diff --git a/.bazelrc b/.bazelrc
index 9278352e686ef..c4029cd0bab47 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,14 +2,6 @@
 # Import shared settings first so we can override below
 import %workspace%/.bazelrc.common
 
-# Remote cache settings for local env
-# build --remote_cache=grpcs://cloud.buildbuddy.io
-# build --incompatible_remote_results_ignore_disk=true
-# build --noremote_upload_local_results
-# build --remote_timeout=30
-# build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
-# build --remote_accept_cached=true
-
 # Enable this in case you want to share your build info
 # build --build_metadata=VISIBILITY=PUBLIC
 build --build_metadata=TEST_GROUPS=//packages
diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
index 773672c5f05f5..eac479d4d450f 100644
--- a/.buildkite/pipelines/artifacts.yml
+++ b/.buildkite/pipelines/artifacts.yml
@@ -4,29 +4,68 @@ steps:
     agents:
       queue: c2-16
     timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - wait
 
   - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh
-    label: Package testing for deb
+    label: Artifact Testing
     agents:
       queue: n2-4-virt
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh
-    label: Package testing for rpm
+    label: Artifact Testing
     agents:
       queue: n2-4-virt
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh
-    label: Package testing for docker
+    label: Artifact Testing
     agents:
       queue: n2-4-virt
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - command: .buildkite/scripts/steps/artifacts/docker_context.sh
-    label: 'Docker Build Context'
+    label: 'Docker Context Verification'
     agents:
       queue: n2-2
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/artifacts/cloud.sh
+    label: 'Cloud Deployment'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 30
+    if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - wait
+
+  - command: .buildkite/scripts/steps/artifacts/publish.sh
+    label: 'Publish Kibana Artifacts'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 30
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
index 18f3440b4acf7..23ec38085c3d9 100755
--- a/.buildkite/pipelines/es_snapshots/verify.yml
+++ b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -29,7 +29,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 27
+    parallelism: 31
     agents:
       queue: n2-4
     depends_on: build
@@ -40,18 +40,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
-    label: 'Docker CI Group'
-    agents:
-      queue: n2-4
-    depends_on: build
-    timeout_in_minutes: 120
-    key: default-cigroup-docker
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-
   - command: .buildkite/scripts/steps/functional/oss_cigroup.sh
     label: 'OSS CI Group'
     parallelism: 11
@@ -91,7 +79,6 @@ steps:
       queue: kibana-default
     depends_on:
       - default-cigroup
-      - default-cigroup-docker
       - oss-cigroup
       - jest-integration
       - api-integration
diff --git a/.buildkite/pipelines/flaky_tests/groups.json b/.buildkite/pipelines/flaky_tests/groups.json
index 0a5d0d488cd5d..e471d5c6a8679 100644
--- a/.buildkite/pipelines/flaky_tests/groups.json
+++ b/.buildkite/pipelines/flaky_tests/groups.json
@@ -32,11 +32,7 @@
     {
       "key": "xpack/cigroup",
       "name": "Default CI Group",
-      "ciGroups": 27
-    },
-    {
-      "key": "xpack/cigroup/Docker",
-      "name": "Default CI Group Docker"
+      "ciGroups": 30
     },
     {
       "key": "xpack/firefox",
@@ -47,4 +43,4 @@
       "name": "Default Accessibility"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index a11f566b06093..8702493d9f4cf 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -51,7 +51,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 27
+    parallelism: 31
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -64,20 +64,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
-    label: 'Docker CI Group'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 120
-    key: default-cigroup-docker
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '*'
-          limit: 1
-
   - command: .buildkite/scripts/steps/functional/oss_cigroup.sh
     label: 'OSS CI Group'
     parallelism: 11
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index a88799d785f06..658d855d86cfd 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -17,26 +17,16 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 27
+    parallelism: 31
     agents:
-      queue: n2-4
+      queue: n2-4-spot-2
     depends_on: build
     timeout_in_minutes: 150
     key: default-cigroup
     retry:
       automatic:
-        - exit_status: '*'
-          limit: 1
-
-  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
-    label: 'Docker CI Group'
-    agents:
-      queue: n2-4
-    depends_on: build
-    timeout_in_minutes: 120
-    key: default-cigroup-docker
-    retry:
-      automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
diff --git a/.buildkite/scripts/build_kibana_plugins.sh b/.buildkite/scripts/build_kibana_plugins.sh
index 94366d9524346..fafd68d86a65d 100755
--- a/.buildkite/scripts/build_kibana_plugins.sh
+++ b/.buildkite/scripts/build_kibana_plugins.sh
@@ -3,18 +3,4 @@
 set -euo pipefail
 
 echo "--- Build Platform Plugins"
-node scripts/build_kibana_platform_plugins \
-  --scan-dir "$KIBANA_DIR/test/analytics/__fixtures__/plugins" \
-  --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
-  --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
-  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
-  --scan-dir "$KIBANA_DIR/examples" \
-  --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
-  --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
-  --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \
-  --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
-  --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
-  --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
-  --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
-  --scan-dir "$XPACK_DIR/test/security_functional/fixtures/common" \
-  --scan-dir "$XPACK_DIR/examples"
+node scripts/build_kibana_platform_plugins --examples --test-plugins
diff --git a/.buildkite/scripts/common/setup_bazel.sh b/.buildkite/scripts/common/setup_bazel.sh
index f9877b16cd424..96cd04fa612fd 100755
--- a/.buildkite/scripts/common/setup_bazel.sh
+++ b/.buildkite/scripts/common/setup_bazel.sh
@@ -15,8 +15,8 @@ if [[ "${BAZEL_CACHE_MODE:-none}" == read* ]]; then
   echo "[bazel] enabling caching"
 cat <<EOF >> $KIBANA_DIR/.bazelrc
   build --bes_results_url=https://app.buildbuddy.io/invocation/
-  build --bes_backend=grpcs://cloud.buildbuddy.io
-  build --remote_cache=grpcs://cloud.buildbuddy.io
+  build --bes_backend=grpcs://remote.buildbuddy.io
+  build --remote_cache=grpcs://remote.buildbuddy.io
   build --remote_timeout=3600
   build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY
 EOF
diff --git a/.buildkite/scripts/lifecycle/pre_build.sh b/.buildkite/scripts/lifecycle/pre_build.sh
index d901594e36ce4..29da2d207dcc4 100755
--- a/.buildkite/scripts/lifecycle/pre_build.sh
+++ b/.buildkite/scripts/lifecycle/pre_build.sh
@@ -12,3 +12,11 @@ export CI_STATS_TOKEN="$(retry 5 5 vault read -field=api_token secret/kibana-iss
 export CI_STATS_HOST="$(retry 5 5 vault read -field=api_host secret/kibana-issues/dev/kibana_ci_stats)"
 
 node "$(dirname "${0}")/ci_stats_start.js"
+
+# We resolve the latest manifest URL at the beginning of the build to ensure that all steps in the build will use the same manifest
+# Otherwise, the manifest could change if a step is running around the time that a new one is promoted
+if [[ ! "${ES_SNAPSHOT_MANIFEST:-}" ]]; then
+  BUCKET=$(curl -s "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/$(cat package.json | jq -r .version)/manifest-latest-verified.json" | jq -r .bucket)
+  ES_SNAPSHOT_MANIFEST_DEFAULT="https://storage.googleapis.com/$BUCKET/manifest.json"
+  buildkite-agent meta-data set ES_SNAPSHOT_MANIFEST_DEFAULT "$ES_SNAPSHOT_MANIFEST_DEFAULT"
+fi
diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh
index 8b2f1f65a52f4..e7a176a5c2666 100755
--- a/.buildkite/scripts/lifecycle/pre_command.sh
+++ b/.buildkite/scripts/lifecycle/pre_command.sh
@@ -65,6 +65,15 @@ EOF
   fi
 }
 
+# If a custom manifest isn't specified, then use the default one that we resolve earlier in the build
+{
+  if [[ ! "${ES_SNAPSHOT_MANIFEST:-}" ]]; then
+    ES_SNAPSHOT_MANIFEST=${ES_SNAPSHOT_MANIFEST:-$(buildkite-agent meta-data get ES_SNAPSHOT_MANIFEST_DEFAULT --default '')}
+    export ES_SNAPSHOT_MANIFEST
+    echo "Using default ES Snapshot Manifest: $ES_SNAPSHOT_MANIFEST"
+  fi
+}
+
 # Setup CI Stats
 {
   CI_STATS_BUILD_ID="$(buildkite-agent meta-data get ci_stats_build_id --default '')"
diff --git a/.buildkite/scripts/steps/artifacts/build.sh b/.buildkite/scripts/steps/artifacts/build.sh
index 9d40a713d4b0a..4519e5167c91f 100644
--- a/.buildkite/scripts/steps/artifacts/build.sh
+++ b/.buildkite/scripts/steps/artifacts/build.sh
@@ -4,44 +4,23 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 
-if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
-  VERSION="$(jq -r '.version' package.json)"
-  RELEASE_ARG="--release"
-else
-  VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
-  RELEASE_ARG=""
-fi
+source .buildkite/scripts/steps/artifacts/env.sh
 
-echo "--- Build Kibana Distribution"
-node scripts/build "$RELEASE_ARG" --all-platforms --debug --docker-cross-compile --skip-docker-cloud
+echo "--- Build Kibana artifacts"
+node scripts/build --all-platforms --debug --docker-cross-compile $(echo "$BUILD_ARGS")
 
-echo "--- Build dependencies report"
-node scripts/licenses_csv_report "--csv=target/dependencies-$VERSION.csv"
-
-# Release verification
-if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
-  echo "--- Build and push Kibana Cloud Distribution"
-  # This doesn't meet the requirements for a release image, implementation TBD
-  # Beats artifacts will need to match a specific commit sha that matches other stack iamges
-  # For now this is a placeholder step that will allow us to run automated Cloud tests
-  # against a best guess approximation of a release image
-  echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
-  trap 'docker logout docker.elastic.co' EXIT
+echo "--- Extract default i18n messages"
+mkdir -p target/i18n
+node scripts/i18n_extract --output-dir=target/i18n
 
-  node scripts/build \
-    "$RELEASE_ARG" \
-    --skip-initialize \
-    --skip-generic-folders \
-    --skip-platform-folders \
-    --skip-archives \
-    --docker-images \
-    --docker-tag-qualifier="$GIT_COMMIT" \
-    --docker-push \
-    --skip-docker-ubi \
-    --skip-docker-ubuntu \
-    --skip-docker-contexts
-fi
+echo "--- Build dependencies report"
+node scripts/licenses_csv_report "--csv=target/dependencies-$FULL_VERSION.csv"
+(cd target; sha512sum "dependencies-$FULL_VERSION.csv" > "dependencies-$FULL_VERSION.csv.sha512.txt")
 
+echo "--- Upload Kibana Artifacts"
 cd target
-buildkite-agent artifact upload "*"
-cd -
\ No newline at end of file
+buildkite-agent artifact upload 'kibana-*'
+buildkite-agent artifact upload "dependencies-$FULL_VERSION.csv"
+buildkite-agent artifact upload "dependencies-$FULL_VERSION.csv.sha512.txt"
+buildkite-agent artifact upload 'i18n/*.json'
+cd -
diff --git a/.buildkite/scripts/steps/artifacts/cloud.sh b/.buildkite/scripts/steps/artifacts/cloud.sh
new file mode 100644
index 0000000000000..8fa04a5d176b0
--- /dev/null
+++ b/.buildkite/scripts/steps/artifacts/cloud.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+set -euo pipefail
+
+.buildkite/scripts/bootstrap.sh
+
+source .buildkite/scripts/steps/artifacts/env.sh
+
+echo "--- Publish Cloud image"
+mkdir -p target
+cd target
+
+buildkite-agent artifact download "kibana-cloud-$FULL_VERSION-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+docker load --input kibana-cloud-$FULL_VERSION-docker-image.tar.gz
+
+TAG="$FULL_VERSION-$GIT_COMMIT"
+KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$FULL_VERSION"
+KIBANA_TEST_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$TAG"
+
+docker tag "$KIBANA_BASE_IMAGE" "$KIBANA_TEST_IMAGE"
+
+echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
+trap 'docker logout docker.elastic.co' EXIT
+
+docker push "$KIBANA_TEST_IMAGE"
+docker logout docker.elastic.co
+
+cd -
+
+echo "--- Create deployment"
+CLOUD_DEPLOYMENT_NAME="kibana-artifacts-$TAG"
+
+LOGS=$(mktemp --suffix ".json")
+DEPLOYMENT_SPEC=$(mktemp --suffix ".json")
+
+jq '
+  .name = "'$CLOUD_DEPLOYMENT_NAME'" |
+  .resources.kibana[0].plan.kibana.docker_image = "'$KIBANA_TEST_IMAGE'" |
+  .resources.kibana[0].plan.kibana.version = "'$FULL_VERSION'" |
+  .resources.elasticsearch[0].plan.elasticsearch.version = "'$FULL_VERSION'" |
+  .resources.enterprise_search[0].plan.enterprise_search.version = "'$FULL_VERSION'" |
+  .resources.integrations_server[0].plan.integrations_server.version = "'$FULL_VERSION'"
+  ' .buildkite/scripts/steps/cloud/deploy.json > "$DEPLOYMENT_SPEC"
+
+ecctl deployment create --track --output json --file "$DEPLOYMENT_SPEC" &> "$LOGS"
+CLOUD_DEPLOYMENT_USERNAME=$(jq --slurp '.[]|select(.resources).resources[] | select(.credentials).credentials.username' "$LOGS")
+CLOUD_DEPLOYMENT_PASSWORD=$(jq --slurp '.[]|select(.resources).resources[] | select(.credentials).credentials.password' "$LOGS")
+CLOUD_DEPLOYMENT_ID=$(jq -r --slurp '.[0].id' "$LOGS")
+CLOUD_DEPLOYMENT_STATUS_MESSAGES=$(jq --slurp '[.[]|select(.resources == null)]' "$LOGS")
+
+CLOUD_DEPLOYMENT_KIBANA_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.kibana[0].info.metadata.aliased_url')
+CLOUD_DEPLOYMENT_ELASTICSEARCH_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.elasticsearch[0].info.metadata.aliased_url')
+
+# NOTE: disabled pending log sanitization
+# echo "--- Setup FTR"
+# export TEST_KIBANA_PROTOCOL=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').protocol)")
+# export TEST_KIBANA_HOSTNAME=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').hostname)")
+# export TEST_KIBANA_PORT=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').port)")
+# export TEST_KIBANA_USERNAME=$CLOUD_DEPLOYMENT_USERNAME"
+# export TEST_KIBANA_PASS=$CLOUD_DEPLOYMENT_PASSWORD"
+
+# export TEST_ES_PROTOCOL=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').protocol)")
+# export TEST_ES_HOSTNAME==$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').hostname)")
+# export TEST_ES_PORT=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').port)")
+# export TEST_ES_USER="$CLOUD_DEPLOYMENT_USERNAME"
+# export TEST_ES_PASS="$CLOUD_DEPLOYMENT_PASSWORD"
+
+# export TEST_BROWSER_HEADLESS=1
+
+# Error: attempted to use the "es" service to fetch Elasticsearch version info but the request failed: ConnectionError: self signed certificate in certificate chain
+# export NODE_TLS_REJECT_UNAUTHORIZED=0
+
+# echo "--- Run default functional tests"
+# node --no-warnings scripts/functional_test_runner.js --include-tag=cloud -exclude-tag=skipCloud
+
+# echo "--- Run x-pack functional tests"
+# cd x-pack
+# node --no-warnings scripts/functional_test_runner.js --include-tag=cloud -exclude-tag=skipCloud 
+
+echo "--- Shutdown deployment"
+ecctl deployment shutdown "$CLOUD_DEPLOYMENT_ID" --force --track --output json &> "$LOGS"
diff --git a/.buildkite/scripts/steps/artifacts/docker_context.sh b/.buildkite/scripts/steps/artifacts/docker_context.sh
index 787f5d278febc..a20544de18fd9 100644
--- a/.buildkite/scripts/steps/artifacts/docker_context.sh
+++ b/.buildkite/scripts/steps/artifacts/docker_context.sh
@@ -4,17 +4,11 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 
-if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
-  VERSION="$(jq -r '.version' package.json)"
-  RELEASE_ARG="--release"
-else
-  VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
-  RELEASE_ARG=""
-fi
+source .buildkite/scripts/steps/artifacts/env.sh
 
 echo "--- Create contexts"
 mkdir -p target
-node scripts/build "$RELEASE_ARG" --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact
+node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact $(echo "$BUILD_ARGS")
 
 echo "--- Setup default context"
 DOCKER_BUILD_FOLDER=$(mktemp -d)
@@ -22,7 +16,7 @@ DOCKER_BUILD_FOLDER=$(mktemp -d)
 tar -xf target/kibana-[0-9]*-docker-build-context.tar.gz -C "$DOCKER_BUILD_FOLDER"
 cd $DOCKER_BUILD_FOLDER
 
-buildkite-agent artifact download "kibana-$VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+buildkite-agent artifact download "kibana-$FULL_VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
 
 echo "--- Build context"
 docker build .
diff --git a/.buildkite/scripts/steps/artifacts/env.sh b/.buildkite/scripts/steps/artifacts/env.sh
new file mode 100755
index 0000000000000..ea2850ff9a38a
--- /dev/null
+++ b/.buildkite/scripts/steps/artifacts/env.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+RELEASE_BUILD="${RELEASE_BUILD:="false"}"
+VERSION_QUALIFIER="${VERSION_QUALIFIER:=""}"
+
+BASE_VERSION="$(jq -r '.version' package.json)"
+
+if [[ "$VERSION_QUALIFIER" == "" ]]; then
+  QUALIFIER_VERSION="$BASE_VERSION"
+else
+  QUALIFIER_VERSION="$BASE_VERSION-$VERSION_QUALIFIER"
+fi
+
+if [[ "$RELEASE_BUILD" == "true" ]]; then
+  FULL_VERSION="$QUALIFIER_VERSION"
+
+  # Beats artifacts will need to match a specific commit sha that matches other stack images
+  # for release builds.  For now we are skipping Cloud builds until there's a pointer.
+  BUILD_ARGS="--release --skip-docker-cloud --version-qualifier=$VERSION_QUALIFIER"
+  WORKFLOW="staging"
+else
+  FULL_VERSION="$QUALIFIER_VERSION-SNAPSHOT"
+  BUILD_ARGS="--version-qualifier=$VERSION_QUALIFIER"
+  WORKFLOW="snapshot"
+fi
+
+export VERSION_QUALIFIER
+export BASE_VERSION
+export QUALIFIER_VERSION
+export FULL_VERSION
+export BUILD_ARGS
+export WORKFLOW
diff --git a/.buildkite/scripts/steps/artifacts/publish.sh b/.buildkite/scripts/steps/artifacts/publish.sh
new file mode 100644
index 0000000000000..ed4cb5ca1d4b9
--- /dev/null
+++ b/.buildkite/scripts/steps/artifacts/publish.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+source .buildkite/scripts/steps/artifacts/env.sh
+
+echo "--- Download and verify artifacts"
+function download {
+  buildkite-agent artifact download "$1" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  buildkite-agent artifact download "$1.sha512.txt" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  sha512sum -c "$1.sha512.txt"
+  rm "$1.sha512.txt"
+}
+
+mkdir -p target
+cd target
+
+download "kibana-$FULL_VERSION-docker-image.tar.gz"
+download "kibana-$FULL_VERSION-docker-image-aarch64.tar.gz"
+download "kibana-ubi8-$FULL_VERSION-docker-image.tar.gz"
+
+download "kibana-$FULL_VERSION-arm64.deb"
+download "kibana-$FULL_VERSION-amd64.deb"
+download "kibana-$FULL_VERSION-x86_64.rpm"
+download "kibana-$FULL_VERSION-aarch64.rpm"
+
+download "kibana-$FULL_VERSION-docker-build-context.tar.gz"
+download "kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
+download "kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
+download "kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
+
+download "kibana-$FULL_VERSION-linux-aarch64.tar.gz"
+download "kibana-$FULL_VERSION-linux-x86_64.tar.gz"
+
+download "kibana-$FULL_VERSION-darwin-x86_64.tar.gz"
+download "kibana-$FULL_VERSION-darwin-aarch64.tar.gz"
+
+download "kibana-$FULL_VERSION-windows-x86_64.zip"
+
+download "dependencies-$FULL_VERSION.csv"
+
+cd - 
+
+echo "--- Set artifact permissions"
+chmod -R a+r target/*
+chmod -R a+w target
+
+echo "--- Pull latest Release Manager CLI"
+echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
+trap 'docker logout docker.elastic.co' EXIT
+docker pull docker.elastic.co/infra/release-manager:latest
+
+echo "--- Publish artifacts"
+if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
+  export VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
+  export VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
+  export VAULT_ADDR="https://secrets.elastic.co:8200"
+  docker run --rm \
+    --name release-manager \
+    -e VAULT_ADDR \
+    -e VAULT_ROLE_ID \
+    -e VAULT_SECRET_ID \
+    --mount type=bind,readonly=false,src="$PWD/target",target=/artifacts/target \
+    docker.elastic.co/infra/release-manager:latest \
+      cli collect \
+        --project kibana \
+        --branch "$KIBANA_BASE_BRANCH" \
+        --commit "$GIT_COMMIT" \
+        --workflow "$WORKFLOW" \
+        --version "$BASE_VERSION" \
+        --qualifier "$VERSION_QUALIFIER" \
+        --artifact-set main
+
+  ARTIFACTS_SUBDOMAIN="artifacts-$WORKFLOW"
+  ARTIFACTS_SUMMARY=$(curl -s "https://$ARTIFACTS_SUBDOMAIN.elastic.co/kibana/latest/$FULL_VERSION.json" | jq -re '.summary_url')
+
+  cat << EOF | buildkite-agent annotate --style "info" --context artifacts-summary
+  ### Artifacts Summary
+
+  $ARTIFACTS_SUMMARY
+EOF
+
+else
+  echo "Skipping publish for untracked branch $BUILDKITE_BRANCH"
+fi
diff --git a/.buildkite/scripts/steps/cloud/deploy.json b/.buildkite/scripts/steps/cloud/deploy.json
index 62edb7b6a11c9..c43294a42a83b 100644
--- a/.buildkite/scripts/steps/cloud/deploy.json
+++ b/.buildkite/scripts/steps/cloud/deploy.json
@@ -207,7 +207,7 @@
               "zone_count": 1,
               "size": {
                 "resource": "memory",
-                "value": 1024
+                "value": 2048
               }
             }
           ],
diff --git a/.buildkite/scripts/steps/es_snapshots/create_manifest.js b/.buildkite/scripts/steps/es_snapshots/create_manifest.js
index 9357cd72fff06..e20a3262e66e0 100644
--- a/.buildkite/scripts/steps/es_snapshots/create_manifest.js
+++ b/.buildkite/scripts/steps/es_snapshots/create_manifest.js
@@ -8,7 +8,7 @@
 
 const fs = require('fs');
 const { execSync } = require('child_process');
-const { BASE_BUCKET_DAILY } = require('./bucket_config.js');
+const { BASE_BUCKET_DAILY } = require('./bucket_config');
 
 (async () => {
   console.log('--- Create ES Snapshot Manifest');
diff --git a/.buildkite/scripts/steps/es_snapshots/promote_manifest.js b/.buildkite/scripts/steps/es_snapshots/promote_manifest.js
index d7ff670755712..1ba60ae6cd25e 100644
--- a/.buildkite/scripts/steps/es_snapshots/promote_manifest.js
+++ b/.buildkite/scripts/steps/es_snapshots/promote_manifest.js
@@ -8,7 +8,7 @@
 
 const fs = require('fs');
 const { execSync } = require('child_process');
-const { BASE_BUCKET_DAILY, BASE_BUCKET_PERMANENT } = require('./bucket_config.js');
+const { BASE_BUCKET_DAILY, BASE_BUCKET_PERMANENT } = require('./bucket_config');
 
 (async () => {
   try {
diff --git a/.buildkite/scripts/steps/functional/performance_playwright.sh b/.buildkite/scripts/steps/functional/performance_playwright.sh
index d739f136992e7..dad75c9f66a98 100644
--- a/.buildkite/scripts/steps/functional/performance_playwright.sh
+++ b/.buildkite/scripts/steps/functional/performance_playwright.sh
@@ -20,7 +20,7 @@ sleep 120
 
 cd "$XPACK_DIR"
 
-journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard")
+journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard" "many_fields_discover")
 
 for i in "${journeys[@]}"; do
     echo "JOURNEY[${i}] is running"
@@ -28,7 +28,7 @@ for i in "${journeys[@]}"; do
     export TEST_PERFORMANCE_PHASE=WARMUP
     export ELASTIC_APM_ACTIVE=false
     export JOURNEY_NAME="${i}"
-    
+
     checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: WARMUP)" \
       node scripts/functional_tests \
       --config test/performance/config.playwright.ts \
diff --git a/.buildkite/scripts/steps/functional/uptime.sh b/.buildkite/scripts/steps/functional/uptime.sh
index a1c8c2bf6c85b..ce49acadf4deb 100755
--- a/.buildkite/scripts/steps/functional/uptime.sh
+++ b/.buildkite/scripts/steps/functional/uptime.sh
@@ -13,5 +13,5 @@ echo "--- Uptime @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-checks-reporter-with-killswitch "Uptime @elastic/synthetics Tests" \
-  node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+checks-reporter-with-killswitch "uptime plugin @elastic/synthetics Tests" \
+  node plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
diff --git a/.buildkite/scripts/steps/package_testing/test.sh b/.buildkite/scripts/steps/package_testing/test.sh
index a9a46502d5b3b..e5ed00f760864 100755
--- a/.buildkite/scripts/steps/package_testing/test.sh
+++ b/.buildkite/scripts/steps/package_testing/test.sh
@@ -15,12 +15,12 @@ elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
   buildkite-agent artifact download 'kibana-*.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   KIBANA_IP_ADDRESS="192.168.56.6"
 elif [[ "$TEST_PACKAGE" == "docker" ]]; then
-  buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION*-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   KIBANA_IP_ADDRESS="192.168.56.7"
 fi
 cd ..
 
-export VAGRANT_CWD=test/package
+export VAGRANT_CWD=$PWD/test/package
 vagrant up "$TEST_PACKAGE" --no-provision
 
 node scripts/es snapshot \
@@ -29,6 +29,16 @@ node scripts/es snapshot \
   --license=trial &
 while ! timeout 1 bash -c "echo > /dev/tcp/localhost/9200"; do sleep 30; done
 
+function echoKibanaLogs {
+  echo '--- Kibana logs'
+  if [[ "$TEST_PACKAGE" == "deb" ]] || [[ "$TEST_PACKAGE" == "rpm" ]]; then
+    vagrant ssh $TEST_PACKAGE -t -c 'sudo cat /var/log/kibana/kibana.log'
+  elif [[ "$TEST_PACKAGE" == "docker" ]]; then
+    vagrant ssh $TEST_PACKAGE -t -c 'sudo docker logs kibana'
+  fi
+}
+trap "echoKibanaLogs" EXIT
+
 vagrant provision "$TEST_PACKAGE"
 
 export TEST_BROWSER_HEADLESS=1
diff --git a/.buildkite/scripts/steps/test/jest_parallel.sh b/.buildkite/scripts/steps/test/jest_parallel.sh
index 0530fe0f84161..27eb9e9216365 100755
--- a/.buildkite/scripts/steps/test/jest_parallel.sh
+++ b/.buildkite/scripts/steps/test/jest_parallel.sh
@@ -10,10 +10,17 @@ JOB_COUNT=$BUILDKITE_PARALLEL_JOB_COUNT
 i=0
 exitCode=0
 
+# run unit tests in parallel
+if [[ "$1" == 'jest.config.js' ]]; then
+  parallelism="-w2"
+else
+  parallelism="--runInBand"
+fi
+
 while read -r config; do
   if [ "$((i % JOB_COUNT))" -eq "$JOB" ]; then
     echo "--- $ node scripts/jest --config $config"
-    node --max-old-space-size=14336 ./scripts/jest --config="$config" --runInBand --coverage=false --passWithNoTests
+    node --max-old-space-size=14336 ./scripts/jest --config="$config" "$parallelism" --coverage=false --passWithNoTests
     lastCode=$?
 
     if [ $lastCode -ne 0 ]; then
diff --git a/.buildkite/yarn.lock b/.buildkite/yarn.lock
index c2d6928d30c5a..c5a4e404ba970 100644
--- a/.buildkite/yarn.lock
+++ b/.buildkite/yarn.lock
@@ -3,93 +3,93 @@
 
 
 "@octokit/auth-token@^2.4.4":
-  "integrity" "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="
-  "resolved" "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"
-  "version" "2.5.0"
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"
+  integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==
   dependencies:
     "@octokit/types" "^6.0.3"
 
-"@octokit/core@^3.5.1", "@octokit/core@>=2", "@octokit/core@>=3":
-  "integrity" "sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw=="
-  "resolved" "https://registry.npmjs.org/@octokit/core/-/core-3.5.1.tgz"
-  "version" "3.5.1"
+"@octokit/core@^3.5.1":
+  version "3.5.1"
+  resolved "https://registry.npmjs.org/@octokit/core/-/core-3.5.1.tgz"
+  integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
   dependencies:
     "@octokit/auth-token" "^2.4.4"
     "@octokit/graphql" "^4.5.8"
     "@octokit/request" "^5.6.0"
     "@octokit/request-error" "^2.0.5"
     "@octokit/types" "^6.0.3"
-    "before-after-hook" "^2.2.0"
-    "universal-user-agent" "^6.0.0"
+    before-after-hook "^2.2.0"
+    universal-user-agent "^6.0.0"
 
 "@octokit/endpoint@^6.0.1":
-  "integrity" "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="
-  "resolved" "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"
-  "version" "6.0.12"
+  version "6.0.12"
+  resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"
+  integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
   dependencies:
     "@octokit/types" "^6.0.3"
-    "is-plain-object" "^5.0.0"
-    "universal-user-agent" "^6.0.0"
+    is-plain-object "^5.0.0"
+    universal-user-agent "^6.0.0"
 
 "@octokit/graphql@^4.5.8":
-  "integrity" "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="
-  "resolved" "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz"
-  "version" "4.8.0"
+  version "4.8.0"
+  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz"
+  integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
   dependencies:
     "@octokit/request" "^5.6.0"
     "@octokit/types" "^6.0.3"
-    "universal-user-agent" "^6.0.0"
+    universal-user-agent "^6.0.0"
 
 "@octokit/openapi-types@^11.2.0":
-  "integrity" "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
-  "resolved" "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz"
-  "version" "11.2.0"
+  version "11.2.0"
+  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz"
+  integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
 
 "@octokit/plugin-paginate-rest@^2.16.8":
-  "integrity" "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw=="
-  "resolved" "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz"
-  "version" "2.17.0"
+  version "2.17.0"
+  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz"
+  integrity sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==
   dependencies:
     "@octokit/types" "^6.34.0"
 
 "@octokit/plugin-request-log@^1.0.4":
-  "integrity" "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="
-  "resolved" "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"
-  "version" "1.0.4"
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"
+  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
 
 "@octokit/plugin-rest-endpoint-methods@^5.12.0":
-  "integrity" "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA=="
-  "resolved" "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz"
-  "version" "5.13.0"
+  version "5.13.0"
+  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz"
+  integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
   dependencies:
     "@octokit/types" "^6.34.0"
-    "deprecation" "^2.3.1"
+    deprecation "^2.3.1"
 
 "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
-  "integrity" "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="
-  "resolved" "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"
-  "version" "2.1.0"
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"
+  integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
   dependencies:
     "@octokit/types" "^6.0.3"
-    "deprecation" "^2.0.0"
-    "once" "^1.4.0"
+    deprecation "^2.0.0"
+    once "^1.4.0"
 
 "@octokit/request@^5.6.0":
-  "integrity" "sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA=="
-  "resolved" "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz"
-  "version" "5.6.2"
+  version "5.6.2"
+  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz"
+  integrity sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.1.0"
     "@octokit/types" "^6.16.1"
-    "is-plain-object" "^5.0.0"
-    "node-fetch" "^2.6.1"
-    "universal-user-agent" "^6.0.0"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
+    universal-user-agent "^6.0.0"
 
 "@octokit/rest@^18.10.0":
-  "integrity" "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="
-  "resolved" "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz"
-  "version" "18.12.0"
+  version "18.12.0"
+  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz"
+  integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
   dependencies:
     "@octokit/core" "^3.5.1"
     "@octokit/plugin-paginate-rest" "^2.16.8"
@@ -97,84 +97,84 @@
     "@octokit/plugin-rest-endpoint-methods" "^5.12.0"
 
 "@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.34.0":
-  "integrity" "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw=="
-  "resolved" "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz"
-  "version" "6.34.0"
+  version "6.34.0"
+  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz"
+  integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==
   dependencies:
     "@octokit/openapi-types" "^11.2.0"
 
-"axios@^0.21.4":
-  "integrity" "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="
-  "resolved" "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
-  "version" "0.21.4"
+axios@^0.21.4:
+  version "0.21.4"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
-    "follow-redirects" "^1.14.0"
-
-"before-after-hook@^2.2.0":
-  "integrity" "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
-  "resolved" "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"
-  "version" "2.2.2"
-
-"deprecation@^2.0.0", "deprecation@^2.3.1":
-  "integrity" "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
-  "resolved" "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"
-  "version" "2.3.1"
-
-"follow-redirects@^1.14.0":
-  "integrity" "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
-  "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"
-  "version" "1.14.5"
-
-"is-plain-object@^5.0.0":
-  "integrity" "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
-  "version" "5.0.0"
-
-"kibana-buildkite-library@github:elastic/kibana-buildkite-library":
-  "resolved" "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#ccf5b824c4294d1fdf3569d32218d3bdb0958121"
-  "version" "1.0.0"
+    follow-redirects "^1.14.0"
+
+before-after-hook@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"
+  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
+
+deprecation@^2.0.0, deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
+follow-redirects@^1.14.0:
+  version "1.14.5"
+  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"
+  integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
+
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
+kibana-buildkite-library@elastic/kibana-buildkite-library:
+  version "1.0.0"
+  resolved "https://codeload.github.com/elastic/kibana-buildkite-library/tar.gz/bd0bec4c7af5f64a12c781d03cedb9fb2386bfbd"
   dependencies:
     "@octokit/rest" "^18.10.0"
-    "axios" "^0.21.4"
+    axios "^0.21.4"
 
-"node-fetch@^2.6.1":
-  "integrity" "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="
-  "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"
-  "version" "2.6.6"
+node-fetch@^2.6.1:
+  version "2.6.6"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"
+  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
   dependencies:
-    "whatwg-url" "^5.0.0"
+    whatwg-url "^5.0.0"
 
-"once@^1.4.0":
-  "integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
-  "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-  "version" "1.4.0"
+once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
-    "wrappy" "1"
-
-"tr46@~0.0.3":
-  "integrity" "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-  "resolved" "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
-  "version" "0.0.3"
-
-"universal-user-agent@^6.0.0":
-  "integrity" "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
-  "resolved" "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"
-  "version" "6.0.0"
-
-"webidl-conversions@^3.0.0":
-  "integrity" "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-  "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
-  "version" "3.0.1"
-
-"whatwg-url@^5.0.0":
-  "integrity" "sha1-lmRU6HZUYuN2RNNib2dCzotwll0="
-  "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
-  "version" "5.0.0"
+    wrappy "1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+universal-user-agent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"
+  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
   dependencies:
-    "tr46" "~0.0.3"
-    "webidl-conversions" "^3.0.0"
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
 
-"wrappy@1":
-  "integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-  "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-  "version" "1.0.2"
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
diff --git a/.ci/.storybook/main.js b/.ci/.storybook/main.js
index 37f3391337308..c4e017179021a 100644
--- a/.ci/.storybook/main.js
+++ b/.ci/.storybook/main.js
@@ -7,7 +7,7 @@
  */
 
 const config = require('@kbn/storybook').defaultConfig;
-const aliases = require('../../src/dev/storybook/aliases.ts').storybookAliases;
+const aliases = require('../../src/dev/storybook/aliases').storybookAliases;
 
 config.refs = {};
 
diff --git a/.ci/ci_groups.yml b/.ci/ci_groups.yml
index 1be6e8c196a2d..c3786f299d4c0 100644
--- a/.ci/ci_groups.yml
+++ b/.ci/ci_groups.yml
@@ -39,4 +39,7 @@ xpack:
   - ciGroup25
   - ciGroup26
   - ciGroup27
-  - ciGroupDocker
+  - ciGroup28
+  - ciGroup29
+  - ciGroup30
+  - ciGroup31
diff --git a/.eslintrc.js b/.eslintrc.js
index 08af34d24e7f5..dfbdd4de96f0a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -840,7 +840,10 @@ module.exports = {
           },
         ],
         'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
-        'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^useFetcher$' }],
+        'react-hooks/exhaustive-deps': [
+          'error',
+          { additionalHooks: '^(useFetcher|useProgressiveFetcher)$' },
+        ],
       },
     },
     {
@@ -1452,6 +1455,20 @@ module.exports = {
       plugins: ['react', '@typescript-eslint'],
       files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
       rules: {
+        'padding-line-between-statements': [
+          'error',
+          {
+            blankLine: 'always',
+            prev: ['block-like'],
+            next: ['*'],
+          },
+          {
+            blankLine: 'always',
+            prev: ['*'],
+            next: ['return'],
+          },
+        ],
+        'padded-blocks': ['error', 'always'],
         'arrow-body-style': ['error', 'as-needed'],
         'prefer-arrow-callback': 'error',
         'no-unused-vars': 'off',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a06ddaf49822f..869160bfa0fd1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -133,7 +133,7 @@
 #CC# /x-pack/plugins/observability/ @elastic/apm-ui
 
 # Uptime
-/x-pack/plugins/uptime @elastic/uptime
+/x-pack/plugins/synthetics @elastic/uptime
 /x-pack/plugins/ux @elastic/uptime
 /x-pack/test/functional_with_es_ssl/apps/uptime  @elastic/uptime
 /x-pack/test/functional/apps/uptime @elastic/uptime
@@ -220,12 +220,14 @@
 /packages/kbn-ambient-ui-types/ @elastic/kibana-operations
 /packages/kbn-ambient-storybook-types/ @elastic/kibana-operations
 /packages/kbn-bazel-packages/ @elastic/kibana-operations
+/packages/kbn-bazel-runner/ @elastic/kibana-operations
 /packages/kbn-cli-dev-mode/ @elastic/kibana-operations
 /packages/kbn-dev-utils*/ @elastic/kibana-operations
 /packages/kbn-es-archiver/ @elastic/kibana-operations
 /packages/kbn-es/ @elastic/kibana-operations
 /packages/kbn-eslint-plugin-imports/ @elastic/kibana-operations
 /packages/kbn-generate/ @elastic/kibana-operations
+/packages/kbn-import-resolver/ @elastic/kibana-operations
 /packages/kbn-optimizer/ @elastic/kibana-operations
 /packages/kbn-plugin-discovery/ @elastic/kibana-operations
 /packages/kbn-pm/ @elastic/kibana-operations
@@ -268,7 +270,7 @@
 /x-pack/plugins/saved_objects_tagging/ @elastic/kibana-core
 /x-pack/test/saved_objects_field_count/ @elastic/kibana-core
 /x-pack/test/saved_object_tagging/ @elastic/kibana-core
-/packages/elastic-analytics/ @elastic/kibana-core
+/packages/analytics/ @elastic/kibana-core
 /packages/kbn-config-schema/ @elastic/kibana-core
 /packages/kbn-std/ @elastic/kibana-core
 /packages/kbn-config/ @elastic/kibana-core
@@ -400,8 +402,149 @@
 #CC# /x-pack/plugins/security_solution/ @elastic/security-solution
 
 # Security Solution sub teams
-/x-pack/plugins/timelines @elastic/security-threat-hunting
-/x-pack/plugins/lists @elastic/security-detections-response
+
+## Security Solution sub teams - Threat Hunting Investigations
+/x-pack/plugins/timelines @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/common/search_strategy/timeline @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/common/types/timeline @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/cypress/integration/timeline_templates @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/cypress/integration/timeline @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/cypress/integration/detection_alerts @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/cypress/integration/urls @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/public/common/components/alerts_viewer @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/common/components/event_details @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/common/components/events_viewer @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/common/components/markdown_editor @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/detections/components/alerts_kpis @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/detections/components/alerts_table @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/detections/components/alerts_info @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/resolver @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/timelines @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/server/lib/timeline @elastic/security-threat-hunting-investigations
+
+## Security Solution sub teams - Threat Hunting Explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/user @elastic/security-threat-hunting-explore
+
+/x-pack/plugins/security_solution/cypress/integration/cases @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/host_details @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/overview @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/pagination @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/users @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/screens/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/screens/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/tasks/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/tasks/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/upgrade_integration/threat_hunting/cases @elastic/security-threat-hunting-explore
+
+/x-pack/plugins/security_solution/public/common/components/charts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/header_page @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/header_section @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/inspect @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/last_event_time @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/links @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/navigation @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/news_feed @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/overview_description_list @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/paginated_table @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/sidebar_header @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/stat_items @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/tables @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/top_n @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/with_hover_actions @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/containers/hosts_risk @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/containers/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/lib/cell_actions @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/cases @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/overview @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/users @elastic/security-threat-hunting-explore
+
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users @elastic/security-threat-hunting-explore
+
+## Security Solution sub teams - Detections and Response Alerts
+/x-pack/plugins/security_solution/public/detections/pages/alerts @elastic/security-detections-response-alerts
+
+/x-pack/plugins/security_solution/server/lib/detection_engine/migrations @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/notifications @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/schemas @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/signals @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals @elastic/security-detections-response-alerts
+
+
+## Security Solution sub teams - Detections and Response Rules
+/x-pack/plugins/security_solution/cypress/integration/detection_rules @elastic/security-detections-response-rules
+
+/x-pack/plugins/security_solution/public/detections/components/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/components/severity @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/components/status @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/common/components/health_truncate_text @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/common/components/links_to_docs @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/common/components/callouts @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/components/callouts @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/mitre @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules @elastic/security-detections-response-rules
+
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/utils @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/tags @elastic/security-detections-response-rules
+
+## Security Solution sub teams - Security Platform
+/x-pack/plugins/lists @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/cypress/integration/data_sources @elastic/security-solution-platform
+/x-pack/plugins/security_solution/cypress/integration/exceptions @elastic/security-solution-platform
+/x-pack/plugins/security_solution/cypress/integration/value_lists @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/public/common/components/exceptions @elastic/security-solution-platform
+/x-pack/plugins/security_solution/public/exceptions @elastic/security-solution-platform
+/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists @elastic/security-solution-platform
+/x-pack/plugins/security_solution/public/common/components/sourcerer @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/server/lib/sourcerer @elastic/security-solution-platform
+/packages/kbn-securitysolution* @elastic/security-solution-platform
+
+## Security Threat Intelligence - Under Security Platform
+/x-pack/plugins/security_solution/public/common/components/threat_match @elastic/security-solution-platform
+
+## Security Solution cross teams ownership
+/x-pack/plugins/security_solution/cypress/downloads @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/fixtures @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/helpers @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/objects @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/plugins @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/support @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/urls @elastic/security-threat-hunting-investigations @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/screens/common @elastic/security-detections-response @elastic/security-threat-hunting
+
+/x-pack/plugins/security_solution/common/ecs @elastic/security-detections-response-rules @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/common/test @elastic/security-detections-response-rules @elastic/security-detections-response-alerts
+
+/x-pack/plugins/security_solution/public/common/components/hover_actions @elastic/security-threat-hunting-explore @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/server/routes @elastic/security-detections-response-alerts @elastic/security-detections-response-rules
+
 
 ## Security Solution sub teams - security-onboarding-and-lifecycle-mgt
 /x-pack/plugins/security_solution/public/management/ @elastic/security-onboarding-and-lifecycle-mgt
@@ -429,15 +572,17 @@ x-pack/test/security_solution_cypress @elastic/security-engineering-productivity
 
 ## Security Solution sub teams - adaptive-workload-protection
 x-pack/plugins/session_view @elastic/awp-platform
+x-pack/plugins/security_solution/public/common/components/sessions_viewer @elastic/awp-platform
 
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
 
+
 # Security Asset Management
 /x-pack/plugins/osquery @elastic/security-asset-management
 
 # Cloud Security Posture
-/x-pack/plugins/cloud_security_posture/ @elastic/cloud-security-posture-control-plane
+/x-pack/plugins/cloud_security_posture/ @elastic/kibana-cloud-security-posture
 
 # Design (at the bottom for specificity of SASS files)
 **/*.scss  @elastic/kibana-design
@@ -462,10 +607,12 @@ x-pack/plugins/session_view @elastic/awp-platform
 
 # Reporting
 /x-pack/examples/reporting_example/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/examples/screenshotting_example/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/plugins/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/apps/dashboard/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/apps/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/apps/reporting_management/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/examples/screenshotting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/es_archives/lens/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/es_archives/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
@@ -484,6 +631,7 @@ x-pack/plugins/session_view @elastic/awp-platform
 
 ## Shared UX
 /src/plugins/shared_ux/ @elastic/shared-ux
+/packages/shared-ux/ @elastic/shared-ux
 /packages/shared-ux-*/ @elastic/shared-ux
 /src/plugins/kibana_react/ @elastic/shared-ux
 /src/plugins/kibana_react/public/code_editor @elastic/shared-ux @elastic/kibana-presentation
diff --git a/.gitignore b/.gitignore
index 588c185b17a0b..7c20367dfe6de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 node_modules
 !/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
 !/src/dev/notice/__fixtures__/node_modules
+!/packages/kbn-import-resolver/src/__fixtures__/node_modules
 trash
 /optimize
 /built_assets
@@ -98,4 +99,5 @@ elastic-agent-*
 fleet-server-*
 elastic-agent.yml
 fleet-server.yml
+/packages/kbn-synthetic-package-map/synthetic-packages.json
 
diff --git a/.i18nrc.json b/.i18nrc.json
index 573462d497438..a5d1b36ede73d 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -66,6 +66,7 @@
     "share": "src/plugins/share",
     "sharedUX": "src/plugins/shared_ux",
     "sharedUXComponents": "packages/kbn-shared-ux-components/src",
+    "sharedUXPackages": "packages/shared-ux",
     "coloring": "packages/kbn-coloring/src",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": [
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 8100e93bcd4df..891389d803a56 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -10,14 +10,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch Node.js rules
 http_archive(
   name = "build_bazel_rules_nodejs",
-  sha256 = "2b2004784358655f334925e7eadc7ba80f701144363df949b3293e1ae7a2fb7b",
-  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.4.0/rules_nodejs-5.4.0.tar.gz"],
+  patch_args = ["-p1"],
+  patches = ["//:src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch"],
+  sha256 = "6f15d75f9e99c19d9291ff8e64e4eb594a6b7d25517760a75ad3621a7a48c2df",
+  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.7.0/rules_nodejs-4.7.0.tar.gz"],
 )
 
-# Build Node.js rules dependencies
-load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
-build_bazel_rules_nodejs_dependencies()
-
 # Now that we have the rules let's import from them to complete the work
 load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
 
@@ -39,7 +37,7 @@ node_repositories(
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],
-  yarn_releases = {
+  yarn_repositories = {
     "1.21.1": ("yarn-v1.21.1.tar.gz", "yarn-v1.21.1", "d1d9f4a0f16f5ed484e814afeb98f39b82d4728c6c8beaafb5abc99c02db6674"),
   },
   yarn_version = "1.21.1",
diff --git a/config/kibana.yml b/config/kibana.yml
index 50ddad9a4b32a..4233bf2882a29 100644
--- a/config/kibana.yml
+++ b/config/kibana.yml
@@ -159,8 +159,8 @@
 # =================== Search Autocomplete ===================
 # Time in milliseconds to wait for autocomplete suggestions from Elasticsearch.
 # This value must be a whole number greater than zero. Defaults to 1000ms
-#data.autocomplete.valueSuggestions.timeout: 1000
+#unifiedSearch.autocomplete.valueSuggestions.timeout: 1000
 
 # Maximum number of documents loaded by each shard to generate autocomplete suggestions.
 # This value must be a whole number greater than zero. Defaults to 100_000
-#data.autocomplete.valueSuggestions.terminateAfter: 100000
+#unifiedSearch.autocomplete.valueSuggestions.terminateAfter: 100000
diff --git a/dev_docs/tutorials/screenshotting.mdx b/dev_docs/tutorials/screenshotting.mdx
new file mode 100644
index 0000000000000..76f2859928491
--- /dev/null
+++ b/dev_docs/tutorials/screenshotting.mdx
@@ -0,0 +1,87 @@
+---
+id: kibDevTutorialScreenshotting
+slug: /kibana-dev-docs/tutorials/screenshotting
+title: Kibana Screenshotting Service
+summary: Kibana Screenshotting Service
+date: 2022-04-12
+tags: ['kibana', 'onboarding', 'dev', 'architecture']
+---
+
+## Screenshotting Plugin
+
+This plugin provides functionality to take screenshots of the Kibana pages.
+It uses Chromium and Puppeteer underneath to run the browser in headless mode.
+
+If you are planning to integrate with the screenshotting plugin, please get in touch with the App Services team to know all the limitations.
+
+### Capabilities
+- Canvas workpads screenshots.
+- Dashboards screenshots.
+- Expressions screenshots.
+- PDF generation.
+- Batch screenshotting.
+
+### Usage
+After listing the `screenshotting` plugin in your dependencies, the plugin will be intitalized on the setup stage.
+The intitalization process downloads (if it is not already present) and verifies the Chromium build.
+
+The start contract exposes a public API to interact with the plugin.
+Apart from the actual screenshotting functionality, it also provides a way for self-diagnostics.
+
+Here is an example of how you can take a screenshot of a Kibana URL.
+
+
+```typescript
+import { lastValueFrom } from 'rxjs';
+import type { CoreSetup, Plugin } from 'src/core/server';
+import type { ScreenshottingStart } from 'x-pack/plugins/screenshotting/server';
+
+
+interface StartDeps {
+  screenshotting: ScreenshottingStart;
+}
+
+class ExamplePlugin implements Plugin<void, void, void, StartDeps> {
+  setup({ http, getStartServices }: CoreSetup<StartDeps>) {
+    const router = http.createRouter();
+
+    router.get(
+      {
+        path: '/api/capture',
+        validate: {
+          query: schema.object({
+            id: schema.string(),
+          }),
+        },
+      },
+      async (context, request, response) => {
+        const [, { screenshotting }] = await getStartServices();
+        const { metrics, results } = await lastValueFrom(
+          screenshotting.getScreenshots({
+            request,
+            urls: [`http://localhost/app/canvas#/workpad/workpad-${request.query.id}`],
+          })
+        );
+
+        return response.ok({
+          body: JSON.stringify({
+            metrics,
+            image: results[0]?.screenshots[0]?.data.toString('base64'),
+            errors: results[0]?.renderErrors,
+          } as ScreenshottingExpressionResponse),
+        });
+      }
+    );
+  }
+
+  start() {}
+}
+
+export function plugin() {
+  return new ExamplePlugin();
+}
+```
+
+<DocCallOut>
+  Check the complete API reference <DocLink id="kibScreenshottingPluginApi" text="here" />.
+</DocCallOut>
diff --git a/docs/api/cases.asciidoc b/docs/api/cases.asciidoc
index 3b5bfaeceaff4..9ffe69997f714 100644
--- a/docs/api/cases.asciidoc
+++ b/docs/api/cases.asciidoc
@@ -8,22 +8,22 @@ these APIs:
 * <<cases-api-create>>
 * <<cases-api-delete-cases>>
 * <<cases-api-delete-comments>>
-* {security-guide}/cases-api-find-alert.html[Find all alerts attached to a case]
 * <<cases-api-find-cases>>
-* {security-guide}/cases-api-find-cases-by-alert.html[Find cases by alert]
 * <<cases-api-find-connectors>>
+* <<cases-api-get-alerts>>
 * <<cases-api-get-case-activity>>
 * <<cases-api-get-case>>
 * <<cases-api-get-status>>
+* <<cases-api-get-cases-by-alert>>
 * <<cases-api-get-comments>>
-* {security-guide}/cases-get-connector.html[Get current connector]
+* <<cases-get-configuration>>
 * <<cases-api-get-reporters>>
 * <<cases-api-get-tag>>
-* {security-guide}/cases-api-push.html[Push case]
-* {security-guide}/assign-connector.html[Set default Elastic Security UI connector]
-* {security-guide}/case-api-update-connector.html[Update case configurations]
+* <<cases-api-push>>
+* <<cases-api-set-configuration>>
 * <<cases-api-update>>
 * <<cases-api-update-comment>>
+* <<cases-api-update-configuration>>
 
 //ADD
 include::cases/cases-api-add-comment.asciidoc[leveloffset=+1]
@@ -36,12 +36,20 @@ include::cases/cases-api-delete-comments.asciidoc[leveloffset=+1]
 include::cases/cases-api-find-cases.asciidoc[leveloffset=+1]
 include::cases/cases-api-find-connectors.asciidoc[leveloffset=+1]
 //GET
+include::cases/cases-api-get-alerts.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-case-activity.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-case.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-status.asciidoc[leveloffset=+1]
+include::cases/cases-api-get-cases-by-alert.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-comments.asciidoc[leveloffset=+1]
+include::cases/cases-api-get-configuration.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-reporters.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-tags.asciidoc[leveloffset=+1]
+//PUSH
+include::cases/cases-api-push.asciidoc[leveloffset=+1]
+//SET
+include::cases/cases-api-set-configuration.asciidoc[leveloffset=+1]
 //UPDATE
 include::cases/cases-api-update.asciidoc[leveloffset=+1]
 include::cases/cases-api-update-comment.asciidoc[leveloffset=+1]
+include::cases/cases-api-update-configuration.asciidoc[leveloffset=+1]
diff --git a/docs/api/cases/cases-api-add-comment.asciidoc b/docs/api/cases/cases-api-add-comment.asciidoc
index 20b558a89c683..df63cc0ecd65f 100644
--- a/docs/api/cases/cases-api-add-comment.asciidoc
+++ b/docs/api/cases/cases-api-add-comment.asciidoc
@@ -6,21 +6,20 @@
 
 Adds a comment to a case.
 
-=== Request
+=== {api-request-title}
 
 `POST <kibana host>:<port>/api/cases/<case_id>/comments`
 
 `POST <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/comments`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `all` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the case you're updating.
 
-
-=== Path parameters
+=== {api-path-parms-title}
 
 `<case_id>`::
 (Required,string) The identifier for the case. To retrieve case IDs, use
@@ -30,7 +29,7 @@ You must have `all` privileges for the *Cases* feature in the *Management*,
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Request body
+=== {api-request-body-title}
 
 `alertId`::
 (Required*, string) The alert identifier. It is required only when `type` is
@@ -65,12 +64,12 @@ only when `type` is `alert`. preview:[]
 `type`::
 (Required, string) The comment type, which must be `user` or `alert`.
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Add a comment to case ID `293f1bc0-74f6-11ea-b83a-553aecdb28b6`:
 
diff --git a/docs/api/cases/cases-api-create.asciidoc b/docs/api/cases/cases-api-create.asciidoc
index f08b69998321f..b7a97fc9cb1b2 100644
--- a/docs/api/cases/cases-api-create.asciidoc
+++ b/docs/api/cases/cases-api-create.asciidoc
@@ -6,26 +6,26 @@
 
 Creates a case.
 
-=== Request
+=== {api-request-title}
 
 `POST <kibana host>:<port>/api/cases`
 
 `POST <kibana host>:<port>/s/<space_id>/api/cases`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `all` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the case you're creating.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Request body
+=== {api-request-body-title}
 
 `connector`::
 (Required, object) An object that contains the connector configuration.
@@ -107,8 +107,8 @@ For {swimlane} connectors, specify:
 
 `id`::
 (Required, string) The identifier for the connector. To create a case without a
-connector, use `none`.
-//To retrieve connector IDs, use <<cases-api-find-connectors>>).
+connector, use `none`. To retrieve connector IDs, use
+<<cases-api-find-connectors>>.
 
 `name`::
 (Required, string) The name of the connector. To create a case without a
@@ -147,12 +147,12 @@ categorize cases. It can be an empty array.
 `title`::
 (Required, string) A title for the case.
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 [source,sh]
 --------------------------------------------------
diff --git a/docs/api/cases/cases-api-delete-cases.asciidoc b/docs/api/cases/cases-api-delete-cases.asciidoc
index 5e4436806f14f..05e9fe3e2898c 100644
--- a/docs/api/cases/cases-api-delete-cases.asciidoc
+++ b/docs/api/cases/cases-api-delete-cases.asciidoc
@@ -6,26 +6,26 @@
 
 Deletes one or more cases.
 
-=== Request
+=== {api-request-title}
 
 `DELETE <kibana host>:<port>/api/cases?ids=["<case ID1>","<case ID2>"]`
 
 `DELETE <kibana host>:<port>/s/<space_id>/api/cases?ids=["<case ID1>","<case ID2>"]`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `all` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're deleting.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Query parameters
+=== {api-query-parms-title}
 
 `ids`::
 (Required, string) The cases that you want to remove. To retrieve case IDs, use
@@ -33,12 +33,12 @@ default space is used.
 +
 NOTE: All non-ASCII characters must be URL encoded.
 
-==== Response code
+=== {api-response-codes-title}
 
 `204`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Delete cases with these IDs:
 
diff --git a/docs/api/cases/cases-api-delete-comments.asciidoc b/docs/api/cases/cases-api-delete-comments.asciidoc
index 0b02786e6659d..c89407fb69ab8 100644
--- a/docs/api/cases/cases-api-delete-comments.asciidoc
+++ b/docs/api/cases/cases-api-delete-comments.asciidoc
@@ -6,7 +6,7 @@
 
 Deletes one or all comments from a case.
 
-=== Request
+=== {api-request-title}
 
 `DELETE <kibana host>:<port>/api/cases/<case_id>/comments`
 
@@ -16,14 +16,14 @@ Deletes one or all comments from a case.
 
 `DELETE <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/comments/<comment_id>`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `all` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're updating.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<case_id>`::
 (Required, string) The identifier for the case. To retrieve case IDs, use
@@ -38,12 +38,12 @@ comments are deleted.
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Response code
+=== {api-response-codes-title}
 
 `204`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Delete all comments from case ID `9c235210-6834-11ea-a78c-6ffb38a34414`:
 
diff --git a/docs/api/cases/cases-api-find-cases.asciidoc b/docs/api/cases/cases-api-find-cases.asciidoc
index b6e87ad502d21..abd4e186ff706 100644
--- a/docs/api/cases/cases-api-find-cases.asciidoc
+++ b/docs/api/cases/cases-api-find-cases.asciidoc
@@ -6,26 +6,26 @@
 
 Retrieves a paginated subset of cases.
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/_find`
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/_find`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're seeking.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Query parameters
+=== {api-query-parms-title}
 
 `defaultSearchOperator`::
 (Optional, string) The default operator to use for the `simple_query_string`.
@@ -84,12 +84,12 @@ Defaults to `desc`.
 `to`::
 (Optional, string) Returns only cases that were created before a specific date. The date must be specified as a <<kuery-query,KQL>> data range or date match expression.  preview:[]
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Retrieve the first five cases with the `phishing` tag, in ascending order by
 last update time:
diff --git a/docs/api/cases/cases-api-find-connectors.asciidoc b/docs/api/cases/cases-api-find-connectors.asciidoc
index 8643d569c980b..0a1554cfde4f8 100644
--- a/docs/api/cases/cases-api-find-connectors.asciidoc
+++ b/docs/api/cases/cases-api-find-connectors.asciidoc
@@ -10,30 +10,30 @@ In particular, only the connectors that are supported for use in cases are
 returned. Refer to the list of supported external incident management systems in
 <<add-case-connectors>>.
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/configure/connectors/_find`
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/configure/connectors/_find`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Actions and Connectors* feature in the
 *Management* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 [source,sh]
 --------------------------------------------------
diff --git a/docs/api/cases/cases-api-get-alerts.asciidoc b/docs/api/cases/cases-api-get-alerts.asciidoc
new file mode 100644
index 0000000000000..7df81f3a8974c
--- /dev/null
+++ b/docs/api/cases/cases-api-get-alerts.asciidoc
@@ -0,0 +1,60 @@
+[[cases-api-get-alerts]]
+== Get alerts attached to case API
+++++
+<titleabbrev>Get alerts</titleabbrev>
+++++
+
+preview::[]
+
+Gets all alerts attached to a case.
+
+=== {api-request-title}
+
+`GET <kibana host>:<port>/api/cases/<case_id>/alerts`
+
+`GET <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/alerts`
+
+=== {api-prereq-title}
+
+You must have `read` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the cases you're seeking.
+
+=== {api-path-parms-title}
+
+`<case_id>`::
+(Required, string) The identifier for the case. To retrieve case IDs, use
+<<cases-api-find-cases>>.
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-examples-title}
+
+Return all alerts attached to case `293f1bc0-74f6-11ea-b83a-553aecdb28b6`:
+
+[source,sh]
+--------------------------------------------------
+GET api/cases/293f1bc0-74f6-11ea-b83a-553aecdb28b6/alerts
+--------------------------------------------------
+// KIBANA
+
+The API returns a JSON array listing the alerts. For example:
+
+[source,json]
+--------------------------------------------------
+[
+   {
+      "id": "09f0c261e39e36351d75995b78bb83673774d1bc2cca9df2d15f0e5c0a99a540",
+      "index": ".internal.alerts-security.alerts-default-000001",
+      "attached_at": "2022-04-13T21:35:24.602Z"
+   }
+]
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-get-case-activity.asciidoc b/docs/api/cases/cases-api-get-case-activity.asciidoc
index 92b16b7862462..25d102dc11ee7 100644
--- a/docs/api/cases/cases-api-get-case-activity.asciidoc
+++ b/docs/api/cases/cases-api-get-case-activity.asciidoc
@@ -8,20 +8,20 @@ Returns all user activity for the specified case.
 
 deprecated::[8.1.0]
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/<case ID>/user_actions`
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/<case ID>/user_actions`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're seeking.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<case_id>`::
 (Required, string) An identifier for the case to retrieve. Use 
@@ -31,12 +31,12 @@ You must have `read` privileges for the *Cases* feature in the *Management*,
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-==== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-==== Example
+=== {api-examples-title}
 
 Gets all activity for case ID `a18b38a0-71b0-11ea-a0b2-c51ea50a58e2`:
 
diff --git a/docs/api/cases/cases-api-get-case.asciidoc b/docs/api/cases/cases-api-get-case.asciidoc
index 6bd255f6f8326..5abb9ecc1903b 100644
--- a/docs/api/cases/cases-api-get-case.asciidoc
+++ b/docs/api/cases/cases-api-get-case.asciidoc
@@ -6,20 +6,20 @@
 
 Returns a specified case.
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/<case ID>`
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/<case ID>`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're seeking.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<case_id>`::
 (Required, string) An identifier for the case to retrieve. Use 
@@ -29,19 +29,18 @@ You must have `read` privileges for the *Cases* feature in the *Management*,
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Query parameters
+=== {api-query-parms-title}
 
 `includeComments`::
 (Optional, boolean) Determines whether case comments are returned. Defaults to 
 `true`. deprecated:[8.1.0, "The `includeComments` query parameter is deprecated and will be removed in a future release."]
 
-
-==== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-==== Example
+=== {api-examples-title}
 
 Returns case ID `a18b38a0-71b0-11ea-a0b2-c51ea50a58e2` without comments:
 
diff --git a/docs/api/cases/cases-api-get-cases-by-alert.asciidoc b/docs/api/cases/cases-api-get-cases-by-alert.asciidoc
new file mode 100644
index 0000000000000..3bd2e8debb3cd
--- /dev/null
+++ b/docs/api/cases/cases-api-get-cases-by-alert.asciidoc
@@ -0,0 +1,72 @@
+[[cases-api-get-cases-by-alert]]
+== Get cases by alert API
+++++
+<titleabbrev>Get cases by alert</titleabbrev>
+++++
+
+preview::[]
+
+Returns the cases associated with a specific alert.
+
+=== {api-request-title}
+
+`GET <kibana host>:<port>/api/cases/alerts/<alert_id>`
+
+`GET <kibana host>:<port>/s/<space_id>/api/cases/alerts/<alert_id>`
+
+=== {api-prereq-title}
+
+You must have `read` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the cases you're seeking.
+
+=== {api-path-parms-title}
+
+`<alert_id>`::
+(Required, string) The alert identifier.
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-query-parms-title}
+
+`owner`::
+(Optional, string or array of strings) A filter to limit the retrieved cases to
+a specific set of applications. Valid values are: `cases`, `observability`,
+and `securitySolution`. If this parameter is omitted, the response contains all
+cases that the user has access to read.
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-examples-title}
+
+Return cases associated with the alert ID
+`09f0c261e39e36351d75995b78bb83673774d1bc2cca9df2d15f0e5c0a99a540`:
+
+[source,sh]
+--------------------------------------------------
+GET api/cases/alerts/09f0c261e39e36351d75995b78bb83673774d1bc2cca9df2d15f0e5c0a99a540
+--------------------------------------------------
+// KIBANA
+
+The API returns a JSON array containing the identifier and title of the cases.
+For example:
+
+[source,json]
+--------------------------------------------------
+[
+    {
+        "id": "8af6ac20-74f6-11ea-b83a-553aecdb28b6",
+        "title": "Case 1"
+    },
+    {
+        "id": "a18b38a0-71b0-11ea-a0b2-c51ea50a58e2",
+        "title": "Case 2"
+    }
+]
+--------------------------------------------------
\ No newline at end of file
diff --git a/docs/api/cases/cases-api-get-comments.asciidoc b/docs/api/cases/cases-api-get-comments.asciidoc
index 6e88b6ffdf004..103731cd04dd7 100644
--- a/docs/api/cases/cases-api-get-comments.asciidoc
+++ b/docs/api/cases/cases-api-get-comments.asciidoc
@@ -6,7 +6,7 @@
 
 Gets a comment or all comments for a case.
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/<case ID>/comments/<comment ID>`
 
@@ -16,14 +16,14 @@ Gets a comment or all comments for a case.
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/comments` deprecated:[8.1.0]
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases with the comments you're seeking.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<case_id>`::
 (Required, string) The identifier for the case. To retrieve case IDs, use 
@@ -40,12 +40,12 @@ deprecated:[8.1.0,The comment identifier will no longer be optional.]
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Retrieves comment ID `71ec1870-725b-11ea-a0b2-c51ea50a58e2` from case ID
 `a18b38a0-71b0-11ea-a0b2-c51ea50a58e2`:
diff --git a/docs/api/cases/cases-api-get-configuration.asciidoc b/docs/api/cases/cases-api-get-configuration.asciidoc
new file mode 100644
index 0000000000000..778e95949e3f5
--- /dev/null
+++ b/docs/api/cases/cases-api-get-configuration.asciidoc
@@ -0,0 +1,95 @@
+[[cases-get-configuration]]
+== Get case configuration API
+++++
+<titleabbrev>Get configuration</titleabbrev>
+++++
+
+Retrieves external connection details, such as the closure type and
+default connector for cases.
+
+=== {api-request-title}
+
+`GET <kibana host>:<port>/api/cases/configure`
+
+`GET <kibana host>:<port>/s/<space_id>/api/cases/configure`
+
+=== {api-prereq-title}
+
+You must have `read` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the case configuration.
+
+=== {api-path-parms-title}
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-query-parms-title}
+
+`owner`::
+(Optional, string or array of strings) A filter to limit the retrieved
+details to a specific set of applications. Valid values are: `cases`,
+`observability`, and `securitySolution`. If this parameter is omitted, the
+response contains information for all applications that the user has access to
+read.
+
+=== Response code
+
+`200`::
+   Indicates a successful call.
+
+=== Example
+
+[source,sh]
+--------------------------------------------------
+GET api/cases/configure?owner=securitySolution
+--------------------------------------------------
+// KIBANA
+
+The API returns the following type of information:
+
+[source,json]
+--------------------------------------------------
+[
+  {
+    "owner": "securitySolution",
+    "closure_type": "close-by-user",
+    "created_at": "2020-03-30T13:31:38.083Z",
+    "created_by": {
+      "email": "admin@hms.gov.uk",
+      "full_name": "Mr Admin",
+      "username": "admin"
+    },
+    "updated_at": null,
+    "updated_by": null,
+    "connector": {
+      "id": "131d4448-abe0-4789-939d-8ef60680b498",
+      "name": "my-jira",
+      "type": ".jira",
+      "fields": null
+    },
+    "mappings": [
+      {
+        "source": "title", 
+        "target": "summary",
+        "action_type": "overwrite"
+      },
+      {
+        "source": "description", 
+        "target": "description",
+        "action_type": "overwrite"
+      },
+      {
+        "source": "comments", 
+        "target": "comments",
+        "action_type": "append"
+      }
+    ],
+    "version": "WzE3NywxXQ==",
+    "error": null,
+    "id": "7349772f-421a-4de3-b8bb-2d9b22ccee30"
+  }
+]
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-get-reporters.asciidoc b/docs/api/cases/cases-api-get-reporters.asciidoc
index eca8d3e45173f..331be71e9123a 100644
--- a/docs/api/cases/cases-api-get-reporters.asciidoc
+++ b/docs/api/cases/cases-api-get-reporters.asciidoc
@@ -6,32 +6,32 @@
 
 Returns information about the users who opened cases.
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/reporters`
 
 `GET <kibana host>:<port>/s/api/cases/reporters`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're seeking.
 
-=== Query parameters
+=== {api-query-parms-title}
 
 `owner`::
 (Optional, string or array of strings) A filter to limit the retrieved reporters 
 to a specific set of applications. If this parameter is omitted, the response 
 will contain all reporters from cases that the user has access to read.
 
-==== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-==== Example
+=== {api-examples-title}
 
 Returns all case reporters:
 
diff --git a/docs/api/cases/cases-api-get-status.asciidoc b/docs/api/cases/cases-api-get-status.asciidoc
index 62a8181feba8e..f96747dcc1116 100644
--- a/docs/api/cases/cases-api-get-status.asciidoc
+++ b/docs/api/cases/cases-api-get-status.asciidoc
@@ -8,26 +8,26 @@ Returns the number of cases that are open, closed, and in progress.
 
 deprecated::[8.1.0]
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/status`
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/status`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're seeking.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 <space_id>::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Query parameters
+=== {api-query-parms-title}
 
 `owner`::
 (Optional, string or array of strings) A filter to limit the retrieved case
@@ -35,12 +35,12 @@ statistics to a specific set of applications. Valid values are: `cases`,
 `observability`, and `securitySolution`. If this parameter is omitted, the
 response contains all cases that the user has access to read.
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 [source,sh]
 --------------------------------------------------
diff --git a/docs/api/cases/cases-api-get-tags.asciidoc b/docs/api/cases/cases-api-get-tags.asciidoc
index 426a7e91a0f47..5008411f37bdb 100644
--- a/docs/api/cases/cases-api-get-tags.asciidoc
+++ b/docs/api/cases/cases-api-get-tags.asciidoc
@@ -4,46 +4,40 @@
 <titleabbrev>Get tags</titleabbrev>
 ++++
 
-Aggregates and returns all unique tags from all cases.
+Aggregates and returns a list of case tags.
 
-=== Request
+=== {api-request-title}
 
 `GET <kibana host>:<port>/api/cases/tags`
 
 `GET <kibana host>:<port>/s/<space_id>/api/cases/tags`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `read` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're seeking.
 
-=== Path parameters
-
-`<case_id>`::
-(Required, string) An identifier for the case to retrieve. Use 
-<<cases-api-find-cases>> to retrieve case IDs.
+=== {api-path-parms-title}
 
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Query parameters
+=== {api-query-parms-title}
 
 `owner`::
-(Optional, string or array of strings) Specifies the set of applications to 
-limit the retrieved tags. If not specified, the response contains all tags from 
-cases that the user has access to read.
+(Optional, string or array of strings) A filter to limit the retrieved tags to a specific set of applications.
+Valid values are: `cases`, `observability`, and `securitySolution`. If this parameter is omitted, the response
+contains tags from all cases that the user has access to read.
 
-==== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-==== Example
-
-Gets all tags for all cases:
+=== {api-examples-title}
 
 [source,sh]
 --------------------------------------------------
@@ -51,8 +45,7 @@ GET api/cases/tags
 --------------------------------------------------
 // KIBANA
 
-The API returns a JSON object with the names and email addresses of users who 
-opened cases. For example: 
+The API returns a JSON object with tags from all the cases that the user has access to read. For example: 
 
 [source,json]
 --------------------------------------------------
@@ -62,4 +55,4 @@ opened cases. For example:
   "social engineering",
   "bubblegum"
 ]
---------------------------------------------------
\ No newline at end of file
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-push.asciidoc b/docs/api/cases/cases-api-push.asciidoc
new file mode 100644
index 0000000000000..5b3e4d7c9ef78
--- /dev/null
+++ b/docs/api/cases/cases-api-push.asciidoc
@@ -0,0 +1,110 @@
+[[cases-api-push]]
+== Push case API
+++++
+<titleabbrev>Push case</titleabbrev>
+++++
+
+Pushes a case to an external service.
+
+=== {api-request-title}
+
+`POST <kibana host>:<port>/api/cases/<case_id>/connector/<connector_id>/_push`
+
+`POST <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/connector/<connector_id>/_push`
+
+=== {api-prereq-title}
+
+You must have `all` privileges for the *Actions and Connectors* feature in the
+*Management* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>. You must also have `all`
+privileges for the *Cases* feature in the *Management*, *{observability}*, or
+*Security* section of the {kib} feature privileges, depending on the
+`owner` of the case you're pushing.
+
+=== {api-path-parms-title}
+
+`<case_id>`::
+(Required, string) The identifier for the case. To retrieve case IDs, use
+<<cases-api-find-cases>>.
+
+`<connector_id>`::
+(Required, string) The identifier for the connector. To retrieve connector IDs,
+use <<cases-api-find-connectors>>.
+
+<space_id>::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-examples-title}
+
+Push the case to an external service:
+
+[source,sh]
+--------------------------------------------------
+POST api/cases/7349772f-421a-4de3-b8bb-2d9b22ccee30/connector/abed3a70-71bd-11ea-a0b2-c51ea50a58e2/_push
+{}
+--------------------------------------------------
+// KIBANA
+
+The API returns a JSON object representing the pushed case. For example:
+
+[source,json]
+--------------------------------------------------
+{
+  "id": "a18b38a0-71b0-11ea-a0b2-c51ea50a58e2",
+  "version": "Wzk4LDFd",
+  "comments": [],
+  "totalComment": 0,
+  "totalAlerts": 0,
+  "title": "This case will self-destruct in 5 seconds",
+  "tags": [ "phishing", "social engineering", "bubblegum" ],
+  "description": "James Bond clicked on a highly suspicious email banner advertising cheap holidays for underpaid civil servants. Operation bubblegum is active. Repeat - operation bubblegum is now active!",
+  "settings": {
+    "syncAlerts": true
+  },
+  "owner": "securitySolution",
+  "closed_at": null,
+  "closed_by": null,
+  "created_at": "2022-03-29T11:30:02.658Z",
+  "created_by": {
+    "email": "ahunley@imf.usa.gov",
+    "full_name": "Alan Hunley",
+    "username": "ahunley"
+  },
+  "status": "open",
+  "updated_at": "2022-03-29T12:01:50.244Z",
+  "updated_by": {
+    "full_name": "Classified",
+    "email": "classified@hms.oo.gov.uk",
+    "username": "M"
+  },
+  "connector": {
+    "id": "08046500-bb7b-11ec-89c3-ef74ed34b2e9",
+    "name": "My connector",
+    "type": ".jira",
+    "fields": {
+      "issueType": "10006",
+      "priority": "High",
+      "parent": null
+    }
+  },
+  "external_service": {
+    "pushed_at":"2022-07-26T18:19:43.688Z",
+    "pushed_by":{
+        "username":"classified@hms.oo.gov.uk",
+        "full_name":null,
+        "email":null
+    },
+    "connector_name":"My connector",
+    "external_id":"10110",
+    "external_title":"TPN-103",
+    "external_url":"https://cases.jira.com",
+    "connector_id":"08046500-bb7b-11ec-89c3-ef74ed34b2e9",
+  }
+}
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-set-configuration.asciidoc b/docs/api/cases/cases-api-set-configuration.asciidoc
new file mode 100644
index 0000000000000..6a7a7c26c66d2
--- /dev/null
+++ b/docs/api/cases/cases-api-set-configuration.asciidoc
@@ -0,0 +1,163 @@
+[[cases-api-set-configuration]]
+== Set case configuration API
+++++
+<titleabbrev>Set configuration</titleabbrev>
+++++
+
+Sets external connection details, such as the closure type and
+default connector for cases.
+
+=== {api-request-title}
+
+`POST <kibana host>:<port>/api/cases/configure`
+
+`POST <kibana host>:<port>/s/<space_id>/api/cases/configure`
+
+=== {api-prereq-title}
+
+You must have `all` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the case configuration.
+
+=== {api-description-title}
+
+Connectors are used to interface with external systems. You must create a
+connector before you can use it in your cases. Refer to <<add-case-connectors>>.
+
+If you set a default connector, it is automatically selected when you create
+cases in {kib}. If you use the <<cases-api-create,create case API>>, however,
+you must still specify all of the connector details.
+
+=== {api-path-parms-title}
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-request-body-title}
+
+`closure_type`::
+(Required, string) Specifies whether a case is automatically closed when it is
+pushed to external systems.
++
+--
+Valid values are:
+
+* `close-by-pushing`: Cases are automatically closed when they are pushed.
+* `close-by-user`: Cases are not automatically closed.
+--
+
+`connector`::
+(Required, object) An object that contains the connector configuration.
++
+.Properties of `connector`
+[%collapsible%open]
+====
+`fields`::
+(Required, object) An object that contains the connector fields.
++
+--
+TIP: The fields specified in the case configuration are not used and are not
+propagated to individual cases, therefore it is recommended to set it to `null`.
+--
+
+`id`::
+(Required, string) The identifier for the connector. If you do not want a
+default connector, use `none`. To retrieve connector IDs, use
+<<cases-api-find-connectors>>.
+
+`name`::
+(Required, string) The name of the connector. If you do not want a default
+connector, use `none`. To retrieve connector names, use
+<<cases-api-find-connectors>>.
+
+`type`::
+(Required, string) The type of the connector. Valid values are: `.jira`, `.none`,
+`.resilient`,`.servicenow`, `.servicenow-sir`, and `.swimlane`.
+====
+
+`owner`::
+(Required, string) The application that owns the case configuration. Valid
+values are: `cases`, `observability`, or `securitySolution`. This value affects
+whether you're setting case configuration details for {stack-manage-app},
+{observability}, or {security-app}.
+
+`settings`::
+(Optional, object)
+An object that contains the case settings.
++
+.Properties of `settings`
+[%collapsible%open]
+====
+`syncAlerts`:: 
+(Required, boolean) Turns alert syncing on or off.
+====
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-examples-title}
+
+Sets the closure type and default connector for cases in **{stack-manage-app}**:
+
+[source,sh]
+--------------------------------------------------
+POST api/cases/configure
+{
+  "owner": "cases",
+  "connector": {
+    "id": "131d4448-abe0-4789-939d-8ef60680b498",
+    "name": "my-serviceNow",
+    "type": ".servicenow",
+    "fields": null,
+  },
+  "closure_type": "close-by-user"
+}
+--------------------------------------------------
+
+The API returns the following response:
+
+[source,json]
+--------------------------------------------------
+{
+  "owner": "cases",
+  "closure_type": "close-by-user",
+  "created_at": "2022-04-02T01:09:02.303Z",
+  "created_by": {
+    "email": "moneypenny@hms.gov.uk",
+    "full_name": "Ms Moneypenny",
+    "username": "moneypenny"
+  },
+  "updated_at": null,
+  "updated_by": null,
+  "connector": {
+    "id": "131d4448-abe0-4789-939d-8ef60680b498",
+    "name": "my-serviceNow",
+    "type": ".servicenow",
+    "fields": null,
+  },
+  "mappings": [
+    {
+      "source": "title", 
+      "target": "short_description",
+      "action_type": "overwrite"
+    },
+    {
+      "source":"description",
+      "target":"description",
+      "action_type":"overwrite"
+    },
+    {
+      "source":"comments",
+      "target":"work_notes",
+      "action_type":"append"
+    }
+  ],
+  "version": "WzE3NywxXQ==",
+  "error": null,
+  "id": "7349772f-421a-4de3-b8bb-2d9b22ccee30",
+}
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-update-comment.asciidoc b/docs/api/cases/cases-api-update-comment.asciidoc
index 98d426cb0c86d..020fe403fa7c5 100644
--- a/docs/api/cases/cases-api-update-comment.asciidoc
+++ b/docs/api/cases/cases-api-update-comment.asciidoc
@@ -6,20 +6,20 @@
 
 Updates a comment in a case.
 
-=== Request
+=== {api-request-title}
 
 `PATCH <kibana host>:<port>/api/cases/<case_id>/comments`
 
 `PATCH <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/comments`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `all` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the case you're updating.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<case_id>`::
 The identifier for the case. To retrieve case IDs, use
@@ -29,7 +29,7 @@ The identifier for the case. To retrieve case IDs, use
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Request body
+=== {api-request-body-title}
 
 `alertId`::
 (Required*, string) The identifier for the alert. It is required only when
@@ -40,8 +40,7 @@ default space is used.
 `user`.
 
 `id`::
-(Required, string) The identifier for the comment.
-//To retrieve comment IDs, use <<cases-api-get-all-case-comments>>.
+(Required, string) The identifier for the comment. To retrieve comment IDs, use <<cases-api-get-comments>>.
 
 `index`::
 (Required*, string) The alert index. It is required only when `type` is `alert`.
@@ -75,15 +74,14 @@ The rule that is associated with the alert. It is required only when `type` is
 NOTE: You cannot change the comment type.
 
 `version`::
-(Required, string) The current comment version.
-//To retrieve version values, use <<cases-api-get-all-case-comments>>.
+(Required, string) The current comment version. To retrieve version values, use <<cases-api-get-comments>>.
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Update comment ID `8af6ac20-74f6-11ea-b83a-553aecdb28b6` (associated with case
 ID `293f1bc0-74f6-11ea-b83a-553aecdb28b6`):
diff --git a/docs/api/cases/cases-api-update-configuration.asciidoc b/docs/api/cases/cases-api-update-configuration.asciidoc
new file mode 100644
index 0000000000000..cf7d2ea7d8cfd
--- /dev/null
+++ b/docs/api/cases/cases-api-update-configuration.asciidoc
@@ -0,0 +1,129 @@
+[[cases-api-update-configuration]]
+== Update case configuration API
+++++
+<titleabbrev>Update configuration</titleabbrev>
+++++
+
+Updates external connection details, such as the closure type and default
+connector for cases.
+
+=== {api-request-title}
+
+`PATCH <kibana host>:<port>/api/cases/configure/<configuration_id>`
+
+`PATCH <kibana host>:<port>/s/<space_id>/api/cases/configure/<configuration_id>`
+
+=== {api-prereq-title}
+
+You must have `all` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the case configuration.
+
+=== {api-description-title}
+
+Connectors are used to interface with external systems. You must create a
+connector before you can it in your cases. Refer to <<add-case-connectors>>.
+
+=== {api-path-parms-title}
+
+`<configuration_id>`::
+The identifier for the configuration. To retrieve the configuration IDs, use
+<<cases-get-configuration>>.
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== Request body
+
+`closure_type`::
+(Optional, string) Determines whether a case is automatically closed when it is
+pushed to external systems. Valid values are:
++
+--
+* `close-by-pushing`: Cases are automatically closed when they
+are pushed.
+* `close-by-user`: Cases are not automatically closed.
+--
+
+`connector`::
+(Optional, object) An object that contains the connector configuration.
++
+.Properties of `connector`
+[%collapsible%open]
+====
+`fields`::
+(Required, object) An object that contains the connector fields.
++
+--
+TIP: The fields specified in the case configuration are not used and are not
+propagated to individual cases, therefore it is recommended to set it to `null`.
+--
+
+`id`::
+(Required, string) The identifier for the connector. To retrieve connector IDs,
+use <<cases-api-find-connectors>>.
+
+`name`::
+(Required, string) The name of the connector.
+
+`type`::
+(Required, string) The type of the connector. Valid values are: `.servicenow`,
+`.servicenow-sir`, `.jira`, `.resilient`, `.swimlane`, and `.none`.
+====
+
+`version`::
+(Required, string) The version of the connector. To retrieve the version value,
+use <<cases-get-configuration>>.
+
+=== Response code
+
+`200`::
+   Indicates a successful call.
+
+=== Example
+
+Change the closure type configuration option:
+
+[source,sh]
+--------------------------------------------------
+PATCH api/cases/configure/3297a0f0-b5ec-11ec-b141-0fdb20a7f9a9
+{
+  "closure_type": "close-by-pushing",
+  "version": "WzIwMiwxXQ=="
+}
+--------------------------------------------------
+// KIBANA
+
+The API returns the following:
+
+[source,json]
+--------------------------------------------------
+{
+  "closure_type": "close-by-user",
+  "owner": "cases",
+  "created_at": "2022-04-06T20:57:40.746Z",
+  "created_by": {
+    "email": "admin@hms.gov.uk",
+    "full_name": "Ms Admin",
+    "username": "admin"
+  },
+  "updated_at": "2022-04-12T22:41:09.262Z",
+  "updated_by": {
+    "email": "admin@hms.gov.uk",
+    "full_name": "Ms Admin",
+    "username": "admin"
+  },
+  "connector": {
+    "id": "none",
+    "name": "none",
+    "type": ".none",
+    "fields": null
+    },
+  "mappings": [],
+  "version": "WzkwNiw1XQ==",
+  "error": null,
+  "id": "3297a0f0-b5ec-11ec-b141-0fdb20a7f9a9"
+}
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-update.asciidoc b/docs/api/cases/cases-api-update.asciidoc
index 522300591d8b7..7a63d0e8a6a33 100644
--- a/docs/api/cases/cases-api-update.asciidoc
+++ b/docs/api/cases/cases-api-update.asciidoc
@@ -6,26 +6,26 @@
 
 Updates one or more cases.
 
-=== Request
+=== {api-request-title}
 
 `PATCH <kibana host>:<port>/api/cases`
 
 `PATCH <kibana host>:<port>/s/<space_id>/api/cases`
 
-=== Prerequisite
+=== {api-prereq-title}
 
 You must have `all` privileges for the *Cases* feature in the *Management*,
 *{observability}*, or *Security* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>, depending on the
 `owner` of the cases you're updating.
 
-=== Path parameters
+=== {api-path-parms-title}
 
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
 
-=== Request body
+=== {api-request-body-title}
 
 `cases`::
 (Required, array of objects) Array containing one or more case objects.
@@ -114,8 +114,7 @@ For {swimlane} connectors, specify:
 
 `id`::
 (Required, string) The identifier for the connector. To remove the connector,
-use `none`.
-//To retrieve connector IDs, use <<cases-api-find-connectors>>).
+use `none`. To retrieve connector IDs, use <<cases-api-find-connectors>>).
 
 `name`::
 (Required, string) The name of the connector. To remove the connector, use
@@ -159,12 +158,12 @@ and `open`.
 (Required, string) The current version of the case. To determine this value, use <<cases-api-get-case>> or <<cases-api-find-cases>>.
 ====
 
-=== Response code
+=== {api-response-codes-title}
 
 `200`::
    Indicates a successful call.
 
-=== Example
+=== {api-examples-title}
 
 Update the description, tags, and connector of case ID
 `a18b38a0-71b0-11ea-a0b2-c51ea50a58e2`:
diff --git a/docs/api/data-views/update-fields.asciidoc b/docs/api/data-views/update-fields.asciidoc
index babe689ce6b23..3ec4b7c84694a 100644
--- a/docs/api/data-views/update-fields.asciidoc
+++ b/docs/api/data-views/update-fields.asciidoc
@@ -49,7 +49,7 @@ Set popularity `count` for field `foo`:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view/fields
+$ curl -X POST api/data_views/data-view/my-view/fields
 {
     "fields": {
         "foo": {
@@ -64,7 +64,7 @@ Update multiple metadata fields in one request:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view/fields
+$ curl -X POST api/data_views/data-view/my-view/fields
 {
     "fields": {
         "foo": {
@@ -82,7 +82,7 @@ $ curl -X POST api/saved_objects/data-view/my-view/fields
 Use `null` value to delete metadata:
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-pattern/fields
+$ curl -X POST api/data_views/data-view/my-pattern/fields
 {
     "fields": {
         "foo": {
diff --git a/docs/api/data-views/update.asciidoc b/docs/api/data-views/update.asciidoc
index b86a13682cb0b..c1473b8f7079b 100644
--- a/docs/api/data-views/update.asciidoc
+++ b/docs/api/data-views/update.asciidoc
@@ -61,7 +61,7 @@ Update a title of the `<my-view>` data view:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view
+$ curl -X POST api/data_views/data-view/my-view
 {
   "data_view": {
     "title": "some-other-view-*"
@@ -74,7 +74,7 @@ Customize the update behavior:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view
+$ curl -X POST api/data_views/data-view/my-view
 {
   "refresh_fields": true,
   "data_view": {
@@ -89,7 +89,7 @@ All update fields are optional, but you can specify the following fields:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view
+$ curl -X POST api/data_views/data-view/my-view
 {
   "data_view": {
     "title": "...",
diff --git a/docs/api/index-patterns/update-fields.asciidoc b/docs/api/index-patterns/update-fields.asciidoc
index e3ac304745f39..e2655d557e929 100644
--- a/docs/api/index-patterns/update-fields.asciidoc
+++ b/docs/api/index-patterns/update-fields.asciidoc
@@ -46,7 +46,7 @@ Set popularity `count` for field `foo`:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
+$ curl -X POST api/index_patterns/index-pattern/my-pattern/fields
 {
     "fields": {
         "foo": {
@@ -61,7 +61,7 @@ Update multiple metadata fields in one request:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
+$ curl -X POST api/index_patterns/index-pattern/my-pattern/fields
 {
     "fields": {
         "foo": {
@@ -79,7 +79,7 @@ $ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
 Use `null` value to delete metadata:
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
+$ curl -X POST api/index_patterns/index-pattern/my-pattern/fields
 {
     "fields": {
         "foo": {
diff --git a/docs/api/index-patterns/update.asciidoc b/docs/api/index-patterns/update.asciidoc
index 366afd336d15a..64479f00ef5c5 100644
--- a/docs/api/index-patterns/update.asciidoc
+++ b/docs/api/index-patterns/update.asciidoc
@@ -58,7 +58,7 @@ Update a title of the `<my-pattern>` index pattern:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST api/index_patterns/index-pattern/my-pattern
 {
   "index_pattern": {
     "title": "some-other-pattern-*"
@@ -71,7 +71,7 @@ Customize the update behavior:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST api/index_patterns/index-pattern/my-pattern
 {
   "refresh_fields": true,
   "index_pattern": {
@@ -86,7 +86,7 @@ All update fields are optional, but you can specify the following fields:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST api/index_patterns/index-pattern/my-pattern
 {
   "index_pattern": {
     "title": "...",
diff --git a/docs/api/machine-learning/sync.asciidoc b/docs/api/machine-learning/sync.asciidoc
index 5f19bc17ab2fb..ba7e98a12dde6 100644
--- a/docs/api/machine-learning/sync.asciidoc
+++ b/docs/api/machine-learning/sync.asciidoc
@@ -4,32 +4,42 @@
 <titleabbrev>Sync {ml} saved objects</titleabbrev>
 ++++
 
-Synchronizes {kib} saved objects for {ml} jobs.
+Synchronizes {kib} saved objects for {ml} jobs and trained models.
 
 [[machine-learning-api-sync-request]]
-==== Request
+==== {api-request-title}
 
 `GET <kibana host>:<port>/api/ml/saved_objects/sync`
 
 `GET <kibana host>:<port>/s/<space_id>/api/ml/saved_objects/sync`
 
+[[machine-learning-api-sync-prereq]]
+==== {api-prereq-title}
+
+You must have `all` privileges for the *Machine Learning* feature in the *Analytics* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>.
+
+[[machine-learning-api-sync-desc]]
+==== {api-description-title}
+
+This API runs automatically when you start {kib} and periodically thereafter.
 
 [[machine-learning-api-sync-path-params]]
-==== Path parameters
+==== {api-path-parms-title}
 
 `space_id`::
 (Optional, string) An identifier for the space. If `space_id` is not provided in
 the URL the default space is used.
 
 [[machine-learning-api-sync-query-params]]
-==== Query parameters
+==== {api-query-parms-title}
 
 `simulate`::
 (Optional, boolean) When `true`, simulates the synchronization by only returning
 the list actions that _would_ be performed.
 
 [[machine-learning-api-sync-response-body]]
-==== Response body
+==== {api-response-body-title}
 
 `datafeedsAdded`::
 (array) If a saved object for an {anomaly-job} is missing a {dfeed} identifier,
@@ -42,23 +52,23 @@ deleted. This list contains the {dfeed} identifiers and indicates whether the
 synchronization was successful.
 
 `savedObjectsCreated`::
-(array) If saved objects are missing for {ml} jobs, they are created. This
-list contains the job identifiers and indicates whether the synchronization was
-successful.
+(array) If saved objects are missing for {ml} jobs or trained models, they are
+created. This list contains the job and model identifiers and indicates whether
+the synchronization was successful.
 
 `savedObjectsDeleted`::
-(array) If saved objects exist for jobs that no longer exist, they are deleted. 
-This list contains the job identifiers and indicates whether the synchronization
-was successful.
+(array) If saved objects exist for {ml} jobs or trained models that no longer
+exist, they are deleted. This list contains the job and model identifiers and
+indicates whether the synchronization was successful.
 
 [[machine-learning-api-sync-codes]]
-==== Response code
+==== {api-response-codes-title}
 
 `200`::
   Indicates a successful call.
 
 [[machine-learning-api-sync-example]]
-==== Example
+==== {api-examples-title}
 
 Retrieve the list of {ml} saved objects that require synchronization:
 
@@ -68,12 +78,12 @@ $ curl -X GET api/ml/saved_objects/sync?simulate=true
 --------------------------------------------------
 // KIBANA
 
-If there are two jobs and a {dfeed} that need to be synchronized, for example,
-the API returns the following:
+If there are two jobs that need to be synchronized, for example, the API returns
+the following response:
 
 [source,sh]
 --------------------------------------------------
-{{"savedObjectsCreated":{"myjob1":{"success":true},"myjob2":{"success":true}},"savedObjectsDeleted":{},"datafeedsAdded":{},"datafeedsRemoved":{"myfeed3":{"success":true}}}
+{{"savedObjectsCreated":{"anomaly_detector":{"myjob1":{"success":true},"myjob2":{"success":true}}},"savedObjectsDeleted":{},"datafeedsAdded":{},"datafeedsRemoved":{}}
 --------------------------------------------------
 
 To perform the synchronization, re-run the API and omit the `simulate` parameter.
\ No newline at end of file
diff --git a/docs/api/saved-objects/create.asciidoc b/docs/api/saved-objects/create.asciidoc
index d250b0602adb7..73339946ea0c0 100644
--- a/docs/api/saved-objects/create.asciidoc
+++ b/docs/api/saved-objects/create.asciidoc
@@ -72,7 +72,7 @@ used to specify a single space, and the "All spaces" identifier (`'*'`) is not a
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern  -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
+$ curl -X POST api/index_patterns/index-pattern/my-pattern  -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
 {
   "attributes": {
     "title": "my-pattern-*"
diff --git a/docs/api/saved-objects/delete.asciidoc b/docs/api/saved-objects/delete.asciidoc
index eca46e202beda..6cc31b6563aa3 100644
--- a/docs/api/saved-objects/delete.asciidoc
+++ b/docs/api/saved-objects/delete.asciidoc
@@ -47,6 +47,6 @@ Delete {a-data-source} object with the `my-pattern` ID:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X DELETE api/saved_objects/index-pattern/my-pattern
+$ curl -X DELETE api/index_patterns/index-pattern/my-pattern
 --------------------------------------------------
 // KIBANA
diff --git a/docs/api/saved-objects/get.asciidoc b/docs/api/saved-objects/get.asciidoc
index 174587b400993..3f4b6037cd806 100644
--- a/docs/api/saved-objects/get.asciidoc
+++ b/docs/api/saved-objects/get.asciidoc
@@ -39,7 +39,7 @@ Retrieve the {data-source} object with the `my-pattern` ID:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X GET api/saved_objects/index-pattern/my-pattern
+$ curl -X GET api/index_patterns/index-pattern/my-pattern
 --------------------------------------------------
 // KIBANA
 
diff --git a/docs/api/saved-objects/update.asciidoc b/docs/api/saved-objects/update.asciidoc
index fb7decccabd4c..0559c49625fee 100644
--- a/docs/api/saved-objects/update.asciidoc
+++ b/docs/api/saved-objects/update.asciidoc
@@ -58,7 +58,7 @@ Update an existing {data-source} object,`my-pattern`, with a different title:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X PUT api/saved_objects/index-pattern/my-pattern
+$ curl -X PUT api/index_patterns/index-pattern/my-pattern
 {
   "attributes": {
     "title": "some-other-pattern-*"
diff --git a/docs/concepts/data-views.asciidoc b/docs/concepts/data-views.asciidoc
index 807b829c7481a..f8040d1885907 100644
--- a/docs/concepts/data-views.asciidoc
+++ b/docs/concepts/data-views.asciidoc
@@ -1,11 +1,11 @@
 [[data-views]]
-=== Create a data view
+=== Create a {data-source}
 
-{kib} requires a data view to access the {es} data that you want to explore.
-A data view selects the data to use and allows you to define properties of the fields.
+{kib} requires a {data-source} to access the {es} data that you want to explore.
+A {data-source} selects the data to use and allows you to define properties of the fields.
 
-A data view can point to one or more indices, {ref}/data-streams.html[data stream], or {ref}/alias.html[index aliases].
-For example, a data view can point to your log data from yesterday,
+A {data-source} can point to one or more indices, {ref}/data-streams.html[data streams], or {ref}/alias.html[index aliases].
+For example, a {data-source} can point to your log data from yesterday,
 or all indices that contain your data.
 
 [float]
@@ -15,12 +15,12 @@ or all indices that contain your data.
 * Access to *Data Views* requires the <<kibana-role-management, {kib} privilege>>
 `Data View Management`.
 
-* To create a data view, you must have the <<kibana-role-management,{es} privilege>>
+* To create a {data-source}, you must have the <<kibana-role-management,{es} privilege>>
 `view_index_metadata`.
 
 * If a read-only indicator appears in {kib}, you have insufficient privileges
-to create or save data views. The buttons to create new data views or
-save existing data views are not visible. For more information,
+to create or save {data-sources}. The buttons to create {data-sources} or
+save existing {data-sources} are not visible. For more information,
 refer to <<xpack-security-authorization,Granting access to {kib}>>.
 
 [float]
@@ -29,12 +29,12 @@ refer to <<xpack-security-authorization,Granting access to {kib}>>.
 
 If you collected data using one of the {kib} <<connect-to-elasticsearch,ingest options>>,
 uploaded a file, or added sample data,
-you get a data view for free, and can start exploring your data.
-If you loaded your own data, follow these steps to create a data view.
+you get a {data-source} for free, and can start exploring your data.
+If you loaded your own data, follow these steps to create a {data-source}.
 
 . Open the main menu, then click *Stack Management > Data Views*.
 
-. Click *Create data view*.
+. Click *Create {data-source}*.
 
 . Start typing in the *name* field, and {kib} looks for the names of
 indices, data streams, and aliases that match your input.
@@ -61,21 +61,25 @@ global time filters on your dashboards. This is useful if
 you have multiple time fields and want to create dashboards that combine visualizations
 based on different timestamps.
 
-. Click *Create data view*.
+. To display all indices, click *Show advanced settings*, then select *Allow hidden and system indices*.
+
+. To specify your own {data-source} name, click *Show advanced settings*, then enter the name in the *Custom {data-source} ID* field. For example, enter your {es} index alias name.
+
+. Click *Create {data-source}*.
 +
 [[reload-fields]] {kib} is now configured to use your {es} data. When a new field is added to an index,
-the data view field list is updated
-the next time the data view is loaded, for example, when you load the page or
+the {data-source} field list is updated
+the next time the {data-source} is loaded, for example, when you load the page or
 move between {kib} apps.
 
-. Select this data view when you search and visualize your data.
+. Select this {data-source} when you search and visualize your data.
 
 [float]
 [[rollup-data-view]]
 ==== Create a data view for rolled up data
 
-A data view can match one rollup index.  For a combination rollup
-data view with both raw and rolled up data, use the standard notation:
+A {data-source} can match one rollup index.  For a combination rollup
+{data-source} with both raw and rolled up data, use the standard notation:
 
 ```ts
 rollup_logstash,kibana_sample_data_logs
@@ -130,20 +134,20 @@ To exclude a cluster having a name starting with `cluster_`:
 `cluster_*:logstash-*,cluster_one:-*`
 ```
 
-Once you configure a data view to use the {ccs} syntax, all searches and
-aggregations using that data view in {kib} take advantage of {ccs}.
+Once you configure a {data-source} to use the {ccs} syntax, all searches and
+aggregations using that {data-source} in {kib} take advantage of {ccs}.
 
 [float]
 [[delete-data-view]]
-=== Delete data views
+=== Delete {data-sources}
 
-When you delete a data view, you cannot recover the associated field formatters, runtime fields, source filters,
-and field popularity data. Deleting a data view does not remove any indices or data documents from {es}.
+When you delete a {data-source}, you cannot recover the associated field formatters, runtime fields, source filters,
+and field popularity data. Deleting a {data-source} does not remove any indices or data documents from {es}.
 
-WARNING: Deleting a data view breaks all visualizations, saved searches, and other saved objects that reference the data view.
+WARNING: Deleting a {data-source} breaks all visualizations, saved searches, and other saved objects that reference the data view.
 
 . Open the main menu, then click *Stack Management > Data Views*.
 
-. Click the data view to delete.
+. Click the {data-source} to delete.
 
-. Delete (image:management/index-patterns/images/delete.png[Delete icon]) the data view.
+. Delete (image:management/index-patterns/images/delete.png[Delete icon]) the {data-source}.
diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
index 0216d26023a78..eed060d253a28 100644
--- a/docs/developer/getting-started/monorepo-packages.asciidoc
+++ b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -57,7 +57,6 @@ yarn kbn watch
 - @kbn/analytics
 - @kbn/apm-config-loader
 - @kbn/apm-utils
-- @kbn/babel-code-parser
 - @kbn/babel-preset
 - @kbn/cli-dev-mode
 - @kbn/config
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index e96f1cd819186..90bf3d3c29b41 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -613,6 +613,11 @@ the alertTypes by the Stack in the alerting plugin, register associated HTTP
 routes, etc.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/synthetics/README.md[synthetics]
+|The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
+in their infrastructure.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/task_manager/README.md[taskManager]
 |The task manager is a generic system for running background tasks.
 Documentation: https://www.elastic.co/guide/en/kibana/master/task-manager-production-considerations.html
@@ -648,11 +653,6 @@ As a developer you can reuse and extend built-in alerts and actions UI functiona
 |Upgrade Assistant helps users prepare their Stack for being upgraded to the next major. It will only be enabled on the last minor before the next major release. This is controlled via the config: xpack.upgrade_assistant.readonly (#101296).
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/uptime/README.md[uptime]
-|The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
-in their infrastructure.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
 |NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.md
index 39e14607d861f..2b43bafbede5c 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.md
@@ -19,7 +19,9 @@ export interface SavedObjectReferenceWithContext
 |  [id](./kibana-plugin-core-public.savedobjectreferencewithcontext.id.md) | string | The ID of the referenced object |
 |  [inboundReferences](./kibana-plugin-core-public.savedobjectreferencewithcontext.inboundreferences.md) | Array&lt;{ type: string; id: string; name: string; }&gt; | References to this object; note that this does not contain \_all inbound references everywhere for this object\_, it only contains inbound references for the scope of this operation |
 |  [isMissing?](./kibana-plugin-core-public.savedobjectreferencewithcontext.ismissing.md) | boolean | <i>(Optional)</i> Whether or not this object or reference is missing |
+|  [originId?](./kibana-plugin-core-public.savedobjectreferencewithcontext.originid.md) | string | <i>(Optional)</i> The origin ID of the referenced object (if it has one) |
 |  [spaces](./kibana-plugin-core-public.savedobjectreferencewithcontext.spaces.md) | string\[\] | The space(s) that the referenced object exists in |
 |  [spacesWithMatchingAliases?](./kibana-plugin-core-public.savedobjectreferencewithcontext.spaceswithmatchingaliases.md) | string\[\] | <i>(Optional)</i> The space(s) that legacy URL aliases matching this type/id exist in |
+|  [spacesWithMatchingOrigins?](./kibana-plugin-core-public.savedobjectreferencewithcontext.spaceswithmatchingorigins.md) | string\[\] | <i>(Optional)</i> The space(s) that objects matching this origin exist in (including this one) |
 |  [type](./kibana-plugin-core-public.savedobjectreferencewithcontext.type.md) | string | The type of the referenced object |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.originid.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.originid.md
new file mode 100644
index 0000000000000..418041ea5df60
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.originid.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectReferenceWithContext](./kibana-plugin-core-public.savedobjectreferencewithcontext.md) &gt; [originId](./kibana-plugin-core-public.savedobjectreferencewithcontext.originid.md)
+
+## SavedObjectReferenceWithContext.originId property
+
+The origin ID of the referenced object (if it has one)
+
+<b>Signature:</b>
+
+```typescript
+originId?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.spaceswithmatchingorigins.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.spaceswithmatchingorigins.md
new file mode 100644
index 0000000000000..88a7ebb5f2234
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectreferencewithcontext.spaceswithmatchingorigins.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectReferenceWithContext](./kibana-plugin-core-public.savedobjectreferencewithcontext.md) &gt; [spacesWithMatchingOrigins](./kibana-plugin-core-public.savedobjectreferencewithcontext.spaceswithmatchingorigins.md)
+
+## SavedObjectReferenceWithContext.spacesWithMatchingOrigins property
+
+The space(s) that objects matching this origin exist in (including this one)
+
+<b>Signature:</b>
+
+```typescript
+spacesWithMatchingOrigins?: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.deprecations.md b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.deprecations.md
new file mode 100644
index 0000000000000..51d93371e518e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.deprecations.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreRequestHandlerContext](./kibana-plugin-core-server.corerequesthandlercontext.md) &gt; [deprecations](./kibana-plugin-core-server.corerequesthandlercontext.deprecations.md)
+
+## CoreRequestHandlerContext.deprecations property
+
+<b>Signature:</b>
+
+```typescript
+deprecations: {
+        client: DeprecationsClient;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.elasticsearch.md b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.elasticsearch.md
new file mode 100644
index 0000000000000..22ff84ce1cb57
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.elasticsearch.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreRequestHandlerContext](./kibana-plugin-core-server.corerequesthandlercontext.md) &gt; [elasticsearch](./kibana-plugin-core-server.corerequesthandlercontext.elasticsearch.md)
+
+## CoreRequestHandlerContext.elasticsearch property
+
+<b>Signature:</b>
+
+```typescript
+elasticsearch: {
+        client: IScopedClusterClient;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.md b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.md
new file mode 100644
index 0000000000000..47297bcddc906
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreRequestHandlerContext](./kibana-plugin-core-server.corerequesthandlercontext.md)
+
+## CoreRequestHandlerContext interface
+
+The `core` context provided to route handler.
+
+Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.client](./kibana-plugin-core-server.iscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
+
+<b>Signature:</b>
+
+```typescript
+export interface CoreRequestHandlerContext 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [deprecations](./kibana-plugin-core-server.corerequesthandlercontext.deprecations.md) | { client: DeprecationsClient; } |  |
+|  [elasticsearch](./kibana-plugin-core-server.corerequesthandlercontext.elasticsearch.md) | { client: IScopedClusterClient; } |  |
+|  [savedObjects](./kibana-plugin-core-server.corerequesthandlercontext.savedobjects.md) | { client: SavedObjectsClientContract; typeRegistry: ISavedObjectTypeRegistry; getClient: (options?: SavedObjectsClientProviderOptions) =&gt; SavedObjectsClientContract; getExporter: (client: SavedObjectsClientContract) =&gt; ISavedObjectsExporter; getImporter: (client: SavedObjectsClientContract) =&gt; ISavedObjectsImporter; } |  |
+|  [uiSettings](./kibana-plugin-core-server.corerequesthandlercontext.uisettings.md) | { client: IUiSettingsClient; } |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.savedobjects.md b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.savedobjects.md
new file mode 100644
index 0000000000000..6d1aa0a8bb5f1
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.savedobjects.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreRequestHandlerContext](./kibana-plugin-core-server.corerequesthandlercontext.md) &gt; [savedObjects](./kibana-plugin-core-server.corerequesthandlercontext.savedobjects.md)
+
+## CoreRequestHandlerContext.savedObjects property
+
+<b>Signature:</b>
+
+```typescript
+savedObjects: {
+        client: SavedObjectsClientContract;
+        typeRegistry: ISavedObjectTypeRegistry;
+        getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
+        getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
+        getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.uisettings.md b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.uisettings.md
new file mode 100644
index 0000000000000..f76dcc8965a03
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.corerequesthandlercontext.uisettings.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreRequestHandlerContext](./kibana-plugin-core-server.corerequesthandlercontext.md) &gt; [uiSettings](./kibana-plugin-core-server.corerequesthandlercontext.uisettings.md)
+
+## CoreRequestHandlerContext.uiSettings property
+
+<b>Signature:</b>
+
+```typescript
+uiSettings: {
+        client: IUiSettingsClient;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.customrequesthandlercontext.md b/docs/development/core/server/kibana-plugin-core-server.customrequesthandlercontext.md
new file mode 100644
index 0000000000000..afaf8c278565a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.customrequesthandlercontext.md
@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CustomRequestHandlerContext](./kibana-plugin-core-server.customrequesthandlercontext.md)
+
+## CustomRequestHandlerContext type
+
+
+<b>Signature:</b>
+
+```typescript
+export declare type CustomRequestHandlerContext<T> = RequestHandlerContext & {
+    [Key in keyof T]: T[Key] extends Promise<unknown> ? T[Key] : Promise<T[Key]>;
+};
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.md
index f3be1a9130b9c..bb03887e547e2 100644
--- a/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.md
@@ -87,5 +87,5 @@ async (context, request, response) => {
 |  [registerOnPreAuth](./kibana-plugin-core-server.httpservicesetup.registeronpreauth.md) | (handler: OnPreAuthHandler) =&gt; void | To define custom logic to perform for incoming requests before the Auth interceptor performs a check that user has access to requested resources. |
 |  [registerOnPreResponse](./kibana-plugin-core-server.httpservicesetup.registeronpreresponse.md) | (handler: OnPreResponseHandler) =&gt; void | To define custom logic to perform for the server response. |
 |  [registerOnPreRouting](./kibana-plugin-core-server.httpservicesetup.registeronprerouting.md) | (handler: OnPreRoutingHandler) =&gt; void | To define custom logic to perform for incoming requests before server performs a route lookup. |
-|  [registerRouteHandlerContext](./kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md) | &lt;Context extends RequestHandlerContext, ContextName extends keyof Context&gt;(contextName: ContextName, provider: RequestHandlerContextProvider&lt;Context, ContextName&gt;) =&gt; RequestHandlerContextContainer | Register a context provider for a route handler. |
+|  [registerRouteHandlerContext](./kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md) | &lt;Context extends RequestHandlerContext, ContextName extends keyof Omit&lt;Context, 'resolve'&gt;&gt;(contextName: ContextName, provider: RequestHandlerContextProvider&lt;Context, ContextName&gt;) =&gt; RequestHandlerContextContainer | Register a context provider for a route handler. |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md b/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md
index c793080305d0c..23e009864dcd6 100644
--- a/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md
+++ b/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md
@@ -9,7 +9,7 @@ Register a context provider for a route handler.
 <b>Signature:</b>
 
 ```typescript
-registerRouteHandlerContext: <Context extends RequestHandlerContext, ContextName extends keyof Context>(contextName: ContextName, provider: RequestHandlerContextProvider<Context, ContextName>) => RequestHandlerContextContainer;
+registerRouteHandlerContext: <Context extends RequestHandlerContext, ContextName extends keyof Omit<Context, 'resolve'>>(contextName: ContextName, provider: RequestHandlerContextProvider<Context, ContextName>) => RequestHandlerContextContainer;
 ```
 
 ## Example
diff --git a/docs/development/core/server/kibana-plugin-core-server.icontextprovider.md b/docs/development/core/server/kibana-plugin-core-server.icontextprovider.md
index ddd8a0e92f465..eb2ec3cbf90b8 100644
--- a/docs/development/core/server/kibana-plugin-core-server.icontextprovider.md
+++ b/docs/development/core/server/kibana-plugin-core-server.icontextprovider.md
@@ -9,7 +9,7 @@ A function that returns a context value for a specific key of given context type
 <b>Signature:</b>
 
 ```typescript
-export declare type IContextProvider<Context extends RequestHandlerContext, ContextName extends keyof Context> = (context: Omit<Context, ContextName>, ...rest: HandlerParameters<RequestHandler>) => Promise<Context[ContextName]> | Context[ContextName];
+export declare type IContextProvider<Context extends RequestHandlerContext, ContextName extends keyof Context> = (context: Omit<Context, ContextName>, ...rest: HandlerParameters<RequestHandler>) => MaybePromise<Awaited<Context[ContextName]>>;
 ```
 
 ## Remarks
diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
index 91cb6c370d759..d5ba98c06ef02 100644
--- a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
+++ b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
@@ -34,7 +34,7 @@ kibanaResponseFactory: {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
-    customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<string | Error | {
+    customError: (options: CustomHttpResponseOptions<ResponseError | Buffer | Stream>) => KibanaResponse<string | Error | Buffer | Stream | {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index d142579e1ced3..e33beb19e01a4 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -60,6 +60,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ConfigDeprecationDetails](./kibana-plugin-core-server.configdeprecationdetails.md) |  |
 |  [ContextSetup](./kibana-plugin-core-server.contextsetup.md) | An object that handles registration of context providers and configuring handlers with context. |
 |  [CorePreboot](./kibana-plugin-core-server.corepreboot.md) | Context passed to the <code>setup</code> method of <code>preboot</code> plugins. |
+|  [CoreRequestHandlerContext](./kibana-plugin-core-server.corerequesthandlercontext.md) | The <code>core</code> context provided to route handler.<!-- -->Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.client](./kibana-plugin-core-server.iscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
 |  [CoreSetup](./kibana-plugin-core-server.coresetup.md) | Context passed to the <code>setup</code> method of <code>standard</code> plugins. |
 |  [CoreStart](./kibana-plugin-core-server.corestart.md) | Context passed to the plugins <code>start</code> method. |
 |  [CoreStatus](./kibana-plugin-core-server.corestatus.md) | Status of core services. |
@@ -133,7 +134,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PrebootPlugin](./kibana-plugin-core-server.prebootplugin.md) | The interface that should be returned by a <code>PluginInitializer</code> for a <code>preboot</code> plugin. |
 |  [PrebootServicePreboot](./kibana-plugin-core-server.prebootservicepreboot.md) | Kibana Preboot Service allows to control the boot flow of Kibana. Preboot plugins can use it to hold the boot until certain condition is met. |
 |  [RegisterDeprecationsConfig](./kibana-plugin-core-server.registerdeprecationsconfig.md) |  |
-|  [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.client](./kibana-plugin-core-server.iscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
+|  [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Base context passed to a route handler. |
+|  [RequestHandlerContextBase](./kibana-plugin-core-server.requesthandlercontextbase.md) | \* |
 |  [ResolveCapabilitiesOptions](./kibana-plugin-core-server.resolvecapabilitiesoptions.md) | Defines a set of additional options for the <code>resolveCapabilities</code> method of [CapabilitiesStart](./kibana-plugin-core-server.capabilitiesstart.md)<!-- -->. |
 |  [RouteConfig](./kibana-plugin-core-server.routeconfig.md) | Route specific configuration. |
 |  [RouteConfigOptions](./kibana-plugin-core-server.routeconfigoptions.md) | Additional route options. |
@@ -262,6 +264,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [AuthResult](./kibana-plugin-core-server.authresult.md) |  |
 |  [CapabilitiesProvider](./kibana-plugin-core-server.capabilitiesprovider.md) | See [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) |
 |  [CapabilitiesSwitcher](./kibana-plugin-core-server.capabilitiesswitcher.md) | See [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) |
+|  [CustomRequestHandlerContext](./kibana-plugin-core-server.customrequesthandlercontext.md) |  |
 |  [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) |  |
 |  [DestructiveRouteMethod](./kibana-plugin-core-server.destructiveroutemethod.md) | Set of HTTP methods changing the state of the server. |
 |  [DocLinksServiceStart](./kibana-plugin-core-server.doclinksservicestart.md) |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md
index dcf6975c5fa70..8d0b715fdef7b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md
+++ b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md
@@ -7,22 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-core: {
-        savedObjects: {
-            client: SavedObjectsClientContract;
-            typeRegistry: ISavedObjectTypeRegistry;
-            getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
-            getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
-            getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
-        };
-        elasticsearch: {
-            client: IScopedClusterClient;
-        };
-        uiSettings: {
-            client: IUiSettingsClient;
-        };
-        deprecations: {
-            client: DeprecationsClient;
-        };
-    };
+core: Promise<CoreRequestHandlerContext>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md
index 0d705c9daa333..214f8a6f6ba5c 100644
--- a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md
+++ b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md
@@ -4,19 +4,18 @@
 
 ## RequestHandlerContext interface
 
-Plugin specific context passed to a route handler.
-
-Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.client](./kibana-plugin-core-server.iscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
+Base context passed to a route handler.
 
 <b>Signature:</b>
 
 ```typescript
-export interface RequestHandlerContext 
+export interface RequestHandlerContext extends RequestHandlerContextBase 
 ```
+<b>Extends:</b> RequestHandlerContextBase
 
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [core](./kibana-plugin-core-server.requesthandlercontext.core.md) | { savedObjects: { client: SavedObjectsClientContract; typeRegistry: ISavedObjectTypeRegistry; getClient: (options?: SavedObjectsClientProviderOptions) =&gt; SavedObjectsClientContract; getExporter: (client: SavedObjectsClientContract) =&gt; ISavedObjectsExporter; getImporter: (client: SavedObjectsClientContract) =&gt; ISavedObjectsImporter; }; elasticsearch: { client: IScopedClusterClient; }; uiSettings: { client: IUiSettingsClient; }; deprecations: { client: DeprecationsClient; }; } |  |
+|  [core](./kibana-plugin-core-server.requesthandlercontext.core.md) | Promise&lt;CoreRequestHandlerContext&gt; |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontextbase.md b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontextbase.md
new file mode 100644
index 0000000000000..33a123eefae63
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontextbase.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [RequestHandlerContextBase](./kibana-plugin-core-server.requesthandlercontextbase.md)
+
+## RequestHandlerContextBase interface
+
+\*
+
+<b>Signature:</b>
+
+```typescript
+export interface RequestHandlerContextBase 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [resolve](./kibana-plugin-core-server.requesthandlercontextbase.resolve.md) | &lt;T extends keyof Omit&lt;this, 'resolve'&gt;&gt;(parts: T\[\]) =&gt; Promise&lt;AwaitedProperties&lt;Pick&lt;this, T&gt;&gt;&gt; | Await all the specified context parts and return them. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontextbase.resolve.md b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontextbase.resolve.md
new file mode 100644
index 0000000000000..74192c0e1aee8
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontextbase.resolve.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [RequestHandlerContextBase](./kibana-plugin-core-server.requesthandlercontextbase.md) &gt; [resolve](./kibana-plugin-core-server.requesthandlercontextbase.resolve.md)
+
+## RequestHandlerContextBase.resolve property
+
+Await all the specified context parts and return them.
+
+<b>Signature:</b>
+
+```typescript
+resolve: <T extends keyof Omit<this, 'resolve'>>(parts: T[]) => Promise<AwaitedProperties<Pick<this, T>>>;
+```
+
+## Example
+
+
+```ts
+const resolved = await context.resolve(['core', 'pluginA']);
+const esClient = resolved.core.elasticsearch.client;
+const pluginAService = resolved.pluginA.someService;
+```
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.md
index 8cdfbb4fde480..79dd7a40019ec 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.md
@@ -19,7 +19,9 @@ export interface SavedObjectReferenceWithContext
 |  [id](./kibana-plugin-core-server.savedobjectreferencewithcontext.id.md) | string | The ID of the referenced object |
 |  [inboundReferences](./kibana-plugin-core-server.savedobjectreferencewithcontext.inboundreferences.md) | Array&lt;{ type: string; id: string; name: string; }&gt; | References to this object; note that this does not contain \_all inbound references everywhere for this object\_, it only contains inbound references for the scope of this operation |
 |  [isMissing?](./kibana-plugin-core-server.savedobjectreferencewithcontext.ismissing.md) | boolean | <i>(Optional)</i> Whether or not this object or reference is missing |
+|  [originId?](./kibana-plugin-core-server.savedobjectreferencewithcontext.originid.md) | string | <i>(Optional)</i> The origin ID of the referenced object (if it has one) |
 |  [spaces](./kibana-plugin-core-server.savedobjectreferencewithcontext.spaces.md) | string\[\] | The space(s) that the referenced object exists in |
 |  [spacesWithMatchingAliases?](./kibana-plugin-core-server.savedobjectreferencewithcontext.spaceswithmatchingaliases.md) | string\[\] | <i>(Optional)</i> The space(s) that legacy URL aliases matching this type/id exist in |
+|  [spacesWithMatchingOrigins?](./kibana-plugin-core-server.savedobjectreferencewithcontext.spaceswithmatchingorigins.md) | string\[\] | <i>(Optional)</i> The space(s) that objects matching this origin exist in (including this one) |
 |  [type](./kibana-plugin-core-server.savedobjectreferencewithcontext.type.md) | string | The type of the referenced object |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.originid.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.originid.md
new file mode 100644
index 0000000000000..47cac3f423647
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.originid.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectReferenceWithContext](./kibana-plugin-core-server.savedobjectreferencewithcontext.md) &gt; [originId](./kibana-plugin-core-server.savedobjectreferencewithcontext.originid.md)
+
+## SavedObjectReferenceWithContext.originId property
+
+The origin ID of the referenced object (if it has one)
+
+<b>Signature:</b>
+
+```typescript
+originId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.spaceswithmatchingorigins.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.spaceswithmatchingorigins.md
new file mode 100644
index 0000000000000..3fedce753c034
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectreferencewithcontext.spaceswithmatchingorigins.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectReferenceWithContext](./kibana-plugin-core-server.savedobjectreferencewithcontext.md) &gt; [spacesWithMatchingOrigins](./kibana-plugin-core-server.savedobjectreferencewithcontext.spaceswithmatchingorigins.md)
+
+## SavedObjectReferenceWithContext.spacesWithMatchingOrigins property
+
+The space(s) that objects matching this origin exist in (including this one)
+
+<b>Signature:</b>
+
+```typescript
+spacesWithMatchingOrigins?: string[];
+```
diff --git a/docs/discover/document-explorer.asciidoc b/docs/discover/document-explorer.asciidoc
index de7b07aa4d784..e0cead0292cf3 100644
--- a/docs/discover/document-explorer.asciidoc
+++ b/docs/discover/document-explorer.asciidoc
@@ -1,10 +1,11 @@
 [[document-explorer]]
-== Document Explorer
+== Explore your documents
 
-beta::[]
 
-*Discover* has a *Document Explorer* with resizable columns, better data sorting and comparison,
-and a fullscreen view.
+*Discover* displays your documents in table format, so you can
+best explore your data.
+Use the document table to resize columns, set row height,
+perform multi-column sorting, compare data, and more.
 
 ++++
 <script type="text/javascript" async src="https://play.vidyard.com/embed/v4.js">
@@ -12,20 +13,14 @@ and a fullscreen view.
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/BgbLpBo3qvPZvtXrwZoNuD.jpg"
-data-uuid="BgbLpBo3qvPZvtXrwZoNuD"
+src="https://play.vidyard.com/KbZQP6Y7msjevAm1JGbKeG.jpg"
+data-uuid="KbZQP6Y7msjevAm1JGbKeG"
 data-v="4"
 data-type="inline"
 />
 </br>
 ++++
 
-To use the *Document Explorer* instead of the classic document table:
-
-. Open *Discover*.
-. In the toolbar, click *Options*, and then click *Try Document Explorer*.
-. Turn off the classic view and save the changes.
-
 [float]
 [[document-explorer-columns]]
 === Reorder and resize columns
@@ -51,7 +46,7 @@ adjust the height to fit the contents, click the row height icon
 image:images/row-height-icon.png[icon to open the Row height pop-up].
 
 [role="screenshot"]
-image::images/document-explorer-row-height.png[Row height settings for Document Explroer, width="75%"]
+image::images/document-explorer-row-height.png[Row height settings for the document table, width="75%"]
 
 
 [float]
@@ -61,33 +56,41 @@ image::images/document-explorer-row-height.png[Row height settings for Document
 Sort your data by one or more fields, in ascending or descending order.
 The default sort is based on the time field, from new to old.
 
-. In the *Document Explorer*, click and open the *field sorted* options.
+To add or remove a sort on a single field, click the
+column header, and then select the sort order.
+
+To sort by multiple fields:
+
+. In the document table, click the *field sorted* option.
 +
 [role="screenshot"]
-image::images/document-explorer-sort-data.png[Pop-up in Document Explorer for sorting columns, width="75%"]
+image::images/document-explorer-sort-data.png[Pop-up in document table for sorting columns, width="75%"]
 
 . To add more fields to the sort, select from the dropdown menu.
 +
 By default, columns are sorted in the order they are added.
-For example, to sort by `order_date` then `geo.country_iso_code`, make sure `order_date` appears first.
 +
 [role="screenshot"]
-image::images/document-explorer-multi-field.png[Multi field sort in Document Explorer, width="75%"]
+image::images/document-explorer-multi-field.png[Multi field sort in the document table, width="75%"]
 
 . To change the sort order, select a field in the pop-up, and then drag it to the new location.
++
+For example, to sort by `geo.country_iso_code` then `order_date`, make sure `geo.country_iso_code` appears first.
+
 
 [float]
 [[document-explorer-compare-data]]
 === Compare data
 
-Narrow your results to a subset documents.
+Narrow your results to a subset of documents to easily
+compare the data of interest.
 
 . Select the documents you want to compare.
 
-. Click and open the *documents selected* options, and then select *Show selected documents only*.
+. Click the *documents selected* option, and then select *Show selected documents only*.
 +
 [role="screenshot"]
-image::images/document-explorer-compare-data.png[Multi field sort in Document Explorer, width="75%"]
+image::images/document-explorer-compare-data.png[Compare data in the document table, width="75%"]
 
 [float]
 [[document-explorer-expand-documents]]
@@ -99,26 +102,56 @@ the documents that occurred before and after it.
 . Click the expand icon
 image:images/expand-icon-2.png[double arrow icon to open a flyout with the document details].
 +
+You can view the document in two ways. The **Table** view displays the document fields row-by-row.
+The **JSON** (JavaScript Object Notation) view allows you to look at how {es} returns the document.
++
 [role="screenshot"]
-image::images/document-explorer-expand.png[Expanded view in Document Explorer]
-
-. Scan through the fields and their values, or search for a field by name.
+image::images/document-explorer-expand.png[Expanded view of the document table]
++
+. In the *Table* view, scan through the fields and their values, or search for a field by name.
 
 . When you find a field of interest,
 click
 image:images/actions-icon.png[three dots icon in table column] in the *Actions* column
 to:
-.. Filter the view of the data
-.. Toggle the field in or out the document table
-.. Pin the field so it stays at the top
+.. Filter the results to include or exclude specific fields or values.
+.. Toggle the field in or out the document table.
+.. Pin the field so it stays at the top.
+
+. To navigate to the next and previous documents, click the < and > arrows at the top of the view.
+
+. To create a view of the document that you can bookmark and share, click **Single document**.
++
+[role="screenshot"]
+image::images/discover-view-single-document.png[Discover single document view]
++
+The link is valid for the time the document is available in Elasticsearch. To create a customized view of the document,
+you can create <<external-plugin-development, your own plugin>>.
 
-. For direct access to a particular document, click <<discover-view-single-document,**Single document**>>.
+. To view documents that occurred before or after the event you are looking at, click **Surrounding documents**.
++
+Documents are displayed using the same set of columns as the *Discover* view from which
+the context was opened. The filters you applied are also carried over. Pinned
+filters remain active, while other filters are copied in a disabled state.
++
+[role="screenshot"]
+image::images/discover-context.png[Image showing context view feature, with anchor documents highlighted in blue]
 
-. To view documents that occurred before or after the event you are looking at, click <<discover-view-surrounding-documents,**Surrounding documents**>>.
 
 [float]
 [[document-explorer-full-screen]]
 === View documents in fullscreen
 
 To view as much data as possible and eliminate distractions, click the fullscreen icon
-image:images/fullscreen-icon.png[icon to display the Document Explorer in fullscreen mode].
+image:images/fullscreen-icon.png[icon to display the document table in fullscreen mode]
+in the document table.
+
+[float]
+[[document-explorer-configure-table]]
+=== Configure the number of documents displayed
+
+By default, the document table displays 100 rows per page. To change this number,
+click *Rows per page*.
+
+[role="screenshot"]
+image::images/document-table-rows-per-page.png["Menu with options for setting the number of rows in the document table", width=50%]
diff --git a/docs/discover/field-statistics.asciidoc b/docs/discover/field-statistics.asciidoc
index 750b25c714aa3..52f78f3376cda 100644
--- a/docs/discover/field-statistics.asciidoc
+++ b/docs/discover/field-statistics.asciidoc
@@ -1,5 +1,5 @@
 [[show-field-statistics]]
-== Explore the fields in your data
+== View field statistics
 
 beta::[]
 
@@ -50,7 +50,7 @@ image::images/field-statistics-geo.png["Field statistics for a geo field."]
 . Explore additional field types to see the statistics that *Discover* provides.
 
 . To create a visualization of the field data, click
-image:images/chart-icon.png[Click the magnifying glass icon to create a visualization of the data in Lens]
+image:images/visualization-icon.png[Click the magnifying glass icon to create a visualization of the data in Lens]
 or
 image:images/map-icon.png[Click the Maps icon to explore the data in a map]
 in the *Actions* column.
diff --git a/docs/discover/images/add-field-to-data-view.png b/docs/discover/images/add-field-to-data-view.png
index e4352e814fa0b..4d17b9dd833e0 100644
Binary files a/docs/discover/images/add-field-to-data-view.png and b/docs/discover/images/add-field-to-data-view.png differ
diff --git a/docs/discover/images/chart-icon.png b/docs/discover/images/chart-icon.png
index db7f70319a66d..7d8c5da4621ce 100644
Binary files a/docs/discover/images/chart-icon.png and b/docs/discover/images/chart-icon.png differ
diff --git a/docs/discover/images/customer.png b/docs/discover/images/customer.png
index 55a04bf754d4e..5e2015499d8ef 100644
Binary files a/docs/discover/images/customer.png and b/docs/discover/images/customer.png differ
diff --git a/docs/discover/images/discover-context.png b/docs/discover/images/discover-context.png
index 770c5fb921a5d..dd8a29ba29336 100644
Binary files a/docs/discover/images/discover-context.png and b/docs/discover/images/discover-context.png differ
diff --git a/docs/discover/images/discover-from-visualize.png b/docs/discover/images/discover-from-visualize.png
index 1aa3e9b502d40..74307bcd46a2c 100644
Binary files a/docs/discover/images/discover-from-visualize.png and b/docs/discover/images/discover-from-visualize.png differ
diff --git a/docs/discover/images/discover-search-for-relevance.png b/docs/discover/images/discover-search-for-relevance.png
index 81b8c323e4d49..d9d5834c9e382 100644
Binary files a/docs/discover/images/discover-search-for-relevance.png and b/docs/discover/images/discover-search-for-relevance.png differ
diff --git a/docs/discover/images/discover-view-single-document.png b/docs/discover/images/discover-view-single-document.png
index 18ff5f67eb5d8..5c040087b3a3f 100644
Binary files a/docs/discover/images/discover-view-single-document.png and b/docs/discover/images/discover-view-single-document.png differ
diff --git a/docs/discover/images/discover.png b/docs/discover/images/discover.png
index 83a91e03b033d..6b60f74154a1b 100644
Binary files a/docs/discover/images/discover.png and b/docs/discover/images/discover.png differ
diff --git a/docs/discover/images/document-explorer-compare-data.png b/docs/discover/images/document-explorer-compare-data.png
index 0aeb5635d47e9..1164fb0d1fdba 100644
Binary files a/docs/discover/images/document-explorer-compare-data.png and b/docs/discover/images/document-explorer-compare-data.png differ
diff --git a/docs/discover/images/document-explorer-expand.png b/docs/discover/images/document-explorer-expand.png
index a1b989a0f5ae8..7404e758bf902 100644
Binary files a/docs/discover/images/document-explorer-expand.png and b/docs/discover/images/document-explorer-expand.png differ
diff --git a/docs/discover/images/document-explorer-multi-field.png b/docs/discover/images/document-explorer-multi-field.png
index b8b1865e14927..2b4abb7416a81 100644
Binary files a/docs/discover/images/document-explorer-multi-field.png and b/docs/discover/images/document-explorer-multi-field.png differ
diff --git a/docs/discover/images/document-explorer-sort-data.png b/docs/discover/images/document-explorer-sort-data.png
index 6665f0af52d3e..389c94ba27b46 100644
Binary files a/docs/discover/images/document-explorer-sort-data.png and b/docs/discover/images/document-explorer-sort-data.png differ
diff --git a/docs/discover/images/document-table-expanded.png b/docs/discover/images/document-table-expanded.png
index 9f0a05f74df75..10e8b269efe66 100644
Binary files a/docs/discover/images/document-table-expanded.png and b/docs/discover/images/document-table-expanded.png differ
diff --git a/docs/discover/images/document-table-rows-per-page.png b/docs/discover/images/document-table-rows-per-page.png
new file mode 100644
index 0000000000000..21643903e4021
Binary files /dev/null and b/docs/discover/images/document-table-rows-per-page.png differ
diff --git a/docs/discover/images/document-table.png b/docs/discover/images/document-table.png
index 1fc8a19d54cb7..0df7ad265369c 100644
Binary files a/docs/discover/images/document-table.png and b/docs/discover/images/document-table.png differ
diff --git a/docs/discover/images/field-statistics-geo.png b/docs/discover/images/field-statistics-geo.png
index 14af668af7559..35c727cb1fe76 100644
Binary files a/docs/discover/images/field-statistics-geo.png and b/docs/discover/images/field-statistics-geo.png differ
diff --git a/docs/discover/images/field-statistics-numeric.png b/docs/discover/images/field-statistics-numeric.png
index d81aafb2f2b47..cd587532c9cc4 100644
Binary files a/docs/discover/images/field-statistics-numeric.png and b/docs/discover/images/field-statistics-numeric.png differ
diff --git a/docs/discover/images/field-statistics-view.png b/docs/discover/images/field-statistics-view.png
index 8f51f7c089509..836d0b5173005 100644
Binary files a/docs/discover/images/field-statistics-view.png and b/docs/discover/images/field-statistics-view.png differ
diff --git a/docs/discover/images/hello-field.png b/docs/discover/images/hello-field.png
index bd5999f86dc3e..a8750fac0cb9b 100644
Binary files a/docs/discover/images/hello-field.png and b/docs/discover/images/hello-field.png differ
diff --git a/docs/discover/images/sort-by-relevance.png b/docs/discover/images/sort-by-relevance.png
new file mode 100644
index 0000000000000..893950508e9f1
Binary files /dev/null and b/docs/discover/images/sort-by-relevance.png differ
diff --git a/docs/discover/images/visualization-icon.png b/docs/discover/images/visualization-icon.png
new file mode 100644
index 0000000000000..db7f70319a66d
Binary files /dev/null and b/docs/discover/images/visualization-icon.png differ
diff --git a/docs/discover/search-for-relevance.asciidoc b/docs/discover/search-for-relevance.asciidoc
index cb3728ed38604..d14fb438e2b7e 100644
--- a/docs/discover/search-for-relevance.asciidoc
+++ b/docs/discover/search-for-relevance.asciidoc
@@ -8,7 +8,7 @@ This example shows how to use *Discover* to list
 your documents from most relevant to least relevant. This example uses
 the <<gs-get-data-into-kibana, sample flights data set>>, or you can use your own data.
 
-.  In *Discover*, open the {data-source} dropdown, and select that data you want to work with.
+.  In *Discover*, open the {data-source} dropdown, and select the data that you want to work with.
 +
 For the sample flights data, set the {data-source} to *kibana_sample_data_flights*.
 
@@ -19,15 +19,16 @@ Warsaw OR Venice OR Clear
 ```
 . If you don't see any results, expand the <<set-time-filter,time range>>, for example to *Last 7 days*.
 . From the list of *Available fields*, add `_score` and any other fields you want to the document table.
-. To sort the `_score` column in descending order, hover over its header, and set
-the sort icon to
-image:images/downward-arrow.png[Downward pointing arrow to indicate descending sorting].
 +
-At this point, you're doing a multi-column sort: first by `Time`, and then by `_score`.
-. To turn off sorting for the `Time` field, hover over its header, and set the sort icon to
-image:images/double-arrow.png[Arrow on both ends of the icon indicates sorting is off].
+At this point, you're sorting by the`timestamp` field.
+. To turn off sorting by the `timestamp` field, click the *field sorted* option, and then click *Clear sorting.*
+. To turn on sorting by the `_score` field in descending order, open the dropdown menu and click *_score*, and then select *High-Low*.
++
+[role="screenshot"]
+image::images/sort-by-relevance.png["Field sorting popover", width=75%]
+
 +
 Your table now sorts documents from most to least relevant.
 +
 [role="screenshot"]
-image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant."]
+image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant.", width=75%]
diff --git a/docs/discover/view-document.asciidoc b/docs/discover/view-document.asciidoc
deleted file mode 100644
index c5b59d98dc5fd..0000000000000
--- a/docs/discover/view-document.asciidoc
+++ /dev/null
@@ -1,51 +0,0 @@
-[[discover-view-document]]
-== View a document
-
-Once you've found a document of interest in *Discover*, you have two more ways to
-view it: in a view by itself or in context with surrounding documents.
-
-[float]
-[[discover-view-single-document]]
-=== View a single document
-
-Access a single document so you can bookmark it and share the link.
-
-. In the document table, click the expand icon (>).
-. In the expanded view, click **View single document**.
-+
-You can view the document in two ways. The **Table** view displays the document fields row-by-row.
-The **JSON** (JavaScript Object Notation) view allows you to look at how {es} returns the document.
-+
-[role="screenshot"]
-image::images/discover-view-single-document.png[Discover single document view]
-+
-The link is valid for the time the document is available in Elasticsearch. To create a customized view of the document,
-you can create <<external-plugin-development, your own plugin>>.
-
-[float]
-[[discover-view-surrounding-documents]]
-=== View surrounding documents
-
-To inspect the documents that occurred immediately before and after a document,
-your {data-source} must contain time-based events.
-
-. In the document table, click the expand icon (>).
-. In the expanded view, click **View surrounding documents**.
-+
-Documents are displayed using the same set of columns as the *Discover* view from which
-the context was opened. The filters you applied are also carried over. Pinned
-filters remain active, while normal filters are copied in a disabled state.
-+
-[role="screenshot"]
-image::images/discover-context.png[Image showing context view feature, with anchor documents highlighted in blue]
-
-. To find the documents of interest, add filters.
-
-. To increase the number of documents that surround the anchor document, click *Load*.
-By default, five documents are added with each click.
-+
-[role="screenshot"]
-image::images/discover-context-load-newer-documents.png[Load button and the number of documents to load, width=50%]
-. To configure the number of documents to display and
-the number of documents to load with each button click, go to *Stack Management > Advanced Settings*
-and edit the <<kibana-discover-settings, context settings>>.
diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index a702c7d607e55..f0e0e929fad6e 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -490,6 +490,7 @@ Used for calculating automatic intervals in visualizations, this is the number
 of buckets to try to represent.
 
 [[timelion-legacyChartsLibrary]]`timelion:legacyChartsLibrary`::
+**The legacy timelion charts are deprecated and will not be supported as of 8.4.**
 Enables the legacy charts library for timelion charts in Visualize.
 
 
@@ -509,6 +510,7 @@ Enables the legacy time axis for charts in Lens, Discover, Visualize and TSVB
 The maximum number of buckets a datasource can return. High numbers can have a negative impact on your browser rendering performance.
 
 [[visualization-visualize-pieChartslibrary]]`visualization:visualize:legacyPieChartsLibrary`::
+**The legacy pie charts are deprecated and will not be supported in a future version.**
 The visualize editor uses new pie charts with improved performance, color palettes, label positioning, and more. Enable this option if you prefer to use the legacy charts library.
 
 [[visualization-visualize-heatmapChartslibrary]]`visualization:visualize:legacyHeatmapChartsLibrary`::
diff --git a/docs/management/connectors/action-types/webhook.asciidoc b/docs/management/connectors/action-types/webhook.asciidoc
index 02c3de139e0d5..4c001920f716c 100644
--- a/docs/management/connectors/action-types/webhook.asciidoc
+++ b/docs/management/connectors/action-types/webhook.asciidoc
@@ -15,7 +15,7 @@ Webhook connectors have the following configuration properties.
 
 Name::      The name of the connector. The name is used to identify a  connector in the management UI connector listing, or in the connector list when configuring an action.
 URL::       The request URL. If you are using the <<action-settings, `xpack.actions.allowedHosts`>> setting, make sure the hostname is added to the allowed hosts.
-Method::    HTTP request method, either `POST`(default) or `PUT`.
+Method::    HTTP request method, either `post`(default) or `put`.
 Headers::   A set of key-value pairs sent as headers with the request
 Require authentication:: If true, a username and password for login type authentication must be provided.
 Username::      Username for HTTP basic authentication.
@@ -38,7 +38,7 @@ Use the <<action-settings, Action configuration settings>> to customize connecto
    actionTypeId: .webhook
    config:
      url: https://test.host
-     method: POST
+     method: post
      headers:
        testheader: testvalue
    secrets:
diff --git a/docs/management/managing-saved-objects.asciidoc b/docs/management/managing-saved-objects.asciidoc
index 3901d178e1461..39d294df43a5a 100644
--- a/docs/management/managing-saved-objects.asciidoc
+++ b/docs/management/managing-saved-objects.asciidoc
@@ -23,7 +23,7 @@ Granting access to Saved Objects Management will authorize users to manage all s
 
 [float]
 [[managing-saved-objects-view]]
-=== View, edit, and delete
+=== View and delete
 
 * To view and edit an object in its associated application, click the object title.
 
@@ -105,26 +105,4 @@ WARNING: The copy operation automatically includes child objects that are relate
 the <<spaces-api-copy-saved-objects, copy saved objects to space API>> instead.
 
 
-[float]
-[[managing-saved-objects-object-definition]]
-=== Advanced editing
-
-Some objects offer an advanced *Edit* page for modifying the object definition.
-To open the page, click the actions icon image:images/actions_icon.png[Actions icon]
-and select *Inspect*.
-You can change the object title, add a description, and modify
-the JSON that defines the object properties.
-
-If you access an object whose index has been deleted, you can:
-
-* Recreate the index so you can continue using the object.
-* Delete the object and recreate it using a different index.
-* Change the index name in the object's `reference` array to point to an existing
-data view. This is useful if the index you were working with has been renamed.
-
-WARNING: Validation is not performed for object properties. Submitting an invalid
-change will render the object unusable. A more failsafe approach is to use
-*Discover* or *Dashboard* to create new objects instead of
-directly editing an existing one.
-
 include::saved-objects/saved-object-ids.asciidoc[]
diff --git a/docs/osquery/advanced-osquery.asciidoc b/docs/osquery/advanced-osquery.asciidoc
new file mode 100644
index 0000000000000..4f03a6d5fe5eb
--- /dev/null
+++ b/docs/osquery/advanced-osquery.asciidoc
@@ -0,0 +1,103 @@
+[[advanced-osquery]]
+== Advanced Osquery
+
+[float]
+[[osquery-map-fields]]
+=== Map result fields to ECS
+
+When you save queries or add queries to a pack, you can optionally map Osquery results or static values to fields in
+the {ecs-ref}/ecs-reference.html[Elastic Common Schema] (ECS).
+This standardizes your Osquery data for use across detections, machine learning,
+and any other areas that rely on ECS-compliant data.
+When the query is run, the results include the original `osquery.<fields>`
+and the mapped ECS fields. For example, if you update a query to map `osquery.name` to `user.name`, the query results include both fields.
+
+. Edit saved queries or queries in a pack to map fields:
+
+* For *Saved queries*: Open the *Saved queries* tab, and then click the edit icon for the query that you want to map.
+
+* For *packs*: Open the *Packs* tab, edit a pack, and then click the edit icon for the query that you want to map.
+
+. In the **ECS mapping** section, select an **ECS field** to map.
+
+. In the **Value** column, use the dropdown on the left to choose what type of value to map to the ECS field:
+
+** **Osquery value**: Select an Osquery field. The fields available are based on the SQL query entered, and only include fields that the query returns. When the query runs, the ECS field is set dynamically to the value of the Osquery field selected.
+
+** **Static value**: Enter a static value. When the query runs, the ECS field is set to the value entered. For example, static fields can be used to apply `tags` or your preferred `event.category` to the query results.
+
+. Map more fields, as needed. To remove any mapped rows, click the delete icon.
+
+. Save your changes.
+
+[NOTE]
+=========================
+
+* Some ECS fields are restricted and cannot be mapped. These are not available in the ECS dropdown.
+
+* Some ECS fields are restricted to a set of allowed values, like {ecs-ref}/ecs-event.html#field-event-category[event.category]. Use the {ecs-ref}/ecs-field-reference.html[ECS Field Reference] for help when mapping fields.
+
+* Osquery date fields have a variety of data types (including integer, text, or bigint). When mapping an Osquery date field to an ECS date field, you might need to use SQL operators in the query to get an {es}-compatible
+{ref}/date.html[date] type.
+=========================
+
+
+[float]
+[[osquery-extended-tables]]
+=== Extended tables for Kubernetes queries
+In addition to the Osquery schema, the Elastic-provided version of Osquery also includes the following tables to support Kubernetes containers. These can be queried with live or scheduled queries.
+
+* `host_users`
+
+* `host_groups`
+
+* `host_processes`
+
+When querying these tables, the expectation is that the `/etc/passwd`, `/etc/group`, and `/proc` are available in the container under `/hostfs` as:
+`/hostfs/etc/passwd`, `/hostfs/etc/group`, and `/hostfs/proc`. For information about the fields available in these tables, see the
+https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields] reference.
+
+[float]
+[[osquery-status]]
+=== Osquery status
+
+A query can have the following status:
+
+[cols="2*<"]
+|===
+| Successful | The query successfully completed.
+| Failed | The query encountered a problem, such as an issue with the query or the agent was disconnected, and might have failed.
+| Not yet responded | The query has not been sent to the agent.
+| Expired | The action request timed out. The agent may be offline.
+|===
+
+NOTE: If an agent is offline, the request status remains **pending** as {kib} retries the request.
+By default, a query request times out after five minutes. The time out applies to the time it takes
+to deliver the action request to an agent to run a query. If the action completes after the timeout period,
+the results are still returned.
+
+
+[float]
+[[osquery-results]]
+=== Osquery results
+When you run live or scheduled queries, the results are automatically
+stored in an {es} index, so that you can search, analyze, and visualize this data in {kib}.
+For a list of the Osquery fields that can be returned in query results,
+refer to https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields].
+Query results can also include ECS fields, if the query has a defined ECS mapping.
+
+Osquery responses include the following information:
+
+* Everything prefaced with `osquery.` is part of the query response. These fields are not mapped to ECS by default.
+
+* Results include some ECS fields by default, such as `host.*` and `agent.*`, which provide information about the host that was queried.
+
+* For live queries, the `action_data.query` is the query that was sent.
+
+* For scheduled queries in a pack, the `action_id` has the format `pack_<pack-name>_<query-ID>`. You can use this information to look up the query that was run.
+
+* By default, all query results are https://osquery.readthedocs.io/en/stable/deployment/logging/#snapshot-logs[snapshot logs]
+that represent a point in time with a set of results, with no
+https://osquery.readthedocs.io/en/stable/deployment/logging/#differential-logs[differentials].
+
+* Osquery data is stored in the `logs-osquery_manager.result-<namespace>` datastream, and the result row data is under the `osquery` property in the document.
diff --git a/docs/osquery/exported-fields-reference.asciidoc b/docs/osquery/exported-fields-reference.asciidoc
new file mode 100644
index 0000000000000..d359c484e4439
--- /dev/null
+++ b/docs/osquery/exported-fields-reference.asciidoc
@@ -0,0 +1,4 @@
+[[exported-fields-osquery]]
+== Exported fields reference
+
+_Content coming soon._
diff --git a/docs/osquery/manage-integration.asciidoc b/docs/osquery/manage-integration.asciidoc
new file mode 100644
index 0000000000000..e35b9ffcc2473
--- /dev/null
+++ b/docs/osquery/manage-integration.asciidoc
@@ -0,0 +1,111 @@
+[[manage-osquery-integration]]
+== Manage the integration
+
+[float]
+=== System requirements
+
+* {fleet-guide}/fleet-overview.html[Fleet] is enabled on your cluster, and
+one or more {fleet-guide}/elastic-agent-installation.html[Elastic Agents] is enrolled.
+* The https://docs.elastic.co/en/integrations/osquery_manager[*Osquery Manager*] integration
+has been added and configured
+for an agent policy through Fleet.
+This integration supports x64 architecture on Windows, MacOS, and Linux platforms,
+and ARM64 architecture on Linux.
+
+[NOTE]
+=========================
+
+* The original {filebeat-ref}/filebeat-module-osquery.html[Filebeat Osquery module]
+and the https://docs.elastic.co/en/integrations/osquery[Osquery]
+integration collect logs from self-managed Osquery deployments.
+The *Osquery Manager* integration manages Osquery deployments
+and supports running and scheduling queries from {kib}.
+
+* *Osquery Manager* cannot be integrated with an Elastic Agent in standalone mode.
+=========================
+
+[float]
+=== Customize Osquery sub-feature privileges
+
+Depending on your https://www.elastic.co/subscriptions[subscription level],
+you can further customize the sub-feature privileges
+for *Osquery Manager*. These include options to grant specific access for running live queries,
+running saved queries, saving queries, and scheduling packs. For example,
+you can create roles for users who can only run live or saved queries, but who cannot save or schedule queries.
+This is useful for teams who need in-depth and detailed control.
+
+[float]
+=== Customize Osquery configuration
+experimental[] By default, all Osquery Manager integrations share the same osquery configuration. However, you can customize how Osquery is configured by editing the Osquery Manager integration for each agent policy
+you want to adjust. The custom configuration is then applied to all agents in the policy.
+This powerful feature allows you to configure
+https://osquery.readthedocs.io/en/stable/deployment/file-integrity-monitoring[File Integrity Monitoring], https://osquery.readthedocs.io/en/stable/deployment/process-auditing[Process auditing],
+and https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-specification[others].
+
+[IMPORTANT]
+=========================
+
+* Take caution when editing this configuration. The changes you make are distributed to all agents in the policy.
+
+* Take caution when editing `packs` using the Advanced *Osquery config* field.
+Any changes you make to `packs` from this field are not reflected in the UI on the Osquery *Packs* page in {kib}, however, these changes are deployed to agents in the policy.
+While this allows you to use advanced Osquery functionality like pack discovery queries, you do lose the ability to manage packs defined this way from the Osquery *Packs* page.
+=========================
+
+. From the {kib} main menu, click *Fleet*, then the *Agent policies* tab.
+
+. Click the name of the agent policy where you want to adjust the Osquery configuration. The configuration changes you make only apply to the policy you select.
+
+. Click the name of the *Osquery Manager* integration, or add the integration first if the agent policy does not yet have it.
+
+. From the *Edit Osquery Manager integration* page, expand the *Advanced* section.
+
+. Edit the *Osquery config* JSON field to apply your preferred Osquery configuration. Note the following:
+
+* The field may already have content if you have scheduled packs for this agent policy. To keep these packs scheduled, do not remove the `packs` section.
+
+* Refer to the https://osquery.readthedocs.io/en/stable/[Osquery documentation] for configuration options.
+
+* Some fields are protected and cannot be set. A warning is displayed with details about which fields should be removed.
+
+* (Optional) To load a full configuration file, drag and drop an Osquery `.conf` file into the area at the bottom of the page.
+
+. Click *Save integration* to apply the custom configuration to all agents in the policy.
++
+As an example, the following configuration disables two tables.
++
+```ts
+{
+   "options":{
+      "disable_tables":"curl,process_envs"
+   }
+}
+```
+
+[float]
+=== Upgrade Osquery versions
+
+The https://github.com/osquery/osquery/releases[Osquery version] available on an Elastic Agent
+is associated to the version of Osquery Beat on the Agent.
+To get the latest version of Osquery Beat,
+https://www.elastic.co/guide/en/fleet/master/upgrade-elastic-agent.html[upgrade your Elastic Agent].
+
+[float]
+=== Debug issues
+If you encounter issues with *Osquery Manager*, find the relevant logs for {elastic-agent}
+and Osquerybeat in the agent directory. Refer to the {fleet-guide}/installation-layout.html[Fleet Installation layout] to find the log file location for your OS.
+
+```ts
+../data/elastic-agent-*/logs/elastic-agent-json.log-*
+../data/elastic-agent-*/logs/default/osquerybeat-json.log
+```
+
+To get more details in the logs, change the agent logging level to debug:
+
+. Open the main menu, and then select **Fleet**.
+
+. Select the agent that you want to debug.
+
+. On the **Logs** tab, change the **Agent logging level** to **debug**, and then click **Apply changes**.
++
+`agent.logging.level` is updated in `fleet.yml`, and the logging level is changed to `debug`.
diff --git a/docs/osquery/osquery.asciidoc b/docs/osquery/osquery.asciidoc
index e745835c87999..ab8058027934e 100644
--- a/docs/osquery/osquery.asciidoc
+++ b/docs/osquery/osquery.asciidoc
@@ -1,13 +1,13 @@
-[chapter]
-[role="xpack"]
 [[osquery]]
 = Osquery
 
+[partintro]
+--
 https://osquery.io[Osquery] is an open source tool that lets you query operating systems like a database, providing you with visibility into your infrastructure and operating systems.
-Using basic SQL commands, you can ask questions about devices, such as servers, 
+Using basic SQL commands, you can ask questions about devices, such as servers,
 Docker containers, and computers running Linux, macOS, or Windows.
 The https://osquery.io/schema[extensive schema] helps with a variety of use cases,
-including vulnerability detection, compliance monitoring, incident investigations, and more.  
+including vulnerability detection, compliance monitoring, incident investigations, and more.
 
 With Osquery in {kib}, you can:
 
@@ -56,11 +56,11 @@ image::images/enter-query.png[Select saved query dropdown name showing query nam
 or to the drag-and-drop *Lens* editor to create visualizations.
 . To view more information about the request, such as failures, open the *Status* tab.
 . To save the query for future use, click *Save for later* and define the ID,
-description, and other <<osquery-manage-query,details>>. 
+description, and other <<osquery-manage-query,details>>.
 
 [float]
 [[osquery-view-history]]
-===  View or rerun previous live queries
+== View or rerun previous live queries
 
 From the *Live queries history* section on the *Live queries* tab:
 
@@ -77,8 +77,8 @@ image::images/live-query-check-results.png[Results of OSquery]
 == Schedule queries with packs
 
 Create packs to organize sets of queries. For example, you might create one pack that checks
-for IT compliance-type issues, and another pack that monitors for evidence of malware. 
-You can schedule packs to run for one or more agent policies. When scheduled, queries in the pack are run at the set intervals for all agents in those policies. Scheduling packs is optional. 
+for IT compliance-type issues, and another pack that monitors for evidence of malware.
+You can schedule packs to run for one or more agent policies. When scheduled, queries in the pack are run at the set intervals for all agents in those policies. Scheduling packs is optional.
 
 . Open the **Packs** tab.
 
@@ -95,7 +95,7 @@ You can schedule packs to run for one or more agent policies. When scheduled, qu
 . Add queries to schedule:
 
 * To add a query to the pack, click *Add query*, and then either add a saved query or enter a new query.
-Each query must include a unique query ID and the interval at which it should run. 
+Each query must include a unique query ID and the interval at which it should run.
 Optionally, set the minimum Osquery version and platform,
 or <<osquery-map-fields,map ECS fields>>. When you add a saved query to a pack, this adds a copy of the query. A connection is not maintained between saved queries and packs.
 
@@ -105,7 +105,7 @@ or <<osquery-map-fields,map ECS fields>>. When you add a saved query to a pack,
 
 [float]
 [[osquery-schedule-status]]
-=== View status of scheduled packs
+== View status of scheduled packs
 
 . Open the **Packs** tab.
 
@@ -151,222 +151,16 @@ To add or edit saved queries from the *Saved queries* tab:
 
 ** The operating system required to run the query. For information about supported platforms per table, refer to the https://osquery.io/schema[Osquery schema].
 
-. Click *Test configuration* to test the query and any mapped fields: 
+. Click *Test configuration* to test the query and any mapped fields:
 
 * From the *Test query* panel, select agents or groups to test the query, then click *Submit* to run a live query. Result columns with the image:images/mapped-icon.png[mapping] icon are mapped. Hover over the icon to see the mapped ECS field.
 
-. Click *Save* or *Update*. 
+. Click *Save* or *Update*.
 
-[float]
-[[osquery-map-fields]]
-== Map result fields to ECS
-
-When you save queries or add queries to a pack, you can optionally map Osquery results or static values to fields in
-the {ecs-ref}/ecs-reference.html[Elastic Common Schema] (ECS).
-This standardizes your Osquery data for use across detections, machine learning,
-and any other areas that rely on ECS-compliant data.
-When the query is run, the results include the original `osquery.<fields>`
-and the mapped ECS fields. For example, if you update a query to map `osquery.name` to `user.name`, the query results include both fields. 
-
-. Edit saved queries or queries in a pack to map fields:
-
-* For *Saved queries*: Open the *Saved queries* tab, and then click the edit icon for the query that you want to map.
-
-* For *packs*: Open the *Packs* tab, edit a pack, and then click the edit icon for the query that you want to map.
-
-. In the **ECS mapping** section, select an **ECS field** to map. 
-
-. In the **Value** column, use the dropdown on the left to choose what type of value to map to the ECS field: 
-
-** **Osquery value**: Select an Osquery field. The fields available are based on the SQL query entered, and only include fields that the query returns. When the query runs, the ECS field is set dynamically to the value of the Osquery field selected.
-
-** **Static value**: Enter a static value. When the query runs, the ECS field is set to the value entered. For example, static fields can be used to apply `tags` or your preferred `event.category` to the query results. 
-
-. Map more fields, as needed. To remove any mapped rows, click the delete icon.
-
-. Save your changes.
-
-[NOTE]
-=========================
-
-* Some ECS fields are restricted and cannot be mapped. These are not available in the ECS dropdown.
-
-* Some ECS fields are restricted to a set of allowed values, like {ecs-ref}/ecs-event.html#field-event-category[event.category]. Use the {ecs-ref}/ecs-field-reference.html[ECS Field Reference] for help when mapping fields. 
-
-* Osquery date fields have a variety of data types (including integer, text, or bigint). When mapping an Osquery date field to an ECS date field, you might need to use SQL operators in the query to get an {es}-compatible 
-{ref}/date.html[date] type. 
-=========================
-
-
-[float]
-[[osquery-extended-tables]]
-== Extended tables for Kubernetes queries
-In addition to the Osquery schema, the Elastic-provided version of Osquery also includes the following tables to support Kubernetes containers. These can be queried with live or scheduled queries.
-
-* `host_users`
+--
 
-* `host_groups`
+include::advanced-osquery.asciidoc[]
 
-* `host_processes`
-
-When querying these tables, the expectation is that the `/etc/passwd`, `/etc/group`, and `/proc` are available in the container under `/hostfs` as:
-`/hostfs/etc/passwd`, `/hostfs/etc/group`, and `/hostfs/proc`. For information about the fields available in these tables, see the
-https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields] reference. 
-
-[float]
-[[osquery-status]]
-== Osquery status
-
-A query can have the following status:
-
-[cols="2*<"]
-|===
-| Successful | The query successfully completed.
-| Failed | The query encountered a problem, such as an issue with the query or the agent was disconnected, and might have failed.
-| Not yet responded | The query has not been sent to the agent.
-| Expired | The action request timed out. The agent may be offline.
-|===
-
-NOTE: If an agent is offline, the request status remains **pending** as {kib} retries the request.
-By default, a query request times out after five minutes. The time out applies to the time it takes
-to deliver the action request to an agent to run a query. If the action completes after the timeout period,
-the results are still returned.
-
-
-[float]
-[[osquery-results]]
-== Osquery results
-When you run live or scheduled queries, the results are automatically 
-stored in an {es} index, so that you can search, analyze, and visualize this data in {kib}.
-For a list of the Osquery fields that can be returned in query results,
-refer to https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields].
-Query results can also include ECS fields, if the query has a defined ECS mapping.
-
-Osquery responses include the following information:
-
-* Everything prefaced with `osquery.` is part of the query response. These fields are not mapped to ECS by default.
-
-* Results include some ECS fields by default, such as `host.*` and `agent.*`, which provide information about the host that was queried.
-
-* For live queries, the `action_data.query` is the query that was sent.
-
-* For scheduled queries in a pack, the `action_id` has the format `pack_<pack-name>_<query-ID>`. You can use this information to look up the query that was run.
-
-* By default, all query results are https://osquery.readthedocs.io/en/stable/deployment/logging/#snapshot-logs[snapshot logs]
-that represent a point in time with a set of results, with no 
-https://osquery.readthedocs.io/en/stable/deployment/logging/#differential-logs[differentials].
-
-* Osquery data is stored in the `logs-osquery_manager.result-<namespace>` datastream, and the result row data is under the `osquery` property in the document. 
-
-[float]
-[[manage-osquery-integration]]
-== Manage the integration
+include::manage-integration.asciidoc[]
 
-[float]
-=== System requirements
-
-* {fleet-guide}/fleet-overview.html[Fleet] is enabled on your cluster, and
-one or more {fleet-guide}/elastic-agent-installation.html[Elastic Agents] is enrolled.
-* The https://docs.elastic.co/en/integrations/osquery_manager[*Osquery Manager*] integration
-has been added and configured
-for an agent policy through Fleet.
-This integration supports x64 architecture on Windows, MacOS, and Linux platforms, 
-and ARM64 architecture on Linux.
-
-[NOTE]
-=========================
-
-* The original {filebeat-ref}/filebeat-module-osquery.html[Filebeat Osquery module]
-and the https://docs.elastic.co/en/integrations/osquery[Osquery]
-integration collect logs from self-managed Osquery deployments.
-The *Osquery Manager* integration manages Osquery deployments
-and supports running and scheduling queries from {kib}.
-
-* *Osquery Manager* cannot be integrated with an Elastic Agent in standalone mode.
-=========================
-
-[float]
-=== Customize Osquery sub-feature privileges
-
-Depending on your https://www.elastic.co/subscriptions[subscription level],
-you can further customize the sub-feature privileges
-for *Osquery Manager*. These include options to grant specific access for running live queries,
-running saved queries, saving queries, and scheduling packs. For example,
-you can create roles for users who can only run live or saved queries, but who cannot save or schedule queries.
-This is useful for teams who need in-depth and detailed control.
-
-[float]
-=== Customize Osquery configuration
-experimental[] By default, all Osquery Manager integrations share the same osquery configuration. However, you can customize how Osquery is configured by editing the Osquery Manager integration for each agent policy
-you want to adjust. The custom configuration is then applied to all agents in the policy. 
-This powerful feature allows you to configure
-https://osquery.readthedocs.io/en/stable/deployment/file-integrity-monitoring[File Integrity Monitoring], https://osquery.readthedocs.io/en/stable/deployment/process-auditing[Process auditing], 
-and https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-specification[others].
-
-[IMPORTANT]
-=========================
-
-* Take caution when editing this configuration. The changes you make are distributed to all agents in the policy.
-
-* Take caution when editing `packs` using the Advanced *Osquery config* field. 
-Any changes you make to `packs` from this field are not reflected in the UI on the Osquery *Packs* page in {kib}, however, these changes are deployed to agents in the policy. 
-While this allows you to use advanced Osquery functionality like pack discovery queries, you do lose the ability to manage packs defined this way from the Osquery *Packs* page.
-=========================
-
-. From the {kib} main menu, click *Fleet*, then the *Agent policies* tab.
-
-. Click the name of the agent policy where you want to adjust the Osquery configuration. The configuration changes you make only apply to the policy you select.
-
-. Click the name of the *Osquery Manager* integration, or add the integration first if the agent policy does not yet have it.
-
-. From the *Edit Osquery Manager integration* page, expand the *Advanced* section.
-
-. Edit the *Osquery config* JSON field to apply your preferred Osquery configuration. Note the following:
-
-* The field may already have content if you have scheduled packs for this agent policy. To keep these packs scheduled, do not remove the `packs` section.
-
-* Refer to the https://osquery.readthedocs.io/en/stable/[Osquery documentation] for configuration options. 
-
-* Some fields are protected and cannot be set. A warning is displayed with details about which fields should be removed.
-
-* (Optional) To load a full configuration file, drag and drop an Osquery `.conf` file into the area at the bottom of the page.
-
-. Click *Save integration* to apply the custom configuration to all agents in the policy.
-+
-As an example, the following configuration disables two tables.
-+
-```ts
-{
-   "options":{
-      "disable_tables":"curl,process_envs"
-   }
-}
-```
-
-[float]
-=== Upgrade Osquery versions
-
-The https://github.com/osquery/osquery/releases[Osquery version] available on an Elastic Agent
-is associated to the version of Osquery Beat on the Agent.
-To get the latest version of Osquery Beat,
-https://www.elastic.co/guide/en/fleet/master/upgrade-elastic-agent.html[upgrade your Elastic Agent].
-
-[float]
-=== Debug issues
-If you encounter issues with *Osquery Manager*, find the relevant logs for {elastic-agent}
-and Osquerybeat in the agent directory. Refer to the {fleet-guide}/installation-layout.html[Fleet Installation layout] to find the log file location for your OS.
-
-```ts
-../data/elastic-agent-*/logs/elastic-agent-json.log-*
-../data/elastic-agent-*/logs/default/osquerybeat-json.log
-```
-
-To get more details in the logs, change the agent logging level to debug:
-
-. Open the main menu, and then select **Fleet**.
-
-. Select the agent that you want to debug.
-
-. On the **Logs** tab, change the **Agent logging level** to **debug**, and then click **Apply changes**.
-+
-`agent.logging.level` is updated in `fleet.yml`, and the logging level is changed to `debug`.
+include::exported-fields-reference.asciidoc[]
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index 2c9d48813781a..9a96eec55db32 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -329,7 +329,7 @@ This content has moved. Refer to <<kuery-query>>.
 [role="exclude",id="discover-document-context"]
 == View surrounding documents
 
-This content has moved. Refer to <<discover-view-surrounding-documents>>.
+This content has moved. Refer to <<document-explorer>>.
 
 [role="exclude",id="field-formatters-string"]
 == String field formatters
@@ -405,3 +405,8 @@ This content has moved. Refer to {kibana-ref-all}/7.17/upgrade-assistant.html[Up
 == Install {kib} on macOS with Homebrew
 
 This page has been deleted. Refer to <<install>>.
+
+[role="exclude",id="discover-view-document"]
+== View a document
+
+This page has been deleted. Refer to <<document-explorer>>.
diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
index 51fa0b71f9601..3d15c3cc5e368 100644
--- a/docs/settings/alert-action-settings.asciidoc
+++ b/docs/settings/alert-action-settings.asciidoc
@@ -198,24 +198,26 @@ For example, `20m`, `24h`, `7d`. Default: `1m`.
 `xpack.alerting.rules.minimumScheduleInterval.enforce`::
 Specifies the behavior when a new or changed rule has a schedule interval less than the value defined in `xpack.alerting.rules.minimumScheduleInterval.value`. If `false`, rules with schedules less than the interval will be created but warnings will be logged. If `true`, rules with schedules less than the interval cannot be created. Default: `false`.
 
-`xpack.alerting.rules.execution.actions.max`::
+`xpack.alerting.rules.run.actions.max`::
 Specifies the maximum number of actions that a rule can trigger each time detection checks run.
 
-`xpack.alerting.rules.execution.timeout`::
+`xpack.alerting.rules.run.timeout`::
 Specifies the default timeout for tasks associated with all types of rules. The time is formatted as:
 +
 `<count>[ms,s,m,h,d,w,M,Y]`
 +
 For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
 
-`xpack.alerting.rules.execution.ruleTypeOverrides`::
-Overrides the configs under `xpack.alerting.rules.execution` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
+`xpack.alerting.rules.run.ruleTypeOverrides`::
+Overrides the configs under `xpack.alerting.rules.run` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
 +
+--
 For example:
 ```
-xpack.alerting.rules.execution:
+xpack.alerting.rules.run:
     timeout: '5m'
     ruleTypeOverrides:
         - id: '.index-threshold'
           timeout: '15m'
-```
\ No newline at end of file
+```
+--
\ No newline at end of file
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index f5dca28a7da1c..2d52abc1f0138 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -289,11 +289,11 @@ is an alternative to `elasticsearch.username` and `elasticsearch.password`.
 | `interpreter.enableInVisualize`
   | Enables use of interpreter in Visualize. *Default: `true`*
 
-| `data.autocomplete.valueSuggestions.timeout:` {ess-icon}
+| `unifiedSearch.autocomplete.valueSuggestions.timeout:` {ess-icon}
  | Time in milliseconds to wait for autocomplete suggestions from {es}.
 This value must be a whole number greater than zero. *Default: `"1000"`*
 
-| `data.autocomplete.valueSuggestions.terminateAfter:` {ess-icon}
+| `unifiedSearch.autocomplete.valueSuggestions.terminateAfter:` {ess-icon}
  | Maximum number of documents loaded by each shard to generate autocomplete
 suggestions. This value must be a whole number greater than zero.
 *Default: `"100000"`*
diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
index db9d302709092..686e10265df7b 100644
--- a/docs/setup/upgrade.asciidoc
+++ b/docs/setup/upgrade.asciidoc
@@ -46,7 +46,11 @@ Take these extra steps to ensure you are ready for migration.
 
 [float]
 ==== Ensure your {es} cluster is healthy
-Problems with your {es} cluster can prevent {kib} upgrades from succeeding. Ensure that your cluster has:
+Problems with your {es} cluster can prevent {kib} upgrades from succeeding.
+
+During the upgrade process, {kib} creates new indices into which updated documents are written. If a cluster is approaching the low watermark, there's a high risk of {kib} not being able to create these. Reading, transforming and writing updated documents can be memory intensive, using more available heap than during routine operation. You must make sure that enough heap is available to prevent requests from timing out or throwing errors from circuit breaker exceptions. You should also ensure that all shards are replicated and assigned.
+
+A healthy cluster has:
 
  * Enough free disk space, at least twice the amount of storage taken up by the `.kibana` and `.kibana_task_manager` indices
  * Sufficient heap size
diff --git a/docs/setup/upgrade/resolving-migration-failures.asciidoc b/docs/setup/upgrade/resolving-migration-failures.asciidoc
index 5b590c359cc69..3cbfb4c9c2abe 100644
--- a/docs/setup/upgrade/resolving-migration-failures.asciidoc
+++ b/docs/setup/upgrade/resolving-migration-failures.asciidoc
@@ -99,7 +99,7 @@ object types will also log the following warning message:
 
 [source,sh]
 --------------------------------------------
-CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
+CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that future upgrades will succeed, either re-enable plugins or delete these documents from the ".kibana_7.17.0_001" index after the current upgrade completes.
 --------------------------------------------
 
 If you fail to remedy this, your upgrade to 8.0+ will fail with a message like:
@@ -123,3 +123,67 @@ In {kib} 7.5.0 and earlier, when the task manager index is set to `.tasks`
 with the configuration setting `xpack.tasks.index: ".tasks"`,
 upgrade migrations fail. In {kib} 7.5.1 and later, the incompatible configuration
 setting prevents upgrade migrations from starting.
+
+[float]
+==== Repeated time-out requests that eventually fail
+Migrations get stuck in a loop of retry attempts waiting for index yellow status that's never reached.
+In the CLONE_TEMP_TO_TARGET or CREATE_REINDEX_TEMP steps, you might see a log entry similar to:
+
+[source,sh]
+--------------------------------------------
+"Action failed with [index_not_yellow_timeout] Timeout waiting for the status of the [.kibana_8.1.0_001] index to become "yellow". Retrying attempt 1 in 2 seconds."
+--------------------------------------------
+The process is waiting for a yellow index status. There are two known causes:
+
+* Cluster hits the low watermark for disk usage
+* Cluster has <<routing-allocation-disabled,routing allocation disabled>>
+
+Before retrying the migration, inspect the output of the `_cluster/allocation/explain?index=${targetIndex}` API to identify why the index isn't yellow:
+
+[source,sh]
+--------------------------------------------
+GET _cluster/allocation/explain
+{
+  "index": ".kibana_8.1.0_001",
+  "shard": 0,
+  "primary": true,
+}
+--------------------------------------------
+If the cluster exceeded the low watermark for disk usage, the output should contain a message similar to this:
+
+[source,sh]
+--------------------------------------------
+"The node is above the low watermark cluster setting [cluster.routing.allocation.disk.watermark.low=85%], using more disk space than the maximum allowed [85.0%], actual free: [11.692661332965082%]"
+--------------------------------------------
+Refer to the {es} guide for how to {ref}/fix-common-cluster-issues.html#_error_disk_usage_exceeded_flood_stage_watermark_index_has_read_only_allow_delete_block[fix common cluster issues].
+
+If routing allocation is the issue, the `_cluster/allocation/explain` API will return an entry similar to this:
+
+[source,sh]
+--------------------------------------------
+"allocate_explanation" : "cannot allocate because allocation is not permitted to any of the nodes"
+--------------------------------------------
+
+[float]
+[[routing-allocation-disabled]]
+==== Routing allocation disabled or restricted
+Upgrade migrations fail because routing allocation is disabled or restricted (`cluster.routing.allocation.enable: none/primaries/new_primaries`), which causes {kib} to log errors such as:
+
+[source,sh]
+--------------------------------------------
+Unable to complete saved object migrations for the [.kibana] index: The elasticsearch cluster has cluster routing allocation incorrectly set for migrations to continue. To proceed, please remove the cluster routing allocation settings with PUT /_cluster/settings {"transient": {"cluster.routing.allocation.enable": null}, "persistent": {"cluster.routing.allocation.enable": null}}
+--------------------------------------------
+
+To get around the issue, remove the transient and persisted routing allocation settings:
+[source,sh]
+--------------------------------------------
+PUT /_cluster/settings
+{
+  "transient": {
+    "cluster.routing.allocation.enable": null
+  }, 
+  "persistent": {
+    "cluster.routing.allocation.enable": null
+  }
+}
+--------------------------------------------
diff --git a/docs/user/alerting/create-and-manage-rules.asciidoc b/docs/user/alerting/create-and-manage-rules.asciidoc
index 23e79911fd5ee..ba1629abd9c86 100644
--- a/docs/user/alerting/create-and-manage-rules.asciidoc
+++ b/docs/user/alerting/create-and-manage-rules.asciidoc
@@ -140,17 +140,21 @@ Actions are not required on rules. You can run a rule without actions to underst
 
 [float]
 [[controlling-rules]]
-=== Mute and disable rules
+=== Snooze and disable rules
 
-The rule listing allows you to quickly mute/unmute, disable/enable, and delete individual rules by clicking menu button to open the actions menu. Muting means that the rule checks continue to run on a schedule, but that alert will not trigger any action.
+The rule listing enables you to quickly snooze, disable or enable, and delete individual rules using the colored dropdown.
 
 [role="screenshot"]
-image:images/individual-mute-disable.png[The actions button allows an individual rule to be muted, disabled, or deleted]
+image:images/individual-snooze-disable.png[The rule status dropdown enables you to snooze or disable an individual rule]
 
-You can perform these operations in bulk by multi-selecting rules, and then clicking the *Manage rules* button:
+When you snooze a rule, the rule checks continue to run on a schedule but the alert will not trigger any actions. You can snooze for a specified period of time or indefinitely.
 
 [role="screenshot"]
-image:images/bulk-mute-disable.png[The Manage rules button lets you mute/unmute, enable/disable, and delete in bulk,width=75%]
+image:images/snooze-panel.png[The snooze panel allows you to set the length of a rule's snooze period]
+
+When a rule is in a `snoozed` state, you can cancel or change the duration of this state. You can perform these operations in bulk by multi-selecting rules, and then clicking the *Manage rules* button. 
+
+TIP: In this context, "Mute" refers to an indefinite snooze. preview:[]
 
 [float]
 === Rule status
diff --git a/docs/user/alerting/images/bulk-mute-disable.png b/docs/user/alerting/images/bulk-mute-disable.png
deleted file mode 100644
index 7ac4ac8fc3daf..0000000000000
Binary files a/docs/user/alerting/images/bulk-mute-disable.png and /dev/null differ
diff --git a/docs/user/alerting/images/individual-snooze-disable.png b/docs/user/alerting/images/individual-snooze-disable.png
new file mode 100644
index 0000000000000..354d996ee74a1
Binary files /dev/null and b/docs/user/alerting/images/individual-snooze-disable.png differ
diff --git a/docs/user/alerting/images/rules-and-connectors-ui.png b/docs/user/alerting/images/rules-and-connectors-ui.png
index 3a464fa7cf375..b13e0ff4a2f78 100644
Binary files a/docs/user/alerting/images/rules-and-connectors-ui.png and b/docs/user/alerting/images/rules-and-connectors-ui.png differ
diff --git a/docs/user/alerting/images/snooze-panel.png b/docs/user/alerting/images/snooze-panel.png
new file mode 100644
index 0000000000000..b09a509c57ca9
Binary files /dev/null and b/docs/user/alerting/images/snooze-panel.png differ
diff --git a/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc b/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
index 4bd06284d8d6c..7ab34dacacd98 100644
--- a/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
+++ b/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
@@ -85,7 +85,7 @@ and in the <<rule-details,details page>>:
 [role="screenshot"]
 image::images/rule-details-timeout-error.png[Rule details page with timeout error]
 
-If you want your rules to run longer, update the `xpack.alerting.rules.execution.timeout` configuration in your <<alert-settings>>. You can also target a specific rule type by using `xpack.alerting.rules.execution.ruleTypeOverrides`.
+If you want your rules to run longer, update the `xpack.alerting.rules.run.timeout` configuration in your <<alert-settings>>. You can also target a specific rule type by using `xpack.alerting.rules.run.ruleTypeOverrides`.
 
 Rules that consistently run longer than their <<create-edit-rules, check interval>> may produce unexpected results. If the average run duration, visible on the <<rule-details,details page>>, is greater than the check interval, consider increasing the check interval.
 
diff --git a/docs/user/discover.asciidoc b/docs/user/discover.asciidoc
index 3d08bceaccc7b..257cd9c856dab 100644
--- a/docs/user/discover.asciidoc
+++ b/docs/user/discover.asciidoc
@@ -54,13 +54,15 @@ Tell {kib} where to find the data you want to explore, and then specify the time
 +
 {kib} uses a <<data-views,{data-source}>> to tell it where to find
 your {es} data.
-To view the ecommerce sample data, make sure the {data-source} is set to **kibana_sample_data_ecommerce**.
+To view the ecommerce sample data, select **kibana_sample_data_ecommerce**
+from the {data-source} dropdown.
 +
 [role="screenshot"]
 image::images/discover-data-view.png[How to set the {data-source} in Discover, width=50%]
 +
 To create a data view for your own data,
-click the ellipsis icon (…​), and then click *Create new data view*.
+click
+image:images/actions-icon.png[three dots icon next to data view dropdown], and then click *Create new data view*.
 For details, refer to <<data-views, Create a data view.>>
 
 . Adjust the <<set-time-filter,time range>> to view data for the *Last 7 days*.
@@ -76,9 +78,10 @@ click and drag the mouse over the chart.
 [[explore-fields-in-your-data]]
 === Explore the fields in your data
 
-**Discover** includes a table that shows all the documents that match your search.
-By default, the table includes columns for the time field and the document `_source`.
-You’ll modify this table to display your fields of interest.
+**Discover** includes a table
+that shows all the documents that match your search.
+By default, the document table includes a column for the time field and a column that lists all other fields in the document.
+You’ll modify the document table to display your fields of interest.
 
 . Scan through the list of **Available fields** until you find the `manufacturer` field.
 You can also search for the field by name.
@@ -94,15 +97,18 @@ image:images/find-manufacturer-field.png[Fields list that displays the top five
 . Click image:images/add-icon.png[Add icon] to toggle the field into the document table.
 
 . Find the `customer_first_name` and `customer_last_name` fields and add
-them to your document table. Your table should look similar to this:
+them to the document table. Your table should look similar to this:
 +
 [role="screenshot"]
 image:images/document-table.png[Document table with fields for manufacturer, customer_first_name, and customer_last_name]
 
-. To rearrange the table columns, hover the mouse over a
-column header, and then use the move control.
+. To rearrange the table columns, click a
+column header, and then select *Move left* or *Move right*.
 
-. To view more of the document table, click *Chart options > Hide chart*.
+. To view more of the document table, click
+image:images/chart-icon.png[icon button for opening Show/Hide chart menu, width=24px]
+to open the *Chart options* menu,
+and then select *Hide chart*.
 
 [float]
 [[add-field-in-discover]]
@@ -114,7 +120,8 @@ You can add a runtime field to your {data-source} from inside of **Discover**,
 and then use that field for analysis and visualizations,
 the same way you do with other fields.
 
-. Click the ellipsis icon (...), and then click *Add field*.
+. Click
+image:images/actions-icon.png[three dots icon next to data view dropdown], and then click *Add field*.
 +
 [role="screenshot"]
 image:images/add-field-to-data-view.png[Dropdown menu located next to {data-source} field with item for adding a field to a {data-source}, width=50%]
@@ -131,10 +138,10 @@ emit("Hello World!");
 
 . Click *Save*.
 
-. In the fields list, search for the *hello* field, and then add it to the table to view it's value.
+. In the fields list, search for the *hello* field, and then add it to the document table to view it's value.
 +
 [role="screenshot"]
-image:images/hello-field.png[hello field in the document table]
+image:images/hello-field.png[hello field in the document tables]
 
 . Create a second field named `customer` that combines customer last name and first initial.
 +
@@ -143,7 +150,7 @@ String str = doc['customer_first_name.keyword'].value;
 char ch1 = str.charAt(0);
 emit(doc['customer_last_name.keyword'].value + ", " + ch1);
 ```
-. Simplify the the document table by removing `customer_first_name` and `customer_last_name` and adding `customer` in their place.
+. Remove `customer_first_name` and `customer_last_name` from the document table, and then add `customer`.
 +
 [role="screenshot"]
 image:images/customer.png[Customer last name, first initial in the document table]
@@ -208,29 +215,31 @@ click the close icon (x) next to its name in the filter bar.
 Dive into an individual document to view its fields and the documents
 that occurred before and after it.
 
-. In the document table, expand any document.
+. In the document table, click the expand icon
+image:images/expand-icon-2.png[double arrow icon to open a flyout with the document details]
+to show document details.
 +
 [role="screenshot"]
 image:images/document-table-expanded.png[Table view with document expanded]
 
 . Scan through the fields and their values. If you find a field of interest,
-hover over its name for filters and other controls.
+click
+image:images/actions-icon.png[three dots icon next to data view dropdown] in the *Actions* column for filters and other controls.
 
 . To view documents that occurred before or after the event you are looking at, click
-<<discover-view-surrounding-documents, View surrounding documents>>.
+**Surrounding documents**.
 
-. For direct access to a particular document, click **<<discover-view-single-document,View single document>>**.
-+
-You can bookmark this document and share the link.
+. To create a view of the document that you can bookmark and share, click **Single document**.
 
 
 [float]
 [[save-your-search]]
 === Save your search for later use
 
-Save your search so you can repeat it later, generate a CSV report, or use it in visualizations, dashboards, and Canvas workpads.
+Save your search so you can use it later, generate a CSV report, or use it to create visualizations, dashboards, and Canvas workpads.
 Saving a search saves the query text, filters,
-and current view of *Discover*, including the columns selected in the document table, the sort order, and the {data-source}.
+and current view of *Discover*, including the columns selected in
+the document table, the sort order, and the {data-source}.
 
 . In the toolbar, click **Save**.
 
@@ -281,8 +290,7 @@ Go to **Advanced Settings** to configure the number of documents to show,
 the table columns that display by default, and more.
 
 --
-
-include::{kib-repo-dir}/discover/view-document.asciidoc[]
+include::{kib-repo-dir}/discover/document-explorer.asciidoc[]
 
 include::{kib-repo-dir}/discover/search-for-relevance.asciidoc[]
 
@@ -290,6 +298,4 @@ include::{kib-repo-dir}/discover/save-search.asciidoc[]
 
 include::{kib-repo-dir}/discover/search-sessions.asciidoc[]
 
-include::{kib-repo-dir}/discover/document-explorer.asciidoc[]
-
 include::{kib-repo-dir}/discover/field-statistics.asciidoc[]
diff --git a/docs/user/production-considerations/task-manager-health-monitoring.asciidoc b/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
index 6232f20d28972..f975816462962 100644
--- a/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
+++ b/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
@@ -21,7 +21,7 @@ $ curl -X GET api/task_manager/_health
 --------------------------------------------------
 // KIBANA
 
-Monitoring the `_health` endpoint of each {kib} instance in the cluster is the recommended method of ensuring confidence in mission critical services such as Alerting and Actions.
+Monitoring the `_health` endpoint of each {kib} instance in the cluster is the recommended method of ensuring confidence in mission critical services such as Alerting, Actions, and Reporting.
 
 [float]
 [[task-manager-configuring-health-monitoring]]
diff --git a/docs/user/production-considerations/task-manager-production-considerations.asciidoc b/docs/user/production-considerations/task-manager-production-considerations.asciidoc
index 28c5f6e4f14c8..8dd27d4e2d5ee 100644
--- a/docs/user/production-considerations/task-manager-production-considerations.asciidoc
+++ b/docs/user/production-considerations/task-manager-production-considerations.asciidoc
@@ -105,7 +105,7 @@ A recommended strategy is to follow these steps:
 3. If the throughput is insufficient, and {kib} instances exhibit low resource usage, incrementally scale vertically while <<kibana-page,monitoring>> the impact of these changes.
 4. If the throughput is insufficient, and {kib} instances are exhibiting high resource usage, incrementally scale horizontally by provisioning new {kib} instances and reassess.
 
-Task Manager, like the rest of the Elastic Stack, is designed to scale horizontally. Take advantage of this ability to ensure mission critical services, such as Alerting and Reporting, always have the capacity they need.
+Task Manager, like the rest of the Elastic Stack, is designed to scale horizontally. Take advantage of this ability to ensure mission critical services, such as Alerting, Actions, and Reporting, always have the capacity they need.
 
 Scaling horizontally requires a higher degree of coordination between {kib} instances. One way Task Manager coordinates with other instances is by delaying its polling schedule to avoid conflicts with other instances.
 By using <<task-manager-health-monitoring, health monitoring>> to evaluate the <<task-manager-health-evaluate-the-runtime,date of the `last_polling_delay`>> across a deployment, you can estimate the frequency at which Task Manager resets its delay mechanism.
diff --git a/docs/user/production-considerations/task-manager-troubleshooting.asciidoc b/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
index 606dd3c8a24ee..de765ea542ecd 100644
--- a/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
+++ b/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
@@ -6,7 +6,7 @@
 <titleabbrev>Troubleshooting</titleabbrev>
 ++++
 
-Task Manager is used by a wide range of services in {kib}, such as <<alerting-production-considerations, Alerting>>, Reporting, and Telemetry.
+Task Manager is used by a wide range of services in {kib}, such as <<alerting-production-considerations, Alerting>>, Actions, Reporting, and Telemetry.
 Unexpected behavior in these services might be a downstream issue originating in Task Manager.
 
 This page describes how to resolve common problems you might encounter with Task Manager.
diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
index c1e131cc057e0..a10c3a6ec8737 100644
--- a/docs/user/reporting/index.asciidoc
+++ b/docs/user/reporting/index.asciidoc
@@ -27,6 +27,10 @@ You access the options from the *Share* menu in the toolbar. The sharing options
 
 * *Embed code* &mdash; Embed a fully interactive dashboard or visualization as an iframe on a web page.
 
+[[reporting-on-cloud-resource-requirements]]
+NOTE: For Elastic Cloud deployments, Kibana instances require a minimum of 2GB RAM to generate PDF or PNG reports. To
+change Kibana sizing, {ess-console}[edit the deployment].
+
 [float]
 [[manually-generate-reports]]
 == Create reports
diff --git a/examples/bfetch_explorer/public/components/count_until/index.tsx b/examples/bfetch_explorer/public/components/count_until/index.tsx
index d40475f57971d..ca60c78818bdf 100644
--- a/examples/bfetch_explorer/public/components/count_until/index.tsx
+++ b/examples/bfetch_explorer/public/components/count_until/index.tsx
@@ -10,7 +10,7 @@ import React, { useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import useList from 'react-use/lib/useList';
 import { EuiForm, EuiSpacer, EuiFieldNumber, EuiFormRow, EuiButton } from '@elastic/eui';
-import { BfetchPublicSetup } from '../../../../../src/plugins/bfetch/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
 
 export interface Props {
   fetchStreaming: BfetchPublicSetup['fetchStreaming'];
diff --git a/examples/bfetch_explorer/public/hooks/use_deps.ts b/examples/bfetch_explorer/public/hooks/use_deps.ts
index 7d2ab87529833..a8c4b2ae1ad8f 100644
--- a/examples/bfetch_explorer/public/hooks/use_deps.ts
+++ b/examples/bfetch_explorer/public/hooks/use_deps.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { useKibana } from '../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { BfetchDeps } from '../mount';
 
 export const useDeps = () => useKibana().services as BfetchDeps;
diff --git a/examples/bfetch_explorer/public/mount.tsx b/examples/bfetch_explorer/public/mount.tsx
index 8c15405f2f6be..40d171f2d98a3 100644
--- a/examples/bfetch_explorer/public/mount.tsx
+++ b/examples/bfetch_explorer/public/mount.tsx
@@ -8,8 +8,8 @@
 
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { CoreSetup, CoreStart, AppMountParameters } from 'kibana/public';
-import { KibanaContextProvider } from '../../../src/plugins/kibana_react/public';
+import { CoreSetup, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { BfetchExplorerStartPlugins, ExplorerService } from './plugin';
 import { App } from './containers/app';
 
diff --git a/examples/bfetch_explorer/public/plugin.tsx b/examples/bfetch_explorer/public/plugin.tsx
index fd4687c5fb149..cc97a5a95ce72 100644
--- a/examples/bfetch_explorer/public/plugin.tsx
+++ b/examples/bfetch_explorer/public/plugin.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../src/core/public';
-import { BfetchPublicSetup, BfetchPublicStart } from '../../../src/plugins/bfetch/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { BfetchPublicSetup, BfetchPublicStart } from '@kbn/bfetch-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
 
 export interface ExplorerService {
   double: (number: { num: number }) => Promise<{ num: number }>;
diff --git a/examples/bfetch_explorer/server/plugin.ts b/examples/bfetch_explorer/server/plugin.ts
index 37d8645181dde..6e169b76beed1 100644
--- a/examples/bfetch_explorer/server/plugin.ts
+++ b/examples/bfetch_explorer/server/plugin.ts
@@ -7,8 +7,8 @@
  */
 
 import { Subject } from 'rxjs';
-import { Plugin, CoreSetup, CoreStart } from '../../../src/core/server';
-import { BfetchServerSetup, BfetchServerStart } from '../../../src/plugins/bfetch/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { BfetchServerSetup, BfetchServerStart } from '@kbn/bfetch-plugin/server';
 
 export interface BfetchExplorerSetupPlugins {
   bfetch: BfetchServerSetup;
diff --git a/examples/dashboard_embeddable_examples/public/app.tsx b/examples/dashboard_embeddable_examples/public/app.tsx
index c44d67c49f3d7..69d4668d829d7 100644
--- a/examples/dashboard_embeddable_examples/public/app.tsx
+++ b/examples/dashboard_embeddable_examples/public/app.tsx
@@ -18,10 +18,10 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 import 'brace/mode/json';
-import { AppMountParameters, IUiSettingsClient } from '../../../src/core/public';
+import { AppMountParameters, IUiSettingsClient } from '@kbn/core/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DashboardEmbeddableByValue } from './by_value/embeddable';
-import { DashboardStart } from '../../../src/plugins/dashboard/public';
-import { KibanaContextProvider } from '../../../src/plugins/kibana_react/public';
 
 interface PageDef {
   title: string;
diff --git a/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx b/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
index 76e0827ed3fd6..6107605f25017 100644
--- a/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
+++ b/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
@@ -7,12 +7,12 @@
  */
 
 import React, { useState } from 'react';
-import { ViewMode } from '../../../../src/plugins/embeddable/public';
-import { DashboardContainerInput, DashboardStart } from '../../../../src/plugins/dashboard/public';
-import { HELLO_WORLD_EMBEDDABLE } from '../../../embeddable_examples/public/hello_world';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { DashboardContainerInput, DashboardStart } from '@kbn/dashboard-plugin/public';
+import { HELLO_WORLD_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public/hello_world';
+import { TODO_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public/todo';
+import { TODO_REF_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public/todo/todo_ref_embeddable';
 import { InputEditor } from './input_editor';
-import { TODO_EMBEDDABLE } from '../../../embeddable_examples/public/todo';
-import { TODO_REF_EMBEDDABLE } from '../../../embeddable_examples/public/todo/todo_ref_embeddable';
 
 const initialInput: DashboardContainerInput = {
   viewMode: ViewMode.VIEW,
diff --git a/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx b/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
index a723712f395d0..1d205eea0efe1 100644
--- a/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
+++ b/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
-import { CodeEditor } from '../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 export const InputEditor = <T,>(props: { input: T; onSubmit: (value: T) => void }) => {
   const input = JSON.stringify(props.input, null, 4);
diff --git a/examples/dashboard_embeddable_examples/public/plugin.tsx b/examples/dashboard_embeddable_examples/public/plugin.tsx
index 14bd71523ef2f..0c31076df8c6c 100644
--- a/examples/dashboard_embeddable_examples/public/plugin.tsx
+++ b/examples/dashboard_embeddable_examples/public/plugin.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '../../../src/core/public';
-import { DashboardStart } from '../../../src/plugins/dashboard/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { EmbeddableExamplesStart } from '../../embeddable_examples/public/plugin';
+import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '@kbn/core/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { EmbeddableExamplesStart } from '@kbn/embeddable-examples-plugin/public/plugin';
 
 interface SetupDeps {
   developerExamples: DeveloperExamplesSetup;
diff --git a/examples/data_view_field_editor_example/public/app.tsx b/examples/data_view_field_editor_example/public/app.tsx
index cbad86d7e21d4..0a5b98ee41a04 100644
--- a/examples/data_view_field_editor_example/public/app.tsx
+++ b/examples/data_view_field_editor_example/public/app.tsx
@@ -19,10 +19,10 @@ import {
   EuiText,
   DefaultItemAction,
 } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
-import type { DataView, DataViewField } from '../../../src/plugins/data_views/public';
-import { IndexPatternFieldEditorStart } from '../../../src/plugins/data_view_field_editor/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
 
 interface Props {
   dataView?: DataView;
diff --git a/examples/data_view_field_editor_example/public/plugin.tsx b/examples/data_view_field_editor_example/public/plugin.tsx
index 3cf0ce618ad3b..087dd2ca8572b 100644
--- a/examples/data_view_field_editor_example/public/plugin.tsx
+++ b/examples/data_view_field_editor_example/public/plugin.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
-import { IndexPatternFieldEditorStart } from '../../../src/plugins/data_view_field_editor/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
 
 interface StartDeps {
   data: DataPublicPluginStart;
diff --git a/examples/developer_examples/public/app.tsx b/examples/developer_examples/public/app.tsx
index e9e277ed69bec..a179ebb6abb6a 100644
--- a/examples/developer_examples/public/app.tsx
+++ b/examples/developer_examples/public/app.tsx
@@ -22,7 +22,7 @@ import {
   EuiLink,
   EuiButtonIcon,
 } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { ExampleDefinition } from './types';
 
 interface Props {
diff --git a/examples/developer_examples/public/plugin.ts b/examples/developer_examples/public/plugin.ts
index 75a05ed95c8a1..c87bd2f5cc890 100644
--- a/examples/developer_examples/public/plugin.ts
+++ b/examples/developer_examples/public/plugin.ts
@@ -6,12 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  CoreSetup,
-  Plugin,
-  AppMountParameters,
-  DEFAULT_APP_CATEGORIES,
-} from '../../../src/core/public';
+import { CoreSetup, Plugin, AppMountParameters, DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 
 import { ExampleDefinition } from './types';
 
diff --git a/examples/embeddable_examples/common/book_saved_object_attributes.ts b/examples/embeddable_examples/common/book_saved_object_attributes.ts
index 596068c7231d0..077f54a0a0d08 100644
--- a/examples/embeddable_examples/common/book_saved_object_attributes.ts
+++ b/examples/embeddable_examples/common/book_saved_object_attributes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from '../../../src/core/types';
+import { SavedObjectAttributes } from '@kbn/core/types';
 
 export const BOOK_SAVED_OBJECT = 'book';
 
diff --git a/examples/embeddable_examples/common/todo_saved_object_attributes.ts b/examples/embeddable_examples/common/todo_saved_object_attributes.ts
index dcaee933a67cc..3a05e02e523f9 100644
--- a/examples/embeddable_examples/common/todo_saved_object_attributes.ts
+++ b/examples/embeddable_examples/common/todo_saved_object_attributes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from '../../../src/core/types';
+import { SavedObjectAttributes } from '@kbn/core/types';
 
 export interface TodoSavedObjectAttributes extends SavedObjectAttributes {
   task: string;
diff --git a/examples/embeddable_examples/public/book/add_book_to_library_action.tsx b/examples/embeddable_examples/public/book/add_book_to_library_action.tsx
index 00b0f69522f84..a9c922f110c09 100644
--- a/examples/embeddable_examples/public/book/add_book_to_library_action.tsx
+++ b/examples/embeddable_examples/public/book/add_book_to_library_action.tsx
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
+import { createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { ViewMode, isReferenceOrValueEmbeddable } from '@kbn/embeddable-plugin/public';
+import { DASHBOARD_CONTAINER_TYPE } from '@kbn/dashboard-plugin/public';
 import { BookEmbeddable, BOOK_EMBEDDABLE } from './book_embeddable';
-import { ViewMode, isReferenceOrValueEmbeddable } from '../../../../src/plugins/embeddable/public';
-import { DASHBOARD_CONTAINER_TYPE } from '../../../../src/plugins/dashboard/public';
 
 interface ActionContext {
   embeddable: BookEmbeddable;
diff --git a/examples/embeddable_examples/public/book/book_component.tsx b/examples/embeddable_examples/public/book/book_component.tsx
index 69535f09cb009..abe6d31b78f81 100644
--- a/examples/embeddable_examples/public/book/book_component.tsx
+++ b/examples/embeddable_examples/public/book/book_component.tsx
@@ -11,7 +11,7 @@ import { EuiFlexItem, EuiFlexGroup, EuiIcon } from '@elastic/eui';
 
 import { EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription } from '@kbn/embeddable-plugin/public';
 import { BookEmbeddableInput, BookEmbeddableOutput, BookEmbeddable } from './book_embeddable';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/book/book_embeddable.tsx b/examples/embeddable_examples/public/book/book_embeddable.tsx
index 024d9d90448eb..fac2c151df469 100644
--- a/examples/embeddable_examples/public/book/book_embeddable.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable.tsx
@@ -17,7 +17,7 @@ import {
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
   AttributeService,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { BookSavedObjectAttributes } from '../../common';
 import { BookEmbeddableComponent } from './book_component';
 
diff --git a/examples/embeddable_examples/public/book/book_embeddable_factory.tsx b/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
index f44446991fde5..7510107854a8f 100644
--- a/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
@@ -8,15 +8,16 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   EmbeddableFactoryDefinition,
   IContainer,
   EmbeddableFactory,
   EmbeddableStart,
   AttributeService,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { OverlayStart, SavedObjectsClientContract, SimpleSavedObject } from '@kbn/core/public';
+import { checkForDuplicateTitle, OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import {
   BookEmbeddable,
   BOOK_EMBEDDABLE,
@@ -24,12 +25,7 @@ import {
   BookEmbeddableOutput,
 } from './book_embeddable';
 import { CreateEditBookComponent } from './create_edit_book_component';
-import {
-  OverlayStart,
-  SavedObjectsClientContract,
-  SimpleSavedObject,
-} from '../../../../src/core/public';
-import { checkForDuplicateTitle, OnSaveProps } from '../../../../src/plugins/saved_objects/public';
+import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
 
 interface StartServices {
   getAttributeService: EmbeddableStart['getAttributeService'];
diff --git a/examples/embeddable_examples/public/book/edit_book_action.tsx b/examples/embeddable_examples/public/book/edit_book_action.tsx
index 0f2a44f177d4c..778b4177331c8 100644
--- a/examples/embeddable_examples/public/book/edit_book_action.tsx
+++ b/examples/embeddable_examples/public/book/edit_book_action.tsx
@@ -7,16 +7,17 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
-import { createAction } from '../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   ViewMode,
   SavedObjectEmbeddableInput,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   BookEmbeddable,
   BOOK_EMBEDDABLE,
@@ -24,8 +25,7 @@ import {
   BookByValueInput,
 } from './book_embeddable';
 import { CreateEditBookComponent } from './create_edit_book_component';
-import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
-import { SavedObjectsClientContract } from '../../../../src/core/public';
+import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
 
 interface StartServices {
   openModal: OverlayStart['openModal'];
diff --git a/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx b/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx
index 5e4680a8fea70..461bcf83e2dfa 100644
--- a/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx
+++ b/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
+import { createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { ViewMode, isReferenceOrValueEmbeddable } from '@kbn/embeddable-plugin/public';
+import { DASHBOARD_CONTAINER_TYPE } from '@kbn/dashboard-plugin/public';
 import { BookEmbeddable, BOOK_EMBEDDABLE } from './book_embeddable';
-import { ViewMode, isReferenceOrValueEmbeddable } from '../../../../src/plugins/embeddable/public';
-import { DASHBOARD_CONTAINER_TYPE } from '../../../../src/plugins/dashboard/public';
 
 interface ActionContext {
   embeddable: BookEmbeddable;
diff --git a/examples/embeddable_examples/public/create_sample_data.ts b/examples/embeddable_examples/public/create_sample_data.ts
index 3e49f62570238..612290bce78a8 100644
--- a/examples/embeddable_examples/public/create_sample_data.ts
+++ b/examples/embeddable_examples/public/create_sample_data.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { TodoSavedObjectAttributes, BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../common';
 
 export async function createSampleData(client: SavedObjectsClientContract, overwrite = true) {
diff --git a/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
index afec509037434..3f82356a1466e 100644
--- a/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Embeddable, EmbeddableInput, IContainer } from '../../../../src/plugins/embeddable/public';
+import { Embeddable, EmbeddableInput, IContainer } from '@kbn/embeddable-plugin/public';
 
 export const HELLO_WORLD_EMBEDDABLE = 'HELLO_WORLD_EMBEDDABLE';
 
diff --git a/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts b/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
index faa71f7296abe..2147c439cc691 100644
--- a/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
@@ -12,7 +12,7 @@ import {
   EmbeddableInput,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { HelloWorldEmbeddable, HELLO_WORLD_EMBEDDABLE } from './hello_world_embeddable';
 
 export type HelloWorldEmbeddableFactory = EmbeddableFactory;
diff --git a/examples/embeddable_examples/public/list_container/list_container.tsx b/examples/embeddable_examples/public/list_container/list_container.tsx
index 70a4f1ba44f2b..c4641ba0f68de 100644
--- a/examples/embeddable_examples/public/list_container/list_container.tsx
+++ b/examples/embeddable_examples/public/list_container/list_container.tsx
@@ -8,11 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {
-  Container,
-  ContainerInput,
-  EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+import { Container, ContainerInput, EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import { ListContainerComponent } from './list_container_component';
 
 export const LIST_CONTAINER = 'LIST_CONTAINER';
diff --git a/examples/embeddable_examples/public/list_container/list_container_component.tsx b/examples/embeddable_examples/public/list_container/list_container_component.tsx
index d939cc2029f65..d83ce243f37d2 100644
--- a/examples/embeddable_examples/public/list_container/list_container_component.tsx
+++ b/examples/embeddable_examples/public/list_container/list_container_component.tsx
@@ -16,7 +16,7 @@ import {
   ContainerOutput,
   EmbeddableStart,
   EmbeddableChildPanel,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 
 interface Props {
   embeddable: IContainer;
diff --git a/examples/embeddable_examples/public/list_container/list_container_factory.ts b/examples/embeddable_examples/public/list_container/list_container_factory.ts
index 7dc85fa476dfa..ddf889f2afd8a 100644
--- a/examples/embeddable_examples/public/list_container/list_container_factory.ts
+++ b/examples/embeddable_examples/public/list_container/list_container_factory.ts
@@ -13,7 +13,7 @@ import {
   EmbeddableStart,
   EmbeddableFactory,
   ContainerOutput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { LIST_CONTAINER, ListContainer } from './list_container';
 
 interface StartServices {
diff --git a/examples/embeddable_examples/public/migrations/migration.7.3.0.ts b/examples/embeddable_examples/public/migrations/migration.7.3.0.ts
index 5b31cfe2b4e66..79b61848a0166 100644
--- a/examples/embeddable_examples/public/migrations/migration.7.3.0.ts
+++ b/examples/embeddable_examples/public/migrations/migration.7.3.0.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { MigrateFunction } from '../../../../src/plugins/kibana_utils/common/persistable_state';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common/persistable_state';
+import { EmbeddableInput } from '@kbn/embeddable-plugin/common';
 import { SimpleEmbeddableInput } from './migrations_embeddable_factory';
-import { EmbeddableInput } from '../../../../src/plugins/embeddable/common';
 
 // before 7.3.0 this embeddable received a very simple input with a variable named `number`
 // eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx b/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx
index 871994ce2aaae..94f095efd62af 100644
--- a/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx
+++ b/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import { SIMPLE_EMBEDDABLE, SimpleEmbeddableInput } from '.';
-import { Embeddable, IContainer } from '../../../../src/plugins/embeddable/public';
 
 export class SimpleEmbeddable extends Embeddable<SimpleEmbeddableInput> {
   // The type of this embeddable. This will be used to find the appropriate factory
diff --git a/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts b/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts
index 61e6bfa56ec47..19efd95a12dde 100644
--- a/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts
+++ b/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EmbeddableStateWithType } from '../../../../src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import {
   IContainer,
   EmbeddableInput,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { SimpleEmbeddable } from './migrations_embeddable';
 import { migration730 } from './migration.7.3.0';
 
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
index 367ce80497728..cda168547b81f 100644
--- 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
@@ -17,7 +17,7 @@ import {
   EuiListGroup,
   EuiListGroupItem,
 } from '@elastic/eui';
-import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription } from '@kbn/embeddable-plugin/public';
 import {
   MultiTaskTodoEmbeddable,
   MultiTaskTodoOutput,
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
index 6ce3d456f37ff..eea615626fb5e 100644
--- 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
@@ -14,7 +14,7 @@ import {
   EmbeddableInput,
   IContainer,
   EmbeddableOutput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { MultiTaskTodoEmbeddableComponent } from './multi_task_todo_component';
 
 export const MULTI_TASK_TODO_EMBEDDABLE = 'MULTI_TASK_TODO_EMBEDDABLE';
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
index 7364f336b722c..4c147c760ba51 100644
--- 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
@@ -11,7 +11,7 @@ import {
   IContainer,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import {
   MultiTaskTodoEmbeddable,
   MULTI_TASK_TODO_EMBEDDABLE,
diff --git a/examples/embeddable_examples/public/plugin.ts b/examples/embeddable_examples/public/plugin.ts
index e59e7367e8af7..ffea5710e9ca2 100644
--- a/examples/embeddable_examples/public/plugin.ts
+++ b/examples/embeddable_examples/public/plugin.ts
@@ -10,8 +10,9 @@ import {
   EmbeddableSetup,
   EmbeddableStart,
   CONTEXT_MENU_TRIGGER,
-} from '../../../src/plugins/embeddable/public';
-import { Plugin, CoreSetup, CoreStart, SavedObjectsClient } from '../../../src/core/public';
+} from '@kbn/embeddable-plugin/public';
+import { Plugin, CoreSetup, CoreStart, SavedObjectsClient } from '@kbn/core/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   HelloWorldEmbeddableFactory,
   HELLO_WORLD_EMBEDDABLE,
@@ -46,7 +47,6 @@ import {
   BookEmbeddableFactory,
   BookEmbeddableFactoryDefinition,
 } from './book/book_embeddable_factory';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { createAddBookToLibraryAction } from './book/add_book_to_library_action';
 import { createUnlinkBookFromLibraryAction } from './book/unlink_book_from_library_action';
 import {
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
index 8a9fe85a5c4ef..f01e717ec364e 100644
--- a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
@@ -13,7 +13,7 @@ import {
   ContainerInput,
   EmbeddableStart,
   EmbeddableInput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { SearchableListContainerComponent } from './searchable_list_container_component';
 
 export const SEARCHABLE_LIST_CONTAINER = 'SEARCHABLE_LIST_CONTAINER';
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
index 972500c36475b..2c225303fee20 100644
--- 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
@@ -25,7 +25,7 @@ import {
   ContainerOutput,
   EmbeddableOutput,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { SearchableListContainer, SearchableContainerInput } from './searchable_list_container';
 
 interface Props {
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
index 5b09719f70b39..5964159512ffb 100644
--- 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
@@ -12,7 +12,7 @@ import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import {
   SEARCHABLE_LIST_CONTAINER,
   SearchableListContainer,
diff --git a/examples/embeddable_examples/public/todo/todo_component.tsx b/examples/embeddable_examples/public/todo/todo_component.tsx
index f2ba44de407ee..ed5dc89e4c547 100644
--- a/examples/embeddable_examples/public/todo/todo_component.tsx
+++ b/examples/embeddable_examples/public/todo/todo_component.tsx
@@ -13,10 +13,7 @@ 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 { withEmbeddableSubscription, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 import { TodoEmbeddable, TodoInput } from './todo_embeddable';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/todo/todo_embeddable.tsx b/examples/embeddable_examples/public/todo/todo_embeddable.tsx
index 82fcaadf2e172..d08eb7c637788 100644
--- a/examples/embeddable_examples/public/todo/todo_embeddable.tsx
+++ b/examples/embeddable_examples/public/todo/todo_embeddable.tsx
@@ -14,7 +14,7 @@ import {
   EmbeddableInput,
   IContainer,
   EmbeddableOutput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { TodoEmbeddableComponent } from './todo_component';
 
 export const TODO_EMBEDDABLE = 'TODO_EMBEDDABLE';
diff --git a/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx b/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx
index 2c8b3083fd990..456e28074ff03 100644
--- a/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx
+++ b/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx
@@ -9,15 +9,15 @@
 import React, { useState } from 'react';
 import { EuiModalBody } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { EuiFieldText } from '@elastic/eui';
 import { EuiButton } from '@elastic/eui';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   IContainer,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { TodoEmbeddable, TODO_EMBEDDABLE, TodoInput, TodoOutput } from './todo_embeddable';
 
 function TaskInput({ onSave }: { onSave: (task: string) => void }) {
diff --git a/examples/embeddable_examples/public/todo/todo_ref_component.tsx b/examples/embeddable_examples/public/todo/todo_ref_component.tsx
index d70db903d1dac..65c81aaefbd25 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_component.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_component.tsx
@@ -13,7 +13,7 @@ import { EuiText } from '@elastic/eui';
 import { EuiAvatar } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
 import { EuiFlexGrid } from '@elastic/eui';
-import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription } from '@kbn/embeddable-plugin/public';
 import { TodoRefInput, TodoRefOutput, TodoRefEmbeddable } from './todo_ref_embeddable';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx b/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx
index b797d8975665b..645fd443220a5 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx
@@ -9,14 +9,14 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
-import { TodoSavedObjectAttributes } from 'examples/embeddable_examples/common';
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   Embeddable,
   IContainer,
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { TodoSavedObjectAttributes } from '../../common';
 import { TodoRefEmbeddableComponent } from './todo_ref_component';
 
 // Notice this is not the same value as the 'todo' saved object type. Many of our
diff --git a/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx b/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx
index 467318658da19..2f3d79a672c90 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx
@@ -7,15 +7,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObjectsClientContract } from 'kibana/public';
-import { TodoSavedObjectAttributes } from 'examples/embeddable_examples/common';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   IContainer,
   EmbeddableStart,
   ErrorEmbeddable,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { TodoSavedObjectAttributes } from '../../common';
 import {
   TodoRefEmbeddable,
   TODO_REF_EMBEDDABLE,
diff --git a/examples/embeddable_examples/server/book_saved_object.ts b/examples/embeddable_examples/server/book_saved_object.ts
index 2a1866b8be82a..31ccb914b2335 100644
--- a/examples/embeddable_examples/server/book_saved_object.ts
+++ b/examples/embeddable_examples/server/book_saved_object.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const bookSavedObject: SavedObjectsType = {
   name: 'book',
diff --git a/examples/embeddable_examples/server/index.ts b/examples/embeddable_examples/server/index.ts
index ab32bdc9e7c2c..0139633a71d69 100644
--- a/examples/embeddable_examples/server/index.ts
+++ b/examples/embeddable_examples/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 
 import { EmbeddableExamplesPlugin } from './plugin';
 
diff --git a/examples/embeddable_examples/server/merge_migration_function_maps.ts b/examples/embeddable_examples/server/merge_migration_function_maps.ts
index 01a46949e6bbf..56c931613b0e3 100644
--- a/examples/embeddable_examples/server/merge_migration_function_maps.ts
+++ b/examples/embeddable_examples/server/merge_migration_function_maps.ts
@@ -8,7 +8,7 @@
 
 import { mergeWith } from 'lodash';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { MigrateFunctionsObject, MigrateFunction } from '../../../src/plugins/kibana_utils/common';
+import { MigrateFunctionsObject, MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 
 export const mergeMigrationFunctionMaps = (
   obj1: MigrateFunctionsObject,
diff --git a/examples/embeddable_examples/server/plugin.ts b/examples/embeddable_examples/server/plugin.ts
index 469c463381d1c..fbf9dc97ac790 100644
--- a/examples/embeddable_examples/server/plugin.ts
+++ b/examples/embeddable_examples/server/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import { todoSavedObject } from './todo_saved_object';
 import { bookSavedObject } from './book_saved_object';
 import { searchableListSavedObject } from './searchable_list_saved_object';
-import { EmbeddableSetup } from '../../../src/plugins/embeddable/server';
 
 export interface EmbeddableExamplesSetupDependencies {
   embeddable: EmbeddableSetup;
diff --git a/examples/embeddable_examples/server/searchable_list_saved_object.ts b/examples/embeddable_examples/server/searchable_list_saved_object.ts
index a3b12a05323f0..7990655822f5a 100644
--- a/examples/embeddable_examples/server/searchable_list_saved_object.ts
+++ b/examples/embeddable_examples/server/searchable_list_saved_object.ts
@@ -7,8 +7,8 @@
  */
 
 import { mapValues } from 'lodash';
-import { SavedObjectsType, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { EmbeddableSetup } from '../../../src/plugins/embeddable/server';
+import { SavedObjectsType, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 // NOTE: this should rather be imported from 'plugins/kibana_utils/server' but examples at the moment don't
 // allow static imports from plugins so this code was duplicated
 import { mergeMigrationFunctionMaps } from './merge_migration_function_maps';
diff --git a/examples/embeddable_examples/server/todo_saved_object.ts b/examples/embeddable_examples/server/todo_saved_object.ts
index 9ac75c248873a..4f987f8f10c72 100644
--- a/examples/embeddable_examples/server/todo_saved_object.ts
+++ b/examples/embeddable_examples/server/todo_saved_object.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const todoSavedObject: SavedObjectsType = {
   name: 'todo',
diff --git a/examples/embeddable_explorer/public/app.tsx b/examples/embeddable_explorer/public/app.tsx
index a23557669c000..ad7eb76188b54 100644
--- a/examples/embeddable_explorer/public/app.tsx
+++ b/examples/embeddable_explorer/public/app.tsx
@@ -12,21 +12,21 @@ import { BrowserRouter as Router, Route, withRouter, RouteComponentProps } from
 
 import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
 
-import { EmbeddableStart } from '../../../src/plugins/embeddable/public';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
-import { Start as InspectorStartContract } from '../../../src/plugins/inspector/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 import {
   AppMountParameters,
   CoreStart,
   SavedObjectsStart,
   IUiSettingsClient,
   OverlayStart,
-} from '../../../src/core/public';
+} from '@kbn/core/public';
+import { EmbeddableExamplesStart } from '@kbn/embeddable-examples-plugin/public/plugin';
 import { HelloWorldEmbeddableExample } from './hello_world_embeddable_example';
 import { TodoEmbeddableExample } from './todo_embeddable_example';
 import { ListContainerExample } from './list_container_example';
 import { EmbeddablePanelExample } from './embeddable_panel_example';
-import { EmbeddableExamplesStart } from '../../embeddable_examples/public/plugin';
 
 interface PageDef {
   title: string;
diff --git a/examples/embeddable_explorer/public/embeddable_panel_example.tsx b/examples/embeddable_explorer/public/embeddable_panel_example.tsx
index 6796ac4105aff..50c941938cb74 100644
--- a/examples/embeddable_explorer/public/embeddable_panel_example.tsx
+++ b/examples/embeddable_explorer/public/embeddable_panel_example.tsx
@@ -18,14 +18,14 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { EuiSpacer } from '@elastic/eui';
-import { EmbeddableStart, IEmbeddable } from '../../../src/plugins/embeddable/public';
+import { EmbeddableStart, IEmbeddable } from '@kbn/embeddable-plugin/public';
 import {
   HELLO_WORLD_EMBEDDABLE,
   TODO_EMBEDDABLE,
   BOOK_EMBEDDABLE,
   MULTI_TASK_TODO_EMBEDDABLE,
   SearchableListContainerFactory,
-} from '../../embeddable_examples/public';
+} from '@kbn/embeddable-examples-plugin/public';
 
 interface Props {
   embeddableServices: EmbeddableStart;
diff --git a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
index 815390b1e1a31..228dd0b9c14e7 100644
--- a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
+++ b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
@@ -17,11 +17,11 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { EmbeddableRenderer } from '../../../src/plugins/embeddable/public';
+import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
 import {
   HelloWorldEmbeddable,
   HelloWorldEmbeddableFactory,
-} from '../../embeddable_examples/public';
+} from '@kbn/embeddable-examples-plugin/public';
 
 interface Props {
   helloWorldEmbeddableFactory: HelloWorldEmbeddableFactory;
diff --git a/examples/embeddable_explorer/public/list_container_example.tsx b/examples/embeddable_explorer/public/list_container_example.tsx
index 9bfd56d9c9fb9..764f02b28e14c 100644
--- a/examples/embeddable_explorer/public/list_container_example.tsx
+++ b/examples/embeddable_explorer/public/list_container_example.tsx
@@ -18,17 +18,17 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { EmbeddableRenderer, ViewMode } from '../../../src/plugins/embeddable/public';
+import { EmbeddableRenderer, ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   HELLO_WORLD_EMBEDDABLE,
   MULTI_TASK_TODO_EMBEDDABLE,
   TODO_EMBEDDABLE,
   ListContainerFactory,
   SearchableListContainerFactory,
-} from '../../embeddable_examples/public';
-import { SearchableContainerInput } from '../../embeddable_examples/public/searchable_list_container/searchable_list_container';
-import { TodoInput } from '../../embeddable_examples/public/todo';
-import { MultiTaskTodoInput } from '../../embeddable_examples/public/multi_task_todo';
+} from '@kbn/embeddable-examples-plugin/public';
+import { SearchableContainerInput } from '@kbn/embeddable-examples-plugin/public/searchable_list_container/searchable_list_container';
+import { TodoInput } from '@kbn/embeddable-examples-plugin/public/todo';
+import { MultiTaskTodoInput } from '@kbn/embeddable-examples-plugin/public/multi_task_todo';
 
 interface Props {
   listContainerEmbeddableFactory: ListContainerFactory;
diff --git a/examples/embeddable_explorer/public/plugin.tsx b/examples/embeddable_explorer/public/plugin.tsx
index ea8c412e443ee..4d534ba56fda6 100644
--- a/examples/embeddable_explorer/public/plugin.tsx
+++ b/examples/embeddable_explorer/public/plugin.tsx
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableExamplesStart } from 'examples/embeddable_examples/public/plugin';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { UiActionsService } from '../../../src/plugins/ui_actions/public';
-import { EmbeddableStart } from '../../../src/plugins/embeddable/public';
-import { Start as InspectorStart } from '../../../src/plugins/inspector/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { EmbeddableExamplesStart } from '@kbn/embeddable-examples-plugin/public/plugin';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { UiActionsService } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import img from './embeddables.png';
 
 interface StartDeps {
diff --git a/examples/embeddable_explorer/public/todo_embeddable_example.tsx b/examples/embeddable_explorer/public/todo_embeddable_example.tsx
index 4c691e4800759..0710f5b0d082e 100644
--- a/examples/embeddable_explorer/public/todo_embeddable_example.tsx
+++ b/examples/embeddable_explorer/public/todo_embeddable_example.tsx
@@ -23,9 +23,9 @@ import {
   EuiTextArea,
   EuiTitle,
 } from '@elastic/eui';
-import { TodoInput } from '../../../examples/embeddable_examples/public/todo';
-import { TodoEmbeddableFactory } from '../../../examples/embeddable_examples/public';
-import { EmbeddableRenderer } from '../../../src/plugins/embeddable/public';
+import { TodoInput } from '@kbn/embeddable-examples-plugin/public/todo';
+import { TodoEmbeddableFactory } from '@kbn/embeddable-examples-plugin/public';
+import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
 
 interface Props {
   todoEmbeddableFactory: TodoEmbeddableFactory;
diff --git a/examples/expressions_explorer/public/actions/navigate_action.ts b/examples/expressions_explorer/public/actions/navigate_action.ts
index e116519b17630..b1ba30d995fd6 100644
--- a/examples/expressions_explorer/public/actions/navigate_action.ts
+++ b/examples/expressions_explorer/public/actions/navigate_action.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createAction } from '../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 
 export const ACTION_NAVIGATE = 'ACTION_NAVIGATE';
 
diff --git a/examples/expressions_explorer/public/actions/navigate_trigger.ts b/examples/expressions_explorer/public/actions/navigate_trigger.ts
index 495615b9075a4..3f3f7f4e51994 100644
--- a/examples/expressions_explorer/public/actions/navigate_trigger.ts
+++ b/examples/expressions_explorer/public/actions/navigate_trigger.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Trigger } from '../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const NAVIGATE_TRIGGER_ID = 'NAVIGATE_TRIGGER_ID';
 
diff --git a/examples/expressions_explorer/public/actions_and_expressions.tsx b/examples/expressions_explorer/public/actions_and_expressions.tsx
index 4d6d8b9f05ed3..a42a7d3b31f10 100644
--- a/examples/expressions_explorer/public/actions_and_expressions.tsx
+++ b/examples/expressions_explorer/public/actions_and_expressions.tsx
@@ -19,9 +19,9 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { NAVIGATE_TRIGGER_ID } from './actions/navigate_trigger';
 
 interface Props {
diff --git a/examples/expressions_explorer/public/actions_and_expressions2.tsx b/examples/expressions_explorer/public/actions_and_expressions2.tsx
index 28c698df38d1b..9745fbbb3241b 100644
--- a/examples/expressions_explorer/public/actions_and_expressions2.tsx
+++ b/examples/expressions_explorer/public/actions_and_expressions2.tsx
@@ -19,9 +19,9 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/expressions_explorer/public/app.tsx b/examples/expressions_explorer/public/app.tsx
index 631b60f4dc566..0ff1ae36f7a9b 100644
--- a/examples/expressions_explorer/public/app.tsx
+++ b/examples/expressions_explorer/public/app.tsx
@@ -18,15 +18,15 @@ import {
   EuiText,
   EuiLink,
 } from '@elastic/eui';
-import { AppMountParameters, IUiSettingsClient } from '../../../src/core/public';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
-import { Start as InspectorStart } from '../../../src/plugins/inspector/public';
+import { AppMountParameters, IUiSettingsClient } from '@kbn/core/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { RunExpressionsExample } from './run_expressions';
 import { RenderExpressionsExample } from './render_expressions';
 import { ActionsExpressionsExample } from './actions_and_expressions';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { ActionsExpressionsExample2 } from './actions_and_expressions2';
-import { createKibanaReactContext } from '../../../src/plugins/kibana_react/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/expressions_explorer/public/editor/expression_editor.tsx b/examples/expressions_explorer/public/editor/expression_editor.tsx
index 79c5a296981db..c940a21fada27 100644
--- a/examples/expressions_explorer/public/editor/expression_editor.tsx
+++ b/examples/expressions_explorer/public/editor/expression_editor.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CodeEditor } from '../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   value: string;
diff --git a/examples/expressions_explorer/public/functions/button.ts b/examples/expressions_explorer/public/functions/button.ts
index 78eb10721cd7f..4f24d2871d61d 100644
--- a/examples/expressions_explorer/public/functions/button.ts
+++ b/examples/expressions_explorer/public/functions/button.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from '../../../../src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   color: string;
diff --git a/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx b/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx
index d05ab5d279d0d..ba272df89f6c1 100644
--- a/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx
+++ b/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx
@@ -10,7 +10,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt } from '@elastic/eui';
-import { InspectorViewProps, Adapters } from '../../../../src/plugins/inspector/public';
+import { InspectorViewProps, Adapters } from '@kbn/inspector-plugin/public';
 import { AstDebugView } from './ast_debug_view';
 
 interface ExpressionsInspectorViewComponentState {
diff --git a/examples/expressions_explorer/public/inspector/index.ts b/examples/expressions_explorer/public/inspector/index.ts
index e4aaae3a6610f..e7b9d1e496056 100644
--- a/examples/expressions_explorer/public/inspector/index.ts
+++ b/examples/expressions_explorer/public/inspector/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Adapters, InspectorViewDescription } from '../../../../src/plugins/inspector/public';
+import { Adapters, InspectorViewDescription } from '@kbn/inspector-plugin/public';
 import { getExpressionsInspectorViewComponentWrapper } from './expressions_inspector_view_wrapper';
 
 export const getExpressionsInspectorViewDescription = (): InspectorViewDescription => ({
diff --git a/examples/expressions_explorer/public/plugin.tsx b/examples/expressions_explorer/public/plugin.tsx
index a3ad9d60fd47a..53e739658621b 100644
--- a/examples/expressions_explorer/public/plugin.tsx
+++ b/examples/expressions_explorer/public/plugin.tsx
@@ -6,15 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { ExpressionsSetup, ExpressionsStart } from '../../../src/plugins/expressions/public';
-import {
-  Setup as InspectorSetup,
-  Start as InspectorStart,
-} from '../../../src/plugins/inspector/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Setup as InspectorSetup, Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { UiActionsStart, UiActionsSetup } from '@kbn/ui-actions-plugin/public';
 import { getExpressionsInspectorViewDescription } from './inspector';
-import { UiActionsStart, UiActionsSetup } from '../../../src/plugins/ui_actions/public';
 import { NAVIGATE_TRIGGER_ID, navigateTrigger } from './actions/navigate_trigger';
 import { ACTION_NAVIGATE, createNavigateAction } from './actions/navigate_action';
 import { buttonRenderer } from './renderers/button';
diff --git a/examples/expressions_explorer/public/render_expressions.tsx b/examples/expressions_explorer/public/render_expressions.tsx
index b7780939e1913..c0301a3f07281 100644
--- a/examples/expressions_explorer/public/render_expressions.tsx
+++ b/examples/expressions_explorer/public/render_expressions.tsx
@@ -20,9 +20,9 @@ import {
   EuiTitle,
   EuiButton,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { Start as InspectorStart } from '../../../src/plugins/inspector/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/expressions_explorer/public/renderers/button.tsx b/examples/expressions_explorer/public/renderers/button.tsx
index 557180ab73a35..98d0220ce73a3 100644
--- a/examples/expressions_explorer/public/renderers/button.tsx
+++ b/examples/expressions_explorer/public/renderers/button.tsx
@@ -9,7 +9,7 @@
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
-import { ExpressionRenderDefinition } from '../../../../src/plugins/expressions/common/expression_renderers';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 
 export const buttonRenderer: ExpressionRenderDefinition<any> = {
   name: 'button',
diff --git a/examples/expressions_explorer/public/run_expressions.tsx b/examples/expressions_explorer/public/run_expressions.tsx
index 18caa97171847..6e29f3fbad3ba 100644
--- a/examples/expressions_explorer/public/run_expressions.tsx
+++ b/examples/expressions_explorer/public/run_expressions.tsx
@@ -22,9 +22,9 @@ import {
   EuiTitle,
   EuiButton,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Adapters, Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { Adapters, Start as InspectorStart } from '../../../src/plugins/inspector/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/field_formats_example/common/example_currency_format.ts b/examples/field_formats_example/common/example_currency_format.ts
index 18ff46892a02c..9134a4cf5f926 100644
--- a/examples/field_formats_example/common/example_currency_format.ts
+++ b/examples/field_formats_example/common/example_currency_format.ts
@@ -7,7 +7,7 @@
  */
 
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
-import { FieldFormat } from '../../../src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 // 1. Create a custom formatter by extending {@link FieldFormat}
 export class ExampleCurrencyFormat extends FieldFormat {
diff --git a/examples/field_formats_example/public/app.tsx b/examples/field_formats_example/public/app.tsx
index 7a6701d115d46..5eea418687928 100644
--- a/examples/field_formats_example/public/app.tsx
+++ b/examples/field_formats_example/public/app.tsx
@@ -23,7 +23,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { FieldFormatsStart } from '../../../src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import * as example1 from './examples/1_using_existing_format';
 import * as example2 from './examples/2_creating_custom_formatter';
 // @ts-ignore
diff --git a/examples/field_formats_example/public/examples/1_using_existing_format.ts b/examples/field_formats_example/public/examples/1_using_existing_format.ts
index 1f534e79d7568..13bc7908dea79 100644
--- a/examples/field_formats_example/public/examples/1_using_existing_format.ts
+++ b/examples/field_formats_example/public/examples/1_using_existing_format.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SerializedFieldFormat } from '../../../../src/plugins/field_formats/common';
-import { FieldFormatsStart } from '../../../../src/plugins/field_formats/public';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 // 1. Assume we have an existing field format configuration serialized and saved somewhere
 // In this case it is `bytes` field formatter with a configured `'0.00b'` pattern
diff --git a/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts b/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
index e3ac523c6c368..a4337b1b0b61c 100644
--- a/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
+++ b/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SerializedFieldFormat } from '../../../../src/plugins/field_formats/common';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../../../src/plugins/field_formats/public';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 import { ExampleCurrencyFormat } from '../../common';
 
diff --git a/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx b/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx
index e0863a952f8b3..037063b042ce9 100644
--- a/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx
+++ b/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx
@@ -12,7 +12,7 @@ import {
   FieldFormatEditor,
   FieldFormatEditorFactory,
   IndexPatternFieldEditorSetup,
-} from '../../../../src/plugins/data_view_field_editor/public';
+} from '@kbn/data-view-field-editor-plugin/public';
 import { ExampleCurrencyFormat } from '../../common';
 
 // 1. Create an editor component
diff --git a/examples/field_formats_example/public/plugin.tsx b/examples/field_formats_example/public/plugin.tsx
index 8e8018a0f5e6e..2457176cbf6b3 100755
--- a/examples/field_formats_example/public/plugin.tsx
+++ b/examples/field_formats_example/public/plugin.tsx
@@ -14,16 +14,16 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-} from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { App } from './app';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../../src/plugins/field_formats/public';
-import { registerExampleFormat } from './examples/2_creating_custom_formatter';
+} from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import {
   IndexPatternFieldEditorStart,
   IndexPatternFieldEditorSetup,
-} from '../../../src/plugins/data_view_field_editor/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
+} from '@kbn/data-view-field-editor-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { registerExampleFormat } from './examples/2_creating_custom_formatter';
+import { App } from './app';
 import { registerExampleFormatEditor } from './examples/3_creating_custom_format_editor';
 import img from './formats.png';
 
diff --git a/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts b/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts
index a2dbb9594512b..b01fc08e9b545 100644
--- a/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts
+++ b/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts
@@ -8,7 +8,7 @@
 
 // This is server-side continuation of examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
 
-import { FieldFormatsSetup } from '../../../../src/plugins/field_formats/server';
+import { FieldFormatsSetup } from '@kbn/field-formats-plugin/server';
 
 import { ExampleCurrencyFormat } from '../../common';
 
diff --git a/examples/field_formats_example/server/plugin.ts b/examples/field_formats_example/server/plugin.ts
index 2163e0fc6e9fe..2223347f389f0 100644
--- a/examples/field_formats_example/server/plugin.ts
+++ b/examples/field_formats_example/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../src/core/server';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../../src/plugins/field_formats/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { registerExampleFormat } from './examples/2_creating_custom_formatter';
 
 interface SetupDeps {
diff --git a/examples/hello_world/public/plugin.tsx b/examples/hello_world/public/plugin.tsx
index 49acf07e6ae12..6433913ad9e03 100755
--- a/examples/hello_world/public/plugin.tsx
+++ b/examples/hello_world/public/plugin.tsx
@@ -7,8 +7,8 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 
 interface SetupDeps {
   developerExamples: DeveloperExamplesSetup;
diff --git a/examples/locator_examples/public/app.tsx b/examples/locator_examples/public/app.tsx
index cca1bb93b9fa7..c874319de8120 100644
--- a/examples/locator_examples/public/app.tsx
+++ b/examples/locator_examples/public/app.tsx
@@ -15,7 +15,7 @@ import { EuiPageContentBody } from '@elastic/eui';
 import { Route, Switch, Redirect, Router, useLocation } from 'react-router-dom';
 import { createBrowserHistory } from 'history';
 import { EuiText } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 function useQuery() {
   const { search } = useLocation();
diff --git a/examples/locator_examples/public/locator.ts b/examples/locator_examples/public/locator.ts
index 52f44f89c4848..6031bb4b4fe28 100644
--- a/examples/locator_examples/public/locator.ts
+++ b/examples/locator_examples/public/locator.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { MigrateFunction } from 'src/plugins/kibana_utils/common';
-import { LocatorDefinition, LocatorPublic } from '../../../src/plugins/share/public';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common';
+import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 
 export const HELLO_LOCATOR = 'HELLO_LOCATOR';
 
diff --git a/examples/locator_examples/public/plugin.tsx b/examples/locator_examples/public/plugin.tsx
index 4facf9c95964f..79b261039c0fc 100644
--- a/examples/locator_examples/public/plugin.tsx
+++ b/examples/locator_examples/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SharePluginStart, SharePluginSetup } from '../../../src/plugins/share/public';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
 import { HelloLocator, HelloLocatorDefinition } from './locator';
 
 interface SetupDeps {
diff --git a/examples/locator_explorer/public/app.tsx b/examples/locator_explorer/public/app.tsx
index c1e3da665d63a..951320ba83a5c 100644
--- a/examples/locator_explorer/public/app.tsx
+++ b/examples/locator_explorer/public/app.tsx
@@ -18,13 +18,13 @@ import { EuiText } from '@elastic/eui';
 import { EuiFieldText } from '@elastic/eui';
 import { EuiPageHeader } from '@elastic/eui';
 import { EuiLink } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
-import { SharePluginSetup } from '../../../src/plugins/share/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 import {
   HelloLocatorV1Params,
   HelloLocatorV2Params,
   HELLO_LOCATOR,
-} from '../../locator_examples/public';
+} from '@kbn/locator-examples-plugin/public';
 
 interface Props {
   share: SharePluginSetup;
diff --git a/examples/locator_explorer/public/plugin.tsx b/examples/locator_explorer/public/plugin.tsx
index 240a1a34caef9..34ff857569166 100644
--- a/examples/locator_explorer/public/plugin.tsx
+++ b/examples/locator_explorer/public/plugin.tsx
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SharePluginSetup, SharePluginStart } from '../../../src/plugins/share/public';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 
 interface SetupDeps {
   developerExamples: DeveloperExamplesSetup;
diff --git a/examples/partial_results_example/public/app/app.tsx b/examples/partial_results_example/public/app/app.tsx
index 5420ab0f4ceed..f6249ea2d33b4 100644
--- a/examples/partial_results_example/public/app/app.tsx
+++ b/examples/partial_results_example/public/app/app.tsx
@@ -22,7 +22,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { ExpressionsContext } from './expressions_context';
 
 const expression = `getEvents
diff --git a/examples/partial_results_example/public/app/expressions_context.ts b/examples/partial_results_example/public/app/expressions_context.ts
index a14c12e0f3ac1..e282abdb382ca 100644
--- a/examples/partial_results_example/public/app/expressions_context.ts
+++ b/examples/partial_results_example/public/app/expressions_context.ts
@@ -7,6 +7,6 @@
  */
 
 import { createContext } from 'react';
-import type { ExpressionsServiceStart } from 'src/plugins/expressions';
+import type { ExpressionsServiceStart } from '@kbn/expressions-plugin';
 
 export const ExpressionsContext = createContext<ExpressionsServiceStart | undefined>(undefined);
diff --git a/examples/partial_results_example/public/functions/count_event.ts b/examples/partial_results_example/public/functions/count_event.ts
index 86090fe4f4d60..93b3856f56075 100644
--- a/examples/partial_results_example/public/functions/count_event.ts
+++ b/examples/partial_results_example/public/functions/count_event.ts
@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent } from 'rxjs';
 import { scan, startWith } from 'rxjs/operators';
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export interface CountEventArguments {
   event: string;
diff --git a/examples/partial_results_example/public/functions/get_events.ts b/examples/partial_results_example/public/functions/get_events.ts
index d911e12f11f96..1abf3cb984c58 100644
--- a/examples/partial_results_example/public/functions/get_events.ts
+++ b/examples/partial_results_example/public/functions/get_events.ts
@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent, merge } from 'rxjs';
 import { distinct, map, pluck, scan, take } from 'rxjs/operators';
-import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 const EVENTS: Array<keyof WindowEventMap> = [
   'mousedown',
diff --git a/examples/partial_results_example/public/functions/pluck.ts b/examples/partial_results_example/public/functions/pluck.ts
index a5a1fbc007ffa..8b32298fc5ced 100644
--- a/examples/partial_results_example/public/functions/pluck.ts
+++ b/examples/partial_results_example/public/functions/pluck.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export interface PluckArguments {
   key: string;
diff --git a/examples/partial_results_example/public/plugin.tsx b/examples/partial_results_example/public/plugin.tsx
index 9599a0d6f590c..fce4f72f28b52 100755
--- a/examples/partial_results_example/public/plugin.tsx
+++ b/examples/partial_results_example/public/plugin.tsx
@@ -7,10 +7,10 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { ExpressionsServiceSetup } from 'src/plugins/expressions';
-import { ExpressionsServiceFork } from 'src/plugins/expressions/common/service/expressions_fork';
-import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '../../../src/core/public';
-import type { DeveloperExamplesSetup } from '../../developer_examples/public';
+import type { ExpressionsServiceSetup } from '@kbn/expressions-plugin';
+import { ExpressionsServiceFork } from '@kbn/expressions-plugin/common/service/expressions_fork';
+import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '@kbn/core/public';
+import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { App, ExpressionsContext } from './app';
 import { countEvent, getEvents, pluck } from './functions';
 
diff --git a/examples/preboot_example/public/app.tsx b/examples/preboot_example/public/app.tsx
index d95df8cf72164..39a50995f0580 100644
--- a/examples/preboot_example/public/app.tsx
+++ b/examples/preboot_example/public/app.tsx
@@ -17,7 +17,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import type { HttpSetup, IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import type { HttpSetup, IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 export const App = ({ http, token }: { http: HttpSetup; token?: string }) => {
   const onCompleteSetup = async ({ shouldReloadConfig }: { shouldReloadConfig: boolean }) => {
diff --git a/examples/preboot_example/public/index.ts b/examples/preboot_example/public/index.ts
index 7859758c274f3..3ee7380e58ec7 100644
--- a/examples/preboot_example/public/index.ts
+++ b/examples/preboot_example/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { PrebootExamplePlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/examples/preboot_example/public/plugin.tsx b/examples/preboot_example/public/plugin.tsx
index 1db38e2240a86..4d4e9bcb509d8 100644
--- a/examples/preboot_example/public/plugin.tsx
+++ b/examples/preboot_example/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { App } from './app';
diff --git a/examples/preboot_example/server/index.ts b/examples/preboot_example/server/index.ts
index 0377250d0cf50..cc231e0c873ed 100644
--- a/examples/preboot_example/server/index.ts
+++ b/examples/preboot_example/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { PrebootExamplePlugin } from './plugin';
diff --git a/examples/preboot_example/server/plugin.ts b/examples/preboot_example/server/plugin.ts
index 288b5245c82b1..f1f24c0972f90 100644
--- a/examples/preboot_example/server/plugin.ts
+++ b/examples/preboot_example/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { CorePreboot, PrebootPlugin, PluginInitializerContext } from 'src/core/server';
+import type { CorePreboot, PrebootPlugin, PluginInitializerContext } from '@kbn/core/server';
 import fs from 'fs/promises';
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
diff --git a/examples/routing_example/public/app.tsx b/examples/routing_example/public/app.tsx
index e8b7b44a0a097..37b6d18a4e669 100644
--- a/examples/routing_example/public/app.tsx
+++ b/examples/routing_example/public/app.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import {
   EuiPage,
   EuiPageBody,
diff --git a/examples/routing_example/public/get_message_example.tsx b/examples/routing_example/public/get_message_example.tsx
index 4cef21128518e..45ad123f7bbba 100644
--- a/examples/routing_example/public/get_message_example.tsx
+++ b/examples/routing_example/public/get_message_example.tsx
@@ -16,7 +16,7 @@ import {
   EuiCallOut,
   EuiFormRow,
 } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { isError } from './is_error';
 import { Services } from './services';
 
diff --git a/examples/routing_example/public/index.ts b/examples/routing_example/public/index.ts
index b7bd5e98baa29..d074112aa86e7 100644
--- a/examples/routing_example/public/index.ts
+++ b/examples/routing_example/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { RoutingExamplePlugin } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}> = () => new RoutingExamplePlugin();
diff --git a/examples/routing_example/public/is_error.ts b/examples/routing_example/public/is_error.ts
index 4d86b8aa8c609..1c8d849c9cc68 100644
--- a/examples/routing_example/public/is_error.ts
+++ b/examples/routing_example/public/is_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 
 export function isError<T>(error: T | HttpFetchError): error is HttpFetchError {
   return error instanceof HttpFetchError;
diff --git a/examples/routing_example/public/plugin.tsx b/examples/routing_example/public/plugin.tsx
index d47d31f7631de..4fbe00333b9a2 100644
--- a/examples/routing_example/public/plugin.tsx
+++ b/examples/routing_example/public/plugin.tsx
@@ -12,8 +12,8 @@ import {
   CoreSetup,
   AppMountParameters,
   AppNavLinkStatus,
-} from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+} from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { getServices } from './services';
 
 interface SetupDeps {
diff --git a/examples/routing_example/public/post_message_example.tsx b/examples/routing_example/public/post_message_example.tsx
index 3dce70fc0db2b..bfaf6f09cb6c8 100644
--- a/examples/routing_example/public/post_message_example.tsx
+++ b/examples/routing_example/public/post_message_example.tsx
@@ -17,7 +17,7 @@ import {
   EuiFormRow,
   EuiTextArea,
 } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { isError } from './is_error';
 import { Services } from './services';
 
diff --git a/examples/routing_example/public/random_number_between_example.tsx b/examples/routing_example/public/random_number_between_example.tsx
index 59e1d4de727aa..86c20b9e7dbbb 100644
--- a/examples/routing_example/public/random_number_between_example.tsx
+++ b/examples/routing_example/public/random_number_between_example.tsx
@@ -16,7 +16,7 @@ import {
   EuiCallOut,
   EuiFormRow,
 } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { isError } from './is_error';
 import { Services } from './services';
 
diff --git a/examples/routing_example/public/random_number_example.tsx b/examples/routing_example/public/random_number_example.tsx
index 4ecb46af6f7ce..292093c18767c 100644
--- a/examples/routing_example/public/random_number_example.tsx
+++ b/examples/routing_example/public/random_number_example.tsx
@@ -9,7 +9,7 @@
 import React, { useCallback } from 'react';
 import { useState } from 'react';
 import { EuiText, EuiButton, EuiLoadingSpinner, EuiCallOut } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { Services } from './services';
 import { isError } from './is_error';
 
diff --git a/examples/routing_example/public/services.ts b/examples/routing_example/public/services.ts
index a7f7aaef344fc..499d7e86a5912 100644
--- a/examples/routing_example/public/services.ts
+++ b/examples/routing_example/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, HttpFetchError } from 'kibana/public';
+import { CoreStart, HttpFetchError } from '@kbn/core/public';
 import {
   RANDOM_NUMBER_ROUTE_PATH,
   RANDOM_NUMBER_BETWEEN_ROUTE_PATH,
diff --git a/examples/routing_example/server/index.ts b/examples/routing_example/server/index.ts
index 15e7a50b56e6d..1fc65c6da1314 100644
--- a/examples/routing_example/server/index.ts
+++ b/examples/routing_example/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 
 import { RoutingExamplePlugin } from './plugin';
 
diff --git a/examples/routing_example/server/plugin.ts b/examples/routing_example/server/plugin.ts
index d9fc2558660af..5a4e88dc094e1 100644
--- a/examples/routing_example/server/plugin.ts
+++ b/examples/routing_example/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
 import { registerRoutes } from './routes';
 
 export class RoutingExamplePlugin implements Plugin<{}, {}> {
diff --git a/examples/routing_example/server/routes/message_routes.ts b/examples/routing_example/server/routes/message_routes.ts
index c53c6d1a934e0..efadb1851313d 100644
--- a/examples/routing_example/server/routes/message_routes.ts
+++ b/examples/routing_example/server/routes/message_routes.ts
@@ -7,10 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { POST_MESSAGE_ROUTE_PATH, INTERNAL_GET_MESSAGE_BY_ID_ROUTE } from '../../common';
 
-import { IRouter } from '../../../../src/core/server';
-
 /**
  *
  * NOTE: DON'T USE IN MEMORY DATA STRUCTURES TO STORE DATA!
diff --git a/examples/routing_example/server/routes/random_number_between_generator.ts b/examples/routing_example/server/routes/random_number_between_generator.ts
index edd100e85e6a0..b7056d12d33b5 100644
--- a/examples/routing_example/server/routes/random_number_between_generator.ts
+++ b/examples/routing_example/server/routes/random_number_between_generator.ts
@@ -7,10 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { RANDOM_NUMBER_BETWEEN_ROUTE_PATH } from '../../common';
 
-import { IRouter } from '../../../../src/core/server';
-
 /**
  *
  * @param router Registers a get route that returns a random number between one and another number suplied by the user.
diff --git a/examples/routing_example/server/routes/random_number_generator.ts b/examples/routing_example/server/routes/random_number_generator.ts
index 6dca4588af216..077d5cd188650 100644
--- a/examples/routing_example/server/routes/random_number_generator.ts
+++ b/examples/routing_example/server/routes/random_number_generator.ts
@@ -6,10 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { IRouter } from '@kbn/core/server';
 import { RANDOM_NUMBER_ROUTE_PATH } from '../../common';
 
-import { IRouter } from '../../../../src/core/server';
-
 /**
  *
  * @param router Registers a get route that returns a random number between one and ten. It has no input
diff --git a/examples/routing_example/server/routes/register_routes.ts b/examples/routing_example/server/routes/register_routes.ts
index 72e25ec18afbd..ef57fc641994c 100644
--- a/examples/routing_example/server/routes/register_routes.ts
+++ b/examples/routing_example/server/routes/register_routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { registerGetRandomNumberRoute } from './random_number_generator';
 import { registerGetRandomNumberBetweenRoute } from './random_number_between_generator';
 import { registerGetMessageByIdRoute, registerPostMessageRoute } from './message_routes';
diff --git a/examples/screenshot_mode_example/public/application.tsx b/examples/screenshot_mode_example/public/application.tsx
index 670468c77bd5f..080b196cdad09 100644
--- a/examples/screenshot_mode_example/public/application.tsx
+++ b/examples/screenshot_mode_example/public/application.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { AppPluginSetupDependencies, AppPluginStartDependencies } from './types';
 import { ScreenshotModeExampleApp } from './components/app';
 
diff --git a/examples/screenshot_mode_example/public/components/app.tsx b/examples/screenshot_mode_example/public/components/app.tsx
index 10dcf05870415..ed4475a9a90b5 100644
--- a/examples/screenshot_mode_example/public/components/app.tsx
+++ b/examples/screenshot_mode_example/public/components/app.tsx
@@ -21,12 +21,12 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { CoreStart } from '../../../../src/core/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import {
   ScreenshotModePluginSetup,
   KBN_SCREENSHOT_MODE_HEADER,
-} from '../../../../src/plugins/screenshot_mode/public';
+} from '@kbn/screenshot-mode-plugin/public';
 
 import { PLUGIN_NAME, BASE_API_ROUTE } from '../../common';
 
diff --git a/examples/screenshot_mode_example/public/plugin.ts b/examples/screenshot_mode_example/public/plugin.ts
index 4108924ca3b8d..788e31e2e0e51 100644
--- a/examples/screenshot_mode_example/public/plugin.ts
+++ b/examples/screenshot_mode_example/public/plugin.ts
@@ -12,7 +12,7 @@ import {
   CoreStart,
   Plugin,
   AppNavLinkStatus,
-} from '../../../src/core/public';
+} from '@kbn/core/public';
 import { AppPluginSetupDependencies, AppPluginStartDependencies } from './types';
 import { MetricsTracking } from './services';
 import { PLUGIN_NAME } from '../common';
diff --git a/examples/screenshot_mode_example/public/services/metrics_tracking.ts b/examples/screenshot_mode_example/public/services/metrics_tracking.ts
index e40b6bbf09e44..5154720f29bd9 100644
--- a/examples/screenshot_mode_example/public/services/metrics_tracking.ts
+++ b/examples/screenshot_mode_example/public/services/metrics_tracking.ts
@@ -7,8 +7,8 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { PLUGIN_NAME } from '../../common';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 
 export class MetricsTracking {
   private trackingDisabled = false;
diff --git a/examples/screenshot_mode_example/public/types.ts b/examples/screenshot_mode_example/public/types.ts
index 2eb9bd8e144a0..3b15d9e8a4e47 100644
--- a/examples/screenshot_mode_example/public/types.ts
+++ b/examples/screenshot_mode_example/public/types.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
-import { ScreenshotModePluginSetup } from '../../../src/plugins/screenshot_mode/public';
-import { UsageCollectionSetup } from '../../../src/plugins/usage_collection/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 
 export interface AppPluginSetupDependencies {
   usageCollection: UsageCollectionSetup;
diff --git a/examples/screenshot_mode_example/server/index.ts b/examples/screenshot_mode_example/server/index.ts
index af23ea893a755..3237dbabff937 100644
--- a/examples/screenshot_mode_example/server/index.ts
+++ b/examples/screenshot_mode_example/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ScreenshotModeExamplePlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new ScreenshotModeExamplePlugin(ctx);
diff --git a/examples/screenshot_mode_example/server/plugin.ts b/examples/screenshot_mode_example/server/plugin.ts
index 5738f4a583a1a..b4609b4a370e0 100644
--- a/examples/screenshot_mode_example/server/plugin.ts
+++ b/examples/screenshot_mode_example/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, PluginInitializerContext, CoreSetup, Logger } from 'kibana/server';
-import { ScreenshotModePluginSetup } from '../../../src/plugins/screenshot_mode/server';
+import { Plugin, PluginInitializerContext, CoreSetup, Logger } from '@kbn/core/server';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { RouteDependencies } from './types';
 import { registerRoutes } from './routes';
 
diff --git a/examples/screenshot_mode_example/server/routes.ts b/examples/screenshot_mode_example/server/routes.ts
index adf4c2e2b6fc5..44515abc48c70 100644
--- a/examples/screenshot_mode_example/server/routes.ts
+++ b/examples/screenshot_mode_example/server/routes.ts
@@ -14,7 +14,7 @@ export const registerRoutes = ({ router, log, screenshotMode }: RouteDependencie
     { path: `${BASE_API_ROUTE}/check_is_screenshot`, validate: false },
     async (ctx, req, res) => {
       log.info(`Reading screenshot mode from a request: ${screenshotMode.isScreenshotMode(req)}`);
-      log.info(`Reading is screenshot mode from ctx: ${ctx.screenshotMode.isScreenshot}`);
+      log.info(`Reading is screenshot mode from ctx: ${(await ctx.screenshotMode).isScreenshot}`);
       return res.ok();
     }
   );
diff --git a/examples/screenshot_mode_example/server/types.ts b/examples/screenshot_mode_example/server/types.ts
index 9d8d5888c3ab1..a5157cb9a5129 100644
--- a/examples/screenshot_mode_example/server/types.ts
+++ b/examples/screenshot_mode_example/server/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, Logger } from 'kibana/server';
-import { ScreenshotModeRequestHandlerContext } from '../../../src/plugins/screenshot_mode/server';
-import { ScreenshotModePluginSetup } from '../../../src/plugins/screenshot_mode/server';
+import { IRouter, Logger } from '@kbn/core/server';
+import { ScreenshotModeRequestHandlerContext } from '@kbn/screenshot-mode-plugin/server';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 
 export type ScreenshotModeExampleRouter = IRouter<ScreenshotModeRequestHandlerContext>;
 
diff --git a/examples/search_examples/common/types.ts b/examples/search_examples/common/types.ts
index 8bb38ea0b2d0d..c2e174ca4731e 100644
--- a/examples/search_examples/common/types.ts
+++ b/examples/search_examples/common/types.ts
@@ -11,7 +11,7 @@ import {
   IEsSearchResponse,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
-} from '../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 
 export interface IMyStrategyRequest extends IEsSearchRequest {
   get_cool: boolean;
diff --git a/examples/search_examples/public/application.tsx b/examples/search_examples/public/application.tsx
index 2c1d92451fe63..ad39cdf2e662d 100644
--- a/examples/search_examples/public/application.tsx
+++ b/examples/search_examples/public/application.tsx
@@ -10,12 +10,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Route, Redirect } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import { AppMountParameters, CoreStart } from '../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { AppPluginStartDependencies } from './types';
 import { SearchExamplePage, ExampleLink } from './common/example_page';
 import { SearchExamplesApp } from './search/app';
 import { SearchSessionsExampleApp } from './search_sessions/app';
-import { RedirectAppLinks } from '../../../src/plugins/kibana_react/public';
 import { SqlSearchExampleApp } from './sql_search/app';
 
 const LINKS: ExampleLink[] = [
diff --git a/examples/search_examples/public/common/example_page.tsx b/examples/search_examples/public/common/example_page.tsx
index baa3a8ca6ef0a..502d6545be76c 100644
--- a/examples/search_examples/public/common/example_page.tsx
+++ b/examples/search_examples/public/common/example_page.tsx
@@ -8,7 +8,7 @@
 
 import React, { PropsWithChildren } from 'react';
 import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { PLUGIN_ID } from '../../common';
 
 export interface ExampleLink {
diff --git a/examples/search_examples/public/plugin.ts b/examples/search_examples/public/plugin.ts
index 368231018e1a9..f3c23167da63c 100644
--- a/examples/search_examples/public/plugin.ts
+++ b/examples/search_examples/public/plugin.ts
@@ -12,7 +12,7 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-} from '../../../src/core/public';
+} from '@kbn/core/public';
 import {
   AppPluginSetupDependencies,
   AppPluginStartDependencies,
diff --git a/examples/search_examples/public/search/app.tsx b/examples/search_examples/public/search/app.tsx
index 0efb592ce0070..c409403c47259 100644
--- a/examples/search_examples/public/search/app.tsx
+++ b/examples/search_examples/public/search/app.tsx
@@ -33,22 +33,21 @@ import {
 } from '@elastic/eui';
 
 import { lastValueFrom } from 'rxjs';
-import { CoreStart } from '../../../../src/core/public';
-import { mountReactNode } from '../../../../src/core/public/utils';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-
-import { PLUGIN_ID, PLUGIN_NAME, SERVER_SEARCH_ROUTE_PATH } from '../../common';
+import { CoreStart } from '@kbn/core/public';
+import { mountReactNode } from '@kbn/core/public/utils';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   isCompleteResponse,
   isErrorResponse,
-} from '../../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { DataViewField, DataView } from '../../../../src/plugins/data_views/public';
+} from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { IMyStrategyResponse } from '../../common/types';
-import { AbortError } from '../../../../src/plugins/kibana_utils/common';
+import { PLUGIN_ID, PLUGIN_NAME, SERVER_SEARCH_ROUTE_PATH } from '../../common';
 
 interface SearchExamplesAppDeps {
   notifications: CoreStart['notifications'];
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
index e3bd839f1f299..31ffcc2b9a0f3 100644
--- a/examples/search_examples/public/search_sessions/app.tsx
+++ b/examples/search_examples/public/search_sessions/app.tsx
@@ -32,11 +32,9 @@ import {
 import { catchError, map, tap } from 'rxjs/operators';
 import { lastValueFrom, of } from 'rxjs';
 
-import { CoreStart } from '../../../../src/core/public';
-import { mountReactNode } from '../../../../src/core/public/utils';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-
-import { PLUGIN_ID } from '../../common';
+import { CoreStart } from '@kbn/core/public';
+import { mountReactNode } from '@kbn/core/public/utils';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   connectToQueryState,
@@ -48,13 +46,11 @@ import {
   QueryState,
   SearchSessionState,
   TimeRange,
-} from '../../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { DataView, DataViewField } from '../../../../src/plugins/data_views/public';
-import {
-  createStateContainer,
-  useContainerState,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { createStateContainer, useContainerState } from '@kbn/kibana-utils-plugin/public';
+import { PLUGIN_ID } from '../../common';
 import { getInitialStateFromUrl, SEARCH_SESSIONS_EXAMPLES_APP_LOCATOR } from './app_locator';
 
 interface SearchSessionsExampleAppDeps {
diff --git a/examples/search_examples/public/search_sessions/app_locator.ts b/examples/search_examples/public/search_sessions/app_locator.ts
index f7e59ece3be5d..c7f805ed0d5f2 100644
--- a/examples/search_examples/public/search_sessions/app_locator.ts
+++ b/examples/search_examples/public/search_sessions/app_locator.ts
@@ -8,9 +8,9 @@
 
 import { SerializableRecord } from '@kbn/utility-types';
 import { Filter, Query, isFilterPinned } from '@kbn/es-query';
-import type { TimeRange } from '../../../../src/plugins/data/public';
-import { getStatesFromKbnUrl, setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
-import { LocatorDefinition } from '../../../../src/plugins/share/common';
+import type { TimeRange } from '@kbn/data-plugin/public';
+import { getStatesFromKbnUrl, setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import { LocatorDefinition } from '@kbn/share-plugin/common';
 
 export const STATE_STORAGE_KEY = '_a';
 export const GLOBAL_STATE_STORAGE_KEY = '_g';
diff --git a/examples/search_examples/public/sql_search/app.tsx b/examples/search_examples/public/sql_search/app.tsx
index acb640c4d82db..b63425bbe2679 100644
--- a/examples/search_examples/public/sql_search/app.tsx
+++ b/examples/search_examples/public/sql_search/app.tsx
@@ -24,19 +24,19 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { CoreStart } from '../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   isCompleteResponse,
   isErrorResponse,
-} from '../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import {
   SQL_SEARCH_STRATEGY,
   SqlSearchStrategyRequest,
   SqlSearchStrategyResponse,
-} from '../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 
 interface SearchExamplesAppDeps {
   notifications: CoreStart['notifications'];
diff --git a/examples/search_examples/public/types.ts b/examples/search_examples/public/types.ts
index 02f0ad28cfd72..91e3e53045bd3 100644
--- a/examples/search_examples/public/types.ts
+++ b/examples/search_examples/public/types.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../src/plugins/unified_search/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { SharePluginSetup } from '../../../src/plugins/share/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SearchExamplesPluginSetup {}
diff --git a/examples/search_examples/server/fibonacci_strategy.ts b/examples/search_examples/server/fibonacci_strategy.ts
index 93cb18d3e9e82..87419d8fe6be4 100644
--- a/examples/search_examples/server/fibonacci_strategy.ts
+++ b/examples/search_examples/server/fibonacci_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import uuid from 'uuid';
-import { ISearchStrategy } from '../../../src/plugins/data/server';
+import { ISearchStrategy } from '@kbn/data-plugin/server';
 import { FibonacciRequest, FibonacciResponse } from '../common/types';
 
 export const fibonacciStrategyProvider = (): ISearchStrategy<
diff --git a/examples/search_examples/server/index.ts b/examples/search_examples/server/index.ts
index 75c23e8e89257..1b1f69bcb32aa 100644
--- a/examples/search_examples/server/index.ts
+++ b/examples/search_examples/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SearchExamplesPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/examples/search_examples/server/my_strategy.ts b/examples/search_examples/server/my_strategy.ts
index db8cd903f23d6..9eea71b7a6c80 100644
--- a/examples/search_examples/server/my_strategy.ts
+++ b/examples/search_examples/server/my_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import { map } from 'rxjs/operators';
-import { ISearchStrategy, PluginStart } from '../../../src/plugins/data/server';
+import { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
 import { IMyStrategyRequest, IMyStrategyResponse } from '../common/types';
 
 export const mySearchStrategyProvider = (
diff --git a/examples/search_examples/server/plugin.ts b/examples/search_examples/server/plugin.ts
index 992c260e25e9d..57a8b055f9b44 100644
--- a/examples/search_examples/server/plugin.ts
+++ b/examples/search_examples/server/plugin.ts
@@ -12,9 +12,9 @@ import type {
   CoreStart,
   Plugin,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 
 import {
   SearchExamplesPluginSetup,
diff --git a/examples/search_examples/server/routes/register_routes.ts b/examples/search_examples/server/routes/register_routes.ts
index f714ec4a6be8c..badbcda86a4be 100644
--- a/examples/search_examples/server/routes/register_routes.ts
+++ b/examples/search_examples/server/routes/register_routes.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter } from 'kibana/server';
-import { DataRequestHandlerContext } from 'src/plugins/data/server';
+import type { IRouter } from '@kbn/core/server';
+import { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 import { registerServerSearchRoute } from './server_search_route';
 
 export function registerRoutes(router: IRouter<DataRequestHandlerContext>) {
diff --git a/examples/search_examples/server/routes/server_search_route.ts b/examples/search_examples/server/routes/server_search_route.ts
index 0d1302233a39c..632952b6c4617 100644
--- a/examples/search_examples/server/routes/server_search_route.ts
+++ b/examples/search_examples/server/routes/server_search_route.ts
@@ -7,11 +7,11 @@
  */
 
 import { Observable } from 'rxjs';
-import { IEsSearchRequest } from 'src/plugins/data/server';
+import { IEsSearchRequest } from '@kbn/data-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { IEsSearchResponse } from 'src/plugins/data/common';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
-import type { IRouter } from 'src/core/server';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { IRouter } from '@kbn/core/server';
 import { SERVER_SEARCH_ROUTE_PATH } from '../../common';
 
 export function registerServerSearchRoute(router: IRouter<DataRequestHandlerContext>) {
@@ -33,8 +33,9 @@ export function registerServerSearchRoute(router: IRouter<DataRequestHandlerCont
       const abortSignal = getRequestAbortedSignal(request.events.aborted$);
 
       try {
-        const res = await context
-          .search!.search(
+        const search = await context.search;
+        const res = await search
+          .search(
             {
               params: {
                 index,
diff --git a/examples/search_examples/server/types.ts b/examples/search_examples/server/types.ts
index 054645a5b3793..e5d52b040a9a8 100644
--- a/examples/search_examples/server/types.ts
+++ b/examples/search_examples/server/types.ts
@@ -7,7 +7,7 @@
  */
 
 // Rename PluginStart to something better
-import { PluginSetup, PluginStart } from '../../../src/plugins/data/server';
+import { PluginSetup, PluginStart } from '@kbn/data-plugin/server';
 
 export interface SearchExamplesPluginSetupDeps {
   data: PluginSetup;
diff --git a/examples/share_examples/public/plugin.tsx b/examples/share_examples/public/plugin.tsx
index 24ca45e8f5f45..e84264f7cf5d2 100644
--- a/examples/share_examples/public/plugin.tsx
+++ b/examples/share_examples/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SharePluginStart, SharePluginSetup } from '../../../src/plugins/share/public';
-import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 interface SetupDeps {
   share: SharePluginSetup;
diff --git a/examples/state_containers_examples/public/common/example_page.tsx b/examples/state_containers_examples/public/common/example_page.tsx
index ccadf45c9d634..91107066e3bc6 100644
--- a/examples/state_containers_examples/public/common/example_page.tsx
+++ b/examples/state_containers_examples/public/common/example_page.tsx
@@ -8,7 +8,7 @@
 
 import React, { PropsWithChildren } from 'react';
 import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
-import { CoreStart } from '../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
 export interface ExampleLink {
   title: string;
diff --git a/examples/state_containers_examples/public/plugin.ts b/examples/state_containers_examples/public/plugin.ts
index bfc20fd2b48d2..e3c5f4138df06 100644
--- a/examples/state_containers_examples/public/plugin.ts
+++ b/examples/state_containers_examples/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { AppMountParameters, CoreSetup, Plugin, AppNavLinkStatus } from '../../../src/core/public';
+import { AppMountParameters, CoreSetup, Plugin, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { AppPluginDependencies } from './with_data_services/types';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
 import image from './state_sync.png';
 
 interface SetupDeps {
diff --git a/examples/state_containers_examples/public/todo/app.tsx b/examples/state_containers_examples/public/todo/app.tsx
index 9ceba35c1350d..81c067cec7d60 100644
--- a/examples/state_containers_examples/public/todo/app.tsx
+++ b/examples/state_containers_examples/public/todo/app.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { createHashHistory } from 'history';
diff --git a/examples/state_containers_examples/public/todo/todo.tsx b/examples/state_containers_examples/public/todo/todo.tsx
index 33ba8c91583bf..1a4e85fbb0928 100644
--- a/examples/state_containers_examples/public/todo/todo.tsx
+++ b/examples/state_containers_examples/public/todo/todo.tsx
@@ -32,13 +32,13 @@ import {
   StateContainer,
   syncState,
   useContainerSelector,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import {
   defaultState,
   pureTransitions,
   TodoActions,
   TodoState,
-} from '../../../../src/plugins/kibana_utils/demos/state_containers/todomvc';
+} from '@kbn/kibana-utils-plugin/demos/state_containers/todomvc';
 
 interface TodoAppProps {
   filter: 'completed' | 'not-completed' | null;
diff --git a/examples/state_containers_examples/public/with_data_services/app.tsx b/examples/state_containers_examples/public/with_data_services/app.tsx
index 881bc07017966..b61e1fe98f83b 100644
--- a/examples/state_containers_examples/public/with_data_services/app.tsx
+++ b/examples/state_containers_examples/public/with_data_services/app.tsx
@@ -19,8 +19,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { Filter, FilterStateStore } from '@kbn/es-query';
-import { CoreStart } from 'kibana/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   connectToQueryState,
@@ -28,15 +28,15 @@ import {
   Query,
   QueryState,
   syncQueryStateWithUrl,
-} from '../../../../src/plugins/data/public';
-import type { DataView } from '../../../../src/plugins/data_views/public';
+} from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   BaseStateContainer,
   createStateContainer,
   IKbnUrlStateStorage,
   syncState,
   useContainerState,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { ExampleLink, StateContainersExamplesPage } from '../common/example_page';
 
 interface StateDemoAppDeps {
diff --git a/examples/state_containers_examples/public/with_data_services/application.tsx b/examples/state_containers_examples/public/with_data_services/application.tsx
index 0ed69d535ef10..7d4810381583c 100644
--- a/examples/state_containers_examples/public/with_data_services/application.tsx
+++ b/examples/state_containers_examples/public/with_data_services/application.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { AppPluginDependencies } from './types';
 import { App } from './app';
-import { createKbnUrlStateStorage } from '../../../../src/plugins/kibana_utils/public/';
 import { ExampleLink } from '../common/example_page';
 
 export const renderApp = (
diff --git a/examples/state_containers_examples/public/with_data_services/types.ts b/examples/state_containers_examples/public/with_data_services/types.ts
index 20264e4235939..c2e5b8477068f 100644
--- a/examples/state_containers_examples/public/with_data_services/types.ts
+++ b/examples/state_containers_examples/public/with_data_services/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface StateDemoPublicPluginSetup {}
diff --git a/examples/ui_action_examples/public/hello_world_action.tsx b/examples/ui_action_examples/public/hello_world_action.tsx
index d534ef851a29b..8771e5fefbeb3 100644
--- a/examples/ui_action_examples/public/hello_world_action.tsx
+++ b/examples/ui_action_examples/public/hello_world_action.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiText, EuiModalBody, EuiButton } from '@elastic/eui';
-import { OverlayStart } from '../../../src/core/public';
-import { createAction } from '../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../src/plugins/kibana_react/public';
+import { OverlayStart } from '@kbn/core/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export const ACTION_HELLO_WORLD = 'ACTION_HELLO_WORLD';
 
diff --git a/examples/ui_action_examples/public/hello_world_trigger.ts b/examples/ui_action_examples/public/hello_world_trigger.ts
index 72e4aa3584c2a..79f07cb119aa9 100644
--- a/examples/ui_action_examples/public/hello_world_trigger.ts
+++ b/examples/ui_action_examples/public/hello_world_trigger.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Trigger } from '../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const HELLO_WORLD_TRIGGER_ID = 'HELLO_WORLD_TRIGGER_ID';
 
diff --git a/examples/ui_action_examples/public/plugin.ts b/examples/ui_action_examples/public/plugin.ts
index 4845ebf683026..ac113056877cf 100644
--- a/examples/ui_action_examples/public/plugin.ts
+++ b/examples/ui_action_examples/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
-import { UiActionsSetup, UiActionsStart } from '../../../src/plugins/ui_actions/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { createHelloWorldAction } from './hello_world_action';
 import { helloWorldTrigger } from './hello_world_trigger';
 
diff --git a/examples/ui_actions_explorer/public/actions/actions.tsx b/examples/ui_actions_explorer/public/actions/actions.tsx
index 27c3cffe10aff..573778a504df3 100644
--- a/examples/ui_actions_explorer/public/actions/actions.tsx
+++ b/examples/ui_actions_explorer/public/actions/actions.tsx
@@ -7,15 +7,15 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { EuiFieldText, EuiModalBody, EuiButton } from '@elastic/eui';
 import { useState } from 'react';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   ActionExecutionContext,
   createAction,
   UiActionsStart,
-} from '../../../../src/plugins/ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
 
 export const USER_TRIGGER = 'USER_TRIGGER';
 export const COUNTRY_TRIGGER = 'COUNTRY_TRIGGER';
diff --git a/examples/ui_actions_explorer/public/app.tsx b/examples/ui_actions_explorer/public/app.tsx
index e0711edb61eb1..f1f0bcb314c27 100644
--- a/examples/ui_actions_explorer/public/app.tsx
+++ b/examples/ui_actions_explorer/public/app.tsx
@@ -21,10 +21,10 @@ import { EuiFieldText } from '@elastic/eui';
 import { EuiCallOut } from '@elastic/eui';
 import { EuiPageHeader } from '@elastic/eui';
 import { EuiModalBody } from '@elastic/eui';
-import { toMountPoint } from '../../../src/plugins/kibana_react/public';
-import { UiActionsStart, createAction } from '../../../src/plugins/ui_actions/public';
-import { AppMountParameters, OverlayStart } from '../../../src/core/public';
-import { HELLO_WORLD_TRIGGER_ID, ACTION_HELLO_WORLD } from '../../ui_action_examples/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { UiActionsStart, createAction } from '@kbn/ui-actions-plugin/public';
+import { AppMountParameters, OverlayStart } from '@kbn/core/public';
+import { HELLO_WORLD_TRIGGER_ID, ACTION_HELLO_WORLD } from '@kbn/ui-actions-examples-plugin/public';
 import { TriggerContextExample } from './trigger_context_example';
 import { ContextMenuExamples } from './context_menu_examples';
 
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx
index e2b3cc22ffb46..cba6b0685120a 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelEdit: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx
index 1efa095f66994..5b21df930e268 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelEditWithDrilldowns: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx
index f485ec3ebbde1..5c52db946ad79 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelEditWithDrilldownsAndContextActions: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx
index 3c515c65a2727..9685510e86fb6 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelView: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx
index 5b827a5bbef4a..edda0235f4ede 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelViewWithSharing: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx
index c0845b33bc8b4..9b16cedc376f1 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelViewWithSharingLong: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/util.ts b/examples/ui_actions_explorer/public/context_menu_examples/util.ts
index faa862dfd4008..b982ec7acedde 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/util.ts
+++ b/examples/ui_actions_explorer/public/context_menu_examples/util.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Action } from '../../../../src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 
 export const sampleAction = (
   id: string,
diff --git a/examples/ui_actions_explorer/public/plugin.tsx b/examples/ui_actions_explorer/public/plugin.tsx
index ef3c961ab5b4b..045ae2f383ee9 100644
--- a/examples/ui_actions_explorer/public/plugin.tsx
+++ b/examples/ui_actions_explorer/public/plugin.tsx
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { UiActionsStart, UiActionsSetup } from '../../../src/plugins/ui_actions/public';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
+import { UiActionsStart, UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import {
   PHONE_TRIGGER,
   USER_TRIGGER,
@@ -19,7 +20,6 @@ import {
   showcasePluggability,
   createTriggerPhoneTriggerAction,
 } from './actions/actions';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
 import image from './ui_actions.png';
 
 interface StartDeps {
diff --git a/examples/ui_actions_explorer/public/trigger_context_example.tsx b/examples/ui_actions_explorer/public/trigger_context_example.tsx
index ca818a8ddaadf..3e94cd253a215 100644
--- a/examples/ui_actions_explorer/public/trigger_context_example.tsx
+++ b/examples/ui_actions_explorer/public/trigger_context_example.tsx
@@ -11,7 +11,7 @@ import { EuiButtonEmpty } from '@elastic/eui';
 import { EuiText } from '@elastic/eui';
 import { EuiDataGrid } from '@elastic/eui';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { USER_TRIGGER, PHONE_TRIGGER, COUNTRY_TRIGGER, User } from './actions/actions';
 
 export interface Props {
diff --git a/kibana.d.ts b/kibana.d.ts
index 8a7a531890057..8d4f25ef47933 100644
--- a/kibana.d.ts
+++ b/kibana.d.ts
@@ -9,7 +9,7 @@
 /**
  * All exports from TS source files (where the implementation is actually done in TS).
  */
-import * as Public from 'src/core/public';
-import * as Server from 'src/core/server';
+import * as Public from '@kbn/core/public';
+import * as Server from '@kbn/core/server';
 
 export { Public, Server };
diff --git a/nav-kibana-dev.docnav.json b/nav-kibana-dev.docnav.json
index 8542855dbcfe6..517d42c8f72d0 100644
--- a/nav-kibana-dev.docnav.json
+++ b/nav-kibana-dev.docnav.json
@@ -62,7 +62,8 @@
         { "id": "kibDevTutorialCI" },
         { "id": "kibDevTutorialServerEndpoint" },
         { "id": "kibDevTutorialAdvancedSettings" },
-        { "id": "kibDevSharePluginReadme" }
+        { "id": "kibDevSharePluginReadme" },
+        { "id": "kibDevTutorialScreenshotting" }
       ]
     },
     {
@@ -146,6 +147,7 @@
         { "id": "kibSavedObjectsTaggingOssPluginApi" },
         { "id": "kibSavedObjectsTaggingPluginApi" },
         { "id": "kibSavedObjectsPluginApi" },
+        { "id": "kibScreenshottingPluginApi" },
         { "id": "kibSecuritySolutionPluginApi" },
         { "id": "kibSecurityPluginApi" },
         { "id": "kibSharePluginApi" },
diff --git a/package.json b/package.json
index 5d863bcc76e75..ba885c8985a19 100644
--- a/package.json
+++ b/package.json
@@ -101,14 +101,13 @@
     "@dnd-kit/core": "^3.1.1",
     "@dnd-kit/sortable": "^4.0.0",
     "@dnd-kit/utilities": "^2.0.0",
-    "@elastic/analytics": "link:bazel-bin/packages/elastic-analytics",
-    "@elastic/apm-rum": "^5.10.2",
-    "@elastic/apm-rum-react": "^1.3.4",
+    "@elastic/apm-rum": "^5.11.0",
+    "@elastic/apm-rum-react": "^1.4.0",
     "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
-    "@elastic/charts": "45.1.1",
+    "@elastic/charts": "46.0.1",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.2",
-    "@elastic/ems-client": "8.2.0",
+    "@elastic/ems-client": "8.3.0",
     "@elastic/eui": "54.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
@@ -125,7 +124,7 @@
     "@hapi/boom": "^9.1.4",
     "@hapi/cookie": "^11.0.2",
     "@hapi/h2o2": "^9.1.0",
-    "@hapi/hapi": "^20.2.1",
+    "@hapi/hapi": "^20.2.2",
     "@hapi/hoek": "^9.2.1",
     "@hapi/inert": "^6.0.4",
     "@hapi/wreck": "^17.1.0",
@@ -134,6 +133,8 @@
     "@kbn/ambient-storybook-types": "link:bazel-bin/packages/kbn-ambient-storybook-types",
     "@kbn/ambient-ui-types": "link:bazel-bin/packages/kbn-ambient-ui-types",
     "@kbn/analytics": "link:bazel-bin/packages/kbn-analytics",
+    "@kbn/analytics-client": "link:bazel-bin/packages/analytics/client",
+    "@kbn/analytics-shippers-fullstory": "link:bazel-bin/packages/analytics/shippers/fullstory",
     "@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader",
     "@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils",
     "@kbn/coloring": "link:bazel-bin/packages/kbn-coloring",
@@ -150,6 +151,7 @@
     "@kbn/i18n-react": "link:bazel-bin/packages/kbn-i18n-react",
     "@kbn/interpreter": "link:bazel-bin/packages/kbn-interpreter",
     "@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils",
+    "@kbn/kibana-json-schema": "link:bazel-bin/packages/kbn-kibana-json-schema",
     "@kbn/logging": "link:bazel-bin/packages/kbn-logging",
     "@kbn/logging-mocks": "link:bazel-bin/packages/kbn-logging-mocks",
     "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
@@ -173,6 +175,7 @@
     "@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils",
     "@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools",
     "@kbn/server-route-repository": "link:bazel-bin/packages/kbn-server-route-repository",
+    "@kbn/shared-ux-button-exit-full-screen": "link:bazel-bin/packages/shared-ux/button/exit_full_screen",
     "@kbn/shared-ux-components": "link:bazel-bin/packages/kbn-shared-ux-components",
     "@kbn/shared-ux-services": "link:bazel-bin/packages/kbn-shared-ux-services",
     "@kbn/shared-ux-storybook": "link:bazel-bin/packages/kbn-shared-ux-storybook",
@@ -193,6 +196,7 @@
     "@mapbox/geojson-rewind": "^0.5.0",
     "@mapbox/mapbox-gl-draw": "1.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
+    "@mapbox/vector-tile": "1.3.1",
     "@reduxjs/toolkit": "^1.6.1",
     "@slack/webhook": "^5.0.4",
     "@turf/along": "6.0.1",
@@ -205,9 +209,10 @@
     "@turf/distance": "6.0.1",
     "@turf/helpers": "6.0.1",
     "@turf/length": "^6.0.2",
-    "@types/elastic__analytics": "link:bazel-bin/packages/elastic-analytics/npm_module_types",
     "@types/jsonwebtoken": "^8.5.6",
+    "@types/mapbox__vector-tile": "1.3.0",
     "@types/moment-duration-format": "^2.2.3",
+    "@types/react-is": "^16.7.1",
     "JSONStream": "1.3.5",
     "abort-controller": "^3.0.0",
     "antlr4ts": "^0.5.0-alpha.3",
@@ -223,7 +228,7 @@
     "chokidar": "^3.4.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
-    "color": "1.0.3",
+    "color": "^4.2.3",
     "commander": "^4.1.1",
     "compare-versions": "3.5.1",
     "constate": "^1.3.2",
@@ -302,7 +307,7 @@
     "lru-cache": "^4.1.5",
     "lz-string": "^1.4.4",
     "mapbox-gl-draw-rectangle-mode": "1.0.4",
-    "maplibre-gl": "1.15.2",
+    "maplibre-gl": "2.1.9",
     "markdown-it": "^12.3.2",
     "md5": "^2.1.0",
     "mdast-util-to-hast": "10.0.1",
@@ -329,6 +334,7 @@
     "p-map": "^4.0.0",
     "p-retry": "^4.2.0",
     "papaparse": "^5.2.0",
+    "pbf": "3.2.1",
     "pdfmake": "^0.2.4",
     "peggy": "^1.2.0",
     "pluralize": "3.1.0",
@@ -441,6 +447,7 @@
     "@babel/eslint-parser": "^7.17.0",
     "@babel/eslint-plugin": "^7.17.7",
     "@babel/generator": "^7.17.7",
+    "@babel/helper-plugin-utils": "^7.16.7",
     "@babel/parser": "^7.17.8",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
@@ -456,7 +463,7 @@
     "@babel/traverse": "^7.17.3",
     "@babel/types": "^7.17.0",
     "@bazel/ibazel": "^0.16.2",
-    "@bazel/typescript": "5.4.0",
+    "@bazel/typescript": "4.6.2",
     "@cypress/code-coverage": "^3.9.12",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.6.0",
@@ -472,9 +479,13 @@
     "@jest/console": "^26.6.2",
     "@jest/reporters": "^26.6.2",
     "@kbn/axe-config": "link:bazel-bin/packages/kbn-axe-config",
-    "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
+    "@kbn/babel-plugin-synthetic-packages": "link:bazel-bin/packages/kbn-babel-plugin-synthetic-packages",
     "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
     "@kbn/bazel-packages": "link:bazel-bin/packages/kbn-bazel-packages",
+    "@kbn/bazel-runner": "link:bazel-bin/packages/kbn-bazel-runner",
+    "@kbn/ci-stats-client": "link:bazel-bin/packages/kbn-ci-stats-client",
+    "@kbn/ci-stats-core": "link:bazel-bin/packages/kbn-ci-stats-core",
+    "@kbn/ci-stats-reporter": "link:bazel-bin/packages/kbn-ci-stats-reporter",
     "@kbn/cli-dev-mode": "link:bazel-bin/packages/kbn-cli-dev-mode",
     "@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils",
     "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
@@ -482,17 +493,24 @@
     "@kbn/es-archiver": "link:bazel-bin/packages/kbn-es-archiver",
     "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
     "@kbn/expect": "link:bazel-bin/packages/kbn-expect",
+    "@kbn/find-used-node-modules": "link:bazel-bin/packages/kbn-find-used-node-modules",
     "@kbn/generate": "link:bazel-bin/packages/kbn-generate",
+    "@kbn/import-resolver": "link:bazel-bin/packages/kbn-import-resolver",
+    "@kbn/jest-serializers": "link:bazel-bin/packages/kbn-jest-serializers",
     "@kbn/optimizer": "link:bazel-bin/packages/kbn-optimizer",
     "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator",
     "@kbn/plugin-helpers": "link:bazel-bin/packages/kbn-plugin-helpers",
     "@kbn/pm": "link:packages/kbn-pm",
+    "@kbn/sort-package-json": "link:bazel-bin/packages/kbn-sort-package-json",
     "@kbn/spec-to-console": "link:bazel-bin/packages/kbn-spec-to-console",
+    "@kbn/stdio-dev-helpers": "link:bazel-bin/packages/kbn-stdio-dev-helpers",
     "@kbn/storybook": "link:bazel-bin/packages/kbn-storybook",
+    "@kbn/synthetic-package-map": "link:bazel-bin/packages/kbn-synthetic-package-map",
     "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools",
     "@kbn/test": "link:bazel-bin/packages/kbn-test",
     "@kbn/test-jest-helpers": "link:bazel-bin/packages/kbn-test-jest-helpers",
     "@kbn/test-subj-selector": "link:bazel-bin/packages/kbn-test-subj-selector",
+    "@kbn/tooling-log": "link:bazel-bin/packages/kbn-tooling-log",
     "@kbn/type-summarizer": "link:bazel-bin/packages/kbn-type-summarizer",
     "@loaders.gl/polyfills": "^2.3.5",
     "@mapbox/vector-tile": "1.3.1",
@@ -524,13 +542,14 @@
     "@types/apidoc": "^0.22.3",
     "@types/archiver": "^5.1.0",
     "@types/babel__core": "^7.1.19",
+    "@types/babel__helper-plugin-utils": "^7.10.0",
     "@types/base64-js": "^1.2.5",
     "@types/chance": "^1.0.0",
     "@types/chroma-js": "^1.4.2",
     "@types/chromedriver": "^81.0.1",
     "@types/classnames": "^2.2.9",
     "@types/cmd-shim": "^2.0.0",
-    "@types/color": "^3.0.0",
+    "@types/color": "^3.0.3",
     "@types/compression-webpack-plugin": "^2.0.2",
     "@types/cypress-cucumber-preprocessor": "^1.14.1",
     "@types/cytoscape": "^3.14.0",
@@ -586,10 +605,16 @@
     "@types/kbn__ace": "link:bazel-bin/packages/kbn-ace/npm_module_types",
     "@types/kbn__alerts": "link:bazel-bin/packages/kbn-alerts/npm_module_types",
     "@types/kbn__analytics": "link:bazel-bin/packages/kbn-analytics/npm_module_types",
+    "@types/kbn__analytics-client": "link:bazel-bin/packages/analytics/client/npm_module_types",
+    "@types/kbn__analytics-shippers-fullstory": "link:bazel-bin/packages/analytics/shippers/fullstory/npm_module_types",
     "@types/kbn__apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader/npm_module_types",
     "@types/kbn__apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module_types",
     "@types/kbn__axe-config": "link:bazel-bin/packages/kbn-axe-config/npm_module_types",
     "@types/kbn__bazel-packages": "link:bazel-bin/packages/kbn-bazel-packages/npm_module_types",
+    "@types/kbn__bazel-runner": "link:bazel-bin/packages/kbn-bazel-runner/npm_module_types",
+    "@types/kbn__ci-stats-client": "link:bazel-bin/packages/kbn-ci-stats-client/npm_module_types",
+    "@types/kbn__ci-stats-core": "link:bazel-bin/packages/kbn-ci-stats-core/npm_module_types",
+    "@types/kbn__ci-stats-reporter": "link:bazel-bin/packages/kbn-ci-stats-reporter/npm_module_types",
     "@types/kbn__cli-dev-mode": "link:bazel-bin/packages/kbn-cli-dev-mode/npm_module_types",
     "@types/kbn__coloring": "link:bazel-bin/packages/kbn-coloring/npm_module_types",
     "@types/kbn__config": "link:bazel-bin/packages/kbn-config/npm_module_types",
@@ -603,11 +628,15 @@
     "@types/kbn__es-query": "link:bazel-bin/packages/kbn-es-query/npm_module_types",
     "@types/kbn__eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports/npm_module_types",
     "@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",
+    "@types/kbn__find-used-node-modules": "link:bazel-bin/packages/kbn-find-used-node-modules/npm_module_types",
     "@types/kbn__generate": "link:bazel-bin/packages/kbn-generate/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
     "@types/kbn__i18n-react": "link:bazel-bin/packages/kbn-i18n-react/npm_module_types",
+    "@types/kbn__import-resolver": "link:bazel-bin/packages/kbn-import-resolver/npm_module_types",
     "@types/kbn__interpreter": "link:bazel-bin/packages/kbn-interpreter/npm_module_types",
     "@types/kbn__io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module_types",
+    "@types/kbn__jest-serializers": "link:bazel-bin/packages/kbn-jest-serializers/npm_module_types",
+    "@types/kbn__kibana-json-schema": "link:bazel-bin/packages/kbn-kibana-json-schema/npm_module_types",
     "@types/kbn__logging": "link:bazel-bin/packages/kbn-logging/npm_module_types",
     "@types/kbn__logging-mocks": "link:bazel-bin/packages/kbn-logging-mocks/npm_module_types",
     "@types/kbn__mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module_types",
@@ -634,15 +663,19 @@
     "@types/kbn__securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module_types",
     "@types/kbn__server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools/npm_module_types",
     "@types/kbn__server-route-repository": "link:bazel-bin/packages/kbn-server-route-repository/npm_module_types",
+    "@types/kbn__shared-ux-button-exit-full-screen": "link:bazel-bin/packages/shared-ux/button/exit_full_screen/npm_module_types",
     "@types/kbn__shared-ux-components": "link:bazel-bin/packages/kbn-shared-ux-components/npm_module_types",
     "@types/kbn__shared-ux-services": "link:bazel-bin/packages/kbn-shared-ux-services/npm_module_types",
     "@types/kbn__shared-ux-storybook": "link:bazel-bin/packages/kbn-shared-ux-storybook/npm_module_types",
     "@types/kbn__shared-ux-utility": "link:bazel-bin/packages/kbn-shared-ux-utility/npm_module_types",
+    "@types/kbn__sort-package-json": "link:bazel-bin/packages/kbn-sort-package-json/npm_module_types",
     "@types/kbn__std": "link:bazel-bin/packages/kbn-std/npm_module_types",
+    "@types/kbn__stdio-dev-helpers": "link:bazel-bin/packages/kbn-stdio-dev-helpers/npm_module_types",
     "@types/kbn__storybook": "link:bazel-bin/packages/kbn-storybook/npm_module_types",
     "@types/kbn__telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module_types",
     "@types/kbn__test": "link:bazel-bin/packages/kbn-test/npm_module_types",
     "@types/kbn__test-jest-helpers": "link:bazel-bin/packages/kbn-test-jest-helpers/npm_module_types",
+    "@types/kbn__tooling-log": "link:bazel-bin/packages/kbn-tooling-log/npm_module_types",
     "@types/kbn__typed-react-router-config": "link:bazel-bin/packages/kbn-typed-react-router-config/npm_module_types",
     "@types/kbn__ui-shared-deps-npm": "link:bazel-bin/packages/kbn-ui-shared-deps-npm/npm_module_types",
     "@types/kbn__ui-shared-deps-src": "link:bazel-bin/packages/kbn-ui-shared-deps-src/npm_module_types",
@@ -677,6 +710,7 @@
     "@types/ora": "^1.3.5",
     "@types/papaparse": "^5.0.3",
     "@types/parse-link-header": "^1.0.0",
+    "@types/pbf": "3.0.2",
     "@types/pdfmake": "^0.1.19",
     "@types/pegjs": "^0.10.1",
     "@types/pngjs": "^3.4.0",
@@ -738,9 +772,9 @@
     "@types/yargs": "^15.0.0",
     "@types/yauzl": "^2.9.1",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
-    "@typescript-eslint/typescript-estree": "^5.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.20.0",
+    "@typescript-eslint/parser": "^5.20.0",
+    "@typescript-eslint/typescript-estree": "^5.20.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "abab": "^2.0.4",
     "aggregate-error": "^3.1.0",
@@ -845,6 +879,7 @@
     "jest-styled-components": "^7.0.3",
     "jimp": "^0.14.0",
     "jsdom": "13.1.0",
+    "json-schema-typed": "^7.0.3",
     "json5": "^1.0.1",
     "jsondiffpatch": "0.4.1",
     "license-checker": "^16.0.0",
@@ -877,7 +912,7 @@
     "postcss": "^7.0.32",
     "postcss-loader": "^3.0.0",
     "postcss-prefix-selector": "^1.7.2",
-    "prettier": "^2.6.1",
+    "prettier": "^2.6.2",
     "pretty-format": "^27.5.1",
     "q": "^1.5.1",
     "react-test-renderer": "^16.12.0",
@@ -911,7 +946,7 @@
     "tough-cookie": "^4.0.0",
     "ts-loader": "^7.0.5",
     "ts-morph": "^13.0.2",
-    "tsd": "^0.13.1",
+    "tsd": "^0.20.0",
     "typescript": "4.6.3",
     "unlazy-loader": "^0.1.3",
     "url-loader": "^2.2.0",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 61104d1afcac0..567e5dd65d664 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -9,7 +9,8 @@
 filegroup(
   name = "build_pkg_code",
   srcs = [
-    "//packages/elastic-analytics:build",
+    "//packages/analytics/client:build",
+    "//packages/analytics/shippers/fullstory:build",
     "//packages/elastic-apm-synthtrace:build",
     "//packages/elastic-eslint-config-kibana:build",
     "//packages/elastic-safer-lodash-set:build",
@@ -21,9 +22,13 @@ filegroup(
     "//packages/kbn-apm-config-loader:build",
     "//packages/kbn-apm-utils:build",
     "//packages/kbn-axe-config:build",
-    "//packages/kbn-babel-code-parser:build",
+    "//packages/kbn-babel-plugin-synthetic-packages:build",
     "//packages/kbn-babel-preset:build",
     "//packages/kbn-bazel-packages:build",
+    "//packages/kbn-bazel-runner:build",
+    "//packages/kbn-ci-stats-client:build",
+    "//packages/kbn-ci-stats-core:build",
+    "//packages/kbn-ci-stats-reporter:build",
     "//packages/kbn-cli-dev-mode:build",
     "//packages/kbn-coloring:build",
     "//packages/kbn-config-schema:build",
@@ -40,12 +45,16 @@ filegroup(
     "//packages/kbn-eslint-plugin-imports:build",
     "//packages/kbn-expect:build",
     "//packages/kbn-field-types:build",
+    "//packages/kbn-find-used-node-modules:build",
     "//packages/kbn-flot-charts:build",
     "//packages/kbn-generate:build",
     "//packages/kbn-i18n-react:build",
     "//packages/kbn-i18n:build",
+    "//packages/kbn-import-resolver:build",
     "//packages/kbn-interpreter:build",
     "//packages/kbn-io-ts-utils:build",
+    "//packages/kbn-jest-serializers:build",
+    "//packages/kbn-kibana-json-schema:build",
     "//packages/kbn-logging-mocks:build",
     "//packages/kbn-logging:build",
     "//packages/kbn-mapbox-gl:build",
@@ -76,15 +85,19 @@ filegroup(
     "//packages/kbn-shared-ux-services:build",
     "//packages/kbn-shared-ux-storybook:build",
     "//packages/kbn-shared-ux-utility:build",
+    "//packages/kbn-sort-package-json:build",
     "//packages/kbn-spec-to-console:build",
     "//packages/kbn-std:build",
+    "//packages/kbn-stdio-dev-helpers:build",
     "//packages/kbn-storybook:build",
+    "//packages/kbn-synthetic-package-map:build",
     "//packages/kbn-telemetry-tools:build",
     "//packages/kbn-test-jest-helpers:build",
     "//packages/kbn-test-subj-selector:build",
     "//packages/kbn-test:build",
     "//packages/kbn-timelion-grammar:build",
     "//packages/kbn-tinymath:build",
+    "//packages/kbn-tooling-log:build",
     "//packages/kbn-type-summarizer:build",
     "//packages/kbn-typed-react-router-config:build",
     "//packages/kbn-ui-framework:build",
@@ -93,6 +106,7 @@ filegroup(
     "//packages/kbn-ui-theme:build",
     "//packages/kbn-utility-types:build",
     "//packages/kbn-utils:build",
+    "//packages/shared-ux/button/exit_full_screen:build",
   ],
 )
 
@@ -100,7 +114,8 @@ filegroup(
 filegroup(
   name = "build_pkg_types",
   srcs = [
-    "//packages/elastic-analytics:build_types",
+    "//packages/analytics/client:build_types",
+    "//packages/analytics/shippers/fullstory:build_types",
     "//packages/elastic-apm-synthtrace:build_types",
     "//packages/elastic-safer-lodash-set:build_types",
     "//packages/kbn-ace:build_types",
@@ -110,6 +125,10 @@ filegroup(
     "//packages/kbn-apm-utils:build_types",
     "//packages/kbn-axe-config:build_types",
     "//packages/kbn-bazel-packages:build_types",
+    "//packages/kbn-bazel-runner:build_types",
+    "//packages/kbn-ci-stats-client:build_types",
+    "//packages/kbn-ci-stats-core:build_types",
+    "//packages/kbn-ci-stats-reporter:build_types",
     "//packages/kbn-cli-dev-mode:build_types",
     "//packages/kbn-coloring:build_types",
     "//packages/kbn-config-schema:build_types",
@@ -123,11 +142,15 @@ filegroup(
     "//packages/kbn-es-query:build_types",
     "//packages/kbn-eslint-plugin-imports:build_types",
     "//packages/kbn-field-types:build_types",
+    "//packages/kbn-find-used-node-modules:build_types",
     "//packages/kbn-generate:build_types",
     "//packages/kbn-i18n-react:build_types",
     "//packages/kbn-i18n:build_types",
+    "//packages/kbn-import-resolver:build_types",
     "//packages/kbn-interpreter:build_types",
     "//packages/kbn-io-ts-utils:build_types",
+    "//packages/kbn-jest-serializers:build_types",
+    "//packages/kbn-kibana-json-schema:build_types",
     "//packages/kbn-logging-mocks:build_types",
     "//packages/kbn-logging:build_types",
     "//packages/kbn-mapbox-gl:build_types",
@@ -158,11 +181,14 @@ filegroup(
     "//packages/kbn-shared-ux-services:build_types",
     "//packages/kbn-shared-ux-storybook:build_types",
     "//packages/kbn-shared-ux-utility:build_types",
+    "//packages/kbn-sort-package-json:build_types",
     "//packages/kbn-std:build_types",
+    "//packages/kbn-stdio-dev-helpers:build_types",
     "//packages/kbn-storybook:build_types",
     "//packages/kbn-telemetry-tools:build_types",
     "//packages/kbn-test-jest-helpers:build_types",
     "//packages/kbn-test:build_types",
+    "//packages/kbn-tooling-log:build_types",
     "//packages/kbn-type-summarizer:build_types",
     "//packages/kbn-typed-react-router-config:build_types",
     "//packages/kbn-ui-shared-deps-npm:build_types",
@@ -170,6 +196,7 @@ filegroup(
     "//packages/kbn-ui-theme:build_types",
     "//packages/kbn-utility-types:build_types",
     "//packages/kbn-utils:build_types",
+    "//packages/shared-ux/button/exit_full_screen:build_types",
   ],
 )
 
diff --git a/packages/analytics/README.md b/packages/analytics/README.md
new file mode 100644
index 0000000000000..a9198dae88975
--- /dev/null
+++ b/packages/analytics/README.md
@@ -0,0 +1,11 @@
+# @kbn/analytics-*
+
+This module implements the Analytics client used for Event-Based Telemetry. The intention of the client is to be usable on both: the UI and the Server sides.
+
+## Client
+
+Holds the public APIs to report events, enrich the events' context and set up the transport mechanisms. Refer to the [client's docs](./client/README.md) for more information.
+
+## Prebuilt shippers
+
+Elastic-approved shippers are available as `@kbn/analytics-shippers-*` packages. Refer to the [shippers' docs](./shippers/README.md) for more information.
diff --git a/packages/elastic-analytics/BUILD.bazel b/packages/analytics/client/BUILD.bazel
similarity index 97%
rename from packages/elastic-analytics/BUILD.bazel
rename to packages/analytics/client/BUILD.bazel
index a73c908c7ea52..af79d33ccc692 100644
--- a/packages/elastic-analytics/BUILD.bazel
+++ b/packages/analytics/client/BUILD.bazel
@@ -2,8 +2,8 @@ load("@npm//@bazel/typescript:index.bzl", "ts_config")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
 load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
-PKG_DIRNAME = "elastic-analytics"
-PKG_REQUIRE_NAME = "@elastic/analytics"
+PKG_DIRNAME = "client"
+PKG_REQUIRE_NAME = "@kbn/analytics-client"
 
 SOURCE_FILES = glob(
   [
diff --git a/packages/elastic-analytics/README.md b/packages/analytics/client/README.md
similarity index 96%
rename from packages/elastic-analytics/README.md
rename to packages/analytics/client/README.md
index f5cd01c811ac6..b9a49256149d9 100644
--- a/packages/elastic-analytics/README.md
+++ b/packages/analytics/client/README.md
@@ -1,4 +1,4 @@
-# @elastic/analytics
+# @kbn/analytics-client
 
 This module implements the Analytics client used for Event-Based Telemetry. The intention of the client is to be usable on both: the UI and the Server sides.
 
@@ -7,7 +7,7 @@ This module implements the Analytics client used for Event-Based Telemetry. The
 It all starts by creating the client with the `createAnalytics` API:
 
 ```typescript
-import { createAnalytics } from '@elastic/analytics';
+import { createAnalytics } from '@kbn/analytics-client';
 
 const analytics = createAnalytics({
   // Set to `true` when running in developer mode.
@@ -107,7 +107,7 @@ analytics.registerContextProvider({
 
 ### Setting the user's opt-in consent
 
-The client cannot send any data until the user provides consent. At the beginning, the client will internally enqueue any incoming events until the consent is either granted or refused. 
+The client cannot send any data until the user provides consent. At the beginning, the client will internally enqueue any incoming events until the consent is either granted or refused.
 
 To set the user's selection use the `optIn` API:
 
@@ -145,7 +145,7 @@ There are some prebuilt shippers in this package that can be enabled using the A
 
 #### Prebuilt shippers
 
-TODO when actually implemented
+Refer to the [shippers' documentation](../shippers/README.md) for more information.
 
 #### Custom shippers
 
@@ -158,7 +158,7 @@ import type {
   EventContext, 
   IShipper, 
   TelemetryCounter 
-} from '@elastic/analytics';
+} from '@kbn/analytics-client';
 
 class MyVeryOwnShipper implements IShipper {
   constructor(myOptions: MyOptions, initContext: AnalyticsClientInitContext) {
@@ -188,7 +188,7 @@ analytics.registerShipper(MyVeryOwnShipper, myOptions);
 
 Schemas are a framework that allows us to document the structure of the events that our application will report. It is useful to understand the meaning of the events that we report. And, at the same time, it serves as an extra validation step from the developer's point of view.
 
-The syntax of a schema is a _simplified ES mapping on steroids_: it removes some of the ES mapping complexity, and at the same time, it includes features that are specific to the telemetry collection. 
+The syntax of a schema is a _simplified ES mapping on steroids_: it removes some of the ES mapping complexity, and at the same time, it includes features that are specific to the telemetry collection.
 
 **DISCLAIMER:** **The schema is not a direct mapping to ES indices.** The final structure of how the event is stored will depend on many factors like the context providers, shippers and final analytics solution.
 
@@ -226,7 +226,7 @@ For the `_meta`, refer to [Schema Specification: `_meta`](#schema-specification-
 
 #### Schema Specification: Objects
 
-Declaring the schema of an object contains 2 main attributes: `properties` and an optional `_meta`:  
+Declaring the schema of an object contains 2 main attributes: `properties` and an optional `_meta`:
 
 The `properties` attribute is an object with all the keys that the original object may include:
 
@@ -324,7 +324,7 @@ For the optional `_meta`, refer to [Schema Specification: `_meta`](#schema-speci
 
 #### Schema Specification: `_meta`
 
-The `_meta` adds the invaluable information of a `description` and whether a field is `optional` in the payload. 
+The `_meta` adds the invaluable information of a `description` and whether a field is `optional` in the payload.
 
 It can be attached to any schema definition as seen in the examples above. For high-order types, like arrays or objects, the `_meta` field is optional. For first-order types, like numbers, strings, booleans or `pass_through`, the `_meta` key is mandatory.
 
diff --git a/packages/analytics/client/jest.config.js b/packages/analytics/client/jest.config.js
new file mode 100644
index 0000000000000..aa0d319f9d1e7
--- /dev/null
+++ b/packages/analytics/client/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../../../',
+  roots: ['<rootDir>/packages/analytics/client'],
+};
diff --git a/packages/elastic-analytics/package.json b/packages/analytics/client/package.json
similarity index 78%
rename from packages/elastic-analytics/package.json
rename to packages/analytics/client/package.json
index bd688a0ab74d5..82ab42bc22a31 100644
--- a/packages/elastic-analytics/package.json
+++ b/packages/analytics/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@elastic/analytics",
+  "name": "@kbn/analytics-client",
   "private": true,
   "version": "1.0.0",
   "main": "./target_node/index.js",
diff --git a/packages/elastic-analytics/src/analytics_client/analytics_client.test.ts b/packages/analytics/client/src/analytics_client/analytics_client.test.ts
similarity index 96%
rename from packages/elastic-analytics/src/analytics_client/analytics_client.test.ts
rename to packages/analytics/client/src/analytics_client/analytics_client.test.ts
index 63e8e91e8a5ff..08515ecae8d1e 100644
--- a/packages/elastic-analytics/src/analytics_client/analytics_client.test.ts
+++ b/packages/analytics/client/src/analytics_client/analytics_client.test.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line max-classes-per-file
 import type { Observable } from 'rxjs';
-import { BehaviorSubject, lastValueFrom, Subject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, lastValueFrom, Subject } from 'rxjs';
 import type { MockedLogger } from '@kbn/logging-mocks';
 import { loggerMock } from '@kbn/logging-mocks';
 import { AnalyticsClient } from './analytics_client';
@@ -528,6 +528,44 @@ describe('AnalyticsClient', () => {
       ]);
     });
 
+    test('The undefined values are not forwarded to the global context', async () => {
+      const context$ = new Subject<{ a_field?: boolean; b_field: number }>();
+      analyticsClient.registerContextProvider({
+        name: 'contextProviderA',
+        schema: {
+          a_field: {
+            type: 'boolean',
+            _meta: {
+              description: 'a_field description',
+              optional: true,
+            },
+          },
+          b_field: {
+            type: 'long',
+            _meta: {
+              description: 'b_field description',
+            },
+          },
+        },
+        context$,
+      });
+
+      const globalContextPromise = firstValueFrom(globalContext$.pipe(take(6), toArray()));
+      context$.next({ b_field: 1 });
+      context$.next({ a_field: false, b_field: 1 });
+      context$.next({ a_field: true, b_field: 1 });
+      context$.next({ b_field: 1 });
+      context$.next({ a_field: undefined, b_field: 2 });
+      await expect(globalContextPromise).resolves.toEqual([
+        {}, // Original empty state
+        { b_field: 1 },
+        { a_field: false, b_field: 1 },
+        { a_field: true, b_field: 1 },
+        { b_field: 1 }, // a_field is removed because the context provider removed it.
+        { b_field: 2 }, // a_field is not forwarded because it is `undefined`
+      ]);
+    });
+
     test('Fails to register 2 context providers with the same name', () => {
       analyticsClient.registerContextProvider({
         name: 'contextProviderA',
diff --git a/packages/elastic-analytics/src/analytics_client/analytics_client.ts b/packages/analytics/client/src/analytics_client/analytics_client.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/analytics_client.ts
rename to packages/analytics/client/src/analytics_client/analytics_client.ts
diff --git a/packages/elastic-analytics/src/analytics_client/context_service.ts b/packages/analytics/client/src/analytics_client/context_service.ts
similarity index 89%
rename from packages/elastic-analytics/src/analytics_client/context_service.ts
rename to packages/analytics/client/src/analytics_client/context_service.ts
index cee3e56b389d1..7c3f3c8327eb7 100644
--- a/packages/elastic-analytics/src/analytics_client/context_service.ts
+++ b/packages/analytics/client/src/analytics_client/context_service.ts
@@ -69,9 +69,21 @@ export class ContextService {
       [...this.contextProvidersRegistry.values()].reduce((acc, context) => {
         return {
           ...acc,
-          ...context,
+          ...this.removeEmptyValues(context),
         };
       }, {} as Partial<EventContext>)
     );
   }
+
+  private removeEmptyValues(context?: Partial<EventContext>) {
+    if (!context) {
+      return {};
+    }
+    return Object.keys(context).reduce((acc, key) => {
+      if (context[key] !== undefined) {
+        acc[key] = context[key];
+      }
+      return acc;
+    }, {} as Partial<EventContext>);
+  }
 }
diff --git a/packages/elastic-analytics/src/analytics_client/index.ts b/packages/analytics/client/src/analytics_client/index.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/index.ts
rename to packages/analytics/client/src/analytics_client/index.ts
diff --git a/packages/elastic-analytics/src/analytics_client/mocks.ts b/packages/analytics/client/src/analytics_client/mocks.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/mocks.ts
rename to packages/analytics/client/src/analytics_client/mocks.ts
diff --git a/packages/elastic-analytics/src/analytics_client/opt_in_config.test.ts b/packages/analytics/client/src/analytics_client/opt_in_config.test.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/opt_in_config.test.ts
rename to packages/analytics/client/src/analytics_client/opt_in_config.test.ts
diff --git a/packages/elastic-analytics/src/analytics_client/opt_in_config.ts b/packages/analytics/client/src/analytics_client/opt_in_config.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/opt_in_config.ts
rename to packages/analytics/client/src/analytics_client/opt_in_config.ts
diff --git a/packages/elastic-analytics/src/analytics_client/shippers_registry.test.ts b/packages/analytics/client/src/analytics_client/shippers_registry.test.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/shippers_registry.test.ts
rename to packages/analytics/client/src/analytics_client/shippers_registry.test.ts
diff --git a/packages/elastic-analytics/src/analytics_client/shippers_registry.ts b/packages/analytics/client/src/analytics_client/shippers_registry.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/shippers_registry.ts
rename to packages/analytics/client/src/analytics_client/shippers_registry.ts
diff --git a/packages/elastic-analytics/src/analytics_client/types.ts b/packages/analytics/client/src/analytics_client/types.ts
similarity index 100%
rename from packages/elastic-analytics/src/analytics_client/types.ts
rename to packages/analytics/client/src/analytics_client/types.ts
diff --git a/packages/elastic-analytics/src/events/index.ts b/packages/analytics/client/src/events/index.ts
similarity index 100%
rename from packages/elastic-analytics/src/events/index.ts
rename to packages/analytics/client/src/events/index.ts
diff --git a/packages/elastic-analytics/src/events/types.ts b/packages/analytics/client/src/events/types.ts
similarity index 82%
rename from packages/elastic-analytics/src/events/types.ts
rename to packages/analytics/client/src/events/types.ts
index 8523b7791150a..bc193a2788db1 100644
--- a/packages/elastic-analytics/src/events/types.ts
+++ b/packages/analytics/client/src/events/types.ts
@@ -8,7 +8,34 @@
 
 import type { ShipperName } from '../analytics_client';
 
+/**
+ * Definition of the context that can be appended to the events through the {@link IAnalyticsClient.registerContextProvider}.
+ */
 export interface EventContext {
+  /**
+   * The unique user ID.
+   */
+  userId?: string;
+  /**
+   * The Cloud ID.
+   */
+  cloudId?: string;
+  /**
+   * The product's version.
+   */
+  version?: string;
+  /**
+   * The name of the current page.
+   */
+  pageName?: string;
+  /**
+   * The current application ID.
+   */
+  applicationId?: string;
+  /**
+   * The current entity ID (dashboard ID, visualization ID, etc.).
+   */
+  entityId?: string;
   // TODO: Extend with known keys
   [key: string]: unknown;
 }
diff --git a/packages/elastic-analytics/src/index.ts b/packages/analytics/client/src/index.ts
similarity index 99%
rename from packages/elastic-analytics/src/index.ts
rename to packages/analytics/client/src/index.ts
index 382974783aeb1..543298f6bb8e5 100644
--- a/packages/elastic-analytics/src/index.ts
+++ b/packages/analytics/client/src/index.ts
@@ -36,8 +36,10 @@ export type {
   // Types for the registerEventType API
   EventTypeOpts,
 } from './analytics_client';
+
 export type { Event, EventContext, EventType, TelemetryCounter } from './events';
 export { TelemetryCounterType } from './events';
+
 export type {
   RootSchema,
   SchemaObject,
@@ -52,4 +54,5 @@ export type {
   AllowedSchemaStringTypes,
   AllowedSchemaTypes,
 } from './schema';
+
 export type { IShipper } from './shippers';
diff --git a/packages/elastic-analytics/src/mocks.ts b/packages/analytics/client/src/mocks.ts
similarity index 100%
rename from packages/elastic-analytics/src/mocks.ts
rename to packages/analytics/client/src/mocks.ts
diff --git a/packages/elastic-analytics/src/schema/index.ts b/packages/analytics/client/src/schema/index.ts
similarity index 100%
rename from packages/elastic-analytics/src/schema/index.ts
rename to packages/analytics/client/src/schema/index.ts
diff --git a/packages/elastic-analytics/src/schema/types.test.ts b/packages/analytics/client/src/schema/types.test.ts
similarity index 100%
rename from packages/elastic-analytics/src/schema/types.test.ts
rename to packages/analytics/client/src/schema/types.test.ts
diff --git a/packages/elastic-analytics/src/schema/types.ts b/packages/analytics/client/src/schema/types.ts
similarity index 100%
rename from packages/elastic-analytics/src/schema/types.ts
rename to packages/analytics/client/src/schema/types.ts
diff --git a/packages/elastic-analytics/src/shippers/index.ts b/packages/analytics/client/src/shippers/index.ts
similarity index 100%
rename from packages/elastic-analytics/src/shippers/index.ts
rename to packages/analytics/client/src/shippers/index.ts
diff --git a/packages/elastic-analytics/src/shippers/mocks.ts b/packages/analytics/client/src/shippers/mocks.ts
similarity index 100%
rename from packages/elastic-analytics/src/shippers/mocks.ts
rename to packages/analytics/client/src/shippers/mocks.ts
diff --git a/packages/elastic-analytics/src/shippers/types.ts b/packages/analytics/client/src/shippers/types.ts
similarity index 100%
rename from packages/elastic-analytics/src/shippers/types.ts
rename to packages/analytics/client/src/shippers/types.ts
diff --git a/packages/analytics/client/tsconfig.json b/packages/analytics/client/tsconfig.json
new file mode 100644
index 0000000000000..0778503efa3af
--- /dev/null
+++ b/packages/analytics/client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/analytics/shippers/README.md b/packages/analytics/shippers/README.md
new file mode 100644
index 0000000000000..8fc04b9f9ecbc
--- /dev/null
+++ b/packages/analytics/shippers/README.md
@@ -0,0 +1,5 @@
+# @kbn/analytics-shippers-*
+
+This directory holds the implementation of the _built-in_ shippers provided by the Analytics client. At the moment, the shippers are:
+
+* [FullStory](./fullstory/README.md)
diff --git a/packages/analytics/shippers/fullstory/BUILD.bazel b/packages/analytics/shippers/fullstory/BUILD.bazel
new file mode 100644
index 0000000000000..2825e3fd733ea
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/BUILD.bazel
@@ -0,0 +1,118 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "fullstory"
+PKG_REQUIRE_NAME = "@kbn/analytics-shippers-fullstory"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//moment",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//moment",
+  "//packages/analytics/client:npm_module_types",
+  "//packages/kbn-logging-mocks:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/analytics/shippers/fullstory/README.md b/packages/analytics/shippers/fullstory/README.md
new file mode 100644
index 0000000000000..60c4b641e300b
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/README.md
@@ -0,0 +1,23 @@
+# @kbn/analytics-shippers-fullstory
+
+FullStory implementation as a shipper for the `@kbn/analytics-client`.
+
+## How to use it
+
+This module is intended to be used on the UI only. It does not support server-side events.
+
+```typescript
+import { FullStoryShipper } from "@kbn/analytics-shippers-fullstory";
+
+analytics.registerShipper(FullStoryShipper, { fullStoryOrgId: '12345' })
+```
+
+## Configuration
+
+|       Name       | Description | 
+|:----------------:|:----------------------------------------------------------------------------------------------------------------------------------| 
+| `fullStoryOrgId` | FullStory account ID                                                                                                              |
+|      `host`      | The host to send the data to. Used to overcome AdBlockers by using custom DNSs. If not specified, it defaults to `fullstory.com`. |
+|   `scriptUrl`    | The URL to load the FullStory client from. Falls back to `edge.fullstory.com/s/fs.js` if not specified.                           |
+|     `debug`      | Whether the debug logs should be printed to the console. Defaults to `false`.                                                     |
+|   `namespace`    | The name of the variable where the API is stored: `window[namespace]`. Defaults to `FS`.                                          |
diff --git a/packages/analytics/shippers/fullstory/jest.config.js b/packages/analytics/shippers/fullstory/jest.config.js
new file mode 100644
index 0000000000000..9d1637823c150
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../../../../',
+  roots: ['<rootDir>/packages/analytics/shippers/fullstory'],
+};
diff --git a/packages/analytics/shippers/fullstory/package.json b/packages/analytics/shippers/fullstory/package.json
new file mode 100644
index 0000000000000..5d8fa7b7df976
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/analytics-shippers-fullstory",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
diff --git a/packages/analytics/shippers/fullstory/src/format_payload.test.ts b/packages/analytics/shippers/fullstory/src/format_payload.test.ts
new file mode 100644
index 0000000000000..6f9ad05bc9da7
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/format_payload.test.ts
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { formatPayload } from './format_payload';
+
+describe('formatPayload', () => {
+  test('appends `_str` to string values', () => {
+    const payload = {
+      foo: 'bar',
+      baz: ['qux'],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_str: payload.foo,
+      baz_strs: payload.baz,
+    });
+  });
+
+  test('appends `_int` to integer values', () => {
+    const payload = {
+      foo: 1,
+      baz: [100000],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_int: payload.foo,
+      baz_ints: payload.baz,
+    });
+  });
+
+  test('appends `_real` to integer values', () => {
+    const payload = {
+      foo: 1.5,
+      baz: [100000.5],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_real: payload.foo,
+      baz_reals: payload.baz,
+    });
+  });
+
+  test('appends `_bool` to booleans values', () => {
+    const payload = {
+      foo: true,
+      baz: [false],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_bool: payload.foo,
+      baz_bools: payload.baz,
+    });
+  });
+
+  test('appends `_date` to Date values', () => {
+    const payload = {
+      foo: new Date(),
+      baz: [new Date()],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_date: payload.foo,
+      baz_dates: payload.baz,
+    });
+  });
+
+  test('supports nested values', () => {
+    const payload = {
+      nested: {
+        foo: 'bar',
+        baz: ['qux'],
+      },
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      nested: {
+        foo_str: payload.nested.foo,
+        baz_strs: payload.nested.baz,
+      },
+    });
+  });
+
+  test('does not mutate reserved keys', () => {
+    const payload = {
+      uid: 'uid',
+      displayName: 'displayName',
+      email: 'email',
+      acctId: 'acctId',
+      website: 'website',
+      pageName: 'pageName',
+    };
+
+    expect(formatPayload(payload)).toEqual(payload);
+  });
+
+  test('removes undefined values', () => {
+    const payload = {
+      foo: undefined,
+      baz: [undefined],
+    };
+
+    expect(formatPayload(payload)).toEqual({});
+  });
+
+  test('throws if null is provided', () => {
+    const payload = {
+      foo: null,
+      baz: [null],
+    };
+
+    expect(() => formatPayload(payload)).toThrowErrorMatchingInlineSnapshot(
+      `"Unsupported type: object"`
+    );
+  });
+
+  describe('String to Date identification', () => {
+    test('appends `_date` to ISO string values', () => {
+      const payload = {
+        foo: new Date().toISOString(),
+        baz: [new Date().toISOString()],
+      };
+
+      expect(formatPayload(payload)).toEqual({
+        foo_date: payload.foo,
+        baz_dates: payload.baz,
+      });
+    });
+
+    test('appends `_str` to random string values', () => {
+      const payload = {
+        foo: 'test-1',
+        baz: ['test-1'],
+      };
+
+      expect(formatPayload(payload)).toEqual({
+        foo_str: payload.foo,
+        baz_strs: payload.baz,
+      });
+    });
+  });
+});
diff --git a/packages/analytics/shippers/fullstory/src/format_payload.ts b/packages/analytics/shippers/fullstory/src/format_payload.ts
new file mode 100644
index 0000000000000..c55ed2409da50
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/format_payload.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import moment from 'moment';
+
+// https://help.fullstory.com/hc/en-us/articles/360020623234#reserved-properties
+const FULLSTORY_RESERVED_PROPERTIES = [
+  'uid',
+  'displayName',
+  'email',
+  'acctId',
+  'website',
+  // https://developer.fullstory.com/page-variables
+  'pageName',
+];
+
+export function formatPayload(context: Record<string, unknown>): Record<string, unknown> {
+  // format context keys as required for env vars, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
+  return Object.fromEntries(
+    Object.entries(context)
+      // Discard any undefined values
+      .map<[string, unknown]>(([key, value]) => {
+        return Array.isArray(value)
+          ? [key, value.filter((v) => typeof v !== 'undefined')]
+          : [key, value];
+      })
+      .filter(
+        ([, value]) => typeof value !== 'undefined' && (!Array.isArray(value) || value.length > 0)
+      )
+      // Transform key names according to the FullStory needs
+      .map(([key, value]) => {
+        if (FULLSTORY_RESERVED_PROPERTIES.includes(key)) {
+          return [key, value];
+        }
+        if (isRecord(value)) {
+          return [key, formatPayload(value)];
+        }
+        const valueType = getFullStoryType(value);
+        const formattedKey = valueType ? `${key}_${valueType}` : key;
+        return [formattedKey, value];
+      })
+  );
+}
+
+function getFullStoryType(value: unknown) {
+  // For arrays, make the decision based on the first element
+  const isArray = Array.isArray(value);
+  const v = isArray ? value[0] : value;
+  let type: string;
+  switch (typeof v) {
+    case 'string':
+      type = moment(v, moment.ISO_8601, true).isValid() ? 'date' : 'str';
+      break;
+    case 'number':
+      type = Number.isInteger(v) ? 'int' : 'real';
+      break;
+    case 'boolean':
+      type = 'bool';
+      break;
+    case 'object':
+      if (isDate(v)) {
+        type = 'date';
+        break;
+      }
+    default:
+      throw new Error(`Unsupported type: ${typeof v}`);
+  }
+
+  // convert to plural form for arrays
+  return isArray ? `${type}s` : type;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value) && !isDate(value);
+}
+
+function isDate(value: unknown): value is Date {
+  return value instanceof Date;
+}
diff --git a/packages/analytics/shippers/fullstory/src/fullstory_shipper.test.mocks.ts b/packages/analytics/shippers/fullstory/src/fullstory_shipper.test.mocks.ts
new file mode 100644
index 0000000000000..fadd1ffee2ae0
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/fullstory_shipper.test.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { FullStoryApi } from './types';
+
+export const fullStoryApiMock: jest.Mocked<FullStoryApi> = {
+  identify: jest.fn(),
+  setUserVars: jest.fn(),
+  setVars: jest.fn(),
+  consent: jest.fn(),
+  restart: jest.fn(),
+  shutdown: jest.fn(),
+  event: jest.fn(),
+};
+jest.doMock('./load_snippet', () => {
+  return {
+    loadSnippet: () => fullStoryApiMock,
+  };
+});
diff --git a/packages/analytics/shippers/fullstory/src/fullstory_shipper.test.ts b/packages/analytics/shippers/fullstory/src/fullstory_shipper.test.ts
new file mode 100644
index 0000000000000..4b60ba661fe14
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/fullstory_shipper.test.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { loggerMock } from '@kbn/logging-mocks';
+import { fullStoryApiMock } from './fullstory_shipper.test.mocks';
+import { FullStoryShipper } from './fullstory_shipper';
+
+describe('FullStoryShipper', () => {
+  let fullstoryShipper: FullStoryShipper;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    fullstoryShipper = new FullStoryShipper(
+      {
+        debug: true,
+        fullStoryOrgId: 'test-org-id',
+      },
+      {
+        logger: loggerMock.create(),
+        sendTo: 'staging',
+        isDev: true,
+      }
+    );
+  });
+
+  describe('extendContext', () => {
+    describe('FS.identify', () => {
+      test('calls `identify` when the userId is provided', () => {
+        const userId = 'test-user-id';
+        fullstoryShipper.extendContext({ userId });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(userId);
+      });
+
+      test('calls `identify` again only if the userId changes', () => {
+        const userId = 'test-user-id';
+        fullstoryShipper.extendContext({ userId });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledTimes(1);
+        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(userId);
+
+        fullstoryShipper.extendContext({ userId });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledTimes(1); // still only called once
+
+        fullstoryShipper.extendContext({ userId: `${userId}-1` });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledTimes(2); // called again because the user changed
+        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(`${userId}-1`);
+      });
+    });
+
+    describe('FS.setUserVars', () => {
+      test('calls `setUserVars` when version is provided', () => {
+        fullstoryShipper.extendContext({ version: '1.2.3' });
+        expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+          version_str: '1.2.3',
+          version_major_int: 1,
+          version_minor_int: 2,
+          version_patch_int: 3,
+        });
+      });
+
+      test('calls `setUserVars` when cloudId is provided', () => {
+        fullstoryShipper.extendContext({ cloudId: 'test-es-org-id' });
+        expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({ org_id_str: 'test-es-org-id' });
+      });
+
+      test('merges both: version and cloudId if both are provided', () => {
+        fullstoryShipper.extendContext({ version: '1.2.3', cloudId: 'test-es-org-id' });
+        expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+          org_id_str: 'test-es-org-id',
+          version_str: '1.2.3',
+          version_major_int: 1,
+          version_minor_int: 2,
+          version_patch_int: 3,
+        });
+      });
+    });
+
+    describe('FS.setVars', () => {
+      test('adds the rest of the context to `setVars`', () => {
+        const context = {
+          userId: 'test-user-id',
+          version: '1.2.3',
+          cloudId: 'test-es-org-id',
+          foo: 'bar',
+        };
+        fullstoryShipper.extendContext(context);
+        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', { foo_str: 'bar' });
+      });
+    });
+  });
+
+  describe('optIn', () => {
+    test('should call consent true and restart when isOptIn: true', () => {
+      fullstoryShipper.optIn(true);
+      expect(fullStoryApiMock.consent).toHaveBeenCalledWith(true);
+      expect(fullStoryApiMock.restart).toHaveBeenCalled();
+    });
+
+    test('should call consent false and shutdown when isOptIn: false', () => {
+      fullstoryShipper.optIn(false);
+      expect(fullStoryApiMock.consent).toHaveBeenCalledWith(false);
+      expect(fullStoryApiMock.shutdown).toHaveBeenCalled();
+    });
+  });
+
+  describe('reportEvents', () => {
+    test('calls the API once per event in the array with the properties transformed', () => {
+      fullstoryShipper.reportEvents([
+        {
+          event_type: 'test-event-1',
+          timestamp: '2020-01-01T00:00:00.000Z',
+          properties: { test: 'test-1' },
+          context: { pageName: 'test-page-1' },
+        },
+        {
+          event_type: 'test-event-2',
+          timestamp: '2020-01-01T00:00:00.000Z',
+          properties: { test: 'test-2' },
+          context: { pageName: 'test-page-1' },
+        },
+      ]);
+
+      expect(fullStoryApiMock.event).toHaveBeenCalledTimes(2);
+      expect(fullStoryApiMock.event).toHaveBeenCalledWith('test-event-1', {
+        test_str: 'test-1',
+      });
+      expect(fullStoryApiMock.event).toHaveBeenCalledWith('test-event-2', {
+        test_str: 'test-2',
+      });
+    });
+  });
+});
diff --git a/packages/analytics/shippers/fullstory/src/fullstory_shipper.ts b/packages/analytics/shippers/fullstory/src/fullstory_shipper.ts
new file mode 100644
index 0000000000000..ef9d5d662813d
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/fullstory_shipper.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type {
+  AnalyticsClientInitContext,
+  EventContext,
+  Event,
+  IShipper,
+} from '@kbn/analytics-client';
+import type { FullStoryApi } from './types';
+import type { FullStorySnippetConfig } from './load_snippet';
+import { getParsedVersion } from './get_parsed_version';
+import { formatPayload } from './format_payload';
+import { loadSnippet } from './load_snippet';
+
+export type FullStoryShipperConfig = FullStorySnippetConfig;
+
+export class FullStoryShipper implements IShipper {
+  public static shipperName = 'FullStory';
+  private readonly fullStoryApi: FullStoryApi;
+  private lastUserId: string | undefined;
+
+  constructor(
+    config: FullStoryShipperConfig,
+    private readonly initContext: AnalyticsClientInitContext
+  ) {
+    this.fullStoryApi = loadSnippet(config);
+  }
+
+  public extendContext(newContext: EventContext): void {
+    this.initContext.logger.debug(`Received context ${JSON.stringify(newContext)}`);
+
+    // FullStory requires different APIs for different type of contexts.
+    const { userId, version, cloudId, ...nonUserContext } = newContext;
+
+    // Call it only when the userId changes
+    if (userId && userId !== this.lastUserId) {
+      this.initContext.logger.debug(`Calling FS.identify with userId ${userId}`);
+      // We need to call the API for every new userId (restarting the session).
+      this.fullStoryApi.identify(userId);
+      this.lastUserId = userId;
+    }
+
+    // User-level context
+    if (version || cloudId) {
+      this.initContext.logger.debug(
+        `Calling FS.setUserVars with version ${version} and cloudId ${cloudId}`
+      );
+      this.fullStoryApi.setUserVars({
+        ...(version ? getParsedVersion(version) : {}),
+        ...(cloudId ? { org_id_str: cloudId } : {}),
+      });
+    }
+
+    // Event-level context. At the moment, only the scope `page` is supported by FullStory for webapps.
+    if (Object.keys(nonUserContext).length) {
+      // Keeping these fields for backwards compatibility.
+      if (nonUserContext.applicationId) nonUserContext.app_id = nonUserContext.applicationId;
+      if (nonUserContext.entityId) nonUserContext.ent_id = nonUserContext.entityId;
+
+      this.initContext.logger.debug(
+        `Calling FS.setVars with context ${JSON.stringify(nonUserContext)}`
+      );
+      this.fullStoryApi.setVars('page', formatPayload(nonUserContext));
+    }
+  }
+
+  public optIn(isOptedIn: boolean): void {
+    this.initContext.logger.debug(`Setting FS to optIn ${isOptedIn}`);
+    // FullStory uses 2 different opt-in methods:
+    // - `consent` is needed to allow collecting information about the components
+    //   declared as "Record with user consent" (https://help.fullstory.com/hc/en-us/articles/360020623574).
+    //   We need to explicitly call `consent` if for the "Record with user content" feature to work.
+    this.fullStoryApi.consent(isOptedIn);
+    // - `restart` and `shutdown` fully start/stop the collection of data.
+    if (isOptedIn) {
+      this.fullStoryApi.restart();
+    } else {
+      this.fullStoryApi.shutdown();
+    }
+  }
+
+  public reportEvents(events: Event[]): void {
+    this.initContext.logger.debug(`Reporting ${events.length} events to FS`);
+    events.forEach((event) => {
+      // We only read event.properties and discard the rest because the context is already sent in the other APIs.
+      this.fullStoryApi.event(event.event_type, formatPayload(event.properties));
+    });
+  }
+}
diff --git a/packages/analytics/shippers/fullstory/src/get_parsed_version.test.ts b/packages/analytics/shippers/fullstory/src/get_parsed_version.test.ts
new file mode 100644
index 0000000000000..b4938dbca3bc4
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/get_parsed_version.test.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { getParsedVersion } from './get_parsed_version';
+
+describe('getParsedVersion', () => {
+  test('parses a version string', () => {
+    expect(getParsedVersion('1.2.3')).toEqual({
+      version_str: '1.2.3',
+      version_major_int: 1,
+      version_minor_int: 2,
+      version_patch_int: 3,
+    });
+  });
+
+  test('parses a version string with extra label', () => {
+    expect(getParsedVersion('1.2.3-SNAPSHOT')).toEqual({
+      version_str: '1.2.3-SNAPSHOT',
+      version_major_int: 1,
+      version_minor_int: 2,
+      version_patch_int: 3,
+    });
+  });
+
+  test('does not throw for invalid version', () => {
+    expect(getParsedVersion('INVALID_VERSION')).toEqual({
+      version_str: 'INVALID_VERSION',
+      version_major_int: NaN,
+      version_minor_int: NaN,
+      version_patch_int: NaN,
+    });
+  });
+});
diff --git a/packages/analytics/shippers/fullstory/src/get_parsed_version.ts b/packages/analytics/shippers/fullstory/src/get_parsed_version.ts
new file mode 100644
index 0000000000000..873b47a0cde8a
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/get_parsed_version.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export function getParsedVersion(version: string): {
+  version_str: string;
+  version_major_int: number;
+  version_minor_int: number;
+  version_patch_int: number;
+} {
+  const [major, minor, patch] = version.split('.');
+  return {
+    version_str: version,
+    version_major_int: parseInt(major, 10),
+    version_minor_int: parseInt(minor, 10),
+    version_patch_int: parseInt(patch, 10),
+  };
+}
diff --git a/packages/kbn-pm/src/production/index.ts b/packages/analytics/shippers/fullstory/src/index.ts
similarity index 65%
rename from packages/kbn-pm/src/production/index.ts
rename to packages/analytics/shippers/fullstory/src/index.ts
index 9083eae61da2a..a9be91c82e9ec 100644
--- a/packages/kbn-pm/src/production/index.ts
+++ b/packages/analytics/shippers/fullstory/src/index.ts
@@ -6,5 +6,6 @@
  * Side Public License, v 1.
  */
 
-export { buildBazelProductionProjects } from './build_bazel_production_projects';
-export { buildNonBazelProductionProjects } from './build_non_bazel_production_projects';
+export { FullStoryShipper } from './fullstory_shipper';
+export type { FullStoryShipperConfig } from './fullstory_shipper';
+export type { FullStorySnippetConfig } from './load_snippet';
diff --git a/packages/analytics/shippers/fullstory/src/load_snippet.test.ts b/packages/analytics/shippers/fullstory/src/load_snippet.test.ts
new file mode 100644
index 0000000000000..0b920ef2d22c1
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/load_snippet.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { loadSnippet } from './load_snippet';
+
+describe('loadSnippet', () => {
+  beforeAll(() => {
+    // Define necessary window and document global variables for the tests
+    Object.defineProperty(global, 'window', {
+      writable: true,
+      value: {},
+    });
+
+    Object.defineProperty(global, 'document', {
+      writable: true,
+      value: {
+        createElement: jest.fn().mockReturnValue({}),
+        getElementsByTagName: jest
+          .fn()
+          .mockReturnValue([{ parentNode: { insertBefore: jest.fn() } }]),
+      },
+    });
+
+    Object.defineProperty(global, '_fs_script', {
+      writable: true,
+      value: '',
+    });
+  });
+
+  it('should return the FullStory API', () => {
+    const fullStoryApi = loadSnippet({ debug: true, fullStoryOrgId: 'foo' });
+    expect(fullStoryApi).toBeDefined();
+    expect(fullStoryApi.event).toBeDefined();
+    expect(fullStoryApi.consent).toBeDefined();
+    expect(fullStoryApi.restart).toBeDefined();
+    expect(fullStoryApi.shutdown).toBeDefined();
+    expect(fullStoryApi.identify).toBeDefined();
+    expect(fullStoryApi.setUserVars).toBeDefined();
+    expect(fullStoryApi.setVars).toBeDefined();
+  });
+});
diff --git a/packages/analytics/shippers/fullstory/src/load_snippet.ts b/packages/analytics/shippers/fullstory/src/load_snippet.ts
new file mode 100644
index 0000000000000..471152f033b5a
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/load_snippet.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { FullStoryApi } from './types';
+
+export interface FullStorySnippetConfig {
+  /**
+   * The FullStory account id.
+   */
+  fullStoryOrgId: string;
+  /**
+   * The host to send the data to. Used to overcome AdBlockers by using custom DNSs.
+   * If not specified, it defaults to `fullstory.com`.
+   */
+  host?: string;
+  /**
+   * The URL to load the FullStory client from. Falls back to `edge.fullstory.com/s/fs.js` if not specified.
+   */
+  scriptUrl?: string;
+  /**
+   * Whether the debug logs should be printed to the console.
+   */
+  debug?: boolean;
+  /**
+   * The name of the variable where the API is stored: `window[namespace]`. Defaults to `FS`.
+   */
+  namespace?: string;
+}
+
+export function loadSnippet({
+  scriptUrl = 'edge.fullstory.com/s/fs.js',
+  fullStoryOrgId,
+  host = 'fullstory.com',
+  namespace = 'FS',
+  debug = false,
+}: FullStorySnippetConfig): FullStoryApi {
+  window._fs_debug = debug;
+  window._fs_host = host;
+  window._fs_script = scriptUrl;
+  window._fs_org = fullStoryOrgId;
+  window._fs_namespace = namespace;
+
+  /* eslint-disable */
+  (function(m,n,e,t,l,o,g,y){
+    if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
+    // @ts-expect-error
+    g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
+    // @ts-expect-error
+    o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src=_fs_script;
+    // @ts-expect-error
+    y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
+    // @ts-expect-error
+    g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
+    // @ts-expect-error
+    g.anonymize=function(){g.identify(!!0)};
+    // @ts-expect-error
+    g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
+    // @ts-expect-error
+    g.log = function(a,b){g("log",[a,b])};
+    // @ts-expect-error
+    g.consent=function(a){g("consent",!arguments.length||a)};
+    // @ts-expect-error
+    g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
+    // @ts-expect-error
+    g.clearUserCookie=function(){};
+    // @ts-expect-error
+    g.setVars=function(n, p){g('setVars',[n,p]);};
+    // @ts-expect-error
+    g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
+    // @ts-expect-error
+    if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
+    // @ts-expect-error
+    g._v="1.3.0";
+
+  })(window,document,window['_fs_namespace'],'script','user');
+
+  const fullStoryApi = window[namespace as 'FS'];
+
+  if (!fullStoryApi) {
+    throw new Error('FullStory snippet failed to load. Check browser logs for more information.');
+  }
+
+  return fullStoryApi;
+}
diff --git a/packages/analytics/shippers/fullstory/src/types.ts b/packages/analytics/shippers/fullstory/src/types.ts
new file mode 100644
index 0000000000000..6c448c2c4d2e1
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/src/types.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * Definition of the FullStory API.
+ * Docs are available at https://developer.fullstory.com/.
+ */
+export interface FullStoryApi {
+  /**
+   * Identify a User
+   * https://developer.fullstory.com/identify
+   * @param userId
+   * @param userVars
+   */
+  identify(userId: string, userVars?: Record<string, unknown>): void;
+
+  /**
+   * Set User Variables
+   * https://developer.fullstory.com/user-variables
+   * @param userVars
+   */
+  setUserVars(userVars: Record<string, unknown>): void;
+
+  /**
+   * Setting page variables
+   * https://developer.fullstory.com/page-variables
+   * @param scope
+   * @param pageProperties
+   */
+  setVars(scope: 'page', pageProperties: Record<string, unknown>): void;
+
+  /**
+   * Sending custom event data into FullStory
+   * https://developer.fullstory.com/custom-events
+   * @param eventName
+   * @param eventProperties
+   */
+  event(eventName: string, eventProperties: Record<string, unknown>): void;
+
+  /**
+   * Selectively record parts of your site based on explicit user consent
+   * https://developer.fullstory.com/consent
+   * @param isOptedIn true if the user has opted in to tracking
+   */
+  consent(isOptedIn: boolean): void;
+
+  /**
+   * Restart session recording after it has been shutdown
+   * https://developer.fullstory.com/restart-recording
+   */
+  restart(): void;
+
+  /**
+   * Stop recording a session
+   * https://developer.fullstory.com/stop-recording
+   */
+  shutdown(): void;
+}
+
+declare global {
+  interface Window {
+    _fs_debug: boolean;
+    _fs_host: string;
+    _fs_org: string;
+    _fs_namespace: string;
+    _fs_script: string;
+    FS: FullStoryApi;
+  }
+}
diff --git a/packages/analytics/shippers/fullstory/tsconfig.json b/packages/analytics/shippers/fullstory/tsconfig.json
new file mode 100644
index 0000000000000..97a3644c3c703
--- /dev/null
+++ b/packages/analytics/shippers/fullstory/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts b/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts
index 83d844426e643..349e2fe561643 100644
--- a/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts
@@ -206,19 +206,6 @@ export class ApmSynthtraceEsClient {
         return { create: { _index: index } };
       },
     });
-    options?.itemStartStopCallback?.apply(this, [item, true]);
-
-    if (this.refreshAfterIndex) {
-      await this.refresh();
-    }
-  }
-
-  async createDataStream(aggregator: StreamAggregator) {
-    const datastreamName = aggregator.getDataStreamName();
-    const mappings = aggregator.getMappings();
-    const dimensions = aggregator.getDimensions();
-
-    if (dimensions.length === 0) return;
 
     await this.client.cluster.putComponentTemplate({
       name: `${datastreamName}-mappings`,
diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts b/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts
index 9a919e505185c..d8d001774df6d 100644
--- a/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ApmUserAgentFields } from '../../apm/apm_fields';
+import { ApmUserAgentFields } from '../apm_fields';
 
 export function getChromeUserAgentDefaults(): ApmUserAgentFields {
   return {
diff --git a/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts b/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts
index 700bbca1194ac..b90bf7bb69c05 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { apm, timerange } from '../../index';
+import { apm, timerange } from '../..';
 import { ApmFields } from '../../lib/apm/apm_fields';
 import { Instance } from '../../lib/apm/instance';
 import { Scenario } from '../scenario';
diff --git a/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts b/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts
index 2b33607c8a3cb..6d31ae188be40 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { stackMonitoring, timerange } from '../../index';
+import { stackMonitoring, timerange } from '../..';
 import { Scenario } from '../scenario';
 import { getLogger } from '../utils/get_common_services';
 import { RunOptions } from '../utils/parse_run_cli_flags';
diff --git a/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts b/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts
index 994d0e394ecf3..bcc1dfb50def2 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts
@@ -8,7 +8,7 @@
 
 // Run with: node ./src/scripts/run ./src/scripts/examples/03_monitoring.ts --target=http://elastic:changeme@localhost:9200
 
-import { stackMonitoring, timerange } from '../../index';
+import { stackMonitoring, timerange } from '../..';
 import { Scenario } from '../scenario';
 import { getLogger } from '../utils/get_common_services';
 import { RunOptions } from '../utils/parse_run_cli_flags';
diff --git a/packages/elastic-apm-synthtrace/src/scripts/run.js b/packages/elastic-apm-synthtrace/src/scripts/run.js
index 426b247b6b623..e6da98c40004d 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/run.js
+++ b/packages/elastic-apm-synthtrace/src/scripts/run.js
@@ -12,4 +12,4 @@ require('@babel/register')({
   presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
 });
 
-require('./run.ts');
+require('./run_synthtrace');
diff --git a/packages/elastic-apm-synthtrace/src/scripts/run.ts b/packages/elastic-apm-synthtrace/src/scripts/run_synthtrace.ts
similarity index 100%
rename from packages/elastic-apm-synthtrace/src/scripts/run.ts
rename to packages/elastic-apm-synthtrace/src/scripts/run_synthtrace.ts
diff --git a/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts
index cc1eaf482667b..91412a45a7508 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts
@@ -7,7 +7,7 @@
  */
 
 import { random } from 'lodash';
-import { apm, timerange } from '../../index';
+import { apm, timerange } from '../..';
 import { ApmFields } from '../../lib/apm/apm_fields';
 import { Instance } from '../../lib/apm/instance';
 import { Scenario } from '../scenario';
diff --git a/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts
index 0cedd8c93cd78..728884c1a8df5 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts
@@ -7,7 +7,7 @@
  */
 
 import { random } from 'lodash';
-import { apm, timerange } from '../../index';
+import { apm, timerange } from '../..';
 import { Instance } from '../../lib/apm/instance';
 import { Scenario } from '../scenario';
 import { getLogger } from '../utils/get_common_services';
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts
index f2343af9bf2b4..58582cadaf3b3 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts
@@ -8,7 +8,7 @@
 
 import { pick } from 'lodash';
 import { LogLevel } from '../../lib/utils/create_logger';
-import { RunCliFlags } from '../run';
+import { RunCliFlags } from '../run_synthtrace';
 
 export function parseRunCliFlags(flags: RunCliFlags) {
   const { file, _, logLevel } = flags;
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js b/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js
index 7e333577c39f0..84887f4d9285b 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js
@@ -12,4 +12,4 @@ require('@babel/register')({
   presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
 });
 
-require('./worker.ts');
+require('./worker');
diff --git a/packages/elastic-eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js
index 0680fafe50de3..eba5332ca71e3 100644
--- a/packages/elastic-eslint-config-kibana/.eslintrc.js
+++ b/packages/elastic-eslint-config-kibana/.eslintrc.js
@@ -105,11 +105,96 @@ module.exports = {
       ],
     ],
 
+    /**
+     * ESLint rule to aid with breaking up packages:
+     *
+     *  `fromPacakge` the package name which was broken up
+     *  `toPackage` the package where the removed exports were placed
+     *  `exportNames` the list of exports which used to be found in `fromPacakge` and are now found in `toPackage`
+     *
+     * TODO(@spalger): once packages have types we should be able to filter this rule based on the package type
+     *  of the file being linted so that we could re-route imports from `plugin-client` types to a different package
+     *  than `plugin-server` types.
+     */
+    '@kbn/imports/exports_moved_packages': ['error', [
+      {
+        fromPackage: '@kbn/dev-utils',
+        toPackage: '@kbn/tooling-log',
+        exportNames: [
+          'DEFAULT_LOG_LEVEL',
+          'getLogLevelFlagsHelp',
+          'LOG_LEVEL_FLAGS',
+          'LogLevel',
+          'Message',
+          'ParsedLogLevel',
+          'parseLogLevel',
+          'pickLevelFromFlags',
+          'ToolingLog',
+          'ToolingLogCollectingWriter',
+          'ToolingLogOptions',
+          'ToolingLogTextWriter',
+          'ToolingLogTextWriterConfig',
+          'Writer',
+        ]
+      },
+      {
+        fromPackage: '@kbn/dev-utils',
+        toPackage: '@kbn/ci-stats-reporter',
+        exportNames: [
+          'CiStatsMetric',
+          'CiStatsReporter',
+          'CiStatsReportTestsOptions',
+          'CiStatsTestGroupInfo',
+          'CiStatsTestResult',
+          'CiStatsTestRun',
+          'CiStatsTestType',
+          'CiStatsTiming',
+          'getTimeReporter',
+          'MetricsOptions',
+          'TimingsOptions',
+        ]
+      },
+      {
+        fromPackage: '@kbn/dev-utils',
+        toPackage: '@kbn/ci-stats-core',
+        exportNames: [
+          'Config',
+        ]
+      },
+      {
+        fromPackage: '@kbn/dev-utils',
+        toPackage: '@kbn/jest-serializers',
+        exportNames: [
+          'createAbsolutePathSerializer',
+          'createStripAnsiSerializer',
+          'createRecursiveSerializer',
+          'createAnyInstanceSerializer',
+          'createReplaceSerializer',
+        ]
+      },
+      {
+        fromPackage: '@kbn/dev-utils',
+        toPackage: '@kbn/stdio-dev-helpers',
+        exportNames: [
+          'observeReadable',
+          'observeLines',
+        ]
+      },
+      {
+        fromPackage: '@kbn/dev-utils',
+        toPackage: '@kbn/sort-package-json',
+        exportNames: [
+          'sortPackageJson',
+        ]
+      },
+    ]],
+
     '@kbn/eslint/no_async_promise_body': 'error',
     '@kbn/eslint/no_async_foreach': 'error',
     '@kbn/eslint/no_trailing_import_slash': 'error',
     '@kbn/eslint/no_constructor_args_in_property_initializers': 'error',
     '@kbn/eslint/no_this_in_property_initializers': 'error',
-    '@kbn/imports/no_unresolved_imports': 'error',
+    '@kbn/imports/no_unresolvable_imports': 'error',
+    '@kbn/imports/uniform_imports': 'error',
   },
 };
diff --git a/packages/elastic-eslint-config-kibana/BUILD.bazel b/packages/elastic-eslint-config-kibana/BUILD.bazel
index d8b727bf3b6bc..9dceec268418b 100644
--- a/packages/elastic-eslint-config-kibana/BUILD.bazel
+++ b/packages/elastic-eslint-config-kibana/BUILD.bazel
@@ -28,6 +28,7 @@ NPM_MODULE_EXTRA_FILES = [
 RUNTIME_DEPS = [
   "//packages/kbn-babel-preset",
   "//packages/kbn-dev-utils",
+  "//packages/kbn-eslint-plugin-imports",
   "@npm//eslint-config-prettier",
   "@npm//semver",
 ]
diff --git a/packages/elastic-safer-lodash-set/fp/assoc.d.ts b/packages/elastic-safer-lodash-set/fp/assoc.d.ts
index 57fe84d0b07f2..c04c85f63a870 100644
--- a/packages/elastic-safer-lodash-set/fp/assoc.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/assoc.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { assoc } from './index';
+import { assoc } from '.';
 export = assoc;
diff --git a/packages/elastic-safer-lodash-set/fp/assocPath.d.ts b/packages/elastic-safer-lodash-set/fp/assocPath.d.ts
index 76df38e98ff28..534128331f142 100644
--- a/packages/elastic-safer-lodash-set/fp/assocPath.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/assocPath.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { assocPath } from './index';
+import { assocPath } from '.';
 export = assocPath;
diff --git a/packages/elastic-safer-lodash-set/fp/set.d.ts b/packages/elastic-safer-lodash-set/fp/set.d.ts
index 16bc98658bdcd..b676d271e0556 100644
--- a/packages/elastic-safer-lodash-set/fp/set.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/set.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { set } from './index';
+import { set } from '.';
 export = set;
diff --git a/packages/elastic-safer-lodash-set/fp/setWith.d.ts b/packages/elastic-safer-lodash-set/fp/setWith.d.ts
index 556e702f59f0f..812437adc165a 100644
--- a/packages/elastic-safer-lodash-set/fp/setWith.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/setWith.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { setWith } from './index';
+import { setWith } from '.';
 export = setWith;
diff --git a/packages/elastic-safer-lodash-set/set.d.ts b/packages/elastic-safer-lodash-set/set.d.ts
index 16bc98658bdcd..b676d271e0556 100644
--- a/packages/elastic-safer-lodash-set/set.d.ts
+++ b/packages/elastic-safer-lodash-set/set.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { set } from './index';
+import { set } from '.';
 export = set;
diff --git a/packages/elastic-safer-lodash-set/setWith.d.ts b/packages/elastic-safer-lodash-set/setWith.d.ts
index 556e702f59f0f..812437adc165a 100644
--- a/packages/elastic-safer-lodash-set/setWith.d.ts
+++ b/packages/elastic-safer-lodash-set/setWith.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { setWith } from './index';
+import { setWith } from '.';
 export = setWith;
diff --git a/packages/elastic-safer-lodash-set/test/patch_test.js b/packages/elastic-safer-lodash-set/test/patch_test.js
index 03dfe260009e9..80a44eb0c5b6b 100644
--- a/packages/elastic-safer-lodash-set/test/patch_test.js
+++ b/packages/elastic-safer-lodash-set/test/patch_test.js
@@ -6,11 +6,11 @@
 const test = require('tape');
 
 const setFunctions = [
-  [require('../').set, 'module.set'],
+  [require('..').set, 'module.set'],
   [require('../set'), 'module/set'],
 ];
 const setWithFunctions = [
-  [require('../').setWith, 'module.setWith'],
+  [require('..').setWith, 'module.setWith'],
   [require('../setWith'), 'module/setWith'],
 ];
 const setAndSetWithFunctions = [].concat(setFunctions, setWithFunctions);
diff --git a/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts b/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts
index 53b17d93e38db..3721726fe1f5c 100644
--- a/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts
+++ b/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts
@@ -7,7 +7,7 @@
  */
 
 // @ts-ignore
-import src from '!!raw-loader!./x_json.ace.worker.js';
+import src from '!!raw-loader!./x_json.ace.worker';
 
 export const workerModule = {
   id: 'ace/mode/json_worker',
diff --git a/packages/kbn-ace/src/ace/modes/x_json/x_json.ts b/packages/kbn-ace/src/ace/modes/x_json/x_json.ts
index 46a27e8a0a4c3..5a7e819cb36e8 100644
--- a/packages/kbn-ace/src/ace/modes/x_json/x_json.ts
+++ b/packages/kbn-ace/src/ace/modes/x_json/x_json.ts
@@ -7,7 +7,7 @@
  */
 
 import ace from 'brace';
-import { XJsonHighlightRules } from '../index';
+import { XJsonHighlightRules } from '..';
 import { workerModule } from './worker';
 
 const { WorkerClient } = ace.acequire('ace/worker/worker_client');
diff --git a/packages/kbn-alerts/src/empty_page/index.test.tsx b/packages/kbn-alerts/src/empty_page/index.test.tsx
index be755b0c23c38..ca329ffde3fe2 100644
--- a/packages/kbn-alerts/src/empty_page/index.test.tsx
+++ b/packages/kbn-alerts/src/empty_page/index.test.tsx
@@ -9,7 +9,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { EmptyPage } from './';
+import { EmptyPage } from '.';
 
 describe('EmptyPage component', () => {
   it('renders actions without descriptions', () => {
diff --git a/packages/kbn-analytics/src/metrics/application_usage.ts b/packages/kbn-analytics/src/metrics/application_usage.ts
index 10a40072d48f7..a093b933134ac 100644
--- a/packages/kbn-analytics/src/metrics/application_usage.ts
+++ b/packages/kbn-analytics/src/metrics/application_usage.ts
@@ -7,7 +7,7 @@
  */
 
 import moment, { Moment } from 'moment-timezone';
-import { METRIC_TYPE } from './';
+import { METRIC_TYPE } from '.';
 
 export interface ApplicationUsageMetric {
   type: METRIC_TYPE.APPLICATION_USAGE;
diff --git a/packages/kbn-analytics/src/metrics/ui_counter.ts b/packages/kbn-analytics/src/metrics/ui_counter.ts
index f2a5d2fd18d12..59720fee22b8d 100644
--- a/packages/kbn-analytics/src/metrics/ui_counter.ts
+++ b/packages/kbn-analytics/src/metrics/ui_counter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { METRIC_TYPE } from './';
+import { METRIC_TYPE } from '.';
 
 export type UiCounterMetricType =
   | METRIC_TYPE.CLICK
diff --git a/packages/kbn-analytics/src/metrics/user_agent.ts b/packages/kbn-analytics/src/metrics/user_agent.ts
index 72f5da1e6b779..d54e1fabd05bf 100644
--- a/packages/kbn-analytics/src/metrics/user_agent.ts
+++ b/packages/kbn-analytics/src/metrics/user_agent.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { METRIC_TYPE } from './';
+import { METRIC_TYPE } from '.';
 
 export interface UserAgentMetric {
   type: METRIC_TYPE.USER_AGENT;
diff --git a/packages/kbn-babel-code-parser/BUILD.bazel b/packages/kbn-babel-code-parser/BUILD.bazel
deleted file mode 100644
index 06cb6dfff2281..0000000000000
--- a/packages/kbn-babel-code-parser/BUILD.bazel
+++ /dev/null
@@ -1,61 +0,0 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm")
-
-PKG_BASE_NAME = "kbn-babel-code-parser"
-PKG_REQUIRE_NAME = "@kbn/babel-code-parser"
-
-SOURCE_FILES = glob(
-  [
-    "src/**/*",
-  ],
-  exclude = [
-    "**/*.test.*"
-  ],
-)
-
-SRCS = SOURCE_FILES
-
-filegroup(
-  name = "srcs",
-  srcs = SRCS,
-)
-
-NPM_MODULE_EXTRA_FILES = [
-  "package.json",
-  "README.md",
-]
-
-RUNTIME_DEPS = [
-  "@npm//@babel/parser",
-  "@npm//@babel/traverse",
-  "@npm//lodash",
-]
-
-jsts_transpiler(
-  name = "target_node",
-  srcs = SRCS,
-  build_pkg_name = package_name(),
-)
-
-js_library(
-  name = PKG_BASE_NAME,
-  srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node"],
-  package_name = PKG_REQUIRE_NAME,
-  visibility = ["//visibility:public"],
-)
-
-pkg_npm(
-  name = "npm_module",
-  deps = [
-    ":%s" % PKG_BASE_NAME,
-  ]
-)
-
-filegroup(
-  name = "build",
-  srcs = [
-    ":npm_module",
-  ],
-  visibility = ["//visibility:public"],
-)
diff --git a/packages/kbn-babel-code-parser/README.md b/packages/kbn-babel-code-parser/README.md
deleted file mode 100755
index f99d01541ee22..0000000000000
--- a/packages/kbn-babel-code-parser/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# @kbn/babel-code-parser
-
-Simple abstraction over the `@babel/parser` and the `@babel/traverse` in order 
-to build a code parser on top.
-
-We have two main functions `parseSingleFile` (sync and sync version) and the 
-`parseEntries` (only async version). The first one just parse one entry file
-and the second one parses recursively all the files from a list of 
-start entry points.
-
-Then we have `visitors` and `strategies`. The first ones are basically the
-`visitors` to use into the ast from the `@babel/traverse`. They are the only
-way to collect info when using the `parseSingleFile`. The `strategies` are
-meant to be used with the `parseEntries` and configures the info we want
-to collect from our parsed code. After each loop, one per entry file, the
-`parseEntries` method will call the given `strategy` expecting that 
-`strategy` would call the desired visitors, assemble the important 
-information to collect and adds them to the final results.
-
diff --git a/packages/kbn-babel-code-parser/package.json b/packages/kbn-babel-code-parser/package.json
deleted file mode 100755
index 7ff913087f5bd..0000000000000
--- a/packages/kbn-babel-code-parser/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@kbn/babel-code-parser",
-  "description": "babel code parser for Kibana",
-  "private": true,
-  "version": "1.0.0",
-  "main": "./target_node/index.js",
-  "license": "SSPL-1.0 OR Elastic License 2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/elastic/kibana/tree/main/packages/kbn-babel-code-parser"
-  },
-  "kibana": {
-    "devOnly": true
-  }
-}
diff --git a/packages/kbn-babel-code-parser/src/can_require.js b/packages/kbn-babel-code-parser/src/can_require.js
deleted file mode 100644
index b1b41790583dd..0000000000000
--- a/packages/kbn-babel-code-parser/src/can_require.js
+++ /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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export function canRequire(cwd, entry) {
-  try {
-    // We will try to test if we can resolve
-    // this entry through the require.resolve
-    // setting as the start looking path the
-    // given cwd. Require.resolve will keep
-    // looking recursively as normal starting
-    // from that location.
-    return require.resolve(entry, {
-      paths: [cwd],
-    });
-  } catch (e) {
-    return false;
-  }
-}
diff --git a/packages/kbn-babel-code-parser/src/code_parser.js b/packages/kbn-babel-code-parser/src/code_parser.js
deleted file mode 100644
index 955d529bbabe4..0000000000000
--- a/packages/kbn-babel-code-parser/src/code_parser.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { canRequire } from './can_require';
-import { readFile, readFileSync } from 'fs';
-import { extname } from 'path';
-import { promisify } from 'util';
-import * as parser from '@babel/parser';
-import traverse from '@babel/traverse';
-import * as babelParserOptions from '@kbn/babel-preset/common_babel_parser_options';
-
-const read = promisify(readFile);
-
-function _cannotParseFile(filePath) {
-  return extname(filePath) !== '.js';
-}
-
-function _parseAndTraverseFileContent(fileContent, visitorsGenerator) {
-  const results = [];
-
-  // Parse and get the code AST
-  // All the babel parser plugins
-  // were enabled
-  const ast = parser.parse(fileContent, babelParserOptions);
-
-  // Loop through the code AST with
-  // the defined visitors
-  traverse(ast, visitorsGenerator(results));
-
-  return results;
-}
-
-export async function parseSingleFile(filePath, visitorsGenerator) {
-  // Don't parse any other files than .js ones
-  if (_cannotParseFile(filePath)) {
-    return [];
-  }
-
-  // Read the file
-  const content = await read(filePath, { encoding: 'utf8' });
-
-  // return the results found on parse and traverse
-  // the file content with the given visitors
-  return _parseAndTraverseFileContent(content, visitorsGenerator);
-}
-
-export function parseSingleFileSync(filePath, visitorsGenerator) {
-  // Don't parse any other files than .js ones
-  if (_cannotParseFile(filePath)) {
-    return [];
-  }
-
-  // Read the file
-  const content = readFileSync(filePath, { encoding: 'utf8' });
-
-  // return the results found on parse and traverse
-  // the file content with the given visitors
-  return _parseAndTraverseFileContent(content, visitorsGenerator);
-}
-
-export async function parseEntries(cwd, entries, strategy, results, wasParsed = {}) {
-  // Assure that we always have a cwd
-  const sanitizedCwd = cwd || process.cwd();
-
-  // Test each entry against canRequire function
-  const entriesQueue = entries.map((entry) => canRequire(sanitizedCwd, entry));
-
-  while (entriesQueue.length) {
-    // Get the first element in the queue as
-    // select it as our current entry to parse
-    const mainEntry = entriesQueue.shift();
-
-    // Avoid parse the current entry if it is not valid
-    // or it was already parsed
-    if (typeof mainEntry !== 'string' || wasParsed[mainEntry]) {
-      continue;
-    }
-
-    // Find new entries and adds them to the end of the queue
-    entriesQueue.push(
-      ...(await strategy(sanitizedCwd, parseSingleFile, mainEntry, wasParsed, results))
-    );
-
-    // Mark the current main entry as already parsed
-    wasParsed[mainEntry] = true;
-  }
-
-  return results;
-}
diff --git a/packages/kbn-babel-code-parser/src/strategies.js b/packages/kbn-babel-code-parser/src/strategies.js
deleted file mode 100644
index 9928959da99c8..0000000000000
--- a/packages/kbn-babel-code-parser/src/strategies.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { canRequire } from './can_require';
-import { dependenciesVisitorsGenerator } from './visitors';
-import { dirname, isAbsolute, resolve } from 'path';
-
-export function _calculateTopLevelDependency(inputDep, outputDep = '') {
-  // The path separator will be always the forward slash
-  // as at this point we only have the found entries into
-  // the provided source code entries where we just use it
-  const pathSeparator = '/';
-  const depSplitPaths = inputDep.split(pathSeparator);
-  const firstPart = depSplitPaths.shift();
-  const outputDepFirstArgAppend = outputDep ? pathSeparator : '';
-
-  outputDep += `${outputDepFirstArgAppend}${firstPart}`;
-
-  // In case our dependency isn't started by @
-  // we are already done and we can return the
-  // dependency value we already have
-  if (firstPart.charAt(0) !== '@') {
-    return outputDep;
-  }
-
-  // Otherwise we need to keep constructing the dependency
-  // value because dependencies starting with @ points to
-  // folders of dependencies. For example, in case we found
-  // dependencies values with '@the-deps/a' and '@the-deps/a/b'
-  // we don't want to map it to '@the-deps' but also to @'the-deps/a'
-  // because inside '@the-deps' we can also have '@the-dep/b'
-  return _calculateTopLevelDependency(depSplitPaths.join(pathSeparator), outputDep);
-}
-
-export async function dependenciesParseStrategy(
-  cwd,
-  parseSingleFile,
-  mainEntry,
-  wasParsed,
-  results
-) {
-  // Retrieve native nodeJS modules
-  const natives = process.binding('natives');
-
-  // Get dependencies from a single file and filter
-  // out node native modules from the result
-  const dependencies = (await parseSingleFile(mainEntry, dependenciesVisitorsGenerator)).filter(
-    (dep) => !natives[dep]
-  );
-
-  // Return the list of all the new entries found into
-  // the current mainEntry that we could use to look for
-  // new dependencies
-  return dependencies.reduce((filteredEntries, entry) => {
-    const absEntryPath = resolve(cwd, dirname(mainEntry), entry);
-    const requiredPath = canRequire(cwd, absEntryPath);
-    const requiredRelativePath = canRequire(cwd, entry);
-    const isRelativeFile = !isAbsolute(entry);
-    const isNodeModuleDep = isRelativeFile && !requiredPath && requiredRelativePath;
-    const isNewEntry = isRelativeFile && requiredPath;
-
-    // If it is a node_module add it to the results and also
-    // add the resolved path for the node_module main file
-    // as an entry point to look for dependencies it was
-    // not already parsed
-    if (isNodeModuleDep) {
-      // Save the result as the top level dependency
-      results[_calculateTopLevelDependency(entry)] = true;
-
-      if (!wasParsed[requiredRelativePath]) {
-        filteredEntries.push(requiredRelativePath);
-      }
-    }
-
-    // If a new, not yet parsed, relative entry were found
-    // add it to the list of entries to be parsed
-    if (isNewEntry && !wasParsed[requiredPath]) {
-      if (!wasParsed[requiredPath]) {
-        filteredEntries.push(requiredPath);
-      }
-    }
-
-    return filteredEntries;
-  }, []);
-}
diff --git a/packages/kbn-babel-code-parser/src/strategies.test.js b/packages/kbn-babel-code-parser/src/strategies.test.js
deleted file mode 100644
index fef46858c5a0a..0000000000000
--- a/packages/kbn-babel-code-parser/src/strategies.test.js
+++ /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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { readFile } from 'fs';
-import { canRequire } from './can_require';
-import { parseSingleFile } from './code_parser';
-import { _calculateTopLevelDependency, dependenciesParseStrategy } from './strategies';
-
-jest.mock('./can_require', () => ({
-  canRequire: jest.fn(),
-}));
-
-jest.mock('fs', () => ({
-  readFile: jest.fn(),
-}));
-
-const mockCwd = '/tmp/project/dir/';
-
-describe('Code Parser Strategies', () => {
-  it('should calculate the top level dependencies correctly', () => {
-    const plainDep = 'dep1/file';
-    const foldedDep = '@kbn/es/file';
-    const otherFoldedDep = '@kbn/es';
-
-    expect(_calculateTopLevelDependency(plainDep)).toEqual('dep1');
-    expect(_calculateTopLevelDependency(foldedDep)).toEqual('@kbn/es');
-    expect(_calculateTopLevelDependency(otherFoldedDep)).toEqual('@kbn/es');
-  });
-
-  it('should exclude native modules', async () => {
-    readFile.mockImplementationOnce((path, options, cb) => {
-      cb(null, `require('fs')`);
-    });
-
-    const results = [];
-    await dependenciesParseStrategy(mockCwd, parseSingleFile, 'dep1/file.js', {}, results);
-
-    expect(results.length).toBe(0);
-  });
-
-  it('should return a dep from_modules', async () => {
-    readFile.mockImplementationOnce((path, options, cb) => {
-      cb(null, `require('dep_from_node_modules')`);
-    });
-
-    canRequire.mockImplementation((mockCwd, entry) => {
-      if (entry === `${mockCwd}dep1/dep_from_node_modules`) {
-        return false;
-      }
-
-      if (entry === 'dep_from_node_modules') {
-        return `${mockCwd}node_modules/dep_from_node_modules/index.js`;
-      }
-    });
-
-    const results = await dependenciesParseStrategy(
-      mockCwd,
-      parseSingleFile,
-      'dep1/file.js',
-      {},
-      {}
-    );
-    expect(results[0]).toBe(`${mockCwd}node_modules/dep_from_node_modules/index.js`);
-  });
-
-  it('should return a relative dep file', async () => {
-    readFile.mockImplementationOnce((path, options, cb) => {
-      cb(null, `require('./relative_dep')`);
-    });
-
-    canRequire.mockImplementation((mockCwd, entry) => {
-      if (entry === `${mockCwd}dep1/relative_dep`) {
-        return `${entry}/index.js`;
-      }
-
-      return false;
-    });
-
-    const results = await dependenciesParseStrategy(
-      mockCwd,
-      parseSingleFile,
-      'dep1/file.js',
-      {},
-      {}
-    );
-    expect(results[0]).toBe(`${mockCwd}dep1/relative_dep/index.js`);
-  });
-
-  afterAll(() => {
-    jest.clearAllMocks();
-  });
-});
diff --git a/packages/kbn-babel-code-parser/src/visitors.js b/packages/kbn-babel-code-parser/src/visitors.js
deleted file mode 100644
index 9974b58b5fb7e..0000000000000
--- a/packages/kbn-babel-code-parser/src/visitors.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { matches } from 'lodash';
-
-/**
- * @notice
- *
- * This product has relied on ASTExplorer that is licensed under MIT.
- */
-export function dependenciesVisitorsGenerator(dependenciesAcc) {
-  return (() => {
-    // This was built with help on an ast explorer and some ESTree docs
-    // like the babel parser ast spec and the main docs for the Esprima
-    // which is a complete and useful docs for the ESTree spec.
-    //
-    // https://astexplorer.net
-    // https://github.com/babel/babel/blob/master/packages/babel-parser/ast/spec.md
-    // https://esprima.readthedocs.io/en/latest/syntax-tree-format.html
-    // https://github.com/estree/estree
-    return {
-      // Visitors to traverse and found dependencies
-      // raw values on require + require.resolve
-      CallExpression: ({ node }) => {
-        // AST check for require expressions
-        const isRequire = (node) => {
-          return matches({
-            callee: {
-              type: 'Identifier',
-              name: 'require',
-            },
-          })(node);
-        };
-
-        // AST check for require.resolve expressions
-        const isRequireResolve = (node) => {
-          return matches({
-            callee: {
-              type: 'MemberExpression',
-              object: {
-                type: 'Identifier',
-                name: 'require',
-              },
-              property: {
-                type: 'Identifier',
-                name: 'resolve',
-              },
-            },
-          })(node);
-        };
-
-        // Get string values inside the expressions
-        // whether they are require or require.resolve
-        if (isRequire(node) || isRequireResolve(node)) {
-          const nodeArguments = node.arguments;
-          const reqArg = Array.isArray(nodeArguments) ? nodeArguments.shift() : null;
-
-          if (!reqArg) {
-            return;
-          }
-
-          if (reqArg.type === 'StringLiteral') {
-            dependenciesAcc.push(reqArg.value);
-          }
-        }
-      },
-      // Visitors to traverse and found dependencies
-      // raw values on import
-      ImportDeclaration: ({ node }) => {
-        // AST check for supported import expressions
-        const isImport = (node) => {
-          return matches({
-            type: 'ImportDeclaration',
-            source: {
-              type: 'StringLiteral',
-            },
-          })(node);
-        };
-
-        // Get string values from import expressions
-        if (isImport(node)) {
-          const importSource = node.source;
-          dependenciesAcc.push(importSource.value);
-        }
-      },
-      // Visitors to traverse and found dependencies
-      // raw values on export from
-      ExportNamedDeclaration: ({ node }) => {
-        // AST check for supported export from expressions
-        const isExportFrom = (node) => {
-          return matches({
-            type: 'ExportNamedDeclaration',
-            source: {
-              type: 'StringLiteral',
-            },
-          })(node);
-        };
-
-        // Get string values from export from expressions
-        if (isExportFrom(node)) {
-          const exportFromSource = node.source;
-          dependenciesAcc.push(exportFromSource.value);
-        }
-      },
-      // Visitors to traverse and found dependencies
-      // raw values on export * from
-      ExportAllDeclaration: ({ node }) => {
-        // AST check for supported export * from expressions
-        const isExportAllFrom = (node) => {
-          return matches({
-            type: 'ExportAllDeclaration',
-            source: {
-              type: 'StringLiteral',
-            },
-          })(node);
-        };
-
-        // Get string values from export * from expressions
-        if (isExportAllFrom(node)) {
-          const exportAllFromSource = node.source;
-          dependenciesAcc.push(exportAllFromSource.value);
-        }
-      },
-    };
-  })();
-}
diff --git a/packages/kbn-babel-code-parser/src/visitors.test.js b/packages/kbn-babel-code-parser/src/visitors.test.js
deleted file mode 100644
index fd8413840d4de..0000000000000
--- a/packages/kbn-babel-code-parser/src/visitors.test.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import * as parser from '@babel/parser';
-import traverse from '@babel/traverse';
-import { dependenciesVisitorsGenerator } from './visitors';
-
-const visitorsApplier = (code) => {
-  const result = [];
-  traverse(
-    parser.parse(code, {
-      sourceType: 'unambiguous',
-      plugins: ['exportDefaultFrom'],
-    }),
-    dependenciesVisitorsGenerator(result)
-  );
-  return result;
-};
-
-describe('Code Parser Visitors', () => {
-  it('should get values from require', () => {
-    const rawCode = `/*foo*/require('dep1'); const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-  });
-
-  it('should get values from require.resolve', () => {
-    const rawCode = `/*foo*/require.resolve('dep2'); const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep2');
-  });
-
-  it('should get values from import', () => {
-    const rawCode = `/*foo*/import dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-    expect(foundDeps[1] === 'dep2');
-  });
-
-  it('should get values from export from', () => {
-    const rawCode = `/*foo*/export dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-  });
-
-  it('should get values from export * from', () => {
-    const rawCode = `/*foo*/export * from 'dep1'; export dep2 from 'dep2';const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-    expect(foundDeps[1] === 'dep2');
-  });
-});
diff --git a/packages/kbn-babel-plugin-synthetic-packages/BUILD.bazel b/packages/kbn-babel-plugin-synthetic-packages/BUILD.bazel
new file mode 100644
index 0000000000000..da588dab2ce42
--- /dev/null
+++ b/packages/kbn-babel-plugin-synthetic-packages/BUILD.bazel
@@ -0,0 +1,64 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-babel-plugin-synthetic-packages"
+PKG_REQUIRE_NAME = "@kbn/babel-plugin-synthetic-packages"
+
+filegroup(
+  name = "srcs",
+  srcs = [
+    "babel_plugin_synthetic_packages.js"
+  ],
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//@babel/helper-plugin-utils",
+  "@npm//normalize-path",
+  "//packages/kbn-synthetic-package-map",
+]
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES + [
+    ":srcs",
+  ],
+  deps = RUNTIME_DEPS,
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [
+    ":%s" % PKG_DIRNAME,
+  ]
+)
+
+filegroup(
+  name = "build",
+  srcs = [
+    ":npm_module",
+  ],
+  visibility = ["//visibility:public"],
+)
+
+alias(
+  name = "npm_module_types",
+  actual = ":" + PKG_DIRNAME,
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-babel-plugin-synthetic-packages/babel_plugin_synthetic_packages.js b/packages/kbn-babel-plugin-synthetic-packages/babel_plugin_synthetic_packages.js
new file mode 100644
index 0000000000000..8caa3906c8fe0
--- /dev/null
+++ b/packages/kbn-babel-plugin-synthetic-packages/babel_plugin_synthetic_packages.js
@@ -0,0 +1,183 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/** @typedef {import('@babel/core').PluginObj} PluginObj */
+
+const Path = require('path');
+const Fs = require('fs');
+
+const T = require('@babel/types');
+const normalizePath = require('normalize-path');
+const { declare } = require('@babel/helper-plugin-utils');
+const KbnSyntheticPackageMap = require('@kbn/synthetic-package-map');
+
+const PKG_MAP = KbnSyntheticPackageMap.readPackageMap();
+const PKG_MAP_HASH = KbnSyntheticPackageMap.readHashOfPackageMap();
+
+function getFilename(state) {
+  if (typeof state !== 'object' || !state || !state.filename || !Path.isAbsolute(state.filename)) {
+    throw new Error(
+      `@kbn/babel-plugin-synthetic-packages is only compatible when building files with absolute filename state`
+    );
+  }
+
+  return state.filename;
+}
+
+let foundKibanaRoot;
+function getKibanaRoot(someSourceFilename) {
+  if (foundKibanaRoot) {
+    return foundKibanaRoot;
+  }
+
+  // try to find the Kibana package.json file in a parent directory of the sourceFile
+  let cursorDir = Path.dirname(someSourceFilename);
+  while (true) {
+    const packageJsonPath = Path.resolve(cursorDir, 'package.json');
+    try {
+      const pkg = JSON.parse(Fs.readFileSync(packageJsonPath, 'utf8'));
+      if (pkg && pkg.name === 'kibana') {
+        foundKibanaRoot = cursorDir;
+        return foundKibanaRoot;
+      }
+    } catch {
+      // this directory is not the Kibana dir
+    }
+
+    const nextCursor = Path.dirname(cursorDir);
+    if (!nextCursor || nextCursor === cursorDir) {
+      // stop iterating when we get to the root of the root of the filesystem
+      break;
+    }
+
+    cursorDir = nextCursor;
+  }
+
+  throw new Error(
+    '@kbn/*-plugin and @kbn/core imports can only be used by source files which have not been converted to packages, building packages which rely on these imports requires converting the thing you want into a package.'
+  );
+}
+
+function fixImportRequest(req, filename, kibanaRoot) {
+  if (!req.startsWith('@kbn/')) {
+    return;
+  }
+
+  const parts = req.split('/');
+  const dir = PKG_MAP.get(`@kbn/${parts[1]}`);
+  if (!dir) {
+    return;
+  }
+
+  return normalizePath(
+    Path.relative(
+      Path.dirname(filename),
+      Path.resolve(kibanaRoot ?? getKibanaRoot(filename), dir, ...parts.slice(2))
+    )
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isDynamicImport(node) {
+  return !!(
+    T.isImport(node.callee) &&
+    node.arguments.length === 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isRequire(node) {
+  return !!(
+    T.isIdentifier(node.callee) &&
+    node.callee.name === 'require' &&
+    node.arguments.length >= 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isRequireResolve(node) {
+  return !!(
+    T.isMemberExpression(node.callee) &&
+    T.isIdentifier(node.callee.object) &&
+    node.callee.object.name === 'require' &&
+    T.isIdentifier(node.callee.property) &&
+    node.callee.property.name === 'resolve' &&
+    node.arguments.length >= 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isJestMockCall(node) {
+  return !!(
+    T.isMemberExpression(node.callee) &&
+    T.isIdentifier(node.callee.object) &&
+    node.callee.object.name === 'jest' &&
+    node.arguments.length >= 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+module.exports = declare((api, options) => {
+  const kibanaRoot = options['kibana/rootDir'];
+
+  api.assertVersion(7);
+  api.cache.using(() => `${PKG_MAP_HASH}:${kibanaRoot}`);
+
+  /** @type {PluginObj} */
+  const plugin = {
+    name: 'synthetic-packages',
+    visitor: {
+      'ImportDeclaration|ExportNamedDeclaration|ExportAllDeclaration'(path) {
+        const filename = getFilename(this);
+
+        const source = path.node.source;
+        if (!T.isStringLiteral(source)) {
+          return;
+        }
+
+        const req = source.value;
+        const newReq = fixImportRequest(req, filename, kibanaRoot);
+        if (newReq) {
+          path.get('source').replaceWith(T.stringLiteral(newReq));
+        }
+      },
+      CallExpression(path) {
+        const filename = getFilename(this);
+
+        const { node } = path;
+        if (
+          !isDynamicImport(node) &&
+          !isRequire(node) &&
+          !isRequireResolve(node) &&
+          !isJestMockCall(node)
+        ) {
+          return;
+        }
+
+        const req = node.arguments[0].value;
+        const newReq = fixImportRequest(req, filename, kibanaRoot);
+        if (newReq) {
+          path.get('arguments.0').replaceWith(T.stringLiteral(newReq));
+        }
+      },
+    },
+  };
+
+  return plugin;
+});
diff --git a/packages/kbn-babel-plugin-synthetic-packages/package.json b/packages/kbn-babel-plugin-synthetic-packages/package.json
new file mode 100644
index 0000000000000..f488064fc6100
--- /dev/null
+++ b/packages/kbn-babel-plugin-synthetic-packages/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/babel-plugin-synthetic-packages",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./babel_plugin_synthetic_packages.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-babel-preset/BUILD.bazel b/packages/kbn-babel-preset/BUILD.bazel
index 8e600eb6b23be..1e64c1e9f9ef7 100644
--- a/packages/kbn-babel-preset/BUILD.bazel
+++ b/packages/kbn-babel-preset/BUILD.bazel
@@ -40,6 +40,7 @@ RUNTIME_DEPS = [
   "@npm//babel-plugin-add-module-exports",
   "@npm//babel-plugin-styled-components",
   "@npm//babel-plugin-transform-react-remove-prop-types",
+  "//packages/kbn-babel-plugin-synthetic-packages",
 ]
 
 js_library(
diff --git a/packages/kbn-babel-preset/common_preset.js b/packages/kbn-babel-preset/common_preset.js
index 824a73f9b2611..1c3e2135d1049 100644
--- a/packages/kbn-babel-preset/common_preset.js
+++ b/packages/kbn-babel-preset/common_preset.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-module.exports = {
+module.exports = (_, options = {}) => ({
   presets: [
     // plugins always run before presets, but in this case we need the
     // @babel/preset-typescript preset to run first so we have to move
@@ -46,6 +46,8 @@ module.exports = {
             version: '^7.12.5',
           },
         ],
+
+        [require.resolve('@kbn/babel-plugin-synthetic-packages'), options],
       ],
     },
 
@@ -59,4 +61,4 @@ module.exports = {
       },
     ],
   ],
-};
+});
diff --git a/packages/kbn-babel-preset/node_preset.js b/packages/kbn-babel-preset/node_preset.js
index b69c59f5e2cc5..295ea5d0d8e8b 100644
--- a/packages/kbn-babel-preset/node_preset.js
+++ b/packages/kbn-babel-preset/node_preset.js
@@ -37,7 +37,7 @@ module.exports = (_, options = {}) => {
           ...(options['@babel/preset-env'] || {}),
         },
       ],
-      require('./common_preset'),
+      [require('./common_preset'), options],
     ],
   };
 };
diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js
index a1d94136ebfb1..a8b1234a406fd 100644
--- a/packages/kbn-babel-preset/styled_components_files.js
+++ b/packages/kbn-babel-preset/styled_components_files.js
@@ -14,7 +14,7 @@ module.exports = {
   USES_STYLED_COMPONENTS: [
     /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
     /src[\/\\]plugins[\/\\](unified_search|kibana_react)[\/\\]/,
-    /x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|osquery|security_solution|timelines|uptime|ux)[\/\\]/,
+    /x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|osquery|security_solution|timelines|synthetics|ux)[\/\\]/,
     /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
   ],
 };
diff --git a/packages/kbn-babel-preset/webpack_preset.js b/packages/kbn-babel-preset/webpack_preset.js
index 7bf1f518012a4..1f5a840f4f54d 100644
--- a/packages/kbn-babel-preset/webpack_preset.js
+++ b/packages/kbn-babel-preset/webpack_preset.js
@@ -8,7 +8,7 @@
 
 const { USES_STYLED_COMPONENTS } = require('./styled_components_files');
 
-module.exports = () => {
+module.exports = (_, options = {}) => {
   return {
     presets: [
       [
@@ -22,7 +22,7 @@ module.exports = () => {
           bugfixes: true,
         },
       ],
-      require('./common_preset'),
+      [require('./common_preset'), options],
     ],
     env: {
       production: {
diff --git a/packages/kbn-bazel-packages/BUILD.bazel b/packages/kbn-bazel-packages/BUILD.bazel
index 9adfe80060889..024282768d633 100644
--- a/packages/kbn-bazel-packages/BUILD.bazel
+++ b/packages/kbn-bazel-packages/BUILD.bazel
@@ -39,6 +39,7 @@ NPM_MODULE_EXTRA_FILES = [
 RUNTIME_DEPS = [
   "//packages/kbn-utils",
   "//packages/kbn-std",
+  "//packages/kbn-synthetic-package-map",
   "@npm//globby",
   "@npm//normalize-path",
 ]
@@ -56,6 +57,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-std:npm_module_types",
+  "//packages/kbn-synthetic-package-map:npm_module_types",
   "@npm//@types/normalize-path",
   "@npm//globby",
   "@npm//normalize-path",
diff --git a/packages/kbn-bazel-packages/src/bazel_package.ts b/packages/kbn-bazel-packages/src/bazel_package.ts
index 35950c9896faf..930eed591a853 100644
--- a/packages/kbn-bazel-packages/src/bazel_package.ts
+++ b/packages/kbn-bazel-packages/src/bazel_package.ts
@@ -13,51 +13,21 @@ import Fsp from 'fs/promises';
 import normalizePath from 'normalize-path';
 import { REPO_ROOT } from '@kbn/utils';
 
+import { readPackageJson, ParsedPackageJson } from './parse_package_json';
+
 const BUILD_RULE_NAME = /(^|\s)name\s*=\s*"build"/;
 const BUILD_TYPES_RULE_NAME = /(^|\s)name\s*=\s*"build_types"/;
 
-/**
- * Simple parsed representation of a package.json file, validated
- * by `assertParsedPackageJson()` and extensible as needed in the future
- */
-export interface ParsedPackageJson {
-  /**
-   * The name of the package, usually `@kbn/`+something
-   */
-  name: string;
-  /**
-   * All other fields in the package.json are typed as unknown as all we need at this time is "name"
-   */
-  [key: string]: unknown;
-}
-
-function isObj(v: unknown): v is Record<string, unknown> {
-  return !!(typeof v === 'object' && v);
-}
-
-function assertParsedPackageJson(v: unknown): asserts v is ParsedPackageJson {
-  if (!isObj(v) || typeof v.name !== 'string') {
-    throw new Error('Expected parsed package.json to be an object with at least a "name" property');
-  }
-}
-
 /**
  * Representation of a Bazel Package in the Kibana repository
  */
 export class BazelPackage {
   /**
    * Create a BazelPackage object from a package directory. Reads some files from the package and returns
-   * a Promise for a BazelPackage instance
+   * a Promise for a BazelPackage instance.
    */
   static async fromDir(dir: string) {
-    let pkg;
-    try {
-      pkg = JSON.parse(await Fsp.readFile(Path.resolve(dir, 'package.json'), 'utf8'));
-    } catch (error) {
-      throw new Error(`unable to parse package.json in [${dir}]: ${error.message}`);
-    }
-
-    assertParsedPackageJson(pkg);
+    const pkg = readPackageJson(Path.resolve(dir, 'package.json'));
 
     let buildBazelContent;
     if (pkg.name !== '@kbn/pm') {
@@ -100,6 +70,13 @@ export class BazelPackage {
     return !!(this.buildBazelContent && BUILD_TYPES_RULE_NAME.test(this.buildBazelContent));
   }
 
+  /**
+   * Returns true if the package is not intended to be in the build
+   */
+  isDevOnly() {
+    return !!this.pkg.kibana?.devOnly;
+  }
+
   /**
    * Custom inspect handler so that logging variables in scripts/generate doesn't
    * print all the BUILD.bazel files
diff --git a/packages/kbn-bazel-packages/src/bazel_package_dirs.ts b/packages/kbn-bazel-packages/src/bazel_package_dirs.ts
index f34ab39d3526a..f09883994feca 100644
--- a/packages/kbn-bazel-packages/src/bazel_package_dirs.ts
+++ b/packages/kbn-bazel-packages/src/bazel_package_dirs.ts
@@ -6,12 +6,40 @@
  * Side Public License, v 1.
  */
 
+import Path from 'path';
+
+import globby from 'globby';
+import { REPO_ROOT } from '@kbn/utils';
+
 /**
  * This is a list of repo-relative paths to directories containing packages. Do not
  * include `**` in these, one or two `*` segments is acceptable, we need this search
  * to be super fast so please avoid deep recursive searching.
  *
- *   eg. src/vis-editors     => would find a package at src/vis-editors/foo/package.json
- *       src/vis-editors/*   => would find a package at src/vis-editors/foo/bar/package.json
+ *   eg. src/vis_editors     => would find a package at src/vis_editors/foo/package.json
+ *       src/vis_editors/*   => would find a package at src/vis_editors/foo/bar/package.json
+ */
+export const BAZEL_PACKAGE_DIRS = [
+  'packages',
+  'packages/shared-ux/*',
+  'packages/analytics',
+  'packages/analytics/shippers',
+];
+
+/**
+ * Resolve all the BAZEL_PACKAGE_DIRS to absolute paths
+ */
+export function getAllBazelPackageDirs() {
+  return globby.sync(BAZEL_PACKAGE_DIRS, {
+    cwd: REPO_ROOT,
+    onlyDirectories: true,
+    expandDirectories: false,
+  });
+}
+
+/**
+ * Resolve all the BAZEL_PACKAGE_DIRS to repo-relative paths
  */
-export const BAZEL_PACKAGE_DIRS = ['packages'];
+export function getAllRepoRelativeBazelPackageDirs() {
+  return getAllBazelPackageDirs().map((path) => Path.relative(REPO_ROOT, path));
+}
diff --git a/packages/kbn-bazel-packages/src/discover_packages.ts b/packages/kbn-bazel-packages/src/discover_packages.ts
index fa636b9d3dba6..db31b54beec75 100644
--- a/packages/kbn-bazel-packages/src/discover_packages.ts
+++ b/packages/kbn-bazel-packages/src/discover_packages.ts
@@ -15,22 +15,23 @@ import { asyncMapWithLimit } from '@kbn/std';
 import { BazelPackage } from './bazel_package';
 import { BAZEL_PACKAGE_DIRS } from './bazel_package_dirs';
 
-/**
- * Search the local Kibana repo for bazel packages and return an array of BazelPackage objects
- * representing each package found.
- */
-export async function discoverBazelPackages() {
-  const packageJsons = globby.sync(
-    BAZEL_PACKAGE_DIRS.map((dir) => `${dir}/*/package.json`),
-    {
-      cwd: REPO_ROOT,
-      absolute: true,
-    }
-  );
+export function discoverBazelPackageLocations(repoRoot: string) {
+  return globby
+    .sync(
+      BAZEL_PACKAGE_DIRS.map((dir) => `${dir}/*/package.json`),
+      {
+        cwd: repoRoot,
+        absolute: true,
+      }
+    )
+    .sort((a, b) => a.localeCompare(b))
+    .map((path) => Path.dirname(path));
+}
 
+export async function discoverBazelPackages(repoRoot: string = REPO_ROOT) {
   return await asyncMapWithLimit(
-    packageJsons.sort((a, b) => a.localeCompare(b)),
+    discoverBazelPackageLocations(repoRoot),
     100,
-    async (path) => await BazelPackage.fromDir(Path.dirname(path))
+    async (dir) => await BazelPackage.fromDir(dir)
   );
 }
diff --git a/packages/kbn-bazel-packages/src/parse_package_json.ts b/packages/kbn-bazel-packages/src/parse_package_json.ts
new file mode 100644
index 0000000000000..c3ad446b66823
--- /dev/null
+++ b/packages/kbn-bazel-packages/src/parse_package_json.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs';
+
+/**
+ * Simple parsed representation of a package.json file, validated
+ * by `assertParsedPackageJson()` and extensible as needed in the future
+ */
+export interface ParsedPackageJson {
+  /** The name of the package, usually `@kbn/`+something */
+  name: string;
+  /** "dependenices" property from package.json */
+  dependencies?: Record<string, string>;
+  /** "devDependenices" property from package.json */
+  devDependencies?: Record<string, string>;
+  /** Some kibana specific properties about this package */
+  kibana?: {
+    /** Is this package only intended for dev? */
+    devOnly?: boolean;
+  };
+  /** All other fields in the package.json are typed as unknown as we don't care what they are */
+  [key: string]: unknown;
+}
+
+function isObj(v: unknown): v is Record<string, unknown> {
+  return !!(typeof v === 'object' && v);
+}
+
+/**
+ * Asserts that given value looks like a parsed package.json file
+ */
+export function assertParsedPackageJson(v: unknown): asserts v is ParsedPackageJson {
+  if (!isObj(v) || typeof v.name !== 'string') {
+    throw new Error('Expected at least a "name" property');
+  }
+
+  if (v.dependencies && !isObj(v.dependencies)) {
+    throw new Error('Expected "dependencies" to be an object');
+  }
+
+  if (v.devDependencies && !isObj(v.devDependencies)) {
+    throw new Error('Expected "dependencies" to be an object');
+  }
+
+  const kibana = v.kibana;
+  if (kibana !== undefined) {
+    if (!isObj(kibana)) {
+      throw new Error('Expected "kibana" field in package.json to be an object');
+    }
+
+    if (kibana.devOnly !== undefined && typeof kibana.devOnly !== 'boolean') {
+      throw new Error('Expected "kibana.devOnly" field in package.json to be a boolean');
+    }
+  }
+}
+
+/**
+ * Reads a given package.json file from disk and parses it
+ */
+export function readPackageJson(path: string): ParsedPackageJson {
+  let pkg;
+  try {
+    pkg = JSON.parse(Fs.readFileSync(path, 'utf8'));
+    assertParsedPackageJson(pkg);
+  } catch (error) {
+    throw new Error(`unable to parse package.json at [${path}]: ${error.message}`);
+  }
+  return pkg;
+}
diff --git a/packages/kbn-bazel-runner/BUILD.bazel b/packages/kbn-bazel-runner/BUILD.bazel
new file mode 100644
index 0000000000000..ace7e0f9c7662
--- /dev/null
+++ b/packages/kbn-bazel-runner/BUILD.bazel
@@ -0,0 +1,122 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-bazel-runner"
+PKG_REQUIRE_NAME = "@kbn/bazel-runner"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//execa",
+  "@npm//chalk",
+  "@npm//rxjs",
+  "//packages/kbn-dev-utils",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//execa",
+  "@npm//chalk",
+  "@npm//rxjs",
+  "//packages/kbn-dev-utils:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-bazel-runner/README.md b/packages/kbn-bazel-runner/README.md
new file mode 100644
index 0000000000000..690caf33e45ba
--- /dev/null
+++ b/packages/kbn-bazel-runner/README.md
@@ -0,0 +1,3 @@
+# @kbn/bazel-runner
+
+Helpers for running bazel commands, used everywhere we programatically run bazel.
\ No newline at end of file
diff --git a/packages/elastic-analytics/jest.config.js b/packages/kbn-bazel-runner/jest.config.js
similarity index 89%
rename from packages/elastic-analytics/jest.config.js
rename to packages/kbn-bazel-runner/jest.config.js
index cc7f3da0561cd..4d4f77a8f43f3 100644
--- a/packages/elastic-analytics/jest.config.js
+++ b/packages/kbn-bazel-runner/jest.config.js
@@ -9,5 +9,5 @@
 module.exports = {
   preset: '@kbn/test/jest_node',
   rootDir: '../..',
-  roots: ['<rootDir>/packages/elastic-analytics'],
+  roots: ['<rootDir>/packages/kbn-bazel-runner'],
 };
diff --git a/packages/kbn-bazel-runner/package.json b/packages/kbn-bazel-runner/package.json
new file mode 100644
index 0000000000000..d8fe010f0e4c3
--- /dev/null
+++ b/packages/kbn-bazel-runner/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/bazel-runner",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-bazel-runner/src/bazel_runner.ts b/packages/kbn-bazel-runner/src/bazel_runner.ts
new file mode 100644
index 0000000000000..a07ec35285872
--- /dev/null
+++ b/packages/kbn-bazel-runner/src/bazel_runner.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import chalk from 'chalk';
+import execa from 'execa';
+import * as Rx from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { ToolingLog } from '@kbn/tooling-log';
+import { observeLines } from '@kbn/stdio-dev-helpers';
+
+type BazelCommandRunner = 'bazel' | 'ibazel';
+
+interface BazelRunOptions {
+  log: ToolingLog;
+  bazelArgs: string[];
+  offline?: boolean;
+  execaOpts?: execa.Options;
+}
+
+async function runBazelCommandWithRunner(runner: BazelCommandRunner, options: BazelRunOptions) {
+  const bazelProc = execa(
+    runner,
+    options.offline ? [...options.bazelArgs, '--config=offline'] : options.bazelArgs,
+    {
+      ...options.execaOpts,
+      stdio: 'pipe',
+      preferLocal: true,
+    }
+  );
+
+  await Promise.all([
+    // Bazel outputs machine readable output into stdout and human readable output goes to stderr.
+    // Therefore we need to get both. In order to get errors we need to parse the actual text line
+    Rx.lastValueFrom(
+      Rx.merge(
+        observeLines(bazelProc.stdout!).pipe(
+          tap((line) => options.log.info(`${chalk.cyan(`[${runner}]`)} ${line}`))
+        ),
+        observeLines(bazelProc.stderr!).pipe(
+          tap((line) => options.log.info(`${chalk.cyan(`[${runner}]`)} ${line}`))
+        )
+      ).pipe(Rx.defaultIfEmpty(undefined))
+    ),
+
+    // Wait for process and logs to finish, unsubscribing in the end
+    bazelProc.catch(() => {
+      options.log.error(
+        'HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`'
+      );
+
+      throw new Error(`The bazel command that was running failed to complete.`);
+    }),
+  ]);
+}
+
+export async function runBazel(options: BazelRunOptions) {
+  await runBazelCommandWithRunner('bazel', options);
+}
+
+export async function runIBazel(options: BazelRunOptions) {
+  await runBazelCommandWithRunner('ibazel', {
+    ...options,
+    execaOpts: {
+      ...options.execaOpts,
+      env: {
+        ...options.execaOpts?.env,
+        IBAZEL_USE_LEGACY_WATCHER: '0',
+      },
+    },
+  });
+}
diff --git a/packages/kbn-pm/cli.js b/packages/kbn-bazel-runner/src/index.ts
similarity index 88%
rename from packages/kbn-pm/cli.js
rename to packages/kbn-bazel-runner/src/index.ts
index 41b533ee87d8b..fb88a9744f522 100644
--- a/packages/kbn-pm/cli.js
+++ b/packages/kbn-bazel-runner/src/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-require('./dist').run(process.argv.slice(2));
+export * from './bazel_runner';
diff --git a/packages/elastic-analytics/tsconfig.json b/packages/kbn-bazel-runner/tsconfig.json
similarity index 91%
rename from packages/elastic-analytics/tsconfig.json
rename to packages/kbn-bazel-runner/tsconfig.json
index 139f53ae99db6..a8cfc2cceb08b 100644
--- a/packages/elastic-analytics/tsconfig.json
+++ b/packages/kbn-bazel-runner/tsconfig.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "declaration": true,
     "emitDeclarationOnly": true,
-    "isolatedModules": true,
     "outDir": "target_types",
     "rootDir": "src",
     "stripInternal": false,
diff --git a/packages/kbn-ci-stats-client/BUILD.bazel b/packages/kbn-ci-stats-client/BUILD.bazel
new file mode 100644
index 0000000000000..7017adc604416
--- /dev/null
+++ b/packages/kbn-ci-stats-client/BUILD.bazel
@@ -0,0 +1,120 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-ci-stats-client"
+PKG_REQUIRE_NAME = "@kbn/ci-stats-client"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//axios",
+  "//packages/kbn-ci-stats-core",
+  "//packages/kbn-tooling-log",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//axios",
+  "//packages/kbn-ci-stats-core:npm_module_types",
+  "//packages/kbn-tooling-log:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-ci-stats-client/README.md b/packages/kbn-ci-stats-client/README.md
new file mode 100644
index 0000000000000..d1f6c59e978c9
--- /dev/null
+++ b/packages/kbn-ci-stats-client/README.md
@@ -0,0 +1,3 @@
+# @kbn/ci-stats-client
+
+Client for reading data stored at https://ci-stats.kibana.dev
\ No newline at end of file
diff --git a/packages/kbn-ci-stats-client/jest.config.js b/packages/kbn-ci-stats-client/jest.config.js
new file mode 100644
index 0000000000000..d855d7886d0d7
--- /dev/null
+++ b/packages/kbn-ci-stats-client/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-ci-stats-client'],
+};
diff --git a/packages/kbn-ci-stats-client/package.json b/packages/kbn-ci-stats-client/package.json
new file mode 100644
index 0000000000000..709f6a3454d59
--- /dev/null
+++ b/packages/kbn-ci-stats-client/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/ci-stats-client",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_client.ts b/packages/kbn-ci-stats-client/src/ci_stats_client.ts
similarity index 93%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_client.ts
rename to packages/kbn-ci-stats-client/src/ci_stats_client.ts
index 77b3769fe62c1..a7ab6f1cc4cb8 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_client.ts
+++ b/packages/kbn-ci-stats-client/src/ci_stats_client.ts
@@ -7,10 +7,9 @@
  */
 
 import Axios from 'axios';
-import { ToolingLog } from '../tooling_log';
+import { ToolingLog } from '@kbn/tooling-log';
 
-import { parseConfig, Config } from './ci_stats_config';
-import { CiStatsMetadata } from './ci_stats_metadata';
+import { parseConfig, Config, CiStatsMetadata } from '@kbn/ci-stats-core';
 
 interface LatestTestGroupStatsOptions {
   /** The Kibana branch to get stats for, eg "main" */
diff --git a/packages/kbn-config/src/plugins/index.ts b/packages/kbn-ci-stats-client/src/index.ts
similarity index 85%
rename from packages/kbn-config/src/plugins/index.ts
rename to packages/kbn-ci-stats-client/src/index.ts
index fdb459b5f412e..ac32c69b9f7b7 100644
--- a/packages/kbn-config/src/plugins/index.ts
+++ b/packages/kbn-ci-stats-client/src/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { getPluginSearchPaths } from './plugin_search_paths';
+export { CiStatsClient } from './ci_stats_client';
diff --git a/packages/kbn-ci-stats-client/tsconfig.json b/packages/kbn-ci-stats-client/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-ci-stats-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-ci-stats-core/BUILD.bazel b/packages/kbn-ci-stats-core/BUILD.bazel
new file mode 100644
index 0000000000000..421ec5e1961d9
--- /dev/null
+++ b/packages/kbn-ci-stats-core/BUILD.bazel
@@ -0,0 +1,116 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-ci-stats-core"
+PKG_REQUIRE_NAME = "@kbn/ci-stats-core"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "//packages/kbn-tooling-log",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "//packages/kbn-tooling-log:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-ci-stats-core/README.md b/packages/kbn-ci-stats-core/README.md
new file mode 100644
index 0000000000000..b2e34a492b745
--- /dev/null
+++ b/packages/kbn-ci-stats-core/README.md
@@ -0,0 +1,3 @@
+# @kbn/ci-stats-core
+
+Config and types used by `@kbn/ci-stats-client` and `@kbn/ci-stats-reporter`.
\ No newline at end of file
diff --git a/packages/kbn-ci-stats-core/jest.config.js b/packages/kbn-ci-stats-core/jest.config.js
new file mode 100644
index 0000000000000..0feb7b4e1b872
--- /dev/null
+++ b/packages/kbn-ci-stats-core/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-ci-stats-core'],
+};
diff --git a/packages/kbn-ci-stats-core/package.json b/packages/kbn-ci-stats-core/package.json
new file mode 100644
index 0000000000000..d1141ec3c55a8
--- /dev/null
+++ b/packages/kbn-ci-stats-core/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/ci-stats-core",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts b/packages/kbn-ci-stats-core/src/ci_stats_config.ts
similarity index 97%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts
rename to packages/kbn-ci-stats-core/src/ci_stats_config.ts
index f73b9c830a2ab..c97d99c53bf6a 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts
+++ b/packages/kbn-ci-stats-core/src/ci_stats_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ToolingLog } from '../tooling_log';
+import type { ToolingLog } from '@kbn/tooling-log';
 
 /**
  * Information about how CiStatsReporter should talk to the ci-stats service. Normally
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_metadata.ts b/packages/kbn-ci-stats-core/src/ci_stats_metadata.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_metadata.ts
rename to packages/kbn-ci-stats-core/src/ci_stats_metadata.ts
diff --git a/packages/kbn-ci-stats-core/src/index.ts b/packages/kbn-ci-stats-core/src/index.ts
new file mode 100644
index 0000000000000..5b39370eb17e1
--- /dev/null
+++ b/packages/kbn-ci-stats-core/src/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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export type { Config } from './ci_stats_config';
+export { parseConfig } from './ci_stats_config';
+export type { CiStatsMetadata } from './ci_stats_metadata';
diff --git a/packages/kbn-ci-stats-core/tsconfig.json b/packages/kbn-ci-stats-core/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-ci-stats-core/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-ci-stats-reporter/BUILD.bazel b/packages/kbn-ci-stats-reporter/BUILD.bazel
new file mode 100644
index 0000000000000..41ff5a697977c
--- /dev/null
+++ b/packages/kbn-ci-stats-reporter/BUILD.bazel
@@ -0,0 +1,122 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-ci-stats-reporter"
+PKG_REQUIRE_NAME = "@kbn/ci-stats-reporter"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//axios",
+  "@npm//execa",
+  "//packages/kbn-tooling-log",
+  "//packages/kbn-ci-stats-core",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//axios",
+  "@npm//execa",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "//packages/kbn-tooling-log:npm_module_types",
+  "//packages/kbn-ci-stats-core:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/README.md b/packages/kbn-ci-stats-reporter/README.md
similarity index 100%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/README.md
rename to packages/kbn-ci-stats-reporter/README.md
diff --git a/packages/kbn-ci-stats-reporter/jest.config.js b/packages/kbn-ci-stats-reporter/jest.config.js
new file mode 100644
index 0000000000000..bf58324f440a3
--- /dev/null
+++ b/packages/kbn-ci-stats-reporter/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-ci-stats-reporter'],
+};
diff --git a/packages/kbn-ci-stats-reporter/package.json b/packages/kbn-ci-stats-reporter/package.json
new file mode 100644
index 0000000000000..01743bced98d5
--- /dev/null
+++ b/packages/kbn-ci-stats-reporter/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/ci-stats-reporter",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts b/packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts
similarity index 98%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
rename to packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts
index 367a1be175266..d709927787b0e 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
+++ b/packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts
@@ -16,11 +16,10 @@ import execa from 'execa';
 import Axios, { AxiosRequestConfig } from 'axios';
 // @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
 import httpAdapter from 'axios/lib/adapters/http';
+import { ToolingLog } from '@kbn/tooling-log';
 
-import { ToolingLog } from '../tooling_log';
-import { parseConfig, Config } from './ci_stats_config';
+import { parseConfig, Config, CiStatsMetadata } from '@kbn/ci-stats-core';
 import type { CiStatsTestGroupInfo, CiStatsTestRun } from './ci_stats_test_group_types';
-import { CiStatsMetadata } from './ci_stats_metadata';
 
 const BASE_URL = 'https://ci-stats.kibana.dev';
 
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_test_group_types.ts b/packages/kbn-ci-stats-reporter/src/ci_stats_test_group_types.ts
similarity index 97%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_test_group_types.ts
rename to packages/kbn-ci-stats-reporter/src/ci_stats_test_group_types.ts
index b786981fb8437..223273ca82cd3 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_test_group_types.ts
+++ b/packages/kbn-ci-stats-reporter/src/ci_stats_test_group_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CiStatsMetadata } from './ci_stats_metadata';
+import type { CiStatsMetadata } from '@kbn/ci-stats-core';
 
 export type CiStatsTestResult = 'fail' | 'pass' | 'skip';
 export type CiStatsTestType =
diff --git a/packages/kbn-ci-stats-reporter/src/index.ts b/packages/kbn-ci-stats-reporter/src/index.ts
new file mode 100644
index 0000000000000..aa797f97f2603
--- /dev/null
+++ b/packages/kbn-ci-stats-reporter/src/index.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export type {
+  CiStatsMetric,
+  CiStatsReportTestsOptions,
+  CiStatsTiming,
+  MetricsOptions,
+  TimingsOptions,
+} from './ci_stats_reporter';
+export { CiStatsReporter } from './ci_stats_reporter';
+export { getTimeReporter } from './report_time';
+export type {
+  CiStatsTestGroupInfo,
+  CiStatsTestResult,
+  CiStatsTestRun,
+  CiStatsTestType,
+} from './ci_stats_test_group_types';
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/report_time.ts b/packages/kbn-ci-stats-reporter/src/report_time.ts
similarity index 87%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/report_time.ts
rename to packages/kbn-ci-stats-reporter/src/report_time.ts
index d10250a03f091..20cb8fc9ef86d 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/report_time.ts
+++ b/packages/kbn-ci-stats-reporter/src/report_time.ts
@@ -6,7 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CiStatsReporter, ToolingLog } from '..';
+import { ToolingLog } from '@kbn/tooling-log';
+
+import { CiStatsReporter } from './ci_stats_reporter';
 
 export const getTimeReporter = (log: ToolingLog, group: string) => {
   const reporter = CiStatsReporter.fromEnv(log);
diff --git a/packages/kbn-ci-stats-reporter/tsconfig.json b/packages/kbn-ci-stats-reporter/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-ci-stats-reporter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-cli-dev-mode/src/cli_dev_mode.test.ts b/packages/kbn-cli-dev-mode/src/cli_dev_mode.test.ts
index 0066644d0825a..6dd96cbb0634b 100644
--- a/packages/kbn-cli-dev-mode/src/cli_dev_mode.test.ts
+++ b/packages/kbn-cli-dev-mode/src/cli_dev_mode.test.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import * as Rx from 'rxjs';
-import { createAbsolutePathSerializer, createAnyInstanceSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer, createAnyInstanceSerializer } from '@kbn/jest-serializers';
 
 import { REPO_ROOT } from '@kbn/utils';
 
@@ -32,8 +32,8 @@ const { DevServer } = jest.requireMock('./dev_server');
 jest.mock('./base_path_proxy_server');
 const { BasePathProxyServer } = jest.requireMock('./base_path_proxy_server');
 
-jest.mock('@kbn/dev-utils/ci_stats_reporter');
-const { CiStatsReporter } = jest.requireMock('@kbn/dev-utils/ci_stats_reporter');
+jest.mock('@kbn/ci-stats-reporter');
+const { CiStatsReporter } = jest.requireMock('@kbn/ci-stats-reporter');
 
 jest.mock('./get_server_watch_paths', () => ({
   getServerWatchPaths: jest.fn(() => ({
diff --git a/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts b/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
index 9cf688b675e67..ccd3e61214463 100644
--- a/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
+++ b/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
@@ -22,7 +22,7 @@ import {
   takeUntil,
 } from 'rxjs/operators';
 import { CliArgs } from '@kbn/config';
-import { CiStatsReporter } from '@kbn/dev-utils';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { Log, CliLog } from './log';
diff --git a/packages/kbn-cli-dev-mode/src/dev_server.test.ts b/packages/kbn-cli-dev-mode/src/dev_server.test.ts
index 772ba097fc31a..959a47ac80803 100644
--- a/packages/kbn-cli-dev-mode/src/dev_server.test.ts
+++ b/packages/kbn-cli-dev-mode/src/dev_server.test.ts
@@ -72,6 +72,7 @@ const defaultOptions: Options = {
   processExit$,
   sigint$,
   sigterm$,
+  forceColor: true,
 };
 
 expect.addSnapshotSerializer(extendedEnvSerializer);
@@ -80,7 +81,6 @@ beforeEach(() => {
   jest.clearAllMocks();
   log.messages.length = 0;
   process.execArgv = ['--inheritted', '--exec', '--argv'];
-  process.env.FORCE_COLOR = process.env.FORCE_COLOR || '1';
   currentProc = undefined;
 });
 
diff --git a/packages/kbn-cli-dev-mode/src/dev_server.ts b/packages/kbn-cli-dev-mode/src/dev_server.ts
index 750f93dd6c58c..cf89d2c00d16f 100644
--- a/packages/kbn-cli-dev-mode/src/dev_server.ts
+++ b/packages/kbn-cli-dev-mode/src/dev_server.ts
@@ -18,7 +18,7 @@ import {
   takeUntil,
   ignoreElements,
 } from 'rxjs/operators';
-import { observeLines } from '@kbn/dev-utils';
+import { observeLines } from '@kbn/stdio-dev-helpers';
 
 import { usingServerProcess } from './using_server_process';
 import { Watcher } from './watcher';
@@ -34,6 +34,7 @@ export interface Options {
   sigint$?: Rx.Observable<void>;
   sigterm$?: Rx.Observable<void>;
   mapLogLine?: DevServer['mapLogLine'];
+  forceColor?: boolean;
 }
 
 export class DevServer {
@@ -50,6 +51,7 @@ export class DevServer {
   private readonly argv: string[];
   private readonly gracefulTimeout: number;
   private readonly mapLogLine?: (line: string) => string | null;
+  private readonly forceColor: boolean;
 
   constructor(options: Options) {
     this.log = options.log;
@@ -62,6 +64,7 @@ export class DevServer {
     this.sigint$ = options.sigint$ ?? Rx.fromEvent<void>(process, 'SIGINT');
     this.sigterm$ = options.sigterm$ ?? Rx.fromEvent<void>(process, 'SIGTERM');
     this.mapLogLine = options.mapLogLine;
+    this.forceColor = options.forceColor ?? !!process.stdout.isTTY;
   }
 
   isReady$() {
@@ -141,8 +144,13 @@ export class DevServer {
       })
     );
 
+    const serverOptions = {
+      script: this.script,
+      argv: this.argv,
+      forceColor: this.forceColor,
+    };
     const runServer = () =>
-      usingServerProcess(this.script, this.argv, (proc) => {
+      usingServerProcess(serverOptions, (proc) => {
         this.phase$.next('starting');
         this.ready$.next(false);
 
diff --git a/packages/kbn-cli-dev-mode/src/get_server_watch_paths.test.ts b/packages/kbn-cli-dev-mode/src/get_server_watch_paths.test.ts
index 12074bf493218..6291c07b4f266 100644
--- a/packages/kbn-cli-dev-mode/src/get_server_watch_paths.test.ts
+++ b/packages/kbn-cli-dev-mode/src/get_server_watch_paths.test.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { getServerWatchPaths } from './get_server_watch_paths';
diff --git a/packages/kbn-cli-dev-mode/src/log.ts b/packages/kbn-cli-dev-mode/src/log.ts
index dc38639f29e6e..4ddc4b0ebdbe2 100644
--- a/packages/kbn-cli-dev-mode/src/log.ts
+++ b/packages/kbn-cli-dev-mode/src/log.ts
@@ -9,7 +9,7 @@
 /* eslint-disable max-classes-per-file */
 
 import Chalk from 'chalk';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 export interface Log {
   toolingLog: ToolingLog;
diff --git a/packages/kbn-cli-dev-mode/src/optimizer.test.ts b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
index c300b34d514d2..3cb847c9594e3 100644
--- a/packages/kbn-cli-dev-mode/src/optimizer.test.ts
+++ b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
@@ -11,7 +11,8 @@ import { PassThrough } from 'stream';
 import * as Rx from 'rxjs';
 import { toArray } from 'rxjs/operators';
 import { OptimizerUpdate } from '@kbn/optimizer';
-import { observeLines, createReplaceSerializer } from '@kbn/dev-utils';
+import { observeLines } from '@kbn/stdio-dev-helpers';
+import { createReplaceSerializer } from '@kbn/jest-serializers';
 
 import { Optimizer, Options } from './optimizer';
 
diff --git a/packages/kbn-cli-dev-mode/src/optimizer.ts b/packages/kbn-cli-dev-mode/src/optimizer.ts
index 3f7a6edc22314..60d84d2b42c85 100644
--- a/packages/kbn-cli-dev-mode/src/optimizer.ts
+++ b/packages/kbn-cli-dev-mode/src/optimizer.ts
@@ -15,7 +15,7 @@ import {
   pickLevelFromFlags,
   ToolingLogTextWriter,
   parseLogLevel,
-} from '@kbn/dev-utils';
+} from '@kbn/tooling-log';
 import * as Rx from 'rxjs';
 import { ignoreElements } from 'rxjs/operators';
 import {
diff --git a/packages/kbn-cli-dev-mode/src/using_server_process.ts b/packages/kbn-cli-dev-mode/src/using_server_process.ts
index eb997295035d8..690ba250cbcbc 100644
--- a/packages/kbn-cli-dev-mode/src/using_server_process.ts
+++ b/packages/kbn-cli-dev-mode/src/using_server_process.ts
@@ -18,14 +18,19 @@ interface ProcResource extends Rx.Unsubscribable {
   unsubscribe(): void;
 }
 
+interface Options {
+  script: string;
+  argv: string[];
+  forceColor: boolean;
+}
+
 export function usingServerProcess<T>(
-  script: string,
-  argv: string[],
+  options: Options,
   fn: (proc: execa.ExecaChildProcess) => Rx.Observable<T>
 ) {
   return Rx.using(
     (): ProcResource => {
-      const proc = execa.node(script, argv, {
+      const proc = execa.node(options.script, options.argv, {
         stdio: 'pipe',
         nodeOptions: [
           ...process.execArgv,
@@ -36,7 +41,7 @@ export function usingServerProcess<T>(
           NODE_OPTIONS: process.env.NODE_OPTIONS,
           isDevCliChild: 'true',
           ELASTIC_APM_SERVICE_NAME: 'kibana',
-          ...(process.stdout.isTTY ? { FORCE_COLOR: 'true' } : {}),
+          ...(options.forceColor ? { FORCE_COLOR: 'true' } : {}),
         },
       });
 
diff --git a/packages/kbn-coloring/BUILD.bazel b/packages/kbn-coloring/BUILD.bazel
index 656807d8ba2c1..cbbb4d2b7d3e8 100644
--- a/packages/kbn-coloring/BUILD.bazel
+++ b/packages/kbn-coloring/BUILD.bazel
@@ -49,6 +49,8 @@ RUNTIME_DEPS = [
   "@npm//@elastic/eui",
   "@npm//react-use",
   "@npm//react",
+  "@npm//@emotion/react",
+  "@npm//@emotion/css",
 ]
 
 # In this array place dependencies necessary to build the types, which will include the
@@ -71,6 +73,8 @@ TYPES_DEPS = [
   "@npm//@types/react",
   "@npm//@elastic/eui",
   "@npm//react-use",
+  "@npm//@emotion/react",
+  "@npm//@emotion/css",
 ]
 
 jsts_transpiler(
diff --git a/packages/kbn-coloring/src/palettes/utils.ts b/packages/kbn-coloring/src/palettes/utils.ts
index 2ced7eb105a38..d3a51388c7a3d 100644
--- a/packages/kbn-coloring/src/palettes/utils.ts
+++ b/packages/kbn-coloring/src/palettes/utils.ts
@@ -12,7 +12,7 @@ import {
   CustomPaletteParams,
   DataBounds,
   ColorStop,
-} from '../palettes/types';
+} from './types';
 
 import {
   DEFAULT_COLOR_STEPS,
diff --git a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.scss b/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.scss
deleted file mode 100644
index 82165b172eab9..0000000000000
--- a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.lnsPalettePanel__section {
-  padding: $euiSize;
-}
-
-.lnsPalettePanel__section--shaded {
-  background-color: $euiColorLightestShade;
-  border-bottom: $euiBorderThin;
-}
\ No newline at end of file
diff --git a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx b/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx
index beb7e828c1435..5db80ba80446c 100644
--- a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx
+++ b/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx
@@ -8,7 +8,8 @@
 import { i18n } from '@kbn/i18n';
 import React, { useReducer, useMemo } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
-import { EuiFormRow, htmlIdGenerator, EuiButtonGroup, EuiIconTip } from '@elastic/eui';
+import { css } from '@emotion/react';
+import { EuiFormRow, htmlIdGenerator, EuiButtonGroup, EuiIconTip, useEuiTheme } from '@elastic/eui';
 import { PalettePicker } from './palette_picker';
 import {
   PaletteOutput,
@@ -19,8 +20,6 @@ import {
   RequiredPaletteParamTypes,
 } from '../../palettes';
 
-import './palette_configuration.scss';
-
 import { toColorRanges } from './utils';
 import { ColorRanges, ColorRangesContext } from './color_ranges';
 import { isAllColorRangesValid } from './color_ranges/color_ranges_validation';
@@ -72,8 +71,19 @@ export const CustomizablePalette = ({
     [localState]
   );
 
+  const { euiTheme } = useEuiTheme();
+
+  const styles = useMemo(
+    () => css`
+      padding: ${euiTheme.size.base};
+      background-color: ${euiTheme.colors.lightestShade};
+      border-bottom: ${euiTheme.border.thin};
+    `,
+    [euiTheme.size.base, euiTheme.colors.lightestShade, euiTheme.border.thin]
+  );
+
   return (
-    <div className="lnsPalettePanel__section lnsPalettePanel__section--shaded">
+    <div css={styles} className="lnsPalettePanel__section">
       <EuiFormRow
         display="rowCompressed"
         label={i18n.translate('coloring.dynamicColoring.palettePicker.label', {
diff --git a/packages/kbn-config-schema/src/references/reference.test.ts b/packages/kbn-config-schema/src/references/reference.test.ts
index db7f0db7a051f..7781d3b485dd6 100644
--- a/packages/kbn-config-schema/src/references/reference.test.ts
+++ b/packages/kbn-config-schema/src/references/reference.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Reference } from './reference';
-import { schema } from '../';
+import { schema } from '..';
 
 describe('Reference.isReference', () => {
   it('handles primitives', () => {
diff --git a/packages/kbn-config/BUILD.bazel b/packages/kbn-config/BUILD.bazel
index e242cf5c92622..3567c549a77c4 100644
--- a/packages/kbn-config/BUILD.bazel
+++ b/packages/kbn-config/BUILD.bazel
@@ -37,6 +37,7 @@ RUNTIME_DEPS = [
   "//packages/kbn-std",
   "//packages/kbn-utility-types",
   "//packages/kbn-i18n",
+  "//packages/kbn-plugin-discovery",
   "@npm//js-yaml",
   "@npm//load-json-file",
   "@npm//lodash",
@@ -52,6 +53,7 @@ TYPES_DEPS = [
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-utility-types:npm_module_types",
   "//packages/kbn-i18n:npm_module_types",
+  "//packages/kbn-plugin-discovery:npm_module_types",
   "@npm//load-json-file",
   "@npm//rxjs",
   "@npm//@types/jest",
diff --git a/packages/kbn-config/src/env.ts b/packages/kbn-config/src/env.ts
index 73f32606c463f..4c54178447105 100644
--- a/packages/kbn-config/src/env.ts
+++ b/packages/kbn-config/src/env.ts
@@ -8,7 +8,7 @@
 
 import { resolve, join } from 'path';
 import loadJsonFile from 'load-json-file';
-import { getPluginSearchPaths } from './plugins';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { PackageInfo, EnvironmentMode } from './types';
 
 /** @internal */
diff --git a/packages/kbn-config/src/index.ts b/packages/kbn-config/src/index.ts
index 272ee7598570c..e4b60d939c074 100644
--- a/packages/kbn-config/src/index.ts
+++ b/packages/kbn-config/src/index.ts
@@ -30,4 +30,3 @@ export { ObjectToConfigAdapter } from './object_to_config_adapter';
 export type { CliArgs, RawPackageInfo } from './env';
 export { Env } from './env';
 export type { EnvironmentMode, PackageInfo } from './types';
-export { getPluginSearchPaths } from './plugins';
diff --git a/packages/kbn-config/src/object_to_config_adapter.ts b/packages/kbn-config/src/object_to_config_adapter.ts
index a20cd0dc2fa66..6b68f71ea7399 100644
--- a/packages/kbn-config/src/object_to_config_adapter.ts
+++ b/packages/kbn-config/src/object_to_config_adapter.ts
@@ -10,7 +10,7 @@ import { cloneDeep, get, has } from 'lodash';
 import { set } from '@elastic/safer-lodash-set';
 import { getFlattenedObject } from '@kbn/std';
 
-import { Config, ConfigPath } from './';
+import { Config, ConfigPath } from '.';
 
 /**
  * Allows plain javascript object to behave like `RawConfig` instance.
diff --git a/packages/kbn-config/src/plugins/plugin_search_paths.ts b/packages/kbn-config/src/plugins/plugin_search_paths.ts
deleted file mode 100644
index 32eb36f9bc956..0000000000000
--- a/packages/kbn-config/src/plugins/plugin_search_paths.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { resolve } from 'path';
-
-interface SearchOptions {
-  rootDir: string;
-  oss: boolean;
-  examples: boolean;
-}
-
-export function getPluginSearchPaths({ rootDir, oss, examples }: SearchOptions) {
-  return [
-    resolve(rootDir, 'src', 'plugins'),
-    ...(oss ? [] : [resolve(rootDir, 'x-pack', 'plugins')]),
-    resolve(rootDir, 'plugins'),
-    ...(examples ? [resolve(rootDir, 'examples')] : []),
-    ...(examples && !oss ? [resolve(rootDir, 'x-pack', 'examples')] : []),
-    resolve(rootDir, '..', 'kibana-extra'),
-  ];
-}
diff --git a/packages/kbn-datemath/src/index.test.js b/packages/kbn-datemath/src/index.test.js
index a6a576dd713a9..703254204df50 100644
--- a/packages/kbn-datemath/src/index.test.js
+++ b/packages/kbn-datemath/src/index.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const dateMath = require('./index');
+const dateMath = require('.');
 const moment = require('moment');
 
 /**
diff --git a/packages/kbn-dev-utils/BUILD.bazel b/packages/kbn-dev-utils/BUILD.bazel
index 7b60e46d030a3..cf12092007987 100644
--- a/packages/kbn-dev-utils/BUILD.bazel
+++ b/packages/kbn-dev-utils/BUILD.bazel
@@ -37,16 +37,17 @@ NPM_MODULE_EXTRA_FILES = [
   "package.json",
   "README.md",
   ":certs",
-  "ci_stats_reporter/package.json",
-  "sort_package_json/package.json",
-  "stdio/package.json",
-  "tooling_log/package.json"
 ]
 
 RUNTIME_DEPS = [
   "//packages/kbn-std",
   "//packages/kbn-utils",
   "//packages/kbn-plugin-discovery",
+  "//packages/kbn-tooling-log",
+  "//packages/kbn-stdio-dev-helpers",
+  "//packages/kbn-ci-stats-reporter",
+  "//packages/kbn-jest-serializers",
+  "//packages/kbn-kibana-json-schema",
   "@npm//@babel/core",
   "@npm//axios",
   "@npm//chalk",
@@ -73,6 +74,11 @@ TYPES_DEPS = [
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-plugin-discovery:npm_module_types",
+  "//packages/kbn-tooling-log:npm_module_types",
+  "//packages/kbn-stdio-dev-helpers:npm_module_types",
+  "//packages/kbn-ci-stats-reporter:npm_module_types",
+  "//packages/kbn-jest-serializers:npm_module_types",
+  "//packages/kbn-kibana-json-schema:npm_module_types",
   "@npm//@babel/parser",
   "@npm//@babel/types",
   "@npm//@types/babel__core",
diff --git a/packages/kbn-dev-utils/ci_stats_reporter/package.json b/packages/kbn-dev-utils/ci_stats_reporter/package.json
deleted file mode 100644
index e20bd531a77ef..0000000000000
--- a/packages/kbn-dev-utils/ci_stats_reporter/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "main": "../target_node/ci_stats_reporter/ci_stats_reporter",
-  "types": "../target_types/ci_stats_reporter/ci_stats_reporter"
-}
\ No newline at end of file
diff --git a/packages/kbn-dev-utils/sort_package_json/package.json b/packages/kbn-dev-utils/sort_package_json/package.json
deleted file mode 100644
index e075ec436de33..0000000000000
--- a/packages/kbn-dev-utils/sort_package_json/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "main": "../target_node/sort_package_json",
-  "types": "../target_types/sort_package_json"
-}
\ No newline at end of file
diff --git a/packages/kbn-dev-utils/src/index.ts b/packages/kbn-dev-utils/src/index.ts
index cb75cbdf62782..ce8c54e0c7aba 100644
--- a/packages/kbn-dev-utils/src/index.ts
+++ b/packages/kbn-dev-utils/src/index.ts
@@ -7,8 +7,6 @@
  */
 
 export { withProcRunner, ProcRunner } from './proc_runner';
-export * from './tooling_log';
-export * from './serializers';
 export {
   CA_CERT_PATH,
   ES_KEY_PATH,
@@ -24,12 +22,10 @@ export {
 } from './certs';
 export * from './run';
 export * from './axios';
-export * from './stdio';
-export * from './ci_stats_reporter';
+export * from './ship_ci_stats_cli';
 export * from './plugin_list';
 export * from './streams';
 export * from './babel';
 export * from './extract';
 export * from './vscode_config';
-export * from './sort_package_json';
 export * from './diff_strings';
diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.ts b/packages/kbn-dev-utils/src/proc_runner/proc.ts
index 8238e29413309..0402feec99d47 100644
--- a/packages/kbn-dev-utils/src/proc_runner/proc.ts
+++ b/packages/kbn-dev-utils/src/proc_runner/proc.ts
@@ -17,8 +17,8 @@ import treeKill from 'tree-kill';
 import { promisify } from 'util';
 const treeKillAsync = promisify((...args: [number, string, any]) => treeKill(...args));
 
-import { ToolingLog } from '../tooling_log';
-import { observeLines } from '../stdio';
+import { ToolingLog } from '@kbn/tooling-log';
+import { observeLines } from '@kbn/stdio-dev-helpers';
 import { createFailError } from '../run';
 
 const SECOND = 1000;
diff --git a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts b/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts
index cb2ac2604e035..3b7cf008df9a6 100644
--- a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts
+++ b/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts
@@ -10,7 +10,7 @@ import * as Rx from 'rxjs';
 import { filter, first, catchError, map } from 'rxjs/operators';
 import exitHook from 'exit-hook';
 
-import { ToolingLog } from '../tooling_log';
+import { ToolingLog } from '@kbn/tooling-log';
 import { createFailError } from '../run';
 import { Proc, ProcOptions, startProc } from './proc';
 
diff --git a/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.ts b/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.ts
index 87a28e547ca33..4855744cfccca 100644
--- a/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.ts
+++ b/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '../tooling_log';
+import { ToolingLog } from '@kbn/tooling-log';
 import { withProcRunner } from './with_proc_runner';
 import { ProcRunner } from './proc_runner';
 
diff --git a/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.ts b/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.ts
index 1292bf45ad414..5c9bc8103bc62 100644
--- a/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.ts
+++ b/packages/kbn-dev-utils/src/proc_runner/with_proc_runner.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { ToolingLog } from '@kbn/tooling-log';
+
 import { ProcRunner } from './proc_runner';
-import { ToolingLog } from '../tooling_log';
 
 /**
  *  Create a ProcRunner and pass it to an async function. When
diff --git a/packages/kbn-dev-utils/src/run/cleanup.ts b/packages/kbn-dev-utils/src/run/cleanup.ts
index ba0b762a562ad..87da0f1e704df 100644
--- a/packages/kbn-dev-utils/src/run/cleanup.ts
+++ b/packages/kbn-dev-utils/src/run/cleanup.ts
@@ -9,8 +9,8 @@
 import { inspect } from 'util';
 
 import exitHook from 'exit-hook';
+import { ToolingLog } from '@kbn/tooling-log';
 
-import { ToolingLog } from '../tooling_log';
 import { isFailError } from './fail';
 
 /**
diff --git a/packages/kbn-dev-utils/src/run/flags.ts b/packages/kbn-dev-utils/src/run/flags.ts
index 822ac261d4908..20357c8204ae7 100644
--- a/packages/kbn-dev-utils/src/run/flags.ts
+++ b/packages/kbn-dev-utils/src/run/flags.ts
@@ -8,8 +8,8 @@
 
 import getopts from 'getopts';
 
+import { LOG_LEVEL_FLAGS, DEFAULT_LOG_LEVEL } from '@kbn/tooling-log';
 import { RunOptions } from './run';
-import { LOG_LEVEL_FLAGS, DEFAULT_LOG_LEVEL } from '../tooling_log/log_levels';
 
 export interface Flags {
   verbose: boolean;
diff --git a/packages/kbn-dev-utils/src/run/help.ts b/packages/kbn-dev-utils/src/run/help.ts
index 0da4e8146d198..3bf2738b82748 100644
--- a/packages/kbn-dev-utils/src/run/help.ts
+++ b/packages/kbn-dev-utils/src/run/help.ts
@@ -11,9 +11,9 @@ import Path from 'path';
 import chalk from 'chalk';
 import 'core-js/features/string/repeat';
 import dedent from 'dedent';
+import { getLogLevelFlagsHelp } from '@kbn/tooling-log';
 
 import { Command } from './run_with_commands';
-import { getLogLevelFlagsHelp } from '../tooling_log/log_levels';
 
 const DEFAULT_GLOBAL_USAGE = `node ${Path.relative(process.cwd(), process.argv[1])}`;
 export const GLOBAL_FLAGS = dedent`
diff --git a/packages/kbn-dev-utils/src/run/metrics.ts b/packages/kbn-dev-utils/src/run/metrics.ts
index 90a005bfc64dd..36c80c659b016 100644
--- a/packages/kbn-dev-utils/src/run/metrics.ts
+++ b/packages/kbn-dev-utils/src/run/metrics.ts
@@ -9,8 +9,8 @@
 import path from 'path';
 import { REPO_ROOT } from '@kbn/utils';
 import normalizePath from 'normalize-path';
-import { CiStatsReporter } from '../ci_stats_reporter';
-import { ToolingLog } from '../tooling_log';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
+import { ToolingLog } from '@kbn/tooling-log';
 
 export type MetricsMeta = Map<string, string | boolean | number>;
 
diff --git a/packages/kbn-dev-utils/src/run/run.ts b/packages/kbn-dev-utils/src/run/run.ts
index 8afed4339884c..17630826299f2 100644
--- a/packages/kbn-dev-utils/src/run/run.ts
+++ b/packages/kbn-dev-utils/src/run/run.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { pickLevelFromFlags, ToolingLog, LogLevel } from '../tooling_log';
+import { pickLevelFromFlags, ToolingLog, LogLevel } from '@kbn/tooling-log';
 import { createFlagError } from './fail';
 import { Flags, getFlags, FlagOptions } from './flags';
 import { ProcRunner, withProcRunner } from '../proc_runner';
diff --git a/packages/kbn-dev-utils/src/run/run_with_commands.test.ts b/packages/kbn-dev-utils/src/run/run_with_commands.test.ts
index 357908bd2f56d..0005ab8f27c01 100644
--- a/packages/kbn-dev-utils/src/run/run_with_commands.test.ts
+++ b/packages/kbn-dev-utils/src/run/run_with_commands.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { RunWithCommands } from './run_with_commands';
-import { ToolingLog, ToolingLogCollectingWriter } from '../tooling_log';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
 import { ProcRunner } from '../proc_runner';
 
 const testLog = new ToolingLog();
diff --git a/packages/kbn-dev-utils/src/run/run_with_commands.ts b/packages/kbn-dev-utils/src/run/run_with_commands.ts
index 701f3fa965fc8..eb6df27a5fa53 100644
--- a/packages/kbn-dev-utils/src/run/run_with_commands.ts
+++ b/packages/kbn-dev-utils/src/run/run_with_commands.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog, pickLevelFromFlags } from '../tooling_log';
+import { ToolingLog, pickLevelFromFlags } from '@kbn/tooling-log';
 import { RunContext, RunOptions } from './run';
 import { getFlags, FlagOptions, mergeFlagOptions } from './flags';
 import { Cleanup } from './cleanup';
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ship_ci_stats_cli.ts b/packages/kbn-dev-utils/src/ship_ci_stats_cli.ts
similarity index 94%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/ship_ci_stats_cli.ts
rename to packages/kbn-dev-utils/src/ship_ci_stats_cli.ts
index 4d07b54b8cf03..6afd85e49361d 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ship_ci_stats_cli.ts
+++ b/packages/kbn-dev-utils/src/ship_ci_stats_cli.ts
@@ -9,8 +9,9 @@
 import Path from 'path';
 import Fs from 'fs';
 
-import { CiStatsReporter } from './ci_stats_reporter';
-import { run, createFlagError, createFailError } from '../run';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
+
+import { run, createFlagError, createFailError } from './run';
 
 export function shipCiStatsCli() {
   run(
diff --git a/packages/kbn-dev-utils/src/vscode_config/managed_config_keys.ts b/packages/kbn-dev-utils/src/vscode_config/managed_config_keys.ts
index 4fccc9937b1f6..55a44564d29ea 100644
--- a/packages/kbn-dev-utils/src/vscode_config/managed_config_keys.ts
+++ b/packages/kbn-dev-utils/src/vscode_config/managed_config_keys.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { KibanaJsonSchema } from '@kbn/kibana-json-schema';
+
 export interface ManagedConfigKey {
   key: string;
   value: string | Record<string, any> | boolean | number;
@@ -58,4 +60,17 @@ export const MANAGED_CONFIG_KEYS: ManagedConfigKey[] = [
     key: 'typescript.tsserver.maxTsServerMemory',
     value: 4096,
   },
+  {
+    key: 'json.schemas',
+    value: [
+      {
+        fileMatch: ['kibana.json'],
+        url: './.vscode/kibana-json-schema.json',
+      },
+    ],
+  },
+];
+
+export const MANAGED_CONFIG_FILES = [
+  { name: 'kibana-json-schema.json', content: JSON.stringify(KibanaJsonSchema, null, 2) },
 ];
diff --git a/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.test.ts b/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.test.ts
index 3573acd59559f..f9e3aecb89b93 100644
--- a/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.test.ts
+++ b/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.test.ts
@@ -26,6 +26,10 @@ const TEST_KEYS: ManagedConfigKey[] = [
     key: 'stringKey',
     value: 'foo',
   },
+  {
+    key: 'arrayKey',
+    value: ['foo', 'bar'],
+  },
 ];
 
 const run = (json?: string) => updateVscodeConfig(TEST_KEYS, '', json);
@@ -41,7 +45,9 @@ it('updates the passed JSON with the managed settings', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -58,7 +64,9 @@ it('initialized empty or undefined json values', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -73,7 +81,9 @@ it('initialized empty or undefined json values', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -90,7 +100,9 @@ it('replaces conflicting managed keys which do not have matching value types', (
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -136,7 +148,9 @@ it('persists comments in the original file', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -164,7 +178,9 @@ it('overrides old values for managed keys', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -206,7 +222,9 @@ it('does not modify properties with leading `// self managed` comment', () => {
         "world": [5]
       },
       // self managed
-      "stringKey": "--"
+      "stringKey": "--",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -232,7 +250,9 @@ it('does not modify child properties with leading `// self managed` comment', ()
         "hello": true
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -260,7 +280,9 @@ it('does not modify unknown child properties', () => {
         "hello": true
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -288,7 +310,9 @@ it('removes managed properties which are no longer managed', () => {
         "hello": true
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -314,7 +338,9 @@ it('wipes out child keys which conflict with newly managed child keys', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -338,7 +364,9 @@ it('correctly formats info text when specified', () => {
         "world": [1, 2, 3]
       },
       // @managed
-      "stringKey": "foo"
+      "stringKey": "foo",
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
@@ -368,7 +396,9 @@ it('allows "// self managed" comments conflicting with "// @managed" comments to
         "world": [1, 2, 3]
       },
       // self managed
-      "stringKey": 12345
+      "stringKey": 12345,
+      // @managed
+      "arrayKey": ["foo", "bar"]
     }
 
   `);
diff --git a/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.ts b/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.ts
index 5c33b00262cc6..d327ab98ae82c 100644
--- a/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.ts
+++ b/packages/kbn-dev-utils/src/vscode_config/update_vscode_config.ts
@@ -69,9 +69,9 @@ const createObjectPropOfManagedValues = (key: string, value: Record<string, any>
 const addManagedProp = (
   ast: t.ObjectExpression,
   key: string,
-  value: string | Record<string, any> | boolean | number
+  value: string | Record<string, any> | boolean | number | any[]
 ) => {
-  if (['number', 'string', 'boolean'].includes(typeof value)) {
+  if (['number', 'string', 'boolean'].includes(typeof value) || Array.isArray(value)) {
     ast.properties.push(createManagedProp(key, value));
   } else {
     ast.properties.push(createObjectPropOfManagedValues(key, value as Record<string, any>));
@@ -183,6 +183,20 @@ export function updateVscodeConfig(keys: ManagedConfigKey[], infoText: string, j
       continue;
     }
 
+    if (Array.isArray(value)) {
+      if (!existingProp) {
+        addManagedProp(ast, key, value);
+        continue;
+      }
+
+      if (!isSelfManaged(existingProp)) {
+        replaceManagedProp(ast, existingProp, value);
+        continue;
+      }
+
+      continue;
+    }
+
     if (typeof value === 'object') {
       if (existingProp && existingProp.value.type === 'ObjectExpression') {
         // setting exists and is an object so merge properties of `value` with it
diff --git a/packages/kbn-dev-utils/src/vscode_config/update_vscode_config_cli.ts b/packages/kbn-dev-utils/src/vscode_config/update_vscode_config_cli.ts
index 273aed9585572..70ae7c35765f5 100644
--- a/packages/kbn-dev-utils/src/vscode_config/update_vscode_config_cli.ts
+++ b/packages/kbn-dev-utils/src/vscode_config/update_vscode_config_cli.ts
@@ -7,23 +7,25 @@
  */
 
 import Path from 'path';
-import Fs from 'fs/promises';
+import Fsp from 'fs/promises';
 
 import { REPO_ROOT } from '@kbn/utils';
 import dedent from 'dedent';
 
 import { run } from '../run';
 
-import { MANAGED_CONFIG_KEYS } from './managed_config_keys';
+import { MANAGED_CONFIG_KEYS, MANAGED_CONFIG_FILES } from './managed_config_keys';
 import { updateVscodeConfig } from './update_vscode_config';
 
+const CONFIG_DIR = Path.resolve(REPO_ROOT, '.vscode');
+
 export function runUpdateVscodeConfigCli() {
   run(async ({ log }) => {
-    const path = Path.resolve(REPO_ROOT, '.vscode/settings.json');
+    const path = Path.resolve(CONFIG_DIR, 'settings.json');
 
     let json;
     try {
-      json = await Fs.readFile(path, 'utf-8');
+      json = await Fsp.readFile(path, 'utf-8');
     } catch (error) {
       if (error.code !== 'ENOENT') {
         throw error;
@@ -40,8 +42,14 @@ export function runUpdateVscodeConfigCli() {
       `,
       json
     );
-    await Fs.mkdir(Path.dirname(path), { recursive: true });
-    await Fs.writeFile(path, updatedJson);
+    await Fsp.mkdir(Path.dirname(path), { recursive: true });
+
+    // write managed config files
+    for (const { name, content } of MANAGED_CONFIG_FILES) {
+      await Fsp.writeFile(Path.resolve(CONFIG_DIR, name), content);
+    }
+
+    await Fsp.writeFile(path, updatedJson);
 
     log.success('updated', path);
   });
diff --git a/packages/kbn-dev-utils/stdio/package.json b/packages/kbn-dev-utils/stdio/package.json
deleted file mode 100644
index 9aa2d96e19f3f..0000000000000
--- a/packages/kbn-dev-utils/stdio/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "main": "../target_node/stdio",
-  "types": "../target_types/stdio"
-}
\ No newline at end of file
diff --git a/packages/kbn-dev-utils/tooling_log/package.json b/packages/kbn-dev-utils/tooling_log/package.json
deleted file mode 100644
index 711a55b9ba335..0000000000000
--- a/packages/kbn-dev-utils/tooling_log/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "main": "../target_node/tooling_log",
-  "types": "../target_types/tooling_log"
-}
\ No newline at end of file
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
index 80760520da27f..a661707bfa568 100644
--- a/packages/kbn-doc-links/src/get_doc_links.ts
+++ b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -96,6 +96,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       crawlRules: `${APP_SEARCH_DOCS}crawl-web-content.html#crawl-web-content-manage-crawl-rules`,
       curations: `${APP_SEARCH_DOCS}curations-guide.html`,
       duplicateDocuments: `${APP_SEARCH_DOCS}web-crawler-reference.html#web-crawler-reference-content-deduplication`,
+      elasticsearchIndexedEngines: `${APP_SEARCH_DOCS}elasticsearch-engines.html`,
       entryPoints: `${APP_SEARCH_DOCS}crawl-web-content.html#crawl-web-content-manage-entry-points`,
       guide: `${APP_SEARCH_DOCS}index.html`,
       indexingDocuments: `${APP_SEARCH_DOCS}indexing-documents-guide.html`,
@@ -386,6 +387,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       regressionEvaluation: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-regression.html#ml-dfanalytics-regression-evaluation`,
       classificationAucRoc: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfa-classification.html#ml-dfanalytics-class-aucroc`,
       setUpgradeMode: `${ELASTICSEARCH_DOCS}ml-set-upgrade-mode.html`,
+      trainedModels: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-trained-models.html`,
     },
     transforms: {
       guide: `${ELASTICSEARCH_DOCS}transforms.html`,
@@ -601,6 +603,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       learnMoreBlog: `${ELASTIC_WEBSITE_URL}blog/elastic-agent-and-fleet-make-it-easier-to-integrate-your-systems-with-elastic`,
       apiKeysLearnMore: `${KIBANA_DOCS}api-keys.html`,
       onPremRegistry: `${FLEET_DOCS}air-gapped.html`,
+      secureLogstash: `${FLEET_DOCS}secure-logstash-connections.html`,
     },
     ecs: {
       guide: `${ELASTIC_WEBSITE_URL}guide/en/ecs/current/index.html`,
@@ -640,5 +643,8 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
     legal: {
       privacyStatement: `${ELASTIC_WEBSITE_URL}legal/privacy-statement`,
     },
+    kibanaUpgradeSavedObjects: {
+      resolveMigrationFailures: `${KIBANA_DOCS}resolve-migrations-failures.html`,
+    },
   });
 };
diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
index 57a48219b973c..a2d05fbbe699c 100644
--- a/packages/kbn-doc-links/src/types.ts
+++ b/packages/kbn-doc-links/src/types.ts
@@ -82,6 +82,7 @@ export interface DocLinks {
     readonly crawlRules: string;
     readonly curations: string;
     readonly duplicateDocuments: string;
+    readonly elasticsearchIndexedEngines: string;
     readonly entryPoints: string;
     readonly guide: string;
     readonly indexingDocuments: string;
@@ -358,6 +359,7 @@ export interface DocLinks {
     learnMoreBlog: string;
     apiKeysLearnMore: string;
     onPremRegistry: string;
+    secureLogstash: string;
   }>;
   readonly ecs: {
     readonly guide: string;
@@ -396,4 +398,7 @@ export interface DocLinks {
   readonly legal: {
     readonly privacyStatement: string;
   };
+  readonly kibanaUpgradeSavedObjects: {
+    readonly resolveMigrationFailures: string;
+  };
 }
diff --git a/packages/kbn-docs-utils/BUILD.bazel b/packages/kbn-docs-utils/BUILD.bazel
index 30baa9dccb7f7..a9035e5aeed89 100644
--- a/packages/kbn-docs-utils/BUILD.bazel
+++ b/packages/kbn-docs-utils/BUILD.bazel
@@ -28,7 +28,7 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 RUNTIME_DEPS = [
-  "//packages/kbn-config",
+  "//packages/kbn-plugin-discovery",
   "//packages/kbn-dev-utils",
   "//packages/kbn-utils",
   "@npm//dedent",
@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config:npm_module_types",
+  "//packages/kbn-plugin-discovery:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
   "@npm//ts-morph",
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/buid_api_declaration.test.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/buid_api_declaration.test.ts
index 75c0bf4985b84..9b86db445c225 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/buid_api_declaration.test.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/buid_api_declaration.test.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import { Project, Node } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { TypeKind, ApiScope, PluginOrPackage } from '../types';
 import { getKibanaPlatformPlugin } from '../tests/kibana_platform_plugin_mock';
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/build_api_declaration.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/build_api_declaration.ts
index bf8beadea4d91..809097ee73818 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/build_api_declaration.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/build_api_declaration.ts
@@ -7,7 +7,7 @@
  */
 
 import { FunctionTypeNode, Node } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { buildClassDec } from './build_class_dec';
 import { buildFunctionDec } from './build_function_dec';
 import { isNamedNode } from '../tsmorph_utils';
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.test.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.test.ts
index bf3f85114c660..63c02e4d8ea82 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.test.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { REPO_ROOT } from '@kbn/utils';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { getPluginApiDocId } from '../utils';
 import { extractImportReferences } from './extract_import_refs';
 import { ApiScope, PluginOrPackage, Reference } from '../types';
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.ts
index 8420a0cee4cd0..e72367f5fd783 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/extract_import_refs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { getApiSectionId, getPluginApiDocId, getPluginForPath } from '../utils';
 import { ApiScope, PluginOrPackage, TextWithLinks } from '../types';
 import { getRelativePath, pathsOutsideScopes } from './utils';
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_references.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_references.ts
index 108e018f82c85..9bc48a55b3415 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_references.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_references.ts
@@ -7,7 +7,7 @@
  */
 
 import { Node, ReferenceFindableNode } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { getPluginForPath } from '../utils';
 import { getSourceForNode } from './utils';
 import { ApiDeclaration, ApiReference, PluginOrPackage } from '../types';
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_signature.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_signature.ts
index 81daa3bb5df6d..67960dfe6a898 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_signature.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/get_signature.ts
@@ -8,7 +8,7 @@
 
 /* eslint-disable no-bitwise */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Node, TypeFormatFlags } from 'ts-morph';
 import { isNamedNode } from '../tsmorph_utils';
 import { PluginOrPackage, Reference } from '../types';
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/types.ts b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/types.ts
index cf88a51d69ba4..9f44646b7de2d 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_declarations/types.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_declarations/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { ApiScope, PluginOrPackage } from '../types';
 
 export interface BuildApiDecOpts {
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts b/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts
index fcb06da4ea975..0617e35a88615 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts
@@ -9,7 +9,8 @@
 import Fs from 'fs';
 import Path from 'path';
 
-import { run, CiStatsReporter, createFlagError } from '@kbn/dev-utils';
+import { run, createFlagError } from '@kbn/dev-utils';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
 import { REPO_ROOT } from '@kbn/utils';
 import { Project } from 'ts-morph';
 
diff --git a/packages/kbn-docs-utils/src/api_docs/find_plugins.ts b/packages/kbn-docs-utils/src/api_docs/find_plugins.ts
index ebe329029302c..5740d094a6894 100644
--- a/packages/kbn-docs-utils/src/api_docs/find_plugins.ts
+++ b/packages/kbn-docs-utils/src/api_docs/find_plugins.ts
@@ -11,8 +11,7 @@ import globby from 'globby';
 
 import loadJsonFile from 'load-json-file';
 
-import { getPluginSearchPaths } from '@kbn/config';
-import { simpleKibanaPlatformPluginDiscovery } from '@kbn/plugin-discovery';
+import { getPluginSearchPaths, simpleKibanaPlatformPluginDiscovery } from '@kbn/plugin-discovery';
 import { REPO_ROOT } from '@kbn/utils';
 import { ApiScope, PluginOrPackage } from './types';
 
diff --git a/packages/kbn-docs-utils/src/api_docs/get_declaration_nodes_for_plugin.ts b/packages/kbn-docs-utils/src/api_docs/get_declaration_nodes_for_plugin.ts
index 0d587559d3512..10eb466a4b4ae 100644
--- a/packages/kbn-docs-utils/src/api_docs/get_declaration_nodes_for_plugin.ts
+++ b/packages/kbn-docs-utils/src/api_docs/get_declaration_nodes_for_plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import Path from 'path';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Project, SourceFile, Node } from 'ts-morph';
 import { ApiScope, PluginOrPackage } from './types';
 import { isNamedNode, getSourceFileMatching } from './tsmorph_utils';
diff --git a/packages/kbn-docs-utils/src/api_docs/get_plugin_api.ts b/packages/kbn-docs-utils/src/api_docs/get_plugin_api.ts
index e0169f964dd99..b8850059aa366 100644
--- a/packages/kbn-docs-utils/src/api_docs/get_plugin_api.ts
+++ b/packages/kbn-docs-utils/src/api_docs/get_plugin_api.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import { Node, Project } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { ApiScope, Lifecycle, PluginOrPackage } from './types';
 import { ApiDeclaration, PluginApi } from './types';
 import { buildApiDeclarationTopNode } from './build_api_declarations/build_api_declaration';
diff --git a/packages/kbn-docs-utils/src/api_docs/get_plugin_api_map.ts b/packages/kbn-docs-utils/src/api_docs/get_plugin_api_map.ts
index 5709ec2a2f639..08ffafe81a2df 100644
--- a/packages/kbn-docs-utils/src/api_docs/get_plugin_api_map.ts
+++ b/packages/kbn-docs-utils/src/api_docs/get_plugin_api_map.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Project } from 'ts-morph';
 import { getPluginApi } from './get_plugin_api';
 import {
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/build_plugin_deprecations_table.ts b/packages/kbn-docs-utils/src/api_docs/mdx/build_plugin_deprecations_table.ts
index 4e4d5e2bf0ceb..bd2d973bf58ff 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/build_plugin_deprecations_table.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/build_plugin_deprecations_table.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import Path from 'path';
 import { ApiDeclaration, ApiReference, ReferencedDeprecationsByPlugin } from '../types';
 import { getPluginApiDocId } from '../utils';
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/split_apis_by_folder.test.ts b/packages/kbn-docs-utils/src/api_docs/mdx/split_apis_by_folder.test.ts
index 022cce8cbfe2d..b1862f9bc2165 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/split_apis_by_folder.test.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/split_apis_by_folder.test.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import { Project } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { PluginApi, PluginOrPackage } from '../types';
 import { getKibanaPlatformPlugin } from '../tests/kibana_platform_plugin_mock';
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/types.ts b/packages/kbn-docs-utils/src/api_docs/mdx/types.ts
index 8ad7c22486d60..9299e41d06999 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/types.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { ApiStats, PluginApi, PluginOrPackage } from '../types';
 
 export interface WritePluginDocsOpts {
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_api.ts b/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_api.ts
index 031dc8cf35bce..156e09b2fce1b 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_api.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_api.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import dedent from 'dedent';
 import fs from 'fs';
 import Path from 'path';
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_plugin.ts b/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_plugin.ts
index 6be1ca11d3d4f..e79c109311c0b 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_plugin.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_doc_by_plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import dedent from 'dedent';
 import fs from 'fs';
 import Path from 'path';
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_due_by_team.ts b/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_due_by_team.ts
index 8397f84eb9812..712dd9c8e637f 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_due_by_team.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/write_deprecations_due_by_team.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import moment from 'moment';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import dedent from 'dedent';
 import fs from 'fs';
 import Path from 'path';
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_directory_doc.ts b/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_directory_doc.ts
index f7099e6c1a23b..c98621356439c 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_directory_doc.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_directory_doc.ts
@@ -9,7 +9,7 @@ import moment from 'moment';
 import fs from 'fs';
 import Path from 'path';
 import dedent from 'dedent';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { PluginApi, PluginMetaInfo } from '../types';
 import { getPluginApiDocId } from '../utils';
 
diff --git a/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_split_by_folder.test.ts b/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_split_by_folder.test.ts
index 9e96544b0143b..be947bc13b469 100644
--- a/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_split_by_folder.test.ts
+++ b/packages/kbn-docs-utils/src/api_docs/mdx/write_plugin_split_by_folder.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Project } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { splitApisByFolder } from './write_plugin_split_by_folder';
 import { getPluginApi } from '../get_plugin_api';
 import { getKibanaPlatformPlugin } from '../tests/kibana_platform_plugin_mock';
diff --git a/packages/kbn-docs-utils/src/api_docs/tests/api_doc_suite.test.ts b/packages/kbn-docs-utils/src/api_docs/tests/api_doc_suite.test.ts
index cf536ce5158c1..fa7ea46b093bf 100644
--- a/packages/kbn-docs-utils/src/api_docs/tests/api_doc_suite.test.ts
+++ b/packages/kbn-docs-utils/src/api_docs/tests/api_doc_suite.test.ts
@@ -10,7 +10,7 @@ import fs from 'fs';
 import Path from 'path';
 
 import { Project } from 'ts-morph';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { writePluginDocs } from '../mdx/write_plugin_mdx_docs';
 import {
diff --git a/packages/kbn-docs-utils/src/api_docs/utils.test.ts b/packages/kbn-docs-utils/src/api_docs/utils.test.ts
index 0cfa0331fd202..7c98f0dd99b72 100644
--- a/packages/kbn-docs-utils/src/api_docs/utils.test.ts
+++ b/packages/kbn-docs-utils/src/api_docs/utils.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import Path from 'path';
 import { Project } from 'ts-morph';
 import { findPlugins } from './find_plugins';
diff --git a/packages/kbn-docs-utils/src/api_docs/utils.ts b/packages/kbn-docs-utils/src/api_docs/utils.ts
index c4c89cd070034..c479228533f49 100644
--- a/packages/kbn-docs-utils/src/api_docs/utils.ts
+++ b/packages/kbn-docs-utils/src/api_docs/utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import path from 'path';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import {
   ApiDeclaration,
   ScopeApi,
diff --git a/packages/kbn-es-archiver/src/actions/edit.ts b/packages/kbn-es-archiver/src/actions/edit.ts
index 7a97bf08f3675..1d6742a20a3dc 100644
--- a/packages/kbn-es-archiver/src/actions/edit.ts
+++ b/packages/kbn-es-archiver/src/actions/edit.ts
@@ -11,7 +11,7 @@ import Fs from 'fs';
 import { createGunzip, createGzip, constants } from 'zlib';
 import { promisify } from 'util';
 import globby from 'globby';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { createPromiseFromStreams } from '@kbn/utils';
 
 const unlinkAsync = promisify(Fs.unlink);
diff --git a/packages/kbn-es-archiver/src/actions/empty_kibana_index.ts b/packages/kbn-es-archiver/src/actions/empty_kibana_index.ts
index 96b5b5f8e98e5..c9b67e4745d45 100644
--- a/packages/kbn-es-archiver/src/actions/empty_kibana_index.ts
+++ b/packages/kbn-es-archiver/src/actions/empty_kibana_index.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 
 import { migrateKibanaIndex, createStats, cleanKibanaIndices } from '../lib';
diff --git a/packages/kbn-es-archiver/src/actions/load.ts b/packages/kbn-es-archiver/src/actions/load.ts
index 0a318f895deb3..82462a9421520 100644
--- a/packages/kbn-es-archiver/src/actions/load.ts
+++ b/packages/kbn-es-archiver/src/actions/load.ts
@@ -9,7 +9,7 @@
 import { resolve, relative } from 'path';
 import { createReadStream } from 'fs';
 import { Readable } from 'stream';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import { KbnClient } from '@kbn/test';
 import type { Client } from '@elastic/elasticsearch';
diff --git a/packages/kbn-es-archiver/src/actions/rebuild_all.ts b/packages/kbn-es-archiver/src/actions/rebuild_all.ts
index 27fcae0c7cec5..74062125fd795 100644
--- a/packages/kbn-es-archiver/src/actions/rebuild_all.ts
+++ b/packages/kbn-es-archiver/src/actions/rebuild_all.ts
@@ -10,7 +10,7 @@ import { resolve, relative } from 'path';
 import { Stats, createReadStream, createWriteStream } from 'fs';
 import { stat, rename } from 'fs/promises';
 import { Readable, Writable } from 'stream';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { createPromiseFromStreams, REPO_ROOT } from '@kbn/utils';
 import {
   prioritizeMappings,
diff --git a/packages/kbn-es-archiver/src/actions/save.ts b/packages/kbn-es-archiver/src/actions/save.ts
index e5e3f06b8436d..16f0cbc3c1846 100644
--- a/packages/kbn-es-archiver/src/actions/save.ts
+++ b/packages/kbn-es-archiver/src/actions/save.ts
@@ -10,7 +10,7 @@ import { resolve, relative } from 'path';
 import { createWriteStream, mkdirSync } from 'fs';
 import { Readable, Writable } from 'stream';
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { createListStream, createPromiseFromStreams, REPO_ROOT } from '@kbn/utils';
 
 import {
diff --git a/packages/kbn-es-archiver/src/actions/unload.ts b/packages/kbn-es-archiver/src/actions/unload.ts
index 22830b7289174..2d4b16d718689 100644
--- a/packages/kbn-es-archiver/src/actions/unload.ts
+++ b/packages/kbn-es-archiver/src/actions/unload.ts
@@ -10,7 +10,7 @@ import { resolve, relative } from 'path';
 import { createReadStream } from 'fs';
 import { Readable, Writable } from 'stream';
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 import { createPromiseFromStreams, REPO_ROOT } from '@kbn/utils';
 
diff --git a/packages/kbn-es-archiver/src/es_archiver.ts b/packages/kbn-es-archiver/src/es_archiver.ts
index e13e20f25a703..0a9937ca3d9b4 100644
--- a/packages/kbn-es-archiver/src/es_archiver.ts
+++ b/packages/kbn-es-archiver/src/es_archiver.ts
@@ -10,7 +10,7 @@ import Fs from 'fs';
 import Path from 'path';
 
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import { KbnClient } from '@kbn/test';
 
diff --git a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
index edcf5c32f1085..e102ac50c3876 100644
--- a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
+++ b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import {
   createListStream,
diff --git a/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.test.ts b/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.test.ts
index 9c0ff4a8f91ec..5dc9b4b7bd8dd 100644
--- a/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.test.ts
+++ b/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.test.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog, createRecursiveSerializer } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { createRecursiveSerializer } from '@kbn/jest-serializers';
 
 import { createListStream, createPromiseFromStreams } from '@kbn/utils';
 
diff --git a/packages/kbn-es-archiver/src/lib/indices/__mocks__/stubs.ts b/packages/kbn-es-archiver/src/lib/indices/__mocks__/stubs.ts
index ded56ddfdf0de..c60c920100174 100644
--- a/packages/kbn-es-archiver/src/lib/indices/__mocks__/stubs.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/__mocks__/stubs.ts
@@ -8,7 +8,7 @@
 
 import type { Client } from '@elastic/elasticsearch';
 import sinon from 'sinon';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Stats } from '../../stats';
 
 type StubStats = Stats & {
diff --git a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
index 26472d72bef0f..2ab53a2ca012c 100644
--- a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
@@ -11,7 +11,7 @@ import { inspect } from 'util';
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { Stats } from '../stats';
 import { deleteKibanaIndices } from './kibana_index';
diff --git a/packages/kbn-es-archiver/src/lib/indices/delete_index.ts b/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
index 3bba96d32ba95..20067a1f54bcf 100644
--- a/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Stats } from '../stats';
 import { ES_CLIENT_HEADERS } from '../../client_headers';
 
diff --git a/packages/kbn-es-archiver/src/lib/indices/delete_index_stream.ts b/packages/kbn-es-archiver/src/lib/indices/delete_index_stream.ts
index e7763ca251e6f..450d575181529 100644
--- a/packages/kbn-es-archiver/src/lib/indices/delete_index_stream.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/delete_index_stream.ts
@@ -8,7 +8,7 @@
 
 import { Transform } from 'stream';
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { Stats } from '../stats';
 import { deleteIndex } from './delete_index';
diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
index eaae1de46f1e6..6a02113bbf733 100644
--- a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -9,7 +9,7 @@
 import { inspect } from 'util';
 
 import type { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 import { Stats } from '../stats';
 import { deleteIndex } from './delete_index';
diff --git a/packages/kbn-es-archiver/src/lib/progress.ts b/packages/kbn-es-archiver/src/lib/progress.ts
index 5e54aba335b97..59be205eb1283 100644
--- a/packages/kbn-es-archiver/src/lib/progress.ts
+++ b/packages/kbn-es-archiver/src/lib/progress.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 const SECOND = 1000;
 
diff --git a/packages/kbn-es-archiver/src/lib/stats.test.ts b/packages/kbn-es-archiver/src/lib/stats.test.ts
index 49dd75232d83a..5634bda070763 100644
--- a/packages/kbn-es-archiver/src/lib/stats.test.ts
+++ b/packages/kbn-es-archiver/src/lib/stats.test.ts
@@ -8,7 +8,7 @@
 
 import { uniq } from 'lodash';
 import sinon from 'sinon';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { createStats } from './stats';
 
diff --git a/packages/kbn-es-archiver/src/lib/stats.ts b/packages/kbn-es-archiver/src/lib/stats.ts
index 64dd6a9273efe..9ff16d57b8661 100644
--- a/packages/kbn-es-archiver/src/lib/stats.ts
+++ b/packages/kbn-es-archiver/src/lib/stats.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { cloneDeep } from 'lodash';
 
 export interface IndexStats {
diff --git a/packages/kbn-es-query/src/kuery/ast/ast.ts b/packages/kbn-es-query/src/kuery/ast/ast.ts
index ed1b9b90b4cf6..2c9174a1e6db6 100644
--- a/packages/kbn-es-query/src/kuery/ast/ast.ts
+++ b/packages/kbn-es-query/src/kuery/ast/ast.ts
@@ -8,7 +8,7 @@
 
 import { JsonObject } from '@kbn/utility-types';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { nodeTypes } from '../node_types/index';
+import { nodeTypes } from '../node_types';
 import { KQLSyntaxError } from '../kuery_syntax_error';
 import { KueryNode, KueryParseOptions, KueryQueryOptions } from '../types';
 
diff --git a/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts b/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts
index 65de192f4a49e..8e09af5e5dd0a 100644
--- a/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts
@@ -9,7 +9,7 @@
 import { DataViewBase } from '../../..';
 import { fields } from '../../../filters/stubs';
 
-import { nodeTypes } from '../../index';
+import { nodeTypes } from '../..';
 import { getFields } from './get_fields';
 
 jest.mock('../../grammar');
diff --git a/packages/kbn-es-query/src/kuery/node_types/function.test.ts b/packages/kbn-es-query/src/kuery/node_types/function.test.ts
index 754bf170c5062..b50e07c1028f0 100644
--- a/packages/kbn-es-query/src/kuery/node_types/function.test.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/function.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { nodeTypes } from './index';
+import { nodeTypes } from '.';
 
 import { buildNode, buildNodeWithArgumentNodes, toElasticsearchQuery } from './function';
 import { toElasticsearchQuery as isFunctionToElasticsearchQuery } from '../functions/is';
diff --git a/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts b/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
index aefd40c6db3fb..3931c218c9f7e 100644
--- a/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { nodeBuilder } from './node_builder';
-import { toElasticsearchQuery } from '../index';
+import { toElasticsearchQuery } from '..';
 
 jest.mock('../grammar');
 
diff --git a/packages/kbn-es/src/artifact.test.js b/packages/kbn-es/src/artifact.test.js
index 8888c8ca2f989..b16cb3ab54548 100644
--- a/packages/kbn-es/src/artifact.test.js
+++ b/packages/kbn-es/src/artifact.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 jest.mock('node-fetch');
 import fetch from 'node-fetch';
 const { Response } = jest.requireActual('node-fetch');
diff --git a/packages/kbn-es/src/artifact.ts b/packages/kbn-es/src/artifact.ts
index 9ec3b96801dda..04cde128181b3 100644
--- a/packages/kbn-es/src/artifact.ts
+++ b/packages/kbn-es/src/artifact.ts
@@ -16,7 +16,7 @@ import { setTimeout } from 'timers/promises';
 import fetch, { Headers } from 'node-fetch';
 import AbortController from 'abort-controller';
 import chalk from 'chalk';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { cache } from './utils/cache';
 import { resolveCustomSnapshotUrl } from './custom_snapshots';
diff --git a/packages/kbn-es/src/cli_commands/snapshot.js b/packages/kbn-es/src/cli_commands/snapshot.js
index 095ce3cb04299..c0256fafbae7d 100644
--- a/packages/kbn-es/src/cli_commands/snapshot.js
+++ b/packages/kbn-es/src/cli_commands/snapshot.js
@@ -8,7 +8,8 @@
 
 const dedent = require('dedent');
 const getopts = require('getopts');
-import { ToolingLog, getTimeReporter } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getTimeReporter } from '@kbn/ci-stats-reporter';
 const { Cluster } = require('../cluster');
 const { parseTimeoutToMs } = require('../utils');
 
diff --git a/packages/kbn-es/src/install/install_archive.ts b/packages/kbn-es/src/install/install_archive.ts
index ee04d9e4b62b5..9ccf00e09cf85 100644
--- a/packages/kbn-es/src/install/install_archive.ts
+++ b/packages/kbn-es/src/install/install_archive.ts
@@ -12,7 +12,8 @@ import path from 'path';
 import chalk from 'chalk';
 import execa from 'execa';
 import del from 'del';
-import { extract, ToolingLog } from '@kbn/dev-utils';
+import { extract } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { BASE_PATH, ES_CONFIG, ES_KEYSTORE_BIN } from '../paths';
 import { Artifact } from '../artifact';
diff --git a/packages/kbn-es/src/install/install_snapshot.ts b/packages/kbn-es/src/install/install_snapshot.ts
index 84d713745eb82..1ab0facfd2601 100644
--- a/packages/kbn-es/src/install/install_snapshot.ts
+++ b/packages/kbn-es/src/install/install_snapshot.ts
@@ -9,7 +9,7 @@
 import path from 'path';
 
 import chalk from 'chalk';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { BASE_PATH } from '../paths';
 import { installArchive } from './install_archive';
diff --git a/packages/kbn-es/src/install/install_source.ts b/packages/kbn-es/src/install/install_source.ts
index d8c272677058e..a641e6eed513a 100644
--- a/packages/kbn-es/src/install/install_source.ts
+++ b/packages/kbn-es/src/install/install_source.ts
@@ -13,7 +13,7 @@ import crypto from 'crypto';
 
 import chalk from 'chalk';
 import simpleGit from 'simple-git/promise';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { installArchive } from './install_archive';
 import { log as defaultLog } from '../utils/log';
diff --git a/packages/kbn-es/src/integration_tests/cluster.test.js b/packages/kbn-es/src/integration_tests/cluster.test.js
index 271942158dc94..250bc9ac883b3 100644
--- a/packages/kbn-es/src/integration_tests/cluster.test.js
+++ b/packages/kbn-es/src/integration_tests/cluster.test.js
@@ -6,13 +6,9 @@
  * Side Public License, v 1.
  */
 
-const {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  ES_NOPASSWORD_P12_PATH,
-  createAnyInstanceSerializer,
-  createStripAnsiSerializer,
-} = require('@kbn/dev-utils');
+const { ES_NOPASSWORD_P12_PATH } = require('@kbn/dev-utils');
+const { ToolingLog, ToolingLogCollectingWriter } = require('@kbn/tooling-log');
+const { createAnyInstanceSerializer, createStripAnsiSerializer } = require('@kbn/jest-serializers');
 const execa = require('execa');
 const { Cluster } = require('../cluster');
 const { installSource, installSnapshot, installArchive } = require('../install');
diff --git a/packages/kbn-es/src/utils/build_snapshot.ts b/packages/kbn-es/src/utils/build_snapshot.ts
index 542e63dcc0748..2f5181a369f96 100644
--- a/packages/kbn-es/src/utils/build_snapshot.ts
+++ b/packages/kbn-es/src/utils/build_snapshot.ts
@@ -9,7 +9,8 @@
 import path from 'path';
 import os from 'os';
 
-import { ToolingLog, withProcRunner } from '@kbn/dev-utils';
+import { withProcRunner } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { createCliError } from '../errors';
 import { findMostRecentlyChanged } from './find_most_recently_changed';
diff --git a/packages/kbn-es/src/utils/log.ts b/packages/kbn-es/src/utils/log.ts
index a0299f885cf6a..e74ec837649c7 100644
--- a/packages/kbn-es/src/utils/log.ts
+++ b/packages/kbn-es/src/utils/log.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 export const log = new ToolingLog({
   level: 'verbose',
diff --git a/packages/kbn-es/src/utils/native_realm.test.js b/packages/kbn-es/src/utils/native_realm.test.js
index d3eaf6bd97b72..87a7092ca502e 100644
--- a/packages/kbn-es/src/utils/native_realm.test.js
+++ b/packages/kbn-es/src/utils/native_realm.test.js
@@ -7,7 +7,7 @@
  */
 
 const { NativeRealm } = require('./native_realm');
-const { ToolingLog } = require('@kbn/dev-utils');
+const { ToolingLog } = require('@kbn/tooling-log');
 
 const mockClient = {
   xpack: {
diff --git a/packages/kbn-eslint-plugin-eslint/BUILD.bazel b/packages/kbn-eslint-plugin-eslint/BUILD.bazel
index c02a468456f77..f8242afb6cf9e 100644
--- a/packages/kbn-eslint-plugin-eslint/BUILD.bazel
+++ b/packages/kbn-eslint-plugin-eslint/BUILD.bazel
@@ -30,6 +30,7 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 RUNTIME_DEPS = [
+  "//packages/kbn-utils",
   "@npm//@babel/eslint-parser",
   "@npm//dedent",
   "@npm//eslint",
diff --git a/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js b/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js
index 733bfc91ab9e1..97126995f3b52 100644
--- a/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js
+++ b/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js
@@ -28,7 +28,7 @@
  */
 const path = require('path');
 const mm = require('micromatch');
-const { resolveKibanaImport } = require('@kbn/eslint-plugin-imports');
+const { getImportResolver } = require('@kbn/eslint-plugin-imports');
 
 function isStaticRequire(node) {
   return (
@@ -90,6 +90,8 @@ module.exports = {
   },
 
   create(context) {
+    const resolver = getImportResolver(context);
+
     const sourcePath = context.getPhysicalFilename
       ? context.getPhysicalFilename()
       : context.getFilename();
@@ -103,7 +105,7 @@ module.exports = {
     }
 
     function checkForRestrictedImportPath(importPath, node) {
-      const resolveReport = resolveKibanaImport(importPath, sourceDirname);
+      const resolveReport = resolver.resolve(importPath, sourceDirname);
 
       if (resolveReport?.type !== 'file' || resolveReport.nodeModule) {
         return;
diff --git a/packages/kbn-eslint-plugin-imports/BUILD.bazel b/packages/kbn-eslint-plugin-imports/BUILD.bazel
index ecfb51b9a6ecb..efb6a40a1d9f0 100644
--- a/packages/kbn-eslint-plugin-imports/BUILD.bazel
+++ b/packages/kbn-eslint-plugin-imports/BUILD.bazel
@@ -37,6 +37,7 @@ NPM_MODULE_EXTRA_FILES = [
 #    eg. "@npm//lodash"
 RUNTIME_DEPS = [
   "//packages/kbn-utils",
+  "//packages/kbn-import-resolver",
   "@npm//resolve",
   "@npm//@typescript-eslint/typescript-estree",
   "@npm//eslint",
@@ -55,6 +56,8 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types", # only required for the tests, which are excluded except on windows
+  "//packages/kbn-import-resolver:npm_module_types",
+  "@npm//dedent", # only required for the tests, which are excluded except on windows
   "@npm//@types/eslint",
   "@npm//@types/jest",
   "@npm//@types/node",
diff --git a/packages/kbn-eslint-plugin-imports/README.md b/packages/kbn-eslint-plugin-imports/README.md
index dc8abb4dd0772..ba22ed2400643 100644
--- a/packages/kbn-eslint-plugin-imports/README.md
+++ b/packages/kbn-eslint-plugin-imports/README.md
@@ -1,9 +1,56 @@
 # @kbn/eslint-plugin-imports
 
-ESLint plugin providing custom rules for validating imports in the Kibana repo with custom logic beyond what's possible with custom config to eslint-plugin-imports and even a custom resolver
+ESLint plugin providing custom rules for validating imports in the Kibana repo with custom logic beyond what's possible with custom config to eslint-plugin-imports and even a custom resolver.
 
-## `resolveKibanaImport(request: string, dirname: string)`
+For the purposes of this ESLint plugin "imports" include:
 
-Resolve an import request (the "from" string from an import statement, or any other relative/absolute import path) from a given directory. The `dirname` should be the same for all files in a given directory.
+ - `import` statements
+ - `import()` expressions
+ - `export ... from` statements
+ - `require()` calls
+ - `require.resolve()` calls
+ - `jest.mock()` and related calls
 
-Result will be `null` when the import path does not resolve, but all valid/committed import paths *should* resolve. Other result values are documented in src/resolve_result.ts.
\ No newline at end of file
+An "import request" is the string defining the target package/module by any of the previous mentioned "import" types
+
+## `@kbn/imports/no_unresolvable_imports`
+
+This rule validates that every import request in the repository can be resolved by `@kbn/import-resolver`.
+
+This rule is not configurable, should never be skipped, and is auto-fixable.
+
+If a valid import request can't be resolved for some reason please reach out to Kibana Operations to work on either a different strategy for the import or help updating the resolve to support the new import strategy.
+
+## `@kbn/imports/uniform_imports`
+
+This rule validates that every import request in the repsitory follows a standard set of formatting rules. See the rule implemeation for a full breakdown but here is a breif summary:
+
+ - imports within a single package must use relative paths
+ - imports across packages must reference the other package using it's module id
+ - imports to code not in a package must use relative paths
+ - imports to an `index` file end with the directory name, ie `/index` or `/index.{ext}` are stripped
+ - unless this is a `require.resolve()`, the imports should not mention file extensions. `require.resolve()` calls will retain the extension if added manually
+
+This rule is not configurable, should never be skipped, and is auto-fixable.
+
+## `@kbn/imports/exports_moved_packages`
+
+This rule assists package authors who are doing the good work of breaking up large packages. The goal is to define exports which used to be part of one package as having moved to another package. The configuration maintains this mapping and is designed to be extended in the future is additional needs arrise like targetting specific package types.
+
+Config example:
+```ts
+'@kbn/imports/exports_moved_packages': ['error', [
+  {
+    fromPackage: '@kbn/kitchen-sink',
+    toPackage: '@kbn/spatula',
+    exportNames: [
+      'Spatula',
+      'isSpatula'
+    ]
+  }
+]]
+```
+
+This config will find any import of `@kbn/kitchen-sink` which specifically references the `Spatula` or `isSpatula` exports, remove the old exports from the import (potentially removing the entire import), and add a new import after the previous following it's style pointing to the new package.
+
+The auto-fixer here covers the vast majority of import styles in the repository but might not cover everything, including `import * as Namespace from '@kbn/kitchen-sink'`. Imports like this will need to be found and updated manually, though TypeScript should be able to find the vast majority of those.
\ No newline at end of file
diff --git a/packages/kbn-eslint-plugin-imports/jest.config.js b/packages/kbn-eslint-plugin-imports/jest.config.js
new file mode 100644
index 0000000000000..bf0bad97843ef
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-eslint-plugin-imports'],
+};
diff --git a/packages/kbn-eslint-plugin-imports/src/get_import_resolver.ts b/packages/kbn-eslint-plugin-imports/src/get_import_resolver.ts
new file mode 100644
index 0000000000000..331232288aef1
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/get_import_resolver.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ImportResolver } from '@kbn/import-resolver';
+import { REPO_ROOT } from '@kbn/utils';
+import { Rule } from 'eslint';
+import { RUNNING_IN_EDITOR } from './helpers/running_in_editor';
+
+let importResolverCache: ImportResolver | undefined;
+
+/**
+ * Create a request resolver for ESLint, requires a PluginPackageResolver from @kbn/bazel-packages which will
+ * be created and cached on contextServices automatically.
+ *
+ * All import requests in the repository should return a result, if they don't it's a bug
+ * which should be caught by the `@kbn/import/no_unresolved` rule, which should never be disabled. If you need help
+ * adding support for an import style please reach out to operations.
+ */
+export function getImportResolver(context: Rule.RuleContext): ImportResolver {
+  if (RUNNING_IN_EDITOR) {
+    return (context.parserServices.kibanaImportResolver ||= ImportResolver.create(REPO_ROOT));
+  }
+
+  return (importResolverCache ||= ImportResolver.create(REPO_ROOT));
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/report.ts b/packages/kbn-eslint-plugin-imports/src/helpers/report.ts
new file mode 100644
index 0000000000000..bfcd9956018cc
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/helpers/report.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Eslint from 'eslint';
+import { SomeNode } from './visit_all_import_statements';
+
+interface ReportOptions {
+  node: SomeNode;
+  message: string;
+  correctImport?: string;
+}
+
+/**
+ * Simple wrapper around context.report so that the types work better with typescript-estree
+ */
+export function report(context: Eslint.Rule.RuleContext, options: ReportOptions) {
+  context.report({
+    node: options.node as any,
+    message: options.message,
+    fix: options.correctImport
+      ? (fixer) => {
+          return fixer.replaceText(options.node as any, `'${options.correctImport}'`);
+        }
+      : null,
+  });
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/running_in_editor.ts b/packages/kbn-eslint-plugin-imports/src/helpers/running_in_editor.ts
new file mode 100644
index 0000000000000..3067cc9d1005f
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/helpers/running_in_editor.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const RUNNING_IN_EDITOR =
+  // vscode sets this in the env for all workers
+  !!process.env.VSCODE_CWD ||
+  // MacOS sets this for intellij processes, not sure if it works in webstorm but we could expand this check later
+  !!process.env.__CFBundleIdentifier?.startsWith('com.jetbrains.intellij');
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts b/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts
index c65843764ef79..6f549d93ef26e 100644
--- a/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts
+++ b/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts
@@ -6,73 +6,142 @@
  * Side Public License, v 1.
  */
 
+import { Rule } from 'eslint';
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/typescript-estree';
-// @ts-expect-error no types for this module
-import moduleVisitor from 'eslint-module-utils/moduleVisitor';
+import * as T from '@babel/types';
+import { ImportType } from '@kbn/import-resolver';
 
-type Importers =
+const JEST_MODULE_METHODS = [
+  'jest.createMockFromModule',
+  'jest.mock',
+  'jest.unmock',
+  'jest.doMock',
+  'jest.dontMock',
+  'jest.setMock',
+  'jest.requireActual',
+  'jest.requireMock',
+];
+
+export type Importer =
   | TSESTree.ImportDeclaration
+  | T.ImportDeclaration
   | TSESTree.ExportNamedDeclaration
+  | T.ExportNamedDeclaration
   | TSESTree.ExportAllDeclaration
+  | T.ExportAllDeclaration
   | TSESTree.CallExpression
+  | T.CallExpression
   | TSESTree.ImportExpression
-  | TSESTree.CallExpression;
+  | TSESTree.CallExpression
+  | T.CallExpression;
+
+export type SomeNode = TSESTree.Node | T.Node;
+
+interface VisitorContext {
+  node: SomeNode;
+  type: ImportType;
+  importer: Importer;
+}
+type Visitor = (req: string | null, context: VisitorContext) => void;
+
+const isIdent = (node: SomeNode): node is TSESTree.Identifier | T.Identifier =>
+  T.isIdentifier(node) || node.type === AST_NODE_TYPES.Identifier;
+
+const isStringLiteral = (node: SomeNode): node is TSESTree.StringLiteral | T.StringLiteral =>
+  T.isStringLiteral(node) ||
+  (node.type === AST_NODE_TYPES.Literal && typeof node.value === 'string');
+
+const isTemplateLiteral = (node: SomeNode): node is TSESTree.TemplateLiteral | T.TemplateLiteral =>
+  T.isTemplateLiteral(node) || node.type === AST_NODE_TYPES.TemplateLiteral;
 
-type ImportVisitor = (req: string, node: Importers) => void;
+function passSourceAsString(
+  fn: Visitor,
+  node: SomeNode | null | undefined,
+  importer: Importer,
+  type: ImportType
+) {
+  if (!node) {
+    return;
+  }
+
+  const ctx = {
+    node,
+    importer,
+    type,
+  };
+
+  if (isStringLiteral(node)) {
+    return fn(node.value, ctx);
+  }
+
+  if (isTemplateLiteral(node)) {
+    if (node.expressions.length) {
+      return null;
+    }
+
+    return fn(
+      [...node.quasis].reduce((acc, q) => acc + q.value.raw, ''),
+      ctx
+    );
+  }
+
+  return fn(null, ctx);
+}
 
 /**
- * Create an ESLint rule visitor that calls visitor() for every import string, including
- * 'export from' statements, require() calls, jest.mock() calls, and more.
+ * Create an ESLint rule visitor that calls fn() for every import string, including
+ * 'export from' statements, require() calls, require.resolve(), jest.mock() calls, and more.
+ * Works with both babel eslint and typescript-eslint parsers
  */
-export function visitAllImportStatements(visitor: ImportVisitor) {
-  const baseWrapper = moduleVisitor(
-    (reqNode: TSESTree.Literal, importer: Importers) => {
-      const req = reqNode.value;
-      if (typeof req !== 'string') {
-        throw new Error('unable to read value of import request');
-      }
-
-      visitor(req, importer);
+export function visitAllImportStatements(fn: Visitor) {
+  const visitor = {
+    ImportDeclaration(node: TSESTree.ImportDeclaration | T.ImportDeclaration) {
+      passSourceAsString(fn, node.source, node, 'esm');
     },
-    {
-      esmodules: true,
-      commonjs: true,
-    }
-  );
-
-  const baseCallExpressionVisitor = baseWrapper.CallExpression;
-
-  /**
-   * wrapper around the base wrapper which also picks up calls to jest.<any>('../<any>' or '@kbn/<any>', ...) as "import statements"
-   * @param {CallExpression} node
-   */
-  baseWrapper.CallExpression = (node: TSESTree.CallExpression) => {
-    const { callee } = node;
-    // is this call expression a represenation of an obj.method() call?
-    if (callee.type === AST_NODE_TYPES.MemberExpression) {
-      const { object } = callee;
-
-      // is the object being called named "jest"?
-      if (object.type === AST_NODE_TYPES.Identifier && object.name === 'jest') {
-        const [path] = node.arguments;
-
-        // is the first argument to the method a string which starts with '../' or '@kbn/'?
-        if (
-          path &&
-          path.type === AST_NODE_TYPES.Literal &&
-          typeof path.value === 'string' &&
-          (path.value.startsWith('../') || path.value.startsWith('@kbn/'))
-        ) {
-          // call our visitor and assume this node represents a call to a jest mocking function and validate the relative path
-          visitor(path.value, node);
-        }
+    ExportNamedDeclaration(node: TSESTree.ExportNamedDeclaration | T.ExportNamedDeclaration) {
+      passSourceAsString(fn, node.source, node, 'esm');
+    },
+    ExportAllDeclaration(node: TSESTree.ExportAllDeclaration | T.ExportAllDeclaration) {
+      passSourceAsString(fn, node.source, node, 'esm');
+    },
+    ImportExpression(node: TSESTree.ImportExpression) {
+      passSourceAsString(fn, node.source, node, 'esm');
+    },
+    CallExpression(node: TSESTree.CallExpression | T.CallExpression) {
+      const { callee, arguments: args } = node;
+      // babel parser used for .js files treats import() calls as CallExpressions with callees of type "Import"
+      if (T.isImport(callee)) {
+        passSourceAsString(fn, args[0], node, 'esm');
+        return;
+      }
 
+      // is this a `require()` call?
+      if (isIdent(callee) && callee.name === 'require') {
+        passSourceAsString(fn, args[0], node, 'require');
         return;
       }
-    }
 
-    return baseCallExpressionVisitor(node);
+      // is this an `obj.method()` call?
+      if (
+        callee.type === AST_NODE_TYPES.MemberExpression &&
+        isIdent(callee.object) &&
+        isIdent(callee.property)
+      ) {
+        const { object: left, property: right } = callee;
+        const name = `${left.name}.${right.name}`;
+
+        // is it "require.resolve()"?
+        if (name === 'require.resolve') {
+          passSourceAsString(fn, args[0], node, 'require-resolve');
+        }
+
+        // is it one of jest's mock methods?
+        if (left.name === 'jest' && JEST_MODULE_METHODS.includes(name)) {
+          passSourceAsString(fn, args[0], node, 'jest');
+        }
+      }
+    },
   };
 
-  return baseWrapper;
+  return visitor as Rule.RuleListener;
 }
diff --git a/packages/kbn-eslint-plugin-imports/src/index.ts b/packages/kbn-eslint-plugin-imports/src/index.ts
index 756a6f0c19852..24dd819502b58 100644
--- a/packages/kbn-eslint-plugin-imports/src/index.ts
+++ b/packages/kbn-eslint-plugin-imports/src/index.ts
@@ -6,15 +6,17 @@
  * Side Public License, v 1.
  */
 
-export * from './resolve_kibana_import';
-export * from './resolve_result';
-
-import { NoUnresolvedImportsRule } from './rules/no_unresolved_imports';
+export * from './get_import_resolver';
+import { NoUnresolvableImportsRule } from './rules/no_unresolvable_imports';
+import { UniformImportsRule } from './rules/uniform_imports';
+import { ExportsMovedPackagesRule } from './rules/exports_moved_packages';
 
 /**
  * Custom ESLint rules, add `'@kbn/eslint-plugin-imports'` to your eslint config to use them
  * @internal
  */
 export const rules = {
-  no_unresolved_imports: NoUnresolvedImportsRule,
+  no_unresolvable_imports: NoUnresolvableImportsRule,
+  uniform_imports: UniformImportsRule,
+  exports_moved_packages: ExportsMovedPackagesRule,
 };
diff --git a/packages/kbn-eslint-plugin-imports/src/integration_tests/resolve_kibana_import.test.ts b/packages/kbn-eslint-plugin-imports/src/integration_tests/resolve_kibana_import.test.ts
deleted file mode 100644
index 21b1ea7b30409..0000000000000
--- a/packages/kbn-eslint-plugin-imports/src/integration_tests/resolve_kibana_import.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import Path from 'path';
-
-import { REPO_ROOT } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
-import { resolveKibanaImport } from '../resolve_kibana_import';
-
-expect.addSnapshotSerializer(createAbsolutePathSerializer());
-
-const plugin = (subPath: string) => Path.resolve(REPO_ROOT, 'src/plugins', subPath);
-const xPlugin = (subPath: string) => Path.resolve(REPO_ROOT, 'x-pack/plugins', subPath);
-const pkg = (subPath: string) => Path.resolve(REPO_ROOT, 'packages', subPath);
-
-describe('standard import formats', () => {
-  it('resolves requests to src/', () => {
-    expect(resolveKibanaImport('src/core/public', plugin('discovery/public/components/foo')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/public/index.ts,
-        "type": "file",
-      }
-    `);
-    expect(resolveKibanaImport('src/core/server', xPlugin('spaces/server/routes')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/server/index.ts,
-        "type": "file",
-      }
-    `);
-    expect(resolveKibanaImport('src/core/utils', pkg('kbn-dev-utils/lib'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/utils/index.ts,
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves relative paths too', () => {
-    expect(resolveKibanaImport('../../../../core/public', plugin('foo/bar/baz')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/public/index.ts,
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves @kbn/ imports', () => {
-    expect(resolveKibanaImport('@kbn/std', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/@kbn/std/target_node/index.js,
-        "nodeModule": "@kbn/std",
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves @elastic/ imports', () => {
-    expect(resolveKibanaImport('@elastic/eui', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/@elastic/eui/lib/index.js,
-        "nodeModule": "@elastic/eui",
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves normal node module imports', () => {
-    expect(resolveKibanaImport('lodash', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/lodash/lodash.js,
-        "nodeModule": "lodash",
-        "type": "file",
-      }
-    `);
-
-    expect(resolveKibanaImport('globby', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/globby/index.js,
-        "nodeModule": "globby",
-        "type": "file",
-      }
-    `);
-  });
-
-  it('returns null when the import cannot be resolved', () => {
-    expect(resolveKibanaImport('../../../../invalid', plugin('foo/bar'))).toMatchInlineSnapshot(
-      `null`
-    );
-    expect(resolveKibanaImport('src/invalid', plugin('foo/bar'))).toMatchInlineSnapshot(`null`);
-    expect(resolveKibanaImport('kibana/invalid', plugin('foo/bar'))).toMatchInlineSnapshot(`null`);
-    expect(resolveKibanaImport('@kbn/invalid', plugin('foo/bar'))).toMatchInlineSnapshot(`null`);
-  });
-
-  it('returns ignore results for known unresolvable but okay import statements', () => {
-    expect(resolveKibanaImport('../../grammar/built_grammar.js', plugin('foo/bar')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('kibana-buildkite-library', pkg('kbn-foo/src')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('core_styles', pkg('kbn-foo/src'))).toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('core_app_image_assets', pkg('kbn-foo/src'))).toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('ace/lib/dom', pkg('kbn-foo/src'))).toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('@elastic/eui/src/components/', pkg('kbn-foo/src')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('@elastic/eui/src/services/', pkg('kbn-foo/src')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-  });
-});
diff --git a/packages/kbn-eslint-plugin-imports/src/resolve_kibana_import.ts b/packages/kbn-eslint-plugin-imports/src/resolve_kibana_import.ts
deleted file mode 100644
index 00ab3e0cdcf82..0000000000000
--- a/packages/kbn-eslint-plugin-imports/src/resolve_kibana_import.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import Fs from 'fs';
-import Path from 'path';
-
-import Resolve from 'resolve';
-import { REPO_ROOT } from '@kbn/utils';
-
-import { isDirectory, isFile } from './helpers/fs';
-import { ResolveResult } from './resolve_result';
-
-const NODE_MODULE_SEG = Path.sep + 'node_modules' + Path.sep;
-
-function packageFilter(pkg: Record<string, unknown>) {
-  if (!pkg.main && pkg.types) {
-    // for the purpose of resolving files, a "types" file is adequate
-    return {
-      ...pkg,
-      main: pkg.types,
-    };
-  }
-
-  return pkg;
-}
-
-function adaptReq(req: string, dirname: string): string | undefined {
-  // transform webpack loader requests and focus on the actual file selected
-  if (req.startsWith('!!')) {
-    return req.split('!').pop()?.split('?').shift();
-  }
-
-  // handle typescript aliases
-  if (req === 'kibana/public') {
-    return adaptReq('src/core/public', dirname);
-  }
-
-  if (req === 'kibana/server') {
-    return adaptReq('src/core/server', dirname);
-  }
-
-  // turn root-relative paths into relative paths
-  if (
-    req.startsWith('src/') ||
-    req.startsWith('x-pack/') ||
-    req.startsWith('examples/') ||
-    req.startsWith('test/')
-  ) {
-    const absolute = Path.resolve(REPO_ROOT, req);
-    return `./${Path.relative(dirname, absolute)}`;
-  }
-}
-
-function shouldResolve(req: string) {
-  // this library is only installed on CI and never resolvable
-  if (req === 'kibana-buildkite-library') {
-    return;
-  }
-
-  // these are special webpack-aliases only used in storybooks, ignore them
-  if (req === 'core_styles' || req === 'core_app_image_assets') {
-    return;
-  }
-
-  // ignore amd require done by ace syntax plugin
-  if (req === 'ace/lib/dom') {
-    return;
-  }
-
-  // ignore requests to grammar/built_grammar.js files or built kbn-monaco workers, these are built by bazel and never resolvable
-  if (
-    req.endsWith('grammar/built_grammar.js') ||
-    (req.includes('/target_workers/') && req.endsWith('.editor.worker.js'))
-  ) {
-    return;
-  }
-
-  // typescript validates these imports fine and they're purely virtual thanks to ambient type definitions in @elastic/eui so /shrug
-  if (
-    req.startsWith('@elastic/eui/src/components/') ||
-    req.startsWith('@elastic/eui/src/services/')
-  ) {
-    return;
-  }
-
-  return true;
-}
-
-function tryNodeResolve(req: string, dirname: string): ResolveResult | null {
-  try {
-    const path = Resolve.sync(req, {
-      basedir: dirname,
-      extensions: ['.js', '.json', '.ts', '.tsx', '.d.ts'],
-      isDirectory,
-      isFile,
-      packageFilter,
-    });
-
-    if (path.includes(NODE_MODULE_SEG)) {
-      const modulePath = path.split(NODE_MODULE_SEG).pop()!.split(Path.sep);
-      const moduleId = modulePath[0].startsWith('@')
-        ? `${modulePath[0]}/${modulePath[1]}`
-        : modulePath[0];
-      return {
-        type: 'file',
-        absolute: path,
-        nodeModule: moduleId,
-      };
-    }
-
-    return {
-      type: 'file',
-      absolute: path.includes('node_modules') ? Fs.readlinkSync(path) : path,
-    };
-  } catch (error) {
-    if (error && error.code === 'MODULE_NOT_FOUND') {
-      return null;
-    }
-
-    throw error;
-  }
-}
-
-function tryTypesResolve(req: string, dirname: string): ResolveResult | null {
-  const parts = req.split('/');
-  const nmParts = parts[0].startsWith('@') ? [parts[0].slice(1), parts[1]] : [parts[0]];
-  const typesReq = `@types/${nmParts.join('__')}`;
-  const result = tryNodeResolve(typesReq, dirname);
-
-  if (result) {
-    return {
-      type: '@types',
-      module: typesReq,
-    };
-  }
-
-  return null;
-}
-
-/**
- * Resolve an import request. All import requests in the repository should return a result, if they don't it's a bug
- * which should be caught by the `@kbn/import/no_unresolved` rule, which should never be disabled. If you need help
- * adding support for an import style please reach out to operations.
- *
- * @param req Text from an import/require, like `../../src/core/public` or `@kbn/std`
- * @param dirname The directory of the file where the req was found
- */
-export function resolveKibanaImport(req: string, dirname: string): ResolveResult | null {
-  req = adaptReq(req, dirname) ?? req;
-
-  if (!shouldResolve(req)) {
-    return { type: 'ignore' };
-  }
-
-  return tryNodeResolve(req, dirname) ?? tryTypesResolve(req, dirname);
-}
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.test.ts b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.test.ts
new file mode 100644
index 0000000000000..720d738e2ca90
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.test.ts
@@ -0,0 +1,279 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { RuleTester } from 'eslint';
+import { ExportsMovedPackagesRule, MovedExportsRule } from './exports_moved_packages';
+import dedent from 'dedent';
+
+const fmt = (str: TemplateStringsArray) => dedent(str) + '\n';
+
+const OPTIONS: MovedExportsRule[][] = [
+  [
+    {
+      exportNames: ['foo', 'bar'],
+      fromPackage: 'old',
+      toPackage: 'new',
+    },
+  ],
+];
+
+const tsTester = [
+  '@typescript-eslint/parser',
+  new RuleTester({
+    parser: require.resolve('@typescript-eslint/parser'),
+    parserOptions: {
+      sourceType: 'module',
+      ecmaVersion: 2018,
+      ecmaFeatures: {
+        jsx: true,
+      },
+    },
+  }),
+] as const;
+
+const babelTester = [
+  '@babel/eslint-parser',
+  new RuleTester({
+    parser: require.resolve('@babel/eslint-parser'),
+    parserOptions: {
+      sourceType: 'module',
+      ecmaVersion: 2018,
+      requireConfigFile: false,
+      babelOptions: {
+        presets: ['@kbn/babel-preset/node_preset'],
+      },
+    },
+  }),
+] as const;
+
+for (const [name, tester] of [tsTester, babelTester]) {
+  describe(name, () => {
+    tester.run('@kbn/imports/exports_moved_packages', ExportsMovedPackagesRule, {
+      valid: [
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import { foo, bar as Bar } from 'new'
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const { foo, bar: Bar } = require('new')
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export async function x () {
+              const { foo, bar: Bar } = await import('new')
+              return { foo, Bar }
+            }
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const Old = require('old')
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import Old from 'old'
+          `,
+        },
+        {
+          // we aren't going to try to figure out which imports you use from an async import in
+          // a Promise.all
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const [{ foo }] = Promise.all([
+              import('old')
+            ])
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export * from 'old'
+          `,
+        },
+      ],
+
+      invalid: [
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import { foo, bar as Bar } from 'old'
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            import { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import type { foo, bar as Bar } from 'old'
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            import type { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export { foo, box } from 'old';
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Export "foo" is now in package "new"',
+            },
+          ],
+          output: fmt`
+            export {  box } from 'old';
+            export { foo } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export { foo, bar as Bar } from 'old';
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            export { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export type { foo, bar as Bar } from 'old'
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            export type { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export type { foo, box } from 'old';
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Export "foo" is now in package "new"',
+            },
+          ],
+          output: fmt`
+            export type {  box } from 'old';
+            export type { foo } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const { foo, bar: Bar } = require('old')
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            const { foo, bar: Bar } = require('new');
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export async function x () {
+              const { foo, bar: Bar } = await import('old')
+              return { foo, Bar }
+            }
+          `,
+          errors: [
+            {
+              line: 2,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            export async function x () {
+              const { foo, bar: Bar } = await import('new');
+              return { foo, Bar }
+            }
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export async function x () {
+              const { foo, box } = await import('old')
+              return { foo, box }
+            }
+          `,
+          errors: [
+            {
+              line: 2,
+              message: 'Export "foo" is now in package "new"',
+            },
+          ],
+          output: fmt`
+            export async function x () {
+              const {  box } = await import('old')
+            const { foo } = await import('new');
+              return { foo, box }
+            }
+          `,
+        },
+      ],
+    });
+  });
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.ts b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.ts
new file mode 100644
index 0000000000000..2962ab4a5cb12
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.ts
@@ -0,0 +1,375 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Rule, AST } from 'eslint';
+import * as T from '@babel/types';
+import { TSESTree } from '@typescript-eslint/typescript-estree';
+
+import { visitAllImportStatements, Importer } from '../helpers/visit_all_import_statements';
+
+export interface MovedExportsRule {
+  fromPackage: string;
+  toPackage: string;
+  exportNames: string[];
+}
+
+interface Imported {
+  type: 'require' | 'import expression' | 'export' | 'export type' | 'import' | 'import type';
+  node:
+    | TSESTree.ImportSpecifier
+    | T.ImportSpecifier
+    | TSESTree.Property
+    | T.Property
+    | TSESTree.ExportSpecifier
+    | T.ExportSpecifier;
+  name: string;
+  id?: string;
+}
+
+interface BadImport extends Imported {
+  id: string;
+  newPkg: string;
+}
+
+function getParent(node: T.Node | TSESTree.Node): T.Node | TSESTree.Node | undefined {
+  if ('parent' in node) {
+    return node.parent as any;
+  }
+}
+
+function findDeclaration(node: T.Node | TSESTree.Node) {
+  let cursor: T.Node | TSESTree.Node | undefined = node;
+  while (
+    cursor &&
+    !T.isVariableDeclaration(cursor) &&
+    cursor.type !== TSESTree.AST_NODE_TYPES.VariableDeclaration
+  ) {
+    cursor = getParent(cursor);
+  }
+  return cursor;
+}
+
+function getBadImports(imported: Imported[], rules: MovedExportsRule[]): BadImport[] {
+  return imported.flatMap((i): BadImport | never[] => {
+    if (!i.id) {
+      return [];
+    }
+
+    const name = i.name;
+    const match = rules.find((r) => r.exportNames.includes(name));
+    if (!match) {
+      return [];
+    }
+
+    return {
+      type: i.type,
+      node: i.node,
+      id: i.id,
+      name: i.name,
+      newPkg: match.toPackage,
+    };
+  });
+}
+
+function inspectImports(
+  importer: Importer,
+  rules: MovedExportsRule[]
+): undefined | { importCount: number; allBadImports: BadImport[] } {
+  // get import names from require() and await import() calls
+  if (
+    T.isCallExpression(importer) ||
+    importer.type === TSESTree.AST_NODE_TYPES.CallExpression ||
+    importer.type === TSESTree.AST_NODE_TYPES.ImportExpression
+  ) {
+    const declaration = findDeclaration(importer);
+    if (!declaration || !declaration.declarations[0]) {
+      return;
+    }
+    const declarator = declaration.declarations[0];
+    if (
+      !T.isObjectPattern(declarator.id) &&
+      declarator.id.type !== TSESTree.AST_NODE_TYPES.ObjectPattern
+    ) {
+      return;
+    }
+
+    const properties = declarator.id.properties;
+    return {
+      importCount: properties.length,
+      allBadImports: getBadImports(
+        properties.flatMap((prop): Imported | never[] => {
+          if (
+            prop.type !== TSESTree.AST_NODE_TYPES.Property ||
+            prop.kind !== 'init' ||
+            prop.key.type !== TSESTree.AST_NODE_TYPES.Identifier
+          ) {
+            return [];
+          }
+
+          const name = prop.key.name;
+          const local =
+            prop.value.type === TSESTree.AST_NODE_TYPES.Identifier ? prop.value.name : undefined;
+
+          return {
+            node: prop,
+            name,
+            type:
+              importer.type === TSESTree.AST_NODE_TYPES.ImportExpression ||
+              T.isImport(importer.callee)
+                ? 'import expression'
+                : 'require',
+            id: !local ? undefined : name === local ? name : `${name}: ${local}`,
+          };
+        }),
+        rules
+      ),
+    };
+  }
+
+  // get import names from import {} and export {} from
+  if (
+    T.isImportDeclaration(importer) ||
+    importer.type === TSESTree.AST_NODE_TYPES.ImportDeclaration ||
+    T.isExportNamedDeclaration(importer) ||
+    importer.type === TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
+  ) {
+    const type =
+      T.isExportNamedDeclaration(importer) ||
+      importer.type === TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
+        ? importer.exportKind === 'type'
+          ? 'export type'
+          : 'export'
+        : (T.isImportDeclaration(importer) ||
+            importer.type === TSESTree.AST_NODE_TYPES.ImportDeclaration) &&
+          importer.importKind === 'type'
+        ? 'import type'
+        : 'import';
+
+    return {
+      importCount: importer.specifiers.length,
+      allBadImports: getBadImports(
+        importer.specifiers.flatMap((specifier): Imported | never[] => {
+          if (
+            T.isImportSpecifier(specifier) ||
+            specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier
+          ) {
+            const name = T.isStringLiteral(specifier.imported)
+              ? specifier.imported.value
+              : specifier.imported.name;
+            const local = specifier.local.name;
+            return {
+              node: specifier,
+              name,
+              type,
+              id: name === local ? name : `${name} as ${local}`,
+            };
+          }
+
+          if (
+            T.isExportSpecifier(specifier) ||
+            specifier.type === TSESTree.AST_NODE_TYPES.ExportSpecifier
+          ) {
+            const name = T.isStringLiteral(specifier.exported)
+              ? specifier.exported.value
+              : specifier.exported.name;
+            const local = specifier.local.name;
+            return {
+              node: specifier,
+              name: local,
+              type,
+              id: name === local ? name : `${local} as ${name}`,
+            };
+          }
+
+          return [];
+        }),
+        rules
+      ),
+    };
+  }
+}
+
+export const ExportsMovedPackagesRule: Rule.RuleModule = {
+  meta: {
+    fixable: 'code',
+    schema: [
+      {
+        type: 'array',
+        items: {
+          type: 'object',
+          properties: {
+            fromPackage: {
+              type: 'string',
+            },
+            toPackage: {
+              type: 'string',
+            },
+            exportNames: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    ],
+    docs: {
+      url: 'https://github.com/elastic/kibana/blob/main/packages/kbn-eslint-plugin-imports/README.md#kbnimportsexports_moved_packages',
+    },
+  },
+
+  create(context) {
+    const rules: MovedExportsRule[] = context.options[0];
+    const source = context.getSourceCode();
+
+    // get the range for the entire "import", expanding require()/import() to their
+    // entire variable declaration and including the trailing newline if we can
+    // idenitify it
+    function getRangeWithNewline(
+      importer: Importer | T.VariableDeclaration | TSESTree.VariableDeclaration
+    ): AST.Range {
+      if (
+        T.isCallExpression(importer) ||
+        importer.type === TSESTree.AST_NODE_TYPES.CallExpression ||
+        importer.type === TSESTree.AST_NODE_TYPES.ImportExpression
+      ) {
+        const declaration = findDeclaration(importer);
+        if (declaration) {
+          return getRangeWithNewline(declaration);
+        }
+      }
+
+      const text = source.getText(importer as any, 0, 1);
+      const range = getRange(importer);
+      return text.endsWith('\n') ? [range[0], range[1] + 1] : range;
+    }
+
+    function getRange(
+      nodeA: T.Node | TSESTree.Node | AST.Token,
+      nodeB: T.Node | TSESTree.Node | AST.Token = nodeA
+    ): AST.Range {
+      if (!nodeA.loc) {
+        throw new Error('unable to use babel AST nodes without locations');
+      }
+      if (!nodeB.loc) {
+        throw new Error('unable to use babel AST nodes without locations');
+      }
+      return [source.getIndexFromLoc(nodeA.loc.start), source.getIndexFromLoc(nodeB.loc.end)];
+    }
+
+    return visitAllImportStatements((req, { importer }) => {
+      if (!req) {
+        return;
+      }
+
+      const rulesForRightPackage = rules.filter((m) => m.fromPackage === req);
+      if (!rulesForRightPackage.length) {
+        return;
+      }
+
+      const { allBadImports, importCount } = inspectImports(importer, rulesForRightPackage) ?? {};
+      if (!allBadImports?.length) {
+        return;
+      }
+
+      const badImportsByNewPkg = new Map<string, typeof allBadImports>();
+      const groupedBadImports = new Map<BadImport['type'], Map<string, typeof allBadImports>>();
+      for (const badProp of allBadImports) {
+        if (!groupedBadImports.has(badProp.type)) {
+          groupedBadImports.set(badProp.type, new Map());
+        }
+        const typeGroup = groupedBadImports.get(badProp.type)!;
+        if (!typeGroup.has(badProp.newPkg)) {
+          typeGroup.set(badProp.newPkg, []);
+        }
+
+        typeGroup.get(badProp.newPkg)!.push(badProp);
+
+        const existing = badImportsByNewPkg.get(badProp.newPkg);
+        if (existing) {
+          existing.push(badProp);
+        } else {
+          badImportsByNewPkg.set(badProp.newPkg, [badProp]);
+        }
+      }
+
+      context.report({
+        node: importer as any,
+        message: Array.from(badImportsByNewPkg)
+          .map(
+            ([pkg, bad]) =>
+              `Export${bad.length === 1 ? '' : 's'} ${bad.map((b) => `"${b.name}"`).join(', ')} ${
+                bad.length === 1 ? 'is' : 'are'
+              } now in package "${pkg}"`
+          )
+          .join('\n'),
+        *fix(fixer) {
+          const importerRange = getRangeWithNewline(importer);
+
+          // insert new require() calls
+          for (const [type, badProps] of groupedBadImports) {
+            for (const [pkg, props] of badProps) {
+              switch (type) {
+                case 'require':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `const { ${props.map((b) => b.id).join(', ')} } = require('${pkg}');\n`
+                  );
+                  break;
+                case 'import expression':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `const { ${props.map((b) => b.id).join(', ')} } = await import('${pkg}');\n`
+                  );
+                  break;
+                case 'export':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `export { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+                case 'export type':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `export type { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+                case 'import':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `import { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+                case 'import type':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `import type { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+              }
+            }
+          }
+
+          if (importCount === allBadImports.length) {
+            yield fixer.removeRange(importerRange);
+          } else {
+            for (const bp of allBadImports) {
+              const nextToken = source.getTokenAfter(bp.node as any);
+              if (nextToken?.value === ',') {
+                yield fixer.removeRange(getRange(bp.node, nextToken));
+              } else {
+                yield fixer.removeRange(getRange(bp.node));
+              }
+            }
+          }
+        },
+      });
+    });
+  },
+};
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/no_unresolved_imports.ts b/packages/kbn-eslint-plugin-imports/src/rules/no_unresolvable_imports.ts
similarity index 60%
rename from packages/kbn-eslint-plugin-imports/src/rules/no_unresolved_imports.ts
rename to packages/kbn-eslint-plugin-imports/src/rules/no_unresolvable_imports.ts
index 1e0b8173ab583..e5b324ea0a3e8 100644
--- a/packages/kbn-eslint-plugin-imports/src/rules/no_unresolved_imports.ts
+++ b/packages/kbn-eslint-plugin-imports/src/rules/no_unresolvable_imports.ts
@@ -9,11 +9,19 @@
 import Path from 'path';
 import { Rule } from 'eslint';
 
-import { resolveKibanaImport } from '../resolve_kibana_import';
+import { report } from '../helpers/report';
+import { getImportResolver } from '../get_import_resolver';
 import { visitAllImportStatements } from '../helpers/visit_all_import_statements';
 
-export const NoUnresolvedImportsRule: Rule.RuleModule = {
+export const NoUnresolvableImportsRule: Rule.RuleModule = {
+  meta: {
+    docs: {
+      url: 'https://github.com/elastic/kibana/blob/main/packages/kbn-eslint-plugin-imports/README.md#kbnimportsno_unresolvable_imports',
+    },
+  },
   create(context) {
+    const resolver = getImportResolver(context);
+
     const sourceFilename = context.getPhysicalFilename
       ? context.getPhysicalFilename()
       : context.getFilename();
@@ -22,10 +30,10 @@ export const NoUnresolvedImportsRule: Rule.RuleModule = {
       throw new Error('unable to determine sourceFilename for file being linted');
     }
 
-    return visitAllImportStatements((req, importer) => {
-      if (!resolveKibanaImport(req, Path.dirname(sourceFilename))) {
-        context.report({
-          node: importer as any,
+    return visitAllImportStatements((req, { node }) => {
+      if (req !== null && !resolver.resolve(req, Path.dirname(sourceFilename))) {
+        report(context, {
+          node,
           message: `Unable to resolve import [${req}]`,
         });
       }
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/uniform_imports.ts b/packages/kbn-eslint-plugin-imports/src/rules/uniform_imports.ts
new file mode 100644
index 0000000000000..75487e62cd613
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/rules/uniform_imports.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import Eslint from 'eslint';
+import { REPO_ROOT } from '@kbn/utils';
+import { getRelativeImportReq, getPackageRelativeImportReq } from '@kbn/import-resolver';
+
+import { report } from '../helpers/report';
+import { visitAllImportStatements } from '../helpers/visit_all_import_statements';
+import { getImportResolver } from '../get_import_resolver';
+
+// TODO: get rid of all the special cases in here by moving more things to packages
+
+const SETUP_NODE_ENV_DIR = Path.resolve(REPO_ROOT, 'src/setup_node_env');
+const PKGJSON_PATH = Path.resolve(REPO_ROOT, 'package.json');
+const XPACK_PKGJSON_PATH = Path.resolve(REPO_ROOT, 'x-pack/package.json');
+const KBN_PM_SCRIPT = Path.resolve(REPO_ROOT, 'packages/kbn-pm/dist/index.js');
+
+export const UniformImportsRule: Eslint.Rule.RuleModule = {
+  meta: {
+    fixable: 'code',
+    docs: {
+      url: 'https://github.com/elastic/kibana/blob/main/packages/kbn-eslint-plugin-imports/README.md#kbnimportsuniform_imports',
+    },
+  },
+
+  create(context) {
+    const resolver = getImportResolver(context);
+    const sourceFilename = context.getPhysicalFilename
+      ? context.getPhysicalFilename()
+      : context.getFilename();
+
+    const sourceDirname = Path.dirname(sourceFilename);
+
+    const ownPackageId = resolver.getPackageIdForPath(sourceFilename);
+
+    return visitAllImportStatements((req, { node, type }) => {
+      if (!req) {
+        return;
+      }
+
+      const result = resolver.resolve(req, sourceDirname);
+      if (result?.type !== 'file' || result.nodeModule) {
+        return;
+      }
+
+      const { absolute } = result;
+      // don't mess with imports to the kbn/pm script for now
+      if (absolute === KBN_PM_SCRIPT) {
+        return;
+      }
+
+      const packageId = resolver.getPackageIdForPath(absolute);
+      if (ownPackageId && !packageId) {
+        // special cases, files that aren't in packages but packages are allowed to import them
+        if (
+          absolute === PKGJSON_PATH ||
+          absolute === XPACK_PKGJSON_PATH ||
+          absolute.startsWith(SETUP_NODE_ENV_DIR)
+        ) {
+          return;
+        }
+
+        if (resolver.isBazelPackage(ownPackageId)) {
+          report(context, {
+            node,
+            message: `Package [${ownPackageId}] can only import other packages`,
+          });
+          return;
+        }
+      }
+
+      if (packageId === ownPackageId || !packageId) {
+        const correct = getRelativeImportReq({
+          ...result,
+          original: req,
+          dirname: sourceDirname,
+          type,
+        });
+
+        if (req !== correct) {
+          report(context, {
+            node,
+            message: `Use import request [${correct}]`,
+            correctImport: correct,
+          });
+        }
+        return;
+      }
+
+      const packageDir = resolver.getAbsolutePackageDir(packageId);
+      if (!packageDir) {
+        report(context, {
+          node,
+          message: `Unable to determine location of package [${packageId}]`,
+        });
+        return;
+      }
+
+      const correct = getPackageRelativeImportReq({
+        ...result,
+        packageDir,
+        packageId,
+        type,
+      });
+      if (req !== correct) {
+        report(context, {
+          node,
+          message: `Use import request [${correct}]`,
+          correctImport: correct,
+        });
+        return;
+      }
+    });
+  },
+};
diff --git a/packages/kbn-field-types/src/kbn_field_types.test.ts b/packages/kbn-field-types/src/kbn_field_types.test.ts
index 6209108712c3f..5f73efd3ad48f 100644
--- a/packages/kbn-field-types/src/kbn_field_types.test.ts
+++ b/packages/kbn-field-types/src/kbn_field_types.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { castEsToKbnFieldTypeName, getKbnFieldType, getKbnTypeNames, KbnFieldType } from './';
+import { castEsToKbnFieldTypeName, getKbnFieldType, getKbnTypeNames, KbnFieldType } from '.';
 
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from './types';
 
diff --git a/packages/kbn-find-used-node-modules/BUILD.bazel b/packages/kbn-find-used-node-modules/BUILD.bazel
new file mode 100644
index 0000000000000..61dc2c7703217
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/BUILD.bazel
@@ -0,0 +1,122 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-find-used-node-modules"
+PKG_REQUIRE_NAME = "@kbn/find-used-node-modules"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "//packages/kbn-babel-preset",
+  "@npm//@babel/core",
+  "@npm//@babel/types",
+  "@npm//@babel/traverse",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "//packages/kbn-import-resolver:npm_module_types",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//@types/babel__core",
+  "@npm//@babel/traverse",
+  "@npm//@babel/types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-find-used-node-modules/README.md b/packages/kbn-find-used-node-modules/README.md
new file mode 100644
index 0000000000000..3480448a1f86a
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/README.md
@@ -0,0 +1,7 @@
+# @kbn/find-used-node-modules
+
+Simple abstraction over the `@babel/parser` and the `@babel/traverse` to find the node_modules used by a list of files.
+
+## `findUsedNodeModules(resolver, entryPaths): string[]`
+
+Pass an `ImportResolver` instance from `@kbn/import-resolver` and a list of absolute paths to JS files to get the list of `node_modules` used by those files and the files the import.
\ No newline at end of file
diff --git a/packages/kbn-find-used-node-modules/jest.config.js b/packages/kbn-find-used-node-modules/jest.config.js
new file mode 100644
index 0000000000000..e8cdf1190cb47
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-find-used-node-modules'],
+};
diff --git a/packages/kbn-find-used-node-modules/package.json b/packages/kbn-find-used-node-modules/package.json
new file mode 100644
index 0000000000000..c5da8d1f898c1
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/find-used-node-modules",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-find-used-node-modules/src/find_used_node_modules.test.ts b/packages/kbn-find-used-node-modules/src/find_used_node_modules.test.ts
new file mode 100644
index 0000000000000..a5175c8734183
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/find_used_node_modules.test.ts
@@ -0,0 +1,186 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { findUsedNodeModules } from './find_used_node_modules';
+import { ImportResolver } from '@kbn/import-resolver';
+
+jest.mock('./fs');
+
+const FILES: Record<string, string> = {
+  '/foo.js': `
+    require('./bar.js')
+  `,
+  '/bar.js': `
+    require('./box')
+  `,
+  '/box.js': `
+    require('foo')
+  `,
+};
+
+class MockResolver extends ImportResolver {
+  constructor() {
+    super('/', new Map(), new Map());
+  }
+
+  isBazelPackage = jest.fn();
+  resolve = jest.fn();
+}
+
+const RESOLVER = new MockResolver();
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  jest.requireMock('./fs').readFile.mockImplementation((path: string) => {
+    if (Object.hasOwn(FILES, path)) {
+      return FILES[path];
+    }
+
+    const error: any = new Error(`ENOENT, missing file [${path}]`);
+    error.code = 'ENOENT';
+    throw error;
+  });
+});
+
+describe('findUsedNodeModules()', () => {
+  it('excludes built-in modules', async () => {
+    RESOLVER.resolve.mockImplementation(() => ({
+      type: 'built-in',
+    }));
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(1);
+    expect(results).toEqual([]);
+  });
+
+  it('returns node_modules found in the source file', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/bar',
+          absolute: '/bar.js',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(1);
+    expect(results).toEqual(['@foo/bar']);
+  });
+
+  it('returns node_modules found in referenced files', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          absolute: '/bar.js',
+        };
+      }
+
+      if (req === './box') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/box',
+          absolute: '/box.js',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(2);
+    expect(results).toEqual(['@foo/box']);
+  });
+
+  it('does not traverse node_modules', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          absolute: '/bar.js',
+        };
+      }
+
+      if (req === './box') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/box',
+          absolute: '/box.js',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(2);
+    expect(results).toEqual(['@foo/box']);
+  });
+
+  it('does traverse node_modules which are also bazel packages', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          absolute: '/bar.js',
+        };
+      }
+
+      if (req === './box') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/box',
+          absolute: '/box.js',
+        };
+      }
+
+      if (req === 'foo') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/core',
+          absolute: '/non-existant',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    RESOLVER.isBazelPackage.mockImplementation((pkgId) => {
+      return pkgId === '@foo/box';
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(3);
+    expect(results).toEqual(['@foo/box', '@foo/core']);
+  });
+});
diff --git a/packages/kbn-find-used-node-modules/src/find_used_node_modules.ts b/packages/kbn-find-used-node-modules/src/find_used_node_modules.ts
new file mode 100644
index 0000000000000..d02cc084e8901
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/find_used_node_modules.ts
@@ -0,0 +1,138 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import { asyncForEachWithLimit } from '@kbn/std';
+import type { ImportResolver } from '@kbn/import-resolver';
+
+import { readFile, readFileSync } from './fs';
+import { getImportRequests } from './get_import_requests';
+
+function isObj(v: any): v is Record<string, unknown> {
+  return typeof v === 'object' && v !== null;
+}
+
+function getPeerDeps(thisNodeModule: string) {
+  const pkgPath = require.resolve(`${thisNodeModule}/package.json`);
+  const pkg = JSON.parse(readFileSync(pkgPath));
+
+  if (isObj(pkg) && isObj(pkg.peerDependencies)) {
+    return Object.keys(pkg.peerDependencies);
+  } else {
+    return [];
+  }
+}
+
+interface Options {
+  resolver: ImportResolver;
+  entryPaths: string[];
+  findUsedPeers: boolean;
+  // if we are finding used modules in a node_module, this must be the name of the node_module
+  // we should treat as "this module" rather than "another node module"
+  thisNodeModule?: string;
+}
+
+/**
+ * Parse a list of entry paths and find the node_modules which are required by them. If the
+ * entry path requires/imports a non-node_module then that file is scanned too, deeply, until
+ * all referenced files are scanned.
+ *
+ * Optionally, we can find the used peers of the used node_modules. This will keep track of all
+ * the paths we use to enter a node_module and then traverse from those points, finding the
+ * used modules and comparing those to the `peerDependencies` listed in the node_module's package.json
+ * file. If a used dependeny is in the `peerDependencies` and is used by the node_module it will
+ * be included in the results.
+ *
+ * This was implemented mostly for `@emotion/react` which is used by @elastic/eui but only listed
+ * as a peerDependency. If we didn't keep it in the Kibana package.json then the package would not
+ * be installed and cause an error on startup because `@emotion/react` can't be found. We used to
+ * solve this by scanning the node_modules directory for all the packages which are used but that
+ * was much slower and lead to extra entries in package.json.
+ */
+export async function findUsedNodeModules(options: Options) {
+  const queue = new Set<string>(options.entryPaths);
+  const results = new Set<string>();
+
+  const entryPathsIntoNodeModules = new Map<string, Set<string>>();
+
+  for (const path of queue) {
+    if (Path.extname(path) !== '.js') {
+      continue;
+    }
+
+    const dirname = Path.dirname(path);
+    const code = await readFile(path);
+    const reqs = getImportRequests(code);
+
+    for (const req of reqs) {
+      // resolve the request to it's actual file on dist
+      const result = options.resolver.resolve(req, dirname);
+
+      // ignore non-file resolution results, these represent files which aren't on
+      // the file-system yet (like during the build) built-ins, explicitily ignored
+      // files, and @types only imports
+      if (result?.type !== 'file') {
+        continue;
+      }
+
+      // if the result points to a node_module (or another node_module)...
+      if (result.nodeModule && result.nodeModule !== options.thisNodeModule) {
+        // add it to the results
+        results.add(result.nodeModule);
+
+        // record this absolute path as an entry path into the node module from our entries, if we
+        // need to scan this node_module for used deps we need to know how we access it.
+        const nmEntries = entryPathsIntoNodeModules.get(result.nodeModule);
+        if (!nmEntries) {
+          entryPathsIntoNodeModules.set(result.nodeModule, new Set([result.absolute]));
+        } else {
+          nmEntries.add(result.absolute);
+        }
+      }
+
+      // no need to scan node_modules unless they're bazel packages
+      if (
+        !result.nodeModule ||
+        result.nodeModule === options.thisNodeModule ||
+        options.resolver.isBazelPackage(result.nodeModule)
+      ) {
+        queue.add(result.absolute);
+      }
+    }
+  }
+
+  if (options.findUsedPeers) {
+    await asyncForEachWithLimit(results, 10, async (dep) => {
+      const entryPaths = entryPathsIntoNodeModules.get(dep);
+      if (!entryPaths?.size) {
+        return;
+      }
+
+      const peerDeps = getPeerDeps(dep);
+      if (!peerDeps.length) {
+        return;
+      }
+
+      const usedInside = await findUsedNodeModules({
+        resolver: options.resolver,
+        entryPaths: Array.from(entryPaths),
+        findUsedPeers: false,
+        thisNodeModule: dep,
+      });
+
+      for (const peer of peerDeps) {
+        if (usedInside.includes(peer)) {
+          results.add(peer);
+        }
+      }
+    });
+  }
+
+  return Array.from(results).sort((a, b) => a.localeCompare(b));
+}
diff --git a/packages/kbn-babel-code-parser/src/index.js b/packages/kbn-find-used-node-modules/src/fs.ts
similarity index 61%
rename from packages/kbn-babel-code-parser/src/index.js
rename to packages/kbn-find-used-node-modules/src/fs.ts
index cc03bc75a4b4e..e0e9c9690803c 100644
--- a/packages/kbn-babel-code-parser/src/index.js
+++ b/packages/kbn-find-used-node-modules/src/fs.ts
@@ -6,6 +6,13 @@
  * Side Public License, v 1.
  */
 
-export { dependenciesParseStrategy } from './strategies';
-export { dependenciesVisitorsGenerator } from './visitors';
-export { parseSingleFile, parseSingleFileSync, parseEntries } from './code_parser';
+import Fs from 'fs';
+import Fsp from 'fs/promises';
+
+export function readFileSync(path: string) {
+  return Fs.readFileSync(path, 'utf8');
+}
+
+export function readFile(path: string) {
+  return Fsp.readFile(path, 'utf8');
+}
diff --git a/packages/kbn-find-used-node-modules/src/get_import_requests.test.ts b/packages/kbn-find-used-node-modules/src/get_import_requests.test.ts
new file mode 100644
index 0000000000000..ebfc7572cf1e7
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/get_import_requests.test.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { getImportRequests } from './get_import_requests';
+
+describe('getImportRequests()', () => {
+  it('should get requests from `require`', () => {
+    const rawCode = `/*foo*/require('dep1'); const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+      ]
+    `);
+  });
+
+  it('should get requests from `require.resolve`', () => {
+    const rawCode = `/*foo*/require.resolve('dep2'); const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep2",
+      ]
+    `);
+  });
+
+  it('should get requests from `import`', () => {
+    const rawCode = `/*foo*/import dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+        "dep2",
+      ]
+    `);
+  });
+
+  it('should get requests from `export from`', () => {
+    const rawCode = `/*foo*/export dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+        "dep2",
+      ]
+    `);
+  });
+
+  it('should get requests from `export * from`', () => {
+    const rawCode = `/*foo*/export * from 'dep1'; export dep2 from 'dep2';const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+        "dep2",
+      ]
+    `);
+  });
+});
diff --git a/packages/kbn-find-used-node-modules/src/get_import_requests.ts b/packages/kbn-find-used-node-modules/src/get_import_requests.ts
new file mode 100644
index 0000000000000..03de25f7fb92a
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/get_import_requests.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as parser from '@babel/parser';
+import traverse from '@babel/traverse';
+// @ts-expect-error Not available with types
+import babelParserOptions from '@kbn/babel-preset/common_babel_parser_options';
+
+import { importVisitor } from './import_visitor';
+
+/**
+ * Parse the code and return an array of all the import requests in that file
+ */
+export function getImportRequests(code: string) {
+  const importRequests: string[] = [];
+
+  // Parse and get the code AST
+  const ast = parser.parse(code, babelParserOptions);
+
+  // Loop through the code AST with
+  // the defined visitors
+  traverse(ast, importVisitor(importRequests));
+
+  return importRequests;
+}
diff --git a/packages/kbn-find-used-node-modules/src/import_visitor.ts b/packages/kbn-find-used-node-modules/src/import_visitor.ts
new file mode 100644
index 0000000000000..ac7e09cd726d0
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/import_visitor.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as T from '@babel/types';
+import type { Visitor } from '@babel/core';
+
+/**
+ * @notice
+ *
+ * This product has relied on ASTExplorer that is licensed under MIT.
+ */
+
+// AST check for require expressions
+const isRequire = ({ callee }: T.CallExpression) =>
+  T.isIdentifier(callee) && callee.name === 'require';
+
+// AST check for require.resolve expressions
+const isRequireResolve = ({ callee }: T.CallExpression) =>
+  T.isMemberExpression(callee) &&
+  T.isIdentifier(callee.object) &&
+  callee.object.name === 'require' &&
+  T.isIdentifier(callee.property) &&
+  callee.property.name === 'resolve';
+
+/**
+ * Create a Babel AST visitor that will write import requests into the passed array
+ */
+export function importVisitor(importRequests: string[]): Visitor {
+  // This was built with help on an ast explorer and some ESTree docs
+  // like the babel parser ast spec and the main docs for the Esprima
+  // which is a complete and useful docs for the ESTree spec.
+  //
+  // https://astexplorer.net
+  // https://github.com/babel/babel/blob/master/packages/babel-parser/ast/spec.md
+  // https://esprima.readthedocs.io/en/latest/syntax-tree-format.html
+  // https://github.com/estree/estree
+
+  // Visitors to traverse and find dependencies
+  return {
+    // raw values on require + require.resolve
+    CallExpression: ({ node }) => {
+      if (isRequire(node) || isRequireResolve(node)) {
+        const nodeArguments = node.arguments;
+        const reqArg = Array.isArray(nodeArguments) ? nodeArguments.shift() : null;
+
+        if (!reqArg) {
+          return;
+        }
+
+        if (reqArg.type === 'StringLiteral') {
+          importRequests.push(reqArg.value);
+        }
+      }
+    },
+
+    // raw values on import
+    ImportDeclaration: ({ node }) => {
+      // Get string values from import expressions
+      const importSource = node.source;
+      importRequests.push(importSource.value);
+    },
+
+    // raw values on export from
+    ExportNamedDeclaration: ({ node }) => {
+      // Get string values from export from expressions
+      if (node.source) {
+        importRequests.push(node.source.value);
+      }
+    },
+
+    // raw values on export * from
+    ExportAllDeclaration: ({ node }) => {
+      const exportAllFromSource = node.source;
+      importRequests.push(exportAllFromSource.value);
+    },
+  };
+}
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/index.ts b/packages/kbn-find-used-node-modules/src/index.ts
similarity index 84%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/index.ts
rename to packages/kbn-find-used-node-modules/src/index.ts
index 66ffe2976d786..52e2935b5f0e0 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/index.ts
+++ b/packages/kbn-find-used-node-modules/src/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { ExitFullScreenButton } from './exit_full_screen_button';
+export { findUsedNodeModules } from './find_used_node_modules';
diff --git a/packages/kbn-find-used-node-modules/tsconfig.json b/packages/kbn-find-used-node-modules/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-generate/BUILD.bazel b/packages/kbn-generate/BUILD.bazel
index ee73f358df9ca..eba297de0516e 100644
--- a/packages/kbn-generate/BUILD.bazel
+++ b/packages/kbn-generate/BUILD.bazel
@@ -29,6 +29,7 @@ RUNTIME_DEPS = [
   "//packages/kbn-dev-utils",
   "//packages/kbn-bazel-packages",
   "//packages/kbn-utils",
+  "//packages/kbn-sort-package-json",
   "@npm//ejs",
   "@npm//micromatch",
   "@npm//normalize-path",
@@ -38,6 +39,7 @@ TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-bazel-packages:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-sort-package-json:npm_module_types",
   "@npm//@types/micromatch",
   "@npm//ejs",
   "@npm//micromatch",
diff --git a/packages/kbn-generate/src/commands/package_command.ts b/packages/kbn-generate/src/commands/package_command.ts
index 074f48d26114b..92362e7feb35f 100644
--- a/packages/kbn-generate/src/commands/package_command.ts
+++ b/packages/kbn-generate/src/commands/package_command.ts
@@ -11,11 +11,13 @@ import Path from 'path';
 
 import normalizePath from 'normalize-path';
 import globby from 'globby';
+import { ESLint } from 'eslint';
 
 import micromatch from 'micromatch';
 import { REPO_ROOT } from '@kbn/utils';
 import { discoverBazelPackages, BAZEL_PACKAGE_DIRS } from '@kbn/bazel-packages';
-import { createFailError, createFlagError, isFailError, sortPackageJson } from '@kbn/dev-utils';
+import { createFailError, createFlagError, isFailError } from '@kbn/dev-utils';
+import { sortPackageJson } from '@kbn/sort-package-json';
 
 import { TEMPLATE_DIR, ROOT_PKG_DIR, PKG_TEMPLATE_DIR } from '../paths';
 import type { GenerateCommand } from '../generate_command';
@@ -31,10 +33,12 @@ export const PackageCommand: GenerateCommand = {
       --dev          Generate a package which is intended for dev-only use and can access things like devDependencies
       --web          Build webpack-compatible version of sources for this package. If your package is intended to be
                       used in the browser and Node.js then you need to opt-into these sources being created.
-      --force        If the packageDir already exists, delete it before generation
-      --dir          Directory where this package will live, defaults to [./packages]
-                       Valid Options:
-${BAZEL_PACKAGE_DIRS.map((rel) => `                         ${rel}\n`).join('')}
+      --dir          Specify where this package will be written. The path must be a direct child of one of the
+                      directories selected by the BAZEL_PACKAGE_DIRS const in @kbn/bazel-packages.
+                        Valid locations for packages:
+${BAZEL_PACKAGE_DIRS.map((dir) => `                          ./${dir}/*\n`).join('')}
+                      defaults to [./packages/{kebab-case-version-of-name}]
+      --force        If the --dir already exists, delete it before generation
     `,
   },
   async run({ log, flags, render }) {
@@ -50,15 +54,16 @@ ${BAZEL_PACKAGE_DIRS.map((rel) => `                         ${rel}\n`).join('')}
     const web = !!flags.web;
     const dev = !!flags.dev;
 
-    const containingDir = flags.dir ? Path.resolve(`${flags.dir}`) : ROOT_PKG_DIR;
-    const relContainingDir = Path.relative(REPO_ROOT, containingDir);
+    const packageDir = flags.dir
+      ? Path.resolve(`${flags.dir}`)
+      : Path.resolve(ROOT_PKG_DIR, name.slice(1).replace('/', '-'));
+    const relContainingDir = Path.relative(REPO_ROOT, Path.dirname(packageDir));
     if (!micromatch.isMatch(relContainingDir, BAZEL_PACKAGE_DIRS)) {
       throw createFlagError(
         'Invalid --dir selection. To setup a new --dir option extend the `BAZEL_PACKAGE_DIRS` const in `@kbn/bazel-packages` and make sure to rebuild.'
       );
     }
 
-    const packageDir = Path.resolve(containingDir, name.slice(1).replace('/', '-'));
     const normalizedRepoRelativeDir = normalizePath(Path.relative(REPO_ROOT, packageDir));
 
     try {
@@ -125,6 +130,15 @@ ${BAZEL_PACKAGE_DIRS.map((rel) => `                         ${rel}\n`).join('')}
 
     log.info('Wrote plugin files to', packageDir);
 
+    log.info('Linting files');
+    const eslint = new ESLint({
+      cache: false,
+      cwd: REPO_ROOT,
+      fix: true,
+      extensions: ['.js', '.mjs', '.ts', '.tsx'],
+    });
+    await ESLint.outputFixes(await eslint.lintFiles([packageDir]));
+
     const packageJsonPath = Path.resolve(REPO_ROOT, 'package.json');
     const packageJson = JSON.parse(await Fsp.readFile(packageJsonPath, 'utf8'));
 
diff --git a/packages/kbn-generate/src/lib/render.ts b/packages/kbn-generate/src/lib/render.ts
index 23595dbbe43d0..33c6a903875f4 100644
--- a/packages/kbn-generate/src/lib/render.ts
+++ b/packages/kbn-generate/src/lib/render.ts
@@ -11,7 +11,8 @@ import Fsp from 'fs/promises';
 
 import Ejs from 'ejs';
 import normalizePath from 'normalize-path';
-import { ToolingLog, sortPackageJson } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { sortPackageJson } from '@kbn/sort-package-json';
 import { REPO_ROOT } from '@kbn/utils';
 
 export type Vars = Record<string, unknown>;
diff --git a/packages/kbn-generate/src/lib/validate_file.ts b/packages/kbn-generate/src/lib/validate_file.ts
index d4f3640a45471..9a9ca28691537 100644
--- a/packages/kbn-generate/src/lib/validate_file.ts
+++ b/packages/kbn-generate/src/lib/validate_file.ts
@@ -9,7 +9,8 @@
 import Fsp from 'fs/promises';
 import Path from 'path';
 
-import { ToolingLog, createFailError, diffStrings } from '@kbn/dev-utils';
+import { createFailError, diffStrings } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 export async function validateFile(log: ToolingLog, usage: string, path: string, expected: string) {
   const relPath = Path.relative(process.cwd(), path);
diff --git a/packages/kbn-generate/templates/package/jest.config.js.ejs b/packages/kbn-generate/templates/package/jest.config.js.ejs
index 6a65cc6b304c5..1d74c042bd4c8 100644
--- a/packages/kbn-generate/templates/package/jest.config.js.ejs
+++ b/packages/kbn-generate/templates/package/jest.config.js.ejs
@@ -1,5 +1,5 @@
 module.exports = {
   preset: <%- js(pkg.web ? '@kbn/test' : '@kbn/test/jest_node') %>,
-  rootDir: '../..',
+  rootDir: <%- js(relativePathTo('.')) %>,
   roots: [<%- js(`<rootDir>/${pkg.normalizedRepoRelativeDir}`) %>],
 };
diff --git a/packages/kbn-i18n/src/core/i18n.ts b/packages/kbn-i18n/src/core/i18n.ts
index 5d845dd4b12eb..cde5506383dd6 100644
--- a/packages/kbn-i18n/src/core/i18n.ts
+++ b/packages/kbn-i18n/src/core/i18n.ts
@@ -16,7 +16,7 @@ import { hasValues, isObject, isString, mergeAll } from './helper';
 import { isPseudoLocale, translateUsingPseudoLocale } from './pseudo_locale';
 
 // Add all locale data to `IntlMessageFormat`.
-import './locales.js';
+import './locales';
 
 const EN_LOCALE = 'en';
 const translationsForLocale: Record<string, Translation> = {};
diff --git a/packages/kbn-import-resolver/BUILD.bazel b/packages/kbn-import-resolver/BUILD.bazel
new file mode 100644
index 0000000000000..f6ad73e494486
--- /dev/null
+++ b/packages/kbn-import-resolver/BUILD.bazel
@@ -0,0 +1,125 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-import-resolver"
+PKG_REQUIRE_NAME = "@kbn/import-resolver"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "//packages/kbn-bazel-packages",
+  "//packages/kbn-utils",
+  "//packages/kbn-synthetic-package-map",
+  "@npm//resolve",
+  "@npm//normalize-path",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "//packages/kbn-bazel-packages:npm_module_types",
+  "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-dev-utils:npm_module_types", # needed for testing, only required for windows dev
+  "//packages/kbn-synthetic-package-map:npm_module_types",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//@types/resolve",
+  "@npm//@types/normalize-path",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-import-resolver/README.md b/packages/kbn-import-resolver/README.md
new file mode 100644
index 0000000000000..82760b05f8c4c
--- /dev/null
+++ b/packages/kbn-import-resolver/README.md
@@ -0,0 +1,3 @@
+# @kbn/import-resolver
+
+Empty package generated by @kbn/generate
diff --git a/packages/kbn-import-resolver/jest.integration.config.js b/packages/kbn-import-resolver/jest.integration.config.js
new file mode 100644
index 0000000000000..7a593982100b0
--- /dev/null
+++ b/packages/kbn-import-resolver/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_integration_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-import-resolver'],
+};
diff --git a/packages/kbn-import-resolver/package.json b/packages/kbn-import-resolver/package.json
new file mode 100644
index 0000000000000..d8a6e72792399
--- /dev/null
+++ b/packages/kbn-import-resolver/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/import-resolver",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-import-resolver/src/__fixtures__/node_modules/@pkg/box/index.js b/packages/kbn-import-resolver/src/__fixtures__/node_modules/@pkg/box/index.js
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/kbn-import-resolver/src/__fixtures__/node_modules/foo/index.js b/packages/kbn-import-resolver/src/__fixtures__/node_modules/foo/index.js
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/kbn-import-resolver/src/__fixtures__/packages/box/index.js b/packages/kbn-import-resolver/src/__fixtures__/packages/box/index.js
new file mode 100644
index 0000000000000..5c2d5b68ae2e0
--- /dev/null
+++ b/packages/kbn-import-resolver/src/__fixtures__/packages/box/index.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
diff --git a/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js b/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js
new file mode 100644
index 0000000000000..5c2d5b68ae2e0
--- /dev/null
+++ b/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
diff --git a/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js b/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js
new file mode 100644
index 0000000000000..5c2d5b68ae2e0
--- /dev/null
+++ b/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
diff --git a/packages/kbn-import-resolver/src/__fixtures__/src/index.js b/packages/kbn-import-resolver/src/__fixtures__/src/index.js
new file mode 100644
index 0000000000000..5c2d5b68ae2e0
--- /dev/null
+++ b/packages/kbn-import-resolver/src/__fixtures__/src/index.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/fs.ts b/packages/kbn-import-resolver/src/helpers/fs.ts
similarity index 55%
rename from packages/kbn-eslint-plugin-imports/src/helpers/fs.ts
rename to packages/kbn-import-resolver/src/helpers/fs.ts
index 98b26bd1336ed..d1897ed9247eb 100644
--- a/packages/kbn-eslint-plugin-imports/src/helpers/fs.ts
+++ b/packages/kbn-import-resolver/src/helpers/fs.ts
@@ -8,11 +8,7 @@
 
 import Fs from 'fs';
 
-import { memoize } from './memoize';
-
-const runningInEditor = !!process.env.VSCODE_CWD;
-
-const safeStat = (path: string) => {
+export function safeStat(path: string) {
   try {
     return Fs.statSync(path);
   } catch (error) {
@@ -22,15 +18,8 @@ const safeStat = (path: string) => {
 
     throw error;
   }
-};
-
-function _isDirectory(path: string) {
-  return !!safeStat(path)?.isDirectory();
 }
 
-function _isFile(path: string) {
-  return !!safeStat(path)?.isFile();
+export function readFileSync(path: string) {
+  return Fs.readFileSync(path, 'utf8');
 }
-
-export const isDirectory = runningInEditor ? _isDirectory : memoize(_isDirectory);
-export const isFile = runningInEditor ? _isFile : memoize(_isFile);
diff --git a/packages/kbn-import-resolver/src/helpers/import_req.ts b/packages/kbn-import-resolver/src/helpers/import_req.ts
new file mode 100644
index 0000000000000..5844f47e880fe
--- /dev/null
+++ b/packages/kbn-import-resolver/src/helpers/import_req.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import normalizePath from 'normalize-path';
+
+export type ImportType = 'esm' | 'require' | 'require-resolve' | 'jest';
+
+interface WrapOptions {
+  prefix?: string;
+  postfix?: string;
+}
+function wrap(req: string, options: WrapOptions) {
+  return `${options.prefix ?? ''}${req}${options.postfix ?? ''}`;
+}
+
+const EXT_RE = /\.(jsx?|(d\.)?tsx?)$/;
+const INDEX_IN_INDEX_RE = /\/index\/index(\.jsx?|\.d\.tsx?|\.tsx?)$/;
+const INCLUDES_FILENAME_RE = /\/.*\..{2,4}$/;
+
+export function reduceImportRequest(req: string, type: ImportType, original?: string) {
+  let reduced = req;
+
+  if (type === 'require-resolve' && original && original.match(INCLUDES_FILENAME_RE)) {
+    // require.resolve() can be a complicated, it's often used in config files and
+    // sometimes we don't have babel to help resolve .ts to .js, so we try to rely
+    // on the original request and keep the filename listed if it's in the original
+    return req;
+  }
+
+  const indexInIndexMatch = req.match(INDEX_IN_INDEX_RE);
+  if (indexInIndexMatch) {
+    if (indexInIndexMatch[1] !== '.ts' && indexInIndexMatch[1] !== '.tsx') {
+      // this is a very ambiguous request, leave the whole import statement to make it less so
+      return req;
+    }
+
+    // this is also a very ambiguous request, but TS complains about leaving .ts or .tsx on a request so strip it
+    return req.slice(0, -indexInIndexMatch[1].length);
+  }
+
+  const extMatch = req.match(EXT_RE);
+  if (extMatch) {
+    reduced = reduced.slice(0, -extMatch[0].length);
+  }
+
+  if (reduced === 'index') {
+    return '';
+  }
+
+  if (reduced.endsWith('/index')) {
+    reduced = reduced.slice(0, -6);
+  }
+
+  return reduced;
+}
+
+interface RelativeImportReqOptions extends WrapOptions {
+  dirname: string;
+  absolute: string;
+  type: ImportType;
+  original?: string;
+}
+
+export function getRelativeImportReq(options: RelativeImportReqOptions) {
+  const relative = normalizePath(Path.relative(options.dirname, options.absolute));
+  return wrap(
+    reduceImportRequest(
+      relative.startsWith('.') ? relative : `./${relative}`,
+      options.type,
+      options.original
+    ),
+    options
+  );
+}
+
+interface PackageRelativeImportReqOptions extends WrapOptions {
+  packageDir: string;
+  packageId: string;
+  absolute: string;
+  type: ImportType;
+}
+
+export function getPackageRelativeImportReq(options: PackageRelativeImportReqOptions) {
+  const relative = normalizePath(Path.relative(options.packageDir, options.absolute));
+
+  if (!relative) {
+    return wrap(options.packageId, options);
+  }
+
+  const subPath = reduceImportRequest(relative, options.type);
+
+  return wrap(subPath ? `${options.packageId}/${subPath}` : options.packageId, options);
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/memoize.ts b/packages/kbn-import-resolver/src/helpers/memoize.ts
similarity index 100%
rename from packages/kbn-eslint-plugin-imports/src/helpers/memoize.ts
rename to packages/kbn-import-resolver/src/helpers/memoize.ts
diff --git a/packages/kbn-import-resolver/src/import_resolver.ts b/packages/kbn-import-resolver/src/import_resolver.ts
new file mode 100644
index 0000000000000..44114ce731e28
--- /dev/null
+++ b/packages/kbn-import-resolver/src/import_resolver.ts
@@ -0,0 +1,281 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+import Fs from 'fs';
+
+import Resolve from 'resolve';
+import { REPO_ROOT } from '@kbn/utils';
+import normalizePath from 'normalize-path';
+import { discoverBazelPackageLocations } from '@kbn/bazel-packages';
+import { readPackageMap, PackageMap } from '@kbn/synthetic-package-map';
+
+import { safeStat, readFileSync } from './helpers/fs';
+import { ResolveResult } from './resolve_result';
+import { getRelativeImportReq } from './helpers/import_req';
+import { memoize } from './helpers/memoize';
+
+const NODE_MODULE_SEG = Path.sep + 'node_modules' + Path.sep;
+
+export class ImportResolver {
+  static create(repoRoot: string) {
+    const pkgMap = new Map();
+    for (const dir of discoverBazelPackageLocations(repoRoot)) {
+      const pkg = JSON.parse(Fs.readFileSync(Path.resolve(dir, 'package.json'), 'utf8'));
+      pkgMap.set(pkg.name, normalizePath(Path.relative(repoRoot, dir)));
+    }
+
+    return new ImportResolver(repoRoot, pkgMap, readPackageMap());
+  }
+
+  private safeStat = memoize(safeStat);
+
+  private baseResolveOpts = {
+    extensions: ['.js', '.json', '.ts', '.tsx', '.d.ts'],
+    isFile: (path: string) => !!this.safeStat(path)?.isFile(),
+    isDirectory: (path: string) => !!this.safeStat(path)?.isDirectory(),
+    readFileSync: memoize(readFileSync),
+    packageFilter(pkg: Record<string, unknown>) {
+      if (!pkg.main && pkg.types) {
+        // for the purpose of resolving files, a "types" file is adequate
+        return {
+          ...pkg,
+          main: pkg.types,
+        };
+      }
+
+      return pkg;
+    },
+  };
+
+  constructor(
+    /**
+     * Root directory that all source files for packages are expected to be
+     * in, also the directory that package maps are resolved against.
+     */
+    private readonly cwd: string,
+    /**
+     * Map of actual package names to normalized root-relative directories
+     * for each package
+     */
+    private readonly pkgMap: PackageMap,
+    /**
+     * Map of synthetic package names to normalized root-relative directories
+     * for each simulated package
+     */
+    private readonly synthPkgMap: PackageMap
+  ) {}
+
+  getPackageIdForPath(path: string) {
+    const relative = normalizePath(Path.relative(this.cwd, path));
+    if (relative.startsWith('..')) {
+      throw new Error(`path is outside of cwd [${this.cwd}]`);
+    }
+
+    for (const [synthPkgId, dir] of this.synthPkgMap) {
+      if (relative === dir || relative.startsWith(dir + '/')) {
+        return synthPkgId;
+      }
+    }
+
+    for (const [pkgId, dir] of this.pkgMap) {
+      if (relative === dir || relative.startsWith(dir + '/')) {
+        return pkgId;
+      }
+    }
+
+    return null;
+  }
+
+  getAbsolutePackageDir(pkgId: string) {
+    const dir = this.synthPkgMap.get(pkgId) ?? this.pkgMap.get(pkgId);
+    if (!dir) {
+      return null;
+    }
+    return Path.resolve(this.cwd, dir);
+  }
+
+  isBazelPackage(pkgId: string) {
+    return this.pkgMap.has(pkgId);
+  }
+
+  isSyntheticPackage(pkgId: string) {
+    return this.synthPkgMap.has(pkgId);
+  }
+
+  private shouldIgnore(req: string): boolean {
+    // this library is only installed on CI and never resolvable
+    if (req === 'kibana-buildkite-library') {
+      return true;
+    }
+
+    // these are special webpack-aliases only used in storybooks, ignore them
+    if (req === 'core_styles' || req === 'core_app_image_assets') {
+      return true;
+    }
+
+    // ignore amd require done by ace syntax plugin
+    if (req === 'ace/lib/dom') {
+      return true;
+    }
+
+    // ignore requests to grammar/built_grammar.js files or bazel target dirs, these files are only
+    // available in the build output and will never resolve in dev. We will validate that people don't
+    // import these files from outside the package in another rule
+    if (
+      req.endsWith('grammar/built_grammar.js') ||
+      req.includes('/target_workers/') ||
+      req.includes('/target_node/')
+    ) {
+      return true;
+    }
+
+    // typescript validates these imports fine and they're purely virtual thanks to ambient type definitions in @elastic/eui so /shrug
+    if (
+      req.startsWith('@elastic/eui/src/components/') ||
+      req.startsWith('@elastic/eui/src/services/')
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  private adaptReq(req: string, dirname: string): string | undefined {
+    // handle typescript aliases
+    if (req === 'kibana/public') {
+      return this.adaptReq('src/core/public', dirname);
+    }
+    if (req === 'kibana/server') {
+      return this.adaptReq('src/core/server', dirname);
+    }
+
+    // turn root-relative paths into relative paths
+    if (
+      req.startsWith('src/') ||
+      req.startsWith('x-pack/') ||
+      req.startsWith('examples/') ||
+      req.startsWith('test/')
+    ) {
+      return getRelativeImportReq({
+        dirname,
+        absolute: Path.resolve(REPO_ROOT, req),
+        type: 'esm',
+      });
+    }
+  }
+
+  private tryNodeResolve(req: string, dirname: string): ResolveResult | null {
+    try {
+      const path = Resolve.sync(req, {
+        basedir: dirname,
+        ...this.baseResolveOpts,
+      });
+
+      if (!Path.isAbsolute(path)) {
+        return {
+          type: 'built-in',
+        };
+      }
+
+      const lastNmSeg = path.lastIndexOf(NODE_MODULE_SEG);
+      if (lastNmSeg !== -1) {
+        const segs = path.slice(lastNmSeg + NODE_MODULE_SEG.length).split(Path.sep);
+        const moduleId = segs[0].startsWith('@') ? `${segs[0]}/${segs[1]}` : segs[0];
+
+        return {
+          type: 'file',
+          absolute: path,
+          nodeModule: moduleId,
+        };
+      }
+
+      return {
+        type: 'file',
+        absolute: path,
+      };
+    } catch (error) {
+      if (error && error.code === 'MODULE_NOT_FOUND') {
+        if (req === 'fsevents') {
+          return {
+            type: 'optional-and-missing',
+          };
+        }
+        return null;
+      }
+
+      throw error;
+    }
+  }
+
+  private tryTypesResolve(req: string, dirname: string): ResolveResult | null {
+    const parts = req.split('/');
+    const nmParts = parts[0].startsWith('@') ? [parts[0].slice(1), parts[1]] : [parts[0]];
+    const typesReq = `@types/${nmParts.join('__')}`;
+    const result = this.tryNodeResolve(typesReq, dirname);
+
+    if (result) {
+      return {
+        type: '@types',
+        module: typesReq,
+      };
+    }
+
+    return null;
+  }
+
+  /**
+   * Resolve an import request from a file in the given dirname
+   */
+  resolve(req: string, dirname: string): ResolveResult | null {
+    // transform webpack loader requests and focus on the actual file selected
+    const lastExI = req.lastIndexOf('!');
+    if (lastExI > -1) {
+      const quesI = req.lastIndexOf('?');
+      const prefix = req.slice(0, lastExI + 1);
+      const postfix = quesI > -1 ? req.slice(quesI) : '';
+      const result = this.resolve(req.slice(lastExI + 1, quesI > -1 ? quesI : undefined), dirname);
+
+      if (result?.type !== 'file') {
+        return result;
+      }
+
+      return {
+        ...result,
+        prefix,
+        postfix,
+      };
+    }
+
+    if (req[0] !== '.') {
+      const parts = req.split('/');
+      const pkgId = parts[0].startsWith('@') ? `${parts[0]}/${parts[1]}` : `${parts[0]}`;
+      if (this.synthPkgMap.has(pkgId)) {
+        const pkgDir = this.getAbsolutePackageDir(pkgId);
+        if (pkgDir) {
+          return this.resolve(
+            getRelativeImportReq({
+              absolute: parts.length > 2 ? Path.resolve(pkgDir, ...parts.slice(2)) : pkgDir,
+              dirname,
+              type: 'esm',
+            }),
+            dirname
+          );
+        }
+      }
+    }
+
+    req = this.adaptReq(req, dirname) ?? req;
+
+    if (this.shouldIgnore(req)) {
+      return { type: 'ignore' };
+    }
+
+    return this.tryNodeResolve(req, dirname) ?? this.tryTypesResolve(req, dirname);
+  }
+}
diff --git a/packages/kbn-import-resolver/src/index.ts b/packages/kbn-import-resolver/src/index.ts
new file mode 100644
index 0000000000000..63b551bac9f96
--- /dev/null
+++ b/packages/kbn-import-resolver/src/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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from './import_resolver';
+export * from './helpers/import_req';
+export * from './resolve_result';
diff --git a/packages/kbn-import-resolver/src/integration_tests/import_resolver.test.ts b/packages/kbn-import-resolver/src/integration_tests/import_resolver.test.ts
new file mode 100644
index 0000000000000..1857e6ef26453
--- /dev/null
+++ b/packages/kbn-import-resolver/src/integration_tests/import_resolver.test.ts
@@ -0,0 +1,192 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
+
+import { ImportResolver } from '../import_resolver';
+
+const FIXTURES_DIR = Path.resolve(__dirname, '../__fixtures__');
+
+expect.addSnapshotSerializer(createAbsolutePathSerializer());
+
+const resolver = new ImportResolver(
+  FIXTURES_DIR,
+  new Map([['@pkg/box', 'packages/box']]),
+  new Map([['@synth/bar', 'src/bar']])
+);
+
+describe('#resolve()', () => {
+  it('resolves imports to synth packages', () => {
+    expect(resolver.resolve('@synth/bar', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js,
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves imports to bazel packages that are also found in node_modules', () => {
+    expect(resolver.resolve('@pkg/box', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/node_modules/@pkg/box/index.js,
+        "nodeModule": "@pkg/box",
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves node_module imports', () => {
+    expect(resolver.resolve('foo', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/node_modules/foo/index.js,
+        "nodeModule": "foo",
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves requests to src/', () => {
+    expect(resolver.resolve('src/core/public', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/src/core/public/index.ts,
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves relative paths', () => {
+    expect(resolver.resolve('./bar', Path.resolve(FIXTURES_DIR, 'src/bar'))).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js,
+        "type": "file",
+      }
+    `);
+  });
+
+  it('returns null when the import cannot be resolved', () => {
+    expect(resolver.resolve('../../../../invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+    expect(resolver.resolve('src/invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+    expect(resolver.resolve('kibana/invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+    expect(resolver.resolve('@kbn/invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+  });
+
+  it('returns ignore results for known unresolvable but okay import statements', () => {
+    expect(resolver.resolve('../../grammar/built_grammar.js', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('kibana-buildkite-library', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('core_styles', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('core_app_image_assets', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('ace/lib/dom', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('@elastic/eui/src/components/foo', FIXTURES_DIR))
+      .toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('@elastic/eui/src/services/foo', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+  });
+});
+
+describe('#getPackageIdForPath()', () => {
+  it('returns package id for bazel package', () => {
+    expect(
+      resolver.getPackageIdForPath(Path.resolve(FIXTURES_DIR, 'packages/box/index.js'))
+    ).toMatchInlineSnapshot(`"@pkg/box"`);
+  });
+
+  it('returns package id for synth package', () => {
+    expect(
+      resolver.getPackageIdForPath(Path.resolve(FIXTURES_DIR, 'src/bar/index.js'))
+    ).toMatchInlineSnapshot(`"@synth/bar"`);
+  });
+
+  it('returns null for files outside of a package', () => {
+    expect(
+      resolver.getPackageIdForPath(Path.resolve(FIXTURES_DIR, 'src/index.js'))
+    ).toMatchInlineSnapshot(`null`);
+  });
+});
+
+describe('#getAbsolutePackageDir()', () => {
+  it('returns path for bazel package', () => {
+    expect(resolver.getAbsolutePackageDir('@pkg/box')).toMatchInlineSnapshot(
+      `<absolute path>/packages/kbn-import-resolver/src/__fixtures__/packages/box`
+    );
+  });
+  it('returns path for synth package', () => {
+    expect(resolver.getAbsolutePackageDir('@synth/bar')).toMatchInlineSnapshot(
+      `<absolute path>/packages/kbn-import-resolver/src/__fixtures__/src/bar`
+    );
+  });
+  it('returns null for node_modules', () => {
+    expect(resolver.getAbsolutePackageDir('foo')).toMatchInlineSnapshot(`null`);
+  });
+  it('returns null for unknown packages', () => {
+    expect(resolver.getAbsolutePackageDir('@kbn/invalid')).toMatchInlineSnapshot(`null`);
+  });
+});
+
+describe('#isBazelPackage()', () => {
+  it('returns true for bazel packages', () => {
+    expect(resolver.isBazelPackage('@pkg/box')).toBe(true);
+  });
+  it('returns false for synth packages', () => {
+    expect(resolver.isBazelPackage('@synth/bar')).toBe(false);
+  });
+  it('returns false for node_modules packages', () => {
+    expect(resolver.isBazelPackage('foo')).toBe(false);
+  });
+  it('returns false for unknown packages', () => {
+    expect(resolver.isBazelPackage('@kbn/invalid')).toBe(false);
+  });
+});
+
+describe('#isSyntheticPackage()', () => {
+  it('returns true for synth packages', () => {
+    expect(resolver.isSyntheticPackage('@synth/bar')).toBe(true);
+  });
+  it('returns false for bazel packages', () => {
+    expect(resolver.isSyntheticPackage('@pkg/box')).toBe(false);
+  });
+  it('returns false for node_modules packages', () => {
+    expect(resolver.isSyntheticPackage('foo')).toBe(false);
+  });
+  it('returns false for unknown packages', () => {
+    expect(resolver.isSyntheticPackage('@kbn/invalid')).toBe(false);
+  });
+});
diff --git a/packages/kbn-eslint-plugin-imports/src/resolve_result.ts b/packages/kbn-import-resolver/src/resolve_result.ts
similarity index 74%
rename from packages/kbn-eslint-plugin-imports/src/resolve_result.ts
rename to packages/kbn-import-resolver/src/resolve_result.ts
index 688683c9ae860..3174da55fb58a 100644
--- a/packages/kbn-eslint-plugin-imports/src/resolve_result.ts
+++ b/packages/kbn-import-resolver/src/resolve_result.ts
@@ -6,6 +6,21 @@
  * Side Public License, v 1.
  */
 
+/**
+ * Resolution result indicating that the import request resolves to a built-in node library
+ */
+export interface BuiltInResult {
+  type: 'built-in';
+}
+
+/**
+ * Resolution result indicating that the import request resolves to an npm dep which isn't
+ * currently installed so assumed to be optional
+ */
+export interface OptionalDepResult {
+  type: 'optional-and-missing';
+}
+
 /**
  * Resolution result indicating that the import request can't be resolved, but it shouldn't need to be
  * because the file that is imported can't be resolved from the source alone, usually because it is explicitly
@@ -35,9 +50,16 @@ export interface FileResult {
   type: 'file';
   absolute: string;
   nodeModule?: string;
+  prefix?: string;
+  postfix?: string;
 }
 
 /**
  * Possible resolve result types
  */
-export type ResolveResult = IgnoreResult | TypesResult | FileResult;
+export type ResolveResult =
+  | BuiltInResult
+  | IgnoreResult
+  | TypesResult
+  | FileResult
+  | OptionalDepResult;
diff --git a/packages/kbn-import-resolver/tsconfig.json b/packages/kbn-import-resolver/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-import-resolver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-interpreter/src/common/lib/cast.js b/packages/kbn-interpreter/src/common/lib/cast.js
index 6f1ed16bb055c..ccadb00d21597 100644
--- a/packages/kbn-interpreter/src/common/lib/cast.js
+++ b/packages/kbn-interpreter/src/common/lib/cast.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getType } from '../lib/get_type';
+import { getType } from './get_type';
 
 export function castProvider(types) {
   return function cast(node, toTypeNames) {
diff --git a/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts b/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts
index d6d6afbf98755..bf8975bba7df5 100644
--- a/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { isoToEpochRt } from './index';
+import { isoToEpochRt } from '.';
 import { isRight } from 'fp-ts/lib/Either';
 
 describe('isoToEpochRt', () => {
diff --git a/packages/kbn-io-ts-utils/src/json_rt/index.test.ts b/packages/kbn-io-ts-utils/src/json_rt/index.test.ts
index 1220639fc7bef..dfc5a24c96c9f 100644
--- a/packages/kbn-io-ts-utils/src/json_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/json_rt/index.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as t from 'io-ts';
-import { jsonRt } from './index';
+import { jsonRt } from '.';
 import { isRight, Either, isLeft, fold } from 'fp-ts/lib/Either';
 import { Right } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
diff --git a/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts b/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts
index 85b58ef76622f..5bf57f41860f1 100644
--- a/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { nonEmptyStringRt } from './';
+import { nonEmptyStringRt } from '.';
 import { isLeft, isRight } from 'fp-ts/lib/Either';
 
 describe('nonEmptyStringRt', () => {
diff --git a/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts b/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts
index 6b19026cb1be5..2907889025c41 100644
--- a/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts
@@ -8,7 +8,7 @@
 
 import * as t from 'io-ts';
 import { isRight, isLeft } from 'fp-ts/lib/Either';
-import { strictKeysRt } from './';
+import { strictKeysRt } from '.';
 import { jsonRt } from '../json_rt';
 import { PathReporter } from 'io-ts/lib/PathReporter';
 
diff --git a/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts b/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts
index cac7d3b2aae5e..80045185ea906 100644
--- a/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import * as t from 'io-ts';
-import { toJsonSchema } from './';
+import { toJsonSchema } from '.';
 
 describe('toJsonSchema', () => {
   it('converts simple types to JSON schema', () => {
diff --git a/packages/kbn-jest-serializers/BUILD.bazel b/packages/kbn-jest-serializers/BUILD.bazel
new file mode 100644
index 0000000000000..23f0c76ab17dd
--- /dev/null
+++ b/packages/kbn-jest-serializers/BUILD.bazel
@@ -0,0 +1,118 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-jest-serializers"
+PKG_REQUIRE_NAME = "@kbn/jest-serializers"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//strip-ansi",
+  "//packages/kbn-utils",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//strip-ansi",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "//packages/kbn-utils:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-jest-serializers/README.md b/packages/kbn-jest-serializers/README.md
new file mode 100644
index 0000000000000..20d411e0db535
--- /dev/null
+++ b/packages/kbn-jest-serializers/README.md
@@ -0,0 +1,11 @@
+# @kbn/jest-serializers
+
+Shared serializers that may be useful when you're writing jest tests. To use them import the package and call one of the functions, passing the result to `expect.addSnapshotSerializer()`.
+
+Example:
+
+```ts
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers'
+
+expect.addSnapshotSerializer(createAbsolutePathSerializer());
+```
\ No newline at end of file
diff --git a/packages/kbn-jest-serializers/jest.config.js b/packages/kbn-jest-serializers/jest.config.js
new file mode 100644
index 0000000000000..23fad67c028bf
--- /dev/null
+++ b/packages/kbn-jest-serializers/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-jest-serializers'],
+};
diff --git a/packages/kbn-jest-serializers/package.json b/packages/kbn-jest-serializers/package.json
new file mode 100644
index 0000000000000..c049ef6725157
--- /dev/null
+++ b/packages/kbn-jest-serializers/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/jest-serializers",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts b/packages/kbn-jest-serializers/src/absolute_path_serializer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts
rename to packages/kbn-jest-serializers/src/absolute_path_serializer.ts
diff --git a/packages/kbn-dev-utils/src/serializers/any_instance_serizlizer.ts b/packages/kbn-jest-serializers/src/any_instance_serizlizer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/serializers/any_instance_serizlizer.ts
rename to packages/kbn-jest-serializers/src/any_instance_serizlizer.ts
diff --git a/packages/kbn-dev-utils/src/serializers/index.ts b/packages/kbn-jest-serializers/src/index.ts
similarity index 50%
rename from packages/kbn-dev-utils/src/serializers/index.ts
rename to packages/kbn-jest-serializers/src/index.ts
index 44db5fb56a9f7..134f97da3ed82 100644
--- a/packages/kbn-dev-utils/src/serializers/index.ts
+++ b/packages/kbn-jest-serializers/src/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-export * from './absolute_path_serializer';
-export * from './strip_ansi_serializer';
-export * from './recursive_serializer';
-export * from './any_instance_serizlizer';
-export * from './replace_serializer';
+export { createAbsolutePathSerializer } from './absolute_path_serializer';
+export { createStripAnsiSerializer } from './strip_ansi_serializer';
+export { createRecursiveSerializer } from './recursive_serializer';
+export { createAnyInstanceSerializer } from './any_instance_serizlizer';
+export { createReplaceSerializer } from './replace_serializer';
diff --git a/packages/kbn-dev-utils/src/serializers/recursive_serializer.ts b/packages/kbn-jest-serializers/src/recursive_serializer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/serializers/recursive_serializer.ts
rename to packages/kbn-jest-serializers/src/recursive_serializer.ts
diff --git a/packages/kbn-dev-utils/src/serializers/replace_serializer.ts b/packages/kbn-jest-serializers/src/replace_serializer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/serializers/replace_serializer.ts
rename to packages/kbn-jest-serializers/src/replace_serializer.ts
diff --git a/packages/kbn-dev-utils/src/serializers/strip_ansi_serializer.ts b/packages/kbn-jest-serializers/src/strip_ansi_serializer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/serializers/strip_ansi_serializer.ts
rename to packages/kbn-jest-serializers/src/strip_ansi_serializer.ts
diff --git a/packages/kbn-jest-serializers/tsconfig.json b/packages/kbn-jest-serializers/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-jest-serializers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-kibana-json-schema/BUILD.bazel b/packages/kbn-kibana-json-schema/BUILD.bazel
new file mode 100644
index 0000000000000..ff863dd7d6d0a
--- /dev/null
+++ b/packages/kbn-kibana-json-schema/BUILD.bazel
@@ -0,0 +1,117 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-kibana-json-schema"
+PKG_REQUIRE_NAME = "@kbn/kibana-json-schema"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//dedent",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/dedent",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//json-schema-typed"
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-kibana-json-schema/README.md b/packages/kbn-kibana-json-schema/README.md
new file mode 100644
index 0000000000000..f1edda001081b
--- /dev/null
+++ b/packages/kbn-kibana-json-schema/README.md
@@ -0,0 +1,3 @@
+# @kbn/kibana-json-schema
+
+The JSON Schema used for kibana.json files
\ No newline at end of file
diff --git a/packages/kbn-kibana-json-schema/jest.config.js b/packages/kbn-kibana-json-schema/jest.config.js
new file mode 100644
index 0000000000000..00bc8f55adc57
--- /dev/null
+++ b/packages/kbn-kibana-json-schema/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-kibana-json-schema'],
+};
diff --git a/packages/kbn-kibana-json-schema/package.json b/packages/kbn-kibana-json-schema/package.json
new file mode 100644
index 0000000000000..12df4c2d199a2
--- /dev/null
+++ b/packages/kbn-kibana-json-schema/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/kibana-json-schema",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
diff --git a/packages/kbn-dev-utils/src/stdio/index.ts b/packages/kbn-kibana-json-schema/src/index.ts
similarity index 83%
rename from packages/kbn-dev-utils/src/stdio/index.ts
rename to packages/kbn-kibana-json-schema/src/index.ts
index cdbd1808db255..57d8be3e215e6 100644
--- a/packages/kbn-dev-utils/src/stdio/index.ts
+++ b/packages/kbn-kibana-json-schema/src/index.ts
@@ -6,5 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from './observe_lines';
-export * from './observe_readable';
+export { KibanaJsonSchema } from './kibana_json_schema';
diff --git a/packages/kbn-kibana-json-schema/src/kibana_json_schema.ts b/packages/kbn-kibana-json-schema/src/kibana_json_schema.ts
new file mode 100644
index 0000000000000..40686a9230cc6
--- /dev/null
+++ b/packages/kbn-kibana-json-schema/src/kibana_json_schema.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { JSONSchema } from 'json-schema-typed';
+import dedent from 'dedent';
+
+export const KibanaJsonSchema: JSONSchema = {
+  type: 'object',
+  required: ['id', 'version', 'owner'],
+  properties: {
+    id: {
+      description: dedent`
+        Identifier of the plugin. Must be a string in camelCase. Part of a plugin
+        public contract. Other plugins leverage it to access plugin API, navigate
+        to the plugin, etc.
+      `,
+      type: 'string',
+      pattern: '^[a-z]{1}([a-zA-Z0-9]{1,})$',
+    },
+    version: {
+      description: 'Version of the plugin.',
+      type: 'string',
+      pattern: '^(kibana|v?\\d+(\\.\\d+){0,2})$',
+    },
+    kibanaVersion: {
+      description: dedent`
+        The version of Kibana the plugin is compatible with, defaults to the value of the version field.
+      `,
+      type: 'string',
+      pattern: '^(kibana|)$',
+    },
+    type: {
+      description: 'Type of the plugin, defaults to `standard`.',
+      enum: ['standard', 'preboot'],
+    },
+    configPath: {
+      description:
+        'Root configuration path used by the plugin, defaults to "id" in snake_case format.',
+      oneOf: [
+        { type: 'string' },
+        {
+          type: 'array',
+          items: { type: 'string' },
+        },
+      ],
+    },
+    requiredPlugins: {
+      description: dedent`
+        An optional list of the other plugins that MUST BE installed and enabled for this
+        plugin to function properly.
+      `,
+      type: 'array',
+      items: { type: 'string' },
+    },
+    optionalPlugins: {
+      description: dedent`
+        An optional list of the other plugins that if installed and enabled **may be**
+        leveraged by this plugin for some additional functionality but otherwise are
+        not required for this plugin to work properly.
+      `,
+      type: 'array',
+      items: { type: 'string' },
+    },
+    requiredBundles: {
+      description: dedent`
+        An optional list of the other plugins that if installed and enabled MAY BE leveraged
+        by this plugin for some additional functionality but otherwise are not required for
+        this plugin to work properly.
+
+        The plugins listed here will be loaded in the browser, even if the plugin is
+        disabled. Required by \`@kbn/optimizer\` to support cross-plugin imports.
+        "core" and plugins already listed in \`requiredPlugins\` do not need to be
+        duplicated here.
+      `,
+      type: 'array',
+      items: { type: 'string' },
+    },
+    ui: {
+      description: dedent`
+        Specifies whether plugin includes some client/browser specific functionality
+        that should be included into client bundle via \`public/ui_plugin.js\` file.
+      `,
+      type: 'boolean',
+    },
+    server: {
+      description: dedent`
+        Specifies whether plugin includes some server-side specific functionality.
+      `,
+      type: 'boolean',
+    },
+    extraPublicDirs: {
+      description: dedent`
+        Specifies directory names that can be imported by other ui-plugins built
+        using the same instance of the @kbn/optimizer. A temporary measure we plan
+        to replace with better mechanisms for sharing static code between plugins
+        @deprecated To be deleted when https://github.com/elastic/kibana/issues/101948 is done.
+      `,
+      type: 'array',
+      items: { type: 'string' },
+    },
+    serviceFolders: {
+      description: dedent`
+        Only used for the automatically generated API documentation. Specifying service
+        folders will cause your plugin API reference to be broken up into sub sections.
+      `,
+      type: 'array',
+      items: { type: 'string' },
+    },
+    owner: {
+      type: 'object',
+      required: ['name'],
+      properties: {
+        name: {
+          description: 'The name of the team that currently owns this plugin.',
+          type: 'string',
+        },
+        githubTeam: {
+          description: dedent`
+            All internal plugins should have a github team specified. GitHub teams can be
+            viewed here: https://github.com/orgs/elastic/teams
+          `,
+          type: 'string',
+        },
+      },
+    },
+    description: {
+      description: dedent`
+        A brief description of what this plugin does and any capabilities it provides.
+      `,
+      type: 'string',
+    },
+    enabledOnAnonymousPages: {
+      description: dedent`
+        Specifies whether this plugin - and its required dependencies - will be enabled for anonymous pages (login page, status page when
+        configured, etc.) Default is false.
+      `,
+      type: 'boolean',
+    },
+  },
+};
diff --git a/packages/kbn-kibana-json-schema/tsconfig.json b/packages/kbn-kibana-json-schema/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-kibana-json-schema/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-mapbox-gl/src/index.ts b/packages/kbn-mapbox-gl/src/index.ts
index 3b31aec0011f3..481702b15771b 100644
--- a/packages/kbn-mapbox-gl/src/index.ts
+++ b/packages/kbn-mapbox-gl/src/index.ts
@@ -8,51 +8,56 @@
 
 import type {
   Map,
+  LayerSpecification,
+  Source,
   GeoJSONSource,
-  VectorSource,
-  Layer,
-  AnyLayer,
-  FeatureIdentifier,
-  Style,
-  MapboxOptions,
+  VectorTileSource,
+  StyleSpecification,
+  MapEvent,
+  MapOptions,
   MapMouseEvent,
   MapSourceDataEvent,
   LngLat,
   LngLatBounds,
+  Point2D,
   PointLike,
-  MapboxGeoJSONFeature,
-  Point,
+  MapGeoJSONFeature,
   CustomLayerInterface,
+  FilterSpecification,
+  FeatureIdentifier,
 } from 'maplibre-gl';
+
 // @ts-expect-error
-import mapboxglDist from 'maplibre-gl/dist/maplibre-gl-csp';
+import maplibreglDist from 'maplibre-gl/dist/maplibre-gl-csp';
 // @ts-expect-error
 import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js';
 // @ts-expect-error
 import mbWorkerUrl from '!!file-loader!maplibre-gl/dist/maplibre-gl-csp-worker';
 import 'maplibre-gl/dist/maplibre-gl.css';
 
-const mapboxgl: any = mapboxglDist;
-mapboxgl.workerUrl = mbWorkerUrl;
-mapboxgl.setRTLTextPlugin(mbRtlPlugin);
+const maplibregl: any = maplibreglDist;
+maplibregl.workerUrl = mbWorkerUrl;
+maplibregl.setRTLTextPlugin(mbRtlPlugin);
 
-export { mapboxgl };
+export { maplibregl };
 
 export type {
   Map,
+  LayerSpecification,
+  StyleSpecification,
+  Source,
   GeoJSONSource,
-  VectorSource,
-  Layer,
-  AnyLayer,
-  FeatureIdentifier,
-  Style,
-  MapboxOptions,
+  VectorTileSource,
+  MapEvent,
+  MapOptions,
   MapMouseEvent,
   MapSourceDataEvent,
   LngLat,
   LngLatBounds,
+  Point2D,
   PointLike,
-  MapboxGeoJSONFeature,
-  Point,
+  MapGeoJSONFeature,
   CustomLayerInterface,
+  FilterSpecification,
+  FeatureIdentifier,
 };
diff --git a/packages/kbn-optimizer/BUILD.bazel b/packages/kbn-optimizer/BUILD.bazel
index 057e00066ddfa..94da078df54b2 100644
--- a/packages/kbn-optimizer/BUILD.bazel
+++ b/packages/kbn-optimizer/BUILD.bazel
@@ -38,6 +38,7 @@ RUNTIME_DEPS = [
   "//packages/kbn-ui-shared-deps-npm",
   "//packages/kbn-ui-shared-deps-src",
   "//packages/kbn-utils",
+  "//packages/kbn-synthetic-package-map",
   "@npm//@babel/core",
   "@npm//chalk",
   "@npm//clean-webpack-plugin",
@@ -70,6 +71,7 @@ TYPES_DEPS = [
   "//packages/kbn-ui-shared-deps-npm:npm_module_types",
   "//packages/kbn-ui-shared-deps-src:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-synthetic-package-map:npm_module_types",
   "@npm//chalk",
   "@npm//clean-webpack-plugin",
   "@npm//cpy",
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index ebab8e61a2268..98089f1f1c5fb 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -3,7 +3,7 @@ pageLoadAssetSize:
   alerting: 106936
   apm: 64385
   canvas: 1066647
-  charts: 95000
+  charts: 55000
   cloud: 21076
   console: 46091
   core: 435325
@@ -30,7 +30,7 @@ pageLoadAssetSize:
   inputControlVis: 172675
   inspector: 148711
   kibanaOverview: 56279
-  lens: 96624
+  lens: 35000
   licenseManagement: 41817
   licensing: 29004
   lists: 22900
@@ -56,9 +56,8 @@ pageLoadAssetSize:
   telemetry: 51957
   telemetryManagementSection: 38586
   transform: 41007
-  triggersActionsUi: 102400
+  triggersActionsUi: 103400
   upgradeAssistant: 81241
-  uptime: 40825
   urlForwarding: 32579
   usageCollection: 39762
   visDefaultEditor: 50178
@@ -116,15 +115,16 @@ pageLoadAssetSize:
   reporting: 57003
   visTypeHeatmap: 25340
   expressionGauge: 25000
-  controls: 34788
+  controls: 40000
   expressionPartitionVis: 26338
   sharedUX: 16225
   ux: 20784
   sessionView: 77750
   cloudSecurityPosture: 19109
   visTypeGauge: 24113
-  unifiedSearch: 49195
+  unifiedSearch: 104869
   data: 454087
   expressionXY: 26500
   eventAnnotation: 19334
   screenshotting: 22870
+  synthetics: 40958
diff --git a/packages/kbn-optimizer/src/cli.ts b/packages/kbn-optimizer/src/cli.ts
index 5dba6305d5bb2..6da282b8995db 100644
--- a/packages/kbn-optimizer/src/cli.ts
+++ b/packages/kbn-optimizer/src/cli.ts
@@ -68,6 +68,11 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
         throw createFlagError('expected --no-examples to have no value');
       }
 
+      const testPlugins = flags['test-plugins'] ?? false;
+      if (typeof testPlugins !== 'boolean') {
+        throw createFlagError('expected --test-plugins to have no value');
+      }
+
       const profileWebpack = flags.profile ?? false;
       if (typeof profileWebpack !== 'boolean') {
         throw createFlagError('expected --profile to have no value');
@@ -133,6 +138,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
         dist: dist || updateLimits,
         cache,
         examples: examples && !(validateLimits || updateLimits),
+        testPlugins: testPlugins && !(validateLimits || updateLimits),
         profileWebpack,
         extraPluginScanDirs,
         inspectWorkers,
@@ -173,6 +179,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
           'watch',
           'oss',
           'examples',
+          'test-plugins',
           'dist',
           'cache',
           'profile',
@@ -202,6 +209,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
           --focus            just like --filter, except dependencies are automatically included, --filter applies to result
           --filter           comma-separated list of bundle id filters, results from multiple flags are merged, * and ! are supported
           --no-examples      don't build the example plugins
+          --test-plugins     build test plugins too
           --dist             create bundles that are suitable for inclusion in the Kibana distributable, enabled when running with --update-limits
           --scan-dir         add a directory to the list of directories scanned for plugins (specify as many times as necessary)
           --no-inspect-workers  when inspecting the parent process, don't inspect the workers
diff --git a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
index 767069e3a295f..e83fb083e9868 100644
--- a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
+++ b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
@@ -16,8 +16,9 @@ import cpy from 'cpy';
 import del from 'del';
 import { tap, filter } from 'rxjs/operators';
 import { REPO_ROOT } from '@kbn/utils';
-import { ToolingLog, createReplaceSerializer } from '@kbn/dev-utils';
-import { runOptimizer, OptimizerConfig, OptimizerUpdate, logOptimizerState } from '../index';
+import { ToolingLog } from '@kbn/tooling-log';
+import { createReplaceSerializer } from '@kbn/jest-serializers';
+import { runOptimizer, OptimizerConfig, OptimizerUpdate, logOptimizerState } from '..';
 
 import { allValuesFrom } from '../common';
 
diff --git a/packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts b/packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts
index 99f0c0bd9696e..bfec5800abebe 100644
--- a/packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts
+++ b/packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts
@@ -10,7 +10,7 @@ import Path from 'path';
 
 import cpy from 'cpy';
 import del from 'del';
-import { createAbsolutePathSerializer, createStripAnsiSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer, createStripAnsiSerializer } from '@kbn/jest-serializers';
 
 import { OptimizerConfig } from '../optimizer/optimizer_config';
 import { allValuesFrom, Bundle, Hashes, ParsedDllManifest } from '../common';
diff --git a/packages/kbn-optimizer/src/integration_tests/optimizer_built_paths.test.ts b/packages/kbn-optimizer/src/integration_tests/optimizer_built_paths.test.ts
index c5ac22e2faa9b..164a855e76896 100644
--- a/packages/kbn-optimizer/src/integration_tests/optimizer_built_paths.test.ts
+++ b/packages/kbn-optimizer/src/integration_tests/optimizer_built_paths.test.ts
@@ -8,7 +8,7 @@
 
 // @ts-expect-error
 import { getOptimizerBuiltPaths } from '@kbn/optimizer/target_node/optimizer/optimizer_built_paths';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer());
 
diff --git a/packages/kbn-optimizer/src/limits.ts b/packages/kbn-optimizer/src/limits.ts
index b2f8b6fda6c6f..a63012f37a52e 100644
--- a/packages/kbn-optimizer/src/limits.ts
+++ b/packages/kbn-optimizer/src/limits.ts
@@ -11,7 +11,9 @@ import Path from 'path';
 
 import dedent from 'dedent';
 import Yaml from 'js-yaml';
-import { createFailError, ToolingLog, CiStatsMetric } from '@kbn/dev-utils';
+import { createFailError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { CiStatsMetric } from '@kbn/ci-stats-reporter';
 
 import { OptimizerConfig, Limits } from './optimizer';
 
diff --git a/packages/kbn-optimizer/src/log_optimizer_progress.ts b/packages/kbn-optimizer/src/log_optimizer_progress.ts
index d07c9dc6eff32..a4ad2d16d17c3 100644
--- a/packages/kbn-optimizer/src/log_optimizer_progress.ts
+++ b/packages/kbn-optimizer/src/log_optimizer_progress.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import * as Rx from 'rxjs';
 import { tap } from 'rxjs/operators';
 
diff --git a/packages/kbn-optimizer/src/log_optimizer_state.ts b/packages/kbn-optimizer/src/log_optimizer_state.ts
index 060f05a445eb5..6271ab17e1e2d 100644
--- a/packages/kbn-optimizer/src/log_optimizer_state.ts
+++ b/packages/kbn-optimizer/src/log_optimizer_state.ts
@@ -8,7 +8,7 @@
 
 import { inspect } from 'util';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { tap } from 'rxjs/operators';
 
 import { OptimizerConfig } from './optimizer';
diff --git a/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts b/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts
index e4cdddbf56dcb..fd8c6b9c37f27 100644
--- a/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { getPluginBundles } from './get_plugin_bundles';
 
diff --git a/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.test.ts b/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.test.ts
index ff3b7cd8c6174..2b95b5ccc5c04 100644
--- a/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.test.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { findKibanaPlatformPlugins } from './kibana_platform_plugins';
 
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
index 3670a6af2cbe5..1cfc1b184d87a 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
@@ -7,11 +7,19 @@
  */
 
 import { REPO_ROOT } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { getOptimizerCacheKey } from './optimizer_cache_key';
 import { OptimizerConfig } from './optimizer_config';
 
+jest.mock('@kbn/synthetic-package-map', () => {
+  return {
+    readHashOfPackageMap() {
+      return '<hash of package map>';
+    },
+  };
+});
+
 jest.mock('../common/hashes', () => {
   return {
     Hashes: class MockHashes {
@@ -68,6 +76,7 @@ describe('getOptimizerCacheKey()', () => {
         "checksums": Object {
           "foo": "bar",
         },
+        "synthPackages": "<hash of package map>",
         "workerConfig": Object {
           "browserslistEnv": "dev",
           "dist": false,
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts
index 1c955e18c10ce..586846653802c 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { readHashOfPackageMap } from '@kbn/synthetic-package-map';
+
 import { CacheableWorkerConfig, Hashes } from '../common';
 import { OptimizerConfig } from './optimizer_config';
 import { getOptimizerBuiltPaths } from './optimizer_built_paths';
@@ -13,6 +15,7 @@ import { getOptimizerBuiltPaths } from './optimizer_built_paths';
 export interface OptimizerCacheKey {
   readonly workerConfig: CacheableWorkerConfig;
   readonly checksums: Record<string, string>;
+  readonly synthPackages: string;
 }
 
 /**
@@ -25,5 +28,6 @@ export async function getOptimizerCacheKey(config: OptimizerConfig): Promise<Opt
   return {
     checksums: hashes.cacheToJson(),
     workerConfig: config.getCacheableWorkerConfig(),
+    synthPackages: readHashOfPackageMap(),
   };
 }
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
index dff389f2e0de2..ccee62e7f1e50 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-jest.mock('./assign_bundles_to_workers.ts');
-jest.mock('./kibana_platform_plugins.ts');
-jest.mock('./get_plugin_bundles.ts');
-jest.mock('../common/theme_tags.ts');
-jest.mock('./filter_by_id.ts');
+jest.mock('./assign_bundles_to_workers');
+jest.mock('./kibana_platform_plugins');
+jest.mock('./get_plugin_bundles');
+jest.mock('../common/theme_tags');
+jest.mock('./filter_by_id');
 jest.mock('./focus_bundles');
-jest.mock('../limits.ts');
+jest.mock('../limits');
 
 jest.mock('os', () => {
   const realOs = jest.requireActual('os');
@@ -24,7 +24,7 @@ jest.mock('os', () => {
 
 import Path from 'path';
 import { REPO_ROOT } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { OptimizerConfig, ParsedOptions } from './optimizer_config';
 import { parseThemeTags } from '../common';
@@ -381,15 +381,15 @@ describe('OptimizerConfig::parseOptions()', () => {
  */
 describe('OptimizerConfig::create()', () => {
   const assignBundlesToWorkers: jest.Mock = jest.requireMock(
-    './assign_bundles_to_workers.ts'
+    './assign_bundles_to_workers'
   ).assignBundlesToWorkers;
   const findKibanaPlatformPlugins: jest.Mock = jest.requireMock(
-    './kibana_platform_plugins.ts'
+    './kibana_platform_plugins'
   ).findKibanaPlatformPlugins;
-  const getPluginBundles: jest.Mock = jest.requireMock('./get_plugin_bundles.ts').getPluginBundles;
-  const filterById: jest.Mock = jest.requireMock('./filter_by_id.ts').filterById;
+  const getPluginBundles: jest.Mock = jest.requireMock('./get_plugin_bundles').getPluginBundles;
+  const filterById: jest.Mock = jest.requireMock('./filter_by_id').filterById;
   const focusBundles: jest.Mock = jest.requireMock('./focus_bundles').focusBundles;
-  const readLimits: jest.Mock = jest.requireMock('../limits.ts').readLimits;
+  const readLimits: jest.Mock = jest.requireMock('../limits').readLimits;
 
   beforeEach(() => {
     if ('mock' in OptimizerConfig.parseOptions) {
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
index 13c82260d34ff..3a5cea4cb8f12 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import Os from 'os';
-import { getPluginSearchPaths } from '@kbn/config';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 
 import {
   Bundle,
@@ -109,6 +109,9 @@ interface Options {
 
   /** path to a limits.yml file that should be used to inform ci-stats of metric limits */
   limitsPath?: string;
+
+  /** discover and build test plugins along with the standard plugins */
+  testPlugins?: boolean;
 }
 
 export interface ParsedOptions {
@@ -136,6 +139,7 @@ export class OptimizerConfig {
     const examples = !!options.examples;
     const profileWebpack = !!options.profileWebpack;
     const inspectWorkers = !!options.inspectWorkers;
+    const testPlugins = !!options.testPlugins;
     const cache = options.cache !== false && !process.env.KBN_OPTIMIZER_NO_CACHE;
     const includeCoreBundle = !!options.includeCoreBundle;
     const filters = options.filter || [];
@@ -157,6 +161,7 @@ export class OptimizerConfig {
         rootDir: repoRoot,
         oss,
         examples,
+        testPlugins,
       });
 
     if (!pluginScanDirs.every((p) => Path.isAbsolute(p))) {
diff --git a/packages/kbn-optimizer/src/report_optimizer_timings.ts b/packages/kbn-optimizer/src/report_optimizer_timings.ts
index e57d0b9a641c6..2102821c80e2c 100644
--- a/packages/kbn-optimizer/src/report_optimizer_timings.ts
+++ b/packages/kbn-optimizer/src/report_optimizer_timings.ts
@@ -7,7 +7,8 @@
  */
 
 import { concatMap } from 'rxjs/operators';
-import { CiStatsReporter, ToolingLog } from '@kbn/dev-utils';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { OptimizerConfig } from './optimizer';
 import { OptimizerUpdate$ } from './run_optimizer';
diff --git a/packages/kbn-optimizer/src/worker/bundle_metrics_plugin.ts b/packages/kbn-optimizer/src/worker/bundle_metrics_plugin.ts
index d9e1bee22557b..ac1bcb02a0349 100644
--- a/packages/kbn-optimizer/src/worker/bundle_metrics_plugin.ts
+++ b/packages/kbn-optimizer/src/worker/bundle_metrics_plugin.ts
@@ -10,7 +10,7 @@ import Path from 'path';
 
 import webpack from 'webpack';
 import { RawSource } from 'webpack-sources';
-import { CiStatsMetric } from '@kbn/dev-utils';
+import { CiStatsMetric } from '@kbn/ci-stats-reporter';
 
 import { Bundle } from '../common';
 
diff --git a/packages/kbn-plugin-discovery/src/plugin_search_paths.ts b/packages/kbn-plugin-discovery/src/plugin_search_paths.ts
index fe6f0a44b044e..5d46c0c8de868 100644
--- a/packages/kbn-plugin-discovery/src/plugin_search_paths.ts
+++ b/packages/kbn-plugin-discovery/src/plugin_search_paths.ts
@@ -12,9 +12,10 @@ export interface SearchOptions {
   rootDir: string;
   oss: boolean;
   examples: boolean;
+  testPlugins?: boolean;
 }
 
-export function getPluginSearchPaths({ rootDir, oss, examples }: SearchOptions) {
+export function getPluginSearchPaths({ rootDir, oss, examples, testPlugins }: SearchOptions) {
   return [
     resolve(rootDir, 'src', 'plugins'),
     ...(oss ? [] : [resolve(rootDir, 'x-pack', 'plugins')]),
@@ -22,5 +23,25 @@ export function getPluginSearchPaths({ rootDir, oss, examples }: SearchOptions)
     ...(examples ? [resolve(rootDir, 'examples')] : []),
     ...(examples && !oss ? [resolve(rootDir, 'x-pack', 'examples')] : []),
     resolve(rootDir, '..', 'kibana-extra'),
+    ...(testPlugins
+      ? [
+          resolve(rootDir, 'test/analytics/__fixtures__/plugins'),
+          resolve(rootDir, 'test/plugin_functional/plugins'),
+          resolve(rootDir, 'test/interpreter_functional/plugins'),
+          resolve(rootDir, 'test/common/fixtures/plugins'),
+        ]
+      : []),
+    ...(testPlugins && !oss
+      ? [
+          resolve(rootDir, 'x-pack/test/plugin_functional/plugins'),
+          resolve(rootDir, 'x-pack/test/functional_with_es_ssl/fixtures/plugins'),
+          resolve(rootDir, 'x-pack/test/alerting_api_integration/plugins'),
+          resolve(rootDir, 'x-pack/test/plugin_api_integration/plugins'),
+          resolve(rootDir, 'x-pack/test/plugin_api_perf/plugins'),
+          resolve(rootDir, 'x-pack/test/licensing_plugin/plugins'),
+          resolve(rootDir, 'x-pack/test/usage_collection/plugins'),
+          resolve(rootDir, 'x-pack/test/security_functional/fixtures/common'),
+        ]
+      : []),
   ];
 }
diff --git a/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts b/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts
index 3b5a2bd272329..a9df7fdd2be90 100644
--- a/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts
+++ b/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts
@@ -11,7 +11,7 @@ import Path from 'path';
 import del from 'del';
 import execa from 'execa';
 import { REPO_ROOT } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 import globby from 'globby';
 
 const GENERATED_DIR = Path.resolve(REPO_ROOT, `plugins`);
diff --git a/packages/kbn-plugin-helpers/src/build_context.ts b/packages/kbn-plugin-helpers/src/build_context.ts
index 40bf1dfa3cd04..75ba365c8f4e1 100644
--- a/packages/kbn-plugin-helpers/src/build_context.ts
+++ b/packages/kbn-plugin-helpers/src/build_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { Plugin } from './load_kibana_platform_plugin';
 import { Config } from './config';
diff --git a/packages/kbn-plugin-helpers/src/config.ts b/packages/kbn-plugin-helpers/src/config.ts
index 6c41ba7ac019c..c398bc9bd6d87 100644
--- a/packages/kbn-plugin-helpers/src/config.ts
+++ b/packages/kbn-plugin-helpers/src/config.ts
@@ -10,7 +10,7 @@ import Path from 'path';
 
 import loadJsonFile from 'load-json-file';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Plugin } from './load_kibana_platform_plugin';
 
 export interface Config {
diff --git a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
index 2d7664aa13326..9df98159c4e4d 100644
--- a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
+++ b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
@@ -11,7 +11,7 @@ import Fs from 'fs';
 
 import execa from 'execa';
 import { REPO_ROOT } from '@kbn/utils';
-import { createStripAnsiSerializer, createReplaceSerializer } from '@kbn/dev-utils';
+import { createStripAnsiSerializer, createReplaceSerializer } from '@kbn/jest-serializers';
 import extract from 'extract-zip';
 import del from 'del';
 import globby from 'globby';
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 84e8b95e6ad1c..32171e030d91a 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -82,15955 +82,15496 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ 	return __webpack_require__(__webpack_require__.s = "./src/index.ts");
 /******/ })
 /************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/******/ ({
+
+/***/ "../../node_modules/@babel/code-frame/lib/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__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__(591);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildBazelProductionProjects"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildNonBazelProductionProjects"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.codeFrameColumns = codeFrameColumns;
+exports.default = _default;
 
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(461);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return _utils_projects__WEBPACK_IMPORTED_MODULE_2__["getProjects"]; });
+var _highlight = __webpack_require__("../../node_modules/@babel/highlight/lib/index.js");
 
-/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(463);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; });
+let deprecationWarningShown = false;
 
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(464);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "transformDependencies", function() { return _utils_package_json__WEBPACK_IMPORTED_MODULE_4__["transformDependencies"]; });
+function getDefs(chalk) {
+  return {
+    gutter: chalk.grey,
+    marker: chalk.red.bold,
+    message: chalk.red.bold
+  };
+}
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(590);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
+const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+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, end).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];
 
-/***/ }),
-/* 1 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (hasMarker) {
+      let markerLine = "";
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "run", function() { return run; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
-/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(getopts__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5);
-/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(250);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(585);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(341);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+      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.length > 0 ? ` ${line}` : "", markerLine].join("");
+    } else {
+      return ` ${maybeHighlight(defs.gutter, gutter)}${line.length > 0 ? ` ${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);
+}
 
-function help() {
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      usage: kbn <command> [<args>]
+/***/ }),
 
-      By default commands are run for Kibana itself, all packages in the 'packages/'
-      folder and for all plugins in './plugins' and '../kibana-extra'.
+/***/ "../../node_modules/@babel/helper-validator-identifier/lib/identifier.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      Available commands:
+"use strict";
 
-        ${Object.values(_commands__WEBPACK_IMPORTED_MODULE_4__["commands"]).map(command => `${command.name} - ${command.description}`).join('\n        ')}
 
-      Global options:
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isIdentifierChar = isIdentifierChar;
+exports.isIdentifierName = isIdentifierName;
+exports.isIdentifierStart = isIdentifierStart;
+let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088e\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ca\ua7d0\ua7d1\ua7d3\ua7d5-\ua7d9\ua7f2-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
+let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0898-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1ace\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
+const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
+const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
+nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
+const astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1070, 4050, 582, 8634, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 46, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 482, 44, 11, 6, 17, 0, 322, 29, 19, 43, 1269, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4152, 8, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
+const astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 
-        -e, --exclude           Exclude specified project. Can be specified multiple times to exclude multiple projects, e.g. '-e kibana -e @kbn/pm'.
-        -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 kbn packages bootstrap cache
-        --no-validate           Disable the bootstrap yarn.lock validation
-        --force-install         Forces yarn install to run on bootstrap
-        --offline               Run in offline mode
-        --verbose               Set log level to verbose
-        --debug                 Set log level to debug
-        --quiet                 Set log level to error
-        --silent                Disable log output
+function isInAstralSet(code, set) {
+  let pos = 0x10000;
 
-      "run" options:
-        --skip-missing          Ignore packages which don't have the requested script
-    ` + '\n');
+  for (let i = 0, length = set.length; i < length; i += 2) {
+    pos += set[i];
+    if (pos > code) return false;
+    pos += set[i + 1];
+    if (pos >= code) return true;
+  }
+
+  return false;
 }
 
-async function run(argv) {
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].setLogLevel(Object(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__["pickLevelFromFlags"])(getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
-    boolean: ['verbose', 'debug', 'quiet', 'silent', 'skip-missing']
-  }))); // We can simplify this setup (and remove this extra handling) once Yarn
-  // starts forwarding the `--` directly to this script, see
-  // https://github.com/yarnpkg/yarn/blob/b2d3e1a8fe45ef376b716d597cc79b38702a9320/src/cli/index.js#L174-L182
+function isIdentifierStart(code) {
+  if (code < 65) return code === 36;
+  if (code <= 90) return true;
+  if (code < 97) return code === 95;
+  if (code <= 122) return true;
 
-  if (argv.includes('--')) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].error(`Using "--" is not allowed, as it doesn't work with 'yarn kbn'.`);
-    process.exit(1);
+  if (code <= 0xffff) {
+    return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
   }
 
-  const options = getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
-    alias: {
-      e: 'exclude',
-      h: 'help',
-      i: 'include'
-    },
-    default: {
-      cache: true,
-      'force-install': false,
-      offline: false,
-      validate: true
-    },
-    boolean: ['cache', 'force-install', 'offline', 'validate']
-  });
-  const args = options._;
+  return isInAstralSet(code, astralIdentifierStartCodes);
+}
 
-  if (options.help || args.length === 0) {
-    help();
-    return;
-  } // This `rootPath` is relative to `./dist/` as that's the location of the
-  // built version of this tool.
+function isIdentifierChar(code) {
+  if (code < 48) return code === 36;
+  if (code < 58) return true;
+  if (code < 65) return false;
+  if (code <= 90) return true;
+  if (code < 97) return code === 95;
+  if (code <= 122) return true;
 
+  if (code <= 0xffff) {
+    return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
+  }
 
-  const rootPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(__dirname, '../../../');
-  const commandName = args[0];
-  const extraArgs = args.slice(1);
-  const commandOptions = {
-    options,
-    extraArgs,
-    rootPath
-  };
-  const command = _commands__WEBPACK_IMPORTED_MODULE_4__["commands"][commandName];
+  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes);
+}
 
-  if (command === undefined) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].error(`[${commandName}] is not a valid command, see 'kbn --help'`);
-    process.exit(1);
+function isIdentifierName(name) {
+  let isFirst = true;
+
+  for (let i = 0; i < name.length; i++) {
+    let cp = name.charCodeAt(i);
+
+    if ((cp & 0xfc00) === 0xd800 && i + 1 < name.length) {
+      const trail = name.charCodeAt(++i);
+
+      if ((trail & 0xfc00) === 0xdc00) {
+        cp = 0x10000 + ((cp & 0x3ff) << 10) + (trail & 0x3ff);
+      }
+    }
+
+    if (isFirst) {
+      isFirst = false;
+
+      if (!isIdentifierStart(cp)) {
+        return false;
+      }
+    } else if (!isIdentifierChar(cp)) {
+      return false;
+    }
   }
 
-  await Object(_run__WEBPACK_IMPORTED_MODULE_5__["runCommand"])(command, commandOptions);
+  return !isFirst;
 }
 
 /***/ }),
-/* 2 */
+
+/***/ "../../node_modules/@babel/helper-validator-identifier/lib/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-function dedent(strings) {
-
-  var raw = void 0;
-  if (typeof strings === "string") {
-    // dedent can be used as a plain function
-    raw = [strings];
-  } else {
-    raw = strings.raw;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "isIdentifierChar", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierChar;
+  }
+});
+Object.defineProperty(exports, "isIdentifierName", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierName;
   }
+});
+Object.defineProperty(exports, "isIdentifierStart", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierStart;
+  }
+});
+Object.defineProperty(exports, "isKeyword", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isKeyword;
+  }
+});
+Object.defineProperty(exports, "isReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictBindOnlyReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictBindOnlyReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictBindReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictBindReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictReservedWord;
+  }
+});
 
-  // first, perform interpolation
-  var result = "";
-  for (var i = 0; i < raw.length; i++) {
-    result += raw[i].
-    // join lines when there is a suppressed newline
-    replace(/\\\n[ \t]*/g, "").
+var _identifier = __webpack_require__("../../node_modules/@babel/helper-validator-identifier/lib/identifier.js");
 
-    // handle escaped backticks
-    replace(/\\`/g, "`");
+var _keyword = __webpack_require__("../../node_modules/@babel/helper-validator-identifier/lib/keyword.js");
 
-    if (i < (arguments.length <= 1 ? 0 : arguments.length - 1)) {
-      result += arguments.length <= i + 1 ? undefined : arguments[i + 1];
-    }
-  }
+/***/ }),
 
-  // now strip indentation
-  var lines = result.split("\n");
-  var mindent = null;
-  lines.forEach(function (l) {
-    var m = l.match(/^(\s+)\S+/);
-    if (m) {
-      var indent = m[1].length;
-      if (!mindent) {
-        // this is the first indented line
-        mindent = indent;
-      } else {
-        mindent = Math.min(mindent, indent);
-      }
-    }
-  });
+/***/ "../../node_modules/@babel/helper-validator-identifier/lib/keyword.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (mindent !== null) {
-    result = lines.map(function (l) {
-      return l[0] === " " ? l.slice(mindent) : l;
-    }).join("\n");
-  }
+"use strict";
 
-  // dedent eats leading and trailing whitespace too
-  result = result.trim();
 
-  // handle escaped newlines at the end to ensure they don't get stripped too
-  return result.replace(/\\n/g, "\n");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isKeyword = isKeyword;
+exports.isReservedWord = isReservedWord;
+exports.isStrictBindOnlyReservedWord = isStrictBindOnlyReservedWord;
+exports.isStrictBindReservedWord = isStrictBindReservedWord;
+exports.isStrictReservedWord = isStrictReservedWord;
+const reservedWords = {
+  keyword: ["break", "case", "catch", "continue", "debugger", "default", "do", "else", "finally", "for", "function", "if", "return", "switch", "throw", "try", "var", "const", "while", "with", "new", "this", "super", "class", "extends", "export", "import", "null", "true", "false", "in", "instanceof", "typeof", "void", "delete"],
+  strict: ["implements", "interface", "let", "package", "private", "protected", "public", "static", "yield"],
+  strictBind: ["eval", "arguments"]
+};
+const keywords = new Set(reservedWords.keyword);
+const reservedWordsStrictSet = new Set(reservedWords.strict);
+const reservedWordsStrictBindSet = new Set(reservedWords.strictBind);
+
+function isReservedWord(word, inModule) {
+  return inModule && word === "await" || word === "enum";
 }
 
-if (true) {
-  module.exports = dedent;
+function isStrictReservedWord(word, inModule) {
+  return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
+}
+
+function isStrictBindOnlyReservedWord(word) {
+  return reservedWordsStrictBindSet.has(word);
+}
+
+function isStrictBindReservedWord(word, inModule) {
+  return isStrictReservedWord(word, inModule) || isStrictBindOnlyReservedWord(word);
 }
 
+function isKeyword(word) {
+  return keywords.has(word);
+}
 
 /***/ }),
-/* 3 */
+
+/***/ "../../node_modules/@babel/highlight/lib/index.js":
 /***/ (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
-}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = highlight;
+exports.getChalk = getChalk;
+exports.shouldHighlight = shouldHighlight;
 
-const parseAlias = function(aliases) {
-  let out = {},
-    key,
-    alias,
-    prev,
-    len,
-    any,
-    i,
-    k
+var _jsTokens = __webpack_require__("../../node_modules/@babel/highlight/node_modules/js-tokens/index.js");
 
-  for (key in aliases) {
-    any = aliases[key]
-    alias = out[key] = isArray(any) ? any : [any]
+var _helperValidatorIdentifier = __webpack_require__("../../node_modules/@babel/helper-validator-identifier/lib/index.js");
 
-    for (i = 0, len = alias.length; i < len; i++) {
-      prev = out[alias[i]] = [key]
+var _chalk = __webpack_require__("../../node_modules/@babel/highlight/node_modules/chalk/index.js");
 
-      for (k = 0; k < len; k++) {
-        if (i !== k) prev.push(alias[k])
-      }
-    }
-  }
+const sometimesKeywords = new Set(["as", "async", "from", "get", "of", "set"]);
 
-  return out
+function getDefs(chalk) {
+  return {
+    keyword: chalk.cyan,
+    capitalized: chalk.yellow,
+    jsxIdentifier: chalk.yellow,
+    punctuator: chalk.yellow,
+    number: chalk.magenta,
+    string: chalk.green,
+    regex: chalk.magenta,
+    comment: chalk.grey,
+    invalid: chalk.white.bgRed.bold
+  };
 }
 
-const parseDefault = function(aliases, defaults) {
-  let out = {},
-    key,
-    alias,
-    value,
-    len,
-    i
+const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+const BRACKET = /^[()[\]{}]$/;
+let tokenize;
+{
+  const JSX_TAG = /^[a-z][\w-]*$/i;
 
-  for (key in defaults) {
-    value = defaults[key]
-    alias = aliases[key]
+  const getTokenType = function (token, offset, text) {
+    if (token.type === "name") {
+      if ((0, _helperValidatorIdentifier.isKeyword)(token.value) || (0, _helperValidatorIdentifier.isStrictReservedWord)(token.value, true) || sometimesKeywords.has(token.value)) {
+        return "keyword";
+      }
 
-    out[key] = value
+      if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
+        return "jsxIdentifier";
+      }
 
-    if (alias === undefined) {
-      aliases[key] = EMPTYARR
-    } else {
-      for (i = 0, len = alias.length; i < len; i++) {
-        out[alias[i]] = value
+      if (token.value[0] !== token.value[0].toLowerCase()) {
+        return "capitalized";
       }
     }
-  }
-
-  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
-        }
-      }
+    if (token.type === "punctuator" && BRACKET.test(token.value)) {
+      return "bracket";
     }
-  }
 
-  return out
-}
+    if (token.type === "invalid" && (token.value === "@" || token.value === "#")) {
+      return "punctuator";
+    }
 
-const write = function(out, key, value, aliases, unknown) {
-  let i,
-    prev,
-    alias = aliases[key],
-    len = alias === undefined ? -1 : alias.length
+    return token.type;
+  };
 
-  if (len >= 0 || unknown === undefined || unknown(key)) {
-    prev = out[key]
+  tokenize = function* (text) {
+    let match;
 
-    if (prev === undefined) {
-      out[key] = value
-    } else {
-      if (isArray(prev)) {
-        prev.push(value)
-      } else {
-        out[key] = [prev, value]
-      }
-    }
+    while (match = _jsTokens.default.exec(text)) {
+      const token = _jsTokens.matchToToken(match);
 
-    for (i = 0; i < len; i++) {
-      out[alias[i]] = out[key]
+      yield {
+        type: getTokenType(token, match.index, text),
+        value: token.value
+      };
     }
-  }
+  };
 }
 
-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
+function highlightTokens(defs, text) {
+  let highlighted = "";
 
-  for (; i < len; i++) {
-    arg = argv[i]
+  for (const {
+    type,
+    value
+  } of tokenize(text)) {
+    const colorize = defs[type];
 
-    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)
+    if (colorize) {
+      highlighted += value.split(NEWLINE).map(str => colorize(str)).join("\n");
     } 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
-        )
-      }
+      highlighted += value;
     }
   }
 
-  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 highlighted;
+}
 
-  return out
+function shouldHighlight(options) {
+  return !!_chalk.supportsColor || options.forceColor;
 }
 
-module.exports = getopts
+function getChalk(options) {
+  return options.forceColor ? new _chalk.constructor({
+    enabled: true,
+    level: 1
+  }) : _chalk;
+}
 
+function highlight(code, options = {}) {
+  if (code !== "" && shouldHighlight(options)) {
+    const chalk = getChalk(options);
+    const defs = getDefs(chalk);
+    return highlightTokens(defs, code);
+  } else {
+    return code;
+  }
+}
 
 /***/ }),
-/* 4 */
-/***/ (function(module, exports) {
-
-module.exports = require("path");
 
-/***/ }),
-/* 5 */
+/***/ "../../node_modules/@babel/highlight/node_modules/ansi-styles/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__("../../node_modules/color-convert/index.js");
 
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ToolingLog", {
-  enumerable: true,
-  get: function () {
-    return _tooling_log.ToolingLog;
-  }
-});
-Object.defineProperty(exports, "ToolingLogCollectingWriter", {
-  enumerable: true,
-  get: function () {
-    return _tooling_log_collecting_writer.ToolingLogCollectingWriter;
-  }
-});
-Object.defineProperty(exports, "ToolingLogTextWriter", {
-  enumerable: true,
-  get: function () {
-    return _tooling_log_text_writer.ToolingLogTextWriter;
-  }
-});
-Object.defineProperty(exports, "parseLogLevel", {
-  enumerable: true,
-  get: function () {
-    return _log_levels.parseLogLevel;
-  }
-});
-Object.defineProperty(exports, "pickLevelFromFlags", {
-  enumerable: true,
-  get: function () {
-    return _log_levels.pickLevelFromFlags;
-  }
-});
+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`;
+};
 
-var _tooling_log = __webpack_require__(6);
+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],
 
-var _tooling_log_text_writer = __webpack_require__(233);
+			// 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],
 
-var _log_levels = __webpack_require__(248);
+			// 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 _tooling_log_collecting_writer = __webpack_require__(249);
+	// Fix humans
+	styles.color.grey = styles.color.gray;
 
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
 
-"use strict";
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
 
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
-var _interopRequireDefault = __webpack_require__(7);
+			group[styleName] = styles[styleName];
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ToolingLog = void 0;
+			codes.set(style[0], style[1]);
+		}
 
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(8));
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
 
-var Rx = _interopRequireWildcard(__webpack_require__(9));
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
 
-var _tooling_log_text_writer = __webpack_require__(233);
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-class ToolingLog {
-  constructor(writerConfig, options) {
-    (0, _defineProperty2.default)(this, "indentWidth$", void 0);
-    (0, _defineProperty2.default)(this, "writers$", void 0);
-    (0, _defineProperty2.default)(this, "written$", void 0);
-    (0, _defineProperty2.default)(this, "type", void 0);
-    this.indentWidth$ = options !== null && options !== void 0 && options.parent ? options.parent.indentWidth$ : new Rx.BehaviorSubject(0);
-    this.writers$ = options !== null && options !== void 0 && options.parent ? options.parent.writers$ : new Rx.BehaviorSubject([]);
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
 
-    if (!(options !== null && options !== void 0 && options.parent) && writerConfig) {
-      this.writers$.next([new _tooling_log_text_writer.ToolingLogTextWriter(writerConfig)]);
-    }
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
 
-    this.written$ = options !== null && options !== void 0 && options.parent ? options.parent.written$ : new Rx.Subject();
-    this.type = options === null || options === void 0 ? void 0 : options.type;
-  }
-  /**
-   * Get the current indentation level of the ToolingLog
-   */
+		const suite = colorConvert[key];
 
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
 
-  getIndent() {
-    return this.indentWidth$.getValue();
-  }
-  /**
-   * Indent the output of the ToolingLog by some character (4 is a good choice usually).
-   *
-   * If provided, the `block` function will be executed and once it's promise is resolved
-   * or rejected the indentation will be reset to its original state.
-   *
-   * @param delta the number of spaces to increase/decrease the indentation
-   * @param block a function to run and reset any indentation changes after
-   */
+		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);
+		}
 
-  indent(delta = 0, block) {
-    const originalWidth = this.indentWidth$.getValue();
-    this.indentWidth$.next(Math.max(originalWidth + delta, 0));
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
 
-    if (!block) {
-      return;
-    }
+	return styles;
+}
 
-    const maybePromise = block();
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
 
-    if (typeof maybePromise === 'object' && maybePromise && typeof maybePromise.then === 'function') {
-      return (async () => {
-        try {
-          return await maybePromise;
-        } finally {
-          this.indentWidth$.next(originalWidth);
-        }
-      })();
-    }
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
-    this.indentWidth$.next(originalWidth);
-    return maybePromise;
-  }
+/***/ }),
 
-  verbose(...args) {
-    this.sendToWriters('verbose', args);
-  }
+/***/ "../../node_modules/@babel/highlight/node_modules/chalk/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  debug(...args) {
-    this.sendToWriters('debug', args);
-  }
+"use strict";
 
-  info(...args) {
-    this.sendToWriters('info', args);
-  }
+const escapeStringRegexp = __webpack_require__("../../node_modules/escape-string-regexp/index.js");
+const ansiStyles = __webpack_require__("../../node_modules/@babel/highlight/node_modules/ansi-styles/index.js");
+const stdoutColor = __webpack_require__("../../node_modules/@babel/highlight/node_modules/supports-color/index.js").stdout;
 
-  success(...args) {
-    this.sendToWriters('success', args);
-  }
+const template = __webpack_require__("../../node_modules/@babel/highlight/node_modules/chalk/templates.js");
 
-  warning(...args) {
-    this.sendToWriters('warning', args);
-  }
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-  error(error) {
-    this.sendToWriters('error', [error]);
-  }
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-  write(...args) {
-    this.sendToWriters('write', args);
-  }
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
 
-  getWriters() {
-    return [...this.writers$.getValue()];
-  }
+const styles = Object.create(null);
 
-  setWriters(writers) {
-    this.writers$.next([...writers]);
-  }
+function applyOptions(obj, options) {
+	options = options || {};
 
-  getWritten$() {
-    return this.written$.asObservable();
-  }
-  /**
-   * Create a new ToolingLog which sets a different "type", allowing messages to be filtered out by "source"
-   * @param type A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`
-   */
+	// 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);
 
-  withType(type) {
-    return new ToolingLog(undefined, {
-      type,
-      parent: this
-    });
-  }
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
 
-  sendToWriters(type, args) {
-    const indent = this.indentWidth$.getValue();
-    const writers = this.writers$.getValue();
-    const msg = {
-      type,
-      indent,
-      source: this.type,
-      args
-    };
-    let written = false;
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
 
-    for (const writer of writers) {
-      if (writer.write(msg)) {
-        written = true;
-      }
-    }
+		chalk.template.constructor = Chalk;
 
-    if (written) {
-      this.written$.next(msg);
-    }
-  }
+		return chalk.template;
+	}
 
+	applyOptions(this, options);
 }
 
-exports.ToolingLog = ToolingLog;
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
 
-/***/ }),
-/* 7 */
-/***/ (function(module, exports) {
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
 
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : {
-    "default": obj
-  };
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
 }
 
-module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports) {
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
 
-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;
-  }
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-  return obj;
+	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);
+			};
+		}
+	};
 }
 
-module.exports = _defineProperty, module.exports.__esModule = true, module.exports["default"] = module.exports;
-
-/***/ }),
-/* 9 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]; });
+	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);
+			};
+		}
+	};
+}
 
-/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"]; });
+const proto = Object.defineProperties(() => {}, styles);
 
-/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]; });
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
 
-/* harmony import */ var _internal_observable_dom_animationFrames__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrames", function() { return _internal_observable_dom_animationFrames__WEBPACK_IMPORTED_MODULE_3__["animationFrames"]; });
+	builder._styles = _styles;
+	builder._empty = _empty;
 
-/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; });
+	const self = this;
 
-/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(36);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["BehaviorSubject"]; });
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
 
-/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(37);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["ReplaySubject"]; });
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
 
-/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(39);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["AsyncSubject"]; });
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
 
-/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(40);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asap"]; });
+	// `__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
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asapScheduler"]; });
+	return builder;
+}
 
-/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(50);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "async", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["async"]; });
+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]);
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["asyncScheduler"]; });
+	if (argsLen === 0) {
+		return '';
+	}
 
-/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(51);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queue"]; });
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queueScheduler"]; });
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
 
-/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(54);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrame"]; });
+	// 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 = '';
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrameScheduler"]; });
+	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;
 
-/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(57);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualTimeScheduler"]; });
+		// 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}`);
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualAction"]; });
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
 
-/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(49);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; });
+	return str;
+}
 
-/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(14);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["Subscription"]; });
+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(' ');
+	}
 
-/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(11);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["Subscriber"]; });
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
 
-/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(58);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; });
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; });
+	return template(chalk, parts.join(''));
+}
 
-/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(25);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["pipe"]; });
+Object.defineProperties(Chalk.prototype, styles);
 
-/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(21);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["noop"]; });
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
 
-/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(26);
-/* 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__(84);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["isObservable"]; });
+/***/ }),
 
-/* harmony import */ var _internal_lastValueFrom__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(85);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "lastValueFrom", function() { return _internal_lastValueFrom__WEBPACK_IMPORTED_MODULE_21__["lastValueFrom"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/chalk/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_firstValueFrom__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(87);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "firstValueFrom", function() { return _internal_firstValueFrom__WEBPACK_IMPORTED_MODULE_22__["firstValueFrom"]; });
+"use strict";
 
-/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(88);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_23__["ArgumentOutOfRangeError"]; });
+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;
 
-/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(86);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_24__["EmptyError"]; });
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-/* harmony import */ var _internal_util_NotFoundError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(89);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotFoundError", function() { return _internal_util_NotFoundError__WEBPACK_IMPORTED_MODULE_25__["NotFoundError"]; });
+function unescape(c) {
+	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(35);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_26__["ObjectUnsubscribedError"]; });
+	return ESCAPES.get(c) || c;
+}
 
-/* harmony import */ var _internal_util_SequenceError__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(90);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "SequenceError", function() { return _internal_util_SequenceError__WEBPACK_IMPORTED_MODULE_27__["SequenceError"]; });
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
 
-/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(91);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__["TimeoutError"]; });
+	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}')`);
+		}
+	}
 
-/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(15);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_29__["UnsubscriptionError"]; });
+	return results;
+}
 
-/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(93);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_30__["bindCallback"]; });
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(97);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_31__["bindNodeCallback"]; });
+	const results = [];
+	let matches;
 
-/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(98);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_32__["combineLatest"]; });
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(101);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_33__["concat"]; });
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-/* harmony import */ var _internal_observable_connectable__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(106);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connectable", function() { return _internal_observable_connectable__WEBPACK_IMPORTED_MODULE_34__["connectable"]; });
+	return results;
+}
 
-/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(107);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_35__["defer"]; });
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(59);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__["empty"]; });
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(108);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_37__["forkJoin"]; });
+	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}`);
+			}
 
-/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(63);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_38__["from"]; });
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
 
-/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(109);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_39__["fromEvent"]; });
+	return current;
+}
 
-/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(110);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_40__["fromEventPattern"]; });
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(111);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_41__["generate"]; });
+	// 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');
+			}
 
-/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(112);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_42__["iif"]; });
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
 
-/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(113);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_43__["interval"]; });
+	chunks.push(chunk.join(''));
 
-/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(115);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_44__["merge"]; });
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(116);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__["never"]; });
+	return chunks.join('');
+};
 
-/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(60);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_46__["of"]; });
 
-/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(117);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_47__["onErrorResumeNext"]; });
+/***/ }),
 
-/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(120);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_48__["pairs"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/has-flag/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(121);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_49__["partition"]; });
+"use strict";
 
-/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(124);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_50__["race"]; });
+module.exports = (flag, argv) => {
+	argv = argv || process.argv;
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const pos = argv.indexOf(prefix + flag);
+	const terminatorPos = argv.indexOf('--');
+	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+};
 
-/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(125);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_51__["range"]; });
 
-/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(83);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_52__["throwError"]; });
+/***/ }),
 
-/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(114);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_53__["timer"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/js-tokens/index.js":
+/***/ (function(module, exports) {
 
-/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(126);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_54__["using"]; });
+// Copyright 2014, 2015, 2016, 2017, 2018 Simon Lydell
+// License: MIT. (See LICENSE.)
 
-/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(127);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_55__["zip"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+})
 
-/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(64);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_56__["scheduled"]; });
+// 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
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__["EMPTY"]; });
+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
+}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__["NEVER"]; });
 
-/* harmony import */ var _internal_types__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(128);
-/* empty/unused harmony star reexport *//* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(18);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_58__["config"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(129);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_59__["audit"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/supports-color/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(130);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_60__["auditTime"]; });
+"use strict";
 
-/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(131);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_61__["buffer"]; });
+const os = __webpack_require__("os");
+const hasFlag = __webpack_require__("../../node_modules/@babel/highlight/node_modules/has-flag/index.js");
 
-/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(132);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_62__["bufferCount"]; });
+const env = process.env;
 
-/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(133);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_63__["bufferTime"]; });
+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;
+}
 
-/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(134);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_64__["bufferToggle"]; });
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
-/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(135);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_65__["bufferWhen"]; });
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
 
-/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(136);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_66__["catchError"]; });
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
 
-/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(137);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_67__["combineAll"]; });
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-/* harmony import */ var _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(138);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_68__["combineLatestAll"]; });
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-/* harmony import */ var _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(143);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_69__["combineLatestWith"]; });
+	if (stream && !stream.isTTY && forceColor !== true) {
+		return 0;
+	}
 
-/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(102);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_70__["concatAll"]; });
+	const min = forceColor ? 1 : 0;
 
-/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(145);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_71__["concatMap"]; });
+	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;
+		}
 
-/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(146);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_72__["concatMapTo"]; });
+		return 1;
+	}
 
-/* harmony import */ var _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(147);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_73__["concatWith"]; });
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
-/* harmony import */ var _internal_operators_connect__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(149);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return _internal_operators_connect__WEBPACK_IMPORTED_MODULE_74__["connect"]; });
+		return min;
+	}
 
-/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(151);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_75__["count"]; });
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(152);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_76__["debounce"]; });
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
-/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(153);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_77__["debounceTime"]; });
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(154);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_78__["defaultIfEmpty"]; });
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
 
-/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(155);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_79__["delay"]; });
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
 
-/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(156);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_80__["delayWhen"]; });
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
-/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(160);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_81__["dematerialize"]; });
+	if ('COLORTERM' in env) {
+		return 1;
+	}
 
-/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(161);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_82__["distinct"]; });
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
-/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(162);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_83__["distinctUntilChanged"]; });
+	return min;
+}
 
-/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(163);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_84__["distinctUntilKeyChanged"]; });
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
 
-/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(164);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_85__["elementAt"]; });
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
 
-/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(166);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_86__["endWith"]; });
 
-/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(167);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_87__["every"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(168);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_88__["exhaust"]; });
+/***/ "../../node_modules/@babel/runtime/helpers/defineProperty.js":
+/***/ (function(module, exports) {
 
-/* harmony import */ var _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(169);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_89__["exhaustAll"]; });
+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;
+  }
 
-/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(170);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_90__["exhaustMap"]; });
+  return obj;
+}
 
-/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(171);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_91__["expand"]; });
+module.exports = _defineProperty, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
-/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(123);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_92__["filter"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(172);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_93__["finalize"]; });
+/***/ "../../node_modules/@babel/runtime/helpers/interopRequireDefault.js":
+/***/ (function(module, exports) {
 
-/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(173);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_94__["find"]; });
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : {
+    "default": obj
+  };
+}
 
-/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(174);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_95__["findIndex"]; });
+module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
-/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(175);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_96__["first"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(176);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_97__["groupBy"]; });
+/***/ "../../node_modules/@kbn/bazel-runner/target_node/bazel_runner.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(158);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_98__["ignoreElements"]; });
+"use strict";
 
-/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(177);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_99__["isEmpty"]; });
 
-/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(178);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_100__["last"]; });
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(96);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_101__["map"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runBazel = runBazel;
+exports.runIBazel = runIBazel;
 
-/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(159);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_102__["mapTo"]; });
+var _chalk = _interopRequireDefault(__webpack_require__("../../node_modules/chalk/source/index.js"));
 
-/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_103__ = __webpack_require__(180);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_103__["materialize"]; });
+var _execa = _interopRequireDefault(__webpack_require__("../../node_modules/execa/index.js"));
 
-/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_104__ = __webpack_require__(181);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_104__["max"]; });
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
-/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_105__ = __webpack_require__(103);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_105__["mergeAll"]; });
+var _operators = __webpack_require__("../../node_modules/rxjs/dist/esm5/operators/index.js");
 
-/* harmony import */ var _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_106__ = __webpack_require__(182);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_106__["flatMap"]; });
+var _stdioDevHelpers = __webpack_require__("../../node_modules/@kbn/stdio-dev-helpers/target_node/index.js");
 
-/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_107__ = __webpack_require__(104);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_107__["mergeMap"]; });
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_108__ = __webpack_require__(183);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_108__["mergeMapTo"]; });
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_109__ = __webpack_require__(184);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_109__["mergeScan"]; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+async function runBazelCommandWithRunner(runner, options) {
+  const bazelProc = (0, _execa.default)(runner, options.offline ? [...options.bazelArgs, '--config=offline'] : options.bazelArgs, { ...options.execaOpts,
+    stdio: 'pipe',
+    preferLocal: true
+  });
+  await Promise.all([// Bazel outputs machine readable output into stdout and human readable output goes to stderr.
+  // Therefore we need to get both. In order to get errors we need to parse the actual text line
+  Rx.lastValueFrom(Rx.merge((0, _stdioDevHelpers.observeLines)(bazelProc.stdout).pipe((0, _operators.tap)(line => options.log.info(`${_chalk.default.cyan(`[${runner}]`)} ${line}`))), (0, _stdioDevHelpers.observeLines)(bazelProc.stderr).pipe((0, _operators.tap)(line => options.log.info(`${_chalk.default.cyan(`[${runner}]`)} ${line}`)))).pipe(Rx.defaultIfEmpty(undefined))), // Wait for process and logs to finish, unsubscribing in the end
+  bazelProc.catch(() => {
+    options.log.error('HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`');
+    throw new Error(`The bazel command that was running failed to complete.`);
+  })]);
+}
 
-/* harmony import */ var _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_110__ = __webpack_require__(185);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_110__["mergeWith"]; });
+async function runBazel(options) {
+  await runBazelCommandWithRunner('bazel', options);
+}
 
-/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_111__ = __webpack_require__(187);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_111__["min"]; });
+async function runIBazel(options) {
+  var _options$execaOpts;
 
-/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_112__ = __webpack_require__(188);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_112__["multicast"]; });
+  await runBazelCommandWithRunner('ibazel', { ...options,
+    execaOpts: { ...options.execaOpts,
+      env: { ...((_options$execaOpts = options.execaOpts) === null || _options$execaOpts === void 0 ? void 0 : _options$execaOpts.env),
+        IBAZEL_USE_LEGACY_WATCHER: '0'
+      }
+    }
+  });
+}
 
-/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_113__ = __webpack_require__(75);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_113__["observeOn"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_114__ = __webpack_require__(189);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_114__["pairwise"]; });
+/***/ "../../node_modules/@kbn/bazel-runner/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_115__ = __webpack_require__(190);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_115__["pluck"]; });
+"use strict";
 
-/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_116__ = __webpack_require__(191);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_116__["publish"]; });
 
-/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_117__ = __webpack_require__(192);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_117__["publishBehavior"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_118__ = __webpack_require__(193);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_118__["publishLast"]; });
+var _bazel_runner = __webpack_require__("../../node_modules/@kbn/bazel-runner/target_node/bazel_runner.js");
 
-/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_119__ = __webpack_require__(194);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_119__["publishReplay"]; });
+Object.keys(_bazel_runner).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _bazel_runner[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _bazel_runner[key];
+    }
+  });
+});
 
-/* harmony import */ var _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_120__ = __webpack_require__(195);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_120__["raceWith"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_121__ = __webpack_require__(141);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_121__["reduce"]; });
+/***/ "../../node_modules/@kbn/ci-stats-core/target_node/ci_stats_config.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_122__ = __webpack_require__(196);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_122__["repeat"]; });
+"use strict";
 
-/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_123__ = __webpack_require__(197);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_123__["repeatWhen"]; });
 
-/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_124__ = __webpack_require__(198);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_124__["retry"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseConfig = parseConfig;
 
-/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_125__ = __webpack_require__(199);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_125__["retryWhen"]; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_126__ = __webpack_require__(28);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_126__["refCount"]; });
+/**
+ * Information about how CiStatsReporter should talk to the ci-stats service. Normally
+ * it is read from a JSON environment variable using the `parseConfig()` function
+ * exported by this module.
+ */
+function validateConfig(log, config) {
+  const validApiToken = typeof config.apiToken === 'string' && config.apiToken.length !== 0;
 
-/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_127__ = __webpack_require__(200);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_127__["sample"]; });
+  if (!validApiToken) {
+    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid api token, stats will not be reported');
+    return;
+  }
 
-/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_128__ = __webpack_require__(201);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_128__["sampleTime"]; });
+  const validId = typeof config.buildId === 'string' && config.buildId.length !== 0;
 
-/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_129__ = __webpack_require__(202);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_129__["scan"]; });
+  if (!validId) {
+    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid build id, stats will not be reported');
+    return;
+  }
 
-/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_130__ = __webpack_require__(203);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_130__["sequenceEqual"]; });
+  return config;
+}
 
-/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_131__ = __webpack_require__(204);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_131__["share"]; });
+function parseConfig(log) {
+  const configJson = process.env.KIBANA_CI_STATS_CONFIG;
 
-/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_132__ = __webpack_require__(205);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_132__["shareReplay"]; });
+  if (!configJson) {
+    log.debug('KIBANA_CI_STATS_CONFIG environment variable not found, disabling CiStatsReporter');
+    return;
+  }
 
-/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_133__ = __webpack_require__(206);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_133__["single"]; });
+  let config;
 
-/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_134__ = __webpack_require__(207);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_134__["skip"]; });
+  try {
+    config = JSON.parse(configJson);
+  } catch (_) {// handled below
+  }
 
-/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_135__ = __webpack_require__(208);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_135__["skipLast"]; });
+  if (typeof config === 'object' && config !== null) {
+    return validateConfig(log, config);
+  }
 
-/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_136__ = __webpack_require__(209);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_136__["skipUntil"]; });
+  log.warning('KIBANA_CI_STATS_CONFIG is invalid, stats will not be reported');
+  return;
+}
 
-/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_137__ = __webpack_require__(210);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_137__["skipWhile"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_138__ = __webpack_require__(211);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_138__["startWith"]; });
+/***/ "../../node_modules/@kbn/ci-stats-core/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_139__ = __webpack_require__(77);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_139__["subscribeOn"]; });
+"use strict";
 
-/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_140__ = __webpack_require__(212);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_140__["switchAll"]; });
 
-/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_141__ = __webpack_require__(213);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_141__["switchMap"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "parseConfig", {
+  enumerable: true,
+  get: function () {
+    return _ci_stats_config.parseConfig;
+  }
+});
 
-/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_142__ = __webpack_require__(214);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_142__["switchMapTo"]; });
+var _ci_stats_config = __webpack_require__("../../node_modules/@kbn/ci-stats-core/target_node/ci_stats_config.js");
 
-/* harmony import */ var _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_143__ = __webpack_require__(215);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_143__["switchScan"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_144__ = __webpack_require__(157);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_144__["take"]; });
+/***/ "../../node_modules/@kbn/ci-stats-reporter/target_node sync recursive":
+/***/ (function(module, exports) {
 
-/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_145__ = __webpack_require__(179);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_145__["takeLast"]; });
+function webpackEmptyContext(req) {
+	var e = new Error("Cannot find module '" + req + "'");
+	e.code = 'MODULE_NOT_FOUND';
+	throw e;
+}
+webpackEmptyContext.keys = function() { return []; };
+webpackEmptyContext.resolve = webpackEmptyContext;
+module.exports = webpackEmptyContext;
+webpackEmptyContext.id = "../../node_modules/@kbn/ci-stats-reporter/target_node sync recursive";
 
-/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_146__ = __webpack_require__(216);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_146__["takeUntil"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_147__ = __webpack_require__(217);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_147__["takeWhile"]; });
+/***/ "../../node_modules/@kbn/ci-stats-reporter/target_node/ci_stats_reporter.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_148__ = __webpack_require__(218);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_148__["tap"]; });
+"use strict";
 
-/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_149__ = __webpack_require__(219);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_149__["throttle"]; });
 
-/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_150__ = __webpack_require__(220);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_150__["throttleTime"]; });
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_151__ = __webpack_require__(165);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_151__["throwIfEmpty"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CiStatsReporter = void 0;
 
-/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_152__ = __webpack_require__(221);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_152__["timeInterval"]; });
+var _util = __webpack_require__("util");
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__["timeout"]; });
+var _os = _interopRequireDefault(__webpack_require__("os"));
 
-/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_153__ = __webpack_require__(222);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_153__["timeoutWith"]; });
+var _fs = _interopRequireDefault(__webpack_require__("fs"));
 
-/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_154__ = __webpack_require__(223);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_154__["timestamp"]; });
+var _path = _interopRequireDefault(__webpack_require__("path"));
 
-/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_155__ = __webpack_require__(140);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_155__["toArray"]; });
+var _crypto = _interopRequireDefault(__webpack_require__("crypto"));
 
-/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_156__ = __webpack_require__(224);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_156__["window"]; });
+var _execa = _interopRequireDefault(__webpack_require__("../../node_modules/execa/index.js"));
 
-/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_157__ = __webpack_require__(225);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_157__["windowCount"]; });
+var _axios = _interopRequireDefault(__webpack_require__("../../node_modules/axios/index.js"));
 
-/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_158__ = __webpack_require__(226);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_158__["windowTime"]; });
+var _http = _interopRequireDefault(__webpack_require__("../../node_modules/axios/lib/adapters/http.js"));
 
-/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_159__ = __webpack_require__(227);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_159__["windowToggle"]; });
+var _ciStatsCore = __webpack_require__("../../node_modules/@kbn/ci-stats-core/target_node/index.js");
 
-/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_160__ = __webpack_require__(228);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_160__["windowWhen"]; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
+const BASE_URL = 'https://ci-stats.kibana.dev';
+/** A ci-stats metric record */
 
-/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_161__ = __webpack_require__(229);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_161__["withLatestFrom"]; });
+/** Object that helps report data to the ci-stats service */
+class CiStatsReporter {
+  /**
+   * Create a CiStatsReporter by inspecting the ENV for the necessary config
+   */
+  static fromEnv(log) {
+    return new CiStatsReporter((0, _ciStatsCore.parseConfig)(log), log);
+  }
 
-/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_162__ = __webpack_require__(230);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_162__["zipAll"]; });
+  constructor(config, log) {
+    this.config = config;
+    this.log = log;
+  }
+  /**
+   * Determine if CI_STATS is explicitly disabled by the environment. To determine
+   * if the CiStatsReporter has enough information in the environment to send metrics
+   * for builds use #hasBuildConfig().
+   */
 
-/* harmony import */ var _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_163__ = __webpack_require__(231);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_163__["zipWith"]; });
 
+  isEnabled() {
+    return process.env.CI_STATS_DISABLED !== 'true';
+  }
+  /**
+   * Determines if the CiStatsReporter is disabled by the environment, or properly
+   * configured and able to send stats
+   */
 
 
+  hasBuildConfig() {
+    var _this$config, _this$config2;
 
+    return this.isEnabled() && !!((_this$config = this.config) !== null && _this$config !== void 0 && _this$config.apiToken) && !!((_this$config2 = this.config) !== null && _this$config2 !== void 0 && _this$config2.buildId);
+  }
+  /**
+   * Report timings data to the ci-stats service. If running in CI then the reporter
+   * will include the buildId in the report with the access token, otherwise the timings
+   * data will be recorded as anonymous timing data.
+   */
 
 
+  async timings(options) {
+    var _this$config3, _options$upstreamBran, _Os$cpus, _Os$cpus$, _Os$cpus$2;
 
+    if (!this.isEnabled()) {
+      return;
+    }
 
+    const buildId = (_this$config3 = this.config) === null || _this$config3 === void 0 ? void 0 : _this$config3.buildId;
+    const timings = options.timings;
+    const upstreamBranch = (_options$upstreamBran = options.upstreamBranch) !== null && _options$upstreamBran !== void 0 ? _options$upstreamBran : this.getUpstreamBranch();
+    const kibanaUuid = options.kibanaUuid === undefined ? this.getKibanaUuid() : options.kibanaUuid;
+    let email;
+    let branch;
 
+    try {
+      const {
+        stdout
+      } = await (0, _execa.default)('git', ['config', 'user.email']);
+      email = stdout;
+    } catch (e) {
+      this.log.debug(e.message);
+    }
 
+    try {
+      const {
+        stdout
+      } = await (0, _execa.default)('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
+      branch = stdout;
+    } catch (e) {
+      this.log.debug(e.message);
+    }
 
+    const memUsage = process.memoryUsage();
+    const isElasticCommitter = email && email.endsWith('@elastic.co') ? true : false;
+    const defaultMeta = {
+      kibanaUuid,
+      isElasticCommitter,
+      committerHash: email ? _crypto.default.createHash('sha256').update(email).digest('hex').substring(0, 20) : undefined,
+      email: isElasticCommitter ? email : undefined,
+      branch: isElasticCommitter ? branch : undefined,
+      cpuCount: (_Os$cpus = _os.default.cpus()) === null || _Os$cpus === void 0 ? void 0 : _Os$cpus.length,
+      cpuModel: (_Os$cpus$ = _os.default.cpus()[0]) === null || _Os$cpus$ === void 0 ? void 0 : _Os$cpus$.model,
+      cpuSpeed: (_Os$cpus$2 = _os.default.cpus()[0]) === null || _Os$cpus$2 === void 0 ? void 0 : _Os$cpus$2.speed,
+      freeMem: _os.default.freemem(),
+      memoryUsageRss: memUsage.rss,
+      memoryUsageHeapTotal: memUsage.heapTotal,
+      memoryUsageHeapUsed: memUsage.heapUsed,
+      memoryUsageExternal: memUsage.external,
+      memoryUsageArrayBuffers: memUsage.arrayBuffers,
+      nestedTiming: process.env.CI_STATS_NESTED_TIMING ? true : false,
+      osArch: _os.default.arch(),
+      osPlatform: _os.default.platform(),
+      osRelease: _os.default.release(),
+      totalMem: _os.default.totalmem()
+    };
+    this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash);
+    return !!(await this.req({
+      auth: !!buildId,
+      path: '/v1/timings',
+      body: {
+        buildId,
+        upstreamBranch,
+        defaultMeta,
+        timings
+      },
+      bodyDesc: timings.length === 1 ? `${timings.length} timing` : `${timings.length} timings`
+    }));
+  }
+  /**
+   * Report metrics data to the ci-stats service. If running outside of CI this method
+   * does nothing as metrics can only be reported when associated with a specific CI build.
+   */
 
 
+  async metrics(metrics, options) {
+    var _this$config4;
 
+    if (!this.hasBuildConfig()) {
+      return;
+    }
 
+    const buildId = (_this$config4 = this.config) === null || _this$config4 === void 0 ? void 0 : _this$config4.buildId;
 
+    if (!buildId) {
+      throw new Error(`metrics can't be reported without a buildId`);
+    }
 
+    return !!(await this.req({
+      auth: true,
+      path: '/v1/metrics',
+      body: {
+        buildId,
+        defaultMeta: options === null || options === void 0 ? void 0 : options.defaultMeta,
+        metrics
+      },
+      bodyDesc: `metrics: ${metrics.map(({
+        group,
+        id,
+        value
+      }) => `[${group}/${id}=${value}]`).join(' ')}`
+    }));
+  }
+  /**
+   * Send test reports to ci-stats
+   */
 
 
+  async reportTests({
+    group,
+    testRuns
+  }) {
+    var _this$config5, _this$config6, _this$config7;
 
+    if (!((_this$config5 = this.config) !== null && _this$config5 !== void 0 && _this$config5.buildId) || !((_this$config6 = this.config) !== null && _this$config6 !== void 0 && _this$config6.apiToken)) {
+      throw new Error('unable to report tests unless buildId is configured and auth config available');
+    }
 
+    return await this.req({
+      auth: true,
+      path: '/v1/test_group',
+      query: {
+        buildId: (_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.buildId
+      },
+      bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
+      body: [JSON.stringify({
+        group
+      }), ...testRuns.map(testRun => JSON.stringify({
+        testRun
+      }))].join('\n')
+    });
+  }
+  /**
+   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
+   * in the upstreamBranch when calling the timings() method. Outside of @kbn/pm
+   * we rely on @kbn/utils to find the package.json file.
+   */
 
 
+  getUpstreamBranch() {
+    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
+    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
 
+    const {
+      kibanaPackageJson
+    } = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node sync recursive")(hideFromWebpack.join(''));
 
+    return kibanaPackageJson.branch;
+  }
+  /**
+   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
+   * in the kibanaUuid when calling the timings() method. Outside of @kbn/pm
+   * we rely on @kbn/utils to find the repo root.
+   */
 
 
+  getKibanaUuid() {
+    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
+    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
 
+    const {
+      REPO_ROOT
+    } = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node sync recursive")(hideFromWebpack.join(''));
 
+    try {
+      return _fs.default.readFileSync(_path.default.resolve(REPO_ROOT, 'data/uuid'), 'utf-8').trim();
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return undefined;
+      }
 
+      throw error;
+    }
+  }
 
+  async req({
+    auth,
+    body,
+    bodyDesc,
+    path,
+    query
+  }) {
+    let attempt = 0;
+    const maxAttempts = 5;
+    let headers;
 
+    if (auth && this.config) {
+      headers = {
+        Authorization: `token ${this.config.apiToken}`
+      };
+    } else if (auth) {
+      throw new Error('this.req() shouldnt be called with auth=true if this.config is not defined');
+    }
 
+    while (true) {
+      attempt += 1;
 
+      try {
+        const resp = await _axios.default.request({
+          method: 'POST',
+          url: path,
+          baseURL: BASE_URL,
+          headers,
+          data: body,
+          params: query,
+          adapter: _http.default,
+          // if it can be serialized into a string, send it
+          maxBodyLength: Infinity,
+          maxContentLength: Infinity
+        });
+        return resp.data;
+      } catch (error) {
+        var _error$response;
 
+        if (!(error !== null && error !== void 0 && error.request)) {
+          // not an axios error, must be a usage error that we should notify user about
+          throw error;
+        }
 
+        if (error !== null && error !== void 0 && error.response && error.response.status < 500) {
+          // error response from service was received so warn the user and move on
+          this.log.warning(`error reporting ${bodyDesc} [status=${error.response.status}] [resp=${(0, _util.inspect)(error.response.data)}]`);
+          return;
+        }
 
+        if (attempt === maxAttempts) {
+          this.log.warning(`unable to report ${bodyDesc}, failed to reach ci-stats service too many times`);
+          return;
+        } // we failed to reach the backend and we have remaining attempts, lets retry after a short delay
 
 
+        const reason = error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && _error$response.status ? `${error.response.status} response` : 'no response';
+        const seconds = attempt * 10;
+        this.log.warning(`failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`);
+        await new Promise(resolve => setTimeout(resolve, seconds * 1000));
+      }
+    }
+  }
 
+}
 
+exports.CiStatsReporter = CiStatsReporter;
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/ci-stats-reporter/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "CiStatsReporter", {
+  enumerable: true,
+  get: function () {
+    return _ci_stats_reporter.CiStatsReporter;
+  }
+});
+Object.defineProperty(exports, "getTimeReporter", {
+  enumerable: true,
+  get: function () {
+    return _report_time.getTimeReporter;
+  }
+});
 
+var _ci_stats_reporter = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node/ci_stats_reporter.js");
 
+var _report_time = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node/report_time.js");
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/ci-stats-reporter/target_node/report_time.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTimeReporter = void 0;
 
+var _ci_stats_reporter = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node/ci_stats_reporter.js");
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const getTimeReporter = (log, group) => {
+  const reporter = _ci_stats_reporter.CiStatsReporter.fromEnv(log);
 
+  return async (startTime, id, meta) => {
+    await reporter.timings({
+      timings: [{
+        group,
+        id,
+        ms: Date.now() - startTime,
+        meta
+      }]
+    });
+  };
+};
 
+exports.getTimeReporter = getTimeReporter;
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
+var _parse_kibana_platform_plugin = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/parse_kibana_platform_plugin.js");
 
+Object.keys(_parse_kibana_platform_plugin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _parse_kibana_platform_plugin[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _parse_kibana_platform_plugin[key];
+    }
+  });
+});
 
+var _plugin_search_paths = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/plugin_search_paths.js");
 
+Object.keys(_plugin_search_paths).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _plugin_search_paths[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugin_search_paths[key];
+    }
+  });
+});
 
+var _simple_kibana_platform_plugin_discovery = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/simple_kibana_platform_plugin_discovery.js");
 
+Object.keys(_simple_kibana_platform_plugin_discovery).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _simple_kibana_platform_plugin_discovery[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _simple_kibana_platform_plugin_discovery[key];
+    }
+  });
+});
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/parse_kibana_platform_plugin.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseKibanaPlatformPlugin = parseKibanaPlatformPlugin;
 
+var _path = _interopRequireDefault(__webpack_require__("path"));
 
+var _loadJsonFile = _interopRequireDefault(__webpack_require__("../../node_modules/load-json-file/index.js"));
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function isValidDepsDeclaration(input, type) {
+  if (typeof input === 'undefined') return [];
 
+  if (Array.isArray(input) && input.every(i => typeof i === 'string')) {
+    return input;
+  }
 
+  throw new TypeError(`The "${type}" in plugin manifest should be an array of strings.`);
+}
 
+function parseKibanaPlatformPlugin(manifestPath) {
+  if (!_path.default.isAbsolute(manifestPath)) {
+    throw new TypeError('expected new platform manifest path to be absolute');
+  }
 
+  const manifest = _loadJsonFile.default.sync(manifestPath);
 
+  if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest)) {
+    throw new TypeError('expected new platform plugin manifest to be a JSON encoded object');
+  }
 
+  if (typeof manifest.id !== 'string') {
+    throw new TypeError('expected new platform plugin manifest to have a string id');
+  }
 
+  if (typeof manifest.version !== 'string') {
+    throw new TypeError('expected new platform plugin manifest to have a string version');
+  }
 
+  if (!manifest.owner || typeof manifest.owner.name !== 'string') {
+    throw new TypeError(`Expected plugin ${manifest.id} manifest to have an owner with name specified (${manifestPath})`);
+  }
 
+  return {
+    directory: _path.default.dirname(manifestPath),
+    manifestPath,
+    manifest: { ...manifest,
+      ui: !!manifest.ui,
+      server: !!manifest.server,
+      id: manifest.id,
+      version: manifest.version,
+      kibanaVersion: manifest.kibanaVersion || manifest.version,
+      serviceFolders: manifest.serviceFolders || [],
+      owner: manifest.owner,
+      description: manifest.description,
+      enabledOnAnonymousPages: Boolean(manifest.enabledOnAnonymousPages),
+      requiredPlugins: isValidDepsDeclaration(manifest.requiredPlugins, 'requiredPlugins'),
+      optionalPlugins: isValidDepsDeclaration(manifest.optionalPlugins, 'optionalPlugins'),
+      requiredBundles: isValidDepsDeclaration(manifest.requiredBundles, 'requiredBundles'),
+      extraPublicDirs: isValidDepsDeclaration(manifest.extraPublicDirs, 'extraPublicDirs')
+    }
+  };
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/plugin_search_paths.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPluginSearchPaths = getPluginSearchPaths;
 
+var _path = __webpack_require__("path");
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function getPluginSearchPaths({
+  rootDir,
+  oss,
+  examples,
+  testPlugins
+}) {
+  return [(0, _path.resolve)(rootDir, 'src', 'plugins'), ...(oss ? [] : [(0, _path.resolve)(rootDir, 'x-pack', 'plugins')]), (0, _path.resolve)(rootDir, 'plugins'), ...(examples ? [(0, _path.resolve)(rootDir, 'examples')] : []), ...(examples && !oss ? [(0, _path.resolve)(rootDir, 'x-pack', 'examples')] : []), (0, _path.resolve)(rootDir, '..', 'kibana-extra'), ...(testPlugins ? [(0, _path.resolve)(rootDir, 'test/analytics/__fixtures__/plugins'), (0, _path.resolve)(rootDir, 'test/plugin_functional/plugins'), (0, _path.resolve)(rootDir, 'test/interpreter_functional/plugins'), (0, _path.resolve)(rootDir, 'test/common/fixtures/plugins')] : []), ...(testPlugins && !oss ? [(0, _path.resolve)(rootDir, 'x-pack/test/plugin_functional/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/functional_with_es_ssl/fixtures/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/alerting_api_integration/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/plugin_api_integration/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/plugin_api_perf/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/licensing_plugin/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/usage_collection/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/security_functional/fixtures/common')] : [])];
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/simple_kibana_platform_plugin_discovery.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.simpleKibanaPlatformPluginDiscovery = simpleKibanaPlatformPluginDiscovery;
 
+var _path = _interopRequireDefault(__webpack_require__("path"));
 
+var _globby = _interopRequireDefault(__webpack_require__("../../node_modules/globby/index.js"));
 
+var _normalizePath = _interopRequireDefault(__webpack_require__("../../node_modules/normalize-path/index.js"));
 
+var _parse_kibana_platform_plugin = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/parse_kibana_platform_plugin.js");
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
+/**
+ * Helper to find the new platform plugins.
+ */
+function simpleKibanaPlatformPluginDiscovery(scanDirs, pluginPaths) {
+  const patterns = Array.from(new Set([// find kibana.json files up to 5 levels within the scan dir
+  ...scanDirs.reduce((acc, dir) => [...acc, _path.default.resolve(dir, '*/kibana.json'), _path.default.resolve(dir, '*/*/kibana.json'), _path.default.resolve(dir, '*/*/*/kibana.json'), _path.default.resolve(dir, '*/*/*/*/kibana.json'), _path.default.resolve(dir, '*/*/*/*/*/kibana.json')], []), ...pluginPaths.map(path => _path.default.resolve(path, `kibana.json`))])).map(path => (0, _normalizePath.default)(path));
 
+  const manifestPaths = _globby.default.sync(patterns, {
+    absolute: true
+  }).map(path => // absolute paths returned from globby are using normalize or
+  // something so the path separators are `/` even on windows,
+  // Path.resolve solves this
+  _path.default.resolve(path));
 
+  return manifestPaths.map(_parse_kibana_platform_plugin.parseKibanaPlatformPlugin);
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/sort-package-json/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortPackageJson = sortPackageJson;
 
+var _sortPackageJson = _interopRequireDefault(__webpack_require__("../../node_modules/sort-package-json/index.js"));
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function sortPackageJson(json) {
+  return JSON.stringify((0, _sortPackageJson.default)(JSON.parse(json), {
+    // top level keys in the order they were written when this was implemented
+    sortOrder: ['name', 'description', 'keywords', 'private', 'version', 'branch', 'main', 'browser', 'types', 'tsdocMetadata', 'build', 'homepage', 'bugs', 'license', 'kibana', 'author', 'scripts', 'repository', 'engines', 'resolutions']
+  }), null, 2) + '\n';
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/stdio-dev-helpers/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "observeLines", {
+  enumerable: true,
+  get: function () {
+    return _observe_lines.observeLines;
+  }
+});
+Object.defineProperty(exports, "observeReadable", {
+  enumerable: true,
+  get: function () {
+    return _observe_readable.observeReadable;
+  }
+});
 
+var _observe_lines = __webpack_require__("../../node_modules/@kbn/stdio-dev-helpers/target_node/observe_lines.js");
 
+var _observe_readable = __webpack_require__("../../node_modules/@kbn/stdio-dev-helpers/target_node/observe_readable.js");
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/stdio-dev-helpers/target_node/observe_lines.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.observeLines = observeLines;
 
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
+var _operators = __webpack_require__("../../node_modules/rxjs/dist/esm5/operators/index.js");
 
+var _observe_readable = __webpack_require__("../../node_modules/@kbn/stdio-dev-helpers/target_node/observe_readable.js");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const SEP = /\r?\n/;
 
+/**
+ *  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$ = (0, _observe_readable.observeReadable)(readable).pipe((0, _operators.share)());
+  const scan$ = Rx.fromEvent(readable, 'data').pipe((0, _operators.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
+  (0, _operators.takeUntil)(done$.pipe((0, _operators.materialize)())), (0, _operators.share)());
+  return Rx.merge( // use done$ to provide completion/errors
+  done$, // merge in the "lines" from each step
+  scan$.pipe((0, _operators.mergeMap)(({
+    lines
+  }) => lines || [])), // inject the "unsplit" data at the end
+  scan$.pipe((0, _operators.last)(), (0, _operators.mergeMap)(({
+    buffer
+  }) => buffer ? [buffer] : []), // if there were no lines, last() will error, so catch and complete
+  (0, _operators.catchError)(() => Rx.empty())));
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/stdio-dev-helpers/target_node/observe_readable.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.observeReadable = observeReadable;
 
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
+var _operators = __webpack_require__("../../node_modules/rxjs/dist/esm5/operators/index.js");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
+/**
+ *  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((0, _operators.first)(), (0, _operators.ignoreElements)()), Rx.fromEvent(readable, 'error').pipe((0, _operators.first)(), (0, _operators.mergeMap)(err => Rx.throwError(err))));
+}
 
+/***/ }),
+
+/***/ "../../node_modules/@kbn/tooling-log/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "DEFAULT_LOG_LEVEL", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.DEFAULT_LOG_LEVEL;
+  }
+});
+Object.defineProperty(exports, "LOG_LEVEL_FLAGS", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.LOG_LEVEL_FLAGS;
+  }
+});
+Object.defineProperty(exports, "ToolingLog", {
+  enumerable: true,
+  get: function () {
+    return _tooling_log.ToolingLog;
+  }
+});
+Object.defineProperty(exports, "ToolingLogCollectingWriter", {
+  enumerable: true,
+  get: function () {
+    return _tooling_log_collecting_writer.ToolingLogCollectingWriter;
+  }
+});
+Object.defineProperty(exports, "ToolingLogTextWriter", {
+  enumerable: true,
+  get: function () {
+    return _tooling_log_text_writer.ToolingLogTextWriter;
+  }
+});
+Object.defineProperty(exports, "getLogLevelFlagsHelp", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.getLogLevelFlagsHelp;
+  }
+});
+Object.defineProperty(exports, "parseLogLevel", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.parseLogLevel;
+  }
+});
+Object.defineProperty(exports, "pickLevelFromFlags", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.pickLevelFromFlags;
+  }
+});
 
+var _tooling_log = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/tooling_log.js");
 
+var _tooling_log_text_writer = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/tooling_log_text_writer.js");
 
+var _log_levels = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/log_levels.js");
 
+var _tooling_log_collecting_writer = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/tooling_log_collecting_writer.js");
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/tooling-log/target_node/log_levels.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LOG_LEVEL_FLAGS = exports.DEFAULT_LOG_LEVEL = void 0;
+exports.getLogLevelFlagsHelp = getLogLevelFlagsHelp;
+exports.parseLogLevel = parseLogLevel;
+exports.pickLevelFromFlags = pickLevelFromFlags;
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const LEVELS = ['silent', 'error', 'warning', 'success', 'info', 'debug', 'verbose'];
+const DEFAULT_LOG_LEVEL = 'info';
+exports.DEFAULT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
 
+function pickLevelFromFlags(flags, options = {}) {
+  if (flags.verbose) return 'verbose';
+  if (flags.debug) return 'debug';
+  if (flags.info) return 'info';
+  if (flags.quiet) return 'error';
+  if (flags.silent) return 'silent';
+  return options.default || DEFAULT_LOG_LEVEL;
+}
 
+const LOG_LEVEL_FLAGS = [{
+  name: 'verbose',
+  help: '--verbose, -v      Log verbosely'
+}, {
+  name: 'info',
+  help: "--info             Don't log debug messages"
+}, {
+  name: 'debug',
+  help: '--debug            Log debug messages (less than verbose)'
+}, {
+  name: 'quiet',
+  help: '--quiet            Only log errors'
+}, {
+  name: 'silent',
+  help: "--silent           Don't log anything"
+}];
+exports.LOG_LEVEL_FLAGS = LOG_LEVEL_FLAGS;
 
+function getLogLevelFlagsHelp(defaultLogLevel = DEFAULT_LOG_LEVEL) {
+  return LOG_LEVEL_FLAGS.filter(({
+    name
+  }) => name !== defaultLogLevel).map(({
+    help
+  }) => help).join('\n');
+}
 
+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);
+  }
 
-//# sourceMappingURL=index.js.map
+  const flags = {};
+  LEVELS.forEach((level, levelI) => {
+    flags[level] = levelI <= i;
+  });
+  return {
+    name,
+    flags: flags
+  };
+}
 
 /***/ }),
-/* 10 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/tooling-log/target_node/tooling_log.js":
+/***/ (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 _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(18);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(13);
-/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23);
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ToolingLog = void 0;
 
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("../../node_modules/@babel/runtime/helpers/defineProperty.js"));
 
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
+var _tooling_log_text_writer = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/tooling_log_text_writer.js");
 
-var Observable = (function () {
-    function Observable(subscribe) {
-        if (subscribe) {
-            this._subscribe = subscribe;
-        }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+class ToolingLog {
+  constructor(writerConfig, options) {
+    (0, _defineProperty2.default)(this, "indentWidth$", void 0);
+    (0, _defineProperty2.default)(this, "writers$", void 0);
+    (0, _defineProperty2.default)(this, "written$", void 0);
+    (0, _defineProperty2.default)(this, "type", void 0);
+    this.indentWidth$ = options !== null && options !== void 0 && options.parent ? options.parent.indentWidth$ : new Rx.BehaviorSubject(0);
+    this.writers$ = options !== null && options !== void 0 && options.parent ? options.parent.writers$ : new Rx.BehaviorSubject([]);
+
+    if (!(options !== null && options !== void 0 && options.parent) && writerConfig) {
+      this.writers$.next([new _tooling_log_text_writer.ToolingLogTextWriter(writerConfig)]);
     }
-    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 _this = this;
-        var subscriber = isSubscriber(observerOrNext) ? observerOrNext : new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["SafeSubscriber"](observerOrNext, error, complete);
-        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_6__["errorContext"])(function () {
-            var _a = _this, operator = _a.operator, source = _a.source;
-            subscriber.add(operator
-                ?
-                    operator.call(subscriber, source)
-                : source
-                    ?
-                        _this._subscribe(subscriber)
-                    :
-                        _this._trySubscribe(subscriber));
-        });
-        return subscriber;
-    };
-    Observable.prototype._trySubscribe = function (sink) {
+
+    this.written$ = options !== null && options !== void 0 && options.parent ? options.parent.written$ : new Rx.Subject();
+    this.type = options === null || options === void 0 ? void 0 : options.type;
+  }
+  /**
+   * Get the current indentation level of the ToolingLog
+   */
+
+
+  getIndent() {
+    return this.indentWidth$.getValue();
+  }
+  /**
+   * Indent the output of the ToolingLog by some character (4 is a good choice usually).
+   *
+   * If provided, the `block` function will be executed and once it's promise is resolved
+   * or rejected the indentation will be reset to its original state.
+   *
+   * @param delta the number of spaces to increase/decrease the indentation
+   * @param block a function to run and reset any indentation changes after
+   */
+
+
+  indent(delta = 0, block) {
+    const originalWidth = this.indentWidth$.getValue();
+    this.indentWidth$.next(Math.max(originalWidth + delta, 0));
+
+    if (!block) {
+      return;
+    }
+
+    const maybePromise = block();
+
+    if (typeof maybePromise === 'object' && maybePromise && typeof maybePromise.then === 'function') {
+      return (async () => {
         try {
-            return this._subscribe(sink);
-        }
-        catch (err) {
-            sink.error(err);
-        }
-    };
-    Observable.prototype.forEach = function (next, promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var subscriber = new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["SafeSubscriber"]({
-                next: function (value) {
-                    try {
-                        next(value);
-                    }
-                    catch (err) {
-                        reject(err);
-                        subscriber.unsubscribe();
-                    }
-                },
-                error: reject,
-                complete: resolve,
-            });
-            _this.subscribe(subscriber);
-        });
-    };
-    Observable.prototype._subscribe = function (subscriber) {
-        var _a;
-        return (_a = this.source) === null || _a === void 0 ? void 0 : _a.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];
+          return await maybePromise;
+        } finally {
+          this.indentWidth$.next(originalWidth);
         }
-        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) {
-    var _a;
-    return (_a = promiseCtor !== null && promiseCtor !== void 0 ? promiseCtor : _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise) !== null && _a !== void 0 ? _a : Promise;
-}
-function isObserver(value) {
-    return value && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(value.next) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(value.error) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(value.complete);
-}
-function isSubscriber(value) {
-    return (value && value instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) || (isObserver(value) && Object(_Subscription__WEBPACK_IMPORTED_MODULE_1__["isSubscription"])(value));
-}
-//# sourceMappingURL=Observable.js.map
+    this.indentWidth$.next(originalWidth);
+    return maybePromise;
+  }
 
-/***/ }),
-/* 11 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  verbose(...args) {
+    this.sendToWriters('verbose', args);
+  }
 
-"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 export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY_OBSERVER", function() { return EMPTY_OBSERVER; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18);
-/* harmony import */ var _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(19);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(21);
-/* harmony import */ var _NotificationFactories__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(22);
-/* harmony import */ var _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(20);
-/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(23);
+  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$.getValue()];
+  }
 
+  setWriters(writers) {
+    this.writers$.next([...writers]);
+  }
 
+  getWritten$() {
+    return this.written$.asObservable();
+  }
+  /**
+   * Create a new ToolingLog which sets a different "type", allowing messages to be filtered out by "source"
+   * @param type A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`
+   */
 
-var Subscriber = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(Subscriber, _super);
-    function Subscriber(destination) {
-        var _this = _super.call(this) || this;
-        _this.isStopped = false;
-        if (destination) {
-            _this.destination = destination;
-            if (Object(_Subscription__WEBPACK_IMPORTED_MODULE_2__["isSubscription"])(destination)) {
-                destination.add(_this);
-            }
-        }
-        else {
-            _this.destination = EMPTY_OBSERVER;
-        }
-        return _this;
-    }
-    Subscriber.create = function (next, error, complete) {
-        return new SafeSubscriber(next, error, complete);
-    };
-    Subscriber.prototype.next = function (value) {
-        if (this.isStopped) {
-            handleStoppedNotification(Object(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__["nextNotification"])(value), this);
-        }
-        else {
-            this._next(value);
-        }
-    };
-    Subscriber.prototype.error = function (err) {
-        if (this.isStopped) {
-            handleStoppedNotification(Object(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__["errorNotification"])(err), this);
-        }
-        else {
-            this.isStopped = true;
-            this._error(err);
-        }
-    };
-    Subscriber.prototype.complete = function () {
-        if (this.isStopped) {
-            handleStoppedNotification(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__["COMPLETE_NOTIFICATION"], this);
-        }
-        else {
-            this.isStopped = true;
-            this._complete();
-        }
-    };
-    Subscriber.prototype.unsubscribe = function () {
-        if (!this.closed) {
-            this.isStopped = true;
-            _super.prototype.unsubscribe.call(this);
-            this.destination = null;
-        }
-    };
-    Subscriber.prototype._next = function (value) {
-        this.destination.next(value);
-    };
-    Subscriber.prototype._error = function (err) {
-        try {
-            this.destination.error(err);
-        }
-        finally {
-            this.unsubscribe();
-        }
-    };
-    Subscriber.prototype._complete = function () {
-        try {
-            this.destination.complete();
-        }
-        finally {
-            this.unsubscribe();
-        }
-    };
-    return Subscriber;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]));
 
-var _bind = Function.prototype.bind;
-function bind(fn, thisArg) {
-    return _bind.call(fn, thisArg);
-}
-var ConsumerObserver = (function () {
-    function ConsumerObserver(partialObserver) {
-        this.partialObserver = partialObserver;
-    }
-    ConsumerObserver.prototype.next = function (value) {
-        var partialObserver = this.partialObserver;
-        if (partialObserver.next) {
-            try {
-                partialObserver.next(value);
-            }
-            catch (error) {
-                handleUnhandledError(error);
-            }
-        }
-    };
-    ConsumerObserver.prototype.error = function (err) {
-        var partialObserver = this.partialObserver;
-        if (partialObserver.error) {
-            try {
-                partialObserver.error(err);
-            }
-            catch (error) {
-                handleUnhandledError(error);
-            }
-        }
-        else {
-            handleUnhandledError(err);
-        }
-    };
-    ConsumerObserver.prototype.complete = function () {
-        var partialObserver = this.partialObserver;
-        if (partialObserver.complete) {
-            try {
-                partialObserver.complete();
-            }
-            catch (error) {
-                handleUnhandledError(error);
-            }
-        }
+  withType(type) {
+    return new ToolingLog(undefined, {
+      type,
+      parent: this
+    });
+  }
+
+  sendToWriters(type, args) {
+    const indent = this.indentWidth$.getValue();
+    const writers = this.writers$.getValue();
+    const msg = {
+      type,
+      indent,
+      source: this.type,
+      args
     };
-    return ConsumerObserver;
-}());
-var SafeSubscriber = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(SafeSubscriber, _super);
-    function SafeSubscriber(observerOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        var partialObserver;
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(observerOrNext) || !observerOrNext) {
-            partialObserver = {
-                next: observerOrNext !== null && observerOrNext !== void 0 ? observerOrNext : undefined,
-                error: error !== null && error !== void 0 ? error : undefined,
-                complete: complete !== null && complete !== void 0 ? complete : undefined,
-            };
-        }
-        else {
-            var context_1;
-            if (_this && _config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedNextContext) {
-                context_1 = Object.create(observerOrNext);
-                context_1.unsubscribe = function () { return _this.unsubscribe(); };
-                partialObserver = {
-                    next: observerOrNext.next && bind(observerOrNext.next, context_1),
-                    error: observerOrNext.error && bind(observerOrNext.error, context_1),
-                    complete: observerOrNext.complete && bind(observerOrNext.complete, context_1),
-                };
-            }
-            else {
-                partialObserver = observerOrNext;
-            }
-        }
-        _this.destination = new ConsumerObserver(partialObserver);
-        return _this;
-    }
-    return SafeSubscriber;
-}(Subscriber));
+    let written = false;
 
-function handleUnhandledError(error) {
-    if (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling) {
-        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_8__["captureError"])(error);
+    for (const writer of writers) {
+      if (writer.write(msg)) {
+        written = true;
+      }
     }
-    else {
-        Object(_util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_4__["reportUnhandledError"])(error);
+
+    if (written) {
+      this.written$.next(msg);
     }
+  }
+
 }
-function defaultErrorHandler(err) {
-    throw err;
-}
-function handleStoppedNotification(notification, subscriber) {
-    var onStoppedNotification = _config__WEBPACK_IMPORTED_MODULE_3__["config"].onStoppedNotification;
-    onStoppedNotification && _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_7__["timeoutProvider"].setTimeout(function () { return onStoppedNotification(notification, subscriber); });
-}
-var EMPTY_OBSERVER = {
-    closed: true,
-    next: _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"],
-    error: defaultErrorHandler,
-    complete: _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"],
-};
-//# sourceMappingURL=Subscriber.js.map
+
+exports.ToolingLog = ToolingLog;
 
 /***/ }),
-/* 12 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/tooling-log/target_node/tooling_log_collecting_writer.js":
+/***/ (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__, "__createBinding", function() { return __createBinding; });
-/* 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__, "__spreadArrays", function() { return __spreadArrays; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArray", function() { return __spreadArray; });
-/* 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; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldGet", function() { return __classPrivateFieldGet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldSet", function() { return __classPrivateFieldSet; });
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* 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 (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    if (typeof b !== "function" && b !== null)
-        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-    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 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                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) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(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 };
-    }
-}
-
-var __createBinding = Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-});
-
-function __exportStar(m, o) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
-}
-
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
-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;
-}
-
-/** @deprecated */
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-/** @deprecated */
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-}
-
-function __spreadArray(to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-}
-
-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;
-};
-
-var __setModuleDefault = Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
-
-function __classPrivateFieldGet(receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-}
-
-function __classPrivateFieldSet(receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-}
-
 
-/***/ }),
-/* 13 */
-/***/ (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; });
-function isFunction(value) {
-    return typeof value === 'function';
-}
-//# sourceMappingURL=isFunction.js.map
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-/***/ }),
-/* 14 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ToolingLogCollectingWriter = void 0;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return Subscription; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY_SUBSCRIPTION", function() { return EMPTY_SUBSCRIPTION; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isSubscription", function() { return isSubscription; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
-/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(17);
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("../../node_modules/@babel/runtime/helpers/defineProperty.js"));
 
+var _tooling_log_text_writer = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/tooling_log_text_writer.js");
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+class ToolingLogCollectingWriter extends _tooling_log_text_writer.ToolingLogTextWriter {
+  constructor(level = 'verbose') {
+    super({
+      level,
+      writeTo: {
+        write: msg => {
+          // trim trailing new line
+          this.messages.push(msg.slice(0, -1));
+        }
+      }
+    });
+    (0, _defineProperty2.default)(this, "messages", []);
+  }
+  /**
+   * Called by ToolingLog, extends messages with the source if message includes one.
+   */
 
 
-var Subscription = (function () {
-    function Subscription(initialTeardown) {
-        this.initialTeardown = initialTeardown;
-        this.closed = false;
-        this._parentage = null;
-        this._finalizers = null;
+  write(msg) {
+    if (msg.source) {
+      return super.write({ ...msg,
+        args: [`source[${msg.source}]`, ...msg.args]
+      });
     }
-    Subscription.prototype.unsubscribe = function () {
-        var e_1, _a, e_2, _b;
-        var errors;
-        if (!this.closed) {
-            this.closed = true;
-            var _parentage = this._parentage;
-            if (_parentage) {
-                this._parentage = null;
-                if (Array.isArray(_parentage)) {
-                    try {
-                        for (var _parentage_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(_parentage), _parentage_1_1 = _parentage_1.next(); !_parentage_1_1.done; _parentage_1_1 = _parentage_1.next()) {
-                            var parent_1 = _parentage_1_1.value;
-                            parent_1.remove(this);
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (_parentage_1_1 && !_parentage_1_1.done && (_a = _parentage_1.return)) _a.call(_parentage_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                }
-                else {
-                    _parentage.remove(this);
-                }
-            }
-            var initialFinalizer = this.initialTeardown;
-            if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(initialFinalizer)) {
-                try {
-                    initialFinalizer();
-                }
-                catch (e) {
-                    errors = e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__["UnsubscriptionError"] ? e.errors : [e];
-                }
-            }
-            var _finalizers = this._finalizers;
-            if (_finalizers) {
-                this._finalizers = null;
-                try {
-                    for (var _finalizers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(_finalizers), _finalizers_1_1 = _finalizers_1.next(); !_finalizers_1_1.done; _finalizers_1_1 = _finalizers_1.next()) {
-                        var finalizer = _finalizers_1_1.value;
-                        try {
-                            execFinalizer(finalizer);
-                        }
-                        catch (err) {
-                            errors = errors !== null && errors !== void 0 ? errors : [];
-                            if (err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__["UnsubscriptionError"]) {
-                                errors = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(errors)), Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(err.errors));
-                            }
-                            else {
-                                errors.push(err);
-                            }
-                        }
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (_finalizers_1_1 && !_finalizers_1_1.done && (_b = _finalizers_1.return)) _b.call(_finalizers_1);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-            }
-            if (errors) {
-                throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__["UnsubscriptionError"](errors);
-            }
-        }
-    };
-    Subscription.prototype.add = function (teardown) {
-        var _a;
-        if (teardown && teardown !== this) {
-            if (this.closed) {
-                execFinalizer(teardown);
-            }
-            else {
-                if (teardown instanceof Subscription) {
-                    if (teardown.closed || teardown._hasParent(this)) {
-                        return;
-                    }
-                    teardown._addParent(this);
-                }
-                (this._finalizers = (_a = this._finalizers) !== null && _a !== void 0 ? _a : []).push(teardown);
-            }
-        }
-    };
-    Subscription.prototype._hasParent = function (parent) {
-        var _parentage = this._parentage;
-        return _parentage === parent || (Array.isArray(_parentage) && _parentage.includes(parent));
-    };
-    Subscription.prototype._addParent = function (parent) {
-        var _parentage = this._parentage;
-        this._parentage = Array.isArray(_parentage) ? (_parentage.push(parent), _parentage) : _parentage ? [_parentage, parent] : parent;
-    };
-    Subscription.prototype._removeParent = function (parent) {
-        var _parentage = this._parentage;
-        if (_parentage === parent) {
-            this._parentage = null;
-        }
-        else if (Array.isArray(_parentage)) {
-            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__["arrRemove"])(_parentage, parent);
-        }
-    };
-    Subscription.prototype.remove = function (teardown) {
-        var _finalizers = this._finalizers;
-        _finalizers && Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__["arrRemove"])(_finalizers, teardown);
-        if (teardown instanceof Subscription) {
-            teardown._removeParent(this);
-        }
-    };
-    Subscription.EMPTY = (function () {
-        var empty = new Subscription();
-        empty.closed = true;
-        return empty;
-    })();
-    return Subscription;
-}());
 
-var EMPTY_SUBSCRIPTION = Subscription.EMPTY;
-function isSubscription(value) {
-    return (value instanceof Subscription ||
-        (value && 'closed' in value && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(value.remove) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(value.add) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(value.unsubscribe)));
-}
-function execFinalizer(finalizer) {
-    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(finalizer)) {
-        finalizer();
-    }
-    else {
-        finalizer.unsubscribe();
-    }
+    return super.write(msg);
+  }
+
 }
-//# sourceMappingURL=Subscription.js.map
+
+exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter;
 
 /***/ }),
-/* 15 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/tooling-log/target_node/tooling_log_text_writer.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return UnsubscriptionError; });
-/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
 
-var UnsubscriptionError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__["createErrorClass"])(function (_super) {
-    return function UnsubscriptionErrorImpl(errors) {
-        _super(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;
-    };
-});
-//# sourceMappingURL=UnsubscriptionError.js.map
 
-/***/ }),
-/* 16 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createErrorClass", function() { return createErrorClass; });
-function createErrorClass(createImpl) {
-    var _super = function (instance) {
-        Error.call(instance);
-        instance.stack = new Error().stack;
-    };
-    var ctorFunc = createImpl(_super);
-    ctorFunc.prototype = Object.create(Error.prototype);
-    ctorFunc.prototype.constructor = ctorFunc;
-    return ctorFunc;
-}
-//# sourceMappingURL=createErrorClass.js.map
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ToolingLogTextWriter = void 0;
 
-/***/ }),
-/* 17 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("../../node_modules/@babel/runtime/helpers/defineProperty.js"));
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "arrRemove", function() { return arrRemove; });
-function arrRemove(arr, item) {
-    if (arr) {
-        var index = arr.indexOf(item);
-        0 <= index && arr.splice(index, 1);
-    }
-}
-//# sourceMappingURL=arrRemove.js.map
+var _util = __webpack_require__("util");
 
-/***/ }),
-/* 18 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _chalk = _interopRequireDefault(__webpack_require__("../../node_modules/chalk/source/index.js"));
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return config; });
-var config = {
-    onUnhandledError: null,
-    onStoppedNotification: null,
-    Promise: undefined,
-    useDeprecatedSynchronousErrorHandling: false,
-    useDeprecatedNextContext: false,
-};
-//# sourceMappingURL=config.js.map
+var _log_levels = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/log_levels.js");
 
-/***/ }),
-/* 19 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const {
+  magentaBright,
+  yellow,
+  red,
+  blue,
+  green,
+  dim
+} = _chalk.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')} `
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reportUnhandledError", function() { return reportUnhandledError; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
+const has = (obj, key) => obj.hasOwnProperty(key);
 
+function shouldWriteType(level, type) {
+  if (type === 'write') {
+    return level.name !== 'silent';
+  }
 
-function reportUnhandledError(err) {
-    _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_1__["timeoutProvider"].setTimeout(function () {
-        var onUnhandledError = _config__WEBPACK_IMPORTED_MODULE_0__["config"].onUnhandledError;
-        if (onUnhandledError) {
-            onUnhandledError(err);
-        }
-        else {
-            throw err;
-        }
-    });
+  return Boolean(level.flags[type === 'success' ? 'info' : type]);
 }
-//# sourceMappingURL=reportUnhandledError.js.map
 
-/***/ }),
-/* 20 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutProvider", function() { return timeoutProvider; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-
-var timeoutProvider = {
-    setTimeout: function (handler, timeout) {
-        var args = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            args[_i - 2] = arguments[_i];
-        }
-        var delegate = timeoutProvider.delegate;
-        if (delegate === null || delegate === void 0 ? void 0 : delegate.setTimeout) {
-            return delegate.setTimeout.apply(delegate, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-        }
-        return setTimeout.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-    },
-    clearTimeout: function (handle) {
-        var delegate = timeoutProvider.delegate;
-        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearTimeout) || clearTimeout)(handle);
-    },
-    delegate: undefined,
-};
-//# sourceMappingURL=timeoutProvider.js.map
+function stringifyError(error) {
+  if (typeof error !== 'string' && !(error instanceof Error)) {
+    error = new Error(`"${error}" thrown`);
+  }
 
-/***/ }),
-/* 21 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (typeof error === 'string') {
+    return error;
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return noop; });
-function noop() { }
-//# sourceMappingURL=noop.js.map
+  return error.stack || error.message || error;
+}
 
-/***/ }),
-/* 22 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+class ToolingLogTextWriter {
+  constructor(config) {
+    (0, _defineProperty2.default)(this, "level", void 0);
+    (0, _defineProperty2.default)(this, "writeTo", void 0);
+    (0, _defineProperty2.default)(this, "ignoreSources", void 0);
+    this.level = (0, _log_levels.parseLogLevel)(config.level);
+    this.writeTo = config.writeTo;
+    this.ignoreSources = config.ignoreSources;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "COMPLETE_NOTIFICATION", function() { return COMPLETE_NOTIFICATION; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "errorNotification", function() { return errorNotification; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nextNotification", function() { return nextNotification; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createNotification", function() { return createNotification; });
-var COMPLETE_NOTIFICATION = (function () { return createNotification('C', undefined, undefined); })();
-function errorNotification(error) {
-    return createNotification('E', undefined, error);
-}
-function nextNotification(value) {
-    return createNotification('N', value, undefined);
-}
-function createNotification(kind, value, error) {
-    return {
-        kind: kind,
-        value: value,
-        error: error,
-    };
-}
-//# sourceMappingURL=NotificationFactories.js.map
+    if (!this.writeTo || typeof this.writeTo.write !== 'function') {
+      throw new Error('ToolingLogTextWriter requires the `writeTo` option be set to a stream (like process.stdout)');
+    }
+  }
 
-/***/ }),
-/* 23 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  write(msg) {
+    if (!shouldWriteType(this.level, msg.type)) {
+      return false;
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "errorContext", function() { return errorContext; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "captureError", function() { return captureError; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
+    if (this.ignoreSources && msg.source && this.ignoreSources.includes(msg.source)) {
+      if (msg.type === 'write') {
+        const txt = (0, _util.format)(msg.args[0], ...msg.args.slice(1)); // Ensure that Elasticsearch deprecation log messages from Kibana aren't ignored
 
-var context = null;
-function errorContext(cb) {
-    if (_config__WEBPACK_IMPORTED_MODULE_0__["config"].useDeprecatedSynchronousErrorHandling) {
-        var isRoot = !context;
-        if (isRoot) {
-            context = { errorThrown: false, error: null };
-        }
-        cb();
-        if (isRoot) {
-            var _a = context, errorThrown = _a.errorThrown, error = _a.error;
-            context = null;
-            if (errorThrown) {
-                throw error;
-            }
+        if (!/elasticsearch\.deprecation/.test(txt)) {
+          return false;
         }
+      } else {
+        return false;
+      }
     }
-    else {
-        cb();
-    }
-}
-function captureError(err) {
-    if (_config__WEBPACK_IMPORTED_MODULE_0__["config"].useDeprecatedSynchronousErrorHandling && context) {
-        context.errorThrown = true;
-        context.error = err;
-    }
-}
-//# sourceMappingURL=errorContext.js.map
 
-/***/ }),
-/* 24 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
+    ToolingLogTextWriter.write(this.writeTo, prefix, msg);
+    return true;
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return observable; });
-var observable = (function () { return (typeof Symbol === 'function' && Symbol.observable) || '@@observable'; })();
-//# sourceMappingURL=observable.js.map
+  static write(writeTo, prefix, msg) {
+    const txt = msg.type === 'error' ? stringifyError(msg.args[0]) : (0, _util.format)(msg.args[0], ...msg.args.slice(1));
+    (prefix + txt).split('\n').forEach((line, i) => {
+      let lineIndent = '';
 
-/***/ }),
-/* 25 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (msg.indent > 0) {
+        // if we are indenting write some spaces followed by a symbol
+        lineIndent += ' '.repeat(msg.indent - 1);
+        lineIndent += line.startsWith('-') ? '└' : '│';
+      }
 
-"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 _identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
+      if (line && prefix && i > 0) {
+        // apply additional indentation to lines after
+        // the first if this message gets a prefix
+        lineIndent += PREFIX_INDENT;
+      }
+
+      writeTo.write(`${lineIndent}${line}\n`);
+    });
+  }
 
-function pipe() {
-    var fns = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        fns[_i] = arguments[_i];
-    }
-    return pipeFromArray(fns);
-}
-function pipeFromArray(fns) {
-    if (fns.length === 0) {
-        return _identity__WEBPACK_IMPORTED_MODULE_0__["identity"];
-    }
-    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
+
+exports.ToolingLogTextWriter = ToolingLogTextWriter;
 
 /***/ }),
-/* 26 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/adapters/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return identity; });
-function identity(x) {
-    return x;
-}
-//# sourceMappingURL=identity.js.map
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("fs");
+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 === undefined) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
+}
+exports.createFileSystemAdapter = createFileSystemAdapter;
+
 
 /***/ }),
-/* 27 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/constants.js":
+/***/ (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 import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28);
-/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(29);
+
+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);
+const SUPPORTED_MAJOR_VERSION = 10;
+const SUPPORTED_MINOR_VERSION = 10;
+const IS_MATCHED_BY_MAJOR = MAJOR_VERSION > SUPPORTED_MAJOR_VERSION;
+const IS_MATCHED_BY_MAJOR_AND_MINOR = MAJOR_VERSION === SUPPORTED_MAJOR_VERSION && MINOR_VERSION >= SUPPORTED_MINOR_VERSION;
+/**
+ * IS `true` for Node.js 10.10 and greater.
+ */
+exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = IS_MATCHED_BY_MAJOR || IS_MATCHED_BY_MAJOR_AND_MINOR;
 
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.scandir/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/providers/async.js");
+const sync = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/settings.js");
+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);
+}
 
 
-var ConnectableObservable = (function (_super) {
-    Object(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._subject = null;
-        _this._refCount = 0;
-        _this._connection = null;
-        if (Object(_util_lift__WEBPACK_IMPORTED_MODULE_5__["hasLift"])(source)) {
-            _this.lift = source.lift;
-        }
-        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._teardown = function () {
-        this._refCount = 0;
-        var _connection = this._connection;
-        this._subject = this._connection = null;
-        _connection === null || _connection === void 0 ? void 0 : _connection.unsubscribe();
-    };
-    ConnectableObservable.prototype.connect = function () {
-        var _this = this;
-        var connection = this._connection;
-        if (!connection) {
-            connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-            var subject_1 = this.getSubject();
-            connection.add(this.source.subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subject_1, undefined, function () {
-                _this._teardown();
-                subject_1.complete();
-            }, function (err) {
-                _this._teardown();
-                subject_1.error(err);
-            }, function () { return _this._teardown(); })));
-            if (connection.closed) {
-                this._connection = null;
-                connection = _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
-            }
-        }
-        return connection;
-    };
-    ConnectableObservable.prototype.refCount = function () {
-        return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_3__["refCount"])()(this);
-    };
-    return ConnectableObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+/***/ }),
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const rpl = __webpack_require__("../../node_modules/run-parallel/index.js");
+const constants_1 = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/constants.js");
+const utils = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/utils/index.js");
+function read(directory, settings, callback) {
+    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
+        return readdirWithFileTypes(directory, settings, callback);
+    }
+    return readdir(directory, settings, callback);
+}
+exports.read = read;
+function readdirWithFileTypes(directory, settings, callback) {
+    settings.fs.readdir(directory, { withFileTypes: true }, (readdirError, dirents) => {
+        if (readdirError !== null) {
+            return callFailureCallback(callback, readdirError);
+        }
+        const entries = dirents.map((dirent) => ({
+            dirent,
+            name: dirent.name,
+            path: `${directory}${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 !== null) {
+                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 !== null) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    return done(statError);
+                }
+                return done(null, entry);
+            }
+            entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
+            return done(null, entry);
+        });
+    };
+}
+function readdir(directory, settings, callback) {
+    settings.fs.readdir(directory, (readdirError, names) => {
+        if (readdirError !== null) {
+            return callFailureCallback(callback, readdirError);
+        }
+        const filepaths = names.map((name) => `${directory}${settings.pathSegmentSeparator}${name}`);
+        const tasks = filepaths.map((filepath) => {
+            return (done) => fsStat.stat(filepath, settings.fsStatSettings, done);
+        });
+        rpl(tasks, (rplError, results) => {
+            if (rplError !== null) {
+                return callFailureCallback(callback, rplError);
+            }
+            const entries = [];
+            names.forEach((name, 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);
+}
 
-//# sourceMappingURL=ConnectableObservable.js.map
 
 /***/ }),
-/* 28 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+/***/ "../../node_modules/@nodelib/fs.scandir/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const constants_1 = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/constants.js");
+const utils = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/utils/index.js");
+function read(directory, settings) {
+    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
+        return readdirWithFileTypes(directory, settings);
+    }
+    return readdir(directory, settings);
+}
+exports.read = read;
+function readdirWithFileTypes(directory, settings) {
+    const dirents = settings.fs.readdirSync(directory, { withFileTypes: true });
+    return dirents.map((dirent) => {
+        const entry = {
+            dirent,
+            name: dirent.name,
+            path: `${directory}${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(directory, settings) {
+    const names = settings.fs.readdirSync(directory);
+    return names.map((name) => {
+        const entryPath = `${directory}${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;
 
-function refCount() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var connection = null;
-        source._refCount++;
-        var refCounter = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, undefined, undefined, undefined, function () {
-            if (!source || source._refCount <= 0 || 0 < --source._refCount) {
-                connection = null;
-                return;
-            }
-            var sharedConnection = source._connection;
-            var conn = connection;
-            connection = null;
-            if (sharedConnection && (!conn || sharedConnection === conn)) {
-                sharedConnection.unsubscribe();
-            }
-            subscriber.unsubscribe();
-        });
-        source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            connection = source.connect();
-        }
-    });
-}
-//# sourceMappingURL=refCount.js.map
 
 /***/ }),
-/* 29 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hasLift", function() { return hasLift; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "operate", function() { return operate; });
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fs = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/adapters/fs.js");
+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;
 
-function hasLift(source) {
-    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__["isFunction"])(source === null || source === void 0 ? void 0 : source.lift);
-}
-function operate(init) {
-    return function (source) {
-        if (hasLift(source)) {
-            return source.lift(function (liftedSource) {
-                try {
-                    return init(liftedSource, this);
-                }
-                catch (err) {
-                    this.error(err);
-                }
-            });
-        }
-        throw new TypeError('Unable to lift unknown Observable type');
-    };
-}
-//# sourceMappingURL=lift.js.map
 
 /***/ }),
-/* 30 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/utils/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createOperatorSubscriber", function() { return createOperatorSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OperatorSubscriber", function() { return OperatorSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11);
+
+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;
 
 
-function createOperatorSubscriber(destination, onNext, onComplete, onError, onFinalize) {
-    return new OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize);
-}
-var OperatorSubscriber = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(OperatorSubscriber, _super);
-    function OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize, shouldUnsubscribe) {
-        var _this = _super.call(this, destination) || this;
-        _this.onFinalize = onFinalize;
-        _this.shouldUnsubscribe = shouldUnsubscribe;
-        _this._next = onNext
-            ? function (value) {
-                try {
-                    onNext(value);
-                }
-                catch (err) {
-                    destination.error(err);
-                }
-            }
-            : _super.prototype._next;
-        _this._error = onError
-            ? function (err) {
-                try {
-                    onError(err);
-                }
-                catch (err) {
-                    destination.error(err);
-                }
-                finally {
-                    this.unsubscribe();
-                }
-            }
-            : _super.prototype._error;
-        _this._complete = onComplete
-            ? function () {
-                try {
-                    onComplete();
-                }
-                catch (err) {
-                    destination.error(err);
-                }
-                finally {
-                    this.unsubscribe();
-                }
-            }
-            : _super.prototype._complete;
-        return _this;
-    }
-    OperatorSubscriber.prototype.unsubscribe = function () {
-        var _a;
-        if (!this.shouldUnsubscribe || this.shouldUnsubscribe()) {
-            var closed_1 = this.closed;
-            _super.prototype.unsubscribe.call(this);
-            !closed_1 && ((_a = this.onFinalize) === null || _a === void 0 ? void 0 : _a.call(this));
-        }
-    };
-    return OperatorSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-
-//# sourceMappingURL=OperatorSubscriber.js.map
-
 /***/ }),
-/* 31 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrames", function() { return animationFrames; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-/* harmony import */ var _scheduler_performanceTimestampProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(32);
-/* harmony import */ var _scheduler_animationFrameProvider__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(33);
-
 
+/***/ "../../node_modules/@nodelib/fs.scandir/out/utils/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/utils/fs.js");
+exports.fs = fs;
 
-function animationFrames(timestampProvider) {
-    return timestampProvider ? animationFramesFactory(timestampProvider) : DEFAULT_ANIMATION_FRAMES;
-}
-function animationFramesFactory(timestampProvider) {
-    var schedule = _scheduler_animationFrameProvider__WEBPACK_IMPORTED_MODULE_3__["animationFrameProvider"].schedule;
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        var provider = timestampProvider || _scheduler_performanceTimestampProvider__WEBPACK_IMPORTED_MODULE_2__["performanceTimestampProvider"];
-        var start = provider.now();
-        var run = function (timestamp) {
-            var now = provider.now();
-            subscriber.next({
-                timestamp: timestampProvider ? now : timestamp,
-                elapsed: now - start,
-            });
-            if (!subscriber.closed) {
-                subscription.add(schedule(run));
-            }
-        };
-        subscription.add(schedule(run));
-        return subscription;
-    });
-}
-var DEFAULT_ANIMATION_FRAMES = animationFramesFactory();
-//# sourceMappingURL=animationFrames.js.map
 
 /***/ }),
-/* 32 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "performanceTimestampProvider", function() { return performanceTimestampProvider; });
-var performanceTimestampProvider = {
-    now: function () {
-        return (performanceTimestampProvider.delegate || performance).now();
-    },
-    delegate: undefined,
-};
-//# sourceMappingURL=performanceTimestampProvider.js.map
 
-/***/ }),
-/* 33 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ "../../node_modules/@nodelib/fs.stat/out/adapters/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrameProvider", function() { return animationFrameProvider; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("fs");
+exports.FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    stat: fs.stat,
+    lstatSync: fs.lstatSync,
+    statSync: fs.statSync
+};
+function createFileSystemAdapter(fsMethods) {
+    if (fsMethods === undefined) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
+}
+exports.createFileSystemAdapter = createFileSystemAdapter;
 
-var animationFrameProvider = {
-    schedule: function (callback) {
-        var request = requestAnimationFrame;
-        var cancel = cancelAnimationFrame;
-        var delegate = animationFrameProvider.delegate;
-        if (delegate) {
-            request = delegate.requestAnimationFrame;
-            cancel = delegate.cancelAnimationFrame;
-        }
-        var handle = request(function (timestamp) {
-            cancel = undefined;
-            callback(timestamp);
-        });
-        return new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](function () { return cancel === null || cancel === void 0 ? void 0 : cancel(handle); });
-    },
-    requestAnimationFrame: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var delegate = animationFrameProvider.delegate;
-        return ((delegate === null || delegate === void 0 ? void 0 : delegate.requestAnimationFrame) || requestAnimationFrame).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-    },
-    cancelAnimationFrame: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var delegate = animationFrameProvider.delegate;
-        return ((delegate === null || delegate === void 0 ? void 0 : delegate.cancelAnimationFrame) || cancelAnimationFrame).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-    },
-    delegate: undefined,
-};
-//# sourceMappingURL=animationFrameProvider.js.map
 
 /***/ }),
-/* 34 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.stat/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* 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__(12);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
-/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(23);
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/providers/async.js");
+const sync = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/settings.js");
+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);
+}
 
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.stat/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function read(path, settings, callback) {
+    settings.fs.lstat(path, (lstatError, lstat) => {
+        if (lstatError !== null) {
+            return callFailureCallback(callback, lstatError);
+        }
+        if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
+            return callSuccessCallback(callback, lstat);
+        }
+        settings.fs.stat(path, (statError, stat) => {
+            if (statError !== null) {
+                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);
+}
 
 
-var Subject = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(Subject, _super);
-    function Subject() {
-        var _this = _super.call(this) || this;
-        _this.closed = false;
-        _this.currentObservers = null;
-        _this.observers = [];
-        _this.isStopped = false;
-        _this.hasError = false;
-        _this.thrownError = null;
-        return _this;
-    }
-    Subject.prototype.lift = function (operator) {
-        var subject = new AnonymousSubject(this, this);
-        subject.operator = operator;
-        return subject;
-    };
-    Subject.prototype._throwIfClosed = function () {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_3__["ObjectUnsubscribedError"]();
-        }
-    };
-    Subject.prototype.next = function (value) {
-        var _this = this;
-        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__["errorContext"])(function () {
-            var e_1, _a;
-            _this._throwIfClosed();
-            if (!_this.isStopped) {
-                if (!_this.currentObservers) {
-                    _this.currentObservers = Array.from(_this.observers);
-                }
-                try {
-                    for (var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(_this.currentObservers), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var observer = _c.value;
-                        observer.next(value);
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-            }
-        });
-    };
-    Subject.prototype.error = function (err) {
-        var _this = this;
-        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__["errorContext"])(function () {
-            _this._throwIfClosed();
-            if (!_this.isStopped) {
-                _this.hasError = _this.isStopped = true;
-                _this.thrownError = err;
-                var observers = _this.observers;
-                while (observers.length) {
-                    observers.shift().error(err);
-                }
-            }
-        });
-    };
-    Subject.prototype.complete = function () {
-        var _this = this;
-        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__["errorContext"])(function () {
-            _this._throwIfClosed();
-            if (!_this.isStopped) {
-                _this.isStopped = true;
-                var observers = _this.observers;
-                while (observers.length) {
-                    observers.shift().complete();
-                }
-            }
-        });
-    };
-    Subject.prototype.unsubscribe = function () {
-        this.isStopped = this.closed = true;
-        this.observers = this.currentObservers = null;
-    };
-    Object.defineProperty(Subject.prototype, "observed", {
-        get: function () {
-            var _a;
-            return ((_a = this.observers) === null || _a === void 0 ? void 0 : _a.length) > 0;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Subject.prototype._trySubscribe = function (subscriber) {
-        this._throwIfClosed();
-        return _super.prototype._trySubscribe.call(this, subscriber);
-    };
-    Subject.prototype._subscribe = function (subscriber) {
-        this._throwIfClosed();
-        this._checkFinalizedStatuses(subscriber);
-        return this._innerSubscribe(subscriber);
-    };
-    Subject.prototype._innerSubscribe = function (subscriber) {
-        var _this = this;
-        var _a = this, hasError = _a.hasError, isStopped = _a.isStopped, observers = _a.observers;
-        if (hasError || isStopped) {
-            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["EMPTY_SUBSCRIPTION"];
-        }
-        this.currentObservers = null;
-        observers.push(subscriber);
-        return new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](function () {
-            _this.currentObservers = null;
-            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_4__["arrRemove"])(observers, subscriber);
-        });
-    };
-    Subject.prototype._checkFinalizedStatuses = function (subscriber) {
-        var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, isStopped = _a.isStopped;
-        if (hasError) {
-            subscriber.error(thrownError);
-        }
-        else if (isStopped) {
-            subscriber.complete();
-        }
-    };
-    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 = (function (_super) {
-    Object(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 _a, _b;
-        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.next) === null || _b === void 0 ? void 0 : _b.call(_a, value);
-    };
-    AnonymousSubject.prototype.error = function (err) {
-        var _a, _b;
-        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.call(_a, err);
-    };
-    AnonymousSubject.prototype.complete = function () {
-        var _a, _b;
-        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.complete) === null || _b === void 0 ? void 0 : _b.call(_a);
-    };
-    AnonymousSubject.prototype._subscribe = function (subscriber) {
-        var _a, _b;
-        return (_b = (_a = this.source) === null || _a === void 0 ? void 0 : _a.subscribe(subscriber)) !== null && _b !== void 0 ? _b : _Subscription__WEBPACK_IMPORTED_MODULE_2__["EMPTY_SUBSCRIPTION"];
-    };
-    return AnonymousSubject;
-}(Subject));
+/***/ "../../node_modules/@nodelib/fs.stat/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function read(path, settings) {
+    const lstat = settings.fs.lstatSync(path);
+    if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
+        return lstat;
+    }
+    try {
+        const stat = settings.fs.statSync(path);
+        if (settings.markSymbolicLink) {
+            stat.isSymbolicLink = () => true;
+        }
+        return stat;
+    }
+    catch (error) {
+        if (!settings.throwErrorOnBrokenSymbolicLink) {
+            return lstat;
+        }
+        throw error;
+    }
+}
+exports.read = read;
 
-//# sourceMappingURL=Subject.js.map
 
 /***/ }),
-/* 35 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.stat/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; });
-/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/adapters/fs.js");
+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;
 
-var ObjectUnsubscribedError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__["createErrorClass"])(function (_super) {
-    return function ObjectUnsubscribedErrorImpl() {
-        _super(this);
-        this.name = 'ObjectUnsubscribedError';
-        this.message = 'object unsubscribed';
-    };
-});
-//# sourceMappingURL=ObjectUnsubscribedError.js.map
 
 /***/ }),
-/* 36 */
-/***/ (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__(12);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var BehaviorSubject = (function (_super) {
-    Object(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: false,
-        configurable: true
-    });
-    BehaviorSubject.prototype._subscribe = function (subscriber) {
-        var subscription = _super.prototype._subscribe.call(this, subscriber);
-        !subscription.closed && subscriber.next(this._value);
-        return subscription;
-    };
-    BehaviorSubject.prototype.getValue = function () {
-        var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, _value = _a._value;
-        if (hasError) {
-            throw thrownError;
-        }
-        this._throwIfClosed();
-        return _value;
-    };
-    BehaviorSubject.prototype.next = function (value) {
-        _super.prototype.next.call(this, (this._value = value));
-    };
-    return BehaviorSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/providers/async.js");
+const stream_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/providers/stream.js");
+const sync_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/settings.js");
+exports.Settings = settings_1.default;
+function walk(directory, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return new async_1.default(directory, getSettings()).read(optionsOrSettingsOrCallback);
+    }
+    new async_1.default(directory, getSettings(optionsOrSettingsOrCallback)).read(callback);
+}
+exports.walk = walk;
+function walkSync(directory, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    const provider = new sync_1.default(directory, settings);
+    return provider.read();
+}
+exports.walkSync = walkSync;
+function walkStream(directory, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    const provider = new stream_1.default(directory, settings);
+    return provider.read();
+}
+exports.walkStream = walkStream;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
 
-//# sourceMappingURL=BehaviorSubject.js.map
 
 /***/ }),
-/* 37 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.walk/out/providers/async.js":
+/***/ (function(module, 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__(12);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38);
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/async.js");
+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, [...this._storage]);
+        });
+        this._reader.read();
+    }
+}
+exports.default = AsyncProvider;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, entries) {
+    callback(null, entries);
+}
 
 
+/***/ }),
 
-var ReplaySubject = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(ReplaySubject, _super);
-    function ReplaySubject(_bufferSize, _windowTime, _timestampProvider) {
-        if (_bufferSize === void 0) { _bufferSize = Infinity; }
-        if (_windowTime === void 0) { _windowTime = Infinity; }
-        if (_timestampProvider === void 0) { _timestampProvider = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_2__["dateTimestampProvider"]; }
-        var _this = _super.call(this) || this;
-        _this._bufferSize = _bufferSize;
-        _this._windowTime = _windowTime;
-        _this._timestampProvider = _timestampProvider;
-        _this._buffer = [];
-        _this._infiniteTimeWindow = true;
-        _this._infiniteTimeWindow = _windowTime === Infinity;
-        _this._bufferSize = Math.max(1, _bufferSize);
-        _this._windowTime = Math.max(1, _windowTime);
-        return _this;
-    }
-    ReplaySubject.prototype.next = function (value) {
-        var _a = this, isStopped = _a.isStopped, _buffer = _a._buffer, _infiniteTimeWindow = _a._infiniteTimeWindow, _timestampProvider = _a._timestampProvider, _windowTime = _a._windowTime;
-        if (!isStopped) {
-            _buffer.push(value);
-            !_infiniteTimeWindow && _buffer.push(_timestampProvider.now() + _windowTime);
-        }
-        this._trimBuffer();
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype._subscribe = function (subscriber) {
-        this._throwIfClosed();
-        this._trimBuffer();
-        var subscription = this._innerSubscribe(subscriber);
-        var _a = this, _infiniteTimeWindow = _a._infiniteTimeWindow, _buffer = _a._buffer;
-        var copy = _buffer.slice();
-        for (var i = 0; i < copy.length && !subscriber.closed; i += _infiniteTimeWindow ? 1 : 2) {
-            subscriber.next(copy[i]);
-        }
-        this._checkFinalizedStatuses(subscriber);
-        return subscription;
-    };
-    ReplaySubject.prototype._trimBuffer = function () {
-        var _a = this, _bufferSize = _a._bufferSize, _timestampProvider = _a._timestampProvider, _buffer = _a._buffer, _infiniteTimeWindow = _a._infiniteTimeWindow;
-        var adjustedBufferSize = (_infiniteTimeWindow ? 1 : 2) * _bufferSize;
-        _bufferSize < Infinity && adjustedBufferSize < _buffer.length && _buffer.splice(0, _buffer.length - adjustedBufferSize);
-        if (!_infiniteTimeWindow) {
-            var now = _timestampProvider.now();
-            var last = 0;
-            for (var i = 1; i < _buffer.length && _buffer[i] <= now; i += 2) {
-                last = i;
-            }
-            last && _buffer.splice(0, last + 1);
-        }
-    };
-    return ReplaySubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
-
-//# sourceMappingURL=ReplaySubject.js.map
-
-/***/ }),
-/* 38 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dateTimestampProvider", function() { return dateTimestampProvider; });
-var dateTimestampProvider = {
-    now: function () {
-        return (dateTimestampProvider.delegate || Date).now();
-    },
-    delegate: undefined,
-};
-//# sourceMappingURL=dateTimestampProvider.js.map
-
-/***/ }),
-/* 39 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ "../../node_modules/@nodelib/fs.walk/out/providers/stream.js":
+/***/ (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__(12);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-
-
-var AsyncSubject = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(AsyncSubject, _super);
-    function AsyncSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this._value = null;
-        _this._hasValue = false;
-        _this._isComplete = false;
-        return _this;
-    }
-    AsyncSubject.prototype._checkFinalizedStatuses = function (subscriber) {
-        var _a = this, hasError = _a.hasError, _hasValue = _a._hasValue, _value = _a._value, thrownError = _a.thrownError, isStopped = _a.isStopped, _isComplete = _a._isComplete;
-        if (hasError) {
-            subscriber.error(thrownError);
-        }
-        else if (isStopped || _isComplete) {
-            _hasValue && subscriber.next(_value);
-            subscriber.complete();
-        }
-    };
-    AsyncSubject.prototype.next = function (value) {
-        if (!this.isStopped) {
-            this._value = value;
-            this._hasValue = true;
-        }
-    };
-    AsyncSubject.prototype.complete = function () {
-        var _a = this, _hasValue = _a._hasValue, _value = _a._value, _isComplete = _a._isComplete;
-        if (!_isComplete) {
-            this._isComplete = true;
-            _hasValue && _super.prototype.next.call(this, _value);
-            _super.prototype.complete.call(this);
-        }
-    };
-    return AsyncSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const async_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/async.js");
+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;
 
-//# sourceMappingURL=AsyncSubject.js.map
 
 /***/ }),
-/* 40 */
-/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return asap; });
-/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(41);
-/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
+/***/ "../../node_modules/@nodelib/fs.walk/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/sync.js");
+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 asapScheduler = new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapScheduler"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__["AsapAction"]);
-var asap = asapScheduler;
-//# sourceMappingURL=asap.js.map
 
 /***/ }),
-/* 41 */
-/***/ (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__(12);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42);
-/* harmony import */ var _immediateProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(45);
-
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var AsapAction = (function (_super) {
-    Object(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 = _immediateProvider__WEBPACK_IMPORTED_MODULE_2__["immediateProvider"].setImmediate(scheduler.flush.bind(scheduler, undefined)));
-    };
-    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.some(function (action) { return action.id === id; })) {
-            _immediateProvider__WEBPACK_IMPORTED_MODULE_2__["immediateProvider"].clearImmediate(id);
-            scheduler._scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AsapAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __webpack_require__("events");
+const fsScandir = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/index.js");
+const fastq = __webpack_require__("../../node_modules/fastq/queue.js");
+const common = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/common.js");
+const reader_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/reader.js");
+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(directory, base) {
+        const queueItem = { directory, base };
+        this._queue.push(queueItem, (error) => {
+            if (error !== null) {
+                this._handleError(error);
+            }
+        });
+    }
+    _worker(item, done) {
+        this._scandir(item.directory, this._settings.fsScandirSettings, (error, entries) => {
+            if (error !== null) {
+                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;
 
-//# sourceMappingURL=AsapAction.js.map
 
 /***/ }),
-/* 42 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/common.js":
+/***/ (function(module, 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__(12);
-/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(43);
-/* harmony import */ var _intervalProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(17);
+
+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;
 
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/reader.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var AsyncAction = (function (_super) {
-    Object(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 _intervalProvider__WEBPACK_IMPORTED_MODULE_2__["intervalProvider"].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;
-        }
-        _intervalProvider__WEBPACK_IMPORTED_MODULE_2__["intervalProvider"].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;
-        try {
-            this.work(state);
-        }
-        catch (e) {
-            errored = true;
-            errorValue = e ? e : new Error('Scheduled action threw falsy error');
-        }
-        if (errored) {
-            this.unsubscribe();
-            return errorValue;
-        }
-    };
-    AsyncAction.prototype.unsubscribe = function () {
-        if (!this.closed) {
-            var _a = this, id = _a.id, scheduler = _a.scheduler;
-            var actions = scheduler.actions;
-            this.work = this.state = this.scheduler = null;
-            this.pending = false;
-            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__["arrRemove"])(actions, this);
-            if (id != null) {
-                this.id = this.recycleAsyncId(scheduler, id, null);
-            }
-            this.delay = null;
-            _super.prototype.unsubscribe.call(this);
-        }
-    };
-    return AsyncAction;
-}(_Action__WEBPACK_IMPORTED_MODULE_1__["Action"]));
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const common = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/common.js");
+class Reader {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
+    }
+}
+exports.default = Reader;
 
-//# sourceMappingURL=AsyncAction.js.map
 
 /***/ }),
-/* 43 */
-/***/ (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__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var Action = (function (_super) {
-    Object(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"]));
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsScandir = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/index.js");
+const common = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/common.js");
+const reader_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/reader.js");
+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 [...this._storage];
+    }
+    _pushToQueue(directory, base) {
+        this._queue.add({ directory, base });
+    }
+    _handleQueue() {
+        for (const item of this._queue.values()) {
+            this._handleDirectory(item.directory, item.base);
+        }
+    }
+    _handleDirectory(directory, base) {
+        try {
+            const entries = this._scandir(directory, 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;
 
-//# sourceMappingURL=Action.js.map
 
 /***/ }),
-/* 44 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.walk/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "intervalProvider", function() { return intervalProvider; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsScandir = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/index.js");
+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;
 
-var intervalProvider = {
-    setInterval: function (handler, timeout) {
-        var args = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            args[_i - 2] = arguments[_i];
-        }
-        var delegate = intervalProvider.delegate;
-        if (delegate === null || delegate === void 0 ? void 0 : delegate.setInterval) {
-            return delegate.setInterval.apply(delegate, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-        }
-        return setInterval.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-    },
-    clearInterval: function (handle) {
-        var delegate = intervalProvider.delegate;
-        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearInterval) || clearInterval)(handle);
-    },
-    delegate: undefined,
-};
-//# sourceMappingURL=intervalProvider.js.map
 
 /***/ }),
-/* 45 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "immediateProvider", function() { return immediateProvider; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(46);
+/***/ "../../node_modules/@yarnpkg/lockfile/index.js":
+/***/ (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) {
 
-var setImmediate = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].setImmediate, clearImmediate = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].clearImmediate;
-var immediateProvider = {
-    setImmediate: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var delegate = immediateProvider.delegate;
-        return ((delegate === null || delegate === void 0 ? void 0 : delegate.setImmediate) || setImmediate).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)));
-    },
-    clearImmediate: function (handle) {
-        var delegate = immediateProvider.delegate;
-        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearImmediate) || clearImmediate)(handle);
-    },
-    delegate: undefined,
-};
-//# sourceMappingURL=immediateProvider.js.map
-
-/***/ }),
-/* 46 */
-/***/ (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; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TestTools", function() { return TestTools; });
-var nextHandle = 1;
-var resolved;
-var activeHandles = {};
-function findAndClearHandle(handle) {
-    if (handle in activeHandles) {
-        delete activeHandles[handle];
-        return true;
-    }
-    return false;
-}
-var Immediate = {
-    setImmediate: function (cb) {
-        var handle = nextHandle++;
-        activeHandles[handle] = true;
-        if (!resolved) {
-            resolved = Promise.resolve();
-        }
-        resolved.then(function () { return findAndClearHandle(handle) && cb(); });
-        return handle;
-    },
-    clearImmediate: function (handle) {
-        findAndClearHandle(handle);
-    },
-};
-var TestTools = {
-    pending: function () {
-        return Object.keys(activeHandles).length;
-    }
-};
-//# sourceMappingURL=Immediate.js.map
+module.exports = __webpack_require__("path");
 
 /***/ }),
-/* 47 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 1 */
+/***/ (function(module, 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__(12);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
-
 
-var AsapScheduler = (function (_super) {
-    Object(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;
-        var flushId = this._scheduled;
-        this._scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        action = action || actions.shift();
-        do {
-            if ((error = action.execute(action.state, action.delay))) {
-                break;
-            }
-        } while ((action = actions[0]) && action.id === flushId && actions.shift());
-        this._active = false;
-        if (error) {
-            while ((action = actions[0]) && action.id === flushId && actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsapScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
 
-//# sourceMappingURL=AsapScheduler.js.map
+exports.__esModule = true;
 
-/***/ }),
-/* 48 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _promise = __webpack_require__(173);
 
-"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__(12);
-/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(49);
+var _promise2 = _interopRequireDefault(_promise);
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var AsyncScheduler = (function (_super) {
-    Object(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, now) || this;
-        _this.actions = [];
-        _this._active = false;
-        _this._scheduled = undefined;
-        return _this;
-    }
-    AsyncScheduler.prototype.flush = function (action) {
-        var actions = this.actions;
-        if (this._active) {
-            actions.push(action);
-            return;
+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;
         }
-        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;
+
+        if (info.done) {
+          resolve(value);
+        } else {
+          return _promise2.default.resolve(value).then(function (value) {
+            step("next", value);
+          }, function (err) {
+            step("throw", err);
+          });
         }
-    };
-    return AsyncScheduler;
-}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"]));
+      }
 
-//# sourceMappingURL=AsyncScheduler.js.map
+      return step("next");
+    });
+  };
+};
 
 /***/ }),
-/* 49 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 2 */
+/***/ (function(module, exports) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return Scheduler; });
-/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(38);
+module.exports = __webpack_require__("util");
 
-var Scheduler = (function () {
-    function Scheduler(schedulerActionCtor, now) {
-        if (now === void 0) { now = Scheduler.now; }
-        this.schedulerActionCtor = schedulerActionCtor;
-        this.now = now;
-    }
-    Scheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) { delay = 0; }
-        return new this.schedulerActionCtor(this, work).schedule(state, delay);
-    };
-    Scheduler.now = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__["dateTimestampProvider"].now;
-    return Scheduler;
-}());
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
 
-//# sourceMappingURL=Scheduler.js.map
+module.exports = __webpack_require__("fs");
 
 /***/ }),
-/* 50 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return asyncScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "async", function() { return async; });
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
-
-
-var asyncScheduler = new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__["AsyncAction"]);
-var async = asyncScheduler;
-//# sourceMappingURL=async.js.map
 
-/***/ }),
-/* 51 */
-/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return queue; });
-/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(52);
-/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(53);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+class MessageError extends Error {
+  constructor(msg, code) {
+    super(msg);
+    this.code = code;
+  }
 
+}
 
-var queueScheduler = new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["QueueScheduler"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__["QueueAction"]);
-var queue = queueScheduler;
-//# sourceMappingURL=queue.js.map
+exports.MessageError = MessageError;
+class ProcessSpawnError extends MessageError {
+  constructor(msg, code, process) {
+    super(msg, code);
+    this.process = process;
+  }
 
-/***/ }),
-/* 52 */
-/***/ (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__(12);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42);
+exports.ProcessSpawnError = ProcessSpawnError;
+class SecurityError extends MessageError {}
 
+exports.SecurityError = SecurityError;
+class ProcessTermError extends MessageError {}
 
-var QueueAction = (function (_super) {
-    Object(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"]));
+exports.ProcessTermError = ProcessTermError;
+class ResponseError extends Error {
+  constructor(msg, responseCode) {
+    super(msg);
+    this.responseCode = responseCode;
+  }
 
-//# sourceMappingURL=QueueAction.js.map
+}
+exports.ResponseError = ResponseError;
 
 /***/ }),
-/* 53 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 5 */
+/***/ (function(module, 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__(12);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
 
 
-var QueueScheduler = (function (_super) {
-    Object(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"]));
+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;
 
-//# sourceMappingURL=QueueScheduler.js.map
+var _asyncToGenerator2;
 
-/***/ }),
-/* 54 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return animationFrameScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return animationFrame; });
-/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
-/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
+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;
 
-var animationFrameScheduler = new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__["AnimationFrameScheduler"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__["AnimationFrameAction"]);
-var animationFrame = animationFrameScheduler;
-//# sourceMappingURL=animationFrame.js.map
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
 
-/***/ }),
-/* 55 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        // 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());
+        }
 
-"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__(12);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42);
-/* harmony import */ var _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33);
+        if (type === 'symlink') {
+          yield mkdirp((_path || _load_path()).default.dirname(dest));
+          onFresh();
+          actions.symlink.push({
+            dest,
+            linkname: src
+          });
+          onDone();
+          return;
+        }
 
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
 
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-var AnimationFrameAction = (function (_super) {
-    Object(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 = _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__["animationFrameProvider"].requestAnimationFrame(function () { return scheduler.flush(undefined); }));
-    };
-    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 (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
         }
-        if (!scheduler.actions.some(function (action) { return action.id === id; })) {
-            _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__["animationFrameProvider"].cancelAnimationFrame(id);
-            scheduler._scheduled = undefined;
+
+        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;
+          }
         }
-        return undefined;
-    };
-    return AnimationFrameAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
 
-//# sourceMappingURL=AnimationFrameAction.js.map
+        // if destination exists
+        if (destStat) {
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-/***/ }),
-/* 56 */
-/***/ (function(module, __webpack_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";
-__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__(12);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
+          /* 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;
+          }
 
-var AnimationFrameScheduler = (function (_super) {
-    Object(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;
-        var flushId = this._scheduled;
-        this._scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        action = action || actions.shift();
-        do {
-            if ((error = action.execute(action.state, action.delay))) {
-                break;
-            }
-        } while ((action = actions[0]) && action.id === flushId && actions.shift());
-        this._active = false;
-        if (error) {
-            while ((action = actions[0]) && action.id === flushId && actions.shift()) {
-                action.unsubscribe();
+          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;
+          }
+
+          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;
             }
-            throw error;
-        }
-    };
-    return AnimationFrameScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
+          }
 
-//# sourceMappingURL=AnimationFrameScheduler.js.map
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
 
-/***/ }),
-/* 57 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+              var _ref6;
 
-"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__(12);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(48);
+              if (_isArray4) {
+                if (_i4 >= _iterator4.length) break;
+                _ref6 = _iterator4[_i4++];
+              } else {
+                _i4 = _iterator4.next();
+                if (_i4.done) break;
+                _ref6 = _i4.value;
+              }
 
+              const file = _ref6;
 
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
+                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;
 
-var VirtualTimeScheduler = (function (_super) {
-    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(VirtualTimeScheduler, _super);
-    function VirtualTimeScheduler(schedulerActionCtor, maxFrames) {
-        if (schedulerActionCtor === void 0) { schedulerActionCtor = VirtualAction; }
-        if (maxFrames === void 0) { maxFrames = Infinity; }
-        var _this = _super.call(this, schedulerActionCtor, 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;
-        var 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_3__["AsyncScheduler"]));
+                    if (_isArray5) {
+                      if (_i5 >= _iterator5.length) break;
+                      _ref7 = _iterator5[_i5++];
+                    } else {
+                      _i5 = _iterator5.next();
+                      if (_i5.done) break;
+                      _ref7 = _i5.value;
+                    }
 
-var VirtualAction = (function (_super) {
-    Object(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 (Number.isFinite(delay)) {
-            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);
-        }
-        else {
-            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
-        }
-    };
-    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;
+                    const file = _ref7;
+
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
             }
+          }
         }
-        else if (a.delay > b.delay) {
-            return 1;
-        }
-        else {
-            return -1;
-        }
-    };
-    return VirtualAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
-
-//# sourceMappingURL=VirtualTimeScheduler.js.map
-
-/***/ }),
-/* 58 */
-/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "observeNotification", function() { return observeNotification; });
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59);
-/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60);
-/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(83);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(13);
-
-
 
-
-var NotificationKind;
-(function (NotificationKind) {
-    NotificationKind["NEXT"] = "N";
-    NotificationKind["ERROR"] = "E";
-    NotificationKind["COMPLETE"] = "C";
-})(NotificationKind || (NotificationKind = {}));
-var Notification = (function () {
-    function Notification(kind, value, error) {
-        this.kind = kind;
-        this.value = value;
-        this.error = error;
-        this.hasValue = kind === 'N';
-    }
-    Notification.prototype.observe = function (observer) {
-        return observeNotification(this, observer);
-    };
-    Notification.prototype.do = function (nextHandler, errorHandler, completeHandler) {
-        var _a = this, kind = _a.kind, value = _a.value, error = _a.error;
-        return kind === 'N' ? nextHandler === null || nextHandler === void 0 ? void 0 : nextHandler(value) : kind === 'E' ? errorHandler === null || errorHandler === void 0 ? void 0 : errorHandler(error) : completeHandler === null || completeHandler === void 0 ? void 0 : completeHandler();
-    };
-    Notification.prototype.accept = function (nextOrObserver, error, complete) {
-        var _a;
-        return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])((_a = nextOrObserver) === null || _a === void 0 ? void 0 : _a.next)
-            ? this.observe(nextOrObserver)
-            : this.do(nextOrObserver, error, complete);
-    };
-    Notification.prototype.toObservable = function () {
-        var _a = this, kind = _a.kind, value = _a.value, error = _a.error;
-        var result = kind === 'N'
-            ?
-                Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__["of"])(value)
-            :
-                kind === 'E'
-                    ?
-                        Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__["throwError"])(function () { return error; })
-                    :
-                        kind === 'C'
-                            ?
-                                _observable_empty__WEBPACK_IMPORTED_MODULE_0__["EMPTY"]
-                            :
-                                0;
-        if (!result) {
-            throw new TypeError("Unexpected notification kind " + kind);
+        if (destStat && destStat.isSymbolicLink()) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+          destStat = null;
         }
-        return result;
-    };
-    Notification.createNext = function (value) {
-        return new Notification('N', value);
-    };
-    Notification.createError = function (err) {
-        return new Notification('E', undefined, err);
-    };
-    Notification.createComplete = function () {
-        return Notification.completeNotification;
-    };
-    Notification.completeNotification = new Notification('C');
-    return Notification;
-}());
-
-function observeNotification(notification, observer) {
-    var _a, _b, _c;
-    var _d = notification, kind = _d.kind, value = _d.value, error = _d.error;
-    if (typeof kind !== 'string') {
-        throw new TypeError('Invalid notification, missing "kind"');
-    }
-    kind === 'N' ? (_a = observer.next) === null || _a === void 0 ? void 0 : _a.call(observer, value) : kind === 'E' ? (_b = observer.error) === null || _b === void 0 ? void 0 : _b.call(observer, error) : (_c = observer.complete) === null || _c === void 0 ? void 0 : _c.call(observer);
-}
-//# sourceMappingURL=Notification.js.map
-
-/***/ }),
-/* 59 */
-/***/ (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__(10);
-
-var EMPTY = 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
-
-/***/ }),
-/* 60 */
-/***/ (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_args__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(61);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(63);
+        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);
+          }
 
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-function of() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_0__["popScheduler"])(args);
-    return Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(args, scheduler);
-}
-//# sourceMappingURL=of.js.map
+          // 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;
 
-/***/ }),
-/* 61 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref8 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref8 = _i6.value;
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "popResultSelector", function() { return popResultSelector; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "popScheduler", function() { return popScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "popNumber", function() { return popNumber; });
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(62);
+            const file = _ref8;
 
+            queue.push({
+              dest: (_path || _load_path()).default.join(dest, file),
+              onFresh,
+              onDone: function (_onDone) {
+                function onDone() {
+                  return _onDone.apply(this, arguments);
+                }
 
-function last(arr) {
-    return arr[arr.length - 1];
-}
-function popResultSelector(args) {
-    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__["isFunction"])(last(args)) ? args.pop() : undefined;
-}
-function popScheduler(args) {
-    return Object(_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(last(args)) ? args.pop() : undefined;
-}
-function popNumber(args, defaultValue) {
-    return typeof last(args) === 'number' ? args.pop() : defaultValue;
-}
-//# sourceMappingURL=args.js.map
+                onDone.toString = function () {
+                  return _onDone.toString();
+                };
 
-/***/ }),
-/* 62 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+                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}`);
+        }
+      });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isScheduler", function() { return isScheduler; });
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
+      return function build(_x5) {
+        return _ref5.apply(this, arguments);
+      };
+    })();
 
-function isScheduler(value) {
-    return value && Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__["isFunction"])(value.schedule);
-}
-//# sourceMappingURL=isScheduler.js.map
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-/***/ }),
-/* 63 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // initialise events
+    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; });
-/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(64);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
 
+      const item = _ref2;
 
-function from(input, scheduler) {
-    return scheduler ? Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_0__["scheduled"])(input, scheduler) : Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(input);
-}
-//# sourceMappingURL=from.js.map
+      const onDone = item.onDone;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        if (onDone) {
+          onDone();
+        }
+      };
+    }
+    events.onStart(queue.length);
 
-/***/ }),
-/* 64 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
-"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__(65);
-/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(78);
-/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(79);
-/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80);
-/* harmony import */ var _scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(81);
-/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(69);
-/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68);
-/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(67);
-/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(72);
-/* harmony import */ var _util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(70);
-/* harmony import */ var _util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(71);
-/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(74);
-/* harmony import */ var _scheduleReadableStreamLike__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(82);
+    // 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));
+    }
 
+    // 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;
 
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
+      }
 
+      const file = _ref3;
 
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
 
+    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;
 
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
 
+    return actions;
+  });
 
+  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
 
+let buildActionsForHardlink = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
+    //
+    let build = (() => {
+      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest;
 
-function scheduled(input, scheduler) {
-    if (input != null) {
-        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_5__["isInteropObservable"])(input)) {
-            return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__["scheduleObservable"])(input, scheduler);
-        }
-        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_7__["isArrayLike"])(input)) {
-            return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
-        }
-        if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_6__["isPromise"])(input)) {
-            return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__["schedulePromise"])(input, scheduler);
-        }
-        if (Object(_util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_9__["isAsyncIterable"])(input)) {
-            return Object(_scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_4__["scheduleAsyncIterable"])(input, scheduler);
-        }
-        if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_8__["isIterable"])(input)) {
-            return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__["scheduleIterable"])(input, scheduler);
+        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;
         }
-        if (Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_11__["isReadableStreamLike"])(input)) {
-            return Object(_scheduleReadableStreamLike__WEBPACK_IMPORTED_MODULE_12__["scheduleReadableStreamLike"])(input, scheduler);
+        files.add(dest.toLowerCase());
+
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
         }
-    }
-    throw Object(_util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_10__["createInvalidObservableTypeError"])(input);
-}
-//# sourceMappingURL=scheduled.js.map
 
-/***/ }),
-/* 65 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleObservable", function() { return scheduleObservable; });
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
-/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(75);
-/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(77);
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
 
+        const destExists = yield exists(dest);
+        if (destExists) {
+          const destStat = yield lstat(dest);
 
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-function scheduleObservable(input, scheduler) {
-    return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__["innerFrom"])(input).pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__["subscribeOn"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_1__["observeOn"])(scheduler));
-}
-//# sourceMappingURL=scheduleObservable.js.map
+          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);
+            }
+          }
 
-/***/ }),
-/* 66 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          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;
+          }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "innerFrom", function() { return innerFrom; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromInteropObservable", function() { return fromInteropObservable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromArrayLike", function() { return fromArrayLike; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromPromise", function() { return fromPromise; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromIterable", function() { return fromIterable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromAsyncIterable", function() { return fromAsyncIterable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromReadableStreamLike", function() { return fromReadableStreamLike; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67);
-/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(68);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10);
-/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(69);
-/* harmony import */ var _util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(70);
-/* harmony import */ var _util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(71);
-/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(72);
-/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(74);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(13);
-/* harmony import */ var _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(19);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(24);
+          // correct hardlink
+          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
+            return;
+          }
 
+          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 (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;
+              }
 
+              const file = _ref14;
 
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
+                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;
 
+                    if (_isArray11) {
+                      if (_i11 >= _iterator11.length) break;
+                      _ref15 = _iterator11[_i11++];
+                    } else {
+                      _i11 = _iterator11.next();
+                      if (_i11.done) break;
+                      _ref15 = _i11.value;
+                    }
 
+                    const file = _ref15;
 
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
+        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);
 
-function innerFrom(input) {
-    if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"]) {
-        return input;
-    }
-    if (input != null) {
-        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__["isInteropObservable"])(input)) {
-            return fromInteropObservable(input);
-        }
-        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_1__["isArrayLike"])(input)) {
-            return fromArrayLike(input);
-        }
-        if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_2__["isPromise"])(input)) {
-            return fromPromise(input);
-        }
-        if (Object(_util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_5__["isAsyncIterable"])(input)) {
-            return fromAsyncIterable(input);
-        }
-        if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__["isIterable"])(input)) {
-            return fromIterable(input);
-        }
-        if (Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__["isReadableStreamLike"])(input)) {
-            return fromReadableStreamLike(input);
-        }
-    }
-    throw Object(_util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_6__["createInvalidObservableTypeError"])(input);
-}
-function fromInteropObservable(obj) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](function (subscriber) {
-        var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_11__["observable"]]();
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_9__["isFunction"])(obs.subscribe)) {
-            return obs.subscribe(subscriber);
-        }
-        throw new TypeError('Provided object does not correctly implement Symbol.observable');
-    });
-}
-function fromArrayLike(array) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](function (subscriber) {
-        for (var i = 0; i < array.length && !subscriber.closed; i++) {
-            subscriber.next(array[i]);
-        }
-        subscriber.complete();
-    });
-}
-function fromPromise(promise) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](function (subscriber) {
-        promise
-            .then(function (value) {
-            if (!subscriber.closed) {
-                subscriber.next(value);
-                subscriber.complete();
-            }
-        }, function (err) { return subscriber.error(err); })
-            .then(null, _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_10__["reportUnhandledError"]);
-    });
-}
-function fromIterable(iterable) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](function (subscriber) {
-        var e_1, _a;
-        try {
-            for (var iterable_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(iterable), iterable_1_1 = iterable_1.next(); !iterable_1_1.done; iterable_1_1 = iterable_1.next()) {
-                var value = iterable_1_1.value;
-                subscriber.next(value);
-                if (subscriber.closed) {
-                    return;
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (iterable_1_1 && !iterable_1_1.done && (_a = iterable_1.return)) _a.call(iterable_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        subscriber.complete();
-    });
-}
-function fromAsyncIterable(asyncIterable) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](function (subscriber) {
-        process(asyncIterable, subscriber).catch(function (err) { return subscriber.error(err); });
-    });
-}
-function fromReadableStreamLike(readableStream) {
-    return fromAsyncIterable(Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__["readableStreamLikeToAsyncGenerator"])(readableStream));
-}
-function process(asyncIterable, subscriber) {
-    var asyncIterable_1, asyncIterable_1_1;
-    var e_2, _a;
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-        var value, e_2_1;
-        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 5, 6, 11]);
-                    asyncIterable_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__asyncValues"])(asyncIterable);
-                    _b.label = 1;
-                case 1: return [4, asyncIterable_1.next()];
-                case 2:
-                    if (!(asyncIterable_1_1 = _b.sent(), !asyncIterable_1_1.done)) return [3, 4];
-                    value = asyncIterable_1_1.value;
-                    subscriber.next(value);
-                    if (subscriber.closed) {
-                        return [2];
-                    }
-                    _b.label = 3;
-                case 3: return [3, 1];
-                case 4: return [3, 11];
-                case 5:
-                    e_2_1 = _b.sent();
-                    e_2 = { error: e_2_1 };
-                    return [3, 11];
-                case 6:
-                    _b.trys.push([6, , 9, 10]);
-                    if (!(asyncIterable_1_1 && !asyncIterable_1_1.done && (_a = asyncIterable_1.return))) return [3, 8];
-                    return [4, _a.call(asyncIterable_1)];
-                case 7:
-                    _b.sent();
-                    _b.label = 8;
-                case 8: return [3, 10];
-                case 9:
-                    if (e_2) throw e_2.error;
-                    return [7];
-                case 10: return [7];
-                case 11:
-                    subscriber.complete();
-                    return [2];
-            }
-        });
-    });
-}
-//# sourceMappingURL=innerFrom.js.map
-
-/***/ }),
-/* 67 */
-/***/ (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; });
-var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
-//# sourceMappingURL=isArrayLike.js.map
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-/***/ }),
-/* 68 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          // 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;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; });
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
+            if (_isArray12) {
+              if (_i12 >= _iterator12.length) break;
+              _ref16 = _iterator12[_i12++];
+            } else {
+              _i12 = _iterator12.next();
+              if (_i12.done) break;
+              _ref16 = _i12.value;
+            }
 
-function isPromise(value) {
-    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__["isFunction"])(value === null || value === void 0 ? void 0 : value.then);
-}
-//# sourceMappingURL=isPromise.js.map
+            const file = _ref16;
 
-/***/ }),
-/* 69 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+            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);
+                }
 
-"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__(24);
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+                onDone.toString = function () {
+                  return _onDone2.toString();
+                };
 
+                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}`);
+        }
+      });
 
-function isInteropObservable(input) {
-    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]]);
-}
-//# sourceMappingURL=isInteropObservable.js.map
+      return function build(_x10) {
+        return _ref13.apply(this, arguments);
+      };
+    })();
 
-/***/ }),
-/* 70 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isAsyncIterable", function() { return isAsyncIterable; });
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
+    // initialise events
+    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+      var _ref10;
 
-function isAsyncIterable(obj) {
-    return Symbol.asyncIterator && Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__["isFunction"])(obj === null || obj === void 0 ? void 0 : obj[Symbol.asyncIterator]);
-}
-//# sourceMappingURL=isAsyncIterable.js.map
+      if (_isArray7) {
+        if (_i7 >= _iterator7.length) break;
+        _ref10 = _iterator7[_i7++];
+      } else {
+        _i7 = _iterator7.next();
+        if (_i7.done) break;
+        _ref10 = _i7.value;
+      }
 
-/***/ }),
-/* 71 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      const item = _ref10;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createInvalidObservableTypeError", function() { return createInvalidObservableTypeError; });
-function createInvalidObservableTypeError(input) {
-    return new TypeError("You provided " + (input !== null && typeof input === 'object' ? 'an invalid object' : "'" + input + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
-}
-//# sourceMappingURL=throwUnobservableError.js.map
+      const onDone = item.onDone || noop;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        onDone();
+      };
+    }
+    events.onStart(queue.length);
 
-/***/ }),
-/* 72 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
-"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__(73);
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+    // 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));
+    }
 
+    // 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;
 
-function isIterable(input) {
-    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(input === null || input === void 0 ? void 0 : input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]]);
-}
-//# sourceMappingURL=isIterable.js.map
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref11 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref11 = _i8.value;
+      }
 
-/***/ }),
-/* 73 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      const file = _ref11;
 
-"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; });
-function getSymbolIterator() {
-    if (typeof Symbol !== 'function' || !Symbol.iterator) {
-        return '@@iterator';
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
     }
-    return Symbol.iterator;
-}
-var iterator = getSymbolIterator();
-//# sourceMappingURL=iterator.js.map
 
-/***/ }),
-/* 74 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref12;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readableStreamLikeToAsyncGenerator", function() { return readableStreamLikeToAsyncGenerator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isReadableStreamLike", function() { return isReadableStreamLike; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref12 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref12 = _i9.value;
+      }
 
+      const loc = _ref12;
 
-function readableStreamLikeToAsyncGenerator(readableStream) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__asyncGenerator"])(this, arguments, function readableStreamLikeToAsyncGenerator_1() {
-        var reader, _a, value, done;
-        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    reader = readableStream.getReader();
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, , 9, 10]);
-                    _b.label = 2;
-                case 2:
-                    if (false) {}
-                    return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__await"])(reader.read())];
-                case 3:
-                    _a = _b.sent(), value = _a.value, done = _a.done;
-                    if (!done) return [3, 5];
-                    return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__await"])(void 0)];
-                case 4: return [2, _b.sent()];
-                case 5: return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__await"])(value)];
-                case 6: return [4, _b.sent()];
-                case 7:
-                    _b.sent();
-                    return [3, 2];
-                case 8: return [3, 10];
-                case 9:
-                    reader.releaseLock();
-                    return [7];
-                case 10: return [2];
-            }
-        });
-    });
-}
-function isReadableStreamLike(obj) {
-    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(obj === null || obj === void 0 ? void 0 : obj.getReader);
-}
-//# sourceMappingURL=isReadableStreamLike.js.map
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
 
-/***/ }),
-/* 75 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    return actions;
+  });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return observeOn; });
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(76);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
+    return _ref9.apply(this, arguments);
+  };
+})();
 
+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 || []
+    };
 
+    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-function observeOn(scheduler, delay) {
-    if (delay === void 0) { delay = 0; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__["executeSchedule"])(subscriber, scheduler, function () { return subscriber.next(value); }, delay); }, function () { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__["executeSchedule"])(subscriber, scheduler, function () { return subscriber.complete(); }, delay); }, function (err) { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__["executeSchedule"])(subscriber, scheduler, function () { return subscriber.error(err); }, delay); }));
-    });
-}
-//# sourceMappingURL=observeOn.js.map
+    const fileActions = actions.file;
 
-/***/ }),
-/* 76 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    const currentlyWriting = new Map();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "executeSchedule", function() { return executeSchedule; });
-function executeSchedule(parentSubscription, scheduler, work, delay, repeat) {
-    if (delay === void 0) { delay = 0; }
-    if (repeat === void 0) { repeat = false; }
-    var scheduleSubscription = scheduler.schedule(function () {
-        work();
-        if (repeat) {
-            parentSubscription.add(this.schedule(null, delay));
-        }
-        else {
-            this.unsubscribe();
+    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;
         }
-    }, delay);
-    parentSubscription.add(scheduleSubscription);
-    if (!repeat) {
-        return scheduleSubscription;
-    }
-}
-//# sourceMappingURL=executeSchedule.js.map
 
-/***/ }),
-/* 77 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        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;
+      });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return subscribeOn; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
+      return function (_x14) {
+        return _ref18.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
 
-function subscribeOn(scheduler, delay) {
-    if (delay === void 0) { delay = 0; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        subscriber.add(scheduler.schedule(function () { return source.subscribe(subscriber); }, delay));
+    // 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);
     });
-}
-//# sourceMappingURL=subscribeOn.js.map
-
-/***/ }),
-/* 78 */
-/***/ (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_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
-/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(75);
-/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(77);
+  return function copyBulk(_x11, _x12, _x13) {
+    return _ref17.apply(this, arguments);
+  };
+})();
 
+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: []
+    };
 
+    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-function schedulePromise(input, scheduler) {
-    return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__["innerFrom"])(input).pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__["subscribeOn"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_1__["observeOn"])(scheduler));
-}
-//# sourceMappingURL=schedulePromise.js.map
+    const fileActions = actions.link;
 
-/***/ }),
-/* 79 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    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);
+      });
 
-"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__(10);
+      return function (_x18) {
+        return _ref20.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
 
-function scheduleArray(input, scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var i = 0;
-        return scheduler.schedule(function () {
-            if (i === input.length) {
-                subscriber.complete();
-            }
-            else {
-                subscriber.next(input[i++]);
-                if (!subscriber.closed) {
-                    this.schedule();
-                }
-            }
-        });
+    // 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);
     });
-}
-//# sourceMappingURL=scheduleArray.js.map
+  });
 
-/***/ }),
-/* 80 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function hardlinkBulk(_x15, _x16, _x17) {
+    return _ref19.apply(this, arguments);
+  };
+})();
 
-"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__(10);
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(76);
+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 null;
+  });
 
-function scheduleIterable(input, scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var iterator;
-        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__["executeSchedule"])(subscriber, scheduler, function () {
-            iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_1__["iterator"]]();
-            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__["executeSchedule"])(subscriber, scheduler, function () {
-                var _a;
-                var value;
-                var done;
-                try {
-                    (_a = iterator.next(), value = _a.value, done = _a.done);
-                }
-                catch (err) {
-                    subscriber.error(err);
-                    return;
-                }
-                if (done) {
-                    subscriber.complete();
-                }
-                else {
-                    subscriber.next(value);
-                }
-            }, 0, true);
-        });
-        return function () { return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(iterator === null || iterator === void 0 ? void 0 : iterator.return) && iterator.return(); };
-    });
-}
-//# sourceMappingURL=scheduleIterable.js.map
-
-/***/ }),
-/* 81 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function readFileAny(_x19) {
+    return _ref21.apply(this, arguments);
+  };
+})();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleAsyncIterable", function() { return scheduleAsyncIterable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(76);
+let readJson = exports.readJson = (() => {
+  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    return (yield readJsonAndFile(loc)).object;
+  });
 
+  return function readJson(_x20) {
+    return _ref23.apply(this, arguments);
+  };
+})();
 
-function scheduleAsyncIterable(input, scheduler) {
-    if (!input) {
-        throw new Error('Iterable cannot be null');
+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;
     }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__["executeSchedule"])(subscriber, scheduler, function () {
-            var iterator = input[Symbol.asyncIterator]();
-            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__["executeSchedule"])(subscriber, scheduler, function () {
-                iterator.next().then(function (result) {
-                    if (result.done) {
-                        subscriber.complete();
-                    }
-                    else {
-                        subscriber.next(result.value);
-                    }
-                });
-            }, 0, true);
-        });
-    });
-}
-//# sourceMappingURL=scheduleAsyncIterable.js.map
+  });
 
-/***/ }),
-/* 82 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function readJsonAndFile(_x21) {
+    return _ref24.apply(this, arguments);
+  };
+})();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleReadableStreamLike", function() { return scheduleReadableStreamLike; });
-/* harmony import */ var _scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(81);
-/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(74);
+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);
 
-function scheduleReadableStreamLike(input, scheduler) {
-    return Object(_scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_0__["scheduleAsyncIterable"])(Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_1__["readableStreamLikeToAsyncGenerator"])(input), scheduler);
-}
-//# sourceMappingURL=scheduleReadableStreamLike.js.map
+      if (yield exists(loc)) {
+        return loc;
+      } else {
+        parts.pop();
+      }
+    }
 
-/***/ }),
-/* 83 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    return false;
+  });
 
-"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__(10);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+  return function find(_x22, _x23) {
+    return _ref25.apply(this, arguments);
+  };
+})();
 
+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);
 
-function throwError(errorOrErrorFactory, scheduler) {
-    var errorFactory = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(errorOrErrorFactory) ? errorOrErrorFactory : function () { return errorOrErrorFactory; };
-    var init = function (subscriber) { return subscriber.error(errorFactory()); };
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](scheduler ? function (subscriber) { return scheduler.schedule(init, 0, subscriber); } : init);
-}
-//# sourceMappingURL=throwError.js.map
+    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);
+    }
+  });
 
-/***/ }),
-/* 84 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function symlink(_x24, _x25) {
+    return _ref26.apply(this, arguments);
+  };
+})();
 
-"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__(10);
-/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+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);
+      });
+    }
 
-function isObservable(obj) {
-    return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"] || (Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(obj.lift) && Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(obj.subscribe)));
-}
-//# sourceMappingURL=isObservable.js.map
+    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+      var _ref28;
 
-/***/ }),
-/* 85 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (_isArray14) {
+        if (_i14 >= _iterator14.length) break;
+        _ref28 = _iterator14[_i14++];
+      } else {
+        _i14 = _iterator14.next();
+        if (_i14.done) break;
+        _ref28 = _i14.value;
+      }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lastValueFrom", function() { return lastValueFrom; });
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86);
+      const name = _ref28;
 
-function lastValueFrom(source, config) {
-    var hasConfig = typeof config === 'object';
-    return new Promise(function (resolve, reject) {
-        var _hasValue = false;
-        var _value;
-        source.subscribe({
-            next: function (value) {
-                _value = value;
-                _hasValue = true;
-            },
-            error: reject,
-            complete: function () {
-                if (_hasValue) {
-                    resolve(_value);
-                }
-                else if (hasConfig) {
-                    resolve(config.defaultValue);
-                }
-                else {
-                    reject(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"]());
-                }
-            },
-        });
-    });
-}
-//# sourceMappingURL=lastValueFrom.js.map
+      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);
 
-/***/ }),
-/* 86 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      files.push({
+        relative,
+        basename: name,
+        absolute: loc,
+        mtime: +stat.mtime
+      });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; });
-/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+      if (stat.isDirectory()) {
+        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+      }
+    }
 
-var EmptyError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__["createErrorClass"])(function (_super) { return function EmptyErrorImpl() {
-    _super(this);
-    this.name = 'EmptyError';
-    this.message = 'no elements in sequence';
-}; });
-//# sourceMappingURL=EmptyError.js.map
+    return files;
+  });
 
-/***/ }),
-/* 87 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function walk(_x26, _x27) {
+    return _ref27.apply(this, arguments);
+  };
+})();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "firstValueFrom", function() { return firstValueFrom; });
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11);
+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;
 
 
-function firstValueFrom(source, config) {
-    var hasConfig = typeof config === 'object';
-    return new Promise(function (resolve, reject) {
-        var subscriber = new _Subscriber__WEBPACK_IMPORTED_MODULE_1__["SafeSubscriber"]({
-            next: function (value) {
-                resolve(value);
-                subscriber.unsubscribe();
-            },
-            error: reject,
-            complete: function () {
-                if (hasConfig) {
-                    resolve(config.defaultValue);
-                }
-                else {
-                    reject(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"]());
-                }
-            },
-        });
-        source.subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=firstValueFrom.js.map
+    return Math.ceil(size / blockSize) * blockSize;
+  });
 
-/***/ }),
-/* 88 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function getFileSizeOnDisk(_x28) {
+    return _ref29.apply(this, arguments);
+  };
+})();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; });
-/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+let getEolFromFile = (() => {
+  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
+    if (!(yield exists(path))) {
+      return undefined;
+    }
 
-var ArgumentOutOfRangeError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__["createErrorClass"])(function (_super) {
-    return function ArgumentOutOfRangeErrorImpl() {
-        _super(this);
-        this.name = 'ArgumentOutOfRangeError';
-        this.message = 'argument out of range';
-    };
-});
-//# sourceMappingURL=ArgumentOutOfRangeError.js.map
+    const buffer = yield readFileBuffer(path);
 
-/***/ }),
-/* 89 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    for (let i = 0; i < buffer.length; ++i) {
+      if (buffer[i] === cr) {
+        return '\r\n';
+      }
+      if (buffer[i] === lf) {
+        return '\n';
+      }
+    }
+    return undefined;
+  });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NotFoundError", function() { return NotFoundError; });
-/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+  return function getEolFromFile(_x29) {
+    return _ref30.apply(this, arguments);
+  };
+})();
 
-var NotFoundError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__["createErrorClass"])(function (_super) {
-    return function NotFoundErrorImpl(message) {
-        _super(this);
-        this.name = 'NotFoundError';
-        this.message = message;
-    };
-});
-//# sourceMappingURL=NotFoundError.js.map
+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);
+  });
 
-/***/ }),
-/* 90 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function writeFilePreservingEol(_x30, _x31) {
+    return _ref31.apply(this, arguments);
+  };
+})();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceError", function() { return SequenceError; });
-/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+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;
+  });
 
-var SequenceError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__["createErrorClass"])(function (_super) {
-    return function SequenceErrorImpl(message) {
-        _super(this);
-        this.name = 'SequenceError';
-        this.message = message;
-    };
-});
-//# sourceMappingURL=SequenceError.js.map
+  return function hardlinksWork(_x32) {
+    return _ref32.apply(this, arguments);
+  };
+})();
 
-/***/ }),
-/* 91 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// not a strict polyfill for Node's fs.mkdtemp
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(92);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
-/* harmony import */ var _util_createErrorClass__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(16);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(76);
 
+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;
+  });
 
+  return function makeTempDir(_x33) {
+    return _ref33.apply(this, arguments);
+  };
+})();
 
+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 (_isArray15) {
+        if (_i15 >= _iterator15.length) break;
+        _ref35 = _iterator15[_i15++];
+      } else {
+        _i15 = _iterator15.next();
+        if (_i15.done) break;
+        _ref35 = _i15.value;
+      }
 
+      const path = _ref35;
 
+      try {
+        const fd = yield open(path, 'r');
+        return (_fs || _load_fs()).default.createReadStream(path, { fd });
+      } catch (err) {
+        // Try the next one
+      }
+    }
+    return null;
+  });
 
-var TimeoutError = Object(_util_createErrorClass__WEBPACK_IMPORTED_MODULE_4__["createErrorClass"])(function (_super) {
-    return function TimeoutErrorImpl(info) {
-        if (info === void 0) { info = null; }
-        _super(this);
-        this.message = 'Timeout has occurred';
-        this.name = 'TimeoutError';
-        this.info = info;
+  return function readFirstAvailableStream(_x34) {
+    return _ref34.apply(this, arguments);
+  };
+})();
+
+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
     };
-});
-function timeout(config, schedulerArg) {
-    var _a = (Object(_util_isDate__WEBPACK_IMPORTED_MODULE_1__["isValidDate"])(config) ? { first: config } : typeof config === 'number' ? { each: config } : config), first = _a.first, each = _a.each, _b = _a.with, _with = _b === void 0 ? timeoutErrorFactory : _b, _c = _a.scheduler, scheduler = _c === void 0 ? schedulerArg !== null && schedulerArg !== void 0 ? schedulerArg : _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"] : _c, _d = _a.meta, meta = _d === void 0 ? null : _d;
-    if (first == null && each == null) {
-        throw new TypeError('No timeout provided.');
-    }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var originalSourceSubscription;
-        var timerSubscription;
-        var lastValue = null;
-        var seen = 0;
-        var startTimer = function (delay) {
-            timerSubscription = Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_6__["executeSchedule"])(subscriber, scheduler, function () {
-                try {
-                    originalSourceSubscription.unsubscribe();
-                    Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(_with({
-                        meta: meta,
-                        lastValue: lastValue,
-                        seen: seen,
-                    })).subscribe(subscriber);
-                }
-                catch (err) {
-                    subscriber.error(err);
-                }
-            }, delay);
-        };
-        originalSourceSubscription = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__["createOperatorSubscriber"])(subscriber, function (value) {
-            timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
-            seen++;
-            subscriber.next((lastValue = value));
-            each > 0 && startTimer(each);
-        }, undefined, undefined, function () {
-            if (!(timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.closed)) {
-                timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
-            }
-            lastValue = null;
-        }));
-        !seen && startTimer(first != null ? (typeof first === 'number' ? first : +first - scheduler.now()) : each);
-    });
-}
-function timeoutErrorFactory(info) {
-    throw new TimeoutError(info);
-}
-//# sourceMappingURL=timeout.js.map
 
-/***/ }),
-/* 92 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+      var _ref37;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isValidDate", function() { return isValidDate; });
-function isValidDate(value) {
-    return value instanceof Date && !isNaN(value);
-}
-//# sourceMappingURL=isDate.js.map
+      if (_isArray16) {
+        if (_i16 >= _iterator16.length) break;
+        _ref37 = _iterator16[_i16++];
+      } else {
+        _i16 = _iterator16.next();
+        if (_i16.done) break;
+        _ref37 = _i16.value;
+      }
 
-/***/ }),
-/* 93 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      const folder = _ref37;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return bindCallback; });
-/* harmony import */ var _bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94);
+      try {
+        yield mkdirp(folder);
+        yield access(folder, mode);
 
-function bindCallback(callbackFunc, resultSelector, scheduler) {
-    return Object(_bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__["bindCallbackInternals"])(false, callbackFunc, resultSelector, scheduler);
+        result.folder = folder;
+
+        return result;
+      } catch (error) {
+        result.skipped.push({
+          error,
+          folder
+        });
+      }
+    }
+    return result;
+  });
+
+  return function getFirstSuitableFolder(_x35) {
+    return _ref36.apply(this, arguments);
+  };
+})();
+
+exports.copy = copy;
+exports.readFile = readFile;
+exports.readFileRaw = readFileRaw;
+exports.normalizeOS = normalizeOS;
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
 }
-//# sourceMappingURL=bindCallback.js.map
 
-/***/ }),
-/* 94 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _glob;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallbackInternals", function() { return bindCallbackInternals; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(62);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
-/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(77);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(95);
-/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(75);
-/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(39);
+function _load_glob() {
+  return _glob = _interopRequireDefault(__webpack_require__(75));
+}
 
+var _os;
 
+function _load_os() {
+  return _os = _interopRequireDefault(__webpack_require__(36));
+}
 
+var _path;
 
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
 
+var _blockingQueue;
 
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
+}
 
-function bindCallbackInternals(isNodeStyle, callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return bindCallbackInternals(isNodeStyle, callbackFunc, scheduler)
-                    .apply(this, args)
-                    .pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__["mapOneOrManyArgs"])(resultSelector));
-            };
-        }
-    }
-    if (scheduler) {
-        return function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return bindCallbackInternals(isNodeStyle, callbackFunc)
-                .apply(this, args)
-                .pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_3__["subscribeOn"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_5__["observeOn"])(scheduler));
-        };
-    }
-    return function () {
-        var _this = this;
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_6__["AsyncSubject"]();
-        var uninitialized = true;
-        return new _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"](function (subscriber) {
-            var subs = subject.subscribe(subscriber);
-            if (uninitialized) {
-                uninitialized = false;
-                var isAsync_1 = false;
-                var isComplete_1 = false;
-                callbackFunc.apply(_this, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)), [
-                    function () {
-                        var results = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            results[_i] = arguments[_i];
-                        }
-                        if (isNodeStyle) {
-                            var err = results.shift();
-                            if (err != null) {
-                                subject.error(err);
-                                return;
-                            }
-                        }
-                        subject.next(1 < results.length ? results : results[0]);
-                        isComplete_1 = true;
-                        if (isAsync_1) {
-                            subject.complete();
-                        }
-                    },
-                ]));
-                if (isComplete_1) {
-                    subject.complete();
-                }
-                isAsync_1 = true;
-            }
-            return subs;
-        });
-    };
-}
-//# sourceMappingURL=bindCallbackInternals.js.map
-
-/***/ }),
-/* 95 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapOneOrManyArgs", function() { return mapOneOrManyArgs; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(96);
-
+var _promise;
 
-var isArray = Array.isArray;
-function callOrApply(fn, args) {
-    return isArray(args) ? fn.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args))) : fn(args);
-}
-function mapOneOrManyArgs(fn) {
-    return Object(_operators_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (args) { return callOrApply(fn, args); });
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(40));
 }
-//# sourceMappingURL=mapOneOrManyArgs.js.map
 
-/***/ }),
-/* 96 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _promise2;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return map; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+function _load_promise2() {
+  return _promise2 = __webpack_require__(40);
+}
 
+var _map;
 
-function map(project, thisArg) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            subscriber.next(project.call(thisArg, value, index++));
-        }));
-    });
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
 }
-//# sourceMappingURL=map.js.map
-
-/***/ }),
-/* 97 */
-/***/ (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 _bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94);
+var _fsNormalized;
 
-function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
-    return Object(_bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__["bindCallbackInternals"])(true, callbackFunc, resultSelector, scheduler);
+function _load_fsNormalized() {
+  return _fsNormalized = __webpack_require__(164);
 }
-//# sourceMappingURL=bindNodeCallback.js.map
-
-/***/ }),
-/* 98 */
-/***/ (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__, "combineLatestInit", function() { return combineLatestInit; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(63);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(95);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(61);
-/* harmony import */ var _util_createObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(100);
-/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(30);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(76);
+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; } }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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
+};
 
+const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
 
+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;
 
+// 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.
 
+const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
 
+const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
+const invariant = __webpack_require__(7);
+const stripBOM = __webpack_require__(122);
 
+const noop = () => {};
 
-function combineLatest() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_5__["popScheduler"])(args);
-    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_5__["popResultSelector"])(args);
-    var _a = Object(_util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__["argsArgArrayOrObject"])(args), observables = _a.args, keys = _a.keys;
-    if (observables.length === 0) {
-        return Object(_from__WEBPACK_IMPORTED_MODULE_2__["from"])([], scheduler);
-    }
-    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](combineLatestInit(observables, scheduler, keys
-        ?
-            function (values) { return Object(_util_createObject__WEBPACK_IMPORTED_MODULE_6__["createObject"])(keys, values); }
-        :
-            _util_identity__WEBPACK_IMPORTED_MODULE_3__["identity"]));
-    return resultSelector ? result.pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__["mapOneOrManyArgs"])(resultSelector)) : result;
-}
-function combineLatestInit(observables, scheduler, valueTransform) {
-    if (valueTransform === void 0) { valueTransform = _util_identity__WEBPACK_IMPORTED_MODULE_3__["identity"]; }
-    return function (subscriber) {
-        maybeSchedule(scheduler, function () {
-            var length = observables.length;
-            var values = new Array(length);
-            var active = length;
-            var remainingFirstValues = length;
-            var _loop_1 = function (i) {
-                maybeSchedule(scheduler, function () {
-                    var source = Object(_from__WEBPACK_IMPORTED_MODULE_2__["from"])(observables[i], scheduler);
-                    var hasFirstValue = false;
-                    source.subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_7__["createOperatorSubscriber"])(subscriber, function (value) {
-                        values[i] = value;
-                        if (!hasFirstValue) {
-                            hasFirstValue = true;
-                            remainingFirstValues--;
-                        }
-                        if (!remainingFirstValues) {
-                            subscriber.next(valueTransform(values.slice()));
-                        }
-                    }, function () {
-                        if (!--active) {
-                            subscriber.complete();
-                        }
-                    }));
-                }, subscriber);
-            };
-            for (var i = 0; i < length; i++) {
-                _loop_1(i);
-            }
-        }, subscriber);
-    };
-}
-function maybeSchedule(scheduler, execute, subscription) {
-    if (scheduler) {
-        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_8__["executeSchedule"])(subscription, scheduler, execute);
-    }
-    else {
-        execute();
-    }
+function copy(src, dest, reporter) {
+  return copyBulk([{ src, dest }], reporter);
 }
-//# sourceMappingURL=combineLatest.js.map
-
-/***/ }),
-/* 99 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "argsArgArrayOrObject", function() { return argsArgArrayOrObject; });
-var isArray = Array.isArray;
-var getPrototypeOf = Object.getPrototypeOf, objectProto = Object.prototype, getKeys = Object.keys;
-function argsArgArrayOrObject(args) {
-    if (args.length === 1) {
-        var first_1 = args[0];
-        if (isArray(first_1)) {
-            return { args: first_1, keys: null };
-        }
-        if (isPOJO(first_1)) {
-            var keys = getKeys(first_1);
-            return {
-                args: keys.map(function (key) { return first_1[key]; }),
-                keys: keys,
-            };
-        }
-    }
-    return { args: args, keys: null };
+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);
+      }
+    });
+  });
 }
-function isPOJO(obj) {
-    return obj && typeof obj === 'object' && getPrototypeOf(obj) === objectProto;
+
+function readFile(loc) {
+  return _readFile(loc, 'utf8').then(normalizeOS);
 }
-//# sourceMappingURL=argsArgArrayOrObject.js.map
 
-/***/ }),
-/* 100 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function readFileRaw(loc) {
+  return _readFile(loc, 'binary');
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createObject", function() { return createObject; });
-function createObject(keys, values) {
-    return keys.reduce(function (result, key, i) { return ((result[key] = values[i]), result); }, {});
+function normalizeOS(body) {
+  return body.replace(/\r\n/g, '\n');
 }
-//# sourceMappingURL=createObject.js.map
+
+const cr = '\r'.charCodeAt(0);
+const lf = '\n'.charCodeAt(0);
 
 /***/ }),
-/* 101 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 6 */
+/***/ (function(module, 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 _operators_concatAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(102);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(63);
 
 
+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;
+
+var _require = __webpack_require__(171);
 
-function concat() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_0__["concatAll"])()(Object(_from__WEBPACK_IMPORTED_MODULE_2__["from"])(args, Object(_util_args__WEBPACK_IMPORTED_MODULE_1__["popScheduler"])(args)));
-}
-//# sourceMappingURL=concat.js.map
+const getCacheDir = _require.getCacheDir,
+      getConfigDir = _require.getConfigDir,
+      getDataDir = _require.getDataDir;
 
-/***/ }),
-/* 102 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const isWebpackBundle = __webpack_require__(227);
 
-"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__(103);
+const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
+const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
+const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
 
-function concatAll() {
-    return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(1);
-}
-//# sourceMappingURL=concatAll.js.map
+const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
 
-/***/ }),
-/* 103 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
 
-"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__(104);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
+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 SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
 
-function mergeAll(concurrent) {
-    if (concurrent === void 0) { concurrent = Infinity; }
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"], concurrent);
-}
-//# sourceMappingURL=mergeAll.js.map
+// cache version, bump whenever we make backwards incompatible changes
+const CACHE_VERSION = exports.CACHE_VERSION = 2;
 
-/***/ }),
-/* 104 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// lockfile version, bump whenever we make backwards incompatible changes
+const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return mergeMap; });
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(96);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(105);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(13);
+// max amount of network requests to perform concurrently
+const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
 
+// HTTP timeout used when downloading packages
+const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
 
+// 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()];
 
-function mergeMap(project, resultSelector, concurrent) {
-    if (concurrent === void 0) { concurrent = Infinity; }
-    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_4__["isFunction"])(resultSelector)) {
-        return mergeMap(function (a, i) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(project(a, i))); }, concurrent);
-    }
-    else if (typeof resultSelector === 'number') {
-        concurrent = resultSelector;
-    }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) { return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_3__["mergeInternals"])(source, subscriber, project, concurrent); });
-}
-//# sourceMappingURL=mergeMap.js.map
+  if (process.getuid) {
+    // $FlowFixMe: process.getuid exists, dammit
+    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
+  }
 
-/***/ }),
-/* 105 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeInternals", function() { return mergeInternals; });
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(76);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+  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();
 
-function mergeInternals(source, subscriber, project, concurrent, onBeforeNext, expand, innerSubScheduler, additionalFinalizer) {
-    var buffer = [];
-    var active = 0;
-    var index = 0;
-    var isComplete = false;
-    var checkComplete = function () {
-        if (isComplete && !buffer.length && !active) {
-            subscriber.complete();
-        }
-    };
-    var outerNext = function (value) { return (active < concurrent ? doInnerSub(value) : buffer.push(value)); };
-    var doInnerSub = function (value) {
-        expand && subscriber.next(value);
-        active++;
-        var innerComplete = false;
-        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__["innerFrom"])(project(value, index++)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (innerValue) {
-            onBeforeNext === null || onBeforeNext === void 0 ? void 0 : onBeforeNext(innerValue);
-            if (expand) {
-                outerNext(innerValue);
-            }
-            else {
-                subscriber.next(innerValue);
-            }
-        }, function () {
-            innerComplete = true;
-        }, undefined, function () {
-            if (innerComplete) {
-                try {
-                    active--;
-                    var _loop_1 = function () {
-                        var bufferedValue = buffer.shift();
-                        if (innerSubScheduler) {
-                            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__["executeSchedule"])(subscriber, innerSubScheduler, function () { return doInnerSub(bufferedValue); });
-                        }
-                        else {
-                            doInnerSub(bufferedValue);
-                        }
-                    };
-                    while (buffer.length && active < concurrent) {
-                        _loop_1();
-                    }
-                    checkComplete();
-                }
-                catch (err) {
-                    subscriber.error(err);
-                }
-            }
-        }));
-    };
-    source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, outerNext, function () {
-        isComplete = true;
-        checkComplete();
-    }));
-    return function () {
-        additionalFinalizer === null || additionalFinalizer === void 0 ? void 0 : additionalFinalizer();
-    };
+// Webpack needs to be configured with node.__dirname/__filename = false
+function getYarnBinPath() {
+  if (isWebpackBundle) {
+    return __filename;
+  } else {
+    return path.join(__dirname, '..', 'bin', 'yarn.js');
+  }
 }
-//# sourceMappingURL=mergeInternals.js.map
 
-/***/ }),
-/* 106 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
+const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connectable", function() { return connectable; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
-/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(107);
+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 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';
 
+const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
+const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
 
-var DEFAULT_CONFIG = {
-    connector: function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); },
-    resetOnDisconnect: true,
-};
-function connectable(source, config) {
-    if (config === void 0) { config = DEFAULT_CONFIG; }
-    var connection = null;
-    var connector = config.connector, _a = config.resetOnDisconnect, resetOnDisconnect = _a === void 0 ? true : _a;
-    var subject = connector();
-    var result = new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"](function (subscriber) {
-        return subject.subscribe(subscriber);
-    });
-    result.connect = function () {
-        if (!connection || connection.closed) {
-            connection = Object(_defer__WEBPACK_IMPORTED_MODULE_2__["defer"])(function () { return source; }).subscribe(subject);
-            if (resetOnDisconnect) {
-                connection.add(function () { return (subject = connector()); });
-            }
-        }
-        return connection;
-    };
-    return result;
-}
-//# sourceMappingURL=connectable.js.map
+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';
 
-/***/ }),
-/* 107 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
 
-"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__(10);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
+function getPathKey(platform, env) {
+  let pathKey = 'PATH';
 
+  // windows calls its path "Path" usually, but this is not guaranteed.
+  if (platform === 'win32') {
+    pathKey = 'Path';
 
-function defer(observableFactory) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(observableFactory()).subscribe(subscriber);
-    });
+    for (const key in env) {
+      if (key.toLowerCase() === 'path') {
+        pathKey = key;
+      }
+    }
+  }
+
+  return pathKey;
 }
-//# sourceMappingURL=defer.js.map
+
+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'
+};
 
 /***/ }),
-/* 108 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 7 */
+/***/ (function(module, 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__(10);
-/* harmony import */ var _util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(61);
-/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(95);
-/* harmony import */ var _util_createObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(100);
-
-
+/**
+ * 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.
+ */
 
 
 
+/**
+ * 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.
+ */
 
+var NODE_ENV = "production";
 
-function forkJoin() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+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');
     }
-    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__["popResultSelector"])(args);
-    var _a = Object(_util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__["argsArgArrayOrObject"])(args), sources = _a.args, keys = _a.keys;
-    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var length = sources.length;
-        if (!length) {
-            subscriber.complete();
-            return;
-        }
-        var values = new Array(length);
-        var remainingCompletions = length;
-        var remainingEmissions = length;
-        var _loop_1 = function (sourceIndex) {
-            var hasValue = false;
-            Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(sources[sourceIndex]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, function (value) {
-                if (!hasValue) {
-                    hasValue = true;
-                    remainingEmissions--;
-                }
-                values[sourceIndex] = value;
-            }, function () { return remainingCompletions--; }, undefined, function () {
-                if (!remainingCompletions || !hasValue) {
-                    if (!remainingEmissions) {
-                        subscriber.next(keys ? Object(_util_createObject__WEBPACK_IMPORTED_MODULE_6__["createObject"])(keys, values) : values);
-                    }
-                    subscriber.complete();
-                }
-            }));
-        };
-        for (var sourceIndex = 0; sourceIndex < length; sourceIndex++) {
-            _loop_1(sourceIndex);
-        }
-    });
-    return resultSelector ? result.pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_5__["mapOneOrManyArgs"])(resultSelector)) : result;
-}
-//# sourceMappingURL=forkJoin.js.map
+  }
 
-/***/ }),
-/* 109 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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 {
+      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';
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return fromEvent; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
-/* harmony import */ var _operators_mergeMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(104);
-/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(67);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(13);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(95);
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+};
 
+module.exports = invariant;
 
 
+/***/ }),
+/* 8 */,
+/* 9 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__("crypto");
 
+/***/ }),
+/* 10 */,
+/* 11 */
+/***/ (function(module, exports) {
 
+// 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
 
-var nodeEventEmitterMethods = ['addListener', 'removeListener'];
-var eventTargetMethods = ['addEventListener', 'removeEventListener'];
-var jqueryMethods = ['on', 'off'];
-function fromEvent(target, eventName, options, resultSelector) {
-    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(options)) {
-        resultSelector = options;
-        options = undefined;
-    }
-    if (resultSelector) {
-        return fromEvent(target, eventName, options).pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_6__["mapOneOrManyArgs"])(resultSelector));
-    }
-    var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(isEventTarget(target)
-        ? eventTargetMethods.map(function (methodName) { return function (handler) { return target[methodName](eventName, handler, options); }; })
-        :
-            isNodeStyleEventEmitter(target)
-                ? nodeEventEmitterMethods.map(toCommonHandlerRegistry(target, eventName))
-                : isJQueryStyleEventEmitter(target)
-                    ? jqueryMethods.map(toCommonHandlerRegistry(target, eventName))
-                    : [], 2), add = _a[0], remove = _a[1];
-    if (!add) {
-        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(target)) {
-            return Object(_operators_mergeMap__WEBPACK_IMPORTED_MODULE_3__["mergeMap"])(function (subTarget) { return fromEvent(subTarget, eventName, options); })(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(target));
-        }
-    }
-    if (!add) {
-        throw new TypeError('Invalid event target');
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"](function (subscriber) {
-        var handler = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return subscriber.next(1 < args.length ? args : args[0]);
-        };
-        add(handler);
-        return function () { return remove(handler); };
-    });
-}
-function toCommonHandlerRegistry(target, eventName) {
-    return function (methodName) { return function (handler) { return target[methodName](eventName, handler); }; };
-}
-function isNodeStyleEventEmitter(target) {
-    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(target.addListener) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(target.removeListener);
-}
-function isJQueryStyleEventEmitter(target) {
-    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(target.on) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(target.off);
-}
-function isEventTarget(target) {
-    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(target.addEventListener) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__["isFunction"])(target.removeEventListener);
-}
-//# sourceMappingURL=fromEvent.js.map
 
 /***/ }),
-/* 110 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 12 */
+/***/ (function(module, 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__(10);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(95);
 
 
+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 fromEventPattern(addHandler, removeHandler, resultSelector) {
-    if (resultSelector) {
-        return fromEventPattern(addHandler, removeHandler).pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_2__["mapOneOrManyArgs"])(resultSelector));
+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 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 = addHandler(handler);
-        return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(removeHandler) ? function () { return removeHandler(handler, retValue); } : undefined;
-    });
+  }
+  return a.length - b.length;
 }
-//# sourceMappingURL=fromEventPattern.js.map
-
-/***/ }),
-/* 111 */
-/***/ (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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(62);
-/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(107);
-/* harmony import */ var _scheduled_scheduleIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80);
-
-
 
-
-
-function generate(initialStateOrOptions, condition, iterate, resultSelectorOrScheduler, scheduler) {
-    var _a, _b;
-    var resultSelector;
-    var initialState;
-    if (arguments.length === 1) {
-        (_a = initialStateOrOptions, initialState = _a.initialState, condition = _a.condition, iterate = _a.iterate, _b = _a.resultSelector, resultSelector = _b === void 0 ? _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"] : _b, scheduler = _a.scheduler);
-    }
-    else {
-        initialState = initialStateOrOptions;
-        if (!resultSelectorOrScheduler || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(resultSelectorOrScheduler)) {
-            resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
-            scheduler = resultSelectorOrScheduler;
-        }
-        else {
-            resultSelector = resultSelectorOrScheduler;
-        }
-    }
-    function gen() {
-        var state;
-        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    state = initialState;
-                    _a.label = 1;
-                case 1:
-                    if (!(!condition || condition(state))) return [3, 4];
-                    return [4, resultSelector(state)];
-                case 2:
-                    _a.sent();
-                    _a.label = 3;
-                case 3:
-                    state = iterate(state);
-                    return [3, 1];
-                case 4: return [2];
-            }
-        });
+function entries(obj) {
+  const entries = [];
+  if (obj) {
+    for (const key in obj) {
+      entries.push([key, obj[key]]);
     }
-    return Object(_defer__WEBPACK_IMPORTED_MODULE_3__["defer"])((scheduler
-        ?
-            function () { return Object(_scheduled_scheduleIterable__WEBPACK_IMPORTED_MODULE_4__["scheduleIterable"])(gen(), scheduler); }
-        :
-            gen));
+  }
+  return entries;
 }
-//# sourceMappingURL=generate.js.map
-
-/***/ }),
-/* 112 */
-/***/ (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__(107);
+function removePrefix(pattern, prefix) {
+  if (pattern.startsWith(prefix)) {
+    pattern = pattern.slice(prefix.length);
+  }
 
-function iif(condition, trueResult, falseResult) {
-    return Object(_defer__WEBPACK_IMPORTED_MODULE_0__["defer"])(function () { return (condition() ? trueResult : falseResult); });
+  return pattern;
 }
-//# sourceMappingURL=iif.js.map
-
-/***/ }),
-/* 113 */
-/***/ (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 _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _timer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(114);
 
+function removeSuffix(pattern, suffix) {
+  if (pattern.endsWith(suffix)) {
+    return pattern.slice(0, -suffix.length);
+  }
 
-function interval(period, scheduler) {
-    if (period === void 0) { period = 0; }
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    if (period < 0) {
-        period = 0;
-    }
-    return Object(_timer__WEBPACK_IMPORTED_MODULE_1__["timer"])(period, period, scheduler);
+  return pattern;
 }
-//# sourceMappingURL=interval.js.map
-
-/***/ }),
-/* 114 */
-/***/ (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__(10);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(50);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(62);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(92);
-
-
 
+function addSuffix(pattern, suffix) {
+  if (!pattern.endsWith(suffix)) {
+    return pattern + suffix;
+  }
 
-function timer(dueTime, intervalOrScheduler, scheduler) {
-    if (dueTime === void 0) { dueTime = 0; }
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; }
-    var intervalDuration = -1;
-    if (intervalOrScheduler != null) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(intervalOrScheduler)) {
-            scheduler = intervalOrScheduler;
-        }
-        else {
-            intervalDuration = intervalOrScheduler;
-        }
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var due = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_3__["isValidDate"])(dueTime) ? +dueTime - scheduler.now() : dueTime;
-        if (due < 0) {
-            due = 0;
-        }
-        var n = 0;
-        return scheduler.schedule(function () {
-            if (!subscriber.closed) {
-                subscriber.next(n++);
-                if (0 <= intervalDuration) {
-                    this.schedule(undefined, intervalDuration);
-                }
-                else {
-                    subscriber.complete();
-                }
-            }
-        }, due);
-    });
+  return pattern;
 }
-//# sourceMappingURL=timer.js.map
-
-/***/ }),
-/* 115 */
-/***/ (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 _operators_mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(103);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(59);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(61);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(63);
-
-
 
+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);
+  }
+}
 
-function merge() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+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;
     }
-    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__["popScheduler"])(args);
-    var concurrent = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__["popNumber"])(args, Infinity);
-    var sources = args;
-    return !sources.length
-        ?
-            _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"]
-        : sources.length === 1
-            ?
-                Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(sources[0])
-            :
-                Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(concurrent)(Object(_from__WEBPACK_IMPORTED_MODULE_4__["from"])(sources, scheduler));
+  }
+  return true;
 }
-//# sourceMappingURL=merge.js.map
-
-/***/ }),
-/* 116 */
-/***/ (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__(10);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
 
-
-var NEVER = new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](_util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]);
-function never() {
-    return NEVER;
+function sleep(ms) {
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
 }
-//# sourceMappingURL=never.js.map
 
 /***/ }),
-/* 117 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 13 */
+/***/ (function(module, 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 _empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59);
-/* harmony import */ var _operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(118);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(119);
+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));
+};
 
+$exports.store = store;
 
-function onErrorResumeNext() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    return Object(_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_1__["onErrorResumeNext"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__["argsOrArgArray"])(sources))(_empty__WEBPACK_IMPORTED_MODULE_0__["EMPTY"]);
-}
-//# sourceMappingURL=onErrorResumeNext.js.map
 
 /***/ }),
-/* 118 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 14 */
+/***/ (function(module, 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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(119);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(21);
-
-
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stringify = exports.parse = undefined;
 
+var _asyncToGenerator2;
 
-function onErrorResumeNext() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    var nextSources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__["argsOrArgArray"])(sources);
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var remaining = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(nextSources));
-        var subscribeNext = function () {
-            if (!subscriber.closed) {
-                if (remaining.length > 0) {
-                    var nextSource = void 0;
-                    try {
-                        nextSource = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(remaining.shift());
-                    }
-                    catch (err) {
-                        subscribeNext();
-                        return;
-                    }
-                    var innerSub = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, undefined, _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"], _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"]);
-                    nextSource.subscribe(innerSub);
-                    innerSub.add(subscribeNext);
-                }
-                else {
-                    subscriber.complete();
-                }
-            }
-        };
-        subscribeNext();
-    });
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
 }
-//# sourceMappingURL=onErrorResumeNext.js.map
 
-/***/ }),
-/* 119 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _parse;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "argsOrArgArray", function() { return argsOrArgArray; });
-var isArray = Array.isArray;
-function argsOrArgArray(args) {
-    return args.length === 1 && isArray(args[0]) ? args[0] : args;
+function _load_parse() {
+  return _parse = __webpack_require__(81);
 }
-//# sourceMappingURL=argsOrArgArray.js.map
 
-/***/ }),
-/* 120 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Object.defineProperty(exports, 'parse', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_parse || _load_parse()).default;
+  }
+});
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return pairs; });
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(63);
+var _stringify;
 
-function pairs(obj, scheduler) {
-    return Object(_from__WEBPACK_IMPORTED_MODULE_0__["from"])(Object.entries(obj), scheduler);
+function _load_stringify() {
+  return _stringify = __webpack_require__(150);
 }
-//# sourceMappingURL=pairs.js.map
 
-/***/ }),
-/* 121 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Object.defineProperty(exports, 'stringify', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_stringify || _load_stringify()).default;
+  }
+});
+exports.implodeEntry = implodeEntry;
+exports.explodeEntry = explodeEntry;
 
-"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__(122);
-/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(123);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
+var _misc;
 
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
+var _normalizePattern;
 
-function partition(source, predicate, thisArg) {
-    return [Object(_operators_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(predicate, thisArg)(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(source)), Object(_operators_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(source))];
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(29);
 }
-//# sourceMappingURL=partition.js.map
 
-/***/ }),
-/* 122 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _parse2;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; });
-function not(pred, thisArg) {
-    return function (value, index) { return !pred.call(thisArg, value, index); };
+function _load_parse2() {
+  return _parse2 = _interopRequireDefault(__webpack_require__(81));
 }
-//# sourceMappingURL=not.js.map
 
-/***/ }),
-/* 123 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _constants;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
+var _fs;
 
-function filter(predicate, thisArg) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) { return predicate.call(thisArg, value, index++) && subscriber.next(value); }));
-    });
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
-//# sourceMappingURL=filter.js.map
-
-/***/ }),
-/* 124 */
-/***/ (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__, "raceInit", function() { return raceInit; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(119);
-/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
+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; } }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const invariant = __webpack_require__(7);
 
+const path = __webpack_require__(0);
+const ssri = __webpack_require__(55);
 
-function race() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    sources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__["argsOrArgArray"])(sources);
-    return sources.length === 1 ? Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(sources[0]) : new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](raceInit(sources));
-}
-function raceInit(sources) {
-    return function (subscriber) {
-        var subscriptions = [];
-        var _loop_1 = function (i) {
-            subscriptions.push(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(sources[i]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__["createOperatorSubscriber"])(subscriber, function (value) {
-                if (subscriptions) {
-                    for (var s = 0; s < subscriptions.length; s++) {
-                        s !== i && subscriptions[s].unsubscribe();
-                    }
-                    subscriptions = null;
-                }
-                subscriber.next(value);
-            })));
-        };
-        for (var i = 0; subscriptions && !subscriber.closed && i < sources.length; i++) {
-            _loop_1(i);
-        }
-    };
+function getName(pattern) {
+  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
 }
-//# sourceMappingURL=race.js.map
 
-/***/ }),
-/* 125 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function blankObjectUndefined(obj) {
+  return obj && Object.keys(obj).length ? obj : undefined;
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return range; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59);
+function keyForRemote(remote) {
+  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+}
 
+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 range(start, count, scheduler) {
-    if (count == null) {
-        count = start;
-        start = 0;
-    }
-    if (count <= 0) {
-        return _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
-    }
-    var end = count + start;
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](scheduler
-        ?
-            function (subscriber) {
-                var n = start;
-                return scheduler.schedule(function () {
-                    if (n < end) {
-                        subscriber.next(n++);
-                        this.schedule();
-                    }
-                    else {
-                        subscriber.complete();
-                    }
-                });
-            }
-        :
-            function (subscriber) {
-                var n = start;
-                while (n < end && !subscriber.closed) {
-                    subscriber.next(n++);
-                }
-                subscriber.complete();
-            });
+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;
 }
-//# sourceMappingURL=range.js.map
 
-/***/ }),
-/* 126 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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;
+}
 
-"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__(10);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(59);
+class Lockfile {
+  constructor({ cache, source, parseResultType } = {}) {
+    this.source = source || '';
+    this.cache = cache;
+    this.parseResultType = parseResultType;
+  }
 
+  // source string if the `cache` was parsed
 
 
-function using(resourceFactory, observableFactory) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var resource = resourceFactory();
-        var result = observableFactory(resource);
-        var source = result ? Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"];
-        source.subscribe(subscriber);
-        return function () {
-            if (resource) {
-                resource.unsubscribe();
-            }
-        };
-    });
-}
-//# sourceMappingURL=using.js.map
+  // if true, we're parsing an old yarn file and need to update integrity fields
+  hasEntriesExistWithoutIntegrity() {
+    if (!this.cache) {
+      return false;
+    }
 
-/***/ }),
-/* 127 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    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;
+      }
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
-/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(119);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(59);
-/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(61);
+    return false;
+  }
 
+  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);
 
+      let lockfile;
+      let rawLockfile = '';
+      let parseResult;
 
+      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
+        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
+        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
 
+        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'));
+      }
 
+      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
+    })();
+  }
 
-function zip() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+  getLocked(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return undefined;
     }
-    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__["popResultSelector"])(args);
-    var sources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__["argsOrArgArray"])(args);
-    return sources.length
-        ? new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"](function (subscriber) {
-            var buffers = sources.map(function () { return []; });
-            var completed = sources.map(function () { return false; });
-            subscriber.add(function () {
-                buffers = completed = null;
-            });
-            var _loop_1 = function (sourceIndex) {
-                Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(sources[sourceIndex]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__["createOperatorSubscriber"])(subscriber, function (value) {
-                    buffers[sourceIndex].push(value);
-                    if (buffers.every(function (buffer) { return buffer.length; })) {
-                        var result = buffers.map(function (buffer) { return buffer.shift(); });
-                        subscriber.next(resultSelector ? resultSelector.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(result))) : result);
-                        if (buffers.some(function (buffer, i) { return !buffer.length && completed[i]; })) {
-                            subscriber.complete();
-                        }
-                    }
-                }, function () {
-                    completed[sourceIndex] = true;
-                    !buffers[sourceIndex].length && subscriber.complete();
-                }));
-            };
-            for (var sourceIndex = 0; !subscriber.closed && sourceIndex < sources.length; sourceIndex++) {
-                _loop_1(sourceIndex);
-            }
-            return function () {
-                buffers = completed = null;
-            };
-        })
-        : _empty__WEBPACK_IMPORTED_MODULE_4__["EMPTY"];
-}
-//# sourceMappingURL=zip.js.map
 
-/***/ }),
-/* 128 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    const shrunk = pattern in cache && cache[pattern];
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
+    if (typeof shrunk === 'string') {
+      return this.getLocked(shrunk);
+    } else if (shrunk) {
+      explodeEntry(pattern, shrunk);
+      return shrunk;
+    }
 
-//# sourceMappingURL=types.js.map
+    return undefined;
+  }
 
-/***/ }),
-/* 129 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  removePattern(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return;
+    }
+    delete cache[pattern];
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return audit; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+  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;
 
-function audit(durationSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var hasValue = false;
-        var lastValue = null;
-        var durationSubscriber = null;
-        var isComplete = false;
-        var endDuration = function () {
-            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
-            durationSubscriber = null;
-            if (hasValue) {
-                hasValue = false;
-                var value = lastValue;
-                lastValue = null;
-                subscriber.next(value);
-            }
-            isComplete && subscriber.complete();
-        };
-        var cleanupDuration = function () {
-            durationSubscriber = null;
-            isComplete && subscriber.complete();
-        };
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            hasValue = true;
-            lastValue = value;
-            if (!durationSubscriber) {
-                Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(durationSelector(value)).subscribe((durationSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, endDuration, cleanupDuration)));
-            }
-        }, function () {
-            isComplete = true;
-            (!hasValue || !durationSubscriber || durationSubscriber.closed) && subscriber.complete();
-        }));
-    });
-}
-//# sourceMappingURL=audit.js.map
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
 
-/***/ }),
-/* 130 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      const pattern = _ref;
 
-"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__(50);
-/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(129);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(114);
+      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;
 
-function auditTime(duration, scheduler) {
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    return Object(_audit__WEBPACK_IMPORTED_MODULE_1__["audit"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler); });
-}
-//# sourceMappingURL=auditTime.js.map
+        // 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
+      });
 
-/***/ }),
-/* 131 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      lockfile[pattern] = obj;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return buffer; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+      if (remoteKey) {
+        seen.set(remoteKey, obj);
+      }
+    }
 
+    return lockfile;
+  }
+}
+exports.default = Lockfile;
 
+/***/ }),
+/* 15 */,
+/* 16 */,
+/* 17 */
+/***/ (function(module, exports) {
 
-function buffer(closingNotifier) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var currentBuffer = [];
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) { return currentBuffer.push(value); }, function () {
-            subscriber.next(currentBuffer);
-            subscriber.complete();
-        }));
-        closingNotifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function () {
-            var b = currentBuffer;
-            currentBuffer = [];
-            subscriber.next(b);
-        }, _util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]));
-        return function () {
-            currentBuffer = null;
-        };
-    });
-}
-//# sourceMappingURL=buffer.js.map
+module.exports = __webpack_require__("stream");
 
 /***/ }),
-/* 132 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 18 */,
+/* 19 */,
+/* 20 */
+/***/ (function(module, 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__(12);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(17);
 
 
+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;
+      }
 
-function bufferCount(bufferSize, startBufferEvery) {
-    if (startBufferEvery === void 0) { startBufferEvery = null; }
-    startBufferEvery = startBufferEvery !== null && startBufferEvery !== void 0 ? startBufferEvery : bufferSize;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var buffers = [];
-        var count = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            var e_1, _a, e_2, _b;
-            var toEmit = null;
-            if (count++ % startBufferEvery === 0) {
-                buffers.push([]);
-            }
-            try {
-                for (var buffers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(buffers), buffers_1_1 = buffers_1.next(); !buffers_1_1.done; buffers_1_1 = buffers_1.next()) {
-                    var buffer = buffers_1_1.value;
-                    buffer.push(value);
-                    if (bufferSize <= buffer.length) {
-                        toEmit = toEmit !== null && toEmit !== void 0 ? toEmit : [];
-                        toEmit.push(buffer);
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (buffers_1_1 && !buffers_1_1.done && (_a = buffers_1.return)) _a.call(buffers_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            if (toEmit) {
-                try {
-                    for (var toEmit_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(toEmit), toEmit_1_1 = toEmit_1.next(); !toEmit_1_1.done; toEmit_1_1 = toEmit_1.next()) {
-                        var buffer = toEmit_1_1.value;
-                        Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__["arrRemove"])(buffers, buffer);
-                        subscriber.next(buffer);
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (toEmit_1_1 && !toEmit_1_1.done && (_b = toEmit_1.return)) _b.call(toEmit_1);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-            }
-        }, function () {
-            var e_3, _a;
-            try {
-                for (var buffers_2 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(buffers), buffers_2_1 = buffers_2.next(); !buffers_2_1.done; buffers_2_1 = buffers_2.next()) {
-                    var buffer = buffers_2_1.value;
-                    subscriber.next(buffer);
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (buffers_2_1 && !buffers_2_1.done && (_a = buffers_2.return)) _a.call(buffers_2);
-                }
-                finally { if (e_3) throw e_3.error; }
-            }
-            subscriber.complete();
-        }, undefined, function () {
-            buffers = null;
-        }));
-    });
-}
-//# sourceMappingURL=bufferCount.js.map
+      const item = _ref;
 
-/***/ }),
-/* 133 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      nullify(item);
+    }
+  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
+    Object.setPrototypeOf(obj, null);
 
-"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__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(50);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(61);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(76);
+    // for..in can only be applied to 'object', not 'function'
+    if (typeof obj === 'object') {
+      for (const key in obj) {
+        nullify(obj[key]);
+      }
+    }
+  }
 
+  return obj;
+}
 
+/***/ }),
+/* 21 */,
+/* 22 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__("assert");
 
+/***/ }),
+/* 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;
+};
 
-function bufferTime(bufferTimeSpan) {
-    var _a, _b;
-    var otherArgs = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        otherArgs[_i - 1] = arguments[_i];
-    }
-    var scheduler = (_a = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__["popScheduler"])(otherArgs)) !== null && _a !== void 0 ? _a : _scheduler_async__WEBPACK_IMPORTED_MODULE_5__["asyncScheduler"];
-    var bufferCreationInterval = (_b = otherArgs[0]) !== null && _b !== void 0 ? _b : null;
-    var maxBufferSize = otherArgs[1] || Infinity;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var bufferRecords = [];
-        var restartOnEmit = false;
-        var emit = function (record) {
-            var buffer = record.buffer, subs = record.subs;
-            subs.unsubscribe();
-            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_4__["arrRemove"])(bufferRecords, record);
-            subscriber.next(buffer);
-            restartOnEmit && startBuffer();
-        };
-        var startBuffer = function () {
-            if (bufferRecords) {
-                var subs = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-                subscriber.add(subs);
-                var buffer = [];
-                var record_1 = {
-                    buffer: buffer,
-                    subs: subs,
-                };
-                bufferRecords.push(record_1);
-                Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__["executeSchedule"])(subs, scheduler, function () { return emit(record_1); }, bufferTimeSpan);
-            }
-        };
-        if (bufferCreationInterval !== null && bufferCreationInterval >= 0) {
-            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__["executeSchedule"])(subscriber, scheduler, startBuffer, bufferCreationInterval, true);
-        }
-        else {
-            restartOnEmit = true;
-        }
-        startBuffer();
-        var bufferTimeSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__["createOperatorSubscriber"])(subscriber, function (value) {
-            var e_1, _a;
-            var recordsCopy = bufferRecords.slice();
-            try {
-                for (var recordsCopy_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(recordsCopy), recordsCopy_1_1 = recordsCopy_1.next(); !recordsCopy_1_1.done; recordsCopy_1_1 = recordsCopy_1.next()) {
-                    var record = recordsCopy_1_1.value;
-                    var buffer = record.buffer;
-                    buffer.push(value);
-                    maxBufferSize <= buffer.length && emit(record);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (recordsCopy_1_1 && !recordsCopy_1_1.done && (_a = recordsCopy_1.return)) _a.call(recordsCopy_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        }, function () {
-            while (bufferRecords === null || bufferRecords === void 0 ? void 0 : bufferRecords.length) {
-                subscriber.next(bufferRecords.shift().buffer);
-            }
-            bufferTimeSubscriber === null || bufferTimeSubscriber === void 0 ? void 0 : bufferTimeSubscriber.unsubscribe();
-            subscriber.complete();
-            subscriber.unsubscribe();
-        }, undefined, function () { return (bufferRecords = null); });
-        source.subscribe(bufferTimeSubscriber);
-    });
-}
-//# sourceMappingURL=bufferTime.js.map
 
 /***/ }),
-/* 134 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 28 */,
+/* 29 */
+/***/ (function(module, 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__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(21);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(17);
-
-
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizePattern = normalizePattern;
 
+/**
+ * Explode and normalize a pattern into its name and range.
+ */
 
+function normalizePattern(pattern) {
+  let hasVersion = false;
+  let range = 'latest';
+  let name = pattern;
 
-function bufferToggle(openings, closingSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var buffers = [];
-        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(openings).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, function (openValue) {
-            var buffer = [];
-            buffers.push(buffer);
-            var closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            var emitBuffer = function () {
-                Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_6__["arrRemove"])(buffers, buffer);
-                subscriber.next(buffer);
-                closingSubscription.unsubscribe();
-            };
-            closingSubscription.add(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(closingSelector(openValue)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, emitBuffer, _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"])));
-        }, _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"]));
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, function (value) {
-            var e_1, _a;
-            try {
-                for (var buffers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(buffers), buffers_1_1 = buffers_1.next(); !buffers_1_1.done; buffers_1_1 = buffers_1.next()) {
-                    var buffer = buffers_1_1.value;
-                    buffer.push(value);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (buffers_1_1 && !buffers_1_1.done && (_a = buffers_1.return)) _a.call(buffers_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        }, function () {
-            while (buffers.length > 0) {
-                subscriber.next(buffers.shift());
-            }
-            subscriber.complete();
-        }));
-    });
-}
-//# sourceMappingURL=bufferToggle.js.map
-
-/***/ }),
-/* 135 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
+  // 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);
+  }
 
+  // take first part as the name
+  const parts = name.split('@');
+  if (parts.length > 1) {
+    name = parts.shift();
+    range = parts.join('@');
 
+    if (range) {
+      hasVersion = true;
+    } else {
+      range = '*';
+    }
+  }
 
+  // add back @ scope suffix
+  if (isScoped) {
+    name = `@${name}`;
+  }
 
-function bufferWhen(closingSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var buffer = null;
-        var closingSubscriber = null;
-        var openBuffer = function () {
-            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
-            var b = buffer;
-            buffer = [];
-            b && subscriber.next(b);
-            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(closingSelector()).subscribe((closingSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, openBuffer, _util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"])));
-        };
-        openBuffer();
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) { return buffer === null || buffer === void 0 ? void 0 : buffer.push(value); }, function () {
-            buffer && subscriber.next(buffer);
-            subscriber.complete();
-        }, undefined, function () { return (buffer = closingSubscriber = null); }));
-    });
+  return { name, range, hasVersion };
 }
-//# sourceMappingURL=bufferWhen.js.map
 
 /***/ }),
-/* 136 */
-/***/ (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 _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-
+/* 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;
+};
 
-function catchError(selector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var innerSub = null;
-        var syncUnsub = false;
-        var handledResult;
-        innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, undefined, undefined, function (err) {
-            handledResult = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__["innerFrom"])(selector(err, catchError(selector)(source)));
-            if (innerSub) {
-                innerSub.unsubscribe();
-                innerSub = null;
-                handledResult.subscribe(subscriber);
-            }
-            else {
-                syncUnsub = true;
-            }
-        }));
-        if (syncUnsub) {
-            innerSub.unsubscribe();
-            innerSub = null;
-            handledResult.subscribe(subscriber);
-        }
-    });
-}
-//# sourceMappingURL=catchError.js.map
 
 /***/ }),
-/* 137 */
-/***/ (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 _combineLatestAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(138);
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var combineAll = _combineLatestAll__WEBPACK_IMPORTED_MODULE_0__["combineLatestAll"];
-//# sourceMappingURL=combineAll.js.map
+/* eslint-disable node/no-deprecated-api */
+var buffer = __webpack_require__(63)
+var Buffer = buffer.Buffer
 
-/***/ }),
-/* 138 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+  for (var key in src) {
+    dst[key] = src[key]
+  }
+}
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+  module.exports = buffer
+} else {
+  // Copy properties from require('buffer')
+  copyProps(buffer, exports)
+  exports.Buffer = SafeBuffer
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return combineLatestAll; });
-/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(98);
-/* harmony import */ var _joinAllInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(139);
+function SafeBuffer (arg, encodingOrOffset, length) {
+  return Buffer(arg, encodingOrOffset, length)
+}
 
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
 
-function combineLatestAll(project) {
-    return Object(_joinAllInternals__WEBPACK_IMPORTED_MODULE_1__["joinAllInternals"])(_observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__["combineLatest"], project);
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+  if (typeof arg === 'number') {
+    throw new TypeError('Argument must not be a number')
+  }
+  return Buffer(arg, encodingOrOffset, length)
 }
-//# sourceMappingURL=combineLatestAll.js.map
 
-/***/ }),
-/* 139 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "joinAllInternals", function() { return joinAllInternals; });
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(95);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(25);
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(104);
-/* harmony import */ var _toArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(140);
+SafeBuffer.allocUnsafe = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return Buffer(size)
+}
 
+SafeBuffer.allocUnsafeSlow = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return buffer.SlowBuffer(size)
+}
 
 
+/***/ }),
+/* 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;
+});
 
-function joinAllInternals(joinFn, project) {
-    return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_2__["pipe"])(Object(_toArray__WEBPACK_IMPORTED_MODULE_4__["toArray"])(), Object(_mergeMap__WEBPACK_IMPORTED_MODULE_3__["mergeMap"])(function (sources) { return joinFn(sources); }), project ? Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_1__["mapOneOrManyArgs"])(project) : _util_identity__WEBPACK_IMPORTED_MODULE_0__["identity"]);
-}
-//# sourceMappingURL=joinAllInternals.js.map
 
 /***/ }),
-/* 140 */
-/***/ (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__(141);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
+/* 34 */
+/***/ (function(module, exports) {
 
+module.exports = function (it) {
+  return typeof it === 'object' ? it !== null : typeof it === 'function';
+};
 
-var arrReducer = function (arr, value) { return (arr.push(value), arr); };
-function toArray() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(arrReducer, [])(source).subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=toArray.js.map
 
 /***/ }),
-/* 141 */
-/***/ (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 _scanInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(142);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
+/* 35 */
+/***/ (function(module, exports) {
 
+module.exports = {};
 
-function reduce(accumulator, seed) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(Object(_scanInternals__WEBPACK_IMPORTED_MODULE_0__["scanInternals"])(accumulator, seed, arguments.length >= 2, false, true));
-}
-//# sourceMappingURL=reduce.js.map
 
 /***/ }),
-/* 142 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scanInternals", function() { return scanInternals; });
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(30);
+/* 36 */
+/***/ (function(module, exports) {
 
-function scanInternals(accumulator, seed, hasSeed, emitOnNext, emitBeforeComplete) {
-    return function (source, subscriber) {
-        var hasState = hasSeed;
-        var state = seed;
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_0__["createOperatorSubscriber"])(subscriber, function (value) {
-            var i = index++;
-            state = hasState
-                ?
-                    accumulator(state, value, i)
-                :
-                    ((hasState = true), value);
-            emitOnNext && subscriber.next(state);
-        }, emitBeforeComplete &&
-            (function () {
-                hasState && subscriber.next(state);
-                subscriber.complete();
-            })));
-    };
-}
-//# sourceMappingURL=scanInternals.js.map
+module.exports = __webpack_require__("os");
 
 /***/ }),
-/* 143 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 37 */,
+/* 38 */,
+/* 39 */,
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return combineLatestWith; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(144);
 
 
-function combineLatestWith() {
-    var otherSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        otherSources[_i] = arguments[_i];
-    }
-    return _combineLatest__WEBPACK_IMPORTED_MODULE_1__["combineLatest"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(otherSources)));
+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);
+  });
 }
-//# sourceMappingURL=combineLatestWith.js.map
 
-/***/ }),
-/* 144 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function promisify(fn, firstData) {
+  return function (...args) {
+    return new Promise(function (resolve, reject) {
+      args.push(function (err, ...result) {
+        let res = result;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(98);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(119);
-/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(95);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(61);
+        if (result.length <= 1) {
+          res = result[0];
+        }
 
+        if (firstData) {
+          res = err;
+          err = null;
+        }
 
+        if (err) {
+          reject(err);
+        } else {
+          resolve(res);
+        }
+      });
 
+      fn.apply(null, args);
+    });
+  };
+}
 
+function queue(arr, promiseProducer, concurrency = Infinity) {
+  concurrency = Math.min(concurrency, arr.length);
 
+  // clone
+  arr = arr.slice();
 
+  const results = [];
+  let total = arr.length;
+  if (!total) {
+    return Promise.resolve(results);
+  }
 
-function combineLatest() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+  return new Promise((resolve, reject) => {
+    for (let i = 0; i < concurrency; i++) {
+      next();
     }
-    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__["popResultSelector"])(args);
-    return resultSelector
-        ? Object(_util_pipe__WEBPACK_IMPORTED_MODULE_5__["pipe"])(combineLatest.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args))), Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__["mapOneOrManyArgs"])(resultSelector))
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-            Object(_observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__["combineLatestInit"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__["argsOrArgArray"])(args))))(subscriber);
-        });
-}
-//# sourceMappingURL=combineLatest.js.map
-
-/***/ }),
-/* 145 */
-/***/ (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__(104);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+    function next() {
+      const item = arr.shift();
+      const promise = promiseProducer(item);
 
+      promise.then(function (result) {
+        results.push(result);
 
-function concatMap(project, resultSelector) {
-    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(resultSelector) ? Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, resultSelector, 1) : Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, 1);
+        total--;
+        if (total === 0) {
+          resolve(results);
+        } else {
+          if (arr.length) {
+            next();
+          }
+        }
+      }, reject);
+    }
+  });
 }
-//# sourceMappingURL=concatMap.js.map
 
 /***/ }),
-/* 146 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 41 */
+/***/ (function(module, 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__(145);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+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;
 
-function concatMapTo(innerObservable, resultSelector) {
-    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(resultSelector) ? Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; }, resultSelector) : Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; });
-}
-//# sourceMappingURL=concatMapTo.js.map
 
 /***/ }),
-/* 147 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return concatWith; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _concat__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(148);
-
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function concatWith() {
-    var otherSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        otherSources[_i] = arguments[_i];
-    }
-    return _concat__WEBPACK_IMPORTED_MODULE_1__["concat"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(otherSources)));
+try {
+  var util = __webpack_require__(2);
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  module.exports = __webpack_require__(224);
 }
-//# sourceMappingURL=concatWith.js.map
+
 
 /***/ }),
-/* 148 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 43 */,
+/* 44 */,
+/* 45 */
+/***/ (function(module, 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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _concatAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(102);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(61);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(63);
-
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.home = undefined;
 
+var _rootUser;
 
-function concat() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__["popScheduler"])(args);
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        Object(_concatAll__WEBPACK_IMPORTED_MODULE_2__["concatAll"])()(Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)), scheduler)).subscribe(subscriber);
-    });
+function _load_rootUser() {
+  return _rootUser = _interopRequireDefault(__webpack_require__(169));
 }
-//# sourceMappingURL=concat.js.map
 
-/***/ }),
-/* 149 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return connect; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(63);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _observable_fromSubscribable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(150);
+const path = __webpack_require__(0);
 
+const home = exports.home = __webpack_require__(36).homedir();
 
+const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
 
+exports.default = userHomeDir;
 
-var DEFAULT_CONFIG = {
-    connector: function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); },
+/***/ }),
+/* 46 */
+/***/ (function(module, exports) {
+
+module.exports = function (it) {
+  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
+  return it;
 };
-function connect(selector, config) {
-    if (config === void 0) { config = DEFAULT_CONFIG; }
-    var connector = config.connector;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var subject = connector();
-        Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(selector(Object(_observable_fromSubscribable__WEBPACK_IMPORTED_MODULE_3__["fromSubscribable"])(subject))).subscribe(subscriber);
-        subscriber.add(source.subscribe(subject));
-    });
-}
-//# sourceMappingURL=connect.js.map
+
 
 /***/ }),
-/* 150 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 47 */
+/***/ (function(module, exports) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromSubscribable", function() { return fromSubscribable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
+var toString = {}.toString;
+
+module.exports = function (it) {
+  return toString.call(it).slice(8, -1);
+};
 
-function fromSubscribable(subscribable) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscribable.subscribe(subscriber); });
-}
-//# sourceMappingURL=fromSubscribable.js.map
 
 /***/ }),
-/* 151 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 48 */
+/***/ (function(module, 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 _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(141);
+// 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);
+  };
+};
 
-function count(predicate) {
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(function (total, value, i) { return (!predicate || predicate(value, i) ? total + 1 : total); }, 0);
-}
-//# sourceMappingURL=count.js.map
 
 /***/ }),
-/* 152 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
-
-
+/* 49 */
+/***/ (function(module, exports) {
 
+var hasOwnProperty = {}.hasOwnProperty;
+module.exports = function (it, key) {
+  return hasOwnProperty.call(it, key);
+};
 
-function debounce(durationSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var hasValue = false;
-        var lastValue = null;
-        var durationSubscriber = null;
-        var emit = function () {
-            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
-            durationSubscriber = null;
-            if (hasValue) {
-                hasValue = false;
-                var value = lastValue;
-                lastValue = null;
-                subscriber.next(value);
-            }
-        };
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
-            hasValue = true;
-            lastValue = value;
-            durationSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, emit, _util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]);
-            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(durationSelector(value)).subscribe(durationSubscriber);
-        }, function () {
-            emit();
-            subscriber.complete();
-        }, undefined, function () {
-            lastValue = durationSubscriber = null;
-        }));
-    });
-}
-//# sourceMappingURL=debounce.js.map
 
 /***/ }),
-/* 153 */
-/***/ (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 _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+/* 50 */
+/***/ (function(module, exports, __webpack_require__) {
 
+var anObject = __webpack_require__(27);
+var IE8_DOM_DEFINE = __webpack_require__(184);
+var toPrimitive = __webpack_require__(201);
+var dP = Object.defineProperty;
 
+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;
+};
 
-function debounceTime(dueTime, scheduler) {
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var activeTask = null;
-        var lastValue = null;
-        var lastTime = null;
-        var emit = function () {
-            if (activeTask) {
-                activeTask.unsubscribe();
-                activeTask = null;
-                var value = lastValue;
-                lastValue = null;
-                subscriber.next(value);
-            }
-        };
-        function emitWhenIdle() {
-            var targetTime = lastTime + dueTime;
-            var now = scheduler.now();
-            if (now < targetTime) {
-                activeTask = this.schedule(undefined, targetTime - now);
-                subscriber.add(activeTask);
-                return;
-            }
-            emit();
-        }
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            lastValue = value;
-            lastTime = scheduler.now();
-            if (!activeTask) {
-                activeTask = scheduler.schedule(emitWhenIdle, dueTime);
-                subscriber.add(activeTask);
-            }
-        }, function () {
-            emit();
-            subscriber.complete();
-        }, undefined, function () {
-            lastValue = activeTask = null;
-        }));
-    });
-}
-//# sourceMappingURL=debounceTime.js.map
 
 /***/ }),
-/* 154 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-
+/* 51 */,
+/* 52 */,
+/* 53 */,
+/* 54 */
+/***/ (function(module, exports) {
 
-function defaultIfEmpty(defaultValue) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var hasValue = false;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            hasValue = true;
-            subscriber.next(value);
-        }, function () {
-            if (!hasValue) {
-                subscriber.next(defaultValue);
-            }
-            subscriber.complete();
-        }));
-    });
-}
-//# sourceMappingURL=defaultIfEmpty.js.map
+module.exports = __webpack_require__("events");
 
 /***/ }),
-/* 155 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 55 */
+/***/ (function(module, 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 _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _delayWhen__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(156);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(114);
-
-
-
-function delay(due, scheduler) {
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    var duration = Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(due, scheduler);
-    return Object(_delayWhen__WEBPACK_IMPORTED_MODULE_1__["delayWhen"])(function () { return duration; });
-}
-//# sourceMappingURL=delay.js.map
 
-/***/ }),
-/* 156 */
-/***/ (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 _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(101);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(157);
-/* harmony import */ var _ignoreElements__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(158);
-/* harmony import */ var _mapTo__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(159);
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(104);
+const Buffer = __webpack_require__(32).Buffer
 
+const crypto = __webpack_require__(9)
+const Transform = __webpack_require__(17).Transform
 
+const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
 
+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]+$/
 
+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]
 
-function delayWhen(delayDurationSelector, subscriptionDelay) {
-    if (subscriptionDelay) {
-        return function (source) {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(subscriptionDelay.pipe(Object(_take__WEBPACK_IMPORTED_MODULE_1__["take"])(1), Object(_ignoreElements__WEBPACK_IMPORTED_MODULE_2__["ignoreElements"])()), source.pipe(delayWhen(delayDurationSelector)));
-        };
+    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 ''
+      }
     }
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_4__["mergeMap"])(function (value, index) { return delayDurationSelector(value, index).pipe(Object(_take__WEBPACK_IMPORTED_MODULE_1__["take"])(1), Object(_mapTo__WEBPACK_IMPORTED_MODULE_3__["mapTo"])(value)); });
+    const options = this.options && this.options.length
+    ? `?${this.options.join('?')}`
+    : ''
+    return `${this.algorithm}-${this.digest}${options}`
+  }
 }
-//# sourceMappingURL=delayWhen.js.map
-
-/***/ }),
-/* 157 */
-/***/ (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 _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-
-
-
-function take(count) {
-    return count <= 0
-        ?
-            function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_0__["EMPTY"]; }
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-            var seen = 0;
-            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-                if (++seen <= count) {
-                    subscriber.next(value);
-                    if (count <= seen) {
-                        subscriber.complete();
-                    }
-                }
-            }));
-        });
+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
+    })
+  }
 }
-//# sourceMappingURL=take.js.map
-
-/***/ }),
-/* 158 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21);
 
-
-
-function ignoreElements() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]));
-    });
+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)
+  }
 }
-//# sourceMappingURL=ignoreElements.js.map
-
-/***/ }),
-/* 159 */
-/***/ (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 _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(96);
-
-function mapTo(value) {
-    return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(function () { return value; });
+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())
 }
-//# sourceMappingURL=mapTo.js.map
-
-/***/ }),
-/* 160 */
-/***/ (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 _Notification__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-
-
 
-function dematerialize() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (notification) { return Object(_Notification__WEBPACK_IMPORTED_MODULE_0__["observeNotification"])(notification, subscriber); }));
-    });
+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)
+  }
 }
-//# sourceMappingURL=dematerialize.js.map
 
-/***/ }),
-/* 161 */
-/***/ (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 import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21);
-
-
-
-function distinct(keySelector, flushes) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var distinctKeys = new Set();
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            var key = keySelector ? keySelector(value) : value;
-            if (!distinctKeys.has(key)) {
-                distinctKeys.add(key);
-                subscriber.next(value);
-            }
-        }));
-        flushes === null || flushes === void 0 ? void 0 : flushes.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function () { return distinctKeys.clear(); }, _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]));
-    });
+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
+  )
 }
-//# sourceMappingURL=distinct.js.map
-
-/***/ }),
-/* 162 */
-/***/ (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 _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-
-
 
-function distinctUntilChanged(comparator, keySelector) {
-    if (keySelector === void 0) { keySelector = _util_identity__WEBPACK_IMPORTED_MODULE_0__["identity"]; }
-    comparator = comparator !== null && comparator !== void 0 ? comparator : defaultCompare;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var previousKey;
-        var first = true;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            var currentKey = keySelector(value);
-            if (first || !comparator(previousKey, currentKey)) {
-                first = false;
-                previousKey = currentKey;
-                subscriber.next(value);
-            }
-        }));
-    });
-}
-function defaultCompare(a, b) {
-    return a === b;
+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())
 }
-//# sourceMappingURL=distinctUntilChanged.js.map
 
-/***/ }),
-/* 163 */
-/***/ (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__(162);
-
-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]; });
+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', () => {})
+  })
 }
-//# sourceMappingURL=distinctUntilKeyChanged.js.map
-
-/***/ }),
-/* 164 */
-/***/ (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__(88);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(123);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(165);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(154);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(157);
-
-
-
 
-
-function elementAt(index, defaultValue) {
-    if (index < 0) {
-        throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"]();
+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
     }
-    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"](); }));
-    };
+  }
+  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
+  }
 }
-//# sourceMappingURL=elementAt.js.map
-
-/***/ }),
-/* 165 */
-/***/ (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 _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-
 
+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', () => {})
+  })
+}
 
-function throwIfEmpty(errorFactory) {
-    if (errorFactory === void 0) { errorFactory = defaultErrorFactory; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var hasValue = false;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            hasValue = true;
-            subscriber.next(value);
-        }, function () { return (hasValue ? subscriber.complete() : subscriber.error(errorFactory())); }));
-    });
-}
-function defaultErrorFactory() {
-    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"]();
+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
 }
-//# sourceMappingURL=throwIfEmpty.js.map
-
-/***/ }),
-/* 166 */
-/***/ (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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(101);
-/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(60);
+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())
 
-function endWith() {
-    var values = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        values[_i] = arguments[_i];
+      return integrity
     }
-    return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_1__["concat"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_2__["of"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(values)))); };
+  }
 }
-//# sourceMappingURL=endWith.js.map
-
-/***/ }),
-/* 167 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+const NODE_HASHES = new Set(crypto.getHashes())
 
+// 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))
 
-function every(predicate, thisArg) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            if (!predicate.call(thisArg, value, index++, source)) {
-                subscriber.next(false);
-                subscriber.complete();
-            }
-        }, function () {
-            subscriber.next(true);
-            subscriber.complete();
-        }));
-    });
+function getPrioritizedHash (algo1, algo2) {
+  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
+  ? algo1
+  : algo2
 }
-//# sourceMappingURL=every.js.map
-
-/***/ }),
-/* 168 */
-/***/ (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 _exhaustAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(169);
-
-var exhaust = _exhaustAll__WEBPACK_IMPORTED_MODULE_0__["exhaustAll"];
-//# sourceMappingURL=exhaust.js.map
 
 /***/ }),
-/* 169 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 56 */,
+/* 57 */,
+/* 58 */,
+/* 59 */,
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return exhaustAll; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
 
+var path = { sep: '/' }
+try {
+  path = __webpack_require__(0)
+} catch (er) {}
 
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__(175)
 
-function exhaustAll() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var isComplete = false;
-        var innerSub = null;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (inner) {
-            if (!innerSub) {
-                innerSub = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(inner).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, undefined, function () {
-                    innerSub = null;
-                    isComplete && subscriber.complete();
-                }));
-            }
-        }, function () {
-            isComplete = true;
-            !innerSub && subscriber.complete();
-        }));
-    });
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
 }
-//# sourceMappingURL=exhaustAll.js.map
 
-/***/ }),
-/* 170 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return exhaustMap; });
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(96);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
+// * => 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('().*{}+?[]^$\\!')
 
-function exhaustMap(project, resultSelector) {
-    if (resultSelector) {
-        return function (source) {
-            return source.pipe(exhaustMap(function (a, i) { return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }));
-        };
-    }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var index = 0;
-        var innerSub = null;
-        var isComplete = false;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__["createOperatorSubscriber"])(subscriber, function (outerValue) {
-            if (!innerSub) {
-                innerSub = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__["createOperatorSubscriber"])(subscriber, undefined, function () {
-                    innerSub = null;
-                    isComplete && subscriber.complete();
-                });
-                Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(project(outerValue, index++)).subscribe(innerSub);
-            }
-        }, function () {
-            isComplete = true;
-            !innerSub && subscriber.complete();
-        }));
-    });
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
 }
-//# sourceMappingURL=exhaustMap.js.map
-
-/***/ }),
-/* 171 */
-/***/ (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 import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(105);
 
+// normalizes slashes.
+var slashSplit = /\/+/
 
-function expand(project, concurrent, scheduler) {
-    if (concurrent === void 0) { concurrent = Infinity; }
-    concurrent = (concurrent || 0) < 1 ? Infinity : concurrent;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_1__["mergeInternals"])(source, subscriber, project, concurrent, undefined, true, scheduler);
-    });
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
 }
-//# sourceMappingURL=expand.js.map
-
-/***/ }),
-/* 172 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-
-function finalize(callback) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        try {
-            source.subscribe(subscriber);
-        }
-        finally {
-            subscriber.add(callback);
-        }
-    });
+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
 }
-//# sourceMappingURL=finalize.js.map
 
-/***/ }),
-/* 173 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
 
-"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__, "createFind", function() { return createFind; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+  var orig = minimatch
 
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
 
-function find(predicate, thisArg) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(createFind(predicate, thisArg, 'value'));
-}
-function createFind(predicate, thisArg, emit) {
-    var findIndex = emit === 'index';
-    return function (source, subscriber) {
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            var i = index++;
-            if (predicate.call(thisArg, value, i, source)) {
-                subscriber.next(findIndex ? i : value);
-                subscriber.complete();
-            }
-        }, function () {
-            subscriber.next(findIndex ? -1 : undefined);
-            subscriber.complete();
-        }));
-    };
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
+
+  return m
 }
-//# sourceMappingURL=find.js.map
 
-/***/ }),
-/* 174 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _find__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(173);
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
+  if (!options) options = {}
 
-function findIndex(predicate, thisArg) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(Object(_find__WEBPACK_IMPORTED_MODULE_1__["createFind"])(predicate, thisArg, 'index'));
-}
-//# sourceMappingURL=findIndex.js.map
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
 
-/***/ }),
-/* 175 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
 
-"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__(86);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(123);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(157);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(154);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(165);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
+  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
 
-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"](); }));
-    };
+  // make the set of regexps etc.
+  this.make()
 }
-//# sourceMappingURL=first.js.map
 
-/***/ }),
-/* 176 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Minimatch.prototype.debug = function () {}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return groupBy; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
+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()
 
-function groupBy(keySelector, elementOrOptions, duration, connector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__["operate"])(function (source, subscriber) {
-        var element;
-        if (!elementOrOptions || typeof elementOrOptions === 'function') {
-            element = elementOrOptions;
-        }
-        else {
-            (duration = elementOrOptions.duration, element = elementOrOptions.element, connector = elementOrOptions.connector);
-        }
-        var groups = new Map();
-        var notify = function (cb) {
-            groups.forEach(cb);
-            cb(subscriber);
-        };
-        var handleError = function (err) { return notify(function (consumer) { return consumer.error(err); }); };
-        var activeGroups = 0;
-        var teardownAttempted = false;
-        var groupBySourceSubscriber = new _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["OperatorSubscriber"](subscriber, function (value) {
-            try {
-                var key_1 = keySelector(value);
-                var group_1 = groups.get(key_1);
-                if (!group_1) {
-                    groups.set(key_1, (group_1 = connector ? connector() : new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]()));
-                    var grouped = createGroupedObservable(key_1, group_1);
-                    subscriber.next(grouped);
-                    if (duration) {
-                        var durationSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(group_1, function () {
-                            group_1.complete();
-                            durationSubscriber_1 === null || durationSubscriber_1 === void 0 ? void 0 : durationSubscriber_1.unsubscribe();
-                        }, undefined, undefined, function () { return groups.delete(key_1); });
-                        groupBySourceSubscriber.add(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__["innerFrom"])(duration(grouped)).subscribe(durationSubscriber_1));
-                    }
-                }
-                group_1.next(element ? element(value) : value);
-            }
-            catch (err) {
-                handleError(err);
-            }
-        }, function () { return notify(function (consumer) { return consumer.complete(); }); }, handleError, function () { return groups.clear(); }, function () {
-            teardownAttempted = true;
-            return activeGroups === 0;
-        });
-        source.subscribe(groupBySourceSubscriber);
-        function createGroupedObservable(key, groupSubject) {
-            var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (groupSubscriber) {
-                activeGroups++;
-                var innerSub = groupSubject.subscribe(groupSubscriber);
-                return function () {
-                    innerSub.unsubscribe();
-                    --activeGroups === 0 && teardownAttempted && groupBySourceSubscriber.unsubscribe();
-                };
-            });
-            result.key = key;
-            return result;
-        }
-    });
-}
-//# sourceMappingURL=groupBy.js.map
+  if (options.debug) this.debug = console.error
 
-/***/ }),
-/* 177 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  this.debug(this.pattern, set)
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return isEmpty; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+  // 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)
 
-function isEmpty() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function () {
-            subscriber.next(false);
-            subscriber.complete();
-        }, function () {
-            subscriber.next(true);
-            subscriber.complete();
-        }));
-    });
-}
-//# sourceMappingURL=isEmpty.js.map
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
 
-/***/ }),
-/* 178 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  this.debug(this.pattern, set)
 
-"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__(86);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(123);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(179);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(165);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(154);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
+  // 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++
+  }
 
-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"](); }));
-    };
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
 }
-//# sourceMappingURL=last.js.map
-
-/***/ }),
-/* 179 */
-/***/ (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__(12);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
+// 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
 
-function takeLast(count) {
-    return count <= 0
-        ? function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"]; }
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-            var buffer = [];
-            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__["createOperatorSubscriber"])(subscriber, function (value) {
-                buffer.push(value);
-                count < buffer.length && buffer.shift();
-            }, function () {
-                var e_1, _a;
-                try {
-                    for (var buffer_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(buffer), buffer_1_1 = buffer_1.next(); !buffer_1_1.done; buffer_1_1 = buffer_1.next()) {
-                        var value = buffer_1_1.value;
-                        subscriber.next(value);
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (buffer_1_1 && !buffer_1_1.done && (_a = buffer_1.return)) _a.call(buffer_1);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                subscriber.complete();
-            }, undefined, function () {
-                buffer = null;
-            }));
-        });
+  if (typeof pattern === 'undefined') {
+    throw new TypeError('undefined pattern')
+  }
+
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
+
+  return expand(pattern)
 }
-//# sourceMappingURL=takeLast.js.map
 
-/***/ }),
-/* 180 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// 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')
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return materialize; });
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+  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 materialize() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__["Notification"].createNext(value));
-        }, function () {
-            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__["Notification"].createComplete());
-            subscriber.complete();
-        }, function (err) {
-            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__["Notification"].createError(err));
-            subscriber.complete();
-        }));
-    });
-}
-//# sourceMappingURL=materialize.js.map
+  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
+    }
+  }
 
-/***/ }),
-/* 181 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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)
 
-"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__(141);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+    // 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
 
-function max(comparer) {
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(comparer) ? function (x, y) { return (comparer(x, y) > 0 ? x : y); } : function (x, y) { return (x > y ? x : y); });
-}
-//# sourceMappingURL=max.js.map
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
 
-/***/ }),
-/* 182 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      // 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)
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return flatMap; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(104);
+        // 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
+        }
 
-var flatMap = _mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"];
-//# sourceMappingURL=flatMap.js.map
+        // 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
 
-/***/ }),
-/* 183 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
 
-"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__(104);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+        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
 
-function mergeMapTo(innerObservable, resultSelector, concurrent) {
-    if (concurrent === void 0) { concurrent = Infinity; }
-    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(resultSelector)) {
-        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
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
 
-/***/ }),
-/* 184 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        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
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return mergeScan; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(105);
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
 
+        clearStateChar()
+        re += '|'
+      continue
 
-function mergeScan(accumulator, seed, concurrent) {
-    if (concurrent === void 0) { concurrent = Infinity; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var state = seed;
-        return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_1__["mergeInternals"])(source, subscriber, function (value, index) { return accumulator(state, value, index); }, concurrent, function (value) {
-            state = value;
-        }, false, undefined, function () { return (state = null); });
-    });
-}
-//# sourceMappingURL=mergeScan.js.map
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
-/***/ }),
-/* 185 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return mergeWith; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _merge__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(186);
+        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
+        }
 
-function mergeWith() {
-    var otherSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        otherSources[_i] = arguments[_i];
-    }
-    return _merge__WEBPACK_IMPORTED_MODULE_1__["merge"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(otherSources)));
-}
-//# sourceMappingURL=mergeWith.js.map
+        // 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
+          }
+        }
 
-/***/ }),
-/* 186 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(119);
-/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(103);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(61);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(63);
+      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 = '\\'
+      }
 
-function merge() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_4__["popScheduler"])(args);
-    var concurrent = Object(_util_args__WEBPACK_IMPORTED_MODULE_4__["popNumber"])(args, Infinity);
-    args = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__["argsOrArgArray"])(args);
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        Object(_mergeAll__WEBPACK_IMPORTED_MODULE_3__["mergeAll"])(concurrent)(Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args)), scheduler)).subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=merge.js.map
+      // 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 + '|'
+    })
 
-/***/ }),
-/* 187 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
 
-"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__(141);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+    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 += '\\\\'
+  }
 
-function min(comparer) {
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(comparer) ? function (x, y) { return (comparer(x, y) < 0 ? x : y); } : function (x, y) { return (x < y ? x : y); });
-}
-//# sourceMappingURL=min.js.map
+  // 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
+  }
 
-/***/ }),
-/* 188 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // 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]
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return multicast; });
-/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
-/* harmony import */ var _connect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(149);
+    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
 
-function multicast(subjectOrSubjectFactory, selector) {
-    var subjectFactory = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(subjectOrSubjectFactory) ? subjectOrSubjectFactory : function () { return subjectOrSubjectFactory; };
-    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(selector)) {
-        return Object(_connect__WEBPACK_IMPORTED_MODULE_2__["connect"])(selector, {
-            connector: subjectFactory,
-        });
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
     }
-    return function (source) { return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__["ConnectableObservable"](source, subjectFactory); };
-}
-//# sourceMappingURL=multicast.js.map
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
 
-/***/ }),
-/* 189 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // 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
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return pairwise; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+  if (addPatternStart) {
+    re = patternStart + re
+  }
 
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
 
-function pairwise() {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var prev;
-        var hasPrev = false;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            var p = prev;
-            prev = value;
-            hasPrev && subscriber.next([p, value]);
-            hasPrev = 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)
+  }
+
+  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
 }
-//# sourceMappingURL=pairwise.js.map
 
-/***/ }),
-/* 190 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
 
-"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__(96);
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
 
-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 Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(function (x) {
-        var currentProp = x;
-        for (var i = 0; i < length; i++) {
-            var p = currentProp === null || currentProp === void 0 ? void 0 : currentProp[properties[i]];
-            if (typeof p !== 'undefined') {
-                currentProp = p;
-            }
-            else {
-                return undefined;
-            }
-        }
-        return currentProp;
-    });
-}
-//# sourceMappingURL=pluck.js.map
-
-/***/ }),
-/* 191 */
-/***/ (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__(34);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(188);
-/* harmony import */ var _connect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(149);
+  // 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' : ''
 
-function publish(selector) {
-    return selector ? function (source) { return Object(_connect__WEBPACK_IMPORTED_MODULE_2__["connect"])(selector)(source); } : function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]())(source); };
-}
-//# sourceMappingURL=publish.js.map
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
 
-/***/ }),
-/* 192 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
 
-"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__(36);
-/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27);
+  // 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
+}
 
-function publishBehavior(initialValue) {
-    return function (source) {
-        var subject = new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__["BehaviorSubject"](initialValue);
-        return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"](source, function () { return subject; });
-    };
+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
 }
-//# sourceMappingURL=publishBehavior.js.map
 
-/***/ }),
-/* 193 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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 === ''
 
-"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__(39);
-/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27);
+  if (f === '/' && partial) return true
 
+  var options = this.options
 
-function publishLast() {
-    return function (source) {
-        var subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__["AsyncSubject"]();
-        return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"](source, function () { return subject; });
-    };
-}
-//# sourceMappingURL=publishLast.js.map
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
 
-/***/ }),
-/* 194 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
 
-"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__(37);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(188);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
+  // 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
+  }
 
-function publishReplay(bufferSize, windowTime, selectorOrScheduler, timestampProvider) {
-    if (selectorOrScheduler && !Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(selectorOrScheduler)) {
-        timestampProvider = selectorOrScheduler;
+  for (i = 0; i < set.length; i++) {
+    var pattern = set[i]
+    var file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = [filename]
     }
-    var selector = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(selectorOrScheduler) ? selectorOrScheduler : undefined;
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, timestampProvider), selector)(source); };
-}
-//# sourceMappingURL=publishReplay.js.map
+    var hit = this.matchOne(file, pattern, partial)
+    if (hit) {
+      if (options.flipNegate) return true
+      return !this.negate
+    }
+  }
 
-/***/ }),
-/* 195 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return raceWith; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(124);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26);
+// 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 })
 
+  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]
 
-function raceWith() {
-    var otherSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        otherSources[_i] = arguments[_i];
-    }
-    return !otherSources.length
-        ? _util_identity__WEBPACK_IMPORTED_MODULE_3__["identity"]
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-            Object(_observable_race__WEBPACK_IMPORTED_MODULE_1__["raceInit"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(otherSources)))(subscriber);
-        });
-}
-//# sourceMappingURL=raceWith.js.map
+    this.debug(pattern, p, f)
 
-/***/ }),
-/* 196 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return repeat; });
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(114);
+    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
+          }
 
-function repeat(countOrConfig) {
-    var _a;
-    var count = Infinity;
-    var delay;
-    if (countOrConfig != null) {
-        if (typeof countOrConfig === 'object') {
-            (_a = countOrConfig.count, count = _a === void 0 ? Infinity : _a, delay = countOrConfig.delay);
-        }
-        else {
-            count = countOrConfig;
+          // ** 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
     }
-    return count <= 0
-        ? function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_0__["EMPTY"]; }
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-            var soFar = 0;
-            var sourceSub;
-            var resubscribe = function () {
-                sourceSub === null || sourceSub === void 0 ? void 0 : sourceSub.unsubscribe();
-                sourceSub = null;
-                if (delay != null) {
-                    var notifier = typeof delay === 'number' ? Object(_observable_timer__WEBPACK_IMPORTED_MODULE_4__["timer"])(delay) : Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(delay(soFar));
-                    var notifierSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function () {
-                        notifierSubscriber_1.unsubscribe();
-                        subscribeToSource();
-                    });
-                    notifier.subscribe(notifierSubscriber_1);
-                }
-                else {
-                    subscribeToSource();
-                }
-            };
-            var subscribeToSource = function () {
-                var syncUnsub = false;
-                sourceSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, undefined, function () {
-                    if (++soFar < count) {
-                        if (sourceSub) {
-                            resubscribe();
-                        }
-                        else {
-                            syncUnsub = true;
-                        }
-                    }
-                    else {
-                        subscriber.complete();
-                    }
-                }));
-                if (syncUnsub) {
-                    resubscribe();
-                }
-            };
-            subscribeToSource();
-        });
-}
-//# sourceMappingURL=repeat.js.map
 
-/***/ }),
-/* 197 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // 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)
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return repeatWhen; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+    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
+  }
 
-function repeatWhen(notifier) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var innerSub;
-        var syncResub = false;
-        var completions$;
-        var isNotifierComplete = false;
-        var isMainComplete = false;
-        var checkComplete = function () { return isMainComplete && isNotifierComplete && (subscriber.complete(), true); };
-        var getCompletionSubject = function () {
-            if (!completions$) {
-                completions$ = new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
-                notifier(completions$).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function () {
-                    if (innerSub) {
-                        subscribeForRepeatWhen();
-                    }
-                    else {
-                        syncResub = true;
-                    }
-                }, function () {
-                    isNotifierComplete = true;
-                    checkComplete();
-                }));
-            }
-            return completions$;
-        };
-        var subscribeForRepeatWhen = function () {
-            isMainComplete = false;
-            innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, undefined, function () {
-                isMainComplete = true;
-                !checkComplete() && getCompletionSubject().next();
-            }));
-            if (syncResub) {
-                innerSub.unsubscribe();
-                innerSub = null;
-                syncResub = false;
-                subscribeForRepeatWhen();
-            }
-        };
-        subscribeForRepeatWhen();
-    });
+  // should be unreachable.
+  throw new Error('wtf?')
 }
-//# sourceMappingURL=repeatWhen.js.map
 
-/***/ }),
-/* 198 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return retry; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(26);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(114);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(66);
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+}
 
 
+/***/ }),
+/* 61 */
+/***/ (function(module, exports, __webpack_require__) {
 
+var wrappy = __webpack_require__(123)
+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
+  })
 
-function retry(configOrCount) {
-    if (configOrCount === void 0) { configOrCount = Infinity; }
-    var config;
-    if (configOrCount && typeof configOrCount === 'object') {
-        config = configOrCount;
-    }
-    else {
-        config = {
-            count: configOrCount,
-        };
-    }
-    var _a = config.count, count = _a === void 0 ? Infinity : _a, delay = config.delay, _b = config.resetOnSuccess, resetOnSuccess = _b === void 0 ? false : _b;
-    return count <= 0
-        ? _util_identity__WEBPACK_IMPORTED_MODULE_2__["identity"]
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-            var soFar = 0;
-            var innerSub;
-            var subscribeForRetry = function () {
-                var syncUnsub = false;
-                innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-                    if (resetOnSuccess) {
-                        soFar = 0;
-                    }
-                    subscriber.next(value);
-                }, undefined, function (err) {
-                    if (soFar++ < count) {
-                        var resub_1 = function () {
-                            if (innerSub) {
-                                innerSub.unsubscribe();
-                                innerSub = null;
-                                subscribeForRetry();
-                            }
-                            else {
-                                syncUnsub = true;
-                            }
-                        };
-                        if (delay != null) {
-                            var notifier = typeof delay === 'number' ? Object(_observable_timer__WEBPACK_IMPORTED_MODULE_3__["timer"])(delay) : Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__["innerFrom"])(delay(err, soFar));
-                            var notifierSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function () {
-                                notifierSubscriber_1.unsubscribe();
-                                resub_1();
-                            }, function () {
-                                subscriber.complete();
-                            });
-                            notifier.subscribe(notifierSubscriber_1);
-                        }
-                        else {
-                            resub_1();
-                        }
-                    }
-                    else {
-                        subscriber.error(err);
-                    }
-                }));
-                if (syncUnsub) {
-                    innerSub.unsubscribe();
-                    innerSub = null;
-                    subscribeForRetry();
-                }
-            };
-            subscribeForRetry();
-        });
+  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
 }
-//# sourceMappingURL=retry.js.map
 
-/***/ }),
-/* 199 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return retryWhen; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
 
+/***/ }),
+/* 62 */,
+/* 63 */
+/***/ (function(module, exports) {
 
-
-function retryWhen(notifier) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var innerSub;
-        var syncResub = false;
-        var errors$;
-        var subscribeForRetryWhen = function () {
-            innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, undefined, undefined, function (err) {
-                if (!errors$) {
-                    errors$ = new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
-                    notifier(errors$).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function () {
-                        return innerSub ? subscribeForRetryWhen() : (syncResub = true);
-                    }));
-                }
-                if (errors$) {
-                    errors$.next(err);
-                }
-            }));
-            if (syncResub) {
-                innerSub.unsubscribe();
-                innerSub = null;
-                syncResub = false;
-                subscribeForRetryWhen();
-            }
-        };
-        subscribeForRetryWhen();
-    });
-}
-//# sourceMappingURL=retryWhen.js.map
+module.exports = __webpack_require__("buffer");
 
 /***/ }),
-/* 200 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-
+/* 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;
+};
 
-function sample(notifier) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var hasValue = false;
-        var lastValue = null;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            hasValue = true;
-            lastValue = value;
-        }));
-        notifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function () {
-            if (hasValue) {
-                hasValue = false;
-                var value = lastValue;
-                lastValue = null;
-                subscriber.next(value);
-            }
-        }, _util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]));
-    });
-}
-//# sourceMappingURL=sample.js.map
 
 /***/ }),
-/* 201 */
-/***/ (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 _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _sample__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200);
-/* harmony import */ var _observable_interval__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(113);
-
+/* 68 */
+/***/ (function(module, exports, __webpack_require__) {
 
+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) : {};
+};
 
-function sampleTime(period, scheduler) {
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    return Object(_sample__WEBPACK_IMPORTED_MODULE_1__["sample"])(Object(_observable_interval__WEBPACK_IMPORTED_MODULE_2__["interval"])(period, scheduler));
-}
-//# sourceMappingURL=sampleTime.js.map
 
 /***/ }),
-/* 202 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _scanInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(142);
+/* 69 */
+/***/ (function(module, exports) {
 
+module.exports = true;
 
-function scan(accumulator, seed) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(Object(_scanInternals__WEBPACK_IMPORTED_MODULE_1__["scanInternals"])(accumulator, seed, arguments.length >= 2, true));
-}
-//# sourceMappingURL=scan.js.map
 
 /***/ }),
-/* 203 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 70 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return sequenceEqual; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
 
+// 25.4.1.5 NewPromiseCapability(C)
+var aFunction = __webpack_require__(46);
 
-function sequenceEqual(compareTo, comparator) {
-    if (comparator === void 0) { comparator = function (a, b) { return a === b; }; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var aState = createState();
-        var bState = createState();
-        var emit = function (isEqual) {
-            subscriber.next(isEqual);
-            subscriber.complete();
-        };
-        var createSubscriber = function (selfState, otherState) {
-            var sequenceEqualSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (a) {
-                var buffer = otherState.buffer, complete = otherState.complete;
-                if (buffer.length === 0) {
-                    complete ? emit(false) : selfState.buffer.push(a);
-                }
-                else {
-                    !comparator(a, buffer.shift()) && emit(false);
-                }
-            }, function () {
-                selfState.complete = true;
-                var complete = otherState.complete, buffer = otherState.buffer;
-                complete && emit(buffer.length === 0);
-                sequenceEqualSubscriber === null || sequenceEqualSubscriber === void 0 ? void 0 : sequenceEqualSubscriber.unsubscribe();
-            });
-            return sequenceEqualSubscriber;
-        };
-        source.subscribe(createSubscriber(aState, bState));
-        compareTo.subscribe(createSubscriber(bState, aState));
-    });
-}
-function createState() {
-    return {
-        buffer: [],
-        complete: false,
-    };
+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);
 }
-//# sourceMappingURL=sequenceEqual.js.map
-
-/***/ }),
-/* 204 */
-/***/ (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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(63);
-/* harmony import */ var _operators_take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(157);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(11);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(29);
 
+module.exports.f = function (C) {
+  return new PromiseCapability(C);
+};
 
 
+/***/ }),
+/* 71 */
+/***/ (function(module, exports, __webpack_require__) {
 
+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 });
+};
 
-function share(options) {
-    if (options === void 0) { options = {}; }
-    var _a = options.connector, connector = _a === void 0 ? function () { return new _Subject__WEBPACK_IMPORTED_MODULE_3__["Subject"](); } : _a, _b = options.resetOnError, resetOnError = _b === void 0 ? true : _b, _c = options.resetOnComplete, resetOnComplete = _c === void 0 ? true : _c, _d = options.resetOnRefCountZero, resetOnRefCountZero = _d === void 0 ? true : _d;
-    return function (wrapperSource) {
-        var connection = null;
-        var resetConnection = null;
-        var subject = null;
-        var refCount = 0;
-        var hasCompleted = false;
-        var hasErrored = false;
-        var cancelReset = function () {
-            resetConnection === null || resetConnection === void 0 ? void 0 : resetConnection.unsubscribe();
-            resetConnection = null;
-        };
-        var reset = function () {
-            cancelReset();
-            connection = subject = null;
-            hasCompleted = hasErrored = false;
-        };
-        var resetAndUnsubscribe = function () {
-            var conn = connection;
-            reset();
-            conn === null || conn === void 0 ? void 0 : conn.unsubscribe();
-        };
-        return Object(_util_lift__WEBPACK_IMPORTED_MODULE_5__["operate"])(function (source, subscriber) {
-            refCount++;
-            if (!hasErrored && !hasCompleted) {
-                cancelReset();
-            }
-            var dest = (subject = subject !== null && subject !== void 0 ? subject : connector());
-            subscriber.add(function () {
-                refCount--;
-                if (refCount === 0 && !hasErrored && !hasCompleted) {
-                    resetConnection = handleReset(resetAndUnsubscribe, resetOnRefCountZero);
-                }
-            });
-            dest.subscribe(subscriber);
-            if (!connection) {
-                connection = new _Subscriber__WEBPACK_IMPORTED_MODULE_4__["SafeSubscriber"]({
-                    next: function (value) { return dest.next(value); },
-                    error: function (err) {
-                        hasErrored = true;
-                        cancelReset();
-                        resetConnection = handleReset(reset, resetOnError, err);
-                        dest.error(err);
-                    },
-                    complete: function () {
-                        hasCompleted = true;
-                        cancelReset();
-                        resetConnection = handleReset(reset, resetOnComplete);
-                        dest.complete();
-                    },
-                });
-                Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(source).subscribe(connection);
-            }
-        })(wrapperSource);
-    };
-}
-function handleReset(reset, on) {
-    var args = [];
-    for (var _i = 2; _i < arguments.length; _i++) {
-        args[_i - 2] = arguments[_i];
-    }
-    if (on === true) {
-        reset();
-        return null;
-    }
-    if (on === false) {
-        return null;
-    }
-    return on.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(args))).pipe(Object(_operators_take__WEBPACK_IMPORTED_MODULE_2__["take"])(1))
-        .subscribe(function () { return reset(); });
-}
-//# sourceMappingURL=share.js.map
 
 /***/ }),
-/* 205 */
-/***/ (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__(37);
-/* harmony import */ var _share__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
+/* 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));
+};
 
-function shareReplay(configOrBufferSize, windowTime, scheduler) {
-    var _a, _b, _c;
-    var bufferSize;
-    var refCount = false;
-    if (configOrBufferSize && typeof configOrBufferSize === 'object') {
-        (_a = configOrBufferSize.bufferSize, bufferSize = _a === void 0 ? Infinity : _a, _b = configOrBufferSize.windowTime, windowTime = _b === void 0 ? Infinity : _b, _c = configOrBufferSize.refCount, refCount = _c === void 0 ? false : _c, scheduler = configOrBufferSize.scheduler);
-    }
-    else {
-        bufferSize = configOrBufferSize !== null && configOrBufferSize !== void 0 ? configOrBufferSize : Infinity;
-    }
-    return Object(_share__WEBPACK_IMPORTED_MODULE_1__["share"])({
-        connector: function () { return new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler); },
-        resetOnError: true,
-        resetOnComplete: false,
-        resetOnRefCountZero: refCount,
-    });
-}
-//# sourceMappingURL=shareReplay.js.map
 
 /***/ }),
-/* 206 */
-/***/ (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 _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86);
-/* harmony import */ var _util_SequenceError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(90);
-/* harmony import */ var _util_NotFoundError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(89);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
+/* 73 */
+/***/ (function(module, exports) {
 
+// 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);
+};
 
 
+/***/ }),
+/* 74 */
+/***/ (function(module, exports, __webpack_require__) {
 
+// 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));
+};
 
-function single(predicate) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__["operate"])(function (source, subscriber) {
-        var hasValue = false;
-        var singleValue;
-        var seenValue = false;
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, function (value) {
-            seenValue = true;
-            if (!predicate || predicate(value, index++, source)) {
-                hasValue && subscriber.error(new _util_SequenceError__WEBPACK_IMPORTED_MODULE_1__["SequenceError"]('Too many matching values'));
-                hasValue = true;
-                singleValue = value;
-            }
-        }, function () {
-            if (hasValue) {
-                subscriber.next(singleValue);
-                subscriber.complete();
-            }
-            else {
-                subscriber.error(seenValue ? new _util_NotFoundError__WEBPACK_IMPORTED_MODULE_2__["NotFoundError"]('No matching values') : new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"]());
-            }
-        }));
-    });
-}
-//# sourceMappingURL=single.js.map
 
 /***/ }),
-/* 207 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 75 */
+/***/ (function(module, 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 _filter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(123);
+// 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 skip(count) {
-    return Object(_filter__WEBPACK_IMPORTED_MODULE_0__["filter"])(function (_, index) { return count <= index; });
-}
-//# sourceMappingURL=skip.js.map
+module.exports = glob
 
-/***/ }),
-/* 208 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return skipLast; });
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+var once = __webpack_require__(61)
 
+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)
+  }
 
-function skipLast(skipCount) {
-    return skipCount <= 0
-        ?
-            _util_identity__WEBPACK_IMPORTED_MODULE_0__["identity"]
-        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-            var ring = new Array(skipCount);
-            var seen = 0;
-            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-                var valueIndex = seen++;
-                if (valueIndex < skipCount) {
-                    ring[valueIndex] = value;
-                }
-                else {
-                    var index = valueIndex % skipCount;
-                    var oldValue = ring[index];
-                    ring[index] = value;
-                    subscriber.next(oldValue);
-                }
-            }));
-            return function () {
-                ring = null;
-            };
-        });
+  return new Glob(pattern, options, cb)
 }
-//# sourceMappingURL=skipLast.js.map
 
-/***/ }),
-/* 209 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return skipUntil; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21);
+// 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
 
-function skipUntil(notifier) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var taking = false;
-        var skipSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function () {
-            skipSubscriber === null || skipSubscriber === void 0 ? void 0 : skipSubscriber.unsubscribe();
-            taking = true;
-        }, _util_noop__WEBPACK_IMPORTED_MODULE_3__["noop"]);
-        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(notifier).subscribe(skipSubscriber);
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) { return taking && subscriber.next(value); }));
-    });
-}
-//# sourceMappingURL=skipUntil.js.map
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
 
-/***/ }),
-/* 210 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (!pattern)
+    return false
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return skipWhile; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+  if (set.length > 1)
+    return true
 
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
 
-function skipWhile(predicate) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var taking = false;
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) { return (taking || (taking = !predicate(value, index++))) && subscriber.next(value); }));
-    });
+  return false
 }
-//# sourceMappingURL=skipWhile.js.map
 
-/***/ }),
-/* 211 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+glob.Glob = Glob
+inherits(Glob, EE)
+function Glob (pattern, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = null
+  }
 
-"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__(101);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
+  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
 
-function startWith() {
-    var values = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        values[_i] = arguments[_i];
-    }
-    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_1__["popScheduler"])(values);
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        (scheduler ? Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(values, source, scheduler) : Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(values, source)).subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=startWith.js.map
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
 
-/***/ }),
-/* 212 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // 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)
 
-"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__(213);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
+  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
 
-function switchAll() {
-    return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]);
-}
-//# sourceMappingURL=switchAll.js.map
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
 
-/***/ }),
-/* 213 */
-/***/ (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 _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+  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 switchMap(project, resultSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var innerSubscriber = null;
-        var index = 0;
-        var isComplete = false;
-        var checkComplete = function () { return isComplete && !innerSubscriber && subscriber.complete(); };
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            innerSubscriber === null || innerSubscriber === void 0 ? void 0 : innerSubscriber.unsubscribe();
-            var innerIndex = 0;
-            var outerIndex = index++;
-            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__["innerFrom"])(project(value, outerIndex)).subscribe((innerSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (innerValue) { return subscriber.next(resultSelector ? resultSelector(value, innerValue, outerIndex, innerIndex++) : innerValue); }, function () {
-                innerSubscriber = null;
-                checkComplete();
-            })));
-        }, function () {
-            isComplete = true;
-            checkComplete();
-        }));
-    });
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
+  }
 }
-//# sourceMappingURL=switchMap.js.map
-
-/***/ }),
-/* 214 */
-/***/ (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__(213);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
 
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
 
-function switchMapTo(innerObservable, resultSelector) {
-    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(resultSelector) ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; });
+  common.finish(this)
+  this.emit('end', this.found)
 }
-//# sourceMappingURL=switchMapTo.js.map
 
-/***/ }),
-/* 215 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return switchScan; });
-/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(213);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
+  this._didRealpath = true
 
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
 
-function switchScan(accumulator, seed) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var state = seed;
-        Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function (value, index) { return accumulator(state, value, index); }, function (_, innerValue) { return ((state = innerValue), innerValue); })(source).subscribe(subscriber);
-        return function () {
-            state = null;
-        };
-    });
-}
-//# sourceMappingURL=switchScan.js.map
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
 
-/***/ }),
-/* 216 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return takeUntil; });
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21);
+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
 
-function takeUntil(notifier) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(notifier).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function () { return subscriber.complete(); }, _util_noop__WEBPACK_IMPORTED_MODULE_3__["noop"]));
-        !subscriber.closed && source.subscribe(subscriber);
-    });
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
 }
-//# sourceMappingURL=takeUntil.js.map
-
-/***/ }),
-/* 217 */
-/***/ (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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
 
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-function takeWhile(predicate, inclusive) {
-    if (inclusive === void 0) { inclusive = false; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var index = 0;
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            var result = predicate(value, index++);
-            (result || inclusive) && subscriber.next(value);
-            !result && subscriber.complete();
-        }));
-    });
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
 }
-//# sourceMappingURL=takeWhile.js.map
 
-/***/ }),
-/* 218 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; });
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26);
+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
 
-function tap(observerOrNext, error, complete) {
-    var tapObserver = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_0__["isFunction"])(observerOrNext) || error || complete
-        ?
-            { next: observerOrNext, error: error, complete: complete }
-        : observerOrNext;
-    return tapObserver
-        ? Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-            var _a;
-            (_a = tapObserver.subscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
-            var isUnsub = true;
-            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-                var _a;
-                (_a = tapObserver.next) === null || _a === void 0 ? void 0 : _a.call(tapObserver, value);
-                subscriber.next(value);
-            }, function () {
-                var _a;
-                isUnsub = false;
-                (_a = tapObserver.complete) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
-                subscriber.complete();
-            }, function (err) {
-                var _a;
-                isUnsub = false;
-                (_a = tapObserver.error) === null || _a === void 0 ? void 0 : _a.call(tapObserver, err);
-                subscriber.error(err);
-            }, function () {
-                var _a, _b;
-                if (isUnsub) {
-                    (_a = tapObserver.unsubscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
-                }
-                (_b = tapObserver.finalize) === null || _b === void 0 ? void 0 : _b.call(tapObserver);
-            }));
-        })
-        :
-            _util_identity__WEBPACK_IMPORTED_MODULE_3__["identity"];
-}
-//# sourceMappingURL=tap.js.map
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
 
-/***/ }),
-/* 219 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  //console.error('PROCESS %d', this._processing, pattern)
 
-"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 _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66);
+  // 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
 
-var defaultThrottleConfig = {
-    leading: true,
-    trailing: false,
-};
-function throttle(durationSelector, config) {
-    if (config === void 0) { config = defaultThrottleConfig; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__["operate"])(function (source, subscriber) {
-        var leading = config.leading, trailing = config.trailing;
-        var hasValue = false;
-        var sendValue = null;
-        var throttled = null;
-        var isComplete = false;
-        var endThrottling = function () {
-            throttled === null || throttled === void 0 ? void 0 : throttled.unsubscribe();
-            throttled = null;
-            if (trailing) {
-                send();
-                isComplete && subscriber.complete();
-            }
-        };
-        var cleanupThrottling = function () {
-            throttled = null;
-            isComplete && subscriber.complete();
-        };
-        var startThrottle = function (value) {
-            return (throttled = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__["innerFrom"])(durationSelector(value)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, endThrottling, cleanupThrottling)));
-        };
-        var send = function () {
-            if (hasValue) {
-                hasValue = false;
-                var value = sendValue;
-                sendValue = null;
-                subscriber.next(value);
-                !isComplete && startThrottle(value);
-            }
-        };
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__["createOperatorSubscriber"])(subscriber, function (value) {
-            hasValue = true;
-            sendValue = value;
-            !(throttled && !throttled.closed) && (leading ? send() : startThrottle(value));
-        }, function () {
-            isComplete = true;
-            !(trailing && hasValue && throttled && !throttled.closed) && subscriber.complete();
-        }));
-    });
-}
-//# sourceMappingURL=throttle.js.map
+    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
+  }
 
-/***/ }),
-/* 220 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  var remain = pattern.slice(n)
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return throttleTime; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(219);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(114);
+  // 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()
 
-function throttleTime(duration, scheduler, config) {
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    if (config === void 0) { config = _throttle__WEBPACK_IMPORTED_MODULE_1__["defaultThrottleConfig"]; }
-    var duration$ = Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler);
-    return Object(_throttle__WEBPACK_IMPORTED_MODULE_1__["throttle"])(function () { return duration$; }, config);
+  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)
 }
-//# sourceMappingURL=throttleTime.js.map
 
-/***/ }),
-/* 221 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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)
+  })
+}
 
-"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__(50);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+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) === '.'
 
-function timeInterval(scheduler) {
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["asyncScheduler"]; }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var last = scheduler.now();
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            var now = scheduler.now();
-            var interval = now - last;
-            last = now;
-            subscriber.next(new TimeInterval(value, interval));
-        }));
-    });
-}
-var TimeInterval = (function () {
-    function TimeInterval(value, interval) {
-        this.value = value;
-        this.interval = interval;
+  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)
     }
-    return TimeInterval;
-}());
+  }
 
-//# sourceMappingURL=timeInterval.js.map
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
 
-/***/ }),
-/* 222 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(92);
-/* harmony import */ var _timeout__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91);
+  // 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
+      }
 
-function timeoutWith(due, withObservable, scheduler) {
-    var first;
-    var each;
-    var _with;
-    scheduler = scheduler !== null && scheduler !== void 0 ? scheduler : _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    if (Object(_util_isDate__WEBPACK_IMPORTED_MODULE_1__["isValidDate"])(due)) {
-        first = due;
-    }
-    else if (typeof due === 'number') {
-        each = due;
-    }
-    if (withObservable) {
-        _with = function () { return withObservable; };
-    }
-    else {
-        throw new TypeError('No observable provided to switch to');
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
     }
-    if (first == null && each == null) {
-        throw new TypeError('No timeout provided.');
+    // 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
     }
-    return Object(_timeout__WEBPACK_IMPORTED_MODULE_2__["timeout"])({
-        first: first,
-        each: each,
-        scheduler: scheduler,
-        with: _with,
-    });
+    this._process([e].concat(remain), index, inGlobStar, cb)
+  }
+  cb()
 }
-//# sourceMappingURL=timeoutWith.js.map
 
-/***/ }),
-/* 223 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return timestamp; });
-/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(38);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(96);
+  if (isIgnored(this, e))
+    return
 
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
+  }
 
-function timestamp(timestampProvider) {
-    if (timestampProvider === void 0) { timestampProvider = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__["dateTimestampProvider"]; }
-    return Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (value) { return ({ value: value, timestamp: timestampProvider.now() }); });
-}
-//# sourceMappingURL=timestamp.js.map
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
 
-/***/ }),
-/* 224 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (this.mark)
+    e = this._mark(e)
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return window; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21);
+  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
 
-function window(windowBoundaries) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var windowSubject = new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
-        subscriber.next(windowSubject.asObservable());
-        var errorHandler = function (err) {
-            windowSubject.error(err);
-            subscriber.error(err);
-        };
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) { return windowSubject === null || windowSubject === void 0 ? void 0 : windowSubject.next(value); }, function () {
-            windowSubject.complete();
-            subscriber.complete();
-        }, errorHandler));
-        windowBoundaries.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function () {
-            windowSubject.complete();
-            subscriber.next((windowSubject = new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]()));
-        }, _util_noop__WEBPACK_IMPORTED_MODULE_3__["noop"], errorHandler));
-        return function () {
-            windowSubject === null || windowSubject === void 0 ? void 0 : windowSubject.unsubscribe();
-            windowSubject = null;
-        };
-    });
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
+
+  this.emit('match', e)
 }
-//# sourceMappingURL=window.js.map
 
-/***/ }),
-/* 225 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
 
-"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__(12);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
+  // 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()
 
-function windowCount(windowSize, startWindowEvery) {
-    if (startWindowEvery === void 0) { startWindowEvery = 0; }
-    var startEvery = startWindowEvery > 0 ? startWindowEvery : windowSize;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        var windows = [new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]()];
-        var starts = [];
-        var count = 0;
-        subscriber.next(windows[0].asObservable());
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__["createOperatorSubscriber"])(subscriber, function (value) {
-            var e_1, _a;
-            try {
-                for (var windows_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(windows), windows_1_1 = windows_1.next(); !windows_1_1.done; windows_1_1 = windows_1.next()) {
-                    var window_1 = windows_1_1.value;
-                    window_1.next(value);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (windows_1_1 && !windows_1_1.done && (_a = windows_1.return)) _a.call(windows_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            var c = count - windowSize + 1;
-            if (c >= 0 && c % startEvery === 0) {
-                windows.shift().complete();
-            }
-            if (++count % startEvery === 0) {
-                var window_2 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-                windows.push(window_2);
-                subscriber.next(window_2.asObservable());
-            }
-        }, function () {
-            while (windows.length > 0) {
-                windows.shift().complete();
-            }
-            subscriber.complete();
-        }, function (err) {
-            while (windows.length > 0) {
-                windows.shift().error(err);
-            }
-            subscriber.error(err);
-        }, function () {
-            starts = null;
-            windows = null;
-        }));
-    });
-}
-//# sourceMappingURL=windowCount.js.map
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
 
-/***/ }),
-/* 226 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // 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)
+  }
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return windowTime; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(50);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(17);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(61);
-/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(76);
+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
 
-function windowTime(windowTimeSpan) {
-    var _a, _b;
-    var otherArgs = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        otherArgs[_i - 1] = arguments[_i];
+  // 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
     }
-    var scheduler = (_a = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__["popScheduler"])(otherArgs)) !== null && _a !== void 0 ? _a : _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["asyncScheduler"];
-    var windowCreationInterval = (_b = otherArgs[0]) !== null && _b !== void 0 ? _b : null;
-    var maxWindowSize = otherArgs[1] || Infinity;
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__["operate"])(function (source, subscriber) {
-        var windowRecords = [];
-        var restartOnClose = false;
-        var closeWindow = function (record) {
-            var window = record.window, subs = record.subs;
-            window.complete();
-            subs.unsubscribe();
-            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_5__["arrRemove"])(windowRecords, record);
-            restartOnClose && startWindow();
-        };
-        var startWindow = function () {
-            if (windowRecords) {
-                var subs = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-                subscriber.add(subs);
-                var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
-                var record_1 = {
-                    window: window_1,
-                    subs: subs,
-                    seen: 0,
-                };
-                windowRecords.push(record_1);
-                subscriber.next(window_1.asObservable());
-                Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__["executeSchedule"])(subs, scheduler, function () { return closeWindow(record_1); }, windowTimeSpan);
-            }
-        };
-        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
-            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__["executeSchedule"])(subscriber, scheduler, startWindow, windowCreationInterval, true);
-        }
-        else {
-            restartOnClose = true;
-        }
-        startWindow();
-        var loop = function (cb) { return windowRecords.slice().forEach(cb); };
-        var terminate = function (cb) {
-            loop(function (_a) {
-                var window = _a.window;
-                return cb(window);
-            });
-            cb(subscriber);
-            subscriber.unsubscribe();
-        };
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__["createOperatorSubscriber"])(subscriber, function (value) {
-            loop(function (record) {
-                record.window.next(value);
-                maxWindowSize <= ++record.seen && closeWindow(record);
-            });
-        }, function () { return terminate(function (consumer) { return consumer.complete(); }); }, function (err) { return terminate(function (consumer) { return consumer.error(err); }); }));
-        return function () {
-            windowRecords = null;
-        };
-    });
+  }
+
+  this.cache[abs] = entries
+  return cb(null, entries)
 }
-//# sourceMappingURL=windowTime.js.map
 
-/***/ }),
-/* 227 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
 
-"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__(12);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(66);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(21);
-/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(17);
+  // 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()
 
-function windowToggle(openings, closingSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__["operate"])(function (source, subscriber) {
-        var windows = [];
-        var handleError = function (err) {
-            while (0 < windows.length) {
-                windows.shift().error(err);
-            }
-            subscriber.error(err);
-        };
-        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__["innerFrom"])(openings).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__["createOperatorSubscriber"])(subscriber, function (openValue) {
-            var window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-            windows.push(window);
-            var closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-            var closeWindow = function () {
-                Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_7__["arrRemove"])(windows, window);
-                window.complete();
-                closingSubscription.unsubscribe();
-            };
-            var closingNotifier;
-            try {
-                closingNotifier = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__["innerFrom"])(closingSelector(openValue));
-            }
-            catch (err) {
-                handleError(err);
-                return;
-            }
-            subscriber.next(window.asObservable());
-            closingSubscription.add(closingNotifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__["createOperatorSubscriber"])(subscriber, closeWindow, _util_noop__WEBPACK_IMPORTED_MODULE_6__["noop"], handleError)));
-        }, _util_noop__WEBPACK_IMPORTED_MODULE_6__["noop"]));
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__["createOperatorSubscriber"])(subscriber, function (value) {
-            var e_1, _a;
-            var windowsCopy = windows.slice();
-            try {
-                for (var windowsCopy_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(windowsCopy), windowsCopy_1_1 = windowsCopy_1.next(); !windowsCopy_1_1.done; windowsCopy_1_1 = windowsCopy_1.next()) {
-                    var window_1 = windowsCopy_1_1.value;
-                    window_1.next(value);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (windowsCopy_1_1 && !windowsCopy_1_1.done && (_a = windowsCopy_1.return)) _a.call(windowsCopy_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        }, function () {
-            while (0 < windows.length) {
-                windows.shift().complete();
-            }
-            subscriber.complete();
-        }, handleError, function () {
-            while (0 < windows.length) {
-                windows.shift().unsubscribe();
-            }
-        }));
-    });
+  // 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()
 }
-//# sourceMappingURL=windowToggle.js.map
 
-/***/ }),
-/* 228 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return windowWhen; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
+  //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 += '/'
+    }
+  }
 
-function windowWhen(closingSelector) {
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var window;
-        var closingSubscriber;
-        var handleError = function (err) {
-            window.error(err);
-            subscriber.error(err);
-        };
-        var openWindow = function () {
-            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
-            window === null || window === void 0 ? void 0 : window.complete();
-            window = new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
-            subscriber.next(window.asObservable());
-            var closingNotifier;
-            try {
-                closingNotifier = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(closingSelector());
-            }
-            catch (err) {
-                handleError(err);
-                return;
-            }
-            closingNotifier.subscribe((closingSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, openWindow, openWindow, handleError)));
-        };
-        openWindow();
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) { return window.next(value); }, function () {
-            window.complete();
-            subscriber.complete();
-        }, handleError, function () {
-            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
-            window = null;
-        }));
-    });
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
 }
-//# sourceMappingURL=windowWhen.js.map
 
-/***/ }),
-/* 229 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-"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__(12);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
-/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(21);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(61);
+  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)
+    }
+  }
 
-function withLatestFrom() {
-    var inputs = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        inputs[_i] = arguments[_i];
+  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)
     }
-    var project = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__["popResultSelector"])(inputs);
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__["operate"])(function (source, subscriber) {
-        var len = inputs.length;
-        var otherValues = new Array(len);
-        var hasValue = inputs.map(function () { return false; });
-        var ready = false;
-        var _loop_1 = function (i) {
-            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__["innerFrom"])(inputs[i]).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-                otherValues[i] = value;
-                if (!ready && !hasValue[i]) {
-                    hasValue[i] = true;
-                    (ready = hasValue.every(_util_identity__WEBPACK_IMPORTED_MODULE_4__["identity"])) && (hasValue = null);
-                }
-            }, _util_noop__WEBPACK_IMPORTED_MODULE_5__["noop"]));
-        };
-        for (var i = 0; i < len; i++) {
-            _loop_1(i);
-        }
-        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__["createOperatorSubscriber"])(subscriber, function (value) {
-            if (ready) {
-                var values = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([value], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(otherValues));
-                subscriber.next(project ? project.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(values))) : values);
-            }
-        }));
-    });
+  }
 }
-//# sourceMappingURL=withLatestFrom.js.map
 
-/***/ }),
-/* 230 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
 
-"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__(127);
-/* harmony import */ var _joinAllInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(139);
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
 
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
 
-function zipAll(project) {
-    return Object(_joinAllInternals__WEBPACK_IMPORTED_MODULE_1__["joinAllInternals"])(_observable_zip__WEBPACK_IMPORTED_MODULE_0__["zip"], project);
+  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)
 }
-//# sourceMappingURL=zipAll.js.map
+
 
 /***/ }),
-/* 231 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 76 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return zipWith; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _zip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232);
 
 
-function zipWith() {
-    var otherInputs = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        otherInputs[_i] = arguments[_i];
-    }
-    return _zip__WEBPACK_IMPORTED_MODULE_1__["zip"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(otherInputs)));
+function posix(path) {
+	return path.charAt(0) === '/';
 }
-//# sourceMappingURL=zipWith.js.map
 
-/***/ }),
-/* 232 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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) !== ':');
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(127);
-/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
+}
 
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
 
-function zip() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__["operate"])(function (source, subscriber) {
-        _observable_zip__WEBPACK_IMPORTED_MODULE_1__["zip"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(sources))).subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=zip.js.map
+/***/ }),
+/* 77 */,
+/* 78 */,
+/* 79 */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__("tty");
 
 /***/ }),
-/* 233 */
+/* 80 */,
+/* 81 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var _interopRequireDefault = __webpack_require__(7);
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ToolingLogTextWriter = void 0;
 
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(8));
+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) };
+};
 
-var _util = __webpack_require__(234);
+var _util;
 
-var _chalk = _interopRequireDefault(__webpack_require__(235));
+function _load_util() {
+  return _util = _interopRequireDefault(__webpack_require__(2));
+}
 
-var _log_levels = __webpack_require__(248);
+var _invariant;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-const {
-  magentaBright,
-  yellow,
-  red,
-  blue,
-  green,
-  dim
-} = _chalk.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')} `
-};
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(7));
+}
 
-const has = (obj, key) => obj.hasOwnProperty(key);
+var _stripBom;
 
-function shouldWriteType(level, type) {
-  if (type === 'write') {
-    return level.name !== 'silent';
-  }
+function _load_stripBom() {
+  return _stripBom = _interopRequireDefault(__webpack_require__(122));
+}
 
-  return Boolean(level.flags[type === 'success' ? 'info' : type]);
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(6);
 }
 
-function stringifyError(error) {
-  if (typeof error !== 'string' && !(error instanceof Error)) {
-    error = new Error(`"${error}" thrown`);
-  }
+var _errors;
 
-  if (typeof error === 'string') {
-    return error;
-  }
+function _load_errors() {
+  return _errors = __webpack_require__(4);
+}
 
-  return error.stack || error.message || error;
+var _map;
+
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
 }
 
-class ToolingLogTextWriter {
-  constructor(config) {
-    (0, _defineProperty2.default)(this, "level", void 0);
-    (0, _defineProperty2.default)(this, "writeTo", void 0);
-    (0, _defineProperty2.default)(this, "ignoreSources", void 0);
-    this.level = (0, _log_levels.parseLogLevel)(config.level);
-    this.writeTo = config.writeTo;
-    this.ignoreSources = config.ignoreSources;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-    if (!this.writeTo || typeof this.writeTo.write !== 'function') {
-      throw new Error('ToolingLogTextWriter requires the `writeTo` option be set to a stream (like process.stdout)');
-    }
+/* eslint quotes: 0 */
+
+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'
+};
+
+const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
+
+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 };
   }
 
-  write(msg) {
-    if (!shouldWriteType(this.level, msg.type)) {
-      return false;
-    }
+  while (input.length) {
+    let chop = 0;
 
-    if (this.ignoreSources && msg.source && this.ignoreSources.includes(msg.source)) {
-      if (msg.type === 'write') {
-        const txt = (0, _util.format)(msg.args[0], ...msg.args.slice(1)); // Ensure that Elasticsearch deprecation log messages from Kibana aren't ignored
+    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++;
 
-        if (!/elasticsearch\.deprecation/.test(txt)) {
-          return false;
+      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 (indent.length % 2) {
+          throw new TypeError('Invalid number of spaces');
+        } else {
+          chop = indent.length;
+          yield buildToken(TOKEN_TYPES.indent, indent.length / 2);
         }
       } else {
-        return false;
+        chop++;
       }
-    }
+    } else if (input[0] === '"') {
+      let val = '';
 
-    const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
-    ToolingLogTextWriter.write(this.writeTo, prefix, msg);
-    return true;
-  }
+      for (let i = 0;; i++) {
+        const currentChar = input[i];
+        val += currentChar;
 
-  static write(writeTo, prefix, msg) {
-    const txt = msg.type === 'error' ? stringifyError(msg.args[0]) : (0, _util.format)(msg.args[0], ...msg.args.slice(1));
-    (prefix + txt).split('\n').forEach((line, i) => {
-      let lineIndent = '';
+        if (i > 0 && currentChar === '"') {
+          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
+          if (!isEscaped) {
+            break;
+          }
+        }
+      }
 
-      if (msg.indent > 0) {
-        // if we are indenting write some spaces followed by a symbol
-        lineIndent += ' '.repeat(msg.indent - 1);
-        lineIndent += line.startsWith('-') ? '└' : '│';
+      chop = val.length;
+
+      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;
 
-      if (line && prefix && i > 0) {
-        // apply additional indentation to lines after
-        // the first if this message gets a prefix
-        lineIndent += PREFIX_INDENT;
+      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;
 
-      writeTo.write(`${lineIndent}${line}\n`);
-    });
+      yield buildToken(TOKEN_TYPES.string, name);
+    } else {
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
+
+    if (!chop) {
+      // will trigger infinite recursion
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
+
+    col += chop;
+    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
+    input = input.slice(chop);
   }
 
+  yield buildToken(TOKEN_TYPES.eof);
 }
 
-exports.ToolingLogTextWriter = ToolingLogTextWriter;
-
-/***/ }),
-/* 234 */
-/***/ (function(module, exports) {
+class Parser {
+  constructor(input, fileLoc = 'lockfile') {
+    this.comments = [];
+    this.tokens = tokenise(input);
+    this.fileLoc = fileLoc;
+  }
 
-module.exports = require("util");
+  onComment(token) {
+    const value = token.value;
+    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
 
-/***/ }),
-/* 235 */
-/***/ (function(module, exports, __webpack_require__) {
+    const comment = value.trim();
 
-"use strict";
+    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.`);
+      }
+    }
 
-const ansiStyles = __webpack_require__(236);
-const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(242);
-const {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-} = __webpack_require__(246);
+    this.comments.push(comment);
+  }
 
-const {isArray} = Array;
+  next() {
+    const item = this.tokens.next();
+    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = [
-	'ansi',
-	'ansi',
-	'ansi256',
-	'ansi16m'
-];
+    const done = item.done,
+          value = item.value;
 
-const styles = Object.create(null);
+    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;
+    }
+  }
 
-const applyOptions = (object, options = {}) => {
-	if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
-		throw new Error('The `level` option should be an integer from 0 to 3');
-	}
+  unexpected(msg = 'Unexpected token') {
+    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
+  }
 
-	// Detect level if not set manually
-	const colorLevel = stdoutColor ? stdoutColor.level : 0;
-	object.level = options.level === undefined ? colorLevel : options.level;
-};
+  expect(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+    } else {
+      this.unexpected();
+    }
+  }
 
-class ChalkClass {
-	constructor(options) {
-		// eslint-disable-next-line no-constructor-return
-		return chalkFactory(options);
-	}
-}
+  eat(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+      return true;
+    } else {
+      return false;
+    }
+  }
 
-const chalkFactory = options => {
-	const chalk = {};
-	applyOptions(chalk, options);
+  parse(indent = 0) {
+    const obj = (0, (_map || _load_map()).default)();
 
-	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
+    while (true) {
+      const propToken = this.token;
 
-	Object.setPrototypeOf(chalk, Chalk.prototype);
-	Object.setPrototypeOf(chalk.template, chalk);
+      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;
+        }
 
-	chalk.template.constructor = () => {
-		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
-	};
+        if (nextToken.type !== TOKEN_TYPES.indent) {
+          // if we have no indentation after a newline then we've gone down a level
+          break;
+        }
 
-	chalk.template.Instance = ChalkClass;
+        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');
 
-	return chalk.template;
-};
+        const keys = [key];
+        this.next();
 
-function Chalk(options) {
-	return chalkFactory(options);
-}
+        // support multiple keys
+        while (this.token.type === TOKEN_TYPES.comma) {
+          this.next(); // skip comma
 
-for (const [styleName, style] of Object.entries(ansiStyles)) {
-	styles[styleName] = {
-		get() {
-			const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty);
-			Object.defineProperty(this, styleName, {value: builder});
-			return builder;
-		}
-	};
-}
+          const keyToken = this.token;
+          if (keyToken.type !== TOKEN_TYPES.string) {
+            this.unexpected('Expected string');
+          }
 
-styles.visible = {
-	get() {
-		const builder = createBuilder(this, this._styler, true);
-		Object.defineProperty(this, 'visible', {value: builder});
-		return builder;
-	}
-};
+          const key = keyToken.value;
+          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+          keys.push(key);
+          this.next();
+        }
 
-const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
+        const valToken = this.token;
 
-for (const model of usedModels) {
-	styles[model] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler);
-				return createBuilder(this, styler, this._isEmpty);
-			};
-		}
-	};
-}
+        if (valToken.type === TOKEN_TYPES.colon) {
+          // object
+          this.next();
 
-for (const model of usedModels) {
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler);
-				return createBuilder(this, styler, this._isEmpty);
-			};
-		}
-	};
-}
+          // parse object
+          const val = this.parse(indent + 1);
 
-const proto = Object.defineProperties(() => {}, {
-	...styles,
-	level: {
-		enumerable: true,
-		get() {
-			return this._generator.level;
-		},
-		set(level) {
-			this._generator.level = level;
-		}
-	}
-});
+          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+            var _ref;
 
-const createStyler = (open, close, parent) => {
-	let openAll;
-	let closeAll;
-	if (parent === undefined) {
-		openAll = open;
-		closeAll = close;
-	} else {
-		openAll = parent.openAll + open;
-		closeAll = close + parent.closeAll;
-	}
+            if (_isArray) {
+              if (_i >= _iterator.length) break;
+              _ref = _iterator[_i++];
+            } else {
+              _i = _iterator.next();
+              if (_i.done) break;
+              _ref = _i.value;
+            }
 
-	return {
-		open,
-		close,
-		openAll,
-		closeAll,
-		parent
-	};
-};
+            const key = _ref;
 
-const createBuilder = (self, _styler, _isEmpty) => {
-	const builder = (...arguments_) => {
-		if (isArray(arguments_[0]) && isArray(arguments_[0].raw)) {
-			// Called as a template literal, for example: chalk.red`2 + 3 = {bold ${2+3}}`
-			return applyStyle(builder, chalkTag(builder, ...arguments_));
-		}
+            obj[key] = val;
+          }
 
-		// Single argument is hot path, implicit coercion is faster than anything
-		// eslint-disable-next-line no-implicit-coercion
-		return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
-	};
+          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;
 
-	// We alter the prototype because we must return a function, but there is
-	// no way to create a function with a different prototype
-	Object.setPrototypeOf(builder, proto);
+            if (_isArray2) {
+              if (_i2 >= _iterator2.length) break;
+              _ref2 = _iterator2[_i2++];
+            } else {
+              _i2 = _iterator2.next();
+              if (_i2.done) break;
+              _ref2 = _i2.value;
+            }
 
-	builder._generator = self;
-	builder._styler = _styler;
-	builder._isEmpty = _isEmpty;
+            const key = _ref2;
 
-	return builder;
-};
+            obj[key] = valToken.value;
+          }
 
-const applyStyle = (self, string) => {
-	if (self.level <= 0 || !string) {
-		return self._isEmpty ? '' : string;
-	}
+          this.next();
+        } else {
+          this.unexpected('Invalid value type');
+        }
+      } else {
+        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
+      }
+    }
 
-	let styler = self._styler;
+    return obj;
+  }
+}
 
-	if (styler === undefined) {
-		return string;
-	}
+const MERGE_CONFLICT_ANCESTOR = '|||||||';
+const MERGE_CONFLICT_END = '>>>>>>>';
+const MERGE_CONFLICT_SEP = '=======';
+const MERGE_CONFLICT_START = '<<<<<<<';
 
-	const {openAll, closeAll} = styler;
-	if (string.indexOf('\u001B') !== -1) {
-		while (styler !== undefined) {
-			// 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'.
-			string = stringReplaceAll(string, styler.close, styler.open);
-
-			styler = styler.parent;
-		}
-	}
+/**
+ * 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;
 
-	// We can move both next actions out of loop, because remaining actions in loop won't have
-	// any/visible effect on parts we add here. 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
-	const lfIndex = string.indexOf('\n');
-	if (lfIndex !== -1) {
-		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
-	}
+  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);
+        }
+      }
 
-	return openAll + string + closeAll;
-};
+      // 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);
+    }
+  }
 
-let template;
-const chalkTag = (chalk, ...strings) => {
-	const [firstString] = strings;
+  return [variants[0].join('\n'), variants[1].join('\n')];
+}
 
-	if (!isArray(firstString) || !isArray(firstString.raw)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return strings.join(' ');
-	}
+/**
+ * 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);
+}
 
-	const arguments_ = strings.slice(1);
-	const parts = [firstString.raw[0]];
+/**
+ * Parse the lockfile.
+ */
+function parse(str, fileLoc) {
+  const parser = new Parser(str, fileLoc);
+  parser.next();
+  return parser.parse();
+}
 
-	for (let i = 1; i < firstString.length; i++) {
-		parts.push(
-			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
-			String(firstString.raw[i])
-		);
-	}
+/**
+ * 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;
+    }
+  }
+}
 
-	if (template === undefined) {
-		template = __webpack_require__(247);
-	}
+/***/ }),
+/* 82 */,
+/* 83 */,
+/* 84 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return template(chalk, parts.join(''));
-};
+"use strict";
 
-Object.defineProperties(Chalk.prototype, styles);
 
-const chalk = Chalk(); // eslint-disable-line new-cap
-chalk.supportsColor = stdoutColor;
-chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap
-chalk.stderr.supportsColor = stderrColor;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-module.exports = chalk;
+var _map;
 
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-/***/ }),
-/* 236 */
-/***/ (function(module, exports, __webpack_require__) {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
+const debug = __webpack_require__(212)('yarn');
 
-const wrapAnsi16 = (fn, offset) => (...args) => {
-	const code = fn(...args);
-	return `\u001B[${code + offset}m`;
-};
+class BlockingQueue {
+  constructor(alias, maxConcurrency = Infinity) {
+    this.concurrencyQueue = [];
+    this.maxConcurrency = maxConcurrency;
+    this.runningCount = 0;
+    this.warnedStuck = false;
+    this.alias = alias;
+    this.first = true;
 
-const wrapAnsi256 = (fn, offset) => (...args) => {
-	const code = fn(...args);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+    this.running = (0, (_map || _load_map()).default)();
+    this.queue = (0, (_map || _load_map()).default)();
 
-const wrapAnsi16m = (fn, offset) => (...args) => {
-	const rgb = fn(...args);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
+    this.stuckTick = this.stuckTick.bind(this);
+  }
 
-const ansi2ansi = n => n;
-const rgb2rgb = (r, g, b) => [r, g, b];
+  stillActive() {
+    if (this.stuckTimer) {
+      clearTimeout(this.stuckTimer);
+    }
 
-const setLazyProperty = (object, property, get) => {
-	Object.defineProperty(object, property, {
-		get: () => {
-			const value = get();
+    this.stuckTimer = setTimeout(this.stuckTick, 5000);
 
-			Object.defineProperty(object, property, {
-				value,
-				enumerable: true,
-				configurable: true
-			});
+    // 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();
+  }
 
-			return value;
-		},
-		enumerable: true,
-		configurable: true
-	});
-};
+  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]}`);
+    }
+  }
 
-/** @type {typeof import('color-convert')} */
-let colorConvert;
-const makeDynamicStyles = (wrap, targetSpace, identity, isBackground) => {
-	if (colorConvert === undefined) {
-		colorConvert = __webpack_require__(238);
-	}
+  push(key, factory) {
+    if (this.first) {
+      this.first = false;
+    } else {
+      this.stillActive();
+    }
 
-	const offset = isBackground ? 10 : 0;
-	const styles = {};
+    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 });
 
-	for (const [sourceSpace, suite] of Object.entries(colorConvert)) {
-		const name = sourceSpace === 'ansi16' ? 'ansi' : sourceSpace;
-		if (sourceSpace === targetSpace) {
-			styles[name] = wrap(identity, offset);
-		} else if (typeof suite === 'object') {
-			styles[name] = wrap(suite[targetSpace], offset);
-		}
-	}
+      if (!this.running[key]) {
+        this.shift(key);
+      }
+    });
+  }
 
-	return styles;
-};
+  shift(key) {
+    if (this.running[key]) {
+      delete this.running[key];
+      this.runningCount--;
 
-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],
+      if (this.stuckTimer) {
+        clearTimeout(this.stuckTimer);
+        this.stuckTimer = null;
+      }
 
-			// Bright color
-			blackBright: [90, 39],
-			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],
+      if (this.warnedStuck) {
+        this.warnedStuck = false;
+        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
+      }
+    }
 
-			// 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]
-		}
-	};
+    const queue = this.queue[key];
+    if (!queue) {
+      return;
+    }
 
-	// Alias bright black as gray (and grey)
-	styles.color.gray = styles.color.blackBright;
-	styles.bgColor.bgGray = styles.bgColor.bgBlackBright;
-	styles.color.grey = styles.color.blackBright;
-	styles.bgColor.bgGrey = styles.bgColor.bgBlackBright;
+    var _queue$shift = queue.shift();
 
-	for (const [groupName, group] of Object.entries(styles)) {
-		for (const [styleName, style] of Object.entries(group)) {
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+    const resolve = _queue$shift.resolve,
+          reject = _queue$shift.reject,
+          factory = _queue$shift.factory;
 
-			group[styleName] = styles[styleName];
+    if (!queue.length) {
+      delete this.queue[key];
+    }
 
-			codes.set(style[0], style[1]);
-		}
+    const next = () => {
+      this.shift(key);
+      this.shiftConcurrencyQueue();
+    };
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
-	}
+    const run = () => {
+      this.running[key] = true;
+      this.runningCount++;
 
-	Object.defineProperty(styles, 'codes', {
-		value: codes,
-		enumerable: false
-	});
+      factory().then(function (val) {
+        resolve(val);
+        next();
+        return null;
+      }).catch(function (err) {
+        reject(err);
+        next();
+      });
+    };
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+    this.maybePushConcurrencyQueue(run);
+  }
 
-	setLazyProperty(styles.color, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, false));
-	setLazyProperty(styles.color, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, false));
-	setLazyProperty(styles.color, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, false));
-	setLazyProperty(styles.bgColor, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, true));
-	setLazyProperty(styles.bgColor, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, true));
-	setLazyProperty(styles.bgColor, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, true));
+  maybePushConcurrencyQueue(run) {
+    if (this.runningCount < this.maxConcurrency) {
+      run();
+    } else {
+      this.concurrencyQueue.push(run);
+    }
+  }
 
-	return styles;
+  shiftConcurrencyQueue() {
+    if (this.runningCount < this.maxConcurrency) {
+      const fn = this.concurrencyQueue.shift();
+      if (fn) {
+        fn();
+      }
+    }
+  }
 }
-
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
-
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(237)(module)))
+exports.default = BlockingQueue;
 
 /***/ }),
-/* 237 */
+/* 85 */
 /***/ (function(module, exports) {
 
-module.exports = function(module) {
-	if (!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if (!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
+module.exports = function (exec) {
+  try {
+    return !!exec();
+  } catch (e) {
+    return true;
+  }
 };
 
 
 /***/ }),
-/* 238 */
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */,
+/* 97 */,
+/* 98 */,
+/* 99 */,
+/* 100 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const conversions = __webpack_require__(239);
-const route = __webpack_require__(241);
-
-const convert = {};
-
-const models = Object.keys(conversions);
+// 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';
 
-function wrapRaw(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
+// fallback for IE11 Script Access Denied error
+var tryGet = function (it, key) {
+  try {
+    return it[key];
+  } catch (e) { /* empty */ }
+};
 
-		if (arg0.length > 1) {
-			args = arg0;
-		}
+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;
+};
 
-		return fn(args);
-	};
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+/***/ }),
+/* 101 */
+/***/ (function(module, exports) {
 
-	return wrappedFn;
-}
+// IE 8- don't enum bug keys
+module.exports = (
+  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+).split(',');
 
-function wrapRounded(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
 
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
+/***/ }),
+/* 102 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		if (arg0.length > 1) {
-			args = arg0;
-		}
+var document = __webpack_require__(11).document;
+module.exports = document && document.documentElement;
 
-		const result = fn(args);
 
-		// We're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (let len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
+/***/ }),
+/* 103 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		return result;
-	};
+"use strict";
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+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';
 
-	return wrappedFn;
-}
+var returnThis = function () { return this; };
 
-models.forEach(fromModel => {
-	convert[fromModel] = {};
-
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
-
-	const routes = route(fromModel);
-	const routeModels = Object.keys(routes);
+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;
+};
 
-	routeModels.forEach(toModel => {
-		const fn = routes[toModel];
 
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
+/***/ }),
+/* 104 */
+/***/ (function(module, exports) {
 
-module.exports = convert;
+module.exports = function (exec) {
+  try {
+    return { e: false, v: exec() };
+  } catch (e) {
+    return { e: true, v: e };
+  }
+};
 
 
 /***/ }),
-/* 239 */
+/* 105 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* MIT license */
-/* eslint-disable no-mixed-operators */
-const cssKeywords = __webpack_require__(240);
-
-// NOTE: conversions should only return primitive values (i.e. arrays, or
-//       values that give correct `typeof` results).
-//       do not use box values types (i.e. Number(), String(), etc.)
-
-const reverseKeywords = {};
-for (const key of Object.keys(cssKeywords)) {
-	reverseKeywords[cssKeywords[key]] = key;
-}
+var anObject = __webpack_require__(27);
+var isObject = __webpack_require__(34);
+var newPromiseCapability = __webpack_require__(70);
 
-const convert = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
+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;
 };
 
-module.exports = convert;
-
-// Hide .channels and .labels properties
-for (const model of Object.keys(convert)) {
-	if (!('channels' in convert[model])) {
-		throw new Error('missing channels property: ' + model);
-	}
-
-	if (!('labels' in convert[model])) {
-		throw new Error('missing channel labels property: ' + model);
-	}
 
-	if (convert[model].labels.length !== convert[model].channels) {
-		throw new Error('channel and label counts mismatch: ' + model);
-	}
+/***/ }),
+/* 106 */
+/***/ (function(module, exports) {
 
-	const {channels, labels} = convert[model];
-	delete convert[model].channels;
-	delete convert[model].labels;
-	Object.defineProperty(convert[model], 'channels', {value: channels});
-	Object.defineProperty(convert[model], 'labels', {value: labels});
-}
+module.exports = function (bitmap, value) {
+  return {
+    enumerable: !(bitmap & 1),
+    configurable: !(bitmap & 2),
+    writable: !(bitmap & 4),
+    value: value
+  };
+};
 
-convert.rgb.hsl = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const min = Math.min(r, g, b);
-	const max = Math.max(r, g, b);
-	const delta = max - min;
-	let h;
-	let s;
 
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
+/***/ }),
+/* 107 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	h = Math.min(h * 60, 360);
+var core = __webpack_require__(23);
+var global = __webpack_require__(11);
+var SHARED = '__core-js_shared__';
+var store = global[SHARED] || (global[SHARED] = {});
 
-	if (h < 0) {
-		h += 360;
-	}
+(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)'
+});
 
-	const l = (min + max) / 2;
 
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
+/***/ }),
+/* 108 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [h, s * 100, l * 100];
+// 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);
 };
 
-convert.rgb.hsv = function (rgb) {
-	let rdif;
-	let gdif;
-	let bdif;
-	let h;
-	let s;
-
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const v = Math.max(r, g, b);
-	const diff = v - Math.min(r, g, b);
-	const diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
-
-	if (diff === 0) {
-		h = 0;
-		s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
-
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
 
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
+/***/ }),
+/* 109 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
+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
 };
 
-convert.rgb.hwb = function (rgb) {
-	const r = rgb[0];
-	const g = rgb[1];
-	let b = rgb[2];
-	const h = convert.rgb.hsl(rgb)[0];
-	const w = 1 / 255 * Math.min(r, Math.min(g, b));
 
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+/***/ }),
+/* 110 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [h, w * 100, b * 100];
+// 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
 };
 
-convert.rgb.cmyk = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
 
-	const k = Math.min(1 - r, 1 - g, 1 - b);
-	const c = (1 - r - k) / (1 - k) || 0;
-	const m = (1 - g - k) / (1 - k) || 0;
-	const y = (1 - b - k) / (1 - k) || 0;
+/***/ }),
+/* 111 */
+/***/ (function(module, exports) {
 
-	return [c * 100, m * 100, y * 100, k * 100];
+var id = 0;
+var px = Math.random();
+module.exports = function (key) {
+  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
 };
 
-function comparativeDistance(x, y) {
-	/*
-		See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
-	*/
-	return (
-		((x[0] - y[0]) ** 2) +
-		((x[1] - y[1]) ** 2) +
-		((x[2] - y[2]) ** 2)
-	);
-}
 
-convert.rgb.keyword = function (rgb) {
-	const reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
+/***/ }),
+/* 112 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	let currentClosestDistance = Infinity;
-	let currentClosestKeyword;
 
-	for (const keyword of Object.keys(cssKeywords)) {
-		const value = cssKeywords[keyword];
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-		// Compute comparative distance
-		const distance = comparativeDistance(rgb, value);
+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);
 
-		// Check if its less, if so set as closest
-		if (distance < currentClosestDistance) {
-			currentClosestDistance = distance;
-			currentClosestKeyword = keyword;
-		}
-	}
+/**
+ * Active `debug` instances.
+ */
+exports.instances = [];
 
-	return currentClosestKeyword;
-};
+/**
+ * The currently active debug mode names, and names to skip.
+ */
 
-convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
-};
+exports.names = [];
+exports.skips = [];
 
-convert.rgb.xyz = function (rgb) {
-	let r = rgb[0] / 255;
-	let g = rgb[1] / 255;
-	let b = rgb[2] / 255;
+/**
+ * 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".
+ */
 
-	// Assume sRGB
-	r = r > 0.04045 ? (((r + 0.055) / 1.055) ** 2.4) : (r / 12.92);
-	g = g > 0.04045 ? (((g + 0.055) / 1.055) ** 2.4) : (g / 12.92);
-	b = b > 0.04045 ? (((b + 0.055) / 1.055) ** 2.4) : (b / 12.92);
+exports.formatters = {};
 
-	const x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	const y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	const z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
 
-	return [x * 100, y * 100, z * 100];
-};
+function selectColor(namespace) {
+  var hash = 0, i;
 
-convert.rgb.lab = function (rgb) {
-	const xyz = convert.rgb.xyz(rgb);
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
 
-	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
 
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
+function createDebug(namespace) {
 
-	return [l, a, b];
-};
+  var prevTime;
 
-convert.hsl.rgb = function (hsl) {
-	const h = hsl[0] / 360;
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
-	let t2;
-	let t3;
-	let val;
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
 
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
+    var self = debug;
 
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
 
-	const t1 = 2 * l - t2;
+    // 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];
+    }
 
-	const rgb = [0, 0, 0];
-	for (let i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
+    args[0] = exports.coerce(args[0]);
 
-		if (t3 > 1) {
-			t3--;
-		}
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
+    }
 
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-		} else {
-			val = t1;
-		}
+    // 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);
 
-		rgb[i] = val * 255;
-	}
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
 
-	return rgb;
-};
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
 
-convert.hsl.hsv = function (hsl) {
-	const h = hsl[0];
-	let s = hsl[1] / 100;
-	let l = hsl[2] / 100;
-	let smin = s;
-	const lmin = Math.max(l, 0.01);
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
 
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	const v = (l + s) / 2;
-	const sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+  debug.destroy = destroy;
 
-	return [h, sv * 100, v * 100];
-};
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }
 
-convert.hsv.rgb = function (hsv) {
-	const h = hsv[0] / 60;
-	const s = hsv[1] / 100;
-	let v = hsv[2] / 100;
-	const hi = Math.floor(h) % 6;
+  exports.instances.push(debug);
 
-	const f = h - Math.floor(h);
-	const p = 255 * v * (1 - s);
-	const q = 255 * v * (1 - (s * f));
-	const t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
+  return debug;
+}
 
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
-	}
-};
+function destroy () {
+  var index = exports.instances.indexOf(this);
+  if (index !== -1) {
+    exports.instances.splice(index, 1);
+    return true;
+  } else {
+    return false;
+  }
+}
 
-convert.hsv.hsl = function (hsv) {
-	const h = hsv[0];
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
-	const vmin = Math.max(v, 0.01);
-	let sl;
-	let l;
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
 
-	l = (2 - s) * v;
-	const lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
+function enable(namespaces) {
+  exports.save(namespaces);
 
-	return [h, sl * 100, l * 100];
-};
+  exports.names = [];
+  exports.skips = [];
 
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-convert.hwb.rgb = function (hwb) {
-	const h = hwb[0] / 360;
-	let wh = hwb[1] / 100;
-	let bl = hwb[2] / 100;
-	const ratio = wh + bl;
-	let f;
+  var i;
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
 
-	// Wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
+  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 + '$'));
+    }
+  }
 
-	const i = Math.floor(6 * h);
-	const v = 1 - bl;
-	f = 6 * h - i;
+  for (i = 0; i < exports.instances.length; i++) {
+    var instance = exports.instances[i];
+    instance.enabled = exports.enabled(instance.namespace);
+  }
+}
 
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
 
-	const n = wh + f * (v - wh); // Linear interpolation
+function disable() {
+  exports.enable('');
+}
 
-	let r;
-	let g;
-	let b;
-	/* eslint-disable max-statements-per-line,no-multi-spaces */
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v;  g = n;  b = wh; break;
-		case 1: r = n;  g = v;  b = wh; break;
-		case 2: r = wh; g = v;  b = n; break;
-		case 3: r = wh; g = n;  b = v; break;
-		case 4: r = n;  g = wh; b = v; break;
-		case 5: r = v;  g = wh; b = n; break;
-	}
-	/* eslint-enable max-statements-per-line,no-multi-spaces */
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
 
-	return [r * 255, g * 255, b * 255];
-};
+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;
+}
 
-convert.cmyk.rgb = function (cmyk) {
-	const c = cmyk[0] / 100;
-	const m = cmyk[1] / 100;
-	const y = cmyk[2] / 100;
-	const k = cmyk[3] / 100;
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
 
-	const r = 1 - Math.min(1, c * (1 - k) + k);
-	const g = 1 - Math.min(1, m * (1 - k) + k);
-	const b = 1 - Math.min(1, y * (1 - k) + k);
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
 
-	return [r * 255, g * 255, b * 255];
-};
 
-convert.xyz.rgb = function (xyz) {
-	const x = xyz[0] / 100;
-	const y = xyz[1] / 100;
-	const z = xyz[2] / 100;
-	let r;
-	let g;
-	let b;
+/***/ }),
+/* 113 */,
+/* 114 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
 
-	// Assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
-		: r * 12.92;
+var fs = __webpack_require__(3)
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
 
-	g = g > 0.0031308
-		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
-		: g * 12.92;
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__(217)
 
-	b = b > 0.0031308
-		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
-		: b * 12.92;
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
 
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
 
-	return [r * 255, g * 255, b * 255];
-};
+  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)
+    }
+  })
+}
 
-convert.xyz.lab = function (xyz) {
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
+  }
+}
 
-	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
 
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
 
-	return [l, a, b];
-};
 
-convert.lab.xyz = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let x;
-	let y;
-	let z;
+/***/ }),
+/* 115 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
+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
 
-	const y2 = y ** 3;
-	const x2 = x ** 3;
-	const z2 = z ** 3;
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
+}
 
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
+var path = __webpack_require__(0)
+var minimatch = __webpack_require__(60)
+var isAbsolute = __webpack_require__(76)
+var Minimatch = minimatch.Minimatch
 
-	return [x, y, z];
-};
+function alphasorti (a, b) {
+  return a.toLowerCase().localeCompare(b.toLowerCase())
+}
 
-convert.lab.lch = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let h;
+function alphasort (a, b) {
+  return a.localeCompare(b)
+}
 
-	const hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
 
-	if (h < 0) {
-		h += 360;
-	}
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
 
-	const c = Math.sqrt(a * a + b * b);
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
+  }
+}
 
-	return [l, c, h];
-};
+// 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 })
+  }
 
-convert.lch.lab = function (lch) {
-	const l = lch[0];
-	const c = lch[1];
-	const h = lch[2];
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
 
-	const hr = h / 360 * 2 * Math.PI;
-	const a = c * Math.cos(hr);
-	const b = c * Math.sin(hr);
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
 
-	return [l, a, b];
-};
+  // 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
+  }
 
-convert.rgb.ansi16 = function (args, saturation = null) {
-	const [r, g, b] = args;
-	let value = saturation === null ? convert.rgb.hsv(args)[2] : saturation; // Hsv -> ansi16 optimization
+  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
 
-	value = Math.round(value / 50);
+  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 (value === 0) {
-		return 30;
-	}
+  setupIgnores(self, options)
 
-	let ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
+  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
+  }
 
-	if (value === 2) {
-		ansi += 60;
-	}
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
 
-	return ansi;
-};
+  // 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
 
-convert.hsv.ansi16 = function (args) {
-	// Optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
-};
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
 
-convert.rgb.ansi256 = function (args) {
-	const r = args[0];
-	const g = args[1];
-	const b = args[2];
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
 
-	// We use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
-
-		if (r > 248) {
-			return 231;
-		}
+function finish (self) {
+  var nou = self.nounique
+  var all = nou ? [] : Object.create(null)
 
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
+  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
+        })
+    }
+  }
 
-	const ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
+  if (!nou)
+    all = Object.keys(all)
 
-	return ansi;
-};
+  if (!self.nosort)
+    all = all.sort(self.nocase ? alphasorti : alphasort)
 
-convert.ansi16.rgb = function (args) {
-	let color = args % 10;
+  // 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
+      })
+    }
+  }
 
-	// Handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
+  if (self.ignore.length)
+    all = all.filter(function(m) {
+      return !isIgnored(self, m)
+    })
 
-		color = color / 10.5 * 255;
+  self.found = all
+}
 
-		return [color, color, color];
-	}
+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) === '/'
 
-	const mult = (~~(args > 50) + 1) * 0.5;
-	const r = ((color & 1) * mult) * 255;
-	const g = (((color >> 1) & 1) * mult) * 255;
-	const b = (((color >> 2) & 1) * mult) * 255;
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
 
-	return [r, g, b];
-};
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
 
-convert.ansi256.rgb = function (args) {
-	// Handle greyscale
-	if (args >= 232) {
-		const c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
+  return m
+}
 
-	args -= 16;
+// 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)
+  }
 
-	let rem;
-	const r = Math.floor(args / 36) / 5 * 255;
-	const g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	const b = (rem % 6) / 5 * 255;
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
 
-	return [r, g, b];
-};
+  return abs
+}
 
-convert.rgb.hex = function (args) {
-	const integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
 
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+// 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
 
-convert.hex.rgb = function (args) {
-	const match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
-	let colorString = match[0];
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(char => {
-			return char + char;
-		}).join('');
-	}
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
-	const integer = parseInt(colorString, 16);
-	const r = (integer >> 16) & 0xFF;
-	const g = (integer >> 8) & 0xFF;
-	const b = integer & 0xFF;
 
-	return [r, g, b];
-};
+/***/ }),
+/* 116 */
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.rgb.hcg = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const max = Math.max(Math.max(r, g), b);
-	const min = Math.min(Math.min(r, g), b);
-	const chroma = (max - min);
-	let grayscale;
-	let hue;
+var path = __webpack_require__(0);
+var fs = __webpack_require__(3);
+var _0777 = parseInt('0777', 8);
 
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
+module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
 
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma;
-	}
+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;
 
-	hue /= 6;
-	hue %= 1;
+            // 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;
+        }
+    });
+}
 
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
+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;
 
-convert.hsl.hcg = function (hsl) {
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
+    p = path.resolve(p);
 
-	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
+    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;
 
-	let f = 0;
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
+            // 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;
+        }
+    }
 
-	return [hsl[0], c * 100, f * 100];
+    return made;
 };
 
-convert.hsv.hcg = function (hsv) {
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
-
-	const c = s * v;
-	let f = 0;
-
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
 
-	return [hsv[0], c * 100, f * 100];
-};
+/***/ }),
+/* 117 */,
+/* 118 */,
+/* 119 */,
+/* 120 */,
+/* 121 */,
+/* 122 */
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.hcg.rgb = function (hcg) {
-	const h = hcg[0] / 360;
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+"use strict";
 
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
+module.exports = x => {
+	if (typeof x !== 'string') {
+		throw new TypeError('Expected a string, got ' + typeof x);
 	}
 
-	const pure = [0, 0, 0];
-	const hi = (h % 1) * 6;
-	const v = hi % 1;
-	const w = 1 - v;
-	let mg = 0;
-
-	/* eslint-disable max-statements-per-line */
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
+	// 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);
 	}
-	/* eslint-enable max-statements-per-line */
-
-	mg = (1.0 - c) * g;
 
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
+	return x;
 };
 
-convert.hcg.hsv = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
 
-	const v = c + g * (1.0 - c);
-	let f = 0;
+/***/ }),
+/* 123 */
+/***/ (function(module, exports) {
 
-	if (v > 0.0) {
-		f = c / v;
-	}
+// 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)
 
-	return [hcg[0], f * 100, v * 100];
-};
+  if (typeof fn !== 'function')
+    throw new TypeError('need wrapper function')
 
-convert.hcg.hsl = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
 
-	const l = g * (1.0 - c) + 0.5 * c;
-	let s = 0;
+  return wrapper
 
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
+  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
+  }
+}
 
-	return [hcg[0], s * 100, l * 100];
-};
 
-convert.hcg.hwb = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
-	const v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+/***/ }),
+/* 124 */,
+/* 125 */,
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 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);
 };
 
-convert.hwb.hcg = function (hwb) {
-	const w = hwb[1] / 100;
-	const b = hwb[2] / 100;
-	const v = 1 - b;
-	const c = v - w;
-	let g = 0;
 
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
+/***/ }),
+/* 132 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [hwb[0], c * 100, g * 100];
-};
+// 19.1.2.14 / 15.2.3.14 Object.keys(O)
+var $keys = __webpack_require__(195);
+var enumBugKeys = __webpack_require__(101);
 
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+module.exports = Object.keys || function keys(O) {
+  return $keys(O, enumBugKeys);
 };
 
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
 
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
+/***/ }),
+/* 133 */
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.gray.hsl = function (args) {
-	return [0, 0, args[0]];
+// 7.1.13 ToObject(argument)
+var defined = __webpack_require__(67);
+module.exports = function (it) {
+  return Object(defined(it));
 };
 
-convert.gray.hsv = convert.gray.hsl;
 
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
+/***/ }),
+/* 134 */,
+/* 135 */,
+/* 136 */,
+/* 137 */,
+/* 138 */,
+/* 139 */,
+/* 140 */,
+/* 141 */,
+/* 142 */,
+/* 143 */,
+/* 144 */,
+/* 145 */
+/***/ (function(module, exports) {
 
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
+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"}}}
 
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
+/***/ }),
+/* 146 */,
+/* 147 */,
+/* 148 */,
+/* 149 */,
+/* 150 */
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.gray.hex = function (gray) {
-	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	const integer = (val << 16) + (val << 8) + val;
+"use strict";
 
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.rgb.gray = function (rgb) {
-	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
-};
-
-
-/***/ }),
-/* 240 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = stringify;
 
-/***/ }),
-/* 241 */
-/***/ (function(module, exports, __webpack_require__) {
+var _misc;
 
-const conversions = __webpack_require__(239);
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-/*
-	This function routes a model to all other models.
+var _constants;
 
-	all functions that are routed have a property `.conversion` attached
-	to the returned synthetic function. This property is an array
-	of strings, each with the steps in between the 'from' and 'to'
-	color models (inclusive).
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-	conversions that are not possible simply are not included.
-*/
+var _package;
 
-function buildGraph() {
-	const graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	const models = Object.keys(conversions);
+function _load_package() {
+  return _package = __webpack_require__(145);
+}
 
-	for (let len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
+const NODE_VERSION = process.version;
 
-	return graph;
+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);
 }
 
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	const graph = buildGraph();
-	const queue = [fromModel]; // Unshift -> queue -> pop
+function maybeWrap(str) {
+  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
+    return JSON.stringify(str);
+  } else {
+    return str;
+  }
+}
 
-	graph[fromModel].distance = 0;
+const priorities = {
+  name: 1,
+  version: 2,
+  uid: 3,
+  resolved: 4,
+  integrity: 5,
+  registry: 6,
+  dependencies: 7
+};
 
-	while (queue.length) {
-		const current = queue.pop();
-		const adjacents = Object.keys(conversions[current]);
+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);
+  }
+}
 
-		for (let len = adjacents.length, i = 0; i < len; i++) {
-			const adjacent = adjacents[i];
-			const node = graph[adjacent];
+function _stringify(obj, options) {
+  if (typeof obj !== 'object') {
+    throw new TypeError();
+  }
 
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
+  const indent = options.indent;
+  const lines = [];
 
-	return graph;
-}
+  // 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);
 
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
+  let addedKeys = [];
 
-function wrapConversion(toModel, graph) {
-	const path = [graph[toModel].parent, toModel];
-	let fn = conversions[graph[toModel].parent][toModel];
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const val = obj[key];
+    if (val == null || addedKeys.indexOf(key) >= 0) {
+      continue;
+    }
 
-	let cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
+    const valKeys = [key];
 
-	fn.conversion = path;
-	return fn;
-}
+    // 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);
+        }
+      }
+    }
 
-module.exports = function (fromModel) {
-	const graph = deriveBFS(fromModel);
-	const conversion = {};
+    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
 
-	const models = Object.keys(graph);
-	for (let len = models.length, i = 0; i < len; i++) {
-		const toModel = models[i];
-		const node = graph[toModel];
+    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();
+    }
 
-		if (node.parent === null) {
-			// No possible conversion, or this node is the source model.
-			continue;
-		}
+    addedKeys = addedKeys.concat(valKeys);
+  }
 
-		conversion[toModel] = wrapConversion(toModel, graph);
-	}
+  return indent + lines.join(`\n${indent}`);
+}
 
-	return conversion;
-};
+function stringify(obj, noHeader, enableVersions) {
+  const val = _stringify(obj, {
+    indent: '',
+    topLevel: true
+  });
+  if (noHeader) {
+    return val;
+  }
 
+  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);
 
+  return lines.join('\n');
+}
 
 /***/ }),
-/* 242 */
+/* 151 */,
+/* 152 */,
+/* 153 */,
+/* 154 */,
+/* 155 */,
+/* 156 */,
+/* 157 */,
+/* 158 */,
+/* 159 */,
+/* 160 */,
+/* 161 */,
+/* 162 */,
+/* 163 */,
+/* 164 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const os = __webpack_require__(243);
-const tty = __webpack_require__(244);
-const hasFlag = __webpack_require__(245);
 
-const {env} = process;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
 
-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;
-}
+var _asyncToGenerator2;
 
-if ('FORCE_COLOR' in env) {
-	if (env.FORCE_COLOR === 'true') {
-		forceColor = 1;
-	} else if (env.FORCE_COLOR === 'false') {
-		forceColor = 0;
-	} else {
-		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
-	}
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
 }
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+// 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;
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-}
+    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);
+    }
 
-function supportsColor(haveStream, streamIsTTY) {
-	if (forceColor === 0) {
-		return 0;
-	}
+    if (disableTimestampCorrection) {
+      return;
+    }
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+    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;
+        }
+      }
+    }
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+    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);
+      }
+    }
+  });
 
-	if (haveStream && !streamIsTTY && forceColor === undefined) {
-		return 0;
-	}
+  return function fixTimes(_x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
 
-	const min = forceColor || 0;
+// Compare file timestamps.
+// Some versions of Node on windows zero the milliseconds when utime is used.
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
 
-	if (process.platform === 'win32') {
-		// 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(osRelease[0]) >= 10 &&
-			Number(osRelease[2]) >= 10586
-		) {
-			return Number(osRelease[2]) >= 14931 ? 3 : 2;
-		}
+var _fs;
 
-		return 1;
-	}
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
+}
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+var _promise;
 
-		return min;
-	}
+function _load_promise() {
+  return _promise = __webpack_require__(40);
+}
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-	if ('GITHUB_ACTIONS' in env) {
-		return 1;
-	}
+// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+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);
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
+const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
 
-	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+/**
+ * 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();
+      }
+    }
+  });
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
+  return function copyFile(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
 
-	return min;
-}
+// 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);
+  }
+};
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream, stream && stream.isTTY);
-	return translateLevel(level);
-}
+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);
+    }
+  });
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: translateLevel(supportsColor(true, tty.isatty(1))),
-	stderr: translateLevel(supportsColor(true, tty.isatty(2)))
-};
+  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();
 
+  if (process.platform !== 'win32') {
+    return aTime === bTime;
+  }
 
-/***/ }),
-/* 243 */
-/***/ (function(module, exports) {
+  // 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;
+  }
 
-module.exports = require("os");
+  const aTimeSec = Math.floor(aTime / 1000);
+  const bTimeSec = Math.floor(bTime / 1000);
 
-/***/ }),
-/* 244 */
-/***/ (function(module, exports) {
+  // 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;
+  }
 
-module.exports = require("tty");
+  return aTime === bTime;
+};
 
 /***/ }),
-/* 245 */
+/* 165 */,
+/* 166 */,
+/* 167 */,
+/* 168 */,
+/* 169 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = (flag, argv = process.argv) => {
-	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-	const position = argv.indexOf(prefix + flag);
-	const terminatorPosition = argv.indexOf('--');
-	return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
-};
+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;
+}
+
+exports.default = isRootUser(getUid()) && !isFakeRoot();
+function isFakeRoot() {
+  return Boolean(process.env.FAKEROOTKEY);
+}
 
+function isRootUser(uid) {
+  return uid === 0;
+}
 
 /***/ }),
-/* 246 */
+/* 170 */,
+/* 171 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringReplaceAll = (string, substring, replacer) => {
-	let index = string.indexOf(substring);
-	if (index === -1) {
-		return string;
-	}
+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;
 
-	const substringLength = substring.length;
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
-		endIndex = index + substringLength;
-		index = string.indexOf(substring, endIndex);
-	} while (index !== -1);
+const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
+const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+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
 
-const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => {
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		const gotCR = string[index - 1] === '\r';
-		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
-		endIndex = index + 1;
-		index = string.indexOf('\n', endIndex);
-	} while (index !== -1);
+    // 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;
+  }
+}
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+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;
+  }
+}
 
-module.exports = {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-};
+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;
+  }
+}
 
+function getLocalAppDataDir() {
+  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
+}
 
 /***/ }),
-/* 247 */
+/* 172 */,
+/* 173 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|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}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi;
+module.exports = { "default": __webpack_require__(179), __esModule: true };
 
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
+/***/ }),
+/* 174 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function unescape(c) {
-	const u = c[0] === 'u';
-	const bracket = c[1] === '{';
+"use strict";
 
-	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
 
-	if (u && bracket) {
-		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
-	}
+  var r = range(a, b, str);
 
-	return ESCAPES.get(c) || c;
+  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 parseArguments(name, arguments_) {
-	const results = [];
-	const chunks = arguments_.trim().split(/\s*,\s*/g);
-	let matches;
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
+}
 
-	for (const chunk of chunks) {
-		const number = Number(chunk);
-		if (!Number.isNaN(number)) {
-			results.push(number);
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
+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;
 
-	return results;
-}
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+    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;
+        }
 
-	const results = [];
-	let matches;
+        bi = str.indexOf(b, i + 1);
+      }
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+      i = ai < bi && ai >= 0 ? ai : bi;
+    }
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+    if (begs.length) {
+      result = [ left, right ];
+    }
+  }
 
-	return results;
+  return result;
 }
 
-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);
-		}
-	}
+/***/ }),
+/* 175 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	let current = chalk;
-	for (const [styleName, styles] of Object.entries(enabled)) {
-		if (!Array.isArray(styles)) {
-			continue;
-		}
+var concatMap = __webpack_require__(178);
+var balanced = __webpack_require__(174);
 
-		if (!(styleName in current)) {
-			throw new Error(`Unknown Chalk style: ${styleName}`);
-		}
+module.exports = expandTop;
 
-		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
-	}
+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';
 
-	return current;
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
 }
 
-module.exports = (chalk, temporary) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
 
-	// eslint-disable-next-line max-params
-	temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
-		if (escapeCharacter) {
-			chunk.push(unescape(escapeCharacter));
-		} else if (style) {
-			const string = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
-			}
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(character);
-		}
-	});
 
-	chunks.push(chunk.join(''));
+// 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 (styles.length > 0) {
-		const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMessage);
-	}
+  var parts = [];
+  var m = balanced('{', '}', str);
 
-	return chunks.join('');
-};
+  if (!m)
+    return str.split(',');
 
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
 
-/***/ }),
-/* 248 */
-/***/ (function(module, exports, __webpack_require__) {
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
 
-"use strict";
+  parts.push.apply(parts, p);
 
+  return parts;
+}
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LOG_LEVEL_FLAGS = exports.DEFAULT_LOG_LEVEL = void 0;
-exports.getLogLevelFlagsHelp = getLogLevelFlagsHelp;
-exports.parseLogLevel = parseLogLevel;
-exports.pickLevelFromFlags = pickLevelFromFlags;
+function expandTop(str) {
+  if (!str)
+    return [];
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-const LEVELS = ['silent', 'error', 'warning', 'success', 'info', 'debug', 'verbose'];
-const DEFAULT_LOG_LEVEL = 'info';
-exports.DEFAULT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
+  // 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);
+  }
 
-function pickLevelFromFlags(flags, options = {}) {
-  if (flags.verbose) return 'verbose';
-  if (flags.debug) return 'debug';
-  if (flags.info) return 'info';
-  if (flags.quiet) return 'error';
-  if (flags.silent) return 'silent';
-  return options.default || DEFAULT_LOG_LEVEL;
+  return expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
-const LOG_LEVEL_FLAGS = [{
-  name: 'verbose',
-  help: '--verbose, -v      Log verbosely'
-}, {
-  name: 'info',
-  help: "--info             Don't log debug messages"
-}, {
-  name: 'debug',
-  help: '--debug            Log debug messages (less than verbose)'
-}, {
-  name: 'quiet',
-  help: '--quiet            Only log errors'
-}, {
-  name: 'silent',
-  help: "--silent           Don't log anything"
-}];
-exports.LOG_LEVEL_FLAGS = LOG_LEVEL_FLAGS;
-
-function getLogLevelFlagsHelp(defaultLogLevel = DEFAULT_LOG_LEVEL) {
-  return LOG_LEVEL_FLAGS.filter(({
-    name
-  }) => name !== defaultLogLevel).map(({
-    help
-  }) => help).join('\n');
+function identity(e) {
+  return e;
 }
 
-function parseLogLevel(name) {
-  const i = LEVELS.indexOf(name);
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
 
-  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
-  };
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
 }
 
-/***/ }),
-/* 249 */
-/***/ (function(module, exports, __webpack_require__) {
+function expand(str, isTop) {
+  var expansions = [];
 
-"use strict";
+  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;
+        });
+      }
+    }
+  }
 
-var _interopRequireDefault = __webpack_require__(7);
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ToolingLogCollectingWriter = void 0;
+  // 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 _defineProperty2 = _interopRequireDefault(__webpack_require__(8));
+  var N;
 
-var _tooling_log_text_writer = __webpack_require__(233);
+  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);
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-class ToolingLogCollectingWriter extends _tooling_log_text_writer.ToolingLogTextWriter {
-  constructor(level = 'verbose') {
-    super({
-      level,
-      writeTo: {
-        write: msg => {
-          // trim trailing new line
-          this.messages.push(msg.slice(0, -1));
+    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;
+          }
         }
       }
-    });
-    (0, _defineProperty2.default)(this, "messages", []);
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
   }
-  /**
-   * Called by ToolingLog, extends messages with the source if message includes one.
-   */
 
-
-  write(msg) {
-    if (msg.source) {
-      return super.write({ ...msg,
-        args: [`source[${msg.source}]`, ...msg.args]
-      });
+  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 super.write(msg);
   }
 
+  return expansions;
 }
 
-exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter;
+
 
 /***/ }),
-/* 250 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 176 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__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__(251);
-/* harmony import */ var _build__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(556);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(557);
-/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(581);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(582);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(584);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
 
+function preserveCamelCase(str) {
+	let isLastCharLower = false;
+	let isLastCharUpper = false;
+	let isLastLastCharUpper = false;
 
+	for (let i = 0; i < str.length; i++) {
+		const c = str[i];
 
+		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;
+		}
+	}
 
+	return str;
+}
 
-const commands = {
-  bootstrap: _bootstrap__WEBPACK_IMPORTED_MODULE_0__["BootstrapCommand"],
-  build: _build__WEBPACK_IMPORTED_MODULE_1__["BuildCommand"],
-  clean: _clean__WEBPACK_IMPORTED_MODULE_2__["CleanCommand"],
-  reset: _reset__WEBPACK_IMPORTED_MODULE_3__["ResetCommand"],
-  run: _run__WEBPACK_IMPORTED_MODULE_4__["RunCommand"],
-  watch: _watch__WEBPACK_IMPORTED_MODULE_5__["WatchCommand"]
-};
+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();
+	}
 
-/***/ }),
-/* 251 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (str.length === 0) {
+		return '';
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BootstrapCommand", function() { return BootstrapCommand; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(252);
-/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341);
-/* harmony import */ var _utils_child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(342);
-/* harmony import */ var _utils_link_project_executables__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(351);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(461);
-/* harmony import */ var _utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(530);
-/* harmony import */ var _utils_sort_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(533);
-/* harmony import */ var _utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(542);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(544);
-/* harmony import */ var _utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(555);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+	if (str.length === 1) {
+		return str.toLowerCase();
+	}
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+	if (/^[a-z0-9]+$/.test(str)) {
+		return str;
+	}
 
-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; }
+	const hasUpperCase = str !== str.toLowerCase();
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+	if (hasUpperCase) {
+		str = preserveCamelCase(str);
+	}
 
+	return str
+		.replace(/^[_.\- ]+/, '')
+		.toLowerCase()
+		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
+};
 
 
+/***/ }),
+/* 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__) {
 
+__webpack_require__(205);
+__webpack_require__(207);
+__webpack_require__(210);
+__webpack_require__(206);
+__webpack_require__(208);
+__webpack_require__(209);
+module.exports = __webpack_require__(23).Promise;
 
 
+/***/ }),
+/* 180 */
+/***/ (function(module, exports) {
 
-const BootstrapCommand = {
-  description: 'Install dependencies and crosslink projects',
-  name: 'bootstrap',
-  reportTiming: {
-    group: 'scripts/kbn bootstrap',
-    id: 'total'
-  },
+module.exports = function () { /* empty */ };
 
-  async run(projects, projectGraph, {
-    options,
-    kbn,
-    rootPath
-  }) {
-    var _projects$get;
 
-    const nonBazelProjectsOnly = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__["getNonBazelProjectsOnly"])(projects);
-    const batchedNonBazelProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__["topologicallyBatchProjects"])(nonBazelProjectsOnly, projectGraph);
-    const kibanaProjectPath = ((_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path) || '';
-    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true;
-    const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
-    const timings = [];
+/***/ }),
+/* 181 */
+/***/ (function(module, exports) {
 
-    const time = async (id, body) => {
-      const start = Date.now();
+module.exports = function (it, Constructor, name, forbiddenField) {
+  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
+    throw TypeError(name + ': incorrect invocation!');
+  } return it;
+};
 
-      try {
-        return await body();
-      } finally {
-        timings.push({
-          id,
-          ms: Date.now() - start
-        });
-      }
-    }; // Force install is set in case a flag is passed into yarn kbn bootstrap
 
+/***/ }),
+/* 182 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    const forceInstall = !!options && options['force-install'] === true; // Install bazel machinery tools if needed
+// 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;
+  };
+};
 
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["installBazelTools"])(rootPath); // Setup remote cache settings in .bazelrc.cache if needed
 
-    await Object(_utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_10__["setupRemoteCache"])(rootPath); // Bootstrap process for Bazel packages
-    // Bazel is now managing dependencies so yarn install
-    // will happen as part of this
-    //
-    // NOTE: Bazel projects will be introduced incrementally
-    // And should begin from the ones with none dependencies forward.
-    // That way non bazel projects could depend on bazel projects but not the other way around
-    // That is only intended during the migration process while non Bazel projects are not removed at all.
-    //
+/***/ }),
+/* 183 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (forceInstall) {
-      await time('force install dependencies', async () => {
-        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["removeYarnIntegrityFileIfExists"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(kibanaProjectPath, 'node_modules'));
-        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['clean', '--expunge']);
-        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@yarn//:yarn'], runOffline, {
-          env: {
-            SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
-            RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
-          }
-        });
-      });
-    } // build packages
+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;
 
 
-    await time('build packages', async () => {
-      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['build', '//packages:build', '--show_result=1'], runOffline);
-    }); // Install monorepo npm dependencies outside of the Bazel managed ones
+/***/ }),
+/* 184 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    for (const batch of batchedNonBazelProjects) {
-      for (const project of batch) {
-        const isExternalPlugin = project.path.includes(`${kibanaProjectPath}${path__WEBPACK_IMPORTED_MODULE_0__["sep"]}plugins`);
+module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
+  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
+});
 
-        if (!project.hasDependencies()) {
-          continue;
-        }
 
-        if (isExternalPlugin) {
-          await project.installDependencies();
-          continue;
-        }
+/***/ }),
+/* 185 */
+/***/ (function(module, exports) {
 
-        if (!project.isSinglePackageJsonProject && !project.isEveryDependencyLocal() && !isExternalPlugin) {
-          throw new Error(`[${project.name}] is not eligible to hold non local dependencies. Move the non local dependencies into the top level package.json.`);
-        }
-      }
-    }
+// 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);
+};
 
-    await time('sort package json', async () => {
-      await Object(_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_7__["sortPackageJson"])(kbn);
-    });
-    const yarnLock = await time('read yarn.lock', async () => await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__["readYarnLock"])(kbn));
 
-    if (options.validate) {
-      await time('validate dependencies', async () => {
-        await Object(_utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_8__["validateDependencies"])(kbn, yarnLock);
-      });
-    } // Assure all kbn projects with bin defined scripts
-    // copy those scripts into the top level node_modules folder
-    //
-    // NOTE: We don't probably need this anymore, is actually not being used
+/***/ }),
+/* 186 */
+/***/ (function(module, exports, __webpack_require__) {
 
+// check on default Array iterator
+var Iterators = __webpack_require__(35);
+var ITERATOR = __webpack_require__(13)('iterator');
+var ArrayProto = Array.prototype;
 
-    await time('link project executables', async () => {
-      await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_4__["linkProjectExecutables"])(projects, projectGraph);
-    });
-    await time('update vscode config', async () => {
-      // Update vscode settings
-      await Object(_utils_child_process__WEBPACK_IMPORTED_MODULE_3__["spawnStreaming"])(process.execPath, ['scripts/update_vscode_config'], {
-        cwd: kbn.getAbsolute(),
-        env: process.env
-      }, {
-        prefix: '[vscode]',
-        debug: false
-      });
-    }); // send timings
+module.exports = function (it) {
+  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
+};
 
-    await reporter.timings({
-      upstreamBranch: kbn.kibanaProject.json.branch,
-      // prevent loading @kbn/utils by passing null
-      kibanaUuid: kbn.getUuid() || null,
-      timings: timings.map(t => _objectSpread({
-        group: 'scripts/kbn bootstrap'
-      }, t))
-    });
-  }
 
+/***/ }),
+/* 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;
+  }
 };
 
+
 /***/ }),
-/* 252 */
+/* 188 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+var create = __webpack_require__(192);
+var descriptor = __webpack_require__(106);
+var setToStringTag = __webpack_require__(71);
+var IteratorPrototype = {};
 
-var _interopRequireDefault = __webpack_require__(7);
+// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
+__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CiStatsReporter = void 0;
+module.exports = function (Constructor, NAME, next) {
+  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+  setToStringTag(Constructor, NAME + ' Iterator');
+};
 
-var _util = __webpack_require__(234);
 
-var _os = _interopRequireDefault(__webpack_require__(243));
+/***/ }),
+/* 189 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _fs = _interopRequireDefault(__webpack_require__(253));
+var ITERATOR = __webpack_require__(13)('iterator');
+var SAFE_CLOSING = false;
 
-var _path = _interopRequireDefault(__webpack_require__(4));
+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 */ }
 
-var _crypto = _interopRequireDefault(__webpack_require__(254));
+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;
+};
 
-var _execa = _interopRequireDefault(__webpack_require__(255));
 
-var _axios = _interopRequireDefault(__webpack_require__(298));
+/***/ }),
+/* 190 */
+/***/ (function(module, exports) {
 
-var _http = _interopRequireDefault(__webpack_require__(320));
+module.exports = function (done, value) {
+  return { value: value, done: !!done };
+};
 
-var _ci_stats_config = __webpack_require__(339);
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
-const BASE_URL = 'https://ci-stats.kibana.dev';
-/** A ci-stats metric record */
+/***/ }),
+/* 191 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/** Object that helps report data to the ci-stats service */
-class CiStatsReporter {
-  /**
-   * Create a CiStatsReporter by inspecting the ENV for the necessary config
-   */
-  static fromEnv(log) {
-    return new CiStatsReporter((0, _ci_stats_config.parseConfig)(log), log);
-  }
+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';
 
-  constructor(config, log) {
-    this.config = config;
-    this.log = log;
-  }
-  /**
-   * Determine if CI_STATS is explicitly disabled by the environment. To determine
-   * if the CiStatsReporter has enough information in the environment to send metrics
-   * for builds use #hasBuildConfig().
-   */
+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();
+  };
 
-  isEnabled() {
-    return process.env.CI_STATS_DISABLED !== 'true';
+  // 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);
+    };
   }
-  /**
-   * Determines if the CiStatsReporter is disabled by the environment, or properly
-   * configured and able to send stats
-   */
-
-
-  hasBuildConfig() {
-    var _this$config, _this$config2;
 
-    return this.isEnabled() && !!((_this$config = this.config) !== null && _this$config !== void 0 && _this$config.apiToken) && !!((_this$config2 = this.config) !== null && _this$config2 !== void 0 && _this$config2.buildId);
-  }
-  /**
-   * Report timings data to the ci-stats service. If running in CI then the reporter
-   * will include the buildId in the report with the access token, otherwise the timings
-   * data will be recorded as anonymous timing data.
-   */
+  return function (fn) {
+    var task = { fn: fn, next: undefined };
+    if (last) last.next = task;
+    if (!head) {
+      head = task;
+      notify();
+    } last = task;
+  };
+};
 
 
-  async timings(options) {
-    var _this$config3, _options$upstreamBran, _Os$cpus, _Os$cpus$, _Os$cpus$2;
+/***/ }),
+/* 192 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (!this.isEnabled()) {
-      return;
-    }
+// 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';
 
-    const buildId = (_this$config3 = this.config) === null || _this$config3 === void 0 ? void 0 : _this$config3.buildId;
-    const timings = options.timings;
-    const upstreamBranch = (_options$upstreamBran = options.upstreamBranch) !== null && _options$upstreamBran !== void 0 ? _options$upstreamBran : this.getUpstreamBranch();
-    const kibanaUuid = options.kibanaUuid === undefined ? this.getKibanaUuid() : options.kibanaUuid;
-    let email;
-    let branch;
+// 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();
+};
 
-    try {
-      const {
-        stdout
-      } = await (0, _execa.default)('git', ['config', 'user.email']);
-      email = stdout;
-    } catch (e) {
-      this.log.debug(e.message);
-    }
+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);
+};
 
-    try {
-      const {
-        stdout
-      } = await (0, _execa.default)('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
-      branch = stdout;
-    } catch (e) {
-      this.log.debug(e.message);
-    }
 
-    const memUsage = process.memoryUsage();
-    const isElasticCommitter = email && email.endsWith('@elastic.co') ? true : false;
-    const defaultMeta = {
-      kibanaUuid,
-      isElasticCommitter,
-      committerHash: email ? _crypto.default.createHash('sha256').update(email).digest('hex').substring(0, 20) : undefined,
-      email: isElasticCommitter ? email : undefined,
-      branch: isElasticCommitter ? branch : undefined,
-      cpuCount: (_Os$cpus = _os.default.cpus()) === null || _Os$cpus === void 0 ? void 0 : _Os$cpus.length,
-      cpuModel: (_Os$cpus$ = _os.default.cpus()[0]) === null || _Os$cpus$ === void 0 ? void 0 : _Os$cpus$.model,
-      cpuSpeed: (_Os$cpus$2 = _os.default.cpus()[0]) === null || _Os$cpus$2 === void 0 ? void 0 : _Os$cpus$2.speed,
-      freeMem: _os.default.freemem(),
-      memoryUsageRss: memUsage.rss,
-      memoryUsageHeapTotal: memUsage.heapTotal,
-      memoryUsageHeapUsed: memUsage.heapUsed,
-      memoryUsageExternal: memUsage.external,
-      memoryUsageArrayBuffers: memUsage.arrayBuffers,
-      nestedTiming: process.env.CI_STATS_NESTED_TIMING ? true : false,
-      osArch: _os.default.arch(),
-      osPlatform: _os.default.platform(),
-      osRelease: _os.default.release(),
-      totalMem: _os.default.totalmem()
-    };
-    this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash);
-    return !!(await this.req({
-      auth: !!buildId,
-      path: '/v1/timings',
-      body: {
-        buildId,
-        upstreamBranch,
-        defaultMeta,
-        timings
-      },
-      bodyDesc: timings.length === 1 ? `${timings.length} timing` : `${timings.length} timings`
-    }));
-  }
-  /**
-   * Report metrics data to the ci-stats service. If running outside of CI this method
-   * does nothing as metrics can only be reported when associated with a specific CI build.
-   */
+/***/ }),
+/* 193 */
+/***/ (function(module, exports, __webpack_require__) {
 
+var dP = __webpack_require__(50);
+var anObject = __webpack_require__(27);
+var getKeys = __webpack_require__(132);
 
-  async metrics(metrics, options) {
-    var _this$config4;
+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;
+};
 
-    if (!this.hasBuildConfig()) {
-      return;
-    }
 
-    const buildId = (_this$config4 = this.config) === null || _this$config4 === void 0 ? void 0 : _this$config4.buildId;
+/***/ }),
+/* 194 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (!buildId) {
-      throw new Error(`metrics can't be reported without a buildId`);
-    }
+// 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;
 
-    return !!(await this.req({
-      auth: true,
-      path: '/v1/metrics',
-      body: {
-        buildId,
-        defaultMeta: options === null || options === void 0 ? void 0 : options.defaultMeta,
-        metrics
-      },
-      bodyDesc: `metrics: ${metrics.map(({
-        group,
-        id,
-        value
-      }) => `[${group}/${id}=${value}]`).join(' ')}`
-    }));
-  }
-  /**
-   * Send test reports to ci-stats
-   */
+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;
+};
 
 
-  async reportTests({
-    group,
-    testRuns
-  }) {
-    var _this$config5, _this$config6, _this$config7;
+/***/ }),
+/* 195 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (!((_this$config5 = this.config) !== null && _this$config5 !== void 0 && _this$config5.buildId) || !((_this$config6 = this.config) !== null && _this$config6 !== void 0 && _this$config6.apiToken)) {
-      throw new Error('unable to report tests unless buildId is configured and auth config available');
-    }
+var has = __webpack_require__(49);
+var toIObject = __webpack_require__(74);
+var arrayIndexOf = __webpack_require__(182)(false);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
 
-    return await this.req({
-      auth: true,
-      path: '/v1/test_group',
-      query: {
-        buildId: (_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.buildId
-      },
-      bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
-      body: [JSON.stringify({
-        group
-      }), ...testRuns.map(testRun => JSON.stringify({
-        testRun
-      }))].join('\n')
-    });
+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);
   }
-  /**
-   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
-   * in the upstreamBranch when calling the timings() method. Outside of @kbn/pm
-   * we rely on @kbn/utils to find the package.json file.
-   */
+  return result;
+};
 
 
-  getUpstreamBranch() {
-    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
-    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
+/***/ }),
+/* 196 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    const {
-      kibanaPackageJson
-    } = __webpack_require__(340)(hideFromWebpack.join(''));
+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;
+};
 
-    return kibanaPackageJson.branch;
-  }
-  /**
-   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
-   * in the kibanaUuid when calling the timings() method. Outside of @kbn/pm
-   * we rely on @kbn/utils to find the repo root.
-   */
 
+/***/ }),
+/* 197 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  getKibanaUuid() {
-    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
-    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
+module.exports = __webpack_require__(31);
 
-    const {
-      REPO_ROOT
-    } = __webpack_require__(340)(hideFromWebpack.join(''));
 
-    try {
-      return _fs.default.readFileSync(_path.default.resolve(REPO_ROOT, 'data/uuid'), 'utf-8').trim();
-    } catch (error) {
-      if (error.code === 'ENOENT') {
-        return undefined;
-      }
+/***/ }),
+/* 198 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      throw error;
-    }
-  }
+"use strict";
 
-  async req({
-    auth,
-    body,
-    bodyDesc,
-    path,
-    query
-  }) {
-    let attempt = 0;
-    const maxAttempts = 5;
-    let headers;
+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');
 
-    if (auth && this.config) {
-      headers = {
-        Authorization: `token ${this.config.apiToken}`
-      };
-    } else if (auth) {
-      throw new Error('this.req() shouldnt be called with auth=true if this.config is not defined');
-    }
+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; }
+  });
+};
 
-    while (true) {
-      attempt += 1;
 
-      try {
-        const resp = await _axios.default.request({
-          method: 'POST',
-          url: path,
-          baseURL: BASE_URL,
-          headers,
-          data: body,
-          params: query,
-          adapter: _http.default,
-          // if it can be serialized into a string, send it
-          maxBodyLength: Infinity,
-          maxContentLength: Infinity
-        });
-        return resp.data;
-      } catch (error) {
-        var _error$response;
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (!(error !== null && error !== void 0 && error.request)) {
-          // not an axios error, must be a usage error that we should notify user about
-          throw error;
-        }
+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;
+  };
+};
 
-        if (error !== null && error !== void 0 && error.response && error.response.status < 500) {
-          // error response from service was received so warn the user and move on
-          this.log.warning(`error reporting ${bodyDesc} [status=${error.response.status}] [resp=${(0, _util.inspect)(error.response.data)}]`);
-          return;
-        }
 
-        if (attempt === maxAttempts) {
-          this.log.warning(`unable to report ${bodyDesc}, failed to reach ci-stats service too many times`);
-          return;
-        } // we failed to reach the backend and we have remaining attempts, lets retry after a short delay
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
 
+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);
+};
 
-        const reason = error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && _error$response.status ? `${error.response.status} response` : 'no response';
-        const seconds = attempt * 10;
-        this.log.warning(`failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`);
-        await new Promise(resolve => setTimeout(resolve, seconds * 1000));
-      }
-    }
-  }
 
-}
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 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");
+};
 
-exports.CiStatsReporter = CiStatsReporter;
 
 /***/ }),
-/* 253 */
-/***/ (function(module, exports) {
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var global = __webpack_require__(11);
+var navigator = global.navigator;
+
+module.exports = navigator && navigator.userAgent || '';
 
-module.exports = require("fs");
 
 /***/ }),
-/* 254 */
-/***/ (function(module, exports) {
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
+
+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)];
+};
 
-module.exports = require("crypto");
 
 /***/ }),
-/* 255 */
+/* 204 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(4);
-const childProcess = __webpack_require__(256);
-const crossSpawn = __webpack_require__(257);
-const stripFinalNewline = __webpack_require__(270);
-const npmRunPath = __webpack_require__(271);
-const onetime = __webpack_require__(273);
-const makeError = __webpack_require__(275);
-const normalizeStdio = __webpack_require__(280);
-const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(281);
-const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(286);
-const {mergePromise, getSpawnedPromise} = __webpack_require__(296);
-const {joinCommand, parseCommand} = __webpack_require__(297);
+var addToUnscopables = __webpack_require__(180);
+var step = __webpack_require__(190);
+var Iterators = __webpack_require__(35);
+var toIObject = __webpack_require__(74);
 
-const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
+// 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');
 
-const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
-	const env = extendEnv ? {...process.env, ...envOption} : envOption;
+// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
+Iterators.Arguments = Iterators.Array;
 
-	if (preferLocal) {
-		return npmRunPath.env({env, cwd: localDir, execPath});
-	}
+addToUnscopables('keys');
+addToUnscopables('values');
+addToUnscopables('entries');
 
-	return env;
-};
 
-const handleArguments = (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,
-		windowsHide: true,
-		...options
-	};
+/***/ }),
+/* 205 */
+/***/ (function(module, exports) {
 
-	options.env = getEnv(options);
 
-	options.stdio = normalizeStdio(options);
 
-	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
-		// #116
-		args.unshift('/q');
-	}
+/***/ }),
+/* 206 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return {file, args, options, parsed};
-};
+"use strict";
 
-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 : '';
-	}
+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;
 
-	if (options.stripFinalNewline) {
-		return stripFinalNewline(value);
-	}
+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 */ }
+}();
 
-	return value;
+// 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 {
+        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);
+        }
+      });
+      // 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 });
+    }
+  });
+};
+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 {
+          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
+        } catch (e) {
+          $reject.call(wrapper, e);
+        }
+      });
+    } else {
+      promise._v = value;
+      promise._s = 1;
+      notify(promise, false);
+    }
+  } catch (e) {
+    $reject.call({ _w: promise, _d: false }, e); // wrap
+  }
 };
 
-const execa = (file, args, options) => {
-	const parsed = handleArguments(file, args, options);
-	const command = joinCommand(file, args);
+// 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);
+    }
+  };
+  // 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);
+  };
+}
 
-	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);
-	}
+$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];
 
-	const spawnedPromise = getSpawnedPromise(spawned);
-	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
-	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
+// 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;
+  }
+});
+$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);
+  }
+});
+$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;
+  }
+});
 
-	const context = {isCanceled: false};
 
-	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
-	spawned.cancel = spawnedCancel.bind(null, spawned, context);
+/***/ }),
+/* 207 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	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);
+"use strict";
 
-		if (error || exitCode !== 0 || signal !== null) {
-			const returnedError = makeError({
-				error,
-				exitCode,
-				signal,
-				stdout,
-				stderr,
-				all,
-				command,
-				parsed,
-				timedOut,
-				isCanceled: context.isCanceled,
-				killed: spawned.killed
-			});
+var $at = __webpack_require__(199)(true);
 
-			if (!parsed.options.reject) {
-				return returnedError;
-			}
+// 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 };
+});
 
-			throw returnedError;
-		}
 
-		return {
-			command,
-			exitCode: 0,
-			stdout,
-			stderr,
-			all,
-			failed: false,
-			timedOut: false,
-			isCanceled: false,
-			killed: false
-		};
-	};
+/***/ }),
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const handlePromiseOnce = onetime(handlePromise);
+"use strict";
+// https://github.com/tc39/proposal-promise-finally
 
-	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
+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);
 
-	handleInput(spawned, parsed.options.input);
+$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
+  );
+} });
 
-	spawned.all = makeAllStream(spawned, parsed.options);
 
-	return mergePromise(spawned, handlePromiseOnce);
-};
+/***/ }),
+/* 209 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = execa;
+"use strict";
 
-module.exports.sync = (file, args, options) => {
-	const parsed = handleArguments(file, args, options);
-	const command = joinCommand(file, args);
+// https://github.com/tc39/proposal-promise-try
+var $export = __webpack_require__(41);
+var newPromiseCapability = __webpack_require__(70);
+var perform = __webpack_require__(104);
 
-	validateInputSync(parsed.options);
+$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;
+} });
 
-	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);
+/***/ }),
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	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
-		});
+__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');
 
-		if (!parsed.options.reject) {
-			return error;
-		}
+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(',');
 
-		throw error;
-	}
+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;
+}
 
-	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
-		}
-	);
-};
-
-
-/***/ }),
-/* 256 */
-/***/ (function(module, exports) {
-
-module.exports = require("child_process");
 
 /***/ }),
-/* 257 */
+/* 211 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-const cp = __webpack_require__(256);
-const parse = __webpack_require__(258);
-const enoent = __webpack_require__(269);
-
-function spawn(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-    // Spawn the child process
-    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
+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();
 
-    // 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);
+/**
+ * Colors.
+ */
 
-    return spawned;
-}
+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'
+];
 
-function spawnSync(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+/**
+ * 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
+ */
 
-    // Spawn the child process
-    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
+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;
+  }
 
-    // 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);
+  // Internet Explorer and Edge do not support colors.
+  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
+    return false;
+  }
 
-    return result;
+  // 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 = spawn;
-module.exports.spawn = spawn;
-module.exports.sync = spawnSync;
-
-module.exports._parse = parse;
-module.exports._enoent = enoent;
+/**
+ * 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;
+  }
+};
 
-/***/ }),
-/* 258 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
 
+function formatArgs(args) {
+  var useColors = this.useColors;
 
-const path = __webpack_require__(4);
-const resolveCommand = __webpack_require__(259);
-const escape = __webpack_require__(265);
-const readShebang = __webpack_require__(266);
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
 
-const isWin = process.platform === 'win32';
-const isExecutableRegExp = /\.(?:com|exe)$/i;
-const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+  if (!useColors) return;
 
-function detectShebang(parsed) {
-    parsed.file = resolveCommand(parsed);
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
 
-    const shebang = parsed.file && readShebang(parsed.file);
+  // 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;
+    }
+  });
 
-    if (shebang) {
-        parsed.args.unshift(parsed.file);
-        parsed.command = shebang;
+  args.splice(lastC, 0, c);
+}
 
-        return resolveCommand(parsed);
-    }
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
 
-    return parsed.file;
+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);
 }
 
-function parseNonShell(parsed) {
-    if (!isWin) {
-        return parsed;
+/**
+ * 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) {}
+}
 
-    // Detect & add support for shebangs
-    const commandFile = detectShebang(parsed);
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-    // We don't need a shell if the command filename is an executable
-    const needsShell = !isExecutableRegExp.test(commandFile);
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
 
-    // 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);
+  // 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;
+  }
 
-        // 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);
+  return r;
+}
 
-        // Escape command & arguments
-        parsed.command = escape.command(parsed.command);
-        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
 
-        const shellCommand = [parsed.command].concat(parsed.args).join(' ');
+exports.enable(load());
 
-        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
-    }
+/**
+ * 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 parsed;
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
 }
 
-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
+/***/ }),
+/* 212 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // Build our parsed object
-    const parsed = {
-        command,
-        args,
-        options,
-        file: undefined,
-        original: {
-            command,
-            args,
-        },
-    };
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
 
-    // Delegate further parsing to shell or non-shell
-    return options.shell ? parsed : parseNonShell(parsed);
+if (typeof process === 'undefined' || process.type === 'renderer') {
+  module.exports = __webpack_require__(211);
+} else {
+  module.exports = __webpack_require__(213);
 }
 
-module.exports = parse;
-
 
 /***/ }),
-/* 259 */
+/* 213 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/**
+ * Module dependencies.
+ */
 
+var tty = __webpack_require__(79);
+var util = __webpack_require__(2);
 
-const path = __webpack_require__(4);
-const which = __webpack_require__(260);
-const getPathKey = __webpack_require__(264);
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-function resolveCommandAttempt(parsed, withoutPathExt) {
-    const env = parsed.options.env || process.env;
-    const cwd = process.cwd();
-    const hasCustomCwd = parsed.options.cwd != null;
-    // Worker threads do not have process.chdir()
-    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined && !process.chdir.disabled;
+exports = module.exports = __webpack_require__(112);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
 
-    // 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 */
-        }
-    }
+/**
+ * Colors.
+ */
 
-    let resolved;
+exports.colors = [ 6, 2, 3, 4, 5, 1 ];
 
-    try {
-        resolved = which.sync(parsed.command, {
-            path: env[getPathKey({ env })],
-            pathExt: withoutPathExt ? path.delimiter : undefined,
-        });
-    } catch (e) {
-        /* Empty */
-    } finally {
-        if (shouldSwitchCwd) {
-            process.chdir(cwd);
-        }
-    }
+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.
+}
 
-    // 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);
-    }
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
 
-    return resolved;
-}
+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() });
 
-function resolveCommand(parsed) {
-    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
-}
+  // 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);
 
-module.exports = resolveCommand;
+  obj[prop] = val;
+  return obj;
+}, {});
 
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
 
-/***/ }),
-/* 260 */
-/***/ (function(module, exports, __webpack_require__) {
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(process.stderr.fd);
+}
 
-const isWindows = process.platform === 'win32' ||
-    process.env.OSTYPE === 'cygwin' ||
-    process.env.OSTYPE === 'msys'
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
 
-const path = __webpack_require__(4)
-const COLON = isWindows ? ';' : ':'
-const isexe = __webpack_require__(261)
+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(' ');
+};
 
-const getNotFoundError = (cmd) =>
-  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
 
-const getPathInfo = (cmd, opt) => {
-  const colon = opt.colon || COLON
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
 
-  // 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) : ['']
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
 
-  if (isWindows) {
-    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
-      pathExt.unshift('')
-  }
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
 
-  return {
-    pathEnv,
-    pathExt,
-    pathExtExe,
+  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];
   }
 }
 
-const which = (cmd, opt, cb) => {
-  if (typeof opt === 'function') {
-    cb = opt
-    opt = {}
+function getDate() {
+  if (exports.inspectOpts.hideDate) {
+    return '';
+  } else {
+    return new Date().toISOString() + ' ';
   }
-  if (!opt)
-    opt = {}
+}
 
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+/**
+ * Invokes `util.format()` with the specified arguments and writes to stderr.
+ */
 
-  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))
-  })
+function log() {
+  return process.stderr.write(util.format.apply(util, arguments) + '\n');
+}
 
-  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))
-    })
-  })
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
+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;
+  }
 }
 
-const whichSync = (cmd, opt) => {
-  opt = opt || {}
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+function load() {
+  return process.env.DEBUG;
+}
 
-  for (let i = 0; i < pathEnv.length; i ++) {
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
 
-    const pCmd = path.join(pathPart, cmd)
-    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
-      : pCmd
+function init (debug) {
+  debug.inspectOpts = {};
 
-    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) {}
-    }
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
   }
-
-  if (opt.all && found.length)
-    return found
-
-  if (opt.nothrow)
-    return null
-
-  throw getNotFoundError(cmd)
 }
 
-module.exports = which
-which.sync = whichSync
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
+
+exports.enable(load());
 
 
 /***/ }),
-/* 261 */
+/* 214 */,
+/* 215 */,
+/* 216 */,
+/* 217 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(253)
-var core
-if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = __webpack_require__(262)
-} else {
-  core = __webpack_require__(263)
-}
+// 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.
 
-module.exports = isexe
-isexe.sync = sync
+var pathModule = __webpack_require__(0);
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__(3);
 
-function isexe (path, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+// JavaScript implementation of realpath, ported from node pre-v6
 
-  if (!cb) {
-    if (typeof Promise !== 'function') {
-      throw new TypeError('callback not provided')
-    }
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
 
-    return new Promise(function (resolve, reject) {
-      isexe(path, options || {}, function (er, is) {
-        if (er) {
-          reject(er)
-        } else {
-          resolve(is)
-        }
-      })
-    })
-  }
+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;
 
-  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)
-  })
-}
+  return callback;
 
-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 debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
     }
   }
-}
-
-
-/***/ }),
-/* 262 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = isexe
-isexe.sync = sync
-
-var fs = __webpack_require__(253)
-
-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
+  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);
+      }
     }
   }
-  return false
 }
 
-function checkStat (stat, path, options) {
-  if (!stat.isSymbolicLink() && !stat.isFile()) {
-    return false
-  }
-  return checkPathExt(path, options)
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
 }
 
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, path, options))
-  })
-}
+var normalize = pathModule.normalize;
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), path, options)
+// 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;
 }
 
-
-/***/ }),
-/* 263 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = isexe
-isexe.sync = sync
-
-var fs = __webpack_require__(253)
-
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, options))
-  })
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
 }
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), options)
-}
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-function checkStat (stat, options) {
-  return stat.isFile() && checkMode(stat, options)
-}
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
 
-function checkMode (stat, options) {
-  var mod = stat.mode
-  var uid = stat.uid
-  var gid = stat.gid
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-  var myUid = options.uid !== undefined ?
-    options.uid : process.getuid && process.getuid()
-  var myGid = options.gid !== undefined ?
-    options.gid : process.getgid && process.getgid()
+  // 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;
 
-  var u = parseInt('100', 8)
-  var g = parseInt('010', 8)
-  var o = parseInt('001', 8)
-  var ug = u | g
+  start();
 
-  var ret = (mod & o) ||
-    (mod & g) && gid === myGid ||
-    (mod & u) && uid === myUid ||
-    (mod & ug) && myUid === 0
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
-  return ret
-}
+    // 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;
 
-/***/ }),
-/* 264 */
-/***/ (function(module, exports, __webpack_require__) {
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
 
-"use strict";
+    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;
+    }
 
-const pathKey = (options = {}) => {
-	const environment = options.env || process.env;
-	const platform = options.platform || process.platform;
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
 
-	if (platform !== 'win32') {
-		return 'PATH';
-	}
+  if (cache) cache[original] = p;
 
-	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
+  return p;
 };
 
-module.exports = pathKey;
-// TODO: Remove this for the next major release
-module.exports.default = pathKey;
 
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
 
-/***/ }),
-/* 265 */
-/***/ (function(module, exports, __webpack_require__) {
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-"use strict";
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
 
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-// See http://www.robvanderwoude.com/escapechars.php
-const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
+  // 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 escapeCommand(arg) {
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+  start();
 
-    return arg;
-}
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
-function escapeArgument(arg, doubleEscapeMetaChars) {
-    // Convert to string
-    arg = `${arg}`;
+    // 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);
+    }
+  }
 
-    // Algorithm below is based on https://qntm.org/cmd
+  // 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);
+    }
 
-    // Sequence of backslashes followed by a double quote:
-    // double up all the backslashes and escape the double quote
-    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
 
-    // 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');
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
+    }
 
-    // All other backslashes occur literally
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
+    }
 
-    // Quote the whole thing:
-    arg = `"${arg}"`;
+    return fs.lstat(base, gotStat);
+  }
 
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+  function gotStat(err, stat) {
+    if (err) return cb(err);
 
-    // Double escape meta chars if necessary
-    if (doubleEscapeMetaChars) {
-        arg = arg.replace(metaCharsRegExp, '^$1');
+    // 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);
     }
 
-    return arg;
-}
+    // 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);
 
-module.exports.command = escapeCommand;
-module.exports.argument = escapeArgument;
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
 
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
 
-/***/ }),
-/* 266 */
-/***/ (function(module, exports, __webpack_require__) {
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
 
-"use strict";
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+};
 
 
-const fs = __webpack_require__(253);
-const shebangCommand = __webpack_require__(267);
+/***/ }),
+/* 218 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function readShebang(command) {
-    // Read the first 150 bytes from the file
-    const size = 150;
-    const buffer = Buffer.alloc(size);
+module.exports = globSync
+globSync.GlobSync = GlobSync
 
-    let fd;
+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
 
-    try {
-        fd = fs.openSync(command, 'r');
-        fs.readSync(fd, buffer, 0, size, 0);
-        fs.closeSync(fd);
-    } catch (e) { /* Empty */ }
+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')
 
-    // Attempt to extract shebang (null is returned if not a shebang)
-    return shebangCommand(buffer.toString());
+  return new GlobSync(pattern, options).found
 }
 
-module.exports = readShebang;
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
 
+  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')
 
-/***/ }),
-/* 267 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!(this instanceof GlobSync))
+    return new GlobSync(pattern, options)
 
-"use strict";
+  setopts(this, pattern, options)
 
-const shebangRegex = __webpack_require__(268);
+  if (this.noprocess)
+    return this
 
-module.exports = (string = '') => {
-	const match = string.match(shebangRegex);
+  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()
+}
 
-	if (!match) {
-		return null;
-	}
+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)
+}
 
-	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
-	const binary = path.split('/').pop();
 
-	if (binary === 'env') {
-		return argument;
-	}
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
 
-	return argument ? `${binary} ${argument}` : binary;
-};
+  // 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
 
-/***/ }),
-/* 268 */
-/***/ (function(module, exports, __webpack_require__) {
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
 
-"use strict";
+    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
+  }
 
-module.exports = /^#!(.*)/;
+  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
 
-/***/ }),
-/* 269 */
-/***/ (function(module, exports, __webpack_require__) {
+  var abs = this._makeAbs(read)
 
-"use strict";
+  //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)
+}
 
-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,
-    });
-}
+GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
+  var entries = this._readdir(abs, inGlobStar)
 
-function hookChildProcess(cp, parsed) {
-    if (!isWin) {
-        return;
-    }
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return
 
-    const originalEmit = cp.emit;
+  // 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) === '.'
 
-    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');
+  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)
+    }
+  }
 
-            if (err) {
-                return originalEmit.call(cp, 'error', err);
-            }
-        }
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
 
-        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
-    };
-}
+  // 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.
 
-function verifyENOENT(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawn');
-    }
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-    return 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
+      }
 
-function verifyENOENTSync(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawnSync');
+      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 null;
+  // 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 = {
-    hookChildProcess,
-    verifyENOENT,
-    verifyENOENTSync,
-    notFoundError,
-};
 
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
 
-/***/ }),
-/* 270 */
-/***/ (function(module, exports, __webpack_require__) {
+  var abs = this._makeAbs(e)
 
-"use strict";
+  if (this.mark)
+    e = this._mark(e)
 
+  if (this.absolute) {
+    e = abs
+  }
 
-module.exports = input => {
-	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
-	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
+  if (this.matches[index][e])
+    return
 
-	if (input[input.length - 1] === LF) {
-		input = input.slice(0, input.length - 1);
-	}
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-	if (input[input.length - 1] === CR) {
-		input = input.slice(0, input.length - 1);
-	}
+  this.matches[index][e] = true
 
-	return input;
-};
+  if (this.stat)
+    this._stat(e)
+}
 
 
-/***/ }),
-/* 271 */
-/***/ (function(module, exports, __webpack_require__) {
+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)
 
-"use strict";
+  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 path = __webpack_require__(4);
-const pathKey = __webpack_require__(272);
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
 
-const npmRunPath = options => {
-	options = {
-		cwd: process.cwd(),
-		path: process.env[pathKey()],
-		execPath: process.execPath,
-		...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)
 
-	let previous;
-	let cwdPath = path.resolve(options.cwd);
-	const result = [];
+  return entries
+}
 
-	while (previous !== cwdPath) {
-		result.push(path.join(cwdPath, 'node_modules/.bin'));
-		previous = cwdPath;
-		cwdPath = path.resolve(cwdPath, '..');
-	}
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-	// Ensure the running `node` binary is used
-	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
-	result.push(execPathDir);
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
 
-	return result.concat(options.path).join(path.delimiter);
-};
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
 
-module.exports = npmRunPath;
-// TODO: Remove this for the next major release
-module.exports.default = npmRunPath;
+    if (Array.isArray(c))
+      return c
+  }
 
-module.exports.env = options => {
-	options = {
-		env: process.env,
-		...options
-	};
+  try {
+    return this._readdirEntries(abs, fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
+  }
+}
 
-	const env = {...options.env};
-	const path = pathKey({env});
+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
+    }
+  }
 
-	options.path = env[path];
-	env[path] = module.exports(options);
+  this.cache[abs] = entries
 
-	return env;
-};
+  // mark and cache dir-ness
+  return entries
+}
 
+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
 
-/***/ }),
-/* 272 */
-/***/ (function(module, exports, __webpack_require__) {
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-"use strict";
+    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) {
 
-const pathKey = (options = {}) => {
-	const environment = options.env || process.env;
-	const platform = options.platform || process.platform;
+  var entries = this._readdir(abs, inGlobStar)
 
-	if (platform !== 'win32') {
-		return 'PATH';
-	}
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
 
-	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
-};
+  // 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)
 
-module.exports = pathKey;
-// TODO: Remove this for the next major release
-module.exports.default = pathKey;
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
 
+  var len = entries.length
+  var isSym = this.symlinks[abs]
 
-/***/ }),
-/* 273 */
-/***/ (function(module, exports, __webpack_require__) {
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
 
-"use strict";
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-const mimicFn = __webpack_require__(274);
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true)
 
-const calledFunctions = new WeakMap();
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true)
+  }
+}
 
-const onetime = (function_, options = {}) => {
-	if (typeof function_ !== 'function') {
-		throw new TypeError('Expected a function');
-	}
+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)
 
-	let returnValue;
-	let callCount = 0;
-	const functionName = function_.displayName || function_.name || '<anonymous>';
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-	const onetime = function (...arguments_) {
-		calledFunctions.set(onetime, ++callCount);
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
 
-		if (callCount === 1) {
-			returnValue = function_.apply(this, arguments_);
-			function_ = null;
-		} else if (options.throw === true) {
-			throw new Error(`Function \`${functionName}\` can only be called once`);
-		}
+  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 returnValue;
-	};
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
 
-	mimicFn(onetime, function_);
-	calledFunctions.set(onetime, callCount);
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+}
 
-	return onetime;
-};
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-module.exports = onetime;
-// TODO: Remove this for the next major release
-module.exports.default = onetime;
+  if (f.length > this.maxLength)
+    return false
 
-module.exports.callCount = function_ => {
-	if (!calledFunctions.has(function_)) {
-		throw new Error(`The given function \`${function_.name}\` is not wrapped by the \`onetime\` package`);
-	}
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-	return calledFunctions.get(function_);
-};
+    if (Array.isArray(c))
+      c = 'DIR'
 
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
 
-/***/ }),
-/* 274 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (needDir && c === 'FILE')
+      return false
 
-"use strict";
+    // 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) {
+    var lstat
+    try {
+      lstat = fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
+    }
 
-const mimicFn = (to, from) => {
-	for (const prop of Reflect.ownKeys(from)) {
-		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
-	}
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
+    }
+  }
 
-	return to;
-};
+  this.statCache[abs] = stat
 
-module.exports = mimicFn;
-// TODO: Remove this for the next major release
-module.exports.default = mimicFn;
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
 
+  this.cache[abs] = this.cache[abs] || c
 
-/***/ }),
-/* 275 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (needDir && c === 'FILE')
+    return false
 
-"use strict";
+  return c
+}
 
-const {signalsByName} = __webpack_require__(276);
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
-	if (timedOut) {
-		return `timed out after ${timeout} milliseconds`;
-	}
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
-	if (isCanceled) {
-		return 'was canceled';
-	}
 
-	if (errorCode !== undefined) {
-		return `failed with ${errorCode}`;
-	}
+/***/ }),
+/* 219 */,
+/* 220 */,
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (signal !== undefined) {
-		return `was killed with ${signal} (${signalDescription})`;
-	}
+"use strict";
 
-	if (exitCode !== undefined) {
-		return `failed with exit code ${exitCode}`;
-	}
+module.exports = function (flag, argv) {
+	argv = argv || process.argv;
 
-	return 'failed';
-};
+	var terminatorPos = argv.indexOf('--');
+	var prefix = /^--/.test(flag) ? '' : '--';
+	var pos = argv.indexOf(prefix + flag);
 
-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;
+	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
+};
 
-	const errorCode = error && error.code;
 
-	const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled});
-	const execaMessage = `Command ${prefix}: ${command}`;
-	const isError = Object.prototype.toString.call(error) === '[object Error]';
-	const shortMessage = isError ? `${execaMessage}\n${error.message}` : execaMessage;
-	const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n');
+/***/ }),
+/* 222 */,
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (isError) {
-		error.originalMessage = error.message;
-		error.message = message;
-	} else {
-		error = new Error(message);
-	}
+var wrappy = __webpack_require__(123)
+var reqs = Object.create(null)
+var once = __webpack_require__(61)
 
-	error.shortMessage = shortMessage;
-	error.command = command;
-	error.exitCode = exitCode;
-	error.signal = signal;
-	error.signalDescription = signalDescription;
-	error.stdout = stdout;
-	error.stderr = stderr;
+module.exports = wrappy(inflight)
 
-	if (all !== undefined) {
-		error.all = all;
-	}
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
+  }
+}
 
-	if ('bufferedData' in error) {
-		delete error.bufferedData;
-	}
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
 
-	error.failed = true;
-	error.timedOut = Boolean(timedOut);
-	error.isCanceled = isCanceled;
-	error.killed = killed && !timedOut;
+    // 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]
+      }
+    }
+  })
+}
 
-	return error;
-};
+function slice (args) {
+  var length = args.length
+  var array = []
 
-module.exports = makeError;
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
 
 
 /***/ }),
-/* 276 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(243);
+/* 224 */
+/***/ (function(module, exports) {
 
-var _signals=__webpack_require__(277);
-var _realtime=__webpack_require__(279);
+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
+  }
+}
 
 
+/***/ }),
+/* 225 */,
+/* 226 */,
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const getSignalsByName=function(){
-const signals=(0,_signals.getSignals)();
-return signals.reduce(getSignalByName,{});
-};
+// @flow
 
-const getSignalByName=function(
-signalByNameMemo,
-{name,number,description,supported,action,forced,standard})
-{
-return{
-...signalByNameMemo,
-[name]:{name,number,description,supported,action,forced,standard}};
+/*::
+declare var __webpack_require__: mixed;
+*/
 
-};
+module.exports = typeof __webpack_require__ !== "undefined";
 
-const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
 
+/***/ }),
+/* 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;
 
-const getSignalsByNumber=function(){
-const signals=(0,_signals.getSignals)();
-const length=_realtime.SIGRTMAX+1;
-const signalsA=Array.from({length},(value,number)=>
-getSignalByNumber(number,signals));
+/**
+ * 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
+ */
 
-return Object.assign({},...signalsA);
+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)
+  );
 };
 
-const getSignalByNumber=function(number,signals){
-const signal=findSignalByNumber(number,signals);
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
 
-if(signal===undefined){
-return{};
+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;
+  }
 }
 
-const{name,description,supported,action,forced,standard}=signal;
-return{
-[number]:{
-name,
-number,
-description,
-supported,
-action,
-forced,
-standard}};
-
+/**
+ * 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';
+}
 
-const findSignalByNumber=function(number,signals){
-const signal=signals.find(({name})=>_os.constants.signals[name]===number);
+/**
+ * Pluralization helper.
+ */
 
-if(signal!==undefined){
-return signal;
+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';
 }
 
-return signals.find(signalA=>signalA.number===number);
-};
-
-const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
-//# sourceMappingURL=main.js.map
 
 /***/ }),
-/* 277 */
+/* 230 */,
+/* 231 */,
+/* 232 */,
+/* 233 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(243);
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
-var _core=__webpack_require__(278);
-var _realtime=__webpack_require__(279);
+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)
 
+var defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
+// for EMFILE handling
+var timeout = 0
 
-const getSignals=function(){
-const realtimeSignals=(0,_realtime.getRealtimeSignals)();
-const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
-return signals;
-};exports.getSignals=getSignals;
+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 rimraf (p, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
+  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)
 
+  var busyTries = 0
+  var errState = null
+  var n = 0
 
-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
-
-/***/ }),
-/* 278 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0;
+  options.lstat(p, function (er, stat) {
+    if (!er)
+      return afterGlob(null, [p])
 
-const SIGNALS=[
-{
-name:"SIGHUP",
-number:1,
-action:"terminate",
-description:"Terminal closed",
-standard:"posix"},
+    glob(p, options.glob, afterGlob)
+  })
 
-{
-name:"SIGINT",
-number:2,
-action:"terminate",
-description:"User interruption with CTRL-C",
-standard:"ansi"},
+  function next (er) {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-{
-name:"SIGQUIT",
-number:3,
-action:"core",
-description:"User interruption with CTRL-\\",
-standard:"posix"},
+  function afterGlob (er, results) {
+    if (er)
+      return cb(er)
 
-{
-name:"SIGILL",
-number:4,
-action:"core",
-description:"Invalid machine instruction",
-standard:"ansi"},
+    n = results.length
+    if (n === 0)
+      return cb()
 
-{
-name:"SIGTRAP",
-number:5,
-action:"core",
-description:"Debugger breakpoint",
-standard:"posix"},
+    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)
+          }
 
-{
-name:"SIGABRT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"ansi"},
+          // 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 ++)
+          }
 
-{
-name:"SIGIOT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"bsd"},
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
-{
-name:"SIGBUS",
-number:7,
-action:"core",
-description:
-"Bus error due to misaligned, non-existing address or paging error",
-standard:"bsd"},
+        timeout = 0
+        next(er)
+      })
+    })
+  }
+}
 
-{
-name:"SIGEMT",
-number:7,
-action:"terminate",
-description:"Command should be emulated but is not implemented",
-standard:"other"},
+// 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')
 
-{
-name:"SIGFPE",
-number:8,
-action:"core",
-description:"Floating point arithmetic error",
-standard:"ansi"},
+  // 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)
 
-{
-name:"SIGKILL",
-number:9,
-action:"terminate",
-description:"Forced termination",
-standard:"posix",
-forced:true},
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
 
-{
-name:"SIGUSR1",
-number:10,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
 
-{
-name:"SIGSEGV",
-number:11,
-action:"core",
-description:"Segmentation fault",
-standard:"ansi"},
+    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)
+    })
+  })
+}
 
-{
-name:"SIGUSR2",
-number:12,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+function fixWinEPERM (p, options, er, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+  if (er)
+    assert(er instanceof Error)
 
-{
-name:"SIGPIPE",
-number:13,
-action:"terminate",
-description:"Broken pipe or socket",
-standard:"posix"},
+  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)
+      })
+  })
+}
 
-{
-name:"SIGALRM",
-number:14,
-action:"terminate",
-description:"Timeout or timer",
-standard:"posix"},
+function fixWinEPERMSync (p, options, er) {
+  assert(p)
+  assert(options)
+  if (er)
+    assert(er instanceof Error)
 
-{
-name:"SIGTERM",
-number:15,
-action:"terminate",
-description:"Termination",
-standard:"ansi"},
+  try {
+    options.chmodSync(p, _0666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-{
-name:"SIGSTKFLT",
-number:16,
-action:"terminate",
-description:"Stack is empty or overflowed",
-standard:"other"},
+  try {
+    var stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-{
-name:"SIGCHLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"posix"},
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
 
-{
-name:"SIGCLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"other"},
+function rmdir (p, options, originalEr, cb) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+  assert(typeof cb === 'function')
 
-{
-name:"SIGCONT",
-number:18,
-action:"unpause",
-description:"Unpaused",
-standard:"posix",
-forced:true},
+  // 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)
+  })
+}
 
-{
-name:"SIGSTOP",
-number:19,
-action:"pause",
-description:"Paused",
-standard:"posix",
-forced:true},
+function rmkids(p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-{
-name:"SIGTSTP",
-number:20,
-action:"pause",
-description:"Paused using CTRL-Z or \"suspend\"",
-standard:"posix"},
+  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)
+      })
+    })
+  })
+}
 
-{
-name:"SIGTTIN",
-number:21,
-action:"pause",
-description:"Background process cannot read terminal input",
-standard:"posix"},
+// 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)
 
-{
-name:"SIGBREAK",
-number:21,
-action:"terminate",
-description:"User interruption with CTRL-BREAK",
-standard:"other"},
+  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')
 
-{
-name:"SIGTTOU",
-number:22,
-action:"pause",
-description:"Background process cannot write to terminal output",
-standard:"posix"},
+  var results
 
-{
-name:"SIGURG",
-number:23,
-action:"ignore",
-description:"Socket received out-of-band data",
-standard:"bsd"},
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
+  }
 
-{
-name:"SIGXCPU",
-number:24,
-action:"core",
-description:"Process timed out",
-standard:"bsd"},
+  if (!results.length)
+    return
 
-{
-name:"SIGXFSZ",
-number:25,
-action:"core",
-description:"File too big",
-standard:"bsd"},
+  for (var i = 0; i < results.length; i++) {
+    var p = results[i]
 
-{
-name:"SIGVTALRM",
-number:26,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+    try {
+      var st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
 
-{
-name:"SIGPROF",
-number:27,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
+    }
 
-{
-name:"SIGWINCH",
-number:28,
-action:"ignore",
-description:"Terminal window size changed",
-standard:"bsd"},
+    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
 
-{
-name:"SIGIO",
-number:29,
-action:"terminate",
-description:"I/O is available",
-standard:"other"},
+      rmdirSync(p, options, er)
+    }
+  }
+}
 
-{
-name:"SIGPOLL",
-number:29,
-action:"terminate",
-description:"Watched event",
-standard:"other"},
+function rmdirSync (p, options, originalEr) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
 
-{
-name:"SIGINFO",
-number:29,
-action:"ignore",
-description:"Request for process information",
-standard:"other"},
+  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)
+  }
+}
 
-{
-name:"SIGPWR",
-number:30,
-action:"terminate",
-description:"Device running out of power",
-standard:"systemv"},
+function rmkidsSync (p, options) {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(function (f) {
+    rimrafSync(path.join(p, f), options)
+  })
 
-{
-name:"SIGSYS",
-number:31,
-action:"core",
-description:"Invalid system call",
-standard:"other"},
+  // 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)
+}
 
-{
-name:"SIGUNUSED",
-number:31,
-action:"terminate",
-description:"Invalid system call",
-standard:"other"}];exports.SIGNALS=SIGNALS;
-//# sourceMappingURL=core.js.map
 
 /***/ }),
-/* 279 */
-/***/ (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
-
-/***/ }),
-/* 280 */
+/* 234 */,
+/* 235 */,
+/* 236 */,
+/* 237 */,
+/* 238 */,
+/* 239 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const aliases = ['stdin', 'stdout', 'stderr'];
+var hasFlag = __webpack_require__(221);
 
-const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
+var support = function (level) {
+	if (level === 0) {
+		return false;
+	}
 
-const normalizeStdio = opts => {
-	if (!opts) {
-		return;
+	return {
+		level: level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+};
+
+var supportLevel = (function () {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
+		return 0;
 	}
 
-	const {stdio} = opts;
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-	if (stdio === undefined) {
-		return aliases.map(alias => opts[alias]);
+	if (hasFlag('color=256')) {
+		return 2;
 	}
 
-	if (hasAlias(opts)) {
-		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
+		return 1;
 	}
 
-	if (typeof stdio === 'string') {
-		return stdio;
+	if (process.stdout && !process.stdout.isTTY) {
+		return 0;
 	}
 
-	if (!Array.isArray(stdio)) {
-		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	if (process.platform === 'win32') {
+		return 1;
 	}
 
-	const length = Math.max(stdio.length, aliases.length);
-	return Array.from({length}, (value, index) => stdio[index]);
-};
+	if ('CI' in process.env) {
+		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
+			return 1;
+		}
 
-module.exports = normalizeStdio;
+		return 0;
+	}
 
-// `ipc` is pushed unless it is already present
-module.exports.node = opts => {
-	const stdio = normalizeStdio(opts);
+	if ('TEAMCITY_VERSION' in process.env) {
+		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
+	}
 
-	if (stdio === 'ipc') {
-		return 'ipc';
+	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
+		return 2;
 	}
 
-	if (stdio === undefined || typeof stdio === 'string') {
-		return [stdio, stdio, stdio, 'ipc'];
+	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+		return 1;
 	}
 
-	if (stdio.includes('ipc')) {
-		return stdio;
+	if ('COLORTERM' in process.env) {
+		return 1;
 	}
 
-	return [...stdio, 'ipc'];
-};
+	if (process.env.TERM === 'dumb') {
+		return 0;
+	}
+
+	return 0;
+})();
+
+if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
+	supportLevel = 1;
+}
+
+module.exports = process && support(supportLevel);
+
 
+/***/ })
+/******/ ]);
 
 /***/ }),
-/* 281 */
+
+/***/ "../../node_modules/ansi-regex/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const os = __webpack_require__(243);
-const onExit = __webpack_require__(282);
 
-const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
+module.exports = ({onlyFirst = false} = {}) => {
+	const pattern = [
+		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
+	].join('|');
 
-// 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;
+	return new RegExp(pattern, onlyFirst ? undefined : 'g');
 };
 
-const setKillTimeout = (kill, signal, options, killResult) => {
-	if (!shouldForceKill(signal, options, killResult)) {
-		return;
-	}
 
-	const timeout = getForceKillAfterTimeout(options);
-	const t = setTimeout(() => {
-		kill('SIGKILL');
-	}, timeout);
+/***/ }),
 
-	// Guarded because there's no `.unref()` when `execa` is used in the renderer
-	// process in Electron. This cannot be tested since we don't run tests in
-	// Electron.
-	// istanbul ignore else
-	if (t.unref) {
-		t.unref();
-	}
+/***/ "../../node_modules/ansi-styles/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+
+const wrapAnsi16 = (fn, offset) => (...args) => {
+	const code = fn(...args);
+	return `\u001B[${code + offset}m`;
 };
 
-const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
-	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
+const wrapAnsi256 = (fn, offset) => (...args) => {
+	const code = fn(...args);
+	return `\u001B[${38 + offset};5;${code}m`;
 };
 
-const isSigterm = signal => {
-	return signal === os.constants.signals.SIGTERM ||
-		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
+const wrapAnsi16m = (fn, offset) => (...args) => {
+	const rgb = fn(...args);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
 };
 
-const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
-	if (forceKillAfterTimeout === true) {
-		return DEFAULT_FORCE_KILL_TIMEOUT;
-	}
+const ansi2ansi = n => n;
+const rgb2rgb = (r, g, b) => [r, g, b];
 
-	if (!Number.isFinite(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
-		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
-	}
+const setLazyProperty = (object, property, get) => {
+	Object.defineProperty(object, property, {
+		get: () => {
+			const value = get();
 
-	return forceKillAfterTimeout;
+			Object.defineProperty(object, property, {
+				value,
+				enumerable: true,
+				configurable: true
+			});
+
+			return value;
+		},
+		enumerable: true,
+		configurable: true
+	});
 };
 
-// `childProcess.cancel()`
-const spawnedCancel = (spawned, context) => {
-	const killResult = spawned.kill();
+/** @type {typeof import('color-convert')} */
+let colorConvert;
+const makeDynamicStyles = (wrap, targetSpace, identity, isBackground) => {
+	if (colorConvert === undefined) {
+		colorConvert = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/index.js");
+	}
 
-	if (killResult) {
-		context.isCanceled = true;
+	const offset = isBackground ? 10 : 0;
+	const styles = {};
+
+	for (const [sourceSpace, suite] of Object.entries(colorConvert)) {
+		const name = sourceSpace === 'ansi16' ? 'ansi' : sourceSpace;
+		if (sourceSpace === targetSpace) {
+			styles[name] = wrap(identity, offset);
+		} else if (typeof suite === 'object') {
+			styles[name] = wrap(suite[targetSpace], offset);
+		}
 	}
-};
 
-const timeoutKill = (spawned, signal, reject) => {
-	spawned.kill(signal);
-	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
+	return styles;
 };
 
-// `timeout` option handling
-const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
-	if (timeout === 0 || timeout === undefined) {
-		return spawnedPromise;
-	}
+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],
 
-	if (!Number.isFinite(timeout) || timeout < 0) {
-		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
-	}
+			// Bright color
+			blackBright: [90, 39],
+			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],
 
-	let timeoutId;
-	const timeoutPromise = new Promise((resolve, reject) => {
-		timeoutId = setTimeout(() => {
-			timeoutKill(spawned, killSignal, reject);
-		}, timeout);
-	});
+			// 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]
+		}
+	};
 
-	const safeSpawnedPromise = spawnedPromise.finally(() => {
-		clearTimeout(timeoutId);
-	});
+	// Alias bright black as gray (and grey)
+	styles.color.gray = styles.color.blackBright;
+	styles.bgColor.bgGray = styles.bgColor.bgBlackBright;
+	styles.color.grey = styles.color.blackBright;
+	styles.bgColor.bgGrey = styles.bgColor.bgBlackBright;
 
-	return Promise.race([timeoutPromise, safeSpawnedPromise]);
-};
+	for (const [groupName, group] of Object.entries(styles)) {
+		for (const [styleName, style] of Object.entries(group)) {
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
-// `cleanup` option handling
-const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
-	if (!cleanup || detached) {
-		return timedPromise;
+			group[styleName] = styles[styleName];
+
+			codes.set(style[0], style[1]);
+		}
+
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
 	}
 
-	const removeExitHandler = onExit(() => {
-		spawned.kill();
+	Object.defineProperty(styles, 'codes', {
+		value: codes,
+		enumerable: false
 	});
 
-	return timedPromise.finally(() => {
-		removeExitHandler();
-	});
-};
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-module.exports = {
-	spawnedKill,
-	spawnedCancel,
-	setupTimeout,
-	setExitHandler
-};
+	setLazyProperty(styles.color, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, false));
+	setLazyProperty(styles.color, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, false));
+	setLazyProperty(styles.color, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, false));
+	setLazyProperty(styles.bgColor, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, true));
+	setLazyProperty(styles.bgColor, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, true));
+	setLazyProperty(styles.bgColor, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, true));
+
+	return styles;
+}
+
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
 
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
 /***/ }),
-/* 282 */
+
+/***/ "../../node_modules/ansi-styles/node_modules/color-convert/conversions.js":
 /***/ (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.
-// grab a reference to node's real process object right away
-var process = global.process
+/* MIT license */
+/* eslint-disable no-mixed-operators */
+const cssKeywords = __webpack_require__("../../node_modules/color-name/index.js");
 
-const processOk = function (process) {
-  return process &&
-    typeof process === 'object' &&
-    typeof process.removeListener === 'function' &&
-    typeof process.emit === 'function' &&
-    typeof process.reallyExit === 'function' &&
-    typeof process.listeners === 'function' &&
-    typeof process.kill === 'function' &&
-    typeof process.pid === 'number' &&
-    typeof process.on === 'function'
+// NOTE: conversions should only return primitive values (i.e. arrays, or
+//       values that give correct `typeof` results).
+//       do not use box values types (i.e. Number(), String(), etc.)
+
+const reverseKeywords = {};
+for (const key of Object.keys(cssKeywords)) {
+	reverseKeywords[cssKeywords[key]] = key;
 }
 
-// some kind of non-node environment, just no-op
-/* istanbul ignore if */
-if (!processOk(process)) {
-  module.exports = function () {
-    return function () {}
-  }
-} else {
-  var assert = __webpack_require__(283)
-  var signals = __webpack_require__(284)
-  var isWin = /^win/i.test(process.platform)
+const convert = {
+	rgb: {channels: 3, labels: 'rgb'},
+	hsl: {channels: 3, labels: 'hsl'},
+	hsv: {channels: 3, labels: 'hsv'},
+	hwb: {channels: 3, labels: 'hwb'},
+	cmyk: {channels: 4, labels: 'cmyk'},
+	xyz: {channels: 3, labels: 'xyz'},
+	lab: {channels: 3, labels: 'lab'},
+	lch: {channels: 3, labels: 'lch'},
+	hex: {channels: 1, labels: ['hex']},
+	keyword: {channels: 1, labels: ['keyword']},
+	ansi16: {channels: 1, labels: ['ansi16']},
+	ansi256: {channels: 1, labels: ['ansi256']},
+	hcg: {channels: 3, labels: ['h', 'c', 'g']},
+	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
+	gray: {channels: 1, labels: ['gray']}
+};
 
-  var EE = __webpack_require__(285)
-  /* istanbul ignore if */
-  if (typeof EE !== 'function') {
-    EE = EE.EventEmitter
-  }
+module.exports = convert;
 
-  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 = {}
-  }
+// Hide .channels and .labels properties
+for (const model of Object.keys(convert)) {
+	if (!('channels' in convert[model])) {
+		throw new Error('missing channels property: ' + model);
+	}
 
-  // 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
-  }
+	if (!('labels' in convert[model])) {
+		throw new Error('missing channel labels property: ' + model);
+	}
 
-  module.exports = function (cb, opts) {
-    /* istanbul ignore if */
-    if (!processOk(global.process)) {
-      return function () {}
-    }
-    assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+	if (convert[model].labels.length !== convert[model].channels) {
+		throw new Error('channel and label counts mismatch: ' + model);
+	}
 
-    if (loaded === false) {
-      load()
-    }
+	const {channels, labels} = convert[model];
+	delete convert[model].channels;
+	delete convert[model].labels;
+	Object.defineProperty(convert[model], 'channels', {value: channels});
+	Object.defineProperty(convert[model], 'labels', {value: labels});
+}
 
-    var ev = 'exit'
-    if (opts && opts.alwaysLast) {
-      ev = 'afterexit'
-    }
+convert.rgb.hsl = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
+	const min = Math.min(r, g, b);
+	const max = Math.max(r, g, b);
+	const delta = max - min;
+	let h;
+	let s;
 
-    var remove = function () {
-      emitter.removeListener(ev, cb)
-      if (emitter.listeners('exit').length === 0 &&
-          emitter.listeners('afterexit').length === 0) {
-        unload()
-      }
-    }
-    emitter.on(ev, cb)
+	if (max === min) {
+		h = 0;
+	} else if (r === max) {
+		h = (g - b) / delta;
+	} else if (g === max) {
+		h = 2 + (b - r) / delta;
+	} else if (b === max) {
+		h = 4 + (r - g) / delta;
+	}
 
-    return remove
-  }
+	h = Math.min(h * 60, 360);
 
-  var unload = function unload () {
-    if (!loaded || !processOk(global.process)) {
-      return
-    }
-    loaded = false
+	if (h < 0) {
+		h += 360;
+	}
 
-    signals.forEach(function (sig) {
-      try {
-        process.removeListener(sig, sigListeners[sig])
-      } catch (er) {}
-    })
-    process.emit = originalProcessEmit
-    process.reallyExit = originalProcessReallyExit
-    emitter.count -= 1
-  }
-  module.exports.unload = unload
+	const l = (min + max) / 2;
 
-  var emit = function emit (event, code, signal) {
-    /* istanbul ignore if */
-    if (emitter.emitted[event]) {
-      return
-    }
-    emitter.emitted[event] = true
-    emitter.emit(event, code, signal)
-  }
+	if (max === min) {
+		s = 0;
+	} else if (l <= 0.5) {
+		s = delta / (max + min);
+	} else {
+		s = delta / (2 - max - min);
+	}
 
-  // { <signal>: <listener fn>, ... }
-  var sigListeners = {}
-  signals.forEach(function (sig) {
-    sigListeners[sig] = function listener () {
-      /* istanbul ignore if */
-      if (!processOk(global.process)) {
-        return
-      }
-      // 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 */
-        if (isWin && sig === 'SIGHUP') {
-          // "SIGHUP" throws an `ENOSYS` error on Windows,
-          // so use a supported signal instead
-          sig = 'SIGINT'
-        }
-        /* istanbul ignore next */
-        process.kill(process.pid, sig)
-      }
-    }
-  })
-
-  module.exports.signals = function () {
-    return signals
-  }
-
-  var loaded = false
+	return [h, s * 100, l * 100];
+};
 
-  var load = function load () {
-    if (loaded || !processOk(global.process)) {
-      return
-    }
-    loaded = true
+convert.rgb.hsv = function (rgb) {
+	let rdif;
+	let gdif;
+	let bdif;
+	let h;
+	let s;
 
-    // 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
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
+	const v = Math.max(r, g, b);
+	const diff = v - Math.min(r, g, b);
+	const diffc = function (c) {
+		return (v - c) / 6 / diff + 1 / 2;
+	};
 
-    signals = signals.filter(function (sig) {
-      try {
-        process.on(sig, sigListeners[sig])
-        return true
-      } catch (er) {
-        return false
-      }
-    })
+	if (diff === 0) {
+		h = 0;
+		s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
 
-    process.emit = processEmit
-    process.reallyExit = processReallyExit
-  }
-  module.exports.load = load
+		if (r === v) {
+			h = bdif - gdif;
+		} else if (g === v) {
+			h = (1 / 3) + rdif - bdif;
+		} else if (b === v) {
+			h = (2 / 3) + gdif - rdif;
+		}
 
-  var originalProcessReallyExit = process.reallyExit
-  var processReallyExit = function processReallyExit (code) {
-    /* istanbul ignore if */
-    if (!processOk(global.process)) {
-      return
-    }
-    process.exitCode = code || /* istanbul ignore next */ 0
-    emit('exit', process.exitCode, null)
-    /* istanbul ignore next */
-    emit('afterexit', process.exitCode, null)
-    /* istanbul ignore next */
-    originalProcessReallyExit.call(process, process.exitCode)
-  }
+		if (h < 0) {
+			h += 1;
+		} else if (h > 1) {
+			h -= 1;
+		}
+	}
 
-  var originalProcessEmit = process.emit
-  var processEmit = function processEmit (ev, arg) {
-    if (ev === 'exit' && processOk(global.process)) {
-      /* istanbul ignore else */
-      if (arg !== undefined) {
-        process.exitCode = arg
-      }
-      var ret = originalProcessEmit.apply(this, arguments)
-      /* istanbul ignore next */
-      emit('exit', process.exitCode, null)
-      /* istanbul ignore next */
-      emit('afterexit', process.exitCode, null)
-      /* istanbul ignore next */
-      return ret
-    } else {
-      return originalProcessEmit.apply(this, arguments)
-    }
-  }
-}
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
+};
 
+convert.rgb.hwb = function (rgb) {
+	const r = rgb[0];
+	const g = rgb[1];
+	let b = rgb[2];
+	const h = convert.rgb.hsl(rgb)[0];
+	const w = 1 / 255 * Math.min(r, Math.min(g, b));
 
-/***/ }),
-/* 283 */
-/***/ (function(module, exports) {
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
 
-module.exports = require("assert");
+	return [h, w * 100, b * 100];
+};
 
-/***/ }),
-/* 284 */
-/***/ (function(module, exports) {
+convert.rgb.cmyk = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
 
-// 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'
-]
+	const k = Math.min(1 - r, 1 - g, 1 - b);
+	const c = (1 - r - k) / (1 - k) || 0;
+	const m = (1 - g - k) / (1 - k) || 0;
+	const y = (1 - b - k) / (1 - k) || 0;
 
-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 [c * 100, m * 100, y * 100, k * 100];
+};
 
-if (process.platform === 'linux') {
-  module.exports.push(
-    'SIGIO',
-    'SIGPOLL',
-    'SIGPWR',
-    'SIGSTKFLT',
-    'SIGUNUSED'
-  )
+function comparativeDistance(x, y) {
+	/*
+		See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
+	*/
+	return (
+		((x[0] - y[0]) ** 2) +
+		((x[1] - y[1]) ** 2) +
+		((x[2] - y[2]) ** 2)
+	);
 }
 
+convert.rgb.keyword = function (rgb) {
+	const reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
+	}
 
-/***/ }),
-/* 285 */
-/***/ (function(module, exports) {
-
-module.exports = require("events");
-
-/***/ }),
-/* 286 */
-/***/ (function(module, exports, __webpack_require__) {
+	let currentClosestDistance = Infinity;
+	let currentClosestKeyword;
 
-"use strict";
+	for (const keyword of Object.keys(cssKeywords)) {
+		const value = cssKeywords[keyword];
 
-const isStream = __webpack_require__(287);
-const getStream = __webpack_require__(288);
-const mergeStream = __webpack_require__(295);
+		// Compute comparative distance
+		const distance = comparativeDistance(rgb, value);
 
-// `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;
+		// Check if its less, if so set as closest
+		if (distance < currentClosestDistance) {
+			currentClosestDistance = distance;
+			currentClosestKeyword = keyword;
+		}
 	}
 
-	if (isStream(input)) {
-		input.pipe(spawned.stdin);
-	} else {
-		spawned.stdin.end(input);
-	}
+	return currentClosestKeyword;
 };
 
-// `all` interleaves `stdout` and `stderr`
-const makeAllStream = (spawned, {all}) => {
-	if (!all || (!spawned.stdout && !spawned.stderr)) {
-		return;
-	}
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
 
-	const mixed = mergeStream();
+convert.rgb.xyz = function (rgb) {
+	let r = rgb[0] / 255;
+	let g = rgb[1] / 255;
+	let b = rgb[2] / 255;
 
-	if (spawned.stdout) {
-		mixed.add(spawned.stdout);
-	}
+	// Assume sRGB
+	r = r > 0.04045 ? (((r + 0.055) / 1.055) ** 2.4) : (r / 12.92);
+	g = g > 0.04045 ? (((g + 0.055) / 1.055) ** 2.4) : (g / 12.92);
+	b = b > 0.04045 ? (((b + 0.055) / 1.055) ** 2.4) : (b / 12.92);
 
-	if (spawned.stderr) {
-		mixed.add(spawned.stderr);
-	}
+	const x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
+	const y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
+	const z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
 
-	return mixed;
+	return [x * 100, y * 100, z * 100];
 };
 
-// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
-const getBufferedData = async (stream, streamPromise) => {
-	if (!stream) {
-		return;
-	}
-
-	stream.destroy();
+convert.rgb.lab = function (rgb) {
+	const xyz = convert.rgb.xyz(rgb);
+	let x = xyz[0];
+	let y = xyz[1];
+	let z = xyz[2];
 
-	try {
-		return await streamPromise;
-	} catch (error) {
-		return error.bufferedData;
-	}
-};
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
-	if (!stream || !buffer) {
-		return;
-	}
+	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
 
-	if (encoding) {
-		return getStream(stream, {encoding, maxBuffer});
-	}
+	const l = (116 * y) - 16;
+	const a = 500 * (x - y);
+	const b = 200 * (y - z);
 
-	return getStream.buffer(stream, {maxBuffer});
+	return [l, a, b];
 };
 
-// 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});
+convert.hsl.rgb = function (hsl) {
+	const h = hsl[0] / 360;
+	const s = hsl[1] / 100;
+	const l = hsl[2] / 100;
+	let t2;
+	let t3;
+	let val;
 
-	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)
-		]);
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
 	}
-};
 
-const validateInputSync = ({input}) => {
-	if (isStream(input)) {
-		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
 	}
-};
 
-module.exports = {
-	handleInput,
-	makeAllStream,
-	getSpawnedResult,
-	validateInputSync
-};
+	const t1 = 2 * l - t2;
 
+	const rgb = [0, 0, 0];
+	for (let i = 0; i < 3; i++) {
+		t3 = h + 1 / 3 * -(i - 1);
+		if (t3 < 0) {
+			t3++;
+		}
 
+		if (t3 > 1) {
+			t3--;
+		}
 
-/***/ }),
-/* 287 */
-/***/ (function(module, exports, __webpack_require__) {
+		if (6 * t3 < 1) {
+			val = t1 + (t2 - t1) * 6 * t3;
+		} else if (2 * t3 < 1) {
+			val = t2;
+		} else if (3 * t3 < 2) {
+			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+		} else {
+			val = t1;
+		}
 
-"use strict";
+		rgb[i] = val * 255;
+	}
 
+	return rgb;
+};
 
-const isStream = stream =>
-	stream !== null &&
-	typeof stream === 'object' &&
-	typeof stream.pipe === 'function';
+convert.hsl.hsv = function (hsl) {
+	const h = hsl[0];
+	let s = hsl[1] / 100;
+	let l = hsl[2] / 100;
+	let smin = s;
+	const lmin = Math.max(l, 0.01);
 
-isStream.writable = stream =>
-	isStream(stream) &&
-	stream.writable !== false &&
-	typeof stream._write === 'function' &&
-	typeof stream._writableState === 'object';
+	l *= 2;
+	s *= (l <= 1) ? l : 2 - l;
+	smin *= lmin <= 1 ? lmin : 2 - lmin;
+	const v = (l + s) / 2;
+	const sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
 
-isStream.readable = stream =>
-	isStream(stream) &&
-	stream.readable !== false &&
-	typeof stream._read === 'function' &&
-	typeof stream._readableState === 'object';
+	return [h, sv * 100, v * 100];
+};
 
-isStream.duplex = stream =>
-	isStream.writable(stream) &&
-	isStream.readable(stream);
+convert.hsv.rgb = function (hsv) {
+	const h = hsv[0] / 60;
+	const s = hsv[1] / 100;
+	let v = hsv[2] / 100;
+	const hi = Math.floor(h) % 6;
 
-isStream.transform = stream =>
-	isStream.duplex(stream) &&
-	typeof stream._transform === 'function' &&
-	typeof stream._transformState === 'object';
+	const f = h - Math.floor(h);
+	const p = 255 * v * (1 - s);
+	const q = 255 * v * (1 - (s * f));
+	const t = 255 * v * (1 - (s * (1 - f)));
+	v *= 255;
 
-module.exports = isStream;
+	switch (hi) {
+		case 0:
+			return [v, t, p];
+		case 1:
+			return [q, v, p];
+		case 2:
+			return [p, v, t];
+		case 3:
+			return [p, q, v];
+		case 4:
+			return [t, p, v];
+		case 5:
+			return [v, p, q];
+	}
+};
 
+convert.hsv.hsl = function (hsv) {
+	const h = hsv[0];
+	const s = hsv[1] / 100;
+	const v = hsv[2] / 100;
+	const vmin = Math.max(v, 0.01);
+	let sl;
+	let l;
 
-/***/ }),
-/* 288 */
-/***/ (function(module, exports, __webpack_require__) {
+	l = (2 - s) * v;
+	const lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
 
-"use strict";
+	return [h, sl * 100, l * 100];
+};
 
-const pump = __webpack_require__(289);
-const bufferStream = __webpack_require__(293);
+// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
+convert.hwb.rgb = function (hwb) {
+	const h = hwb[0] / 360;
+	let wh = hwb[1] / 100;
+	let bl = hwb[2] / 100;
+	const ratio = wh + bl;
+	let f;
 
-class MaxBufferError extends Error {
-	constructor() {
-		super('maxBuffer exceeded');
-		this.name = 'MaxBufferError';
+	// Wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
 	}
-}
 
-async function getStream(inputStream, options) {
-	if (!inputStream) {
-		return Promise.reject(new Error('Expected a stream'));
+	const i = Math.floor(6 * h);
+	const v = 1 - bl;
+	f = 6 * h - i;
+
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
 	}
 
-	options = {
-		maxBuffer: Infinity,
-		...options
-	};
+	const n = wh + f * (v - wh); // Linear interpolation
 
-	const {maxBuffer} = options;
+	let r;
+	let g;
+	let b;
+	/* eslint-disable max-statements-per-line,no-multi-spaces */
+	switch (i) {
+		default:
+		case 6:
+		case 0: r = v;  g = n;  b = wh; break;
+		case 1: r = n;  g = v;  b = wh; break;
+		case 2: r = wh; g = v;  b = n; break;
+		case 3: r = wh; g = n;  b = v; break;
+		case 4: r = n;  g = wh; b = v; break;
+		case 5: r = v;  g = wh; b = n; break;
+	}
+	/* eslint-enable max-statements-per-line,no-multi-spaces */
 
-	let stream;
-	await new Promise((resolve, reject) => {
-		const rejectPromise = error => {
-			if (error) { // A null check
-				error.bufferedData = stream.getBufferedValue();
-			}
+	return [r * 255, g * 255, b * 255];
+};
 
-			reject(error);
-		};
+convert.cmyk.rgb = function (cmyk) {
+	const c = cmyk[0] / 100;
+	const m = cmyk[1] / 100;
+	const y = cmyk[2] / 100;
+	const k = cmyk[3] / 100;
 
-		stream = pump(inputStream, bufferStream(options), error => {
-			if (error) {
-				rejectPromise(error);
-				return;
-			}
+	const r = 1 - Math.min(1, c * (1 - k) + k);
+	const g = 1 - Math.min(1, m * (1 - k) + k);
+	const b = 1 - Math.min(1, y * (1 - k) + k);
 
-			resolve();
-		});
+	return [r * 255, g * 255, b * 255];
+};
 
-		stream.on('data', () => {
-			if (stream.getBufferedLength() > maxBuffer) {
-				rejectPromise(new MaxBufferError());
-			}
-		});
-	});
+convert.xyz.rgb = function (xyz) {
+	const x = xyz[0] / 100;
+	const y = xyz[1] / 100;
+	const z = xyz[2] / 100;
+	let r;
+	let g;
+	let b;
 
-	return stream.getBufferedValue();
-}
+	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
+	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
+	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
 
-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;
+	// Assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
+		: r * 12.92;
 
+	g = g > 0.0031308
+		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
+		: g * 12.92;
 
-/***/ }),
-/* 289 */
-/***/ (function(module, exports, __webpack_require__) {
+	b = b > 0.0031308
+		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
+		: b * 12.92;
 
-var once = __webpack_require__(290)
-var eos = __webpack_require__(292)
-var fs = __webpack_require__(253) // we only need fs to get the ReadStream and WriteStream prototypes
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
 
-var noop = function () {}
-var ancient = /^v?\.0/.test(process.version)
+	return [r * 255, g * 255, b * 255];
+};
 
-var isFn = function (fn) {
-  return typeof fn === 'function'
-}
+convert.xyz.lab = function (xyz) {
+	let x = xyz[0];
+	let y = xyz[1];
+	let z = xyz[2];
 
-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)
-}
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-var isRequest = function (stream) {
-  return stream.setHeader && isFn(stream.abort)
-}
+	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
 
-var destroyer = function (stream, reading, writing, callback) {
-  callback = once(callback)
+	const l = (116 * y) - 16;
+	const a = 500 * (x - y);
+	const b = 200 * (y - z);
 
-  var closed = false
-  stream.on('close', function () {
-    closed = true
-  })
+	return [l, a, b];
+};
 
-  eos(stream, {readable: reading, writable: writing}, function (err) {
-    if (err) return callback(err)
-    closed = true
-    callback()
-  })
+convert.lab.xyz = function (lab) {
+	const l = lab[0];
+	const a = lab[1];
+	const b = lab[2];
+	let x;
+	let y;
+	let z;
 
-  var destroyed = false
-  return function (err) {
-    if (closed) return
-    if (destroyed) return
-    destroyed = true
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
 
-    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
+	const y2 = y ** 3;
+	const x2 = x ** 3;
+	const z2 = z ** 3;
+	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
+	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
+	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
 
-    if (isFn(stream.destroy)) return stream.destroy()
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
 
-    callback(err || new Error('stream was destroyed'))
-  }
-}
+	return [x, y, z];
+};
 
-var call = function (fn) {
-  fn()
-}
+convert.lab.lch = function (lab) {
+	const l = lab[0];
+	const a = lab[1];
+	const b = lab[2];
+	let h;
 
-var pipe = function (from, to) {
-  return from.pipe(to)
-}
+	const hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
 
-var pump = function () {
-  var streams = Array.prototype.slice.call(arguments)
-  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+	if (h < 0) {
+		h += 360;
+	}
 
-  if (Array.isArray(streams[0])) streams = streams[0]
-  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
+	const c = Math.sqrt(a * a + b * b);
 
-  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 [l, c, h];
+};
 
-  return streams.reduce(pipe)
-}
+convert.lch.lab = function (lch) {
+	const l = lch[0];
+	const c = lch[1];
+	const h = lch[2];
 
-module.exports = pump
+	const hr = h / 360 * 2 * Math.PI;
+	const a = c * Math.cos(hr);
+	const b = c * Math.sin(hr);
 
+	return [l, a, b];
+};
 
-/***/ }),
-/* 290 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.rgb.ansi16 = function (args, saturation = null) {
+	const [r, g, b] = args;
+	let value = saturation === null ? convert.rgb.hsv(args)[2] : saturation; // Hsv -> ansi16 optimization
 
-var wrappy = __webpack_require__(291)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
+	value = Math.round(value / 50);
 
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
+	if (value === 0) {
+		return 30;
+	}
 
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
+	let ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
 
-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
-}
+	if (value === 2) {
+		ansi += 60;
+	}
 
-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
-}
+	return ansi;
+};
 
+convert.hsv.ansi16 = function (args) {
+	// Optimization here; we already know the value and don't need to get
+	// it converted for us.
+	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
+};
 
-/***/ }),
-/* 291 */
-/***/ (function(module, exports) {
+convert.rgb.ansi256 = function (args) {
+	const r = args[0];
+	const g = args[1];
+	const b = args[2];
 
-// 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)
+	// We use the extended greyscale palette here, with the exception of
+	// black and white. normal palette only has 4 greyscale shades.
+	if (r === g && g === b) {
+		if (r < 8) {
+			return 16;
+		}
 
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
+		if (r > 248) {
+			return 231;
+		}
 
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
+		return Math.round(((r - 8) / 247) * 24) + 232;
+	}
 
-  return wrapper
+	const ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
 
-  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
-  }
-}
+	return ansi;
+};
 
+convert.ansi16.rgb = function (args) {
+	let color = args % 10;
 
-/***/ }),
-/* 292 */
-/***/ (function(module, exports, __webpack_require__) {
+	// Handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
+		}
 
-var once = __webpack_require__(290);
+		color = color / 10.5 * 255;
 
-var noop = function() {};
+		return [color, color, color];
+	}
 
-var isRequest = function(stream) {
-	return stream.setHeader && typeof stream.abort === 'function';
-};
+	const mult = (~~(args > 50) + 1) * 0.5;
+	const r = ((color & 1) * mult) * 255;
+	const g = (((color >> 1) & 1) * mult) * 255;
+	const b = (((color >> 2) & 1) * mult) * 255;
 
-var isChildProcess = function(stream) {
-	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
+	return [r, g, b];
 };
 
-var eos = function(stream, opts, callback) {
-	if (typeof opts === 'function') return eos(stream, null, opts);
-	if (!opts) opts = {};
+convert.ansi256.rgb = function (args) {
+	// Handle greyscale
+	if (args >= 232) {
+		const c = (args - 232) * 10 + 8;
+		return [c, c, c];
+	}
 
-	callback = once(callback || noop);
+	args -= 16;
 
-	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 cancelled = false;
+	let rem;
+	const r = Math.floor(args / 36) / 5 * 255;
+	const g = Math.floor((rem = args % 36) / 6) / 5 * 255;
+	const b = (rem % 6) / 5 * 255;
 
-	var onlegacyfinish = function() {
-		if (!stream.writable) onfinish();
-	};
+	return [r, g, b];
+};
 
-	var onfinish = function() {
-		writable = false;
-		if (!readable) callback.call(stream);
-	};
+convert.rgb.hex = function (args) {
+	const integer = ((Math.round(args[0]) & 0xFF) << 16)
+		+ ((Math.round(args[1]) & 0xFF) << 8)
+		+ (Math.round(args[2]) & 0xFF);
 
-	var onend = function() {
-		readable = false;
-		if (!writable) callback.call(stream);
-	};
+	const string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-	var onexit = function(exitCode) {
-		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
-	};
+convert.hex.rgb = function (args) {
+	const match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
+	if (!match) {
+		return [0, 0, 0];
+	}
 
-	var onerror = function(err) {
-		callback.call(stream, err);
-	};
+	let colorString = match[0];
 
-	var onclose = function() {
-		process.nextTick(onclosenexttick);
-	};
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(char => {
+			return char + char;
+		}).join('');
+	}
 
-	var onclosenexttick = function() {
-		if (cancelled) return;
-		if (readable && !(rs && (rs.ended && !rs.destroyed))) return callback.call(stream, new Error('premature close'));
-		if (writable && !(ws && (ws.ended && !ws.destroyed))) return callback.call(stream, new Error('premature close'));
-	};
+	const integer = parseInt(colorString, 16);
+	const r = (integer >> 16) & 0xFF;
+	const g = (integer >> 8) & 0xFF;
+	const b = integer & 0xFF;
 
-	var onrequest = function() {
-		stream.req.on('finish', onfinish);
-	};
+	return [r, g, b];
+};
 
-	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);
+convert.rgb.hcg = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
+	const max = Math.max(Math.max(r, g), b);
+	const min = Math.min(Math.min(r, g), b);
+	const chroma = (max - min);
+	let grayscale;
+	let hue;
+
+	if (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
 	}
 
-	if (isChildProcess(stream)) stream.on('exit', onexit);
+	if (chroma <= 0) {
+		hue = 0;
+	} else
+	if (max === r) {
+		hue = ((g - b) / chroma) % 6;
+	} else
+	if (max === g) {
+		hue = 2 + (b - r) / chroma;
+	} else {
+		hue = 4 + (r - g) / chroma;
+	}
 
-	stream.on('end', onend);
-	stream.on('finish', onfinish);
-	if (opts.error !== false) stream.on('error', onerror);
-	stream.on('close', onclose);
+	hue /= 6;
+	hue %= 1;
 
-	return function() {
-		cancelled = true;
-		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);
-	};
+	return [hue * 360, chroma * 100, grayscale * 100];
 };
 
-module.exports = eos;
-
+convert.hsl.hcg = function (hsl) {
+	const s = hsl[1] / 100;
+	const l = hsl[2] / 100;
 
-/***/ }),
-/* 293 */
-/***/ (function(module, exports, __webpack_require__) {
+	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
 
-"use strict";
+	let f = 0;
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
+	}
 
-const {PassThrough: PassThroughStream} = __webpack_require__(294);
+	return [hsl[0], c * 100, f * 100];
+};
 
-module.exports = options => {
-	options = {...options};
+convert.hsv.hcg = function (hsv) {
+	const s = hsv[1] / 100;
+	const v = hsv[2] / 100;
 
-	const {array} = options;
-	let {encoding} = options;
-	const isBuffer = encoding === 'buffer';
-	let objectMode = false;
+	const c = s * v;
+	let f = 0;
 
-	if (array) {
-		objectMode = !(encoding || isBuffer);
-	} else {
-		encoding = encoding || 'utf8';
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
 	}
 
-	if (isBuffer) {
-		encoding = null;
-	}
+	return [hsv[0], c * 100, f * 100];
+};
 
-	const stream = new PassThroughStream({objectMode});
+convert.hcg.rgb = function (hcg) {
+	const h = hcg[0] / 360;
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-	if (encoding) {
-		stream.setEncoding(encoding);
+	if (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
 	}
 
-	let length = 0;
-	const chunks = [];
+	const pure = [0, 0, 0];
+	const hi = (h % 1) * 6;
+	const v = hi % 1;
+	const w = 1 - v;
+	let mg = 0;
 
-	stream.on('data', chunk => {
-		chunks.push(chunk);
+	/* eslint-disable max-statements-per-line */
+	switch (Math.floor(hi)) {
+		case 0:
+			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
+		case 1:
+			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
+		case 2:
+			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
+		case 3:
+			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
+		case 4:
+			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
+		default:
+			pure[0] = 1; pure[1] = 0; pure[2] = w;
+	}
+	/* eslint-enable max-statements-per-line */
 
-		if (objectMode) {
-			length = chunks.length;
-		} else {
-			length += chunk.length;
-		}
-	});
+	mg = (1.0 - c) * g;
 
-	stream.getBufferedValue = () => {
-		if (array) {
-			return chunks;
-		}
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
+};
 
-		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
-	};
+convert.hcg.hsv = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-	stream.getBufferedLength = () => length;
+	const v = c + g * (1.0 - c);
+	let f = 0;
 
-	return stream;
+	if (v > 0.0) {
+		f = c / v;
+	}
+
+	return [hcg[0], f * 100, v * 100];
 };
 
+convert.hcg.hsl = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
+
+	const l = g * (1.0 - c) + 0.5 * c;
+	let s = 0;
 
-/***/ }),
-/* 294 */
-/***/ (function(module, exports) {
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
+	}
 
-module.exports = require("stream");
+	return [hcg[0], s * 100, l * 100];
+};
 
-/***/ }),
-/* 295 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.hcg.hwb = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
+	const v = c + g * (1.0 - c);
+	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+};
 
-"use strict";
+convert.hwb.hcg = function (hwb) {
+	const w = hwb[1] / 100;
+	const b = hwb[2] / 100;
+	const v = 1 - b;
+	const c = v - w;
+	let g = 0;
+
+	if (c < 1) {
+		g = (v - c) / (1 - c);
+	}
 
+	return [hwb[0], c * 100, g * 100];
+};
 
-const { PassThrough } = __webpack_require__(294);
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
 
-module.exports = function (/*streams...*/) {
-  var sources = []
-  var output  = new PassThrough({objectMode: true})
+convert.rgb.apple = function (rgb) {
+	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+};
 
-  output.setMaxListeners(0)
+convert.gray.rgb = function (args) {
+	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+};
 
-  output.add = add
-  output.isEmpty = isEmpty
+convert.gray.hsl = function (args) {
+	return [0, 0, args[0]];
+};
 
-  output.on('unpipe', remove)
+convert.gray.hsv = convert.gray.hsl;
 
-  Array.prototype.slice.call(arguments).forEach(add)
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
+};
 
-  return output
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
 
-  function add (source) {
-    if (Array.isArray(source)) {
-      source.forEach(add)
-      return this
-    }
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
 
-    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
-  }
+convert.gray.hex = function (gray) {
+	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	const integer = (val << 16) + (val << 8) + val;
 
-  function isEmpty () {
-    return sources.length == 0;
-  }
+	const string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-  function remove (source) {
-    sources = sources.filter(function (it) { return it !== source })
-    if (!sources.length && output.readable) { output.end() }
-  }
-}
+convert.rgb.gray = function (rgb) {
+	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
 
 
 /***/ }),
-/* 296 */
+
+/***/ "../../node_modules/ansi-styles/node_modules/color-convert/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+const conversions = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/conversions.js");
+const route = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/route.js");
 
+const convert = {};
 
-const nativePromisePrototype = (async () => {})().constructor.prototype;
-const descriptors = ['then', 'catch', 'finally'].map(property => [
-	property,
-	Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)
-]);
+const models = Object.keys(conversions);
 
-// The return value is a mixin of `childProcess` and `Promise`
-const mergePromise = (spawned, promise) => {
-	for (const [property, descriptor] of descriptors) {
-		// Starting the main `promise` is deferred to avoid consuming streams
-		const value = typeof promise === 'function' ?
-			(...args) => Reflect.apply(descriptor.value, promise(), args) :
-			descriptor.value.bind(promise);
+function wrapRaw(fn) {
+	const wrappedFn = function (...args) {
+		const arg0 = args[0];
+		if (arg0 === undefined || arg0 === null) {
+			return arg0;
+		}
 
-		Reflect.defineProperty(spawned, property, {...descriptor, value});
+		if (arg0.length > 1) {
+			args = arg0;
+		}
+
+		return fn(args);
+	};
+
+	// Preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
 	}
 
-	return spawned;
-};
+	return wrappedFn;
+}
 
-// Use promises instead of `child_process` events
-const getSpawnedPromise = spawned => {
-	return new Promise((resolve, reject) => {
-		spawned.on('exit', (exitCode, signal) => {
-			resolve({exitCode, signal});
-		});
+function wrapRounded(fn) {
+	const wrappedFn = function (...args) {
+		const arg0 = args[0];
 
-		spawned.on('error', error => {
-			reject(error);
-		});
+		if (arg0 === undefined || arg0 === null) {
+			return arg0;
+		}
 
-		if (spawned.stdin) {
-			spawned.stdin.on('error', error => {
-				reject(error);
-			});
+		if (arg0.length > 1) {
+			args = arg0;
 		}
-	});
-};
 
-module.exports = {
-	mergePromise,
-	getSpawnedPromise
-};
+		const result = fn(args);
+
+		// We're assuming the result is an array here.
+		// see notice in conversions.js; don't use box types
+		// in conversion functions.
+		if (typeof result === 'object') {
+			for (let len = result.length, i = 0; i < len; i++) {
+				result[i] = Math.round(result[i]);
+			}
+		}
+
+		return result;
+	};
+
+	// Preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
+
+	return wrappedFn;
+}
+
+models.forEach(fromModel => {
+	convert[fromModel] = {};
+
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
+
+	const routes = route(fromModel);
+	const routeModels = Object.keys(routes);
+
+	routeModels.forEach(toModel => {
+		const fn = routes[toModel];
+
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
 
+module.exports = convert;
 
 
 /***/ }),
-/* 297 */
+
+/***/ "../../node_modules/ansi-styles/node_modules/color-convert/route.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+const conversions = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/conversions.js");
 
-const SPACES_REGEXP = / +/g;
+/*
+	This function routes a model to all other models.
 
-const joinCommand = (file, args = []) => {
-	if (!Array.isArray(args)) {
-		return file;
+	all functions that are routed have a property `.conversion` attached
+	to the returned synthetic function. This property is an array
+	of strings, each with the steps in between the 'from' and 'to'
+	color models (inclusive).
+
+	conversions that are not possible simply are not included.
+*/
+
+function buildGraph() {
+	const graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	const models = Object.keys(conversions);
+
+	for (let len = models.length, i = 0; i < len; i++) {
+		graph[models[i]] = {
+			// http://jsperf.com/1-vs-infinity
+			// micro-opt, but this is simple.
+			distance: -1,
+			parent: null
+		};
 	}
 
-	return [file, ...args].join(' ');
-};
+	return graph;
+}
 
-// Allow spaces to be escaped by a backslash if not meant as a delimiter
-const handleEscaping = (tokens, token, index) => {
-	if (index === 0) {
-		return [token];
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	const graph = buildGraph();
+	const queue = [fromModel]; // Unshift -> queue -> pop
+
+	graph[fromModel].distance = 0;
+
+	while (queue.length) {
+		const current = queue.pop();
+		const adjacents = Object.keys(conversions[current]);
+
+		for (let len = adjacents.length, i = 0; i < len; i++) {
+			const adjacent = adjacents[i];
+			const node = graph[adjacent];
+
+			if (node.distance === -1) {
+				node.distance = graph[current].distance + 1;
+				node.parent = current;
+				queue.unshift(adjacent);
+			}
+		}
 	}
 
-	const previousToken = tokens[tokens.length - 1];
+	return graph;
+}
 
-	if (previousToken.endsWith('\\')) {
-		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
+}
+
+function wrapConversion(toModel, graph) {
+	const path = [graph[toModel].parent, toModel];
+	let fn = conversions[graph[toModel].parent][toModel];
+
+	let cur = graph[toModel].parent;
+	while (graph[cur].parent) {
+		path.unshift(graph[cur].parent);
+		fn = link(conversions[graph[cur].parent][cur], fn);
+		cur = graph[cur].parent;
 	}
 
-	return [...tokens, token];
-};
+	fn.conversion = path;
+	return fn;
+}
 
-// Handle `execa.command()`
-const parseCommand = command => {
-	return command
-		.trim()
-		.split(SPACES_REGEXP)
-		.reduce(handleEscaping, []);
-};
+module.exports = function (fromModel) {
+	const graph = deriveBFS(fromModel);
+	const conversion = {};
 
-module.exports = {
-	joinCommand,
-	parseCommand
+	const models = Object.keys(graph);
+	for (let len = models.length, i = 0; i < len; i++) {
+		const toModel = models[i];
+		const node = graph[toModel];
+
+		if (node.parent === null) {
+			// No possible conversion, or this node is the source model.
+			continue;
+		}
+
+		conversion[toModel] = wrapConversion(toModel, graph);
+	}
+
+	return conversion;
 };
 
 
+
 /***/ }),
-/* 298 */
+
+/***/ "../../node_modules/array-differ/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(299);
+"use strict";
+
+
+const arrayDiffer = (array, ...values) => {
+	const rest = new Set([].concat(...values));
+	return array.filter(element => !rest.has(element));
+};
+
+module.exports = arrayDiffer;
+
 
 /***/ }),
-/* 299 */
+
+/***/ "../../node_modules/array-union/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(300);
-var bind = __webpack_require__(301);
-var Axios = __webpack_require__(302);
-var mergeConfig = __webpack_require__(334);
-var defaults = __webpack_require__(308);
-
-/**
- * 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);
+module.exports = (...arguments_) => {
+	return [...new Set([].concat(...arguments_))];
+};
 
-  // Copy axios.prototype to instance
-  utils.extend(instance, Axios.prototype, context);
 
-  // Copy context to instance
-  utils.extend(instance, context);
+/***/ }),
 
-  return instance;
-}
+/***/ "../../node_modules/arrify/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// Create the default instance to be exported
-var axios = createInstance(defaults);
+"use strict";
 
-// Expose Axios class to allow class inheritance
-axios.Axios = Axios;
 
-// Factory for creating new instances
-axios.create = function create(instanceConfig) {
-  return createInstance(mergeConfig(axios.defaults, instanceConfig));
-};
+const arrify = value => {
+	if (value === null || value === undefined) {
+		return [];
+	}
 
-// Expose Cancel & CancelToken
-axios.Cancel = __webpack_require__(335);
-axios.CancelToken = __webpack_require__(336);
-axios.isCancel = __webpack_require__(307);
+	if (Array.isArray(value)) {
+		return value;
+	}
 
-// Expose all/spread
-axios.all = function all(promises) {
-  return Promise.all(promises);
-};
-axios.spread = __webpack_require__(337);
+	if (typeof value === 'string') {
+		return [value];
+	}
 
-// Expose isAxiosError
-axios.isAxiosError = __webpack_require__(338);
+	if (typeof value[Symbol.iterator] === 'function') {
+		return [...value];
+	}
 
-module.exports = axios;
+	return [value];
+};
 
-// Allow use of default import syntax in TypeScript
-module.exports.default = axios;
+module.exports = arrify;
 
 
 /***/ }),
-/* 300 */
+
+/***/ "../../node_modules/axios/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = __webpack_require__("../../node_modules/axios/lib/axios.js");
 
+/***/ }),
 
-var bind = __webpack_require__(301);
+/***/ "../../node_modules/axios/lib/adapters/http.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/*global toString:true*/
+"use strict";
 
-// utils is a library of generic helper functions non-specific to axios
 
-var toString = Object.prototype.toString;
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var settle = __webpack_require__("../../node_modules/axios/lib/core/settle.js");
+var buildFullPath = __webpack_require__("../../node_modules/axios/lib/core/buildFullPath.js");
+var buildURL = __webpack_require__("../../node_modules/axios/lib/helpers/buildURL.js");
+var http = __webpack_require__("http");
+var https = __webpack_require__("https");
+var httpFollow = __webpack_require__("../../node_modules/follow-redirects/index.js").http;
+var httpsFollow = __webpack_require__("../../node_modules/follow-redirects/index.js").https;
+var url = __webpack_require__("url");
+var zlib = __webpack_require__("zlib");
+var pkg = __webpack_require__("../../node_modules/axios/package.json");
+var createError = __webpack_require__("../../node_modules/axios/lib/core/createError.js");
+var enhanceError = __webpack_require__("../../node_modules/axios/lib/core/enhanceError.js");
 
-/**
- * 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]';
-}
+var isHttps = /https:?/;
 
 /**
- * Determine if a value is undefined
  *
- * @param {Object} val The value to test
- * @returns {boolean} True if the value is undefined, otherwise false
+ * @param {http.ClientRequestArgs} options
+ * @param {AxiosProxyConfig} proxy
+ * @param {string} location
  */
-function isUndefined(val) {
-  return typeof val === 'undefined';
-}
+function setProxy(options, proxy, location) {
+  options.hostname = proxy.host;
+  options.host = proxy.host;
+  options.port = proxy.port;
+  options.path = location;
 
-/**
- * Determine if a value is a Buffer
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Buffer, otherwise false
- */
-function isBuffer(val) {
-  return val !== null && !isUndefined(val) && val.constructor !== null && !isUndefined(val.constructor)
-    && typeof val.constructor.isBuffer === 'function' && val.constructor.isBuffer(val);
-}
+  // Basic proxy authorization
+  if (proxy.auth) {
+    var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64');
+    options.headers['Proxy-Authorization'] = 'Basic ' + base64;
+  }
 
-/**
- * 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]';
+  // If a proxy is used, any redirects must also pass through the proxy
+  options.beforeRedirect = function beforeRedirect(redirection) {
+    redirection.headers.host = redirection.host;
+    setProxy(redirection, proxy, redirection.href);
+  };
 }
 
-/**
- * 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);
-}
+/*eslint consistent-return:0*/
+module.exports = function httpAdapter(config) {
+  return new Promise(function dispatchHttpRequest(resolvePromise, rejectPromise) {
+    var resolve = function resolve(value) {
+      resolvePromise(value);
+    };
+    var reject = function reject(value) {
+      rejectPromise(value);
+    };
+    var data = config.data;
+    var headers = config.headers;
 
-/**
- * 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;
-}
+    // 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;
+    }
 
-/**
- * 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';
-}
+    if (data && !utils.isStream(data)) {
+      if (Buffer.isBuffer(data)) {
+        // Nothing to do...
+      } else if (utils.isArrayBuffer(data)) {
+        data = Buffer.from(new Uint8Array(data));
+      } else if (utils.isString(data)) {
+        data = Buffer.from(data, 'utf-8');
+      } else {
+        return reject(createError(
+          'Data after transformation must be a string, an ArrayBuffer, a Buffer, or a Stream',
+          config
+        ));
+      }
 
-/**
- * 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';
-}
+      // Add Content-Length header if data exists
+      headers['Content-Length'] = data.length;
+    }
 
-/**
- * Determine if a value is a plain Object
- *
- * @param {Object} val The value to test
- * @return {boolean} True if value is a plain Object, otherwise false
- */
-function isPlainObject(val) {
-  if (toString.call(val) !== '[object Object]') {
-    return false;
-  }
+    // HTTP basic authentication
+    var auth = undefined;
+    if (config.auth) {
+      var username = config.auth.username || '';
+      var password = config.auth.password || '';
+      auth = username + ':' + password;
+    }
 
-  var prototype = Object.getPrototypeOf(val);
-  return prototype === null || prototype === Object.prototype;
-}
+    // Parse url
+    var fullPath = buildFullPath(config.baseURL, config.url);
+    var parsed = url.parse(fullPath);
+    var protocol = parsed.protocol || 'http:';
 
-/**
- * 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]';
-}
+    if (!auth && parsed.auth) {
+      var urlAuth = parsed.auth.split(':');
+      var urlUsername = urlAuth[0] || '';
+      var urlPassword = urlAuth[1] || '';
+      auth = urlUsername + ':' + urlPassword;
+    }
 
-/**
- * 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]';
-}
+    if (auth) {
+      delete headers.Authorization;
+    }
 
-/**
- * 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]';
-}
+    var isHttpsRequest = isHttps.test(protocol);
+    var agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
 
-/**
- * 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]';
-}
+    var options = {
+      path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
+      method: config.method.toUpperCase(),
+      headers: headers,
+      agent: agent,
+      agents: { http: config.httpAgent, https: config.httpsAgent },
+      auth: auth
+    };
 
-/**
- * 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);
-}
+    if (config.socketPath) {
+      options.socketPath = config.socketPath;
+    } else {
+      options.hostname = parsed.hostname;
+      options.port = parsed.port;
+    }
 
-/**
- * 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;
-}
+    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);
+        var noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
+        var shouldProxy = true;
 
-/**
- * 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*$/, '');
-}
+        if (noProxyEnv) {
+          var noProxy = noProxyEnv.split(',').map(function trim(s) {
+            return s.trim();
+          });
 
-/**
- * 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'
- * nativescript
- *  navigator.product -> 'NativeScript' or 'NS'
- */
-function isStandardBrowserEnv() {
-  if (typeof navigator !== 'undefined' && (navigator.product === 'ReactNative' ||
-                                           navigator.product === 'NativeScript' ||
-                                           navigator.product === 'NS')) {
-    return false;
-  }
-  return (
-    typeof window !== 'undefined' &&
-    typeof document !== 'undefined'
-  );
-}
+          shouldProxy = !noProxy.some(function proxyMatch(proxyElement) {
+            if (!proxyElement) {
+              return false;
+            }
+            if (proxyElement === '*') {
+              return true;
+            }
+            if (proxyElement[0] === '.' &&
+                parsed.hostname.substr(parsed.hostname.length - proxyElement.length) === proxyElement) {
+              return true;
+            }
 
-/**
- * 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;
-  }
+            return parsed.hostname === proxyElement;
+          });
+        }
 
-  // Force an array if not already something iterable
-  if (typeof obj !== 'object') {
-    /*eslint no-param-reassign:0*/
-    obj = [obj];
-  }
+        if (shouldProxy) {
+          proxy = {
+            host: parsedProxyUrl.hostname,
+            port: parsedProxyUrl.port,
+            protocol: parsedProxyUrl.protocol
+          };
 
-  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);
+          if (parsedProxyUrl.auth) {
+            var proxyUrlAuth = parsedProxyUrl.auth.split(':');
+            proxy.auth = {
+              username: proxyUrlAuth[0],
+              password: proxyUrlAuth[1]
+            };
+          }
+        }
       }
     }
-  }
-}
 
-/**
- * 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 (isPlainObject(result[key]) && isPlainObject(val)) {
-      result[key] = merge(result[key], val);
-    } else if (isPlainObject(val)) {
-      result[key] = merge({}, val);
-    } else if (isArray(val)) {
-      result[key] = val.slice();
-    } else {
-      result[key] = val;
+    if (proxy) {
+      options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : '');
+      setProxy(options, proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path);
     }
-  }
-
-  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);
+    var transport;
+    var isHttpsProxy = isHttpsRequest && (proxy ? isHttps.test(proxy.protocol) : true);
+    if (config.transport) {
+      transport = config.transport;
+    } else if (config.maxRedirects === 0) {
+      transport = isHttpsProxy ? https : http;
     } else {
-      a[key] = val;
+      if (config.maxRedirects) {
+        options.maxRedirects = config.maxRedirects;
+      }
+      transport = isHttpsProxy ? httpsFollow : httpFollow;
     }
-  });
-  return a;
-}
 
-/**
- * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
- *
- * @param {string} content with BOM
- * @return {string} content value without BOM
- */
-function stripBOM(content) {
-  if (content.charCodeAt(0) === 0xFEFF) {
-    content = content.slice(1);
-  }
-  return content;
-}
+    if (config.maxBodyLength > -1) {
+      options.maxBodyLength = config.maxBodyLength;
+    }
 
-module.exports = {
-  isArray: isArray,
-  isArrayBuffer: isArrayBuffer,
-  isBuffer: isBuffer,
-  isFormData: isFormData,
-  isArrayBufferView: isArrayBufferView,
-  isString: isString,
-  isNumber: isNumber,
-  isObject: isObject,
-  isPlainObject: isPlainObject,
-  isUndefined: isUndefined,
-  isDate: isDate,
-  isFile: isFile,
-  isBlob: isBlob,
-  isFunction: isFunction,
-  isStream: isStream,
-  isURLSearchParams: isURLSearchParams,
-  isStandardBrowserEnv: isStandardBrowserEnv,
-  forEach: forEach,
-  merge: merge,
-  extend: extend,
-  trim: trim,
-  stripBOM: stripBOM
-};
+    // Create the request
+    var req = transport.request(options, function handleResponse(res) {
+      if (req.aborted) return;
 
+      // uncompress the response body transparently if required
+      var stream = res;
 
-/***/ }),
-/* 301 */
-/***/ (function(module, exports, __webpack_require__) {
+      // return the last request in case of redirects
+      var lastRequest = res.req || req;
 
-"use strict";
 
+      // if no content, is HEAD request or decompress disabled we should not decompress
+      if (res.statusCode !== 204 && lastRequest.method !== 'HEAD' && config.decompress !== false) {
+        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());
 
-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);
-  };
-};
+          // remove the content-encoding in order to not confuse downstream operations
+          delete res.headers['content-encoding'];
+          break;
+        }
+      }
 
+      var response = {
+        status: res.statusCode,
+        statusText: res.statusMessage,
+        headers: res.headers,
+        config: config,
+        request: lastRequest
+      };
 
-/***/ }),
-/* 302 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (config.responseType === 'stream') {
+        response.data = stream;
+        settle(resolve, reject, response);
+      } else {
+        var responseBuffer = [];
+        stream.on('data', function handleStreamData(chunk) {
+          responseBuffer.push(chunk);
 
-"use strict";
+          // 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));
+        });
 
-var utils = __webpack_require__(300);
-var buildURL = __webpack_require__(303);
-var InterceptorManager = __webpack_require__(304);
-var dispatchRequest = __webpack_require__(305);
-var mergeConfig = __webpack_require__(334);
+        stream.on('end', function handleStreamEnd() {
+          var responseData = Buffer.concat(responseBuffer);
+          if (config.responseType !== 'arraybuffer') {
+            responseData = responseData.toString(config.responseEncoding);
+            if (!config.responseEncoding || config.responseEncoding === 'utf8') {
+              responseData = utils.stripBOM(responseData);
+            }
+          }
 
-/**
- * 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()
-  };
-}
+          response.data = responseData;
+          settle(resolve, reject, response);
+        });
+      }
+    });
 
-/**
- * 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 = arguments[1] || {};
-    config.url = arguments[0];
-  } else {
-    config = config || {};
-  }
+    // Handle errors
+    req.on('error', function handleRequestError(err) {
+      if (req.aborted && err.code !== 'ERR_FR_TOO_MANY_REDIRECTS') return;
+      reject(enhanceError(err, config, null, req));
+    });
 
-  config = mergeConfig(this.defaults, config);
+    // Handle request timeout
+    if (config.timeout) {
+      // Sometime, the response will be very slow, and does not respond, the connect event will be block by event loop system.
+      // And timer callback will be fired, and abort() will be invoked before connection, then get "socket hang up" and code ECONNRESET.
+      // At this time, if we have a large number of request, nodejs will hang up some socket on background. and the number will up and up.
+      // And then these socket which be hang up will devoring CPU little by little.
+      // ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect.
+      req.setTimeout(config.timeout, function handleRequestTimeout() {
+        req.abort();
+        reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED', req));
+      });
+    }
 
-  // Set config.method
-  if (config.method) {
-    config.method = config.method.toLowerCase();
-  } else if (this.defaults.method) {
-    config.method = this.defaults.method.toLowerCase();
-  } else {
-    config.method = 'get';
-  }
+    if (config.cancelToken) {
+      // Handle cancellation
+      config.cancelToken.promise.then(function onCanceled(cancel) {
+        if (req.aborted) return;
 
-  // Hook up interceptors middleware
-  var chain = [dispatchRequest, undefined];
-  var promise = Promise.resolve(config);
+        req.abort();
+        reject(cancel);
+      });
+    }
 
-  this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
-    chain.unshift(interceptor.fulfilled, interceptor.rejected);
+    // Send the request
+    if (utils.isStream(data)) {
+      data.on('error', function handleStreamError(err) {
+        reject(enhanceError(err, config, null, req));
+      }).pipe(req);
+    } else {
+      req.end(data);
+    }
   });
+};
 
-  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;
-};
-
-Axios.prototype.getUri = function getUri(config) {
-  config = mergeConfig(this.defaults, config);
-  return buildURL(config.url, config.params, config.paramsSerializer).replace(/^\?/, '');
-};
-
-// 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(mergeConfig(config || {}, {
-      method: method,
-      url: url,
-      data: (config || {}).data
-    }));
-  };
-});
-
-utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
-  /*eslint func-names:0*/
-  Axios.prototype[method] = function(url, data, config) {
-    return this.request(mergeConfig(config || {}, {
-      method: method,
-      url: url,
-      data: data
-    }));
-  };
-});
-
-module.exports = Axios;
-
-
-/***/ }),
-/* 303 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(300);
-
-function encode(val) {
-  return encodeURIComponent(val).
-    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) {
-    var hashmarkIndex = url.indexOf('#');
-    if (hashmarkIndex !== -1) {
-      url = url.slice(0, hashmarkIndex);
-    }
-
-    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
-  }
-
-  return url;
-};
-
-
-/***/ }),
-/* 304 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(300);
-
-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;
-
-
-/***/ }),
-/* 305 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(300);
-var transformData = __webpack_require__(306);
-var isCancel = __webpack_require__(307);
-var defaults = __webpack_require__(308);
-
-/**
- * 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);
-
-  // 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);
-  });
-};
-
-
-/***/ }),
-/* 306 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(300);
-
-/**
- * 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;
-};
-
-
-/***/ }),
-/* 307 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = function isCancel(value) {
-  return !!(value && value.__CANCEL__);
-};
-
-
-/***/ }),
-/* 308 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(300);
-var normalizeHeaderName = __webpack_require__(309);
-
-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__(310);
-  } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') {
-    // For node use HTTP adapter
-    adapter = __webpack_require__(320);
-  }
-  return adapter;
-}
-
-var defaults = {
-  adapter: getDefaultAdapter(),
-
-  transformRequest: [function transformRequest(data, headers) {
-    normalizeHeaderName(headers, 'Accept');
-    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,
-  maxBodyLength: -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;
-
-
-/***/ }),
-/* 309 */
+/***/ "../../node_modules/axios/lib/adapters/xhr.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(300);
-
-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];
-    }
-  });
-};
-
-
-/***/ }),
-/* 310 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(300);
-var settle = __webpack_require__(311);
-var cookies = __webpack_require__(314);
-var buildURL = __webpack_require__(303);
-var buildFullPath = __webpack_require__(315);
-var parseHeaders = __webpack_require__(318);
-var isURLSameOrigin = __webpack_require__(319);
-var createError = __webpack_require__(312);
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var settle = __webpack_require__("../../node_modules/axios/lib/core/settle.js");
+var cookies = __webpack_require__("../../node_modules/axios/lib/helpers/cookies.js");
+var buildURL = __webpack_require__("../../node_modules/axios/lib/helpers/buildURL.js");
+var buildFullPath = __webpack_require__("../../node_modules/axios/lib/core/buildFullPath.js");
+var parseHeaders = __webpack_require__("../../node_modules/axios/lib/helpers/parseHeaders.js");
+var isURLSameOrigin = __webpack_require__("../../node_modules/axios/lib/helpers/isURLSameOrigin.js");
+var createError = __webpack_require__("../../node_modules/axios/lib/core/createError.js");
 
 module.exports = function xhrAdapter(config) {
   return new Promise(function dispatchXhrRequest(resolve, reject) {
@@ -16203,180 +15744,347 @@ module.exports = function xhrAdapter(config) {
 
 
 /***/ }),
-/* 311 */
+
+/***/ "../../node_modules/axios/lib/axios.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var createError = __webpack_require__(312);
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var bind = __webpack_require__("../../node_modules/axios/lib/helpers/bind.js");
+var Axios = __webpack_require__("../../node_modules/axios/lib/core/Axios.js");
+var mergeConfig = __webpack_require__("../../node_modules/axios/lib/core/mergeConfig.js");
+var defaults = __webpack_require__("../../node_modules/axios/lib/defaults.js");
 
 /**
- * Resolve or reject a Promise based on response status.
+ * Create an instance of Axios
  *
- * @param {Function} resolve A function that resolves the promise.
- * @param {Function} reject A function that rejects the promise.
- * @param {object} response The response.
+ * @param {Object} defaultConfig The default config for the instance
+ * @return {Axios} A new instance of Axios
  */
-module.exports = function settle(resolve, reject, response) {
-  var validateStatus = response.config.validateStatus;
-  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
-    ));
-  }
+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(mergeConfig(axios.defaults, instanceConfig));
+};
+
+// Expose Cancel & CancelToken
+axios.Cancel = __webpack_require__("../../node_modules/axios/lib/cancel/Cancel.js");
+axios.CancelToken = __webpack_require__("../../node_modules/axios/lib/cancel/CancelToken.js");
+axios.isCancel = __webpack_require__("../../node_modules/axios/lib/cancel/isCancel.js");
+
+// Expose all/spread
+axios.all = function all(promises) {
+  return Promise.all(promises);
 };
+axios.spread = __webpack_require__("../../node_modules/axios/lib/helpers/spread.js");
+
+// Expose isAxiosError
+axios.isAxiosError = __webpack_require__("../../node_modules/axios/lib/helpers/isAxiosError.js");
+
+module.exports = axios;
+
+// Allow use of default import syntax in TypeScript
+module.exports.default = axios;
 
 
 /***/ }),
-/* 312 */
+
+/***/ "../../node_modules/axios/lib/cancel/Cancel.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var enhanceError = __webpack_require__(313);
-
 /**
- * Create an Error with the specified message, config, error code, request and response.
+ * A `Cancel` is an object that is thrown when an operation is canceled.
  *
- * @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.
+ * @class
+ * @param {string=} message The message.
  */
-module.exports = function createError(message, config, code, request, response) {
-  var error = new Error(message);
-  return enhanceError(error, config, code, request, response);
+function Cancel(message) {
+  this.message = message;
+}
+
+Cancel.prototype.toString = function toString() {
+  return 'Cancel' + (this.message ? ': ' + this.message : '');
 };
 
+Cancel.prototype.__CANCEL__ = true;
+
+module.exports = Cancel;
+
 
 /***/ }),
-/* 313 */
+
+/***/ "../../node_modules/axios/lib/cancel/CancelToken.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
+var Cancel = __webpack_require__("../../node_modules/axios/lib/cancel/Cancel.js");
+
 /**
- * Update an Error with the specified config, error code, and response.
+ * A `CancelToken` is an object that can be used to request cancellation of an operation.
  *
- * @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.
+ * @class
+ * @param {Function} executor The executor function.
  */
-module.exports = function enhanceError(error, config, code, request, response) {
-  error.config = config;
-  if (code) {
-    error.code = code;
+function CancelToken(executor) {
+  if (typeof executor !== 'function') {
+    throw new TypeError('executor must be a function.');
   }
 
-  error.request = request;
-  error.response = response;
-  error.isAxiosError = true;
+  var resolvePromise;
+  this.promise = new Promise(function promiseExecutor(resolve) {
+    resolvePromise = resolve;
+  });
 
-  error.toJSON = function toJSON() {
-    return {
-      // Standard
-      message: this.message,
-      name: this.name,
-      // Microsoft
-      description: this.description,
-      number: this.number,
-      // Mozilla
-      fileName: this.fileName,
-      lineNumber: this.lineNumber,
-      columnNumber: this.columnNumber,
-      stack: this.stack,
-      // Axios
-      config: this.config,
-      code: this.code
-    };
+  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
   };
-  return error;
 };
 
+module.exports = CancelToken;
+
 
 /***/ }),
-/* 314 */
+
+/***/ "../../node_modules/axios/lib/cancel/isCancel.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(300);
+module.exports = function isCancel(value) {
+  return !!(value && value.__CANCEL__);
+};
 
-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());
-          }
+/***/ "../../node_modules/axios/lib/core/Axios.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-          if (utils.isString(path)) {
-            cookie.push('path=' + path);
-          }
+"use strict";
 
-          if (utils.isString(domain)) {
-            cookie.push('domain=' + domain);
-          }
 
-          if (secure === true) {
-            cookie.push('secure');
-          }
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var buildURL = __webpack_require__("../../node_modules/axios/lib/helpers/buildURL.js");
+var InterceptorManager = __webpack_require__("../../node_modules/axios/lib/core/InterceptorManager.js");
+var dispatchRequest = __webpack_require__("../../node_modules/axios/lib/core/dispatchRequest.js");
+var mergeConfig = __webpack_require__("../../node_modules/axios/lib/core/mergeConfig.js");
 
-          document.cookie = cookie.join('; ');
-        },
+/**
+ * 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()
+  };
+}
 
-        read: function read(name) {
-          var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)'));
-          return (match ? decodeURIComponent(match[3]) : null);
-        },
+/**
+ * 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 = arguments[1] || {};
+    config.url = arguments[0];
+  } else {
+    config = config || {};
+  }
 
-        remove: function remove(name) {
-          this.write(name, '', Date.now() - 86400000);
-        }
-      };
-    })() :
+  config = mergeConfig(this.defaults, config);
 
-  // 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() {}
-      };
-    })()
-);
+  // Set config.method
+  if (config.method) {
+    config.method = config.method.toLowerCase();
+  } else if (this.defaults.method) {
+    config.method = this.defaults.method.toLowerCase();
+  } else {
+    config.method = 'get';
+  }
+
+  // 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;
+};
+
+Axios.prototype.getUri = function getUri(config) {
+  config = mergeConfig(this.defaults, config);
+  return buildURL(config.url, config.params, config.paramsSerializer).replace(/^\?/, '');
+};
+
+// 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(mergeConfig(config || {}, {
+      method: method,
+      url: url,
+      data: (config || {}).data
+    }));
+  };
+});
+
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  /*eslint func-names:0*/
+  Axios.prototype[method] = function(url, data, config) {
+    return this.request(mergeConfig(config || {}, {
+      method: method,
+      url: url,
+      data: data
+    }));
+  };
+});
+
+module.exports = Axios;
+
+
+/***/ }),
+
+/***/ "../../node_modules/axios/lib/core/InterceptorManager.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+
+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;
 
 
 /***/ }),
-/* 315 */
+
+/***/ "../../node_modules/axios/lib/core/buildFullPath.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isAbsoluteURL = __webpack_require__(316);
-var combineURLs = __webpack_require__(317);
+var isAbsoluteURL = __webpack_require__("../../node_modules/axios/lib/helpers/isAbsoluteURL.js");
+var combineURLs = __webpack_require__("../../node_modules/axios/lib/helpers/combineURLs.js");
 
 /**
  * Creates a new URL by combining the baseURL with the requestedURL,
@@ -16396,4517 +16104,3456 @@ module.exports = function buildFullPath(baseURL, requestedURL) {
 
 
 /***/ }),
-/* 316 */
+
+/***/ "../../node_modules/axios/lib/core/createError.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
+var enhanceError = __webpack_require__("../../node_modules/axios/lib/core/enhanceError.js");
+
 /**
- * Determines whether the specified URL is absolute
+ * Create an Error with the specified message, config, error code, request and response.
  *
- * @param {string} url The URL to test
- * @returns {boolean} True if the specified URL is absolute, otherwise false
+ * @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 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);
+module.exports = function createError(message, config, code, request, response) {
+  var error = new Error(message);
+  return enhanceError(error, config, code, request, response);
 };
 
 
 /***/ }),
-/* 317 */
+
+/***/ "../../node_modules/axios/lib/core/dispatchRequest.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var transformData = __webpack_require__("../../node_modules/axios/lib/core/transformData.js");
+var isCancel = __webpack_require__("../../node_modules/axios/lib/cancel/isCancel.js");
+var defaults = __webpack_require__("../../node_modules/axios/lib/defaults.js");
+
 /**
- * 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
+ * Throws a `Cancel` if cancellation has been requested.
  */
-module.exports = function combineURLs(baseURL, relativeURL) {
-  return relativeURL
-    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
-    : baseURL;
-};
+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);
 
-/***/ }),
-/* 318 */
-/***/ (function(module, exports, __webpack_require__) {
+  // Ensure headers exist
+  config.headers = config.headers || {};
 
-"use strict";
+  // 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
+  );
 
-var utils = __webpack_require__(300);
+  utils.forEach(
+    ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'],
+    function cleanHeaderConfig(method) {
+      delete config.headers[method];
+    }
+  );
 
-// 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'
-];
+  var adapter = config.adapter || defaults.adapter;
 
-/**
- * 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;
+  return adapter(config).then(function onAdapterResolution(response) {
+    throwIfCancellationRequested(config);
 
-  if (!headers) { return parsed; }
+    // Transform response data
+    response.data = transformData(
+      response.data,
+      response.headers,
+      config.transformResponse
+    );
 
-  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));
+    return response;
+  }, function onAdapterRejection(reason) {
+    if (!isCancel(reason)) {
+      throwIfCancellationRequested(config);
 
-    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;
+      // Transform response data
+      if (reason && reason.response) {
+        reason.response.data = transformData(
+          reason.response.data,
+          reason.response.headers,
+          config.transformResponse
+        );
       }
     }
-  });
 
-  return parsed;
+    return Promise.reject(reason);
+  });
 };
 
 
 /***/ }),
-/* 319 */
+
+/***/ "../../node_modules/axios/lib/core/enhanceError.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(300);
-
-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);
+/**
+ * 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;
+  }
 
-      /**
-    * 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);
-      };
-    })() :
+  error.request = request;
+  error.response = response;
+  error.isAxiosError = true;
 
-  // Non standard browser envs (web workers, react-native) lack needed support.
-    (function nonStandardBrowserEnv() {
-      return function isURLSameOrigin() {
-        return true;
-      };
-    })()
-);
+  error.toJSON = function toJSON() {
+    return {
+      // Standard
+      message: this.message,
+      name: this.name,
+      // Microsoft
+      description: this.description,
+      number: this.number,
+      // Mozilla
+      fileName: this.fileName,
+      lineNumber: this.lineNumber,
+      columnNumber: this.columnNumber,
+      stack: this.stack,
+      // Axios
+      config: this.config,
+      code: this.code
+    };
+  };
+  return error;
+};
 
 
 /***/ }),
-/* 320 */
+
+/***/ "../../node_modules/axios/lib/core/mergeConfig.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(300);
-var settle = __webpack_require__(311);
-var buildFullPath = __webpack_require__(315);
-var buildURL = __webpack_require__(303);
-var http = __webpack_require__(321);
-var https = __webpack_require__(322);
-var httpFollow = __webpack_require__(323).http;
-var httpsFollow = __webpack_require__(323).https;
-var url = __webpack_require__(324);
-var zlib = __webpack_require__(332);
-var pkg = __webpack_require__(333);
-var createError = __webpack_require__(312);
-var enhanceError = __webpack_require__(313);
-
-var isHttps = /https:?/;
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
 /**
+ * Config-specific merge-function which creates a new config-object
+ * by merging two configuration objects together.
  *
- * @param {http.ClientRequestArgs} options
- * @param {AxiosProxyConfig} proxy
- * @param {string} location
+ * @param {Object} config1
+ * @param {Object} config2
+ * @returns {Object} New object resulting from merging config2 to config1
  */
-function setProxy(options, proxy, location) {
-  options.hostname = proxy.host;
-  options.host = proxy.host;
-  options.port = proxy.port;
-  options.path = location;
+module.exports = function mergeConfig(config1, config2) {
+  // eslint-disable-next-line no-param-reassign
+  config2 = config2 || {};
+  var config = {};
 
-  // Basic proxy authorization
-  if (proxy.auth) {
-    var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64');
-    options.headers['Proxy-Authorization'] = 'Basic ' + base64;
-  }
+  var valueFromConfig2Keys = ['url', 'method', 'data'];
+  var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy', 'params'];
+  var defaultToConfig2Keys = [
+    'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
+    'timeout', 'timeoutMessage', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
+    'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'decompress',
+    'maxContentLength', 'maxBodyLength', 'maxRedirects', 'transport', 'httpAgent',
+    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
+  ];
+  var directMergeKeys = ['validateStatus'];
 
-  // If a proxy is used, any redirects must also pass through the proxy
-  options.beforeRedirect = function beforeRedirect(redirection) {
-    redirection.headers.host = redirection.host;
-    setProxy(redirection, proxy, redirection.href);
-  };
-}
-
-/*eslint consistent-return:0*/
-module.exports = function httpAdapter(config) {
-  return new Promise(function dispatchHttpRequest(resolvePromise, rejectPromise) {
-    var resolve = function resolve(value) {
-      resolvePromise(value);
-    };
-    var reject = function reject(value) {
-      rejectPromise(value);
-    };
-    var data = config.data;
-    var headers = config.headers;
-
-    // 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;
+  function getMergedValue(target, source) {
+    if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
+      return utils.merge(target, source);
+    } else if (utils.isPlainObject(source)) {
+      return utils.merge({}, source);
+    } else if (utils.isArray(source)) {
+      return source.slice();
     }
+    return source;
+  }
 
-    if (data && !utils.isStream(data)) {
-      if (Buffer.isBuffer(data)) {
-        // Nothing to do...
-      } else if (utils.isArrayBuffer(data)) {
-        data = Buffer.from(new Uint8Array(data));
-      } else if (utils.isString(data)) {
-        data = Buffer.from(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;
+  function mergeDeepProperties(prop) {
+    if (!utils.isUndefined(config2[prop])) {
+      config[prop] = getMergedValue(config1[prop], config2[prop]);
+    } else if (!utils.isUndefined(config1[prop])) {
+      config[prop] = getMergedValue(undefined, config1[prop]);
     }
+  }
 
-    // HTTP basic authentication
-    var auth = undefined;
-    if (config.auth) {
-      var username = config.auth.username || '';
-      var password = config.auth.password || '';
-      auth = username + ':' + password;
+  utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
+    if (!utils.isUndefined(config2[prop])) {
+      config[prop] = getMergedValue(undefined, config2[prop]);
     }
+  });
 
-    // Parse url
-    var fullPath = buildFullPath(config.baseURL, config.url);
-    var parsed = url.parse(fullPath);
-    var protocol = parsed.protocol || 'http:';
+  utils.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
 
-    if (!auth && parsed.auth) {
-      var urlAuth = parsed.auth.split(':');
-      var urlUsername = urlAuth[0] || '';
-      var urlPassword = urlAuth[1] || '';
-      auth = urlUsername + ':' + urlPassword;
+  utils.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
+    if (!utils.isUndefined(config2[prop])) {
+      config[prop] = getMergedValue(undefined, config2[prop]);
+    } else if (!utils.isUndefined(config1[prop])) {
+      config[prop] = getMergedValue(undefined, config1[prop]);
     }
+  });
 
-    if (auth) {
-      delete headers.Authorization;
+  utils.forEach(directMergeKeys, function merge(prop) {
+    if (prop in config2) {
+      config[prop] = getMergedValue(config1[prop], config2[prop]);
+    } else if (prop in config1) {
+      config[prop] = getMergedValue(undefined, config1[prop]);
     }
+  });
 
-    var isHttpsRequest = isHttps.test(protocol);
-    var agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
+  var axiosKeys = valueFromConfig2Keys
+    .concat(mergeDeepPropertiesKeys)
+    .concat(defaultToConfig2Keys)
+    .concat(directMergeKeys);
 
-    var options = {
-      path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
-      method: config.method.toUpperCase(),
-      headers: headers,
-      agent: agent,
-      agents: { http: config.httpAgent, https: config.httpsAgent },
-      auth: auth
-    };
+  var otherKeys = Object
+    .keys(config1)
+    .concat(Object.keys(config2))
+    .filter(function filterAxiosKeys(key) {
+      return axiosKeys.indexOf(key) === -1;
+    });
 
-    if (config.socketPath) {
-      options.socketPath = config.socketPath;
-    } else {
-      options.hostname = parsed.hostname;
-      options.port = parsed.port;
-    }
+  utils.forEach(otherKeys, mergeDeepProperties);
 
-    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);
-        var noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
-        var shouldProxy = true;
+  return config;
+};
 
-        if (noProxyEnv) {
-          var noProxy = noProxyEnv.split(',').map(function trim(s) {
-            return s.trim();
-          });
 
-          shouldProxy = !noProxy.some(function proxyMatch(proxyElement) {
-            if (!proxyElement) {
-              return false;
-            }
-            if (proxyElement === '*') {
-              return true;
-            }
-            if (proxyElement[0] === '.' &&
-                parsed.hostname.substr(parsed.hostname.length - proxyElement.length) === proxyElement) {
-              return true;
-            }
+/***/ }),
 
-            return parsed.hostname === proxyElement;
-          });
-        }
+/***/ "../../node_modules/axios/lib/core/settle.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (shouldProxy) {
-          proxy = {
-            host: parsedProxyUrl.hostname,
-            port: parsedProxyUrl.port,
-            protocol: parsedProxyUrl.protocol
-          };
+"use strict";
 
-          if (parsedProxyUrl.auth) {
-            var proxyUrlAuth = parsedProxyUrl.auth.split(':');
-            proxy.auth = {
-              username: proxyUrlAuth[0],
-              password: proxyUrlAuth[1]
-            };
-          }
-        }
-      }
-    }
 
-    if (proxy) {
-      options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : '');
-      setProxy(options, proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path);
-    }
+var createError = __webpack_require__("../../node_modules/axios/lib/core/createError.js");
 
-    var transport;
-    var isHttpsProxy = isHttpsRequest && (proxy ? isHttps.test(proxy.protocol) : true);
-    if (config.transport) {
-      transport = config.transport;
-    } else if (config.maxRedirects === 0) {
-      transport = isHttpsProxy ? https : http;
-    } else {
-      if (config.maxRedirects) {
-        options.maxRedirects = config.maxRedirects;
-      }
-      transport = isHttpsProxy ? httpsFollow : httpFollow;
-    }
+/**
+ * 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;
+  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
+    ));
+  }
+};
 
-    if (config.maxBodyLength > -1) {
-      options.maxBodyLength = config.maxBodyLength;
-    }
 
-    // Create the request
-    var req = transport.request(options, function handleResponse(res) {
-      if (req.aborted) return;
+/***/ }),
 
-      // uncompress the response body transparently if required
-      var stream = res;
+/***/ "../../node_modules/axios/lib/core/transformData.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      // return the last request in case of redirects
-      var lastRequest = res.req || req;
+"use strict";
 
 
-      // if no content, is HEAD request or decompress disabled we should not decompress
-      if (res.statusCode !== 204 && lastRequest.method !== 'HEAD' && config.decompress !== false) {
-        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());
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-          // remove the content-encoding in order to not confuse downstream operations
-          delete res.headers['content-encoding'];
-          break;
-        }
-      }
+/**
+ * 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);
+  });
 
-      var response = {
-        status: res.statusCode,
-        statusText: res.statusMessage,
-        headers: res.headers,
-        config: config,
-        request: lastRequest
-      };
+  return data;
+};
 
-      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));
-        });
+/***/ "../../node_modules/axios/lib/defaults.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        stream.on('end', function handleStreamEnd() {
-          var responseData = Buffer.concat(responseBuffer);
-          if (config.responseType !== 'arraybuffer') {
-            responseData = responseData.toString(config.responseEncoding);
-            if (!config.responseEncoding || config.responseEncoding === 'utf8') {
-              responseData = utils.stripBOM(responseData);
-            }
-          }
+"use strict";
 
-          response.data = responseData;
-          settle(resolve, reject, response);
-        });
-      }
-    });
 
-    // Handle errors
-    req.on('error', function handleRequestError(err) {
-      if (req.aborted && err.code !== 'ERR_FR_TOO_MANY_REDIRECTS') return;
-      reject(enhanceError(err, config, null, req));
-    });
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var normalizeHeaderName = __webpack_require__("../../node_modules/axios/lib/helpers/normalizeHeaderName.js");
 
-    // Handle request timeout
-    if (config.timeout) {
-      // Sometime, the response will be very slow, and does not respond, the connect event will be block by event loop system.
-      // And timer callback will be fired, and abort() will be invoked before connection, then get "socket hang up" and code ECONNRESET.
-      // At this time, if we have a large number of request, nodejs will hang up some socket on background. and the number will up and up.
-      // And then these socket which be hang up will devoring CPU little by little.
-      // ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect.
-      req.setTimeout(config.timeout, function handleRequestTimeout() {
-        req.abort();
-        reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED', req));
-      });
-    }
+var DEFAULT_CONTENT_TYPE = {
+  'Content-Type': 'application/x-www-form-urlencoded'
+};
 
-    if (config.cancelToken) {
-      // Handle cancellation
-      config.cancelToken.promise.then(function onCanceled(cancel) {
-        if (req.aborted) return;
+function setContentTypeIfUnset(headers, value) {
+  if (!utils.isUndefined(headers) && utils.isUndefined(headers['Content-Type'])) {
+    headers['Content-Type'] = value;
+  }
+}
 
-        req.abort();
-        reject(cancel);
-      });
+function getDefaultAdapter() {
+  var adapter;
+  if (typeof XMLHttpRequest !== 'undefined') {
+    // For browsers use XHR adapter
+    adapter = __webpack_require__("../../node_modules/axios/lib/adapters/xhr.js");
+  } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') {
+    // For node use HTTP adapter
+    adapter = __webpack_require__("../../node_modules/axios/lib/adapters/http.js");
+  }
+  return adapter;
+}
+
+var defaults = {
+  adapter: getDefaultAdapter(),
+
+  transformRequest: [function transformRequest(data, headers) {
+    normalizeHeaderName(headers, 'Accept');
+    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;
+  }],
 
-    // Send the request
-    if (utils.isStream(data)) {
-      data.on('error', function handleStreamError(err) {
-        reject(enhanceError(err, config, null, req));
-      }).pipe(req);
-    } else {
-      req.end(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,
+  maxBodyLength: -1,
+
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300;
+  }
 };
 
+defaults.headers = {
+  common: {
+    'Accept': 'application/json, text/plain, */*'
+  }
+};
 
-/***/ }),
-/* 321 */
-/***/ (function(module, exports) {
+utils.forEach(['delete', 'get', 'head'], function forEachMethodNoData(method) {
+  defaults.headers[method] = {};
+});
 
-module.exports = require("http");
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  defaults.headers[method] = utils.merge(DEFAULT_CONTENT_TYPE);
+});
 
-/***/ }),
-/* 322 */
-/***/ (function(module, exports) {
+module.exports = defaults;
 
-module.exports = require("https");
 
 /***/ }),
-/* 323 */
+
+/***/ "../../node_modules/axios/lib/helpers/bind.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var url = __webpack_require__(324);
-var URL = url.URL;
-var http = __webpack_require__(321);
-var https = __webpack_require__(322);
-var Writable = __webpack_require__(294).Writable;
-var assert = __webpack_require__(283);
-var debug = __webpack_require__(325);
+"use strict";
 
-// Create handlers that pass events from native requests
-var events = ["abort", "aborted", "connect", "error", "socket", "timeout"];
-var eventHandlers = Object.create(null);
-events.forEach(function (event) {
-  eventHandlers[event] = function (arg1, arg2, arg3) {
-    this._redirectable.emit(event, arg1, arg2, arg3);
+
+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);
   };
-});
+};
 
-// Error types with codes
-var RedirectionError = createErrorType(
-  "ERR_FR_REDIRECTION_FAILURE",
-  "Redirected request failed"
-);
-var TooManyRedirectsError = createErrorType(
-  "ERR_FR_TOO_MANY_REDIRECTS",
-  "Maximum number of redirects exceeded"
-);
-var MaxBodyLengthExceededError = createErrorType(
-  "ERR_FR_MAX_BODY_LENGTH_EXCEEDED",
-  "Request body larger than maxBodyLength limit"
-);
-var WriteAfterEndError = createErrorType(
-  "ERR_STREAM_WRITE_AFTER_END",
-  "write after end"
-);
 
-// An HTTP(S) request that can be redirected
-function RedirectableRequest(options, responseCallback) {
-  // Initialize the request
-  Writable.call(this);
-  this._sanitizeOptions(options);
-  this._options = options;
-  this._ended = false;
-  this._ending = false;
-  this._redirectCount = 0;
-  this._redirects = [];
-  this._requestBodyLength = 0;
-  this._requestBodyBuffers = [];
+/***/ }),
 
-  // Attach a callback if passed
-  if (responseCallback) {
-    this.on("response", responseCallback);
-  }
+/***/ "../../node_modules/axios/lib/helpers/buildURL.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // React to responses of native requests
-  var self = this;
-  this._onNativeResponse = function (response) {
-    self._processResponse(response);
-  };
+"use strict";
 
-  // Perform the first request
-  this._performRequest();
-}
-RedirectableRequest.prototype = Object.create(Writable.prototype);
 
-RedirectableRequest.prototype.abort = function () {
-  abortRequest(this._currentRequest);
-  this.emit("abort");
-};
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-// Writes buffered data to the current native request
-RedirectableRequest.prototype.write = function (data, encoding, callback) {
-  // Writing is not allowed if end has been called
-  if (this._ending) {
-    throw new WriteAfterEndError();
-  }
+function encode(val) {
+  return encodeURIComponent(val).
+    replace(/%3A/gi, ':').
+    replace(/%24/g, '$').
+    replace(/%2C/gi, ',').
+    replace(/%20/g, '+').
+    replace(/%5B/gi, '[').
+    replace(/%5D/gi, ']');
+}
 
-  // Validate input and shift parameters if necessary
-  if (!(typeof data === "string" || typeof data === "object" && ("length" in data))) {
-    throw new TypeError("data should be a string, Buffer or Uint8Array");
-  }
-  if (typeof encoding === "function") {
-    callback = encoding;
-    encoding = null;
+/**
+ * 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;
   }
 
-  // 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 MaxBodyLengthExceededError());
-    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 if needed and end
-  if (!data) {
-    this._ended = this._ending = true;
-    this._currentRequest.end(null, null, callback);
-  }
-  else {
-    var self = this;
-    var currentRequest = this._currentRequest;
-    this.write(data, encoding, function () {
-      self._ended = true;
-      currentRequest.end(null, null, callback);
-    });
-    this._ending = true;
-  }
-};
+  var serializedParams;
+  if (paramsSerializer) {
+    serializedParams = paramsSerializer(params);
+  } else if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString();
+  } else {
+    var parts = [];
 
-// 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);
-};
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return;
+      }
 
-// Clears a header value on the current native request
-RedirectableRequest.prototype.removeHeader = function (name) {
-  delete this._options.headers[name];
-  this._currentRequest.removeHeader(name);
-};
+      if (utils.isArray(val)) {
+        key = key + '[]';
+      } else {
+        val = [val];
+      }
 
-// Global timeout for all underlying requests
-RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
-  var self = this;
+      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));
+      });
+    });
 
-  // Destroys the socket on timeout
-  function destroyOnTimeout(socket) {
-    socket.setTimeout(msecs);
-    socket.removeListener("timeout", socket.destroy);
-    socket.addListener("timeout", socket.destroy);
+    serializedParams = parts.join('&');
   }
 
-  // Sets up a timer to trigger a timeout event
-  function startTimer(socket) {
-    if (self._timeout) {
-      clearTimeout(self._timeout);
+  if (serializedParams) {
+    var hashmarkIndex = url.indexOf('#');
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex);
     }
-    self._timeout = setTimeout(function () {
-      self.emit("timeout");
-      clearTimer();
-    }, msecs);
-    destroyOnTimeout(socket);
+
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
   }
 
-  // Stops a timeout from triggering
-  function clearTimer() {
-    // Clear the timeout
-    if (self._timeout) {
-      clearTimeout(self._timeout);
-      self._timeout = null;
-    }
+  return url;
+};
 
-    // Clean up all attached listeners
-    self.removeListener("abort", clearTimer);
-    self.removeListener("error", clearTimer);
-    self.removeListener("response", clearTimer);
-    if (callback) {
-      self.removeListener("timeout", callback);
-    }
-    if (!self.socket) {
-      self._currentRequest.removeListener("socket", startTimer);
-    }
-  }
 
-  // Attach callback if passed
-  if (callback) {
-    this.on("timeout", callback);
-  }
+/***/ }),
 
-  // Start the timer if or when the socket is opened
-  if (this.socket) {
-    startTimer(this.socket);
-  }
-  else {
-    this._currentRequest.once("socket", startTimer);
-  }
+/***/ "../../node_modules/axios/lib/helpers/combineURLs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // Clean up on events
-  this.on("socket", destroyOnTimeout);
-  this.on("abort", clearTimer);
-  this.on("error", clearTimer);
-  this.on("response", clearTimer);
+"use strict";
 
-  return this;
+
+/**
+ * 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;
 };
 
-// Proxy all other public ClientRequest methods
-[
-  "flushHeaders", "getHeader",
-  "setNoDelay", "setSocketKeepAlive",
-].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]; },
-  });
-});
+/***/ }),
 
-RedirectableRequest.prototype._sanitizeOptions = function (options) {
-  // Ensure headers are always present
-  if (!options.headers) {
-    options.headers = {};
-  }
+/***/ "../../node_modules/axios/lib/helpers/cookies.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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;
-  }
+"use strict";
 
-  // 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);
-    }
-  }
-};
 
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-// 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 TypeError("Unsupported protocol " + protocol));
-    return;
-  }
+module.exports = (
+  utils.isStandardBrowserEnv() ?
 
-  // 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];
-  }
+  // 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));
 
-  // Create the native request
-  var request = this._currentRequest =
-        nativeProtocol.request(this._options, this._onNativeResponse);
-  this._currentUrl = url.format(this._options);
+          if (utils.isNumber(expires)) {
+            cookie.push('expires=' + new Date(expires).toGMTString());
+          }
 
-  // Set up event handlers
-  request._redirectable = this;
-  for (var e = 0; e < events.length; e++) {
-    request.on(events[e], eventHandlers[events[e]]);
-  }
+          if (utils.isString(path)) {
+            cookie.push('path=' + path);
+          }
 
-  // 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 self = this;
-    var buffers = this._requestBodyBuffers;
-    (function writeNext(error) {
-      // Only write if this request has not been redirected yet
-      /* istanbul ignore else */
-      if (request === self._currentRequest) {
-        // Report any write errors
-        /* istanbul ignore if */
-        if (error) {
-          self.emit("error", error);
-        }
-        // Write the next buffer if there are still left
-        else if (i < buffers.length) {
-          var buffer = buffers[i++];
-          /* istanbul ignore else */
-          if (!request.finished) {
-            request.write(buffer.data, buffer.encoding, writeNext);
+          if (utils.isString(domain)) {
+            cookie.push('domain=' + domain);
           }
-        }
-        // End the request if `end` has been called on us
-        else if (self._ended) {
-          request.end();
-        }
-      }
-    }());
-  }
-};
 
-// Processes a response from the current native request
-RedirectableRequest.prototype._processResponse = function (response) {
-  // Store the redirected response
-  var statusCode = response.statusCode;
-  if (this._options.trackRedirects) {
-    this._redirects.push({
-      url: this._currentUrl,
-      headers: response.headers,
-      statusCode: statusCode,
-    });
-  }
+          if (secure === true) {
+            cookie.push('secure');
+          }
 
-  // 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.
+          document.cookie = cookie.join('; ');
+        },
 
-  // If the response is not a redirect; return it as-is
-  var location = response.headers.location;
-  if (!location || this._options.followRedirects === false ||
-      statusCode < 300 || statusCode >= 400) {
-    response.responseUrl = this._currentUrl;
-    response.redirects = this._redirects;
-    this.emit("response", response);
+        read: function read(name) {
+          var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)'));
+          return (match ? decodeURIComponent(match[3]) : null);
+        },
 
-    // Clean up
-    this._requestBodyBuffers = [];
-    return;
-  }
+        remove: function remove(name) {
+          this.write(name, '', Date.now() - 86400000);
+        }
+      };
+    })() :
 
-  // The response is a redirect, so abort the current request
-  abortRequest(this._currentRequest);
-  // Discard the remainder of the response to avoid waiting for data
-  response.destroy();
+  // 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() {}
+      };
+    })()
+);
 
-  // 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 TooManyRedirectsError());
-    return;
-  }
 
-  // RFC7231§6.4: Automatic redirection needs to done with
-  // care for methods not known to be safe, […]
-  // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
-  // the request method from POST to GET for the subsequent request.
-  if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" ||
-      // RFC7231§6.4.4: The 303 (See Other) status code indicates that
-      // the server is redirecting the user agent to a different resource […]
-      // A user agent can perform a retrieval request targeting that URI
-      // (a GET or HEAD request if using HTTP) […]
-      (statusCode === 303) && !/^(?:GET|HEAD)$/.test(this._options.method)) {
-    this._options.method = "GET";
-    // Drop a possible entity and headers related to it
-    this._requestBodyBuffers = [];
-    removeMatchingHeaders(/^content-/i, this._options.headers);
-  }
+/***/ }),
 
-  // Drop the Host header, as the redirect might lead to a different host
-  var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
+/***/ "../../node_modules/axios/lib/helpers/isAbsoluteURL.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // If the redirect is relative, carry over the host of the last request
-  var currentUrlParts = url.parse(this._currentUrl);
-  var currentHost = currentHostHeader || currentUrlParts.host;
-  var currentUrl = /^\w+:/.test(location) ? this._currentUrl :
-    url.format(Object.assign(currentUrlParts, { host: currentHost }));
+"use strict";
 
-  // Determine the URL of the redirection
-  var redirectUrl;
-  try {
-    redirectUrl = url.resolve(currentUrl, location);
-  }
-  catch (cause) {
-    this.emit("error", new RedirectionError(cause));
-    return;
-  }
 
-  // Create the redirected request
-  debug("redirecting to", redirectUrl);
-  this._isRedirect = true;
-  var redirectUrlParts = url.parse(redirectUrl);
-  Object.assign(this._options, redirectUrlParts);
+/**
+ * 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);
+};
 
-  // Drop confidential headers when redirecting to a less secure protocol
-  // or to a different domain that is not a superdomain
-  if (redirectUrlParts.protocol !== currentUrlParts.protocol &&
-     redirectUrlParts.protocol !== "https:" ||
-     redirectUrlParts.host !== currentHost &&
-     !isSubdomain(redirectUrlParts.host, currentHost)) {
-    removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
-  }
 
-  // Evaluate the beforeRedirect callback
-  if (typeof this._options.beforeRedirect === "function") {
-    var responseDetails = { headers: response.headers };
-    try {
-      this._options.beforeRedirect.call(null, this._options, responseDetails);
-    }
-    catch (err) {
-      this.emit("error", err);
-      return;
-    }
-    this._sanitizeOptions(this._options);
-  }
+/***/ }),
 
-  // Perform the redirected request
-  try {
-    this._performRequest();
-  }
-  catch (cause) {
-    this.emit("error", new RedirectionError(cause));
-  }
-};
+/***/ "../../node_modules/axios/lib/helpers/isAxiosError.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// Wraps the key/value object of protocols with redirect functionality
-function wrap(protocols) {
-  // Default settings
-  var exports = {
-    maxRedirects: 21,
-    maxBodyLength: 10 * 1024 * 1024,
-  };
+"use strict";
 
-  // 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
-    function request(input, options, callback) {
-      // Parse parameters
-      if (typeof input === "string") {
-        var urlStr = input;
-        try {
-          input = urlToOptions(new URL(urlStr));
-        }
-        catch (err) {
-          /* istanbul ignore next */
-          input = url.parse(urlStr);
-        }
-      }
-      else if (URL && (input instanceof URL)) {
-        input = urlToOptions(input);
-      }
-      else {
-        callback = options;
-        options = input;
-        input = { protocol: protocol };
-      }
-      if (typeof options === "function") {
-        callback = options;
-        options = null;
-      }
+/**
+ * Determines whether the payload is an error thrown by Axios
+ *
+ * @param {*} payload The value to test
+ * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
+ */
+module.exports = function isAxiosError(payload) {
+  return (typeof payload === 'object') && (payload.isAxiosError === true);
+};
 
-      // Set defaults
-      options = Object.assign({
-        maxRedirects: exports.maxRedirects,
-        maxBodyLength: exports.maxBodyLength,
-      }, input, 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
-    function get(input, options, callback) {
-      var wrappedRequest = wrappedProtocol.request(input, options, callback);
-      wrappedRequest.end();
-      return wrappedRequest;
-    }
+/***/ "../../node_modules/axios/lib/helpers/isURLSameOrigin.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // Expose the properties on the wrapped protocol
-    Object.defineProperties(wrappedProtocol, {
-      request: { value: request, configurable: true, enumerable: true, writable: true },
-      get: { value: get, configurable: true, enumerable: true, writable: true },
-    });
-  });
-  return exports;
-}
+"use strict";
 
-/* istanbul ignore next */
-function noop() { /* empty */ }
 
-// from https://github.com/nodejs/node/blob/master/lib/internal/url.js
-function urlToOptions(urlObject) {
-  var options = {
-    protocol: urlObject.protocol,
-    hostname: urlObject.hostname.startsWith("[") ?
-      /* istanbul ignore next */
-      urlObject.hostname.slice(1, -1) :
-      urlObject.hostname,
-    hash: urlObject.hash,
-    search: urlObject.search,
-    pathname: urlObject.pathname,
-    path: urlObject.pathname + urlObject.search,
-    href: urlObject.href,
-  };
-  if (urlObject.port !== "") {
-    options.port = Number(urlObject.port);
-  }
-  return options;
-}
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-function removeMatchingHeaders(regex, headers) {
-  var lastValue;
-  for (var header in headers) {
-    if (regex.test(header)) {
-      lastValue = headers[header];
-      delete headers[header];
-    }
-  }
-  return (lastValue === null || typeof lastValue === "undefined") ?
-    undefined : String(lastValue).trim();
-}
+module.exports = (
+  utils.isStandardBrowserEnv() ?
 
-function createErrorType(code, defaultMessage) {
-  function CustomError(cause) {
-    Error.captureStackTrace(this, this.constructor);
-    if (!cause) {
-      this.message = defaultMessage;
-    }
-    else {
-      this.message = defaultMessage + ": " + cause.message;
-      this.cause = cause;
-    }
-  }
-  CustomError.prototype = new Error();
-  CustomError.prototype.constructor = CustomError;
-  CustomError.prototype.name = "Error [" + code + "]";
-  CustomError.prototype.code = code;
-  return CustomError;
-}
+  // 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;
 
-function abortRequest(request) {
-  for (var e = 0; e < events.length; e++) {
-    request.removeListener(events[e], eventHandlers[events[e]]);
-  }
-  request.on("error", noop);
-  request.abort();
-}
+      /**
+    * Parse a URL to discover it's components
+    *
+    * @param {String} url The URL to be parsed
+    * @returns {Object}
+    */
+      function resolveURL(url) {
+        var href = url;
 
-function isSubdomain(subdomain, domain) {
-  const dot = subdomain.length - domain.length - 1;
-  return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
-}
+        if (msie) {
+        // IE needs attribute set twice to normalize properties
+          urlParsingNode.setAttribute('href', href);
+          href = urlParsingNode.href;
+        }
 
-// Exports
-module.exports = wrap({ http: http, https: https });
-module.exports.wrap = wrap;
+        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);
 
-/***/ }),
-/* 324 */
-/***/ (function(module, exports) {
+      /**
+    * 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;
+      };
+    })()
+);
 
-module.exports = require("url");
 
 /***/ }),
-/* 325 */
+
+/***/ "../../node_modules/axios/lib/helpers/normalizeHeaderName.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var debug;
+"use strict";
 
-module.exports = function () {
-  if (!debug) {
-    try {
-      /* eslint global-require: off */
-      debug = __webpack_require__(326)("follow-redirects");
-    }
-    catch (error) { /* */ }
-    if (typeof debug !== "function") {
-      debug = function () { /* */ };
+
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+
+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];
     }
-  }
-  debug.apply(null, arguments);
+  });
 };
 
 
 /***/ }),
-/* 326 */
+
+/***/ "../../node_modules/axios/lib/helpers/parseHeaders.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Detect Electron renderer process, which is node, but we should
- * treat as a browser.
- */
+"use strict";
 
-if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(327);
-} else {
-  module.exports = __webpack_require__(330);
-}
 
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-/***/ }),
-/* 327 */
-/***/ (function(module, exports, __webpack_require__) {
+// 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'
+];
 
 /**
- * This is the web browser implementation of `debug()`.
+ * Parse headers into an object
  *
- * Expose `debug()` as the module.
+ * ```
+ * 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;
 
-exports = module.exports = __webpack_require__(328);
-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();
+  if (!headers) { return parsed; }
 
-/**
- * Colors.
- */
+  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));
 
-exports.colors = [
-  'lightseagreen',
-  'forestgreen',
-  'goldenrod',
-  'dodgerblue',
-  'darkorchid',
-  'crimson'
-];
+    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;
+      }
+    }
+  });
 
-/**
- * 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
- */
+  return parsed;
+};
 
-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;
-  }
 
-  // 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.
- */
+/***/ "../../node_modules/axios/lib/helpers/spread.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.formatters.j = function(v) {
-  try {
-    return JSON.stringify(v);
-  } catch (err) {
-    return '[UnexpectedJSONParseError]: ' + err.message;
-  }
-};
+"use strict";
 
 
 /**
- * Colorize log arguments if enabled.
+ * Syntactic sugar for invoking a function and expanding an array for arguments.
  *
- * @api public
+ * 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);
+  };
+};
 
-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;
+/***/ "../../node_modules/axios/lib/utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit')
+"use strict";
 
-  // 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);
-}
+var bind = __webpack_require__("../../node_modules/axios/lib/helpers/bind.js");
+
+/*global toString:true*/
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString;
 
 /**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
+ * Determine if a value is an Array
  *
- * @api public
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
  */
-
-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);
+function isArray(val) {
+  return toString.call(val) === '[object Array]';
 }
 
 /**
- * Save `namespaces`.
+ * Determine if a value is undefined
  *
- * @param {String} namespaces
- * @api private
+ * @param {Object} val The value to test
+ * @returns {boolean} True if the value is undefined, otherwise false
  */
+function isUndefined(val) {
+  return typeof val === 'undefined';
+}
 
-function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
-    } else {
-      exports.storage.debug = namespaces;
-    }
-  } catch(e) {}
+/**
+ * Determine if a value is a Buffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Buffer, otherwise false
+ */
+function isBuffer(val) {
+  return val !== null && !isUndefined(val) && val.constructor !== null && !isUndefined(val.constructor)
+    && typeof val.constructor.isBuffer === 'function' && val.constructor.isBuffer(val);
 }
 
 /**
- * Load `namespaces`.
+ * Determine if a value is an ArrayBuffer
  *
- * @return {String} returns the previously persisted debug modes
- * @api private
+ * @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]';
+}
 
-function load() {
-  var r;
-  try {
-    r = exports.storage.debug;
-  } catch(e) {}
+/**
+ * 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);
+}
 
-  // 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;
+/**
+ * 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 r;
+  return result;
 }
 
 /**
- * Enable namespaces listed in `localStorage.debug` initially.
+ * Determine if a value is a String
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a String, otherwise false
  */
-
-exports.enable(load());
+function isString(val) {
+  return typeof val === 'string';
+}
 
 /**
- * Localstorage attempts to return the localstorage.
- *
- * This is necessary because safari throws
- * when a user disables cookies/localstorage
- * and you attempt to access it.
+ * Determine if a value is a Number
  *
- * @return {LocalStorage}
- * @api private
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Number, otherwise false
  */
-
-function localstorage() {
-  try {
-    return window.localStorage;
-  } catch (e) {}
+function isNumber(val) {
+  return typeof val === 'number';
 }
 
-
-/***/ }),
-/* 328 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
 /**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
+ * Determine if a value is an Object
  *
- * Expose `debug()` as the module.
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
  */
-
-exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
-exports.coerce = coerce;
-exports.disable = disable;
-exports.enable = enable;
-exports.enabled = enabled;
-exports.humanize = __webpack_require__(329);
+function isObject(val) {
+  return val !== null && typeof val === 'object';
+}
 
 /**
- * The currently active debug mode names, and names to skip.
+ * Determine if a value is a plain Object
+ *
+ * @param {Object} val The value to test
+ * @return {boolean} True if value is a plain Object, otherwise false
  */
+function isPlainObject(val) {
+  if (toString.call(val) !== '[object Object]') {
+    return false;
+  }
 
-exports.names = [];
-exports.skips = [];
+  var prototype = Object.getPrototypeOf(val);
+  return prototype === null || prototype === Object.prototype;
+}
 
 /**
- * Map of special "%n" handling functions, for the debug "format" argument.
+ * Determine if a value is a Date
  *
- * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
  */
-
-exports.formatters = {};
+function isDate(val) {
+  return toString.call(val) === '[object Date]';
+}
 
 /**
- * Previous log timestamp.
+ * Determine if a value is a File
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a File, otherwise false
  */
-
-var prevTime;
+function isFile(val) {
+  return toString.call(val) === '[object File]';
+}
 
 /**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
+ * 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 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];
+function isBlob(val) {
+  return toString.call(val) === '[object Blob]';
 }
 
 /**
- * Create a debugger with the given `namespace`.
+ * Determine if a value is a Function
  *
- * @param {String} namespace
- * @return {Function}
- * @api public
+ * @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]';
+}
 
-function createDebug(namespace) {
+/**
+ * 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);
+}
 
-  function debug() {
-    // disabled?
-    if (!debug.enabled) return;
+/**
+ * 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;
+}
 
-    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);
-
-  // env-specific initialization logic for debug instances
-  if ('function' === typeof exports.init) {
-    exports.init(debug);
-  }
-
-  return debug;
-}
+/**
+ * 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*$/, '');
+}
 
 /**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
+ * Determine if we're running in a standard browser environment
  *
- * @param {String} namespaces
- * @api public
+ * 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'
+ * nativescript
+ *  navigator.product -> 'NativeScript' or 'NS'
  */
-
-function enable(namespaces) {
-  exports.save(namespaces);
-
-  exports.names = [];
-  exports.skips = [];
-
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
-
-  for (var 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 isStandardBrowserEnv() {
+  if (typeof navigator !== 'undefined' && (navigator.product === 'ReactNative' ||
+                                           navigator.product === 'NativeScript' ||
+                                           navigator.product === 'NS')) {
+    return false;
   }
+  return (
+    typeof window !== 'undefined' &&
+    typeof document !== 'undefined'
+  );
 }
 
 /**
- * Disable debug output.
+ * Iterate over an Array or an Object invoking a function for each item.
  *
- * @api public
- */
-
-function disable() {
-  exports.enable('');
-}
-
-/**
- * Returns true if the given mode name is enabled, false otherwise.
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
  *
- * @param {String} name
- * @return {Boolean}
- * @api public
+ * 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;
+  }
 
-function enabled(name) {
-  var i, len;
-  for (i = 0, len = exports.skips.length; i < len; i++) {
-    if (exports.skips[i].test(name)) {
-      return false;
-    }
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj];
   }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
+
+  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);
+      }
     }
   }
-  return false;
 }
 
 /**
- * Coerce `val`.
+ * Accepts varargs expecting each argument to be an object, then
+ * immutably merges the properties of each object and returns result.
  *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
-
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
-
-
-/***/ }),
-/* 329 */
-/***/ (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`.
+ * When multiple objects contain the same key the later object in
+ * the arguments list will take precedence.
  *
- * Options:
+ * Example:
  *
- *  - `long` verbose formatting [false]
+ * ```js
+ * var result = merge({foo: 123}, {foo: 456});
+ * console.log(result.foo); // outputs 456
+ * ```
  *
- * @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
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
  */
-
-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);
+function merge(/* obj1, obj2, obj3, ... */) {
+  var result = {};
+  function assignValue(val, key) {
+    if (isPlainObject(result[key]) && isPlainObject(val)) {
+      result[key] = merge(result[key], val);
+    } else if (isPlainObject(val)) {
+      result[key] = merge({}, val);
+    } else if (isArray(val)) {
+      result[key] = val.slice();
+    } else {
+      result[key] = 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;
+  for (var i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue);
   }
+  return result;
 }
 
 /**
- * Short format for `ms`.
+ * Extends object a by mutably adding to it the properties of object b.
  *
- * @param {Number} ms
- * @return {String}
- * @api private
+ * @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 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';
+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;
 }
 
 /**
- * Long format for `ms`.
+ * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
  *
- * @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.
+ * @param {string} content with BOM
+ * @return {string} content value without BOM
  */
-
-function plural(ms, n, name) {
-  if (ms < n) {
-    return;
-  }
-  if (ms < n * 1.5) {
-    return Math.floor(ms / n) + ' ' + name;
+function stripBOM(content) {
+  if (content.charCodeAt(0) === 0xFEFF) {
+    content = content.slice(1);
   }
-  return Math.ceil(ms / n) + ' ' + name + 's';
+  return content;
 }
 
+module.exports = {
+  isArray: isArray,
+  isArrayBuffer: isArrayBuffer,
+  isBuffer: isBuffer,
+  isFormData: isFormData,
+  isArrayBufferView: isArrayBufferView,
+  isString: isString,
+  isNumber: isNumber,
+  isObject: isObject,
+  isPlainObject: isPlainObject,
+  isUndefined: isUndefined,
+  isDate: isDate,
+  isFile: isFile,
+  isBlob: isBlob,
+  isFunction: isFunction,
+  isStream: isStream,
+  isURLSearchParams: isURLSearchParams,
+  isStandardBrowserEnv: isStandardBrowserEnv,
+  forEach: forEach,
+  merge: merge,
+  extend: extend,
+  trim: trim,
+  stripBOM: stripBOM
+};
+
 
 /***/ }),
-/* 330 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Module dependencies.
- */
+/***/ "../../node_modules/axios/package.json":
+/***/ (function(module) {
 
-var tty = __webpack_require__(244);
-var util = __webpack_require__(234);
+module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.21.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\",\"fix\":\"eslint --fix lib/**/*.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.17.0\",\"coveralls\":\"^3.0.0\",\"es6-promise\":\"^4.2.4\",\"grunt\":\"^1.0.2\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.1.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^20.1.0\",\"grunt-karma\":\"^2.0.0\",\"grunt-mocha-test\":\"^0.13.3\",\"grunt-ts\":\"^6.0.0-beta.19\",\"grunt-webpack\":\"^1.0.18\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^1.3.0\",\"karma-chrome-launcher\":\"^2.2.0\",\"karma-coverage\":\"^1.1.1\",\"karma-firefox-launcher\":\"^1.1.0\",\"karma-jasmine\":\"^1.1.1\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-opera-launcher\":\"^1.0.0\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^1.2.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\",\"mocha\":\"^5.2.0\",\"sinon\":\"^4.5.0\",\"typescript\":\"^2.8.1\",\"url-search-params\":\"^0.10.0\",\"webpack\":\"^1.13.1\",\"webpack-dev-server\":\"^1.14.1\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"jsdelivr\":\"dist/axios.min.js\",\"unpkg\":\"dist/axios.min.js\",\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"^1.10.0\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
 
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+/***/ }),
 
-exports = module.exports = __webpack_require__(328);
-exports.init = init;
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
+/***/ "../../node_modules/balanced-match/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Colors.
- */
+"use strict";
 
-exports.colors = [6, 2, 3, 4, 5, 1];
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
 
-/**
- * Build up the default `inspectOpts` object from the environment variables.
- *
- *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
- */
+  var r = range(a, b, str);
 
-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() });
+  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)
+  };
+}
 
-  // 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);
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
+}
 
-  obj[prop] = val;
-  return obj;
-}, {});
+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;
 
-/**
- * The file descriptor to write the `debug()` calls to.
- * Set the `DEBUG_FD` env variable to override with another value. i.e.:
- *
- *   $ DEBUG_FD=3 node script.js 3>debug.log
- */
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
 
-var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
+    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;
+        }
 
-if (1 !== fd && 2 !== fd) {
-  util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')()
-}
+        bi = str.indexOf(b, i + 1);
+      }
 
-var stream = 1 === fd ? process.stdout :
-             2 === fd ? process.stderr :
-             createWritableStdioStream(fd);
+      i = ai < bi && ai >= 0 ? ai : bi;
+    }
 
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
+    if (begs.length) {
+      result = [ left, right ];
+    }
+  }
 
-function useColors() {
-  return 'colors' in exports.inspectOpts
-    ? Boolean(exports.inspectOpts.colors)
-    : tty.isatty(fd);
+  return result;
 }
 
-/**
- * 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.
- */
+/***/ "../../node_modules/brace-expansion/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.formatters.O = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts);
-};
+var concatMap = __webpack_require__("../../node_modules/concat-map/index.js");
+var balanced = __webpack_require__("../../node_modules/balanced-match/index.js");
 
-/**
- * Adds ANSI color escape codes if enabled.
- *
- * @api public
- */
+module.exports = expandTop;
 
-function formatArgs(args) {
-  var name = this.namespace;
-  var useColors = this.useColors;
-
-  if (useColors) {
-    var c = this.color;
-    var prefix = '  \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m';
-
-    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
-    args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
-  } else {
-    args[0] = new Date().toUTCString()
-      + ' ' + name + ' ' + args[0];
-  }
-}
-
-/**
- * Invokes `util.format()` with the specified arguments and writes to `stream`.
- */
+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 log() {
-  return stream.write(util.format.apply(util, arguments) + '\n');
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
 }
 
-/**
- * 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;
-  }
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
 }
 
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-function load() {
-  return process.env.DEBUG;
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
 }
 
-/**
- * Copied from `node/src/node.js`.
- *
- * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
- * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
- */
 
-function createWritableStdioStream (fd) {
-  var stream;
-  var tty_wrap = process.binding('tty_wrap');
+// 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 [''];
 
-  // Note stream._type is used for test-module-load-list.js
+  var parts = [];
+  var m = balanced('{', '}', str);
 
-  switch (tty_wrap.guessHandleType(fd)) {
-    case 'TTY':
-      stream = new tty.WriteStream(fd);
-      stream._type = 'tty';
+  if (!m)
+    return str.split(',');
 
-      // Hack to have stream not keep the event loop alive.
-      // See https://github.com/joyent/node/issues/1726
-      if (stream._handle && stream._handle.unref) {
-        stream._handle.unref();
-      }
-      break;
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
 
-    case 'FILE':
-      var fs = __webpack_require__(253);
-      stream = new fs.SyncWriteStream(fd, { autoClose: false });
-      stream._type = 'fs';
-      break;
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
 
-    case 'PIPE':
-    case 'TCP':
-      var net = __webpack_require__(331);
-      stream = new net.Socket({
-        fd: fd,
-        readable: false,
-        writable: true
-      });
+  parts.push.apply(parts, p);
 
-      // FIXME Should probably have an option in net.Socket to create a
-      // stream from an existing fd which is writable only. But for now
-      // we'll just add this hack and set the `readable` member to false.
-      // Test: ./node test/fixtures/echo.js < /etc/passwd
-      stream.readable = false;
-      stream.read = null;
-      stream._type = 'pipe';
+  return parts;
+}
 
-      // FIXME Hack to have stream not keep the event loop alive.
-      // See https://github.com/joyent/node/issues/1726
-      if (stream._handle && stream._handle.unref) {
-        stream._handle.unref();
-      }
-      break;
+function expandTop(str) {
+  if (!str)
+    return [];
 
-    default:
-      // Probably an error on in uv_guess_handle()
-      throw new Error('Implement me. Unknown stream file type!');
+  // 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);
   }
 
-  // For supporting legacy API we put the FD here.
-  stream.fd = fd;
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
 
-  stream._isStdio = true;
+function identity(e) {
+  return e;
+}
 
-  return stream;
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
 }
 
-/**
- * Init logic for `debug` instances.
- *
- * Create a new `inspectOpts` object in case `useColors` is set
- * differently for a particular `debug` instance.
- */
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
 
-function init (debug) {
-  debug.inspectOpts = {};
+function expand(str, isTop) {
+  var expansions = [];
 
-  var keys = Object.keys(exports.inspectOpts);
-  for (var i = 0; i < keys.length; i++) {
-    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+  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];
   }
-}
 
-/**
- * Enable namespaces listed in `process.env.DEBUG` initially.
- */
+  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;
+        });
+      }
+    }
+  }
 
-exports.enable(load());
+  // 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)
+    : [''];
 
-/***/ }),
-/* 331 */
-/***/ (function(module, exports) {
+  var N;
 
-module.exports = require("net");
+  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);
 
-/***/ }),
-/* 332 */
-/***/ (function(module, exports) {
+    N = [];
 
-module.exports = require("zlib");
+    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);
+    }
+  }
+
+  return expansions;
+}
 
-/***/ }),
-/* 333 */
-/***/ (function(module) {
 
-module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.21.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\",\"fix\":\"eslint --fix lib/**/*.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.17.0\",\"coveralls\":\"^3.0.0\",\"es6-promise\":\"^4.2.4\",\"grunt\":\"^1.0.2\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.1.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^20.1.0\",\"grunt-karma\":\"^2.0.0\",\"grunt-mocha-test\":\"^0.13.3\",\"grunt-ts\":\"^6.0.0-beta.19\",\"grunt-webpack\":\"^1.0.18\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^1.3.0\",\"karma-chrome-launcher\":\"^2.2.0\",\"karma-coverage\":\"^1.1.1\",\"karma-firefox-launcher\":\"^1.1.0\",\"karma-jasmine\":\"^1.1.1\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-opera-launcher\":\"^1.0.0\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^1.2.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\",\"mocha\":\"^5.2.0\",\"sinon\":\"^4.5.0\",\"typescript\":\"^2.8.1\",\"url-search-params\":\"^0.10.0\",\"webpack\":\"^1.13.1\",\"webpack-dev-server\":\"^1.14.1\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"jsdelivr\":\"dist/axios.min.js\",\"unpkg\":\"dist/axios.min.js\",\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"^1.10.0\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
 
 /***/ }),
-/* 334 */
+
+/***/ "../../node_modules/braces/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(300);
+const stringify = __webpack_require__("../../node_modules/braces/lib/stringify.js");
+const compile = __webpack_require__("../../node_modules/braces/lib/compile.js");
+const expand = __webpack_require__("../../node_modules/braces/lib/expand.js");
+const parse = __webpack_require__("../../node_modules/braces/lib/parse.js");
 
 /**
- * Config-specific merge-function which creates a new config-object
- * by merging two configuration objects together.
+ * Expand the given pattern or create a regex-compatible string.
  *
- * @param {Object} config1
- * @param {Object} config2
- * @returns {Object} New object resulting from merging config2 to config1
+ * ```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
  */
-module.exports = function mergeConfig(config1, config2) {
-  // eslint-disable-next-line no-param-reassign
-  config2 = config2 || {};
-  var config = {};
 
-  var valueFromConfig2Keys = ['url', 'method', 'data'];
-  var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy', 'params'];
-  var defaultToConfig2Keys = [
-    'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
-    'timeout', 'timeoutMessage', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
-    'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'decompress',
-    'maxContentLength', 'maxBodyLength', 'maxRedirects', 'transport', 'httpAgent',
-    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
-  ];
-  var directMergeKeys = ['validateStatus'];
+const braces = (input, options = {}) => {
+  let output = [];
 
-  function getMergedValue(target, source) {
-    if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
-      return utils.merge(target, source);
-    } else if (utils.isPlainObject(source)) {
-      return utils.merge({}, source);
-    } else if (utils.isArray(source)) {
-      return source.slice();
+  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);
+      }
     }
-    return source;
+  } else {
+    output = [].concat(braces.create(input, options));
   }
 
-  function mergeDeepProperties(prop) {
-    if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
-    } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
-    }
+  if (options && options.expand === true && options.nodupes === true) {
+    output = [...new Set(output)];
   }
+  return output;
+};
 
-  utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
-    if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
-    }
-  });
+/**
+ * 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
+ */
 
-  utils.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
+braces.parse = (input, options = {}) => parse(input, options);
 
-  utils.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
-    if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
-    } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
-    }
-  });
+/**
+ * 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
+ */
 
-  utils.forEach(directMergeKeys, function merge(prop) {
-    if (prop in config2) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
-    } else if (prop in config1) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
-    }
-  });
+braces.stringify = (input, options = {}) => {
+  if (typeof input === 'string') {
+    return stringify(braces.parse(input, options), options);
+  }
+  return stringify(input, options);
+};
 
-  var axiosKeys = valueFromConfig2Keys
-    .concat(mergeDeepPropertiesKeys)
-    .concat(defaultToConfig2Keys)
-    .concat(directMergeKeys);
+/**
+ * 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
+ */
 
-  var otherKeys = Object
-    .keys(config1)
-    .concat(Object.keys(config2))
-    .filter(function filterAxiosKeys(key) {
-      return axiosKeys.indexOf(key) === -1;
-    });
+braces.compile = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
+  return compile(input, options);
+};
 
-  utils.forEach(otherKeys, mergeDeepProperties);
+/**
+ * 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 config;
-};
+braces.expand = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
 
+  let result = expand(input, options);
 
-/***/ }),
-/* 335 */
-/***/ (function(module, exports, __webpack_require__) {
+  // filter out empty strings if specified
+  if (options.noempty === true) {
+    result = result.filter(Boolean);
+  }
 
-"use strict";
+  // filter out duplicates if specified
+  if (options.nodupes === true) {
+    result = [...new Set(result)];
+  }
 
+  return result;
+};
 
 /**
- * A `Cancel` is an object that is thrown when an operation is canceled.
+ * 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.
  *
- * @class
- * @param {string=} message The message.
+ * ```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 Cancel(message) {
-  this.message = message;
-}
 
-Cancel.prototype.toString = function toString() {
-  return 'Cancel' + (this.message ? ': ' + this.message : '');
+braces.create = (input, options = {}) => {
+  if (input === '' || input.length < 3) {
+    return [input];
+  }
+
+ return options.expand !== true
+    ? braces.compile(input, options)
+    : braces.expand(input, options);
 };
 
-Cancel.prototype.__CANCEL__ = true;
+/**
+ * Expose "braces"
+ */
 
-module.exports = Cancel;
+module.exports = braces;
 
 
 /***/ }),
-/* 336 */
+
+/***/ "../../node_modules/braces/lib/compile.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Cancel = __webpack_require__(335);
-
-/**
- * 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.');
-  }
+const fill = __webpack_require__("../../node_modules/fill-range/index.js");
+const utils = __webpack_require__("../../node_modules/braces/lib/utils.js");
 
-  var resolvePromise;
-  this.promise = new Promise(function promiseExecutor(resolve) {
-    resolvePromise = resolve;
-  });
+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 = '';
 
-  var token = this;
-  executor(function cancel(message) {
-    if (token.reason) {
-      // Cancellation has already been requested
-      return;
+    if (node.isOpen === true) {
+      return prefix + node.value;
+    }
+    if (node.isClose === true) {
+      return prefix + node.value;
     }
 
-    token.reason = new Cancel(message);
-    resolvePromise(token.reason);
-  });
-}
+    if (node.type === 'open') {
+      return invalid ? (prefix + node.value) : '(';
+    }
 
-/**
- * Throws a `Cancel` if cancellation has been requested.
- */
-CancelToken.prototype.throwIfRequested = function throwIfRequested() {
-  if (this.reason) {
-    throw this.reason;
-  }
-};
+    if (node.type === 'close') {
+      return invalid ? (prefix + node.value) : ')';
+    }
 
-/**
- * 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
+    if (node.type === 'comma') {
+      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
+    }
+
+    if (node.value) {
+      return node.value;
+    }
+
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
+      let range = fill(...args, { ...options, wrap: false, toRegex: true });
+
+      if (range.length !== 0) {
+        return args.length > 1 && range.length > 1 ? `(${range})` : range;
+      }
+    }
+
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += walk(child, node);
+      }
+    }
+    return output;
   };
+
+  return walk(ast);
 };
 
-module.exports = CancelToken;
+module.exports = compile;
 
 
 /***/ }),
-/* 337 */
+
+/***/ "../../node_modules/braces/lib/constants.js":
 /***/ (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);
-  };
-};
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
 
+  // Digits
+  CHAR_0: '0', /* 0 */
+  CHAR_9: '9', /* 9 */
 
-/***/ }),
-/* 338 */
-/***/ (function(module, exports, __webpack_require__) {
+  // Alphabet chars.
+  CHAR_UPPERCASE_A: 'A', /* A */
+  CHAR_LOWERCASE_A: 'a', /* a */
+  CHAR_UPPERCASE_Z: 'Z', /* Z */
+  CHAR_LOWERCASE_Z: 'z', /* z */
 
-"use strict";
+  CHAR_LEFT_PARENTHESES: '(', /* ( */
+  CHAR_RIGHT_PARENTHESES: ')', /* ) */
 
+  CHAR_ASTERISK: '*', /* * */
 
-/**
- * Determines whether the payload is an error thrown by Axios
- *
- * @param {*} payload The value to test
- * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
- */
-module.exports = function isAxiosError(payload) {
-  return (typeof payload === 'object') && (payload.isAxiosError === true);
+  // 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 */
 };
 
 
 /***/ }),
-/* 339 */
+
+/***/ "../../node_modules/braces/lib/expand.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.parseConfig = parseConfig;
+const fill = __webpack_require__("../../node_modules/fill-range/index.js");
+const stringify = __webpack_require__("../../node_modules/braces/lib/stringify.js");
+const utils = __webpack_require__("../../node_modules/braces/lib/utils.js");
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+const append = (queue = '', stash = '', enclose = false) => {
+  let result = [];
 
-/**
- * Information about how CiStatsReporter should talk to the ci-stats service. Normally
- * it is read from a JSON environment variable using the `parseConfig()` function
- * exported by this module.
- */
-function validateConfig(log, config) {
-  const validApiToken = typeof config.apiToken === 'string' && config.apiToken.length !== 0;
+  queue = [].concat(queue);
+  stash = [].concat(stash);
 
-  if (!validApiToken) {
-    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid api token, stats will not be reported');
-    return;
+  if (!stash.length) return queue;
+  if (!queue.length) {
+    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
   }
 
-  const validId = typeof config.buildId === 'string' && config.buildId.length !== 0;
-
-  if (!validId) {
-    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid build id, stats will not be reported');
-    return;
+  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);
+};
 
-  return config;
-}
+const expand = (ast, options = {}) => {
+  let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
 
-function parseConfig(log) {
-  const configJson = process.env.KIBANA_CI_STATS_CONFIG;
+  let walk = (node, parent = {}) => {
+    node.queue = [];
 
-  if (!configJson) {
-    log.debug('KIBANA_CI_STATS_CONFIG environment variable not found, disabling CiStatsReporter');
-    return;
-  }
+    let p = parent;
+    let q = parent.queue;
 
-  let config;
+    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
+      p = p.parent;
+      q = p.queue;
+    }
 
-  try {
-    config = JSON.parse(configJson);
-  } catch (_) {// handled below
-  }
+    if (node.invalid || node.dollar) {
+      q.push(append(q.pop(), stringify(node, options)));
+      return;
+    }
 
-  if (typeof config === 'object' && config !== null) {
-    return validateConfig(log, config);
-  }
+    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
+      q.push(append(q.pop(), ['{}']));
+      return;
+    }
 
-  log.warning('KIBANA_CI_STATS_CONFIG is invalid, stats will not be reported');
-  return;
-}
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
 
-/***/ }),
-/* 340 */
-/***/ (function(module, exports) {
+      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.');
+      }
 
-function webpackEmptyContext(req) {
-	var e = new Error("Cannot find module '" + req + "'");
-	e.code = 'MODULE_NOT_FOUND';
-	throw e;
-}
-webpackEmptyContext.keys = function() { return []; };
-webpackEmptyContext.resolve = webpackEmptyContext;
-module.exports = webpackEmptyContext;
-webpackEmptyContext.id = 340;
+      let range = fill(...args, options);
+      if (range.length === 0) {
+        range = stringify(node, options);
+      }
 
-/***/ }),
-/* 341 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      q.push(append(q.pop(), range));
+      node.nodes = [];
+      return;
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "log", function() { return log; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Log", function() { return Log; });
-/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5);
-/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_tooling_log__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; }
+    let enclose = utils.encloseBrace(node);
+    let queue = node.queue;
+    let block = node;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
+      block = block.parent;
+      queue = block.queue;
+    }
 
+    for (let i = 0; i < node.nodes.length; i++) {
+      let child = node.nodes[i];
 
-class Log extends _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLog"] {
-  constructor() {
-    super();
+      if (child.type === 'comma' && node.type === 'brace') {
+        if (i === 1) queue.push('');
+        queue.push('');
+        continue;
+      }
 
-    _defineProperty(this, "logLevel", void 0);
+      if (child.type === 'close') {
+        q.push(append(q.pop(), queue, enclose));
+        continue;
+      }
 
-    this.setLogLevel('info');
-  }
+      if (child.value && child.type !== 'open') {
+        queue.push(append(queue.pop(), child.value));
+        continue;
+      }
 
-  setLogLevel(level) {
-    this.logLevel = Object(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["parseLogLevel"])(level);
-    this.setWriters([new _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLogTextWriter"]({
-      level: this.logLevel.name,
-      writeTo: process.stdout
-    })]);
-  }
+      if (child.nodes) {
+        walk(child, node);
+      }
+    }
 
-  wouldLogLevel(level) {
-    return this.logLevel.flags[level];
-  }
+    return queue;
+  };
 
-}
+  return utils.flatten(walk(ast));
+};
 
-const log = new Log();
+module.exports = expand;
 
 
 /***/ }),
-/* 342 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/braces/lib/parse.js":
+/***/ (function(module, 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 stream__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(294);
-/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(stream__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(235);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(255);
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(343);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(341);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+const stringify = __webpack_require__("../../node_modules/braces/lib/stringify.js");
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/**
+ * Constants
  */
 
+const {
+  MAX_LENGTH,
+  CHAR_BACKSLASH, /* \ */
+  CHAR_BACKTICK, /* ` */
+  CHAR_COMMA, /* , */
+  CHAR_DOT, /* . */
+  CHAR_LEFT_PARENTHESES, /* ( */
+  CHAR_RIGHT_PARENTHESES, /* ) */
+  CHAR_LEFT_CURLY_BRACE, /* { */
+  CHAR_RIGHT_CURLY_BRACE, /* } */
+  CHAR_LEFT_SQUARE_BRACKET, /* [ */
+  CHAR_RIGHT_SQUARE_BRACKET, /* ] */
+  CHAR_DOUBLE_QUOTE, /* " */
+  CHAR_SINGLE_QUOTE, /* ' */
+  CHAR_NO_BREAK_SPACE,
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE
+} = __webpack_require__("../../node_modules/braces/lib/constants.js");
 
+/**
+ * parse
+ */
 
+const parse = (input, options = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
 
+  let opts = options || {};
+  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  if (input.length > max) {
+    throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
+  }
 
-const colorWheel = [chalk__WEBPACK_IMPORTED_MODULE_1___default.a.cyan, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.magenta, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.blue, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.yellow, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.green];
-
-const getColor = () => {
-  const color = colorWheel.shift();
-  colorWheel.push(color);
-  return color;
-};
-
-function spawn(command, args, opts) {
-  return execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
-    stdio: 'inherit',
-    preferLocal: true
-  }, opts));
-}
-
-function streamToLog(debug = true) {
-  return new stream__WEBPACK_IMPORTED_MODULE_0__["Writable"]({
-    objectMode: true,
+  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 = {};
 
-    write(line, _, cb) {
-      if (line.endsWith('\n')) {
-        _log__WEBPACK_IMPORTED_MODULE_4__["log"][debug ? 'debug' : 'write'](line.slice(0, -1));
-      } else {
-        _log__WEBPACK_IMPORTED_MODULE_4__["log"][debug ? 'debug' : 'write'](line);
-      }
+  /**
+   * Helpers
+   */
 
-      cb();
+  const advance = () => input[index++];
+  const push = node => {
+    if (node.type === 'text' && prev.type === 'dot') {
+      prev.type = 'text';
     }
 
-  });
-}
+    if (prev && prev.type === 'text' && node.type === 'text') {
+      prev.value += node.value;
+      return;
+    }
 
-function spawnStreaming(command, args, opts, {
-  prefix,
-  debug
-}) {
-  const spawned = execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
-    stdio: ['ignore', 'pipe', 'pipe'],
-    preferLocal: true
-  }, opts));
-  const color = getColor();
-  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: color.bold(prefix)
-  });
-  spawned.stdout.pipe(prefixedStdout).pipe(streamToLog(debug)); // TypeScript note: As long as the proc stdio[1] is 'pipe', then stdout will not be null
+    block.nodes.push(node);
+    node.parent = block;
+    node.prev = prev;
+    prev = node;
+    return node;
+  };
 
-  spawned.stderr.pipe(prefixedStderr).pipe(streamToLog(debug)); // TypeScript note: As long as the proc stdio[2] is 'pipe', then stderr will not be null
+  push({ type: 'bos' });
 
-  return spawned;
-}
+  while (index < length) {
+    block = stack[stack.length - 1];
+    value = advance();
 
-/***/ }),
-/* 343 */
-/***/ (function(module, exports, __webpack_require__) {
+    /**
+     * Invalid chars
+     */
 
-// Copyright IBM Corp. 2014,2018. All Rights Reserved.
-// Node module: strong-log-transformer
-// This file is licensed under the Apache License 2.0.
-// License text available at https://opensource.org/licenses/Apache-2.0
+    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
+      continue;
+    }
 
-module.exports = __webpack_require__(344);
-module.exports.cli = __webpack_require__(348);
+    /**
+     * Escaped chars
+     */
 
+    if (value === CHAR_BACKSLASH) {
+      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
+      continue;
+    }
 
-/***/ }),
-/* 344 */
-/***/ (function(module, exports, __webpack_require__) {
+    /**
+     * Right square bracket (literal): ']'
+     */
 
-"use strict";
-// Copyright IBM Corp. 2014,2018. All Rights Reserved.
-// Node module: strong-log-transformer
-// This file is licensed under the Apache License 2.0.
-// License text available at https://opensource.org/licenses/Apache-2.0
+    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
+      push({ type: 'text', value: '\\' + value });
+      continue;
+    }
 
+    /**
+     * Left square bracket: '['
+     */
 
+    if (value === CHAR_LEFT_SQUARE_BRACKET) {
+      brackets++;
 
-var stream = __webpack_require__(294);
-var util = __webpack_require__(234);
-var fs = __webpack_require__(253);
+      let closed = true;
+      let next;
 
-var through = __webpack_require__(345);
-var duplexer = __webpack_require__(346);
-var StringDecoder = __webpack_require__(347).StringDecoder;
+      while (index < length && (next = advance())) {
+        value += next;
 
-module.exports = Logger;
+        if (next === CHAR_LEFT_SQUARE_BRACKET) {
+          brackets++;
+          continue;
+        }
 
-Logger.DEFAULTS = {
-  format: 'text',
-  tag: '',
-  mergeMultiline: false,
-  timeStamp: false,
-};
+        if (next === CHAR_BACKSLASH) {
+          value += advance();
+          continue;
+        }
 
-var formatters = {
-  text: textFormatter,
-  json: jsonFormatter,
-}
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          brackets--;
 
-function Logger(options) {
-  var defaults = JSON.parse(JSON.stringify(Logger.DEFAULTS));
-  options = util._extend(defaults, options || {});
-  var catcher = deLiner();
-  var emitter = catcher;
-  var transforms = [
-    objectifier(),
-  ];
-
-  if (options.tag) {
-    transforms.push(staticTagger(options.tag));
-  }
-
-  if (options.mergeMultiline) {
-    transforms.push(lineMerger());
-  }
-
-  // TODO
-  // if (options.pidStamp) {
-  //   transforms.push(pidStamper(options.pid));
-  // }
-
-  // TODO
-  // if (options.workerStamp) {
-  //   transforms.push(workerStamper(options.worker));
-  // }
-
-  transforms.push(formatters[options.format](options));
-
-  // restore line endings that were removed by line splitting
-  transforms.push(reLiner());
-
-  for (var t in transforms) {
-    emitter = emitter.pipe(transforms[t]);
-  }
-
-  return duplexer(catcher, emitter);
-}
-
-function deLiner() {
-  var decoder = new StringDecoder('utf8');
-  var last = '';
-
-  return new stream.Transform({
-    transform(chunk, _enc, callback) {
-      last += decoder.write(chunk);
-      var list = last.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
-      last = list.pop();
-      for (var i = 0; i < list.length; i++) {
-        // swallow empty lines
-        if (list[i]) {
-          this.push(list[i]);
+          if (brackets === 0) {
+            break;
+          }
         }
       }
-      callback();
-    },
-    flush(callback) {
-      // incomplete UTF8 sequences become UTF8 replacement characters
-      last += decoder.end();
-      if (last) {
-        this.push(last);
-      }
-      callback();
-    },
-  });
-}
-
-function reLiner() {
-  return through(appendNewline);
-
-  function appendNewline(line) {
-    this.emit('data', line + '\n');
-  }
-}
-
-function objectifier() {
-  return through(objectify, null, {autoDestroy: false});
-
-  function objectify(line) {
-    this.emit('data', {
-      msg: line,
-      time: Date.now(),
-    });
-  }
-}
-
-function staticTagger(tag) {
-  return through(tagger);
 
-  function tagger(logEvent) {
-    logEvent.tag = tag;
-    this.emit('data', logEvent);
-  }
-}
+      push({ type: 'text', value });
+      continue;
+    }
 
-function textFormatter(options) {
-  return through(textify);
+    /**
+     * Parentheses
+     */
 
-  function textify(logEvent) {
-    var line = util.format('%s%s', textifyTags(logEvent.tag),
-                           logEvent.msg.toString());
-    if (options.timeStamp) {
-      line = util.format('%s %s', new Date(logEvent.time).toISOString(), line);
+    if (value === CHAR_LEFT_PARENTHESES) {
+      block = push({ type: 'paren', nodes: [] });
+      stack.push(block);
+      push({ type: 'text', value });
+      continue;
     }
-    this.emit('data', line.replace(/\n/g, '\\n'));
-  }
 
-  function textifyTags(tags) {
-    var str = '';
-    if (typeof tags === 'string') {
-      str = tags + ' ';
-    } else if (typeof tags === 'object') {
-      for (var t in tags) {
-        str += t + ':' + tags[t] + ' ';
+    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;
     }
-    return str;
-  }
-}
 
-function jsonFormatter(options) {
-  return through(jsonify);
+    /**
+     * Quotes: '|"|`
+     */
 
-  function jsonify(logEvent) {
-    if (options.timeStamp) {
-      logEvent.time = new Date(logEvent.time).toISOString();
-    } else {
-      delete logEvent.time;
-    }
-    logEvent.msg = logEvent.msg.toString();
-    this.emit('data', JSON.stringify(logEvent));
-  }
-}
+    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
+      let open = value;
+      let next;
 
-function lineMerger(host) {
-  var previousLine = null;
-  var flushTimer = null;
-  var stream = through(lineMergerWrite, lineMergerEnd);
-  var flush = _flush.bind(stream);
+      if (options.keepQuotes !== true) {
+        value = '';
+      }
 
-  return stream;
+      while (index < length && (next = advance())) {
+        if (next === CHAR_BACKSLASH) {
+          value += next + advance();
+          continue;
+        }
 
-  function lineMergerWrite(line) {
-    if (/^\s+/.test(line.msg)) {
-      if (previousLine) {
-        previousLine.msg += '\n' + line.msg;
-      } else {
-        previousLine = line;
+        if (next === open) {
+          if (options.keepQuotes === true) value += next;
+          break;
+        }
+
+        value += next;
       }
-    } else {
-      flush();
-      previousLine = line;
-    }
-    // rolling timeout
-    clearTimeout(flushTimer);
-    flushTimer = setTimeout(flush.bind(this), 10);
-  }
 
-  function _flush() {
-    if (previousLine) {
-      this.emit('data', previousLine);
-      previousLine = null;
+      push({ type: 'text', value });
+      continue;
     }
-  }
 
-  function lineMergerEnd() {
-    flush.call(this);
-    this.emit('end');
-  }
-}
+    /**
+     * Left curly brace: '{'
+     */
 
+    if (value === CHAR_LEFT_CURLY_BRACE) {
+      depth++;
 
-/***/ }),
-/* 345 */
-/***/ (function(module, exports, __webpack_require__) {
+      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: []
+      };
 
-var Stream = __webpack_require__(294)
+      block = push(brace);
+      stack.push(block);
+      push({ type: 'open', value });
+      continue;
+    }
 
-// through
-//
-// a stream that does nothing but re-emit the input.
-// useful for aggregating a series of changing but not ending streams into one stream)
+    /**
+     * Right curly brace: '}'
+     */
 
-exports = module.exports = through
-through.through = through
+    if (value === CHAR_RIGHT_CURLY_BRACE) {
+      if (block.type !== 'brace') {
+        push({ type: 'text', value });
+        continue;
+      }
 
-//create a readable writable stream.
+      let type = 'close';
+      block = stack.pop();
+      block.close = true;
 
-function through (write, end, opts) {
-  write = write || function (data) { this.queue(data) }
-  end = end || function () { this.queue(null) }
+      push({ type, value });
+      depth--;
 
-  var ended = false, destroyed = false, buffer = [], _ended = false
-  var stream = new Stream()
-  stream.readable = stream.writable = true
-  stream.paused = false
+      block = stack[stack.length - 1];
+      continue;
+    }
 
-//  stream.autoPause   = !(opts && opts.autoPause   === false)
-  stream.autoDestroy = !(opts && opts.autoDestroy === false)
+    /**
+     * Comma: ','
+     */
 
-  stream.write = function (data) {
-    write.call(this, data)
-    return !stream.paused
-  }
+    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 drain() {
-    while(buffer.length && !stream.paused) {
-      var data = buffer.shift()
-      if(null === data)
-        return stream.emit('end')
-      else
-        stream.emit('data', data)
+      push({ type: 'comma', value });
+      block.commas++;
+      continue;
     }
-  }
-
-  stream.queue = stream.push = function (data) {
-//    console.error(ended)
-    if(_ended) return stream
-    if(data === null) _ended = true
-    buffer.push(data)
-    drain()
-    return stream
-  }
 
-  //this will be registered as the first 'end' listener
-  //must call destroy next tick, to make sure we're after any
-  //stream piped from here.
-  //this is only a problem if end is not emitted synchronously.
-  //a nicer way to do this is to make sure this is the last listener for 'end'
+    /**
+     * Dot: '.'
+     */
 
-  stream.on('end', function () {
-    stream.readable = false
-    if(!stream.writable && stream.autoDestroy)
-      process.nextTick(function () {
-        stream.destroy()
-      })
-  })
+    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
+      let siblings = block.nodes;
 
-  function _end () {
-    stream.writable = false
-    end.call(stream)
-    if(!stream.readable && stream.autoDestroy)
-      stream.destroy()
-  }
+      if (depth === 0 || siblings.length === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
 
-  stream.end = function (data) {
-    if(ended) return
-    ended = true
-    if(arguments.length) stream.write(data)
-    _end() // will emit or queue
-    return stream
-  }
+      if (prev.type === 'dot') {
+        block.range = [];
+        prev.value += value;
+        prev.type = 'range';
 
-  stream.destroy = function () {
-    if(destroyed) return
-    destroyed = true
-    ended = true
-    buffer.length = 0
-    stream.writable = stream.readable = false
-    stream.emit('close')
-    return stream
-  }
+        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
+          block.invalid = true;
+          block.ranges = 0;
+          prev.type = 'text';
+          continue;
+        }
 
-  stream.pause = function () {
-    if(stream.paused) return
-    stream.paused = true
-    return stream
-  }
+        block.ranges++;
+        block.args = [];
+        continue;
+      }
 
-  stream.resume = function () {
-    if(stream.paused) {
-      stream.paused = false
-      stream.emit('resume')
-    }
-    drain()
-    //may have become paused again,
-    //as drain emits 'data'.
-    if(!stream.paused)
-      stream.emit('drain')
-    return stream
-  }
-  return stream
-}
+      if (prev.type === 'range') {
+        siblings.pop();
 
+        let before = siblings[siblings.length - 1];
+        before.value += prev.value + value;
+        prev = before;
+        block.ranges--;
+        continue;
+      }
 
+      push({ type: 'dot', value });
+      continue;
+    }
 
-/***/ }),
-/* 346 */
-/***/ (function(module, exports, __webpack_require__) {
+    /**
+     * Text
+     */
 
-var Stream = __webpack_require__(294)
-var writeMethods = ["write", "end", "destroy"]
-var readMethods = ["resume", "pause"]
-var readEvents = ["data", "close"]
-var slice = Array.prototype.slice
+    push({ type: 'text', value });
+  }
 
-module.exports = duplex
+  // Mark imbalanced braces and brackets as invalid
+  do {
+    block = stack.pop();
 
-function forEach (arr, fn) {
-    if (arr.forEach) {
-        return arr.forEach(fn)
-    }
+    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;
+        }
+      });
 
-    for (var i = 0; i < arr.length; i++) {
-        fn(arr[i], i)
+      // 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);
     }
-}
-
-function duplex(writer, reader) {
-    var stream = new Stream()
-    var ended = false
+  } while (stack.length > 0);
 
-    forEach(writeMethods, proxyWriter)
+  push({ type: 'eos' });
+  return ast;
+};
 
-    forEach(readMethods, proxyReader)
+module.exports = parse;
 
-    forEach(readEvents, proxyStream)
 
-    reader.on("end", handleEnd)
+/***/ }),
 
-    writer.on("drain", function() {
-      stream.emit("drain")
-    })
+/***/ "../../node_modules/braces/lib/stringify.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    writer.on("error", reemit)
-    reader.on("error", reemit)
+"use strict";
 
-    stream.writable = writer.writable
-    stream.readable = reader.readable
 
-    return stream
+const utils = __webpack_require__("../../node_modules/braces/lib/utils.js");
 
-    function proxyWriter(methodName) {
-        stream[methodName] = method
+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 = '';
 
-        function method() {
-            return writer[methodName].apply(writer, arguments)
-        }
+    if (node.value) {
+      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
+        return '\\' + node.value;
+      }
+      return node.value;
     }
 
-    function proxyReader(methodName) {
-        stream[methodName] = method
-
-        function method() {
-            stream.emit(methodName)
-            var func = reader[methodName]
-            if (func) {
-                return func.apply(reader, arguments)
-            }
-            reader.emit(methodName)
-        }
+    if (node.value) {
+      return node.value;
     }
 
-    function proxyStream(methodName) {
-        reader.on(methodName, reemit)
-
-        function reemit() {
-            var args = slice.call(arguments)
-            args.unshift(methodName)
-            stream.emit.apply(stream, args)
-        }
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += stringify(child);
+      }
     }
+    return output;
+  };
 
-    function handleEnd() {
-        if (ended) {
-            return
-        }
-        ended = true
-        var args = slice.call(arguments)
-        args.unshift("end")
-        stream.emit.apply(stream, args)
-    }
+  return stringify(ast);
+};
 
-    function reemit(err) {
-        stream.emit("error", err)
-    }
-}
 
 
 /***/ }),
-/* 347 */
-/***/ (function(module, exports) {
 
-module.exports = require("string_decoder");
-
-/***/ }),
-/* 348 */
+/***/ "../../node_modules/braces/lib/utils.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-// Copyright IBM Corp. 2014,2018. All Rights Reserved.
-// Node module: strong-log-transformer
-// This file is licensed under the Apache License 2.0.
-// License text available at https://opensource.org/licenses/Apache-2.0
 
 
+exports.isInteger = num => {
+  if (typeof num === 'number') {
+    return Number.isInteger(num);
+  }
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isInteger(Number(num));
+  }
+  return false;
+};
 
-var minimist = __webpack_require__(349);
-var path = __webpack_require__(4);
+/**
+ * Find a node of the given type
+ */
 
-var Logger = __webpack_require__(344);
-var pkg = __webpack_require__(350);
+exports.find = (node, type) => node.nodes.find(node => node.type === type);
 
-module.exports = cli;
+/**
+ * Find a node of the given type
+ */
 
-function cli(args) {
-  var opts = minimist(args.slice(2));
-  var $0 = path.basename(args[1]);
-  var p = console.log.bind(console);
-  if (opts.v || opts.version) {
-    version($0, p);
-  } else if (opts.h || opts.help) {
-    usage($0, p);
-  } else if (args.length < 3) {
-    process.stdin.pipe(Logger()).pipe(process.stdout);
-  } else {
-    process.stdin.pipe(Logger(opts)).pipe(process.stdout);
-  }
-}
+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 version($0, p) {
-  p('%s v%s', pkg.name, pkg.version);
-}
+/**
+ * Escape the given node with '\\' before node.value
+ */
 
-function usage($0, p) {
-  var PADDING = '               ';
-  var opt, def;
-  p('Usage: %s [options]', $0);
-  p('');
-  p('%s', pkg.description);
-  p('');
-  p('OPTIONS:');
-  for (opt in Logger.DEFAULTS) {
-    def = Logger.DEFAULTS[opt];
-    if (typeof def === 'boolean')
-      boolOpt(opt, Logger.DEFAULTS[opt]);
-    else
-      stdOpt(opt, Logger.DEFAULTS[opt]);
+exports.escapeNode = (block, n = 0, type) => {
+  let node = block.nodes[n];
+  if (!node) return;
+
+  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
+    if (node.escaped !== true) {
+      node.value = '\\' + node.value;
+      node.escaped = true;
+    }
   }
-  p('');
+};
 
-  function boolOpt(name, def) {
-    name = name + PADDING.slice(0, 20-name.length);
-    p('   --%s default: %s', name, def);
+/**
+ * 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;
+};
 
-  function stdOpt(name, def) {
-    var value = name.toUpperCase() +
-                PADDING.slice(0, 19 - name.length*2);
-    p('   --%s %s default: %j', name, value, def);
+/**
+ * Returns true if a brace node is invalid.
+ */
+
+exports.isInvalidBrace = block => {
+  if (block.type !== 'brace') return false;
+  if (block.invalid === true || block.dollar) return true;
+  if ((block.commas >> 0 + block.ranges >> 0) === 0) {
+    block.invalid = true;
+    return true;
   }
-}
+  if (block.open !== true || block.close !== true) {
+    block.invalid = true;
+    return true;
+  }
+  return false;
+};
 
+/**
+ * Returns true if a node is an open or close node
+ */
 
-/***/ }),
-/* 349 */
-/***/ (function(module, exports) {
+exports.isOpenOrClose = node => {
+  if (node.type === 'open' || node.type === 'close') {
+    return true;
+  }
+  return node.open === true || node.close === true;
+};
 
-module.exports = function (args, opts) {
-    if (!opts) opts = {};
-    
-    var flags = { bools : {}, strings : {}, unknownFn: null };
+/**
+ * Reduce an array of text nodes.
+ */
 
-    if (typeof opts['unknown'] === 'function') {
-        flags.unknownFn = opts['unknown'];
-    }
+exports.reduce = nodes => nodes.reduce((acc, node) => {
+  if (node.type === 'text') acc.push(node.value);
+  if (node.type === 'range') node.type = 'text';
+  return acc;
+}, []);
 
-    if (typeof opts['boolean'] === 'boolean' && opts['boolean']) {
-      flags.allBools = true;
-    } else {
-      [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
-          flags.bools[key] = true;
-      });
+/**
+ * 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);
     }
-    
-    var aliases = {};
-    Object.keys(opts.alias || {}).forEach(function (key) {
-        aliases[key] = [].concat(opts.alias[key]);
-        aliases[key].forEach(function (x) {
-            aliases[x] = [key].concat(aliases[key].filter(function (y) {
-                return x !== y;
-            }));
-        });
-    });
+    return result;
+  };
+  flat(args);
+  return result;
+};
 
-    [].concat(opts.string).filter(Boolean).forEach(function (key) {
-        flags.strings[key] = true;
-        if (aliases[key]) {
-            flags.strings[aliases[key]] = true;
-        }
-     });
 
-    var defaults = opts['default'] || {};
-    
-    var argv = { _ : [] };
-    Object.keys(flags.bools).forEach(function (key) {
-        setArg(key, defaults[key] === undefined ? false : defaults[key]);
-    });
-    
-    var notFlags = [];
+/***/ }),
 
-    if (args.indexOf('--') !== -1) {
-        notFlags = args.slice(args.indexOf('--')+1);
-        args = args.slice(0, args.indexOf('--'));
-    }
+/***/ "../../node_modules/chalk/source/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    function argDefined(key, arg) {
-        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
-            flags.strings[key] || flags.bools[key] || aliases[key];
-    }
+"use strict";
 
-    function setArg (key, val, arg) {
-        if (arg && flags.unknownFn && !argDefined(key, arg)) {
-            if (flags.unknownFn(arg) === false) return;
-        }
+const ansiStyles = __webpack_require__("../../node_modules/ansi-styles/index.js");
+const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__("../../node_modules/supports-color/index.js");
+const {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+} = __webpack_require__("../../node_modules/chalk/source/util.js");
 
-        var value = !flags.strings[key] && isNumber(val)
-            ? Number(val) : val
-        ;
-        setKey(argv, key.split('.'), value);
-        
-        (aliases[key] || []).forEach(function (x) {
-            setKey(argv, x.split('.'), value);
-        });
-    }
+const {isArray} = Array;
 
-    function setKey (obj, keys, value) {
-        var o = obj;
-        for (var i = 0; i < keys.length-1; i++) {
-            var key = keys[i];
-            if (isConstructorOrProto(o, key)) return;
-            if (o[key] === undefined) o[key] = {};
-            if (o[key] === Object.prototype || o[key] === Number.prototype
-                || o[key] === String.prototype) o[key] = {};
-            if (o[key] === Array.prototype) o[key] = [];
-            o = o[key];
-        }
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = [
+	'ansi',
+	'ansi',
+	'ansi256',
+	'ansi16m'
+];
 
-        var key = keys[keys.length - 1];
-        if (isConstructorOrProto(o, key)) return;
-        if (o === Object.prototype || o === Number.prototype
-            || o === String.prototype) o = {};
-        if (o === Array.prototype) o = [];
-        if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') {
-            o[key] = value;
-        }
-        else if (Array.isArray(o[key])) {
-            o[key].push(value);
-        }
-        else {
-            o[key] = [ o[key], value ];
-        }
-    }
-    
-    function aliasIsBoolean(key) {
-      return aliases[key].some(function (x) {
-          return flags.bools[x];
-      });
-    }
+const styles = Object.create(null);
 
-    for (var i = 0; i < args.length; i++) {
-        var arg = args[i];
-        
-        if (/^--.+=/.test(arg)) {
-            // Using [\s\S] instead of . because js doesn't support the
-            // 'dotall' regex modifier. See:
-            // http://stackoverflow.com/a/1068308/13216
-            var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
-            var key = m[1];
-            var value = m[2];
-            if (flags.bools[key]) {
-                value = value !== 'false';
-            }
-            setArg(key, value, arg);
-        }
-        else if (/^--no-.+/.test(arg)) {
-            var key = arg.match(/^--no-(.+)/)[1];
-            setArg(key, false, arg);
-        }
-        else if (/^--.+/.test(arg)) {
-            var key = arg.match(/^--(.+)/)[1];
-            var next = args[i + 1];
-            if (next !== undefined && !/^-/.test(next)
-            && !flags.bools[key]
-            && !flags.allBools
-            && (aliases[key] ? !aliasIsBoolean(key) : true)) {
-                setArg(key, next, arg);
-                i++;
-            }
-            else if (/^(true|false)$/.test(next)) {
-                setArg(key, next === 'true', arg);
-                i++;
-            }
-            else {
-                setArg(key, flags.strings[key] ? '' : true, arg);
-            }
-        }
-        else if (/^-[^-]+/.test(arg)) {
-            var letters = arg.slice(1,-1).split('');
-            
-            var broken = false;
-            for (var j = 0; j < letters.length; j++) {
-                var next = arg.slice(j+2);
-                
-                if (next === '-') {
-                    setArg(letters[j], next, arg)
-                    continue;
-                }
-                
-                if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
-                    setArg(letters[j], next.split('=')[1], arg);
-                    broken = true;
-                    break;
-                }
-                
-                if (/[A-Za-z]/.test(letters[j])
-                && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
-                    setArg(letters[j], next, arg);
-                    broken = true;
-                    break;
-                }
-                
-                if (letters[j+1] && letters[j+1].match(/\W/)) {
-                    setArg(letters[j], arg.slice(j+2), arg);
-                    broken = true;
-                    break;
-                }
-                else {
-                    setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
-                }
-            }
-            
-            var key = arg.slice(-1)[0];
-            if (!broken && key !== '-') {
-                if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
-                && !flags.bools[key]
-                && (aliases[key] ? !aliasIsBoolean(key) : true)) {
-                    setArg(key, args[i+1], arg);
-                    i++;
-                }
-                else if (args[i+1] && /^(true|false)$/.test(args[i+1])) {
-                    setArg(key, args[i+1] === 'true', arg);
-                    i++;
-                }
-                else {
-                    setArg(key, flags.strings[key] ? '' : true, arg);
-                }
-            }
-        }
-        else {
-            if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
-                argv._.push(
-                    flags.strings['_'] || !isNumber(arg) ? arg : Number(arg)
-                );
-            }
-            if (opts.stopEarly) {
-                argv._.push.apply(argv._, args.slice(i + 1));
-                break;
-            }
-        }
-    }
-    
-    Object.keys(defaults).forEach(function (key) {
-        if (!hasKey(argv, key.split('.'))) {
-            setKey(argv, key.split('.'), defaults[key]);
-            
-            (aliases[key] || []).forEach(function (x) {
-                setKey(argv, x.split('.'), defaults[key]);
-            });
-        }
-    });
-    
-    if (opts['--']) {
-        argv['--'] = new Array();
-        notFlags.forEach(function(key) {
-            argv['--'].push(key);
-        });
-    }
-    else {
-        notFlags.forEach(function(key) {
-            argv._.push(key);
-        });
-    }
+const applyOptions = (object, options = {}) => {
+	if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
+		throw new Error('The `level` option should be an integer from 0 to 3');
+	}
 
-    return argv;
+	// Detect level if not set manually
+	const colorLevel = stdoutColor ? stdoutColor.level : 0;
+	object.level = options.level === undefined ? colorLevel : options.level;
 };
 
-function hasKey (obj, keys) {
-    var o = obj;
-    keys.slice(0,-1).forEach(function (key) {
-        o = (o[key] || {});
-    });
-
-    var key = keys[keys.length - 1];
-    return key in o;
+class ChalkClass {
+	constructor(options) {
+		// eslint-disable-next-line no-constructor-return
+		return chalkFactory(options);
+	}
 }
 
-function isNumber (x) {
-    if (typeof x === 'number') return true;
-    if (/^0x[0-9a-f]+$/i.test(x)) return true;
-    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
-}
+const chalkFactory = options => {
+	const chalk = {};
+	applyOptions(chalk, options);
 
+	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
 
-function isConstructorOrProto (obj, key) {
-    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
-}
+	Object.setPrototypeOf(chalk, Chalk.prototype);
+	Object.setPrototypeOf(chalk.template, chalk);
 
+	chalk.template.constructor = () => {
+		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
+	};
 
-/***/ }),
-/* 350 */
-/***/ (function(module) {
+	chalk.template.Instance = ChalkClass;
 
-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\"}}");
+	return chalk.template;
+};
 
-/***/ }),
-/* 351 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function Chalk(options) {
+	return chalkFactory(options);
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "linkProjectExecutables", function() { return linkProjectExecutables; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(352);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+for (const [styleName, style] of Object.entries(ansiStyles)) {
+	styles[styleName] = {
+		get() {
+			const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty);
+			Object.defineProperty(this, styleName, {value: builder});
+			return builder;
+		}
+	};
+}
 
+styles.visible = {
+	get() {
+		const builder = createBuilder(this, this._styler, true);
+		Object.defineProperty(this, 'visible', {value: builder});
+		return builder;
+	}
+};
 
+const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
 
+for (const model of usedModels) {
+	styles[model] = {
+		get() {
+			const {level} = this;
+			return function (...arguments_) {
+				const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler);
+				return createBuilder(this, styler, this._isEmpty);
+			};
+		}
+	};
+}
 
-/**
- * Yarn does not link the executables from dependencies that are installed
- * using `link:` https://github.com/yarnpkg/yarn/pull/5046
- *
- * We simulate this functionality by walking through each project's project
- * dependencies, and manually linking their executables if defined. The logic
- * for linking was mostly adapted from lerna: https://github.com/lerna/lerna/blob/1d7eb9eeff65d5a7de64dea73613b1bf6bfa8d57/src/PackageUtilities.js#L348
- */
-async function linkProjectExecutables(projectsByName, projectGraph) {
-  _log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`Linking package executables`); // Find root and generate executables from dependencies for it
+for (const model of usedModels) {
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const {level} = this;
+			return function (...arguments_) {
+				const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler);
+				return createBuilder(this, styler, this._isEmpty);
+			};
+		}
+	};
+}
 
-  let rootProject = null;
-  let rootProjectDeps = [];
+const proto = Object.defineProperties(() => {}, {
+	...styles,
+	level: {
+		enumerable: true,
+		get() {
+			return this._generator.level;
+		},
+		set(level) {
+			this._generator.level = level;
+		}
+	}
+});
 
-  for (const [projectName, projectDeps] of projectGraph) {
-    const project = projectsByName.get(projectName);
+const createStyler = (open, close, parent) => {
+	let openAll;
+	let closeAll;
+	if (parent === undefined) {
+		openAll = open;
+		closeAll = close;
+	} else {
+		openAll = parent.openAll + open;
+		closeAll = close + parent.closeAll;
+	}
 
-    if (project.isSinglePackageJsonProject) {
-      rootProject = projectsByName.get(projectName);
-      rootProjectDeps = projectDeps;
-      break;
-    }
-  }
+	return {
+		open,
+		close,
+		openAll,
+		closeAll,
+		parent
+	};
+};
 
-  if (!rootProject) {
-    throw new Error('Could not finding root project while linking package executables');
-  } // Prepare root project node_modules/.bin
+const createBuilder = (self, _styler, _isEmpty) => {
+	const builder = (...arguments_) => {
+		if (isArray(arguments_[0]) && isArray(arguments_[0].raw)) {
+			// Called as a template literal, for example: chalk.red`2 + 3 = {bold ${2+3}}`
+			return applyStyle(builder, chalkTag(builder, ...arguments_));
+		}
 
+		// Single argument is hot path, implicit coercion is faster than anything
+		// eslint-disable-next-line no-implicit-coercion
+		return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
+	};
 
-  const rootBinsDir = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootProject.nodeModulesLocation, '.bin');
+	// We alter the prototype because we must return a function, but there is
+	// no way to create a function with a different prototype
+	Object.setPrototypeOf(builder, proto);
 
-  for (const rootProjectDep of rootProjectDeps) {
-    const executables = rootProjectDep.getExecutables();
+	builder._generator = self;
+	builder._styler = _styler;
+	builder._isEmpty = _isEmpty;
 
-    for (const name of Object.keys(executables)) {
-      const srcPath = executables[name]; // existing logic from lerna -- ensure that the bin we are going to
-      // point to exists or ignore it
+	return builder;
+};
 
-      if (!(await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["isFile"])(srcPath))) {
-        continue;
-      }
+const applyStyle = (self, string) => {
+	if (self.level <= 0 || !string) {
+		return self._isEmpty ? '' : string;
+	}
 
-      const dest = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootBinsDir, name); // Get relative project path with normalized path separators.
+	let styler = self._styler;
 
-      const rootProjectRelativePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["relative"])(rootProject.path, srcPath).split(path__WEBPACK_IMPORTED_MODULE_0__["sep"]).join('/');
-      _log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`[${rootProject.name}] ${name} -> ${rootProjectRelativePath}`);
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["mkdirp"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(dest));
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["createSymlink"])(srcPath, dest, 'exec');
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["chmod"])(dest, '755');
-    }
-  }
-}
+	if (styler === undefined) {
+		return string;
+	}
 
-/***/ }),
-/* 352 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const {openAll, closeAll} = styler;
+	if (string.indexOf('\u001B') !== -1) {
+		while (styler !== undefined) {
+			// 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'.
+			string = stringReplaceAll(string, styler.close, styler.open);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readFile", function() { return readFile; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writeFile", function() { return writeFile; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "chmod", function() { return chmod; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mkdirp", function() { return mkdirp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rmdirp", function() { return rmdirp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "unlink", function() { return unlink; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "copyDirectory", function() { return copyDirectory; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isSymlink", function() { return isSymlink; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDirectory", function() { return isDirectory; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFile", function() { return isFile; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createSymlink", function() { return createSymlink; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tryRealpath", function() { return tryRealpath; });
-/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(353);
-/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cmd_shim__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(361);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(253);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(460);
-/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(ncp__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(234);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_5__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+			styler = styler.parent;
+		}
+	}
 
+	// We can move both next actions out of loop, because remaining actions in loop won't have
+	// any/visible effect on parts we add here. 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
+	const lfIndex = string.indexOf('\n');
+	if (lfIndex !== -1) {
+		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+	}
 
+	return openAll + string + closeAll;
+};
 
+let template;
+const chalkTag = (chalk, ...strings) => {
+	const [firstString] = strings;
 
+	if (!isArray(firstString) || !isArray(firstString.raw)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return strings.join(' ');
+	}
 
+	const arguments_ = strings.slice(1);
+	const parts = [firstString.raw[0]];
 
-const lstat = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.lstat);
-const readFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.readFile);
-const writeFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.writeFile);
-const symlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.symlink);
-const chmod = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.chmod);
-const cmdShim = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(cmd_shim__WEBPACK_IMPORTED_MODULE_0___default.a);
-const mkdir = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.mkdir);
-const realpathNative = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.realpath.native);
-const mkdirp = async path => await mkdir(path, {
-  recursive: true
-});
-const rmdirp = async path => await del__WEBPACK_IMPORTED_MODULE_1___default()(path, {
-  force: true
-});
-const unlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.unlink);
-const copyDirectory = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(ncp__WEBPACK_IMPORTED_MODULE_3__["ncp"]);
+	for (let i = 1; i < firstString.length; i++) {
+		parts.push(
+			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
+			String(firstString.raw[i])
+		);
+	}
 
-async function statTest(path, block) {
-  try {
-    return block(await lstat(path));
-  } catch (e) {
-    if (e.code === 'ENOENT') {
-      return false;
-    }
+	if (template === undefined) {
+		template = __webpack_require__("../../node_modules/chalk/source/templates.js");
+	}
 
-    throw e;
-  }
-}
-/**
- * Test if a path points to a symlink.
- * @param path
- */
+	return template(chalk, parts.join(''));
+};
 
+Object.defineProperties(Chalk.prototype, styles);
 
-async function isSymlink(path) {
-  return await statTest(path, stats => stats.isSymbolicLink());
-}
-/**
- * Test if a path points to a directory.
- * @param path
- */
+const chalk = Chalk(); // eslint-disable-line new-cap
+chalk.supportsColor = stdoutColor;
+chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap
+chalk.stderr.supportsColor = stderrColor;
 
-async function isDirectory(path) {
-  return await statTest(path, stats => stats.isDirectory());
-}
-/**
- * Test if a path points to a regular file.
- * @param path
- */
+module.exports = chalk;
 
-async function isFile(path) {
-  return await statTest(path, stats => stats.isFile());
-}
-/**
- * Create a symlink at dest that points to src. Adapted from
- * https://github.com/lerna/lerna/blob/2f1b87d9e2295f587e4ac74269f714271d8ed428/src/FileSystemUtilities.js#L103.
- *
- * @param src
- * @param dest
- * @param type 'dir', 'file', 'junction', or 'exec'. 'exec' on
- *  windows will use the `cmd-shim` module since symlinks can't be used
- *  for executable files on windows.
- */
 
-async function createSymlink(src, dest, type) {
-  if (process.platform === 'win32') {
-    if (type === 'exec') {
-      await cmdShim(src, dest);
-    } else {
-      await forceCreate(src, dest, type);
-    }
-  } else {
-    const posixType = type === 'exec' ? 'file' : type;
-    const relativeSource = Object(path__WEBPACK_IMPORTED_MODULE_4__["relative"])(Object(path__WEBPACK_IMPORTED_MODULE_4__["dirname"])(dest), src);
-    await forceCreate(relativeSource, dest, posixType);
-  }
-}
+/***/ }),
 
-async function forceCreate(src, dest, type) {
-  try {
-    // If something exists at `dest` we need to remove it first.
-    await unlink(dest);
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
+/***/ "../../node_modules/chalk/source/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  await symlink(src, dest, type);
-}
+"use strict";
 
-async function tryRealpath(path) {
-  let calculatedPath = path;
+const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|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}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi;
 
-  try {
-    calculatedPath = await realpathNative(path);
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-  return calculatedPath;
-}
+function unescape(c) {
+	const u = c[0] === 'u';
+	const bracket = c[1] === '{';
 
-/***/ }),
-/* 353 */
-/***/ (function(module, exports, __webpack_require__) {
+	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-// On windows, create a .cmd file.
-// Read the #! in the file to see what it uses.  The vast majority
-// of the time, this will be either:
-// "#!/usr/bin/env <prog> <args...>"
-// or:
-// "#!<prog> <args...>"
-//
-// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
-// @<prog> <args...> %~dp0<target> %*
+	if (u && bracket) {
+		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
+	}
 
-module.exports = cmdShim
-cmdShim.ifExists = cmdShimIfExists
+	return ESCAPES.get(c) || c;
+}
 
-var fs = __webpack_require__(354)
+function parseArguments(name, arguments_) {
+	const results = [];
+	const chunks = arguments_.trim().split(/\s*,\s*/g);
+	let matches;
 
-var mkdir = __webpack_require__(359)
-  , path = __webpack_require__(4)
-  , toBatchSyntax = __webpack_require__(360)
-  , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+=[^ \t]+\s+)*\s*([^ \t]+)(.*)$/
+	for (const chunk of chunks) {
+		const number = Number(chunk);
+		if (!Number.isNaN(number)) {
+			results.push(number);
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
 
-function cmdShimIfExists (from, to, cb) {
-  fs.stat(from, function (er) {
-    if (er) return cb()
-    cmdShim(from, to, cb)
-  })
+	return results;
 }
 
-// Try to unlink, but ignore errors.
-// Any problems will surface later.
-function rm (path, cb) {
-  fs.unlink(path, function(er) {
-    cb()
-  })
-}
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-function cmdShim (from, to, cb) {
-  fs.stat(from, function (er, stat) {
-    if (er)
-      return cb(er)
+	const results = [];
+	let matches;
 
-    cmdShim_(from, to, cb)
-  })
-}
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-function cmdShim_ (from, to, cb) {
-  var then = times(2, next, cb)
-  rm(to, then)
-  rm(to + ".cmd", then)
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-  function next(er) {
-    writeShim(from, to, cb)
-  }
+	return results;
 }
 
-function writeShim (from, to, cb) {
-  // make a cmd file and a sh script
-  // First, check if the bin is a #! of some sort.
-  // If not, then assume it's something that'll be compiled, or some other
-  // sort of script, and just call it directly.
-  mkdir(path.dirname(to), function (er) {
-    if (er)
-      return cb(er)
-    fs.readFile(from, "utf8", function (er, data) {
-      if (er) return writeShim_(from, to, null, null, cb)
-      var firstLine = data.trim().split(/\r*\n/)[0]
-        , shebang = firstLine.match(shebangExpr)
-      if (!shebang) return writeShim_(from, to, null, null, null, cb)
-      var vars = shebang[1] || ""
-        , prog = shebang[2]
-        , args = shebang[3] || ""
-      return writeShim_(from, to, prog, args, vars, cb)
-    })
-  })
-}
+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);
+		}
+	}
 
-function writeShim_ (from, to, prog, args, variables, cb) {
-  var shTarget = path.relative(path.dirname(to), from)
-    , target = shTarget.split("/").join("\\")
-    , longProg
-    , shProg = prog && prog.split("\\").join("/")
-    , shLongProg
-    , pwshProg = shProg && "\"" + shProg + "$exe\""
-    , pwshLongProg
-  shTarget = shTarget.split("\\").join("/")
-  args = args || ""
-  variables = variables || ""
-  if (!prog) {
-    prog = "\"%~dp0\\" + target + "\""
-    shProg = "\"$basedir/" + shTarget + "\""
-    pwshProg = shProg
-    args = ""
-    target = ""
-    shTarget = ""
-  } else {
-    longProg = "\"%~dp0\\" + prog + ".exe\""
-    shLongProg = "\"$basedir/" + prog + "\""
-    pwshLongProg = "\"$basedir/" + prog + "$exe\""
-    target = "\"%~dp0\\" + target + "\""
-    shTarget = "\"$basedir/" + shTarget + "\""
-  }
+	let current = chalk;
+	for (const [styleName, styles] of Object.entries(enabled)) {
+		if (!Array.isArray(styles)) {
+			continue;
+		}
 
-  // @SETLOCAL
-  //
-  // @IF EXIST "%~dp0\node.exe" (
-  //   @SET "_prog=%~dp0\node.exe"
-  // ) ELSE (
-  //   @SET "_prog=node"
-  //   @SET PATHEXT=%PATHEXT:;.JS;=;%
-  // )
-  //
-  // "%_prog%" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-  // @ENDLOCAL
-  var cmd
-  if (longProg) {
-    shLongProg = shLongProg.trim();
-    args = args.trim();
-    var variableDeclarationsAsBatch = toBatchSyntax.convertToSetCommands(variables)
-    cmd = "@SETLOCAL\r\n"
-        + variableDeclarationsAsBatch
-        + "\r\n"
-        + "@IF EXIST " + longProg + " (\r\n"
-        + "  @SET \"_prog=" + longProg.replace(/(^")|("$)/g, '') + "\"\r\n"
-        + ") ELSE (\r\n"
-        + "  @SET \"_prog=" + prog.replace(/(^")|("$)/g, '') + "\"\r\n"
-        + "  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n"
-        + ")\r\n"
-        + "\r\n"
-        +  "\"%_prog%\" " + args + " " + target + " %*\r\n"
-        + '@ENDLOCAL\r\n'
-  } else {
-    cmd = "@" + prog + " " + args + " " + target + " %*\r\n"
-  }
+		if (!(styleName in current)) {
+			throw new Error(`Unknown Chalk style: ${styleName}`);
+		}
 
-  // #!/bin/sh
-  // basedir=`dirname "$0"`
-  //
-  // case `uname` in
-  //     *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
-  // esac
-  //
-  // if [ -x "$basedir/node.exe" ]; then
-  //   "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-  //   ret=$?
-  // else
-  //   node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-  //   ret=$?
-  // fi
-  // exit $ret
+		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
+	}
 
-  var sh = "#!/bin/sh\n"
+	return current;
+}
 
-  sh = sh
-      + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
-      + "\n"
-      + "case `uname` in\n"
-      + "    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;\n"
-      + "esac\n"
-      + "\n"
+module.exports = (chalk, temporary) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-  if (shLongProg) {
-    sh = sh
-       + "if [ -x "+shLongProg+" ]; then\n"
-       + "  " + variables + shLongProg + " " + args + " " + shTarget + " \"$@\"\n"
-       + "  ret=$?\n"
-       + "else \n"
-       + "  " + variables + shProg + " " + args + " " + shTarget + " \"$@\"\n"
-       + "  ret=$?\n"
-       + "fi\n"
-       + "exit $ret\n"
-  } else {
-    sh = sh
-       + shProg + " " + args + " " + shTarget + " \"$@\"\n"
-       + "exit $?\n"
-  }
+	// eslint-disable-next-line max-params
+	temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
+		if (escapeCharacter) {
+			chunk.push(unescape(escapeCharacter));
+		} else if (style) {
+			const string = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
 
-  // #!/usr/bin/env pwsh
-  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-  //
-  // $ret=0
-  // $exe = ""
-  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  //   # Fix case when both the Windows and Linux builds of Node
-  //   # are installed in the same directory
-  //   $exe = ".exe"
-  // }
-  // if (Test-Path "$basedir/node") {
-  //   & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
-  //   $ret=$LASTEXITCODE
-  // } else {
-  //   & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
-  //   $ret=$LASTEXITCODE
-  // }
-  // exit $ret
-  var pwsh = "#!/usr/bin/env pwsh\n"
-           + "$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n"
-           + "\n"
-           + "$exe=\"\"\n"
-           + "if ($PSVersionTable.PSVersion -lt \"6.0\" -or $IsWindows) {\n"
-           + "  # Fix case when both the Windows and Linux builds of Node\n"
-           + "  # are installed in the same directory\n"
-           + "  $exe=\".exe\"\n"
-           + "}\n"
-  if (shLongProg) {
-    pwsh = pwsh
-         + "$ret=0\n"
-         + "if (Test-Path " + pwshLongProg + ") {\n"
-         + "  & " + pwshLongProg + " " + args + " " + shTarget + " $args\n"
-         + "  $ret=$LASTEXITCODE\n"
-         + "} else {\n"
-         + "  & " + pwshProg + " " + args + " " + shTarget + " $args\n"
-         + "  $ret=$LASTEXITCODE\n"
-         + "}\n"
-         + "exit $ret\n"
-  } else {
-    pwsh = pwsh
-         + "& " + pwshProg + " " + args + " " + shTarget + " $args\n"
-         + "exit $LASTEXITCODE\n"
-  }
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(character);
+		}
+	});
 
-  var then = times(3, next, cb)
-  fs.writeFile(to + ".ps1", pwsh, "utf8", then)
-  fs.writeFile(to + ".cmd", cmd, "utf8", then)
-  fs.writeFile(to, sh, "utf8", then)
-  function next () {
-    chmodShim(to, cb)
-  }
-}
+	chunks.push(chunk.join(''));
 
-function chmodShim (to, cb) {
-  var then = times(2, cb, cb)
-  fs.chmod(to, "0755", then)
-  fs.chmod(to + ".cmd", "0755", then)
-  fs.chmod(to + ".ps1", "0755", then)
-}
+	if (styles.length > 0) {
+		const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMessage);
+	}
 
-function times(n, ok, cb) {
-  var errState = null
-  return function(er) {
-    if (!errState) {
-      if (er)
-        cb(errState = er)
-      else if (--n === 0)
-        ok()
-    }
-  }
-}
+	return chunks.join('');
+};
 
 
 /***/ }),
-/* 354 */
+
+/***/ "../../node_modules/chalk/source/util.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(253)
-var polyfills = __webpack_require__(355)
-var legacy = __webpack_require__(357)
-var clone = __webpack_require__(358)
+"use strict";
 
-var util = __webpack_require__(234)
 
-/* 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'
-}
+const stringReplaceAll = (string, substring, replacer) => {
+	let index = string.indexOf(substring);
+	if (index === -1) {
+		return string;
+	}
 
-function noop () {}
+	const substringLength = substring.length;
+	let endIndex = 0;
+	let returnValue = '';
+	do {
+		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
+		endIndex = index + substringLength;
+		index = string.indexOf(substring, endIndex);
+	} while (index !== -1);
 
-function publishQueue(context, queue) {
-  Object.defineProperty(context, gracefulQueue, {
-    get: function() {
-      return queue
-    }
-  })
-}
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-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)
-  }
+const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => {
+	let endIndex = 0;
+	let returnValue = '';
+	do {
+		const gotCR = string[index - 1] === '\r';
+		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
+		endIndex = index + 1;
+		index = string.indexOf('\n', endIndex);
+	} while (index !== -1);
 
-// Once time initialization
-if (!fs[gracefulQueue]) {
-  // This queue can be shared by multiple loaded instances
-  var queue = global[gracefulQueue] || []
-  publishQueue(fs, queue)
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-  // 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()
-        }
+module.exports = {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+};
 
-        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()
-    }
+/***/ "../../node_modules/clean-stack/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    Object.defineProperty(closeSync, previousSymbol, {
-      value: fs$closeSync
-    })
-    return closeSync
-  })(fs.closeSync)
+"use strict";
 
-  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-    process.on('exit', function() {
-      debug(fs[gracefulQueue])
-      __webpack_require__(283).equal(fs[gracefulQueue].length, 0)
-    })
-  }
-}
+const os = __webpack_require__("os");
 
-if (!global[gracefulQueue]) {
-  publishQueue(global, fs[gracefulQueue]);
-}
+const extractPathRegex = /\s+at.*(?:\(|\s)(.*)\)?/;
+const pathRegex = /^(?:(?:(?:node|(?:internal\/[\w/]*|.*node_modules\/(?:babel-polyfill|pirates)\/.*)?\w+)\.js:\d+:\d+)|native)/;
+const homeDir = typeof os.homedir === 'undefined' ? '' : os.homedir();
 
-module.exports = patch(clone(fs))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
-    module.exports = patch(fs)
-    fs.__patched = true;
-}
+module.exports = (stack, options) => {
+	options = Object.assign({pretty: false}, options);
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
+	return stack.replace(/\\/g, '/')
+		.split('\n')
+		.filter(line => {
+			const pathMatches = line.match(extractPathRegex);
+			if (pathMatches === null || !pathMatches[1]) {
+				return true;
+			}
 
-  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
+			const match = pathMatches[1];
 
-    return go$readFile(path, options, cb)
+			// Electron
+			if (
+				match.includes('.app/Contents/Resources/electron.asar') ||
+				match.includes('.app/Contents/Resources/default_app.asar')
+			) {
+				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()
-        }
-      })
-    }
-  }
+			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, '~')));
+			}
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+			return line;
+		})
+		.join('\n');
+};
 
-    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
+/***/ "../../node_modules/cli-cursor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    return go$appendFile(path, data, options, cb)
+"use strict";
 
-    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()
-        }
-      })
-    }
-  }
+const restoreCursor = __webpack_require__("../../node_modules/restore-cursor/index.js");
 
-  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)
+let isHidden = false;
 
-    return go$readdir(args)
+exports.show = (writableStream = process.stderr) => {
+	if (!writableStream.isTTY) {
+		return;
+	}
 
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
+	isHidden = false;
+	writableStream.write('\u001B[?25h');
+};
 
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
+exports.hide = (writableStream = process.stderr) => {
+	if (!writableStream.isTTY) {
+		return;
+	}
 
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
-      }
-    }
-  }
+	restoreCursor();
+	isHidden = true;
+	writableStream.write('\u001B[?25l');
+};
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
-  }
+exports.toggle = (force, writableStream) => {
+	if (force !== undefined) {
+		isHidden = force;
+	}
 
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
-  }
+	if (isHidden) {
+		exports.show(writableStream);
+	} else {
+		exports.hide(writableStream);
+	}
+};
 
-  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
-  }
+/***/ }),
 
-  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
-  })
+/***/ "../../node_modules/cli-spinners/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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
-  })
+"use strict";
 
-  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()
+const spinners = Object.assign({}, __webpack_require__("../../node_modules/cli-spinners/spinners.json"));
 
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
+const spinnersList = Object.keys(spinners);
 
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
+Object.defineProperty(spinners, 'random', {
+	get() {
+		const randomIndex = Math.floor(Math.random() * spinnersList.length);
+		const spinnerName = spinnersList[randomIndex];
+		return spinners[spinnerName];
+	}
+});
 
-  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)
-      }
-    })
-  }
+module.exports = spinners;
+// TODO: Remove this for the next major release
+module.exports.default = spinners;
 
-  function createReadStream (path, options) {
-    return new fs.ReadStream(path, options)
-  }
 
-  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
+/***/ "../../node_modules/cli-spinners/spinners.json":
+/***/ (function(module) {
 
-    return go$open(path, flags, mode, cb)
+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\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"dots8Bit\":{\"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\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"material\":{\"interval\":17,\"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\":[\"🌲\",\"🎄\"]},\"grenade\":{\"interval\":80,\"frames\":[\"،   \",\"′   \",\" ´ \",\" ‾ \",\"  ⸌\",\"  ⸊\",\"  |\",\"  ⁎\",\"  ⁕\",\" ෴ \",\"  ⁓\",\"   \",\"   \",\"   \"]},\"point\":{\"interval\":125,\"frames\":[\"∙∙∙\",\"●∙∙\",\"∙●∙\",\"∙∙●\",\"∙∙∙\"]},\"layer\":{\"interval\":150,\"frames\":[\"-\",\"=\",\"≡\"]},\"betaWave\":{\"interval\":80,\"frames\":[\"ρββββββ\",\"βρβββββ\",\"ββρββββ\",\"βββρβββ\",\"ββββρββ\",\"βββββρβ\",\"ββββββρ\"]},\"aesthetic\":{\"interval\":80,\"frames\":[\"▰▱▱▱▱▱▱\",\"▰▰▱▱▱▱▱\",\"▰▰▰▱▱▱▱\",\"▰▰▰▰▱▱▱\",\"▰▰▰▰▰▱▱\",\"▰▰▰▰▰▰▱\",\"▰▰▰▰▰▰▰\",\"▰▱▱▱▱▱▱\"]}}");
 
-    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
-}
+/***/ "../../node_modules/clone/clone.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  fs[gracefulQueue].push(elem)
-}
+var clone = (function() {
+'use strict';
 
-function retry () {
-  var elem = fs[gracefulQueue].shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
+/**
+ * Clones (copies) an Object using deep copying.
+ *
+ * This function supports circular references by default, but if you are certain
+ * there are no circular references in your object, you can save some CPU time
+ * by calling clone(obj, false).
+ *
+ * Caution: if `circular` is false and `parent` contains circular references,
+ * your program may enter an infinite loop and crash.
+ *
+ * @param `parent` - the object to be cloned
+ * @param `circular` - set to true if the object to be cloned may contain
+ *    circular references. (optional - true by default)
+ * @param `depth` - set to a number if the object is only to be cloned to
+ *    a particular depth. (optional - defaults to Infinity)
+ * @param `prototype` - sets the prototype to be used when cloning an object.
+ *    (optional - defaults to parent prototype).
+*/
+function clone(parent, circular, depth, prototype) {
+  var filter;
+  if (typeof circular === 'object') {
+    depth = circular.depth;
+    prototype = circular.prototype;
+    filter = circular.filter;
+    circular = circular.circular
   }
-}
-
+  // maintain two arrays for circular references, where corresponding parents
+  // and children have the same index
+  var allParents = [];
+  var allChildren = [];
 
-/***/ }),
-/* 355 */
-/***/ (function(module, exports, __webpack_require__) {
+  var useBuffer = typeof Buffer != 'undefined';
 
-var constants = __webpack_require__(356)
+  if (typeof circular == 'undefined')
+    circular = true;
 
-var origCwd = process.cwd
-var cwd = null
+  if (typeof depth == 'undefined')
+    depth = Infinity;
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+  // recurse this function so we don't reset allParents and allChildren
+  function _clone(parent, depth) {
+    // cloning null always returns null
+    if (parent === null)
+      return null;
 
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-try {
-  process.cwd()
-} catch (er) {}
+    if (depth == 0)
+      return parent;
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
-}
+    var child;
+    var proto;
+    if (typeof parent != 'object') {
+      return parent;
+    }
 
-module.exports = patch
+    if (clone.__isArray(parent)) {
+      child = [];
+    } else if (clone.__isRegExp(parent)) {
+      child = new RegExp(parent.source, __getRegExpFlags(parent));
+      if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+    } else if (clone.__isDate(parent)) {
+      child = new Date(parent.getTime());
+    } else if (useBuffer && Buffer.isBuffer(parent)) {
+      if (Buffer.allocUnsafe) {
+        // Node.js >= 4.5.0
+        child = Buffer.allocUnsafe(parent.length);
+      } else {
+        // Older Node.js versions
+        child = new Buffer(parent.length);
+      }
+      parent.copy(child);
+      return child;
+    } else {
+      if (typeof prototype == 'undefined') {
+        proto = Object.getPrototypeOf(parent);
+        child = Object.create(proto);
+      }
+      else {
+        child = Object.create(prototype);
+        proto = prototype;
+      }
+    }
 
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+    if (circular) {
+      var index = allParents.indexOf(parent);
 
-  // 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) {
-    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)
-        }
+      if (index != -1) {
+        return allChildren[index];
       }
-      return fs$read.call(fs, fd, buffer, offset, length, position, callback)
+      allParents.push(parent);
+      allChildren.push(child);
     }
 
-    // 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
-    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
+    for (var i in parent) {
+      var attrs;
+      if (proto) {
+        attrs = Object.getOwnPropertyDescriptor(proto, i);
       }
-    }
-  }})(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)
-        }
+      if (attrs && attrs.set == null) {
+        continue;
       }
-      return ret
+      child[i] = _clone(parent[i], depth - 1);
     }
-  }
-
-  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 () {}
-    }
+    return child;
   }
 
-  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 _clone(parent, depth);
+}
 
-  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
-      }
-    }
-  }
+/**
+ * Simple flat clone using prototype, accepts only objects, usefull for property
+ * override on FLAT configuration object (no nested props).
+ *
+ * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+ * works.
+ */
+clone.clonePrototype = function clonePrototype(parent) {
+  if (parent === null)
+    return null;
 
+  var c = function () {};
+  c.prototype = parent;
+  return new c();
+};
 
-  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)
-      })
-    }
-  }
+// private utility functions
 
-  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 __objToStr(o) {
+  return Object.prototype.toString.call(o);
+};
+clone.__objToStr = __objToStr;
 
-  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 __isDate(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Date]';
+};
+clone.__isDate = __isDate;
 
-  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;
-    }
-  }
+function __isArray(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Array]';
+};
+clone.__isArray = __isArray;
 
-  // 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
+function __isRegExp(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+};
+clone.__isRegExp = __isRegExp;
 
-    if (er.code === "ENOSYS")
-      return true
+function __getRegExpFlags(re) {
+  var flags = '';
+  if (re.global) flags += 'g';
+  if (re.ignoreCase) flags += 'i';
+  if (re.multiline) flags += 'm';
+  return flags;
+};
+clone.__getRegExpFlags = __getRegExpFlags;
 
-    var nonroot = !process.getuid || process.getuid() !== 0
-    if (nonroot) {
-      if (er.code === "EINVAL" || er.code === "EPERM")
-        return true
-    }
+return clone;
+})();
 
-    return false
-  }
+if ( true && module.exports) {
+  module.exports = clone;
 }
 
 
 /***/ }),
-/* 356 */
-/***/ (function(module, exports) {
 
-module.exports = require("constants");
-
-/***/ }),
-/* 357 */
+/***/ "../../node_modules/cmd-shim/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(294).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;
+// On windows, create a .cmd file.
+// Read the #! in the file to see what it uses.  The vast majority
+// of the time, this will be either:
+// "#!/usr/bin/env <prog> <args...>"
+// or:
+// "#!<prog> <args...>"
+//
+// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
+// @<prog> <args...> %~dp0<target> %*
 
-    options = options || {};
+module.exports = cmdShim
+cmdShim.ifExists = cmdShimIfExists
 
-    // 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 fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js")
 
-    if (this.encoding) this.setEncoding(this.encoding);
+var mkdir = __webpack_require__("../../node_modules/cmd-shim/node_modules/mkdirp/index.js")
+  , path = __webpack_require__("path")
+  , toBatchSyntax = __webpack_require__("../../node_modules/cmd-shim/lib/to-batch-syntax.js")
+  , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+=[^ \t]+\s+)*\s*([^ \t]+)(.*)$/
 
-    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');
-      }
+function cmdShimIfExists (from, to, cb) {
+  fs.stat(from, function (er) {
+    if (er) return cb()
+    cmdShim(from, to, cb)
+  })
+}
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
+// Try to unlink, but ignore errors.
+// Any problems will surface later.
+function rm (path, cb) {
+  fs.unlink(path, function(er) {
+    cb()
+  })
+}
 
-      this.pos = this.start;
-    }
+function cmdShim (from, to, cb) {
+  fs.stat(from, function (er, stat) {
+    if (er)
+      return cb(er)
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
+    cmdShim_(from, to, cb)
+  })
+}
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
+function cmdShim_ (from, to, cb) {
+  var then = times(2, next, cb)
+  rm(to, then)
+  rm(to + ".cmd", then)
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
+  function next(er) {
+    writeShim(from, to, cb)
   }
+}
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
-
-    Stream.call(this);
+function writeShim (from, to, cb) {
+  // make a cmd file and a sh script
+  // First, check if the bin is a #! of some sort.
+  // If not, then assume it's something that'll be compiled, or some other
+  // sort of script, and just call it directly.
+  mkdir(path.dirname(to), function (er) {
+    if (er)
+      return cb(er)
+    fs.readFile(from, "utf8", function (er, data) {
+      if (er) return writeShim_(from, to, null, null, cb)
+      var firstLine = data.trim().split(/\r*\n/)[0]
+        , shebang = firstLine.match(shebangExpr)
+      if (!shebang) return writeShim_(from, to, null, null, null, cb)
+      var vars = shebang[1] || ""
+        , prog = shebang[2]
+        , args = shebang[3] || ""
+      return writeShim_(from, to, prog, args, vars, cb)
+    })
+  })
+}
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+function writeShim_ (from, to, prog, args, variables, cb) {
+  var shTarget = path.relative(path.dirname(to), from)
+    , target = shTarget.split("/").join("\\")
+    , longProg
+    , shProg = prog && prog.split("\\").join("/")
+    , shLongProg
+    , pwshProg = shProg && "\"" + shProg + "$exe\""
+    , pwshLongProg
+  shTarget = shTarget.split("\\").join("/")
+  args = args || ""
+  variables = variables || ""
+  if (!prog) {
+    prog = "\"%~dp0\\" + target + "\""
+    shProg = "\"$basedir/" + shTarget + "\""
+    pwshProg = shProg
+    args = ""
+    target = ""
+    shTarget = ""
+  } else {
+    longProg = "\"%~dp0\\" + prog + ".exe\""
+    shLongProg = "\"$basedir/" + prog + "\""
+    pwshLongProg = "\"$basedir/" + prog + "$exe\""
+    target = "\"%~dp0\\" + target + "\""
+    shTarget = "\"$basedir/" + shTarget + "\""
+  }
 
-    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];
-    }
+  // @SETLOCAL
+  //
+  // @IF EXIST "%~dp0\node.exe" (
+  //   @SET "_prog=%~dp0\node.exe"
+  // ) ELSE (
+  //   @SET "_prog=node"
+  //   @SET PATHEXT=%PATHEXT:;.JS;=;%
+  // )
+  //
+  // "%_prog%" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+  // @ENDLOCAL
+  var cmd
+  if (longProg) {
+    shLongProg = shLongProg.trim();
+    args = args.trim();
+    var variableDeclarationsAsBatch = toBatchSyntax.convertToSetCommands(variables)
+    cmd = "@SETLOCAL\r\n"
+        + variableDeclarationsAsBatch
+        + "\r\n"
+        + "@IF EXIST " + longProg + " (\r\n"
+        + "  @SET \"_prog=" + longProg.replace(/(^")|("$)/g, '') + "\"\r\n"
+        + ") ELSE (\r\n"
+        + "  @SET \"_prog=" + prog.replace(/(^")|("$)/g, '') + "\"\r\n"
+        + "  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n"
+        + ")\r\n"
+        + "\r\n"
+        +  "\"%_prog%\" " + args + " " + target + " %*\r\n"
+        + '@ENDLOCAL\r\n'
+  } else {
+    cmd = "@" + prog + " " + args + " " + target + " %*\r\n"
+  }
 
-    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');
-      }
+  // #!/bin/sh
+  // basedir=`dirname "$0"`
+  //
+  // case `uname` in
+  //     *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+  // esac
+  //
+  // if [ -x "$basedir/node.exe" ]; then
+  //   "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+  //   ret=$?
+  // else
+  //   node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+  //   ret=$?
+  // fi
+  // exit $ret
 
-      this.pos = this.start;
-    }
+  var sh = "#!/bin/sh\n"
 
-    this.busy = false;
-    this._queue = [];
+  sh = sh
+      + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
+      + "\n"
+      + "case `uname` in\n"
+      + "    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;\n"
+      + "esac\n"
+      + "\n"
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
+  if (shLongProg) {
+    sh = sh
+       + "if [ -x "+shLongProg+" ]; then\n"
+       + "  " + variables + shLongProg + " " + args + " " + shTarget + " \"$@\"\n"
+       + "  ret=$?\n"
+       + "else \n"
+       + "  " + variables + shProg + " " + args + " " + shTarget + " \"$@\"\n"
+       + "  ret=$?\n"
+       + "fi\n"
+       + "exit $ret\n"
+  } else {
+    sh = sh
+       + shProg + " " + args + " " + shTarget + " \"$@\"\n"
+       + "exit $?\n"
   }
-}
-
 
-/***/ }),
-/* 358 */
-/***/ (function(module, exports, __webpack_require__) {
+  // #!/usr/bin/env pwsh
+  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+  //
+  // $ret=0
+  // $exe = ""
+  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  //   # Fix case when both the Windows and Linux builds of Node
+  //   # are installed in the same directory
+  //   $exe = ".exe"
+  // }
+  // if (Test-Path "$basedir/node") {
+  //   & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
+  //   $ret=$LASTEXITCODE
+  // } else {
+  //   & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
+  //   $ret=$LASTEXITCODE
+  // }
+  // exit $ret
+  var pwsh = "#!/usr/bin/env pwsh\n"
+           + "$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n"
+           + "\n"
+           + "$exe=\"\"\n"
+           + "if ($PSVersionTable.PSVersion -lt \"6.0\" -or $IsWindows) {\n"
+           + "  # Fix case when both the Windows and Linux builds of Node\n"
+           + "  # are installed in the same directory\n"
+           + "  $exe=\".exe\"\n"
+           + "}\n"
+  if (shLongProg) {
+    pwsh = pwsh
+         + "$ret=0\n"
+         + "if (Test-Path " + pwshLongProg + ") {\n"
+         + "  & " + pwshLongProg + " " + args + " " + shTarget + " $args\n"
+         + "  $ret=$LASTEXITCODE\n"
+         + "} else {\n"
+         + "  & " + pwshProg + " " + args + " " + shTarget + " $args\n"
+         + "  $ret=$LASTEXITCODE\n"
+         + "}\n"
+         + "exit $ret\n"
+  } else {
+    pwsh = pwsh
+         + "& " + pwshProg + " " + args + " " + shTarget + " $args\n"
+         + "exit $LASTEXITCODE\n"
+  }
 
-"use strict";
+  var then = times(3, next, cb)
+  fs.writeFile(to + ".ps1", pwsh, "utf8", then)
+  fs.writeFile(to + ".cmd", cmd, "utf8", then)
+  fs.writeFile(to, sh, "utf8", then)
+  function next () {
+    chmodShim(to, cb)
+  }
+}
 
+function chmodShim (to, cb) {
+  var then = times(2, cb, cb)
+  fs.chmod(to, "0755", then)
+  fs.chmod(to + ".cmd", "0755", then)
+  fs.chmod(to + ".ps1", "0755", then)
+}
 
-module.exports = clone
+function times(n, ok, cb) {
+  var errState = null
+  return function(er) {
+    if (!errState) {
+      if (er)
+        cb(errState = er)
+      else if (--n === 0)
+        ok()
+    }
+  }
+}
 
-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))
-  })
+/***/ "../../node_modules/cmd-shim/lib/to-batch-syntax.js":
+/***/ (function(module, exports) {
 
-  return copy
-}
+exports.replaceDollarWithPercentPair = replaceDollarWithPercentPair
+exports.convertToSetCommand = convertToSetCommand
+exports.convertToSetCommands = convertToSetCommands
+
+function convertToSetCommand(key, value) {
+    var line = ""
+    key = key || ""
+    key = key.trim()
+    value = value || ""
+    value = value.trim()
+    if(key && value && value.length > 0) {
+        line = "@SET " + key + "=" + replaceDollarWithPercentPair(value) + "\r\n"
+    }
+    return line
+}
+
+function extractVariableValuePairs(declarations) {
+    var pairs = {}
+    declarations.map(function(declaration) {
+        var split = declaration.split("=")
+        pairs[split[0]]=split[1]
+    })
+    return pairs
+}
+
+function convertToSetCommands(variableString) {
+    var variableValuePairs = extractVariableValuePairs(variableString.split(" "))
+    var variableDeclarationsAsBatch = ""
+    Object.keys(variableValuePairs).forEach(function (key) {
+        variableDeclarationsAsBatch += convertToSetCommand(key, variableValuePairs[key])
+    })
+    return variableDeclarationsAsBatch
+}
+
+function replaceDollarWithPercentPair(value) {
+    var dollarExpressions = /\$\{?([^\$@#\?\- \t{}:]+)\}?/g
+    var result = ""
+    var startIndex = 0
+    value = value || ""
+    do {
+        var match = dollarExpressions.exec(value)
+        if(match) {
+            var betweenMatches = value.substring(startIndex, match.index) || ""
+            result +=  betweenMatches + "%" + match[1] + "%"
+            startIndex = dollarExpressions.lastIndex
+        }
+    } while (dollarExpressions.lastIndex > 0)
+    result += value.substr(startIndex)
+    return result
+}
+
+
 
 
 /***/ }),
-/* 359 */
+
+/***/ "../../node_modules/cmd-shim/node_modules/mkdirp/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var path = __webpack_require__(4);
-var fs = __webpack_require__(253);
+var path = __webpack_require__("path");
+var fs = __webpack_require__("fs");
 var _0777 = parseInt('0777', 8);
 
 module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
@@ -21007,4129 +19654,3882 @@ mkdirP.sync = function sync (p, opts, made) {
 
 
 /***/ }),
-/* 360 */
-/***/ (function(module, exports) {
-
-exports.replaceDollarWithPercentPair = replaceDollarWithPercentPair
-exports.convertToSetCommand = convertToSetCommand
-exports.convertToSetCommands = convertToSetCommands
-
-function convertToSetCommand(key, value) {
-    var line = ""
-    key = key || ""
-    key = key.trim()
-    value = value || ""
-    value = value.trim()
-    if(key && value && value.length > 0) {
-        line = "@SET " + key + "=" + replaceDollarWithPercentPair(value) + "\r\n"
-    }
-    return line
-}
-
-function extractVariableValuePairs(declarations) {
-    var pairs = {}
-    declarations.map(function(declaration) {
-        var split = declaration.split("=")
-        pairs[split[0]]=split[1]
-    })
-    return pairs
-}
-
-function convertToSetCommands(variableString) {
-    var variableValuePairs = extractVariableValuePairs(variableString.split(" "))
-    var variableDeclarationsAsBatch = ""
-    Object.keys(variableValuePairs).forEach(function (key) {
-        variableDeclarationsAsBatch += convertToSetCommand(key, variableValuePairs[key])
-    })
-    return variableDeclarationsAsBatch
-}
-
-function replaceDollarWithPercentPair(value) {
-    var dollarExpressions = /\$\{?([^\$@#\?\- \t{}:]+)\}?/g
-    var result = ""
-    var startIndex = 0
-    value = value || ""
-    do {
-        var match = dollarExpressions.exec(value)
-        if(match) {
-            var betweenMatches = value.substring(startIndex, match.index) || ""
-            result +=  betweenMatches + "%" + match[1] + "%"
-            startIndex = dollarExpressions.lastIndex
-        }
-    } while (dollarExpressions.lastIndex > 0)
-    result += value.substr(startIndex)
-    return result
-}
-
-
-
 
-/***/ }),
-/* 361 */
+/***/ "../../node_modules/color-convert/conversions.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const {promisify} = __webpack_require__(234);
-const path = __webpack_require__(4);
-const globby = __webpack_require__(362);
-const isGlob = __webpack_require__(387);
-const slash = __webpack_require__(451);
-const gracefulFs = __webpack_require__(354);
-const isPathCwd = __webpack_require__(453);
-const isPathInside = __webpack_require__(454);
-const rimraf = __webpack_require__(455);
-const pMap = __webpack_require__(456);
-
-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
-};
+/* MIT license */
+var cssKeywords = __webpack_require__("../../node_modules/color-convert/node_modules/color-name/index.js");
 
-function safeCheck(file, cwd) {
-	if (isPathCwd(file)) {
-		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
-	}
+// NOTE: conversions should only return primitive values (i.e. arrays, or
+//       values that give correct `typeof` results).
+//       do not use box values types (i.e. Number(), String(), etc.)
 
-	if (!isPathInside(file, cwd)) {
-		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
+var reverseKeywords = {};
+for (var key in cssKeywords) {
+	if (cssKeywords.hasOwnProperty(key)) {
+		reverseKeywords[cssKeywords[key]] = key;
 	}
 }
 
-function normalizePatterns(patterns) {
-	patterns = Array.isArray(patterns) ? patterns : [patterns];
+var convert = module.exports = {
+	rgb: {channels: 3, labels: 'rgb'},
+	hsl: {channels: 3, labels: 'hsl'},
+	hsv: {channels: 3, labels: 'hsv'},
+	hwb: {channels: 3, labels: 'hwb'},
+	cmyk: {channels: 4, labels: 'cmyk'},
+	xyz: {channels: 3, labels: 'xyz'},
+	lab: {channels: 3, labels: 'lab'},
+	lch: {channels: 3, labels: 'lch'},
+	hex: {channels: 1, labels: ['hex']},
+	keyword: {channels: 1, labels: ['keyword']},
+	ansi16: {channels: 1, labels: ['ansi16']},
+	ansi256: {channels: 1, labels: ['ansi256']},
+	hcg: {channels: 3, labels: ['h', 'c', 'g']},
+	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
+	gray: {channels: 1, labels: ['gray']}
+};
 
-	patterns = patterns.map(pattern => {
-		if (process.platform === 'win32' && isGlob(pattern) === false) {
-			return slash(pattern);
+// hide .channels and .labels properties
+for (var model in convert) {
+	if (convert.hasOwnProperty(model)) {
+		if (!('channels' in convert[model])) {
+			throw new Error('missing channels property: ' + model);
 		}
 
-		return pattern;
-	});
-
-	return patterns;
-}
-
-module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
+		if (!('labels' in convert[model])) {
+			throw new Error('missing channel labels property: ' + model);
+		}
 
-	patterns = normalizePatterns(patterns);
+		if (convert[model].labels.length !== convert[model].channels) {
+			throw new Error('channel and label counts mismatch: ' + model);
+		}
 
-	const files = (await globby(patterns, options))
-		.sort((a, b) => b.localeCompare(a));
+		var channels = convert[model].channels;
+		var labels = convert[model].labels;
+		delete convert[model].channels;
+		delete convert[model].labels;
+		Object.defineProperty(convert[model], 'channels', {value: channels});
+		Object.defineProperty(convert[model], 'labels', {value: labels});
+	}
+}
 
-	const mapper = async file => {
-		file = path.resolve(cwd, file);
+convert.rgb.hsl = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var min = Math.min(r, g, b);
+	var max = Math.max(r, g, b);
+	var delta = max - min;
+	var h;
+	var s;
+	var l;
 
-		if (!force) {
-			safeCheck(file, cwd);
-		}
+	if (max === min) {
+		h = 0;
+	} else if (r === max) {
+		h = (g - b) / delta;
+	} else if (g === max) {
+		h = 2 + (b - r) / delta;
+	} else if (b === max) {
+		h = 4 + (r - g) / delta;
+	}
 
-		if (!dryRun) {
-			await rimrafP(file, rimrafOptions);
-		}
+	h = Math.min(h * 60, 360);
 
-		return file;
-	};
+	if (h < 0) {
+		h += 360;
+	}
 
-	const removedFiles = await pMap(files, mapper, options);
+	l = (min + max) / 2;
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
+	if (max === min) {
+		s = 0;
+	} else if (l <= 0.5) {
+		s = delta / (max + min);
+	} else {
+		s = delta / (2 - max - min);
+	}
 
-	return removedFiles;
+	return [h, s * 100, l * 100];
 };
 
-module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
-
-	patterns = normalizePatterns(patterns);
+convert.rgb.hsv = function (rgb) {
+	var rdif;
+	var gdif;
+	var bdif;
+	var h;
+	var s;
 
-	const files = globby.sync(patterns, options)
-		.sort((a, b) => b.localeCompare(a));
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var v = Math.max(r, g, b);
+	var diff = v - Math.min(r, g, b);
+	var diffc = function (c) {
+		return (v - c) / 6 / diff + 1 / 2;
+	};
 
-	const removedFiles = files.map(file => {
-		file = path.resolve(cwd, file);
+	if (diff === 0) {
+		h = s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
 
-		if (!force) {
-			safeCheck(file, cwd);
+		if (r === v) {
+			h = bdif - gdif;
+		} else if (g === v) {
+			h = (1 / 3) + rdif - bdif;
+		} else if (b === v) {
+			h = (2 / 3) + gdif - rdif;
 		}
-
-		if (!dryRun) {
-			rimraf.sync(file, rimrafOptions);
+		if (h < 0) {
+			h += 1;
+		} else if (h > 1) {
+			h -= 1;
 		}
+	}
 
-		return file;
-	});
-
-	removedFiles.sort((a, b) => a.localeCompare(b));
-
-	return removedFiles;
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
 };
 
+convert.rgb.hwb = function (rgb) {
+	var r = rgb[0];
+	var g = rgb[1];
+	var b = rgb[2];
+	var h = convert.rgb.hsl(rgb)[0];
+	var w = 1 / 255 * Math.min(r, Math.min(g, b));
 
-/***/ }),
-/* 362 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const fs = __webpack_require__(253);
-const arrayUnion = __webpack_require__(363);
-const merge2 = __webpack_require__(364);
-const glob = __webpack_require__(365);
-const fastGlob = __webpack_require__(378);
-const dirGlob = __webpack_require__(447);
-const gitignore = __webpack_require__(449);
-const {FilterStream, UniqueStream} = __webpack_require__(452);
-
-const DEFAULT_FILTER = () => false;
-
-const isNegative = pattern => pattern[0] === '!';
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
 
-const assertPatternsInput = patterns => {
-	if (!patterns.every(pattern => typeof pattern === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
+	return [h, w * 100, b * 100];
 };
 
-const checkCwdOption = (options = {}) => {
-	if (!options.cwd) {
-		return;
-	}
+convert.rgb.cmyk = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var c;
+	var m;
+	var y;
+	var k;
 
-	let stat;
-	try {
-		stat = fs.statSync(options.cwd);
-	} catch (_) {
-		return;
+	k = Math.min(1 - r, 1 - g, 1 - b);
+	c = (1 - r - k) / (1 - k) || 0;
+	m = (1 - g - k) / (1 - k) || 0;
+	y = (1 - b - k) / (1 - k) || 0;
+
+	return [c * 100, m * 100, y * 100, k * 100];
+};
+
+/**
+ * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
+ * */
+function comparativeDistance(x, y) {
+	return (
+		Math.pow(x[0] - y[0], 2) +
+		Math.pow(x[1] - y[1], 2) +
+		Math.pow(x[2] - y[2], 2)
+	);
+}
+
+convert.rgb.keyword = function (rgb) {
+	var reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
 	}
 
-	if (!stat.isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
+	var currentClosestDistance = Infinity;
+	var currentClosestKeyword;
+
+	for (var keyword in cssKeywords) {
+		if (cssKeywords.hasOwnProperty(keyword)) {
+			var value = cssKeywords[keyword];
+
+			// Compute comparative distance
+			var distance = comparativeDistance(rgb, value);
+
+			// Check if its less, if so set as closest
+			if (distance < currentClosestDistance) {
+				currentClosestDistance = distance;
+				currentClosestKeyword = keyword;
+			}
+		}
 	}
+
+	return currentClosestKeyword;
 };
 
-const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
+convert.rgb.xyz = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
 
-	const globTasks = [];
+	// assume sRGB
+	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
+	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
+	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
 
-	taskOptions = {
-		ignore: [],
-		expandDirectories: true,
-		...taskOptions
-	};
+	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
+	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
+	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
 
-	for (const [index, pattern] of patterns.entries()) {
-		if (isNegative(pattern)) {
-			continue;
-		}
+	return [x * 100, y * 100, z * 100];
+};
 
-		const ignore = patterns
-			.slice(index)
-			.filter(isNegative)
-			.map(pattern => pattern.slice(1));
+convert.rgb.lab = function (rgb) {
+	var xyz = convert.rgb.xyz(rgb);
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
 
-		const options = {
-			...taskOptions,
-			ignore: taskOptions.ignore.concat(ignore)
-		};
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-		globTasks.push({pattern, options});
-	}
+	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
 
-	return globTasks;
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
+
+	return [l, a, b];
 };
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
+convert.hsl.rgb = function (hsl) {
+	var h = hsl[0] / 360;
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var t1;
+	var t2;
+	var t3;
+	var rgb;
+	var val;
+
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
 	}
 
-	if (Array.isArray(task.options.expandDirectories)) {
-		options = {
-			...options,
-			files: task.options.expandDirectories
-		};
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = {
-			...options,
-			...task.options.expandDirectories
-		};
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
 	}
 
-	return fn(task.pattern, options);
-};
+	t1 = 2 * l - t2;
 
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+	rgb = [0, 0, 0];
+	for (var i = 0; i < 3; i++) {
+		t3 = h + 1 / 3 * -(i - 1);
+		if (t3 < 0) {
+			t3++;
+		}
+		if (t3 > 1) {
+			t3--;
+		}
 
-const getFilterSync = options => {
-	return options && options.gitignore ?
-		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
-		DEFAULT_FILTER;
-};
+		if (6 * t3 < 1) {
+			val = t1 + (t2 - t1) * 6 * t3;
+		} else if (2 * t3 < 1) {
+			val = t2;
+		} else if (3 * t3 < 2) {
+			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+		} else {
+			val = t1;
+		}
 
-const globToTask = task => glob => {
-	const {options} = task;
-	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
-		options.ignore = dirGlob.sync(options.ignore);
+		rgb[i] = val * 255;
 	}
 
-	return {
-		pattern: glob,
-		options
-	};
+	return rgb;
 };
 
-module.exports = async (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+convert.hsl.hsv = function (hsl) {
+	var h = hsl[0];
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var smin = s;
+	var lmin = Math.max(l, 0.01);
+	var sv;
+	var v;
 
-	const getFilter = async () => {
-		return options && options.gitignore ?
-			gitignore({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+	l *= 2;
+	s *= (l <= 1) ? l : 2 - l;
+	smin *= lmin <= 1 ? lmin : 2 - lmin;
+	v = (l + s) / 2;
+	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
 
-	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 [h, sv * 100, v * 100];
+};
 
-		return arrayUnion(...tasks);
-	};
+convert.hsv.rgb = function (hsv) {
+	var h = hsv[0] / 60;
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+	var hi = Math.floor(h) % 6;
 
-	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
-	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+	var f = h - Math.floor(h);
+	var p = 255 * v * (1 - s);
+	var q = 255 * v * (1 - (s * f));
+	var t = 255 * v * (1 - (s * (1 - f)));
+	v *= 255;
 
-	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
+	switch (hi) {
+		case 0:
+			return [v, t, p];
+		case 1:
+			return [q, v, p];
+		case 2:
+			return [p, v, t];
+		case 3:
+			return [p, q, v];
+		case 4:
+			return [t, p, v];
+		case 5:
+			return [v, p, q];
+	}
 };
 
-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);
-	}, []);
+convert.hsv.hsl = function (hsv) {
+	var h = hsv[0];
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+	var vmin = Math.max(v, 0.01);
+	var lmin;
+	var sl;
+	var l;
 
-	const filter = getFilterSync(options);
+	l = (2 - s) * v;
+	lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
 
-	return tasks.reduce(
-		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
-		[]
-	).filter(path_ => !filter(path_));
+	return [h, sl * 100, l * 100];
 };
 
-module.exports.stream = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
+convert.hwb.rgb = function (hwb) {
+	var h = hwb[0] / 360;
+	var wh = hwb[1] / 100;
+	var bl = hwb[2] / 100;
+	var ratio = wh + bl;
+	var i;
+	var v;
+	var f;
+	var n;
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+	// wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
+	}
 
-	const filter = getFilterSync(options);
-	const filterStream = new FilterStream(p => !filter(p));
-	const uniqueStream = new UniqueStream();
+	i = Math.floor(6 * h);
+	v = 1 - bl;
+	f = 6 * h - i;
 
-	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
-		.pipe(filterStream)
-		.pipe(uniqueStream);
-};
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
+	}
 
-module.exports.generateGlobTasks = generateGlobTasks;
+	n = wh + f * (v - wh); // linear interpolation
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => glob.hasMagic(pattern, options));
+	var r;
+	var g;
+	var b;
+	switch (i) {
+		default:
+		case 6:
+		case 0: r = v; g = n; b = wh; break;
+		case 1: r = n; g = v; b = wh; break;
+		case 2: r = wh; g = v; b = n; break;
+		case 3: r = wh; g = n; b = v; break;
+		case 4: r = n; g = wh; b = v; break;
+		case 5: r = v; g = wh; b = n; break;
+	}
 
-module.exports.gitignore = gitignore;
+	return [r * 255, g * 255, b * 255];
+};
 
+convert.cmyk.rgb = function (cmyk) {
+	var c = cmyk[0] / 100;
+	var m = cmyk[1] / 100;
+	var y = cmyk[2] / 100;
+	var k = cmyk[3] / 100;
+	var r;
+	var g;
+	var b;
 
-/***/ }),
-/* 363 */
-/***/ (function(module, exports, __webpack_require__) {
+	r = 1 - Math.min(1, c * (1 - k) + k);
+	g = 1 - Math.min(1, m * (1 - k) + k);
+	b = 1 - Math.min(1, y * (1 - k) + k);
 
-"use strict";
+	return [r * 255, g * 255, b * 255];
+};
 
+convert.xyz.rgb = function (xyz) {
+	var x = xyz[0] / 100;
+	var y = xyz[1] / 100;
+	var z = xyz[2] / 100;
+	var r;
+	var g;
+	var b;
 
-module.exports = (...arguments_) => {
-	return [...new Set([].concat(...arguments_))];
-};
+	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
+	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
+	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
 
+	// assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
+		: r * 12.92;
 
-/***/ }),
-/* 364 */
-/***/ (function(module, exports, __webpack_require__) {
+	g = g > 0.0031308
+		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
+		: g * 12.92;
 
-"use strict";
+	b = b > 0.0031308
+		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
+		: b * 12.92;
 
-/*
- * merge2
- * https://github.com/teambition/merge2
- *
- * Copyright (c) 2014-2020 Teambition
- * Licensed under the MIT license.
- */
-const Stream = __webpack_require__(294)
-const PassThrough = Stream.PassThrough
-const slice = Array.prototype.slice
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
 
-module.exports = merge2
+	return [r * 255, g * 255, b * 255];
+};
 
-function merge2 () {
-  const streamsQueue = []
-  const args = slice.call(arguments)
-  let merging = false
-  let options = args[args.length - 1]
+convert.xyz.lab = function (xyz) {
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
 
-  if (options && !Array.isArray(options) && options.pipe == null) {
-    args.pop()
-  } else {
-    options = {}
-  }
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-  const doEnd = options.end !== false
-  const doPipeError = options.pipeError === true
-  if (options.objectMode == null) {
-    options.objectMode = true
-  }
-  if (options.highWaterMark == null) {
-    options.highWaterMark = 64 * 1024
-  }
-  const mergedStream = PassThrough(options)
+	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
 
-  function addStream () {
-    for (let i = 0, len = arguments.length; i < len; i++) {
-      streamsQueue.push(pauseStreams(arguments[i], options))
-    }
-    mergeStream()
-    return this
-  }
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
 
-  function mergeStream () {
-    if (merging) {
-      return
-    }
-    merging = true
+	return [l, a, b];
+};
 
-    let streams = streamsQueue.shift()
-    if (!streams) {
-      process.nextTick(endStream)
-      return
-    }
-    if (!Array.isArray(streams)) {
-      streams = [streams]
-    }
+convert.lab.xyz = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var x;
+	var y;
+	var z;
 
-    let pipesCount = streams.length + 1
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
 
-    function next () {
-      if (--pipesCount > 0) {
-        return
-      }
-      merging = false
-      mergeStream()
-    }
+	var y2 = Math.pow(y, 3);
+	var x2 = Math.pow(x, 3);
+	var z2 = Math.pow(z, 3);
+	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
+	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
+	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
 
-    function pipe (stream) {
-      function onend () {
-        stream.removeListener('merge2UnpipeEnd', onend)
-        stream.removeListener('end', onend)
-        if (doPipeError) {
-          stream.removeListener('error', onerror)
-        }
-        next()
-      }
-      function onerror (err) {
-        mergedStream.emit('error', err)
-      }
-      // skip ended stream
-      if (stream._readableState.endEmitted) {
-        return next()
-      }
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
 
-      stream.on('merge2UnpipeEnd', onend)
-      stream.on('end', onend)
+	return [x, y, z];
+};
 
-      if (doPipeError) {
-        stream.on('error', onerror)
-      }
+convert.lab.lch = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var hr;
+	var h;
+	var c;
 
-      stream.pipe(mergedStream, { end: false })
-      // compatible for old stream
-      stream.resume()
-    }
+	hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
 
-    for (let i = 0; i < streams.length; i++) {
-      pipe(streams[i])
-    }
+	if (h < 0) {
+		h += 360;
+	}
 
-    next()
-  }
+	c = Math.sqrt(a * a + b * b);
 
-  function endStream () {
-    merging = false
-    // emit 'queueDrain' when all streams merged.
-    mergedStream.emit('queueDrain')
-    if (doEnd) {
-      mergedStream.end()
-    }
-  }
-
-  mergedStream.setMaxListeners(0)
-  mergedStream.add = addStream
-  mergedStream.on('unpipe', function (stream) {
-    stream.emit('merge2UnpipeEnd')
-  })
+	return [l, c, h];
+};
 
-  if (args.length) {
-    addStream.apply(null, args)
-  }
-  return mergedStream
-}
+convert.lch.lab = function (lch) {
+	var l = lch[0];
+	var c = lch[1];
+	var h = lch[2];
+	var a;
+	var b;
+	var hr;
 
-// 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
-}
+	hr = h / 360 * 2 * Math.PI;
+	a = c * Math.cos(hr);
+	b = c * Math.sin(hr);
 
+	return [l, a, b];
+};
 
-/***/ }),
-/* 365 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.rgb.ansi16 = function (args) {
+	var r = args[0];
+	var g = args[1];
+	var b = args[2];
+	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
 
-// 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.
+	value = Math.round(value / 50);
 
-module.exports = glob
+	if (value === 0) {
+		return 30;
+	}
 
-var rp = __webpack_require__(366)
-var minimatch = __webpack_require__(368)
-var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(372)
-var EE = __webpack_require__(285).EventEmitter
-var path = __webpack_require__(4)
-var assert = __webpack_require__(283)
-var isAbsolute = __webpack_require__(374)
-var globSync = __webpack_require__(375)
-var common = __webpack_require__(376)
-var setopts = common.setopts
-var ownProp = common.ownProp
-var inflight = __webpack_require__(377)
-var util = __webpack_require__(234)
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+	var ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
 
-var once = __webpack_require__(290)
+	if (value === 2) {
+		ansi += 60;
+	}
 
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
+	return ansi;
+};
 
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
-  }
+convert.hsv.ansi16 = function (args) {
+	// optimization here; we already know the value and don't need to get
+	// it converted for us.
+	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
+};
 
-  return new Glob(pattern, options, cb)
-}
+convert.rgb.ansi256 = function (args) {
+	var r = args[0];
+	var g = args[1];
+	var b = args[2];
 
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
+	// we use the extended greyscale palette here, with the exception of
+	// black and white. normal palette only has 4 greyscale shades.
+	if (r === g && g === b) {
+		if (r < 8) {
+			return 16;
+		}
 
-// old api surface
-glob.glob = glob
+		if (r > 248) {
+			return 231;
+		}
 
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
-  }
+		return Math.round(((r - 8) / 247) * 24) + 232;
+	}
 
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
-  }
-  return origin
-}
+	var ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
 
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
+	return ansi;
+};
 
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
+convert.ansi16.rgb = function (args) {
+	var color = args % 10;
 
-  if (!pattern)
-    return false
+	// handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
+		}
 
-  if (set.length > 1)
-    return true
+		color = color / 10.5 * 255;
 
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
-  }
+		return [color, color, color];
+	}
 
-  return false
-}
+	var mult = (~~(args > 50) + 1) * 0.5;
+	var r = ((color & 1) * mult) * 255;
+	var g = (((color >> 1) & 1) * mult) * 255;
+	var b = (((color >> 2) & 1) * mult) * 255;
 
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
-  }
+	return [r, g, b];
+};
 
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
-  }
+convert.ansi256.rgb = function (args) {
+	// handle greyscale
+	if (args >= 232) {
+		var c = (args - 232) * 10 + 8;
+		return [c, c, c];
+	}
 
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
+	args -= 16;
 
-  setopts(this, pattern, options)
-  this._didRealPath = false
+	var rem;
+	var r = Math.floor(args / 36) / 5 * 255;
+	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
+	var b = (rem % 6) / 5 * 255;
 
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
+	return [r, g, b];
+};
 
-  // 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)
+convert.rgb.hex = function (args) {
+	var integer = ((Math.round(args[0]) & 0xFF) << 16)
+		+ ((Math.round(args[1]) & 0xFF) << 8)
+		+ (Math.round(args[2]) & 0xFF);
 
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
-  }
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-  var self = this
-  this._processing = 0
+convert.hex.rgb = function (args) {
+	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
+	if (!match) {
+		return [0, 0, 0];
+	}
 
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
+	var colorString = match[0];
 
-  if (this.noprocess)
-    return this
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(function (char) {
+			return char + char;
+		}).join('');
+	}
 
-  if (n === 0)
-    return done()
+	var integer = parseInt(colorString, 16);
+	var r = (integer >> 16) & 0xFF;
+	var g = (integer >> 8) & 0xFF;
+	var b = integer & 0xFF;
 
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
-  }
-  sync = false
+	return [r, g, b];
+};
 
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
-      } else {
-        self._finish()
-      }
-    }
-  }
-}
+convert.rgb.hcg = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var max = Math.max(Math.max(r, g), b);
+	var min = Math.min(Math.min(r, g), b);
+	var chroma = (max - min);
+	var grayscale;
+	var hue;
 
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
+	if (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
+	}
 
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
+	if (chroma <= 0) {
+		hue = 0;
+	} else
+	if (max === r) {
+		hue = ((g - b) / chroma) % 6;
+	} else
+	if (max === g) {
+		hue = 2 + (b - r) / chroma;
+	} else {
+		hue = 4 + (r - g) / chroma + 4;
+	}
 
-  common.finish(this)
-  this.emit('end', this.found)
-}
+	hue /= 6;
+	hue %= 1;
 
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
+	return [hue * 360, chroma * 100, grayscale * 100];
+};
 
-  this._didRealpath = true
+convert.hsl.hcg = function (hsl) {
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var c = 1;
+	var f = 0;
 
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
+	if (l < 0.5) {
+		c = 2.0 * s * l;
+	} else {
+		c = 2.0 * s * (1.0 - l);
+	}
 
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
+	}
 
-  function next () {
-    if (--n === 0)
-      self._finish()
-  }
-}
+	return [hsl[0], c * 100, f * 100];
+};
 
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
+convert.hsv.hcg = function (hsv) {
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
 
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
+	var c = s * v;
+	var f = 0;
 
-  if (n === 0)
-    return cb()
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
+	}
 
-  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
+	return [hsv[0], c * 100, f * 100];
+};
 
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
-      }
-    })
-  })
-}
+convert.hcg.rgb = function (hcg) {
+	var h = hcg[0] / 360;
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+	if (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
+	}
 
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+	var pure = [0, 0, 0];
+	var hi = (h % 1) * 6;
+	var v = hi % 1;
+	var w = 1 - v;
+	var mg = 0;
 
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
+	switch (Math.floor(hi)) {
+		case 0:
+			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
+		case 1:
+			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
+		case 2:
+			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
+		case 3:
+			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
+		case 4:
+			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
+		default:
+			pure[0] = 1; pure[1] = 0; pure[2] = w;
+	}
 
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
-  }
-}
+	mg = (1.0 - c) * g;
 
-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])
-      }
-    }
-  }
-}
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
+};
 
-Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
-  assert(this instanceof Glob)
-  assert(typeof cb === 'function')
+convert.hcg.hsv = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-  if (this.aborted)
-    return
+	var v = c + g * (1.0 - c);
+	var f = 0;
 
-  this._processing++
-  if (this.paused) {
-    this._processQueue.push([pattern, index, inGlobStar, cb])
-    return
-  }
+	if (v > 0.0) {
+		f = c / v;
+	}
 
-  //console.error('PROCESS %d', this._processing, pattern)
+	return [hcg[0], f * 100, v * 100];
+};
 
-  // 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.
+convert.hcg.hsl = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-  // 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
+	var l = g * (1.0 - c) + 0.5 * c;
+	var s = 0;
 
-    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
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
+	}
 
-  var abs = this._makeAbs(read)
+	return [hcg[0], s * 100, l * 100];
+};
 
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
+convert.hcg.hwb = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
+	var v = c + g * (1.0 - c);
+	return [hcg[0], (v - c) * 100, (1 - v) * 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)
-}
+convert.hwb.hcg = function (hwb) {
+	var w = hwb[1] / 100;
+	var b = hwb[2] / 100;
+	var v = 1 - b;
+	var c = v - w;
+	var g = 0;
 
-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 (c < 1) {
+		g = (v - c) / (1 - c);
+	}
 
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+	return [hwb[0], c * 100, g * 100];
+};
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
 
-  // 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) === '.'
+convert.rgb.apple = function (rgb) {
+	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+};
 
-  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)
-    }
-  }
+convert.gray.rgb = function (args) {
+	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+};
 
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+convert.gray.hsl = convert.gray.hsv = function (args) {
+	return [0, 0, args[0]];
+};
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
+};
 
-  // 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.
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+convert.gray.hex = function (gray) {
+	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	var integer = (val << 16) + (val << 8) + val;
 
-      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()
-  }
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-  // 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()
-}
+convert.rgb.gray = function (rgb) {
+	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
 
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
 
-  if (isIgnored(this, e))
-    return
+/***/ }),
 
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
-  }
+/***/ "../../node_modules/color-convert/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+var conversions = __webpack_require__("../../node_modules/color-convert/conversions.js");
+var route = __webpack_require__("../../node_modules/color-convert/route.js");
 
-  if (this.mark)
-    e = this._mark(e)
+var convert = {};
 
-  if (this.absolute)
-    e = abs
+var models = Object.keys(conversions);
 
-  if (this.matches[index][e])
-    return
+function wrapRaw(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
 
-  this.matches[index][e] = true
+		return fn(args);
+	};
 
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-  this.emit('match', e)
+	return wrappedFn;
 }
 
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
+function wrapRounded(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
 
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false, cb)
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
 
-  var lstatkey = 'lstat\0' + abs
-  var self = this
-  var lstatcb = inflight(lstatkey, lstatcb_)
+		var result = fn(args);
 
-  if (lstatcb)
-    self.fs.lstat(abs, lstatcb)
+		// we're assuming the result is an array here.
+		// see notice in conversions.js; don't use box types
+		// in conversion functions.
+		if (typeof result === 'object') {
+			for (var len = result.length, i = 0; i < len; i++) {
+				result[i] = Math.round(result[i]);
+			}
+		}
 
-  function lstatcb_ (er, lstat) {
-    if (er && er.code === 'ENOENT')
-      return cb()
+		return result;
+	};
 
-    var isSym = lstat && lstat.isSymbolicLink()
-    self.symlinks[abs] = isSym
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-    // 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)
-  }
+	return wrappedFn;
 }
 
-Glob.prototype._readdir = function (abs, inGlobStar, cb) {
-  if (this.aborted)
-    return
+models.forEach(function (fromModel) {
+	convert[fromModel] = {};
 
-  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
-  if (!cb)
-    return
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
 
-  //console.error('RD %j %j', +inGlobStar, abs)
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs, cb)
+	var routes = route(fromModel);
+	var routeModels = Object.keys(routes);
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return cb()
+	routeModels.forEach(function (toModel) {
+		var fn = routes[toModel];
 
-    if (Array.isArray(c))
-      return cb(null, c)
-  }
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
 
-  var self = this
-  self.fs.readdir(abs, readdirCb(this, abs, cb))
-}
+module.exports = convert;
 
-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
-    }
-  }
+/***/ "../../node_modules/color-convert/node_modules/color-name/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  this.cache[abs] = entries
-  return cb(null, entries)
-}
+"use strict";
+
+
+module.exports = {
+	"aliceblue": [240, 248, 255],
+	"antiquewhite": [250, 235, 215],
+	"aqua": [0, 255, 255],
+	"aquamarine": [127, 255, 212],
+	"azure": [240, 255, 255],
+	"beige": [245, 245, 220],
+	"bisque": [255, 228, 196],
+	"black": [0, 0, 0],
+	"blanchedalmond": [255, 235, 205],
+	"blue": [0, 0, 255],
+	"blueviolet": [138, 43, 226],
+	"brown": [165, 42, 42],
+	"burlywood": [222, 184, 135],
+	"cadetblue": [95, 158, 160],
+	"chartreuse": [127, 255, 0],
+	"chocolate": [210, 105, 30],
+	"coral": [255, 127, 80],
+	"cornflowerblue": [100, 149, 237],
+	"cornsilk": [255, 248, 220],
+	"crimson": [220, 20, 60],
+	"cyan": [0, 255, 255],
+	"darkblue": [0, 0, 139],
+	"darkcyan": [0, 139, 139],
+	"darkgoldenrod": [184, 134, 11],
+	"darkgray": [169, 169, 169],
+	"darkgreen": [0, 100, 0],
+	"darkgrey": [169, 169, 169],
+	"darkkhaki": [189, 183, 107],
+	"darkmagenta": [139, 0, 139],
+	"darkolivegreen": [85, 107, 47],
+	"darkorange": [255, 140, 0],
+	"darkorchid": [153, 50, 204],
+	"darkred": [139, 0, 0],
+	"darksalmon": [233, 150, 122],
+	"darkseagreen": [143, 188, 143],
+	"darkslateblue": [72, 61, 139],
+	"darkslategray": [47, 79, 79],
+	"darkslategrey": [47, 79, 79],
+	"darkturquoise": [0, 206, 209],
+	"darkviolet": [148, 0, 211],
+	"deeppink": [255, 20, 147],
+	"deepskyblue": [0, 191, 255],
+	"dimgray": [105, 105, 105],
+	"dimgrey": [105, 105, 105],
+	"dodgerblue": [30, 144, 255],
+	"firebrick": [178, 34, 34],
+	"floralwhite": [255, 250, 240],
+	"forestgreen": [34, 139, 34],
+	"fuchsia": [255, 0, 255],
+	"gainsboro": [220, 220, 220],
+	"ghostwhite": [248, 248, 255],
+	"gold": [255, 215, 0],
+	"goldenrod": [218, 165, 32],
+	"gray": [128, 128, 128],
+	"green": [0, 128, 0],
+	"greenyellow": [173, 255, 47],
+	"grey": [128, 128, 128],
+	"honeydew": [240, 255, 240],
+	"hotpink": [255, 105, 180],
+	"indianred": [205, 92, 92],
+	"indigo": [75, 0, 130],
+	"ivory": [255, 255, 240],
+	"khaki": [240, 230, 140],
+	"lavender": [230, 230, 250],
+	"lavenderblush": [255, 240, 245],
+	"lawngreen": [124, 252, 0],
+	"lemonchiffon": [255, 250, 205],
+	"lightblue": [173, 216, 230],
+	"lightcoral": [240, 128, 128],
+	"lightcyan": [224, 255, 255],
+	"lightgoldenrodyellow": [250, 250, 210],
+	"lightgray": [211, 211, 211],
+	"lightgreen": [144, 238, 144],
+	"lightgrey": [211, 211, 211],
+	"lightpink": [255, 182, 193],
+	"lightsalmon": [255, 160, 122],
+	"lightseagreen": [32, 178, 170],
+	"lightskyblue": [135, 206, 250],
+	"lightslategray": [119, 136, 153],
+	"lightslategrey": [119, 136, 153],
+	"lightsteelblue": [176, 196, 222],
+	"lightyellow": [255, 255, 224],
+	"lime": [0, 255, 0],
+	"limegreen": [50, 205, 50],
+	"linen": [250, 240, 230],
+	"magenta": [255, 0, 255],
+	"maroon": [128, 0, 0],
+	"mediumaquamarine": [102, 205, 170],
+	"mediumblue": [0, 0, 205],
+	"mediumorchid": [186, 85, 211],
+	"mediumpurple": [147, 112, 219],
+	"mediumseagreen": [60, 179, 113],
+	"mediumslateblue": [123, 104, 238],
+	"mediumspringgreen": [0, 250, 154],
+	"mediumturquoise": [72, 209, 204],
+	"mediumvioletred": [199, 21, 133],
+	"midnightblue": [25, 25, 112],
+	"mintcream": [245, 255, 250],
+	"mistyrose": [255, 228, 225],
+	"moccasin": [255, 228, 181],
+	"navajowhite": [255, 222, 173],
+	"navy": [0, 0, 128],
+	"oldlace": [253, 245, 230],
+	"olive": [128, 128, 0],
+	"olivedrab": [107, 142, 35],
+	"orange": [255, 165, 0],
+	"orangered": [255, 69, 0],
+	"orchid": [218, 112, 214],
+	"palegoldenrod": [238, 232, 170],
+	"palegreen": [152, 251, 152],
+	"paleturquoise": [175, 238, 238],
+	"palevioletred": [219, 112, 147],
+	"papayawhip": [255, 239, 213],
+	"peachpuff": [255, 218, 185],
+	"peru": [205, 133, 63],
+	"pink": [255, 192, 203],
+	"plum": [221, 160, 221],
+	"powderblue": [176, 224, 230],
+	"purple": [128, 0, 128],
+	"rebeccapurple": [102, 51, 153],
+	"red": [255, 0, 0],
+	"rosybrown": [188, 143, 143],
+	"royalblue": [65, 105, 225],
+	"saddlebrown": [139, 69, 19],
+	"salmon": [250, 128, 114],
+	"sandybrown": [244, 164, 96],
+	"seagreen": [46, 139, 87],
+	"seashell": [255, 245, 238],
+	"sienna": [160, 82, 45],
+	"silver": [192, 192, 192],
+	"skyblue": [135, 206, 235],
+	"slateblue": [106, 90, 205],
+	"slategray": [112, 128, 144],
+	"slategrey": [112, 128, 144],
+	"snow": [255, 250, 250],
+	"springgreen": [0, 255, 127],
+	"steelblue": [70, 130, 180],
+	"tan": [210, 180, 140],
+	"teal": [0, 128, 128],
+	"thistle": [216, 191, 216],
+	"tomato": [255, 99, 71],
+	"turquoise": [64, 224, 208],
+	"violet": [238, 130, 238],
+	"wheat": [245, 222, 179],
+	"white": [255, 255, 255],
+	"whitesmoke": [245, 245, 245],
+	"yellow": [255, 255, 0],
+	"yellowgreen": [154, 205, 50]
+};
 
-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
+/***/ "../../node_modules/color-convert/route.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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
-  }
+var conversions = __webpack_require__("../../node_modules/color-convert/conversions.js");
 
-  return cb()
-}
+/*
+	this function routes a model to all other models.
 
-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)
-  })
-}
+	all functions that are routed have a property `.conversion` attached
+	to the returned synthetic function. This property is an array
+	of strings, each with the steps in between the 'from' and 'to'
+	color models (inclusive).
 
+	conversions that are not possible simply are not included.
+*/
 
-Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-  //console.error('pgs2', prefix, remain[0], entries)
+function buildGraph() {
+	var graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	var models = Object.keys(conversions);
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return cb()
+	for (var len = models.length, i = 0; i < len; i++) {
+		graph[models[i]] = {
+			// http://jsperf.com/1-vs-infinity
+			// micro-opt, but this is simple.
+			distance: -1,
+			parent: null
+		};
+	}
 
-  // 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)
+	return graph;
+}
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false, cb)
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	var graph = buildGraph();
+	var queue = [fromModel]; // unshift -> queue -> pop
 
-  var isSym = this.symlinks[abs]
-  var len = entries.length
+	graph[fromModel].distance = 0;
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return cb()
+	while (queue.length) {
+		var current = queue.pop();
+		var adjacents = Object.keys(conversions[current]);
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+		for (var len = adjacents.length, i = 0; i < len; i++) {
+			var adjacent = adjacents[i];
+			var node = graph[adjacent];
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true, cb)
+			if (node.distance === -1) {
+				node.distance = graph[current].distance + 1;
+				node.parent = current;
+				queue.unshift(adjacent);
+			}
+		}
+	}
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true, cb)
-  }
+	return graph;
+}
 
-  cb()
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
 }
 
-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)
-  })
+function wrapConversion(toModel, graph) {
+	var path = [graph[toModel].parent, toModel];
+	var fn = conversions[graph[toModel].parent][toModel];
+
+	var cur = graph[toModel].parent;
+	while (graph[cur].parent) {
+		path.unshift(graph[cur].parent);
+		fn = link(conversions[graph[cur].parent][cur], fn);
+		cur = graph[cur].parent;
+	}
+
+	fn.conversion = path;
+	return fn;
 }
-Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
 
-  //console.error('ps2', prefix, exists)
+module.exports = function (fromModel) {
+	var graph = deriveBFS(fromModel);
+	var conversion = {};
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+	var models = Object.keys(graph);
+	for (var len = models.length, i = 0; i < len; i++) {
+		var toModel = models[i];
+		var node = graph[toModel];
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return cb()
+		if (node.parent === null) {
+			// no possible conversion, or this node is the source model.
+			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 += '/'
-    }
-  }
+		conversion[toModel] = wrapConversion(toModel, graph);
+	}
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+	return conversion;
+};
 
-  // 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]
+/***/ "../../node_modules/color-name/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (Array.isArray(c))
-      c = 'DIR'
+"use strict";
+
+
+module.exports = {
+	"aliceblue": [240, 248, 255],
+	"antiquewhite": [250, 235, 215],
+	"aqua": [0, 255, 255],
+	"aquamarine": [127, 255, 212],
+	"azure": [240, 255, 255],
+	"beige": [245, 245, 220],
+	"bisque": [255, 228, 196],
+	"black": [0, 0, 0],
+	"blanchedalmond": [255, 235, 205],
+	"blue": [0, 0, 255],
+	"blueviolet": [138, 43, 226],
+	"brown": [165, 42, 42],
+	"burlywood": [222, 184, 135],
+	"cadetblue": [95, 158, 160],
+	"chartreuse": [127, 255, 0],
+	"chocolate": [210, 105, 30],
+	"coral": [255, 127, 80],
+	"cornflowerblue": [100, 149, 237],
+	"cornsilk": [255, 248, 220],
+	"crimson": [220, 20, 60],
+	"cyan": [0, 255, 255],
+	"darkblue": [0, 0, 139],
+	"darkcyan": [0, 139, 139],
+	"darkgoldenrod": [184, 134, 11],
+	"darkgray": [169, 169, 169],
+	"darkgreen": [0, 100, 0],
+	"darkgrey": [169, 169, 169],
+	"darkkhaki": [189, 183, 107],
+	"darkmagenta": [139, 0, 139],
+	"darkolivegreen": [85, 107, 47],
+	"darkorange": [255, 140, 0],
+	"darkorchid": [153, 50, 204],
+	"darkred": [139, 0, 0],
+	"darksalmon": [233, 150, 122],
+	"darkseagreen": [143, 188, 143],
+	"darkslateblue": [72, 61, 139],
+	"darkslategray": [47, 79, 79],
+	"darkslategrey": [47, 79, 79],
+	"darkturquoise": [0, 206, 209],
+	"darkviolet": [148, 0, 211],
+	"deeppink": [255, 20, 147],
+	"deepskyblue": [0, 191, 255],
+	"dimgray": [105, 105, 105],
+	"dimgrey": [105, 105, 105],
+	"dodgerblue": [30, 144, 255],
+	"firebrick": [178, 34, 34],
+	"floralwhite": [255, 250, 240],
+	"forestgreen": [34, 139, 34],
+	"fuchsia": [255, 0, 255],
+	"gainsboro": [220, 220, 220],
+	"ghostwhite": [248, 248, 255],
+	"gold": [255, 215, 0],
+	"goldenrod": [218, 165, 32],
+	"gray": [128, 128, 128],
+	"green": [0, 128, 0],
+	"greenyellow": [173, 255, 47],
+	"grey": [128, 128, 128],
+	"honeydew": [240, 255, 240],
+	"hotpink": [255, 105, 180],
+	"indianred": [205, 92, 92],
+	"indigo": [75, 0, 130],
+	"ivory": [255, 255, 240],
+	"khaki": [240, 230, 140],
+	"lavender": [230, 230, 250],
+	"lavenderblush": [255, 240, 245],
+	"lawngreen": [124, 252, 0],
+	"lemonchiffon": [255, 250, 205],
+	"lightblue": [173, 216, 230],
+	"lightcoral": [240, 128, 128],
+	"lightcyan": [224, 255, 255],
+	"lightgoldenrodyellow": [250, 250, 210],
+	"lightgray": [211, 211, 211],
+	"lightgreen": [144, 238, 144],
+	"lightgrey": [211, 211, 211],
+	"lightpink": [255, 182, 193],
+	"lightsalmon": [255, 160, 122],
+	"lightseagreen": [32, 178, 170],
+	"lightskyblue": [135, 206, 250],
+	"lightslategray": [119, 136, 153],
+	"lightslategrey": [119, 136, 153],
+	"lightsteelblue": [176, 196, 222],
+	"lightyellow": [255, 255, 224],
+	"lime": [0, 255, 0],
+	"limegreen": [50, 205, 50],
+	"linen": [250, 240, 230],
+	"magenta": [255, 0, 255],
+	"maroon": [128, 0, 0],
+	"mediumaquamarine": [102, 205, 170],
+	"mediumblue": [0, 0, 205],
+	"mediumorchid": [186, 85, 211],
+	"mediumpurple": [147, 112, 219],
+	"mediumseagreen": [60, 179, 113],
+	"mediumslateblue": [123, 104, 238],
+	"mediumspringgreen": [0, 250, 154],
+	"mediumturquoise": [72, 209, 204],
+	"mediumvioletred": [199, 21, 133],
+	"midnightblue": [25, 25, 112],
+	"mintcream": [245, 255, 250],
+	"mistyrose": [255, 228, 225],
+	"moccasin": [255, 228, 181],
+	"navajowhite": [255, 222, 173],
+	"navy": [0, 0, 128],
+	"oldlace": [253, 245, 230],
+	"olive": [128, 128, 0],
+	"olivedrab": [107, 142, 35],
+	"orange": [255, 165, 0],
+	"orangered": [255, 69, 0],
+	"orchid": [218, 112, 214],
+	"palegoldenrod": [238, 232, 170],
+	"palegreen": [152, 251, 152],
+	"paleturquoise": [175, 238, 238],
+	"palevioletred": [219, 112, 147],
+	"papayawhip": [255, 239, 213],
+	"peachpuff": [255, 218, 185],
+	"peru": [205, 133, 63],
+	"pink": [255, 192, 203],
+	"plum": [221, 160, 221],
+	"powderblue": [176, 224, 230],
+	"purple": [128, 0, 128],
+	"rebeccapurple": [102, 51, 153],
+	"red": [255, 0, 0],
+	"rosybrown": [188, 143, 143],
+	"royalblue": [65, 105, 225],
+	"saddlebrown": [139, 69, 19],
+	"salmon": [250, 128, 114],
+	"sandybrown": [244, 164, 96],
+	"seagreen": [46, 139, 87],
+	"seashell": [255, 245, 238],
+	"sienna": [160, 82, 45],
+	"silver": [192, 192, 192],
+	"skyblue": [135, 206, 235],
+	"slateblue": [106, 90, 205],
+	"slategray": [112, 128, 144],
+	"slategrey": [112, 128, 144],
+	"snow": [255, 250, 250],
+	"springgreen": [0, 255, 127],
+	"steelblue": [70, 130, 180],
+	"tan": [210, 180, 140],
+	"teal": [0, 128, 128],
+	"thistle": [216, 191, 216],
+	"tomato": [255, 99, 71],
+	"turquoise": [64, 224, 208],
+	"violet": [238, 130, 238],
+	"wheat": [245, 222, 179],
+	"white": [255, 255, 255],
+	"whitesmoke": [245, 245, 245],
+	"yellow": [255, 255, 0],
+	"yellowgreen": [154, 205, 50]
+};
 
-    // 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.
-  }
+/***/ "../../node_modules/concat-map/index.js":
+/***/ (function(module, exports) {
 
-  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)
+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 self = this
-  var statcb = inflight('stat\0' + abs, lstatcb_)
-  if (statcb)
-    self.fs.lstat(abs, statcb)
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
 
-  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 self.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
+/***/ "../../node_modules/cross-spawn/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
-    return cb(null, false, stat)
+"use strict";
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-  this.cache[abs] = this.cache[abs] || c
 
-  if (needDir && c === 'FILE')
-    return cb()
+const cp = __webpack_require__("child_process");
+const parse = __webpack_require__("../../node_modules/cross-spawn/lib/parse.js");
+const enoent = __webpack_require__("../../node_modules/cross-spawn/lib/enoent.js");
 
-  return cb(null, c, stat)
+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;
+
 
 /***/ }),
-/* 366 */
+
+/***/ "../../node_modules/cross-spawn/lib/enoent.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = realpath
-realpath.realpath = realpath
-realpath.sync = realpathSync
-realpath.realpathSync = realpathSync
-realpath.monkeypatch = monkeypatch
-realpath.unmonkeypatch = unmonkeypatch
+"use strict";
 
-var fs = __webpack_require__(253)
-var origRealpath = fs.realpath
-var origRealpathSync = fs.realpathSync
 
-var version = process.version
-var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(367)
+const isWin = process.platform === 'win32';
 
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
+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 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 hookChildProcess(cp, parsed) {
+    if (!isWin) {
+        return;
     }
-  })
-}
 
-function realpathSync (p, cache) {
-  if (ok) {
-    return origRealpathSync(p, cache)
-  }
+    const originalEmit = cp.emit;
 
-  try {
-    return origRealpathSync(p, cache)
-  } catch (er) {
-    if (newError(er)) {
-      return old.realpathSync(p, cache)
-    } else {
-      throw er
-    }
-  }
+    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 monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
+function verifyENOENT(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawn');
+    }
+
+    return null;
 }
 
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
+function verifyENOENTSync(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawnSync');
+    }
+
+    return null;
 }
 
+module.exports = {
+    hookChildProcess,
+    verifyENOENT,
+    verifyENOENTSync,
+    notFoundError,
+};
+
 
 /***/ }),
-/* 367 */
+
+/***/ "../../node_modules/cross-spawn/lib/parse.js":
 /***/ (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.
+"use strict";
 
-var pathModule = __webpack_require__(4);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(253);
 
-// JavaScript implementation of realpath, ported from node pre-v6
+const path = __webpack_require__("path");
+const resolveCommand = __webpack_require__("../../node_modules/cross-spawn/lib/util/resolveCommand.js");
+const escape = __webpack_require__("../../node_modules/cross-spawn/lib/util/escape.js");
+const readShebang = __webpack_require__("../../node_modules/cross-spawn/lib/util/readShebang.js");
 
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+const isWin = process.platform === 'win32';
+const isExecutableRegExp = /\.(?:com|exe)$/i;
+const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
 
-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;
+function detectShebang(parsed) {
+    parsed.file = resolveCommand(parsed);
 
-  return callback;
+    const shebang = parsed.file && readShebang(parsed.file);
 
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
-    }
-  }
+    if (shebang) {
+        parsed.args.unshift(parsed.file);
+        parsed.command = shebang;
 
-  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);
-      }
+        return resolveCommand(parsed);
     }
-  }
-}
 
-function maybeCallback(cb) {
-  return typeof cb === 'function' ? cb : rethrow();
+    return parsed.file;
 }
 
-var normalize = pathModule.normalize;
+function parseNonShell(parsed) {
+    if (!isWin) {
+        return parsed;
+    }
 
-// 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;
-}
+    // Detect & add support for shebangs
+    const commandFile = detectShebang(parsed);
 
-// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
-if (isWindows) {
-  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
-} else {
-  var splitRootRe = /^[\/]*/;
-}
+    // We don't need a shell if the command filename is an executable
+    const needsShell = !isExecutableRegExp.test(commandFile);
 
-exports.realpathSync = function realpathSync(p, cache) {
-  // make p is absolute
-  p = pathModule.resolve(p);
+    // 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);
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return cache[p];
-  }
+        // 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);
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+        // Escape command & arguments
+        parsed.command = escape.command(parsed.command);
+        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 
-  // 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 shellCommand = [parsed.command].concat(parsed.args).join(' ');
 
-  start();
+        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
+    }
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+    return parsed;
+}
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstatSync(base);
-      knownHard[base] = true;
+function parse(command, args, options) {
+    // Normalize arguments, similar to nodejs
+    if (args && !Array.isArray(args)) {
+        options = args;
+        args = null;
     }
-  }
 
-  // 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;
+    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
+    options = Object.assign({}, options); // Clone object to avoid changing the original
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
-    }
+    // Build our parsed object
+    const parsed = {
+        command,
+        args,
+        options,
+        file: undefined,
+        original: {
+            command,
+            args,
+        },
+    };
 
-    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;
-      }
+    // Delegate further parsing to shell or non-shell
+    return options.shell ? parsed : parseNonShell(parsed);
+}
 
-      // 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;
-    }
+module.exports = parse;
 
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
 
-  if (cache) cache[original] = p;
+/***/ }),
 
-  return p;
-};
+/***/ "../../node_modules/cross-spawn/lib/util/escape.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-exports.realpath = function realpath(p, cache, cb) {
-  if (typeof cb !== 'function') {
-    cb = maybeCallback(cache);
-    cache = null;
-  }
 
-  // make p is absolute
-  p = pathModule.resolve(p);
+// See http://www.robvanderwoude.com/escapechars.php
+const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return process.nextTick(cb.bind(null, null, cache[p]));
-  }
+function escapeCommand(arg) {
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+    return arg;
+}
 
-  // 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 escapeArgument(arg, doubleEscapeMetaChars) {
+    // Convert to string
+    arg = `${arg}`;
 
-  start();
+    // Algorithm below is based on https://qntm.org/cmd
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+    // Sequence of backslashes followed by a double quote:
+    // double up all the backslashes and escape the double quote
+    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
 
-    // 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);
-    }
-  }
+    // 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');
 
-  // 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);
-    }
+    // All other backslashes occur literally
 
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
+    // Quote the whole thing:
+    arg = `"${arg}"`;
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      return process.nextTick(LOOP);
-    }
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
 
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
+    // Double escape meta chars if necessary
+    if (doubleEscapeMetaChars) {
+        arg = arg.replace(metaCharsRegExp, '^$1');
     }
 
-    return fs.lstat(base, gotStat);
-  }
+    return arg;
+}
 
-  function gotStat(err, stat) {
-    if (err) return cb(err);
+module.exports.command = escapeCommand;
+module.exports.argument = escapeArgument;
 
-    // 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);
-      });
-    });
-  }
+/***/ "../../node_modules/cross-spawn/lib/util/readShebang.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  function gotTarget(err, target, base) {
-    if (err) return cb(err);
+"use strict";
 
-    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();
-  }
-};
+const fs = __webpack_require__("fs");
+const shebangCommand = __webpack_require__("../../node_modules/shebang-command/index.js");
 
+function readShebang(command) {
+    // Read the first 150 bytes from the file
+    const size = 150;
+    const buffer = Buffer.alloc(size);
 
-/***/ }),
-/* 368 */
-/***/ (function(module, exports, __webpack_require__) {
+    let fd;
 
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
+    try {
+        fd = fs.openSync(command, 'r');
+        fs.readSync(fd, buffer, 0, size, 0);
+        fs.closeSync(fd);
+    } catch (e) { /* Empty */ }
 
-var path = (function () { try { return __webpack_require__(4) } catch (e) {}}()) || {
-  sep: '/'
+    // Attempt to extract shebang (null is returned if not a shebang)
+    return shebangCommand(buffer.toString());
 }
-minimatch.sep = path.sep
 
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(369)
+module.exports = readShebang;
 
-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 + '*?'
+/***/ "../../node_modules/cross-spawn/lib/util/resolveCommand.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// ** 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})($|\\\/)).)*?'
+"use strict";
 
-// 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('().*{}+?[]^$\\!')
+const path = __webpack_require__("path");
+const which = __webpack_require__("../../node_modules/which/which.js");
+const getPathKey = __webpack_require__("../../node_modules/cross-spawn/node_modules/path-key/index.js");
 
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
-}
+function resolveCommandAttempt(parsed, withoutPathExt) {
+    const env = parsed.options.env || process.env;
+    const cwd = process.cwd();
+    const hasCustomCwd = parsed.options.cwd != null;
+    // Worker threads do not have process.chdir()
+    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined && !process.chdir.disabled;
 
-// normalizes slashes.
-var slashSplit = /\/+/
+    // 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 */
+        }
+    }
 
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
-  }
+    let resolved;
+
+    try {
+        resolved = which.sync(parsed.command, {
+            path: env[getPathKey({ env })],
+            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 ext (a, b) {
-  b = b || {}
-  var t = {}
-  Object.keys(a).forEach(function (k) {
-    t[k] = a[k]
-  })
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k]
-  })
-  return t
+function resolveCommand(parsed) {
+    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
 }
 
-minimatch.defaults = function (def) {
-  if (!def || typeof def !== 'object' || !Object.keys(def).length) {
-    return minimatch
-  }
+module.exports = resolveCommand;
 
-  var orig = minimatch
 
-  var m = function minimatch (p, pattern, options) {
-    return orig(p, pattern, ext(def, options))
-  }
+/***/ }),
 
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
-  }
-  m.Minimatch.defaults = function defaults (options) {
-    return orig.defaults(ext(def, options)).Minimatch
-  }
+/***/ "../../node_modules/cross-spawn/node_modules/path-key/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  m.filter = function filter (pattern, options) {
-    return orig.filter(pattern, ext(def, options))
-  }
+"use strict";
 
-  m.defaults = function defaults (options) {
-    return orig.defaults(ext(def, options))
-  }
 
-  m.makeRe = function makeRe (pattern, options) {
-    return orig.makeRe(pattern, ext(def, options))
-  }
+const pathKey = (options = {}) => {
+	const environment = options.env || process.env;
+	const platform = options.platform || process.platform;
 
-  m.braceExpand = function braceExpand (pattern, options) {
-    return orig.braceExpand(pattern, ext(def, options))
-  }
+	if (platform !== 'win32') {
+		return 'PATH';
+	}
 
-  m.match = function (list, pattern, options) {
-    return orig.match(list, pattern, ext(def, options))
-  }
+	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
+};
 
-  return m
-}
+module.exports = pathKey;
+// TODO: Remove this for the next major release
+module.exports.default = pathKey;
 
-Minimatch.defaults = function (def) {
-  return minimatch.defaults(def).Minimatch
-}
 
-function minimatch (p, pattern, options) {
-  assertValidPattern(pattern)
+/***/ }),
 
-  if (!options) options = {}
+/***/ "../../node_modules/debug/node_modules/ms/index.js":
+/***/ (function(module, exports) {
 
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
-  }
+/**
+ * Helpers.
+ */
 
-  return new Minimatch(pattern, options).match(p)
-}
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
 
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
+/**
+ * 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)
+  );
+};
 
-  assertValidPattern(pattern)
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
 
-  if (!options) options = {}
+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;
+  }
+}
 
-  pattern = pattern.trim()
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  // windows support: need to use /, not \
-  if (!options.allowWindowsEscape && path.sep !== '/') {
-    pattern = pattern.split(path.sep).join('/')
+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';
+}
 
-  this.options = options
-  this.set = []
-  this.pattern = pattern
-  this.regexp = null
-  this.negate = false
-  this.comment = false
-  this.empty = false
-  this.partial = !!options.partial
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  // make the set of regexps etc.
-  this.make()
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
 }
 
-Minimatch.prototype.debug = function () {}
-
-Minimatch.prototype.make = make
-function make () {
-  var pattern = this.pattern
-  var options = this.options
+/**
+ * Pluralization helper.
+ */
 
-  // empty patterns and comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    this.comment = true
-    return
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
   }
-  if (!pattern) {
-    this.empty = true
-    return
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
   }
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
 
-  // step 1: figure out negation, etc.
-  this.parseNegate()
-
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
 
-  if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
+/***/ }),
 
-  this.debug(this.pattern, set)
+/***/ "../../node_modules/debug/src/browser.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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 is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-  this.debug(this.pattern, set)
+exports = module.exports = __webpack_require__("../../node_modules/debug/src/debug.js");
+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();
 
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
+/**
+ * Colors.
+ */
 
-  this.debug(this.pattern, set)
+exports.colors = [
+  'lightseagreen',
+  'forestgreen',
+  'goldenrod',
+  'dodgerblue',
+  'darkorchid',
+  'crimson'
+];
 
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
-  })
+/**
+ * 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
+ */
 
-  this.debug(this.pattern, set)
+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;
+  }
 
-  this.set = set
+  // 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+)/));
 }
 
-Minimatch.prototype.parseNegate = parseNegate
-function parseNegate () {
-  var pattern = this.pattern
-  var negate = false
-  var options = this.options
-  var negateOffset = 0
-
-  if (options.nonegate) return
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
 
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
   }
+};
 
-  if (negateOffset) this.pattern = pattern.substr(negateOffset)
-  this.negate = negate
+
+/**
+ * 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);
 }
 
-// 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)
+/**
+ * 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);
 }
 
-Minimatch.prototype.braceExpand = braceExpand
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
     } else {
-      options = {}
+      exports.storage.debug = namespaces;
     }
-  }
+  } catch(e) {}
+}
 
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-  assertValidPattern(pattern)
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
 
-  // Thanks to Yeting Li <https://github.com/yetingli> for
-  // improving this regexp to avoid a ReDOS vulnerability.
-  if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
-    // shortcut. no need to expand.
-    return [pattern]
+  // 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 expand(pattern)
+  return r;
 }
 
-var MAX_PATTERN_LENGTH = 1024 * 64
-var assertValidPattern = function (pattern) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('invalid pattern')
-  }
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
 
-  if (pattern.length > MAX_PATTERN_LENGTH) {
-    throw new TypeError('pattern is too long')
-  }
+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) {}
 }
 
-// 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) {
-  assertValidPattern(pattern)
 
-  var options = this.options
+/***/ }),
 
-  // shortcuts
-  if (pattern === '**') {
-    if (!options.noglobstar)
-      return GLOBSTAR
-    else
-      pattern = '*'
-  }
-  if (pattern === '') return ''
+/***/ "../../node_modules/debug/src/debug.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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
-    }
-  }
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-  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)
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__("../../node_modules/debug/node_modules/ms/index.js");
 
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
-    }
+/**
+ * The currently active debug mode names, and names to skip.
+ */
 
-    switch (c) {
-      /* istanbul ignore next */
-      case '/': {
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
-      }
+exports.names = [];
+exports.skips = [];
 
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
+/**
+ * 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".
+ */
 
-      // 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)
+exports.formatters = {};
 
-        // 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
-        }
+/**
+ * Previous log timestamp.
+ */
 
-        // 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
+var prevTime;
 
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
-        }
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
 
-        if (!stateChar) {
-          re += '\\('
-          continue
-        }
+function selectColor(namespace) {
+  var hash = 0, i;
 
-        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
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
 
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
-        }
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
 
-        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
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
 
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
-        }
+function createDebug(namespace) {
 
-        clearStateChar()
-        re += '|'
-      continue
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
 
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
+    var self = debug;
 
-        if (inClass) {
-          re += '\\' + c
-          continue
-        }
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
 
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
+    // 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];
+    }
 
-      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
-        }
+    args[0] = exports.coerce(args[0]);
 
-        // handle the case where we left a class open.
-        // "[z-a]" is valid, equivalent to "\[z-a\]"
-        // 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
-        }
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
+    }
 
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
+    // 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);
 
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
 
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
-        }
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
 
-        re += c
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
 
-    } // switch
-  } // for
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
 
-  // 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]
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
   }
 
-  // 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 = '\\'
-      }
+  return debug;
+}
 
-      // 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 + '|'
-    })
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
 
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
+function enable(namespaces) {
+  exports.save(namespaces);
 
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
-  }
+  exports.names = [];
+  exports.skips = [];
 
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
-  }
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
 
-  // 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
+  for (var 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 + '$'));
+    }
   }
+}
 
-  // 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]
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
 
-    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 disable() {
+  exports.enable('');
+}
 
-    nlLast += nlAfter
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
 
-    // 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(/\)[+*?]?/, '')
+function enabled(name) {
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
     }
-    nlAfter = cleanAfter
-
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
     }
-    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
-    re = newRe
   }
+  return false;
+}
 
-  // 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
-  }
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
 
-  if (addPatternStart) {
-    re = patternStart + re
-  }
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
 
-  // 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) /* istanbul ignore next - should be impossible */ {
-    // 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('$.')
-  }
+/***/ "../../node_modules/debug/src/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  regExp._glob = pattern
-  regExp._src = re
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
 
-  return regExp
+if (typeof process !== 'undefined' && process.type === 'renderer') {
+  module.exports = __webpack_require__("../../node_modules/debug/src/browser.js");
+} else {
+  module.exports = __webpack_require__("../../node_modules/debug/src/node.js");
 }
 
-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
+/***/ "../../node_modules/debug/src/node.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
-  }
-  var options = this.options
+/**
+ * Module dependencies.
+ */
 
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
+var tty = __webpack_require__("tty");
+var util = __webpack_require__("util");
 
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-  // must match entire pattern
-  // ending in a * or ** will make it less strict.
-  re = '^(?:' + re + ')$'
+exports = module.exports = __webpack_require__("../../node_modules/debug/src/debug.js");
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
 
-  // can match anything, as long as it's not this.
-  if (this.negate) re = '^(?!' + re + ').*$'
+/**
+ * Colors.
+ */
 
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) /* istanbul ignore next - should be impossible */ {
-    this.regexp = false
-  }
-  return this.regexp
-}
+exports.colors = [6, 2, 3, 4, 5, 1];
 
-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
-}
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
 
-Minimatch.prototype.match = function match (f, partial) {
-  if (typeof partial === 'undefined') partial = this.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 === ''
+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() });
 
-  if (f === '/' && partial) return true
+  // 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);
 
-  var options = this.options
+  obj[prop] = val;
+  return obj;
+}, {});
 
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
+/**
+ * The file descriptor to write the `debug()` calls to.
+ * Set the `DEBUG_FD` env variable to override with another value. i.e.:
+ *
+ *   $ DEBUG_FD=3 node script.js 3>debug.log
+ */
 
-  // treat the test path as a set of pathparts.
-  f = f.split(slashSplit)
-  this.debug(this.pattern, 'split', f)
+var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
 
-  // 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 (1 !== fd && 2 !== fd) {
+  util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')()
+}
 
-  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
-  }
+var stream = 1 === fd ? process.stdout :
+             2 === fd ? process.stderr :
+             createWritableStdioStream(fd);
 
-  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
-    }
-  }
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
 
-  // 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 useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(fd);
 }
 
-// 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
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
 
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
+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(' ');
+};
 
-  this.debug('matchOne', file.length, pattern.length)
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
 
-  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]
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
 
-    this.debug(pattern, p, f)
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
 
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    /* istanbul ignore if */
-    if (p === false) return false
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
 
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
+  if (useColors) {
+    var c = this.color;
+    var prefix = '  \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m';
 
-      // "**"
-      // 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
-      }
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = new Date().toUTCString()
+      + ' ' + name + ' ' + args[0];
+  }
+}
 
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
+/**
+ * Invokes `util.format()` with the specified arguments and writes to `stream`.
+ */
 
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+function log() {
+  return stream.write(util.format.apply(util, arguments) + '\n');
+}
 
-        // 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
-          }
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
-        }
-      }
+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;
+  }
+}
 
-      // no match was found.
-      // However, in partial mode, we can't say this is necessarily over.
-      // If there's more *pattern* left, then
-      /* istanbul ignore if */
-      if (partial) {
-        // ran out of file
-        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
-        if (fr === fl) return true
-      }
-      return false
-    }
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-    // 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') {
-      hit = f === p
-      this.debug('string match', p, f, hit)
-    } else {
-      hit = f.match(p)
-      this.debug('pattern match', p, f, hit)
-    }
+function load() {
+  return process.env.DEBUG;
+}
 
-    if (!hit) return false
-  }
+/**
+ * Copied from `node/src/node.js`.
+ *
+ * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
+ * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
+ */
 
-  // 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/*
+function createWritableStdioStream (fd) {
+  var stream;
+  var tty_wrap = process.binding('tty_wrap');
 
-  // 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 /* istanbul ignore 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/
-    return (fi === fl - 1) && (file[fi] === '')
-  }
+  // Note stream._type is used for test-module-load-list.js
 
-  // should be unreachable.
-  /* istanbul ignore next */
-  throw new Error('wtf?')
-}
+  switch (tty_wrap.guessHandleType(fd)) {
+    case 'TTY':
+      stream = new tty.WriteStream(fd);
+      stream._type = 'tty';
 
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
-}
+      // Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
 
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
-}
+    case 'FILE':
+      var fs = __webpack_require__("fs");
+      stream = new fs.SyncWriteStream(fd, { autoClose: false });
+      stream._type = 'fs';
+      break;
 
+    case 'PIPE':
+    case 'TCP':
+      var net = __webpack_require__("net");
+      stream = new net.Socket({
+        fd: fd,
+        readable: false,
+        writable: true
+      });
 
-/***/ }),
-/* 369 */
-/***/ (function(module, exports, __webpack_require__) {
+      // FIXME Should probably have an option in net.Socket to create a
+      // stream from an existing fd which is writable only. But for now
+      // we'll just add this hack and set the `readable` member to false.
+      // Test: ./node test/fixtures/echo.js < /etc/passwd
+      stream.readable = false;
+      stream.read = null;
+      stream._type = 'pipe';
 
-var concatMap = __webpack_require__(370);
-var balanced = __webpack_require__(371);
+      // FIXME Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
 
-module.exports = expandTop;
+    default:
+      // Probably an error on in uv_guess_handle()
+      throw new Error('Implement me. Unknown stream file type!');
+  }
 
-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';
+  // For supporting legacy API we put the FD here.
+  stream.fd = fd;
 
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
+  stream._isStdio = true;
 
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
+  return stream;
 }
 
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
+/**
+ * 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.
+ */
 
-// 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 [''];
+exports.enable(load());
 
-  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(',');
+/***/ "../../node_modules/dedent/dist/dedent.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  p[p.length-1] += '{' + body + '}';
-  var postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length-1] += postParts.shift();
-    p.push.apply(p, postParts);
+"use strict";
+
+
+function dedent(strings) {
+
+  var raw = void 0;
+  if (typeof strings === "string") {
+    // dedent can be used as a plain function
+    raw = [strings];
+  } else {
+    raw = strings.raw;
   }
 
-  parts.push.apply(parts, p);
+  // first, perform interpolation
+  var result = "";
+  for (var i = 0; i < raw.length; i++) {
+    result += raw[i].
+    // join lines when there is a suppressed newline
+    replace(/\\\n[ \t]*/g, "").
 
-  return parts;
-}
+    // handle escaped backticks
+    replace(/\\`/g, "`");
 
-function expandTop(str) {
-  if (!str)
-    return [];
+    if (i < (arguments.length <= 1 ? 0 : arguments.length - 1)) {
+      result += arguments.length <= i + 1 ? undefined : arguments[i + 1];
+    }
+  }
 
-  // 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);
+  // now strip indentation
+  var lines = result.split("\n");
+  var mindent = null;
+  lines.forEach(function (l) {
+    var m = l.match(/^(\s+)\S+/);
+    if (m) {
+      var indent = m[1].length;
+      if (!mindent) {
+        // this is the first indented line
+        mindent = indent;
+      } else {
+        mindent = Math.min(mindent, indent);
+      }
+    }
+  });
+
+  if (mindent !== null) {
+    result = lines.map(function (l) {
+      return l[0] === " " ? l.slice(mindent) : l;
+    }).join("\n");
   }
 
-  return expand(escapeBraces(str), true).map(unescapeBraces);
-}
+  // dedent eats leading and trailing whitespace too
+  result = result.trim();
 
-function identity(e) {
-  return e;
+  // handle escaped newlines at the end to ensure they don't get stripped too
+  return result.replace(/\\n/g, "\n");
 }
 
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
+if (true) {
+  module.exports = dedent;
 }
 
-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];
+/***/ "../../node_modules/defaults/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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 clone = __webpack_require__("../../node_modules/clone/clone.js");
 
-  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;
-        });
-      }
+module.exports = function(options, defaults) {
+  options = options || {};
+
+  Object.keys(defaults).forEach(function(key) {
+    if (typeof options[key] === 'undefined') {
+      options[key] = clone(defaults[key]);
     }
-  }
+  });
 
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
+  return options;
+};
 
-  // 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;
+/***/ "../../node_modules/del/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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);
+"use strict";
 
-    N = [];
+const {promisify} = __webpack_require__("util");
+const path = __webpack_require__("path");
+const globby = __webpack_require__("../../node_modules/del/node_modules/globby/index.js");
+const isGlob = __webpack_require__("../../node_modules/is-glob/index.js");
+const slash = __webpack_require__("../../node_modules/slash/index.js");
+const gracefulFs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const isPathCwd = __webpack_require__("../../node_modules/is-path-cwd/index.js");
+const isPathInside = __webpack_require__("../../node_modules/is-path-inside/index.js");
+const rimraf = __webpack_require__("../../node_modules/rimraf/rimraf.js");
+const pMap = __webpack_require__("../../node_modules/del/node_modules/p-map/index.js");
 
-    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);
-    }
-  }
+const rimrafP = promisify(rimraf);
 
-  return expansions;
-}
+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.');
+	}
+}
 
-/***/ }),
-/* 370 */
-/***/ (function(module, exports) {
+function normalizePatterns(patterns) {
+	patterns = Array.isArray(patterns) ? patterns : [patterns];
 
-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;
-};
+	patterns = patterns.map(pattern => {
+		if (process.platform === 'win32' && isGlob(pattern) === false) {
+			return slash(pattern);
+		}
 
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
+		return pattern;
+	});
 
+	return patterns;
+}
 
-/***/ }),
-/* 371 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-"use strict";
+	patterns = normalizePatterns(patterns);
 
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
+	const files = (await globby(patterns, options))
+		.sort((a, b) => b.localeCompare(a));
 
-  var r = range(a, b, str);
+	const mapper = async file => {
+		file = path.resolve(cwd, file);
 
-  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)
-  };
-}
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-function maybeMatch(reg, str) {
-  var m = str.match(reg);
-  return m ? m[0] : null;
-}
+		if (!dryRun) {
+			await rimrafP(file, rimrafOptions);
+		}
 
-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;
+		return file;
+	};
 
-  if (ai >= 0 && bi > 0) {
-    begs = [];
-    left = str.length;
+	const removedFiles = await pMap(files, mapper, options);
 
-    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;
-        }
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-        bi = str.indexOf(b, i + 1);
-      }
+	return removedFiles;
+};
 
-      i = ai < bi && ai >= 0 ? ai : bi;
-    }
+module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-    if (begs.length) {
-      result = [ left, right ];
-    }
-  }
+	patterns = normalizePatterns(patterns);
 
-  return result;
-}
+	const files = globby.sync(patterns, options)
+		.sort((a, b) => b.localeCompare(a));
 
+	const removedFiles = files.map(file => {
+		file = path.resolve(cwd, file);
 
-/***/ }),
-/* 372 */
-/***/ (function(module, exports, __webpack_require__) {
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-try {
-  var util = __webpack_require__(234);
-  /* istanbul ignore next */
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  /* istanbul ignore next */
-  module.exports = __webpack_require__(373);
-}
+		if (!dryRun) {
+			rimraf.sync(file, rimrafOptions);
+		}
 
+		return file;
+	});
 
-/***/ }),
-/* 373 */
-/***/ (function(module, exports) {
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    if (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) {
-    if (superCtor) {
-      ctor.super_ = superCtor
-      var TempCtor = function () {}
-      TempCtor.prototype = superCtor.prototype
-      ctor.prototype = new TempCtor()
-      ctor.prototype.constructor = ctor
-    }
-  }
-}
+	return removedFiles;
+};
 
 
 /***/ }),
-/* 374 */
+
+/***/ "../../node_modules/del/node_modules/aggregate-error/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const indentString = __webpack_require__("../../node_modules/del/node_modules/indent-string/index.js");
+const cleanStack = __webpack_require__("../../node_modules/clean-stack/index.js");
 
-function posix(path) {
-	return path.charAt(0) === '/';
-}
-
-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) !== ':');
+const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
-	// UNC paths are always absolute
-	return Boolean(result[2] || isUnc);
-}
+class AggregateError extends Error {
+	constructor(errors) {
+		if (!Array.isArray(errors)) {
+			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
+		}
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
+		errors = [...errors].map(error => {
+			if (error instanceof Error) {
+				return error;
+			}
 
+			if (error !== null && typeof error === 'object') {
+				// Handle plain error objects with message property and/or possibly other metadata
+				return Object.assign(new Error(error.message), error);
+			}
 
-/***/ }),
-/* 375 */
-/***/ (function(module, exports, __webpack_require__) {
+			return new Error(error);
+		});
 
-module.exports = globSync
-globSync.GlobSync = GlobSync
+		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);
 
-var rp = __webpack_require__(366)
-var minimatch = __webpack_require__(368)
-var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(365).Glob
-var util = __webpack_require__(234)
-var path = __webpack_require__(4)
-var assert = __webpack_require__(283)
-var isAbsolute = __webpack_require__(374)
-var common = __webpack_require__(376)
-var setopts = common.setopts
-var ownProp = common.ownProp
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+		this.name = 'AggregateError';
 
-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')
+		Object.defineProperty(this, '_errors', {value: errors});
+	}
 
-  return new GlobSync(pattern, options).found
+	* [Symbol.iterator]() {
+		for (const error of this._errors) {
+			yield error;
+		}
+	}
 }
 
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
+module.exports = AggregateError;
 
-  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 (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
+/***/ }),
 
-  setopts(this, pattern, options)
+/***/ "../../node_modules/del/node_modules/fast-glob/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (this.noprocess)
-    return this
+"use strict";
 
-  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()
+const taskManager = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/managers/tasks.js");
+const async_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/async.js");
+const stream_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/stream.js");
+const sync_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/settings.js");
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+async function FastGlob(source, options) {
+    assertPatternsInput(source);
+    const works = getWorks(source, async_1.default, options);
+    const result = await Promise.all(works);
+    return utils.array.flatten(result);
 }
-
-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)
+// https://github.com/typescript-eslint/typescript-eslint/issues/60
+// eslint-disable-next-line no-redeclare
+(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;
+    function isDynamicPattern(source, options) {
+        assertPatternsInput(source);
+        const settings = new settings_1.default(options);
+        return utils.pattern.isDynamicPattern(source, settings);
+    }
+    FastGlob.isDynamicPattern = isDynamicPattern;
+    function escapePath(source) {
+        assertPatternsInput(source);
+        return utils.path.escape(source);
+    }
+    FastGlob.escapePath = escapePath;
+})(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(input) {
+    const source = [].concat(input);
+    const isValidSource = source.every((item) => utils.string.isString(item) && !utils.string.isEmpty(item));
+    if (!isValidSource) {
+        throw new TypeError('Patterns must be a string (non empty) or an array of strings');
+    }
+}
+module.exports = FastGlob;
 
 
-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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/managers/tasks.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+"use strict";
 
-    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
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+function generate(patterns, settings) {
+    const positivePatterns = getPositivePatterns(patterns);
+    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
+    const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
+    const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
+    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
+    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
+    return staticTasks.concat(dynamicTasks);
+}
+exports.generate = generate;
+/**
+ * Returns tasks grouped by basic pattern directories.
+ *
+ * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
+ * This is necessary because directory traversal starts at the base directory and goes deeper.
+ */
+function convertPatternsToTasks(positive, negative, dynamic) {
+    const tasks = [];
+    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
+    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
+    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
+    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
+    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
+    /*
+     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
+     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
+     */
+    if ('.' in insideCurrentDirectoryGroup) {
+        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
+    }
+    else {
+        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
+    }
+    return tasks;
+}
+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) {
+    const group = {};
+    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;
+    }, group);
+}
+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;
 
-  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)
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  //if ignored, skip processing
-  if (childrenIgnored(this, read))
-    return
+"use strict";
 
-  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)
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/provider.js");
+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;
 
 
-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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/filters/deep.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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) === '.'
+"use strict";
 
-  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)
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+const partial_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/matchers/partial.js");
+class DeepFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
     }
-  }
+    getFilter(basePath, positive, negative) {
+        const matcher = this._getMatcher(positive);
+        const negativeRe = this._getNegativePatternsRe(negative);
+        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
+    }
+    _getMatcher(patterns) {
+        return new partial_1.default(patterns, this._settings, this._micromatchOptions);
+    }
+    _getNegativePatternsRe(patterns) {
+        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
+        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
+    }
+    _filter(basePath, entry, matcher, negativeRe) {
+        if (this._isSkippedByDeep(basePath, entry.path)) {
+            return false;
+        }
+        if (this._isSkippedSymbolicLink(entry)) {
+            return false;
+        }
+        const filepath = utils.path.removeLeadingDotSegment(entry.path);
+        if (this._isSkippedByPositivePatterns(filepath, matcher)) {
+            return false;
+        }
+        return this._isSkippedByNegativePatterns(filepath, negativeRe);
+    }
+    _isSkippedByDeep(basePath, entryPath) {
+        /**
+         * Avoid unnecessary depth calculations when it doesn't matter.
+         */
+        if (this._settings.deep === Infinity) {
+            return false;
+        }
+        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
+    }
+    _getEntryLevel(basePath, entryPath) {
+        const entryPathDepth = entryPath.split('/').length;
+        if (basePath === '') {
+            return entryPathDepth;
+        }
+        const basePathDepth = basePath.split('/').length;
+        return entryPathDepth - basePathDepth;
+    }
+    _isSkippedSymbolicLink(entry) {
+        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
+    }
+    _isSkippedByPositivePatterns(entryPath, matcher) {
+        return !this._settings.baseNameMatch && !matcher.match(entryPath);
+    }
+    _isSkippedByNegativePatterns(entryPath, patternsRe) {
+        return !utils.pattern.matchAny(entryPath, patternsRe);
+    }
+}
+exports.default = DeepFilter;
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return
 
-  // 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)
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/filters/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix.slice(-1) !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+"use strict";
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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 && this._isDuplicateEntry(entry)) {
+            return false;
+        }
+        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
+            return false;
+        }
+        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
+        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
+        if (this._settings.unique && isMatched) {
+            this._createIndexRecord(entry);
+        }
+        return isMatched;
+    }
+    _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(entryPath, patternsRe) {
+        if (!this._settings.absolute) {
+            return false;
+        }
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
+        return utils.pattern.matchAny(fullpath, patternsRe);
+    }
+    _isMatchToPatterns(entryPath, patternsRe) {
+        const filepath = utils.path.removeLeadingDotSegment(entryPath);
+        return utils.pattern.matchAny(filepath, patternsRe);
     }
-    // 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)
-  }
 }
+exports.default = EntryFilter;
 
 
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
+/***/ }),
 
-  var abs = this._makeAbs(e)
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/filters/error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (this.mark)
-    e = this._mark(e)
+"use strict";
 
-  if (this.absolute) {
-    e = abs
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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 (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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/matchers/matcher.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (this.stat)
-    this._stat(e)
-}
+"use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+class Matcher {
+    constructor(_patterns, _settings, _micromatchOptions) {
+        this._patterns = _patterns;
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
+        this._storage = [];
+        this._fillStorage();
+    }
+    _fillStorage() {
+        /**
+         * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
+         * So, before expand patterns with brace expansion into separated patterns.
+         */
+        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
+        for (const pattern of patterns) {
+            const segments = this._getPatternSegments(pattern);
+            const sections = this._splitSegmentsIntoSections(segments);
+            this._storage.push({
+                complete: sections.length <= 1,
+                pattern,
+                segments,
+                sections
+            });
+        }
+    }
+    _getPatternSegments(pattern) {
+        const parts = utils.pattern.getPatternParts(pattern, this._micromatchOptions);
+        return parts.map((part) => {
+            const dynamic = utils.pattern.isDynamicPattern(part, this._settings);
+            if (!dynamic) {
+                return {
+                    dynamic: false,
+                    pattern: part
+                };
+            }
+            return {
+                dynamic: true,
+                pattern: part,
+                patternRe: utils.pattern.makeRe(part, this._micromatchOptions)
+            };
+        });
+    }
+    _splitSegmentsIntoSections(segments) {
+        return utils.array.splitWhen(segments, (segment) => segment.dynamic && utils.pattern.hasGlobStar(segment.pattern));
+    }
+}
+exports.default = Matcher;
 
-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)
 
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = this.fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
-    }
-  }
+/***/ }),
 
-  var isSym = lstat && lstat.isSymbolicLink()
-  this.symlinks[abs] = isSym
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/matchers/partial.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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)
+"use strict";
 
-  return entries
+Object.defineProperty(exports, "__esModule", { value: true });
+const matcher_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/matchers/matcher.js");
+class PartialMatcher extends matcher_1.default {
+    match(filepath) {
+        const parts = filepath.split('/');
+        const levels = parts.length;
+        const patterns = this._storage.filter((info) => !info.complete || info.segments.length > levels);
+        for (const pattern of patterns) {
+            const section = pattern.sections[0];
+            /**
+             * In this case, the pattern has a globstar and we must read all directories unconditionally,
+             * but only if the level has reached the end of the first group.
+             *
+             * fixtures/{a,b}/**
+             *  ^ true/false  ^ always true
+            */
+            if (!pattern.complete && levels > section.length) {
+                return true;
+            }
+            const match = parts.every((part, index) => {
+                const segment = pattern.segments[index];
+                if (segment.dynamic && segment.patternRe.test(part)) {
+                    return true;
+                }
+                if (!segment.dynamic && segment.pattern === part) {
+                    return true;
+                }
+                return false;
+            });
+            if (match) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
+exports.default = PartialMatcher;
 
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
-
-  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
-  }
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/provider.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  try {
-    return this._readdirEntries(abs, this.fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
-  }
-}
+"use strict";
 
-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
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const deep_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/filters/deep.js");
+const entry_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/filters/entry.js");
+const error_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/filters/error.js");
+const entry_2 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/transformers/entry.js");
+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;
 
-  this.cache[abs] = entries
 
-  // mark and cache dir-ness
-  return entries
-}
+/***/ }),
 
-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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+"use strict";
 
-    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
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const stream_2 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/provider.js");
+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 destination = new stream_1.Readable({ objectMode: true, read: () => { } });
+        source
+            .once('error', (error) => destination.emit('error', error))
+            .on('data', (entry) => destination.emit('data', options.transform(entry)))
+            .once('end', () => destination.emit('end'));
+        destination
+            .once('close', () => source.destroy());
+        return destination;
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
 }
+exports.default = ProviderStream;
 
-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)
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
+"use strict";
 
-  var len = entries.length
-  var isSym = this.symlinks[abs]
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/sync.js");
+const provider_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/provider.js");
+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 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)
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/transformers/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true)
-  }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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(Object.assign({}, entry), { path: filepath });
+    }
 }
+exports.default = EntryTransformer;
 
-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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/readers/reader.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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 += '/'
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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;
 
-  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) === '/'
+/***/ "../../node_modules/del/node_modules/fast-glob/out/readers/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (f.length > this.maxLength)
-    return false
+"use strict";
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/reader.js");
+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) => {
+                return error === null ? resolve(stats) : reject(error);
+            });
+        });
+    }
+}
+exports.default = ReaderStream;
 
-    if (Array.isArray(c))
-      c = 'DIR'
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
+/***/ }),
 
-    if (needDir && c === 'FILE')
-      return false
+/***/ "../../node_modules/del/node_modules/fast-glob/out/readers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+"use strict";
 
-  var exists
-  var stat = this.statCache[abs]
-  if (!stat) {
-    var lstat
-    try {
-      lstat = this.fs.lstatSync(abs)
-    } catch (er) {
-      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-        this.statCache[abs] = false
-        return false
-      }
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/reader.js");
+class ReaderSync extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._walkSync = fsWalk.walkSync;
+        this._statSync = fsStat.statSync;
     }
-
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = this.fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
-      }
-    } else {
-      stat = lstat
+    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;
 
-  this.statCache[abs] = stat
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
+/***/ }),
 
-  this.cache[abs] = this.cache[abs] || c
+/***/ "../../node_modules/del/node_modules/fast-glob/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (needDir && c === 'FILE')
-    return false
+"use strict";
 
-  return c
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
+const fs = __webpack_require__("fs");
+const os = __webpack_require__("os");
+/**
+ * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
+ * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
+ */
+const CPU_COUNT = Math.max(os.cpus().length, 1);
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    lstatSync: fs.lstatSync,
+    stat: fs.stat,
+    statSync: fs.statSync,
+    readdir: fs.readdir,
+    readdirSync: fs.readdirSync
+};
+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(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
+    }
 }
+exports.default = Settings;
 
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
 
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
+/***/ }),
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/array.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitWhen = exports.flatten = void 0;
+function flatten(items) {
+    return items.reduce((collection, item) => [].concat(collection, item), []);
+}
+exports.flatten = flatten;
+function splitWhen(items, predicate) {
+    const result = [[]];
+    let groupIndex = 0;
+    for (const item of items) {
+        if (predicate(item)) {
+            groupIndex++;
+            result[groupIndex] = [];
+        }
+        else {
+            result[groupIndex].push(item);
+        }
+    }
+    return result;
 }
+exports.splitWhen = splitWhen;
 
 
 /***/ }),
-/* 376 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/errno.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-exports.setopts = setopts
-exports.ownProp = ownProp
-exports.makeAbs = makeAbs
-exports.finish = finish
-exports.mark = mark
-exports.isIgnored = isIgnored
-exports.childrenIgnored = childrenIgnored
+"use strict";
 
-function ownProp (obj, field) {
-  return Object.prototype.hasOwnProperty.call(obj, field)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEnoentCodeError = void 0;
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
 }
+exports.isEnoentCodeError = isEnoentCodeError;
 
-var fs = __webpack_require__(253)
-var path = __webpack_require__(4)
-var minimatch = __webpack_require__(368)
-var isAbsolute = __webpack_require__(374)
-var Minimatch = minimatch.Minimatch
 
-function alphasort (a, b) {
-  return a.localeCompare(b, 'en')
-}
+/***/ }),
 
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
+"use strict";
 
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDirentFromStats = void 0;
+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);
+    }
 }
-
-// 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
-  }
+function createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
 }
+exports.createDirentFromStats = createDirentFromStats;
 
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
 
-  // 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
-  self.fs = options.fs || fs
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/index.js":
+/***/ (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";
 
-  setupIgnores(self, options)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
+const array = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/array.js");
+exports.array = array;
+const errno = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/errno.js");
+exports.errno = errno;
+const fs = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/fs.js");
+exports.fs = fs;
+const path = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/path.js");
+exports.path = path;
+const pattern = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/pattern.js");
+exports.pattern = pattern;
+const stream = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/stream.js");
+exports.stream = stream;
+const string = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/string.js");
+exports.string = string;
 
-  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
-  }
 
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
+/***/ }),
 
-  // 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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/path.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
+"use strict";
 
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
+const path = __webpack_require__("path");
+const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
+const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
+/**
+ * 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;
+function escape(pattern) {
+    return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, '\\$2');
+}
+exports.escape = escape;
+function removeLeadingDotSegment(entry) {
+    // We do not use `startsWith` because this is 10x slower than current implementation for some cases.
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
+    if (entry.charAt(0) === '.') {
+        const secondCharactery = entry.charAt(1);
+        if (secondCharactery === '/' || secondCharactery === '\\') {
+            return entry.slice(LEADING_DOT_SEGMENT_CHARACTERS_COUNT);
+        }
+    }
+    return entry;
 }
-
-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
-        })
-    }
-  }
-
-  if (!nou)
-    all = Object.keys(all)
-
-  if (!self.nosort)
-    all = all.sort(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
-      })
-    }
-  }
-
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
-
-  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) === '/'
-
-    if (isDir && !slash)
-      m += '/'
-    else if (!isDir && slash)
-      m = m.slice(0, -1)
-
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
-    }
-  }
-
-  return m
-}
-
-// 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)
-  }
-
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
-
-  return abs
-}
-
-
-// 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))
-  })
-}
-
-
-/***/ }),
-/* 377 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var wrappy = __webpack_require__(291)
-var reqs = Object.create(null)
-var once = __webpack_require__(290)
-
-module.exports = wrappy(inflight)
-
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
-
-function makeres (key) {
-  return once(function RES () {
-    var cbs = reqs[key]
-    var len = cbs.length
-    var args = slice(arguments)
-
-    // 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]
-      }
-    }
-  })
-}
-
-function slice (args) {
-  var length = args.length
-  var array = []
-
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
-
-
-/***/ }),
-/* 378 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const taskManager = __webpack_require__(379);
-const async_1 = __webpack_require__(408);
-const stream_1 = __webpack_require__(443);
-const sync_1 = __webpack_require__(444);
-const settings_1 = __webpack_require__(446);
-const utils = __webpack_require__(380);
-async function FastGlob(source, options) {
-    assertPatternsInput(source);
-    const works = getWorks(source, async_1.default, options);
-    const result = await Promise.all(works);
-    return utils.array.flatten(result);
-}
-// https://github.com/typescript-eslint/typescript-eslint/issues/60
-// eslint-disable-next-line no-redeclare
-(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;
-    function isDynamicPattern(source, options) {
-        assertPatternsInput(source);
-        const settings = new settings_1.default(options);
-        return utils.pattern.isDynamicPattern(source, settings);
-    }
-    FastGlob.isDynamicPattern = isDynamicPattern;
-    function escapePath(source) {
-        assertPatternsInput(source);
-        return utils.path.escape(source);
-    }
-    FastGlob.escapePath = escapePath;
-})(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(input) {
-    const source = [].concat(input);
-    const isValidSource = source.every((item) => utils.string.isString(item) && !utils.string.isEmpty(item));
-    if (!isValidSource) {
-        throw new TypeError('Patterns must be a string (non empty) or an array of strings');
-    }
-}
-module.exports = FastGlob;
-
-
-/***/ }),
-/* 379 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
-const utils = __webpack_require__(380);
-function generate(patterns, settings) {
-    const positivePatterns = getPositivePatterns(patterns);
-    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
-    const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
-    const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
-    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
-    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
-    return staticTasks.concat(dynamicTasks);
-}
-exports.generate = generate;
-/**
- * Returns tasks grouped by basic pattern directories.
- *
- * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
- * This is necessary because directory traversal starts at the base directory and goes deeper.
- */
-function convertPatternsToTasks(positive, negative, dynamic) {
-    const tasks = [];
-    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
-    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
-    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
-    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
-    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
-    /*
-     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
-     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
-     */
-    if ('.' in insideCurrentDirectoryGroup) {
-        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
-    }
-    else {
-        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
-    }
-    return tasks;
-}
-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) {
-    const group = {};
-    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;
-    }, group);
-}
-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;
-
-
-/***/ }),
-/* 380 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
-const array = __webpack_require__(381);
-exports.array = array;
-const errno = __webpack_require__(382);
-exports.errno = errno;
-const fs = __webpack_require__(383);
-exports.fs = fs;
-const path = __webpack_require__(384);
-exports.path = path;
-const pattern = __webpack_require__(385);
-exports.pattern = pattern;
-const stream = __webpack_require__(406);
-exports.stream = stream;
-const string = __webpack_require__(407);
-exports.string = string;
-
-
-/***/ }),
-/* 381 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitWhen = exports.flatten = void 0;
-function flatten(items) {
-    return items.reduce((collection, item) => [].concat(collection, item), []);
-}
-exports.flatten = flatten;
-function splitWhen(items, predicate) {
-    const result = [[]];
-    let groupIndex = 0;
-    for (const item of items) {
-        if (predicate(item)) {
-            groupIndex++;
-            result[groupIndex] = [];
-        }
-        else {
-            result[groupIndex].push(item);
-        }
-    }
-    return result;
-}
-exports.splitWhen = splitWhen;
-
-
-/***/ }),
-/* 382 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnoentCodeError = void 0;
-function isEnoentCodeError(error) {
-    return error.code === 'ENOENT';
-}
-exports.isEnoentCodeError = isEnoentCodeError;
-
-
-/***/ }),
-/* 383 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDirentFromStats = void 0;
-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;
+exports.removeLeadingDotSegment = removeLeadingDotSegment;
 
 
 /***/ }),
-/* 384 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
-const path = __webpack_require__(4);
-const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
-const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
-/**
- * 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;
-function escape(pattern) {
-    return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, '\\$2');
-}
-exports.escape = escape;
-function removeLeadingDotSegment(entry) {
-    // We do not use `startsWith` because this is 10x slower than current implementation for some cases.
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (entry.charAt(0) === '.') {
-        const secondCharactery = entry.charAt(1);
-        if (secondCharactery === '/' || secondCharactery === '\\') {
-            return entry.slice(LEADING_DOT_SEGMENT_CHARACTERS_COUNT);
-        }
-    }
-    return entry;
-}
-exports.removeLeadingDotSegment = removeLeadingDotSegment;
 
-
-/***/ }),
-/* 385 */
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/pattern.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
-const path = __webpack_require__(4);
-const globParent = __webpack_require__(386);
-const micromatch = __webpack_require__(389);
+const path = __webpack_require__("path");
+const globParent = __webpack_require__("../../node_modules/glob-parent/index.js");
+const micromatch = __webpack_require__("../../node_modules/del/node_modules/micromatch/index.js");
 const GLOBSTAR = '**';
 const ESCAPE_SYMBOL = '\\';
 const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/;
@@ -25284,247 +23684,469 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 386 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/stream.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = void 0;
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+function merge(streams) {
+    const mergedStream = merge2(streams);
+    streams.forEach((stream) => {
+        stream.once('error', (error) => mergedStream.emit('error', error));
+    });
+    mergedStream.once('close', () => propagateCloseEventToSources(streams));
+    mergedStream.once('end', () => propagateCloseEventToSources(streams));
+    return mergedStream;
+}
+exports.merge = merge;
+function propagateCloseEventToSources(streams) {
+    streams.forEach((stream) => stream.emit('close'));
+}
 
-var isGlob = __webpack_require__(387);
-var pathPosixDirname = __webpack_require__(4).posix.dirname;
-var isWin32 = __webpack_require__(243).platform() === 'win32';
-
-var slash = '/';
-var backslash = /\\/g;
-var enclosure = /[\{\[].*[\}\]]$/;
-var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
-var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
-
-/**
- * @param {string} str
- * @param {Object} opts
- * @param {boolean} [opts.flipBackslashes=true]
- * @returns {string}
- */
-module.exports = function globParent(str, opts) {
-  var options = Object.assign({ flipBackslashes: true }, opts);
-
-  // flip windows path separators
-  if (options.flipBackslashes && 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';
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/string.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // remove path parts that are globby
-  do {
-    str = pathPosixDirname(str);
-  } while (isGlob(str) || globby.test(str));
+"use strict";
 
-  // remove escape chars and return result
-  return str.replace(escaped, '$1');
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmpty = exports.isString = void 0;
+function isString(input) {
+    return typeof input === 'string';
+}
+exports.isString = isString;
+function isEmpty(input) {
+    return input === '';
+}
+exports.isEmpty = isEmpty;
 
 
 /***/ }),
-/* 387 */
+
+/***/ "../../node_modules/del/node_modules/globby/gitignore.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+"use strict";
 
-var isExtglob = __webpack_require__(388);
-var chars = { '{': '}', '(': ')', '[': ']'};
-var strictCheck = function(str) {
-  if (str[0] === '!') {
-    return true;
-  }
-  var index = 0;
-  var pipeIndex = -2;
-  var closeSquareIndex = -2;
-  var closeCurlyIndex = -2;
-  var closeParenIndex = -2;
-  var backSlashIndex = -2;
-  while (index < str.length) {
-    if (str[index] === '*') {
-      return true;
-    }
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const fastGlob = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/index.js");
+const gitIgnore = __webpack_require__("../../node_modules/ignore/index.js");
+const slash = __webpack_require__("../../node_modules/slash/index.js");
 
-    if (str[index + 1] === '?' && /[\].+)]/.test(str[index])) {
-      return true;
-    }
+const DEFAULT_IGNORE = [
+	'**/node_modules/**',
+	'**/flow-typed/**',
+	'**/coverage/**',
+	'**/.git'
+];
 
-    if (closeSquareIndex !== -1 && str[index] === '[' && str[index + 1] !== ']') {
-      if (closeSquareIndex < index) {
-        closeSquareIndex = str.indexOf(']', index);
-      }
-      if (closeSquareIndex > index) {
-        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
-          return true;
-        }
-        backSlashIndex = str.indexOf('\\', index);
-        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
-          return true;
-        }
-      }
-    }
+const readFileP = promisify(fs.readFile);
 
-    if (closeCurlyIndex !== -1 && str[index] === '{' && str[index + 1] !== '}') {
-      closeCurlyIndex = str.indexOf('}', index);
-      if (closeCurlyIndex > index) {
-        backSlashIndex = str.indexOf('\\', index);
-        if (backSlashIndex === -1 || backSlashIndex > closeCurlyIndex) {
-          return true;
-        }
-      }
-    }
+const mapGitIgnorePatternTo = base => ignore => {
+	if (ignore.startsWith('!')) {
+		return '!' + path.posix.join(base, ignore.slice(1));
+	}
 
-    if (closeParenIndex !== -1 && str[index] === '(' && str[index + 1] === '?' && /[:!=]/.test(str[index + 2]) && str[index + 3] !== ')') {
-      closeParenIndex = str.indexOf(')', index);
-      if (closeParenIndex > index) {
-        backSlashIndex = str.indexOf('\\', index);
-        if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
-          return true;
-        }
-      }
-    }
+	return path.posix.join(base, ignore);
+};
 
-    if (pipeIndex !== -1 && str[index] === '(' && str[index + 1] !== '|') {
-      if (pipeIndex < index) {
-        pipeIndex = str.indexOf('|', index);
-      }
-      if (pipeIndex !== -1 && str[pipeIndex + 1] !== ')') {
-        closeParenIndex = str.indexOf(')', pipeIndex);
-        if (closeParenIndex > pipeIndex) {
-          backSlashIndex = str.indexOf('\\', pipeIndex);
-          if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
-            return true;
-          }
-        }
-      }
-    }
+const parseGitIgnore = (content, options) => {
+	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
 
-    if (str[index] === '\\') {
-      var open = str[index + 1];
-      index += 2;
-      var close = chars[open];
+	return content
+		.split(/\r?\n/)
+		.filter(Boolean)
+		.filter(line => !line.startsWith('#'))
+		.map(mapGitIgnorePatternTo(base));
+};
 
-      if (close) {
-        var n = str.indexOf(close, index);
-        if (n !== -1) {
-          index = n + 1;
-        }
-      }
+const reduceIgnore = files => {
+	return files.reduce((ignores, file) => {
+		ignores.add(parseGitIgnore(file.content, {
+			cwd: file.cwd,
+			fileName: file.filePath
+		}));
+		return ignores;
+	}, gitIgnore());
+};
 
-      if (str[index] === '!') {
-        return true;
-      }
-    } else {
-      index++;
-    }
-  }
-  return false;
+const ensureAbsolutePathForCwd = (cwd, p) => {
+	if (path.isAbsolute(p)) {
+		if (p.startsWith(cwd)) {
+			return p;
+		}
+
+		throw new Error(`Path ${p} is not in cwd ${cwd}`);
+	}
+
+	return path.join(cwd, p);
 };
 
-var relaxedCheck = function(str) {
-  if (str[0] === '!') {
-    return true;
-  }
-  var index = 0;
-  while (index < str.length) {
-    if (/[*?{}()[\]]/.test(str[index])) {
-      return true;
-    }
+const getIsIgnoredPredecate = (ignores, cwd) => {
+	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
+};
 
-    if (str[index] === '\\') {
-      var open = str[index + 1];
-      index += 2;
-      var close = chars[open];
+const getFile = async (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = await readFileP(filePath, 'utf8');
 
-      if (close) {
-        var n = str.indexOf(close, index);
-        if (n !== -1) {
-          index = n + 1;
-        }
-      }
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
 
-      if (str[index] === '!') {
-        return true;
-      }
-    } else {
-      index++;
-    }
-  }
-  return false;
+const getFileSync = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = fs.readFileSync(filePath, 'utf8');
+
+	return {
+		cwd,
+		filePath,
+		content
+	};
 };
 
-module.exports = function isGlob(str, options) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+const normalizeOptions = ({
+	ignore = [],
+	cwd = slash(process.cwd())
+} = {}) => {
+	return {ignore, cwd};
+};
 
-  if (isExtglob(str)) {
-    return true;
-  }
+module.exports = async options => {
+	options = normalizeOptions(options);
 
-  var check = strictCheck;
+	const paths = await fastGlob('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
 
-  // optionally relax check
-  if (options && options.strict === false) {
-    check = relaxedCheck;
-  }
+	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
+	const ignores = reduceIgnore(files);
 
-  return check(str);
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
+
+module.exports.sync = options => {
+	options = normalizeOptions(options);
+
+	const paths = fastGlob.sync('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
+
+	const files = paths.map(file => getFileSync(file, options.cwd));
+	const ignores = reduceIgnore(files);
+
+	return getIsIgnoredPredecate(ignores, options.cwd);
 };
 
 
 /***/ }),
-/* 388 */
-/***/ (function(module, exports) {
 
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/***/ "../../node_modules/del/node_modules/globby/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = function isExtglob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+"use strict";
 
-  var match;
-  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
+const fs = __webpack_require__("fs");
+const arrayUnion = __webpack_require__("../../node_modules/array-union/index.js");
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+const glob = __webpack_require__("../../node_modules/glob/glob.js");
+const fastGlob = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/index.js");
+const dirGlob = __webpack_require__("../../node_modules/dir-glob/index.js");
+const gitignore = __webpack_require__("../../node_modules/del/node_modules/globby/gitignore.js");
+const {FilterStream, UniqueStream} = __webpack_require__("../../node_modules/del/node_modules/globby/stream-utils.js");
 
-  return false;
+const DEFAULT_FILTER = () => false;
+
+const isNegative = pattern => pattern[0] === '!';
+
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
+
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
+
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch (_) {
+		return;
+	}
+
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
+
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
+
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
+
+	const globTasks = [];
+
+	taskOptions = {
+		ignore: [],
+		expandDirectories: true,
+		...taskOptions
+	};
+
+	for (const [index, pattern] of patterns.entries()) {
+		if (isNegative(pattern)) {
+			continue;
+		}
+
+		const ignore = patterns
+			.slice(index)
+			.filter(isNegative)
+			.map(pattern => pattern.slice(1));
+
+		const options = {
+			...taskOptions,
+			ignore: taskOptions.ignore.concat(ignore)
+		};
+
+		globTasks.push({pattern, options});
+	}
+
+	return globTasks;
+};
+
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
+	}
+
+	if (Array.isArray(task.options.expandDirectories)) {
+		options = {
+			...options,
+			files: task.options.expandDirectories
+		};
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = {
+			...options,
+			...task.options.expandDirectories
+		};
+	}
+
+	return fn(task.pattern, options);
+};
+
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+
+const getFilterSync = options => {
+	return options && options.gitignore ?
+		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+		DEFAULT_FILTER;
+};
+
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
+	}
+
+	return {
+		pattern: glob,
+		options
+	};
+};
+
+module.exports = async (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const getFilter = async () => {
+		return options && options.gitignore ?
+			gitignore({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
+	};
+
+	const getTasks = async () => {
+		const tasks = await Promise.all(globTasks.map(async task => {
+			const globs = await getPattern(task, dirGlob);
+			return Promise.all(globs.map(globToTask(task)));
+		}));
+
+		return arrayUnion(...tasks);
+	};
+
+	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
+	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+
+	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
+};
+
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
+
+	const filter = getFilterSync(options);
+
+	return tasks.reduce(
+		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
+		[]
+	).filter(path_ => !filter(path_));
+};
+
+module.exports.stream = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
+
+	const filter = getFilterSync(options);
+	const filterStream = new FilterStream(p => !filter(p));
+	const uniqueStream = new UniqueStream();
+
+	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
+		.pipe(filterStream)
+		.pipe(uniqueStream);
+};
+
+module.exports.generateGlobTasks = generateGlobTasks;
+
+module.exports.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => glob.hasMagic(pattern, options));
+
+module.exports.gitignore = gitignore;
+
+
+/***/ }),
+
+/***/ "../../node_modules/del/node_modules/globby/stream-utils.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {Transform} = __webpack_require__("stream");
+
+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);
+		}
+
+		callback();
+	}
+}
+
+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
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/del/node_modules/indent-string/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = (string, count = 1, options) => {
+	options = {
+		indent: ' ',
+		includeEmptyLines: false,
+		...options
+	};
+
+	if (typeof string !== 'string') {
+		throw new TypeError(
+			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
+		);
+	}
+
+	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 string;
+	}
+
+	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+
+	return string.replace(regex, options.indent.repeat(count));
 };
 
 
 /***/ }),
-/* 389 */
+
+/***/ "../../node_modules/del/node_modules/micromatch/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const util = __webpack_require__(234);
-const braces = __webpack_require__(390);
-const picomatch = __webpack_require__(400);
-const utils = __webpack_require__(403);
+const util = __webpack_require__("util");
+const braces = __webpack_require__("../../node_modules/braces/index.js");
+const picomatch = __webpack_require__("../../node_modules/picomatch/index.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
 const isEmptyString = val => val === '' || val === './';
 
 /**
@@ -25989,5557 +24611,4905 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 390 */
+
+/***/ "../../node_modules/del/node_modules/p-map/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const AggregateError = __webpack_require__("../../node_modules/del/node_modules/aggregate-error/index.js");
 
-const stringify = __webpack_require__(391);
-const compile = __webpack_require__(393);
-const expand = __webpack_require__(397);
-const parse = __webpack_require__(398);
+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');
+		}
 
-/**
- * Expand the given pattern or create a regex-compatible string.
- *
- * ```js
- * const braces = require('braces');
- * console.log(braces('{a,b,c}', { compile: true })); //=> ['(a|b|c)']
- * console.log(braces('{a,b,c}')); //=> ['a', 'b', 'c']
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-const braces = (input, options = {}) => {
-  let output = [];
-
-  if (Array.isArray(input)) {
-    for (let pattern of input) {
-      let result = braces.create(pattern, options);
-      if (Array.isArray(result)) {
-        output.push(...result);
-      } else {
-        output.push(result);
-      }
-    }
-  } else {
-    output = [].concat(braces.create(input, options));
-  }
-
-  if (options && options.expand === true && options.nodupes === true) {
-    output = [...new Set(output)];
-  }
-  return output;
-};
-
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * // braces.parse(pattern, [, options]);
- * const ast = braces.parse('a/{b,c}/d');
- * console.log(ast);
- * ```
- * @param {String} pattern Brace pattern to parse
- * @param {Object} options
- * @return {Object} Returns an AST
- * @api public
- */
-
-braces.parse = (input, options = {}) => parse(input, options);
+		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+		}
 
-/**
- * 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 ret = [];
+		const errors = [];
+		const iterator = iterable[Symbol.iterator]();
+		let isRejected = false;
+		let isIterableDone = false;
+		let resolvingCount = 0;
+		let currentIndex = 0;
 
-braces.stringify = (input, options = {}) => {
-  if (typeof input === 'string') {
-    return stringify(braces.parse(input, options), options);
-  }
-  return stringify(input, options);
-};
+		const next = () => {
+			if (isRejected) {
+				return;
+			}
 
-/**
- * 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
- */
+			const nextItem = iterator.next();
+			const i = currentIndex;
+			currentIndex++;
 
-braces.compile = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
-  }
-  return compile(input, options);
-};
+			if (nextItem.done) {
+				isIterableDone = true;
 
-/**
- * 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
- */
+				if (resolvingCount === 0) {
+					if (!stopOnError && errors.length !== 0) {
+						reject(new AggregateError(errors));
+					} else {
+						resolve(ret);
+					}
+				}
 
-braces.expand = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
-  }
+				return;
+			}
 
-  let result = expand(input, options);
+			resolvingCount++;
 
-  // filter out empty strings if specified
-  if (options.noempty === true) {
-    result = result.filter(Boolean);
-  }
+			(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();
+					}
+				}
+			})();
+		};
 
-  // filter out duplicates if specified
-  if (options.nodupes === true) {
-    result = [...new Set(result)];
-  }
+		for (let i = 0; i < concurrency; i++) {
+			next();
 
-  return result;
+			if (isIterableDone) {
+				break;
+			}
+		}
+	});
 };
 
-/**
- * Processes a brace pattern and returns either an expanded array
- * (if `options.expand` is true), a highly optimized regex-compatible string.
- * This method is called by the main [braces](#braces) function.
- *
- * ```js
- * const braces = require('braces');
- * console.log(braces.create('user-{200..300}/project-{a,b,c}-{1..10}'))
- * //=> 'user-(20[0-9]|2[1-9][0-9]|300)/project-(a|b|c)-([1-9]|10)'
- * ```
- * @param {String} `pattern` Brace pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
 
-braces.create = (input, options = {}) => {
-  if (input === '' || input.length < 3) {
-    return [input];
-  }
+/***/ }),
 
- return options.expand !== true
-    ? braces.compile(input, options)
-    : braces.expand(input, options);
-};
+/***/ "../../node_modules/detect-indent/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Expose "braces"
- */
+"use strict";
 
-module.exports = braces;
 
+// Detect either spaces or tabs but not both to properly handle tabs for indentation and spaces for alignment
+const INDENT_REGEX = /^(?:( )+|\t+)/;
 
-/***/ }),
-/* 391 */
-/***/ (function(module, exports, __webpack_require__) {
+const INDENT_TYPE_SPACE = 'space';
+const INDENT_TYPE_TAB = 'tab';
 
-"use strict";
+// Make a Map that counts how many indents/unindents have occurred for a given size and how many lines follow a given indentation.
+// The key is a concatenation of the indentation type (s = space and t = tab) and the size of the indents/unindents.
+//
+// indents = {
+//    t3: [1, 0],
+//    t4: [1, 5],
+//    s5: [1, 0],
+//   s12: [1, 0],
+// }
+function makeIndentsMap(string, ignoreSingleSpaces) {
+	const indents = new Map();
 
+	// Remember the size of previous line's indentation
+	let previousSize = 0;
+	let previousIndentType;
 
-const utils = __webpack_require__(392);
+	// Indents key (ident type + size of the indents/unindents)
+	let key;
 
-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 = '';
+	for (const line of string.split(/\n/g)) {
+		if (!line) {
+			// Ignore empty lines
+			continue;
+		}
 
-    if (node.value) {
-      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
-        return '\\' + node.value;
-      }
-      return node.value;
-    }
+		let indent;
+		let indentType;
+		let weight;
+		let entry;
+		const matches = line.match(INDENT_REGEX);
 
-    if (node.value) {
-      return node.value;
-    }
+		if (matches === null) {
+			previousSize = 0;
+			previousIndentType = '';
+		} else {
+			indent = matches[0].length;
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += stringify(child);
-      }
-    }
-    return output;
-  };
+			if (matches[1]) {
+				indentType = INDENT_TYPE_SPACE;
+			} else {
+				indentType = INDENT_TYPE_TAB;
+			}
 
-  return stringify(ast);
-};
+			// Ignore single space unless it's the only indent detected to prevent common false positives
+			if (ignoreSingleSpaces && indentType === INDENT_TYPE_SPACE && indent === 1) {
+				continue;
+			}
 
+			if (indentType !== previousIndentType) {
+				previousSize = 0;
+			}
 
+			previousIndentType = indentType;
 
-/***/ }),
-/* 392 */
-/***/ (function(module, exports, __webpack_require__) {
+			weight = 0;
 
-"use strict";
+			const indentDifference = indent - previousSize;
+			previousSize = indent;
 
+			// Previous line have same indent?
+			if (indentDifference === 0) {
+				weight++;
+				// We use the key from previous loop
+			} else {
+				const absoluteIndentDifference = indentDifference > 0 ? indentDifference : -indentDifference;
+				key = encodeIndentsKey(indentType, absoluteIndentDifference);
+			}
 
-exports.isInteger = num => {
-  if (typeof num === 'number') {
-    return Number.isInteger(num);
-  }
-  if (typeof num === 'string' && num.trim() !== '') {
-    return Number.isInteger(Number(num));
-  }
-  return false;
-};
+			// Update the stats
+			entry = indents.get(key);
 
-/**
- * Find a node of the given type
- */
+			if (entry === undefined) {
+				entry = [1, 0]; // Init
+			} else {
+				entry = [++entry[0], entry[1] + weight];
+			}
 
-exports.find = (node, type) => node.nodes.find(node => node.type === type);
+			indents.set(key, entry);
+		}
+	}
 
-/**
- * Find a node of the given type
- */
+	return indents;
+}
 
-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;
-};
+// Encode the indent type and amount as a string (e.g. 's4') for use as a compound key in the indents Map.
+function encodeIndentsKey(indentType, indentAmount) {
+	const typeCharacter = indentType === INDENT_TYPE_SPACE ? 's' : 't';
+	return typeCharacter + String(indentAmount);
+}
 
-/**
- * Escape the given node with '\\' before node.value
- */
+// Extract the indent type and amount from a key of the indents Map.
+function decodeIndentsKey(indentsKey) {
+	const keyHasTypeSpace = indentsKey[0] === 's';
+	const type = keyHasTypeSpace ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
 
-exports.escapeNode = (block, n = 0, type) => {
-  let node = block.nodes[n];
-  if (!node) return;
+	const amount = Number(indentsKey.slice(1));
 
-  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
-    if (node.escaped !== true) {
-      node.value = '\\' + node.value;
-      node.escaped = true;
-    }
-  }
-};
+	return {type, amount};
+}
 
-/**
- * Returns true if the given brace node should be enclosed in literal braces
- */
+// Return the key (e.g. 's4') from the indents Map that represents the most common indent,
+// or return undefined if there are no indents.
+function getMostUsedKey(indents) {
+	let result;
+	let maxUsed = 0;
+	let maxWeight = 0;
 
-exports.encloseBrace = node => {
-  if (node.type !== 'brace') return false;
-  if ((node.commas >> 0 + node.ranges >> 0) === 0) {
-    node.invalid = true;
-    return true;
-  }
-  return false;
-};
+	for (const [key, [usedCount, weight]] of indents) {
+		if (usedCount > maxUsed || (usedCount === maxUsed && weight > maxWeight)) {
+			maxUsed = usedCount;
+			maxWeight = weight;
+			result = key;
+		}
+	}
 
-/**
- * Returns true if a brace node is invalid.
- */
+	return result;
+}
 
-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;
-};
+function makeIndentString(type, amount) {
+	const indentCharacter = type === INDENT_TYPE_SPACE ? ' ' : '\t';
+	return indentCharacter.repeat(amount);
+}
 
-/**
- * Returns true if a node is an open or close node
- */
+module.exports = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-exports.isOpenOrClose = node => {
-  if (node.type === 'open' || node.type === 'close') {
-    return true;
-  }
-  return node.open === true || node.close === true;
-};
+	// Identify indents while skipping single space indents to avoid common edge cases (e.g. code comments)
+	// If no indents are identified, run again and include all indents for comprehensive detection
+	let indents = makeIndentsMap(string, true);
+	if (indents.size === 0) {
+		indents = makeIndentsMap(string, false);
+	}
 
-/**
- * Reduce an array of text nodes.
- */
+	const keyOfMostUsedIndent = getMostUsedKey(indents);
 
-exports.reduce = nodes => nodes.reduce((acc, node) => {
-  if (node.type === 'text') acc.push(node.value);
-  if (node.type === 'range') node.type = 'text';
-  return acc;
-}, []);
+	let type;
+	let amount = 0;
+	let indent = '';
 
-/**
- * Flatten an array
- */
+	if (keyOfMostUsedIndent !== undefined) {
+		({type, amount} = decodeIndentsKey(keyOfMostUsedIndent));
+		indent = makeIndentString(type, amount);
+	}
 
-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;
+	return {
+		amount,
+		type,
+		indent
+	};
 };
 
 
 /***/ }),
-/* 393 */
+
+/***/ "../../node_modules/detect-newline/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(394);
-const utils = __webpack_require__(392);
-
-const compile = (ast, options = {}) => {
-  let walk = (node, parent = {}) => {
-    let invalidBlock = utils.isInvalidBrace(parent);
-    let invalidNode = node.invalid === true && options.escapeInvalid === true;
-    let invalid = invalidBlock === true || invalidNode === true;
-    let prefix = options.escapeInvalid === true ? '\\' : '';
-    let output = '';
-
-    if (node.isOpen === true) {
-      return prefix + node.value;
-    }
-    if (node.isClose === true) {
-      return prefix + node.value;
-    }
-
-    if (node.type === 'open') {
-      return invalid ? (prefix + node.value) : '(';
-    }
-
-    if (node.type === 'close') {
-      return invalid ? (prefix + node.value) : ')';
-    }
-
-    if (node.type === 'comma') {
-      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
-    }
-
-    if (node.value) {
-      return node.value;
-    }
+const detectNewline = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-    if (node.nodes && node.ranges > 0) {
-      let args = utils.reduce(node.nodes);
-      let range = fill(...args, { ...options, wrap: false, toRegex: true });
+	const newlines = string.match(/(?:\r?\n)/g) || [];
 
-      if (range.length !== 0) {
-        return args.length > 1 && range.length > 1 ? `(${range})` : range;
-      }
-    }
+	if (newlines.length === 0) {
+		return;
+	}
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += walk(child, node);
-      }
-    }
-    return output;
-  };
+	const crlf = newlines.filter(newline => newline === '\r\n').length;
+	const lf = newlines.length - crlf;
 
-  return walk(ast);
+	return crlf > lf ? '\r\n' : '\n';
 };
 
-module.exports = compile;
+module.exports = detectNewline;
+module.exports.graceful = string => (typeof string === 'string' && detectNewline(string)) || '\n';
 
 
 /***/ }),
-/* 394 */
+
+/***/ "../../node_modules/dir-glob/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
+const path = __webpack_require__("path");
+const pathType = __webpack_require__("../../node_modules/path-type/index.js");
 
+const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
-const util = __webpack_require__(234);
-const toRegexRange = __webpack_require__(395);
-
-const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
-
-const transform = toNumber => {
-  return value => toNumber === true ? Number(value) : String(value);
-};
-
-const isValidValue = value => {
-  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+const getPath = (filepath, cwd) => {
+	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
+	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
 };
 
-const isNumber = num => Number.isInteger(+num);
+const addExtensions = (file, extensions) => {
+	if (path.extname(file)) {
+		return `**/${file}`;
+	}
 
-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;
+	return `**/${file}.${getExtensions(extensions)}`;
 };
 
-const stringify = (start, end, options) => {
-  if (typeof start === 'string' || typeof end === 'string') {
-    return true;
-  }
-  return options.stringify === true;
-};
+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}\``);
+	}
 
-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;
-};
+	if (options.extensions && !Array.isArray(options.extensions)) {
+		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
+	}
 
-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;
-};
+	if (options.files && options.extensions) {
+		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
+	}
 
-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);
+	if (options.files) {
+		return options.files.map(x => path.posix.join(directory, `**/${x}`));
+	}
 
-  let prefix = options.capture ? '' : '?:';
-  let positives = '';
-  let negatives = '';
-  let result;
+	if (options.extensions) {
+		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
+	}
 
-  if (parts.positives.length) {
-    positives = parts.positives.join('|');
-  }
+	return [path.posix.join(directory, '**')];
+};
 
-  if (parts.negatives.length) {
-    negatives = `-(${prefix}${parts.negatives.join('|')})`;
-  }
+module.exports = async (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
 
-  if (positives && negatives) {
-    result = `${positives}|${negatives}`;
-  } else {
-    result = positives || negatives;
-  }
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
+	}
 
-  if (options.wrap) {
-    return `(${prefix}${result})`;
-  }
+	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 result;
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
 };
 
-const toRange = (a, b, isNumbers, options) => {
-  if (isNumbers) {
-    return toRegexRange(a, b, { wrap: false, ...options });
-  }
+module.exports.sync = (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
 
-  let start = String.fromCharCode(a);
-  if (a === b) return start;
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
+	}
 
-  let stop = String.fromCharCode(b);
-  return `[${start}-${stop}]`;
-};
+	const globs = [].concat(input).map(x => pathType.isDirectorySync(getPath(x, options.cwd)) ? getGlob(x, options) : x);
 
-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);
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
 };
 
-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 [];
-};
+/***/ "../../node_modules/duplexer/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const fillNumbers = (start, end, step = 1, options = {}) => {
-  let a = Number(start);
-  let b = Number(end);
+var Stream = __webpack_require__("stream")
+var writeMethods = ["write", "end", "destroy"]
+var readMethods = ["resume", "pause"]
+var readEvents = ["data", "close"]
+var slice = Array.prototype.slice
 
-  if (!Number.isInteger(a) || !Number.isInteger(b)) {
-    if (options.strictRanges === true) throw rangeError([start, end]);
-    return [];
-  }
+module.exports = duplex
 
-  // fix negative zero
-  if (a === 0) a = 0;
-  if (b === 0) b = 0;
+function forEach (arr, fn) {
+    if (arr.forEach) {
+        return arr.forEach(fn)
+    }
 
-  let descending = a > b;
-  let startString = String(start);
-  let endString = String(end);
-  let stepString = String(step);
-  step = Math.max(Math.abs(step), 1);
+    for (var i = 0; i < arr.length; i++) {
+        fn(arr[i], i)
+    }
+}
 
-  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);
+function duplex(writer, reader) {
+    var stream = new Stream()
+    var ended = false
 
-  if (options.toRegex && step === 1) {
-    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
-  }
+    forEach(writeMethods, proxyWriter)
 
-  let parts = { negatives: [], positives: [] };
-  let push = num => parts[num < 0 ? 'negatives' : 'positives'].push(Math.abs(num));
-  let range = [];
-  let index = 0;
+    forEach(readMethods, proxyReader)
 
-  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++;
-  }
+    forEach(readEvents, proxyStream)
 
-  if (options.toRegex === true) {
-    return step > 1
-      ? toSequence(parts, options)
-      : toRegex(range, null, { wrap: false, ...options });
-  }
+    reader.on("end", handleEnd)
 
-  return range;
-};
+    writer.on("drain", function() {
+      stream.emit("drain")
+    })
 
-const fillLetters = (start, end, step = 1, options = {}) => {
-  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
-    return invalidRange(start, end, options);
-  }
+    writer.on("error", reemit)
+    reader.on("error", reemit)
 
+    stream.writable = writer.writable
+    stream.readable = reader.readable
 
-  let format = options.transform || (val => String.fromCharCode(val));
-  let a = `${start}`.charCodeAt(0);
-  let b = `${end}`.charCodeAt(0);
+    return stream
 
-  let descending = a > b;
-  let min = Math.min(a, b);
-  let max = Math.max(a, b);
+    function proxyWriter(methodName) {
+        stream[methodName] = method
 
-  if (options.toRegex && step === 1) {
-    return toRange(min, max, false, options);
-  }
+        function method() {
+            return writer[methodName].apply(writer, arguments)
+        }
+    }
 
-  let range = [];
-  let index = 0;
+    function proxyReader(methodName) {
+        stream[methodName] = method
 
-  while (descending ? a >= b : a <= b) {
-    range.push(format(a, index));
-    a = descending ? a - step : a + step;
-    index++;
-  }
+        function method() {
+            stream.emit(methodName)
+            var func = reader[methodName]
+            if (func) {
+                return func.apply(reader, arguments)
+            }
+            reader.emit(methodName)
+        }
+    }
 
-  if (options.toRegex === true) {
-    return toRegex(range, null, { wrap: false, options });
-  }
+    function proxyStream(methodName) {
+        reader.on(methodName, reemit)
 
-  return range;
-};
+        function reemit() {
+            var args = slice.call(arguments)
+            args.unshift(methodName)
+            stream.emit.apply(stream, args)
+        }
+    }
 
-const fill = (start, end, step, options = {}) => {
-  if (end == null && isValidValue(start)) {
-    return [start];
-  }
+    function handleEnd() {
+        if (ended) {
+            return
+        }
+        ended = true
+        var args = slice.call(arguments)
+        args.unshift("end")
+        stream.emit.apply(stream, args)
+    }
 
-  if (!isValidValue(start) || !isValidValue(end)) {
-    return invalidRange(start, end, options);
-  }
+    function reemit(err) {
+        stream.emit("error", err)
+    }
+}
 
-  if (typeof step === 'function') {
-    return fill(start, end, 1, { transform: step });
-  }
 
-  if (isObject(step)) {
-    return fill(start, end, 0, step);
-  }
+/***/ }),
 
-  let opts = { ...options };
-  if (opts.capture === true) opts.wrap = true;
-  step = step || opts.step || 1;
+/***/ "../../node_modules/end-of-stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!isNumber(step)) {
-    if (step != null && !isObject(step)) return invalidStep(step, opts);
-    return fill(start, end, 1, step);
-  }
+var once = __webpack_require__("../../node_modules/once/once.js");
 
-  if (isNumber(start) && isNumber(end)) {
-    return fillNumbers(start, end, step, opts);
-  }
+var noop = function() {};
 
-  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
+var isRequest = function(stream) {
+	return stream.setHeader && typeof stream.abort === 'function';
 };
 
-module.exports = fill;
+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 = {};
 
-/***/ }),
-/* 395 */
-/***/ (function(module, exports, __webpack_require__) {
+	callback = once(callback || noop);
 
-"use strict";
-/*!
- * to-regex-range <https://github.com/micromatch/to-regex-range>
- *
- * Copyright (c) 2015-present, Jon Schlinkert.
- * Released under the MIT License.
- */
+	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 cancelled = false;
 
+	var onlegacyfinish = function() {
+		if (!stream.writable) onfinish();
+	};
 
+	var onfinish = function() {
+		writable = false;
+		if (!readable) callback.call(stream);
+	};
 
-const isNumber = __webpack_require__(396);
+	var onend = function() {
+		readable = false;
+		if (!writable) callback.call(stream);
+	};
 
-const toRegexRange = (min, max, options) => {
-  if (isNumber(min) === false) {
-    throw new TypeError('toRegexRange: expected the first argument to be a number');
-  }
+	var onexit = function(exitCode) {
+		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
+	};
 
-  if (max === void 0 || min === max) {
-    return String(min);
-  }
+	var onerror = function(err) {
+		callback.call(stream, err);
+	};
 
-  if (isNumber(max) === false) {
-    throw new TypeError('toRegexRange: expected the second argument to be a number.');
-  }
+	var onclose = function() {
+		process.nextTick(onclosenexttick);
+	};
 
-  let opts = { relaxZeros: true, ...options };
-  if (typeof opts.strictZeros === 'boolean') {
-    opts.relaxZeros = opts.strictZeros === false;
-  }
+	var onclosenexttick = function() {
+		if (cancelled) return;
+		if (readable && !(rs && (rs.ended && !rs.destroyed))) return callback.call(stream, new Error('premature close'));
+		if (writable && !(ws && (ws.ended && !ws.destroyed))) return callback.call(stream, new Error('premature close'));
+	};
 
-  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 onrequest = function() {
+		stream.req.on('finish', onfinish);
+	};
 
-  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
-    return toRegexRange.cache[cacheKey].result;
-  }
+	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);
+	}
 
-  let a = Math.min(min, max);
-  let b = Math.max(min, max);
+	if (isChildProcess(stream)) stream.on('exit', onexit);
 
-  if (Math.abs(a - b) === 1) {
-    let result = min + '|' + max;
-    if (opts.capture) {
-      return `(${result})`;
-    }
-    if (opts.wrap === false) {
-      return result;
-    }
-    return `(?:${result})`;
-  }
+	stream.on('end', onend);
+	stream.on('finish', onfinish);
+	if (opts.error !== false) stream.on('error', onerror);
+	stream.on('close', onclose);
 
-  let isPadded = hasPadding(min) || hasPadding(max);
-  let state = { min, max, a, b };
-  let positives = [];
-  let negatives = [];
+	return function() {
+		cancelled = true;
+		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 (isPadded) {
-    state.isPadded = isPadded;
-    state.maxLen = String(state.max).length;
-  }
+module.exports = eos;
 
-  if (a < 0) {
-    let newMin = b < 0 ? Math.abs(b) : 1;
-    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
-    a = state.a = 0;
-  }
 
-  if (b >= 0) {
-    positives = splitToPatterns(a, b, state, opts);
-  }
+/***/ }),
 
-  state.negatives = negatives;
-  state.positives = positives;
-  state.result = collatePatterns(negatives, positives, opts);
+/***/ "../../node_modules/error-ex/index.js":
+/***/ (function(module, 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";
 
-  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('|');
-}
+var util = __webpack_require__("util");
+var isArrayish = __webpack_require__("../../node_modules/is-arrayish/index.js");
 
-function splitToRanges(min, max) {
-  let nines = 1;
-  let zeros = 1;
+var errorEx = function errorEx(name, properties) {
+	if (!name || name.constructor !== String) {
+		properties = name || {};
+		name = Error.name;
+	}
 
-  let stop = countNines(min, nines);
-  let stops = new Set([max]);
+	var errorExError = function ErrorEXError(message) {
+		if (!this) {
+			return new ErrorEXError(message);
+		}
 
-  while (min <= stop && stop <= max) {
-    stops.add(stop);
-    nines += 1;
-    stop = countNines(min, nines);
-  }
+		message = message instanceof Error
+			? message.message
+			: (message || this.message);
 
-  stop = countZeros(max + 1, zeros) - 1;
+		Error.call(this, message);
+		Error.captureStackTrace(this, errorExError);
 
-  while (min < stop && stop <= max) {
-    stops.add(stop);
-    zeros += 1;
-    stop = countZeros(max + 1, zeros) - 1;
-  }
+		this.name = name;
 
-  stops = [...stops];
-  stops.sort(compare);
-  return stops;
-}
+		Object.defineProperty(this, 'message', {
+			configurable: true,
+			enumerable: false,
+			get: function () {
+				var newMessage = message.split(/\r?\n/g);
 
-/**
- * Convert a range to a regex pattern
- * @param {Number} `start`
- * @param {Number} `stop`
- * @return {String}
- */
+				for (var key in properties) {
+					if (!properties.hasOwnProperty(key)) {
+						continue;
+					}
 
-function rangeToPattern(start, stop, options) {
-  if (start === stop) {
-    return { pattern: start, count: [], digits: 0 };
-  }
+					var modifier = properties[key];
 
-  let zipped = zip(start, stop);
-  let digits = zipped.length;
-  let pattern = '';
-  let count = 0;
+					if ('message' in modifier) {
+						newMessage = modifier.message(this[key], newMessage) || newMessage;
+						if (!isArrayish(newMessage)) {
+							newMessage = [newMessage];
+						}
+					}
+				}
 
-  for (let i = 0; i < digits; i++) {
-    let [startDigit, stopDigit] = zipped[i];
+				return newMessage.join('\n');
+			},
+			set: function (v) {
+				message = v;
+			}
+		});
 
-    if (startDigit === stopDigit) {
-      pattern += startDigit;
+		var stackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
+		var stackGetter = stackDescriptor.get;
+		var stackValue = stackDescriptor.value;
+		delete stackDescriptor.value;
+		delete stackDescriptor.writable;
 
-    } else if (startDigit !== '0' || stopDigit !== '9') {
-      pattern += toCharacterClass(startDigit, stopDigit, options);
+		stackDescriptor.get = function () {
+			var stack = (stackGetter)
+				? stackGetter.call(this).split(/\r?\n+/g)
+				: stackValue.split(/\r?\n+/g);
 
-    } else {
-      count++;
-    }
-  }
+			// starting in Node 7, the stack builder caches the message.
+			// just replace it.
+			stack[0] = this.name + ': ' + this.message;
 
-  if (count) {
-    pattern += options.shorthand === true ? '\\d' : '[0-9]';
-  }
+			var lineCount = 1;
+			for (var key in properties) {
+				if (!properties.hasOwnProperty(key)) {
+					continue;
+				}
 
-  return { pattern, count: [count], digits };
-}
+				var modifier = properties[key];
 
-function splitToPatterns(min, max, tok, options) {
-  let ranges = splitToRanges(min, max);
-  let tokens = [];
-  let start = min;
-  let prev;
+				if ('line' in modifier) {
+					var line = modifier.line(this[key]);
+					if (line) {
+						stack.splice(lineCount++, 0, '    ' + line);
+					}
+				}
 
-  for (let i = 0; i < ranges.length; i++) {
-    let max = ranges[i];
-    let obj = rangeToPattern(String(start), String(max), options);
-    let zeros = '';
+				if ('stack' in modifier) {
+					modifier.stack(this[key], stack);
+				}
+			}
 
-    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
-      if (prev.count.length > 1) {
-        prev.count.pop();
-      }
+			return stack.join('\n');
+		};
 
-      prev.count.push(obj.count[0]);
-      prev.string = prev.pattern + toQuantifier(prev.count);
-      start = max + 1;
-      continue;
-    }
+		Object.defineProperty(this, 'stack', stackDescriptor);
+	};
 
-    if (tok.isPadded) {
-      zeros = padZeros(max, tok, options);
-    }
+	if (Object.setPrototypeOf) {
+		Object.setPrototypeOf(errorExError.prototype, Error.prototype);
+		Object.setPrototypeOf(errorExError, Error);
+	} else {
+		util.inherits(errorExError, Error);
+	}
 
-    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
-    tokens.push(obj);
-    start = max + 1;
-    prev = obj;
-  }
+	return errorExError;
+};
 
-  return tokens;
-}
+errorEx.append = function (str, def) {
+	return {
+		message: function (v, message) {
+			v = v || def;
 
-function filterPatterns(arr, comparison, prefix, intersection, options) {
-  let result = [];
+			if (v) {
+				message[0] += ' ' + str.replace('%s', v.toString());
+			}
 
-  for (let ele of arr) {
-    let { string } = ele;
+			return message;
+		}
+	};
+};
 
-    // only push if _both_ are negative...
-    if (!intersection && !contains(comparison, 'string', string)) {
-      result.push(prefix + string);
-    }
+errorEx.line = function (str, def) {
+	return {
+		line: function (v) {
+			v = v || def;
 
-    // or _both_ are positive
-    if (intersection && contains(comparison, 'string', string)) {
-      result.push(prefix + string);
-    }
-  }
-  return result;
-}
+			if (v) {
+				return str.replace('%s', v.toString());
+			}
 
-/**
- * Zip strings
- */
+			return null;
+		}
+	};
+};
 
-function zip(a, b) {
-  let arr = [];
-  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
-  return arr;
-}
+module.exports = errorEx;
 
-function compare(a, b) {
-  return a > b ? 1 : b > a ? -1 : 0;
-}
 
-function contains(arr, key, val) {
-  return arr.some(ele => ele[key] === val);
-}
+/***/ }),
 
-function countNines(min, len) {
-  return Number(String(min).slice(0, -len) + '9'.repeat(len));
-}
+/***/ "../../node_modules/escape-string-regexp/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function countZeros(integer, zeros) {
-  return integer - (integer % Math.pow(10, zeros));
-}
+"use strict";
 
-function toQuantifier(digits) {
-  let [start = 0, stop = ''] = digits;
-  if (stop || start > 1) {
-    return `{${start + (stop ? ',' + stop : '')}}`;
-  }
-  return '';
-}
 
-function toCharacterClass(a, b, options) {
-  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
-}
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
 
-function hasPadding(str) {
-  return /^-?(0+)\d/.test(str);
-}
+module.exports = function (str) {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-function padZeros(value, tok, options) {
-  if (!tok.isPadded) {
-    return value;
-  }
+	return str.replace(matchOperatorsRe, '\\$&');
+};
 
-  let diff = Math.abs(tok.maxLen - String(value).length);
-  let relax = options.relaxZeros !== false;
 
-  switch (diff) {
-    case 0:
-      return '';
-    case 1:
-      return relax ? '0?' : '0';
-    case 2:
-      return relax ? '0{0,2}' : '00';
-    default: {
-      return relax ? `0{0,${diff}}` : `0{${diff}}`;
-    }
-  }
-}
+/***/ }),
 
-/**
- * Cache
- */
+/***/ "../../node_modules/execa/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-toRegexRange.cache = {};
-toRegexRange.clearCache = () => (toRegexRange.cache = {});
+"use strict";
 
-/**
- * Expose `toRegexRange`
- */
+const path = __webpack_require__("path");
+const childProcess = __webpack_require__("child_process");
+const crossSpawn = __webpack_require__("../../node_modules/cross-spawn/index.js");
+const stripFinalNewline = __webpack_require__("../../node_modules/strip-final-newline/index.js");
+const npmRunPath = __webpack_require__("../../node_modules/npm-run-path/index.js");
+const onetime = __webpack_require__("../../node_modules/onetime/index.js");
+const makeError = __webpack_require__("../../node_modules/execa/lib/error.js");
+const normalizeStdio = __webpack_require__("../../node_modules/execa/lib/stdio.js");
+const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__("../../node_modules/execa/lib/kill.js");
+const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__("../../node_modules/execa/lib/stream.js");
+const {mergePromise, getSpawnedPromise} = __webpack_require__("../../node_modules/execa/lib/promise.js");
+const {joinCommand, parseCommand} = __webpack_require__("../../node_modules/execa/lib/command.js");
 
-module.exports = toRegexRange;
+const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
 
+const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
+	const env = extendEnv ? {...process.env, ...envOption} : envOption;
 
-/***/ }),
-/* 396 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (preferLocal) {
+		return npmRunPath.env({env, cwd: localDir, execPath});
+	}
 
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Released under the MIT License.
- */
+	return env;
+};
 
+const handleArguments = (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,
+		windowsHide: true,
+		...options
+	};
 
-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;
-};
+	options.env = getEnv(options);
 
+	options.stdio = normalizeStdio(options);
 
-/***/ }),
-/* 397 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
+		// #116
+		args.unshift('/q');
+	}
 
-"use strict";
+	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 : '';
+	}
 
-const fill = __webpack_require__(394);
-const stringify = __webpack_require__(391);
-const utils = __webpack_require__(392);
+	if (options.stripFinalNewline) {
+		return stripFinalNewline(value);
+	}
 
-const append = (queue = '', stash = '', enclose = false) => {
-  let result = [];
+	return value;
+};
 
-  queue = [].concat(queue);
-  stash = [].concat(stash);
+const execa = (file, args, options) => {
+	const parsed = handleArguments(file, args, options);
+	const command = joinCommand(file, args);
 
-  if (!stash.length) return queue;
-  if (!queue.length) {
-    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
-  }
+	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);
+	}
 
-  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 spawnedPromise = getSpawnedPromise(spawned);
+	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
+	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
 
-const expand = (ast, options = {}) => {
-  let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
+	const context = {isCanceled: false};
 
-  let walk = (node, parent = {}) => {
-    node.queue = [];
+	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
+	spawned.cancel = spawnedCancel.bind(null, spawned, context);
 
-    let p = parent;
-    let q = parent.queue;
+	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);
 
-    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
-      p = p.parent;
-      q = p.queue;
-    }
+		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 (node.invalid || node.dollar) {
-      q.push(append(q.pop(), stringify(node, options)));
-      return;
-    }
+			if (!parsed.options.reject) {
+				return returnedError;
+			}
 
-    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
-      q.push(append(q.pop(), ['{}']));
-      return;
-    }
+			throw returnedError;
+		}
 
-    if (node.nodes && node.ranges > 0) {
-      let args = utils.reduce(node.nodes);
+		return {
+			command,
+			exitCode: 0,
+			stdout,
+			stderr,
+			all,
+			failed: false,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		};
+	};
 
-      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.');
-      }
+	const handlePromiseOnce = onetime(handlePromise);
 
-      let range = fill(...args, options);
-      if (range.length === 0) {
-        range = stringify(node, options);
-      }
+	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
 
-      q.push(append(q.pop(), range));
-      node.nodes = [];
-      return;
-    }
+	handleInput(spawned, parsed.options.input);
 
-    let enclose = utils.encloseBrace(node);
-    let queue = node.queue;
-    let block = node;
+	spawned.all = makeAllStream(spawned, parsed.options);
 
-    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
-      block = block.parent;
-      queue = block.queue;
-    }
+	return mergePromise(spawned, handlePromiseOnce);
+};
 
-    for (let i = 0; i < node.nodes.length; i++) {
-      let child = node.nodes[i];
+module.exports = execa;
 
-      if (child.type === 'comma' && node.type === 'brace') {
-        if (i === 1) queue.push('');
-        queue.push('');
-        continue;
-      }
+module.exports.sync = (file, args, options) => {
+	const parsed = handleArguments(file, args, options);
+	const command = joinCommand(file, args);
 
-      if (child.type === 'close') {
-        q.push(append(q.pop(), queue, enclose));
-        continue;
-      }
+	validateInputSync(parsed.options);
 
-      if (child.value && child.type !== 'open') {
-        queue.push(append(queue.pop(), child.value));
-        continue;
-      }
+	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 (child.nodes) {
-        walk(child, node);
-      }
-    }
+	const stdout = handleOutput(parsed.options, result.stdout, result.error);
+	const stderr = handleOutput(parsed.options, result.stderr, result.error);
 
-    return queue;
-  };
+	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 utils.flatten(walk(ast));
-};
+		if (!parsed.options.reject) {
+			return error;
+		}
 
-module.exports = expand;
+		throw error;
+	}
 
+	return {
+		command,
+		exitCode: 0,
+		stdout,
+		stderr,
+		failed: false,
+		timedOut: false,
+		isCanceled: false,
+		killed: false
+	};
+};
 
-/***/ }),
-/* 398 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports.command = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa(file, args, options);
+};
 
-"use strict";
+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 stringify = __webpack_require__(391);
+	const stdio = normalizeStdio.node(options);
 
-/**
- * Constants
- */
+	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
 
-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__(399);
-
-/**
- * parse
- */
-
-const parse = (input, options = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+	return execa(
+		nodePath,
+		[
+			...nodeOptions,
+			scriptPath,
+			...(Array.isArray(args) ? args : [])
+		],
+		{
+			...options,
+			stdin: undefined,
+			stdout: undefined,
+			stderr: undefined,
+			stdio,
+			shell: false
+		}
+	);
+};
 
-  let opts = options || {};
-  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
-  if (input.length > max) {
-    throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
-  }
 
-  let ast = { type: 'root', input, nodes: [] };
-  let stack = [ast];
-  let block = ast;
-  let prev = ast;
-  let brackets = 0;
-  let length = input.length;
-  let index = 0;
-  let depth = 0;
-  let value;
-  let memo = {};
+/***/ }),
 
-  /**
-   * Helpers
-   */
+/***/ "../../node_modules/execa/lib/command.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  const advance = () => input[index++];
-  const push = node => {
-    if (node.type === 'text' && prev.type === 'dot') {
-      prev.type = 'text';
-    }
+"use strict";
 
-    if (prev && prev.type === 'text' && node.type === 'text') {
-      prev.value += node.value;
-      return;
-    }
+const SPACES_REGEXP = / +/g;
 
-    block.nodes.push(node);
-    node.parent = block;
-    node.prev = prev;
-    prev = node;
-    return node;
-  };
+const joinCommand = (file, args = []) => {
+	if (!Array.isArray(args)) {
+		return file;
+	}
 
-  push({ type: 'bos' });
+	return [file, ...args].join(' ');
+};
 
-  while (index < length) {
-    block = stack[stack.length - 1];
-    value = advance();
+// Allow spaces to be escaped by a backslash if not meant as a delimiter
+const handleEscaping = (tokens, token, index) => {
+	if (index === 0) {
+		return [token];
+	}
 
-    /**
-     * Invalid chars
-     */
+	const previousToken = tokens[tokens.length - 1];
 
-    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
-      continue;
-    }
+	if (previousToken.endsWith('\\')) {
+		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
+	}
 
-    /**
-     * Escaped chars
-     */
+	return [...tokens, token];
+};
 
-    if (value === CHAR_BACKSLASH) {
-      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
-      continue;
-    }
+// Handle `execa.command()`
+const parseCommand = command => {
+	return command
+		.trim()
+		.split(SPACES_REGEXP)
+		.reduce(handleEscaping, []);
+};
 
-    /**
-     * Right square bracket (literal): ']'
-     */
+module.exports = {
+	joinCommand,
+	parseCommand
+};
 
-    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
-      push({ type: 'text', value: '\\' + value });
-      continue;
-    }
 
-    /**
-     * Left square bracket: '['
-     */
+/***/ }),
 
-    if (value === CHAR_LEFT_SQUARE_BRACKET) {
-      brackets++;
+/***/ "../../node_modules/execa/lib/error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      let closed = true;
-      let next;
+"use strict";
 
-      while (index < length && (next = advance())) {
-        value += next;
+const {signalsByName} = __webpack_require__("../../node_modules/human-signals/build/src/main.js");
 
-        if (next === CHAR_LEFT_SQUARE_BRACKET) {
-          brackets++;
-          continue;
-        }
+const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
+	if (timedOut) {
+		return `timed out after ${timeout} milliseconds`;
+	}
 
-        if (next === CHAR_BACKSLASH) {
-          value += advance();
-          continue;
-        }
+	if (isCanceled) {
+		return 'was canceled';
+	}
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          brackets--;
+	if (errorCode !== undefined) {
+		return `failed with ${errorCode}`;
+	}
 
-          if (brackets === 0) {
-            break;
-          }
-        }
-      }
+	if (signal !== undefined) {
+		return `was killed with ${signal} (${signalDescription})`;
+	}
 
-      push({ type: 'text', value });
-      continue;
-    }
+	if (exitCode !== undefined) {
+		return `failed with exit code ${exitCode}`;
+	}
 
-    /**
-     * Parentheses
-     */
+	return 'failed';
+};
 
-    if (value === CHAR_LEFT_PARENTHESES) {
-      block = push({ type: 'paren', nodes: [] });
-      stack.push(block);
-      push({ type: 'text', value });
-      continue;
-    }
+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;
 
-    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;
-    }
+	const errorCode = error && error.code;
 
-    /**
-     * Quotes: '|"|`
-     */
+	const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled});
+	const execaMessage = `Command ${prefix}: ${command}`;
+	const isError = Object.prototype.toString.call(error) === '[object Error]';
+	const shortMessage = isError ? `${execaMessage}\n${error.message}` : execaMessage;
+	const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n');
 
-    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
-      let open = value;
-      let next;
+	if (isError) {
+		error.originalMessage = error.message;
+		error.message = message;
+	} else {
+		error = new Error(message);
+	}
 
-      if (options.keepQuotes !== true) {
-        value = '';
-      }
+	error.shortMessage = shortMessage;
+	error.command = command;
+	error.exitCode = exitCode;
+	error.signal = signal;
+	error.signalDescription = signalDescription;
+	error.stdout = stdout;
+	error.stderr = stderr;
 
-      while (index < length && (next = advance())) {
-        if (next === CHAR_BACKSLASH) {
-          value += next + advance();
-          continue;
-        }
+	if (all !== undefined) {
+		error.all = all;
+	}
 
-        if (next === open) {
-          if (options.keepQuotes === true) value += next;
-          break;
-        }
+	if ('bufferedData' in error) {
+		delete error.bufferedData;
+	}
 
-        value += next;
-      }
+	error.failed = true;
+	error.timedOut = Boolean(timedOut);
+	error.isCanceled = isCanceled;
+	error.killed = killed && !timedOut;
 
-      push({ type: 'text', value });
-      continue;
-    }
+	return error;
+};
 
-    /**
-     * Left curly brace: '{'
-     */
+module.exports = makeError;
 
-    if (value === CHAR_LEFT_CURLY_BRACE) {
-      depth++;
 
-      let dollar = prev.value && prev.value.slice(-1) === '$' || block.dollar === true;
-      let brace = {
-        type: 'brace',
-        open: true,
-        close: false,
-        dollar,
-        depth,
-        commas: 0,
-        ranges: 0,
-        nodes: []
-      };
+/***/ }),
 
-      block = push(brace);
-      stack.push(block);
-      push({ type: 'open', value });
-      continue;
-    }
+/***/ "../../node_modules/execa/lib/kill.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    /**
-     * Right curly brace: '}'
-     */
+"use strict";
 
-    if (value === CHAR_RIGHT_CURLY_BRACE) {
-      if (block.type !== 'brace') {
-        push({ type: 'text', value });
-        continue;
-      }
+const os = __webpack_require__("os");
+const onExit = __webpack_require__("../../node_modules/signal-exit/index.js");
 
-      let type = 'close';
-      block = stack.pop();
-      block.close = true;
+const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
 
-      push({ type, value });
-      depth--;
+// 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;
+};
 
-      block = stack[stack.length - 1];
-      continue;
-    }
+const setKillTimeout = (kill, signal, options, killResult) => {
+	if (!shouldForceKill(signal, options, killResult)) {
+		return;
+	}
 
-    /**
-     * Comma: ','
-     */
+	const timeout = getForceKillAfterTimeout(options);
+	const t = setTimeout(() => {
+		kill('SIGKILL');
+	}, timeout);
 
-    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) }];
-      }
+	// Guarded because there's no `.unref()` when `execa` is used in the renderer
+	// process in Electron. This cannot be tested since we don't run tests in
+	// Electron.
+	// istanbul ignore else
+	if (t.unref) {
+		t.unref();
+	}
+};
 
-      push({ type: 'comma', value });
-      block.commas++;
-      continue;
-    }
+const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
+	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
+};
 
-    /**
-     * Dot: '.'
-     */
+const isSigterm = signal => {
+	return signal === os.constants.signals.SIGTERM ||
+		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
+};
 
-    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
-      let siblings = block.nodes;
+const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
+	if (forceKillAfterTimeout === true) {
+		return DEFAULT_FORCE_KILL_TIMEOUT;
+	}
 
-      if (depth === 0 || siblings.length === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
+	if (!Number.isFinite(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
+		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
+	}
 
-      if (prev.type === 'dot') {
-        block.range = [];
-        prev.value += value;
-        prev.type = 'range';
+	return forceKillAfterTimeout;
+};
 
-        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
-          block.invalid = true;
-          block.ranges = 0;
-          prev.type = 'text';
-          continue;
-        }
+// `childProcess.cancel()`
+const spawnedCancel = (spawned, context) => {
+	const killResult = spawned.kill();
 
-        block.ranges++;
-        block.args = [];
-        continue;
-      }
+	if (killResult) {
+		context.isCanceled = true;
+	}
+};
 
-      if (prev.type === 'range') {
-        siblings.pop();
+const timeoutKill = (spawned, signal, reject) => {
+	spawned.kill(signal);
+	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
+};
 
-        let before = siblings[siblings.length - 1];
-        before.value += prev.value + value;
-        prev = before;
-        block.ranges--;
-        continue;
-      }
+// `timeout` option handling
+const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
+	if (timeout === 0 || timeout === undefined) {
+		return spawnedPromise;
+	}
 
-      push({ type: 'dot', value });
-      continue;
-    }
+	if (!Number.isFinite(timeout) || timeout < 0) {
+		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
+	}
 
-    /**
-     * Text
-     */
+	let timeoutId;
+	const timeoutPromise = new Promise((resolve, reject) => {
+		timeoutId = setTimeout(() => {
+			timeoutKill(spawned, killSignal, reject);
+		}, timeout);
+	});
 
-    push({ type: 'text', value });
-  }
+	const safeSpawnedPromise = spawnedPromise.finally(() => {
+		clearTimeout(timeoutId);
+	});
 
-  // Mark imbalanced braces and brackets as invalid
-  do {
-    block = stack.pop();
+	return Promise.race([timeoutPromise, safeSpawnedPromise]);
+};
 
-    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;
-        }
-      });
+// `cleanup` option handling
+const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
+	if (!cleanup || detached) {
+		return timedPromise;
+	}
 
-      // 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);
+	const removeExitHandler = onExit(() => {
+		spawned.kill();
+	});
 
-  push({ type: 'eos' });
-  return ast;
+	return timedPromise.finally(() => {
+		removeExitHandler();
+	});
 };
 
-module.exports = parse;
+module.exports = {
+	spawnedKill,
+	spawnedCancel,
+	setupTimeout,
+	setExitHandler
+};
 
 
 /***/ }),
-/* 399 */
+
+/***/ "../../node_modules/execa/lib/promise.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
+const nativePromisePrototype = (async () => {})().constructor.prototype;
+const descriptors = ['then', 'catch', 'finally'].map(property => [
+	property,
+	Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)
+]);
 
-  // Digits
-  CHAR_0: '0', /* 0 */
-  CHAR_9: '9', /* 9 */
+// The return value is a mixin of `childProcess` and `Promise`
+const mergePromise = (spawned, promise) => {
+	for (const [property, descriptor] of descriptors) {
+		// Starting the main `promise` is deferred to avoid consuming streams
+		const value = typeof promise === 'function' ?
+			(...args) => Reflect.apply(descriptor.value, promise(), args) :
+			descriptor.value.bind(promise);
 
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 'A', /* A */
-  CHAR_LOWERCASE_A: 'a', /* a */
-  CHAR_UPPERCASE_Z: 'Z', /* Z */
-  CHAR_LOWERCASE_Z: 'z', /* z */
+		Reflect.defineProperty(spawned, property, {...descriptor, value});
+	}
 
-  CHAR_LEFT_PARENTHESES: '(', /* ( */
-  CHAR_RIGHT_PARENTHESES: ')', /* ) */
+	return spawned;
+};
 
-  CHAR_ASTERISK: '*', /* * */
+// Use promises instead of `child_process` events
+const getSpawnedPromise = spawned => {
+	return new Promise((resolve, reject) => {
+		spawned.on('exit', (exitCode, signal) => {
+			resolve({exitCode, signal});
+		});
 
-  // 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 */
+		spawned.on('error', error => {
+			reject(error);
+		});
+
+		if (spawned.stdin) {
+			spawned.stdin.on('error', error => {
+				reject(error);
+			});
+		}
+	});
+};
+
+module.exports = {
+	mergePromise,
+	getSpawnedPromise
 };
 
 
+
 /***/ }),
-/* 400 */
+
+/***/ "../../node_modules/execa/lib/stdio.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const aliases = ['stdin', 'stdout', 'stderr'];
 
-module.exports = __webpack_require__(401);
+const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
 
+const normalizeStdio = opts => {
+	if (!opts) {
+		return;
+	}
 
-/***/ }),
-/* 401 */
-/***/ (function(module, exports, __webpack_require__) {
+	const {stdio} = opts;
 
-"use strict";
+	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(', ')}`);
+	}
 
-const path = __webpack_require__(4);
-const scan = __webpack_require__(402);
-const parse = __webpack_require__(405);
-const utils = __webpack_require__(403);
-const constants = __webpack_require__(404);
-const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
+	if (typeof stdio === 'string') {
+		return stdio;
+	}
 
-/**
- * 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
- */
+	if (!Array.isArray(stdio)) {
+		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	}
 
-const picomatch = (glob, options, returnState = false) => {
-  if (Array.isArray(glob)) {
-    const fns = glob.map(input => picomatch(input, options, returnState));
-    const arrayMatcher = str => {
-      for (const isMatch of fns) {
-        const state = isMatch(str);
-        if (state) return state;
-      }
-      return false;
-    };
-    return arrayMatcher;
-  }
+	const length = Math.max(stdio.length, aliases.length);
+	return Array.from({length}, (value, index) => stdio[index]);
+};
 
-  const isState = isObject(glob) && glob.tokens && glob.input;
+module.exports = normalizeStdio;
 
-  if (glob === '' || (typeof glob !== 'string' && !isState)) {
-    throw new TypeError('Expected pattern to be a non-empty string');
-  }
+// `ipc` is pushed unless it is already present
+module.exports.node = opts => {
+	const stdio = normalizeStdio(opts);
 
-  const opts = options || {};
-  const posix = utils.isWindows(options);
-  const regex = isState
-    ? picomatch.compileRe(glob, options)
-    : picomatch.makeRe(glob, options, false, true);
+	if (stdio === 'ipc') {
+		return 'ipc';
+	}
 
-  const state = regex.state;
-  delete regex.state;
+	if (stdio === undefined || typeof stdio === 'string') {
+		return [stdio, stdio, stdio, 'ipc'];
+	}
 
-  let isIgnored = () => false;
-  if (opts.ignore) {
-    const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
-    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
-  }
+	if (stdio.includes('ipc')) {
+		return stdio;
+	}
 
-  const matcher = (input, returnObject = false) => {
-    const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
-    const result = { glob, state, regex, posix, input, output, match, isMatch };
+	return [...stdio, 'ipc'];
+};
 
-    if (typeof opts.onResult === 'function') {
-      opts.onResult(result);
-    }
 
-    if (isMatch === false) {
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+/***/ }),
 
-    if (isIgnored(input)) {
-      if (typeof opts.onIgnore === 'function') {
-        opts.onIgnore(result);
-      }
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+/***/ "../../node_modules/execa/lib/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (typeof opts.onMatch === 'function') {
-      opts.onMatch(result);
-    }
-    return returnObject ? result : true;
-  };
+"use strict";
 
-  if (returnState) {
-    matcher.state = state;
-  }
+const isStream = __webpack_require__("../../node_modules/is-stream/index.js");
+const getStream = __webpack_require__("../../node_modules/get-stream/index.js");
+const mergeStream = __webpack_require__("../../node_modules/merge-stream/index.js");
 
-  return matcher;
+// `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);
+	}
 };
 
-/**
- * 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
- */
+// `all` interleaves `stdout` and `stderr`
+const makeAllStream = (spawned, {all}) => {
+	if (!all || (!spawned.stdout && !spawned.stderr)) {
+		return;
+	}
 
-picomatch.test = (input, regex, options, { glob, posix } = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected input to be a string');
-  }
+	const mixed = mergeStream();
 
-  if (input === '') {
-    return { isMatch: false, output: '' };
-  }
+	if (spawned.stdout) {
+		mixed.add(spawned.stdout);
+	}
 
-  const opts = options || {};
-  const format = opts.format || (posix ? utils.toPosixSlashes : null);
-  let match = input === glob;
-  let output = (match && format) ? format(input) : input;
+	if (spawned.stderr) {
+		mixed.add(spawned.stderr);
+	}
 
-  if (match === false) {
-    output = format ? format(input) : input;
-    match = output === glob;
-  }
+	return mixed;
+};
 
-  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);
-    }
-  }
+// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
+const getBufferedData = async (stream, streamPromise) => {
+	if (!stream) {
+		return;
+	}
 
-  return { isMatch: Boolean(match), match, output };
+	stream.destroy();
+
+	try {
+		return await streamPromise;
+	} catch (error) {
+		return error.bufferedData;
+	}
 };
 
-/**
- * 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
- */
+const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
+	if (!stream || !buffer) {
+		return;
+	}
 
-picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
-  const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-  return regex.test(path.basename(input));
+	if (encoding) {
+		return getStream(stream, {encoding, maxBuffer});
+	}
+
+	return getStream.buffer(stream, {maxBuffer});
 };
 
-/**
- * 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
- */
+// 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});
 
-picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+	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)
+		]);
+	}
+};
 
-/**
- * Parse a glob pattern to create the source string for a regular
- * expression.
- *
- * ```js
- * const picomatch = require('picomatch');
- * const result = picomatch.parse(pattern[, options]);
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object} Returns an object with useful properties and output to be used as a regex source string.
- * @api public
- */
+const validateInputSync = ({input}) => {
+	if (isStream(input)) {
+		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	}
+};
 
-picomatch.parse = (pattern, options) => {
-  if (Array.isArray(pattern)) return pattern.map(p => picomatch.parse(p, options));
-  return parse(pattern, { ...options, fastpaths: false });
+module.exports = {
+	handleInput,
+	makeAllStream,
+	getSpawnedResult,
+	validateInputSync
 };
 
-/**
- * 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',
- *   start: 3,
- *   base: 'foo',
- *   glob: '*.js',
- *   isBrace: false,
- *   isBracket: false,
- *   isGlob: true,
- *   isExtglob: false,
- *   isGlobstar: false,
- *   negated: 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);
 
-/**
- * Compile a regular expression from the `state` object returned by the
- * [parse()](#parse) method.
- *
- * @param {Object} `state`
- * @param {Object} `options`
- * @param {Boolean} `returnOutput` Intended for implementors, this argument allows you to return the raw output from the parser.
- * @param {Boolean} `returnState` Adds the state to a `state` property on the returned regex. Useful for implementors and debugging.
- * @return {RegExp}
- * @api public
- */
+/***/ }),
 
-picomatch.compileRe = (state, options, returnOutput = false, returnState = false) => {
-  if (returnOutput === true) {
-    return state.output;
-  }
+/***/ "../../node_modules/fastq/queue.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  const opts = options || {};
-  const prepend = opts.contains ? '' : '^';
-  const append = opts.contains ? '' : '$';
+"use strict";
 
-  let source = `${prepend}(?:${state.output})${append}`;
-  if (state && state.negated === true) {
-    source = `^(?!${source}).*$`;
-  }
 
-  const regex = picomatch.toRegex(source, options);
-  if (returnState === true) {
-    regex.state = state;
-  }
+var reusify = __webpack_require__("../../node_modules/reusify/reusify.js")
 
-  return regex;
-};
+function fastqueue (context, worker, concurrency) {
+  if (typeof context === 'function') {
+    concurrency = worker
+    worker = context
+    context = null
+  }
 
-/**
- * Create a regular expression from a parsed glob pattern.
- *
- * ```js
- * const picomatch = require('picomatch');
- * const state = picomatch.parse('*.js');
- * // picomatch.compileRe(state[, options]);
- *
- * console.log(picomatch.compileRe(state));
- * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
- * ```
- * @param {String} `state` The object returned from the `.parse` method.
- * @param {Object} `options`
- * @param {Boolean} `returnOutput` Implementors may use this argument to return the compiled output, instead of a regular expression. This is not exposed on the options to prevent end-users from mutating the result.
- * @param {Boolean} `returnState` Implementors may use this argument to return the state from the parsed glob with the returned regular expression.
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
+  var cache = reusify(Task)
+  var queueHead = null
+  var queueTail = null
+  var _running = 0
 
-picomatch.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
-  if (!input || typeof input !== 'string') {
-    throw new TypeError('Expected a non-empty string');
+  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
   }
 
-  let parsed = { negated: false, fastpaths: true };
+  return self
 
-  if (options.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
-    parsed.output = parse.fastpaths(input, options);
+  function running () {
+    return _running
   }
 
-  if (!parsed.output) {
-    parsed = parse(input, options);
+  function pause () {
+    self.paused = true
   }
 
-  return picomatch.compileRe(parsed, options, returnOutput, returnState);
-};
+  function length () {
+    var current = queueHead
+    var counter = 0
 
-/**
- * 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
- */
+    while (current) {
+      current = current.next
+      counter++
+    }
 
-picomatch.toRegex = (source, options) => {
-  try {
-    const opts = options || {};
-    return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
-  } catch (err) {
-    if (options && options.debug === true) throw err;
-    return /$^/;
+    return counter
   }
-};
 
-/**
- * Picomatch constants.
- * @return {Object}
- */
+  function resume () {
+    if (!self.paused) return
+    self.paused = false
+    for (var i = 0; i < self.concurrency; i++) {
+      _running++
+      release()
+    }
+  }
 
-picomatch.constants = constants;
+  function idle () {
+    return _running === 0 && self.length() === 0
+  }
 
-/**
- * Expose "picomatch"
- */
+  function push (value, done) {
+    var current = cache.get()
 
-module.exports = picomatch;
+    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)
+    }
+  }
 
-/***/ }),
-/* 402 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  function unshift (value, done) {
+    var current = cache.get()
 
+    current.context = context
+    current.release = release
+    current.value = value
+    current.callback = done || noop
 
-const utils = __webpack_require__(403);
-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__(404);
+    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)
+    }
+  }
 
-const isPathSeparator = code => {
-  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
-};
+  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()
+    }
+  }
 
-const depth = token => {
-  if (token.isPrefix !== true) {
-    token.depth = token.isGlobstar ? Infinity : 1;
+  function kill () {
+    queueHead = null
+    queueTail = null
+    self.drain = noop
   }
-};
 
-/**
- * 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), `negated` (true if the path starts with `!` but not
- * with `!(`) and `negatedExtglob` (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
- */
+  function killAndDrain () {
+    queueHead = null
+    queueTail = null
+    self.drain()
+    self.drain = noop
+  }
+}
 
-const scan = (input, options) => {
-  const opts = options || {};
+function noop () {}
 
-  const length = input.length - 1;
-  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
-  const slashes = [];
-  const tokens = [];
-  const parts = [];
+function Task () {
+  this.value = null
+  this.callback = noop
+  this.next = null
+  this.release = noop
+  this.context = null
 
-  let str = input;
-  let index = -1;
-  let start = 0;
-  let lastIndex = 0;
-  let isBrace = false;
-  let isBracket = false;
-  let isGlob = false;
-  let isExtglob = false;
-  let isGlobstar = false;
-  let braceEscaped = false;
-  let backslashes = false;
-  let negated = false;
-  let negatedExtglob = false;
-  let finished = false;
-  let braces = 0;
-  let prev;
-  let code;
-  let token = { value: '', depth: 0, isGlob: false };
+  var self = this
 
-  const eos = () => index >= length;
-  const peek = () => str.charCodeAt(index + 1);
-  const advance = () => {
-    prev = code;
-    return str.charCodeAt(++index);
-  };
+  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)
+  }
+}
 
-  while (index < length) {
-    code = advance();
-    let next;
+module.exports = fastqueue
 
-    if (code === CHAR_BACKWARD_SLASH) {
-      backslashes = token.backslashes = true;
-      code = advance();
 
-      if (code === CHAR_LEFT_CURLY_BRACE) {
-        braceEscaped = true;
-      }
-      continue;
-    }
+/***/ }),
 
-    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
-      braces++;
+/***/ "../../node_modules/fill-range/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      while (eos() !== true && (code = advance())) {
-        if (code === CHAR_BACKWARD_SLASH) {
-          backslashes = token.backslashes = true;
-          advance();
-          continue;
-        }
+"use strict";
+/*!
+ * fill-range <https://github.com/jonschlinkert/fill-range>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-        if (code === CHAR_LEFT_CURLY_BRACE) {
-          braces++;
-          continue;
-        }
 
-        if (braceEscaped !== true && code === CHAR_DOT && (code = advance()) === CHAR_DOT) {
-          isBrace = token.isBrace = true;
-          isGlob = token.isGlob = true;
-          finished = true;
 
-          if (scanToEnd === true) {
-            continue;
-          }
+const util = __webpack_require__("util");
+const toRegexRange = __webpack_require__("../../node_modules/to-regex-range/index.js");
 
-          break;
-        }
+const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 
-        if (braceEscaped !== true && code === CHAR_COMMA) {
-          isBrace = token.isBrace = true;
-          isGlob = token.isGlob = true;
-          finished = true;
+const transform = toNumber => {
+  return value => toNumber === true ? Number(value) : String(value);
+};
 
-          if (scanToEnd === true) {
-            continue;
-          }
+const isValidValue = value => {
+  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+};
 
-          break;
-        }
+const isNumber = num => Number.isInteger(+num);
 
-        if (code === CHAR_RIGHT_CURLY_BRACE) {
-          braces--;
+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;
+};
 
-          if (braces === 0) {
-            braceEscaped = false;
-            isBrace = token.isBrace = true;
-            finished = true;
-            break;
-          }
-        }
-      }
+const stringify = (start, end, options) => {
+  if (typeof start === 'string' || typeof end === 'string') {
+    return true;
+  }
+  return options.stringify === true;
+};
 
-      if (scanToEnd === true) {
-        continue;
-      }
+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;
+};
 
-      break;
-    }
+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;
+};
 
-    if (code === CHAR_FORWARD_SLASH) {
-      slashes.push(index);
-      tokens.push(token);
-      token = { value: '', depth: 0, isGlob: false };
+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);
 
-      if (finished === true) continue;
-      if (prev === CHAR_DOT && index === (start + 1)) {
-        start += 2;
-        continue;
-      }
+  let prefix = options.capture ? '' : '?:';
+  let positives = '';
+  let negatives = '';
+  let result;
 
-      lastIndex = index + 1;
-      continue;
-    }
+  if (parts.positives.length) {
+    positives = parts.positives.join('|');
+  }
 
-    if (opts.noext !== true) {
-      const isExtglobChar = code === CHAR_PLUS
-        || code === CHAR_AT
-        || code === CHAR_ASTERISK
-        || code === CHAR_QUESTION_MARK
-        || code === CHAR_EXCLAMATION_MARK;
+  if (parts.negatives.length) {
+    negatives = `-(${prefix}${parts.negatives.join('|')})`;
+  }
 
-      if (isExtglobChar === true && peek() === CHAR_LEFT_PARENTHESES) {
-        isGlob = token.isGlob = true;
-        isExtglob = token.isExtglob = true;
-        finished = true;
-        if (code === CHAR_EXCLAMATION_MARK && index === start) {
-          negatedExtglob = true;
-        }
+  if (positives && negatives) {
+    result = `${positives}|${negatives}`;
+  } else {
+    result = positives || negatives;
+  }
 
-        if (scanToEnd === true) {
-          while (eos() !== true && (code = advance())) {
-            if (code === CHAR_BACKWARD_SLASH) {
-              backslashes = token.backslashes = true;
-              code = advance();
-              continue;
-            }
+  if (options.wrap) {
+    return `(${prefix}${result})`;
+  }
 
-            if (code === CHAR_RIGHT_PARENTHESES) {
-              isGlob = token.isGlob = true;
-              finished = true;
-              break;
-            }
-          }
-          continue;
-        }
-        break;
-      }
-    }
+  return result;
+};
 
-    if (code === CHAR_ASTERISK) {
-      if (prev === CHAR_ASTERISK) isGlobstar = token.isGlobstar = true;
-      isGlob = token.isGlob = true;
-      finished = true;
+const toRange = (a, b, isNumbers, options) => {
+  if (isNumbers) {
+    return toRegexRange(a, b, { wrap: false, ...options });
+  }
 
-      if (scanToEnd === true) {
-        continue;
-      }
-      break;
-    }
+  let start = String.fromCharCode(a);
+  if (a === b) return start;
 
-    if (code === CHAR_QUESTION_MARK) {
-      isGlob = token.isGlob = true;
-      finished = true;
+  let stop = String.fromCharCode(b);
+  return `[${start}-${stop}]`;
+};
 
-      if (scanToEnd === true) {
-        continue;
-      }
-      break;
-    }
+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);
+};
 
-    if (code === CHAR_LEFT_SQUARE_BRACKET) {
-      while (eos() !== true && (next = advance())) {
-        if (next === CHAR_BACKWARD_SLASH) {
-          backslashes = token.backslashes = true;
-          advance();
-          continue;
-        }
+const rangeError = (...args) => {
+  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
+};
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          isBracket = token.isBracket = true;
-          isGlob = token.isGlob = true;
-          finished = true;
-          break;
-        }
-      }
+const invalidRange = (start, end, options) => {
+  if (options.strictRanges === true) throw rangeError([start, end]);
+  return [];
+};
 
-      if (scanToEnd === true) {
-        continue;
-      }
+const invalidStep = (step, options) => {
+  if (options.strictRanges === true) {
+    throw new TypeError(`Expected step "${step}" to be a number`);
+  }
+  return [];
+};
 
-      break;
-    }
+const fillNumbers = (start, end, step = 1, options = {}) => {
+  let a = Number(start);
+  let b = Number(end);
 
-    if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {
-      negated = token.negated = true;
-      start++;
-      continue;
-    }
+  if (!Number.isInteger(a) || !Number.isInteger(b)) {
+    if (options.strictRanges === true) throw rangeError([start, end]);
+    return [];
+  }
 
-    if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
-      isGlob = token.isGlob = true;
+  // fix negative zero
+  if (a === 0) a = 0;
+  if (b === 0) b = 0;
 
-      if (scanToEnd === true) {
-        while (eos() !== true && (code = advance())) {
-          if (code === CHAR_LEFT_PARENTHESES) {
-            backslashes = token.backslashes = true;
-            code = advance();
-            continue;
-          }
+  let descending = a > b;
+  let startString = String(start);
+  let endString = String(end);
+  let stepString = String(step);
+  step = Math.max(Math.abs(step), 1);
 
-          if (code === CHAR_RIGHT_PARENTHESES) {
-            finished = true;
-            break;
-          }
-        }
-        continue;
-      }
-      break;
-    }
+  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 (isGlob === true) {
-      finished = true;
+  if (options.toRegex && step === 1) {
+    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
+  }
 
-      if (scanToEnd === true) {
-        continue;
-      }
+  let parts = { negatives: [], positives: [] };
+  let push = num => parts[num < 0 ? 'negatives' : 'positives'].push(Math.abs(num));
+  let range = [];
+  let index = 0;
 
-      break;
+  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 (opts.noext === true) {
-    isExtglob = false;
-    isGlob = false;
+  if (options.toRegex === true) {
+    return step > 1
+      ? toSequence(parts, options)
+      : toRegex(range, null, { wrap: false, ...options });
   }
 
-  let base = str;
-  let prefix = '';
-  let glob = '';
+  return range;
+};
 
-  if (start > 0) {
-    prefix = str.slice(0, start);
-    str = str.slice(start);
-    lastIndex -= start;
+const fillLetters = (start, end, step = 1, options = {}) => {
+  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
+    return invalidRange(start, end, options);
   }
 
-  if (base && isGlob === true && lastIndex > 0) {
-    base = str.slice(0, lastIndex);
-    glob = str.slice(lastIndex);
-  } else if (isGlob === true) {
-    base = '';
-    glob = str;
-  } else {
-    base = str;
+
+  let format = options.transform || (val => String.fromCharCode(val));
+  let a = `${start}`.charCodeAt(0);
+  let b = `${end}`.charCodeAt(0);
+
+  let descending = a > b;
+  let min = Math.min(a, b);
+  let max = Math.max(a, b);
+
+  if (options.toRegex && step === 1) {
+    return toRange(min, max, false, options);
   }
 
-  if (base && base !== '' && base !== '/' && base !== str) {
-    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
-      base = base.slice(0, -1);
-    }
+  let range = [];
+  let index = 0;
+
+  while (descending ? a >= b : a <= b) {
+    range.push(format(a, index));
+    a = descending ? a - step : a + step;
+    index++;
   }
 
-  if (opts.unescape === true) {
-    if (glob) glob = utils.removeBackslashes(glob);
+  if (options.toRegex === true) {
+    return toRegex(range, null, { wrap: false, options });
+  }
 
-    if (base && backslashes === true) {
-      base = utils.removeBackslashes(base);
-    }
+  return range;
+};
+
+const fill = (start, end, step, options = {}) => {
+  if (end == null && isValidValue(start)) {
+    return [start];
   }
 
-  const state = {
-    prefix,
-    input,
-    start,
-    base,
-    glob,
-    isBrace,
-    isBracket,
-    isGlob,
-    isExtglob,
-    isGlobstar,
-    negated,
-    negatedExtglob
-  };
-
-  if (opts.tokens === true) {
-    state.maxDepth = 0;
-    if (!isPathSeparator(code)) {
-      tokens.push(token);
-    }
-    state.tokens = tokens;
+  if (!isValidValue(start) || !isValidValue(end)) {
+    return invalidRange(start, end, options);
   }
 
-  if (opts.parts === true || opts.tokens === true) {
-    let prevIndex;
+  if (typeof step === 'function') {
+    return fill(start, end, 1, { transform: step });
+  }
 
-    for (let idx = 0; idx < slashes.length; idx++) {
-      const n = prevIndex ? prevIndex + 1 : start;
-      const i = slashes[idx];
-      const value = input.slice(n, i);
-      if (opts.tokens) {
-        if (idx === 0 && start !== 0) {
-          tokens[idx].isPrefix = true;
-          tokens[idx].value = prefix;
-        } else {
-          tokens[idx].value = value;
-        }
-        depth(tokens[idx]);
-        state.maxDepth += tokens[idx].depth;
-      }
-      if (idx !== 0 || value !== '') {
-        parts.push(value);
-      }
-      prevIndex = i;
-    }
+  if (isObject(step)) {
+    return fill(start, end, 0, step);
+  }
 
-    if (prevIndex && prevIndex + 1 < input.length) {
-      const value = input.slice(prevIndex + 1);
-      parts.push(value);
+  let opts = { ...options };
+  if (opts.capture === true) opts.wrap = true;
+  step = step || opts.step || 1;
 
-      if (opts.tokens) {
-        tokens[tokens.length - 1].value = value;
-        depth(tokens[tokens.length - 1]);
-        state.maxDepth += tokens[tokens.length - 1].depth;
-      }
-    }
+  if (!isNumber(step)) {
+    if (step != null && !isObject(step)) return invalidStep(step, opts);
+    return fill(start, end, 1, step);
+  }
 
-    state.slashes = slashes;
-    state.parts = parts;
+  if (isNumber(start) && isNumber(end)) {
+    return fillNumbers(start, end, step, opts);
   }
 
-  return state;
+  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
 };
 
-module.exports = scan;
+module.exports = fill;
 
 
 /***/ }),
-/* 403 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const path = __webpack_require__(4);
-const win32 = process.platform === 'win32';
-const {
-  REGEX_BACKSLASH,
-  REGEX_REMOVE_BACKSLASH,
-  REGEX_SPECIAL_CHARS,
-  REGEX_SPECIAL_CHARS_GLOBAL
-} = __webpack_require__(404);
-
-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(REGEX_BACKSLASH, '/');
 
-exports.removeBackslashes = str => {
-  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
-    return match === '\\' ? '' : match;
-  });
-};
+/***/ "../../node_modules/follow-redirects/debug.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.supportsLookbehinds = () => {
-  const segs = process.version.slice(1).split('.').map(Number);
-  if (segs.length === 3 && segs[0] >= 9 || (segs[0] === 8 && segs[1] >= 10)) {
-    return true;
-  }
-  return false;
-};
+var debug;
 
-exports.isWindows = options => {
-  if (options && typeof options.windows === 'boolean') {
-    return options.windows;
+module.exports = function () {
+  if (!debug) {
+    try {
+      /* eslint global-require: off */
+      debug = __webpack_require__("../../node_modules/debug/src/index.js")("follow-redirects");
+    }
+    catch (error) { /* */ }
+    if (typeof debug !== "function") {
+      debug = function () { /* */ };
+    }
   }
-  return win32 === true || path.sep === '\\';
-};
-
-exports.escapeLast = (input, char, lastIdx) => {
-  const 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)}`;
+  debug.apply(null, arguments);
 };
 
-exports.removePrefix = (input, state = {}) => {
-  let output = input;
-  if (output.startsWith('./')) {
-    output = output.slice(2);
-    state.prefix = './';
-  }
-  return output;
-};
 
-exports.wrapOutput = (input, state = {}, options = {}) => {
-  const prepend = options.contains ? '' : '^';
-  const append = options.contains ? '' : '$';
+/***/ }),
 
-  let output = `${prepend}(?:${input})${append}`;
-  if (state.negated === true) {
-    output = `(?:^(?!${output}).*$)`;
-  }
-  return output;
-};
+/***/ "../../node_modules/follow-redirects/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+var url = __webpack_require__("url");
+var URL = url.URL;
+var http = __webpack_require__("http");
+var https = __webpack_require__("https");
+var Writable = __webpack_require__("stream").Writable;
+var assert = __webpack_require__("assert");
+var debug = __webpack_require__("../../node_modules/follow-redirects/debug.js");
 
-/***/ }),
-/* 404 */
-/***/ (function(module, exports, __webpack_require__) {
+// Create handlers that pass events from native requests
+var events = ["abort", "aborted", "connect", "error", "socket", "timeout"];
+var eventHandlers = Object.create(null);
+events.forEach(function (event) {
+  eventHandlers[event] = function (arg1, arg2, arg3) {
+    this._redirectable.emit(event, arg1, arg2, arg3);
+  };
+});
 
-"use strict";
+// Error types with codes
+var RedirectionError = createErrorType(
+  "ERR_FR_REDIRECTION_FAILURE",
+  "Redirected request failed"
+);
+var TooManyRedirectsError = createErrorType(
+  "ERR_FR_TOO_MANY_REDIRECTS",
+  "Maximum number of redirects exceeded"
+);
+var MaxBodyLengthExceededError = createErrorType(
+  "ERR_FR_MAX_BODY_LENGTH_EXCEEDED",
+  "Request body larger than maxBodyLength limit"
+);
+var WriteAfterEndError = createErrorType(
+  "ERR_STREAM_WRITE_AFTER_END",
+  "write after end"
+);
 
+// An HTTP(S) request that can be redirected
+function RedirectableRequest(options, responseCallback) {
+  // Initialize the request
+  Writable.call(this);
+  this._sanitizeOptions(options);
+  this._options = options;
+  this._ended = false;
+  this._ending = false;
+  this._redirectCount = 0;
+  this._redirects = [];
+  this._requestBodyLength = 0;
+  this._requestBodyBuffers = [];
 
-const path = __webpack_require__(4);
-const WIN_SLASH = '\\\\/';
-const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
+  // Attach a callback if passed
+  if (responseCallback) {
+    this.on("response", responseCallback);
+  }
 
-/**
- * Posix glob regex
- */
+  // React to responses of native requests
+  var self = this;
+  this._onNativeResponse = function (response) {
+    self._processResponse(response);
+  };
 
-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}*?`;
+  // Perform the first request
+  this._performRequest();
+}
+RedirectableRequest.prototype = Object.create(Writable.prototype);
 
-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
+RedirectableRequest.prototype.abort = function () {
+  abortRequest(this._currentRequest);
+  this.emit("abort");
 };
 
-/**
- * Windows glob regex
- */
+// Writes buffered data to the current native request
+RedirectableRequest.prototype.write = function (data, encoding, callback) {
+  // Writing is not allowed if end has been called
+  if (this._ending) {
+    throw new WriteAfterEndError();
+  }
 
-const WINDOWS_CHARS = {
-  ...POSIX_CHARS,
+  // Validate input and shift parameters if necessary
+  if (!(typeof data === "string" || typeof data === "object" && ("length" in data))) {
+    throw new TypeError("data should be a string, Buffer or Uint8Array");
+  }
+  if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
+  }
 
-  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}]|$)`
+  // 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 MaxBodyLengthExceededError());
+    this.abort();
+  }
 };
 
-/**
- * POSIX Bracket Regex
- */
+// 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;
+  }
 
-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'
+  // Write data if needed and end
+  if (!data) {
+    this._ended = this._ending = true;
+    this._currentRequest.end(null, null, callback);
+  }
+  else {
+    var self = this;
+    var currentRequest = this._currentRequest;
+    this.write(data, encoding, function () {
+      self._ended = true;
+      currentRequest.end(null, null, callback);
+    });
+    this._ending = true;
+  }
 };
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
-  POSIX_REGEX_SOURCE,
-
-  // regular expressions
-  REGEX_BACKSLASH: /\\(?![*+?^${}(|)[\]])/g,
-  REGEX_NON_SPECIAL_CHARS: /^[^@![\].,$*+?^{}()|\\/]+/,
-  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: {
-    '***': '*',
-    '**/**': '**',
-    '**/**/**': '**'
-  },
+// 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);
+};
 
-  // Digits
-  CHAR_0: 48, /* 0 */
-  CHAR_9: 57, /* 9 */
+// Clears a header value on the current native request
+RedirectableRequest.prototype.removeHeader = function (name) {
+  delete this._options.headers[name];
+  this._currentRequest.removeHeader(name);
+};
 
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 65, /* A */
-  CHAR_LOWERCASE_A: 97, /* a */
-  CHAR_UPPERCASE_Z: 90, /* Z */
-  CHAR_LOWERCASE_Z: 122, /* z */
+// Global timeout for all underlying requests
+RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
+  var self = this;
 
-  CHAR_LEFT_PARENTHESES: 40, /* ( */
-  CHAR_RIGHT_PARENTHESES: 41, /* ) */
+  // Destroys the socket on timeout
+  function destroyOnTimeout(socket) {
+    socket.setTimeout(msecs);
+    socket.removeListener("timeout", socket.destroy);
+    socket.addListener("timeout", socket.destroy);
+  }
 
-  CHAR_ASTERISK: 42, /* * */
+  // Sets up a timer to trigger a timeout event
+  function startTimer(socket) {
+    if (self._timeout) {
+      clearTimeout(self._timeout);
+    }
+    self._timeout = setTimeout(function () {
+      self.emit("timeout");
+      clearTimer();
+    }, msecs);
+    destroyOnTimeout(socket);
+  }
 
-  // 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 */
+  // Stops a timeout from triggering
+  function clearTimer() {
+    // Clear the timeout
+    if (self._timeout) {
+      clearTimeout(self._timeout);
+      self._timeout = null;
+    }
 
-  SEP: path.sep,
+    // Clean up all attached listeners
+    self.removeListener("abort", clearTimer);
+    self.removeListener("error", clearTimer);
+    self.removeListener("response", clearTimer);
+    if (callback) {
+      self.removeListener("timeout", callback);
+    }
+    if (!self.socket) {
+      self._currentRequest.removeListener("socket", startTimer);
+    }
+  }
 
-  /**
-   * Create EXTGLOB_CHARS
-   */
+  // Attach callback if passed
+  if (callback) {
+    this.on("timeout", callback);
+  }
 
-  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: ')' }
-    };
-  },
+  // Start the timer if or when the socket is opened
+  if (this.socket) {
+    startTimer(this.socket);
+  }
+  else {
+    this._currentRequest.once("socket", startTimer);
+  }
 
-  /**
-   * Create GLOB_CHARS
-   */
+  // Clean up on events
+  this.on("socket", destroyOnTimeout);
+  this.on("abort", clearTimer);
+  this.on("error", clearTimer);
+  this.on("response", clearTimer);
 
-  globChars(win32) {
-    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
-  }
+  return this;
 };
 
+// Proxy all other public ClientRequest methods
+[
+  "flushHeaders", "getHeader",
+  "setNoDelay", "setSocketKeepAlive",
+].forEach(function (method) {
+  RedirectableRequest.prototype[method] = function (a, b) {
+    return this._currentRequest[method](a, b);
+  };
+});
 
-/***/ }),
-/* 405 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+// Proxy all public ClientRequest properties
+["aborted", "connection", "socket"].forEach(function (property) {
+  Object.defineProperty(RedirectableRequest.prototype, property, {
+    get: function () { return this._currentRequest[property]; },
+  });
+});
 
+RedirectableRequest.prototype._sanitizeOptions = function (options) {
+  // Ensure headers are always present
+  if (!options.headers) {
+    options.headers = {};
+  }
 
-const constants = __webpack_require__(404);
-const utils = __webpack_require__(403);
+  // 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;
+  }
 
-/**
- * Constants
- */
+  // 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);
+    }
+  }
+};
 
-const {
-  MAX_LENGTH,
-  POSIX_REGEX_SOURCE,
-  REGEX_NON_SPECIAL_CHARS,
-  REGEX_SPECIAL_CHARS_BACKREF,
-  REPLACEMENTS
-} = constants;
 
-/**
- * Helpers
- */
+// 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 TypeError("Unsupported protocol " + protocol));
+    return;
+  }
 
-const expandRange = (args, options) => {
-  if (typeof options.expandRange === 'function') {
-    return options.expandRange(...args, options);
+  // 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];
   }
 
-  args.sort();
-  const value = `[${args.join('-')}]`;
+  // Create the native request
+  var request = this._currentRequest =
+        nativeProtocol.request(this._options, this._onNativeResponse);
+  this._currentUrl = url.format(this._options);
 
-  try {
-    /* eslint-disable-next-line no-new */
-    new RegExp(value);
-  } catch (ex) {
-    return args.map(v => utils.escapeRegex(v)).join('..');
+  // Set up event handlers
+  request._redirectable = this;
+  for (var e = 0; e < events.length; e++) {
+    request.on(events[e], eventHandlers[events[e]]);
   }
 
-  return value;
+  // 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 self = this;
+    var buffers = this._requestBodyBuffers;
+    (function writeNext(error) {
+      // Only write if this request has not been redirected yet
+      /* istanbul ignore else */
+      if (request === self._currentRequest) {
+        // Report any write errors
+        /* istanbul ignore if */
+        if (error) {
+          self.emit("error", error);
+        }
+        // Write the next buffer if there are still left
+        else if (i < buffers.length) {
+          var buffer = buffers[i++];
+          /* istanbul ignore else */
+          if (!request.finished) {
+            request.write(buffer.data, buffer.encoding, writeNext);
+          }
+        }
+        // End the request if `end` has been called on us
+        else if (self._ended) {
+          request.end();
+        }
+      }
+    }());
+  }
 };
 
-/**
- * Create the message for a syntax error
- */
+// Processes a response from the current native request
+RedirectableRequest.prototype._processResponse = function (response) {
+  // Store the redirected response
+  var statusCode = response.statusCode;
+  if (this._options.trackRedirects) {
+    this._redirects.push({
+      url: this._currentUrl,
+      headers: response.headers,
+      statusCode: statusCode,
+    });
+  }
 
-const syntaxError = (type, char) => {
-  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
-};
+  // 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.
 
-/**
- * Parse the given input string.
- * @param {String} input
- * @param {Object} options
- * @return {Object}
- */
+  // If the response is not a redirect; return it as-is
+  var location = response.headers.location;
+  if (!location || this._options.followRedirects === false ||
+      statusCode < 300 || statusCode >= 400) {
+    response.responseUrl = this._currentUrl;
+    response.redirects = this._redirects;
+    this.emit("response", response);
 
-const parse = (input, options) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
+    // Clean up
+    this._requestBodyBuffers = [];
+    return;
   }
 
-  input = REPLACEMENTS[input] || input;
-
-  const opts = { ...options };
-  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  // The response is a redirect, so abort the current request
+  abortRequest(this._currentRequest);
+  // Discard the remainder of the response to avoid waiting for data
+  response.destroy();
 
-  let len = input.length;
-  if (len > max) {
-    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  // 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 TooManyRedirectsError());
+    return;
   }
 
-  const bos = { type: 'bos', value: '', output: opts.prepend || '' };
-  const tokens = [bos];
+  // RFC7231§6.4: Automatic redirection needs to done with
+  // care for methods not known to be safe, […]
+  // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
+  // the request method from POST to GET for the subsequent request.
+  if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" ||
+      // RFC7231§6.4.4: The 303 (See Other) status code indicates that
+      // the server is redirecting the user agent to a different resource […]
+      // A user agent can perform a retrieval request targeting that URI
+      // (a GET or HEAD request if using HTTP) […]
+      (statusCode === 303) && !/^(?:GET|HEAD)$/.test(this._options.method)) {
+    this._options.method = "GET";
+    // Drop a possible entity and headers related to it
+    this._requestBodyBuffers = [];
+    removeMatchingHeaders(/^content-/i, this._options.headers);
+  }
 
-  const capture = opts.capture ? '' : '?:';
-  const win32 = utils.isWindows(options);
+  // Drop the Host header, as the redirect might lead to a different host
+  var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
 
-  // create constants based on platform, for windows or posix
-  const PLATFORM_CHARS = constants.globChars(win32);
-  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
+  // If the redirect is relative, carry over the host of the last request
+  var currentUrlParts = url.parse(this._currentUrl);
+  var currentHost = currentHostHeader || currentUrlParts.host;
+  var currentUrl = /^\w+:/.test(location) ? this._currentUrl :
+    url.format(Object.assign(currentUrlParts, { host: currentHost }));
 
-  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;
+  // Determine the URL of the redirection
+  var redirectUrl;
+  try {
+    redirectUrl = url.resolve(currentUrl, location);
+  }
+  catch (cause) {
+    this.emit("error", new RedirectionError(cause));
+    return;
+  }
 
-  const globstar = opts => {
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+  // Create the redirected request
+  debug("redirecting to", redirectUrl);
+  this._isRedirect = true;
+  var redirectUrlParts = url.parse(redirectUrl);
+  Object.assign(this._options, redirectUrlParts);
 
-  const nodot = opts.dot ? '' : NO_DOT;
-  const qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
-  let star = opts.bash === true ? globstar(opts) : STAR;
+  // Drop confidential headers when redirecting to a less secure protocol
+  // or to a different domain that is not a superdomain
+  if (redirectUrlParts.protocol !== currentUrlParts.protocol &&
+     redirectUrlParts.protocol !== "https:" ||
+     redirectUrlParts.host !== currentHost &&
+     !isSubdomain(redirectUrlParts.host, currentHost)) {
+    removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
+  }
 
-  if (opts.capture) {
-    star = `(${star})`;
+  // Evaluate the beforeRedirect callback
+  if (typeof this._options.beforeRedirect === "function") {
+    var responseDetails = { headers: response.headers };
+    try {
+      this._options.beforeRedirect.call(null, this._options, responseDetails);
+    }
+    catch (err) {
+      this.emit("error", err);
+      return;
+    }
+    this._sanitizeOptions(this._options);
   }
 
-  // minimatch options support
-  if (typeof opts.noext === 'boolean') {
-    opts.noextglob = opts.noext;
+  // Perform the redirected request
+  try {
+    this._performRequest();
+  }
+  catch (cause) {
+    this.emit("error", new RedirectionError(cause));
   }
+};
 
-  const state = {
-    input,
-    index: -1,
-    start: 0,
-    dot: opts.dot === true,
-    consumed: '',
-    output: '',
-    prefix: '',
-    backtrack: false,
-    negated: false,
-    brackets: 0,
-    braces: 0,
-    parens: 0,
-    quotes: 0,
-    globstar: false,
-    tokens
+// Wraps the key/value object of protocols with redirect functionality
+function wrap(protocols) {
+  // Default settings
+  var exports = {
+    maxRedirects: 21,
+    maxBodyLength: 10 * 1024 * 1024,
   };
 
-  input = utils.removePrefix(input, state);
-  len = input.length;
-
-  const extglobs = [];
-  const braces = [];
-  const stack = [];
-  let prev = bos;
-  let value;
-
-  /**
-   * Tokenizing helpers
-   */
-
-  const eos = () => state.index === len - 1;
-  const peek = state.peek = (n = 1) => input[state.index + n];
-  const advance = state.advance = () => input[++state.index] || '';
-  const remaining = () => input.slice(state.index + 1);
-  const consume = (value = '', num = 0) => {
-    state.consumed += value;
-    state.index += num;
-  };
+  // 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);
 
-  const append = token => {
-    state.output += token.output != null ? token.output : token.value;
-    consume(token.value);
-  };
+    // Executes a request, following redirects
+    function request(input, options, callback) {
+      // Parse parameters
+      if (typeof input === "string") {
+        var urlStr = input;
+        try {
+          input = urlToOptions(new URL(urlStr));
+        }
+        catch (err) {
+          /* istanbul ignore next */
+          input = url.parse(urlStr);
+        }
+      }
+      else if (URL && (input instanceof URL)) {
+        input = urlToOptions(input);
+      }
+      else {
+        callback = options;
+        options = input;
+        input = { protocol: protocol };
+      }
+      if (typeof options === "function") {
+        callback = options;
+        options = null;
+      }
 
-  const negate = () => {
-    let count = 1;
+      // Set defaults
+      options = Object.assign({
+        maxRedirects: exports.maxRedirects,
+        maxBodyLength: exports.maxBodyLength,
+      }, input, options);
+      options.nativeProtocols = nativeProtocols;
 
-    while (peek() === '!' && (peek(2) !== '(' || peek(3) === '?')) {
-      advance();
-      state.start++;
-      count++;
+      assert.equal(options.protocol, protocol, "protocol mismatch");
+      debug("options", options);
+      return new RedirectableRequest(options, callback);
     }
 
-    if (count % 2 === 0) {
-      return false;
+    // Executes a GET request, following redirects
+    function get(input, options, callback) {
+      var wrappedRequest = wrappedProtocol.request(input, options, callback);
+      wrappedRequest.end();
+      return wrappedRequest;
     }
 
-    state.negated = true;
-    state.start++;
-    return true;
-  };
+    // Expose the properties on the wrapped protocol
+    Object.defineProperties(wrappedProtocol, {
+      request: { value: request, configurable: true, enumerable: true, writable: true },
+      get: { value: get, configurable: true, enumerable: true, writable: true },
+    });
+  });
+  return exports;
+}
 
-  const increment = type => {
-    state[type]++;
-    stack.push(type);
-  };
+/* istanbul ignore next */
+function noop() { /* empty */ }
 
-  const decrement = type => {
-    state[type]--;
-    stack.pop();
+// from https://github.com/nodejs/node/blob/master/lib/internal/url.js
+function urlToOptions(urlObject) {
+  var options = {
+    protocol: urlObject.protocol,
+    hostname: urlObject.hostname.startsWith("[") ?
+      /* istanbul ignore next */
+      urlObject.hostname.slice(1, -1) :
+      urlObject.hostname,
+    hash: urlObject.hash,
+    search: urlObject.search,
+    pathname: urlObject.pathname,
+    path: urlObject.pathname + urlObject.search,
+    href: urlObject.href,
   };
+  if (urlObject.port !== "") {
+    options.port = Number(urlObject.port);
+  }
+  return options;
+}
 
-  /**
-   * 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') {
-      const isBrace = state.braces > 0 && (tok.type === 'comma' || tok.type === 'brace');
-      const isExtglob = tok.extglob === true || (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 removeMatchingHeaders(regex, headers) {
+  var lastValue;
+  for (var header in headers) {
+    if (regex.test(header)) {
+      lastValue = headers[header];
+      delete headers[header];
     }
+  }
+  return (lastValue === null || typeof lastValue === "undefined") ?
+    undefined : String(lastValue).trim();
+}
 
-    if (extglobs.length && tok.type !== 'paren') {
-      extglobs[extglobs.length - 1].inner += tok.value;
+function createErrorType(code, defaultMessage) {
+  function CustomError(cause) {
+    Error.captureStackTrace(this, this.constructor);
+    if (!cause) {
+      this.message = defaultMessage;
     }
-
-    if (tok.value || tok.output) append(tok);
-    if (prev && prev.type === 'text' && tok.type === 'text') {
-      prev.value += tok.value;
-      prev.output = (prev.output || '') + tok.value;
-      return;
+    else {
+      this.message = defaultMessage + ": " + cause.message;
+      this.cause = cause;
     }
+  }
+  CustomError.prototype = new Error();
+  CustomError.prototype.constructor = CustomError;
+  CustomError.prototype.name = "Error [" + code + "]";
+  CustomError.prototype.code = code;
+  return CustomError;
+}
 
-    tok.prev = prev;
-    tokens.push(tok);
-    prev = tok;
-  };
-
-  const extglobOpen = (type, value) => {
-    const token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
-
-    token.prev = prev;
-    token.parens = state.parens;
-    token.output = state.output;
-    const output = (opts.capture ? '(' : '') + token.open;
+function abortRequest(request) {
+  for (var e = 0; e < events.length; e++) {
+    request.removeListener(events[e], eventHandlers[events[e]]);
+  }
+  request.on("error", noop);
+  request.abort();
+}
 
-    increment('parens');
-    push({ type, value, output: state.output ? '' : ONE_CHAR });
-    push({ type: 'paren', extglob: true, value: advance(), output });
-    extglobs.push(token);
-  };
+function isSubdomain(subdomain, domain) {
+  const dot = subdomain.length - domain.length - 1;
+  return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
+}
 
-  const extglobClose = token => {
-    let output = token.close + (opts.capture ? ')' : '');
-    let rest;
+// Exports
+module.exports = wrap({ http: http, https: https });
+module.exports.wrap = wrap;
 
-    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(remaining())) {
-        output = token.close = `)$))${extglobStar}`;
-      }
+/***/ "../../node_modules/fs.realpath/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (token.inner.includes('*') && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-        output = token.close = `)${rest})${extglobStar})`;
-      }
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
 
-      if (token.prev.type === 'bos') {
-        state.negatedExtglob = true;
-      }
-    }
+var fs = __webpack_require__("fs")
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
 
-    push({ type: 'paren', extglob: true, value, output });
-    decrement('parens');
-  };
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__("../../node_modules/fs.realpath/old.js")
 
-  /**
-   * Fast paths
-   */
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
 
-  if (opts.fastpaths !== false && !/(^[*!]|[/()[\]{}"])/.test(input)) {
-    let backslashes = false;
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
 
-    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
-      if (first === '\\') {
-        backslashes = true;
-        return m;
-      }
-
-      if (first === '?') {
-        if (esc) {
-          return esc + first + (rest ? QMARK.repeat(rest.length) : '');
-        }
-        if (index === 0) {
-          return qmarkNoDot + (rest ? QMARK.repeat(rest.length) : '');
-        }
-        return QMARK.repeat(chars.length);
-      }
-
-      if (first === '.') {
-        return DOT_LITERAL.repeat(chars.length);
-      }
-
-      if (first === '*') {
-        if (esc) {
-          return esc + first + (rest ? star : '');
-        }
-        return star;
-      }
-      return esc ? m : `\\${m}`;
-    });
-
-    if (backslashes === true) {
-      if (opts.unescape === true) {
-        output = output.replace(/\\/g, '');
-      } else {
-        output = output.replace(/\\+/g, m => {
-          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
-        });
-      }
+  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)
     }
+  })
+}
 
-    if (output === input && opts.contains === true) {
-      state.output = input;
-      return state;
-    }
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
 
-    state.output = utils.wrapOutput(output, state, options);
-    return state;
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
   }
+}
 
-  /**
-   * Tokenize input until we reach end-of-string
-   */
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
 
-  while (!eos()) {
-    value = advance();
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
 
-    if (value === '\u0000') {
-      continue;
-    }
 
-    /**
-     * Escaped characters
-     */
+/***/ }),
 
-    if (value === '\\') {
-      const next = peek();
+/***/ "../../node_modules/fs.realpath/old.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (next === '/' && opts.bash !== true) {
-        continue;
-      }
+// 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.
 
-      if (next === '.' || next === ';') {
-        continue;
-      }
+var pathModule = __webpack_require__("path");
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__("fs");
 
-      if (!next) {
-        value += '\\';
-        push({ type: 'text', value });
-        continue;
-      }
+// JavaScript implementation of realpath, ported from node pre-v6
 
-      // collapse slashes to reduce potential for exploits
-      const match = /^\\+/.exec(remaining());
-      let slashes = 0;
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
 
-      if (match && match[0].length > 2) {
-        slashes = match[0].length;
-        state.index += slashes;
-        if (slashes % 2 !== 0) {
-          value += '\\';
-        }
-      }
+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;
 
-      if (opts.unescape === true) {
-        value = advance();
-      } else {
-        value += advance();
-      }
+  return callback;
 
-      if (state.brackets === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
     }
+  }
 
-    /**
-     * If we're inside a regex character class, continue
-     * until we reach the closing bracket.
-     */
+  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);
+      }
+    }
+  }
+}
 
-    if (state.brackets > 0 && (value !== ']' || prev.value === '[' || prev.value === '[^')) {
-      if (opts.posix !== false && value === ':') {
-        const inner = prev.value.slice(1);
-        if (inner.includes('[')) {
-          prev.posix = true;
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
+}
 
-          if (inner.includes(':')) {
-            const idx = prev.value.lastIndexOf('[');
-            const pre = prev.value.slice(0, idx);
-            const rest = prev.value.slice(idx + 2);
-            const posix = POSIX_REGEX_SOURCE[rest];
-            if (posix) {
-              prev.value = pre + posix;
-              state.backtrack = true;
-              advance();
+var normalize = pathModule.normalize;
 
-              if (!bos.output && tokens.indexOf(prev) === 1) {
-                bos.output = ONE_CHAR;
-              }
-              continue;
-            }
-          }
-        }
-      }
+// 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 ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
-        value = `\\${value}`;
-      }
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
+}
 
-      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
-        value = `\\${value}`;
-      }
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-      if (opts.posix === true && value === '!' && prev.value === '[') {
-        value = '^';
-      }
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
 
-      prev.value += value;
-      append({ value });
-      continue;
-    }
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-    /**
-     * If we're inside a quoted string, continue
-     * until we reach the closing double quote.
-     */
+  // 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;
 
-    if (state.quotes === 1 && value !== '"') {
-      value = utils.escapeRegex(value);
-      prev.value += value;
-      append({ value });
-      continue;
-    }
+  start();
 
-    /**
-     * Double quotes
-     */
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
-    if (value === '"') {
-      state.quotes = state.quotes === 1 ? 0 : 1;
-      if (opts.keepQuotes === true) {
-        push({ type: 'text', value });
-      }
-      continue;
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstatSync(base);
+      knownHard[base] = true;
     }
+  }
 
-    /**
-     * Parentheses
-     */
+  // 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 (value === '(') {
-      increment('parens');
-      push({ type: 'paren', value });
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
       continue;
     }
 
-    if (value === ')') {
-      if (state.parens === 0 && opts.strictBrackets === true) {
-        throw new SyntaxError(syntaxError('opening', '('));
-      }
-
-      const extglob = extglobs[extglobs.length - 1];
-      if (extglob && state.parens === extglob.parens + 1) {
-        extglobClose(extglobs.pop());
+    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;
       }
 
-      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
-      decrement('parens');
-      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;
     }
 
-    /**
-     * Square brackets
-     */
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
 
-    if (value === '[') {
-      if (opts.nobracket === true || !remaining().includes(']')) {
-        if (opts.nobracket !== true && opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('closing', ']'));
-        }
+  if (cache) cache[original] = p;
 
-        value = `\\${value}`;
-      } else {
-        increment('brackets');
-      }
+  return p;
+};
 
-      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;
-      }
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
 
-      if (state.brackets === 0) {
-        if (opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('opening', '['));
-        }
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-        push({ type: 'text', value, output: `\\${value}` });
-        continue;
-      }
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
 
-      decrement('brackets');
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-      const prevValue = prev.value.slice(1);
-      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
-        value = `/${value}`;
-      }
+  // 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;
 
-      prev.value += value;
-      append({ value });
+  start();
 
-      // when literal brackets are explicitly disabled
-      // assume we should match with a regex character class
-      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
-        continue;
-      }
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
-      const escaped = utils.escapeRegex(prev.value);
-      state.output = state.output.slice(0, -prev.value.length);
+    // 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);
+    }
+  }
 
-      // 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;
-      }
+  // 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);
+    }
 
-      // when the user specifies nothing, try to match both
-      prev.value = `(${capture}${escaped}|${prev.value})`;
-      state.output += prev.value;
-      continue;
+    // 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);
     }
 
-    /**
-     * Braces
-     */
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
+    }
 
-    if (value === '{' && opts.nobrace !== true) {
-      increment('braces');
+    return fs.lstat(base, gotStat);
+  }
 
-      const open = {
-        type: 'brace',
-        value,
-        output: '(',
-        outputIndex: state.output.length,
-        tokensIndex: state.tokens.length
-      };
+  function gotStat(err, stat) {
+    if (err) return cb(err);
 
-      braces.push(open);
-      push(open);
-      continue;
+    // 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 (value === '}') {
-      const brace = braces[braces.length - 1];
-
-      if (opts.nobrace === true || !brace) {
-        push({ type: 'text', value, output: value });
-        continue;
+    // 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);
 
-      let output = ')';
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
 
-      if (brace.dots === true) {
-        const arr = tokens.slice();
-        const range = [];
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
 
-        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);
-          }
-        }
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
 
-        output = expandRange(range, opts);
-        state.backtrack = true;
-      }
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+};
 
-      if (brace.comma !== true && brace.dots !== true) {
-        const out = state.output.slice(0, brace.outputIndex);
-        const toks = state.tokens.slice(brace.tokensIndex);
-        brace.value = brace.output = '\\{';
-        value = output = '\\}';
-        state.output = out;
-        for (const t of toks) {
-          state.output += (t.output || t.value);
-        }
-      }
 
-      push({ type: 'brace', value, output });
-      decrement('braces');
-      braces.pop();
-      continue;
-    }
+/***/ }),
 
-    /**
-     * Pipes
-     */
+/***/ "../../node_modules/function-bind/implementation.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (value === '|') {
-      if (extglobs.length > 0) {
-        extglobs[extglobs.length - 1].conditions++;
-      }
-      push({ type: 'text', value });
-      continue;
-    }
+"use strict";
 
-    /**
-     * Commas
-     */
 
-    if (value === ',') {
-      let output = value;
+/* eslint no-invalid-this: 1 */
 
-      const brace = braces[braces.length - 1];
-      if (brace && stack[stack.length - 1] === 'braces') {
-        brace.comma = true;
-        output = '|';
-      }
+var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
+var slice = Array.prototype.slice;
+var toStr = Object.prototype.toString;
+var funcType = '[object Function]';
 
-      push({ type: 'comma', value, output });
-      continue;
+module.exports = function bind(that) {
+    var target = this;
+    if (typeof target !== 'function' || toStr.call(target) !== funcType) {
+        throw new TypeError(ERROR_MESSAGE + target);
     }
+    var args = slice.call(arguments, 1);
 
-    /**
-     * Slashes
-     */
-
-    if (value === '/') {
-      // if the beginning of the glob is "./", advance the start
-      // to the current index, and don't add the "./" characters
-      // to the state. This greatly simplifies lookbehinds when
-      // checking for BOS characters like "!" and "." (not "./")
-      if (prev.type === 'dot' && state.index === state.start + 1) {
-        state.start = state.index + 1;
-        state.consumed = '';
-        state.output = '';
-        tokens.pop();
-        prev = bos; // reset "prev" to the first token
-        continue;
-      }
+    var bound;
+    var binder = function () {
+        if (this instanceof bound) {
+            var result = target.apply(
+                this,
+                args.concat(slice.call(arguments))
+            );
+            if (Object(result) === result) {
+                return result;
+            }
+            return this;
+        } else {
+            return target.apply(
+                that,
+                args.concat(slice.call(arguments))
+            );
+        }
+    };
 
-      push({ type: 'slash', value, output: SLASH_LITERAL });
-      continue;
+    var boundLength = Math.max(0, target.length - args.length);
+    var boundArgs = [];
+    for (var i = 0; i < boundLength; i++) {
+        boundArgs.push('$' + i);
     }
 
-    /**
-     * Dots
-     */
+    bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
 
-    if (value === '.') {
-      if (state.braces > 0 && prev.type === 'dot') {
-        if (prev.value === '.') prev.output = DOT_LITERAL;
-        const brace = braces[braces.length - 1];
-        prev.type = 'dots';
-        prev.output += value;
-        prev.value += value;
-        brace.dots = true;
-        continue;
-      }
+    if (target.prototype) {
+        var Empty = function Empty() {};
+        Empty.prototype = target.prototype;
+        bound.prototype = new Empty();
+        Empty.prototype = null;
+    }
 
-      if ((state.braces + state.parens) === 0 && prev.type !== 'bos' && prev.type !== 'slash') {
-        push({ type: 'text', value, output: DOT_LITERAL });
-        continue;
-      }
+    return bound;
+};
 
-      push({ type: 'dot', value, output: DOT_LITERAL });
-      continue;
-    }
 
-    /**
-     * Question marks
-     */
+/***/ }),
 
-    if (value === '?') {
-      const isGroup = prev && prev.value === '(';
-      if (!isGroup && opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('qmark', value);
-        continue;
-      }
+/***/ "../../node_modules/function-bind/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (prev && prev.type === 'paren') {
-        const next = peek();
-        let output = value;
+"use strict";
 
-        if (next === '<' && !utils.supportsLookbehinds()) {
-          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
-        }
 
-        if ((prev.value === '(' && !/[!=<:]/.test(next)) || (next === '<' && !/<([!=]|\w+>)/.test(remaining()))) {
-          output = `\\${value}`;
-        }
+var implementation = __webpack_require__("../../node_modules/function-bind/implementation.js");
 
-        push({ type: 'text', value, output });
-        continue;
-      }
+module.exports = Function.prototype.bind || implementation;
 
-      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
-        push({ type: 'qmark', value, output: QMARK_NO_DOT });
-        continue;
-      }
 
-      push({ type: 'qmark', value, output: QMARK });
-      continue;
-    }
+/***/ }),
 
-    /**
-     * Exclamation
-     */
+/***/ "../../node_modules/get-stream/buffer-stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (value === '!') {
-      if (opts.noextglob !== true && peek() === '(') {
-        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
-          extglobOpen('negate', value);
-          continue;
-        }
-      }
+"use strict";
 
-      if (opts.nonegate !== true && state.index === 0) {
-        negate();
-        continue;
-      }
-    }
+const {PassThrough: PassThroughStream} = __webpack_require__("stream");
 
-    /**
-     * Plus
-     */
+module.exports = options => {
+	options = {...options};
 
-    if (value === '+') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('plus', value);
-        continue;
-      }
+	const {array} = options;
+	let {encoding} = options;
+	const isBuffer = encoding === 'buffer';
+	let objectMode = false;
 
-      if ((prev && prev.value === '(') || opts.regex === false) {
-        push({ type: 'plus', value, output: PLUS_LITERAL });
-        continue;
-      }
+	if (array) {
+		objectMode = !(encoding || isBuffer);
+	} else {
+		encoding = encoding || 'utf8';
+	}
 
-      if ((prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) || state.parens > 0) {
-        push({ type: 'plus', value });
-        continue;
-      }
+	if (isBuffer) {
+		encoding = null;
+	}
 
-      push({ type: 'plus', value: PLUS_LITERAL });
-      continue;
-    }
+	const stream = new PassThroughStream({objectMode});
 
-    /**
-     * Plain text
-     */
+	if (encoding) {
+		stream.setEncoding(encoding);
+	}
 
-    if (value === '@') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        push({ type: 'at', extglob: true, value, output: '' });
-        continue;
-      }
+	let length = 0;
+	const chunks = [];
 
-      push({ type: 'text', value });
-      continue;
-    }
+	stream.on('data', chunk => {
+		chunks.push(chunk);
 
-    /**
-     * Plain text
-     */
+		if (objectMode) {
+			length = chunks.length;
+		} else {
+			length += chunk.length;
+		}
+	});
 
-    if (value !== '*') {
-      if (value === '$' || value === '^') {
-        value = `\\${value}`;
-      }
+	stream.getBufferedValue = () => {
+		if (array) {
+			return chunks;
+		}
 
-      const match = REGEX_NON_SPECIAL_CHARS.exec(remaining());
-      if (match) {
-        value += match[0];
-        state.index += match[0].length;
-      }
+		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
+	};
 
-      push({ type: 'text', value });
-      continue;
-    }
+	stream.getBufferedLength = () => length;
 
-    /**
-     * Stars
-     */
+	return stream;
+};
 
-    if (prev && (prev.type === 'globstar' || prev.star === true)) {
-      prev.type = 'star';
-      prev.star = true;
-      prev.value += value;
-      prev.output = star;
-      state.backtrack = true;
-      state.globstar = true;
-      consume(value);
-      continue;
-    }
 
-    let rest = remaining();
-    if (opts.noextglob !== true && /^\([^?]/.test(rest)) {
-      extglobOpen('star', value);
-      continue;
-    }
+/***/ }),
 
-    if (prev.type === 'star') {
-      if (opts.noglobstar === true) {
-        consume(value);
-        continue;
-      }
+/***/ "../../node_modules/get-stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      const prior = prev.prev;
-      const before = prior.prev;
-      const isStart = prior.type === 'slash' || prior.type === 'bos';
-      const afterStar = before && (before.type === 'star' || before.type === 'globstar');
+"use strict";
 
-      if (opts.bash === true && (!isStart || (rest[0] && rest[0] !== '/'))) {
-        push({ type: 'star', value, output: '' });
-        continue;
-      }
+const pump = __webpack_require__("../../node_modules/pump/index.js");
+const bufferStream = __webpack_require__("../../node_modules/get-stream/buffer-stream.js");
 
-      const isBrace = state.braces > 0 && (prior.type === 'comma' || prior.type === 'brace');
-      const isExtglob = extglobs.length && (prior.type === 'pipe' || prior.type === 'paren');
-      if (!isStart && prior.type !== 'paren' && !isBrace && !isExtglob) {
-        push({ type: 'star', value, output: '' });
-        continue;
-      }
+class MaxBufferError extends Error {
+	constructor() {
+		super('maxBuffer exceeded');
+		this.name = 'MaxBufferError';
+	}
+}
 
-      // strip consecutive `/**/`
-      while (rest.slice(0, 3) === '/**') {
-        const after = input[state.index + 4];
-        if (after && after !== '/') {
-          break;
-        }
-        rest = rest.slice(3);
-        consume('/**', 3);
-      }
+async function getStream(inputStream, options) {
+	if (!inputStream) {
+		return Promise.reject(new Error('Expected a stream'));
+	}
 
-      if (prior.type === 'bos' && eos()) {
-        prev.type = 'globstar';
-        prev.value += value;
-        prev.output = globstar(opts);
-        state.output = prev.output;
-        state.globstar = true;
-        consume(value);
-        continue;
-      }
+	options = {
+		maxBuffer: Infinity,
+		...options
+	};
 
-      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}`;
+	const {maxBuffer} = options;
 
-        prev.type = 'globstar';
-        prev.output = globstar(opts) + (opts.strictSlashes ? ')' : '|$)');
-        prev.value += value;
-        state.globstar = true;
-        state.output += prior.output + prev.output;
-        consume(value);
-        continue;
-      }
+	let stream;
+	await new Promise((resolve, reject) => {
+		const rejectPromise = error => {
+			if (error) { // A null check
+				error.bufferedData = stream.getBufferedValue();
+			}
 
-      if (prior.type === 'slash' && prior.prev.type !== 'bos' && rest[0] === '/') {
-        const end = rest[1] !== void 0 ? '|$' : '';
+			reject(error);
+		};
 
-        state.output = state.output.slice(0, -(prior.output + prev.output).length);
-        prior.output = `(?:${prior.output}`;
+		stream = pump(inputStream, bufferStream(options), error => {
+			if (error) {
+				rejectPromise(error);
+				return;
+			}
 
-        prev.type = 'globstar';
-        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
-        prev.value += value;
+			resolve();
+		});
 
-        state.output += prior.output + prev.output;
-        state.globstar = true;
+		stream.on('data', () => {
+			if (stream.getBufferedLength() > maxBuffer) {
+				rejectPromise(new MaxBufferError());
+			}
+		});
+	});
 
-        consume(value + advance());
+	return stream.getBufferedValue();
+}
 
-        push({ type: 'slash', value: '/', output: '' });
-        continue;
-      }
+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;
 
-      if (prior.type === 'bos' && rest[0] === '/') {
-        prev.type = 'globstar';
-        prev.value += value;
-        prev.output = `(?:^|${SLASH_LITERAL}|${globstar(opts)}${SLASH_LITERAL})`;
-        state.output = prev.output;
-        state.globstar = true;
-        consume(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;
+/***/ "../../node_modules/getopts/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      // reset output with globstar
-      state.output += prev.output;
-      state.globstar = true;
-      consume(value);
-      continue;
-    }
+"use strict";
 
-    const token = { type: 'star', value, output: star };
 
-    if (opts.bash === true) {
-      token.output = '.*?';
-      if (prev.type === 'bos' || prev.type === 'slash') {
-        token.output = nodot + token.output;
-      }
-      push(token);
-      continue;
-    }
+const EMPTYARR = []
+const SHORTSPLIT = /$|[!-@[-`{-~][\s\S]*/g
+const isArray = Array.isArray
 
-    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
-      token.output = value;
-      push(token);
-      continue;
-    }
+const parseValue = function(any) {
+  if (any === "") return ""
+  if (any === "false") return false
+  const maybe = Number(any)
+  return maybe * 0 === 0 ? maybe : any
+}
 
-    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;
+const parseAlias = function(aliases) {
+  let out = {},
+    key,
+    alias,
+    prev,
+    len,
+    any,
+    i,
+    k
 
-      } else if (opts.dot === true) {
-        state.output += NO_DOTS_SLASH;
-        prev.output += NO_DOTS_SLASH;
+  for (key in aliases) {
+    any = aliases[key]
+    alias = out[key] = isArray(any) ? any : [any]
 
-      } else {
-        state.output += nodot;
-        prev.output += nodot;
-      }
+    for (i = 0, len = alias.length; i < len; i++) {
+      prev = out[alias[i]] = [key]
 
-      if (peek() !== '*') {
-        state.output += ONE_CHAR;
-        prev.output += ONE_CHAR;
+      for (k = 0; k < len; k++) {
+        if (i !== k) prev.push(alias[k])
       }
     }
-
-    push(token);
   }
 
-  while (state.brackets > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
-    state.output = utils.escapeLast(state.output, '[');
-    decrement('brackets');
-  }
+  return out
+}
 
-  while (state.parens > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
-    state.output = utils.escapeLast(state.output, '(');
-    decrement('parens');
-  }
+const parseDefault = function(aliases, defaults) {
+  let out = {},
+    key,
+    alias,
+    value,
+    len,
+    i
 
-  while (state.braces > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
-    state.output = utils.escapeLast(state.output, '{');
-    decrement('braces');
-  }
+  for (key in defaults) {
+    value = defaults[key]
+    alias = aliases[key]
 
-  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
-    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
+    out[key] = value
+
+    if (alias === undefined) {
+      aliases[key] = EMPTYARR
+    } else {
+      for (i = 0, len = alias.length; i < len; i++) {
+        out[alias[i]] = value
+      }
+    }
   }
 
-  // rebuild the output if we had to backtrack at any point
-  if (state.backtrack === true) {
-    state.output = '';
+  return out
+}
 
-    for (const token of state.tokens) {
-      state.output += token.output != null ? token.output : token.value;
+const parseOptions = function(aliases, options, value) {
+  let out = {},
+    key,
+    alias,
+    len,
+    end,
+    i,
+    k
 
-      if (token.suffix) {
-        state.output += token.suffix;
+  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 state;
-};
+  return out
+}
 
-/**
- * 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 write = function(out, key, value, aliases, unknown) {
+  let i,
+    prev,
+    alias = aliases[key],
+    len = alias === undefined ? -1 : alias.length
 
-parse.fastpaths = (input, options) => {
-  const opts = { ...options };
-  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
-  const len = input.length;
-  if (len > max) {
-    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  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]
+    }
   }
+}
 
-  input = REPLACEMENTS[input] || input;
-  const win32 = utils.isWindows(options);
+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
 
-  // 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);
+  for (; i < len; i++) {
+    arg = argv[i]
 
-  const nodot = opts.dot ? NO_DOTS : NO_DOT;
-  const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
-  const capture = opts.capture ? '' : '?:';
-  const state = { negated: false, prefix: '' };
-  let star = opts.bash === true ? '.*?' : STAR;
+    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]
 
-  if (opts.capture) {
-    star = `(${star})`;
+      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
+        )
+      }
+    }
   }
 
-  const globstar = opts => {
-    if (opts.noglobstar === true) return star;
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
-
-  const create = str => {
-    switch (str) {
-      case '*':
-        return `${nodot}${ONE_CHAR}${star}`;
+  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] = ""
 
-      case '.*':
-        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
+  return out
+}
 
-      case '*.*':
-        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+module.exports = getopts
 
-      case '*/*':
-        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
 
-      case '**':
-        return nodot + globstar(opts);
+/***/ }),
 
-      case '**/*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
+/***/ "../../node_modules/git-hooks-list/index.json":
+/***/ (function(module) {
 
-      case '**/*.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+module.exports = JSON.parse("[\"applypatch-msg\",\"pre-applypatch\",\"post-applypatch\",\"pre-commit\",\"pre-merge-commit\",\"prepare-commit-msg\",\"commit-msg\",\"post-commit\",\"pre-rebase\",\"post-checkout\",\"post-merge\",\"pre-push\",\"pre-receive\",\"update\",\"post-receive\",\"post-update\",\"push-to-checkout\",\"pre-auto-gc\",\"post-rewrite\",\"sendemail-validate\",\"fsmonitor-watchman\",\"p4-pre-submit\",\"post-index-change\"]");
 
-      case '**/.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
+/***/ }),
 
-      default: {
-        const match = /^(.*?)\.(\w+)$/.exec(str);
-        if (!match) return;
+/***/ "../../node_modules/glob-parent/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        const source = create(match[1]);
-        if (!source) return;
+"use strict";
 
-        return source + DOT_LITERAL + match[2];
-      }
-    }
-  };
 
-  const output = utils.removePrefix(input, state);
-  let source = create(output);
+var isGlob = __webpack_require__("../../node_modules/is-glob/index.js");
+var pathPosixDirname = __webpack_require__("path").posix.dirname;
+var isWin32 = __webpack_require__("os").platform() === 'win32';
 
-  if (source && opts.strictSlashes !== true) {
-    source += `${SLASH_LITERAL}?`;
-  }
+var slash = '/';
+var backslash = /\\/g;
+var enclosure = /[\{\[].*[\}\]]$/;
+var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
+var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
 
-  return source;
-};
+/**
+ * @param {string} str
+ * @param {Object} opts
+ * @param {boolean} [opts.flipBackslashes=true]
+ * @returns {string}
+ */
+module.exports = function globParent(str, opts) {
+  var options = Object.assign({ flipBackslashes: true }, opts);
 
-module.exports = parse;
+  // flip windows path separators
+  if (options.flipBackslashes && 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;
+  }
 
-/***/ }),
-/* 406 */
-/***/ (function(module, exports, __webpack_require__) {
+  // preserves full path in case of trailing path separator
+  str += 'a';
 
-"use strict";
+  // remove path parts that are globby
+  do {
+    str = pathPosixDirname(str);
+  } while (isGlob(str) || globby.test(str));
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = void 0;
-const merge2 = __webpack_require__(364);
-function merge(streams) {
-    const mergedStream = merge2(streams);
-    streams.forEach((stream) => {
-        stream.once('error', (error) => mergedStream.emit('error', error));
-    });
-    mergedStream.once('close', () => propagateCloseEventToSources(streams));
-    mergedStream.once('end', () => propagateCloseEventToSources(streams));
-    return mergedStream;
-}
-exports.merge = merge;
-function propagateCloseEventToSources(streams) {
-    streams.forEach((stream) => stream.emit('close'));
-}
+  // remove escape chars and return result
+  return str.replace(escaped, '$1');
+};
 
 
 /***/ }),
-/* 407 */
+
+/***/ "../../node_modules/glob/common.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+exports.setopts = setopts
+exports.ownProp = ownProp
+exports.makeAbs = makeAbs
+exports.finish = finish
+exports.mark = mark
+exports.isIgnored = isIgnored
+exports.childrenIgnored = childrenIgnored
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.isString = void 0;
-function isString(input) {
-    return typeof input === 'string';
-}
-exports.isString = isString;
-function isEmpty(input) {
-    return input === '';
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
 }
-exports.isEmpty = isEmpty;
 
+var fs = __webpack_require__("fs")
+var path = __webpack_require__("path")
+var minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js")
+var isAbsolute = __webpack_require__("../../node_modules/path-is-absolute/index.js")
+var Minimatch = minimatch.Minimatch
 
-/***/ }),
-/* 408 */
-/***/ (function(module, exports, __webpack_require__) {
+function alphasort (a, b) {
+  return a.localeCompare(b, 'en')
+}
 
-"use strict";
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(409);
-const provider_1 = __webpack_require__(436);
-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);
-    }
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
+
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
+  }
 }
-exports.default = ProviderAsync;
 
+// 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 })
+  }
 
-/***/ }),
-/* 409 */
-/***/ (function(module, exports, __webpack_require__) {
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
 
-"use strict";
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(294);
-const fsStat = __webpack_require__(410);
-const fsWalk = __webpack_require__(415);
-const reader_1 = __webpack_require__(435);
-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) => {
-                return error === null ? resolve(stats) : reject(error);
-            });
-        });
+  // base-matching: just use globstar for that.
+  if (options.matchBase && -1 === pattern.indexOf("/")) {
+    if (options.noglobstar) {
+      throw new Error("base matching requires globstar")
     }
-}
-exports.default = ReaderStream;
+    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
+  self.fs = options.fs || fs
 
-/***/ }),
-/* 410 */
-/***/ (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 async = __webpack_require__(411);
-const sync = __webpack_require__(412);
-const settings_1 = __webpack_require__(413);
-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);
-}
+  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
+  }
 
-/***/ }),
-/* 411 */
-/***/ (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 });
-function read(path, settings, callback) {
-    settings.fs.lstat(path, (lstatError, lstat) => {
-        if (lstatError !== null) {
-            return callFailureCallback(callback, lstatError);
-        }
-        if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
-            return callSuccessCallback(callback, lstat);
-        }
-        settings.fs.stat(path, (statError, stat) => {
-            if (statError !== null) {
-                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);
-}
+  // 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
 
-/***/ }),
-/* 412 */
-/***/ (function(module, exports, __webpack_require__) {
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
 
-"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;
+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
+        })
+    }
+  }
 
-/***/ }),
-/* 413 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!nou)
+    all = Object.keys(all)
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(414);
-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;
+  if (!self.nosort)
+    all = all.sort(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
+      })
+    }
+  }
 
-/***/ }),
-/* 414 */
-/***/ (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 fs = __webpack_require__(253);
-exports.FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    stat: fs.stat,
-    lstatSync: fs.lstatSync,
-    statSync: fs.statSync
-};
-function createFileSystemAdapter(fsMethods) {
-    if (fsMethods === undefined) {
-        return exports.FILE_SYSTEM_ADAPTER;
-    }
-    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
-}
-exports.createFileSystemAdapter = createFileSystemAdapter;
+  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) === '/'
 
-/***/ }),
-/* 415 */
-/***/ (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 async_1 = __webpack_require__(416);
-const stream_1 = __webpack_require__(431);
-const sync_1 = __webpack_require__(432);
-const settings_1 = __webpack_require__(434);
-exports.Settings = settings_1.default;
-function walk(directory, optionsOrSettingsOrCallback, callback) {
-    if (typeof optionsOrSettingsOrCallback === 'function') {
-        return new async_1.default(directory, getSettings()).read(optionsOrSettingsOrCallback);
-    }
-    new async_1.default(directory, getSettings(optionsOrSettingsOrCallback)).read(callback);
-}
-exports.walk = walk;
-function walkSync(directory, optionsOrSettings) {
-    const settings = getSettings(optionsOrSettings);
-    const provider = new sync_1.default(directory, settings);
-    return provider.read();
-}
-exports.walkSync = walkSync;
-function walkStream(directory, optionsOrSettings) {
-    const settings = getSettings(optionsOrSettings);
-    const provider = new stream_1.default(directory, settings);
-    return provider.read();
-}
-exports.walkStream = walkStream;
-function getSettings(settingsOrOptions = {}) {
-    if (settingsOrOptions instanceof settings_1.default) {
-        return settingsOrOptions;
-    }
-    return new settings_1.default(settingsOrOptions);
-}
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
 
+  return m
+}
 
-/***/ }),
-/* 416 */
-/***/ (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 async_1 = __webpack_require__(417);
-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, [...this._storage]);
-        });
-        this._reader.read();
-    }
-}
-exports.default = AsyncProvider;
-function callFailureCallback(callback, error) {
-    callback(error);
-}
-function callSuccessCallback(callback, entries) {
-    callback(null, entries);
-}
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
 
+  return abs
+}
 
-/***/ }),
-/* 417 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = __webpack_require__(285);
-const fsScandir = __webpack_require__(418);
-const fastq = __webpack_require__(427);
-const common = __webpack_require__(429);
-const reader_1 = __webpack_require__(430);
-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(directory, base) {
-        const queueItem = { directory, base };
-        this._queue.push(queueItem, (error) => {
-            if (error !== null) {
-                this._handleError(error);
-            }
-        });
-    }
-    _worker(item, done) {
-        this._scandir(item.directory, this._settings.fsScandirSettings, (error, entries) => {
-            if (error !== null) {
-                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;
+// 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))
+  })
+}
 
-/***/ }),
-/* 418 */
-/***/ (function(module, exports, __webpack_require__) {
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(419);
-const sync = __webpack_require__(424);
-const settings_1 = __webpack_require__(425);
-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);
-}
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
 
 /***/ }),
-/* 419 */
+
+/***/ "../../node_modules/glob/glob.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(410);
-const rpl = __webpack_require__(420);
-const constants_1 = __webpack_require__(421);
-const utils = __webpack_require__(422);
-function read(directory, settings, callback) {
-    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
-        return readdirWithFileTypes(directory, settings, callback);
-    }
-    return readdir(directory, settings, callback);
-}
-exports.read = read;
-function readdirWithFileTypes(directory, settings, callback) {
-    settings.fs.readdir(directory, { withFileTypes: true }, (readdirError, dirents) => {
-        if (readdirError !== null) {
-            return callFailureCallback(callback, readdirError);
-        }
-        const entries = dirents.map((dirent) => ({
-            dirent,
-            name: dirent.name,
-            path: `${directory}${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 !== null) {
-                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 !== null) {
-                if (settings.throwErrorOnBrokenSymbolicLink) {
-                    return done(statError);
-                }
-                return done(null, entry);
-            }
-            entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
-            return done(null, entry);
-        });
-    };
-}
-function readdir(directory, settings, callback) {
-    settings.fs.readdir(directory, (readdirError, names) => {
-        if (readdirError !== null) {
-            return callFailureCallback(callback, readdirError);
-        }
-        const filepaths = names.map((name) => `${directory}${settings.pathSegmentSeparator}${name}`);
-        const tasks = filepaths.map((filepath) => {
-            return (done) => fsStat.stat(filepath, settings.fsStatSettings, done);
-        });
-        rpl(tasks, (rplError, results) => {
-            if (rplError !== null) {
-                return callFailureCallback(callback, rplError);
-            }
-            const entries = [];
-            names.forEach((name, 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);
-}
+// 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
 
-/***/ }),
-/* 420 */
-/***/ (function(module, exports) {
+var rp = __webpack_require__("../../node_modules/fs.realpath/index.js")
+var minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js")
+var Minimatch = minimatch.Minimatch
+var inherits = __webpack_require__("../../node_modules/inherits/inherits.js")
+var EE = __webpack_require__("events").EventEmitter
+var path = __webpack_require__("path")
+var assert = __webpack_require__("assert")
+var isAbsolute = __webpack_require__("../../node_modules/path-is-absolute/index.js")
+var globSync = __webpack_require__("../../node_modules/glob/sync.js")
+var common = __webpack_require__("../../node_modules/glob/common.js")
+var setopts = common.setopts
+var ownProp = common.ownProp
+var inflight = __webpack_require__("../../node_modules/inflight/inflight.js")
+var util = __webpack_require__("util")
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
-module.exports = runParallel
+var once = __webpack_require__("../../node_modules/once/once.js")
 
-function runParallel (tasks, cb) {
-  var results, pending, keys
-  var isSync = true
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
 
-  if (Array.isArray(tasks)) {
-    results = []
-    pending = tasks.length
-  } else {
-    keys = Object.keys(tasks)
-    results = {}
-    pending = keys.length
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
   }
 
-  function done (err) {
-    function end () {
-      if (cb) cb(err, results)
-      cb = null
-    }
-    if (isSync) process.nextTick(end)
-    else end()
+  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
   }
 
-  function each (i, err, result) {
-    results[i] = result
-    if (--pending === 0 || err) {
-      done(err)
-    }
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
   }
+  return origin
+}
 
-  if (!pending) {
-    // empty
-    done(null)
-  } else if (keys) {
-    // object
-    keys.forEach(function (key) {
-      tasks[key](function (err, result) { each(key, err, result) })
-    })
-  } else {
-    // array
-    tasks.forEach(function (task, i) {
-      task(function (err, result) { each(i, err, result) })
-    })
-  }
-
-  isSync = false
-}
-
-
-/***/ }),
-/* 421 */
-/***/ (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);
-const SUPPORTED_MAJOR_VERSION = 10;
-const SUPPORTED_MINOR_VERSION = 10;
-const IS_MATCHED_BY_MAJOR = MAJOR_VERSION > SUPPORTED_MAJOR_VERSION;
-const IS_MATCHED_BY_MAJOR_AND_MINOR = MAJOR_VERSION === SUPPORTED_MAJOR_VERSION && MINOR_VERSION >= SUPPORTED_MINOR_VERSION;
-/**
- * IS `true` for Node.js 10.10 and greater.
- */
-exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = IS_MATCHED_BY_MAJOR || IS_MATCHED_BY_MAJOR_AND_MINOR;
-
-
-/***/ }),
-/* 422 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(423);
-exports.fs = fs;
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
 
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
 
-/***/ }),
-/* 423 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!pattern)
+    return false
 
-"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;
+  if (set.length > 1)
+    return true
 
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
 
-/***/ }),
-/* 424 */
-/***/ (function(module, exports, __webpack_require__) {
+  return false
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(410);
-const constants_1 = __webpack_require__(421);
-const utils = __webpack_require__(422);
-function read(directory, settings) {
-    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
-        return readdirWithFileTypes(directory, settings);
-    }
-    return readdir(directory, settings);
-}
-exports.read = read;
-function readdirWithFileTypes(directory, settings) {
-    const dirents = settings.fs.readdirSync(directory, { withFileTypes: true });
-    return dirents.map((dirent) => {
-        const entry = {
-            dirent,
-            name: dirent.name,
-            path: `${directory}${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(directory, settings) {
-    const names = settings.fs.readdirSync(directory);
-    return names.map((name) => {
-        const entryPath = `${directory}${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;
+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)
+  }
 
-/***/ }),
-/* 425 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(410);
-const fs = __webpack_require__(426);
-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;
+  setopts(this, pattern, options)
+  this._didRealPath = false
 
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
 
-/***/ }),
-/* 426 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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)
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(253);
-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 === undefined) {
-        return exports.FILE_SYSTEM_ADAPTER;
-    }
-    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
-}
-exports.createFileSystemAdapter = createFileSystemAdapter;
+  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
 
-/***/ }),
-/* 427 */
-/***/ (function(module, exports, __webpack_require__) {
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
 
-"use strict";
+  if (this.noprocess)
+    return this
 
+  if (n === 0)
+    return done()
 
-var reusify = __webpack_require__(428)
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
+  }
+  sync = false
 
-function fastqueue (context, worker, concurrency) {
-  if (typeof context === 'function') {
-    concurrency = worker
-    worker = context
-    context = null
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
   }
+}
 
-  var cache = reusify(Task)
-  var queueHead = null
-  var queueTail = null
-  var _running = 0
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
 
-  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
-  }
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
 
-  return self
+  common.finish(this)
+  this.emit('end', this.found)
+}
 
-  function running () {
-    return _running
-  }
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
 
-  function pause () {
-    self.paused = true
-  }
+  this._didRealpath = true
 
-  function length () {
-    var current = queueHead
-    var counter = 0
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
 
-    while (current) {
-      current = current.next
-      counter++
-    }
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
 
-    return counter
+  function next () {
+    if (--n === 0)
+      self._finish()
   }
+}
 
-  function resume () {
-    if (!self.paused) return
-    self.paused = false
-    for (var i = 0; i < self.concurrency; i++) {
-      _running++
-      release()
-    }
-  }
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
 
-  function idle () {
-    return _running === 0 && self.length() === 0
-  }
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
 
-  function push (value, done) {
-    var current = cache.get()
+  if (n === 0)
+    return cb()
 
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+  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 (_running === self.concurrency || self.paused) {
-      if (queueTail) {
-        queueTail.next = current
-        queueTail = current
-      } else {
-        queueHead = current
-        queueTail = current
-        self.saturated()
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
       }
-    } else {
-      _running++
-      worker.call(context, current.value, current.worked)
-    }
-  }
+    })
+  })
+}
 
-  function unshift (value, done) {
-    var current = cache.get()
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
-    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)
-    }
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
+
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
   }
+}
 
-  function release (holder) {
-    if (holder) {
-      cache.release(holder)
+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])
+      }
     }
-    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--
+    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])
       }
-    } 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 () {}
+Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
+  assert(this instanceof Glob)
+  assert(typeof cb === 'function')
 
-function Task () {
-  this.value = null
-  this.callback = noop
-  this.next = null
-  this.release = noop
-  this.context = null
+  if (this.aborted)
+    return
 
-  var self = this
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
 
-  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)
+  //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.
 
-module.exports = fastqueue
+  // 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
 
-/***/ }),
-/* 428 */
-/***/ (function(module, exports, __webpack_require__) {
+    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
+  }
 
-"use strict";
+  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
 
-function reusify (Constructor) {
-  var head = new Constructor()
-  var tail = head
+  var abs = this._makeAbs(read)
 
-  function get () {
-    var current = head
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
 
-    if (current.next) {
-      head = current.next
-    } else {
-      head = new Constructor()
-      tail = head
-    }
+  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)
+}
 
-    current.next = null
+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)
+  })
+}
 
-    return current
+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)
+    }
   }
 
-  function release (obj) {
-    tail.next = obj
-    tail = obj
+  //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()
   }
 
-  return {
-    get: get,
-    release: release
+  // 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()
 }
 
-module.exports = reusify
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
 
+  if (isIgnored(this, e))
+    return
 
-/***/ }),
-/* 429 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
+  }
 
-"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;
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
 
+  if (this.mark)
+    e = this._mark(e)
 
-/***/ }),
-/* 430 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (this.absolute)
+    e = abs
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const common = __webpack_require__(429);
-class Reader {
-    constructor(_root, _settings) {
-        this._root = _root;
-        this._settings = _settings;
-        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
-    }
-}
-exports.default = Reader;
+  if (this.matches[index][e])
+    return
 
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-/***/ }),
-/* 431 */
-/***/ (function(module, exports, __webpack_require__) {
+  this.matches[index][e] = true
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(294);
-const async_1 = __webpack_require__(417);
-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;
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
 
+  this.emit('match', e)
+}
 
-/***/ }),
-/* 432 */
-/***/ (function(module, exports, __webpack_require__) {
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(433);
-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;
+  // 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_)
 
-/***/ }),
-/* 433 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (lstatcb)
+    self.fs.lstat(abs, lstatcb)
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsScandir = __webpack_require__(418);
-const common = __webpack_require__(429);
-const reader_1 = __webpack_require__(430);
-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 [...this._storage];
-    }
-    _pushToQueue(directory, base) {
-        this._queue.add({ directory, base });
-    }
-    _handleQueue() {
-        for (const item of this._queue.values()) {
-            this._handleDirectory(item.directory, item.base);
-        }
-    }
-    _handleDirectory(directory, base) {
-        try {
-            const entries = this._scandir(directory, 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 lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
 
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
 
-/***/ }),
-/* 434 */
-/***/ (function(module, exports, __webpack_require__) {
+    // 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)
+  }
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsScandir = __webpack_require__(418);
-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;
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
 
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
 
-/***/ }),
-/* 435 */
-/***/ (function(module, exports, __webpack_require__) {
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
 
-"use strict";
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(410);
-const utils = __webpack_require__(380);
-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;
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
+
+  var self = this
+  self.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)
 }
-exports.default = Reader;
 
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
 
-/***/ }),
-/* 436 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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
 
-"use strict";
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const deep_1 = __webpack_require__(437);
-const entry_1 = __webpack_require__(440);
-const error_1 = __webpack_require__(441);
-const entry_2 = __webpack_require__(442);
-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
-        };
-    }
+    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()
 }
-exports.default = Provider;
 
+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)
+  })
+}
 
-/***/ }),
-/* 437 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(380);
-const partial_1 = __webpack_require__(438);
-class DeepFilter {
-    constructor(_settings, _micromatchOptions) {
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-    }
-    getFilter(basePath, positive, negative) {
-        const matcher = this._getMatcher(positive);
-        const negativeRe = this._getNegativePatternsRe(negative);
-        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
-    }
-    _getMatcher(patterns) {
-        return new partial_1.default(patterns, this._settings, this._micromatchOptions);
-    }
-    _getNegativePatternsRe(patterns) {
-        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
-        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
-    }
-    _filter(basePath, entry, matcher, negativeRe) {
-        if (this._isSkippedByDeep(basePath, entry.path)) {
-            return false;
-        }
-        if (this._isSkippedSymbolicLink(entry)) {
-            return false;
-        }
-        const filepath = utils.path.removeLeadingDotSegment(entry.path);
-        if (this._isSkippedByPositivePatterns(filepath, matcher)) {
-            return false;
-        }
-        return this._isSkippedByNegativePatterns(filepath, negativeRe);
-    }
-    _isSkippedByDeep(basePath, entryPath) {
-        /**
-         * Avoid unnecessary depth calculations when it doesn't matter.
-         */
-        if (this._settings.deep === Infinity) {
-            return false;
-        }
-        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
-    }
-    _getEntryLevel(basePath, entryPath) {
-        const entryPathDepth = entryPath.split('/').length;
-        if (basePath === '') {
-            return entryPathDepth;
-        }
-        const basePathDepth = basePath.split('/').length;
-        return entryPathDepth - basePathDepth;
-    }
-    _isSkippedSymbolicLink(entry) {
-        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
-    }
-    _isSkippedByPositivePatterns(entryPath, matcher) {
-        return !this._settings.baseNameMatch && !matcher.match(entryPath);
-    }
-    _isSkippedByNegativePatterns(entryPath, patternsRe) {
-        return !utils.pattern.matchAny(entryPath, patternsRe);
-    }
-}
-exports.default = DeepFilter;
+  // 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)
 
-/***/ }),
-/* 438 */
-/***/ (function(module, exports, __webpack_require__) {
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
 
-"use strict";
+  var isSym = this.symlinks[abs]
+  var len = entries.length
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const matcher_1 = __webpack_require__(439);
-class PartialMatcher extends matcher_1.default {
-    match(filepath) {
-        const parts = filepath.split('/');
-        const levels = parts.length;
-        const patterns = this._storage.filter((info) => !info.complete || info.segments.length > levels);
-        for (const pattern of patterns) {
-            const section = pattern.sections[0];
-            /**
-             * In this case, the pattern has a globstar and we must read all directories unconditionally,
-             * but only if the level has reached the end of the first group.
-             *
-             * fixtures/{a,b}/**
-             *  ^ true/false  ^ always true
-            */
-            if (!pattern.complete && levels > section.length) {
-                return true;
-            }
-            const match = parts.every((part, index) => {
-                const segment = pattern.segments[index];
-                if (segment.dynamic && segment.patternRe.test(part)) {
-                    return true;
-                }
-                if (!segment.dynamic && segment.pattern === part) {
-                    return true;
-                }
-                return false;
-            });
-            if (match) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-exports.default = PartialMatcher;
+  // 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
 
-/***/ }),
-/* 439 */
-/***/ (function(module, exports, __webpack_require__) {
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true, cb)
 
-"use strict";
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true, cb)
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(380);
-class Matcher {
-    constructor(_patterns, _settings, _micromatchOptions) {
-        this._patterns = _patterns;
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-        this._storage = [];
-        this._fillStorage();
-    }
-    _fillStorage() {
-        /**
-         * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
-         * So, before expand patterns with brace expansion into separated patterns.
-         */
-        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
-        for (const pattern of patterns) {
-            const segments = this._getPatternSegments(pattern);
-            const sections = this._splitSegmentsIntoSections(segments);
-            this._storage.push({
-                complete: sections.length <= 1,
-                pattern,
-                segments,
-                sections
-            });
-        }
-    }
-    _getPatternSegments(pattern) {
-        const parts = utils.pattern.getPatternParts(pattern, this._micromatchOptions);
-        return parts.map((part) => {
-            const dynamic = utils.pattern.isDynamicPattern(part, this._settings);
-            if (!dynamic) {
-                return {
-                    dynamic: false,
-                    pattern: part
-                };
-            }
-            return {
-                dynamic: true,
-                pattern: part,
-                patternRe: utils.pattern.makeRe(part, this._micromatchOptions)
-            };
-        });
-    }
-    _splitSegmentsIntoSections(segments) {
-        return utils.array.splitWhen(segments, (segment) => segment.dynamic && utils.pattern.hasGlobStar(segment.pattern));
-    }
+  cb()
 }
-exports.default = Matcher;
 
+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) {
 
-/***/ }),
-/* 440 */
-/***/ (function(module, exports, __webpack_require__) {
+  //console.error('ps2', prefix, exists)
 
-"use strict";
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(380);
-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 && this._isDuplicateEntry(entry)) {
-            return false;
-        }
-        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
-            return false;
-        }
-        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
-        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
-        if (this._settings.unique && isMatched) {
-            this._createIndexRecord(entry);
-        }
-        return isMatched;
-    }
-    _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(entryPath, patternsRe) {
-        if (!this._settings.absolute) {
-            return false;
-        }
-        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
-        return utils.pattern.matchAny(fullpath, patternsRe);
-    }
-    _isMatchToPatterns(entryPath, patternsRe) {
-        const filepath = utils.path.removeLeadingDotSegment(entryPath);
-        return utils.pattern.matchAny(filepath, patternsRe);
+  // 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()
 }
-exports.default = EntryFilter;
 
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-/***/ }),
-/* 441 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (f.length > this.maxLength)
+    return cb()
 
-"use strict";
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(380);
-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 (Array.isArray(c))
+      c = 'DIR'
 
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
 
-/***/ }),
-/* 442 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (needDir && c === 'FILE')
+      return cb()
 
-"use strict";
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(380);
-class EntryTransformer {
-    constructor(_settings) {
-        this._settings = _settings;
-    }
-    getTransformer() {
-        return (entry) => this._transform(entry);
+  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)
     }
-    _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(Object.assign({}, entry), { path: filepath });
+  }
+
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    self.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 self.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)
     }
+  }
 }
-exports.default = EntryTransformer;
 
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
 
-/***/ }),
-/* 443 */
-/***/ (function(module, exports, __webpack_require__) {
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
 
-"use strict";
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(294);
-const stream_2 = __webpack_require__(409);
-const provider_1 = __webpack_require__(436);
-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 destination = new stream_1.Readable({ objectMode: true, read: () => { } });
-        source
-            .once('error', (error) => destination.emit('error', error))
-            .on('data', (entry) => destination.emit('data', options.transform(entry)))
-            .once('end', () => destination.emit('end'));
-        destination
-            .once('close', () => source.destroy());
-        return destination;
-    }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
-    }
+  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)
 }
-exports.default = ProviderStream;
 
 
 /***/ }),
-/* 444 */
+
+/***/ "../../node_modules/glob/sync.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = globSync
+globSync.GlobSync = GlobSync
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(445);
-const provider_1 = __webpack_require__(436);
-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);
-    }
+var rp = __webpack_require__("../../node_modules/fs.realpath/index.js")
+var minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js")
+var Minimatch = minimatch.Minimatch
+var Glob = __webpack_require__("../../node_modules/glob/glob.js").Glob
+var util = __webpack_require__("util")
+var path = __webpack_require__("path")
+var assert = __webpack_require__("assert")
+var isAbsolute = __webpack_require__("../../node_modules/path-is-absolute/index.js")
+var common = __webpack_require__("../../node_modules/glob/common.js")
+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
 }
-exports.default = ProviderSync;
 
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
 
-/***/ }),
-/* 445 */
-/***/ (function(module, exports, __webpack_require__) {
+  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')
 
-"use strict";
+  if (!(this instanceof GlobSync))
+    return new GlobSync(pattern, options)
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(410);
-const fsWalk = __webpack_require__(415);
-const reader_1 = __webpack_require__(435);
-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) {
+  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()
+}
+
+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 {
-            const stats = this._getStat(filepath);
-            return this._makeEntry(stats, pattern);
-        }
-        catch (error) {
-            if (options.errorFilter(error)) {
-                return null;
-            }
-            throw error;
+          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
         }
-    }
-    _getStat(filepath) {
-        return this._statSync(filepath, this._fsStatSettings);
-    }
+      }
+    })
+  }
+  common.finish(this)
 }
-exports.default = ReaderSync;
 
 
-/***/ }),
-/* 446 */
-/***/ (function(module, exports, __webpack_require__) {
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
 
-"use strict";
+  // 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.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
-const fs = __webpack_require__(253);
-const os = __webpack_require__(243);
-/**
- * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
- * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
- */
-const CPU_COUNT = Math.max(os.cpus().length, 1);
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    lstatSync: fs.lstatSync,
-    stat: fs.stat,
-    statSync: fs.statSync,
-    readdir: fs.readdir,
-    readdirSync: fs.readdirSync
-};
-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;
+  // 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 {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
     }
-    _getFileSystemMethods(methods = {}) {
-        return Object.assign(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
+  }
+
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
+
+  // 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
+  }
+
+  // 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)
+  }
 }
-exports.default = Settings;
 
 
-/***/ }),
-/* 447 */
-/***/ (function(module, exports, __webpack_require__) {
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
 
-"use strict";
+  var abs = this._makeAbs(e)
 
-const path = __webpack_require__(4);
-const pathType = __webpack_require__(448);
+  if (this.mark)
+    e = this._mark(e)
 
-const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+  if (this.absolute) {
+    e = abs
+  }
 
-const getPath = (filepath, cwd) => {
-	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
-	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
-};
+  if (this.matches[index][e])
+    return
 
-const addExtensions = (file, extensions) => {
-	if (path.extname(file)) {
-		return `**/${file}`;
-	}
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-	return `**/${file}.${getExtensions(extensions)}`;
-};
+  this.matches[index][e] = true
 
-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 (this.stat)
+    this._stat(e)
+}
 
-	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)));
-	}
+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)
 
-	if (options.files) {
-		return options.files.map(x => path.posix.join(directory, `**/${x}`));
-	}
+  var entries
+  var lstat
+  var stat
+  try {
+    lstat = this.fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
+  }
 
-	if (options.extensions) {
-		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
-	}
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
 
-	return [path.posix.join(directory, '**')];
-};
+  // 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)
 
-module.exports = async (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+  return entries
+}
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-	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;
-	}));
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
 
-module.exports.sync = (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+    if (Array.isArray(c))
+      return c
+  }
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+  try {
+    return this._readdirEntries(abs, this.fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
+  }
+}
 
-	const globs = [].concat(input).map(x => pathType.isDirectorySync(getPath(x, options.cwd)) ? getGlob(x, options) : x);
+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
+    }
+  }
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+  this.cache[abs] = entries
 
+  // mark and cache dir-ness
+  return entries
+}
 
-/***/ }),
-/* 448 */
-/***/ (function(module, exports, __webpack_require__) {
+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
 
-"use strict";
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-const {promisify} = __webpack_require__(234);
-const fs = __webpack_require__(253);
+    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
+  }
+}
 
-async function isType(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
 
-	try {
-		const stats = await promisify(fs[fsStatType])(filePath);
-		return stats[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+  var entries = this._readdir(abs, inGlobStar)
 
-		throw error;
-	}
+  // 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)
+
+  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)
+  }
 }
 
-function isTypeSync(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
+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)
 
-	try {
-		return fs[fsStatType](filePath)[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-		throw error;
-	}
+  // 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)
 }
 
-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');
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
+
+  if (f.length > this.maxLength)
+    return false
+
+  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 c
+
+    if (needDir && c === 'FILE')
+      return false
+
+    // 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) {
+    var lstat
+    try {
+      lstat = this.fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
+    }
+
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = this.fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
+    }
+  }
+
+  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
+}
+
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
+
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
 
 /***/ }),
-/* 449 */
+
+/***/ "../../node_modules/globby/gitignore.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const {promisify} = __webpack_require__(234);
-const fs = __webpack_require__(253);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(378);
-const gitIgnore = __webpack_require__(450);
-const slash = __webpack_require__(451);
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const fastGlob = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/index.js");
+const gitIgnore = __webpack_require__("../../node_modules/ignore/index.js");
+const slash = __webpack_require__("../../node_modules/slash/index.js");
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -31569,18 +29539,21 @@ const parseGitIgnore = (content, options) => {
 };
 
 const reduceIgnore = files => {
-	return files.reduce((ignores, file) => {
+	const ignores = gitIgnore();
+	for (const file of files) {
 		ignores.add(parseGitIgnore(file.content, {
 			cwd: file.cwd,
 			fileName: file.filePath
 		}));
-		return ignores;
-	}, gitIgnore());
-};
+	}
+
+	return ignores;
+};
 
 const ensureAbsolutePathForCwd = (cwd, p) => {
+	cwd = slash(cwd);
 	if (path.isAbsolute(p)) {
-		if (p.startsWith(cwd)) {
+		if (slash(p).startsWith(cwd)) {
 			return p;
 		}
 
@@ -31591,7 +29564,7 @@ const ensureAbsolutePathForCwd = (cwd, p) => {
 };
 
 const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
+	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p.path || p))));
 };
 
 const getFile = async (file, cwd) => {
@@ -31653,56888 +29626,32933 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 450 */
-/***/ (function(module, exports) {
 
-// A simple implementation of make-array
-function makeArray (subject) {
-  return Array.isArray(subject)
-    ? subject
-    : [subject]
-}
+/***/ "../../node_modules/globby/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const EMPTY = ''
-const SPACE = ' '
-const ESCAPE = '\\'
-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 = /^\.*\/|^\.+$/
+"use strict";
 
-const SLASH = '/'
-const KEY_IGNORE = typeof Symbol !== 'undefined'
-  ? Symbol.for('node-ignore')
-  /* istanbul ignore next */
-  : 'node-ignore'
+const fs = __webpack_require__("fs");
+const arrayUnion = __webpack_require__("../../node_modules/array-union/index.js");
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+const fastGlob = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/index.js");
+const dirGlob = __webpack_require__("../../node_modules/dir-glob/index.js");
+const gitignore = __webpack_require__("../../node_modules/globby/gitignore.js");
+const {FilterStream, UniqueStream} = __webpack_require__("../../node_modules/globby/stream-utils.js");
 
-const define = (object, key, value) =>
-  Object.defineProperty(object, key, {value})
+const DEFAULT_FILTER = () => false;
 
-const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
+const isNegative = pattern => pattern[0] === '!';
 
-// 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.
-    : EMPTY
-)
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
 
-// See fixtures #59
-const cleanRangeBackSlash = slashes => {
-  const {length} = slashes
-  return slashes.slice(0, length - length % 2)
-}
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
 
-// > 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`
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch {
+		return;
+	}
 
-// '`foo/`' should not continue with the '`..`'
-const REPLACERS = [
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
 
-  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
-  [
-    // (a\ ) -> (a )
-    // (a  ) -> (a)
-    // (a \ ) -> (a  )
-    /\\?\s+$/,
-    match => match.indexOf('\\') === 0
-      ? SPACE
-      : EMPTY
-  ],
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-  // replace (\ ) with ' '
-  [
-    /\\\s/g,
-    () => SPACE
-  ],
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
 
-  // Escape metacharacters
-  // which is written down by users but means special for regular expressions.
+	const globTasks = [];
 
-  // > 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}`
-  ],
+	taskOptions = {
+		ignore: [],
+		expandDirectories: true,
+		...taskOptions
+	};
 
-  [
-    // > a question mark (?) matches a single character
-    /(?!\\)\?/g,
-    () => '[^/]'
-  ],
+	for (const [index, pattern] of patterns.entries()) {
+		if (isNegative(pattern)) {
+			continue;
+		}
 
-  // leading slash
-  [
+		const ignore = patterns
+			.slice(index)
+			.filter(pattern => isNegative(pattern))
+			.map(pattern => pattern.slice(1));
 
-    // > 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
-    /^\//,
-    () => '^'
-  ],
+		const options = {
+			...taskOptions,
+			ignore: taskOptions.ignore.concat(ignore)
+		};
 
-  // replace special metacharacter slash after the leading slash
-  [
-    /\//g,
-    () => '\\/'
-  ],
+		globTasks.push({pattern, options});
+	}
 
-  [
-    // > 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 '\\*'
-    /^\^*\\\*\\\*\\\//,
+	return globTasks;
+};
 
-    // '**/foo' <-> 'foo'
-    () => '^(?:.*\\/)?'
-  ],
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
+	}
 
-  // 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 () {
-      // If has a slash `/` at the beginning or middle
-      return !/\/(?!$)/.test(this)
-        // > Prior to 2.22.1
-        // > 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 (Array.isArray(task.options.expandDirectories)) {
+		options = {
+			...options,
+			files: task.options.expandDirectories
+		};
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = {
+			...options,
+			...task.options.expandDirectories
+		};
+	}
 
-        // After 2.22.1 (compatible but clearer)
-        // > If there is a separator at the beginning or middle (or both)
-        // > of the pattern, then the pattern is relative to the directory
-        // > level of the particular .gitignore file itself.
-        // > Otherwise the pattern may also match at any level below
-        // > the .gitignore level.
-        ? '(?:^|\\/)'
+	return fn(task.pattern, options);
+};
 
-        // > Otherwise, Git treats the pattern as a shell glob suitable for
-        // >   consumption by fnmatch(3)
-        : '^'
-    }
-  ],
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
 
-  // two globstars
-  [
-    // Use lookahead assertions so that we could match more than one `'/**'`
-    /\\\/\\\*\\\*(?=\\\/|$)/g,
+const getFilterSync = options => {
+	return options && options.gitignore ?
+		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+		DEFAULT_FILTER;
+};
 
-    // Zero, one or several directories
-    // should not use '*', or it will be replaced by the next replacer
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
+	}
 
-    // Check if it is not the last `'/**'`
-    (_, index, str) => index + 6 < str.length
+	return {
+		pattern: glob,
+		options
+	};
+};
 
-      // 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.
-      // '/**/'
-      ? '(?:\\/[^\\/]+)*'
+module.exports = async (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-      // case: /**
-      // > A trailing `"/**"` matches everything inside.
+	const getFilter = async () => {
+		return options && options.gitignore ?
+			gitignore({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
+	};
 
-      // #21: everything inside but it should not include the current folder
-      : '\\/.+'
-  ],
+	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)));
+		}));
 
-  // intermediate wildcards
-  [
-    // Never replace escaped '*'
-    // ignore rule '\*' will match the path '*'
+		return arrayUnion(...tasks);
+	};
 
-    // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
+	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
 
-    // '*.js' matches '.js'
-    // '*.js' doesn't match 'abc'
-    (_, p1) => `${p1}[^\\/]*`
-  ],
+	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
+};
 
-  [
-    // unescape, revert step 3 except for back slash
-    // For example, if a user escape a '\\*',
-    // after step 3, the result will be '\\\\\\*'
-    /\\\\\\(?=[$.|*+(){^])/g,
-    () => ESCAPE
-  ],
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-  [
-    // '\\\\' -> '\\'
-    /\\\\/g,
-    () => ESCAPE
-  ],
+	const tasks = [];
+	for (const task of globTasks) {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		tasks.push(...newTask);
+	}
 
-  [
-    // > The range notation, e.g. [a-zA-Z],
-    // > can be used to match one of the characters in a range.
+	const filter = getFilterSync(options);
 
-    // `\` is escaped by step 3
-    /(\\)?\[([^\]/]*?)(\\*)($|\])/g,
-    (match, leadEscape, range, endEscape, close) => leadEscape === ESCAPE
-      // '\\[bar]' -> '\\\\[bar\\]'
-      ? `\\[${range}${cleanRangeBackSlash(endEscape)}${close}`
-      : close === ']'
-        ? endEscape.length % 2 === 0
-          // A normal case, and it is a range notation
-          // '[bar]'
-          // '[bar\\\\]'
-          ? `[${sanitizeRange(range)}${endEscape}]`
-          // Invalid range notaton
-          // '[bar\\]' -> '[bar\\\\]'
-          : '[]'
-        : '[]'
-  ],
+	let matches = [];
+	for (const task of tasks) {
+		matches = arrayUnion(matches, fastGlob.sync(task.pattern, task.options));
+	}
 
-  // ending
-  [
-    // 'js' will not match 'js.'
-    // 'ab' will not match 'abc'
-    /(?:[^*])$/,
+	return matches.filter(path_ => !filter(path_));
+};
 
-    // WTF!
-    // https://git-scm.com/docs/gitignore
-    // changes in [2.22.1](https://git-scm.com/docs/gitignore/2.22.1)
-    // which re-fixes #24, #38
+module.exports.stream = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-    // > If there is a separator at the end of the pattern then the pattern
-    // > will only match directories, otherwise the pattern can match both
-    // > files and directories.
+	const tasks = [];
+	for (const task of globTasks) {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		tasks.push(...newTask);
+	}
 
-    // 'js*' will not match 'a.js'
-    // 'js/' will not match 'a.js'
-    // 'js' will match 'a.js' and 'a.js/'
-    match => /\/$/.test(match)
-      // foo/ will not match 'foo'
-      ? `${match}$`
-      // foo matches 'foo' and 'foo/'
-      : `${match}(?=$|\\/$)`
-  ],
+	const filter = getFilterSync(options);
+	const filterStream = new FilterStream(p => !filter(p));
+	const uniqueStream = new UniqueStream();
 
-  // trailing wildcard
-  [
-    /(\^|\\\/)?\\\*$/,
-    (_, p1) => {
-      const prefix = p1
-        // '\^':
-        // '/*' does not match EMPTY
-        // '/*' does not match everything
+	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
+		.pipe(filterStream)
+		.pipe(uniqueStream);
+};
 
-        // '\\\/':
-        // 'abc/*' does not match 'abc/'
-        ? `${p1}[^/]+`
+module.exports.generateGlobTasks = generateGlobTasks;
 
-        // 'a*' matches 'a'
-        // 'a*' matches 'aa'
-        : '[^/]*'
+module.exports.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => fastGlob.isDynamicPattern(pattern, options));
 
-      return `${prefix}(?=$|\\/$)`
-    }
-  ],
-]
+module.exports.gitignore = gitignore;
 
-// A simple cache, because an ignore rule only has only one certain meaning
-const regexCache = Object.create(null)
 
-// @param {pattern}
-const makeRegex = (pattern, negative, ignorecase) => {
-  const r = regexCache[pattern]
-  if (r) {
-    return r
-  }
+/***/ }),
 
-  // const replacers = negative
-  //   ? NEGATIVE_REPLACERS
-  //   : POSITIVE_REPLACERS
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  const source = REPLACERS.reduce(
-    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
-    pattern
-  )
+"use strict";
 
-  return regexCache[pattern] = ignorecase
-    ? new RegExp(source, 'i')
-    : new RegExp(source)
+const taskManager = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/managers/tasks.js");
+const async_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/async.js");
+const stream_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/stream.js");
+const sync_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/settings.js");
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+async function FastGlob(source, options) {
+    assertPatternsInput(source);
+    const works = getWorks(source, async_1.default, options);
+    const result = await Promise.all(works);
+    return utils.array.flatten(result);
 }
-
-const isString = subject => typeof subject === 'string'
-
-// > 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
-  }
+// https://github.com/typescript-eslint/typescript-eslint/issues/60
+// eslint-disable-next-line no-redeclare
+(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;
+    function isDynamicPattern(source, options) {
+        assertPatternsInput(source);
+        const settings = new settings_1.default(options);
+        return utils.pattern.isDynamicPattern(source, settings);
+    }
+    FastGlob.isDynamicPattern = isDynamicPattern;
+    function escapePath(source) {
+        assertPatternsInput(source);
+        return utils.path.escape(source);
+    }
+    FastGlob.escapePath = escapePath;
+})(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(input) {
+    const source = [].concat(input);
+    const isValidSource = source.every((item) => utils.string.isString(item) && !utils.string.isEmpty(item));
+    if (!isValidSource) {
+        throw new TypeError('Patterns must be a string (non empty) or an array of strings');
+    }
 }
+module.exports = FastGlob;
 
-const createRule = (pattern, ignorecase) => {
-  const origin = pattern
-  let negative = false
 
-  // > 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, '#')
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/managers/tasks.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  const regex = makeRegex(pattern, negative, ignorecase)
+"use strict";
 
-  return new IgnoreRule(
-    origin,
-    pattern,
-    negative,
-    regex
-  )
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+function generate(patterns, settings) {
+    const positivePatterns = getPositivePatterns(patterns);
+    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
+    const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
+    const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
+    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
+    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
+    return staticTasks.concat(dynamicTasks);
 }
-
-const throwError = (message, Ctor) => {
-  throw new Ctor(message)
+exports.generate = generate;
+/**
+ * Returns tasks grouped by basic pattern directories.
+ *
+ * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
+ * This is necessary because directory traversal starts at the base directory and goes deeper.
+ */
+function convertPatternsToTasks(positive, negative, dynamic) {
+    const tasks = [];
+    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
+    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
+    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
+    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
+    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
+    /*
+     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
+     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
+     */
+    if ('.' in insideCurrentDirectoryGroup) {
+        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
+    }
+    else {
+        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
+    }
+    return tasks;
 }
-
-const checkPath = (path, originalPath, doThrow) => {
-  if (!isString(path)) {
-    return doThrow(
-      `path must be a string, but got \`${originalPath}\``,
-      TypeError
-    )
-  }
-
-  // We don't know if we should ignore EMPTY, 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
+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) {
+    const group = {};
+    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;
+    }, group);
+}
+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;
 
-const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
-checkPath.isNotRelative = isNotRelative
-checkPath.convert = p => p
+/***/ }),
 
-class Ignore {
-  constructor ({
-    ignorecase = true
-  } = {}) {
-    this._rules = []
-    this._ignorecase = ignorecase
-    define(this, KEY_IGNORE, true)
-    this._initCache()
-  }
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  _initCache () {
-    this._ignoreCache = Object.create(null)
-    this._testCache = Object.create(null)
-  }
+"use strict";
 
-  _addPattern (pattern) {
-    // #32
-    if (pattern && pattern[KEY_IGNORE]) {
-      this._rules = this._rules.concat(pattern._rules)
-      this._added = true
-      return
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js");
+class ProviderAsync extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new stream_1.default(this._settings);
     }
-
-    if (checkPattern(pattern)) {
-      const rule = createRule(pattern, this._ignorecase)
-      this._added = true
-      this._rules.push(rule)
+    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));
+        });
     }
-  }
-
-  // @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()
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
     }
+}
+exports.default = ProviderAsync;
 
-    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)
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/filters/deep.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (matched) {
-        ignored = !negative
-        unignored = negative
-      }
-    })
+"use strict";
 
-    return {
-      ignored,
-      unignored
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+const partial_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/partial.js");
+class DeepFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
     }
-  }
-
-  // @returns {TestResult}
-  _test (originalPath, cache, checkUnignored, slices) {
-    const path = originalPath
-      // Supports nullable path
-      && checkPath.convert(originalPath)
-
-    checkPath(path, originalPath, throwError)
-
-    return this._t(path, cache, checkUnignored, slices)
-  }
-
-  _t (path, cache, checkUnignored, slices) {
-    if (path in cache) {
-      return cache[path]
+    getFilter(basePath, positive, negative) {
+        const matcher = this._getMatcher(positive);
+        const negativeRe = this._getNegativePatternsRe(negative);
+        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
     }
-
-    if (!slices) {
-      // path/to/a.js
-      // ['path', 'to', 'a.js']
-      slices = path.split(SLASH)
+    _getMatcher(patterns) {
+        return new partial_1.default(patterns, this._settings, this._micromatchOptions);
     }
-
-    slices.pop()
-
-    // If the path has no parent directory, just test it
-    if (!slices.length) {
-      return cache[path] = this._testOne(path, checkUnignored)
+    _getNegativePatternsRe(patterns) {
+        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
+        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
     }
+    _filter(basePath, entry, matcher, negativeRe) {
+        if (this._isSkippedByDeep(basePath, entry.path)) {
+            return false;
+        }
+        if (this._isSkippedSymbolicLink(entry)) {
+            return false;
+        }
+        const filepath = utils.path.removeLeadingDotSegment(entry.path);
+        if (this._isSkippedByPositivePatterns(filepath, matcher)) {
+            return false;
+        }
+        return this._isSkippedByNegativePatterns(filepath, negativeRe);
+    }
+    _isSkippedByDeep(basePath, entryPath) {
+        /**
+         * Avoid unnecessary depth calculations when it doesn't matter.
+         */
+        if (this._settings.deep === Infinity) {
+            return false;
+        }
+        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
+    }
+    _getEntryLevel(basePath, entryPath) {
+        const entryPathDepth = entryPath.split('/').length;
+        if (basePath === '') {
+            return entryPathDepth;
+        }
+        const basePathDepth = basePath.split('/').length;
+        return entryPathDepth - basePathDepth;
+    }
+    _isSkippedSymbolicLink(entry) {
+        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
+    }
+    _isSkippedByPositivePatterns(entryPath, matcher) {
+        return !this._settings.baseNameMatch && !matcher.match(entryPath);
+    }
+    _isSkippedByNegativePatterns(entryPath, patternsRe) {
+        return !utils.pattern.matchAny(entryPath, patternsRe);
+    }
+}
+exports.default = DeepFilter;
 
-    const parent = this._t(
-      slices.join(SLASH) + SLASH,
-      cache,
-      checkUnignored,
-      slices
-    )
-
-    // 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)
-  }
 
-  ignores (path) {
-    return this._test(path, this._ignoreCache, false).ignored
-  }
+/***/ }),
 
-  createFilter () {
-    return path => !this.ignores(path)
-  }
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/filters/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  filter (paths) {
-    return makeArray(paths).filter(this.createFilter())
-  }
+"use strict";
 
-  // @returns {TestResult}
-  test (path) {
-    return this._test(path, this._testCache, true)
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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 && this._isDuplicateEntry(entry)) {
+            return false;
+        }
+        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
+            return false;
+        }
+        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
+        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
+        if (this._settings.unique && isMatched) {
+            this._createIndexRecord(entry);
+        }
+        return isMatched;
+    }
+    _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(entryPath, patternsRe) {
+        if (!this._settings.absolute) {
+            return false;
+        }
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
+        return utils.pattern.matchAny(fullpath, patternsRe);
+    }
+    _isMatchToPatterns(entryPath, patternsRe) {
+        const filepath = utils.path.removeLeadingDotSegment(entryPath);
+        return utils.pattern.matchAny(filepath, patternsRe);
+    }
 }
+exports.default = EntryFilter;
 
-const factory = options => new Ignore(options)
-
-const returnFalse = () => false
-
-const isPathValid = path =>
-  checkPath(path && checkPath.convert(path), path, returnFalse)
-
-factory.isPathValid = isPathValid
-
-// Fixes typescript
-factory.default = factory
 
-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, '/')
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/filters/error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  checkPath.convert = makePosix
+"use strict";
 
-  // '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)
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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;
 
 
 /***/ }),
-/* 451 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/matcher.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = path => {
-	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
-
-	if (isExtendedLengthPath || hasNonAscii) {
-		return path;
-	}
-
-	return path.replace(/\\/g, '/');
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+class Matcher {
+    constructor(_patterns, _settings, _micromatchOptions) {
+        this._patterns = _patterns;
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
+        this._storage = [];
+        this._fillStorage();
+    }
+    _fillStorage() {
+        /**
+         * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
+         * So, before expand patterns with brace expansion into separated patterns.
+         */
+        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
+        for (const pattern of patterns) {
+            const segments = this._getPatternSegments(pattern);
+            const sections = this._splitSegmentsIntoSections(segments);
+            this._storage.push({
+                complete: sections.length <= 1,
+                pattern,
+                segments,
+                sections
+            });
+        }
+    }
+    _getPatternSegments(pattern) {
+        const parts = utils.pattern.getPatternParts(pattern, this._micromatchOptions);
+        return parts.map((part) => {
+            const dynamic = utils.pattern.isDynamicPattern(part, this._settings);
+            if (!dynamic) {
+                return {
+                    dynamic: false,
+                    pattern: part
+                };
+            }
+            return {
+                dynamic: true,
+                pattern: part,
+                patternRe: utils.pattern.makeRe(part, this._micromatchOptions)
+            };
+        });
+    }
+    _splitSegmentsIntoSections(segments) {
+        return utils.array.splitWhen(segments, (segment) => segment.dynamic && utils.pattern.hasGlobStar(segment.pattern));
+    }
+}
+exports.default = Matcher;
 
 
 /***/ }),
-/* 452 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/partial.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const {Transform} = __webpack_require__(294);
-
-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);
-		}
-
-		callback();
-	}
+Object.defineProperty(exports, "__esModule", { value: true });
+const matcher_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/matcher.js");
+class PartialMatcher extends matcher_1.default {
+    match(filepath) {
+        const parts = filepath.split('/');
+        const levels = parts.length;
+        const patterns = this._storage.filter((info) => !info.complete || info.segments.length > levels);
+        for (const pattern of patterns) {
+            const section = pattern.sections[0];
+            /**
+             * In this case, the pattern has a globstar and we must read all directories unconditionally,
+             * but only if the level has reached the end of the first group.
+             *
+             * fixtures/{a,b}/**
+             *  ^ true/false  ^ always true
+            */
+            if (!pattern.complete && levels > section.length) {
+                return true;
+            }
+            const match = parts.every((part, index) => {
+                const segment = pattern.segments[index];
+                if (segment.dynamic && segment.patternRe.test(part)) {
+                    return true;
+                }
+                if (!segment.dynamic && segment.pattern === part) {
+                    return true;
+                }
+                return false;
+            });
+            if (match) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
+exports.default = PartialMatcher;
 
-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();
-	}
-}
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = {
-	FilterStream,
-	UniqueStream
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const deep_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/filters/deep.js");
+const entry_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/filters/entry.js");
+const error_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/filters/error.js");
+const entry_2 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/transformers/entry.js");
+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;
 
 
 /***/ }),
-/* 453 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/stream.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(4);
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const stream_2 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js");
+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 destination = new stream_1.Readable({ objectMode: true, read: () => { } });
+        source
+            .once('error', (error) => destination.emit('error', error))
+            .on('data', (entry) => destination.emit('data', options.transform(entry)))
+            .once('end', () => destination.emit('end'));
+        destination
+            .once('close', () => source.destroy());
+        return destination;
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
+}
+exports.default = ProviderStream;
+
 
-module.exports = path_ => {
-	let cwd = process.cwd();
+/***/ }),
 
-	path_ = path.resolve(path_);
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (process.platform === 'win32') {
-		cwd = cwd.toLowerCase();
-		path_ = path_.toLowerCase();
-	}
+"use strict";
 
-	return path_ === cwd;
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/sync.js");
+const provider_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js");
+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;
 
 
 /***/ }),
-/* 454 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/transformers/entry.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(4);
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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(Object.assign({}, entry), { path: filepath });
+    }
+}
+exports.default = EntryTransformer;
 
-module.exports = (childPath, parentPath) => {
-	childPath = path.resolve(childPath);
-	parentPath = path.resolve(parentPath);
 
-	if (process.platform === 'win32') {
-		childPath = childPath.toLowerCase();
-		parentPath = parentPath.toLowerCase();
-	}
+/***/ }),
 
-	if (childPath === parentPath) {
-		return false;
-	}
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/readers/reader.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	childPath += path.sep;
-	parentPath += path.sep;
+"use strict";
 
-	return childPath.startsWith(parentPath);
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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;
 
 
 /***/ }),
-/* 455 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/readers/stream.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-const assert = __webpack_require__(283)
-const path = __webpack_require__(4)
-const fs = __webpack_require__(253)
-let glob = undefined
-try {
-  glob = __webpack_require__(365)
-} catch (_err) {
-  // treat glob as optional.
-}
+"use strict";
 
-const defaultGlobOpts = {
-  nosort: true,
-  silent: true
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/reader.js");
+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) => {
+                return error === null ? resolve(stats) : reject(error);
+            });
+        });
+    }
 }
+exports.default = ReaderStream;
 
-// 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]
-  })
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/readers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/reader.js");
+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;
 
-const rimraf = (p, options, cb) => {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
 
-  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)
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  let busyTries = 0
-  let errState = null
-  let n = 0
+"use strict";
 
-  const next = (er) => {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
+const fs = __webpack_require__("fs");
+const os = __webpack_require__("os");
+/**
+ * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
+ * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
+ */
+const CPU_COUNT = Math.max(os.cpus().length, 1);
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    lstatSync: fs.lstatSync,
+    stat: fs.stat,
+    statSync: fs.statSync,
+    readdir: fs.readdir,
+    readdirSync: fs.readdirSync
+};
+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(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
+    }
+}
+exports.default = Settings;
 
-  const afterGlob = (er, results) => {
-    if (er)
-      return cb(er)
 
-    n = results.length
-    if (n === 0)
-      return cb()
+/***/ }),
 
-    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)
-          }
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/array.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-          // this one won't happen if graceful-fs is used.
-          if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
-          }
+"use strict";
 
-          // already gone
-          if (er.code === "ENOENT") er = null
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitWhen = exports.flatten = void 0;
+function flatten(items) {
+    return items.reduce((collection, item) => [].concat(collection, item), []);
+}
+exports.flatten = flatten;
+function splitWhen(items, predicate) {
+    const result = [[]];
+    let groupIndex = 0;
+    for (const item of items) {
+        if (predicate(item)) {
+            groupIndex++;
+            result[groupIndex] = [];
+        }
+        else {
+            result[groupIndex].push(item);
         }
+    }
+    return result;
+}
+exports.splitWhen = splitWhen;
 
-        timeout = 0
-        next(er)
-      }
-      rimraf_(p, options, CB)
-    })
-  }
 
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+/***/ }),
 
-  options.lstat(p, (er, stat) => {
-    if (!er)
-      return afterGlob(null, [p])
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/errno.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    glob(p, options.glob, afterGlob)
-  })
+"use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEnoentCodeError = void 0;
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
 }
+exports.isEnoentCodeError = isEnoentCodeError;
 
-// 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)
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
+"use strict";
 
-    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)
-    })
-  })
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDirentFromStats = void 0;
+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);
+    }
 }
-
-const fixWinEPERM = (p, options, er, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-
-  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 createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
 }
+exports.createDirentFromStats = createDirentFromStats;
 
-const fixWinEPERMSync = (p, options, er) => {
-  assert(p)
-  assert(options)
-
-  try {
-    options.chmodSync(p, 0o666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
-
-  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)
-}
+/***/ }),
 
-const rmdir = (p, options, originalEr, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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)
-  })
-}
+"use strict";
 
-const rmkids = (p, options, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
+const array = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/array.js");
+exports.array = array;
+const errno = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/errno.js");
+exports.errno = errno;
+const fs = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/fs.js");
+exports.fs = fs;
+const path = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/path.js");
+exports.path = path;
+const pattern = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/pattern.js");
+exports.pattern = pattern;
+const stream = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/stream.js");
+exports.stream = stream;
+const string = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/string.js");
+exports.string = string;
 
-  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)
-      })
-    })
-  })
-}
 
-// 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)
+/***/ }),
 
-  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')
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/path.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  let results
+"use strict";
 
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
+const path = __webpack_require__("path");
+const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
+const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
+/**
+ * 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;
+function escape(pattern) {
+    return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, '\\$2');
+}
+exports.escape = escape;
+function removeLeadingDotSegment(entry) {
+    // We do not use `startsWith` because this is 10x slower than current implementation for some cases.
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
+    if (entry.charAt(0) === '.') {
+        const secondCharactery = entry.charAt(1);
+        if (secondCharactery === '/' || secondCharactery === '\\') {
+            return entry.slice(LEADING_DOT_SEGMENT_CHARACTERS_COUNT);
+        }
     }
-  }
-
-  if (!results.length)
-    return
+    return entry;
+}
+exports.removeLeadingDotSegment = removeLeadingDotSegment;
 
-  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)
-    }
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/pattern.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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
+"use strict";
 
-      rmdirSync(p, options, er)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
+const path = __webpack_require__("path");
+const globParent = __webpack_require__("../../node_modules/glob-parent/index.js");
+const micromatch = __webpack_require__("../../node_modules/globby/node_modules/micromatch/index.js");
+const GLOBSTAR = '**';
+const ESCAPE_SYMBOL = '\\';
+const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/;
+const REGEX_CHARACTER_CLASS_SYMBOLS_RE = /\[.*]/;
+const REGEX_GROUP_SYMBOLS_RE = /(?:^|[^!*+?@])\(.*\|.*\)/;
+const GLOB_EXTENSION_SYMBOLS_RE = /[!*+?@]\(.*\)/;
+const BRACE_EXPANSIONS_SYMBOLS_RE = /{.*(?:,|\.\.).*}/;
+function isStaticPattern(pattern, options = {}) {
+    return !isDynamicPattern(pattern, options);
+}
+exports.isStaticPattern = isStaticPattern;
+function isDynamicPattern(pattern, options = {}) {
+    /**
+     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
+     * An empty string cannot be a dynamic pattern.
+     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
+     */
+    if (pattern === '') {
+        return false;
     }
-  }
+    /**
+     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
+     * filepath directly (without read directory).
+     */
+    if (options.caseSensitiveMatch === false || pattern.includes(ESCAPE_SYMBOL)) {
+        return true;
+    }
+    if (COMMON_GLOB_SYMBOLS_RE.test(pattern) || REGEX_CHARACTER_CLASS_SYMBOLS_RE.test(pattern) || REGEX_GROUP_SYMBOLS_RE.test(pattern)) {
+        return true;
+    }
+    if (options.extglob !== false && GLOB_EXTENSION_SYMBOLS_RE.test(pattern)) {
+        return true;
+    }
+    if (options.braceExpansion !== false && BRACE_EXPANSIONS_SYMBOLS_RE.test(pattern)) {
+        return true;
+    }
+    return false;
 }
-
-const rmdirSync = (p, options, originalEr) => {
-  assert(p)
-  assert(options)
-
-  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)
-  }
+exports.isDynamicPattern = isDynamicPattern;
+function convertToPositivePattern(pattern) {
+    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
 }
-
-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
+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;
+/**
+ * Returns patterns that can be applied inside the current directory.
+ *
+ * @example
+ * // ['./*', '*', 'a/*']
+ * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
+ */
+function getPatternsInsideCurrentDirectory(patterns) {
+    return patterns.filter((pattern) => !isPatternRelatedToParentDirectory(pattern));
+}
+exports.getPatternsInsideCurrentDirectory = getPatternsInsideCurrentDirectory;
+/**
+ * Returns patterns to be expanded relative to (outside) the current directory.
+ *
+ * @example
+ * // ['../*', './../*']
+ * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
+ */
+function getPatternsOutsideCurrentDirectory(patterns) {
+    return patterns.filter(isPatternRelatedToParentDirectory);
+}
+exports.getPatternsOutsideCurrentDirectory = getPatternsOutsideCurrentDirectory;
+function isPatternRelatedToParentDirectory(pattern) {
+    return pattern.startsWith('..') || pattern.startsWith('./..');
+}
+exports.isPatternRelatedToParentDirectory = isPatternRelatedToParentDirectory;
+function getBaseDirectory(pattern) {
+    return globParent(pattern, { flipBackslashes: false });
+}
+exports.getBaseDirectory = getBaseDirectory;
+function hasGlobStar(pattern) {
+    return pattern.includes(GLOBSTAR);
+}
+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 expandPatternsWithBraceExpansion(patterns) {
+    return patterns.reduce((collection, pattern) => {
+        return collection.concat(expandBraceExpansion(pattern));
+    }, []);
+}
+exports.expandPatternsWithBraceExpansion = expandPatternsWithBraceExpansion;
+function expandBraceExpansion(pattern) {
+    return micromatch.braces(pattern, {
+        expand: true,
+        nodupes: true
+    });
+}
+exports.expandBraceExpansion = expandBraceExpansion;
+function getPatternParts(pattern, options) {
+    let { parts } = micromatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
+    /**
+     * The scan method returns an empty array in some cases.
+     * See micromatch/picomatch#58 for more details.
+     */
+    if (parts.length === 0) {
+        parts = [pattern];
     }
-  } while (true)
+    /**
+     * The scan method does not return an empty part for the pattern with a forward slash.
+     * This is another part of micromatch/picomatch#58.
+     */
+    if (parts[0].startsWith('/')) {
+        parts[0] = parts[0].slice(1);
+        parts.unshift('');
+    }
+    return parts;
 }
-
-module.exports = rimraf
-rimraf.sync = rimrafSync
+exports.getPatternParts = getPatternParts;
+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) {
+    return patternsRe.some((patternRe) => patternRe.test(entry));
+}
+exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 456 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/stream.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const AggregateError = __webpack_require__(457);
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = void 0;
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+function merge(streams) {
+    const mergedStream = merge2(streams);
+    streams.forEach((stream) => {
+        stream.once('error', (error) => mergedStream.emit('error', error));
+    });
+    mergedStream.once('close', () => propagateCloseEventToSources(streams));
+    mergedStream.once('end', () => propagateCloseEventToSources(streams));
+    return mergedStream;
+}
+exports.merge = merge;
+function propagateCloseEventToSources(streams) {
+    streams.forEach((stream) => stream.emit('close'));
+}
 
-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})`);
-		}
+/***/ }),
 
-		const ret = [];
-		const errors = [];
-		const iterator = iterable[Symbol.iterator]();
-		let isRejected = false;
-		let isIterableDone = false;
-		let resolvingCount = 0;
-		let currentIndex = 0;
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/string.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		const next = () => {
-			if (isRejected) {
-				return;
-			}
+"use strict";
 
-			const nextItem = iterator.next();
-			const i = currentIndex;
-			currentIndex++;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmpty = exports.isString = void 0;
+function isString(input) {
+    return typeof input === 'string';
+}
+exports.isString = isString;
+function isEmpty(input) {
+    return input === '';
+}
+exports.isEmpty = isEmpty;
 
-			if (nextItem.done) {
-				isIterableDone = true;
 
-				if (resolvingCount === 0) {
-					if (!stopOnError && errors.length !== 0) {
-						reject(new AggregateError(errors));
-					} else {
-						resolve(ret);
-					}
-				}
+/***/ }),
 
-				return;
-			}
+/***/ "../../node_modules/globby/node_modules/micromatch/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-			resolvingCount++;
+"use strict";
 
-			(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();
 
-			if (isIterableDone) {
-				break;
-			}
-		}
-	});
-};
+const util = __webpack_require__("util");
+const braces = __webpack_require__("../../node_modules/braces/index.js");
+const picomatch = __webpack_require__("../../node_modules/picomatch/index.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+const isEmptyString = val => 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
+ */
 
-/***/ }),
-/* 457 */
-/***/ (function(module, exports, __webpack_require__) {
+const micromatch = (list, patterns, options) => {
+  patterns = [].concat(patterns);
+  list = [].concat(list);
 
-"use strict";
+  let omit = new Set();
+  let keep = new Set();
+  let items = new Set();
+  let negatives = 0;
 
-const indentString = __webpack_require__(458);
-const cleanStack = __webpack_require__(459);
+  let onResult = state => {
+    items.add(state.output);
+    if (options && options.onResult) {
+      options.onResult(state);
+    }
+  };
 
-const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
+  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++;
 
-class AggregateError extends Error {
-	constructor(errors) {
-		if (!Array.isArray(errors)) {
-			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
-		}
+    for (let item of list) {
+      let matched = isMatch(item, true);
 
-		errors = [...errors].map(error => {
-			if (error instanceof Error) {
-				return error;
-			}
+      let match = negated ? !matched.isMatch : matched.isMatch;
+      if (!match) continue;
 
-			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);
-			}
+      if (negated) {
+        omit.add(matched.output);
+      } else {
+        omit.delete(matched.output);
+        keep.add(matched.output);
+      }
+    }
+  }
 
-			return new Error(error);
-		});
+  let result = negatives === patterns.length ? [...items] : [...keep];
+  let matches = result.filter(item => !omit.has(item));
 
-		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);
+  if (options && matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+    }
 
-		this.name = 'AggregateError';
+    if (options.nonull === true || options.nullglob === true) {
+      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
+    }
+  }
 
-		Object.defineProperty(this, '_errors', {value: errors});
-	}
+  return matches;
+};
 
-	* [Symbol.iterator]() {
-		for (const error of this._errors) {
-			yield error;
-		}
-	}
-}
+/**
+ * Backwards compatibility
+ */
 
-module.exports = AggregateError;
+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
+ */
 
-/***/ }),
-/* 458 */
-/***/ (function(module, exports, __webpack_require__) {
+micromatch.matcher = (pattern, options) => picomatch(pattern, options);
 
-"use strict";
+/**
+ * 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);
 
-module.exports = (string, count = 1, options) => {
-	options = {
-		indent: ' ',
-		includeEmptyLines: false,
-		...options
-	};
+/**
+ * Backwards compatibility
+ */
 
-	if (typeof string !== 'string') {
-		throw new TypeError(
-			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
-		);
-	}
+micromatch.any = micromatch.isMatch;
 
-	if (typeof count !== 'number') {
-		throw new TypeError(
-			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
-		);
-	}
+/**
+ * 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
+ */
 
-	if (typeof options.indent !== 'string') {
-		throw new TypeError(
-			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
-		);
-	}
+micromatch.not = (list, patterns, options = {}) => {
+  patterns = [].concat(patterns).map(String);
+  let result = new Set();
+  let items = [];
 
-	if (count === 0) {
-		return string;
-	}
+  let onResult = state => {
+    if (options.onResult) options.onResult(state);
+    items.push(state.output);
+  };
 
-	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+  let matches = micromatch(list, patterns, { ...options, onResult });
 
-	return string.replace(regex, options.indent.repeat(count));
+  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 any of the patterns matches any part of `str`.
+ * @api public
+ */
 
-/***/ }),
-/* 459 */
-/***/ (function(module, exports, __webpack_require__) {
+micromatch.contains = (str, pattern, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
 
-"use strict";
+  if (Array.isArray(pattern)) {
+    return pattern.some(p => micromatch.contains(str, p, options));
+  }
 
-const os = __webpack_require__(243);
+  if (typeof pattern === 'string') {
+    if (isEmptyString(str) || isEmptyString(pattern)) {
+      return false;
+    }
 
-const extractPathRegex = /\s+at.*(?:\(|\s)(.*)\)?/;
-const pathRegex = /^(?:(?:(?:node|(?:internal\/[\w/]*|.*node_modules\/(?:babel-polyfill|pirates)\/.*)?\w+)\.js:\d+:\d+)|native)/;
-const homeDir = typeof os.homedir === 'undefined' ? '' : os.homedir();
+    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
+      return true;
+    }
+  }
 
-module.exports = (stack, options) => {
-	options = Object.assign({pretty: false}, options);
+  return micromatch.isMatch(str, pattern, { ...options, contains: true });
+};
 
-	return stack.replace(/\\/g, '/')
-		.split('\n')
-		.filter(line => {
-			const pathMatches = line.match(extractPathRegex);
-			if (pathMatches === null || !pathMatches[1]) {
-				return 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
+ */
 
-			const match = pathMatches[1];
+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;
+};
 
-			// Electron
-			if (
-				match.includes('.app/Contents/Resources/electron.asar') ||
-				match.includes('.app/Contents/Resources/default_app.asar')
-			) {
-				return false;
-			}
+/**
+ * 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` matches any of the strings in `list`
+ * @api public
+ */
 
-			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, '~')));
-			}
+micromatch.some = (list, patterns, options) => {
+  let items = [].concat(list);
 
-			return line;
-		})
-		.join('\n');
+  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 all `patterns` matches all of the strings in `list`
+ * @api public
+ */
 
-/***/ }),
-/* 460 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var fs = __webpack_require__(253),
-    path = __webpack_require__(4);
+micromatch.every = (list, patterns, options) => {
+  let items = [].concat(list);
 
-module.exports = ncp;
-ncp.ncp = ncp;
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (!items.every(item => isMatch(item))) {
+      return false;
+    }
+  }
+  return true;
+};
 
-function ncp (source, dest, options, callback) {
-  var cback = callback;
+/**
+ * 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
+ */
 
-  if (!callback) {
-    cback = options;
-    options = {};
+micromatch.all = (str, patterns, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
   }
 
-  var basePath = process.cwd(),
-      currentPath = path.resolve(basePath, source),
-      targetPath = path.resolve(basePath, dest),
-      filter = options.filter,
-      rename = options.rename,
-      transform = options.transform,
-      clobber = options.clobber !== false,
-      modified = options.modified,
-      dereference = options.dereference,
-      errs = null,
-      started = 0,
-      finished = 0,
-      running = 0,
-      limit = options.limit || ncp.limit || 16;
+  return [].concat(patterns).every(p => picomatch(p, options)(str));
+};
 
-  limit = (limit < 1) ? 1 : (limit > 512) ? 512 : limit;
+/**
+ * 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 {Array|null} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
+ * @api public
+ */
 
-  startCopy(currentPath);
-  
-  function startCopy(source) {
-    started++;
-    if (filter) {
-      if (filter instanceof RegExp) {
-        if (!filter.test(source)) {
-          return cb(true);
-        }
-      }
-      else if (typeof filter === 'function') {
-        if (!filter(source)) {
-          return cb(true);
-        }
-      }
-    }
-    return getStats(source);
+micromatch.capture = (glob, input, options) => {
+  let posix = utils.isWindows(options);
+  let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
+  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
+
+  if (match) {
+    return match.slice(1).map(v => v === void 0 ? '' : v);
   }
+};
 
-  function getStats(source) {
-    var stat = dereference ? fs.stat : fs.lstat;
-    if (running >= limit) {
-      return setImmediate(function () {
-        getStats(source);
-      });
-    }
-    running++;
-    stat(source, function (err, stats) {
-      var item = {};
-      if (err) {
-        return onError(err);
-      }
+/**
+ * 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
+ */
 
-      // We need to get the mode from the stats object and preserve it.
-      item.name = source;
-      item.mode = stats.mode;
-      item.mtime = stats.mtime; //modified time
-      item.atime = stats.atime; //access time
+micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-      if (stats.isDirectory()) {
-        return onDir(item);
-      }
-      else if (stats.isFile()) {
-        return onFile(item);
-      }
-      else if (stats.isSymbolicLink()) {
-        // Symlinks don't really need to know about the mode.
-        return onLink(source);
-      }
-    });
-  }
+/**
+ * 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
+ */
 
-  function onFile(file) {
-    var target = file.name.replace(currentPath, targetPath);
-    if(rename) {
-      target =  rename(target);
-    }
-    isWritable(target, function (writable) {
-      if (writable) {
-        return copyFile(file, target);
-      }
-      if(clobber) {
-        rmFile(target, function () {
-          copyFile(file, target);
-        });
-      }
-      if (modified) {
-        var stat = dereference ? fs.stat : fs.lstat;
-        stat(target, function(err, stats) {
-            //if souce modified time greater to target modified time copy file
-            if (file.mtime.getTime()>stats.mtime.getTime())
-                copyFile(file, target);
-            else return cb();
-        });
-      }
-      else {
-        return cb();
-      }
-    });
-  }
+micromatch.scan = (...args) => picomatch.scan(...args);
 
-  function copyFile(file, target) {
-    var readStream = fs.createReadStream(file.name),
-        writeStream = fs.createWriteStream(target, { mode: file.mode });
-    
-    readStream.on('error', onError);
-    writeStream.on('error', onError);
-    
-    if(transform) {
-      transform(readStream, writeStream, file);
-    } else {
-      writeStream.on('open', function() {
-        readStream.pipe(writeStream);
-      });
+/**
+ * Parse a glob pattern to create the source string for a regular
+ * expression.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * const state = mm(pattern[, options]);
+ * ```
+ * @param {String} `glob`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with useful properties and output to be used as regex source string.
+ * @api public
+ */
+
+micromatch.parse = (patterns, options) => {
+  let res = [];
+  for (let pattern of [].concat(patterns || [])) {
+    for (let str of braces(String(pattern), options)) {
+      res.push(picomatch.parse(str, options));
     }
-    writeStream.once('finish', function() {
-        if (modified) {
-            //target file modified date sync.
-            fs.utimesSync(target, file.atime, file.mtime);
-            cb();
-        }
-        else cb();
-    });
   }
+  return res;
+};
 
-  function rmFile(file, done) {
-    fs.unlink(file, function (err) {
-      if (err) {
-        return onError(err);
-      }
-      return done();
-    });
-  }
+/**
+ * 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
+ */
 
-  function onDir(dir) {
-    var target = dir.name.replace(currentPath, targetPath);
-    isWritable(target, function (writable) {
-      if (writable) {
-        return mkDir(dir, target);
-      }
-      copyDir(dir.name);
-    });
+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);
+};
 
-  function mkDir(dir, target) {
-    fs.mkdir(target, dir.mode, function (err) {
-      if (err) {
-        return onError(err);
-      }
-      copyDir(dir.name);
-    });
-  }
+/**
+ * Expand braces
+ */
 
-  function copyDir(dir) {
-    fs.readdir(dir, function (err, items) {
-      if (err) {
-        return onError(err);
-      }
-      items.forEach(function (item) {
-        startCopy(path.join(dir, item));
-      });
-      return cb();
-    });
-  }
+micromatch.braceExpand = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  return micromatch.braces(pattern, { ...options, expand: true });
+};
 
-  function onLink(link) {
-    var target = link.replace(currentPath, targetPath);
-    fs.readlink(link, function (err, resolvedPath) {
-      if (err) {
-        return onError(err);
-      }
-      checkLink(resolvedPath, target);
-    });
-  }
+/**
+ * Expose micromatch
+ */
 
-  function checkLink(resolvedPath, target) {
-    if (dereference) {
-      resolvedPath = path.resolve(basePath, resolvedPath);
-    }
-    isWritable(target, function (writable) {
-      if (writable) {
-        return makeLink(resolvedPath, target);
-      }
-      fs.readlink(target, function (err, targetDest) {
-        if (err) {
-          return onError(err);
-        }
-        if (dereference) {
-          targetDest = path.resolve(basePath, targetDest);
-        }
-        if (targetDest === resolvedPath) {
-          return cb();
-        }
-        return rmFile(target, function () {
-          makeLink(resolvedPath, target);
-        });
-      });
-    });
-  }
+module.exports = micromatch;
 
-  function makeLink(linkPath, target) {
-    fs.symlink(linkPath, target, function (err) {
-      if (err) {
-        return onError(err);
-      }
-      return cb();
-    });
-  }
 
-  function isWritable(path, done) {
-    fs.lstat(path, function (err) {
-      if (err) {
-        if (err.code === 'ENOENT') return done(true);
-        return done(false);
-      }
-      return done(false);
-    });
-  }
+/***/ }),
 
-  function onError(err) {
-    if (options.stopOnError) {
-      return cback(err);
-    }
-    else if (!errs && options.errs) {
-      errs = fs.createWriteStream(options.errs);
-    }
-    else if (!errs) {
-      errs = [];
-    }
-    if (typeof errs.write === 'undefined') {
-      errs.push(err);
-    }
-    else { 
-      errs.write(err.stack + '\n\n');
-    }
-    return cb();
-  }
+/***/ "../../node_modules/globby/stream-utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  function cb(skipped) {
-    if (!skipped) running--;
-    finished++;
-    if ((started === finished) && (running === 0)) {
-      if (cback !== undefined ) {
-        return errs ? cback(errs) : cback(null);
-      }
-    }
-  }
+"use strict";
+
+const {Transform} = __webpack_require__("stream");
+
+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);
+		}
 
+		callback();
+	}
+}
 
-/***/ }),
-/* 461 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+class UniqueStream extends ObjectTransform {
+	constructor() {
+		super();
+		this._pushed = new Set();
+	}
 
-"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__, "getNonBazelProjectsOnly", function() { return getNonBazelProjectsOnly; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelProjectsOnly", function() { return getBazelProjectsOnly; });
-/* 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__(365);
-/* 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__(4);
-/* 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__(234);
-/* 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__(462);
-/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(463);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+	_transform(data, encoding, callback) {
+		if (!this._pushed.has(data)) {
+			this.push(data);
+			this._pushed.add(data);
+		}
 
+		callback();
+	}
+}
 
+module.exports = {
+	FilterStream,
+	UniqueStream
+};
 
 
+/***/ }),
 
-const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
-/** a Map of project names to Project instances */
+/***/ "../../node_modules/graceful-fs/clone.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-async function getProjects(rootPath, projectsPathsPatterns, {
-  include = [],
-  exclude = []
-} = {}, bazelOnly = false) {
-  const projects = new Map();
+"use strict";
 
-  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);
-      const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name) || bazelOnly && !project.isBazelPackage();
+module.exports = clone
 
-      if (excludeProject) {
-        continue;
-      }
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
 
-      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]
-        });
-      }
+  if (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
 
-      projects.set(project.name, project);
-    }
-  }
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
 
-  return projects;
+  return copy
 }
-async function getNonBazelProjectsOnly(projects) {
-  const bazelProjectsOnly = new Map();
 
-  for (const project of projects.values()) {
-    if (!project.isBazelPackage()) {
-      bazelProjectsOnly.set(project.name, project);
-    }
-  }
 
-  return bazelProjectsOnly;
-}
-async function getBazelProjectsOnly(projects) {
-  const bazelProjectsOnly = new Map();
+/***/ }),
 
-  for (const project of projects.values()) {
-    if (project.isBazelPackage()) {
-      bazelProjectsOnly.set(project.name, project);
-    }
-  }
+/***/ "../../node_modules/graceful-fs/graceful-fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return bazelProjectsOnly;
-}
+var fs = __webpack_require__("fs")
+var polyfills = __webpack_require__("../../node_modules/graceful-fs/polyfills.js")
+var legacy = __webpack_require__("../../node_modules/graceful-fs/legacy-streams.js")
+var clone = __webpack_require__("../../node_modules/graceful-fs/clone.js")
 
-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.
+var util = __webpack_require__("util")
 
+/* istanbul ignore next - node 0.x polyfill */
+var gracefulQueue
+var previousSymbol
 
-function normalize(dir) {
-  return path__WEBPACK_IMPORTED_MODULE_1___default.a.normalize(dir);
+/* 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 buildProjectGraph(projects) {
-  const projectGraph = new Map();
-
-  for (const project of projects.values()) {
-    const projectDeps = [];
-    const dependencies = project.allDependencies;
+function noop () {}
 
-    for (const depName of Object.keys(dependencies)) {
-      if (projects.has(depName)) {
-        const dep = projects.get(depName);
-        project.ensureValidProjectDependency(dep);
-        projectDeps.push(dep);
-      }
+function publishQueue(context, queue) {
+  Object.defineProperty(context, gracefulQueue, {
+    get: function() {
+      return queue
     }
-
-    projectGraph.set(project.name, projectDeps);
-  }
-
-  return projectGraph;
+  })
 }
-function topologicallyBatchProjects(projectsToBatch, projectGraph) {
-  // We're going to be chopping stuff out of this list, so copy it.
-  const projectsLeftToBatch = new Set(projectsToBatch.keys());
-  const batches = [];
 
-  while (projectsLeftToBatch.size > 0) {
-    // Get all projects that have no remaining dependencies within the repo
-    // that haven't yet been picked.
-    const batch = [];
+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)
+  }
 
-    for (const projectName of projectsLeftToBatch) {
-      const projectDeps = projectGraph.get(projectName);
-      const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name));
+// Once time initialization
+if (!fs[gracefulQueue]) {
+  // This queue can be shared by multiple loaded instances
+  var queue = global[gracefulQueue] || []
+  publishQueue(fs, queue)
 
-      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.
+  // 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)
+      })
+    }
 
-    const hasCycles = batch.length === 0;
+    Object.defineProperty(close, previousSymbol, {
+      value: fs$close
+    })
+    return close
+  })(fs.close)
 
-    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);
+  fs.closeSync = (function (fs$closeSync) {
+    function closeSync (fd) {
+      // This function uses the graceful-fs shared queue
+      fs$closeSync.apply(fs, arguments)
+      retry()
     }
 
-    batches.push(batch);
-    batch.forEach(project => projectsLeftToBatch.delete(project.name));
-  }
+    Object.defineProperty(closeSync, previousSymbol, {
+      value: fs$closeSync
+    })
+    return closeSync
+  })(fs.closeSync)
 
-  return batches;
+  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+    process.on('exit', function() {
+      debug(fs[gracefulQueue])
+      __webpack_require__("assert").equal(fs[gracefulQueue].length, 0)
+    })
+  }
 }
-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);
-  }
+if (!global[gracefulQueue]) {
+  publishQueue(global, fs[gracefulQueue]);
+}
 
-  return projectsWithDependents;
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
 }
 
-/***/ }),
-/* 462 */
-/***/ (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; });
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-class CliError extends Error {
-  constructor(message, meta = {}) {
-    super(message);
-    this.meta = meta;
-  }
-
-}
-
-/***/ }),
-/* 463 */
-/***/ (function(module, __webpack_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 fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(253);
-/* 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__(4);
-/* 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__(234);
-/* 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__(462);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(341);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(464);
-/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(529);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
+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)
 
-class Project {
-  static async fromPath(path) {
-    const pkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["readPackageJson"])(path);
-    return new Project(pkgJson, path);
+    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()
+        }
+      })
+    }
   }
-  /** parsed package.json */
-
-
-  constructor(packageJson, projectPath) {
-    _defineProperty(this, "json", void 0);
-
-    _defineProperty(this, "packageJsonLocation", void 0);
 
-    _defineProperty(this, "nodeModulesLocation", void 0);
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
 
-    _defineProperty(this, "targetLocation", void 0);
+    return go$writeFile(path, data, options, cb)
 
-    _defineProperty(this, "path", void 0);
+    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()
+        }
+      })
+    }
+  }
 
-    _defineProperty(this, "version", void 0);
+  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
 
-    _defineProperty(this, "allDependencies", void 0);
+    return go$appendFile(path, data, options, cb)
 
-    _defineProperty(this, "productionDependencies", void 0);
+    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()
+        }
+      })
+    }
+  }
 
-    _defineProperty(this, "devDependencies", void 0);
+  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)
 
-    _defineProperty(this, "scripts", void 0);
+    return go$readdir(args)
 
-    _defineProperty(this, "bazelPackage", void 0);
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
 
-    _defineProperty(this, "isSinglePackageJsonProject", false);
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
 
-    this.json = Object.freeze(packageJson);
-    this.path = projectPath;
-    this.packageJsonLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'package.json');
-    this.nodeModulesLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'node_modules');
-    this.targetLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'target');
-    this.version = this.json.version;
-    this.productionDependencies = this.json.dependencies || {};
-    this.devDependencies = this.json.devDependencies || {};
-    this.allDependencies = _objectSpread(_objectSpread({}, this.devDependencies), this.productionDependencies);
-    this.isSinglePackageJsonProject = this.json.name === 'kibana';
-    this.scripts = this.json.scripts || {};
-    this.bazelPackage = !this.isSinglePackageJsonProject && fs__WEBPACK_IMPORTED_MODULE_0___default.a.existsSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'BUILD.bazel'));
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
+    }
   }
 
-  get name() {
-    return this.json.name;
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
   }
 
-  ensureValidProjectDependency(project) {
-    const relativePathToProject = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, project.path));
-    const relativePathToProjectIfBazelPkg = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, `${__dirname}/../../../bazel-bin/packages/${path__WEBPACK_IMPORTED_MODULE_1___default.a.basename(project.path)}`));
-    const versionInPackageJson = this.allDependencies[project.name];
-    const expectedVersionInPackageJson = `link:${relativePathToProject}`;
-    const expectedVersionInPackageJsonIfBazelPkg = `link:${relativePathToProjectIfBazelPkg}`; // TODO: after introduce bazel to build all the packages and completely remove the support for kbn packages
-    //  do not allow child projects to hold dependencies, unless they are meant to be published externally
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
 
-    if (versionInPackageJson === expectedVersionInPackageJson || versionInPackageJson === expectedVersionInPackageJsonIfBazelPkg) {
-      return;
-    }
+  var fs$ReadStream = fs.ReadStream
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
 
-    const updateMsg = 'Update its package.json to the expected value below.';
-    const meta = {
-      actual: `"${project.name}": "${versionInPackageJson}"`,
-      expected: `"${project.name}": "${expectedVersionInPackageJson}" or "${project.name}": "${expectedVersionInPackageJsonIfBazelPkg}"`,
-      package: `${this.name} (${this.packageJsonLocation})`
-    };
+  var fs$WriteStream = fs.WriteStream
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
 
-    if (Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["isLinkDependency"])(versionInPackageJson)) {
-      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`[${this.name}] depends on [${project.name}] using 'link:', but the path is wrong. ${updateMsg}`, meta);
-    }
+  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
+  })
 
-    throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`[${this.name}] depends on [${project.name}] but it's not using the local package. ${updateMsg}`, meta);
-  }
+  // 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
+  })
 
-  getBuildConfig() {
-    return this.json.kibana && this.json.kibana.build || {};
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
   }
-  /**
-   * 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 ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
 
-  getIntermediateBuildDirectory() {
-    return path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
   }
 
-  getCleanConfig() {
-    return this.json.kibana && this.json.kibana.clean || {};
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
   }
 
-  isBazelPackage() {
-    return this.bazelPackage;
+  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)
+      }
+    })
   }
 
-  isFlaggedAsDevOnly() {
-    return !!(this.json.kibana && this.json.kibana.devOnly);
+  function createReadStream (path, options) {
+    return new fs.ReadStream(path, options)
   }
 
-  hasScript(name) {
-    return name in this.scripts;
+  function createWriteStream (path, options) {
+    return new fs.WriteStream(path, options)
   }
 
-  getExecutables() {
-    const raw = this.json.bin;
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
 
-    if (!raw) {
-      return {};
-    }
+    return go$open(path, flags, mode, cb)
 
-    if (typeof raw === 'string') {
-      return {
-        [this.name]: path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw)
-      };
+    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 (typeof raw === 'object') {
-      const binsConfig = {};
-
-      for (const binName of Object.keys(raw)) {
-        binsConfig[binName] = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw[binName]);
-      }
+  return fs
+}
 
-      return binsConfig;
-    }
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  fs[gracefulQueue].push(elem)
+}
 
-    throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, {
-      binConfig: Object(util__WEBPACK_IMPORTED_MODULE_2__["inspect"])(raw),
-      package: `${this.name} (${this.packageJsonLocation})`
-    });
+function retry () {
+  var elem = fs[gracefulQueue].shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
   }
+}
 
-  async runScript(scriptName, args = []) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`Running script [${scriptName}] in [${this.name}]:`);
-    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__["runScriptInPackage"])(scriptName, args, this);
-  }
 
-  runScriptStreaming(scriptName, options = {}) {
-    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__["runScriptInPackageStreaming"])({
-      script: scriptName,
-      args: options.args || [],
-      pkg: this,
-      debug: options.debug
-    });
-  }
+/***/ }),
 
-  hasDependencies() {
-    return Object.keys(this.allDependencies).length > 0;
-  }
+/***/ "../../node_modules/graceful-fs/legacy-streams.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  isEveryDependencyLocal() {
-    return Object.values(this.allDependencies).every(dep => Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["isLinkDependency"])(dep));
-  }
+var Stream = __webpack_require__("stream").Stream
 
-  async installDependencies(options = {}) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[${this.name}] running yarn`);
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].write('');
-    await Object(_scripts__WEBPACK_IMPORTED_MODULE_6__["installInDir"])(this.path, options === null || options === void 0 ? void 0 : options.extraArgs);
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].write('');
-  }
+module.exports = legacy
 
-} // We normalize all path separators to `/` in generated files
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
 
-function normalizePath(path) {
-  return path.replace(/[\\\/]+/g, '/');
-}
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
 
-/***/ }),
-/* 464 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    Stream.call(this);
 
-"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__, "createProductionPackageJson", function() { return createProductionPackageJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isLinkDependency", function() { return isLinkDependency; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isBazelPackageDependency", function() { return isBazelPackageDependency; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "transformDependencies", function() { return transformDependencies; });
-/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(465);
-/* 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__(518);
-/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+    var self = this;
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
 
-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; }
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+    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];
+    }
 
-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 createProductionPackageJson = pkgJson => _objectSpread(_objectSpread({}, pkgJson), {}, {
-  dependencies: transformDependencies(pkgJson.dependencies)
-});
-const isLinkDependency = depVersion => depVersion.startsWith('link:');
-const isBazelPackageDependency = depVersion => depVersion.startsWith('link:bazel-bin/');
-/**
- * Replaces `link:` dependencies with `file:` dependencies. When installing
- * dependencies, these `file:` dependencies will be copied into `node_modules`
- * instead of being symlinked.
- *
- * This will allow us to copy packages into the build and run `yarn`, which
- * will then _copy_ the `file:` dependencies into `node_modules` instead of
- * symlinking like we do in development.
- *
- * Additionally it also taken care of replacing `link:bazel-bin/` with
- * `file:` so we can also support the copy of the Bazel packages dist already into
- * build/packages to be copied into the node_modules
- */
+    if (this.encoding) this.setEncoding(this.encoding);
 
-function transformDependencies(dependencies = {}) {
-  const newDeps = {};
+    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');
+      }
 
-  for (const name of Object.keys(dependencies)) {
-    const depVersion = dependencies[name];
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
 
-    if (!isLinkDependency(depVersion)) {
-      newDeps[name] = depVersion;
-      continue;
+      this.pos = this.start;
     }
 
-    if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
-      continue;
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
     }
 
-    newDeps[name] = depVersion.replace('link:', 'file:');
-  }
-
-  return newDeps;
-}
-
-/***/ }),
-/* 465 */
-/***/ (function(module, exports, __webpack_require__) {
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
 
-"use strict";
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
 
-const {promisify} = __webpack_require__(234);
-const fs = __webpack_require__(253);
-const path = __webpack_require__(4);
-const parseJson = __webpack_require__(466);
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-const readFileAsync = promisify(fs.readFile);
+    Stream.call(this);
 
-module.exports = async options => {
-	options = {
-		cwd: process.cwd(),
-		normalize: true,
-		...options
-	};
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
 
-	const filePath = path.resolve(options.cwd, 'package.json');
-	const json = parseJson(await readFileAsync(filePath, 'utf8'));
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
 
-	if (options.normalize) {
-		__webpack_require__(487)(json);
-	}
+    options = options || {};
 
-	return json;
-};
+    // 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];
+    }
 
-module.exports.sync = options => {
-	options = {
-		cwd: process.cwd(),
-		normalize: true,
-		...options
-	};
+    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');
+      }
 
-	const filePath = path.resolve(options.cwd, 'package.json');
-	const json = parseJson(fs.readFileSync(filePath, 'utf8'));
+      this.pos = this.start;
+    }
 
-	if (options.normalize) {
-		__webpack_require__(487)(json);
-	}
+    this.busy = false;
+    this._queue = [];
 
-	return json;
-};
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
+}
 
 
 /***/ }),
-/* 466 */
+
+/***/ "../../node_modules/graceful-fs/polyfills.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var constants = __webpack_require__("constants")
 
-const errorEx = __webpack_require__(467);
-const fallback = __webpack_require__(469);
-const {default: LinesAndColumns} = __webpack_require__(470);
-const {codeFrameColumns} = __webpack_require__(471);
+var origCwd = process.cwd
+var cwd = null
 
-const JSONError = errorEx('JSONError', {
-	fileName: errorEx.append('in %s'),
-	codeFrame: errorEx.append('\n\n%s\n')
-});
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
 
-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}
-			);
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
+}
+try {
+  process.cwd()
+} catch (er) {}
 
-			jsonError.codeFrame = codeFrame;
-		}
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
 
-		throw jsonError;
-	}
-};
+module.exports = patch
 
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
 
-/***/ }),
-/* 467 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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)
+  }
 
-"use strict";
+  // 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.
 
-var util = __webpack_require__(234);
-var isArrayish = __webpack_require__(468);
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
 
-var errorEx = function errorEx(name, properties) {
-	if (!name || name.constructor !== String) {
-		properties = name || {};
-		name = Error.name;
-	}
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
 
-	var errorExError = function ErrorEXError(message) {
-		if (!this) {
-			return new ErrorEXError(message);
-		}
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
 
-		message = message instanceof Error
-			? message.message
-			: (message || this.message);
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
-		Error.call(this, message);
-		Error.captureStackTrace(this, errorExError);
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
 
-		this.name = name;
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
 
-		Object.defineProperty(this, 'message', {
-			configurable: true,
-			enumerable: false,
-			get: function () {
-				var newMessage = message.split(/\r?\n/g);
+  // 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 () {}
+  }
 
-				for (var key in properties) {
-					if (!properties.hasOwnProperty(key)) {
-						continue;
-					}
+  // 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 modifier = properties[key];
+  // 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 ('message' in modifier) {
-						newMessage = modifier.message(this[key], newMessage) || newMessage;
-						if (!isArrayish(newMessage)) {
-							newMessage = [newMessage];
-						}
-					}
-				}
+  // 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)
+    }
 
-				return newMessage.join('\n');
-			},
-			set: function (v) {
-				message = v;
-			}
-		});
+    // This ensures `util.promisify` works as it does for native `fs.read`.
+    read.__proto__ = fs$read
+    return read
+  })(fs.read)
 
-		var stackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
-		var stackGetter = stackDescriptor.get;
-		var stackValue = stackDescriptor.value;
-		delete stackDescriptor.value;
-		delete stackDescriptor.writable;
+  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)
 
-		stackDescriptor.get = function () {
-			var stack = (stackGetter)
-				? stackGetter.call(this).split(/\r?\n+/g)
-				: stackValue.split(/\r?\n+/g);
+  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)
+          })
+        })
+      })
+    }
 
-			// starting in Node 7, the stack builder caches the message.
-			// just replace it.
-			stack[0] = this.name + ': ' + this.message;
+    fs.lchmodSync = function (path, mode) {
+      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
 
-			var lineCount = 1;
-			for (var key in properties) {
-				if (!properties.hasOwnProperty(key)) {
-					continue;
-				}
+      // 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
+    }
+  }
 
-				var modifier = properties[key];
+  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 ('line' in modifier) {
-					var line = modifier.line(this[key]);
-					if (line) {
-						stack.splice(lineCount++, 0, '    ' + line);
-					}
-				}
+      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
+      }
 
-				if ('stack' in modifier) {
-					modifier.stack(this[key], stack);
-				}
-			}
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
+  }
 
-			return stack.join('\n');
-		};
+  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)
+      })
+    }
+  }
 
-		Object.defineProperty(this, 'stack', stackDescriptor);
-	};
+  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
+      }
+    }
+  }
 
-	if (Object.setPrototypeOf) {
-		Object.setPrototypeOf(errorExError.prototype, Error.prototype);
-		Object.setPrototypeOf(errorExError, Error);
-	} else {
-		util.inherits(errorExError, Error);
-	}
 
-	return errorExError;
-};
+  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)
+      })
+    }
+  }
 
-errorEx.append = function (str, def) {
-	return {
-		message: function (v, message) {
-			v = v || def;
+  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
+      }
+    }
+  }
 
-			if (v) {
-				message[0] += ' ' + str.replace('%s', v.toString());
-			}
+  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)
+    }
+  }
 
-			return message;
-		}
-	};
-};
+  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;
+    }
+  }
 
-errorEx.line = function (str, def) {
-	return {
-		line: function (v) {
-			v = v || def;
+  // 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 (v) {
-				return str.replace('%s', v.toString());
-			}
+    if (er.code === "ENOSYS")
+      return true
 
-			return null;
-		}
-	};
-};
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
 
-module.exports = errorEx;
+    return false
+  }
+}
 
 
 /***/ }),
-/* 468 */
+
+/***/ "../../node_modules/has-flag/index.js":
 /***/ (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);
+module.exports = (flag, argv = process.argv) => {
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const position = argv.indexOf(prefix + flag);
+	const terminatorPosition = argv.indexOf('--');
+	return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
 };
 
 
 /***/ }),
-/* 469 */
+
+/***/ "../../node_modules/has/src/index.js":
 /***/ (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) {
-    if (typeof txt !== 'string') {
-      const isEmptyArray = Array.isArray(txt) && txt.length === 0
-      const errorMessage = 'Cannot parse ' +
-      (isEmptyArray ? 'an empty array' : String(txt))
-      throw new TypeError(errorMessage)
-    }
-    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
-  }
-}
+var bind = __webpack_require__("../../node_modules/function-bind/index.js");
+
+module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
 
 
 /***/ }),
-/* 470 */
-/***/ (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);
-
-
-/***/ }),
-/* 471 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/hosted-git-info/git-host-info.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.codeFrameColumns = codeFrameColumns;
-exports.default = _default;
+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://codeload.{domain}/{user}/{project}/tar.gz/{committish}'
+  },
+  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',
+    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
+    'httpstemplate': 'git+https://{auth@}{domain}/{user}/{projectPath}.git{#committish}',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}',
+    'pathmatch': /^[/]([^/]+)[/]((?!.*(\/-\/|\/repository\/archive\.tar\.gz\?=.*|\/repository\/[^/]+\/archive.tar.gz$)).*?)(?:[.]git|[/])?$/
+  },
+  gist: {
+    'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'gist.github.com',
+    'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]{32,})(?:[.]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}',
+    'browsefiletemplate': 'https://{domain}/{project}{/committish}{#path}',
+    'docstemplate': 'https://{domain}/{project}{/committish}',
+    'httpstemplate': 'git+https://{domain}/{project}.git{#committish}',
+    'shortcuttemplate': '{type}:{project}{#committish}',
+    'pathtemplate': '{project}{#committish}',
+    'tarballtemplate': 'https://codeload.github.com/gist/{project}/tar.gz/{committish}',
+    'hashformat': function (fragment) {
+      return 'file-' + formatHashFragment(fragment)
+    }
+  }
+}
 
-var _highlight = __webpack_require__(472);
+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}',
+  'browsefiletemplate': 'https://{domain}/{user}/{project}/{treepath}/{committish}/{path}{#fragment}',
+  '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|[/])?$/,
+  'hashformat': formatHashFragment
+}
 
-let deprecationWarningShown = false;
+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('|') + '):$')
+})
 
-function getDefs(chalk) {
-  return {
-    gutter: chalk.grey,
-    marker: chalk.red.bold,
-    message: chalk.red.bold
-  };
+function formatHashFragment (fragment) {
+  return fragment.toLowerCase().replace(/^\W+|\/|\W+$/g, '').replace(/\W+/g, '-')
 }
 
-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;
-  }
+/***/ "../../node_modules/hosted-git-info/git-host.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (endLine === -1) {
-    end = source.length;
-  }
+"use strict";
 
-  const lineDiff = endLine - startLine;
-  const markerLines = {};
+var gitHosts = __webpack_require__("../../node_modules/hosted-git-info/git-host-info.js")
+/* eslint-disable node/no-deprecated-api */
 
-  if (lineDiff) {
-    for (let i = 0; i <= lineDiff; i++) {
-      const lineNumber = i + startLine;
+// copy-pasta util._extend from node's source, to avoid pulling
+// the whole util module into peoples' webpack bundles.
+/* istanbul ignore next */
+var extend = Object.assign || function _extend (target, source) {
+  // Don't do anything if source isn't an object
+  if (source === null || typeof source !== 'object') return target
 
-      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];
-    }
+  var keys = Object.keys(source)
+  var i = keys.length
+  while (i--) {
+    target[keys[i]] = source[keys[i]]
   }
-
-  return {
-    start,
-    end,
-    markerLines
-  };
+  return target
 }
 
-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, end).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("");
+module.exports = GitHost
+function GitHost (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 || {}
+}
 
-        if (lastMarkerLine && opts.message) {
-          markerLine += " " + maybeHighlight(defs.message, opts.message);
-        }
-      }
+GitHost.prototype.hash = function () {
+  return this.committish ? '#' + this.committish : ''
+}
 
-      return [maybeHighlight(defs.marker, ">"), maybeHighlight(defs.gutter, gutter), line.length > 0 ? ` ${line}` : "", markerLine].join("");
+GitHost.prototype._fill = function (template, opts) {
+  if (!template) return
+  var vars = extend({}, opts)
+  vars.path = vars.path ? vars.path.replace(/^[/]+/g, '') : ''
+  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 rawcommittish = vars.committish
+  var rawFragment = vars.fragment
+  var rawPath = vars.path
+  var rawProject = vars.project
+  Object.keys(vars).forEach(function (key) {
+    var value = vars[key]
+    if ((key === 'path' || key === 'project') && typeof value === 'string') {
+      vars[key] = value.split('/').map(function (pathComponent) {
+        return encodeURIComponent(pathComponent)
+      }).join('/')
     } else {
-      return ` ${maybeHighlight(defs.gutter, gutter)}${line.length > 0 ? ` ${line}` : ""}`;
+      vars[key] = encodeURIComponent(value)
     }
-  }).join("\n");
-
-  if (opts.message && !hasColumns) {
-    frame = `${" ".repeat(numberMaxWidth + 1)}${opts.message}\n${frame}`;
+  })
+  vars['auth@'] = rawAuth ? rawAuth + '@' : ''
+  vars['#fragment'] = rawFragment ? '#' + this.hashformat(rawFragment) : ''
+  vars.fragment = vars.fragment ? vars.fragment : ''
+  vars['#path'] = rawPath ? '#' + this.hashformat(rawPath) : ''
+  vars['/path'] = vars.path ? '/' + vars.path : ''
+  vars.projectPath = rawProject.split('/').map(encodeURIComponent).join('/')
+  if (opts.noCommittish) {
+    vars['#committish'] = ''
+    vars['/tree/committish'] = ''
+    vars['/committish'] = ''
+    vars.committish = ''
+  } else {
+    vars['#committish'] = rawcommittish ? '#' + rawcommittish : ''
+    vars['/tree/committish'] = vars.committish
+      ? '/' + vars.treepath + '/' + vars.committish
+      : ''
+    vars['/committish'] = vars.committish ? '/' + vars.committish : ''
+    vars.committish = vars.committish || 'master'
   }
-
-  if (highlighted) {
-    return chalk.reset(frame);
+  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 frame;
+    return res
   }
 }
 
-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`.";
+GitHost.prototype.ssh = function (opts) {
+  return this._fill(this.sshtemplate, opts)
+}
 
-    if (process.emitWarning) {
-      process.emitWarning(message, "DeprecationWarning");
-    } else {
-      const deprecationError = new Error(message);
-      deprecationError.name = "DeprecationWarning";
-      console.warn(new Error(message));
-    }
-  }
+GitHost.prototype.sshurl = function (opts) {
+  return this._fill(this.sshurltemplate, opts)
+}
 
-  colNumber = Math.max(colNumber, 0);
-  const location = {
-    start: {
-      column: colNumber,
-      line: lineNumber
+GitHost.prototype.browse = function (P, F, opts) {
+  if (typeof P === 'string') {
+    if (typeof F !== 'string') {
+      opts = F
+      F = null
     }
-  };
-  return codeFrameColumns(rawLines, location, opts);
+    return this._fill(this.browsefiletemplate, extend({
+      fragment: F,
+      path: P
+    }, opts))
+  } else {
+    return this._fill(this.browsetemplate, P)
+  }
 }
 
-/***/ }),
-/* 472 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = highlight;
-exports.getChalk = getChalk;
-exports.shouldHighlight = shouldHighlight;
-
-var _jsTokens = __webpack_require__(473);
-
-var _helperValidatorIdentifier = __webpack_require__(474);
-
-var _chalk = __webpack_require__(477);
-
-const sometimesKeywords = new Set(["as", "async", "from", "get", "of", "set"]);
-
-function getDefs(chalk) {
-  return {
-    keyword: chalk.cyan,
-    capitalized: chalk.yellow,
-    jsxIdentifier: chalk.yellow,
-    punctuator: chalk.yellow,
-    number: chalk.magenta,
-    string: chalk.green,
-    regex: chalk.magenta,
-    comment: chalk.grey,
-    invalid: chalk.white.bgRed.bold
-  };
+GitHost.prototype.docs = function (opts) {
+  return this._fill(this.docstemplate, opts)
 }
 
-const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
-const BRACKET = /^[()[\]{}]$/;
-let tokenize;
-{
-  const JSX_TAG = /^[a-z][\w-]*$/i;
-
-  const getTokenType = function (token, offset, text) {
-    if (token.type === "name") {
-      if ((0, _helperValidatorIdentifier.isKeyword)(token.value) || (0, _helperValidatorIdentifier.isStrictReservedWord)(token.value, true) || sometimesKeywords.has(token.value)) {
-        return "keyword";
-      }
+GitHost.prototype.bugs = function (opts) {
+  return this._fill(this.bugstemplate, opts)
+}
 
-      if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
-        return "jsxIdentifier";
-      }
+GitHost.prototype.https = function (opts) {
+  return this._fill(this.httpstemplate, opts)
+}
 
-      if (token.value[0] !== token.value[0].toLowerCase()) {
-        return "capitalized";
-      }
-    }
+GitHost.prototype.git = function (opts) {
+  return this._fill(this.gittemplate, opts)
+}
 
-    if (token.type === "punctuator" && BRACKET.test(token.value)) {
-      return "bracket";
-    }
+GitHost.prototype.shortcut = function (opts) {
+  return this._fill(this.shortcuttemplate, opts)
+}
 
-    if (token.type === "invalid" && (token.value === "@" || token.value === "#")) {
-      return "punctuator";
-    }
+GitHost.prototype.path = function (opts) {
+  return this._fill(this.pathtemplate, opts)
+}
 
-    return token.type;
-  };
+GitHost.prototype.tarball = function (opts_) {
+  var opts = extend({}, opts_, { noCommittish: false })
+  return this._fill(this.tarballtemplate, opts)
+}
 
-  tokenize = function* (text) {
-    let match;
+GitHost.prototype.file = function (P, opts) {
+  return this._fill(this.filetemplate, extend({ path: P }, opts))
+}
 
-    while (match = _jsTokens.default.exec(text)) {
-      const token = _jsTokens.matchToToken(match);
+GitHost.prototype.getDefaultRepresentation = function () {
+  return this.default
+}
 
-      yield {
-        type: getTokenType(token, match.index, text),
-        value: token.value
-      };
-    }
-  };
+GitHost.prototype.toString = function (opts) {
+  if (this.default && typeof this[this.default] === 'function') return this[this.default](opts)
+  return this.sshurl(opts)
 }
 
-function highlightTokens(defs, text) {
-  let highlighted = "";
 
-  for (const {
-    type,
-    value
-  } of tokenize(text)) {
-    const colorize = defs[type];
+/***/ }),
 
-    if (colorize) {
-      highlighted += value.split(NEWLINE).map(str => colorize(str)).join("\n");
-    } else {
-      highlighted += value;
-    }
-  }
+/***/ "../../node_modules/hosted-git-info/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return highlighted;
-}
+"use strict";
 
-function shouldHighlight(options) {
-  return !!_chalk.supportsColor || options.forceColor;
+var url = __webpack_require__("url")
+var gitHosts = __webpack_require__("../../node_modules/hosted-git-info/git-host-info.js")
+var GitHost = module.exports = __webpack_require__("../../node_modules/hosted-git-info/git-host.js")
+
+var protocolToRepresentationMap = {
+  'git+ssh:': 'sshurl',
+  'git+https:': 'https',
+  'ssh:': 'sshurl',
+  'git:': 'git'
 }
 
-function getChalk(options) {
-  return options.forceColor ? new _chalk.constructor({
-    enabled: true,
-    level: 1
-  }) : _chalk;
+function protocolToRepresentation (protocol) {
+  return protocolToRepresentationMap[protocol] || protocol.slice(0, -1)
 }
 
-function highlight(code, options = {}) {
-  if (code !== "" && shouldHighlight(options)) {
-    const chalk = getChalk(options);
-    const defs = getDefs(chalk);
-    return highlightTokens(defs, code);
-  } else {
-    return code;
-  }
+var authProtocols = {
+  'git:': true,
+  'https:': true,
+  'git+https:': true,
+  'http:': true,
+  'git+http:': true
 }
 
-/***/ }),
-/* 473 */
-/***/ (function(module, exports) {
+var cache = {}
 
-// Copyright 2014, 2015, 2016, 2017, 2018 Simon Lydell
-// License: MIT. (See LICENSE.)
+module.exports.fromUrl = function (giturl, opts) {
+  if (typeof giturl !== 'string') return
+  var key = giturl + JSON.stringify(opts || {})
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-})
+  if (!(key in cache)) {
+    cache[key] = fromUrl(giturl, opts)
+  }
 
-// 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 cache[key]
+}
 
-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
+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(/^([^:]+):(?:[^@]+@)?(?:([^/]*)\/)?([^#]+)/)
+  var matches = Object.keys(gitHosts).map(function (gitHostName) {
+    try {
+      var gitHostInfo = gitHosts[gitHostName]
+      var auth = null
+      if (parsed.auth && authProtocols[parsed.protocol]) {
+        auth = 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].replace(/\.git$/, ''))
+        defaultRepresentation = 'shortcut'
+      } else {
+        if (parsed.host && parsed.host !== gitHostInfo.domain && parsed.host.replace(/^www[.]/, '') !== 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
+        /* istanbul ignore else */
+        if (matched[1] !== null && matched[1] !== undefined) {
+          user = decodeURIComponent(matched[1].replace(/^:/, ''))
+        }
+        project = decodeURIComponent(matched[2])
+        defaultRepresentation = protocolToRepresentation(parsed.protocol)
+      }
+      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation, opts)
+    } catch (ex) {
+      /* istanbul ignore else */
+      if (ex instanceof URIError) {
+      } else throw ex
+    }
+  }).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)
+}
 
-/***/ }),
-/* 474 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "isIdentifierChar", {
-  enumerable: true,
-  get: function () {
-    return _identifier.isIdentifierChar;
-  }
-});
-Object.defineProperty(exports, "isIdentifierName", {
-  enumerable: true,
-  get: function () {
-    return _identifier.isIdentifierName;
-  }
-});
-Object.defineProperty(exports, "isIdentifierStart", {
-  enumerable: true,
-  get: function () {
-    return _identifier.isIdentifierStart;
-  }
-});
-Object.defineProperty(exports, "isKeyword", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isKeyword;
-  }
-});
-Object.defineProperty(exports, "isReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isReservedWord;
-  }
-});
-Object.defineProperty(exports, "isStrictBindOnlyReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isStrictBindOnlyReservedWord;
+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
   }
-});
-Object.defineProperty(exports, "isStrictBindReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isStrictBindReservedWord;
+}
+
+function parseGitUrl (giturl) {
+  var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/)
+  if (!matched) {
+    var legacy = url.parse(giturl)
+    // If we don't have url.URL, then sorry, this is just not fixable.
+    // This affects Node <= 6.12.
+    if (legacy.auth && typeof url.URL === 'function') {
+      // git urls can be in the form of scp-style/ssh-connect strings, like
+      // git+ssh://user@host.com:some/path, which the legacy url parser
+      // supports, but WhatWG url.URL class does not.  However, the legacy
+      // parser de-urlencodes the username and password, so something like
+      // https://user%3An%40me:p%40ss%3Aword@x.com/ becomes
+      // https://user:n@me:p@ss:word@x.com/ which is all kinds of wrong.
+      // Pull off just the auth and host, so we dont' get the confusing
+      // scp-style URL, then pass that to the WhatWG parser to get the
+      // auth properly escaped.
+      var authmatch = giturl.match(/[^@]+@[^:/]+/)
+      /* istanbul ignore else - this should be impossible */
+      if (authmatch) {
+        var whatwg = new url.URL(authmatch[0])
+        legacy.auth = whatwg.username || ''
+        if (whatwg.password) legacy.auth += ':' + whatwg.password
+      }
+    }
+    return legacy
   }
-});
-Object.defineProperty(exports, "isStrictReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isStrictReservedWord;
+  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 _identifier = __webpack_require__(475);
+}
 
-var _keyword = __webpack_require__(476);
 
 /***/ }),
-/* 475 */
+
+/***/ "../../node_modules/human-signals/build/src/core.js":
 /***/ (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"},
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isIdentifierChar = isIdentifierChar;
-exports.isIdentifierName = isIdentifierName;
-exports.isIdentifierStart = isIdentifierStart;
-let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088e\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ca\ua7d0\ua7d1\ua7d3\ua7d5-\ua7d9\ua7f2-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
-let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0898-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1ace\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
-const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
-const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
-nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
-const astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1070, 4050, 582, 8634, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 46, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 482, 44, 11, 6, 17, 0, 322, 29, 19, 43, 1269, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4152, 8, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
-const astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
-
-function isInAstralSet(code, set) {
-  let pos = 0x10000;
+{
+name:"SIGINT",
+number:2,
+action:"terminate",
+description:"User interruption with CTRL-C",
+standard:"ansi"},
 
-  for (let i = 0, length = set.length; i < length; i += 2) {
-    pos += set[i];
-    if (pos > code) return false;
-    pos += set[i + 1];
-    if (pos >= code) return true;
-  }
+{
+name:"SIGQUIT",
+number:3,
+action:"core",
+description:"User interruption with CTRL-\\",
+standard:"posix"},
 
-  return false;
-}
+{
+name:"SIGILL",
+number:4,
+action:"core",
+description:"Invalid machine instruction",
+standard:"ansi"},
 
-function isIdentifierStart(code) {
-  if (code < 65) return code === 36;
-  if (code <= 90) return true;
-  if (code < 97) return code === 95;
-  if (code <= 122) return true;
+{
+name:"SIGTRAP",
+number:5,
+action:"core",
+description:"Debugger breakpoint",
+standard:"posix"},
 
-  if (code <= 0xffff) {
-    return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
-  }
+{
+name:"SIGABRT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"ansi"},
 
-  return isInAstralSet(code, astralIdentifierStartCodes);
-}
+{
+name:"SIGIOT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"bsd"},
 
-function isIdentifierChar(code) {
-  if (code < 48) return code === 36;
-  if (code < 58) return true;
-  if (code < 65) return false;
-  if (code <= 90) return true;
-  if (code < 97) return code === 95;
-  if (code <= 122) return true;
+{
+name:"SIGBUS",
+number:7,
+action:"core",
+description:
+"Bus error due to misaligned, non-existing address or paging error",
+standard:"bsd"},
 
-  if (code <= 0xffff) {
-    return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
-  }
+{
+name:"SIGEMT",
+number:7,
+action:"terminate",
+description:"Command should be emulated but is not implemented",
+standard:"other"},
 
-  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes);
-}
+{
+name:"SIGFPE",
+number:8,
+action:"core",
+description:"Floating point arithmetic error",
+standard:"ansi"},
 
-function isIdentifierName(name) {
-  let isFirst = true;
+{
+name:"SIGKILL",
+number:9,
+action:"terminate",
+description:"Forced termination",
+standard:"posix",
+forced:true},
 
-  for (let i = 0; i < name.length; i++) {
-    let cp = name.charCodeAt(i);
+{
+name:"SIGUSR1",
+number:10,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
 
-    if ((cp & 0xfc00) === 0xd800 && i + 1 < name.length) {
-      const trail = name.charCodeAt(++i);
+{
+name:"SIGSEGV",
+number:11,
+action:"core",
+description:"Segmentation fault",
+standard:"ansi"},
 
-      if ((trail & 0xfc00) === 0xdc00) {
-        cp = 0x10000 + ((cp & 0x3ff) << 10) + (trail & 0x3ff);
-      }
-    }
+{
+name:"SIGUSR2",
+number:12,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
 
-    if (isFirst) {
-      isFirst = false;
+{
+name:"SIGPIPE",
+number:13,
+action:"terminate",
+description:"Broken pipe or socket",
+standard:"posix"},
 
-      if (!isIdentifierStart(cp)) {
-        return false;
-      }
-    } else if (!isIdentifierChar(cp)) {
-      return false;
-    }
-  }
+{
+name:"SIGALRM",
+number:14,
+action:"terminate",
+description:"Timeout or timer",
+standard:"posix"},
 
-  return !isFirst;
-}
+{
+name:"SIGTERM",
+number:15,
+action:"terminate",
+description:"Termination",
+standard:"ansi"},
 
-/***/ }),
-/* 476 */
-/***/ (function(module, exports, __webpack_require__) {
+{
+name:"SIGSTKFLT",
+number:16,
+action:"terminate",
+description:"Stack is empty or overflowed",
+standard:"other"},
 
-"use strict";
+{
+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"},
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isKeyword = isKeyword;
-exports.isReservedWord = isReservedWord;
-exports.isStrictBindOnlyReservedWord = isStrictBindOnlyReservedWord;
-exports.isStrictBindReservedWord = isStrictBindReservedWord;
-exports.isStrictReservedWord = isStrictReservedWord;
-const reservedWords = {
-  keyword: ["break", "case", "catch", "continue", "debugger", "default", "do", "else", "finally", "for", "function", "if", "return", "switch", "throw", "try", "var", "const", "while", "with", "new", "this", "super", "class", "extends", "export", "import", "null", "true", "false", "in", "instanceof", "typeof", "void", "delete"],
-  strict: ["implements", "interface", "let", "package", "private", "protected", "public", "static", "yield"],
-  strictBind: ["eval", "arguments"]
-};
-const keywords = new Set(reservedWords.keyword);
-const reservedWordsStrictSet = new Set(reservedWords.strict);
-const reservedWordsStrictBindSet = new Set(reservedWords.strictBind);
+{
+name:"SIGCONT",
+number:18,
+action:"unpause",
+description:"Unpaused",
+standard:"posix",
+forced:true},
 
-function isReservedWord(word, inModule) {
-  return inModule && word === "await" || word === "enum";
-}
+{
+name:"SIGSTOP",
+number:19,
+action:"pause",
+description:"Paused",
+standard:"posix",
+forced:true},
 
-function isStrictReservedWord(word, inModule) {
-  return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
-}
+{
+name:"SIGTSTP",
+number:20,
+action:"pause",
+description:"Paused using CTRL-Z or \"suspend\"",
+standard:"posix"},
 
-function isStrictBindOnlyReservedWord(word) {
-  return reservedWordsStrictBindSet.has(word);
-}
+{
+name:"SIGTTIN",
+number:21,
+action:"pause",
+description:"Background process cannot read terminal input",
+standard:"posix"},
 
-function isStrictBindReservedWord(word, inModule) {
-  return isStrictReservedWord(word, inModule) || isStrictBindOnlyReservedWord(word);
-}
+{
+name:"SIGBREAK",
+number:21,
+action:"terminate",
+description:"User interruption with CTRL-BREAK",
+standard:"other"},
 
-function isKeyword(word) {
-  return keywords.has(word);
-}
+{
+name:"SIGTTOU",
+number:22,
+action:"pause",
+description:"Background process cannot write to terminal output",
+standard:"posix"},
 
-/***/ }),
-/* 477 */
-/***/ (function(module, exports, __webpack_require__) {
+{
+name:"SIGURG",
+number:23,
+action:"ignore",
+description:"Socket received out-of-band data",
+standard:"bsd"},
 
-"use strict";
+{
+name:"SIGXCPU",
+number:24,
+action:"core",
+description:"Process timed out",
+standard:"bsd"},
 
-const escapeStringRegexp = __webpack_require__(478);
-const ansiStyles = __webpack_require__(479);
-const stdoutColor = __webpack_require__(484).stdout;
+{
+name:"SIGXFSZ",
+number:25,
+action:"core",
+description:"File too big",
+standard:"bsd"},
 
-const template = __webpack_require__(486);
+{
+name:"SIGVTALRM",
+number:26,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
 
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
+{
+name:"SIGPROF",
+number:27,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+{
+name:"SIGWINCH",
+number:28,
+action:"ignore",
+description:"Terminal window size changed",
+standard:"bsd"},
 
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
+{
+name:"SIGIO",
+number:29,
+action:"terminate",
+description:"I/O is available",
+standard:"other"},
 
-const styles = Object.create(null);
+{
+name:"SIGPOLL",
+number:29,
+action:"terminate",
+description:"Watched event",
+standard:"other"},
 
-function applyOptions(obj, options) {
-	options = options || {};
+{
+name:"SIGINFO",
+number:29,
+action:"ignore",
+description:"Request for process information",
+standard:"other"},
 
-	// 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;
-}
+{
+name:"SIGPWR",
+number:30,
+action:"terminate",
+description:"Device running out of power",
+standard:"systemv"},
 
-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));
-		};
+{
+name:"SIGSYS",
+number:31,
+action:"core",
+description:"Invalid system call",
+standard:"other"},
 
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
+{
+name:"SIGUNUSED",
+number:31,
+action:"terminate",
+description:"Invalid system call",
+standard:"other"}];exports.SIGNALS=SIGNALS;
+//# sourceMappingURL=core.js.map
 
-		chalk.template.constructor = Chalk;
+/***/ }),
 
-		return chalk.template;
-	}
+/***/ "../../node_modules/human-signals/build/src/main.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	applyOptions(this, options);
-}
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__("os");
 
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
+var _signals=__webpack_require__("../../node_modules/human-signals/build/src/signals.js");
+var _realtime=__webpack_require__("../../node_modules/human-signals/build/src/realtime.js");
 
-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');
-	}
+const getSignalsByName=function(){
+const signals=(0,_signals.getSignals)();
+return signals.reduce(getSignalByName,{});
 };
 
-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 getSignalByName=function(
+signalByNameMemo,
+{name,number,description,supported,action,forced,standard})
+{
+return{
+...signalByNameMemo,
+[name]:{name,number,description,supported,action,forced,standard}};
 
-const proto = Object.defineProperties(() => {}, styles);
+};
 
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
+const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
 
-	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;
-		}
-	});
+const getSignalsByNumber=function(){
+const signals=(0,_signals.getSignals)();
+const length=_realtime.SIGRTMAX+1;
+const signalsA=Array.from({length},(value,number)=>
+getSignalByNumber(number,signals));
 
-	// See below for fix regarding invisible grey/dim combination on Windows
-	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+return Object.assign({},...signalsA);
+};
 
-	// `__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
+const getSignalByNumber=function(number,signals){
+const signal=findSignalByNumber(number,signals);
 
-	return builder;
+if(signal===undefined){
+return{};
 }
 
-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}`);
-	}
+const{name,description,supported,action,forced,standard}=signal;
+return{
+[number]:{
+name,
+number,
+description,
+supported,
+action,
+forced,
+standard}};
 
-	// 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]));
-	}
+const findSignalByNumber=function(number,signals){
+const signal=signals.find(({name})=>_os.constants.signals[name]===number);
 
-	return template(chalk, parts.join(''));
+if(signal!==undefined){
+return signal;
 }
 
-Object.defineProperties(Chalk.prototype, styles);
-
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
+return signals.find(signalA=>signalA.number===number);
+};
 
+const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
+//# sourceMappingURL=main.js.map
 
 /***/ }),
-/* 478 */
+
+/***/ "../../node_modules/human-signals/build/src/realtime.js":
 /***/ (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"};
 
-var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-
-module.exports = function (str) {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	return str.replace(matchOperatorsRe, '\\$&');
 };
 
+const SIGRTMIN=34;
+const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
+//# sourceMappingURL=realtime.js.map
 
 /***/ }),
-/* 479 */
+
+/***/ "../../node_modules/human-signals/build/src/signals.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(480);
-
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
+Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__("os");
 
-const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+var _core=__webpack_require__("../../node_modules/human-signals/build/src/core.js");
+var _realtime=__webpack_require__("../../node_modules/human-signals/build/src/realtime.js");
 
-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],
+const getSignals=function(){
+const realtimeSignals=(0,_realtime.getRealtimeSignals)();
+const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
+return signals;
+};exports.getSignals=getSignals;
 
-			// 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]);
-		}
+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
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
+/***/ }),
 
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
-	}
+/***/ "../../node_modules/ignore/index.js":
+/***/ (function(module, exports) {
 
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
+// A simple implementation of make-array
+function makeArray (subject) {
+  return Array.isArray(subject)
+    ? subject
+    : [subject]
+}
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+const EMPTY = ''
+const SPACE = ' '
+const ESCAPE = '\\'
+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 = /^\.*\/|^\.+$/
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
+const SLASH = '/'
+const KEY_IGNORE = typeof Symbol !== 'undefined'
+  ? Symbol.for('node-ignore')
+  /* istanbul ignore next */
+  : 'node-ignore'
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+const define = (object, key, value) =>
+  Object.defineProperty(object, key, {value})
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
+const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
 
-		const suite = colorConvert[key];
+// 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.
+    : EMPTY
+)
 
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
+// See fixtures #59
+const cleanRangeBackSlash = slashes => {
+  const {length} = slashes
+  return slashes.slice(0, length - length % 2)
+}
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+// > 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`
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+// '`foo/`' should not continue with the '`..`'
+const REPLACERS = [
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
+  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
+  [
+    // (a\ ) -> (a )
+    // (a  ) -> (a)
+    // (a \ ) -> (a  )
+    /\\?\s+$/,
+    match => match.indexOf('\\') === 0
+      ? SPACE
+      : EMPTY
+  ],
 
-	return styles;
-}
+  // replace (\ ) with ' '
+  [
+    /\\\s/g,
+    () => SPACE
+  ],
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+  // Escape metacharacters
+  // which is written down by users but means special for regular expressions.
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(237)(module)))
+  // > 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}`
+  ],
 
-/***/ }),
-/* 480 */
-/***/ (function(module, exports, __webpack_require__) {
+  [
+    // > a question mark (?) matches a single character
+    /(?!\\)\?/g,
+    () => '[^/]'
+  ],
 
-var conversions = __webpack_require__(481);
-var route = __webpack_require__(483);
+  // leading slash
+  [
 
-var convert = {};
-
-var models = Object.keys(conversions);
+    // > 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 wrapRaw(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
+  // replace special metacharacter slash after the leading slash
+  [
+    /\//g,
+    () => '\\/'
+  ],
 
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
+  [
+    // > 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 '\\*'
+    /^\^*\\\*\\\*\\\//,
 
-		return fn(args);
-	};
+    // '**/foo' <-> 'foo'
+    () => '^(?:.*\\/)?'
+  ],
 
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+  // 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 () {
+      // If has a slash `/` at the beginning or middle
+      return !/\/(?!$)/.test(this)
+        // > Prior to 2.22.1
+        // > 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
 
-	return wrappedFn;
-}
+        // After 2.22.1 (compatible but clearer)
+        // > If there is a separator at the beginning or middle (or both)
+        // > of the pattern, then the pattern is relative to the directory
+        // > level of the particular .gitignore file itself.
+        // > Otherwise the pattern may also match at any level below
+        // > the .gitignore level.
+        ? '(?:^|\\/)'
 
-function wrapRounded(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
+        // > Otherwise, Git treats the pattern as a shell glob suitable for
+        // >   consumption by fnmatch(3)
+        : '^'
+    }
+  ],
 
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
+  // two globstars
+  [
+    // Use lookahead assertions so that we could match more than one `'/**'`
+    /\\\/\\\*\\\*(?=\\\/|$)/g,
 
-		var result = fn(args);
+    // Zero, one or several directories
+    // should not use '*', or it will be replaced by the next replacer
 
-		// we're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (var len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
+    // Check if it is not the last `'/**'`
+    (_, index, str) => index + 6 < str.length
 
-		return result;
-	};
+      // 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.
+      // '/**/'
+      ? '(?:\\/[^\\/]+)*'
 
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+      // case: /**
+      // > A trailing `"/**"` matches everything inside.
 
-	return wrappedFn;
-}
+      // #21: everything inside but it should not include the current folder
+      : '\\/.+'
+  ],
 
-models.forEach(function (fromModel) {
-	convert[fromModel] = {};
+  // intermediate wildcards
+  [
+    // Never replace escaped '*'
+    // ignore rule '\*' will match the path '*'
 
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
+    // 'abc.*/' -> go
+    // 'abc.*'  -> skip this rule
+    /(^|[^\\]+)\\\*(?=.+)/g,
 
-	var routes = route(fromModel);
-	var routeModels = Object.keys(routes);
+    // '*.js' matches '.js'
+    // '*.js' doesn't match 'abc'
+    (_, p1) => `${p1}[^\\/]*`
+  ],
 
-	routeModels.forEach(function (toModel) {
-		var fn = routes[toModel];
+  [
+    // unescape, revert step 3 except for back slash
+    // For example, if a user escape a '\\*',
+    // after step 3, the result will be '\\\\\\*'
+    /\\\\\\(?=[$.|*+(){^])/g,
+    () => ESCAPE
+  ],
 
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
+  [
+    // '\\\\' -> '\\'
+    /\\\\/g,
+    () => ESCAPE
+  ],
 
-module.exports = convert;
+  [
+    // > The range notation, e.g. [a-zA-Z],
+    // > can be used to match one of the characters in a range.
 
+    // `\` is escaped by step 3
+    /(\\)?\[([^\]/]*?)(\\*)($|\])/g,
+    (match, leadEscape, range, endEscape, close) => leadEscape === ESCAPE
+      // '\\[bar]' -> '\\\\[bar\\]'
+      ? `\\[${range}${cleanRangeBackSlash(endEscape)}${close}`
+      : close === ']'
+        ? endEscape.length % 2 === 0
+          // A normal case, and it is a range notation
+          // '[bar]'
+          // '[bar\\\\]'
+          ? `[${sanitizeRange(range)}${endEscape}]`
+          // Invalid range notaton
+          // '[bar\\]' -> '[bar\\\\]'
+          : '[]'
+        : '[]'
+  ],
 
-/***/ }),
-/* 481 */
-/***/ (function(module, exports, __webpack_require__) {
+  // ending
+  [
+    // 'js' will not match 'js.'
+    // 'ab' will not match 'abc'
+    /(?:[^*])$/,
 
-/* MIT license */
-var cssKeywords = __webpack_require__(482);
+    // WTF!
+    // https://git-scm.com/docs/gitignore
+    // changes in [2.22.1](https://git-scm.com/docs/gitignore/2.22.1)
+    // which re-fixes #24, #38
 
-// NOTE: conversions should only return primitive values (i.e. arrays, or
-//       values that give correct `typeof` results).
-//       do not use box values types (i.e. Number(), String(), etc.)
+    // > If there is a separator at the end of the pattern then the pattern
+    // > will only match directories, otherwise the pattern can match both
+    // > files and directories.
 
-var reverseKeywords = {};
-for (var key in cssKeywords) {
-	if (cssKeywords.hasOwnProperty(key)) {
-		reverseKeywords[cssKeywords[key]] = key;
-	}
-}
+    // 'js*' will not match 'a.js'
+    // 'js/' will not match 'a.js'
+    // 'js' will match 'a.js' and 'a.js/'
+    match => /\/$/.test(match)
+      // foo/ will not match 'foo'
+      ? `${match}$`
+      // foo matches 'foo' and 'foo/'
+      : `${match}(?=$|\\/$)`
+  ],
 
-var convert = module.exports = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
-};
+  // trailing wildcard
+  [
+    /(\^|\\\/)?\\\*$/,
+    (_, p1) => {
+      const prefix = p1
+        // '\^':
+        // '/*' does not match EMPTY
+        // '/*' does not match everything
 
-// hide .channels and .labels properties
-for (var model in convert) {
-	if (convert.hasOwnProperty(model)) {
-		if (!('channels' in convert[model])) {
-			throw new Error('missing channels property: ' + model);
-		}
+        // '\\\/':
+        // 'abc/*' does not match 'abc/'
+        ? `${p1}[^/]+`
 
-		if (!('labels' in convert[model])) {
-			throw new Error('missing channel labels property: ' + model);
-		}
+        // 'a*' matches 'a'
+        // 'a*' matches 'aa'
+        : '[^/]*'
 
-		if (convert[model].labels.length !== convert[model].channels) {
-			throw new Error('channel and label counts mismatch: ' + model);
-		}
+      return `${prefix}(?=$|\\/$)`
+    }
+  ],
+]
 
-		var channels = convert[model].channels;
-		var labels = convert[model].labels;
-		delete convert[model].channels;
-		delete convert[model].labels;
-		Object.defineProperty(convert[model], 'channels', {value: channels});
-		Object.defineProperty(convert[model], 'labels', {value: labels});
-	}
-}
+// A simple cache, because an ignore rule only has only one certain meaning
+const regexCache = Object.create(null)
 
-convert.rgb.hsl = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var min = Math.min(r, g, b);
-	var max = Math.max(r, g, b);
-	var delta = max - min;
-	var h;
-	var s;
-	var l;
+// @param {pattern}
+const makeRegex = (pattern, negative, ignorecase) => {
+  const r = regexCache[pattern]
+  if (r) {
+    return r
+  }
 
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
+  // const replacers = negative
+  //   ? NEGATIVE_REPLACERS
+  //   : POSITIVE_REPLACERS
 
-	h = Math.min(h * 60, 360);
+  const source = REPLACERS.reduce(
+    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
+    pattern
+  )
 
-	if (h < 0) {
-		h += 360;
-	}
+  return regexCache[pattern] = ignorecase
+    ? new RegExp(source, 'i')
+    : new RegExp(source)
+}
 
-	l = (min + max) / 2;
+const isString = subject => typeof subject === 'string'
 
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
+// > 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)
 
-	return [h, s * 100, l * 100];
-};
+  // > A line starting with # serves as a comment.
+  && pattern.indexOf('#') !== 0
 
-convert.rgb.hsv = function (rgb) {
-	var rdif;
-	var gdif;
-	var bdif;
-	var h;
-	var s;
+const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
 
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var v = Math.max(r, g, b);
-	var diff = v - Math.min(r, g, b);
-	var diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
+class IgnoreRule {
+  constructor (
+    origin,
+    pattern,
+    negative,
+    regex
+  ) {
+    this.origin = origin
+    this.pattern = pattern
+    this.negative = negative
+    this.regex = regex
+  }
+}
 
-	if (diff === 0) {
-		h = s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
+const createRule = (pattern, ignorecase) => {
+  const origin = pattern
+  let negative = false
 
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
+  // > An optional prefix "!" which negates the pattern;
+  if (pattern.indexOf('!') === 0) {
+    negative = true
+    pattern = pattern.substr(1)
+  }
 
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
-};
+  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, '#')
 
-convert.rgb.hwb = function (rgb) {
-	var r = rgb[0];
-	var g = rgb[1];
-	var b = rgb[2];
-	var h = convert.rgb.hsl(rgb)[0];
-	var w = 1 / 255 * Math.min(r, Math.min(g, b));
+  const regex = makeRegex(pattern, negative, ignorecase)
 
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+  return new IgnoreRule(
+    origin,
+    pattern,
+    negative,
+    regex
+  )
+}
 
-	return [h, w * 100, b * 100];
-};
+const throwError = (message, Ctor) => {
+  throw new Ctor(message)
+}
 
-convert.rgb.cmyk = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var c;
-	var m;
-	var y;
-	var k;
+const checkPath = (path, originalPath, doThrow) => {
+  if (!isString(path)) {
+    return doThrow(
+      `path must be a string, but got \`${originalPath}\``,
+      TypeError
+    )
+  }
 
-	k = Math.min(1 - r, 1 - g, 1 - b);
-	c = (1 - r - k) / (1 - k) || 0;
-	m = (1 - g - k) / (1 - k) || 0;
-	y = (1 - b - k) / (1 - k) || 0;
+  // We don't know if we should ignore EMPTY, so throw
+  if (!path) {
+    return doThrow(`path must not be empty`, TypeError)
+  }
 
-	return [c * 100, m * 100, y * 100, k * 100];
-};
+  // 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
+    )
+  }
 
-/**
- * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
- * */
-function comparativeDistance(x, y) {
-	return (
-		Math.pow(x[0] - y[0], 2) +
-		Math.pow(x[1] - y[1], 2) +
-		Math.pow(x[2] - y[2], 2)
-	);
+  return true
 }
 
-convert.rgb.keyword = function (rgb) {
-	var reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
+const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
-	var currentClosestDistance = Infinity;
-	var currentClosestKeyword;
+checkPath.isNotRelative = isNotRelative
+checkPath.convert = p => p
 
-	for (var keyword in cssKeywords) {
-		if (cssKeywords.hasOwnProperty(keyword)) {
-			var value = cssKeywords[keyword];
+class Ignore {
+  constructor ({
+    ignorecase = true
+  } = {}) {
+    this._rules = []
+    this._ignorecase = ignorecase
+    define(this, KEY_IGNORE, true)
+    this._initCache()
+  }
 
-			// Compute comparative distance
-			var distance = comparativeDistance(rgb, value);
+  _initCache () {
+    this._ignoreCache = Object.create(null)
+    this._testCache = Object.create(null)
+  }
 
-			// Check if its less, if so set as closest
-			if (distance < currentClosestDistance) {
-				currentClosestDistance = distance;
-				currentClosestKeyword = keyword;
-			}
-		}
-	}
+  _addPattern (pattern) {
+    // #32
+    if (pattern && pattern[KEY_IGNORE]) {
+      this._rules = this._rules.concat(pattern._rules)
+      this._added = true
+      return
+    }
 
-	return currentClosestKeyword;
-};
+    if (checkPattern(pattern)) {
+      const rule = createRule(pattern, this._ignorecase)
+      this._added = true
+      this._rules.push(rule)
+    }
+  }
 
-convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
-};
+  // @param {Array<string> | string | Ignore} pattern
+  add (pattern) {
+    this._added = false
 
-convert.rgb.xyz = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
+    makeArray(
+      isString(pattern)
+        ? splitPattern(pattern)
+        : pattern
+    ).forEach(this._addPattern, this)
 
-	// assume sRGB
-	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
-	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
-	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
+    // Some rules have just added to the ignore,
+    // making the behavior changed.
+    if (this._added) {
+      this._initCache()
+    }
 
-	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
+    return this
+  }
 
-	return [x * 100, y * 100, z * 100];
-};
+  // legacy
+  addPattern (pattern) {
+    return this.add(pattern)
+  }
 
-convert.rgb.lab = function (rgb) {
-	var xyz = convert.rgb.xyz(rgb);
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
+  //          |           ignored : unignored
+  // negative |   0:0   |   0:1   |   1:0   |   1:1
+  // -------- | ------- | ------- | ------- | --------
+  //     0    |  TEST   |  TEST   |  SKIP   |    X
+  //     1    |  TESTIF |  SKIP   |  TEST   |    X
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+  // - SKIP: always skip
+  // - TEST: always test
+  // - TESTIF: only test if checkUnignored
+  // - X: that never happen
 
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
+  // @param {boolean} whether should check if the path is unignored,
+  //   setting `checkUnignored` to `false` could reduce additional
+  //   path matching.
 
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
+  // @returns {TestResult} true if a file is ignored
+  _testOne (path, checkUnignored) {
+    let ignored = false
+    let unignored = false
 
-	return [l, a, b];
-};
+    this._rules.forEach(rule => {
+      const {negative} = rule
+      if (
+        unignored === negative && ignored !== unignored
+        || negative && !ignored && !unignored && !checkUnignored
+      ) {
+        return
+      }
 
-convert.hsl.rgb = function (hsl) {
-	var h = hsl[0] / 360;
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var t1;
-	var t2;
-	var t3;
-	var rgb;
-	var val;
+      const matched = rule.regex.test(path)
 
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
+      if (matched) {
+        ignored = !negative
+        unignored = negative
+      }
+    })
 
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
+    return {
+      ignored,
+      unignored
+    }
+  }
 
-	t1 = 2 * l - t2;
+  // @returns {TestResult}
+  _test (originalPath, cache, checkUnignored, slices) {
+    const path = originalPath
+      // Supports nullable path
+      && checkPath.convert(originalPath)
 
-	rgb = [0, 0, 0];
-	for (var i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
-		if (t3 > 1) {
-			t3--;
-		}
+    checkPath(path, originalPath, throwError)
 
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-		} else {
-			val = t1;
-		}
+    return this._t(path, cache, checkUnignored, slices)
+  }
 
-		rgb[i] = val * 255;
-	}
+  _t (path, cache, checkUnignored, slices) {
+    if (path in cache) {
+      return cache[path]
+    }
 
-	return rgb;
-};
+    if (!slices) {
+      // path/to/a.js
+      // ['path', 'to', 'a.js']
+      slices = path.split(SLASH)
+    }
 
-convert.hsl.hsv = function (hsl) {
-	var h = hsl[0];
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var smin = s;
-	var lmin = Math.max(l, 0.01);
-	var sv;
-	var v;
+    slices.pop()
 
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	v = (l + s) / 2;
-	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
+    // If the path has no parent directory, just test it
+    if (!slices.length) {
+      return cache[path] = this._testOne(path, checkUnignored)
+    }
 
-	return [h, sv * 100, v * 100];
-};
+    const parent = this._t(
+      slices.join(SLASH) + SLASH,
+      cache,
+      checkUnignored,
+      slices
+    )
 
-convert.hsv.rgb = function (hsv) {
-	var h = hsv[0] / 60;
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var hi = Math.floor(h) % 6;
+    // 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 f = h - Math.floor(h);
-	var p = 255 * v * (1 - s);
-	var q = 255 * v * (1 - (s * f));
-	var t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
+  ignores (path) {
+    return this._test(path, this._ignoreCache, false).ignored
+  }
 
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
-	}
-};
+  createFilter () {
+    return path => !this.ignores(path)
+  }
 
-convert.hsv.hsl = function (hsv) {
-	var h = hsv[0];
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var vmin = Math.max(v, 0.01);
-	var lmin;
-	var sl;
-	var l;
+  filter (paths) {
+    return makeArray(paths).filter(this.createFilter())
+  }
 
-	l = (2 - s) * v;
-	lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
+  // @returns {TestResult}
+  test (path) {
+    return this._test(path, this._testCache, true)
+  }
+}
 
-	return [h, sl * 100, l * 100];
-};
+const factory = options => new Ignore(options)
 
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-convert.hwb.rgb = function (hwb) {
-	var h = hwb[0] / 360;
-	var wh = hwb[1] / 100;
-	var bl = hwb[2] / 100;
-	var ratio = wh + bl;
-	var i;
-	var v;
-	var f;
-	var n;
+const returnFalse = () => false
 
-	// wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
+const isPathValid = path =>
+  checkPath(path && checkPath.convert(path), path, returnFalse)
 
-	i = Math.floor(6 * h);
-	v = 1 - bl;
-	f = 6 * h - i;
+factory.isPathValid = isPathValid
 
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
+// Fixes typescript
+factory.default = factory
 
-	n = wh + f * (v - wh); // linear interpolation
+module.exports = factory
 
-	var r;
-	var g;
-	var b;
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v; g = n; b = wh; break;
-		case 1: r = n; g = v; b = wh; break;
-		case 2: r = wh; g = v; b = n; break;
-		case 3: r = wh; g = n; b = v; break;
-		case 4: r = n; g = wh; b = v; break;
-		case 5: r = v; g = wh; b = n; break;
-	}
+// 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, '/')
 
-	return [r * 255, g * 255, b * 255];
-};
+  checkPath.convert = makePosix
 
-convert.cmyk.rgb = function (cmyk) {
-	var c = cmyk[0] / 100;
-	var m = cmyk[1] / 100;
-	var y = cmyk[2] / 100;
-	var k = cmyk[3] / 100;
-	var r;
-	var g;
-	var b;
+  // '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)
+}
 
-	r = 1 - Math.min(1, c * (1 - k) + k);
-	g = 1 - Math.min(1, m * (1 - k) + k);
-	b = 1 - Math.min(1, y * (1 - k) + k);
 
-	return [r * 255, g * 255, b * 255];
-};
+/***/ }),
 
-convert.xyz.rgb = function (xyz) {
-	var x = xyz[0] / 100;
-	var y = xyz[1] / 100;
-	var z = xyz[2] / 100;
-	var r;
-	var g;
-	var b;
+/***/ "../../node_modules/imurmurhash/imurmurhash.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
+/**
+ * @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;
 
-	// assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
-		: r * 12.92;
+    // 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);
+        }
 
-	g = g > 0.0031308
-		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
-		: g * 12.92;
+        if (m !== this) {
+            return m;
+        }
+    };
 
-	b = b > 0.0031308
-		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
-		: b * 12.92;
+    // 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;
 
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
+        len = key.length;
+        this.len += len;
 
-	return [r * 255, g * 255, b * 255];
-};
+        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;
+        }
 
-convert.xyz.lab = function (xyz) {
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
+        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;
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+                h1 ^= k1;
+                h1 = (h1 << 13) | (h1 >>> 19);
+                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
 
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
+                if (i >= len) {
+                    break;
+                }
 
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
+                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);
+            }
 
-	return [l, a, b];
-};
+            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);
+            }
 
-convert.lab.xyz = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var x;
-	var y;
-	var z;
+            this.h1 = h1;
+        }
 
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
+        this.k1 = k1;
+        return this;
+    };
 
-	var y2 = Math.pow(y, 3);
-	var x2 = Math.pow(x, 3);
-	var z2 = Math.pow(z, 3);
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
+    // 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;
 
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
+        if (k1 > 0) {
+            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
+            k1 = (k1 << 15) | (k1 >>> 17);
+            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
+            h1 ^= k1;
+        }
 
-	return [x, y, z];
-};
+        h1 ^= this.len;
 
-convert.lab.lch = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var hr;
-	var h;
-	var c;
+        h1 ^= h1 >>> 16;
+        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
+        h1 ^= h1 >>> 13;
+        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
+        h1 ^= h1 >>> 16;
 
-	hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
+        return h1 >>> 0;
+    };
 
-	if (h < 0) {
-		h += 360;
-	}
+    // 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;
+    };
 
-	c = Math.sqrt(a * a + b * b);
+    // 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();
 
-	return [l, c, h];
-};
+    if (true) {
+        module.exports = MurmurHash3;
+    } else {}
+}());
 
-convert.lch.lab = function (lch) {
-	var l = lch[0];
-	var c = lch[1];
-	var h = lch[2];
-	var a;
-	var b;
-	var hr;
 
-	hr = h / 360 * 2 * Math.PI;
-	a = c * Math.cos(hr);
-	b = c * Math.sin(hr);
+/***/ }),
 
-	return [l, a, b];
-};
+/***/ "../../node_modules/inflight/inflight.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.rgb.ansi16 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
-
-	value = Math.round(value / 50);
-
-	if (value === 0) {
-		return 30;
-	}
-
-	var ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
+var wrappy = __webpack_require__("../../node_modules/wrappy/wrappy.js")
+var reqs = Object.create(null)
+var once = __webpack_require__("../../node_modules/once/once.js")
 
-	if (value === 2) {
-		ansi += 60;
-	}
+module.exports = wrappy(inflight)
 
-	return ansi;
-};
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
+  }
+}
 
-convert.hsv.ansi16 = function (args) {
-	// optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
-};
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
 
-convert.rgb.ansi256 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
+    // 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]
+      }
+    }
+  })
+}
 
-	// we use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
+function slice (args) {
+  var length = args.length
+  var array = []
 
-		if (r > 248) {
-			return 231;
-		}
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
 
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
 
-	var ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
+/***/ }),
 
-	return ansi;
-};
+/***/ "../../node_modules/inherits/inherits.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.ansi16.rgb = function (args) {
-	var color = args % 10;
+try {
+  var util = __webpack_require__("util");
+  /* istanbul ignore next */
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  /* istanbul ignore next */
+  module.exports = __webpack_require__("../../node_modules/inherits/inherits_browser.js");
+}
 
-	// handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
 
-		color = color / 10.5 * 255;
+/***/ }),
 
-		return [color, color, color];
-	}
+/***/ "../../node_modules/inherits/inherits_browser.js":
+/***/ (function(module, exports) {
 
-	var mult = (~~(args > 50) + 1) * 0.5;
-	var r = ((color & 1) * mult) * 255;
-	var g = (((color >> 1) & 1) * mult) * 255;
-	var b = (((color >> 2) & 1) * mult) * 255;
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    if (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) {
+    if (superCtor) {
+      ctor.super_ = superCtor
+      var TempCtor = function () {}
+      TempCtor.prototype = superCtor.prototype
+      ctor.prototype = new TempCtor()
+      ctor.prototype.constructor = ctor
+    }
+  }
+}
 
-	return [r, g, b];
-};
 
-convert.ansi256.rgb = function (args) {
-	// handle greyscale
-	if (args >= 232) {
-		var c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
+/***/ }),
 
-	args -= 16;
+/***/ "../../node_modules/is-arrayish/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	var rem;
-	var r = Math.floor(args / 36) / 5 * 255;
-	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	var b = (rem % 6) / 5 * 255;
+"use strict";
 
-	return [r, g, b];
-};
 
-convert.rgb.hex = function (args) {
-	var integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
+module.exports = function isArrayish(obj) {
+	if (!obj) {
+		return false;
+	}
 
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
+	return obj instanceof Array || Array.isArray(obj) ||
+		(obj.length >= 0 && obj.splice instanceof Function);
 };
 
-convert.hex.rgb = function (args) {
-	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
-
-	var colorString = match[0];
 
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(function (char) {
-			return char + char;
-		}).join('');
-	}
+/***/ }),
 
-	var integer = parseInt(colorString, 16);
-	var r = (integer >> 16) & 0xFF;
-	var g = (integer >> 8) & 0xFF;
-	var b = integer & 0xFF;
+/***/ "../../node_modules/is-core-module/core.json":
+/***/ (function(module) {
 
-	return [r, g, b];
-};
+module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
 
-convert.rgb.hcg = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var max = Math.max(Math.max(r, g), b);
-	var min = Math.min(Math.min(r, g), b);
-	var chroma = (max - min);
-	var grayscale;
-	var hue;
+/***/ }),
 
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
+/***/ "../../node_modules/is-core-module/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma + 4;
-	}
+"use strict";
 
-	hue /= 6;
-	hue %= 1;
 
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
+var has = __webpack_require__("../../node_modules/has/src/index.js");
 
-convert.hsl.hcg = function (hsl) {
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var c = 1;
-	var f = 0;
+function specifierIncluded(current, specifier) {
+	var nodeParts = current.split('.');
+	var parts = specifier.split(' ');
+	var op = parts.length > 1 ? parts[0] : '=';
+	var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
 
-	if (l < 0.5) {
-		c = 2.0 * s * l;
-	} else {
-		c = 2.0 * s * (1.0 - l);
+	for (var i = 0; i < 3; ++i) {
+		var cur = parseInt(nodeParts[i] || 0, 10);
+		var ver = parseInt(versionParts[i] || 0, 10);
+		if (cur === ver) {
+			continue; // eslint-disable-line no-restricted-syntax, no-continue
+		}
+		if (op === '<') {
+			return cur < ver;
+		}
+		if (op === '>=') {
+			return cur >= ver;
+		}
+		return false;
 	}
+	return op === '>=';
+}
 
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
+function matchesRange(current, range) {
+	var specifiers = range.split(/ ?&& ?/);
+	if (specifiers.length === 0) {
+		return false;
 	}
-
-	return [hsl[0], c * 100, f * 100];
-};
-
-convert.hsv.hcg = function (hsv) {
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-
-	var c = s * v;
-	var f = 0;
-
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
+	for (var i = 0; i < specifiers.length; ++i) {
+		if (!specifierIncluded(current, specifiers[i])) {
+			return false;
+		}
 	}
+	return true;
+}
 
-	return [hsv[0], c * 100, f * 100];
-};
+function versionIncluded(nodeVersion, specifierValue) {
+	if (typeof specifierValue === 'boolean') {
+		return specifierValue;
+	}
 
-convert.hcg.rgb = function (hcg) {
-	var h = hcg[0] / 360;
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
+	var current = typeof nodeVersion === 'undefined'
+		? process.versions && process.versions.node
+		: nodeVersion;
 
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
+	if (typeof current !== 'string') {
+		throw new TypeError(typeof nodeVersion === 'undefined' ? 'Unable to determine current node version' : 'If provided, a valid node version is required');
 	}
 
-	var pure = [0, 0, 0];
-	var hi = (h % 1) * 6;
-	var v = hi % 1;
-	var w = 1 - v;
-	var mg = 0;
-
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
+	if (specifierValue && typeof specifierValue === 'object') {
+		for (var i = 0; i < specifierValue.length; ++i) {
+			if (matchesRange(current, specifierValue[i])) {
+				return true;
+			}
+		}
+		return false;
 	}
+	return matchesRange(current, specifierValue);
+}
 
-	mg = (1.0 - c) * g;
+var data = __webpack_require__("../../node_modules/is-core-module/core.json");
 
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
+module.exports = function isCore(x, nodeVersion) {
+	return has(data, x) && versionIncluded(nodeVersion, data[x]);
 };
 
-convert.hcg.hsv = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var v = c + g * (1.0 - c);
-	var f = 0;
-
-	if (v > 0.0) {
-		f = c / v;
-	}
 
-	return [hcg[0], f * 100, v * 100];
-};
+/***/ }),
 
-convert.hcg.hsl = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
+/***/ "../../node_modules/is-extglob/index.js":
+/***/ (function(module, exports) {
 
-	var l = g * (1.0 - c) + 0.5 * c;
-	var s = 0;
+/*!
+ * is-extglob <https://github.com/jonschlinkert/is-extglob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
+module.exports = function isExtglob(str) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
 
-	return [hcg[0], s * 100, l * 100];
-};
+  var match;
+  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
+    if (match[2]) return true;
+    str = str.slice(match.index + match[0].length);
+  }
 
-convert.hcg.hwb = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-	var v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+  return false;
 };
 
-convert.hwb.hcg = function (hwb) {
-	var w = hwb[1] / 100;
-	var b = hwb[2] / 100;
-	var v = 1 - b;
-	var c = v - w;
-	var g = 0;
 
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
+/***/ }),
 
-	return [hwb[0], c * 100, g * 100];
-};
+/***/ "../../node_modules/is-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
+var isExtglob = __webpack_require__("../../node_modules/is-extglob/index.js");
+var chars = { '{': '}', '(': ')', '[': ']'};
+var strictCheck = function(str) {
+  if (str[0] === '!') {
+    return true;
+  }
+  var index = 0;
+  var pipeIndex = -2;
+  var closeSquareIndex = -2;
+  var closeCurlyIndex = -2;
+  var closeParenIndex = -2;
+  var backSlashIndex = -2;
+  while (index < str.length) {
+    if (str[index] === '*') {
+      return true;
+    }
 
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
+    if (str[index + 1] === '?' && /[\].+)]/.test(str[index])) {
+      return true;
+    }
 
-convert.gray.hsl = convert.gray.hsv = function (args) {
-	return [0, 0, args[0]];
-};
+    if (closeSquareIndex !== -1 && str[index] === '[' && str[index + 1] !== ']') {
+      if (closeSquareIndex < index) {
+        closeSquareIndex = str.indexOf(']', index);
+      }
+      if (closeSquareIndex > index) {
+        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
+          return true;
+        }
+        backSlashIndex = str.indexOf('\\', index);
+        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
+          return true;
+        }
+      }
+    }
 
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
+    if (closeCurlyIndex !== -1 && str[index] === '{' && str[index + 1] !== '}') {
+      closeCurlyIndex = str.indexOf('}', index);
+      if (closeCurlyIndex > index) {
+        backSlashIndex = str.indexOf('\\', index);
+        if (backSlashIndex === -1 || backSlashIndex > closeCurlyIndex) {
+          return true;
+        }
+      }
+    }
 
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
+    if (closeParenIndex !== -1 && str[index] === '(' && str[index + 1] === '?' && /[:!=]/.test(str[index + 2]) && str[index + 3] !== ')') {
+      closeParenIndex = str.indexOf(')', index);
+      if (closeParenIndex > index) {
+        backSlashIndex = str.indexOf('\\', index);
+        if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
+          return true;
+        }
+      }
+    }
 
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
+    if (pipeIndex !== -1 && str[index] === '(' && str[index + 1] !== '|') {
+      if (pipeIndex < index) {
+        pipeIndex = str.indexOf('|', index);
+      }
+      if (pipeIndex !== -1 && str[pipeIndex + 1] !== ')') {
+        closeParenIndex = str.indexOf(')', pipeIndex);
+        if (closeParenIndex > pipeIndex) {
+          backSlashIndex = str.indexOf('\\', pipeIndex);
+          if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
+            return true;
+          }
+        }
+      }
+    }
 
-convert.gray.hex = function (gray) {
-	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	var integer = (val << 16) + (val << 8) + val;
+    if (str[index] === '\\') {
+      var open = str[index + 1];
+      index += 2;
+      var close = chars[open];
 
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+      if (close) {
+        var n = str.indexOf(close, index);
+        if (n !== -1) {
+          index = n + 1;
+        }
+      }
 
-convert.rgb.gray = function (rgb) {
-	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
+      if (str[index] === '!') {
+        return true;
+      }
+    } else {
+      index++;
+    }
+  }
+  return false;
 };
 
+var relaxedCheck = function(str) {
+  if (str[0] === '!') {
+    return true;
+  }
+  var index = 0;
+  while (index < str.length) {
+    if (/[*?{}()[\]]/.test(str[index])) {
+      return true;
+    }
 
-/***/ }),
-/* 482 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
-
-
-/***/ }),
-/* 483 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (str[index] === '\\') {
+      var open = str[index + 1];
+      index += 2;
+      var close = chars[open];
 
-var conversions = __webpack_require__(481);
+      if (close) {
+        var n = str.indexOf(close, index);
+        if (n !== -1) {
+          index = n + 1;
+        }
+      }
 
-/*
-	this function routes a model to all other models.
+      if (str[index] === '!') {
+        return true;
+      }
+    } else {
+      index++;
+    }
+  }
+  return false;
+};
 
-	all functions that are routed have a property `.conversion` attached
-	to the returned synthetic function. This property is an array
-	of strings, each with the steps in between the 'from' and 'to'
-	color models (inclusive).
+module.exports = function isGlob(str, options) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
 
-	conversions that are not possible simply are not included.
-*/
+  if (isExtglob(str)) {
+    return true;
+  }
 
-function buildGraph() {
-	var graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	var models = Object.keys(conversions);
+  var check = strictCheck;
 
-	for (var len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
+  // optionally relax check
+  if (options && options.strict === false) {
+    check = relaxedCheck;
+  }
 
-	return graph;
-}
+  return check(str);
+};
 
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	var graph = buildGraph();
-	var queue = [fromModel]; // unshift -> queue -> pop
 
-	graph[fromModel].distance = 0;
+/***/ }),
 
-	while (queue.length) {
-		var current = queue.pop();
-		var adjacents = Object.keys(conversions[current]);
+/***/ "../../node_modules/is-interactive/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		for (var len = adjacents.length, i = 0; i < len; i++) {
-			var adjacent = adjacents[i];
-			var node = graph[adjacent];
+"use strict";
 
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
 
-	return graph;
-}
+module.exports = ({stream = process.stdout} = {}) => {
+	return Boolean(
+		stream && stream.isTTY &&
+		process.env.TERM !== 'dumb' &&
+		!('CI' in process.env)
+	);
+};
 
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
 
-function wrapConversion(toModel, graph) {
-	var path = [graph[toModel].parent, toModel];
-	var fn = conversions[graph[toModel].parent][toModel];
+/***/ }),
 
-	var cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
+/***/ "../../node_modules/is-path-cwd/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	fn.conversion = path;
-	return fn;
-}
+"use strict";
 
-module.exports = function (fromModel) {
-	var graph = deriveBFS(fromModel);
-	var conversion = {};
+const path = __webpack_require__("path");
 
-	var models = Object.keys(graph);
-	for (var len = models.length, i = 0; i < len; i++) {
-		var toModel = models[i];
-		var node = graph[toModel];
+module.exports = path_ => {
+	let cwd = process.cwd();
 
-		if (node.parent === null) {
-			// no possible conversion, or this node is the source model.
-			continue;
-		}
+	path_ = path.resolve(path_);
 
-		conversion[toModel] = wrapConversion(toModel, graph);
+	if (process.platform === 'win32') {
+		cwd = cwd.toLowerCase();
+		path_ = path_.toLowerCase();
 	}
 
-	return conversion;
+	return path_ === cwd;
 };
 
 
-
 /***/ }),
-/* 484 */
+
+/***/ "../../node_modules/is-path-inside/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const os = __webpack_require__(243);
-const hasFlag = __webpack_require__(485);
-
-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) {
-		return 0;
-	}
+const path = __webpack_require__("path");
 
-	const min = forceColor ? 1 : 0;
+module.exports = (childPath, parentPath) => {
+	childPath = path.resolve(childPath);
+	parentPath = path.resolve(parentPath);
 
 	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;
+		childPath = childPath.toLowerCase();
+		parentPath = parentPath.toLowerCase();
 	}
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
-
-		return min;
+	if (childPath === parentPath) {
+		return false;
 	}
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+	childPath += path.sep;
+	parentPath += path.sep;
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+	return childPath.startsWith(parentPath);
+};
 
-	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;
-	}
+/***/ "../../node_modules/is-plain-obj/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+"use strict";
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
 
-	if (env.TERM === 'dumb') {
-		return min;
+module.exports = value => {
+	if (Object.prototype.toString.call(value) !== '[object Object]') {
+		return false;
 	}
 
-	return min;
-}
-
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
-}
-
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
+	const prototype = Object.getPrototypeOf(value);
+	return prototype === null || prototype === Object.prototype;
 };
 
 
 /***/ }),
-/* 485 */
+
+/***/ "../../node_modules/is-stream/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = (flag, argv) => {
-	argv = argv || process.argv;
-	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-	const pos = argv.indexOf(prefix + flag);
-	const terminatorPos = argv.indexOf('--');
-	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-};
 
+const isStream = stream =>
+	stream !== null &&
+	typeof stream === 'object' &&
+	typeof stream.pipe === 'function';
 
-/***/ }),
-/* 486 */
-/***/ (function(module, exports, __webpack_require__) {
+isStream.writable = stream =>
+	isStream(stream) &&
+	stream.writable !== false &&
+	typeof stream._write === 'function' &&
+	typeof stream._writableState === 'object';
 
-"use strict";
+isStream.readable = stream =>
+	isStream(stream) &&
+	stream.readable !== false &&
+	typeof stream._read === 'function' &&
+	typeof stream._readableState === 'object';
 
-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;
+isStream.duplex = stream =>
+	isStream.writable(stream) &&
+	isStream.readable(stream);
 
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
+isStream.transform = stream =>
+	isStream.duplex(stream) &&
+	typeof stream._transform === 'function' &&
+	typeof stream._transformState === 'object';
 
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
+module.exports = isStream;
 
-	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}')`);
-		}
-	}
+/***/ "../../node_modules/isexe/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return results;
+var fs = __webpack_require__("fs")
+var core
+if (process.platform === 'win32' || global.TESTING_WINDOWS) {
+  core = __webpack_require__("../../node_modules/isexe/windows.js")
+} else {
+  core = __webpack_require__("../../node_modules/isexe/mode.js")
 }
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+module.exports = isexe
+isexe.sync = sync
 
-	const results = [];
-	let matches;
+function isexe (path, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+  if (!cb) {
+    if (typeof Promise !== 'function') {
+      throw new TypeError('callback not provided')
+    }
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+    return new Promise(function (resolve, reject) {
+      isexe(path, options || {}, function (er, is) {
+        if (er) {
+          reject(er)
+        } else {
+          resolve(is)
+        }
+      })
+    })
+  }
 
-	return results;
+  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 buildStyle(chalk, styles) {
-	const enabled = {};
+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
+    }
+  }
+}
 
-	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];
-			}
-		}
-	}
+/***/ "../../node_modules/isexe/mode.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return current;
+module.exports = isexe
+isexe.sync = sync
+
+var fs = __webpack_require__("fs")
+
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, options))
+  })
 }
 
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+function sync (path, options) {
+  return checkStat(fs.statSync(path), options)
+}
 
-	// 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');
-			}
+function checkStat (stat, options) {
+  return stat.isFile() && checkMode(stat, options)
+}
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(chr);
-		}
-	});
+function checkMode (stat, options) {
+  var mod = stat.mode
+  var uid = stat.uid
+  var gid = stat.gid
 
-	chunks.push(chunk.join(''));
+  var myUid = options.uid !== undefined ?
+    options.uid : process.getuid && process.getuid()
+  var myGid = options.gid !== undefined ?
+    options.gid : process.getgid && process.getgid()
 
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
-	}
+  var u = parseInt('100', 8)
+  var g = parseInt('010', 8)
+  var o = parseInt('001', 8)
+  var ug = u | g
 
-	return chunks.join('');
-};
+  var ret = (mod & o) ||
+    (mod & g) && gid === myGid ||
+    (mod & u) && uid === myUid ||
+    (mod & ug) && myUid === 0
+
+  return ret
+}
 
 
 /***/ }),
-/* 487 */
-/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = normalize
+/***/ "../../node_modules/isexe/windows.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var fixer = __webpack_require__(488)
-normalize.fixer = fixer
+module.exports = isexe
+isexe.sync = sync
 
-var makeWarning = __webpack_require__(516)
+var fs = __webpack_require__("fs")
 
-var fieldsToFix = ['name','version','description','repository','modules','scripts'
-                  ,'files','bin','man','bugs','keywords','readme','homepage','license']
-var otherThingsToFix = ['dependencies','people', 'typos']
+function checkPathExt (path, options) {
+  var pathext = options.pathExt !== undefined ?
+    options.pathExt : process.env.PATHEXT
 
-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 (!pathext) {
+    return true
+  }
 
-function normalize (data, warn, strict) {
-  if(warn === true) warn = null, strict = true
-  if(!strict) strict = false
-  if(!warn || data.private) warn = function(msg) { /* noop */ }
+  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
+}
 
-  if (data.scripts &&
-      data.scripts.install === "node-gyp rebuild" &&
-      !data.scripts.preinstall) {
-    data.gypfile = true
+function checkStat (stat, path, options) {
+  if (!stat.isSymbolicLink() && !stat.isFile()) {
+    return false
   }
-  fixer.warn = function() { warn(makeWarning.apply(null, arguments)) }
-  thingsToFix.forEach(function(thingName) {
-    fixer["fix" + ucFirst(thingName)](data, strict)
+  return checkPathExt(path, options)
+}
+
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, path, options))
   })
-  data._id = data.name + "@" + data.version
 }
 
-function ucFirst (string) {
-  return string.charAt(0).toUpperCase() + string.slice(1);
+function sync (path, options) {
+  return checkStat(fs.statSync(path), path, options)
 }
 
 
 /***/ }),
-/* 488 */
+
+/***/ "../../node_modules/json-parse-better-errors/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var semver = __webpack_require__(489)
-var validateLicense = __webpack_require__(490);
-var hostedGitInfo = __webpack_require__(495)
-var isBuiltinModule = __webpack_require__(498).isCore
-var depTypes = ["dependencies","devDependencies","optionalDependencies"]
-var extractDescription = __webpack_require__(514)
-var url = __webpack_require__(324)
-var typos = __webpack_require__(515)
+"use strict";
 
-var fixer = module.exports = {
-  // default warning function
-  warn: function() {},
 
-  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()
-      }
+module.exports = parseJson
+function parseJson (txt, reviver, context) {
+  context = context || 20
+  try {
+    return JSON.parse(txt, reviver)
+  } catch (e) {
+    if (typeof txt !== 'string') {
+      const isEmptyArray = Array.isArray(txt) && txt.length === 0
+      const errorMessage = 'Cannot parse ' +
+      (isEmptyArray ? 'an empty array' : String(txt))
+      throw new TypeError(errorMessage)
     }
-
-    if (r.match(/github.com\/[^\/]+\/[^\/]+\.git\.git$/)) {
-      this.warn("brokenGitUrl", r)
+    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
   }
+}
 
-, 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
-        } else {
-          return true
+/***/ "../../node_modules/lines-and-columns/dist/index.mjs":
+/***/ (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)
+        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);
 
-, 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
-    }
-  }
 
-, fixManField: function(data) {
-    if (!data.man) return;
-    if (typeof data.man === "string") {
-      data.man = [ data.man ]
-    }
-  }
-, 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)
-    }
-  }
+/***/ }),
 
-, fixDependencies: function(data, strict) {
-    var loose = !strict
-    objectifyDeps(data, this.warn)
-    addOptionalDepsToDeps(data, this.warn)
-    this.fixBundleDependenciesField(data)
+/***/ "../../node_modules/load-json-file/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    ;['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)
-  }
+"use strict";
 
-, fixModulesField: function (data) {
-    if (data.modules) {
-      this.warn("deprecatedModules")
-      delete data.modules
-    }
-  }
+const path = __webpack_require__("path");
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const stripBom = __webpack_require__("../../node_modules/strip-bom/index.js");
+const parseJson = __webpack_require__("../../node_modules/parse-json/index.js");
 
-, 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)
-    }
-  }
+const parse = (data, filePath, options = {}) => {
+	data = stripBom(data);
 
-, 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
-  }
+	if (typeof options.beforeParse === 'function') {
+		data = options.beforeParse(data);
+	}
 
-, fixPeople: function(data) {
-    modifyPeople(data, unParsePerson)
-    modifyPeople(data, parsePerson)
-  }
+	return parseJson(data, options.reviver, path.relative(process.cwd(), filePath));
+};
 
-, 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)
-  }
+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);
 
 
-, 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")
-  }
+/***/ }),
 
-, fixReadmeField: function (data) {
-    if (!data.readme) {
-      this.warn("missingReadme")
-      data.readme = "ERROR: No README data found!"
-    }
-  }
+/***/ "../../node_modules/merge-stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-, 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")
-      }
-    }
-  }
+"use strict";
 
-, 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
 
-    if(typeof data.homepage !== "string") {
-      this.warn("nonUrlHomepage")
-      return delete data.homepage
-    }
-    if(!url.parse(data.homepage).protocol) {
-      data.homepage = "http://" + data.homepage
-    }
-  }
+const { PassThrough } = __webpack_require__("stream");
 
-, 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")
-      }
-    }
-  }
-}
+module.exports = function (/*streams...*/) {
+  var sources = []
+  var output  = new PassThrough({objectMode: true})
 
-function isValidScopedPackageName(spec) {
-  if (spec.charAt(0) !== '@') return false
+  output.setMaxListeners(0)
 
-  var rest = spec.slice(1).split('/')
-  if (rest.length !== 2) return false
+  output.add = add
+  output.isEmpty = isEmpty
 
-  return rest[0] && rest[1] &&
-    rest[0] === encodeURIComponent(rest[0]) &&
-    rest[1] === encodeURIComponent(rest[1])
-}
+  output.on('unpipe', remove)
 
-function isCorrectlyEncodedName(spec) {
-  return !spec.match(/[\/@\s\+%:]/) &&
-    spec === encodeURIComponent(spec)
-}
+  Array.prototype.slice.call(arguments).forEach(add)
 
-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))
+  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 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
-}
+  function isEmpty () {
+    return sources.length == 0;
+  }
 
-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
+  function remove (source) {
+    sources = sources.filter(function (it) { return it !== source })
+    if (!sources.length && output.readable) { output.end() }
+  }
 }
 
-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 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
-}
+/***/ "../../node_modules/merge2/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function objectifyDeps (data, warn) {
-  depTypes.forEach(function (type) {
-    if (!data[type]) return;
-    data[type] = depObjectify(data[type], type, warn)
-  })
-}
+"use strict";
 
-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]
-    }
-  })
-}
+/*
+ * merge2
+ * https://github.com/teambition/merge2
+ *
+ * Copyright (c) 2014-2020 Teambition
+ * Licensed under the MIT license.
+ */
+const Stream = __webpack_require__("stream")
+const PassThrough = Stream.PassThrough
+const slice = Array.prototype.slice
 
+module.exports = merge2
 
-/***/ }),
-/* 489 */
-/***/ (function(module, exports) {
+function merge2 () {
+  const streamsQueue = []
+  const args = slice.call(arguments)
+  let merging = false
+  let options = args[args.length - 1]
 
-exports = module.exports = SemVer
+  if (options && !Array.isArray(options) && options.pipe == null) {
+    args.pop()
+  } else {
+    options = {}
+  }
 
-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)
+  const doEnd = options.end !== false
+  const doPipeError = options.pipeError === true
+  if (options.objectMode == null) {
+    options.objectMode = true
   }
-} else {
-  debug = function () {}
-}
+  if (options.highWaterMark == null) {
+    options.highWaterMark = 64 * 1024
+  }
+  const mergedStream = PassThrough(options)
 
-// 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'
+  function addStream () {
+    for (let i = 0, len = arguments.length; i < len; i++) {
+      streamsQueue.push(pauseStreams(arguments[i], options))
+    }
+    mergeStream()
+    return this
+  }
 
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
+  function mergeStream () {
+    if (merging) {
+      return
+    }
+    merging = true
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16
+    let streams = streamsQueue.shift()
+    if (!streams) {
+      process.nextTick(endStream)
+      return
+    }
+    if (!Array.isArray(streams)) {
+      streams = [streams]
+    }
 
-// The actual regexps go on exports.re
-var re = exports.re = []
-var src = exports.src = []
-var R = 0
+    let pipesCount = streams.length + 1
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
+    function next () {
+      if (--pipesCount > 0) {
+        return
+      }
+      merging = false
+      mergeStream()
+    }
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
+    function pipe (stream) {
+      function onend () {
+        stream.removeListener('merge2UnpipeEnd', onend)
+        stream.removeListener('end', onend)
+        if (doPipeError) {
+          stream.removeListener('error', onerror)
+        }
+        next()
+      }
+      function onerror (err) {
+        mergedStream.emit('error', err)
+      }
+      // skip ended stream
+      if (stream._readableState.endEmitted) {
+        return next()
+      }
 
-var NUMERICIDENTIFIER = R++
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-var NUMERICIDENTIFIERLOOSE = R++
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
+      stream.on('merge2UnpipeEnd', onend)
+      stream.on('end', onend)
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+      if (doPipeError) {
+        stream.on('error', onerror)
+      }
 
-var NONNUMERICIDENTIFIER = R++
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
+      stream.pipe(mergedStream, { end: false })
+      // compatible for old stream
+      stream.resume()
+    }
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+    for (let i = 0; i < streams.length; i++) {
+      pipe(streams[i])
+    }
 
-var MAINVERSION = R++
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')'
+    next()
+  }
 
-var MAINVERSIONLOOSE = R++
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
+  function endStream () {
+    merging = false
+    // emit 'queueDrain' when all streams merged.
+    mergedStream.emit('queueDrain')
+    if (doEnd) {
+      mergedStream.end()
+    }
+  }
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+  mergedStream.setMaxListeners(0)
+  mergedStream.add = addStream
+  mergedStream.on('unpipe', function (stream) {
+    stream.emit('merge2UnpipeEnd')
+  })
 
-var PRERELEASEIDENTIFIER = R++
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')'
+  if (args.length) {
+    addStream.apply(null, args)
+  }
+  return mergedStream
+}
 
-var PRERELEASEIDENTIFIERLOOSE = R++
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
+// 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
+}
 
-// ## 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] + ')*))'
+/***/ "../../node_modules/mimic-fn/index.js":
+/***/ (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.
+const mimicFn = (to, from) => {
+	for (const prop of Reflect.ownKeys(from)) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
 
-var BUILD = R++
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
+	return to;
+};
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+module.exports = mimicFn;
+// TODO: Remove this for the next major release
+module.exports.default = mimicFn;
 
-// 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] + '?'
+/***/ }),
 
-src[FULL] = '^' + FULLPLAIN + '$'
+/***/ "../../node_modules/minimatch/minimatch.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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 = minimatch
+minimatch.Minimatch = Minimatch
 
-var LOOSE = R++
-src[LOOSE] = '^' + LOOSEPLAIN + '$'
+var path = (function () { try { return __webpack_require__("path") } catch (e) {}}()) || {
+  sep: '/'
+}
+minimatch.sep = path.sep
 
-var GTLT = R++
-src[GTLT] = '((?:<|>)?=?)'
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__("../../node_modules/brace-expansion/index.js")
 
-// 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 plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
 
-var XRANGEPLAIN = R++
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?'
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
 
-var XRANGEPLAINLOOSE = R++
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?'
+// * => any number of characters
+var star = qmark + '*?'
 
-var XRANGE = R++
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
-var XRANGELOOSE = R++
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
+// ** 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})($|\\\/)).)*?'
 
-// 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])'
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++
-src[LONETILDE] = '(?:~>?)'
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
 
-var TILDETRIM = R++
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
 
-var TILDE = R++
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
-var TILDELOOSE = R++
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
+// normalizes slashes.
+var slashSplit = /\/+/
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++
-src[LONECARET] = '(?:\\^)'
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
 
-var CARETTRIM = R++
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
-
-var CARET = R++
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
-var CARETLOOSE = R++
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
-
-// 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 + ')$|^$'
-
-// 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] + ')'
-
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
-
-// 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*$'
+function ext (a, b) {
+  b = b || {}
+  var t = {}
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  return t
+}
 
-var HYPHENRANGELOOSE = R++
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
+minimatch.defaults = function (def) {
+  if (!def || typeof def !== 'object' || !Object.keys(def).length) {
+    return minimatch
+  }
 
-// Star ranges basically just allow anything at all.
-var STAR = R++
-src[STAR] = '(<|>)?=?\\s*\\*'
+  var orig = minimatch
 
-// 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])
+  var m = function minimatch (p, pattern, options) {
+    return orig(p, pattern, ext(def, options))
   }
-}
 
-exports.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
+  m.Minimatch.defaults = function defaults (options) {
+    return orig.defaults(ext(def, options)).Minimatch
   }
 
-  if (version instanceof SemVer) {
-    return version
+  m.filter = function filter (pattern, options) {
+    return orig.filter(pattern, ext(def, options))
   }
 
-  if (typeof version !== 'string') {
-    return null
+  m.defaults = function defaults (options) {
+    return orig.defaults(ext(def, options))
   }
 
-  if (version.length > MAX_LENGTH) {
-    return null
+  m.makeRe = function makeRe (pattern, options) {
+    return orig.makeRe(pattern, ext(def, options))
   }
 
-  var r = options.loose ? re[LOOSE] : re[FULL]
-  if (!r.test(version)) {
-    return null
+  m.braceExpand = function braceExpand (pattern, options) {
+    return orig.braceExpand(pattern, ext(def, options))
   }
 
-  try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
+  m.match = function (list, pattern, options) {
+    return orig.match(list, pattern, ext(def, options))
   }
-}
 
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
+  return m
 }
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
+Minimatch.defaults = function (def) {
+  return minimatch.defaults(def).Minimatch
 }
 
-exports.SemVer = SemVer
+function minimatch (p, pattern, options) {
+  assertValidPattern(pattern)
 
-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)
-  }
+  if (!options) options = {}
 
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
   }
 
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
+  return new Minimatch(pattern, options).match(p)
+}
+
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
   }
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
+  assertValidPattern(pattern)
 
-  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
+  if (!options) options = {}
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
+  pattern = pattern.trim()
+
+  // windows support: need to use /, not \
+  if (!options.allowWindowsEscape && path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
   }
 
-  this.raw = version
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
+  this.partial = !!options.partial
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
+  // make the set of regexps etc.
+  this.make()
+}
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-    throw new TypeError('Invalid major version')
-  }
+Minimatch.prototype.debug = function () {}
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-    throw new TypeError('Invalid minor version')
-  }
+Minimatch.prototype.make = make
+function make () {
+  var pattern = this.pattern
+  var options = this.options
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
   }
-
-  // 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
-    })
+  if (!pattern) {
+    this.empty = true
+    return
   }
 
-  this.build = m[5] ? m[5].split('.') : []
-  this.format()
-}
+  // step 1: figure out negation, etc.
+  this.parseNegate()
 
-SemVer.prototype.format = function () {
-  this.version = this.major + '.' + this.minor + '.' + this.patch
-  if (this.prerelease.length) {
-    this.version += '-' + this.prerelease.join('.')
-  }
-  return this.version
-}
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
 
-SemVer.prototype.toString = function () {
-  return this.version
-}
+  if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+  this.debug(this.pattern, set)
 
-  return this.compareMain(other) || this.comparePre(other)
-}
+  // 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)
+  })
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+  this.debug(this.pattern, set)
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+  this.debug(this.pattern, set)
 
-  // 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
-  }
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
 
-  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)
+  this.debug(this.pattern, set)
+
+  this.set = set
 }
 
-// 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
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 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)
-        }
-      }
-      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
+  if (options.nonegate) return
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
   }
-  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
-  }
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version
-  } catch (er) {
-    return null
-  }
+// 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)
 }
 
-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
-        }
-      }
+Minimatch.prototype.braceExpand = braceExpand
+
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
     }
-    return defaultResult // may be undefined
   }
-}
 
-exports.compareIdentifiers = compareIdentifiers
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+  assertValidPattern(pattern)
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
+  // Thanks to Yeting Li <https://github.com/yetingli> for
+  // improving this regexp to avoid a ReDOS vulnerability.
+  if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
+    // shortcut. no need to expand.
+    return [pattern]
   }
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
-}
-
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
-}
-
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
+  return expand(pattern)
 }
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
-}
+var MAX_PATTERN_LENGTH = 1024 * 64
+var assertValidPattern = function (pattern) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('invalid pattern')
+  }
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
+  if (pattern.length > MAX_PATTERN_LENGTH) {
+    throw new TypeError('pattern is too long')
+  }
 }
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
-}
+// 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) {
+  assertValidPattern(pattern)
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
-}
+  var options = this.options
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
-}
+  // shortcuts
+  if (pattern === '**') {
+    if (!options.noglobstar)
+      return GLOBSTAR
+    else
+      pattern = '*'
+  }
+  if (pattern === '') return ''
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compare(a, b, loose)
-  })
-}
+  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
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.rcompare(a, b, loose)
-  })
-}
+  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
+    }
+  }
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
-}
+  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)
 
-exports.lt = lt
-function lt (a, b, loose) {
-  return compare(a, b, loose) < 0
-}
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
 
-exports.eq = eq
-function eq (a, b, loose) {
-  return compare(a, b, loose) === 0
-}
+    switch (c) {
+      /* istanbul ignore next */
+      case '/': {
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
+      }
 
-exports.neq = neq
-function neq (a, b, loose) {
-  return compare(a, b, loose) !== 0
-}
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
 
-exports.gte = gte
-function gte (a, b, loose) {
-  return compare(a, b, loose) >= 0
-}
+      // 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)
 
-exports.lte = lte
-function lte (a, b, loose) {
-  return compare(a, b, loose) <= 0
-}
+        // 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
+        }
 
-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
+        // 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 (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a !== b
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
 
-    case '!=':
-      return neq(a, b, loose)
+        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 '>':
-      return gt(a, b, loose)
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
 
-    case '>=':
-      return gte(a, b, loose)
+        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 '<':
-      return lt(a, b, loose)
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
 
-    case '<=':
-      return lte(a, b, loose)
+        clearStateChar()
+        re += '|'
+      continue
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
-  }
-}
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
-    }
-  }
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
 
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
-  }
+      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
+        }
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        // 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
+        }
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
-  }
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
 
-  debug('comp', this)
-}
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
 
-var ANY = {}
-Comparator.prototype.parse = function (comp) {
-  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var m = comp.match(r)
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
 
-  if (!m) {
-    throw new TypeError('Invalid comparator: ' + comp)
-  }
+        re += c
 
-  this.operator = m[1]
-  if (this.operator === '=') {
-    this.operator = ''
-  }
+    } // switch
+  } // for
 
-  // 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)
+  // 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]
   }
-}
 
-Comparator.prototype.toString = function () {
-  return this.value
-}
+  // 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 = '\\'
+      }
 
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
+      // 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 (this.semver === ANY) {
-    return true
-  }
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
   }
 
-  return cmp(version, this.operator, this.semver, this.options)
-}
-
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
   }
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
+  // 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
   }
 
-  var rangeTmp
-
-  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)
-  }
+  // 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 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 === '>'))
+    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)
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
-}
+    nlLast += nlAfter
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+    // 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
 
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
     }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
   }
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, options)
+  // 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 (!(this instanceof Range)) {
-    return new Range(range, options)
+  if (addPatternStart) {
+    re = patternStart + re
   }
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
-
-  // 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)
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
   }
 
-  this.format()
-}
+  // 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)
+  }
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
+  var flags = options.nocase ? 'i' : ''
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) /* istanbul ignore next - should be impossible */ {
+    // 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
 }
 
-Range.prototype.toString = function () {
-  return this.range
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
 }
 
-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])
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace)
+  // 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
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace)
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
 
-  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)
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
 
-  return set
-}
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) /* istanbul ignore next - should be impossible */ {
+    this.regexp = false
   }
-
-  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 this.regexp
 }
 
-// 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(' ')
+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
 }
 
-// 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
-}
+Minimatch.prototype.match = function match (f, partial) {
+  if (typeof partial === 'undefined') partial = this.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 === ''
 
-function isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+  if (f === '/' && partial) return true
 
-// ~, ~> --> * (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(' ')
-}
+  var options = this.options
 
-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
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
 
-    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'
-    }
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
 
-    debug('tilde return', ret)
-    return ret
-  })
-}
+  // 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.
 
-// ^ --> * (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(' ')
-}
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
 
-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
+  // 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 (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'
-      }
+  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
+    }
+  }
 
-    debug('caret return', ret)
-    return ret
-  })
-}
-
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
+  // 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 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
+// 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 (gtlt === '=' && anyX) {
-      gtlt = ''
-    }
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
 
-    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
+  this.debug('matchOne', file.length, pattern.length)
 
-      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
-        }
-      }
+  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]
 
-      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'
-    }
+    this.debug(pattern, p, f)
 
-    debug('xRange return', ret)
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    /* istanbul ignore if */
+    if (p === false) return false
 
-    return ret
-  })
-}
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
 
-// 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], '')
-}
+      // "**"
+      // 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
+      }
 
-// 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
-  }
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
 
-  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
-  }
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
 
-  return (from + ' ' + to).trim()
-}
+        // 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 ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
-  }
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
+        }
+      }
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      /* istanbul ignore if */
+      if (partial) {
+        // ran out of file
+        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
+        if (fr === fl) return true
+      }
+      return false
+    }
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
+    // 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') {
+      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
   }
-  return false
-}
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
-    }
-  }
-
-  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
-      }
-
-      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
-        }
-      }
-    }
+  // 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/*
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
+  // 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 /* istanbul ignore 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/
+    return (fi === fl - 1) && (file[fi] === '')
   }
 
-  return true
-}
-
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
+  // should be unreachable.
+  /* istanbul ignore next */
+  throw new Error('wtf?')
 }
 
-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
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
 }
 
-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
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
 }
 
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
-
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
-  }
-
-  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]
-
-    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
-  }
+/***/ }),
 
-  return null
-}
+/***/ "../../node_modules/minimist/index.js":
+/***/ (function(module, exports) {
 
-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
-  }
-}
+module.exports = function (args, opts) {
+    if (!opts) opts = {};
+    
+    var flags = { bools : {}, strings : {}, unknownFn: null };
 
-// 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 (typeof opts['unknown'] === 'function') {
+        flags.unknownFn = opts['unknown'];
+    }
 
-// 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)
-}
+    if (typeof opts['boolean'] === 'boolean' && opts['boolean']) {
+      flags.allBools = true;
+    } else {
+      [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
+          flags.bools[key] = true;
+      });
+    }
+    
+    var aliases = {};
+    Object.keys(opts.alias || {}).forEach(function (key) {
+        aliases[key] = [].concat(opts.alias[key]);
+        aliases[key].forEach(function (x) {
+            aliases[x] = [key].concat(aliases[key].filter(function (y) {
+                return x !== y;
+            }));
+        });
+    });
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
+    [].concat(opts.string).filter(Boolean).forEach(function (key) {
+        flags.strings[key] = true;
+        if (aliases[key]) {
+            flags.strings[aliases[key]] = 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 ">"')
-  }
+    var defaults = opts['default'] || {};
+    
+    var argv = { _ : [] };
+    Object.keys(flags.bools).forEach(function (key) {
+        setArg(key, defaults[key] === undefined ? false : defaults[key]);
+    });
+    
+    var notFlags = [];
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
-  }
+    if (args.indexOf('--') !== -1) {
+        notFlags = args.slice(args.indexOf('--')+1);
+        args = args.slice(0, args.indexOf('--'));
+    }
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+    function argDefined(key, arg) {
+        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
+            flags.strings[key] || flags.bools[key] || aliases[key];
+    }
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+    function setArg (key, val, arg) {
+        if (arg && flags.unknownFn && !argDefined(key, arg)) {
+            if (flags.unknownFn(arg) === false) return;
+        }
 
-    var high = null
-    var low = null
+        var value = !flags.strings[key] && isNumber(val)
+            ? Number(val) : val
+        ;
+        setKey(argv, key.split('.'), value);
+        
+        (aliases[key] || []).forEach(function (x) {
+            setKey(argv, x.split('.'), value);
+        });
+    }
 
-    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
-      }
-    })
+    function setKey (obj, keys, value) {
+        var o = obj;
+        for (var i = 0; i < keys.length-1; i++) {
+            var key = keys[i];
+            if (isConstructorOrProto(o, key)) return;
+            if (o[key] === undefined) o[key] = {};
+            if (o[key] === Object.prototype || o[key] === Number.prototype
+                || o[key] === String.prototype) o[key] = {};
+            if (o[key] === Array.prototype) o[key] = [];
+            o = o[key];
+        }
 
-    // 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 key = keys[keys.length - 1];
+        if (isConstructorOrProto(o, key)) return;
+        if (o === Object.prototype || o === Number.prototype
+            || o === String.prototype) o = {};
+        if (o === Array.prototype) o = [];
+        if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') {
+            o[key] = value;
+        }
+        else if (Array.isArray(o[key])) {
+            o[key].push(value);
+        }
+        else {
+            o[key] = [ o[key], value ];
+        }
     }
-
-    // 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
+    
+    function aliasIsBoolean(key) {
+      return aliases[key].some(function (x) {
+          return flags.bools[x];
+      });
     }
-  }
-  return true
-}
 
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
-}
+    for (var i = 0; i < args.length; i++) {
+        var arg = args[i];
+        
+        if (/^--.+=/.test(arg)) {
+            // Using [\s\S] instead of . because js doesn't support the
+            // 'dotall' regex modifier. See:
+            // http://stackoverflow.com/a/1068308/13216
+            var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
+            var key = m[1];
+            var value = m[2];
+            if (flags.bools[key]) {
+                value = value !== 'false';
+            }
+            setArg(key, value, arg);
+        }
+        else if (/^--no-.+/.test(arg)) {
+            var key = arg.match(/^--no-(.+)/)[1];
+            setArg(key, false, arg);
+        }
+        else if (/^--.+/.test(arg)) {
+            var key = arg.match(/^--(.+)/)[1];
+            var next = args[i + 1];
+            if (next !== undefined && !/^-/.test(next)
+            && !flags.bools[key]
+            && !flags.allBools
+            && (aliases[key] ? !aliasIsBoolean(key) : true)) {
+                setArg(key, next, arg);
+                i++;
+            }
+            else if (/^(true|false)$/.test(next)) {
+                setArg(key, next === 'true', arg);
+                i++;
+            }
+            else {
+                setArg(key, flags.strings[key] ? '' : true, arg);
+            }
+        }
+        else if (/^-[^-]+/.test(arg)) {
+            var letters = arg.slice(1,-1).split('');
+            
+            var broken = false;
+            for (var j = 0; j < letters.length; j++) {
+                var next = arg.slice(j+2);
+                
+                if (next === '-') {
+                    setArg(letters[j], next, arg)
+                    continue;
+                }
+                
+                if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
+                    setArg(letters[j], next.split('=')[1], arg);
+                    broken = true;
+                    break;
+                }
+                
+                if (/[A-Za-z]/.test(letters[j])
+                && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
+                    setArg(letters[j], next, arg);
+                    broken = true;
+                    break;
+                }
+                
+                if (letters[j+1] && letters[j+1].match(/\W/)) {
+                    setArg(letters[j], arg.slice(j+2), arg);
+                    broken = true;
+                    break;
+                }
+                else {
+                    setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
+                }
+            }
+            
+            var key = arg.slice(-1)[0];
+            if (!broken && key !== '-') {
+                if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
+                && !flags.bools[key]
+                && (aliases[key] ? !aliasIsBoolean(key) : true)) {
+                    setArg(key, args[i+1], arg);
+                    i++;
+                }
+                else if (args[i+1] && /^(true|false)$/.test(args[i+1])) {
+                    setArg(key, args[i+1] === 'true', arg);
+                    i++;
+                }
+                else {
+                    setArg(key, flags.strings[key] ? '' : true, arg);
+                }
+            }
+        }
+        else {
+            if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
+                argv._.push(
+                    flags.strings['_'] || !isNumber(arg) ? arg : Number(arg)
+                );
+            }
+            if (opts.stopEarly) {
+                argv._.push.apply(argv._, args.slice(i + 1));
+                break;
+            }
+        }
+    }
+    
+    Object.keys(defaults).forEach(function (key) {
+        if (!hasKey(argv, key.split('.'))) {
+            setKey(argv, key.split('.'), defaults[key]);
+            
+            (aliases[key] || []).forEach(function (x) {
+                setKey(argv, x.split('.'), defaults[key]);
+            });
+        }
+    });
+    
+    if (opts['--']) {
+        argv['--'] = new Array();
+        notFlags.forEach(function(key) {
+            argv['--'].push(key);
+        });
+    }
+    else {
+        notFlags.forEach(function(key) {
+            argv._.push(key);
+        });
+    }
 
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
-}
+    return argv;
+};
 
-exports.coerce = coerce
-function coerce (version) {
-  if (version instanceof SemVer) {
-    return version
-  }
+function hasKey (obj, keys) {
+    var o = obj;
+    keys.slice(0,-1).forEach(function (key) {
+        o = (o[key] || {});
+    });
 
-  if (typeof version !== 'string') {
-    return null
-  }
+    var key = keys[keys.length - 1];
+    return key in o;
+}
 
-  var match = version.match(re[COERCE])
+function isNumber (x) {
+    if (typeof x === 'number') return true;
+    if (/^0x[0-9a-f]+$/i.test(x)) return true;
+    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
+}
 
-  if (match == null) {
-    return null
-  }
 
-  return parse(match[1] +
-    '.' + (match[2] || '0') +
-    '.' + (match[3] || '0'))
+function isConstructorOrProto (obj, key) {
+    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
 }
 
 
 /***/ }),
-/* 490 */
+
+/***/ "../../node_modules/multimatch/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(491);
-var correct = __webpack_require__(493);
+"use strict";
 
-var genericWarning = (
-  'license should be ' +
-  'a valid SPDX license expression (without "LicenseRef"), ' +
-  '"UNLICENSED", or ' +
-  '"SEE LICENSE IN <filename>"'
-);
+const minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js");
+const arrayUnion = __webpack_require__("../../node_modules/array-union/index.js");
+const arrayDiffer = __webpack_require__("../../node_modules/array-differ/index.js");
+const arrify = __webpack_require__("../../node_modules/arrify/index.js");
 
-var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
+module.exports = (list, patterns, options = {}) => {
+	list = arrify(list);
+	patterns = arrify(patterns);
 
-function startsWith(prefix, string) {
-  return string.slice(0, prefix.length) === prefix;
+	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));
+	}, []);
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/mute-stream/mute.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__("stream")
+
+module.exports = MuteStream
+
+// var out = new MuteStream(process.stdout)
+// argument auto-pipes
+function MuteStream (opts) {
+  Stream.apply(this)
+  opts = opts || {}
+  this.writable = this.readable = true
+  this.muted = false
+  this.on('pipe', this._onpipe)
+  this.replace = opts.replace
+
+  // For readline-type situations
+  // This much at the start of a line being redrawn after a ctrl char
+  // is seen (such as backspace) won't be redrawn as the replacement
+  this._prompt = opts.prompt || null
+  this._hadControl = false
 }
 
-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)
-    );
-  }
+MuteStream.prototype = Object.create(Stream.prototype)
+
+Object.defineProperty(MuteStream.prototype, 'constructor', {
+  value: MuteStream,
+  enumerable: false
+})
+
+MuteStream.prototype.mute = function () {
+  this.muted = true
 }
 
-module.exports = function(argument) {
-  var ast;
+MuteStream.prototype.unmute = function () {
+  this.muted = false
+}
 
-  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]
-      };
+Object.defineProperty(MuteStream.prototype, '_onpipe', {
+  value: onPipe,
+  enumerable: false,
+  writable: true,
+  configurable: true
+})
+
+function onPipe (src) {
+  this._src = src
+}
+
+Object.defineProperty(MuteStream.prototype, 'isTTY', {
+  get: getIsTTY,
+  set: setIsTTY,
+  enumerable: true,
+  configurable: true
+})
+
+function getIsTTY () {
+  return( (this._dest) ? this._dest.isTTY
+        : (this._src) ? this._src.isTTY
+        : false
+        )
+}
+
+// basically just get replace the getter/setter with a regular value
+function setIsTTY (isTTY) {
+  Object.defineProperty(this, 'isTTY', {
+    value: isTTY,
+    enumerable: true,
+    writable: true,
+    configurable: true
+  })
+}
+
+Object.defineProperty(MuteStream.prototype, 'rows', {
+  get: function () {
+    return( this._dest ? this._dest.rows
+          : this._src ? this._src.rows
+          : undefined )
+  }, enumerable: true, configurable: true })
+
+Object.defineProperty(MuteStream.prototype, 'columns', {
+  get: function () {
+    return( this._dest ? this._dest.columns
+          : this._src ? this._src.columns
+          : undefined )
+  }, enumerable: true, configurable: true })
+
+
+MuteStream.prototype.pipe = function (dest, options) {
+  this._dest = dest
+  return Stream.prototype.pipe.call(this, dest, options)
+}
+
+MuteStream.prototype.pause = function () {
+  if (this._src) return this._src.pause()
+}
+
+MuteStream.prototype.resume = function () {
+  if (this._src) return this._src.resume()
+}
+
+MuteStream.prototype.write = function (c) {
+  if (this.muted) {
+    if (!this.replace) return true
+    if (c.match(/^\u001b/)) {
+      if(c.indexOf(this._prompt) === 0) {
+        c = c.substr(this._prompt.length);
+        c = c.replace(/./g, this.replace);
+        c = this._prompt + c;
+      }
+      this._hadControl = true
+      return this.emit('data', c)
     } 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 + '"'
-        );
+      if (this._prompt && this._hadControl &&
+          c.indexOf(this._prompt) === 0) {
+        this._hadControl = false
+        this.emit('data', this._prompt)
+        c = c.substr(this._prompt.length)
       }
-      return result;
+      c = c.toString().replace(/./g, this.replace)
     }
   }
+  this.emit('data', c)
+}
 
-  if (usesLicenseRef(ast)) {
-    return {
-      validForNewPackages: false,
-      validForOldPackages: false,
-      spdx: true,
-      warnings: [genericWarning]
-    };
-  } else {
-    return {
-      validForNewPackages: true,
-      validForOldPackages: true,
-      spdx: true
-    };
+MuteStream.prototype.end = function (c) {
+  if (this.muted) {
+    if (c && this.replace) {
+      c = c.toString().replace(/./g, this.replace)
+    } else {
+      c = null
+    }
   }
-};
+  if (c) this.emit('data', c)
+  this.emit('end')
+}
+
+function proxy (fn) { return function () {
+  var d = this._dest
+  var s = this._src
+  if (d && d[fn]) d[fn].apply(d, arguments)
+  if (s && s[fn]) s[fn].apply(s, arguments)
+}}
+
+MuteStream.prototype.destroy = proxy('destroy')
+MuteStream.prototype.destroySoon = proxy('destroySoon')
+MuteStream.prototype.close = proxy('close')
 
 
 /***/ }),
-/* 491 */
+
+/***/ "../../node_modules/ncp/lib/ncp.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var parser = __webpack_require__(492).parser
+var fs = __webpack_require__("fs"),
+    path = __webpack_require__("path");
 
-module.exports = function (argument) {
-  return parser.parse(argument)
-}
+module.exports = ncp;
+ncp.ncp = ncp;
 
+function ncp (source, dest, options, callback) {
+  var cback = callback;
 
-/***/ }),
-/* 492 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!callback) {
+    cback = options;
+    options = {};
+  }
 
-/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
-/*
-  Returns a Parser object of the following structure:
+  var basePath = process.cwd(),
+      currentPath = path.resolve(basePath, source),
+      targetPath = path.resolve(basePath, dest),
+      filter = options.filter,
+      rename = options.rename,
+      transform = options.transform,
+      clobber = options.clobber !== false,
+      modified = options.modified,
+      dereference = options.dereference,
+      errs = null,
+      started = 0,
+      finished = 0,
+      running = 0,
+      limit = options.limit || ncp.limit || 16;
 
-  Parser: {
-    yy: {}
+  limit = (limit < 1) ? 1 : (limit > 512) ? 512 : limit;
+
+  startCopy(currentPath);
+  
+  function startCopy(source) {
+    started++;
+    if (filter) {
+      if (filter instanceof RegExp) {
+        if (!filter.test(source)) {
+          return cb(true);
+        }
+      }
+      else if (typeof filter === 'function') {
+        if (!filter(source)) {
+          return cb(true);
+        }
+      }
+    }
+    return getStats(source);
   }
 
-  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),
+  function getStats(source) {
+    var stat = dereference ? fs.stat : fs.lstat;
+    if (running >= limit) {
+      return setImmediate(function () {
+        getStats(source);
+      });
+    }
+    running++;
+    stat(source, function (err, stats) {
+      var item = {};
+      if (err) {
+        return onError(err);
+      }
 
-    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),
+      // We need to get the mode from the stats object and preserve it.
+      item.name = source;
+      item.mode = stats.mode;
+      item.mtime = stats.mtime; //modified time
+      item.atime = stats.atime; //access time
 
-        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 (stats.isDirectory()) {
+        return onDir(item);
+      }
+      else if (stats.isFile()) {
+        return onFile(item);
+      }
+      else if (stats.isSymbolicLink()) {
+        // Symlinks don't really need to know about the mode.
+        return onLink(source);
+      }
+    });
+  }
 
-        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
-        rules: [...],
-        conditions: {associative list: name ==> set},
+  function onFile(file) {
+    var target = file.name.replace(currentPath, targetPath);
+    if(rename) {
+      target =  rename(target);
     }
+    isWritable(target, function (writable) {
+      if (writable) {
+        return copyFile(file, target);
+      }
+      if(clobber) {
+        rmFile(target, function () {
+          copyFile(file, target);
+        });
+      }
+      if (modified) {
+        var stat = dereference ? fs.stat : fs.lstat;
+        stat(target, function(err, stats) {
+            //if souce modified time greater to target modified time copy file
+            if (file.mtime.getTime()>stats.mtime.getTime())
+                copyFile(file, target);
+            else return cb();
+        });
+      }
+      else {
+        return cb();
+      }
+    });
   }
 
+  function copyFile(file, target) {
+    var readStream = fs.createReadStream(file.name),
+        writeStream = fs.createWriteStream(target, { mode: file.mode });
+    
+    readStream.on('error', onError);
+    writeStream.on('error', onError);
+    
+    if(transform) {
+      transform(readStream, writeStream, file);
+    } else {
+      writeStream.on('open', function() {
+        readStream.pipe(writeStream);
+      });
+    }
+    writeStream.once('finish', function() {
+        if (modified) {
+            //target file modified date sync.
+            fs.utimesSync(target, file.atime, file.mtime);
+            cb();
+        }
+        else cb();
+    });
+  }
 
-  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)
+  function rmFile(file, done) {
+    fs.unlink(file, function (err) {
+      if (err) {
+        return onError(err);
+      }
+      return done();
+    });
   }
 
+  function onDir(dir) {
+    var target = dir.name.replace(currentPath, targetPath);
+    isWritable(target, function (writable) {
+      if (writable) {
+        return mkDir(dir, target);
+      }
+      copyDir(dir.name);
+    });
+  }
 
-  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)
+  function mkDir(dir, target) {
+    fs.mkdir(target, dir.mode, function (err) {
+      if (err) {
+        return onError(err);
+      }
+      copyDir(dir.name);
+    });
   }
-  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)
+
+  function copyDir(dir) {
+    fs.readdir(dir, function (err, items) {
+      if (err) {
+        return onError(err);
+      }
+      items.forEach(function (item) {
+        startCopy(path.join(dir, item));
+      });
+      return cb();
+    });
   }
-*/
-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 */
 
-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;
-        }
-        _parseError.prototype = Error;
+  function onLink(link) {
+    var target = link.replace(currentPath, targetPath);
+    fs.readlink(link, function (err, resolvedPath) {
+      if (err) {
+        return onError(err);
+      }
+      checkLink(resolvedPath, target);
+    });
+  }
 
-        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];
-        }
+  function checkLink(resolvedPath, target) {
+    if (dereference) {
+      resolvedPath = path.resolve(basePath, resolvedPath);
     }
-    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];
+    isWritable(target, function (writable) {
+      if (writable) {
+        return makeLink(resolvedPath, target);
+      }
+      fs.readlink(target, function (err, targetDest) {
+        if (err) {
+          return onError(err);
         }
-                    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 (dereference) {
+          targetDest = path.resolve(basePath, targetDest);
         }
-        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;
-            }
-            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;
+        if (targetDest === resolvedPath) {
+          return cb();
         }
-    }
-    return true;
-}};
-/* generated by jison-lex 0.3.4 */
-var lexer = (function(){
-var lexer = ({
-
-EOF:1,
+        return rmFile(target, function () {
+          makeLink(resolvedPath, target);
+        });
+      });
+    });
+  }
 
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
+  function makeLink(linkPath, target) {
+    fs.symlink(linkPath, target, function (err) {
+      if (err) {
+        return onError(err);
+      }
+      return cb();
+    });
+  }
 
-// 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;
-    },
+  function isWritable(path, done) {
+    fs.lstat(path, function (err) {
+      if (err) {
+        if (err.code === 'ENOENT') return done(true);
+        return done(false);
+      }
+      return done(false);
+    });
+  }
 
-// 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]++;
-        }
+  function onError(err) {
+    if (options.stopOnError) {
+      return cback(err);
+    }
+    else if (!errs && options.errs) {
+      errs = fs.createWriteStream(options.errs);
+    }
+    else if (!errs) {
+      errs = [];
+    }
+    if (typeof errs.write === 'undefined') {
+      errs.push(err);
+    }
+    else { 
+      errs.write(err.stack + '\n\n');
+    }
+    return cb();
+  }
 
-        this._input = this._input.slice(1);
-        return ch;
-    },
+  function cb(skipped) {
+    if (!skipped) running--;
+    finished++;
+    if ((started === finished) && (running === 0)) {
+      if (cback !== undefined ) {
+        return errs ? cback(errs) : cback(null);
+      }
+    }
+  }
+}
 
-// 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;
-        }
-        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
-        };
+/***/ }),
 
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        this.yyleng = this.yytext.length;
-        return this;
-    },
+/***/ "../../node_modules/normalize-package-data/lib/extract_description.js":
+/***/ (function(module, exports) {
 
-// When called from action, caches matched text and appends it on next action
-more:function () {
-        this._more = true;
-        return this;
-    },
+module.exports = extractDescription
 
-// 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
-            });
+// 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()
+}
 
-        }
-        return this;
-    },
 
-// retain first n characters of the match
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
+/***/ }),
 
-// 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, "");
-    },
+/***/ "../../node_modules/normalize-package-data/lib/fixer.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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, "");
-    },
+var semver = __webpack_require__("../../node_modules/normalize-package-data/node_modules/semver/semver.js")
+var validateLicense = __webpack_require__("../../node_modules/validate-npm-package-license/index.js");
+var hostedGitInfo = __webpack_require__("../../node_modules/hosted-git-info/index.js")
+var isBuiltinModule = __webpack_require__("../../node_modules/resolve/index.js").isCore
+var depTypes = ["dependencies","devDependencies","optionalDependencies"]
+var extractDescription = __webpack_require__("../../node_modules/normalize-package-data/lib/extract_description.js")
+var url = __webpack_require__("url")
+var typos = __webpack_require__("../../node_modules/normalize-package-data/lib/typos.json")
 
-// 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 + "^";
-    },
+var fixer = module.exports = {
+  // default warning function
+  warn: function() {},
 
-// test the lexed token: return FALSE when not a match, otherwise return token
-test_match:function (match, indexed_rule) {
-        var token,
-            lines,
-            backup;
+  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()
+      }
+    }
 
-        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);
-            }
-        }
+    if (r.match(/github.com\/[^\/]+\/[^\/]+\.git\.git$/)) {
+      this.warn("brokenGitUrl", r)
+    }
+  }
 
-        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;
-    },
+, fixTypos: function(data) {
+    Object.keys(typos.topLevel).forEach(function (d) {
+      if (data.hasOwnProperty(d)) {
+        this.warn("typo", d, typos.topLevel[d])
+      }
+    }, this)
+  }
 
-// return next match in input
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) {
-            this.done = true;
-        }
+, 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 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;
+, 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 this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
+          return true
         }
-    },
+      }, this)
+    }
+  }
 
-// return next match that has a token
-lex:function lex() {
-        var r = this.next();
-        if (r) {
-            return r;
+, 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
+    }
+  }
+
+, fixManField: function(data) {
+    if (!data.man) return;
+    if (typeof data.man === "string") {
+      data.man = [ data.man ]
+    }
+  }
+, 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 {
-            return this.lex();
+          if (!data.dependencies) {
+            data.dependencies = {}
+          }
+          if (!data.dependencies.hasOwnProperty(bd)) {
+            this.warn("nonDependencyBundleDependency", bd)
+            data.dependencies[bd] = "*"
+          }
+          return true
         }
-    },
+      }, this)
+    }
+  }
 
-// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
+, fixDependencies: function(data, strict) {
+    var loose = !strict
+    objectifyDeps(data, this.warn)
+    addOptionalDepsToDeps(data, this.warn)
+    this.fixBundleDependenciesField(data)
 
-// 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];
+    ;['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)
+  }
 
-// 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;
+, 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
         } else {
-            return this.conditions["INITIAL"].rules;
+          return true
         }
-    },
+      }, this)
+    }
+  }
 
-// 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";
+, 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
+  }
+
+, 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)
+  }
+
+
+, 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")
+  }
+
+, fixReadmeField: function (data) {
+    if (!data.readme) {
+      this.warn("missingReadme")
+      data.readme = "ERROR: No README data found!"
+    }
+  }
+
+, 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")
+      }
+    }
+  }
 
-// alias for begin(condition)
-pushState:function pushState(condition) {
-        this.begin(condition);
-    },
-
-// 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;
-}
-},
-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;
-})();
+, 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
 
+    if(typeof data.homepage !== "string") {
+      this.warn("nonUrlHomepage")
+      return delete data.homepage
+    }
+    if(!url.parse(data.homepage).protocol) {
+      data.homepage = "http://" + data.homepage
+    }
+  }
 
-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);
+, 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")
+      }
     }
-    var source = __webpack_require__(253).readFileSync(__webpack_require__(4).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__(237)(module)))
+function isValidScopedPackageName(spec) {
+  if (spec.charAt(0) !== '@') return false
 
-/***/ }),
-/* 493 */
-/***/ (function(module, exports, __webpack_require__) {
+  var rest = spec.slice(1).split('/')
+  if (rest.length !== 2) return false
 
-var licenseIDs = __webpack_require__(494);
+  return rest[0] && rest[1] &&
+    rest[0] === encodeURIComponent(rest[0]) &&
+    rest[1] === encodeURIComponent(rest[1])
+}
 
-function valid(string) {
-  return licenseIDs.indexOf(string) > -1;
+function isCorrectlyEncodedName(spec) {
+  return !spec.match(/[\/@\s\+%:]/) &&
+    spec === encodeURIComponent(spec)
 }
 
-// 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 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))
+  }
+}
 
-var TRANSPOSED = 0;
-var CORRECT = 1;
+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
+}
 
-// 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';
-  }
-];
+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
+}
 
-// 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']
-];
+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
+}
 
-var SUBSTRING = 0;
-var IDENTIFIER = 1;
+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
+}
 
-var validTransformation = function(identifier) {
-  for (var i = 0; i < transforms.length; i++) {
-    var transformed = transforms[i](identifier);
-    if (transformed !== identifier && valid(transformed)) {
-      return transformed;
-    }
+function depObjectify (deps, type, warn) {
+  if (!deps) return {}
+  if (typeof deps === "string") {
+    deps = deps.trim().split(/[\n\r\s\t ,]+/)
   }
-  return null;
-};
+  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
+}
 
-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;
-};
+function objectifyDeps (data, warn) {
+  depTypes.forEach(function (type) {
+    if (!data[type]) return;
+    data[type] = depObjectify(data[type], type, warn)
+  })
+}
 
-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;
-      }
+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]
     }
-  }
-  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;
-    }
-    return validTransformation(argument);
-  });
-  if (transformed !== null) {
-    return transformed;
+
+/***/ }),
+
+/***/ "../../node_modules/normalize-package-data/lib/make_warning.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var util = __webpack_require__("util")
+var messages = __webpack_require__("../../node_modules/normalize-package-data/lib/warning_messages.json")
+
+module.exports = function() {
+  var args = Array.prototype.slice.call(arguments, 0)
+  var warningName = args.shift()
+  if (warningName == "typo") {
+    return makeTypoWarning.apply(null,args)
   }
-  transformed = validLastResort(identifier);
-  if (transformed !== null) {
-    return transformed;
+  else {
+    var msgTemplate = messages[warningName] ? messages[warningName] : warningName + ": '%s'"
+    args.unshift(msgTemplate)
+    return util.format.apply(null, args)
   }
-  transformed = anyCorrection(identifier, validLastResort);
-  if (transformed !== null) {
-    return transformed;
+}
+
+function makeTypoWarning (providedName, probableName, field) {
+  if (field) {
+    providedName = field + "['" + providedName + "']"
+    probableName = field + "['" + probableName + "']"
   }
-  return null;
-};
+  return util.format(messages.typo, providedName, probableName)
+}
 
 
 /***/ }),
-/* 494 */
-/***/ (function(module) {
-
-module.exports = JSON.parse("[\"Glide\",\"Abstyles\",\"AFL-1.1\",\"AFL-1.2\",\"AFL-2.0\",\"AFL-2.1\",\"AFL-3.0\",\"AMPAS\",\"APL-1.0\",\"Adobe-Glyph\",\"APAFML\",\"Adobe-2006\",\"AGPL-1.0\",\"Afmparse\",\"Aladdin\",\"ADSL\",\"AMDPLPA\",\"ANTLR-PD\",\"Apache-1.0\",\"Apache-1.1\",\"Apache-2.0\",\"AML\",\"APSL-1.0\",\"APSL-1.1\",\"APSL-1.2\",\"APSL-2.0\",\"Artistic-1.0\",\"Artistic-1.0-Perl\",\"Artistic-1.0-cl8\",\"Artistic-2.0\",\"AAL\",\"Bahyph\",\"Barr\",\"Beerware\",\"BitTorrent-1.0\",\"BitTorrent-1.1\",\"BSL-1.0\",\"Borceux\",\"BSD-2-Clause\",\"BSD-2-Clause-FreeBSD\",\"BSD-2-Clause-NetBSD\",\"BSD-3-Clause\",\"BSD-3-Clause-Clear\",\"BSD-4-Clause\",\"BSD-Protection\",\"BSD-Source-Code\",\"BSD-3-Clause-Attribution\",\"0BSD\",\"BSD-4-Clause-UC\",\"bzip2-1.0.5\",\"bzip2-1.0.6\",\"Caldera\",\"CECILL-1.0\",\"CECILL-1.1\",\"CECILL-2.0\",\"CECILL-2.1\",\"CECILL-B\",\"CECILL-C\",\"ClArtistic\",\"MIT-CMU\",\"CNRI-Jython\",\"CNRI-Python\",\"CNRI-Python-GPL-Compatible\",\"CPOL-1.02\",\"CDDL-1.0\",\"CDDL-1.1\",\"CPAL-1.0\",\"CPL-1.0\",\"CATOSL-1.1\",\"Condor-1.1\",\"CC-BY-1.0\",\"CC-BY-2.0\",\"CC-BY-2.5\",\"CC-BY-3.0\",\"CC-BY-4.0\",\"CC-BY-ND-1.0\",\"CC-BY-ND-2.0\",\"CC-BY-ND-2.5\",\"CC-BY-ND-3.0\",\"CC-BY-ND-4.0\",\"CC-BY-NC-1.0\",\"CC-BY-NC-2.0\",\"CC-BY-NC-2.5\",\"CC-BY-NC-3.0\",\"CC-BY-NC-4.0\",\"CC-BY-NC-ND-1.0\",\"CC-BY-NC-ND-2.0\",\"CC-BY-NC-ND-2.5\",\"CC-BY-NC-ND-3.0\",\"CC-BY-NC-ND-4.0\",\"CC-BY-NC-SA-1.0\",\"CC-BY-NC-SA-2.0\",\"CC-BY-NC-SA-2.5\",\"CC-BY-NC-SA-3.0\",\"CC-BY-NC-SA-4.0\",\"CC-BY-SA-1.0\",\"CC-BY-SA-2.0\",\"CC-BY-SA-2.5\",\"CC-BY-SA-3.0\",\"CC-BY-SA-4.0\",\"CC0-1.0\",\"Crossword\",\"CrystalStacker\",\"CUA-OPL-1.0\",\"Cube\",\"curl\",\"D-FSL-1.0\",\"diffmark\",\"WTFPL\",\"DOC\",\"Dotseqn\",\"DSDP\",\"dvipdfm\",\"EPL-1.0\",\"ECL-1.0\",\"ECL-2.0\",\"eGenix\",\"EFL-1.0\",\"EFL-2.0\",\"MIT-advertising\",\"MIT-enna\",\"Entessa\",\"ErlPL-1.1\",\"EUDatagrid\",\"EUPL-1.0\",\"EUPL-1.1\",\"Eurosym\",\"Fair\",\"MIT-feh\",\"Frameworx-1.0\",\"FreeImage\",\"FTL\",\"FSFAP\",\"FSFUL\",\"FSFULLR\",\"Giftware\",\"GL2PS\",\"Glulxe\",\"AGPL-3.0\",\"GFDL-1.1\",\"GFDL-1.2\",\"GFDL-1.3\",\"GPL-1.0\",\"GPL-2.0\",\"GPL-3.0\",\"LGPL-2.1\",\"LGPL-3.0\",\"LGPL-2.0\",\"gnuplot\",\"gSOAP-1.3b\",\"HaskellReport\",\"HPND\",\"IBM-pibs\",\"IPL-1.0\",\"ICU\",\"ImageMagick\",\"iMatix\",\"Imlib2\",\"IJG\",\"Info-ZIP\",\"Intel-ACPI\",\"Intel\",\"Interbase-1.0\",\"IPA\",\"ISC\",\"JasPer-2.0\",\"JSON\",\"LPPL-1.0\",\"LPPL-1.1\",\"LPPL-1.2\",\"LPPL-1.3a\",\"LPPL-1.3c\",\"Latex2e\",\"BSD-3-Clause-LBNL\",\"Leptonica\",\"LGPLLR\",\"Libpng\",\"libtiff\",\"LAL-1.2\",\"LAL-1.3\",\"LiLiQ-P-1.1\",\"LiLiQ-Rplus-1.1\",\"LiLiQ-R-1.1\",\"LPL-1.02\",\"LPL-1.0\",\"MakeIndex\",\"MTLL\",\"MS-PL\",\"MS-RL\",\"MirOS\",\"MITNFA\",\"MIT\",\"Motosoto\",\"MPL-1.0\",\"MPL-1.1\",\"MPL-2.0\",\"MPL-2.0-no-copyleft-exception\",\"mpich2\",\"Multics\",\"Mup\",\"NASA-1.3\",\"Naumen\",\"NBPL-1.0\",\"NetCDF\",\"NGPL\",\"NOSL\",\"NPL-1.0\",\"NPL-1.1\",\"Newsletr\",\"NLPL\",\"Nokia\",\"NPOSL-3.0\",\"NLOD-1.0\",\"Noweb\",\"NRL\",\"NTP\",\"Nunit\",\"OCLC-2.0\",\"ODbL-1.0\",\"PDDL-1.0\",\"OCCT-PL\",\"OGTSL\",\"OLDAP-2.2.2\",\"OLDAP-1.1\",\"OLDAP-1.2\",\"OLDAP-1.3\",\"OLDAP-1.4\",\"OLDAP-2.0\",\"OLDAP-2.0.1\",\"OLDAP-2.1\",\"OLDAP-2.2\",\"OLDAP-2.2.1\",\"OLDAP-2.3\",\"OLDAP-2.4\",\"OLDAP-2.5\",\"OLDAP-2.6\",\"OLDAP-2.7\",\"OLDAP-2.8\",\"OML\",\"OPL-1.0\",\"OSL-1.0\",\"OSL-1.1\",\"OSL-2.0\",\"OSL-2.1\",\"OSL-3.0\",\"OpenSSL\",\"OSET-PL-2.1\",\"PHP-3.0\",\"PHP-3.01\",\"Plexus\",\"PostgreSQL\",\"psfrag\",\"psutils\",\"Python-2.0\",\"QPL-1.0\",\"Qhull\",\"Rdisc\",\"RPSL-1.0\",\"RPL-1.1\",\"RPL-1.5\",\"RHeCos-1.1\",\"RSCPL\",\"RSA-MD\",\"Ruby\",\"SAX-PD\",\"Saxpath\",\"SCEA\",\"SWL\",\"SMPPL\",\"Sendmail\",\"SGI-B-1.0\",\"SGI-B-1.1\",\"SGI-B-2.0\",\"OFL-1.0\",\"OFL-1.1\",\"SimPL-2.0\",\"Sleepycat\",\"SNIA\",\"Spencer-86\",\"Spencer-94\",\"Spencer-99\",\"SMLNJ\",\"SugarCRM-1.1.3\",\"SISSL\",\"SISSL-1.2\",\"SPL-1.0\",\"Watcom-1.0\",\"TCL\",\"Unlicense\",\"TMate\",\"TORQUE-1.1\",\"TOSL\",\"Unicode-TOU\",\"UPL-1.0\",\"NCSA\",\"Vim\",\"VOSTROM\",\"VSL-1.0\",\"W3C-19980720\",\"W3C\",\"Wsuipa\",\"Xnet\",\"X11\",\"Xerox\",\"XFree86-1.1\",\"xinetd\",\"xpp\",\"XSkat\",\"YPL-1.0\",\"YPL-1.1\",\"Zed\",\"Zend-2.0\",\"Zimbra-1.3\",\"Zimbra-1.4\",\"Zlib\",\"zlib-acknowledgement\",\"ZPL-1.1\",\"ZPL-2.0\",\"ZPL-2.1\",\"BSD-3-Clause-No-Nuclear-License\",\"BSD-3-Clause-No-Nuclear-Warranty\",\"BSD-3-Clause-No-Nuclear-License-2014\",\"eCos-2.0\",\"GPL-2.0-with-autoconf-exception\",\"GPL-2.0-with-bison-exception\",\"GPL-2.0-with-classpath-exception\",\"GPL-2.0-with-font-exception\",\"GPL-2.0-with-GCC-exception\",\"GPL-3.0-with-autoconf-exception\",\"GPL-3.0-with-GCC-exception\",\"StandardML-NJ\",\"WXwindows\"]");
 
-/***/ }),
-/* 495 */
+/***/ "../../node_modules/normalize-package-data/lib/normalize.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-var url = __webpack_require__(324)
-var gitHosts = __webpack_require__(496)
-var GitHost = module.exports = __webpack_require__(497)
+module.exports = normalize
 
-var protocolToRepresentationMap = {
-  'git+ssh:': 'sshurl',
-  'git+https:': 'https',
-  'ssh:': 'sshurl',
-  'git:': 'git'
-}
+var fixer = __webpack_require__("../../node_modules/normalize-package-data/lib/fixer.js")
+normalize.fixer = fixer
 
-function protocolToRepresentation (protocol) {
-  return protocolToRepresentationMap[protocol] || protocol.slice(0, -1)
-}
+var makeWarning = __webpack_require__("../../node_modules/normalize-package-data/lib/make_warning.js")
 
-var authProtocols = {
-  'git:': true,
-  'https:': true,
-  'git+https:': true,
-  'http:': true,
-  'git+http:': true
-}
+var fieldsToFix = ['name','version','description','repository','modules','scripts'
+                  ,'files','bin','man','bugs','keywords','readme','homepage','license']
+var otherThingsToFix = ['dependencies','people', 'typos']
 
-var cache = {}
+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)
 
-module.exports.fromUrl = function (giturl, opts) {
-  if (typeof giturl !== 'string') return
-  var key = giturl + JSON.stringify(opts || {})
+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 (!(key in cache)) {
-    cache[key] = fromUrl(giturl, opts)
+  if (data.scripts &&
+      data.scripts.install === "node-gyp rebuild" &&
+      !data.scripts.preinstall) {
+    data.gypfile = true
   }
-
-  return cache[key]
+  fixer.warn = function() { warn(makeWarning.apply(null, arguments)) }
+  thingsToFix.forEach(function(thingName) {
+    fixer["fix" + ucFirst(thingName)](data, strict)
+  })
+  data._id = data.name + "@" + data.version
 }
 
-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(/^([^:]+):(?:[^@]+@)?(?:([^/]*)\/)?([^#]+)/)
-  var matches = Object.keys(gitHosts).map(function (gitHostName) {
-    try {
-      var gitHostInfo = gitHosts[gitHostName]
-      var auth = null
-      if (parsed.auth && authProtocols[parsed.protocol]) {
-        auth = 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].replace(/\.git$/, ''))
-        defaultRepresentation = 'shortcut'
-      } else {
-        if (parsed.host && parsed.host !== gitHostInfo.domain && parsed.host.replace(/^www[.]/, '') !== 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
-        /* istanbul ignore else */
-        if (matched[1] !== null && matched[1] !== undefined) {
-          user = decodeURIComponent(matched[1].replace(/^:/, ''))
-        }
-        project = decodeURIComponent(matched[2])
-        defaultRepresentation = protocolToRepresentation(parsed.protocol)
-      }
-      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation, opts)
-    } catch (ex) {
-      /* istanbul ignore else */
-      if (ex instanceof URIError) {
-      } else throw ex
-    }
-  }).filter(function (gitHostInfo) { return gitHostInfo })
-  if (matches.length !== 1) return
-  return matches[0]
+function ucFirst (string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
 }
 
-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)
-}
 
-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
-  }
-}
+/***/ }),
 
-function parseGitUrl (giturl) {
-  var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/)
-  if (!matched) {
-    var legacy = url.parse(giturl)
-    // If we don't have url.URL, then sorry, this is just not fixable.
-    // This affects Node <= 6.12.
-    if (legacy.auth && typeof url.URL === 'function') {
-      // git urls can be in the form of scp-style/ssh-connect strings, like
-      // git+ssh://user@host.com:some/path, which the legacy url parser
-      // supports, but WhatWG url.URL class does not.  However, the legacy
-      // parser de-urlencodes the username and password, so something like
-      // https://user%3An%40me:p%40ss%3Aword@x.com/ becomes
-      // https://user:n@me:p@ss:word@x.com/ which is all kinds of wrong.
-      // Pull off just the auth and host, so we dont' get the confusing
-      // scp-style URL, then pass that to the WhatWG parser to get the
-      // auth properly escaped.
-      var authmatch = giturl.match(/[^@]+@[^:/]+/)
-      /* istanbul ignore else - this should be impossible */
-      if (authmatch) {
-        var whatwg = new url.URL(authmatch[0])
-        legacy.auth = whatwg.username || ''
-        if (whatwg.password) legacy.auth += ':' + whatwg.password
-      }
-    }
-    return legacy
-  }
-  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] || '')
-  }
-}
+/***/ "../../node_modules/normalize-package-data/lib/typos.json":
+/***/ (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\"}}");
 
 /***/ }),
-/* 496 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/normalize-package-data/lib/warning_messages.json":
+/***/ (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.\"}");
 
-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://codeload.{domain}/{user}/{project}/tar.gz/{committish}'
-  },
-  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',
-    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
-    'httpstemplate': 'git+https://{auth@}{domain}/{user}/{projectPath}.git{#committish}',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}',
-    'pathmatch': /^[/]([^/]+)[/]((?!.*(\/-\/|\/repository\/archive\.tar\.gz\?=.*|\/repository\/[^/]+\/archive.tar.gz$)).*?)(?:[.]git|[/])?$/
-  },
-  gist: {
-    'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'gist.github.com',
-    'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]{32,})(?:[.]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}',
-    'browsefiletemplate': 'https://{domain}/{project}{/committish}{#path}',
-    'docstemplate': 'https://{domain}/{project}{/committish}',
-    'httpstemplate': 'git+https://{domain}/{project}.git{#committish}',
-    'shortcuttemplate': '{type}:{project}{#committish}',
-    'pathtemplate': '{project}{#committish}',
-    'tarballtemplate': 'https://codeload.github.com/gist/{project}/tar.gz/{committish}',
-    'hashformat': function (fragment) {
-      return 'file-' + formatHashFragment(fragment)
-    }
+/***/ }),
+
+/***/ "../../node_modules/normalize-package-data/node_modules/semver/semver.js":
+/***/ (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 () {}
 }
 
-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}',
-  'browsefiletemplate': 'https://{domain}/{user}/{project}/{treepath}/{committish}/{path}{#fragment}',
-  '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|[/])?$/,
-  'hashformat': formatHashFragment
-}
+// 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'
 
-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('|') + '):$')
-})
+var MAX_LENGTH = 256
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+  /* istanbul ignore next */ 9007199254740991
 
-function formatHashFragment (fragment) {
-  return fragment.toLowerCase().replace(/^\W+|\/|\W+$/g, '').replace(/\W+/g, '-')
-}
+// 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
 
-/***/ }),
-/* 497 */
-/***/ (function(module, exports, __webpack_require__) {
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
-"use strict";
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-var gitHosts = __webpack_require__(496)
-/* eslint-disable node/no-deprecated-api */
+var NUMERICIDENTIFIER = R++
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
+var NUMERICIDENTIFIERLOOSE = R++
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
-// copy-pasta util._extend from node's source, to avoid pulling
-// the whole util module into peoples' webpack bundles.
-/* istanbul ignore next */
-var extend = Object.assign || function _extend (target, source) {
-  // Don't do anything if source isn't an object
-  if (source === null || typeof source !== 'object') return target
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
-  var keys = Object.keys(source)
-  var i = keys.length
-  while (i--) {
-    target[keys[i]] = source[keys[i]]
-  }
-  return target
-}
+var NONNUMERICIDENTIFIER = R++
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-module.exports = GitHost
-function GitHost (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 || {}
-}
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
-GitHost.prototype.hash = function () {
-  return this.committish ? '#' + this.committish : ''
-}
+var MAINVERSION = R++
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')'
 
-GitHost.prototype._fill = function (template, opts) {
-  if (!template) return
-  var vars = extend({}, opts)
-  vars.path = vars.path ? vars.path.replace(/^[/]+/g, '') : ''
-  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 rawcommittish = vars.committish
-  var rawFragment = vars.fragment
-  var rawPath = vars.path
-  var rawProject = vars.project
-  Object.keys(vars).forEach(function (key) {
-    var value = vars[key]
-    if ((key === 'path' || key === 'project') && typeof value === 'string') {
-      vars[key] = value.split('/').map(function (pathComponent) {
-        return encodeURIComponent(pathComponent)
-      }).join('/')
-    } else {
-      vars[key] = encodeURIComponent(value)
-    }
-  })
-  vars['auth@'] = rawAuth ? rawAuth + '@' : ''
-  vars['#fragment'] = rawFragment ? '#' + this.hashformat(rawFragment) : ''
-  vars.fragment = vars.fragment ? vars.fragment : ''
-  vars['#path'] = rawPath ? '#' + this.hashformat(rawPath) : ''
-  vars['/path'] = vars.path ? '/' + vars.path : ''
-  vars.projectPath = rawProject.split('/').map(encodeURIComponent).join('/')
-  if (opts.noCommittish) {
-    vars['#committish'] = ''
-    vars['/tree/committish'] = ''
-    vars['/committish'] = ''
-    vars.committish = ''
-  } else {
-    vars['#committish'] = rawcommittish ? '#' + rawcommittish : ''
-    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 MAINVERSIONLOOSE = R++
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
 
-GitHost.prototype.ssh = function (opts) {
-  return this._fill(this.sshtemplate, opts)
-}
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
-GitHost.prototype.sshurl = function (opts) {
-  return this._fill(this.sshurltemplate, opts)
-}
+var PRERELEASEIDENTIFIER = R++
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-GitHost.prototype.browse = function (P, F, opts) {
-  if (typeof P === 'string') {
-    if (typeof F !== 'string') {
-      opts = F
-      F = null
-    }
-    return this._fill(this.browsefiletemplate, extend({
-      fragment: F,
-      path: P
-    }, opts))
-  } else {
-    return this._fill(this.browsetemplate, P)
-  }
-}
+var PRERELEASEIDENTIFIERLOOSE = R++
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-GitHost.prototype.docs = function (opts) {
-  return this._fill(this.docstemplate, opts)
-}
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
-GitHost.prototype.bugs = function (opts) {
-  return this._fill(this.bugstemplate, opts)
-}
+var PRERELEASE = R++
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
 
-GitHost.prototype.https = function (opts) {
-  return this._fill(this.httpstemplate, opts)
-}
+var PRERELEASELOOSE = R++
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-GitHost.prototype.git = function (opts) {
-  return this._fill(this.gittemplate, opts)
-}
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-GitHost.prototype.shortcut = function (opts) {
-  return this._fill(this.shortcuttemplate, opts)
-}
+var BUILDIDENTIFIER = R++
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-GitHost.prototype.path = function (opts) {
-  return this._fill(this.pathtemplate, opts)
-}
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-GitHost.prototype.tarball = function (opts_) {
-  var opts = extend({}, opts_, { noCommittish: false })
-  return this._fill(this.tarballtemplate, opts)
-}
+var BUILD = R++
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
 
-GitHost.prototype.file = function (P, opts) {
-  return this._fill(this.filetemplate, extend({ path: P }, opts))
-}
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
 
-GitHost.prototype.getDefaultRepresentation = function () {
-  return this.default
-}
+// 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.
 
-GitHost.prototype.toString = function (opts) {
-  if (this.default && typeof this[this.default] === 'function') return this[this.default](opts)
-  return this.sshurl(opts)
-}
+var FULL = R++
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?'
 
+src[FULL] = '^' + FULLPLAIN + '$'
 
-/***/ }),
-/* 498 */
-/***/ (function(module, exports, __webpack_require__) {
+// 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 async = __webpack_require__(499);
-async.core = __webpack_require__(510);
-async.isCore = __webpack_require__(512);
-async.sync = __webpack_require__(513);
+var LOOSE = R++
+src[LOOSE] = '^' + LOOSEPLAIN + '$'
 
-module.exports = async;
+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|\\*'
 
-/***/ }),
-/* 499 */
-/***/ (function(module, exports, __webpack_require__) {
+var XRANGEPLAIN = R++
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?'
 
-var fs = __webpack_require__(253);
-var getHomedir = __webpack_require__(500);
-var path = __webpack_require__(4);
-var caller = __webpack_require__(501);
-var nodeModulesPaths = __webpack_require__(502);
-var normalizeOptions = __webpack_require__(504);
-var isCore = __webpack_require__(505);
+var XRANGEPLAINLOOSE = R++
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?'
 
-var realpathFS = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
+var XRANGE = R++
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
+var XRANGELOOSE = R++
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
 
-var homedir = getHomedir();
-var defaultPaths = function () {
-    return [
-        path.join(homedir, '.node_modules'),
-        path.join(homedir, '.node_libraries')
-    ];
-};
+// 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])'
 
-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);
-    });
-};
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++
+src[LONETILDE] = '(?:~>?)'
 
-var defaultIsDir = function isDirectory(dir, cb) {
-    fs.stat(dir, function (err, stat) {
-        if (!err) {
-            return cb(null, stat.isDirectory());
-        }
-        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
-        return cb(err);
-    });
-};
+var TILDETRIM = R++
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
+var tildeTrimReplace = '$1~'
 
-var defaultRealpath = function realpath(x, cb) {
-    realpathFS(x, function (realpathErr, realPath) {
-        if (realpathErr && realpathErr.code !== 'ENOENT') cb(realpathErr);
-        else cb(null, realpathErr ? x : realPath);
-    });
-};
+var TILDE = R++
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
+var TILDELOOSE = R++
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
 
-var maybeRealpath = function maybeRealpath(realpath, x, opts, cb) {
-    if (opts && opts.preserveSymlinks === false) {
-        realpath(x, cb);
-    } else {
-        cb(null, x);
-    }
-};
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++
+src[LONECARET] = '(?:\\^)'
 
-var defaultReadPackage = function defaultReadPackage(readFile, pkgfile, cb) {
-    readFile(pkgfile, function (readFileErr, body) {
-        if (readFileErr) cb(readFileErr);
-        else {
-            try {
-                var pkg = JSON.parse(body);
-                cb(null, pkg);
-            } catch (jsonErr) {
-                cb(null);
-            }
-        }
-    });
-};
+var CARETTRIM = R++
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
+var caretTrimReplace = '$1^'
 
-var getPackageCandidates = function getPackageCandidates(x, start, opts) {
-    var dirs = nodeModulesPaths(start, opts, x);
-    for (var i = 0; i < dirs.length; i++) {
-        dirs[i] = path.join(dirs[i], x);
-    }
-    return dirs;
-};
+var CARET = R++
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
+var CARETLOOSE = R++
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
 
-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);
-        });
-    }
+// 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 + ')$|^$'
 
-    opts = normalizeOptions(x, 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] + ')'
 
-    var isFile = opts.isFile || defaultIsFile;
-    var isDirectory = opts.isDirectory || defaultIsDir;
-    var readFile = opts.readFile || fs.readFile;
-    var realpath = opts.realpath || defaultRealpath;
-    var readPackage = opts.readPackage || defaultReadPackage;
-    if (opts.readFile && opts.readPackage) {
-        var conflictErr = new TypeError('`readFile` and `readPackage` are mutually exclusive.');
-        return process.nextTick(function () {
-            cb(conflictErr);
-        });
-    }
-    var packageIterator = opts.packageIterator;
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
+var comparatorTrimReplace = '$1$2$3'
 
-    var extensions = opts.extensions || ['.js'];
-    var includeCoreModules = opts.includeCoreModules !== false;
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
+// 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*$'
 
-    opts.paths = opts.paths || defaultPaths();
+var HYPHENRANGELOOSE = R++
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$'
 
-    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
-    var absoluteStart = path.resolve(basedir);
+// Star ranges basically just allow anything at all.
+var STAR = R++
+src[STAR] = '(<|>)?=?\\s*\\*'
 
-    maybeRealpath(
-        realpath,
-        absoluteStart,
-        opts,
-        function (err, realStart) {
-            if (err) cb(err);
-            else init(realStart);
-        }
-    );
+// 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])
+  }
+}
 
-    var res;
-    function init(basedir) {
-        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
-            res = path.resolve(basedir, x);
-            if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
-            if ((/\/$/).test(x) && res === basedir) {
-                loadAsDirectory(res, opts.package, onfile);
-            } else loadAsFile(res, opts.package, onfile);
-        } else if (includeCoreModules && isCore(x)) {
-            return cb(null, x);
-        } else loadNodeModules(x, basedir, function (err, n, pkg) {
-            if (err) cb(err);
-            else if (n) {
-                return maybeRealpath(realpath, n, opts, function (err, realN) {
-                    if (err) {
-                        cb(err);
-                    } else {
-                        cb(null, realN, pkg);
-                    }
-                });
-            } else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
-    }
-
-    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) {
-                maybeRealpath(realpath, d, opts, function (err, realD) {
-                    if (err) {
-                        cb(err);
-                    } else {
-                        cb(null, realD, pkg);
-                    }
-                });
-            } else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
+exports.parse = parse
+function parse (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
     }
+  }
 
-    function loadAsFile(x, thePackage, callback) {
-        var loadAsFilePackage = thePackage;
-        var cb = callback;
-        if (typeof loadAsFilePackage === 'function') {
-            cb = loadAsFilePackage;
-            loadAsFilePackage = undefined;
-        }
-
-        var exts = [''].concat(extensions);
-        load(exts, x, loadAsFilePackage);
+  if (version instanceof SemVer) {
+    return version
+  }
 
-        function load(exts, x, loadPackage) {
-            if (exts.length === 0) return cb(null, undefined, loadPackage);
-            var file = x + exts[0];
+  if (typeof version !== 'string') {
+    return null
+  }
 
-            var pkg = loadPackage;
-            if (pkg) onpkg(null, pkg);
-            else loadpkg(path.dirname(file), onpkg);
+  if (version.length > MAX_LENGTH) {
+    return 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);
-            }
-        }
-    }
+  var r = options.loose ? re[LOOSE] : re[FULL]
+  if (!r.test(version)) {
+    return null
+  }
 
-    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);
+  try {
+    return new SemVer(version, options)
+  } catch (er) {
+    return null
+  }
+}
 
-        maybeRealpath(realpath, dir, opts, function (unwrapErr, pkgdir) {
-            if (unwrapErr) return loadpkg(path.dirname(dir), cb);
-            var pkgfile = path.join(pkgdir, 'package.json');
-            isFile(pkgfile, function (err, ex) {
-                // on err, ex is false
-                if (!ex) return loadpkg(path.dirname(dir), cb);
+exports.valid = valid
+function valid (version, options) {
+  var v = parse(version, options)
+  return v ? v.version : null
+}
 
-                readPackage(readFile, pkgfile, function (err, pkgParam) {
-                    if (err) cb(err);
+exports.clean = clean
+function clean (version, options) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
+  return s ? s.version : null
+}
 
-                    var pkg = pkgParam;
+exports.SemVer = SemVer
 
-                    if (pkg && opts.packageFilter) {
-                        pkg = opts.packageFilter(pkg, pkgfile);
-                    }
-                    cb(null, pkg, dir);
-                });
-            });
-        });
+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)
+  }
 
-    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
-        var cb = callback;
-        var fpkg = loadAsDirectoryPackage;
-        if (typeof fpkg === 'function') {
-            cb = fpkg;
-            fpkg = opts.package;
-        }
-
-        maybeRealpath(realpath, x, opts, function (unwrapErr, pkgdir) {
-            if (unwrapErr) return cb(unwrapErr);
-            var pkgfile = path.join(pkgdir, 'package.json');
-            isFile(pkgfile, function (err, ex) {
-                if (err) return cb(err);
-                if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
+  if (version.length > MAX_LENGTH) {
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  }
 
-                readPackage(readFile, pkgfile, function (err, pkgParam) {
-                    if (err) return cb(err);
+  if (!(this instanceof SemVer)) {
+    return new SemVer(version, options)
+  }
 
-                    var pkg = pkgParam;
+  debug('SemVer', version, options)
+  this.options = options
+  this.loose = !!options.loose
 
-                    if (pkg && opts.packageFilter) {
-                        pkg = opts.packageFilter(pkg, pkgfile);
-                    }
+  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
 
-                    if (pkg && 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) {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-                            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;
-                    }
+  this.raw = version
 
-                    loadAsFile(path.join(x, '/index'), pkg, cb);
-                });
-            });
-        });
-    }
+  // these are actually numbers
+  this.major = +m[1]
+  this.minor = +m[2]
+  this.patch = +m[3]
 
-    function processDirs(cb, dirs) {
-        if (dirs.length === 0) return cb(null, undefined);
-        var dir = dirs[0];
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
+    throw new TypeError('Invalid major version')
+  }
 
-        isDirectory(path.dirname(dir), isdir);
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+    throw new TypeError('Invalid minor version')
+  }
 
-        function isdir(err, isdir) {
-            if (err) return cb(err);
-            if (!isdir) return processDirs(cb, dirs.slice(1));
-            loadAsFile(dir, opts.package, onfile);
-        }
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+    throw new TypeError('Invalid patch version')
+  }
 
-        function onfile(err, m, pkg) {
-            if (err) return cb(err);
-            if (m) return cb(null, m, pkg);
-            loadAsDirectory(dir, opts.package, ondir);
+  // 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
+    })
+  }
 
-        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) {
-        var thunk = function () { return getPackageCandidates(x, start, opts); };
-        processDirs(
-            cb,
-            packageIterator ? packageIterator(x, start, thunk, opts) : thunk()
-        );
-    }
-};
+  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
+}
 
-/***/ }),
-/* 500 */
-/***/ (function(module, exports, __webpack_require__) {
+SemVer.prototype.toString = function () {
+  return this.version
+}
 
-"use strict";
+SemVer.prototype.compare = function (other) {
+  debug('SemVer.compare', this.version, this.options, other)
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
+  return this.compareMain(other) || this.comparePre(other)
+}
 
-var os = __webpack_require__(243);
+SemVer.prototype.compareMain = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-// adapted from https://github.com/sindresorhus/os-homedir/blob/11e089f4754db38bb535e5a8416320c4446e8cfd/index.js
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch)
+}
 
-module.exports = os.homedir || function homedir() {
-    var home = process.env.HOME;
-    var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME;
+SemVer.prototype.comparePre = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-    if (process.platform === 'win32') {
-        return process.env.USERPROFILE || process.env.HOMEDRIVE + process.env.HOMEPATH || home || null;
-    }
+  // 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 (process.platform === 'darwin') {
-        return home || (user ? '/Users/' + user : null);
+  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)
+}
 
-    if (process.platform === 'linux') {
-        return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null)); // eslint-disable-line no-extra-parens
-    }
+// 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
 
-    return home || null;
-};
+    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
 
+    default:
+      throw new Error('invalid increment argument: ' + release)
+  }
+  this.format()
+  this.raw = this.version
+  return this
+}
 
-/***/ }),
-/* 501 */
-/***/ (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'
+    }
+    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
+  }
+}
 
-/***/ }),
-/* 502 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.compareIdentifiers = compareIdentifiers
 
-var path = __webpack_require__(4);
-var parse = path.parse || __webpack_require__(503); // eslint-disable-line global-require
+var numeric = /^[0-9]+$/
+function compareIdentifiers (a, b) {
+  var anum = numeric.test(a)
+  var bnum = numeric.test(b)
 
-var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
-    var prefix = '/';
-    if ((/^([A-Za-z]:)/).test(absoluteStart)) {
-        prefix = '';
-    } else if ((/^\\\\/).test(absoluteStart)) {
-        prefix = '\\\\';
-    }
+  if (anum && bnum) {
+    a = +a
+    b = +b
+  }
 
-    var paths = [absoluteStart];
-    var parsed = parse(absoluteStart);
-    while (parsed.dir !== paths[paths.length - 1]) {
-        paths.push(parsed.dir);
-        parsed = parse(parsed.dir);
-    }
+  return a === b ? 0
+    : (anum && !bnum) ? -1
+    : (bnum && !anum) ? 1
+    : a < b ? -1
+    : 1
+}
 
-    return paths.reduce(function (dirs, aPath) {
-        return dirs.concat(modules.map(function (moduleDir) {
-            return path.resolve(prefix, aPath, moduleDir);
-        }));
-    }, []);
-};
+exports.rcompareIdentifiers = rcompareIdentifiers
+function rcompareIdentifiers (a, b) {
+  return compareIdentifiers(b, a)
+}
 
-module.exports = function nodeModulesPaths(start, opts, request) {
-    var modules = opts && opts.moduleDirectory
-        ? [].concat(opts.moduleDirectory)
-        : ['node_modules'];
+exports.major = major
+function major (a, loose) {
+  return new SemVer(a, loose).major
+}
 
-    if (opts && typeof opts.paths === 'function') {
-        return opts.paths(
-            request,
-            start,
-            function () { return getNodeModulesDirs(start, modules); },
-            opts
-        );
-    }
+exports.minor = minor
+function minor (a, loose) {
+  return new SemVer(a, loose).minor
+}
 
-    var dirs = getNodeModulesDirs(start, modules);
-    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
-};
+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))
+}
 
-/***/ }),
-/* 503 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.compareLoose = compareLoose
+function compareLoose (a, b) {
+  return compare(a, b, true)
+}
 
-"use strict";
+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)
+  })
+}
 
-var isWindows = process.platform === 'win32';
+exports.rsort = rsort
+function rsort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.rcompare(a, b, loose)
+  })
+}
 
-// Regex to split a windows path into into [dir, root, basename, name, ext]
-var splitWindowsRe =
-    /^(((?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?[\\\/]?)(?:[^\\\/]*[\\\/])*)((\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))[\\\/]*$/;
+exports.gt = gt
+function gt (a, b, loose) {
+  return compare(a, b, loose) > 0
+}
 
-var win32 = {};
+exports.lt = lt
+function lt (a, b, loose) {
+  return compare(a, b, loose) < 0
+}
 
-function win32SplitPath(filename) {
-  return splitWindowsRe.exec(filename).slice(1);
+exports.eq = eq
+function eq (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 !== 5) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  return {
-    root: allParts[1],
-    dir: allParts[0] === allParts[1] ? allParts[0] : allParts[0].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[4],
-    name: allParts[3]
-  };
-};
+exports.neq = neq
+function neq (a, b, loose) {
+  return compare(a, b, loose) !== 0
+}
 
+exports.gte = gte
+function gte (a, b, loose) {
+  return compare(a, b, loose) >= 0
+}
 
+exports.lte = lte
+function lte (a, b, loose) {
+  return compare(a, b, loose) <= 0
+}
 
-// Split a filename into [dir, root, basename, name, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^((\/?)(?:[^\/]*\/)*)((\.{1,2}|[^\/]+?|)(\.[^.\/]*|))[\/]*$/;
-var posix = {};
+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
 
-function posixSplitPath(filename) {
-  return splitPathRe.exec(filename).slice(1);
-}
+    case '':
+    case '=':
+    case '==':
+      return eq(a, b, loose)
 
+    case '!=':
+      return neq(a, b, loose)
 
-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 !== 5) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  
-  return {
-    root: allParts[1],
-    dir: allParts[0].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[4],
-    name: allParts[3],
-  };
-};
+    case '>':
+      return gt(a, b, loose)
 
+    case '>=':
+      return gte(a, b, loose)
 
-if (isWindows)
-  module.exports = win32.parse;
-else /* posix */
-  module.exports = posix.parse;
+    case '<':
+      return lt(a, b, loose)
 
-module.exports.posix = posix.parse;
-module.exports.win32 = win32.parse;
+    case '<=':
+      return lte(a, b, loose)
 
+    default:
+      throw new TypeError('Invalid operator: ' + op)
+  }
+}
 
-/***/ }),
-/* 504 */
-/***/ (function(module, exports) {
+exports.Comparator = Comparator
+function Comparator (comp, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-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.
-     */
+  if (comp instanceof Comparator) {
+    if (comp.loose === !!options.loose) {
+      return comp
+    } else {
+      comp = comp.value
+    }
+  }
 
-    return opts || {};
-};
+  if (!(this instanceof Comparator)) {
+    return new Comparator(comp, options)
+  }
 
+  debug('comparator', comp, options)
+  this.options = options
+  this.loose = !!options.loose
+  this.parse(comp)
 
-/***/ }),
-/* 505 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (this.semver === ANY) {
+    this.value = ''
+  } else {
+    this.value = this.operator + this.semver.version
+  }
 
-"use strict";
+  debug('comp', this)
+}
 
+var ANY = {}
+Comparator.prototype.parse = function (comp) {
+  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var m = comp.match(r)
 
-var has = __webpack_require__(506);
+  if (!m) {
+    throw new TypeError('Invalid comparator: ' + comp)
+  }
 
-function specifierIncluded(current, specifier) {
-	var nodeParts = current.split('.');
-	var parts = specifier.split(' ');
-	var op = parts.length > 1 ? parts[0] : '=';
-	var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+  this.operator = m[1]
+  if (this.operator === '=') {
+    this.operator = ''
+  }
 
-	for (var i = 0; i < 3; ++i) {
-		var cur = parseInt(nodeParts[i] || 0, 10);
-		var ver = parseInt(versionParts[i] || 0, 10);
-		if (cur === ver) {
-			continue; // eslint-disable-line no-restricted-syntax, no-continue
-		}
-		if (op === '<') {
-			return cur < ver;
-		}
-		if (op === '>=') {
-			return cur >= ver;
-		}
-		return false;
-	}
-	return op === '>=';
+  // 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)
+  }
 }
 
-function matchesRange(current, range) {
-	var specifiers = range.split(/ ?&& ?/);
-	if (specifiers.length === 0) {
-		return false;
-	}
-	for (var i = 0; i < specifiers.length; ++i) {
-		if (!specifierIncluded(current, specifiers[i])) {
-			return false;
-		}
-	}
-	return true;
+Comparator.prototype.toString = function () {
+  return this.value
 }
 
-function versionIncluded(nodeVersion, specifierValue) {
-	if (typeof specifierValue === 'boolean') {
-		return specifierValue;
-	}
+Comparator.prototype.test = function (version) {
+  debug('Comparator.test', version, this.options.loose)
 
-	var current = typeof nodeVersion === 'undefined'
-		? process.versions && process.versions.node
-		: nodeVersion;
+  if (this.semver === ANY) {
+    return true
+  }
 
-	if (typeof current !== 'string') {
-		throw new TypeError(typeof nodeVersion === 'undefined' ? 'Unable to determine current node version' : 'If provided, a valid node version is required');
-	}
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-	if (specifierValue && typeof specifierValue === 'object') {
-		for (var i = 0; i < specifierValue.length; ++i) {
-			if (matchesRange(current, specifierValue[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	return matchesRange(current, specifierValue);
+  return cmp(version, this.operator, this.semver, this.options)
 }
 
-var data = __webpack_require__(509);
-
-module.exports = function isCore(x, nodeVersion) {
-	return has(data, x) && versionIncluded(nodeVersion, data[x]);
-};
-
+Comparator.prototype.intersects = function (comp, options) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required')
+  }
 
-/***/ }),
-/* 506 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-"use strict";
+  var rangeTmp
 
+  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 bind = __webpack_require__(507);
+  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 === '>'))
 
-module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+}
 
+exports.Range = Range
+function Range (range, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-/***/ }),
-/* 507 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (range instanceof Range) {
+    if (range.loose === !!options.loose &&
+        range.includePrerelease === !!options.includePrerelease) {
+      return range
+    } else {
+      return new Range(range.raw, options)
+    }
+  }
 
-"use strict";
+  if (range instanceof Comparator) {
+    return new Range(range.value, options)
+  }
 
+  if (!(this instanceof Range)) {
+    return new Range(range, options)
+  }
 
-var implementation = __webpack_require__(508);
+  this.options = options
+  this.loose = !!options.loose
+  this.includePrerelease = !!options.includePrerelease
 
-module.exports = Function.prototype.bind || implementation;
+  // 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)
+  }
 
-/***/ }),
-/* 508 */
-/***/ (function(module, exports, __webpack_require__) {
+  this.format()
+}
 
-"use strict";
+Range.prototype.format = function () {
+  this.range = this.set.map(function (comps) {
+    return comps.join(' ').trim()
+  }).join('||').trim()
+  return this.range
+}
 
+Range.prototype.toString = function () {
+  return this.range
+}
 
-/* eslint no-invalid-this: 1 */
+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])
 
-var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
-var slice = Array.prototype.slice;
-var toStr = Object.prototype.toString;
-var funcType = '[object Function]';
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace)
 
-module.exports = function bind(that) {
-    var target = this;
-    if (typeof target !== 'function' || toStr.call(target) !== funcType) {
-        throw new TypeError(ERROR_MESSAGE + target);
-    }
-    var args = slice.call(arguments, 1);
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace)
 
-    var bound;
-    var binder = function () {
-        if (this instanceof bound) {
-            var result = target.apply(
-                this,
-                args.concat(slice.call(arguments))
-            );
-            if (Object(result) === result) {
-                return result;
-            }
-            return this;
-        } else {
-            return target.apply(
-                that,
-                args.concat(slice.call(arguments))
-            );
-        }
-    };
+  // normalize spaces
+  range = range.split(/\s+/).join(' ')
 
-    var boundLength = Math.max(0, target.length - args.length);
-    var boundArgs = [];
-    for (var i = 0; i < boundLength; i++) {
-        boundArgs.push('$' + i);
-    }
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
-    bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
+  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)
 
-    if (target.prototype) {
-        var Empty = function Empty() {};
-        Empty.prototype = target.prototype;
-        bound.prototype = new Empty();
-        Empty.prototype = null;
-    }
+  return set
+}
 
-    return bound;
-};
+Range.prototype.intersects = function (range, options) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required')
+  }
 
+  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)
+        })
+      })
+    })
+  })
+}
 
-/***/ }),
-/* 509 */
-/***/ (function(module) {
+// 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(' ')
+  })
+}
 
-module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
+// 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
+}
 
-/***/ }),
-/* 510 */
-/***/ (function(module, exports, __webpack_require__) {
+function isX (id) {
+  return !id || id.toLowerCase() === 'x' || id === '*'
+}
 
-var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
+// ~, ~> --> * (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(' ')
+}
 
-function specifierIncluded(specifier) {
-    var parts = specifier.split(' ');
-    var op = parts.length > 1 ? parts[0] : '=';
-    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+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
 
-    for (var i = 0; i < 3; ++i) {
-        var cur = parseInt(current[i] || 0, 10);
-        var ver = parseInt(versionParts[i] || 0, 10);
-        if (cur === ver) {
-            continue; // eslint-disable-line no-restricted-syntax, no-continue
-        }
-        if (op === '<') {
-            return cur < ver;
-        } else if (op === '>=') {
-            return cur >= ver;
-        }
-        return false;
+    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'
     }
-    return op === '>=';
+
+    debug('tilde return', ret)
+    return ret
+  })
 }
 
-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;
+// ^ --> * (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 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; }
+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
+
+    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'
         }
-        return false;
+      } 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'
+      }
     }
-    return matchesRange(specifierValue);
+
+    debug('caret return', ret)
+    return ret
+  })
 }
 
-var data = __webpack_require__(511);
+function replaceXRanges (comp, options) {
+  debug('replaceXRanges', comp, options)
+  return comp.split(/\s+/).map(function (comp) {
+    return replaceXRange(comp, options)
+  }).join(' ')
+}
 
-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]);
+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
+
+    if (gtlt === '=' && anyX) {
+      gtlt = ''
     }
-}
-module.exports = core;
 
+    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
 
-/***/ }),
-/* 511 */
-/***/ (function(module) {
+      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
+        }
+      }
 
-module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
+      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'
+    }
 
-/***/ }),
-/* 512 */
-/***/ (function(module, exports, __webpack_require__) {
+    debug('xRange return', ret)
 
-var isCoreModule = __webpack_require__(505);
+    return ret
+  })
+}
 
-module.exports = function isCore(x) {
-    return isCoreModule(x);
-};
+// 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], '')
+}
 
+// 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
+  }
 
-/***/ }),
-/* 513 */
-/***/ (function(module, exports, __webpack_require__) {
+  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 isCore = __webpack_require__(505);
-var fs = __webpack_require__(253);
-var path = __webpack_require__(4);
-var getHomedir = __webpack_require__(500);
-var caller = __webpack_require__(501);
-var nodeModulesPaths = __webpack_require__(502);
-var normalizeOptions = __webpack_require__(504);
+  return (from + ' ' + to).trim()
+}
 
-var realpathFS = fs.realpathSync && typeof fs.realpathSync.native === 'function' ? fs.realpathSync.native : fs.realpathSync;
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function (version) {
+  if (!version) {
+    return false
+  }
 
-var homedir = getHomedir();
-var defaultPaths = function () {
-    return [
-        path.join(homedir, '.node_modules'),
-        path.join(homedir, '.node_libraries')
-    ];
-};
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-var defaultIsFile = function isFile(file) {
-    try {
-        var stat = fs.statSync(file, { throwIfNoEntry: false });
-    } catch (e) {
-        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
-        throw e;
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version, this.options)) {
+      return true
     }
-    return !!stat && (stat.isFile() || stat.isFIFO());
-};
+  }
+  return false
+}
 
-var defaultIsDir = function isDirectory(dir) {
-    try {
-        var stat = fs.statSync(dir, { throwIfNoEntry: false });
-    } catch (e) {
-        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
-        throw e;
+function testSet (set, version, options) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version)) {
+      return false
     }
-    return !!stat && stat.isDirectory();
-};
+  }
 
-var defaultRealpathSync = function realpathSync(x) {
-    try {
-        return realpathFS(x);
-    } catch (realpathErr) {
-        if (realpathErr.code !== 'ENOENT') {
-            throw realpathErr;
+  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
+      }
+
+      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 x;
-};
 
-var maybeRealpathSync = function maybeRealpathSync(realpathSync, x, opts) {
-    if (opts && opts.preserveSymlinks === false) {
-        return realpathSync(x);
-    }
-    return x;
-};
+    // Version has a -pre, but it's not one of the ones we like.
+    return false
+  }
 
-var defaultReadPackageSync = function defaultReadPackageSync(readFileSync, pkgfile) {
-    var body = readFileSync(pkgfile);
-    try {
-        var pkg = JSON.parse(body);
-        return pkg;
-    } catch (jsonErr) {}
-};
+  return true
+}
 
-var getPackageCandidates = function getPackageCandidates(x, start, opts) {
-    var dirs = nodeModulesPaths(start, opts, x);
-    for (var i = 0; i < dirs.length; i++) {
-        dirs[i] = path.join(dirs[i], x);
-    }
-    return dirs;
-};
+exports.satisfies = satisfies
+function satisfies (version, range, options) {
+  try {
+    range = new Range(range, options)
+  } catch (er) {
+    return false
+  }
+  return range.test(version)
+}
 
-module.exports = function resolveSync(x, options) {
-    if (typeof x !== 'string') {
-        throw new TypeError('Path must be a string.');
+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)
+      }
     }
-    var opts = normalizeOptions(x, options);
+  })
+  return max
+}
 
-    var isFile = opts.isFile || defaultIsFile;
-    var readFileSync = opts.readFileSync || fs.readFileSync;
-    var isDirectory = opts.isDirectory || defaultIsDir;
-    var realpathSync = opts.realpathSync || defaultRealpathSync;
-    var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
-    if (opts.readFileSync && opts.readPackageSync) {
-        throw new TypeError('`readFileSync` and `readPackageSync` are mutually exclusive.');
+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)
+      }
     }
-    var packageIterator = opts.packageIterator;
+  })
+  return min
+}
 
-    var extensions = opts.extensions || ['.js'];
-    var includeCoreModules = opts.includeCoreModules !== false;
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
+exports.minVersion = minVersion
+function minVersion (range, loose) {
+  range = new Range(range, loose)
 
-    opts.paths = opts.paths || defaultPaths();
+  var minver = new SemVer('0.0.0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
-    var absoluteStart = maybeRealpathSync(realpathSync, path.resolve(basedir), opts);
+  minver = new SemVer('0.0.0-0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-    if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
-        var res = path.resolve(absoluteStart, x);
-        if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
-        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
-        if (m) return maybeRealpathSync(realpathSync, m, opts);
-    } else if (includeCoreModules && isCore(x)) {
-        return x;
-    } else {
-        var n = loadNodeModulesSync(x, absoluteStart);
-        if (n) return maybeRealpathSync(realpathSync, n, opts);
-    }
+  minver = null
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-    err.code = 'MODULE_NOT_FOUND';
-    throw err;
+    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)
+      }
+    })
+  }
 
-    function loadAsFileSync(x) {
-        var pkg = loadpkg(path.dirname(x));
+  if (minver && range.test(minver)) {
+    return minver
+  }
 
-        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
-            }
-        }
+  return null
+}
 
-        if (isFile(x)) {
-            return x;
-        }
+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
+  }
+}
 
-        for (var i = 0; i < extensions.length; i++) {
-            var file = x + extensions[i];
-            if (isFile(file)) {
-                return file;
-            }
-        }
-    }
+// 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)
+}
 
-    function loadpkg(dir) {
-        if (dir === '' || dir === '/') return;
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return;
-        }
-        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
+// 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 pkgfile = path.join(maybeRealpathSync(realpathSync, dir, opts), 'package.json');
+exports.outside = outside
+function outside (version, range, hilo, options) {
+  version = new SemVer(version, options)
+  range = new Range(range, options)
 
-        if (!isFile(pkgfile)) {
-            return loadpkg(path.dirname(dir));
-        }
+  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 ">"')
+  }
 
-        var pkg = readPackageSync(readFileSync, pkgfile);
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, options)) {
+    return false
+  }
 
-        if (pkg && opts.packageFilter) {
-            // v2 will pass pkgfile
-            pkg = opts.packageFilter(pkg, /*pkgfile,*/ dir); // eslint-disable-line spaced-comment
-        }
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
 
-        return { pkg: pkg, dir: dir };
-    }
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-    function loadAsDirectorySync(x) {
-        var pkgfile = path.join(maybeRealpathSync(realpathSync, x, opts), '/package.json');
-        if (isFile(pkgfile)) {
-            try {
-                var pkg = readPackageSync(readFileSync, pkgfile);
-            } catch (e) {}
+    var high = null
+    var low = null
 
-            if (pkg && opts.packageFilter) {
-                // v2 will pass pkgfile
-                pkg = opts.packageFilter(pkg, /*pkgfile,*/ x); // eslint-disable-line spaced-comment
-            }
+    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
+      }
+    })
 
-            if (pkg && 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) {}
-            }
-        }
+    // 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 loadAsFileSync(path.join(x, '/index'));
+    // 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
+}
 
-    function loadNodeModulesSync(x, start) {
-        var thunk = function () { return getPackageCandidates(x, start, opts); };
-        var dirs = packageIterator ? packageIterator(x, start, thunk, opts) : thunk();
+exports.prerelease = prerelease
+function prerelease (version, options) {
+  var parsed = parse(version, options)
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+}
 
-        for (var i = 0; i < dirs.length; i++) {
-            var dir = dirs[i];
-            if (isDirectory(path.dirname(dir))) {
-                var m = loadAsFileSync(dir);
-                if (m) return m;
-                var n = loadAsDirectorySync(dir);
-                if (n) return n;
-            }
-        }
-    }
-};
+exports.intersects = intersects
+function intersects (r1, r2, options) {
+  r1 = new Range(r1, options)
+  r2 = new Range(r2, options)
+  return r1.intersects(r2)
+}
 
+exports.coerce = coerce
+function coerce (version) {
+  if (version instanceof SemVer) {
+    return version
+  }
 
-/***/ }),
-/* 514 */
-/***/ (function(module, exports) {
+  if (typeof version !== 'string') {
+    return null
+  }
 
-module.exports = extractDescription
+  var match = version.match(re[COERCE])
 
-// 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()
+  if (match == null) {
+    return null
+  }
+
+  return parse(match[1] +
+    '.' + (match[2] || '0') +
+    '.' + (match[3] || '0'))
 }
 
 
 /***/ }),
-/* 515 */
-/***/ (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\"}}");
 
-/***/ }),
-/* 516 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ "../../node_modules/normalize-path/index.js":
+/***/ (function(module, exports) {
 
-var util = __webpack_require__(234)
-var messages = __webpack_require__(517)
+/*!
+ * normalize-path <https://github.com/jonschlinkert/normalize-path>
+ *
+ * Copyright (c) 2014-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-module.exports = function() {
-  var args = Array.prototype.slice.call(arguments, 0)
-  var warningName = args.shift()
-  if (warningName == "typo") {
-    return makeTypoWarning.apply(null,args)
+module.exports = function(path, stripTrailing) {
+  if (typeof path !== 'string') {
+    throw new TypeError('expected path to be a string');
   }
-  else {
-    var msgTemplate = messages[warningName] ? messages[warningName] : warningName + ": '%s'"
-    args.unshift(msgTemplate)
-    return util.format.apply(null, args)
+
+  if (path === '\\' || path === '/') return '/';
+
+  var len = path.length;
+  if (len <= 1) return path;
+
+  // ensure that win32 namespaces has two leading slashes, so that the path is
+  // handled properly by the win32 version of path.parse() after being normalized
+  // https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+  var prefix = '';
+  if (len > 4 && path[3] === '\\') {
+    var ch = path[2];
+    if ((ch === '?' || ch === '.') && path.slice(0, 2) === '\\\\') {
+      path = path.slice(2);
+      prefix = '//';
+    }
   }
-}
 
-function makeTypoWarning (providedName, probableName, field) {
-  if (field) {
-    providedName = field + "['" + providedName + "']"
-    probableName = field + "['" + probableName + "']"
+  var segs = path.split(/[/\\]+/);
+  if (stripTrailing !== false && segs[segs.length - 1] === '') {
+    segs.pop();
   }
-  return util.format(messages.typo, providedName, probableName)
-}
+  return prefix + segs.join('/');
+};
 
 
 /***/ }),
-/* 517 */
-/***/ (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.\"}");
 
-/***/ }),
-/* 518 */
+/***/ "../../node_modules/npm-run-path/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(4);
-const writeJsonFile = __webpack_require__(519);
-const sortKeys = __webpack_require__(523);
+const path = __webpack_require__("path");
+const pathKey = __webpack_require__("../../node_modules/npm-run-path/node_modules/path-key/index.js");
 
-const dependencyKeys = new Set([
-	'dependencies',
-	'devDependencies',
-	'optionalDependencies',
-	'peerDependencies'
-]);
+const npmRunPath = options => {
+	options = {
+		cwd: process.cwd(),
+		path: process.env[pathKey()],
+		execPath: process.execPath,
+		...options
+	};
 
-function normalize(packageJson) {
-	const result = {};
+	let previous;
+	let cwdPath = path.resolve(options.cwd);
+	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]);
-		}
+	while (previous !== cwdPath) {
+		result.push(path.join(cwdPath, 'node_modules/.bin'));
+		previous = cwdPath;
+		cwdPath = path.resolve(cwdPath, '..');
 	}
 
-	return result;
-}
+	// Ensure the running `node` binary is used
+	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
+	result.push(execPathDir);
 
-module.exports = async (filePath, data, options) => {
-	if (typeof filePath !== 'string') {
-		options = data;
-		data = filePath;
-		filePath = '.';
-	}
+	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 = {
-		normalize: true,
-		...options,
-		detectIndent: true
+		env: process.env,
+		...options
 	};
 
-	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
+	const env = {...options.env};
+	const path = pathKey({env});
 
-	data = options.normalize ? normalize(data) : data;
+	options.path = env[path];
+	env[path] = module.exports(options);
 
-	return writeJsonFile(filePath, data, options);
+	return env;
 };
 
-module.exports.sync = (filePath, data, options) => {
-	if (typeof filePath !== 'string') {
-		options = data;
-		data = filePath;
-		filePath = '.';
-	}
 
-	options = {
-		normalize: true,
-		...options,
-		detectIndent: true
-	};
+/***/ }),
 
-	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
+/***/ "../../node_modules/npm-run-path/node_modules/path-key/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	data = options.normalize ? normalize(data) : data;
+"use strict";
 
-	writeJsonFile.sync(filePath, data, options);
+
+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;
+
 
 /***/ }),
-/* 519 */
+
+/***/ "../../node_modules/once/once.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var wrappy = __webpack_require__("../../node_modules/wrappy/wrappy.js")
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
 
-const path = __webpack_require__(4);
-const fs = __webpack_require__(354);
-const writeFileAtomic = __webpack_require__(520);
-const sortKeys = __webpack_require__(523);
-const makeDir = __webpack_require__(525);
-const pify = __webpack_require__(526);
-const detectIndent = __webpack_require__(528);
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
 
-const init = (fn, filePath, data, options) => {
-	if (!filePath) {
-		throw new TypeError('Expected a filepath');
-	}
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
 
-	if (data === undefined) {
-		throw new TypeError('Expected data to stringify');
-	}
+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
+}
 
-	options = Object.assign({
-		indent: '\t',
-		sortKeys: false
-	}, options);
+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
+}
 
-	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(() => {});
+/***/ "../../node_modules/onetime/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-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);
+"use strict";
 
-			return pify(writeFileAtomic)(filePath, `${json}\n`, {mode: options.mode});
-		});
-};
+const mimicFn = __webpack_require__("../../node_modules/mimic-fn/index.js");
 
-const mainSync = (filePath, data, options) => {
-	let {indent} = options;
+const calledFunctions = new WeakMap();
 
-	if (options.detectIndent) {
-		try {
-			const file = fs.readFileSync(filePath, 'utf8');
-			indent = detectIndent(file).indent;
-		} catch (error) {
-			if (error.code !== 'ENOENT') {
-				throw error;
-			}
-		}
+const onetime = (function_, options = {}) => {
+	if (typeof function_ !== 'function') {
+		throw new TypeError('Expected a function');
 	}
 
-	const json = JSON.stringify(data, options.replacer, indent);
+	let returnValue;
+	let callCount = 0;
+	const functionName = function_.displayName || function_.name || '<anonymous>';
 
-	return writeFileAtomic.sync(filePath, `${json}\n`, {mode: options.mode});
-};
+	const onetime = function (...arguments_) {
+		calledFunctions.set(onetime, ++callCount);
 
-const writeJsonFile = (filePath, data, options) => {
-	return makeDir(path.dirname(filePath), {fs})
-		.then(() => init(main, filePath, data, options));
+		if (callCount === 1) {
+			returnValue = function_.apply(this, arguments_);
+			function_ = null;
+		} else if (options.throw === true) {
+			throw new Error(`Function \`${functionName}\` can only be called once`);
+		}
+
+		return returnValue;
+	};
+
+	mimicFn(onetime, function_);
+	calledFunctions.set(onetime, callCount);
+
+	return onetime;
 };
 
-module.exports = writeJsonFile;
+module.exports = onetime;
 // 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);
+module.exports.default = onetime;
+
+module.exports.callCount = function_ => {
+	if (!calledFunctions.has(function_)) {
+		throw new Error(`The given function \`${function_.name}\` is not wrapped by the \`onetime\` package`);
+	}
+
+	return calledFunctions.get(function_);
 };
 
 
 /***/ }),
-/* 520 */
+
+/***/ "../../node_modules/ora/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = writeFile
-module.exports.sync = writeFileSync
-module.exports._getTmpname = getTmpname // for testing
-module.exports._cleanupOnExit = cleanupOnExit
+const readline = __webpack_require__("readline");
+const chalk = __webpack_require__("../../node_modules/ora/node_modules/chalk/source/index.js");
+const cliCursor = __webpack_require__("../../node_modules/cli-cursor/index.js");
+const cliSpinners = __webpack_require__("../../node_modules/cli-spinners/index.js");
+const logSymbols = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/index.js");
+const stripAnsi = __webpack_require__("../../node_modules/strip-ansi/index.js");
+const wcwidth = __webpack_require__("../../node_modules/wcwidth/index.js");
+const isInteractive = __webpack_require__("../../node_modules/is-interactive/index.js");
+const MuteStream = __webpack_require__("../../node_modules/mute-stream/mute.js");
 
-var fs = __webpack_require__(354)
-var MurmurHash3 = __webpack_require__(521)
-var onExit = __webpack_require__(282)
-var path = __webpack_require__(4)
-var activeFiles = {}
+const TEXT = Symbol('text');
+const PREFIX_TEXT = Symbol('prefixText');
 
-// 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__(522)
+const ASCII_ETX_CODE = 0x03; // Ctrl+C emits this code
 
-    /// 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
-  }
-})()
+class StdinDiscarder {
+	constructor() {
+		this.requests = 0;
 
-var invocations = 0
-function getTmpname (filename) {
-  return filename + '.' +
-    MurmurHash3(__filename)
-      .hash(String(process.pid))
-      .hash(String(threadId))
-      .hash(String(++invocations))
-      .result()
-}
+		this.mutedStream = new MuteStream();
+		this.mutedStream.pipe(process.stdout);
+		this.mutedStream.mute();
 
-function cleanupOnExit (tmpfile) {
-  return function () {
-    try {
-      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
-    } catch (_) {}
-  }
-}
+		const self = this;
+		this.ourEmit = function (event, data, ...args) {
+			const {stdin} = process;
+			if (self.requests > 0 || stdin.emit === self.ourEmit) {
+				if (event === 'keypress') { // Fixes readline behavior
+					return;
+				}
 
-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 = {}
-  }
+				if (event === 'data' && data.includes(ASCII_ETX_CODE)) {
+					process.emit('SIGINT');
+				}
 
-  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)
+				Reflect.apply(self.oldEmit, this, [event, data, ...args]);
+			} else {
+				Reflect.apply(process.stdin.emit, this, [event, data, ...args]);
+			}
+		};
+	}
 
-  new Promise(function serializeSameFile (resolve) {
-    // make a queue if it doesn't already exist
-    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
+	start() {
+		this.requests++;
 
-    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
-    }
-  }
+		if (this.requests === 1) {
+			this.realStart();
+		}
+	}
 
-  var fd
-  var cleanup = cleanupOnExit(tmpfile)
-  var removeOnExitHandler = onExit(cleanup)
+	stop() {
+		if (this.requests <= 0) {
+			throw new Error('`stop` called more times than `start`');
+		}
 
-  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
-  }
-}
+		this.requests--;
 
+		if (this.requests === 0) {
+			this.realStop();
+		}
+	}
 
-/***/ }),
-/* 521 */
-/***/ (function(module, exports, __webpack_require__) {
+	realStart() {
+		// No known way to make it work reliably on Windows
+		if (process.platform === 'win32') {
+			return;
+		}
 
-/**
- * @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;
+		this.rl = readline.createInterface({
+			input: process.stdin,
+			output: this.mutedStream
+		});
 
-    // 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);
-        }
+		this.rl.on('SIGINT', () => {
+			if (process.listenerCount('SIGINT') === 0) {
+				process.emit('SIGINT');
+			} else {
+				this.rl.close();
+				process.kill(process.pid, 'SIGINT');
+			}
+		});
+	}
 
-        if (m !== this) {
-            return m;
-        }
-    };
+	realStop() {
+		if (process.platform === 'win32') {
+			return;
+		}
 
-    // 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;
+		this.rl.close();
+		this.rl = undefined;
+	}
+}
 
-        len = key.length;
-        this.len += len;
+let stdinDiscarder;
 
-        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;
-        }
+class Ora {
+	constructor(options) {
+		if (!stdinDiscarder) {
+			stdinDiscarder = new StdinDiscarder();
+		}
 
-        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;
+		if (typeof options === 'string') {
+			options = {
+				text: options
+			};
+		}
 
-                h1 ^= k1;
-                h1 = (h1 << 13) | (h1 >>> 19);
-                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
+		this.options = {
+			text: '',
+			color: 'cyan',
+			stream: process.stderr,
+			discardStdin: true,
+			...options
+		};
 
-                if (i >= len) {
-                    break;
-                }
+		this.spinner = this.options.spinner;
 
-                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);
-            }
+		this.color = this.options.color;
+		this.hideCursor = this.options.hideCursor !== false;
+		this.interval = this.options.interval || this.spinner.interval || 100;
+		this.stream = this.options.stream;
+		this.id = undefined;
+		this.isEnabled = typeof this.options.isEnabled === 'boolean' ? this.options.isEnabled : isInteractive({stream: this.stream});
 
-            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);
-            }
+		// Set *after* `this.stream`
+		this.text = this.options.text;
+		this.prefixText = this.options.prefixText;
+		this.linesToClear = 0;
+		this.indent = this.options.indent;
+		this.discardStdin = this.options.discardStdin;
+		this.isDiscardingStdin = false;
+	}
 
-            this.h1 = h1;
-        }
+	get indent() {
+		return this._indent;
+	}
 
-        this.k1 = k1;
-        return this;
-    };
+	set indent(indent = 0) {
+		if (!(indent >= 0 && Number.isInteger(indent))) {
+			throw new Error('The `indent` option must be an integer from 0 and up');
+		}
 
-    // 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;
+		this._indent = indent;
+	}
 
-        if (k1 > 0) {
-            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
-            k1 = (k1 << 15) | (k1 >>> 17);
-            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
-            h1 ^= k1;
-        }
+	_updateInterval(interval) {
+		if (interval !== undefined) {
+			this.interval = interval;
+		}
+	}
 
-        h1 ^= this.len;
+	get spinner() {
+		return this._spinner;
+	}
 
-        h1 ^= h1 >>> 16;
-        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
-        h1 ^= h1 >>> 13;
-        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
-        h1 ^= h1 >>> 16;
+	set spinner(spinner) {
+		this.frameIndex = 0;
 
-        return h1 >>> 0;
-    };
+		if (typeof spinner === 'object') {
+			if (spinner.frames === undefined) {
+				throw new Error('The given spinner must have a `frames` property');
+			}
 
-    // 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;
-    };
+			this._spinner = spinner;
+		} else if (process.platform === 'win32') {
+			this._spinner = cliSpinners.line;
+		} else if (spinner === undefined) {
+			// Set default spinner
+			this._spinner = cliSpinners.dots;
+		} else if (cliSpinners[spinner]) {
+			this._spinner = cliSpinners[spinner];
+		} else {
+			throw new Error(`There is no built-in spinner named '${spinner}'. See https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json for a full list.`);
+		}
 
-    // 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();
+		this._updateInterval(this._spinner.interval);
+	}
 
-    if (true) {
-        module.exports = MurmurHash3;
-    } else {}
-}());
+	get text() {
+		return this[TEXT];
+	}
 
+	get prefixText() {
+		return this[PREFIX_TEXT];
+	}
 
-/***/ }),
-/* 522 */
-/***/ (function(module, exports) {
+	get isSpinning() {
+		return this.id !== undefined;
+	}
 
-module.exports = require(undefined);
+	updateLineCount() {
+		const columns = this.stream.columns || 80;
+		const fullPrefixText = (typeof this[PREFIX_TEXT] === 'string') ? this[PREFIX_TEXT] + '-' : '';
+		this.lineCount = stripAnsi(fullPrefixText + '--' + this[TEXT]).split('\n').reduce((count, line) => {
+			return count + Math.max(1, Math.ceil(wcwidth(line) / columns));
+		}, 0);
+	}
 
-/***/ }),
-/* 523 */
-/***/ (function(module, exports, __webpack_require__) {
+	set text(value) {
+		this[TEXT] = value;
+		this.updateLineCount();
+	}
 
-"use strict";
+	set prefixText(value) {
+		this[PREFIX_TEXT] = value;
+		this.updateLineCount();
+	}
 
-const isPlainObj = __webpack_require__(524);
+	frame() {
+		const {frames} = this.spinner;
+		let frame = frames[this.frameIndex];
 
-module.exports = (obj, opts) => {
-	if (!isPlainObj(obj)) {
-		throw new TypeError('Expected a plain object');
-	}
+		if (this.color) {
+			frame = chalk[this.color](frame);
+		}
 
-	opts = opts || {};
+		this.frameIndex = ++this.frameIndex % frames.length;
+		const fullPrefixText = (typeof this.prefixText === 'string' && this.prefixText !== '') ? this.prefixText + ' ' : '';
+		const fullText = typeof this.text === 'string' ? ' ' + this.text : '';
 
-	// DEPRECATED
-	if (typeof opts === 'function') {
-		throw new TypeError('Specify the compare function as an option instead');
+		return fullPrefixText + frame + fullText;
 	}
 
-	const deep = opts.deep;
-	const seenInput = [];
-	const seenOutput = [];
+	clear() {
+		if (!this.isEnabled || !this.stream.isTTY) {
+			return this;
+		}
 
-	const sortKeys = x => {
-		const seenIndex = seenInput.indexOf(x);
+		for (let i = 0; i < this.linesToClear; i++) {
+			if (i > 0) {
+				this.stream.moveCursor(0, -1);
+			}
 
-		if (seenIndex !== -1) {
-			return seenOutput[seenIndex];
+			this.stream.clearLine();
+			this.stream.cursorTo(this.indent);
 		}
 
-		const ret = {};
-		const keys = Object.keys(x).sort(opts.compare);
+		this.linesToClear = 0;
 
-		seenInput.push(x);
-		seenOutput.push(ret);
+		return this;
+	}
 
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			const val = x[key];
+	render() {
+		this.clear();
+		this.stream.write(this.frame());
+		this.linesToClear = this.lineCount;
 
-			if (deep && Array.isArray(val)) {
-				const retArr = [];
+		return this;
+	}
 
-				for (let j = 0; j < val.length; j++) {
-					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
-				}
+	start(text) {
+		if (text) {
+			this.text = text;
+		}
 
-				ret[key] = retArr;
-				continue;
+		if (!this.isEnabled) {
+			if (this.text) {
+				this.stream.write(`- ${this.text}\n`);
 			}
 
-			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
+			return this;
 		}
 
-		return ret;
-	};
-
-	return sortKeys(obj);
-};
+		if (this.isSpinning) {
+			return this;
+		}
 
+		if (this.hideCursor) {
+			cliCursor.hide(this.stream);
+		}
 
-/***/ }),
-/* 524 */
-/***/ (function(module, exports, __webpack_require__) {
+		if (this.discardStdin && process.stdin.isTTY) {
+			this.isDiscardingStdin = true;
+			stdinDiscarder.start();
+		}
 
-"use strict";
+		this.render();
+		this.id = setInterval(this.render.bind(this), this.interval);
 
-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({}));
-};
+		return this;
+	}
 
+	stop() {
+		if (!this.isEnabled) {
+			return this;
+		}
 
-/***/ }),
-/* 525 */
-/***/ (function(module, exports, __webpack_require__) {
+		clearInterval(this.id);
+		this.id = undefined;
+		this.frameIndex = 0;
+		this.clear();
+		if (this.hideCursor) {
+			cliCursor.show(this.stream);
+		}
 
-"use strict";
+		if (this.discardStdin && process.stdin.isTTY && this.isDiscardingStdin) {
+			stdinDiscarder.stop();
+			this.isDiscardingStdin = false;
+		}
 
-const fs = __webpack_require__(253);
-const path = __webpack_require__(4);
-const pify = __webpack_require__(526);
-const semver = __webpack_require__(527);
+		return this;
+	}
 
-const defaults = {
-	mode: 0o777 & (~process.umask()),
-	fs
-};
+	succeed(text) {
+		return this.stopAndPersist({symbol: logSymbols.success, text});
+	}
 
-const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
+	fail(text) {
+		return this.stopAndPersist({symbol: logSymbols.error, text});
+	}
 
-// 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, ''));
+	warn(text) {
+		return this.stopAndPersist({symbol: logSymbols.warning, text});
+	}
 
-		if (pathHasInvalidWinCharacters) {
-			const error = new Error(`Path contains invalid characters: ${pth}`);
-			error.code = 'EINVAL';
-			throw error;
-		}
+	info(text) {
+		return this.stopAndPersist({symbol: logSymbols.info, text});
 	}
-};
 
-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;
-};
+	stopAndPersist(options = {}) {
+		const prefixText = options.prefixText || this.prefixText;
+		const fullPrefixText = (typeof prefixText === 'string' && prefixText !== '') ? prefixText + ' ' : '';
+		const text = options.text || this.text;
+		const fullText = (typeof text === 'string') ? ' ' + text : '';
 
-const makeDir = (input, options) => Promise.resolve().then(() => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
+		this.stop();
+		this.stream.write(`${fullPrefixText}${options.symbol || ' '}${fullText}\n`);
 
-	// TODO: Use util.promisify when targeting Node.js 8
-	const mkdir = pify(options.fs.mkdir);
-	const stat = pify(options.fs.stat);
+		return this;
+	}
+}
 
-	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
-		const pth = path.resolve(input);
+const oraFactory = function (options) {
+	return new Ora(options);
+};
 
-		return mkdir(pth, {
-			mode: options.mode,
-			recursive: true
-		}).then(() => pth);
+module.exports = oraFactory;
+
+module.exports.promise = (action, options) => {
+	// eslint-disable-next-line promise/prefer-await-to-then
+	if (typeof action.then !== 'function') {
+		throw new TypeError('Parameter `action` must be a Promise');
 	}
 
-	const make = pth => {
-		return mkdir(pth, options.mode)
-			.then(() => pth)
-			.catch(error => {
-				if (error.code === 'EPERM') {
-					throw error;
-				}
+	const spinner = new Ora(options);
+	spinner.start();
 
-				if (error.code === 'ENOENT') {
-					if (path.dirname(pth) === pth) {
-						throw permissionError(pth);
-					}
+	(async () => {
+		try {
+			await action;
+			spinner.succeed();
+		} catch (_) {
+			spinner.fail();
+		}
+	})();
 
-					if (error.message.includes('null bytes')) {
-						throw error;
-					}
+	return spinner;
+};
 
-					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));
-});
+/***/ "../../node_modules/ora/node_modules/chalk/source/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = makeDir;
-module.exports.default = makeDir;
+"use strict";
 
-module.exports.sync = (input, options) => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
+const ansiStyles = __webpack_require__("../../node_modules/ansi-styles/index.js");
+const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__("../../node_modules/supports-color/index.js");
+const {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+} = __webpack_require__("../../node_modules/ora/node_modules/chalk/source/util.js");
 
-	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
-		const pth = path.resolve(input);
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = [
+	'ansi',
+	'ansi',
+	'ansi256',
+	'ansi16m'
+];
 
-		fs.mkdirSync(pth, {
-			mode: options.mode,
-			recursive: true
-		});
+const styles = Object.create(null);
 
-		return pth;
+const applyOptions = (object, options = {}) => {
+	if (options.level > 3 || options.level < 0) {
+		throw new Error('The `level` option should be an integer from 0 to 3');
 	}
 
-	const make = pth => {
-		try {
-			options.fs.mkdirSync(pth, options.mode);
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
+	// Detect level if not set manually
+	const colorLevel = stdoutColor ? stdoutColor.level : 0;
+	object.level = options.level === undefined ? colorLevel : options.level;
+};
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
+class ChalkClass {
+	constructor(options) {
+		return chalkFactory(options);
+	}
+}
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
+const chalkFactory = options => {
+	const chalk = {};
+	applyOptions(chalk, options);
 
-				make(path.dirname(pth));
-				return make(pth);
-			}
+	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
 
-			try {
-				if (!options.fs.statSync(pth).isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
-		}
+	Object.setPrototypeOf(chalk, Chalk.prototype);
+	Object.setPrototypeOf(chalk.template, chalk);
 
-		return pth;
+	chalk.template.constructor = () => {
+		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
 	};
 
-	return make(path.resolve(input));
-};
-
-
-/***/ }),
-/* 526 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+	chalk.template.Instance = ChalkClass;
 
+	return chalk.template;
+};
 
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
+function Chalk(options) {
+	return chalkFactory(options);
+}
 
-	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);
+for (const [styleName, style] of Object.entries(ansiStyles)) {
+	styles[styleName] = {
+		get() {
+			const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty);
+			Object.defineProperty(this, styleName, {value: builder});
+			return builder;
 		}
+	};
+}
 
-		fn.apply(this, args);
-	});
+styles.visible = {
+	get() {
+		const builder = createBuilder(this, this._styler, true);
+		Object.defineProperty(this, 'visible', {value: builder});
+		return builder;
+	}
 };
 
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
+const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
 
-	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}\``);
-	}
+for (const model of usedModels) {
+	styles[model] = {
+		get() {
+			const {level} = this;
+			return function (...arguments_) {
+				const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler);
+				return createBuilder(this, styler, this._isEmpty);
+			};
+		}
+	};
+}
 
-	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);
+for (const model of usedModels) {
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const {level} = this;
+			return function (...arguments_) {
+				const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler);
+				return createBuilder(this, styler, this._isEmpty);
+			};
+		}
 	};
+}
 
-	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));
+const proto = Object.defineProperties(() => {}, {
+	...styles,
+	level: {
+		enumerable: true,
+		get() {
+			return this._generator.level;
+		},
+		set(level) {
+			this._generator.level = level;
+		}
 	}
+});
 
-	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;
+const createStyler = (open, close, parent) => {
+	let openAll;
+	let closeAll;
+	if (parent === undefined) {
+		openAll = open;
+		closeAll = close;
+	} else {
+		openAll = parent.openAll + open;
+		closeAll = close + parent.closeAll;
 	}
 
-	return ret;
+	return {
+		open,
+		close,
+		openAll,
+		closeAll,
+		parent
+	};
 };
 
+const createBuilder = (self, _styler, _isEmpty) => {
+	const builder = (...arguments_) => {
+		// Single argument is hot path, implicit coercion is faster than anything
+		// eslint-disable-next-line no-implicit-coercion
+		return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
+	};
 
-/***/ }),
-/* 527 */
-/***/ (function(module, exports) {
+	// `__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
 
-exports = module.exports = SemVer
+	builder._generator = self;
+	builder._styler = _styler;
+	builder._isEmpty = _isEmpty;
 
-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 () {}
-}
+	return builder;
+};
 
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0'
+const applyStyle = (self, string) => {
+	if (self.level <= 0 || !string) {
+		return self._isEmpty ? '' : string;
+	}
 
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
+	let styler = self._styler;
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16
+	if (styler === undefined) {
+		return string;
+	}
 
-// The actual regexps go on exports.re
-var re = exports.re = []
-var src = exports.src = []
-var R = 0
+	const {openAll, closeAll} = styler;
+	if (string.indexOf('\u001B') !== -1) {
+		while (styler !== undefined) {
+			// 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'.
+			string = stringReplaceAll(string, styler.close, styler.open);
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
+			styler = styler.parent;
+		}
+	}
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
+	// We can move both next actions out of loop, because remaining actions in loop won't have
+	// any/visible effect on parts we add here. 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
+	const lfIndex = string.indexOf('\n');
+	if (lfIndex !== -1) {
+		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+	}
 
-var NUMERICIDENTIFIER = R++
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-var NUMERICIDENTIFIERLOOSE = R++
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
+	return openAll + string + closeAll;
+};
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+let template;
+const chalkTag = (chalk, ...strings) => {
+	const [firstString] = strings;
 
-var NONNUMERICIDENTIFIER = R++
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
+	if (!Array.isArray(firstString)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return strings.join(' ');
+	}
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+	const arguments_ = strings.slice(1);
+	const parts = [firstString.raw[0]];
 
-var MAINVERSION = R++
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')'
+	for (let i = 1; i < firstString.length; i++) {
+		parts.push(
+			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
+			String(firstString.raw[i])
+		);
+	}
 
-var MAINVERSIONLOOSE = R++
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
+	if (template === undefined) {
+		template = __webpack_require__("../../node_modules/ora/node_modules/chalk/source/templates.js");
+	}
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+	return template(chalk, parts.join(''));
+};
 
-var PRERELEASEIDENTIFIER = R++
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')'
+Object.defineProperties(Chalk.prototype, styles);
 
-var PRERELEASEIDENTIFIERLOOSE = R++
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
+const chalk = Chalk(); // eslint-disable-line new-cap
+chalk.supportsColor = stdoutColor;
+chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap
+chalk.stderr.supportsColor = stderrColor;
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+// For TypeScript
+chalk.Level = {
+	None: 0,
+	Basic: 1,
+	Ansi256: 2,
+	TrueColor: 3,
+	0: 'None',
+	1: 'Basic',
+	2: 'Ansi256',
+	3: 'TrueColor'
+};
 
-var PRERELEASE = R++
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
+module.exports = chalk;
 
-var PRERELEASELOOSE = R++
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+/***/ }),
 
-var BUILDIDENTIFIER = R++
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
+/***/ "../../node_modules/ora/node_modules/chalk/source/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+"use strict";
 
-var BUILD = R++
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
+const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|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}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi;
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-// 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.
+function unescape(c) {
+	const u = c[0] === 'u';
+	const bracket = c[1] === '{';
 
-var FULL = R++
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?'
+	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-src[FULL] = '^' + FULLPLAIN + '$'
+	if (u && bracket) {
+		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
+	}
 
-// 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] + '?'
+	return ESCAPES.get(c) || c;
+}
 
-var LOOSE = R++
-src[LOOSE] = '^' + LOOSEPLAIN + '$'
+function parseArguments(name, arguments_) {
+	const results = [];
+	const chunks = arguments_.trim().split(/\s*,\s*/g);
+	let matches;
 
-var GTLT = R++
-src[GTLT] = '((?:<|>)?=?)'
+	for (const chunk of chunks) {
+		const number = Number(chunk);
+		if (!Number.isNaN(number)) {
+			results.push(number);
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
 
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-var XRANGEIDENTIFIERLOOSE = R++
-src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
-var XRANGEIDENTIFIER = R++
-src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*'
+	return results;
+}
 
-var XRANGEPLAIN = R++
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?'
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-var XRANGEPLAINLOOSE = R++
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?'
+	const results = [];
+	let matches;
 
-var XRANGE = R++
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
-var XRANGELOOSE = R++
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-// 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])'
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++
-src[LONETILDE] = '(?:~>?)'
+	return results;
+}
 
-var TILDETRIM = R++
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-var TILDE = R++
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
-var TILDELOOSE = R++
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++
-src[LONECARET] = '(?:\\^)'
+	let current = chalk;
+	for (const [styleName, styles] of Object.entries(enabled)) {
+		if (!Array.isArray(styles)) {
+			continue;
+		}
 
-var CARETTRIM = R++
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
+		if (!(styleName in current)) {
+			throw new Error(`Unknown Chalk style: ${styleName}`);
+		}
 
-var CARET = R++
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
-var CARETLOOSE = R++
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
+		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
+	}
 
-// 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 + ')$|^$'
+	return current;
+}
 
-// 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] + ')'
+module.exports = (chalk, temporary) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
+	// eslint-disable-next-line max-params
+	temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
+		if (escapeCharacter) {
+			chunk.push(unescape(escapeCharacter));
+		} else if (style) {
+			const string = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
 
-// 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*$'
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(character);
+		}
+	});
 
-var HYPHENRANGELOOSE = R++
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
+	chunks.push(chunk.join(''));
 
-// Star ranges basically just allow anything at all.
-var STAR = R++
-src[STAR] = '(<|>)?=?\\s*\\*'
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-// 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])
-  }
-}
+	return chunks.join('');
+};
 
-exports.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
 
-  if (version instanceof SemVer) {
-    return version
-  }
+/***/ }),
 
-  if (typeof version !== 'string') {
-    return null
-  }
+/***/ "../../node_modules/ora/node_modules/chalk/source/util.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (version.length > MAX_LENGTH) {
-    return null
-  }
+"use strict";
 
-  var r = options.loose ? re[LOOSE] : re[FULL]
-  if (!r.test(version)) {
-    return null
-  }
 
-  try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
-  }
-}
+const stringReplaceAll = (string, substring, replacer) => {
+	let index = string.indexOf(substring);
+	if (index === -1) {
+		return string;
+	}
 
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
-}
+	const substringLength = substring.length;
+	let endIndex = 0;
+	let returnValue = '';
+	do {
+		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
+		endIndex = index + substringLength;
+		index = string.indexOf(substring, endIndex);
+	} while (index !== -1);
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
-}
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-exports.SemVer = SemVer
+const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => {
+	let endIndex = 0;
+	let returnValue = '';
+	do {
+		const gotCR = string[index - 1] === '\r';
+		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
+		endIndex = index + 1;
+		index = string.indexOf('\n', endIndex);
+	} while (index !== -1);
 
-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)
-  }
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-  }
+module.exports = {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+};
 
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
-  }
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
+/***/ }),
 
-  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
+/***/ "../../node_modules/ora/node_modules/has-flag/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
-  }
+"use strict";
 
-  this.raw = version
+module.exports = (flag, argv) => {
+	argv = argv || process.argv;
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const pos = argv.indexOf(prefix + flag);
+	const terminatorPos = argv.indexOf('--');
+	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+};
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
 
-  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')
-  }
+/***/ "../../node_modules/ora/node_modules/log-symbols/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
-  }
+"use strict";
 
-  // 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
-    })
-  }
+const chalk = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/index.js");
 
-  this.build = m[5] ? m[5].split('.') : []
-  this.format()
-}
+const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
-SemVer.prototype.format = function () {
-  this.version = this.major + '.' + this.minor + '.' + this.patch
-  if (this.prerelease.length) {
-    this.version += '-' + this.prerelease.join('.')
-  }
-  return this.version
-}
+const main = {
+	info: chalk.blue('ℹ'),
+	success: chalk.green('✔'),
+	warning: chalk.yellow('⚠'),
+	error: chalk.red('✖')
+};
 
-SemVer.prototype.toString = function () {
-  return this.version
-}
+const fallbacks = {
+	info: chalk.blue('i'),
+	success: chalk.green('√'),
+	warning: chalk.yellow('‼'),
+	error: chalk.red('×')
+};
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+module.exports = isSupported ? main : fallbacks;
 
-  return this.compareMain(other) || this.comparePre(other)
-}
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+/***/ }),
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/ansi-styles/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__("../../node_modules/color-convert/index.js");
 
-  // 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
-  }
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
 
-  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)
-}
+const wrapAnsi256 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};5;${code}m`;
+};
 
-// 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 wrapAnsi16m = (fn, offset) => function () {
+	const rgb = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
 
-    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
+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],
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
-  }
-  this.format()
-  this.raw = this.version
-  return this
-}
+			// 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],
 
-exports.inc = inc
-function inc (version, release, loose, identifier) {
-  if (typeof (loose) === 'string') {
-    identifier = loose
-    loose = undefined
-  }
+			// 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]
+		}
+	};
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version
-  } catch (er) {
-    return null
-  }
-}
+	// Fix humans
+	styles.color.grey = styles.color.gray;
 
-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
-  }
-}
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
 
-exports.compareIdentifiers = compareIdentifiers
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
-  }
+			group[styleName] = styles[styleName];
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
-}
+			codes.set(style[0], style[1]);
+		}
 
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
-}
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
 
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
-}
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
-}
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
-}
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
-}
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
-}
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
-}
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compare(a, b, loose)
-  })
-}
+		const suite = colorConvert[key];
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.rcompare(a, b, loose)
-  })
-}
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
-}
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
 
-exports.lt = lt
-function lt (a, b, loose) {
-  return compare(a, b, loose) < 0
-}
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
 
-exports.eq = eq
-function eq (a, b, loose) {
-  return compare(a, b, loose) === 0
-}
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
 
-exports.neq = neq
-function neq (a, b, loose) {
-  return compare(a, b, loose) !== 0
+	return styles;
 }
 
-exports.gte = gte
-function gte (a, b, loose) {
-  return compare(a, b, loose) >= 0
-}
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
 
-exports.lte = lte
-function lte (a, b, loose) {
-  return compare(a, b, loose) <= 0
-}
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
-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
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+"use strict";
 
-    case '!=':
-      return neq(a, b, loose)
+const escapeStringRegexp = __webpack_require__("../../node_modules/escape-string-regexp/index.js");
+const ansiStyles = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/ansi-styles/index.js");
+const stdoutColor = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/supports-color/index.js").stdout;
 
-    case '>':
-      return gt(a, b, loose)
+const template = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/templates.js");
 
-    case '>=':
-      return gte(a, b, loose)
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-    case '<':
-      return lt(a, b, loose)
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-    case '<=':
-      return lte(a, b, loose)
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
-  }
+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;
 }
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+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);
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
-    }
-  }
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
 
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
-  }
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
+		chalk.template.constructor = Chalk;
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
-  }
+		return chalk.template;
+	}
 
-  debug('comp', this)
+	applyOptions(this, options);
 }
 
-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)
-  }
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
 
-  this.operator = m[1]
-  if (this.operator === '=') {
-    this.operator = ''
-  }
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
 
-  // 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)
-  }
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
 }
 
-Comparator.prototype.toString = function () {
-  return this.value
-}
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
 
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-  if (this.semver === ANY) {
-    return true
-  }
+	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);
+			};
+		}
+	};
+}
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-  return cmp(version, this.operator, this.semver, this.options)
+	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);
+			};
+		}
+	};
 }
 
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
-  }
+const proto = Object.defineProperties(() => {}, styles);
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
 
-  var rangeTmp
+	builder._styles = _styles;
+	builder._empty = _empty;
 
-  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)
-  }
+	const self = this;
 
-  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 === '>'))
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
-}
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
 
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
-    }
-  }
+	// `__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 (range instanceof Comparator) {
-    return new Range(range.value, options)
-  }
+	return builder;
+}
 
-  if (!(this instanceof Range)) {
-    return new Range(range, options)
-  }
+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]);
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
+	if (argsLen === 0) {
+		return '';
+	}
 
-  // 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 (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range)
-  }
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
 
-  this.format()
-}
+	// 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 = '';
+	}
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
-}
+	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;
 
-Range.prototype.toString = function () {
-  return this.range
+		// 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;
 }
 
-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])
+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(' ');
+	}
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace)
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace)
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+	return template(chalk, parts.join(''));
+}
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+Object.defineProperties(Chalk.prototype, styles);
 
-  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)
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
 
-  return set
-}
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
-  }
+/***/ }),
 
-  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)
-        })
-      })
-    })
-  })
-}
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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(' ')
-  })
-}
+"use strict";
 
-// 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
-}
+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 isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-// ~, ~> --> * (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(' ')
+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 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
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
 
-    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'
-    }
+	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}')`);
+		}
+	}
 
-    debug('tilde return', ret)
-    return ret
-  })
+	return results;
 }
 
-// ^ --> * (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 parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-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 results = [];
+	let matches;
 
-    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'
-      }
-    }
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-    debug('caret return', ret)
-    return ret
-  })
-}
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
+	return results;
 }
 
-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
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-    if (gtlt === '=' && anyX) {
-      gtlt = ''
-    }
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-    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
+	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 (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
-        }
-      }
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
 
-      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 current;
+}
 
-    debug('xRange return', ret)
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-    return ret
-  })
-}
+	// 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');
+			}
 
-// 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], '')
-}
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
 
-// 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
-  }
+	chunks.push(chunk.join(''));
 
-  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
-  }
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-  return (from + ' ' + to).trim()
-}
+	return chunks.join('');
+};
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
-  }
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+/***/ }),
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
-    }
-  }
-  return false
-}
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/supports-color/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
-    }
-  }
+"use strict";
 
-  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
-      }
-
-      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 os = __webpack_require__("os");
+const hasFlag = __webpack_require__("../../node_modules/ora/node_modules/has-flag/index.js");
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
-  }
+const env = process.env;
 
-  return true
+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;
 }
-
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
 }
 
-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
-}
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
-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 {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
 }
 
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
-
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
-  }
-
-  minver = new SemVer('0.0.0-0')
-  if (range.test(minver)) {
-    return minver
-  }
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
 
-  minver = null
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-    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 (hasFlag('color=256')) {
+		return 2;
+	}
 
-  if (minver && range.test(minver)) {
-    return minver
-  }
+	if (stream && !stream.isTTY && forceColor !== true) {
+		return 0;
+	}
 
-  return null
-}
+	const min = forceColor ? 1 : 0;
 
-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
-  }
-}
+	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;
+		}
 
-// 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)
-}
+		return 1;
+	}
 
-// 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)
-}
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
+		return min;
+	}
 
-  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 ">"')
-  }
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
-  }
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
 
-    var high = null
-    var low = null
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
 
-    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
-      }
-    })
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
-    // 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 ('COLORTERM' in env) {
+		return 1;
+	}
 
-    // 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
-}
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+	return min;
 }
 
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
 }
 
-exports.coerce = coerce
-function coerce (version) {
-  if (version instanceof SemVer) {
-    return version
-  }
-
-  if (typeof version !== 'string') {
-    return null
-  }
-
-  var match = version.match(re[COERCE])
-
-  if (match == null) {
-    return null
-  }
-
-  return parse(match[1] +
-    '.' + (match[2] || '0') +
-    '.' + (match[3] || '0'))
-}
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
 
 
 /***/ }),
-/* 528 */
+
+/***/ "../../node_modules/parse-json/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const errorEx = __webpack_require__("../../node_modules/error-ex/index.js");
+const fallback = __webpack_require__("../../node_modules/json-parse-better-errors/index.js");
+const {default: LinesAndColumns} = __webpack_require__("../../node_modules/lines-and-columns/dist/index.mjs");
+const {codeFrameColumns} = __webpack_require__("../../node_modules/@babel/code-frame/lib/index.js");
 
-// detect either spaces or tabs but not both to properly handle tabs
-// for indentation and spaces for alignment
-const INDENT_RE = /^(?:( )+|\t+)/;
+const JSONError = errorEx('JSONError', {
+	fileName: errorEx.append('in %s'),
+	codeFrame: errorEx.append('\n\n%s\n')
+});
 
-function getMostUsed(indents) {
-	let result = 0;
-	let maxUsed = 0;
-	let maxWeight = 0;
+module.exports = (string, reviver, filename) => {
+	if (typeof reviver === 'string') {
+		filename = reviver;
+		reviver = null;
+	}
 
-	for (const entry of indents) {
-		// TODO: use destructuring when targeting Node.js 6
-		const key = entry[0];
-		const val = entry[1];
+	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 u = val[0];
-		const w = val[1];
+		const jsonError = new JSONError(error);
+		if (filename) {
+			jsonError.fileName = filename;
+		}
 
-		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
-			maxUsed = u;
-			maxWeight = w;
-			result = Number(key);
+		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;
 	}
+};
 
-	return result;
-}
 
-module.exports = str => {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
+/***/ }),
 
-	// used to see if tabs or spaces are the most used
-	let tabs = 0;
-	let spaces = 0;
+/***/ "../../node_modules/path-is-absolute/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	// remember the size of previous line's indentation
-	let prev = 0;
+"use strict";
 
-	// 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();
 
-	// pointer to the array of last used indent
-	let current;
+function posix(path) {
+	return path.charAt(0) === '/';
+}
 
-	// whether the last action was an indent (opposed to an unindent)
-	let isIndent;
+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) !== ':');
 
-	for (const line of str.split(/\n/g)) {
-		if (!line) {
-			// ignore empty lines
-			continue;
-		}
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
+}
 
-		let indent;
-		const matches = line.match(INDENT_RE);
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
-		if (matches) {
-			indent = matches[0].length;
 
-			if (matches[1]) {
-				spaces++;
-			} else {
-				tabs++;
-			}
-		} else {
-			indent = 0;
-		}
+/***/ }),
 
-		const diff = indent - prev;
-		prev = indent;
+/***/ "../../node_modules/path-parse/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		if (diff) {
-			// an indent or unindent has been detected
+"use strict";
 
-			isIndent = diff > 0;
 
-			current = indents.get(isIndent ? diff : -diff);
+var isWindows = process.platform === 'win32';
 
-			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);
-		}
-	}
+// Regex to split a windows path into into [dir, root, basename, name, ext]
+var splitWindowsRe =
+    /^(((?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?[\\\/]?)(?:[^\\\/]*[\\\/])*)((\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))[\\\/]*$/;
 
-	const amount = getMostUsed(indents);
+var win32 = {};
 
-	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);
-	}
+function win32SplitPath(filename) {
+  return splitWindowsRe.exec(filename).slice(1);
+}
 
-	return {
-		amount,
-		type,
-		indent
-	};
+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 !== 5) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  return {
+    root: allParts[1],
+    dir: allParts[0] === allParts[1] ? allParts[0] : allParts[0].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[4],
+    name: allParts[3]
+  };
 };
 
 
-/***/ }),
-/* 529 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"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 import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(342);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-const YARN_EXEC = process.env.npm_execpath || 'yarn';
-/**
- * Install all dependencies in the given directory
- */
+// Split a filename into [dir, root, basename, name, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^((\/?)(?:[^\/]*\/)*)((\.{1,2}|[^\/]+?|)(\.[^.\/]*|))[\/]*$/;
+var posix = {};
 
-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_EXEC, options, {
-    cwd: directory,
-    env: {
-      SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
-      RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
-    }
-  });
+function posixSplitPath(filename) {
+  return splitPathRe.exec(filename).slice(1);
 }
-/**
- * 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_EXEC, ['run', script, ...args], execOpts);
-}
-/**
- * Run script in the given directory
- */
 
-function runScriptInPackageStreaming({
-  script,
-  args,
-  pkg,
-  debug
-}) {
-  const execOpts = {
-    cwd: pkg.path
+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 !== 5) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  
+  return {
+    root: allParts[1],
+    dir: allParts[0].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[4],
+    name: allParts[3],
   };
-  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])(YARN_EXEC, ['run', script, ...args], execOpts, {
-    prefix: pkg.name,
-    debug
-  });
-}
-
-/***/ }),
-/* 530 */
-/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "resolveDepsForProject", function() { return resolveDepsForProject; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(531);
-/* 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__(352);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-// @ts-expect-error published types are worthless
 
+if (isWindows)
+  module.exports = win32.parse;
+else /* posix */
+  module.exports = posix.parse;
 
-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);
+module.exports.posix = posix.parse;
+module.exports.win32 = win32.parse;
 
-    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 {};
-}
-/**
- * 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
- */
+/***/ "../../node_modules/path-type/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function resolveDepsForProject({
-  project: rootProject,
-  yarnLock,
-  kbn,
-  log,
-  productionDepsOnly,
-  includeDependentProject
-}) {
-  /** map of [name@range, { name, version }] */
-  const resolved = new Map();
-  const seenProjects = new Set();
-  const projectQueue = [rootProject];
-  const depQueue = [];
+"use strict";
 
-  while (projectQueue.length) {
-    const project = projectQueue.shift();
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
 
-    if (seenProjects.has(project)) {
-      continue;
-    }
+async function isType(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
 
-    seenProjects.add(project);
-    const projectDeps = Object.entries(productionDepsOnly ? project.productionDependencies : project.allDependencies);
+	try {
+		const stats = await promisify(fs[fsStatType])(filePath);
+		return stats[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
 
-    for (const [name, versionRange] of projectDeps) {
-      depQueue.push([name, versionRange]);
-    }
+		throw error;
+	}
+}
 
-    while (depQueue.length) {
-      const [name, versionRange] = depQueue.shift();
-      const req = `${name}@${versionRange}`;
+function isTypeSync(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
 
-      if (resolved.has(req)) {
-        continue;
-      }
+	try {
+		return fs[fsStatType](filePath)[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
 
-      if (includeDependentProject && kbn.hasProject(name)) {
-        projectQueue.push(kbn.getProject(name));
-      }
+		throw error;
+	}
+}
 
-      if (!kbn.hasProject(name)) {
-        const pkg = yarnLock[req];
+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');
 
-        if (!pkg) {
-          log.warning('yarn.lock file is out of date, please run `yarn kbn bootstrap` to re-enable caching');
-          return;
-        }
 
-        resolved.set(req, {
-          name,
-          version: pkg.version
-        });
-        const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
+/***/ }),
 
-        for (const [childName, childVersionRange] of allDepsEntries) {
-          depQueue.push([childName, childVersionRange]);
-        }
-      }
-    }
-  }
+/***/ "../../node_modules/picomatch/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return resolved;
-}
+"use strict";
 
-/***/ }),
-/* 531 */
-/***/ (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__("../../node_modules/picomatch/lib/picomatch.js");
 
-module.exports = __webpack_require__(4);
 
 /***/ }),
-/* 1 */
+
+/***/ "../../node_modules/picomatch/lib/constants.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-exports.__esModule = true;
+const path = __webpack_require__("path");
+const WIN_SLASH = '\\\\/';
+const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
-var _promise = __webpack_require__(173);
+/**
+ * Posix glob regex
+ */
 
-var _promise2 = _interopRequireDefault(_promise);
+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}*?`;
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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
+};
 
-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;
-        }
+/**
+ * Windows glob regex
+ */
 
-        if (info.done) {
-          resolve(value);
-        } else {
-          return _promise2.default.resolve(value).then(function (value) {
-            step("next", value);
-          }, function (err) {
-            step("throw", err);
-          });
-        }
-      }
+const WINDOWS_CHARS = {
+  ...POSIX_CHARS,
 
-      return step("next");
-    });
-  };
+  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}]|$)`
 };
 
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
+/**
+ * POSIX Bracket Regex
+ */
 
-module.exports = __webpack_require__(234);
+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'
+};
 
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
+  POSIX_REGEX_SOURCE,
 
-module.exports = __webpack_require__(253);
+  // regular expressions
+  REGEX_BACKSLASH: /\\(?![*+?^${}(|)[\]])/g,
+  REGEX_NON_SPECIAL_CHARS: /^[^@![\].,$*+?^{}()|\\/]+/,
+  REGEX_SPECIAL_CHARS: /[-*+?.^${}(|)[\]]/,
+  REGEX_SPECIAL_CHARS_BACKREF: /(\\?)((\W)(\3*))/g,
+  REGEX_SPECIAL_CHARS_GLOBAL: /([-*+?.^${}(|)[\]])/g,
+  REGEX_REMOVE_BACKSLASH: /(?:\[.*?[^\\]\]|\\(?=.))/g,
 
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
+  // Replace globs with equivalent patterns to reduce parsing time.
+  REPLACEMENTS: {
+    '***': '*',
+    '**/**': '**',
+    '**/**/**': '**'
+  },
 
-"use strict";
+  // 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 */
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-class MessageError extends Error {
-  constructor(msg, code) {
-    super(msg);
-    this.code = code;
-  }
+  CHAR_LEFT_PARENTHESES: 40, /* ( */
+  CHAR_RIGHT_PARENTHESES: 41, /* ) */
 
-}
+  CHAR_ASTERISK: 42, /* * */
 
-exports.MessageError = MessageError;
-class ProcessSpawnError extends MessageError {
-  constructor(msg, code, process) {
-    super(msg, code);
-    this.process = process;
-  }
+  // Non-alphabetic chars.
+  CHAR_AMPERSAND: 38, /* & */
+  CHAR_AT: 64, /* @ */
+  CHAR_BACKWARD_SLASH: 92, /* \ */
+  CHAR_CARRIAGE_RETURN: 13, /* \r */
+  CHAR_CIRCUMFLEX_ACCENT: 94, /* ^ */
+  CHAR_COLON: 58, /* : */
+  CHAR_COMMA: 44, /* , */
+  CHAR_DOT: 46, /* . */
+  CHAR_DOUBLE_QUOTE: 34, /* " */
+  CHAR_EQUAL: 61, /* = */
+  CHAR_EXCLAMATION_MARK: 33, /* ! */
+  CHAR_FORM_FEED: 12, /* \f */
+  CHAR_FORWARD_SLASH: 47, /* / */
+  CHAR_GRAVE_ACCENT: 96, /* ` */
+  CHAR_HASH: 35, /* # */
+  CHAR_HYPHEN_MINUS: 45, /* - */
+  CHAR_LEFT_ANGLE_BRACKET: 60, /* < */
+  CHAR_LEFT_CURLY_BRACE: 123, /* { */
+  CHAR_LEFT_SQUARE_BRACKET: 91, /* [ */
+  CHAR_LINE_FEED: 10, /* \n */
+  CHAR_NO_BREAK_SPACE: 160, /* \u00A0 */
+  CHAR_PERCENT: 37, /* % */
+  CHAR_PLUS: 43, /* + */
+  CHAR_QUESTION_MARK: 63, /* ? */
+  CHAR_RIGHT_ANGLE_BRACKET: 62, /* > */
+  CHAR_RIGHT_CURLY_BRACE: 125, /* } */
+  CHAR_RIGHT_SQUARE_BRACKET: 93, /* ] */
+  CHAR_SEMICOLON: 59, /* ; */
+  CHAR_SINGLE_QUOTE: 39, /* ' */
+  CHAR_SPACE: 32, /*   */
+  CHAR_TAB: 9, /* \t */
+  CHAR_UNDERSCORE: 95, /* _ */
+  CHAR_VERTICAL_LINE: 124, /* | */
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */
 
-}
+  SEP: path.sep,
 
-exports.ProcessSpawnError = ProcessSpawnError;
-class SecurityError extends MessageError {}
+  /**
+   * Create EXTGLOB_CHARS
+   */
 
-exports.SecurityError = SecurityError;
-class ProcessTermError extends MessageError {}
+  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: ')' }
+    };
+  },
 
-exports.ProcessTermError = ProcessTermError;
-class ResponseError extends Error {
-  constructor(msg, responseCode) {
-    super(msg);
-    this.responseCode = responseCode;
+  /**
+   * Create GLOB_CHARS
+   */
+
+  globChars(win32) {
+    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
   }
+};
 
-}
-exports.ResponseError = ResponseError;
 
 /***/ }),
-/* 5 */
+
+/***/ "../../node_modules/picomatch/lib/parse.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-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;
+const constants = __webpack_require__("../../node_modules/picomatch/lib/constants.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
 
-var _asyncToGenerator2;
+/**
+ * Constants
+ */
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+const {
+  MAX_LENGTH,
+  POSIX_REGEX_SOURCE,
+  REGEX_NON_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_BACKREF,
+  REPLACEMENTS
+} = constants;
 
-let buildActionsForCopy = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
+/**
+ * Helpers
+ */
 
-    //
-    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());
-        }
+const expandRange = (args, options) => {
+  if (typeof options.expandRange === 'function') {
+    return options.expandRange(...args, options);
+  }
 
-        if (type === 'symlink') {
-          yield mkdirp((_path || _load_path()).default.dirname(dest));
-          onFresh();
-          actions.symlink.push({
-            dest,
-            linkname: src
-          });
-          onDone();
-          return;
-        }
+  args.sort();
+  const value = `[${args.join('-')}]`;
 
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
-        }
+  try {
+    /* eslint-disable-next-line no-new */
+    new RegExp(value);
+  } catch (ex) {
+    return args.map(v => utils.escapeRegex(v)).join('..');
+  }
 
-        const srcStat = yield lstat(src);
-        let srcFiles;
+  return value;
+};
 
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
-        }
+/**
+ * Create the message for a syntax error
+ */
 
-        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;
-          }
-        }
+const syntaxError = (type, char) => {
+  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
+};
 
-        // if destination exists
-        if (destStat) {
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
+/**
+ * Parse the given input string.
+ * @param {String} input
+ * @param {Object} options
+ * @return {Object}
+ */
 
-          // 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.
+const parse = (input, options) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
 
-          /* if (srcStat.mode !== destStat.mode) {
-            try {
-              await access(dest, srcStat.mode);
-            } catch (err) {}
-          } */
+  input = REPLACEMENTS[input] || input;
 
-          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;
-          }
+  const opts = { ...options };
+  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
 
-          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;
-          }
+  let len = input.length;
+  if (len > max) {
+    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  }
 
-          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;
-            }
-          }
+  const bos = { type: 'bos', value: '', output: opts.prepend || '' };
+  const tokens = [bos];
 
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
+  const capture = opts.capture ? '' : '?:';
+  const win32 = utils.isWindows(options);
 
-            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-              var _ref6;
+  // create constants based on platform, for windows or posix
+  const PLATFORM_CHARS = constants.globChars(win32);
+  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
 
-              if (_isArray4) {
-                if (_i4 >= _iterator4.length) break;
-                _ref6 = _iterator4[_i4++];
-              } else {
-                _i4 = _iterator4.next();
-                if (_i4.done) break;
-                _ref6 = _i4.value;
-              }
+  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 file = _ref6;
+  const globstar = opts => {
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
+  const nodot = opts.dot ? '' : NO_DOT;
+  const qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
+  let star = opts.bash === true ? globstar(opts) : STAR;
 
-                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 (opts.capture) {
+    star = `(${star})`;
+  }
 
-                    if (_isArray5) {
-                      if (_i5 >= _iterator5.length) break;
-                      _ref7 = _iterator5[_i5++];
-                    } else {
-                      _i5 = _iterator5.next();
-                      if (_i5.done) break;
-                      _ref7 = _i5.value;
-                    }
+  // minimatch options support
+  if (typeof opts.noext === 'boolean') {
+    opts.noextglob = opts.noext;
+  }
 
-                    const file = _ref7;
+  const state = {
+    input,
+    index: -1,
+    start: 0,
+    dot: opts.dot === true,
+    consumed: '',
+    output: '',
+    prefix: '',
+    backtrack: false,
+    negated: false,
+    brackets: 0,
+    braces: 0,
+    parens: 0,
+    quotes: 0,
+    globstar: false,
+    tokens
+  };
 
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
+  input = utils.removePrefix(input, state);
+  len = input.length;
 
-        if (destStat && destStat.isSymbolicLink()) {
-          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
-          destStat = null;
-        }
+  const extglobs = [];
+  const braces = [];
+  const stack = [];
+  let prev = bos;
+  let value;
 
-        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);
-          }
+  /**
+   * Tokenizing helpers
+   */
 
-          const destParts = dest.split((_path || _load_path()).default.sep);
-          while (destParts.length) {
-            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
-            destParts.pop();
-          }
+  const eos = () => state.index === len - 1;
+  const peek = state.peek = (n = 1) => input[state.index + n];
+  const advance = state.advance = () => input[++state.index] || '';
+  const remaining = () => input.slice(state.index + 1);
+  const consume = (value = '', num = 0) => {
+    state.consumed += value;
+    state.index += num;
+  };
 
-          // 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;
+  const append = token => {
+    state.output += token.output != null ? token.output : token.value;
+    consume(token.value);
+  };
 
-            if (_isArray6) {
-              if (_i6 >= _iterator6.length) break;
-              _ref8 = _iterator6[_i6++];
-            } else {
-              _i6 = _iterator6.next();
-              if (_i6.done) break;
-              _ref8 = _i6.value;
-            }
+  const negate = () => {
+    let count = 1;
 
-            const file = _ref8;
+    while (peek() === '!' && (peek(2) !== '(' || peek(3) === '?')) {
+      advance();
+      state.start++;
+      count++;
+    }
 
-            queue.push({
-              dest: (_path || _load_path()).default.join(dest, file),
-              onFresh,
-              onDone: function (_onDone) {
-                function onDone() {
-                  return _onDone.apply(this, arguments);
-                }
+    if (count % 2 === 0) {
+      return false;
+    }
 
-                onDone.toString = function () {
-                  return _onDone.toString();
-                };
+    state.negated = true;
+    state.start++;
+    return true;
+  };
 
-                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}`);
-        }
-      });
+  const increment = type => {
+    state[type]++;
+    stack.push(type);
+  };
 
-      return function build(_x5) {
-        return _ref5.apply(this, arguments);
-      };
-    })();
+  const decrement = type => {
+    state[type]--;
+    stack.pop();
+  };
 
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
+  /**
+   * 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.
+   */
 
-    // initialise events
-    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
+  const push = tok => {
+    if (prev.type === 'globstar') {
+      const isBrace = state.braces > 0 && (tok.type === 'comma' || tok.type === 'brace');
+      const isExtglob = tok.extglob === true || (extglobs.length && (tok.type === 'pipe' || tok.type === 'paren'));
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
+      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;
       }
+    }
 
-      const item = _ref2;
+    if (extglobs.length && tok.type !== 'paren') {
+      extglobs[extglobs.length - 1].inner += tok.value;
+    }
 
-      const onDone = item.onDone;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        if (onDone) {
-          onDone();
-        }
-      };
+    if (tok.value || tok.output) append(tok);
+    if (prev && prev.type === 'text' && tok.type === 'text') {
+      prev.value += tok.value;
+      prev.output = (prev.output || '') + tok.value;
+      return;
     }
-    events.onStart(queue.length);
 
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
+    tok.prev = prev;
+    tokens.push(tok);
+    prev = tok;
+  };
 
-    // 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));
-    }
+  const extglobOpen = (type, value) => {
+    const token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
 
-    // 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;
+    token.prev = prev;
+    token.parens = state.parens;
+    token.output = state.output;
+    const output = (opts.capture ? '(' : '') + token.open;
 
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref3 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref3 = _i2.value;
-      }
+    increment('parens');
+    push({ type, value, output: state.output ? '' : ONE_CHAR });
+    push({ type: 'paren', extglob: true, value: advance(), output });
+    extglobs.push(token);
+  };
 
-      const file = _ref3;
+  const extglobClose = token => {
+    let output = token.close + (opts.capture ? ')' : '');
+    let rest;
 
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
+    if (token.type === 'negate') {
+      let extglobStar = star;
 
-    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
+      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
+        extglobStar = globstar(opts);
+      }
 
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
+      if (extglobStar !== star || eos() || /^\)+$/.test(remaining())) {
+        output = token.close = `)$))${extglobStar}`;
       }
 
-      const loc = _ref4;
+      if (token.inner.includes('*') && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
+        output = token.close = `)${rest})${extglobStar})`;
+      }
 
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
+      if (token.prev.type === 'bos') {
+        state.negatedExtglob = true;
       }
     }
 
-    return actions;
-  });
-
-  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
+    push({ type: 'paren', extglob: true, value, output });
+    decrement('parens');
   };
-})();
 
-let buildActionsForHardlink = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
+  /**
+   * Fast paths
+   */
 
-    //
-    let build = (() => {
-      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest;
+  if (opts.fastpaths !== false && !/(^[*!]|[/()[\]{}"])/.test(input)) {
+    let backslashes = false;
 
-        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());
+    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
+      if (first === '\\') {
+        backslashes = true;
+        return m;
+      }
 
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
+      if (first === '?') {
+        if (esc) {
+          return esc + first + (rest ? QMARK.repeat(rest.length) : '');
         }
-
-        const srcStat = yield lstat(src);
-        let srcFiles;
-
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
+        if (index === 0) {
+          return qmarkNoDot + (rest ? QMARK.repeat(rest.length) : '');
         }
+        return QMARK.repeat(chars.length);
+      }
 
-        const destExists = yield exists(dest);
-        if (destExists) {
-          const destStat = yield lstat(dest);
+      if (first === '.') {
+        return DOT_LITERAL.repeat(chars.length);
+      }
 
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
+      if (first === '*') {
+        if (esc) {
+          return esc + first + (rest ? star : '');
+        }
+        return star;
+      }
+      return esc ? m : `\\${m}`;
+    });
 
-          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 (backslashes === true) {
+      if (opts.unescape === true) {
+        output = output.replace(/\\/g, '');
+      } else {
+        output = output.replace(/\\+/g, m => {
+          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
+        });
+      }
+    }
 
-          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 (output === input && opts.contains === true) {
+      state.output = input;
+      return state;
+    }
 
-          // correct hardlink
-          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
-            return;
-          }
+    state.output = utils.wrapOutput(output, state, options);
+    return state;
+  }
 
-          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;
-            }
-          }
+  /**
+   * Tokenize input until we reach end-of-string
+   */
 
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
+  while (!eos()) {
+    value = advance();
 
-            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-              var _ref14;
+    if (value === '\u0000') {
+      continue;
+    }
 
-              if (_isArray10) {
-                if (_i10 >= _iterator10.length) break;
-                _ref14 = _iterator10[_i10++];
-              } else {
-                _i10 = _iterator10.next();
-                if (_i10.done) break;
-                _ref14 = _i10.value;
-              }
+    /**
+     * Escaped characters
+     */
 
-              const file = _ref14;
+    if (value === '\\') {
+      const next = peek();
 
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
+      if (next === '/' && opts.bash !== true) {
+        continue;
+      }
 
-                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;
+      if (next === '.' || next === ';') {
+        continue;
+      }
 
-                    if (_isArray11) {
-                      if (_i11 >= _iterator11.length) break;
-                      _ref15 = _iterator11[_i11++];
-                    } else {
-                      _i11 = _iterator11.next();
-                      if (_i11.done) break;
-                      _ref15 = _i11.value;
-                    }
+      if (!next) {
+        value += '\\';
+        push({ type: 'text', value });
+        continue;
+      }
 
-                    const file = _ref15;
+      // collapse slashes to reduce potential for exploits
+      const match = /^\\+/.exec(remaining());
+      let slashes = 0;
 
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
+      if (match && match[0].length > 2) {
+        slashes = match[0].length;
+        state.index += slashes;
+        if (slashes % 2 !== 0) {
+          value += '\\';
         }
+      }
 
-        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();
-          }
-
-          // 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;
+      if (opts.unescape === true) {
+        value = advance();
+      } else {
+        value += advance();
+      }
 
-            if (_isArray12) {
-              if (_i12 >= _iterator12.length) break;
-              _ref16 = _iterator12[_i12++];
-            } else {
-              _i12 = _iterator12.next();
-              if (_i12.done) break;
-              _ref16 = _i12.value;
-            }
+      if (state.brackets === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
+    }
 
-            const file = _ref16;
+    /**
+     * If we're inside a regex character class, continue
+     * until we reach the closing bracket.
+     */
 
-            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);
-                }
+    if (state.brackets > 0 && (value !== ']' || prev.value === '[' || prev.value === '[^')) {
+      if (opts.posix !== false && value === ':') {
+        const inner = prev.value.slice(1);
+        if (inner.includes('[')) {
+          prev.posix = true;
 
-                onDone.toString = function () {
-                  return _onDone2.toString();
-                };
+          if (inner.includes(':')) {
+            const idx = prev.value.lastIndexOf('[');
+            const pre = prev.value.slice(0, idx);
+            const rest = prev.value.slice(idx + 2);
+            const posix = POSIX_REGEX_SOURCE[rest];
+            if (posix) {
+              prev.value = pre + posix;
+              state.backtrack = true;
+              advance();
 
-                return onDone;
-              }(function () {
-                if (--remaining === 0) {
-                  onDone();
-                }
-              })
-            });
+              if (!bos.output && tokens.indexOf(prev) === 1) {
+                bos.output = ONE_CHAR;
+              }
+              continue;
+            }
           }
-        } else if (srcStat.isFile()) {
-          onFresh();
-          actions.link.push({
-            src,
-            dest,
-            removeDest: destExists
-          });
-          onDone();
-        } else {
-          throw new Error(`unsure how to copy this: ${src}`);
         }
-      });
-
-      return function build(_x10) {
-        return _ref13.apply(this, arguments);
-      };
-    })();
-
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
+      }
 
-    // initialise events
-    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-      var _ref10;
+      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
+        value = `\\${value}`;
+      }
 
-      if (_isArray7) {
-        if (_i7 >= _iterator7.length) break;
-        _ref10 = _iterator7[_i7++];
-      } else {
-        _i7 = _iterator7.next();
-        if (_i7.done) break;
-        _ref10 = _i7.value;
+      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
+        value = `\\${value}`;
       }
 
-      const item = _ref10;
+      if (opts.posix === true && value === '!' && prev.value === '[') {
+        value = '^';
+      }
 
-      const onDone = item.onDone || noop;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        onDone();
-      };
+      prev.value += value;
+      append({ value });
+      continue;
     }
-    events.onStart(queue.length);
 
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
+    /**
+     * If we're inside a quoted string, continue
+     * until we reach the closing double quote.
+     */
 
-    // 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));
+    if (state.quotes === 1 && value !== '"') {
+      value = utils.escapeRegex(value);
+      prev.value += value;
+      append({ value });
+      continue;
     }
 
-    // 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;
+    /**
+     * Double quotes
+     */
 
-      if (_isArray8) {
-        if (_i8 >= _iterator8.length) break;
-        _ref11 = _iterator8[_i8++];
-      } else {
-        _i8 = _iterator8.next();
-        if (_i8.done) break;
-        _ref11 = _i8.value;
+    if (value === '"') {
+      state.quotes = state.quotes === 1 ? 0 : 1;
+      if (opts.keepQuotes === true) {
+        push({ type: 'text', value });
       }
+      continue;
+    }
 
-      const file = _ref11;
+    /**
+     * Parentheses
+     */
 
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
+    if (value === '(') {
+      increment('parens');
+      push({ type: 'paren', value });
+      continue;
     }
 
-    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref12;
-
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref12 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref12 = _i9.value;
+    if (value === ')') {
+      if (state.parens === 0 && opts.strictBrackets === true) {
+        throw new SyntaxError(syntaxError('opening', '('));
       }
 
-      const loc = _ref12;
-
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
+      const extglob = extglobs[extglobs.length - 1];
+      if (extglob && state.parens === extglob.parens + 1) {
+        extglobClose(extglobs.pop());
+        continue;
       }
-    }
 
-    return actions;
-  });
+      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
+      decrement('parens');
+      continue;
+    }
 
-  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
-    return _ref9.apply(this, arguments);
-  };
-})();
+    /**
+     * Square brackets
+     */
 
-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 || []
-    };
+    if (value === '[') {
+      if (opts.nobracket === true || !remaining().includes(']')) {
+        if (opts.nobracket !== true && opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('closing', ']'));
+        }
 
-    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+        value = `\\${value}`;
+      } else {
+        increment('brackets');
+      }
 
-    const fileActions = actions.file;
+      push({ type: 'bracket', value });
+      continue;
+    }
 
-    const currentlyWriting = new Map();
+    if (value === ']') {
+      if (opts.nobracket === true || (prev && prev.type === 'bracket' && prev.value.length === 1)) {
+        push({ type: 'text', value, output: `\\${value}` });
+        continue;
+      }
 
-    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;
+      if (state.brackets === 0) {
+        if (opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('opening', '['));
         }
 
-        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;
-      });
-
-      return function (_x14) {
-        return _ref18.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
+        push({ type: 'text', value, output: `\\${value}` });
+        continue;
+      }
 
-    // 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);
-    });
-  });
+      decrement('brackets');
 
-  return function copyBulk(_x11, _x12, _x13) {
-    return _ref17.apply(this, arguments);
-  };
-})();
+      const prevValue = prev.value.slice(1);
+      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
+        value = `/${value}`;
+      }
 
-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: []
-    };
+      prev.value += value;
+      append({ value });
 
-    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+      // when literal brackets are explicitly disabled
+      // assume we should match with a regex character class
+      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
+        continue;
+      }
 
-    const fileActions = actions.link;
+      const escaped = utils.escapeRegex(prev.value);
+      state.output = state.output.slice(0, -prev.value.length);
 
-    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);
-      });
+      // 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;
+      }
 
-      return function (_x18) {
-        return _ref20.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
+      // when the user specifies nothing, try to match both
+      prev.value = `(${capture}${escaped}|${prev.value})`;
+      state.output += prev.value;
+      continue;
+    }
 
-    // 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);
-    });
-  });
+    /**
+     * Braces
+     */
 
-  return function hardlinkBulk(_x15, _x16, _x17) {
-    return _ref19.apply(this, arguments);
-  };
-})();
+    if (value === '{' && opts.nobrace !== true) {
+      increment('braces');
 
-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;
+      const open = {
+        type: 'brace',
+        value,
+        output: '(',
+        outputIndex: state.output.length,
+        tokensIndex: state.tokens.length
+      };
 
-      if (_isArray13) {
-        if (_i13 >= _iterator13.length) break;
-        _ref22 = _iterator13[_i13++];
-      } else {
-        _i13 = _iterator13.next();
-        if (_i13.done) break;
-        _ref22 = _i13.value;
-      }
+      braces.push(open);
+      push(open);
+      continue;
+    }
 
-      const file = _ref22;
+    if (value === '}') {
+      const brace = braces[braces.length - 1];
 
-      if (yield exists(file)) {
-        return readFile(file);
+      if (opts.nobrace === true || !brace) {
+        push({ type: 'text', value, output: value });
+        continue;
       }
-    }
-    return null;
-  });
 
-  return function readFileAny(_x19) {
-    return _ref21.apply(this, arguments);
-  };
-})();
+      let output = ')';
 
-let readJson = exports.readJson = (() => {
-  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    return (yield readJsonAndFile(loc)).object;
-  });
+      if (brace.dots === true) {
+        const arr = tokens.slice();
+        const range = [];
 
-  return function readJson(_x20) {
-    return _ref23.apply(this, arguments);
-  };
-})();
+        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);
+          }
+        }
 
-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;
-    }
-  });
+        output = expandRange(range, opts);
+        state.backtrack = true;
+      }
 
-  return function readJsonAndFile(_x21) {
-    return _ref24.apply(this, arguments);
-  };
-})();
+      if (brace.comma !== true && brace.dots !== true) {
+        const out = state.output.slice(0, brace.outputIndex);
+        const toks = state.tokens.slice(brace.tokensIndex);
+        brace.value = brace.output = '\\{';
+        value = output = '\\}';
+        state.output = out;
+        for (const t of toks) {
+          state.output += (t.output || t.value);
+        }
+      }
 
-let find = exports.find = (() => {
-  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
-    const parts = dir.split((_path || _load_path()).default.sep);
+      push({ type: 'brace', value, output });
+      decrement('braces');
+      braces.pop();
+      continue;
+    }
 
-    while (parts.length) {
-      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
+    /**
+     * Pipes
+     */
 
-      if (yield exists(loc)) {
-        return loc;
-      } else {
-        parts.pop();
+    if (value === '|') {
+      if (extglobs.length > 0) {
+        extglobs[extglobs.length - 1].conditions++;
       }
+      push({ type: 'text', value });
+      continue;
     }
 
-    return false;
-  });
+    /**
+     * Commas
+     */
 
-  return function find(_x22, _x23) {
-    return _ref25.apply(this, arguments);
-  };
-})();
+    if (value === ',') {
+      let output = value;
 
-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;
+      const brace = braces[braces.length - 1];
+      if (brace && stack[stack.length - 1] === 'braces') {
+        brace.comma = true;
+        output = '|';
       }
-    }
-    // We use rimraf for unlink which never throws an ENOENT on missing target
-    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
 
-    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);
+      push({ type: 'comma', value, output });
+      continue;
     }
-  });
 
-  return function symlink(_x24, _x25) {
-    return _ref26.apply(this, arguments);
-  };
-})();
+    /**
+     * Slashes
+     */
 
-let walk = exports.walk = (() => {
-  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
-    let files = [];
+    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 === state.start + 1) {
+        state.start = state.index + 1;
+        state.consumed = '';
+        state.output = '';
+        tokens.pop();
+        prev = bos; // reset "prev" to the first token
+        continue;
+      }
 
-    let filenames = yield readdir(dir);
-    if (ignoreBasenames.size) {
-      filenames = filenames.filter(function (name) {
-        return !ignoreBasenames.has(name);
-      });
+      push({ type: 'slash', value, output: SLASH_LITERAL });
+      continue;
     }
 
-    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-      var _ref28;
+    /**
+     * Dots
+     */
 
-      if (_isArray14) {
-        if (_i14 >= _iterator14.length) break;
-        _ref28 = _iterator14[_i14++];
-      } else {
-        _i14 = _iterator14.next();
-        if (_i14.done) break;
-        _ref28 = _i14.value;
+    if (value === '.') {
+      if (state.braces > 0 && prev.type === 'dot') {
+        if (prev.value === '.') prev.output = DOT_LITERAL;
+        const brace = braces[braces.length - 1];
+        prev.type = 'dots';
+        prev.output += value;
+        prev.value += value;
+        brace.dots = true;
+        continue;
       }
 
-      const name = _ref28;
+      if ((state.braces + state.parens) === 0 && prev.type !== 'bos' && prev.type !== 'slash') {
+        push({ type: 'text', value, output: DOT_LITERAL });
+        continue;
+      }
 
-      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);
+      push({ type: 'dot', value, output: DOT_LITERAL });
+      continue;
+    }
 
-      files.push({
-        relative,
-        basename: name,
-        absolute: loc,
-        mtime: +stat.mtime
-      });
+    /**
+     * Question marks
+     */
 
-      if (stat.isDirectory()) {
-        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+    if (value === '?') {
+      const isGroup = prev && prev.value === '(';
+      if (!isGroup && opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('qmark', value);
+        continue;
       }
-    }
-
-    return files;
-  });
 
-  return function walk(_x26, _x27) {
-    return _ref27.apply(this, arguments);
-  };
-})();
+      if (prev && prev.type === 'paren') {
+        const next = peek();
+        let output = value;
 
-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;
+        if (next === '<' && !utils.supportsLookbehinds()) {
+          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
+        }
 
+        if ((prev.value === '(' && !/[!=<:]/.test(next)) || (next === '<' && !/<([!=]|\w+>)/.test(remaining()))) {
+          output = `\\${value}`;
+        }
 
-    return Math.ceil(size / blockSize) * blockSize;
-  });
+        push({ type: 'text', value, output });
+        continue;
+      }
 
-  return function getFileSizeOnDisk(_x28) {
-    return _ref29.apply(this, arguments);
-  };
-})();
+      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
+        push({ type: 'qmark', value, output: QMARK_NO_DOT });
+        continue;
+      }
 
-let getEolFromFile = (() => {
-  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
-    if (!(yield exists(path))) {
-      return undefined;
+      push({ type: 'qmark', value, output: QMARK });
+      continue;
     }
 
-    const buffer = yield readFileBuffer(path);
+    /**
+     * Exclamation
+     */
 
-    for (let i = 0; i < buffer.length; ++i) {
-      if (buffer[i] === cr) {
-        return '\r\n';
+    if (value === '!') {
+      if (opts.noextglob !== true && peek() === '(') {
+        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
+          extglobOpen('negate', value);
+          continue;
+        }
       }
-      if (buffer[i] === lf) {
-        return '\n';
+
+      if (opts.nonegate !== true && state.index === 0) {
+        negate();
+        continue;
       }
     }
-    return undefined;
-  });
 
-  return function getEolFromFile(_x29) {
-    return _ref30.apply(this, arguments);
-  };
-})();
-
-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);
-  });
+    /**
+     * Plus
+     */
 
-  return function writeFilePreservingEol(_x30, _x31) {
-    return _ref31.apply(this, arguments);
-  };
-})();
+    if (value === '+') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('plus', value);
+        continue;
+      }
 
-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;
-  });
+      if ((prev && prev.value === '(') || opts.regex === false) {
+        push({ type: 'plus', value, output: PLUS_LITERAL });
+        continue;
+      }
 
-  return function hardlinksWork(_x32) {
-    return _ref32.apply(this, arguments);
-  };
-})();
+      if ((prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) || state.parens > 0) {
+        push({ type: 'plus', value });
+        continue;
+      }
 
-// not a strict polyfill for Node's fs.mkdtemp
+      push({ type: 'plus', value: PLUS_LITERAL });
+      continue;
+    }
 
+    /**
+     * Plain text
+     */
 
-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;
-  });
+    if (value === '@') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        push({ type: 'at', extglob: true, value, output: '' });
+        continue;
+      }
 
-  return function makeTempDir(_x33) {
-    return _ref33.apply(this, arguments);
-  };
-})();
+      push({ type: 'text', value });
+      continue;
+    }
 
-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;
+    /**
+     * Plain text
+     */
 
-      if (_isArray15) {
-        if (_i15 >= _iterator15.length) break;
-        _ref35 = _iterator15[_i15++];
-      } else {
-        _i15 = _iterator15.next();
-        if (_i15.done) break;
-        _ref35 = _i15.value;
+    if (value !== '*') {
+      if (value === '$' || value === '^') {
+        value = `\\${value}`;
       }
 
-      const path = _ref35;
-
-      try {
-        const fd = yield open(path, 'r');
-        return (_fs || _load_fs()).default.createReadStream(path, { fd });
-      } catch (err) {
-        // Try the next one
+      const match = REGEX_NON_SPECIAL_CHARS.exec(remaining());
+      if (match) {
+        value += match[0];
+        state.index += match[0].length;
       }
+
+      push({ type: 'text', value });
+      continue;
     }
-    return null;
-  });
 
-  return function readFirstAvailableStream(_x34) {
-    return _ref34.apply(this, arguments);
-  };
-})();
+    /**
+     * Stars
+     */
 
-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
-    };
+    if (prev && (prev.type === 'globstar' || prev.star === true)) {
+      prev.type = 'star';
+      prev.star = true;
+      prev.value += value;
+      prev.output = star;
+      state.backtrack = true;
+      state.globstar = true;
+      consume(value);
+      continue;
+    }
 
-    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
-      var _ref37;
+    let rest = remaining();
+    if (opts.noextglob !== true && /^\([^?]/.test(rest)) {
+      extglobOpen('star', value);
+      continue;
+    }
 
-      if (_isArray16) {
-        if (_i16 >= _iterator16.length) break;
-        _ref37 = _iterator16[_i16++];
-      } else {
-        _i16 = _iterator16.next();
-        if (_i16.done) break;
-        _ref37 = _i16.value;
+    if (prev.type === 'star') {
+      if (opts.noglobstar === true) {
+        consume(value);
+        continue;
       }
 
-      const folder = _ref37;
+      const prior = prev.prev;
+      const before = prior.prev;
+      const isStart = prior.type === 'slash' || prior.type === 'bos';
+      const afterStar = before && (before.type === 'star' || before.type === 'globstar');
 
-      try {
-        yield mkdirp(folder);
-        yield access(folder, mode);
+      if (opts.bash === true && (!isStart || (rest[0] && rest[0] !== '/'))) {
+        push({ type: 'star', value, output: '' });
+        continue;
+      }
 
-        result.folder = folder;
+      const isBrace = state.braces > 0 && (prior.type === 'comma' || prior.type === 'brace');
+      const isExtglob = extglobs.length && (prior.type === 'pipe' || prior.type === 'paren');
+      if (!isStart && prior.type !== 'paren' && !isBrace && !isExtglob) {
+        push({ type: 'star', value, output: '' });
+        continue;
+      }
 
-        return result;
-      } catch (error) {
-        result.skipped.push({
-          error,
-          folder
-        });
+      // strip consecutive `/**/`
+      while (rest.slice(0, 3) === '/**') {
+        const after = input[state.index + 4];
+        if (after && after !== '/') {
+          break;
+        }
+        rest = rest.slice(3);
+        consume('/**', 3);
       }
-    }
-    return result;
-  });
 
-  return function getFirstSuitableFolder(_x35) {
-    return _ref36.apply(this, arguments);
-  };
-})();
+      if (prior.type === 'bos' && eos()) {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = globstar(opts);
+        state.output = prev.output;
+        state.globstar = true;
+        consume(value);
+        continue;
+      }
 
-exports.copy = copy;
-exports.readFile = readFile;
-exports.readFileRaw = readFileRaw;
-exports.normalizeOS = normalizeOS;
+      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}`;
 
-var _fs;
+        prev.type = 'globstar';
+        prev.output = globstar(opts) + (opts.strictSlashes ? ')' : '|$)');
+        prev.value += value;
+        state.globstar = true;
+        state.output += prior.output + prev.output;
+        consume(value);
+        continue;
+      }
 
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(3));
-}
+      if (prior.type === 'slash' && prior.prev.type !== 'bos' && rest[0] === '/') {
+        const end = rest[1] !== void 0 ? '|$' : '';
 
-var _glob;
+        state.output = state.output.slice(0, -(prior.output + prev.output).length);
+        prior.output = `(?:${prior.output}`;
 
-function _load_glob() {
-  return _glob = _interopRequireDefault(__webpack_require__(75));
-}
+        prev.type = 'globstar';
+        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
+        prev.value += value;
 
-var _os;
+        state.output += prior.output + prev.output;
+        state.globstar = true;
 
-function _load_os() {
-  return _os = _interopRequireDefault(__webpack_require__(36));
-}
+        consume(value + advance());
 
-var _path;
+        push({ type: 'slash', value: '/', output: '' });
+        continue;
+      }
 
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
+      if (prior.type === 'bos' && rest[0] === '/') {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = `(?:^|${SLASH_LITERAL}|${globstar(opts)}${SLASH_LITERAL})`;
+        state.output = prev.output;
+        state.globstar = true;
+        consume(value + advance());
+        push({ type: 'slash', value: '/', output: '' });
+        continue;
+      }
 
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
-}
+      // remove single star from output
+      state.output = state.output.slice(0, -prev.output.length);
 
-var _promise;
+      // reset previous token to globstar
+      prev.type = 'globstar';
+      prev.output = globstar(opts);
+      prev.value += value;
 
-function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(40));
-}
+      // reset output with globstar
+      state.output += prev.output;
+      state.globstar = true;
+      consume(value);
+      continue;
+    }
 
-var _promise2;
+    const token = { type: 'star', value, output: star };
 
-function _load_promise2() {
-  return _promise2 = __webpack_require__(40);
-}
+    if (opts.bash === true) {
+      token.output = '.*?';
+      if (prev.type === 'bos' || prev.type === 'slash') {
+        token.output = nodot + token.output;
+      }
+      push(token);
+      continue;
+    }
 
-var _map;
+    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
+      token.output = value;
+      push(token);
+      continue;
+    }
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
+    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 _fsNormalized;
+      } else if (opts.dot === true) {
+        state.output += NO_DOTS_SLASH;
+        prev.output += NO_DOTS_SLASH;
 
-function _load_fsNormalized() {
-  return _fsNormalized = __webpack_require__(164);
-}
+      } else {
+        state.output += nodot;
+        prev.output += nodot;
+      }
 
-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; } }
+      if (peek() !== '*') {
+        state.output += ONE_CHAR;
+        prev.output += ONE_CHAR;
+      }
+    }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+    push(token);
+  }
 
-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
-};
+  while (state.brackets > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
+    state.output = utils.escapeLast(state.output, '[');
+    decrement('brackets');
+  }
 
-const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
+  while (state.parens > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
+    state.output = utils.escapeLast(state.output, '(');
+    decrement('parens');
+  }
 
-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;
+  while (state.braces > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
+    state.output = utils.escapeLast(state.output, '{');
+    decrement('braces');
+  }
 
-// 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 (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
+    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
+  }
 
-const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
+  // rebuild the output if we had to backtrack at any point
+  if (state.backtrack === true) {
+    state.output = '';
 
-const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
-const invariant = __webpack_require__(7);
-const stripBOM = __webpack_require__(122);
+    for (const token of state.tokens) {
+      state.output += token.output != null ? token.output : token.value;
 
-const noop = () => {};
+      if (token.suffix) {
+        state.output += token.suffix;
+      }
+    }
+  }
 
-function copy(src, dest, reporter) {
-  return copyBulk([{ src, dest }], reporter);
-}
+  return state;
+};
 
-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);
-      }
-    });
-  });
-}
+/**
+ * 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.
+ */
 
-function readFile(loc) {
-  return _readFile(loc, 'utf8').then(normalizeOS);
-}
+parse.fastpaths = (input, options) => {
+  const opts = { ...options };
+  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  const len = input.length;
+  if (len > max) {
+    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  }
 
-function readFileRaw(loc) {
-  return _readFile(loc, 'binary');
-}
+  input = REPLACEMENTS[input] || input;
+  const win32 = utils.isWindows(options);
 
-function normalizeOS(body) {
-  return body.replace(/\r\n/g, '\n');
-}
+  // 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);
 
-const cr = '\r'.charCodeAt(0);
-const lf = '\n'.charCodeAt(0);
+  const nodot = opts.dot ? NO_DOTS : NO_DOT;
+  const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
+  const capture = opts.capture ? '' : '?:';
+  const state = { negated: false, prefix: '' };
+  let star = opts.bash === true ? '.*?' : STAR;
 
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (opts.capture) {
+    star = `(${star})`;
+  }
 
-"use strict";
+  const globstar = opts => {
+    if (opts.noglobstar === true) return star;
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
+  const create = str => {
+    switch (str) {
+      case '*':
+        return `${nodot}${ONE_CHAR}${star}`;
 
-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;
+      case '.*':
+        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-var _require = __webpack_require__(171);
+      case '*.*':
+        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-const getCacheDir = _require.getCacheDir,
-      getConfigDir = _require.getConfigDir,
-      getDataDir = _require.getDataDir;
+      case '*/*':
+        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
 
-const isWebpackBundle = __webpack_require__(227);
+      case '**':
+        return nodot + globstar(opts);
 
-const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
-const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
-const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
+      case '**/*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
 
-const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
+      case '**/*.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-const YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
+      case '**/.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-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';
+      default: {
+        const match = /^(.*?)\.(\w+)$/.exec(str);
+        if (!match) return;
 
-const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
+        const source = create(match[1]);
+        if (!source) return;
 
-// cache version, bump whenever we make backwards incompatible changes
-const CACHE_VERSION = exports.CACHE_VERSION = 2;
+        return source + DOT_LITERAL + match[2];
+      }
+    }
+  };
 
-// lockfile version, bump whenever we make backwards incompatible changes
-const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
+  const output = utils.removePrefix(input, state);
+  let source = create(output);
 
-// max amount of network requests to perform concurrently
-const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
+  if (source && opts.strictSlashes !== true) {
+    source += `${SLASH_LITERAL}?`;
+  }
 
-// HTTP timeout used when downloading packages
-const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
+  return source;
+};
 
-// max amount of child processes to execute concurrently
-const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
+module.exports = parse;
 
-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()}`));
-  }
+/***/ "../../node_modules/picomatch/lib/picomatch.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
+"use strict";
 
-  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 path = __webpack_require__("path");
+const scan = __webpack_require__("../../node_modules/picomatch/lib/scan.js");
+const parse = __webpack_require__("../../node_modules/picomatch/lib/parse.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+const constants = __webpack_require__("../../node_modules/picomatch/lib/constants.js");
+const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
 
-const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
-const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
+/**
+ * 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
+ */
 
-// Webpack needs to be configured with node.__dirname/__filename = false
-function getYarnBinPath() {
-  if (isWebpackBundle) {
-    return __filename;
-  } else {
-    return path.join(__dirname, '..', 'bin', 'yarn.js');
+const picomatch = (glob, options, returnState = false) => {
+  if (Array.isArray(glob)) {
+    const fns = glob.map(input => picomatch(input, options, returnState));
+    const arrayMatcher = str => {
+      for (const isMatch of fns) {
+        const state = isMatch(str);
+        if (state) return state;
+      }
+      return false;
+    };
+    return arrayMatcher;
   }
-}
 
-const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
-const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
+  const isState = isObject(glob) && glob.tokens && glob.input;
 
-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');
+  if (glob === '' || (typeof glob !== 'string' && !isState)) {
+    throw new TypeError('Expected pattern to be a non-empty string');
+  }
 
-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';
+  const opts = options || {};
+  const posix = utils.isWindows(options);
+  const regex = isState
+    ? picomatch.compileRe(glob, options)
+    : picomatch.makeRe(glob, options, false, true);
 
-const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
-const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
+  const state = regex.state;
+  delete regex.state;
 
-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';
+  let isIgnored = () => false;
+  if (opts.ignore) {
+    const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
+    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
+  }
 
-const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
+  const matcher = (input, returnObject = false) => {
+    const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
+    const result = { glob, state, regex, posix, input, output, match, isMatch };
 
-function getPathKey(platform, env) {
-  let pathKey = 'PATH';
+    if (typeof opts.onResult === 'function') {
+      opts.onResult(result);
+    }
 
-  // windows calls its path "Path" usually, but this is not guaranteed.
-  if (platform === 'win32') {
-    pathKey = 'Path';
+    if (isMatch === false) {
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
 
-    for (const key in env) {
-      if (key.toLowerCase() === 'path') {
-        pathKey = key;
+    if (isIgnored(input)) {
+      if (typeof opts.onIgnore === 'function') {
+        opts.onIgnore(result);
       }
+      result.isMatch = false;
+      return returnObject ? result : false;
     }
-  }
 
-  return pathKey;
-}
+    if (typeof opts.onMatch === 'function') {
+      opts.onMatch(result);
+    }
+    return returnObject ? result : true;
+  };
 
-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'
-};
+  if (returnState) {
+    matcher.state = state;
+  }
 
-/***/ }),
-/* 7 */
-/***/ (function(module, exports, __webpack_require__) {
+  return matcher;
+};
 
-"use strict";
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Test `input` with the given `regex`. This is used by the main
+ * `picomatch()` function to test the input string.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.test(input, regex[, options]);
+ *
+ * console.log(picomatch.test('foo/bar', /^(?:([^/]*?)\/([^/]*?))$/));
+ * // { isMatch: true, match: [ 'foo/', 'foo', 'bar' ], output: 'foo/bar' }
+ * ```
+ * @param {String} `input` String to test.
+ * @param {RegExp} `regex`
+ * @return {Object} Returns an object with matching info.
+ * @api public
  */
 
+picomatch.test = (input, regex, options, { glob, posix } = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected input to be a string');
+  }
 
+  if (input === '') {
+    return { isMatch: false, output: '' };
+  }
 
-/**
- * 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.
- */
-
-var NODE_ENV = "none";
+  const opts = options || {};
+  const format = opts.format || (posix ? utils.toPosixSlashes : null);
+  let match = input === glob;
+  let output = (match && format) ? format(input) : input;
 
-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');
-    }
+  if (match === false) {
+    output = format ? format(input) : input;
+    match = output === glob;
   }
 
-  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.'
-      );
+  if (match === false || opts.capture === true) {
+    if (opts.matchBase === true || opts.basename === true) {
+      match = picomatch.matchBase(input, regex, options, posix);
     } else {
-      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';
+      match = regex.exec(output);
     }
-
-    error.framesToPop = 1; // we don't care about invariant's own frame
-    throw error;
   }
+
+  return { isMatch: Boolean(match), match, output };
 };
 
-module.exports = invariant;
+/**
+ * Match the basename of a filepath.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.matchBase(input, glob[, options]);
+ * console.log(picomatch.matchBase('foo/bar.js', '*.js'); // true
+ * ```
+ * @param {String} `input` String to test.
+ * @param {RegExp|String} `glob` Glob pattern or regex created by [.makeRe](#makeRe).
+ * @return {Boolean}
+ * @api public
+ */
 
+picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
+  const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
+  return regex.test(path.basename(input));
+};
 
-/***/ }),
-/* 8 */,
-/* 9 */
-/***/ (function(module, exports) {
+/**
+ * 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
+ */
 
-module.exports = __webpack_require__(254);
+picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
-/***/ }),
-/* 10 */,
-/* 11 */
-/***/ (function(module, exports) {
+/**
+ * Parse a glob pattern to create the source string for a regular
+ * expression.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * const result = picomatch.parse(pattern[, options]);
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with useful properties and output to be used as a regex source string.
+ * @api public
+ */
 
-// 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
+picomatch.parse = (pattern, options) => {
+  if (Array.isArray(pattern)) return pattern.map(p => picomatch.parse(p, options));
+  return parse(pattern, { ...options, fastpaths: false });
+};
 
+/**
+ * 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',
+ *   start: 3,
+ *   base: 'foo',
+ *   glob: '*.js',
+ *   isBrace: false,
+ *   isBracket: false,
+ *   isGlob: true,
+ *   isExtglob: false,
+ *   isGlobstar: false,
+ *   negated: true }
+ * ```
+ * @param {String} `input` Glob pattern to scan.
+ * @param {Object} `options`
+ * @return {Object} Returns an object with
+ * @api public
+ */
 
-/***/ }),
-/* 12 */
-/***/ (function(module, exports, __webpack_require__) {
+picomatch.scan = (input, options) => scan(input, options);
 
-"use strict";
+/**
+ * Compile a regular expression from the `state` object returned by the
+ * [parse()](#parse) method.
+ *
+ * @param {Object} `state`
+ * @param {Object} `options`
+ * @param {Boolean} `returnOutput` Intended for implementors, this argument allows you to return the raw output from the parser.
+ * @param {Boolean} `returnState` Adds the state to a `state` property on the returned regex. Useful for implementors and debugging.
+ * @return {RegExp}
+ * @api public
+ */
 
+picomatch.compileRe = (state, options, returnOutput = false, returnState = false) => {
+  if (returnOutput === true) {
+    return state.output;
+  }
 
-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);
+  const opts = options || {};
+  const prepend = opts.contains ? '' : '^';
+  const append = opts.contains ? '' : '$';
 
-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;
-    }
+  let source = `${prepend}(?:${state.output})${append}`;
+  if (state && state.negated === true) {
+    source = `^(?!${source}).*$`;
   }
-  return a.length - b.length;
-}
 
-function entries(obj) {
-  const entries = [];
-  if (obj) {
-    for (const key in obj) {
-      entries.push([key, obj[key]]);
-    }
+  const regex = picomatch.toRegex(source, options);
+  if (returnState === true) {
+    regex.state = state;
   }
-  return entries;
-}
 
-function removePrefix(pattern, prefix) {
-  if (pattern.startsWith(prefix)) {
-    pattern = pattern.slice(prefix.length);
-  }
+  return regex;
+};
 
-  return pattern;
-}
+/**
+ * Create a regular expression from a parsed glob pattern.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * const state = picomatch.parse('*.js');
+ * // picomatch.compileRe(state[, options]);
+ *
+ * console.log(picomatch.compileRe(state));
+ * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
+ * ```
+ * @param {String} `state` The object returned from the `.parse` method.
+ * @param {Object} `options`
+ * @param {Boolean} `returnOutput` Implementors may use this argument to return the compiled output, instead of a regular expression. This is not exposed on the options to prevent end-users from mutating the result.
+ * @param {Boolean} `returnState` Implementors may use this argument to return the state from the parsed glob with the returned regular expression.
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
 
-function removeSuffix(pattern, suffix) {
-  if (pattern.endsWith(suffix)) {
-    return pattern.slice(0, -suffix.length);
+picomatch.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
+  if (!input || typeof input !== 'string') {
+    throw new TypeError('Expected a non-empty string');
   }
 
-  return pattern;
-}
+  let parsed = { negated: false, fastpaths: true };
 
-function addSuffix(pattern, suffix) {
-  if (!pattern.endsWith(suffix)) {
-    return pattern + suffix;
+  if (options.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
+    parsed.output = parse.fastpaths(input, options);
   }
 
-  return pattern;
-}
+  if (!parsed.output) {
+    parsed = parse(input, options);
+  }
 
-function hyphenate(str) {
-  return str.replace(/[A-Z]/g, match => {
-    return '-' + match.charAt(0).toLowerCase();
-  });
-}
+  return picomatch.compileRe(parsed, options, returnOutput, returnState);
+};
 
-function camelCase(str) {
-  if (/[A-Z]/.test(str)) {
-    return null;
-  } else {
-    return _camelCase(str);
-  }
-}
+/**
+ * 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
+ */
 
-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;
-    }
+picomatch.toRegex = (source, options) => {
+  try {
+    const opts = options || {};
+    return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
+  } catch (err) {
+    if (options && options.debug === true) throw err;
+    return /$^/;
   }
-  return true;
-}
-
-function sleep(ms) {
-  return new Promise(resolve => {
-    setTimeout(resolve, ms);
-  });
-}
+};
 
-/***/ }),
-/* 13 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Picomatch constants.
+ * @return {Object}
+ */
 
-var store = __webpack_require__(107)('wks');
-var uid = __webpack_require__(111);
-var Symbol = __webpack_require__(11).Symbol;
-var USE_SYMBOL = typeof Symbol == 'function';
+picomatch.constants = constants;
 
-var $exports = module.exports = function (name) {
-  return store[name] || (store[name] =
-    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
-};
+/**
+ * Expose "picomatch"
+ */
 
-$exports.store = store;
+module.exports = picomatch;
 
 
 /***/ }),
-/* 14 */
+
+/***/ "../../node_modules/picomatch/lib/scan.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.stringify = exports.parse = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
-
-var _parse;
-
-function _load_parse() {
-  return _parse = __webpack_require__(81);
-}
-
-Object.defineProperty(exports, 'parse', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_parse || _load_parse()).default;
-  }
-});
-
-var _stringify;
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+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__("../../node_modules/picomatch/lib/constants.js");
 
-function _load_stringify() {
-  return _stringify = __webpack_require__(150);
-}
+const isPathSeparator = code => {
+  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
+};
 
-Object.defineProperty(exports, 'stringify', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_stringify || _load_stringify()).default;
+const depth = token => {
+  if (token.isPrefix !== true) {
+    token.depth = token.isGlobstar ? Infinity : 1;
   }
-});
-exports.implodeEntry = implodeEntry;
-exports.explodeEntry = explodeEntry;
+};
 
-var _misc;
+/**
+ * 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), `negated` (true if the path starts with `!` but not
+ * with `!(`) and `negatedExtglob` (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
+ */
 
-function _load_misc() {
-  return _misc = __webpack_require__(12);
-}
+const scan = (input, options) => {
+  const opts = options || {};
 
-var _normalizePattern;
+  const length = input.length - 1;
+  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+  const slashes = [];
+  const tokens = [];
+  const parts = [];
 
-function _load_normalizePattern() {
-  return _normalizePattern = __webpack_require__(29);
-}
+  let str = input;
+  let index = -1;
+  let start = 0;
+  let lastIndex = 0;
+  let isBrace = false;
+  let isBracket = false;
+  let isGlob = false;
+  let isExtglob = false;
+  let isGlobstar = false;
+  let braceEscaped = false;
+  let backslashes = false;
+  let negated = false;
+  let negatedExtglob = false;
+  let finished = false;
+  let braces = 0;
+  let prev;
+  let code;
+  let token = { value: '', depth: 0, isGlob: false };
 
-var _parse2;
+  const eos = () => index >= length;
+  const peek = () => str.charCodeAt(index + 1);
+  const advance = () => {
+    prev = code;
+    return str.charCodeAt(++index);
+  };
 
-function _load_parse2() {
-  return _parse2 = _interopRequireDefault(__webpack_require__(81));
-}
+  while (index < length) {
+    code = advance();
+    let next;
 
-var _constants;
+    if (code === CHAR_BACKWARD_SLASH) {
+      backslashes = token.backslashes = true;
+      code = advance();
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
+      if (code === CHAR_LEFT_CURLY_BRACE) {
+        braceEscaped = true;
+      }
+      continue;
+    }
 
-var _fs;
+    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
+      braces++;
 
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(5));
-}
+      while (eos() !== true && (code = advance())) {
+        if (code === CHAR_BACKWARD_SLASH) {
+          backslashes = token.backslashes = true;
+          advance();
+          continue;
+        }
 
-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; } }
+        if (code === CHAR_LEFT_CURLY_BRACE) {
+          braces++;
+          continue;
+        }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+        if (braceEscaped !== true && code === CHAR_DOT && (code = advance()) === CHAR_DOT) {
+          isBrace = token.isBrace = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-const invariant = __webpack_require__(7);
+          if (scanToEnd === true) {
+            continue;
+          }
 
-const path = __webpack_require__(0);
-const ssri = __webpack_require__(55);
+          break;
+        }
 
-function getName(pattern) {
-  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
-}
+        if (braceEscaped !== true && code === CHAR_COMMA) {
+          isBrace = token.isBrace = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-function blankObjectUndefined(obj) {
-  return obj && Object.keys(obj).length ? obj : undefined;
-}
+          if (scanToEnd === true) {
+            continue;
+          }
 
-function keyForRemote(remote) {
-  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
-}
+          break;
+        }
 
-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(' ');
-}
+        if (code === CHAR_RIGHT_CURLY_BRACE) {
+          braces--;
 
-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;
-}
+          if (braces === 0) {
+            braceEscaped = false;
+            isBrace = token.isBrace = true;
+            finished = true;
+            break;
+          }
+        }
+      }
 
-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;
-}
+      if (scanToEnd === true) {
+        continue;
+      }
 
-class Lockfile {
-  constructor({ cache, source, parseResultType } = {}) {
-    this.source = source || '';
-    this.cache = cache;
-    this.parseResultType = parseResultType;
-  }
+      break;
+    }
 
-  // source string if the `cache` was parsed
+    if (code === CHAR_FORWARD_SLASH) {
+      slashes.push(index);
+      tokens.push(token);
+      token = { value: '', depth: 0, isGlob: false };
 
+      if (finished === true) continue;
+      if (prev === CHAR_DOT && index === (start + 1)) {
+        start += 2;
+        continue;
+      }
 
-  // if true, we're parsing an old yarn file and need to update integrity fields
-  hasEntriesExistWithoutIntegrity() {
-    if (!this.cache) {
-      return false;
+      lastIndex = index + 1;
+      continue;
     }
 
-    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;
-      }
-    }
+    if (opts.noext !== true) {
+      const isExtglobChar = code === CHAR_PLUS
+        || code === CHAR_AT
+        || code === CHAR_ASTERISK
+        || code === CHAR_QUESTION_MARK
+        || code === CHAR_EXCLAMATION_MARK;
 
-    return false;
-  }
+      if (isExtglobChar === true && peek() === CHAR_LEFT_PARENTHESES) {
+        isGlob = token.isGlob = true;
+        isExtglob = token.isExtglob = true;
+        finished = true;
+        if (code === CHAR_EXCLAMATION_MARK && index === start) {
+          negatedExtglob = true;
+        }
 
-  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);
-
-      let lockfile;
-      let rawLockfile = '';
-      let parseResult;
-
-      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
-        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
-        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
+        if (scanToEnd === true) {
+          while (eos() !== true && (code = advance())) {
+            if (code === CHAR_BACKWARD_SLASH) {
+              backslashes = token.backslashes = true;
+              code = advance();
+              continue;
+            }
 
-        if (reporter) {
-          if (parseResult.type === 'merge') {
-            reporter.info(reporter.lang('lockfileMerged'));
-          } else if (parseResult.type === 'conflict') {
-            reporter.warn(reporter.lang('lockfileConflict'));
+            if (code === CHAR_RIGHT_PARENTHESES) {
+              isGlob = token.isGlob = true;
+              finished = true;
+              break;
+            }
           }
+          continue;
         }
-
-        lockfile = parseResult.object;
-      } else if (reporter) {
-        reporter.info(reporter.lang('noLockfileFound'));
+        break;
       }
-
-      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
-    })();
-  }
-
-  getLocked(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return undefined;
     }
 
-    const shrunk = pattern in cache && cache[pattern];
+    if (code === CHAR_ASTERISK) {
+      if (prev === CHAR_ASTERISK) isGlobstar = token.isGlobstar = true;
+      isGlob = token.isGlob = true;
+      finished = true;
 
-    if (typeof shrunk === 'string') {
-      return this.getLocked(shrunk);
-    } else if (shrunk) {
-      explodeEntry(pattern, shrunk);
-      return shrunk;
+      if (scanToEnd === true) {
+        continue;
+      }
+      break;
     }
 
-    return undefined;
-  }
+    if (code === CHAR_QUESTION_MARK) {
+      isGlob = token.isGlob = true;
+      finished = true;
 
-  removePattern(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return;
+      if (scanToEnd === true) {
+        continue;
+      }
+      break;
     }
-    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);
+    if (code === CHAR_LEFT_SQUARE_BRACKET) {
+      while (eos() !== true && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = token.backslashes = true;
+          advance();
+          continue;
+        }
 
-    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          isBracket = token.isBracket = true;
+          isGlob = token.isGlob = true;
+          finished = true;
+          break;
+        }
+      }
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
+      if (scanToEnd === true) {
+        continue;
       }
 
-      const pattern = _ref;
+      break;
+    }
 
-      const pkg = patterns[pattern];
-      const remote = pkg._remote,
-            ref = pkg._reference;
+    if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {
+      negated = token.negated = true;
+      start++;
+      continue;
+    }
 
-      invariant(ref, 'Package is missing a reference');
-      invariant(remote, 'Package is missing a remote');
+    if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
+      isGlob = token.isGlob = true;
 
-      const remoteKey = keyForRemote(remote);
-      const seenPattern = remoteKey && seen.get(remoteKey);
-      if (seenPattern) {
-        // no point in duplicating it
-        lockfile[pattern] = seenPattern;
+      if (scanToEnd === true) {
+        while (eos() !== true && (code = advance())) {
+          if (code === CHAR_LEFT_PARENTHESES) {
+            backslashes = token.backslashes = true;
+            code = advance();
+            continue;
+          }
 
-        // 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;
+          if (code === CHAR_RIGHT_PARENTHESES) {
+            finished = true;
+            break;
+          }
         }
         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
-      });
+      break;
+    }
 
-      lockfile[pattern] = obj;
+    if (isGlob === true) {
+      finished = true;
 
-      if (remoteKey) {
-        seen.set(remoteKey, obj);
+      if (scanToEnd === true) {
+        continue;
       }
-    }
 
-    return lockfile;
+      break;
+    }
   }
-}
-exports.default = Lockfile;
 
-/***/ }),
-/* 15 */,
-/* 16 */,
-/* 17 */
-/***/ (function(module, exports) {
+  if (opts.noext === true) {
+    isExtglob = false;
+    isGlob = false;
+  }
 
-module.exports = __webpack_require__(294);
+  let base = str;
+  let prefix = '';
+  let glob = '';
 
-/***/ }),
-/* 18 */,
-/* 19 */,
-/* 20 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (start > 0) {
+    prefix = str.slice(0, start);
+    str = str.slice(start);
+    lastIndex -= start;
+  }
 
-"use strict";
+  if (base && isGlob === true && lastIndex > 0) {
+    base = str.slice(0, lastIndex);
+    glob = str.slice(lastIndex);
+  } else if (isGlob === true) {
+    base = '';
+    glob = str;
+  } else {
+    base = str;
+  }
 
+  if (base && base !== '' && base !== '/' && base !== str) {
+    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
+      base = base.slice(0, -1);
+    }
+  }
 
-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 (opts.unescape === true) {
+    if (glob) glob = utils.removeBackslashes(glob);
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
+    if (base && backslashes === true) {
+      base = utils.removeBackslashes(base);
+    }
+  }
 
-      const item = _ref;
+  const state = {
+    prefix,
+    input,
+    start,
+    base,
+    glob,
+    isBrace,
+    isBracket,
+    isGlob,
+    isExtglob,
+    isGlobstar,
+    negated,
+    negatedExtglob
+  };
 
-      nullify(item);
+  if (opts.tokens === true) {
+    state.maxDepth = 0;
+    if (!isPathSeparator(code)) {
+      tokens.push(token);
     }
-  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
-    Object.setPrototypeOf(obj, null);
+    state.tokens = tokens;
+  }
 
-    // for..in can only be applied to 'object', not 'function'
-    if (typeof obj === 'object') {
-      for (const key in obj) {
-        nullify(obj[key]);
+  if (opts.parts === true || opts.tokens === true) {
+    let prevIndex;
+
+    for (let idx = 0; idx < slashes.length; idx++) {
+      const n = prevIndex ? prevIndex + 1 : start;
+      const i = slashes[idx];
+      const value = input.slice(n, i);
+      if (opts.tokens) {
+        if (idx === 0 && start !== 0) {
+          tokens[idx].isPrefix = true;
+          tokens[idx].value = prefix;
+        } else {
+          tokens[idx].value = value;
+        }
+        depth(tokens[idx]);
+        state.maxDepth += tokens[idx].depth;
+      }
+      if (idx !== 0 || value !== '') {
+        parts.push(value);
       }
+      prevIndex = i;
     }
-  }
 
-  return obj;
-}
+    if (prevIndex && prevIndex + 1 < input.length) {
+      const value = input.slice(prevIndex + 1);
+      parts.push(value);
 
-/***/ }),
-/* 21 */,
-/* 22 */
-/***/ (function(module, exports) {
+      if (opts.tokens) {
+        tokens[tokens.length - 1].value = value;
+        depth(tokens[tokens.length - 1]);
+        state.maxDepth += tokens[tokens.length - 1].depth;
+      }
+    }
 
-module.exports = __webpack_require__(283);
+    state.slashes = slashes;
+    state.parts = parts;
+  }
 
-/***/ }),
-/* 23 */
-/***/ (function(module, exports) {
+  return state;
+};
 
-var core = module.exports = { version: '2.5.7' };
-if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
+module.exports = scan;
 
 
 /***/ }),
-/* 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 */
+/***/ "../../node_modules/picomatch/lib/utils.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.normalizePattern = normalizePattern;
+const path = __webpack_require__("path");
+const win32 = process.platform === 'win32';
+const {
+  REGEX_BACKSLASH,
+  REGEX_REMOVE_BACKSLASH,
+  REGEX_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_GLOBAL
+} = __webpack_require__("../../node_modules/picomatch/lib/constants.js");
 
-/**
- * Explode and normalize a pattern into its name and range.
- */
+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(REGEX_BACKSLASH, '/');
 
-function normalizePattern(pattern) {
-  let hasVersion = false;
-  let range = 'latest';
-  let name = pattern;
+exports.removeBackslashes = str => {
+  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
+    return match === '\\' ? '' : match;
+  });
+};
 
-  // 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);
+exports.supportsLookbehinds = () => {
+  const segs = process.version.slice(1).split('.').map(Number);
+  if (segs.length === 3 && segs[0] >= 9 || (segs[0] === 8 && segs[1] >= 10)) {
+    return true;
+  }
+  return false;
+};
+
+exports.isWindows = options => {
+  if (options && typeof options.windows === 'boolean') {
+    return options.windows;
   }
+  return win32 === true || path.sep === '\\';
+};
 
-  // take first part as the name
-  const parts = name.split('@');
-  if (parts.length > 1) {
-    name = parts.shift();
-    range = parts.join('@');
+exports.escapeLast = (input, char, lastIdx) => {
+  const 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)}`;
+};
 
-    if (range) {
-      hasVersion = true;
-    } else {
-      range = '*';
-    }
+exports.removePrefix = (input, state = {}) => {
+  let output = input;
+  if (output.startsWith('./')) {
+    output = output.slice(2);
+    state.prefix = './';
   }
+  return output;
+};
 
-  // add back @ scope suffix
-  if (isScoped) {
-    name = `@${name}`;
+exports.wrapOutput = (input, state = {}, options = {}) => {
+  const prepend = options.contains ? '' : '^';
+  const append = options.contains ? '' : '$';
+
+  let output = `${prepend}(?:${input})${append}`;
+  if (state.negated === true) {
+    output = `(?:^(?!${output}).*$)`;
   }
+  return output;
+};
 
-  return { name, range, hasVersion };
-}
 
 /***/ }),
-/* 30 */,
-/* 31 */
+
+/***/ "../../node_modules/pify/index.js":
 /***/ (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;
+"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);
+	});
+};
+
+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;
+	}
+
+	return ret;
 };
 
 
 /***/ }),
-/* 32 */
+
+/***/ "../../node_modules/pump/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-/* eslint-disable node/no-deprecated-api */
-var buffer = __webpack_require__(63)
-var Buffer = buffer.Buffer
+var once = __webpack_require__("../../node_modules/once/once.js")
+var eos = __webpack_require__("../../node_modules/end-of-stream/index.js")
+var fs = __webpack_require__("fs") // we only need fs to get the ReadStream and WriteStream prototypes
 
-// alternative to using Object.keys for old browsers
-function copyProps (src, dst) {
-  for (var key in src) {
-    dst[key] = src[key]
-  }
+var noop = function () {}
+var ancient = /^v?\.0/.test(process.version)
+
+var isFn = function (fn) {
+  return typeof fn === 'function'
 }
-if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
-  module.exports = buffer
-} else {
-  // Copy properties from require('buffer')
-  copyProps(buffer, exports)
-  exports.Buffer = SafeBuffer
+
+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)
 }
 
-function SafeBuffer (arg, encodingOrOffset, length) {
-  return Buffer(arg, encodingOrOffset, length)
+var isRequest = function (stream) {
+  return stream.setHeader && isFn(stream.abort)
 }
 
-// Copy static methods from Buffer
-copyProps(Buffer, SafeBuffer)
+var destroyer = function (stream, reading, writing, callback) {
+  callback = once(callback)
 
-SafeBuffer.from = function (arg, encodingOrOffset, length) {
-  if (typeof arg === 'number') {
-    throw new TypeError('Argument must not be a number')
+  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'))
   }
-  return Buffer(arg, encodingOrOffset, length)
 }
 
-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
+var call = function (fn) {
+  fn()
 }
 
-SafeBuffer.allocUnsafe = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return Buffer(size)
+var pipe = function (from, to) {
+  return from.pipe(to)
 }
 
-SafeBuffer.allocUnsafeSlow = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return buffer.SlowBuffer(size)
+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
+
 
 /***/ }),
-/* 33 */
+
+/***/ "../../node_modules/read-pkg/index.js":
 /***/ (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;
-});
+"use strict";
 
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const parseJson = __webpack_require__("../../node_modules/parse-json/index.js");
 
-/***/ }),
-/* 34 */
-/***/ (function(module, exports) {
+const readFileAsync = promisify(fs.readFile);
 
-module.exports = function (it) {
-  return typeof it === 'object' ? it !== null : typeof it === 'function';
-};
+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'));
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports) {
+	if (options.normalize) {
+		__webpack_require__("../../node_modules/normalize-package-data/lib/normalize.js")(json);
+	}
 
-module.exports = {};
+	return json;
+};
+
+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'));
 
-/***/ }),
-/* 36 */
-/***/ (function(module, exports) {
+	if (options.normalize) {
+		__webpack_require__("../../node_modules/normalize-package-data/lib/normalize.js")(json);
+	}
+
+	return json;
+};
 
-module.exports = __webpack_require__(243);
 
 /***/ }),
-/* 37 */,
-/* 38 */,
-/* 39 */,
-/* 40 */
+
+/***/ "../../node_modules/resolve/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var async = __webpack_require__("../../node_modules/resolve/lib/async.js");
+async.core = __webpack_require__("../../node_modules/resolve/lib/core.js");
+async.isCore = __webpack_require__("../../node_modules/resolve/lib/is-core.js");
+async.sync = __webpack_require__("../../node_modules/resolve/lib/sync.js");
 
+module.exports = async;
 
-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;
+/***/ }),
 
-        if (result.length <= 1) {
-          res = result[0];
-        }
+/***/ "../../node_modules/resolve/lib/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (firstData) {
-          res = err;
-          err = null;
-        }
+var fs = __webpack_require__("fs");
+var getHomedir = __webpack_require__("../../node_modules/resolve/lib/homedir.js");
+var path = __webpack_require__("path");
+var caller = __webpack_require__("../../node_modules/resolve/lib/caller.js");
+var nodeModulesPaths = __webpack_require__("../../node_modules/resolve/lib/node-modules-paths.js");
+var normalizeOptions = __webpack_require__("../../node_modules/resolve/lib/normalize-options.js");
+var isCore = __webpack_require__("../../node_modules/is-core-module/index.js");
 
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
+var realpathFS = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
+
+var homedir = getHomedir();
+var defaultPaths = function () {
+    return [
+        path.join(homedir, '.node_modules'),
+        path.join(homedir, '.node_libraries')
+    ];
+};
+
+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);
+    });
+};
 
-      fn.apply(null, args);
+var defaultIsDir = function isDirectory(dir, cb) {
+    fs.stat(dir, function (err, stat) {
+        if (!err) {
+            return cb(null, stat.isDirectory());
+        }
+        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
+        return cb(err);
     });
-  };
-}
+};
 
-function queue(arr, promiseProducer, concurrency = Infinity) {
-  concurrency = Math.min(concurrency, arr.length);
+var defaultRealpath = function realpath(x, cb) {
+    realpathFS(x, function (realpathErr, realPath) {
+        if (realpathErr && realpathErr.code !== 'ENOENT') cb(realpathErr);
+        else cb(null, realpathErr ? x : realPath);
+    });
+};
 
-  // clone
-  arr = arr.slice();
+var maybeRealpath = function maybeRealpath(realpath, x, opts, cb) {
+    if (opts && opts.preserveSymlinks === false) {
+        realpath(x, cb);
+    } else {
+        cb(null, x);
+    }
+};
 
-  const results = [];
-  let total = arr.length;
-  if (!total) {
-    return Promise.resolve(results);
-  }
+var defaultReadPackage = function defaultReadPackage(readFile, pkgfile, cb) {
+    readFile(pkgfile, function (readFileErr, body) {
+        if (readFileErr) cb(readFileErr);
+        else {
+            try {
+                var pkg = JSON.parse(body);
+                cb(null, pkg);
+            } catch (jsonErr) {
+                cb(null);
+            }
+        }
+    });
+};
 
-  return new Promise((resolve, reject) => {
-    for (let i = 0; i < concurrency; i++) {
-      next();
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
     }
+    return dirs;
+};
 
-    function next() {
-      const item = arr.shift();
-      const promise = promiseProducer(item);
+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);
+        });
+    }
 
-      promise.then(function (result) {
-        results.push(result);
+    opts = normalizeOptions(x, opts);
 
-        total--;
-        if (total === 0) {
-          resolve(results);
-        } else {
-          if (arr.length) {
-            next();
-          }
-        }
-      }, reject);
+    var isFile = opts.isFile || defaultIsFile;
+    var isDirectory = opts.isDirectory || defaultIsDir;
+    var readFile = opts.readFile || fs.readFile;
+    var realpath = opts.realpath || defaultRealpath;
+    var readPackage = opts.readPackage || defaultReadPackage;
+    if (opts.readFile && opts.readPackage) {
+        var conflictErr = new TypeError('`readFile` and `readPackage` are mutually exclusive.');
+        return process.nextTick(function () {
+            cb(conflictErr);
+        });
     }
-  });
-}
+    var packageIterator = opts.packageIterator;
 
-/***/ }),
-/* 41 */
-/***/ (function(module, exports, __webpack_require__) {
+    var extensions = opts.extensions || ['.js'];
+    var includeCoreModules = opts.includeCoreModules !== false;
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
-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';
+    opts.paths = opts.paths || defaultPaths();
 
-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);
+    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
+    var absoluteStart = path.resolve(basedir);
+
+    maybeRealpath(
+        realpath,
+        absoluteStart,
+        opts,
+        function (err, realStart) {
+            if (err) cb(err);
+            else init(realStart);
+        }
+    );
+
+    var res;
+    function init(basedir) {
+        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
+            res = path.resolve(basedir, x);
+            if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
+            if ((/\/$/).test(x) && res === basedir) {
+                loadAsDirectory(res, opts.package, onfile);
+            } else loadAsFile(res, opts.package, onfile);
+        } else if (includeCoreModules && isCore(x)) {
+            return cb(null, x);
+        } else loadNodeModules(x, basedir, function (err, n, pkg) {
+            if (err) cb(err);
+            else if (n) {
+                return maybeRealpath(realpath, n, opts, function (err, realN) {
+                    if (err) {
+                        cb(err);
+                    } else {
+                        cb(null, realN, pkg);
+                    }
+                });
+            } else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
     }
-  }
-};
-// 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;
 
+    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) {
+                maybeRealpath(realpath, d, opts, function (err, realD) {
+                    if (err) {
+                        cb(err);
+                    } else {
+                        cb(null, realD, pkg);
+                    }
+                });
+            } else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
+    }
 
-/***/ }),
-/* 42 */
-/***/ (function(module, exports, __webpack_require__) {
+    function loadAsFile(x, thePackage, callback) {
+        var loadAsFilePackage = thePackage;
+        var cb = callback;
+        if (typeof loadAsFilePackage === 'function') {
+            cb = loadAsFilePackage;
+            loadAsFilePackage = undefined;
+        }
 
-try {
-  var util = __webpack_require__(2);
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  module.exports = __webpack_require__(224);
-}
+        var exts = [''].concat(extensions);
+        load(exts, x, loadAsFilePackage);
 
+        function load(exts, x, loadPackage) {
+            if (exts.length === 0) return cb(null, undefined, loadPackage);
+            var file = x + exts[0];
 
-/***/ }),
-/* 43 */,
-/* 44 */,
-/* 45 */
-/***/ (function(module, exports, __webpack_require__) {
+            var pkg = loadPackage;
+            if (pkg) onpkg(null, pkg);
+            else loadpkg(path.dirname(file), onpkg);
 
-"use strict";
+            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);
+            }
+        }
+    }
 
+    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);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.home = undefined;
+        maybeRealpath(realpath, dir, opts, function (unwrapErr, pkgdir) {
+            if (unwrapErr) return loadpkg(path.dirname(dir), cb);
+            var pkgfile = path.join(pkgdir, 'package.json');
+            isFile(pkgfile, function (err, ex) {
+                // on err, ex is false
+                if (!ex) return loadpkg(path.dirname(dir), cb);
 
-var _rootUser;
+                readPackage(readFile, pkgfile, function (err, pkgParam) {
+                    if (err) cb(err);
 
-function _load_rootUser() {
-  return _rootUser = _interopRequireDefault(__webpack_require__(169));
-}
+                    var pkg = pkgParam;
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+                    if (pkg && opts.packageFilter) {
+                        pkg = opts.packageFilter(pkg, pkgfile);
+                    }
+                    cb(null, pkg, dir);
+                });
+            });
+        });
+    }
 
-const path = __webpack_require__(0);
+    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
+        var cb = callback;
+        var fpkg = loadAsDirectoryPackage;
+        if (typeof fpkg === 'function') {
+            cb = fpkg;
+            fpkg = opts.package;
+        }
 
-const home = exports.home = __webpack_require__(36).homedir();
+        maybeRealpath(realpath, x, opts, function (unwrapErr, pkgdir) {
+            if (unwrapErr) return cb(unwrapErr);
+            var pkgfile = path.join(pkgdir, 'package.json');
+            isFile(pkgfile, function (err, ex) {
+                if (err) return cb(err);
+                if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
 
-const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
+                readPackage(readFile, pkgfile, function (err, pkgParam) {
+                    if (err) return cb(err);
 
-exports.default = userHomeDir;
+                    var pkg = pkgParam;
 
-/***/ }),
-/* 46 */
-/***/ (function(module, exports) {
+                    if (pkg && opts.packageFilter) {
+                        pkg = opts.packageFilter(pkg, pkgfile);
+                    }
 
-module.exports = function (it) {
-  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
-  return it;
-};
+                    if (pkg && 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 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;
+                    }
 
-/***/ }),
-/* 47 */
-/***/ (function(module, exports) {
+                    loadAsFile(path.join(x, '/index'), pkg, cb);
+                });
+            });
+        });
+    }
 
-var toString = {}.toString;
+    function processDirs(cb, dirs) {
+        if (dirs.length === 0) return cb(null, undefined);
+        var dir = dirs[0];
 
-module.exports = function (it) {
-  return toString.call(it).slice(8, -1);
-};
+        isDirectory(path.dirname(dir), isdir);
 
+        function isdir(err, isdir) {
+            if (err) return cb(err);
+            if (!isdir) return processDirs(cb, dirs.slice(1));
+            loadAsFile(dir, opts.package, onfile);
+        }
 
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
+        function onfile(err, m, pkg) {
+            if (err) return cb(err);
+            if (m) return cb(null, m, pkg);
+            loadAsDirectory(dir, opts.package, ondir);
+        }
 
-// 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);
-  };
+        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) {
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        processDirs(
+            cb,
+            packageIterator ? packageIterator(x, start, thunk, opts) : thunk()
+        );
+    }
 };
 
 
 /***/ }),
-/* 49 */
+
+/***/ "../../node_modules/resolve/lib/caller.js":
 /***/ (function(module, exports) {
 
-var hasOwnProperty = {}.hasOwnProperty;
-module.exports = function (it, key) {
-  return hasOwnProperty.call(it, key);
+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();
 };
 
 
 /***/ }),
-/* 50 */
+
+/***/ "../../node_modules/resolve/lib/core.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var anObject = __webpack_require__(27);
-var IE8_DOM_DEFINE = __webpack_require__(184);
-var toPrimitive = __webpack_require__(201);
-var dP = Object.defineProperty;
+var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
 
-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;
-};
+function specifierIncluded(specifier) {
+    var parts = specifier.split(' ');
+    var op = parts.length > 1 ? parts[0] : '=';
+    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+
+    for (var i = 0; i < 3; ++i) {
+        var cur = parseInt(current[i] || 0, 10);
+        var ver = parseInt(versionParts[i] || 0, 10);
+        if (cur === ver) {
+            continue; // eslint-disable-line no-restricted-syntax, no-continue
+        }
+        if (op === '<') {
+            return cur < ver;
+        } else if (op === '>=') {
+            return cur >= ver;
+        }
+        return false;
+    }
+    return op === '>=';
+}
+
+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;
+}
+
+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);
+}
+
+var data = __webpack_require__("../../node_modules/resolve/lib/core.json");
+
+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;
 
 
 /***/ }),
-/* 51 */,
-/* 52 */,
-/* 53 */,
-/* 54 */
-/***/ (function(module, exports) {
 
-module.exports = __webpack_require__(285);
+/***/ "../../node_modules/resolve/lib/core.json":
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
 
 /***/ }),
-/* 55 */
+
+/***/ "../../node_modules/resolve/lib/homedir.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const Buffer = __webpack_require__(32).Buffer
+var os = __webpack_require__("os");
 
-const crypto = __webpack_require__(9)
-const Transform = __webpack_require__(17).Transform
+// adapted from https://github.com/sindresorhus/os-homedir/blob/11e089f4754db38bb535e5a8416320c4446e8cfd/index.js
 
-const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
+module.exports = os.homedir || function homedir() {
+    var home = process.env.HOME;
+    var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME;
 
-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 (process.platform === 'win32') {
+        return process.env.USERPROFILE || process.env.HOMEDRIVE + process.env.HOMEPATH || home || null;
+    }
 
-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]
+    if (process.platform === 'darwin') {
+        return home || (user ? '/Users/' + user : null);
+    }
 
-    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 ''
-      }
+    if (process.platform === 'linux') {
+        return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null)); // eslint-disable-line no-extra-parens
     }
-    const options = this.options && this.options.length
-    ? `?${this.options.join('?')}`
-    : ''
-    return `${this.algorithm}-${this.digest}${options}`
-  }
-}
 
-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 home || null;
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/resolve/lib/is-core.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var isCoreModule = __webpack_require__("../../node_modules/is-core-module/index.js");
+
+module.exports = function isCore(x) {
+    return isCoreModule(x);
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/resolve/lib/node-modules-paths.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var path = __webpack_require__("path");
+var parse = path.parse || __webpack_require__("../../node_modules/path-parse/index.js"); // eslint-disable-line global-require
+
+var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
+    var prefix = '/';
+    if ((/^([A-Za-z]:)/).test(absoluteStart)) {
+        prefix = '';
+    } else if ((/^\\\\/).test(absoluteStart)) {
+        prefix = '\\\\';
     }
-    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())
-      }`)
+
+    var paths = [absoluteStart];
+    var parsed = parse(absoluteStart);
+    while (parsed.dir !== paths[paths.length - 1]) {
+        paths.push(parsed.dir);
+        parsed = parse(parsed.dir);
     }
-    return keys.reduce((acc, algo) => {
-      return pickAlgorithm(acc, algo) || acc
-    })
-  }
-}
 
-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)
-  }
-}
+    return paths.reduce(function (dirs, aPath) {
+        return dirs.concat(modules.map(function (moduleDir) {
+            return path.resolve(prefix, aPath, moduleDir);
+        }));
+    }, []);
+};
 
-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)
+module.exports = function nodeModulesPaths(start, opts, request) {
+    var modules = opts && opts.moduleDirectory
+        ? [].concat(opts.moduleDirectory)
+        : ['node_modules'];
+
+    if (opts && typeof opts.paths === 'function') {
+        return opts.paths(
+            request,
+            start,
+            function () { return getNodeModulesDirs(start, modules); },
+            opts
+        );
     }
-    return acc
-  }, new Integrity())
-}
 
-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)
-  }
-}
+    var dirs = getNodeModulesDirs(start, modules);
+    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
+};
 
-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)
+/***/ }),
+
+/***/ "../../node_modules/resolve/lib/normalize-options.js":
+/***/ (function(module, exports) {
+
+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.
+     */
+
+    return opts || {};
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/resolve/lib/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var isCore = __webpack_require__("../../node_modules/is-core-module/index.js");
+var fs = __webpack_require__("fs");
+var path = __webpack_require__("path");
+var getHomedir = __webpack_require__("../../node_modules/resolve/lib/homedir.js");
+var caller = __webpack_require__("../../node_modules/resolve/lib/caller.js");
+var nodeModulesPaths = __webpack_require__("../../node_modules/resolve/lib/node-modules-paths.js");
+var normalizeOptions = __webpack_require__("../../node_modules/resolve/lib/normalize-options.js");
+
+var realpathFS = fs.realpathSync && typeof fs.realpathSync.native === 'function' ? fs.realpathSync.native : fs.realpathSync;
+
+var homedir = getHomedir();
+var defaultPaths = function () {
+    return [
+        path.join(homedir, '.node_modules'),
+        path.join(homedir, '.node_libraries')
+    ];
+};
+
+var defaultIsFile = function isFile(file) {
+    try {
+        var stat = fs.statSync(file, { throwIfNoEntry: false });
+    } catch (e) {
+        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+        throw e;
     }
-    return acc
-  }, new Integrity())
-}
+    return !!stat && (stat.isFile() || stat.isFIFO());
+};
 
-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', () => {})
-  })
-}
+var defaultIsDir = function isDirectory(dir) {
+    try {
+        var stat = fs.statSync(dir, { throwIfNoEntry: false });
+    } catch (e) {
+        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+        throw e;
+    }
+    return !!stat && stat.isDirectory();
+};
 
-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'
+var defaultRealpathSync = function realpathSync(x) {
+    try {
+        return realpathFS(x);
+    } catch (realpathErr) {
+        if (realpathErr.code !== 'ENOENT') {
+            throw realpathErr;
         }
-      )
-    } 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
-  }
-}
+    return x;
+};
 
-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', () => {})
-  })
-}
+var maybeRealpathSync = function maybeRealpathSync(realpathSync, x, opts) {
+    if (opts && opts.preserveSymlinks === false) {
+        return realpathSync(x);
+    }
+    return x;
+};
 
-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)
+var defaultReadPackageSync = function defaultReadPackageSync(readFileSync, pkgfile) {
+    var body = readFileSync(pkgfile);
+    try {
+        var pkg = JSON.parse(body);
+        return pkg;
+    } catch (jsonErr) {}
+};
+
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
     }
-  }).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 dirs;
+};
+
+module.exports = function resolveSync(x, options) {
+    if (typeof x !== 'string') {
+        throw new TypeError('Path must be a string.');
     }
-  })
-  return stream
-}
+    var opts = normalizeOptions(x, options);
 
-module.exports.create = createIntegrity
-function createIntegrity (opts) {
-  opts = opts || {}
-  const algorithms = opts.algorithms || ['sha512']
-  const optString = opts.options && opts.options.length
-  ? `?${opts.options.join('?')}`
-  : ''
+    var isFile = opts.isFile || defaultIsFile;
+    var readFileSync = opts.readFileSync || fs.readFileSync;
+    var isDirectory = opts.isDirectory || defaultIsDir;
+    var realpathSync = opts.realpathSync || defaultRealpathSync;
+    var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
+    if (opts.readFileSync && opts.readPackageSync) {
+        throw new TypeError('`readFileSync` and `readPackageSync` are mutually exclusive.');
+    }
+    var packageIterator = opts.packageIterator;
 
-  const hashes = algorithms.map(crypto.createHash)
+    var extensions = opts.extensions || ['.js'];
+    var includeCoreModules = opts.includeCoreModules !== false;
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
-  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())
+    opts.paths = opts.paths || defaultPaths();
 
-      return integrity
+    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
+    var absoluteStart = maybeRealpathSync(realpathSync, path.resolve(basedir), opts);
+
+    if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
+        var res = path.resolve(absoluteStart, x);
+        if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
+        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
+        if (m) return maybeRealpathSync(realpathSync, m, opts);
+    } else if (includeCoreModules && isCore(x)) {
+        return x;
+    } else {
+        var n = loadNodeModulesSync(x, absoluteStart);
+        if (n) return maybeRealpathSync(realpathSync, n, opts);
     }
-  }
-}
 
-const NODE_HASHES = new Set(crypto.getHashes())
+    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
 
-// 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))
+    function loadAsFileSync(x) {
+        var pkg = loadpkg(path.dirname(x));
 
-function getPrioritizedHash (algo1, algo2) {
-  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
-  ? algo1
-  : algo2
-}
+        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 (isFile(x)) {
+            return x;
+        }
 
-/***/ }),
-/* 56 */,
-/* 57 */,
-/* 58 */,
-/* 59 */,
-/* 60 */
-/***/ (function(module, exports, __webpack_require__) {
+        for (var i = 0; i < extensions.length; i++) {
+            var file = x + extensions[i];
+            if (isFile(file)) {
+                return file;
+            }
+        }
+    }
 
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
+    function loadpkg(dir) {
+        if (dir === '' || dir === '/') return;
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return;
+        }
+        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
 
-var path = { sep: '/' }
-try {
-  path = __webpack_require__(0)
-} catch (er) {}
+        var pkgfile = path.join(maybeRealpathSync(realpathSync, dir, opts), 'package.json');
 
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(175)
+        if (!isFile(pkgfile)) {
+            return loadpkg(path.dirname(dir));
+        }
 
-var plTypes = {
-  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
-  '?': { open: '(?:', close: ')?' },
-  '+': { open: '(?:', close: ')+' },
-  '*': { open: '(?:', close: ')*' },
-  '@': { open: '(?:', close: ')' }
-}
+        var pkg = readPackageSync(readFileSync, pkgfile);
 
-// any single thing other than /
-// don't need to escape / when using new RegExp()
-var qmark = '[^/]'
+        if (pkg && opts.packageFilter) {
+            // v2 will pass pkgfile
+            pkg = opts.packageFilter(pkg, /*pkgfile,*/ dir); // eslint-disable-line spaced-comment
+        }
 
-// * => any number of characters
-var star = qmark + '*?'
+        return { pkg: pkg, dir: dir };
+    }
 
-// ** 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 loadAsDirectorySync(x) {
+        var pkgfile = path.join(maybeRealpathSync(realpathSync, x, opts), '/package.json');
+        if (isFile(pkgfile)) {
+            try {
+                var pkg = readPackageSync(readFileSync, pkgfile);
+            } catch (e) {}
 
-// not a ^ or / followed by a dot,
-// followed by anything, any number of times.
-var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+            if (pkg && opts.packageFilter) {
+                // v2 will pass pkgfile
+                pkg = opts.packageFilter(pkg, /*pkgfile,*/ x); // eslint-disable-line spaced-comment
+            }
 
-// characters that need to be escaped in RegExp.
-var reSpecials = charSet('().*{}+?[]^$\\!')
+            if (pkg && 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) {}
+            }
+        }
 
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
-}
+        return loadAsFileSync(path.join(x, '/index'));
+    }
 
-// normalizes slashes.
-var slashSplit = /\/+/
+    function loadNodeModulesSync(x, start) {
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        var dirs = packageIterator ? packageIterator(x, start, thunk, opts) : thunk();
 
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
-  }
-}
+        for (var i = 0; i < dirs.length; i++) {
+            var dir = dirs[i];
+            if (isDirectory(path.dirname(dir))) {
+                var m = loadAsFileSync(dir);
+                if (m) return m;
+                var n = loadAsDirectorySync(dir);
+                if (n) return n;
+            }
+        }
+    }
+};
 
-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
+/***/ "../../node_modules/restore-cursor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  var m = function minimatch (p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options))
-  }
+"use strict";
 
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
-  }
+const onetime = __webpack_require__("../../node_modules/onetime/index.js");
+const signalExit = __webpack_require__("../../node_modules/signal-exit/index.js");
 
-  return m
-}
+module.exports = onetime(() => {
+	signalExit(() => {
+		process.stderr.write('\u001B[?25h');
+	}, {alwaysLast: true});
+});
 
-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 = {}
+/***/ "../../node_modules/reusify/reusify.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
-  }
+"use strict";
 
-  // "" only matches ""
-  if (pattern.trim() === '') return p === ''
 
-  return new Minimatch(pattern, options).match(p)
-}
+function reusify (Constructor) {
+  var head = new Constructor()
+  var tail = head
 
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
-  }
+  function get () {
+    var current = head
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+    if (current.next) {
+      head = current.next
+    } else {
+      head = new Constructor()
+      tail = head
+    }
 
-  if (!options) options = {}
-  pattern = pattern.trim()
+    current.next = null
 
-  // windows support: need to use /, not \
-  if (path.sep !== '/') {
-    pattern = pattern.split(path.sep).join('/')
+    return current
   }
 
-  this.options = options
-  this.set = []
-  this.pattern = pattern
-  this.regexp = null
-  this.negate = false
-  this.comment = false
-  this.empty = false
+  function release (obj) {
+    tail.next = obj
+    tail = obj
+  }
 
-  // make the set of regexps etc.
-  this.make()
+  return {
+    get: get,
+    release: release
+  }
 }
 
-Minimatch.prototype.debug = function () {}
+module.exports = reusify
 
-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
-  }
+/***/ "../../node_modules/rimraf/rimraf.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // step 1: figure out negation, etc.
-  this.parseNegate()
+const assert = __webpack_require__("assert")
+const path = __webpack_require__("path")
+const fs = __webpack_require__("fs")
+let glob = undefined
+try {
+  glob = __webpack_require__("../../node_modules/glob/glob.js")
+} catch (_err) {
+  // treat glob as optional.
+}
 
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
+const defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
-  if (options.debug) this.debug = console.error
+// for EMFILE handling
+let timeout = 0
 
-  this.debug(this.pattern, set)
+const isWindows = (process.platform === "win32")
 
-  // 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)
+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]
   })
 
-  this.debug(this.pattern, set)
+  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
+}
 
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
+const rimraf = (p, options, cb) => {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-  this.debug(this.pattern, set)
+  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')
 
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
-  })
+  defaults(options)
 
-  this.debug(this.pattern, set)
+  let busyTries = 0
+  let errState = null
+  let n = 0
 
-  this.set = set
-}
+  const next = (er) => {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-Minimatch.prototype.parseNegate = parseNegate
-function parseNegate () {
-  var pattern = this.pattern
-  var negate = false
-  var options = this.options
-  var negateOffset = 0
-
-  if (options.nonegate) return
+  const afterGlob = (er, results) => {
+    if (er)
+      return cb(er)
 
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
-  }
+    n = results.length
+    if (n === 0)
+      return cb()
 
-  if (negateOffset) this.pattern = pattern.substr(negateOffset)
-  this.negate = negate
-}
+    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)
+          }
 
-// 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)
-}
+          // this one won't happen if graceful-fs is used.
+          if (er.code === "EMFILE" && timeout < options.emfileWait) {
+            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
+          }
 
-Minimatch.prototype.braceExpand = braceExpand
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
-    } else {
-      options = {}
-    }
+        timeout = 0
+        next(er)
+      }
+      rimraf_(p, options, CB)
+    })
   }
 
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern')
-  }
+  options.lstat(p, (er, stat) => {
+    if (!er)
+      return afterGlob(null, [p])
 
-  if (options.nobrace ||
-    !pattern.match(/\{.*\}/)) {
-    // shortcut. no need to expand.
-    return [pattern]
-  }
+    glob(p, options.glob, afterGlob)
+  })
 
-  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 |.
+// 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
 //
-// 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')
-  }
+// 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')
 
-  var options = this.options
+  // 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)
 
-  // shortcuts
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR
-  if (pattern === '') return ''
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
 
-  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 (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
 
-  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
+    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)
       }
-      self.debug('clearStateChar %j %j', stateChar, re)
-      stateChar = false
-    }
+      return cb(er)
+    })
+  })
+}
+
+const fixWinEPERM = (p, options, er, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  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)
+      })
+  })
+}
+
+const fixWinEPERMSync = (p, options, er) => {
+  assert(p)
+  assert(options)
+
+  try {
+    options.chmodSync(p, 0o666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
   }
 
-  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)
+  let stats
+  try {
+    stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
-    }
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
 
-    switch (c) {
-      case '/':
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
+const rmdir = (p, options, originalEr, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
+  // 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)
+  })
+}
 
-      // 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)
+const rmkids = (p, options, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-        // 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
-        }
+  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)
+      })
+    })
+  })
+}
 
-        // 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
+// 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)
 
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
-        }
+  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')
 
-        if (!stateChar) {
-          re += '\\('
-          continue
-        }
+  let results
 
-        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
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
+  }
 
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
-        }
+  if (!results.length)
+    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
+  for (let i = 0; i < results.length; i++) {
+    const p = results[i]
 
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
-        }
+    let st
+    try {
+      st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
 
-        clearStateChar()
-        re += '|'
-      continue
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
+    }
 
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
+    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
 
-        if (inClass) {
-          re += '\\' + c
-          continue
-        }
+      rmdirSync(p, options, er)
+    }
+  }
+}
 
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
+const rmdirSync = (p, options, originalEr) => {
+  assert(p)
+  assert(options)
 
-      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
-        }
+  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)
+  }
+}
 
-        // 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
-          }
-        }
+const rmkidsSync = (p, options) => {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
 
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
+  // 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)
+}
 
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
-        }
 
-        re += c
+/***/ }),
 
-    } // switch
-  } // for
+/***/ "../../node_modules/run-parallel/index.js":
+/***/ (function(module, exports) {
 
-  // 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 = '\\'
-      }
+module.exports = runParallel
 
-      // 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 + '|'
-    })
+function runParallel (tasks, cb) {
+  var results, pending, keys
+  var isSync = true
 
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
+  if (Array.isArray(tasks)) {
+    results = []
+    pending = tasks.length
+  } else {
+    keys = Object.keys(tasks)
+    results = {}
+    pending = keys.length
+  }
 
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  function done (err) {
+    function end () {
+      if (cb) cb(err, results)
+      cb = null
+    }
+    if (isSync) process.nextTick(end)
+    else end()
   }
 
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
+  function each (i, err, result) {
+    results[i] = result
+    if (--pending === 0 || err) {
+      done(err)
+    }
   }
 
-  // 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 (!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) })
+    })
   }
 
-  // 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]
+  isSync = false
+}
 
-    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
+/***/ "../../node_modules/rxjs/dist/esm5/index.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
-    }
-    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
-    re = newRe
-  }
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-  // 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
-  }
+/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-  if (addPatternStart) {
-    re = patternStart + re
-  }
+/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-  // parsing just a piece of a larger pattern.
-  if (isSub === SUBPARSE) {
-    return [re, hasMagic]
-  }
+/* harmony import */ var _internal_observable_dom_animationFrames__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/dom/animationFrames.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrames", function() { return _internal_observable_dom_animationFrames__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-  // 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)
-  }
+/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["a"]; });
 
-  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('$.')
-  }
+/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/BehaviorSubject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["a"]; });
 
-  regExp._glob = pattern
-  regExp._src = re
+/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["a"]; });
 
-  return regExp
-}
+/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["a"]; });
 
-minimatch.makeRe = function (pattern, options) {
-  return new Minimatch(pattern, options || {}).makeRe()
-}
+/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/asap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["a"]; });
 
-Minimatch.prototype.makeRe = makeRe
-function makeRe () {
-  if (this.regexp || this.regexp === false) return this.regexp
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["b"]; });
 
-  // 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
+/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "async", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["a"]; });
 
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
-  }
-  var options = this.options
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["b"]; });
 
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
+/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/queue.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["a"]; });
 
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["b"]; });
 
-  // must match entire pattern
-  // ending in a * or ** will make it less strict.
-  re = '^(?:' + re + ')$'
+/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrame.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["a"]; });
 
-  // can match anything, as long as it's not this.
-  if (this.negate) re = '^(?!' + re + ').*$'
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["b"]; });
 
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) {
-    this.regexp = false
-  }
-  return this.regexp
-}
+/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/VirtualTimeScheduler.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["b"]; });
 
-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
-}
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["a"]; });
 
-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 === ''
+/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Scheduler.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["a"]; });
 
-  if (f === '/' && partial) return true
+/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["b"]; });
 
-  var options = this.options
+/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["b"]; });
 
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
+/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Notification.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["a"]; });
 
-  // treat the test path as a set of pathparts.
-  f = f.split(slashSplit)
-  this.debug(this.pattern, 'split', f)
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["b"]; });
 
-  // 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.
+/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["a"]; });
 
-  var set = this.set
-  this.debug(this.pattern, 'set', set)
+/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["a"]; });
 
-  // 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
-  }
+/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["a"]; });
 
-  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
-    }
-  }
+/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isObservable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["a"]; });
 
-  // didn't get any hits.  this is success if it's a negative
-  // pattern, failure otherwise.
-  if (options.flipNegate) return false
-  return this.negate
-}
+/* harmony import */ var _internal_lastValueFrom__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/lastValueFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "lastValueFrom", function() { return _internal_lastValueFrom__WEBPACK_IMPORTED_MODULE_21__["a"]; });
 
-// 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
+/* harmony import */ var _internal_firstValueFrom__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/firstValueFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "firstValueFrom", function() { return _internal_firstValueFrom__WEBPACK_IMPORTED_MODULE_22__["a"]; });
 
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
+/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ArgumentOutOfRangeError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_23__["a"]; });
 
-  this.debug('matchOne', file.length, pattern.length)
+/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_24__["a"]; });
 
-  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]
+/* harmony import */ var _internal_util_NotFoundError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/NotFoundError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotFoundError", function() { return _internal_util_NotFoundError__WEBPACK_IMPORTED_MODULE_25__["a"]; });
 
-    this.debug(pattern, p, f)
+/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ObjectUnsubscribedError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_26__["a"]; });
 
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    if (p === false) return false
+/* harmony import */ var _internal_util_SequenceError__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/SequenceError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "SequenceError", function() { return _internal_util_SequenceError__WEBPACK_IMPORTED_MODULE_27__["a"]; });
 
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__["a"]; });
 
-      // "**"
-      // 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
-      }
+/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_29__["a"]; });
 
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
+/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindCallback.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_30__["a"]; });
 
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindNodeCallback.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_31__["a"]; });
 
-        // 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
-          }
+/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_32__["a"]; });
 
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
-        }
-      }
+/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_33__["a"]; });
 
-      // 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
-    }
+/* harmony import */ var _internal_observable_connectable__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/connectable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connectable", function() { return _internal_observable_connectable__WEBPACK_IMPORTED_MODULE_34__["a"]; });
 
-    // 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)
-    }
+/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_35__["a"]; });
 
-    if (!hit) return false
-  }
+/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__["b"]; });
 
-  // 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/*
+/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/forkJoin.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_37__["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
-  }
+/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_38__["a"]; });
 
-  // should be unreachable.
-  throw new Error('wtf?')
-}
+/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_39__["a"]; });
 
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
-}
+/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/fromEventPattern.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_40__["a"]; });
 
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
-}
+/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/generate.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_41__["a"]; });
 
+/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/iif.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_42__["a"]; });
 
-/***/ }),
-/* 61 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/interval.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_43__["a"]; });
 
-var wrappy = __webpack_require__(123)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
+/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/merge.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_44__["a"]; });
 
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
+/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/never.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__["b"]; });
 
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
+/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/of.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_46__["a"]; });
 
-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
-}
+/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/onErrorResumeNext.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_47__["a"]; });
 
-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
-}
+/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/pairs.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_48__["a"]; });
 
+/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/partition.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_49__["a"]; });
 
-/***/ }),
-/* 62 */,
-/* 63 */
-/***/ (function(module, exports) {
+/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/race.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_50__["a"]; });
 
-module.exports = __webpack_require__(532);
+/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/range.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_51__["a"]; });
 
-/***/ }),
-/* 64 */,
-/* 65 */,
-/* 66 */,
-/* 67 */
-/***/ (function(module, exports) {
+/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/throwError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_52__["a"]; });
 
-// 7.2.1 RequireObjectCoercible(argument)
-module.exports = function (it) {
-  if (it == undefined) throw TypeError("Can't call method on  " + it);
-  return it;
-};
+/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_53__["a"]; });
 
+/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/using.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_54__["a"]; });
 
-/***/ }),
-/* 68 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/zip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_55__["a"]; });
 
-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) : {};
-};
+/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduled.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_56__["a"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__["a"]; });
 
-/***/ }),
-/* 69 */
-/***/ (function(module, exports) {
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__["a"]; });
 
-module.exports = true;
+/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_57__["a"]; });
 
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/audit.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_58__["a"]; });
 
-/***/ }),
-/* 70 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/auditTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_59__["a"]; });
 
-"use strict";
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/buffer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_60__["a"]; });
 
-// 25.4.1.5 NewPromiseCapability(C)
-var aFunction = __webpack_require__(46);
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_61__["a"]; });
 
-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);
-}
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_62__["a"]; });
 
-module.exports.f = function (C) {
-  return new PromiseCapability(C);
-};
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_63__["a"]; });
 
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_64__["a"]; });
 
-/***/ }),
-/* 71 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/catchError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_65__["a"]; });
 
-var def = __webpack_require__(50).f;
-var has = __webpack_require__(49);
-var TAG = __webpack_require__(13)('toStringTag');
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_66__["a"]; });
 
-module.exports = function (it, tag, stat) {
-  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
-};
+/* harmony import */ var _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_67__["a"]; });
 
+/* harmony import */ var _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_68__["a"]; });
 
-/***/ }),
-/* 72 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_69__["a"]; });
 
-var shared = __webpack_require__(107)('keys');
-var uid = __webpack_require__(111);
-module.exports = function (key) {
-  return shared[key] || (shared[key] = uid(key));
-};
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_70__["a"]; });
 
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_71__["a"]; });
 
-/***/ }),
-/* 73 */
-/***/ (function(module, exports) {
+/* harmony import */ var _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_72__["a"]; });
 
-// 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);
-};
+/* harmony import */ var _internal_operators_connect__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return _internal_operators_connect__WEBPACK_IMPORTED_MODULE_73__["a"]; });
 
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/count.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_74__["a"]; });
 
-/***/ }),
-/* 74 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_75__["a"]; });
 
-// 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));
-};
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounceTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_76__["a"]; });
 
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_77__["a"]; });
 
-/***/ }),
-/* 75 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_78__["a"]; });
 
-// 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.
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_79__["a"]; });
 
-module.exports = glob
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/dematerialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_80__["a"]; });
 
-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
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinct.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_81__["a"]; });
 
-var once = __webpack_require__(61)
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_82__["a"]; });
 
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilKeyChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_83__["a"]; });
 
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
-  }
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/elementAt.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_84__["a"]; });
 
-  return new Glob(pattern, options, cb)
-}
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/endWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_85__["a"]; });
 
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/every.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_86__["a"]; });
 
-// old api surface
-glob.glob = glob
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaust.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_87__["a"]; });
 
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
-  }
+/* harmony import */ var _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_88__["a"]; });
 
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
-  }
-  return origin
-}
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_89__["a"]; });
 
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/expand.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_90__["a"]; });
 
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
+/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_91__["a"]; });
 
-  if (!pattern)
-    return false
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/finalize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_92__["a"]; });
 
-  if (set.length > 1)
-    return true
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/find.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_93__["b"]; });
 
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
-  }
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/findIndex.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_94__["a"]; });
 
-  return false
-}
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/first.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_95__["a"]; });
 
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
-  }
+/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/groupBy.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_96__["a"]; });
 
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
-  }
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_97__["a"]; });
 
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/isEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_98__["a"]; });
 
-  setopts(this, pattern, options)
-  this._didRealPath = false
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/last.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_99__["a"]; });
 
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
+/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_100__["a"]; });
 
-  // 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)
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_101__["a"]; });
 
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
-  }
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/materialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_102__["a"]; });
 
-  var self = this
-  this._processing = 0
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_103__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/max.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_103__["a"]; });
 
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
+/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_104__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_104__["a"]; });
 
-  if (this.noprocess)
-    return this
+/* harmony import */ var _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_105__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/flatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_105__["a"]; });
 
-  if (n === 0)
-    return done()
+/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_106__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_106__["a"]; });
 
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
-  }
-  sync = false
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_107__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_107__["a"]; });
 
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
-      } else {
-        self._finish()
-      }
-    }
-  }
-}
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_108__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_108__["a"]; });
 
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
+/* harmony import */ var _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_109__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_109__["a"]; });
 
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_110__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/min.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_110__["a"]; });
 
-  common.finish(this)
-  this.emit('end', this.found)
-}
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_111__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_111__["a"]; });
 
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
+/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_112__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_112__["a"]; });
 
-  this._didRealpath = true
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_113__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pairwise.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_113__["a"]; });
 
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_114__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pluck.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_114__["a"]; });
 
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_115__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publish.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_115__["a"]; });
 
-  function next () {
-    if (--n === 0)
-      self._finish()
-  }
-}
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_116__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishBehavior.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_116__["a"]; });
 
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_117__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_117__["a"]; });
 
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_118__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_118__["a"]; });
 
-  if (n === 0)
-    return cb()
+/* harmony import */ var _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_119__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_119__["a"]; });
 
-  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
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_120__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_120__["a"]; });
 
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
-      }
-    })
-  })
-}
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_121__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_121__["a"]; });
 
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_122__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeatWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_122__["a"]; });
 
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_123__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retry.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_123__["a"]; });
 
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_124__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retryWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_124__["a"]; });
 
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
-  }
-}
+/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_125__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_125__["a"]; });
 
-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])
-      }
-    }
-  }
-}
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_126__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sample.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_126__["a"]; });
 
-Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
-  assert(this instanceof Glob)
-  assert(typeof cb === 'function')
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_127__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sampleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_127__["a"]; });
 
-  if (this.aborted)
-    return
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_128__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_128__["a"]; });
 
-  this._processing++
-  if (this.paused) {
-    this._processQueue.push([pattern, index, inGlobStar, cb])
-    return
-  }
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_129__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sequenceEqual.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_129__["a"]; });
 
-  //console.error('PROCESS %d', this._processing, pattern)
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_130__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/share.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_130__["a"]; });
 
-  // 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.
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_131__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/shareReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_131__["a"]; });
 
-  // 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
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_132__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/single.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_132__["a"]; });
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_133__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_133__["a"]; });
 
-    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
-  }
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_134__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_134__["a"]; });
 
-  var remain = pattern.slice(n)
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_135__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_135__["a"]; });
 
-  // 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
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_136__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_136__["a"]; });
 
-  var abs = this._makeAbs(read)
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_137__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/startWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_137__["a"]; });
 
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_138__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_138__["a"]; });
 
-  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)
-}
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_139__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_139__["a"]; });
 
-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)
-  })
-}
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_140__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_140__["a"]; });
 
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_141__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_141__["a"]; });
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
+/* harmony import */ var _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_142__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_142__["a"]; });
 
-  // 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) === '.'
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_143__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_143__["a"]; });
 
-  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)
-    }
-  }
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_144__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_144__["a"]; });
 
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_145__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_145__["a"]; });
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_146__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_146__["a"]; });
 
-  // 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.
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_147__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/tap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_147__["a"]; });
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_148__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_148__["b"]; });
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_149__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_149__["a"]; });
 
-      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()
-  }
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_150__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_150__["a"]; });
 
-  // 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()
-}
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_151__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeInterval.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_151__["a"]; });
 
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__["b"]; });
 
-  if (isIgnored(this, e))
-    return
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_152__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeoutWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_152__["a"]; });
 
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
-  }
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_153__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timestamp.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_153__["a"]; });
 
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_154__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_154__["a"]; });
 
-  if (this.mark)
-    e = this._mark(e)
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_155__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/window.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_155__["a"]; });
 
-  if (this.absolute)
-    e = abs
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_156__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_156__["a"]; });
 
-  if (this.matches[index][e])
-    return
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_157__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_157__["a"]; });
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_158__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_158__["a"]; });
 
-  this.matches[index][e] = true
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_159__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_159__["a"]; });
 
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_160__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_160__["a"]; });
 
-  this.emit('match', e)
-}
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_161__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_161__["a"]; });
 
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
+/* harmony import */ var _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_162__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_162__["a"]; });
 
-  // 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)
-}
 
 
-/***/ }),
-/* 76 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-function posix(path) {
-	return path.charAt(0) === '/';
-}
 
-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);
-}
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
 
 
-/***/ }),
-/* 77 */,
-/* 78 */,
-/* 79 */
-/***/ (function(module, exports) {
 
-module.exports = __webpack_require__(244);
 
-/***/ }),
-/* 80 */,
-/* 81 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 
-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) };
-};
 
-var _util;
 
-function _load_util() {
-  return _util = _interopRequireDefault(__webpack_require__(2));
-}
 
-var _invariant;
 
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(7));
-}
 
-var _stripBom;
 
-function _load_stripBom() {
-  return _stripBom = _interopRequireDefault(__webpack_require__(122));
-}
 
-var _constants;
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
 
-var _errors;
 
-function _load_errors() {
-  return _errors = __webpack_require__(4);
-}
 
-var _map;
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/* eslint quotes: 0 */
 
-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'
-};
 
-const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
 
-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 };
-  }
 
-  while (input.length) {
-    let chop = 0;
 
-    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 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 (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 = '';
 
-      for (let i = 0;; i++) {
-        const currentChar = input[i];
-        val += currentChar;
 
-        if (i > 0 && currentChar === '"') {
-          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
-          if (!isEscaped) {
-            break;
-          }
-        }
-      }
 
-      chop = val.length;
 
-      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;
 
-      yield buildToken(TOKEN_TYPES.string, name);
-    } else {
-      yield buildToken(TOKEN_TYPES.invalid);
-    }
 
-    if (!chop) {
-      // will trigger infinite recursion
-      yield buildToken(TOKEN_TYPES.invalid);
-    }
 
-    col += chop;
-    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
-    input = input.slice(chop);
-  }
 
-  yield buildToken(TOKEN_TYPES.eof);
-}
 
-class Parser {
-  constructor(input, fileLoc = 'lockfile') {
-    this.comments = [];
-    this.tokens = tokenise(input);
-    this.fileLoc = fileLoc;
-  }
 
-  onComment(token) {
-    const value = token.value;
-    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
 
-    const comment = value.trim();
 
-    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.`);
-      }
-    }
 
-    this.comments.push(comment);
-  }
 
-  next() {
-    const item = this.tokens.next();
-    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
 
-    const done = item.done,
-          value = item.value;
 
-    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;
-    }
-  }
 
-  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();
-    }
-  }
 
-  eat(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
-      return true;
-    } else {
-      return false;
-    }
-  }
 
-  parse(indent = 0) {
-    const obj = (0, (_map || _load_map()).default)();
 
-    while (true) {
-      const propToken = this.token;
 
-      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;
-        }
 
-        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');
 
-        const keys = [key];
-        this.next();
 
-        // 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');
-          }
 
-          const key = keyToken.value;
-          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
-          keys.push(key);
-          this.next();
-        }
 
-        const valToken = this.token;
 
-        if (valToken.type === TOKEN_TYPES.colon) {
-          // object
-          this.next();
 
-          // parse object
-          const val = this.parse(indent + 1);
 
-          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;
-            }
 
-            const key = _ref;
 
-            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;
-            }
 
-            const key = _ref2;
 
-            obj[key] = valToken.value;
-          }
 
-          this.next();
-        } else {
-          this.unexpected('Invalid value type');
-        }
-      } else {
-        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
-      }
-    }
 
-    return obj;
-  }
-}
 
-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;
 
-  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);
-        }
-      }
-
-      // 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')];
-}
-
-/**
- * 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);
-}
-
-/**
- * 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;
-    }
-  }
-}
 
-/***/ }),
-/* 82 */,
-/* 83 */,
-/* 84 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 
-var _map;
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const debug = __webpack_require__(212)('yarn');
 
-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);
-  }
 
-  stillActive() {
-    if (this.stuckTimer) {
-      clearTimeout(this.stuckTimer);
-    }
 
-    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();
-  }
 
-  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]}`);
-    }
-  }
 
-  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);
-      }
-    });
-  }
 
-  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();
-    };
+//# sourceMappingURL=index.js.map
 
-    const run = () => {
-      this.running[key] = true;
-      this.runningCount++;
+/***/ }),
 
-      factory().then(function (val) {
-        resolve(val);
-        next();
-        return null;
-      }).catch(function (err) {
-        reject(err);
-        next();
-      });
-    };
+/***/ "../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    this.maybePushConcurrencyQueue(run);
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncSubject; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
 
-  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();
-      }
+var AsyncSubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsyncSubject, _super);
+    function AsyncSubject() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this._value = null;
+        _this._hasValue = false;
+        _this._isComplete = false;
+        return _this;
     }
-  }
-}
-exports.default = BlockingQueue;
-
-/***/ }),
-/* 85 */
-/***/ (function(module, exports) {
-
-module.exports = function (exec) {
-  try {
-    return !!exec();
-  } catch (e) {
-    return true;
-  }
-};
+    AsyncSubject.prototype._checkFinalizedStatuses = function (subscriber) {
+        var _a = this, hasError = _a.hasError, _hasValue = _a._hasValue, _value = _a._value, thrownError = _a.thrownError, isStopped = _a.isStopped, _isComplete = _a._isComplete;
+        if (hasError) {
+            subscriber.error(thrownError);
+        }
+        else if (isStopped || _isComplete) {
+            _hasValue && subscriber.next(_value);
+            subscriber.complete();
+        }
+    };
+    AsyncSubject.prototype.next = function (value) {
+        if (!this.isStopped) {
+            this._value = value;
+            this._hasValue = true;
+        }
+    };
+    AsyncSubject.prototype.complete = function () {
+        var _a = this, _hasValue = _a._hasValue, _value = _a._value, _isComplete = _a._isComplete;
+        if (!_isComplete) {
+            this._isComplete = true;
+            _hasValue && _super.prototype.next.call(this, _value);
+            _super.prototype.complete.call(this);
+        }
+    };
+    return AsyncSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]));
 
+//# sourceMappingURL=AsyncSubject.js.map
 
 /***/ }),
-/* 86 */,
-/* 87 */,
-/* 88 */,
-/* 89 */,
-/* 90 */,
-/* 91 */,
-/* 92 */,
-/* 93 */,
-/* 94 */,
-/* 95 */,
-/* 96 */,
-/* 97 */,
-/* 98 */,
-/* 99 */,
-/* 100 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 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;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/BehaviorSubject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BehaviorSubject; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
 
-/***/ }),
-/* 101 */
-/***/ (function(module, exports) {
 
-// IE 8- don't enum bug keys
-module.exports = (
-  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
-).split(',');
+var BehaviorSubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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: false,
+        configurable: true
+    });
+    BehaviorSubject.prototype._subscribe = function (subscriber) {
+        var subscription = _super.prototype._subscribe.call(this, subscriber);
+        !subscription.closed && subscriber.next(this._value);
+        return subscription;
+    };
+    BehaviorSubject.prototype.getValue = function () {
+        var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, _value = _a._value;
+        if (hasError) {
+            throw thrownError;
+        }
+        this._throwIfClosed();
+        return _value;
+    };
+    BehaviorSubject.prototype.next = function (value) {
+        _super.prototype.next.call(this, (this._value = value));
+    };
+    return BehaviorSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]));
 
+//# sourceMappingURL=BehaviorSubject.js.map
 
 /***/ }),
-/* 102 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var document = __webpack_require__(11).document;
-module.exports = document && document.documentElement;
-
-
-/***/ }),
-/* 103 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Notification.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return NotificationKind; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Notification; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return observeNotification; });
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/of.js");
+/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/throwError.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-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);
+
+var NotificationKind;
+(function (NotificationKind) {
+    NotificationKind["NEXT"] = "N";
+    NotificationKind["ERROR"] = "E";
+    NotificationKind["COMPLETE"] = "C";
+})(NotificationKind || (NotificationKind = {}));
+var Notification = (function () {
+    function Notification(kind, value, error) {
+        this.kind = kind;
+        this.value = value;
+        this.error = error;
+        this.hasValue = kind === 'N';
     }
-  }
-  // 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
+    Notification.prototype.observe = function (observer) {
+        return observeNotification(this, observer);
     };
-    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;
-};
-
-
-/***/ }),
-/* 104 */
-/***/ (function(module, exports) {
-
-module.exports = function (exec) {
-  try {
-    return { e: false, v: exec() };
-  } catch (e) {
-    return { e: true, v: e };
-  }
-};
+    Notification.prototype.do = function (nextHandler, errorHandler, completeHandler) {
+        var _a = this, kind = _a.kind, value = _a.value, error = _a.error;
+        return kind === 'N' ? nextHandler === null || nextHandler === void 0 ? void 0 : nextHandler(value) : kind === 'E' ? errorHandler === null || errorHandler === void 0 ? void 0 : errorHandler(error) : completeHandler === null || completeHandler === void 0 ? void 0 : completeHandler();
+    };
+    Notification.prototype.accept = function (nextOrObserver, error, complete) {
+        var _a;
+        return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__[/* isFunction */ "a"])((_a = nextOrObserver) === null || _a === void 0 ? void 0 : _a.next)
+            ? this.observe(nextOrObserver)
+            : this.do(nextOrObserver, error, complete);
+    };
+    Notification.prototype.toObservable = function () {
+        var _a = this, kind = _a.kind, value = _a.value, error = _a.error;
+        var result = kind === 'N'
+            ?
+                Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__[/* of */ "a"])(value)
+            :
+                kind === 'E'
+                    ?
+                        Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__[/* throwError */ "a"])(function () { return error; })
+                    :
+                        kind === 'C'
+                            ?
+                                _observable_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]
+                            :
+                                0;
+        if (!result) {
+            throw new TypeError("Unexpected notification kind " + kind);
+        }
+        return result;
+    };
+    Notification.createNext = function (value) {
+        return new Notification('N', value);
+    };
+    Notification.createError = function (err) {
+        return new Notification('E', undefined, err);
+    };
+    Notification.createComplete = function () {
+        return Notification.completeNotification;
+    };
+    Notification.completeNotification = new Notification('C');
+    return Notification;
+}());
 
+function observeNotification(notification, observer) {
+    var _a, _b, _c;
+    var _d = notification, kind = _d.kind, value = _d.value, error = _d.error;
+    if (typeof kind !== 'string') {
+        throw new TypeError('Invalid notification, missing "kind"');
+    }
+    kind === 'N' ? (_a = observer.next) === null || _a === void 0 ? void 0 : _a.call(observer, value) : kind === 'E' ? (_b = observer.error) === null || _b === void 0 ? void 0 : _b.call(observer, error) : (_c = observer.complete) === null || _c === void 0 ? void 0 : _c.call(observer);
+}
+//# sourceMappingURL=Notification.js.map
 
 /***/ }),
-/* 105 */
-/***/ (function(module, exports, __webpack_require__) {
-
-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;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/NotificationFactories.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return COMPLETE_NOTIFICATION; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return errorNotification; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return nextNotification; });
+/* unused harmony export createNotification */
+var COMPLETE_NOTIFICATION = (function () { return createNotification('C', undefined, undefined); })();
+function errorNotification(error) {
+    return createNotification('E', undefined, error);
+}
+function nextNotification(value) {
+    return createNotification('N', value, undefined);
+}
+function createNotification(kind, value, error) {
+    return {
+        kind: kind,
+        value: value,
+        error: error,
+    };
+}
+//# sourceMappingURL=NotificationFactories.js.map
 
 /***/ }),
-/* 106 */
-/***/ (function(module, exports) {
 
-module.exports = function (bitmap, value) {
-  return {
-    enumerable: !(bitmap & 1),
-    configurable: !(bitmap & 2),
-    writable: !(bitmap & 4),
-    value: value
-  };
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Observable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; });
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js");
 
-/***/ }),
-/* 107 */
-/***/ (function(module, exports, __webpack_require__) {
 
-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)'
-});
 
 
-/***/ }),
-/* 108 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// 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);
-};
 
-
-/***/ }),
-/* 109 */
-/***/ (function(module, exports, __webpack_require__) {
-
-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);
+var Observable = (function () {
+    function Observable(subscribe) {
+        if (subscribe) {
+            this._subscribe = subscribe;
+        }
+    }
+    Observable.prototype.lift = function (operator) {
+        var observable = new Observable();
+        observable.source = this;
+        observable.operator = operator;
+        return observable;
     };
-    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));
+    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
+        var _this = this;
+        var subscriber = isSubscriber(observerOrNext) ? observerOrNext : new _Subscriber__WEBPACK_IMPORTED_MODULE_0__[/* SafeSubscriber */ "a"](observerOrNext, error, complete);
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_6__[/* errorContext */ "b"])(function () {
+            var _a = _this, operator = _a.operator, source = _a.source;
+            subscriber.add(operator
+                ?
+                    operator.call(subscriber, source)
+                : source
+                    ?
+                        _this._subscribe(subscriber)
+                    :
+                        _this._trySubscribe(subscriber));
+        });
+        return subscriber;
     };
-  // Sphere (JS game engine) Dispatch API
-  } else if (Dispatch && Dispatch.now) {
-    defer = function (id) {
-      Dispatch.now(ctx(run, id, 1));
+    Observable.prototype._trySubscribe = function (sink) {
+        try {
+            return this._subscribe(sink);
+        }
+        catch (err) {
+            sink.error(err);
+        }
     };
-  // 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 + '', '*');
+    Observable.prototype.forEach = function (next, promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var subscriber = new _Subscriber__WEBPACK_IMPORTED_MODULE_0__[/* SafeSubscriber */ "a"]({
+                next: function (value) {
+                    try {
+                        next(value);
+                    }
+                    catch (err) {
+                        reject(err);
+                        subscriber.unsubscribe();
+                    }
+                },
+                error: reject,
+                complete: resolve,
+            });
+            _this.subscribe(subscriber);
+        });
     };
-    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);
-      };
+    Observable.prototype._subscribe = function (subscriber) {
+        var _a;
+        return (_a = this.source) === null || _a === void 0 ? void 0 : _a.subscribe(subscriber);
     };
-  // Rest old browsers
-  } else {
-    defer = function (id) {
-      setTimeout(ctx(run, id, 1), 0);
+    Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__[/* observable */ "a"]] = function () {
+        return this;
     };
-  }
-}
-module.exports = {
-  set: setTask,
-  clear: clearTask
-};
+    Observable.prototype.pipe = function () {
+        var operations = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            operations[_i] = arguments[_i];
+        }
+        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__[/* pipeFromArray */ "b"])(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) {
+    var _a;
+    return (_a = promiseCtor !== null && promiseCtor !== void 0 ? promiseCtor : _config__WEBPACK_IMPORTED_MODULE_4__[/* config */ "a"].Promise) !== null && _a !== void 0 ? _a : Promise;
+}
+function isObserver(value) {
+    return value && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(value.next) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(value.error) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(value.complete);
+}
+function isSubscriber(value) {
+    return (value && value instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__[/* Subscriber */ "b"]) || (isObserver(value) && Object(_Subscription__WEBPACK_IMPORTED_MODULE_1__[/* isSubscription */ "c"])(value));
+}
+//# sourceMappingURL=Observable.js.map
 
 /***/ }),
-/* 110 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 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
-};
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/***/ }),
-/* 111 */
-/***/ (function(module, exports) {
-
-var id = 0;
-var px = Math.random();
-module.exports = function (key) {
-  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ReplaySubject; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js");
 
 
-/***/ }),
-/* 112 */
-/***/ (function(module, exports, __webpack_require__) {
 
+var ReplaySubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(ReplaySubject, _super);
+    function ReplaySubject(_bufferSize, _windowTime, _timestampProvider) {
+        if (_bufferSize === void 0) { _bufferSize = Infinity; }
+        if (_windowTime === void 0) { _windowTime = Infinity; }
+        if (_timestampProvider === void 0) { _timestampProvider = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_2__[/* dateTimestampProvider */ "a"]; }
+        var _this = _super.call(this) || this;
+        _this._bufferSize = _bufferSize;
+        _this._windowTime = _windowTime;
+        _this._timestampProvider = _timestampProvider;
+        _this._buffer = [];
+        _this._infiniteTimeWindow = true;
+        _this._infiniteTimeWindow = _windowTime === Infinity;
+        _this._bufferSize = Math.max(1, _bufferSize);
+        _this._windowTime = Math.max(1, _windowTime);
+        return _this;
+    }
+    ReplaySubject.prototype.next = function (value) {
+        var _a = this, isStopped = _a.isStopped, _buffer = _a._buffer, _infiniteTimeWindow = _a._infiniteTimeWindow, _timestampProvider = _a._timestampProvider, _windowTime = _a._windowTime;
+        if (!isStopped) {
+            _buffer.push(value);
+            !_infiniteTimeWindow && _buffer.push(_timestampProvider.now() + _windowTime);
+        }
+        this._trimBuffer();
+        _super.prototype.next.call(this, value);
+    };
+    ReplaySubject.prototype._subscribe = function (subscriber) {
+        this._throwIfClosed();
+        this._trimBuffer();
+        var subscription = this._innerSubscribe(subscriber);
+        var _a = this, _infiniteTimeWindow = _a._infiniteTimeWindow, _buffer = _a._buffer;
+        var copy = _buffer.slice();
+        for (var i = 0; i < copy.length && !subscriber.closed; i += _infiniteTimeWindow ? 1 : 2) {
+            subscriber.next(copy[i]);
+        }
+        this._checkFinalizedStatuses(subscriber);
+        return subscription;
+    };
+    ReplaySubject.prototype._trimBuffer = function () {
+        var _a = this, _bufferSize = _a._bufferSize, _timestampProvider = _a._timestampProvider, _buffer = _a._buffer, _infiniteTimeWindow = _a._infiniteTimeWindow;
+        var adjustedBufferSize = (_infiniteTimeWindow ? 1 : 2) * _bufferSize;
+        _bufferSize < Infinity && adjustedBufferSize < _buffer.length && _buffer.splice(0, _buffer.length - adjustedBufferSize);
+        if (!_infiniteTimeWindow) {
+            var now = _timestampProvider.now();
+            var last = 0;
+            for (var i = 1; i < _buffer.length && _buffer[i] <= now; i += 2) {
+                last = i;
+            }
+            last && _buffer.splice(0, last + 1);
+        }
+    };
+    return ReplaySubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]));
 
-/**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+//# sourceMappingURL=ReplaySubject.js.map
 
-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);
+/***/ }),
 
-/**
- * Active `debug` instances.
- */
-exports.instances = [];
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Scheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * The currently active debug mode names, and names to skip.
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Scheduler; });
+/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js");
 
-exports.names = [];
-exports.skips = [];
+var Scheduler = (function () {
+    function Scheduler(schedulerActionCtor, now) {
+        if (now === void 0) { now = Scheduler.now; }
+        this.schedulerActionCtor = schedulerActionCtor;
+        this.now = now;
+    }
+    Scheduler.prototype.schedule = function (work, delay, state) {
+        if (delay === void 0) { delay = 0; }
+        return new this.schedulerActionCtor(this, work).schedule(state, delay);
+    };
+    Scheduler.now = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__[/* dateTimestampProvider */ "a"].now;
+    return Scheduler;
+}());
 
-/**
- * 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".
- */
+//# sourceMappingURL=Scheduler.js.map
 
-exports.formatters = {};
+/***/ }),
 
-/**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Subject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function selectColor(namespace) {
-  var hash = 0, i;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subject; });
+/* unused harmony export AnonymousSubject */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ObjectUnsubscribedError.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
+/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js");
 
-  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 Subject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(Subject, _super);
+    function Subject() {
+        var _this = _super.call(this) || this;
+        _this.closed = false;
+        _this.currentObservers = null;
+        _this.observers = [];
+        _this.isStopped = false;
+        _this.hasError = false;
+        _this.thrownError = null;
+        return _this;
+    }
+    Subject.prototype.lift = function (operator) {
+        var subject = new AnonymousSubject(this, this);
+        subject.operator = operator;
+        return subject;
+    };
+    Subject.prototype._throwIfClosed = function () {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_3__[/* ObjectUnsubscribedError */ "a"]();
+        }
+    };
+    Subject.prototype.next = function (value) {
+        var _this = this;
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__[/* errorContext */ "b"])(function () {
+            var e_1, _a;
+            _this._throwIfClosed();
+            if (!_this.isStopped) {
+                if (!_this.currentObservers) {
+                    _this.currentObservers = Array.from(_this.observers);
+                }
+                try {
+                    for (var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(_this.currentObservers), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var observer = _c.value;
+                        observer.next(value);
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+            }
+        });
+    };
+    Subject.prototype.error = function (err) {
+        var _this = this;
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__[/* errorContext */ "b"])(function () {
+            _this._throwIfClosed();
+            if (!_this.isStopped) {
+                _this.hasError = _this.isStopped = true;
+                _this.thrownError = err;
+                var observers = _this.observers;
+                while (observers.length) {
+                    observers.shift().error(err);
+                }
+            }
+        });
+    };
+    Subject.prototype.complete = function () {
+        var _this = this;
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__[/* errorContext */ "b"])(function () {
+            _this._throwIfClosed();
+            if (!_this.isStopped) {
+                _this.isStopped = true;
+                var observers = _this.observers;
+                while (observers.length) {
+                    observers.shift().complete();
+                }
+            }
+        });
+    };
+    Subject.prototype.unsubscribe = function () {
+        this.isStopped = this.closed = true;
+        this.observers = this.currentObservers = null;
+    };
+    Object.defineProperty(Subject.prototype, "observed", {
+        get: function () {
+            var _a;
+            return ((_a = this.observers) === null || _a === void 0 ? void 0 : _a.length) > 0;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Subject.prototype._trySubscribe = function (subscriber) {
+        this._throwIfClosed();
+        return _super.prototype._trySubscribe.call(this, subscriber);
+    };
+    Subject.prototype._subscribe = function (subscriber) {
+        this._throwIfClosed();
+        this._checkFinalizedStatuses(subscriber);
+        return this._innerSubscribe(subscriber);
+    };
+    Subject.prototype._innerSubscribe = function (subscriber) {
+        var _this = this;
+        var _a = this, hasError = _a.hasError, isStopped = _a.isStopped, observers = _a.observers;
+        if (hasError || isStopped) {
+            return _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY_SUBSCRIPTION */ "a"];
+        }
+        this.currentObservers = null;
+        observers.push(subscriber);
+        return new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"](function () {
+            _this.currentObservers = null;
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_4__[/* arrRemove */ "a"])(observers, subscriber);
+        });
+    };
+    Subject.prototype._checkFinalizedStatuses = function (subscriber) {
+        var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, isStopped = _a.isStopped;
+        if (hasError) {
+            subscriber.error(thrownError);
+        }
+        else if (isStopped) {
+            subscriber.complete();
+        }
+    };
+    Subject.prototype.asObservable = function () {
+        var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"]();
+        observable.source = this;
+        return observable;
+    };
+    Subject.create = function (destination, source) {
+        return new AnonymousSubject(destination, source);
+    };
+    return Subject;
+}(_Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"]));
 
-    var self = debug;
+var AnonymousSubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 _a, _b;
+        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.next) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+    };
+    AnonymousSubject.prototype.error = function (err) {
+        var _a, _b;
+        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.call(_a, err);
+    };
+    AnonymousSubject.prototype.complete = function () {
+        var _a, _b;
+        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.complete) === null || _b === void 0 ? void 0 : _b.call(_a);
+    };
+    AnonymousSubject.prototype._subscribe = function (subscriber) {
+        var _a, _b;
+        return (_b = (_a = this.source) === null || _a === void 0 ? void 0 : _a.subscribe(subscriber)) !== null && _b !== void 0 ? _b : _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY_SUBSCRIPTION */ "a"];
+    };
+    return AnonymousSubject;
+}(Subject));
 
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
+//# sourceMappingURL=Subject.js.map
 
-    // 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]);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Subscriber.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %O
-      args.unshift('%O');
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return Subscriber; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SafeSubscriber; });
+/* unused harmony export EMPTY_OBSERVER */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony import */ var _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _NotificationFactories__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/NotificationFactories.js");
+/* harmony import */ var _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js");
+/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js");
 
-    // 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;
-  }
-}
+var Subscriber = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(Subscriber, _super);
+    function Subscriber(destination) {
+        var _this = _super.call(this) || this;
+        _this.isStopped = false;
+        if (destination) {
+            _this.destination = destination;
+            if (Object(_Subscription__WEBPACK_IMPORTED_MODULE_2__[/* isSubscription */ "c"])(destination)) {
+                destination.add(_this);
+            }
+        }
+        else {
+            _this.destination = EMPTY_OBSERVER;
+        }
+        return _this;
+    }
+    Subscriber.create = function (next, error, complete) {
+        return new SafeSubscriber(next, error, complete);
+    };
+    Subscriber.prototype.next = function (value) {
+        if (this.isStopped) {
+            handleStoppedNotification(Object(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__[/* nextNotification */ "c"])(value), this);
+        }
+        else {
+            this._next(value);
+        }
+    };
+    Subscriber.prototype.error = function (err) {
+        if (this.isStopped) {
+            handleStoppedNotification(Object(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__[/* errorNotification */ "b"])(err), this);
+        }
+        else {
+            this.isStopped = true;
+            this._error(err);
+        }
+    };
+    Subscriber.prototype.complete = function () {
+        if (this.isStopped) {
+            handleStoppedNotification(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__[/* COMPLETE_NOTIFICATION */ "a"], this);
+        }
+        else {
+            this.isStopped = true;
+            this._complete();
+        }
+    };
+    Subscriber.prototype.unsubscribe = function () {
+        if (!this.closed) {
+            this.isStopped = true;
+            _super.prototype.unsubscribe.call(this);
+            this.destination = null;
+        }
+    };
+    Subscriber.prototype._next = function (value) {
+        this.destination.next(value);
+    };
+    Subscriber.prototype._error = function (err) {
+        try {
+            this.destination.error(err);
+        }
+        finally {
+            this.unsubscribe();
+        }
+    };
+    Subscriber.prototype._complete = function () {
+        try {
+            this.destination.complete();
+        }
+        finally {
+            this.unsubscribe();
+        }
+    };
+    return Subscriber;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]));
 
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
+var _bind = Function.prototype.bind;
+function bind(fn, thisArg) {
+    return _bind.call(fn, thisArg);
+}
+var ConsumerObserver = (function () {
+    function ConsumerObserver(partialObserver) {
+        this.partialObserver = partialObserver;
+    }
+    ConsumerObserver.prototype.next = function (value) {
+        var partialObserver = this.partialObserver;
+        if (partialObserver.next) {
+            try {
+                partialObserver.next(value);
+            }
+            catch (error) {
+                handleUnhandledError(error);
+            }
+        }
+    };
+    ConsumerObserver.prototype.error = function (err) {
+        var partialObserver = this.partialObserver;
+        if (partialObserver.error) {
+            try {
+                partialObserver.error(err);
+            }
+            catch (error) {
+                handleUnhandledError(error);
+            }
+        }
+        else {
+            handleUnhandledError(err);
+        }
+    };
+    ConsumerObserver.prototype.complete = function () {
+        var partialObserver = this.partialObserver;
+        if (partialObserver.complete) {
+            try {
+                partialObserver.complete();
+            }
+            catch (error) {
+                handleUnhandledError(error);
+            }
+        }
+    };
+    return ConsumerObserver;
+}());
+var SafeSubscriber = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(SafeSubscriber, _super);
+    function SafeSubscriber(observerOrNext, error, complete) {
+        var _this = _super.call(this) || this;
+        var partialObserver;
+        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(observerOrNext) || !observerOrNext) {
+            partialObserver = {
+                next: observerOrNext !== null && observerOrNext !== void 0 ? observerOrNext : undefined,
+                error: error !== null && error !== void 0 ? error : undefined,
+                complete: complete !== null && complete !== void 0 ? complete : undefined,
+            };
+        }
+        else {
+            var context_1;
+            if (_this && _config__WEBPACK_IMPORTED_MODULE_3__[/* config */ "a"].useDeprecatedNextContext) {
+                context_1 = Object.create(observerOrNext);
+                context_1.unsubscribe = function () { return _this.unsubscribe(); };
+                partialObserver = {
+                    next: observerOrNext.next && bind(observerOrNext.next, context_1),
+                    error: observerOrNext.error && bind(observerOrNext.error, context_1),
+                    complete: observerOrNext.complete && bind(observerOrNext.complete, context_1),
+                };
+            }
+            else {
+                partialObserver = observerOrNext;
+            }
+        }
+        _this.destination = new ConsumerObserver(partialObserver);
+        return _this;
+    }
+    return SafeSubscriber;
+}(Subscriber));
 
-function enable(namespaces) {
-  exports.save(namespaces);
+function handleUnhandledError(error) {
+    if (_config__WEBPACK_IMPORTED_MODULE_3__[/* config */ "a"].useDeprecatedSynchronousErrorHandling) {
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_8__[/* captureError */ "a"])(error);
+    }
+    else {
+        Object(_util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_4__[/* reportUnhandledError */ "a"])(error);
+    }
+}
+function defaultErrorHandler(err) {
+    throw err;
+}
+function handleStoppedNotification(notification, subscriber) {
+    var onStoppedNotification = _config__WEBPACK_IMPORTED_MODULE_3__[/* config */ "a"].onStoppedNotification;
+    onStoppedNotification && _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_7__[/* timeoutProvider */ "a"].setTimeout(function () { return onStoppedNotification(notification, subscriber); });
+}
+var EMPTY_OBSERVER = {
+    closed: true,
+    next: _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"],
+    error: defaultErrorHandler,
+    complete: _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"],
+};
+//# sourceMappingURL=Subscriber.js.map
 
-  exports.names = [];
-  exports.skips = [];
+/***/ }),
 
-  var i;
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Subscription.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  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 + '$'));
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return Subscription; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EMPTY_SUBSCRIPTION; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return isSubscription; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-  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
- */
+var Subscription = (function () {
+    function Subscription(initialTeardown) {
+        this.initialTeardown = initialTeardown;
+        this.closed = false;
+        this._parentage = null;
+        this._finalizers = null;
+    }
+    Subscription.prototype.unsubscribe = function () {
+        var e_1, _a, e_2, _b;
+        var errors;
+        if (!this.closed) {
+            this.closed = true;
+            var _parentage = this._parentage;
+            if (_parentage) {
+                this._parentage = null;
+                if (Array.isArray(_parentage)) {
+                    try {
+                        for (var _parentage_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(_parentage), _parentage_1_1 = _parentage_1.next(); !_parentage_1_1.done; _parentage_1_1 = _parentage_1.next()) {
+                            var parent_1 = _parentage_1_1.value;
+                            parent_1.remove(this);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_parentage_1_1 && !_parentage_1_1.done && (_a = _parentage_1.return)) _a.call(_parentage_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                }
+                else {
+                    _parentage.remove(this);
+                }
+            }
+            var initialFinalizer = this.initialTeardown;
+            if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(initialFinalizer)) {
+                try {
+                    initialFinalizer();
+                }
+                catch (e) {
+                    errors = e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__[/* UnsubscriptionError */ "a"] ? e.errors : [e];
+                }
+            }
+            var _finalizers = this._finalizers;
+            if (_finalizers) {
+                this._finalizers = null;
+                try {
+                    for (var _finalizers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(_finalizers), _finalizers_1_1 = _finalizers_1.next(); !_finalizers_1_1.done; _finalizers_1_1 = _finalizers_1.next()) {
+                        var finalizer = _finalizers_1_1.value;
+                        try {
+                            execFinalizer(finalizer);
+                        }
+                        catch (err) {
+                            errors = errors !== null && errors !== void 0 ? errors : [];
+                            if (err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__[/* UnsubscriptionError */ "a"]) {
+                                errors = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(errors)), Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(err.errors));
+                            }
+                            else {
+                                errors.push(err);
+                            }
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_finalizers_1_1 && !_finalizers_1_1.done && (_b = _finalizers_1.return)) _b.call(_finalizers_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+            if (errors) {
+                throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__[/* UnsubscriptionError */ "a"](errors);
+            }
+        }
+    };
+    Subscription.prototype.add = function (teardown) {
+        var _a;
+        if (teardown && teardown !== this) {
+            if (this.closed) {
+                execFinalizer(teardown);
+            }
+            else {
+                if (teardown instanceof Subscription) {
+                    if (teardown.closed || teardown._hasParent(this)) {
+                        return;
+                    }
+                    teardown._addParent(this);
+                }
+                (this._finalizers = (_a = this._finalizers) !== null && _a !== void 0 ? _a : []).push(teardown);
+            }
+        }
+    };
+    Subscription.prototype._hasParent = function (parent) {
+        var _parentage = this._parentage;
+        return _parentage === parent || (Array.isArray(_parentage) && _parentage.includes(parent));
+    };
+    Subscription.prototype._addParent = function (parent) {
+        var _parentage = this._parentage;
+        this._parentage = Array.isArray(_parentage) ? (_parentage.push(parent), _parentage) : _parentage ? [_parentage, parent] : parent;
+    };
+    Subscription.prototype._removeParent = function (parent) {
+        var _parentage = this._parentage;
+        if (_parentage === parent) {
+            this._parentage = null;
+        }
+        else if (Array.isArray(_parentage)) {
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(_parentage, parent);
+        }
+    };
+    Subscription.prototype.remove = function (teardown) {
+        var _finalizers = this._finalizers;
+        _finalizers && Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(_finalizers, teardown);
+        if (teardown instanceof Subscription) {
+            teardown._removeParent(this);
+        }
+    };
+    Subscription.EMPTY = (function () {
+        var empty = new Subscription();
+        empty.closed = true;
+        return empty;
+    })();
+    return Subscription;
+}());
 
-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;
+var EMPTY_SUBSCRIPTION = Subscription.EMPTY;
+function isSubscription(value) {
+    return (value instanceof Subscription ||
+        (value && 'closed' in value && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(value.remove) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(value.add) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(value.unsubscribe)));
+}
+function execFinalizer(finalizer) {
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(finalizer)) {
+        finalizer();
     }
-  }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
+    else {
+        finalizer.unsubscribe();
     }
-  }
-  return false;
 }
+//# sourceMappingURL=Subscription.js.map
 
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
+/***/ }),
 
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/config.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; });
+var config = {
+    onUnhandledError: null,
+    onStoppedNotification: null,
+    Promise: undefined,
+    useDeprecatedSynchronousErrorHandling: false,
+    useDeprecatedNextContext: false,
+};
+//# sourceMappingURL=config.js.map
 
 /***/ }),
-/* 113 */,
-/* 114 */
-/***/ (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__(3)
-var origRealpath = fs.realpath
-var origRealpathSync = fs.realpathSync
 
-var version = process.version
-var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(217)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/firstValueFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return firstValueFrom; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
 
-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 firstValueFrom(source, config) {
+    var hasConfig = typeof config === 'object';
+    return new Promise(function (resolve, reject) {
+        var subscriber = new _Subscriber__WEBPACK_IMPORTED_MODULE_1__[/* SafeSubscriber */ "a"]({
+            next: function (value) {
+                resolve(value);
+                subscriber.unsubscribe();
+            },
+            error: reject,
+            complete: function () {
+                if (hasConfig) {
+                    resolve(config.defaultValue);
+                }
+                else {
+                    reject(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]());
+                }
+            },
+        });
+        source.subscribe(subscriber);
+    });
 }
+//# sourceMappingURL=firstValueFrom.js.map
 
-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
-    }
-  }
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/lastValueFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return lastValueFrom; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
 
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
+function lastValueFrom(source, config) {
+    var hasConfig = typeof config === 'object';
+    return new Promise(function (resolve, reject) {
+        var _hasValue = false;
+        var _value;
+        source.subscribe({
+            next: function (value) {
+                _value = value;
+                _hasValue = true;
+            },
+            error: reject,
+            complete: function () {
+                if (_hasValue) {
+                    resolve(_value);
+                }
+                else if (hasConfig) {
+                    resolve(config.defaultValue);
+                }
+                else {
+                    reject(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]());
+                }
+            },
+        });
+    });
 }
-
+//# sourceMappingURL=lastValueFrom.js.map
 
 /***/ }),
-/* 115 */
-/***/ (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)
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var path = __webpack_require__(0)
-var minimatch = __webpack_require__(60)
-var isAbsolute = __webpack_require__(76)
-var Minimatch = minimatch.Minimatch
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ConnectableObservable; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
-}
 
-function alphasort (a, b) {
-  return a.localeCompare(b)
-}
 
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
 
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
 
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
-}
 
-// 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
-  }
-}
+var ConnectableObservable = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(ConnectableObservable, _super);
+    function ConnectableObservable(source, subjectFactory) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.subjectFactory = subjectFactory;
+        _this._subject = null;
+        _this._refCount = 0;
+        _this._connection = null;
+        if (Object(_util_lift__WEBPACK_IMPORTED_MODULE_5__[/* hasLift */ "a"])(source)) {
+            _this.lift = source.lift;
+        }
+        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._teardown = function () {
+        this._refCount = 0;
+        var _connection = this._connection;
+        this._subject = this._connection = null;
+        _connection === null || _connection === void 0 ? void 0 : _connection.unsubscribe();
+    };
+    ConnectableObservable.prototype.connect = function () {
+        var _this = this;
+        var connection = this._connection;
+        if (!connection) {
+            connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]();
+            var subject_1 = this.getSubject();
+            connection.add(this.source.subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subject_1, undefined, function () {
+                _this._teardown();
+                subject_1.complete();
+            }, function (err) {
+                _this._teardown();
+                subject_1.error(err);
+            }, function () { return _this._teardown(); })));
+            if (connection.closed) {
+                this._connection = null;
+                connection = _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"].EMPTY;
+            }
+        }
+        return connection;
+    };
+    ConnectableObservable.prototype.refCount = function () {
+        return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_3__[/* refCount */ "a"])()(this);
+    };
+    return ConnectableObservable;
+}(_Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"]));
 
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
+//# sourceMappingURL=ConnectableObservable.js.map
 
-  // 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
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/bindCallback.js":
+/***/ (function(module, __webpack_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";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bindCallback; });
+/* harmony import */ var _bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindCallbackInternals.js");
 
-  setupIgnores(self, options)
+function bindCallback(callbackFunc, resultSelector, scheduler) {
+    return Object(_bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__[/* bindCallbackInternals */ "a"])(false, callbackFunc, resultSelector, scheduler);
+}
+//# sourceMappingURL=bindCallback.js.map
 
-  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
-  }
+/***/ }),
 
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/bindCallbackInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // 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
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bindCallbackInternals; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js");
 
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
 
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
-}
 
-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
-        })
-    }
-  }
 
-  if (!nou)
-    all = Object.keys(all)
 
-  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])
+function bindCallbackInternals(isNodeStyle, callbackFunc, resultSelector, scheduler) {
+    if (resultSelector) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__[/* isScheduler */ "a"])(resultSelector)) {
+            scheduler = resultSelector;
+        }
+        else {
+            return function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return bindCallbackInternals(isNodeStyle, callbackFunc, scheduler)
+                    .apply(this, args)
+                    .pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__[/* mapOneOrManyArgs */ "a"])(resultSelector));
+            };
+        }
     }
-    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
-      })
+    if (scheduler) {
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return bindCallbackInternals(isNodeStyle, callbackFunc)
+                .apply(this, args)
+                .pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_3__[/* subscribeOn */ "a"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_5__[/* observeOn */ "a"])(scheduler));
+        };
     }
-  }
-
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
-
-  self.found = all
+    return function () {
+        var _this = this;
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_6__[/* AsyncSubject */ "a"]();
+        var uninitialized = true;
+        return new _Observable__WEBPACK_IMPORTED_MODULE_2__[/* Observable */ "a"](function (subscriber) {
+            var subs = subject.subscribe(subscriber);
+            if (uninitialized) {
+                uninitialized = false;
+                var isAsync_1 = false;
+                var isComplete_1 = false;
+                callbackFunc.apply(_this, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)), [
+                    function () {
+                        var results = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            results[_i] = arguments[_i];
+                        }
+                        if (isNodeStyle) {
+                            var err = results.shift();
+                            if (err != null) {
+                                subject.error(err);
+                                return;
+                            }
+                        }
+                        subject.next(1 < results.length ? results : results[0]);
+                        isComplete_1 = true;
+                        if (isAsync_1) {
+                            subject.complete();
+                        }
+                    },
+                ]));
+                if (isComplete_1) {
+                    subject.complete();
+                }
+                isAsync_1 = true;
+            }
+            return subs;
+        });
+    };
 }
+//# sourceMappingURL=bindCallbackInternals.js.map
 
-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 (isDir && !slash)
-      m += '/'
-    else if (!isDir && slash)
-      m = m.slice(0, -1)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/bindNodeCallback.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bindNodeCallback; });
+/* harmony import */ var _bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindCallbackInternals.js");
 
-  return m
+function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
+    return Object(_bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__[/* bindCallbackInternals */ "a"])(true, callbackFunc, resultSelector, scheduler);
 }
+//# sourceMappingURL=bindNodeCallback.js.map
 
-// 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)
-  }
-
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
+/***/ }),
 
-  return abs
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatest; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return combineLatestInit; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsArgArrayOrObject.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_createObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createObject.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-// 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))
-  })
-}
 
 
-/***/ }),
-/* 116 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var path = __webpack_require__(0);
-var fs = __webpack_require__(3);
-var _0777 = parseInt('0777', 8);
 
-module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
 
-function mkdirP (p, opts, f, made) {
-    if (typeof opts === 'function') {
-        f = opts;
-        opts = {};
-    }
-    else if (!opts || typeof opts !== 'object') {
-        opts = { mode: opts };
+function combineLatest() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
-    
-    var mode = opts.mode;
-    var xfs = opts.fs || fs;
-    
-    if (mode === undefined) {
-        mode = _0777 & (~process.umask());
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_5__[/* popScheduler */ "c"])(args);
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_5__[/* popResultSelector */ "b"])(args);
+    var _a = Object(_util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__[/* argsArgArrayOrObject */ "a"])(args), observables = _a.args, keys = _a.keys;
+    if (observables.length === 0) {
+        return Object(_from__WEBPACK_IMPORTED_MODULE_2__[/* from */ "a"])([], scheduler);
     }
-    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;
-        }
-    });
+    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](combineLatestInit(observables, scheduler, keys
+        ?
+            function (values) { return Object(_util_createObject__WEBPACK_IMPORTED_MODULE_6__[/* createObject */ "a"])(keys, values); }
+        :
+            _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"]));
+    return resultSelector ? result.pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__[/* mapOneOrManyArgs */ "a"])(resultSelector)) : result;
 }
-
-mkdirP.sync = function sync (p, opts, made) {
-    if (!opts || typeof opts !== 'object') {
-        opts = { mode: opts };
+function combineLatestInit(observables, scheduler, valueTransform) {
+    if (valueTransform === void 0) { valueTransform = _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"]; }
+    return function (subscriber) {
+        maybeSchedule(scheduler, function () {
+            var length = observables.length;
+            var values = new Array(length);
+            var active = length;
+            var remainingFirstValues = length;
+            var _loop_1 = function (i) {
+                maybeSchedule(scheduler, function () {
+                    var source = Object(_from__WEBPACK_IMPORTED_MODULE_2__[/* from */ "a"])(observables[i], scheduler);
+                    var hasFirstValue = false;
+                    source.subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_7__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                        values[i] = value;
+                        if (!hasFirstValue) {
+                            hasFirstValue = true;
+                            remainingFirstValues--;
+                        }
+                        if (!remainingFirstValues) {
+                            subscriber.next(valueTransform(values.slice()));
+                        }
+                    }, function () {
+                        if (!--active) {
+                            subscriber.complete();
+                        }
+                    }));
+                }, subscriber);
+            };
+            for (var i = 0; i < length; i++) {
+                _loop_1(i);
+            }
+        }, subscriber);
+    };
+}
+function maybeSchedule(scheduler, execute, subscription) {
+    if (scheduler) {
+        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_8__[/* executeSchedule */ "a"])(subscription, scheduler, execute);
     }
-    
-    var mode = opts.mode;
-    var xfs = opts.fs || fs;
-    
-    if (mode === undefined) {
-        mode = _0777 & (~process.umask());
+    else {
+        execute();
     }
-    if (!made) made = null;
+}
+//# sourceMappingURL=combineLatest.js.map
 
-    p = path.resolve(p);
+/***/ }),
 
-    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;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/concat.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-            // 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;
-        }
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concat; });
+/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
-    return made;
-};
 
 
+function concat() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_0__[/* concatAll */ "a"])()(Object(_from__WEBPACK_IMPORTED_MODULE_2__[/* from */ "a"])(args, Object(_util_args__WEBPACK_IMPORTED_MODULE_1__[/* popScheduler */ "c"])(args)));
+}
+//# sourceMappingURL=concat.js.map
+
 /***/ }),
-/* 117 */,
-/* 118 */,
-/* 119 */,
-/* 120 */,
-/* 121 */,
-/* 122 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/connectable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return connectable; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
 
-module.exports = x => {
-	if (typeof x !== 'string') {
-		throw new TypeError('Expected a string, got ' + typeof x);
-	}
 
-	// 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);
-	}
 
-	return x;
+var DEFAULT_CONFIG = {
+    connector: function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"](); },
+    resetOnDisconnect: true,
 };
+function connectable(source, config) {
+    if (config === void 0) { config = DEFAULT_CONFIG; }
+    var connection = null;
+    var connector = config.connector, _a = config.resetOnDisconnect, resetOnDisconnect = _a === void 0 ? true : _a;
+    var subject = connector();
+    var result = new _Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"](function (subscriber) {
+        return subject.subscribe(subscriber);
+    });
+    result.connect = function () {
+        if (!connection || connection.closed) {
+            connection = Object(_defer__WEBPACK_IMPORTED_MODULE_2__[/* defer */ "a"])(function () { return source; }).subscribe(subject);
+            if (resetOnDisconnect) {
+                connection.add(function () { return (subject = connector()); });
+            }
+        }
+        return connection;
+    };
+    return result;
+}
+//# sourceMappingURL=connectable.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/defer.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defer; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+
 
+function defer(observableFactory) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(observableFactory()).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=defer.js.map
 
 /***/ }),
-/* 123 */
-/***/ (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)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/dom/animationFrames.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrames; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _scheduler_performanceTimestampProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/performanceTimestampProvider.js");
+/* harmony import */ var _scheduler_animationFrameProvider__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrameProvider.js");
 
-  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
-  }
-}
-
-
-/***/ }),
-/* 124 */,
-/* 125 */,
-/* 126 */,
-/* 127 */,
-/* 128 */,
-/* 129 */,
-/* 130 */,
-/* 131 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 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);
-};
 
+function animationFrames(timestampProvider) {
+    return timestampProvider ? animationFramesFactory(timestampProvider) : DEFAULT_ANIMATION_FRAMES;
+}
+function animationFramesFactory(timestampProvider) {
+    var schedule = _scheduler_animationFrameProvider__WEBPACK_IMPORTED_MODULE_3__[/* animationFrameProvider */ "a"].schedule;
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]();
+        var provider = timestampProvider || _scheduler_performanceTimestampProvider__WEBPACK_IMPORTED_MODULE_2__[/* performanceTimestampProvider */ "a"];
+        var start = provider.now();
+        var run = function (timestamp) {
+            var now = provider.now();
+            subscriber.next({
+                timestamp: timestampProvider ? now : timestamp,
+                elapsed: now - start,
+            });
+            if (!subscriber.closed) {
+                subscription.add(schedule(run));
+            }
+        };
+        subscription.add(schedule(run));
+        return subscription;
+    });
+}
+var DEFAULT_ANIMATION_FRAMES = animationFramesFactory();
+//# sourceMappingURL=animationFrames.js.map
 
 /***/ }),
-/* 132 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// 19.1.2.14 / 15.2.3.14 Object.keys(O)
-var $keys = __webpack_require__(195);
-var enumBugKeys = __webpack_require__(101);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/empty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = Object.keys || function keys(O) {
-  return $keys(O, enumBugKeys);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EMPTY; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return empty; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
 
+var EMPTY = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) { return subscriber.complete(); });
+function empty(scheduler) {
+    return scheduler ? emptyScheduled(scheduler) : EMPTY;
+}
+function emptyScheduled(scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
+}
+//# sourceMappingURL=empty.js.map
 
 /***/ }),
-/* 133 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 7.1.13 ToObject(argument)
-var defined = __webpack_require__(67);
-module.exports = function (it) {
-  return Object(defined(it));
-};
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/forkJoin.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/***/ }),
-/* 134 */,
-/* 135 */,
-/* 136 */,
-/* 137 */,
-/* 138 */,
-/* 139 */,
-/* 140 */,
-/* 141 */,
-/* 142 */,
-/* 143 */,
-/* 144 */,
-/* 145 */
-/***/ (function(module, exports) {
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return forkJoin; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsArgArrayOrObject.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_createObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createObject.js");
 
-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"}}}
 
-/***/ }),
-/* 146 */,
-/* 147 */,
-/* 148 */,
-/* 149 */,
-/* 150 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = stringify;
 
-var _misc;
 
-function _load_misc() {
-  return _misc = __webpack_require__(12);
+function forkJoin() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popResultSelector */ "b"])(args);
+    var _a = Object(_util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__[/* argsArgArrayOrObject */ "a"])(args), sources = _a.args, keys = _a.keys;
+    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var length = sources.length;
+        if (!length) {
+            subscriber.complete();
+            return;
+        }
+        var values = new Array(length);
+        var remainingCompletions = length;
+        var remainingEmissions = length;
+        var _loop_1 = function (sourceIndex) {
+            var hasValue = false;
+            Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(sources[sourceIndex]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                if (!hasValue) {
+                    hasValue = true;
+                    remainingEmissions--;
+                }
+                values[sourceIndex] = value;
+            }, function () { return remainingCompletions--; }, undefined, function () {
+                if (!remainingCompletions || !hasValue) {
+                    if (!remainingEmissions) {
+                        subscriber.next(keys ? Object(_util_createObject__WEBPACK_IMPORTED_MODULE_6__[/* createObject */ "a"])(keys, values) : values);
+                    }
+                    subscriber.complete();
+                }
+            }));
+        };
+        for (var sourceIndex = 0; sourceIndex < length; sourceIndex++) {
+            _loop_1(sourceIndex);
+        }
+    });
+    return resultSelector ? result.pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_5__[/* mapOneOrManyArgs */ "a"])(resultSelector)) : result;
 }
+//# sourceMappingURL=forkJoin.js.map
 
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
+/***/ }),
 
-var _package;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/from.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function _load_package() {
-  return _package = __webpack_require__(145);
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return from; });
+/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduled.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-const NODE_VERSION = process.version;
 
-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);
+function from(input, scheduler) {
+    return scheduler ? Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_0__[/* scheduled */ "a"])(input, scheduler) : Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(input);
 }
+//# sourceMappingURL=from.js.map
 
-function maybeWrap(str) {
-  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
-    return JSON.stringify(str);
-  } else {
-    return str;
-  }
-}
+/***/ }),
 
-const priorities = {
-  name: 1,
-  version: 2,
-  uid: 3,
-  resolved: 4,
-  integrity: 5,
-  registry: 6,
-  dependencies: 7
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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);
-  }
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromEvent; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _operators_mergeMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
 
-function _stringify(obj, options) {
-  if (typeof obj !== 'object') {
-    throw new TypeError();
-  }
 
-  const indent = options.indent;
-  const lines = [];
 
-  // 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);
 
-  let addedKeys = [];
 
-  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 valKeys = [key];
 
-    // 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);
+var nodeEventEmitterMethods = ['addListener', 'removeListener'];
+var eventTargetMethods = ['addEventListener', 'removeEventListener'];
+var jqueryMethods = ['on', 'off'];
+function fromEvent(target, eventName, options, resultSelector) {
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(options)) {
+        resultSelector = options;
+        options = undefined;
+    }
+    if (resultSelector) {
+        return fromEvent(target, eventName, options).pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_6__[/* mapOneOrManyArgs */ "a"])(resultSelector));
+    }
+    var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(isEventTarget(target)
+        ? eventTargetMethods.map(function (methodName) { return function (handler) { return target[methodName](eventName, handler, options); }; })
+        :
+            isNodeStyleEventEmitter(target)
+                ? nodeEventEmitterMethods.map(toCommonHandlerRegistry(target, eventName))
+                : isJQueryStyleEventEmitter(target)
+                    ? jqueryMethods.map(toCommonHandlerRegistry(target, eventName))
+                    : [], 2), add = _a[0], remove = _a[1];
+    if (!add) {
+        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_4__[/* isArrayLike */ "a"])(target)) {
+            return Object(_operators_mergeMap__WEBPACK_IMPORTED_MODULE_3__[/* mergeMap */ "a"])(function (subTarget) { return fromEvent(subTarget, eventName, options); })(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(target));
         }
-      }
     }
-
-    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();
+    if (!add) {
+        throw new TypeError('Invalid event target');
     }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_2__[/* Observable */ "a"](function (subscriber) {
+        var handler = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return subscriber.next(1 < args.length ? args : args[0]);
+        };
+        add(handler);
+        return function () { return remove(handler); };
+    });
+}
+function toCommonHandlerRegistry(target, eventName) {
+    return function (methodName) { return function (handler) { return target[methodName](eventName, handler); }; };
+}
+function isNodeStyleEventEmitter(target) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.addListener) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.removeListener);
+}
+function isJQueryStyleEventEmitter(target) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.on) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.off);
+}
+function isEventTarget(target) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.addEventListener) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.removeEventListener);
+}
+//# sourceMappingURL=fromEvent.js.map
 
-    addedKeys = addedKeys.concat(valKeys);
-  }
+/***/ }),
 
-  return indent + lines.join(`\n${indent}`);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/fromEventPattern.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function stringify(obj, noHeader, enableVersions) {
-  const val = _stringify(obj, {
-    indent: '',
-    topLevel: true
-  });
-  if (noHeader) {
-    return val;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromEventPattern; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
 
-  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);
 
-  return lines.join('\n');
+
+function fromEventPattern(addHandler, removeHandler, resultSelector) {
+    if (resultSelector) {
+        return fromEventPattern(addHandler, removeHandler).pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_2__[/* mapOneOrManyArgs */ "a"])(resultSelector));
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](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 = addHandler(handler);
+        return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(removeHandler) ? function () { return removeHandler(handler, retValue); } : undefined;
+    });
 }
+//# sourceMappingURL=fromEventPattern.js.map
 
 /***/ }),
-/* 151 */,
-/* 152 */,
-/* 153 */,
-/* 154 */,
-/* 155 */,
-/* 156 */,
-/* 157 */,
-/* 158 */,
-/* 159 */,
-/* 160 */,
-/* 161 */,
-/* 162 */,
-/* 163 */,
-/* 164 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/fromSubscribable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromSubscribable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
 
+function fromSubscribable(subscribable) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) { return subscribable.subscribe(subscriber); });
+}
+//# sourceMappingURL=fromSubscribable.js.map
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
+/***/ }),
 
-var _asyncToGenerator2;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/generate.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return generate; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
+/* harmony import */ var _scheduled_scheduleIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleIterable.js");
 
-// 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;
 
-    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);
-    }
 
-    if (disableTimestampCorrection) {
-      return;
-    }
 
-    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;
+
+function generate(initialStateOrOptions, condition, iterate, resultSelectorOrScheduler, scheduler) {
+    var _a, _b;
+    var resultSelector;
+    var initialState;
+    if (arguments.length === 1) {
+        (_a = initialStateOrOptions, initialState = _a.initialState, condition = _a.condition, iterate = _a.iterate, _b = _a.resultSelector, resultSelector = _b === void 0 ? _util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"] : _b, scheduler = _a.scheduler);
+    }
+    else {
+        initialState = initialStateOrOptions;
+        if (!resultSelectorOrScheduler || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__[/* isScheduler */ "a"])(resultSelectorOrScheduler)) {
+            resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"];
+            scheduler = resultSelectorOrScheduler;
+        }
+        else {
+            resultSelector = resultSelectorOrScheduler;
         }
-      }
     }
-
-    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);
-      }
+    function gen() {
+        var state;
+        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __generator */ "f"])(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    state = initialState;
+                    _a.label = 1;
+                case 1:
+                    if (!(!condition || condition(state))) return [3, 4];
+                    return [4, resultSelector(state)];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    state = iterate(state);
+                    return [3, 1];
+                case 4: return [2];
+            }
+        });
     }
-  });
-
-  return function fixTimes(_x7, _x8, _x9) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-// Compare file timestamps.
-// Some versions of Node on windows zero the milliseconds when utime is used.
-
+    return Object(_defer__WEBPACK_IMPORTED_MODULE_3__[/* defer */ "a"])((scheduler
+        ?
+            function () { return Object(_scheduled_scheduleIterable__WEBPACK_IMPORTED_MODULE_4__[/* scheduleIterable */ "a"])(gen(), scheduler); }
+        :
+            gen));
+}
+//# sourceMappingURL=generate.js.map
 
-var _fs;
+/***/ }),
 
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(3));
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/iif.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var _promise;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iif; });
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
 
-function _load_promise() {
-  return _promise = __webpack_require__(40);
+function iif(condition, trueResult, falseResult) {
+    return Object(_defer__WEBPACK_IMPORTED_MODULE_0__[/* defer */ "a"])(function () { return (condition() ? trueResult : falseResult); });
 }
+//# sourceMappingURL=iif.js.map
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/***/ }),
 
-// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return innerFrom; });
+/* unused harmony export fromInteropObservable */
+/* unused harmony export fromArrayLike */
+/* unused harmony export fromPromise */
+/* unused harmony export fromIterable */
+/* unused harmony export fromAsyncIterable */
+/* unused harmony export fromReadableStreamLike */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js");
+/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isPromise.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js");
+/* harmony import */ var _util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js");
+/* harmony import */ var _util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js");
+/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isIterable.js");
+/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js");
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
 
-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);
 
-const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
 
-const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
 
-/**
- * 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();
-      }
-    }
-  });
 
-  return function copyFile(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
 
-// 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);
-  }
-};
 
-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);
-    }
-  });
 
-  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();
 
-  if (process.platform !== 'win32') {
-    return aTime === bTime;
-  }
 
-  // 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 aTimeSec = Math.floor(aTime / 1000);
-  const bTimeSec = Math.floor(bTime / 1000);
 
-  // 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;
-  }
-
-  return aTime === bTime;
-};
+function innerFrom(input) {
+    if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"]) {
+        return input;
+    }
+    if (input != null) {
+        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__[/* isInteropObservable */ "a"])(input)) {
+            return fromInteropObservable(input);
+        }
+        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_1__[/* isArrayLike */ "a"])(input)) {
+            return fromArrayLike(input);
+        }
+        if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_2__[/* isPromise */ "a"])(input)) {
+            return fromPromise(input);
+        }
+        if (Object(_util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_5__[/* isAsyncIterable */ "a"])(input)) {
+            return fromAsyncIterable(input);
+        }
+        if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__[/* isIterable */ "a"])(input)) {
+            return fromIterable(input);
+        }
+        if (Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__[/* isReadableStreamLike */ "a"])(input)) {
+            return fromReadableStreamLike(input);
+        }
+    }
+    throw Object(_util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_6__[/* createInvalidObservableTypeError */ "a"])(input);
+}
+function fromInteropObservable(obj) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_11__[/* observable */ "a"]]();
+        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_9__[/* isFunction */ "a"])(obs.subscribe)) {
+            return obs.subscribe(subscriber);
+        }
+        throw new TypeError('Provided object does not correctly implement Symbol.observable');
+    });
+}
+function fromArrayLike(array) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        for (var i = 0; i < array.length && !subscriber.closed; i++) {
+            subscriber.next(array[i]);
+        }
+        subscriber.complete();
+    });
+}
+function fromPromise(promise) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        promise
+            .then(function (value) {
+            if (!subscriber.closed) {
+                subscriber.next(value);
+                subscriber.complete();
+            }
+        }, function (err) { return subscriber.error(err); })
+            .then(null, _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_10__[/* reportUnhandledError */ "a"]);
+    });
+}
+function fromIterable(iterable) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        var e_1, _a;
+        try {
+            for (var iterable_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(iterable), iterable_1_1 = iterable_1.next(); !iterable_1_1.done; iterable_1_1 = iterable_1.next()) {
+                var value = iterable_1_1.value;
+                subscriber.next(value);
+                if (subscriber.closed) {
+                    return;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (iterable_1_1 && !iterable_1_1.done && (_a = iterable_1.return)) _a.call(iterable_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        subscriber.complete();
+    });
+}
+function fromAsyncIterable(asyncIterable) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        process(asyncIterable, subscriber).catch(function (err) { return subscriber.error(err); });
+    });
+}
+function fromReadableStreamLike(readableStream) {
+    return fromAsyncIterable(Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__[/* readableStreamLikeToAsyncGenerator */ "b"])(readableStream));
+}
+function process(asyncIterable, subscriber) {
+    var asyncIterable_1, asyncIterable_1_1;
+    var e_2, _a;
+    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "d"])(this, void 0, void 0, function () {
+        var value, e_2_1;
+        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __generator */ "f"])(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 5, 6, 11]);
+                    asyncIterable_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __asyncValues */ "b"])(asyncIterable);
+                    _b.label = 1;
+                case 1: return [4, asyncIterable_1.next()];
+                case 2:
+                    if (!(asyncIterable_1_1 = _b.sent(), !asyncIterable_1_1.done)) return [3, 4];
+                    value = asyncIterable_1_1.value;
+                    subscriber.next(value);
+                    if (subscriber.closed) {
+                        return [2];
+                    }
+                    _b.label = 3;
+                case 3: return [3, 1];
+                case 4: return [3, 11];
+                case 5:
+                    e_2_1 = _b.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3, 11];
+                case 6:
+                    _b.trys.push([6, , 9, 10]);
+                    if (!(asyncIterable_1_1 && !asyncIterable_1_1.done && (_a = asyncIterable_1.return))) return [3, 8];
+                    return [4, _a.call(asyncIterable_1)];
+                case 7:
+                    _b.sent();
+                    _b.label = 8;
+                case 8: return [3, 10];
+                case 9:
+                    if (e_2) throw e_2.error;
+                    return [7];
+                case 10: return [7];
+                case 11:
+                    subscriber.complete();
+                    return [2];
+            }
+        });
+    });
+}
+//# sourceMappingURL=innerFrom.js.map
 
 /***/ }),
-/* 165 */,
-/* 166 */,
-/* 167 */,
-/* 168 */,
-/* 169 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/interval.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return interval; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _timer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-exports.default = isRootUser(getUid()) && !isFakeRoot();
-function isFakeRoot() {
-  return Boolean(process.env.FAKEROOTKEY);
-}
 
-function isRootUser(uid) {
-  return uid === 0;
+function interval(period, scheduler) {
+    if (period === void 0) { period = 0; }
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    if (period < 0) {
+        period = 0;
+    }
+    return Object(_timer__WEBPACK_IMPORTED_MODULE_1__[/* timer */ "a"])(period, period, scheduler);
 }
+//# sourceMappingURL=interval.js.map
 
 /***/ }),
-/* 170 */,
-/* 171 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/merge.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return merge; });
+/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
 
-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;
 
-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;
-  }
+function merge() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popScheduler */ "c"])(args);
+    var concurrent = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popNumber */ "a"])(args, Infinity);
+    var sources = args;
+    return !sources.length
+        ?
+            _empty__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY */ "a"]
+        : sources.length === 1
+            ?
+                Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(sources[0])
+            :
+                Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_0__[/* mergeAll */ "a"])(concurrent)(Object(_from__WEBPACK_IMPORTED_MODULE_4__[/* from */ "a"])(sources, scheduler));
 }
+//# sourceMappingURL=merge.js.map
 
-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;
-  }
-}
+/***/ }),
 
-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;
-  }
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/never.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function getLocalAppDataDir() {
-  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return NEVER; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return never; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-/***/ }),
-/* 172 */,
-/* 173 */
-/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = { "default": __webpack_require__(179), __esModule: true };
+var NEVER = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](_util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]);
+function never() {
+    return NEVER;
+}
+//# sourceMappingURL=never.js.map
 
 /***/ }),
-/* 174 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/of.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return of; });
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
-  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 of() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_0__[/* popScheduler */ "c"])(args);
+    return Object(_from__WEBPACK_IMPORTED_MODULE_1__[/* from */ "a"])(args, scheduler);
 }
+//# sourceMappingURL=of.js.map
 
-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;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/onErrorResumeNext.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (ai >= 0 && bi > 0) {
-    begs = [];
-    left = str.length;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return onErrorResumeNext; });
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/onErrorResumeNext.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
 
-    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;
+function onErrorResumeNext() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
     }
+    return Object(_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_1__[/* onErrorResumeNext */ "a"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__[/* argsOrArgArray */ "a"])(sources))(_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]);
+}
+//# sourceMappingURL=onErrorResumeNext.js.map
 
-    if (begs.length) {
-      result = [ left, right ];
-    }
-  }
+/***/ }),
 
-  return result;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/pairs.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pairs; });
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
+function pairs(obj, scheduler) {
+    return Object(_from__WEBPACK_IMPORTED_MODULE_0__[/* from */ "a"])(Object.entries(obj), scheduler);
+}
+//# sourceMappingURL=pairs.js.map
 
 /***/ }),
-/* 175 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var concatMap = __webpack_require__(178);
-var balanced = __webpack_require__(174);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/partition.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = expandTop;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return partition; });
+/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/not.js");
+/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-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);
-}
 
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
+function partition(source, predicate, thisArg) {
+    return [Object(_operators_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(predicate, thisArg)(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(source)), Object(_operators_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__[/* not */ "a"])(predicate, thisArg))(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(source))];
 }
+//# sourceMappingURL=partition.js.map
 
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
-}
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/race.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// 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 [''];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return race; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return raceInit; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  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);
-  }
+function race() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    sources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__[/* argsOrArgArray */ "a"])(sources);
+    return sources.length === 1 ? Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(sources[0]) : new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](raceInit(sources));
+}
+function raceInit(sources) {
+    return function (subscriber) {
+        var subscriptions = [];
+        var _loop_1 = function (i) {
+            subscriptions.push(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(sources[i]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                if (subscriptions) {
+                    for (var s = 0; s < subscriptions.length; s++) {
+                        s !== i && subscriptions[s].unsubscribe();
+                    }
+                    subscriptions = null;
+                }
+                subscriber.next(value);
+            })));
+        };
+        for (var i = 0; subscriptions && !subscriber.closed && i < sources.length; i++) {
+            _loop_1(i);
+        }
+    };
+}
+//# sourceMappingURL=race.js.map
 
-  parts.push.apply(parts, p);
+/***/ }),
 
-  return parts;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/range.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function expandTop(str) {
-  if (!str)
-    return [];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return range; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
 
-  // 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 range(start, count, scheduler) {
+    if (count == null) {
+        count = start;
+        start = 0;
+    }
+    if (count <= 0) {
+        return _empty__WEBPACK_IMPORTED_MODULE_1__[/* EMPTY */ "a"];
+    }
+    var end = count + start;
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](scheduler
+        ?
+            function (subscriber) {
+                var n = start;
+                return scheduler.schedule(function () {
+                    if (n < end) {
+                        subscriber.next(n++);
+                        this.schedule();
+                    }
+                    else {
+                        subscriber.complete();
+                    }
+                });
+            }
+        :
+            function (subscriber) {
+                var n = start;
+                while (n < end && !subscriber.closed) {
+                    subscriber.next(n++);
+                }
+                subscriber.complete();
+            });
 }
+//# sourceMappingURL=range.js.map
 
-function identity(e) {
-  return e;
-}
+/***/ }),
 
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/throwError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwError; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-function expand(str, isTop) {
-  var expansions = [];
 
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
+function throwError(errorOrErrorFactory, scheduler) {
+    var errorFactory = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(errorOrErrorFactory) ? errorOrErrorFactory : function () { return errorOrErrorFactory; };
+    var init = function (subscriber) { return subscriber.error(errorFactory()); };
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](scheduler ? function (subscriber) { return scheduler.schedule(init, 0, subscriber); } : init);
+}
+//# sourceMappingURL=throwError.js.map
 
-  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;
-        });
-      }
-    }
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/timer.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timer; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isDate.js");
 
-  // 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;
-          }
+function timer(dueTime, intervalOrScheduler, scheduler) {
+    if (dueTime === void 0) { dueTime = 0; }
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__[/* async */ "a"]; }
+    var intervalDuration = -1;
+    if (intervalOrScheduler != null) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__[/* isScheduler */ "a"])(intervalOrScheduler)) {
+            scheduler = intervalOrScheduler;
+        }
+        else {
+            intervalDuration = intervalOrScheduler;
         }
-      }
-      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 expansions;
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var due = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_3__[/* isValidDate */ "a"])(dueTime) ? +dueTime - scheduler.now() : dueTime;
+        if (due < 0) {
+            due = 0;
+        }
+        var n = 0;
+        return scheduler.schedule(function () {
+            if (!subscriber.closed) {
+                subscriber.next(n++);
+                if (0 <= intervalDuration) {
+                    this.schedule(undefined, intervalDuration);
+                }
+                else {
+                    subscriber.complete();
+                }
+            }
+        }, due);
+    });
 }
-
-
+//# sourceMappingURL=timer.js.map
 
 /***/ }),
-/* 176 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/using.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function preserveCamelCase(str) {
-	let isLastCharLower = false;
-	let isLastCharUpper = false;
-	let isLastLastCharUpper = false;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return using; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
 
-	for (let i = 0; i < str.length; i++) {
-		const c = str[i];
 
-		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;
-		}
-	}
 
-	return str;
+function using(resourceFactory, observableFactory) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var resource = resourceFactory();
+        var result = observableFactory(resource);
+        var source = result ? Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY */ "a"];
+        source.subscribe(subscriber);
+        return function () {
+            if (resource) {
+                resource.unsubscribe();
+            }
+        };
+    });
 }
+//# sourceMappingURL=using.js.map
 
-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();
-	}
+/***/ }),
 
-	if (str.length === 0) {
-		return '';
-	}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/zip.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	if (str.length === 1) {
-		return str.toLowerCase();
-	}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zip; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
 
-	if (/^[a-z0-9]+$/.test(str)) {
-		return str;
-	}
 
-	const hasUpperCase = str !== str.toLowerCase();
 
-	if (hasUpperCase) {
-		str = preserveCamelCase(str);
-	}
 
-	return str
-		.replace(/^[_.\- ]+/, '')
-		.toLowerCase()
-		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
-};
 
 
-/***/ }),
-/* 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);
+function zip() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
-    return res;
-};
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popResultSelector */ "b"])(args);
+    var sources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__[/* argsOrArgArray */ "a"])(args);
+    return sources.length
+        ? new _Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"](function (subscriber) {
+            var buffers = sources.map(function () { return []; });
+            var completed = sources.map(function () { return false; });
+            subscriber.add(function () {
+                buffers = completed = null;
+            });
+            var _loop_1 = function (sourceIndex) {
+                Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(sources[sourceIndex]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                    buffers[sourceIndex].push(value);
+                    if (buffers.every(function (buffer) { return buffer.length; })) {
+                        var result = buffers.map(function (buffer) { return buffer.shift(); });
+                        subscriber.next(resultSelector ? resultSelector.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(result))) : result);
+                        if (buffers.some(function (buffer, i) { return !buffer.length && completed[i]; })) {
+                            subscriber.complete();
+                        }
+                    }
+                }, function () {
+                    completed[sourceIndex] = true;
+                    !buffers[sourceIndex].length && subscriber.complete();
+                }));
+            };
+            for (var sourceIndex = 0; !subscriber.closed && sourceIndex < sources.length; sourceIndex++) {
+                _loop_1(sourceIndex);
+            }
+            return function () {
+                buffers = completed = null;
+            };
+        })
+        : _empty__WEBPACK_IMPORTED_MODULE_4__[/* EMPTY */ "a"];
+}
+//# sourceMappingURL=zip.js.map
 
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/***/ }),
-/* 179 */
-/***/ (function(module, exports, __webpack_require__) {
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return createOperatorSubscriber; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OperatorSubscriber; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
 
-__webpack_require__(205);
-__webpack_require__(207);
-__webpack_require__(210);
-__webpack_require__(206);
-__webpack_require__(208);
-__webpack_require__(209);
-module.exports = __webpack_require__(23).Promise;
 
+function createOperatorSubscriber(destination, onNext, onComplete, onError, onFinalize) {
+    return new OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize);
+}
+var OperatorSubscriber = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(OperatorSubscriber, _super);
+    function OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize, shouldUnsubscribe) {
+        var _this = _super.call(this, destination) || this;
+        _this.onFinalize = onFinalize;
+        _this.shouldUnsubscribe = shouldUnsubscribe;
+        _this._next = onNext
+            ? function (value) {
+                try {
+                    onNext(value);
+                }
+                catch (err) {
+                    destination.error(err);
+                }
+            }
+            : _super.prototype._next;
+        _this._error = onError
+            ? function (err) {
+                try {
+                    onError(err);
+                }
+                catch (err) {
+                    destination.error(err);
+                }
+                finally {
+                    this.unsubscribe();
+                }
+            }
+            : _super.prototype._error;
+        _this._complete = onComplete
+            ? function () {
+                try {
+                    onComplete();
+                }
+                catch (err) {
+                    destination.error(err);
+                }
+                finally {
+                    this.unsubscribe();
+                }
+            }
+            : _super.prototype._complete;
+        return _this;
+    }
+    OperatorSubscriber.prototype.unsubscribe = function () {
+        var _a;
+        if (!this.shouldUnsubscribe || this.shouldUnsubscribe()) {
+            var closed_1 = this.closed;
+            _super.prototype.unsubscribe.call(this);
+            !closed_1 && ((_a = this.onFinalize) === null || _a === void 0 ? void 0 : _a.call(this));
+        }
+    };
+    return OperatorSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__[/* Subscriber */ "b"]));
+
+//# sourceMappingURL=OperatorSubscriber.js.map
 
 /***/ }),
-/* 180 */
-/***/ (function(module, exports) {
 
-module.exports = function () { /* empty */ };
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/audit.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return audit; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/***/ }),
-/* 181 */
-/***/ (function(module, exports) {
 
-module.exports = function (it, Constructor, name, forbiddenField) {
-  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
-    throw TypeError(name + ': incorrect invocation!');
-  } return it;
-};
 
+function audit(durationSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var lastValue = null;
+        var durationSubscriber = null;
+        var isComplete = false;
+        var endDuration = function () {
+            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
+            durationSubscriber = null;
+            if (hasValue) {
+                hasValue = false;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+            isComplete && subscriber.complete();
+        };
+        var cleanupDuration = function () {
+            durationSubscriber = null;
+            isComplete && subscriber.complete();
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            lastValue = value;
+            if (!durationSubscriber) {
+                Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(durationSelector(value)).subscribe((durationSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, endDuration, cleanupDuration)));
+            }
+        }, function () {
+            isComplete = true;
+            (!hasValue || !durationSubscriber || durationSubscriber.closed) && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=audit.js.map
 
 /***/ }),
-/* 182 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// 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;
-  };
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/auditTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return auditTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/audit.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-/***/ }),
-/* 183 */
-/***/ (function(module, exports, __webpack_require__) {
 
-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;
 
+function auditTime(duration, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_audit__WEBPACK_IMPORTED_MODULE_1__[/* audit */ "a"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__[/* timer */ "a"])(duration, scheduler); });
+}
+//# sourceMappingURL=auditTime.js.map
 
 /***/ }),
-/* 184 */
-/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
-  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
-});
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/buffer.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return buffer; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/***/ }),
-/* 185 */
-/***/ (function(module, exports) {
 
-// 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);
-};
 
+function buffer(closingNotifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var currentBuffer = [];
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return currentBuffer.push(value); }, function () {
+            subscriber.next(currentBuffer);
+            subscriber.complete();
+        }));
+        closingNotifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            var b = currentBuffer;
+            currentBuffer = [];
+            subscriber.next(b);
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]));
+        return function () {
+            currentBuffer = null;
+        };
+    });
+}
+//# sourceMappingURL=buffer.js.map
 
 /***/ }),
-/* 186 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// check on default Array iterator
-var Iterators = __webpack_require__(35);
-var ITERATOR = __webpack_require__(13)('iterator');
-var ArrayProto = Array.prototype;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferCount.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function (it) {
-  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferCount; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
 
-/***/ }),
-/* 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;
-  }
-};
 
+function bufferCount(bufferSize, startBufferEvery) {
+    if (startBufferEvery === void 0) { startBufferEvery = null; }
+    startBufferEvery = startBufferEvery !== null && startBufferEvery !== void 0 ? startBufferEvery : bufferSize;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var buffers = [];
+        var count = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a, e_2, _b;
+            var toEmit = null;
+            if (count++ % startBufferEvery === 0) {
+                buffers.push([]);
+            }
+            try {
+                for (var buffers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffers), buffers_1_1 = buffers_1.next(); !buffers_1_1.done; buffers_1_1 = buffers_1.next()) {
+                    var buffer = buffers_1_1.value;
+                    buffer.push(value);
+                    if (bufferSize <= buffer.length) {
+                        toEmit = toEmit !== null && toEmit !== void 0 ? toEmit : [];
+                        toEmit.push(buffer);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (buffers_1_1 && !buffers_1_1.done && (_a = buffers_1.return)) _a.call(buffers_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (toEmit) {
+                try {
+                    for (var toEmit_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(toEmit), toEmit_1_1 = toEmit_1.next(); !toEmit_1_1.done; toEmit_1_1 = toEmit_1.next()) {
+                        var buffer = toEmit_1_1.value;
+                        Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(buffers, buffer);
+                        subscriber.next(buffer);
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (toEmit_1_1 && !toEmit_1_1.done && (_b = toEmit_1.return)) _b.call(toEmit_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+        }, function () {
+            var e_3, _a;
+            try {
+                for (var buffers_2 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffers), buffers_2_1 = buffers_2.next(); !buffers_2_1.done; buffers_2_1 = buffers_2.next()) {
+                    var buffer = buffers_2_1.value;
+                    subscriber.next(buffer);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (buffers_2_1 && !buffers_2_1.done && (_a = buffers_2.return)) _a.call(buffers_2);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            subscriber.complete();
+        }, undefined, function () {
+            buffers = null;
+        }));
+    });
+}
+//# sourceMappingURL=bufferCount.js.map
 
 /***/ }),
-/* 188 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferTime; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-var create = __webpack_require__(192);
-var descriptor = __webpack_require__(106);
-var setToStringTag = __webpack_require__(71);
-var IteratorPrototype = {};
 
-// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
-__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
 
-module.exports = function (Constructor, NAME, next) {
-  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
-  setToStringTag(Constructor, NAME + ' Iterator');
-};
 
 
-/***/ }),
-/* 189 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var ITERATOR = __webpack_require__(13)('iterator');
-var SAFE_CLOSING = false;
 
-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 bufferTime(bufferTimeSpan) {
+    var _a, _b;
+    var otherArgs = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        otherArgs[_i - 1] = arguments[_i];
+    }
+    var scheduler = (_a = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popScheduler */ "c"])(otherArgs)) !== null && _a !== void 0 ? _a : _scheduler_async__WEBPACK_IMPORTED_MODULE_5__[/* asyncScheduler */ "b"];
+    var bufferCreationInterval = (_b = otherArgs[0]) !== null && _b !== void 0 ? _b : null;
+    var maxBufferSize = otherArgs[1] || Infinity;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var bufferRecords = [];
+        var restartOnEmit = false;
+        var emit = function (record) {
+            var buffer = record.buffer, subs = record.subs;
+            subs.unsubscribe();
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_4__[/* arrRemove */ "a"])(bufferRecords, record);
+            subscriber.next(buffer);
+            restartOnEmit && startBuffer();
+        };
+        var startBuffer = function () {
+            if (bufferRecords) {
+                var subs = new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]();
+                subscriber.add(subs);
+                var buffer = [];
+                var record_1 = {
+                    buffer: buffer,
+                    subs: subs,
+                };
+                bufferRecords.push(record_1);
+                Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subs, scheduler, function () { return emit(record_1); }, bufferTimeSpan);
+            }
+        };
+        if (bufferCreationInterval !== null && bufferCreationInterval >= 0) {
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subscriber, scheduler, startBuffer, bufferCreationInterval, true);
+        }
+        else {
+            restartOnEmit = true;
+        }
+        startBuffer();
+        var bufferTimeSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            var recordsCopy = bufferRecords.slice();
+            try {
+                for (var recordsCopy_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(recordsCopy), recordsCopy_1_1 = recordsCopy_1.next(); !recordsCopy_1_1.done; recordsCopy_1_1 = recordsCopy_1.next()) {
+                    var record = recordsCopy_1_1.value;
+                    var buffer = record.buffer;
+                    buffer.push(value);
+                    maxBufferSize <= buffer.length && emit(record);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (recordsCopy_1_1 && !recordsCopy_1_1.done && (_a = recordsCopy_1.return)) _a.call(recordsCopy_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }, function () {
+            while (bufferRecords === null || bufferRecords === void 0 ? void 0 : bufferRecords.length) {
+                subscriber.next(bufferRecords.shift().buffer);
+            }
+            bufferTimeSubscriber === null || bufferTimeSubscriber === void 0 ? void 0 : bufferTimeSubscriber.unsubscribe();
+            subscriber.complete();
+            subscriber.unsubscribe();
+        }, undefined, function () { return (bufferRecords = null); });
+        source.subscribe(bufferTimeSubscriber);
+    });
+}
+//# sourceMappingURL=bufferTime.js.map
 
 /***/ }),
-/* 190 */
-/***/ (function(module, exports) {
 
-module.exports = function (done, value) {
-  return { value: value, done: !!done };
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferToggle.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferToggle; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-/***/ }),
-/* 191 */
-/***/ (function(module, exports, __webpack_require__) {
 
-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();
-  };
 
-  // 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);
-    };
-  }
 
-  return function (fn) {
-    var task = { fn: fn, next: undefined };
-    if (last) last.next = task;
-    if (!head) {
-      head = task;
-      notify();
-    } last = task;
-  };
-};
 
+function bufferToggle(openings, closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var buffers = [];
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(openings).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (openValue) {
+            var buffer = [];
+            buffers.push(buffer);
+            var closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]();
+            var emitBuffer = function () {
+                Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_6__[/* arrRemove */ "a"])(buffers, buffer);
+                subscriber.next(buffer);
+                closingSubscription.unsubscribe();
+            };
+            closingSubscription.add(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(closingSelector(openValue)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, emitBuffer, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"])));
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"]));
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            try {
+                for (var buffers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffers), buffers_1_1 = buffers_1.next(); !buffers_1_1.done; buffers_1_1 = buffers_1.next()) {
+                    var buffer = buffers_1_1.value;
+                    buffer.push(value);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (buffers_1_1 && !buffers_1_1.done && (_a = buffers_1.return)) _a.call(buffers_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }, function () {
+            while (buffers.length > 0) {
+                subscriber.next(buffers.shift());
+            }
+            subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=bufferToggle.js.map
 
 /***/ }),
-/* 192 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// 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';
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferWhen; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-// 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);
-};
 
 
+function bufferWhen(closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var buffer = null;
+        var closingSubscriber = null;
+        var openBuffer = function () {
+            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
+            var b = buffer;
+            buffer = [];
+            b && subscriber.next(b);
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(closingSelector()).subscribe((closingSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, openBuffer, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"])));
+        };
+        openBuffer();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return buffer === null || buffer === void 0 ? void 0 : buffer.push(value); }, function () {
+            buffer && subscriber.next(buffer);
+            subscriber.complete();
+        }, undefined, function () { return (buffer = closingSubscriber = null); }));
+    });
+}
+//# sourceMappingURL=bufferWhen.js.map
+
 /***/ }),
-/* 193 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var dP = __webpack_require__(50);
-var anObject = __webpack_require__(27);
-var getKeys = __webpack_require__(132);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/catchError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return catchError; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-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 catchError(selector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSub = null;
+        var syncUnsub = false;
+        var handledResult;
+        innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, undefined, function (err) {
+            handledResult = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(selector(err, catchError(selector)(source)));
+            if (innerSub) {
+                innerSub.unsubscribe();
+                innerSub = null;
+                handledResult.subscribe(subscriber);
+            }
+            else {
+                syncUnsub = true;
+            }
+        }));
+        if (syncUnsub) {
+            innerSub.unsubscribe();
+            innerSub = null;
+            handledResult.subscribe(subscriber);
+        }
+    });
+}
+//# sourceMappingURL=catchError.js.map
+
 /***/ }),
-/* 194 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// 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;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineAll; });
+/* harmony import */ var _combineLatestAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js");
 
+var combineAll = _combineLatestAll__WEBPACK_IMPORTED_MODULE_0__[/* combineLatestAll */ "a"];
+//# sourceMappingURL=combineAll.js.map
 
 /***/ }),
-/* 195 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var has = __webpack_require__(49);
-var toIObject = __webpack_require__(74);
-var arrayIndexOf = __webpack_require__(182)(false);
-var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineLatest.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatest; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
 
 
-/***/ }),
-/* 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);
 
+function combineLatest() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popResultSelector */ "b"])(args);
+    return resultSelector
+        ? Object(_util_pipe__WEBPACK_IMPORTED_MODULE_5__[/* pipe */ "a"])(combineLatest.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args))), Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__[/* mapOneOrManyArgs */ "a"])(resultSelector))
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+            Object(_observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__[/* combineLatestInit */ "b"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__[/* argsOrArgArray */ "a"])(args))))(subscriber);
+        });
+}
+//# sourceMappingURL=combineLatest.js.map
 
 /***/ }),
-/* 198 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatestAll; });
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js");
+/* harmony import */ var _joinAllInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/joinAllInternals.js");
 
-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; }
-  });
-};
 
+function combineLatestAll(project) {
+    return Object(_joinAllInternals__WEBPACK_IMPORTED_MODULE_1__[/* joinAllInternals */ "a"])(_observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__[/* combineLatest */ "a"], project);
+}
+//# sourceMappingURL=combineLatestAll.js.map
 
 /***/ }),
-/* 199 */
-/***/ (function(module, exports, __webpack_require__) {
-
-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;
-  };
-};
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/***/ }),
-/* 200 */
-/***/ (function(module, exports, __webpack_require__) {
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatestWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatest.js");
 
-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);
-};
 
+function combineLatestWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
+    }
+    return _combineLatest__WEBPACK_IMPORTED_MODULE_1__[/* combineLatest */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)));
+}
+//# sourceMappingURL=combineLatestWith.js.map
 
 /***/ }),
-/* 201 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// 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");
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concat.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concat; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _concatAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
 
-/***/ }),
-/* 202 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var global = __webpack_require__(11);
-var navigator = global.navigator;
 
-module.exports = navigator && navigator.userAgent || '';
 
+function concat() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popScheduler */ "c"])(args);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_concatAll__WEBPACK_IMPORTED_MODULE_2__[/* concatAll */ "a"])()(Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__[/* from */ "a"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)), scheduler)).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=concat.js.map
 
 /***/ }),
-/* 203 */
-/***/ (function(module, exports, __webpack_require__) {
 
-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)];
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatAll; });
+/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
 
+function concatAll() {
+    return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__[/* mergeAll */ "a"])(1);
+}
+//# sourceMappingURL=concatAll.js.map
 
 /***/ }),
-/* 204 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatMap; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-var addToUnscopables = __webpack_require__(180);
-var step = __webpack_require__(190);
-var Iterators = __webpack_require__(35);
-var toIObject = __webpack_require__(74);
 
-// 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');
+function concatMap(project, resultSelector) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector) ? Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(project, resultSelector, 1) : Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(project, 1);
+}
+//# sourceMappingURL=concatMap.js.map
 
-// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
-Iterators.Arguments = Iterators.Array;
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatMapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatMapTo; });
+/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-addToUnscopables('keys');
-addToUnscopables('values');
-addToUnscopables('entries');
 
+function concatMapTo(innerObservable, resultSelector) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector) ? Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__[/* concatMap */ "a"])(function () { return innerObservable; }, resultSelector) : Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__[/* concatMap */ "a"])(function () { return innerObservable; });
+}
+//# sourceMappingURL=concatMapTo.js.map
 
 /***/ }),
-/* 205 */
-/***/ (function(module, exports) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _concat__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concat.js");
 
 
+function concatWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
+    }
+    return _concat__WEBPACK_IMPORTED_MODULE_1__[/* concat */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)));
+}
+//# sourceMappingURL=concatWith.js.map
 
 /***/ }),
-/* 206 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/connect.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return connect; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_fromSubscribable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/fromSubscribable.js");
 
-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 {
-        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);
-        }
-      });
-      // 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 });
-    }
-  });
-};
-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 {
-          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
-        } catch (e) {
-          $reject.call(wrapper, e);
-        }
-      });
-    } else {
-      promise._v = value;
-      promise._s = 1;
-      notify(promise, false);
-    }
-  } catch (e) {
-    $reject.call({ _w: promise, _d: false }, e); // wrap
-  }
-};
 
-// 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);
-    }
-  };
-  // 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);
-  };
+var DEFAULT_CONFIG = {
+    connector: function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"](); },
+};
+function connect(selector, config) {
+    if (config === void 0) { config = DEFAULT_CONFIG; }
+    var connector = config.connector;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var subject = connector();
+        Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__[/* from */ "a"])(selector(Object(_observable_fromSubscribable__WEBPACK_IMPORTED_MODULE_3__[/* fromSubscribable */ "a"])(subject))).subscribe(subscriber);
+        subscriber.add(source.subscribe(subject));
+    });
 }
+//# sourceMappingURL=connect.js.map
 
-$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];
+/***/ }),
 
-// 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;
-  }
-});
-$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);
-  }
-});
-$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;
-  }
-});
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/count.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return count; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+
+function count(predicate) {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(function (total, value, i) { return (!predicate || predicate(value, i) ? total + 1 : total); }, 0);
+}
+//# sourceMappingURL=count.js.map
 
 /***/ }),
-/* 207 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/debounce.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return debounce; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-var $at = __webpack_require__(199)(true);
 
-// 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 };
-});
 
 
+function debounce(durationSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var lastValue = null;
+        var durationSubscriber = null;
+        var emit = function () {
+            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
+            durationSubscriber = null;
+            if (hasValue) {
+                hasValue = false;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
+            hasValue = true;
+            lastValue = value;
+            durationSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, emit, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]);
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(durationSelector(value)).subscribe(durationSubscriber);
+        }, function () {
+            emit();
+            subscriber.complete();
+        }, undefined, function () {
+            lastValue = durationSubscriber = null;
+        }));
+    });
+}
+//# sourceMappingURL=debounce.js.map
+
 /***/ }),
-/* 208 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/debounceTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-// https://github.com/tc39/proposal-promise-finally
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return debounceTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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
-  );
-} });
 
+function debounceTime(dueTime, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var activeTask = null;
+        var lastValue = null;
+        var lastTime = null;
+        var emit = function () {
+            if (activeTask) {
+                activeTask.unsubscribe();
+                activeTask = null;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+        };
+        function emitWhenIdle() {
+            var targetTime = lastTime + dueTime;
+            var now = scheduler.now();
+            if (now < targetTime) {
+                activeTask = this.schedule(undefined, targetTime - now);
+                subscriber.add(activeTask);
+                return;
+            }
+            emit();
+        }
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            lastValue = value;
+            lastTime = scheduler.now();
+            if (!activeTask) {
+                activeTask = scheduler.schedule(emitWhenIdle, dueTime);
+                subscriber.add(activeTask);
+            }
+        }, function () {
+            emit();
+            subscriber.complete();
+        }, undefined, function () {
+            lastValue = activeTask = null;
+        }));
+    });
+}
+//# sourceMappingURL=debounceTime.js.map
 
 /***/ }),
-/* 209 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// https://github.com/tc39/proposal-promise-try
-var $export = __webpack_require__(41);
-var newPromiseCapability = __webpack_require__(70);
-var perform = __webpack_require__(104);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defaultIfEmpty; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-$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;
-} });
 
+function defaultIfEmpty(defaultValue) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            subscriber.next(value);
+        }, function () {
+            if (!hasValue) {
+                subscriber.next(defaultValue);
+            }
+            subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=defaultIfEmpty.js.map
 
 /***/ }),
-/* 210 */
-/***/ (function(module, exports, __webpack_require__) {
 
-__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');
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/delay.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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(',');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return delay; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _delayWhen__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-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;
-}
 
 
-/***/ }),
-/* 211 */
-/***/ (function(module, exports, __webpack_require__) {
+function delay(due, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    var duration = Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__[/* timer */ "a"])(due, scheduler);
+    return Object(_delayWhen__WEBPACK_IMPORTED_MODULE_1__[/* delayWhen */ "a"])(function () { return duration; });
+}
+//# sourceMappingURL=delay.js.map
 
-/**
- * This is the web browser implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+/***/ }),
 
-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();
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Colors.
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return delayWhen; });
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony import */ var _ignoreElements__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js");
+/* harmony import */ var _mapTo__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js");
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
 
-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+)/));
+function delayWhen(delayDurationSelector, subscriptionDelay) {
+    if (subscriptionDelay) {
+        return function (source) {
+            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__[/* concat */ "a"])(subscriptionDelay.pipe(Object(_take__WEBPACK_IMPORTED_MODULE_1__[/* take */ "a"])(1), Object(_ignoreElements__WEBPACK_IMPORTED_MODULE_2__[/* ignoreElements */ "a"])()), source.pipe(delayWhen(delayDurationSelector)));
+        };
+    }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_4__[/* mergeMap */ "a"])(function (value, index) { return delayDurationSelector(value, index).pipe(Object(_take__WEBPACK_IMPORTED_MODULE_1__[/* take */ "a"])(1), Object(_mapTo__WEBPACK_IMPORTED_MODULE_3__[/* mapTo */ "a"])(value)); });
 }
+//# sourceMappingURL=delayWhen.js.map
 
-/**
- * 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;
-  }
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/dematerialize.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return dematerialize; });
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Notification.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * 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);
+function dematerialize() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (notification) { return Object(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* observeNotification */ "c"])(notification, subscriber); }));
+    });
+}
+//# sourceMappingURL=dematerialize.js.map
 
-  if (!useColors) return;
+/***/ }),
 
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit')
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/distinct.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // 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;
-    }
-  });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return distinct; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-  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);
+function distinct(keySelector, flushes) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var distinctKeys = new Set();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var key = keySelector ? keySelector(value) : value;
+            if (!distinctKeys.has(key)) {
+                distinctKeys.add(key);
+                subscriber.next(value);
+            }
+        }));
+        flushes === null || flushes === void 0 ? void 0 : flushes.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () { return distinctKeys.clear(); }, _util_noop__WEBPACK_IMPORTED_MODULE_2__[/* noop */ "a"]));
+    });
 }
+//# sourceMappingURL=distinct.js.map
 
-/**
- * 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) {}
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return distinctUntilChanged; });
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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;
+function distinctUntilChanged(comparator, keySelector) {
+    if (keySelector === void 0) { keySelector = _util_identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"]; }
+    comparator = comparator !== null && comparator !== void 0 ? comparator : defaultCompare;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var previousKey;
+        var first = true;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var currentKey = keySelector(value);
+            if (first || !comparator(previousKey, currentKey)) {
+                first = false;
+                previousKey = currentKey;
+                subscriber.next(value);
+            }
+        }));
+    });
 }
-
-/**
- * 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) {}
+function defaultCompare(a, b) {
+    return a === b;
 }
-
+//# sourceMappingURL=distinctUntilChanged.js.map
 
 /***/ }),
-/* 212 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Detect Electron renderer process, which is node, but we should
- * treat as a browser.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilKeyChanged.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-if (typeof process === 'undefined' || process.type === 'renderer') {
-  module.exports = __webpack_require__(211);
-} else {
-  module.exports = __webpack_require__(213);
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return distinctUntilKeyChanged; });
+/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js");
 
+function distinctUntilKeyChanged(key, compare) {
+    return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__[/* distinctUntilChanged */ "a"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
+}
+//# sourceMappingURL=distinctUntilKeyChanged.js.map
 
 /***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Module dependencies.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/elementAt.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var tty = __webpack_require__(79);
-var util = __webpack_require__(2);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return elementAt; });
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ArgumentOutOfRangeError.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
 
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
 
-exports = module.exports = __webpack_require__(112);
-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__(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.
+function elementAt(index, defaultValue) {
+    if (index < 0) {
+        throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__[/* ArgumentOutOfRangeError */ "a"]();
+    }
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__[/* take */ "a"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__[/* defaultIfEmpty */ "a"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__[/* throwIfEmpty */ "a"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__[/* ArgumentOutOfRangeError */ "a"](); }));
+    };
 }
+//# sourceMappingURL=elementAt.js.map
 
-/**
- * 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() });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/endWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // 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);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return endWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/of.js");
 
-  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);
+function endWith() {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
+    }
+    return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_1__[/* concat */ "a"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_2__[/* of */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(values)))); };
 }
+//# sourceMappingURL=endWith.js.map
 
-/**
- * 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(' ');
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/every.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Map %o to `util.inspect()`, allowing multiple lines if needed.
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return every; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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 every(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            if (!predicate.call(thisArg, value, index++, source)) {
+                subscriber.next(false);
+                subscriber.complete();
+            }
+        }, function () {
+            subscriber.next(true);
+            subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=every.js.map
 
-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';
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/exhaust.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    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];
-  }
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exhaust; });
+/* harmony import */ var _exhaustAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js");
 
-function getDate() {
-  if (exports.inspectOpts.hideDate) {
-    return '';
-  } else {
-    return new Date().toISOString() + ' ';
-  }
-}
+var exhaust = _exhaustAll__WEBPACK_IMPORTED_MODULE_0__[/* exhaustAll */ "a"];
+//# sourceMappingURL=exhaust.js.map
 
-/**
- * Invokes `util.format()` with the specified arguments and writes to stderr.
- */
+/***/ }),
 
-function log() {
-  return process.stderr.write(util.format.apply(util, arguments) + '\n');
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exhaustAll; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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;
+function exhaustAll() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var isComplete = false;
+        var innerSub = null;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (inner) {
+            if (!innerSub) {
+                innerSub = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(inner).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                    innerSub = null;
+                    isComplete && subscriber.complete();
+                }));
+            }
+        }, function () {
+            isComplete = true;
+            !innerSub && subscriber.complete();
+        }));
+    });
 }
+//# sourceMappingURL=exhaustAll.js.map
 
-/**
- * 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 = {};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exhaustMap; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  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());
 
+function exhaustMap(project, resultSelector) {
+    if (resultSelector) {
+        return function (source) {
+            return source.pipe(exhaustMap(function (a, i) { return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }));
+        };
+    }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        var innerSub = null;
+        var isComplete = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (outerValue) {
+            if (!innerSub) {
+                innerSub = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                    innerSub = null;
+                    isComplete && subscriber.complete();
+                });
+                Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(project(outerValue, index++)).subscribe(innerSub);
+            }
+        }, function () {
+            isComplete = true;
+            !innerSub && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=exhaustMap.js.map
 
 /***/ }),
-/* 214 */,
-/* 215 */,
-/* 216 */,
-/* 217 */
-/***/ (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.
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/expand.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var pathModule = __webpack_require__(0);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(3);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return expand; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js");
 
-// JavaScript implementation of realpath, ported from node pre-v6
 
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+function expand(project, concurrent, scheduler) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    concurrent = (concurrent || 0) < 1 ? Infinity : concurrent;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_1__[/* mergeInternals */ "a"])(source, subscriber, project, concurrent, undefined, true, scheduler);
+    });
+}
+//# sourceMappingURL=expand.js.map
 
-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;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/filter.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return filter; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  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();
+function filter(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return predicate.call(thisArg, value, index++) && subscriber.next(value); }));
+    });
 }
+//# sourceMappingURL=filter.js.map
 
-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;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/finalize.js":
+/***/ (function(module, __webpack_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";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return finalize; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+
+function finalize(callback) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        try {
+            source.subscribe(subscriber);
+        }
+        finally {
+            subscriber.add(callback);
+        }
+    });
 }
+//# sourceMappingURL=finalize.js.map
 
-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];
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/find.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return find; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createFind; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  // 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 = '';
+function find(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(createFind(predicate, thisArg, 'value'));
+}
+function createFind(predicate, thisArg, emit) {
+    var findIndex = emit === 'index';
+    return function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var i = index++;
+            if (predicate.call(thisArg, value, i, source)) {
+                subscriber.next(findIndex ? i : value);
+                subscriber.complete();
+            }
+        }, function () {
+            subscriber.next(findIndex ? -1 : undefined);
+            subscriber.complete();
+        }));
+    };
+}
+//# sourceMappingURL=find.js.map
 
-    // 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;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/findIndex.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return findIndex; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _find__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/find.js");
 
-    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;
-    }
+function findIndex(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(Object(_find__WEBPACK_IMPORTED_MODULE_1__[/* createFind */ "a"])(predicate, thisArg, 'index'));
+}
+//# sourceMappingURL=findIndex.js.map
 
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
+/***/ }),
 
-  if (cache) cache[original] = p;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/first.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  return p;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return first; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
 
-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;
+function first(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__[/* identity */ "a"], Object(_take__WEBPACK_IMPORTED_MODULE_2__[/* take */ "a"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__[/* defaultIfEmpty */ "a"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__[/* throwIfEmpty */ "a"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"](); }));
+    };
+}
+//# sourceMappingURL=first.js.map
 
-  start();
+/***/ }),
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/flatMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    // 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);
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return flatMap; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
 
-  // 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);
-    }
+var flatMap = _mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"];
+//# sourceMappingURL=flatMap.js.map
 
-    // 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);
-    }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/groupBy.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return groupBy; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-    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 groupBy(keySelector, elementOrOptions, duration, connector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var element;
+        if (!elementOrOptions || typeof elementOrOptions === 'function') {
+            element = elementOrOptions;
+        }
+        else {
+            (duration = elementOrOptions.duration, element = elementOrOptions.element, connector = elementOrOptions.connector);
+        }
+        var groups = new Map();
+        var notify = function (cb) {
+            groups.forEach(cb);
+            cb(subscriber);
+        };
+        var handleError = function (err) { return notify(function (consumer) { return consumer.error(err); }); };
+        var activeGroups = 0;
+        var teardownAttempted = false;
+        var groupBySourceSubscriber = new _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* OperatorSubscriber */ "a"](subscriber, function (value) {
+            try {
+                var key_1 = keySelector(value);
+                var group_1 = groups.get(key_1);
+                if (!group_1) {
+                    groups.set(key_1, (group_1 = connector ? connector() : new _Subject__WEBPACK_IMPORTED_MODULE_2__[/* Subject */ "a"]()));
+                    var grouped = createGroupedObservable(key_1, group_1);
+                    subscriber.next(grouped);
+                    if (duration) {
+                        var durationSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(group_1, function () {
+                            group_1.complete();
+                            durationSubscriber_1 === null || durationSubscriber_1 === void 0 ? void 0 : durationSubscriber_1.unsubscribe();
+                        }, undefined, undefined, function () { return groups.delete(key_1); });
+                        groupBySourceSubscriber.add(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(duration(grouped)).subscribe(durationSubscriber_1));
+                    }
+                }
+                group_1.next(element ? element(value) : value);
+            }
+            catch (err) {
+                handleError(err);
+            }
+        }, function () { return notify(function (consumer) { return consumer.complete(); }); }, handleError, function () { return groups.clear(); }, function () {
+            teardownAttempted = true;
+            return activeGroups === 0;
+        });
+        source.subscribe(groupBySourceSubscriber);
+        function createGroupedObservable(key, groupSubject) {
+            var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (groupSubscriber) {
+                activeGroups++;
+                var innerSub = groupSubject.subscribe(groupSubscriber);
+                return function () {
+                    innerSub.unsubscribe();
+                    --activeGroups === 0 && teardownAttempted && groupBySourceSubscriber.unsubscribe();
+                };
+            });
+            result.key = key;
+            return result;
+        }
     });
-  }
+}
+//# sourceMappingURL=groupBy.js.map
 
-  function gotTarget(err, target, base) {
-    if (err) return cb(err);
+/***/ }),
 
-    var resolvedLink = pathModule.resolve(previous, target);
-    if (cache) cache[base] = resolvedLink;
-    gotResolvedLink(resolvedLink);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ignoreElements; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-  function gotResolvedLink(resolvedLink) {
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
-};
 
 
+function ignoreElements() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, _util_noop__WEBPACK_IMPORTED_MODULE_2__[/* noop */ "a"]));
+    });
+}
+//# sourceMappingURL=ignoreElements.js.map
+
 /***/ }),
-/* 218 */
-/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = globSync
-globSync.GlobSync = GlobSync
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/isEmpty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isEmpty; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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
+function isEmpty() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            subscriber.next(false);
+            subscriber.complete();
+        }, function () {
+            subscriber.next(true);
+            subscriber.complete();
+        }));
+    });
 }
+//# sourceMappingURL=isEmpty.js.map
 
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
+/***/ }),
 
-  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')
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/joinAllInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return joinAllInternals; });
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _toArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js");
 
-  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()
-}
 
-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)
+
+function joinAllInternals(joinFn, project) {
+    return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_2__[/* pipe */ "a"])(Object(_toArray__WEBPACK_IMPORTED_MODULE_4__[/* toArray */ "a"])(), Object(_mergeMap__WEBPACK_IMPORTED_MODULE_3__[/* mergeMap */ "a"])(function (sources) { return joinFn(sources); }), project ? Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_1__[/* mapOneOrManyArgs */ "a"])(project) : _util_identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"]);
 }
+//# sourceMappingURL=joinAllInternals.js.map
 
+/***/ }),
 
-GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/last.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // 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.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return last; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js");
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-  // 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)
+function last(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__[/* identity */ "a"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__[/* takeLast */ "a"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__[/* defaultIfEmpty */ "a"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__[/* throwIfEmpty */ "a"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"](); }));
+    };
+}
+//# sourceMappingURL=last.js.map
 
-  //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)
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/map.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return map; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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
+function map(project, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            subscriber.next(project.call(thisArg, value, index++));
+        }));
+    });
+}
+//# sourceMappingURL=map.js.map
 
-  // 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)
-    }
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mapTo; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
-  // 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.
+function mapTo(value) {
+    return Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function () { return value; });
+}
+//# sourceMappingURL=mapTo.js.map
 
-  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
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/materialize.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      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
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return materialize; });
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Notification.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  // 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)
-  }
+
+
+function materialize() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* Notification */ "a"].createNext(value));
+        }, function () {
+            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* Notification */ "a"].createComplete());
+            subscriber.complete();
+        }, function (err) {
+            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* Notification */ "a"].createError(err));
+            subscriber.complete();
+        }));
+    });
 }
+//# sourceMappingURL=materialize.js.map
 
+/***/ }),
 
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/max.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var abs = this._makeAbs(e)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return max; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  if (this.mark)
-    e = this._mark(e)
 
-  if (this.absolute) {
-    e = abs
-  }
-
-  if (this.matches[index][e])
-    return
+function max(comparer) {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(comparer) ? function (x, y) { return (comparer(x, y) > 0 ? x : y); } : function (x, y) { return (x > y ? x : y); });
+}
+//# sourceMappingURL=max.js.map
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+/***/ }),
 
-  this.matches[index][e] = true
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/merge.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (this.stat)
-    this._stat(e)
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return merge; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
 
-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)
 
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
-    }
-  }
 
-  var isSym = lstat && lstat.isSymbolicLink()
-  this.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())
-    this.cache[abs] = 'FILE'
-  else
-    entries = this._readdir(abs, false)
 
-  return entries
+function merge() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_4__[/* popScheduler */ "c"])(args);
+    var concurrent = Object(_util_args__WEBPACK_IMPORTED_MODULE_4__[/* popNumber */ "a"])(args, Infinity);
+    args = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__[/* argsOrArgArray */ "a"])(args);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_mergeAll__WEBPACK_IMPORTED_MODULE_3__[/* mergeAll */ "a"])(concurrent)(Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__[/* from */ "a"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)), scheduler)).subscribe(subscriber);
+    });
 }
+//# sourceMappingURL=merge.js.map
 
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
+/***/ }),
 
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return null
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeAll; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-    if (Array.isArray(c))
-      return c
-  }
 
-  try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
-  }
+function mergeAll(concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"], concurrent);
 }
+//# sourceMappingURL=mergeAll.js.map
 
-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
-    }
-  }
+/***/ }),
 
-  this.cache[abs] = entries
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // mark and cache dir-ness
-  return entries
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeInternals; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-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
 
-    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
-  }
+function mergeInternals(source, subscriber, project, concurrent, onBeforeNext, expand, innerSubScheduler, additionalFinalizer) {
+    var buffer = [];
+    var active = 0;
+    var index = 0;
+    var isComplete = false;
+    var checkComplete = function () {
+        if (isComplete && !buffer.length && !active) {
+            subscriber.complete();
+        }
+    };
+    var outerNext = function (value) { return (active < concurrent ? doInnerSub(value) : buffer.push(value)); };
+    var doInnerSub = function (value) {
+        expand && subscriber.next(value);
+        active++;
+        var innerComplete = false;
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(project(value, index++)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (innerValue) {
+            onBeforeNext === null || onBeforeNext === void 0 ? void 0 : onBeforeNext(innerValue);
+            if (expand) {
+                outerNext(innerValue);
+            }
+            else {
+                subscriber.next(innerValue);
+            }
+        }, function () {
+            innerComplete = true;
+        }, undefined, function () {
+            if (innerComplete) {
+                try {
+                    active--;
+                    var _loop_1 = function () {
+                        var bufferedValue = buffer.shift();
+                        if (innerSubScheduler) {
+                            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__[/* executeSchedule */ "a"])(subscriber, innerSubScheduler, function () { return doInnerSub(bufferedValue); });
+                        }
+                        else {
+                            doInnerSub(bufferedValue);
+                        }
+                    };
+                    while (buffer.length && active < concurrent) {
+                        _loop_1();
+                    }
+                    checkComplete();
+                }
+                catch (err) {
+                    subscriber.error(err);
+                }
+            }
+        }));
+    };
+    source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, outerNext, function () {
+        isComplete = true;
+        checkComplete();
+    }));
+    return function () {
+        additionalFinalizer === null || additionalFinalizer === void 0 ? void 0 : additionalFinalizer();
+    };
 }
+//# sourceMappingURL=mergeInternals.js.map
 
-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)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeMap; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  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)
-  }
+function mergeMap(project, resultSelector, concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_4__[/* isFunction */ "a"])(resultSelector)) {
+        return mergeMap(function (a, i) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function (b, ii) { return resultSelector(a, b, i, ii); })(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(project(a, i))); }, concurrent);
+    }
+    else if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) { return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_3__[/* mergeInternals */ "a"])(source, subscriber, project, concurrent); });
 }
+//# sourceMappingURL=mergeMap.js.map
 
-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
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeMapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  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 += '/'
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeMapTo; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
+function mergeMapTo(innerObservable, resultSelector, concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector)) {
+        return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(function () { return innerObservable; }, resultSelector, concurrent);
+    }
+    if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(function () { return innerObservable; }, concurrent);
 }
+//# sourceMappingURL=mergeMapTo.js.map
 
-// Returns either 'DIR', 'FILE', or false
-GlobSync.prototype._stat = function (f) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+/***/ }),
 
-  if (f.length > this.maxLength)
-    return false
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeScan.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeScan; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js");
 
-    if (Array.isArray(c))
-      c = 'DIR'
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
+function mergeScan(accumulator, seed, concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var state = seed;
+        return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_1__[/* mergeInternals */ "a"])(source, subscriber, function (value, index) { return accumulator(state, value, index); }, concurrent, function (value) {
+            state = value;
+        }, false, undefined, function () { return (state = null); });
+    });
+}
+//# sourceMappingURL=mergeScan.js.map
 
-    if (needDir && c === 'FILE')
-      return false
+/***/ }),
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  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
-      }
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _merge__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/merge.js");
 
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
-      }
-    } else {
-      stat = lstat
+
+function mergeWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
     }
-  }
+    return _merge__WEBPACK_IMPORTED_MODULE_1__[/* merge */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)));
+}
+//# sourceMappingURL=mergeWith.js.map
 
-  this.statCache[abs] = stat
+/***/ }),
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/min.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  this.cache[abs] = this.cache[abs] || c
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return min; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  if (needDir && c === 'FILE')
-    return false
 
-  return c
+function min(comparer) {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(comparer) ? function (x, y) { return (comparer(x, y) < 0 ? x : y); } : function (x, y) { return (x < y ? x : y); });
 }
+//# sourceMappingURL=min.js.map
 
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return multicast; });
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _connect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
 
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
 
 
+function multicast(subjectOrSubjectFactory, selector) {
+    var subjectFactory = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(subjectOrSubjectFactory) ? subjectOrSubjectFactory : function () { return subjectOrSubjectFactory; };
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(selector)) {
+        return Object(_connect__WEBPACK_IMPORTED_MODULE_2__[/* connect */ "a"])(selector, {
+            connector: subjectFactory,
+        });
+    }
+    return function (source) { return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__[/* ConnectableObservable */ "a"](source, subjectFactory); };
+}
+//# sourceMappingURL=multicast.js.map
+
 /***/ }),
-/* 219 */,
-/* 220 */,
-/* 221 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function (flag, argv) {
-	argv = argv || process.argv;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observeOn; });
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-	var terminatorPos = argv.indexOf('--');
-	var prefix = /^--/.test(flag) ? '' : '--';
-	var pos = argv.indexOf(prefix + flag);
 
-	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
-};
 
+function observeOn(scheduler, delay) {
+    if (delay === void 0) { delay = 0; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__[/* executeSchedule */ "a"])(subscriber, scheduler, function () { return subscriber.next(value); }, delay); }, function () { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__[/* executeSchedule */ "a"])(subscriber, scheduler, function () { return subscriber.complete(); }, delay); }, function (err) { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__[/* executeSchedule */ "a"])(subscriber, scheduler, function () { return subscriber.error(err); }, delay); }));
+    });
+}
+//# sourceMappingURL=observeOn.js.map
 
 /***/ }),
-/* 222 */,
-/* 223 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var wrappy = __webpack_require__(123)
-var reqs = Object.create(null)
-var once = __webpack_require__(61)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/onErrorResumeNext.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = wrappy(inflight)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return onErrorResumeNext; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
 
-function makeres (key) {
-  return once(function RES () {
-    var cbs = reqs[key]
-    var len = cbs.length
-    var args = slice(arguments)
 
-    // 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]
-      }
+
+
+
+function onErrorResumeNext() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
     }
-  })
+    var nextSources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__[/* argsOrArgArray */ "a"])(sources);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var remaining = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(nextSources));
+        var subscribeNext = function () {
+            if (!subscriber.closed) {
+                if (remaining.length > 0) {
+                    var nextSource = void 0;
+                    try {
+                        nextSource = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(remaining.shift());
+                    }
+                    catch (err) {
+                        subscribeNext();
+                        return;
+                    }
+                    var innerSub = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"], _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"]);
+                    nextSource.subscribe(innerSub);
+                    innerSub.add(subscribeNext);
+                }
+                else {
+                    subscriber.complete();
+                }
+            }
+        };
+        subscribeNext();
+    });
 }
+//# sourceMappingURL=onErrorResumeNext.js.map
 
-function slice (args) {
-  var length = args.length
-  var array = []
+/***/ }),
 
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/pairwise.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pairwise; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/***/ }),
-/* 224 */
-/***/ (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
-      }
+function pairwise() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var prev;
+        var hasPrev = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var p = prev;
+            prev = value;
+            hasPrev && subscriber.next([p, value]);
+            hasPrev = 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
-  }
 }
-
+//# sourceMappingURL=pairwise.js.map
 
 /***/ }),
-/* 225 */,
-/* 226 */,
-/* 227 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// @flow
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/partition.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/*::
-declare var __webpack_require__: mixed;
-*/
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return partition; });
+/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/not.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
 
-module.exports = typeof __webpack_require__ !== "undefined";
 
+function partition(predicate, thisArg) {
+    return function (source) {
+        return [Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(predicate, thisArg)(source), Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__[/* not */ "a"])(predicate, thisArg))(source)];
+    };
+}
+//# sourceMappingURL=partition.js.map
 
 /***/ }),
-/* 228 */,
-/* 229 */
-/***/ (function(module, exports) {
 
-/**
- * Helpers.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/pluck.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pluck; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
-/**
- * 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;
-  }
+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 Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function (x) {
+        var currentProp = x;
+        for (var i = 0; i < length; i++) {
+            var p = currentProp === null || currentProp === void 0 ? void 0 : currentProp[properties[i]];
+            if (typeof p !== 'undefined') {
+                currentProp = p;
+            }
+            else {
+                return undefined;
+            }
+        }
+        return currentProp;
+    });
 }
+//# sourceMappingURL=pluck.js.map
 
-/**
- * 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';
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publish.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publish; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony import */ var _connect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
 
-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';
+function publish(selector) {
+    return selector ? function (source) { return Object(_connect__WEBPACK_IMPORTED_MODULE_2__[/* connect */ "a"])(selector)(source); } : function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__[/* multicast */ "a"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]())(source); };
 }
-
+//# sourceMappingURL=publish.js.map
 
 /***/ }),
-/* 230 */,
-/* 231 */,
-/* 232 */,
-/* 233 */
-/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publishBehavior.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publishBehavior; });
+/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/BehaviorSubject.js");
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
 
-var defaultGlobOpts = {
-  nosort: true,
-  silent: true
-}
 
-// for EMFILE handling
-var timeout = 0
+function publishBehavior(initialValue) {
+    return function (source) {
+        var subject = new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__[/* BehaviorSubject */ "a"](initialValue);
+        return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__[/* ConnectableObservable */ "a"](source, function () { return subject; });
+    };
+}
+//# sourceMappingURL=publishBehavior.js.map
 
-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]
-  })
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publishLast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  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
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publishLast; });
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js");
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
 
-function rimraf (p, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
 
-  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')
+function publishLast() {
+    return function (source) {
+        var subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__[/* AsyncSubject */ "a"]();
+        return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__[/* ConnectableObservable */ "a"](source, function () { return subject; });
+    };
+}
+//# sourceMappingURL=publishLast.js.map
 
-  defaults(options)
+/***/ }),
 
-  var busyTries = 0
-  var errState = null
-  var n = 0
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publishReplay.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publishReplay; });
+/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js");
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  options.lstat(p, function (er, stat) {
-    if (!er)
-      return afterGlob(null, [p])
 
-    glob(p, options.glob, afterGlob)
-  })
 
-  function next (er) {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
+function publishReplay(bufferSize, windowTime, selectorOrScheduler, timestampProvider) {
+    if (selectorOrScheduler && !Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__[/* isFunction */ "a"])(selectorOrScheduler)) {
+        timestampProvider = selectorOrScheduler;
+    }
+    var selector = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__[/* isFunction */ "a"])(selectorOrScheduler) ? selectorOrScheduler : undefined;
+    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__[/* multicast */ "a"])(new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__[/* ReplaySubject */ "a"](bufferSize, windowTime, timestampProvider), selector)(source); };
+}
+//# sourceMappingURL=publishReplay.js.map
 
-  function afterGlob (er, results) {
-    if (er)
-      return cb(er)
+/***/ }),
 
-    n = results.length
-    if (n === 0)
-      return cb()
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/race.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    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)
-          }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return race; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _raceWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js");
 
-          // 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 ++)
-          }
 
-          // already gone
-          if (er.code === "ENOENT") er = null
-        }
 
-        timeout = 0
-        next(er)
-      })
-    })
-  }
+function race() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return _raceWith__WEBPACK_IMPORTED_MODULE_2__[/* raceWith */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_1__[/* argsOrArgArray */ "a"])(args))));
 }
+//# sourceMappingURL=race.js.map
 
-// 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')
+/***/ }),
 
-  // 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)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return raceWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/race.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
 
-    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)
-    })
-  })
-}
 
-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)
-      })
-  })
+function raceWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
+    }
+    return !otherSources.length
+        ? _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"]
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+            Object(_observable_race__WEBPACK_IMPORTED_MODULE_1__[/* raceInit */ "b"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)))(subscriber);
+        });
 }
+//# sourceMappingURL=raceWith.js.map
 
-function fixWinEPERMSync (p, options, er) {
-  assert(p)
-  assert(options)
-  if (er)
-    assert(er instanceof Error)
-
-  try {
-    options.chmodSync(p, _0666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+/***/ }),
 
-  try {
-    var stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return reduce; });
+/* harmony import */ var _scanInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scanInternals.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-function rmdir (p, options, originalEr, cb) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-  assert(typeof cb === 'function')
 
-  // 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 reduce(accumulator, seed) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(Object(_scanInternals__WEBPACK_IMPORTED_MODULE_0__[/* scanInternals */ "a"])(accumulator, seed, arguments.length >= 2, false, true));
 }
+//# sourceMappingURL=reduce.js.map
 
-function rmkids(p, options, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+/***/ }),
 
-  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)
-      })
-    })
-  })
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// 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)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return refCount; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  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')
 
-  var results
+function refCount() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var connection = null;
+        source._refCount++;
+        var refCounter = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, undefined, undefined, function () {
+            if (!source || source._refCount <= 0 || 0 < --source._refCount) {
+                connection = null;
+                return;
+            }
+            var sharedConnection = source._connection;
+            var conn = connection;
+            connection = null;
+            if (sharedConnection && (!conn || sharedConnection === conn)) {
+                sharedConnection.unsubscribe();
+            }
+            subscriber.unsubscribe();
+        });
+        source.subscribe(refCounter);
+        if (!refCounter.closed) {
+            connection = source.connect();
+        }
+    });
+}
+//# sourceMappingURL=refCount.js.map
 
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
-  }
+/***/ }),
 
-  if (!results.length)
-    return
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/repeat.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  for (var i = 0; i < results.length; i++) {
-    var p = results[i]
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return repeat; });
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-    try {
-      var 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)
-    }
 
-    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
 
-      rmdirSync(p, options, er)
-    }
-  }
-}
 
-function 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 rmkidsSync (p, options) {
-  assert(p)
-  assert(options)
-  options.readdirSync(p).forEach(function (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.
-  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
+function repeat(countOrConfig) {
+    var _a;
+    var count = Infinity;
+    var delay;
+    if (countOrConfig != null) {
+        if (typeof countOrConfig === 'object') {
+            (_a = countOrConfig.count, count = _a === void 0 ? Infinity : _a, delay = countOrConfig.delay);
+        }
+        else {
+            count = countOrConfig;
+        }
     }
-  } while (true)
+    return count <= 0
+        ? function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]; }
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var soFar = 0;
+            var sourceSub;
+            var resubscribe = function () {
+                sourceSub === null || sourceSub === void 0 ? void 0 : sourceSub.unsubscribe();
+                sourceSub = null;
+                if (delay != null) {
+                    var notifier = typeof delay === 'number' ? Object(_observable_timer__WEBPACK_IMPORTED_MODULE_4__[/* timer */ "a"])(delay) : Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(delay(soFar));
+                    var notifierSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                        notifierSubscriber_1.unsubscribe();
+                        subscribeToSource();
+                    });
+                    notifier.subscribe(notifierSubscriber_1);
+                }
+                else {
+                    subscribeToSource();
+                }
+            };
+            var subscribeToSource = function () {
+                var syncUnsub = false;
+                sourceSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                    if (++soFar < count) {
+                        if (sourceSub) {
+                            resubscribe();
+                        }
+                        else {
+                            syncUnsub = true;
+                        }
+                    }
+                    else {
+                        subscriber.complete();
+                    }
+                }));
+                if (syncUnsub) {
+                    resubscribe();
+                }
+            };
+            subscribeToSource();
+        });
 }
-
+//# sourceMappingURL=repeat.js.map
 
 /***/ }),
-/* 234 */,
-/* 235 */,
-/* 236 */,
-/* 237 */,
-/* 238 */,
-/* 239 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/repeatWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var hasFlag = __webpack_require__(221);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return repeatWhen; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-var support = function (level) {
-	if (level === 0) {
-		return false;
-	}
 
-	return {
-		level: level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-};
 
-var supportLevel = (function () {
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
-		return 0;
-	}
+function repeatWhen(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSub;
+        var syncResub = false;
+        var completions$;
+        var isNotifierComplete = false;
+        var isMainComplete = false;
+        var checkComplete = function () { return isMainComplete && isNotifierComplete && (subscriber.complete(), true); };
+        var getCompletionSubject = function () {
+            if (!completions$) {
+                completions$ = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+                notifier(completions$).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                    if (innerSub) {
+                        subscribeForRepeatWhen();
+                    }
+                    else {
+                        syncResub = true;
+                    }
+                }, function () {
+                    isNotifierComplete = true;
+                    checkComplete();
+                }));
+            }
+            return completions$;
+        };
+        var subscribeForRepeatWhen = function () {
+            isMainComplete = false;
+            innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                isMainComplete = true;
+                !checkComplete() && getCompletionSubject().next();
+            }));
+            if (syncResub) {
+                innerSub.unsubscribe();
+                innerSub = null;
+                syncResub = false;
+                subscribeForRepeatWhen();
+            }
+        };
+        subscribeForRepeatWhen();
+    });
+}
+//# sourceMappingURL=repeatWhen.js.map
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+/***/ }),
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/retry.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		return 1;
-	}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return retry; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-	if (process.stdout && !process.stdout.isTTY) {
-		return 0;
-	}
 
-	if (process.platform === 'win32') {
-		return 1;
-	}
 
-	if ('CI' in process.env) {
-		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
-			return 1;
-		}
 
-		return 0;
-	}
 
-	if ('TEAMCITY_VERSION' in process.env) {
-		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
-	}
+function retry(configOrCount) {
+    if (configOrCount === void 0) { configOrCount = Infinity; }
+    var config;
+    if (configOrCount && typeof configOrCount === 'object') {
+        config = configOrCount;
+    }
+    else {
+        config = {
+            count: configOrCount,
+        };
+    }
+    var _a = config.count, count = _a === void 0 ? Infinity : _a, delay = config.delay, _b = config.resetOnSuccess, resetOnSuccess = _b === void 0 ? false : _b;
+    return count <= 0
+        ? _util_identity__WEBPACK_IMPORTED_MODULE_2__[/* identity */ "a"]
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+            var soFar = 0;
+            var innerSub;
+            var subscribeForRetry = function () {
+                var syncUnsub = false;
+                innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                    if (resetOnSuccess) {
+                        soFar = 0;
+                    }
+                    subscriber.next(value);
+                }, undefined, function (err) {
+                    if (soFar++ < count) {
+                        var resub_1 = function () {
+                            if (innerSub) {
+                                innerSub.unsubscribe();
+                                innerSub = null;
+                                subscribeForRetry();
+                            }
+                            else {
+                                syncUnsub = true;
+                            }
+                        };
+                        if (delay != null) {
+                            var notifier = typeof delay === 'number' ? Object(_observable_timer__WEBPACK_IMPORTED_MODULE_3__[/* timer */ "a"])(delay) : Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__[/* innerFrom */ "a"])(delay(err, soFar));
+                            var notifierSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                                notifierSubscriber_1.unsubscribe();
+                                resub_1();
+                            }, function () {
+                                subscriber.complete();
+                            });
+                            notifier.subscribe(notifierSubscriber_1);
+                        }
+                        else {
+                            resub_1();
+                        }
+                    }
+                    else {
+                        subscriber.error(err);
+                    }
+                }));
+                if (syncUnsub) {
+                    innerSub.unsubscribe();
+                    innerSub = null;
+                    subscribeForRetry();
+                }
+            };
+            subscribeForRetry();
+        });
+}
+//# sourceMappingURL=retry.js.map
 
-	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
-		return 2;
-	}
+/***/ }),
 
-	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
-		return 1;
-	}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/retryWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	if ('COLORTERM' in process.env) {
-		return 1;
-	}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return retryWhen; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-	if (process.env.TERM === 'dumb') {
-		return 0;
-	}
 
-	return 0;
-})();
 
-if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
-	supportLevel = 1;
+function retryWhen(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSub;
+        var syncResub = false;
+        var errors$;
+        var subscribeForRetryWhen = function () {
+            innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, undefined, function (err) {
+                if (!errors$) {
+                    errors$ = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+                    notifier(errors$).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                        return innerSub ? subscribeForRetryWhen() : (syncResub = true);
+                    }));
+                }
+                if (errors$) {
+                    errors$.next(err);
+                }
+            }));
+            if (syncResub) {
+                innerSub.unsubscribe();
+                innerSub = null;
+                syncResub = false;
+                subscribeForRetryWhen();
+            }
+        };
+        subscribeForRetryWhen();
+    });
 }
+//# sourceMappingURL=retryWhen.js.map
 
-module.exports = process && support(supportLevel);
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/sample.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/***/ })
-/******/ ]);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return sample; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/***/ }),
-/* 532 */
-/***/ (function(module, exports) {
 
-module.exports = require("buffer");
+
+function sample(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var lastValue = null;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            lastValue = value;
+        }));
+        notifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            if (hasValue) {
+                hasValue = false;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]));
+    });
+}
+//# sourceMappingURL=sample.js.map
 
 /***/ }),
-/* 533 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/sampleTime.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sortPackageJson", function() { return sortPackageJson; });
-/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(534);
-/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(535);
-/* harmony import */ var _kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return sampleTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _sample__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sample.js");
+/* harmony import */ var _observable_interval__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/interval.js");
+
 
 
-async function sortPackageJson(kbn) {
-  const packageJsonPath = kbn.getAbsolute('package.json');
-  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(packageJsonPath, Object(_kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1__["sortPackageJson"])(await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(packageJsonPath, 'utf-8')));
+function sampleTime(period, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_sample__WEBPACK_IMPORTED_MODULE_1__[/* sample */ "a"])(Object(_observable_interval__WEBPACK_IMPORTED_MODULE_2__[/* interval */ "a"])(period, scheduler));
 }
+//# sourceMappingURL=sampleTime.js.map
 
 /***/ }),
-/* 534 */
-/***/ (function(module, exports) {
 
-module.exports = require("fs/promises");
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/scan.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scan; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _scanInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scanInternals.js");
+
+
+function scan(accumulator, seed) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(Object(_scanInternals__WEBPACK_IMPORTED_MODULE_1__[/* scanInternals */ "a"])(accumulator, seed, arguments.length >= 2, true));
+}
+//# sourceMappingURL=scan.js.map
 
 /***/ }),
-/* 535 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/scanInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scanInternals; });
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+
+function scanInternals(accumulator, seed, hasSeed, emitOnNext, emitBeforeComplete) {
+    return function (source, subscriber) {
+        var hasState = hasSeed;
+        var state = seed;
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_0__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var i = index++;
+            state = hasState
+                ?
+                    accumulator(state, value, i)
+                :
+                    ((hasState = true), value);
+            emitOnNext && subscriber.next(state);
+        }, emitBeforeComplete &&
+            (function () {
+                hasState && subscriber.next(state);
+                subscriber.complete();
+            })));
+    };
+}
+//# sourceMappingURL=scanInternals.js.map
 
+/***/ }),
 
-var _interopRequireDefault = __webpack_require__(7);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/sequenceEqual.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortPackageJson = sortPackageJson;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return sequenceEqual; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-var _sortPackageJson = _interopRequireDefault(__webpack_require__(536));
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-function sortPackageJson(json) {
-  return JSON.stringify((0, _sortPackageJson.default)(JSON.parse(json), {
-    // top level keys in the order they were written when this was implemented
-    sortOrder: ['name', 'description', 'keywords', 'private', 'version', 'branch', 'main', 'browser', 'types', 'tsdocMetadata', 'build', 'homepage', 'bugs', 'license', 'kibana', 'author', 'scripts', 'repository', 'engines', 'resolutions']
-  }), null, 2) + '\n';
+function sequenceEqual(compareTo, comparator) {
+    if (comparator === void 0) { comparator = function (a, b) { return a === b; }; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var aState = createState();
+        var bState = createState();
+        var emit = function (isEqual) {
+            subscriber.next(isEqual);
+            subscriber.complete();
+        };
+        var createSubscriber = function (selfState, otherState) {
+            var sequenceEqualSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (a) {
+                var buffer = otherState.buffer, complete = otherState.complete;
+                if (buffer.length === 0) {
+                    complete ? emit(false) : selfState.buffer.push(a);
+                }
+                else {
+                    !comparator(a, buffer.shift()) && emit(false);
+                }
+            }, function () {
+                selfState.complete = true;
+                var complete = otherState.complete, buffer = otherState.buffer;
+                complete && emit(buffer.length === 0);
+                sequenceEqualSubscriber === null || sequenceEqualSubscriber === void 0 ? void 0 : sequenceEqualSubscriber.unsubscribe();
+            });
+            return sequenceEqualSubscriber;
+        };
+        source.subscribe(createSubscriber(aState, bState));
+        compareTo.subscribe(createSubscriber(bState, aState));
+    });
+}
+function createState() {
+    return {
+        buffer: [],
+        complete: false,
+    };
 }
+//# sourceMappingURL=sequenceEqual.js.map
 
 /***/ }),
-/* 536 */
-/***/ (function(module, exports, __webpack_require__) {
 
-const sortObjectKeys = __webpack_require__(537)
-const detectIndent = __webpack_require__(538)
-const detectNewline = __webpack_require__(539).graceful
-const gitHooks = __webpack_require__(540)
-const isPlainObject = __webpack_require__(541)
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/share.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-const hasOwnProperty = (object, property) =>
-  Object.prototype.hasOwnProperty.call(object, property)
-const pipe = (fns) => (x, ...args) =>
-  fns.reduce((result, fn) => fn(result, ...args), x)
-const onArray = (fn) => (x) => (Array.isArray(x) ? fn(x) : x)
-const onStringArray = (fn) => (x) =>
-  Array.isArray(x) && x.every((item) => typeof item === 'string') ? fn(x) : x
-const uniq = onStringArray((xs) => xs.filter((x, i) => i === xs.indexOf(x)))
-const sortArray = onStringArray((array) => [...array].sort())
-const uniqAndSortArray = pipe([uniq, sortArray])
-const onObject = (fn) => (x, ...args) => (isPlainObject(x) ? fn(x, ...args) : x)
-const sortObjectBy = (comparator, deep) => {
-  const over = onObject((object) => {
-    object = sortObjectKeys(object, comparator)
-    if (deep) {
-      for (const [key, value] of Object.entries(object)) {
-        object[key] = over(value)
-      }
-    }
-    return object
-  })
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return share; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony import */ var _operators_take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-  return over
-}
-const sortObject = sortObjectBy()
-const sortURLObject = sortObjectBy(['type', 'url'])
-const sortPeopleObject = sortObjectBy(['name', 'email', 'url'])
-const sortDirectories = sortObjectBy([
-  'lib',
-  'bin',
-  'man',
-  'doc',
-  'example',
-  'test',
-])
-const overProperty = (property, over) => (object, ...args) =>
-  hasOwnProperty(object, property)
-    ? Object.assign(object, { [property]: over(object[property], ...args) })
-    : object
-const sortGitHooks = sortObjectBy(gitHooks)
 
-// https://github.com/eslint/eslint/blob/acc0e47572a9390292b4e313b4a4bf360d236358/conf/config-schema.js
-const eslintBaseConfigProperties = [
-  // `files` and `excludedFiles` are only on `overrides[]`
-  // for easier sort `overrides[]`,
-  // add them to here, so we don't need sort `overrides[]` twice
-  'files',
-  'excludedFiles',
-  // baseConfig
-  'env',
-  'parser',
-  'parserOptions',
-  'settings',
-  'plugins',
-  'extends',
-  'rules',
-  'overrides',
-  'globals',
-  'processor',
-  'noInlineConfig',
-  'reportUnusedDisableDirectives',
-]
-const sortEslintConfig = onObject(
-  pipe([
-    sortObjectBy(eslintBaseConfigProperties),
-    overProperty('env', sortObject),
-    overProperty('globals', sortObject),
-    overProperty(
-      'overrides',
-      onArray((overrides) => overrides.map(sortEslintConfig)),
-    ),
-    overProperty('parserOptions', sortObject),
-    overProperty(
-      'rules',
-      sortObjectBy(
-        (rule1, rule2) =>
-          rule1.split('/').length - rule2.split('/').length ||
-          rule1.localeCompare(rule2),
-      ),
-    ),
-    overProperty('settings', sortObject),
-  ]),
-)
-const sortVSCodeBadgeObject = sortObjectBy(['description', 'url', 'href'])
 
-const sortPrettierConfig = onObject(
-  pipe([
-    // sort keys alphabetically, but put `overrides` at bottom
-    (config) =>
-      sortObjectKeys(config, [
-        ...Object.keys(config)
-          .filter((key) => key !== 'overrides')
-          .sort(),
-        'overrides',
-      ]),
-    // if `config.overrides` exists
-    overProperty(
-      'overrides',
-      // and `config.overrides` is an array
-      onArray((overrides) =>
-        overrides.map(
-          pipe([
-            // sort `config.overrides[]` alphabetically
-            sortObject,
-            // sort `config.overrides[].options` alphabetically
-            overProperty('options', sortObject),
-          ]),
-        ),
-      ),
-    ),
-  ]),
-)
-
-// See https://docs.npmjs.com/misc/scripts
-const defaultNpmScripts = new Set([
-  'install',
-  'pack',
-  'prepare',
-  'publish',
-  'restart',
-  'shrinkwrap',
-  'start',
-  'stop',
-  'test',
-  'uninstall',
-  'version',
-])
 
-const hasDevDependency = (dependency, packageJson) => {
-  return (
-    'devDependencies' in packageJson &&
-    !!packageJson.devDependencies[dependency]
-  )
-}
 
-const sortScripts = onObject((scripts, packageJson) => {
-  const names = Object.keys(scripts)
-  const prefixable = new Set()
 
-  const keys = names.map((name) => {
-    const omitted = name.replace(/^(?:pre|post)/, '')
-    if (defaultNpmScripts.has(omitted) || names.includes(omitted)) {
-      prefixable.add(omitted)
-      return omitted
+function share(options) {
+    if (options === void 0) { options = {}; }
+    var _a = options.connector, connector = _a === void 0 ? function () { return new _Subject__WEBPACK_IMPORTED_MODULE_3__[/* Subject */ "a"](); } : _a, _b = options.resetOnError, resetOnError = _b === void 0 ? true : _b, _c = options.resetOnComplete, resetOnComplete = _c === void 0 ? true : _c, _d = options.resetOnRefCountZero, resetOnRefCountZero = _d === void 0 ? true : _d;
+    return function (wrapperSource) {
+        var connection = null;
+        var resetConnection = null;
+        var subject = null;
+        var refCount = 0;
+        var hasCompleted = false;
+        var hasErrored = false;
+        var cancelReset = function () {
+            resetConnection === null || resetConnection === void 0 ? void 0 : resetConnection.unsubscribe();
+            resetConnection = null;
+        };
+        var reset = function () {
+            cancelReset();
+            connection = subject = null;
+            hasCompleted = hasErrored = false;
+        };
+        var resetAndUnsubscribe = function () {
+            var conn = connection;
+            reset();
+            conn === null || conn === void 0 ? void 0 : conn.unsubscribe();
+        };
+        return Object(_util_lift__WEBPACK_IMPORTED_MODULE_5__[/* operate */ "b"])(function (source, subscriber) {
+            refCount++;
+            if (!hasErrored && !hasCompleted) {
+                cancelReset();
+            }
+            var dest = (subject = subject !== null && subject !== void 0 ? subject : connector());
+            subscriber.add(function () {
+                refCount--;
+                if (refCount === 0 && !hasErrored && !hasCompleted) {
+                    resetConnection = handleReset(resetAndUnsubscribe, resetOnRefCountZero);
+                }
+            });
+            dest.subscribe(subscriber);
+            if (!connection) {
+                connection = new _Subscriber__WEBPACK_IMPORTED_MODULE_4__[/* SafeSubscriber */ "a"]({
+                    next: function (value) { return dest.next(value); },
+                    error: function (err) {
+                        hasErrored = true;
+                        cancelReset();
+                        resetConnection = handleReset(reset, resetOnError, err);
+                        dest.error(err);
+                    },
+                    complete: function () {
+                        hasCompleted = true;
+                        cancelReset();
+                        resetConnection = handleReset(reset, resetOnComplete);
+                        dest.complete();
+                    },
+                });
+                Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__[/* from */ "a"])(source).subscribe(connection);
+            }
+        })(wrapperSource);
+    };
+}
+function handleReset(reset, on) {
+    var args = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        args[_i - 2] = arguments[_i];
     }
-    return name
-  })
-
-  if (!hasDevDependency('npm-run-all', packageJson)) {
-    keys.sort()
-  }
+    if (on === true) {
+        reset();
+        return null;
+    }
+    if (on === false) {
+        return null;
+    }
+    return on.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args))).pipe(Object(_operators_take__WEBPACK_IMPORTED_MODULE_2__[/* take */ "a"])(1))
+        .subscribe(function () { return reset(); });
+}
+//# sourceMappingURL=share.js.map
 
-  const order = keys.reduce(
-    (order, key) =>
-      order.concat(
-        prefixable.has(key) ? [`pre${key}`, key, `post${key}`] : [key],
-      ),
-    [],
-  )
+/***/ }),
 
-  return sortObjectKeys(scripts, order)
-})
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/shareReplay.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// fields marked `vscode` are for `Visual Studio Code extension manifest` only
-// https://code.visualstudio.com/api/references/extension-manifest
-// Supported fields:
-// publisher, displayName, categories, galleryBanner, preview, contributes,
-// activationEvents, badges, markdown, qna, extensionPack,
-// extensionDependencies, icon
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return shareReplay; });
+/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js");
+/* harmony import */ var _share__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/share.js");
 
-// field.key{string}: field name
-// field.over{function}: sort field subKey
-const fields = [
-  { key: '$schema' },
-  { key: 'name' },
-  /* vscode */ { key: 'displayName' },
-  { key: 'version' },
-  { key: 'private' },
-  { key: 'description' },
-  /* vscode */ { key: 'categories', over: uniq },
-  { key: 'keywords', over: uniq },
-  { key: 'homepage' },
-  { key: 'bugs', over: sortObjectBy(['url', 'email']) },
-  { key: 'repository', over: sortURLObject },
-  { key: 'funding', over: sortURLObject },
-  { key: 'license', over: sortURLObject },
-  /* vscode */ { key: 'qna' },
-  { key: 'author', over: sortPeopleObject },
-  {
-    key: 'maintainers',
-    over: onArray((maintainers) => maintainers.map(sortPeopleObject)),
-  },
-  {
-    key: 'contributors',
-    over: onArray((contributors) => contributors.map(sortPeopleObject)),
-  },
-  /* vscode */ { key: 'publisher' },
-  { key: 'sideEffects' },
-  { key: 'type' },
-  { key: 'imports' },
-  { key: 'exports' },
-  { key: 'main' },
-  { key: 'umd:main' },
-  { key: 'jsdelivr' },
-  { key: 'unpkg' },
-  { key: 'module' },
-  { key: 'source' },
-  { key: 'jsnext:main' },
-  { key: 'browser' },
-  { key: 'types' },
-  { key: 'typesVersions' },
-  { key: 'typings' },
-  { key: 'style' },
-  { key: 'example' },
-  { key: 'examplestyle' },
-  { key: 'assets' },
-  { key: 'bin', over: sortObject },
-  { key: 'man' },
-  { key: 'directories', over: sortDirectories },
-  { key: 'files', over: uniq },
-  { key: 'workspaces' },
-  // node-pre-gyp https://www.npmjs.com/package/node-pre-gyp#1-add-new-entries-to-your-packagejson
-  {
-    key: 'binary',
-    over: sortObjectBy([
-      'module_name',
-      'module_path',
-      'remote_path',
-      'package_name',
-      'host',
-    ]),
-  },
-  { key: 'scripts', over: sortScripts },
-  { key: 'betterScripts', over: sortScripts },
-  /* vscode */ { key: 'contributes', over: sortObject },
-  /* vscode */ { key: 'activationEvents', over: uniq },
-  { key: 'husky', over: overProperty('hooks', sortGitHooks) },
-  { key: 'simple-git-hooks', over: sortGitHooks },
-  { key: 'pre-commit' },
-  { key: 'commitlint', over: sortObject },
-  { key: 'lint-staged' },
-  { key: 'config', over: sortObject },
-  { key: 'nodemonConfig', over: sortObject },
-  { key: 'browserify', over: sortObject },
-  { key: 'babel', over: sortObject },
-  { key: 'browserslist' },
-  { key: 'xo', over: sortObject },
-  { key: 'prettier', over: sortPrettierConfig },
-  { key: 'eslintConfig', over: sortEslintConfig },
-  { key: 'eslintIgnore' },
-  { key: 'npmpkgjsonlint', over: sortObject },
-  { key: 'npmPackageJsonLintConfig', over: sortObject },
-  { key: 'npmpackagejsonlint', over: sortObject },
-  { key: 'release', over: sortObject },
-  { key: 'remarkConfig', over: sortObject },
-  { key: 'stylelint' },
-  { key: 'ava', over: sortObject },
-  { key: 'jest', over: sortObject },
-  { key: 'mocha', over: sortObject },
-  { key: 'nyc', over: sortObject },
-  { key: 'c8', over: sortObject },
-  { key: 'tap', over: sortObject },
-  { key: 'resolutions', over: sortObject },
-  { key: 'dependencies', over: sortObject },
-  { key: 'devDependencies', over: sortObject },
-  { key: 'dependenciesMeta', over: sortObjectBy(undefined, true) },
-  { key: 'peerDependencies', over: sortObject },
-  // TODO: only sort depth = 2
-  { key: 'peerDependenciesMeta', over: sortObjectBy(undefined, true) },
-  { key: 'optionalDependencies', over: sortObject },
-  { key: 'bundledDependencies', over: uniqAndSortArray },
-  { key: 'bundleDependencies', over: uniqAndSortArray },
-  /* vscode */ { key: 'extensionPack', over: uniqAndSortArray },
-  /* vscode */ { key: 'extensionDependencies', over: uniqAndSortArray },
-  { key: 'flat' },
-  { key: 'engines', over: sortObject },
-  { key: 'engineStrict', over: sortObject },
-  { key: 'languageName' },
-  { key: 'os' },
-  { key: 'cpu' },
-  { key: 'preferGlobal', over: sortObject },
-  { key: 'publishConfig', over: sortObject },
-  /* vscode */ { key: 'icon' },
-  /* vscode */ {
-    key: 'badges',
-    over: onArray((badge) => badge.map(sortVSCodeBadgeObject)),
-  },
-  /* vscode */ { key: 'galleryBanner', over: sortObject },
-  /* vscode */ { key: 'preview' },
-  /* vscode */ { key: 'markdown' },
-]
 
-const defaultSortOrder = fields.map(({ key }) => key)
-const overFields = pipe(
-  fields.reduce((fns, { key, over }) => {
-    if (over) {
-      fns.push(overProperty(key, over))
+function shareReplay(configOrBufferSize, windowTime, scheduler) {
+    var _a, _b, _c;
+    var bufferSize;
+    var refCount = false;
+    if (configOrBufferSize && typeof configOrBufferSize === 'object') {
+        (_a = configOrBufferSize.bufferSize, bufferSize = _a === void 0 ? Infinity : _a, _b = configOrBufferSize.windowTime, windowTime = _b === void 0 ? Infinity : _b, _c = configOrBufferSize.refCount, refCount = _c === void 0 ? false : _c, scheduler = configOrBufferSize.scheduler);
     }
-    return fns
-  }, []),
-)
+    else {
+        bufferSize = configOrBufferSize !== null && configOrBufferSize !== void 0 ? configOrBufferSize : Infinity;
+    }
+    return Object(_share__WEBPACK_IMPORTED_MODULE_1__[/* share */ "a"])({
+        connector: function () { return new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__[/* ReplaySubject */ "a"](bufferSize, windowTime, scheduler); },
+        resetOnError: true,
+        resetOnComplete: false,
+        resetOnRefCountZero: refCount,
+    });
+}
+//# sourceMappingURL=shareReplay.js.map
 
-function editStringJSON(json, over) {
-  if (typeof json === 'string') {
-    const { indent } = detectIndent(json)
-    const endCharacters = json.slice(-1) === '\n' ? '\n' : ''
-    const newline = detectNewline(json)
-    json = JSON.parse(json)
+/***/ }),
 
-    let result = JSON.stringify(over(json), null, indent) + endCharacters
-    if (newline === '\r\n') {
-      result = result.replace(/\n/g, newline)
-    }
-    return result
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/single.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  return over(json)
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return single; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _util_SequenceError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/SequenceError.js");
+/* harmony import */ var _util_NotFoundError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/NotFoundError.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-const isPrivateKey = (key) => key[0] === '_'
-const partition = (array, predicate) =>
-  array.reduce(
-    (result, value) => {
-      result[predicate(value) ? 0 : 1].push(value)
-      return result
-    },
-    [[], []],
-  )
-function sortPackageJson(jsonIsh, options = {}) {
-  return editStringJSON(
-    jsonIsh,
-    onObject((json) => {
-      let sortOrder = options.sortOrder ? options.sortOrder : defaultSortOrder
 
-      if (Array.isArray(sortOrder)) {
-        const keys = Object.keys(json)
-        const [privateKeys, publicKeys] = partition(keys, isPrivateKey)
-        sortOrder = [
-          ...sortOrder,
-          ...defaultSortOrder,
-          ...publicKeys.sort(),
-          ...privateKeys.sort(),
-        ]
-      }
 
-      return overFields(sortObjectKeys(json, sortOrder), json)
-    }),
-  )
-}
 
-module.exports = sortPackageJson
-module.exports.sortPackageJson = sortPackageJson
-module.exports.sortOrder = defaultSortOrder
-module.exports.default = sortPackageJson
 
+function single(predicate) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var singleValue;
+        var seenValue = false;
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            seenValue = true;
+            if (!predicate || predicate(value, index++, source)) {
+                hasValue && subscriber.error(new _util_SequenceError__WEBPACK_IMPORTED_MODULE_1__[/* SequenceError */ "a"]('Too many matching values'));
+                hasValue = true;
+                singleValue = value;
+            }
+        }, function () {
+            if (hasValue) {
+                subscriber.next(singleValue);
+                subscriber.complete();
+            }
+            else {
+                subscriber.error(seenValue ? new _util_NotFoundError__WEBPACK_IMPORTED_MODULE_2__[/* NotFoundError */ "a"]('No matching values') : new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]());
+            }
+        }));
+    });
+}
+//# sourceMappingURL=single.js.map
 
 /***/ }),
-/* 537 */
-/***/ (function(module, exports) {
 
-module.exports = function sortObjectByKeyNameList(object, sortWith) {
-  var keys;
-  var sortFn;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skip.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (typeof sortWith === 'function') {
-    sortFn = sortWith;
-  } else {
-    keys = sortWith;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skip; });
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
 
-  var objectKeys = Object.keys(object);
-  return (keys || []).concat(objectKeys.sort(sortFn)).reduce(function(total, key) {
-    if (objectKeys.indexOf(key) !== -1) {
-      total[key] = object[key];
-    }
-    return total;
-  }, Object.create(null));
+function skip(count) {
+    return Object(_filter__WEBPACK_IMPORTED_MODULE_0__[/* filter */ "a"])(function (_, index) { return count <= index; });
 }
-
+//# sourceMappingURL=skip.js.map
 
 /***/ }),
-/* 538 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skipLast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skipLast; });
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
 
-// Detect either spaces or tabs but not both to properly handle tabs for indentation and spaces for alignment
-const INDENT_REGEX = /^(?:( )+|\t+)/;
 
-const INDENT_TYPE_SPACE = 'space';
-const INDENT_TYPE_TAB = 'tab';
+function skipLast(skipCount) {
+    return skipCount <= 0
+        ?
+            _util_identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"]
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var ring = new Array(skipCount);
+            var seen = 0;
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                var valueIndex = seen++;
+                if (valueIndex < skipCount) {
+                    ring[valueIndex] = value;
+                }
+                else {
+                    var index = valueIndex % skipCount;
+                    var oldValue = ring[index];
+                    ring[index] = value;
+                    subscriber.next(oldValue);
+                }
+            }));
+            return function () {
+                ring = null;
+            };
+        });
+}
+//# sourceMappingURL=skipLast.js.map
 
-// Make a Map that counts how many indents/unindents have occurred for a given size and how many lines follow a given indentation.
-// The key is a concatenation of the indentation type (s = space and t = tab) and the size of the indents/unindents.
-//
-// indents = {
-//    t3: [1, 0],
-//    t4: [1, 5],
-//    s5: [1, 0],
-//   s12: [1, 0],
-// }
-function makeIndentsMap(string, ignoreSingleSpaces) {
-	const indents = new Map();
+/***/ }),
 
-	// Remember the size of previous line's indentation
-	let previousSize = 0;
-	let previousIndentType;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skipUntil.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	// Indents key (ident type + size of the indents/unindents)
-	let key;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skipUntil; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-	for (const line of string.split(/\n/g)) {
-		if (!line) {
-			// Ignore empty lines
-			continue;
-		}
 
-		let indent;
-		let indentType;
-		let weight;
-		let entry;
-		const matches = line.match(INDENT_REGEX);
 
-		if (matches === null) {
-			previousSize = 0;
-			previousIndentType = '';
-		} else {
-			indent = matches[0].length;
 
-			if (matches[1]) {
-				indentType = INDENT_TYPE_SPACE;
-			} else {
-				indentType = INDENT_TYPE_TAB;
-			}
+function skipUntil(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var taking = false;
+        var skipSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            skipSubscriber === null || skipSubscriber === void 0 ? void 0 : skipSubscriber.unsubscribe();
+            taking = true;
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_3__[/* noop */ "a"]);
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(notifier).subscribe(skipSubscriber);
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return taking && subscriber.next(value); }));
+    });
+}
+//# sourceMappingURL=skipUntil.js.map
 
-			// Ignore single space unless it's the only indent detected to prevent common false positives
-			if (ignoreSingleSpaces && indentType === INDENT_TYPE_SPACE && indent === 1) {
-				continue;
-			}
+/***/ }),
 
-			if (indentType !== previousIndentType) {
-				previousSize = 0;
-			}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skipWhile.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-			previousIndentType = indentType;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skipWhile; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-			weight = 0;
 
-			const indentDifference = indent - previousSize;
-			previousSize = indent;
+function skipWhile(predicate) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var taking = false;
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return (taking || (taking = !predicate(value, index++))) && subscriber.next(value); }));
+    });
+}
+//# sourceMappingURL=skipWhile.js.map
 
-			// Previous line have same indent?
-			if (indentDifference === 0) {
-				weight++;
-				// We use the key from previous loop
-			} else {
-				const absoluteIndentDifference = indentDifference > 0 ? indentDifference : -indentDifference;
-				key = encodeIndentsKey(indentType, absoluteIndentDifference);
-			}
+/***/ }),
 
-			// Update the stats
-			entry = indents.get(key);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/startWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-			if (entry === undefined) {
-				entry = [1, 0]; // Init
-			} else {
-				entry = [++entry[0], entry[1] + weight];
-			}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return startWith; });
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-			indents.set(key, entry);
-		}
-	}
 
-	return indents;
-}
 
-// Encode the indent type and amount as a string (e.g. 's4') for use as a compound key in the indents Map.
-function encodeIndentsKey(indentType, indentAmount) {
-	const typeCharacter = indentType === INDENT_TYPE_SPACE ? 's' : 't';
-	return typeCharacter + String(indentAmount);
+function startWith() {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_1__[/* popScheduler */ "c"])(values);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        (scheduler ? Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__[/* concat */ "a"])(values, source, scheduler) : Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__[/* concat */ "a"])(values, source)).subscribe(subscriber);
+    });
 }
+//# sourceMappingURL=startWith.js.map
 
-// Extract the indent type and amount from a key of the indents Map.
-function decodeIndentsKey(indentsKey) {
-	const keyHasTypeSpace = indentsKey[0] === 's';
-	const type = keyHasTypeSpace ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
+/***/ }),
 
-	const amount = Number(indentsKey.slice(1));
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	return {type, amount};
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeOn; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-// Return the key (e.g. 's4') from the indents Map that represents the most common indent,
-// or return undefined if there are no indents.
-function getMostUsedKey(indents) {
-	let result;
-	let maxUsed = 0;
-	let maxWeight = 0;
-
-	for (const [key, [usedCount, weight]] of indents) {
-		if (usedCount > maxUsed || (usedCount === maxUsed && weight > maxWeight)) {
-			maxUsed = usedCount;
-			maxWeight = weight;
-			result = key;
-		}
-	}
-
-	return result;
-}
-
-function makeIndentString(type, amount) {
-	const indentCharacter = type === INDENT_TYPE_SPACE ? ' ' : '\t';
-	return indentCharacter.repeat(amount);
+function subscribeOn(scheduler, delay) {
+    if (delay === void 0) { delay = 0; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        subscriber.add(scheduler.schedule(function () { return source.subscribe(subscriber); }, delay));
+    });
 }
+//# sourceMappingURL=subscribeOn.js.map
 
-module.exports = string => {
-	if (typeof string !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	// Identify indents while skipping single space indents to avoid common edge cases (e.g. code comments)
-	// If no indents are identified, run again and include all indents for comprehensive detection
-	let indents = makeIndentsMap(string, true);
-	if (indents.size === 0) {
-		indents = makeIndentsMap(string, false);
-	}
-
-	const keyOfMostUsedIndent = getMostUsedKey(indents);
+/***/ }),
 
-	let type;
-	let amount = 0;
-	let indent = '';
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	if (keyOfMostUsedIndent !== undefined) {
-		({type, amount} = decodeIndentsKey(keyOfMostUsedIndent));
-		indent = makeIndentString(type, amount);
-	}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchAll; });
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-	return {
-		amount,
-		type,
-		indent
-	};
-};
 
+function switchAll() {
+    return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"]);
+}
+//# sourceMappingURL=switchAll.js.map
 
 /***/ }),
-/* 539 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchMap; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
 
-const detectNewline = string => {
-	if (typeof string !== 'string') {
-		throw new TypeError('Expected a string');
-	}
 
-	const newlines = string.match(/(?:\r?\n)/g) || [];
+function switchMap(project, resultSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSubscriber = null;
+        var index = 0;
+        var isComplete = false;
+        var checkComplete = function () { return isComplete && !innerSubscriber && subscriber.complete(); };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            innerSubscriber === null || innerSubscriber === void 0 ? void 0 : innerSubscriber.unsubscribe();
+            var innerIndex = 0;
+            var outerIndex = index++;
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(project(value, outerIndex)).subscribe((innerSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (innerValue) { return subscriber.next(resultSelector ? resultSelector(value, innerValue, outerIndex, innerIndex++) : innerValue); }, function () {
+                innerSubscriber = null;
+                checkComplete();
+            })));
+        }, function () {
+            isComplete = true;
+            checkComplete();
+        }));
+    });
+}
+//# sourceMappingURL=switchMap.js.map
 
-	if (newlines.length === 0) {
-		return;
-	}
+/***/ }),
 
-	const crlf = newlines.filter(newline => newline === '\r\n').length;
-	const lf = newlines.length - crlf;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchMapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	return crlf > lf ? '\r\n' : '\n';
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchMapTo; });
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-module.exports = detectNewline;
-module.exports.graceful = string => (typeof string === 'string' && detectNewline(string)) || '\n';
 
+function switchMapTo(innerObservable, resultSelector) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector) ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(function () { return innerObservable; });
+}
+//# sourceMappingURL=switchMapTo.js.map
 
 /***/ }),
-/* 540 */
-/***/ (function(module) {
 
-module.exports = JSON.parse("[\"applypatch-msg\",\"pre-applypatch\",\"post-applypatch\",\"pre-commit\",\"pre-merge-commit\",\"prepare-commit-msg\",\"commit-msg\",\"post-commit\",\"pre-rebase\",\"post-checkout\",\"post-merge\",\"pre-push\",\"pre-receive\",\"update\",\"post-receive\",\"post-update\",\"push-to-checkout\",\"pre-auto-gc\",\"post-rewrite\",\"sendemail-validate\",\"fsmonitor-watchman\",\"p4-pre-submit\",\"post-index-change\"]");
-
-/***/ }),
-/* 541 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchScan.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchScan; });
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
 
-module.exports = value => {
-	if (Object.prototype.toString.call(value) !== '[object Object]') {
-		return false;
-	}
-
-	const prototype = Object.getPrototypeOf(value);
-	return prototype === null || prototype === Object.prototype;
-};
-
+function switchScan(accumulator, seed) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var state = seed;
+        Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(function (value, index) { return accumulator(state, value, index); }, function (_, innerValue) { return ((state = innerValue), innerValue); })(source).subscribe(subscriber);
+        return function () {
+            state = null;
+        };
+    });
+}
+//# sourceMappingURL=switchScan.js.map
 
 /***/ }),
-/* 542 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/take.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "validateDependencies", function() { return validateDependencies; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(531);
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(235);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(352);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(341);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(464);
-/* harmony import */ var _projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(543);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-// @ts-expect-error published types are useless
-
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return take; });
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
 
 
+function take(count) {
+    return count <= 0
+        ?
+            function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]; }
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var seen = 0;
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                if (++seen <= count) {
+                    subscriber.next(value);
+                    if (count <= seen) {
+                        subscriber.complete();
+                    }
+                }
+            }));
+        });
+}
+//# sourceMappingURL=take.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-async function validateDependencies(kbn, yarnLock) {
-  // look through all of the packages in the yarn.lock file to see if
-  // we have accidentally installed multiple lodash v4 versions
-  const lodash4Versions = new Set();
-  const lodash4Reqs = new Set();
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return takeLast; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  for (const [req, dep] of Object.entries(yarnLock)) {
-    if (req.startsWith('lodash@') && dep.version.startsWith('4.')) {
-      lodash4Reqs.add(req);
-      lodash4Versions.add(dep.version);
-    }
-  } // if we find more than one lodash v4 version installed then delete
-  // lodash v4 requests from the yarn.lock file and prompt the user to
-  // retry bootstrap so that a single v4 version will be installed
 
 
-  if (lodash4Versions.size > 1) {
-    for (const req of lodash4Reqs) {
-      delete yarnLock[req];
-    }
 
-    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["writeFile"])(kbn.getAbsolute('yarn.lock'), Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["stringify"])(yarnLock), 'utf8');
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
+function takeLast(count) {
+    return count <= 0
+        ? function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_1__[/* EMPTY */ "a"]; }
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+            var buffer = [];
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                buffer.push(value);
+                count < buffer.length && buffer.shift();
+            }, function () {
+                var e_1, _a;
+                try {
+                    for (var buffer_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffer), buffer_1_1 = buffer_1.next(); !buffer_1_1.done; buffer_1_1 = buffer_1.next()) {
+                        var value = buffer_1_1.value;
+                        subscriber.next(value);
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (buffer_1_1 && !buffer_1_1.done && (_a = buffer_1.return)) _a.call(buffer_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                subscriber.complete();
+            }, undefined, function () {
+                buffer = null;
+            }));
+        });
+}
+//# sourceMappingURL=takeLast.js.map
 
-      Multiple version of lodash v4 were detected, so they have been removed
-      from the yarn.lock file. Please rerun yarn kbn bootstrap to coalese the
-      lodash versions installed.
+/***/ }),
 
-      If you still see this error when you re-bootstrap then you might need
-      to force a new dependency to use the latest version of lodash via the
-      "resolutions" field in package.json.
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      If you have questions about this please reach out to the operations team.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return takeUntil; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-    `);
-    process.exit(1);
-  } // look through all the dependencies of production packages and production
-  // dependencies of those packages to determine if we're shipping any versions
-  // of lodash v3 in the distributable
 
 
-  const prodDependencies = kbn.resolveAllProductionDependencies(yarnLock, _log__WEBPACK_IMPORTED_MODULE_5__["log"]);
-  const lodash3Versions = new Set();
 
-  for (const dep of prodDependencies.values()) {
-    if (dep.name === 'lodash' && dep.version.startsWith('3.')) {
-      lodash3Versions.add(dep.version);
-    }
-  } // if any lodash v3 packages were found we abort and tell the user to fix things
+function takeUntil(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(notifier).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () { return subscriber.complete(); }, _util_noop__WEBPACK_IMPORTED_MODULE_3__[/* noop */ "a"]));
+        !subscriber.closed && source.subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=takeUntil.js.map
 
+/***/ }),
 
-  if (lodash3Versions.size) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/takeWhile.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      Due to changes in the yarn.lock file and/or package.json files a version of
-      lodash 3 is now included in the production dependencies. To reduce the size of
-      our distributable and especially our front-end bundles we have decided to
-      prevent adding any new instances of lodash 3.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return takeWhile; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-      Please inspect the changes to yarn.lock or package.json files to identify where
-      the lodash 3 version is coming from and remove it.
 
-      If you have questions about this please reack out to the operations team.
+function takeWhile(predicate, inclusive) {
+    if (inclusive === void 0) { inclusive = false; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var result = predicate(value, index++);
+            (result || inclusive) && subscriber.next(value);
+            !result && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=takeWhile.js.map
 
-    `);
-    process.exit(1);
-  } // TODO: remove this once we move into a single package.json
-  // look through all the package.json files to find packages which have mismatched version ranges
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/tap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  const depRanges = new Map();
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return tap; });
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-  for (const project of kbn.getAllProjects().values()) {
-    var _kbn$kibanaProject;
 
-    // Skip if this is an external plugin
-    if (project.path.includes(`${(_kbn$kibanaProject = kbn.kibanaProject) === null || _kbn$kibanaProject === void 0 ? void 0 : _kbn$kibanaProject.path}${path__WEBPACK_IMPORTED_MODULE_3__["sep"]}plugins`)) {
-      continue;
-    }
 
-    for (const [dep, range] of Object.entries(project.allDependencies)) {
-      const existingDep = depRanges.get(dep);
 
-      if (!existingDep) {
-        depRanges.set(dep, [{
-          range,
-          projects: [project]
-        }]);
-        continue;
-      }
+function tap(observerOrNext, error, complete) {
+    var tapObserver = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(observerOrNext) || error || complete
+        ?
+            { next: observerOrNext, error: error, complete: complete }
+        : observerOrNext;
+    return tapObserver
+        ? Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var _a;
+            (_a = tapObserver.subscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
+            var isUnsub = true;
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                var _a;
+                (_a = tapObserver.next) === null || _a === void 0 ? void 0 : _a.call(tapObserver, value);
+                subscriber.next(value);
+            }, function () {
+                var _a;
+                isUnsub = false;
+                (_a = tapObserver.complete) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
+                subscriber.complete();
+            }, function (err) {
+                var _a;
+                isUnsub = false;
+                (_a = tapObserver.error) === null || _a === void 0 ? void 0 : _a.call(tapObserver, err);
+                subscriber.error(err);
+            }, function () {
+                var _a, _b;
+                if (isUnsub) {
+                    (_a = tapObserver.unsubscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
+                }
+                (_b = tapObserver.finalize) === null || _b === void 0 ? void 0 : _b.call(tapObserver);
+            }));
+        })
+        :
+            _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"];
+}
+//# sourceMappingURL=tap.js.map
 
-      const existingRange = existingDep.find(existing => existing.range === range);
+/***/ }),
 
-      if (!existingRange) {
-        existingDep.push({
-          range,
-          projects: [project]
-        });
-        continue;
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      existingRange.projects.push(project);
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defaultThrottleConfig; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return throttle; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-  const duplicateRanges = Array.from(depRanges.entries()).filter(([, ranges]) => ranges.length > 1 && !ranges.every(rng => Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["isLinkDependency"])(rng.range))).reduce((acc, [dep, ranges]) => [...acc, dep, ...ranges.map(({
-    range,
-    projects
-  }) => `  ${range} => ${projects.map(p => p.name).join(', ')}`)], []).join('\n        ');
 
-  if (duplicateRanges) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-      [single_version_dependencies] Multiple version ranges for the same dependency
-      were found declared across different package.json files. Please consolidate
-      those to match across all package.json files. Different versions for the
-      same dependency is not supported.
+var defaultThrottleConfig = {
+    leading: true,
+    trailing: false,
+};
+function throttle(durationSelector, config) {
+    if (config === void 0) { config = defaultThrottleConfig; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var leading = config.leading, trailing = config.trailing;
+        var hasValue = false;
+        var sendValue = null;
+        var throttled = null;
+        var isComplete = false;
+        var endThrottling = function () {
+            throttled === null || throttled === void 0 ? void 0 : throttled.unsubscribe();
+            throttled = null;
+            if (trailing) {
+                send();
+                isComplete && subscriber.complete();
+            }
+        };
+        var cleanupThrottling = function () {
+            throttled = null;
+            isComplete && subscriber.complete();
+        };
+        var startThrottle = function (value) {
+            return (throttled = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(durationSelector(value)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, endThrottling, cleanupThrottling)));
+        };
+        var send = function () {
+            if (hasValue) {
+                hasValue = false;
+                var value = sendValue;
+                sendValue = null;
+                subscriber.next(value);
+                !isComplete && startThrottle(value);
+            }
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            sendValue = value;
+            !(throttled && !throttled.closed) && (leading ? send() : startThrottle(value));
+        }, function () {
+            isComplete = true;
+            !(trailing && hasValue && throttled && !throttled.closed) && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=throttle.js.map
 
-      If you have questions about this please reach out to the operations team.
+/***/ }),
 
-      The conflicting dependencies are:
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/throttleTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-        ${duplicateRanges}
-    `);
-    process.exit(1);
-  } // look for packages that have the the `kibana.devOnly` flag in their package.json
-  // and make sure they aren't included in the production dependencies of Kibana
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throttleTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
 
-  const devOnlyProjectsInProduction = getDevOnlyProductionDepsTree(kbn, 'kibana');
 
-  if (devOnlyProjectsInProduction) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
-      Some of the packages in the production dependency chain for Kibana and X-Pack are
-      flagged with "kibana.devOnly" in their package.json. Please check changes made to
-      packages and their dependencies to ensure they don't end up in production.
+function throttleTime(duration, scheduler, config) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    if (config === void 0) { config = _throttle__WEBPACK_IMPORTED_MODULE_1__[/* defaultThrottleConfig */ "a"]; }
+    var duration$ = Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__[/* timer */ "a"])(duration, scheduler);
+    return Object(_throttle__WEBPACK_IMPORTED_MODULE_1__[/* throttle */ "b"])(function () { return duration$; }, config);
+}
+//# sourceMappingURL=throttleTime.js.map
 
-      The devOnly dependencies that are being dependend on in production are:
+/***/ }),
 
-        ${Object(_projects_tree__WEBPACK_IMPORTED_MODULE_7__["treeToString"])(devOnlyProjectsInProduction).split('\n').join('\n        ')}
-    `);
-    process.exit(1);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  _log__WEBPACK_IMPORTED_MODULE_5__["log"].success('yarn.lock analysis completed without any issues');
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwIfEmpty; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function getDevOnlyProductionDepsTree(kbn, projectName) {
-  const project = kbn.getProject(projectName);
-  const childProjectNames = [...Object.keys(project.productionDependencies).filter(name => kbn.hasProject(name)), ...(projectName === 'kibana' ? ['x-pack'] : [])];
-  const children = childProjectNames.map(n => getDevOnlyProductionDepsTree(kbn, n)).filter(t => !!t);
 
-  if (!children.length && !project.isFlaggedAsDevOnly()) {
-    return;
-  }
 
-  const tree = {
-    name: project.isFlaggedAsDevOnly() ? chalk__WEBPACK_IMPORTED_MODULE_2___default.a.red.bold(projectName) : projectName,
-    children
-  };
-  return tree;
+function throwIfEmpty(errorFactory) {
+    if (errorFactory === void 0) { errorFactory = defaultErrorFactory; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            subscriber.next(value);
+        }, function () { return (hasValue ? subscriber.complete() : subscriber.error(errorFactory())); }));
+    });
+}
+function defaultErrorFactory() {
+    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]();
 }
+//# sourceMappingURL=throwIfEmpty.js.map
 
 /***/ }),
-/* 543 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timeInterval.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "renderProjectsTree", function() { return renderProjectsTree; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "treeToString", function() { return treeToString; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(235);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timeInterval; });
+/* unused harmony export TimeInterval */
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-const projectKey = Symbol('__project');
-function renderProjectsTree(rootPath, projects) {
-  const projectsTree = buildProjectsTree(rootPath, projects);
-  return treeToString(createTreeStructure(projectsTree));
-}
-function treeToString(tree) {
-  return [tree.name].concat(childrenToStrings(tree.children, '')).join('\n');
-}
 
-function childrenToStrings(tree, treePrefix) {
-  if (tree === undefined) {
-    return [];
-  }
 
-  let strings = [];
-  tree.forEach((node, index) => {
-    const isLastNode = tree.length - 1 === index;
-    const nodePrefix = isLastNode ? '└── ' : '├── ';
-    const childPrefix = isLastNode ? '    ' : '│   ';
-    const childrenPrefix = treePrefix + childPrefix;
-    strings.push(`${treePrefix}${nodePrefix}${node.name}`);
-    strings = strings.concat(childrenToStrings(node.children, childrenPrefix));
-  });
-  return strings;
+function timeInterval(scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var last = scheduler.now();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var now = scheduler.now();
+            var interval = now - last;
+            last = now;
+            subscriber.next(new TimeInterval(value, interval));
+        }));
+    });
 }
+var TimeInterval = (function () {
+    function TimeInterval(value, interval) {
+        this.value = value;
+        this.interval = interval;
+    }
+    return TimeInterval;
+}());
 
-function createTreeStructure(tree) {
-  let name;
-  const children = [];
+//# sourceMappingURL=timeInterval.js.map
 
-  for (const [dir, project] of tree.entries()) {
-    // This is a leaf node (aka a project)
-    if (typeof project === 'string') {
-      name = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(project);
-      continue;
-    } // If there's only one project and the key indicates it's a leaf node, we
-    // know that we're at a package folder that contains a package.json, so we
-    // "inline it" so we don't get unnecessary levels, i.e. we'll just see
-    // `foo` instead of `foo -> foo`.
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (project.size === 1 && project.has(projectKey)) {
-      const projectName = project.get(projectKey);
-      children.push({
-        children: [],
-        name: dirOrProjectName(dir, projectName)
-      });
-      continue;
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TimeoutError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return timeout; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isDate.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_createErrorClass__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-    const subtree = createTreeStructure(project); // If the name is specified, we know there's a package at the "root" of the
-    // subtree itself.
 
-    if (subtree.name !== undefined) {
-      const projectName = subtree.name;
-      children.push({
-        children: subtree.children,
-        name: dirOrProjectName(dir, projectName)
-      });
-      continue;
-    } // Special-case whenever we have one child, so we don't get unnecessary
-    // folders in the output. E.g. instead of `foo -> bar -> baz` we get
-    // `foo/bar/baz` instead.
 
 
-    if (subtree.children && subtree.children.length === 1) {
-      const child = subtree.children[0];
-      const newName = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(dir.toString(), child.name));
-      children.push({
-        children: child.children,
-        name: newName
-      });
-      continue;
-    }
 
-    children.push({
-      children: subtree.children,
-      name: chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(dir.toString())
-    });
-  }
 
-  return {
-    name,
-    children
-  };
-}
-
-function dirOrProjectName(dir, projectName) {
-  return dir === projectName ? chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(dir) : chalk__WEBPACK_IMPORTED_MODULE_0___default.a`{dim ${dir.toString()} ({reset.green ${projectName}})}`;
-}
-
-function buildProjectsTree(rootPath, projects) {
-  const tree = new Map();
 
-  for (const project of projects.values()) {
-    if (rootPath === project.path) {
-      tree.set(projectKey, project.name);
-    } else {
-      const relativeProjectPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(rootPath, project.path);
-      addProjectToTree(tree, relativeProjectPath.split(path__WEBPACK_IMPORTED_MODULE_1___default.a.sep), project);
+var TimeoutError = Object(_util_createErrorClass__WEBPACK_IMPORTED_MODULE_4__[/* createErrorClass */ "a"])(function (_super) {
+    return function TimeoutErrorImpl(info) {
+        if (info === void 0) { info = null; }
+        _super(this);
+        this.message = 'Timeout has occurred';
+        this.name = 'TimeoutError';
+        this.info = info;
+    };
+});
+function timeout(config, schedulerArg) {
+    var _a = (Object(_util_isDate__WEBPACK_IMPORTED_MODULE_1__[/* isValidDate */ "a"])(config) ? { first: config } : typeof config === 'number' ? { each: config } : config), first = _a.first, each = _a.each, _b = _a.with, _with = _b === void 0 ? timeoutErrorFactory : _b, _c = _a.scheduler, scheduler = _c === void 0 ? schedulerArg !== null && schedulerArg !== void 0 ? schedulerArg : _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"] : _c, _d = _a.meta, meta = _d === void 0 ? null : _d;
+    if (first == null && each == null) {
+        throw new TypeError('No timeout provided.');
     }
-  }
-
-  return tree;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var originalSourceSubscription;
+        var timerSubscription;
+        var lastValue = null;
+        var seen = 0;
+        var startTimer = function (delay) {
+            timerSubscription = Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_6__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+                try {
+                    originalSourceSubscription.unsubscribe();
+                    Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(_with({
+                        meta: meta,
+                        lastValue: lastValue,
+                        seen: seen,
+                    })).subscribe(subscriber);
+                }
+                catch (err) {
+                    subscriber.error(err);
+                }
+            }, delay);
+        };
+        originalSourceSubscription = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
+            seen++;
+            subscriber.next((lastValue = value));
+            each > 0 && startTimer(each);
+        }, undefined, undefined, function () {
+            if (!(timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.closed)) {
+                timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
+            }
+            lastValue = null;
+        }));
+        !seen && startTimer(first != null ? (typeof first === 'number' ? first : +first - scheduler.now()) : each);
+    });
 }
-
-function addProjectToTree(tree, pathParts, project) {
-  if (pathParts.length === 0) {
-    tree.set(projectKey, project.name);
-  } else {
-    const [currentDir, ...rest] = pathParts;
-
-    if (!tree.has(currentDir)) {
-      tree.set(currentDir, new Map());
-    }
-
-    const subtree = tree.get(currentDir);
-    addProjectToTree(subtree, rest, project);
-  }
+function timeoutErrorFactory(info) {
+    throw new TimeoutError(info);
 }
+//# sourceMappingURL=timeout.js.map
 
 /***/ }),
-/* 544 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timeoutWith.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(545);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelDiskCacheFolder"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelRepositoryCacheFolder"]; });
-
-/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(546);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["isBazelBinAvailable"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["installBazelTools"]; });
-
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(547);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["runBazel"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runIBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["runIBazel"]; });
-
-/* harmony import */ var _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(554);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "removeYarnIntegrityFileIfExists", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__["removeYarnIntegrityFileIfExists"]; });
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timeoutWith; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isDate.js");
+/* harmony import */ var _timeout__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js");
 
 
 
+function timeoutWith(due, withObservable, scheduler) {
+    var first;
+    var each;
+    var _with;
+    scheduler = scheduler !== null && scheduler !== void 0 ? scheduler : _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* async */ "a"];
+    if (Object(_util_isDate__WEBPACK_IMPORTED_MODULE_1__[/* isValidDate */ "a"])(due)) {
+        first = due;
+    }
+    else if (typeof due === 'number') {
+        each = due;
+    }
+    if (withObservable) {
+        _with = function () { return withObservable; };
+    }
+    else {
+        throw new TypeError('No observable provided to switch to');
+    }
+    if (first == null && each == null) {
+        throw new TypeError('No timeout provided.');
+    }
+    return Object(_timeout__WEBPACK_IMPORTED_MODULE_2__[/* timeout */ "b"])({
+        first: first,
+        each: each,
+        scheduler: scheduler,
+        with: _with,
+    });
+}
+//# sourceMappingURL=timeoutWith.js.map
 
 /***/ }),
-/* 545 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timestamp.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return getBazelDiskCacheFolder; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return getBazelRepositoryCacheFolder; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(342);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timestamp; });
+/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js");
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
 
-async function rawRunBazelInfoRepoCache() {
-  const {
-    stdout: bazelRepositoryCachePath
-  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_1__["spawn"])('bazel', ['info', 'repository_cache'], {
-    stdio: 'pipe'
-  });
-  return bazelRepositoryCachePath;
-}
-
-async function getBazelDiskCacheFolder() {
-  return Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(await rawRunBazelInfoRepoCache()), 'disk-cache');
-}
-async function getBazelRepositoryCacheFolder() {
-  return await rawRunBazelInfoRepoCache();
+function timestamp(timestampProvider) {
+    if (timestampProvider === void 0) { timestampProvider = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__[/* dateTimestampProvider */ "a"]; }
+    return Object(_map__WEBPACK_IMPORTED_MODULE_1__[/* map */ "a"])(function (value) { return ({ value: value, timestamp: timestampProvider.now() }); });
 }
+//# sourceMappingURL=timestamp.js.map
 
 /***/ }),
-/* 546 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return isBazelBinAvailable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return installBazelTools; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(342);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(352);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(341);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return toArray; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
 
+var arrReducer = function (arr, value) { return (arr.push(value), arr); };
+function toArray() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(arrReducer, [])(source).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=toArray.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/window.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-async function readBazelToolsVersionFile(repoRootPath, versionFilename) {
-  const version = (await Object(_fs__WEBPACK_IMPORTED_MODULE_3__["readFile"])(Object(path__WEBPACK_IMPORTED_MODULE_1__["resolve"])(repoRootPath, versionFilename))).toString().split('\n')[0];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return window; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-  if (!version) {
-    throw new Error(`[bazel_tools] Failed on reading bazel tools versions\n ${versionFilename} file do not contain any version set`);
-  }
 
-  return version;
-}
 
-async function isBazelBinAvailable() {
-  try {
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('bazel', ['--version'], {
-      stdio: 'pipe'
-    });
-    return true;
-  } catch {
-    return false;
-  }
-}
 
-async function isBazeliskInstalled(bazeliskVersion) {
-  try {
-    const {
-      stdout: bazeliskPkgInstallStdout
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`], {
-      stdio: 'pipe'
+function window(windowBoundaries) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var windowSubject = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+        subscriber.next(windowSubject.asObservable());
+        var errorHandler = function (err) {
+            windowSubject.error(err);
+            subscriber.error(err);
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return windowSubject === null || windowSubject === void 0 ? void 0 : windowSubject.next(value); }, function () {
+            windowSubject.complete();
+            subscriber.complete();
+        }, errorHandler));
+        windowBoundaries.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            windowSubject.complete();
+            subscriber.next((windowSubject = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]()));
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_3__[/* noop */ "a"], errorHandler));
+        return function () {
+            windowSubject === null || windowSubject === void 0 ? void 0 : windowSubject.unsubscribe();
+            windowSubject = null;
+        };
     });
-    return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`);
-  } catch {
-    return false;
-  }
 }
+//# sourceMappingURL=window.js.map
 
-async function tryRemoveBazeliskFromYarnGlobal() {
-  try {
-    // Check if Bazelisk is installed on the yarn global scope
-    const {
-      stdout: bazeliskPkgInstallStdout
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'list'], {
-      stdio: 'pipe'
-    }); // Bazelisk was found on yarn global scope so lets remove it
-
-    if (bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@`)) {
-      await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'remove', `@bazel/bazelisk`], {
-        stdio: 'pipe'
-      });
-      _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] bazelisk was installed on Yarn global packages and is now removed`);
-      return true;
-    }
-
-    return false;
-  } catch {
-    return false;
-  }
-}
+/***/ }),
 
-async function installBazelTools(repoRootPath) {
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] reading bazel tools versions from version files`);
-  const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
-  const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowCount.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); // Check if we need to remove bazelisk from yarn
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowCount; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  await tryRemoveBazeliskFromYarnGlobal(); // Test if bazelisk is already installed in the correct version
 
-  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available
 
-  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed
 
-  if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] installing Bazel tools`);
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`);
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], {
-      env: {
-        USE_BAZEL_VERSION: bazelVersion
-      },
-      stdio: 'pipe'
+function windowCount(windowSize, startWindowEvery) {
+    if (startWindowEvery === void 0) { startWindowEvery = 0; }
+    var startEvery = startWindowEvery > 0 ? startWindowEvery : windowSize;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var windows = [new _Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]()];
+        var starts = [];
+        var count = 0;
+        subscriber.next(windows[0].asObservable());
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            try {
+                for (var windows_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(windows), windows_1_1 = windows_1.next(); !windows_1_1.done; windows_1_1 = windows_1.next()) {
+                    var window_1 = windows_1_1.value;
+                    window_1.next(value);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (windows_1_1 && !windows_1_1.done && (_a = windows_1.return)) _a.call(windows_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            var c = count - windowSize + 1;
+            if (c >= 0 && c % startEvery === 0) {
+                windows.shift().complete();
+            }
+            if (++count % startEvery === 0) {
+                var window_2 = new _Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]();
+                windows.push(window_2);
+                subscriber.next(window_2.asObservable());
+            }
+        }, function () {
+            while (windows.length > 0) {
+                windows.shift().complete();
+            }
+            subscriber.complete();
+        }, function (err) {
+            while (windows.length > 0) {
+                windows.shift().error(err);
+            }
+            subscriber.error(err);
+        }, function () {
+            starts = null;
+            windows = null;
+        }));
     });
-    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable();
-
-    if (!isBazelBinAvailableAfterInstall) {
-      throw new Error(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
-      `);
-    }
-  }
-
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].success(`[bazel_tools] all bazel tools are correctly installed`);
 }
+//# sourceMappingURL=windowCount.js.map
 
 /***/ }),
-/* 547 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowTime.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runBazel", function() { return runBazel; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runIBazel", function() { return runIBazel; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(235);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(548);
-/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(551);
-/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(342);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(341);
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(462);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowTime; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
+
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
 
 
 
+function windowTime(windowTimeSpan) {
+    var _a, _b;
+    var otherArgs = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        otherArgs[_i - 1] = arguments[_i];
+    }
+    var scheduler = (_a = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popScheduler */ "c"])(otherArgs)) !== null && _a !== void 0 ? _a : _scheduler_async__WEBPACK_IMPORTED_MODULE_1__[/* asyncScheduler */ "b"];
+    var windowCreationInterval = (_b = otherArgs[0]) !== null && _b !== void 0 ? _b : null;
+    var maxWindowSize = otherArgs[1] || Infinity;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var windowRecords = [];
+        var restartOnClose = false;
+        var closeWindow = function (record) {
+            var window = record.window, subs = record.subs;
+            window.complete();
+            subs.unsubscribe();
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_5__[/* arrRemove */ "a"])(windowRecords, record);
+            restartOnClose && startWindow();
+        };
+        var startWindow = function () {
+            if (windowRecords) {
+                var subs = new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]();
+                subscriber.add(subs);
+                var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+                var record_1 = {
+                    window: window_1,
+                    subs: subs,
+                    seen: 0,
+                };
+                windowRecords.push(record_1);
+                subscriber.next(window_1.asObservable());
+                Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subs, scheduler, function () { return closeWindow(record_1); }, windowTimeSpan);
+            }
+        };
+        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subscriber, scheduler, startWindow, windowCreationInterval, true);
+        }
+        else {
+            restartOnClose = true;
+        }
+        startWindow();
+        var loop = function (cb) { return windowRecords.slice().forEach(cb); };
+        var terminate = function (cb) {
+            loop(function (_a) {
+                var window = _a.window;
+                return cb(window);
+            });
+            cb(subscriber);
+            subscriber.unsubscribe();
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            loop(function (record) {
+                record.window.next(value);
+                maxWindowSize <= ++record.seen && closeWindow(record);
+            });
+        }, function () { return terminate(function (consumer) { return consumer.complete(); }); }, function (err) { return terminate(function (consumer) { return consumer.error(err); }); }));
+        return function () {
+            windowRecords = null;
+        };
+    });
+}
+//# sourceMappingURL=windowTime.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowToggle.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowToggle; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-async function runBazelCommandWithRunner(bazelCommandRunner, bazelArgs, offline = false, runOpts = {}) {
-  // Force logs to pipe in order to control the output of them
-  const bazelOpts = _objectSpread(_objectSpread({}, runOpts), {}, {
-    stdio: 'pipe'
-  });
 
-  if (offline) {
-    bazelArgs = [...bazelArgs, '--config=offline'];
-  }
 
-  const bazelProc = Object(_child_process__WEBPACK_IMPORTED_MODULE_4__["spawn"])(bazelCommandRunner, bazelArgs, bazelOpts);
-  const bazelLogs$ = new rxjs__WEBPACK_IMPORTED_MODULE_1__["Subject"](); // Bazel outputs machine readable output into stdout and human readable output goes to stderr.
-  // Therefore we need to get both. In order to get errors we need to parse the actual text line
 
-  const bazelLogSubscription = rxjs__WEBPACK_IMPORTED_MODULE_1__["merge"](Object(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__["observeLines"])(bazelProc.stdout).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_2__["tap"])(line => _log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan(`[${bazelCommandRunner}]`)} ${line}`))), Object(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__["observeLines"])(bazelProc.stderr).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_2__["tap"])(line => _log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan(`[${bazelCommandRunner}]`)} ${line}`)))).subscribe(bazelLogs$); // Wait for process and logs to finish, unsubscribing in the end
 
-  try {
-    await bazelProc;
-  } catch {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error('HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`');
-    throw new _errors__WEBPACK_IMPORTED_MODULE_6__["CliError"](`The bazel command that was running failed to complete.`);
-  }
 
-  await bazelLogs$.toPromise();
-  await bazelLogSubscription.unsubscribe();
-}
 
-async function runBazel(bazelArgs, offline = false, runOpts = {}) {
-  await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
-}
-async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
-  const extendedEnv = _objectSpread({
-    IBAZEL_USE_LEGACY_WATCHER: '0'
-  }, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);
 
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
-    env: extendedEnv
-  }));
+function windowToggle(openings, closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var windows = [];
+        var handleError = function (err) {
+            while (0 < windows.length) {
+                windows.shift().error(err);
+            }
+            subscriber.error(err);
+        };
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__[/* innerFrom */ "a"])(openings).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (openValue) {
+            var window = new _Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]();
+            windows.push(window);
+            var closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]();
+            var closeWindow = function () {
+                Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_7__[/* arrRemove */ "a"])(windows, window);
+                window.complete();
+                closingSubscription.unsubscribe();
+            };
+            var closingNotifier;
+            try {
+                closingNotifier = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__[/* innerFrom */ "a"])(closingSelector(openValue));
+            }
+            catch (err) {
+                handleError(err);
+                return;
+            }
+            subscriber.next(window.asObservable());
+            closingSubscription.add(closingNotifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, closeWindow, _util_noop__WEBPACK_IMPORTED_MODULE_6__[/* noop */ "a"], handleError)));
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_6__[/* noop */ "a"]));
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            var windowsCopy = windows.slice();
+            try {
+                for (var windowsCopy_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(windowsCopy), windowsCopy_1_1 = windowsCopy_1.next(); !windowsCopy_1_1.done; windowsCopy_1_1 = windowsCopy_1.next()) {
+                    var window_1 = windowsCopy_1_1.value;
+                    window_1.next(value);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (windowsCopy_1_1 && !windowsCopy_1_1.done && (_a = windowsCopy_1.return)) _a.call(windowsCopy_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }, function () {
+            while (0 < windows.length) {
+                windows.shift().complete();
+            }
+            subscriber.complete();
+        }, handleError, function () {
+            while (0 < windows.length) {
+                windows.shift().unsubscribe();
+            }
+        }));
+    });
 }
+//# sourceMappingURL=windowToggle.js.map
 
 /***/ }),
-/* 548 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowWhen.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(129);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowWhen; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(130);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; });
 
-/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(131);
-/* 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__(132);
-/* 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__(133);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; });
+function windowWhen(closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var window;
+        var closingSubscriber;
+        var handleError = function (err) {
+            window.error(err);
+            subscriber.error(err);
+        };
+        var openWindow = function () {
+            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
+            window === null || window === void 0 ? void 0 : window.complete();
+            window = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+            subscriber.next(window.asObservable());
+            var closingNotifier;
+            try {
+                closingNotifier = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(closingSelector());
+            }
+            catch (err) {
+                handleError(err);
+                return;
+            }
+            closingNotifier.subscribe((closingSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, openWindow, openWindow, handleError)));
+        };
+        openWindow();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return window.next(value); }, function () {
+            window.complete();
+            subscriber.complete();
+        }, handleError, function () {
+            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
+            window = null;
+        }));
+    });
+}
+//# sourceMappingURL=windowWhen.js.map
 
-/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(134);
-/* 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__(135);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(136);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return withLatestFrom; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
 
-/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(137);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; });
 
-/* harmony import */ var _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(138);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_9__["combineLatestAll"]; });
 
-/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(144);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_10__["combineLatest"]; });
 
-/* harmony import */ var _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(143);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_11__["combineLatestWith"]; });
 
-/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(148);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_12__["concat"]; });
 
-/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(102);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_13__["concatAll"]; });
 
-/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(145);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_14__["concatMap"]; });
+function withLatestFrom() {
+    var inputs = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        inputs[_i] = arguments[_i];
+    }
+    var project = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popResultSelector */ "b"])(inputs);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var len = inputs.length;
+        var otherValues = new Array(len);
+        var hasValue = inputs.map(function () { return false; });
+        var ready = false;
+        var _loop_1 = function (i) {
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(inputs[i]).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                otherValues[i] = value;
+                if (!ready && !hasValue[i]) {
+                    hasValue[i] = true;
+                    (ready = hasValue.every(_util_identity__WEBPACK_IMPORTED_MODULE_4__[/* identity */ "a"])) && (hasValue = null);
+                }
+            }, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"]));
+        };
+        for (var i = 0; i < len; i++) {
+            _loop_1(i);
+        }
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            if (ready) {
+                var values = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([value], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherValues));
+                subscriber.next(project ? project.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(values))) : values);
+            }
+        }));
+    });
+}
+//# sourceMappingURL=withLatestFrom.js.map
 
-/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(146);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_15__["concatMapTo"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(147);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_16__["concatWith"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/zip.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_connect__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(149);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return _internal_operators_connect__WEBPACK_IMPORTED_MODULE_17__["connect"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zip; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/zip.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(151);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_18__["count"]; });
 
-/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(152);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_19__["debounce"]; });
 
-/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(153);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_20__["debounceTime"]; });
+function zip() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        _observable_zip__WEBPACK_IMPORTED_MODULE_1__[/* zip */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(sources))).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=zip.js.map
 
-/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(154);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_21__["defaultIfEmpty"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(155);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_22__["delay"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/zipAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(156);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_23__["delayWhen"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zipAll; });
+/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/zip.js");
+/* harmony import */ var _joinAllInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/joinAllInternals.js");
 
-/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(160);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_24__["dematerialize"]; });
 
-/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(161);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_25__["distinct"]; });
+function zipAll(project) {
+    return Object(_joinAllInternals__WEBPACK_IMPORTED_MODULE_1__[/* joinAllInternals */ "a"])(_observable_zip__WEBPACK_IMPORTED_MODULE_0__[/* zip */ "a"], project);
+}
+//# sourceMappingURL=zipAll.js.map
 
-/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(162);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_26__["distinctUntilChanged"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(163);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_27__["distinctUntilKeyChanged"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/zipWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(164);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_28__["elementAt"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zipWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _zip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zip.js");
 
-/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(166);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_29__["endWith"]; });
 
-/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(167);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_30__["every"]; });
+function zipWith() {
+    var otherInputs = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherInputs[_i] = arguments[_i];
+    }
+    return _zip__WEBPACK_IMPORTED_MODULE_1__[/* zip */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherInputs)));
+}
+//# sourceMappingURL=zipWith.js.map
 
-/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(168);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_31__["exhaust"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(169);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_32__["exhaustAll"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleArray.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(170);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_33__["exhaustMap"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleArray; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
 
-/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(171);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_34__["expand"]; });
+function scheduleArray(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var i = 0;
+        return scheduler.schedule(function () {
+            if (i === input.length) {
+                subscriber.complete();
+            }
+            else {
+                subscriber.next(input[i++]);
+                if (!subscriber.closed) {
+                    this.schedule();
+                }
+            }
+        });
+    });
+}
+//# sourceMappingURL=scheduleArray.js.map
 
-/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(123);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_35__["filter"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(172);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_36__["finalize"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleAsyncIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(173);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_37__["find"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleAsyncIterable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(174);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_38__["findIndex"]; });
 
-/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(175);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_39__["first"]; });
-
-/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(176);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_40__["groupBy"]; });
-
-/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(158);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_41__["ignoreElements"]; });
-
-/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(177);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_42__["isEmpty"]; });
+function scheduleAsyncIterable(input, scheduler) {
+    if (!input) {
+        throw new Error('Iterable cannot be null');
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+            var iterator = input[Symbol.asyncIterator]();
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+                iterator.next().then(function (result) {
+                    if (result.done) {
+                        subscriber.complete();
+                    }
+                    else {
+                        subscriber.next(result.value);
+                    }
+                });
+            }, 0, true);
+        });
+    });
+}
+//# sourceMappingURL=scheduleAsyncIterable.js.map
 
-/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(178);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_43__["last"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(96);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_44__["map"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(159);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_45__["mapTo"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleIterable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/iterator.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(180);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_46__["materialize"]; });
 
-/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(181);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_47__["max"]; });
 
-/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(186);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_48__["merge"]; });
 
-/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(103);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_49__["mergeAll"]; });
+function scheduleIterable(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var iterator;
+        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+            iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_1__[/* iterator */ "a"]]();
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+                var _a;
+                var value;
+                var done;
+                try {
+                    (_a = iterator.next(), value = _a.value, done = _a.done);
+                }
+                catch (err) {
+                    subscriber.error(err);
+                    return;
+                }
+                if (done) {
+                    subscriber.complete();
+                }
+                else {
+                    subscriber.next(value);
+                }
+            }, 0, true);
+        });
+        return function () { return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__[/* isFunction */ "a"])(iterator === null || iterator === void 0 ? void 0 : iterator.return) && iterator.return(); };
+    });
+}
+//# sourceMappingURL=scheduleIterable.js.map
 
-/* harmony import */ var _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(182);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_50__["flatMap"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(104);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_51__["mergeMap"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(183);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_52__["mergeMapTo"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleObservable; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
 
-/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(184);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_53__["mergeScan"]; });
 
-/* harmony import */ var _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(185);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_54__["mergeWith"]; });
 
-/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(187);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_55__["min"]; });
+function scheduleObservable(input, scheduler) {
+    return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(input).pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__[/* subscribeOn */ "a"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_1__[/* observeOn */ "a"])(scheduler));
+}
+//# sourceMappingURL=scheduleObservable.js.map
 
-/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(188);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_56__["multicast"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(75);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_57__["observeOn"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/schedulePromise.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(118);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_58__["onErrorResumeNext"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return schedulePromise; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
 
-/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(189);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_59__["pairwise"]; });
 
-/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(549);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_60__["partition"]; });
 
-/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(190);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_61__["pluck"]; });
+function schedulePromise(input, scheduler) {
+    return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(input).pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__[/* subscribeOn */ "a"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_1__[/* observeOn */ "a"])(scheduler));
+}
+//# sourceMappingURL=schedulePromise.js.map
 
-/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(191);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_62__["publish"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(192);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_63__["publishBehavior"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleReadableStreamLike.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(193);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_64__["publishLast"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleReadableStreamLike; });
+/* harmony import */ var _scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleAsyncIterable.js");
+/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js");
 
-/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(194);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_65__["publishReplay"]; });
 
-/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(550);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_66__["race"]; });
+function scheduleReadableStreamLike(input, scheduler) {
+    return Object(_scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_0__[/* scheduleAsyncIterable */ "a"])(Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_1__[/* readableStreamLikeToAsyncGenerator */ "b"])(input), scheduler);
+}
+//# sourceMappingURL=scheduleReadableStreamLike.js.map
 
-/* harmony import */ var _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(195);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_67__["raceWith"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(141);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_68__["reduce"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduled.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(196);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_69__["repeat"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduled; });
+/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleObservable.js");
+/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/schedulePromise.js");
+/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleArray.js");
+/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleIterable.js");
+/* harmony import */ var _scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleAsyncIterable.js");
+/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js");
+/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isPromise.js");
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js");
+/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isIterable.js");
+/* harmony import */ var _util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js");
+/* harmony import */ var _util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js");
+/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js");
+/* harmony import */ var _scheduleReadableStreamLike__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleReadableStreamLike.js");
 
-/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(197);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_70__["repeatWhen"]; });
 
-/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(198);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_71__["retry"]; });
 
-/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(199);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_72__["retryWhen"]; });
 
-/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(28);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_73__["refCount"]; });
 
-/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(200);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_74__["sample"]; });
 
-/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(201);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_75__["sampleTime"]; });
 
-/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(202);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_76__["scan"]; });
 
-/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(203);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_77__["sequenceEqual"]; });
 
-/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(204);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_78__["share"]; });
 
-/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(205);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_79__["shareReplay"]; });
 
-/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(206);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_80__["single"]; });
 
-/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(207);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_81__["skip"]; });
 
-/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(208);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_82__["skipLast"]; });
+function scheduled(input, scheduler) {
+    if (input != null) {
+        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_5__[/* isInteropObservable */ "a"])(input)) {
+            return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__[/* scheduleObservable */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_7__[/* isArrayLike */ "a"])(input)) {
+            return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__[/* scheduleArray */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_6__[/* isPromise */ "a"])(input)) {
+            return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__[/* schedulePromise */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_9__[/* isAsyncIterable */ "a"])(input)) {
+            return Object(_scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_4__[/* scheduleAsyncIterable */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_8__[/* isIterable */ "a"])(input)) {
+            return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__[/* scheduleIterable */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_11__[/* isReadableStreamLike */ "a"])(input)) {
+            return Object(_scheduleReadableStreamLike__WEBPACK_IMPORTED_MODULE_12__[/* scheduleReadableStreamLike */ "a"])(input, scheduler);
+        }
+    }
+    throw Object(_util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_10__[/* createInvalidObservableTypeError */ "a"])(input);
+}
+//# sourceMappingURL=scheduled.js.map
 
-/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(209);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_83__["skipUntil"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(210);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_84__["skipWhile"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/Action.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(211);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_85__["startWith"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Action; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
 
-/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(77);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_86__["subscribeOn"]; });
 
-/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(212);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_87__["switchAll"]; });
+var Action = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 */ "b"]));
 
-/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(213);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_88__["switchMap"]; });
+//# sourceMappingURL=Action.js.map
 
-/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(214);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_89__["switchMapTo"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(215);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_90__["switchScan"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(157);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_91__["take"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrameProvider.js");
 
-/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(179);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_92__["takeLast"]; });
 
-/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(216);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_93__["takeUntil"]; });
 
-/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(217);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_94__["takeWhile"]; });
+var AnimationFrameAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 = _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__[/* animationFrameProvider */ "a"].requestAnimationFrame(function () { return scheduler.flush(undefined); }));
+    };
+    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.some(function (action) { return action.id === id; })) {
+            _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__[/* animationFrameProvider */ "a"].cancelAnimationFrame(id);
+            scheduler._scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AnimationFrameAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__[/* AsyncAction */ "a"]));
 
-/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(218);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_95__["tap"]; });
+//# sourceMappingURL=AnimationFrameAction.js.map
 
-/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(219);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_96__["throttle"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(220);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_97__["throttleTime"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(165);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_98__["throwIfEmpty"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
-/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(221);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_99__["timeInterval"]; });
 
-/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(91);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_100__["timeout"]; });
+var AnimationFrameScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AnimationFrameScheduler, _super);
+    function AnimationFrameScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AnimationFrameScheduler.prototype.flush = function (action) {
+        this._active = true;
+        var flushId = this._scheduled;
+        this._scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        action = action || actions.shift();
+        do {
+            if ((error = action.execute(action.state, action.delay))) {
+                break;
+            }
+        } while ((action = actions[0]) && action.id === flushId && actions.shift());
+        this._active = false;
+        if (error) {
+            while ((action = actions[0]) && action.id === flushId && actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AnimationFrameScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"]));
 
-/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(222);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_101__["timeoutWith"]; });
+//# sourceMappingURL=AnimationFrameScheduler.js.map
 
-/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(223);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_102__["timestamp"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_103__ = __webpack_require__(140);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_103__["toArray"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_104__ = __webpack_require__(224);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_104__["window"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _immediateProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/immediateProvider.js");
 
-/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_105__ = __webpack_require__(225);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_105__["windowCount"]; });
 
-/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_106__ = __webpack_require__(226);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_106__["windowTime"]; });
 
-/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_107__ = __webpack_require__(227);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_107__["windowToggle"]; });
+var AsapAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 = _immediateProvider__WEBPACK_IMPORTED_MODULE_2__[/* immediateProvider */ "a"].setImmediate(scheduler.flush.bind(scheduler, undefined)));
+    };
+    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.some(function (action) { return action.id === id; })) {
+            _immediateProvider__WEBPACK_IMPORTED_MODULE_2__[/* immediateProvider */ "a"].clearImmediate(id);
+            scheduler._scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AsapAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__[/* AsyncAction */ "a"]));
 
-/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_108__ = __webpack_require__(228);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_108__["windowWhen"]; });
+//# sourceMappingURL=AsapAction.js.map
 
-/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_109__ = __webpack_require__(229);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_109__["withLatestFrom"]; });
+/***/ }),
 
-/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_110__ = __webpack_require__(232);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_110__["zip"]; });
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_111__ = __webpack_require__(230);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_111__["zipAll"]; });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
-/* harmony import */ var _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_112__ = __webpack_require__(231);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_112__["zipWith"]; });
 
+var AsapScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsapScheduler, _super);
+    function AsapScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AsapScheduler.prototype.flush = function (action) {
+        this._active = true;
+        var flushId = this._scheduled;
+        this._scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        action = action || actions.shift();
+        do {
+            if ((error = action.execute(action.state, action.delay))) {
+                break;
+            }
+        } while ((action = actions[0]) && action.id === flushId && actions.shift());
+        this._active = false;
+        if (error) {
+            while ((action = actions[0]) && action.id === flushId && actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsapScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"]));
 
+//# sourceMappingURL=AsapScheduler.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/Action.js");
+/* harmony import */ var _intervalProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/intervalProvider.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
 
 
 
+var AsyncAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 _intervalProvider__WEBPACK_IMPORTED_MODULE_2__[/* intervalProvider */ "a"].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;
+        }
+        _intervalProvider__WEBPACK_IMPORTED_MODULE_2__[/* intervalProvider */ "a"].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;
+        try {
+            this.work(state);
+        }
+        catch (e) {
+            errored = true;
+            errorValue = e ? e : new Error('Scheduled action threw falsy error');
+        }
+        if (errored) {
+            this.unsubscribe();
+            return errorValue;
+        }
+    };
+    AsyncAction.prototype.unsubscribe = function () {
+        if (!this.closed) {
+            var _a = this, id = _a.id, scheduler = _a.scheduler;
+            var actions = scheduler.actions;
+            this.work = this.state = this.scheduler = null;
+            this.pending = false;
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(actions, this);
+            if (id != null) {
+                this.id = this.recycleAsyncId(scheduler, id, null);
+            }
+            this.delay = null;
+            _super.prototype.unsubscribe.call(this);
+        }
+    };
+    return AsyncAction;
+}(_Action__WEBPACK_IMPORTED_MODULE_1__[/* Action */ "a"]));
 
+//# sourceMappingURL=AsyncAction.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Scheduler.js");
 
 
+var AsyncScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsyncScheduler, _super);
+    function AsyncScheduler(SchedulerAction, now) {
+        if (now === void 0) { now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__[/* Scheduler */ "a"].now; }
+        var _this = _super.call(this, SchedulerAction, now) || this;
+        _this.actions = [];
+        _this._active = false;
+        _this._scheduled = undefined;
+        return _this;
+    }
+    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 */ "a"]));
 
+//# sourceMappingURL=AsyncScheduler.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
 
 
+var QueueAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 */ "a"]));
 
+//# sourceMappingURL=QueueAction.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
 
+var QueueScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(QueueScheduler, _super);
+    function QueueScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return QueueScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"]));
 
+//# sourceMappingURL=QueueScheduler.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/VirtualTimeScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return VirtualTimeScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VirtualAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
 
 
 
+var VirtualTimeScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(VirtualTimeScheduler, _super);
+    function VirtualTimeScheduler(schedulerActionCtor, maxFrames) {
+        if (schedulerActionCtor === void 0) { schedulerActionCtor = VirtualAction; }
+        if (maxFrames === void 0) { maxFrames = Infinity; }
+        var _this = _super.call(this, schedulerActionCtor, 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;
+        var 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_3__[/* AsyncScheduler */ "a"]));
 
+var VirtualAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(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 (Number.isFinite(delay)) {
+            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);
+        }
+        else {
+            return _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"].EMPTY;
+        }
+    };
+    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 */ "a"]));
 
+//# sourceMappingURL=VirtualTimeScheduler.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrame.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return animationFrameScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrame; });
+/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameAction.js");
+/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameScheduler.js");
 
 
+var animationFrameScheduler = new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AnimationFrameScheduler */ "a"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__[/* AnimationFrameAction */ "a"]);
+var animationFrame = animationFrameScheduler;
+//# sourceMappingURL=animationFrame.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrameProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrameProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
 
 
+var animationFrameProvider = {
+    schedule: function (callback) {
+        var request = requestAnimationFrame;
+        var cancel = cancelAnimationFrame;
+        var delegate = animationFrameProvider.delegate;
+        if (delegate) {
+            request = delegate.requestAnimationFrame;
+            cancel = delegate.cancelAnimationFrame;
+        }
+        var handle = request(function (timestamp) {
+            cancel = undefined;
+            callback(timestamp);
+        });
+        return new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"](function () { return cancel === null || cancel === void 0 ? void 0 : cancel(handle); });
+    },
+    requestAnimationFrame: function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var delegate = animationFrameProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.requestAnimationFrame) || requestAnimationFrame).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    cancelAnimationFrame: function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var delegate = animationFrameProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.cancelAnimationFrame) || cancelAnimationFrame).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=animationFrameProvider.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/asap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return asapScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return asap; });
+/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapAction.js");
+/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapScheduler.js");
 
 
+var asapScheduler = new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsapScheduler */ "a"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__[/* AsapAction */ "a"]);
+var asap = asapScheduler;
+//# sourceMappingURL=asap.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return asyncScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return async; });
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
 
+var asyncScheduler = new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__[/* AsyncAction */ "a"]);
+var async = asyncScheduler;
+//# sourceMappingURL=async.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return dateTimestampProvider; });
+var dateTimestampProvider = {
+    now: function () {
+        return (dateTimestampProvider.delegate || Date).now();
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=dateTimestampProvider.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/immediateProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return immediateProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/Immediate.js");
 
 
+var setImmediate = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__[/* Immediate */ "a"].setImmediate, clearImmediate = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__[/* Immediate */ "a"].clearImmediate;
+var immediateProvider = {
+    setImmediate: function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var delegate = immediateProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.setImmediate) || setImmediate).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    clearImmediate: function (handle) {
+        var delegate = immediateProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearImmediate) || clearImmediate)(handle);
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=immediateProvider.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/intervalProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return intervalProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
 
+var intervalProvider = {
+    setInterval: function (handler, timeout) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        var delegate = intervalProvider.delegate;
+        if (delegate === null || delegate === void 0 ? void 0 : delegate.setInterval) {
+            return delegate.setInterval.apply(delegate, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+        }
+        return setInterval.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    clearInterval: function (handle) {
+        var delegate = intervalProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearInterval) || clearInterval)(handle);
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=intervalProvider.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/performanceTimestampProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return performanceTimestampProvider; });
+var performanceTimestampProvider = {
+    now: function () {
+        return (performanceTimestampProvider.delegate || performance).now();
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=performanceTimestampProvider.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/queue.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return queueScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return queue; });
+/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueAction.js");
+/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueScheduler.js");
 
 
+var queueScheduler = new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__[/* QueueScheduler */ "a"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__[/* QueueAction */ "a"]);
+var queue = queueScheduler;
+//# sourceMappingURL=queue.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timeoutProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
 
+var timeoutProvider = {
+    setTimeout: function (handler, timeout) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        var delegate = timeoutProvider.delegate;
+        if (delegate === null || delegate === void 0 ? void 0 : delegate.setTimeout) {
+            return delegate.setTimeout.apply(delegate, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+        }
+        return setTimeout.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    clearTimeout: function (handle) {
+        var delegate = timeoutProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearTimeout) || clearTimeout)(handle);
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=timeoutProvider.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/symbol/iterator.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* unused harmony export getSymbolIterator */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iterator; });
+function getSymbolIterator() {
+    if (typeof Symbol !== 'function' || !Symbol.iterator) {
+        return '@@iterator';
+    }
+    return Symbol.iterator;
+}
+var iterator = getSymbolIterator();
+//# sourceMappingURL=iterator.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observable; });
+var observable = (function () { return (typeof Symbol === 'function' && Symbol.observable) || '@@observable'; })();
+//# sourceMappingURL=observable.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/ArgumentOutOfRangeError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ArgumentOutOfRangeError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var ArgumentOutOfRangeError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function ArgumentOutOfRangeErrorImpl() {
+        _super(this);
+        this.name = 'ArgumentOutOfRangeError';
+        this.message = 'argument out of range';
+    };
+});
+//# sourceMappingURL=ArgumentOutOfRangeError.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EmptyError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var EmptyError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) { return function EmptyErrorImpl() {
+    _super(this);
+    this.name = 'EmptyError';
+    this.message = 'no elements in sequence';
+}; });
+//# sourceMappingURL=EmptyError.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/Immediate.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Immediate; });
+/* unused harmony export TestTools */
+var nextHandle = 1;
+var resolved;
+var activeHandles = {};
+function findAndClearHandle(handle) {
+    if (handle in activeHandles) {
+        delete activeHandles[handle];
+        return true;
+    }
+    return false;
+}
+var Immediate = {
+    setImmediate: function (cb) {
+        var handle = nextHandle++;
+        activeHandles[handle] = true;
+        if (!resolved) {
+            resolved = Promise.resolve();
+        }
+        resolved.then(function () { return findAndClearHandle(handle) && cb(); });
+        return handle;
+    },
+    clearImmediate: function (handle) {
+        findAndClearHandle(handle);
+    },
+};
+var TestTools = {
+    pending: function () {
+        return Object.keys(activeHandles).length;
+    }
+};
+//# sourceMappingURL=Immediate.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/NotFoundError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return NotFoundError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var NotFoundError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function NotFoundErrorImpl(message) {
+        _super(this);
+        this.name = 'NotFoundError';
+        this.message = message;
+    };
+});
+//# sourceMappingURL=NotFoundError.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/ObjectUnsubscribedError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObjectUnsubscribedError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var ObjectUnsubscribedError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function ObjectUnsubscribedErrorImpl() {
+        _super(this);
+        this.name = 'ObjectUnsubscribedError';
+        this.message = 'object unsubscribed';
+    };
+});
+//# sourceMappingURL=ObjectUnsubscribedError.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/SequenceError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SequenceError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var SequenceError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function SequenceErrorImpl(message) {
+        _super(this);
+        this.name = 'SequenceError';
+        this.message = message;
+    };
+});
+//# sourceMappingURL=SequenceError.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return UnsubscriptionError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
-//# sourceMappingURL=index.js.map
+var UnsubscriptionError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function UnsubscriptionErrorImpl(errors) {
+        _super(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;
+    };
+});
+//# sourceMappingURL=UnsubscriptionError.js.map
 
 /***/ }),
-/* 549 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/args.js":
 /***/ (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__(122);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(123);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return popResultSelector; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return popScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return popNumber; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
 
 
-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)];
-    };
+function last(arr) {
+    return arr[arr.length - 1];
 }
-//# sourceMappingURL=partition.js.map
+function popResultSelector(args) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(last(args)) ? args.pop() : undefined;
+}
+function popScheduler(args) {
+    return Object(_isScheduler__WEBPACK_IMPORTED_MODULE_1__[/* isScheduler */ "a"])(last(args)) ? args.pop() : undefined;
+}
+function popNumber(args, defaultValue) {
+    return typeof last(args) === 'number' ? args.pop() : defaultValue;
+}
+//# sourceMappingURL=args.js.map
 
 /***/ }),
-/* 550 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/argsArgArrayOrObject.js":
 /***/ (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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(119);
-/* harmony import */ var _raceWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(195);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return argsArgArrayOrObject; });
+var isArray = Array.isArray;
+var getPrototypeOf = Object.getPrototypeOf, objectProto = Object.prototype, getKeys = Object.keys;
+function argsArgArrayOrObject(args) {
+    if (args.length === 1) {
+        var first_1 = args[0];
+        if (isArray(first_1)) {
+            return { args: first_1, keys: null };
+        }
+        if (isPOJO(first_1)) {
+            var keys = getKeys(first_1);
+            return {
+                args: keys.map(function (key) { return first_1[key]; }),
+                keys: keys,
+            };
+        }
+    }
+    return { args: args, keys: null };
+}
+function isPOJO(obj) {
+    return obj && typeof obj === 'object' && getPrototypeOf(obj) === objectProto;
+}
+//# sourceMappingURL=argsArgArrayOrObject.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function race() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    return _raceWith__WEBPACK_IMPORTED_MODULE_2__["raceWith"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spreadArray"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_1__["argsOrArgArray"])(args))));
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return argsOrArgArray; });
+var isArray = Array.isArray;
+function argsOrArgArray(args) {
+    return args.length === 1 && isArray(args[0]) ? args[0] : args;
 }
-//# sourceMappingURL=race.js.map
+//# sourceMappingURL=argsOrArgArray.js.map
 
 /***/ }),
-/* 551 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return arrRemove; });
+function arrRemove(arr, item) {
+    if (arr) {
+        var index = arr.indexOf(item);
+        0 <= index && arr.splice(index, 1);
+    }
+}
+//# sourceMappingURL=arrRemove.js.map
 
+/***/ }),
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var _observe_lines = __webpack_require__(552);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createErrorClass; });
+function createErrorClass(createImpl) {
+    var _super = function (instance) {
+        Error.call(instance);
+        instance.stack = new Error().stack;
+    };
+    var ctorFunc = createImpl(_super);
+    ctorFunc.prototype = Object.create(Error.prototype);
+    ctorFunc.prototype.constructor = ctorFunc;
+    return ctorFunc;
+}
+//# sourceMappingURL=createErrorClass.js.map
 
-Object.keys(_observe_lines).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _observe_lines[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _observe_lines[key];
-    }
-  });
-});
+/***/ }),
 
-var _observe_readable = __webpack_require__(553);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/createObject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Object.keys(_observe_readable).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _observe_readable[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _observe_readable[key];
-    }
-  });
-});
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createObject; });
+function createObject(keys, values) {
+    return keys.reduce(function (result, key, i) { return ((result[key] = values[i]), result); }, {});
+}
+//# sourceMappingURL=createObject.js.map
 
 /***/ }),
-/* 552 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return errorContext; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return captureError; });
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
 
+var context = null;
+function errorContext(cb) {
+    if (_config__WEBPACK_IMPORTED_MODULE_0__[/* config */ "a"].useDeprecatedSynchronousErrorHandling) {
+        var isRoot = !context;
+        if (isRoot) {
+            context = { errorThrown: false, error: null };
+        }
+        cb();
+        if (isRoot) {
+            var _a = context, errorThrown = _a.errorThrown, error = _a.error;
+            context = null;
+            if (errorThrown) {
+                throw error;
+            }
+        }
+    }
+    else {
+        cb();
+    }
+}
+function captureError(err) {
+    if (_config__WEBPACK_IMPORTED_MODULE_0__[/* config */ "a"].useDeprecatedSynchronousErrorHandling && context) {
+        context.errorThrown = true;
+        context.error = err;
+    }
+}
+//# sourceMappingURL=errorContext.js.map
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.observeLines = observeLines;
+/***/ }),
 
-var Rx = _interopRequireWildcard(__webpack_require__(9));
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var _operators = __webpack_require__(548);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return executeSchedule; });
+function executeSchedule(parentSubscription, scheduler, work, delay, repeat) {
+    if (delay === void 0) { delay = 0; }
+    if (repeat === void 0) { repeat = false; }
+    var scheduleSubscription = scheduler.schedule(function () {
+        work();
+        if (repeat) {
+            parentSubscription.add(this.schedule(null, delay));
+        }
+        else {
+            this.unsubscribe();
+        }
+    }, delay);
+    parentSubscription.add(scheduleSubscription);
+    if (!repeat) {
+        return scheduleSubscription;
+    }
+}
+//# sourceMappingURL=executeSchedule.js.map
 
-var _observe_readable = __webpack_require__(553);
+/***/ }),
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/identity.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return identity; });
+function identity(x) {
+    return x;
+}
+//# sourceMappingURL=identity.js.map
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-const SEP = /\r?\n/;
+/***/ }),
 
-/**
- *  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$ = (0, _observe_readable.observeReadable)(readable).pipe((0, _operators.share)());
-  const scan$ = Rx.fromEvent(readable, 'data').pipe((0, _operators.scan)(({
-    buffer
-  }, chunk) => {
-    buffer += chunk;
-    const lines = [];
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    while (true) {
-      const match = buffer.match(SEP);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArrayLike; });
+var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
+//# sourceMappingURL=isArrayLike.js.map
 
-      if (!match || match.index === undefined) {
-        break;
-      }
+/***/ }),
 
-      lines.push(buffer.slice(0, match.index));
-      buffer = buffer.slice(match.index + match[0].length);
-    }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    return {
-      buffer,
-      lines
-    };
-  }, {
-    buffer: ''
-  }), // stop if done completes or errors
-  (0, _operators.takeUntil)(done$.pipe((0, _operators.materialize)())), (0, _operators.share)());
-  return Rx.merge( // use done$ to provide completion/errors
-  done$, // merge in the "lines" from each step
-  scan$.pipe((0, _operators.mergeMap)(({
-    lines
-  }) => lines || [])), // inject the "unsplit" data at the end
-  scan$.pipe((0, _operators.last)(), (0, _operators.mergeMap)(({
-    buffer
-  }) => buffer ? [buffer] : []), // if there were no lines, last() will error, so catch and complete
-  (0, _operators.catchError)(() => Rx.empty())));
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isAsyncIterable; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+
+function isAsyncIterable(obj) {
+    return Symbol.asyncIterator && Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(obj === null || obj === void 0 ? void 0 : obj[Symbol.asyncIterator]);
 }
+//# sourceMappingURL=isAsyncIterable.js.map
 
 /***/ }),
-/* 553 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isDate.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isValidDate; });
+function isValidDate(value) {
+    return value instanceof Date && !isNaN(value);
+}
+//# sourceMappingURL=isDate.js.map
 
+/***/ }),
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.observeReadable = observeReadable;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var Rx = _interopRequireWildcard(__webpack_require__(9));
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isFunction; });
+function isFunction(value) {
+    return typeof value === 'function';
+}
+//# sourceMappingURL=isFunction.js.map
 
-var _operators = __webpack_require__(548);
+/***/ }),
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isInteropObservable; });
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
-/**
- *  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((0, _operators.first)(), (0, _operators.ignoreElements)()), Rx.fromEvent(readable, 'error').pipe((0, _operators.first)(), (0, _operators.mergeMap)(err => Rx.throwError(err))));
+function isInteropObservable(input) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__[/* observable */ "a"]]);
 }
+//# sourceMappingURL=isInteropObservable.js.map
 
 /***/ }),
-/* 554 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isIterable.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removeYarnIntegrityFileIfExists", function() { return removeYarnIntegrityFileIfExists; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(352);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isIterable; });
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/iterator.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
 
-async function removeYarnIntegrityFileIfExists(nodeModulesPath) {
-  try {
-    const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["tryRealpath"])(nodeModulesPath);
-    const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // check if the file exists and delete it in that case
-
-    if (await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["isFile"])(yarnIntegrityFilePath)) {
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["unlink"])(yarnIntegrityFilePath);
-    }
-  } catch {// no-op
-  }
+function isIterable(input) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(input === null || input === void 0 ? void 0 : input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__[/* iterator */ "a"]]);
 }
+//# sourceMappingURL=isIterable.js.map
 
 /***/ }),
-/* 555 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isObservable.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setupRemoteCache", function() { return setupRemoteCache; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(253);
-/* 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__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(342);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(341);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isObservable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
 
+function isObservable(obj) {
+    return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"] || (Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(obj.lift) && Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(obj.subscribe)));
+}
+//# sourceMappingURL=isObservable.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isPromise.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isPromise; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-async function isVaultAvailable() {
-  try {
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('vault', ['--version'], {
-      stdio: 'pipe'
-    });
-    return true;
-  } catch {
-    return false;
-  }
+function isPromise(value) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(value === null || value === void 0 ? void 0 : value.then);
 }
+//# sourceMappingURL=isPromise.js.map
 
-async function isElasticCommitter() {
-  try {
-    const {
-      stdout: email
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('git', ['config', 'user.email'], {
-      stdio: 'pipe'
-    });
-    return email.trim().endsWith('@elastic.co');
-  } catch {
-    return false;
-  }
-}
-
-async function setupRemoteCache(repoRootPath) {
-  // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
-  if (process.env.CI || !(await isElasticCommitter())) {
-    return;
-  }
-
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] setting up remote cache settings if necessary`);
-  const settingsPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(repoRootPath, '.bazelrc.cache');
+/***/ }),
 
-  if (Object(fs__WEBPACK_IMPORTED_MODULE_1__["existsSync"])(settingsPath)) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] remote cache settings already exist, skipping`);
-    return;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (!(await isVaultAvailable())) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
-    return;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return readableStreamLikeToAsyncGenerator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isReadableStreamLike; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  let apiKey = '';
 
-  try {
-    const {
-      stdout
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('vault', ['read', '-field=readonly-key', 'secret/ui-team/kibana-bazel-remote-cache'], {
-      stdio: 'pipe'
+function readableStreamLikeToAsyncGenerator(readableStream) {
+    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __asyncGenerator */ "a"])(this, arguments, function readableStreamLikeToAsyncGenerator_1() {
+        var reader, _a, value, done;
+        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __generator */ "f"])(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    reader = readableStream.getReader();
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, , 9, 10]);
+                    _b.label = 2;
+                case 2:
+                    if (false) {}
+                    return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __await */ "c"])(reader.read())];
+                case 3:
+                    _a = _b.sent(), value = _a.value, done = _a.done;
+                    if (!done) return [3, 5];
+                    return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __await */ "c"])(void 0)];
+                case 4: return [2, _b.sent()];
+                case 5: return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __await */ "c"])(value)];
+                case 6: return [4, _b.sent()];
+                case 7:
+                    _b.sent();
+                    return [3, 2];
+                case 8: return [3, 10];
+                case 9:
+                    reader.releaseLock();
+                    return [7];
+                case 10: return [2];
+            }
+        });
     });
-    apiKey = stdout.trim();
-  } catch (ex) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] unable to read bazel remote cache key from vault, are you authenticated?');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] ${ex}`);
-    return;
-  }
-
-  const contents = dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-    # V1 - This file is automatically generated by 'yarn kbn bootstrap'
-    # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
-    build --bes_results_url=https://app.buildbuddy.io/invocation/
-    build --bes_backend=grpcs://cloud.buildbuddy.io
-    build --remote_cache=grpcs://cloud.buildbuddy.io
-    build --remote_timeout=3600
-    build --remote_header=${apiKey}
-  `;
-  Object(fs__WEBPACK_IMPORTED_MODULE_1__["writeFileSync"])(settingsPath, contents);
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] remote cache settings written to ${settingsPath}`);
 }
+function isReadableStreamLike(obj) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(obj === null || obj === void 0 ? void 0 : obj.getReader);
+}
+//# sourceMappingURL=isReadableStreamLike.js.map
 
 /***/ }),
-/* 556 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BuildCommand", function() { return BuildCommand; });
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(544);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isScheduler; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-const BuildCommand = {
-  description: 'Runs a build in the Bazel built packages',
-  name: 'build',
-  reportTiming: {
-    group: 'scripts/kbn build',
-    id: 'total'
-  },
+function isScheduler(value) {
+    return value && Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(value.schedule);
+}
+//# sourceMappingURL=isScheduler.js.map
 
-  async run(projects, projectGraph, {
-    options
-  }) {
-    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages
+/***/ }),
 
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runBazel"])(['build', '//packages:build', '--show_result=1'], runOffline);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/lift.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return hasLift; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return operate; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+
+function hasLift(source) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(source === null || source === void 0 ? void 0 : source.lift);
+}
+function operate(init) {
+    return function (source) {
+        if (hasLift(source)) {
+            return source.lift(function (liftedSource) {
+                try {
+                    return init(liftedSource, this);
+                }
+                catch (err) {
+                    this.error(err);
+                }
+            });
+        }
+        throw new TypeError('Unable to lift unknown Observable type');
+    };
+}
+//# sourceMappingURL=lift.js.map
 
 /***/ }),
-/* 557 */
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js":
 /***/ (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 dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(361);
-/* 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__(558);
-/* 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__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(544);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(352);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(341);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mapOneOrManyArgs; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
 
+var isArray = Array.isArray;
+function callOrApply(fn, args) {
+    return isArray(args) ? fn.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args))) : fn(args);
+}
+function mapOneOrManyArgs(fn) {
+    return Object(_operators_map__WEBPACK_IMPORTED_MODULE_1__[/* map */ "a"])(function (args) { return callOrApply(fn, args); });
+}
+//# sourceMappingURL=mapOneOrManyArgs.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/noop.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return noop; });
+function noop() { }
+//# sourceMappingURL=noop.js.map
 
-const CleanCommand = {
-  description: 'Deletes output directories and resets internal caches.',
-  name: 'clean',
-  reportTiming: {
-    group: 'scripts/kbn clean',
-    id: 'total'
-  },
+/***/ }),
 
-  async run(projects) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      This command is only necessary for the circumstance where you need to recover a consistent
-      state when problems arise. If you need to run this command often, please let us know by
-      filling out this form: https://ela.st/yarn-kbn-clean.
-      Please not it might not solve problems with node_modules. To solve problems around node_modules
-      you might need to run 'yarn kbn reset'.
-    `);
-    const toDelete = [];
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/not.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    for (const project of projects.values()) {
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(project.targetLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
-        });
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return not; });
+function not(pred, thisArg) {
+    return function (value, index) { return !pred.call(thisArg, value, index); };
+}
+//# sourceMappingURL=not.js.map
 
-      const {
-        extraPatterns
-      } = project.getCleanConfig();
+/***/ }),
 
-      if (extraPatterns) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: extraPatterns
-        });
-      }
-    } // Runs Bazel soft clean
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/pipe.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pipe; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return pipeFromArray; });
+/* harmony import */ var _identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["isBazelBinAvailable"])()) {
-      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean']);
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Soft cleaned bazel');
+function pipe() {
+    var fns = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        fns[_i] = arguments[_i];
+    }
+    return pipeFromArray(fns);
+}
+function pipeFromArray(fns) {
+    if (fns.length === 0) {
+        return _identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"];
+    }
+    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
 
-    if (toDelete.length === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Nothing to delete');
-    } else {
-      /**
-       * 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);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-          if (_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].wouldLogLevel('info')) {
-            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))));
-          }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return reportUnhandledError; });
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony import */ var _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js");
 
-          await promise;
+
+function reportUnhandledError(err) {
+    _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_1__[/* timeoutProvider */ "a"].setTimeout(function () {
+        var onUnhandledError = _config__WEBPACK_IMPORTED_MODULE_0__[/* config */ "a"].onUnhandledError;
+        if (onUnhandledError) {
+            onUnhandledError(err);
         }
-      } finally {
-        process.chdir(originalCwd);
-      }
-    }
-  }
+        else {
+            throw err;
+        }
+    });
+}
+//# sourceMappingURL=reportUnhandledError.js.map
 
-};
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createInvalidObservableTypeError; });
+function createInvalidObservableTypeError(input) {
+    return new TypeError("You provided " + (input !== null && typeof input === 'object' ? 'an invalid object' : "'" + input + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
+}
+//# sourceMappingURL=throwUnobservableError.js.map
 
 /***/ }),
-/* 558 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/operators/index.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/audit.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-const readline = __webpack_require__(559);
-const chalk = __webpack_require__(560);
-const cliCursor = __webpack_require__(563);
-const cliSpinners = __webpack_require__(565);
-const logSymbols = __webpack_require__(567);
-const stripAnsi = __webpack_require__(573);
-const wcwidth = __webpack_require__(575);
-const isInteractive = __webpack_require__(579);
-const MuteStream = __webpack_require__(580);
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/auditTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-const TEXT = Symbol('text');
-const PREFIX_TEXT = Symbol('prefixText');
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/buffer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-const ASCII_ETX_CODE = 0x03; // Ctrl+C emits this code
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-class StdinDiscarder {
-	constructor() {
-		this.requests = 0;
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["a"]; });
 
-		this.mutedStream = new MuteStream();
-		this.mutedStream.pipe(process.stdout);
-		this.mutedStream.mute();
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["a"]; });
 
-		const self = this;
-		this.ourEmit = function (event, data, ...args) {
-			const {stdin} = process;
-			if (self.requests > 0 || stdin.emit === self.ourEmit) {
-				if (event === 'keypress') { // Fixes readline behavior
-					return;
-				}
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["a"]; });
 
-				if (event === 'data' && data.includes(ASCII_ETX_CODE)) {
-					process.emit('SIGINT');
-				}
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/catchError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["a"]; });
 
-				Reflect.apply(self.oldEmit, this, [event, data, ...args]);
-			} else {
-				Reflect.apply(process.stdin.emit, this, [event, data, ...args]);
-			}
-		};
-	}
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["a"]; });
 
-	start() {
-		this.requests++;
+/* harmony import */ var _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_9__["a"]; });
 
-		if (this.requests === 1) {
-			this.realStart();
-		}
-	}
+/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatest.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_10__["a"]; });
 
-	stop() {
-		if (this.requests <= 0) {
-			throw new Error('`stop` called more times than `start`');
-		}
+/* harmony import */ var _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_11__["a"]; });
 
-		this.requests--;
+/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_12__["a"]; });
 
-		if (this.requests === 0) {
-			this.realStop();
-		}
-	}
+/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_13__["a"]; });
 
-	realStart() {
-		// No known way to make it work reliably on Windows
-		if (process.platform === 'win32') {
-			return;
-		}
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_14__["a"]; });
 
-		this.rl = readline.createInterface({
-			input: process.stdin,
-			output: this.mutedStream
-		});
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_15__["a"]; });
 
-		this.rl.on('SIGINT', () => {
-			if (process.listenerCount('SIGINT') === 0) {
-				process.emit('SIGINT');
-			} else {
-				this.rl.close();
-				process.kill(process.pid, 'SIGINT');
-			}
-		});
-	}
+/* harmony import */ var _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_16__["a"]; });
 
-	realStop() {
-		if (process.platform === 'win32') {
-			return;
-		}
+/* harmony import */ var _internal_operators_connect__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return _internal_operators_connect__WEBPACK_IMPORTED_MODULE_17__["a"]; });
 
-		this.rl.close();
-		this.rl = undefined;
-	}
-}
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/count.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_18__["a"]; });
 
-let stdinDiscarder;
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_19__["a"]; });
 
-class Ora {
-	constructor(options) {
-		if (!stdinDiscarder) {
-			stdinDiscarder = new StdinDiscarder();
-		}
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounceTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_20__["a"]; });
 
-		if (typeof options === 'string') {
-			options = {
-				text: options
-			};
-		}
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_21__["a"]; });
 
-		this.options = {
-			text: '',
-			color: 'cyan',
-			stream: process.stderr,
-			discardStdin: true,
-			...options
-		};
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_22__["a"]; });
 
-		this.spinner = this.options.spinner;
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_23__["a"]; });
 
-		this.color = this.options.color;
-		this.hideCursor = this.options.hideCursor !== false;
-		this.interval = this.options.interval || this.spinner.interval || 100;
-		this.stream = this.options.stream;
-		this.id = undefined;
-		this.isEnabled = typeof this.options.isEnabled === 'boolean' ? this.options.isEnabled : isInteractive({stream: this.stream});
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/dematerialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_24__["a"]; });
 
-		// Set *after* `this.stream`
-		this.text = this.options.text;
-		this.prefixText = this.options.prefixText;
-		this.linesToClear = 0;
-		this.indent = this.options.indent;
-		this.discardStdin = this.options.discardStdin;
-		this.isDiscardingStdin = false;
-	}
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinct.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_25__["a"]; });
 
-	get indent() {
-		return this._indent;
-	}
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_26__["a"]; });
 
-	set indent(indent = 0) {
-		if (!(indent >= 0 && Number.isInteger(indent))) {
-			throw new Error('The `indent` option must be an integer from 0 and up');
-		}
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilKeyChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_27__["a"]; });
 
-		this._indent = indent;
-	}
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/elementAt.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_28__["a"]; });
 
-	_updateInterval(interval) {
-		if (interval !== undefined) {
-			this.interval = interval;
-		}
-	}
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/endWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_29__["a"]; });
 
-	get spinner() {
-		return this._spinner;
-	}
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/every.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_30__["a"]; });
 
-	set spinner(spinner) {
-		this.frameIndex = 0;
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaust.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_31__["a"]; });
 
-		if (typeof spinner === 'object') {
-			if (spinner.frames === undefined) {
-				throw new Error('The given spinner must have a `frames` property');
-			}
+/* harmony import */ var _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_32__["a"]; });
 
-			this._spinner = spinner;
-		} else if (process.platform === 'win32') {
-			this._spinner = cliSpinners.line;
-		} else if (spinner === undefined) {
-			// Set default spinner
-			this._spinner = cliSpinners.dots;
-		} else if (cliSpinners[spinner]) {
-			this._spinner = cliSpinners[spinner];
-		} else {
-			throw new Error(`There is no built-in spinner named '${spinner}'. See https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json for a full list.`);
-		}
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_33__["a"]; });
 
-		this._updateInterval(this._spinner.interval);
-	}
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/expand.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_34__["a"]; });
 
-	get text() {
-		return this[TEXT];
-	}
+/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_35__["a"]; });
 
-	get prefixText() {
-		return this[PREFIX_TEXT];
-	}
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/finalize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_36__["a"]; });
 
-	get isSpinning() {
-		return this.id !== undefined;
-	}
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/find.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_37__["b"]; });
 
-	updateLineCount() {
-		const columns = this.stream.columns || 80;
-		const fullPrefixText = (typeof this[PREFIX_TEXT] === 'string') ? this[PREFIX_TEXT] + '-' : '';
-		this.lineCount = stripAnsi(fullPrefixText + '--' + this[TEXT]).split('\n').reduce((count, line) => {
-			return count + Math.max(1, Math.ceil(wcwidth(line) / columns));
-		}, 0);
-	}
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/findIndex.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_38__["a"]; });
 
-	set text(value) {
-		this[TEXT] = value;
-		this.updateLineCount();
-	}
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/first.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_39__["a"]; });
 
-	set prefixText(value) {
-		this[PREFIX_TEXT] = value;
-		this.updateLineCount();
-	}
+/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/groupBy.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_40__["a"]; });
 
-	frame() {
-		const {frames} = this.spinner;
-		let frame = frames[this.frameIndex];
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_41__["a"]; });
 
-		if (this.color) {
-			frame = chalk[this.color](frame);
-		}
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/isEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_42__["a"]; });
 
-		this.frameIndex = ++this.frameIndex % frames.length;
-		const fullPrefixText = (typeof this.prefixText === 'string' && this.prefixText !== '') ? this.prefixText + ' ' : '';
-		const fullText = typeof this.text === 'string' ? ' ' + this.text : '';
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/last.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_43__["a"]; });
 
-		return fullPrefixText + frame + fullText;
-	}
+/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_44__["a"]; });
 
-	clear() {
-		if (!this.isEnabled || !this.stream.isTTY) {
-			return this;
-		}
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_45__["a"]; });
 
-		for (let i = 0; i < this.linesToClear; i++) {
-			if (i > 0) {
-				this.stream.moveCursor(0, -1);
-			}
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/materialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_46__["a"]; });
 
-			this.stream.clearLine();
-			this.stream.cursorTo(this.indent);
-		}
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/max.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_47__["a"]; });
 
-		this.linesToClear = 0;
+/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/merge.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_48__["a"]; });
 
-		return this;
-	}
+/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_49__["a"]; });
 
-	render() {
-		this.clear();
-		this.stream.write(this.frame());
-		this.linesToClear = this.lineCount;
+/* harmony import */ var _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/flatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_50__["a"]; });
 
-		return this;
-	}
+/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_51__["a"]; });
 
-	start(text) {
-		if (text) {
-			this.text = text;
-		}
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_52__["a"]; });
 
-		if (!this.isEnabled) {
-			if (this.text) {
-				this.stream.write(`- ${this.text}\n`);
-			}
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_53__["a"]; });
 
-			return this;
-		}
+/* harmony import */ var _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_54__["a"]; });
 
-		if (this.isSpinning) {
-			return this;
-		}
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/min.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_55__["a"]; });
 
-		if (this.hideCursor) {
-			cliCursor.hide(this.stream);
-		}
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_56__["a"]; });
 
-		if (this.discardStdin && process.stdin.isTTY) {
-			this.isDiscardingStdin = true;
-			stdinDiscarder.start();
-		}
+/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_57__["a"]; });
 
-		this.render();
-		this.id = setInterval(this.render.bind(this), this.interval);
+/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/onErrorResumeNext.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_58__["a"]; });
 
-		return this;
-	}
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pairwise.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_59__["a"]; });
 
-	stop() {
-		if (!this.isEnabled) {
-			return this;
-		}
+/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/partition.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_60__["a"]; });
 
-		clearInterval(this.id);
-		this.id = undefined;
-		this.frameIndex = 0;
-		this.clear();
-		if (this.hideCursor) {
-			cliCursor.show(this.stream);
-		}
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pluck.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_61__["a"]; });
 
-		if (this.discardStdin && process.stdin.isTTY && this.isDiscardingStdin) {
-			stdinDiscarder.stop();
-			this.isDiscardingStdin = false;
-		}
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publish.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_62__["a"]; });
 
-		return this;
-	}
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishBehavior.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_63__["a"]; });
 
-	succeed(text) {
-		return this.stopAndPersist({symbol: logSymbols.success, text});
-	}
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_64__["a"]; });
 
-	fail(text) {
-		return this.stopAndPersist({symbol: logSymbols.error, text});
-	}
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_65__["a"]; });
 
-	warn(text) {
-		return this.stopAndPersist({symbol: logSymbols.warning, text});
-	}
+/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/race.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_66__["a"]; });
 
-	info(text) {
-		return this.stopAndPersist({symbol: logSymbols.info, text});
-	}
+/* harmony import */ var _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_67__["a"]; });
 
-	stopAndPersist(options = {}) {
-		const prefixText = options.prefixText || this.prefixText;
-		const fullPrefixText = (typeof prefixText === 'string' && prefixText !== '') ? prefixText + ' ' : '';
-		const text = options.text || this.text;
-		const fullText = (typeof text === 'string') ? ' ' + text : '';
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_68__["a"]; });
 
-		this.stop();
-		this.stream.write(`${fullPrefixText}${options.symbol || ' '}${fullText}\n`);
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_69__["a"]; });
 
-		return this;
-	}
-}
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeatWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_70__["a"]; });
 
-const oraFactory = function (options) {
-	return new Ora(options);
-};
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retry.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_71__["a"]; });
 
-module.exports = oraFactory;
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retryWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_72__["a"]; });
 
-module.exports.promise = (action, options) => {
-	// eslint-disable-next-line promise/prefer-await-to-then
-	if (typeof action.then !== 'function') {
-		throw new TypeError('Parameter `action` must be a Promise');
-	}
+/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_73__["a"]; });
 
-	const spinner = new Ora(options);
-	spinner.start();
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sample.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_74__["a"]; });
 
-	(async () => {
-		try {
-			await action;
-			spinner.succeed();
-		} catch (_) {
-			spinner.fail();
-		}
-	})();
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sampleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_75__["a"]; });
 
-	return spinner;
-};
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_76__["a"]; });
 
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sequenceEqual.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_77__["a"]; });
 
-/***/ }),
-/* 559 */
-/***/ (function(module, exports) {
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/share.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_78__["a"]; });
 
-module.exports = require("readline");
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/shareReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_79__["a"]; });
 
-/***/ }),
-/* 560 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/single.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_80__["a"]; });
 
-"use strict";
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_81__["a"]; });
 
-const ansiStyles = __webpack_require__(236);
-const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(242);
-const {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-} = __webpack_require__(561);
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_82__["a"]; });
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = [
-	'ansi',
-	'ansi',
-	'ansi256',
-	'ansi16m'
-];
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_83__["a"]; });
 
-const styles = Object.create(null);
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_84__["a"]; });
 
-const applyOptions = (object, options = {}) => {
-	if (options.level > 3 || options.level < 0) {
-		throw new Error('The `level` option should be an integer from 0 to 3');
-	}
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/startWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_85__["a"]; });
 
-	// Detect level if not set manually
-	const colorLevel = stdoutColor ? stdoutColor.level : 0;
-	object.level = options.level === undefined ? colorLevel : options.level;
-};
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_86__["a"]; });
 
-class ChalkClass {
-	constructor(options) {
-		return chalkFactory(options);
-	}
-}
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_87__["a"]; });
 
-const chalkFactory = options => {
-	const chalk = {};
-	applyOptions(chalk, options);
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_88__["a"]; });
 
-	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_89__["a"]; });
 
-	Object.setPrototypeOf(chalk, Chalk.prototype);
-	Object.setPrototypeOf(chalk.template, chalk);
+/* harmony import */ var _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_90__["a"]; });
 
-	chalk.template.constructor = () => {
-		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
-	};
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_91__["a"]; });
 
-	chalk.template.Instance = ChalkClass;
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_92__["a"]; });
 
-	return chalk.template;
-};
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_93__["a"]; });
 
-function Chalk(options) {
-	return chalkFactory(options);
-}
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_94__["a"]; });
 
-for (const [styleName, style] of Object.entries(ansiStyles)) {
-	styles[styleName] = {
-		get() {
-			const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty);
-			Object.defineProperty(this, styleName, {value: builder});
-			return builder;
-		}
-	};
-}
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/tap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_95__["a"]; });
 
-styles.visible = {
-	get() {
-		const builder = createBuilder(this, this._styler, true);
-		Object.defineProperty(this, 'visible', {value: builder});
-		return builder;
-	}
-};
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_96__["b"]; });
 
-const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_97__["a"]; });
 
-for (const model of usedModels) {
-	styles[model] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler);
-				return createBuilder(this, styler, this._isEmpty);
-			};
-		}
-	};
-}
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_98__["a"]; });
 
-for (const model of usedModels) {
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler);
-				return createBuilder(this, styler, this._isEmpty);
-			};
-		}
-	};
-}
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeInterval.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_99__["a"]; });
 
-const proto = Object.defineProperties(() => {}, {
-	...styles,
-	level: {
-		enumerable: true,
-		get() {
-			return this._generator.level;
-		},
-		set(level) {
-			this._generator.level = level;
-		}
-	}
-});
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_100__["b"]; });
 
-const createStyler = (open, close, parent) => {
-	let openAll;
-	let closeAll;
-	if (parent === undefined) {
-		openAll = open;
-		closeAll = close;
-	} else {
-		openAll = parent.openAll + open;
-		closeAll = close + parent.closeAll;
-	}
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeoutWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_101__["a"]; });
 
-	return {
-		open,
-		close,
-		openAll,
-		closeAll,
-		parent
-	};
-};
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timestamp.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_102__["a"]; });
 
-const createBuilder = (self, _styler, _isEmpty) => {
-	const builder = (...arguments_) => {
-		// Single argument is hot path, implicit coercion is faster than anything
-		// eslint-disable-next-line no-implicit-coercion
-		return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
-	};
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_103__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_103__["a"]; });
 
-	// `__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
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_104__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/window.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_104__["a"]; });
 
-	builder._generator = self;
-	builder._styler = _styler;
-	builder._isEmpty = _isEmpty;
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_105__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_105__["a"]; });
 
-	return builder;
-};
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_106__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_106__["a"]; });
 
-const applyStyle = (self, string) => {
-	if (self.level <= 0 || !string) {
-		return self._isEmpty ? '' : string;
-	}
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_107__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_107__["a"]; });
 
-	let styler = self._styler;
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_108__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_108__["a"]; });
 
-	if (styler === undefined) {
-		return string;
-	}
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_109__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_109__["a"]; });
 
-	const {openAll, closeAll} = styler;
-	if (string.indexOf('\u001B') !== -1) {
-		while (styler !== undefined) {
-			// 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'.
-			string = stringReplaceAll(string, styler.close, styler.open);
+/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_110__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_110__["a"]; });
 
-			styler = styler.parent;
-		}
-	}
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_111__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_111__["a"]; });
 
-	// We can move both next actions out of loop, because remaining actions in loop won't have
-	// any/visible effect on parts we add here. 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
-	const lfIndex = string.indexOf('\n');
-	if (lfIndex !== -1) {
-		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
-	}
+/* harmony import */ var _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_112__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_112__["a"]; });
 
-	return openAll + string + closeAll;
-};
 
-let template;
-const chalkTag = (chalk, ...strings) => {
-	const [firstString] = strings;
 
-	if (!Array.isArray(firstString)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return strings.join(' ');
-	}
 
-	const arguments_ = strings.slice(1);
-	const parts = [firstString.raw[0]];
 
-	for (let i = 1; i < firstString.length; i++) {
-		parts.push(
-			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
-			String(firstString.raw[i])
-		);
-	}
 
-	if (template === undefined) {
-		template = __webpack_require__(562);
-	}
 
-	return template(chalk, parts.join(''));
-};
 
-Object.defineProperties(Chalk.prototype, styles);
 
-const chalk = Chalk(); // eslint-disable-line new-cap
-chalk.supportsColor = stdoutColor;
-chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap
-chalk.stderr.supportsColor = stderrColor;
 
-// For TypeScript
-chalk.Level = {
-	None: 0,
-	Basic: 1,
-	Ansi256: 2,
-	TrueColor: 3,
-	0: 'None',
-	1: 'Basic',
-	2: 'Ansi256',
-	3: 'TrueColor'
-};
 
-module.exports = chalk;
 
 
-/***/ }),
-/* 561 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-const stringReplaceAll = (string, substring, replacer) => {
-	let index = string.indexOf(substring);
-	if (index === -1) {
-		return string;
-	}
 
-	const substringLength = substring.length;
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
-		endIndex = index + substringLength;
-		index = string.indexOf(substring, endIndex);
-	} while (index !== -1);
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
 
-const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => {
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		const gotCR = string[index - 1] === '\r';
-		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
-		endIndex = index + 1;
-		index = string.indexOf('\n', endIndex);
-	} while (index !== -1);
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
 
-module.exports = {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-};
 
 
-/***/ }),
-/* 562 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|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}|\{[a-f\d]{1,6}\})|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) {
-	const u = c[0] === 'u';
-	const bracket = c[1] === '{';
 
-	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
 
-	if (u && bracket) {
-		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
-	}
 
-	return ESCAPES.get(c) || c;
-}
 
-function parseArguments(name, arguments_) {
-	const results = [];
-	const chunks = arguments_.trim().split(/\s*,\s*/g);
-	let matches;
 
-	for (const chunk of chunks) {
-		const number = Number(chunk);
-		if (!Number.isNaN(number)) {
-			results.push(number);
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character));
-		} 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, styles] of Object.entries(enabled)) {
-		if (!Array.isArray(styles)) {
-			continue;
-		}
 
-		if (!(styleName in current)) {
-			throw new Error(`Unknown Chalk style: ${styleName}`);
-		}
 
-		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
-	}
 
-	return current;
-}
 
-module.exports = (chalk, temporary) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
 
-	// eslint-disable-next-line max-params
-	temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
-		if (escapeCharacter) {
-			chunk.push(unescape(escapeCharacter));
-		} else if (style) {
-			const string = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string));
-			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(character);
-		}
-	});
 
-	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('');
-};
 
 
-/***/ }),
-/* 563 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const restoreCursor = __webpack_require__(564);
 
-let isHidden = false;
 
-exports.show = (writableStream = process.stderr) => {
-	if (!writableStream.isTTY) {
-		return;
-	}
 
-	isHidden = false;
-	writableStream.write('\u001B[?25h');
-};
 
-exports.hide = (writableStream = process.stderr) => {
-	if (!writableStream.isTTY) {
-		return;
-	}
 
-	restoreCursor();
-	isHidden = true;
-	writableStream.write('\u001B[?25l');
-};
 
-exports.toggle = (force, writableStream) => {
-	if (force !== undefined) {
-		isHidden = force;
-	}
 
-	if (isHidden) {
-		exports.show(writableStream);
-	} else {
-		exports.hide(writableStream);
-	}
-};
 
 
-/***/ }),
-/* 564 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const onetime = __webpack_require__(273);
-const signalExit = __webpack_require__(282);
 
-module.exports = onetime(() => {
-	signalExit(() => {
-		process.stderr.write('\u001B[?25h');
-	}, {alwaysLast: true});
-});
 
 
-/***/ }),
-/* 565 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-const spinners = Object.assign({}, __webpack_require__(566));
 
-const spinnersList = Object.keys(spinners);
 
-Object.defineProperty(spinners, 'random', {
-	get() {
-		const randomIndex = Math.floor(Math.random() * spinnersList.length);
-		const spinnerName = spinnersList[randomIndex];
-		return spinners[spinnerName];
-	}
-});
 
-module.exports = spinners;
-// TODO: Remove this for the next major release
-module.exports.default = spinners;
 
 
-/***/ }),
-/* 566 */
-/***/ (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\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"dots8Bit\":{\"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\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"material\":{\"interval\":17,\"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\":[\"🌲\",\"🎄\"]},\"grenade\":{\"interval\":80,\"frames\":[\"،   \",\"′   \",\" ´ \",\" ‾ \",\"  ⸌\",\"  ⸊\",\"  |\",\"  ⁎\",\"  ⁕\",\" ෴ \",\"  ⁓\",\"   \",\"   \",\"   \"]},\"point\":{\"interval\":125,\"frames\":[\"∙∙∙\",\"●∙∙\",\"∙●∙\",\"∙∙●\",\"∙∙∙\"]},\"layer\":{\"interval\":150,\"frames\":[\"-\",\"=\",\"≡\"]},\"betaWave\":{\"interval\":80,\"frames\":[\"ρββββββ\",\"βρβββββ\",\"ββρββββ\",\"βββρβββ\",\"ββββρββ\",\"βββββρβ\",\"ββββββρ\"]},\"aesthetic\":{\"interval\":80,\"frames\":[\"▰▱▱▱▱▱▱\",\"▰▰▱▱▱▱▱\",\"▰▰▰▱▱▱▱\",\"▰▰▰▰▱▱▱\",\"▰▰▰▰▰▱▱\",\"▰▰▰▰▰▰▱\",\"▰▰▰▰▰▰▰\",\"▰▱▱▱▱▱▱\"]}}");
 
-/***/ }),
-/* 567 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const chalk = __webpack_require__(568);
 
-const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
-const main = {
-	info: chalk.blue('ℹ'),
-	success: chalk.green('✔'),
-	warning: chalk.yellow('⚠'),
-	error: chalk.red('✖')
-};
 
-const fallbacks = {
-	info: chalk.blue('i'),
-	success: chalk.green('√'),
-	warning: chalk.yellow('‼'),
-	error: chalk.red('×')
-};
 
-module.exports = isSupported ? main : fallbacks;
 
 
-/***/ }),
-/* 568 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const escapeStringRegexp = __webpack_require__(478);
-const ansiStyles = __webpack_require__(569);
-const stdoutColor = __webpack_require__(570).stdout;
 
-const template = __webpack_require__(572);
 
-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;
-		}
-	});
+//# sourceMappingURL=index.js.map
 
-	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';
+/***/ "../../node_modules/rxjs/node_modules/tslib/tslib.es6.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return __extends; });
+/* unused harmony export __assign */
+/* unused harmony export __rest */
+/* unused harmony export __decorate */
+/* unused harmony export __param */
+/* unused harmony export __metadata */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return __awaiter; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return __generator; });
+/* unused harmony export __createBinding */
+/* unused harmony export __exportStar */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return __values; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return __read; });
+/* unused harmony export __spread */
+/* unused harmony export __spreadArrays */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return __spreadArray; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return __await; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __asyncGenerator; });
+/* unused harmony export __asyncDelegator */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return __asyncValues; });
+/* unused harmony export __makeTemplateObject */
+/* unused harmony export __importStar */
+/* unused harmony export __importDefault */
+/* unused harmony export __classPrivateFieldGet */
+/* unused harmony export __classPrivateFieldSet */
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* 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 (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    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 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                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) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    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) : adopt(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 };
+    }
+}
+
+var __createBinding = Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+});
+
+function __exportStar(m, o) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
+}
+
+function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+
+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;
+}
+
+/** @deprecated */
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
+/** @deprecated */
+function __spreadArrays() {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+}
+
+function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+}
+
+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;
+};
+
+var __setModuleDefault = Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+};
+
+function __importStar(mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+}
+
+function __importDefault(mod) {
+    return (mod && mod.__esModule) ? mod : { default: mod };
+}
+
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+}
 
-	// `__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]);
+/***/ "../../node_modules/shebang-command/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (argsLen === 0) {
-		return '';
-	}
+"use strict";
 
-	if (argsLen > 1) {
-		// Don't slice `arguments`, it prevents V8 optimizations
-		for (let a = 1; a < argsLen; a++) {
-			str += ' ' + args[a];
-		}
-	}
+const shebangRegex = __webpack_require__("../../node_modules/shebang-regex/index.js");
 
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
-	}
+module.exports = (string = '') => {
+	const match = string.match(shebangRegex);
 
-	// 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 = '';
+	if (!match) {
+		return null;
 	}
 
-	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;
+	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
+	const binary = path.split('/').pop();
 
-		// 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}`);
+	if (binary === 'env') {
+		return argument;
 	}
 
-	// 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(' ');
-	}
+	return argument ? `${binary} ${argument}` : binary;
+};
 
-	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(''));
-}
+/***/ "../../node_modules/shebang-regex/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-Object.defineProperties(Chalk.prototype, styles);
+"use strict";
 
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
+module.exports = /^#!(.*)/;
 
 
 /***/ }),
-/* 569 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(480);
+/***/ "../../node_modules/signal-exit/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
+// 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.
+// grab a reference to node's real process object right away
+var process = global.process
 
-const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+const processOk = function (process) {
+  return process &&
+    typeof process === 'object' &&
+    typeof process.removeListener === 'function' &&
+    typeof process.emit === 'function' &&
+    typeof process.reallyExit === 'function' &&
+    typeof process.listeners === 'function' &&
+    typeof process.kill === 'function' &&
+    typeof process.pid === 'number' &&
+    typeof process.on === 'function'
+}
 
-const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
+// some kind of non-node environment, just no-op
+/* istanbul ignore if */
+if (!processOk(process)) {
+  module.exports = function () {
+    return function () {}
+  }
+} else {
+  var assert = __webpack_require__("assert")
+  var signals = __webpack_require__("../../node_modules/signal-exit/signals.js")
+  var isWin = /^win/i.test(process.platform)
 
-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],
+  var EE = __webpack_require__("events")
+  /* istanbul ignore if */
+  if (typeof EE !== 'function') {
+    EE = EE.EventEmitter
+  }
 
-			// 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],
+  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 = {}
+  }
 
-			// 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]
-		}
-	};
+  // 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
+  }
 
-	// Fix humans
-	styles.color.grey = styles.color.gray;
+  module.exports = function (cb, opts) {
+    /* istanbul ignore if */
+    if (!processOk(global.process)) {
+      return function () {}
+    }
+    assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
 
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
+    if (loaded === false) {
+      load()
+    }
 
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
+    var ev = 'exit'
+    if (opts && opts.alwaysLast) {
+      ev = 'afterexit'
+    }
 
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+    var remove = function () {
+      emitter.removeListener(ev, cb)
+      if (emitter.listeners('exit').length === 0 &&
+          emitter.listeners('afterexit').length === 0) {
+        unload()
+      }
+    }
+    emitter.on(ev, cb)
 
-			group[styleName] = styles[styleName];
+    return remove
+  }
 
-			codes.set(style[0], style[1]);
-		}
+  var unload = function unload () {
+    if (!loaded || !processOk(global.process)) {
+      return
+    }
+    loaded = false
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
+    signals.forEach(function (sig) {
+      try {
+        process.removeListener(sig, sigListeners[sig])
+      } catch (er) {}
+    })
+    process.emit = originalProcessEmit
+    process.reallyExit = originalProcessReallyExit
+    emitter.count -= 1
+  }
+  module.exports.unload = unload
 
-		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';
+  var emit = function emit (event, code, signal) {
+    /* istanbul ignore if */
+    if (emitter.emitted[event]) {
+      return
+    }
+    emitter.emitted[event] = true
+    emitter.emit(event, code, signal)
+  }
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
+  // { <signal>: <listener fn>, ... }
+  var sigListeners = {}
+  signals.forEach(function (sig) {
+    sigListeners[sig] = function listener () {
+      /* istanbul ignore if */
+      if (!processOk(global.process)) {
+        return
+      }
+      // 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 */
+        if (isWin && sig === 'SIGHUP') {
+          // "SIGHUP" throws an `ENOSYS` error on Windows,
+          // so use a supported signal instead
+          sig = 'SIGINT'
+        }
+        /* istanbul ignore next */
+        process.kill(process.pid, sig)
+      }
+    }
+  })
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+  module.exports.signals = function () {
+    return signals
+  }
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
+  var loaded = false
 
-		const suite = colorConvert[key];
+  var load = function load () {
+    if (loaded || !processOk(global.process)) {
+      return
+    }
+    loaded = true
 
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
+    // 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
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+    signals = signals.filter(function (sig) {
+      try {
+        process.on(sig, sigListeners[sig])
+        return true
+      } catch (er) {
+        return false
+      }
+    })
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+    process.emit = processEmit
+    process.reallyExit = processReallyExit
+  }
+  module.exports.load = load
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
+  var originalProcessReallyExit = process.reallyExit
+  var processReallyExit = function processReallyExit (code) {
+    /* istanbul ignore if */
+    if (!processOk(global.process)) {
+      return
+    }
+    process.exitCode = code || /* istanbul ignore next */ 0
+    emit('exit', process.exitCode, null)
+    /* istanbul ignore next */
+    emit('afterexit', process.exitCode, null)
+    /* istanbul ignore next */
+    originalProcessReallyExit.call(process, process.exitCode)
+  }
 
-	return styles;
+  var originalProcessEmit = process.emit
+  var processEmit = function processEmit (ev, arg) {
+    if (ev === 'exit' && processOk(global.process)) {
+      /* istanbul ignore else */
+      if (arg !== undefined) {
+        process.exitCode = arg
+      }
+      var ret = originalProcessEmit.apply(this, arguments)
+      /* istanbul ignore next */
+      emit('exit', process.exitCode, null)
+      /* istanbul ignore next */
+      emit('afterexit', process.exitCode, null)
+      /* istanbul ignore next */
+      return ret
+    } else {
+      return originalProcessEmit.apply(this, arguments)
+    }
+  }
 }
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
-
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(237)(module)))
 
 /***/ }),
-/* 570 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const os = __webpack_require__(243);
-const hasFlag = __webpack_require__(571);
+/***/ "../../node_modules/signal-exit/signals.js":
+/***/ (function(module, exports) {
 
-const env = process.env;
+// 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'
+]
 
-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;
+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'
+  )
 }
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
-
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
+if (process.platform === 'linux') {
+  module.exports.push(
+    'SIGIO',
+    'SIGPOLL',
+    'SIGPWR',
+    'SIGSTKFLT',
+    'SIGUNUSED'
+  )
 }
 
-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) {
-		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;
-	}
+/***/ "../../node_modules/slash/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+"use strict";
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
+module.exports = path => {
+	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
 
-	if (env.TERM === 'dumb') {
-		return min;
+	if (isExtendedLengthPath || hasNonAscii) {
+		return path;
 	}
 
-	return min;
-}
-
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
-}
-
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
+	return path.replace(/\\/g, '/');
 };
 
 
 /***/ }),
-/* 571 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = (flag, argv) => {
-	argv = argv || process.argv;
-	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-	const pos = argv.indexOf(prefix + flag);
-	const terminatorPos = argv.indexOf('--');
-	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-};
 
-
-/***/ }),
-/* 572 */
+/***/ "../../node_modules/sort-keys/index.js":
 /***/ (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']
-]);
+const isPlainObj = __webpack_require__("../../node_modules/sort-keys/node_modules/is-plain-obj/index.js");
 
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
+module.exports = (obj, opts) => {
+	if (!isPlainObj(obj)) {
+		throw new TypeError('Expected a plain object');
 	}
 
-	return ESCAPES.get(c) || c;
-}
-
-function parseArguments(name, args) {
-	const results = [];
-	const chunks = args.trim().split(/\s*,\s*/g);
-	let matches;
+	opts = opts || {};
 
-	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}')`);
-		}
+	// DEPRECATED
+	if (typeof opts === 'function') {
+		throw new TypeError('Specify the compare function as an option instead');
 	}
 
-	return results;
-}
-
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
-
-	const results = [];
-	let matches;
+	const deep = opts.deep;
+	const seenInput = [];
+	const seenOutput = [];
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+	const sortKeys = x => {
+		const seenIndex = seenInput.indexOf(x);
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
+		if (seenIndex !== -1) {
+			return seenOutput[seenIndex];
 		}
-	}
-
-	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);
-		}
-	}
+		const ret = {};
+		const keys = Object.keys(x).sort(opts.compare);
 
-	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}`);
-			}
+		seenInput.push(x);
+		seenOutput.push(ret);
 
-			if (enabled[styleName].length > 0) {
-				current = current[styleName].apply(current, enabled[styleName]);
-			} else {
-				current = current[styleName];
-			}
-		}
-	}
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i];
+			const val = x[key];
 
-	return current;
-}
+			if (deep && Array.isArray(val)) {
+				const retArr = [];
 
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+				for (let j = 0; j < val.length; j++) {
+					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
+				}
 
-	// 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');
+				ret[key] = retArr;
+				continue;
 			}
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(chr);
+			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
 		}
-	});
 
-	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 ret;
+	};
 
-	return chunks.join('');
+	return sortKeys(obj);
 };
 
 
 /***/ }),
-/* 573 */
+
+/***/ "../../node_modules/sort-keys/node_modules/is-plain-obj/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(574);
+var toString = Object.prototype.toString;
 
-module.exports = string => typeof string === 'string' ? string.replace(ansiRegex(), '') : string;
+module.exports = function (x) {
+	var prototype;
+	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
+};
 
 
 /***/ }),
-/* 574 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/sort-object-keys/index.js":
+/***/ (function(module, exports) {
 
+module.exports = function sortObjectByKeyNameList(object, sortWith) {
+  var keys;
+  var sortFn;
 
-module.exports = ({onlyFirst = false} = {}) => {
-	const pattern = [
-		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
-	].join('|');
+  if (typeof sortWith === 'function') {
+    sortFn = sortWith;
+  } else {
+    keys = sortWith;
+  }
 
-	return new RegExp(pattern, onlyFirst ? undefined : 'g');
-};
+  var objectKeys = Object.keys(object);
+  return (keys || []).concat(objectKeys.sort(sortFn)).reduce(function(total, key) {
+    if (objectKeys.indexOf(key) !== -1) {
+      total[key] = object[key];
+    }
+    return total;
+  }, Object.create(null));
+}
 
 
 /***/ }),
-/* 575 */
+
+/***/ "../../node_modules/sort-package-json/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+const sortObjectKeys = __webpack_require__("../../node_modules/sort-object-keys/index.js")
+const detectIndent = __webpack_require__("../../node_modules/detect-indent/index.js")
+const detectNewline = __webpack_require__("../../node_modules/detect-newline/index.js").graceful
+const gitHooks = __webpack_require__("../../node_modules/git-hooks-list/index.json")
+const isPlainObject = __webpack_require__("../../node_modules/is-plain-obj/index.js")
 
-var defaults = __webpack_require__(576)
-var combining = __webpack_require__(578)
+const hasOwnProperty = (object, property) =>
+  Object.prototype.hasOwnProperty.call(object, property)
+const pipe = (fns) => (x, ...args) =>
+  fns.reduce((result, fn) => fn(result, ...args), x)
+const onArray = (fn) => (x) => (Array.isArray(x) ? fn(x) : x)
+const onStringArray = (fn) => (x) =>
+  Array.isArray(x) && x.every((item) => typeof item === 'string') ? fn(x) : x
+const uniq = onStringArray((xs) => xs.filter((x, i) => i === xs.indexOf(x)))
+const sortArray = onStringArray((array) => [...array].sort())
+const uniqAndSortArray = pipe([uniq, sortArray])
+const onObject = (fn) => (x, ...args) => (isPlainObject(x) ? fn(x, ...args) : x)
+const sortObjectBy = (comparator, deep) => {
+  const over = onObject((object) => {
+    object = sortObjectKeys(object, comparator)
+    if (deep) {
+      for (const [key, value] of Object.entries(object)) {
+        object[key] = over(value)
+      }
+    }
+    return object
+  })
 
-var DEFAULTS = {
-  nul: 0,
-  control: 0
+  return over
 }
+const sortObject = sortObjectBy()
+const sortURLObject = sortObjectBy(['type', 'url'])
+const sortPeopleObject = sortObjectBy(['name', 'email', 'url'])
+const sortDirectories = sortObjectBy([
+  'lib',
+  'bin',
+  'man',
+  'doc',
+  'example',
+  'test',
+])
+const overProperty = (property, over) => (object, ...args) =>
+  hasOwnProperty(object, property)
+    ? Object.assign(object, { [property]: over(object[property], ...args) })
+    : object
+const sortGitHooks = sortObjectBy(gitHooks)
 
-module.exports = function wcwidth(str) {
-  return wcswidth(str, DEFAULTS)
-}
+// https://github.com/eslint/eslint/blob/acc0e47572a9390292b4e313b4a4bf360d236358/conf/config-schema.js
+const eslintBaseConfigProperties = [
+  // `files` and `excludedFiles` are only on `overrides[]`
+  // for easier sort `overrides[]`,
+  // add them to here, so we don't need sort `overrides[]` twice
+  'files',
+  'excludedFiles',
+  // baseConfig
+  'env',
+  'parser',
+  'parserOptions',
+  'settings',
+  'plugins',
+  'extends',
+  'rules',
+  'overrides',
+  'globals',
+  'processor',
+  'noInlineConfig',
+  'reportUnusedDisableDirectives',
+]
+const sortEslintConfig = onObject(
+  pipe([
+    sortObjectBy(eslintBaseConfigProperties),
+    overProperty('env', sortObject),
+    overProperty('globals', sortObject),
+    overProperty(
+      'overrides',
+      onArray((overrides) => overrides.map(sortEslintConfig)),
+    ),
+    overProperty('parserOptions', sortObject),
+    overProperty(
+      'rules',
+      sortObjectBy(
+        (rule1, rule2) =>
+          rule1.split('/').length - rule2.split('/').length ||
+          rule1.localeCompare(rule2),
+      ),
+    ),
+    overProperty('settings', sortObject),
+  ]),
+)
+const sortVSCodeBadgeObject = sortObjectBy(['description', 'url', 'href'])
 
-module.exports.config = function(opts) {
-  opts = defaults(opts || {}, DEFAULTS)
-  return function wcwidth(str) {
-    return wcswidth(str, opts)
-  }
+const sortPrettierConfig = onObject(
+  pipe([
+    // sort keys alphabetically, but put `overrides` at bottom
+    (config) =>
+      sortObjectKeys(config, [
+        ...Object.keys(config)
+          .filter((key) => key !== 'overrides')
+          .sort(),
+        'overrides',
+      ]),
+    // if `config.overrides` exists
+    overProperty(
+      'overrides',
+      // and `config.overrides` is an array
+      onArray((overrides) =>
+        overrides.map(
+          pipe([
+            // sort `config.overrides[]` alphabetically
+            sortObject,
+            // sort `config.overrides[].options` alphabetically
+            overProperty('options', sortObject),
+          ]),
+        ),
+      ),
+    ),
+  ]),
+)
+
+// See https://docs.npmjs.com/misc/scripts
+const defaultNpmScripts = new Set([
+  'install',
+  'pack',
+  'prepare',
+  'publish',
+  'restart',
+  'shrinkwrap',
+  'start',
+  'stop',
+  'test',
+  'uninstall',
+  'version',
+])
+
+const hasDevDependency = (dependency, packageJson) => {
+  return (
+    'devDependencies' in packageJson &&
+    !!packageJson.devDependencies[dependency]
+  )
 }
 
-/*
- *  The following functions define the column width of an ISO 10646
- *  character as follows:
- *  - The null character (U+0000) has a column width of 0.
- *  - Other C0/C1 control characters and DEL will lead to a return value
- *    of -1.
- *  - Non-spacing and enclosing combining characters (general category
- *    code Mn or Me in the
- *    Unicode database) have a column width of 0.
- *  - SOFT HYPHEN (U+00AD) has a column width of 1.
- *  - Other format characters (general category code Cf in the Unicode
- *    database) and ZERO WIDTH
- *    SPACE (U+200B) have a column width of 0.
- *  - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
- *    have a column width of 0.
- *  - Spacing characters in the East Asian Wide (W) or East Asian
- *    Full-width (F) category as
- *    defined in Unicode Technical Report #11 have a column width of 2.
- *  - All remaining characters (including all printable ISO 8859-1 and
- *    WGL4 characters, Unicode control characters, etc.) have a column
- *    width of 1.
- *  This implementation assumes that characters are encoded in ISO 10646.
-*/
+const sortScripts = onObject((scripts, packageJson) => {
+  const names = Object.keys(scripts)
+  const prefixable = new Set()
 
-function wcswidth(str, opts) {
-  if (typeof str !== 'string') return wcwidth(str, opts)
+  const keys = names.map((name) => {
+    const omitted = name.replace(/^(?:pre|post)/, '')
+    if (defaultNpmScripts.has(omitted) || names.includes(omitted)) {
+      prefixable.add(omitted)
+      return omitted
+    }
+    return name
+  })
 
-  var s = 0
-  for (var i = 0; i < str.length; i++) {
-    var n = wcwidth(str.charCodeAt(i), opts)
-    if (n < 0) return -1
-    s += n
+  if (!hasDevDependency('npm-run-all', packageJson)) {
+    keys.sort()
   }
 
-  return s
-}
+  const order = keys.reduce(
+    (order, key) =>
+      order.concat(
+        prefixable.has(key) ? [`pre${key}`, key, `post${key}`] : [key],
+      ),
+    [],
+  )
 
-function wcwidth(ucs, opts) {
-  // test for 8-bit control characters
-  if (ucs === 0) return opts.nul
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return opts.control
+  return sortObjectKeys(scripts, order)
+})
 
-  // binary search in table of non-spacing characters
-  if (bisearch(ucs)) return 0
+// fields marked `vscode` are for `Visual Studio Code extension manifest` only
+// https://code.visualstudio.com/api/references/extension-manifest
+// Supported fields:
+// publisher, displayName, categories, galleryBanner, preview, contributes,
+// activationEvents, badges, markdown, qna, extensionPack,
+// extensionDependencies, icon
 
-  // if we arrive here, ucs is not a combining or C0/C1 control character
-  return 1 +
-      (ucs >= 0x1100 &&
-       (ucs <= 0x115f ||                       // Hangul Jamo init. consonants
-        ucs == 0x2329 || ucs == 0x232a ||
-        (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-         ucs != 0x303f) ||                     // CJK ... Yi
-        (ucs >= 0xac00 && ucs <= 0xd7a3) ||    // Hangul Syllables
-        (ucs >= 0xf900 && ucs <= 0xfaff) ||    // CJK Compatibility Ideographs
-        (ucs >= 0xfe10 && ucs <= 0xfe19) ||    // Vertical forms
-        (ucs >= 0xfe30 && ucs <= 0xfe6f) ||    // CJK Compatibility Forms
-        (ucs >= 0xff00 && ucs <= 0xff60) ||    // Fullwidth Forms
-        (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-        (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-        (ucs >= 0x30000 && ucs <= 0x3fffd)));
-}
+// field.key{string}: field name
+// field.over{function}: sort field subKey
+const fields = [
+  { key: '$schema' },
+  { key: 'name' },
+  /* vscode */ { key: 'displayName' },
+  { key: 'version' },
+  { key: 'private' },
+  { key: 'description' },
+  /* vscode */ { key: 'categories', over: uniq },
+  { key: 'keywords', over: uniq },
+  { key: 'homepage' },
+  { key: 'bugs', over: sortObjectBy(['url', 'email']) },
+  { key: 'repository', over: sortURLObject },
+  { key: 'funding', over: sortURLObject },
+  { key: 'license', over: sortURLObject },
+  /* vscode */ { key: 'qna' },
+  { key: 'author', over: sortPeopleObject },
+  {
+    key: 'maintainers',
+    over: onArray((maintainers) => maintainers.map(sortPeopleObject)),
+  },
+  {
+    key: 'contributors',
+    over: onArray((contributors) => contributors.map(sortPeopleObject)),
+  },
+  /* vscode */ { key: 'publisher' },
+  { key: 'sideEffects' },
+  { key: 'type' },
+  { key: 'imports' },
+  { key: 'exports' },
+  { key: 'main' },
+  { key: 'umd:main' },
+  { key: 'jsdelivr' },
+  { key: 'unpkg' },
+  { key: 'module' },
+  { key: 'source' },
+  { key: 'jsnext:main' },
+  { key: 'browser' },
+  { key: 'types' },
+  { key: 'typesVersions' },
+  { key: 'typings' },
+  { key: 'style' },
+  { key: 'example' },
+  { key: 'examplestyle' },
+  { key: 'assets' },
+  { key: 'bin', over: sortObject },
+  { key: 'man' },
+  { key: 'directories', over: sortDirectories },
+  { key: 'files', over: uniq },
+  { key: 'workspaces' },
+  // node-pre-gyp https://www.npmjs.com/package/node-pre-gyp#1-add-new-entries-to-your-packagejson
+  {
+    key: 'binary',
+    over: sortObjectBy([
+      'module_name',
+      'module_path',
+      'remote_path',
+      'package_name',
+      'host',
+    ]),
+  },
+  { key: 'scripts', over: sortScripts },
+  { key: 'betterScripts', over: sortScripts },
+  /* vscode */ { key: 'contributes', over: sortObject },
+  /* vscode */ { key: 'activationEvents', over: uniq },
+  { key: 'husky', over: overProperty('hooks', sortGitHooks) },
+  { key: 'simple-git-hooks', over: sortGitHooks },
+  { key: 'pre-commit' },
+  { key: 'commitlint', over: sortObject },
+  { key: 'lint-staged' },
+  { key: 'config', over: sortObject },
+  { key: 'nodemonConfig', over: sortObject },
+  { key: 'browserify', over: sortObject },
+  { key: 'babel', over: sortObject },
+  { key: 'browserslist' },
+  { key: 'xo', over: sortObject },
+  { key: 'prettier', over: sortPrettierConfig },
+  { key: 'eslintConfig', over: sortEslintConfig },
+  { key: 'eslintIgnore' },
+  { key: 'npmpkgjsonlint', over: sortObject },
+  { key: 'npmPackageJsonLintConfig', over: sortObject },
+  { key: 'npmpackagejsonlint', over: sortObject },
+  { key: 'release', over: sortObject },
+  { key: 'remarkConfig', over: sortObject },
+  { key: 'stylelint' },
+  { key: 'ava', over: sortObject },
+  { key: 'jest', over: sortObject },
+  { key: 'mocha', over: sortObject },
+  { key: 'nyc', over: sortObject },
+  { key: 'c8', over: sortObject },
+  { key: 'tap', over: sortObject },
+  { key: 'resolutions', over: sortObject },
+  { key: 'dependencies', over: sortObject },
+  { key: 'devDependencies', over: sortObject },
+  { key: 'dependenciesMeta', over: sortObjectBy(undefined, true) },
+  { key: 'peerDependencies', over: sortObject },
+  // TODO: only sort depth = 2
+  { key: 'peerDependenciesMeta', over: sortObjectBy(undefined, true) },
+  { key: 'optionalDependencies', over: sortObject },
+  { key: 'bundledDependencies', over: uniqAndSortArray },
+  { key: 'bundleDependencies', over: uniqAndSortArray },
+  /* vscode */ { key: 'extensionPack', over: uniqAndSortArray },
+  /* vscode */ { key: 'extensionDependencies', over: uniqAndSortArray },
+  { key: 'flat' },
+  { key: 'engines', over: sortObject },
+  { key: 'engineStrict', over: sortObject },
+  { key: 'languageName' },
+  { key: 'os' },
+  { key: 'cpu' },
+  { key: 'preferGlobal', over: sortObject },
+  { key: 'publishConfig', over: sortObject },
+  /* vscode */ { key: 'icon' },
+  /* vscode */ {
+    key: 'badges',
+    over: onArray((badge) => badge.map(sortVSCodeBadgeObject)),
+  },
+  /* vscode */ { key: 'galleryBanner', over: sortObject },
+  /* vscode */ { key: 'preview' },
+  /* vscode */ { key: 'markdown' },
+]
 
-function bisearch(ucs) {
-  var min = 0
-  var max = combining.length - 1
-  var mid
+const defaultSortOrder = fields.map(({ key }) => key)
+const overFields = pipe(
+  fields.reduce((fns, { key, over }) => {
+    if (over) {
+      fns.push(overProperty(key, over))
+    }
+    return fns
+  }, []),
+)
 
-  if (ucs < combining[0][0] || ucs > combining[max][1]) return false
+function editStringJSON(json, over) {
+  if (typeof json === 'string') {
+    const { indent } = detectIndent(json)
+    const endCharacters = json.slice(-1) === '\n' ? '\n' : ''
+    const newline = detectNewline(json)
+    json = JSON.parse(json)
 
-  while (max >= min) {
-    mid = Math.floor((min + max) / 2)
-    if (ucs > combining[mid][1]) min = mid + 1
-    else if (ucs < combining[mid][0]) max = mid - 1
-    else return true
+    let result = JSON.stringify(over(json), null, indent) + endCharacters
+    if (newline === '\r\n') {
+      result = result.replace(/\n/g, newline)
+    }
+    return result
   }
 
-  return false
+  return over(json)
 }
 
+const isPrivateKey = (key) => key[0] === '_'
+const partition = (array, predicate) =>
+  array.reduce(
+    (result, value) => {
+      result[predicate(value) ? 0 : 1].push(value)
+      return result
+    },
+    [[], []],
+  )
+function sortPackageJson(jsonIsh, options = {}) {
+  return editStringJSON(
+    jsonIsh,
+    onObject((json) => {
+      let sortOrder = options.sortOrder ? options.sortOrder : defaultSortOrder
 
-/***/ }),
-/* 576 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var clone = __webpack_require__(577);
+      if (Array.isArray(sortOrder)) {
+        const keys = Object.keys(json)
+        const [privateKeys, publicKeys] = partition(keys, isPrivateKey)
+        sortOrder = [
+          ...sortOrder,
+          ...defaultSortOrder,
+          ...publicKeys.sort(),
+          ...privateKeys.sort(),
+        ]
+      }
 
-module.exports = function(options, defaults) {
-  options = options || {};
+      return overFields(sortObjectKeys(json, sortOrder), json)
+    }),
+  )
+}
 
-  Object.keys(defaults).forEach(function(key) {
-    if (typeof options[key] === 'undefined') {
-      options[key] = clone(defaults[key]);
-    }
-  });
+module.exports = sortPackageJson
+module.exports.sortPackageJson = sortPackageJson
+module.exports.sortOrder = defaultSortOrder
+module.exports.default = sortPackageJson
 
-  return options;
-};
 
 /***/ }),
-/* 577 */
+
+/***/ "../../node_modules/spdx-expression-parse/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var clone = (function() {
-'use strict';
+var parser = __webpack_require__("../../node_modules/spdx-expression-parse/parser.js").parser
 
-/**
- * Clones (copies) an Object using deep copying.
- *
- * This function supports circular references by default, but if you are certain
- * there are no circular references in your object, you can save some CPU time
- * by calling clone(obj, false).
- *
- * Caution: if `circular` is false and `parent` contains circular references,
- * your program may enter an infinite loop and crash.
- *
- * @param `parent` - the object to be cloned
- * @param `circular` - set to true if the object to be cloned may contain
- *    circular references. (optional - true by default)
- * @param `depth` - set to a number if the object is only to be cloned to
- *    a particular depth. (optional - defaults to Infinity)
- * @param `prototype` - sets the prototype to be used when cloning an object.
- *    (optional - defaults to parent prototype).
-*/
-function clone(parent, circular, depth, prototype) {
-  var filter;
-  if (typeof circular === 'object') {
-    depth = circular.depth;
-    prototype = circular.prototype;
-    filter = circular.filter;
-    circular = circular.circular
-  }
-  // maintain two arrays for circular references, where corresponding parents
-  // and children have the same index
-  var allParents = [];
-  var allChildren = [];
+module.exports = function (argument) {
+  return parser.parse(argument)
+}
 
-  var useBuffer = typeof Buffer != 'undefined';
 
-  if (typeof circular == 'undefined')
-    circular = true;
+/***/ }),
 
-  if (typeof depth == 'undefined')
-    depth = Infinity;
+/***/ "../../node_modules/spdx-expression-parse/parser.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // recurse this function so we don't reset allParents and allChildren
-  function _clone(parent, depth) {
-    // cloning null always returns null
-    if (parent === null)
-      return null;
+/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
+/*
+  Returns a Parser object of the following structure:
 
-    if (depth == 0)
-      return parent;
+  Parser: {
+    yy: {}
+  }
 
-    var child;
-    var proto;
-    if (typeof parent != 'object') {
-      return parent;
-    }
+  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),
 
-    if (clone.__isArray(parent)) {
-      child = [];
-    } else if (clone.__isRegExp(parent)) {
-      child = new RegExp(parent.source, __getRegExpFlags(parent));
-      if (parent.lastIndex) child.lastIndex = parent.lastIndex;
-    } else if (clone.__isDate(parent)) {
-      child = new Date(parent.getTime());
-    } else if (useBuffer && Buffer.isBuffer(parent)) {
-      if (Buffer.allocUnsafe) {
-        // Node.js >= 4.5.0
-        child = Buffer.allocUnsafe(parent.length);
-      } else {
-        // Older Node.js versions
-        child = new Buffer(parent.length);
-      }
-      parent.copy(child);
-      return child;
-    } else {
-      if (typeof prototype == 'undefined') {
-        proto = Object.getPrototypeOf(parent);
-        child = Object.create(proto);
-      }
-      else {
-        child = Object.create(prototype);
-        proto = prototype;
-      }
-    }
+    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),
 
-    if (circular) {
-      var index = allParents.indexOf(parent);
+        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 (index != -1) {
-        return allChildren[index];
-      }
-      allParents.push(parent);
-      allChildren.push(child);
+        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
+        rules: [...],
+        conditions: {associative list: name ==> set},
     }
+  }
 
-    for (var i in parent) {
-      var attrs;
-      if (proto) {
-        attrs = Object.getOwnPropertyDescriptor(proto, i);
-      }
-
-      if (attrs && attrs.set == null) {
-        continue;
-      }
-      child[i] = _clone(parent[i], depth - 1);
-    }
 
-    return child;
+  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)
   }
 
-  return _clone(parent, depth);
-}
-
-/**
- * Simple flat clone using prototype, accepts only objects, usefull for property
- * override on FLAT configuration object (no nested props).
- *
- * USE WITH CAUTION! This may not behave as you wish if you do not know how this
- * works.
- */
-clone.clonePrototype = function clonePrototype(parent) {
-  if (parent === null)
-    return null;
 
-  var c = function () {};
-  c.prototype = parent;
-  return new c();
-};
+  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 */
 
-// private utility functions
+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;
+        }
+        _parseError.prototype = Error;
 
-function __objToStr(o) {
-  return Object.prototype.toString.call(o);
-};
-clone.__objToStr = __objToStr;
+        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];
+        }
+    }
+    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] + '\'');
+                    }
+                }
+                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);
+        }
+        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;
+            }
+            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 = ({
 
-function __isDate(o) {
-  return typeof o === 'object' && __objToStr(o) === '[object Date]';
-};
-clone.__isDate = __isDate;
+EOF:1,
 
-function __isArray(o) {
-  return typeof o === 'object' && __objToStr(o) === '[object Array]';
-};
-clone.__isArray = __isArray;
+parseError:function parseError(str, hash) {
+        if (this.yy.parser) {
+            this.yy.parser.parseError(str, hash);
+        } else {
+            throw new Error(str);
+        }
+    },
 
-function __isRegExp(o) {
-  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
-};
-clone.__isRegExp = __isRegExp;
+// 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;
+    },
 
-function __getRegExpFlags(re) {
-  var flags = '';
-  if (re.global) flags += 'g';
-  if (re.ignoreCase) flags += 'i';
-  if (re.multiline) flags += 'm';
-  return flags;
-};
-clone.__getRegExpFlags = __getRegExpFlags;
+// 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]++;
+        }
 
-return clone;
-})();
+        this._input = this._input.slice(1);
+        return ch;
+    },
 
-if ( true && module.exports) {
-  module.exports = clone;
-}
+// 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);
 
-/***/ }),
-/* 578 */
-/***/ (function(module, exports) {
+        if (lines.length - 1) {
+            this.yylineno -= lines.length - 1;
+        }
+        var r = this.yylloc.range;
 
-module.exports = [
-    [ 0x0300, 0x036F ], [ 0x0483, 0x0486 ], [ 0x0488, 0x0489 ],
-    [ 0x0591, 0x05BD ], [ 0x05BF, 0x05BF ], [ 0x05C1, 0x05C2 ],
-    [ 0x05C4, 0x05C5 ], [ 0x05C7, 0x05C7 ], [ 0x0600, 0x0603 ],
-    [ 0x0610, 0x0615 ], [ 0x064B, 0x065E ], [ 0x0670, 0x0670 ],
-    [ 0x06D6, 0x06E4 ], [ 0x06E7, 0x06E8 ], [ 0x06EA, 0x06ED ],
-    [ 0x070F, 0x070F ], [ 0x0711, 0x0711 ], [ 0x0730, 0x074A ],
-    [ 0x07A6, 0x07B0 ], [ 0x07EB, 0x07F3 ], [ 0x0901, 0x0902 ],
-    [ 0x093C, 0x093C ], [ 0x0941, 0x0948 ], [ 0x094D, 0x094D ],
-    [ 0x0951, 0x0954 ], [ 0x0962, 0x0963 ], [ 0x0981, 0x0981 ],
-    [ 0x09BC, 0x09BC ], [ 0x09C1, 0x09C4 ], [ 0x09CD, 0x09CD ],
-    [ 0x09E2, 0x09E3 ], [ 0x0A01, 0x0A02 ], [ 0x0A3C, 0x0A3C ],
-    [ 0x0A41, 0x0A42 ], [ 0x0A47, 0x0A48 ], [ 0x0A4B, 0x0A4D ],
-    [ 0x0A70, 0x0A71 ], [ 0x0A81, 0x0A82 ], [ 0x0ABC, 0x0ABC ],
-    [ 0x0AC1, 0x0AC5 ], [ 0x0AC7, 0x0AC8 ], [ 0x0ACD, 0x0ACD ],
-    [ 0x0AE2, 0x0AE3 ], [ 0x0B01, 0x0B01 ], [ 0x0B3C, 0x0B3C ],
-    [ 0x0B3F, 0x0B3F ], [ 0x0B41, 0x0B43 ], [ 0x0B4D, 0x0B4D ],
-    [ 0x0B56, 0x0B56 ], [ 0x0B82, 0x0B82 ], [ 0x0BC0, 0x0BC0 ],
-    [ 0x0BCD, 0x0BCD ], [ 0x0C3E, 0x0C40 ], [ 0x0C46, 0x0C48 ],
-    [ 0x0C4A, 0x0C4D ], [ 0x0C55, 0x0C56 ], [ 0x0CBC, 0x0CBC ],
-    [ 0x0CBF, 0x0CBF ], [ 0x0CC6, 0x0CC6 ], [ 0x0CCC, 0x0CCD ],
-    [ 0x0CE2, 0x0CE3 ], [ 0x0D41, 0x0D43 ], [ 0x0D4D, 0x0D4D ],
-    [ 0x0DCA, 0x0DCA ], [ 0x0DD2, 0x0DD4 ], [ 0x0DD6, 0x0DD6 ],
-    [ 0x0E31, 0x0E31 ], [ 0x0E34, 0x0E3A ], [ 0x0E47, 0x0E4E ],
-    [ 0x0EB1, 0x0EB1 ], [ 0x0EB4, 0x0EB9 ], [ 0x0EBB, 0x0EBC ],
-    [ 0x0EC8, 0x0ECD ], [ 0x0F18, 0x0F19 ], [ 0x0F35, 0x0F35 ],
-    [ 0x0F37, 0x0F37 ], [ 0x0F39, 0x0F39 ], [ 0x0F71, 0x0F7E ],
-    [ 0x0F80, 0x0F84 ], [ 0x0F86, 0x0F87 ], [ 0x0F90, 0x0F97 ],
-    [ 0x0F99, 0x0FBC ], [ 0x0FC6, 0x0FC6 ], [ 0x102D, 0x1030 ],
-    [ 0x1032, 0x1032 ], [ 0x1036, 0x1037 ], [ 0x1039, 0x1039 ],
-    [ 0x1058, 0x1059 ], [ 0x1160, 0x11FF ], [ 0x135F, 0x135F ],
-    [ 0x1712, 0x1714 ], [ 0x1732, 0x1734 ], [ 0x1752, 0x1753 ],
-    [ 0x1772, 0x1773 ], [ 0x17B4, 0x17B5 ], [ 0x17B7, 0x17BD ],
-    [ 0x17C6, 0x17C6 ], [ 0x17C9, 0x17D3 ], [ 0x17DD, 0x17DD ],
-    [ 0x180B, 0x180D ], [ 0x18A9, 0x18A9 ], [ 0x1920, 0x1922 ],
-    [ 0x1927, 0x1928 ], [ 0x1932, 0x1932 ], [ 0x1939, 0x193B ],
-    [ 0x1A17, 0x1A18 ], [ 0x1B00, 0x1B03 ], [ 0x1B34, 0x1B34 ],
-    [ 0x1B36, 0x1B3A ], [ 0x1B3C, 0x1B3C ], [ 0x1B42, 0x1B42 ],
-    [ 0x1B6B, 0x1B73 ], [ 0x1DC0, 0x1DCA ], [ 0x1DFE, 0x1DFF ],
-    [ 0x200B, 0x200F ], [ 0x202A, 0x202E ], [ 0x2060, 0x2063 ],
-    [ 0x206A, 0x206F ], [ 0x20D0, 0x20EF ], [ 0x302A, 0x302F ],
-    [ 0x3099, 0x309A ], [ 0xA806, 0xA806 ], [ 0xA80B, 0xA80B ],
-    [ 0xA825, 0xA826 ], [ 0xFB1E, 0xFB1E ], [ 0xFE00, 0xFE0F ],
-    [ 0xFE20, 0xFE23 ], [ 0xFEFF, 0xFEFF ], [ 0xFFF9, 0xFFFB ],
-    [ 0x10A01, 0x10A03 ], [ 0x10A05, 0x10A06 ], [ 0x10A0C, 0x10A0F ],
-    [ 0x10A38, 0x10A3A ], [ 0x10A3F, 0x10A3F ], [ 0x1D167, 0x1D169 ],
-    [ 0x1D173, 0x1D182 ], [ 0x1D185, 0x1D18B ], [ 0x1D1AA, 0x1D1AD ],
-    [ 0x1D242, 0x1D244 ], [ 0xE0001, 0xE0001 ], [ 0xE0020, 0xE007F ],
-    [ 0xE0100, 0xE01EF ]
-]
+        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
+        };
 
+        if (this.options.ranges) {
+            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+        }
+        this.yyleng = this.yytext.length;
+        return this;
+    },
 
-/***/ }),
-/* 579 */
-/***/ (function(module, exports, __webpack_require__) {
+// When called from action, caches matched text and appends it on next action
+more:function () {
+        this._more = true;
+        return this;
+    },
 
-"use strict";
+// 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
+            });
 
+        }
+        return this;
+    },
 
-module.exports = ({stream = process.stdout} = {}) => {
-	return Boolean(
-		stream && stream.isTTY &&
-		process.env.TERM !== 'dumb' &&
-		!('CI' in process.env)
-	);
-};
+// retain first n characters of the match
+less:function (n) {
+        this.unput(this.match.slice(n));
+    },
 
+// 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, "");
+    },
 
-/***/ }),
-/* 580 */
-/***/ (function(module, exports, __webpack_require__) {
+// 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, "");
+    },
 
-var Stream = __webpack_require__(294)
+// 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 = MuteStream
+// test the lexed token: return FALSE when not a match, otherwise return token
+test_match:function (match, indexed_rule) {
+        var token,
+            lines,
+            backup;
 
-// var out = new MuteStream(process.stdout)
-// argument auto-pipes
-function MuteStream (opts) {
-  Stream.apply(this)
-  opts = opts || {}
-  this.writable = this.readable = true
-  this.muted = false
-  this.on('pipe', this._onpipe)
-  this.replace = opts.replace
-
-  // For readline-type situations
-  // This much at the start of a line being redrawn after a ctrl char
-  // is seen (such as backspace) won't be redrawn as the replacement
-  this._prompt = opts.prompt || null
-  this._hadControl = false
-}
-
-MuteStream.prototype = Object.create(Stream.prototype)
-
-Object.defineProperty(MuteStream.prototype, 'constructor', {
-  value: MuteStream,
-  enumerable: false
-})
-
-MuteStream.prototype.mute = function () {
-  this.muted = true
-}
-
-MuteStream.prototype.unmute = function () {
-  this.muted = false
-}
-
-Object.defineProperty(MuteStream.prototype, '_onpipe', {
-  value: onPipe,
-  enumerable: false,
-  writable: true,
-  configurable: true
-})
-
-function onPipe (src) {
-  this._src = src
-}
-
-Object.defineProperty(MuteStream.prototype, 'isTTY', {
-  get: getIsTTY,
-  set: setIsTTY,
-  enumerable: true,
-  configurable: true
-})
-
-function getIsTTY () {
-  return( (this._dest) ? this._dest.isTTY
-        : (this._src) ? this._src.isTTY
-        : false
-        )
-}
-
-// basically just get replace the getter/setter with a regular value
-function setIsTTY (isTTY) {
-  Object.defineProperty(this, 'isTTY', {
-    value: isTTY,
-    enumerable: true,
-    writable: true,
-    configurable: true
-  })
-}
-
-Object.defineProperty(MuteStream.prototype, 'rows', {
-  get: function () {
-    return( this._dest ? this._dest.rows
-          : this._src ? this._src.rows
-          : undefined )
-  }, enumerable: true, configurable: true })
-
-Object.defineProperty(MuteStream.prototype, 'columns', {
-  get: function () {
-    return( this._dest ? this._dest.columns
-          : this._src ? this._src.columns
-          : undefined )
-  }, enumerable: true, configurable: true })
-
-
-MuteStream.prototype.pipe = function (dest, options) {
-  this._dest = dest
-  return Stream.prototype.pipe.call(this, dest, options)
-}
-
-MuteStream.prototype.pause = function () {
-  if (this._src) return this._src.pause()
-}
-
-MuteStream.prototype.resume = function () {
-  if (this._src) return this._src.resume()
-}
-
-MuteStream.prototype.write = function (c) {
-  if (this.muted) {
-    if (!this.replace) return true
-    if (c.match(/^\u001b/)) {
-      if(c.indexOf(this._prompt) === 0) {
-        c = c.substr(this._prompt.length);
-        c = c.replace(/./g, this.replace);
-        c = this._prompt + c;
-      }
-      this._hadControl = true
-      return this.emit('data', c)
-    } else {
-      if (this._prompt && this._hadControl &&
-          c.indexOf(this._prompt) === 0) {
-        this._hadControl = false
-        this.emit('data', this._prompt)
-        c = c.substr(this._prompt.length)
-      }
-      c = c.toString().replace(/./g, this.replace)
-    }
-  }
-  this.emit('data', c)
-}
-
-MuteStream.prototype.end = function (c) {
-  if (this.muted) {
-    if (c && this.replace) {
-      c = c.toString().replace(/./g, this.replace)
-    } else {
-      c = null
-    }
-  }
-  if (c) this.emit('data', c)
-  this.emit('end')
-}
-
-function proxy (fn) { return function () {
-  var d = this._dest
-  var s = this._src
-  if (d && d[fn]) d[fn].apply(d, arguments)
-  if (s && s[fn]) s[fn].apply(s, arguments)
-}}
-
-MuteStream.prototype.destroy = proxy('destroy')
-MuteStream.prototype.destroySoon = proxy('destroySoon')
-MuteStream.prototype.close = proxy('close')
-
-
-/***/ }),
-/* 581 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ResetCommand", function() { return ResetCommand; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(361);
-/* 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__(558);
-/* 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__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(544);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(352);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(341);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
-
-
-
-const ResetCommand = {
-  description: 'Deletes node_modules and output directories, resets internal and disk caches, and stops Bazel server',
-  name: 'reset',
-  reportTiming: {
-    group: 'scripts/kbn reset',
-    id: 'total'
-  },
-
-  async run(projects) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
-      problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
-      If you think you need to use this command very often (which is not normal), please let us know.
-    `);
-    const toDelete = [];
-
-    for (const project of projects.values()) {
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["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_5__["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
-        });
-      }
-    } // Runs Bazel hard clean and deletes Bazel Cache Folders
-
-
-    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["isBazelBinAvailable"])()) {
-      // Hard cleaning bazel
-      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean', '--expunge']);
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Hard cleaned bazel'); // Deletes Bazel Cache Folders
-
-      await del__WEBPACK_IMPORTED_MODULE_1___default()([await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelDiskCacheFolder"])(), await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelRepositoryCacheFolder"])()], {
-        force: true
-      });
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Removed disk caches');
-    }
-
-    if (toDelete.length === 0) {
-      return;
-    }
-    /**
-     * 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);
-
-        if (_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].wouldLogLevel('info')) {
-          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))));
+        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);
+            }
         }
 
-        await promise;
-      }
-    } finally {
-      process.chdir(originalCwd);
-    }
-  }
-
-};
-
-/***/ }),
-/* 582 */
-/***/ (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 dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(462);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(583);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(461);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
-
-const RunCommand = {
-  description: 'Run script defined in package.json in each package that contains that script (only works on packages not using Bazel yet)',
-  name: 'run',
-  reportTiming: {
-    group: 'scripts/kbn run',
-    id: 'total'
-  },
-
-  async run(projects, projectGraph, {
-    extraArgs,
-    options
-  }) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      We are migrating packages into the Bazel build system and we will no longer support running npm scripts on
-      packages using 'yarn kbn run' on Bazel built packages. If the package you are trying to act on contains a
-      BUILD.bazel file please just use 'yarn kbn build' to build it or 'yarn kbn watch' to watch it
-    `);
-    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__["topologicallyBatchProjects"])(projects, projectGraph);
-
-    if (extraArgs.length === 0) {
-      throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__["CliError"]('No script specified');
-    }
-
-    const scriptName = extraArgs[0];
-    const scriptArgs = extraArgs.slice(1);
-    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_3__["parallelizeBatches"])(batchedProjects, async project => {
-      if (!project.hasScript(scriptName)) {
-        if (!!options['skip-missing']) {
-          return;
+        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;
+    },
 
-        throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__["CliError"](`[${project.name}] no "${scriptName}" script defined. To skip packages without the "${scriptName}" script pass --skip-missing`);
-      }
-
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].info(`[${project.name}] running "${scriptName}" script`);
-      await project.runScriptStreaming(scriptName, {
-        args: scriptArgs
-      });
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].success(`[${project.name}] complete`);
-    });
-  }
-
-};
-
-/***/ }),
-/* 583 */
-/***/ (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; });
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-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 next match in input
+next:function () {
+        if (this.done) {
+            return this.EOF;
+        }
+        if (!this._input) {
+            this.done = true;
+        }
 
-  return new Promise((resolve, reject) => {
-    let activePromises = 0;
-    const values = items.slice(0);
+        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
+            });
+        }
+    },
 
-    async function scheduleItem(item) {
-      activePromises++;
+// return next match that has a token
+lex:function lex() {
+        var r = this.next();
+        if (r) {
+            return r;
+        } else {
+            return this.lex();
+        }
+    },
 
-      try {
-        await fn(item);
-        activePromises--;
+// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
+begin:function begin(condition) {
+        this.conditionStack.push(condition);
+    },
 
-        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();
+// 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];
         }
-      } catch (error) {
-        reject(error);
-      }
-    }
+    },
 
-    values.splice(0, concurrency).map(scheduleItem);
-  });
-}
+// 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;
+        }
+    },
 
-/***/ }),
-/* 584 */
-/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "WatchCommand", function() { return WatchCommand; });
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(544);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+// alias for begin(condition)
+pushState:function pushState(condition) {
+        this.begin(condition);
+    },
 
-const WatchCommand = {
-  description: 'Runs a build in the Bazel built packages and keeps watching them for changes',
-  name: 'watch',
-  reportTiming: {
-    group: 'scripts/kbn watch',
-    id: 'total'
-  },
-
-  async run(projects, projectGraph, {
-    options
-  }) {
-    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages and run it through iBazel to watch it for changes
-    //
-    // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
-    // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
-
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
-  }
-
-};
-
-/***/ }),
-/* 585 */
-/***/ (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 _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(252);
-/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(462);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(461);
-/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(543);
-/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(586);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
-
-
-process.env.CI_STATS_NESTED_TIMING = 'true';
-async function runCommand(command, config) {
-  const runStartTime = Date.now();
-  let kbn;
-
-  try {
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`Running [${command.name}] command from [${config.rootPath}]`);
-    kbn = await _utils_kibana__WEBPACK_IMPORTED_MODULE_5__["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_2__["log"].error(`There are no projects found. Double check project name(s) in '-i/--include' and '-e/--exclude' filters.`);
-      return process.exit(1);
-    }
-
-    const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_3__["buildProjectGraph"])(projects);
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`Found ${projects.size.toString()} projects`);
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(Object(_utils_projects_tree__WEBPACK_IMPORTED_MODULE_4__["renderProjectsTree"])(config.rootPath, projects));
-    await command.run(projects, projectGraph, _objectSpread(_objectSpread({}, config), {}, {
-      kbn
-    }));
-
-    if (command.reportTiming) {
-      const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
-      await reporter.timings({
-        upstreamBranch: kbn.kibanaProject.json.branch,
-        // prevent loading @kbn/utils by passing null
-        kibanaUuid: kbn.getUuid() || null,
-        timings: [{
-          group: command.reportTiming.group,
-          id: command.reportTiming.id,
-          ms: Date.now() - runStartTime,
-          meta: {
-            success: true
-          }
-        }]
-      });
-    }
-  } catch (error) {
-    if (command.reportTiming) {
-      // if we don't have a kbn object then things are too broken to report on
-      if (kbn) {
-        try {
-          const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
-          await reporter.timings({
-            upstreamBranch: kbn.kibanaProject.json.branch,
-            // prevent loading @kbn/utils by passing null
-            kibanaUuid: kbn.getUuid() || null,
-            timings: [{
-              group: command.reportTiming.group,
-              id: command.reportTiming.id,
-              ms: Date.now() - runStartTime,
-              meta: {
-                success: false
-              }
-            }]
-          });
-        } catch (e) {
-          // prevent hiding bootstrap errors
-          _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error('failed to report timings:');
-          _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(e);
-        }
-      }
-    }
-
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(`[${command.name}] failed:`);
-
-    if (error instanceof _utils_errors__WEBPACK_IMPORTED_MODULE_1__["CliError"]) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(error.message);
-      const metaOutput = Object.entries(error.meta).map(([key, value]) => `${key}: ${value}`).join('\n');
-
-      if (metaOutput) {
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].info('Additional debugging info:\n');
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].indent(2);
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].info(metaOutput);
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].indent(-2);
-      }
-    } else {
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(error);
-    }
-
-    process.exit(1);
-  }
-}
-
-function toArray(value) {
-  if (value == null) {
-    return [];
-  }
-
-  return Array.isArray(value) ? value : [value];
-}
-
-/***/ }),
-/* 586 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kibana", function() { return Kibana; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(253);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(587);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(454);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(530);
-/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(461);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(590);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
-
-
-
-/**
- * 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_5__["getProjects"])(rootPath, Object(_config__WEBPACK_IMPORTED_MODULE_6__["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_5__["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_6__["getProjectPaths"])(_objectSpread(_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_2___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;
-  }
-
-  isPartOfRepo(project) {
-    return project.path === this.kibanaProject.path || is_path_inside__WEBPACK_IMPORTED_MODULE_3___default()(project.path, this.kibanaProject.path);
-  }
-
-  isOutsideRepo(project) {
-    return !this.isPartOfRepo(project);
-  }
-
-  resolveAllProductionDependencies(yarnLock, log) {
-    const kibanaDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["resolveDepsForProject"])({
-      project: this.kibanaProject,
-      yarnLock,
-      kbn: this,
-      includeDependentProject: true,
-      productionDepsOnly: true,
-      log
-    });
-    const xpackDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["resolveDepsForProject"])({
-      project: this.getProject('x-pack'),
-      yarnLock,
-      kbn: this,
-      includeDependentProject: true,
-      productionDepsOnly: true,
-      log
-    });
-    return new Map([...kibanaDeps.entries(), ...xpackDeps.entries()]);
-  }
-
-  getUuid() {
-    try {
-      return fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFileSync(this.getAbsolute('data/uuid'), 'utf-8').trim();
-    } catch (error) {
-      if (error.code === 'ENOENT') {
-        return undefined;
-      }
-
-      throw error;
-    }
-  }
-
-}
-
-/***/ }),
-/* 587 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const minimatch = __webpack_require__(368);
-const arrayUnion = __webpack_require__(363);
-const arrayDiffer = __webpack_require__(588);
-const arrify = __webpack_require__(589);
-
-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));
-	}, []);
-};
-
-
-/***/ }),
-/* 588 */
-/***/ (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;
-
-
-/***/ }),
-/* 589 */
-/***/ (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;
-
-
-/***/ }),
-/* 590 */
-/***/ (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__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-/**
- * 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.
-
-  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, 'test/server_integration/__fixtures__/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/plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/test/functional_with_es_ssl/fixtures/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;
-}
-
-/***/ }),
-/* 591 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(592);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildBazelProductionProjects"]; });
-
-/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(833);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__["buildNonBazelProductionProjects"]; });
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-/***/ }),
-/* 592 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return buildBazelProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(593);
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(805);
-/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(globby__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(833);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(544);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(352);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(341);
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(464);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(461);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
-
-
-
-
-
-async function buildBazelProductionProjects({
-  kibanaRoot,
-  buildRoot,
-  onlyOSS
-}) {
-  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_8__["getBazelProjectsOnly"])(await Object(_build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__["getProductionProjects"])(kibanaRoot, onlyOSS));
-  const projectNames = [...projects.values()].map(project => project.name);
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`);
-  await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['build', '//packages:build']);
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(`All Bazel projects production builds for [${projectNames.join(', ')}] are complete`);
-
-  for (const project of projects.values()) {
-    await copyToBuild(project, kibanaRoot, buildRoot);
-    await applyCorrectPermissions(project, kibanaRoot, buildRoot);
-  }
-}
-/**
- * Copy all the project's files from its Bazel dist directory into the
- * project build folder.
- *
- * When copying all the files into the build, we exclude `node_modules` because
- * we want the Kibana build to be responsible for actually installing all
- * dependencies. The primary reason for allowing the Kibana build process to
- * manage dependencies is that it will "dedupe" them, so we don't include
- * unnecessary copies of dependencies. We also exclude every related Bazel build
- * files in order to get the most cleaner package module we can in the final distributable.
- */
-
-async function copyToBuild(project, kibanaRoot, buildRoot) {
-  // We want the package to have the same relative location within the build
-  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
-  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
-  await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*'], buildProjectPath, {
-    cwd: Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(kibanaRoot, 'bazel-bin', 'packages', Object(path__WEBPACK_IMPORTED_MODULE_2__["basename"])(buildProjectPath), 'npm_module'),
-    dot: true,
-    onlyFiles: true,
-    parents: true
-  }); // If a project is using an intermediate build directory, we special-case our
-  // handling of `package.json`, as the project build process might have copied
-  // (a potentially modified) `package.json` into the intermediate build
-  // directory already. If so, we want to use that `package.json` as the basis
-  // for creating the production-ready `package.json`. If it's not present in
-  // the intermediate build, we fall back to using the project's already defined
-  // `package.json`.
-
-  const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isFile"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["readPackageJson"])(buildProjectPath) : project.json;
-  const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["createProductionPackageJson"])(packageJson);
-  await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["writePackageJson"])(buildProjectPath, preparedPackageJson);
-}
-
-async function applyCorrectPermissions(project, kibanaRoot, buildRoot) {
-  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
-  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
-  const allPluginPaths = await globby__WEBPACK_IMPORTED_MODULE_1___default()([`**/*`], {
-    onlyFiles: false,
-    cwd: buildProjectPath,
-    dot: true
-  });
-
-  for (const pluginPath of allPluginPaths) {
-    const resolvedPluginPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildProjectPath, pluginPath);
-
-    if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isFile"])(resolvedPluginPath)) {
-      await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["chmod"])(resolvedPluginPath, 0o644);
-    }
-
-    if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(resolvedPluginPath)) {
-      await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["chmod"])(resolvedPluginPath, 0o755);
-    }
-  }
-}
-
-/***/ }),
-/* 593 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const EventEmitter = __webpack_require__(285);
-const path = __webpack_require__(4);
-const os = __webpack_require__(243);
-const pMap = __webpack_require__(594);
-const arrify = __webpack_require__(589);
-const globby = __webpack_require__(597);
-const hasGlob = __webpack_require__(789);
-const cpFile = __webpack_require__(791);
-const junk = __webpack_require__(801);
-const pFilter = __webpack_require__(802);
-const CpyError = __webpack_require__(804);
-
-const defaultOptions = {
-	ignoreJunk: true
-};
-
-class SourceFile {
-	constructor(relativePath, path) {
-		this.path = path;
-		this.relativePath = relativePath;
-		Object.freeze(this);
-	}
-
-	get name() {
-		return path.basename(this.relativePath);
-	}
-
-	get nameWithoutExtension() {
-		return path.basename(this.relativePath, path.extname(this.relativePath));
-	}
-
-	get extension() {
-		return path.extname(this.relativePath).slice(1);
-	}
-}
-
-const preprocessSourcePath = (source, options) => path.resolve(options.cwd ? options.cwd : process.cwd(), source);
-
-const preprocessDestinationPath = (source, destination, options) => {
-	let basename = path.basename(source);
-
-	if (typeof options.rename === 'string') {
-		basename = options.rename;
-	} else if (typeof options.rename === 'function') {
-		basename = options.rename(basename);
-	}
-
-	if (options.cwd) {
-		destination = path.resolve(options.cwd, destination);
-	}
-
-	if (options.parents) {
-		const dirname = path.dirname(source);
-		const parsedDirectory = path.parse(dirname);
-		return path.join(destination, dirname.replace(parsedDirectory.root, path.sep), basename);
-	}
-
-	return path.join(destination, basename);
-};
-
-module.exports = (source, destination, {
-	concurrency = (os.cpus().length || 1) * 2,
-	...options
-} = {}) => {
-	const progressEmitter = new EventEmitter();
-
-	options = {
-		...defaultOptions,
-		...options
-	};
-
-	const promise = (async () => {
-		source = arrify(source);
-
-		if (source.length === 0 || !destination) {
-			throw new CpyError('`source` and `destination` required');
-		}
-
-		const copyStatus = new Map();
-		let completedFiles = 0;
-		let completedSize = 0;
-
-		let files;
-		try {
-			files = await globby(source, options);
-
-			if (options.ignoreJunk) {
-				files = files.filter(file => junk.not(path.basename(file)));
-			}
-		} catch (error) {
-			throw new CpyError(`Cannot glob \`${source}\`: ${error.message}`, error);
-		}
-
-		if (files.length === 0 && !hasGlob(source)) {
-			throw new CpyError(`Cannot copy \`${source}\`: the file doesn't exist`);
-		}
-
-		let sources = files.map(sourcePath => new SourceFile(sourcePath, preprocessSourcePath(sourcePath, options)));
-
-		if (options.filter !== undefined) {
-			const filteredSources = await pFilter(sources, options.filter, {concurrency: 1024});
-			sources = filteredSources;
-		}
-
-		if (sources.length === 0) {
-			progressEmitter.emit('progress', {
-				totalFiles: 0,
-				percent: 1,
-				completedFiles: 0,
-				completedSize: 0
-			});
-		}
-
-		const fileProgressHandler = event => {
-			const fileStatus = copyStatus.get(event.src) || {written: 0, percent: 0};
-
-			if (fileStatus.written !== event.written || fileStatus.percent !== event.percent) {
-				completedSize -= fileStatus.written;
-				completedSize += event.written;
-
-				if (event.percent === 1 && fileStatus.percent !== 1) {
-					completedFiles++;
-				}
-
-				copyStatus.set(event.src, {
-					written: event.written,
-					percent: event.percent
-				});
-
-				progressEmitter.emit('progress', {
-					totalFiles: files.length,
-					percent: completedFiles / files.length,
-					completedFiles,
-					completedSize
-				});
-			}
-		};
-
-		return pMap(sources, async source => {
-			const to = preprocessDestinationPath(source.relativePath, destination, options);
-
-			try {
-				await cpFile(source.path, to, options).on('progress', fileProgressHandler);
-			} catch (error) {
-				throw new CpyError(`Cannot copy from \`${source.relativePath}\` to \`${to}\`: ${error.message}`, error);
-			}
-
-			return to;
-		}, {concurrency});
-	})();
-
-	promise.on = (...arguments_) => {
-		progressEmitter.on(...arguments_);
-		return promise;
-	};
-
-	return promise;
-};
-
-
-/***/ }),
-/* 594 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const AggregateError = __webpack_require__(595);
-
-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})`);
-		}
-
-		const ret = [];
-		const errors = [];
-		const iterator = iterable[Symbol.iterator]();
-		let isRejected = false;
-		let isIterableDone = false;
-		let resolvingCount = 0;
-		let currentIndex = 0;
-
-		const next = () => {
-			if (isRejected) {
-				return;
-			}
-
-			const nextItem = iterator.next();
-			const i = currentIndex;
-			currentIndex++;
-
-			if (nextItem.done) {
-				isIterableDone = true;
-
-				if (resolvingCount === 0) {
-					if (!stopOnError && errors.length !== 0) {
-						reject(new AggregateError(errors));
-					} else {
-						resolve(ret);
-					}
-				}
-
-				return;
-			}
-
-			resolvingCount++;
-
-			(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();
-
-			if (isIterableDone) {
-				break;
-			}
-		}
-	});
-};
-
-
-/***/ }),
-/* 595 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const indentString = __webpack_require__(596);
-const cleanStack = __webpack_require__(459);
-
-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}`);
-		}
-
-		errors = [...errors].map(error => {
-			if (error instanceof Error) {
-				return error;
-			}
-
-			if (error !== null && typeof error === 'object') {
-				// Handle plain error objects with message property and/or possibly other metadata
-				return Object.assign(new Error(error.message), error);
-			}
-
-			return new Error(error);
-		});
-
-		let message = errors
-			.map(error => {
-				// The `stack` property is not standardized, so we can't assume it exists
-				return typeof error.stack === 'string' ? cleanInternalStack(cleanStack(error.stack)) : String(error);
-			})
-			.join('\n');
-		message = '\n' + indentString(message, 4);
-		super(message);
-
-		this.name = 'AggregateError';
-
-		Object.defineProperty(this, '_errors', {value: errors});
-	}
-
-	* [Symbol.iterator]() {
-		for (const error of this._errors) {
-			yield error;
-		}
-	}
-}
-
-module.exports = AggregateError;
-
-
-/***/ }),
-/* 596 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = (string, count = 1, options) => {
-	options = {
-		indent: ' ',
-		includeEmptyLines: false,
-		...options
-	};
-
-	if (typeof string !== 'string') {
-		throw new TypeError(
-			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
-		);
-	}
-
-	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 string;
-	}
-
-	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
-
-	return string.replace(regex, options.indent.repeat(count));
-};
-
-
-/***/ }),
-/* 597 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const fs = __webpack_require__(253);
-const arrayUnion = __webpack_require__(598);
-const glob = __webpack_require__(365);
-const fastGlob = __webpack_require__(600);
-const dirGlob = __webpack_require__(783);
-const gitignore = __webpack_require__(786);
-
-const DEFAULT_FILTER = () => false;
-
-const isNegative = pattern => pattern[0] === '!';
-
-const assertPatternsInput = patterns => {
-	if (!patterns.every(x => typeof x === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
-};
-
-const checkCwdOption = options => {
-	if (options && options.cwd && !fs.statSync(options.cwd).isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
-	}
-};
-
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
-
-	const globTasks = [];
-
-	taskOptions = Object.assign({
-		ignore: [],
-		expandDirectories: true
-	}, taskOptions);
-
-	patterns.forEach((pattern, i) => {
-		if (isNegative(pattern)) {
-			return;
-		}
-
-		const ignore = patterns
-			.slice(i)
-			.filter(isNegative)
-			.map(pattern => pattern.slice(1));
-
-		const options = Object.assign({}, 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 = Object.assign(options, {files: task.options.expandDirectories});
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = Object.assign(options, task.options.expandDirectories);
-	}
-
-	return fn(task.pattern, options);
-};
-
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
-
-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
-	};
-};
-
-const globby = (patterns, options) => {
-	let globTasks;
-
-	try {
-		globTasks = generateGlobTasks(patterns, options);
-	} catch (error) {
-		return Promise.reject(error);
-	}
-
-	const getTasks = Promise.all(globTasks.map(task => Promise.resolve(getPattern(task, dirGlob))
-		.then(globs => Promise.all(globs.map(globToTask(task))))
-	))
-		.then(tasks => arrayUnion(...tasks));
-
-	const getFilter = () => {
-		return Promise.resolve(
-			options && options.gitignore ?
-				gitignore({cwd: options.cwd, ignore: options.ignore}) :
-				DEFAULT_FILTER
-		);
-	};
-
-	return getFilter()
-		.then(filter => {
-			return getTasks
-				.then(tasks => Promise.all(tasks.map(task => fastGlob(task.pattern, task.options))))
-				.then(paths => arrayUnion(...paths))
-				.then(paths => paths.filter(p => !filter(p)));
-		});
-};
-
-module.exports = globby;
-// TODO: Remove this for the next major release
-module.exports.default = globby;
-
-module.exports.sync = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
-
-	const getFilter = () => {
-		return options && options.gitignore ?
-			gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
-
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
-
-	const filter = getFilter();
-	return tasks.reduce(
-		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
-		[]
-	).filter(p => !filter(p));
-};
-
-module.exports.generateGlobTasks = generateGlobTasks;
-
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => glob.hasMagic(pattern, options));
-
-module.exports.gitignore = gitignore;
-
-
-/***/ }),
-/* 598 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var arrayUniq = __webpack_require__(599);
-
-module.exports = function () {
-	return arrayUniq([].concat.apply([], arguments));
-};
-
-
-/***/ }),
-/* 599 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// there's 3 implementations written in increasing order of efficiency
-
-// 1 - no Set type is defined
-function uniqNoSet(arr) {
-	var ret = [];
-
-	for (var i = 0; i < arr.length; i++) {
-		if (ret.indexOf(arr[i]) === -1) {
-			ret.push(arr[i]);
-		}
-	}
-
-	return ret;
-}
-
-// 2 - a simple Set type is defined
-function uniqSet(arr) {
-	var seen = new Set();
-	return arr.filter(function (el) {
-		if (!seen.has(el)) {
-			seen.add(el);
-			return true;
-		}
-
-		return false;
-	});
-}
-
-// 3 - a standard Set type is defined and it has a forEach method
-function uniqSetWithForEach(arr) {
-	var ret = [];
-
-	(new Set(arr)).forEach(function (el) {
-		ret.push(el);
-	});
-
-	return ret;
-}
-
-// V8 currently has a broken implementation
-// https://github.com/joyent/node/issues/8449
-function doesForEachActuallyWork() {
-	var ret = false;
-
-	(new Set([true])).forEach(function (el) {
-		ret = el;
-	});
-
-	return ret === true;
-}
-
-if ('Set' in global) {
-	if (typeof Set.prototype.forEach === 'function' && doesForEachActuallyWork()) {
-		module.exports = uniqSetWithForEach;
-	} else {
-		module.exports = uniqSet;
-	}
-} else {
-	module.exports = uniqNoSet;
-}
-
-
-/***/ }),
-/* 600 */
-/***/ (function(module, exports, __webpack_require__) {
-
-const pkg = __webpack_require__(601);
-
-module.exports = pkg.async;
-module.exports.default = pkg.async;
-
-module.exports.async = pkg.async;
-module.exports.sync = pkg.sync;
-module.exports.stream = pkg.stream;
-
-module.exports.generateTasks = pkg.generateTasks;
-
-
-/***/ }),
-/* 601 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(602);
-var taskManager = __webpack_require__(603);
-var reader_async_1 = __webpack_require__(754);
-var reader_stream_1 = __webpack_require__(778);
-var reader_sync_1 = __webpack_require__(779);
-var arrayUtils = __webpack_require__(781);
-var streamUtils = __webpack_require__(782);
-/**
- * Synchronous API.
- */
-function sync(source, opts) {
-    assertPatternsInput(source);
-    var works = getWorks(source, reader_sync_1.default, opts);
-    return arrayUtils.flatten(works);
-}
-exports.sync = sync;
-/**
- * Asynchronous API.
- */
-function async(source, opts) {
-    try {
-        assertPatternsInput(source);
-    }
-    catch (error) {
-        return Promise.reject(error);
-    }
-    var works = getWorks(source, reader_async_1.default, opts);
-    return Promise.all(works).then(arrayUtils.flatten);
-}
-exports.async = async;
-/**
- * Stream API.
- */
-function stream(source, opts) {
-    assertPatternsInput(source);
-    var works = getWorks(source, reader_stream_1.default, opts);
-    return streamUtils.merge(works);
-}
-exports.stream = stream;
-/**
- * Return a set of tasks based on provided patterns.
- */
-function generateTasks(source, opts) {
-    assertPatternsInput(source);
-    var patterns = [].concat(source);
-    var options = optionsManager.prepare(opts);
-    return taskManager.generate(patterns, options);
-}
-exports.generateTasks = generateTasks;
-/**
- * Returns a set of works based on provided tasks and class of the reader.
- */
-function getWorks(source, _Reader, opts) {
-    var patterns = [].concat(source);
-    var options = optionsManager.prepare(opts);
-    var tasks = taskManager.generate(patterns, options);
-    var reader = new _Reader(options);
-    return tasks.map(reader.read, reader);
-}
-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';
-}
-
-
-/***/ }),
-/* 602 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(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);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-function prepare(options) {
-    var opts = __assign({ cwd: process.cwd(), deep: true, ignore: [], dot: false, stats: false, onlyFiles: true, onlyDirectories: false, followSymlinkedDirectories: true, unique: true, markDirectories: false, absolute: false, nobrace: false, brace: true, noglobstar: false, globstar: true, noext: false, extension: true, nocase: false, case: true, matchBase: false, transform: null }, options);
-    if (opts.onlyDirectories) {
-        opts.onlyFiles = false;
-    }
-    opts.brace = !opts.nobrace;
-    opts.globstar = !opts.noglobstar;
-    opts.extension = !opts.noext;
-    opts.case = !opts.nocase;
-    if (options) {
-        opts.brace = ('brace' in options ? options.brace : opts.brace);
-        opts.globstar = ('globstar' in options ? options.globstar : opts.globstar);
-        opts.extension = ('extension' in options ? options.extension : opts.extension);
-        opts.case = ('case' in options ? options.case : opts.case);
-    }
-    return opts;
-}
-exports.prepare = prepare;
-
-
-/***/ }),
-/* 603 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(604);
-/**
- * Generate tasks based on parent directory of each pattern.
- */
-function generate(patterns, options) {
-    var unixPatterns = patterns.map(patternUtils.unixifyPattern);
-    var unixIgnore = options.ignore.map(patternUtils.unixifyPattern);
-    var positivePatterns = getPositivePatterns(unixPatterns);
-    var negativePatterns = getNegativePatternsAsPositive(unixPatterns, unixIgnore);
-    /**
-     * When the `case` option is disabled, all patterns must be marked as dynamic, because we cannot check filepath
-     * directly (without read directory).
-     */
-    var staticPatterns = !options.case ? [] : positivePatterns.filter(patternUtils.isStaticPattern);
-    var dynamicPatterns = !options.case ? positivePatterns : positivePatterns.filter(patternUtils.isDynamicPattern);
-    var staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
-    var dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
-    return staticTasks.concat(dynamicTasks);
-}
-exports.generate = generate;
-/**
- * Convert patterns to tasks based on parent directory of each pattern.
- */
-function convertPatternsToTasks(positive, negative, dynamic) {
-    var 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) {
-        var task = convertPatternGroupToTask('.', positive, negative, dynamic);
-        return [task];
-    }
-    return convertPatternGroupsToTasks(positivePatternsGroup, negative, dynamic);
-}
-exports.convertPatternsToTasks = convertPatternsToTasks;
-/**
- * Return only positive patterns.
- */
-function getPositivePatterns(patterns) {
-    return patternUtils.getPositivePatterns(patterns);
-}
-exports.getPositivePatterns = getPositivePatterns;
-/**
- * Return only negative patterns.
- */
-function getNegativePatternsAsPositive(patterns, ignore) {
-    var negative = patternUtils.getNegativePatterns(patterns).concat(ignore);
-    var positive = negative.map(patternUtils.convertToPositivePattern);
-    return positive;
-}
-exports.getNegativePatternsAsPositive = getNegativePatternsAsPositive;
-/**
- * Group patterns by base directory of each pattern.
- */
-function groupPatternsByBaseDirectory(patterns) {
-    return patterns.reduce(function (collection, pattern) {
-        var base = patternUtils.getBaseDirectory(pattern);
-        if (base in collection) {
-            collection[base].push(pattern);
-        }
-        else {
-            collection[base] = [pattern];
-        }
-        return collection;
-    }, {});
-}
-exports.groupPatternsByBaseDirectory = groupPatternsByBaseDirectory;
-/**
- * Convert group of patterns to tasks.
- */
-function convertPatternGroupsToTasks(positive, negative, dynamic) {
-    return Object.keys(positive).map(function (base) {
-        return convertPatternGroupToTask(base, positive[base], negative, dynamic);
-    });
-}
-exports.convertPatternGroupsToTasks = convertPatternGroupsToTasks;
-/**
- * Create a task for positive and negative patterns.
- */
-function convertPatternGroupToTask(base, positive, negative, dynamic) {
-    return {
-        base: base,
-        dynamic: dynamic,
-        positive: positive,
-        negative: negative,
-        patterns: [].concat(positive, negative.map(patternUtils.convertToNegativePattern))
-    };
-}
-exports.convertPatternGroupToTask = convertPatternGroupToTask;
-
-
-/***/ }),
-/* 604 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-var globParent = __webpack_require__(605);
-var isGlob = __webpack_require__(387);
-var micromatch = __webpack_require__(608);
-var GLOBSTAR = '**';
-/**
- * Return true for static pattern.
- */
-function isStaticPattern(pattern) {
-    return !isDynamicPattern(pattern);
-}
-exports.isStaticPattern = isStaticPattern;
-/**
- * Return true for pattern that looks like glob.
- */
-function isDynamicPattern(pattern) {
-    return isGlob(pattern, { strict: false });
-}
-exports.isDynamicPattern = isDynamicPattern;
-/**
- * Convert a windows «path» to a unix-style «path».
- */
-function unixifyPattern(pattern) {
-    return pattern.replace(/\\/g, '/');
-}
-exports.unixifyPattern = unixifyPattern;
-/**
- * Returns negative pattern as positive pattern.
- */
-function convertToPositivePattern(pattern) {
-    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
-}
-exports.convertToPositivePattern = convertToPositivePattern;
-/**
- * Returns positive pattern as negative pattern.
- */
-function convertToNegativePattern(pattern) {
-    return '!' + pattern;
-}
-exports.convertToNegativePattern = convertToNegativePattern;
-/**
- * Return true if provided pattern is negative pattern.
- */
-function isNegativePattern(pattern) {
-    return pattern.startsWith('!') && pattern[1] !== '(';
-}
-exports.isNegativePattern = isNegativePattern;
-/**
- * Return true if provided pattern is positive pattern.
- */
-function isPositivePattern(pattern) {
-    return !isNegativePattern(pattern);
-}
-exports.isPositivePattern = isPositivePattern;
-/**
- * Extracts negative patterns from array of patterns.
- */
-function getNegativePatterns(patterns) {
-    return patterns.filter(isNegativePattern);
-}
-exports.getNegativePatterns = getNegativePatterns;
-/**
- * Extracts positive patterns from array of patterns.
- */
-function getPositivePatterns(patterns) {
-    return patterns.filter(isPositivePattern);
-}
-exports.getPositivePatterns = getPositivePatterns;
-/**
- * Extract base directory from provided pattern.
- */
-function getBaseDirectory(pattern) {
-    return globParent(pattern);
-}
-exports.getBaseDirectory = getBaseDirectory;
-/**
- * Return true if provided pattern has globstar.
- */
-function hasGlobStar(pattern) {
-    return pattern.indexOf(GLOBSTAR) !== -1;
-}
-exports.hasGlobStar = hasGlobStar;
-/**
- * Return true if provided pattern ends with slash and globstar.
- */
-function endsWithSlashGlobStar(pattern) {
-    return pattern.endsWith('/' + GLOBSTAR);
-}
-exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
-/**
- * Returns «true» when pattern ends with a slash and globstar or the last partial of the pattern is static pattern.
- */
-function isAffectDepthOfReadingPattern(pattern) {
-    var basename = path.basename(pattern);
-    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
-}
-exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
-/**
- * Return naive depth of provided pattern without depth of the base directory.
- */
-function getNaiveDepth(pattern) {
-    var base = getBaseDirectory(pattern);
-    var patternDepth = pattern.split('/').length;
-    var 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;
-/**
- * Return max naive depth of provided patterns without depth of the base directory.
- */
-function getMaxNaivePatternsDepth(patterns) {
-    return patterns.reduce(function (max, pattern) {
-        var depth = getNaiveDepth(pattern);
-        return depth > max ? depth : max;
-    }, 0);
-}
-exports.getMaxNaivePatternsDepth = getMaxNaivePatternsDepth;
-/**
- * Make RegExp for provided pattern.
- */
-function makeRe(pattern, options) {
-    return micromatch.makeRe(pattern, options);
-}
-exports.makeRe = makeRe;
-/**
- * Convert patterns to regexps.
- */
-function convertPatternsToRe(patterns, options) {
-    return patterns.map(function (pattern) { return makeRe(pattern, options); });
-}
-exports.convertPatternsToRe = convertPatternsToRe;
-/**
- * Returns true if the entry match any of the given RegExp's.
- */
-function matchAny(entry, patternsRe) {
-    return patternsRe.some(function (patternRe) { return patternRe.test(entry); });
-}
-exports.matchAny = matchAny;
-
-
-/***/ }),
-/* 605 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var path = __webpack_require__(4);
-var isglob = __webpack_require__(606);
-var pathDirname = __webpack_require__(607);
-var isWin32 = __webpack_require__(243).platform() === 'win32';
-
-module.exports = function globParent(str) {
-	// flip windows path separators
-	if (isWin32 && str.indexOf('/') < 0) str = str.split('\\').join('/');
-
-	// special case for strings ending in enclosure containing path separator
-	if (/[\{\[].*[\/]*.*[\}\]]$/.test(str)) str += '/';
-
-	// preserves full path in case of trailing path separator
-	str += 'a';
-
-	// remove path parts that are globby
-	do {str = pathDirname.posix(str)}
-	while (isglob(str) || /(^|[^\\])([\{\[]|\([^\)]+$)/.test(str));
-
-	// remove escape chars and return result
-	return str.replace(/\\([\*\?\|\[\]\(\)\{\}])/g, '$1');
-};
-
-
-/***/ }),
-/* 606 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-var isExtglob = __webpack_require__(388);
-
-module.exports = function isGlob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
-
-  if (isExtglob(str)) return true;
-
-  var regex = /(\\).|([*?]|\[.*\]|\{.*\}|\(.*\|.*\)|^!)/;
-  var match;
-
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
-  return false;
-};
-
-
-/***/ }),
-/* 607 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var path = __webpack_require__(4);
-var inspect = __webpack_require__(234).inspect;
-
-function assertPath(path) {
-  if (typeof path !== 'string') {
-    throw new TypeError('Path must be a string. Received ' + inspect(path));
-  }
-}
-
-function posix(path) {
-  assertPath(path);
-  if (path.length === 0)
-    return '.';
-  var code = path.charCodeAt(0);
-  var hasRoot = (code === 47/*/*/);
-  var end = -1;
-  var matchedSlash = true;
-  for (var i = path.length - 1; i >= 1; --i) {
-    code = path.charCodeAt(i);
-    if (code === 47/*/*/) {
-      if (!matchedSlash) {
-        end = i;
-        break;
-      }
-    } else {
-      // We saw the first non-path separator
-      matchedSlash = false;
-    }
-  }
-
-  if (end === -1)
-    return hasRoot ? '/' : '.';
-  if (hasRoot && end === 1)
-    return '//';
-  return path.slice(0, end);
-}
-
-function win32(path) {
-  assertPath(path);
-  var len = path.length;
-  if (len === 0)
-    return '.';
-  var rootEnd = -1;
-  var end = -1;
-  var matchedSlash = true;
-  var offset = 0;
-  var code = path.charCodeAt(0);
-
-  // Try to match a root
-  if (len > 1) {
-    if (code === 47/*/*/ || code === 92/*\*/) {
-      // Possible UNC root
-
-      rootEnd = offset = 1;
-
-      code = path.charCodeAt(1);
-      if (code === 47/*/*/ || code === 92/*\*/) {
-        // Matched double path separator at beginning
-        var j = 2;
-        var last = j;
-        // Match 1 or more non-path separators
-        for (; j < len; ++j) {
-          code = path.charCodeAt(j);
-          if (code === 47/*/*/ || code === 92/*\*/)
-            break;
-        }
-        if (j < len && j !== last) {
-          // Matched!
-          last = j;
-          // Match 1 or more path separators
-          for (; j < len; ++j) {
-            code = path.charCodeAt(j);
-            if (code !== 47/*/*/ && code !== 92/*\*/)
-              break;
-          }
-          if (j < len && j !== last) {
-            // Matched!
-            last = j;
-            // Match 1 or more non-path separators
-            for (; j < len; ++j) {
-              code = path.charCodeAt(j);
-              if (code === 47/*/*/ || code === 92/*\*/)
-                break;
-            }
-            if (j === len) {
-              // We matched a UNC root only
-              return path;
-            }
-            if (j !== last) {
-              // We matched a UNC root with leftovers
-
-              // Offset by 1 to include the separator after the UNC root to
-              // treat it as a "normal root" on top of a (UNC) root
-              rootEnd = offset = j + 1;
-            }
-          }
-        }
-      }
-    } else if ((code >= 65/*A*/ && code <= 90/*Z*/) ||
-               (code >= 97/*a*/ && code <= 122/*z*/)) {
-      // Possible device root
-
-      code = path.charCodeAt(1);
-      if (path.charCodeAt(1) === 58/*:*/) {
-        rootEnd = offset = 2;
-        if (len > 2) {
-          code = path.charCodeAt(2);
-          if (code === 47/*/*/ || code === 92/*\*/)
-            rootEnd = offset = 3;
-        }
-      }
-    }
-  } else if (code === 47/*/*/ || code === 92/*\*/) {
-    return path[0];
-  }
-
-  for (var i = len - 1; i >= offset; --i) {
-    code = path.charCodeAt(i);
-    if (code === 47/*/*/ || code === 92/*\*/) {
-      if (!matchedSlash) {
-        end = i;
-        break;
-      }
-    } else {
-      // We saw the first non-path separator
-      matchedSlash = false;
-    }
-  }
-
-  if (end === -1) {
-    if (rootEnd === -1)
-      return '.';
-    else
-      end = rootEnd;
-  }
-  return path.slice(0, end);
-}
-
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
-
-
-/***/ }),
-/* 608 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Module dependencies
- */
-
-var util = __webpack_require__(234);
-var braces = __webpack_require__(609);
-var toRegex = __webpack_require__(610);
-var extend = __webpack_require__(722);
-
-/**
- * Local dependencies
- */
-
-var compilers = __webpack_require__(724);
-var parsers = __webpack_require__(750);
-var cache = __webpack_require__(751);
-var utils = __webpack_require__(752);
-var MAX_LENGTH = 1024 * 64;
-
-/**
- * The main function takes a list of strings and one or more
- * glob patterns to use for matching.
- *
- * ```js
- * var mm = require('micromatch');
- * mm(list, patterns[, options]);
- *
- * console.log(mm(['a.js', 'a.txt'], ['*.js']));
- * //=> [ 'a.js' ]
- * ```
- * @param {Array} `list` A list of strings to match
- * @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 {Array} Returns an array of matches
- * @summary false
- * @api public
- */
-
-function micromatch(list, patterns, options) {
-  patterns = utils.arrayify(patterns);
-  list = utils.arrayify(list);
-
-  var len = patterns.length;
-  if (list.length === 0 || len === 0) {
-    return [];
-  }
-
-  if (len === 1) {
-    return micromatch.match(list, patterns[0], options);
-  }
-
-  var omit = [];
-  var keep = [];
-  var idx = -1;
-
-  while (++idx < len) {
-    var pattern = patterns[idx];
-
-    if (typeof pattern === 'string' && pattern.charCodeAt(0) === 33 /* ! */) {
-      omit.push.apply(omit, micromatch.match(list, pattern.slice(1), options));
-    } else {
-      keep.push.apply(keep, micromatch.match(list, pattern, options));
-    }
-  }
-
-  var matches = utils.diff(keep, omit);
-  if (!options || options.nodupes !== false) {
-    return utils.unique(matches);
-  }
-
-  return matches;
-}
-
-/**
- * Similar to the main function, but `pattern` must be a string.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.match(list, pattern[, options]);
- *
- * console.log(mm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
- * //=> ['a.a', 'a.aa']
- * ```
- * @param {Array} `list` Array of strings to match
- * @param {String} `pattern` 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 matches
- * @api public
- */
-
-micromatch.match = function(list, pattern, options) {
-  if (Array.isArray(pattern)) {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  var unixify = utils.unixify(options);
-  var isMatch = memoize('match', pattern, options, micromatch.matcher);
-  var matches = [];
-
-  list = utils.arrayify(list);
-  var len = list.length;
-  var idx = -1;
-
-  while (++idx < len) {
-    var ele = list[idx];
-    if (ele === pattern || isMatch(ele)) {
-      matches.push(utils.value(ele, unixify, options));
-    }
-  }
-
-  // if no options were passed, uniquify results and return
-  if (typeof options === 'undefined') {
-    return utils.unique(matches);
-  }
-
-  if (matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
-    if (options.nonull === true || options.nullglob === true) {
-      return [options.unescape ? utils.unescape(pattern) : pattern];
-    }
-  }
-
-  // if `opts.ignore` was defined, diff ignored list
-  if (options.ignore) {
-    matches = micromatch.not(matches, options.ignore, options);
-  }
-
-  return options.nodupes !== false ? utils.unique(matches) : matches;
-};
-
-/**
- * Returns true if the specified `string` matches the given glob `pattern`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.isMatch(string, pattern[, options]);
- *
- * console.log(mm.isMatch('a.a', '*.a'));
- * //=> true
- * console.log(mm.isMatch('a.b', '*.a'));
- * //=> false
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` 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 string matches the glob pattern.
- * @api public
- */
-
-micromatch.isMatch = function(str, pattern, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (isEmptyString(str) || isEmptyString(pattern)) {
-    return false;
-  }
-
-  var equals = utils.equalsPattern(options);
-  if (equals(str)) {
-    return true;
-  }
-
-  var isMatch = memoize('isMatch', pattern, options, micromatch.matcher);
-  return isMatch(str);
-};
-
-/**
- * Returns true if some of the strings in the given `list` match any of the
- * given glob `patterns`.
- *
- * ```js
- * var 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 = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
-  for (var i = 0; i < list.length; i++) {
-    if (micromatch(list[i], patterns, options).length === 1) {
-      return true;
-    }
-  }
-  return false;
-};
-
-/**
- * Returns true if every string in the given `list` matches
- * any of the given glob `patterns`.
- *
- * ```js
- * var 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 = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
-  for (var i = 0; i < list.length; i++) {
-    if (micromatch(list[i], patterns, options).length !== 1) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Returns true if **any** of the given glob `patterns`
- * match the specified `string`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.any(string, patterns[, options]);
- *
- * console.log(mm.any('a.a', ['b.*', '*.a']));
- * //=> true
- * console.log(mm.any('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) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
-
-micromatch.any = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (isEmptyString(str) || isEmptyString(patterns)) {
-    return false;
-  }
-
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
-
-  for (var i = 0; i < patterns.length; i++) {
-    if (micromatch.isMatch(str, patterns[i], options)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-/**
- * Returns true if **all** of the given `patterns` match
- * the specified string.
- *
- * ```js
- * var 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 = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
-  for (var i = 0; i < patterns.length; i++) {
-    if (!micromatch.isMatch(str, patterns[i], options)) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Returns a list of strings that _**do not match any**_ of the given `patterns`.
- *
- * ```js
- * var 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 = function(list, patterns, options) {
-  var opts = extend({}, options);
-  var ignore = opts.ignore;
-  delete opts.ignore;
-
-  var unixify = utils.unixify(opts);
-  list = utils.arrayify(list).map(unixify);
-
-  var matches = utils.diff(list, micromatch(list, patterns, opts));
-  if (ignore) {
-    matches = utils.diff(matches, micromatch(list, ignore));
-  }
-
-  return opts.nodupes !== false ? utils.unique(matches) : matches;
-};
-
-/**
- * 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 = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (typeof patterns === 'string') {
-    if (isEmptyString(str) || isEmptyString(patterns)) {
-      return false;
-    }
-
-    var equals = utils.equalsPattern(patterns, options);
-    if (equals(str)) {
-      return true;
-    }
-    var contains = utils.containsPattern(patterns, options);
-    if (contains(str)) {
-      return true;
-    }
-  }
-
-  var opts = extend({}, options, {contains: true});
-  return micromatch.any(str, patterns, opts);
-};
-
-/**
- * Returns true if the given pattern and options should enable
- * the `matchBase` option.
- * @return {Boolean}
- * @api private
- */
-
-micromatch.matchBase = function(pattern, options) {
-  if (pattern && pattern.indexOf('/') !== -1 || !options) return false;
-  return options.basename === true || options.matchBase === 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
- * var mm = require('micromatch');
- * mm.matchKeys(object, patterns[, options]);
- *
- * var 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 = function(obj, patterns, options) {
-  if (!utils.isObject(obj)) {
-    throw new TypeError('expected the first argument to be an object');
-  }
-  var keys = micromatch(Object.keys(obj), patterns, options);
-  return utils.pick(obj, keys);
-};
-
-/**
- * Returns a memoized 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
- * var mm = require('micromatch');
- * mm.matcher(pattern[, options]);
- *
- * var isMatch = mm.matcher('*.!(*a)');
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.b'));
- * //=> true
- * ```
- * @param {String} `pattern` Glob pattern
- * @param {Object} `options` See available [options](#options) for changing how matches are performed.
- * @return {Function} Returns a matcher function.
- * @api public
- */
-
-micromatch.matcher = function matcher(pattern, options) {
-  if (Array.isArray(pattern)) {
-    return compose(pattern, options, matcher);
-  }
-
-  // if pattern is a regex
-  if (pattern instanceof RegExp) {
-    return test(pattern);
-  }
-
-  // if pattern is invalid
-  if (!utils.isString(pattern)) {
-    throw new TypeError('expected pattern to be an array, string or regex');
-  }
-
-  // if pattern is a non-glob string
-  if (!utils.hasSpecialChars(pattern)) {
-    if (options && options.nocase === true) {
-      pattern = pattern.toLowerCase();
-    }
-    return utils.matchPath(pattern, options);
-  }
-
-  // if pattern is a glob string
-  var re = micromatch.makeRe(pattern, options);
-
-  // if `options.matchBase` or `options.basename` is defined
-  if (micromatch.matchBase(pattern, options)) {
-    return utils.matchBasename(re, options);
-  }
-
-  function test(regex) {
-    var equals = utils.equalsPattern(options);
-    var unixify = utils.unixify(options);
-
-    return function(str) {
-      if (equals(str)) {
-        return true;
-      }
-
-      if (regex.test(unixify(str))) {
-        return true;
-      }
-      return false;
-    };
-  }
-
-  var fn = test(re);
-  Object.defineProperty(fn, 'result', {
-    configurable: true,
-    enumerable: false,
-    value: re.result
-  });
-  return fn;
-};
-
-/**
- * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
- *
- * ```js
- * var 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} `pattern` Glob pattern to use for matching.
- * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
- * @api public
- */
-
-micromatch.capture = function(pattern, str, options) {
-  var re = micromatch.makeRe(pattern, extend({capture: true}, options));
-  var unixify = utils.unixify(options);
-
-  function match() {
-    return function(string) {
-      var match = re.exec(unixify(string));
-      if (!match) {
-        return null;
-      }
-
-      return match.slice(1);
-    };
-  }
-
-  var capture = memoize('capture', pattern, options, match);
-  return capture(str);
-};
-
-/**
- * Create a regular expression from the given glob `pattern`.
- *
- * ```js
- * var 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` See available [options](#options) for changing how matches are performed.
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
-
-micromatch.makeRe = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
-  }
-
-  function makeRe() {
-    var result = micromatch.create(pattern, options);
-    var ast_array = [];
-    var output = result.map(function(obj) {
-      obj.ast.state = obj.state;
-      ast_array.push(obj.ast);
-      return obj.output;
-    });
-
-    var regex = toRegex(output.join('|'), options);
-    Object.defineProperty(regex, 'result', {
-      configurable: true,
-      enumerable: false,
-      value: ast_array
-    });
-    return regex;
-  }
-
-  return memoize('makeRe', pattern, options, makeRe);
-};
-
-/**
- * Expand the given brace `pattern`.
- *
- * ```js
- * var mm = require('micromatch');
- * console.log(mm.braces('foo/{a,b}/bar'));
- * //=> ['foo/(a|b)/bar']
- *
- * console.log(mm.braces('foo/{a,b}/bar', {expand: true}));
- * //=> ['foo/(a|b)/bar']
- * ```
- * @param {String} `pattern` String with brace pattern to expand.
- * @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 = function(pattern, options) {
-  if (typeof pattern !== 'string' && !Array.isArray(pattern)) {
-    throw new TypeError('expected pattern to be an array or string');
-  }
-
-  function expand() {
-    if (options && options.nobrace === true || !/\{.*\}/.test(pattern)) {
-      return utils.arrayify(pattern);
-    }
-    return braces(pattern, options);
-  }
-
-  return memoize('braces', pattern, options, expand);
-};
-
-/**
- * Proxy to the [micromatch.braces](#method), for parity with
- * minimatch.
- */
-
-micromatch.braceExpand = function(pattern, options) {
-  var opts = extend({}, options, {expand: true});
-  return micromatch.braces(pattern, opts);
-};
-
-/**
- * Parses the given glob `pattern` and returns an array of abstract syntax
- * trees (ASTs), with the compiled `output` and optional source `map` on
- * each AST.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.create(pattern[, options]);
- *
- * console.log(mm.create('abc/*.js'));
- * // [{ options: { source: 'string', sourcemap: true },
- * //   state: {},
- * //   compilers:
- * //    { ... },
- * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
- * //   ast:
- * //    { type: 'root',
- * //      errors: [],
- * //      nodes:
- * //       [ ... ],
- * //      dot: false,
- * //      input: 'abc/*.js' },
- * //   parsingErrors: [],
- * //   map:
- * //    { version: 3,
- * //      sources: [ 'string' ],
- * //      names: [],
- * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
- * //      sourcesContent: [ 'abc/*.js' ] },
- * //   position: { line: 1, column: 28 },
- * //   content: {},
- * //   files: {},
- * //   idx: 6 }]
- * ```
- * @param {String} `pattern` Glob pattern to parse and compile.
- * @param {Object} `options` Any [options](#options) to change how parsing and compiling is performed.
- * @return {Object} Returns an object with the parsed AST, compiled string and optional source map.
- * @api public
- */
-
-micromatch.create = function(pattern, options) {
-  return memoize('create', pattern, options, function() {
-    function create(str, opts) {
-      return micromatch.compile(micromatch.parse(str, opts), opts);
-    }
-
-    pattern = micromatch.braces(pattern, options);
-    var len = pattern.length;
-    var idx = -1;
-    var res = [];
-
-    while (++idx < len) {
-      res.push(create(pattern[idx], options));
-    }
-    return res;
-  });
-};
-
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.parse(pattern[, options]);
- *
- * var ast = mm.parse('a/{b,c}/d');
- * console.log(ast);
- * // { type: 'root',
- * //   errors: [],
- * //   input: 'a/{b,c}/d',
- * //   nodes:
- * //    [ { type: 'bos', val: '' },
- * //      { type: 'text', val: 'a/' },
- * //      { type: 'brace',
- * //        nodes:
- * //         [ { type: 'brace.open', val: '{' },
- * //           { type: 'text', val: 'b,c' },
- * //           { type: 'brace.close', val: '}' } ] },
- * //      { type: 'text', val: '/d' },
- * //      { type: 'eos', val: '' } ] }
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object} Returns an AST
- * @api public
- */
-
-micromatch.parse = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  function parse() {
-    var snapdragon = utils.instantiate(null, options);
-    parsers(snapdragon, options);
-
-    var ast = snapdragon.parse(pattern, options);
-    utils.define(ast, 'snapdragon', snapdragon);
-    ast.input = pattern;
-    return ast;
-  }
-
-  return memoize('parse', pattern, options, parse);
-};
-
-/**
- * Compile the given `ast` or string with the given `options`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.compile(ast[, options]);
- *
- * var ast = mm.parse('a/{b,c}/d');
- * console.log(mm.compile(ast));
- * // { options: { source: 'string' },
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      brace: [Function],
- * //      'brace.open': [Function],
- * //      text: [Function],
- * //      'brace.close': [Function] },
- * //   output: [ 'a/(b|c)/d' ],
- * //   ast:
- * //    { ... },
- * //   parsingErrors: [] }
- * ```
- * @param {Object|String} `ast`
- * @param {Object} `options`
- * @return {Object} Returns an object that has an `output` property with the compiled string.
- * @api public
- */
-
-micromatch.compile = function(ast, options) {
-  if (typeof ast === 'string') {
-    ast = micromatch.parse(ast, options);
-  }
-
-  return memoize('compile', ast.input, options, function() {
-    var snapdragon = utils.instantiate(ast, options);
-    compilers(snapdragon, options);
-    return snapdragon.compile(ast, options);
-  });
-};
-
-/**
- * Clear the regex cache.
- *
- * ```js
- * mm.clearCache();
- * ```
- * @api public
- */
-
-micromatch.clearCache = function() {
-  micromatch.cache.caches = {};
-};
-
-/**
- * Returns true if the given value is effectively an empty string
- */
-
-function isEmptyString(val) {
-  return String(val) === '' || String(val) === './';
-}
-
-/**
- * Compose a matcher function with the given patterns.
- * This allows matcher functions to be compiled once and
- * called multiple times.
- */
-
-function compose(patterns, options, matcher) {
-  var matchers;
-
-  return memoize('compose', String(patterns), options, function() {
-    return function(file) {
-      // delay composition until it's invoked the first time,
-      // after that it won't be called again
-      if (!matchers) {
-        matchers = [];
-        for (var i = 0; i < patterns.length; i++) {
-          matchers.push(matcher(patterns[i], options));
-        }
-      }
-
-      var len = matchers.length;
-      while (len--) {
-        if (matchers[len](file) === true) {
-          return true;
-        }
-      }
-      return false;
-    };
-  });
-}
-
-/**
- * Memoize a generated regex or function. A unique key is generated
- * from the `type` (usually method name), the `pattern`, and
- * user-defined options.
- */
-
-function memoize(type, pattern, options, fn) {
-  var key = utils.createKey(type + '=' + pattern, options);
-
-  if (options && options.cache === false) {
-    return fn(pattern, options);
-  }
-
-  if (cache.has(type, key)) {
-    return cache.get(type, key);
-  }
-
-  var val = fn(pattern, options);
-  cache.set(type, key, val);
-  return val;
-}
-
-/**
- * Expose compiler, parser and cache on `micromatch`
- */
-
-micromatch.compilers = compilers;
-micromatch.parsers = parsers;
-micromatch.caches = cache.caches;
-
-/**
- * Expose `micromatch`
- * @type {Function}
- */
-
-module.exports = micromatch;
-
-
-/***/ }),
-/* 609 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Module dependencies
- */
-
-var toRegex = __webpack_require__(610);
-var unique = __webpack_require__(630);
-var extend = __webpack_require__(631);
-
-/**
- * Local dependencies
- */
-
-var compilers = __webpack_require__(633);
-var parsers = __webpack_require__(648);
-var Braces = __webpack_require__(653);
-var utils = __webpack_require__(634);
-var MAX_LENGTH = 1024 * 64;
-var cache = {};
-
-/**
- * Convert the given `braces` pattern into a regex-compatible string. By default, only one string is generated for every input string. Set `options.expand` to true to return an array of patterns (similar to Bash or minimatch. Before using `options.expand`, it's recommended that you read the [performance notes](#performance)).
- *
- * ```js
- * var braces = require('braces');
- * console.log(braces('{a,b,c}'));
- * //=> ['(a|b|c)']
- *
- * console.log(braces('{a,b,c}', {expand: true}));
- * //=> ['a', 'b', 'c']
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-function braces(pattern, options) {
-  var key = utils.createKey(String(pattern), options);
-  var arr = [];
-
-  var disabled = options && options.cache === false;
-  if (!disabled && cache.hasOwnProperty(key)) {
-    return cache[key];
-  }
-
-  if (Array.isArray(pattern)) {
-    for (var i = 0; i < pattern.length; i++) {
-      arr.push.apply(arr, braces.create(pattern[i], options));
-    }
-  } else {
-    arr = braces.create(pattern, options);
-  }
-
-  if (options && options.nodupes === true) {
-    arr = unique(arr);
-  }
-
-  if (!disabled) {
-    cache[key] = arr;
-  }
-  return arr;
-}
-
-/**
- * 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 [.optimize](#optimize) instead.
- *
- * ```js
- * var 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 = function(pattern, options) {
-  return braces.create(pattern, extend({}, options, {expand: true}));
-};
-
-/**
- * Expands a brace pattern into a regex-compatible, optimized string. This method is called by the main [braces](#braces) function by default.
- *
- * ```js
- * var braces = require('braces');
- * console.log(braces.expand('a/{b,c}/d'));
- * //=> ['a/(b|c)/d']
- * ```
- * @param {String} `pattern` Brace pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
-
-braces.optimize = function(pattern, options) {
-  return braces.create(pattern, options);
-};
-
-/**
- * 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
- * var braces = require('braces');
- * console.log(braces.create('user-{200..300}/project-{a,b,c}-{1..10}'))
- * //=> 'user-(20[0-9]|2[1-9][0-9]|300)/project-(a|b|c)-([1-9]|10)'
- * ```
- * @param {String} `pattern` Brace pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
-
-braces.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  var maxLength = (options && options.maxLength) || MAX_LENGTH;
-  if (pattern.length >= maxLength) {
-    throw new Error('expected pattern to be less than ' + maxLength + ' characters');
-  }
-
-  function create() {
-    if (pattern === '' || pattern.length < 3) {
-      return [pattern];
-    }
-
-    if (utils.isEmptySets(pattern)) {
-      return [];
-    }
-
-    if (utils.isQuotedString(pattern)) {
-      return [pattern.slice(1, -1)];
-    }
-
-    var proto = new Braces(options);
-    var result = !options || options.expand !== true
-      ? proto.optimize(pattern, options)
-      : proto.expand(pattern, options);
-
-    // get the generated pattern(s)
-    var arr = result.output;
-
-    // filter out empty strings if specified
-    if (options && options.noempty === true) {
-      arr = arr.filter(Boolean);
-    }
-
-    // filter out duplicates if specified
-    if (options && options.nodupes === true) {
-      arr = unique(arr);
-    }
-
-    Object.defineProperty(arr, 'result', {
-      enumerable: false,
-      value: result
-    });
-
-    return arr;
-  }
-
-  return memoize('create', pattern, options, create);
-};
-
-/**
- * Create a regular expression from the given string `pattern`.
- *
- * ```js
- * var braces = require('braces');
- *
- * console.log(braces.makeRe('id-{200..300}'));
- * //=> /^(?:id-(20[0-9]|2[1-9][0-9]|300))$/
- * ```
- * @param {String} `pattern` The pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
-
-braces.makeRe = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  var maxLength = (options && options.maxLength) || MAX_LENGTH;
-  if (pattern.length >= maxLength) {
-    throw new Error('expected pattern to be less than ' + maxLength + ' characters');
-  }
-
-  function makeRe() {
-    var arr = braces(pattern, options);
-    var opts = extend({strictErrors: false}, options);
-    return toRegex(arr, opts);
-  }
-
-  return memoize('makeRe', pattern, options, makeRe);
-};
-
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * var braces = require('braces');
- * var ast = braces.parse('a/{b,c}/d');
- * console.log(ast);
- * // { type: 'root',
- * //   errors: [],
- * //   input: 'a/{b,c}/d',
- * //   nodes:
- * //    [ { type: 'bos', val: '' },
- * //      { type: 'text', val: 'a/' },
- * //      { type: 'brace',
- * //        nodes:
- * //         [ { type: 'brace.open', val: '{' },
- * //           { type: 'text', val: 'b,c' },
- * //           { type: 'brace.close', val: '}' } ] },
- * //      { type: 'text', val: '/d' },
- * //      { type: 'eos', val: '' } ] }
- * ```
- * @param {String} `pattern` Brace pattern to parse
- * @param {Object} `options`
- * @return {Object} Returns an AST
- * @api public
- */
-
-braces.parse = function(pattern, options) {
-  var proto = new Braces(options);
-  return proto.parse(pattern, options);
-};
-
-/**
- * Compile the given `ast` or string with the given `options`.
- *
- * ```js
- * var braces = require('braces');
- * var ast = braces.parse('a/{b,c}/d');
- * console.log(braces.compile(ast));
- * // { options: { source: 'string' },
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      brace: [Function],
- * //      'brace.open': [Function],
- * //      text: [Function],
- * //      'brace.close': [Function] },
- * //   output: [ 'a/(b|c)/d' ],
- * //   ast:
- * //    { ... },
- * //   parsingErrors: [] }
- * ```
- * @param {Object|String} `ast` AST from [.parse](#parse). If a string is passed it will be parsed first.
- * @param {Object} `options`
- * @return {Object} Returns an object that has an `output` property with the compiled string.
- * @api public
- */
-
-braces.compile = function(ast, options) {
-  var proto = new Braces(options);
-  return proto.compile(ast, options);
-};
-
-/**
- * Clear the regex cache.
- *
- * ```js
- * braces.clearCache();
- * ```
- * @api public
- */
-
-braces.clearCache = function() {
-  cache = braces.cache = {};
-};
-
-/**
- * Memoize a generated regex or function. A unique key is generated
- * from the method name, pattern, and user-defined options. Set
- * options.memoize to false to disable.
- */
-
-function memoize(type, pattern, options, fn) {
-  var key = utils.createKey(type + ':' + pattern, options);
-  var disabled = options && options.cache === false;
-  if (disabled) {
-    braces.clearCache();
-    return fn(pattern, options);
-  }
-
-  if (cache.hasOwnProperty(key)) {
-    return cache[key];
-  }
-
-  var res = fn(pattern, options);
-  cache[key] = res;
-  return res;
-}
-
-/**
- * Expose `Braces` constructor and methods
- * @type {Function}
- */
-
-braces.Braces = Braces;
-braces.compilers = compilers;
-braces.parsers = parsers;
-braces.cache = cache;
-
-/**
- * Expose `braces`
- * @type {Function}
- */
-
-module.exports = braces;
-
-
-/***/ }),
-/* 610 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var safe = __webpack_require__(611);
-var define = __webpack_require__(617);
-var extend = __webpack_require__(623);
-var not = __webpack_require__(627);
-var MAX_LENGTH = 1024 * 64;
-
-/**
- * Session cache
- */
-
-var cache = {};
-
-/**
- * Create a regular expression from the given `pattern` string.
- *
- * @param {String|RegExp} `pattern` Pattern can be a string or regular expression.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
-
-module.exports = function(patterns, options) {
-  if (!Array.isArray(patterns)) {
-    return makeRe(patterns, options);
-  }
-  return makeRe(patterns.join('|'), options);
-};
-
-/**
- * Create a regular expression from the given `pattern` string.
- *
- * @param {String|RegExp} `pattern` Pattern can be a string or regular expression.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
-
-function makeRe(pattern, options) {
-  if (pattern instanceof RegExp) {
-    return pattern;
-  }
-
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
-  }
-
-  var key = pattern;
-  // do this before shallow cloning options, it's a lot faster
-  if (!options || (options && options.cache !== false)) {
-    key = createKey(pattern, options);
-
-    if (cache.hasOwnProperty(key)) {
-      return cache[key];
-    }
-  }
-
-  var opts = extend({}, options);
-  if (opts.contains === true) {
-    if (opts.negate === true) {
-      opts.strictNegate = false;
-    } else {
-      opts.strict = false;
-    }
-  }
-
-  if (opts.strict === false) {
-    opts.strictOpen = false;
-    opts.strictClose = false;
-  }
-
-  var open = opts.strictOpen !== false ? '^' : '';
-  var close = opts.strictClose !== false ? '$' : '';
-  var flags = opts.flags || '';
-  var regex;
-
-  if (opts.nocase === true && !/i/.test(flags)) {
-    flags += 'i';
-  }
-
-  try {
-    if (opts.negate || typeof opts.strictNegate === 'boolean') {
-      pattern = not.create(pattern, opts);
-    }
-
-    var str = open + '(?:' + pattern + ')' + close;
-    regex = new RegExp(str, flags);
-
-    if (opts.safe === true && safe(regex) === false) {
-      throw new Error('potentially unsafe regular expression: ' + regex.source);
-    }
-
-  } catch (err) {
-    if (opts.strictErrors === true || opts.safe === true) {
-      err.key = key;
-      err.pattern = pattern;
-      err.originalOptions = options;
-      err.createdOptions = opts;
-      throw err;
-    }
-
-    try {
-      regex = new RegExp('^' + pattern.replace(/(\W)/g, '\\$1') + '$');
-    } catch (err) {
-      regex = /.^/; //<= match nothing
-    }
-  }
-
-  if (opts.cache !== false) {
-    memoize(regex, key, pattern, opts);
-  }
-  return regex;
-}
-
-/**
- * Memoize generated regex. This can result in dramatic speed improvements
- * and simplify debugging by adding options and pattern to the regex. It can be
- * disabled by passing setting `options.cache` to false.
- */
-
-function memoize(regex, key, pattern, options) {
-  define(regex, 'cached', true);
-  define(regex, 'pattern', pattern);
-  define(regex, 'options', options);
-  define(regex, 'key', key);
-  cache[key] = regex;
-}
-
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
-
-function createKey(pattern, options) {
-  if (!options) return pattern;
-  var key = pattern;
-  for (var prop in options) {
-    if (options.hasOwnProperty(prop)) {
-      key += ';' + prop + '=' + String(options[prop]);
-    }
-  }
-  return key;
-}
-
-/**
- * Expose `makeRe`
- */
-
-module.exports.makeRe = makeRe;
-
-
-/***/ }),
-/* 611 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var parse = __webpack_require__(612);
-var types = parse.types;
-
-module.exports = function (re, opts) {
-    if (!opts) opts = {};
-    var replimit = opts.limit === undefined ? 25 : opts.limit;
-    
-    if (isRegExp(re)) re = re.source;
-    else if (typeof re !== 'string') re = String(re);
-    
-    try { re = parse(re) }
-    catch (err) { return false }
-    
-    var reps = 0;
-    return (function walk (node, starHeight) {
-        if (node.type === types.REPETITION) {
-            starHeight ++;
-            reps ++;
-            if (starHeight > 1) return false;
-            if (reps > replimit) return false;
-        }
-        
-        if (node.options) {
-            for (var i = 0, len = node.options.length; i < len; i++) {
-                var ok = walk({ stack: node.options[i] }, starHeight);
-                if (!ok) return false;
-            }
-        }
-        var stack = node.stack || (node.value && node.value.stack);
-        if (!stack) return true;
-        
-        for (var i = 0; i < stack.length; i++) {
-            var ok = walk(stack[i], starHeight);
-            if (!ok) return false;
-        }
-        
-        return true;
-    })(re, 0);
-};
-
-function isRegExp (x) {
-    return {}.toString.call(x) === '[object RegExp]';
-}
-
-
-/***/ }),
-/* 612 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var util      = __webpack_require__(613);
-var types     = __webpack_require__(614);
-var sets      = __webpack_require__(615);
-var positions = __webpack_require__(616);
-
-
-module.exports = function(regexpStr) {
-  var i = 0, l, c,
-      start = { type: types.ROOT, stack: []},
-
-      // Keep track of last clause/group and stack.
-      lastGroup = start,
-      last = start.stack,
-      groupStack = [];
-
-
-  var repeatErr = function(i) {
-    util.error(regexpStr, 'Nothing to repeat at column ' + (i - 1));
-  };
-
-  // Decode a few escaped characters.
-  var str = util.strToChars(regexpStr);
-  l = str.length;
-
-  // Iterate through each character in string.
-  while (i < l) {
-    c = str[i++];
-
-    switch (c) {
-      // Handle escaped characters, inclues a few sets.
-      case '\\':
-        c = str[i++];
-
-        switch (c) {
-          case 'b':
-            last.push(positions.wordBoundary());
-            break;
-
-          case 'B':
-            last.push(positions.nonWordBoundary());
-            break;
-
-          case 'w':
-            last.push(sets.words());
-            break;
-
-          case 'W':
-            last.push(sets.notWords());
-            break;
-
-          case 'd':
-            last.push(sets.ints());
-            break;
-
-          case 'D':
-            last.push(sets.notInts());
-            break;
-
-          case 's':
-            last.push(sets.whitespace());
-            break;
-
-          case 'S':
-            last.push(sets.notWhitespace());
-            break;
-
-          default:
-            // Check if c is integer.
-            // In which case it's a reference.
-            if (/\d/.test(c)) {
-              last.push({ type: types.REFERENCE, value: parseInt(c, 10) });
-
-            // Escaped character.
-            } else {
-              last.push({ type: types.CHAR, value: c.charCodeAt(0) });
-            }
-        }
-
-        break;
-
-
-      // Positionals.
-      case '^':
-          last.push(positions.begin());
-        break;
-
-      case '$':
-          last.push(positions.end());
-        break;
-
-
-      // Handle custom sets.
-      case '[':
-        // Check if this class is 'anti' i.e. [^abc].
-        var not;
-        if (str[i] === '^') {
-          not = true;
-          i++;
-        } else {
-          not = false;
-        }
-
-        // Get all the characters in class.
-        var classTokens = util.tokenizeClass(str.slice(i), regexpStr);
-
-        // Increase index by length of class.
-        i += classTokens[1];
-        last.push({
-          type: types.SET,
-          set: classTokens[0],
-          not: not,
-        });
-
-        break;
-
-
-      // Class of any character except \n.
-      case '.':
-        last.push(sets.anyChar());
-        break;
-
-
-      // Push group onto stack.
-      case '(':
-        // Create group.
-        var group = {
-          type: types.GROUP,
-          stack: [],
-          remember: true,
-        };
-
-        c = str[i];
-
-        // If if this is a special kind of group.
-        if (c === '?') {
-          c = str[i + 1];
-          i += 2;
-
-          // Match if followed by.
-          if (c === '=') {
-            group.followedBy = true;
-
-          // Match if not followed by.
-          } else if (c === '!') {
-            group.notFollowedBy = true;
-
-          } else if (c !== ':') {
-            util.error(regexpStr,
-              'Invalid group, character \'' + c +
-              '\' after \'?\' at column ' + (i - 1));
-          }
-
-          group.remember = false;
-        }
-
-        // Insert subgroup into current group stack.
-        last.push(group);
-
-        // Remember the current group for when the group closes.
-        groupStack.push(lastGroup);
-
-        // Make this new group the current group.
-        lastGroup = group;
-        last = group.stack;
-        break;
-
-
-      // Pop group out of stack.
-      case ')':
-        if (groupStack.length === 0) {
-          util.error(regexpStr, 'Unmatched ) at column ' + (i - 1));
-        }
-        lastGroup = groupStack.pop();
-
-        // Check if this group has a PIPE.
-        // To get back the correct last stack.
-        last = lastGroup.options ?
-          lastGroup.options[lastGroup.options.length - 1] : lastGroup.stack;
-        break;
-
-
-      // Use pipe character to give more choices.
-      case '|':
-        // Create array where options are if this is the first PIPE
-        // in this clause.
-        if (!lastGroup.options) {
-          lastGroup.options = [lastGroup.stack];
-          delete lastGroup.stack;
-        }
-
-        // Create a new stack and add to options for rest of clause.
-        var stack = [];
-        lastGroup.options.push(stack);
-        last = stack;
-        break;
-
-
-      // Repetition.
-      // For every repetition, remove last element from last stack
-      // then insert back a RANGE object.
-      // This design is chosen because there could be more than
-      // one repetition symbols in a regex i.e. `a?+{2,3}`.
-      case '{':
-        var rs = /^(\d+)(,(\d+)?)?\}/.exec(str.slice(i)), min, max;
-        if (rs !== null) {
-          if (last.length === 0) {
-            repeatErr(i);
-          }
-          min = parseInt(rs[1], 10);
-          max = rs[2] ? rs[3] ? parseInt(rs[3], 10) : Infinity : min;
-          i += rs[0].length;
-
-          last.push({
-            type: types.REPETITION,
-            min: min,
-            max: max,
-            value: last.pop(),
-          });
-        } else {
-          last.push({
-            type: types.CHAR,
-            value: 123,
-          });
-        }
-        break;
-
-      case '?':
-        if (last.length === 0) {
-          repeatErr(i);
-        }
-        last.push({
-          type: types.REPETITION,
-          min: 0,
-          max: 1,
-          value: last.pop(),
-        });
-        break;
-
-      case '+':
-        if (last.length === 0) {
-          repeatErr(i);
-        }
-        last.push({
-          type: types.REPETITION,
-          min: 1,
-          max: Infinity,
-          value: last.pop(),
-        });
-        break;
-
-      case '*':
-        if (last.length === 0) {
-          repeatErr(i);
-        }
-        last.push({
-          type: types.REPETITION,
-          min: 0,
-          max: Infinity,
-          value: last.pop(),
-        });
-        break;
-
-
-      // Default is a character that is not `\[](){}?+*^$`.
-      default:
-        last.push({
-          type: types.CHAR,
-          value: c.charCodeAt(0),
-        });
-    }
-
-  }
-
-  // Check if any groups have not been closed.
-  if (groupStack.length !== 0) {
-    util.error(regexpStr, 'Unterminated group');
-  }
-
-  return start;
-};
-
-module.exports.types = types;
-
-
-/***/ }),
-/* 613 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var types = __webpack_require__(614);
-var sets  = __webpack_require__(615);
-
-
-// All of these are private and only used by randexp.
-// It's assumed that they will always be called with the correct input.
-
-var CTRL = '@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^ ?';
-var SLSH = { '0': 0, 't': 9, 'n': 10, 'v': 11, 'f': 12, 'r': 13 };
-
-/**
- * Finds character representations in str and convert all to
- * their respective characters
- *
- * @param {String} str
- * @return {String}
- */
-exports.strToChars = function(str) {
-  /* jshint maxlen: false */
-  var chars_regex = /(\[\\b\])|(\\)?\\(?:u([A-F0-9]{4})|x([A-F0-9]{2})|(0?[0-7]{2})|c([@A-Z\[\\\]\^?])|([0tnvfr]))/g;
-  str = str.replace(chars_regex, function(s, b, lbs, a16, b16, c8, dctrl, eslsh) {
-    if (lbs) {
-      return s;
-    }
-
-    var code = b     ? 8 :
-               a16   ? parseInt(a16, 16) :
-               b16   ? parseInt(b16, 16) :
-               c8    ? parseInt(c8,   8) :
-               dctrl ? CTRL.indexOf(dctrl) :
-               SLSH[eslsh];
-
-    var c = String.fromCharCode(code);
-
-    // Escape special regex characters.
-    if (/[\[\]{}\^$.|?*+()]/.test(c)) {
-      c = '\\' + c;
-    }
-
-    return c;
-  });
-
-  return str;
-};
-
-
-/**
- * turns class into tokens
- * reads str until it encounters a ] not preceeded by a \
- *
- * @param {String} str
- * @param {String} regexpStr
- * @return {Array.<Array.<Object>, Number>}
- */
-exports.tokenizeClass = function(str, regexpStr) {
-  /* jshint maxlen: false */
-  var tokens = [];
-  var regexp = /\\(?:(w)|(d)|(s)|(W)|(D)|(S))|((?:(?:\\)(.)|([^\]\\]))-(?:\\)?([^\]]))|(\])|(?:\\)?(.)/g;
-  var rs, c;
-
-
-  while ((rs = regexp.exec(str)) != null) {
-    if (rs[1]) {
-      tokens.push(sets.words());
-
-    } else if (rs[2]) {
-      tokens.push(sets.ints());
-
-    } else if (rs[3]) {
-      tokens.push(sets.whitespace());
-
-    } else if (rs[4]) {
-      tokens.push(sets.notWords());
-
-    } else if (rs[5]) {
-      tokens.push(sets.notInts());
-
-    } else if (rs[6]) {
-      tokens.push(sets.notWhitespace());
-
-    } else if (rs[7]) {
-      tokens.push({
-        type: types.RANGE,
-        from: (rs[8] || rs[9]).charCodeAt(0),
-          to: rs[10].charCodeAt(0),
-      });
-
-    } else if (c = rs[12]) {
-      tokens.push({
-        type: types.CHAR,
-        value: c.charCodeAt(0),
-      });
-
-    } else {
-      return [tokens, regexp.lastIndex];
-    }
-  }
-
-  exports.error(regexpStr, 'Unterminated character class');
-};
-
-
-/**
- * Shortcut to throw errors.
- *
- * @param {String} regexp
- * @param {String} msg
- */
-exports.error = function(regexp, msg) {
-  throw new SyntaxError('Invalid regular expression: /' + regexp + '/: ' + msg);
-};
-
-
-/***/ }),
-/* 614 */
-/***/ (function(module, exports) {
-
-module.exports = {
-  ROOT       : 0,
-  GROUP      : 1,
-  POSITION   : 2,
-  SET        : 3,
-  RANGE      : 4,
-  REPETITION : 5,
-  REFERENCE  : 6,
-  CHAR       : 7,
-};
-
-
-/***/ }),
-/* 615 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var types = __webpack_require__(614);
-
-var INTS = function() {
- return [{ type: types.RANGE , from: 48, to: 57 }];
-};
-
-var WORDS = function() {
- return [
-    { type: types.CHAR, value: 95 },
-    { type: types.RANGE, from: 97, to: 122 },
-    { type: types.RANGE, from: 65, to: 90 }
-  ].concat(INTS());
-};
-
-var WHITESPACE = function() {
- return [
-    { type: types.CHAR, value: 9 },
-    { type: types.CHAR, value: 10 },
-    { type: types.CHAR, value: 11 },
-    { type: types.CHAR, value: 12 },
-    { type: types.CHAR, value: 13 },
-    { type: types.CHAR, value: 32 },
-    { type: types.CHAR, value: 160 },
-    { type: types.CHAR, value: 5760 },
-    { type: types.CHAR, value: 6158 },
-    { type: types.CHAR, value: 8192 },
-    { type: types.CHAR, value: 8193 },
-    { type: types.CHAR, value: 8194 },
-    { type: types.CHAR, value: 8195 },
-    { type: types.CHAR, value: 8196 },
-    { type: types.CHAR, value: 8197 },
-    { type: types.CHAR, value: 8198 },
-    { type: types.CHAR, value: 8199 },
-    { type: types.CHAR, value: 8200 },
-    { type: types.CHAR, value: 8201 },
-    { type: types.CHAR, value: 8202 },
-    { type: types.CHAR, value: 8232 },
-    { type: types.CHAR, value: 8233 },
-    { type: types.CHAR, value: 8239 },
-    { type: types.CHAR, value: 8287 },
-    { type: types.CHAR, value: 12288 },
-    { type: types.CHAR, value: 65279 }
-  ];
-};
-
-var NOTANYCHAR = function() {
-  return [
-    { type: types.CHAR, value: 10 },
-    { type: types.CHAR, value: 13 },
-    { type: types.CHAR, value: 8232 },
-    { type: types.CHAR, value: 8233 },
-  ];
-};
-
-// Predefined class objects.
-exports.words = function() {
-  return { type: types.SET, set: WORDS(), not: false };
-};
-
-exports.notWords = function() {
-  return { type: types.SET, set: WORDS(), not: true };
-};
-
-exports.ints = function() {
-  return { type: types.SET, set: INTS(), not: false };
-};
-
-exports.notInts = function() {
-  return { type: types.SET, set: INTS(), not: true };
-};
-
-exports.whitespace = function() {
-  return { type: types.SET, set: WHITESPACE(), not: false };
-};
-
-exports.notWhitespace = function() {
-  return { type: types.SET, set: WHITESPACE(), not: true };
-};
-
-exports.anyChar = function() {
-  return { type: types.SET, set: NOTANYCHAR(), not: true };
-};
-
-
-/***/ }),
-/* 616 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var types = __webpack_require__(614);
-
-exports.wordBoundary = function() {
-  return { type: types.POSITION, value: 'b' };
-};
-
-exports.nonWordBoundary = function() {
-  return { type: types.POSITION, value: 'B' };
-};
-
-exports.begin = function() {
-  return { type: types.POSITION, value: '^' };
-};
-
-exports.end = function() {
-  return { type: types.POSITION, value: '$' };
-};
-
-
-/***/ }),
-/* 617 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isobject = __webpack_require__(618);
-var isDescriptor = __webpack_require__(619);
-var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
-  ? Reflect.defineProperty
-  : Object.defineProperty;
-
-module.exports = function defineProperty(obj, key, val) {
-  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
-    throw new TypeError('expected an object, function, or array');
-  }
-
-  if (typeof key !== 'string') {
-    throw new TypeError('expected "key" to be a string');
-  }
-
-  if (isDescriptor(val)) {
-    define(obj, key, val);
-    return obj;
-  }
-
-  define(obj, key, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-
-  return obj;
-};
-
-
-/***/ }),
-/* 618 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * isobject <https://github.com/jonschlinkert/isobject>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function isObject(val) {
-  return val != null && typeof val === 'object' && Array.isArray(val) === false;
-};
-
-
-/***/ }),
-/* 619 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-descriptor <https://github.com/jonschlinkert/is-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(620);
-var isAccessor = __webpack_require__(621);
-var isData = __webpack_require__(622);
-
-module.exports = function isDescriptor(obj, key) {
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-  if ('get' in obj) {
-    return isAccessor(obj, key);
-  }
-  return isData(obj, key);
-};
-
-
-/***/ }),
-/* 620 */
-/***/ (function(module, exports) {
-
-var toString = Object.prototype.toString;
-
-module.exports = function kindOf(val) {
-  if (val === void 0) return 'undefined';
-  if (val === null) return 'null';
-
-  var type = typeof val;
-  if (type === 'boolean') return 'boolean';
-  if (type === 'string') return 'string';
-  if (type === 'number') return 'number';
-  if (type === 'symbol') return 'symbol';
-  if (type === 'function') {
-    return isGeneratorFn(val) ? 'generatorfunction' : 'function';
-  }
-
-  if (isArray(val)) return 'array';
-  if (isBuffer(val)) return 'buffer';
-  if (isArguments(val)) return 'arguments';
-  if (isDate(val)) return 'date';
-  if (isError(val)) return 'error';
-  if (isRegexp(val)) return 'regexp';
-
-  switch (ctorName(val)) {
-    case 'Symbol': return 'symbol';
-    case 'Promise': return 'promise';
-
-    // Set, Map, WeakSet, WeakMap
-    case 'WeakMap': return 'weakmap';
-    case 'WeakSet': return 'weakset';
-    case 'Map': return 'map';
-    case 'Set': return 'set';
-
-    // 8-bit typed arrays
-    case 'Int8Array': return 'int8array';
-    case 'Uint8Array': return 'uint8array';
-    case 'Uint8ClampedArray': return 'uint8clampedarray';
-
-    // 16-bit typed arrays
-    case 'Int16Array': return 'int16array';
-    case 'Uint16Array': return 'uint16array';
-
-    // 32-bit typed arrays
-    case 'Int32Array': return 'int32array';
-    case 'Uint32Array': return 'uint32array';
-    case 'Float32Array': return 'float32array';
-    case 'Float64Array': return 'float64array';
-  }
-
-  if (isGeneratorObj(val)) {
-    return 'generator';
-  }
-
-  // Non-plain objects
-  type = toString.call(val);
-  switch (type) {
-    case '[object Object]': return 'object';
-    // iterators
-    case '[object Map Iterator]': return 'mapiterator';
-    case '[object Set Iterator]': return 'setiterator';
-    case '[object String Iterator]': return 'stringiterator';
-    case '[object Array Iterator]': return 'arrayiterator';
-  }
-
-  // other
-  return type.slice(8, -1).toLowerCase().replace(/\s/g, '');
-};
-
-function ctorName(val) {
-  return typeof val.constructor === 'function' ? val.constructor.name : null;
-}
-
-function isArray(val) {
-  if (Array.isArray) return Array.isArray(val);
-  return val instanceof Array;
-}
-
-function isError(val) {
-  return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number');
-}
-
-function isDate(val) {
-  if (val instanceof Date) return true;
-  return typeof val.toDateString === 'function'
-    && typeof val.getDate === 'function'
-    && typeof val.setDate === 'function';
-}
-
-function isRegexp(val) {
-  if (val instanceof RegExp) return true;
-  return typeof val.flags === 'string'
-    && typeof val.ignoreCase === 'boolean'
-    && typeof val.multiline === 'boolean'
-    && typeof val.global === 'boolean';
-}
-
-function isGeneratorFn(name, val) {
-  return ctorName(name) === 'GeneratorFunction';
-}
-
-function isGeneratorObj(val) {
-  return typeof val.throw === 'function'
-    && typeof val.return === 'function'
-    && typeof val.next === 'function';
-}
-
-function isArguments(val) {
-  try {
-    if (typeof val.length === 'number' && typeof val.callee === 'function') {
-      return true;
-    }
-  } catch (err) {
-    if (err.message.indexOf('callee') !== -1) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * If you need to support Safari 5-7 (8-10 yr-old browser),
- * take a look at https://github.com/feross/is-buffer
- */
-
-function isBuffer(val) {
-  if (val.constructor && typeof val.constructor.isBuffer === 'function') {
-    return val.constructor.isBuffer(val);
-  }
-  return false;
-}
-
-
-/***/ }),
-/* 621 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-accessor-descriptor <https://github.com/jonschlinkert/is-accessor-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(620);
-
-// accessor descriptor properties
-var accessor = {
-  get: 'function',
-  set: 'function',
-  configurable: 'boolean',
-  enumerable: 'boolean'
-};
-
-function isAccessorDescriptor(obj, prop) {
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
-
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-
-  if (has(obj, 'value') || has(obj, 'writable')) {
-    return false;
-  }
-
-  if (!has(obj, 'get') || typeof obj.get !== 'function') {
-    return false;
-  }
-
-  // tldr: it's valid to have "set" be undefined
-  // "set" might be undefined if `Object.getOwnPropertyDescriptor`
-  // was used to get the value, and only `get` was defined by the user
-  if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') {
-    return false;
-  }
-
-  for (var key in obj) {
-    if (!accessor.hasOwnProperty(key)) {
-      continue;
-    }
-
-    if (typeOf(obj[key]) === accessor[key]) {
-      continue;
-    }
-
-    if (typeof obj[key] !== 'undefined') {
-      return false;
-    }
-  }
-  return true;
-}
-
-function has(obj, key) {
-  return {}.hasOwnProperty.call(obj, key);
-}
-
-/**
- * Expose `isAccessorDescriptor`
- */
-
-module.exports = isAccessorDescriptor;
-
-
-/***/ }),
-/* 622 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-data-descriptor <https://github.com/jonschlinkert/is-data-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(620);
-
-module.exports = function isDataDescriptor(obj, prop) {
-  // data descriptor properties
-  var data = {
-    configurable: 'boolean',
-    enumerable: 'boolean',
-    writable: 'boolean'
-  };
-
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
-
-  if (!('value' in obj) && !('writable' in obj)) {
-    return false;
-  }
-
-  for (var key in obj) {
-    if (key === 'value') continue;
-
-    if (!data.hasOwnProperty(key)) {
-      continue;
-    }
-
-    if (typeOf(obj[key]) === data[key]) {
-      continue;
-    }
-
-    if (typeof obj[key] !== 'undefined') {
-      return false;
-    }
-  }
-  return true;
-};
-
-
-/***/ }),
-/* 623 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(624);
-var assignSymbols = __webpack_require__(626);
-
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-function isString(val) {
-  return (val && typeof val === 'string');
-}
-
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
-
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
-
-
-/***/ }),
-/* 624 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isPlainObject = __webpack_require__(625);
-
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
-
-
-/***/ }),
-/* 625 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(618);
-
-function isObjectObject(o) {
-  return isObject(o) === true
-    && Object.prototype.toString.call(o) === '[object Object]';
-}
-
-module.exports = function isPlainObject(o) {
-  var ctor,prot;
-
-  if (isObjectObject(o) === false) return false;
-
-  // If has modified constructor
-  ctor = o.constructor;
-  if (typeof ctor !== 'function') return false;
-
-  // If has modified prototype
-  prot = ctor.prototype;
-  if (isObjectObject(prot) === false) return false;
-
-  // If constructor does not have an Object-specific method
-  if (prot.hasOwnProperty('isPrototypeOf') === false) {
-    return false;
-  }
-
-  // Most likely a plain Object
-  return true;
-};
-
-
-/***/ }),
-/* 626 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * assign-symbols <https://github.com/jonschlinkert/assign-symbols>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function(receiver, objects) {
-  if (receiver === null || typeof receiver === 'undefined') {
-    throw new TypeError('expected first argument to be an object.');
-  }
-
-  if (typeof objects === 'undefined' || typeof Symbol === 'undefined') {
-    return receiver;
-  }
-
-  if (typeof Object.getOwnPropertySymbols !== 'function') {
-    return receiver;
-  }
-
-  var isEnumerable = Object.prototype.propertyIsEnumerable;
-  var target = Object(receiver);
-  var len = arguments.length, i = 0;
-
-  while (++i < len) {
-    var provider = Object(arguments[i]);
-    var names = Object.getOwnPropertySymbols(provider);
-
-    for (var j = 0; j < names.length; j++) {
-      var key = names[j];
-
-      if (isEnumerable.call(provider, key)) {
-        target[key] = provider[key];
-      }
-    }
-  }
-  return target;
-};
-
-
-/***/ }),
-/* 627 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var extend = __webpack_require__(628);
-var safe = __webpack_require__(611);
-
-/**
- * The main export is a function that takes a `pattern` string and an `options` object.
- *
- * ```js
- & var not = require('regex-not');
- & console.log(not('foo'));
- & //=> /^(?:(?!^(?:foo)$).)*$/
- * ```
- *
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {RegExp} Converts the given `pattern` to a regex using the specified `options`.
- * @api public
- */
-
-function toRegex(pattern, options) {
-  return new RegExp(toRegex.create(pattern, options));
-}
-
-/**
- * Create a regex-compatible string from the given `pattern` and `options`.
- *
- * ```js
- & var not = require('regex-not');
- & console.log(not.create('foo'));
- & //=> '^(?:(?!^(?:foo)$).)*$'
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-toRegex.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  var opts = extend({}, options);
-  if (opts.contains === true) {
-    opts.strictNegate = false;
-  }
-
-  var open = opts.strictOpen !== false ? '^' : '';
-  var close = opts.strictClose !== false ? '$' : '';
-  var endChar = opts.endChar ? opts.endChar : '+';
-  var str = pattern;
-
-  if (opts.strictNegate === false) {
-    str = '(?:(?!(?:' + pattern + ')).)' + endChar;
-  } else {
-    str = '(?:(?!^(?:' + pattern + ')$).)' + endChar;
-  }
-
-  var res = open + str + close;
-  if (opts.safe === true && safe(res) === false) {
-    throw new Error('potentially unsafe regular expression: ' + res);
-  }
-
-  return res;
-};
-
-/**
- * Expose `toRegex`
- */
-
-module.exports = toRegex;
-
-
-/***/ }),
-/* 628 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(629);
-var assignSymbols = __webpack_require__(626);
-
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-function isString(val) {
-  return (val && typeof val === 'string');
-}
-
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
-
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
-
-
-/***/ }),
-/* 629 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isPlainObject = __webpack_require__(625);
-
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
-
-
-/***/ }),
-/* 630 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * array-unique <https://github.com/jonschlinkert/array-unique>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function unique(arr) {
-  if (!Array.isArray(arr)) {
-    throw new TypeError('array-unique expects an array.');
-  }
-
-  var len = arr.length;
-  var i = -1;
-
-  while (i++ < len) {
-    var j = i + 1;
-
-    for (; j < arr.length; ++j) {
-      if (arr[i] === arr[j]) {
-        arr.splice(j--, 1);
-      }
-    }
-  }
-  return arr;
-};
-
-module.exports.immutable = function uniqueImmutable(arr) {
-  if (!Array.isArray(arr)) {
-    throw new TypeError('array-unique expects an array.');
-  }
-
-  var arrLen = arr.length;
-  var newArr = new Array(arrLen);
-
-  for (var i = 0; i < arrLen; i++) {
-    newArr[i] = arr[i];
-  }
-
-  return module.exports(newArr);
-};
-
-
-/***/ }),
-/* 631 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isObject = __webpack_require__(632);
-
-module.exports = function extend(o/*, objects*/) {
-  if (!isObject(o)) { o = {}; }
-
-  var len = arguments.length;
-  for (var i = 1; i < len; i++) {
-    var obj = arguments[i];
-
-    if (isObject(obj)) {
-      assign(o, obj);
-    }
-  }
-  return o;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-
-/***/ }),
-/* 632 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
-
-
-/***/ }),
-/* 633 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(634);
-
-module.exports = function(braces, options) {
-  braces.compiler
-
-    /**
-     * bos
-     */
-
-    .set('bos', function() {
-      if (this.output) return;
-      this.ast.queue = isEscaped(this.ast) ? [this.ast.val] : [];
-      this.ast.count = 1;
-    })
-
-    /**
-     * Square brackets
-     */
-
-    .set('bracket', function(node) {
-      var close = node.close;
-      var open = !node.escaped ? '[' : '\\[';
-      var negated = node.negated;
-      var inner = node.inner;
-
-      inner = inner.replace(/\\(?=[\\\w]|$)/g, '\\\\');
-      if (inner === ']-') {
-        inner = '\\]\\-';
-      }
-
-      if (negated && inner.indexOf('.') === -1) {
-        inner += '.';
-      }
-      if (negated && inner.indexOf('/') === -1) {
-        inner += '/';
-      }
-
-      var val = open + negated + inner + close;
-      var queue = node.parent.queue;
-      var last = utils.arrayify(queue.pop());
-
-      queue.push(utils.join(last, val));
-      queue.push.apply(queue, []);
-    })
-
-    /**
-     * Brace
-     */
-
-    .set('brace', function(node) {
-      node.queue = isEscaped(node) ? [node.val] : [];
-      node.count = 1;
-      return this.mapVisit(node.nodes);
-    })
-
-    /**
-     * Open
-     */
-
-    .set('brace.open', function(node) {
-      node.parent.open = node.val;
-    })
-
-    /**
-     * Inner
-     */
-
-    .set('text', function(node) {
-      var queue = node.parent.queue;
-      var escaped = node.escaped;
-      var segs = [node.val];
-
-      if (node.optimize === false) {
-        options = utils.extend({}, options, {optimize: false});
-      }
-
-      if (node.multiplier > 1) {
-        node.parent.count *= node.multiplier;
-      }
-
-      if (options.quantifiers === true && utils.isQuantifier(node.val)) {
-        escaped = true;
-
-      } else if (node.val.length > 1) {
-        if (isType(node.parent, 'brace') && !isEscaped(node)) {
-          var expanded = utils.expand(node.val, options);
-          segs = expanded.segs;
-
-          if (expanded.isOptimized) {
-            node.parent.isOptimized = true;
-          }
-
-          // if nothing was expanded, we probably have a literal brace
-          if (!segs.length) {
-            var val = (expanded.val || node.val);
-            if (options.unescape !== false) {
-              // unescape unexpanded brace sequence/set separators
-              val = val.replace(/\\([,.])/g, '$1');
-              // strip quotes
-              val = val.replace(/["'`]/g, '');
-            }
-
-            segs = [val];
-            escaped = true;
-          }
-        }
-
-      } else if (node.val === ',') {
-        if (options.expand) {
-          node.parent.queue.push(['']);
-          segs = [''];
-        } else {
-          segs = ['|'];
-        }
-      } else {
-        escaped = true;
-      }
-
-      if (escaped && isType(node.parent, 'brace')) {
-        if (node.parent.nodes.length <= 4 && node.parent.count === 1) {
-          node.parent.escaped = true;
-        } else if (node.parent.length <= 3) {
-          node.parent.escaped = true;
-        }
-      }
-
-      if (!hasQueue(node.parent)) {
-        node.parent.queue = segs;
-        return;
-      }
-
-      var last = utils.arrayify(queue.pop());
-      if (node.parent.count > 1 && options.expand) {
-        last = multiply(last, node.parent.count);
-        node.parent.count = 1;
-      }
-
-      queue.push(utils.join(utils.flatten(last), segs.shift()));
-      queue.push.apply(queue, segs);
-    })
-
-    /**
-     * Close
-     */
-
-    .set('brace.close', function(node) {
-      var queue = node.parent.queue;
-      var prev = node.parent.parent;
-      var last = prev.queue.pop();
-      var open = node.parent.open;
-      var close = node.val;
-
-      if (open && close && isOptimized(node, options)) {
-        open = '(';
-        close = ')';
-      }
-
-      // if a close brace exists, and the previous segment is one character
-      // don't wrap the result in braces or parens
-      var ele = utils.last(queue);
-      if (node.parent.count > 1 && options.expand) {
-        ele = multiply(queue.pop(), node.parent.count);
-        node.parent.count = 1;
-        queue.push(ele);
-      }
-
-      if (close && typeof ele === 'string' && ele.length === 1) {
-        open = '';
-        close = '';
-      }
-
-      if ((isLiteralBrace(node, options) || noInner(node)) && !node.parent.hasEmpty) {
-        queue.push(utils.join(open, queue.pop() || ''));
-        queue = utils.flatten(utils.join(queue, close));
-      }
-
-      if (typeof last === 'undefined') {
-        prev.queue = [queue];
-      } else {
-        prev.queue.push(utils.flatten(utils.join(last, queue)));
-      }
-    })
-
-    /**
-     * eos
-     */
-
-    .set('eos', function(node) {
-      if (this.input) return;
-
-      if (options.optimize !== false) {
-        this.output = utils.last(utils.flatten(this.ast.queue));
-      } else if (Array.isArray(utils.last(this.ast.queue))) {
-        this.output = utils.flatten(this.ast.queue.pop());
-      } else {
-        this.output = utils.flatten(this.ast.queue);
-      }
-
-      if (node.parent.count > 1 && options.expand) {
-        this.output = multiply(this.output, node.parent.count);
-      }
-
-      this.output = utils.arrayify(this.output);
-      this.ast.queue = [];
-    });
-
-};
-
-/**
- * Multiply the segments in the current brace level
- */
-
-function multiply(queue, n, options) {
-  return utils.flatten(utils.repeat(utils.arrayify(queue), n));
-}
-
-/**
- * Return true if `node` is escaped
- */
-
-function isEscaped(node) {
-  return node.escaped === true;
-}
-
-/**
- * Returns true if regex parens should be used for sets. If the parent `type`
- * is not `brace`, then we're on a root node, which means we should never
- * expand segments and open/close braces should be `{}` (since this indicates
- * a brace is missing from the set)
- */
-
-function isOptimized(node, options) {
-  if (node.parent.isOptimized) return true;
-  return isType(node.parent, 'brace')
-    && !isEscaped(node.parent)
-    && options.expand !== true;
-}
-
-/**
- * Returns true if the value in `node` should be wrapped in a literal brace.
- * @return {Boolean}
- */
-
-function isLiteralBrace(node, options) {
-  return isEscaped(node.parent) || options.optimize !== false;
-}
-
-/**
- * Returns true if the given `node` does not have an inner value.
- * @return {Boolean}
- */
-
-function noInner(node, type) {
-  if (node.parent.queue.length === 1) {
-    return true;
-  }
-  var nodes = node.parent.nodes;
-  return nodes.length === 3
-    && isType(nodes[0], 'brace.open')
-    && !isType(nodes[1], 'text')
-    && isType(nodes[2], 'brace.close');
-}
-
-/**
- * Returns true if the given `node` is the given `type`
- * @return {Boolean}
- */
-
-function isType(node, type) {
-  return typeof node !== 'undefined' && node.type === type;
-}
-
-/**
- * Returns true if the given `node` has a non-empty queue.
- * @return {Boolean}
- */
-
-function hasQueue(node) {
-  return Array.isArray(node.queue) && node.queue.length;
-}
-
-
-/***/ }),
-/* 634 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var splitString = __webpack_require__(635);
-var utils = module.exports;
-
-/**
- * Module dependencies
- */
-
-utils.extend = __webpack_require__(631);
-utils.flatten = __webpack_require__(638);
-utils.isObject = __webpack_require__(618);
-utils.fillRange = __webpack_require__(639);
-utils.repeat = __webpack_require__(647);
-utils.unique = __webpack_require__(630);
-
-utils.define = function(obj, key, val) {
-  Object.defineProperty(obj, key, {
-    writable: true,
-    configurable: true,
-    enumerable: false,
-    value: val
-  });
-};
-
-/**
- * Returns true if the given string contains only empty brace sets.
- */
-
-utils.isEmptySets = function(str) {
-  return /^(?:\{,\})+$/.test(str);
-};
-
-/**
- * Returns true if the given string contains only empty brace sets.
- */
-
-utils.isQuotedString = function(str) {
-  var open = str.charAt(0);
-  if (open === '\'' || open === '"' || open === '`') {
-    return str.slice(-1) === open;
-  }
-  return false;
-};
-
-/**
- * Create the key to use for memoization. The unique key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
-
-utils.createKey = function(pattern, options) {
-  var id = pattern;
-  if (typeof options === 'undefined') {
-    return id;
-  }
-  var keys = Object.keys(options);
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    id += ';' + key + '=' + String(options[key]);
-  }
-  return id;
-};
-
-/**
- * Normalize options
- */
-
-utils.createOptions = function(options) {
-  var opts = utils.extend.apply(null, arguments);
-  if (typeof opts.expand === 'boolean') {
-    opts.optimize = !opts.expand;
-  }
-  if (typeof opts.optimize === 'boolean') {
-    opts.expand = !opts.optimize;
-  }
-  if (opts.optimize === true) {
-    opts.makeRe = true;
-  }
-  return opts;
-};
-
-/**
- * Join patterns in `a` to patterns in `b`
- */
-
-utils.join = function(a, b, options) {
-  options = options || {};
-  a = utils.arrayify(a);
-  b = utils.arrayify(b);
-
-  if (!a.length) return b;
-  if (!b.length) return a;
-
-  var len = a.length;
-  var idx = -1;
-  var arr = [];
-
-  while (++idx < len) {
-    var val = a[idx];
-    if (Array.isArray(val)) {
-      for (var i = 0; i < val.length; i++) {
-        val[i] = utils.join(val[i], b, options);
-      }
-      arr.push(val);
-      continue;
-    }
-
-    for (var j = 0; j < b.length; j++) {
-      var bval = b[j];
-
-      if (Array.isArray(bval)) {
-        arr.push(utils.join(val, bval, options));
-      } else {
-        arr.push(val + bval);
-      }
-    }
-  }
-  return arr;
-};
-
-/**
- * Split the given string on `,` if not escaped.
- */
-
-utils.split = function(str, options) {
-  var opts = utils.extend({sep: ','}, options);
-  if (typeof opts.keepQuotes !== 'boolean') {
-    opts.keepQuotes = true;
-  }
-  if (opts.unescape === false) {
-    opts.keepEscaping = true;
-  }
-  return splitString(str, opts, utils.escapeBrackets(opts));
-};
-
-/**
- * Expand ranges or sets in the given `pattern`.
- *
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object}
- */
-
-utils.expand = function(str, options) {
-  var opts = utils.extend({rangeLimit: 10000}, options);
-  var segs = utils.split(str, opts);
-  var tok = { segs: segs };
-
-  if (utils.isQuotedString(str)) {
-    return tok;
-  }
-
-  if (opts.rangeLimit === true) {
-    opts.rangeLimit = 10000;
-  }
-
-  if (segs.length > 1) {
-    if (opts.optimize === false) {
-      tok.val = segs[0];
-      return tok;
-    }
-
-    tok.segs = utils.stringifyArray(tok.segs);
-  } else if (segs.length === 1) {
-    var arr = str.split('..');
-
-    if (arr.length === 1) {
-      tok.val = tok.segs[tok.segs.length - 1] || tok.val || str;
-      tok.segs = [];
-      return tok;
-    }
-
-    if (arr.length === 2 && arr[0] === arr[1]) {
-      tok.escaped = true;
-      tok.val = arr[0];
-      tok.segs = [];
-      return tok;
-    }
-
-    if (arr.length > 1) {
-      if (opts.optimize !== false) {
-        opts.optimize = true;
-        delete opts.expand;
-      }
-
-      if (opts.optimize !== true) {
-        var min = Math.min(arr[0], arr[1]);
-        var max = Math.max(arr[0], arr[1]);
-        var step = arr[2] || 1;
-
-        if (opts.rangeLimit !== false && ((max - min) / step >= opts.rangeLimit)) {
-          throw new RangeError('expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.');
-        }
-      }
-
-      arr.push(opts);
-      tok.segs = utils.fillRange.apply(null, arr);
-
-      if (!tok.segs.length) {
-        tok.escaped = true;
-        tok.val = str;
-        return tok;
-      }
-
-      if (opts.optimize === true) {
-        tok.segs = utils.stringifyArray(tok.segs);
-      }
-
-      if (tok.segs === '') {
-        tok.val = str;
-      } else {
-        tok.val = tok.segs[0];
-      }
-      return tok;
-    }
-  } else {
-    tok.val = str;
-  }
-  return tok;
-};
-
-/**
- * Ensure commas inside brackets and parens are not split.
- * @param {Object} `tok` Token from the `split-string` module
- * @return {undefined}
- */
-
-utils.escapeBrackets = function(options) {
-  return function(tok) {
-    if (tok.escaped && tok.val === 'b') {
-      tok.val = '\\b';
-      return;
-    }
-
-    if (tok.val !== '(' && tok.val !== '[') return;
-    var opts = utils.extend({}, options);
-    var brackets = [];
-    var parens = [];
-    var stack = [];
-    var val = tok.val;
-    var str = tok.str;
-    var i = tok.idx - 1;
-
-    while (++i < str.length) {
-      var ch = str[i];
-
-      if (ch === '\\') {
-        val += (opts.keepEscaping === false ? '' : ch) + str[++i];
-        continue;
-      }
-
-      if (ch === '(') {
-        parens.push(ch);
-        stack.push(ch);
-      }
-
-      if (ch === '[') {
-        brackets.push(ch);
-        stack.push(ch);
-      }
-
-      if (ch === ')') {
-        parens.pop();
-        stack.pop();
-        if (!stack.length) {
-          val += ch;
-          break;
-        }
-      }
-
-      if (ch === ']') {
-        brackets.pop();
-        stack.pop();
-        if (!stack.length) {
-          val += ch;
-          break;
-        }
-      }
-      val += ch;
-    }
-
-    tok.split = false;
-    tok.val = val.slice(1);
-    tok.idx = i;
-  };
-};
-
-/**
- * Returns true if the given string looks like a regex quantifier
- * @return {Boolean}
- */
-
-utils.isQuantifier = function(str) {
-  return /^(?:[0-9]?,[0-9]|[0-9],)$/.test(str);
-};
-
-/**
- * Cast `val` to an array.
- * @param {*} `val`
- */
-
-utils.stringifyArray = function(arr) {
-  return [utils.arrayify(arr).join('|')];
-};
-
-/**
- * Cast `val` to an array.
- * @param {*} `val`
- */
-
-utils.arrayify = function(arr) {
-  if (typeof arr === 'undefined') {
-    return [];
-  }
-  if (typeof arr === 'string') {
-    return [arr];
-  }
-  return arr;
-};
-
-/**
- * Returns true if the given `str` is a non-empty string
- * @return {Boolean}
- */
-
-utils.isString = function(str) {
-  return str != null && typeof str === 'string';
-};
-
-/**
- * Get the last element from `array`
- * @param {Array} `array`
- * @return {*}
- */
-
-utils.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
-
-utils.escapeRegex = function(str) {
-  return str.replace(/\\?([!^*?()[\]{}+?/])/g, '\\$1');
-};
-
-
-/***/ }),
-/* 635 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * split-string <https://github.com/jonschlinkert/split-string>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var extend = __webpack_require__(636);
-
-module.exports = function(str, options, fn) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  if (typeof options === 'function') {
-    fn = options;
-    options = null;
-  }
-
-  // allow separator to be defined as a string
-  if (typeof options === 'string') {
-    options = { sep: options };
-  }
-
-  var opts = extend({sep: '.'}, options);
-  var quotes = opts.quotes || ['"', "'", '`'];
-  var brackets;
-
-  if (opts.brackets === true) {
-    brackets = {
-      '<': '>',
-      '(': ')',
-      '[': ']',
-      '{': '}'
-    };
-  } else if (opts.brackets) {
-    brackets = opts.brackets;
-  }
-
-  var tokens = [];
-  var stack = [];
-  var arr = [''];
-  var sep = opts.sep;
-  var len = str.length;
-  var idx = -1;
-  var closeIdx;
-
-  function expected() {
-    if (brackets && stack.length) {
-      return brackets[stack[stack.length - 1]];
-    }
-  }
-
-  while (++idx < len) {
-    var ch = str[idx];
-    var next = str[idx + 1];
-    var tok = { val: ch, idx: idx, arr: arr, str: str };
-    tokens.push(tok);
-
-    if (ch === '\\') {
-      tok.val = keepEscaping(opts, str, idx) === true ? (ch + next) : next;
-      tok.escaped = true;
-      if (typeof fn === 'function') {
-        fn(tok);
-      }
-      arr[arr.length - 1] += tok.val;
-      idx++;
-      continue;
-    }
-
-    if (brackets && brackets[ch]) {
-      stack.push(ch);
-      var e = expected();
-      var i = idx + 1;
-
-      if (str.indexOf(e, i + 1) !== -1) {
-        while (stack.length && i < len) {
-          var s = str[++i];
-          if (s === '\\') {
-            s++;
-            continue;
-          }
-
-          if (quotes.indexOf(s) !== -1) {
-            i = getClosingQuote(str, s, i + 1);
-            continue;
-          }
-
-          e = expected();
-          if (stack.length && str.indexOf(e, i + 1) === -1) {
-            break;
-          }
-
-          if (brackets[s]) {
-            stack.push(s);
-            continue;
-          }
-
-          if (e === s) {
-            stack.pop();
-          }
-        }
-      }
-
-      closeIdx = i;
-      if (closeIdx === -1) {
-        arr[arr.length - 1] += ch;
-        continue;
-      }
-
-      ch = str.slice(idx, closeIdx + 1);
-      tok.val = ch;
-      tok.idx = idx = closeIdx;
-    }
-
-    if (quotes.indexOf(ch) !== -1) {
-      closeIdx = getClosingQuote(str, ch, idx + 1);
-      if (closeIdx === -1) {
-        arr[arr.length - 1] += ch;
-        continue;
-      }
-
-      if (keepQuotes(ch, opts) === true) {
-        ch = str.slice(idx, closeIdx + 1);
-      } else {
-        ch = str.slice(idx + 1, closeIdx);
-      }
-
-      tok.val = ch;
-      tok.idx = idx = closeIdx;
-    }
-
-    if (typeof fn === 'function') {
-      fn(tok, tokens);
-      ch = tok.val;
-      idx = tok.idx;
-    }
-
-    if (tok.val === sep && tok.split !== false) {
-      arr.push('');
-      continue;
-    }
-
-    arr[arr.length - 1] += tok.val;
-  }
-
-  return arr;
-};
-
-function getClosingQuote(str, ch, i, brackets) {
-  var idx = str.indexOf(ch, i);
-  if (str.charAt(idx - 1) === '\\') {
-    return getClosingQuote(str, ch, idx + 1);
-  }
-  return idx;
-}
-
-function keepQuotes(ch, opts) {
-  if (opts.keepDoubleQuotes === true && ch === '"') return true;
-  if (opts.keepSingleQuotes === true && ch === "'") return true;
-  return opts.keepQuotes;
-}
-
-function keepEscaping(opts, str, idx) {
-  if (typeof opts.keepEscaping === 'function') {
-    return opts.keepEscaping(str, idx);
-  }
-  return opts.keepEscaping === true || str[idx + 1] === '\\';
-}
-
-
-/***/ }),
-/* 636 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(637);
-var assignSymbols = __webpack_require__(626);
-
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-function isString(val) {
-  return (val && typeof val === 'string');
-}
-
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
-
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
-
-
-/***/ }),
-/* 637 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isPlainObject = __webpack_require__(625);
-
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
-
-
-/***/ }),
-/* 638 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * arr-flatten <https://github.com/jonschlinkert/arr-flatten>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function (arr) {
-  return flat(arr, []);
-};
-
-function flat(arr, res) {
-  var i = 0, cur;
-  var len = arr.length;
-  for (; i < len; i++) {
-    cur = arr[i];
-    Array.isArray(cur) ? flat(cur, res) : res.push(cur);
-  }
-  return res;
-}
-
-
-/***/ }),
-/* 639 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var util = __webpack_require__(234);
-var isNumber = __webpack_require__(640);
-var extend = __webpack_require__(643);
-var repeat = __webpack_require__(645);
-var toRegex = __webpack_require__(646);
-
-/**
- * Return a range of numbers or letters.
- *
- * @param  {String} `start` Start of the range
- * @param  {String} `stop` End of the range
- * @param  {String} `step` Increment or decrement to use.
- * @param  {Function} `fn` Custom function to modify each element in the range.
- * @return {Array}
- */
-
-function fillRange(start, stop, step, options) {
-  if (typeof start === 'undefined') {
-    return [];
-  }
-
-  if (typeof stop === 'undefined' || start === stop) {
-    // special case, for handling negative zero
-    var isString = typeof start === 'string';
-    if (isNumber(start) && !toNumber(start)) {
-      return [isString ? '0' : 0];
-    }
-    return [start];
-  }
-
-  if (typeof step !== 'number' && typeof step !== 'string') {
-    options = step;
-    step = undefined;
-  }
-
-  if (typeof options === 'function') {
-    options = { transform: options };
-  }
-
-  var opts = extend({step: step}, options);
-  if (opts.step && !isValidNumber(opts.step)) {
-    if (opts.strictRanges === true) {
-      throw new TypeError('expected options.step to be a number');
-    }
-    return [];
-  }
-
-  opts.isNumber = isValidNumber(start) && isValidNumber(stop);
-  if (!opts.isNumber && !isValid(start, stop)) {
-    if (opts.strictRanges === true) {
-      throw new RangeError('invalid range arguments: ' + util.inspect([start, stop]));
-    }
-    return [];
-  }
-
-  opts.isPadded = isPadded(start) || isPadded(stop);
-  opts.toString = opts.stringify
-    || typeof opts.step === 'string'
-    || typeof start === 'string'
-    || typeof stop === 'string'
-    || !opts.isNumber;
-
-  if (opts.isPadded) {
-    opts.maxLength = Math.max(String(start).length, String(stop).length);
-  }
-
-  // support legacy minimatch/fill-range options
-  if (typeof opts.optimize === 'boolean') opts.toRegex = opts.optimize;
-  if (typeof opts.makeRe === 'boolean') opts.toRegex = opts.makeRe;
-  return expand(start, stop, opts);
-}
-
-function expand(start, stop, options) {
-  var a = options.isNumber ? toNumber(start) : start.charCodeAt(0);
-  var b = options.isNumber ? toNumber(stop) : stop.charCodeAt(0);
-
-  var step = Math.abs(toNumber(options.step)) || 1;
-  if (options.toRegex && step === 1) {
-    return toRange(a, b, start, stop, options);
-  }
-
-  var zero = {greater: [], lesser: []};
-  var asc = a < b;
-  var arr = new Array(Math.round((asc ? b - a : a - b) / step));
-  var idx = 0;
-
-  while (asc ? a <= b : a >= b) {
-    var val = options.isNumber ? a : String.fromCharCode(a);
-    if (options.toRegex && (val >= 0 || !options.isNumber)) {
-      zero.greater.push(val);
-    } else {
-      zero.lesser.push(Math.abs(val));
-    }
-
-    if (options.isPadded) {
-      val = zeros(val, options);
-    }
-
-    if (options.toString) {
-      val = String(val);
-    }
-
-    if (typeof options.transform === 'function') {
-      arr[idx++] = options.transform(val, a, b, step, idx, arr, options);
-    } else {
-      arr[idx++] = val;
-    }
-
-    if (asc) {
-      a += step;
-    } else {
-      a -= step;
-    }
-  }
-
-  if (options.toRegex === true) {
-    return toSequence(arr, zero, options);
-  }
-  return arr;
-}
-
-function toRange(a, b, start, stop, options) {
-  if (options.isPadded) {
-    return toRegex(start, stop, options);
-  }
-
-  if (options.isNumber) {
-    return toRegex(Math.min(a, b), Math.max(a, b), options);
-  }
-
-  var start = String.fromCharCode(Math.min(a, b));
-  var stop = String.fromCharCode(Math.max(a, b));
-  return '[' + start + '-' + stop + ']';
-}
-
-function toSequence(arr, zeros, options) {
-  var greater = '', lesser = '';
-  if (zeros.greater.length) {
-    greater = zeros.greater.join('|');
-  }
-  if (zeros.lesser.length) {
-    lesser = '-(' + zeros.lesser.join('|') + ')';
-  }
-  var res = greater && lesser
-    ? greater + '|' + lesser
-    : greater || lesser;
-
-  if (options.capture) {
-    return '(' + res + ')';
-  }
-  return res;
-}
-
-function zeros(val, options) {
-  if (options.isPadded) {
-    var str = String(val);
-    var len = str.length;
-    var dash = '';
-    if (str.charAt(0) === '-') {
-      dash = '-';
-      str = str.slice(1);
-    }
-    var diff = options.maxLength - len;
-    var pad = repeat('0', diff);
-    val = (dash + pad + str);
-  }
-  if (options.stringify) {
-    return String(val);
-  }
-  return val;
-}
-
-function toNumber(val) {
-  return Number(val) || 0;
-}
-
-function isPadded(str) {
-  return /^-?0\d/.test(str);
-}
-
-function isValid(min, max) {
-  return (isValidNumber(min) || isValidLetter(min))
-      && (isValidNumber(max) || isValidLetter(max));
-}
-
-function isValidLetter(ch) {
-  return typeof ch === 'string' && ch.length === 1 && /^\w+$/.test(ch);
-}
-
-function isValidNumber(n) {
-  return isNumber(n) && !/\./.test(n);
-}
-
-/**
- * Expose `fillRange`
- * @type {Function}
- */
-
-module.exports = fillRange;
-
-
-/***/ }),
-/* 640 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(641);
-
-module.exports = function isNumber(num) {
-  var type = typeOf(num);
-
-  if (type === 'string') {
-    if (!num.trim()) return false;
-  } else if (type !== 'number') {
-    return false;
-  }
-
-  return (num - num + 1) >= 0;
-};
-
-
-/***/ }),
-/* 641 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 642 */
-/***/ (function(module, exports) {
-
-/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-// The _isBuffer check is for Safari 5-7 support, because it's missing
-// Object.prototype.constructor. Remove this eventually
-module.exports = function (obj) {
-  return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
-}
-
-function isBuffer (obj) {
-  return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
-}
-
-// For Node v0.10 support. Remove this eventually.
-function isSlowBuffer (obj) {
-  return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
-}
-
-
-/***/ }),
-/* 643 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isObject = __webpack_require__(644);
-
-module.exports = function extend(o/*, objects*/) {
-  if (!isObject(o)) { o = {}; }
-
-  var len = arguments.length;
-  for (var i = 1; i < len; i++) {
-    var obj = arguments[i];
-
-    if (isObject(obj)) {
-      assign(o, obj);
-    }
-  }
-  return o;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-
-/***/ }),
-/* 644 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
-
-
-/***/ }),
-/* 645 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * repeat-string <https://github.com/jonschlinkert/repeat-string>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-/**
- * Results cache
- */
-
-var res = '';
-var cache;
-
-/**
- * Expose `repeat`
- */
-
-module.exports = repeat;
-
-/**
- * Repeat the given `string` the specified `number`
- * of times.
- *
- * **Example:**
- *
- * ```js
- * var repeat = require('repeat-string');
- * repeat('A', 5);
- * //=> AAAAA
- * ```
- *
- * @param {String} `string` The string to repeat
- * @param {Number} `number` The number of times to repeat the string
- * @return {String} Repeated string
- * @api public
- */
-
-function repeat(str, num) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  // cover common, quick use cases
-  if (num === 1) return str;
-  if (num === 2) return str + str;
-
-  var max = str.length * num;
-  if (cache !== str || typeof cache === 'undefined') {
-    cache = str;
-    res = '';
-  } else if (res.length >= max) {
-    return res.substr(0, max);
-  }
-
-  while (max > res.length && num > 1) {
-    if (num & 1) {
-      res += str;
-    }
-
-    num >>= 1;
-    str += str;
-  }
-
-  res += str;
-  res = res.substr(0, max);
-  return res;
-}
-
-
-/***/ }),
-/* 646 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * to-regex-range <https://github.com/jonschlinkert/to-regex-range>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var repeat = __webpack_require__(645);
-var isNumber = __webpack_require__(640);
-var cache = {};
-
-function toRegexRange(min, max, options) {
-  if (isNumber(min) === false) {
-    throw new RangeError('toRegexRange: first argument is invalid.');
-  }
-
-  if (typeof max === 'undefined' || min === max) {
-    return String(min);
-  }
-
-  if (isNumber(max) === false) {
-    throw new RangeError('toRegexRange: second argument is invalid.');
-  }
-
-  options = options || {};
-  var relax = String(options.relaxZeros);
-  var shorthand = String(options.shorthand);
-  var capture = String(options.capture);
-  var key = min + ':' + max + '=' + relax + shorthand + capture;
-  if (cache.hasOwnProperty(key)) {
-    return cache[key].result;
-  }
-
-  var a = Math.min(min, max);
-  var b = Math.max(min, max);
-
-  if (Math.abs(a - b) === 1) {
-    var result = min + '|' + max;
-    if (options.capture) {
-      return '(' + result + ')';
-    }
-    return result;
-  }
-
-  var isPadded = padding(min) || padding(max);
-  var positives = [];
-  var negatives = [];
-
-  var tok = {min: min, max: max, a: a, b: b};
-  if (isPadded) {
-    tok.isPadded = isPadded;
-    tok.maxLen = String(tok.max).length;
-  }
-
-  if (a < 0) {
-    var newMin = b < 0 ? Math.abs(b) : 1;
-    var newMax = Math.abs(a);
-    negatives = splitToPatterns(newMin, newMax, tok, options);
-    a = tok.a = 0;
-  }
-
-  if (b >= 0) {
-    positives = splitToPatterns(a, b, tok, options);
-  }
-
-  tok.negatives = negatives;
-  tok.positives = positives;
-  tok.result = siftPatterns(negatives, positives, options);
-
-  if (options.capture && (positives.length + negatives.length) > 1) {
-    tok.result = '(' + tok.result + ')';
-  }
-
-  cache[key] = tok;
-  return tok.result;
-}
-
-function siftPatterns(neg, pos, options) {
-  var onlyNegative = filterPatterns(neg, pos, '-', false, options) || [];
-  var onlyPositive = filterPatterns(pos, neg, '', false, options) || [];
-  var intersected = filterPatterns(neg, pos, '-?', true, options) || [];
-  var subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
-  return subpatterns.join('|');
-}
-
-function splitToRanges(min, max) {
-  min = Number(min);
-  max = Number(max);
-
-  var nines = 1;
-  var stops = [max];
-  var stop = +countNines(min, nines);
-
-  while (min <= stop && stop <= max) {
-    stops = push(stops, stop);
-    nines += 1;
-    stop = +countNines(min, nines);
-  }
-
-  var zeros = 1;
-  stop = countZeros(max + 1, zeros) - 1;
-
-  while (min < stop && stop <= max) {
-    stops = push(stops, stop);
-    zeros += 1;
-    stop = countZeros(max + 1, zeros) - 1;
-  }
-
-  stops.sort(compare);
-  return stops;
-}
-
-/**
- * Convert a range to a regex pattern
- * @param {Number} `start`
- * @param {Number} `stop`
- * @return {String}
- */
-
-function rangeToPattern(start, stop, options) {
-  if (start === stop) {
-    return {pattern: String(start), digits: []};
-  }
-
-  var zipped = zip(String(start), String(stop));
-  var len = zipped.length, i = -1;
-
-  var pattern = '';
-  var digits = 0;
-
-  while (++i < len) {
-    var numbers = zipped[i];
-    var startDigit = numbers[0];
-    var stopDigit = numbers[1];
-
-    if (startDigit === stopDigit) {
-      pattern += startDigit;
-
-    } else if (startDigit !== '0' || stopDigit !== '9') {
-      pattern += toCharacterClass(startDigit, stopDigit);
-
-    } else {
-      digits += 1;
-    }
-  }
-
-  if (digits) {
-    pattern += options.shorthand ? '\\d' : '[0-9]';
-  }
-
-  return { pattern: pattern, digits: [digits] };
-}
-
-function splitToPatterns(min, max, tok, options) {
-  var ranges = splitToRanges(min, max);
-  var len = ranges.length;
-  var idx = -1;
-
-  var tokens = [];
-  var start = min;
-  var prev;
-
-  while (++idx < len) {
-    var range = ranges[idx];
-    var obj = rangeToPattern(start, range, options);
-    var zeros = '';
-
-    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
-      if (prev.digits.length > 1) {
-        prev.digits.pop();
-      }
-      prev.digits.push(obj.digits[0]);
-      prev.string = prev.pattern + toQuantifier(prev.digits);
-      start = range + 1;
-      continue;
-    }
-
-    if (tok.isPadded) {
-      zeros = padZeros(range, tok);
-    }
-
-    obj.string = zeros + obj.pattern + toQuantifier(obj.digits);
-    tokens.push(obj);
-    start = range + 1;
-    prev = obj;
-  }
-
-  return tokens;
-}
-
-function filterPatterns(arr, comparison, prefix, intersection, options) {
-  var res = [];
-
-  for (var i = 0; i < arr.length; i++) {
-    var tok = arr[i];
-    var ele = tok.string;
-
-    if (options.relaxZeros !== false) {
-      if (prefix === '-' && ele.charAt(0) === '0') {
-        if (ele.charAt(1) === '{') {
-          ele = '0*' + ele.replace(/^0\{\d+\}/, '');
-        } else {
-          ele = '0*' + ele.slice(1);
-        }
-      }
-    }
-
-    if (!intersection && !contains(comparison, 'string', ele)) {
-      res.push(prefix + ele);
-    }
-
-    if (intersection && contains(comparison, 'string', ele)) {
-      res.push(prefix + ele);
-    }
-  }
-  return res;
-}
-
-/**
- * Zip strings (`for in` can be used on string characters)
- */
-
-function zip(a, b) {
-  var arr = [];
-  for (var ch in a) arr.push([a[ch], b[ch]]);
-  return arr;
-}
-
-function compare(a, b) {
-  return a > b ? 1 : b > a ? -1 : 0;
-}
-
-function push(arr, ele) {
-  if (arr.indexOf(ele) === -1) arr.push(ele);
-  return arr;
-}
-
-function contains(arr, key, val) {
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i][key] === val) {
-      return true;
-    }
-  }
-  return false;
-}
-
-function countNines(min, len) {
-  return String(min).slice(0, -len) + repeat('9', len);
-}
-
-function countZeros(integer, zeros) {
-  return integer - (integer % Math.pow(10, zeros));
-}
-
-function toQuantifier(digits) {
-  var start = digits[0];
-  var stop = digits[1] ? (',' + digits[1]) : '';
-  if (!stop && (!start || start === 1)) {
-    return '';
-  }
-  return '{' + start + stop + '}';
-}
-
-function toCharacterClass(a, b) {
-  return '[' + a + ((b - a === 1) ? '' : '-') + b + ']';
-}
-
-function padding(str) {
-  return /^-?(0+)\d/.exec(str);
-}
-
-function padZeros(val, tok) {
-  if (tok.isPadded) {
-    var diff = Math.abs(tok.maxLen - String(val).length);
-    switch (diff) {
-      case 0:
-        return '';
-      case 1:
-        return '0';
-      default: {
-        return '0{' + diff + '}';
-      }
-    }
-  }
-  return val;
-}
-
-/**
- * Expose `toRegexRange`
- */
-
-module.exports = toRegexRange;
-
-
-/***/ }),
-/* 647 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * repeat-element <https://github.com/jonschlinkert/repeat-element>
- *
- * Copyright (c) 2015 Jon Schlinkert.
- * Licensed under the MIT license.
- */
-
-
-
-module.exports = function repeat(ele, num) {
-  var arr = new Array(num);
-
-  for (var i = 0; i < num; i++) {
-    arr[i] = ele;
-  }
-
-  return arr;
-};
-
-
-/***/ }),
-/* 648 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Node = __webpack_require__(649);
-var utils = __webpack_require__(634);
-
-/**
- * Braces parsers
- */
-
-module.exports = function(braces, options) {
-  braces.parser
-    .set('bos', function() {
-      if (!this.parsed) {
-        this.ast = this.nodes[0] = new Node(this.ast);
-      }
-    })
-
-    /**
-     * Character parsers
-     */
-
-    .set('escape', function() {
-      var pos = this.position();
-      var m = this.match(/^(?:\\(.)|\$\{)/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
-
-      var node = pos(new Node({
-        type: 'text',
-        multiplier: 1,
-        val: m[0]
-      }));
-
-      if (node.val === '\\\\') {
-        return node;
-      }
-
-      if (node.val === '${') {
-        var str = this.input;
-        var idx = -1;
-        var ch;
-
-        while ((ch = str[++idx])) {
-          this.consume(1);
-          node.val += ch;
-          if (ch === '\\') {
-            node.val += str[++idx];
-            continue;
-          }
-          if (ch === '}') {
-            break;
-          }
-        }
-      }
-
-      if (this.options.unescape !== false) {
-        node.val = node.val.replace(/\\([{}])/g, '$1');
-      }
-
-      if (last.val === '"' && this.input.charAt(0) === '"') {
-        last.val = node.val;
-        this.consume(1);
-        return;
-      }
-
-      return concatNodes.call(this, pos, node, prev, options);
-    })
-
-    /**
-     * Brackets: "[...]" (basic, this is overridden by
-     * other parsers in more advanced implementations)
-     */
-
-    .set('bracket', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^(?:\[([!^]?)([^\]]{2,}|\]-)(\]|[^*+?]+)|\[)/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var val = m[0];
-      var negated = m[1] ? '^' : '';
-      var inner = m[2] || '';
-      var close = m[3] || '';
-
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
-
-      var esc = this.input.slice(0, 2);
-      if (inner === '' && esc === '\\]') {
-        inner += esc;
-        this.consume(2);
-
-        var str = this.input;
-        var idx = -1;
-        var ch;
-
-        while ((ch = str[++idx])) {
-          this.consume(1);
-          if (ch === ']') {
-            close = ch;
-            break;
-          }
-          inner += ch;
-        }
-      }
-
-      return pos(new Node({
-        type: 'bracket',
-        val: val,
-        escaped: close !== ']',
-        negated: negated,
-        inner: inner,
-        close: close
-      }));
-    })
-
-    /**
-     * Empty braces (we capture these early to
-     * speed up processing in the compiler)
-     */
-
-    .set('multiplier', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^\{((?:,|\{,+\})+)\}/);
-      if (!m) return;
-
-      this.multiplier = true;
-      var prev = this.prev();
-      var val = m[0];
-
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
-
-      var node = pos(new Node({
-        type: 'text',
-        multiplier: 1,
-        match: m,
-        val: val
-      }));
-
-      return concatNodes.call(this, pos, node, prev, options);
-    })
-
-    /**
-     * Open
-     */
-
-    .set('brace.open', function() {
-      var pos = this.position();
-      var m = this.match(/^\{(?!(?:[^\\}]?|,+)\})/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
-
-      // if the last parsed character was an extglob character
-      // we need to _not optimize_ the brace pattern because
-      // it might be mistaken for an extglob by a downstream parser
-      if (last && last.val && isExtglobChar(last.val.slice(-1))) {
-        last.optimize = false;
-      }
-
-      var open = pos(new Node({
-        type: 'brace.open',
-        val: m[0]
-      }));
-
-      var node = pos(new Node({
-        type: 'brace',
-        nodes: []
-      }));
-
-      node.push(open);
-      prev.push(node);
-      this.push('brace', node);
-    })
-
-    /**
-     * Close
-     */
-
-    .set('brace.close', function() {
-      var pos = this.position();
-      var m = this.match(/^\}/);
-      if (!m || !m[0]) return;
-
-      var brace = this.pop('brace');
-      var node = pos(new Node({
-        type: 'brace.close',
-        val: m[0]
-      }));
-
-      if (!this.isType(brace, 'brace')) {
-        if (this.options.strict) {
-          throw new Error('missing opening "{"');
-        }
-        node.type = 'text';
-        node.multiplier = 0;
-        node.escaped = true;
-        return node;
-      }
-
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
-      if (last.text) {
-        var lastNode = utils.last(last.nodes);
-        if (lastNode.val === ')' && /[!@*?+]\(/.test(last.text)) {
-          var open = last.nodes[0];
-          var text = last.nodes[1];
-          if (open.type === 'brace.open' && text && text.type === 'text') {
-            text.optimize = false;
-          }
-        }
-      }
-
-      if (brace.nodes.length > 2) {
-        var first = brace.nodes[1];
-        if (first.type === 'text' && first.val === ',') {
-          brace.nodes.splice(1, 1);
-          brace.nodes.push(first);
-        }
-      }
-
-      brace.push(node);
-    })
-
-    /**
-     * Capture boundary characters
-     */
-
-    .set('boundary', function() {
-      var pos = this.position();
-      var m = this.match(/^[$^](?!\{)/);
-      if (!m) return;
-      return pos(new Node({
-        type: 'text',
-        val: m[0]
-      }));
-    })
-
-    /**
-     * One or zero, non-comma characters wrapped in braces
-     */
-
-    .set('nobrace', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^\{[^,]?\}/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var val = m[0];
-
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
-
-      return pos(new Node({
-        type: 'text',
-        multiplier: 0,
-        val: val
-      }));
-    })
-
-    /**
-     * Text
-     */
-
-    .set('text', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^((?!\\)[^${}[\]])+/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var val = m[0];
-
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
-
-      var node = pos(new Node({
-        type: 'text',
-        multiplier: 1,
-        val: val
-      }));
-
-      return concatNodes.call(this, pos, node, prev, options);
-    });
-};
-
-/**
- * Returns true if the character is an extglob character.
- */
-
-function isExtglobChar(ch) {
-  return ch === '!' || ch === '@' || ch === '*' || ch === '?' || ch === '+';
-}
-
-/**
- * Combine text nodes, and calculate empty sets (`{,,}`)
- * @param {Function} `pos` Function to calculate node position
- * @param {Object} `node` AST node
- * @return {Object}
- */
-
-function concatNodes(pos, node, parent, options) {
-  node.orig = node.val;
-  var prev = this.prev();
-  var last = utils.last(prev.nodes);
-  var isEscaped = false;
-
-  if (node.val.length > 1) {
-    var a = node.val.charAt(0);
-    var b = node.val.slice(-1);
-
-    isEscaped = (a === '"' && b === '"')
-      || (a === "'" && b === "'")
-      || (a === '`' && b === '`');
-  }
-
-  if (isEscaped && options.unescape !== false) {
-    node.val = node.val.slice(1, node.val.length - 1);
-    node.escaped = true;
-  }
-
-  if (node.match) {
-    var match = node.match[1];
-    if (!match || match.indexOf('}') === -1) {
-      match = node.match[0];
-    }
-
-    // replace each set with a single ","
-    var val = match.replace(/\{/g, ',').replace(/\}/g, '');
-    node.multiplier *= val.length;
-    node.val = '';
-  }
-
-  var simpleText = last.type === 'text'
-    && last.multiplier === 1
-    && node.multiplier === 1
-    && node.val;
-
-  if (simpleText) {
-    last.val += node.val;
-    return;
-  }
-
-  prev.push(node);
-}
-
-
-/***/ }),
-/* 649 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isObject = __webpack_require__(618);
-var define = __webpack_require__(650);
-var utils = __webpack_require__(651);
-var ownNames;
-
-/**
- * Create a new AST `Node` with the given `val` and `type`.
- *
- * ```js
- * var node = new Node('*', 'Star');
- * var node = new Node({type: 'star', val: '*'});
- * ```
- * @name Node
- * @param {String|Object} `val` Pass a matched substring, or an object to merge onto the node.
- * @param {String} `type` The node type to use when `val` is a string.
- * @return {Object} node instance
- * @api public
- */
-
-function Node(val, type, parent) {
-  if (typeof type !== 'string') {
-    parent = type;
-    type = null;
-  }
-
-  define(this, 'parent', parent);
-  define(this, 'isNode', true);
-  define(this, 'expect', null);
-
-  if (typeof type !== 'string' && isObject(val)) {
-    lazyKeys();
-    var keys = Object.keys(val);
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (ownNames.indexOf(key) === -1) {
-        this[key] = val[key];
-      }
-    }
-  } else {
-    this.type = type;
-    this.val = val;
-  }
-}
-
-/**
- * Returns true if the given value is a node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({type: 'foo'});
- * console.log(Node.isNode(node)); //=> true
- * console.log(Node.isNode({})); //=> false
- * ```
- * @param {Object} `node`
- * @returns {Boolean}
- * @api public
- */
-
-Node.isNode = function(node) {
-  return utils.isNode(node);
-};
-
-/**
- * Define a non-enumberable property on the node instance.
- * Useful for adding properties that shouldn't be extended
- * or visible during debugging.
- *
- * ```js
- * var node = new Node();
- * node.define('foo', 'something non-enumerable');
- * ```
- * @param {String} `name`
- * @param {any} `val`
- * @return {Object} returns the node instance
- * @api public
- */
-
-Node.prototype.define = function(name, val) {
-  define(this, name, val);
-  return this;
-};
-
-/**
- * Returns true if `node.val` is an empty string, or `node.nodes` does
- * not contain any non-empty text nodes.
- *
- * ```js
- * var node = new Node({type: 'text'});
- * node.isEmpty(); //=> true
- * node.val = 'foo';
- * node.isEmpty(); //=> false
- * ```
- * @param {Function} `fn` (optional) Filter function that is called on `node` and/or child nodes. `isEmpty` will return false immediately when the filter function returns false on any nodes.
- * @return {Boolean}
- * @api public
- */
-
-Node.prototype.isEmpty = function(fn) {
-  return utils.isEmpty(this, fn);
-};
-
-/**
- * Given node `foo` and node `bar`, push node `bar` onto `foo.nodes`, and
- * set `foo` as `bar.parent`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * foo.push(bar);
- * ```
- * @param {Object} `node`
- * @return {Number} Returns the length of `node.nodes`
- * @api public
- */
-
-Node.prototype.push = function(node) {
-  assert(Node.isNode(node), 'expected node to be an instance of Node');
-  define(node, 'parent', this);
-
-  this.nodes = this.nodes || [];
-  return this.nodes.push(node);
-};
-
-/**
- * Given node `foo` and node `bar`, unshift node `bar` onto `foo.nodes`, and
- * set `foo` as `bar.parent`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * foo.unshift(bar);
- * ```
- * @param {Object} `node`
- * @return {Number} Returns the length of `node.nodes`
- * @api public
- */
-
-Node.prototype.unshift = function(node) {
-  assert(Node.isNode(node), 'expected node to be an instance of Node');
-  define(node, 'parent', this);
-
-  this.nodes = this.nodes || [];
-  return this.nodes.unshift(node);
-};
-
-/**
- * Pop a node from `node.nodes`.
- *
- * ```js
- * var node = new Node({type: 'foo'});
- * node.push(new Node({type: 'a'}));
- * node.push(new Node({type: 'b'}));
- * node.push(new Node({type: 'c'}));
- * node.push(new Node({type: 'd'}));
- * console.log(node.nodes.length);
- * //=> 4
- * node.pop();
- * console.log(node.nodes.length);
- * //=> 3
- * ```
- * @return {Number} Returns the popped `node`
- * @api public
- */
-
-Node.prototype.pop = function() {
-  return this.nodes && this.nodes.pop();
-};
-
-/**
- * Shift a node from `node.nodes`.
- *
- * ```js
- * var node = new Node({type: 'foo'});
- * node.push(new Node({type: 'a'}));
- * node.push(new Node({type: 'b'}));
- * node.push(new Node({type: 'c'}));
- * node.push(new Node({type: 'd'}));
- * console.log(node.nodes.length);
- * //=> 4
- * node.shift();
- * console.log(node.nodes.length);
- * //=> 3
- * ```
- * @return {Object} Returns the shifted `node`
- * @api public
- */
-
-Node.prototype.shift = function() {
-  return this.nodes && this.nodes.shift();
-};
-
-/**
- * Remove `node` from `node.nodes`.
- *
- * ```js
- * node.remove(childNode);
- * ```
- * @param {Object} `node`
- * @return {Object} Returns the removed node.
- * @api public
- */
-
-Node.prototype.remove = function(node) {
-  assert(Node.isNode(node), 'expected node to be an instance of Node');
-  this.nodes = this.nodes || [];
-  var idx = node.index;
-  if (idx !== -1) {
-    node.index = -1;
-    return this.nodes.splice(idx, 1);
-  }
-  return null;
-};
-
-/**
- * Get the first child node from `node.nodes` that matches the given `type`.
- * If `type` is a number, the child node at that index is returned.
- *
- * ```js
- * var child = node.find(1); //<= index of the node to get
- * var child = node.find('foo'); //<= node.type of a child node
- * var child = node.find(/^(foo|bar)$/); //<= regex to match node.type
- * var child = node.find(['foo', 'bar']); //<= array of node.type(s)
- * ```
- * @param {String} `type`
- * @return {Object} Returns a child node or undefined.
- * @api public
- */
-
-Node.prototype.find = function(type) {
-  return utils.findNode(this.nodes, type);
-};
-
-/**
- * Return true if the node is the given `type`.
- *
- * ```js
- * var node = new Node({type: 'bar'});
- * cosole.log(node.isType('foo'));          // false
- * cosole.log(node.isType(/^(foo|bar)$/));  // true
- * cosole.log(node.isType(['foo', 'bar'])); // true
- * ```
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
-
-Node.prototype.isType = function(type) {
-  return utils.isType(this, type);
-};
-
-/**
- * Return true if the `node.nodes` has the given `type`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * foo.push(bar);
- *
- * cosole.log(foo.hasType('qux'));          // false
- * cosole.log(foo.hasType(/^(qux|bar)$/));  // true
- * cosole.log(foo.hasType(['qux', 'bar'])); // true
- * ```
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
-
-Node.prototype.hasType = function(type) {
-  return utils.hasType(this, type);
-};
-
-/**
- * Get the siblings array, or `null` if it doesn't exist.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * foo.push(bar);
- * foo.push(baz);
- *
- * console.log(bar.siblings.length) // 2
- * console.log(baz.siblings.length) // 2
- * ```
- * @return {Array}
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'siblings', {
-  set: function() {
-    throw new Error('node.siblings is a getter and cannot be defined');
-  },
-  get: function() {
-    return this.parent ? this.parent.nodes : null;
-  }
-});
-
-/**
- * Get the node's current index from `node.parent.nodes`.
- * This should always be correct, even when the parent adds nodes.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.unshift(qux);
- *
- * console.log(bar.index) // 1
- * console.log(baz.index) // 2
- * console.log(qux.index) // 0
- * ```
- * @return {Number}
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'index', {
-  set: function(index) {
-    define(this, 'idx', index);
-  },
-  get: function() {
-    if (!Array.isArray(this.siblings)) {
-      return -1;
-    }
-    var tok = this.idx !== -1 ? this.siblings[this.idx] : null;
-    if (tok !== this) {
-      this.idx = this.siblings.indexOf(this);
-    }
-    return this.idx;
-  }
-});
-
-/**
- * Get the previous node from the siblings array or `null`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * foo.push(bar);
- * foo.push(baz);
- *
- * console.log(baz.prev.type) // 'bar'
- * ```
- * @return {Object}
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'prev', {
-  set: function() {
-    throw new Error('node.prev is a getter and cannot be defined');
-  },
-  get: function() {
-    if (Array.isArray(this.siblings)) {
-      return this.siblings[this.index - 1] || this.parent.prev;
-    }
-    return null;
-  }
-});
-
-/**
- * Get the siblings array, or `null` if it doesn't exist.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * foo.push(bar);
- * foo.push(baz);
- *
- * console.log(bar.siblings.length) // 2
- * console.log(baz.siblings.length) // 2
- * ```
- * @return {Object}
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'next', {
-  set: function() {
-    throw new Error('node.next is a getter and cannot be defined');
-  },
-  get: function() {
-    if (Array.isArray(this.siblings)) {
-      return this.siblings[this.index + 1] || this.parent.next;
-    }
-    return null;
-  }
-});
-
-/**
- * Get the first node from `node.nodes`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.push(qux);
- *
- * console.log(foo.first.type) // 'bar'
- * ```
- * @return {Object} The first node, or undefiend
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'first', {
-  get: function() {
-    return this.nodes ? this.nodes[0] : null;
-  }
-});
-
-/**
- * Get the last node from `node.nodes`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.push(qux);
- *
- * console.log(foo.last.type) // 'qux'
- * ```
- * @return {Object} The last node, or undefiend
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'last', {
-  get: function() {
-    return this.nodes ? utils.last(this.nodes) : null;
-  }
-});
-
-/**
- * Get the last node from `node.nodes`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.push(qux);
- *
- * console.log(foo.last.type) // 'qux'
- * ```
- * @return {Object} The last node, or undefiend
- * @api public
- */
-
-Object.defineProperty(Node.prototype, 'scope', {
-  get: function() {
-    if (this.isScope !== true) {
-      return this.parent ? this.parent.scope : this;
-    }
-    return this;
-  }
-});
-
-/**
- * Get own property names from Node prototype, but only the
- * first time `Node` is instantiated
- */
-
-function lazyKeys() {
-  if (!ownNames) {
-    ownNames = Object.getOwnPropertyNames(Node.prototype);
-  }
-}
-
-/**
- * Simplified assertion. Throws an error is `val` is falsey.
- */
-
-function assert(val, message) {
-  if (!val) throw new Error(message);
-}
-
-/**
- * Expose `Node`
- */
-
-exports = module.exports = Node;
-
-
-/***/ }),
-/* 650 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isDescriptor = __webpack_require__(619);
-
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
-
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
-
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
-
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
-
-
-/***/ }),
-/* 651 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var typeOf = __webpack_require__(652);
-var utils = module.exports;
-
-/**
- * Returns true if the given value is a node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({type: 'foo'});
- * console.log(utils.isNode(node)); //=> true
- * console.log(utils.isNode({})); //=> false
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {Boolean}
- * @api public
- */
-
-utils.isNode = function(node) {
-  return typeOf(node) === 'object' && node.isNode === true;
-};
-
-/**
- * Emit an empty string for the given `node`.
- *
- * ```js
- * // do nothing for beginning-of-string
- * snapdragon.compiler.set('bos', utils.noop);
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {undefined}
- * @api public
- */
-
-utils.noop = function(node) {
-  append(this, '', node);
-};
-
-/**
- * Appdend `node.val` to `compiler.output`, exactly as it was created
- * by the parser.
- *
- * ```js
- * snapdragon.compiler.set('text', utils.identity);
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {undefined}
- * @api public
- */
-
-utils.identity = function(node) {
-  append(this, node.val, node);
-};
-
-/**
- * Previously named `.emit`, this method appends the given `val`
- * to `compiler.output` for the given node. Useful when you know
- * what value should be appended advance, regardless of the actual
- * value of `node.val`.
- *
- * ```js
- * snapdragon.compiler
- *   .set('i', function(node) {
- *     this.mapVisit(node);
- *   })
- *   .set('i.open', utils.append('<i>'))
- *   .set('i.close', utils.append('</i>'))
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {Function} Returns a compiler middleware function.
- * @api public
- */
-
-utils.append = function(val) {
-  return function(node) {
-    append(this, val, node);
-  };
-};
-
-/**
- * Used in compiler middleware, this onverts an AST node into
- * an empty `text` node and deletes `node.nodes` if it exists.
- * The advantage of this method is that, as opposed to completely
- * removing the node, indices will not need to be re-calculated
- * in sibling nodes, and nothing is appended to the output.
- *
- * ```js
- * utils.toNoop(node);
- * // convert `node.nodes` to the given value instead of deleting it
- * utils.toNoop(node, []);
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Array} `nodes` Optionally pass a new `nodes` value, to replace the existing `node.nodes` array.
- * @api public
- */
-
-utils.toNoop = function(node, nodes) {
-  if (nodes) {
-    node.nodes = nodes;
-  } else {
-    delete node.nodes;
-    node.type = 'text';
-    node.val = '';
-  }
-};
-
-/**
- * Visit `node` with the given `fn`. The built-in `.visit` method in snapdragon
- * automatically calls registered compilers, this allows you to pass a visitor
- * function.
- *
- * ```js
- * snapdragon.compiler.set('i', function(node) {
- *   utils.visit(node, function(childNode) {
- *     // do stuff with "childNode"
- *     return childNode;
- *   });
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `fn`
- * @return {Object} returns the node after recursively visiting all child nodes.
- * @api public
- */
-
-utils.visit = function(node, fn) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(fn), 'expected a visitor function');
-  fn(node);
-  return node.nodes ? utils.mapVisit(node, fn) : node;
-};
-
-/**
- * Map [visit](#visit) the given `fn` over `node.nodes`. This is called by
- * [visit](#visit), use this method if you do not want `fn` to be called on
- * the first node.
- *
- * ```js
- * snapdragon.compiler.set('i', function(node) {
- *   utils.mapVisit(node, function(childNode) {
- *     // do stuff with "childNode"
- *     return childNode;
- *   });
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Object} `options`
- * @param {Function} `fn`
- * @return {Object} returns the node
- * @api public
- */
-
-utils.mapVisit = function(node, fn) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isArray(node.nodes), 'expected node.nodes to be an array');
-  assert(isFunction(fn), 'expected a visitor function');
-
-  for (var i = 0; i < node.nodes.length; i++) {
-    utils.visit(node.nodes[i], fn);
-  }
-  return node;
-};
-
-/**
- * Unshift an `*.open` node onto `node.nodes`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * snapdragon.parser.set('brace', function(node) {
- *   var match = this.match(/^{/);
- *   if (match) {
- *     var parent = new Node({type: 'brace'});
- *     utils.addOpen(parent, Node);
- *     console.log(parent.nodes[0]):
- *     // { type: 'brace.open', val: '' };
- *
- *     // push the parent "brace" node onto the stack
- *     this.push(parent);
- *
- *     // return the parent node, so it's also added to the AST
- *     return brace;
- *   }
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
- * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
- * @return {Object} Returns the created opening node.
- * @api public
- */
-
-utils.addOpen = function(node, Node, val, filter) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(Node), 'expected Node to be a constructor function');
-
-  if (typeof val === 'function') {
-    filter = val;
-    val = '';
-  }
-
-  if (typeof filter === 'function' && !filter(node)) return;
-  var open = new Node({ type: node.type + '.open', val: val});
-  var unshift = node.unshift || node.unshiftNode;
-  if (typeof unshift === 'function') {
-    unshift.call(node, open);
-  } else {
-    utils.unshiftNode(node, open);
-  }
-  return open;
-};
-
-/**
- * Push a `*.close` node onto `node.nodes`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * snapdragon.parser.set('brace', function(node) {
- *   var match = this.match(/^}/);
- *   if (match) {
- *     var parent = this.parent();
- *     if (parent.type !== 'brace') {
- *       throw new Error('missing opening: ' + '}');
- *     }
- *
- *     utils.addClose(parent, Node);
- *     console.log(parent.nodes[parent.nodes.length - 1]):
- *     // { type: 'brace.close', val: '' };
- *
- *     // no need to return a node, since the parent
- *     // was already added to the AST
- *     return;
- *   }
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
- * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
- * @return {Object} Returns the created closing node.
- * @api public
- */
-
-utils.addClose = function(node, Node, val, filter) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(Node), 'expected Node to be a constructor function');
-
-  if (typeof val === 'function') {
-    filter = val;
-    val = '';
-  }
-
-  if (typeof filter === 'function' && !filter(node)) return;
-  var close = new Node({ type: node.type + '.close', val: val});
-  var push = node.push || node.pushNode;
-  if (typeof push === 'function') {
-    push.call(node, close);
-  } else {
-    utils.pushNode(node, close);
-  }
-  return close;
-};
-
-/**
- * Wraps the given `node` with `*.open` and `*.close` nodes.
- *
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
- * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
- * @return {Object} Returns the node
- * @api public
- */
-
-utils.wrapNodes = function(node, Node, filter) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(Node), 'expected Node to be a constructor function');
-
-  utils.addOpen(node, Node, filter);
-  utils.addClose(node, Node, filter);
-  return node;
-};
-
-/**
- * Push the given `node` onto `parent.nodes`, and set `parent` as `node.parent.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * var node = new Node({type: 'bar'});
- * utils.pushNode(parent, node);
- * console.log(parent.nodes[0].type) // 'bar'
- * console.log(node.parent.type) // 'foo'
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Object} Returns the child node
- * @api public
- */
-
-utils.pushNode = function(parent, node) {
-  assert(utils.isNode(parent), 'expected parent node to be an instance of Node');
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-
-  node.define('parent', parent);
-  parent.nodes = parent.nodes || [];
-  parent.nodes.push(node);
-  return node;
-};
-
-/**
- * Unshift `node` onto `parent.nodes`, and set `parent` as `node.parent.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * var node = new Node({type: 'bar'});
- * utils.unshiftNode(parent, node);
- * console.log(parent.nodes[0].type) // 'bar'
- * console.log(node.parent.type) // 'foo'
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {undefined}
- * @api public
- */
-
-utils.unshiftNode = function(parent, node) {
-  assert(utils.isNode(parent), 'expected parent node to be an instance of Node');
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-
-  node.define('parent', parent);
-  parent.nodes = parent.nodes || [];
-  parent.nodes.unshift(node);
-};
-
-/**
- * Pop the last `node` off of `parent.nodes`. The advantage of
- * using this method is that it checks for `node.nodes` and works
- * with any version of `snapdragon-node`.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * utils.pushNode(parent, new Node({type: 'foo'}));
- * utils.pushNode(parent, new Node({type: 'bar'}));
- * utils.pushNode(parent, new Node({type: 'baz'}));
- * console.log(parent.nodes.length); //=> 3
- * utils.popNode(parent);
- * console.log(parent.nodes.length); //=> 2
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Number|Undefined} Returns the length of `node.nodes` or undefined.
- * @api public
- */
-
-utils.popNode = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  if (typeof node.pop === 'function') {
-    return node.pop();
-  }
-  return node.nodes && node.nodes.pop();
-};
-
-/**
- * Shift the first `node` off of `parent.nodes`. The advantage of
- * using this method is that it checks for `node.nodes` and works
- * with any version of `snapdragon-node`.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * utils.pushNode(parent, new Node({type: 'foo'}));
- * utils.pushNode(parent, new Node({type: 'bar'}));
- * utils.pushNode(parent, new Node({type: 'baz'}));
- * console.log(parent.nodes.length); //=> 3
- * utils.shiftNode(parent);
- * console.log(parent.nodes.length); //=> 2
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Number|Undefined} Returns the length of `node.nodes` or undefined.
- * @api public
- */
-
-utils.shiftNode = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  if (typeof node.shift === 'function') {
-    return node.shift();
-  }
-  return node.nodes && node.nodes.shift();
-};
-
-/**
- * Remove the specified `node` from `parent.nodes`.
- *
- * ```js
- * var parent = new Node({type: 'abc'});
- * var foo = new Node({type: 'foo'});
- * utils.pushNode(parent, foo);
- * utils.pushNode(parent, new Node({type: 'bar'}));
- * utils.pushNode(parent, new Node({type: 'baz'}));
- * console.log(parent.nodes.length); //=> 3
- * utils.removeNode(parent, foo);
- * console.log(parent.nodes.length); //=> 2
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Object|undefined} Returns the removed node, if successful, or undefined if it does not exist on `parent.nodes`.
- * @api public
- */
-
-utils.removeNode = function(parent, node) {
-  assert(utils.isNode(parent), 'expected parent.node to be an instance of Node');
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-
-  if (!parent.nodes) {
-    return null;
-  }
-
-  if (typeof parent.remove === 'function') {
-    return parent.remove(node);
-  }
-
-  var idx = parent.nodes.indexOf(node);
-  if (idx !== -1) {
-    return parent.nodes.splice(idx, 1);
-  }
-};
-
-/**
- * Returns true if `node.type` matches the given `type`. Throws a
- * `TypeError` if `node` is not an instance of `Node`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({type: 'foo'});
- * console.log(utils.isType(node, 'foo')); // false
- * console.log(utils.isType(node, 'bar')); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
-
-utils.isType = function(node, type) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  switch (typeOf(type)) {
-    case 'array':
-      var types = type.slice();
-      for (var i = 0; i < types.length; i++) {
-        if (utils.isType(node, types[i])) {
-          return true;
-        }
-      }
-      return false;
-    case 'string':
-      return node.type === type;
-    case 'regexp':
-      return type.test(node.type);
-    default: {
-      throw new TypeError('expected "type" to be an array, string or regexp');
-    }
-  }
-};
-
-/**
- * Returns true if the given `node` has the given `type` in `node.nodes`.
- * Throws a `TypeError` if `node` is not an instance of `Node`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({
- *   type: 'foo',
- *   nodes: [
- *     new Node({type: 'bar'}),
- *     new Node({type: 'baz'})
- *   ]
- * });
- * console.log(utils.hasType(node, 'xyz')); // false
- * console.log(utils.hasType(node, 'baz')); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
-
-utils.hasType = function(node, type) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  if (!Array.isArray(node.nodes)) return false;
-  for (var i = 0; i < node.nodes.length; i++) {
-    if (utils.isType(node.nodes[i], type)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-/**
- * Returns the first node from `node.nodes` of the given `type`
- *
- * ```js
- * var node = new Node({
- *   type: 'foo',
- *   nodes: [
- *     new Node({type: 'text', val: 'abc'}),
- *     new Node({type: 'text', val: 'xyz'})
- *   ]
- * });
- *
- * var textNode = utils.firstOfType(node.nodes, 'text');
- * console.log(textNode.val);
- * //=> 'abc'
- * ```
- * @param {Array} `nodes`
- * @param {String} `type`
- * @return {Object|undefined} Returns the first matching node or undefined.
- * @api public
- */
-
-utils.firstOfType = function(nodes, type) {
-  for (var i = 0; i < nodes.length; i++) {
-    var node = nodes[i];
-    if (utils.isType(node, type)) {
-      return node;
-    }
-  }
-};
-
-/**
- * Returns the node at the specified index, or the first node of the
- * given `type` from `node.nodes`.
- *
- * ```js
- * var node = new Node({
- *   type: 'foo',
- *   nodes: [
- *     new Node({type: 'text', val: 'abc'}),
- *     new Node({type: 'text', val: 'xyz'})
- *   ]
- * });
- *
- * var nodeOne = utils.findNode(node.nodes, 'text');
- * console.log(nodeOne.val);
- * //=> 'abc'
- *
- * var nodeTwo = utils.findNode(node.nodes, 1);
- * console.log(nodeTwo.val);
- * //=> 'xyz'
- * ```
- *
- * @param {Array} `nodes`
- * @param {String|Number} `type` Node type or index.
- * @return {Object} Returns a node or undefined.
- * @api public
- */
-
-utils.findNode = function(nodes, type) {
-  if (!Array.isArray(nodes)) {
-    return null;
-  }
-  if (typeof type === 'number') {
-    return nodes[type];
-  }
-  return utils.firstOfType(nodes, type);
-};
-
-/**
- * Returns true if the given node is an "*.open" node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({type: 'brace'});
- * var open = new Node({type: 'brace.open'});
- * var close = new Node({type: 'brace.close'});
- *
- * console.log(utils.isOpen(brace)); // false
- * console.log(utils.isOpen(open)); // true
- * console.log(utils.isOpen(close)); // false
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
-
-utils.isOpen = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  return node.type.slice(-5) === '.open';
-};
-
-/**
- * Returns true if the given node is a "*.close" node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({type: 'brace'});
- * var open = new Node({type: 'brace.open'});
- * var close = new Node({type: 'brace.close'});
- *
- * console.log(utils.isClose(brace)); // false
- * console.log(utils.isClose(open)); // false
- * console.log(utils.isClose(close)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
-
-utils.isClose = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  return node.type.slice(-6) === '.close';
-};
-
-/**
- * Returns true if `node.nodes` **has** an `.open` node
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({
- *   type: 'brace',
- *   nodes: []
- * });
- *
- * var open = new Node({type: 'brace.open'});
- * console.log(utils.hasOpen(brace)); // false
- *
- * brace.pushNode(open);
- * console.log(utils.hasOpen(brace)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
-
-utils.hasOpen = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  var first = node.first || node.nodes ? node.nodes[0] : null;
-  if (utils.isNode(first)) {
-    return first.type === node.type + '.open';
-  }
-  return false;
-};
-
-/**
- * Returns true if `node.nodes` **has** a `.close` node
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({
- *   type: 'brace',
- *   nodes: []
- * });
- *
- * var close = new Node({type: 'brace.close'});
- * console.log(utils.hasClose(brace)); // false
- *
- * brace.pushNode(close);
- * console.log(utils.hasClose(brace)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
-
-utils.hasClose = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  var last = node.last || node.nodes ? node.nodes[node.nodes.length - 1] : null;
-  if (utils.isNode(last)) {
-    return last.type === node.type + '.close';
-  }
-  return false;
-};
-
-/**
- * Returns true if `node.nodes` has both `.open` and `.close` nodes
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({
- *   type: 'brace',
- *   nodes: []
- * });
- *
- * var open = new Node({type: 'brace.open'});
- * var close = new Node({type: 'brace.close'});
- * console.log(utils.hasOpen(brace)); // false
- * console.log(utils.hasClose(brace)); // false
- *
- * brace.pushNode(open);
- * brace.pushNode(close);
- * console.log(utils.hasOpen(brace)); // true
- * console.log(utils.hasClose(brace)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
-
-utils.hasOpenAndClose = function(node) {
-  return utils.hasOpen(node) && utils.hasClose(node);
-};
-
-/**
- * Push the given `node` onto the `state.inside` array for the
- * given type. This array is used as a specialized "stack" for
- * only the given `node.type`.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * utils.addType(state, node);
- * console.log(state.inside);
- * //=> { brace: [{type: 'brace'}] }
- * ```
- * @param {Object} `state` The `compiler.state` object or custom state object.
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Array} Returns the `state.inside` stack for the given type.
- * @api public
- */
-
-utils.addType = function(state, node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isObject(state), 'expected state to be an object');
-
-  var type = node.parent
-    ? node.parent.type
-    : node.type.replace(/\.open$/, '');
-
-  if (!state.hasOwnProperty('inside')) {
-    state.inside = {};
-  }
-  if (!state.inside.hasOwnProperty(type)) {
-    state.inside[type] = [];
-  }
-
-  var arr = state.inside[type];
-  arr.push(node);
-  return arr;
-};
-
-/**
- * Remove the given `node` from the `state.inside` array for the
- * given type. This array is used as a specialized "stack" for
- * only the given `node.type`.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * utils.addType(state, node);
- * console.log(state.inside);
- * //=> { brace: [{type: 'brace'}] }
- * utils.removeType(state, node);
- * //=> { brace: [] }
- * ```
- * @param {Object} `state` The `compiler.state` object or custom state object.
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Array} Returns the `state.inside` stack for the given type.
- * @api public
- */
-
-utils.removeType = function(state, node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isObject(state), 'expected state to be an object');
-
-  var type = node.parent
-    ? node.parent.type
-    : node.type.replace(/\.close$/, '');
-
-  if (state.inside.hasOwnProperty(type)) {
-    return state.inside[type].pop();
-  }
-};
-
-/**
- * Returns true if `node.val` is an empty string, or `node.nodes` does
- * not contain any non-empty text nodes.
- *
- * ```js
- * var node = new Node({type: 'text'});
- * utils.isEmpty(node); //=> true
- * node.val = 'foo';
- * utils.isEmpty(node); //=> false
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `fn`
- * @return {Boolean}
- * @api public
- */
-
-utils.isEmpty = function(node, fn) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-
-  if (!Array.isArray(node.nodes)) {
-    if (node.type !== 'text') {
-      return true;
-    }
-    if (typeof fn === 'function') {
-      return fn(node, node.parent);
-    }
-    return !utils.trim(node.val);
-  }
-
-  for (var i = 0; i < node.nodes.length; i++) {
-    var child = node.nodes[i];
-    if (utils.isOpen(child) || utils.isClose(child)) {
-      continue;
-    }
-    if (!utils.isEmpty(child, fn)) {
-      return false;
-    }
-  }
-
-  return true;
-};
-
-/**
- * Returns true if the `state.inside` stack for the given type exists
- * and has one or more nodes on it.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * console.log(utils.isInsideType(state, 'brace')); //=> false
- * utils.addType(state, node);
- * console.log(utils.isInsideType(state, 'brace')); //=> true
- * utils.removeType(state, node);
- * console.log(utils.isInsideType(state, 'brace')); //=> false
- * ```
- * @param {Object} `state`
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
-
-utils.isInsideType = function(state, type) {
-  assert(isObject(state), 'expected state to be an object');
-  assert(isString(type), 'expected type to be a string');
-
-  if (!state.hasOwnProperty('inside')) {
-    return false;
-  }
-
-  if (!state.inside.hasOwnProperty(type)) {
-    return false;
-  }
-
-  return state.inside[type].length > 0;
-};
-
-/**
- * Returns true if `node` is either a child or grand-child of the given `type`,
- * or `state.inside[type]` is a non-empty array.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * var open = new Node({type: 'brace.open'});
- * console.log(utils.isInside(state, open, 'brace')); //=> false
- * utils.pushNode(node, open);
- * console.log(utils.isInside(state, open, 'brace')); //=> true
- * ```
- * @param {Object} `state` Either the `compiler.state` object, if it exists, or a user-supplied state object.
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {String} `type` The `node.type` to check for.
- * @return {Boolean}
- * @api public
- */
-
-utils.isInside = function(state, node, type) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isObject(state), 'expected state to be an object');
-
-  if (Array.isArray(type)) {
-    for (var i = 0; i < type.length; i++) {
-      if (utils.isInside(state, node, type[i])) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  var parent = node.parent;
-  if (typeof type === 'string') {
-    return (parent && parent.type === type) || utils.isInsideType(state, type);
-  }
-
-  if (typeOf(type) === 'regexp') {
-    if (parent && parent.type && type.test(parent.type)) {
-      return true;
-    }
-
-    var keys = Object.keys(state.inside);
-    var len = keys.length;
-    var idx = -1;
-    while (++idx < len) {
-      var key = keys[idx];
-      var val = state.inside[key];
-
-      if (Array.isArray(val) && val.length !== 0 && type.test(key)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-
-/**
- * Get the last `n` element from the given `array`. Used for getting
- * a node from `node.nodes.`
- *
- * @param {Array} `array`
- * @param {Number} `n`
- * @return {undefined}
- * @api public
- */
-
-utils.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
-
-/**
- * Cast the given `val` to an array.
- *
- * ```js
- * console.log(utils.arrayify(''));
- * //=> []
- * console.log(utils.arrayify('foo'));
- * //=> ['foo']
- * console.log(utils.arrayify(['foo']));
- * //=> ['foo']
- * ```
- * @param {any} `val`
- * @return {Array}
- * @api public
- */
-
-utils.arrayify = function(val) {
-  if (typeof val === 'string' && val !== '') {
-    return [val];
-  }
-  if (!Array.isArray(val)) {
-    return [];
-  }
-  return val;
-};
-
-/**
- * Convert the given `val` to a string by joining with `,`. Useful
- * for creating a cheerio/CSS/DOM-style selector from a list of strings.
- *
- * @param {any} `val`
- * @return {Array}
- * @api public
- */
-
-utils.stringify = function(val) {
-  return utils.arrayify(val).join(',');
-};
-
-/**
- * Ensure that the given value is a string and call `.trim()` on it,
- * or return an empty string.
- *
- * @param {String} `str`
- * @return {String}
- * @api public
- */
-
-utils.trim = function(str) {
-  return typeof str === 'string' ? str.trim() : '';
-};
-
-/**
- * Return true if val is an object
- */
-
-function isObject(val) {
-  return typeOf(val) === 'object';
-}
-
-/**
- * Return true if val is a string
- */
-
-function isString(val) {
-  return typeof val === 'string';
-}
-
-/**
- * Return true if val is a function
- */
-
-function isFunction(val) {
-  return typeof val === 'function';
-}
-
-/**
- * Return true if val is an array
- */
-
-function isArray(val) {
-  return Array.isArray(val);
-}
-
-/**
- * Shim to ensure the `.append` methods work with any version of snapdragon
- */
-
-function append(compiler, val, node) {
-  if (typeof compiler.append !== 'function') {
-    return compiler.emit(val, node);
-  }
-  return compiler.append(val, node);
-}
-
-/**
- * Simplified assertion. Throws an error is `val` is falsey.
- */
-
-function assert(val, message) {
-  if (!val) throw new Error(message);
-}
-
-
-/***/ }),
-/* 652 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 653 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var extend = __webpack_require__(631);
-var Snapdragon = __webpack_require__(654);
-var compilers = __webpack_require__(633);
-var parsers = __webpack_require__(648);
-var utils = __webpack_require__(634);
-
-/**
- * Customize Snapdragon parser and renderer
- */
-
-function Braces(options) {
-  this.options = extend({}, options);
-}
-
-/**
- * Initialize braces
- */
-
-Braces.prototype.init = function(options) {
-  if (this.isInitialized) return;
-  this.isInitialized = true;
-  var opts = utils.createOptions({}, this.options, options);
-  this.snapdragon = this.options.snapdragon || new Snapdragon(opts);
-  this.compiler = this.snapdragon.compiler;
-  this.parser = this.snapdragon.parser;
-
-  compilers(this.snapdragon, opts);
-  parsers(this.snapdragon, opts);
-
-  /**
-   * Call Snapdragon `.parse` method. When AST is returned, we check to
-   * see if any unclosed braces are left on the stack and, if so, we iterate
-   * over the stack and correct the AST so that compilers are called in the correct
-   * order and unbalance braces are properly escaped.
-   */
-
-  utils.define(this.snapdragon, 'parse', function(pattern, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
-    this.parser.ast.input = pattern;
-
-    var stack = this.parser.stack;
-    while (stack.length) {
-      addParent({type: 'brace.close', val: ''}, stack.pop());
-    }
-
-    function addParent(node, parent) {
-      utils.define(node, 'parent', parent);
-      parent.nodes.push(node);
-    }
-
-    // add non-enumerable parser reference
-    utils.define(parsed, 'parser', this.parser);
-    return parsed;
-  });
-};
-
-/**
- * Decorate `.parse` method
- */
-
-Braces.prototype.parse = function(ast, options) {
-  if (ast && typeof ast === 'object' && ast.nodes) return ast;
-  this.init(options);
-  return this.snapdragon.parse(ast, options);
-};
-
-/**
- * Decorate `.compile` method
- */
-
-Braces.prototype.compile = function(ast, options) {
-  if (typeof ast === 'string') {
-    ast = this.parse(ast, options);
-  } else {
-    this.init(options);
-  }
-  return this.snapdragon.compile(ast, options);
-};
-
-/**
- * Expand
- */
-
-Braces.prototype.expand = function(pattern) {
-  var ast = this.parse(pattern, {expand: true});
-  return this.compile(ast, {expand: true});
-};
-
-/**
- * Optimize
- */
-
-Braces.prototype.optimize = function(pattern) {
-  var ast = this.parse(pattern, {optimize: true});
-  return this.compile(ast, {optimize: true});
-};
-
-/**
- * Expose `Braces`
- */
-
-module.exports = Braces;
-
-
-/***/ }),
-/* 654 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Base = __webpack_require__(655);
-var define = __webpack_require__(685);
-var Compiler = __webpack_require__(696);
-var Parser = __webpack_require__(719);
-var utils = __webpack_require__(699);
-var regexCache = {};
-var cache = {};
-
-/**
- * Create a new instance of `Snapdragon` with the given `options`.
- *
- * ```js
- * var snapdragon = new Snapdragon();
- * ```
- *
- * @param {Object} `options`
- * @api public
- */
-
-function Snapdragon(options) {
-  Base.call(this, null, options);
-  this.options = utils.extend({source: 'string'}, this.options);
-  this.compiler = new Compiler(this.options);
-  this.parser = new Parser(this.options);
-
-  Object.defineProperty(this, 'compilers', {
-    get: function() {
-      return this.compiler.compilers;
-    }
-  });
-
-  Object.defineProperty(this, 'parsers', {
-    get: function() {
-      return this.parser.parsers;
-    }
-  });
-
-  Object.defineProperty(this, 'regex', {
-    get: function() {
-      return this.parser.regex;
-    }
-  });
-}
-
-/**
- * Inherit Base
- */
-
-Base.extend(Snapdragon);
-
-/**
- * Add a parser to `snapdragon.parsers` for capturing the given `type` using
- * the specified regex or parser function. A function is useful if you need
- * to customize how the token is created and/or have access to the parser
- * instance to check options, etc.
- *
- * ```js
- * snapdragon
- *   .capture('slash', /^\//)
- *   .capture('dot', function() {
- *     var pos = this.position();
- *     var m = this.match(/^\./);
- *     if (!m) return;
- *     return pos({
- *       type: 'dot',
- *       val: m[0]
- *     });
- *   });
- * ```
- * @param {String} `type`
- * @param {RegExp|Function} `regex`
- * @return {Object} Returns the parser instance for chaining
- * @api public
- */
-
-Snapdragon.prototype.capture = function() {
-  return this.parser.capture.apply(this.parser, arguments);
-};
-
-/**
- * Register a plugin `fn`.
- *
- * ```js
- * var snapdragon = new Snapdgragon([options]);
- * snapdragon.use(function() {
- *   console.log(this);          //<= snapdragon instance
- *   console.log(this.parser);   //<= parser instance
- *   console.log(this.compiler); //<= compiler instance
- * });
- * ```
- * @param {Object} `fn`
- * @api public
- */
-
-Snapdragon.prototype.use = function(fn) {
-  fn.call(this, this);
-  return this;
-};
-
-/**
- * Parse the given `str`.
- *
- * ```js
- * var snapdragon = new Snapdgragon([options]);
- * // register parsers
- * snapdragon.parser.use(function() {});
- *
- * // parse
- * var ast = snapdragon.parse('foo/bar');
- * console.log(ast);
- * ```
- * @param {String} `str`
- * @param {Object} `options` Set `options.sourcemap` to true to enable source maps.
- * @return {Object} Returns an AST.
- * @api public
- */
-
-Snapdragon.prototype.parse = function(str, options) {
-  this.options = utils.extend({}, this.options, options);
-  var parsed = this.parser.parse(str, this.options);
-
-  // add non-enumerable parser reference
-  define(parsed, 'parser', this.parser);
-  return parsed;
-};
-
-/**
- * Compile the given `AST`.
- *
- * ```js
- * var snapdragon = new Snapdgragon([options]);
- * // register plugins
- * snapdragon.use(function() {});
- * // register parser plugins
- * snapdragon.parser.use(function() {});
- * // register compiler plugins
- * snapdragon.compiler.use(function() {});
- *
- * // parse
- * var ast = snapdragon.parse('foo/bar');
- *
- * // compile
- * var res = snapdragon.compile(ast);
- * console.log(res.output);
- * ```
- * @param {Object} `ast`
- * @param {Object} `options`
- * @return {Object} Returns an object with an `output` property with the rendered string.
- * @api public
- */
-
-Snapdragon.prototype.compile = function(ast, options) {
-  this.options = utils.extend({}, this.options, options);
-  var compiled = this.compiler.compile(ast, this.options);
-
-  // add non-enumerable compiler reference
-  define(compiled, 'compiler', this.compiler);
-  return compiled;
-};
-
-/**
- * Expose `Snapdragon`
- */
-
-module.exports = Snapdragon;
-
-/**
- * Expose `Parser` and `Compiler`
- */
-
-module.exports.Compiler = Compiler;
-module.exports.Parser = Parser;
-
-
-/***/ }),
-/* 655 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var util = __webpack_require__(234);
-var define = __webpack_require__(656);
-var CacheBase = __webpack_require__(657);
-var Emitter = __webpack_require__(658);
-var isObject = __webpack_require__(618);
-var merge = __webpack_require__(679);
-var pascal = __webpack_require__(682);
-var cu = __webpack_require__(683);
-
-/**
- * Optionally define a custom `cache` namespace to use.
- */
-
-function namespace(name) {
-  var Cache = name ? CacheBase.namespace(name) : CacheBase;
-  var fns = [];
-
-  /**
-   * Create an instance of `Base` with the given `config` and `options`.
-   *
-   * ```js
-   * // initialize with `config` and `options`
-   * var app = new Base({isApp: true}, {abc: true});
-   * app.set('foo', 'bar');
-   *
-   * // values defined with the given `config` object will be on the root of the instance
-   * console.log(app.baz); //=> undefined
-   * console.log(app.foo); //=> 'bar'
-   * // or use `.get`
-   * console.log(app.get('isApp')); //=> true
-   * console.log(app.get('foo')); //=> 'bar'
-   *
-   * // values defined with the given `options` object will be on `app.options
-   * console.log(app.options.abc); //=> true
-   * ```
-   *
-   * @param {Object} `config` If supplied, this object is passed to [cache-base][] to merge onto the the instance upon instantiation.
-   * @param {Object} `options` If supplied, this object is used to initialize the `base.options` object.
-   * @api public
-   */
-
-  function Base(config, options) {
-    if (!(this instanceof Base)) {
-      return new Base(config, options);
-    }
-    Cache.call(this, config);
-    this.is('base');
-    this.initBase(config, options);
-  }
-
-  /**
-   * Inherit cache-base
-   */
-
-  util.inherits(Base, Cache);
-
-  /**
-   * Add static emitter methods
-   */
-
-  Emitter(Base);
-
-  /**
-   * Initialize `Base` defaults with the given `config` object
-   */
-
-  Base.prototype.initBase = function(config, options) {
-    this.options = merge({}, this.options, options);
-    this.cache = this.cache || {};
-    this.define('registered', {});
-    if (name) this[name] = {};
-
-    // make `app._callbacks` non-enumerable
-    this.define('_callbacks', this._callbacks);
-    if (isObject(config)) {
-      this.visit('set', config);
-    }
-    Base.run(this, 'use', fns);
-  };
-
-  /**
-   * Set the given `name` on `app._name` and `app.is*` properties. Used for doing
-   * lookups in plugins.
-   *
-   * ```js
-   * app.is('foo');
-   * console.log(app._name);
-   * //=> 'foo'
-   * console.log(app.isFoo);
-   * //=> true
-   * app.is('bar');
-   * console.log(app.isFoo);
-   * //=> true
-   * console.log(app.isBar);
-   * //=> true
-   * console.log(app._name);
-   * //=> 'bar'
-   * ```
-   * @name .is
-   * @param {String} `name`
-   * @return {Boolean}
-   * @api public
-   */
-
-  Base.prototype.is = function(name) {
-    if (typeof name !== 'string') {
-      throw new TypeError('expected name to be a string');
-    }
-    this.define('is' + pascal(name), true);
-    this.define('_name', name);
-    this.define('_appname', name);
-    return this;
-  };
-
-  /**
-   * Returns true if a plugin has already been registered on an instance.
-   *
-   * Plugin implementors are encouraged to use this first thing in a plugin
-   * to prevent the plugin from being called more than once on the same
-   * instance.
-   *
-   * ```js
-   * var base = new Base();
-   * base.use(function(app) {
-   *   if (app.isRegistered('myPlugin')) return;
-   *   // do stuff to `app`
-   * });
-   *
-   * // to also record the plugin as being registered
-   * base.use(function(app) {
-   *   if (app.isRegistered('myPlugin', true)) return;
-   *   // do stuff to `app`
-   * });
-   * ```
-   * @name .isRegistered
-   * @emits `plugin` Emits the name of the plugin being registered. Useful for unit tests, to ensure plugins are only registered once.
-   * @param {String} `name` The plugin name.
-   * @param {Boolean} `register` If the plugin if not already registered, to record it as being registered pass `true` as the second argument.
-   * @return {Boolean} Returns true if a plugin is already registered.
-   * @api public
-   */
-
-  Base.prototype.isRegistered = function(name, register) {
-    if (this.registered.hasOwnProperty(name)) {
-      return true;
-    }
-    if (register !== false) {
-      this.registered[name] = true;
-      this.emit('plugin', name);
-    }
-    return false;
-  };
-
-  /**
-   * Define a plugin function to be called immediately upon init. Plugins are chainable
-   * and expose the following arguments to the plugin function:
-   *
-   * - `app`: the current instance of `Base`
-   * - `base`: the [first ancestor instance](#base) of `Base`
-   *
-   * ```js
-   * var app = new Base()
-   *   .use(foo)
-   *   .use(bar)
-   *   .use(baz)
-   * ```
-   * @name .use
-   * @param {Function} `fn` plugin function to call
-   * @return {Object} Returns the item instance for chaining.
-   * @api public
-   */
-
-  Base.prototype.use = function(fn) {
-    fn.call(this, this);
-    return this;
-  };
-
-  /**
-   * The `.define` method is used for adding non-enumerable property on the instance.
-   * Dot-notation is **not supported** with `define`.
-   *
-   * ```js
-   * // arbitrary `render` function using lodash `template`
-   * app.define('render', function(str, locals) {
-   *   return _.template(str)(locals);
-   * });
-   * ```
-   * @name .define
-   * @param {String} `key` The name of the property to define.
-   * @param {any} `value`
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
-
-  Base.prototype.define = function(key, val) {
-    if (isObject(key)) {
-      return this.visit('define', key);
-    }
-    define(this, key, val);
-    return this;
-  };
-
-  /**
-   * Mix property `key` onto the Base prototype. If base is inherited using
-   * `Base.extend` this method will be overridden by a new `mixin` method that will
-   * only add properties to the prototype of the inheriting application.
-   *
-   * ```js
-   * app.mixin('foo', function() {
-   *   // do stuff
-   * });
-   * ```
-   * @name .mixin
-   * @param {String} `key`
-   * @param {Object|Array} `val`
-   * @return {Object} Returns the `base` instance for chaining.
-   * @api public
-   */
-
-  Base.prototype.mixin = function(key, val) {
-    Base.prototype[key] = val;
-    return this;
-  };
-
-  /**
-   * Non-enumberable mixin array, used by the static [Base.mixin]() method.
-   */
-
-  Base.prototype.mixins = Base.prototype.mixins || [];
-
-  /**
-   * Getter/setter used when creating nested instances of `Base`, for storing a reference
-   * to the first ancestor instance. This works by setting an instance of `Base` on the `parent`
-   * property of a "child" instance. The `base` property defaults to the current instance if
-   * no `parent` property is defined.
-   *
-   * ```js
-   * // create an instance of `Base`, this is our first ("base") instance
-   * var first = new Base();
-   * first.foo = 'bar'; // arbitrary property, to make it easier to see what's happening later
-   *
-   * // create another instance
-   * var second = new Base();
-   * // create a reference to the first instance (`first`)
-   * second.parent = first;
-   *
-   * // create another instance
-   * var third = new Base();
-   * // create a reference to the previous instance (`second`)
-   * // repeat this pattern every time a "child" instance is created
-   * third.parent = second;
-   *
-   * // we can always access the first instance using the `base` property
-   * console.log(first.base.foo);
-   * //=> 'bar'
-   * console.log(second.base.foo);
-   * //=> 'bar'
-   * console.log(third.base.foo);
-   * //=> 'bar'
-   * // and now you know how to get to third base ;)
-   * ```
-   * @name .base
-   * @api public
-   */
-
-  Object.defineProperty(Base.prototype, 'base', {
-    configurable: true,
-    get: function() {
-      return this.parent ? this.parent.base : this;
-    }
-  });
-
-  /**
-   * Static method for adding global plugin functions that will
-   * be added to an instance when created.
-   *
-   * ```js
-   * Base.use(function(app) {
-   *   app.foo = 'bar';
-   * });
-   * var app = new Base();
-   * console.log(app.foo);
-   * //=> 'bar'
-   * ```
-   * @name #use
-   * @param {Function} `fn` Plugin function to use on each instance.
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
-
-  define(Base, 'use', function(fn) {
-    fns.push(fn);
-    return Base;
-  });
-
-  /**
-   * Run an array of functions by passing each function
-   * to a method on the given object specified by the given property.
-   *
-   * @param  {Object} `obj` Object containing method to use.
-   * @param  {String} `prop` Name of the method on the object to use.
-   * @param  {Array} `arr` Array of functions to pass to the method.
-   */
-
-  define(Base, 'run', function(obj, prop, arr) {
-    var len = arr.length, i = 0;
-    while (len--) {
-      obj[prop](arr[i++]);
-    }
-    return Base;
-  });
-
-  /**
-   * Static method for inheriting the prototype and static methods of the `Base` class.
-   * This method greatly simplifies the process of creating inheritance-based applications.
-   * See [static-extend][] for more details.
-   *
-   * ```js
-   * var extend = cu.extend(Parent);
-   * Parent.extend(Child);
-   *
-   * // optional methods
-   * Parent.extend(Child, {
-   *   foo: function() {},
-   *   bar: function() {}
-   * });
-   * ```
-   * @name #extend
-   * @param {Function} `Ctor` constructor to extend
-   * @param {Object} `methods` Optional prototype properties to mix in.
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
-
-  define(Base, 'extend', cu.extend(Base, function(Ctor, Parent) {
-    Ctor.prototype.mixins = Ctor.prototype.mixins || [];
-
-    define(Ctor, 'mixin', function(fn) {
-      var mixin = fn(Ctor.prototype, Ctor);
-      if (typeof mixin === 'function') {
-        Ctor.prototype.mixins.push(mixin);
-      }
-      return Ctor;
-    });
-
-    define(Ctor, 'mixins', function(Child) {
-      Base.run(Child, 'mixin', Ctor.prototype.mixins);
-      return Ctor;
-    });
-
-    Ctor.prototype.mixin = function(key, value) {
-      Ctor.prototype[key] = value;
-      return this;
-    };
-    return Base;
-  }));
-
-  /**
-   * Used for adding methods to the `Base` prototype, and/or to the prototype of child instances.
-   * When a mixin function returns a function, the returned function is pushed onto the `.mixins`
-   * array, making it available to be used on inheriting classes whenever `Base.mixins()` is
-   * called (e.g. `Base.mixins(Child)`).
-   *
-   * ```js
-   * Base.mixin(function(proto) {
-   *   proto.foo = function(msg) {
-   *     return 'foo ' + msg;
-   *   };
-   * });
-   * ```
-   * @name #mixin
-   * @param {Function} `fn` Function to call
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
-
-  define(Base, 'mixin', function(fn) {
-    var mixin = fn(Base.prototype, Base);
-    if (typeof mixin === 'function') {
-      Base.prototype.mixins.push(mixin);
-    }
-    return Base;
-  });
-
-  /**
-   * Static method for running global mixin functions against a child constructor.
-   * Mixins must be registered before calling this method.
-   *
-   * ```js
-   * Base.extend(Child);
-   * Base.mixins(Child);
-   * ```
-   * @name #mixins
-   * @param {Function} `Child` Constructor function of a child class
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
-
-  define(Base, 'mixins', function(Child) {
-    Base.run(Child, 'mixin', Base.prototype.mixins);
-    return Base;
-  });
-
-  /**
-   * Similar to `util.inherit`, but copies all static properties, prototype properties, and
-   * getters/setters from `Provider` to `Receiver`. See [class-utils][]{#inherit} for more details.
-   *
-   * ```js
-   * Base.inherit(Foo, Bar);
-   * ```
-   * @name #inherit
-   * @param {Function} `Receiver` Receiving (child) constructor
-   * @param {Function} `Provider` Providing (parent) constructor
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
-
-  define(Base, 'inherit', cu.inherit);
-  define(Base, 'bubble', cu.bubble);
-  return Base;
-}
-
-/**
- * Expose `Base` with default settings
- */
-
-module.exports = namespace();
-
-/**
- * Allow users to define a namespace
- */
-
-module.exports.namespace = namespace;
-
-
-/***/ }),
-/* 656 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isDescriptor = __webpack_require__(619);
-
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
-
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
-
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
-
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
-
-
-/***/ }),
-/* 657 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isObject = __webpack_require__(618);
-var Emitter = __webpack_require__(658);
-var visit = __webpack_require__(659);
-var toPath = __webpack_require__(662);
-var union = __webpack_require__(664);
-var del = __webpack_require__(670);
-var get = __webpack_require__(667);
-var has = __webpack_require__(675);
-var set = __webpack_require__(678);
-
-/**
- * Create a `Cache` constructor that when instantiated will
- * store values on the given `prop`.
- *
- * ```js
- * var Cache = require('cache-base').namespace('data');
- * var cache = new Cache();
- *
- * cache.set('foo', 'bar');
- * //=> {data: {foo: 'bar'}}
- * ```
- * @param {String} `prop` The property name to use for storing values.
- * @return {Function} Returns a custom `Cache` constructor
- * @api public
- */
-
-function namespace(prop) {
-
-  /**
-   * Create a new `Cache`. Internally the `Cache` constructor is created using
-   * the `namespace` function, with `cache` defined as the storage object.
-   *
-   * ```js
-   * var app = new Cache();
-   * ```
-   * @param {Object} `cache` Optionally pass an object to initialize with.
-   * @constructor
-   * @api public
-   */
-
-  function Cache(cache) {
-    if (prop) {
-      this[prop] = {};
-    }
-    if (cache) {
-      this.set(cache);
-    }
-  }
-
-  /**
-   * Inherit Emitter
-   */
-
-  Emitter(Cache.prototype);
-
-  /**
-   * Assign `value` to `key`. Also emits `set` with
-   * the key and value.
-   *
-   * ```js
-   * app.on('set', function(key, val) {
-   *   // do something when `set` is emitted
-   * });
-   *
-   * app.set(key, value);
-   *
-   * // also takes an object or array
-   * app.set({name: 'Halle'});
-   * app.set([{foo: 'bar'}, {baz: 'quux'}]);
-   * console.log(app);
-   * //=> {name: 'Halle', foo: 'bar', baz: 'quux'}
-   * ```
-   *
-   * @name .set
-   * @emits `set` with `key` and `value` as arguments.
-   * @param {String} `key`
-   * @param {any} `value`
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
-
-  Cache.prototype.set = function(key, val) {
-    if (Array.isArray(key) && arguments.length === 2) {
-      key = toPath(key);
-    }
-    if (isObject(key) || Array.isArray(key)) {
-      this.visit('set', key);
-    } else {
-      set(prop ? this[prop] : this, key, val);
-      this.emit('set', key, val);
-    }
-    return this;
-  };
-
-  /**
-   * Union `array` to `key`. Also emits `set` with
-   * the key and value.
-   *
-   * ```js
-   * app.union('a.b', ['foo']);
-   * app.union('a.b', ['bar']);
-   * console.log(app.get('a'));
-   * //=> {b: ['foo', 'bar']}
-   * ```
-   * @name .union
-   * @param {String} `key`
-   * @param {any} `value`
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
-
-  Cache.prototype.union = function(key, val) {
-    if (Array.isArray(key) && arguments.length === 2) {
-      key = toPath(key);
-    }
-    var ctx = prop ? this[prop] : this;
-    union(ctx, key, arrayify(val));
-    this.emit('union', val);
-    return this;
-  };
-
-  /**
-   * Return the value of `key`. Dot notation may be used
-   * to get [nested property values][get-value].
-   *
-   * ```js
-   * app.set('a.b.c', 'd');
-   * app.get('a.b');
-   * //=> {c: 'd'}
-   *
-   * app.get(['a', 'b']);
-   * //=> {c: 'd'}
-   * ```
-   *
-   * @name .get
-   * @emits `get` with `key` and `value` as arguments.
-   * @param {String} `key` The name of the property to get. Dot-notation may be used.
-   * @return {any} Returns the value of `key`
-   * @api public
-   */
-
-  Cache.prototype.get = function(key) {
-    key = toPath(arguments);
-
-    var ctx = prop ? this[prop] : this;
-    var val = get(ctx, key);
-
-    this.emit('get', key, val);
-    return val;
-  };
-
-  /**
-   * Return true if app has a stored value for `key`,
-   * false only if value is `undefined`.
-   *
-   * ```js
-   * app.set('foo', 'bar');
-   * app.has('foo');
-   * //=> true
-   * ```
-   *
-   * @name .has
-   * @emits `has` with `key` and true or false as arguments.
-   * @param {String} `key`
-   * @return {Boolean}
-   * @api public
-   */
-
-  Cache.prototype.has = function(key) {
-    key = toPath(arguments);
-
-    var ctx = prop ? this[prop] : this;
-    var val = get(ctx, key);
-
-    var has = typeof val !== 'undefined';
-    this.emit('has', key, has);
-    return has;
-  };
-
-  /**
-   * Delete one or more properties from the instance.
-   *
-   * ```js
-   * app.del(); // delete all
-   * // or
-   * app.del('foo');
-   * // or
-   * app.del(['foo', 'bar']);
-   * ```
-   * @name .del
-   * @emits `del` with the `key` as the only argument.
-   * @param {String|Array} `key` Property name or array of property names.
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
-
-  Cache.prototype.del = function(key) {
-    if (Array.isArray(key)) {
-      this.visit('del', key);
-    } else {
-      del(prop ? this[prop] : this, key);
-      this.emit('del', key);
-    }
-    return this;
-  };
-
-  /**
-   * Reset the entire cache to an empty object.
-   *
-   * ```js
-   * app.clear();
-   * ```
-   * @api public
-   */
-
-  Cache.prototype.clear = function() {
-    if (prop) {
-      this[prop] = {};
-    }
-  };
-
-  /**
-   * Visit `method` over the properties in the given object, or map
-   * visit over the object-elements in an array.
-   *
-   * @name .visit
-   * @param {String} `method` The name of the `base` method to call.
-   * @param {Object|Array} `val` The object or array to iterate over.
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
-
-  Cache.prototype.visit = function(method, val) {
-    visit(this, method, val);
-    return this;
-  };
-
-  return Cache;
-}
-
-/**
- * Cast val to an array
- */
-
-function arrayify(val) {
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-}
-
-/**
- * Expose `Cache`
- */
-
-module.exports = namespace();
-
-/**
- * Expose `Cache.namespace`
- */
-
-module.exports.namespace = namespace;
-
-
-/***/ }),
-/* 658 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-/**
- * Expose `Emitter`.
- */
-
-if (true) {
-  module.exports = Emitter;
-}
-
-/**
- * Initialize a new `Emitter`.
- *
- * @api public
- */
-
-function Emitter(obj) {
-  if (obj) return mixin(obj);
-};
-
-/**
- * Mixin the emitter properties.
- *
- * @param {Object} obj
- * @return {Object}
- * @api private
- */
-
-function mixin(obj) {
-  for (var key in Emitter.prototype) {
-    obj[key] = Emitter.prototype[key];
-  }
-  return obj;
-}
-
-/**
- * Listen on the given `event` with `fn`.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.on =
-Emitter.prototype.addEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
-    .push(fn);
-  return this;
-};
-
-/**
- * Adds an `event` listener that will be invoked a single
- * time then automatically removed.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.once = function(event, fn){
-  function on() {
-    this.off(event, on);
-    fn.apply(this, arguments);
-  }
-
-  on.fn = fn;
-  this.on(event, on);
-  return this;
-};
-
-/**
- * Remove the given callback for `event` or all
- * registered callbacks.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.off =
-Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners =
-Emitter.prototype.removeEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
-  var callbacks = this._callbacks['$' + event];
-  if (!callbacks) return this;
-
-  // remove all handlers
-  if (1 == arguments.length) {
-    delete this._callbacks['$' + event];
-    return this;
-  }
-
-  // remove specific handler
-  var cb;
-  for (var i = 0; i < callbacks.length; i++) {
-    cb = callbacks[i];
-    if (cb === fn || cb.fn === fn) {
-      callbacks.splice(i, 1);
-      break;
-    }
-  }
-  return this;
-};
-
-/**
- * Emit `event` with the given args.
- *
- * @param {String} event
- * @param {Mixed} ...
- * @return {Emitter}
- */
-
-Emitter.prototype.emit = function(event){
-  this._callbacks = this._callbacks || {};
-  var args = [].slice.call(arguments, 1)
-    , callbacks = this._callbacks['$' + event];
-
-  if (callbacks) {
-    callbacks = callbacks.slice(0);
-    for (var i = 0, len = callbacks.length; i < len; ++i) {
-      callbacks[i].apply(this, args);
-    }
-  }
-
-  return this;
-};
-
-/**
- * Return array of callbacks for `event`.
- *
- * @param {String} event
- * @return {Array}
- * @api public
- */
-
-Emitter.prototype.listeners = function(event){
-  this._callbacks = this._callbacks || {};
-  return this._callbacks['$' + event] || [];
-};
-
-/**
- * Check if this emitter has `event` handlers.
- *
- * @param {String} event
- * @return {Boolean}
- * @api public
- */
-
-Emitter.prototype.hasListeners = function(event){
-  return !! this.listeners(event).length;
-};
-
-
-/***/ }),
-/* 659 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * collection-visit <https://github.com/jonschlinkert/collection-visit>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var visit = __webpack_require__(660);
-var mapVisit = __webpack_require__(661);
-
-module.exports = function(collection, method, val) {
-  var result;
-
-  if (typeof val === 'string' && (method in collection)) {
-    var args = [].slice.call(arguments, 2);
-    result = collection[method].apply(collection, args);
-  } else if (Array.isArray(val)) {
-    result = mapVisit.apply(null, arguments);
-  } else {
-    result = visit.apply(null, arguments);
-  }
-
-  if (typeof result !== 'undefined') {
-    return result;
-  }
-
-  return collection;
-};
-
-
-/***/ }),
-/* 660 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * object-visit <https://github.com/jonschlinkert/object-visit>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(618);
-
-module.exports = function visit(thisArg, method, target, val) {
-  if (!isObject(thisArg) && typeof thisArg !== 'function') {
-    throw new Error('object-visit expects `thisArg` to be an object.');
-  }
-
-  if (typeof method !== 'string') {
-    throw new Error('object-visit expects `method` name to be a string');
-  }
-
-  if (typeof thisArg[method] !== 'function') {
-    return thisArg;
-  }
-
-  var args = [].slice.call(arguments, 3);
-  target = target || {};
-
-  for (var key in target) {
-    var arr = [key, target[key]].concat(args);
-    thisArg[method].apply(thisArg, arr);
-  }
-  return thisArg;
-};
-
-
-/***/ }),
-/* 661 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var util = __webpack_require__(234);
-var visit = __webpack_require__(660);
-
-/**
- * Map `visit` over an array of objects.
- *
- * @param  {Object} `collection` The context in which to invoke `method`
- * @param  {String} `method` Name of the method to call on `collection`
- * @param  {Object} `arr` Array of objects.
- */
-
-module.exports = function mapVisit(collection, method, val) {
-  if (isObject(val)) {
-    return visit.apply(null, arguments);
-  }
-
-  if (!Array.isArray(val)) {
-    throw new TypeError('expected an array: ' + util.inspect(val));
-  }
-
-  var args = [].slice.call(arguments, 3);
-
-  for (var i = 0; i < val.length; i++) {
-    var ele = val[i];
-    if (isObject(ele)) {
-      visit.apply(null, [collection, method, ele].concat(args));
-    } else {
-      collection[method].apply(collection, [ele].concat(args));
-    }
-  }
-};
-
-function isObject(val) {
-  return val && (typeof val === 'function' || (!Array.isArray(val) && typeof val === 'object'));
-}
-
-
-/***/ }),
-/* 662 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * to-object-path <https://github.com/jonschlinkert/to-object-path>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(663);
-
-module.exports = function toPath(args) {
-  if (typeOf(args) !== 'arguments') {
-    args = arguments;
-  }
-  return filter(args).join('.');
-};
-
-function filter(arr) {
-  var len = arr.length;
-  var idx = -1;
-  var res = [];
-
-  while (++idx < len) {
-    var ele = arr[idx];
-    if (typeOf(ele) === 'arguments' || Array.isArray(ele)) {
-      res.push.apply(res, filter(ele));
-    } else if (typeof ele === 'string') {
-      res.push(ele);
-    }
-  }
-  return res;
-}
-
-
-/***/ }),
-/* 663 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 664 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isObject = __webpack_require__(665);
-var union = __webpack_require__(666);
-var get = __webpack_require__(667);
-var set = __webpack_require__(668);
-
-module.exports = function unionValue(obj, prop, value) {
-  if (!isObject(obj)) {
-    throw new TypeError('union-value expects the first argument to be an object.');
-  }
-
-  if (typeof prop !== 'string') {
-    throw new TypeError('union-value expects `prop` to be a string.');
-  }
-
-  var arr = arrayify(get(obj, prop));
-  set(obj, prop, union(arr, arrayify(value)));
-  return obj;
-};
-
-function arrayify(val) {
-  if (val === null || typeof val === 'undefined') {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val;
-  }
-  return [val];
-}
-
-
-/***/ }),
-/* 665 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
-
-
-/***/ }),
-/* 666 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = function union(init) {
-  if (!Array.isArray(init)) {
-    throw new TypeError('arr-union expects the first argument to be an array.');
-  }
-
-  var len = arguments.length;
-  var i = 0;
-
-  while (++i < len) {
-    var arg = arguments[i];
-    if (!arg) continue;
-
-    if (!Array.isArray(arg)) {
-      arg = [arg];
-    }
-
-    for (var j = 0; j < arg.length; j++) {
-      var ele = arg[j];
-
-      if (init.indexOf(ele) >= 0) {
-        continue;
-      }
-      init.push(ele);
-    }
-  }
-  return init;
-};
-
-
-/***/ }),
-/* 667 */
-/***/ (function(module, exports) {
-
-/*!
- * get-value <https://github.com/jonschlinkert/get-value>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-module.exports = function(obj, prop, a, b, c) {
-  if (!isObject(obj) || !prop) {
-    return obj;
-  }
-
-  prop = toString(prop);
-
-  // allowing for multiple properties to be passed as
-  // a string or array, but much faster (3-4x) than doing
-  // `[].slice.call(arguments)`
-  if (a) prop += '.' + toString(a);
-  if (b) prop += '.' + toString(b);
-  if (c) prop += '.' + toString(c);
-
-  if (prop in obj) {
-    return obj[prop];
-  }
-
-  var segs = prop.split('.');
-  var len = segs.length;
-  var i = -1;
-
-  while (obj && (++i < len)) {
-    var key = segs[i];
-    while (key[key.length - 1] === '\\') {
-      key = key.slice(0, -1) + '.' + segs[++i];
-    }
-    obj = obj[key];
-  }
-  return obj;
-};
-
-function isObject(val) {
-  return val !== null && (typeof val === 'object' || typeof val === 'function');
-}
-
-function toString(val) {
-  if (!val) return '';
-  if (Array.isArray(val)) {
-    return val.join('.');
-  }
-  return val;
-}
-
-
-/***/ }),
-/* 668 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * set-value <https://github.com/jonschlinkert/set-value>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var split = __webpack_require__(635);
-var extend = __webpack_require__(669);
-var isPlainObject = __webpack_require__(625);
-var isObject = __webpack_require__(665);
-
-module.exports = function(obj, prop, val) {
-  if (!isObject(obj)) {
-    return obj;
-  }
-
-  if (Array.isArray(prop)) {
-    prop = [].concat.apply([], prop).join('.');
-  }
-
-  if (typeof prop !== 'string') {
-    return obj;
-  }
-
-  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
-  var len = keys.length;
-  var idx = -1;
-  var current = obj;
-
-  while (++idx < len) {
-    var key = keys[idx];
-    if (idx !== len - 1) {
-      if (!isObject(current[key])) {
-        current[key] = {};
-      }
-      current = current[key];
-      continue;
-    }
-
-    if (isPlainObject(current[key]) && isPlainObject(val)) {
-      current[key] = extend({}, current[key], val);
-    } else {
-      current[key] = val;
-    }
-  }
-
-  return obj;
-};
-
-function isValidKey(key) {
-  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
-}
-
-
-/***/ }),
-/* 669 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isObject = __webpack_require__(665);
-
-module.exports = function extend(o/*, objects*/) {
-  if (!isObject(o)) { o = {}; }
-
-  var len = arguments.length;
-  for (var i = 1; i < len; i++) {
-    var obj = arguments[i];
-
-    if (isObject(obj)) {
-      assign(o, obj);
-    }
-  }
-  return o;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-
-/***/ }),
-/* 670 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * unset-value <https://github.com/jonschlinkert/unset-value>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(618);
-var has = __webpack_require__(671);
-
-module.exports = function unset(obj, prop) {
-  if (!isObject(obj)) {
-    throw new TypeError('expected an object.');
-  }
-  if (obj.hasOwnProperty(prop)) {
-    delete obj[prop];
-    return true;
-  }
-
-  if (has(obj, prop)) {
-    var segs = prop.split('.');
-    var last = segs.pop();
-    while (segs.length && segs[segs.length - 1].slice(-1) === '\\') {
-      last = segs.pop().slice(0, -1) + '.' + last;
-    }
-    while (segs.length) obj = obj[prop = segs.shift()];
-    return (delete obj[last]);
-  }
-  return true;
-};
-
-
-/***/ }),
-/* 671 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * has-value <https://github.com/jonschlinkert/has-value>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(672);
-var hasValues = __webpack_require__(674);
-var get = __webpack_require__(667);
-
-module.exports = function(obj, prop, noZero) {
-  if (isObject(obj)) {
-    return hasValues(get(obj, prop), noZero);
-  }
-  return hasValues(obj, prop);
-};
-
-
-/***/ }),
-/* 672 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * isobject <https://github.com/jonschlinkert/isobject>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isArray = __webpack_require__(673);
-
-module.exports = function isObject(val) {
-  return val != null && typeof val === 'object' && isArray(val) === false;
-};
-
-
-/***/ }),
-/* 673 */
-/***/ (function(module, exports) {
-
-var toString = {}.toString;
-
-module.exports = Array.isArray || function (arr) {
-  return toString.call(arr) == '[object Array]';
-};
-
-
-/***/ }),
-/* 674 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * has-values <https://github.com/jonschlinkert/has-values>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function hasValue(o, noZero) {
-  if (o === null || o === undefined) {
-    return false;
-  }
-
-  if (typeof o === 'boolean') {
-    return true;
-  }
-
-  if (typeof o === 'number') {
-    if (o === 0 && noZero === true) {
-      return false;
-    }
-    return true;
-  }
-
-  if (o.length !== undefined) {
-    return o.length !== 0;
-  }
-
-  for (var key in o) {
-    if (o.hasOwnProperty(key)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-
-/***/ }),
-/* 675 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * has-value <https://github.com/jonschlinkert/has-value>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(618);
-var hasValues = __webpack_require__(676);
-var get = __webpack_require__(667);
-
-module.exports = function(val, prop) {
-  return hasValues(isObject(val) && prop ? get(val, prop) : val);
-};
-
-
-/***/ }),
-/* 676 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * has-values <https://github.com/jonschlinkert/has-values>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(677);
-var isNumber = __webpack_require__(640);
-
-module.exports = function hasValue(val) {
-  // is-number checks for NaN and other edge cases
-  if (isNumber(val)) {
-    return true;
-  }
-
-  switch (typeOf(val)) {
-    case 'null':
-    case 'boolean':
-    case 'function':
-      return true;
-    case 'string':
-    case 'arguments':
-      return val.length !== 0;
-    case 'error':
-      return val.message !== '';
-    case 'array':
-      var len = val.length;
-      if (len === 0) {
-        return false;
-      }
-      for (var i = 0; i < len; i++) {
-        if (hasValue(val[i])) {
-          return true;
-        }
-      }
-      return false;
-    case 'file':
-    case 'map':
-    case 'set':
-      return val.size !== 0;
-    case 'object':
-      var keys = Object.keys(val);
-      if (keys.length === 0) {
-        return false;
-      }
-      for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (hasValue(val[key])) {
-          return true;
-        }
-      }
-      return false;
-    default: {
-      return false;
-    }
-  }
-};
-
-
-/***/ }),
-/* 677 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-  if (type === '[object Promise]') {
-    return 'promise';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 678 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * set-value <https://github.com/jonschlinkert/set-value>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var split = __webpack_require__(635);
-var extend = __webpack_require__(669);
-var isPlainObject = __webpack_require__(625);
-var isObject = __webpack_require__(665);
-
-module.exports = function(obj, prop, val) {
-  if (!isObject(obj)) {
-    return obj;
-  }
-
-  if (Array.isArray(prop)) {
-    prop = [].concat.apply([], prop).join('.');
-  }
-
-  if (typeof prop !== 'string') {
-    return obj;
-  }
-
-  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
-  var len = keys.length;
-  var idx = -1;
-  var current = obj;
-
-  while (++idx < len) {
-    var key = keys[idx];
-    if (idx !== len - 1) {
-      if (!isObject(current[key])) {
-        current[key] = {};
-      }
-      current = current[key];
-      continue;
-    }
-
-    if (isPlainObject(current[key]) && isPlainObject(val)) {
-      current[key] = extend({}, current[key], val);
-    } else {
-      current[key] = val;
-    }
-  }
-
-  return obj;
-};
-
-function isValidKey(key) {
-  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
-}
-
-
-/***/ }),
-/* 679 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(680);
-var forIn = __webpack_require__(681);
-
-function mixinDeep(target, objects) {
-  var len = arguments.length, i = 0;
-  while (++i < len) {
-    var obj = arguments[i];
-    if (isObject(obj)) {
-      forIn(obj, copy, target);
-    }
-  }
-  return target;
-}
-
-/**
- * Copy properties from the source object to the
- * target object.
- *
- * @param  {*} `val`
- * @param  {String} `key`
- */
-
-function copy(val, key) {
-  if (!isValidKey(key)) {
-    return;
-  }
-
-  var obj = this[key];
-  if (isObject(val) && isObject(obj)) {
-    mixinDeep(obj, val);
-  } else {
-    this[key] = val;
-  }
-}
-
-/**
- * Returns true if `val` is an object or function.
- *
- * @param  {any} val
- * @return {Boolean}
- */
-
-function isObject(val) {
-  return isExtendable(val) && !Array.isArray(val);
-}
-
-/**
- * Returns true if `key` is a valid key to use when extending objects.
- *
- * @param  {String} `key`
- * @return {Boolean}
- */
-
-function isValidKey(key) {
-  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
-};
-
-/**
- * Expose `mixinDeep`
- */
-
-module.exports = mixinDeep;
-
-
-/***/ }),
-/* 680 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isPlainObject = __webpack_require__(625);
-
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
-
-
-/***/ }),
-/* 681 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * for-in <https://github.com/jonschlinkert/for-in>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function forIn(obj, fn, thisArg) {
-  for (var key in obj) {
-    if (fn.call(thisArg, obj[key], key, obj) === false) {
-      break;
-    }
-  }
-};
-
-
-/***/ }),
-/* 682 */
-/***/ (function(module, exports) {
-
-/*!
- * pascalcase <https://github.com/jonschlinkert/pascalcase>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-function pascalcase(str) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string.');
-  }
-  str = str.replace(/([A-Z])/g, ' $1');
-  if (str.length === 1) { return str.toUpperCase(); }
-  str = str.replace(/^[\W_]+|[\W_]+$/g, '').toLowerCase();
-  str = str.charAt(0).toUpperCase() + str.slice(1);
-  return str.replace(/[\W_]+(\w|$)/g, function (_, ch) {
-    return ch.toUpperCase();
-  });
-}
-
-module.exports = pascalcase;
-
-
-/***/ }),
-/* 683 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var util = __webpack_require__(234);
-var utils = __webpack_require__(684);
-
-/**
- * Expose class utils
- */
-
-var cu = module.exports;
-
-/**
- * Expose class utils: `cu`
- */
-
-cu.isObject = function isObject(val) {
-  return utils.isObj(val) || typeof val === 'function';
-};
-
-/**
- * Returns true if an array has any of the given elements, or an
- * object has any of the give keys.
- *
- * ```js
- * cu.has(['a', 'b', 'c'], 'c');
- * //=> true
- *
- * cu.has(['a', 'b', 'c'], ['c', 'z']);
- * //=> true
- *
- * cu.has({a: 'b', c: 'd'}, ['c', 'z']);
- * //=> true
- * ```
- * @param {Object} `obj`
- * @param {String|Array} `val`
- * @return {Boolean}
- * @api public
- */
-
-cu.has = function has(obj, val) {
-  val = cu.arrayify(val);
-  var len = val.length;
-
-  if (cu.isObject(obj)) {
-    for (var key in obj) {
-      if (val.indexOf(key) > -1) {
-        return true;
-      }
-    }
-
-    var keys = cu.nativeKeys(obj);
-    return cu.has(keys, val);
-  }
-
-  if (Array.isArray(obj)) {
-    var arr = obj;
-    while (len--) {
-      if (arr.indexOf(val[len]) > -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  throw new TypeError('expected an array or object.');
-};
-
-/**
- * Returns true if an array or object has all of the given values.
- *
- * ```js
- * cu.hasAll(['a', 'b', 'c'], 'c');
- * //=> true
- *
- * cu.hasAll(['a', 'b', 'c'], ['c', 'z']);
- * //=> false
- *
- * cu.hasAll({a: 'b', c: 'd'}, ['c', 'z']);
- * //=> false
- * ```
- * @param {Object|Array} `val`
- * @param {String|Array} `values`
- * @return {Boolean}
- * @api public
- */
-
-cu.hasAll = function hasAll(val, values) {
-  values = cu.arrayify(values);
-  var len = values.length;
-  while (len--) {
-    if (!cu.has(val, values[len])) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Cast the given value to an array.
- *
- * ```js
- * cu.arrayify('foo');
- * //=> ['foo']
- *
- * cu.arrayify(['foo']);
- * //=> ['foo']
- * ```
- *
- * @param {String|Array} `val`
- * @return {Array}
- * @api public
- */
-
-cu.arrayify = function arrayify(val) {
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
-
-/**
- * Noop
- */
-
-cu.noop = function noop() {
-  return;
-};
-
-/**
- * Returns the first argument passed to the function.
- */
-
-cu.identity = function identity(val) {
-  return val;
-};
-
-/**
- * Returns true if a value has a `contructor`
- *
- * ```js
- * cu.hasConstructor({});
- * //=> true
- *
- * cu.hasConstructor(Object.create(null));
- * //=> false
- * ```
- * @param  {Object} `value`
- * @return {Boolean}
- * @api public
- */
-
-cu.hasConstructor = function hasConstructor(val) {
-  return cu.isObject(val) && typeof val.constructor !== 'undefined';
-};
-
-/**
- * Get the native `ownPropertyNames` from the constructor of the
- * given `object`. An empty array is returned if the object does
- * not have a constructor.
- *
- * ```js
- * cu.nativeKeys({a: 'b', b: 'c', c: 'd'})
- * //=> ['a', 'b', 'c']
- *
- * cu.nativeKeys(function(){})
- * //=> ['length', 'caller']
- * ```
- *
- * @param  {Object} `obj` Object that has a `constructor`.
- * @return {Array} Array of keys.
- * @api public
- */
-
-cu.nativeKeys = function nativeKeys(val) {
-  if (!cu.hasConstructor(val)) return [];
-  return Object.getOwnPropertyNames(val);
-};
-
-/**
- * Returns property descriptor `key` if it's an "own" property
- * of the given object.
- *
- * ```js
- * function App() {}
- * Object.defineProperty(App.prototype, 'count', {
- *   get: function() {
- *     return Object.keys(this).length;
- *   }
- * });
- * cu.getDescriptor(App.prototype, 'count');
- * // returns:
- * // {
- * //   get: [Function],
- * //   set: undefined,
- * //   enumerable: false,
- * //   configurable: false
- * // }
- * ```
- *
- * @param {Object} `obj`
- * @param {String} `key`
- * @return {Object} Returns descriptor `key`
- * @api public
- */
-
-cu.getDescriptor = function getDescriptor(obj, key) {
-  if (!cu.isObject(obj)) {
-    throw new TypeError('expected an object.');
-  }
-  if (typeof key !== 'string') {
-    throw new TypeError('expected key to be a string.');
-  }
-  return Object.getOwnPropertyDescriptor(obj, key);
-};
-
-/**
- * Copy a descriptor from one object to another.
- *
- * ```js
- * function App() {}
- * Object.defineProperty(App.prototype, 'count', {
- *   get: function() {
- *     return Object.keys(this).length;
- *   }
- * });
- * var obj = {};
- * cu.copyDescriptor(obj, App.prototype, 'count');
- * ```
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String} `name`
- * @return {Object}
- * @api public
- */
-
-cu.copyDescriptor = function copyDescriptor(receiver, provider, name) {
-  if (!cu.isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!cu.isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
-  if (typeof name !== 'string') {
-    throw new TypeError('expected name to be a string.');
-  }
-
-  var val = cu.getDescriptor(provider, name);
-  if (val) Object.defineProperty(receiver, name, val);
-};
-
-/**
- * Copy static properties, prototype properties, and descriptors
- * from one object to another.
- *
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String|Array} `omit` One or more properties to omit
- * @return {Object}
- * @api public
- */
-
-cu.copy = function copy(receiver, provider, omit) {
-  if (!cu.isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!cu.isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
-  var props = Object.getOwnPropertyNames(provider);
-  var keys = Object.keys(provider);
-  var len = props.length,
-    key;
-  omit = cu.arrayify(omit);
-
-  while (len--) {
-    key = props[len];
-
-    if (cu.has(keys, key)) {
-      utils.define(receiver, key, provider[key]);
-    } else if (!(key in receiver) && !cu.has(omit, key)) {
-      cu.copyDescriptor(receiver, provider, key);
-    }
-  }
-};
-
-/**
- * Inherit the static properties, prototype properties, and descriptors
- * from of an object.
- *
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String|Array} `omit` One or more properties to omit
- * @return {Object}
- * @api public
- */
-
-cu.inherit = function inherit(receiver, provider, omit) {
-  if (!cu.isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!cu.isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
-
-  var keys = [];
-  for (var key in provider) {
-    keys.push(key);
-    receiver[key] = provider[key];
-  }
-
-  keys = keys.concat(cu.arrayify(omit));
-
-  var a = provider.prototype || provider;
-  var b = receiver.prototype || receiver;
-  cu.copy(b, a, keys);
-};
-
-/**
- * Returns a function for extending the static properties,
- * prototype properties, and descriptors from the `Parent`
- * constructor onto `Child` constructors.
- *
- * ```js
- * var extend = cu.extend(Parent);
- * Parent.extend(Child);
- *
- * // optional methods
- * Parent.extend(Child, {
- *   foo: function() {},
- *   bar: function() {}
- * });
- * ```
- * @param {Function} `Parent` Parent ctor
- * @param {Function} `extend` Optional extend function to handle custom extensions. Useful when updating methods that require a specific prototype.
- *   @param {Function} `Child` Child ctor
- *   @param {Object} `proto` Optionally pass additional prototype properties to inherit.
- *   @return {Object}
- * @api public
- */
-
-cu.extend = function() {
-  // keep it lazy, instead of assigning to `cu.extend`
-  return utils.staticExtend.apply(null, arguments);
-};
-
-/**
- * Bubble up events emitted from static methods on the Parent ctor.
- *
- * @param {Object} `Parent`
- * @param {Array} `events` Event names to bubble up
- * @api public
- */
-
-cu.bubble = function(Parent, events) {
-  events = events || [];
-  Parent.bubble = function(Child, arr) {
-    if (Array.isArray(arr)) {
-      events = utils.union([], events, arr);
-    }
-    var len = events.length;
-    var idx = -1;
-    while (++idx < len) {
-      var name = events[idx];
-      Parent.on(name, Child.emit.bind(Child, name));
-    }
-    cu.bubble(Child, events);
-  };
-};
-
-
-/***/ }),
-/* 684 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = {};
-
-
-
-/**
- * Lazily required module dependencies
- */
-
-utils.union = __webpack_require__(666);
-utils.define = __webpack_require__(685);
-utils.isObj = __webpack_require__(618);
-utils.staticExtend = __webpack_require__(692);
-
-
-/**
- * Expose `utils`
- */
-
-module.exports = utils;
-
-
-/***/ }),
-/* 685 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isDescriptor = __webpack_require__(686);
-
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
-
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
-
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
-
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
-
-
-/***/ }),
-/* 686 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-descriptor <https://github.com/jonschlinkert/is-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(687);
-var isAccessor = __webpack_require__(688);
-var isData = __webpack_require__(690);
-
-module.exports = function isDescriptor(obj, key) {
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-  if ('get' in obj) {
-    return isAccessor(obj, key);
-  }
-  return isData(obj, key);
-};
-
-
-/***/ }),
-/* 687 */
-/***/ (function(module, exports) {
-
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  var type = typeof val;
-
-  // primitivies
-  if (type === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (type === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (type === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (type === 'function' || val instanceof Function) {
-    if (typeof val.constructor.name !== 'undefined' && val.constructor.name.slice(0, 9) === 'Generator') {
-      return 'generatorfunction';
-    }
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-  if (type === '[object Promise]') {
-    return 'promise';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-  
-  if (type === '[object Map Iterator]') {
-    return 'mapiterator';
-  }
-  if (type === '[object Set Iterator]') {
-    return 'setiterator';
-  }
-  if (type === '[object String Iterator]') {
-    return 'stringiterator';
-  }
-  if (type === '[object Array Iterator]') {
-    return 'arrayiterator';
-  }
-  
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-/**
- * If you need to support Safari 5-7 (8-10 yr-old browser),
- * take a look at https://github.com/feross/is-buffer
- */
-
-function isBuffer(val) {
-  return val.constructor
-    && typeof val.constructor.isBuffer === 'function'
-    && val.constructor.isBuffer(val);
-}
-
-
-/***/ }),
-/* 688 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-accessor-descriptor <https://github.com/jonschlinkert/is-accessor-descriptor>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(689);
-
-// accessor descriptor properties
-var accessor = {
-  get: 'function',
-  set: 'function',
-  configurable: 'boolean',
-  enumerable: 'boolean'
-};
-
-function isAccessorDescriptor(obj, prop) {
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
-
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-
-  if (has(obj, 'value') || has(obj, 'writable')) {
-    return false;
-  }
-
-  if (!has(obj, 'get') || typeof obj.get !== 'function') {
-    return false;
-  }
-
-  // tldr: it's valid to have "set" be undefined
-  // "set" might be undefined if `Object.getOwnPropertyDescriptor`
-  // was used to get the value, and only `get` was defined by the user
-  if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') {
-    return false;
-  }
-
-  for (var key in obj) {
-    if (!accessor.hasOwnProperty(key)) {
-      continue;
-    }
-
-    if (typeOf(obj[key]) === accessor[key]) {
-      continue;
-    }
-
-    if (typeof obj[key] !== 'undefined') {
-      return false;
-    }
-  }
-  return true;
-}
-
-function has(obj, key) {
-  return {}.hasOwnProperty.call(obj, key);
-}
-
-/**
- * Expose `isAccessorDescriptor`
- */
-
-module.exports = isAccessorDescriptor;
-
-
-/***/ }),
-/* 689 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 690 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-data-descriptor <https://github.com/jonschlinkert/is-data-descriptor>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(691);
-
-// data descriptor properties
-var data = {
-  configurable: 'boolean',
-  enumerable: 'boolean',
-  writable: 'boolean'
-};
-
-function isDataDescriptor(obj, prop) {
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
-
-  if (!('value' in obj) && !('writable' in obj)) {
-    return false;
-  }
-
-  for (var key in obj) {
-    if (key === 'value') continue;
-
-    if (!data.hasOwnProperty(key)) {
-      continue;
-    }
-
-    if (typeOf(obj[key]) === data[key]) {
-      continue;
-    }
-
-    if (typeof obj[key] !== 'undefined') {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * Expose `isDataDescriptor`
- */
-
-module.exports = isDataDescriptor;
-
-
-/***/ }),
-/* 691 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 692 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * static-extend <https://github.com/jonschlinkert/static-extend>
- *
- * Copyright (c) 2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var copy = __webpack_require__(693);
-var define = __webpack_require__(685);
-var util = __webpack_require__(234);
-
-/**
- * Returns a function for extending the static properties,
- * prototype properties, and descriptors from the `Parent`
- * constructor onto `Child` constructors.
- *
- * ```js
- * var extend = require('static-extend');
- * Parent.extend = extend(Parent);
- *
- * // optionally pass a custom merge function as the second arg
- * Parent.extend = extend(Parent, function(Child) {
- *   Child.prototype.mixin = function(key, val) {
- *     Child.prototype[key] = val;
- *   };
- * });
- *
- * // extend "child" constructors
- * Parent.extend(Child);
- *
- * // optionally define prototype methods as the second arg
- * Parent.extend(Child, {
- *   foo: function() {},
- *   bar: function() {}
- * });
- * ```
- * @param {Function} `Parent` Parent ctor
- * @param {Function} `extendFn` Optional extend function for handling any necessary custom merging. Useful when updating methods that require a specific prototype.
- *   @param {Function} `Child` Child ctor
- *   @param {Object} `proto` Optionally pass additional prototype properties to inherit.
- *   @return {Object}
- * @api public
- */
-
-function extend(Parent, extendFn) {
-  if (typeof Parent !== 'function') {
-    throw new TypeError('expected Parent to be a function.');
-  }
-
-  return function(Ctor, proto) {
-    if (typeof Ctor !== 'function') {
-      throw new TypeError('expected Ctor to be a function.');
-    }
-
-    util.inherits(Ctor, Parent);
-    copy(Ctor, Parent);
-
-    // proto can be null or a plain object
-    if (typeof proto === 'object') {
-      var obj = Object.create(proto);
-
-      for (var k in obj) {
-        Ctor.prototype[k] = obj[k];
-      }
-    }
-
-    // keep a reference to the parent prototype
-    define(Ctor.prototype, '_parent_', {
-      configurable: true,
-      set: function() {},
-      get: function() {
-        return Parent.prototype;
-      }
-    });
-
-    if (typeof extendFn === 'function') {
-      extendFn(Ctor, Parent);
-    }
-
-    Ctor.extend = extend(Ctor, extendFn);
-  };
-};
-
-/**
- * Expose `extend`
- */
-
-module.exports = extend;
-
-
-/***/ }),
-/* 693 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var typeOf = __webpack_require__(694);
-var copyDescriptor = __webpack_require__(695);
-var define = __webpack_require__(685);
-
-/**
- * Copy static properties, prototype properties, and descriptors from one object to another.
- *
- * ```js
- * function App() {}
- * var proto = App.prototype;
- * App.prototype.set = function() {};
- * App.prototype.get = function() {};
- *
- * var obj = {};
- * copy(obj, proto);
- * ```
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String|Array} `omit` One or more properties to omit
- * @return {Object}
- * @api public
- */
-
-function copy(receiver, provider, omit) {
-  if (!isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
-
-  var props = nativeKeys(provider);
-  var keys = Object.keys(provider);
-  var len = props.length;
-  omit = arrayify(omit);
-
-  while (len--) {
-    var key = props[len];
-
-    if (has(keys, key)) {
-      define(receiver, key, provider[key]);
-    } else if (!(key in receiver) && !has(omit, key)) {
-      copyDescriptor(receiver, provider, key);
-    }
-  }
-};
-
-/**
- * Return true if the given value is an object or function
- */
-
-function isObject(val) {
-  return typeOf(val) === 'object' || typeof val === 'function';
-}
-
-/**
- * Returns true if an array has any of the given elements, or an
- * object has any of the give keys.
- *
- * ```js
- * has(['a', 'b', 'c'], 'c');
- * //=> true
- *
- * has(['a', 'b', 'c'], ['c', 'z']);
- * //=> true
- *
- * has({a: 'b', c: 'd'}, ['c', 'z']);
- * //=> true
- * ```
- * @param {Object} `obj`
- * @param {String|Array} `val`
- * @return {Boolean}
- */
-
-function has(obj, val) {
-  val = arrayify(val);
-  var len = val.length;
-
-  if (isObject(obj)) {
-    for (var key in obj) {
-      if (val.indexOf(key) > -1) {
-        return true;
-      }
-    }
-
-    var keys = nativeKeys(obj);
-    return has(keys, val);
-  }
-
-  if (Array.isArray(obj)) {
-    var arr = obj;
-    while (len--) {
-      if (arr.indexOf(val[len]) > -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  throw new TypeError('expected an array or object.');
-}
-
-/**
- * Cast the given value to an array.
- *
- * ```js
- * arrayify('foo');
- * //=> ['foo']
- *
- * arrayify(['foo']);
- * //=> ['foo']
- * ```
- *
- * @param {String|Array} `val`
- * @return {Array}
- */
-
-function arrayify(val) {
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-}
-
-/**
- * Returns true if a value has a `contructor`
- *
- * ```js
- * hasConstructor({});
- * //=> true
- *
- * hasConstructor(Object.create(null));
- * //=> false
- * ```
- * @param  {Object} `value`
- * @return {Boolean}
- */
-
-function hasConstructor(val) {
-  return isObject(val) && typeof val.constructor !== 'undefined';
-}
-
-/**
- * Get the native `ownPropertyNames` from the constructor of the
- * given `object`. An empty array is returned if the object does
- * not have a constructor.
- *
- * ```js
- * nativeKeys({a: 'b', b: 'c', c: 'd'})
- * //=> ['a', 'b', 'c']
- *
- * nativeKeys(function(){})
- * //=> ['length', 'caller']
- * ```
- *
- * @param  {Object} `obj` Object that has a `constructor`.
- * @return {Array} Array of keys.
- */
-
-function nativeKeys(val) {
-  if (!hasConstructor(val)) return [];
-  return Object.getOwnPropertyNames(val);
-}
-
-/**
- * Expose `copy`
- */
-
-module.exports = copy;
-
-/**
- * Expose `copy.has` for tests
- */
-
-module.exports.has = has;
-
-
-/***/ }),
-/* 694 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(642);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 695 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * copy-descriptor <https://github.com/jonschlinkert/copy-descriptor>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-/**
- * Copy a descriptor from one object to another.
- *
- * ```js
- * function App() {
- *   this.cache = {};
- * }
- * App.prototype.set = function(key, val) {
- *   this.cache[key] = val;
- *   return this;
- * };
- * Object.defineProperty(App.prototype, 'count', {
- *   get: function() {
- *     return Object.keys(this.cache).length;
- *   }
- * });
- *
- * copy(App.prototype, 'count', 'len');
- *
- * // create an instance
- * var app = new App();
- *
- * app.set('a', true);
- * app.set('b', true);
- * app.set('c', true);
- *
- * console.log(app.count);
- * //=> 3
- * console.log(app.len);
- * //=> 3
- * ```
- * @name copy
- * @param {Object} `receiver` The target object
- * @param {Object} `provider` The provider object
- * @param {String} `from` The key to copy on provider.
- * @param {String} `to` Optionally specify a new key name to use.
- * @return {Object}
- * @api public
- */
-
-module.exports = function copyDescriptor(receiver, provider, from, to) {
-  if (!isObject(provider) && typeof provider !== 'function') {
-    to = from;
-    from = provider;
-    provider = receiver;
-  }
-  if (!isObject(receiver) && typeof receiver !== 'function') {
-    throw new TypeError('expected the first argument to be an object');
-  }
-  if (!isObject(provider) && typeof provider !== 'function') {
-    throw new TypeError('expected provider to be an object');
-  }
-
-  if (typeof to !== 'string') {
-    to = from;
-  }
-  if (typeof from !== 'string') {
-    throw new TypeError('expected key to be a string');
-  }
-
-  if (!(from in provider)) {
-    throw new Error('property "' + from + '" does not exist');
-  }
-
-  var val = Object.getOwnPropertyDescriptor(provider, from);
-  if (val) Object.defineProperty(receiver, to, val);
-};
-
-function isObject(val) {
-  return {}.toString.call(val) === '[object Object]';
-}
-
-
-
-/***/ }),
-/* 696 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var use = __webpack_require__(697);
-var define = __webpack_require__(685);
-var debug = __webpack_require__(326)('snapdragon:compiler');
-var utils = __webpack_require__(699);
-
-/**
- * Create a new `Compiler` with the given `options`.
- * @param {Object} `options`
- */
-
-function Compiler(options, state) {
-  debug('initializing', __filename);
-  this.options = utils.extend({source: 'string'}, options);
-  this.state = state || {};
-  this.compilers = {};
-  this.output = '';
-  this.set('eos', function(node) {
-    return this.emit(node.val, node);
-  });
-  this.set('noop', function(node) {
-    return this.emit(node.val, node);
-  });
-  this.set('bos', function(node) {
-    return this.emit(node.val, node);
-  });
-  use(this);
-}
-
-/**
- * Prototype methods
- */
-
-Compiler.prototype = {
-
-  /**
-   * Throw an error message with details including the cursor position.
-   * @param {String} `msg` Message to use in the Error.
-   */
-
-  error: function(msg, node) {
-    var pos = node.position || {start: {column: 0}};
-    var message = this.options.source + ' column:' + pos.start.column + ': ' + msg;
-
-    var err = new Error(message);
-    err.reason = msg;
-    err.column = pos.start.column;
-    err.source = this.pattern;
-
-    if (this.options.silent) {
-      this.errors.push(err);
-    } else {
-      throw err;
-    }
-  },
-
-  /**
-   * Define a non-enumberable property on the `Compiler` instance.
-   *
-   * ```js
-   * compiler.define('foo', 'bar');
-   * ```
-   * @name .define
-   * @param {String} `key` propery name
-   * @param {any} `val` property value
-   * @return {Object} Returns the Compiler instance for chaining.
-   * @api public
-   */
-
-  define: function(key, val) {
-    define(this, key, val);
-    return this;
-  },
-
-  /**
-   * Emit `node.val`
-   */
-
-  emit: function(str, node) {
-    this.output += str;
-    return str;
-  },
-
-  /**
-   * Add a compiler `fn` with the given `name`
-   */
-
-  set: function(name, fn) {
-    this.compilers[name] = fn;
-    return this;
-  },
-
-  /**
-   * Get compiler `name`.
-   */
-
-  get: function(name) {
-    return this.compilers[name];
-  },
-
-  /**
-   * Get the previous AST node.
-   */
-
-  prev: function(n) {
-    return this.ast.nodes[this.idx - (n || 1)] || { type: 'bos', val: '' };
-  },
-
-  /**
-   * Get the next AST node.
-   */
-
-  next: function(n) {
-    return this.ast.nodes[this.idx + (n || 1)] || { type: 'eos', val: '' };
-  },
-
-  /**
-   * Visit `node`.
-   */
-
-  visit: function(node, nodes, i) {
-    var fn = this.compilers[node.type];
-    this.idx = i;
-
-    if (typeof fn !== 'function') {
-      throw this.error('compiler "' + node.type + '" is not registered', node);
-    }
-    return fn.call(this, node, nodes, i);
-  },
-
-  /**
-   * Map visit over array of `nodes`.
-   */
-
-  mapVisit: function(nodes) {
-    if (!Array.isArray(nodes)) {
-      throw new TypeError('expected an array');
-    }
-    var len = nodes.length;
-    var idx = -1;
-    while (++idx < len) {
-      this.visit(nodes[idx], nodes, idx);
-    }
-    return this;
-  },
-
-  /**
-   * Compile `ast`.
-   */
-
-  compile: function(ast, options) {
-    var opts = utils.extend({}, this.options, options);
-    this.ast = ast;
-    this.parsingErrors = this.ast.errors;
-    this.output = '';
-
-    // source map support
-    if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(718);
-      sourcemaps(this);
-      this.mapVisit(this.ast.nodes);
-      this.applySourceMaps();
-      this.map = opts.sourcemap === 'generator' ? this.map : this.map.toJSON();
-      return this;
-    }
-
-    this.mapVisit(this.ast.nodes);
-    return this;
-  }
-};
-
-/**
- * Expose `Compiler`
- */
-
-module.exports = Compiler;
-
-
-/***/ }),
-/* 697 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * use <https://github.com/jonschlinkert/use>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var utils = __webpack_require__(698);
-
-module.exports = function base(app, opts) {
-  if (!utils.isObject(app) && typeof app !== 'function') {
-    throw new TypeError('use: expect `app` be an object or function');
-  }
-
-  if (!utils.isObject(opts)) {
-    opts = {};
-  }
-
-  var prop = utils.isString(opts.prop) ? opts.prop : 'fns';
-  if (!Array.isArray(app[prop])) {
-    utils.define(app, prop, []);
-  }
-
-  /**
-   * Define a plugin function to be passed to use. The only
-   * parameter exposed to the plugin is `app`, the object or function.
-   * passed to `use(app)`. `app` is also exposed as `this` in plugins.
-   *
-   * Additionally, **if a plugin returns a function, the function will
-   * be pushed onto the `fns` array**, allowing the plugin to be
-   * called at a later point by the `run` method.
-   *
-   * ```js
-   * var use = require('use');
-   *
-   * // define a plugin
-   * function foo(app) {
-   *   // do stuff
-   * }
-   *
-   * var app = function(){};
-   * use(app);
-   *
-   * // register plugins
-   * app.use(foo);
-   * app.use(bar);
-   * app.use(baz);
-   * ```
-   * @name .use
-   * @param {Function} `fn` plugin function to call
-   * @api public
-   */
-
-  utils.define(app, 'use', use);
-
-  /**
-   * Run all plugins on `fns`. Any plugin that returns a function
-   * when called by `use` is pushed onto the `fns` array.
-   *
-   * ```js
-   * var config = {};
-   * app.run(config);
-   * ```
-   * @name .run
-   * @param {Object} `value` Object to be modified by plugins.
-   * @return {Object} Returns the object passed to `run`
-   * @api public
-   */
-
-  utils.define(app, 'run', function(val) {
-    if (!utils.isObject(val)) return;
-    decorate(val);
-
-    var self = this || app;
-    var fns = self[prop];
-    var len = fns.length;
-    var idx = -1;
-
-    while (++idx < len) {
-      val.use(fns[idx]);
-    }
-    return val;
-  });
-
-  /**
-   * Call plugin `fn`. If a function is returned push it into the
-   * `fns` array to be called by the `run` method.
-   */
-
-  function use(fn, options) {
-    if (typeof fn !== 'function') {
-      throw new TypeError('.use expects `fn` be a function');
-    }
-
-    var self = this || app;
-    if (typeof opts.fn === 'function') {
-      opts.fn.call(self, self, options);
-    }
-
-    var plugin = fn.call(self, self);
-    if (typeof plugin === 'function') {
-      var fns = self[prop];
-      fns.push(plugin);
-    }
-    return self;
-  }
-
-  /**
-   * Ensure the `.use` method exists on `val`
-   */
-
-  function decorate(val) {
-    if (!val.use || !val.run) {
-      base(val);
-    }
-  }
-
-  return app;
-};
-
-
-/***/ }),
-/* 698 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = {};
-
-
-
-/**
- * Lazily required module dependencies
- */
-
-utils.define = __webpack_require__(685);
-utils.isObject = __webpack_require__(618);
-
-
-utils.isString = function(val) {
-  return val && typeof val === 'string';
-};
-
-/**
- * Expose `utils` modules
- */
-
-module.exports = utils;
-
-
-/***/ }),
-/* 699 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Module dependencies
- */
-
-exports.extend = __webpack_require__(669);
-exports.SourceMap = __webpack_require__(700);
-exports.sourceMapResolve = __webpack_require__(711);
-
-/**
- * Convert backslash in the given string to forward slashes
- */
-
-exports.unixify = function(fp) {
-  return fp.split(/\\+/).join('/');
-};
-
-/**
- * Return true if `val` is a non-empty string
- *
- * @param {String} `str`
- * @return {Boolean}
- */
-
-exports.isString = function(str) {
-  return str && typeof str === 'string';
-};
-
-/**
- * Cast `val` to an array
- * @return {Array}
- */
-
-exports.arrayify = function(val) {
-  if (typeof val === 'string') return [val];
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
-
-/**
- * Get the last `n` element from the given `array`
- * @param {Array} `array`
- * @return {*}
- */
-
-exports.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
-
-
-/***/ }),
-/* 700 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-exports.SourceMapGenerator = __webpack_require__(701).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(707).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(710).SourceNode;
-
-
-/***/ }),
-/* 701 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var base64VLQ = __webpack_require__(702);
-var util = __webpack_require__(704);
-var ArraySet = __webpack_require__(705).ArraySet;
-var MappingList = __webpack_require__(706).MappingList;
-
-/**
- * An instance of the SourceMapGenerator represents a source map which is
- * being built incrementally. You may pass an object with the following
- * properties:
- *
- *   - file: The filename of the generated source.
- *   - sourceRoot: A root for all relative URLs in this source map.
- */
-function SourceMapGenerator(aArgs) {
-  if (!aArgs) {
-    aArgs = {};
-  }
-  this._file = util.getArg(aArgs, 'file', null);
-  this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null);
-  this._skipValidation = util.getArg(aArgs, 'skipValidation', false);
-  this._sources = new ArraySet();
-  this._names = new ArraySet();
-  this._mappings = new MappingList();
-  this._sourcesContents = null;
-}
-
-SourceMapGenerator.prototype._version = 3;
-
-/**
- * Creates a new SourceMapGenerator based on a SourceMapConsumer
- *
- * @param aSourceMapConsumer The SourceMap.
- */
-SourceMapGenerator.fromSourceMap =
-  function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
-    var sourceRoot = aSourceMapConsumer.sourceRoot;
-    var generator = new SourceMapGenerator({
-      file: aSourceMapConsumer.file,
-      sourceRoot: sourceRoot
-    });
-    aSourceMapConsumer.eachMapping(function (mapping) {
-      var newMapping = {
-        generated: {
-          line: mapping.generatedLine,
-          column: mapping.generatedColumn
-        }
-      };
-
-      if (mapping.source != null) {
-        newMapping.source = mapping.source;
-        if (sourceRoot != null) {
-          newMapping.source = util.relative(sourceRoot, newMapping.source);
-        }
-
-        newMapping.original = {
-          line: mapping.originalLine,
-          column: mapping.originalColumn
-        };
-
-        if (mapping.name != null) {
-          newMapping.name = mapping.name;
-        }
-      }
-
-      generator.addMapping(newMapping);
-    });
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        generator.setSourceContent(sourceFile, content);
-      }
-    });
-    return generator;
-  };
-
-/**
- * Add a single mapping from original source line and column to the generated
- * source's line and column for this source map being created. The mapping
- * object should have the following properties:
- *
- *   - generated: An object with the generated line and column positions.
- *   - original: An object with the original line and column positions.
- *   - source: The original source file (relative to the sourceRoot).
- *   - name: An optional original token name for this mapping.
- */
-SourceMapGenerator.prototype.addMapping =
-  function SourceMapGenerator_addMapping(aArgs) {
-    var generated = util.getArg(aArgs, 'generated');
-    var original = util.getArg(aArgs, 'original', null);
-    var source = util.getArg(aArgs, 'source', null);
-    var name = util.getArg(aArgs, 'name', null);
-
-    if (!this._skipValidation) {
-      this._validateMapping(generated, original, source, name);
-    }
-
-    if (source != null) {
-      source = String(source);
-      if (!this._sources.has(source)) {
-        this._sources.add(source);
-      }
-    }
-
-    if (name != null) {
-      name = String(name);
-      if (!this._names.has(name)) {
-        this._names.add(name);
-      }
-    }
-
-    this._mappings.add({
-      generatedLine: generated.line,
-      generatedColumn: generated.column,
-      originalLine: original != null && original.line,
-      originalColumn: original != null && original.column,
-      source: source,
-      name: name
-    });
-  };
-
-/**
- * Set the source content for a source file.
- */
-SourceMapGenerator.prototype.setSourceContent =
-  function SourceMapGenerator_setSourceContent(aSourceFile, aSourceContent) {
-    var source = aSourceFile;
-    if (this._sourceRoot != null) {
-      source = util.relative(this._sourceRoot, source);
-    }
-
-    if (aSourceContent != null) {
-      // Add the source content to the _sourcesContents map.
-      // Create a new _sourcesContents map if the property is null.
-      if (!this._sourcesContents) {
-        this._sourcesContents = Object.create(null);
-      }
-      this._sourcesContents[util.toSetString(source)] = aSourceContent;
-    } else if (this._sourcesContents) {
-      // Remove the source file from the _sourcesContents map.
-      // If the _sourcesContents map is empty, set the property to null.
-      delete this._sourcesContents[util.toSetString(source)];
-      if (Object.keys(this._sourcesContents).length === 0) {
-        this._sourcesContents = null;
-      }
-    }
-  };
-
-/**
- * Applies the mappings of a sub-source-map for a specific source file to the
- * source map being generated. Each mapping to the supplied source file is
- * rewritten using the supplied source map. Note: The resolution for the
- * resulting mappings is the minimium of this map and the supplied map.
- *
- * @param aSourceMapConsumer The source map to be applied.
- * @param aSourceFile Optional. The filename of the source file.
- *        If omitted, SourceMapConsumer's file property will be used.
- * @param aSourceMapPath Optional. The dirname of the path to the source map
- *        to be applied. If relative, it is relative to the SourceMapConsumer.
- *        This parameter is needed when the two source maps aren't in the same
- *        directory, and the source map to be applied contains relative source
- *        paths. If so, those relative source paths need to be rewritten
- *        relative to the SourceMapGenerator.
- */
-SourceMapGenerator.prototype.applySourceMap =
-  function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile, aSourceMapPath) {
-    var sourceFile = aSourceFile;
-    // If aSourceFile is omitted, we will use the file property of the SourceMap
-    if (aSourceFile == null) {
-      if (aSourceMapConsumer.file == null) {
-        throw new Error(
-          'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' +
-          'or the source map\'s "file" property. Both were omitted.'
-        );
-      }
-      sourceFile = aSourceMapConsumer.file;
-    }
-    var sourceRoot = this._sourceRoot;
-    // Make "sourceFile" relative if an absolute Url is passed.
-    if (sourceRoot != null) {
-      sourceFile = util.relative(sourceRoot, sourceFile);
-    }
-    // Applying the SourceMap can add and remove items from the sources and
-    // the names array.
-    var newSources = new ArraySet();
-    var newNames = new ArraySet();
-
-    // Find mappings for the "sourceFile"
-    this._mappings.unsortedForEach(function (mapping) {
-      if (mapping.source === sourceFile && mapping.originalLine != null) {
-        // Check if it can be mapped by the source map, then update the mapping.
-        var original = aSourceMapConsumer.originalPositionFor({
-          line: mapping.originalLine,
-          column: mapping.originalColumn
-        });
-        if (original.source != null) {
-          // Copy mapping
-          mapping.source = original.source;
-          if (aSourceMapPath != null) {
-            mapping.source = util.join(aSourceMapPath, mapping.source)
-          }
-          if (sourceRoot != null) {
-            mapping.source = util.relative(sourceRoot, mapping.source);
-          }
-          mapping.originalLine = original.line;
-          mapping.originalColumn = original.column;
-          if (original.name != null) {
-            mapping.name = original.name;
-          }
-        }
-      }
-
-      var source = mapping.source;
-      if (source != null && !newSources.has(source)) {
-        newSources.add(source);
-      }
-
-      var name = mapping.name;
-      if (name != null && !newNames.has(name)) {
-        newNames.add(name);
-      }
-
-    }, this);
-    this._sources = newSources;
-    this._names = newNames;
-
-    // Copy sourcesContents of applied map.
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        if (aSourceMapPath != null) {
-          sourceFile = util.join(aSourceMapPath, sourceFile);
-        }
-        if (sourceRoot != null) {
-          sourceFile = util.relative(sourceRoot, sourceFile);
-        }
-        this.setSourceContent(sourceFile, content);
-      }
-    }, this);
-  };
-
-/**
- * A mapping can have one of the three levels of data:
- *
- *   1. Just the generated position.
- *   2. The Generated position, original position, and original source.
- *   3. Generated and original position, original source, as well as a name
- *      token.
- *
- * To maintain consistency, we validate that any new mapping being added falls
- * in to one of these categories.
- */
-SourceMapGenerator.prototype._validateMapping =
-  function SourceMapGenerator_validateMapping(aGenerated, aOriginal, aSource,
-                                              aName) {
-    // When aOriginal is truthy but has empty values for .line and .column,
-    // it is most likely a programmer error. In this case we throw a very
-    // specific error message to try to guide them the right way.
-    // For example: https://github.com/Polymer/polymer-bundler/pull/519
-    if (aOriginal && typeof aOriginal.line !== 'number' && typeof aOriginal.column !== 'number') {
-        throw new Error(
-            'original.line and original.column are not numbers -- you probably meant to omit ' +
-            'the original mapping entirely and only map the generated position. If so, pass ' +
-            'null for the original mapping instead of an object with empty or null values.'
-        );
-    }
-
-    if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
-        && aGenerated.line > 0 && aGenerated.column >= 0
-        && !aOriginal && !aSource && !aName) {
-      // Case 1.
-      return;
-    }
-    else if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
-             && aOriginal && 'line' in aOriginal && 'column' in aOriginal
-             && aGenerated.line > 0 && aGenerated.column >= 0
-             && aOriginal.line > 0 && aOriginal.column >= 0
-             && aSource) {
-      // Cases 2 and 3.
-      return;
-    }
-    else {
-      throw new Error('Invalid mapping: ' + JSON.stringify({
-        generated: aGenerated,
-        source: aSource,
-        original: aOriginal,
-        name: aName
-      }));
-    }
-  };
-
-/**
- * Serialize the accumulated mappings in to the stream of base 64 VLQs
- * specified by the source map format.
- */
-SourceMapGenerator.prototype._serializeMappings =
-  function SourceMapGenerator_serializeMappings() {
-    var previousGeneratedColumn = 0;
-    var previousGeneratedLine = 1;
-    var previousOriginalColumn = 0;
-    var previousOriginalLine = 0;
-    var previousName = 0;
-    var previousSource = 0;
-    var result = '';
-    var next;
-    var mapping;
-    var nameIdx;
-    var sourceIdx;
-
-    var mappings = this._mappings.toArray();
-    for (var i = 0, len = mappings.length; i < len; i++) {
-      mapping = mappings[i];
-      next = ''
-
-      if (mapping.generatedLine !== previousGeneratedLine) {
-        previousGeneratedColumn = 0;
-        while (mapping.generatedLine !== previousGeneratedLine) {
-          next += ';';
-          previousGeneratedLine++;
-        }
-      }
-      else {
-        if (i > 0) {
-          if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) {
-            continue;
-          }
-          next += ',';
-        }
-      }
-
-      next += base64VLQ.encode(mapping.generatedColumn
-                                 - previousGeneratedColumn);
-      previousGeneratedColumn = mapping.generatedColumn;
-
-      if (mapping.source != null) {
-        sourceIdx = this._sources.indexOf(mapping.source);
-        next += base64VLQ.encode(sourceIdx - previousSource);
-        previousSource = sourceIdx;
-
-        // lines are stored 0-based in SourceMap spec version 3
-        next += base64VLQ.encode(mapping.originalLine - 1
-                                   - previousOriginalLine);
-        previousOriginalLine = mapping.originalLine - 1;
-
-        next += base64VLQ.encode(mapping.originalColumn
-                                   - previousOriginalColumn);
-        previousOriginalColumn = mapping.originalColumn;
-
-        if (mapping.name != null) {
-          nameIdx = this._names.indexOf(mapping.name);
-          next += base64VLQ.encode(nameIdx - previousName);
-          previousName = nameIdx;
-        }
-      }
-
-      result += next;
-    }
-
-    return result;
-  };
-
-SourceMapGenerator.prototype._generateSourcesContent =
-  function SourceMapGenerator_generateSourcesContent(aSources, aSourceRoot) {
-    return aSources.map(function (source) {
-      if (!this._sourcesContents) {
-        return null;
-      }
-      if (aSourceRoot != null) {
-        source = util.relative(aSourceRoot, source);
-      }
-      var key = util.toSetString(source);
-      return Object.prototype.hasOwnProperty.call(this._sourcesContents, key)
-        ? this._sourcesContents[key]
-        : null;
-    }, this);
-  };
-
-/**
- * Externalize the source map.
- */
-SourceMapGenerator.prototype.toJSON =
-  function SourceMapGenerator_toJSON() {
-    var map = {
-      version: this._version,
-      sources: this._sources.toArray(),
-      names: this._names.toArray(),
-      mappings: this._serializeMappings()
-    };
-    if (this._file != null) {
-      map.file = this._file;
-    }
-    if (this._sourceRoot != null) {
-      map.sourceRoot = this._sourceRoot;
-    }
-    if (this._sourcesContents) {
-      map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot);
-    }
-
-    return map;
-  };
-
-/**
- * Render the source map being generated to a string.
- */
-SourceMapGenerator.prototype.toString =
-  function SourceMapGenerator_toString() {
-    return JSON.stringify(this.toJSON());
-  };
-
-exports.SourceMapGenerator = SourceMapGenerator;
-
-
-/***/ }),
-/* 702 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Based on the Base 64 VLQ implementation in Closure Compiler:
- * https://code.google.com/p/closure-compiler/source/browse/trunk/src/com/google/debugging/sourcemap/Base64VLQ.java
- *
- * Copyright 2011 The Closure Compiler Authors. All rights reserved.
- * 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.
- *  * Neither the name of Google Inc. nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTORS 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 base64 = __webpack_require__(703);
-
-// 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,
-// the next four bits are the actual value, and the 6th bit is the
-// continuation bit. The continuation bit tells us whether there are more
-// digits in this value following this digit.
-//
-//   Continuation
-//   |    Sign
-//   |    |
-//   V    V
-//   101011
-
-var VLQ_BASE_SHIFT = 5;
-
-// binary: 100000
-var VLQ_BASE = 1 << VLQ_BASE_SHIFT;
-
-// binary: 011111
-var VLQ_BASE_MASK = VLQ_BASE - 1;
-
-// binary: 100000
-var VLQ_CONTINUATION_BIT = VLQ_BASE;
-
-/**
- * Converts from a two-complement value to a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
- *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
- */
-function toVLQSigned(aValue) {
-  return aValue < 0
-    ? ((-aValue) << 1) + 1
-    : (aValue << 1) + 0;
-}
-
-/**
- * Converts to a two-complement value from a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
- *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
- */
-function fromVLQSigned(aValue) {
-  var isNegative = (aValue & 1) === 1;
-  var shifted = aValue >> 1;
-  return isNegative
-    ? -shifted
-    : shifted;
-}
-
-/**
- * Returns the base 64 VLQ encoded value.
- */
-exports.encode = function base64VLQ_encode(aValue) {
-  var encoded = "";
-  var digit;
-
-  var vlq = toVLQSigned(aValue);
-
-  do {
-    digit = vlq & VLQ_BASE_MASK;
-    vlq >>>= VLQ_BASE_SHIFT;
-    if (vlq > 0) {
-      // There are still more digits in this value, so we must make sure the
-      // continuation bit is marked.
-      digit |= VLQ_CONTINUATION_BIT;
-    }
-    encoded += base64.encode(digit);
-  } while (vlq > 0);
-
-  return encoded;
-};
-
-/**
- * Decodes the next base 64 VLQ value from the given string and returns the
- * value and the rest of the string via the out parameter.
- */
-exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
-  var strLen = aStr.length;
-  var result = 0;
-  var shift = 0;
-  var continuation, digit;
-
-  do {
-    if (aIndex >= strLen) {
-      throw new Error("Expected more digits in base 64 VLQ value.");
-    }
-
-    digit = base64.decode(aStr.charCodeAt(aIndex++));
-    if (digit === -1) {
-      throw new Error("Invalid base64 digit: " + aStr.charAt(aIndex - 1));
-    }
-
-    continuation = !!(digit & VLQ_CONTINUATION_BIT);
-    digit &= VLQ_BASE_MASK;
-    result = result + (digit << shift);
-    shift += VLQ_BASE_SHIFT;
-  } while (continuation);
-
-  aOutParam.value = fromVLQSigned(result);
-  aOutParam.rest = aIndex;
-};
-
-
-/***/ }),
-/* 703 */
-/***/ (function(module, exports) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var intToCharMap = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
-
-/**
- * Encode an integer in the range of 0 to 63 to a single base 64 digit.
- */
-exports.encode = function (number) {
-  if (0 <= number && number < intToCharMap.length) {
-    return intToCharMap[number];
-  }
-  throw new TypeError("Must be between 0 and 63: " + number);
-};
-
-/**
- * Decode a single base 64 character code digit to an integer. Returns -1 on
- * failure.
- */
-exports.decode = function (charCode) {
-  var bigA = 65;     // 'A'
-  var bigZ = 90;     // 'Z'
-
-  var littleA = 97;  // 'a'
-  var littleZ = 122; // 'z'
-
-  var zero = 48;     // '0'
-  var nine = 57;     // '9'
-
-  var plus = 43;     // '+'
-  var slash = 47;    // '/'
-
-  var littleOffset = 26;
-  var numberOffset = 52;
-
-  // 0 - 25: ABCDEFGHIJKLMNOPQRSTUVWXYZ
-  if (bigA <= charCode && charCode <= bigZ) {
-    return (charCode - bigA);
-  }
-
-  // 26 - 51: abcdefghijklmnopqrstuvwxyz
-  if (littleA <= charCode && charCode <= littleZ) {
-    return (charCode - littleA + littleOffset);
-  }
-
-  // 52 - 61: 0123456789
-  if (zero <= charCode && charCode <= nine) {
-    return (charCode - zero + numberOffset);
-  }
-
-  // 62: +
-  if (charCode == plus) {
-    return 62;
-  }
-
-  // 63: /
-  if (charCode == slash) {
-    return 63;
-  }
-
-  // Invalid base64 digit.
-  return -1;
-};
-
-
-/***/ }),
-/* 704 */
-/***/ (function(module, exports) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-/**
- * This is a helper function for getting values from parameter/options
- * objects.
- *
- * @param args The object we are extracting values from
- * @param name The name of the property we are getting.
- * @param defaultValue An optional value to return if the property is missing
- * from the object. If this is not specified and the property is missing, an
- * error will be thrown.
- */
-function getArg(aArgs, aName, aDefaultValue) {
-  if (aName in aArgs) {
-    return aArgs[aName];
-  } else if (arguments.length === 3) {
-    return aDefaultValue;
-  } else {
-    throw new Error('"' + aName + '" is a required argument.');
-  }
-}
-exports.getArg = getArg;
-
-var urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.]*)(?::(\d+))?(\S*)$/;
-var dataUrlRegexp = /^data:.+\,.+$/;
-
-function urlParse(aUrl) {
-  var match = aUrl.match(urlRegexp);
-  if (!match) {
-    return null;
-  }
-  return {
-    scheme: match[1],
-    auth: match[2],
-    host: match[3],
-    port: match[4],
-    path: match[5]
-  };
-}
-exports.urlParse = urlParse;
-
-function urlGenerate(aParsedUrl) {
-  var url = '';
-  if (aParsedUrl.scheme) {
-    url += aParsedUrl.scheme + ':';
-  }
-  url += '//';
-  if (aParsedUrl.auth) {
-    url += aParsedUrl.auth + '@';
-  }
-  if (aParsedUrl.host) {
-    url += aParsedUrl.host;
-  }
-  if (aParsedUrl.port) {
-    url += ":" + aParsedUrl.port
-  }
-  if (aParsedUrl.path) {
-    url += aParsedUrl.path;
-  }
-  return url;
-}
-exports.urlGenerate = urlGenerate;
-
-/**
- * Normalizes a path, or the path portion of a URL:
- *
- * - Replaces consecutive slashes with one slash.
- * - Removes unnecessary '.' parts.
- * - Removes unnecessary '<dir>/..' parts.
- *
- * Based on code in the Node.js 'path' core module.
- *
- * @param aPath The path or url to normalize.
- */
-function normalize(aPath) {
-  var path = aPath;
-  var url = urlParse(aPath);
-  if (url) {
-    if (!url.path) {
-      return aPath;
-    }
-    path = url.path;
-  }
-  var isAbsolute = exports.isAbsolute(path);
-
-  var parts = path.split(/\/+/);
-  for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
-    part = parts[i];
-    if (part === '.') {
-      parts.splice(i, 1);
-    } else if (part === '..') {
-      up++;
-    } else if (up > 0) {
-      if (part === '') {
-        // The first part is blank if the path is absolute. Trying to go
-        // above the root is a no-op. Therefore we can remove all '..' parts
-        // directly after the root.
-        parts.splice(i + 1, up);
-        up = 0;
-      } else {
-        parts.splice(i, 2);
-        up--;
-      }
-    }
-  }
-  path = parts.join('/');
-
-  if (path === '') {
-    path = isAbsolute ? '/' : '.';
-  }
-
-  if (url) {
-    url.path = path;
-    return urlGenerate(url);
-  }
-  return path;
-}
-exports.normalize = normalize;
-
-/**
- * Joins two paths/URLs.
- *
- * @param aRoot The root path or URL.
- * @param aPath The path or URL to be joined with the root.
- *
- * - If aPath is a URL or a data URI, aPath is returned, unless aPath is a
- *   scheme-relative URL: Then the scheme of aRoot, if any, is prepended
- *   first.
- * - Otherwise aPath is a path. If aRoot is a URL, then its path portion
- *   is updated with the result and aRoot is returned. Otherwise the result
- *   is returned.
- *   - If aPath is absolute, the result is aPath.
- *   - Otherwise the two paths are joined with a slash.
- * - Joining for example 'http://' and 'www.example.com' is also supported.
- */
-function join(aRoot, aPath) {
-  if (aRoot === "") {
-    aRoot = ".";
-  }
-  if (aPath === "") {
-    aPath = ".";
-  }
-  var aPathUrl = urlParse(aPath);
-  var aRootUrl = urlParse(aRoot);
-  if (aRootUrl) {
-    aRoot = aRootUrl.path || '/';
-  }
-
-  // `join(foo, '//www.example.org')`
-  if (aPathUrl && !aPathUrl.scheme) {
-    if (aRootUrl) {
-      aPathUrl.scheme = aRootUrl.scheme;
-    }
-    return urlGenerate(aPathUrl);
-  }
-
-  if (aPathUrl || aPath.match(dataUrlRegexp)) {
-    return aPath;
-  }
-
-  // `join('http://', 'www.example.com')`
-  if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
-    aRootUrl.host = aPath;
-    return urlGenerate(aRootUrl);
-  }
-
-  var joined = aPath.charAt(0) === '/'
-    ? aPath
-    : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath);
-
-  if (aRootUrl) {
-    aRootUrl.path = joined;
-    return urlGenerate(aRootUrl);
-  }
-  return joined;
-}
-exports.join = join;
-
-exports.isAbsolute = function (aPath) {
-  return aPath.charAt(0) === '/' || !!aPath.match(urlRegexp);
-};
-
-/**
- * Make a path relative to a URL or another path.
- *
- * @param aRoot The root path or URL.
- * @param aPath The path or URL to be made relative to aRoot.
- */
-function relative(aRoot, aPath) {
-  if (aRoot === "") {
-    aRoot = ".";
-  }
-
-  aRoot = aRoot.replace(/\/$/, '');
-
-  // It is possible for the path to be above the root. In this case, simply
-  // checking whether the root is a prefix of the path won't work. Instead, we
-  // need to remove components from the root one by one, until either we find
-  // a prefix that fits, or we run out of components to remove.
-  var level = 0;
-  while (aPath.indexOf(aRoot + '/') !== 0) {
-    var index = aRoot.lastIndexOf("/");
-    if (index < 0) {
-      return aPath;
-    }
-
-    // If the only part of the root that is left is the scheme (i.e. http://,
-    // file:///, etc.), one or more slashes (/), or simply nothing at all, we
-    // have exhausted all components, so the path is not relative to the root.
-    aRoot = aRoot.slice(0, index);
-    if (aRoot.match(/^([^\/]+:\/)?\/*$/)) {
-      return aPath;
-    }
-
-    ++level;
-  }
-
-  // Make sure we add a "../" for each component we removed from the root.
-  return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
-}
-exports.relative = relative;
-
-var supportsNullProto = (function () {
-  var obj = Object.create(null);
-  return !('__proto__' in obj);
-}());
-
-function identity (s) {
-  return s;
-}
-
-/**
- * Because behavior goes wacky when you set `__proto__` on objects, we
- * have to prefix all the strings in our set with an arbitrary character.
- *
- * See https://github.com/mozilla/source-map/pull/31 and
- * https://github.com/mozilla/source-map/issues/30
- *
- * @param String aStr
- */
-function toSetString(aStr) {
-  if (isProtoString(aStr)) {
-    return '$' + aStr;
-  }
-
-  return aStr;
-}
-exports.toSetString = supportsNullProto ? identity : toSetString;
-
-function fromSetString(aStr) {
-  if (isProtoString(aStr)) {
-    return aStr.slice(1);
-  }
-
-  return aStr;
-}
-exports.fromSetString = supportsNullProto ? identity : fromSetString;
-
-function isProtoString(s) {
-  if (!s) {
-    return false;
-  }
-
-  var length = s.length;
-
-  if (length < 9 /* "__proto__".length */) {
-    return false;
-  }
-
-  if (s.charCodeAt(length - 1) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 2) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 3) !== 111 /* 'o' */ ||
-      s.charCodeAt(length - 4) !== 116 /* 't' */ ||
-      s.charCodeAt(length - 5) !== 111 /* 'o' */ ||
-      s.charCodeAt(length - 6) !== 114 /* 'r' */ ||
-      s.charCodeAt(length - 7) !== 112 /* 'p' */ ||
-      s.charCodeAt(length - 8) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 9) !== 95  /* '_' */) {
-    return false;
-  }
-
-  for (var i = length - 10; i >= 0; i--) {
-    if (s.charCodeAt(i) !== 36 /* '$' */) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/**
- * Comparator between two mappings where the original positions are compared.
- *
- * Optionally pass in `true` as `onlyCompareGenerated` to consider two
- * mappings with the same original source/line/column, but different generated
- * line and column the same. Useful when searching for a mapping with a
- * stubbed out mapping.
- */
-function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) {
-  var cmp = mappingA.source - mappingB.source;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0 || onlyCompareOriginal) {
-    return cmp;
-  }
-
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  return mappingA.name - mappingB.name;
-}
-exports.compareByOriginalPositions = compareByOriginalPositions;
-
-/**
- * Comparator between two mappings with deflated source and name indices where
- * the generated positions are compared.
- *
- * Optionally pass in `true` as `onlyCompareGenerated` to consider two
- * mappings with the same generated line and column, but different
- * source/name/original line and column the same. Useful when searching for a
- * mapping with a stubbed out mapping.
- */
-function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) {
-  var cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0 || onlyCompareGenerated) {
-    return cmp;
-  }
-
-  cmp = mappingA.source - mappingB.source;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  return mappingA.name - mappingB.name;
-}
-exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated;
-
-function strcmp(aStr1, aStr2) {
-  if (aStr1 === aStr2) {
-    return 0;
-  }
-
-  if (aStr1 > aStr2) {
-    return 1;
-  }
-
-  return -1;
-}
-
-/**
- * Comparator between two mappings with inflated source and name strings where
- * the generated positions are compared.
- */
-function compareByGeneratedPositionsInflated(mappingA, mappingB) {
-  var cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = strcmp(mappingA.source, mappingB.source);
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  return strcmp(mappingA.name, mappingB.name);
-}
-exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated;
-
-
-/***/ }),
-/* 705 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var util = __webpack_require__(704);
-var has = Object.prototype.hasOwnProperty;
-var hasNativeMap = typeof Map !== "undefined";
-
-/**
- * A data structure which is a combination of an array and a set. Adding a new
- * member is O(1), testing for membership is O(1), and finding the index of an
- * element is O(1). Removing elements from the set is not supported. Only
- * strings are supported for membership.
- */
-function ArraySet() {
-  this._array = [];
-  this._set = hasNativeMap ? new Map() : Object.create(null);
-}
-
-/**
- * Static method for creating ArraySet instances from an existing array.
- */
-ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
-  var set = new ArraySet();
-  for (var i = 0, len = aArray.length; i < len; i++) {
-    set.add(aArray[i], aAllowDuplicates);
-  }
-  return set;
-};
-
-/**
- * Return how many unique items are in this ArraySet. If duplicates have been
- * added, than those do not count towards the size.
- *
- * @returns Number
- */
-ArraySet.prototype.size = function ArraySet_size() {
-  return hasNativeMap ? this._set.size : Object.getOwnPropertyNames(this._set).length;
-};
-
-/**
- * Add the given string to this set.
- *
- * @param String aStr
- */
-ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
-  var sStr = hasNativeMap ? aStr : util.toSetString(aStr);
-  var isDuplicate = hasNativeMap ? this.has(aStr) : has.call(this._set, sStr);
-  var idx = this._array.length;
-  if (!isDuplicate || aAllowDuplicates) {
-    this._array.push(aStr);
-  }
-  if (!isDuplicate) {
-    if (hasNativeMap) {
-      this._set.set(aStr, idx);
-    } else {
-      this._set[sStr] = idx;
-    }
-  }
-};
-
-/**
- * Is the given string a member of this set?
- *
- * @param String aStr
- */
-ArraySet.prototype.has = function ArraySet_has(aStr) {
-  if (hasNativeMap) {
-    return this._set.has(aStr);
-  } else {
-    var sStr = util.toSetString(aStr);
-    return has.call(this._set, sStr);
-  }
-};
-
-/**
- * What is the index of the given string in the array?
- *
- * @param String aStr
- */
-ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
-  if (hasNativeMap) {
-    var idx = this._set.get(aStr);
-    if (idx >= 0) {
-        return idx;
-    }
-  } else {
-    var sStr = util.toSetString(aStr);
-    if (has.call(this._set, sStr)) {
-      return this._set[sStr];
-    }
-  }
-
-  throw new Error('"' + aStr + '" is not in the set.');
-};
-
-/**
- * What is the element at the given index?
- *
- * @param Number aIdx
- */
-ArraySet.prototype.at = function ArraySet_at(aIdx) {
-  if (aIdx >= 0 && aIdx < this._array.length) {
-    return this._array[aIdx];
-  }
-  throw new Error('No element indexed by ' + aIdx);
-};
-
-/**
- * Returns the array representation of this set (which has the proper indices
- * indicated by indexOf). Note that this is a copy of the internal array used
- * for storing the members so that no one can mess with internal state.
- */
-ArraySet.prototype.toArray = function ArraySet_toArray() {
-  return this._array.slice();
-};
-
-exports.ArraySet = ArraySet;
-
-
-/***/ }),
-/* 706 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2014 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var util = __webpack_require__(704);
-
-/**
- * Determine whether mappingB is after mappingA with respect to generated
- * position.
- */
-function generatedPositionAfter(mappingA, mappingB) {
-  // Optimized for most common case
-  var lineA = mappingA.generatedLine;
-  var lineB = mappingB.generatedLine;
-  var columnA = mappingA.generatedColumn;
-  var columnB = mappingB.generatedColumn;
-  return lineB > lineA || lineB == lineA && columnB >= columnA ||
-         util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0;
-}
-
-/**
- * A data structure to provide a sorted view of accumulated mappings in a
- * performance conscious manner. It trades a neglibable overhead in general
- * case for a large speedup in case of mappings being added in order.
- */
-function MappingList() {
-  this._array = [];
-  this._sorted = true;
-  // Serves as infimum
-  this._last = {generatedLine: -1, generatedColumn: 0};
-}
-
-/**
- * Iterate through internal items. This method takes the same arguments that
- * `Array.prototype.forEach` takes.
- *
- * NOTE: The order of the mappings is NOT guaranteed.
- */
-MappingList.prototype.unsortedForEach =
-  function MappingList_forEach(aCallback, aThisArg) {
-    this._array.forEach(aCallback, aThisArg);
-  };
-
-/**
- * Add the given source mapping.
- *
- * @param Object aMapping
- */
-MappingList.prototype.add = function MappingList_add(aMapping) {
-  if (generatedPositionAfter(this._last, aMapping)) {
-    this._last = aMapping;
-    this._array.push(aMapping);
-  } else {
-    this._sorted = false;
-    this._array.push(aMapping);
-  }
-};
-
-/**
- * Returns the flat, sorted array of mappings. The mappings are sorted by
- * generated position.
- *
- * WARNING: This method returns internal data without copying, for
- * performance. The return value must NOT be mutated, and should be treated as
- * an immutable borrow. If you want to take ownership, you must make your own
- * copy.
- */
-MappingList.prototype.toArray = function MappingList_toArray() {
-  if (!this._sorted) {
-    this._array.sort(util.compareByGeneratedPositionsInflated);
-    this._sorted = true;
-  }
-  return this._array;
-};
-
-exports.MappingList = MappingList;
-
-
-/***/ }),
-/* 707 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var util = __webpack_require__(704);
-var binarySearch = __webpack_require__(708);
-var ArraySet = __webpack_require__(705).ArraySet;
-var base64VLQ = __webpack_require__(702);
-var quickSort = __webpack_require__(709).quickSort;
-
-function SourceMapConsumer(aSourceMap) {
-  var sourceMap = aSourceMap;
-  if (typeof aSourceMap === 'string') {
-    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
-  }
-
-  return sourceMap.sections != null
-    ? new IndexedSourceMapConsumer(sourceMap)
-    : new BasicSourceMapConsumer(sourceMap);
-}
-
-SourceMapConsumer.fromSourceMap = function(aSourceMap) {
-  return BasicSourceMapConsumer.fromSourceMap(aSourceMap);
-}
-
-/**
- * The version of the source mapping spec that we are consuming.
- */
-SourceMapConsumer.prototype._version = 3;
-
-// `__generatedMappings` and `__originalMappings` are arrays that hold the
-// parsed mapping coordinates from the source map's "mappings" attribute. They
-// are lazily instantiated, accessed via the `_generatedMappings` and
-// `_originalMappings` getters respectively, and we only parse the mappings
-// and create these arrays once queried for a source location. We jump through
-// these hoops because there can be many thousands of mappings, and parsing
-// them is expensive, so we only want to do it if we must.
-//
-// Each object in the arrays is of the form:
-//
-//     {
-//       generatedLine: The line number in the generated code,
-//       generatedColumn: The column number in the generated code,
-//       source: The path to the original source file that generated this
-//               chunk of code,
-//       originalLine: The line number in the original source that
-//                     corresponds to this chunk of generated code,
-//       originalColumn: The column number in the original source that
-//                       corresponds to this chunk of generated code,
-//       name: The name of the original symbol which generated this chunk of
-//             code.
-//     }
-//
-// All properties except for `generatedLine` and `generatedColumn` can be
-// `null`.
-//
-// `_generatedMappings` is ordered by the generated positions.
-//
-// `_originalMappings` is ordered by the original positions.
-
-SourceMapConsumer.prototype.__generatedMappings = null;
-Object.defineProperty(SourceMapConsumer.prototype, '_generatedMappings', {
-  get: function () {
-    if (!this.__generatedMappings) {
-      this._parseMappings(this._mappings, this.sourceRoot);
-    }
-
-    return this.__generatedMappings;
-  }
-});
-
-SourceMapConsumer.prototype.__originalMappings = null;
-Object.defineProperty(SourceMapConsumer.prototype, '_originalMappings', {
-  get: function () {
-    if (!this.__originalMappings) {
-      this._parseMappings(this._mappings, this.sourceRoot);
-    }
-
-    return this.__originalMappings;
-  }
-});
-
-SourceMapConsumer.prototype._charIsMappingSeparator =
-  function SourceMapConsumer_charIsMappingSeparator(aStr, index) {
-    var c = aStr.charAt(index);
-    return c === ";" || c === ",";
-  };
-
-/**
- * Parse the mappings in a string in to a data structure which we can easily
- * query (the ordered arrays in the `this.__generatedMappings` and
- * `this.__originalMappings` properties).
- */
-SourceMapConsumer.prototype._parseMappings =
-  function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
-    throw new Error("Subclasses must implement _parseMappings");
-  };
-
-SourceMapConsumer.GENERATED_ORDER = 1;
-SourceMapConsumer.ORIGINAL_ORDER = 2;
-
-SourceMapConsumer.GREATEST_LOWER_BOUND = 1;
-SourceMapConsumer.LEAST_UPPER_BOUND = 2;
-
-/**
- * Iterate over each mapping between an original source/line/column and a
- * generated line/column in this source map.
- *
- * @param Function aCallback
- *        The function that is called with each mapping.
- * @param Object aContext
- *        Optional. If specified, this object will be the value of `this` every
- *        time that `aCallback` is called.
- * @param aOrder
- *        Either `SourceMapConsumer.GENERATED_ORDER` or
- *        `SourceMapConsumer.ORIGINAL_ORDER`. Specifies whether you want to
- *        iterate over the mappings sorted by the generated file's line/column
- *        order or the original's source/line/column order, respectively. Defaults to
- *        `SourceMapConsumer.GENERATED_ORDER`.
- */
-SourceMapConsumer.prototype.eachMapping =
-  function SourceMapConsumer_eachMapping(aCallback, aContext, aOrder) {
-    var context = aContext || null;
-    var order = aOrder || SourceMapConsumer.GENERATED_ORDER;
-
-    var mappings;
-    switch (order) {
-    case SourceMapConsumer.GENERATED_ORDER:
-      mappings = this._generatedMappings;
-      break;
-    case SourceMapConsumer.ORIGINAL_ORDER:
-      mappings = this._originalMappings;
-      break;
-    default:
-      throw new Error("Unknown order of iteration.");
-    }
-
-    var sourceRoot = this.sourceRoot;
-    mappings.map(function (mapping) {
-      var source = mapping.source === null ? null : this._sources.at(mapping.source);
-      if (source != null && sourceRoot != null) {
-        source = util.join(sourceRoot, source);
-      }
-      return {
-        source: source,
-        generatedLine: mapping.generatedLine,
-        generatedColumn: mapping.generatedColumn,
-        originalLine: mapping.originalLine,
-        originalColumn: mapping.originalColumn,
-        name: mapping.name === null ? null : this._names.at(mapping.name)
-      };
-    }, this).forEach(aCallback, context);
-  };
-
-/**
- * Returns all generated line and column information for the original source,
- * line, and column provided. If no column is provided, returns all mappings
- * corresponding to a either the line we are searching for or the next
- * closest line that has any mappings. Otherwise, returns all mappings
- * corresponding to the given line and either the column we are searching for
- * or the next closest column that has any offsets.
- *
- * The only argument is an object with the following properties:
- *
- *   - source: The filename of the original source.
- *   - line: The line number in the original source.
- *   - column: Optional. the column number in the original source.
- *
- * and an array of objects is returned, each with the following properties:
- *
- *   - line: The line number in the generated source, or null.
- *   - column: The column number in the generated source, or null.
- */
-SourceMapConsumer.prototype.allGeneratedPositionsFor =
-  function SourceMapConsumer_allGeneratedPositionsFor(aArgs) {
-    var line = util.getArg(aArgs, 'line');
-
-    // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
-    // returns the index of the closest mapping less than the needle. By
-    // setting needle.originalColumn to 0, we thus find the last mapping for
-    // the given line, provided such a mapping exists.
-    var needle = {
-      source: util.getArg(aArgs, 'source'),
-      originalLine: line,
-      originalColumn: util.getArg(aArgs, 'column', 0)
-    };
-
-    if (this.sourceRoot != null) {
-      needle.source = util.relative(this.sourceRoot, needle.source);
-    }
-    if (!this._sources.has(needle.source)) {
-      return [];
-    }
-    needle.source = this._sources.indexOf(needle.source);
-
-    var mappings = [];
-
-    var index = this._findMapping(needle,
-                                  this._originalMappings,
-                                  "originalLine",
-                                  "originalColumn",
-                                  util.compareByOriginalPositions,
-                                  binarySearch.LEAST_UPPER_BOUND);
-    if (index >= 0) {
-      var mapping = this._originalMappings[index];
-
-      if (aArgs.column === undefined) {
-        var originalLine = mapping.originalLine;
-
-        // Iterate until either we run out of mappings, or we run into
-        // a mapping for a different line than the one we found. Since
-        // mappings are sorted, this is guaranteed to find all mappings for
-        // the line we found.
-        while (mapping && mapping.originalLine === originalLine) {
-          mappings.push({
-            line: util.getArg(mapping, 'generatedLine', null),
-            column: util.getArg(mapping, 'generatedColumn', null),
-            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-          });
-
-          mapping = this._originalMappings[++index];
-        }
-      } else {
-        var originalColumn = mapping.originalColumn;
-
-        // Iterate until either we run out of mappings, or we run into
-        // a mapping for a different line than the one we were searching for.
-        // Since mappings are sorted, this is guaranteed to find all mappings for
-        // the line we are searching for.
-        while (mapping &&
-               mapping.originalLine === line &&
-               mapping.originalColumn == originalColumn) {
-          mappings.push({
-            line: util.getArg(mapping, 'generatedLine', null),
-            column: util.getArg(mapping, 'generatedColumn', null),
-            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-          });
-
-          mapping = this._originalMappings[++index];
-        }
-      }
-    }
-
-    return mappings;
-  };
-
-exports.SourceMapConsumer = SourceMapConsumer;
-
-/**
- * A BasicSourceMapConsumer instance represents a parsed source map which we can
- * query for information about the original file positions by giving it a file
- * position in the generated source.
- *
- * The only parameter is the raw source map (either as a JSON string, or
- * already parsed to an object). According to the spec, source maps have the
- * following attributes:
- *
- *   - version: Which version of the source map spec this map is following.
- *   - sources: An array of URLs to the original source files.
- *   - names: An array of identifiers which can be referrenced by individual mappings.
- *   - sourceRoot: Optional. The URL root from which all sources are relative.
- *   - sourcesContent: Optional. An array of contents of the original source files.
- *   - mappings: A string of base64 VLQs which contain the actual mappings.
- *   - file: Optional. The generated file this source map is associated with.
- *
- * Here is an example source map, taken from the source map spec[0]:
- *
- *     {
- *       version : 3,
- *       file: "out.js",
- *       sourceRoot : "",
- *       sources: ["foo.js", "bar.js"],
- *       names: ["src", "maps", "are", "fun"],
- *       mappings: "AA,AB;;ABCDE;"
- *     }
- *
- * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit?pli=1#
- */
-function BasicSourceMapConsumer(aSourceMap) {
-  var sourceMap = aSourceMap;
-  if (typeof aSourceMap === 'string') {
-    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
-  }
-
-  var version = util.getArg(sourceMap, 'version');
-  var sources = util.getArg(sourceMap, 'sources');
-  // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which
-  // requires the array) to play nice here.
-  var names = util.getArg(sourceMap, 'names', []);
-  var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
-  var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
-  var mappings = util.getArg(sourceMap, 'mappings');
-  var file = util.getArg(sourceMap, 'file', null);
-
-  // Once again, Sass deviates from the spec and supplies the version as a
-  // string rather than a number, so we use loose equality checking here.
-  if (version != this._version) {
-    throw new Error('Unsupported version: ' + version);
-  }
-
-  sources = sources
-    .map(String)
-    // Some source maps produce relative source paths like "./foo.js" instead of
-    // "foo.js".  Normalize these first so that future comparisons will succeed.
-    // See bugzil.la/1090768.
-    .map(util.normalize)
-    // Always ensure that absolute sources are internally stored relative to
-    // the source root, if the source root is absolute. Not doing this would
-    // be particularly problematic when the source root is a prefix of the
-    // source (valid, but why??). See github issue #199 and bugzil.la/1188982.
-    .map(function (source) {
-      return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source)
-        ? util.relative(sourceRoot, source)
-        : source;
-    });
-
-  // Pass `true` below to allow duplicate names and sources. While source maps
-  // are intended to be compressed and deduplicated, the TypeScript compiler
-  // sometimes generates source maps with duplicates in them. See Github issue
-  // #72 and bugzil.la/889492.
-  this._names = ArraySet.fromArray(names.map(String), true);
-  this._sources = ArraySet.fromArray(sources, true);
-
-  this.sourceRoot = sourceRoot;
-  this.sourcesContent = sourcesContent;
-  this._mappings = mappings;
-  this.file = file;
-}
-
-BasicSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
-BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer;
-
-/**
- * Create a BasicSourceMapConsumer from a SourceMapGenerator.
- *
- * @param SourceMapGenerator aSourceMap
- *        The source map that will be consumed.
- * @returns BasicSourceMapConsumer
- */
-BasicSourceMapConsumer.fromSourceMap =
-  function SourceMapConsumer_fromSourceMap(aSourceMap) {
-    var smc = Object.create(BasicSourceMapConsumer.prototype);
-
-    var names = smc._names = ArraySet.fromArray(aSourceMap._names.toArray(), true);
-    var sources = smc._sources = ArraySet.fromArray(aSourceMap._sources.toArray(), true);
-    smc.sourceRoot = aSourceMap._sourceRoot;
-    smc.sourcesContent = aSourceMap._generateSourcesContent(smc._sources.toArray(),
-                                                            smc.sourceRoot);
-    smc.file = aSourceMap._file;
-
-    // Because we are modifying the entries (by converting string sources and
-    // names to indices into the sources and names ArraySets), we have to make
-    // a copy of the entry or else bad things happen. Shared mutable state
-    // strikes again! See github issue #191.
-
-    var generatedMappings = aSourceMap._mappings.toArray().slice();
-    var destGeneratedMappings = smc.__generatedMappings = [];
-    var destOriginalMappings = smc.__originalMappings = [];
-
-    for (var i = 0, length = generatedMappings.length; i < length; i++) {
-      var srcMapping = generatedMappings[i];
-      var destMapping = new Mapping;
-      destMapping.generatedLine = srcMapping.generatedLine;
-      destMapping.generatedColumn = srcMapping.generatedColumn;
-
-      if (srcMapping.source) {
-        destMapping.source = sources.indexOf(srcMapping.source);
-        destMapping.originalLine = srcMapping.originalLine;
-        destMapping.originalColumn = srcMapping.originalColumn;
-
-        if (srcMapping.name) {
-          destMapping.name = names.indexOf(srcMapping.name);
-        }
-
-        destOriginalMappings.push(destMapping);
-      }
-
-      destGeneratedMappings.push(destMapping);
-    }
-
-    quickSort(smc.__originalMappings, util.compareByOriginalPositions);
-
-    return smc;
-  };
-
-/**
- * The version of the source mapping spec that we are consuming.
- */
-BasicSourceMapConsumer.prototype._version = 3;
-
-/**
- * The list of original sources.
- */
-Object.defineProperty(BasicSourceMapConsumer.prototype, 'sources', {
-  get: function () {
-    return this._sources.toArray().map(function (s) {
-      return this.sourceRoot != null ? util.join(this.sourceRoot, s) : s;
-    }, this);
-  }
-});
-
-/**
- * Provide the JIT with a nice shape / hidden class.
- */
-function Mapping() {
-  this.generatedLine = 0;
-  this.generatedColumn = 0;
-  this.source = null;
-  this.originalLine = null;
-  this.originalColumn = null;
-  this.name = null;
-}
-
-/**
- * Parse the mappings in a string in to a data structure which we can easily
- * query (the ordered arrays in the `this.__generatedMappings` and
- * `this.__originalMappings` properties).
- */
-BasicSourceMapConsumer.prototype._parseMappings =
-  function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
-    var generatedLine = 1;
-    var previousGeneratedColumn = 0;
-    var previousOriginalLine = 0;
-    var previousOriginalColumn = 0;
-    var previousSource = 0;
-    var previousName = 0;
-    var length = aStr.length;
-    var index = 0;
-    var cachedSegments = {};
-    var temp = {};
-    var originalMappings = [];
-    var generatedMappings = [];
-    var mapping, str, segment, end, value;
-
-    while (index < length) {
-      if (aStr.charAt(index) === ';') {
-        generatedLine++;
-        index++;
-        previousGeneratedColumn = 0;
-      }
-      else if (aStr.charAt(index) === ',') {
-        index++;
-      }
-      else {
-        mapping = new Mapping();
-        mapping.generatedLine = generatedLine;
-
-        // Because each offset is encoded relative to the previous one,
-        // many segments often have the same encoding. We can exploit this
-        // fact by caching the parsed variable length fields of each segment,
-        // allowing us to avoid a second parse if we encounter the same
-        // segment again.
-        for (end = index; end < length; end++) {
-          if (this._charIsMappingSeparator(aStr, end)) {
-            break;
-          }
-        }
-        str = aStr.slice(index, end);
-
-        segment = cachedSegments[str];
-        if (segment) {
-          index += str.length;
-        } else {
-          segment = [];
-          while (index < end) {
-            base64VLQ.decode(aStr, index, temp);
-            value = temp.value;
-            index = temp.rest;
-            segment.push(value);
-          }
-
-          if (segment.length === 2) {
-            throw new Error('Found a source, but no line and column');
-          }
-
-          if (segment.length === 3) {
-            throw new Error('Found a source and line, but no column');
-          }
-
-          cachedSegments[str] = segment;
-        }
-
-        // Generated column.
-        mapping.generatedColumn = previousGeneratedColumn + segment[0];
-        previousGeneratedColumn = mapping.generatedColumn;
-
-        if (segment.length > 1) {
-          // Original source.
-          mapping.source = previousSource + segment[1];
-          previousSource += segment[1];
-
-          // Original line.
-          mapping.originalLine = previousOriginalLine + segment[2];
-          previousOriginalLine = mapping.originalLine;
-          // Lines are stored 0-based
-          mapping.originalLine += 1;
-
-          // Original column.
-          mapping.originalColumn = previousOriginalColumn + segment[3];
-          previousOriginalColumn = mapping.originalColumn;
-
-          if (segment.length > 4) {
-            // Original name.
-            mapping.name = previousName + segment[4];
-            previousName += segment[4];
-          }
-        }
-
-        generatedMappings.push(mapping);
-        if (typeof mapping.originalLine === 'number') {
-          originalMappings.push(mapping);
-        }
-      }
-    }
-
-    quickSort(generatedMappings, util.compareByGeneratedPositionsDeflated);
-    this.__generatedMappings = generatedMappings;
-
-    quickSort(originalMappings, util.compareByOriginalPositions);
-    this.__originalMappings = originalMappings;
-  };
-
-/**
- * Find the mapping that best matches the hypothetical "needle" mapping that
- * we are searching for in the given "haystack" of mappings.
- */
-BasicSourceMapConsumer.prototype._findMapping =
-  function SourceMapConsumer_findMapping(aNeedle, aMappings, aLineName,
-                                         aColumnName, aComparator, aBias) {
-    // To return the position we are searching for, we must first find the
-    // mapping for the given position and then return the opposite position it
-    // points to. Because the mappings are sorted, we can use binary search to
-    // find the best mapping.
-
-    if (aNeedle[aLineName] <= 0) {
-      throw new TypeError('Line must be greater than or equal to 1, got '
-                          + aNeedle[aLineName]);
-    }
-    if (aNeedle[aColumnName] < 0) {
-      throw new TypeError('Column must be greater than or equal to 0, got '
-                          + aNeedle[aColumnName]);
-    }
-
-    return binarySearch.search(aNeedle, aMappings, aComparator, aBias);
-  };
-
-/**
- * Compute the last column for each generated mapping. The last column is
- * inclusive.
- */
-BasicSourceMapConsumer.prototype.computeColumnSpans =
-  function SourceMapConsumer_computeColumnSpans() {
-    for (var index = 0; index < this._generatedMappings.length; ++index) {
-      var mapping = this._generatedMappings[index];
-
-      // Mappings do not contain a field for the last generated columnt. We
-      // can come up with an optimistic estimate, however, by assuming that
-      // mappings are contiguous (i.e. given two consecutive mappings, the
-      // first mapping ends where the second one starts).
-      if (index + 1 < this._generatedMappings.length) {
-        var nextMapping = this._generatedMappings[index + 1];
-
-        if (mapping.generatedLine === nextMapping.generatedLine) {
-          mapping.lastGeneratedColumn = nextMapping.generatedColumn - 1;
-          continue;
-        }
-      }
-
-      // The last mapping for each line spans the entire line.
-      mapping.lastGeneratedColumn = Infinity;
-    }
-  };
-
-/**
- * Returns the original source, line, and column information for the generated
- * source's line and column positions provided. The only argument is an object
- * with the following properties:
- *
- *   - line: The line number in the generated source.
- *   - column: The column number in the generated source.
- *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
- *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
- *
- * and an object is returned with the following properties:
- *
- *   - source: The original source file, or null.
- *   - line: The line number in the original source, or null.
- *   - column: The column number in the original source, or null.
- *   - name: The original identifier, or null.
- */
-BasicSourceMapConsumer.prototype.originalPositionFor =
-  function SourceMapConsumer_originalPositionFor(aArgs) {
-    var needle = {
-      generatedLine: util.getArg(aArgs, 'line'),
-      generatedColumn: util.getArg(aArgs, 'column')
-    };
-
-    var index = this._findMapping(
-      needle,
-      this._generatedMappings,
-      "generatedLine",
-      "generatedColumn",
-      util.compareByGeneratedPositionsDeflated,
-      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
-    );
-
-    if (index >= 0) {
-      var mapping = this._generatedMappings[index];
-
-      if (mapping.generatedLine === needle.generatedLine) {
-        var source = util.getArg(mapping, 'source', null);
-        if (source !== null) {
-          source = this._sources.at(source);
-          if (this.sourceRoot != null) {
-            source = util.join(this.sourceRoot, source);
-          }
-        }
-        var name = util.getArg(mapping, 'name', null);
-        if (name !== null) {
-          name = this._names.at(name);
-        }
-        return {
-          source: source,
-          line: util.getArg(mapping, 'originalLine', null),
-          column: util.getArg(mapping, 'originalColumn', null),
-          name: name
-        };
-      }
-    }
-
-    return {
-      source: null,
-      line: null,
-      column: null,
-      name: null
-    };
-  };
-
-/**
- * Return true if we have the source content for every source in the source
- * map, false otherwise.
- */
-BasicSourceMapConsumer.prototype.hasContentsOfAllSources =
-  function BasicSourceMapConsumer_hasContentsOfAllSources() {
-    if (!this.sourcesContent) {
-      return false;
-    }
-    return this.sourcesContent.length >= this._sources.size() &&
-      !this.sourcesContent.some(function (sc) { return sc == null; });
-  };
-
-/**
- * Returns the original source content. The only argument is the url of the
- * original source file. Returns null if no original source content is
- * available.
- */
-BasicSourceMapConsumer.prototype.sourceContentFor =
-  function SourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
-    if (!this.sourcesContent) {
-      return null;
-    }
-
-    if (this.sourceRoot != null) {
-      aSource = util.relative(this.sourceRoot, aSource);
-    }
-
-    if (this._sources.has(aSource)) {
-      return this.sourcesContent[this._sources.indexOf(aSource)];
-    }
-
-    var url;
-    if (this.sourceRoot != null
-        && (url = util.urlParse(this.sourceRoot))) {
-      // XXX: file:// URIs and absolute paths lead to unexpected behavior for
-      // many users. We can help them out when they expect file:// URIs to
-      // behave like it would if they were running a local HTTP server. See
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=885597.
-      var fileUriAbsPath = aSource.replace(/^file:\/\//, "");
-      if (url.scheme == "file"
-          && this._sources.has(fileUriAbsPath)) {
-        return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)]
-      }
-
-      if ((!url.path || url.path == "/")
-          && this._sources.has("/" + aSource)) {
-        return this.sourcesContent[this._sources.indexOf("/" + aSource)];
-      }
-    }
-
-    // This function is used recursively from
-    // IndexedSourceMapConsumer.prototype.sourceContentFor. In that case, we
-    // don't want to throw if we can't find the source - we just want to
-    // return null, so we provide a flag to exit gracefully.
-    if (nullOnMissing) {
-      return null;
-    }
-    else {
-      throw new Error('"' + aSource + '" is not in the SourceMap.');
-    }
-  };
-
-/**
- * Returns the generated line and column information for the original source,
- * line, and column positions provided. The only argument is an object with
- * the following properties:
- *
- *   - source: The filename of the original source.
- *   - line: The line number in the original source.
- *   - column: The column number in the original source.
- *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
- *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
- *
- * and an object is returned with the following properties:
- *
- *   - line: The line number in the generated source, or null.
- *   - column: The column number in the generated source, or null.
- */
-BasicSourceMapConsumer.prototype.generatedPositionFor =
-  function SourceMapConsumer_generatedPositionFor(aArgs) {
-    var source = util.getArg(aArgs, 'source');
-    if (this.sourceRoot != null) {
-      source = util.relative(this.sourceRoot, source);
-    }
-    if (!this._sources.has(source)) {
-      return {
-        line: null,
-        column: null,
-        lastColumn: null
-      };
-    }
-    source = this._sources.indexOf(source);
-
-    var needle = {
-      source: source,
-      originalLine: util.getArg(aArgs, 'line'),
-      originalColumn: util.getArg(aArgs, 'column')
-    };
-
-    var index = this._findMapping(
-      needle,
-      this._originalMappings,
-      "originalLine",
-      "originalColumn",
-      util.compareByOriginalPositions,
-      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
-    );
-
-    if (index >= 0) {
-      var mapping = this._originalMappings[index];
-
-      if (mapping.source === needle.source) {
-        return {
-          line: util.getArg(mapping, 'generatedLine', null),
-          column: util.getArg(mapping, 'generatedColumn', null),
-          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-        };
-      }
-    }
-
-    return {
-      line: null,
-      column: null,
-      lastColumn: null
-    };
-  };
-
-exports.BasicSourceMapConsumer = BasicSourceMapConsumer;
-
-/**
- * An IndexedSourceMapConsumer instance represents a parsed source map which
- * we can query for information. It differs from BasicSourceMapConsumer in
- * that it takes "indexed" source maps (i.e. ones with a "sections" field) as
- * input.
- *
- * The only parameter is a raw source map (either as a JSON string, or already
- * parsed to an object). According to the spec for indexed source maps, they
- * have the following attributes:
- *
- *   - version: Which version of the source map spec this map is following.
- *   - file: Optional. The generated file this source map is associated with.
- *   - sections: A list of section definitions.
- *
- * Each value under the "sections" field has two fields:
- *   - offset: The offset into the original specified at which this section
- *       begins to apply, defined as an object with a "line" and "column"
- *       field.
- *   - map: A source map definition. This source map could also be indexed,
- *       but doesn't have to be.
- *
- * Instead of the "map" field, it's also possible to have a "url" field
- * specifying a URL to retrieve a source map from, but that's currently
- * unsupported.
- *
- * Here's an example source map, taken from the source map spec[0], but
- * modified to omit a section which uses the "url" field.
- *
- *  {
- *    version : 3,
- *    file: "app.js",
- *    sections: [{
- *      offset: {line:100, column:10},
- *      map: {
- *        version : 3,
- *        file: "section.js",
- *        sources: ["foo.js", "bar.js"],
- *        names: ["src", "maps", "are", "fun"],
- *        mappings: "AAAA,E;;ABCDE;"
- *      }
- *    }],
- *  }
- *
- * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.535es3xeprgt
- */
-function IndexedSourceMapConsumer(aSourceMap) {
-  var sourceMap = aSourceMap;
-  if (typeof aSourceMap === 'string') {
-    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
-  }
-
-  var version = util.getArg(sourceMap, 'version');
-  var sections = util.getArg(sourceMap, 'sections');
-
-  if (version != this._version) {
-    throw new Error('Unsupported version: ' + version);
-  }
-
-  this._sources = new ArraySet();
-  this._names = new ArraySet();
-
-  var lastOffset = {
-    line: -1,
-    column: 0
-  };
-  this._sections = sections.map(function (s) {
-    if (s.url) {
-      // The url field will require support for asynchronicity.
-      // See https://github.com/mozilla/source-map/issues/16
-      throw new Error('Support for url field in sections not implemented.');
-    }
-    var offset = util.getArg(s, 'offset');
-    var offsetLine = util.getArg(offset, 'line');
-    var offsetColumn = util.getArg(offset, 'column');
-
-    if (offsetLine < lastOffset.line ||
-        (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) {
-      throw new Error('Section offsets must be ordered and non-overlapping.');
-    }
-    lastOffset = offset;
-
-    return {
-      generatedOffset: {
-        // The offset fields are 0-based, but we use 1-based indices when
-        // encoding/decoding from VLQ.
-        generatedLine: offsetLine + 1,
-        generatedColumn: offsetColumn + 1
-      },
-      consumer: new SourceMapConsumer(util.getArg(s, 'map'))
-    }
-  });
-}
-
-IndexedSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
-IndexedSourceMapConsumer.prototype.constructor = SourceMapConsumer;
-
-/**
- * The version of the source mapping spec that we are consuming.
- */
-IndexedSourceMapConsumer.prototype._version = 3;
-
-/**
- * The list of original sources.
- */
-Object.defineProperty(IndexedSourceMapConsumer.prototype, 'sources', {
-  get: function () {
-    var sources = [];
-    for (var i = 0; i < this._sections.length; i++) {
-      for (var j = 0; j < this._sections[i].consumer.sources.length; j++) {
-        sources.push(this._sections[i].consumer.sources[j]);
-      }
-    }
-    return sources;
-  }
-});
-
-/**
- * Returns the original source, line, and column information for the generated
- * source's line and column positions provided. The only argument is an object
- * with the following properties:
- *
- *   - line: The line number in the generated source.
- *   - column: The column number in the generated source.
- *
- * and an object is returned with the following properties:
- *
- *   - source: The original source file, or null.
- *   - line: The line number in the original source, or null.
- *   - column: The column number in the original source, or null.
- *   - name: The original identifier, or null.
- */
-IndexedSourceMapConsumer.prototype.originalPositionFor =
-  function IndexedSourceMapConsumer_originalPositionFor(aArgs) {
-    var needle = {
-      generatedLine: util.getArg(aArgs, 'line'),
-      generatedColumn: util.getArg(aArgs, 'column')
-    };
-
-    // Find the section containing the generated position we're trying to map
-    // to an original position.
-    var sectionIndex = binarySearch.search(needle, this._sections,
-      function(needle, section) {
-        var cmp = needle.generatedLine - section.generatedOffset.generatedLine;
-        if (cmp) {
-          return cmp;
-        }
-
-        return (needle.generatedColumn -
-                section.generatedOffset.generatedColumn);
-      });
-    var section = this._sections[sectionIndex];
-
-    if (!section) {
-      return {
-        source: null,
-        line: null,
-        column: null,
-        name: null
-      };
-    }
-
-    return section.consumer.originalPositionFor({
-      line: needle.generatedLine -
-        (section.generatedOffset.generatedLine - 1),
-      column: needle.generatedColumn -
-        (section.generatedOffset.generatedLine === needle.generatedLine
-         ? section.generatedOffset.generatedColumn - 1
-         : 0),
-      bias: aArgs.bias
-    });
-  };
-
-/**
- * Return true if we have the source content for every source in the source
- * map, false otherwise.
- */
-IndexedSourceMapConsumer.prototype.hasContentsOfAllSources =
-  function IndexedSourceMapConsumer_hasContentsOfAllSources() {
-    return this._sections.every(function (s) {
-      return s.consumer.hasContentsOfAllSources();
-    });
-  };
-
-/**
- * Returns the original source content. The only argument is the url of the
- * original source file. Returns null if no original source content is
- * available.
- */
-IndexedSourceMapConsumer.prototype.sourceContentFor =
-  function IndexedSourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
-    for (var i = 0; i < this._sections.length; i++) {
-      var section = this._sections[i];
-
-      var content = section.consumer.sourceContentFor(aSource, true);
-      if (content) {
-        return content;
-      }
-    }
-    if (nullOnMissing) {
-      return null;
-    }
-    else {
-      throw new Error('"' + aSource + '" is not in the SourceMap.');
-    }
-  };
-
-/**
- * Returns the generated line and column information for the original source,
- * line, and column positions provided. The only argument is an object with
- * the following properties:
- *
- *   - source: The filename of the original source.
- *   - line: The line number in the original source.
- *   - column: The column number in the original source.
- *
- * and an object is returned with the following properties:
- *
- *   - line: The line number in the generated source, or null.
- *   - column: The column number in the generated source, or null.
- */
-IndexedSourceMapConsumer.prototype.generatedPositionFor =
-  function IndexedSourceMapConsumer_generatedPositionFor(aArgs) {
-    for (var i = 0; i < this._sections.length; i++) {
-      var section = this._sections[i];
-
-      // Only consider this section if the requested source is in the list of
-      // sources of the consumer.
-      if (section.consumer.sources.indexOf(util.getArg(aArgs, 'source')) === -1) {
-        continue;
-      }
-      var generatedPosition = section.consumer.generatedPositionFor(aArgs);
-      if (generatedPosition) {
-        var ret = {
-          line: generatedPosition.line +
-            (section.generatedOffset.generatedLine - 1),
-          column: generatedPosition.column +
-            (section.generatedOffset.generatedLine === generatedPosition.line
-             ? section.generatedOffset.generatedColumn - 1
-             : 0)
-        };
-        return ret;
-      }
-    }
-
-    return {
-      line: null,
-      column: null
-    };
-  };
-
-/**
- * Parse the mappings in a string in to a data structure which we can easily
- * query (the ordered arrays in the `this.__generatedMappings` and
- * `this.__originalMappings` properties).
- */
-IndexedSourceMapConsumer.prototype._parseMappings =
-  function IndexedSourceMapConsumer_parseMappings(aStr, aSourceRoot) {
-    this.__generatedMappings = [];
-    this.__originalMappings = [];
-    for (var i = 0; i < this._sections.length; i++) {
-      var section = this._sections[i];
-      var sectionMappings = section.consumer._generatedMappings;
-      for (var j = 0; j < sectionMappings.length; j++) {
-        var mapping = sectionMappings[j];
-
-        var source = section.consumer._sources.at(mapping.source);
-        if (section.consumer.sourceRoot !== null) {
-          source = util.join(section.consumer.sourceRoot, source);
-        }
-        this._sources.add(source);
-        source = this._sources.indexOf(source);
-
-        var name = section.consumer._names.at(mapping.name);
-        this._names.add(name);
-        name = this._names.indexOf(name);
-
-        // The mappings coming from the consumer for the section have
-        // generated positions relative to the start of the section, so we
-        // need to offset them to be relative to the start of the concatenated
-        // generated file.
-        var adjustedMapping = {
-          source: source,
-          generatedLine: mapping.generatedLine +
-            (section.generatedOffset.generatedLine - 1),
-          generatedColumn: mapping.generatedColumn +
-            (section.generatedOffset.generatedLine === mapping.generatedLine
-            ? section.generatedOffset.generatedColumn - 1
-            : 0),
-          originalLine: mapping.originalLine,
-          originalColumn: mapping.originalColumn,
-          name: name
-        };
-
-        this.__generatedMappings.push(adjustedMapping);
-        if (typeof adjustedMapping.originalLine === 'number') {
-          this.__originalMappings.push(adjustedMapping);
-        }
-      }
-    }
-
-    quickSort(this.__generatedMappings, util.compareByGeneratedPositionsDeflated);
-    quickSort(this.__originalMappings, util.compareByOriginalPositions);
-  };
-
-exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
-
-
-/***/ }),
-/* 708 */
-/***/ (function(module, exports) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-exports.GREATEST_LOWER_BOUND = 1;
-exports.LEAST_UPPER_BOUND = 2;
-
-/**
- * Recursive implementation of binary search.
- *
- * @param aLow Indices here and lower do not contain the needle.
- * @param aHigh Indices here and higher do not contain the needle.
- * @param aNeedle The element being searched for.
- * @param aHaystack The non-empty array being searched.
- * @param aCompare Function which takes two elements and returns -1, 0, or 1.
- * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
- *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- */
-function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
-  // This function terminates when one of the following is true:
-  //
-  //   1. We find the exact element we are looking for.
-  //
-  //   2. We did not find the exact element, but we can return the index of
-  //      the next-closest element.
-  //
-  //   3. We did not find the exact element, and there is no next-closest
-  //      element than the one we are searching for, so we return -1.
-  var mid = Math.floor((aHigh - aLow) / 2) + aLow;
-  var cmp = aCompare(aNeedle, aHaystack[mid], true);
-  if (cmp === 0) {
-    // Found the element we are looking for.
-    return mid;
-  }
-  else if (cmp > 0) {
-    // Our needle is greater than aHaystack[mid].
-    if (aHigh - mid > 1) {
-      // The element is in the upper half.
-      return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias);
-    }
-
-    // The exact needle element was not found in this haystack. Determine if
-    // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
-      return aHigh < aHaystack.length ? aHigh : -1;
-    } else {
-      return mid;
-    }
-  }
-  else {
-    // Our needle is less than aHaystack[mid].
-    if (mid - aLow > 1) {
-      // The element is in the lower half.
-      return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias);
-    }
-
-    // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
-      return mid;
-    } else {
-      return aLow < 0 ? -1 : aLow;
-    }
-  }
-}
-
-/**
- * This is an implementation of binary search which will always try and return
- * the index of the closest element if there is no exact hit. This is because
- * mappings between original and generated line/col pairs are single points,
- * and there is an implicit region between each of them, so a miss just means
- * that you aren't on the very start of a region.
- *
- * @param aNeedle The element you are looking for.
- * @param aHaystack The array that is being searched.
- * @param aCompare A function which takes the needle and an element in the
- *     array and returns -1, 0, or 1 depending on whether the needle is less
- *     than, equal to, or greater than the element, respectively.
- * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
- *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
- */
-exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
-  if (aHaystack.length === 0) {
-    return -1;
-  }
-
-  var index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
-                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
-  if (index < 0) {
-    return -1;
-  }
-
-  // We have found either the exact element, or the next-closest element than
-  // the one we are searching for. However, there may be more than one such
-  // element. Make sure we always return the smallest of these.
-  while (index - 1 >= 0) {
-    if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) {
-      break;
-    }
-    --index;
-  }
-
-  return index;
-};
-
-
-/***/ }),
-/* 709 */
-/***/ (function(module, exports) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-// It turns out that some (most?) JavaScript engines don't self-host
-// `Array.prototype.sort`. This makes sense because C++ will likely remain
-// faster than JS when doing raw CPU-intensive sorting. However, when using a
-// custom comparator function, calling back and forth between the VM's C++ and
-// JIT'd JS is rather slow *and* loses JIT type information, resulting in
-// worse generated code for the comparator function than would be optimal. In
-// fact, when sorting with a comparator, these costs outweigh the benefits of
-// sorting in C++. By using our own JS-implemented Quick Sort (below), we get
-// a ~3500ms mean speed-up in `bench/bench.html`.
-
-/**
- * Swap the elements indexed by `x` and `y` in the array `ary`.
- *
- * @param {Array} ary
- *        The array.
- * @param {Number} x
- *        The index of the first item.
- * @param {Number} y
- *        The index of the second item.
- */
-function swap(ary, x, y) {
-  var temp = ary[x];
-  ary[x] = ary[y];
-  ary[y] = temp;
-}
-
-/**
- * Returns a random integer within the range `low .. high` inclusive.
- *
- * @param {Number} low
- *        The lower bound on the range.
- * @param {Number} high
- *        The upper bound on the range.
- */
-function randomIntInRange(low, high) {
-  return Math.round(low + (Math.random() * (high - low)));
-}
-
-/**
- * The Quick Sort algorithm.
- *
- * @param {Array} ary
- *        An array to sort.
- * @param {function} comparator
- *        Function to use to compare two items.
- * @param {Number} p
- *        Start index of the array
- * @param {Number} r
- *        End index of the array
- */
-function doQuickSort(ary, comparator, p, r) {
-  // If our lower bound is less than our upper bound, we (1) partition the
-  // array into two pieces and (2) recurse on each half. If it is not, this is
-  // the empty array and our base case.
-
-  if (p < r) {
-    // (1) Partitioning.
-    //
-    // The partitioning chooses a pivot between `p` and `r` and moves all
-    // elements that are less than or equal to the pivot to the before it, and
-    // all the elements that are greater than it after it. The effect is that
-    // once partition is done, the pivot is in the exact place it will be when
-    // the array is put in sorted order, and it will not need to be moved
-    // again. This runs in O(n) time.
-
-    // Always choose a random pivot so that an input array which is reverse
-    // sorted does not cause O(n^2) running time.
-    var pivotIndex = randomIntInRange(p, r);
-    var i = p - 1;
-
-    swap(ary, pivotIndex, r);
-    var pivot = ary[r];
-
-    // Immediately after `j` is incremented in this loop, the following hold
-    // true:
-    //
-    //   * Every element in `ary[p .. i]` is less than or equal to the pivot.
-    //
-    //   * Every element in `ary[i+1 .. j-1]` is greater than the pivot.
-    for (var j = p; j < r; j++) {
-      if (comparator(ary[j], pivot) <= 0) {
-        i += 1;
-        swap(ary, i, j);
-      }
-    }
-
-    swap(ary, i + 1, j);
-    var q = i + 1;
-
-    // (2) Recurse on each half.
-
-    doQuickSort(ary, comparator, p, q - 1);
-    doQuickSort(ary, comparator, q + 1, r);
-  }
-}
-
-/**
- * Sort the given array in-place with the given comparator function.
- *
- * @param {Array} ary
- *        An array to sort.
- * @param {function} comparator
- *        Function to use to compare two items.
- */
-exports.quickSort = function (ary, comparator) {
-  doQuickSort(ary, comparator, 0, ary.length - 1);
-};
-
-
-/***/ }),
-/* 710 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var SourceMapGenerator = __webpack_require__(701).SourceMapGenerator;
-var util = __webpack_require__(704);
-
-// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
-// operating systems these days (capturing the result).
-var REGEX_NEWLINE = /(\r?\n)/;
-
-// Newline character code for charCodeAt() comparisons
-var NEWLINE_CODE = 10;
-
-// Private symbol for identifying `SourceNode`s when multiple versions of
-// the source-map library are loaded. This MUST NOT CHANGE across
-// versions!
-var isSourceNode = "$$$isSourceNode$$$";
-
-/**
- * SourceNodes provide a way to abstract over interpolating/concatenating
- * snippets of generated JavaScript source code while maintaining the line and
- * column information associated with the original source code.
- *
- * @param aLine The original line number.
- * @param aColumn The original column number.
- * @param aSource The original source's filename.
- * @param aChunks Optional. An array of strings which are snippets of
- *        generated JS, or other SourceNodes.
- * @param aName The original identifier.
- */
-function SourceNode(aLine, aColumn, aSource, aChunks, aName) {
-  this.children = [];
-  this.sourceContents = {};
-  this.line = aLine == null ? null : aLine;
-  this.column = aColumn == null ? null : aColumn;
-  this.source = aSource == null ? null : aSource;
-  this.name = aName == null ? null : aName;
-  this[isSourceNode] = true;
-  if (aChunks != null) this.add(aChunks);
-}
-
-/**
- * Creates a SourceNode from generated code and a SourceMapConsumer.
- *
- * @param aGeneratedCode The generated code
- * @param aSourceMapConsumer The SourceMap for the generated code
- * @param aRelativePath Optional. The path that relative sources in the
- *        SourceMapConsumer should be relative to.
- */
-SourceNode.fromStringWithSourceMap =
-  function SourceNode_fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) {
-    // The SourceNode we want to fill with the generated code
-    // and the SourceMap
-    var node = new SourceNode();
-
-    // All even indices of this array are one line of the generated code,
-    // while all odd indices are the newlines between two adjacent lines
-    // (since `REGEX_NEWLINE` captures its match).
-    // Processed fragments are accessed by calling `shiftNextLine`.
-    var remainingLines = aGeneratedCode.split(REGEX_NEWLINE);
-    var remainingLinesIndex = 0;
-    var shiftNextLine = function() {
-      var lineContents = getNextLine();
-      // The last line of a file might not have a newline.
-      var newLine = getNextLine() || "";
-      return lineContents + newLine;
-
-      function getNextLine() {
-        return remainingLinesIndex < remainingLines.length ?
-            remainingLines[remainingLinesIndex++] : undefined;
-      }
-    };
-
-    // We need to remember the position of "remainingLines"
-    var lastGeneratedLine = 1, lastGeneratedColumn = 0;
-
-    // The generate SourceNodes we need a code range.
-    // To extract it current and last mapping is used.
-    // Here we store the last mapping.
-    var lastMapping = null;
-
-    aSourceMapConsumer.eachMapping(function (mapping) {
-      if (lastMapping !== null) {
-        // We add the code from "lastMapping" to "mapping":
-        // First check if there is a new line in between.
-        if (lastGeneratedLine < mapping.generatedLine) {
-          // Associate first line with "lastMapping"
-          addMappingWithCode(lastMapping, shiftNextLine());
-          lastGeneratedLine++;
-          lastGeneratedColumn = 0;
-          // The remaining code is added without mapping
-        } else {
-          // There is no new line in between.
-          // Associate the code between "lastGeneratedColumn" and
-          // "mapping.generatedColumn" with "lastMapping"
-          var nextLine = remainingLines[remainingLinesIndex];
-          var code = nextLine.substr(0, mapping.generatedColumn -
-                                        lastGeneratedColumn);
-          remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
-                                              lastGeneratedColumn);
-          lastGeneratedColumn = mapping.generatedColumn;
-          addMappingWithCode(lastMapping, code);
-          // No more remaining code, continue
-          lastMapping = mapping;
-          return;
-        }
-      }
-      // We add the generated code until the first mapping
-      // to the SourceNode without any mapping.
-      // Each line is added as separate string.
-      while (lastGeneratedLine < mapping.generatedLine) {
-        node.add(shiftNextLine());
-        lastGeneratedLine++;
-      }
-      if (lastGeneratedColumn < mapping.generatedColumn) {
-        var nextLine = remainingLines[remainingLinesIndex];
-        node.add(nextLine.substr(0, mapping.generatedColumn));
-        remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
-        lastGeneratedColumn = mapping.generatedColumn;
-      }
-      lastMapping = mapping;
-    }, this);
-    // We have processed all mappings.
-    if (remainingLinesIndex < remainingLines.length) {
-      if (lastMapping) {
-        // Associate the remaining code in the current line with "lastMapping"
-        addMappingWithCode(lastMapping, shiftNextLine());
-      }
-      // and add the remaining lines without any mapping
-      node.add(remainingLines.splice(remainingLinesIndex).join(""));
-    }
-
-    // Copy sourcesContent into SourceNode
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        if (aRelativePath != null) {
-          sourceFile = util.join(aRelativePath, sourceFile);
-        }
-        node.setSourceContent(sourceFile, content);
-      }
-    });
-
-    return node;
-
-    function addMappingWithCode(mapping, code) {
-      if (mapping === null || mapping.source === undefined) {
-        node.add(code);
-      } else {
-        var source = aRelativePath
-          ? util.join(aRelativePath, mapping.source)
-          : mapping.source;
-        node.add(new SourceNode(mapping.originalLine,
-                                mapping.originalColumn,
-                                source,
-                                code,
-                                mapping.name));
-      }
-    }
-  };
-
-/**
- * Add a chunk of generated JS to this source node.
- *
- * @param aChunk A string snippet of generated JS code, another instance of
- *        SourceNode, or an array where each member is one of those things.
- */
-SourceNode.prototype.add = function SourceNode_add(aChunk) {
-  if (Array.isArray(aChunk)) {
-    aChunk.forEach(function (chunk) {
-      this.add(chunk);
-    }, this);
-  }
-  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
-    if (aChunk) {
-      this.children.push(aChunk);
-    }
-  }
-  else {
-    throw new TypeError(
-      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
-    );
-  }
-  return this;
-};
-
-/**
- * Add a chunk of generated JS to the beginning of this source node.
- *
- * @param aChunk A string snippet of generated JS code, another instance of
- *        SourceNode, or an array where each member is one of those things.
- */
-SourceNode.prototype.prepend = function SourceNode_prepend(aChunk) {
-  if (Array.isArray(aChunk)) {
-    for (var i = aChunk.length-1; i >= 0; i--) {
-      this.prepend(aChunk[i]);
-    }
-  }
-  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
-    this.children.unshift(aChunk);
-  }
-  else {
-    throw new TypeError(
-      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
-    );
-  }
-  return this;
-};
-
-/**
- * Walk over the tree of JS snippets in this node and its children. The
- * walking function is called once for each snippet of JS and is passed that
- * snippet and the its original associated source's line/column location.
- *
- * @param aFn The traversal function.
- */
-SourceNode.prototype.walk = function SourceNode_walk(aFn) {
-  var chunk;
-  for (var i = 0, len = this.children.length; i < len; i++) {
-    chunk = this.children[i];
-    if (chunk[isSourceNode]) {
-      chunk.walk(aFn);
-    }
-    else {
-      if (chunk !== '') {
-        aFn(chunk, { source: this.source,
-                     line: this.line,
-                     column: this.column,
-                     name: this.name });
-      }
-    }
-  }
-};
-
-/**
- * Like `String.prototype.join` except for SourceNodes. Inserts `aStr` between
- * each of `this.children`.
- *
- * @param aSep The separator.
- */
-SourceNode.prototype.join = function SourceNode_join(aSep) {
-  var newChildren;
-  var i;
-  var len = this.children.length;
-  if (len > 0) {
-    newChildren = [];
-    for (i = 0; i < len-1; i++) {
-      newChildren.push(this.children[i]);
-      newChildren.push(aSep);
-    }
-    newChildren.push(this.children[i]);
-    this.children = newChildren;
-  }
-  return this;
-};
-
-/**
- * Call String.prototype.replace on the very right-most source snippet. Useful
- * for trimming whitespace from the end of a source node, etc.
- *
- * @param aPattern The pattern to replace.
- * @param aReplacement The thing to replace the pattern with.
- */
-SourceNode.prototype.replaceRight = function SourceNode_replaceRight(aPattern, aReplacement) {
-  var lastChild = this.children[this.children.length - 1];
-  if (lastChild[isSourceNode]) {
-    lastChild.replaceRight(aPattern, aReplacement);
-  }
-  else if (typeof lastChild === 'string') {
-    this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement);
-  }
-  else {
-    this.children.push(''.replace(aPattern, aReplacement));
-  }
-  return this;
-};
-
-/**
- * Set the source content for a source file. This will be added to the SourceMapGenerator
- * in the sourcesContent field.
- *
- * @param aSourceFile The filename of the source file
- * @param aSourceContent The content of the source file
- */
-SourceNode.prototype.setSourceContent =
-  function SourceNode_setSourceContent(aSourceFile, aSourceContent) {
-    this.sourceContents[util.toSetString(aSourceFile)] = aSourceContent;
-  };
-
-/**
- * Walk over the tree of SourceNodes. The walking function is called for each
- * source file content and is passed the filename and source content.
- *
- * @param aFn The traversal function.
- */
-SourceNode.prototype.walkSourceContents =
-  function SourceNode_walkSourceContents(aFn) {
-    for (var i = 0, len = this.children.length; i < len; i++) {
-      if (this.children[i][isSourceNode]) {
-        this.children[i].walkSourceContents(aFn);
-      }
-    }
-
-    var sources = Object.keys(this.sourceContents);
-    for (var i = 0, len = sources.length; i < len; i++) {
-      aFn(util.fromSetString(sources[i]), this.sourceContents[sources[i]]);
-    }
-  };
-
-/**
- * Return the string representation of this source node. Walks over the tree
- * and concatenates all the various snippets together to one string.
- */
-SourceNode.prototype.toString = function SourceNode_toString() {
-  var str = "";
-  this.walk(function (chunk) {
-    str += chunk;
-  });
-  return str;
-};
-
-/**
- * Returns the string representation of this source node along with a source
- * map.
- */
-SourceNode.prototype.toStringWithSourceMap = function SourceNode_toStringWithSourceMap(aArgs) {
-  var generated = {
-    code: "",
-    line: 1,
-    column: 0
-  };
-  var map = new SourceMapGenerator(aArgs);
-  var sourceMappingActive = false;
-  var lastOriginalSource = null;
-  var lastOriginalLine = null;
-  var lastOriginalColumn = null;
-  var lastOriginalName = null;
-  this.walk(function (chunk, original) {
-    generated.code += chunk;
-    if (original.source !== null
-        && original.line !== null
-        && original.column !== null) {
-      if(lastOriginalSource !== original.source
-         || lastOriginalLine !== original.line
-         || lastOriginalColumn !== original.column
-         || lastOriginalName !== original.name) {
-        map.addMapping({
-          source: original.source,
-          original: {
-            line: original.line,
-            column: original.column
-          },
-          generated: {
-            line: generated.line,
-            column: generated.column
-          },
-          name: original.name
-        });
-      }
-      lastOriginalSource = original.source;
-      lastOriginalLine = original.line;
-      lastOriginalColumn = original.column;
-      lastOriginalName = original.name;
-      sourceMappingActive = true;
-    } else if (sourceMappingActive) {
-      map.addMapping({
-        generated: {
-          line: generated.line,
-          column: generated.column
-        }
-      });
-      lastOriginalSource = null;
-      sourceMappingActive = false;
-    }
-    for (var idx = 0, length = chunk.length; idx < length; idx++) {
-      if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
-        generated.line++;
-        generated.column = 0;
-        // Mappings end at eol
-        if (idx + 1 === length) {
-          lastOriginalSource = null;
-          sourceMappingActive = false;
-        } else if (sourceMappingActive) {
-          map.addMapping({
-            source: original.source,
-            original: {
-              line: original.line,
-              column: original.column
-            },
-            generated: {
-              line: generated.line,
-              column: generated.column
-            },
-            name: original.name
-          });
-        }
-      } else {
-        generated.column++;
-      }
-    }
-  });
-  this.walkSourceContents(function (sourceFile, sourceContent) {
-    map.setSourceContent(sourceFile, sourceContent);
-  });
-
-  return { code: generated.code, map: map };
-};
-
-exports.SourceNode = SourceNode;
-
-
-/***/ }),
-/* 711 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2014, 2015, 2016, 2017 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var sourceMappingURL   = __webpack_require__(712)
-var resolveUrl         = __webpack_require__(713)
-var decodeUriComponent = __webpack_require__(714)
-var urix               = __webpack_require__(716)
-var atob               = __webpack_require__(717)
-
-
-
-function callbackAsync(callback, error, result) {
-  setImmediate(function() { callback(error, result) })
-}
-
-function parseMapToJSON(string, data) {
-  try {
-    return JSON.parse(string.replace(/^\)\]\}'/, ""))
-  } catch (error) {
-    error.sourceMapData = data
-    throw error
-  }
-}
-
-function readSync(read, url, data) {
-  var readUrl = decodeUriComponent(url)
-  try {
-    return String(read(readUrl))
-  } catch (error) {
-    error.sourceMapData = data
-    throw error
-  }
-}
-
-
-
-function resolveSourceMap(code, codeUrl, read, callback) {
-  var mapData
-  try {
-    mapData = resolveSourceMapHelper(code, codeUrl)
-  } catch (error) {
-    return callbackAsync(callback, error)
-  }
-  if (!mapData || mapData.map) {
-    return callbackAsync(callback, null, mapData)
-  }
-  var readUrl = decodeUriComponent(mapData.url)
-  read(readUrl, function(error, result) {
-    if (error) {
-      error.sourceMapData = mapData
-      return callback(error)
-    }
-    mapData.map = String(result)
-    try {
-      mapData.map = parseMapToJSON(mapData.map, mapData)
-    } catch (error) {
-      return callback(error)
-    }
-    callback(null, mapData)
-  })
-}
-
-function resolveSourceMapSync(code, codeUrl, read) {
-  var mapData = resolveSourceMapHelper(code, codeUrl)
-  if (!mapData || mapData.map) {
-    return mapData
-  }
-  mapData.map = readSync(read, mapData.url, mapData)
-  mapData.map = parseMapToJSON(mapData.map, mapData)
-  return mapData
-}
-
-var dataUriRegex = /^data:([^,;]*)(;[^,;]*)*(?:,(.*))?$/
-var jsonMimeTypeRegex = /^(?:application|text)\/json$/
-
-function resolveSourceMapHelper(code, codeUrl) {
-  codeUrl = urix(codeUrl)
-
-  var url = sourceMappingURL.getFrom(code)
-  if (!url) {
-    return null
-  }
-
-  var dataUri = url.match(dataUriRegex)
-  if (dataUri) {
-    var mimeType = dataUri[1]
-    var lastParameter = dataUri[2] || ""
-    var encoded = dataUri[3] || ""
-    var data = {
-      sourceMappingURL: url,
-      url: null,
-      sourcesRelativeTo: codeUrl,
-      map: encoded
-    }
-    if (!jsonMimeTypeRegex.test(mimeType)) {
-      var error = new Error("Unuseful data uri mime type: " + (mimeType || "text/plain"))
-      error.sourceMapData = data
-      throw error
-    }
-    data.map = parseMapToJSON(
-      lastParameter === ";base64" ? atob(encoded) : decodeURIComponent(encoded),
-      data
-    )
-    return data
-  }
-
-  var mapUrl = resolveUrl(codeUrl, url)
-  return {
-    sourceMappingURL: url,
-    url: mapUrl,
-    sourcesRelativeTo: mapUrl,
-    map: null
-  }
-}
-
-
-
-function resolveSources(map, mapUrl, read, options, callback) {
-  if (typeof options === "function") {
-    callback = options
-    options = {}
-  }
-  var pending = map.sources ? map.sources.length : 0
-  var result = {
-    sourcesResolved: [],
-    sourcesContent:  []
-  }
-
-  if (pending === 0) {
-    callbackAsync(callback, null, result)
-    return
-  }
-
-  var done = function() {
-    pending--
-    if (pending === 0) {
-      callback(null, result)
-    }
-  }
-
-  resolveSourcesHelper(map, mapUrl, options, function(fullUrl, sourceContent, index) {
-    result.sourcesResolved[index] = fullUrl
-    if (typeof sourceContent === "string") {
-      result.sourcesContent[index] = sourceContent
-      callbackAsync(done, null)
-    } else {
-      var readUrl = decodeUriComponent(fullUrl)
-      read(readUrl, function(error, source) {
-        result.sourcesContent[index] = error ? error : String(source)
-        done()
-      })
-    }
-  })
-}
-
-function resolveSourcesSync(map, mapUrl, read, options) {
-  var result = {
-    sourcesResolved: [],
-    sourcesContent:  []
-  }
-
-  if (!map.sources || map.sources.length === 0) {
-    return result
-  }
-
-  resolveSourcesHelper(map, mapUrl, options, function(fullUrl, sourceContent, index) {
-    result.sourcesResolved[index] = fullUrl
-    if (read !== null) {
-      if (typeof sourceContent === "string") {
-        result.sourcesContent[index] = sourceContent
-      } else {
-        var readUrl = decodeUriComponent(fullUrl)
-        try {
-          result.sourcesContent[index] = String(read(readUrl))
-        } catch (error) {
-          result.sourcesContent[index] = error
-        }
-      }
-    }
-  })
-
-  return result
-}
-
-var endingSlash = /\/?$/
-
-function resolveSourcesHelper(map, mapUrl, options, fn) {
-  options = options || {}
-  mapUrl = urix(mapUrl)
-  var fullUrl
-  var sourceContent
-  var sourceRoot
-  for (var index = 0, len = map.sources.length; index < len; index++) {
-    sourceRoot = null
-    if (typeof options.sourceRoot === "string") {
-      sourceRoot = options.sourceRoot
-    } else if (typeof map.sourceRoot === "string" && options.sourceRoot !== false) {
-      sourceRoot = map.sourceRoot
-    }
-    // If the sourceRoot is the empty string, it is equivalent to not setting
-    // the property at all.
-    if (sourceRoot === null || sourceRoot === '') {
-      fullUrl = resolveUrl(mapUrl, map.sources[index])
-    } else {
-      // Make sure that the sourceRoot ends with a slash, so that `/scripts/subdir` becomes
-      // `/scripts/subdir/<source>`, not `/scripts/<source>`. Pointing to a file as source root
-      // does not make sense.
-      fullUrl = resolveUrl(mapUrl, sourceRoot.replace(endingSlash, "/"), map.sources[index])
-    }
-    sourceContent = (map.sourcesContent || [])[index]
-    fn(fullUrl, sourceContent, index)
-  }
-}
-
-
-
-function resolve(code, codeUrl, read, options, callback) {
-  if (typeof options === "function") {
-    callback = options
-    options = {}
-  }
-  if (code === null) {
-    var mapUrl = codeUrl
-    var data = {
-      sourceMappingURL: null,
-      url: mapUrl,
-      sourcesRelativeTo: mapUrl,
-      map: null
-    }
-    var readUrl = decodeUriComponent(mapUrl)
-    read(readUrl, function(error, result) {
-      if (error) {
-        error.sourceMapData = data
-        return callback(error)
-      }
-      data.map = String(result)
-      try {
-        data.map = parseMapToJSON(data.map, data)
-      } catch (error) {
-        return callback(error)
-      }
-      _resolveSources(data)
-    })
-  } else {
-    resolveSourceMap(code, codeUrl, read, function(error, mapData) {
-      if (error) {
-        return callback(error)
-      }
-      if (!mapData) {
-        return callback(null, null)
-      }
-      _resolveSources(mapData)
-    })
-  }
-
-  function _resolveSources(mapData) {
-    resolveSources(mapData.map, mapData.sourcesRelativeTo, read, options, function(error, result) {
-      if (error) {
-        return callback(error)
-      }
-      mapData.sourcesResolved = result.sourcesResolved
-      mapData.sourcesContent  = result.sourcesContent
-      callback(null, mapData)
-    })
-  }
-}
-
-function resolveSync(code, codeUrl, read, options) {
-  var mapData
-  if (code === null) {
-    var mapUrl = codeUrl
-    mapData = {
-      sourceMappingURL: null,
-      url: mapUrl,
-      sourcesRelativeTo: mapUrl,
-      map: null
-    }
-    mapData.map = readSync(read, mapUrl, mapData)
-    mapData.map = parseMapToJSON(mapData.map, mapData)
-  } else {
-    mapData = resolveSourceMapSync(code, codeUrl, read)
-    if (!mapData) {
-      return null
-    }
-  }
-  var result = resolveSourcesSync(mapData.map, mapData.sourcesRelativeTo, read, options)
-  mapData.sourcesResolved = result.sourcesResolved
-  mapData.sourcesContent  = result.sourcesContent
-  return mapData
-}
-
-
-
-module.exports = {
-  resolveSourceMap:     resolveSourceMap,
-  resolveSourceMapSync: resolveSourceMapSync,
-  resolveSources:       resolveSources,
-  resolveSourcesSync:   resolveSourcesSync,
-  resolve:              resolve,
-  resolveSync:          resolveSync,
-  parseMapToJSON:       parseMapToJSON
-}
-
-
-/***/ }),
-/* 712 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-void (function(root, factory) {
-  if (true) {
-    !(__WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) :
-				__WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))
-  } else {}
-}(this, function() {
-
-  var innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/
-
-  var regex = RegExp(
-    "(?:" +
-      "/\\*" +
-      "(?:\\s*\r?\n(?://)?)?" +
-      "(?:" + innerRegex.source + ")" +
-      "\\s*" +
-      "\\*/" +
-      "|" +
-      "//(?:" + innerRegex.source + ")" +
-    ")" +
-    "\\s*"
-  )
-
-  return {
-
-    regex: regex,
-    _innerRegex: innerRegex,
-
-    getFrom: function(code) {
-      var match = code.match(regex)
-      return (match ? match[1] || match[2] || "" : null)
-    },
-
-    existsIn: function(code) {
-      return regex.test(code)
-    },
-
-    removeFrom: function(code) {
-      return code.replace(regex, "")
-    },
-
-    insertBefore: function(code, string) {
-      var match = code.match(regex)
-      if (match) {
-        return code.slice(0, match.index) + string + code.slice(match.index)
-      } else {
-        return code + string
-      }
-    }
-  }
-
-}));
-
-
-/***/ }),
-/* 713 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var url = __webpack_require__(324)
-
-function resolveUrl(/* ...urls */) {
-  return Array.prototype.reduce.call(arguments, function(resolved, nextUrl) {
-    return url.resolve(resolved, nextUrl)
-  })
-}
-
-module.exports = resolveUrl
-
-
-/***/ }),
-/* 714 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var decodeUriComponent = __webpack_require__(715)
-
-function customDecodeUriComponent(string) {
-  // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
-  return decodeUriComponent(string.replace(/\+/g, "%2B"))
-}
-
-module.exports = customDecodeUriComponent
-
-
-/***/ }),
-/* 715 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var token = '%[a-f0-9]{2}';
-var singleMatcher = new RegExp(token, 'gi');
-var multiMatcher = new RegExp('(' + token + ')+', 'gi');
-
-function decodeComponents(components, split) {
-	try {
-		// Try to decode the entire string first
-		return decodeURIComponent(components.join(''));
-	} catch (err) {
-		// Do nothing
-	}
-
-	if (components.length === 1) {
-		return components;
-	}
-
-	split = split || 1;
-
-	// Split the array in 2 parts
-	var left = components.slice(0, split);
-	var right = components.slice(split);
-
-	return Array.prototype.concat.call([], decodeComponents(left), decodeComponents(right));
-}
-
-function decode(input) {
-	try {
-		return decodeURIComponent(input);
-	} catch (err) {
-		var tokens = input.match(singleMatcher);
-
-		for (var i = 1; i < tokens.length; i++) {
-			input = decodeComponents(tokens, i).join('');
-
-			tokens = input.match(singleMatcher);
-		}
-
-		return input;
-	}
-}
-
-function customDecodeURIComponent(input) {
-	// Keep track of all the replacements and prefill the map with the `BOM`
-	var replaceMap = {
-		'%FE%FF': '\uFFFD\uFFFD',
-		'%FF%FE': '\uFFFD\uFFFD'
-	};
-
-	var match = multiMatcher.exec(input);
-	while (match) {
-		try {
-			// Decode as big chunks as possible
-			replaceMap[match[0]] = decodeURIComponent(match[0]);
-		} catch (err) {
-			var result = decode(match[0]);
-
-			if (result !== match[0]) {
-				replaceMap[match[0]] = result;
-			}
-		}
-
-		match = multiMatcher.exec(input);
-	}
-
-	// Add `%C2` at the end of the map to make sure it does not replace the combinator before everything else
-	replaceMap['%C2'] = '\uFFFD';
-
-	var entries = Object.keys(replaceMap);
-
-	for (var i = 0; i < entries.length; i++) {
-		// Replace all decoded components
-		var key = entries[i];
-		input = input.replace(new RegExp(key, 'g'), replaceMap[key]);
-	}
-
-	return input;
-}
-
-module.exports = function (encodedURI) {
-	if (typeof encodedURI !== 'string') {
-		throw new TypeError('Expected `encodedURI` to be of type `string`, got `' + typeof encodedURI + '`');
-	}
-
-	try {
-		encodedURI = encodedURI.replace(/\+/g, ' ');
-
-		// Try the built in decoder first
-		return decodeURIComponent(encodedURI);
-	} catch (err) {
-		// Fallback to a more advanced decoder
-		return customDecodeURIComponent(encodedURI);
-	}
-};
-
-
-/***/ }),
-/* 716 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var path = __webpack_require__(4)
-
-"use strict"
-
-function urix(aPath) {
-  if (path.sep === "\\") {
-    return aPath
-      .replace(/\\/g, "/")
-      .replace(/^[a-z]:\/?/i, "/")
-  }
-  return aPath
-}
-
-module.exports = urix
-
-
-/***/ }),
-/* 717 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function atob(str) {
-  return Buffer.from(str, 'base64').toString('binary');
-}
-
-module.exports = atob.atob = atob;
-
-
-/***/ }),
-/* 718 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var fs = __webpack_require__(253);
-var path = __webpack_require__(4);
-var define = __webpack_require__(685);
-var utils = __webpack_require__(699);
-
-/**
- * Expose `mixin()`.
- * This code is based on `source-maps-support.js` in reworkcss/css
- * https://github.com/reworkcss/css/blob/master/lib/stringify/source-map-support.js
- * Copyright (c) 2012 TJ Holowaychuk <tj@vision-media.ca>
- */
-
-module.exports = mixin;
-
-/**
- * Mixin source map support into `compiler`.
- *
- * @param {Object} `compiler`
- * @api public
- */
-
-function mixin(compiler) {
-  define(compiler, '_comment', compiler.comment);
-  compiler.map = new utils.SourceMap.SourceMapGenerator();
-  compiler.position = { line: 1, column: 1 };
-  compiler.content = {};
-  compiler.files = {};
-
-  for (var key in exports) {
-    define(compiler, key, exports[key]);
-  }
-}
-
-/**
- * Update position.
- *
- * @param {String} str
- */
-
-exports.updatePosition = function(str) {
-  var lines = str.match(/\n/g);
-  if (lines) this.position.line += lines.length;
-  var i = str.lastIndexOf('\n');
-  this.position.column = ~i ? str.length - i : this.position.column + str.length;
-};
-
-/**
- * Emit `str` with `position`.
- *
- * @param {String} str
- * @param {Object} [pos]
- * @return {String}
- */
-
-exports.emit = function(str, node) {
-  var position = node.position || {};
-  var source = position.source;
-  if (source) {
-    if (position.filepath) {
-      source = utils.unixify(position.filepath);
-    }
-
-    this.map.addMapping({
-      source: source,
-      generated: {
-        line: this.position.line,
-        column: Math.max(this.position.column - 1, 0)
-      },
-      original: {
-        line: position.start.line,
-        column: position.start.column - 1
-      }
-    });
-
-    if (position.content) {
-      this.addContent(source, position);
-    }
-    if (position.filepath) {
-      this.addFile(source, position);
-    }
-
-    this.updatePosition(str);
-    this.output += str;
-  }
-  return str;
-};
-
-/**
- * Adds a file to the source map output if it has not already been added
- * @param {String} `file`
- * @param {Object} `pos`
- */
-
-exports.addFile = function(file, position) {
-  if (typeof position.content !== 'string') return;
-  if (Object.prototype.hasOwnProperty.call(this.files, file)) return;
-  this.files[file] = position.content;
-};
-
-/**
- * Adds a content source to the source map output if it has not already been added
- * @param {String} `source`
- * @param {Object} `position`
- */
-
-exports.addContent = function(source, position) {
-  if (typeof position.content !== 'string') return;
-  if (Object.prototype.hasOwnProperty.call(this.content, source)) return;
-  this.map.setSourceContent(source, position.content);
-};
-
-/**
- * Applies any original source maps to the output and embeds the source file
- * contents in the source map.
- */
-
-exports.applySourceMaps = function() {
-  Object.keys(this.files).forEach(function(file) {
-    var content = this.files[file];
-    this.map.setSourceContent(file, content);
-
-    if (this.options.inputSourcemaps === true) {
-      var originalMap = utils.sourceMapResolve.resolveSync(content, file, fs.readFileSync);
-      if (originalMap) {
-        var map = new utils.SourceMap.SourceMapConsumer(originalMap.map);
-        var relativeTo = originalMap.sourcesRelativeTo;
-        this.map.applySourceMap(map, file, utils.unixify(path.dirname(relativeTo)));
-      }
-    }
-  }, this);
-};
-
-/**
- * Process comments, drops sourceMap comments.
- * @param {Object} node
- */
-
-exports.comment = function(node) {
-  if (/^# sourceMappingURL=/.test(node.comment)) {
-    return this.emit('', node.position);
-  }
-  return this._comment(node);
-};
-
-
-/***/ }),
-/* 719 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var use = __webpack_require__(697);
-var util = __webpack_require__(234);
-var Cache = __webpack_require__(720);
-var define = __webpack_require__(685);
-var debug = __webpack_require__(326)('snapdragon:parser');
-var Position = __webpack_require__(721);
-var utils = __webpack_require__(699);
-
-/**
- * Create a new `Parser` with the given `input` and `options`.
- * @param {String} `input`
- * @param {Object} `options`
- * @api public
- */
-
-function Parser(options) {
-  debug('initializing', __filename);
-  this.options = utils.extend({source: 'string'}, options);
-  this.init(this.options);
-  use(this);
-}
-
-/**
- * Prototype methods
- */
-
-Parser.prototype = {
-  constructor: Parser,
-
-  init: function(options) {
-    this.orig = '';
-    this.input = '';
-    this.parsed = '';
-
-    this.column = 1;
-    this.line = 1;
-
-    this.regex = new Cache();
-    this.errors = this.errors || [];
-    this.parsers = this.parsers || {};
-    this.types = this.types || [];
-    this.sets = this.sets || {};
-    this.fns = this.fns || [];
-    this.currentType = 'root';
-
-    var pos = this.position();
-    this.bos = pos({type: 'bos', val: ''});
-
-    this.ast = {
-      type: 'root',
-      errors: this.errors,
-      nodes: [this.bos]
-    };
-
-    define(this.bos, 'parent', this.ast);
-    this.nodes = [this.ast];
-
-    this.count = 0;
-    this.setCount = 0;
-    this.stack = [];
-  },
-
-  /**
-   * Throw a formatted error with the cursor column and `msg`.
-   * @param {String} `msg` Message to use in the Error.
-   */
-
-  error: function(msg, node) {
-    var pos = node.position || {start: {column: 0, line: 0}};
-    var line = pos.start.line;
-    var column = pos.start.column;
-    var source = this.options.source;
-
-    var message = source + ' <line:' + line + ' column:' + column + '>: ' + msg;
-    var err = new Error(message);
-    err.source = source;
-    err.reason = msg;
-    err.pos = pos;
-
-    if (this.options.silent) {
-      this.errors.push(err);
-    } else {
-      throw err;
-    }
-  },
-
-  /**
-   * Define a non-enumberable property on the `Parser` instance.
-   *
-   * ```js
-   * parser.define('foo', 'bar');
-   * ```
-   * @name .define
-   * @param {String} `key` propery name
-   * @param {any} `val` property value
-   * @return {Object} Returns the Parser instance for chaining.
-   * @api public
-   */
-
-  define: function(key, val) {
-    define(this, key, val);
-    return this;
-  },
-
-  /**
-   * Mark position and patch `node.position`.
-   */
-
-  position: function() {
-    var start = { line: this.line, column: this.column };
-    var self = this;
-
-    return function(node) {
-      define(node, 'position', new Position(start, self));
-      return node;
-    };
-  },
-
-  /**
-   * Set parser `name` with the given `fn`
-   * @param {String} `name`
-   * @param {Function} `fn`
-   * @api public
-   */
-
-  set: function(type, fn) {
-    if (this.types.indexOf(type) === -1) {
-      this.types.push(type);
-    }
-    this.parsers[type] = fn.bind(this);
-    return this;
-  },
-
-  /**
-   * Get parser `name`
-   * @param {String} `name`
-   * @api public
-   */
-
-  get: function(name) {
-    return this.parsers[name];
-  },
-
-  /**
-   * Push a `token` onto the `type` stack.
-   *
-   * @param {String} `type`
-   * @return {Object} `token`
-   * @api public
-   */
-
-  push: function(type, token) {
-    this.sets[type] = this.sets[type] || [];
-    this.count++;
-    this.stack.push(token);
-    return this.sets[type].push(token);
-  },
-
-  /**
-   * Pop a token off of the `type` stack
-   * @param {String} `type`
-   * @returns {Object} Returns a token
-   * @api public
-   */
-
-  pop: function(type) {
-    this.sets[type] = this.sets[type] || [];
-    this.count--;
-    this.stack.pop();
-    return this.sets[type].pop();
-  },
-
-  /**
-   * Return true if inside a `stack` node. Types are `braces`, `parens` or `brackets`.
-   *
-   * @param {String} `type`
-   * @return {Boolean}
-   * @api public
-   */
-
-  isInside: function(type) {
-    this.sets[type] = this.sets[type] || [];
-    return this.sets[type].length > 0;
-  },
-
-  /**
-   * Return true if `node` is the given `type`.
-   *
-   * ```js
-   * parser.isType(node, 'brace');
-   * ```
-   * @param {Object} `node`
-   * @param {String} `type`
-   * @return {Boolean}
-   * @api public
-   */
-
-  isType: function(node, type) {
-    return node && node.type === type;
-  },
-
-  /**
-   * Get the previous AST node
-   * @return {Object}
-   */
-
-  prev: function(n) {
-    return this.stack.length > 0
-      ? utils.last(this.stack, n)
-      : utils.last(this.nodes, n);
-  },
-
-  /**
-   * Update line and column based on `str`.
-   */
-
-  consume: function(len) {
-    this.input = this.input.substr(len);
-  },
-
-  /**
-   * Update column based on `str`.
-   */
-
-  updatePosition: function(str, len) {
-    var lines = str.match(/\n/g);
-    if (lines) this.line += lines.length;
-    var i = str.lastIndexOf('\n');
-    this.column = ~i ? len - i : this.column + len;
-    this.parsed += str;
-    this.consume(len);
-  },
-
-  /**
-   * Match `regex`, return captures, and update the cursor position by `match[0]` length.
-   * @param {RegExp} `regex`
-   * @return {Object}
-   */
-
-  match: function(regex) {
-    var m = regex.exec(this.input);
-    if (m) {
-      this.updatePosition(m[0], m[0].length);
-      return m;
-    }
-  },
-
-  /**
-   * Capture `type` with the given regex.
-   * @param {String} `type`
-   * @param {RegExp} `regex`
-   * @return {Function}
-   */
-
-  capture: function(type, regex) {
-    if (typeof regex === 'function') {
-      return this.set.apply(this, arguments);
-    }
-
-    this.regex.set(type, regex);
-    this.set(type, function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(regex);
-      if (!m || !m[0]) return;
-
-      var prev = this.prev();
-      var node = pos({
-        type: type,
-        val: m[0],
-        parsed: parsed,
-        rest: this.input
-      });
-
-      if (m[1]) {
-        node.inner = m[1];
-      }
-
-      define(node, 'inside', this.stack.length > 0);
-      define(node, 'parent', prev);
-      prev.nodes.push(node);
-    }.bind(this));
-    return this;
-  },
-
-  /**
-   * Create a parser with open and close for parens,
-   * brackets or braces
-   */
-
-  capturePair: function(type, openRegex, closeRegex, fn) {
-    this.sets[type] = this.sets[type] || [];
-
-    /**
-     * Open
-     */
-
-    this.set(type + '.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(openRegex);
-      if (!m || !m[0]) return;
-
-      var val = m[0];
-      this.setCount++;
-      this.specialChars = true;
-      var open = pos({
-        type: type + '.open',
-        val: val,
-        rest: this.input
-      });
-
-      if (typeof m[1] !== 'undefined') {
-        open.inner = m[1];
-      }
-
-      var prev = this.prev();
-      var node = pos({
-        type: type,
-        nodes: [open]
-      });
-
-      define(node, 'rest', this.input);
-      define(node, 'parsed', parsed);
-      define(node, 'prefix', m[1]);
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
-
-      if (typeof fn === 'function') {
-        fn.call(this, open, node);
-      }
-
-      this.push(type, node);
-      prev.nodes.push(node);
-    });
-
-    /**
-     * Close
-     */
-
-    this.set(type + '.close', function() {
-      var pos = this.position();
-      var m = this.match(closeRegex);
-      if (!m || !m[0]) return;
-
-      var parent = this.pop(type);
-      var node = pos({
-        type: type + '.close',
-        rest: this.input,
-        suffix: m[1],
-        val: m[0]
-      });
-
-      if (!this.isType(parent, type)) {
-        if (this.options.strict) {
-          throw new Error('missing opening "' + type + '"');
-        }
-
-        this.setCount--;
-        node.escaped = true;
-        return node;
-      }
-
-      if (node.suffix === '\\') {
-        parent.escaped = true;
-        node.escaped = true;
-      }
-
-      parent.nodes.push(node);
-      define(node, 'parent', parent);
-    });
-
-    return this;
-  },
-
-  /**
-   * Capture end-of-string
-   */
-
-  eos: function() {
-    var pos = this.position();
-    if (this.input) return;
-    var prev = this.prev();
-
-    while (prev.type !== 'root' && !prev.visited) {
-      if (this.options.strict === true) {
-        throw new SyntaxError('invalid syntax:' + util.inspect(prev, null, 2));
-      }
-
-      if (!hasDelims(prev)) {
-        prev.parent.escaped = true;
-        prev.escaped = true;
-      }
-
-      visit(prev, function(node) {
-        if (!hasDelims(node.parent)) {
-          node.parent.escaped = true;
-          node.escaped = true;
-        }
-      });
-
-      prev = prev.parent;
-    }
-
-    var tok = pos({
-      type: 'eos',
-      val: this.append || ''
-    });
-
-    define(tok, 'parent', this.ast);
-    return tok;
-  },
-
-  /**
-   * Run parsers to advance the cursor position
-   */
-
-  next: function() {
-    var parsed = this.parsed;
-    var len = this.types.length;
-    var idx = -1;
-    var tok;
-
-    while (++idx < len) {
-      if ((tok = this.parsers[this.types[idx]].call(this))) {
-        define(tok, 'rest', this.input);
-        define(tok, 'parsed', parsed);
-        this.last = tok;
-        return tok;
-      }
-    }
-  },
-
-  /**
-   * Parse the given string.
-   * @return {Array}
-   */
-
-  parse: function(input) {
-    if (typeof input !== 'string') {
-      throw new TypeError('expected a string');
-    }
-
-    this.init(this.options);
-    this.orig = input;
-    this.input = input;
-    var self = this;
-
-    function parse() {
-      // check input before calling `.next()`
-      input = self.input;
-
-      // get the next AST ndoe
-      var node = self.next();
-      if (node) {
-        var prev = self.prev();
-        if (prev) {
-          define(node, 'parent', prev);
-          if (prev.nodes) {
-            prev.nodes.push(node);
-          }
-        }
-
-        if (self.sets.hasOwnProperty(prev.type)) {
-          self.currentType = prev.type;
-        }
-      }
-
-      // if we got here but input is not changed, throw an error
-      if (self.input && input === self.input) {
-        throw new Error('no parsers registered for: "' + self.input.slice(0, 5) + '"');
-      }
-    }
-
-    while (this.input) parse();
-    if (this.stack.length && this.options.strict) {
-      var node = this.stack.pop();
-      throw this.error('missing opening ' + node.type + ': "' + this.orig + '"');
-    }
-
-    var eos = this.eos();
-    var tok = this.prev();
-    if (tok.type !== 'eos') {
-      this.ast.nodes.push(eos);
-    }
-
-    return this.ast;
-  }
-};
-
-/**
- * Visit `node` with the given `fn`
- */
-
-function visit(node, fn) {
-  if (!node.visited) {
-    define(node, 'visited', true);
-    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
-  }
-  return node;
-}
-
-/**
- * Map visit over array of `nodes`.
- */
-
-function mapVisit(nodes, fn) {
-  var len = nodes.length;
-  var idx = -1;
-  while (++idx < len) {
-    visit(nodes[idx], fn);
-  }
-}
-
-function hasOpen(node) {
-  return node.nodes && node.nodes[0].type === (node.type + '.open');
-}
-
-function hasClose(node) {
-  return node.nodes && utils.last(node.nodes).type === (node.type + '.close');
-}
-
-function hasDelims(node) {
-  return hasOpen(node) && hasClose(node);
-}
-
-/**
- * Expose `Parser`
- */
-
-module.exports = Parser;
-
-
-/***/ }),
-/* 720 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * map-cache <https://github.com/jonschlinkert/map-cache>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var hasOwn = Object.prototype.hasOwnProperty;
-
-/**
- * Expose `MapCache`
- */
-
-module.exports = MapCache;
-
-/**
- * Creates a cache object to store key/value pairs.
- *
- * ```js
- * var cache = new MapCache();
- * ```
- *
- * @api public
- */
-
-function MapCache(data) {
-  this.__data__ = data || {};
-}
-
-/**
- * Adds `value` to `key` on the cache.
- *
- * ```js
- * cache.set('foo', 'bar');
- * ```
- *
- * @param {String} `key` The key of the value to cache.
- * @param {*} `value` The value to cache.
- * @returns {Object} Returns the `Cache` object for chaining.
- * @api public
- */
-
-MapCache.prototype.set = function mapSet(key, value) {
-  if (key !== '__proto__') {
-    this.__data__[key] = value;
-  }
-  return this;
-};
-
-/**
- * Gets the cached value for `key`.
- *
- * ```js
- * cache.get('foo');
- * //=> 'bar'
- * ```
- *
- * @param {String} `key` The key of the value to get.
- * @returns {*} Returns the cached value.
- * @api public
- */
-
-MapCache.prototype.get = function mapGet(key) {
-  return key === '__proto__' ? undefined : this.__data__[key];
-};
-
-/**
- * Checks if a cached value for `key` exists.
- *
- * ```js
- * cache.has('foo');
- * //=> true
- * ```
- *
- * @param {String} `key` The key of the entry to check.
- * @returns {Boolean} Returns `true` if an entry for `key` exists, else `false`.
- * @api public
- */
-
-MapCache.prototype.has = function mapHas(key) {
-  return key !== '__proto__' && hasOwn.call(this.__data__, key);
-};
-
-/**
- * Removes `key` and its value from the cache.
- *
- * ```js
- * cache.del('foo');
- * ```
- * @title .del
- * @param {String} `key` The key of the value to remove.
- * @returns {Boolean} Returns `true` if the entry was removed successfully, else `false`.
- * @api public
- */
-
-MapCache.prototype.del = function mapDelete(key) {
-  return this.has(key) && delete this.__data__[key];
-};
-
-
-/***/ }),
-/* 721 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var define = __webpack_require__(685);
-
-/**
- * Store position for a node
- */
-
-module.exports = function Position(start, parser) {
-  this.start = start;
-  this.end = { line: parser.line, column: parser.column };
-  define(this, 'content', parser.orig);
-  define(this, 'source', parser.options.source);
-};
-
-
-/***/ }),
-/* 722 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(723);
-var assignSymbols = __webpack_require__(626);
-
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-function isString(val) {
-  return (val && typeof val === 'string');
-}
-
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
-
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
-
-
-/***/ }),
-/* 723 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isPlainObject = __webpack_require__(625);
-
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
-
-
-/***/ }),
-/* 724 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var nanomatch = __webpack_require__(725);
-var extglob = __webpack_require__(739);
-
-module.exports = function(snapdragon) {
-  var compilers = snapdragon.compiler.compilers;
-  var opts = snapdragon.options;
-
-  // register nanomatch compilers
-  snapdragon.use(nanomatch.compilers);
-
-  // get references to some specific nanomatch compilers before they
-  // are overridden by the extglob and/or custom compilers
-  var escape = compilers.escape;
-  var qmark = compilers.qmark;
-  var slash = compilers.slash;
-  var star = compilers.star;
-  var text = compilers.text;
-  var plus = compilers.plus;
-  var dot = compilers.dot;
-
-  // register extglob compilers or escape exglobs if disabled
-  if (opts.extglob === false || opts.noext === true) {
-    snapdragon.compiler.use(escapeExtglobs);
-  } else {
-    snapdragon.use(extglob.compilers);
-  }
-
-  snapdragon.use(function() {
-    this.options.star = this.options.star || function(/*node*/) {
-      return '[^\\\\/]*?';
-    };
-  });
-
-  // custom micromatch compilers
-  snapdragon.compiler
-
-    // reset referenced compiler
-    .set('dot', dot)
-    .set('escape', escape)
-    .set('plus', plus)
-    .set('slash', slash)
-    .set('qmark', qmark)
-    .set('star', star)
-    .set('text', text);
-};
-
-function escapeExtglobs(compiler) {
-  compiler.set('paren', function(node) {
-    var val = '';
-    visit(node, function(tok) {
-      if (tok.val) val += (/^\W/.test(tok.val) ? '\\' : '') + tok.val;
-    });
-    return this.emit(val, node);
-  });
-
-  /**
-   * Visit `node` with the given `fn`
-   */
-
-  function visit(node, fn) {
-    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
-  }
-
-  /**
-   * Map visit over array of `nodes`.
-   */
-
-  function mapVisit(nodes, fn) {
-    var len = nodes.length;
-    var idx = -1;
-    while (++idx < len) {
-      visit(nodes[idx], fn);
-    }
-  }
-}
-
-
-/***/ }),
-/* 725 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Module dependencies
- */
-
-var util = __webpack_require__(234);
-var toRegex = __webpack_require__(610);
-var extend = __webpack_require__(726);
-
-/**
- * Local dependencies
- */
-
-var compilers = __webpack_require__(728);
-var parsers = __webpack_require__(729);
-var cache = __webpack_require__(732);
-var utils = __webpack_require__(734);
-var MAX_LENGTH = 1024 * 64;
-
-/**
- * The main function takes a list of strings and one or more
- * glob patterns to use for matching.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm(list, patterns[, options]);
- *
- * console.log(nm(['a.js', 'a.txt'], ['*.js']));
- * //=> [ 'a.js' ]
- * ```
- * @param {Array} `list` A list of strings to match
- * @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 {Array} Returns an array of matches
- * @summary false
- * @api public
- */
-
-function nanomatch(list, patterns, options) {
-  patterns = utils.arrayify(patterns);
-  list = utils.arrayify(list);
-
-  var len = patterns.length;
-  if (list.length === 0 || len === 0) {
-    return [];
-  }
-
-  if (len === 1) {
-    return nanomatch.match(list, patterns[0], options);
-  }
-
-  var negated = false;
-  var omit = [];
-  var keep = [];
-  var idx = -1;
-
-  while (++idx < len) {
-    var pattern = patterns[idx];
-
-    if (typeof pattern === 'string' && pattern.charCodeAt(0) === 33 /* ! */) {
-      omit.push.apply(omit, nanomatch.match(list, pattern.slice(1), options));
-      negated = true;
-    } else {
-      keep.push.apply(keep, nanomatch.match(list, pattern, options));
-    }
-  }
-
-  // minimatch.match parity
-  if (negated && keep.length === 0) {
-    if (options && options.unixify === false) {
-      keep = list.slice();
-    } else {
-      var unixify = utils.unixify(options);
-      for (var i = 0; i < list.length; i++) {
-        keep.push(unixify(list[i]));
-      }
-    }
-  }
-
-  var matches = utils.diff(keep, omit);
-  if (!options || options.nodupes !== false) {
-    return utils.unique(matches);
-  }
-
-  return matches;
-}
-
-/**
- * Similar to the main function, but `pattern` must be a string.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.match(list, pattern[, options]);
- *
- * console.log(nm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
- * //=> ['a.a', 'a.aa']
- * ```
- * @param {Array} `list` Array of strings to match
- * @param {String} `pattern` 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 matches
- * @api public
- */
-
-nanomatch.match = function(list, pattern, options) {
-  if (Array.isArray(pattern)) {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  var unixify = utils.unixify(options);
-  var isMatch = memoize('match', pattern, options, nanomatch.matcher);
-  var matches = [];
-
-  list = utils.arrayify(list);
-  var len = list.length;
-  var idx = -1;
-
-  while (++idx < len) {
-    var ele = list[idx];
-    if (ele === pattern || isMatch(ele)) {
-      matches.push(utils.value(ele, unixify, options));
-    }
-  }
-
-  // if no options were passed, uniquify results and return
-  if (typeof options === 'undefined') {
-    return utils.unique(matches);
-  }
-
-  if (matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
-    if (options.nonull === true || options.nullglob === true) {
-      return [options.unescape ? utils.unescape(pattern) : pattern];
-    }
-  }
-
-  // if `opts.ignore` was defined, diff ignored list
-  if (options.ignore) {
-    matches = nanomatch.not(matches, options.ignore, options);
-  }
-
-  return options.nodupes !== false ? utils.unique(matches) : matches;
-};
-
-/**
- * Returns true if the specified `string` matches the given glob `pattern`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.isMatch(string, pattern[, options]);
- *
- * console.log(nm.isMatch('a.a', '*.a'));
- * //=> true
- * console.log(nm.isMatch('a.b', '*.a'));
- * //=> false
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` 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 string matches the glob pattern.
- * @api public
- */
-
-nanomatch.isMatch = function(str, pattern, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (utils.isEmptyString(str) || utils.isEmptyString(pattern)) {
-    return false;
-  }
-
-  var equals = utils.equalsPattern(options);
-  if (equals(str)) {
-    return true;
-  }
-
-  var isMatch = memoize('isMatch', pattern, options, nanomatch.matcher);
-  return isMatch(str);
-};
-
-/**
- * Returns true if some of the elements in the given `list` match any of the
- * given glob `patterns`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.some(list, patterns[, options]);
- *
- * console.log(nm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
- * // true
- * console.log(nm.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
- */
-
-nanomatch.some = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
-
-  for (var i = 0; i < list.length; i++) {
-    if (nanomatch(list[i], patterns, options).length === 1) {
-      return true;
-    }
-  }
-
-  return false;
-};
-
-/**
- * Returns true if every element in the given `list` matches
- * at least one of the given glob `patterns`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.every(list, patterns[, options]);
- *
- * console.log(nm.every('foo.js', ['foo.js']));
- * // true
- * console.log(nm.every(['foo.js', 'bar.js'], ['*.js']));
- * // true
- * console.log(nm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
- * // false
- * console.log(nm.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
- */
-
-nanomatch.every = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
-
-  for (var i = 0; i < list.length; i++) {
-    if (nanomatch(list[i], patterns, options).length !== 1) {
-      return false;
-    }
-  }
-
-  return true;
-};
-
-/**
- * Returns true if **any** of the given glob `patterns`
- * match the specified `string`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.any(string, patterns[, options]);
- *
- * console.log(nm.any('a.a', ['b.*', '*.a']));
- * //=> true
- * console.log(nm.any('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) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
-
-nanomatch.any = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (utils.isEmptyString(str) || utils.isEmptyString(patterns)) {
-    return false;
-  }
-
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
-
-  for (var i = 0; i < patterns.length; i++) {
-    if (nanomatch.isMatch(str, patterns[i], options)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-/**
- * Returns true if **all** of the given `patterns`
- * match the specified string.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.all(string, patterns[, options]);
- *
- * console.log(nm.all('foo.js', ['foo.js']));
- * // true
- *
- * console.log(nm.all('foo.js', ['*.js', '!foo.js']));
- * // false
- *
- * console.log(nm.all('foo.js', ['*.js', 'foo.js']));
- * // true
- *
- * console.log(nm.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
- */
-
-nanomatch.all = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
-
-  for (var i = 0; i < patterns.length; i++) {
-    if (!nanomatch.isMatch(str, patterns[i], options)) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Returns a list of strings that _**do not match any**_ of the given `patterns`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.not(list, patterns[, options]);
- *
- * console.log(nm.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
- */
-
-nanomatch.not = function(list, patterns, options) {
-  var opts = extend({}, options);
-  var ignore = opts.ignore;
-  delete opts.ignore;
-
-  list = utils.arrayify(list);
-
-  var matches = utils.diff(list, nanomatch(list, patterns, opts));
-  if (ignore) {
-    matches = utils.diff(matches, nanomatch(list, ignore));
-  }
-
-  return opts.nodupes !== false ? utils.unique(matches) : matches;
-};
-
-/**
- * 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 nm = require('nanomatch');
- * nm.contains(string, pattern[, options]);
- *
- * console.log(nm.contains('aa/bb/cc', '*b'));
- * //=> true
- * console.log(nm.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
- */
-
-nanomatch.contains = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (typeof patterns === 'string') {
-    if (utils.isEmptyString(str) || utils.isEmptyString(patterns)) {
-      return false;
-    }
-
-    var equals = utils.equalsPattern(patterns, options);
-    if (equals(str)) {
-      return true;
-    }
-    var contains = utils.containsPattern(patterns, options);
-    if (contains(str)) {
-      return true;
-    }
-  }
-
-  var opts = extend({}, options, {contains: true});
-  return nanomatch.any(str, patterns, opts);
-};
-
-/**
- * Returns true if the given pattern and options should enable
- * the `matchBase` option.
- * @return {Boolean}
- * @api private
- */
-
-nanomatch.matchBase = function(pattern, options) {
-  if (pattern && pattern.indexOf('/') !== -1 || !options) return false;
-  return options.basename === true || options.matchBase === 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
- * var nm = require('nanomatch');
- * nm.matchKeys(object, patterns[, options]);
- *
- * var obj = { aa: 'a', ab: 'b', ac: 'c' };
- * console.log(nm.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
- */
-
-nanomatch.matchKeys = function(obj, patterns, options) {
-  if (!utils.isObject(obj)) {
-    throw new TypeError('expected the first argument to be an object');
-  }
-  var keys = nanomatch(Object.keys(obj), patterns, options);
-  return utils.pick(obj, keys);
-};
-
-/**
- * Returns a memoized 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
- * var nm = require('nanomatch');
- * nm.matcher(pattern[, options]);
- *
- * var isMatch = nm.matcher('*.!(*a)');
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.b'));
- * //=> true
- * ```
- * @param {String} `pattern` Glob pattern
- * @param {Object} `options` See available [options](#options) for changing how matches are performed.
- * @return {Function} Returns a matcher function.
- * @api public
- */
-
-nanomatch.matcher = function matcher(pattern, options) {
-  if (utils.isEmptyString(pattern)) {
-    return function() {
-      return false;
-    };
-  }
-
-  if (Array.isArray(pattern)) {
-    return compose(pattern, options, matcher);
-  }
-
-  // if pattern is a regex
-  if (pattern instanceof RegExp) {
-    return test(pattern);
-  }
-
-  // if pattern is invalid
-  if (!utils.isString(pattern)) {
-    throw new TypeError('expected pattern to be an array, string or regex');
-  }
-
-  // if pattern is a non-glob string
-  if (!utils.hasSpecialChars(pattern)) {
-    if (options && options.nocase === true) {
-      pattern = pattern.toLowerCase();
-    }
-    return utils.matchPath(pattern, options);
-  }
-
-  // if pattern is a glob string
-  var re = nanomatch.makeRe(pattern, options);
-
-  // if `options.matchBase` or `options.basename` is defined
-  if (nanomatch.matchBase(pattern, options)) {
-    return utils.matchBasename(re, options);
-  }
-
-  function test(regex) {
-    var equals = utils.equalsPattern(options);
-    var unixify = utils.unixify(options);
-
-    return function(str) {
-      if (equals(str)) {
-        return true;
-      }
-
-      if (regex.test(unixify(str))) {
-        return true;
-      }
-      return false;
-    };
-  }
-
-  // create matcher function
-  var matcherFn = test(re);
-  // set result object from compiler on matcher function,
-  // as a non-enumerable property. useful for debugging
-  utils.define(matcherFn, 'result', re.result);
-  return matcherFn;
-};
-
-/**
- * Returns an array of matches captured by `pattern` in `string, or
- * `null` if the pattern did not match.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.capture(pattern, string[, options]);
- *
- * console.log(nm.capture('test/*.js', 'test/foo.js'));
- * //=> ['foo']
- * console.log(nm.capture('test/*.js', 'foo/bar.css'));
- * //=> null
- * ```
- * @param {String} `pattern` Glob pattern to use for matching.
- * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
- * @api public
- */
-
-nanomatch.capture = function(pattern, str, options) {
-  var re = nanomatch.makeRe(pattern, extend({capture: true}, options));
-  var unixify = utils.unixify(options);
-
-  function match() {
-    return function(string) {
-      var match = re.exec(unixify(string));
-      if (!match) {
-        return null;
-      }
-
-      return match.slice(1);
-    };
-  }
-
-  var capture = memoize('capture', pattern, options, match);
-  return capture(str);
-};
-
-/**
- * Create a regular expression from the given glob `pattern`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.makeRe(pattern[, options]);
- *
- * console.log(nm.makeRe('*.js'));
- * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
- * ```
- * @param {String} `pattern` A glob pattern to convert to regex.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed.
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
-
-nanomatch.makeRe = function(pattern, options) {
-  if (pattern instanceof RegExp) {
-    return pattern;
-  }
-
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
-  }
-
-  function makeRe() {
-    var opts = utils.extend({wrap: false}, options);
-    var result = nanomatch.create(pattern, opts);
-    var regex = toRegex(result.output, opts);
-    utils.define(regex, 'result', result);
-    return regex;
-  }
-
-  return memoize('makeRe', pattern, options, makeRe);
-};
-
-/**
- * Parses the given glob `pattern` and returns an object with the compiled `output`
- * and optional source `map`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.create(pattern[, options]);
- *
- * console.log(nm.create('abc/*.js'));
- * // { options: { source: 'string', sourcemap: true },
- * //   state: {},
- * //   compilers:
- * //    { ... },
- * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
- * //   ast:
- * //    { type: 'root',
- * //      errors: [],
- * //      nodes:
- * //       [ ... ],
- * //      dot: false,
- * //      input: 'abc/*.js' },
- * //   parsingErrors: [],
- * //   map:
- * //    { version: 3,
- * //      sources: [ 'string' ],
- * //      names: [],
- * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
- * //      sourcesContent: [ 'abc/*.js' ] },
- * //   position: { line: 1, column: 28 },
- * //   content: {},
- * //   files: {},
- * //   idx: 6 }
- * ```
- * @param {String} `pattern` Glob pattern to parse and compile.
- * @param {Object} `options` Any [options](#options) to change how parsing and compiling is performed.
- * @return {Object} Returns an object with the parsed AST, compiled string and optional source map.
- * @api public
- */
-
-nanomatch.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-  function create() {
-    return nanomatch.compile(nanomatch.parse(pattern, options), options);
-  }
-  return memoize('create', pattern, options, create);
-};
-
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.parse(pattern[, options]);
- *
- * var ast = nm.parse('a/{b,c}/d');
- * console.log(ast);
- * // { type: 'root',
- * //   errors: [],
- * //   input: 'a/{b,c}/d',
- * //   nodes:
- * //    [ { type: 'bos', val: '' },
- * //      { type: 'text', val: 'a/' },
- * //      { type: 'brace',
- * //        nodes:
- * //         [ { type: 'brace.open', val: '{' },
- * //           { type: 'text', val: 'b,c' },
- * //           { type: 'brace.close', val: '}' } ] },
- * //      { type: 'text', val: '/d' },
- * //      { type: 'eos', val: '' } ] }
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object} Returns an AST
- * @api public
- */
-
-nanomatch.parse = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  function parse() {
-    var snapdragon = utils.instantiate(null, options);
-    parsers(snapdragon, options);
-
-    var ast = snapdragon.parse(pattern, options);
-    utils.define(ast, 'snapdragon', snapdragon);
-    ast.input = pattern;
-    return ast;
-  }
-
-  return memoize('parse', pattern, options, parse);
-};
-
-/**
- * Compile the given `ast` or string with the given `options`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.compile(ast[, options]);
- *
- * var ast = nm.parse('a/{b,c}/d');
- * console.log(nm.compile(ast));
- * // { options: { source: 'string' },
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      brace: [Function],
- * //      'brace.open': [Function],
- * //      text: [Function],
- * //      'brace.close': [Function] },
- * //   output: [ 'a/(b|c)/d' ],
- * //   ast:
- * //    { ... },
- * //   parsingErrors: [] }
- * ```
- * @param {Object|String} `ast`
- * @param {Object} `options`
- * @return {Object} Returns an object that has an `output` property with the compiled string.
- * @api public
- */
-
-nanomatch.compile = function(ast, options) {
-  if (typeof ast === 'string') {
-    ast = nanomatch.parse(ast, options);
-  }
-
-  function compile() {
-    var snapdragon = utils.instantiate(ast, options);
-    compilers(snapdragon, options);
-    return snapdragon.compile(ast, options);
-  }
-
-  return memoize('compile', ast.input, options, compile);
-};
-
-/**
- * Clear the regex cache.
- *
- * ```js
- * nm.clearCache();
- * ```
- * @api public
- */
-
-nanomatch.clearCache = function() {
-  nanomatch.cache.__data__ = {};
-};
-
-/**
- * Compose a matcher function with the given patterns.
- * This allows matcher functions to be compiled once and
- * called multiple times.
- */
-
-function compose(patterns, options, matcher) {
-  var matchers;
-
-  return memoize('compose', String(patterns), options, function() {
-    return function(file) {
-      // delay composition until it's invoked the first time,
-      // after that it won't be called again
-      if (!matchers) {
-        matchers = [];
-        for (var i = 0; i < patterns.length; i++) {
-          matchers.push(matcher(patterns[i], options));
-        }
-      }
-
-      var len = matchers.length;
-      while (len--) {
-        if (matchers[len](file) === true) {
-          return true;
-        }
-      }
-      return false;
-    };
-  });
-}
-
-/**
- * Memoize a generated regex or function. A unique key is generated
- * from the `type` (usually method name), the `pattern`, and
- * user-defined options.
- */
-
-function memoize(type, pattern, options, fn) {
-  var key = utils.createKey(type + '=' + pattern, options);
-
-  if (options && options.cache === false) {
-    return fn(pattern, options);
-  }
-
-  if (cache.has(type, key)) {
-    return cache.get(type, key);
-  }
-
-  var val = fn(pattern, options);
-  cache.set(type, key, val);
-  return val;
-}
-
-/**
- * Expose compiler, parser and cache on `nanomatch`
- */
-
-nanomatch.compilers = compilers;
-nanomatch.parsers = parsers;
-nanomatch.cache = cache;
-
-/**
- * Expose `nanomatch`
- * @type {Function}
- */
-
-module.exports = nanomatch;
-
-
-/***/ }),
-/* 726 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(727);
-var assignSymbols = __webpack_require__(626);
-
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
-
-function isString(val) {
-  return (val && typeof val === 'string');
-}
-
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
-
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
-
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
-
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
-
-
-/***/ }),
-/* 727 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isPlainObject = __webpack_require__(625);
-
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
-
-
-/***/ }),
-/* 728 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
-* Nanomatch compilers
-*/
-
-module.exports = function(nanomatch, options) {
-  function slash() {
-    if (options && typeof options.slash === 'string') {
-      return options.slash;
-    }
-    if (options && typeof options.slash === 'function') {
-      return options.slash.call(nanomatch);
-    }
-    return '\\\\/';
-  }
-
-  function star() {
-    if (options && typeof options.star === 'string') {
-      return options.star;
-    }
-    if (options && typeof options.star === 'function') {
-      return options.star.call(nanomatch);
-    }
-    return '[^' + slash() + ']*?';
-  }
-
-  var ast = nanomatch.ast = nanomatch.parser.ast;
-  ast.state = nanomatch.parser.state;
-  nanomatch.compiler.state = ast.state;
-  nanomatch.compiler
-
-    /**
-     * Negation / escaping
-     */
-
-    .set('not', function(node) {
-      var prev = this.prev();
-      if (this.options.nonegate === true || prev.type !== 'bos') {
-        return this.emit('\\' + node.val, node);
-      }
-      return this.emit(node.val, node);
-    })
-    .set('escape', function(node) {
-      if (this.options.unescape && /^[-\w_.]/.test(node.val)) {
-        return this.emit(node.val, node);
-      }
-      return this.emit('\\' + node.val, node);
-    })
-    .set('quoted', function(node) {
-      return this.emit(node.val, node);
-    })
-
-    /**
-     * Regex
-     */
-
-    .set('dollar', function(node) {
-      if (node.parent.type === 'bracket') {
-        return this.emit(node.val, node);
-      }
-      return this.emit('\\' + node.val, node);
-    })
-
-    /**
-     * Dot: "."
-     */
-
-    .set('dot', function(node) {
-      if (node.dotfiles === true) this.dotfiles = true;
-      return this.emit('\\' + node.val, node);
-    })
-
-    /**
-     * Slashes: "/" and "\"
-     */
-
-    .set('backslash', function(node) {
-      return this.emit(node.val, node);
-    })
-    .set('slash', function(node, nodes, i) {
-      var val = '[' + slash() + ']';
-      var parent = node.parent;
-      var prev = this.prev();
-
-      // set "node.hasSlash" to true on all ancestor parens nodes
-      while (parent.type === 'paren' && !parent.hasSlash) {
-        parent.hasSlash = true;
-        parent = parent.parent;
-      }
-
-      if (prev.addQmark) {
-        val += '?';
-      }
-
-      // word boundary
-      if (node.rest.slice(0, 2) === '\\b') {
-        return this.emit(val, node);
-      }
-
-      // globstars
-      if (node.parsed === '**' || node.parsed === './**') {
-        this.output = '(?:' + this.output;
-        return this.emit(val + ')?', node);
-      }
-
-      // negation
-      if (node.parsed === '!**' && this.options.nonegate !== true) {
-        return this.emit(val + '?\\b', node);
-      }
-      return this.emit(val, node);
-    })
-
-    /**
-     * Square brackets
-     */
-
-    .set('bracket', function(node) {
-      var close = node.close;
-      var open = !node.escaped ? '[' : '\\[';
-      var negated = node.negated;
-      var inner = node.inner;
-      var val = node.val;
-
-      if (node.escaped === true) {
-        inner = inner.replace(/\\?(\W)/g, '\\$1');
-        negated = '';
-      }
-
-      if (inner === ']-') {
-        inner = '\\]\\-';
-      }
-
-      if (negated && inner.indexOf('.') === -1) {
-        inner += '.';
-      }
-      if (negated && inner.indexOf('/') === -1) {
-        inner += '/';
-      }
-
-      val = open + negated + inner + close;
-      return this.emit(val, node);
-    })
-
-    /**
-     * Square: "[.]" (only matches a single character in brackets)
-     */
-
-    .set('square', function(node) {
-      var val = (/^\W/.test(node.val) ? '\\' : '') + node.val;
-      return this.emit(val, node);
-    })
-
-    /**
-     * Question mark: "?"
-     */
-
-    .set('qmark', function(node) {
-      var prev = this.prev();
-      // don't use "slash" variable so that we always avoid
-      // matching backslashes and slashes with a qmark
-      var val = '[^.\\\\/]';
-      if (this.options.dot || (prev.type !== 'bos' && prev.type !== 'slash')) {
-        val = '[^\\\\/]';
-      }
-
-      if (node.parsed.slice(-1) === '(') {
-        var ch = node.rest.charAt(0);
-        if (ch === '!' || ch === '=' || ch === ':') {
-          return this.emit(node.val, node);
-        }
-      }
-
-      if (node.val.length > 1) {
-        val += '{' + node.val.length + '}';
-      }
-      return this.emit(val, node);
-    })
-
-    /**
-     * Plus
-     */
-
-    .set('plus', function(node) {
-      var prev = node.parsed.slice(-1);
-      if (prev === ']' || prev === ')') {
-        return this.emit(node.val, node);
-      }
-      if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
-        return this.emit('\\+', node);
-      }
-      var ch = this.output.slice(-1);
-      if (/\w/.test(ch) && !node.inside) {
-        return this.emit('+\\+?', node);
-      }
-      return this.emit('+', node);
-    })
-
-    /**
-     * globstar: '**'
-     */
-
-    .set('globstar', function(node, nodes, i) {
-      if (!this.output) {
-        this.state.leadingGlobstar = true;
-      }
-
-      var prev = this.prev();
-      var before = this.prev(2);
-      var next = this.next();
-      var after = this.next(2);
-      var type = prev.type;
-      var val = node.val;
-
-      if (prev.type === 'slash' && next.type === 'slash') {
-        if (before.type === 'text') {
-          this.output += '?';
-
-          if (after.type !== 'text') {
-            this.output += '\\b';
-          }
-        }
-      }
-
-      var parsed = node.parsed;
-      if (parsed.charAt(0) === '!') {
-        parsed = parsed.slice(1);
-      }
-
-      var isInside = node.isInside.paren || node.isInside.brace;
-      if (parsed && type !== 'slash' && type !== 'bos' && !isInside) {
-        val = star();
-      } else {
-        val = this.options.dot !== true
-          ? '(?:(?!(?:[' + slash() + ']|^)\\.).)*?'
-          : '(?:(?!(?:[' + slash() + ']|^)(?:\\.{1,2})($|[' + slash() + ']))(?!\\.{2}).)*?';
-      }
-
-      if ((type === 'slash' || type === 'bos') && this.options.dot !== true) {
-        val = '(?!\\.)' + val;
-      }
-
-      if (prev.type === 'slash' && next.type === 'slash' && before.type !== 'text') {
-        if (after.type === 'text' || after.type === 'star') {
-          node.addQmark = true;
-        }
-      }
-
-      if (this.options.capture) {
-        val = '(' + val + ')';
-      }
-
-      return this.emit(val, node);
-    })
-
-    /**
-     * Star: "*"
-     */
-
-    .set('star', function(node, nodes, i) {
-      var prior = nodes[i - 2] || {};
-      var prev = this.prev();
-      var next = this.next();
-      var type = prev.type;
-
-      function isStart(n) {
-        return n.type === 'bos' || n.type === 'slash';
-      }
-
-      if (this.output === '' && this.options.contains !== true) {
-        this.output = '(?![' + slash() + '])';
-      }
-
-      if (type === 'bracket' && this.options.bash === false) {
-        var str = next && next.type === 'bracket' ? star() : '*?';
-        if (!prev.nodes || prev.nodes[1].type !== 'posix') {
-          return this.emit(str, node);
-        }
-      }
-
-      var prefix = !this.dotfiles && type !== 'text' && type !== 'escape'
-        ? (this.options.dot ? '(?!(?:^|[' + slash() + '])\\.{1,2}(?:$|[' + slash() + ']))' : '(?!\\.)')
-        : '';
-
-      if (isStart(prev) || (isStart(prior) && type === 'not')) {
-        if (prefix !== '(?!\\.)') {
-          prefix += '(?!(\\.{2}|\\.[' + slash() + ']))(?=.)';
-        } else {
-          prefix += '(?=.)';
-        }
-      } else if (prefix === '(?!\\.)') {
-        prefix = '';
-      }
-
-      if (prev.type === 'not' && prior.type === 'bos' && this.options.dot === true) {
-        this.output = '(?!\\.)' + this.output;
-      }
-
-      var output = prefix + star();
-      if (this.options.capture) {
-        output = '(' + output + ')';
-      }
-
-      return this.emit(output, node);
-    })
-
-    /**
-     * Text
-     */
-
-    .set('text', function(node) {
-      return this.emit(node.val, node);
-    })
-
-    /**
-     * End-of-string
-     */
-
-    .set('eos', function(node) {
-      var prev = this.prev();
-      var val = node.val;
-
-      this.output = '(?:\\.[' + slash() + '](?=.))?' + this.output;
-      if (this.state.metachar && prev.type !== 'qmark' && prev.type !== 'slash') {
-        val += (this.options.contains ? '[' + slash() + ']?' : '(?:[' + slash() + ']|$)');
-      }
-
-      return this.emit(val, node);
-    });
-
-  /**
-   * Allow custom compilers to be passed on options
-   */
-
-  if (options && typeof options.compilers === 'function') {
-    options.compilers(nanomatch.compiler);
-  }
-};
-
-
-
-/***/ }),
-/* 729 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var regexNot = __webpack_require__(627);
-var toRegex = __webpack_require__(610);
-var isOdd = __webpack_require__(730);
-
-/**
- * Characters to use in negation regex (we want to "not" match
- * characters that are matched by other parsers)
- */
-
-var cached;
-var NOT_REGEX = '[\\[!*+?$^"\'.\\\\/]+';
-var not = createTextRegex(NOT_REGEX);
-
-/**
- * Nanomatch parsers
- */
-
-module.exports = function(nanomatch, options) {
-  var parser = nanomatch.parser;
-  var opts = parser.options;
-
-  parser.state = {
-    slashes: 0,
-    paths: []
-  };
-
-  parser.ast.state = parser.state;
-  parser
-
-    /**
-     * Beginning-of-string
-     */
-
-    .capture('prefix', function() {
-      if (this.parsed) return;
-      var m = this.match(/^\.[\\/]/);
-      if (!m) return;
-      this.state.strictOpen = !!this.options.strictOpen;
-      this.state.addPrefix = true;
-    })
-
-    /**
-     * Escape: "\\."
-     */
-
-    .capture('escape', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(/^(?:\\(.)|([$^]))/);
-      if (!m) return;
-
-      return pos({
-        type: 'escape',
-        val: m[2] || m[1]
-      });
-    })
-
-    /**
-     * Quoted strings
-     */
-
-    .capture('quoted', function() {
-      var pos = this.position();
-      var m = this.match(/^["']/);
-      if (!m) return;
-
-      var quote = m[0];
-      if (this.input.indexOf(quote) === -1) {
-        return pos({
-          type: 'escape',
-          val: quote
-        });
-      }
-
-      var tok = advanceTo(this.input, quote);
-      this.consume(tok.len);
-
-      return pos({
-        type: 'quoted',
-        val: tok.esc
-      });
-    })
-
-    /**
-     * Negations: "!"
-     */
-
-    .capture('not', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(this.notRegex || /^!+/);
-      if (!m) return;
-      var val = m[0];
-
-      var isNegated = isOdd(val.length);
-      if (parsed === '' && !isNegated) {
-        val = '';
-      }
-
-      // if nothing has been parsed, we know `!` is at the start,
-      // so we need to wrap the result in a negation regex
-      if (parsed === '' && isNegated && this.options.nonegate !== true) {
-        this.bos.val = '(?!^(?:';
-        this.append = ')$).*';
-        val = '';
-      }
-      return pos({
-        type: 'not',
-        val: val
-      });
-    })
-
-    /**
-     * Dot: "."
-     */
-
-    .capture('dot', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\.+/);
-      if (!m) return;
-
-      var val = m[0];
-      this.state.dot = val === '.' && (parsed === '' || parsed.slice(-1) === '/');
-
-      return pos({
-        type: 'dot',
-        dotfiles: this.state.dot,
-        val: val
-      });
-    })
-
-    /**
-     * Plus: "+"
-     */
-
-    .capture('plus', /^\+(?!\()/)
-
-    /**
-     * Question mark: "?"
-     */
-
-    .capture('qmark', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\?+(?!\()/);
-      if (!m) return;
-
-      this.state.metachar = true;
-      this.state.qmark = true;
-
-      return pos({
-        type: 'qmark',
-        parsed: parsed,
-        val: m[0]
-      });
-    })
-
-    /**
-     * Globstar: "**"
-     */
-
-    .capture('globstar', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\*{2}(?![*(])(?=[,)/]|$)/);
-      if (!m) return;
-
-      var type = opts.noglobstar !== true ? 'globstar' : 'star';
-      var node = pos({type: type, parsed: parsed});
-      this.state.metachar = true;
-
-      while (this.input.slice(0, 4) === '/**/') {
-        this.input = this.input.slice(3);
-      }
-
-      node.isInside = {
-        brace: this.isInside('brace'),
-        paren: this.isInside('paren')
-      };
-
-      if (type === 'globstar') {
-        this.state.globstar = true;
-        node.val = '**';
-
-      } else {
-        this.state.star = true;
-        node.val = '*';
-      }
-
-      return node;
-    })
-
-    /**
-     * Star: "*"
-     */
-
-    .capture('star', function() {
-      var pos = this.position();
-      var starRe = /^(?:\*(?![*(])|[*]{3,}(?!\()|[*]{2}(?![(/]|$)|\*(?=\*\())/;
-      var m = this.match(starRe);
-      if (!m) return;
-
-      this.state.metachar = true;
-      this.state.star = true;
-      return pos({
-        type: 'star',
-        val: m[0]
-      });
-    })
-
-    /**
-     * Slash: "/"
-     */
-
-    .capture('slash', function() {
-      var pos = this.position();
-      var m = this.match(/^\//);
-      if (!m) return;
-
-      this.state.slashes++;
-      return pos({
-        type: 'slash',
-        val: m[0]
-      });
-    })
-
-    /**
-     * Backslash: "\\"
-     */
-
-    .capture('backslash', function() {
-      var pos = this.position();
-      var m = this.match(/^\\(?![*+?(){}[\]'"])/);
-      if (!m) return;
-
-      var val = m[0];
-
-      if (this.isInside('bracket')) {
-        val = '\\';
-      } else if (val.length > 1) {
-        val = '\\\\';
-      }
-
-      return pos({
-        type: 'backslash',
-        val: val
-      });
-    })
-
-    /**
-     * Square: "[.]"
-     */
-
-    .capture('square', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(/^\[([^!^\\])\]/);
-      if (!m) return;
-
-      return pos({
-        type: 'square',
-        val: m[1]
-      });
-    })
-
-    /**
-     * Brackets: "[...]" (basic, this can be overridden by other parsers)
-     */
-
-    .capture('bracket', function() {
-      var pos = this.position();
-      var m = this.match(/^(?:\[([!^]?)([^\]]+|\]-)(\]|[^*+?]+)|\[)/);
-      if (!m) return;
-
-      var val = m[0];
-      var negated = m[1] ? '^' : '';
-      var inner = (m[2] || '').replace(/\\\\+/, '\\\\');
-      var close = m[3] || '';
-
-      if (m[2] && inner.length < m[2].length) {
-        val = val.replace(/\\\\+/, '\\\\');
-      }
-
-      var esc = this.input.slice(0, 2);
-      if (inner === '' && esc === '\\]') {
-        inner += esc;
-        this.consume(2);
-
-        var str = this.input;
-        var idx = -1;
-        var ch;
-
-        while ((ch = str[++idx])) {
-          this.consume(1);
-          if (ch === ']') {
-            close = ch;
-            break;
-          }
-          inner += ch;
-        }
-      }
-
-      return pos({
-        type: 'bracket',
-        val: val,
-        escaped: close !== ']',
-        negated: negated,
-        inner: inner,
-        close: close
-      });
-    })
-
-    /**
-     * Text
-     */
-
-    .capture('text', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(not);
-      if (!m || !m[0]) return;
-
-      return pos({
-        type: 'text',
-        val: m[0]
-      });
-    });
-
-  /**
-   * Allow custom parsers to be passed on options
-   */
-
-  if (options && typeof options.parsers === 'function') {
-    options.parsers(nanomatch.parser);
-  }
-};
-
-/**
- * Advance to the next non-escaped character
- */
-
-function advanceTo(input, endChar) {
-  var ch = input.charAt(0);
-  var tok = { len: 1, val: '', esc: '' };
-  var idx = 0;
-
-  function advance() {
-    if (ch !== '\\') {
-      tok.esc += '\\' + ch;
-      tok.val += ch;
-    }
-
-    ch = input.charAt(++idx);
-    tok.len++;
-
-    if (ch === '\\') {
-      advance();
-      advance();
-    }
-  }
-
-  while (ch && ch !== endChar) {
-    advance();
-  }
-  return tok;
-}
-
-/**
- * Create text regex
- */
-
-function createTextRegex(pattern) {
-  if (cached) return cached;
-  var opts = {contains: true, strictClose: false};
-  var not = regexNot.create(pattern, opts);
-  var re = toRegex('^(?:[*]\\((?=.)|' + not + ')', opts);
-  return (cached = re);
-}
-
-/**
- * Expose negation string
- */
-
-module.exports.not = NOT_REGEX;
-
-
-/***/ }),
-/* 730 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-odd <https://github.com/jonschlinkert/is-odd>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isNumber = __webpack_require__(731);
-
-module.exports = function isOdd(i) {
-  if (!isNumber(i)) {
-    throw new TypeError('is-odd expects a number.');
-  }
-  if (Number(i) !== Math.floor(i)) {
-    throw new RangeError('is-odd expects an integer.');
-  }
-  return !!(~~i & 1);
-};
-
-
-/***/ }),
-/* 731 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function isNumber(num) {
-  var type = typeof num;
-
-  if (type === 'string' || num instanceof String) {
-    // an empty string would be coerced to true with the below logic
-    if (!num.trim()) return false;
-  } else if (type !== 'number' && !(num instanceof Number)) {
-    return false;
-  }
-
-  return (num - num + 1) >= 0;
-};
-
-
-/***/ }),
-/* 732 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = new (__webpack_require__(733))();
-
-
-/***/ }),
-/* 733 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * fragment-cache <https://github.com/jonschlinkert/fragment-cache>
- *
- * Copyright (c) 2016-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var MapCache = __webpack_require__(720);
-
-/**
- * Create a new `FragmentCache` with an optional object to use for `caches`.
- *
- * ```js
- * var fragment = new FragmentCache();
- * ```
- * @name FragmentCache
- * @param {String} `cacheName`
- * @return {Object} Returns the [map-cache][] instance.
- * @api public
- */
-
-function FragmentCache(caches) {
-  this.caches = caches || {};
-}
-
-/**
- * Prototype
- */
-
-FragmentCache.prototype = {
-
-  /**
-   * Get cache `name` from the `fragment.caches` object. Creates a new
-   * `MapCache` if it doesn't already exist.
-   *
-   * ```js
-   * var cache = fragment.cache('files');
-   * console.log(fragment.caches.hasOwnProperty('files'));
-   * //=> true
-   * ```
-   * @name .cache
-   * @param {String} `cacheName`
-   * @return {Object} Returns the [map-cache][] instance.
-   * @api public
-   */
-
-  cache: function(cacheName) {
-    return this.caches[cacheName] || (this.caches[cacheName] = new MapCache());
-  },
-
-  /**
-   * Set a value for property `key` on cache `name`
-   *
-   * ```js
-   * fragment.set('files', 'somefile.js', new File({path: 'somefile.js'}));
-   * ```
-   * @name .set
-   * @param {String} `name`
-   * @param {String} `key` Property name to set
-   * @param {any} `val` The value of `key`
-   * @return {Object} The cache instance for chaining
-   * @api public
-   */
-
-  set: function(cacheName, key, val) {
-    var cache = this.cache(cacheName);
-    cache.set(key, val);
-    return cache;
-  },
-
-  /**
-   * Returns true if a non-undefined value is set for `key` on fragment cache `name`.
-   *
-   * ```js
-   * var cache = fragment.cache('files');
-   * cache.set('somefile.js');
-   *
-   * console.log(cache.has('somefile.js'));
-   * //=> true
-   *
-   * console.log(cache.has('some-other-file.js'));
-   * //=> false
-   * ```
-   * @name .has
-   * @param {String} `name` Cache name
-   * @param {String} `key` Optionally specify a property to check for on cache `name`
-   * @return {Boolean}
-   * @api public
-   */
-
-  has: function(cacheName, key) {
-    return typeof this.get(cacheName, key) !== 'undefined';
-  },
-
-  /**
-   * Get `name`, or if specified, the value of `key`. Invokes the [cache]() method,
-   * so that cache `name` will be created it doesn't already exist. If `key` is not passed,
-   * the entire cache (`name`) is returned.
-   *
-   * ```js
-   * var Vinyl = require('vinyl');
-   * var cache = fragment.cache('files');
-   * cache.set('somefile.js', new Vinyl({path: 'somefile.js'}));
-   * console.log(cache.get('somefile.js'));
-   * //=> <File "somefile.js">
-   * ```
-   * @name .get
-   * @param {String} `name`
-   * @return {Object} Returns cache `name`, or the value of `key` if specified
-   * @api public
-   */
-
-  get: function(name, key) {
-    var cache = this.cache(name);
-    if (typeof key === 'string') {
-      return cache.get(key);
-    }
-    return cache;
-  }
-};
-
-/**
- * Expose `FragmentCache`
- */
-
-exports = module.exports = FragmentCache;
-
-
-/***/ }),
-/* 734 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = module.exports;
-var path = __webpack_require__(4);
-
-/**
- * Module dependencies
- */
-
-var isWindows = __webpack_require__(735)();
-var Snapdragon = __webpack_require__(654);
-utils.define = __webpack_require__(736);
-utils.diff = __webpack_require__(737);
-utils.extend = __webpack_require__(726);
-utils.pick = __webpack_require__(738);
-utils.typeOf = __webpack_require__(620);
-utils.unique = __webpack_require__(630);
-
-/**
- * Returns true if the given value is effectively an empty string
- */
-
-utils.isEmptyString = function(val) {
-  return String(val) === '' || String(val) === './';
-};
-
-/**
- * Returns true if the platform is windows, or `path.sep` is `\\`.
- * This is defined as a function to allow `path.sep` to be set in unit tests,
- * or by the user, if there is a reason to do so.
- * @return {Boolean}
- */
-
-utils.isWindows = function() {
-  return path.sep === '\\' || isWindows === true;
-};
-
-/**
- * Return the last element from an array
- */
-
-utils.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
-
-/**
- * Get the `Snapdragon` instance to use
- */
-
-utils.instantiate = function(ast, options) {
-  var snapdragon;
-  // if an instance was created by `.parse`, use that instance
-  if (utils.typeOf(ast) === 'object' && ast.snapdragon) {
-    snapdragon = ast.snapdragon;
-  // if the user supplies an instance on options, use that instance
-  } else if (utils.typeOf(options) === 'object' && options.snapdragon) {
-    snapdragon = options.snapdragon;
-  // create a new instance
-  } else {
-    snapdragon = new Snapdragon(options);
-  }
-
-  utils.define(snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.call(this, str, options);
-    parsed.input = str;
-
-    // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
-    if (last && this.options.strictErrors !== true) {
-      var open = last.nodes[0];
-      var inner = last.nodes[1];
-      if (last.type === 'bracket') {
-        if (inner.val.charAt(0) === '[') {
-          inner.val = '\\' + inner.val;
-        }
-
-      } else {
-        open.val = '\\' + open.val;
-        var sibling = open.parent.nodes[1];
-        if (sibling.type === 'star') {
-          sibling.loose = true;
-        }
-      }
-    }
-
-    // add non-enumerable parser reference
-    utils.define(parsed, 'parser', this.parser);
-    return parsed;
-  });
-
-  return snapdragon;
-};
-
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
-
-utils.createKey = function(pattern, options) {
-  if (typeof options === 'undefined') {
-    return pattern;
-  }
-  var key = pattern;
-  for (var prop in options) {
-    if (options.hasOwnProperty(prop)) {
-      key += ';' + prop + '=' + String(options[prop]);
-    }
-  }
-  return key;
-};
-
-/**
- * Cast `val` to an array
- * @return {Array}
- */
-
-utils.arrayify = function(val) {
-  if (typeof val === 'string') return [val];
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
-
-/**
- * Return true if `val` is a non-empty string
- */
-
-utils.isString = function(val) {
-  return typeof val === 'string';
-};
-
-/**
- * Return true if `val` is a non-empty string
- */
-
-utils.isRegex = function(val) {
-  return utils.typeOf(val) === 'regexp';
-};
-
-/**
- * Return true if `val` is a non-empty string
- */
-
-utils.isObject = function(val) {
-  return utils.typeOf(val) === 'object';
-};
-
-/**
- * Escape regex characters in the given string
- */
-
-utils.escapeRegex = function(str) {
-  return str.replace(/[-[\]{}()^$|*+?.\\/\s]/g, '\\$&');
-};
-
-/**
- * Combines duplicate characters in the provided `input` string.
- * @param {String} `input`
- * @returns {String}
- */
-
-utils.combineDupes = function(input, patterns) {
-  patterns = utils.arrayify(patterns).join('|').split('|');
-  patterns = patterns.map(function(s) {
-    return s.replace(/\\?([+*\\/])/g, '\\$1');
-  });
-  var substr = patterns.join('|');
-  var regex = new RegExp('(' + substr + ')(?=\\1)', 'g');
-  return input.replace(regex, '');
-};
-
-/**
- * Returns true if the given `str` has special characters
- */
-
-utils.hasSpecialChars = function(str) {
-  return /(?:(?:(^|\/)[!.])|[*?+()|[\]{}]|[+@]\()/.test(str);
-};
-
-/**
- * Normalize slashes in the given filepath.
- *
- * @param {String} `filepath`
- * @return {String}
- */
-
-utils.toPosixPath = function(str) {
-  return str.replace(/\\+/g, '/');
-};
-
-/**
- * Strip backslashes before special characters in a string.
- *
- * @param {String} `str`
- * @return {String}
- */
-
-utils.unescape = function(str) {
-  return utils.toPosixPath(str.replace(/\\(?=[*+?!.])/g, ''));
-};
-
-/**
- * Strip the drive letter from a windows filepath
- * @param {String} `fp`
- * @return {String}
- */
-
-utils.stripDrive = function(fp) {
-  return utils.isWindows() ? fp.replace(/^[a-z]:[\\/]+?/i, '/') : fp;
-};
-
-/**
- * Strip the prefix from a filepath
- * @param {String} `fp`
- * @return {String}
- */
-
-utils.stripPrefix = function(str) {
-  if (str.charAt(0) === '.' && (str.charAt(1) === '/' || str.charAt(1) === '\\')) {
-    return str.slice(2);
-  }
-  return str;
-};
-
-/**
- * Returns true if `str` is a common character that doesn't need
- * to be processed to be used for matching.
- * @param {String} `str`
- * @return {Boolean}
- */
-
-utils.isSimpleChar = function(str) {
-  return str.trim() === '' || str === '.';
-};
-
-/**
- * Returns true if the given str is an escaped or
- * unescaped path character
- */
-
-utils.isSlash = function(str) {
-  return str === '/' || str === '\\/' || str === '\\' || str === '\\\\';
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern matches or contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.matchPath = function(pattern, options) {
-  return (options && options.contains)
-    ? utils.containsPattern(pattern, options)
-    : utils.equalsPattern(pattern, options);
-};
-
-/**
- * Returns true if the given (original) filepath or unixified path are equal
- * to the given pattern.
- */
-
-utils._equals = function(filepath, unixPath, pattern) {
-  return pattern === filepath || pattern === unixPath;
-};
-
-/**
- * Returns true if the given (original) filepath or unixified path contain
- * the given pattern.
- */
-
-utils._contains = function(filepath, unixPath, pattern) {
-  return filepath.indexOf(pattern) !== -1 || unixPath.indexOf(pattern) !== -1;
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern is the same as a given `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.equalsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
-
-  return function fn(filepath) {
-    var equal = utils._equals(filepath, unixify(filepath), pattern);
-    if (equal === true || options.nocase !== true) {
-      return equal;
-    }
-    var lower = filepath.toLowerCase();
-    return utils._equals(lower, unixify(lower), pattern);
-  };
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.containsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
-
-  return function(filepath) {
-    var contains = utils._contains(filepath, unixify(filepath), pattern);
-    if (contains === true || options.nocase !== true) {
-      return contains;
-    }
-    var lower = filepath.toLowerCase();
-    return utils._contains(lower, unixify(lower), pattern);
-  };
-};
-
-/**
- * Returns a function that returns true if the given
- * regex matches the `filename` of a file path.
- *
- * @param {RegExp} `re` Matching regex
- * @return {Function}
- */
-
-utils.matchBasename = function(re) {
-  return function(filepath) {
-    return re.test(filepath) || re.test(path.basename(filepath));
-  };
-};
-
-/**
- * Returns the given value unchanced.
- * @return {any}
- */
-
-utils.identity = function(val) {
-  return val;
-};
-
-/**
- * Determines the filepath to return based on the provided options.
- * @return {any}
- */
-
-utils.value = function(str, unixify, options) {
-  if (options && options.unixify === false) {
-    return str;
-  }
-  if (options && typeof options.unixify === 'function') {
-    return options.unixify(str);
-  }
-  return unixify(str);
-};
-
-/**
- * Returns a function that normalizes slashes in a string to forward
- * slashes, strips `./` from beginning of paths, and optionally unescapes
- * special characters.
- * @return {Function}
- */
-
-utils.unixify = function(options) {
-  var opts = options || {};
-  return function(filepath) {
-    if (opts.stripPrefix !== false) {
-      filepath = utils.stripPrefix(filepath);
-    }
-    if (opts.unescape === true) {
-      filepath = utils.unescape(filepath);
-    }
-    if (opts.unixify === true || utils.isWindows()) {
-      filepath = utils.toPosixPath(filepath);
-    }
-    return filepath;
-  };
-};
-
-
-/***/ }),
-/* 735 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * is-windows <https://github.com/jonschlinkert/is-windows>
- *
- * Copyright © 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-(function(factory) {
-  if (exports && typeof exports === 'object' && typeof module !== 'undefined') {
-    module.exports = factory();
-  } else if (true) {
-    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-  } else {}
-})(function() {
-  'use strict';
-  return function isWindows() {
-    return process && (process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE));
-  };
-});
-
-
-/***/ }),
-/* 736 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isobject = __webpack_require__(618);
-var isDescriptor = __webpack_require__(619);
-var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
-  ? Reflect.defineProperty
-  : Object.defineProperty;
-
-module.exports = function defineProperty(obj, key, val) {
-  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
-    throw new TypeError('expected an object, function, or array');
-  }
-
-  if (typeof key !== 'string') {
-    throw new TypeError('expected "key" to be a string');
-  }
-
-  if (isDescriptor(val)) {
-    define(obj, key, val);
-    return obj;
-  }
-
-  define(obj, key, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-
-  return obj;
-};
-
-
-/***/ }),
-/* 737 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * arr-diff <https://github.com/jonschlinkert/arr-diff>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function diff(arr/*, arrays*/) {
-  var len = arguments.length;
-  var idx = 0;
-  while (++idx < len) {
-    arr = diffArray(arr, arguments[idx]);
-  }
-  return arr;
-};
-
-function diffArray(one, two) {
-  if (!Array.isArray(two)) {
-    return one.slice();
-  }
-
-  var tlen = two.length
-  var olen = one.length;
-  var idx = -1;
-  var arr = [];
-
-  while (++idx < olen) {
-    var ele = one[idx];
-
-    var hasEle = false;
-    for (var i = 0; i < tlen; i++) {
-      var val = two[i];
-
-      if (ele === val) {
-        hasEle = true;
-        break;
-      }
-    }
-
-    if (hasEle === false) {
-      arr.push(ele);
-    }
-  }
-  return arr;
-}
-
-
-/***/ }),
-/* 738 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * object.pick <https://github.com/jonschlinkert/object.pick>
- *
- * Copyright (c) 2014-2015 Jon Schlinkert, contributors.
- * Licensed under the MIT License
- */
-
-
-
-var isObject = __webpack_require__(618);
-
-module.exports = function pick(obj, keys) {
-  if (!isObject(obj) && typeof obj !== 'function') {
-    return {};
-  }
-
-  var res = {};
-  if (typeof keys === 'string') {
-    if (keys in obj) {
-      res[keys] = obj[keys];
-    }
-    return res;
-  }
-
-  var len = keys.length;
-  var idx = -1;
-
-  while (++idx < len) {
-    var key = keys[idx];
-    if (key in obj) {
-      res[key] = obj[key];
-    }
-  }
-  return res;
-};
-
-
-/***/ }),
-/* 739 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Module dependencies
- */
-
-var extend = __webpack_require__(669);
-var unique = __webpack_require__(630);
-var toRegex = __webpack_require__(610);
-
-/**
- * Local dependencies
- */
-
-var compilers = __webpack_require__(740);
-var parsers = __webpack_require__(746);
-var Extglob = __webpack_require__(749);
-var utils = __webpack_require__(748);
-var MAX_LENGTH = 1024 * 64;
-
-/**
- * Convert the given `extglob` pattern into a regex-compatible string. Returns
- * an object with the compiled result and the parsed AST.
- *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob('*.!(*a)'));
- * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-function extglob(pattern, options) {
-  return extglob.create(pattern, options).output;
-}
-
-/**
- * Takes an array of strings and an extglob pattern and returns a new
- * array that contains only the strings that match the pattern.
- *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob.match(['a.a', 'a.b', 'a.c'], '*.!(*a)'));
- * //=> ['a.b', 'a.c']
- * ```
- * @param {Array} `list` Array of strings to match
- * @param {String} `pattern` Extglob pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of matches
- * @api public
- */
-
-extglob.match = function(list, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  list = utils.arrayify(list);
-  var isMatch = extglob.matcher(pattern, options);
-  var len = list.length;
-  var idx = -1;
-  var matches = [];
-
-  while (++idx < len) {
-    var ele = list[idx];
-
-    if (isMatch(ele)) {
-      matches.push(ele);
-    }
-  }
-
-  // if no options were passed, uniquify results and return
-  if (typeof options === 'undefined') {
-    return unique(matches);
-  }
-
-  if (matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
-    if (options.nonull === true || options.nullglob === true) {
-      return [pattern.split('\\').join('')];
-    }
-  }
-
-  return options.nodupes !== false ? unique(matches) : matches;
-};
-
-/**
- * Returns true if the specified `string` matches the given
- * extglob `pattern`.
- *
- * ```js
- * var extglob = require('extglob');
- *
- * console.log(extglob.isMatch('a.a', '*.!(*a)'));
- * //=> false
- * console.log(extglob.isMatch('a.b', '*.!(*a)'));
- * //=> true
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` Extglob pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
-
-extglob.isMatch = function(str, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  if (pattern === str) {
-    return true;
-  }
-
-  if (pattern === '' || pattern === ' ' || pattern === '.') {
-    return pattern === str;
-  }
-
-  var isMatch = utils.memoize('isMatch', pattern, options, extglob.matcher);
-  return isMatch(str);
-};
-
-/**
- * Returns true if the given `string` contains the given pattern. Similar to `.isMatch` but
- * the pattern can match any part of the string.
- *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob.contains('aa/bb/cc', '*b'));
- * //=> true
- * console.log(extglob.contains('aa/bb/cc', '*d'));
- * //=> false
- * ```
- * @param {String} `str` The string to match.
- * @param {String} `pattern` Glob pattern to use for matching.
- * @param {Object} `options`
- * @return {Boolean} Returns true if the patter matches any part of `str`.
- * @api public
- */
-
-extglob.contains = function(str, pattern, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  if (pattern === '' || pattern === ' ' || pattern === '.') {
-    return pattern === str;
-  }
-
-  var opts = extend({}, options, {contains: true});
-  opts.strictClose = false;
-  opts.strictOpen = false;
-  return extglob.isMatch(str, pattern, opts);
-};
-
-/**
- * Takes an extglob pattern and returns a matcher function. The returned
- * function takes the string to match as its only argument.
- *
- * ```js
- * var extglob = require('extglob');
- * var isMatch = extglob.matcher('*.!(*a)');
- *
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.b'));
- * //=> true
- * ```
- * @param {String} `pattern` Extglob pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
-
-extglob.matcher = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  function matcher() {
-    var re = extglob.makeRe(pattern, options);
-    return function(str) {
-      return re.test(str);
-    };
-  }
-
-  return utils.memoize('matcher', pattern, options, matcher);
-};
-
-/**
- * Convert the given `extglob` pattern into a regex-compatible string. Returns
- * an object with the compiled result and the parsed AST.
- *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob.create('*.!(*a)').output);
- * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-extglob.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  function create() {
-    var ext = new Extglob(options);
-    var ast = ext.parse(pattern, options);
-    return ext.compile(ast, options);
-  }
-
-  return utils.memoize('create', pattern, options, create);
-};
-
-/**
- * Returns an array of matches captured by `pattern` in `string`, or `null`
- * if the pattern did not match.
- *
- * ```js
- * var extglob = require('extglob');
- * extglob.capture(pattern, string[, options]);
- *
- * console.log(extglob.capture('test/*.js', 'test/foo.js'));
- * //=> ['foo']
- * console.log(extglob.capture('test/*.js', 'foo/bar.css'));
- * //=> null
- * ```
- * @param {String} `pattern` Glob pattern to use for matching.
- * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
- * @api public
- */
-
-extglob.capture = function(pattern, str, options) {
-  var re = extglob.makeRe(pattern, extend({capture: true}, options));
-
-  function match() {
-    return function(string) {
-      var match = re.exec(string);
-      if (!match) {
-        return null;
-      }
-
-      return match.slice(1);
-    };
-  }
-
-  var capture = utils.memoize('capture', pattern, options, match);
-  return capture(str);
-};
-
-/**
- * Create a regular expression from the given `pattern` and `options`.
- *
- * ```js
- * var extglob = require('extglob');
- * var re = extglob.makeRe('*.!(*a)');
- * console.log(re);
- * //=> /^[^\/]*?\.(?![^\/]*?a)[^\/]*?$/
- * ```
- * @param {String} `pattern` The pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
-
-extglob.makeRe = function(pattern, options) {
-  if (pattern instanceof RegExp) {
-    return pattern;
-  }
-
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
-  }
-
-  function makeRe() {
-    var opts = extend({strictErrors: false}, options);
-    if (opts.strictErrors === true) opts.strict = true;
-    var res = extglob.create(pattern, opts);
-    return toRegex(res.output, opts);
-  }
-
-  var regex = utils.memoize('makeRe', pattern, options, makeRe);
-  if (regex.source.length > MAX_LENGTH) {
-    throw new SyntaxError('potentially malicious regex detected');
-  }
-
-  return regex;
-};
-
-/**
- * Cache
- */
-
-extglob.cache = utils.cache;
-extglob.clearCache = function() {
-  extglob.cache.__data__ = {};
-};
-
-/**
- * Expose `Extglob` constructor, parsers and compilers
- */
-
-extglob.Extglob = Extglob;
-extglob.compilers = compilers;
-extglob.parsers = parsers;
-
-/**
- * Expose `extglob`
- * @type {Function}
- */
-
-module.exports = extglob;
-
-
-/***/ }),
-/* 740 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var brackets = __webpack_require__(741);
-
-/**
- * Extglob compilers
- */
-
-module.exports = function(extglob) {
-  function star() {
-    if (typeof extglob.options.star === 'function') {
-      return extglob.options.star.apply(this, arguments);
-    }
-    if (typeof extglob.options.star === 'string') {
-      return extglob.options.star;
-    }
-    return '.*?';
-  }
-
-  /**
-   * Use `expand-brackets` compilers
-   */
-
-  extglob.use(brackets.compilers);
-  extglob.compiler
-
-    /**
-     * Escaped: "\\*"
-     */
-
-    .set('escape', function(node) {
-      return this.emit(node.val, node);
-    })
-
-    /**
-     * Dot: "."
-     */
-
-    .set('dot', function(node) {
-      return this.emit('\\' + node.val, node);
-    })
-
-    /**
-     * Question mark: "?"
-     */
-
-    .set('qmark', function(node) {
-      var val = '[^\\\\/.]';
-      var prev = this.prev();
-
-      if (node.parsed.slice(-1) === '(') {
-        var ch = node.rest.charAt(0);
-        if (ch !== '!' && ch !== '=' && ch !== ':') {
-          return this.emit(val, node);
-        }
-        return this.emit(node.val, node);
-      }
-
-      if (prev.type === 'text' && prev.val) {
-        return this.emit(val, node);
-      }
-
-      if (node.val.length > 1) {
-        val += '{' + node.val.length + '}';
-      }
-      return this.emit(val, node);
-    })
-
-    /**
-     * Plus: "+"
-     */
-
-    .set('plus', function(node) {
-      var prev = node.parsed.slice(-1);
-      if (prev === ']' || prev === ')') {
-        return this.emit(node.val, node);
-      }
-      var ch = this.output.slice(-1);
-      if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
-        return this.emit('\\+', node);
-      }
-      if (/\w/.test(ch) && !node.inside) {
-        return this.emit('+\\+?', node);
-      }
-      return this.emit('+', node);
-    })
-
-    /**
-     * Star: "*"
-     */
-
-    .set('star', function(node) {
-      var prev = this.prev();
-      var prefix = prev.type !== 'text' && prev.type !== 'escape'
-        ? '(?!\\.)'
-        : '';
-
-      return this.emit(prefix + star.call(this, node), node);
-    })
-
-    /**
-     * Parens
-     */
-
-    .set('paren', function(node) {
-      return this.mapVisit(node.nodes);
-    })
-    .set('paren.open', function(node) {
-      var capture = this.options.capture ? '(' : '';
-
-      switch (node.parent.prefix) {
-        case '!':
-        case '^':
-          return this.emit(capture + '(?:(?!(?:', node);
-        case '*':
-        case '+':
-        case '?':
-        case '@':
-          return this.emit(capture + '(?:', node);
-        default: {
-          var val = node.val;
-          if (this.options.bash === true) {
-            val = '\\' + val;
-          } else if (!this.options.capture && val === '(' && node.parent.rest[0] !== '?') {
-            val += '?:';
-          }
-
-          return this.emit(val, node);
-        }
-      }
-    })
-    .set('paren.close', function(node) {
-      var capture = this.options.capture ? ')' : '';
-
-      switch (node.prefix) {
-        case '!':
-        case '^':
-          var prefix = /^(\)|$)/.test(node.rest) ? '$' : '';
-          var str = star.call(this, node);
-
-          // if the extglob has a slash explicitly defined, we know the user wants
-          // to match slashes, so we need to ensure the "star" regex allows for it
-          if (node.parent.hasSlash && !this.options.star && this.options.slash !== false) {
-            str = '.*?';
-          }
-
-          return this.emit(prefix + ('))' + str + ')') + capture, node);
-        case '*':
-        case '+':
-        case '?':
-          return this.emit(')' + node.prefix + capture, node);
-        case '@':
-          return this.emit(')' + capture, node);
-        default: {
-          var val = (this.options.bash === true ? '\\' : '') + ')';
-          return this.emit(val, node);
-        }
-      }
-    })
-
-    /**
-     * Text
-     */
-
-    .set('text', function(node) {
-      var val = node.val.replace(/[\[\]]/g, '\\$&');
-      return this.emit(val, node);
-    });
-};
-
-
-/***/ }),
-/* 741 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Local dependencies
- */
-
-var compilers = __webpack_require__(742);
-var parsers = __webpack_require__(744);
-
-/**
- * Module dependencies
- */
-
-var debug = __webpack_require__(326)('expand-brackets');
-var extend = __webpack_require__(669);
-var Snapdragon = __webpack_require__(654);
-var toRegex = __webpack_require__(610);
-
-/**
- * Parses the given POSIX character class `pattern` and returns a
- * string that can be used for creating regular expressions for matching.
- *
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object}
- * @api public
- */
-
-function brackets(pattern, options) {
-  debug('initializing from <%s>', __filename);
-  var res = brackets.create(pattern, options);
-  return res.output;
+// 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;
 }
-
-/**
- * Takes an array of strings and a POSIX character class pattern, and returns a new
- * array with only the strings that matched the pattern.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * console.log(brackets.match(['1', 'a', 'ab'], '[[:alpha:]]'));
- * //=> ['a']
- *
- * console.log(brackets.match(['1', 'a', 'ab'], '[[:alpha:]]+'));
- * //=> ['a', 'ab']
- * ```
- * @param {Array} `arr` Array of strings to match
- * @param {String} `pattern` POSIX character class pattern(s)
- * @param {Object} `options`
- * @return {Array}
- * @api public
- */
-
-brackets.match = function(arr, pattern, options) {
-  arr = [].concat(arr);
-  var opts = extend({}, options);
-  var isMatch = brackets.matcher(pattern, opts);
-  var len = arr.length;
-  var idx = -1;
-  var res = [];
-
-  while (++idx < len) {
-    var ele = arr[idx];
-    if (isMatch(ele)) {
-      res.push(ele);
-    }
-  }
-
-  if (res.length === 0) {
-    if (opts.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
-
-    if (opts.nonull === true || opts.nullglob === true) {
-      return [pattern.split('\\').join('')];
-    }
-  }
-  return res;
-};
-
-/**
- * Returns true if the specified `string` matches the given
- * brackets `pattern`.
- *
- * ```js
- * var brackets = require('expand-brackets');
- *
- * console.log(brackets.isMatch('a.a', '[[:alpha:]].[[:alpha:]]'));
- * //=> true
- * console.log(brackets.isMatch('1.2', '[[:alpha:]].[[:alpha:]]'));
- * //=> false
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` Poxis pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
-
-brackets.isMatch = function(str, pattern, options) {
-  return brackets.matcher(pattern, options)(str);
-};
-
-/**
- * Takes a POSIX character class pattern and returns a matcher function. The returned
- * function takes the string to match as its only argument.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * var isMatch = brackets.matcher('[[:lower:]].[[:upper:]]');
- *
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.A'));
- * //=> true
- * ```
- * @param {String} `pattern` Poxis pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
-
-brackets.matcher = function(pattern, options) {
-  var re = brackets.makeRe(pattern, options);
-  return function(str) {
-    return re.test(str);
-  };
-};
-
-/**
- * Create a regular expression from the given `pattern`.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * var re = brackets.makeRe('[[:alpha:]]');
- * console.log(re);
- * //=> /^(?:[a-zA-Z])$/
- * ```
- * @param {String} `pattern` The pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
-
-brackets.makeRe = function(pattern, options) {
-  var res = brackets.create(pattern, options);
-  var opts = extend({strictErrors: false}, options);
-  return toRegex(res.output, opts);
-};
-
-/**
- * Parses the given POSIX character class `pattern` and returns an object
- * with the compiled `output` and optional source `map`.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * console.log(brackets('[[:alpha:]]'));
- * // { options: { source: 'string' },
- * //   input: '[[:alpha:]]',
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      not: [Function],
- * //      escape: [Function],
- * //      text: [Function],
- * //      posix: [Function],
- * //      bracket: [Function],
- * //      'bracket.open': [Function],
- * //      'bracket.inner': [Function],
- * //      'bracket.literal': [Function],
- * //      'bracket.close': [Function] },
- * //   output: '[a-zA-Z]',
- * //   ast:
- * //    { type: 'root',
- * //      errors: [],
- * //      nodes: [ [Object], [Object], [Object] ] },
- * //   parsingErrors: [] }
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object}
- * @api public
- */
-
-brackets.create = function(pattern, options) {
-  var snapdragon = (options && options.snapdragon) || new Snapdragon(options);
-  compilers(snapdragon);
-  parsers(snapdragon);
-
-  var ast = snapdragon.parse(pattern, options);
-  ast.input = pattern;
-  var res = snapdragon.compile(ast, options);
-  res.input = pattern;
-  return res;
-};
-
-/**
- * Expose `brackets` constructor, parsers and compilers
- */
-
-brackets.compilers = compilers;
-brackets.parsers = parsers;
-
-/**
- * Expose `brackets`
- * @type {Function}
- */
-
-module.exports = brackets;
-
-
-/***/ }),
-/* 742 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var posix = __webpack_require__(743);
-
-module.exports = function(brackets) {
-  brackets.compiler
-
-    /**
-     * Escaped characters
-     */
-
-    .set('escape', function(node) {
-      return this.emit('\\' + node.val.replace(/^\\/, ''), node);
-    })
-
-    /**
-     * Text
-     */
-
-    .set('text', function(node) {
-      return this.emit(node.val.replace(/([{}])/g, '\\$1'), node);
-    })
-
-    /**
-     * POSIX character classes
-     */
-
-    .set('posix', function(node) {
-      if (node.val === '[::]') {
-        return this.emit('\\[::\\]', node);
-      }
-
-      var val = posix[node.inner];
-      if (typeof val === 'undefined') {
-        val = '[' + node.inner + ']';
-      }
-      return this.emit(val, node);
-    })
-
-    /**
-     * Non-posix brackets
-     */
-
-    .set('bracket', function(node) {
-      return this.mapVisit(node.nodes);
-    })
-    .set('bracket.open', function(node) {
-      return this.emit(node.val, node);
-    })
-    .set('bracket.inner', function(node) {
-      var inner = node.val;
-
-      if (inner === '[' || inner === ']') {
-        return this.emit('\\' + node.val, node);
-      }
-      if (inner === '^]') {
-        return this.emit('^\\]', node);
-      }
-      if (inner === '^') {
-        return this.emit('^', node);
-      }
-
-      if (/-/.test(inner) && !/(\d-\d|\w-\w)/.test(inner)) {
-        inner = inner.split('-').join('\\-');
-      }
-
-      var isNegated = inner.charAt(0) === '^';
-      // add slashes to negated brackets, per spec
-      if (isNegated && inner.indexOf('/') === -1) {
-        inner += '/';
-      }
-      if (isNegated && inner.indexOf('.') === -1) {
-        inner += '.';
-      }
-
-      // don't unescape `0` (octal literal)
-      inner = inner.replace(/\\([1-9])/g, '$1');
-      return this.emit(inner, node);
-    })
-    .set('bracket.close', function(node) {
-      var val = node.val.replace(/^\\/, '');
-      if (node.parent.escaped === true) {
-        return this.emit('\\' + val, node);
-      }
-      return this.emit(val, node);
-    });
-};
-
-
-/***/ }),
-/* 743 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * POSIX character classes
- */
-
-module.exports = {
-  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'
-};
-
-
-/***/ }),
-/* 744 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(745);
-var define = __webpack_require__(685);
-
-/**
- * Text regex
- */
-
-var TEXT_REGEX = '(\\[(?=.*\\])|\\])+';
-var not = utils.createRegex(TEXT_REGEX);
-
-/**
- * Brackets parsers
- */
-
-function parsers(brackets) {
-  brackets.state = brackets.state || {};
-  brackets.parser.sets.bracket = brackets.parser.sets.bracket || [];
-  brackets.parser
-
-    .capture('escape', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(/^\\(.)/);
-      if (!m) return;
-
-      return pos({
-        type: 'escape',
-        val: m[0]
-      });
-    })
-
-    /**
-     * Text parser
-     */
-
-    .capture('text', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(not);
-      if (!m || !m[0]) return;
-
-      return pos({
-        type: 'text',
-        val: m[0]
-      });
-    })
-
-    /**
-     * POSIX character classes: "[[:alpha:][:digits:]]"
-     */
-
-    .capture('posix', function() {
-      var pos = this.position();
-      var m = this.match(/^\[:(.*?):\](?=.*\])/);
-      if (!m) return;
-
-      var inside = this.isInside('bracket');
-      if (inside) {
-        brackets.posix++;
-      }
-
-      return pos({
-        type: 'posix',
-        insideBracket: inside,
-        inner: m[1],
-        val: m[0]
-      });
-    })
-
-    /**
-     * Bracket (noop)
-     */
-
-    .capture('bracket', function() {})
-
-    /**
-     * Open: '['
-     */
-
-    .capture('bracket.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\[(?=.*\])/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
-
-      if (parsed.slice(-1) === '\\' && !this.isInside('bracket')) {
-        last.val = last.val.slice(0, last.val.length - 1);
-        return pos({
-          type: 'escape',
-          val: m[0]
-        });
-      }
-
-      var open = pos({
-        type: 'bracket.open',
-        val: m[0]
-      });
-
-      if (last.type === 'bracket.open' || this.isInside('bracket')) {
-        open.val = '\\' + open.val;
-        open.type = 'bracket.inner';
-        open.escaped = true;
-        return open;
-      }
-
-      var node = pos({
-        type: 'bracket',
-        nodes: [open]
-      });
-
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
-      this.push('bracket', node);
-      prev.nodes.push(node);
-    })
-
-    /**
-     * Bracket text
-     */
-
-    .capture('bracket.inner', function() {
-      if (!this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(not);
-      if (!m || !m[0]) return;
-
-      var next = this.input.charAt(0);
-      var val = m[0];
-
-      var node = pos({
-        type: 'bracket.inner',
-        val: val
-      });
-
-      if (val === '\\\\') {
-        return node;
-      }
-
-      var first = val.charAt(0);
-      var last = val.slice(-1);
-
-      if (first === '!') {
-        val = '^' + val.slice(1);
-      }
-
-      if (last === '\\' || (val === '^' && next === ']')) {
-        val += this.input[0];
-        this.consume(1);
-      }
-
-      node.val = val;
-      return node;
-    })
-
-    /**
-     * Close: ']'
-     */
-
-    .capture('bracket.close', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\]/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
-
-      if (parsed.slice(-1) === '\\' && !this.isInside('bracket')) {
-        last.val = last.val.slice(0, last.val.length - 1);
-
-        return pos({
-          type: 'escape',
-          val: m[0]
-        });
-      }
-
-      var node = pos({
-        type: 'bracket.close',
-        rest: this.input,
-        val: m[0]
-      });
-
-      if (last.type === 'bracket.open') {
-        node.type = 'bracket.inner';
-        node.escaped = true;
-        return node;
-      }
-
-      var bracket = this.pop('bracket');
-      if (!this.isType(bracket, 'bracket')) {
-        if (this.options.strict) {
-          throw new Error('missing opening "["');
-        }
-        node.type = 'bracket.inner';
-        node.escaped = true;
-        return node;
-      }
-
-      bracket.nodes.push(node);
-      define(node, 'parent', bracket);
-    });
+},
+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;
+})();
 
-/**
- * Brackets parsers
- */
-
-module.exports = parsers;
-
-/**
- * Expose text regex
- */
-
-module.exports.TEXT_REGEX = TEXT_REGEX;
-
-
-/***/ }),
-/* 745 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var toRegex = __webpack_require__(610);
-var regexNot = __webpack_require__(627);
-var cached;
-
-/**
- * Get the last element from `array`
- * @param {Array} `array`
- * @return {*}
- */
-
-exports.last = function(arr) {
-  return arr[arr.length - 1];
-};
-
-/**
- * Create and cache regex to use for text nodes
- */
-
-exports.createRegex = function(pattern, include) {
-  if (cached) return cached;
-  var opts = {contains: true, strictClose: false};
-  var not = regexNot.create(pattern, opts);
-  var re;
-
-  if (typeof include === 'string') {
-    re = toRegex('^(?:' + include + '|' + not + ')', opts);
-  } else {
-    re = toRegex(not, opts);
-  }
-
-  return (cached = re);
-};
-
-
-/***/ }),
-/* 746 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var brackets = __webpack_require__(741);
-var define = __webpack_require__(747);
-var utils = __webpack_require__(748);
-
-/**
- * Characters to use in text regex (we want to "not" match
- * characters that are matched by other parsers)
- */
-
-var TEXT_REGEX = '([!@*?+]?\\(|\\)|[*?.+\\\\]|\\[:?(?=.*\\])|:?\\])+';
-var not = utils.createRegex(TEXT_REGEX);
-
-/**
- * Extglob parsers
- */
-
-function parsers(extglob) {
-  extglob.state = extglob.state || {};
-
-  /**
-   * Use `expand-brackets` parsers
-   */
-
-  extglob.use(brackets.parsers);
-  extglob.parser.sets.paren = extglob.parser.sets.paren || [];
-  extglob.parser
-
-    /**
-     * Extglob open: "*("
-     */
-
-    .capture('paren.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^([!@*?+])?\(/);
-      if (!m) return;
-
-      var prev = this.prev();
-      var prefix = m[1];
-      var val = m[0];
-
-      var open = pos({
-        type: 'paren.open',
-        parsed: parsed,
-        val: val
-      });
-
-      var node = pos({
-        type: 'paren',
-        prefix: prefix,
-        nodes: [open]
-      });
-
-      // if nested negation extglobs, just cancel them out to simplify
-      if (prefix === '!' && prev.type === 'paren' && prev.prefix === '!') {
-        prev.prefix = '@';
-        node.prefix = '@';
-      }
-
-      define(node, 'rest', this.input);
-      define(node, 'parsed', parsed);
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
-
-      this.push('paren', node);
-      prev.nodes.push(node);
-    })
-
-    /**
-     * Extglob close: ")"
-     */
-
-    .capture('paren.close', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\)/);
-      if (!m) return;
-
-      var parent = this.pop('paren');
-      var node = pos({
-        type: 'paren.close',
-        rest: this.input,
-        parsed: parsed,
-        val: m[0]
-      });
-
-      if (!this.isType(parent, 'paren')) {
-        if (this.options.strict) {
-          throw new Error('missing opening paren: "("');
-        }
-        node.escaped = true;
-        return node;
-      }
-
-      node.prefix = parent.prefix;
-      parent.nodes.push(node);
-      define(node, 'parent', parent);
-    })
-
-    /**
-     * Escape: "\\."
-     */
-
-    .capture('escape', function() {
-      var pos = this.position();
-      var m = this.match(/^\\(.)/);
-      if (!m) return;
-
-      return pos({
-        type: 'escape',
-        val: m[0],
-        ch: m[1]
-      });
-    })
-
-    /**
-     * Question marks: "?"
-     */
-
-    .capture('qmark', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\?+(?!\()/);
-      if (!m) return;
-      extglob.state.metachar = true;
-      return pos({
-        type: 'qmark',
-        rest: this.input,
-        parsed: parsed,
-        val: m[0]
-      });
-    })
-
-    /**
-     * Character parsers
-     */
-
-    .capture('star', /^\*(?!\()/)
-    .capture('plus', /^\+(?!\()/)
-    .capture('dot', /^\./)
-    .capture('text', not);
-};
-
-/**
- * Expose text regex string
- */
-
-module.exports.TEXT_REGEX = TEXT_REGEX;
-
-/**
- * Extglob parsers
- */
-
-module.exports = parsers;
-
-
-/***/ }),
-/* 747 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isDescriptor = __webpack_require__(619);
-
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
-
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
-
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
-
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
-
-
-/***/ }),
-/* 748 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var regex = __webpack_require__(627);
-var Cache = __webpack_require__(733);
-
-/**
- * Utils
- */
-
-var utils = module.exports;
-var cache = utils.cache = new Cache();
-
-/**
- * Cast `val` to an array
- * @return {Array}
- */
-
-utils.arrayify = function(val) {
-  if (!Array.isArray(val)) {
-    return [val];
-  }
-  return val;
-};
-
-/**
- * Memoize a generated regex or function
- */
-
-utils.memoize = function(type, pattern, options, fn) {
-  var key = utils.createKey(type + pattern, options);
-
-  if (cache.has(type, key)) {
-    return cache.get(type, key);
-  }
-
-  var val = fn(pattern, options);
-  if (options && options.cache === false) {
-    return val;
-  }
-
-  cache.set(type, key, val);
-  return val;
-};
-
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
-
-utils.createKey = function(pattern, options) {
-  var key = pattern;
-  if (typeof options === 'undefined') {
-    return key;
-  }
-  for (var prop in options) {
-    key += ';' + prop + '=' + String(options[prop]);
-  }
-  return key;
-};
-
-/**
- * Create the regex to use for matching text
- */
 
-utils.createRegex = function(str) {
-  var opts = {contains: true, strictClose: false};
-  return regex(str, opts);
+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__("fs").readFileSync(__webpack_require__("path").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__("../../node_modules/webpack/buildin/module.js")(module)))
 
-/***/ }),
-/* 749 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Module dependencies
- */
-
-var Snapdragon = __webpack_require__(654);
-var define = __webpack_require__(747);
-var extend = __webpack_require__(669);
-
-/**
- * Local dependencies
- */
-
-var compilers = __webpack_require__(740);
-var parsers = __webpack_require__(746);
-
-/**
- * Customize Snapdragon parser and renderer
- */
-
-function Extglob(options) {
-  this.options = extend({source: 'extglob'}, options);
-  this.snapdragon = this.options.snapdragon || new Snapdragon(this.options);
-  this.snapdragon.patterns = this.snapdragon.patterns || {};
-  this.compiler = this.snapdragon.compiler;
-  this.parser = this.snapdragon.parser;
-
-  compilers(this.snapdragon);
-  parsers(this.snapdragon);
-
-  /**
-   * Override Snapdragon `.parse` method
-   */
-
-  define(this.snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
-    parsed.input = str;
-
-    // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
-    if (last && this.options.strict !== true) {
-      var node = last.nodes[0];
-      node.val = '\\' + node.val;
-      var sibling = node.parent.nodes[1];
-      if (sibling.type === 'star') {
-        sibling.loose = true;
-      }
-    }
-
-    // add non-enumerable parser reference
-    define(parsed, 'parser', this.parser);
-    return parsed;
-  });
+/***/ }),
 
-  /**
-   * Decorate `.parse` method
-   */
+/***/ "../../node_modules/spdx-license-ids/spdx-license-ids.json":
+/***/ (function(module) {
 
-  define(this, 'parse', function(ast, options) {
-    return this.snapdragon.parse.apply(this.snapdragon, arguments);
-  });
+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\"]");
 
-  /**
-   * Decorate `.compile` method
-   */
+/***/ }),
 
-  define(this, 'compile', function(ast, options) {
-    return this.snapdragon.compile.apply(this.snapdragon, arguments);
-  });
+/***/ "../../node_modules/strip-ansi/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-}
+"use strict";
 
-/**
- * Expose `Extglob`
- */
+const ansiRegex = __webpack_require__("../../node_modules/ansi-regex/index.js");
 
-module.exports = Extglob;
+module.exports = string => typeof string === 'string' ? string.replace(ansiRegex(), '') : string;
 
 
 /***/ }),
-/* 750 */
+
+/***/ "../../node_modules/strip-bom/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(739);
-var nanomatch = __webpack_require__(725);
-var regexNot = __webpack_require__(627);
-var toRegex = __webpack_require__(610);
-var not;
+module.exports = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof string}`);
+	}
 
-/**
- * Characters to use in negation regex (we want to "not" match
- * characters that are matched by other parsers)
- */
+	// 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);
+	}
 
-var TEXT = '([!@*?+]?\\(|\\)|\\[:?(?=.*?:?\\])|:?\\]|[*+?!^$.\\\\/])+';
-var createNotRegex = function(opts) {
-  return not || (not = textRegex(TEXT));
+	return string;
 };
 
-/**
- * Parsers
- */
 
-module.exports = function(snapdragon) {
-  var parsers = snapdragon.parser.parsers;
-
-  // register nanomatch parsers
-  snapdragon.use(nanomatch.parsers);
-
-  // get references to some specific nanomatch parsers before they
-  // are overridden by the extglob and/or parsers
-  var escape = parsers.escape;
-  var slash = parsers.slash;
-  var qmark = parsers.qmark;
-  var plus = parsers.plus;
-  var star = parsers.star;
-  var dot = parsers.dot;
-
-  // register extglob parsers
-  snapdragon.use(extglob.parsers);
-
-  // custom micromatch parsers
-  snapdragon.parser
-    .use(function() {
-      // override "notRegex" created in nanomatch parser
-      this.notRegex = /^\!+(?!\()/;
-    })
-    // reset the referenced parsers
-    .capture('escape', escape)
-    .capture('slash', slash)
-    .capture('qmark', qmark)
-    .capture('star', star)
-    .capture('plus', plus)
-    .capture('dot', dot)
+/***/ }),
 
-    /**
-     * Override `text` parser
-     */
+/***/ "../../node_modules/strip-final-newline/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    .capture('text', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(createNotRegex(this.options));
-      if (!m || !m[0]) return;
+"use strict";
 
-      // escape regex boundary characters and simple brackets
-      var val = m[0].replace(/([[\]^$])/g, '\\$1');
 
-      return pos({
-        type: 'text',
-        val: val
-      });
-    });
-};
+module.exports = input => {
+	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
+	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
 
-/**
- * Create text regex
- */
+	if (input[input.length - 1] === LF) {
+		input = input.slice(0, input.length - 1);
+	}
 
-function textRegex(pattern) {
-  var notStr = regexNot.create(pattern, {contains: true, strictClose: false});
-  var prefix = '(?:[\\^]|\\\\|';
-  return toRegex(prefix + notStr + ')', {strictClose: false});
-}
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, input.length - 1);
+	}
+
+	return input;
+};
 
 
 /***/ }),
-/* 751 */
+
+/***/ "../../node_modules/strong-log-transformer/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(733))();
+// Copyright IBM Corp. 2014,2018. All Rights Reserved.
+// Node module: strong-log-transformer
+// 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__("../../node_modules/strong-log-transformer/lib/logger.js");
+module.exports.cli = __webpack_require__("../../node_modules/strong-log-transformer/lib/cli.js");
 
 
 /***/ }),
-/* 752 */
+
+/***/ "../../node_modules/strong-log-transformer/lib/cli.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+// Copyright IBM Corp. 2014,2018. All Rights Reserved.
+// Node module: strong-log-transformer
+// This file is licensed under the Apache License 2.0.
+// License text available at https://opensource.org/licenses/Apache-2.0
 
 
-var utils = module.exports;
-var path = __webpack_require__(4);
-
-/**
- * Module dependencies
- */
-
-var Snapdragon = __webpack_require__(654);
-utils.define = __webpack_require__(753);
-utils.diff = __webpack_require__(737);
-utils.extend = __webpack_require__(722);
-utils.pick = __webpack_require__(738);
-utils.typeOf = __webpack_require__(620);
-utils.unique = __webpack_require__(630);
 
-/**
- * Returns true if the platform is windows, or `path.sep` is `\\`.
- * This is defined as a function to allow `path.sep` to be set in unit tests,
- * or by the user, if there is a reason to do so.
- * @return {Boolean}
- */
+var minimist = __webpack_require__("../../node_modules/minimist/index.js");
+var path = __webpack_require__("path");
 
-utils.isWindows = function() {
-  return path.sep === '\\' || process.platform === 'win32';
-};
+var Logger = __webpack_require__("../../node_modules/strong-log-transformer/lib/logger.js");
+var pkg = __webpack_require__("../../node_modules/strong-log-transformer/package.json");
 
-/**
- * Get the `Snapdragon` instance to use
- */
+module.exports = cli;
 
-utils.instantiate = function(ast, options) {
-  var snapdragon;
-  // if an instance was created by `.parse`, use that instance
-  if (utils.typeOf(ast) === 'object' && ast.snapdragon) {
-    snapdragon = ast.snapdragon;
-  // if the user supplies an instance on options, use that instance
-  } else if (utils.typeOf(options) === 'object' && options.snapdragon) {
-    snapdragon = options.snapdragon;
-  // create a new instance
+function cli(args) {
+  var opts = minimist(args.slice(2));
+  var $0 = path.basename(args[1]);
+  var p = console.log.bind(console);
+  if (opts.v || opts.version) {
+    version($0, p);
+  } else if (opts.h || opts.help) {
+    usage($0, p);
+  } else if (args.length < 3) {
+    process.stdin.pipe(Logger()).pipe(process.stdout);
   } else {
-    snapdragon = new Snapdragon(options);
+    process.stdin.pipe(Logger(opts)).pipe(process.stdout);
   }
+}
 
-  utils.define(snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
-    parsed.input = str;
-
-    // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
-    if (last && this.options.strictErrors !== true) {
-      var open = last.nodes[0];
-      var inner = last.nodes[1];
-      if (last.type === 'bracket') {
-        if (inner.val.charAt(0) === '[') {
-          inner.val = '\\' + inner.val;
-        }
+function version($0, p) {
+  p('%s v%s', pkg.name, pkg.version);
+}
 
-      } else {
-        open.val = '\\' + open.val;
-        var sibling = open.parent.nodes[1];
-        if (sibling.type === 'star') {
-          sibling.loose = true;
-        }
-      }
-    }
+function usage($0, p) {
+  var PADDING = '               ';
+  var opt, def;
+  p('Usage: %s [options]', $0);
+  p('');
+  p('%s', pkg.description);
+  p('');
+  p('OPTIONS:');
+  for (opt in Logger.DEFAULTS) {
+    def = Logger.DEFAULTS[opt];
+    if (typeof def === 'boolean')
+      boolOpt(opt, Logger.DEFAULTS[opt]);
+    else
+      stdOpt(opt, Logger.DEFAULTS[opt]);
+  }
+  p('');
 
-    // add non-enumerable parser reference
-    utils.define(parsed, 'parser', this.parser);
-    return parsed;
-  });
+  function boolOpt(name, def) {
+    name = name + PADDING.slice(0, 20-name.length);
+    p('   --%s default: %s', name, def);
+  }
 
-  return snapdragon;
-};
+  function stdOpt(name, def) {
+    var value = name.toUpperCase() +
+                PADDING.slice(0, 19 - name.length*2);
+    p('   --%s %s default: %j', name, value, def);
+  }
+}
 
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
 
-utils.createKey = function(pattern, options) {
-  if (utils.typeOf(options) !== 'object') {
-    return pattern;
-  }
-  var val = pattern;
-  var keys = Object.keys(options);
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    val += ';' + key + '=' + String(options[key]);
-  }
-  return val;
-};
+/***/ }),
 
-/**
- * Cast `val` to an array
- * @return {Array}
- */
+/***/ "../../node_modules/strong-log-transformer/lib/logger.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-utils.arrayify = function(val) {
-  if (typeof val === 'string') return [val];
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
+"use strict";
+// Copyright IBM Corp. 2014,2018. All Rights Reserved.
+// Node module: strong-log-transformer
+// This file is licensed under the Apache License 2.0.
+// License text available at https://opensource.org/licenses/Apache-2.0
 
-/**
- * Return true if `val` is a non-empty string
- */
 
-utils.isString = function(val) {
-  return typeof val === 'string';
-};
 
-/**
- * Return true if `val` is a non-empty string
- */
+var stream = __webpack_require__("stream");
+var util = __webpack_require__("util");
+var fs = __webpack_require__("fs");
 
-utils.isObject = function(val) {
-  return utils.typeOf(val) === 'object';
-};
+var through = __webpack_require__("../../node_modules/through/index.js");
+var duplexer = __webpack_require__("../../node_modules/duplexer/index.js");
+var StringDecoder = __webpack_require__("string_decoder").StringDecoder;
 
-/**
- * Returns true if the given `str` has special characters
- */
+module.exports = Logger;
 
-utils.hasSpecialChars = function(str) {
-  return /(?:(?:(^|\/)[!.])|[*?+()|\[\]{}]|[+@]\()/.test(str);
+Logger.DEFAULTS = {
+  format: 'text',
+  tag: '',
+  mergeMultiline: false,
+  timeStamp: false,
 };
 
-/**
- * Escape regex characters in the given string
- */
+var formatters = {
+  text: textFormatter,
+  json: jsonFormatter,
+}
 
-utils.escapeRegex = function(str) {
-  return str.replace(/[-[\]{}()^$|*+?.\\\/\s]/g, '\\$&');
-};
+function Logger(options) {
+  var defaults = JSON.parse(JSON.stringify(Logger.DEFAULTS));
+  options = util._extend(defaults, options || {});
+  var catcher = deLiner();
+  var emitter = catcher;
+  var transforms = [
+    objectifier(),
+  ];
 
-/**
- * Normalize slashes in the given filepath.
- *
- * @param {String} `filepath`
- * @return {String}
- */
+  if (options.tag) {
+    transforms.push(staticTagger(options.tag));
+  }
 
-utils.toPosixPath = function(str) {
-  return str.replace(/\\+/g, '/');
-};
+  if (options.mergeMultiline) {
+    transforms.push(lineMerger());
+  }
 
-/**
- * Strip backslashes before special characters in a string.
- *
- * @param {String} `str`
- * @return {String}
- */
+  // TODO
+  // if (options.pidStamp) {
+  //   transforms.push(pidStamper(options.pid));
+  // }
 
-utils.unescape = function(str) {
-  return utils.toPosixPath(str.replace(/\\(?=[*+?!.])/g, ''));
-};
+  // TODO
+  // if (options.workerStamp) {
+  //   transforms.push(workerStamper(options.worker));
+  // }
 
-/**
- * Strip the prefix from a filepath
- * @param {String} `fp`
- * @return {String}
- */
+  transforms.push(formatters[options.format](options));
 
-utils.stripPrefix = function(str) {
-  if (str.charAt(0) !== '.') {
-    return str;
-  }
-  var ch = str.charAt(1);
-  if (utils.isSlash(ch)) {
-    return str.slice(2);
+  // restore line endings that were removed by line splitting
+  transforms.push(reLiner());
+
+  for (var t in transforms) {
+    emitter = emitter.pipe(transforms[t]);
   }
-  return str;
-};
 
-/**
- * Returns true if the given str is an escaped or
- * unescaped path character
- */
+  return duplexer(catcher, emitter);
+}
 
-utils.isSlash = function(str) {
-  return str === '/' || str === '\\/' || str === '\\' || str === '\\\\';
-};
+function deLiner() {
+  var decoder = new StringDecoder('utf8');
+  var last = '';
 
-/**
- * Returns a function that returns true if the given
- * pattern matches or contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
+  return new stream.Transform({
+    transform(chunk, _enc, callback) {
+      last += decoder.write(chunk);
+      var list = last.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
+      last = list.pop();
+      for (var i = 0; i < list.length; i++) {
+        // swallow empty lines
+        if (list[i]) {
+          this.push(list[i]);
+        }
+      }
+      callback();
+    },
+    flush(callback) {
+      // incomplete UTF8 sequences become UTF8 replacement characters
+      last += decoder.end();
+      if (last) {
+        this.push(last);
+      }
+      callback();
+    },
+  });
+}
 
-utils.matchPath = function(pattern, options) {
-  return (options && options.contains)
-    ? utils.containsPattern(pattern, options)
-    : utils.equalsPattern(pattern, options);
-};
+function reLiner() {
+  return through(appendNewline);
 
-/**
- * Returns true if the given (original) filepath or unixified path are equal
- * to the given pattern.
- */
+  function appendNewline(line) {
+    this.emit('data', line + '\n');
+  }
+}
 
-utils._equals = function(filepath, unixPath, pattern) {
-  return pattern === filepath || pattern === unixPath;
-};
+function objectifier() {
+  return through(objectify, null, {autoDestroy: false});
 
-/**
- * Returns true if the given (original) filepath or unixified path contain
- * the given pattern.
- */
+  function objectify(line) {
+    this.emit('data', {
+      msg: line,
+      time: Date.now(),
+    });
+  }
+}
 
-utils._contains = function(filepath, unixPath, pattern) {
-  return filepath.indexOf(pattern) !== -1 || unixPath.indexOf(pattern) !== -1;
-};
+function staticTagger(tag) {
+  return through(tagger);
 
-/**
- * Returns a function that returns true if the given
- * pattern is the same as a given `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
+  function tagger(logEvent) {
+    logEvent.tag = tag;
+    this.emit('data', logEvent);
+  }
+}
 
-utils.equalsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
+function textFormatter(options) {
+  return through(textify);
 
-  return function fn(filepath) {
-    var equal = utils._equals(filepath, unixify(filepath), pattern);
-    if (equal === true || options.nocase !== true) {
-      return equal;
+  function textify(logEvent) {
+    var line = util.format('%s%s', textifyTags(logEvent.tag),
+                           logEvent.msg.toString());
+    if (options.timeStamp) {
+      line = util.format('%s %s', new Date(logEvent.time).toISOString(), line);
     }
-    var lower = filepath.toLowerCase();
-    return utils._equals(lower, unixify(lower), pattern);
-  };
-};
+    this.emit('data', line.replace(/\n/g, '\\n'));
+  }
 
-/**
- * Returns a function that returns true if the given
- * pattern contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
+  function textifyTags(tags) {
+    var str = '';
+    if (typeof tags === 'string') {
+      str = tags + ' ';
+    } else if (typeof tags === 'object') {
+      for (var t in tags) {
+        str += t + ':' + tags[t] + ' ';
+      }
+    }
+    return str;
+  }
+}
 
-utils.containsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
+function jsonFormatter(options) {
+  return through(jsonify);
 
-  return function(filepath) {
-    var contains = utils._contains(filepath, unixify(filepath), pattern);
-    if (contains === true || options.nocase !== true) {
-      return contains;
+  function jsonify(logEvent) {
+    if (options.timeStamp) {
+      logEvent.time = new Date(logEvent.time).toISOString();
+    } else {
+      delete logEvent.time;
     }
-    var lower = filepath.toLowerCase();
-    return utils._contains(lower, unixify(lower), pattern);
-  };
-};
+    logEvent.msg = logEvent.msg.toString();
+    this.emit('data', JSON.stringify(logEvent));
+  }
+}
 
-/**
- * Returns a function that returns true if the given
- * regex matches the `filename` of a file path.
- *
- * @param {RegExp} `re` Matching regex
- * @return {Function}
- */
+function lineMerger(host) {
+  var previousLine = null;
+  var flushTimer = null;
+  var stream = through(lineMergerWrite, lineMergerEnd);
+  var flush = _flush.bind(stream);
 
-utils.matchBasename = function(re) {
-  return function(filepath) {
-    return re.test(path.basename(filepath));
-  };
-};
+  return stream;
 
-/**
- * Determines the filepath to return based on the provided options.
- * @return {any}
- */
+  function lineMergerWrite(line) {
+    if (/^\s+/.test(line.msg)) {
+      if (previousLine) {
+        previousLine.msg += '\n' + line.msg;
+      } else {
+        previousLine = line;
+      }
+    } else {
+      flush();
+      previousLine = line;
+    }
+    // rolling timeout
+    clearTimeout(flushTimer);
+    flushTimer = setTimeout(flush.bind(this), 10);
+  }
 
-utils.value = function(str, unixify, options) {
-  if (options && options.unixify === false) {
-    return str;
+  function _flush() {
+    if (previousLine) {
+      this.emit('data', previousLine);
+      previousLine = null;
+    }
   }
-  return unixify(str);
-};
 
-/**
- * Returns a function that normalizes slashes in a string to forward
- * slashes, strips `./` from beginning of paths, and optionally unescapes
- * special characters.
- * @return {Function}
- */
+  function lineMergerEnd() {
+    flush.call(this);
+    this.emit('end');
+  }
+}
 
-utils.unixify = function(options) {
-  options = options || {};
-  return function(filepath) {
-    if (utils.isWindows() || options.unixify === true) {
-      filepath = utils.toPosixPath(filepath);
-    }
-    if (options.stripPrefix !== false) {
-      filepath = utils.stripPrefix(filepath);
-    }
-    if (options.unescape === true) {
-      filepath = utils.unescape(filepath);
-    }
-    return filepath;
-  };
-};
 
+/***/ }),
+
+/***/ "../../node_modules/strong-log-transformer/package.json":
+/***/ (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\"}}");
 
 /***/ }),
-/* 753 */
+
+/***/ "../../node_modules/supports-color/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
 
+const os = __webpack_require__("os");
+const tty = __webpack_require__("tty");
+const hasFlag = __webpack_require__("../../node_modules/has-flag/index.js");
 
+const {env} = process;
 
-var isobject = __webpack_require__(618);
-var isDescriptor = __webpack_require__(619);
-var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
-  ? Reflect.defineProperty
-  : Object.defineProperty;
+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;
+}
 
-module.exports = function defineProperty(obj, key, val) {
-  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
-    throw new TypeError('expected an object, function, or array');
-  }
+if ('FORCE_COLOR' in env) {
+	if (env.FORCE_COLOR === 'true') {
+		forceColor = 1;
+	} else if (env.FORCE_COLOR === 'false') {
+		forceColor = 0;
+	} else {
+		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+	}
+}
 
-  if (typeof key !== 'string') {
-    throw new TypeError('expected "key" to be a string');
-  }
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
-  if (isDescriptor(val)) {
-    define(obj, key, val);
-    return obj;
-  }
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
 
-  define(obj, key, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
+function supportsColor(haveStream, streamIsTTY) {
+	if (forceColor === 0) {
+		return 0;
+	}
 
-  return obj;
-};
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-/***/ }),
-/* 754 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (haveStream && !streamIsTTY && forceColor === undefined) {
+		return 0;
+	}
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    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);
-    };
-    return function (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 });
-var readdir = __webpack_require__(755);
-var reader_1 = __webpack_require__(768);
-var fs_stream_1 = __webpack_require__(772);
-var ReaderAsync = /** @class */ (function (_super) {
-    __extends(ReaderAsync, _super);
-    function ReaderAsync() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(ReaderAsync.prototype, "fsAdapter", {
-        /**
-         * Returns FileSystem adapter.
-         */
-        get: function () {
-            return new fs_stream_1.default(this.options);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * Use async API to read entries for Task.
-     */
-    ReaderAsync.prototype.read = function (task) {
-        var _this = this;
-        var root = this.getRootDirectory(task);
-        var options = this.getReaderOptions(task);
-        var entries = [];
-        return new Promise(function (resolve, reject) {
-            var stream = _this.api(root, task, options);
-            stream.on('error', function (err) {
-                _this.isEnoentCodeError(err) ? resolve([]) : reject(err);
-                stream.pause();
-            });
-            stream.on('data', function (entry) { return entries.push(_this.transform(entry)); });
-            stream.on('end', function () { return resolve(entries); });
-        });
-    };
-    /**
-     * Returns founded paths.
-     */
-    ReaderAsync.prototype.api = function (root, task, options) {
-        if (task.dynamic) {
-            return this.dynamicApi(root, options);
-        }
-        return this.staticApi(task, options);
-    };
-    /**
-     * Api for dynamic tasks.
-     */
-    ReaderAsync.prototype.dynamicApi = function (root, options) {
-        return readdir.readdirStreamStat(root, options);
-    };
-    /**
-     * Api for static tasks.
-     */
-    ReaderAsync.prototype.staticApi = function (task, options) {
-        return this.fsAdapter.read(task.patterns, options.filter);
-    };
-    return ReaderAsync;
-}(reader_1.default));
-exports.default = ReaderAsync;
+	const min = forceColor || 0;
+
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
+	if (process.platform === 'win32') {
+		// 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(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
 
-/***/ }),
-/* 755 */
-/***/ (function(module, exports, __webpack_require__) {
+		return 1;
+	}
 
-"use strict";
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
+		return min;
+	}
 
-const readdirSync = __webpack_require__(756);
-const readdirAsync = __webpack_require__(764);
-const readdirStream = __webpack_require__(767);
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-module.exports = exports = readdirAsyncPath;
-exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
-exports.readdirAsyncStat = exports.async.stat = readdirAsyncStat;
-exports.readdirStream = exports.stream = readdirStreamPath;
-exports.readdirStreamStat = exports.stream.stat = readdirStreamStat;
-exports.readdirSync = exports.sync = readdirSyncPath;
-exports.readdirSyncStat = exports.sync.stat = readdirSyncStat;
+	if ('GITHUB_ACTIONS' in env) {
+		return 1;
+	}
 
-/**
- * Synchronous readdir that returns an array of string paths.
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {string[]}
- */
-function readdirSyncPath (dir, options) {
-  return readdirSync(dir, options, {});
-}
+	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;
+	}
 
-/**
- * Synchronous readdir that returns results as an array of {@link fs.Stats} objects
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {fs.Stats[]}
- */
-function readdirSyncStat (dir, options) {
-  return readdirSync(dir, options, { stats: true });
-}
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
-/**
- * Aynchronous readdir (accepts an error-first callback or returns a {@link Promise}).
- * Results are an array of path strings.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {function} [callback]
- * @returns {Promise<string[]>}
- */
-function readdirAsyncPath (dir, options, callback) {
-  return readdirAsync(dir, options, callback, {});
-}
+	if ('COLORTERM' in env) {
+		return 1;
+	}
 
-/**
- * Aynchronous readdir (accepts an error-first callback or returns a {@link Promise}).
- * Results are an array of {@link fs.Stats} objects.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {function} [callback]
- * @returns {Promise<fs.Stats[]>}
- */
-function readdirAsyncStat (dir, options, callback) {
-  return readdirAsync(dir, options, callback, { stats: true });
+	return min;
 }
 
-/**
- * Aynchronous readdir that returns a {@link stream.Readable} (which is also an {@link EventEmitter}).
- * All stream data events ("data", "file", "directory", "symlink") are passed a path string.
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {stream.Readable}
- */
-function readdirStreamPath (dir, options) {
-  return readdirStream(dir, options, {});
+function getSupportLevel(stream) {
+	const level = supportsColor(stream, stream && stream.isTTY);
+	return translateLevel(level);
 }
 
-/**
- * Aynchronous readdir that returns a {@link stream.Readable} (which is also an {@link EventEmitter})
- * All stream data events ("data", "file", "directory", "symlink") are passed an {@link fs.Stats} object.
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {stream.Readable}
- */
-function readdirStreamStat (dir, options) {
-  return readdirStream(dir, options, { stats: true });
-}
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+	stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+};
 
 
 /***/ }),
-/* 756 */
+
+/***/ "../../node_modules/through/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var Stream = __webpack_require__("stream")
 
+// through
+//
+// a stream that does nothing but re-emit the input.
+// useful for aggregating a series of changing but not ending streams into one stream)
 
-module.exports = readdirSync;
+exports = module.exports = through
+through.through = through
 
-const DirectoryReader = __webpack_require__(757);
+//create a readable writable stream.
 
-let syncFacade = {
-  fs: __webpack_require__(762),
-  forEach: __webpack_require__(763),
-  sync: true
-};
+function through (write, end, opts) {
+  write = write || function (data) { this.queue(data) }
+  end = end || function () { this.queue(null) }
 
-/**
- * Returns the buffered output from a synchronous {@link DirectoryReader}.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {object} internalOptions
- */
-function readdirSync (dir, options, internalOptions) {
-  internalOptions.facade = syncFacade;
+  var ended = false, destroyed = false, buffer = [], _ended = false
+  var stream = new Stream()
+  stream.readable = stream.writable = true
+  stream.paused = false
 
-  let reader = new DirectoryReader(dir, options, internalOptions);
-  let stream = reader.stream;
+//  stream.autoPause   = !(opts && opts.autoPause   === false)
+  stream.autoDestroy = !(opts && opts.autoDestroy === false)
 
-  let results = [];
-  let data = stream.read();
-  while (data !== null) {
-    results.push(data);
-    data = stream.read();
+  stream.write = function (data) {
+    write.call(this, data)
+    return !stream.paused
   }
 
-  return results;
-}
-
-
-/***/ }),
-/* 757 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  function drain() {
+    while(buffer.length && !stream.paused) {
+      var data = buffer.shift()
+      if(null === data)
+        return stream.emit('end')
+      else
+        stream.emit('data', data)
+    }
+  }
 
+  stream.queue = stream.push = function (data) {
+//    console.error(ended)
+    if(_ended) return stream
+    if(data === null) _ended = true
+    buffer.push(data)
+    drain()
+    return stream
+  }
 
-const Readable = __webpack_require__(294).Readable;
-const EventEmitter = __webpack_require__(285).EventEmitter;
-const path = __webpack_require__(4);
-const normalizeOptions = __webpack_require__(758);
-const stat = __webpack_require__(760);
-const call = __webpack_require__(761);
+  //this will be registered as the first 'end' listener
+  //must call destroy next tick, to make sure we're after any
+  //stream piped from here.
+  //this is only a problem if end is not emitted synchronously.
+  //a nicer way to do this is to make sure this is the last listener for 'end'
 
-/**
- * Asynchronously reads the contents of a directory and streams the results
- * via a {@link stream.Readable}.
- */
-class DirectoryReader {
-  /**
-   * @param {string} dir - The absolute or relative directory path to read
-   * @param {object} [options] - User-specified options, if any (see {@link normalizeOptions})
-   * @param {object} internalOptions - Internal options that aren't part of the public API
-   * @class
-   */
-  constructor (dir, options, internalOptions) {
-    this.options = options = normalizeOptions(options, internalOptions);
-
-    // Indicates whether we should keep reading
-    // This is set false if stream.Readable.push() returns false.
-    this.shouldRead = true;
-
-    // The directories to read
-    // (initialized with the top-level directory)
-    this.queue = [{
-      path: dir,
-      basePath: options.basePath,
-      posixBasePath: options.posixBasePath,
-      depth: 0
-    }];
-
-    // The number of directories that are currently being processed
-    this.pending = 0;
-
-    // The data that has been read, but not yet emitted
-    this.buffer = [];
-
-    this.stream = new Readable({ objectMode: true });
-    this.stream._read = () => {
-      // Start (or resume) reading
-      this.shouldRead = true;
-
-      // If we have data in the buffer, then send the next chunk
-      if (this.buffer.length > 0) {
-        this.pushFromBuffer();
-      }
+  stream.on('end', function () {
+    stream.readable = false
+    if(!stream.writable && stream.autoDestroy)
+      process.nextTick(function () {
+        stream.destroy()
+      })
+  })
 
-      // If we have directories queued, then start processing the next one
-      if (this.queue.length > 0) {
-        if (this.options.facade.sync) {
-          while (this.queue.length > 0) {
-            this.readNextDirectory();
-          }
-        }
-        else {
-          this.readNextDirectory();
-        }
-      }
+  function _end () {
+    stream.writable = false
+    end.call(stream)
+    if(!stream.readable && stream.autoDestroy)
+      stream.destroy()
+  }
 
-      this.checkForEOF();
-    };
+  stream.end = function (data) {
+    if(ended) return
+    ended = true
+    if(arguments.length) stream.write(data)
+    _end() // will emit or queue
+    return stream
   }
 
-  /**
-   * Reads the next directory in the queue
-   */
-  readNextDirectory () {
-    let facade = this.options.facade;
-    let dir = this.queue.shift();
-    this.pending++;
+  stream.destroy = function () {
+    if(destroyed) return
+    destroyed = true
+    ended = true
+    buffer.length = 0
+    stream.writable = stream.readable = false
+    stream.emit('close')
+    return stream
+  }
 
-    // Read the directory listing
-    call.safe(facade.fs.readdir, dir.path, (err, items) => {
-      if (err) {
-        // fs.readdir threw an error
-        this.emit('error', err);
-        return this.finishedReadingDirectory();
-      }
+  stream.pause = function () {
+    if(stream.paused) return
+    stream.paused = true
+    return stream
+  }
 
-      try {
-        // Process each item in the directory (simultaneously, if async)
-        facade.forEach(
-          items,
-          this.processItem.bind(this, dir),
-          this.finishedReadingDirectory.bind(this, dir)
-        );
-      }
-      catch (err2) {
-        // facade.forEach threw an error
-        // (probably because fs.readdir returned an invalid result)
-        this.emit('error', err2);
-        this.finishedReadingDirectory();
-      }
-    });
+  stream.resume = function () {
+    if(stream.paused) {
+      stream.paused = false
+      stream.emit('resume')
+    }
+    drain()
+    //may have become paused again,
+    //as drain emits 'data'.
+    if(!stream.paused)
+      stream.emit('drain')
+    return stream
   }
+  return stream
+}
 
-  /**
-   * This method is called after all items in a directory have been processed.
-   *
-   * NOTE: This does not necessarily mean that the reader is finished, since there may still
-   * be other directories queued or pending.
-   */
-  finishedReadingDirectory () {
-    this.pending--;
 
-    if (this.shouldRead) {
-      // If we have directories queued, then start processing the next one
-      if (this.queue.length > 0 && this.options.facade.async) {
-        this.readNextDirectory();
-      }
 
-      this.checkForEOF();
-    }
-  }
+/***/ }),
 
-  /**
-   * Determines whether the reader has finished processing all items in all directories.
-   * If so, then the "end" event is fired (via {@Readable#push})
-   */
-  checkForEOF () {
-    if (this.buffer.length === 0 &&   // The stuff we've already read
-    this.pending === 0 &&             // The stuff we're currently reading
-    this.queue.length === 0) {        // The stuff we haven't read yet
-      // There's no more stuff!
-      this.stream.push(null);
-    }
-  }
+/***/ "../../node_modules/to-regex-range/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  /**
-   * Processes a single item in a directory.
-   *
-   * If the item is a directory, and `option.deep` is enabled, then the item will be added
-   * to the directory queue.
-   *
-   * If the item meets the filter criteria, then it will be emitted to the reader's stream.
-   *
-   * @param {object} dir - A directory object from the queue
-   * @param {string} item - The name of the item (name only, no path)
-   * @param {function} done - A callback function that is called after the item has been processed
-   */
-  processItem (dir, item, done) {
-    let stream = this.stream;
-    let options = this.options;
-
-    let itemPath = dir.basePath + item;
-    let posixPath = dir.posixBasePath + item;
-    let fullPath = path.join(dir.path, item);
-
-    // If `options.deep` is a number, and we've already recursed to the max depth,
-    // then there's no need to check fs.Stats to know if it's a directory.
-    // If `options.deep` is a function, then we'll need fs.Stats
-    let maxDepthReached = dir.depth >= options.recurseDepth;
-
-    // Do we need to call `fs.stat`?
-    let needStats =
-      !maxDepthReached ||                                 // we need the fs.Stats to know if it's a directory
-      options.stats ||                                    // the user wants fs.Stats objects returned
-      options.recurseFn ||                                // we need fs.Stats for the recurse function
-      options.filterFn ||                                 // we need fs.Stats for the filter function
-      EventEmitter.listenerCount(stream, 'file') ||       // we need the fs.Stats to know if it's a file
-      EventEmitter.listenerCount(stream, 'directory') ||  // we need the fs.Stats to know if it's a directory
-      EventEmitter.listenerCount(stream, 'symlink');      // we need the fs.Stats to know if it's a symlink
-
-    // If we don't need stats, then exit early
-    if (!needStats) {
-      if (this.filter(itemPath, posixPath)) {
-        this.pushOrBuffer({ data: itemPath });
-      }
-      return done();
-    }
+"use strict";
+/*!
+ * to-regex-range <https://github.com/micromatch/to-regex-range>
+ *
+ * Copyright (c) 2015-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-    // Get the fs.Stats object for this path
-    stat(options.facade.fs, fullPath, (err, stats) => {
-      if (err) {
-        // fs.stat threw an error
-        this.emit('error', err);
-        return done();
-      }
 
-      try {
-        // Add the item's path to the fs.Stats object
-        // The base of this path, and its separators are determined by the options
-        // (i.e. options.basePath and options.sep)
-        stats.path = itemPath;
-
-        // Add depth of the path to the fs.Stats object for use this in the filter function
-        stats.depth = dir.depth;
-
-        if (this.shouldRecurse(stats, posixPath, maxDepthReached)) {
-          // Add this subdirectory to the queue
-          this.queue.push({
-            path: fullPath,
-            basePath: itemPath + options.sep,
-            posixBasePath: posixPath + '/',
-            depth: dir.depth + 1,
-          });
-        }
 
-        // Determine whether this item matches the filter criteria
-        if (this.filter(stats, posixPath)) {
-          this.pushOrBuffer({
-            data: options.stats ? stats : itemPath,
-            file: stats.isFile(),
-            directory: stats.isDirectory(),
-            symlink: stats.isSymbolicLink(),
-          });
-        }
+const isNumber = __webpack_require__("../../node_modules/to-regex-range/node_modules/is-number/index.js");
 
-        done();
-      }
-      catch (err2) {
-        // An error occurred while processing the item
-        // (probably during a user-specified function, such as options.deep, options.filter, etc.)
-        this.emit('error', err2);
-        done();
-      }
-    });
+const toRegexRange = (min, max, options) => {
+  if (isNumber(min) === false) {
+    throw new TypeError('toRegexRange: expected the first argument to be a number');
   }
 
-  /**
-   * Pushes the given chunk of data to the stream, or adds it to the buffer,
-   * depending on the state of the stream.
-   *
-   * @param {object} chunk
-   */
-  pushOrBuffer (chunk) {
-    // Add the chunk to the buffer
-    this.buffer.push(chunk);
+  if (max === void 0 || min === max) {
+    return String(min);
+  }
 
-    // If we're still reading, then immediately emit the next chunk in the buffer
-    // (which may or may not be the chunk that we just added)
-    if (this.shouldRead) {
-      this.pushFromBuffer();
-    }
+  if (isNumber(max) === false) {
+    throw new TypeError('toRegexRange: expected the second argument to be a number.');
   }
 
-  /**
-   * Immediately pushes the next chunk in the buffer to the reader's stream.
-   * The "data" event will always be fired (via {@link Readable#push}).
-   * In addition, the "file", "directory", and/or "symlink" events may be fired,
-   * depending on the type of properties of the chunk.
-   */
-  pushFromBuffer () {
-    let stream = this.stream;
-    let chunk = this.buffer.shift();
+  let opts = { relaxZeros: true, ...options };
+  if (typeof opts.strictZeros === 'boolean') {
+    opts.relaxZeros = opts.strictZeros === false;
+  }
 
-    // Stream the data
-    try {
-      this.shouldRead = stream.push(chunk.data);
-    }
-    catch (err) {
-      this.emit('error', err);
-    }
+  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;
 
-    // Also emit specific events, based on the type of chunk
-    chunk.file && this.emit('file', chunk.data);
-    chunk.symlink && this.emit('symlink', chunk.data);
-    chunk.directory && this.emit('directory', chunk.data);
+  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
+    return toRegexRange.cache[cacheKey].result;
   }
 
-  /**
-   * Determines whether the given directory meets the user-specified recursion criteria.
-   * If the user didn't specify recursion criteria, then this function will default to true.
-   *
-   * @param {fs.Stats} stats - The directory's {@link fs.Stats} object
-   * @param {string} posixPath - The item's POSIX path (used for glob matching)
-   * @param {boolean} maxDepthReached - Whether we've already crawled the user-specified depth
-   * @returns {boolean}
-   */
-  shouldRecurse (stats, posixPath, maxDepthReached) {
-    let options = this.options;
+  let a = Math.min(min, max);
+  let b = Math.max(min, max);
 
-    if (maxDepthReached) {
-      // We've already crawled to the maximum depth. So no more recursion.
-      return false;
-    }
-    else if (!stats.isDirectory()) {
-      // It's not a directory. So don't try to crawl it.
-      return false;
-    }
-    else if (options.recurseGlob) {
-      // Glob patterns are always tested against the POSIX path, even on Windows
-      // https://github.com/isaacs/node-glob#windows
-      return options.recurseGlob.test(posixPath);
-    }
-    else if (options.recurseRegExp) {
-      // Regular expressions are tested against the normal path
-      // (based on the OS or options.sep)
-      return options.recurseRegExp.test(stats.path);
-    }
-    else if (options.recurseFn) {
-      try {
-        // Run the user-specified recursion criteria
-        return options.recurseFn.call(null, stats);
-      }
-      catch (err) {
-        // An error occurred in the user's code.
-        // In Sync and Async modes, this will return an error.
-        // In Streaming mode, we emit an "error" event, but continue processing
-        this.emit('error', err);
-      }
+  if (Math.abs(a - b) === 1) {
+    let result = min + '|' + max;
+    if (opts.capture) {
+      return `(${result})`;
     }
-    else {
-      // No recursion function was specified, and we're within the maximum depth.
-      // So crawl this directory.
-      return true;
+    if (opts.wrap === false) {
+      return result;
     }
+    return `(?:${result})`;
   }
 
-  /**
-   * Determines whether the given item meets the user-specified filter criteria.
-   * If the user didn't specify a filter, then this function will always return true.
-   *
-   * @param {string|fs.Stats} value - Either the item's path, or the item's {@link fs.Stats} object
-   * @param {string} posixPath - The item's POSIX path (used for glob matching)
-   * @returns {boolean}
-   */
-  filter (value, posixPath) {
-    let options = this.options;
+  let isPadded = hasPadding(min) || hasPadding(max);
+  let state = { min, max, a, b };
+  let positives = [];
+  let negatives = [];
 
-    if (options.filterGlob) {
-      // Glob patterns are always tested against the POSIX path, even on Windows
-      // https://github.com/isaacs/node-glob#windows
-      return options.filterGlob.test(posixPath);
-    }
-    else if (options.filterRegExp) {
-      // Regular expressions are tested against the normal path
-      // (based on the OS or options.sep)
-      return options.filterRegExp.test(value.path || value);
-    }
-    else if (options.filterFn) {
-      try {
-        // Run the user-specified filter function
-        return options.filterFn.call(null, value);
-      }
-      catch (err) {
-        // An error occurred in the user's code.
-        // In Sync and Async modes, this will return an error.
-        // In Streaming mode, we emit an "error" event, but continue processing
-        this.emit('error', err);
-      }
-    }
-    else {
-      // No filter was specified, so match everything
-      return true;
-    }
+  if (isPadded) {
+    state.isPadded = isPadded;
+    state.maxLen = String(state.max).length;
   }
 
-  /**
-   * Emits an event.  If one of the event listeners throws an error,
-   * then an "error" event is emitted.
-   *
-   * @param {string} eventName
-   * @param {*} data
-   */
-  emit (eventName, data) {
-    let stream = this.stream;
+  if (a < 0) {
+    let newMin = b < 0 ? Math.abs(b) : 1;
+    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
+    a = state.a = 0;
+  }
 
-    try {
-      stream.emit(eventName, data);
-    }
-    catch (err) {
-      if (eventName === 'error') {
-        // Don't recursively emit "error" events.
-        // If the first one fails, then just throw
-        throw err;
-      }
-      else {
-        stream.emit('error', err);
-      }
-    }
+  if (b >= 0) {
+    positives = splitToPatterns(a, b, state, opts);
   }
-}
 
-module.exports = DirectoryReader;
+  state.negatives = negatives;
+  state.positives = positives;
+  state.result = collatePatterns(negatives, positives, opts);
 
+  if (opts.capture === true) {
+    state.result = `(${state.result})`;
+  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
+    state.result = `(?:${state.result})`;
+  }
 
-/***/ }),
-/* 758 */
-/***/ (function(module, exports, __webpack_require__) {
+  toRegexRange.cache[cacheKey] = state;
+  return state.result;
+};
 
-"use strict";
+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;
 
-const path = __webpack_require__(4);
-const globToRegExp = __webpack_require__(759);
+  let stop = countNines(min, nines);
+  let stops = new Set([max]);
 
-module.exports = normalizeOptions;
+  while (min <= stop && stop <= max) {
+    stops.add(stop);
+    nines += 1;
+    stop = countNines(min, nines);
+  }
 
-let isWindows = /^win/.test(process.platform);
+  stop = countZeros(max + 1, zeros) - 1;
 
-/**
- * @typedef {Object} FSFacade
- * @property {fs.readdir} readdir
- * @property {fs.stat} stat
- * @property {fs.lstat} lstat
- */
+  while (min < stop && stop <= max) {
+    stops.add(stop);
+    zeros += 1;
+    stop = countZeros(max + 1, zeros) - 1;
+  }
+
+  stops = [...stops];
+  stops.sort(compare);
+  return stops;
+}
 
 /**
- * Validates and normalizes the options argument
- *
- * @param {object} [options] - User-specified options, if any
- * @param {object} internalOptions - Internal options that aren't part of the public API
- *
- * @param {number|boolean|function} [options.deep]
- * The number of directories to recursively traverse. Any falsy value or negative number will
- * default to zero, so only the top-level contents will be returned. Set to `true` or `Infinity`
- * to traverse all subdirectories.  Or provide a function that accepts a {@link fs.Stats} object
- * and returns a truthy value if the directory's contents should be crawled.
- *
- * @param {function|string|RegExp} [options.filter]
- * A function that accepts a {@link fs.Stats} object and returns a truthy value if the data should
- * be returned.  Or a RegExp or glob string pattern, to filter by file name.
- *
- * @param {string} [options.sep]
- * The path separator to use. By default, the OS-specific separator will be used, but this can be
- * set to a specific value to ensure consistency across platforms.
- *
- * @param {string} [options.basePath]
- * The base path to prepend to each result. If empty, then all results will be relative to `dir`.
- *
- * @param {FSFacade} [options.fs]
- * Synchronous or asynchronous facades for Node.js File System module
- *
- * @param {object} [internalOptions.facade]
- * Synchronous or asynchronous facades for various methods, including for the Node.js File System module
- *
- * @param {boolean} [internalOptions.emit]
- * Indicates whether the reader should emit "file", "directory", and "symlink" events
- *
- * @param {boolean} [internalOptions.stats]
- * Indicates whether the reader should emit {@link fs.Stats} objects instead of path strings
- *
- * @returns {object}
+ * Convert a range to a regex pattern
+ * @param {Number} `start`
+ * @param {Number} `stop`
+ * @return {String}
  */
-function normalizeOptions (options, internalOptions) {
-  if (options === null || options === undefined) {
-    options = {};
-  }
-  else if (typeof options !== 'object') {
-    throw new TypeError('options must be an object');
-  }
 
-  let recurseDepth, recurseFn, recurseRegExp, recurseGlob, deep = options.deep;
-  if (deep === null || deep === undefined) {
-    recurseDepth = 0;
-  }
-  else if (typeof deep === 'boolean') {
-    recurseDepth = deep ? Infinity : 0;
-  }
-  else if (typeof deep === 'number') {
-    if (deep < 0 || isNaN(deep)) {
-      throw new Error('options.deep must be a positive number');
-    }
-    else if (Math.floor(deep) !== deep) {
-      throw new Error('options.deep must be an integer');
-    }
-    else {
-      recurseDepth = deep;
-    }
-  }
-  else if (typeof deep === 'function') {
-    recurseDepth = Infinity;
-    recurseFn = deep;
-  }
-  else if (deep instanceof RegExp) {
-    recurseDepth = Infinity;
-    recurseRegExp = deep;
-  }
-  else if (typeof deep === 'string' && deep.length > 0) {
-    recurseDepth = Infinity;
-    recurseGlob = globToRegExp(deep, { extended: true, globstar: true });
-  }
-  else {
-    throw new TypeError('options.deep must be a boolean, number, function, regular expression, or glob pattern');
+function rangeToPattern(start, stop, options) {
+  if (start === stop) {
+    return { pattern: start, count: [], digits: 0 };
   }
 
-  let filterFn, filterRegExp, filterGlob, filter = options.filter;
-  if (filter !== null && filter !== undefined) {
-    if (typeof filter === 'function') {
-      filterFn = filter;
-    }
-    else if (filter instanceof RegExp) {
-      filterRegExp = filter;
-    }
-    else if (typeof filter === 'string' && filter.length > 0) {
-      filterGlob = globToRegExp(filter, { extended: true, globstar: true });
-    }
-    else {
-      throw new TypeError('options.filter must be a function, regular expression, or glob pattern');
-    }
-  }
+  let zipped = zip(start, stop);
+  let digits = zipped.length;
+  let pattern = '';
+  let count = 0;
 
-  let sep = options.sep;
-  if (sep === null || sep === undefined) {
-    sep = path.sep;
-  }
-  else if (typeof sep !== 'string') {
-    throw new TypeError('options.sep must be a string');
-  }
+  for (let i = 0; i < digits; i++) {
+    let [startDigit, stopDigit] = zipped[i];
 
-  let basePath = options.basePath;
-  if (basePath === null || basePath === undefined) {
-    basePath = '';
-  }
-  else if (typeof basePath === 'string') {
-    // Append a path separator to the basePath, if necessary
-    if (basePath && basePath.substr(-1) !== sep) {
-      basePath += sep;
-    }
-  }
-  else {
-    throw new TypeError('options.basePath must be a string');
-  }
+    if (startDigit === stopDigit) {
+      pattern += startDigit;
 
-  // Convert the basePath to POSIX (forward slashes)
-  // so that glob pattern matching works consistently, even on Windows
-  let posixBasePath = basePath;
-  if (posixBasePath && sep !== '/') {
-    posixBasePath = posixBasePath.replace(new RegExp('\\' + sep, 'g'), '/');
+    } else if (startDigit !== '0' || stopDigit !== '9') {
+      pattern += toCharacterClass(startDigit, stopDigit, options);
 
-    /* istanbul ignore if */
-    if (isWindows) {
-      // Convert Windows root paths (C:\) and UNCs (\\) to POSIX root paths
-      posixBasePath = posixBasePath.replace(/^([a-zA-Z]\:\/|\/\/)/, '/');
+    } else {
+      count++;
     }
   }
 
-  // Determine which facade methods to use
-  let facade;
-  if (options.fs === null || options.fs === undefined) {
-    // The user didn't provide their own facades, so use our internal ones
-    facade = internalOptions.facade;
-  }
-  else if (typeof options.fs === 'object') {
-    // Merge the internal facade methods with the user-provided `fs` facades
-    facade = Object.assign({}, internalOptions.facade);
-    facade.fs = Object.assign({}, internalOptions.facade.fs, options.fs);
-  }
-  else {
-    throw new TypeError('options.fs must be an object');
+  if (count) {
+    pattern += options.shorthand === true ? '\\d' : '[0-9]';
   }
 
-  return {
-    recurseDepth,
-    recurseFn,
-    recurseRegExp,
-    recurseGlob,
-    filterFn,
-    filterRegExp,
-    filterGlob,
-    sep,
-    basePath,
-    posixBasePath,
-    facade,
-    emit: !!internalOptions.emit,
-    stats: !!internalOptions.stats,
-  };
+  return { pattern, count: [count], digits };
 }
 
+function splitToPatterns(min, max, tok, options) {
+  let ranges = splitToRanges(min, max);
+  let tokens = [];
+  let start = min;
+  let prev;
 
-/***/ }),
-/* 759 */
-/***/ (function(module, exports) {
-
-module.exports = function (glob, opts) {
-  if (typeof glob !== 'string') {
-    throw new TypeError('Expected a string');
-  }
-
-  var str = String(glob);
+  for (let i = 0; i < ranges.length; i++) {
+    let max = ranges[i];
+    let obj = rangeToPattern(String(start), String(max), options);
+    let zeros = '';
 
-  // The regexp we are building, as a string.
-  var reStr = "";
+    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
+      if (prev.count.length > 1) {
+        prev.count.pop();
+      }
 
-  // Whether we are matching so called "extended" globs (like bash) and should
-  // support single character matching, matching ranges of characters, group
-  // matching, etc.
-  var extended = opts ? !!opts.extended : false;
+      prev.count.push(obj.count[0]);
+      prev.string = prev.pattern + toQuantifier(prev.count);
+      start = max + 1;
+      continue;
+    }
 
-  // When globstar is _false_ (default), '/foo/*' is translated a regexp like
-  // '^\/foo\/.*$' which will match any string beginning with '/foo/'
-  // When globstar is _true_, '/foo/*' is translated to regexp like
-  // '^\/foo\/[^/]*$' which will match any string beginning with '/foo/' BUT
-  // which does not have a '/' to the right of it.
-  // E.g. with '/foo/*' these will match: '/foo/bar', '/foo/bar.txt' but
-  // these will not '/foo/bar/baz', '/foo/bar/baz.txt'
-  // Lastely, when globstar is _true_, '/foo/**' is equivelant to '/foo/*' when
-  // globstar is _false_
-  var globstar = opts ? !!opts.globstar : false;
+    if (tok.isPadded) {
+      zeros = padZeros(max, tok, options);
+    }
 
-  // If we are doing extended matching, this boolean is true when we are inside
-  // a group (eg {*.html,*.js}), and false otherwise.
-  var inGroup = false;
+    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
+    tokens.push(obj);
+    start = max + 1;
+    prev = obj;
+  }
 
-  // RegExp flags (eg "i" ) to pass in to RegExp constructor.
-  var flags = opts && typeof( opts.flags ) === "string" ? opts.flags : "";
+  return tokens;
+}
 
-  var c;
-  for (var i = 0, len = str.length; i < len; i++) {
-    c = str[i];
+function filterPatterns(arr, comparison, prefix, intersection, options) {
+  let result = [];
 
-    switch (c) {
-    case "\\":
-    case "/":
-    case "$":
-    case "^":
-    case "+":
-    case ".":
-    case "(":
-    case ")":
-    case "=":
-    case "!":
-    case "|":
-      reStr += "\\" + c;
-      break;
+  for (let ele of arr) {
+    let { string } = ele;
 
-    case "?":
-      if (extended) {
-        reStr += ".";
-	    break;
-      }
+    // only push if _both_ are negative...
+    if (!intersection && !contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
 
-    case "[":
-    case "]":
-      if (extended) {
-        reStr += c;
-	    break;
-      }
+    // or _both_ are positive
+    if (intersection && contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
+  }
+  return result;
+}
 
-    case "{":
-      if (extended) {
-        inGroup = true;
-	    reStr += "(";
-	    break;
-      }
+/**
+ * Zip strings
+ */
 
-    case "}":
-      if (extended) {
-        inGroup = false;
-	    reStr += ")";
-	    break;
-      }
+function zip(a, b) {
+  let arr = [];
+  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
+  return arr;
+}
 
-    case ",":
-      if (inGroup) {
-        reStr += "|";
-	    break;
-      }
-      reStr += "\\" + c;
-      break;
+function compare(a, b) {
+  return a > b ? 1 : b > a ? -1 : 0;
+}
 
-    case "*":
-      // Move over all consecutive "*"'s.
-      // Also store the previous and next characters
-      var prevChar = str[i - 1];
-      var starCount = 1;
-      while(str[i + 1] === "*") {
-        starCount++;
-        i++;
-      }
-      var nextChar = str[i + 1];
+function contains(arr, key, val) {
+  return arr.some(ele => ele[key] === val);
+}
 
-      if (!globstar) {
-        // globstar is disabled, so treat any number of "*" as one
-        reStr += ".*";
-      } else {
-        // globstar is enabled, so determine if this is a globstar segment
-        var isGlobstar = starCount > 1                      // multiple "*"'s
-          && (prevChar === "/" || prevChar === undefined)   // from the start of the segment
-          && (nextChar === "/" || nextChar === undefined)   // to the end of the segment
-
-        if (isGlobstar) {
-          // it's a globstar, so match zero or more path segments
-          reStr += "(?:[^/]*(?:\/|$))*";
-          i++; // move over the "/"
-        } else {
-          // it's not a globstar, so only match one path segment
-          reStr += "[^/]*";
-        }
-      }
-      break;
+function countNines(min, len) {
+  return Number(String(min).slice(0, -len) + '9'.repeat(len));
+}
 
-    default:
-      reStr += c;
-    }
-  }
+function countZeros(integer, zeros) {
+  return integer - (integer % Math.pow(10, zeros));
+}
 
-  // When regexp 'g' flag is specified don't
-  // constrain the regular expression with ^ & $
-  if (!flags || !~flags.indexOf('g')) {
-    reStr = "^" + reStr + "$";
+function toQuantifier(digits) {
+  let [start = 0, stop = ''] = digits;
+  if (stop || start > 1) {
+    return `{${start + (stop ? ',' + stop : '')}}`;
   }
+  return '';
+}
 
-  return new RegExp(reStr, flags);
-};
+function toCharacterClass(a, b, options) {
+  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
+}
 
+function hasPadding(str) {
+  return /^-?(0+)\d/.test(str);
+}
 
-/***/ }),
-/* 760 */
-/***/ (function(module, exports, __webpack_require__) {
+function padZeros(value, tok, options) {
+  if (!tok.isPadded) {
+    return value;
+  }
 
-"use strict";
+  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}}`;
+    }
+  }
+}
 
-const call = __webpack_require__(761);
+/**
+ * Cache
+ */
 
-module.exports = stat;
+toRegexRange.cache = {};
+toRegexRange.clearCache = () => (toRegexRange.cache = {});
 
 /**
- * Retrieves the {@link fs.Stats} for the given path. If the path is a symbolic link,
- * then the Stats of the symlink's target are returned instead.  If the symlink is broken,
- * then the Stats of the symlink itself are returned.
- *
- * @param {object} fs - Synchronous or Asynchronouse facade for the "fs" module
- * @param {string} path - The path to return stats for
- * @param {function} callback
+ * Expose `toRegexRange`
  */
-function stat (fs, path, callback) {
-  let isSymLink = false;
 
-  call.safe(fs.lstat, path, (err, lstats) => {
-    if (err) {
-      // fs.lstat threw an eror
-      return callback(err);
-    }
+module.exports = toRegexRange;
 
-    try {
-      isSymLink = lstats.isSymbolicLink();
-    }
-    catch (err2) {
-      // lstats.isSymbolicLink() threw an error
-      // (probably because fs.lstat returned an invalid result)
-      return callback(err2);
-    }
 
-    if (isSymLink) {
-      // Try to resolve the symlink
-      symlinkStat(fs, path, lstats, callback);
-    }
-    else {
-      // It's not a symlink, so return the stats as-is
-      callback(null, lstats);
-    }
-  });
-}
+/***/ }),
 
-/**
- * Retrieves the {@link fs.Stats} for the target of the given symlink.
- * If the symlink is broken, then the Stats of the symlink itself are returned.
+/***/ "../../node_modules/to-regex-range/node_modules/is-number/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
  *
- * @param {object} fs - Synchronous or Asynchronouse facade for the "fs" module
- * @param {string} path - The path of the symlink to return stats for
- * @param {object} lstats - The stats of the symlink
- * @param {function} callback
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Released under the MIT License.
  */
-function symlinkStat (fs, path, lstats, callback) {
-  call.safe(fs.stat, path, (err, stats) => {
-    if (err) {
-      // The symlink is broken, so return the stats for the link itself
-      return callback(null, lstats);
-    }
 
-    try {
-      // Return the stats for the resolved symlink target,
-      // and override the `isSymbolicLink` method to indicate that it's a symlink
-      stats.isSymbolicLink = () => true;
-    }
-    catch (err2) {
-      // Setting stats.isSymbolicLink threw an error
-      // (probably because fs.stat returned an invalid result)
-      return callback(err2);
-    }
 
-    callback(null, stats);
-  });
-}
+
+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;
+};
 
 
 /***/ }),
-/* 761 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/validate-npm-package-license/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+var parse = __webpack_require__("../../node_modules/spdx-expression-parse/index.js");
+var correct = __webpack_require__("../../node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js");
 
-let call = module.exports = {
-  safe: safeCall,
-  once: callOnce,
-};
+var genericWarning = (
+  'license should be ' +
+  'a valid SPDX license expression (without "LicenseRef"), ' +
+  '"UNLICENSED", or ' +
+  '"SEE LICENSE IN <filename>"'
+);
 
-/**
- * Calls a function with the given arguments, and ensures that the error-first callback is _always_
- * invoked exactly once, even if the function throws an error.
- *
- * @param {function} fn - The function to invoke
- * @param {...*} args - The arguments to pass to the function. The final argument must be a callback function.
- */
-function safeCall (fn, args) {
-  // Get the function arguments as an array
-  args = Array.prototype.slice.call(arguments, 1);
+var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
 
-  // Replace the callback function with a wrapper that ensures it will only be called once
-  let callback = call.once(args.pop());
-  args.push(callback);
+function startsWith(prefix, string) {
+  return string.slice(0, prefix.length) === prefix;
+}
 
-  try {
-    fn.apply(null, args);
-  }
-  catch (err) {
-    callback(err);
+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)
+    );
   }
 }
 
-/**
- * Returns a wrapper function that ensures the given callback function is only called once.
- * Subsequent calls are ignored, unless the first argument is an Error, in which case the
- * error is thrown.
- *
- * @param {function} fn - The function that should only be called once
- * @returns {function}
- */
-function callOnce (fn) {
-  let fulfilled = false;
-
-  return function onceWrapper (err) {
-    if (!fulfilled) {
-      fulfilled = true;
-      return fn.apply(this, arguments);
-    }
-    else if (err) {
-      // The callback has already been called, but now an error has occurred
-      // (most likely inside the callback function). So re-throw the error,
-      // so it gets handled further up the call stack
-      throw err;
+module.exports = function(argument) {
+  var ast;
+
+  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;
     }
-  };
-}
+  }
+
+  if (usesLicenseRef(ast)) {
+    return {
+      validForNewPackages: false,
+      validForOldPackages: false,
+      spdx: true,
+      warnings: [genericWarning]
+    };
+  } else {
+    return {
+      validForNewPackages: true,
+      validForOldPackages: true,
+      spdx: true
+    };
+  }
+};
 
 
 /***/ }),
-/* 762 */
+
+/***/ "../../node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var licenseIDs = __webpack_require__("../../node_modules/spdx-license-ids/spdx-license-ids.json");
 
+function valid(string) {
+  return licenseIDs.indexOf(string) > -1;
+}
 
-const fs = __webpack_require__(253);
-const call = __webpack_require__(761);
+// 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', '']
+];
 
-/**
- * A facade around {@link fs.readdirSync} that allows it to be called
- * the same way as {@link fs.readdir}.
- *
- * @param {string} dir
- * @param {function} callback
- */
-exports.readdir = function (dir, callback) {
-  // Make sure the callback is only called once
-  callback = call.once(callback);
+var TRANSPOSED = 0;
+var CORRECT = 1;
 
-  try {
-    let items = fs.readdirSync(dir);
-    callback(null, items);
-  }
-  catch (err) {
-    callback(err);
+// 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';
   }
-};
+];
 
-/**
- * A facade around {@link fs.statSync} that allows it to be called
- * the same way as {@link fs.stat}.
- *
- * @param {string} path
- * @param {function} callback
- */
-exports.stat = function (path, callback) {
-  // Make sure the callback is only called once
-  callback = call.once(callback);
+// 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']
+];
 
-  try {
-    let stats = fs.statSync(path);
-    callback(null, stats);
+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;
+    }
   }
-  catch (err) {
-    callback(err);
+  return null;
+};
+
+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;
 };
 
-/**
- * A facade around {@link fs.lstatSync} that allows it to be called
- * the same way as {@link fs.lstat}.
- *
- * @param {string} path
- * @param {function} callback
- */
-exports.lstat = function (path, callback) {
-  // Make sure the callback is only called once
-  callback = call.once(callback);
+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;
+};
 
-  try {
-    let stats = fs.lstatSync(path);
-    callback(null, stats);
+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;
   }
-  catch (err) {
-    callback(err);
+  transformed = anyCorrection(identifier, validLastResort);
+  if (transformed !== null) {
+    return transformed;
   }
+  return null;
 };
 
 
 /***/ }),
-/* 763 */
+
+/***/ "../../node_modules/wcwidth/combining.js":
+/***/ (function(module, exports) {
+
+module.exports = [
+    [ 0x0300, 0x036F ], [ 0x0483, 0x0486 ], [ 0x0488, 0x0489 ],
+    [ 0x0591, 0x05BD ], [ 0x05BF, 0x05BF ], [ 0x05C1, 0x05C2 ],
+    [ 0x05C4, 0x05C5 ], [ 0x05C7, 0x05C7 ], [ 0x0600, 0x0603 ],
+    [ 0x0610, 0x0615 ], [ 0x064B, 0x065E ], [ 0x0670, 0x0670 ],
+    [ 0x06D6, 0x06E4 ], [ 0x06E7, 0x06E8 ], [ 0x06EA, 0x06ED ],
+    [ 0x070F, 0x070F ], [ 0x0711, 0x0711 ], [ 0x0730, 0x074A ],
+    [ 0x07A6, 0x07B0 ], [ 0x07EB, 0x07F3 ], [ 0x0901, 0x0902 ],
+    [ 0x093C, 0x093C ], [ 0x0941, 0x0948 ], [ 0x094D, 0x094D ],
+    [ 0x0951, 0x0954 ], [ 0x0962, 0x0963 ], [ 0x0981, 0x0981 ],
+    [ 0x09BC, 0x09BC ], [ 0x09C1, 0x09C4 ], [ 0x09CD, 0x09CD ],
+    [ 0x09E2, 0x09E3 ], [ 0x0A01, 0x0A02 ], [ 0x0A3C, 0x0A3C ],
+    [ 0x0A41, 0x0A42 ], [ 0x0A47, 0x0A48 ], [ 0x0A4B, 0x0A4D ],
+    [ 0x0A70, 0x0A71 ], [ 0x0A81, 0x0A82 ], [ 0x0ABC, 0x0ABC ],
+    [ 0x0AC1, 0x0AC5 ], [ 0x0AC7, 0x0AC8 ], [ 0x0ACD, 0x0ACD ],
+    [ 0x0AE2, 0x0AE3 ], [ 0x0B01, 0x0B01 ], [ 0x0B3C, 0x0B3C ],
+    [ 0x0B3F, 0x0B3F ], [ 0x0B41, 0x0B43 ], [ 0x0B4D, 0x0B4D ],
+    [ 0x0B56, 0x0B56 ], [ 0x0B82, 0x0B82 ], [ 0x0BC0, 0x0BC0 ],
+    [ 0x0BCD, 0x0BCD ], [ 0x0C3E, 0x0C40 ], [ 0x0C46, 0x0C48 ],
+    [ 0x0C4A, 0x0C4D ], [ 0x0C55, 0x0C56 ], [ 0x0CBC, 0x0CBC ],
+    [ 0x0CBF, 0x0CBF ], [ 0x0CC6, 0x0CC6 ], [ 0x0CCC, 0x0CCD ],
+    [ 0x0CE2, 0x0CE3 ], [ 0x0D41, 0x0D43 ], [ 0x0D4D, 0x0D4D ],
+    [ 0x0DCA, 0x0DCA ], [ 0x0DD2, 0x0DD4 ], [ 0x0DD6, 0x0DD6 ],
+    [ 0x0E31, 0x0E31 ], [ 0x0E34, 0x0E3A ], [ 0x0E47, 0x0E4E ],
+    [ 0x0EB1, 0x0EB1 ], [ 0x0EB4, 0x0EB9 ], [ 0x0EBB, 0x0EBC ],
+    [ 0x0EC8, 0x0ECD ], [ 0x0F18, 0x0F19 ], [ 0x0F35, 0x0F35 ],
+    [ 0x0F37, 0x0F37 ], [ 0x0F39, 0x0F39 ], [ 0x0F71, 0x0F7E ],
+    [ 0x0F80, 0x0F84 ], [ 0x0F86, 0x0F87 ], [ 0x0F90, 0x0F97 ],
+    [ 0x0F99, 0x0FBC ], [ 0x0FC6, 0x0FC6 ], [ 0x102D, 0x1030 ],
+    [ 0x1032, 0x1032 ], [ 0x1036, 0x1037 ], [ 0x1039, 0x1039 ],
+    [ 0x1058, 0x1059 ], [ 0x1160, 0x11FF ], [ 0x135F, 0x135F ],
+    [ 0x1712, 0x1714 ], [ 0x1732, 0x1734 ], [ 0x1752, 0x1753 ],
+    [ 0x1772, 0x1773 ], [ 0x17B4, 0x17B5 ], [ 0x17B7, 0x17BD ],
+    [ 0x17C6, 0x17C6 ], [ 0x17C9, 0x17D3 ], [ 0x17DD, 0x17DD ],
+    [ 0x180B, 0x180D ], [ 0x18A9, 0x18A9 ], [ 0x1920, 0x1922 ],
+    [ 0x1927, 0x1928 ], [ 0x1932, 0x1932 ], [ 0x1939, 0x193B ],
+    [ 0x1A17, 0x1A18 ], [ 0x1B00, 0x1B03 ], [ 0x1B34, 0x1B34 ],
+    [ 0x1B36, 0x1B3A ], [ 0x1B3C, 0x1B3C ], [ 0x1B42, 0x1B42 ],
+    [ 0x1B6B, 0x1B73 ], [ 0x1DC0, 0x1DCA ], [ 0x1DFE, 0x1DFF ],
+    [ 0x200B, 0x200F ], [ 0x202A, 0x202E ], [ 0x2060, 0x2063 ],
+    [ 0x206A, 0x206F ], [ 0x20D0, 0x20EF ], [ 0x302A, 0x302F ],
+    [ 0x3099, 0x309A ], [ 0xA806, 0xA806 ], [ 0xA80B, 0xA80B ],
+    [ 0xA825, 0xA826 ], [ 0xFB1E, 0xFB1E ], [ 0xFE00, 0xFE0F ],
+    [ 0xFE20, 0xFE23 ], [ 0xFEFF, 0xFEFF ], [ 0xFFF9, 0xFFFB ],
+    [ 0x10A01, 0x10A03 ], [ 0x10A05, 0x10A06 ], [ 0x10A0C, 0x10A0F ],
+    [ 0x10A38, 0x10A3A ], [ 0x10A3F, 0x10A3F ], [ 0x1D167, 0x1D169 ],
+    [ 0x1D173, 0x1D182 ], [ 0x1D185, 0x1D18B ], [ 0x1D1AA, 0x1D1AD ],
+    [ 0x1D242, 0x1D244 ], [ 0xE0001, 0xE0001 ], [ 0xE0020, 0xE007F ],
+    [ 0xE0100, 0xE01EF ]
+]
+
+
+/***/ }),
+
+/***/ "../../node_modules/wcwidth/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = syncForEach;
+var defaults = __webpack_require__("../../node_modules/defaults/index.js")
+var combining = __webpack_require__("../../node_modules/wcwidth/combining.js")
 
-/**
- * A facade that allows {@link Array.forEach} to be called as though it were asynchronous.
- *
- * @param {array} array - The array to iterate over
- * @param {function} iterator - The function to call for each item in the array
- * @param {function} done - The function to call when all iterators have completed
- */
-function syncForEach (array, iterator, done) {
-  array.forEach(item => {
-    iterator(item, () => {
-      // Note: No error-handling here because this is currently only ever called
-      // by DirectoryReader, which never passes an `error` parameter to the callback.
-      // Instead, DirectoryReader emits an "error" event if an error occurs.
-    });
-  });
+var DEFAULTS = {
+  nul: 0,
+  control: 0
+}
 
-  done();
+module.exports = function wcwidth(str) {
+  return wcswidth(str, DEFAULTS)
 }
 
+module.exports.config = function(opts) {
+  opts = defaults(opts || {}, DEFAULTS)
+  return function wcwidth(str) {
+    return wcswidth(str, opts)
+  }
+}
 
-/***/ }),
-/* 764 */
-/***/ (function(module, exports, __webpack_require__) {
+/*
+ *  The following functions define the column width of an ISO 10646
+ *  character as follows:
+ *  - The null character (U+0000) has a column width of 0.
+ *  - Other C0/C1 control characters and DEL will lead to a return value
+ *    of -1.
+ *  - Non-spacing and enclosing combining characters (general category
+ *    code Mn or Me in the
+ *    Unicode database) have a column width of 0.
+ *  - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *  - Other format characters (general category code Cf in the Unicode
+ *    database) and ZERO WIDTH
+ *    SPACE (U+200B) have a column width of 0.
+ *  - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ *    have a column width of 0.
+ *  - Spacing characters in the East Asian Wide (W) or East Asian
+ *    Full-width (F) category as
+ *    defined in Unicode Technical Report #11 have a column width of 2.
+ *  - All remaining characters (including all printable ISO 8859-1 and
+ *    WGL4 characters, Unicode control characters, etc.) have a column
+ *    width of 1.
+ *  This implementation assumes that characters are encoded in ISO 10646.
+*/
 
-"use strict";
+function wcswidth(str, opts) {
+  if (typeof str !== 'string') return wcwidth(str, opts)
 
+  var s = 0
+  for (var i = 0; i < str.length; i++) {
+    var n = wcwidth(str.charCodeAt(i), opts)
+    if (n < 0) return -1
+    s += n
+  }
 
-module.exports = readdirAsync;
+  return s
+}
 
-const maybe = __webpack_require__(765);
-const DirectoryReader = __webpack_require__(757);
+function wcwidth(ucs, opts) {
+  // test for 8-bit control characters
+  if (ucs === 0) return opts.nul
+  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return opts.control
 
-let asyncFacade = {
-  fs: __webpack_require__(253),
-  forEach: __webpack_require__(766),
-  async: true
-};
+  // binary search in table of non-spacing characters
+  if (bisearch(ucs)) return 0
 
-/**
- * Returns the buffered output from an asynchronous {@link DirectoryReader},
- * via an error-first callback or a {@link Promise}.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {function} [callback]
- * @param {object} internalOptions
- */
-function readdirAsync (dir, options, callback, internalOptions) {
-  if (typeof options === 'function') {
-    callback = options;
-    options = undefined;
-  }
+  // if we arrive here, ucs is not a combining or C0/C1 control character
+  return 1 +
+      (ucs >= 0x1100 &&
+       (ucs <= 0x115f ||                       // Hangul Jamo init. consonants
+        ucs == 0x2329 || ucs == 0x232a ||
+        (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+         ucs != 0x303f) ||                     // CJK ... Yi
+        (ucs >= 0xac00 && ucs <= 0xd7a3) ||    // Hangul Syllables
+        (ucs >= 0xf900 && ucs <= 0xfaff) ||    // CJK Compatibility Ideographs
+        (ucs >= 0xfe10 && ucs <= 0xfe19) ||    // Vertical forms
+        (ucs >= 0xfe30 && ucs <= 0xfe6f) ||    // CJK Compatibility Forms
+        (ucs >= 0xff00 && ucs <= 0xff60) ||    // Fullwidth Forms
+        (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+        (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+        (ucs >= 0x30000 && ucs <= 0x3fffd)));
+}
 
-  return maybe(callback, new Promise(((resolve, reject) => {
-    let results = [];
+function bisearch(ucs) {
+  var min = 0
+  var max = combining.length - 1
+  var mid
 
-    internalOptions.facade = asyncFacade;
+  if (ucs < combining[0][0] || ucs > combining[max][1]) return false
 
-    let reader = new DirectoryReader(dir, options, internalOptions);
-    let stream = reader.stream;
+  while (max >= min) {
+    mid = Math.floor((min + max) / 2)
+    if (ucs > combining[mid][1]) min = mid + 1
+    else if (ucs < combining[mid][0]) max = mid - 1
+    else return true
+  }
 
-    stream.on('error', err => {
-      reject(err);
-      stream.pause();
-    });
-    stream.on('data', result => {
-      results.push(result);
-    });
-    stream.on('end', () => {
-      resolve(results);
-    });
-  })));
+  return false
 }
 
 
 /***/ }),
-/* 765 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-var next = (global.process && process.nextTick) || global.setImmediate || function (f) {
-  setTimeout(f, 0)
-}
+/***/ "../../node_modules/webpack/buildin/module.js":
+/***/ (function(module, exports) {
 
-module.exports = function maybe (cb, promise) {
-  if (cb) {
-    promise
-      .then(function (result) {
-        next(function () { cb(null, result) })
-      }, function (err) {
-        next(function () { cb(err) })
-      })
-    return undefined
-  }
-  else {
-    return promise
-  }
-}
+module.exports = function(module) {
+	if (!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if (!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
 
 
 /***/ }),
-/* 766 */
+
+/***/ "../../node_modules/which/which.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+const isWindows = process.platform === 'win32' ||
+    process.env.OSTYPE === 'cygwin' ||
+    process.env.OSTYPE === 'msys'
 
+const path = __webpack_require__("path")
+const COLON = isWindows ? ';' : ':'
+const isexe = __webpack_require__("../../node_modules/isexe/index.js")
 
-module.exports = asyncForEach;
+const getNotFoundError = (cmd) =>
+  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
 
-/**
- * Simultaneously processes all items in the given array.
- *
- * @param {array} array - The array to iterate over
- * @param {function} iterator - The function to call for each item in the array
- * @param {function} done - The function to call when all iterators have completed
- */
-function asyncForEach (array, iterator, done) {
-  if (array.length === 0) {
-    // NOTE: Normally a bad idea to mix sync and async, but it's safe here because
-    // of the way that this method is currently used by DirectoryReader.
-    done();
-    return;
+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('')
   }
 
-  // Simultaneously process all items in the array.
-  let pending = array.length;
-  array.forEach(item => {
-    iterator(item, () => {
-      if (--pending === 0) {
-        done();
-      }
-    });
-  });
+  return {
+    pathEnv,
+    pathExt,
+    pathExtExe,
+  }
 }
 
+const which = (cmd, opt, cb) => {
+  if (typeof opt === 'function') {
+    cb = opt
+    opt = {}
+  }
+  if (!opt)
+    opt = {}
 
-/***/ }),
-/* 767 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  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))
 
-module.exports = readdirStream;
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
 
-const DirectoryReader = __webpack_require__(757);
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
 
-let streamFacade = {
-  fs: __webpack_require__(253),
-  forEach: __webpack_require__(766),
-  async: true
-};
+    resolve(subStep(p, i, 0))
+  })
 
-/**
- * Returns the {@link stream.Readable} of an asynchronous {@link DirectoryReader}.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {object} internalOptions
- */
-function readdirStream (dir, options, internalOptions) {
-  internalOptions.facade = streamFacade;
+  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))
+    })
+  })
 
-  let reader = new DirectoryReader(dir, options, internalOptions);
-  return reader.stream;
+  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
 }
 
+const whichSync = (cmd, opt) => {
+  opt = opt || {}
 
-/***/ }),
-/* 768 */
-/***/ (function(module, exports, __webpack_require__) {
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-var deep_1 = __webpack_require__(769);
-var entry_1 = __webpack_require__(771);
-var pathUtil = __webpack_require__(770);
-var Reader = /** @class */ (function () {
-    function Reader(options) {
-        this.options = options;
-        this.micromatchOptions = this.getMicromatchOptions();
-        this.entryFilter = new entry_1.default(options, this.micromatchOptions);
-        this.deepFilter = new deep_1.default(options, this.micromatchOptions);
-    }
-    /**
-     * Returns root path to scanner.
-     */
-    Reader.prototype.getRootDirectory = function (task) {
-        return path.resolve(this.options.cwd, task.base);
-    };
-    /**
-     * Returns options for reader.
-     */
-    Reader.prototype.getReaderOptions = function (task) {
-        return {
-            basePath: task.base === '.' ? '' : task.base,
-            filter: this.entryFilter.getFilter(task.positive, task.negative),
-            deep: this.deepFilter.getFilter(task.positive, task.negative),
-            sep: '/'
-        };
-    };
-    /**
-     * Returns options for micromatch.
-     */
-    Reader.prototype.getMicromatchOptions = function () {
-        return {
-            dot: this.options.dot,
-            nobrace: !this.options.brace,
-            noglobstar: !this.options.globstar,
-            noext: !this.options.extension,
-            nocase: !this.options.case,
-            matchBase: this.options.matchBase
-        };
-    };
-    /**
-     * Returns transformed entry.
-     */
-    Reader.prototype.transform = function (entry) {
-        if (this.options.absolute) {
-            entry.path = pathUtil.makeAbsolute(this.options.cwd, entry.path);
-        }
-        if (this.options.markDirectories && entry.isDirectory()) {
-            entry.path += '/';
-        }
-        var item = this.options.stats ? entry : entry.path;
-        if (this.options.transform === null) {
-            return item;
-        }
-        return this.options.transform(item);
-    };
-    /**
-     * Returns true if error has ENOENT code.
-     */
-    Reader.prototype.isEnoentCodeError = function (err) {
-        return err.code === 'ENOENT';
-    };
-    return Reader;
-}());
-exports.default = Reader;
+  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
 
-/***/ }),
-/* 769 */
-/***/ (function(module, exports, __webpack_require__) {
+    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) {}
+    }
+  }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(770);
-var patternUtils = __webpack_require__(604);
-var DeepFilter = /** @class */ (function () {
-    function DeepFilter(options, micromatchOptions) {
-        this.options = options;
-        this.micromatchOptions = micromatchOptions;
-    }
-    /**
-     * Returns filter for directories.
-     */
-    DeepFilter.prototype.getFilter = function (positive, negative) {
-        var _this = this;
-        var maxPatternDepth = this.getMaxPatternDepth(positive);
-        var negativeRe = this.getNegativePatternsRe(negative);
-        return function (entry) { return _this.filter(entry, negativeRe, maxPatternDepth); };
-    };
-    /**
-     * Returns max depth of the provided patterns.
-     */
-    DeepFilter.prototype.getMaxPatternDepth = function (patterns) {
-        var globstar = patterns.some(patternUtils.hasGlobStar);
-        return globstar ? Infinity : patternUtils.getMaxNaivePatternsDepth(patterns);
-    };
-    /**
-     * Returns RegExp's for patterns that can affect the depth of reading.
-     */
-    DeepFilter.prototype.getNegativePatternsRe = function (patterns) {
-        var affectDepthOfReadingPatterns = patterns.filter(patternUtils.isAffectDepthOfReadingPattern);
-        return patternUtils.convertPatternsToRe(affectDepthOfReadingPatterns, this.micromatchOptions);
-    };
-    /**
-     * Returns «true» for directory that should be read.
-     */
-    DeepFilter.prototype.filter = function (entry, negativeRe, maxPatternDepth) {
-        if (this.isSkippedByDeepOption(entry.depth)) {
-            return false;
-        }
-        if (this.isSkippedByMaxPatternDepth(entry.depth, maxPatternDepth)) {
-            return false;
-        }
-        if (this.isSkippedSymlinkedDirectory(entry)) {
-            return false;
-        }
-        if (this.isSkippedDotDirectory(entry)) {
-            return false;
-        }
-        return this.isSkippedByNegativePatterns(entry, negativeRe);
-    };
-    /**
-     * Returns «true» when the «deep» option is disabled or number and depth of the entry is greater that the option value.
-     */
-    DeepFilter.prototype.isSkippedByDeepOption = function (entryDepth) {
-        return !this.options.deep || (typeof this.options.deep === 'number' && entryDepth >= this.options.deep);
-    };
-    /**
-     * Returns «true» when depth parameter is not an Infinity and entry depth greater that the parameter value.
-     */
-    DeepFilter.prototype.isSkippedByMaxPatternDepth = function (entryDepth, maxPatternDepth) {
-        return maxPatternDepth !== Infinity && entryDepth >= maxPatternDepth;
-    };
-    /**
-     * Returns «true» for symlinked directory if the «followSymlinkedDirectories» option is disabled.
-     */
-    DeepFilter.prototype.isSkippedSymlinkedDirectory = function (entry) {
-        return !this.options.followSymlinkedDirectories && entry.isSymbolicLink();
-    };
-    /**
-     * Returns «true» for a directory whose name starts with a period if «dot» option is disabled.
-     */
-    DeepFilter.prototype.isSkippedDotDirectory = function (entry) {
-        return !this.options.dot && pathUtils.isDotDirectory(entry.path);
-    };
-    /**
-     * Returns «true» for a directory whose path math to any negative pattern.
-     */
-    DeepFilter.prototype.isSkippedByNegativePatterns = function (entry, negativeRe) {
-        return !patternUtils.matchAny(entry.path, negativeRe);
-    };
-    return DeepFilter;
-}());
-exports.default = DeepFilter;
+  if (opt.all && found.length)
+    return found
 
+  if (opt.nothrow)
+    return null
 
-/***/ }),
-/* 770 */
-/***/ (function(module, exports, __webpack_require__) {
+  throw getNotFoundError(cmd)
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-/**
- * Returns «true» if the last partial of the path starting with a period.
- */
-function isDotDirectory(filepath) {
-    return path.basename(filepath).startsWith('.');
-}
-exports.isDotDirectory = isDotDirectory;
-/**
- * Convert a windows-like path to a unix-style path.
- */
-function normalize(filepath) {
-    return filepath.replace(/\\/g, '/');
-}
-exports.normalize = normalize;
-/**
- * Returns normalized absolute path of provided filepath.
- */
-function makeAbsolute(cwd, filepath) {
-    return normalize(path.resolve(cwd, filepath));
-}
-exports.makeAbsolute = makeAbsolute;
+module.exports = which
+which.sync = whichSync
 
 
 /***/ }),
-/* 771 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(770);
-var patternUtils = __webpack_require__(604);
-var EntryFilter = /** @class */ (function () {
-    function EntryFilter(options, micromatchOptions) {
-        this.options = options;
-        this.micromatchOptions = micromatchOptions;
-        this.index = new Map();
-    }
-    /**
-     * Returns filter for directories.
-     */
-    EntryFilter.prototype.getFilter = function (positive, negative) {
-        var _this = this;
-        var positiveRe = patternUtils.convertPatternsToRe(positive, this.micromatchOptions);
-        var negativeRe = patternUtils.convertPatternsToRe(negative, this.micromatchOptions);
-        return function (entry) { return _this.filter(entry, positiveRe, negativeRe); };
-    };
-    /**
-     * Returns true if entry must be added to result.
-     */
-    EntryFilter.prototype.filter = function (entry, positiveRe, negativeRe) {
-        // Exclude duplicate results
-        if (this.options.unique) {
-            if (this.isDuplicateEntry(entry)) {
-                return false;
-            }
-            this.createIndexRecord(entry);
-        }
-        // Filter files and directories by options
-        if (this.onlyFileFilter(entry) || this.onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this.isSkippedByAbsoluteNegativePatterns(entry, negativeRe)) {
-            return false;
-        }
-        return this.isMatchToPatterns(entry.path, positiveRe) && !this.isMatchToPatterns(entry.path, negativeRe);
-    };
-    /**
-     * Return true if the entry already has in the cross reader index.
-     */
-    EntryFilter.prototype.isDuplicateEntry = function (entry) {
-        return this.index.has(entry.path);
-    };
-    /**
-     * Create record in the cross reader index.
-     */
-    EntryFilter.prototype.createIndexRecord = function (entry) {
-        this.index.set(entry.path, undefined);
-    };
-    /**
-     * Returns true for non-files if the «onlyFiles» option is enabled.
-     */
-    EntryFilter.prototype.onlyFileFilter = function (entry) {
-        return this.options.onlyFiles && !entry.isFile();
-    };
-    /**
-     * Returns true for non-directories if the «onlyDirectories» option is enabled.
-     */
-    EntryFilter.prototype.onlyDirectoryFilter = function (entry) {
-        return this.options.onlyDirectories && !entry.isDirectory();
-    };
-    /**
-     * Return true when `absolute` option is enabled and matched to the negative patterns.
-     */
-    EntryFilter.prototype.isSkippedByAbsoluteNegativePatterns = function (entry, negativeRe) {
-        if (!this.options.absolute) {
-            return false;
-        }
-        var fullpath = pathUtils.makeAbsolute(this.options.cwd, entry.path);
-        return this.isMatchToPatterns(fullpath, negativeRe);
-    };
-    /**
-     * Return true when entry match to provided patterns.
-     *
-     * First, just trying to apply patterns to the path.
-     * Second, trying to apply patterns to the path with final slash (need to micromatch to support «directory/**» patterns).
-     */
-    EntryFilter.prototype.isMatchToPatterns = function (filepath, patternsRe) {
-        return patternUtils.matchAny(filepath, patternsRe) || patternUtils.matchAny(filepath + '/', patternsRe);
-    };
-    return EntryFilter;
-}());
-exports.default = EntryFilter;
-
 
-/***/ }),
-/* 772 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ "../../node_modules/wrappy/wrappy.js":
+/***/ (function(module, exports) {
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    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);
-    };
-    return function (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 });
-var stream = __webpack_require__(294);
-var fsStat = __webpack_require__(773);
-var fs_1 = __webpack_require__(777);
-var FileSystemStream = /** @class */ (function (_super) {
-    __extends(FileSystemStream, _super);
-    function FileSystemStream() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * Use stream API to read entries for Task.
-     */
-    FileSystemStream.prototype.read = function (patterns, filter) {
-        var _this = this;
-        var filepaths = patterns.map(this.getFullEntryPath, this);
-        var transform = new stream.Transform({ objectMode: true });
-        transform._transform = function (index, _enc, done) {
-            return _this.getEntry(filepaths[index], patterns[index]).then(function (entry) {
-                if (entry !== null && filter(entry)) {
-                    transform.push(entry);
-                }
-                if (index === filepaths.length - 1) {
-                    transform.end();
-                }
-                done();
-            });
-        };
-        for (var i = 0; i < filepaths.length; i++) {
-            transform.write(i);
-        }
-        return transform;
-    };
-    /**
-     * Return entry for the provided path.
-     */
-    FileSystemStream.prototype.getEntry = function (filepath, pattern) {
-        var _this = this;
-        return this.getStat(filepath)
-            .then(function (stat) { return _this.makeEntry(stat, pattern); })
-            .catch(function () { return null; });
-    };
-    /**
-     * Return fs.Stats for the provided path.
-     */
-    FileSystemStream.prototype.getStat = function (filepath) {
-        return fsStat.stat(filepath, { throwErrorOnBrokenSymlinks: false });
-    };
-    return FileSystemStream;
-}(fs_1.default));
-exports.default = FileSystemStream;
+// 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')
 
-/***/ }),
-/* 773 */
-/***/ (function(module, exports, __webpack_require__) {
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
 
-"use strict";
+  return wrapper
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(774);
-const statProvider = __webpack_require__(776);
-/**
- * Asynchronous API.
- */
-function stat(path, opts) {
-    return new Promise((resolve, reject) => {
-        statProvider.async(path, optionsManager.prepare(opts), (err, stats) => err ? reject(err) : resolve(stats));
-    });
-}
-exports.stat = stat;
-function statCallback(path, optsOrCallback, callback) {
-    if (typeof optsOrCallback === 'function') {
-        callback = optsOrCallback; /* tslint:disable-line: no-parameter-reassignment */
-        optsOrCallback = undefined; /* tslint:disable-line: no-parameter-reassignment */
+  function wrapper() {
+    var args = new Array(arguments.length)
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i]
     }
-    if (typeof callback === 'undefined') {
-        throw new TypeError('The "callback" argument must be of type Function.');
+    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]
+      })
     }
-    statProvider.async(path, optionsManager.prepare(optsOrCallback), callback);
-}
-exports.statCallback = statCallback;
-/**
- * Synchronous API.
- */
-function statSync(path, opts) {
-    return statProvider.sync(path, optionsManager.prepare(opts));
+    return ret
+  }
 }
-exports.statSync = statSync;
 
 
 /***/ }),
-/* 774 */
+
+/***/ "../../node_modules/write-json-file/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(775);
-function prepare(opts) {
-    const options = Object.assign({
-        fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
-        throwErrorOnBrokenSymlinks: true,
-        followSymlinks: true
-    }, opts);
-    return options;
-}
-exports.prepare = prepare;
+const path = __webpack_require__("path");
+const fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const writeFileAtomic = __webpack_require__("../../node_modules/write-json-file/node_modules/write-file-atomic/index.js");
+const sortKeys = __webpack_require__("../../node_modules/sort-keys/index.js");
+const makeDir = __webpack_require__("../../node_modules/write-json-file/node_modules/make-dir/index.js");
+const pify = __webpack_require__("../../node_modules/pify/index.js");
+const detectIndent = __webpack_require__("../../node_modules/write-json-file/node_modules/detect-indent/index.js");
 
+const init = (fn, filePath, data, options) => {
+	if (!filePath) {
+		throw new TypeError('Expected a filepath');
+	}
 
-/***/ }),
-/* 775 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (data === undefined) {
+		throw new TypeError('Expected data to stringify');
+	}
 
-"use strict";
+	options = Object.assign({
+		indent: '\t',
+		sortKeys: false
+	}, options);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(253);
-exports.FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    stat: fs.stat,
-    lstatSync: fs.lstatSync,
-    statSync: fs.statSync
-};
-function getFileSystemAdapter(fsMethods) {
-    if (!fsMethods) {
-        return exports.FILE_SYSTEM_ADAPTER;
-    }
-    return Object.assign({}, exports.FILE_SYSTEM_ADAPTER, fsMethods);
-}
-exports.getFileSystemAdapter = getFileSystemAdapter;
+	if (options.sortKeys) {
+		data = sortKeys(data, {
+			deep: true,
+			compare: typeof options.sortKeys === 'function' ? options.sortKeys : undefined
+		});
+	}
 
+	return fn(filePath, data, options);
+};
 
-/***/ }),
-/* 776 */
-/***/ (function(module, exports, __webpack_require__) {
+const readFile = filePath => pify(fs.readFile)(filePath, 'utf8').catch(() => {});
 
-"use strict";
+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);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-function sync(path, options) {
-    const lstat = options.fs.lstatSync(path);
-    if (!isFollowedSymlink(lstat, options)) {
-        return lstat;
-    }
-    try {
-        const stat = options.fs.statSync(path);
-        stat.isSymbolicLink = () => true;
-        return stat;
-    }
-    catch (err) {
-        if (!options.throwErrorOnBrokenSymlinks) {
-            return lstat;
-        }
-        throw err;
-    }
-}
-exports.sync = sync;
-function async(path, options, callback) {
-    options.fs.lstat(path, (err0, lstat) => {
-        if (err0) {
-            return callback(err0, undefined);
-        }
-        if (!isFollowedSymlink(lstat, options)) {
-            return callback(null, lstat);
-        }
-        options.fs.stat(path, (err1, stat) => {
-            if (err1) {
-                return options.throwErrorOnBrokenSymlinks ? callback(err1) : callback(null, lstat);
-            }
-            stat.isSymbolicLink = () => true;
-            callback(null, stat);
-        });
-    });
-}
-exports.async = async;
-/**
- * Returns `true` for followed symlink.
- */
-function isFollowedSymlink(stat, options) {
-    return stat.isSymbolicLink() && options.followSymlinks;
-}
-exports.isFollowedSymlink = isFollowedSymlink;
+			return pify(writeFileAtomic)(filePath, `${json}\n`, {mode: options.mode});
+		});
+};
 
+const mainSync = (filePath, data, options) => {
+	let {indent} = options;
 
-/***/ }),
-/* 777 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (options.detectIndent) {
+		try {
+			const file = fs.readFileSync(filePath, 'utf8');
+			indent = detectIndent(file).indent;
+		} catch (error) {
+			if (error.code !== 'ENOENT') {
+				throw error;
+			}
+		}
+	}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-var FileSystem = /** @class */ (function () {
-    function FileSystem(options) {
-        this.options = options;
-    }
-    /**
-     * Return full path to entry.
-     */
-    FileSystem.prototype.getFullEntryPath = function (filepath) {
-        return path.resolve(this.options.cwd, filepath);
-    };
-    /**
-     * Return an implementation of the Entry interface.
-     */
-    FileSystem.prototype.makeEntry = function (stat, pattern) {
-        stat.path = pattern;
-        stat.depth = pattern.split('/').length;
-        return stat;
-    };
-    return FileSystem;
-}());
-exports.default = FileSystem;
+	const json = JSON.stringify(data, options.replacer, indent);
 
+	return writeFileAtomic.sync(filePath, `${json}\n`, {mode: options.mode});
+};
 
-/***/ }),
-/* 778 */
-/***/ (function(module, exports, __webpack_require__) {
+const writeJsonFile = (filePath, data, options) => {
+	return makeDir(path.dirname(filePath), {fs})
+		.then(() => init(main, filePath, data, options));
+};
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    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);
-    };
-    return function (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 });
-var stream = __webpack_require__(294);
-var readdir = __webpack_require__(755);
-var reader_1 = __webpack_require__(768);
-var fs_stream_1 = __webpack_require__(772);
-var TransformStream = /** @class */ (function (_super) {
-    __extends(TransformStream, _super);
-    function TransformStream(reader) {
-        var _this = _super.call(this, { objectMode: true }) || this;
-        _this.reader = reader;
-        return _this;
-    }
-    TransformStream.prototype._transform = function (entry, _encoding, callback) {
-        callback(null, this.reader.transform(entry));
-    };
-    return TransformStream;
-}(stream.Transform));
-var ReaderStream = /** @class */ (function (_super) {
-    __extends(ReaderStream, _super);
-    function ReaderStream() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(ReaderStream.prototype, "fsAdapter", {
-        /**
-         * Returns FileSystem adapter.
-         */
-        get: function () {
-            return new fs_stream_1.default(this.options);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * Use stream API to read entries for Task.
-     */
-    ReaderStream.prototype.read = function (task) {
-        var _this = this;
-        var root = this.getRootDirectory(task);
-        var options = this.getReaderOptions(task);
-        var transform = new TransformStream(this);
-        var readable = this.api(root, task, options);
-        return readable
-            .on('error', function (err) { return _this.isEnoentCodeError(err) ? null : transform.emit('error', err); })
-            .pipe(transform);
-    };
-    /**
-     * Returns founded paths.
-     */
-    ReaderStream.prototype.api = function (root, task, options) {
-        if (task.dynamic) {
-            return this.dynamicApi(root, options);
-        }
-        return this.staticApi(task, options);
-    };
-    /**
-     * Api for dynamic tasks.
-     */
-    ReaderStream.prototype.dynamicApi = function (root, options) {
-        return readdir.readdirStreamStat(root, options);
-    };
-    /**
-     * Api for static tasks.
-     */
-    ReaderStream.prototype.staticApi = function (task, options) {
-        return this.fsAdapter.read(task.patterns, options.filter);
-    };
-    return ReaderStream;
-}(reader_1.default));
-exports.default = ReaderStream;
+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);
+};
 
 
 /***/ }),
-/* 779 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    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);
-    };
-    return function (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 });
-var readdir = __webpack_require__(755);
-var reader_1 = __webpack_require__(768);
-var fs_sync_1 = __webpack_require__(780);
-var ReaderSync = /** @class */ (function (_super) {
-    __extends(ReaderSync, _super);
-    function ReaderSync() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(ReaderSync.prototype, "fsAdapter", {
-        /**
-         * Returns FileSystem adapter.
-         */
-        get: function () {
-            return new fs_sync_1.default(this.options);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * Use sync API to read entries for Task.
-     */
-    ReaderSync.prototype.read = function (task) {
-        var root = this.getRootDirectory(task);
-        var options = this.getReaderOptions(task);
-        try {
-            var entries = this.api(root, task, options);
-            return entries.map(this.transform, this);
-        }
-        catch (err) {
-            if (this.isEnoentCodeError(err)) {
-                return [];
-            }
-            throw err;
-        }
-    };
-    /**
-     * Returns founded paths.
-     */
-    ReaderSync.prototype.api = function (root, task, options) {
-        if (task.dynamic) {
-            return this.dynamicApi(root, options);
-        }
-        return this.staticApi(task, options);
-    };
-    /**
-     * Api for dynamic tasks.
-     */
-    ReaderSync.prototype.dynamicApi = function (root, options) {
-        return readdir.readdirSyncStat(root, options);
-    };
-    /**
-     * Api for static tasks.
-     */
-    ReaderSync.prototype.staticApi = function (task, options) {
-        return this.fsAdapter.read(task.patterns, options.filter);
-    };
-    return ReaderSync;
-}(reader_1.default));
-exports.default = ReaderSync;
 
-
-/***/ }),
-/* 780 */
+/***/ "../../node_modules/write-json-file/node_modules/detect-indent/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    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);
-    };
-    return function (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 });
-var fsStat = __webpack_require__(773);
-var fs_1 = __webpack_require__(777);
-var FileSystemSync = /** @class */ (function (_super) {
-    __extends(FileSystemSync, _super);
-    function FileSystemSync() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * Use sync API to read entries for Task.
-     */
-    FileSystemSync.prototype.read = function (patterns, filter) {
-        var _this = this;
-        var entries = [];
-        patterns.forEach(function (pattern) {
-            var filepath = _this.getFullEntryPath(pattern);
-            var entry = _this.getEntry(filepath, pattern);
-            if (entry === null || !filter(entry)) {
-                return;
-            }
-            entries.push(entry);
-        });
-        return entries;
-    };
-    /**
-     * Return entry for the provided path.
-     */
-    FileSystemSync.prototype.getEntry = function (filepath, pattern) {
-        try {
-            var stat = this.getStat(filepath);
-            return this.makeEntry(stat, pattern);
-        }
-        catch (err) {
-            return null;
-        }
-    };
-    /**
-     * Return fs.Stats for the provided path.
-     */
-    FileSystemSync.prototype.getStat = function (filepath) {
-        return fsStat.statSync(filepath, { throwErrorOnBrokenSymlinks: false });
-    };
-    return FileSystemSync;
-}(fs_1.default));
-exports.default = FileSystemSync;
 
 
-/***/ }),
-/* 781 */
-/***/ (function(module, exports, __webpack_require__) {
+// detect either spaces or tabs but not both to properly handle tabs
+// for indentation and spaces for alignment
+const INDENT_RE = /^(?:( )+|\t+)/;
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Flatten nested arrays (max depth is 2) into a non-nested array of non-array items.
- */
-function flatten(items) {
-    return items.reduce(function (collection, item) { return [].concat(collection, item); }, []);
-}
-exports.flatten = flatten;
+function getMostUsed(indents) {
+	let result = 0;
+	let maxUsed = 0;
+	let maxWeight = 0;
 
+	for (const entry of indents) {
+		// TODO: use destructuring when targeting Node.js 6
+		const key = entry[0];
+		const val = entry[1];
 
-/***/ }),
-/* 782 */
-/***/ (function(module, exports, __webpack_require__) {
+		const u = val[0];
+		const w = val[1];
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(364);
-/**
- * Merge multiple streams and propagate their errors into one stream in parallel.
- */
-function merge(streams) {
-    var mergedStream = merge2(streams);
-    streams.forEach(function (stream) {
-        stream.on('error', function (err) { return mergedStream.emit('error', err); });
-    });
-    return mergedStream;
-}
-exports.merge = merge;
+		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
+			maxUsed = u;
+			maxWeight = w;
+			result = Number(key);
+		}
+	}
 
+	return result;
+}
 
-/***/ }),
-/* 783 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = str => {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-"use strict";
+	// used to see if tabs or spaces are the most used
+	let tabs = 0;
+	let spaces = 0;
 
-const path = __webpack_require__(4);
-const pathType = __webpack_require__(784);
+	// remember the size of previous line's indentation
+	let prev = 0;
 
-const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+	// 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();
 
-const getPath = (filepath, cwd) => {
-	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
-	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
-};
+	// pointer to the array of last used indent
+	let current;
 
-const addExtensions = (file, extensions) => {
-	if (path.extname(file)) {
-		return `**/${file}`;
-	}
+	// whether the last action was an indent (opposed to an unindent)
+	let isIndent;
 
-	return `**/${file}.${getExtensions(extensions)}`;
-};
+	for (const line of str.split(/\n/g)) {
+		if (!line) {
+			// ignore empty lines
+			continue;
+		}
 
-const getGlob = (dir, opts) => {
-	if (opts.files && !Array.isArray(opts.files)) {
-		throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof opts.files}\``);
-	}
+		let indent;
+		const matches = line.match(INDENT_RE);
 
-	if (opts.extensions && !Array.isArray(opts.extensions)) {
-		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof opts.extensions}\``);
-	}
+		if (matches) {
+			indent = matches[0].length;
 
-	if (opts.files && opts.extensions) {
-		return opts.files.map(x => path.join(dir, addExtensions(x, opts.extensions)));
-	}
+			if (matches[1]) {
+				spaces++;
+			} else {
+				tabs++;
+			}
+		} else {
+			indent = 0;
+		}
 
-	if (opts.files) {
-		return opts.files.map(x => path.join(dir, `**/${x}`));
-	}
+		const diff = indent - prev;
+		prev = indent;
 
-	if (opts.extensions) {
-		return [path.join(dir, `**/*.${getExtensions(opts.extensions)}`)];
-	}
+		if (diff) {
+			// an indent or unindent has been detected
 
-	return [path.join(dir, '**')];
-};
+			isIndent = diff > 0;
 
-module.exports = (input, opts) => {
-	opts = Object.assign({cwd: process.cwd()}, opts);
+			current = indents.get(isIndent ? diff : -diff);
 
-	if (typeof opts.cwd !== 'string') {
-		return Promise.reject(new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof opts.cwd}\``));
+			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);
+		}
 	}
 
-	return Promise.all([].concat(input).map(x => pathType.dir(getPath(x, opts.cwd))
-		.then(isDir => isDir ? getGlob(x, opts) : x)))
-		.then(globs => [].concat.apply([], globs));
-};
-
-module.exports.sync = (input, opts) => {
-	opts = Object.assign({cwd: process.cwd()}, opts);
+	const amount = getMostUsed(indents);
 
-	if (typeof opts.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof opts.cwd}\``);
+	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);
 	}
 
-	const globs = [].concat(input).map(x => pathType.dirSync(getPath(x, opts.cwd)) ? getGlob(x, opts) : x);
-	return [].concat.apply([], globs);
+	return {
+		amount,
+		type,
+		indent
+	};
 };
 
 
 /***/ }),
-/* 784 */
+
+/***/ "../../node_modules/write-json-file/node_modules/make-dir/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const fs = __webpack_require__(253);
-const pify = __webpack_require__(785);
-
-function type(fn, fn2, fp) {
-	if (typeof fp !== 'string') {
-		return Promise.reject(new TypeError(`Expected a string, got ${typeof fp}`));
-	}
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const pify = __webpack_require__("../../node_modules/pify/index.js");
+const semver = __webpack_require__("../../node_modules/write-json-file/node_modules/semver/semver.js");
 
-	return pify(fs[fn])(fp)
-		.then(stats => stats[fn2]())
-		.catch(err => {
-			if (err.code === 'ENOENT') {
-				return false;
-			}
+const defaults = {
+	mode: 0o777 & (~process.umask()),
+	fs
+};
 
-			throw err;
-		});
-}
+const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
 
-function typeSync(fn, fn2, fp) {
-	if (typeof fp !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof fp}`);
-	}
+// 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, ''));
 
-	try {
-		return fs[fn](fp)[fn2]();
-	} catch (err) {
-		if (err.code === 'ENOENT') {
-			return false;
+		if (pathHasInvalidWinCharacters) {
+			const error = new Error(`Path contains invalid characters: ${pth}`);
+			error.code = 'EINVAL';
+			throw error;
 		}
-
-		throw err;
 	}
-}
-
-exports.file = type.bind(null, 'stat', 'isFile');
-exports.dir = type.bind(null, 'stat', 'isDirectory');
-exports.symlink = type.bind(null, 'lstat', 'isSymbolicLink');
-exports.fileSync = typeSync.bind(null, 'statSync', 'isFile');
-exports.dirSync = typeSync.bind(null, 'statSync', 'isDirectory');
-exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
-
+};
 
-/***/ }),
-/* 785 */
-/***/ (function(module, exports, __webpack_require__) {
+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;
+};
 
-"use strict";
+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);
 
-const processFn = (fn, opts) => function () {
-	const P = opts.promiseModule;
-	const args = new Array(arguments.length);
+	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
+		const pth = path.resolve(input);
 
-	for (let i = 0; i < arguments.length; i++) {
-		args[i] = arguments[i];
+		return mkdir(pth, {
+			mode: options.mode,
+			recursive: true
+		}).then(() => pth);
 	}
 
-	return new P((resolve, reject) => {
-		if (opts.errorFirst) {
-			args.push(function (err, result) {
-				if (opts.multiArgs) {
-					const results = new Array(arguments.length - 1);
+	const make = pth => {
+		return mkdir(pth, options.mode)
+			.then(() => pth)
+			.catch(error => {
+				if (error.code === 'EPERM') {
+					throw error;
+				}
 
-					for (let i = 1; i < arguments.length; i++) {
-						results[i - 1] = arguments[i];
+				if (error.code === 'ENOENT') {
+					if (path.dirname(pth) === pth) {
+						throw permissionError(pth);
 					}
 
-					if (err) {
-						results.unshift(err);
-						reject(results);
-					} else {
-						resolve(results);
+					if (error.message.includes('null bytes')) {
+						throw error;
 					}
-				} else if (err) {
-					reject(err);
-				} else {
-					resolve(result);
+
+					return make(path.dirname(pth)).then(() => make(pth));
 				}
+
+				return stat(pth)
+					.then(stats => stats.isDirectory() ? pth : Promise.reject())
+					.catch(() => {
+						throw error;
+					});
 			});
-		} else {
-			args.push(function (result) {
-				if (opts.multiArgs) {
-					const results = new Array(arguments.length - 1);
+	};
 
-					for (let i = 0; i < arguments.length; i++) {
-						results[i] = arguments[i];
-					}
+	return make(path.resolve(input));
+});
 
-					resolve(results);
-				} else {
-					resolve(result);
-				}
-			});
-		}
+module.exports = makeDir;
+module.exports.default = makeDir;
 
-		fn.apply(this, args);
-	});
-};
+module.exports.sync = (input, options) => {
+	checkPath(input);
+	options = Object.assign({}, defaults, options);
 
-module.exports = (obj, opts) => {
-	opts = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, opts);
+	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
+		const pth = path.resolve(input);
 
-	const filter = key => {
-		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		return opts.include ? opts.include.some(match) : !opts.exclude.some(match);
-	};
+		fs.mkdirSync(pth, {
+			mode: options.mode,
+			recursive: true
+		});
 
-	let ret;
-	if (typeof obj === 'function') {
-		ret = function () {
-			if (opts.excludeMain) {
-				return obj.apply(this, arguments);
+		return pth;
+	}
+
+	const make = pth => {
+		try {
+			options.fs.mkdirSync(pth, options.mode);
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
 			}
 
-			return processFn(obj, opts).apply(this, arguments);
-		};
-	} else {
-		ret = Object.create(Object.getPrototypeOf(obj));
-	}
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
 
-	for (const key in obj) { // eslint-disable-line guard-for-in
-		const x = obj[key];
-		ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x;
-	}
+				if (error.message.includes('null bytes')) {
+					throw error;
+				}
 
-	return ret;
-};
+				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;
+			}
+		}
 
-/***/ }),
-/* 786 */
-/***/ (function(module, exports, __webpack_require__) {
+		return pth;
+	};
 
-"use strict";
+	return make(path.resolve(input));
+};
 
-const fs = __webpack_require__(253);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(600);
-const gitIgnore = __webpack_require__(787);
-const pify = __webpack_require__(526);
-const slash = __webpack_require__(788);
 
-const DEFAULT_IGNORE = [
-	'**/node_modules/**',
-	'**/bower_components/**',
-	'**/flow-typed/**',
-	'**/coverage/**',
-	'**/.git'
-];
+/***/ }),
 
-const readFileP = pify(fs.readFile);
+/***/ "../../node_modules/write-json-file/node_modules/semver/semver.js":
+/***/ (function(module, exports) {
 
-const mapGitIgnorePatternTo = base => ignore => {
-	if (ignore.startsWith('!')) {
-		return '!' + path.posix.join(base, ignore.slice(1));
-	}
+exports = module.exports = SemVer
 
-	return path.posix.join(base, ignore);
-};
+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 parseGitIgnore = (content, options) => {
-	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+// 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'
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => line.charAt(0) !== '#')
-		.map(mapGitIgnorePatternTo(base));
-};
+var MAX_LENGTH = 256
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+  /* istanbul ignore next */ 9007199254740991
 
-const reduceIgnore = files => {
-	return files.reduce((ignores, file) => {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-		return ignores;
-	}, gitIgnore());
-};
+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, p)));
-};
+// The actual regexps go on exports.re
+var re = exports.re = []
+var src = exports.src = []
+var R = 0
 
-const getFile = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	return readFileP(filePath, 'utf8')
-		.then(content => ({
-			content,
-			cwd,
-			filePath
-		}));
-};
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-	return {
-		content,
-		cwd,
-		filePath
-	};
-};
+var NUMERICIDENTIFIER = R++
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
+var NUMERICIDENTIFIERLOOSE = R++
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
-const normalizeOptions = (options = {}) => {
-	const ignore = options.ignore || [];
-	const cwd = options.cwd || process.cwd();
-	return {ignore, cwd};
-};
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
-module.exports = options => {
-	options = normalizeOptions(options);
+var NONNUMERICIDENTIFIER = R++
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-	return fastGlob('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	})
-		.then(paths => Promise.all(paths.map(file => getFile(file, options.cwd))))
-		.then(files => reduceIgnore(files))
-		.then(ignores => getIsIgnoredPredecate(ignores, options.cwd));
-};
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
-module.exports.sync = options => {
-	options = normalizeOptions(options);
+var MAINVERSION = R++
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')'
 
-	const paths = fastGlob.sync('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
-	const files = paths.map(file => getFileSync(file, options.cwd));
-	const ignores = reduceIgnore(files);
+var MAINVERSIONLOOSE = R++
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
+var PRERELEASEIDENTIFIER = R++
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-/***/ }),
-/* 787 */
-/***/ (function(module, exports) {
+var PRERELEASEIDENTIFIERLOOSE = R++
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-// A simple implementation of make-array
-function make_array (subject) {
-  return Array.isArray(subject)
-    ? subject
-    : [subject]
-}
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
-const REGEX_BLANK_LINE = /^\s+$/
-const REGEX_LEADING_EXCAPED_EXCLAMATION = /^\\!/
-const REGEX_LEADING_EXCAPED_HASH = /^\\#/
-const SLASH = '/'
-const KEY_IGNORE = typeof Symbol !== 'undefined'
-  ? Symbol.for('node-ignore')
-  /* istanbul ignore next */
-  : 'node-ignore'
+var PRERELEASE = R++
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
 
-const define = (object, key, value) =>
-  Object.defineProperty(object, key, {value})
+var PRERELEASELOOSE = R++
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-// 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.
-    : ''
-)
+var BUILDIDENTIFIER = R++
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-// > 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`
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-// '`foo/`' should not continue with the '`..`'
-const DEFAULT_REPLACER_PREFIX = [
+var BUILD = R++
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
 
-  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
-  [
-    // (a\ ) -> (a )
-    // (a  ) -> (a)
-    // (a \ ) -> (a  )
-    /\\?\s+$/,
-    match => match.indexOf('\\') === 0
-      ? ' '
-      : ''
-  ],
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
 
-  // replace (\ ) with ' '
-  [
-    /\\\s/g,
-    () => ' '
-  ],
+// 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.
 
-  // Escape metacharacters
-  // which is written down by users but means special for regular expressions.
+var FULL = R++
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?'
 
-  // > 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}`
-  ],
+src[FULL] = '^' + FULLPLAIN + '$'
 
-  [
-    // > [abc] matches any character inside the brackets
-    // >    (in this case a, b, or c);
-    /\[([^\]/]*)($|\])/g,
-    (match, p1, p2) => p2 === ']'
-      ? `[${sanitizeRange(p1)}]`
-      : `\\${match}`
-  ],
+// 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] + '?'
 
-  [
-    // > a question mark (?) matches a single character
-    /(?!\\)\?/g,
-    () => '[^/]'
-  ],
+var LOOSE = R++
+src[LOOSE] = '^' + LOOSEPLAIN + '$'
 
-  // leading slash
-  [
+var GTLT = R++
+src[GTLT] = '((?:<|>)?=?)'
 
-    // > 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
-    /^\//,
-    () => '^'
-  ],
+// 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|\\*'
 
-  // replace special metacharacter slash after the leading slash
-  [
-    /\//g,
-    () => '\\/'
-  ],
+var XRANGEPLAIN = R++
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?'
 
-  [
-    // > 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 '\\*'
-    /^\^*\\\*\\\*\\\//,
+var XRANGEPLAINLOOSE = R++
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?'
 
-    // '**/foo' <-> 'foo'
-    () => '^(?:.*\\/)?'
-  ]
-]
+var XRANGE = R++
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
+var XRANGELOOSE = R++
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
 
-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
-        ? '(?:^|\\/)'
+// 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])'
 
-        // > Otherwise, Git treats the pattern as a shell glob suitable for
-        // >   consumption by fnmatch(3)
-        : '^'
-    }
-  ],
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++
+src[LONETILDE] = '(?:~>?)'
 
-  // two globstars
-  [
-    // Use lookahead assertions so that we could match more than one `'/**'`
-    /\\\/\\\*\\\*(?=\\\/|$)/g,
+var TILDETRIM = R++
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
+var tildeTrimReplace = '$1~'
 
-    // Zero, one or several directories
-    // should not use '*', or it will be replaced by the next replacer
+var TILDE = R++
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
+var TILDELOOSE = R++
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
 
-    // Check if it is not the last `'/**'`
-    (match, index, str) => index + 6 < str.length
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++
+src[LONECARET] = '(?:\\^)'
 
-      // 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 CARETTRIM = R++
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
+var caretTrimReplace = '$1^'
 
-      // case: /**
-      // > A trailing `"/**"` matches everything inside.
+var CARET = R++
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
+var CARETLOOSE = R++
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
 
-      // #21: everything inside but it should not include the current folder
-      : '\\/.+'
-  ],
+// 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 + ')$|^$'
 
-  // intermediate wildcards
-  [
-    // Never replace escaped '*'
-    // ignore rule '\*' will match the path '*'
+// 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] + ')'
 
-    // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
+var comparatorTrimReplace = '$1$2$3'
 
-    // '*.js' matches '.js'
-    // '*.js' doesn't match 'abc'
-    (match, p1) => `${p1}[^\\/]*`
-  ],
+// 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*$'
 
-  // trailing wildcard
-  [
-    /(\^|\\\/)?\\\*$/,
-    (match, p1) => {
-      const prefix = p1
-        // '\^':
-        // '/*' does not match ''
-        // '/*' does not match everything
+var HYPHENRANGELOOSE = R++
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$'
 
-        // '\\\/':
-        // 'abc/*' does not match 'abc/'
-        ? `${p1}[^/]+`
+// Star ranges basically just allow anything at all.
+var STAR = R++
+src[STAR] = '(<|>)?=?\\s*\\*'
 
-        // 'a*' matches 'a'
-        // 'a*' matches 'aa'
-        : '[^/]*'
+// 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])
+  }
+}
 
-      return `${prefix}(?=$|\\/$)`
+exports.parse = parse
+function parse (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
     }
-  ],
-
-  [
-    // 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(/|$)
+  if (version instanceof SemVer) {
+    return version
+  }
 
-  // ending
-  [
-    // 'js' will not match 'js.'
-    // 'ab' will not match 'abc'
-    /(?:[^*/])$/,
+  if (typeof version !== 'string') {
+    return null
+  }
 
-    // 'js*' will not match 'a.js'
-    // 'js/' will not match 'a.js'
-    // 'js' will match 'a.js' and 'a.js/'
-    match => `${match}(?=$|\\/)`
-  ],
+  if (version.length > MAX_LENGTH) {
+    return null
+  }
 
-  ...DEFAULT_REPLACER_SUFFIX
-]
+  var r = options.loose ? re[LOOSE] : re[FULL]
+  if (!r.test(version)) {
+    return null
+  }
 
-const NEGATIVE_REPLACERS = [
-  ...DEFAULT_REPLACER_PREFIX,
+  try {
+    return new SemVer(version, options)
+  } catch (er) {
+    return null
+  }
+}
 
-  // #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.
+exports.valid = valid
+function valid (version, options) {
+  var v = parse(version, options)
+  return v ? v.version : null
+}
 
-  // eg:
-  // ['node_modules/*', '!node_modules']
-  // should ignore `node_modules/a.js`
-  [
-    /(?:[^*])$/,
-    match => `${match}(?=$|\\/$)`
-  ],
+exports.clean = clean
+function clean (version, options) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
+  return s ? s.version : null
+}
 
-  ...DEFAULT_REPLACER_SUFFIX
-]
+exports.SemVer = SemVer
 
-// A simple cache, because an ignore rule only has only one certain meaning
-const cache = Object.create(null)
+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)
+  }
 
-// @param {pattern}
-const make_regex = (pattern, negative, ignorecase) => {
-  const r = cache[pattern]
-  if (r) {
-    return r
+  if (version.length > MAX_LENGTH) {
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
   }
 
-  const replacers = negative
-    ? NEGATIVE_REPLACERS
-    : POSITIVE_REPLACERS
+  if (!(this instanceof SemVer)) {
+    return new SemVer(version, options)
+  }
 
-  const source = replacers.reduce(
-    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
-    pattern
-  )
+  debug('SemVer', version, options)
+  this.options = options
+  this.loose = !!options.loose
 
-  return cache[pattern] = ignorecase
-    ? new RegExp(source, 'i')
-    : new RegExp(source)
-}
+  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
 
-// > A blank line matches no files, so it can serve as a separator for readability.
-const checkPattern = pattern => pattern
-  && typeof pattern === 'string'
-  && !REGEX_BLANK_LINE.test(pattern)
+  if (!m) {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-  // > A line starting with # serves as a comment.
-  && pattern.indexOf('#') !== 0
+  this.raw = version
 
-const createRule = (pattern, ignorecase) => {
-  const origin = pattern
-  let negative = false
+  // these are actually numbers
+  this.major = +m[1]
+  this.minor = +m[2]
+  this.patch = +m[3]
 
-  // > An optional prefix "!" which negates the pattern;
-  if (pattern.indexOf('!') === 0) {
-    negative = true
-    pattern = pattern.substr(1)
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
+    throw new TypeError('Invalid major version')
   }
 
-  pattern = pattern
-  // > Put a backslash ("\") in front of the first "!" for patterns that
-  // >   begin with a literal "!", for example, `"\!important!.txt"`.
-  .replace(REGEX_LEADING_EXCAPED_EXCLAMATION, '!')
-  // > Put a backslash ("\") in front of the first hash for patterns that
-  // >   begin with a hash.
-  .replace(REGEX_LEADING_EXCAPED_HASH, '#')
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+    throw new TypeError('Invalid minor version')
+  }
 
-  const regex = make_regex(pattern, negative, ignorecase)
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+    throw new TypeError('Invalid patch version')
+  }
 
-  return {
-    origin,
-    pattern,
-    negative,
-    regex
+  // 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()
 }
 
-class IgnoreBase {
-  constructor ({
-    ignorecase = true
-  } = {}) {
-    this._rules = []
-    this._ignorecase = ignorecase
-    define(this, KEY_IGNORE, true)
-    this._initCache()
+SemVer.prototype.format = function () {
+  this.version = this.major + '.' + this.minor + '.' + this.patch
+  if (this.prerelease.length) {
+    this.version += '-' + this.prerelease.join('.')
   }
+  return this.version
+}
 
-  _initCache () {
-    this._cache = Object.create(null)
-  }
+SemVer.prototype.toString = function () {
+  return this.version
+}
 
-  // @param {Array.<string>|string|Ignore} pattern
-  add (pattern) {
-    this._added = false
+SemVer.prototype.compare = function (other) {
+  debug('SemVer.compare', this.version, this.options, other)
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-    if (typeof pattern === 'string') {
-      pattern = pattern.split(/\r?\n/g)
-    }
+  return this.compareMain(other) || this.comparePre(other)
+}
 
-    make_array(pattern).forEach(this._addPattern, this)
+SemVer.prototype.compareMain = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-    // Some rules have just added to the ignore,
-    // making the behavior changed.
-    if (this._added) {
-      this._initCache()
-    }
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch)
+}
 
-    return this
+SemVer.prototype.comparePre = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
   }
 
-  // legacy
-  addPattern (pattern) {
-    return this.add(pattern)
+  // 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
   }
 
-  _addPattern (pattern) {
-    // #32
-    if (pattern && pattern[KEY_IGNORE]) {
-      this._rules = this._rules.concat(pattern._rules)
-      this._added = true
-      return
+  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)
+}
 
-    if (checkPattern(pattern)) {
-      const rule = createRule(pattern, this._ignorecase)
-      this._added = true
-      this._rules.push(rule)
-    }
-  }
+// 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
 
-  filter (paths) {
-    return make_array(paths).filter(path => this._filter(path))
-  }
+    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
 
-  createFilter () {
-    return path => this._filter(path)
+    default:
+      throw new Error('invalid increment argument: ' + release)
   }
+  this.format()
+  this.raw = this.version
+  return this
+}
 
-  ignores (path) {
-    return !this._filter(path)
+exports.inc = inc
+function inc (version, release, loose, identifier) {
+  if (typeof (loose) === 'string') {
+    identifier = loose
+    loose = undefined
   }
 
-  // @returns `Boolean` true if the `path` is NOT ignored
-  _filter (path, slices) {
-    if (!path) {
-      return false
-    }
+  try {
+    return new SemVer(version, loose).inc(release, identifier).version
+  } catch (er) {
+    return null
+  }
+}
 
-    if (path in this._cache) {
-      return this._cache[path]
+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'
     }
-
-    if (!slices) {
-      // path/to/a.js
-      // ['path', 'to', 'a.js']
-      slices = path.split(SLASH)
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return prefix + key
+        }
+      }
     }
-
-    slices.pop()
-
-    return this._cache[path] = slices.length
-      // > It is not possible to re-include a file if a parent directory of
-      // >   that file is excluded.
-      // If the path contains a parent directory, check the parent first
-      ? this._filter(slices.join(SLASH) + SLASH, slices)
-        && this._test(path)
-
-      // Or only test the path
-      : this._test(path)
+    return defaultResult // may be undefined
   }
+}
 
-  // @returns {Boolean} true if a file is NOT ignored
-  _test (path) {
-    // Explicitly define variable type by setting matched to `0`
-    let matched = 0
+exports.compareIdentifiers = compareIdentifiers
 
-    this._rules.forEach(rule => {
-      // if matched = true, then we only test negative rules
-      // if matched = false, then we test non-negative rules
-      if (!(matched ^ rule.negative)) {
-        matched = rule.negative ^ rule.regex.test(path)
-      }
-    })
+var numeric = /^[0-9]+$/
+function compareIdentifiers (a, b) {
+  var anum = numeric.test(a)
+  var bnum = numeric.test(b)
 
-    return !matched
+  if (anum && bnum) {
+    a = +a
+    b = +b
   }
-}
 
-// 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'
-  )
-) {
-  const filter = IgnoreBase.prototype._filter
+  return a === b ? 0
+    : (anum && !bnum) ? -1
+    : (bnum && !anum) ? 1
+    : a < b ? -1
+    : 1
+}
 
-  /* eslint no-control-regex: "off" */
-  const make_posix = str => /^\\\\\?\\/.test(str)
-  || /[^\x00-\x80]+/.test(str)
-    ? str
-    : str.replace(/\\/g, '/')
+exports.rcompareIdentifiers = rcompareIdentifiers
+function rcompareIdentifiers (a, b) {
+  return compareIdentifiers(b, a)
+}
 
-  IgnoreBase.prototype._filter = function filterWin32 (path, slices) {
-    path = make_posix(path)
-    return filter.call(this, path, slices)
-  }
+exports.major = major
+function major (a, loose) {
+  return new SemVer(a, loose).major
 }
 
-module.exports = options => new IgnoreBase(options)
+exports.minor = minor
+function minor (a, loose) {
+  return new SemVer(a, loose).minor
+}
 
+exports.patch = patch
+function patch (a, loose) {
+  return new SemVer(a, loose).patch
+}
 
-/***/ }),
-/* 788 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.compare = compare
+function compare (a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose))
+}
 
-"use strict";
+exports.compareLoose = compareLoose
+function compareLoose (a, b) {
+  return compare(a, b, true)
+}
 
-module.exports = input => {
-	const isExtendedLengthPath = /^\\\\\?\\/.test(input);
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(input); // eslint-disable-line no-control-regex
+exports.rcompare = rcompare
+function rcompare (a, b, loose) {
+  return compare(b, a, loose)
+}
 
-	if (isExtendedLengthPath || hasNonAscii) {
-		return input;
-	}
+exports.sort = sort
+function sort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.compare(a, b, loose)
+  })
+}
 
-	return input.replace(/\\/g, '/');
-};
+exports.rsort = rsort
+function rsort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.rcompare(a, b, loose)
+  })
+}
 
+exports.gt = gt
+function gt (a, b, loose) {
+  return compare(a, b, loose) > 0
+}
 
-/***/ }),
-/* 789 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.lt = lt
+function lt (a, b, loose) {
+  return compare(a, b, loose) < 0
+}
 
-"use strict";
-/*!
- * has-glob <https://github.com/jonschlinkert/has-glob>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+exports.eq = eq
+function eq (a, b, loose) {
+  return compare(a, b, loose) === 0
+}
 
+exports.neq = neq
+function neq (a, b, loose) {
+  return compare(a, b, loose) !== 0
+}
 
+exports.gte = gte
+function gte (a, b, loose) {
+  return compare(a, b, loose) >= 0
+}
 
-var isGlob = __webpack_require__(790);
+exports.lte = lte
+function lte (a, b, loose) {
+  return compare(a, b, loose) <= 0
+}
 
-module.exports = function hasGlob(val) {
-  if (val == null) return false;
-  if (typeof val === 'string') {
-    return isGlob(val);
-  }
-  if (Array.isArray(val)) {
-    var len = val.length;
-    while (len--) {
-      if (isGlob(val[len])) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
+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
 
-/***/ }),
-/* 790 */
-/***/ (function(module, exports, __webpack_require__) {
+    case '':
+    case '=':
+    case '==':
+      return eq(a, b, loose)
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+    case '!=':
+      return neq(a, b, loose)
 
-var isExtglob = __webpack_require__(388);
+    case '>':
+      return gt(a, b, loose)
 
-module.exports = function isGlob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+    case '>=':
+      return gte(a, b, loose)
 
-  if (isExtglob(str)) return true;
+    case '<':
+      return lt(a, b, loose)
 
-  var regex = /(\\).|([*?]|\[.*\]|\{.*\}|\(.*\|.*\)|^!)/;
-  var match;
+    case '<=':
+      return lte(a, b, loose)
 
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
+    default:
+      throw new TypeError('Invalid operator: ' + op)
   }
-  return false;
-};
+}
 
+exports.Comparator = Comparator
+function Comparator (comp, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-/***/ }),
-/* 791 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (comp instanceof Comparator) {
+    if (comp.loose === !!options.loose) {
+      return comp
+    } else {
+      comp = comp.value
+    }
+  }
 
-"use strict";
+  if (!(this instanceof Comparator)) {
+    return new Comparator(comp, options)
+  }
 
-const path = __webpack_require__(4);
-const {constants: fsConstants} = __webpack_require__(253);
-const pEvent = __webpack_require__(792);
-const CpFileError = __webpack_require__(795);
-const fs = __webpack_require__(797);
-const ProgressEmitter = __webpack_require__(800);
+  debug('comparator', comp, options)
+  this.options = options
+  this.loose = !!options.loose
+  this.parse(comp)
 
-const cpFileAsync = async (source, destination, options, progressEmitter) => {
-	let readError;
-	const stat = await fs.stat(source);
-	progressEmitter.size = stat.size;
+  if (this.semver === ANY) {
+    this.value = ''
+  } else {
+    this.value = this.operator + this.semver.version
+  }
 
-	const read = await fs.createReadStream(source);
-	await fs.makeDir(path.dirname(destination));
-	const write = fs.createWriteStream(destination, {flags: options.overwrite ? 'w' : 'wx'});
-	read.on('data', () => {
-		progressEmitter.written = write.bytesWritten;
-	});
-	read.once('error', error => {
-		readError = new CpFileError(`Cannot read from \`${source}\`: ${error.message}`, error);
-		write.end();
-	});
+  debug('comp', this)
+}
 
-	let updateStats = false;
-	try {
-		const writePromise = pEvent(write, 'close');
-		read.pipe(write);
-		await writePromise;
-		progressEmitter.written = progressEmitter.size;
-		updateStats = true;
-	} catch (error) {
-		if (options.overwrite || error.code !== 'EEXIST') {
-			throw new CpFileError(`Cannot write to \`${destination}\`: ${error.message}`, error);
-		}
-	}
+var ANY = {}
+Comparator.prototype.parse = function (comp) {
+  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var m = comp.match(r)
 
-	if (readError) {
-		throw readError;
-	}
+  if (!m) {
+    throw new TypeError('Invalid comparator: ' + comp)
+  }
 
-	if (updateStats) {
-		const stats = await fs.lstat(source);
+  this.operator = m[1]
+  if (this.operator === '=') {
+    this.operator = ''
+  }
 
-		return Promise.all([
-			fs.utimes(destination, stats.atime, stats.mtime),
-			fs.chmod(destination, stats.mode),
-			fs.chown(destination, stats.uid, stats.gid)
-		]);
-	}
-};
+  // 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)
+  }
+}
 
-const cpFile = (source, destination, options) => {
-	if (!source || !destination) {
-		return Promise.reject(new CpFileError('`source` and `destination` required'));
-	}
+Comparator.prototype.toString = function () {
+  return this.value
+}
 
-	options = {
-		overwrite: true,
-		...options
-	};
+Comparator.prototype.test = function (version) {
+  debug('Comparator.test', version, this.options.loose)
 
-	const progressEmitter = new ProgressEmitter(path.resolve(source), path.resolve(destination));
-	const promise = cpFileAsync(source, destination, options, progressEmitter);
-	promise.on = (...args) => {
-		progressEmitter.on(...args);
-		return promise;
-	};
+  if (this.semver === ANY) {
+    return true
+  }
 
-	return promise;
-};
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-module.exports = cpFile;
+  return cmp(version, this.operator, this.semver, this.options)
+}
 
-const checkSourceIsFile = (stat, source) => {
-	if (stat.isDirectory()) {
-		throw Object.assign(new CpFileError(`EISDIR: illegal operation on a directory '${source}'`), {
-			errno: -21,
-			code: 'EISDIR',
-			source
-		});
-	}
-};
+Comparator.prototype.intersects = function (comp, options) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required')
+  }
 
-const fixupAttributes = (destination, stat) => {
-	fs.chmodSync(destination, stat.mode);
-	fs.chownSync(destination, stat.uid, stat.gid);
-};
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-module.exports.sync = (source, destination, options) => {
-	if (!source || !destination) {
-		throw new CpFileError('`source` and `destination` required');
-	}
+  var rangeTmp
 
-	options = {
-		overwrite: true,
-		...options
-	};
+  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)
+  }
 
-	const stat = fs.statSync(source);
-	checkSourceIsFile(stat, source);
-	fs.makeDirSync(path.dirname(destination));
+  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 flags = options.overwrite ? null : fsConstants.COPYFILE_EXCL;
-	try {
-		fs.copyFileSync(source, destination, flags);
-	} catch (error) {
-		if (!options.overwrite && error.code === 'EEXIST') {
-			return;
-		}
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+}
 
-		throw error;
-	}
+exports.Range = Range
+function Range (range, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-	fs.utimesSync(destination, stat.atime, stat.mtime);
-	fixupAttributes(destination, stat);
-};
+  if (range instanceof Range) {
+    if (range.loose === !!options.loose &&
+        range.includePrerelease === !!options.includePrerelease) {
+      return range
+    } else {
+      return new Range(range.raw, options)
+    }
+  }
 
+  if (range instanceof Comparator) {
+    return new Range(range.value, options)
+  }
 
-/***/ }),
-/* 792 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!(this instanceof Range)) {
+    return new Range(range, options)
+  }
 
-"use strict";
+  this.options = options
+  this.loose = !!options.loose
+  this.includePrerelease = !!options.includePrerelease
 
-const pTimeout = __webpack_require__(793);
+  // 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 symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range)
+  }
 
-const normalizeEmitter = emitter => {
-	const addListener = emitter.on || emitter.addListener || emitter.addEventListener;
-	const removeListener = emitter.off || emitter.removeListener || emitter.removeEventListener;
+  this.format()
+}
 
-	if (!addListener || !removeListener) {
-		throw new TypeError('Emitter is not compatible');
-	}
+Range.prototype.format = function () {
+  this.range = this.set.map(function (comps) {
+    return comps.join(' ').trim()
+  }).join('||').trim()
+  return this.range
+}
 
-	return {
-		addListener: addListener.bind(emitter),
-		removeListener: removeListener.bind(emitter)
-	};
-};
+Range.prototype.toString = function () {
+  return this.range
+}
 
-const normalizeEvents = event => Array.isArray(event) ? event : [event];
+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 multiple = (emitter, event, options) => {
-	let cancel;
-	const ret = new Promise((resolve, reject) => {
-		options = {
-			rejectionEvents: ['error'],
-			multiArgs: false,
-			resolveImmediately: false,
-			...options
-		};
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace)
 
-		if (!(options.count >= 0 && (options.count === Infinity || Number.isInteger(options.count)))) {
-			throw new TypeError('The `count` option should be at least 0 or more');
-		}
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace)
 
-		// Allow multiple events
-		const events = normalizeEvents(event);
+  // normalize spaces
+  range = range.split(/\s+/).join(' ')
 
-		const items = [];
-		const {addListener, removeListener} = normalizeEmitter(emitter);
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
-		const onItem = (...args) => {
-			const value = options.multiArgs ? args : args[0];
+  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)
 
-			if (options.filter && !options.filter(value)) {
-				return;
-			}
+  return set
+}
 
-			items.push(value);
+Range.prototype.intersects = function (range, options) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required')
+  }
 
-			if (options.count === items.length) {
-				cancel();
-				resolve(items);
-			}
-		};
+  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)
+        })
+      })
+    })
+  })
+}
 
-		const rejectHandler = error => {
-			cancel();
-			reject(error);
-		};
+// 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(' ')
+  })
+}
 
-		cancel = () => {
-			for (const event of events) {
-				removeListener(event, onItem);
-			}
+// 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
+}
 
-			for (const rejectionEvent of options.rejectionEvents) {
-				removeListener(rejectionEvent, rejectHandler);
-			}
-		};
+function isX (id) {
+  return !id || id.toLowerCase() === 'x' || id === '*'
+}
 
-		for (const event of events) {
-			addListener(event, onItem);
-		}
+// ~, ~> --> * (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(' ')
+}
 
-		for (const rejectionEvent of options.rejectionEvents) {
-			addListener(rejectionEvent, rejectHandler);
-		}
+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 (options.resolveImmediately) {
-			resolve(items);
-		}
-	});
+    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'
+    }
 
-	ret.cancel = cancel;
+    debug('tilde return', ret)
+    return ret
+  })
+}
 
-	if (typeof options.timeout === 'number') {
-		const timeout = pTimeout(ret, options.timeout);
-		timeout.cancel = cancel;
-		return timeout;
-	}
+// ^ --> * (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(' ')
+}
 
-	return ret;
-};
+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 pEvent = (emitter, event, options) => {
-	if (typeof options === 'function') {
-		options = {filter: options};
-	}
+    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 = {
-		...options,
-		count: 1,
-		resolveImmediately: false
-	};
+    debug('caret return', ret)
+    return ret
+  })
+}
 
-	const arrayPromise = multiple(emitter, event, options);
-	const promise = arrayPromise.then(array => array[0]); // eslint-disable-line promise/prefer-await-to-then
-	promise.cancel = arrayPromise.cancel;
+function replaceXRanges (comp, options) {
+  debug('replaceXRanges', comp, options)
+  return comp.split(/\s+/).map(function (comp) {
+    return replaceXRange(comp, options)
+  }).join(' ')
+}
 
-	return promise;
-};
+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
 
-module.exports = pEvent;
-// TODO: Remove this for the next major release
-module.exports.default = pEvent;
+    if (gtlt === '=' && anyX) {
+      gtlt = ''
+    }
 
-module.exports.multiple = multiple;
+    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
 
-module.exports.iterator = (emitter, event, options) => {
-	if (typeof options === 'function') {
-		options = {filter: options};
-	}
+      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
+        }
+      }
 
-	// Allow multiple events
-	const events = normalizeEvents(event);
+      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'
+    }
 
-	options = {
-		rejectionEvents: ['error'],
-		resolutionEvents: [],
-		limit: Infinity,
-		multiArgs: false,
-		...options
-	};
+    debug('xRange return', ret)
 
-	const {limit} = options;
-	const isValidLimit = limit >= 0 && (limit === Infinity || Number.isInteger(limit));
-	if (!isValidLimit) {
-		throw new TypeError('The `limit` option should be a non-negative integer or Infinity');
-	}
+    return ret
+  })
+}
 
-	if (limit === 0) {
-		// Return an empty async iterator to avoid any further cost
-		return {
-			[Symbol.asyncIterator]() {
-				return this;
-			},
-			async next() {
-				return {
-					done: true,
-					value: undefined
-				};
-			}
-		};
-	}
+// 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], '')
+}
 
-	const {addListener, removeListener} = normalizeEmitter(emitter);
+// 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
+  }
 
-	let isDone = false;
-	let error;
-	let hasPendingError = false;
-	const nextQueue = [];
-	const valueQueue = [];
-	let eventCount = 0;
-	let isLimitReached = false;
+  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 valueHandler = (...args) => {
-		eventCount++;
-		isLimitReached = eventCount === limit;
+  return (from + ' ' + to).trim()
+}
 
-		const value = options.multiArgs ? args : args[0];
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function (version) {
+  if (!version) {
+    return false
+  }
 
-		if (nextQueue.length > 0) {
-			const {resolve} = nextQueue.shift();
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-			resolve({done: false, value});
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version, this.options)) {
+      return true
+    }
+  }
+  return false
+}
 
-			if (isLimitReached) {
-				cancel();
-			}
+function testSet (set, version, options) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version)) {
+      return false
+    }
+  }
 
-			return;
-		}
+  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
+      }
 
-		valueQueue.push(value);
+      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 (isLimitReached) {
-			cancel();
-		}
-	};
+    // Version has a -pre, but it's not one of the ones we like.
+    return false
+  }
 
-	const cancel = () => {
-		isDone = true;
-		for (const event of events) {
-			removeListener(event, valueHandler);
-		}
+  return true
+}
 
-		for (const rejectionEvent of options.rejectionEvents) {
-			removeListener(rejectionEvent, rejectHandler);
-		}
+exports.satisfies = satisfies
+function satisfies (version, range, options) {
+  try {
+    range = new Range(range, options)
+  } catch (er) {
+    return false
+  }
+  return range.test(version)
+}
 
-		for (const resolutionEvent of options.resolutionEvents) {
-			removeListener(resolutionEvent, resolveHandler);
-		}
+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
+}
 
-		while (nextQueue.length > 0) {
-			const {resolve} = nextQueue.shift();
-			resolve({done: true, value: undefined});
-		}
-	};
+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
+}
 
-	const rejectHandler = (...args) => {
-		error = options.multiArgs ? args : args[0];
+exports.minVersion = minVersion
+function minVersion (range, loose) {
+  range = new Range(range, loose)
 
-		if (nextQueue.length > 0) {
-			const {reject} = nextQueue.shift();
-			reject(error);
-		} else {
-			hasPendingError = true;
-		}
+  var minver = new SemVer('0.0.0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-		cancel();
-	};
+  minver = new SemVer('0.0.0-0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-	const resolveHandler = (...args) => {
-		const value = options.multiArgs ? args : args[0];
+  minver = null
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-		if (options.filter && !options.filter(value)) {
-			return;
-		}
+    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 (nextQueue.length > 0) {
-			const {resolve} = nextQueue.shift();
-			resolve({done: true, value});
-		} else {
-			valueQueue.push(value);
-		}
+  if (minver && range.test(minver)) {
+    return minver
+  }
 
-		cancel();
-	};
+  return null
+}
 
-	for (const event of events) {
-		addListener(event, valueHandler);
-	}
+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
+  }
+}
 
-	for (const rejectionEvent of options.rejectionEvents) {
-		addListener(rejectionEvent, rejectHandler);
-	}
+// 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)
+}
 
-	for (const resolutionEvent of options.resolutionEvents) {
-		addListener(resolutionEvent, resolveHandler);
-	}
+// 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)
+}
 
-	return {
-		[symbolAsyncIterator]() {
-			return this;
-		},
-		async next() {
-			if (valueQueue.length > 0) {
-				const value = valueQueue.shift();
-				return {
-					done: isDone && valueQueue.length === 0 && !isLimitReached,
-					value
-				};
-			}
+exports.outside = outside
+function outside (version, range, hilo, options) {
+  version = new SemVer(version, options)
+  range = new Range(range, options)
 
-			if (hasPendingError) {
-				hasPendingError = false;
-				throw error;
-			}
+  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 ">"')
+  }
 
-			if (isDone) {
-				return {
-					done: true,
-					value: undefined
-				};
-			}
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, options)) {
+    return false
+  }
 
-			return new Promise((resolve, reject) => nextQueue.push({resolve, reject}));
-		},
-		async return(value) {
-			cancel();
-			return {
-				done: isDone,
-				value
-			};
-		}
-	};
-};
+  // 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]
 
-/***/ }),
-/* 793 */
-/***/ (function(module, exports, __webpack_require__) {
+    var high = null
+    var low = null
 
-"use strict";
+    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
+      }
+    })
 
-const pFinally = __webpack_require__(794);
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false
+    }
 
-class TimeoutError extends Error {
-	constructor(message) {
-		super(message);
-		this.name = 'TimeoutError';
-	}
+    // 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
 }
 
-module.exports = (promise, ms, fallback) => new Promise((resolve, reject) => {
-	if (typeof ms !== 'number' || ms < 0) {
-		throw new TypeError('Expected `ms` to be a positive number');
-	}
+exports.prerelease = prerelease
+function prerelease (version, options) {
+  var parsed = parse(version, options)
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+}
 
-	const timer = setTimeout(() => {
-		if (typeof fallback === 'function') {
-			try {
-				resolve(fallback());
-			} catch (err) {
-				reject(err);
-			}
-			return;
-		}
+exports.intersects = intersects
+function intersects (r1, r2, options) {
+  r1 = new Range(r1, options)
+  r2 = new Range(r2, options)
+  return r1.intersects(r2)
+}
 
-		const message = typeof fallback === 'string' ? fallback : `Promise timed out after ${ms} milliseconds`;
-		const err = fallback instanceof Error ? fallback : new TimeoutError(message);
+exports.coerce = coerce
+function coerce (version) {
+  if (version instanceof SemVer) {
+    return version
+  }
 
-		if (typeof promise.cancel === 'function') {
-			promise.cancel();
-		}
+  if (typeof version !== 'string') {
+    return null
+  }
 
-		reject(err);
-	}, ms);
+  var match = version.match(re[COERCE])
 
-	pFinally(
-		promise.then(resolve, reject),
-		() => {
-			clearTimeout(timer);
-		}
-	);
-});
+  if (match == null) {
+    return null
+  }
 
-module.exports.TimeoutError = TimeoutError;
+  return parse(match[1] +
+    '.' + (match[2] || '0') +
+    '.' + (match[3] || '0'))
+}
 
 
 /***/ }),
-/* 794 */
+
+/***/ "../../node_modules/write-json-file/node_modules/write-file-atomic/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = (promise, onFinally) => {
-	onFinally = onFinally || (() => {});
+module.exports = writeFile
+module.exports.sync = writeFileSync
+module.exports._getTmpname = getTmpname // for testing
+module.exports._cleanupOnExit = cleanupOnExit
 
-	return promise.then(
-		val => new Promise(resolve => {
-			resolve(onFinally());
-		}).then(() => val),
-		err => new Promise(resolve => {
-			resolve(onFinally());
-		}).then(() => {
-			throw err;
-		})
-	);
-};
+var fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js")
+var MurmurHash3 = __webpack_require__("../../node_modules/imurmurhash/imurmurhash.js")
+var onExit = __webpack_require__("../../node_modules/signal-exit/index.js")
+var path = __webpack_require__("path")
+var activeFiles = {}
 
+// 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__("worker_threads")
 
-/***/ }),
-/* 795 */
-/***/ (function(module, exports, __webpack_require__) {
+    /// 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
+  }
+})()
 
-"use strict";
+var invocations = 0
+function getTmpname (filename) {
+  return filename + '.' +
+    MurmurHash3(__filename)
+      .hash(String(process.pid))
+      .hash(String(threadId))
+      .hash(String(++invocations))
+      .result()
+}
 
-const NestedError = __webpack_require__(796);
+function cleanupOnExit (tmpfile) {
+  return function () {
+    try {
+      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
+    } catch (_) {}
+  }
+}
 
-class CpFileError extends NestedError {
-	constructor(message, nested) {
-		super(message, nested);
-		Object.assign(this, nested);
-		this.name = 'CpFileError';
-	}
+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]
+  })
 }
 
-module.exports = CpFileError;
-
-
-/***/ }),
-/* 796 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var inherits = __webpack_require__(234).inherits;
-
-var NestedError = function (message, nested) {
-    this.nested = nested;
+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 (message instanceof Error) {
-        nested = message;
-    } else if (typeof message !== 'undefined') {
-        Object.defineProperty(this, 'message', {
-            value: message,
-            writable: true,
-            enumerable: false,
-            configurable: true
-        });
+  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
     }
+  }
 
-    Error.captureStackTrace(this, this.constructor);
-    var oldStackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
-    var stackDescriptor = buildStackDescriptor(oldStackDescriptor, nested);
-    Object.defineProperty(this, 'stack', stackDescriptor);
-};
+  var fd
+  var cleanup = cleanupOnExit(tmpfile)
+  var removeOnExitHandler = onExit(cleanup)
 
-function buildStackDescriptor(oldStackDescriptor, nested) {
-    if (oldStackDescriptor.get) {
-        return {
-            get: function () {
-                var stack = oldStackDescriptor.get.call(this);
-                return buildCombinedStacks(stack, this.nested);
-            }
-        };
-    } else {
-        var stack = oldStackDescriptor.value;
-        return {
-            value: buildCombinedStacks(stack, nested)
-        };
+  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'))
     }
-}
-
-function buildCombinedStacks(stack, nested) {
-    if (nested) {
-        stack += '\nCaused By: ' + nested.stack;
+    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.
+      }
     }
-    return stack;
+    removeOnExitHandler()
+    cleanup()
+    throw err
+  }
 }
 
-inherits(NestedError, Error);
-NestedError.prototype.name = 'NestedError';
-
-
-module.exports = NestedError;
-
 
 /***/ }),
-/* 797 */
+
+/***/ "../../node_modules/write-pkg/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const {promisify} = __webpack_require__(234);
-const fs = __webpack_require__(354);
-const makeDir = __webpack_require__(798);
-const pEvent = __webpack_require__(792);
-const CpFileError = __webpack_require__(795);
+const path = __webpack_require__("path");
+const writeJsonFile = __webpack_require__("../../node_modules/write-json-file/index.js");
+const sortKeys = __webpack_require__("../../node_modules/sort-keys/index.js");
 
-const stat = promisify(fs.stat);
-const lstat = promisify(fs.lstat);
-const utimes = promisify(fs.utimes);
-const chmod = promisify(fs.chmod);
-const chown = promisify(fs.chown);
-
-exports.closeSync = fs.closeSync.bind(fs);
-exports.createWriteStream = fs.createWriteStream.bind(fs);
+const dependencyKeys = new Set([
+	'dependencies',
+	'devDependencies',
+	'optionalDependencies',
+	'peerDependencies'
+]);
 
-exports.createReadStream = async (path, options) => {
-	const read = fs.createReadStream(path, options);
+function normalize(packageJson) {
+	const result = {};
 
-	try {
-		await pEvent(read, ['readable', 'end']);
-	} catch (error) {
-		throw new CpFileError(`Cannot read from \`${path}\`: ${error.message}`, error);
+	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 read;
-};
-
-exports.stat = path => stat(path).catch(error => {
-	throw new CpFileError(`Cannot stat path \`${path}\`: ${error.message}`, error);
-});
-
-exports.lstat = path => lstat(path).catch(error => {
-	throw new CpFileError(`lstat \`${path}\` failed: ${error.message}`, error);
-});
+	return result;
+}
 
-exports.utimes = (path, atime, mtime) => utimes(path, atime, mtime).catch(error => {
-	throw new CpFileError(`utimes \`${path}\` failed: ${error.message}`, error);
-});
+module.exports = async (filePath, data, options) => {
+	if (typeof filePath !== 'string') {
+		options = data;
+		data = filePath;
+		filePath = '.';
+	}
 
-exports.chmod = (path, mode) => chmod(path, mode).catch(error => {
-	throw new CpFileError(`chmod \`${path}\` failed: ${error.message}`, error);
-});
+	options = {
+		normalize: true,
+		...options,
+		detectIndent: true
+	};
 
-exports.chown = (path, uid, gid) => chown(path, uid, gid).catch(error => {
-	throw new CpFileError(`chown \`${path}\` failed: ${error.message}`, error);
-});
+	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
 
-exports.statSync = path => {
-	try {
-		return fs.statSync(path);
-	} catch (error) {
-		throw new CpFileError(`stat \`${path}\` failed: ${error.message}`, error);
-	}
-};
+	data = options.normalize ? normalize(data) : data;
 
-exports.utimesSync = (path, atime, mtime) => {
-	try {
-		return fs.utimesSync(path, atime, mtime);
-	} catch (error) {
-		throw new CpFileError(`utimes \`${path}\` failed: ${error.message}`, error);
-	}
+	return writeJsonFile(filePath, data, options);
 };
 
-exports.chmodSync = (path, mode) => {
-	try {
-		return fs.chmodSync(path, mode);
-	} catch (error) {
-		throw new CpFileError(`chmod \`${path}\` failed: ${error.message}`, error);
+module.exports.sync = (filePath, data, options) => {
+	if (typeof filePath !== 'string') {
+		options = data;
+		data = filePath;
+		filePath = '.';
 	}
-};
 
-exports.chownSync = (path, uid, gid) => {
-	try {
-		return fs.chownSync(path, uid, gid);
-	} catch (error) {
-		throw new CpFileError(`chown \`${path}\` failed: ${error.message}`, error);
-	}
-};
+	options = {
+		normalize: true,
+		...options,
+		detectIndent: true
+	};
 
-exports.makeDir = path => makeDir(path, {fs}).catch(error => {
-	throw new CpFileError(`Cannot create directory \`${path}\`: ${error.message}`, error);
-});
+	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
 
-exports.makeDirSync = path => {
-	try {
-		makeDir.sync(path, {fs});
-	} catch (error) {
-		throw new CpFileError(`Cannot create directory \`${path}\`: ${error.message}`, error);
-	}
-};
+	data = options.normalize ? normalize(data) : data;
 
-exports.copyFileSync = (source, destination, flags) => {
-	try {
-		fs.copyFileSync(source, destination, flags);
-	} catch (error) {
-		throw new CpFileError(`Cannot copy from \`${source}\` to \`${destination}\`: ${error.message}`, error);
-	}
+	writeJsonFile.sync(filePath, data, options);
 };
 
 
 /***/ }),
-/* 798 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const fs = __webpack_require__(253);
-const path = __webpack_require__(4);
-const {promisify} = __webpack_require__(234);
-const semver = __webpack_require__(799);
-
-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 processOptions = options => {
-	// https://github.com/sindresorhus/make-dir/issues/18
-	const defaults = {
-		mode: 0o777,
-		fs
-	};
 
-	return {
-		...defaults,
-		...options
-	};
-};
+/***/ "./src/cli.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return run; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/getopts/index.js");
+/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(getopts__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _kbn_tooling_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/index.js");
+/* harmony import */ var _kbn_tooling_log__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_tooling_log__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/commands/index.ts");
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/run.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-const makeDir = async (input, options) => {
-	checkPath(input);
-	options = processOptions(options);
 
-	const mkdir = promisify(options.fs.mkdir);
-	const stat = promisify(options.fs.stat);
 
-	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
-		const pth = path.resolve(input);
 
-		await mkdir(pth, {
-			mode: options.mode,
-			recursive: true
-		});
 
-		return pth;
-	}
 
-	const make = async pth => {
-		try {
-			await mkdir(pth, options.mode);
 
-			return pth;
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
+function help() {
+  _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].info(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      usage: kbn <command> [<args>]
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
+      By default commands are run for Kibana itself, all packages in the 'packages/'
+      folder and for all plugins in './plugins' and '../kibana-extra'.
 
-				await make(path.dirname(pth));
+      Available commands:
 
-				return make(pth);
-			}
+        ${Object.values(_commands__WEBPACK_IMPORTED_MODULE_4__[/* commands */ "a"]).map(command => `${command.name} - ${command.description}`).join('\n        ')}
 
-			try {
-				const stats = await stat(pth);
-				if (!stats.isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
+      Global options:
 
-			return pth;
-		}
-	};
+        -e, --exclude           Exclude specified project. Can be specified multiple times to exclude multiple projects, e.g. '-e kibana -e @kbn/pm'.
+        -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 kbn packages bootstrap cache
+        --no-validate           Disable the bootstrap yarn.lock validation
+        --force-install         Forces yarn install to run on bootstrap
+        --offline               Run in offline mode
+        --verbose               Set log level to verbose
+        --debug                 Set log level to debug
+        --quiet                 Set log level to error
+        --silent                Disable log output
 
-	return make(path.resolve(input));
-};
+      "run" options:
+        --skip-missing          Ignore packages which don't have the requested script
+    ` + '\n');
+}
 
-module.exports = makeDir;
+async function run(argv) {
+  _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].setLogLevel(Object(_kbn_tooling_log__WEBPACK_IMPORTED_MODULE_3__["pickLevelFromFlags"])(getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
+    boolean: ['verbose', 'debug', 'quiet', 'silent', 'skip-missing']
+  }))); // We can simplify this setup (and remove this extra handling) once Yarn
+  // starts forwarding the `--` directly to this script, see
+  // https://github.com/yarnpkg/yarn/blob/b2d3e1a8fe45ef376b716d597cc79b38702a9320/src/cli/index.js#L174-L182
 
-module.exports.sync = (input, options) => {
-	checkPath(input);
-	options = processOptions(options);
+  if (argv.includes('--')) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].error(`Using "--" is not allowed, as it doesn't work with 'yarn kbn'.`);
+    process.exit(1);
+  }
 
-	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
-		const pth = path.resolve(input);
+  const options = getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
+    alias: {
+      e: 'exclude',
+      h: 'help',
+      i: 'include'
+    },
+    default: {
+      cache: true,
+      'force-install': false,
+      offline: false,
+      validate: true
+    },
+    boolean: ['cache', 'force-install', 'offline', 'validate']
+  });
+  const args = options._;
 
-		fs.mkdirSync(pth, {
-			mode: options.mode,
-			recursive: true
-		});
+  if (options.help || args.length === 0) {
+    help();
+    return;
+  } // This `rootPath` is relative to `./dist/` as that's the location of the
+  // built version of this tool.
 
-		return pth;
-	}
 
-	const make = pth => {
-		try {
-			options.fs.mkdirSync(pth, options.mode);
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
+  const rootPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(__dirname, '../../../');
+  const commandName = args[0];
+  const extraArgs = args.slice(1);
+  const commandOptions = {
+    options,
+    extraArgs,
+    rootPath
+  };
+  const command = _commands__WEBPACK_IMPORTED_MODULE_4__[/* commands */ "a"][commandName];
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
+  if (command === undefined) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].error(`[${commandName}] is not a valid command, see 'kbn --help'`);
+    process.exit(1);
+  }
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
+  await Object(_run__WEBPACK_IMPORTED_MODULE_5__[/* runCommand */ "a"])(command, commandOptions);
+}
 
-				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;
-			}
-		}
+/***/ "./src/commands/bootstrap.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-		return pth;
-	};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BootstrapCommand; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node/index.js");
+/* harmony import */ var _kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@kbn/bazel-runner/target_node/index.js");
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_child_process__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _utils_link_project_executables__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/link_project_executables.ts");
+/* harmony import */ var _utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/yarn_lock.ts");
+/* harmony import */ var _utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/validate_dependencies.ts");
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("./src/utils/bazel/setup_remote_cache.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-	return make(path.resolve(input));
-};
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-/***/ }),
-/* 799 */
-/***/ (function(module, exports) {
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-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'
 
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
 
-// 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 t = exports.tokens = {}
-var R = 0
 
-function tok (n) {
-  t[n] = R++
-}
 
-// 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.
 
-tok('NUMERICIDENTIFIER')
-src[t.NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-tok('NUMERICIDENTIFIERLOOSE')
-src[t.NUMERICIDENTIFIERLOOSE] = '[0-9]+'
+const BootstrapCommand = {
+  description: 'Install dependencies and crosslink projects',
+  name: 'bootstrap',
+  reportTiming: {
+    group: 'scripts/kbn bootstrap',
+    id: 'total'
+  },
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+  async run(projects, projectGraph, {
+    options,
+    kbn,
+    rootPath
+  }) {
+    var _projects$get;
 
-tok('NONNUMERICIDENTIFIER')
-src[t.NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
+    const kibanaProjectPath = ((_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path) || '';
+    const offline = (options === null || options === void 0 ? void 0 : options.offline) === true;
+    const reporter = _kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"]);
+    const timings = [];
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+    const time = async (id, body) => {
+      const start = Date.now();
 
-tok('MAINVERSION')
-src[t.MAINVERSION] = '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[t.NUMERICIDENTIFIER] + ')'
+      try {
+        return await body();
+      } finally {
+        timings.push({
+          id,
+          ms: Date.now() - start
+        });
+      }
+    }; // Force install is set in case a flag is passed into yarn kbn bootstrap
 
-tok('MAINVERSIONLOOSE')
-src[t.MAINVERSIONLOOSE] = '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')'
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+    const forceInstall = !!options && options['force-install'] === true; // Install bazel machinery tools if needed
 
-tok('PRERELEASEIDENTIFIER')
-src[t.PRERELEASEIDENTIFIER] = '(?:' + src[t.NUMERICIDENTIFIER] +
-                            '|' + src[t.NONNUMERICIDENTIFIER] + ')'
+    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* installBazelTools */ "c"])(rootPath); // Setup remote cache settings in .bazelrc.cache if needed
 
-tok('PRERELEASEIDENTIFIERLOOSE')
-src[t.PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[t.NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[t.NONNUMERICIDENTIFIER] + ')'
+    await Object(_utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_9__[/* setupRemoteCache */ "a"])(rootPath); // Bootstrap process for Bazel packages
+    // Bazel is now managing dependencies so yarn install
+    // will happen as part of this
+    //
+    // NOTE: Bazel projects will be introduced incrementally
+    // And should begin from the ones with none dependencies forward.
+    // That way non bazel projects could depend on bazel projects but not the other way around
+    // That is only intended during the migration process while non Bazel projects are not removed at all.
+    //
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+    if (forceInstall) {
+      await time('force install dependencies', async () => {
+        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* removeYarnIntegrityFileIfExists */ "e"])(path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(kibanaProjectPath, 'node_modules'));
+        await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_2__["runBazel"])({
+          bazelArgs: ['clean', '--expunge'],
+          log: _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"]
+        });
+        await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_2__["runBazel"])({
+          bazelArgs: ['run', '@nodejs//:yarn'],
+          offline,
+          log: _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"],
+          execaOpts: {
+            env: {
+              SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+              RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
+            }
+          }
+        });
+      });
+    } // build packages
 
-tok('PRERELEASE')
-src[t.PRERELEASE] = '(?:-(' + src[t.PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[t.PRERELEASEIDENTIFIER] + ')*))'
 
-tok('PRERELEASELOOSE')
-src[t.PRERELEASELOOSE] = '(?:-?(' + src[t.PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[t.PRERELEASEIDENTIFIERLOOSE] + ')*))'
+    await time('build packages', async () => {
+      await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_2__["runBazel"])({
+        bazelArgs: ['build', '//packages:build', '--show_result=1'],
+        log: _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"],
+        offline
+      });
+    });
+    const yarnLock = await time('read yarn.lock', async () => await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__[/* readYarnLock */ "a"])(kbn));
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+    if (options.validate) {
+      await time('validate dependencies', async () => {
+        await Object(_utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_7__[/* validateDependencies */ "a"])(kbn, yarnLock);
+      });
+    } // Assure all kbn projects with bin defined scripts
+    // copy those scripts into the top level node_modules folder
+    //
+    // NOTE: We don't probably need this anymore, is actually not being used
 
-tok('BUILDIDENTIFIER')
-src[t.BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+    await time('link project executables', async () => {
+      await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_5__[/* linkProjectExecutables */ "a"])(projects, projectGraph);
+    });
+    await time('update vscode config', async () => {
+      // Update vscode settings
+      await Object(_utils_child_process__WEBPACK_IMPORTED_MODULE_4__[/* spawnStreaming */ "b"])(process.execPath, ['scripts/update_vscode_config'], {
+        cwd: kbn.getAbsolute(),
+        env: process.env
+      }, {
+        prefix: '[vscode]',
+        debug: false
+      });
+    }); // send timings
 
-tok('BUILD')
-src[t.BUILD] = '(?:\\+(' + src[t.BUILDIDENTIFIER] +
-             '(?:\\.' + src[t.BUILDIDENTIFIER] + ')*))'
+    await reporter.timings({
+      upstreamBranch: kbn.kibanaProject.json.branch,
+      // prevent loading @kbn/utils by passing null
+      kibanaUuid: kbn.getUuid() || null,
+      timings: timings.map(t => _objectSpread({
+        group: 'scripts/kbn bootstrap'
+      }, t))
+    });
+  }
 
-// ## 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.
+/***/ }),
 
-tok('FULL')
-tok('FULLPLAIN')
-src[t.FULLPLAIN] = 'v?' + src[t.MAINVERSION] +
-                  src[t.PRERELEASE] + '?' +
-                  src[t.BUILD] + '?'
+/***/ "./src/commands/build.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-src[t.FULL] = '^' + src[t.FULLPLAIN] + '$'
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BuildCommand; });
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@kbn/bazel-runner/target_node/index.js");
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-// 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.
-tok('LOOSEPLAIN')
-src[t.LOOSEPLAIN] = '[v=\\s]*' + src[t.MAINVERSIONLOOSE] +
-                  src[t.PRERELEASELOOSE] + '?' +
-                  src[t.BUILD] + '?'
 
-tok('LOOSE')
-src[t.LOOSE] = '^' + src[t.LOOSEPLAIN] + '$'
+const BuildCommand = {
+  description: 'Runs a build in the Bazel built packages',
+  name: 'build',
+  reportTiming: {
+    group: 'scripts/kbn build',
+    id: 'total'
+  },
 
-tok('GTLT')
-src[t.GTLT] = '((?:<|>)?=?)'
+  async run(projects, projectGraph, {
+    options
+  }) {
+    // Call bazel with the target to build all available packages
+    await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0__["runBazel"])({
+      bazelArgs: ['build', '//packages:build', '--show_result=1'],
+      log: _utils_log__WEBPACK_IMPORTED_MODULE_1__[/* log */ "a"],
+      offline: (options === null || options === void 0 ? void 0 : options.offline) === true
+    });
+  }
 
-// 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.
-tok('XRANGEIDENTIFIERLOOSE')
-src[t.XRANGEIDENTIFIERLOOSE] = src[t.NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
-tok('XRANGEIDENTIFIER')
-src[t.XRANGEIDENTIFIER] = src[t.NUMERICIDENTIFIER] + '|x|X|\\*'
-
-tok('XRANGEPLAIN')
-src[t.XRANGEPLAIN] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[t.PRERELEASE] + ')?' +
-                   src[t.BUILD] + '?' +
-                   ')?)?'
+};
 
-tok('XRANGEPLAINLOOSE')
-src[t.XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[t.PRERELEASELOOSE] + ')?' +
-                        src[t.BUILD] + '?' +
-                        ')?)?'
+/***/ }),
 
-tok('XRANGE')
-src[t.XRANGE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAIN] + '$'
-tok('XRANGELOOSE')
-src[t.XRANGELOOSE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAINLOOSE] + '$'
+/***/ "./src/commands/clean.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// Coercion.
-// Extract anything that could conceivably be a part of a valid semver
-tok('COERCE')
-src[t.COERCE] = '(^|[^\\d])' +
-              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:$|[^\\d])'
-tok('COERCERTL')
-re[t.COERCERTL] = new RegExp(src[t.COERCE], 'g')
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CleanCommand; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/del/index.js");
+/* 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__("../../node_modules/ora/index.js");
+/* 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__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/@kbn/bazel-runner/target_node/index.js");
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-tok('LONETILDE')
-src[t.LONETILDE] = '(?:~>?)'
 
-tok('TILDETRIM')
-src[t.TILDETRIM] = '(\\s*)' + src[t.LONETILDE] + '\\s+'
-re[t.TILDETRIM] = new RegExp(src[t.TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
 
-tok('TILDE')
-src[t.TILDE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAIN] + '$'
-tok('TILDELOOSE')
-src[t.TILDELOOSE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAINLOOSE] + '$'
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-tok('LONECARET')
-src[t.LONECARET] = '(?:\\^)'
 
-tok('CARETTRIM')
-src[t.CARETTRIM] = '(\\s*)' + src[t.LONECARET] + '\\s+'
-re[t.CARETTRIM] = new RegExp(src[t.CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
 
-tok('CARET')
-src[t.CARET] = '^' + src[t.LONECARET] + src[t.XRANGEPLAIN] + '$'
-tok('CARETLOOSE')
-src[t.CARETLOOSE] = '^' + src[t.LONECARET] + src[t.XRANGEPLAINLOOSE] + '$'
 
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-tok('COMPARATORLOOSE')
-src[t.COMPARATORLOOSE] = '^' + src[t.GTLT] + '\\s*(' + src[t.LOOSEPLAIN] + ')$|^$'
-tok('COMPARATOR')
-src[t.COMPARATOR] = '^' + src[t.GTLT] + '\\s*(' + src[t.FULLPLAIN] + ')$|^$'
 
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-tok('COMPARATORTRIM')
-src[t.COMPARATORTRIM] = '(\\s*)' + src[t.GTLT] +
-                      '\\s*(' + src[t.LOOSEPLAIN] + '|' + src[t.XRANGEPLAIN] + ')'
+const CleanCommand = {
+  description: 'Deletes output directories and resets internal caches.',
+  name: 'clean',
+  reportTiming: {
+    group: 'scripts/kbn clean',
+    id: 'total'
+  },
 
-// this one has to use the /g flag
-re[t.COMPARATORTRIM] = new RegExp(src[t.COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
+  async run(projects, projectGraph, {
+    kbn
+  }) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      This command is only necessary for the circumstance where you need to recover a consistent
+      state when problems arise. If you need to run this command often, please let us know by
+      filling out this form: https://ela.st/yarn-kbn-clean.
+      Please not it might not solve problems with node_modules. To solve problems around node_modules
+      you might need to run 'yarn kbn reset'.
+    `);
+    const toDelete = [];
 
-// 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.
-tok('HYPHENRANGE')
-src[t.HYPHENRANGE] = '^\\s*(' + src[t.XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[t.XRANGEPLAIN] + ')' +
-                   '\\s*$'
+    for (const project of projects.values()) {
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_6__[/* isDirectory */ "c"])(project.targetLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
+        });
+      }
 
-tok('HYPHENRANGELOOSE')
-src[t.HYPHENRANGELOOSE] = '^\\s*(' + src[t.XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[t.XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
 
-// Star ranges basically just allow anything at all.
-tok('STAR')
-src[t.STAR] = '(<|>)?=?\\s*\\*'
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
+      }
+    } // Runs Bazel soft clean
 
-// 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.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_5__[/* isBazelBinAvailable */ "d"])(kbn.getAbsolute())) {
+      await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4__["runBazel"])({
+        bazelArgs: ['clean'],
+        log: _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"]
+      });
+      _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].success('Soft cleaned bazel');
     }
-  }
-
-  if (version instanceof SemVer) {
-    return version
-  }
 
-  if (typeof version !== 'string') {
-    return null
-  }
+    if (toDelete.length === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].success('Nothing to delete');
+    } else {
+      /**
+       * 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();
 
-  if (version.length > MAX_LENGTH) {
-    return null
-  }
+      try {
+        for (const {
+          pattern,
+          cwd
+        } of toDelete) {
+          process.chdir(cwd);
+          const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
 
-  var r = options.loose ? re[t.LOOSE] : re[t.FULL]
-  if (!r.test(version)) {
-    return null
-  }
+          if (_utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].wouldLogLevel('info')) {
+            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))));
+          }
 
-  try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
+          await promise;
+        }
+      } finally {
+        process.chdir(originalCwd);
+      }
+    }
   }
-}
 
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
-}
+};
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
-}
+/***/ }),
 
-exports.SemVer = SemVer
+/***/ "./src/commands/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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)
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return commands; });
+/* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/commands/bootstrap.ts");
+/* harmony import */ var _build__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/commands/build.ts");
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/commands/clean.ts");
+/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/commands/reset.ts");
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/commands/run.ts");
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/commands/watch.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-  }
 
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
-  }
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
 
-  var m = version.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL])
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
-  }
 
-  this.raw = version
+const commands = {
+  bootstrap: _bootstrap__WEBPACK_IMPORTED_MODULE_0__[/* BootstrapCommand */ "a"],
+  build: _build__WEBPACK_IMPORTED_MODULE_1__[/* BuildCommand */ "a"],
+  clean: _clean__WEBPACK_IMPORTED_MODULE_2__[/* CleanCommand */ "a"],
+  reset: _reset__WEBPACK_IMPORTED_MODULE_3__[/* ResetCommand */ "a"],
+  run: _run__WEBPACK_IMPORTED_MODULE_4__[/* RunCommand */ "a"],
+  watch: _watch__WEBPACK_IMPORTED_MODULE_5__[/* WatchCommand */ "a"]
+};
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
+/***/ }),
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-    throw new TypeError('Invalid major version')
-  }
+/***/ "./src/commands/reset.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-    throw new TypeError('Invalid minor version')
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ResetCommand; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/del/index.js");
+/* 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__("../../node_modules/ora/index.js");
+/* 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__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/@kbn/bazel-runner/target_node/index.js");
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
-  }
 
-  // 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
-}
 
-SemVer.prototype.toString = function () {
-  return this.version
-}
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
 
-  return this.compareMain(other) || this.comparePre(other)
-}
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+const ResetCommand = {
+  description: 'Deletes node_modules and output directories, resets internal and disk caches, and stops Bazel server',
+  name: 'reset',
+  reportTiming: {
+    group: 'scripts/kbn reset',
+    id: 'total'
+  },
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+  async run(projects, projectGraph, {
+    kbn
+  }) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
+      problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
+      If you think you need to use this command very often (which is not normal), please let us know.
+    `);
+    const toDelete = [];
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+    for (const project of projects.values()) {
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_6__[/* isDirectory */ "c"])(project.nodeModulesLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.nodeModulesLocation)
+        });
+      }
 
-  // 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 (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_6__[/* isDirectory */ "c"])(project.targetLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
+        });
+      }
 
-  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)
-}
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
 
-SemVer.prototype.compareBuild = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
+      }
+    } // Runs Bazel hard clean and deletes Bazel Cache Folders
 
-  var i = 0
-  do {
-    var a = this.build[i]
-    var b = other.build[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
+    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_5__[/* isBazelBinAvailable */ "d"])(kbn.getAbsolute())) {
+      // Hard cleaning bazel
+      await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_4__["runBazel"])({
+        bazelArgs: ['clean', '--expunge'],
+        log: _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"]
+      });
+      _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].success('Hard cleaned bazel'); // Deletes Bazel Cache Folders
 
-    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]
+      await del__WEBPACK_IMPORTED_MODULE_1___default()([await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_5__[/* getBazelDiskCacheFolder */ "a"])(), await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_5__[/* getBazelRepositoryCacheFolder */ "b"])()], {
+        force: true
+      });
+      _utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].success('Removed disk caches');
+    }
+
+    if (toDelete.length === 0) {
+      return;
+    }
+    /**
+     * 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);
+
+        if (_utils_log__WEBPACK_IMPORTED_MODULE_7__[/* log */ "a"].wouldLogLevel('info')) {
+          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))));
         }
-      }
-      break
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
+        await promise;
+      }
+    } finally {
+      process.chdir(originalCwd);
+    }
   }
-  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
-  }
+};
 
-  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'
+/***/ "./src/commands/run.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return RunCommand; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/errors.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/parallelize.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/projects.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+
+
+
+const RunCommand = {
+  description: 'Run script defined in package.json in each package that contains that script (only works on packages not using Bazel yet)',
+  name: 'run',
+  reportTiming: {
+    group: 'scripts/kbn run',
+    id: 'total'
+  },
+
+  async run(projects, projectGraph, {
+    extraArgs,
+    options
+  }) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      We are migrating packages into the Bazel build system and we will no longer support running npm scripts on
+      packages using 'yarn kbn run' on Bazel built packages. If the package you are trying to act on contains a
+      BUILD.bazel file please just use 'yarn kbn build' to build it or 'yarn kbn watch' to watch it
+    `);
+    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__[/* topologicallyBatchProjects */ "d"])(projects, projectGraph);
+
+    if (extraArgs.length === 0) {
+      throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__[/* CliError */ "a"]('No script specified');
     }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return prefix + key
+
+    const scriptName = extraArgs[0];
+    const scriptArgs = extraArgs.slice(1);
+    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_3__[/* parallelizeBatches */ "a"])(batchedProjects, async project => {
+      if (!project.hasScript(scriptName)) {
+        if (!!options['skip-missing']) {
+          return;
         }
+
+        throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__[/* CliError */ "a"](`[${project.name}] no "${scriptName}" script defined. To skip packages without the "${scriptName}" script pass --skip-missing`);
       }
-    }
-    return defaultResult // may be undefined
+
+      _utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].info(`[${project.name}] running "${scriptName}" script`);
+      await project.runScriptStreaming(scriptName, {
+        args: scriptArgs
+      });
+      _utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].success(`[${project.name}] complete`);
+    });
   }
-}
 
-exports.compareIdentifiers = compareIdentifiers
+};
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+/***/ }),
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
-  }
+/***/ "./src/commands/watch.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WatchCommand; });
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@kbn/bazel-runner/target_node/index.js");
+/* harmony import */ var _kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
-}
 
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
-}
+const WatchCommand = {
+  description: 'Runs a build in the Bazel built packages and keeps watching them for changes',
+  name: 'watch',
+  reportTiming: {
+    group: 'scripts/kbn watch',
+    id: 'total'
+  },
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
-}
+  async run(projects, projectGraph, {
+    options
+  }) {
+    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages and run it through iBazel to watch it for changes
+    //
+    // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
+    // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
-}
+    await Object(_kbn_bazel_runner__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])({
+      bazelArgs: ['--run_output=false', 'build', '//packages:build', '--show_result=1'],
+      log: _utils_log__WEBPACK_IMPORTED_MODULE_1__[/* log */ "a"],
+      offline: runOffline
+    });
+  }
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
-}
+};
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
-}
+/***/ }),
 
-exports.compareBuild = compareBuild
-function compareBuild (a, b, loose) {
-  var versionA = new SemVer(a, loose)
-  var versionB = new SemVer(b, loose)
-  return versionA.compare(versionB) || versionA.compareBuild(versionB)
-}
+/***/ "./src/config.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getProjectPaths; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compareBuild(a, b, loose)
-  })
-}
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compareBuild(b, a, loose)
-  })
-}
+/**
+ * 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.
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
-}
+  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, 'test/server_integration/__fixtures__/plugins/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
 
-exports.lt = lt
-function lt (a, b, loose) {
-  return compare(a, b, loose) < 0
-}
+  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/plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/test/functional_with_es_ssl/fixtures/plugins/*'));
+  }
 
-exports.eq = eq
-function eq (a, b, loose) {
-  return compare(a, b, loose) === 0
-}
+  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/*'));
+  }
 
-exports.neq = neq
-function neq (a, b, loose) {
-  return compare(a, b, loose) !== 0
+  return projectPaths;
 }
 
-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
-}
+/***/ "./src/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-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
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/cli.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-    case '!==':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a !== b
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return _utils_projects__WEBPACK_IMPORTED_MODULE_1__["b"]; });
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/project.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-    case '!=':
-      return neq(a, b, loose)
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/config.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-    case '>':
-      return gt(a, b, loose)
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-    case '>=':
-      return gte(a, b, loose)
 
-    case '<':
-      return lt(a, b, loose)
 
-    case '<=':
-      return lte(a, b, loose)
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
-  }
-}
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+/***/ }),
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
-    }
-  }
+/***/ "./src/run.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return runCommand; });
+/* harmony import */ var _kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@kbn/ci-stats-reporter/target_node/index.js");
+/* harmony import */ var _kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/index.js");
+/* harmony import */ var _kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/errors.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/projects_tree.ts");
+/* harmony import */ var _utils_regenerate_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/regenerate_package_json.ts");
+/* harmony import */ var _utils_regenerate_synthetic_package_map__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/regenerate_synthetic_package_map.ts");
+/* harmony import */ var _utils_regenerate_base_tsconfig__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("./src/utils/regenerate_base_tsconfig.ts");
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("./src/utils/kibana.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
-  }
+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; }
 
-  debug('comp', this)
-}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-var ANY = {}
-Comparator.prototype.parse = function (comp) {
-  var r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
-  var m = comp.match(r)
 
-  if (!m) {
-    throw new TypeError('Invalid comparator: ' + comp)
-  }
 
-  this.operator = m[1] !== undefined ? 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.options.loose)
-  }
-}
 
-Comparator.prototype.toString = function () {
-  return this.value
-}
 
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
 
-  if (this.semver === ANY || version === ANY) {
-    return true
-  }
 
-  if (typeof version === 'string') {
+
+
+process.env.CI_STATS_NESTED_TIMING = 'true';
+async function runCommand(command, config) {
+  const runStartTime = Date.now();
+  let kbn;
+  const timings = [];
+
+  async function time(id, block) {
+    const start = Date.now();
+    let success = true;
+
     try {
-      version = new SemVer(version, this.options)
-    } catch (er) {
-      return false
+      return await block();
+    } catch (error) {
+      success = false;
+      throw error;
+    } finally {
+      timings.push({
+        id,
+        ms: Date.now() - start,
+        meta: {
+          success
+        }
+      });
     }
   }
 
-  return cmp(version, this.operator, this.semver, this.options)
-}
+  async function reportTimes(timingConfig, error) {
+    if (!kbn) {
+      // things are too broken to report remotely
+      return;
+    }
 
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
-  }
+    const reporter = _kbn_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"]);
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+    try {
+      await reporter.timings({
+        upstreamBranch: kbn.kibanaProject.json.branch,
+        // prevent loading @kbn/utils by passing null
+        kibanaUuid: kbn.getUuid() || null,
+        timings: [...timings.map(t => _objectSpread(_objectSpread({}, timingConfig), t)), {
+          group: timingConfig.group,
+          id: timingConfig.id,
+          ms: Date.now() - runStartTime,
+          meta: {
+            success: !error
+          }
+        }]
+      });
+    } catch (e) {
+      // prevent hiding bootstrap errors
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error('failed to report timings:');
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(e);
     }
   }
 
-  var rangeTmp
+  try {
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].debug(`Running [${command.name}] command from [${config.rootPath}]`);
+    await time('regenerate package.json, synthetic-package map and tsconfig', async () => {
+      const plugins = Object(_kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__["simpleKibanaPlatformPluginDiscovery"])(Object(_kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__["getPluginSearchPaths"])({
+        rootDir: config.rootPath,
+        oss: false,
+        examples: true,
+        testPlugins: true
+      }), []);
+      await Promise.all([Object(_utils_regenerate_package_json__WEBPACK_IMPORTED_MODULE_6__[/* regeneratePackageJson */ "a"])(config.rootPath), Object(_utils_regenerate_synthetic_package_map__WEBPACK_IMPORTED_MODULE_7__[/* regenerateSyntheticPackageMap */ "a"])(plugins, config.rootPath), Object(_utils_regenerate_base_tsconfig__WEBPACK_IMPORTED_MODULE_8__[/* regenerateBaseTsconfig */ "a"])(plugins, config.rootPath)]);
+    });
+    kbn = await time('load Kibana project', async () => await _utils_kibana__WEBPACK_IMPORTED_MODULE_9__[/* Kibana */ "a"].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 (this.operator === '') {
-    if (this.value === '') {
-      return true
+    if (projects.size === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(`There are no projects found. Double check project name(s) in '-i/--include' and '-e/--exclude' filters.`);
+      return process.exit(1);
     }
-    rangeTmp = new Range(comp.value, options)
-    return satisfies(this.value, rangeTmp, options)
-  } else if (comp.operator === '') {
-    if (comp.value === '') {
-      return true
+
+    const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__[/* buildProjectGraph */ "a"])(projects);
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].debug(`Found ${projects.size.toString()} projects`);
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].debug(Object(_utils_projects_tree__WEBPACK_IMPORTED_MODULE_5__[/* renderProjectsTree */ "a"])(config.rootPath, projects));
+    await command.run(projects, projectGraph, _objectSpread(_objectSpread({}, config), {}, {
+      kbn
+    }));
+
+    if (command.reportTiming) {
+      await reportTimes(command.reportTiming);
     }
-    rangeTmp = new Range(this.value, options)
-    return satisfies(comp.semver, rangeTmp, options)
+  } catch (error) {
+    if (command.reportTiming) {
+      await reportTimes(command.reportTiming, error);
+    }
+
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(`[${command.name}] failed:`);
+
+    if (error instanceof _utils_errors__WEBPACK_IMPORTED_MODULE_2__[/* CliError */ "a"]) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(error.message);
+      const metaOutput = Object.entries(error.meta).map(([key, value]) => `${key}: ${value}`).join('\n');
+
+      if (metaOutput) {
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].info('Additional debugging info:\n');
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].indent(2);
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].info(metaOutput);
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].indent(-2);
+      }
+    } else {
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(error);
+    }
+
+    process.exit(1);
   }
+}
 
-  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 === '>'))
+function toArray(value) {
+  if (value == null) {
+    return [];
+  }
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+  return Array.isArray(value) ? value : [value];
+}
+
+/***/ }),
+
+/***/ "./src/utils/bazel/get_cache_folders.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getBazelDiskCacheFolder; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return getBazelRepositoryCacheFolder; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/child_process.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+
+async function rawRunBazelInfoRepoCache() {
+  const {
+    stdout: bazelRepositoryCachePath
+  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_1__[/* spawn */ "a"])('bazel', ['info', 'repository_cache'], {
+    stdio: 'pipe'
+  });
+  return bazelRepositoryCachePath;
+}
+
+async function getBazelDiskCacheFolder() {
+  return Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(await rawRunBazelInfoRepoCache()), 'disk-cache');
+}
+async function getBazelRepositoryCacheFolder() {
+  return await rawRunBazelInfoRepoCache();
 }
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
-
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
-    }
-  }
+/***/ }),
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, options)
-  }
+/***/ "./src/utils/bazel/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (!(this instanceof Range)) {
-    return new Range(range, options)
-  }
+"use strict";
+/* harmony import */ var _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/utils/bazel/get_cache_folders.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "b", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["b"]; });
 
-  // 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
-  })
+/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/bazel/install_tools.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "c", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range)
-  }
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "d", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["b"]; });
 
-  this.format()
-}
+/* harmony import */ var _yarn_integrity__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/bazel/yarn_integrity.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "e", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
-}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-Range.prototype.toString = function () {
-  return this.range
-}
 
-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[t.HYPHENRANGELOOSE] : re[t.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[t.COMPARATORTRIM], comparatorTrimReplace)
-  debug('comparator trim', range, re[t.COMPARATORTRIM])
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[t.TILDETRIM], tildeTrimReplace)
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[t.CARETTRIM], caretTrimReplace)
+/***/ }),
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+/***/ "./src/utils/bazel/install_tools.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return isBazelBinAvailable; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return installBazelTools; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-  var compRe = loose ? re[t.COMPARATORLOOSE] : re[t.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)
 
-  return set
-}
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
-  }
 
-  return this.set.some(function (thisComparators) {
-    return (
-      isSatisfiable(thisComparators, options) &&
-      range.set.some(function (rangeComparators) {
-        return (
-          isSatisfiable(rangeComparators, options) &&
-          thisComparators.every(function (thisComparator) {
-            return rangeComparators.every(function (rangeComparator) {
-              return thisComparator.intersects(rangeComparator, options)
-            })
-          })
-        )
-      })
-    )
-  })
-}
 
-// take a set of comparators and determine whether there
-// exists a version which can satisfy it
-function isSatisfiable (comparators, options) {
-  var result = true
-  var remainingComparators = comparators.slice()
-  var testComparator = remainingComparators.pop()
 
-  while (result && remainingComparators.length) {
-    result = remainingComparators.every(function (otherComparator) {
-      return testComparator.intersects(otherComparator, options)
-    })
+async function readBazelToolsVersionFile(repoRootPath, versionFilename) {
+  const version = (await Object(_fs__WEBPACK_IMPORTED_MODULE_3__[/* readFile */ "f"])(Object(path__WEBPACK_IMPORTED_MODULE_1__["resolve"])(repoRootPath, versionFilename))).toString().trim();
 
-    testComparator = remainingComparators.pop()
+  if (!version) {
+    throw new Error(`[bazel_tools] Failed on reading bazel tools versions\n ${versionFilename} file do not contain any version set`);
   }
 
-  return result
+  return version;
 }
 
-// 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(' ')
-  })
-}
+async function isBazelBinAvailable(repoRootPath) {
+  try {
+    const installedVersion = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('bazel', ['--version'], {
+      stdio: 'pipe'
+    });
+    const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion');
 
-// 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
+    if (installedVersion.stdout === `bazel ${bazelVersion}`) {
+      return true;
+    } else {
+      _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] Bazel is installed (${installedVersion.stdout}), but was expecting ${bazelVersion}`);
+      return false;
+    }
+  } catch {
+    return false;
+  }
 }
 
-function isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+async function tryRemoveBazeliskFromYarnGlobal() {
+  try {
+    // Check if Bazelisk is installed on the yarn global scope
+    const {
+      stdout: bazeliskPkgInstallStdout
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('yarn', ['global', 'list'], {
+      stdio: 'pipe'
+    }); // Bazelisk was found on yarn global scope so lets remove it
 
-// ~, ~> --> * (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(' ')
+    if (bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@`)) {
+      await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('yarn', ['global', 'remove', `@bazel/bazelisk`], {
+        stdio: 'pipe'
+      });
+      _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] bazelisk was installed on Yarn global packages and is now removed`);
+      return true;
+    }
+
+    return false;
+  } catch {
+    return false;
+  }
 }
 
-function replaceTilde (comp, options) {
-  var r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr)
-    var ret
+async function installBazelTools(repoRootPath) {
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] reading bazel tools versions from version files`);
+  const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
+  const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed
 
-    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'
-    }
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] verify if bazelisk is installed`); // Check if we need to remove bazelisk from yarn
 
-    debug('tilde return', ret)
-    return ret
-  })
-}
+  await tryRemoveBazeliskFromYarnGlobal(); // Test if bazel bin is available
 
-// ^ --> * (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(' ')
-}
+  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(repoRootPath); // Install bazelisk if not installed
 
-function replaceCaret (comp, options) {
-  debug('caret', comp, options)
-  var r = options.loose ? re[t.CARETLOOSE] : re[t.CARET]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr)
-    var ret
+  if (!isBazelBinAlreadyAvailable) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] installing Bazel tools`);
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`);
+    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], {
+      env: {
+        USE_BAZEL_VERSION: bazelVersion
+      },
+      stdio: 'pipe'
+    });
+    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable(repoRootPath);
 
-    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'
-      }
+    if (!isBazelBinAvailableAfterInstall) {
+      throw new Error(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
+      `);
     }
+  }
 
-    debug('caret return', ret)
-    return ret
-  })
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].success(`[bazel_tools] all bazel tools are correctly installed`);
 }
 
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
-}
+/***/ }),
 
-function replaceXRange (comp, options) {
-  comp = comp.trim()
-  var r = options.loose ? re[t.XRANGELOOSE] : re[t.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
+/***/ "./src/utils/bazel/setup_remote_cache.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (gtlt === '=' && anyX) {
-      gtlt = ''
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return setupRemoteCache; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("fs");
+/* 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__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/fs.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-    // if we're including prereleases in the match, then we need
-    // to fix this to -0, the lowest possible prerelease value
-    pr = options.includePrerelease ? '-0' : ''
 
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.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
 
-      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
-        }
-      }
 
-      ret = gtlt + M + '.' + m + '.' + p + pr
-    } else if (xm) {
-      ret = '>=' + M + '.0.0' + pr + ' <' + (+M + 1) + '.0.0' + pr
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0' + pr +
-        ' <' + M + '.' + (+m + 1) + '.0' + pr
-    }
 
-    debug('xRange return', ret)
 
-    return ret
-  })
+
+async function isVaultAvailable() {
+  try {
+    await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawn */ "a"])('vault', ['--version'], {
+      stdio: 'pipe'
+    });
+    return true;
+  } catch {
+    return false;
+  }
 }
 
-// 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[t.STAR], '')
+async function isElasticCommitter() {
+  try {
+    const {
+      stdout: email
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawn */ "a"])('git', ['config', 'user.email'], {
+      stdio: 'pipe'
+    });
+    return email.trim().endsWith('@elastic.co');
+  } catch {
+    return false;
+  }
 }
 
-// This function is passed to string.replace(re[t.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
+async function migrateToNewServersIfNeeded(settingsPath) {
+  if (!(await Object(_fs__WEBPACK_IMPORTED_MODULE_5__[/* isFile */ "d"])(settingsPath))) {
+    return false;
   }
 
-  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 readSettingsFile = await Object(_fs__WEBPACK_IMPORTED_MODULE_5__[/* readFile */ "f"])(settingsPath, 'utf8');
+  const newReadSettingsFile = readSettingsFile.replace(/cloud\.buildbuddy\.io/g, 'remote.buildbuddy.io');
+
+  if (newReadSettingsFile === readSettingsFile) {
+    return false;
   }
 
-  return (from + ' ' + to).trim()
+  Object(_fs__WEBPACK_IMPORTED_MODULE_5__[/* writeFile */ "i"])(settingsPath, newReadSettingsFile);
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] upgrade remote cache settings to use new server address`);
+  return true;
 }
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
+async function setupRemoteCache(repoRootPath) {
+  // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
+  if (process.env.CI || !(await isElasticCommitter())) {
+    return;
   }
 
-  if (typeof version === 'string') {
-    try {
-      version = new SemVer(version, this.options)
-    } catch (er) {
-      return false
-    }
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] setting up remote cache settings if necessary`);
+  const settingsPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(repoRootPath, '.bazelrc.cache'); // Checks if we should upgrade the servers used on .bazelrc.cache
+  //
+  // NOTE: this can be removed in the future once everyone is migrated into the new servers
+
+  if (await migrateToNewServersIfNeeded(settingsPath)) {
+    return;
   }
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
-    }
+  if (Object(fs__WEBPACK_IMPORTED_MODULE_1__["existsSync"])(settingsPath)) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] remote cache settings already exist, skipping`);
+    return;
   }
-  return false
+
+  if (!(await isVaultAvailable())) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] use the following guide or reach out to Operations for assistance');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] https://github.com/elastic/infra/tree/master/docs/vault');
+    return;
+  }
+
+  let apiKey = '';
+
+  try {
+    const {
+      stdout
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawn */ "a"])('vault', ['read', '-field=readonly-key', 'secret/ui-team/kibana-bazel-remote-cache'], {
+      stdio: 'pipe'
+    });
+    apiKey = stdout.trim();
+  } catch (ex) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] unable to read bazel remote cache key from vault, are you authenticated?');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] ${ex}`);
+    return;
+  }
+
+  const contents = dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+    # V1 - This file is automatically generated by 'yarn kbn bootstrap'
+    # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
+    build --bes_results_url=https://app.buildbuddy.io/invocation/
+    build --bes_backend=grpcs://remote.buildbuddy.io
+    build --remote_cache=grpcs://remote.buildbuddy.io
+    build --remote_timeout=3600
+    build --remote_header=${apiKey}
+  `;
+  Object(fs__WEBPACK_IMPORTED_MODULE_1__["writeFileSync"])(settingsPath, contents);
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] remote cache settings written to ${settingsPath}`);
 }
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
+/***/ }),
+
+/***/ "./src/utils/bazel/yarn_integrity.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return removeYarnIntegrityFileIfExists; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/fs.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+async function removeYarnIntegrityFileIfExists(nodeModulesPath) {
+  try {
+    const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* tryRealpath */ "g"])(nodeModulesPath);
+    const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // check if the file exists and delete it in that case
+
+    if (await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* isFile */ "d"])(yarnIntegrityFilePath)) {
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* unlink */ "h"])(yarnIntegrityFilePath);
     }
+  } catch {// no-op
   }
+}
+
+/***/ }),
+
+/***/ "./src/utils/child_process.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return spawn; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return spawnStreaming; });
+/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("stream");
+/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(stream__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/chalk/source/index.js");
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/execa/index.js");
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/strong-log-transformer/index.js");
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
 
-  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
-      }
 
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch) {
-          return true
-        }
-      }
-    }
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
-  }
+const colorWheel = [chalk__WEBPACK_IMPORTED_MODULE_1___default.a.cyan, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.magenta, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.blue, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.yellow, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.green];
 
-  return true
-}
+const getColor = () => {
+  const color = colorWheel.shift();
+  colorWheel.push(color);
+  return color;
+};
 
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
+function spawn(command, args, opts) {
+  return execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
+    stdio: 'inherit',
+    preferLocal: true
+  }, opts));
 }
 
-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
-}
+function streamToLog(debug = true) {
+  return new stream__WEBPACK_IMPORTED_MODULE_0__["Writable"]({
+    objectMode: true,
 
-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)
+    write(line, _, cb) {
+      if (line.endsWith('\n')) {
+        _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"][debug ? 'debug' : 'write'](line.slice(0, -1));
+      } else {
+        _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"][debug ? 'debug' : 'write'](line);
       }
+
+      cb();
     }
-  })
-  return min
+
+  });
 }
 
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
+function spawnStreaming(command, args, opts, {
+  prefix,
+  debug
+}) {
+  const spawned = execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
+    stdio: ['ignore', 'pipe', 'pipe'],
+    preferLocal: true
+  }, opts));
+  const color = getColor();
+  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: color.bold(prefix)
+  });
+  spawned.stdout.pipe(prefixedStdout).pipe(streamToLog(debug)); // TypeScript note: As long as the proc stdio[1] is 'pipe', then stdout will not be null
 
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
-  }
+  spawned.stderr.pipe(prefixedStderr).pipe(streamToLog(debug)); // TypeScript note: As long as the proc stdio[2] is 'pipe', then stderr will not be null
 
-  minver = new SemVer('0.0.0-0')
-  if (range.test(minver)) {
-    return minver
-  }
+  return spawned;
+}
 
-  minver = null
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+/***/ }),
 
-    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)
-      }
-    })
-  }
+/***/ "./src/utils/convert_plugin_id_to_package_id.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (minver && range.test(minver)) {
-    return minver
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return convertPluginIdToPackageId; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function convertPluginIdToPackageId(pluginId) {
+  if (pluginId === 'core') {
+    // core is the only non-plugin
+    return `@kbn/core`;
   }
 
-  return null
+  return `@kbn/${pluginId.split('').flatMap(c => c.toUpperCase() === c ? `-${c.toLowerCase()}` : c).join('')}-plugin`.replace(/-\w(-\w)+-/g, match => `-${match.split('-').join('')}-`).replace(/-plugin-plugin$/, '-plugin');
 }
 
-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
+/***/ }),
+
+/***/ "./src/utils/errors.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CliError; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+class CliError extends Error {
+  constructor(message, meta = {}) {
+    super(message);
+    this.meta = meta;
   }
-}
 
-// 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)
 }
 
-// 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)
-}
+/***/ }),
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
+/***/ "./src/utils/fs.ts":
+/***/ (function(module, __webpack_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 ">"')
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return readFile; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return writeFile; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return chmod; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return mkdirp; });
+/* unused harmony export rmdirp */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return unlink; });
+/* unused harmony export copyDirectory */
+/* unused harmony export isSymlink */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return isDirectory; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return isFile; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return createSymlink; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return tryRealpath; });
+/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/cmd-shim/index.js");
+/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cmd_shim__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/del/index.js");
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/ncp/lib/ncp.js");
+/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(ncp__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("util");
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_5__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
-  }
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
 
-    var high = null
-    var low = null
 
-    comparators.forEach(function (comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
-      }
-      high = high || comparator
-      low = low || comparator
-      if (gtfn(comparator.semver, high.semver, options)) {
-        high = comparator
-      } else if (ltfn(comparator.semver, low.semver, options)) {
-        low = comparator
-      }
-    })
 
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false
-    }
+const lstat = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.lstat);
+const readFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.readFile);
+const writeFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.writeFile);
+const symlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.symlink);
+const chmod = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.chmod);
+const cmdShim = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(cmd_shim__WEBPACK_IMPORTED_MODULE_0___default.a);
+const mkdir = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.mkdir);
+const realpathNative = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.realpath.native);
+const mkdirp = async path => await mkdir(path, {
+  recursive: true
+});
+const rmdirp = async path => await del__WEBPACK_IMPORTED_MODULE_1___default()(path, {
+  force: true
+});
+const unlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.unlink);
+const copyDirectory = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(ncp__WEBPACK_IMPORTED_MODULE_3__["ncp"]);
 
-    // 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
+async function statTest(path, block) {
+  try {
+    return block(await lstat(path));
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      return false;
     }
+
+    throw e;
   }
-  return true
 }
+/**
+ * Test if a path points to a symlink.
+ * @param path
+ */
 
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+
+async function isSymlink(path) {
+  return await statTest(path, stats => stats.isSymbolicLink());
 }
+/**
+ * Test if a path points to a directory.
+ * @param path
+ */
 
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
+async function isDirectory(path) {
+  return await statTest(path, stats => stats.isDirectory());
 }
+/**
+ * Test if a path points to a regular file.
+ * @param path
+ */
 
-exports.coerce = coerce
-function coerce (version, options) {
-  if (version instanceof SemVer) {
-    return version
-  }
+async function isFile(path) {
+  return await statTest(path, stats => stats.isFile());
+}
+/**
+ * Create a symlink at dest that points to src. Adapted from
+ * https://github.com/lerna/lerna/blob/2f1b87d9e2295f587e4ac74269f714271d8ed428/src/FileSystemUtilities.js#L103.
+ *
+ * @param src
+ * @param dest
+ * @param type 'dir', 'file', 'junction', or 'exec'. 'exec' on
+ *  windows will use the `cmd-shim` module since symlinks can't be used
+ *  for executable files on windows.
+ */
 
-  if (typeof version === 'number') {
-    version = String(version)
+async function createSymlink(src, dest, type) {
+  if (process.platform === 'win32') {
+    if (type === 'exec') {
+      await cmdShim(src, dest);
+    } else {
+      await forceCreate(src, dest, type);
+    }
+  } else {
+    const posixType = type === 'exec' ? 'file' : type;
+    const relativeSource = Object(path__WEBPACK_IMPORTED_MODULE_4__["relative"])(Object(path__WEBPACK_IMPORTED_MODULE_4__["dirname"])(dest), src);
+    await forceCreate(relativeSource, dest, posixType);
   }
+}
 
-  if (typeof version !== 'string') {
-    return null
+async function forceCreate(src, dest, type) {
+  try {
+    // If something exists at `dest` we need to remove it first.
+    await unlink(dest);
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
   }
 
-  options = options || {}
+  await symlink(src, dest, type);
+}
 
-  var match = null
-  if (!options.rtl) {
-    match = version.match(re[t.COERCE])
-  } else {
-    // Find the right-most coercible string that does not share
-    // a terminus with a more left-ward coercible string.
-    // Eg, '1.2.3.4' wants to coerce '2.3.4', not '3.4' or '4'
-    //
-    // Walk through the string checking with a /g regexp
-    // Manually set the index so as to pick up overlapping matches.
-    // Stop when we get a match that ends at the string end, since no
-    // coercible string can be more right-ward without the same terminus.
-    var next
-    while ((next = re[t.COERCERTL].exec(version)) &&
-      (!match || match.index + match[0].length !== version.length)
-    ) {
-      if (!match ||
-          next.index + next[0].length !== match.index + match[0].length) {
-        match = next
-      }
-      re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length
-    }
-    // leave it in a clean state
-    re[t.COERCERTL].lastIndex = -1
-  }
+async function tryRealpath(path) {
+  let calculatedPath = path;
 
-  if (match === null) {
-    return null
+  try {
+    calculatedPath = await realpathNative(path);
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
   }
 
-  return parse(match[2] +
-    '.' + (match[3] || '0') +
-    '.' + (match[4] || '0'), options)
+  return calculatedPath;
 }
 
-
 /***/ }),
-/* 800 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/kibana.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Kibana; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/multimatch/index.js");
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/is-path-inside/index.js");
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/yarn_lock.ts");
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/config.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-const EventEmitter = __webpack_require__(285);
+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; }
 
-const written = new WeakMap();
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-class ProgressEmitter extends EventEmitter {
-	constructor(source, destination) {
-		super();
-		this._source = source;
-		this._destination = destination;
-	}
 
-	set written(value) {
-		written.set(this, value);
-		this.emitProgress();
-	}
 
-	get written() {
-		return written.get(this);
-	}
 
-	emitProgress() {
-		const {size, written} = this;
-		this.emit('progress', {
-			src: this._source,
-			dest: this._destination,
-			size,
-			written,
-			percent: written === size ? 1 : written / size
-		});
-	}
-}
 
-module.exports = ProgressEmitter;
 
 
-/***/ }),
-/* 801 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * 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.
+ */
 
-"use strict";
+class Kibana {
+  static async loadFrom(rootPath) {
+    return new Kibana(await Object(_projects__WEBPACK_IMPORTED_MODULE_5__[/* getProjects */ "b"])(rootPath, Object(_config__WEBPACK_IMPORTED_MODULE_6__[/* getProjectPaths */ "a"])({
+      rootPath
+    })));
+  }
 
+  constructor(allWorkspaceProjects) {
+    this.allWorkspaceProjects = allWorkspaceProjects;
 
-const blacklist = [
-	// # All
-	'^npm-debug\\.log$', // Error log for npm
-	'^\\..*\\.swp$', // Swap file for vim state
+    _defineProperty(this, "kibanaProject", void 0);
 
-	// # macOS
-	'^\\.DS_Store$', // Stores custom folder attributes
-	'^\\.AppleDouble$', // Stores additional file resources
-	'^\\.LSOverride$', // Contains the absolute path to the app to be used
-	'^Icon\\r$', // Custom Finder icon: http://superuser.com/questions/298785/icon-file-on-os-x-desktop
-	'^\\._.*', // Thumbnail
-	'^\\.Spotlight-V100(?:$|\\/)', // Directory that might appear on external disk
-	'\\.Trashes', // File that might appear on external disk
-	'^__MACOSX$', // Resource fork
+    const kibanaProject = allWorkspaceProjects.get('kibana');
 
-	// # Linux
-	'~$', // Backup file
+    if (!kibanaProject) {
+      throw new TypeError('Unable to create Kibana object without all projects, including the Kibana project.');
+    }
 
-	// # Windows
-	'^Thumbs\\.db$', // Image file cache
-	'^ehthumbs\\.db$', // Folder config file
-	'^Desktop\\.ini$', // Stores custom folder attributes
-	'@eaDir$' // Synology Diskstation "hidden" folder where the server stores thumbnails
-];
+    this.kibanaProject = kibanaProject;
+  }
+  /** make an absolute path by resolving subPath relative to the kibana repo */
 
-exports.re = () => {
-	throw new Error('`junk.re` was renamed to `junk.regex`');
-};
 
-exports.regex = new RegExp(blacklist.join('|'));
+  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 */
 
-exports.is = filename => exports.regex.test(filename);
 
-exports.not = filename => !exports.is(filename);
+  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 */
 
-// TODO: Remove this for the next major release
-exports.default = module.exports;
 
+  getAllProjects() {
+    return new Map(this.allWorkspaceProjects);
+  }
+  /** determine if a project with the given name exists */
 
-/***/ }),
-/* 802 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+  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_5__[/* includeTransitiveProjects */ "c"])([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_6__[/* getProjectPaths */ "a"])(_objectSpread(_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_2___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;
+  }
+
+  isPartOfRepo(project) {
+    return project.path === this.kibanaProject.path || is_path_inside__WEBPACK_IMPORTED_MODULE_3___default()(project.path, this.kibanaProject.path);
+  }
+
+  isOutsideRepo(project) {
+    return !this.isPartOfRepo(project);
+  }
 
-const pMap = __webpack_require__(803);
+  resolveAllProductionDependencies(yarnLock, log) {
+    const kibanaDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__[/* resolveDepsForProject */ "b"])({
+      project: this.kibanaProject,
+      yarnLock,
+      kbn: this,
+      includeDependentProject: true,
+      productionDepsOnly: true,
+      log
+    });
+    const xpackDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__[/* resolveDepsForProject */ "b"])({
+      project: this.getProject('x-pack'),
+      yarnLock,
+      kbn: this,
+      includeDependentProject: true,
+      productionDepsOnly: true,
+      log
+    });
+    return new Map([...kibanaDeps.entries(), ...xpackDeps.entries()]);
+  }
 
-const pFilter = async (iterable, filterer, options) => {
-	const values = await pMap(
-		iterable,
-		(element, index) => Promise.all([filterer(element, index), element]),
-		options
-	);
-	return values.filter(value => Boolean(value[0])).map(value => value[1]);
-};
+  getUuid() {
+    try {
+      return fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFileSync(this.getAbsolute('data/uuid'), 'utf-8').trim();
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return undefined;
+      }
 
-module.exports = pFilter;
-// TODO: Remove this for the next major release
-module.exports.default = pFilter;
+      throw error;
+    }
+  }
 
+}
 
 /***/ }),
-/* 803 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "./src/utils/link_project_executables.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-const pMap = (iterable, mapper, options) => new Promise((resolve, reject) => {
-	options = Object.assign({
-		concurrency: Infinity
-	}, options);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return linkProjectExecutables; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	if (typeof mapper !== 'function') {
-		throw new TypeError('Mapper function is required');
-	}
 
-	const {concurrency} = options;
 
-	if (!(typeof concurrency === 'number' && concurrency >= 1)) {
-		throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-	}
 
-	const ret = [];
-	const iterator = iterable[Symbol.iterator]();
-	let isRejected = false;
-	let isIterableDone = false;
-	let resolvingCount = 0;
-	let currentIndex = 0;
+/**
+ * Yarn does not link the executables from dependencies that are installed
+ * using `link:` https://github.com/yarnpkg/yarn/pull/5046
+ *
+ * We simulate this functionality by walking through each project's project
+ * dependencies, and manually linking their executables if defined. The logic
+ * for linking was mostly adapted from lerna: https://github.com/lerna/lerna/blob/1d7eb9eeff65d5a7de64dea73613b1bf6bfa8d57/src/PackageUtilities.js#L348
+ */
+async function linkProjectExecutables(projectsByName, projectGraph) {
+  _log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].debug(`Linking package executables`); // Find root and generate executables from dependencies for it
 
-	const next = () => {
-		if (isRejected) {
-			return;
-		}
+  let rootProject = null;
+  let rootProjectDeps = [];
 
-		const nextItem = iterator.next();
-		const i = currentIndex;
-		currentIndex++;
+  for (const [projectName, projectDeps] of projectGraph) {
+    const project = projectsByName.get(projectName);
 
-		if (nextItem.done) {
-			isIterableDone = true;
+    if (project.isSinglePackageJsonProject) {
+      rootProject = projectsByName.get(projectName);
+      rootProjectDeps = projectDeps;
+      break;
+    }
+  }
 
-			if (resolvingCount === 0) {
-				resolve(ret);
-			}
+  if (!rootProject) {
+    throw new Error('Could not finding root project while linking package executables');
+  } // Prepare root project node_modules/.bin
 
-			return;
-		}
 
-		resolvingCount++;
+  const rootBinsDir = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootProject.nodeModulesLocation, '.bin');
 
-		Promise.resolve(nextItem.value)
-			.then(element => mapper(element, i))
-			.then(
-				value => {
-					ret[i] = value;
-					resolvingCount--;
-					next();
-				},
-				error => {
-					isRejected = true;
-					reject(error);
-				}
-			);
-	};
+  for (const rootProjectDep of rootProjectDeps) {
+    const executables = rootProjectDep.getExecutables();
 
-	for (let i = 0; i < concurrency; i++) {
-		next();
+    for (const name of Object.keys(executables)) {
+      const srcPath = executables[name]; // existing logic from lerna -- ensure that the bin we are going to
+      // point to exists or ignore it
 
-		if (isIterableDone) {
-			break;
-		}
-	}
-});
+      if (!(await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* isFile */ "d"])(srcPath))) {
+        continue;
+      }
 
-module.exports = pMap;
-// TODO: Remove this for the next major release
-module.exports.default = pMap;
+      const dest = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootBinsDir, name); // Get relative project path with normalized path separators.
 
+      const rootProjectRelativePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["relative"])(rootProject.path, srcPath).split(path__WEBPACK_IMPORTED_MODULE_0__["sep"]).join('/');
+      _log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].debug(`[${rootProject.name}] ${name} -> ${rootProjectRelativePath}`);
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* mkdirp */ "e"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(dest));
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* createSymlink */ "b"])(srcPath, dest, 'exec');
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* chmod */ "a"])(dest, '755');
+    }
+  }
+}
 
 /***/ }),
-/* 804 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
-const NestedError = __webpack_require__(796);
-
-class CpyError extends NestedError {
-	constructor(message, nested) {
-		super(message, nested);
-		Object.assign(this, nested);
-		this.name = 'CpyError';
-	}
-}
+/***/ "./src/utils/log.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = CpyError;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return log; });
+/* unused harmony export Log */
+/* harmony import */ var _kbn_tooling_log__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@kbn/tooling-log/target_node/index.js");
+/* harmony import */ var _kbn_tooling_log__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_tooling_log__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; }
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-/***/ }),
-/* 805 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+class Log extends _kbn_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLog"] {
+  constructor() {
+    super();
 
-const fs = __webpack_require__(253);
-const arrayUnion = __webpack_require__(363);
-const merge2 = __webpack_require__(364);
-const fastGlob = __webpack_require__(806);
-const dirGlob = __webpack_require__(447);
-const gitignore = __webpack_require__(831);
-const {FilterStream, UniqueStream} = __webpack_require__(832);
+    _defineProperty(this, "logLevel", void 0);
 
-const DEFAULT_FILTER = () => false;
+    this.setLogLevel('info');
+  }
 
-const isNegative = pattern => pattern[0] === '!';
+  setLogLevel(level) {
+    this.logLevel = Object(_kbn_tooling_log__WEBPACK_IMPORTED_MODULE_0__["parseLogLevel"])(level);
+    this.setWriters([new _kbn_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLogTextWriter"]({
+      level: this.logLevel.name,
+      writeTo: process.stdout
+    })]);
+  }
 
-const assertPatternsInput = patterns => {
-	if (!patterns.every(pattern => typeof pattern === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
-};
+  wouldLogLevel(level) {
+    return this.logLevel.flags[level];
+  }
 
-const checkCwdOption = (options = {}) => {
-	if (!options.cwd) {
-		return;
-	}
+}
 
-	let stat;
-	try {
-		stat = fs.statSync(options.cwd);
-	} catch {
-		return;
-	}
+const log = new Log();
 
-	if (!stat.isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
-	}
-};
 
-const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
+/***/ }),
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
+/***/ "./src/utils/package_json.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	const globTasks = [];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return readPackageJson; });
+/* unused harmony export writePackageJson */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isLinkDependency; });
+/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/read-pkg/index.js");
+/* 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__("../../node_modules/write-pkg/index.js");
+/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	taskOptions = {
-		ignore: [],
-		expandDirectories: true,
-		...taskOptions
-	};
 
-	for (const [index, pattern] of patterns.entries()) {
-		if (isNegative(pattern)) {
-			continue;
-		}
+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:');
 
-		const ignore = patterns
-			.slice(index)
-			.filter(pattern => isNegative(pattern))
-			.map(pattern => pattern.slice(1));
+/***/ }),
 
-		const options = {
-			...taskOptions,
-			ignore: taskOptions.ignore.concat(ignore)
-		};
+/***/ "./src/utils/parallelize.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-		globTasks.push({pattern, options});
-	}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return parallelizeBatches; });
+/* unused harmony export parallelize */
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+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 globTasks;
-};
+  return new Promise((resolve, reject) => {
+    let activePromises = 0;
+    const values = items.slice(0);
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
-	}
+    async function scheduleItem(item) {
+      activePromises++;
 
-	if (Array.isArray(task.options.expandDirectories)) {
-		options = {
-			...options,
-			files: task.options.expandDirectories
-		};
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = {
-			...options,
-			...task.options.expandDirectories
-		};
-	}
+      try {
+        await fn(item);
+        activePromises--;
 
-	return fn(task.pattern, options);
-};
+        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);
+      }
+    }
 
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+    values.splice(0, concurrency).map(scheduleItem);
+  });
+}
 
-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);
-	}
+/***/ "./src/utils/project.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	return {
-		pattern: glob,
-		options
-	};
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Project; });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs");
+/* 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__("path");
+/* 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__("util");
+/* 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__("./src/utils/errors.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/scripts.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-module.exports = async (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-	const getFilter = async () => {
-		return options && options.gitignore ?
-			gitignore({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+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; }
 
-	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)));
-		}));
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-		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 = [];
-	for (const task of globTasks) {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		tasks.push(...newTask);
-	}
 
-	const filter = getFilterSync(options);
 
-	let matches = [];
-	for (const task of tasks) {
-		matches = arrayUnion(matches, fastGlob.sync(task.pattern, task.options));
-	}
+class Project {
+  static async fromPath(path) {
+    const pkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__[/* readPackageJson */ "b"])(path);
+    return new Project(pkgJson, path);
+  }
+  /** parsed package.json */
 
-	return matches.filter(path_ => !filter(path_));
-};
 
-module.exports.stream = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+  constructor(packageJson, projectPath) {
+    _defineProperty(this, "json", void 0);
 
-	const tasks = [];
-	for (const task of globTasks) {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		tasks.push(...newTask);
-	}
+    _defineProperty(this, "packageJsonLocation", void 0);
 
-	const filter = getFilterSync(options);
-	const filterStream = new FilterStream(p => !filter(p));
-	const uniqueStream = new UniqueStream();
+    _defineProperty(this, "nodeModulesLocation", void 0);
 
-	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
-		.pipe(filterStream)
-		.pipe(uniqueStream);
-};
+    _defineProperty(this, "targetLocation", void 0);
 
-module.exports.generateGlobTasks = generateGlobTasks;
+    _defineProperty(this, "path", void 0);
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => fastGlob.isDynamicPattern(pattern, options));
+    _defineProperty(this, "version", void 0);
 
-module.exports.gitignore = gitignore;
+    _defineProperty(this, "allDependencies", void 0);
 
+    _defineProperty(this, "productionDependencies", void 0);
 
-/***/ }),
-/* 806 */
-/***/ (function(module, exports, __webpack_require__) {
+    _defineProperty(this, "devDependencies", void 0);
 
-"use strict";
+    _defineProperty(this, "scripts", void 0);
 
-const taskManager = __webpack_require__(807);
-const async_1 = __webpack_require__(817);
-const stream_1 = __webpack_require__(827);
-const sync_1 = __webpack_require__(828);
-const settings_1 = __webpack_require__(830);
-const utils = __webpack_require__(808);
-async function FastGlob(source, options) {
-    assertPatternsInput(source);
-    const works = getWorks(source, async_1.default, options);
-    const result = await Promise.all(works);
-    return utils.array.flatten(result);
-}
-// https://github.com/typescript-eslint/typescript-eslint/issues/60
-// eslint-disable-next-line no-redeclare
-(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;
-    function isDynamicPattern(source, options) {
-        assertPatternsInput(source);
-        const settings = new settings_1.default(options);
-        return utils.pattern.isDynamicPattern(source, settings);
-    }
-    FastGlob.isDynamicPattern = isDynamicPattern;
-    function escapePath(source) {
-        assertPatternsInput(source);
-        return utils.path.escape(source);
-    }
-    FastGlob.escapePath = escapePath;
-})(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(input) {
-    const source = [].concat(input);
-    const isValidSource = source.every((item) => utils.string.isString(item) && !utils.string.isEmpty(item));
-    if (!isValidSource) {
-        throw new TypeError('Patterns must be a string (non empty) or an array of strings');
-    }
-}
-module.exports = FastGlob;
+    _defineProperty(this, "bazelPackage", void 0);
 
+    _defineProperty(this, "isSinglePackageJsonProject", false);
 
-/***/ }),
-/* 807 */
-/***/ (function(module, exports, __webpack_require__) {
+    this.json = Object.freeze(packageJson);
+    this.path = projectPath;
+    this.packageJsonLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'package.json');
+    this.nodeModulesLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'node_modules');
+    this.targetLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'target');
+    this.version = this.json.version;
+    this.productionDependencies = this.json.dependencies || {};
+    this.devDependencies = this.json.devDependencies || {};
+    this.allDependencies = _objectSpread(_objectSpread({}, this.devDependencies), this.productionDependencies);
+    this.isSinglePackageJsonProject = this.json.name === 'kibana';
+    this.scripts = this.json.scripts || {};
+    this.bazelPackage = !this.isSinglePackageJsonProject && fs__WEBPACK_IMPORTED_MODULE_0___default.a.existsSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'BUILD.bazel'));
+  }
 
-"use strict";
+  get name() {
+    return this.json.name;
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
-const utils = __webpack_require__(808);
-function generate(patterns, settings) {
-    const positivePatterns = getPositivePatterns(patterns);
-    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
-    const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
-    const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
-    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
-    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
-    return staticTasks.concat(dynamicTasks);
-}
-exports.generate = generate;
-/**
- * Returns tasks grouped by basic pattern directories.
- *
- * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
- * This is necessary because directory traversal starts at the base directory and goes deeper.
- */
-function convertPatternsToTasks(positive, negative, dynamic) {
-    const tasks = [];
-    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
-    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
-    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
-    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
-    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
-    /*
-     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
-     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
-     */
-    if ('.' in insideCurrentDirectoryGroup) {
-        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
-    }
-    else {
-        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
-    }
-    return tasks;
-}
-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) {
-    const group = {};
-    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;
-    }, group);
-}
-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))
+  ensureValidProjectDependency(project) {
+    const relativePathToProject = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, project.path));
+    const relativePathToProjectIfBazelPkg = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, `${__dirname}/../../../bazel-bin/packages/${path__WEBPACK_IMPORTED_MODULE_1___default.a.basename(project.path)}`));
+    const versionInPackageJson = this.allDependencies[project.name];
+    const expectedVersionInPackageJson = `link:${relativePathToProject}`;
+    const expectedVersionInPackageJsonIfBazelPkg = `link:${relativePathToProjectIfBazelPkg}`; // TODO: after introduce bazel to build all the packages and completely remove the support for kbn packages
+    //  do not allow child projects to hold dependencies, unless they are meant to be published externally
+
+    if (versionInPackageJson === expectedVersionInPackageJson || versionInPackageJson === expectedVersionInPackageJsonIfBazelPkg) {
+      return;
+    }
+
+    const updateMsg = 'Update its package.json to the expected value below.';
+    const meta = {
+      actual: `"${project.name}": "${versionInPackageJson}"`,
+      expected: `"${project.name}": "${expectedVersionInPackageJson}" or "${project.name}": "${expectedVersionInPackageJsonIfBazelPkg}"`,
+      package: `${this.name} (${this.packageJsonLocation})`
     };
-}
-exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
+    if (Object(_package_json__WEBPACK_IMPORTED_MODULE_5__[/* isLinkDependency */ "a"])(versionInPackageJson)) {
+      throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`[${this.name}] depends on [${project.name}] using 'link:', but the path is wrong. ${updateMsg}`, meta);
+    }
 
-/***/ }),
-/* 808 */
-/***/ (function(module, exports, __webpack_require__) {
+    throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`[${this.name}] depends on [${project.name}] but it's not using the local package. ${updateMsg}`, meta);
+  }
 
-"use strict";
+  getBuildConfig() {
+    return this.json.kibana && this.json.kibana.build || {};
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
-const array = __webpack_require__(809);
-exports.array = array;
-const errno = __webpack_require__(810);
-exports.errno = errno;
-const fs = __webpack_require__(811);
-exports.fs = fs;
-const path = __webpack_require__(812);
-exports.path = path;
-const pattern = __webpack_require__(813);
-exports.pattern = pattern;
-const stream = __webpack_require__(815);
-exports.stream = stream;
-const string = __webpack_require__(816);
-exports.string = string;
+  getCleanConfig() {
+    return this.json.kibana && this.json.kibana.clean || {};
+  }
 
+  isBazelPackage() {
+    return this.bazelPackage;
+  }
 
-/***/ }),
-/* 809 */
-/***/ (function(module, exports, __webpack_require__) {
+  isFlaggedAsDevOnly() {
+    return !!(this.json.kibana && this.json.kibana.devOnly);
+  }
 
-"use strict";
+  hasScript(name) {
+    return name in this.scripts;
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitWhen = exports.flatten = void 0;
-function flatten(items) {
-    return items.reduce((collection, item) => [].concat(collection, item), []);
-}
-exports.flatten = flatten;
-function splitWhen(items, predicate) {
-    const result = [[]];
-    let groupIndex = 0;
-    for (const item of items) {
-        if (predicate(item)) {
-            groupIndex++;
-            result[groupIndex] = [];
-        }
-        else {
-            result[groupIndex].push(item);
-        }
+  getExecutables() {
+    const raw = this.json.bin;
+
+    if (!raw) {
+      return {};
     }
-    return result;
-}
-exports.splitWhen = splitWhen;
 
+    if (typeof raw === 'string') {
+      return {
+        [this.name]: path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw)
+      };
+    }
 
-/***/ }),
-/* 810 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (typeof raw === 'object') {
+      const binsConfig = {};
 
-"use strict";
+      for (const binName of Object.keys(raw)) {
+        binsConfig[binName] = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw[binName]);
+      }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnoentCodeError = void 0;
-function isEnoentCodeError(error) {
-    return error.code === 'ENOENT';
-}
-exports.isEnoentCodeError = isEnoentCodeError;
+      return binsConfig;
+    }
 
+    throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, {
+      binConfig: Object(util__WEBPACK_IMPORTED_MODULE_2__["inspect"])(raw),
+      package: `${this.name} (${this.packageJsonLocation})`
+    });
+  }
 
-/***/ }),
-/* 811 */
-/***/ (function(module, exports, __webpack_require__) {
+  async runScript(scriptName, args = []) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`Running script [${scriptName}] in [${this.name}]:`);
+    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__[/* runScriptInPackage */ "a"])(scriptName, args, this);
+  }
 
-"use strict";
+  runScriptStreaming(scriptName, options = {}) {
+    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__[/* runScriptInPackageStreaming */ "b"])({
+      script: scriptName,
+      args: options.args || [],
+      pkg: this,
+      debug: options.debug
+    });
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDirentFromStats = void 0;
-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;
+  hasDependencies() {
+    return Object.keys(this.allDependencies).length > 0;
+  }
+
+  isEveryDependencyLocal() {
+    return Object.values(this.allDependencies).every(dep => Object(_package_json__WEBPACK_IMPORTED_MODULE_5__[/* isLinkDependency */ "a"])(dep));
+  }
+
+} // We normalize all path separators to `/` in generated files
 
+function normalizePath(path) {
+  return path.replace(/[\\\/]+/g, '/');
+}
 
 /***/ }),
-/* 812 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "./src/utils/projects.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
-const path = __webpack_require__(4);
-const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
-const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
-/**
- * Designed to work only with simple paths: `dir\\file`.
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return getProjects; });
+/* unused harmony export getNonBazelProjectsOnly */
+/* unused harmony export getBazelProjectsOnly */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return buildProjectGraph; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return topologicallyBatchProjects; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return includeTransitiveProjects; });
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/glob/glob.js");
+/* 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__("path");
+/* 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__("util");
+/* 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__("./src/utils/errors.ts");
+/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/project.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
-function unixify(filepath) {
-    return filepath.replace(/\\/g, '/');
-}
-exports.unixify = unixify;
-function makeAbsolute(cwd, filepath) {
-    return path.resolve(cwd, filepath);
-}
-exports.makeAbsolute = makeAbsolute;
-function escape(pattern) {
-    return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, '\\$2');
-}
-exports.escape = escape;
-function removeLeadingDotSegment(entry) {
-    // We do not use `startsWith` because this is 10x slower than current implementation for some cases.
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (entry.charAt(0) === '.') {
-        const secondCharactery = entry.charAt(1);
-        if (secondCharactery === '/' || secondCharactery === '\\') {
-            return entry.slice(LEADING_DOT_SEGMENT_CHARACTERS_COUNT);
-        }
-    }
-    return entry;
-}
-exports.removeLeadingDotSegment = removeLeadingDotSegment;
 
 
-/***/ }),
-/* 813 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
-const path = __webpack_require__(4);
-const globParent = __webpack_require__(386);
-const micromatch = __webpack_require__(814);
-const GLOBSTAR = '**';
-const ESCAPE_SYMBOL = '\\';
-const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/;
-const REGEX_CHARACTER_CLASS_SYMBOLS_RE = /\[.*]/;
-const REGEX_GROUP_SYMBOLS_RE = /(?:^|[^!*+?@])\(.*\|.*\)/;
-const GLOB_EXTENSION_SYMBOLS_RE = /[!*+?@]\(.*\)/;
-const BRACE_EXPANSIONS_SYMBOLS_RE = /{.*(?:,|\.\.).*}/;
-function isStaticPattern(pattern, options = {}) {
-    return !isDynamicPattern(pattern, options);
-}
-exports.isStaticPattern = isStaticPattern;
-function isDynamicPattern(pattern, options = {}) {
-    /**
-     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
-     * An empty string cannot be a dynamic pattern.
-     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
-     */
-    if (pattern === '') {
-        return false;
-    }
-    /**
-     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
-     * filepath directly (without read directory).
-     */
-    if (options.caseSensitiveMatch === false || pattern.includes(ESCAPE_SYMBOL)) {
-        return true;
-    }
-    if (COMMON_GLOB_SYMBOLS_RE.test(pattern) || REGEX_CHARACTER_CLASS_SYMBOLS_RE.test(pattern) || REGEX_GROUP_SYMBOLS_RE.test(pattern)) {
-        return true;
-    }
-    if (options.extglob !== false && GLOB_EXTENSION_SYMBOLS_RE.test(pattern)) {
-        return true;
-    }
-    if (options.braceExpansion !== false && BRACE_EXPANSIONS_SYMBOLS_RE.test(pattern)) {
-        return true;
-    }
-    return 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;
-/**
- * Returns patterns that can be applied inside the current directory.
- *
- * @example
- * // ['./*', '*', 'a/*']
- * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
- */
-function getPatternsInsideCurrentDirectory(patterns) {
-    return patterns.filter((pattern) => !isPatternRelatedToParentDirectory(pattern));
-}
-exports.getPatternsInsideCurrentDirectory = getPatternsInsideCurrentDirectory;
-/**
- * Returns patterns to be expanded relative to (outside) the current directory.
- *
- * @example
- * // ['../*', './../*']
- * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
- */
-function getPatternsOutsideCurrentDirectory(patterns) {
-    return patterns.filter(isPatternRelatedToParentDirectory);
-}
-exports.getPatternsOutsideCurrentDirectory = getPatternsOutsideCurrentDirectory;
-function isPatternRelatedToParentDirectory(pattern) {
-    return pattern.startsWith('..') || pattern.startsWith('./..');
-}
-exports.isPatternRelatedToParentDirectory = isPatternRelatedToParentDirectory;
-function getBaseDirectory(pattern) {
-    return globParent(pattern, { flipBackslashes: false });
-}
-exports.getBaseDirectory = getBaseDirectory;
-function hasGlobStar(pattern) {
-    return pattern.includes(GLOBSTAR);
-}
-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 expandPatternsWithBraceExpansion(patterns) {
-    return patterns.reduce((collection, pattern) => {
-        return collection.concat(expandBraceExpansion(pattern));
-    }, []);
-}
-exports.expandPatternsWithBraceExpansion = expandPatternsWithBraceExpansion;
-function expandBraceExpansion(pattern) {
-    return micromatch.braces(pattern, {
-        expand: true,
-        nodupes: true
+
+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 = []
+} = {}, bazelOnly = false) {
+  const projects = new Map();
+
+  for (const pattern of projectsPathsPatterns) {
+    const pathsToProcess = await packagesFromGlobPattern({
+      pattern,
+      rootPath
     });
-}
-exports.expandBraceExpansion = expandBraceExpansion;
-function getPatternParts(pattern, options) {
-    let { parts } = micromatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
-    /**
-     * The scan method returns an empty array in some cases.
-     * See micromatch/picomatch#58 for more details.
-     */
-    if (parts.length === 0) {
-        parts = [pattern];
-    }
-    /**
-     * The scan method does not return an empty part for the pattern with a forward slash.
-     * This is another part of micromatch/picomatch#58.
-     */
-    if (parts[0].startsWith('/')) {
-        parts[0] = parts[0].slice(1);
-        parts.unshift('');
+
+    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 */ "a"].fromPath(projectDir);
+      const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name) || bazelOnly && !project.isBazelPackage();
+
+      if (excludeProject) {
+        continue;
+      }
+
+      if (projects.has(project.name)) {
+        throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`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 parts;
+  }
+
+  return projects;
 }
-exports.getPatternParts = getPatternParts;
-function makeRe(pattern, options) {
-    return micromatch.makeRe(pattern, options);
+async function getNonBazelProjectsOnly(projects) {
+  const bazelProjectsOnly = new Map();
+
+  for (const project of projects.values()) {
+    if (!project.isBazelPackage()) {
+      bazelProjectsOnly.set(project.name, project);
+    }
+  }
+
+  return bazelProjectsOnly;
 }
-exports.makeRe = makeRe;
-function convertPatternsToRe(patterns, options) {
-    return patterns.map((pattern) => makeRe(pattern, options));
+async function getBazelProjectsOnly(projects) {
+  const bazelProjectsOnly = new Map();
+
+  for (const project of projects.values()) {
+    if (project.isBazelPackage()) {
+      bazelProjectsOnly.set(project.name, project);
+    }
+  }
+
+  return bazelProjectsOnly;
 }
-exports.convertPatternsToRe = convertPatternsToRe;
-function matchAny(entry, patternsRe) {
-    return patternsRe.some((patternRe) => patternRe.test(entry));
+
+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);
 }
-exports.matchAny = matchAny;
 
+function buildProjectGraph(projects) {
+  const projectGraph = new Map();
 
-/***/ }),
-/* 814 */
-/***/ (function(module, exports, __webpack_require__) {
+  for (const project of projects.values()) {
+    const projectDeps = [];
+    const dependencies = project.allDependencies;
 
-"use strict";
+    for (const depName of Object.keys(dependencies)) {
+      if (projects.has(depName)) {
+        const dep = projects.get(depName);
+        project.ensureValidProjectDependency(dep);
+        projectDeps.push(dep);
+      }
+    }
 
+    projectGraph.set(project.name, projectDeps);
+  }
 
-const util = __webpack_require__(234);
-const braces = __webpack_require__(390);
-const picomatch = __webpack_require__(400);
-const utils = __webpack_require__(403);
-const isEmptyString = val => val === '' || val === './';
+  return projectGraph;
+}
+function topologicallyBatchProjects(projectsToBatch, projectGraph) {
+  // We're going to be chopping stuff out of this list, so copy it.
+  const projectsLeftToBatch = new Set(projectsToBatch.keys());
+  const batches = [];
 
-/**
- * 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
- */
+  while (projectsLeftToBatch.size > 0) {
+    // Get all projects that have no remaining dependencies within the repo
+    // that haven't yet been picked.
+    const batch = [];
 
-const micromatch = (list, patterns, options) => {
-  patterns = [].concat(patterns);
-  list = [].concat(list);
+    for (const projectName of projectsLeftToBatch) {
+      const projectDeps = projectGraph.get(projectName);
+      const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name));
 
-  let omit = new Set();
-  let keep = new Set();
-  let items = new Set();
-  let negatives = 0;
+      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.
 
-  let onResult = state => {
-    items.add(state.output);
-    if (options && options.onResult) {
-      options.onResult(state);
+
+    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 */ "a"](message);
     }
-  };
 
-  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++;
+    batches.push(batch);
+    batch.forEach(project => projectsLeftToBatch.delete(project.name));
+  }
 
-    for (let item of list) {
-      let matched = isMatch(item, true);
+  return batches;
+}
+function includeTransitiveProjects(subsetOfProjects, allProjects, {
+  onlyProductionDependencies = false
+} = {}) {
+  const projectsWithDependents = new Map(); // the current list of packages we are expanding using breadth-first-search
 
-      let match = negated ? !matched.isMatch : matched.isMatch;
-      if (!match) continue;
+  const toProcess = [...subsetOfProjects];
 
-      if (negated) {
-        omit.add(matched.output);
-      } else {
-        omit.delete(matched.output);
-        keep.add(matched.output);
+  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);
   }
 
-  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(', ')}"`);
-    }
+  return projectsWithDependents;
+}
 
-    if (options.nonull === true || options.nullglob === true) {
-      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
-    }
-  }
+/***/ }),
 
-  return matches;
-};
+/***/ "./src/utils/projects_tree.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Backwards compatibility
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return renderProjectsTree; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return treeToString; });
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/chalk/source/index.js");
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-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
- */
+const projectKey = Symbol('__project');
+function renderProjectsTree(rootPath, projects) {
+  const projectsTree = buildProjectsTree(rootPath, projects);
+  return treeToString(createTreeStructure(projectsTree));
+}
+function treeToString(tree) {
+  return [tree.name].concat(childrenToStrings(tree.children, '')).join('\n');
+}
 
-micromatch.matcher = (pattern, options) => picomatch(pattern, options);
+function childrenToStrings(tree, treePrefix) {
+  if (tree === undefined) {
+    return [];
+  }
 
-/**
- * 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
- */
+  let strings = [];
+  tree.forEach((node, index) => {
+    const isLastNode = tree.length - 1 === index;
+    const nodePrefix = isLastNode ? '└── ' : '├── ';
+    const childPrefix = isLastNode ? '    ' : '│   ';
+    const childrenPrefix = treePrefix + childPrefix;
+    strings.push(`${treePrefix}${nodePrefix}${node.name}`);
+    strings = strings.concat(childrenToStrings(node.children, childrenPrefix));
+  });
+  return strings;
+}
 
-micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+function createTreeStructure(tree) {
+  let name;
+  const children = [];
 
-/**
- * Backwards compatibility
- */
+  for (const [dir, project] of tree.entries()) {
+    // This is a leaf node (aka a project)
+    if (typeof project === 'string') {
+      name = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(project);
+      continue;
+    } // If there's only one project and the key indicates it's a leaf node, we
+    // know that we're at a package folder that contains a package.json, so we
+    // "inline it" so we don't get unnecessary levels, i.e. we'll just see
+    // `foo` instead of `foo -> foo`.
 
-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
- */
+    if (project.size === 1 && project.has(projectKey)) {
+      const projectName = project.get(projectKey);
+      children.push({
+        children: [],
+        name: dirOrProjectName(dir, projectName)
+      });
+      continue;
+    }
 
-micromatch.not = (list, patterns, options = {}) => {
-  patterns = [].concat(patterns).map(String);
-  let result = new Set();
-  let items = [];
+    const subtree = createTreeStructure(project); // If the name is specified, we know there's a package at the "root" of the
+    // subtree itself.
 
-  let onResult = state => {
-    if (options.onResult) options.onResult(state);
-    items.push(state.output);
-  };
+    if (subtree.name !== undefined) {
+      const projectName = subtree.name;
+      children.push({
+        children: subtree.children,
+        name: dirOrProjectName(dir, projectName)
+      });
+      continue;
+    } // Special-case whenever we have one child, so we don't get unnecessary
+    // folders in the output. E.g. instead of `foo -> bar -> baz` we get
+    // `foo/bar/baz` instead.
 
-  let matches = micromatch(list, patterns, { ...options, onResult });
 
-  for (let item of items) {
-    if (!matches.includes(item)) {
-      result.add(item);
+    if (subtree.children && subtree.children.length === 1) {
+      const child = subtree.children[0];
+      const newName = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(dir.toString(), child.name));
+      children.push({
+        children: child.children,
+        name: newName
+      });
+      continue;
     }
-  }
-  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 any of the patterns 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)}"`);
+    children.push({
+      children: subtree.children,
+      name: chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(dir.toString())
+    });
   }
 
-  if (Array.isArray(pattern)) {
-    return pattern.some(p => micromatch.contains(str, p, options));
-  }
+  return {
+    name,
+    children
+  };
+}
 
-  if (typeof pattern === 'string') {
-    if (isEmptyString(str) || isEmptyString(pattern)) {
-      return false;
-    }
+function dirOrProjectName(dir, projectName) {
+  return dir === projectName ? chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(dir) : chalk__WEBPACK_IMPORTED_MODULE_0___default.a`{dim ${dir.toString()} ({reset.green ${projectName}})}`;
+}
 
-    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
-      return true;
+function buildProjectsTree(rootPath, projects) {
+  const tree = new Map();
+
+  for (const project of projects.values()) {
+    if (rootPath === project.path) {
+      tree.set(projectKey, project.name);
+    } else {
+      const relativeProjectPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(rootPath, project.path);
+      addProjectToTree(tree, relativeProjectPath.split(path__WEBPACK_IMPORTED_MODULE_1___default.a.sep), project);
     }
   }
 
-  return micromatch.isMatch(str, pattern, { ...options, contains: true });
-};
+  return tree;
+}
 
-/**
- * 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
- */
+function addProjectToTree(tree, pathParts, project) {
+  if (pathParts.length === 0) {
+    tree.set(projectKey, project.name);
+  } else {
+    const [currentDir, ...rest] = pathParts;
 
-micromatch.matchKeys = (obj, patterns, options) => {
-  if (!utils.isObject(obj)) {
-    throw new TypeError('Expected the first argument to be an object');
+    if (!tree.has(currentDir)) {
+      tree.set(currentDir, new Map());
+    }
+
+    const subtree = tree.get(currentDir);
+    addProjectToTree(subtree, rest, project);
   }
-  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` matches any of the strings in `list`
- * @api public
+/***/ }),
+
+/***/ "./src/utils/regenerate_base_tsconfig.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return regenerateBaseTsconfig; });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/normalize-path/index.js");
+/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(normalize_path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/convert_plugin_id_to_package_id.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-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 all `patterns` matches all of the strings in `list`
- * @api public
- */
 
-micromatch.every = (list, patterns, options) => {
-  let items = [].concat(list);
+async function regenerateBaseTsconfig(plugins, repoRoot) {
+  const tsconfigPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(repoRoot, 'tsconfig.base.json');
+  const lines = (await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(tsconfigPath, 'utf-8')).split('\n');
+  const packageMap = plugins.slice().sort((a, b) => a.manifestPath.localeCompare(b.manifestPath)).flatMap(p => {
+    const id = Object(_convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__[/* convertPluginIdToPackageId */ "a"])(p.manifest.id);
+    const path = normalize_path__WEBPACK_IMPORTED_MODULE_2___default()(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(repoRoot, p.directory));
+    return [`      "${id}": ["${path}"],`, `      "${id}/*": ["${path}/*"],`];
+  });
+  const start = lines.findIndex(l => l.trim() === '// START AUTOMATED PACKAGE LISTING');
+  const end = lines.findIndex(l => l.trim() === '// END AUTOMATED PACKAGE LISTING');
+  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(tsconfigPath, [...lines.slice(0, start + 1), ...packageMap, ...lines.slice(end)].join('\n'));
+}
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (!items.every(item => isMatch(item))) {
-      return false;
-    }
-  }
-  return true;
-};
+/***/ }),
 
-/**
- * Returns true if **all** of the given `patterns` match
- * the specified string.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.all(string, patterns[, options]);
- *
- * console.log(mm.all('foo.js', ['foo.js']));
- * // true
- *
- * console.log(mm.all('foo.js', ['*.js', '!foo.js']));
- * // false
- *
- * console.log(mm.all('foo.js', ['*.js', 'foo.js']));
- * // true
- *
- * console.log(mm.all('foo.js', ['*.js', 'f*', '*o*', '*o.js']));
- * // true
- * ```
- * @param {String|Array} `str` The string to test.
- * @param {String|Array} `patterns` One or more glob patterns to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
+/***/ "./src/utils/regenerate_package_json.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return regeneratePackageJson; });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _kbn_sort_package_json__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@kbn/sort-package-json/target_node/index.js");
+/* harmony import */ var _kbn_sort_package_json__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_kbn_sort_package_json__WEBPACK_IMPORTED_MODULE_2__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-micromatch.all = (str, patterns, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
-  }
 
-  return [].concat(patterns).every(p => picomatch(p, options)(str));
-};
 
-/**
- * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.capture(pattern, string[, options]);
- *
- * console.log(mm.capture('test/*.js', 'test/foo.js'));
- * //=> ['foo']
- * console.log(mm.capture('test/*.js', 'foo/bar.css'));
- * //=> null
- * ```
- * @param {String} `glob` Glob pattern to use for matching.
- * @param {String} `input` String to match
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Array|null} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
- * @api public
- */
+async function regeneratePackageJson(rootPath) {
+  const path = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'package.json');
+  const json = await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(path, 'utf8');
+  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(path, Object(_kbn_sort_package_json__WEBPACK_IMPORTED_MODULE_2__["sortPackageJson"])(json));
+}
 
-micromatch.capture = (glob, input, options) => {
-  let posix = utils.isWindows(options);
-  let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
-  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
+/***/ }),
 
-  if (match) {
-    return match.slice(1).map(v => v === void 0 ? '' : v);
-  }
-};
+/***/ "./src/utils/regenerate_synthetic_package_map.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * 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
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return regenerateSyntheticPackageMap; });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/normalize-path/index.js");
+/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(normalize_path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/convert_plugin_id_to_package_id.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-/**
- * Scan a glob pattern to separate the pattern into segments. Used
- * by the [split](#split) method.
- *
- * ```js
- * const mm = require('micromatch');
- * const state = mm.scan(pattern[, options]);
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object} Returns an object with
- * @api public
- */
 
-micromatch.scan = (...args) => picomatch.scan(...args);
 
-/**
- * Parse a glob pattern to create the source string for a regular
- * expression.
- *
- * ```js
- * const mm = require('micromatch');
- * const state = mm(pattern[, options]);
- * ```
- * @param {String} `glob`
- * @param {Object} `options`
- * @return {Object} Returns an object with useful properties and output to be used as regex source string.
- * @api public
- */
+async function regenerateSyntheticPackageMap(plugins, repoRoot) {
+  const entries = [['@kbn/core', 'src/core']];
 
-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));
-    }
+  for (const plugin of plugins) {
+    entries.push([Object(_convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__[/* convertPluginIdToPackageId */ "a"])(plugin.manifest.id), normalize_path__WEBPACK_IMPORTED_MODULE_2___default()(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(repoRoot, plugin.directory))]);
   }
-  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
- */
+  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(repoRoot, 'packages/kbn-synthetic-package-map/synthetic-packages.json'), JSON.stringify(entries, null, 2));
+}
 
-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
+/***/ "./src/utils/scripts.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return runScriptInPackage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return runScriptInPackageStreaming; });
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/utils/child_process.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-micromatch.braceExpand = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  return micromatch.braces(pattern, { ...options, expand: true });
-};
+const YARN_EXEC = process.env.npm_execpath || 'yarn';
+/**
+ * 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 */ "a"])(YARN_EXEC, ['run', script, ...args], execOpts);
+}
 /**
- * Expose micromatch
+ * Run script in the given directory
  */
 
-module.exports = micromatch;
-
+function runScriptInPackageStreaming({
+  script,
+  args,
+  pkg,
+  debug
+}) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__[/* spawnStreaming */ "b"])(YARN_EXEC, ['run', script, ...args], execOpts, {
+    prefix: pkg.name,
+    debug
+  });
+}
 
 /***/ }),
-/* 815 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/validate_dependencies.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return validateDependencies; });
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@yarnpkg/lockfile/index.js");
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/chalk/source/index.js");
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony import */ var _projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/projects_tree.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// @ts-expect-error published types are useless
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = void 0;
-const merge2 = __webpack_require__(364);
-function merge(streams) {
-    const mergedStream = merge2(streams);
-    streams.forEach((stream) => {
-        stream.once('error', (error) => mergedStream.emit('error', error));
-    });
-    mergedStream.once('close', () => propagateCloseEventToSources(streams));
-    mergedStream.once('end', () => propagateCloseEventToSources(streams));
-    return mergedStream;
-}
-exports.merge = merge;
-function propagateCloseEventToSources(streams) {
-    streams.forEach((stream) => stream.emit('close'));
-}
 
 
-/***/ }),
-/* 816 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.isString = void 0;
-function isString(input) {
-    return typeof input === 'string';
-}
-exports.isString = isString;
-function isEmpty(input) {
-    return input === '';
-}
-exports.isEmpty = isEmpty;
 
 
-/***/ }),
-/* 817 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+async function validateDependencies(kbn, yarnLock) {
+  // look through all of the packages in the yarn.lock file to see if
+  // we have accidentally installed multiple lodash v4 versions
+  const lodash4Versions = new Set();
+  const lodash4Reqs = new Set();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(818);
-const provider_1 = __webpack_require__(820);
-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);
+  for (const [req, dep] of Object.entries(yarnLock)) {
+    if (req.startsWith('lodash@') && dep.version.startsWith('4.')) {
+      lodash4Reqs.add(req);
+      lodash4Versions.add(dep.version);
     }
-}
-exports.default = ProviderAsync;
-
-
-/***/ }),
-/* 818 */
-/***/ (function(module, exports, __webpack_require__) {
+  } // if we find more than one lodash v4 version installed then delete
+  // lodash v4 requests from the yarn.lock file and prompt the user to
+  // retry bootstrap so that a single v4 version will be installed
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(294);
-const fsStat = __webpack_require__(410);
-const fsWalk = __webpack_require__(415);
-const reader_1 = __webpack_require__(819);
-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) => {
-                return error === null ? resolve(stats) : reject(error);
-            });
-        });
+  if (lodash4Versions.size > 1) {
+    for (const req of lodash4Reqs) {
+      delete yarnLock[req];
     }
-}
-exports.default = ReaderStream;
 
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__[/* writeFile */ "i"])(kbn.getAbsolute('yarn.lock'), Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["stringify"])(yarnLock), 'utf8');
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-/***/ }),
-/* 819 */
-/***/ (function(module, exports, __webpack_require__) {
+      Multiple version of lodash v4 were detected, so they have been removed
+      from the yarn.lock file. Please rerun yarn kbn bootstrap to coalese the
+      lodash versions installed.
 
-"use strict";
+      If you still see this error when you re-bootstrap then you might need
+      to force a new dependency to use the latest version of lodash via the
+      "resolutions" field in package.json.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(410);
-const utils = __webpack_require__(808);
-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;
+      If you have questions about this please reach out to the operations team.
 
+    `);
+    process.exit(1);
+  } // look through all the dependencies of production packages and production
+  // dependencies of those packages to determine if we're shipping any versions
+  // of lodash v3 in the distributable
 
-/***/ }),
-/* 820 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+  const prodDependencies = kbn.resolveAllProductionDependencies(yarnLock, _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"]);
+  const lodash3Versions = new Set();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const deep_1 = __webpack_require__(821);
-const entry_1 = __webpack_require__(824);
-const error_1 = __webpack_require__(825);
-const entry_2 = __webpack_require__(826);
-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
-        };
+  for (const dep of prodDependencies.values()) {
+    if (dep.name === 'lodash' && dep.version.startsWith('3.')) {
+      lodash3Versions.add(dep.version);
     }
-}
-exports.default = Provider;
+  } // if any lodash v3 packages were found we abort and tell the user to fix things
 
 
-/***/ }),
-/* 821 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (lodash3Versions.size) {
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-"use strict";
+      Due to changes in the yarn.lock file and/or package.json files a version of
+      lodash 3 is now included in the production dependencies. To reduce the size of
+      our distributable and especially our front-end bundles we have decided to
+      prevent adding any new instances of lodash 3.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(808);
-const partial_1 = __webpack_require__(822);
-class DeepFilter {
-    constructor(_settings, _micromatchOptions) {
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-    }
-    getFilter(basePath, positive, negative) {
-        const matcher = this._getMatcher(positive);
-        const negativeRe = this._getNegativePatternsRe(negative);
-        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
-    }
-    _getMatcher(patterns) {
-        return new partial_1.default(patterns, this._settings, this._micromatchOptions);
-    }
-    _getNegativePatternsRe(patterns) {
-        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
-        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
-    }
-    _filter(basePath, entry, matcher, negativeRe) {
-        if (this._isSkippedByDeep(basePath, entry.path)) {
-            return false;
-        }
-        if (this._isSkippedSymbolicLink(entry)) {
-            return false;
-        }
-        const filepath = utils.path.removeLeadingDotSegment(entry.path);
-        if (this._isSkippedByPositivePatterns(filepath, matcher)) {
-            return false;
-        }
-        return this._isSkippedByNegativePatterns(filepath, negativeRe);
-    }
-    _isSkippedByDeep(basePath, entryPath) {
-        /**
-         * Avoid unnecessary depth calculations when it doesn't matter.
-         */
-        if (this._settings.deep === Infinity) {
-            return false;
-        }
-        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
-    }
-    _getEntryLevel(basePath, entryPath) {
-        const entryPathDepth = entryPath.split('/').length;
-        if (basePath === '') {
-            return entryPathDepth;
-        }
-        const basePathDepth = basePath.split('/').length;
-        return entryPathDepth - basePathDepth;
-    }
-    _isSkippedSymbolicLink(entry) {
-        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
-    }
-    _isSkippedByPositivePatterns(entryPath, matcher) {
-        return !this._settings.baseNameMatch && !matcher.match(entryPath);
-    }
-    _isSkippedByNegativePatterns(entryPath, patternsRe) {
-        return !utils.pattern.matchAny(entryPath, patternsRe);
-    }
-}
-exports.default = DeepFilter;
+      Please inspect the changes to yarn.lock or package.json files to identify where
+      the lodash 3 version is coming from and remove it.
 
+      If you have questions about this please reack out to the operations team.
 
-/***/ }),
-/* 822 */
-/***/ (function(module, exports, __webpack_require__) {
+    `);
+    process.exit(1);
+  } // TODO: remove this once we move into a single package.json
+  // look through all the package.json files to find packages which have mismatched version ranges
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const matcher_1 = __webpack_require__(823);
-class PartialMatcher extends matcher_1.default {
-    match(filepath) {
-        const parts = filepath.split('/');
-        const levels = parts.length;
-        const patterns = this._storage.filter((info) => !info.complete || info.segments.length > levels);
-        for (const pattern of patterns) {
-            const section = pattern.sections[0];
-            /**
-             * In this case, the pattern has a globstar and we must read all directories unconditionally,
-             * but only if the level has reached the end of the first group.
-             *
-             * fixtures/{a,b}/**
-             *  ^ true/false  ^ always true
-            */
-            if (!pattern.complete && levels > section.length) {
-                return true;
-            }
-            const match = parts.every((part, index) => {
-                const segment = pattern.segments[index];
-                if (segment.dynamic && segment.patternRe.test(part)) {
-                    return true;
-                }
-                if (!segment.dynamic && segment.pattern === part) {
-                    return true;
-                }
-                return false;
-            });
-            if (match) {
-                return true;
-            }
-        }
-        return false;
+  const depRanges = new Map();
+
+  for (const project of kbn.getAllProjects().values()) {
+    var _kbn$kibanaProject;
+
+    // Skip if this is an external plugin
+    if (project.path.includes(`${(_kbn$kibanaProject = kbn.kibanaProject) === null || _kbn$kibanaProject === void 0 ? void 0 : _kbn$kibanaProject.path}${path__WEBPACK_IMPORTED_MODULE_3__["sep"]}plugins`)) {
+      continue;
     }
-}
-exports.default = PartialMatcher;
 
+    for (const [dep, range] of Object.entries(project.allDependencies)) {
+      const existingDep = depRanges.get(dep);
 
-/***/ }),
-/* 823 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (!existingDep) {
+        depRanges.set(dep, [{
+          range,
+          projects: [project]
+        }]);
+        continue;
+      }
 
-"use strict";
+      const existingRange = existingDep.find(existing => existing.range === range);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(808);
-class Matcher {
-    constructor(_patterns, _settings, _micromatchOptions) {
-        this._patterns = _patterns;
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-        this._storage = [];
-        this._fillStorage();
-    }
-    _fillStorage() {
-        /**
-         * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
-         * So, before expand patterns with brace expansion into separated patterns.
-         */
-        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
-        for (const pattern of patterns) {
-            const segments = this._getPatternSegments(pattern);
-            const sections = this._splitSegmentsIntoSections(segments);
-            this._storage.push({
-                complete: sections.length <= 1,
-                pattern,
-                segments,
-                sections
-            });
-        }
-    }
-    _getPatternSegments(pattern) {
-        const parts = utils.pattern.getPatternParts(pattern, this._micromatchOptions);
-        return parts.map((part) => {
-            const dynamic = utils.pattern.isDynamicPattern(part, this._settings);
-            if (!dynamic) {
-                return {
-                    dynamic: false,
-                    pattern: part
-                };
-            }
-            return {
-                dynamic: true,
-                pattern: part,
-                patternRe: utils.pattern.makeRe(part, this._micromatchOptions)
-            };
+      if (!existingRange) {
+        existingDep.push({
+          range,
+          projects: [project]
         });
+        continue;
+      }
+
+      existingRange.projects.push(project);
     }
-    _splitSegmentsIntoSections(segments) {
-        return utils.array.splitWhen(segments, (segment) => segment.dynamic && utils.pattern.hasGlobStar(segment.pattern));
-    }
-}
-exports.default = Matcher;
+  }
 
+  const duplicateRanges = Array.from(depRanges.entries()).filter(([, ranges]) => ranges.length > 1 && !ranges.every(rng => Object(_package_json__WEBPACK_IMPORTED_MODULE_6__[/* isLinkDependency */ "a"])(rng.range))).reduce((acc, [dep, ranges]) => [...acc, dep, ...ranges.map(({
+    range,
+    projects
+  }) => `  ${range} => ${projects.map(p => p.name).join(', ')}`)], []).join('\n        ');
 
-/***/ }),
-/* 824 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (duplicateRanges) {
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-"use strict";
+      [single_version_dependencies] Multiple version ranges for the same dependency
+      were found declared across different package.json files. Please consolidate
+      those to match across all package.json files. Different versions for the
+      same dependency is not supported.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(808);
-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 && this._isDuplicateEntry(entry)) {
-            return false;
-        }
-        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
-            return false;
-        }
-        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
-        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
-        if (this._settings.unique && isMatched) {
-            this._createIndexRecord(entry);
-        }
-        return isMatched;
-    }
-    _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(entryPath, patternsRe) {
-        if (!this._settings.absolute) {
-            return false;
-        }
-        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
-        return utils.pattern.matchAny(fullpath, patternsRe);
-    }
-    _isMatchToPatterns(entryPath, patternsRe) {
-        const filepath = utils.path.removeLeadingDotSegment(entryPath);
-        return utils.pattern.matchAny(filepath, patternsRe);
-    }
-}
-exports.default = EntryFilter;
+      If you have questions about this please reach out to the operations team.
 
+      The conflicting dependencies are:
 
-/***/ }),
-/* 825 */
-/***/ (function(module, exports, __webpack_require__) {
+        ${duplicateRanges}
+    `);
+    process.exit(1);
+  } // look for packages that have the the `kibana.devOnly` flag in their package.json
+  // and make sure they aren't included in the production dependencies of Kibana
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(808);
-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;
+  const devOnlyProjectsInProduction = getDevOnlyProductionDepsTree(kbn, 'kibana');
 
+  if (devOnlyProjectsInProduction) {
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
+      Some of the packages in the production dependency chain for Kibana and X-Pack are
+      flagged with "kibana.devOnly" in their package.json. Please check changes made to
+      packages and their dependencies to ensure they don't end up in production.
 
-/***/ }),
-/* 826 */
-/***/ (function(module, exports, __webpack_require__) {
+      The devOnly dependencies that are being dependend on in production are:
 
-"use strict";
+        ${Object(_projects_tree__WEBPACK_IMPORTED_MODULE_7__[/* treeToString */ "b"])(devOnlyProjectsInProduction).split('\n').join('\n        ')}
+    `);
+    process.exit(1);
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(808);
-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(Object.assign({}, entry), { path: filepath });
-    }
+  _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].success('yarn.lock analysis completed without any issues');
 }
-exports.default = EntryTransformer;
 
+function getDevOnlyProductionDepsTree(kbn, projectName) {
+  const project = kbn.getProject(projectName);
+  const childProjectNames = [...Object.keys(project.productionDependencies).filter(name => kbn.hasProject(name)), ...(projectName === 'kibana' ? ['x-pack'] : [])];
+  const children = childProjectNames.map(n => getDevOnlyProductionDepsTree(kbn, n)).filter(t => !!t);
 
-/***/ }),
-/* 827 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  if (!children.length && !project.isFlaggedAsDevOnly()) {
+    return;
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(294);
-const stream_2 = __webpack_require__(818);
-const provider_1 = __webpack_require__(820);
-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 destination = new stream_1.Readable({ objectMode: true, read: () => { } });
-        source
-            .once('error', (error) => destination.emit('error', error))
-            .on('data', (entry) => destination.emit('data', options.transform(entry)))
-            .once('end', () => destination.emit('end'));
-        destination
-            .once('close', () => source.destroy());
-        return destination;
-    }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
-    }
+  const tree = {
+    name: project.isFlaggedAsDevOnly() ? chalk__WEBPACK_IMPORTED_MODULE_2___default.a.red.bold(projectName) : projectName,
+    children
+  };
+  return tree;
 }
-exports.default = ProviderStream;
-
 
 /***/ }),
-/* 828 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/yarn_lock.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return readYarnLock; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return resolveDepsForProject; });
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@yarnpkg/lockfile/index.js");
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/fs.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// @ts-expect-error published types are worthless
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(829);
-const provider_1 = __webpack_require__(820);
-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);
+
+async function readYarnLock(kbn) {
+  try {
+    const contents = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* readFile */ "f"])(kbn.getAbsolute('yarn.lock'), 'utf8');
+    const yarnLock = Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["parse"])(contents);
+
+    if (yarnLock.type === 'success') {
+      return yarnLock.object;
     }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
+
+    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
     }
-}
-exports.default = ProviderSync;
+  }
 
+  return {};
+}
+/**
+ * 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
+ */
 
-/***/ }),
-/* 829 */
-/***/ (function(module, exports, __webpack_require__) {
+function resolveDepsForProject({
+  project: rootProject,
+  yarnLock,
+  kbn,
+  log,
+  productionDepsOnly,
+  includeDependentProject
+}) {
+  /** map of [name@range, { name, version }] */
+  const resolved = new Map();
+  const seenProjects = new Set();
+  const projectQueue = [rootProject];
+  const depQueue = [];
 
-"use strict";
+  while (projectQueue.length) {
+    const project = projectQueue.shift();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(410);
-const fsWalk = __webpack_require__(415);
-const reader_1 = __webpack_require__(819);
-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;
-        }
+    if (seenProjects.has(project)) {
+      continue;
     }
-    _getStat(filepath) {
-        return this._statSync(filepath, this._fsStatSettings);
+
+    seenProjects.add(project);
+    const projectDeps = Object.entries(productionDepsOnly ? project.productionDependencies : project.allDependencies);
+
+    for (const [name, versionRange] of projectDeps) {
+      depQueue.push([name, versionRange]);
     }
-}
-exports.default = ReaderSync;
 
+    while (depQueue.length) {
+      const [name, versionRange] = depQueue.shift();
+      const req = `${name}@${versionRange}`;
 
-/***/ }),
-/* 830 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (resolved.has(req)) {
+        continue;
+      }
 
-"use strict";
+      if (includeDependentProject && kbn.hasProject(name)) {
+        projectQueue.push(kbn.getProject(name));
+      }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
-const fs = __webpack_require__(253);
-const os = __webpack_require__(243);
-/**
- * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
- * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
- */
-const CPU_COUNT = Math.max(os.cpus().length, 1);
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    lstatSync: fs.lstatSync,
-    stat: fs.stat,
-    statSync: fs.statSync,
-    readdir: fs.readdir,
-    readdirSync: fs.readdirSync
-};
-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 (!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;
         }
-        if (this.stats) {
-            this.objectMode = true;
+
+        resolved.set(req, {
+          name,
+          version: pkg.version
+        });
+        const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
+
+        for (const [childName, childVersionRange] of allDepsEntries) {
+          depQueue.push([childName, childVersionRange]);
         }
+      }
     }
-    _getValue(option, value) {
-        return option === undefined ? value : option;
-    }
-    _getFileSystemMethods(methods = {}) {
-        return Object.assign(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
-    }
-}
-exports.default = Settings;
+  }
 
+  return resolved;
+}
 
 /***/ }),
-/* 831 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "assert":
+/***/ (function(module, exports) {
 
-const {promisify} = __webpack_require__(234);
-const fs = __webpack_require__(253);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(806);
-const gitIgnore = __webpack_require__(450);
-const slash = __webpack_require__(451);
+module.exports = require("assert");
 
-const DEFAULT_IGNORE = [
-	'**/node_modules/**',
-	'**/flow-typed/**',
-	'**/coverage/**',
-	'**/.git'
-];
+/***/ }),
 
-const readFileP = promisify(fs.readFile);
+/***/ "buffer":
+/***/ (function(module, exports) {
 
-const mapGitIgnorePatternTo = base => ignore => {
-	if (ignore.startsWith('!')) {
-		return '!' + path.posix.join(base, ignore.slice(1));
-	}
+module.exports = require("buffer");
 
-	return path.posix.join(base, ignore);
-};
+/***/ }),
 
-const parseGitIgnore = (content, options) => {
-	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+/***/ "child_process":
+/***/ (function(module, exports) {
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => !line.startsWith('#'))
-		.map(mapGitIgnorePatternTo(base));
-};
+module.exports = require("child_process");
 
-const reduceIgnore = files => {
-	const ignores = gitIgnore();
-	for (const file of files) {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-	}
+/***/ }),
 
-	return ignores;
-};
+/***/ "constants":
+/***/ (function(module, exports) {
 
-const ensureAbsolutePathForCwd = (cwd, p) => {
-	cwd = slash(cwd);
-	if (path.isAbsolute(p)) {
-		if (slash(p).startsWith(cwd)) {
-			return p;
-		}
+module.exports = require("constants");
 
-		throw new Error(`Path ${p} is not in cwd ${cwd}`);
-	}
+/***/ }),
 
-	return path.join(cwd, p);
-};
+/***/ "crypto":
+/***/ (function(module, exports) {
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p.path || p))));
-};
+module.exports = require("crypto");
 
-const getFile = async (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = await readFileP(filePath, 'utf8');
+/***/ }),
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+/***/ "events":
+/***/ (function(module, exports) {
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
+module.exports = require("events");
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+/***/ }),
 
-const normalizeOptions = ({
-	ignore = [],
-	cwd = slash(process.cwd())
-} = {}) => {
-	return {ignore, cwd};
-};
+/***/ "fs":
+/***/ (function(module, exports) {
 
-module.exports = async options => {
-	options = normalizeOptions(options);
+module.exports = require("fs");
 
-	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);
+/***/ "fs/promises":
+/***/ (function(module, exports) {
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+module.exports = require("fs/promises");
 
-module.exports.sync = options => {
-	options = normalizeOptions(options);
+/***/ }),
 
-	const paths = fastGlob.sync('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+/***/ "http":
+/***/ (function(module, exports) {
 
-	const files = paths.map(file => getFileSync(file, options.cwd));
-	const ignores = reduceIgnore(files);
+module.exports = require("http");
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+/***/ }),
+
+/***/ "https":
+/***/ (function(module, exports) {
 
+module.exports = require("https");
 
 /***/ }),
-/* 832 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "net":
+/***/ (function(module, exports) {
 
-const {Transform} = __webpack_require__(294);
+module.exports = require("net");
 
-class ObjectTransform extends Transform {
-	constructor() {
-		super({
-			objectMode: true
-		});
-	}
-}
+/***/ }),
 
-class FilterStream extends ObjectTransform {
-	constructor(filter) {
-		super();
-		this._filter = filter;
-	}
+/***/ "os":
+/***/ (function(module, exports) {
 
-	_transform(data, encoding, callback) {
-		if (this._filter(data)) {
-			this.push(data);
-		}
+module.exports = require("os");
 
-		callback();
-	}
-}
+/***/ }),
 
-class UniqueStream extends ObjectTransform {
-	constructor() {
-		super();
-		this._pushed = new Set();
-	}
+/***/ "path":
+/***/ (function(module, exports) {
 
-	_transform(data, encoding, callback) {
-		if (!this._pushed.has(data)) {
-			this.push(data);
-			this._pushed.add(data);
-		}
+module.exports = require("path");
 
-		callback();
-	}
-}
+/***/ }),
 
-module.exports = {
-	FilterStream,
-	UniqueStream
-};
+/***/ "readline":
+/***/ (function(module, exports) {
 
+module.exports = require("readline");
 
 /***/ }),
-/* 833 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return buildNonBazelProductionProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProductionProjects", function() { return getProductionProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProject", function() { return buildProject; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(593);
-/* 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__(361);
-/* 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__(4);
-/* 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__(590);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(352);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(341);
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(464);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(461);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/***/ "stream":
+/***/ (function(module, exports) {
 
+module.exports = require("stream");
 
+/***/ }),
 
+/***/ "string_decoder":
+/***/ (function(module, exports) {
 
+module.exports = require("string_decoder");
 
+/***/ }),
 
+/***/ "tty":
+/***/ (function(module, exports) {
 
+module.exports = require("tty");
 
-async function buildNonBazelProductionProjects({
-  kibanaRoot,
-  buildRoot,
-  onlyOSS
-}) {
-  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["getNonBazelProjectsOnly"])(await getProductionProjects(kibanaRoot, onlyOSS));
-  const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["buildProjectGraph"])(projects);
-  const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["topologicallyBatchProjects"])(projects, projectGraph);
-  const projectNames = [...projects.values()].map(project => project.name);
-  _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`Preparing non Bazel production build for [${projectNames.join(', ')}]`);
+/***/ }),
 
-  for (const batch of batchedProjects) {
-    for (const project of batch) {
-      await deleteTarget(project);
-      await buildProject(project);
-      await copyToBuild(project, kibanaRoot, buildRoot);
-    }
-  }
-}
-/**
- * Returns the subset of projects that should be built into the production
- * bundle. As we copy these into Kibana's `node_modules` during the build step,
- * and let Kibana's build process be responsible for installing dependencies,
- * we only include Kibana's transitive _production_ dependencies. If onlyOSS
- * is supplied, we omit projects with build.oss in their package.json set to false.
- */
+/***/ "url":
+/***/ (function(module, exports) {
 
-async function getProductionProjects(rootPath, onlyOSS) {
-  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')];
+module.exports = require("url");
 
-  if (projects.has('x-pack')) {
-    projectsSubset.push(projects.get('x-pack'));
-  }
+/***/ }),
 
-  const productionProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["includeTransitiveProjects"])(projectsSubset, projects, {
-    onlyProductionDependencies: true
-  }); // We remove Kibana, as we're already building Kibana
+/***/ "util":
+/***/ (function(module, exports) {
 
-  productionProjects.delete('kibana');
+module.exports = require("util");
 
-  if (onlyOSS) {
-    productionProjects.forEach(project => {
-      if (project.getBuildConfig().oss === false) {
-        productionProjects.delete(project.json.name);
-      }
-    });
-  }
+/***/ }),
 
-  return productionProjects;
-}
+/***/ "worker_threads":
+/***/ (function(module, exports) {
 
-async function deleteTarget(project) {
-  const targetDir = project.targetLocation;
+module.exports = require(undefined);
 
-  if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(targetDir)) {
-    await del__WEBPACK_IMPORTED_MODULE_1___default()(targetDir, {
-      force: true
-    });
-  }
-}
+/***/ }),
 
-async function buildProject(project) {
-  if (project.hasScript('build')) {
-    await project.runScript('build');
-  }
-}
-/**
- * Copy all the project's files from its "intermediate build directory" and
- * into the build. The intermediate directory can either be the root of the
- * project or some other location defined in the project's `package.json`.
- *
- * When copying all the files into the build, we exclude `node_modules` because
- * we want the Kibana build to be responsible for actually installing all
- * dependencies. The primary reason for allowing the Kibana build process to
- * manage dependencies is that it will "dedupe" them, so we don't include
- * unnecessary copies of dependencies.
- */
+/***/ "zlib":
+/***/ (function(module, exports) {
 
-async function copyToBuild(project, kibanaRoot, buildRoot) {
-  // We want the package to have the same relative location within the build
-  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
-  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
-  await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*', '!node_modules/**'], buildProjectPath, {
-    cwd: project.getIntermediateBuildDirectory(),
-    dot: true,
-    onlyFiles: true,
-    parents: true
-  }); // If a project is using an intermediate build directory, we special-case our
-  // handling of `package.json`, as the project build process might have copied
-  // (a potentially modified) `package.json` into the intermediate build
-  // directory already. If so, we want to use that `package.json` as the basis
-  // for creating the production-ready `package.json`. If it's not present in
-  // the intermediate build, we fall back to using the project's already defined
-  // `package.json`.
-
-  const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isFile"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["readPackageJson"])(buildProjectPath) : project.json;
-  const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["createProductionPackageJson"])(packageJson);
-  await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["writePackageJson"])(buildProjectPath, preparedPackageJson);
-}
+module.exports = require("zlib");
 
 /***/ })
-/******/ ]);
\ No newline at end of file
+
+/******/ });
\ No newline at end of file
diff --git a/packages/kbn-pm/index.d.ts b/packages/kbn-pm/index.d.ts
index 004ac67f4b0c4..de0577ee3ed83 100644
--- a/packages/kbn-pm/index.d.ts
+++ b/packages/kbn-pm/index.d.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from './src/index';
+export * from './src';
diff --git a/packages/kbn-pm/src/cli.ts b/packages/kbn-pm/src/cli.ts
index f6ea4d7124ab2..8b313be500841 100644
--- a/packages/kbn-pm/src/cli.ts
+++ b/packages/kbn-pm/src/cli.ts
@@ -9,7 +9,7 @@
 import dedent from 'dedent';
 import getopts from 'getopts';
 import { resolve } from 'path';
-import { pickLevelFromFlags } from '@kbn/dev-utils/tooling_log';
+import { pickLevelFromFlags } from '@kbn/tooling-log';
 
 import { commands } from './commands';
 import { runCommand } from './run';
diff --git a/packages/kbn-pm/src/commands/bootstrap.ts b/packages/kbn-pm/src/commands/bootstrap.ts
index 2dd59d499b585..3f9275cff8e61 100644
--- a/packages/kbn-pm/src/commands/bootstrap.ts
+++ b/packages/kbn-pm/src/commands/bootstrap.ts
@@ -6,18 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { resolve, sep } from 'path';
-import { CiStatsReporter } from '@kbn/dev-utils/ci_stats_reporter';
+import Path from 'path';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
+import { runBazel } from '@kbn/bazel-runner';
 
 import { log } from '../utils/log';
 import { spawnStreaming } from '../utils/child_process';
 import { linkProjectExecutables } from '../utils/link_project_executables';
-import { getNonBazelProjectsOnly, topologicallyBatchProjects } from '../utils/projects';
-import { ICommand } from './';
+import { ICommand } from '.';
 import { readYarnLock } from '../utils/yarn_lock';
-import { sortPackageJson } from '../utils/sort_package_json';
 import { validateDependencies } from '../utils/validate_dependencies';
-import { installBazelTools, removeYarnIntegrityFileIfExists, runBazel } from '../utils/bazel';
+import { installBazelTools, removeYarnIntegrityFileIfExists } from '../utils/bazel';
 import { setupRemoteCache } from '../utils/bazel/setup_remote_cache';
 
 export const BootstrapCommand: ICommand = {
@@ -30,10 +29,8 @@ export const BootstrapCommand: ICommand = {
   },
 
   async run(projects, projectGraph, { options, kbn, rootPath }) {
-    const nonBazelProjectsOnly = await getNonBazelProjectsOnly(projects);
-    const batchedNonBazelProjects = topologicallyBatchProjects(nonBazelProjectsOnly, projectGraph);
     const kibanaProjectPath = projects.get('kibana')?.path || '';
-    const runOffline = options?.offline === true;
+    const offline = options?.offline === true;
     const reporter = CiStatsReporter.fromEnv(log);
 
     const timings: Array<{ id: string; ms: number }> = [];
@@ -70,14 +67,22 @@ export const BootstrapCommand: ICommand = {
 
     if (forceInstall) {
       await time('force install dependencies', async () => {
-        await removeYarnIntegrityFileIfExists(resolve(kibanaProjectPath, 'node_modules'));
-        await runBazel(['clean', '--expunge']);
-        await runBazel(['run', '@yarn//:yarn'], runOffline, {
-          env: {
-            SASS_BINARY_SITE:
-              'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
-            RE2_DOWNLOAD_MIRROR:
-              'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
+        await removeYarnIntegrityFileIfExists(Path.resolve(kibanaProjectPath, 'node_modules'));
+        await runBazel({
+          bazelArgs: ['clean', '--expunge'],
+          log,
+        });
+        await runBazel({
+          bazelArgs: ['run', '@nodejs//:yarn'],
+          offline,
+          log,
+          execaOpts: {
+            env: {
+              SASS_BINARY_SITE:
+                'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+              RE2_DOWNLOAD_MIRROR:
+                'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
+            },
           },
         });
       });
@@ -85,37 +90,11 @@ export const BootstrapCommand: ICommand = {
 
     // build packages
     await time('build packages', async () => {
-      await runBazel(['build', '//packages:build', '--show_result=1'], runOffline);
-    });
-
-    // Install monorepo npm dependencies outside of the Bazel managed ones
-    for (const batch of batchedNonBazelProjects) {
-      for (const project of batch) {
-        const isExternalPlugin = project.path.includes(`${kibanaProjectPath}${sep}plugins`);
-
-        if (!project.hasDependencies()) {
-          continue;
-        }
-
-        if (isExternalPlugin) {
-          await project.installDependencies();
-          continue;
-        }
-
-        if (
-          !project.isSinglePackageJsonProject &&
-          !project.isEveryDependencyLocal() &&
-          !isExternalPlugin
-        ) {
-          throw new Error(
-            `[${project.name}] is not eligible to hold non local dependencies. Move the non local dependencies into the top level package.json.`
-          );
-        }
-      }
-    }
-
-    await time('sort package json', async () => {
-      await sortPackageJson(kbn);
+      await runBazel({
+        bazelArgs: ['build', '//packages:build', '--show_result=1'],
+        log,
+        offline,
+      });
     });
 
     const yarnLock = await time('read yarn.lock', async () => await readYarnLock(kbn));
diff --git a/packages/kbn-pm/src/commands/build.ts b/packages/kbn-pm/src/commands/build.ts
index 5593ffa86e6f0..567b4addddee7 100644
--- a/packages/kbn-pm/src/commands/build.ts
+++ b/packages/kbn-pm/src/commands/build.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { runBazel } from '../utils/bazel';
-import { ICommand } from './';
+import { runBazel } from '@kbn/bazel-runner';
+import { ICommand } from '.';
+import { log } from '../utils/log';
 
 export const BuildCommand: ICommand = {
   description: 'Runs a build in the Bazel built packages',
@@ -19,9 +20,11 @@ export const BuildCommand: ICommand = {
   },
 
   async run(projects, projectGraph, { options }) {
-    const runOffline = options?.offline === true;
-
     // Call bazel with the target to build all available packages
-    await runBazel(['build', '//packages:build', '--show_result=1'], runOffline);
+    await runBazel({
+      bazelArgs: ['build', '//packages:build', '--show_result=1'],
+      log,
+      offline: options?.offline === true,
+    });
   },
 };
diff --git a/packages/kbn-pm/src/commands/clean.ts b/packages/kbn-pm/src/commands/clean.ts
index 12f6d674ca9e6..8f8564add2096 100644
--- a/packages/kbn-pm/src/commands/clean.ts
+++ b/packages/kbn-pm/src/commands/clean.ts
@@ -10,11 +10,12 @@ import dedent from 'dedent';
 import del from 'del';
 import ora from 'ora';
 import { join, relative } from 'path';
+import { runBazel } from '@kbn/bazel-runner';
 
-import { isBazelBinAvailable, runBazel } from '../utils/bazel';
+import { isBazelBinAvailable } from '../utils/bazel';
 import { isDirectory } from '../utils/fs';
 import { log } from '../utils/log';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const CleanCommand: ICommand = {
   description: 'Deletes output directories and resets internal caches.',
@@ -25,7 +26,7 @@ export const CleanCommand: ICommand = {
     id: 'total',
   },
 
-  async run(projects) {
+  async run(projects, projectGraph, { kbn }) {
     log.warning(dedent`
       This command is only necessary for the circumstance where you need to recover a consistent
       state when problems arise. If you need to run this command often, please let us know by
@@ -53,8 +54,11 @@ export const CleanCommand: ICommand = {
     }
 
     // Runs Bazel soft clean
-    if (await isBazelBinAvailable()) {
-      await runBazel(['clean']);
+    if (await isBazelBinAvailable(kbn.getAbsolute())) {
+      await runBazel({
+        bazelArgs: ['clean'],
+        log,
+      });
       log.success('Soft cleaned bazel');
     }
 
diff --git a/packages/kbn-pm/src/commands/reset.ts b/packages/kbn-pm/src/commands/reset.ts
index 1a3f7c748f79e..5b6aac40149c2 100644
--- a/packages/kbn-pm/src/commands/reset.ts
+++ b/packages/kbn-pm/src/commands/reset.ts
@@ -11,15 +11,16 @@ import del from 'del';
 import ora from 'ora';
 import { join, relative } from 'path';
 
+import { runBazel } from '@kbn/bazel-runner';
+
 import {
   getBazelDiskCacheFolder,
   getBazelRepositoryCacheFolder,
   isBazelBinAvailable,
-  runBazel,
 } from '../utils/bazel';
 import { isDirectory } from '../utils/fs';
 import { log } from '../utils/log';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const ResetCommand: ICommand = {
   description:
@@ -31,7 +32,7 @@ export const ResetCommand: ICommand = {
     id: 'total',
   },
 
-  async run(projects) {
+  async run(projects, projectGraph, { kbn }) {
     log.warning(dedent`
       In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
       problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
@@ -64,9 +65,12 @@ export const ResetCommand: ICommand = {
     }
 
     // Runs Bazel hard clean and deletes Bazel Cache Folders
-    if (await isBazelBinAvailable()) {
+    if (await isBazelBinAvailable(kbn.getAbsolute())) {
       // Hard cleaning bazel
-      await runBazel(['clean', '--expunge']);
+      await runBazel({
+        bazelArgs: ['clean', '--expunge'],
+        log,
+      });
       log.success('Hard cleaned bazel');
 
       // Deletes Bazel Cache Folders
diff --git a/packages/kbn-pm/src/commands/run.ts b/packages/kbn-pm/src/commands/run.ts
index 25d2a16839f27..67cc7855d8e19 100644
--- a/packages/kbn-pm/src/commands/run.ts
+++ b/packages/kbn-pm/src/commands/run.ts
@@ -11,7 +11,7 @@ import { CliError } from '../utils/errors';
 import { log } from '../utils/log';
 import { parallelizeBatches } from '../utils/parallelize';
 import { topologicallyBatchProjects } from '../utils/projects';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const RunCommand: ICommand = {
   description:
diff --git a/packages/kbn-pm/src/commands/watch.ts b/packages/kbn-pm/src/commands/watch.ts
index f5ecf1cd863db..2bae2ddc66235 100644
--- a/packages/kbn-pm/src/commands/watch.ts
+++ b/packages/kbn-pm/src/commands/watch.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { runIBazel } from '../utils/bazel';
-import { ICommand } from './';
+import { runIBazel } from '@kbn/bazel-runner';
+import { ICommand } from '.';
+import { log } from '../utils/log';
 
 export const WatchCommand: ICommand = {
   description: 'Runs a build in the Bazel built packages and keeps watching them for changes',
@@ -25,9 +26,10 @@ export const WatchCommand: ICommand = {
     //
     // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
     // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
-    await runIBazel(
-      ['--run_output=false', 'build', '//packages:build', '--show_result=1'],
-      runOffline
-    );
+    await runIBazel({
+      bazelArgs: ['--run_output=false', 'build', '//packages:build', '--show_result=1'],
+      log,
+      offline: runOffline,
+    });
   },
 };
diff --git a/packages/kbn-pm/src/index.ts b/packages/kbn-pm/src/index.ts
index 8d7b47c396847..d2f907a43db20 100644
--- a/packages/kbn-pm/src/index.ts
+++ b/packages/kbn-pm/src/index.ts
@@ -7,8 +7,6 @@
  */
 
 export { run } from './cli';
-export { buildBazelProductionProjects, buildNonBazelProductionProjects } from './production';
 export { getProjects } from './utils/projects';
 export { Project } from './utils/project';
-export { transformDependencies } from './utils/package_json';
 export { getProjectPaths } from './config';
diff --git a/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json b/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json
deleted file mode 100644
index c0ed787bcb0e8..0000000000000
--- a/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "quux",
-  "version": "1.0.0",
-  "dependencies": {
-    "@kbn/foo": "link:../../packages/foo"
-  }
-}
diff --git a/packages/kbn-pm/src/production/__fixtures__/external_packages/with_other_link_deps/package.json b/packages/kbn-pm/src/production/__fixtures__/external_packages/with_other_link_deps/package.json
deleted file mode 100644
index e60f626e5234f..0000000000000
--- a/packages/kbn-pm/src/production/__fixtures__/external_packages/with_other_link_deps/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "quux",
-  "version": "1.0.0",
-  "dependencies": {
-    "bar": "link:../foo/packages/bar"
-  }
-}
\ No newline at end of file
diff --git a/packages/kbn-pm/src/production/build_bazel_production_projects.ts b/packages/kbn-pm/src/production/build_bazel_production_projects.ts
deleted file mode 100644
index 07c0b651f5ad1..0000000000000
--- a/packages/kbn-pm/src/production/build_bazel_production_projects.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import copy from 'cpy';
-import globby from 'globby';
-import { basename, join, relative, resolve } from 'path';
-
-import { getProductionProjects } from './build_non_bazel_production_projects';
-import { runBazel } from '../utils/bazel';
-import { chmod, isFile, isDirectory } from '../utils/fs';
-import { log } from '../utils/log';
-import {
-  createProductionPackageJson,
-  readPackageJson,
-  writePackageJson,
-} from '../utils/package_json';
-import { getBazelProjectsOnly } from '../utils/projects';
-import { Project } from '..';
-
-export async function buildBazelProductionProjects({
-  kibanaRoot,
-  buildRoot,
-  onlyOSS,
-}: {
-  kibanaRoot: string;
-  buildRoot: string;
-  onlyOSS?: boolean;
-}) {
-  const projects = await getBazelProjectsOnly(await getProductionProjects(kibanaRoot, onlyOSS));
-
-  const projectNames = [...projects.values()].map((project) => project.name);
-  log.info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`);
-
-  await runBazel(['build', '//packages:build']);
-  log.info(`All Bazel projects production builds for [${projectNames.join(', ')}] are complete`);
-
-  for (const project of projects.values()) {
-    await copyToBuild(project, kibanaRoot, buildRoot);
-    await applyCorrectPermissions(project, kibanaRoot, buildRoot);
-  }
-}
-
-/**
- * Copy all the project's files from its Bazel dist directory into the
- * project build folder.
- *
- * When copying all the files into the build, we exclude `node_modules` because
- * we want the Kibana build to be responsible for actually installing all
- * dependencies. The primary reason for allowing the Kibana build process to
- * manage dependencies is that it will "dedupe" them, so we don't include
- * unnecessary copies of dependencies. We also exclude every related Bazel build
- * files in order to get the most cleaner package module we can in the final distributable.
- */
-async function copyToBuild(project: Project, kibanaRoot: string, buildRoot: string) {
-  // We want the package to have the same relative location within the build
-  const relativeProjectPath = relative(kibanaRoot, project.path);
-  const buildProjectPath = resolve(buildRoot, relativeProjectPath);
-
-  await copy(['**/*'], buildProjectPath, {
-    cwd: join(kibanaRoot, 'bazel-bin', 'packages', basename(buildProjectPath), 'npm_module'),
-    dot: true,
-    onlyFiles: true,
-    parents: true,
-  } as copy.Options);
-
-  // If a project is using an intermediate build directory, we special-case our
-  // handling of `package.json`, as the project build process might have copied
-  // (a potentially modified) `package.json` into the intermediate build
-  // directory already. If so, we want to use that `package.json` as the basis
-  // for creating the production-ready `package.json`. If it's not present in
-  // the intermediate build, we fall back to using the project's already defined
-  // `package.json`.
-  const packageJson = (await isFile(join(buildProjectPath, 'package.json')))
-    ? await readPackageJson(buildProjectPath)
-    : project.json;
-
-  const preparedPackageJson = createProductionPackageJson(packageJson);
-  await writePackageJson(buildProjectPath, preparedPackageJson);
-}
-
-async function applyCorrectPermissions(project: Project, kibanaRoot: string, buildRoot: string) {
-  const relativeProjectPath = relative(kibanaRoot, project.path);
-  const buildProjectPath = resolve(buildRoot, relativeProjectPath);
-  const allPluginPaths = await globby([`**/*`], {
-    onlyFiles: false,
-    cwd: buildProjectPath,
-    dot: true,
-  });
-
-  for (const pluginPath of allPluginPaths) {
-    const resolvedPluginPath = resolve(buildProjectPath, pluginPath);
-    if (await isFile(resolvedPluginPath)) {
-      await chmod(resolvedPluginPath, 0o644);
-    }
-
-    if (await isDirectory(resolvedPluginPath)) {
-      await chmod(resolvedPluginPath, 0o755);
-    }
-  }
-}
diff --git a/packages/kbn-pm/src/production/build_non_bazel_production_projects.ts b/packages/kbn-pm/src/production/build_non_bazel_production_projects.ts
deleted file mode 100644
index 391047b13cea7..0000000000000
--- a/packages/kbn-pm/src/production/build_non_bazel_production_projects.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import copy from 'cpy';
-import del from 'del';
-import { join, relative, resolve } from 'path';
-
-import { getProjectPaths } from '../config';
-import { isDirectory, isFile } from '../utils/fs';
-import { log } from '../utils/log';
-import {
-  createProductionPackageJson,
-  readPackageJson,
-  writePackageJson,
-} from '../utils/package_json';
-import {
-  buildProjectGraph,
-  getNonBazelProjectsOnly,
-  getProjects,
-  includeTransitiveProjects,
-  topologicallyBatchProjects,
-} from '../utils/projects';
-import { Project } from '..';
-
-export async function buildNonBazelProductionProjects({
-  kibanaRoot,
-  buildRoot,
-  onlyOSS,
-}: {
-  kibanaRoot: string;
-  buildRoot: string;
-  onlyOSS?: boolean;
-}) {
-  const projects = await getNonBazelProjectsOnly(await getProductionProjects(kibanaRoot, onlyOSS));
-  const projectGraph = buildProjectGraph(projects);
-  const batchedProjects = topologicallyBatchProjects(projects, projectGraph);
-
-  const projectNames = [...projects.values()].map((project) => project.name);
-  log.info(`Preparing non Bazel production build for [${projectNames.join(', ')}]`);
-
-  for (const batch of batchedProjects) {
-    for (const project of batch) {
-      await deleteTarget(project);
-      await buildProject(project);
-      await copyToBuild(project, kibanaRoot, buildRoot);
-    }
-  }
-}
-
-/**
- * Returns the subset of projects that should be built into the production
- * bundle. As we copy these into Kibana's `node_modules` during the build step,
- * and let Kibana's build process be responsible for installing dependencies,
- * we only include Kibana's transitive _production_ dependencies. If onlyOSS
- * is supplied, we omit projects with build.oss in their package.json set to false.
- */
-export async function getProductionProjects(rootPath: string, onlyOSS?: boolean) {
-  const projectPaths = getProjectPaths({ rootPath });
-  const projects = await getProjects(rootPath, projectPaths);
-  const projectsSubset = [projects.get('kibana')!];
-
-  if (projects.has('x-pack')) {
-    projectsSubset.push(projects.get('x-pack')!);
-  }
-
-  const productionProjects = includeTransitiveProjects(projectsSubset, projects, {
-    onlyProductionDependencies: true,
-  });
-
-  // We remove Kibana, as we're already building Kibana
-  productionProjects.delete('kibana');
-
-  if (onlyOSS) {
-    productionProjects.forEach((project) => {
-      if (project.getBuildConfig().oss === false) {
-        productionProjects.delete(project.json.name);
-      }
-    });
-  }
-
-  return productionProjects;
-}
-
-async function deleteTarget(project: Project) {
-  const targetDir = project.targetLocation;
-
-  if (await isDirectory(targetDir)) {
-    await del(targetDir, { force: true });
-  }
-}
-
-export async function buildProject(project: Project) {
-  if (project.hasScript('build')) {
-    await project.runScript('build');
-  }
-}
-
-/**
- * Copy all the project's files from its "intermediate build directory" and
- * into the build. The intermediate directory can either be the root of the
- * project or some other location defined in the project's `package.json`.
- *
- * When copying all the files into the build, we exclude `node_modules` because
- * we want the Kibana build to be responsible for actually installing all
- * dependencies. The primary reason for allowing the Kibana build process to
- * manage dependencies is that it will "dedupe" them, so we don't include
- * unnecessary copies of dependencies.
- */
-async function copyToBuild(project: Project, kibanaRoot: string, buildRoot: string) {
-  // We want the package to have the same relative location within the build
-  const relativeProjectPath = relative(kibanaRoot, project.path);
-  const buildProjectPath = resolve(buildRoot, relativeProjectPath);
-
-  await copy(['**/*', '!node_modules/**'], buildProjectPath, {
-    cwd: project.getIntermediateBuildDirectory(),
-    dot: true,
-    onlyFiles: true,
-    parents: true,
-  } as copy.Options);
-
-  // If a project is using an intermediate build directory, we special-case our
-  // handling of `package.json`, as the project build process might have copied
-  // (a potentially modified) `package.json` into the intermediate build
-  // directory already. If so, we want to use that `package.json` as the basis
-  // for creating the production-ready `package.json`. If it's not present in
-  // the intermediate build, we fall back to using the project's already defined
-  // `package.json`.
-  const packageJson = (await isFile(join(buildProjectPath, 'package.json')))
-    ? await readPackageJson(buildProjectPath)
-    : project.json;
-
-  const preparedPackageJson = createProductionPackageJson(packageJson);
-  await writePackageJson(buildProjectPath, preparedPackageJson);
-}
diff --git a/packages/kbn-pm/src/run.test.ts b/packages/kbn-pm/src/run.test.ts
index 305f79947fcbb..5584c35619ba9 100644
--- a/packages/kbn-pm/src/run.test.ts
+++ b/packages/kbn-pm/src/run.test.ts
@@ -15,7 +15,11 @@ import { log } from './utils/log';
 
 log.setLogLevel('silent');
 
-const rootPath = resolve(`${__dirname}/utils/__fixtures__/kibana`);
+const rootPath = resolve(__dirname, 'utils/__fixtures__/kibana');
+
+jest.mock('./utils/regenerate_package_json');
+jest.mock('./utils/regenerate_synthetic_package_map');
+jest.mock('./utils/regenerate_base_tsconfig');
 
 function getExpectedProjectsAndGraph(runMock: any) {
   const [fullProjects, fullProjectGraph] = (runMock as jest.Mock<any>).mock.calls[0];
diff --git a/packages/kbn-pm/src/run.ts b/packages/kbn-pm/src/run.ts
index 41d26e26a3c29..0529ebd6425ca 100644
--- a/packages/kbn-pm/src/run.ts
+++ b/packages/kbn-pm/src/run.ts
@@ -6,25 +6,98 @@
  * Side Public License, v 1.
  */
 
-import { CiStatsReporter } from '@kbn/dev-utils/ci_stats_reporter';
+import { CiStatsReporter, CiStatsTiming } from '@kbn/ci-stats-reporter';
 
+import { simpleKibanaPlatformPluginDiscovery, getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { ICommand, ICommandConfig } from './commands';
 import { CliError } from './utils/errors';
 import { log } from './utils/log';
 import { buildProjectGraph } from './utils/projects';
 import { renderProjectsTree } from './utils/projects_tree';
+import { regeneratePackageJson } from './utils/regenerate_package_json';
+import { regenerateSyntheticPackageMap } from './utils/regenerate_synthetic_package_map';
+import { regenerateBaseTsconfig } from './utils/regenerate_base_tsconfig';
 import { Kibana } from './utils/kibana';
 
 process.env.CI_STATS_NESTED_TIMING = 'true';
 
 export async function runCommand(command: ICommand, config: Omit<ICommandConfig, 'kbn'>) {
   const runStartTime = Date.now();
-  let kbn;
+  let kbn: undefined | Kibana;
+  const timings: Array<Omit<CiStatsTiming, 'group'>> = [];
+  async function time<T>(id: string, block: () => Promise<T>): Promise<T> {
+    const start = Date.now();
+    let success = true;
+    try {
+      return await block();
+    } catch (error) {
+      success = false;
+      throw error;
+    } finally {
+      timings.push({
+        id,
+        ms: Date.now() - start,
+        meta: {
+          success,
+        },
+      });
+    }
+  }
+
+  async function reportTimes(timingConfig: { group: string; id: string }, error?: Error) {
+    if (!kbn) {
+      // things are too broken to report remotely
+      return;
+    }
+
+    const reporter = CiStatsReporter.fromEnv(log);
+
+    try {
+      await reporter.timings({
+        upstreamBranch: kbn.kibanaProject.json.branch,
+        // prevent loading @kbn/utils by passing null
+        kibanaUuid: kbn.getUuid() || null,
+        timings: [
+          ...timings.map((t) => ({ ...timingConfig, ...t })),
+          {
+            group: timingConfig.group,
+            id: timingConfig.id,
+            ms: Date.now() - runStartTime,
+            meta: {
+              success: !error,
+            },
+          },
+        ],
+      });
+    } catch (e) {
+      // prevent hiding bootstrap errors
+      log.error('failed to report timings:');
+      log.error(e);
+    }
+  }
 
   try {
     log.debug(`Running [${command.name}] command from [${config.rootPath}]`);
 
-    kbn = await Kibana.loadFrom(config.rootPath);
+    await time('regenerate package.json, synthetic-package map and tsconfig', async () => {
+      const plugins = simpleKibanaPlatformPluginDiscovery(
+        getPluginSearchPaths({
+          rootDir: config.rootPath,
+          oss: false,
+          examples: true,
+          testPlugins: true,
+        }),
+        []
+      );
+
+      await Promise.all([
+        regeneratePackageJson(config.rootPath),
+        regenerateSyntheticPackageMap(plugins, config.rootPath),
+        regenerateBaseTsconfig(plugins, config.rootPath),
+      ]);
+    });
+
+    kbn = await time('load Kibana project', async () => await Kibana.loadFrom(config.rootPath));
     const projects = kbn.getFilteredProjects({
       skipKibanaPlugins: Boolean(config.options['skip-kibana-plugins']),
       ossOnly: Boolean(config.options.oss),
@@ -50,50 +123,11 @@ export async function runCommand(command: ICommand, config: Omit<ICommandConfig,
     });
 
     if (command.reportTiming) {
-      const reporter = CiStatsReporter.fromEnv(log);
-      await reporter.timings({
-        upstreamBranch: kbn.kibanaProject.json.branch,
-        // prevent loading @kbn/utils by passing null
-        kibanaUuid: kbn.getUuid() || null,
-        timings: [
-          {
-            group: command.reportTiming.group,
-            id: command.reportTiming.id,
-            ms: Date.now() - runStartTime,
-            meta: {
-              success: true,
-            },
-          },
-        ],
-      });
+      await reportTimes(command.reportTiming);
     }
   } catch (error) {
     if (command.reportTiming) {
-      // if we don't have a kbn object then things are too broken to report on
-      if (kbn) {
-        try {
-          const reporter = CiStatsReporter.fromEnv(log);
-          await reporter.timings({
-            upstreamBranch: kbn.kibanaProject.json.branch,
-            // prevent loading @kbn/utils by passing null
-            kibanaUuid: kbn.getUuid() || null,
-            timings: [
-              {
-                group: command.reportTiming.group,
-                id: command.reportTiming.id,
-                ms: Date.now() - runStartTime,
-                meta: {
-                  success: false,
-                },
-              },
-            ],
-          });
-        } catch (e) {
-          // prevent hiding bootstrap errors
-          log.error('failed to report timings:');
-          log.error(e);
-        }
-      }
+      await reportTimes(command.reportTiming, error);
     }
 
     log.error(`[${command.name}] failed:`);
diff --git a/packages/kbn-pm/src/utils/bazel/index.ts b/packages/kbn-pm/src/utils/bazel/index.ts
index 84e26a0b914e1..39b3cb9c61f00 100644
--- a/packages/kbn-pm/src/utils/bazel/index.ts
+++ b/packages/kbn-pm/src/utils/bazel/index.ts
@@ -8,5 +8,4 @@
 
 export * from './get_cache_folders';
 export * from './install_tools';
-export * from './run';
 export * from './yarn_integrity';
diff --git a/packages/kbn-pm/src/utils/bazel/install_tools.ts b/packages/kbn-pm/src/utils/bazel/install_tools.ts
index 8f634726b5ab2..e5d07748fdccf 100644
--- a/packages/kbn-pm/src/utils/bazel/install_tools.ts
+++ b/packages/kbn-pm/src/utils/bazel/install_tools.ts
@@ -13,9 +13,7 @@ import { readFile } from '../fs';
 import { log } from '../log';
 
 async function readBazelToolsVersionFile(repoRootPath: string, versionFilename: string) {
-  const version = (await readFile(resolve(repoRootPath, versionFilename)))
-    .toString()
-    .split('\n')[0];
+  const version = (await readFile(resolve(repoRootPath, versionFilename))).toString().trim();
 
   if (!version) {
     throw new Error(
@@ -26,27 +24,19 @@ async function readBazelToolsVersionFile(repoRootPath: string, versionFilename:
   return version;
 }
 
-export async function isBazelBinAvailable() {
+export async function isBazelBinAvailable(repoRootPath: string) {
   try {
-    await spawn('bazel', ['--version'], { stdio: 'pipe' });
+    const installedVersion = await spawn('bazel', ['--version'], { stdio: 'pipe' });
+    const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion');
 
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function isBazeliskInstalled(bazeliskVersion: string) {
-  try {
-    const { stdout: bazeliskPkgInstallStdout } = await spawn(
-      'npm',
-      ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`],
-      {
-        stdio: 'pipe',
-      }
-    );
-
-    return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`);
+    if (installedVersion.stdout === `bazel ${bazelVersion}`) {
+      return true;
+    } else {
+      log.info(
+        `[bazel_tools] Bazel is installed (${installedVersion.stdout}), but was expecting ${bazelVersion}`
+      );
+      return false;
+    }
   } catch {
     return false;
   }
@@ -86,14 +76,11 @@ export async function installBazelTools(repoRootPath: string) {
   // Check if we need to remove bazelisk from yarn
   await tryRemoveBazeliskFromYarnGlobal();
 
-  // Test if bazelisk is already installed in the correct version
-  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion);
-
   // Test if bazel bin is available
-  const isBazelBinAlreadyAvailable = await isBazelBinAvailable();
+  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(repoRootPath);
 
   // Install bazelisk if not installed
-  if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
+  if (!isBazelBinAlreadyAvailable) {
     log.info(`[bazel_tools] installing Bazel tools`);
 
     log.debug(
@@ -106,7 +93,7 @@ export async function installBazelTools(repoRootPath: string) {
       stdio: 'pipe',
     });
 
-    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable();
+    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable(repoRootPath);
     if (!isBazelBinAvailableAfterInstall) {
       throw new Error(dedent`
         [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
diff --git a/packages/kbn-pm/src/utils/bazel/run.ts b/packages/kbn-pm/src/utils/bazel/run.ts
deleted file mode 100644
index 18a6cacdf6d2a..0000000000000
--- a/packages/kbn-pm/src/utils/bazel/run.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import chalk from 'chalk';
-import execa from 'execa';
-import * as Rx from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { observeLines } from '@kbn/dev-utils/stdio';
-import { spawn } from '../child_process';
-import { log } from '../log';
-import { CliError } from '../errors';
-
-type BazelCommandRunner = 'bazel' | 'ibazel';
-
-async function runBazelCommandWithRunner(
-  bazelCommandRunner: BazelCommandRunner,
-  bazelArgs: string[],
-  offline: boolean = false,
-  runOpts: execa.Options = {}
-) {
-  // Force logs to pipe in order to control the output of them
-  const bazelOpts: execa.Options = {
-    ...runOpts,
-    stdio: 'pipe',
-  };
-
-  if (offline) {
-    bazelArgs = [...bazelArgs, '--config=offline'];
-  }
-
-  const bazelProc = spawn(bazelCommandRunner, bazelArgs, bazelOpts);
-
-  const bazelLogs$ = new Rx.Subject<string>();
-
-  // Bazel outputs machine readable output into stdout and human readable output goes to stderr.
-  // Therefore we need to get both. In order to get errors we need to parse the actual text line
-  const bazelLogSubscription = Rx.merge(
-    observeLines(bazelProc.stdout!).pipe(
-      tap((line) => log.info(`${chalk.cyan(`[${bazelCommandRunner}]`)} ${line}`))
-    ),
-    observeLines(bazelProc.stderr!).pipe(
-      tap((line) => log.info(`${chalk.cyan(`[${bazelCommandRunner}]`)} ${line}`))
-    )
-  ).subscribe(bazelLogs$);
-
-  // Wait for process and logs to finish, unsubscribing in the end
-  try {
-    await bazelProc;
-  } catch {
-    log.error(
-      'HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`'
-    );
-    throw new CliError(`The bazel command that was running failed to complete.`);
-  }
-  await bazelLogs$.toPromise();
-  await bazelLogSubscription.unsubscribe();
-}
-
-export async function runBazel(
-  bazelArgs: string[],
-  offline: boolean = false,
-  runOpts: execa.Options = {}
-) {
-  await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
-}
-
-export async function runIBazel(
-  bazelArgs: string[],
-  offline: boolean = false,
-  runOpts: execa.Options = {}
-) {
-  const extendedEnv = { IBAZEL_USE_LEGACY_WATCHER: '0', ...runOpts?.env };
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, { ...runOpts, env: extendedEnv });
-}
diff --git a/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts b/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
index 0e740e674b7d8..0c5213e2dacc6 100644
--- a/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
+++ b/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
@@ -10,6 +10,7 @@ import { existsSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { spawn } from '../child_process';
 import { log } from '../log';
+import { isFile, readFile, writeFile } from '../fs';
 
 async function isVaultAvailable() {
   try {
@@ -33,6 +34,26 @@ async function isElasticCommitter() {
   }
 }
 
+async function migrateToNewServersIfNeeded(settingsPath: string) {
+  if (!(await isFile(settingsPath))) {
+    return false;
+  }
+
+  const readSettingsFile = await readFile(settingsPath, 'utf8');
+  const newReadSettingsFile = readSettingsFile.replace(
+    /cloud\.buildbuddy\.io/g,
+    'remote.buildbuddy.io'
+  );
+
+  if (newReadSettingsFile === readSettingsFile) {
+    return false;
+  }
+
+  writeFile(settingsPath, newReadSettingsFile);
+  log.info(`[bazel_tools] upgrade remote cache settings to use new server address`);
+  return true;
+}
+
 export async function setupRemoteCache(repoRootPath: string) {
   // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
   if (process.env.CI || !(await isElasticCommitter())) {
@@ -43,6 +64,13 @@ export async function setupRemoteCache(repoRootPath: string) {
 
   const settingsPath = resolve(repoRootPath, '.bazelrc.cache');
 
+  // Checks if we should upgrade the servers used on .bazelrc.cache
+  //
+  // NOTE: this can be removed in the future once everyone is migrated into the new servers
+  if (await migrateToNewServersIfNeeded(settingsPath)) {
+    return;
+  }
+
   if (existsSync(settingsPath)) {
     log.debug(`[bazel_tools] remote cache settings already exist, skipping`);
     return;
@@ -51,7 +79,8 @@ export async function setupRemoteCache(repoRootPath: string) {
   if (!(await isVaultAvailable())) {
     log.info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
     log.info('[bazel_tools] building packages will work, but will be slower in many cases.');
-    log.info('[bazel_tools] reach out to Operations if you need assistance with this.');
+    log.info('[bazel_tools] use the following guide or reach out to Operations for assistance');
+    log.info('[bazel_tools] https://github.com/elastic/infra/tree/master/docs/vault');
     return;
   }
 
@@ -81,8 +110,8 @@ export async function setupRemoteCache(repoRootPath: string) {
     # V1 - This file is automatically generated by 'yarn kbn bootstrap'
     # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
     build --bes_results_url=https://app.buildbuddy.io/invocation/
-    build --bes_backend=grpcs://cloud.buildbuddy.io
-    build --remote_cache=grpcs://cloud.buildbuddy.io
+    build --bes_backend=grpcs://remote.buildbuddy.io
+    build --remote_cache=grpcs://remote.buildbuddy.io
     build --remote_timeout=3600
     build --remote_header=${apiKey}
   `;
diff --git a/packages/kbn-pm/src/utils/convert_plugin_id_to_package_id.ts b/packages/kbn-pm/src/utils/convert_plugin_id_to_package_id.ts
new file mode 100644
index 0000000000000..613ab6abc3a6f
--- /dev/null
+++ b/packages/kbn-pm/src/utils/convert_plugin_id_to_package_id.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export function convertPluginIdToPackageId(pluginId: string) {
+  if (pluginId === 'core') {
+    // core is the only non-plugin
+    return `@kbn/core`;
+  }
+
+  return `@kbn/${pluginId
+    .split('')
+    .flatMap((c) => (c.toUpperCase() === c ? `-${c.toLowerCase()}` : c))
+    .join('')}-plugin`
+    .replace(/-\w(-\w)+-/g, (match) => `-${match.split('-').join('')}-`)
+    .replace(/-plugin-plugin$/, '-plugin');
+}
diff --git a/packages/kbn-pm/src/utils/link_project_executables.test.ts b/packages/kbn-pm/src/utils/link_project_executables.test.ts
index 7470ea6295490..5045474321ce5 100644
--- a/packages/kbn-pm/src/utils/link_project_executables.test.ts
+++ b/packages/kbn-pm/src/utils/link_project_executables.test.ts
@@ -12,7 +12,7 @@ jest.mock('./fs');
 
 import { resolve } from 'path';
 
-import { ToolingLogCollectingWriter } from '@kbn/dev-utils/tooling_log';
+import { ToolingLogCollectingWriter } from '@kbn/tooling-log';
 
 import { absolutePathSnapshotSerializer, stripAnsiSnapshotSerializer } from '../test_helpers';
 import { linkProjectExecutables } from './link_project_executables';
diff --git a/packages/kbn-pm/src/utils/log.ts b/packages/kbn-pm/src/utils/log.ts
index ba4ee6941f540..a70f967adc400 100644
--- a/packages/kbn-pm/src/utils/log.ts
+++ b/packages/kbn-pm/src/utils/log.ts
@@ -12,7 +12,7 @@ import {
   LogLevel,
   parseLogLevel,
   ParsedLogLevel,
-} from '@kbn/dev-utils/tooling_log';
+} from '@kbn/tooling-log';
 
 class Log extends ToolingLog {
   private logLevel!: ParsedLogLevel;
diff --git a/packages/kbn-pm/src/utils/package_json.ts b/packages/kbn-pm/src/utils/package_json.ts
index a50d8994b5720..e8ed8d0a7f8f5 100644
--- a/packages/kbn-pm/src/utils/package_json.ts
+++ b/packages/kbn-pm/src/utils/package_json.ts
@@ -27,45 +27,4 @@ export function writePackageJson(path: string, json: IPackageJson) {
   return writePkg(path, json);
 }
 
-export const createProductionPackageJson = (pkgJson: IPackageJson) => ({
-  ...pkgJson,
-  dependencies: transformDependencies(pkgJson.dependencies),
-});
-
 export const isLinkDependency = (depVersion: string) => depVersion.startsWith('link:');
-
-export const isBazelPackageDependency = (depVersion: string) =>
-  depVersion.startsWith('link:bazel-bin/');
-
-/**
- * Replaces `link:` dependencies with `file:` dependencies. When installing
- * dependencies, these `file:` dependencies will be copied into `node_modules`
- * instead of being symlinked.
- *
- * This will allow us to copy packages into the build and run `yarn`, which
- * will then _copy_ the `file:` dependencies into `node_modules` instead of
- * symlinking like we do in development.
- *
- * Additionally it also taken care of replacing `link:bazel-bin/` with
- * `file:` so we can also support the copy of the Bazel packages dist already into
- * build/packages to be copied into the node_modules
- */
-export function transformDependencies(dependencies: IPackageDependencies = {}) {
-  const newDeps: IPackageDependencies = {};
-  for (const name of Object.keys(dependencies)) {
-    const depVersion = dependencies[name];
-
-    if (!isLinkDependency(depVersion)) {
-      newDeps[name] = depVersion;
-      continue;
-    }
-
-    if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
-      continue;
-    }
-
-    newDeps[name] = depVersion.replace('link:', 'file:');
-  }
-  return newDeps;
-}
diff --git a/packages/kbn-pm/src/utils/project.test.ts b/packages/kbn-pm/src/utils/project.test.ts
index b283ca1cc0fc4..9be5953880283 100644
--- a/packages/kbn-pm/src/utils/project.test.ts
+++ b/packages/kbn-pm/src/utils/project.test.ts
@@ -145,28 +145,3 @@ describe('#getExecutables()', () => {
     expect(() => createProjectWith({ bin: 1 }).getExecutables()).toThrowErrorMatchingSnapshot();
   });
 });
-
-describe('#getIntermediateBuildDirectory', () => {
-  test('is the same as the project path when not specified', () => {
-    const project = createProjectWith({}, 'packages/my-project');
-    const path = project.getIntermediateBuildDirectory();
-
-    expect(path).toBe(project.path);
-  });
-
-  test('appends the `intermediateBuildDirectory` to project path when specified', () => {
-    const project = createProjectWith(
-      {
-        kibana: {
-          build: {
-            intermediateBuildDirectory: 'quux',
-          },
-        },
-      },
-      'packages/my-project'
-    );
-    const path = project.getIntermediateBuildDirectory();
-
-    expect(path).toBe(join(project.path, 'quux'));
-  });
-});
diff --git a/packages/kbn-pm/src/utils/project.ts b/packages/kbn-pm/src/utils/project.ts
index 8e86b111c6a18..48c606c10da42 100644
--- a/packages/kbn-pm/src/utils/project.ts
+++ b/packages/kbn-pm/src/utils/project.ts
@@ -19,11 +19,10 @@ import {
   isLinkDependency,
   readPackageJson,
 } from './package_json';
-import { installInDir, runScriptInPackage, runScriptInPackageStreaming } from './scripts';
+import { runScriptInPackage, runScriptInPackageStreaming } from './scripts';
 
 interface BuildConfig {
   skip?: boolean;
-  intermediateBuildDirectory?: string;
   oss?: boolean;
 }
 
@@ -135,15 +134,6 @@ export class Project {
     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.
-   */
-  public getIntermediateBuildDirectory() {
-    return Path.resolve(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
-  }
-
   public getCleanConfig(): CleanConfig {
     return (this.json.kibana && this.json.kibana.clean) || {};
   }
@@ -215,14 +205,6 @@ export class Project {
   public isEveryDependencyLocal() {
     return Object.values(this.allDependencies).every((dep) => isLinkDependency(dep));
   }
-
-  public async installDependencies(options: { extraArgs?: string[] } = {}) {
-    log.info(`[${this.name}] running yarn`);
-
-    log.write('');
-    await installInDir(this.path, options?.extraArgs);
-    log.write('');
-  }
 }
 
 // We normalize all path separators to `/` in generated files
diff --git a/packages/kbn-pm/src/utils/regenerate_base_tsconfig.ts b/packages/kbn-pm/src/utils/regenerate_base_tsconfig.ts
new file mode 100644
index 0000000000000..667dc97d9ee8e
--- /dev/null
+++ b/packages/kbn-pm/src/utils/regenerate_base_tsconfig.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs/promises';
+import Path from 'path';
+
+import normalizePath from 'normalize-path';
+import { KibanaPlatformPlugin } from '@kbn/plugin-discovery';
+import { convertPluginIdToPackageId } from './convert_plugin_id_to_package_id';
+
+export async function regenerateBaseTsconfig(plugins: KibanaPlatformPlugin[], repoRoot: string) {
+  const tsconfigPath = Path.resolve(repoRoot, 'tsconfig.base.json');
+  const lines = (await Fs.readFile(tsconfigPath, 'utf-8')).split('\n');
+
+  const packageMap = plugins
+    .slice()
+    .sort((a, b) => a.manifestPath.localeCompare(b.manifestPath))
+    .flatMap((p) => {
+      const id = convertPluginIdToPackageId(p.manifest.id);
+      const path = normalizePath(Path.relative(repoRoot, p.directory));
+      return [`      "${id}": ["${path}"],`, `      "${id}/*": ["${path}/*"],`];
+    });
+
+  const start = lines.findIndex((l) => l.trim() === '// START AUTOMATED PACKAGE LISTING');
+  const end = lines.findIndex((l) => l.trim() === '// END AUTOMATED PACKAGE LISTING');
+
+  await Fs.writeFile(
+    tsconfigPath,
+    [...lines.slice(0, start + 1), ...packageMap, ...lines.slice(end)].join('\n')
+  );
+}
diff --git a/packages/kbn-pm/src/utils/regenerate_package_json.ts b/packages/kbn-pm/src/utils/regenerate_package_json.ts
new file mode 100644
index 0000000000000..6124aebc38879
--- /dev/null
+++ b/packages/kbn-pm/src/utils/regenerate_package_json.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fsp from 'fs/promises';
+import Path from 'path';
+
+import { sortPackageJson } from '@kbn/sort-package-json';
+
+export async function regeneratePackageJson(rootPath: string) {
+  const path = Path.resolve(rootPath, 'package.json');
+  const json = await Fsp.readFile(path, 'utf8');
+  await Fsp.writeFile(path, sortPackageJson(json));
+}
diff --git a/packages/kbn-pm/src/utils/regenerate_synthetic_package_map.ts b/packages/kbn-pm/src/utils/regenerate_synthetic_package_map.ts
new file mode 100644
index 0000000000000..c502e11f1a3c8
--- /dev/null
+++ b/packages/kbn-pm/src/utils/regenerate_synthetic_package_map.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs/promises';
+import Path from 'path';
+
+import normalizePath from 'normalize-path';
+import { KibanaPlatformPlugin } from '@kbn/plugin-discovery';
+import { convertPluginIdToPackageId } from './convert_plugin_id_to_package_id';
+
+export async function regenerateSyntheticPackageMap(
+  plugins: KibanaPlatformPlugin[],
+  repoRoot: string
+) {
+  const entries: Array<[string, string]> = [['@kbn/core', 'src/core']];
+
+  for (const plugin of plugins) {
+    entries.push([
+      convertPluginIdToPackageId(plugin.manifest.id),
+      normalizePath(Path.relative(repoRoot, plugin.directory)),
+    ]);
+  }
+
+  await Fs.writeFile(
+    Path.resolve(repoRoot, 'packages/kbn-synthetic-package-map/synthetic-packages.json'),
+    JSON.stringify(entries, null, 2)
+  );
+}
diff --git a/packages/kbn-pm/src/utils/scripts.ts b/packages/kbn-pm/src/utils/scripts.ts
index 6e99285e145f8..fff2b4ca77a14 100644
--- a/packages/kbn-pm/src/utils/scripts.ts
+++ b/packages/kbn-pm/src/utils/scripts.ts
@@ -11,25 +11,6 @@ import { Project } from './project';
 
 const YARN_EXEC = process.env.npm_execpath || 'yarn';
 
-/**
- * Install all dependencies in the given directory
- */
-export async function installInDir(directory: string, extraArgs: string[] = []) {
-  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 spawn(YARN_EXEC, options, {
-    cwd: directory,
-    env: {
-      SASS_BINARY_SITE:
-        'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
-      RE2_DOWNLOAD_MIRROR:
-        'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
-    },
-  });
-}
-
 /**
  * Run script in the given directory
  */
diff --git a/packages/kbn-pm/src/utils/sort_package_json.ts b/packages/kbn-pm/src/utils/sort_package_json.ts
deleted file mode 100644
index 84a1ed6d80960..0000000000000
--- a/packages/kbn-pm/src/utils/sort_package_json.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import Fs from 'fs/promises';
-import { sortPackageJson as sort } from '@kbn/dev-utils/sort_package_json';
-import { Kibana } from './kibana';
-
-export async function sortPackageJson(kbn: Kibana) {
-  const packageJsonPath = kbn.getAbsolute('package.json');
-  await Fs.writeFile(packageJsonPath, sort(await Fs.readFile(packageJsonPath, 'utf-8')));
-}
diff --git a/packages/kbn-pm/src/utils/watch.test.ts b/packages/kbn-pm/src/utils/watch.test.ts
deleted file mode 100644
index e310557cf209f..0000000000000
--- a/packages/kbn-pm/src/utils/watch.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { EventEmitter } from 'events';
-import { waitUntilWatchIsReady } from './watch';
-
-describe('#waitUntilWatchIsReady', () => {
-  let buildOutputStream: EventEmitter;
-  let completionHintPromise: Promise<string>;
-  beforeEach(() => {
-    jest.useFakeTimers();
-
-    buildOutputStream = new EventEmitter();
-    completionHintPromise = waitUntilWatchIsReady(buildOutputStream, {
-      handlerDelay: 100,
-      handlerReadinessTimeout: 50,
-    });
-  });
-
-  test('`waitUntilWatchIsReady` correctly handles `webpack` output', async () => {
-    buildOutputStream.emit('data', Buffer.from('$ webpack'));
-    buildOutputStream.emit('data', Buffer.from('Chunk Names'));
-
-    jest.runAllTimers();
-
-    expect(await completionHintPromise).toBe('webpack');
-  });
-
-  test('`waitUntilWatchIsReady` correctly handles `tsc` output', async () => {
-    buildOutputStream.emit('data', Buffer.from('$ tsc'));
-    buildOutputStream.emit('data', Buffer.from('Compilation complete.'));
-
-    jest.runAllTimers();
-
-    expect(await completionHintPromise).toBe('tsc');
-  });
-
-  test('`waitUntilWatchIsReady` fallbacks to default output handler if output is not recognizable', async () => {
-    buildOutputStream.emit('data', Buffer.from('$ some-cli'));
-    buildOutputStream.emit('data', Buffer.from('Compilation complete.'));
-    buildOutputStream.emit('data', Buffer.from('Chunk Names.'));
-
-    jest.runAllTimers();
-
-    expect(await completionHintPromise).toBe('timeout');
-  });
-
-  test('`waitUntilWatchIsReady` fallbacks to default output handler if none output is detected', async () => {
-    jest.runAllTimers();
-    expect(await completionHintPromise).toBe('timeout');
-  });
-
-  test('`waitUntilWatchIsReady` fails if output stream receives error', async () => {
-    buildOutputStream.emit('error', new Error('Uh, oh!'));
-
-    jest.runAllTimers();
-
-    await expect(completionHintPromise).rejects.toThrow(/Uh, oh!/);
-  });
-});
diff --git a/packages/kbn-pm/src/utils/yarn_lock.ts b/packages/kbn-pm/src/utils/yarn_lock.ts
index 5c55e7be6230f..ce1e3ddae4843 100644
--- a/packages/kbn-pm/src/utils/yarn_lock.ts
+++ b/packages/kbn-pm/src/utils/yarn_lock.ts
@@ -9,10 +9,10 @@
 // @ts-expect-error published types are worthless
 import { parse as parseLockfile } from '@yarnpkg/lockfile';
 
-import { readFile } from '../utils/fs';
-import { Kibana } from '../utils/kibana';
-import { Project } from '../utils/project';
-import { Log } from '../utils/log';
+import { readFile } from './fs';
+import { Kibana } from './kibana';
+import { Project } from './project';
+import { Log } from './log';
 
 export interface YarnLock {
   /** a simple map of name@versionrange tags to metadata about a package */
diff --git a/packages/kbn-pm/webpack.config.js b/packages/kbn-pm/webpack.config.js
index bb71aa9717f16..73431203ecb77 100644
--- a/packages/kbn-pm/webpack.config.js
+++ b/packages/kbn-pm/webpack.config.js
@@ -86,4 +86,12 @@ module.exports = {
   watchOptions: {
     ignored: [/node_modules/, /vendor/],
   },
+
+  optimization: {
+    moduleIds: 'named',
+    nodeEnv: 'production',
+    usedExports: true,
+    sideEffects: true,
+    minimize: false,
+  },
 };
diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.tsx
index 096058fcc0aa3..bfede3a8fcc4d 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.tsx
+++ b/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.tsx
@@ -21,7 +21,7 @@ import { uniq } from 'lodash';
 import { ListOperatorTypeEnum as OperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
 
 // TODO: I have to use any here for now, but once this is available below, we should use the correct types, https://github.com/elastic/kibana/issues/100715
-// import { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
+// import { AutocompleteStart } from '../../../../../../../src/plugins/unified_search/public';
 type AutocompleteStart = any;
 
 import * as i18n from '../translations';
diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.tsx
index 5a36e155c548f..8f5afbbc86629 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.tsx
+++ b/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.tsx
@@ -13,7 +13,7 @@ import { ListOperatorTypeEnum as OperatorTypeEnum } from '@kbn/securitysolution-
 import { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
 
 // TODO: I have to use any here for now, but once this is available below, we should use the correct types, https://github.com/elastic/kibana/issues/100715
-// import { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
+// import { AutocompleteStart } from '../../../../../../../src/plugins/unified_search/public';
 type AutocompleteStart = any;
 
 import * as i18n from '../translations';
diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.tsx
index 82b9cb029d8dc..82d36aef83728 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.tsx
+++ b/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.tsx
@@ -15,7 +15,7 @@ import { uniq } from 'lodash';
 import { ListOperatorTypeEnum as OperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
 
 // TODO: I have to use any here for now, but once this is available below, we should use the correct types, https://github.com/elastic/kibana/issues/100715
-// import { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
+// import { AutocompleteStart } from '../../../../../../../src/plugins/unified_search/public';
 type AutocompleteStart = any;
 
 import * as i18n from '../translations';
diff --git a/packages/kbn-securitysolution-autocomplete/src/hooks/use_field_value_autocomplete/index.ts b/packages/kbn-securitysolution-autocomplete/src/hooks/use_field_value_autocomplete/index.ts
index ca0868e5056a6..1b2de4567fe2a 100644
--- a/packages/kbn-securitysolution-autocomplete/src/hooks/use_field_value_autocomplete/index.ts
+++ b/packages/kbn-securitysolution-autocomplete/src/hooks/use_field_value_autocomplete/index.ts
@@ -12,7 +12,7 @@ import { ListOperatorTypeEnum as OperatorTypeEnum } from '@kbn/securitysolution-
 import { DataViewBase, DataViewFieldBase, getDataViewFieldSubtypeNested } from '@kbn/es-query';
 
 // TODO: I have to use any here for now, but once this is available below, we should use the correct types, https://github.com/elastic/kibana/issues/100715
-// import { AutocompleteStart } from '../../../../../../../../src/plugins/data/public';
+// import { AutocompleteStart } from '../../../../../../../../src/plugins/unified_search/public';
 type AutocompleteStart = any;
 
 interface FuncArgs {
diff --git a/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts b/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts
index 8584edfabeebd..b232e2b6fc521 100644
--- a/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts
+++ b/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts
@@ -10,7 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { left } from 'fp-ts/lib/Either';
 import { foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils';
 import { ImportCommentsArray } from '../import_comment';
-import { DefaultImportCommentsArray } from '../default_import_comments_array';
+import { DefaultImportCommentsArray } from '.';
 import { getCommentsArrayMock } from '../comment/index.mock';
 import { getCreateCommentsArrayMock } from '../create_comment/index.mock';
 
diff --git a/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts b/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts
index 842e046ea67ee..36b92cb288669 100644
--- a/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts
+++ b/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts
@@ -7,7 +7,7 @@
  */
 
 import { ENTRY_VALUE, FIELD, OPERATOR, WILDCARD } from '../../../constants/index.mock';
-import { EndpointEntryMatchWildcard } from './index';
+import { EndpointEntryMatchWildcard } from '.';
 
 export const getEndpointEntryMatchWildcardMock = (): EndpointEntryMatchWildcard => ({
   field: FIELD,
diff --git a/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts b/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts
index fd7b12123b6bb..c5b12610bb409 100644
--- a/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts
+++ b/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts
@@ -8,7 +8,7 @@
 
 import { pipe } from 'fp-ts/lib/pipeable';
 import { left } from 'fp-ts/lib/Either';
-import { DefaultVersionNumber } from '../default_version_number';
+import { DefaultVersionNumber } from '.';
 import { foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils';
 
 describe('default_version_number', () => {
diff --git a/packages/kbn-securitysolution-list-utils/src/helpers/index.ts b/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
index eabf8dfa33f98..470e15db0404e 100644
--- a/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
+++ b/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
@@ -701,7 +701,7 @@ export const getOperatorOptions = (
  * to find it's corresponding keyword type (if available) which does
  * generate autocomplete values
  *
- * @param fields IFieldType fields
+ * @param fields DataViewFieldBase fields
  * @param selectedField the field name that was selected
  * @param isTextType we only want a corresponding keyword field if
  * the selected field is of type 'text'
diff --git a/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
index bb4fc47ce0370..14f6201cc8283 100644
--- a/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
+++ b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { transformDataToNdjson } from './';
+import { transformDataToNdjson } from '.';
 
 export const ANCHOR_DATE = '2020-02-20T03:57:54.037Z';
 
diff --git a/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx b/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
index 129bbbf3b202d..001efa143b1cc 100644
--- a/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
+++ b/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
@@ -13,7 +13,7 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import { withSuspense } from '@kbn/shared-ux-utility';
 
 export const LazyDataViewIllustration = React.lazy(() =>
-  import('../assets/data_view_illustration').then(({ DataViewIllustration }) => ({
+  import('./data_view_illustration').then(({ DataViewIllustration }) => ({
     default: DataViewIllustration,
   }))
 );
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap b/packages/kbn-shared-ux-components/src/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
deleted file mode 100644
index 5c20a52d05812..0000000000000
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
+++ /dev/null
@@ -1,148 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ExitFullScreenButton /> is rendered 1`] = `
-<SharedUxServicesProvider
-  application={
-    Object {
-      "currentAppId$": Observable {},
-      "navigateToUrl": [Function],
-    }
-  }
-  docLinks={
-    Object {
-      "dataViewsDocLink": "dummy link",
-    }
-  }
-  editors={
-    Object {
-      "openDataViewEditor": [MockFunction],
-    }
-  }
-  http={
-    Object {
-      "addBasePath": [MockFunction],
-    }
-  }
-  permissions={
-    Object {
-      "canAccessFleet": true,
-      "canCreateNewDataView": true,
-    }
-  }
-  platform={
-    Object {
-      "setIsFullscreen": [MockFunction] {
-        "calls": Array [
-          Array [
-            false,
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      },
-    }
-  }
->
-  <ExitFullScreenButton
-    onExit={[MockFunction]}
-  >
-    <ExitFullScreenButton
-      css={
-        Object {
-          "map": undefined,
-          "name": "knjqgf",
-          "next": undefined,
-          "styles": "
-    bottom: 8px;
-    left: 8px;
-    position: fixed;
-    z-index: 5;
-  ",
-          "toString": [Function],
-        }
-      }
-      onClick={[Function]}
-    >
-      <div>
-        <EuiScreenReaderOnly>
-          <p
-            aria-live="polite"
-            className="euiScreenReaderOnly"
-          >
-            In full screen mode, press ESC to exit.
-          </p>
-        </EuiScreenReaderOnly>
-        <button
-          className="exitFullScreenButton"
-          data-test-subj="exitFullScreenModeButton"
-          onClick={[Function]}
-        >
-          <EuiFlexGroup
-            alignItems="center"
-            component="span"
-            gutterSize="s"
-            responsive={false}
-          >
-            <span
-              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-            >
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="m"
-                    type="logoElastic"
-                  >
-                    <span
-                      data-euiicon-type="logoElastic"
-                      size="m"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                data-test-subj="exitFullScreenModeText"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                  data-test-subj="exitFullScreenModeText"
-                >
-                  Exit full screen
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="s"
-                    type="fullScreenExit"
-                  >
-                    <span
-                      data-euiicon-type="fullScreenExit"
-                      size="s"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-            </span>
-          </EuiFlexGroup>
-        </button>
-      </div>
-    </ExitFullScreenButton>
-  </ExitFullScreenButton>
-</SharedUxServicesProvider>
-`;
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.mdx b/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.mdx
deleted file mode 100644
index 82f1eb0fde1ba..0000000000000
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
----
-id: sharedUX/Components/ExitFullScreenButton
-slug: /shared-ux/components/exit-full-screen-button
-title: Exit Full Screen Button
-summary: A button that floats over the plugin workspace and allows one to exit "full screen" mode.
-tags: ['shared-ux', 'component']
-date: 2021-12-28
----
-
-> This documentation is in-progress.
-
-When a plugin moves to "full screen" mode, the Kibana Chrome can be hidden entirely.  This button floats over the plugin workspace and allows someone to exit full screen mode and restore the Kibana Chrome.
-
-The pure component, `exit_full_screen_button.tsx`, contains the base styles and behaviors.
-
-The connected component, `exit_full_screen_button.tsx`, uses services from the `shared_ux` plugin to show and hide the Kibana chrome.  You must wrap your plugin app in the `ServicesContext` provided by the start contract of the `shared_ux` plugin to use it.
-
-This component is provided with `React.lazy` to avoid bundle bloat.
-
-This component is not currently eligible for promotion to EUI.
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.test.tsx b/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.test.tsx
deleted file mode 100644
index da205ddfbe377..0000000000000
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.test.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import React from 'react';
-import { mount as enzymeMount, ReactWrapper } from 'enzyme';
-import { keys } from '@elastic/eui';
-
-import {
-  SharedUxServicesProvider,
-  SharedUxServices,
-  mockServicesFactory,
-} from '@kbn/shared-ux-services';
-import { ExitFullScreenButton } from './exit_full_screen_button';
-
-describe('<ExitFullScreenButton />', () => {
-  let services: SharedUxServices;
-  let mount: (element: JSX.Element) => ReactWrapper;
-
-  beforeEach(() => {
-    services = mockServicesFactory();
-    mount = (element: JSX.Element) =>
-      enzymeMount(<SharedUxServicesProvider {...services}>{element}</SharedUxServicesProvider>);
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  test('is rendered', () => {
-    const component = mount(<ExitFullScreenButton onExit={jest.fn()} />);
-
-    expect(component).toMatchSnapshot();
-  });
-
-  test('passing `false` to toggleChrome does not toggle chrome', () => {
-    const component = mount(<ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />);
-    expect(services.platform.setIsFullscreen).toHaveBeenCalledTimes(0);
-    component.unmount();
-    expect(services.platform.setIsFullscreen).toHaveBeenCalledTimes(0);
-  });
-
-  describe('onExit', () => {
-    const onExitHandler = jest.fn();
-    let component: ReactWrapper;
-
-    beforeEach(() => {
-      component = mount(<ExitFullScreenButton onExit={onExitHandler} toggleChrome={true} />);
-    });
-
-    test('is called when the button is pressed', () => {
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(false);
-
-      component.find('button').simulate('click');
-
-      expect(onExitHandler).toHaveBeenCalledTimes(1);
-
-      component.unmount();
-
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(true);
-    });
-
-    test('is called when the ESC key is pressed', () => {
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(false);
-
-      const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
-      document.dispatchEvent(escapeKeyEvent);
-
-      expect(onExitHandler).toHaveBeenCalledTimes(1);
-
-      component.unmount();
-
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(true);
-    });
-  });
-});
diff --git a/packages/kbn-shared-ux-components/src/index.ts b/packages/kbn-shared-ux-components/src/index.ts
index e6e72b23c3d17..98bd3ad1ac7e9 100644
--- a/packages/kbn-shared-ux-components/src/index.ts
+++ b/packages/kbn-shared-ux-components/src/index.ts
@@ -9,31 +9,14 @@
 import React from 'react';
 import { withSuspense } from '@kbn/shared-ux-utility';
 
-/**
- * The Lazily-loaded `ExitFullScreenButton` component.  Consumers should use `React.Suspense` or the
- * `withSuspense` HOC to load this component.
- */
-export const LazyExitFullScreenButton = React.lazy(() =>
-  import('./exit_full_screen_button').then(({ ExitFullScreenButton }) => ({
-    default: ExitFullScreenButton,
-  }))
-);
-
 export const LazyToolbarButton = React.lazy(() =>
-  import('./toolbar/index').then(({ ToolbarButton }) => ({
+  import('./toolbar').then(({ ToolbarButton }) => ({
     default: ToolbarButton,
   }))
 );
 
 export const RedirectAppLinks = React.lazy(() => import('./redirect_app_links'));
 
-/**
- * A `ExitFullScreenButton` component that is wrapped by the `withSuspense` HOC.  This component can
- * be used directly by consumers and will load the `LazyExitFullScreenButton` component lazily with
- * a predefined fallback and error boundary.
- */
-export const ExitFullScreenButton = withSuspense(LazyExitFullScreenButton);
-
 /**
  * A `ToolbarButton` component that is wrapped by the `withSuspense` HOC.  This component can
  * be used directly by consumers and will load the `LazyToolbarButton` component lazily with
@@ -85,7 +68,7 @@ export const NoDataViewsComponent = withSuspense(LazyNoDataViewsComponent);
  * `withSuspense` HOC to load this component.
  */
 export const LazyIconButtonGroup = React.lazy(() =>
-  import('./toolbar/index').then(({ IconButtonGroup }) => ({
+  import('./toolbar').then(({ IconButtonGroup }) => ({
     default: IconButtonGroup,
   }))
 );
diff --git a/packages/kbn-shared-ux-storybook/src/config/main.ts b/packages/kbn-shared-ux-storybook/src/config/main.ts
index 1981ff546c353..ccd0d1e73cba8 100644
--- a/packages/kbn-shared-ux-storybook/src/config/main.ts
+++ b/packages/kbn-shared-ux-storybook/src/config/main.ts
@@ -11,6 +11,7 @@ import { defaultConfig } from '@kbn/storybook';
 module.exports = {
   ...defaultConfig,
   stories: [
+    '../../../shared-ux/**/*.stories.+(tsx|mdx)',
     '../../../kbn-shared-ux*/**/*.stories.+(tsx|mdx)',
     '../../../../src/plugins/shared_ux/**/*.stories.+(tsx|mdx)',
   ],
diff --git a/packages/kbn-sort-package-json/BUILD.bazel b/packages/kbn-sort-package-json/BUILD.bazel
new file mode 100644
index 0000000000000..515e9009615c8
--- /dev/null
+++ b/packages/kbn-sort-package-json/BUILD.bazel
@@ -0,0 +1,116 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-sort-package-json"
+PKG_REQUIRE_NAME = "@kbn/sort-package-json"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//sort-package-json",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//sort-package-json",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-sort-package-json/README.md b/packages/kbn-sort-package-json/README.md
new file mode 100644
index 0000000000000..915f210547b73
--- /dev/null
+++ b/packages/kbn-sort-package-json/README.md
@@ -0,0 +1,3 @@
+# @kbn/sort-package-json
+
+Empty package generated by @kbn/generate
diff --git a/packages/kbn-sort-package-json/jest.config.js b/packages/kbn-sort-package-json/jest.config.js
new file mode 100644
index 0000000000000..ae0651be19e61
--- /dev/null
+++ b/packages/kbn-sort-package-json/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-sort-package-json'],
+};
diff --git a/packages/kbn-sort-package-json/package.json b/packages/kbn-sort-package-json/package.json
new file mode 100644
index 0000000000000..9a875835d7450
--- /dev/null
+++ b/packages/kbn-sort-package-json/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/sort-package-json",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-dev-utils/src/sort_package_json.ts b/packages/kbn-sort-package-json/src/index.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/sort_package_json.ts
rename to packages/kbn-sort-package-json/src/index.ts
diff --git a/packages/kbn-sort-package-json/tsconfig.json b/packages/kbn-sort-package-json/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-sort-package-json/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-spec-to-console/lib/convert.test.js b/packages/kbn-spec-to-console/lib/convert.test.js
index 14cb2dd7b6c04..1d92455168fc5 100644
--- a/packages/kbn-spec-to-console/lib/convert.test.js
+++ b/packages/kbn-spec-to-console/lib/convert.test.js
@@ -8,8 +8,8 @@
 
 const convert = require('./convert');
 
-const clusterHealthSpec = require('./__fixtures__/cluster_health_spec');
-const clusterHealthAutocomplete = require('./__fixtures__/cluster_health_autocomplete');
+const clusterHealthSpec = require('./__fixtures__/cluster_health_spec.json');
+const clusterHealthAutocomplete = require('./__fixtures__/cluster_health_autocomplete.json');
 
 test('convert', () => {
   expect(convert(clusterHealthSpec)).toEqual(clusterHealthAutocomplete);
diff --git a/packages/kbn-spec-to-console/lib/replace_pattern.js b/packages/kbn-spec-to-console/lib/replace_pattern.js
index 4cf96e13c5a0c..3847900a8136c 100644
--- a/packages/kbn-spec-to-console/lib/replace_pattern.js
+++ b/packages/kbn-spec-to-console/lib/replace_pattern.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const map = require('./static/map_interpolation');
+const map = require('./static/map_interpolation.json');
 
 module.exports = (pattern, { brackets, exact } = {}) => {
   let newPattern = pattern;
diff --git a/packages/kbn-stdio-dev-helpers/BUILD.bazel b/packages/kbn-stdio-dev-helpers/BUILD.bazel
new file mode 100644
index 0000000000000..05b76bbc0508d
--- /dev/null
+++ b/packages/kbn-stdio-dev-helpers/BUILD.bazel
@@ -0,0 +1,118 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-stdio-dev-helpers"
+PKG_REQUIRE_NAME = "@kbn/stdio-dev-helpers"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//rxjs",
+  "@npm//tslib",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//rxjs",
+  "@npm//tslib",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-stdio-dev-helpers/README.md b/packages/kbn-stdio-dev-helpers/README.md
new file mode 100644
index 0000000000000..6ad7f282149ca
--- /dev/null
+++ b/packages/kbn-stdio-dev-helpers/README.md
@@ -0,0 +1,3 @@
+# @kbn/stdio-dev-helpers
+
+RxJS helpers for dealing with stdio from child processes
diff --git a/packages/kbn-stdio-dev-helpers/jest.config.js b/packages/kbn-stdio-dev-helpers/jest.config.js
new file mode 100644
index 0000000000000..31a8aab16c7e5
--- /dev/null
+++ b/packages/kbn-stdio-dev-helpers/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-stdio-dev-helpers'],
+};
diff --git a/packages/kbn-stdio-dev-helpers/package.json b/packages/kbn-stdio-dev-helpers/package.json
new file mode 100644
index 0000000000000..23b0a1cf65a76
--- /dev/null
+++ b/packages/kbn-stdio-dev-helpers/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/stdio-dev-helpers",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-stdio-dev-helpers/src/index.ts b/packages/kbn-stdio-dev-helpers/src/index.ts
new file mode 100644
index 0000000000000..a898037b1673e
--- /dev/null
+++ b/packages/kbn-stdio-dev-helpers/src/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { observeLines } from './observe_lines';
+export { observeReadable } from './observe_readable';
diff --git a/packages/kbn-dev-utils/src/stdio/observe_lines.ts b/packages/kbn-stdio-dev-helpers/src/observe_lines.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/stdio/observe_lines.ts
rename to packages/kbn-stdio-dev-helpers/src/observe_lines.ts
diff --git a/packages/kbn-dev-utils/src/stdio/observe_readable.ts b/packages/kbn-stdio-dev-helpers/src/observe_readable.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/stdio/observe_readable.ts
rename to packages/kbn-stdio-dev-helpers/src/observe_readable.ts
diff --git a/packages/kbn-stdio-dev-helpers/tsconfig.json b/packages/kbn-stdio-dev-helpers/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-stdio-dev-helpers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-storybook/preset.js b/packages/kbn-storybook/preset.js
index 38625a4de800f..8021f28688296 100644
--- a/packages/kbn-storybook/preset.js
+++ b/packages/kbn-storybook/preset.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line
 const webpackConfig = require('./target_node/webpack.config');
 
 module.exports = {
diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts
index 4da3c58688f75..7f4821767cd9c 100644
--- a/packages/kbn-storybook/src/webpack.config.ts
+++ b/packages/kbn-storybook/src/webpack.config.ts
@@ -140,13 +140,13 @@ export default ({ config: storybookConfig }: { config: Configuration }) => {
       const options = (loader.options = { ...(loader.options as Record<string, any>) });
 
       // capture the plugins defined at the root level
-      const plugins: string[] = options.plugins;
+      const plugins: string[] = options.plugins ?? [];
       options.plugins = [];
 
       // move the plugins to the top of the preset array so they will run after the typescript preset
       options.presets = [
         {
-          plugins,
+          plugins: [...plugins, require.resolve('@kbn/babel-plugin-synthetic-packages')],
         },
         ...(options.presets as Preset[]).filter(isDesiredPreset).map((preset) => {
           const tsPreset = getTsPreset(preset);
diff --git a/packages/kbn-synthetic-package-map/BUILD.bazel b/packages/kbn-synthetic-package-map/BUILD.bazel
new file mode 100644
index 0000000000000..6b1d32fcbbb1e
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/BUILD.bazel
@@ -0,0 +1,51 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-synthetic-package-map"
+PKG_REQUIRE_NAME = "@kbn/synthetic-package-map"
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+  "index.js",
+  "index.d.ts",
+  "synthetic-packages.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+]
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS,
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+alias(
+  name = "npm_module_types",
+  actual = ":" + PKG_DIRNAME,
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-synthetic-package-map/index.d.ts b/packages/kbn-synthetic-package-map/index.d.ts
new file mode 100644
index 0000000000000..92724eed486b1
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/index.d.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export type PackageMap = Map<string, string>;
+
+/**
+ * Read the package map from disk
+ */
+export function readPackageMap(): PackageMap;
+/**
+ * Read the package map and calculate a cache key/hash of the package map
+ */
+export function readHashOfPackageMap(): string;
diff --git a/packages/kbn-synthetic-package-map/index.js b/packages/kbn-synthetic-package-map/index.js
new file mode 100644
index 0000000000000..9a9b8c51d90a9
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/index.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+const Fs = require('fs');
+const Path = require('path');
+const Crypto = require('crypto');
+
+const PACKAGE_MAP_PATH = Path.resolve(__dirname, 'synthetic-packages.json');
+
+function readPackageMap() {
+  return new Map(JSON.parse(Fs.readFileSync(PACKAGE_MAP_PATH, 'utf8')));
+}
+
+function readHashOfPackageMap() {
+  return Crypto.createHash('sha256').update(Fs.readFileSync(PACKAGE_MAP_PATH)).digest('hex');
+}
+
+module.exports = {
+  readPackageMap,
+  readHashOfPackageMap,
+};
diff --git a/packages/kbn-synthetic-package-map/package.json b/packages/kbn-synthetic-package-map/package.json
new file mode 100644
index 0000000000000..ae209fdf98db0
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/synthetic-package-map",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-synthetic-package-map/tsconfig.json b/packages/kbn-synthetic-package-map/tsconfig.json
new file mode 100644
index 0000000000000..7b74a1e555c86
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "stripInternal": false,
+    "types": [
+      "node"
+    ]
+  },
+  "include": [
+    "index.d.ts"
+  ]
+}
diff --git a/packages/kbn-telemetry-tools/BUILD.bazel b/packages/kbn-telemetry-tools/BUILD.bazel
index 50336dc44da00..1c9f6113851ff 100644
--- a/packages/kbn-telemetry-tools/BUILD.bazel
+++ b/packages/kbn-telemetry-tools/BUILD.bazel
@@ -31,7 +31,9 @@ NPM_MODULE_EXTRA_FILES = [
 
 RUNTIME_DEPS = [
   "//packages/kbn-dev-utils",
+  "//packages/kbn-eslint-plugin-imports",
   "//packages/kbn-utility-types",
+  "//packages/kbn-utils",
   "@npm//glob",
   "@npm//listr",
   "@npm//normalize-path",
@@ -39,7 +41,9 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
+  "//packages/kbn-eslint-plugin-imports:npm_module_types",
   "//packages/kbn-utility-types:npm_module_types",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//tslib",
   "@npm//@types/glob",
   "@npm//@types/jest",
diff --git a/packages/kbn-telemetry-tools/src/tools/compiler_host.ts b/packages/kbn-telemetry-tools/src/tools/compiler_host.ts
new file mode 100644
index 0000000000000..a49bee64e5642
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/compiler_host.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import ts from 'typescript';
+import { REPO_ROOT } from '@kbn/utils';
+import { ImportResolver } from '@kbn/import-resolver';
+
+function readTsConfigFile(path: string) {
+  const json = ts.readConfigFile(path, ts.sys.readFile);
+
+  if (json.error) {
+    throw new Error(`Unable to load tsconfig file: ${json.error.messageText}`);
+  }
+
+  return json.config;
+}
+
+function loadTsConfigFile(path: string) {
+  return ts.parseJsonConfigFileContent(readTsConfigFile(path) ?? {}, ts.sys, Path.dirname(path));
+}
+
+const baseTsConfig = loadTsConfigFile(Path.resolve(REPO_ROOT, 'tsconfig.base.json'));
+const resolver = ImportResolver.create(REPO_ROOT);
+
+function isTsCompatible(path: string) {
+  const extname = Path.extname(path);
+  return extname === '.ts' || extname === '.tsx' || extname === '.js';
+}
+
+export const compilerHost: ts.CompilerHost = {
+  ...ts.createCompilerHost(baseTsConfig.options),
+
+  resolveModuleNames(moduleNames, sourceFilePath) {
+    const dirname = Path.dirname(sourceFilePath);
+
+    const results: Array<ts.ResolvedModule | undefined> = [];
+
+    for (const req of moduleNames) {
+      const result = resolver.resolve(req, dirname);
+      if (result?.type !== 'file' || !isTsCompatible(result.absolute)) {
+        results.push(undefined);
+      } else {
+        results.push({
+          resolvedFileName: result.absolute,
+          isExternalLibraryImport: !!result.nodeModule,
+        });
+      }
+    }
+
+    return results;
+  },
+};
diff --git a/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts b/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
index 9655b397c8d1d..aa69abc555b18 100644
--- a/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
+++ b/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
@@ -11,6 +11,7 @@ import * as path from 'path';
 import { parseUsageCollection } from './ts_parser';
 import { globAsync } from './utils';
 import { TelemetryRC } from './config';
+import { compilerHost } from './compiler_host';
 
 export async function getProgramPaths({
   root,
@@ -48,7 +49,7 @@ export async function getProgramPaths({
 }
 
 export function* extractCollectors(fullPaths: string[], tsConfig: any) {
-  const program = ts.createProgram(fullPaths, tsConfig);
+  const program = ts.createProgram(fullPaths, tsConfig, compilerHost);
   program.getTypeChecker();
   const sourceFiles = fullPaths.map((fullPath) => {
     const sourceFile = program.getSourceFile(fullPath);
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
index 3398cd0ae6947..5661db270186c 100644
--- a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
@@ -10,6 +10,7 @@ import * as ts from 'typescript';
 import * as path from 'path';
 import { getDescriptor, TelemetryKinds } from './serializer';
 import { traverseNodes } from './ts_parser';
+import { compilerHost } from './compiler_host';
 
 export function loadFixtureProgram(fixtureName: string) {
   const fixturePath = path.resolve(
@@ -23,7 +24,7 @@ export function loadFixtureProgram(fixtureName: string) {
   if (!tsConfig) {
     throw new Error('Could not find a valid tsconfig.json.');
   }
-  const program = ts.createProgram([fixturePath], tsConfig as any);
+  const program = ts.createProgram([fixturePath], tsConfig as any, compilerHost);
   const checker = program.getTypeChecker();
   const sourceFile = program.getSourceFile(fixturePath);
   if (!sourceFile) {
diff --git a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
index 4a58e3fc1101b..205ab6594fda6 100644
--- a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
@@ -9,6 +9,7 @@
 import { parseUsageCollection } from './ts_parser';
 import * as ts from 'typescript';
 import * as path from 'path';
+import { compilerHost } from './compiler_host';
 import { parsedWorkingCollector } from './__fixture__/parsed_working_collector';
 import { parsedNestedCollector } from './__fixture__/parsed_nested_collector';
 import { parsedExternallyDefinedCollector } from './__fixture__/parsed_externally_defined_collector';
@@ -30,7 +31,7 @@ export function loadFixtureProgram(fixtureName: string) {
   if (!tsConfig) {
     throw new Error('Could not find a valid tsconfig.json.');
   }
-  const program = ts.createProgram([fixturePath], tsConfig as any);
+  const program = ts.createProgram([fixturePath], tsConfig as any, compilerHost);
   const checker = program.getTypeChecker();
   const sourceFile = program.getSourceFile(fixturePath);
   if (!sourceFile) {
diff --git a/packages/kbn-telemetry-tools/src/tools/utils.ts b/packages/kbn-telemetry-tools/src/tools/utils.ts
index c9526fe7d0403..074f9ff2d5f29 100644
--- a/packages/kbn-telemetry-tools/src/tools/utils.ts
+++ b/packages/kbn-telemetry-tools/src/tools/utils.ts
@@ -154,6 +154,12 @@ export function getResolvedModuleSourceFile(
   importedModuleName: string
 ) {
   const resolvedModule = (originalSource as any).resolvedModules.get(importedModuleName);
+  if (!resolvedModule) {
+    throw new Error(
+      `Import for [${importedModuleName}] in [${originalSource.fileName}] could not be resolved by TypeScript`
+    );
+  }
+
   const resolvedModuleSourceFile = program.getSourceFile(resolvedModule.resolvedFileName);
   if (!resolvedModuleSourceFile) {
     throw new Error(`Unable to find resolved module ${importedModuleName}`);
diff --git a/packages/kbn-test-subj-selector/index.test.js b/packages/kbn-test-subj-selector/index.test.js
index 1243fb8d5eebe..aa23c8d1bd70b 100755
--- a/packages/kbn-test-subj-selector/index.test.js
+++ b/packages/kbn-test-subj-selector/index.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const testSubjSelector = require('./');
+const testSubjSelector = require('.');
 
 describe('testSubjSelector()', function () {
   it('converts subjectSelectors to cssSelectors', function () {
diff --git a/packages/kbn-test/BUILD.bazel b/packages/kbn-test/BUILD.bazel
index 99d8c64c88032..8a7aabdecd61e 100644
--- a/packages/kbn-test/BUILD.bazel
+++ b/packages/kbn-test/BUILD.bazel
@@ -41,6 +41,7 @@ RUNTIME_DEPS = [
     "//packages/kbn-i18n-react",
     "//packages/kbn-std",
     "//packages/kbn-utils",
+    "//packages/kbn-bazel-packages",
     "@npm//@elastic/elasticsearch",
     "@npm//@babel/traverse",
     "@npm//@jest/console",
@@ -83,6 +84,7 @@ TYPES_DEPS = [
   "//packages/kbn-i18n-react:npm_module_types",
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-bazel-packages:npm_module_types",
   "@npm//@elastic/elasticsearch",
   "@npm//@jest/console",
   "@npm//@jest/reporters",
diff --git a/packages/kbn-test/jest-preset.js b/packages/kbn-test/jest-preset.js
index 1021283936495..6245532b00e44 100644
--- a/packages/kbn-test/jest-preset.js
+++ b/packages/kbn-test/jest-preset.js
@@ -9,6 +9,8 @@
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
 
+const pkgMap = require('@kbn/synthetic-package-map').readPackageMap();
+
 /** @typedef {import("@jest/types").Config.InitialOptions} JestConfig */
 /** @type {JestConfig} */
 module.exports = {
@@ -36,13 +38,17 @@ module.exports = {
     '\\.(css|less|scss)$': '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/style_mock.js',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/file_mock.js',
-    '\\.ace\\.worker.js$':
+    '\\.ace\\.worker$':
       '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/worker_module_mock.js',
-    '\\.editor\\.worker.js$':
+    '\\.editor\\.worker(\\.js)?$':
       '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/worker_module_mock.js',
     '^(!!)?file-loader!': '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/file_mock.js',
-    '^src/core/(.*)': '<rootDir>/src/core/$1',
-    '^src/plugins/(.*)': '<rootDir>/src/plugins/$1',
+    ...Object.fromEntries(
+      Array.from(pkgMap.entries()).map(([pkgId, repoRelativeDir]) => [
+        `^${pkgId}(/?.*)$`,
+        `<rootDir>/${repoRelativeDir}$1`,
+      ])
+    ),
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
diff --git a/packages/kbn-test/src/es/test_es_cluster.ts b/packages/kbn-test/src/es/test_es_cluster.ts
index 27f29ce6995a7..a12b1d852ced9 100644
--- a/packages/kbn-test/src/es/test_es_cluster.ts
+++ b/packages/kbn-test/src/es/test_es_cluster.ts
@@ -12,11 +12,11 @@ import del from 'del';
 // @ts-expect-error in js
 import { Cluster } from '@kbn/es';
 import { Client, HttpConnection } from '@elastic/elasticsearch';
-import type { ToolingLog } from '@kbn/dev-utils';
+import type { ToolingLog } from '@kbn/tooling-log';
 import { CI_PARALLEL_PROCESS_PREFIX } from '../ci_parallel_process_prefix';
 import { esTestConfig } from './es_test_config';
 
-import { KIBANA_ROOT } from '../';
+import { KIBANA_ROOT } from '..';
 
 interface TestEsClusterNodesOptions {
   name: string;
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 b2416fe8eec4c..220a336915bf1 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
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 // @ts-ignore
 import { createPatch } from 'diff';
 
diff --git a/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.ts b/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.ts
index 06604f4b2c7ab..984fd698bfa12 100644
--- a/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.ts
@@ -9,7 +9,7 @@
 import Fs from 'fs';
 import { promisify } from 'util';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import xml2js from 'xml2js';
 
 import { TestReport, makeFailedTestCaseIter } from './test_report';
diff --git a/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.test.ts b/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.test.ts
index 7c28f105fba75..25062c4e5d5cb 100644
--- a/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.test.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.test.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog, ToolingLogCollectingWriter, createStripAnsiSerializer } from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createStripAnsiSerializer } from '@kbn/jest-serializers';
 
 import type { TestFailure } from './get_failures';
 import { ExistingFailedTestIssues, FailedTestIssue } from './existing_failed_test_issues';
diff --git a/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.ts b/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.ts
index 9a38cb0c659d3..b08835b655175 100644
--- a/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/existing_failed_test_issues.ts
@@ -9,7 +9,8 @@
 import { setTimeout } from 'timers/promises';
 
 import Axios from 'axios';
-import { ToolingLog, isAxiosRequestError, isAxiosResponseError } from '@kbn/dev-utils';
+import { isAxiosRequestError, isAxiosResponseError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { GithubIssueMini } from './github_api';
 import { TestFailure } from './get_failures';
diff --git a/packages/kbn-test/src/failed_tests_reporter/github_api.ts b/packages/kbn-test/src/failed_tests_reporter/github_api.ts
index bf870045c5a6e..5ad0f8417d651 100644
--- a/packages/kbn-test/src/failed_tests_reporter/github_api.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/github_api.ts
@@ -9,7 +9,8 @@
 import Url from 'url';
 
 import Axios, { AxiosRequestConfig, AxiosInstance } from 'axios';
-import { ToolingLog, isAxiosResponseError, isAxiosRequestError } from '@kbn/dev-utils';
+import { isAxiosResponseError, isAxiosRequestError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 const BASE_URL = 'https://api.github.com/repos/elastic/kibana/';
 
diff --git a/packages/kbn-test/src/failed_tests_reporter/report_failures_to_es.ts b/packages/kbn-test/src/failed_tests_reporter/report_failures_to_es.ts
index a96ca5822775d..061a5feafa994 100644
--- a/packages/kbn-test/src/failed_tests_reporter/report_failures_to_es.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/report_failures_to_es.ts
@@ -7,7 +7,8 @@
  */
 
 import { Client, HttpConnection } from '@elastic/elasticsearch';
-import { createFailError, ToolingLog } from '@kbn/dev-utils';
+import { createFailError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { TestFailure } from './get_failures';
 
diff --git a/packages/kbn-test/src/failed_tests_reporter/report_failures_to_file.ts b/packages/kbn-test/src/failed_tests_reporter/report_failures_to_file.ts
index 33dab240ec8b4..6985ad32c0808 100644
--- a/packages/kbn-test/src/failed_tests_reporter/report_failures_to_file.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/report_failures_to_file.ts
@@ -10,7 +10,7 @@ import { createHash } from 'crypto';
 import { mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { join, basename, resolve } from 'path';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import { escape } from 'he';
 
diff --git a/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts b/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts
index 2f5519a163abc..4c539b3ab12b1 100644
--- a/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts
@@ -9,7 +9,8 @@
 import Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';
-import { run, createFailError, createFlagError, CiStatsReporter } from '@kbn/dev-utils';
+import { run, createFailError, createFlagError } from '@kbn/dev-utils';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
 import globby from 'globby';
 import normalize from 'normalize-path';
 
diff --git a/packages/kbn-test/src/functional_test_runner/cli.ts b/packages/kbn-test/src/functional_test_runner/cli.ts
index ac254c6ec92fd..ee01b0ccfde9c 100644
--- a/packages/kbn-test/src/functional_test_runner/cli.ts
+++ b/packages/kbn-test/src/functional_test_runner/cli.ts
@@ -9,7 +9,9 @@
 import { resolve } from 'path';
 import { inspect } from 'util';
 
-import { run, createFlagError, Flags, ToolingLog, getTimeReporter } from '@kbn/dev-utils';
+import { run, createFlagError, Flags } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getTimeReporter } from '@kbn/ci-stats-reporter';
 import exitHook from 'exit-hook';
 
 import { FunctionalTestRunner } from './functional_test_runner';
diff --git a/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts b/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts
index c8caad3049f14..1ba99fc69a5d3 100644
--- a/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts
+++ b/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts
@@ -8,7 +8,7 @@
 
 import { writeFileSync, mkdirSync } from 'fs';
 import Path, { dirname } from 'path';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { Suite, Test } from './fake_mocha_types';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js
index 27434ce5a09ca..d1ce17cc95b7b 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { readConfigFile } from './read_config_file';
 import { Config } from './config';
 import { EsVersion } from '../es_version';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts
index fd836f338edf0..d026842f3a4f1 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { defaultsDeep } from 'lodash';
 
 import { Config } from './config';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts
index 188465fb7eb65..52fe9cb90d5fc 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts
@@ -9,7 +9,8 @@
 import execa from 'execa';
 import * as Rx from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { ToolingLog, observeLines } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { observeLines } from '@kbn/stdio-dev-helpers';
 
 /**
  * Observe the logs for a container, reflecting the log lines
diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts
index 632f94d0550e6..b15b2bf3df075 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts
@@ -8,7 +8,7 @@
 
 import execa from 'execa';
 import * as Rx from 'rxjs';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 /**
  * Create an observable that errors if a docker
diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
index fd10551bb17ef..b6af2b5c8df9f 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
@@ -10,7 +10,7 @@ import Url from 'url';
 import execa from 'execa';
 import * as Rx from 'rxjs';
 import { filter, take, map } from 'rxjs/operators';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { Lifecycle } from '../lifecycle';
 import { observeContainerRunning } from './container_running';
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 e12ffdc8cd616..b9d4ed6ef7b5e 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
@@ -12,16 +12,7 @@ import { createAssignmentProxy } from './assignment_proxy';
 import { wrapFunction } from './wrap_function';
 import { wrapRunnableArgs } from './wrap_runnable_args';
 
-function split(arr, fn) {
-  const a = [];
-  const b = [];
-  for (const i of arr) {
-    (fn(i) ? a : b).push(i);
-  }
-  return [a, b];
-}
-
-export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTags }) {
+export function decorateMochaUi(log, lifecycle, context, { rootTags }) {
   // incremented at the start of each suite, decremented after
   // so that in each non-suite call we can know if we are within
   // a suite, or that when a suite is defined it is within a suite
@@ -63,7 +54,7 @@ export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTa
 
           const relativeFilePath = relative(REPO_ROOT, this.file);
           this._tags = [
-            ...(isDockerGroup ? ['ciGroupDocker', relativeFilePath] : [relativeFilePath]),
+            relativeFilePath,
             // we attach the "root tags" to all the child suites of the root suite, so that if they
             // need to be excluded they can be removed from the root suite without removing the entire
             // root suite
@@ -71,17 +62,7 @@ export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTa
           ];
           this.suiteTag = relativeFilePath; // The tag that uniquely targets this suite/file
           this.tags = (tags) => {
-            const newTags = Array.isArray(tags) ? tags : [tags];
-            const [tagsToAdd, tagsToIgnore] = split(newTags, (t) =>
-              !isDockerGroup ? true : !t.startsWith('ciGroup')
-            );
-
-            if (tagsToIgnore.length) {
-              log.warning(
-                `ignoring ciGroup tags because test is being run by a config using 'dockerServers', tags: ${tagsToIgnore}`
-              );
-            }
-
+            const tagsToAdd = Array.isArray(tags) ? tags : [tags];
             this._tags = [...this._tags, ...tagsToAdd];
           };
           this.onlyEsVersion = (semver) => {
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts b/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts
index 90bb3a894bc6c..98db434b3b088 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Suite, Test } from '../../fake_mocha_types';
 import { EsVersion } from '../es_version';
 
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts
index 61eb7eccce430..838b8ee9b9aa5 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts
@@ -9,7 +9,11 @@
 import * as Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';
-import { CiStatsReporter, CiStatsReportTestsOptions, CiStatsTestType } from '@kbn/dev-utils';
+import {
+  CiStatsReporter,
+  CiStatsReportTestsOptions,
+  CiStatsTestType,
+} from '@kbn/ci-stats-reporter';
 
 import { Config } from '../../config';
 import { Runner } from '../../../fake_mocha_types';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
index 84299cba14eaa..973a552ebb728 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
@@ -9,7 +9,8 @@
 import { format } from 'util';
 
 import Mocha from 'mocha';
-import { ToolingLogTextWriter, CiStatsReporter } from '@kbn/dev-utils';
+import { ToolingLogTextWriter } from '@kbn/tooling-log';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
 import moment from 'moment';
 
 import { recordLog, snapshotLogsForRunnable, setupJUnitReportGeneration } from '../../../../mocha';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts b/packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts
index 97d7d43417f91..8723a424f6e22 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { loadTracer } from '../load_tracer';
 import { createAsyncInstance, isAsyncInstance } from './async_instance';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts b/packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts
index 6031a580e64dc..ca4109961b51c 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts
@@ -8,7 +8,7 @@
 
 import { inspect } from 'util';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 function printArgs(args: any[]): string {
   return args
diff --git a/packages/kbn-test/src/functional_test_runner/public_types.ts b/packages/kbn-test/src/functional_test_runner/public_types.ts
index 426fdda74d313..2d632b28d6e21 100644
--- a/packages/kbn-test/src/functional_test_runner/public_types.ts
+++ b/packages/kbn-test/src/functional_test_runner/public_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ToolingLog } from '@kbn/dev-utils';
+import type { ToolingLog } from '@kbn/tooling-log';
 
 import type { Config, Lifecycle, TestMetadata, DockerServersService, EsVersion } from './lib';
 import type { Test, Suite } from './fake_mocha_types';
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
index 20aa65df7299b..d94adcfe615a5 100644
--- a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
+++ b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
@@ -9,7 +9,7 @@
 import { resolve } from 'path';
 
 import dedent from 'dedent';
-import { ToolingLog, pickLevelFromFlags } from '@kbn/dev-utils';
+import { ToolingLog, pickLevelFromFlags } from '@kbn/tooling-log';
 import { EsVersion } from '../../../functional_test_runner';
 
 const options = {
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
index 72ba541466960..888708a2b9d69 100644
--- a/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
+++ b/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { displayHelp, processOptions } from './args';
 
diff --git a/packages/kbn-test/src/functional_tests/cli/start_servers/args.js b/packages/kbn-test/src/functional_tests/cli/start_servers/args.js
index d6b8054da3608..527e3ce64613d 100644
--- a/packages/kbn-test/src/functional_tests/cli/start_servers/args.js
+++ b/packages/kbn-test/src/functional_tests/cli/start_servers/args.js
@@ -9,7 +9,7 @@
 import { resolve } from 'path';
 
 import dedent from 'dedent';
-import { ToolingLog, pickLevelFromFlags } from '@kbn/dev-utils';
+import { ToolingLog, pickLevelFromFlags } from '@kbn/tooling-log';
 
 const options = {
   help: { desc: 'Display this menu and exit.' },
diff --git a/packages/kbn-test/src/functional_tests/cli/start_servers/args.test.js b/packages/kbn-test/src/functional_tests/cli/start_servers/args.test.js
index 164cf36b915c7..7d6c77be2539e 100644
--- a/packages/kbn-test/src/functional_tests/cli/start_servers/args.test.js
+++ b/packages/kbn-test/src/functional_tests/cli/start_servers/args.test.js
@@ -7,7 +7,7 @@
  */
 
 import { displayHelp, processOptions } from './args';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer(process.cwd()));
 
diff --git a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
index ba314e8325a65..adbb18b5312d0 100644
--- a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
+++ b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
@@ -7,10 +7,10 @@
  */
 
 import { resolve } from 'path';
-import type { ToolingLog } from '@kbn/dev-utils';
+import type { ToolingLog } from '@kbn/tooling-log';
 import getPort from 'get-port';
 import { KIBANA_ROOT } from './paths';
-import type { Config } from '../../functional_test_runner/';
+import type { Config } from '../../functional_test_runner';
 import { createTestEsCluster } from '../../es';
 
 interface RunElasticsearchOptions {
diff --git a/packages/kbn-test/src/functional_tests/lib/run_ftr.ts b/packages/kbn-test/src/functional_tests/lib/run_ftr.ts
index e339347b07eb5..6887a664d6657 100644
--- a/packages/kbn-test/src/functional_tests/lib/run_ftr.ts
+++ b/packages/kbn-test/src/functional_tests/lib/run_ftr.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { ToolingLog } from '@kbn/dev-utils';
+import type { ToolingLog } from '@kbn/tooling-log';
 import { FunctionalTestRunner, readConfigFile, EsVersion } from '../../functional_test_runner';
 import { CliError } from './run_cli';
 
diff --git a/packages/kbn-test/src/functional_tests/tasks.ts b/packages/kbn-test/src/functional_tests/tasks.ts
index b1213ceef2905..8116fa25650a1 100644
--- a/packages/kbn-test/src/functional_tests/tasks.ts
+++ b/packages/kbn-test/src/functional_tests/tasks.ts
@@ -9,7 +9,9 @@
 import { relative } from 'path';
 import * as Rx from 'rxjs';
 import { startWith, switchMap, take } from 'rxjs/operators';
-import { withProcRunner, ToolingLog, getTimeReporter } from '@kbn/dev-utils';
+import { withProcRunner } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getTimeReporter } from '@kbn/ci-stats-reporter';
 import { REPO_ROOT } from '@kbn/utils';
 import dedent from 'dedent';
 
diff --git a/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts b/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts
index 94675d87a3a24..6294594ff6cf5 100644
--- a/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts
+++ b/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts
@@ -9,7 +9,8 @@
 import * as Path from 'path';
 
 import getopts from 'getopts';
-import { CiStatsReporter, ToolingLog, CiStatsReportTestsOptions } from '@kbn/dev-utils';
+import { CiStatsReporter, CiStatsReportTestsOptions } from '@kbn/ci-stats-reporter';
+import { ToolingLog } from '@kbn/tooling-log';
 import type { Config } from '@jest/types';
 import { BaseReporter, Test, TestResult } from '@jest/reporters';
 import { ConsoleBuffer } from '@jest/console';
diff --git a/packages/kbn-test/src/jest/configs/jest_configs.ts b/packages/kbn-test/src/jest/configs/jest_configs.ts
index a2a55d4a1b649..39b284854826f 100644
--- a/packages/kbn-test/src/jest/configs/jest_configs.ts
+++ b/packages/kbn-test/src/jest/configs/jest_configs.ts
@@ -24,7 +24,8 @@ export class JestConfigs {
 
   constructor(cwd: string, roots: string[]) {
     this.cwd = cwd;
-    this.roots = roots;
+    // sort roots by length so when we use `file.startsWith()` we will find the most specific root first
+    this.roots = roots.slice().sort((a, b) => b.length - a.length);
   }
 
   async files(type: 'unit' | 'integration') {
diff --git a/packages/kbn-test/src/jest/run.ts b/packages/kbn-test/src/jest/run.ts
index b8617317d6d9f..04e047d694502 100644
--- a/packages/kbn-test/src/jest/run.ts
+++ b/packages/kbn-test/src/jest/run.ts
@@ -21,7 +21,8 @@ import { resolve, relative, sep as osSep } from 'path';
 import { existsSync } from 'fs';
 import { run } from 'jest';
 import { buildArgv } from 'jest-cli/build/cli';
-import { ToolingLog, getTimeReporter } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getTimeReporter } from '@kbn/ci-stats-reporter';
 import { REPO_ROOT } from '@kbn/utils';
 import { map } from 'lodash';
 
diff --git a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
index 9522d9dafd6fd..42766ad3f5a31 100644
--- a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
+++ b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
@@ -12,6 +12,7 @@ import Mustache from 'mustache';
 
 import { run, createFailError } from '@kbn/dev-utils';
 import { REPO_ROOT } from '@kbn/utils';
+import { getAllRepoRelativeBazelPackageDirs } from '@kbn/bazel-packages';
 
 import { JestConfigs, CONFIG_NAMES } from './configs';
 
@@ -34,10 +35,10 @@ const roots: string[] = [
   'x-pack/plugins/security_solution/server',
   'x-pack/plugins/security_solution',
   'x-pack/plugins',
-  'packages',
   'src/plugins',
   'test',
   'src',
+  ...getAllRepoRelativeBazelPackageDirs(),
 ];
 
 export async function runCheckJestConfigsCli() {
diff --git a/packages/kbn-test/src/kbn_client/kbn_client.ts b/packages/kbn-test/src/kbn_client/kbn_client.ts
index e44f500593300..4abf272946e79 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { KbnClientImportExport } from './kbn_client_import_export';
 import { KbnClientPlugins } from './kbn_client_plugins';
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts b/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
index 6da34228bbe7f..c63864857c253 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
@@ -12,7 +12,8 @@ import { existsSync } from 'fs';
 import Path from 'path';
 
 import FormData from 'form-data';
-import { ToolingLog, isAxiosResponseError, createFailError } from '@kbn/dev-utils';
+import { isAxiosResponseError, createFailError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { KbnClientRequester, uriencode, ReqOptions } from './kbn_client_requester';
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_requester.ts b/packages/kbn-test/src/kbn_client/kbn_client_requester.ts
index c2e4247df1ab0..a57515474faf9 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_requester.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_requester.ts
@@ -11,7 +11,8 @@ import Https from 'https';
 import Qs from 'querystring';
 
 import Axios, { AxiosResponse, ResponseType } from 'axios';
-import { ToolingLog, isAxiosRequestError, isAxiosResponseError } from '@kbn/dev-utils';
+import { isAxiosRequestError, isAxiosResponseError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 const isConcliftOnGetError = (error: any) => {
   return (
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
index 97292b0268bc4..02640cd2b8268 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
@@ -10,7 +10,8 @@ import { inspect } from 'util';
 
 import * as Rx from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
-import { ToolingLog, isAxiosResponseError, createFailError } from '@kbn/dev-utils';
+import { isAxiosResponseError, createFailError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { KbnClientRequester, uriencode } from './kbn_client_requester';
 
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_ui_settings.ts b/packages/kbn-test/src/kbn_client/kbn_client_ui_settings.ts
index 7ea685667d48b..7be72e7b484ba 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_ui_settings.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_ui_settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { KbnClientRequester, pathWithSpace } from './kbn_client_requester';
 
diff --git a/packages/kbn-test/src/mocha/junit_report_generation.js b/packages/kbn-test/src/mocha/junit_report_generation.js
index f662e9ccccb25..144afa92303dc 100644
--- a/packages/kbn-test/src/mocha/junit_report_generation.js
+++ b/packages/kbn-test/src/mocha/junit_report_generation.js
@@ -15,7 +15,7 @@ import xmlBuilder from 'xmlbuilder';
 import { getUniqueJunitReportPath } from '../report_path';
 
 import { getSnapshotOfRunnableLogs } from './log_cache';
-import { escapeCdata } from '../';
+import { escapeCdata } from '..';
 
 const dateNow = Date.now.bind(Date);
 
diff --git a/packages/kbn-tinymath/src/functions/count.js b/packages/kbn-tinymath/src/functions/count.js
index e91cfa871d58a..aa01e1c25835a 100644
--- a/packages/kbn-tinymath/src/functions/count.js
+++ b/packages/kbn-tinymath/src/functions/count.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { size } = require('./size.js');
+const { size } = require('./size');
 
 /**
  * Returns the length of an array. Alias for size
diff --git a/packages/kbn-tinymath/src/functions/cube.js b/packages/kbn-tinymath/src/functions/cube.js
index 409bb128ba09d..4d6f8cbea6374 100644
--- a/packages/kbn-tinymath/src/functions/cube.js
+++ b/packages/kbn-tinymath/src/functions/cube.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pow } = require('./pow.js');
+const { pow } = require('./pow');
 
 /**
  * Calculates the cube of a number. For arrays, the function will be applied index-wise to each element.
diff --git a/packages/kbn-tinymath/src/functions/log10.js b/packages/kbn-tinymath/src/functions/log10.js
index c8b1f5ac25e5b..68c2ffb2bbd30 100644
--- a/packages/kbn-tinymath/src/functions/log10.js
+++ b/packages/kbn-tinymath/src/functions/log10.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { log } = require('./log.js');
+const { log } = require('./log');
 
 /**
  * Calculates the logarithm base 10 of a number. For arrays, the function will be applied index-wise to each element.
diff --git a/packages/kbn-tinymath/src/functions/mean.js b/packages/kbn-tinymath/src/functions/mean.js
index d9e80a9ac8427..441b90cff2ac3 100644
--- a/packages/kbn-tinymath/src/functions/mean.js
+++ b/packages/kbn-tinymath/src/functions/mean.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { add } = require('./add.js');
+const { add } = require('./add');
 
 /**
  * Finds the mean value of one of more numbers/arrays of numbers into the function. If at least one array of numbers is passed into the function, the function will find the mean by index.
diff --git a/packages/kbn-tinymath/src/functions/range.js b/packages/kbn-tinymath/src/functions/range.js
index a849fef5d04a4..571b179b75b65 100644
--- a/packages/kbn-tinymath/src/functions/range.js
+++ b/packages/kbn-tinymath/src/functions/range.js
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-const { max } = require('./max.js');
-const { min } = require('./min.js');
-const { subtract } = require('./subtract.js');
+const { max } = require('./max');
+const { min } = require('./min');
+const { subtract } = require('./subtract');
 
 /**
  * Finds the range of one of more numbers/arrays of numbers into the function. If at least one array of numbers is passed into the function, the function will find the range by index.
diff --git a/packages/kbn-tinymath/src/functions/square.js b/packages/kbn-tinymath/src/functions/square.js
index fa43b575d2c49..5c285eaee3209 100644
--- a/packages/kbn-tinymath/src/functions/square.js
+++ b/packages/kbn-tinymath/src/functions/square.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pow } = require('./pow.js');
+const { pow } = require('./pow');
 
 /**
  * Calculates the square of a number. For arrays, the function will be applied index-wise to each element.
diff --git a/packages/kbn-tinymath/test/functions/abs.test.js b/packages/kbn-tinymath/test/functions/abs.test.js
index 048ba590f0d8f..a30d9e1d29066 100644
--- a/packages/kbn-tinymath/test/functions/abs.test.js
+++ b/packages/kbn-tinymath/test/functions/abs.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { abs } = require('../../src/functions/abs.js');
+const { abs } = require('../../src/functions/abs');
 
 describe('Abs', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/add.test.js b/packages/kbn-tinymath/test/functions/add.test.js
index 1362fae356172..69823f42055a7 100644
--- a/packages/kbn-tinymath/test/functions/add.test.js
+++ b/packages/kbn-tinymath/test/functions/add.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { add } = require('../../src/functions/add.js');
+const { add } = require('../../src/functions/add');
 
 describe('Add', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/cbrt.test.js b/packages/kbn-tinymath/test/functions/cbrt.test.js
index dc83aa33b175c..ce7a7d1ad9b52 100644
--- a/packages/kbn-tinymath/test/functions/cbrt.test.js
+++ b/packages/kbn-tinymath/test/functions/cbrt.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { cbrt } = require('../../src/functions/cbrt.js');
+const { cbrt } = require('../../src/functions/cbrt');
 
 describe('Cbrt', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/ceil.test.js b/packages/kbn-tinymath/test/functions/ceil.test.js
index f3ca2f19e5d41..b67e0a9be9be2 100644
--- a/packages/kbn-tinymath/test/functions/ceil.test.js
+++ b/packages/kbn-tinymath/test/functions/ceil.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { ceil } = require('../../src/functions/ceil.js');
+const { ceil } = require('../../src/functions/ceil');
 
 describe('Ceil', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/clamp.test.js b/packages/kbn-tinymath/test/functions/clamp.test.js
index 7bb1d3629f2ba..9150bf969f764 100644
--- a/packages/kbn-tinymath/test/functions/clamp.test.js
+++ b/packages/kbn-tinymath/test/functions/clamp.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { clamp } = require('../../src/functions/clamp.js');
+const { clamp } = require('../../src/functions/clamp');
 
 describe('Clamp', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/cos.test.js b/packages/kbn-tinymath/test/functions/cos.test.js
index 069151420a3a5..56fdf53a25e5f 100644
--- a/packages/kbn-tinymath/test/functions/cos.test.js
+++ b/packages/kbn-tinymath/test/functions/cos.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { cos } = require('../../src/functions/cos.js');
+const { cos } = require('../../src/functions/cos');
 
 describe('Cosine', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/cube.test.js b/packages/kbn-tinymath/test/functions/cube.test.js
index f3568815d6f72..f4bd9a6cd7ba2 100644
--- a/packages/kbn-tinymath/test/functions/cube.test.js
+++ b/packages/kbn-tinymath/test/functions/cube.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { cube } = require('../../src/functions/cube.js');
+const { cube } = require('../../src/functions/cube');
 
 describe('Cube', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/degtorad.test.js b/packages/kbn-tinymath/test/functions/degtorad.test.js
index 0988db251743d..ecabad19206a7 100644
--- a/packages/kbn-tinymath/test/functions/degtorad.test.js
+++ b/packages/kbn-tinymath/test/functions/degtorad.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { degtorad } = require('../../src/functions/degtorad.js');
+const { degtorad } = require('../../src/functions/degtorad');
 
 describe('Degrees to Radians', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/divide.test.js b/packages/kbn-tinymath/test/functions/divide.test.js
index fa1ed184ded23..00af7b1430e58 100644
--- a/packages/kbn-tinymath/test/functions/divide.test.js
+++ b/packages/kbn-tinymath/test/functions/divide.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { divide } = require('../../src/functions/divide.js');
+const { divide } = require('../../src/functions/divide');
 
 describe('Divide', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/exp.test.js b/packages/kbn-tinymath/test/functions/exp.test.js
index 2c46daea5023e..873e2382cbc73 100644
--- a/packages/kbn-tinymath/test/functions/exp.test.js
+++ b/packages/kbn-tinymath/test/functions/exp.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { exp } = require('../../src/functions/exp.js');
+const { exp } = require('../../src/functions/exp');
 
 describe('Exp', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/first.test.js b/packages/kbn-tinymath/test/functions/first.test.js
index 1fbc397799f0b..b8ddca968d8d4 100644
--- a/packages/kbn-tinymath/test/functions/first.test.js
+++ b/packages/kbn-tinymath/test/functions/first.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { first } = require('../../src/functions/first.js');
+const { first } = require('../../src/functions/first');
 
 describe('First', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/fix.test.js b/packages/kbn-tinymath/test/functions/fix.test.js
index ebdbcb83c4687..8b90412b70972 100644
--- a/packages/kbn-tinymath/test/functions/fix.test.js
+++ b/packages/kbn-tinymath/test/functions/fix.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { fix } = require('../../src/functions/fix.js');
+const { fix } = require('../../src/functions/fix');
 
 describe('Fix', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/floor.test.js b/packages/kbn-tinymath/test/functions/floor.test.js
index ee4c2dc6a05cc..92738b2969df9 100644
--- a/packages/kbn-tinymath/test/functions/floor.test.js
+++ b/packages/kbn-tinymath/test/functions/floor.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { floor } = require('../../src/functions/floor.js');
+const { floor } = require('../../src/functions/floor');
 
 describe('Floor', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/last.test.js b/packages/kbn-tinymath/test/functions/last.test.js
index 9bc5d612d9c3f..88579c1dcf033 100644
--- a/packages/kbn-tinymath/test/functions/last.test.js
+++ b/packages/kbn-tinymath/test/functions/last.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { last } = require('../../src/functions/last.js');
+const { last } = require('../../src/functions/last');
 
 describe('Last', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/log.test.js b/packages/kbn-tinymath/test/functions/log.test.js
index d51b3f86d804d..9cc06c61d031c 100644
--- a/packages/kbn-tinymath/test/functions/log.test.js
+++ b/packages/kbn-tinymath/test/functions/log.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { log } = require('../../src/functions/log.js');
+const { log } = require('../../src/functions/log');
 
 describe('Log', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/log10.test.js b/packages/kbn-tinymath/test/functions/log10.test.js
index d04a2224e4c59..aa42334e357aa 100644
--- a/packages/kbn-tinymath/test/functions/log10.test.js
+++ b/packages/kbn-tinymath/test/functions/log10.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { log10 } = require('../../src/functions/log10.js');
+const { log10 } = require('../../src/functions/log10');
 
 describe('Log10', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/max.test.js b/packages/kbn-tinymath/test/functions/max.test.js
index 8ac98baca948c..428fe25abdefb 100644
--- a/packages/kbn-tinymath/test/functions/max.test.js
+++ b/packages/kbn-tinymath/test/functions/max.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { max } = require('../../src/functions/max.js');
+const { max } = require('../../src/functions/max');
 
 describe('Max', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/mean.test.js b/packages/kbn-tinymath/test/functions/mean.test.js
index 1508f8d2ff6ce..42226775d69f0 100644
--- a/packages/kbn-tinymath/test/functions/mean.test.js
+++ b/packages/kbn-tinymath/test/functions/mean.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { mean } = require('../../src/functions/mean.js');
+const { mean } = require('../../src/functions/mean');
 
 describe('Mean', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/median.test.js b/packages/kbn-tinymath/test/functions/median.test.js
index a20b0a995d35b..cf4a46b5eb7bf 100644
--- a/packages/kbn-tinymath/test/functions/median.test.js
+++ b/packages/kbn-tinymath/test/functions/median.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { median } = require('../../src/functions/median.js');
+const { median } = require('../../src/functions/median');
 
 describe('Median', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/min.test.js b/packages/kbn-tinymath/test/functions/min.test.js
index d016dc3a968f6..0da4c444c1946 100644
--- a/packages/kbn-tinymath/test/functions/min.test.js
+++ b/packages/kbn-tinymath/test/functions/min.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { min } = require('../../src/functions/min.js');
+const { min } = require('../../src/functions/min');
 
 describe('Min', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/mod.test.js b/packages/kbn-tinymath/test/functions/mod.test.js
index d887b76e43426..13edf9c00313d 100644
--- a/packages/kbn-tinymath/test/functions/mod.test.js
+++ b/packages/kbn-tinymath/test/functions/mod.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { mod } = require('../../src/functions/mod.js');
+const { mod } = require('../../src/functions/mod');
 
 describe('Mod', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/mode.test.js b/packages/kbn-tinymath/test/functions/mode.test.js
index b076e9fddb512..d20e8e37e5b03 100644
--- a/packages/kbn-tinymath/test/functions/mode.test.js
+++ b/packages/kbn-tinymath/test/functions/mode.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { mode } = require('../../src/functions/mode.js');
+const { mode } = require('../../src/functions/mode');
 
 describe('Mode', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/multiply.test.js b/packages/kbn-tinymath/test/functions/multiply.test.js
index 1da208e95fbf9..b48ba448b8be1 100644
--- a/packages/kbn-tinymath/test/functions/multiply.test.js
+++ b/packages/kbn-tinymath/test/functions/multiply.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { multiply } = require('../../src/functions/multiply.js');
+const { multiply } = require('../../src/functions/multiply');
 
 describe('Multiply', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/pi.test.js b/packages/kbn-tinymath/test/functions/pi.test.js
index 2c8384c775f88..d12a5adae19e0 100644
--- a/packages/kbn-tinymath/test/functions/pi.test.js
+++ b/packages/kbn-tinymath/test/functions/pi.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pi } = require('../../src/functions/pi.js');
+const { pi } = require('../../src/functions/pi');
 
 describe('PI', () => {
   it('constant', () => {
diff --git a/packages/kbn-tinymath/test/functions/pow.test.js b/packages/kbn-tinymath/test/functions/pow.test.js
index 3d1bdeb30cbd7..41277f30e3795 100644
--- a/packages/kbn-tinymath/test/functions/pow.test.js
+++ b/packages/kbn-tinymath/test/functions/pow.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pow } = require('../../src/functions/pow.js');
+const { pow } = require('../../src/functions/pow');
 
 describe('Pow', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/radtodeg.test.js b/packages/kbn-tinymath/test/functions/radtodeg.test.js
index e2059df464f2a..daafa6cd88a19 100644
--- a/packages/kbn-tinymath/test/functions/radtodeg.test.js
+++ b/packages/kbn-tinymath/test/functions/radtodeg.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { radtodeg } = require('../../src/functions/radtodeg.js');
+const { radtodeg } = require('../../src/functions/radtodeg');
 
 describe('Radians to Degrees', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/random.test.js b/packages/kbn-tinymath/test/functions/random.test.js
index 9f7e603dc3f23..a735401d38155 100644
--- a/packages/kbn-tinymath/test/functions/random.test.js
+++ b/packages/kbn-tinymath/test/functions/random.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { random } = require('../../src/functions/random.js');
+const { random } = require('../../src/functions/random');
 
 describe('Random', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/range.test.js b/packages/kbn-tinymath/test/functions/range.test.js
index f7dfcf12e004f..8b74432705bc2 100644
--- a/packages/kbn-tinymath/test/functions/range.test.js
+++ b/packages/kbn-tinymath/test/functions/range.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { range } = require('../../src/functions/range.js');
+const { range } = require('../../src/functions/range');
 
 describe('Range', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/round.test.js b/packages/kbn-tinymath/test/functions/round.test.js
index e5231adb848dc..cb02fd96274ab 100644
--- a/packages/kbn-tinymath/test/functions/round.test.js
+++ b/packages/kbn-tinymath/test/functions/round.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { round } = require('../../src/functions/round.js');
+const { round } = require('../../src/functions/round');
 
 describe('Round', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/sin.test.js b/packages/kbn-tinymath/test/functions/sin.test.js
index 1eb87a36b1f0c..ae2ae965ce7a9 100644
--- a/packages/kbn-tinymath/test/functions/sin.test.js
+++ b/packages/kbn-tinymath/test/functions/sin.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { sin } = require('../../src/functions/sin.js');
+const { sin } = require('../../src/functions/sin');
 
 describe('Sine', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/size.test.js b/packages/kbn-tinymath/test/functions/size.test.js
index ef68c13d7b0c9..967204f96ebed 100644
--- a/packages/kbn-tinymath/test/functions/size.test.js
+++ b/packages/kbn-tinymath/test/functions/size.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { size } = require('../../src/functions/size.js');
+const { size } = require('../../src/functions/size');
 
 describe('Size (also Count)', () => {
   it('array', () => {
diff --git a/packages/kbn-tinymath/test/functions/sqrt.test.js b/packages/kbn-tinymath/test/functions/sqrt.test.js
index cdd0cc987e94f..4222a43a2e35c 100644
--- a/packages/kbn-tinymath/test/functions/sqrt.test.js
+++ b/packages/kbn-tinymath/test/functions/sqrt.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { sqrt } = require('../../src/functions/sqrt.js');
+const { sqrt } = require('../../src/functions/sqrt');
 
 describe('Sqrt', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/square.test.js b/packages/kbn-tinymath/test/functions/square.test.js
index fe2795315249c..2f45dfdd510e5 100644
--- a/packages/kbn-tinymath/test/functions/square.test.js
+++ b/packages/kbn-tinymath/test/functions/square.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { square } = require('../../src/functions/square.js');
+const { square } = require('../../src/functions/square');
 
 describe('Square', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/subtract.test.js b/packages/kbn-tinymath/test/functions/subtract.test.js
index 79f6cea5cc6b4..aa2bcf9dc5bda 100644
--- a/packages/kbn-tinymath/test/functions/subtract.test.js
+++ b/packages/kbn-tinymath/test/functions/subtract.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { subtract } = require('../../src/functions/subtract.js');
+const { subtract } = require('../../src/functions/subtract');
 
 describe('Subtract', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/sum.test.js b/packages/kbn-tinymath/test/functions/sum.test.js
index 5618223d58860..d73877f3c67c0 100644
--- a/packages/kbn-tinymath/test/functions/sum.test.js
+++ b/packages/kbn-tinymath/test/functions/sum.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { sum } = require('../../src/functions/sum.js');
+const { sum } = require('../../src/functions/sum');
 
 describe('Sum', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/tan.test.js b/packages/kbn-tinymath/test/functions/tan.test.js
index 9254328a5da5e..2b8f1e50347dc 100644
--- a/packages/kbn-tinymath/test/functions/tan.test.js
+++ b/packages/kbn-tinymath/test/functions/tan.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { tan } = require('../../src/functions/tan.js');
+const { tan } = require('../../src/functions/tan');
 
 describe('Tangent', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/unique.test.js b/packages/kbn-tinymath/test/functions/unique.test.js
index 6ec5357449773..fa0a98dffe611 100644
--- a/packages/kbn-tinymath/test/functions/unique.test.js
+++ b/packages/kbn-tinymath/test/functions/unique.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { unique } = require('../../src/functions/unique.js');
+const { unique } = require('../../src/functions/unique');
 
 describe('Unique', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tooling-log/BUILD.bazel b/packages/kbn-tooling-log/BUILD.bazel
new file mode 100644
index 0000000000000..a4953521171cb
--- /dev/null
+++ b/packages/kbn-tooling-log/BUILD.bazel
@@ -0,0 +1,118 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-tooling-log"
+PKG_REQUIRE_NAME = "@kbn/tooling-log"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//rxjs",
+  "@npm//tslib",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//rxjs",
+  "@npm//tslib",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-tooling-log/README.md b/packages/kbn-tooling-log/README.md
new file mode 100644
index 0000000000000..d0cef9945d3a7
--- /dev/null
+++ b/packages/kbn-tooling-log/README.md
@@ -0,0 +1,3 @@
+# @kbn/tooling-log
+
+Empty package generated by @kbn/generate
diff --git a/packages/kbn-babel-code-parser/jest.config.js b/packages/kbn-tooling-log/jest.config.js
similarity index 82%
rename from packages/kbn-babel-code-parser/jest.config.js
rename to packages/kbn-tooling-log/jest.config.js
index c5242b7dad926..0aee29901d2a5 100644
--- a/packages/kbn-babel-code-parser/jest.config.js
+++ b/packages/kbn-tooling-log/jest.config.js
@@ -7,7 +7,7 @@
  */
 
 module.exports = {
-  preset: '@kbn/test',
+  preset: '@kbn/test/jest_node',
   rootDir: '../..',
-  roots: ['<rootDir>/packages/kbn-babel-code-parser'],
+  roots: ['<rootDir>/packages/kbn-tooling-log'],
 };
diff --git a/packages/kbn-tooling-log/package.json b/packages/kbn-tooling-log/package.json
new file mode 100644
index 0000000000000..53137ddf6366e
--- /dev/null
+++ b/packages/kbn-tooling-log/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/tooling-log",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/log_levels.test.ts.snap b/packages/kbn-tooling-log/src/__snapshots__/log_levels.test.ts.snap
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/__snapshots__/log_levels.test.ts.snap
rename to packages/kbn-tooling-log/src/__snapshots__/log_levels.test.ts.snap
diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap b/packages/kbn-tooling-log/src/__snapshots__/tooling_log.test.ts.snap
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap
rename to packages/kbn-tooling-log/src/__snapshots__/tooling_log.test.ts.snap
diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap b/packages/kbn-tooling-log/src/__snapshots__/tooling_log_text_writer.test.ts.snap
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log_text_writer.test.ts.snap
rename to packages/kbn-tooling-log/src/__snapshots__/tooling_log_text_writer.test.ts.snap
diff --git a/packages/kbn-dev-utils/src/tooling_log/index.ts b/packages/kbn-tooling-log/src/index.ts
similarity index 85%
rename from packages/kbn-dev-utils/src/tooling_log/index.ts
rename to packages/kbn-tooling-log/src/index.ts
index 2c7216c87c419..47ac551d76f66 100644
--- a/packages/kbn-dev-utils/src/tooling_log/index.ts
+++ b/packages/kbn-tooling-log/src/index.ts
@@ -11,7 +11,13 @@ export type { ToolingLogOptions } from './tooling_log';
 export type { ToolingLogTextWriterConfig } from './tooling_log_text_writer';
 export { ToolingLogTextWriter } from './tooling_log_text_writer';
 export type { LogLevel, ParsedLogLevel } from './log_levels';
-export { pickLevelFromFlags, parseLogLevel } from './log_levels';
+export {
+  DEFAULT_LOG_LEVEL,
+  LOG_LEVEL_FLAGS,
+  pickLevelFromFlags,
+  parseLogLevel,
+  getLogLevelFlagsHelp,
+} from './log_levels';
 export { ToolingLogCollectingWriter } from './tooling_log_collecting_writer';
 export type { Writer } from './writer';
 export type { Message } from './message';
diff --git a/packages/kbn-dev-utils/src/tooling_log/log_levels.test.ts b/packages/kbn-tooling-log/src/log_levels.test.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/log_levels.test.ts
rename to packages/kbn-tooling-log/src/log_levels.test.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/log_levels.ts b/packages/kbn-tooling-log/src/log_levels.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/log_levels.ts
rename to packages/kbn-tooling-log/src/log_levels.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/message.ts b/packages/kbn-tooling-log/src/message.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/message.ts
rename to packages/kbn-tooling-log/src/message.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts b/packages/kbn-tooling-log/src/tooling_log.test.ts
similarity index 98%
rename from packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
rename to packages/kbn-tooling-log/src/tooling_log.test.ts
index 54ac750332c5f..022d56c1731cf 100644
--- a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
+++ b/packages/kbn-tooling-log/src/tooling_log.test.ts
@@ -9,11 +9,12 @@
 import * as Rx from 'rxjs';
 import { toArray, takeUntil } from 'rxjs/operators';
 
+import { createStripAnsiSerializer } from '@kbn/jest-serializers';
+
 import { ToolingLog } from './tooling_log';
 import { Writer } from './writer';
 import { ToolingLogTextWriter } from './tooling_log_text_writer';
 import { ToolingLogCollectingWriter } from './tooling_log_collecting_writer';
-import { createStripAnsiSerializer } from '../serializers/strip_ansi_serializer';
 import { lastValueFrom } from 'rxjs';
 
 expect.addSnapshotSerializer(createStripAnsiSerializer());
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts b/packages/kbn-tooling-log/src/tooling_log.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/tooling_log.ts
rename to packages/kbn-tooling-log/src/tooling_log.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts b/packages/kbn-tooling-log/src/tooling_log_collecting_writer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts
rename to packages/kbn-tooling-log/src/tooling_log_collecting_writer.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.test.ts b/packages/kbn-tooling-log/src/tooling_log_text_writer.test.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.test.ts
rename to packages/kbn-tooling-log/src/tooling_log_text_writer.test.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts b/packages/kbn-tooling-log/src/tooling_log_text_writer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts
rename to packages/kbn-tooling-log/src/tooling_log_text_writer.ts
diff --git a/packages/kbn-dev-utils/src/tooling_log/writer.ts b/packages/kbn-tooling-log/src/writer.ts
similarity index 100%
rename from packages/kbn-dev-utils/src/tooling_log/writer.ts
rename to packages/kbn-tooling-log/src/writer.ts
diff --git a/packages/kbn-tooling-log/tsconfig.json b/packages/kbn-tooling-log/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-tooling-log/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-type-summarizer/BUILD.bazel b/packages/kbn-type-summarizer/BUILD.bazel
index 4399e62f11a77..13a28657f2f0e 100644
--- a/packages/kbn-type-summarizer/BUILD.bazel
+++ b/packages/kbn-type-summarizer/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config")
-load("@rules_nodejs//nodejs:directory_file_path.bzl", "directory_file_path")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "directory_file_path", "js_library", "nodejs_binary")
 load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
 PKG_BASE_NAME = "kbn-type-summarizer"
diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
index 4582a69db0068..0a709181b04d2 100644
--- a/packages/kbn-ui-shared-deps-npm/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -11,7 +11,7 @@ const webpack = require('webpack');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-const UiSharedDepsNpm = require('./src/index');
+const UiSharedDepsNpm = require('./src');
 
 const MOMENT_SRC = require.resolve('moment/min/moment-with-locales.js');
 const WEBPACK_SRC = require.resolve('webpack');
diff --git a/packages/kbn-utility-types/src/index.ts b/packages/kbn-utility-types/src/index.ts
index 277b4a70e415a..50741bbd96954 100644
--- a/packages/kbn-utility-types/src/index.ts
+++ b/packages/kbn-utility-types/src/index.ts
@@ -26,6 +26,13 @@ export type MaybePromise<T> = T | Promise<T>;
  */
 export type ShallowPromise<T> = T extends Promise<infer U> ? Promise<U> : Promise<T>;
 
+/**
+ * Unwrap all promise attributes of the given type
+ */
+export type AwaitedProperties<T> = {
+  [K in keyof T]: Awaited<T[K]>;
+};
+
 /**
  * Minimal interface for an object resembling an `Observable`.
  */
diff --git a/packages/kbn-utils/src/package_json/index.test.ts b/packages/kbn-utils/src/package_json/index.test.ts
index f8d1b5d25fa1b..263e277dd3b4e 100644
--- a/packages/kbn-utils/src/package_json/index.test.ts
+++ b/packages/kbn-utils/src/package_json/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { kibanaPackageJson } from './index';
+import { kibanaPackageJson } from '.';
 
 it('parses package.json', () => {
   expect(kibanaPackageJson.name).toEqual('kibana');
diff --git a/packages/kbn-utils/src/path/index.test.ts b/packages/kbn-utils/src/path/index.test.ts
index e4c80a0783b5d..5c774d9897372 100644
--- a/packages/kbn-utils/src/path/index.test.ts
+++ b/packages/kbn-utils/src/path/index.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { accessSync, constants } from 'fs';
-import { getConfigPath, getDataPath, getLogsPath, getConfigDirectory } from './';
+import { getConfigPath, getDataPath, getLogsPath, getConfigDirectory } from '.';
 import { REPO_ROOT } from '../repo_root';
 
 expect.addSnapshotSerializer(
diff --git a/packages/kbn-utils/src/streams/concat_stream.test.ts b/packages/kbn-utils/src/streams/concat_stream.test.ts
index 123556d248907..9b3b0b19a1079 100644
--- a/packages/kbn-utils/src/streams/concat_stream.test.ts
+++ b/packages/kbn-utils/src/streams/concat_stream.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createListStream, createPromiseFromStreams, createConcatStream } from './index';
+import { createListStream, createPromiseFromStreams, createConcatStream } from '.';
 
 describe('concatStream', () => {
   test('accepts an initial value', async () => {
diff --git a/packages/kbn-utils/src/streams/filter_stream.test.ts b/packages/kbn-utils/src/streams/filter_stream.test.ts
index 61f32e721f170..49250b46e808c 100644
--- a/packages/kbn-utils/src/streams/filter_stream.test.ts
+++ b/packages/kbn-utils/src/streams/filter_stream.test.ts
@@ -11,7 +11,7 @@ import {
   createFilterStream,
   createListStream,
   createPromiseFromStreams,
-} from './index';
+} from '.';
 
 describe('createFilterStream()', () => {
   test('calls the function with each item in the source stream', async () => {
diff --git a/packages/kbn-utils/src/streams/intersperse_stream.test.ts b/packages/kbn-utils/src/streams/intersperse_stream.test.ts
index 8ca4d6d1f9d37..51251f44465e1 100644
--- a/packages/kbn-utils/src/streams/intersperse_stream.test.ts
+++ b/packages/kbn-utils/src/streams/intersperse_stream.test.ts
@@ -11,7 +11,7 @@ import {
   createListStream,
   createIntersperseStream,
   createConcatStream,
-} from './index';
+} from '.';
 
 describe('intersperseStream', () => {
   test('places the intersperse value between each provided value', async () => {
diff --git a/packages/kbn-utils/src/streams/list_stream.test.ts b/packages/kbn-utils/src/streams/list_stream.test.ts
index 9f4b382432f7e..f9b7db0a1b539 100644
--- a/packages/kbn-utils/src/streams/list_stream.test.ts
+++ b/packages/kbn-utils/src/streams/list_stream.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createListStream } from './index';
+import { createListStream } from '.';
 
 describe('listStream', () => {
   test('provides the values in the initial list', async () => {
diff --git a/packages/kbn-utils/src/streams/promise_from_streams.test.ts b/packages/kbn-utils/src/streams/promise_from_streams.test.ts
index ee1b313d4d4cb..9186edf79feab 100644
--- a/packages/kbn-utils/src/streams/promise_from_streams.test.ts
+++ b/packages/kbn-utils/src/streams/promise_from_streams.test.ts
@@ -8,7 +8,7 @@
 
 import { Readable, Writable, Duplex, Transform } from 'stream';
 
-import { createListStream, createPromiseFromStreams, createReduceStream } from './index';
+import { createListStream, createPromiseFromStreams, createReduceStream } from '.';
 
 describe('promiseFromStreams', () => {
   test('pipes together an array of streams', async () => {
diff --git a/packages/kbn-utils/src/streams/reduce_stream.test.ts b/packages/kbn-utils/src/streams/reduce_stream.test.ts
index b2cf92a81be27..25be250865cf8 100644
--- a/packages/kbn-utils/src/streams/reduce_stream.test.ts
+++ b/packages/kbn-utils/src/streams/reduce_stream.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Transform } from 'stream';
-import { createReduceStream, createPromiseFromStreams, createListStream } from './index';
+import { createReduceStream, createPromiseFromStreams, createListStream } from '.';
 
 const promiseFromEvent = (name: string, emitter: Transform) =>
   new Promise((resolve) => emitter.on(name, () => resolve(name)));
diff --git a/packages/kbn-utils/src/streams/replace_stream.test.ts b/packages/kbn-utils/src/streams/replace_stream.test.ts
index 96db0de343555..f99622a75196d 100644
--- a/packages/kbn-utils/src/streams/replace_stream.test.ts
+++ b/packages/kbn-utils/src/streams/replace_stream.test.ts
@@ -14,7 +14,7 @@ import {
   createPromiseFromStreams,
   createListStream,
   createMapStream,
-} from './index';
+} from '.';
 
 async function concatToString(streams: [Readable, ...Writable[]]) {
   return await createPromiseFromStreams([
diff --git a/packages/kbn-utils/src/streams/split_stream.test.ts b/packages/kbn-utils/src/streams/split_stream.test.ts
index 47da2c6416a47..8f1e6a8f6f258 100644
--- a/packages/kbn-utils/src/streams/split_stream.test.ts
+++ b/packages/kbn-utils/src/streams/split_stream.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Transform } from 'stream';
-import { createSplitStream, createConcatStream, createPromiseFromStreams } from './index';
+import { createSplitStream, createConcatStream, createPromiseFromStreams } from '.';
 
 async function split(stream: Transform, input: Array<Buffer | string>) {
   const concat = createConcatStream();
diff --git a/packages/shared-ux/README.mdx b/packages/shared-ux/README.mdx
new file mode 100644
index 0000000000000..05f582f1863b2
--- /dev/null
+++ b/packages/shared-ux/README.mdx
@@ -0,0 +1,118 @@
+# Shared UX Packages
+
+This directory contains directories of packages of shared components and other code for use in Kibana solutions.
+
+## How to use these components
+
+Each package exports one or more components that can be consumed.
+
+### Lazy by default
+
+All components are exported to be lazily-loaded with a default `React.Suspense` default most appropriate to its nature.
+
+If a solution needs to alter the `React.Suspense` behavior, (e.g. a different "loading" component), one can import the `Lazy[ComponentName]` version and surround it with a custom `React.Suspense` component.
+
+### "Pure" and "Connected" components
+
+If a package contains a component with functionality that relies on a Kibana core or plugin dependency, there are two components exported: a `pure` component and a `connected` component.
+
+__Pure__ components:
+- are focused on how a component looks and behaves;
+- have their props and handlers exposed as simple types;
+- have no logic specific to Kibana.
+
+__Connected__ components, by contrast:
+- *compose* their pure counterparts;
+- rely on Kibana core and plugin dependencies to provide Kibana-specific logic;
+- require a `ContextProvider` packaged with the component to provide stateful services from a start contract.
+
+For example, the `ExitFullScreenButton` "pure" component is a button that is styled with the appropriate translated text.  It is simple and without dependency.
+
+The "connected" component *composes* that pure component and:
+- applies EUI theme state;
+- uses the `coreStart.chrome.setIsVisible` API to change the full screen state `onClick`;
+- applies `emotion` styles to position the button in the window.
+
+### Connected component providers
+
+Connected components are accompanied by a `Provider` which is intended to provide their external services.  We typically provide two: one that abstracts away the dependency into a simplified set of functions, and one that maps to the intended dependency directly.
+
+For example, the `ExitFullScreenButton` relies on the `coreStart.chrome.setIsVisible` API to interact with the full screen state.  The package contains two providers.
+
+The `ExitFullScreenButtonProvider` simply expects a single function, `setIsFullScreen`.  This pattern is useful for more complicated components that may rely on a number of dependencies:
+
+```
+<ExitFullScreenButtonProvider setIsFullScreen={...}>
+  <ExitFullScreenButton />
+</ExitFullScreenButtonProvider>
+```
+
+The `ExitFullScreenButtonKibanaProvider` creates a facsimile of the `coreStart` contract type, containing only the portions it expects to use.  This is a kind of "syntactic-sugar-workaround" to the fact plugin start contracts are not typically available to packages:
+
+```
+<ExitFullScreenButtonKibanaProvider coreStart={...}>
+  <ExitFullScreenButton />
+</ExitFullScreenButtonProvider>
+```
+
+Plugins can use either of these providers in their plugin at either the root of their plugin application or at any level of their React tree, wherever it makes sense.  Component compositions can do the same.  Either Provider can be used, depending on the situation.
+
+## How can I contribute a component?
+
+*__Yes, please!__ :elasticheart:*
+
+The easiest way to contribute a shared component to Kibana is to follow our pattern and create a single package containing that contribution.  You can use the `generate` script to create a new boilerplate package.
+
+> More detail on this is coming soon.  Contact the Shared UX team for more information.
+
+## How this collection is organized
+
+Typically, the `/packages` directory contains a flat list of packages, where each directory matches the name of the package.  Given that we expect to create a large number of packages, we're going to organize them into a loose tree structure:
+
+```
+- packages
+  - shared-ux
+    - button
+      - exit_full_screen
+    - [component type]
+      - baz
+      - qux
+    - [subject matter]
+      - foo
+      - bar
+```
+
+This structure should then map to the name of the package:
+
+```
+- @kbn/shared-ux-button-exit-full-screen
+- @kbn/shared-ux-[subject matter]-[foo]
+- @kbn/shared-ux-[subject matter]-[bar]
+- @kbn/shared-ux-[component-type]-[baz]
+- @kbn/shared-ux-[component-type]-[qux]
+```
+
+## Why?
+
+When we started exploring how to effectively share code between Kibana solutions, we realized-- admittedly through some trial and error-- that the usual ways in which we share code between plugins wasn't going to work.
+
+### Why not a plugin?
+
+First, with each component that we create, those components inevitably begin to depend on other plugins.  Once our plugin depends on another, that plugin then becomes unable to use Shared UX components without creating a circular dependency.
+
+Second, the components, while useful to a plugin, are not actually dependent on the *plugin lifecycle*.  They are stateless.  Containing-- restricting-- them to a plugin lifecycle adds unnecessary complexity.
+
+So we opted to organize our code in packages.
+
+### Why not a single package of components?
+
+We started that way, and quickly ran into the "`lodash` bundle problem": containing all of our components in one package (and all of our services in another) meant that any plugin using even one component would inherit *all* of them... even if they weren't used.  Bundle sizes would increase dramatically, as well as build times: any minor change would cascade through the entire monorepo.
+
+Therefore we've opted to create a package for each component.
+
+### How do your components share code?
+
+At present, *they don't*.  Some utility code is shared, but this is code that should change very rarely, at most.
+
+But that doesn't mean they cannot be *composed* together.  `ComponentA` can certainly compose `ComponentB` and `ComponentC`.  What's great is the dependencies become very clear, top-down, and reflect the granular nature of each component.
+
diff --git a/packages/shared-ux/button/exit_full_screen/BUILD.bazel b/packages/shared-ux/button/exit_full_screen/BUILD.bazel
new file mode 100644
index 0000000000000..2b6fbf63066d5
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/BUILD.bazel
@@ -0,0 +1,153 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-shared-ux-button-exit-full-screen"
+PKG_REQUIRE_NAME = "@kbn/shared-ux-button-exit-full-screen"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.scss",
+    "src/**/*.mdx",
+    "src/**/*.svg",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//@elastic/eui",
+  "@npm//@emotion/css",
+  "@npm//@emotion/react",
+  "@npm//@storybook/addon-actions",
+  "@npm//classnames",
+  "@npm//enzyme",
+  "@npm//react-use",
+  "@npm//react",
+  "@npm//url-loader",
+  "//packages/kbn-i18n-react",
+  "//packages/kbn-i18n",
+  "//packages/kbn-shared-ux-utility",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@elastic/eui",
+  "@npm//@emotion/css",
+  "@npm//@emotion/react",
+  "@npm//@storybook/addon-actions",
+  "@npm//@types/classnames",
+  "@npm//@types/enzyme",
+  "@npm//@types/jest",
+  "@npm//@types/node",
+  "@npm//@types/react",
+  "@npm//react-use",
+  "//packages/kbn-ambient-ui-types",
+  "//packages/kbn-i18n-react:npm_module_types",
+  "//packages/kbn-i18n:npm_module_types",
+  "//packages/kbn-shared-ux-utility:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+jsts_transpiler(
+  name = "target_web",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+  web = True,
+  additional_args = [
+    "--copy-files",
+    "--quiet"
+  ],
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node", ":target_web"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/shared-ux/button/exit_full_screen/README.mdx b/packages/shared-ux/button/exit_full_screen/README.mdx
new file mode 100644
index 0000000000000..03a885ba6151c
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/README.mdx
@@ -0,0 +1,28 @@
+---
+id: sharedUX/Components/ExitFullScreenButton
+slug: /shared-ux/components/exit-full-screen-button
+title: Exit Full Screen Button
+summary: A button that floats over the plugin workspace and allows someone to exit "full screen" mode.
+tags: ['shared-ux', 'component']
+date: 2021-12-28
+---
+
+## Description
+
+Many plugins have a "full screen mode", where the chrome is hidden and the workspace of the plugin is maximized.  This button is meant to appear when the plugin is in full screen mode to allow the user to exit that state and return the relevant Kibana Chrome.
+
+## Pure Component: `ExitFullScreenButtonComponent`
+
+The pure component is a simple button representing the style and text of a button to exit full screen mode.  It does not interact with Kibana or browser chrome in any way, nor does it respond to global key presses.  You can use this component with your own logic and positioning, if necessary.
+
+## Connected Component: `ExitFullScreenButton`
+
+The connected component:
+
+- uses the `setIsVisible` API from `coreStart.chrome` to enter and exit full screen;
+- monitors relevant external key presses to exit full screen mode;
+- allows provides the `toggleChrome` prop, which provides the ability to call `setIsVisible` on render, which allows a consumer to enter full screen simply by rendering the component and exit full screen by interacting with it.
+
+## EUI Promotion Status
+
+This component is not currently considered for promotion to EUI.
diff --git a/packages/shared-ux/button/exit_full_screen/jest.config.js b/packages/shared-ux/button/exit_full_screen/jest.config.js
new file mode 100644
index 0000000000000..a9c3d2e1afb48
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/packages/shared-ux/button/exit_full_screen'],
+};
diff --git a/packages/shared-ux/button/exit_full_screen/package.json b/packages/shared-ux/button/exit_full_screen/package.json
new file mode 100644
index 0000000000000..33cd7d782fd5c
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@kbn/shared-ux-button-exit-full-screen",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "browser": "./target_web/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
diff --git a/packages/shared-ux/button/exit_full_screen/src/__snapshots__/exit_full_screen_button.test.tsx.snap b/packages/shared-ux/button/exit_full_screen/src/__snapshots__/exit_full_screen_button.test.tsx.snap
new file mode 100644
index 0000000000000..793c17ae1b1e3
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/__snapshots__/exit_full_screen_button.test.tsx.snap
@@ -0,0 +1,241 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ExitFullScreenButton /> with kibana services is rendered 1`] = `
+<ExitFullScreenButtonKibanaProvider
+  coreStart={
+    Object {
+      "chrome": Object {
+        "setIsVisible": [MockFunction] {
+          "calls": Array [
+            Array [
+              false,
+            ],
+          ],
+          "results": Array [
+            Object {
+              "type": "return",
+              "value": undefined,
+            },
+          ],
+        },
+      },
+    }
+  }
+>
+  <ExitFullScreenButton
+    onExit={[MockFunction]}
+  >
+    <ExitFullScreenButton
+      css={
+        Object {
+          "map": undefined,
+          "name": "knjqgf",
+          "next": undefined,
+          "styles": "
+    bottom: 8px;
+    left: 8px;
+    position: fixed;
+    z-index: 5;
+  ",
+          "toString": [Function],
+        }
+      }
+      onClick={[Function]}
+    >
+      <div>
+        <EuiScreenReaderOnly>
+          <p
+            aria-live="polite"
+            className="euiScreenReaderOnly"
+          >
+            In full screen mode, press ESC to exit.
+          </p>
+        </EuiScreenReaderOnly>
+        <button
+          className="exitFullScreenButton"
+          data-test-subj="exitFullScreenModeButton"
+          onClick={[Function]}
+        >
+          <EuiFlexGroup
+            alignItems="center"
+            component="span"
+            gutterSize="s"
+            responsive={false}
+          >
+            <span
+              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+            >
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="m"
+                    type="logoElastic"
+                  >
+                    <span
+                      data-euiicon-type="logoElastic"
+                      size="m"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                data-test-subj="exitFullScreenModeText"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  data-test-subj="exitFullScreenModeText"
+                >
+                  Exit full screen
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="s"
+                    type="fullScreenExit"
+                  >
+                    <span
+                      data-euiicon-type="fullScreenExit"
+                      size="s"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+            </span>
+          </EuiFlexGroup>
+        </button>
+      </div>
+    </ExitFullScreenButton>
+  </ExitFullScreenButton>
+</ExitFullScreenButtonKibanaProvider>
+`;
+
+exports[`<ExitFullScreenButton /> with manual services is rendered 1`] = `
+<ExitFullScreenButtonProvider
+  setIsFullscreen={
+    [MockFunction] {
+      "calls": Array [
+        Array [
+          false,
+        ],
+      ],
+      "results": Array [
+        Object {
+          "type": "return",
+          "value": undefined,
+        },
+      ],
+    }
+  }
+>
+  <ExitFullScreenButton
+    onExit={[MockFunction]}
+  >
+    <ExitFullScreenButton
+      css={
+        Object {
+          "map": undefined,
+          "name": "knjqgf",
+          "next": undefined,
+          "styles": "
+    bottom: 8px;
+    left: 8px;
+    position: fixed;
+    z-index: 5;
+  ",
+          "toString": [Function],
+        }
+      }
+      onClick={[Function]}
+    >
+      <div>
+        <EuiScreenReaderOnly>
+          <p
+            aria-live="polite"
+            className="euiScreenReaderOnly"
+          >
+            In full screen mode, press ESC to exit.
+          </p>
+        </EuiScreenReaderOnly>
+        <button
+          className="exitFullScreenButton"
+          data-test-subj="exitFullScreenModeButton"
+          onClick={[Function]}
+        >
+          <EuiFlexGroup
+            alignItems="center"
+            component="span"
+            gutterSize="s"
+            responsive={false}
+          >
+            <span
+              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+            >
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="m"
+                    type="logoElastic"
+                  >
+                    <span
+                      data-euiicon-type="logoElastic"
+                      size="m"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                data-test-subj="exitFullScreenModeText"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  data-test-subj="exitFullScreenModeText"
+                >
+                  Exit full screen
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="s"
+                    type="fullScreenExit"
+                  >
+                    <span
+                      data-euiicon-type="fullScreenExit"
+                      size="s"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+            </span>
+          </EuiFlexGroup>
+        </button>
+      </div>
+    </ExitFullScreenButton>
+  </ExitFullScreenButton>
+</ExitFullScreenButtonProvider>
+`;
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.component.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx
similarity index 89%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.component.tsx
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx
index 6c037cc5f65cb..6dc5a8d32929e 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.component.tsx
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx
@@ -21,22 +21,19 @@ import cx from 'classnames';
 
 import './exit_full_screen_button.scss';
 
-const text = i18n.translate(
-  'sharedUXComponents.exitFullScreenButton.exitFullScreenModeButtonText',
-  {
-    defaultMessage: 'Exit full screen',
-  }
-);
+const text = i18n.translate('sharedUXPackages.exitFullScreenButton.exitFullScreenModeButtonText', {
+  defaultMessage: 'Exit full screen',
+});
 
 const description = i18n.translate(
-  'sharedUXComponents.exitFullScreenButton.fullScreenModeDescription',
+  'sharedUXPackages.exitFullScreenButton.fullScreenModeDescription',
   {
     defaultMessage: 'In full screen mode, press ESC to exit.',
   }
 );
 
 /**
- * Props for the Exit Full Screen button component.
+ * Props for the `ExitFullScreenButton` component.
  */
 export interface Props extends Pick<HTMLAttributes<HTMLDivElement>, 'className'> {
   onClick: MouseEventHandler<HTMLButtonElement>;
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.scss b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.scss
similarity index 100%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.scss
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.scss
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.stories.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.stories.tsx
similarity index 78%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.stories.tsx
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.stories.tsx
index e530a4303e6af..36c09558469ec 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.stories.tsx
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.stories.tsx
@@ -9,9 +9,10 @@
 import React from 'react';
 import { action } from '@storybook/addon-actions';
 
+import { ExitFullScreenButtonProvider } from './services';
 import { ExitFullScreenButton as ExitFullScreenButtonComponent } from './exit_full_screen_button.component';
 import { ExitFullScreenButton } from './exit_full_screen_button';
-import mdx from './exit_full_screen_button.mdx';
+import mdx from '../README.mdx';
 
 export default {
   title: 'Exit Full Screen Button',
@@ -25,7 +26,11 @@ export default {
 };
 
 export const ConnectedComponent = ({ toggleChrome = true }: { toggleChrome: boolean }) => {
-  return <ExitFullScreenButton onExit={action('onExit')} toggleChrome={toggleChrome} />;
+  return (
+    <ExitFullScreenButtonProvider setIsFullscreen={action('setIsFullscreen')}>
+      <ExitFullScreenButton onExit={action('onExit')} toggleChrome={toggleChrome} />
+    </ExitFullScreenButtonProvider>
+  );
 };
 
 ConnectedComponent.argTypes = {
diff --git a/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.test.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.test.tsx
new file mode 100644
index 0000000000000..3b30c38d2d050
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.test.tsx
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { ReactWrapper } from 'enzyme';
+import { keys } from '@elastic/eui';
+
+import { ExitFullScreenButton } from './exit_full_screen_button';
+import { componentMount, componentServices, kibanaMount, kibanaServices } from './mocks';
+
+describe('<ExitFullScreenButton />', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('with manual services', () => {
+    test('is rendered', () => {
+      const component = componentMount(<ExitFullScreenButton onExit={jest.fn()} />);
+      expect(component).toMatchSnapshot();
+    });
+
+    test('passing `false` to toggleChrome does not toggle chrome', () => {
+      const component = componentMount(
+        <ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />
+      );
+      expect(componentServices.setIsFullscreen).toHaveBeenCalledTimes(0);
+
+      component.unmount();
+      expect(componentServices.setIsFullscreen).toHaveBeenCalledTimes(0);
+    });
+
+    describe('onExit', () => {
+      const onExitHandler = jest.fn();
+      let component: ReactWrapper;
+
+      beforeEach(() => {
+        component = componentMount(
+          <ExitFullScreenButton onExit={onExitHandler} toggleChrome={true} />
+        );
+      });
+
+      test('is called when the button is pressed', () => {
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(false);
+
+        component.find('button').simulate('click');
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(true);
+      });
+
+      test('is called when the ESC key is pressed', () => {
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(false);
+
+        const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
+        document.dispatchEvent(escapeKeyEvent);
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(true);
+      });
+    });
+  });
+
+  describe('with kibana services', () => {
+    test('is rendered', () => {
+      const component = kibanaMount(<ExitFullScreenButton onExit={jest.fn()} />);
+      expect(component).toMatchSnapshot();
+    });
+
+    test('passing `false` to toggleChrome does not toggle chrome', () => {
+      const component = kibanaMount(
+        <ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />
+      );
+      expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenCalledTimes(0);
+
+      component.unmount();
+      expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenCalledTimes(0);
+    });
+
+    describe('onExit', () => {
+      const onExitHandler = jest.fn();
+      let component: ReactWrapper;
+
+      beforeEach(() => {
+        component = kibanaMount(
+          <ExitFullScreenButton onExit={onExitHandler} toggleChrome={true} />
+        );
+      });
+
+      test('is called when the button is pressed', () => {
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(false);
+
+        component.find('button').simulate('click');
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(true);
+      });
+
+      test('is called when the ESC key is pressed', () => {
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(false);
+
+        const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
+        document.dispatchEvent(escapeKeyEvent);
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(true);
+      });
+    });
+  });
+});
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.tsx
similarity index 83%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.tsx
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.tsx
index 09abe4a760d89..94c26ae4ebbaa 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.tsx
@@ -11,12 +11,11 @@ import { useEuiTheme, keys } from '@elastic/eui';
 import { css } from '@emotion/react';
 import useMountedState from 'react-use/lib/useMountedState';
 
-import { usePlatformService } from '@kbn/shared-ux-services';
-
 import { ExitFullScreenButton as Component } from './exit_full_screen_button.component';
+import { useServices } from './services';
 
 /**
- * Props for the service-enabled Exit Full Screen button component.
+ * Props for the service-enabled `ExitFullScreenButton` component.
  */
 export interface Props {
   /** Optional handler to call when one exits full-screen mode. */
@@ -27,16 +26,11 @@ export interface Props {
 
 /**
  * A service-enabled component that provides Kibana-specific functionality to the `ExitFullScreenButton`
- * component.
- *
- * Use of this component requires both the `EuiTheme` context as well as either a configured Shared UX
- * `ServicesProvider` or the `ServicesContext` provided by the Shared UX public plugin contract.
- *
- * See shared-ux/public/services for information.
+ * pure component.
  */
 export const ExitFullScreenButton = ({ onExit = () => {}, toggleChrome = true }: Props) => {
   const { euiTheme } = useEuiTheme();
-  const { setIsFullscreen } = usePlatformService();
+  const { setIsFullscreen } = useServices();
   const isMounted = useMountedState();
 
   const onClick = useCallback(() => {
diff --git a/packages/shared-ux/button/exit_full_screen/src/index.ts b/packages/shared-ux/button/exit_full_screen/src/index.ts
new file mode 100644
index 0000000000000..da1fcce0e26a5
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/index.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { withSuspense } from '@kbn/shared-ux-utility';
+
+export { ExitFullScreenButtonKibanaProvider, ExitFullScreenButtonProvider } from './services';
+
+/**
+ * Lazy-loaded pure component.  Must be wrapped in `React.Suspense`.
+ */
+export const LazyExitFullScreenButtonComponent = React.lazy(() =>
+  import('./exit_full_screen_button.component').then(({ ExitFullScreenButton }) => ({
+    default: ExitFullScreenButton,
+  }))
+);
+
+/**
+ * A pure component that resembles a button to exit full screen mode.
+ */
+export const ExitFullScreenButtonComponent = withSuspense(LazyExitFullScreenButtonComponent);
+
+/**
+ * Lazy-loaded connected component.  Must be wrapped in `React.Suspense` and a Provider.
+ */
+export const LazyExitFullScreenButton = React.lazy(() =>
+  import('./exit_full_screen_button').then(({ ExitFullScreenButton }) => ({
+    default: ExitFullScreenButton,
+  }))
+);
+
+/**
+ * A component that can be used to exit full screen mode in Kibana.  Requires a Provider for
+ * relevant services.
+ */
+export const ExitFullScreenButton = withSuspense(LazyExitFullScreenButton);
diff --git a/packages/shared-ux/button/exit_full_screen/src/mocks.tsx b/packages/shared-ux/button/exit_full_screen/src/mocks.tsx
new file mode 100644
index 0000000000000..b63ea33cfde8e
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/mocks.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { mount as enzymeMount } from 'enzyme';
+import { ExitFullScreenButtonKibanaProvider, ExitFullScreenButtonProvider } from './services';
+
+export const componentServices = { setIsFullscreen: jest.fn() };
+export const componentMount = (element: JSX.Element) =>
+  enzymeMount(
+    <ExitFullScreenButtonProvider {...componentServices}>{element}</ExitFullScreenButtonProvider>
+  );
+
+export const kibanaServices = { coreStart: { chrome: { setIsVisible: jest.fn() } } };
+export const kibanaMount = (element: JSX.Element) =>
+  enzymeMount(
+    <ExitFullScreenButtonKibanaProvider {...kibanaServices}>
+      {element}
+    </ExitFullScreenButtonKibanaProvider>
+  );
diff --git a/packages/shared-ux/button/exit_full_screen/src/services.tsx b/packages/shared-ux/button/exit_full_screen/src/services.tsx
new file mode 100644
index 0000000000000..7522d160028d9
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/services.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, { FC, useContext } from 'react';
+
+/**
+ * Abstract external services for this component.
+ */
+export interface Services {
+  setIsFullscreen: (isFullscreen: boolean) => void;
+}
+
+const ExitFullScreenButtonContext = React.createContext<Services | null>(null);
+
+/**
+ * Abstract external service Provider.
+ */
+export const ExitFullScreenButtonProvider: FC<Services> = ({ children, ...services }) => {
+  return (
+    <ExitFullScreenButtonContext.Provider value={services}>
+      {children}
+    </ExitFullScreenButtonContext.Provider>
+  );
+};
+
+/**
+ * Kibana-specific service types.
+ */
+export interface KibanaServices {
+  coreStart: {
+    chrome: {
+      setIsVisible: (isVisible: boolean) => void;
+    };
+  };
+}
+
+/**
+ * Kibana-specific Provider that maps to known dependency types.
+ */
+export const ExitFullScreenButtonKibanaProvider: FC<KibanaServices> = ({
+  children,
+  ...services
+}) => {
+  return (
+    <ExitFullScreenButtonContext.Provider
+      value={{
+        setIsFullscreen: services.coreStart.chrome.setIsVisible,
+      }}
+    >
+      {children}
+    </ExitFullScreenButtonContext.Provider>
+  );
+};
+
+/**
+ * React hook for accessing pre-wired services.
+ */
+export function useServices() {
+  const context = useContext(ExitFullScreenButtonContext);
+
+  if (!context) {
+    throw new Error(
+      'ExitFullScreenButtonContext is missing.  Ensure your component or React root is wrapped with ExitFullScreenButtonProvider.'
+    );
+  }
+
+  return context;
+}
diff --git a/packages/shared-ux/button/exit_full_screen/tsconfig.json b/packages/shared-ux/button/exit_full_screen/tsconfig.json
new file mode 100644
index 0000000000000..4d110e436c3fe
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node",
+      "@emotion/react/types/css-prop",
+      "@kbn/ambient-ui-types"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/renovate.json b/renovate.json
index 6f34f08c723f2..4b9418311ced7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -25,11 +25,12 @@
     {
       "groupName": "@elastic/charts",
       "matchPackageNames": ["@elastic/charts"],
-      "reviewers": ["team:datavis"],
+      "reviewers": ["team:datavis", "markov00", "nickofthyme"],
       "matchBaseBranches": ["main"],
-      "labels": ["release_note:skip", "auto-backport", "Team:DataVis", "v8.1.0", "v7.17.0"],
+      "labels": ["release_note:skip", "auto-backport", "Team:DataVis"],
       "draftPR": true,
       "enabled": true,
+      "assignAutomerge": true,
       "prCreation": "immediate"
     },
     {
diff --git a/scripts/build_kibana_platform_plugins.js b/scripts/build_kibana_platform_plugins.js
index 9038d08364400..1a016e8b8e54f 100644
--- a/scripts/build_kibana_platform_plugins.js
+++ b/scripts/build_kibana_platform_plugins.js
@@ -9,5 +9,5 @@
 require('../src/setup_node_env/ensure_node_preserve_symlinks');
 require('source-map-support/register');
 require('@kbn/optimizer').runKbnOptimizerCli({
-  defaultLimitsPath: require.resolve('../packages/kbn-optimizer/limits.yml'),
+  defaultLimitsPath: require.resolve('@kbn/optimizer/limits.yml'),
 });
diff --git a/scripts/kbn.js b/scripts/kbn.js
index f384c13a3acfc..459c590ddf8cc 100644
--- a/scripts/kbn.js
+++ b/scripts/kbn.js
@@ -8,4 +8,4 @@
 
 require('../src/setup_node_env/ensure_node_preserve_symlinks');
 require('../src/setup_node_env/node_version_validator');
-require('../packages/kbn-pm/cli');
+require('../packages/kbn-pm/dist').run(process.argv.slice(2));
diff --git a/scripts/type_summarizer.js b/scripts/type_summarizer.js
index 09d3aa69138e9..cb1b46e941954 100644
--- a/scripts/type_summarizer.js
+++ b/scripts/type_summarizer.js
@@ -6,6 +6,6 @@
  * Side Public License, v 1.
  */
 
-require('../src/setup_node_env');
+require('../src/setup_node_env/no_transpilation');
 require('source-map-support/register');
-require('../packages/kbn-type-summarizer/src/bazel_cli');
+require('@kbn/type-summarizer/target_node/bazel_cli');
diff --git a/src/cli/keystore/read_keystore.js b/src/cli/keystore/read_keystore.js
index be6faeab79cb2..d3629c32671f7 100644
--- a/src/cli/keystore/read_keystore.js
+++ b/src/cli/keystore/read_keystore.js
@@ -8,7 +8,7 @@
 
 import { set } from '@elastic/safer-lodash-set';
 
-import { Keystore } from '../keystore';
+import { Keystore } from '.';
 import { getKeystore } from '../../cli_keystore/get_keystore';
 
 export function readKeystore(keystorePath = getKeystore()) {
diff --git a/src/cli/keystore/read_keystore.test.js b/src/cli/keystore/read_keystore.test.js
index 8b376a3d10699..2727576c1f8a1 100644
--- a/src/cli/keystore/read_keystore.test.js
+++ b/src/cli/keystore/read_keystore.test.js
@@ -9,8 +9,8 @@
 import path from 'path';
 import { readKeystore } from './read_keystore';
 
-jest.mock('../keystore');
-import { Keystore } from '../keystore';
+jest.mock('.');
+import { Keystore } from '.';
 
 describe('cli/serve/read_keystore', () => {
   beforeEach(() => {
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index b7228780a1005..6425b0d6c8005 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -38,7 +38,7 @@ const getBootstrapScript = (isDev) => {
     const { bootstrapDevMode } = require(DEV_MODE_PATH);
     return bootstrapDevMode;
   } else {
-    const { bootstrap } = require('../../core/server');
+    const { bootstrap } = require('@kbn/core/server');
     return bootstrap;
   }
 };
diff --git a/src/cli_encryption_keys/encryption_config.test.js b/src/cli_encryption_keys/encryption_config.test.js
index 9629cfcafe78a..dba1967f4f6b1 100644
--- a/src/cli_encryption_keys/encryption_config.test.js
+++ b/src/cli_encryption_keys/encryption_config.test.js
@@ -14,7 +14,7 @@ describe('encryption key configuration', () => {
   let encryptionConfig = null;
 
   beforeEach(() => {
-    jest.spyOn(fs, 'readFileSync').mockReturnValue('xpack.security.encryptionKey: foo');
+    jest.spyOn(fs, 'readFileSync').mockReturnValueOnce('xpack.security.encryptionKey: foo');
     jest.spyOn(crypto, 'randomBytes').mockReturnValue('random-key');
     encryptionConfig = new EncryptionConfig();
   });
diff --git a/src/cli_keystore/list.test.js b/src/cli_keystore/list.test.js
index 6a433b3e9299d..01bac0c4454d9 100644
--- a/src/cli_keystore/list.test.js
+++ b/src/cli_keystore/list.test.js
@@ -25,7 +25,7 @@ jest.mock('fs', () => ({
 }));
 
 import sinon from 'sinon';
-import { Keystore } from '../cli//keystore';
+import { Keystore } from '../cli/keystore';
 import { list } from './list';
 import { Logger } from '../cli_plugin/lib/logger';
 
diff --git a/src/cli_plugin/install/index.test.js b/src/cli_plugin/install/index.test.js
index 730f90dc85a9f..f789dd9ba3083 100644
--- a/src/cli_plugin/install/index.test.js
+++ b/src/cli_plugin/install/index.test.js
@@ -8,7 +8,7 @@
 
 import sinon from 'sinon';
 
-import { installCommand } from './index';
+import { installCommand } from '.';
 
 describe('kibana cli', function () {
   describe('plugin installer', function () {
diff --git a/src/cli_plugin/install/settings.test.js b/src/cli_plugin/install/settings.test.js
index c7985763524ed..b0accc83971e3 100644
--- a/src/cli_plugin/install/settings.test.js
+++ b/src/cli_plugin/install/settings.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 import { fromRoot } from '@kbn/utils';
 
 import { parseMilliseconds, parse } from './settings';
diff --git a/src/cli_plugin/remove/settings.test.js b/src/cli_plugin/remove/settings.test.js
index ef96bc496d8ce..f369e3e3a1f2f 100644
--- a/src/cli_plugin/remove/settings.test.js
+++ b/src/cli_plugin/remove/settings.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { parse } from './settings';
 
diff --git a/src/cli_setup/cli_setup.ts b/src/cli_setup/cli_setup.ts
index 9ae9fcba0507f..241c0dc13157f 100644
--- a/src/cli_setup/cli_setup.ts
+++ b/src/cli_setup/cli_setup.ts
@@ -15,8 +15,8 @@ import { getConfigPath } from '@kbn/utils';
 import {
   ElasticsearchService,
   EnrollResult,
-} from '../plugins/interactive_setup/server/elasticsearch_service';
-import { getDetailedErrorMessage } from '../plugins/interactive_setup/server/errors';
+} from '@kbn/interactive-setup-plugin/server/elasticsearch_service';
+import { getDetailedErrorMessage } from '@kbn/interactive-setup-plugin/server/errors';
 import {
   promptToken,
   getCommand,
diff --git a/src/cli_setup/utils.test.ts b/src/cli_setup/utils.test.ts
index c9242d4eaeba4..aa90f4a078e9c 100644
--- a/src/cli_setup/utils.test.ts
+++ b/src/cli_setup/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { decodeEnrollmentToken, getCommand } from './utils';
-import type { EnrollmentToken } from '../plugins/interactive_setup/common';
+import type { EnrollmentToken } from '@kbn/interactive-setup-plugin/common';
 
 describe('kibana setup cli', () => {
   describe('getCommand', () => {
diff --git a/src/cli_setup/utils.ts b/src/cli_setup/utils.ts
index 03eca6fe8e0ac..6a5b60681a9f0 100644
--- a/src/cli_setup/utils.ts
+++ b/src/cli_setup/utils.ts
@@ -12,12 +12,12 @@ import { duration } from 'moment';
 import { merge } from 'lodash';
 import { kibanaPackageJson } from '@kbn/utils';
 
-import { Logger } from '../core/server';
-import { ClusterClient } from '../core/server/elasticsearch/client';
-import { configSchema } from '../core/server/elasticsearch';
-import { ElasticsearchService } from '../plugins/interactive_setup/server/elasticsearch_service';
-import { KibanaConfigWriter } from '../plugins/interactive_setup/server/kibana_config_writer';
-import type { EnrollmentToken } from '../plugins/interactive_setup/common';
+import { Logger } from '@kbn/core/server';
+import { ClusterClient } from '@kbn/core/server/elasticsearch/client';
+import { configSchema } from '@kbn/core/server/elasticsearch';
+import { ElasticsearchService } from '@kbn/interactive-setup-plugin/server/elasticsearch_service';
+import { KibanaConfigWriter } from '@kbn/interactive-setup-plugin/server/kibana_config_writer';
+import type { EnrollmentToken } from '@kbn/interactive-setup-plugin/common';
 
 const noop = () => {};
 const logger: Logger = {
diff --git a/src/core/public/analytics/analytics_service.ts b/src/core/public/analytics/analytics_service.ts
index ab17eb46192ae..89e83c7e3c85b 100644
--- a/src/core/public/analytics/analytics_service.ts
+++ b/src/core/public/analytics/analytics_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { AnalyticsClient } from '@elastic/analytics';
-import { createAnalytics } from '@elastic/analytics';
+import type { AnalyticsClient } from '@kbn/analytics-client';
+import { createAnalytics } from '@kbn/analytics-client';
 import { CoreContext } from '../core_system';
 import { createLogger } from './logger';
 
diff --git a/src/core/public/analytics/index.ts b/src/core/public/analytics/index.ts
index c371955123059..0524f7ffe73a2 100644
--- a/src/core/public/analytics/index.ts
+++ b/src/core/public/analytics/index.ts
@@ -20,6 +20,6 @@ export type {
   OptInConfig,
   ContextProviderOpts,
   TelemetryCounter,
-} from '@elastic/analytics';
+} from '@kbn/analytics-client';
 
-export { TelemetryCounterType } from '@elastic/analytics';
+export { TelemetryCounterType } from '@kbn/analytics-client';
diff --git a/src/core/public/application/integration_tests/application_service.test.tsx b/src/core/public/application/integration_tests/application_service.test.tsx
index 99e6d86b6a941..476457d34ccb2 100644
--- a/src/core/public/application/integration_tests/application_service.test.tsx
+++ b/src/core/public/application/integration_tests/application_service.test.tsx
@@ -19,7 +19,7 @@ import { overlayServiceMock } from '../../overlays/overlay_service.mock';
 import { themeServiceMock } from '../../theme/theme_service.mock';
 import { AppMountParameters, AppUpdater } from '../types';
 import { Observable } from 'rxjs';
-import { MountPoint } from 'kibana/public';
+import { MountPoint } from '../..';
 
 const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
 
diff --git a/src/core/public/application/navigation_confirm.ts b/src/core/public/application/navigation_confirm.ts
index 9bae41c71e2d0..63c6a7a438b86 100644
--- a/src/core/public/application/navigation_confirm.ts
+++ b/src/core/public/application/navigation_confirm.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '..';
 
 export type ConfirmHandlerCallback = (result: boolean) => void;
 export type ConfirmHandler = (message: string, callback: ConfirmHandlerCallback) => void;
diff --git a/src/core/public/chrome/chrome_service.mock.ts b/src/core/public/chrome/chrome_service.mock.ts
index a92179ca9283c..08c14e955bcbe 100644
--- a/src/core/public/chrome/chrome_service.mock.ts
+++ b/src/core/public/chrome/chrome_service.mock.ts
@@ -9,7 +9,7 @@
 import { BehaviorSubject } from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import { ChromeBadge, ChromeBreadcrumb, ChromeService, InternalChromeStart } from './';
+import { ChromeBadge, ChromeBreadcrumb, ChromeService, InternalChromeStart } from '.';
 
 const createStartContractMock = () => {
   const startContract: DeeplyMockedKeys<InternalChromeStart> = {
diff --git a/src/core/public/chrome/nav_links/nav_link.ts b/src/core/public/chrome/nav_links/nav_link.ts
index 4e9158cac5cd4..f80a07a91865d 100644
--- a/src/core/public/chrome/nav_links/nav_link.ts
+++ b/src/core/public/chrome/nav_links/nav_link.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { AppCategory } from '../../';
+import { AppCategory } from '../..';
 
 /**
  * @public
diff --git a/src/core/public/chrome/recently_accessed/create_log_key.ts b/src/core/public/chrome/recently_accessed/create_log_key.ts
index 5a93ea5cc9267..bc7655294f049 100644
--- a/src/core/public/chrome/recently_accessed/create_log_key.ts
+++ b/src/core/public/chrome/recently_accessed/create_log_key.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Sha256 } from '../../utils/';
+import { Sha256 } from '../../utils';
 export async function createLogKey(type: string, optionalIdentifier?: string) {
   const baseKey = `kibana.history.${type}`;
 
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx
index da83e7ccfb4cb..01ae5fe35487a 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx
@@ -26,7 +26,7 @@ import { ChromeNavLink, ChromeRecentlyAccessedHistoryItem } from '../..';
 import { AppCategory } from '../../../../types';
 import { InternalApplicationStart } from '../../../application/types';
 import { HttpStart } from '../../../http';
-import { OnIsLockedUpdate } from './';
+import { OnIsLockedUpdate } from '.';
 import {
   createEuiListItem,
   createRecentNavLink,
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 40108760cc0be..ade605de4b017 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -22,7 +22,7 @@ import classnames from 'classnames';
 import React, { createRef, useState } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { Observable } from 'rxjs';
-import { LoadingIndicator } from '../';
+import { LoadingIndicator } from '..';
 import {
   ChromeBadge,
   ChromeBreadcrumb,
@@ -37,7 +37,7 @@ import {
   ChromeHelpExtension,
   ChromeUserBanner,
 } from '../../types';
-import { OnIsLockedUpdate } from './';
+import { OnIsLockedUpdate } from '.';
 import { CollapsibleNav } from './collapsible_nav';
 import { HeaderBadge } from './header_badge';
 import { HeaderBreadcrumbs } from './header_breadcrumbs';
diff --git a/src/core/public/core_app/status/lib/load_status.ts b/src/core/public/core_app/status/lib/load_status.ts
index 0994e55c31c38..c175f3a5bc833 100644
--- a/src/core/public/core_app/status/lib/load_status.ts
+++ b/src/core/public/core_app/status/lib/load_status.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import type { StatusResponse, ServiceStatus, ServiceStatusLevel } from '../../../../types/status';
 import type { HttpSetup } from '../../../http';
 import type { NotificationsSetup } from '../../../notifications';
-import type { DataType } from '../lib';
+import type { DataType } from '.';
 
 interface MetricMeta {
   title: string;
diff --git a/src/core/public/http/anonymous_paths_service.ts b/src/core/public/http/anonymous_paths_service.ts
index 258c25d7772f1..4aae7460815b6 100644
--- a/src/core/public/http/anonymous_paths_service.ts
+++ b/src/core/public/http/anonymous_paths_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAnonymousPaths, IBasePath } from 'src/core/public';
+import { IAnonymousPaths, IBasePath } from '..';
 import { CoreService } from '../../types';
 
 interface Deps {
diff --git a/src/core/public/http/external_url_service.test.ts b/src/core/public/http/external_url_service.test.ts
index 4ce3709ff6366..c2d7725bf1bed 100644
--- a/src/core/public/http/external_url_service.test.ts
+++ b/src/core/public/http/external_url_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExternalUrlConfig } from 'src/core/server/types';
+import { ExternalUrlConfig } from '../../server/types';
 
 import { injectedMetadataServiceMock } from '../mocks';
 import { Sha256 } from '../utils';
diff --git a/src/core/public/http/external_url_service.ts b/src/core/public/http/external_url_service.ts
index 0fb1c85d48257..ffc2d9ec89be3 100644
--- a/src/core/public/http/external_url_service.ts
+++ b/src/core/public/http/external_url_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IExternalUrlPolicy } from 'src/core/server/types';
+import { IExternalUrlPolicy } from '../../server/types';
 
-import { CoreService } from 'src/core/types';
+import { CoreService } from '../../types';
 import { IExternalUrl } from './types';
 import { InjectedMetadataSetup } from '../injected_metadata';
 import { Sha256 } from '../utils';
diff --git a/src/core/public/http/fetch.ts b/src/core/public/http/fetch.ts
index 9a333161e1b7a..c6e7bcd1dd73f 100644
--- a/src/core/public/http/fetch.ts
+++ b/src/core/public/http/fetch.ts
@@ -33,6 +33,7 @@ interface Params {
 const JSON_CONTENT = /^(application\/(json|x-javascript)|text\/(x-)?javascript|x-json)(;.*)?$/;
 const NDJSON_CONTENT = /^(application\/ndjson)(;.*)?$/;
 const ZIP_CONTENT = /^(application\/zip)(;.*)?$/;
+const VECTOR_TILE = /^(application\/vnd.mapbox-vector-tile)(;.*)?$/;
 
 const removedUndefined = (obj: Record<string, any> | undefined) => {
   return omitBy(obj, (v) => v === undefined);
@@ -164,6 +165,8 @@ export class Fetch {
         body = await response.blob();
       } else if (JSON_CONTENT.test(contentType)) {
         body = await response.json();
+      } else if (VECTOR_TILE.test(contentType)) {
+        body = await response.arrayBuffer();
       } else {
         const text = await response.text();
 
diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts
index 7229cc903d317..07f56b889fc79 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.ts
@@ -17,7 +17,7 @@ import {
   UiSettingsParams,
   UserProvidedValues,
 } from '../../server/types';
-import { AppCategory } from '../';
+import { AppCategory } from '..';
 
 export interface InjectedPluginMetadata {
   id: PluginName;
diff --git a/src/core/public/kbn_bootstrap.test.ts b/src/core/public/kbn_bootstrap.test.ts
index f3fb7695a1573..03096daf09c39 100644
--- a/src/core/public/kbn_bootstrap.test.ts
+++ b/src/core/public/kbn_bootstrap.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { apmSystem, fatalErrorMock, i18nLoad } from './kbn_bootstrap.test.mocks';
-import { __kbnBootstrap__ } from './';
+import { __kbnBootstrap__ } from '.';
 
 describe('kbn_bootstrap', () => {
   beforeAll(() => {
diff --git a/src/core/public/notifications/toasts/error_toast.tsx b/src/core/public/notifications/toasts/error_toast.tsx
index f75bdda716131..3b0a8a14f4966 100644
--- a/src/core/public/notifications/toasts/error_toast.tsx
+++ b/src/core/public/notifications/toasts/error_toast.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '../..';
 import { I18nStart } from '../../i18n';
 
 interface ErrorToastProps {
diff --git a/src/core/public/plugins/plugin_context.ts b/src/core/public/plugins/plugin_context.ts
index 0311006fc44a3..7d288799a34c3 100644
--- a/src/core/public/plugins/plugin_context.ts
+++ b/src/core/public/plugins/plugin_context.ts
@@ -12,7 +12,7 @@ import { PluginOpaqueId, PackageInfo, EnvironmentMode } from '../../server/types
 import { CoreContext } from '../core_system';
 import { PluginWrapper } from './plugin';
 import { PluginsServiceSetupDeps, PluginsServiceStartDeps } from './plugins_service';
-import { CoreSetup, CoreStart } from '../';
+import { CoreSetup, CoreStart } from '..';
 
 /**
  * The available core services passed to a `PluginInitializer`
diff --git a/src/core/public/plugins/plugins_service.test.mocks.ts b/src/core/public/plugins/plugins_service.test.mocks.ts
index 801ea20015f2a..7cf65f0d37dbe 100644
--- a/src/core/public/plugins/plugins_service.test.mocks.ts
+++ b/src/core/public/plugins/plugins_service.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginName } from 'kibana/server';
+import { PluginName } from '../../server';
 import { Plugin } from './plugin';
 
 export type MockedPluginInitializer = jest.Mock<Plugin<unknown, unknown>>;
diff --git a/src/core/public/plugins/plugins_service.test.ts b/src/core/public/plugins/plugins_service.test.ts
index 63997d65c7d7b..c8438a03fcec7 100644
--- a/src/core/public/plugins/plugins_service.test.ts
+++ b/src/core/public/plugins/plugins_service.test.ts
@@ -13,7 +13,7 @@ import {
   mockPluginInitializerProvider,
 } from './plugins_service.test.mocks';
 
-import { PluginName, PluginType } from 'src/core/server';
+import { PluginName, PluginType } from '../../server';
 import { coreMock } from '../mocks';
 import {
   PluginsService,
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index c68e2b40d1dd3..2a662e3f7f8bd 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -7,13 +7,13 @@
 /// <reference types="node" />
 
 import { Action } from 'history';
-import { AnalyticsClient } from '@elastic/analytics';
+import { AnalyticsClient } from '@kbn/analytics-client';
 import Boom from '@hapi/boom';
 import type { ButtonColor } from '@elastic/eui';
 import { ByteSizeValue } from '@kbn/config-schema';
 import type { Client } from '@elastic/elasticsearch';
 import { ConfigPath } from '@kbn/config';
-import { ContextProviderOpts } from '@elastic/analytics';
+import { ContextProviderOpts } from '@kbn/analytics-client';
 import { DetailedPeerCertificate } from 'tls';
 import type { DocLinks } from '@kbn/doc-links';
 import { EnvironmentMode } from '@kbn/config';
@@ -24,15 +24,15 @@ import { EuiConfirmModalProps } from '@elastic/eui';
 import { EuiFlyoutSize } from '@elastic/eui';
 import { EuiGlobalToastListToast } from '@elastic/eui';
 import { EuiOverlayMaskProps } from '@elastic/eui';
-import { Event as Event_2 } from '@elastic/analytics';
-import { EventContext } from '@elastic/analytics';
-import { EventType } from '@elastic/analytics';
-import { EventTypeOpts } from '@elastic/analytics';
+import { Event as Event_2 } from '@kbn/analytics-client';
+import { EventContext } from '@kbn/analytics-client';
+import { EventType } from '@kbn/analytics-client';
+import { EventTypeOpts } from '@kbn/analytics-client';
 import { History as History_2 } from 'history';
 import { Href } from 'history';
 import { IconType } from '@elastic/eui';
 import { IncomingHttpHeaders } from 'http';
-import { IShipper } from '@elastic/analytics';
+import { IShipper } from '@kbn/analytics-client';
 import { Location as Location_2 } from 'history';
 import { LocationDescriptorObject } from 'history';
 import { Logger } from '@kbn/logging';
@@ -40,20 +40,19 @@ import { LogMeta } from '@kbn/logging';
 import { MaybePromise } from '@kbn/utility-types';
 import { ObjectType } from '@kbn/config-schema';
 import { Observable } from 'rxjs';
-import { OptInConfig } from '@elastic/analytics';
+import { OptInConfig } from '@kbn/analytics-client';
 import { PackageInfo } from '@kbn/config';
 import { Path } from 'history';
 import { PeerCertificate } from 'tls';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { PublicUiSettingsParams as PublicUiSettingsParams_2 } from 'src/core/server/types';
 import { default as React_2 } from 'react';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { Request as Request_2 } from '@hapi/hapi';
 import * as Rx from 'rxjs';
 import { SchemaTypeError } from '@kbn/config-schema';
-import { ShipperClassConstructor } from '@elastic/analytics';
-import { TelemetryCounter } from '@elastic/analytics';
-import { TelemetryCounterType } from '@elastic/analytics';
+import { ShipperClassConstructor } from '@kbn/analytics-client';
+import { TelemetryCounter } from '@kbn/analytics-client';
+import { TelemetryCounterType } from '@kbn/analytics-client';
 import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 import { TransitionPromptHook } from 'history';
 import { Type } from '@kbn/config-schema';
@@ -61,7 +60,6 @@ import { TypeOf } from '@kbn/config-schema';
 import { UiCounterMetricType } from '@kbn/analytics';
 import { UnregisterCallback } from 'history';
 import { URL as URL_2 } from 'url';
-import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/types';
 
 // @internal (undocumented)
 export function __kbnBootstrap__(): Promise<void>;
@@ -782,7 +780,7 @@ export type IToasts = Pick<ToastsApi, 'get$' | 'add' | 'remove' | 'addSuccess' |
 export interface IUiSettingsClient {
     get$: <T = any>(key: string, defaultOverride?: T) => Observable<T>;
     get: <T = any>(key: string, defaultOverride?: T) => T;
-    getAll: () => Readonly<Record<string, PublicUiSettingsParams_2 & UserProvidedValues_2>>;
+    getAll: () => Readonly<Record<string, PublicUiSettingsParams & UserProvidedValues>>;
     getUpdate$: <T = any>() => Observable<{
         key: string;
         newValue: T;
@@ -1091,8 +1089,10 @@ export interface SavedObjectReferenceWithContext {
         name: string;
     }>;
     isMissing?: boolean;
+    originId?: string;
     spaces: string[];
     spacesWithMatchingAliases?: string[];
+    spacesWithMatchingOrigins?: string[];
     type: string;
 }
 
@@ -1568,7 +1568,7 @@ export interface UiSettingsParams<T = unknown> {
 // @public (undocumented)
 export interface UiSettingsState {
     // (undocumented)
-    [key: string]: PublicUiSettingsParams_2 & UserProvidedValues_2;
+    [key: string]: PublicUiSettingsParams & UserProvidedValues;
 }
 
 // @public
diff --git a/src/core/public/saved_objects/saved_objects_service.ts b/src/core/public/saved_objects/saved_objects_service.ts
index 010cd9ca5701d..457b81f92a7e5 100644
--- a/src/core/public/saved_objects/saved_objects_service.ts
+++ b/src/core/public/saved_objects/saved_objects_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreService } from 'src/core/types';
-import { CoreStart } from 'src/core/public';
+import { CoreService } from '../../types';
+import { CoreStart } from '..';
 import { SavedObjectsClient, SavedObjectsClientContract } from './saved_objects_client';
 
 /**
diff --git a/src/core/public/types.ts b/src/core/public/types.ts
index 30f24a00daba8..5b594373e3523 100644
--- a/src/core/public/types.ts
+++ b/src/core/public/types.ts
@@ -11,7 +11,7 @@ export type {
   PublicUiSettingsParams,
   UserProvidedValues,
   UiSettingsType,
-} from '../../core/types';
+} from '../types';
 
 /**
  * A function that should mount DOM content inside the provided container element
diff --git a/src/core/public/ui_settings/types.ts b/src/core/public/ui_settings/types.ts
index 77c1feb25b6bc..243ac82ed14ab 100644
--- a/src/core/public/ui_settings/types.ts
+++ b/src/core/public/ui_settings/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { PublicUiSettingsParams, UserProvidedValues } from 'src/core/server/types';
+import { PublicUiSettingsParams, UserProvidedValues } from '../../server/types';
 
 /** @public */
 export interface UiSettingsState {
diff --git a/src/core/public/ui_settings/ui_settings_client.ts b/src/core/public/ui_settings/ui_settings_client.ts
index ee5d5da8d29b9..979f6be5ebe2c 100644
--- a/src/core/public/ui_settings/ui_settings_client.ts
+++ b/src/core/public/ui_settings/ui_settings_client.ts
@@ -10,7 +10,7 @@ import { cloneDeep, defaultsDeep } from 'lodash';
 import { Observable, Subject, concat, defer, of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { UserProvidedValues, PublicUiSettingsParams } from 'src/core/server/types';
+import { UserProvidedValues, PublicUiSettingsParams } from '../../server/types';
 import { IUiSettingsClient, UiSettingsState } from './types';
 
 import { UiSettingsApi } from './ui_settings_api';
diff --git a/src/core/public/ui_settings/ui_settings_service.mock.ts b/src/core/public/ui_settings/ui_settings_service.mock.ts
index 72f03be415475..d0633c4fca1fc 100644
--- a/src/core/public/ui_settings/ui_settings_service.mock.ts
+++ b/src/core/public/ui_settings/ui_settings_service.mock.ts
@@ -8,7 +8,7 @@
 
 import * as Rx from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { UiSettingsService } from './';
+import { UiSettingsService } from '.';
 import { IUiSettingsClient } from './types';
 
 const createSetupContractMock = () => {
diff --git a/src/core/server/analytics/analytics_service.ts b/src/core/server/analytics/analytics_service.ts
index 1d3d5e88f64a2..4262a966ceb10 100644
--- a/src/core/server/analytics/analytics_service.ts
+++ b/src/core/server/analytics/analytics_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { AnalyticsClient } from '@elastic/analytics';
-import { createAnalytics } from '@elastic/analytics';
+import type { AnalyticsClient } from '@kbn/analytics-client';
+import { createAnalytics } from '@kbn/analytics-client';
 import type { CoreContext } from '../core_context';
 
 /**
diff --git a/src/core/server/analytics/index.ts b/src/core/server/analytics/index.ts
index 854859cba2406..8a2f08d65bf9e 100644
--- a/src/core/server/analytics/index.ts
+++ b/src/core/server/analytics/index.ts
@@ -24,6 +24,6 @@ export type {
   OptInConfig,
   ContextProviderOpts,
   TelemetryCounter,
-} from '@elastic/analytics';
+} from '@kbn/analytics-client';
 
-export { TelemetryCounterType } from '@elastic/analytics';
+export { TelemetryCounterType } from '@kbn/analytics-client';
diff --git a/src/core/server/context/container/context.test.ts b/src/core/server/context/container/context.test.ts
index 25fab2e3f0bfb..17a04531dedd1 100644
--- a/src/core/server/context/container/context.test.ts
+++ b/src/core/server/context/container/context.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { ContextContainer } from './context';
-import { PluginOpaqueId } from '../..';
+import type { PluginOpaqueId, RequestHandlerContextBase } from '../..';
 import { httpServerMock } from '../../http/http_server.mocks';
 
 const pluginA = Symbol('pluginA');
@@ -22,7 +22,7 @@ const plugins: ReadonlyMap<PluginOpaqueId, PluginOpaqueId[]> = new Map([
 ]);
 const coreId = Symbol();
 
-interface MyContext {
+interface MyContext extends RequestHandlerContextBase {
   core: any;
   core1: string;
   core2: number;
@@ -32,31 +32,47 @@ interface MyContext {
   ctxFromD: object;
 }
 
+type TestContext<T> = T & RequestHandlerContextBase;
+
 describe('ContextContainer', () => {
-  it('does not allow the same context to be registered twice', () => {
-    const contextContainer = new ContextContainer(plugins, coreId);
-    contextContainer.registerContext<{ ctxFromA: string; core: any }, 'ctxFromA'>(
-      coreId,
-      'ctxFromA',
-      () => 'aString'
-    );
-
-    expect(() =>
-      contextContainer.registerContext<{ ctxFromA: string; core: any }, 'ctxFromA'>(
+  describe('registerContext', () => {
+    it('throws an error if the same context is registered twice', () => {
+      const contextContainer = new ContextContainer(plugins, coreId);
+      contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
         coreId,
         'ctxFromA',
         () => 'aString'
-      )
-    ).toThrowErrorMatchingInlineSnapshot(
-      `"Context provider for ctxFromA has already been registered."`
-    );
-  });
+      );
+
+      expect(() =>
+        contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
+          coreId,
+          'ctxFromA',
+          () => 'aString'
+        )
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Context provider for ctxFromA has already been registered."`
+      );
+    });
+
+    it('throws an error if a `resolve` context is registered', () => {
+      const contextContainer = new ContextContainer(plugins, coreId);
+      expect(() =>
+        contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
+          coreId,
+          // @ts-expect-error protected with typing too
+          'resolve',
+          () => 'aString'
+        )
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Cannot register a provider for resolve, it is a reserved keyword."`
+      );
+    });
 
-  describe('registerContext', () => {
     it('throws error if called with an unknown symbol', async () => {
       const contextContainer = new ContextContainer(plugins, coreId);
       await expect(() =>
-        contextContainer.registerContext<{ ctxFromA: string; core: any }, 'ctxFromA'>(
+        contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
           Symbol('unknown'),
           'ctxFromA',
           jest.fn()
@@ -69,7 +85,7 @@ describe('ContextContainer', () => {
     it('reports a TS error if returned contract does not satisfy the Context interface', async () => {
       const contextContainer = new ContextContainer(plugins, coreId);
       await expect(() =>
-        contextContainer.registerContext<{ ctxFromA: string; core: any }, 'ctxFromA'>(
+        contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
           pluginA,
           'ctxFromA',
           // @ts-expect-error expected string, returned number
@@ -82,7 +98,7 @@ describe('ContextContainer', () => {
       const contextContainer = new ContextContainer(plugins, coreId);
       await expect(() =>
         // @ts-expect-error expects ctxFromB, but given ctxFromC
-        contextContainer.registerContext<{ ctxFromB: string; core: any }, 'ctxFromC'>(
+        contextContainer.registerContext<TestContext<{ ctxFromB: string; core: any }>, 'ctxFromC'>(
           pluginB,
           'ctxFromC',
           async () => 1
@@ -92,39 +108,216 @@ describe('ContextContainer', () => {
   });
 
   describe('context building', () => {
+    const resolveAllContexts = async (ctx: Record<string, any>): Promise<unknown> => {
+      const resolved = {} as Record<string, any>;
+      for (const key of Object.getOwnPropertyNames(ctx)) {
+        if (key === 'resolve') {
+          continue;
+        }
+        resolved[key] = await ctx[key];
+      }
+      return resolved;
+    };
+
+    it('lazily loads the providers when accessed', async () => {
+      const contextContainer = new ContextContainer(plugins, coreId);
+
+      const core1provider = jest.fn().mockReturnValue('core1');
+      const ctxFromAProvider = jest.fn().mockReturnValue('ctxFromA');
+
+      contextContainer.registerContext<TestContext<{ core1: string; core: any }>, 'core1'>(
+        coreId,
+        'core1',
+        core1provider
+      );
+
+      contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
+        pluginA,
+        'ctxFromA',
+        ctxFromAProvider
+      );
+
+      let context: any;
+      const rawHandler1 = jest.fn((ctx) => {
+        context = ctx;
+        return 'rawHandler1' as any;
+      });
+      const handler1 = contextContainer.createHandler(pluginC, rawHandler1);
+
+      const request = httpServerMock.createKibanaRequest();
+      const response = httpServerMock.createResponseFactory();
+      await handler1(request, response);
+
+      expect(core1provider).not.toHaveBeenCalled();
+      expect(ctxFromAProvider).not.toHaveBeenCalled();
+
+      await context!.core1;
+
+      expect(core1provider).toHaveBeenCalledTimes(1);
+      expect(ctxFromAProvider).not.toHaveBeenCalled();
+
+      await context!.ctxFromA;
+
+      expect(core1provider).toHaveBeenCalledTimes(1);
+      expect(ctxFromAProvider).toHaveBeenCalledTimes(1);
+    });
+
+    it(`does not eagerly loads a provider's dependencies`, async () => {
+      const contextContainer = new ContextContainer(plugins, coreId);
+
+      const core1provider = jest.fn().mockReturnValue('core1');
+      const ctxFromAProvider = jest.fn().mockReturnValue('ctxFromA');
+
+      contextContainer.registerContext<TestContext<{ core1: string; core: any }>, 'core1'>(
+        coreId,
+        'core1',
+        core1provider
+      );
+
+      contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
+        pluginA,
+        'ctxFromA',
+        ctxFromAProvider
+      );
+
+      let context: any;
+      const rawHandler1 = jest.fn((ctx) => {
+        context = ctx;
+        return 'rawHandler1' as any;
+      });
+      const handler1 = contextContainer.createHandler(pluginC, rawHandler1);
+
+      const request = httpServerMock.createKibanaRequest();
+      const response = httpServerMock.createResponseFactory();
+      await handler1(request, response);
+
+      expect(core1provider).not.toHaveBeenCalled();
+      expect(ctxFromAProvider).not.toHaveBeenCalled();
+
+      await context!.ctxFromA;
+
+      expect(core1provider).not.toHaveBeenCalled();
+      expect(ctxFromAProvider).toHaveBeenCalledTimes(1);
+    });
+
+    it(`allows to load a dependency from a provider`, async () => {
+      const contextContainer = new ContextContainer(plugins, coreId);
+
+      const core1provider = jest.fn().mockReturnValue('core1');
+      const ctxFromAProvider = jest.fn().mockImplementation(async (ctx: any) => {
+        const core1 = await ctx.core1;
+        return `${core1}-ctxFromA`;
+      });
+
+      contextContainer.registerContext<TestContext<{ core1: string; core: any }>, 'core1'>(
+        coreId,
+        'core1',
+        core1provider
+      );
+
+      contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
+        pluginA,
+        'ctxFromA',
+        ctxFromAProvider
+      );
+
+      let context: any;
+      const rawHandler1 = jest.fn((ctx) => {
+        context = ctx;
+        return 'rawHandler1' as any;
+      });
+      const handler1 = contextContainer.createHandler(pluginC, rawHandler1);
+
+      const request = httpServerMock.createKibanaRequest();
+      const response = httpServerMock.createResponseFactory();
+      await handler1(request, response);
+
+      expect(core1provider).not.toHaveBeenCalled();
+      expect(ctxFromAProvider).not.toHaveBeenCalled();
+
+      const contextValue = await context!.ctxFromA;
+
+      expect(contextValue).toEqual('core1-ctxFromA');
+      expect(core1provider).toHaveBeenCalledTimes(1);
+      expect(ctxFromAProvider).toHaveBeenCalledTimes(1);
+    });
+
+    it(`only calls a provider once and caches the returned value`, async () => {
+      const contextContainer = new ContextContainer(plugins, coreId);
+
+      const core1provider = jest.fn().mockReturnValue('core1');
+      const ctxFromAProvider = jest.fn().mockImplementation(async (ctx: any) => {
+        const core1 = await ctx.core1;
+        return `${core1}-ctxFromA`;
+      });
+
+      contextContainer.registerContext<TestContext<{ core1: string; core: any }>, 'core1'>(
+        coreId,
+        'core1',
+        core1provider
+      );
+
+      contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
+        pluginA,
+        'ctxFromA',
+        ctxFromAProvider
+      );
+
+      let context: any;
+      const rawHandler1 = jest.fn((ctx) => {
+        context = ctx;
+        return 'rawHandler1' as any;
+      });
+      const handler1 = contextContainer.createHandler(pluginC, rawHandler1);
+
+      const request = httpServerMock.createKibanaRequest();
+      const response = httpServerMock.createResponseFactory();
+      await handler1(request, response);
+
+      expect(core1provider).not.toHaveBeenCalled();
+      expect(ctxFromAProvider).not.toHaveBeenCalled();
+
+      await context!.core1;
+      await context!.ctxFromA;
+      await context!.core1;
+
+      expect(core1provider).toHaveBeenCalledTimes(1);
+      expect(ctxFromAProvider).toHaveBeenCalledTimes(1);
+    });
+
     it('resolves dependencies', async () => {
       const contextContainer = new ContextContainer(plugins, coreId);
-      expect.assertions(8);
-      contextContainer.registerContext<{ core1: string; core: any }, 'core1'>(
+      expect.assertions(10);
+      contextContainer.registerContext<TestContext<{ core1: string; core: any }>, 'core1'>(
         coreId,
         'core1',
-        (context) => {
-          expect(context).toEqual({});
+        async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({});
           return 'core';
         }
       );
 
-      contextContainer.registerContext<{ ctxFromA: string; core: any }, 'ctxFromA'>(
+      contextContainer.registerContext<TestContext<{ ctxFromA: string; core: any }>, 'ctxFromA'>(
         pluginA,
         'ctxFromA',
-        (context) => {
-          expect(context).toEqual({ core1: 'core' });
+        async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({ core1: 'core' });
           return 'aString';
         }
       );
-      contextContainer.registerContext<{ ctxFromB: number; core: any }, 'ctxFromB'>(
+      contextContainer.registerContext<TestContext<{ ctxFromB: number; core: any }>, 'ctxFromB'>(
         pluginB,
         'ctxFromB',
-        (context) => {
-          expect(context).toEqual({ core1: 'core', ctxFromA: 'aString' });
+        async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({ core1: 'core', ctxFromA: 'aString' });
           return 299;
         }
       );
-      contextContainer.registerContext<{ ctxFromC: boolean; core: any }, 'ctxFromC'>(
+      contextContainer.registerContext<TestContext<{ ctxFromC: boolean; core: any }>, 'ctxFromC'>(
         pluginC,
         'ctxFromC',
-        (context) => {
-          expect(context).toEqual({
+        async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({
             core1: 'core',
             ctxFromA: 'aString',
             ctxFromB: 299,
@@ -132,19 +325,34 @@ describe('ContextContainer', () => {
           return false;
         }
       );
-      contextContainer.registerContext<{ ctxFromD: {}; core: any }, 'ctxFromD'>(
+      contextContainer.registerContext<TestContext<{ ctxFromD: {}; core: any }>, 'ctxFromD'>(
         pluginD,
         'ctxFromD',
-        (context) => {
-          expect(context).toEqual({ core1: 'core' });
+        async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({ core1: 'core' });
           return {};
         }
       );
 
-      const rawHandler1 = jest.fn(() => 'handler1' as any);
+      const rawHandler1 = jest.fn(async (context) => {
+        expect(await resolveAllContexts(context)).toEqual({
+          core1: 'core',
+          ctxFromA: 'aString',
+          ctxFromB: 299,
+          ctxFromC: false,
+        });
+        return 'handler1' as any;
+      });
       const handler1 = contextContainer.createHandler(pluginC, rawHandler1);
 
-      const rawHandler2 = jest.fn(() => 'handler2' as any);
+      const rawHandler2 = jest.fn(async (context) => {
+        expect(await resolveAllContexts(context)).toEqual({
+          core1: 'core',
+          ctxFromD: {},
+        });
+        return 'handler2' as any;
+      });
+
       const handler2 = contextContainer.createHandler(pluginD, rawHandler2);
 
       const request = httpServerMock.createKibanaRequest();
@@ -154,41 +362,25 @@ describe('ContextContainer', () => {
       await handler2(request, response);
 
       // Should have context from pluginC, its deps, and core
-      expect(rawHandler1).toHaveBeenCalledWith(
-        {
-          core1: 'core',
-          ctxFromA: 'aString',
-          ctxFromB: 299,
-          ctxFromC: false,
-        },
-        request,
-        response
-      );
+      expect(rawHandler1).toHaveBeenCalledWith(expect.any(Object), request, response);
 
       // Should have context from pluginD, and core
-      expect(rawHandler2).toHaveBeenCalledWith(
-        {
-          core1: 'core',
-          ctxFromD: {},
-        },
-        request,
-        response
-      );
+      expect(rawHandler2).toHaveBeenCalledWith(expect.any(Object), request, response);
     });
 
     it('exposes all core context to all providers regardless of registration order', async () => {
-      expect.assertions(4);
+      expect.assertions(5);
 
       const contextContainer = new ContextContainer(plugins, coreId);
       contextContainer
-        .registerContext<MyContext, 'ctxFromA'>(pluginA, 'ctxFromA', (context) => {
-          expect(context).toEqual({ core1: 'core', core2: 101 });
-          return `aString ${context.core1} ${context.core2}`;
+        .registerContext<MyContext, 'ctxFromA'>(pluginA, 'ctxFromA', async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({ core1: 'core', core2: 101 });
+          return `aString ${await context.core1} ${await context.core2}`;
         })
         .registerContext<MyContext, 'core1'>(coreId, 'core1', () => 'core')
         .registerContext<MyContext, 'core2'>(coreId, 'core2', () => 101)
-        .registerContext<MyContext, 'ctxFromB'>(pluginB, 'ctxFromB', (context) => {
-          expect(context).toEqual({
+        .registerContext<MyContext, 'ctxFromB'>(pluginB, 'ctxFromB', async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({
             core1: 'core',
             core2: 101,
             ctxFromA: 'aString core 101',
@@ -196,40 +388,45 @@ describe('ContextContainer', () => {
           return 277;
         });
 
-      const rawHandler1 = jest.fn(() => 'handler1' as any);
+      const rawHandler1 = jest.fn(async (context) => {
+        expect(await resolveAllContexts(context)).toEqual({
+          core1: 'core',
+          core2: 101,
+          ctxFromA: 'aString core 101',
+          ctxFromB: 277,
+        });
+        return 'handler1' as any;
+      });
       const handler1 = contextContainer.createHandler(pluginB, rawHandler1);
 
       const request = httpServerMock.createKibanaRequest();
       const response = httpServerMock.createResponseFactory();
       expect(await handler1(request, response)).toEqual('handler1');
 
-      expect(rawHandler1).toHaveBeenCalledWith(
-        {
-          core1: 'core',
-          core2: 101,
-          ctxFromA: 'aString core 101',
-          ctxFromB: 277,
-        },
-        request,
-        response
-      );
+      expect(rawHandler1).toHaveBeenCalledWith(expect.any(Object), request, response);
     });
 
     it('exposes all core context to core providers', async () => {
-      expect.assertions(4);
+      expect.assertions(5);
       const contextContainer = new ContextContainer(plugins, coreId);
 
       contextContainer
-        .registerContext<MyContext, 'core1'>(coreId, 'core1', (context) => {
-          expect(context).toEqual({});
+        .registerContext<MyContext, 'core1'>(coreId, 'core1', async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({});
           return 'core';
         })
-        .registerContext<MyContext, 'core2'>(coreId, 'core2', (context) => {
-          expect(context).toEqual({ core1: 'core' });
+        .registerContext<MyContext, 'core2'>(coreId, 'core2', async (context) => {
+          expect(await resolveAllContexts(context)).toEqual({ core1: 'core' });
           return 101;
         });
 
-      const rawHandler1 = jest.fn(() => 'handler1' as any);
+      const rawHandler1 = jest.fn(async (context) => {
+        expect(await resolveAllContexts(context)).toEqual({
+          core1: 'core',
+          core2: 101,
+        });
+        return 'handler1' as any;
+      });
       const handler1 = contextContainer.createHandler(pluginA, rawHandler1);
 
       const request = httpServerMock.createKibanaRequest();
@@ -237,14 +434,7 @@ describe('ContextContainer', () => {
       expect(await handler1(request, response)).toEqual('handler1');
 
       // If no context is registered for pluginA, only core contexts should be exposed
-      expect(rawHandler1).toHaveBeenCalledWith(
-        {
-          core1: 'core',
-          core2: 101,
-        },
-        request,
-        response
-      );
+      expect(rawHandler1).toHaveBeenCalledWith(expect.any(Object), request, response);
     });
 
     it('does not expose plugin contexts to core handler', async () => {
@@ -254,24 +444,24 @@ describe('ContextContainer', () => {
         .registerContext<MyContext, 'core1'>(coreId, 'core1', (context) => 'core')
         .registerContext<MyContext, 'ctxFromA'>(pluginA, 'ctxFromA', (context) => 'aString');
 
-      const rawHandler1 = jest.fn(() => 'handler1' as any);
+      const rawHandler1 = jest.fn(async (context) => {
+        // pluginA context should not be present in a core handler
+        expect(await resolveAllContexts(context)).toEqual({
+          core1: 'core',
+        });
+        return 'handler1' as any;
+      });
       const handler1 = contextContainer.createHandler(coreId, rawHandler1);
 
       const request = httpServerMock.createKibanaRequest();
       const response = httpServerMock.createResponseFactory();
       expect(await handler1(request, response)).toEqual('handler1');
-      // pluginA context should not be present in a core handler
-      expect(rawHandler1).toHaveBeenCalledWith(
-        {
-          core1: 'core',
-        },
-        request,
-        response
-      );
+
+      expect(rawHandler1).toHaveBeenCalledWith(expect.any(Object), request, response);
     });
 
     it('passes additional arguments to providers', async () => {
-      expect.assertions(6);
+      expect.assertions(7);
       const contextContainer = new ContextContainer(plugins, coreId);
 
       const request = httpServerMock.createKibanaRequest();
@@ -292,19 +482,102 @@ describe('ContextContainer', () => {
         }
       );
 
-      const rawHandler1 = jest.fn(() => 'handler1' as any);
+      const rawHandler1 = jest.fn(async (context) => {
+        expect(await resolveAllContexts(context)).toEqual({
+          core1: 'core',
+          ctxFromB: 77,
+        });
+        return 'handler1' as any;
+      });
       const handler1 = contextContainer.createHandler(pluginD, rawHandler1);
 
       expect(await handler1(request, response)).toEqual('handler1');
 
-      expect(rawHandler1).toHaveBeenCalledWith(
-        {
-          core1: 'core',
-          ctxFromB: 77,
-        },
-        request,
-        response
-      );
+      expect(rawHandler1).toHaveBeenCalledWith(expect.any(Object), request, response);
+    });
+
+    describe('#resolve', () => {
+      it('resolves dependencies', async () => {
+        const contextContainer = new ContextContainer(plugins, coreId);
+        expect.assertions(10);
+        contextContainer.registerContext<MyContext, 'core1'>(coreId, 'core1', async (context) => {
+          expect(await context.resolve([])).toEqual({});
+          return 'core';
+        });
+
+        contextContainer.registerContext<MyContext, 'ctxFromA'>(
+          pluginA,
+          'ctxFromA',
+          async (context) => {
+            expect(await context.resolve(['core1'])).toEqual({ core1: 'core' });
+            return 'aString';
+          }
+        );
+        contextContainer.registerContext<MyContext, 'ctxFromB'>(
+          pluginB,
+          'ctxFromB',
+          async (context) => {
+            expect(await context.resolve(['core1', 'ctxFromA'])).toEqual({
+              core1: 'core',
+              ctxFromA: 'aString',
+            });
+            return 299;
+          }
+        );
+        contextContainer.registerContext<MyContext, 'ctxFromC'>(
+          pluginC,
+          'ctxFromC',
+          async (context) => {
+            expect(await context.resolve(['core1', 'ctxFromA', 'ctxFromB'])).toEqual({
+              core1: 'core',
+              ctxFromA: 'aString',
+              ctxFromB: 299,
+            });
+            return false;
+          }
+        );
+        contextContainer.registerContext<MyContext, 'ctxFromD'>(
+          pluginD,
+          'ctxFromD',
+          async (context) => {
+            expect(await context.resolve(['core1'])).toEqual({ core1: 'core' });
+            return {};
+          }
+        );
+
+        const rawHandler1 = jest.fn(async (context) => {
+          expect(await context.resolve(['core1', 'ctxFromA', 'ctxFromB', 'ctxFromC'])).toEqual({
+            core1: 'core',
+            ctxFromA: 'aString',
+            ctxFromB: 299,
+            ctxFromC: false,
+          });
+          return 'handler1' as any;
+        });
+        const handler1 = contextContainer.createHandler(pluginC, rawHandler1);
+
+        const rawHandler2 = jest.fn(async (context) => {
+          expect(await context.resolve(['core1', 'ctxFromD'])).toEqual({
+            core1: 'core',
+            ctxFromD: {},
+          });
+          return 'handler2' as any;
+        });
+
+        const handler2 = contextContainer.createHandler(pluginD, rawHandler2);
+
+        const request = httpServerMock.createKibanaRequest();
+        const response = httpServerMock.createResponseFactory();
+
+        await handler1(request, response);
+        await handler2(request, response);
+
+        // Should have context from pluginC, its deps, and core
+        expect(rawHandler1).toHaveBeenCalledWith(expect.any(Object), request, response);
+
+        // Should have context from pluginD, and core
+        expect(rawHandler2).toHaveBeenCalledWith(expect.any(Object), request, response);
+      });
     });
   });
 
@@ -337,7 +610,11 @@ describe('ContextContainer', () => {
       const request = httpServerMock.createKibanaRequest();
       const response = httpServerMock.createResponseFactory();
       await handler1(request, response);
-      expect(rawHandler1).toHaveBeenCalledWith({}, request, response);
+      expect(rawHandler1).toHaveBeenCalledWith(
+        { resolve: expect.any(Function) },
+        request,
+        response
+      );
     });
   });
 });
diff --git a/src/core/server/context/container/context.ts b/src/core/server/context/container/context.ts
index 2650c21853604..4bc9a70a7afbb 100644
--- a/src/core/server/context/container/context.ts
+++ b/src/core/server/context/container/context.ts
@@ -7,8 +7,7 @@
  */
 
 import { flatten } from 'lodash';
-import { ShallowPromise } from '@kbn/utility-types';
-import { pick } from 'lodash';
+import { ShallowPromise, MaybePromise } from '@kbn/utility-types';
 import type { CoreId, PluginOpaqueId, RequestHandler, RequestHandlerContext } from '../..';
 
 /**
@@ -31,7 +30,7 @@ export type IContextProvider<
   // context.core will always be available, but plugin contexts are typed as optional
   context: Omit<Context, ContextName>,
   ...rest: HandlerParameters<RequestHandler>
-) => Promise<Context[ContextName]> | Context[ContextName];
+) => MaybePromise<Awaited<Context[ContextName]>>;
 
 /**
  * A function that accepts a context object and an optional number of additional arguments. Used for the generic types
@@ -202,6 +201,9 @@ export class ContextContainer implements IContextContainer {
     provider: IContextProvider<Context, ContextName>
   ): this => {
     const contextName = name as string;
+    if (contextName === 'resolve') {
+      throw new Error(`Cannot register a provider for ${contextName}, it is a reserved keyword.`);
+    }
     if (this.contextProviders.has(contextName)) {
       throw new Error(`Context provider for ${contextName} has already been registered.`);
     }
@@ -224,36 +226,51 @@ export class ContextContainer implements IContextContainer {
     }
 
     return (async (...args: HandlerParameters<RequestHandler>) => {
-      const context = await this.buildContext(source, ...args);
+      const context = this.buildContext(source, ...args);
       return handler(context, ...args);
     }) as (
       ...args: HandlerParameters<RequestHandler>
     ) => ShallowPromise<ReturnType<RequestHandler>>;
   };
 
-  private async buildContext(
+  private buildContext(
     source: symbol,
     ...contextArgs: HandlerParameters<RequestHandler>
-  ): Promise<HandlerContextType<RequestHandler>> {
+  ): HandlerContextType<RequestHandler> {
     const contextsToBuild = new Set(this.getContextNamesForSource(source));
+    const builtContextPromises: Record<string, Promise<unknown>> = {};
+
+    const builtContext = {} as HandlerContextType<RequestHandler>;
+    (builtContext as unknown as RequestHandlerContext).resolve = async (keys) => {
+      const resolved = await Promise.all(
+        keys.map(async (key) => {
+          return [key, await builtContext[key]];
+        })
+      );
+      return Object.fromEntries(resolved);
+    };
 
     return [...this.contextProviders]
       .sort(sortByCoreFirst(this.coreId))
       .filter(([contextName]) => contextsToBuild.has(contextName))
-      .reduce(async (contextPromise, [contextName, { provider, source: providerSource }]) => {
-        const resolvedContext = await contextPromise;
-
-        // For the next provider, only expose the context available based on the dependencies of the plugin that
-        // registered that provider.
-        const exposedContext = pick(resolvedContext, [
-          ...this.getContextNamesForSource(providerSource),
-        ]);
+      .reduce((contextAccessors, [contextName, { provider, source: providerSource }]) => {
+        const exposedContext = createExposedContext({
+          currentContextName: contextName,
+          exposedContextNames: [...this.getContextNamesForSource(providerSource)],
+          contextAccessors,
+        });
+        Object.defineProperty(contextAccessors, contextName, {
+          get: async () => {
+            const contextKey = contextName as keyof HandlerContextType<RequestHandler>;
+            if (!builtContextPromises[contextKey]) {
+              builtContextPromises[contextKey] = provider(exposedContext, ...contextArgs);
+            }
+            return await builtContextPromises[contextKey];
+          },
+        });
 
-        return {
-          ...resolvedContext,
-          [contextName]: await provider(exposedContext, ...contextArgs),
-        };
-      }, Promise.resolve({}) as Promise<HandlerContextType<RequestHandler>>);
+        return contextAccessors;
+      }, builtContext);
   }
 
   private getContextNamesForSource(source: symbol): ReadonlySet<string> {
@@ -299,3 +316,28 @@ const sortByCoreFirst =
       return rightProvider.source === coreId ? 1 : 0;
     }
   };
+
+const createExposedContext = ({
+  currentContextName,
+  exposedContextNames,
+  contextAccessors,
+}: {
+  currentContextName: string;
+  exposedContextNames: string[];
+  contextAccessors: Partial<HandlerContextType<RequestHandler>>;
+}) => {
+  const exposedContext: Partial<HandlerContextType<RequestHandler>> = {};
+  exposedContext.resolve = contextAccessors.resolve;
+
+  for (const contextName of exposedContextNames) {
+    if (contextName === currentContextName) {
+      continue;
+    }
+    const descriptor = Object.getOwnPropertyDescriptor(contextAccessors, contextName);
+    if (descriptor) {
+      Object.defineProperty(exposedContext, contextName, descriptor);
+    }
+  }
+
+  return exposedContext;
+};
diff --git a/src/core/server/context/context_service.test.ts b/src/core/server/context/context_service.test.ts
index 8b5a784b1f8a1..ac16657fa40f4 100644
--- a/src/core/server/context/context_service.test.ts
+++ b/src/core/server/context/context_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginOpaqueId } from '../../server';
+import { PluginOpaqueId } from '..';
 import { MockContextConstructor } from './context_service.test.mocks';
 import { ContextService } from './context_service';
 import { CoreContext } from '../core_context';
diff --git a/src/core/server/context/context_service.ts b/src/core/server/context/context_service.ts
index b2948a4d59129..36f5d77a491e1 100644
--- a/src/core/server/context/context_service.ts
+++ b/src/core/server/context/context_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginOpaqueId } from '../../server';
+import { PluginOpaqueId } from '..';
 import { IContextContainer, ContextContainer } from './container';
 import { CoreContext } from '../core_context';
 
diff --git a/src/core/server/core_app/core_app.test.ts b/src/core/server/core_app/core_app.test.ts
index 6eb38bfaa8644..bdaf0bae3fa6e 100644
--- a/src/core/server/core_app/core_app.test.ts
+++ b/src/core/server/core_app/core_app.test.ts
@@ -15,7 +15,7 @@ import type { UiPlugins } from '../plugins';
 import { PluginType } from '../plugins';
 import { CoreApp } from './core_app';
 import { mockRouter } from '../http/router/router.mock';
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '..';
 
 const emptyPlugins = (): UiPlugins => ({
   internal: new Map(),
diff --git a/src/core/server/core_app/core_app.ts b/src/core/server/core_app/core_app.ts
index bd7de6b20226c..28c52775b2d20 100644
--- a/src/core/server/core_app/core_app.ts
+++ b/src/core/server/core_app/core_app.ts
@@ -89,7 +89,8 @@ export class CoreApp {
     const resources = coreSetup.httpResources.createRegistrar(router);
 
     router.get({ path: '/', validate: false }, async (context, req, res) => {
-      const defaultRoute = await context.core.uiSettings.client.get<string>('defaultRoute');
+      const { uiSettings } = await context.core;
+      const defaultRoute = await uiSettings.client.get<string>('defaultRoute');
       const basePath = httpSetup.basePath.get(req);
       const url = `${basePath}${defaultRoute}`;
 
diff --git a/src/core/server/core_usage_data/core_usage_data_service.test.ts b/src/core/server/core_usage_data/core_usage_data_service.test.ts
index d8fb91809bfc3..2dc1655a0f099 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.test.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.test.ts
@@ -10,7 +10,7 @@ import type { ConfigPath } from '@kbn/config';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-// eslint-disable-next-line @kbn/imports/no_unresolved_imports
+// eslint-disable-next-line @kbn/imports/no_unresolvable_imports
 import { HotObservable } from 'rxjs/internal/testing/HotObservable';
 
 import { configServiceMock } from '../config/mocks';
diff --git a/src/core/server/core_usage_data/core_usage_data_service.ts b/src/core/server/core_usage_data/core_usage_data_service.ts
index a74db26b984b6..5efb2b60ae4c4 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.ts
@@ -11,13 +11,13 @@ import { takeUntil } from 'rxjs/operators';
 import { get } from 'lodash';
 import { hasConfigPathIntersection, ChangedDeprecatedPaths } from '@kbn/config';
 
-import { CoreService } from 'src/core/types';
-import { Logger, SavedObjectsServiceStart, SavedObjectTypeRegistry } from 'src/core/server';
 import type {
   AggregationsMultiBucketAggregateBase,
   AggregationsSingleBucketAggregateBase,
   SearchTotalHits,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { CoreService } from '../../types';
+import { Logger, SavedObjectsServiceStart, SavedObjectTypeRegistry } from '..';
 import { CoreContext } from '../core_context';
 import { ElasticsearchConfigType } from '../elasticsearch/elasticsearch_config';
 import { HttpConfigType, InternalHttpServiceSetup } from '../http';
diff --git a/src/core/server/deprecations/routes/get.ts b/src/core/server/deprecations/routes/get.ts
index cce9369db6171..88965505488f9 100644
--- a/src/core/server/deprecations/routes/get.ts
+++ b/src/core/server/deprecations/routes/get.ts
@@ -15,7 +15,7 @@ export const registerGetRoute = (router: IRouter) => {
       validate: false,
     },
     async (context, req, res) => {
-      const deprecationsClient = context.core.deprecations.client;
+      const deprecationsClient = (await context.core).deprecations.client;
 
       const body: DeprecationsGetResponse = {
         deprecations: await deprecationsClient.getAllDeprecations(),
diff --git a/src/core/server/elasticsearch/client/configure_client.test.ts b/src/core/server/elasticsearch/client/configure_client.test.ts
index 31c64362f8a2b..b17b308294a20 100644
--- a/src/core/server/elasticsearch/client/configure_client.test.ts
+++ b/src/core/server/elasticsearch/client/configure_client.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-jest.mock('./log_query_and_deprecation.ts', () => ({
+jest.mock('./log_query_and_deprecation', () => ({
   __esModule: true,
   instrumentEsQueryAndDeprecationLogger: jest.fn(),
 }));
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
index 63b2233b06a96..3a8f3c459768d 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
@@ -7,7 +7,10 @@
  */
 
 export const mockReadFileSync = jest.fn();
-jest.mock('fs', () => ({ readFileSync: mockReadFileSync }));
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'),
+  readFileSync: mockReadFileSync,
+}));
 
 export const mockReadPkcs12Keystore = jest.fn();
 export const mockReadPkcs12Truststore = jest.fn();
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index 1baef038e313a..80bd52468fd7e 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -11,7 +11,7 @@ import { readPkcs12Keystore, readPkcs12Truststore } from '@kbn/crypto';
 import { i18n } from '@kbn/i18n';
 import { Duration } from 'moment';
 import { readFileSync } from 'fs';
-import { ConfigDeprecationProvider } from 'src/core/server';
+import { ConfigDeprecationProvider } from '..';
 import { ServiceConfigDescriptor } from '../internal_types';
 import { getReservedHeaders } from './default_headers';
 
diff --git a/src/core/server/elasticsearch/integration_tests/client.test.ts b/src/core/server/elasticsearch/integration_tests/client.test.ts
index 96a9d70d1b651..b3d4f7e631a98 100644
--- a/src/core/server/elasticsearch/integration_tests/client.test.ts
+++ b/src/core/server/elasticsearch/integration_tests/client.test.ts
@@ -68,7 +68,8 @@ function createFakeElasticsearchServer() {
   return server;
 }
 
-describe('fake elasticsearch', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/129754
+describe.skip('fake elasticsearch', () => {
   let esServer: http.Server;
   let kibanaServer: Root;
   let kibanaHttpServer: http.Server;
diff --git a/src/core/server/execution_context/integration_tests/tracing.test.ts b/src/core/server/execution_context/integration_tests/tracing.test.ts
index 15813529c358b..2634c81833735 100644
--- a/src/core/server/execution_context/integration_tests/tracing.test.ts
+++ b/src/core/server/execution_context/integration_tests/tracing.test.ts
@@ -65,10 +65,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asInternalUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asInternalUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -90,10 +88,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -115,10 +111,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asInternalUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asInternalUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -136,10 +130,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -157,7 +149,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asInternalUser.ping(
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asInternalUser.ping(
           {},
           {
             opaqueId: 'new-opaque-id',
@@ -203,10 +196,8 @@ describe('trace', () => {
 
         const router = createRouter('');
         router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-          const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-            {},
-            { meta: true }
-          );
+          const esClient = (await context.core).elasticsearch.client;
+          const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
           return res.ok({ body: headers || {} });
         });
 
@@ -229,10 +220,8 @@ describe('trace', () => {
         const router = createRouter('');
         router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
           executionContext.set(parentContext);
-          const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-            {},
-            { meta: true }
-          );
+          const esClient = (await context.core).elasticsearch.client;
+          const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
           return res.ok({
             body: {
               context: executionContext.get()?.toJSON(),
@@ -345,10 +334,8 @@ describe('trace', () => {
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
         executionContext.set(parentContext);
         await delay(id-- * 100);
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -397,10 +384,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -487,10 +472,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -511,10 +494,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asInternalUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asInternalUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -535,10 +516,8 @@ describe('trace', () => {
 
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -561,10 +540,8 @@ describe('trace', () => {
       const router = createRouter('');
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
         executionContext.set(parentContext);
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -593,10 +570,8 @@ describe('trace', () => {
       };
       router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
         executionContext.set(ctx);
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return res.ok({ body: headers || {} });
       });
 
@@ -663,9 +638,10 @@ describe('trace', () => {
           description: 'new-description',
         };
         router.get({ path: '/execution-context', validate: false }, async (context, req, res) => {
-          const { headers } = await executionContext.withContext(newContext, () =>
-            context.core.elasticsearch.client.asCurrentUser.ping({}, { meta: true })
-          );
+          const esClient = (await context.core).elasticsearch.client;
+          const { headers } = await executionContext.withContext(newContext, () => {
+            return esClient.asCurrentUser.ping({}, { meta: true });
+          });
           return res.ok({ body: headers || {} });
         });
 
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 1e26729545cbf..528e5399a1b62 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -25,7 +25,7 @@ import {
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { HttpServer } from './http_server';
 import { Readable } from 'stream';
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '..';
 import { KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import moment from 'moment';
 import { of } from 'rxjs';
diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts
index 58371899596be..3e238755eb398 100644
--- a/src/core/server/http/http_service.ts
+++ b/src/core/server/http/http_service.ts
@@ -10,7 +10,7 @@ import { Observable, Subscription, combineLatest, firstValueFrom } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { pick } from '@kbn/std';
 
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '..';
 import type { InternalExecutionContextSetup } from '../execution_context';
 import { CoreService } from '../../types';
 import { Logger } from '../logging';
diff --git a/src/core/server/http/integration_tests/cookie_session_storage.test.ts b/src/core/server/http/integration_tests/cookie_session_storage.test.ts
index 61da92a8ffdbd..56e93689555d8 100644
--- a/src/core/server/http/integration_tests/cookie_session_storage.test.ts
+++ b/src/core/server/http/integration_tests/cookie_session_storage.test.ts
@@ -14,7 +14,7 @@ import { BehaviorSubject } from 'rxjs';
 import { duration as momentDuration } from 'moment';
 
 import { CoreContext } from '../../core_context';
-import { HttpService } from './../http_service';
+import { HttpService } from '../http_service';
 import { Env } from '../../config';
 
 import { contextServiceMock } from '../../context/context_service.mock';
diff --git a/src/core/server/http/router/error_wrapper.test.ts b/src/core/server/http/router/error_wrapper.test.ts
index a25e9bb1df9bc..948aff8f32fee 100644
--- a/src/core/server/http/router/error_wrapper.test.ts
+++ b/src/core/server/http/router/error_wrapper.test.ts
@@ -9,7 +9,7 @@
 import Boom from '@hapi/boom';
 import { KibanaResponse, KibanaResponseFactory, kibanaResponseFactory } from './response';
 import { wrapErrors } from './error_wrapper';
-import { KibanaRequest, RequestHandler, RequestHandlerContext } from 'kibana/server';
+import { KibanaRequest, RequestHandler, RequestHandlerContext } from '../..';
 
 const createHandler =
   (handler: () => any): RequestHandler<any, any, any> =>
diff --git a/src/core/server/http/router/response.ts b/src/core/server/http/router/response.ts
index 331a1ab38f069..eebd0d0dd6eef 100644
--- a/src/core/server/http/router/response.ts
+++ b/src/core/server/http/router/response.ts
@@ -186,7 +186,7 @@ const errorResponseFactory = {
    * Creates an error response with defined status code and payload.
    * @param options - {@link CustomHttpResponseOptions} configures HTTP response headers, error message and other error details to pass to the client
    */
-  customError: (options: CustomHttpResponseOptions<ResponseError>) => {
+  customError: (options: CustomHttpResponseOptions<ResponseError | Buffer | Stream>) => {
     if (!options || !options.statusCode) {
       throw new Error(
         `options.statusCode is expected to be set. given options: ${options && options.statusCode}`
diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts
index be3b24d5d19a7..26cd28bd3d536 100644
--- a/src/core/server/http/router/router.ts
+++ b/src/core/server/http/router/router.ts
@@ -24,7 +24,7 @@ import {
 } from './response';
 import { RouteConfig, RouteConfigOptions, RouteMethod, validBodyOutput } from './route';
 import { HapiResponseAdapter } from './response_adapter';
-import { RequestHandlerContext } from '../../../server';
+import { RequestHandlerContext } from '../..';
 import { wrapErrors } from './error_wrapper';
 import { RouteValidator } from './validator';
 
diff --git a/src/core/server/http/router/validator/validator.test.ts b/src/core/server/http/router/validator/validator.test.ts
index b516d723edadc..7b82a68340194 100644
--- a/src/core/server/http/router/validator/validator.test.ts
+++ b/src/core/server/http/router/validator/validator.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RouteValidationError, RouteValidator } from './';
+import { RouteValidationError, RouteValidator } from '.';
 import { schema, Type } from '@kbn/config-schema';
 
 describe('Router validator', () => {
diff --git a/src/core/server/http/types.ts b/src/core/server/http/types.ts
index e6d9514107798..27f240af48e01 100644
--- a/src/core/server/http/types.ts
+++ b/src/core/server/http/types.ts
@@ -366,7 +366,7 @@ export interface HttpServiceSetup {
    */
   registerRouteHandlerContext: <
     Context extends RequestHandlerContext,
-    ContextName extends keyof Context
+    ContextName extends keyof Omit<Context, 'resolve'>
   >(
     contextName: ContextName,
     provider: RequestHandlerContextProvider<Context, ContextName>
@@ -393,7 +393,7 @@ export interface InternalHttpServiceSetup
   authRequestHeaders: IAuthHeadersStorage;
   registerRouteHandlerContext: <
     Context extends RequestHandlerContext,
-    ContextName extends keyof Context
+    ContextName extends keyof Omit<Context, 'resolve'>
   >(
     pluginOpaqueId: PluginOpaqueId,
     contextName: ContextName,
diff --git a/src/core/server/http_resources/http_resources_service.test.ts b/src/core/server/http_resources/http_resources_service.test.ts
index 00846ef541411..c74fde4d2e2a7 100644
--- a/src/core/server/http_resources/http_resources_service.test.ts
+++ b/src/core/server/http_resources/http_resources_service.test.ts
@@ -17,7 +17,7 @@ import { httpServerMock } from '../http/http_server.mocks';
 import { renderingMock } from '../rendering/rendering_service.mock';
 import { HttpResourcesService, PrebootDeps, SetupDeps } from './http_resources_service';
 import { httpResourcesMock } from './http_resources_service.mock';
-import { HttpResources } from 'kibana/server';
+import { HttpResources } from '..';
 
 const coreContext = mockCoreContext.create();
 
@@ -27,7 +27,7 @@ describe('HttpResources service', () => {
   let setupDeps: SetupDeps;
   let router: jest.Mocked<IRouter>;
   const kibanaRequest = httpServerMock.createKibanaRequest();
-  const context = { core: coreMock.createRequestHandlerContext() };
+  const context = coreMock.createCustomRequestHandlerContext({});
   const apmConfig = { mockApmConfig: true };
 
   beforeEach(() => {
@@ -71,7 +71,7 @@ describe('HttpResources service', () => {
             await routeHandler(context, kibanaRequest, responseFactory);
             expect(getDeps().rendering.render).toHaveBeenCalledWith(
               kibanaRequest,
-              context.core.uiSettings.client,
+              (await context.core).uiSettings.client,
               {
                 isAnonymousPage: false,
                 vars: {
@@ -117,7 +117,7 @@ describe('HttpResources service', () => {
             await routeHandler(context, kibanaRequest, responseFactory);
             expect(getDeps().rendering.render).toHaveBeenCalledWith(
               kibanaRequest,
-              context.core.uiSettings.client,
+              (await context.core).uiSettings.client,
               {
                 isAnonymousPage: true,
                 vars: {
diff --git a/src/core/server/http_resources/http_resources_service.ts b/src/core/server/http_resources/http_resources_service.ts
index 95610d36d4230..2d49cb17cf4c0 100644
--- a/src/core/server/http_resources/http_resources_service.ts
+++ b/src/core/server/http_resources/http_resources_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RequestHandlerContext } from 'src/core/server';
+import { RequestHandlerContext } from '..';
 
 import { CoreContext } from '../core_context';
 import {
@@ -93,7 +93,8 @@ export class HttpResourcesService implements CoreService<InternalHttpResourcesSe
     return {
       async renderCoreApp(options: HttpResourcesRenderOptions = {}) {
         const apmConfig = getApmConfig(request.url.pathname);
-        const body = await deps.rendering.render(request, context.core.uiSettings.client, {
+        const { uiSettings } = await context.core;
+        const body = await deps.rendering.render(request, uiSettings.client, {
           isAnonymousPage: false,
           vars: {
             apmConfig,
@@ -108,7 +109,8 @@ export class HttpResourcesService implements CoreService<InternalHttpResourcesSe
       },
       async renderAnonymousCoreApp(options: HttpResourcesRenderOptions = {}) {
         const apmConfig = getApmConfig(request.url.pathname);
-        const body = await deps.rendering.render(request, context.core.uiSettings.client, {
+        const { uiSettings } = await context.core;
+        const body = await deps.rendering.render(request, uiSettings.client, {
           isAnonymousPage: true,
           vars: {
             apmConfig,
diff --git a/src/core/server/http_resources/types.ts b/src/core/server/http_resources/types.ts
index b85635cb98247..a7f476454c4d5 100644
--- a/src/core/server/http_resources/types.ts
+++ b/src/core/server/http_resources/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '..';
 import type {
   IRouter,
   RouteConfig,
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index b23fffee71373..d7669b70fde93 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -28,6 +28,7 @@
  * @packageDocumentation
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { Type } from '@kbn/config-schema';
 import {
   ElasticsearchServiceSetup,
@@ -465,8 +466,39 @@ export type {
 } from './analytics';
 export { TelemetryCounterType } from './analytics';
 
+/** @public **/
+export interface RequestHandlerContextBase {
+  /**
+   * Await all the specified context parts and return them.
+   *
+   * @example
+   * ```ts
+   * const resolved = await context.resolve(['core', 'pluginA']);
+   * const esClient = resolved.core.elasticsearch.client;
+   * const pluginAService = resolved.pluginA.someService;
+   * ```
+   */
+  resolve: <T extends keyof Omit<this, 'resolve'>>(
+    parts: T[]
+  ) => Promise<AwaitedProperties<Pick<this, T>>>;
+}
+
 /**
- * Plugin specific context passed to a route handler.
+ * Base context passed to a route handler.
+ *
+ * @public
+ */
+export interface RequestHandlerContext extends RequestHandlerContextBase {
+  core: Promise<CoreRequestHandlerContext>;
+}
+
+/** @public */
+export type CustomRequestHandlerContext<T> = RequestHandlerContext & {
+  [Key in keyof T]: T[Key] extends Promise<unknown> ? T[Key] : Promise<T[Key]>;
+};
+
+/**
+ * The `core` context provided to route handler.
  *
  * Provides the following clients and services:
  *    - {@link SavedObjectsClient | savedObjects.client} - Saved Objects client
@@ -477,27 +509,24 @@ export { TelemetryCounterType } from './analytics';
  *      data 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: {
-    savedObjects: {
-      client: SavedObjectsClientContract;
-      typeRegistry: ISavedObjectTypeRegistry;
-      getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
-      getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
-      getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
-    };
-    elasticsearch: {
-      client: IScopedClusterClient;
-    };
-    uiSettings: {
-      client: IUiSettingsClient;
-    };
-    deprecations: {
-      client: DeprecationsClient;
-    };
+export interface CoreRequestHandlerContext {
+  savedObjects: {
+    client: SavedObjectsClientContract;
+    typeRegistry: ISavedObjectTypeRegistry;
+    getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
+    getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
+    getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
+  };
+  elasticsearch: {
+    client: IScopedClusterClient;
+  };
+  uiSettings: {
+    client: IUiSettingsClient;
+  };
+  deprecations: {
+    client: DeprecationsClient;
   };
 }
 
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 0e5821bcc1c23..cb7010808fe32 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -9,6 +9,7 @@
 import { of } from 'rxjs';
 import { duration } from 'moment';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { isPromise } from '@kbn/std';
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import type {
   PluginInitializerContext,
@@ -66,7 +67,11 @@ export { executionContextServiceMock } from './execution_context/execution_conte
 export { docLinksServiceMock } from './doc_links/doc_links_service.mock';
 export { analyticsServiceMock } from './analytics/analytics_service.mock';
 
-export type { ElasticsearchClientMock } from './elasticsearch/client/mocks';
+export type {
+  ElasticsearchClientMock,
+  ClusterClientMock,
+  ScopedClusterClientMock,
+} from './elasticsearch/client/mocks';
 
 type MockedPluginInitializerConfig<T> = jest.Mocked<PluginInitializerContext<T>['config']>;
 
@@ -280,6 +285,40 @@ function createCoreRequestHandlerContextMock() {
   };
 }
 
+export type CustomRequestHandlerMock<T> = {
+  core: Promise<ReturnType<typeof createCoreRequestHandlerContextMock>>;
+  resolve: jest.MockedFunction<any>;
+} & {
+  [Key in keyof T]: T[Key] extends Promise<unknown> ? T[Key] : Promise<T[Key]>;
+};
+
+const createCustomRequestHandlerContextMock = <T>(contextParts: T): CustomRequestHandlerMock<T> => {
+  const mock = Object.entries(contextParts).reduce(
+    (context, [key, value]) => {
+      // @ts-expect-error type matching from inferred types is hard
+      context[key] = isPromise(value) ? value : Promise.resolve(value);
+      return context;
+    },
+    {
+      core: Promise.resolve(createCoreRequestHandlerContextMock()),
+    } as CustomRequestHandlerMock<T>
+  );
+
+  mock.resolve = jest.fn().mockImplementation(async () => {
+    const resolved = {};
+    for (const propName of Object.keys(mock)) {
+      if (propName === 'resolve') {
+        continue;
+      }
+      // @ts-expect-error type matching from inferred types is hard
+      resolved[propName] = await mock[propName];
+    }
+    return resolved;
+  });
+
+  return mock;
+};
+
 export const coreMock = {
   createPreboot: createCorePrebootMock,
   createSetup: createCoreSetupMock,
@@ -289,4 +328,5 @@ export const coreMock = {
   createInternalStart: createInternalCoreStartMock,
   createPluginInitializerContext: pluginInitializerContextMock,
   createRequestHandlerContext: createCoreRequestHandlerContextMock,
+  createCustomRequestHandlerContext: createCustomRequestHandlerContextMock,
 };
diff --git a/src/core/server/plugins/plugin.test.ts b/src/core/server/plugins/plugin.test.ts
index 92cbda2a69cfe..41718d22fd50a 100644
--- a/src/core/server/plugins/plugin.test.ts
+++ b/src/core/server/plugins/plugin.test.ts
@@ -467,7 +467,7 @@ describe('#getConfigSchema()', () => {
       schema: pluginSchema,
     };
     jest.doMock(
-      'plugin-with-schema/server',
+      join('plugin-with-schema', 'server'),
       () => ({
         config: configDescriptor,
       }),
@@ -491,7 +491,7 @@ describe('#getConfigSchema()', () => {
   });
 
   it('returns null if config definition not specified', () => {
-    jest.doMock('plugin-with-no-definition/server', () => ({}), { virtual: true });
+    jest.doMock(join('plugin-with-no-definition', 'server'), () => ({}), { virtual: true });
     const manifest = createPluginManifest();
     const opaqueId = Symbol();
     const plugin = new PluginWrapper({
@@ -527,7 +527,7 @@ describe('#getConfigSchema()', () => {
 
   it('throws if plugin contains invalid schema', () => {
     jest.doMock(
-      'plugin-invalid-schema/server',
+      join('plugin-invalid-schema', 'server'),
       () => ({
         config: {
           schema: {
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index 4272a9767b90e..81e3b3a107c72 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -7,7 +7,7 @@
  */
 
 import { shareReplay } from 'rxjs/operators';
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '..';
 import { CoreContext } from '../core_context';
 import { PluginWrapper } from './plugin';
 import {
@@ -185,7 +185,7 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       createCookieSessionStorageFactory: deps.http.createCookieSessionStorageFactory,
       registerRouteHandlerContext: <
         Context extends RequestHandlerContext,
-        ContextName extends keyof Context
+        ContextName extends keyof Omit<Context, 'resolve'>
       >(
         contextName: ContextName,
         provider: RequestHandlerContextProvider<Context, ContextName>
diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts
index 7c6938bdde224..e22a6f09edd18 100644
--- a/src/core/server/plugins/plugins_service.test.ts
+++ b/src/core/server/plugins/plugins_service.test.ts
@@ -11,7 +11,7 @@ import { mockDiscover, mockPackage } from './plugins_service.test.mocks';
 import { resolve, join } from 'path';
 import { BehaviorSubject, from } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { ConfigPath, ConfigService, Env } from '../config';
diff --git a/src/core/server/rendering/bootstrap/register_bootstrap_route.ts b/src/core/server/rendering/bootstrap/register_bootstrap_route.ts
index 6be537dce1981..06f4100a01576 100644
--- a/src/core/server/rendering/bootstrap/register_bootstrap_route.ts
+++ b/src/core/server/rendering/bootstrap/register_bootstrap_route.ts
@@ -25,7 +25,7 @@ export const registerBootstrapRoute = ({
       validate: false,
     },
     async (ctx, req, res) => {
-      const uiSettingsClient = ctx.core.uiSettings.client;
+      const uiSettingsClient = (await ctx.core).uiSettings.client;
       const { body, etag } = await renderer({ uiSettingsClient, request: req });
 
       return res.ok({
@@ -48,7 +48,7 @@ export const registerBootstrapRoute = ({
       validate: false,
     },
     async (ctx, req, res) => {
-      const uiSettingsClient = ctx.core.uiSettings.client;
+      const uiSettingsClient = (await ctx.core).uiSettings.client;
       const { body, etag } = await renderer({
         uiSettingsClient,
         request: req,
diff --git a/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts b/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts
index 749ec58bcbfed..533ada6078caa 100644
--- a/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts
+++ b/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts
@@ -12,7 +12,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { deleteUnknownTypeObjects, getUnknownTypesDeprecations } from './unknown_object_types';
 import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { elasticsearchClientMock } from '../../elasticsearch/client/mocks';
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '../..';
 
 const createSearchResponse = (count: number): estypes.SearchResponse => {
   return {
diff --git a/src/core/server/saved_objects/import/lib/check_conflicts.test.ts b/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
index e11e880016550..a9c534bd7e36b 100644
--- a/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
+++ b/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { savedObjectsClientMock } from '../../../mocks';
-import { SavedObjectReference, SavedObjectsImportRetry } from 'kibana/public';
+import { SavedObjectReference, SavedObjectsImportRetry } from '../../../../public';
 import { SavedObjectsClientContract, SavedObject } from '../../types';
 import { SavedObjectsErrorHelpers } from '../../service';
 import { checkConflicts } from './check_conflicts';
diff --git a/src/core/server/saved_objects/migrations/README.md b/src/core/server/saved_objects/migrations/README.md
index d8382e4f0e061..7dd5dacffcee6 100644
--- a/src/core/server/saved_objects/migrations/README.md
+++ b/src/core/server/saved_objects/migrations/README.md
@@ -181,7 +181,11 @@ and the migration source index is the index the `.kibana` alias points to.
 Create the target index. This operation is idempotent, if the index already exist, we wait until its status turns yellow
 
 ### New control state
- → `MARK_VERSION_INDEX_READY`
+1. If the action succeeds
+  → `MARK_VERSION_INDEX_READY`
+2. If the action fails with a `index_not_yellow_timeout`
+  → `CREATE_NEW_TARGET`
+
 
 ## LEGACY_SET_WRITE_BLOCK
 ### Next action
@@ -209,8 +213,10 @@ Create a new `.kibana_pre6.5.0_001` index into which we can reindex the legacy
 index. (Since the task manager index was converted from a data index into a
 saved objects index in 7.4 it will be reindexed into `.kibana_pre7.4.0_001`)
 ### New control state
+1. If the index creation succeeds
   → `LEGACY_REINDEX`
-
+2. If the index creation task failed with a `index_not_yellow_timeout`
+  → `LEGACY_REINDEX_WAIT_FOR_TASK`
 ## LEGACY_REINDEX
 ### Next action
 `reindex`
@@ -257,7 +263,10 @@ Wait for the Elasticsearch cluster to be in "yellow" state. It means the index's
 We don't have as much data redundancy as we could have, but it's enough to start the migration.
 
 ### New control state
+1. If the action succeeds
   → `SET_SOURCE_WRITE_BLOCK`
+2. If the action fails with a `index_not_yellow_timeout`
+  → `WAIT_FOR_YELLOW_SOURCE`
   
 ## SET_SOURCE_WRITE_BLOCK
 ### Next action
@@ -278,7 +287,10 @@ This operation is idempotent, if the index already exist, we wait until its stat
 - (Since we never query the temporary index we can potentially disable refresh to speed up indexing performance. Profile to see if gains justify complexity)
 
 ### New control state
+1. If the action succeeds
   → `REINDEX_SOURCE_TO_TEMP_OPEN_PIT`
+2. If the action fails with a `index_not_yellow_timeout`
+  → `CREATE_REINDEX_TEMP`
 
 ## REINDEX_SOURCE_TO_TEMP_OPEN_PIT
 ### Next action
@@ -357,7 +369,10 @@ Ask elasticsearch to clone the temporary index into the target index. If the tar
 We can’t use the temporary index as our target index because one instance can complete the migration, delete a document, and then a second instance starts the reindex operation and re-creates the deleted document. By cloning the temporary index and only accepting writes/deletes from the cloned target index, we prevent lost acknowledged deletes.
 
 ### New control state
+1. If the action succeeds
   → `OUTDATED_DOCUMENTS_SEARCH`
+2. If the action fails with a `index_not_yellow_timeout`
+  → `CLONE_TEMP_TO_TARGET`
 
 ## OUTDATED_DOCUMENTS_SEARCH
 ### Next action
diff --git a/src/core/server/saved_objects/migrations/__snapshots__/migrations_state_action_machine.test.ts.snap b/src/core/server/saved_objects/migrations/__snapshots__/migrations_state_action_machine.test.ts.snap
index 0ad6f18104685..b1dcd51bbdd0d 100644
--- a/src/core/server/saved_objects/migrations/__snapshots__/migrations_state_action_machine.test.ts.snap
+++ b/src/core/server/saved_objects/migrations/__snapshots__/migrations_state_action_machine.test.ts.snap
@@ -32,6 +32,9 @@ Object {
                 },
               ],
               "maxBatchSizeBytes": 100000000,
+              "migrationDocLinks": Object {
+                "resolveMigrationFailures": "https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html",
+              },
               "outdatedDocuments": Array [],
               "outdatedDocumentsQuery": Object {
                 "bool": Object {
@@ -193,6 +196,9 @@ Object {
                 },
               ],
               "maxBatchSizeBytes": 100000000,
+              "migrationDocLinks": Object {
+                "resolveMigrationFailures": "https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html",
+              },
               "outdatedDocuments": Array [],
               "outdatedDocumentsQuery": Object {
                 "bool": Object {
@@ -358,6 +364,9 @@ Object {
                 },
               ],
               "maxBatchSizeBytes": 100000000,
+              "migrationDocLinks": Object {
+                "resolveMigrationFailures": "https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html",
+              },
               "outdatedDocuments": Array [],
               "outdatedDocumentsQuery": Object {
                 "bool": Object {
@@ -527,6 +536,9 @@ Object {
                 },
               ],
               "maxBatchSizeBytes": 100000000,
+              "migrationDocLinks": Object {
+                "resolveMigrationFailures": "https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html",
+              },
               "outdatedDocuments": Array [],
               "outdatedDocumentsQuery": Object {
                 "bool": Object {
@@ -722,6 +734,9 @@ Object {
                 },
               ],
               "maxBatchSizeBytes": 100000000,
+              "migrationDocLinks": Object {
+                "resolveMigrationFailures": "https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html",
+              },
               "outdatedDocuments": Array [
                 Object {
                   "_id": "1234",
@@ -894,6 +909,9 @@ Object {
                 },
               ],
               "maxBatchSizeBytes": 100000000,
+              "migrationDocLinks": Object {
+                "resolveMigrationFailures": "https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html",
+              },
               "outdatedDocuments": Array [
                 Object {
                   "_id": "1234",
diff --git a/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts b/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts
index 5f3e95bbcfc72..8318bd8f7a69b 100644
--- a/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts
+++ b/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts
@@ -18,11 +18,7 @@ import {
 } from './catch_retryable_es_client_errors';
 import { isWriteBlockException, isIndexNotFoundException } from './es_errors';
 import { WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE } from './constants';
-import type {
-  TargetIndexHadWriteBlock,
-  RequestEntityTooLargeException,
-  IndexNotFound,
-} from './index';
+import type { TargetIndexHadWriteBlock, RequestEntityTooLargeException, IndexNotFound } from '.';
 
 /**
  * Given a document and index, creates a valid body for the Bulk API.
diff --git a/src/core/server/saved_objects/migrations/actions/clone_index.ts b/src/core/server/saved_objects/migrations/actions/clone_index.ts
index e77ce8c47156f..c9496ec6915ca 100644
--- a/src/core/server/saved_objects/migrations/actions/clone_index.ts
+++ b/src/core/server/saved_objects/migrations/actions/clone_index.ts
@@ -15,7 +15,7 @@ import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,
 } from './catch_retryable_es_client_errors';
-import type { IndexNotFound, AcknowledgeResponse } from './';
+import type { IndexNotFound, AcknowledgeResponse, IndexNotYellowTimeout } from '.';
 import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
 import {
   DEFAULT_TIMEOUT,
@@ -49,7 +49,7 @@ export const cloneIndex = ({
   target,
   timeout = DEFAULT_TIMEOUT,
 }: CloneIndexParams): TaskEither.TaskEither<
-  RetryableEsClientError | IndexNotFound,
+  RetryableEsClientError | IndexNotFound | IndexNotYellowTimeout,
   CloneIndexResponse
 > => {
   const cloneTask: TaskEither.TaskEither<
@@ -122,7 +122,7 @@ export const cloneIndex = ({
 
   return pipe(
     cloneTask,
-    TaskEither.chain((res) => {
+    TaskEither.chainW((res) => {
       if (res.acknowledged && res.shardsAcknowledged) {
         // If the cluster state was updated and all shards ackd we're done
         return TaskEither.right(res);
diff --git a/src/core/server/saved_objects/migrations/actions/create_index.ts b/src/core/server/saved_objects/migrations/actions/create_index.ts
index e037de1712373..69d47077c0606 100644
--- a/src/core/server/saved_objects/migrations/actions/create_index.ts
+++ b/src/core/server/saved_objects/migrations/actions/create_index.ts
@@ -10,7 +10,7 @@ import * as Either from 'fp-ts/lib/Either';
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { AcknowledgeResponse } from './index';
+import { AcknowledgeResponse } from '.';
 import { ElasticsearchClient } from '../../../elasticsearch';
 import { IndexMapping } from '../../mappings';
 import {
@@ -22,7 +22,7 @@ import {
   INDEX_AUTO_EXPAND_REPLICAS,
   WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
 } from './constants';
-import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
+import { IndexNotYellowTimeout, waitForIndexStatusYellow } from './wait_for_index_status_yellow';
 
 function aliasArrayToRecord(aliases: string[]): Record<string, estypes.IndicesAlias> {
   const result: Record<string, estypes.IndicesAlias> = {};
@@ -54,7 +54,10 @@ export const createIndex = ({
   indexName,
   mappings,
   aliases = [],
-}: CreateIndexParams): TaskEither.TaskEither<RetryableEsClientError, 'create_index_succeeded'> => {
+}: CreateIndexParams): TaskEither.TaskEither<
+  RetryableEsClientError | IndexNotYellowTimeout,
+  'create_index_succeeded'
+> => {
   const createIndexTask: TaskEither.TaskEither<
     RetryableEsClientError,
     AcknowledgeResponse
diff --git a/src/core/server/saved_objects/migrations/actions/index.ts b/src/core/server/saved_objects/migrations/actions/index.ts
index 1123588309deb..4db260d4c139b 100644
--- a/src/core/server/saved_objects/migrations/actions/index.ts
+++ b/src/core/server/saved_objects/migrations/actions/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { RetryableEsClientError } from './catch_retryable_es_client_errors';
-import { DocumentsTransformFailed } from '../../migrations/core/migrate_raw_docs';
+import { DocumentsTransformFailed } from '../core/migrate_raw_docs';
 
 export {
   BATCH_SIZE,
@@ -35,8 +35,11 @@ export { removeWriteBlock } from './remove_write_block';
 export type { CloneIndexResponse, CloneIndexParams } from './clone_index';
 export { cloneIndex } from './clone_index';
 
-export type { WaitForIndexStatusYellowParams } from './wait_for_index_status_yellow';
-import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
+export type {
+  WaitForIndexStatusYellowParams,
+  IndexNotYellowTimeout,
+} from './wait_for_index_status_yellow';
+import { IndexNotYellowTimeout, waitForIndexStatusYellow } from './wait_for_index_status_yellow';
 
 export type { WaitForTaskResponse, WaitForTaskCompletionTimeout } from './wait_for_task';
 import { waitForTask, WaitForTaskCompletionTimeout } from './wait_for_task';
@@ -149,6 +152,7 @@ export interface ActionErrorTypeMap {
   request_entity_too_large_exception: RequestEntityTooLargeException;
   unknown_docs_found: UnknownDocsFound;
   unsupported_cluster_routing_allocation: UnsupportedClusterRoutingAllocation;
+  index_not_yellow_timeout: IndexNotYellowTimeout;
 }
 
 /**
diff --git a/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts b/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts
index fb14a0c8b3a01..5e840d87ea1ab 100644
--- a/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts
+++ b/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from '../../../../';
+import { ElasticsearchClient } from '../../../..';
 import * as kbnTestServer from '../../../../../test_helpers/kbn_server';
 import { SavedObjectsRawDoc } from '../../../serialization';
 import {
@@ -35,7 +35,7 @@ import {
   transformDocs,
   waitForIndexStatusYellow,
   initAction,
-} from '../../actions';
+} from '..';
 import * as Either from 'fp-ts/lib/Either';
 import * as Option from 'fp-ts/lib/Option';
 import { errors } from '@elastic/elasticsearch';
@@ -321,8 +321,13 @@ describe('migration actions', () => {
   });
 
   describe('waitForIndexStatusYellow', () => {
-    afterAll(async () => {
-      await client.indices.delete({ index: 'red_then_yellow_index' });
+    afterEach(async () => {
+      try {
+        await client.indices.delete({ index: 'red_then_yellow_index' });
+        await client.indices.delete({ index: 'red_index' });
+      } catch (e) {
+        /** ignore */
+      }
     });
     it('resolves right after waiting for an index status to be yellow if the index already existed', async () => {
       // Create a red index
@@ -366,6 +371,39 @@ describe('migration actions', () => {
       const yellowStatusResponse = await client.cluster.health({ index: 'red_then_yellow_index' });
       expect(yellowStatusResponse.status).toBe('yellow');
     });
+    it('resolves left with "index_not_yellow_timeout" after waiting for an index status to be yellow timeout', async () => {
+      // Create a red index
+      await client.indices
+        .create({
+          index: 'red_index',
+          timeout: '5s',
+          body: {
+            mappings: { properties: {} },
+            settings: {
+              // Allocate no replicas so that this index stays red
+              number_of_replicas: '0',
+              // Disable all shard allocation so that the index status is red
+              index: { routing: { allocation: { enable: 'none' } } },
+            },
+          },
+        })
+        .catch((e) => {});
+      // try to wait for index status yellow:
+      const task = waitForIndexStatusYellow({
+        client,
+        index: 'red_index',
+        timeout: '1s',
+      });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+        Object {
+          "_tag": "Left",
+          "left": Object {
+            "message": "[index_not_yellow_timeout] Timeout waiting for the status of the [red_index] index to become 'yellow'",
+            "type": "index_not_yellow_timeout",
+          },
+        }
+      `);
+    });
   });
 
   describe('cloneIndex', () => {
@@ -459,7 +497,7 @@ describe('migration actions', () => {
           }
       `);
     });
-    it('resolves left with a retryable_es_client_error if clone target already exists but takes longer than the specified timeout before turning yellow', async () => {
+    it('resolves left with a index_not_yellow_timeout if clone target already exists but takes longer than the specified timeout before turning yellow', async () => {
       // Create a red index
       await client.indices
         .create({
@@ -489,8 +527,8 @@ describe('migration actions', () => {
         Object {
           "_tag": "Left",
           "left": Object {
-            "message": "Timeout waiting for the status of the [clone_red_index] index to become 'yellow'",
-            "type": "retryable_es_client_error",
+            "message": "[index_not_yellow_timeout] Timeout waiting for the status of the [clone_red_index] index to become 'yellow'",
+            "type": "index_not_yellow_timeout",
           },
         }
       `);
diff --git a/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts b/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts
index 7f998938e92c0..a409bb31d39ef 100644
--- a/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts
+++ b/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from '../../../../';
+import { ElasticsearchClient } from '../../../..';
 import { InternalCoreStart } from '../../../../internal_types';
 import * as kbnTestServer from '../../../../../test_helpers/kbn_server';
 import { Root } from '../../../../root';
diff --git a/src/core/server/saved_objects/migrations/actions/set_write_block.ts b/src/core/server/saved_objects/migrations/actions/set_write_block.ts
index eaca12ab7e315..fcb508aa6cf3f 100644
--- a/src/core/server/saved_objects/migrations/actions/set_write_block.ts
+++ b/src/core/server/saved_objects/migrations/actions/set_write_block.ts
@@ -14,7 +14,7 @@ import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,
 } from './catch_retryable_es_client_errors';
-import type { IndexNotFound } from './';
+import type { IndexNotFound } from '.';
 
 /** @internal */
 export interface SetWriteBlockParams {
diff --git a/src/core/server/saved_objects/migrations/actions/transform_docs.ts b/src/core/server/saved_objects/migrations/actions/transform_docs.ts
index 4c712afcff3a4..e03cdc01a0a22 100644
--- a/src/core/server/saved_objects/migrations/actions/transform_docs.ts
+++ b/src/core/server/saved_objects/migrations/actions/transform_docs.ts
@@ -8,10 +8,7 @@
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import type { TransformRawDocs } from '../types';
 import type { SavedObjectsRawDoc } from '../../serialization';
-import {
-  DocumentsTransformFailed,
-  DocumentsTransformSuccess,
-} from '../../migrations/core/migrate_raw_docs';
+import { DocumentsTransformFailed, DocumentsTransformSuccess } from '../core/migrate_raw_docs';
 
 /** @internal */
 export interface TransformDocsParams {
diff --git a/src/core/server/saved_objects/migrations/actions/update_aliases.ts b/src/core/server/saved_objects/migrations/actions/update_aliases.ts
index f76d30ae023db..c8ac3655ba72a 100644
--- a/src/core/server/saved_objects/migrations/actions/update_aliases.ts
+++ b/src/core/server/saved_objects/migrations/actions/update_aliases.ts
@@ -14,7 +14,7 @@ import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,
 } from './catch_retryable_es_client_errors';
-import { IndexNotFound } from './index';
+import { IndexNotFound } from '.';
 
 export interface AliasNotFound {
   type: 'alias_not_found_exception';
diff --git a/src/core/server/saved_objects/migrations/actions/wait_for_index_status_yellow.ts b/src/core/server/saved_objects/migrations/actions/wait_for_index_status_yellow.ts
index dbff85ff59c23..fed28252bd2a4 100644
--- a/src/core/server/saved_objects/migrations/actions/wait_for_index_status_yellow.ts
+++ b/src/core/server/saved_objects/migrations/actions/wait_for_index_status_yellow.ts
@@ -21,6 +21,11 @@ export interface WaitForIndexStatusYellowParams {
   index: string;
   timeout?: string;
 }
+
+export interface IndexNotYellowTimeout {
+  type: 'index_not_yellow_timeout';
+  message: string;
+}
 /**
  * A yellow index status means the index's primary shard is allocated and the
  * index is ready for searching/indexing documents, but ES wasn't able to
@@ -37,7 +42,10 @@ export const waitForIndexStatusYellow =
     client,
     index,
     timeout = DEFAULT_TIMEOUT,
-  }: WaitForIndexStatusYellowParams): TaskEither.TaskEither<RetryableEsClientError, {}> =>
+  }: WaitForIndexStatusYellowParams): TaskEither.TaskEither<
+    RetryableEsClientError | IndexNotYellowTimeout,
+    {}
+  > =>
   () => {
     return client.cluster
       .health(
@@ -47,14 +55,14 @@ export const waitForIndexStatusYellow =
           timeout,
         },
         // Don't reject on status code 408 so that we can handle the timeout
-        // explicitly and provide more context in the error message
+        // explicitly with a custom response type and provide more context in the error message
         { ignore: [408] }
       )
       .then((res) => {
         if (res.timed_out === true) {
           return Either.left({
-            type: 'retryable_es_client_error' as const,
-            message: `Timeout waiting for the status of the [${index}] index to become 'yellow'`,
+            type: 'index_not_yellow_timeout' as const,
+            message: `[index_not_yellow_timeout] Timeout waiting for the status of the [${index}] index to become 'yellow'`,
           });
         }
         return Either.right({});
diff --git a/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts b/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts
index cafc8f15f0290..3eb7b0da718c2 100644
--- a/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts
+++ b/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts
@@ -10,7 +10,7 @@ import * as TaskEither from 'fp-ts/lib/TaskEither';
 import * as Option from 'fp-ts/lib/Option';
 import { flow } from 'fp-ts/lib/function';
 import { RetryableEsClientError } from './catch_retryable_es_client_errors';
-import type { IndexNotFound, TargetIndexHadWriteBlock } from './index';
+import type { IndexNotFound, TargetIndexHadWriteBlock } from '.';
 import { waitForTask, WaitForTaskCompletionTimeout } from './wait_for_task';
 import { isWriteBlockException, isIncompatibleMappingException } from './es_errors';
 
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
index a39fff20abbe7..7a57a7a8a08d3 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IndexMapping, SavedObjectsTypeMappingDefinitions } from './../../mappings';
+import { IndexMapping, SavedObjectsTypeMappingDefinitions } from '../../mappings';
 import { buildActiveMappings, diffMappings } from './build_active_mappings';
 
 describe('buildActiveMappings', () => {
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
index d3ac00fc0354a..72b5f32d54782 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
@@ -16,7 +16,7 @@ import {
   IndexMapping,
   SavedObjectsMappingProperties,
   SavedObjectsTypeMappingDefinitions,
-} from './../../mappings';
+} from '../../mappings';
 
 /**
  * Creates an index mapping with the core properties required by saved object
diff --git a/src/core/server/saved_objects/migrations/initial_state.test.ts b/src/core/server/saved_objects/migrations/initial_state.test.ts
index 601eb7cf1ce36..0fff4ddb06895 100644
--- a/src/core/server/saved_objects/migrations/initial_state.test.ts
+++ b/src/core/server/saved_objects/migrations/initial_state.test.ts
@@ -8,15 +8,19 @@
 
 import { ByteSizeValue } from '@kbn/config-schema';
 import * as Option from 'fp-ts/Option';
+import { DocLinksServiceSetup } from '../../doc_links';
+import { docLinksServiceMock } from '../../mocks';
 import { SavedObjectsMigrationConfigType } from '../saved_objects_config';
 import { SavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { createInitialState } from './initial_state';
 
 describe('createInitialState', () => {
   let typeRegistry: SavedObjectTypeRegistry;
+  let docLinks: DocLinksServiceSetup;
 
   beforeEach(() => {
     typeRegistry = new SavedObjectTypeRegistry();
+    docLinks = docLinksServiceMock.createSetupContract();
   });
 
   const migrationsConfig = {
@@ -36,6 +40,7 @@ describe('createInitialState', () => {
         indexPrefix: '.kibana_task_manager',
         migrationsConfig,
         typeRegistry,
+        docLinks,
       })
     ).toEqual({
       batchSize: 1000,
@@ -108,6 +113,10 @@ describe('createInitialState', () => {
       },
       versionAlias: '.kibana_task_manager_8.1.0',
       versionIndex: '.kibana_task_manager_8.1.0_001',
+      migrationDocLinks: {
+        resolveMigrationFailures:
+          'https://www.elastic.co/guide/en/kibana/test-branch/resolve-migrations-failures.html',
+      },
     });
   });
 
@@ -135,6 +144,7 @@ describe('createInitialState', () => {
       indexPrefix: '.kibana_task_manager',
       migrationsConfig,
       typeRegistry,
+      docLinks,
     });
 
     expect(initialState.knownTypes).toEqual(['foo', 'bar']);
@@ -160,6 +170,7 @@ describe('createInitialState', () => {
       indexPrefix: '.kibana_task_manager',
       migrationsConfig,
       typeRegistry,
+      docLinks,
     });
 
     expect(initialState.excludeFromUpgradeFilterHooks).toEqual({ foo: fooExcludeOnUpgradeHook });
@@ -178,6 +189,7 @@ describe('createInitialState', () => {
       indexPrefix: '.kibana_task_manager',
       migrationsConfig,
       typeRegistry,
+      docLinks,
     });
 
     expect(Option.isSome(initialState.preMigrationScript)).toEqual(true);
@@ -199,6 +211,7 @@ describe('createInitialState', () => {
           indexPrefix: '.kibana_task_manager',
           migrationsConfig,
           typeRegistry,
+          docLinks,
         }).preMigrationScript
       )
     ).toEqual(true);
@@ -216,6 +229,7 @@ describe('createInitialState', () => {
         indexPrefix: '.kibana_task_manager',
         migrationsConfig,
         typeRegistry,
+        docLinks,
       }).outdatedDocumentsQuery
     ).toMatchInlineSnapshot(`
         Object {
diff --git a/src/core/server/saved_objects/migrations/initial_state.ts b/src/core/server/saved_objects/migrations/initial_state.ts
index f074f123c8930..ae0fe54049505 100644
--- a/src/core/server/saved_objects/migrations/initial_state.ts
+++ b/src/core/server/saved_objects/migrations/initial_state.ts
@@ -12,7 +12,8 @@ import { SavedObjectsMigrationVersion } from '../../../types';
 import { SavedObjectsMigrationConfigType } from '../saved_objects_config';
 import type { ISavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { InitState } from './state';
-import { excludeUnusedTypesQuery } from '../migrations/core';
+import { excludeUnusedTypesQuery } from './core';
+import { DocLinksServiceStart } from '../../doc_links';
 
 /**
  * Construct the initial state for the model
@@ -25,6 +26,7 @@ export const createInitialState = ({
   indexPrefix,
   migrationsConfig,
   typeRegistry,
+  docLinks,
 }: {
   kibanaVersion: string;
   targetMappings: IndexMapping;
@@ -33,6 +35,7 @@ export const createInitialState = ({
   indexPrefix: string;
   migrationsConfig: SavedObjectsMigrationConfigType;
   typeRegistry: ISavedObjectTypeRegistry;
+  docLinks: DocLinksServiceStart;
 }): InitState => {
   const outdatedDocumentsQuery = {
     bool: {
@@ -64,6 +67,8 @@ export const createInitialState = ({
       .filter((type) => !!type.excludeOnUpgrade)
       .map((type) => [type.name, type.excludeOnUpgrade!])
   );
+  // short key to access savedObjects entries directly from docLinks
+  const migrationDocLinks = docLinks.links.kibanaUpgradeSavedObjects;
 
   return {
     controlState: 'INIT',
@@ -87,5 +92,6 @@ export const createInitialState = ({
     unusedTypesQuery: excludeUnusedTypesQuery,
     knownTypes,
     excludeFromUpgradeFilterHooks: excludeFilterHooks,
+    migrationDocLinks,
   };
 };
diff --git a/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts b/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
index 5948425ed737c..cf350c0e9a35e 100644
--- a/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
+++ b/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
@@ -13,7 +13,7 @@ import { kibanaPackageJson as pkg } from '@kbn/utils';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 import type { ElasticsearchClient } from '../../../elasticsearch';
 import { Root } from '../../../root';
-import { deterministicallyRegenerateObjectId } from '../../migrations/core/document_migrator';
+import { deterministicallyRegenerateObjectId } from '../core/document_migrator';
 
 const logFilePath = Path.join(__dirname, 'rewriting_id.log');
 
diff --git a/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts b/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts
index 96ce7a1fdc097..79a76d0a9f4fc 100644
--- a/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts
+++ b/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { REMOVED_TYPES } from '../../migrations/core';
+import { REMOVED_TYPES } from '../core';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 
 // Types should NEVER be removed from this array
diff --git a/src/core/server/saved_objects/migrations/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
index e5aa51f9d6b0a..77837f066a52f 100644
--- a/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
@@ -16,6 +16,7 @@ import { SavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { SavedObjectsType } from '../types';
 import { DocumentMigrator } from './core/document_migrator';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { docLinksServiceMock } from '../../mocks';
 import { lastValueFrom } from 'rxjs';
 
 jest.mock('./core/document_migrator', () => {
@@ -287,6 +288,7 @@ const mockOptions = () => {
       retryAttempts: 20,
     },
     client: elasticsearchClientMock.createElasticsearchClient(),
+    docLinks: docLinksServiceMock.createSetupContract(),
   };
   return options;
 };
diff --git a/src/core/server/saved_objects/migrations/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana_migrator.ts
index 2e2c4e2c63c04..31b9c89f4176f 100644
--- a/src/core/server/saved_objects/migrations/kibana_migrator.ts
+++ b/src/core/server/saved_objects/migrations/kibana_migrator.ts
@@ -29,6 +29,7 @@ import { ISavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { SavedObjectsType } from '../types';
 import { runResilientMigrator } from './run_resilient_migrator';
 import { migrateRawDocsSafely } from './core/migrate_raw_docs';
+import { DocLinksServiceStart } from '../../doc_links';
 
 export interface KibanaMigratorOptions {
   client: ElasticsearchClient;
@@ -37,6 +38,7 @@ export interface KibanaMigratorOptions {
   kibanaIndex: string;
   kibanaVersion: string;
   logger: Logger;
+  docLinks: DocLinksServiceStart;
 }
 
 export type IKibanaMigrator = Pick<KibanaMigrator, keyof KibanaMigrator>;
@@ -65,6 +67,7 @@ export class KibanaMigrator {
   private readonly activeMappings: IndexMapping;
   private readonly soMigrationsConfig: SavedObjectsMigrationConfigType;
   public readonly kibanaVersion: string;
+  private readonly docLinks: DocLinksServiceStart;
 
   /**
    * Creates an instance of KibanaMigrator.
@@ -76,6 +79,7 @@ export class KibanaMigrator {
     soMigrationsConfig,
     kibanaVersion,
     logger,
+    docLinks,
   }: KibanaMigratorOptions) {
     this.client = client;
     this.kibanaIndex = kibanaIndex;
@@ -93,6 +97,7 @@ export class KibanaMigrator {
     // Building the active mappings (and associated md5sums) is an expensive
     // operation so we cache the result
     this.activeMappings = buildActiveMappings(this.mappingProperties);
+    this.docLinks = docLinks;
   }
 
   /**
@@ -177,6 +182,7 @@ export class KibanaMigrator {
             indexPrefix: index,
             migrationsConfig: this.soMigrationsConfig,
             typeRegistry: this.typeRegistry,
+            docLinks: this.docLinks,
           });
         },
       };
diff --git a/src/core/server/saved_objects/migrations/migrations_state_action_machine.test.ts b/src/core/server/saved_objects/migrations/migrations_state_action_machine.test.ts
index 3bc07c0fea0c1..93e6476f8e78c 100644
--- a/src/core/server/saved_objects/migrations/migrations_state_action_machine.test.ts
+++ b/src/core/server/saved_objects/migrations/migrations_state_action_machine.test.ts
@@ -8,7 +8,7 @@
 
 import { cleanupMock } from './migrations_state_machine_cleanup.mocks';
 import { migrationStateActionMachine } from './migrations_state_action_machine';
-import { loggingSystemMock, elasticsearchServiceMock } from '../../mocks';
+import { loggingSystemMock, elasticsearchServiceMock, docLinksServiceMock } from '../../mocks';
 import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import * as Either from 'fp-ts/lib/Either';
 import * as Option from 'fp-ts/lib/Option';
@@ -33,6 +33,7 @@ describe('migrationsStateActionMachine', () => {
 
   const mockLogger = loggingSystemMock.create();
   const typeRegistry = typeRegistryMock.create();
+  const docLinks = docLinksServiceMock.createSetupContract();
 
   const initialState = createInitialState({
     kibanaVersion: '7.11.0',
@@ -48,6 +49,7 @@ describe('migrationsStateActionMachine', () => {
       retryAttempts: 5,
     },
     typeRegistry,
+    docLinks,
   });
 
   const next = jest.fn((s: State) => {
diff --git a/src/core/server/saved_objects/migrations/model/model.test.ts b/src/core/server/saved_objects/migrations/model/model.test.ts
index de8483bb4abce..b80e2bceae846 100644
--- a/src/core/server/saved_objects/migrations/model/model.test.ts
+++ b/src/core/server/saved_objects/migrations/model/model.test.ts
@@ -42,7 +42,7 @@ import type {
   CalculateExcludeFiltersState,
 } from '../state';
 import { SavedObjectsRawDoc } from '../../serialization';
-import { TransformErrorObjects, TransformSavedObjectDocumentError } from '../../migrations/core';
+import { TransformErrorObjects, TransformSavedObjectDocumentError } from '../core';
 import { AliasAction, RetryableEsClientError } from '../actions';
 import { ResponseType } from '../next';
 import { createInitialProgress } from './progress';
@@ -94,6 +94,9 @@ describe('migrations v2 model', () => {
     },
     knownTypes: ['dashboard', 'config'],
     excludeFromUpgradeFilterHooks: {},
+    migrationDocLinks: {
+      resolveMigrationFailures: 'resolveMigrationFailures',
+    },
   };
 
   describe('exponential retry delays for retryable_es_client_error', () => {
@@ -105,7 +108,7 @@ describe('migrations v2 model', () => {
       type: 'retryable_es_client_error',
       message: 'snapshot_in_progress_exception',
     };
-    test('sets retryCount, exponential retryDelay if an action fails with a retryable_es_client_error', () => {
+    test('increments retryCount, exponential retryDelay if an action fails with a retryable_es_client_error', () => {
       const states = new Array(10).fill(1).map(() => {
         state = model(state, Either.left(retryableError));
         return state;
@@ -174,20 +177,6 @@ describe('migrations v2 model', () => {
       expect(newState.retryDelay).toEqual(0);
     });
 
-    test('resets retryCount, retryDelay when an action fails with a non-retryable error', () => {
-      const legacyReindexState = {
-        ...state,
-        ...{ controlState: 'LEGACY_REINDEX_WAIT_FOR_TASK', retryCount: 5, retryDelay: 32000 },
-      };
-      const res: ResponseType<'LEGACY_REINDEX_WAIT_FOR_TASK'> = Either.left({
-        type: 'target_index_had_write_block',
-      });
-      const newState = model(legacyReindexState as State, res);
-
-      expect(newState.retryCount).toEqual(0);
-      expect(newState.retryDelay).toEqual(0);
-    });
-
     test('terminates to FATAL after retryAttempts retries', () => {
       const newState = model(
         { ...state, ...{ retryCount: 15, retryDelay: 64000 } },
@@ -196,7 +185,7 @@ describe('migrations v2 model', () => {
 
       expect(newState.controlState).toEqual('FATAL');
       expect(newState.reason).toMatchInlineSnapshot(
-        `"Unable to complete the INIT step after 15 attempts, terminating."`
+        `"Unable to complete the INIT step after 15 attempts, terminating. The last failure message was: snapshot_in_progress_exception"`
       );
     });
   });
@@ -574,9 +563,29 @@ describe('migrations v2 model', () => {
         expect(newState.retryCount).toEqual(0);
         expect(newState.retryDelay).toEqual(0);
       });
-      // The createIndex action called by LEGACY_CREATE_REINDEX_TARGET never
-      // returns a left, it will always succeed or timeout. Since timeout
-      // failures are always retried we don't explicitly test this logic
+      test('LEGACY_CREATE_REINDEX_TARGET -> LEGACY_CREATE_REINDEX_TARGET if action fails with index_not_yellow_timeout', () => {
+        const res: ResponseType<'LEGACY_CREATE_REINDEX_TARGET'> = Either.left({
+          message: '[index_not_yellow_timeout] Timeout waiting for ...',
+          type: 'index_not_yellow_timeout',
+        });
+        const newState = model(legacyCreateReindexTargetState, res);
+        expect(newState.controlState).toEqual('LEGACY_CREATE_REINDEX_TARGET');
+        expect(newState.retryCount).toEqual(1);
+        expect(newState.retryDelay).toEqual(2000);
+      });
+      test('LEGACY_CREATE_REINDEX_TARGET -> LEGACY_REINDEX resets retry count and retry delay if action succeeds', () => {
+        const res: ResponseType<'LEGACY_CREATE_REINDEX_TARGET'> =
+          Either.right('create_index_succeeded');
+        const testState = {
+          ...legacyCreateReindexTargetState,
+          retryCount: 1,
+          retryDelay: 2000,
+        };
+        const newState = model(testState, res);
+        expect(newState.controlState).toEqual('LEGACY_REINDEX');
+        expect(newState.retryCount).toEqual(0);
+        expect(newState.retryDelay).toEqual(0);
+      });
     });
 
     describe('LEGACY_REINDEX', () => {
@@ -647,6 +656,17 @@ describe('migrations v2 model', () => {
         expect(newState.retryCount).toEqual(1);
         expect(newState.retryDelay).toEqual(2000);
       });
+      test('LEGACY_REINDEX_WAIT_FOR_TASK -> LEGACY_REINDEX_WAIT_FOR_TASK with incremented retryCount if action fails with wait_for_task_completion_timeout a second time', () => {
+        const state = Object.assign({}, legacyReindexWaitForTaskState, { retryCount: 1 });
+        const res: ResponseType<'LEGACY_REINDEX_WAIT_FOR_TASK'> = Either.left({
+          message: '[timeout_exception] Timeout waiting for ...',
+          type: 'wait_for_task_completion_timeout',
+        });
+        const newState = model(state, res);
+        expect(newState.controlState).toEqual('LEGACY_REINDEX_WAIT_FOR_TASK');
+        expect(newState.retryCount).toEqual(2);
+        expect(newState.retryDelay).toEqual(4000);
+      });
     });
 
     describe('LEGACY_DELETE', () => {
@@ -710,6 +730,33 @@ describe('migrations v2 model', () => {
           sourceIndex: Option.some('.kibana_3'),
         });
       });
+
+      test('WAIT_FOR_YELLOW_SOURCE -> WAIT_FOR_YELLOW_SOURCE if action fails with index_not_yellow_timeout', () => {
+        const res: ResponseType<'WAIT_FOR_YELLOW_SOURCE'> = Either.left({
+          message: '[index_not_yellow_timeout] Timeout waiting for ...',
+          type: 'index_not_yellow_timeout',
+        });
+        const newState = model(waitForYellowSourceState, res);
+        expect(newState.controlState).toEqual('WAIT_FOR_YELLOW_SOURCE');
+        expect(newState.retryCount).toEqual(1);
+        expect(newState.retryDelay).toEqual(2000);
+      });
+
+      test('WAIT_FOR_YELLOW_SOURCE -> CHECK_UNKNOWN_DOCUMENTS resets retry count and delay if action succeeds', () => {
+        const res: ResponseType<'WAIT_FOR_YELLOW_SOURCE'> = Either.right({});
+        const testState = {
+          ...waitForYellowSourceState,
+          retryCount: 1,
+          retryDelay: 2000,
+        };
+        const newState = model(testState, res);
+        expect(newState.controlState).toEqual('CHECK_UNKNOWN_DOCUMENTS');
+
+        expect(newState).toMatchObject({
+          controlState: 'CHECK_UNKNOWN_DOCUMENTS',
+          sourceIndex: Option.some('.kibana_3'),
+        });
+      });
     });
 
     describe('CHECK_UNKNOWN_DOCUMENTS', () => {
@@ -903,6 +950,28 @@ describe('migrations v2 model', () => {
         expect(newState.retryCount).toEqual(0);
         expect(newState.retryDelay).toEqual(0);
       });
+      it('CREATE_REINDEX_TEMP -> CREATE_REINDEX_TEMP if action fails with index_not_yellow_timeout', () => {
+        const res: ResponseType<'CREATE_REINDEX_TEMP'> = Either.left({
+          message: '[index_not_yellow_timeout] Timeout waiting for ...',
+          type: 'index_not_yellow_timeout',
+        });
+        const newState = model(state, res);
+        expect(newState.controlState).toEqual('CREATE_REINDEX_TEMP');
+        expect(newState.retryCount).toEqual(1);
+        expect(newState.retryDelay).toEqual(2000);
+      });
+      it('CREATE_REINDEX_TEMP -> REINDEX_SOURCE_TO_TEMP_OPEN_PIT resets retry count if action succeeds', () => {
+        const res: ResponseType<'CREATE_REINDEX_TEMP'> = Either.right('create_index_succeeded');
+        const testState = {
+          ...state,
+          retryCount: 1,
+          retryDelay: 2000,
+        };
+        const newState = model(testState, res);
+        expect(newState.controlState).toEqual('REINDEX_SOURCE_TO_TEMP_OPEN_PIT');
+        expect(newState.retryCount).toEqual(0);
+        expect(newState.retryDelay).toEqual(0);
+      });
     });
 
     describe('REINDEX_SOURCE_TO_TEMP_OPEN_PIT', () => {
@@ -1215,6 +1284,31 @@ describe('migrations v2 model', () => {
         expect(newState.retryCount).toBe(0);
         expect(newState.retryDelay).toBe(0);
       });
+      it('CLONE_TEMP_TO_TARGET -> CLONE_TEMP_TO_TARGET if action fails with index_not_yellow_timeout', () => {
+        const res: ResponseType<'CLONE_TEMP_TO_TARGET'> = Either.left({
+          message: '[index_not_yellow_timeout] Timeout waiting for ...',
+          type: 'index_not_yellow_timeout',
+        });
+        const newState = model(state, res);
+        expect(newState.controlState).toEqual('CLONE_TEMP_TO_TARGET');
+        expect(newState.retryCount).toEqual(1);
+        expect(newState.retryDelay).toEqual(2000);
+      });
+      it('CREATE_NEW_TARGET -> MARK_VERSION_INDEX_READY resets the retry count and delay', () => {
+        const res: ResponseType<'CLONE_TEMP_TO_TARGET'> = Either.right({
+          acknowledged: true,
+          shardsAcknowledged: true,
+        });
+        const testState = {
+          ...state,
+          retryCount: 1,
+          retryDelay: 2000,
+        };
+        const newState = model(testState, res);
+        expect(newState.controlState).toBe('REFRESH_TARGET');
+        expect(newState.retryCount).toBe(0);
+        expect(newState.retryDelay).toBe(0);
+      });
     });
 
     describe('OUTDATED_DOCUMENTS_SEARCH_OPEN_PIT', () => {
@@ -1670,6 +1764,17 @@ describe('migrations v2 model', () => {
         expect(newState.retryCount).toEqual(1);
         expect(newState.retryDelay).toEqual(2000);
       });
+      test('UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK -> UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK with incremented retry count when response is left wait_for_task_completion_timeout a second time', () => {
+        const state = Object.assign({}, updateTargetMappingsWaitForTaskState, { retryCount: 1 });
+        const res: ResponseType<'UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK'> = Either.left({
+          message: '[timeout_exception] Timeout waiting for ...',
+          type: 'wait_for_task_completion_timeout',
+        });
+        const newState = model(state, res) as UpdateTargetMappingsWaitForTaskState;
+        expect(newState.controlState).toEqual('UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK');
+        expect(newState.retryCount).toEqual(2);
+        expect(newState.retryDelay).toEqual(4000);
+      });
     });
 
     describe('CREATE_NEW_TARGET', () => {
@@ -1690,6 +1795,29 @@ describe('migrations v2 model', () => {
         expect(newState.retryCount).toEqual(0);
         expect(newState.retryDelay).toEqual(0);
       });
+      test('CREATE_NEW_TARGET -> CREATE_NEW_TARGET if action fails with index_not_yellow_timeout', () => {
+        const res: ResponseType<'CREATE_NEW_TARGET'> = Either.left({
+          message: '[index_not_yellow_timeout] Timeout waiting for ...',
+          type: 'index_not_yellow_timeout',
+        });
+        const newState = model(createNewTargetState, res);
+        expect(newState.controlState).toEqual('CREATE_NEW_TARGET');
+        expect(newState.retryCount).toEqual(1);
+        expect(newState.retryDelay).toEqual(2000);
+      });
+      test('CREATE_NEW_TARGET -> MARK_VERSION_INDEX_READY resets the retry count and delay', () => {
+        const res: ResponseType<'CREATE_NEW_TARGET'> = Either.right('create_index_succeeded');
+        const testState = {
+          ...createNewTargetState,
+          retryCount: 1,
+          retryDelay: 2000,
+        };
+
+        const newState = model(testState, res);
+        expect(newState.controlState).toEqual('MARK_VERSION_INDEX_READY');
+        expect(newState.retryCount).toEqual(0);
+        expect(newState.retryDelay).toEqual(0);
+      });
     });
 
     describe('MARK_VERSION_INDEX_READY', () => {
diff --git a/src/core/server/saved_objects/migrations/model/model.ts b/src/core/server/saved_objects/migrations/model/model.ts
index c2f11ba18069c..e711f62bcd8d6 100644
--- a/src/core/server/saved_objects/migrations/model/model.ts
+++ b/src/core/server/saved_objects/migrations/model/model.ts
@@ -57,15 +57,13 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
 
   // Handle retryable_es_client_errors. Other left values need to be handled
   // by the control state specific code below.
-  if (
-    Either.isLeft<unknown, unknown>(resW) &&
-    isLeftTypeof(resW.left, 'retryable_es_client_error')
-  ) {
-    // Retry the same step after an exponentially increasing delay.
-    return delayRetryState(stateP, resW.left.message, stateP.retryAttempts);
+  if (Either.isLeft<unknown, unknown>(resW)) {
+    if (isLeftTypeof(resW.left, 'retryable_es_client_error')) {
+      // Retry the same step after an exponentially increasing delay.
+      return delayRetryState(stateP, resW.left.message, stateP.retryAttempts);
+    }
   } else {
-    // If the action didn't fail with a retryable_es_client_error, reset the
-    // retry counter and retryDelay state
+    // If any action returns a right response, reset the retryCount and retryDelay state
     stateP = resetRetryState(stateP);
   }
 
@@ -237,7 +235,21 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
     }
   } else if (stateP.controlState === 'LEGACY_CREATE_REINDEX_TARGET') {
     const res = resW as ExcludeRetryableEsError<ResponseType<typeof stateP.controlState>>;
-    if (Either.isRight(res)) {
+    if (Either.isLeft(res)) {
+      const left = res.left;
+      if (isLeftTypeof(left, 'index_not_yellow_timeout')) {
+        // `index_not_yellow_timeout` for the LEGACY_CREATE_REINDEX_TARGET source index:
+        // A yellow status timeout could theoretically be temporary for a busy cluster
+        // that takes a long time to allocate the primary and we retry the action to see if
+        // we get a response.
+        // If the cluster hit the low watermark for disk usage the LEGACY_CREATE_REINDEX_TARGET action will
+        // continue to timeout and eventually lead to a failed migration.
+        const retryErrorMessage = `${left.message} Refer to ${stateP.migrationDocLinks.resolveMigrationFailures} for information on how to resolve the issue.`;
+        return delayRetryState(stateP, retryErrorMessage, stateP.retryAttempts);
+      } else {
+        return throwBadResponse(stateP, left);
+      }
+    } else if (Either.isRight(res)) {
       return {
         ...stateP,
         controlState: 'LEGACY_REINDEX',
@@ -287,7 +299,7 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
         // After waiting for the specified timeout, the task has not yet
         // completed. Retry this step to see if the task has completed after an
         // exponential delay. We will basically keep polling forever until the
-        // Elasticeasrch task succeeds or fails.
+        // Elasticsearch task succeeds or fails.
         return delayRetryState(stateP, left.message, Number.MAX_SAFE_INTEGER);
       } else if (
         isLeftTypeof(left, 'index_not_found_exception') ||
@@ -346,6 +358,19 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
         ...stateP,
         controlState: 'CHECK_UNKNOWN_DOCUMENTS',
       };
+    } else if (Either.isLeft(res)) {
+      const left = res.left;
+      if (isLeftTypeof(left, 'index_not_yellow_timeout')) {
+        // A yellow status timeout could theoretically be temporary for a busy cluster
+        // that takes a long time to allocate the primary and we retry the action to see if
+        // we get a response.
+        // In the event of retries running out, we link to the docs to help with diagnosing
+        // the problem.
+        const retryErrorMessage = `${left.message} Refer to ${stateP.migrationDocLinks.resolveMigrationFailures} for information on how to resolve the issue.`;
+        return delayRetryState(stateP, retryErrorMessage, stateP.retryAttempts);
+      } else {
+        return throwBadResponse(stateP, left);
+      }
     } else {
       return throwBadResponse(stateP, res);
     }
@@ -427,6 +452,20 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
     const res = resW as ExcludeRetryableEsError<ResponseType<typeof stateP.controlState>>;
     if (Either.isRight(res)) {
       return { ...stateP, controlState: 'REINDEX_SOURCE_TO_TEMP_OPEN_PIT' };
+    } else if (Either.isLeft(res)) {
+      const left = res.left;
+      if (isLeftTypeof(left, 'index_not_yellow_timeout')) {
+        // `index_not_yellow_timeout` for the CREATE_REINDEX_TEMP target temp index:
+        // The index status did not go yellow within the specified timeout period.
+        // A yellow status timeout could theoretically be temporary for a busy cluster.
+        //
+        // If there is a problem CREATE_REINDEX_TEMP action will
+        // continue to timeout and eventually lead to a failed migration.
+        const retryErrorMessage = `${left.message} Refer to ${stateP.migrationDocLinks.resolveMigrationFailures} for information on how to resolve the issue.`;
+        return delayRetryState(stateP, retryErrorMessage, stateP.retryAttempts);
+      } else {
+        return throwBadResponse(stateP, left);
+      }
     } else {
       // If the createIndex action receives an 'resource_already_exists_exception'
       // it will wait until the index status turns green so we don't have any
@@ -647,6 +686,18 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
           ...stateP,
           controlState: 'REFRESH_TARGET',
         };
+      } else if (isLeftTypeof(left, 'index_not_yellow_timeout')) {
+        // `index_not_yellow_timeout` for the CLONE_TEMP_TO_TARGET source -> target index:
+        // The target index status did not go yellow within the specified timeout period.
+        // The cluster could just be busy and we retry the action.
+
+        // Once we run out of retries, the migration fails.
+        // Identifying the cause requires inspecting the ouput of the
+        // `_cluster/allocation/explain?index=${targetIndex}` API.
+        // Unless the root cause is identified and addressed, the request will
+        // continue to timeout and eventually lead to a failed migration.
+        const retryErrorMessage = `${left.message} Refer to ${stateP.migrationDocLinks.resolveMigrationFailures} for information on how to resolve the issue.`;
+        return delayRetryState(stateP, retryErrorMessage, stateP.retryAttempts);
       } else {
         throwBadResponse(stateP, left);
       }
@@ -878,7 +929,7 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
       if (isLeftTypeof(left, 'wait_for_task_completion_timeout')) {
         // After waiting for the specified timeout, the task has not yet
         // completed. Retry this step to see if the task has completed after an
-        // exponential delay. We will basically keep polling forever until the
+        // exponential delay.  We will basically keep polling forever until the
         // Elasticsearch task succeeds or fails.
         return delayRetryState(stateP, res.left.message, Number.MAX_SAFE_INTEGER);
       } else {
@@ -892,6 +943,19 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
         ...stateP,
         controlState: 'MARK_VERSION_INDEX_READY',
       };
+    } else if (Either.isLeft(res)) {
+      const left = res.left;
+      if (isLeftTypeof(left, 'index_not_yellow_timeout')) {
+        // `index_not_yellow_timeout` for the CREATE_NEW_TARGET target index:
+        // The cluster might just be busy and we retry the action for a set number of times.
+        // If the cluster hit the low watermark for disk usage the action will continue to timeout.
+        // Unless the disk space is addressed, the LEGACY_CREATE_REINDEX_TARGET action will
+        // continue to timeout and eventually lead to a failed migration.
+        const retryErrorMessage = `${left.message} Refer to ${stateP.migrationDocLinks.resolveMigrationFailures} for information on how to resolve the issue.`;
+        return delayRetryState(stateP, retryErrorMessage, stateP.retryAttempts);
+      } else {
+        return throwBadResponse(stateP, left);
+      }
     } else {
       // If the createIndex action receives an 'resource_already_exists_exception'
       // it will wait until the index status turns green so we don't have any
diff --git a/src/core/server/saved_objects/migrations/model/retry_state.test.ts b/src/core/server/saved_objects/migrations/model/retry_state.test.ts
index 5a195f8597182..994f3ca2ede4b 100644
--- a/src/core/server/saved_objects/migrations/model/retry_state.test.ts
+++ b/src/core/server/saved_objects/migrations/model/retry_state.test.ts
@@ -109,7 +109,7 @@ describe('delayRetryState', () => {
       hello: 'dolly',
       retryCount: 5,
       retryDelay: 64,
-      reason: `Unable to complete the TEST step after 5 attempts, terminating.`,
+      reason: `Unable to complete the TEST step after 5 attempts, terminating. The last failure message was: some-error`,
     });
   });
 });
diff --git a/src/core/server/saved_objects/migrations/model/retry_state.ts b/src/core/server/saved_objects/migrations/model/retry_state.ts
index 02057a6af2061..532cc70347916 100644
--- a/src/core/server/saved_objects/migrations/model/retry_state.ts
+++ b/src/core/server/saved_objects/migrations/model/retry_state.ts
@@ -18,12 +18,11 @@ export const delayRetryState = <S extends State>(
     return {
       ...state,
       controlState: 'FATAL',
-      reason: `Unable to complete the ${state.controlState} step after ${maxRetryAttempts} attempts, terminating.`,
+      reason: `Unable to complete the ${state.controlState} step after ${maxRetryAttempts} attempts, terminating. The last failure message was: ${errorMessage}`,
     };
   } else {
     const retryCount = state.retryCount + 1;
     const retryDelay = 1000 * Math.min(Math.pow(2, retryCount), 64); // 2s, 4s, 8s, 16s, 32s, 64s, 64s, 64s ...
-
     return {
       ...state,
       retryCount,
diff --git a/src/core/server/saved_objects/migrations/run_resilient_migrator.ts b/src/core/server/saved_objects/migrations/run_resilient_migrator.ts
index 33f73395bcc6c..dce9227719389 100644
--- a/src/core/server/saved_objects/migrations/run_resilient_migrator.ts
+++ b/src/core/server/saved_objects/migrations/run_resilient_migrator.ts
@@ -11,13 +11,14 @@ import { IndexMapping } from '../mappings';
 import { Logger } from '../../logging';
 import type { SavedObjectsMigrationVersion } from '../types';
 import type { TransformRawDocs } from './types';
-import { MigrationResult } from '../migrations/core';
+import { MigrationResult } from './core';
 import { next } from './next';
 import { model } from './model';
 import { createInitialState } from './initial_state';
 import { migrationStateActionMachine } from './migrations_state_action_machine';
 import { SavedObjectsMigrationConfigType } from '../saved_objects_config';
 import type { ISavedObjectTypeRegistry } from '../saved_objects_type_registry';
+import { DocLinksServiceStart } from '../../doc_links';
 
 /**
  * Migrates the provided indexPrefix index using a resilient algorithm that is
@@ -35,6 +36,7 @@ export async function runResilientMigrator({
   indexPrefix,
   migrationsConfig,
   typeRegistry,
+  docLinks,
 }: {
   client: ElasticsearchClient;
   kibanaVersion: string;
@@ -46,6 +48,7 @@ export async function runResilientMigrator({
   indexPrefix: string;
   migrationsConfig: SavedObjectsMigrationConfigType;
   typeRegistry: ISavedObjectTypeRegistry;
+  docLinks: DocLinksServiceStart;
 }): Promise<MigrationResult> {
   const initialState = createInitialState({
     kibanaVersion,
@@ -55,6 +58,7 @@ export async function runResilientMigrator({
     indexPrefix,
     migrationsConfig,
     typeRegistry,
+    docLinks,
   });
   return migrationStateActionMachine({
     initialState,
diff --git a/src/core/server/saved_objects/migrations/state.ts b/src/core/server/saved_objects/migrations/state.ts
index 7073167bfbd1b..6630b5ee57808 100644
--- a/src/core/server/saved_objects/migrations/state.ts
+++ b/src/core/server/saved_objects/migrations/state.ts
@@ -12,7 +12,7 @@ import { ControlState } from './state_action_machine';
 import { AliasAction } from './actions';
 import { IndexMapping } from '../mappings';
 import { SavedObjectsRawDoc } from '..';
-import { TransformErrorObjects } from '../migrations/core';
+import { TransformErrorObjects } from './core';
 import { SavedObjectTypeExcludeFromUpgradeFilterHook } from '../types';
 import { MigrationLog, Progress } from './types';
 
@@ -122,6 +122,10 @@ export interface BaseState extends ControlState {
     string,
     SavedObjectTypeExcludeFromUpgradeFilterHook
   >;
+  /**
+   * DocLinks for savedObjects. to reference online documentation
+   */
+  readonly migrationDocLinks: Record<string, string>;
 }
 
 export interface InitState extends BaseState {
diff --git a/src/core/server/saved_objects/routes/bulk_create.ts b/src/core/server/saved_objects/routes/bulk_create.ts
index f8438a70d0418..b72cd6715fa10 100644
--- a/src/core/server/saved_objects/routes/bulk_create.ts
+++ b/src/core/server/saved_objects/routes/bulk_create.ts
@@ -51,7 +51,8 @@ export const registerBulkCreateRoute = (router: IRouter, { coreUsageData }: Rout
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsBulkCreate({ request: req }).catch(() => {});
 
-      const result = await context.core.savedObjects.client.bulkCreate(req.body, { overwrite });
+      const { savedObjects } = await context.core;
+      const result = await savedObjects.client.bulkCreate(req.body, { overwrite });
       return res.ok({ body: result });
     })
   );
diff --git a/src/core/server/saved_objects/routes/bulk_get.ts b/src/core/server/saved_objects/routes/bulk_get.ts
index cffa69b06f4e4..87b6a604ac6c4 100644
--- a/src/core/server/saved_objects/routes/bulk_get.ts
+++ b/src/core/server/saved_objects/routes/bulk_get.ts
@@ -34,7 +34,8 @@ export const registerBulkGetRoute = (router: IRouter, { coreUsageData }: RouteDe
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsBulkGet({ request: req }).catch(() => {});
 
-      const result = await context.core.savedObjects.client.bulkGet(req.body);
+      const { savedObjects } = await context.core;
+      const result = await savedObjects.client.bulkGet(req.body);
       return res.ok({ body: result });
     })
   );
diff --git a/src/core/server/saved_objects/routes/bulk_resolve.ts b/src/core/server/saved_objects/routes/bulk_resolve.ts
index 493f76a2c497c..5754ec180541c 100644
--- a/src/core/server/saved_objects/routes/bulk_resolve.ts
+++ b/src/core/server/saved_objects/routes/bulk_resolve.ts
@@ -32,7 +32,8 @@ export const registerBulkResolveRoute = (router: IRouter, { coreUsageData }: Rou
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsBulkResolve({ request: req }).catch(() => {});
 
-      const result = await context.core.savedObjects.client.bulkResolve(req.body);
+      const { savedObjects } = await context.core;
+      const result = await savedObjects.client.bulkResolve(req.body);
       return res.ok({ body: result });
     })
   );
diff --git a/src/core/server/saved_objects/routes/bulk_update.ts b/src/core/server/saved_objects/routes/bulk_update.ts
index 277673971dabe..961b8349d1745 100644
--- a/src/core/server/saved_objects/routes/bulk_update.ts
+++ b/src/core/server/saved_objects/routes/bulk_update.ts
@@ -44,7 +44,8 @@ export const registerBulkUpdateRoute = (router: IRouter, { coreUsageData }: Rout
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsBulkUpdate({ request: req }).catch(() => {});
 
-      const savedObject = await context.core.savedObjects.client.bulkUpdate(req.body);
+      const { savedObjects } = await context.core;
+      const savedObject = await savedObjects.client.bulkUpdate(req.body);
       return res.ok({ body: savedObject });
     })
   );
diff --git a/src/core/server/saved_objects/routes/create.ts b/src/core/server/saved_objects/routes/create.ts
index 3e287e91fec80..eb3938db0a9c7 100644
--- a/src/core/server/saved_objects/routes/create.ts
+++ b/src/core/server/saved_objects/routes/create.ts
@@ -61,7 +61,8 @@ export const registerCreateRoute = (router: IRouter, { coreUsageData }: RouteDep
         references,
         initialNamespaces,
       };
-      const result = await context.core.savedObjects.client.create(type, attributes, options);
+      const { savedObjects } = await context.core;
+      const result = await savedObjects.client.create(type, attributes, options);
       return res.ok({ body: result });
     })
   );
diff --git a/src/core/server/saved_objects/routes/delete.ts b/src/core/server/saved_objects/routes/delete.ts
index e8404ba7fc8cf..5c239a55a6923 100644
--- a/src/core/server/saved_objects/routes/delete.ts
+++ b/src/core/server/saved_objects/routes/delete.ts
@@ -32,7 +32,7 @@ export const registerDeleteRoute = (router: IRouter, { coreUsageData }: RouteDep
     catchAndReturnBoomErrors(async (context, req, res) => {
       const { type, id } = req.params;
       const { force } = req.query;
-      const { getClient } = context.core.savedObjects;
+      const { getClient } = (await context.core).savedObjects;
 
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsDelete({ request: req }).catch(() => {});
diff --git a/src/core/server/saved_objects/routes/deprecations/delete_unknown_types.ts b/src/core/server/saved_objects/routes/deprecations/delete_unknown_types.ts
index 97100980a37b3..a30da9723b916 100644
--- a/src/core/server/saved_objects/routes/deprecations/delete_unknown_types.ts
+++ b/src/core/server/saved_objects/routes/deprecations/delete_unknown_types.ts
@@ -25,9 +25,10 @@ export const registerDeleteUnknownTypesRoute = (
       validate: false,
     },
     catchAndReturnBoomErrors(async (context, req, res) => {
+      const { elasticsearch, savedObjects } = await context.core;
       await deleteUnknownTypeObjects({
-        esClient: context.core.elasticsearch.client,
-        typeRegistry: context.core.savedObjects.typeRegistry,
+        esClient: elasticsearch.client,
+        typeRegistry: savedObjects.typeRegistry,
         kibanaIndex,
         kibanaVersion,
       });
diff --git a/src/core/server/saved_objects/routes/export.ts b/src/core/server/saved_objects/routes/export.ts
index e224f30a1bb02..16547970369c2 100644
--- a/src/core/server/saved_objects/routes/export.ts
+++ b/src/core/server/saved_objects/routes/export.ts
@@ -165,7 +165,7 @@ export const registerExportRoute = (
     },
     catchAndReturnBoomErrors(async (context, req, res) => {
       const cleaned = cleanOptions(req.body);
-      const { typeRegistry, getExporter, getClient } = context.core.savedObjects;
+      const { typeRegistry, getExporter, getClient } = (await context.core).savedObjects;
       const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((t) => t.name);
 
       let options: EitherExportOptions;
diff --git a/src/core/server/saved_objects/routes/find.ts b/src/core/server/saved_objects/routes/find.ts
index 6e009f80bda7d..01ac9ae9025f4 100644
--- a/src/core/server/saved_objects/routes/find.ts
+++ b/src/core/server/saved_objects/routes/find.ts
@@ -73,8 +73,8 @@ export const registerFindRoute = (router: IRouter, { coreUsageData }: RouteDepen
           });
         }
       }
-
-      const result = await context.core.savedObjects.client.find({
+      const { savedObjects } = await context.core;
+      const result = await savedObjects.client.find({
         perPage: query.per_page,
         page: query.page,
         type: Array.isArray(query.type) ? query.type : [query.type],
diff --git a/src/core/server/saved_objects/routes/get.ts b/src/core/server/saved_objects/routes/get.ts
index ae0656599a1e2..2ea9a13bbce64 100644
--- a/src/core/server/saved_objects/routes/get.ts
+++ b/src/core/server/saved_objects/routes/get.ts
@@ -32,8 +32,9 @@ export const registerGetRoute = (router: IRouter, { coreUsageData }: RouteDepend
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsGet({ request: req }).catch(() => {});
 
-      const savedObject = await context.core.savedObjects.client.get(type, id);
-      return res.ok({ body: savedObject });
+      const { savedObjects } = await context.core;
+      const object = await savedObjects.client.get(type, id);
+      return res.ok({ body: object });
     })
   );
 };
diff --git a/src/core/server/saved_objects/routes/import.ts b/src/core/server/saved_objects/routes/import.ts
index d373dd5e63bc6..545d01b454741 100644
--- a/src/core/server/saved_objects/routes/import.ts
+++ b/src/core/server/saved_objects/routes/import.ts
@@ -63,7 +63,7 @@ export const registerImportRoute = (
     },
     catchAndReturnBoomErrors(async (context, req, res) => {
       const { overwrite, createNewCopies } = req.query;
-      const { getClient, getImporter, typeRegistry } = context.core.savedObjects;
+      const { getClient, getImporter, typeRegistry } = (await context.core).savedObjects;
 
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts
index be3659f0a5ac4..eeec6bd6b0be0 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkCreateRoute } from '../bulk_create';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts
index 4c59d9838e561..f389307d45c41 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkGetRoute } from '../bulk_get';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts
index 9fd2d66830b0a..bb5067a13ba3e 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkResolveRoute } from '../bulk_resolve';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts
index 886cca83ee849..8c55686b2fd0f 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkUpdateRoute } from '../bulk_update';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/delete.test.ts b/src/core/server/saved_objects/routes/integration_tests/delete.test.ts
index 66f0e2ffb877d..84a2db60b587a 100644
--- a/src/core/server/saved_objects/routes/integration_tests/delete.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/delete.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerDeleteRoute } from '../delete';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts b/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts
index 2501a430df8a3..60d916744babc 100644
--- a/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts
@@ -8,10 +8,10 @@
 
 import supertest from 'supertest';
 import { registerDeleteUnknownTypesRoute } from '../deprecations';
-import { elasticsearchServiceMock } from '../../../../../core/server/elasticsearch/elasticsearch_service.mock';
+import { elasticsearchServiceMock } from '../../../elasticsearch/elasticsearch_service.mock';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
 import { setupServer } from '../test_utils';
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '../../..';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;
 
diff --git a/src/core/server/saved_objects/routes/integration_tests/find.test.ts b/src/core/server/saved_objects/routes/integration_tests/find.test.ts
index 43821c03cbcd6..c18044f8973b8 100644
--- a/src/core/server/saved_objects/routes/integration_tests/find.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/find.test.ts
@@ -10,7 +10,7 @@ import supertest from 'supertest';
 import querystring from 'querystring';
 
 import { registerFindRoute } from '../find';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
index 6f2dfe86a1525..d36b8b07f78f0 100644
--- a/src/core/server/saved_objects/routes/integration_tests/import.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
@@ -10,7 +10,7 @@ jest.mock('uuid');
 
 import supertest from 'supertest';
 import { registerImportRoute } from '../import';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts b/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
index a7f1b1e304aa7..956da9aa13524 100644
--- a/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
@@ -10,7 +10,7 @@ jest.mock('uuid');
 
 import supertest from 'supertest';
 import { registerResolveImportErrorsRoute } from '../resolve_import_errors';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/update.test.ts b/src/core/server/saved_objects/routes/integration_tests/update.test.ts
index 4aa01f7f697a8..78e7b9c1e93d5 100644
--- a/src/core/server/saved_objects/routes/integration_tests/update.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/update.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerUpdateRoute } from '../update';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/export.ts b/src/core/server/saved_objects/routes/legacy_import_export/export.ts
index c9a954db07e7a..7141d74b71904 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/export.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/export.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
-import { InternalCoreUsageDataSetup } from 'src/core/server/core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../../core_usage_data';
 import { IRouter, Logger } from '../../..';
 import { exportDashboards } from './lib';
 
@@ -38,7 +38,7 @@ export const registerLegacyExportRoute = (
       );
 
       const ids = Array.isArray(req.query.dashboard) ? req.query.dashboard : [req.query.dashboard];
-      const { client } = ctx.core.savedObjects;
+      const { client } = (await ctx.core).savedObjects;
 
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementLegacyDashboardsExport({ request: req }).catch(() => {});
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/import.ts b/src/core/server/saved_objects/routes/legacy_import_export/import.ts
index 09027af810149..d98c14f9b620d 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/import.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/import.ts
@@ -46,7 +46,7 @@ export const registerLegacyImportRoute = (
         "The import dashboard API '/api/kibana/dashboards/import' is deprecated. Use the saved objects import objects API '/api/saved_objects/_import' instead."
       );
 
-      const { client } = ctx.core.savedObjects;
+      const { client } = (await ctx.core).savedObjects;
       const objects = req.body.objects as SavedObject[];
       const { force, exclude } = req.query;
 
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts
index c27dc29fed65d..b9752b39f8e78 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts
@@ -37,7 +37,7 @@ import { coreUsageStatsClientMock } from '../../../../core_usage_data/core_usage
 import { coreUsageDataServiceMock } from '../../../../core_usage_data/core_usage_data_service.mock';
 import { registerLegacyExportRoute } from '../export';
 import { setupServer } from '../../test_utils';
-import { loggerMock } from 'src/core/server/logging/logger.mock';
+import { loggerMock } from '../../../../logging/logger.mock';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;
 let coreUsageStatsClient: jest.Mocked<CoreUsageStatsClient>;
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts
index dfc9787d8f59a..8a414094fde99 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts
@@ -37,7 +37,7 @@ import { coreUsageStatsClientMock } from '../../../../core_usage_data/core_usage
 import { coreUsageDataServiceMock } from '../../../../core_usage_data/core_usage_data_service.mock';
 import { registerLegacyImportRoute } from '../import';
 import { setupServer } from '../../test_utils';
-import { loggerMock } from 'src/core/server/logging/logger.mock';
+import { loggerMock } from '../../../../logging/logger.mock';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;
 let coreUsageStatsClient: jest.Mocked<CoreUsageStatsClient>;
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts
index 4f5da2a783cd7..1c85ceedf90e6 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectAttributes } from 'src/core/server';
+import { SavedObject, SavedObjectAttributes } from '../../../..';
 import { savedObjectsClientMock } from '../../../../mocks';
 import { collectReferencesDeep } from './collect_references_deep';
 
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts
index 67f739eacbb53..a02fc37e4b863 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from '../../../..';
 
 const MAX_BULK_GET_SIZE = 10000;
 
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts
index e1beafc03b224..9d0ed7889cdc7 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '../../../..';
 import { collectReferencesDeep } from './collect_references_deep';
 
 export async function exportDashboards(
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts
index 93ec512017c2d..11192cc0ad2f4 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from '../../../..';
 
 export async function importDashboards(
   savedObjectsClient: SavedObjectsClientContract,
diff --git a/src/core/server/saved_objects/routes/resolve.ts b/src/core/server/saved_objects/routes/resolve.ts
index 78e85d17fe1fa..ae09f6526baa3 100644
--- a/src/core/server/saved_objects/routes/resolve.ts
+++ b/src/core/server/saved_objects/routes/resolve.ts
@@ -27,11 +27,12 @@ export const registerResolveRoute = (router: IRouter, { coreUsageData }: RouteDe
     },
     router.handleLegacyErrors(async (context, req, res) => {
       const { type, id } = req.params;
+      const { savedObjects } = await context.core;
 
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsResolve({ request: req }).catch(() => {});
 
-      const result = await context.core.savedObjects.client.resolve(type, id);
+      const result = await savedObjects.client.resolve(type, id);
       return res.ok({ body: result });
     })
   );
diff --git a/src/core/server/saved_objects/routes/resolve_import_errors.ts b/src/core/server/saved_objects/routes/resolve_import_errors.ts
index f1fe2e9cfe431..bf536e906d7da 100644
--- a/src/core/server/saved_objects/routes/resolve_import_errors.ts
+++ b/src/core/server/saved_objects/routes/resolve_import_errors.ts
@@ -92,7 +92,7 @@ export const registerResolveImportErrorsRoute = (
         });
       }
 
-      const { getClient, getImporter, typeRegistry } = context.core.savedObjects;
+      const { getClient, getImporter, typeRegistry } = (await context.core).savedObjects;
 
       const includedHiddenTypes = chain(req.body.retries)
         .map('type')
diff --git a/src/core/server/saved_objects/routes/update.ts b/src/core/server/saved_objects/routes/update.ts
index f21fc183cdade..5383ab76a1e4d 100644
--- a/src/core/server/saved_objects/routes/update.ts
+++ b/src/core/server/saved_objects/routes/update.ts
@@ -49,7 +49,8 @@ export const registerUpdateRoute = (router: IRouter, { coreUsageData }: RouteDep
       const usageStatsClient = coreUsageData.getClient();
       usageStatsClient.incrementSavedObjectsUpdate({ request: req }).catch(() => {});
 
-      const result = await context.core.savedObjects.client.update(type, id, attributes, options);
+      const { savedObjects } = await context.core;
+      const result = await savedObjects.client.update(type, id, attributes, options);
       return res.ok({ body: result });
     })
   );
diff --git a/src/core/server/saved_objects/routes/utils.test.ts b/src/core/server/saved_objects/routes/utils.test.ts
index 51dd5d0918fd4..9c245e58b5947 100644
--- a/src/core/server/saved_objects/routes/utils.test.ts
+++ b/src/core/server/saved_objects/routes/utils.test.ts
@@ -17,7 +17,7 @@ import {
   RequestHandlerContext,
   KibanaResponseFactory,
   kibanaResponseFactory,
-} from '../../';
+} from '../..';
 
 async function readStreamToCompletion(stream: Readable) {
   return createPromiseFromStreams([stream, createConcatStream([])]);
diff --git a/src/core/server/saved_objects/routes/utils.ts b/src/core/server/saved_objects/routes/utils.ts
index 47996847a8387..54a15f599c307 100644
--- a/src/core/server/saved_objects/routes/utils.ts
+++ b/src/core/server/saved_objects/routes/utils.ts
@@ -7,11 +7,6 @@
  */
 
 import { Readable } from 'stream';
-import {
-  RequestHandlerWrapper,
-  SavedObject,
-  SavedObjectsExportResultDetails,
-} from 'src/core/server';
 import {
   createSplitStream,
   createMapStream,
@@ -21,6 +16,7 @@ import {
   createConcatStream,
 } from '@kbn/utils';
 import Boom from '@hapi/boom';
+import { RequestHandlerWrapper, SavedObject, SavedObjectsExportResultDetails } from '../..';
 
 export async function createSavedObjectsStreamFromNdJson(ndJsonStream: Readable) {
   const savedObjects = await createPromiseFromStreams([
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 a8bda95af46f9..dea9ea224512a 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -36,6 +36,7 @@ import { NodesVersionCompatibility } from '../elasticsearch/version_check/ensure
 import { SavedObjectsRepository } from './service/lib/repository';
 import { registerCoreObjectTypes } from './object_types';
 import { getSavedObjectsDeprecationsProvider } from './deprecations';
+import { docLinksServiceMock } from '../doc_links/doc_links_service.mock';
 
 jest.mock('./service/lib/repository');
 jest.mock('./object_types');
@@ -79,6 +80,7 @@ describe('SavedObjectsService', () => {
     return {
       pluginsInitialized,
       elasticsearch: elasticsearchServiceMock.createInternalStart(),
+      docLinks: docLinksServiceMock.createStartContract(),
     };
   };
 
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 0fc5057d1b88b..1598d2b1d2764 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -13,7 +13,7 @@ import {
   SavedObjectsClient,
   SavedObjectsClientProvider,
   SavedObjectsClientProviderOptions,
-} from './';
+} from '.';
 import { KibanaMigrator, IKibanaMigrator } from './migrations';
 import { CoreContext } from '../core_context';
 import { InternalCoreUsageDataSetup } from '../core_usage_data';
@@ -50,6 +50,7 @@ import { ServiceStatus } from '../status';
 import { calculateStatus$ } from './status';
 import { registerCoreObjectTypes } from './object_types';
 import { getSavedObjectsDeprecationsProvider } from './deprecations';
+import { DocLinksServiceStart } from '../doc_links';
 
 const kibanaIndex = '.kibana';
 
@@ -284,6 +285,7 @@ interface WrappedClientFactoryWrapper {
 export interface SavedObjectsStartDeps {
   elasticsearch: InternalElasticsearchServiceStart;
   pluginsInitialized?: boolean;
+  docLinks: DocLinksServiceStart;
 }
 
 export class SavedObjectsService
@@ -383,6 +385,7 @@ export class SavedObjectsService
   public async start({
     elasticsearch,
     pluginsInitialized = true,
+    docLinks,
   }: SavedObjectsStartDeps): Promise<InternalSavedObjectsServiceStart> {
     if (!this.setupDeps || !this.config) {
       throw new Error('#setup() needs to be run first');
@@ -394,7 +397,8 @@ export class SavedObjectsService
 
     const migrator = this.createMigrator(
       this.config.migration,
-      elasticsearch.client.asInternalUser
+      elasticsearch.client.asInternalUser,
+      docLinks
     );
 
     this.migrator$.next(migrator);
@@ -509,7 +513,8 @@ export class SavedObjectsService
 
   private createMigrator(
     soMigrationsConfig: SavedObjectsMigrationConfigType,
-    client: ElasticsearchClient
+    client: ElasticsearchClient,
+    docLinks: DocLinksServiceStart
   ): IKibanaMigrator {
     return new KibanaMigrator({
       typeRegistry: this.typeRegistry,
@@ -518,6 +523,7 @@ export class SavedObjectsService
       soMigrationsConfig,
       kibanaIndex,
       client,
+      docLinks,
     });
   }
 
diff --git a/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts b/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts
index fb7e25fae19f2..454212c5a8673 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts
@@ -19,6 +19,7 @@ import { sortSchema } from './common_schemas';
  * - max
  * - sum
  * - top_hits
+ * - value_count
  * - weighted_avg
  *
  * Not implemented:
@@ -76,6 +77,9 @@ export const metricsAggsSchemas: Record<string, ObjectType> = {
     highlight: s.maybe(s.any()),
     _source: s.maybe(s.oneOf([s.boolean(), s.string(), s.arrayOf(s.string())])),
   }),
+  value_count: s.object({
+    field: s.maybe(s.string()),
+  }),
   weighted_avg: s.object({
     format: s.maybe(s.string()),
     value_type: s.maybe(s.string()),
diff --git a/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.mock.ts b/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.mock.ts
index 728f3b847b631..5476f99c3b37d 100644
--- a/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.mock.ts
+++ b/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.mock.ts
@@ -7,6 +7,7 @@
  */
 
 import type { findLegacyUrlAliases } from './legacy_url_aliases';
+import type { findSharedOriginObjects } from './find_shared_origin_objects';
 import type * as InternalUtils from './internal_utils';
 
 export const mockFindLegacyUrlAliases = jest.fn() as jest.MockedFunction<
@@ -17,6 +18,14 @@ jest.mock('./legacy_url_aliases', () => {
   return { findLegacyUrlAliases: mockFindLegacyUrlAliases };
 });
 
+export const mockFindSharedOriginObjects = jest.fn() as jest.MockedFunction<
+  typeof findSharedOriginObjects
+>;
+
+jest.mock('./find_shared_origin_objects', () => {
+  return { findSharedOriginObjects: mockFindSharedOriginObjects };
+});
+
 export const mockRawDocExistsInNamespace = jest.fn() as jest.MockedFunction<
   typeof InternalUtils['rawDocExistsInNamespace']
 >;
diff --git a/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.ts b/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.ts
index 202b5ca4386c9..bac745995ce07 100644
--- a/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.ts
+++ b/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.test.ts
@@ -8,6 +8,7 @@
 
 import {
   mockFindLegacyUrlAliases,
+  mockFindSharedOriginObjects,
   mockRawDocExistsInNamespace,
 } from './collect_multi_namespace_references.test.mock';
 
@@ -15,7 +16,7 @@ import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
 import { SavedObjectsSerializer } from '../../serialization';
 import {
-  ALIAS_SEARCH_PER_PAGE,
+  ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE,
   CollectMultiNamespaceReferencesParams,
   SavedObjectsCollectMultiNamespaceReferencesObject,
   SavedObjectsCollectMultiNamespaceReferencesOptions,
@@ -35,6 +36,8 @@ const MULTI_NAMESPACE_HIDDEN_OBJ_TYPE = 'type-d';
 beforeEach(() => {
   mockFindLegacyUrlAliases.mockReset();
   mockFindLegacyUrlAliases.mockResolvedValue(new Map()); // return an empty map by default
+  mockFindSharedOriginObjects.mockReset();
+  mockFindSharedOriginObjects.mockResolvedValue(new Map()); // return an empty map by default
   mockRawDocExistsInNamespace.mockReset();
   mockRawDocExistsInNamespace.mockReturnValue(true); // return true by default
 });
@@ -82,6 +85,7 @@ describe('collectMultiNamespaceReferences', () => {
   function mockMgetResults(
     ...results: Array<{
       found: boolean;
+      originId?: string;
       references?: Array<{ type: string; id: string }>;
     }>
   ) {
@@ -95,6 +99,7 @@ describe('collectMultiNamespaceReferences', () => {
               _index: 'doesnt-matter',
               _source: {
                 namespaces: SPACES,
+                originId: x.originId,
                 references,
               },
               ...VERSION_PROPS,
@@ -321,7 +326,7 @@ describe('collectMultiNamespaceReferences', () => {
       expect(mockFindLegacyUrlAliases).toHaveBeenCalledWith(
         expect.anything(),
         [obj1, obj2, obj3],
-        ALIAS_SEARCH_PER_PAGE
+        ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE
       );
       expect(result.objects).toEqual([
         {
@@ -346,7 +351,7 @@ describe('collectMultiNamespaceReferences', () => {
       expect(mockFindLegacyUrlAliases).toHaveBeenCalledWith(
         expect.anything(),
         [obj1],
-        ALIAS_SEARCH_PER_PAGE
+        ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE
       );
     });
 
@@ -363,4 +368,81 @@ describe('collectMultiNamespaceReferences', () => {
       );
     });
   });
+
+  describe('shared origins', () => {
+    it('uses findSharedOriginObjects to search for objects with shared origins', async () => {
+      const obj1 = { type: MULTI_NAMESPACE_OBJ_TYPE_1, id: 'id-1' };
+      const obj2 = { type: MULTI_NAMESPACE_OBJ_TYPE_1, id: 'id-x', originId: 'id-2' };
+      const obj3 = { type: MULTI_NAMESPACE_OBJ_TYPE_1, id: 'id-3' };
+      const params = setup([obj1, obj2], {});
+      mockMgetResults(
+        // results for obj1 and obj2
+        { found: true, references: [obj3] },
+        { found: true, originId: obj2.originId, references: [] }
+      );
+      mockMgetResults({ found: true, references: [] }); // results for obj3
+      mockFindSharedOriginObjects.mockResolvedValue(
+        new Map([
+          [`${obj1.type}:${obj1.id}`, new Set(['space-1'])],
+          [`${obj2.type}:${obj2.originId}`, new Set(['*'])],
+          [`${obj3.type}:${obj3.id}`, new Set(['space-1', 'space-2'])],
+        ])
+      );
+
+      const result = await collectMultiNamespaceReferences(params);
+      expect(client.mget).toHaveBeenCalledTimes(2);
+      expectMgetArgs(1, obj1, obj2);
+      expectMgetArgs(2, obj3); // obj3 is retrieved in a second cluster call
+      expect(mockFindSharedOriginObjects).toHaveBeenCalledTimes(1);
+      expect(mockFindSharedOriginObjects).toHaveBeenCalledWith(
+        expect.anything(),
+        [
+          { type: obj1.type, origin: obj1.id },
+          { type: obj2.type, origin: obj2.originId }, // If the found object has an `originId`, that is used instead of the object's `id`.
+          { type: obj3.type, origin: obj3.id },
+        ],
+        ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE
+      );
+      expect(result.objects).toEqual([
+        // Note: in a realistic scenario, `spacesWithMatchingOrigins` would be a superset of `spaces`. But for the purposes of this unit
+        // test, it doesn't matter if they are different.
+        { ...obj1, spaces: SPACES, inboundReferences: [], spacesWithMatchingOrigins: ['space-1'] },
+        { ...obj2, spaces: SPACES, inboundReferences: [], spacesWithMatchingOrigins: ['*'] },
+        {
+          ...obj3,
+          spaces: SPACES,
+          inboundReferences: [{ ...obj1, name: 'ref-name' }],
+          spacesWithMatchingOrigins: ['space-1', 'space-2'],
+        },
+      ]);
+    });
+
+    it('omits objects that have an empty spaces array (the object does not exist, or we are not sure)', async () => {
+      const obj1 = { type: MULTI_NAMESPACE_OBJ_TYPE_1, id: 'id-1' };
+      const obj2 = { type: MULTI_NAMESPACE_OBJ_TYPE_1, id: 'id-2' };
+      const params = setup([obj1, obj2]);
+      mockMgetResults({ found: true }, { found: false }); // results for obj1 and obj2
+
+      await collectMultiNamespaceReferences(params);
+      expect(mockFindSharedOriginObjects).toHaveBeenCalledTimes(1);
+      expect(mockFindSharedOriginObjects).toHaveBeenCalledWith(
+        expect.anything(),
+        [{ type: obj1.type, origin: obj1.id }],
+        ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE
+      );
+    });
+
+    it('handles findSharedOriginObjects errors', async () => {
+      const obj1 = { type: MULTI_NAMESPACE_OBJ_TYPE_1, id: 'id-1' };
+      const params = setup([obj1]);
+      mockMgetResults({ found: true }); // results for obj1
+      mockFindSharedOriginObjects.mockRejectedValue(
+        new Error('Failed to retrieve shared origin objects: Oh no!')
+      );
+
+      await expect(() => collectMultiNamespaceReferences(params)).rejects.toThrow(
+        'Failed to retrieve shared origin objects: Oh no!'
+      );
+    });
+  });
 });
diff --git a/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.ts b/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.ts
index a404f2e9475b7..a6336a89ac6fe 100644
--- a/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.ts
+++ b/src/core/server/saved_objects/service/lib/collect_multi_namespace_references.ts
@@ -21,6 +21,7 @@ import {
 } from './internal_utils';
 import type { CreatePointInTimeFinderFn } from './point_in_time_finder';
 import type { RepositoryEsClient } from './repository_es_client';
+import { findSharedOriginObjects } from './find_shared_origin_objects';
 
 /**
  * When we collect an object's outbound references, we will only go a maximum of this many levels deep before we throw an error.
@@ -28,13 +29,13 @@ import type { RepositoryEsClient } from './repository_es_client';
 const MAX_REFERENCE_GRAPH_DEPTH = 20;
 
 /**
- * How many aliases to search for per page. This is smaller than the PointInTimeFinder's default of 1000. We specify 100 for the page count
- * because this is a relatively unimportant operation, and we want to avoid blocking the Elasticsearch thread pool for longer than
- * necessary.
+ * How many aliases or objects with shared origins to search for per page. This is smaller than the PointInTimeFinder's default of 1000. We
+ * specify 100 for the page count because this is a relatively unimportant operation, and we want to avoid blocking the Elasticsearch thread
+ * pool for longer than necessary.
  *
  * @internal
  */
-export const ALIAS_SEARCH_PER_PAGE = 100;
+export const ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE = 100;
 
 /**
  * An object to collect references for. It must be a multi-namespace type (in other words, the object type must be registered with the
@@ -71,6 +72,8 @@ export interface SavedObjectReferenceWithContext {
   type: string;
   /** The ID of the referenced object */
   id: string;
+  /** The origin ID of the referenced object (if it has one) */
+  originId?: string;
   /** The space(s) that the referenced object exists in */
   spaces: string[];
   /**
@@ -89,6 +92,8 @@ export interface SavedObjectReferenceWithContext {
   isMissing?: boolean;
   /** The space(s) that legacy URL aliases matching this type/id exist in */
   spacesWithMatchingAliases?: string[];
+  /** The space(s) that objects matching this origin exist in (including this one) */
+  spacesWithMatchingOrigins?: string[];
 }
 
 /**
@@ -140,8 +145,16 @@ export async function collectMultiNamespaceReferences(
     });
     const { type, id } = parseObjectKey(referenceKey);
     const object = objectMap.get(referenceKey);
+    const originId = object?.originId;
     const spaces = object?.namespaces ?? [];
-    return { type, id, spaces, inboundReferences, ...(object === null && { isMissing: true }) };
+    return {
+      type,
+      id,
+      originId,
+      spaces,
+      inboundReferences,
+      ...(object === null && { isMissing: true }),
+    };
   });
 
   const objectsToFindAliasesFor = objectsWithContext
@@ -150,13 +163,22 @@ export async function collectMultiNamespaceReferences(
   const aliasesMap = await findLegacyUrlAliases(
     createPointInTimeFinder,
     objectsToFindAliasesFor,
-    ALIAS_SEARCH_PER_PAGE
+    ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE
+  );
+  const objectOriginsToSearchFor = objectsWithContext
+    .filter(({ spaces }) => spaces.length !== 0)
+    .map(({ type, id, originId }) => ({ type, origin: originId || id }));
+  const originsMap = await findSharedOriginObjects(
+    createPointInTimeFinder,
+    objectOriginsToSearchFor,
+    ALIAS_OR_SHARED_ORIGIN_SEARCH_PER_PAGE
   );
   const results = objectsWithContext.map((obj) => {
-    const key = getObjectKey(obj);
-    const val = aliasesMap.get(key);
-    const spacesWithMatchingAliases = val && Array.from(val);
-    return { ...obj, spacesWithMatchingAliases };
+    const aliasesVal = aliasesMap.get(getObjectKey(obj));
+    const spacesWithMatchingAliases = aliasesVal && Array.from(aliasesVal).sort();
+    const originsVal = originsMap.get(getObjectKey({ type: obj.type, id: obj.originId || obj.id }));
+    const spacesWithMatchingOrigins = originsVal && Array.from(originsVal).sort();
+    return { ...obj, spacesWithMatchingAliases, spacesWithMatchingOrigins };
   });
 
   return {
diff --git a/src/core/server/saved_objects/service/lib/find_shared_origin_objects.test.ts b/src/core/server/saved_objects/service/lib/find_shared_origin_objects.test.ts
new file mode 100644
index 0000000000000..c8e0796dea18e
--- /dev/null
+++ b/src/core/server/saved_objects/service/lib/find_shared_origin_objects.test.ts
@@ -0,0 +1,153 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
+
+import type { CreatePointInTimeFinderFn, PointInTimeFinder } from './point_in_time_finder';
+import { savedObjectsPointInTimeFinderMock } from './point_in_time_finder.mock';
+import type { ISavedObjectsRepository } from './repository';
+import { savedObjectsRepositoryMock } from './repository.mock';
+import { findSharedOriginObjects } from './find_shared_origin_objects';
+
+interface MockFindResultParams {
+  type: string;
+  id: string;
+  originId?: string;
+  namespaces: string[];
+}
+
+describe('findSharedOriginObjects', () => {
+  let savedObjectsMock: jest.Mocked<ISavedObjectsRepository>;
+  let pointInTimeFinder: DeeplyMockedKeys<PointInTimeFinder>;
+  let createPointInTimeFinder: jest.MockedFunction<CreatePointInTimeFinderFn>;
+
+  beforeEach(() => {
+    savedObjectsMock = savedObjectsRepositoryMock.create();
+    savedObjectsMock.find.mockResolvedValue({
+      pit_id: 'foo',
+      saved_objects: [],
+      // the rest of these fields don't matter but are included for type safety
+      total: 0,
+      page: 1,
+      per_page: 100,
+    });
+    pointInTimeFinder = savedObjectsPointInTimeFinderMock.create({ savedObjectsMock })(); // PIT finder mock uses the actual implementation, but it doesn't need to be created with real params because the SOR is mocked too
+    createPointInTimeFinder = jest.fn().mockReturnValue(pointInTimeFinder);
+  });
+
+  function mockFindResults(...results: MockFindResultParams[]) {
+    savedObjectsMock.find.mockResolvedValueOnce({
+      pit_id: 'foo',
+      saved_objects: results.map(({ type, id, originId, namespaces }) => ({
+        type,
+        id,
+        namespaces,
+        ...(originId && { originId }),
+        attributes: {},
+        references: [],
+        score: 0, // doesn't matter
+      })),
+      // the rest of these fields don't matter but are included for type safety
+      total: 0,
+      page: 1,
+      per_page: 100,
+    });
+  }
+
+  const obj1 = { type: 'type-1', origin: 'id-1' };
+  const obj2 = { type: 'type-2', origin: 'id-2' };
+  const obj3 = { type: 'type-3', origin: 'id-3' };
+  const obj4 = { type: 'type-4', origin: 'id-4' };
+
+  it('uses the PointInTimeFinder to search for legacy URL aliases', async () => {
+    mockFindResults(
+      { type: 'type-1', id: 'id-1', namespaces: ['space-a', 'space-b'] },
+      { type: 'type-1', id: 'id-x', originId: 'id-1', namespaces: ['space-b', 'space-c'] },
+      { type: 'type-2', id: 'id-2', namespaces: ['*', 'space-d'] },
+      { type: 'type-2', id: 'id-y', originId: 'id-2', namespaces: ['space-e'] },
+      { type: 'type-3', id: 'id-3', namespaces: ['f'] },
+      { type: 'type-3', id: 'id-z', originId: 'id-3', namespaces: ['*', 'space-g'] }
+      // no results matching obj4
+    );
+
+    const objects = [obj1, obj2, obj3, obj4];
+    const result = await findSharedOriginObjects(createPointInTimeFinder, objects);
+    expect(createPointInTimeFinder).toHaveBeenCalledTimes(1);
+    expect(createPointInTimeFinder).toHaveBeenCalledWith(
+      expect.objectContaining({ type: ['type-1', 'type-2', 'type-3', 'type-4'] }) // filter assertions are below
+    );
+    const kueryFilterArgs = createPointInTimeFinder.mock.calls[0][0].filter.arguments;
+    expect(kueryFilterArgs).toHaveLength(8); // 2 for each object
+    [obj1, obj2, obj3].forEach(({ type, origin }, i) => {
+      expect(kueryFilterArgs[i * 2].arguments).toEqual(
+        expect.arrayContaining([
+          { type: 'literal', value: `${type}.id` },
+          { type: 'literal', value: `${type}:${origin}` },
+        ])
+      );
+      expect(kueryFilterArgs[i * 2 + 1].arguments).toEqual(
+        expect.arrayContaining([
+          { type: 'literal', value: `${type}.originId` },
+          { type: 'literal', value: origin },
+        ])
+      );
+    });
+    expect(pointInTimeFinder.find).toHaveBeenCalledTimes(1);
+    expect(pointInTimeFinder.close).toHaveBeenCalledTimes(2);
+    expect(result).toEqual(
+      // This contains multiple assertions about the response:
+      // 1. A match's `id` is ignored if it has a defined `originId`
+      // 2. The `namespaces` from different matches are combined into a single set, and duplicate space IDs are filtered out
+      // 3. If the first match's `namespaces` array contains '*', all other space IDs are filtered out
+      // 4. If the last match's `namespaces` array contains '*', all other space IDs are filtered out
+      // 5. Objects that have no matches will not have an entry in the result map
+      new Map([
+        ['type-1:id-1', new Set(['space-a', 'space-b', 'space-c'])],
+        ['type-2:id-2', new Set(['*'])],
+        ['type-3:id-3', new Set(['*'])],
+        // the result map does not contain keys for obj4 because we did not find any matches for that object
+      ])
+    );
+  });
+
+  it('allows perPage to be set', async () => {
+    const objects = [obj1, obj2, obj3];
+    await findSharedOriginObjects(createPointInTimeFinder, objects, 999);
+    expect(createPointInTimeFinder).toHaveBeenCalledTimes(1);
+    expect(createPointInTimeFinder).toHaveBeenCalledWith(expect.objectContaining({ perPage: 999 }));
+  });
+
+  it('does not create a PointInTimeFinder if no objects are passed in', async () => {
+    await findSharedOriginObjects(createPointInTimeFinder, []);
+    expect(createPointInTimeFinder).not.toHaveBeenCalled();
+  });
+
+  it('handles PointInTimeFinder.find errors', async () => {
+    savedObjectsMock.find.mockRejectedValue(new Error('Oh no!'));
+
+    const objects = [obj1, obj2, obj3];
+    await expect(() => findSharedOriginObjects(createPointInTimeFinder, objects)).rejects.toThrow(
+      'Failed to retrieve shared origin objects: Oh no!'
+    );
+    expect(createPointInTimeFinder).toHaveBeenCalledTimes(1);
+    expect(pointInTimeFinder.find).toHaveBeenCalledTimes(1);
+    expect(pointInTimeFinder.close).toHaveBeenCalledTimes(2); // we still close the point-in-time, even though the search failed
+  });
+
+  it('handles PointInTimeFinder.close errors', async () => {
+    pointInTimeFinder.close.mockRejectedValue(new Error('Oh no!'));
+
+    const objects = [obj1, obj2, obj3];
+    await expect(() => findSharedOriginObjects(createPointInTimeFinder, objects)).rejects.toThrow(
+      'Failed to retrieve shared origin objects: Oh no!'
+    );
+    expect(createPointInTimeFinder).toHaveBeenCalledTimes(1);
+    expect(pointInTimeFinder.find).toHaveBeenCalledTimes(1);
+    expect(pointInTimeFinder.close).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/src/core/server/saved_objects/service/lib/find_shared_origin_objects.ts b/src/core/server/saved_objects/service/lib/find_shared_origin_objects.ts
new file mode 100644
index 0000000000000..229e0c6f90a66
--- /dev/null
+++ b/src/core/server/saved_objects/service/lib/find_shared_origin_objects.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as esKuery from '@kbn/es-query';
+import { getObjectKey } from './internal_utils';
+import type { CreatePointInTimeFinderFn } from './point_in_time_finder';
+import { ALL_NAMESPACES_STRING } from './utils';
+
+interface ObjectOrigin {
+  /** The object's type. */
+  type: string;
+  /** The object's origin is its `originId` field, or its `id` field if that is unavailable. */
+  origin: string;
+}
+
+/**
+ * Fetches all objects with a shared origin, returning a map of the matching aliases and what space(s) they exist in.
+ *
+ * @internal
+ */
+export async function findSharedOriginObjects(
+  createPointInTimeFinder: CreatePointInTimeFinderFn,
+  objects: ObjectOrigin[],
+  perPage?: number
+) {
+  if (!objects.length) {
+    return new Map<string, Set<string>>();
+  }
+
+  const uniqueObjectTypes = objects.reduce((acc, { type }) => acc.add(type), new Set<string>());
+  const filter = createAliasKueryFilter(objects);
+  const finder = createPointInTimeFinder({
+    type: [...uniqueObjectTypes],
+    perPage,
+    filter,
+    fields: ['not-a-field'], // Specify a non-existent field to avoid fetching all type-level fields (we only care about root-level fields)
+    namespaces: [ALL_NAMESPACES_STRING], // We need to search across all spaces to have accurate results
+  });
+  // NOTE: this objectsMap is only used internally (not in an API that is documented for public consumption), and it contains the minimal
+  // amount of information to satisfy our UI needs today. We will need to change this in the future when we implement merging in #130311.
+  const objectsMap = new Map<string, Set<string>>();
+  let error: Error | undefined;
+  try {
+    for await (const { saved_objects: savedObjects } of finder.find()) {
+      for (const savedObject of savedObjects) {
+        const { type, id, originId, namespaces = [] } = savedObject;
+        const key = getObjectKey({ type, id: originId || id });
+        const val = objectsMap.get(key) ?? new Set<string>();
+        const filteredNamespaces =
+          namespaces.includes(ALL_NAMESPACES_STRING) || val.has(ALL_NAMESPACES_STRING)
+            ? [ALL_NAMESPACES_STRING]
+            : [...val, ...namespaces];
+        objectsMap.set(key, new Set([...filteredNamespaces]));
+      }
+    }
+  } catch (e) {
+    error = e;
+  }
+
+  try {
+    await finder.close();
+  } catch (e) {
+    if (!error) {
+      error = e;
+    }
+  }
+
+  if (error) {
+    throw new Error(`Failed to retrieve shared origin objects: ${error.message}`);
+  }
+  return objectsMap;
+}
+
+function createAliasKueryFilter(objects: Array<{ type: string; origin: string }>) {
+  const { buildNode } = esKuery.nodeTypes.function;
+  // Note: these nodes include '.attributes' for type-level fields because these are eventually passed to `validateConvertFilterToKueryNode`, which requires it
+  const kueryNodes = objects
+    .reduce<unknown[]>((acc, { type, origin }) => {
+      // Escape Kuery values to prevent parsing errors and unintended behavior (object types/IDs can contain KQL special characters/operators)
+      const match1 = buildNode('is', `${type}.id`, esKuery.escapeKuery(`${type}:${origin}`)); // here we are looking for the raw document `_id` field, which has a `type:` prefix
+      const match2 = buildNode('is', `${type}.originId`, esKuery.escapeKuery(origin)); // here we are looking for the saved object's `originId` field, which does not have a `type:` prefix
+      acc.push([match1, match2]);
+      return acc;
+    }, [])
+    .flat();
+  return buildNode('or', kueryNodes);
+}
diff --git a/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts b/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts
index 1c18f0ed9b990..749eff0e33875 100644
--- a/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts
+++ b/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts
@@ -12,7 +12,7 @@ import {
   mockIsNotFoundFromUnsupportedServer,
 } from './internal_bulk_resolve.test.mock';
 
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 import { LEGACY_URL_ALIAS_TYPE } from '../../object_types';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
 import { SavedObjectsSerializer } from '../../serialization';
diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts
index 160852f9160b7..e4045f53eadad 100644
--- a/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts
+++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { loggerMock, MockedLogger } from '../../../logging/logger.mock';
-import type { SavedObjectsFindResult } from '../';
+import type { SavedObjectsFindResult } from '..';
 import { savedObjectsRepositoryMock } from './repository.mock';
 
 import {
diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.ts
index 5c630d1416cc3..54cc527f28058 100644
--- a/src/core/server/saved_objects/service/lib/point_in_time_finder.ts
+++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.ts
@@ -8,7 +8,7 @@
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Logger } from '../../../logging';
 import type { SavedObjectsFindOptions, SavedObjectsClientContract } from '../../types';
-import type { SavedObjectsFindResponse } from '../';
+import type { SavedObjectsFindResponse } from '..';
 
 type PointInTimeFinderClient = Pick<
   SavedObjectsClientContract,
diff --git a/src/core/server/saved_objects/service/lib/repository.test.ts b/src/core/server/saved_objects/service/lib/repository.test.ts
index 1df3ef351c6ae..746ed0033a1d2 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.ts
+++ b/src/core/server/saved_objects/service/lib/repository.test.ts
@@ -75,7 +75,7 @@ import {
   SavedObjectsCollectMultiNamespaceReferencesResponse,
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
-} from 'kibana/server';
+} from '../../..';
 import { InternalBulkResolveError } from './internal_bulk_resolve';
 
 const { nodeTypes } = esKuery;
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index abfea6e7ebafc..db57e74bae138 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -9,7 +9,7 @@
 import { omit, isObject } from 'lodash';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import * as esKuery from '@kbn/es-query';
-import type { ElasticsearchClient } from '../../../elasticsearch/';
+import type { ElasticsearchClient } from '../../../elasticsearch';
 import { isSupportedEsServer, isNotFoundFromUnsupportedServer } from '../../../elasticsearch';
 import type { Logger } from '../../../logging';
 import { getRootPropertiesObjects, IndexMapping } from '../../mappings';
diff --git a/src/core/server/saved_objects/service/lib/repository_es_client.ts b/src/core/server/saved_objects/service/lib/repository_es_client.ts
index e9893d4b2d570..9c9d84d975d0d 100644
--- a/src/core/server/saved_objects/service/lib/repository_es_client.ts
+++ b/src/core/server/saved_objects/service/lib/repository_es_client.ts
@@ -8,7 +8,7 @@
 
 import type { TransportRequestOptions } from '@elastic/elasticsearch';
 
-import { ElasticsearchClient } from '../../../elasticsearch/';
+import { ElasticsearchClient } from '../../../elasticsearch';
 import { retryCallCluster } from '../../../elasticsearch/client/retry_call_cluster';
 import { decorateEsError } from './decorate_es_error';
 
diff --git a/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts b/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts
index 38bdba0208b8d..43a9d44d9fd60 100644
--- a/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts
+++ b/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts
@@ -13,7 +13,7 @@ import {
   mockDeleteLegacyUrlAliases,
 } from './update_objects_spaces.test.mock';
 
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 
 import { loggerMock } from '../../../logging/logger.mock';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
diff --git a/src/core/server/saved_objects/service/saved_objects_client.test.ts b/src/core/server/saved_objects/service/saved_objects_client.test.ts
index 3c24df6dcc1a4..7017d0d854b6f 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.test.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.test.ts
@@ -28,7 +28,7 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
-} from 'kibana/server';
+} from '../..';
 
 describe('', () => {
   let mockRepository: ReturnType<typeof savedObjectsRepositoryMock.create>;
diff --git a/src/core/server/saved_objects/validation/schema.test.ts b/src/core/server/saved_objects/validation/schema.test.ts
index 7b75dd2cec4fb..3aadad0267bfb 100644
--- a/src/core/server/saved_objects/validation/schema.test.ts
+++ b/src/core/server/saved_objects/validation/schema.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsValidationMap } from './';
+import { SavedObjectsValidationMap } from '.';
 import { SavedObjectSanitizedDoc } from '../serialization';
 import { createSavedObjectSanitizedDocSchema } from './schema';
 
diff --git a/src/core/server/saved_objects/validation/validator.test.ts b/src/core/server/saved_objects/validation/validator.test.ts
index ae1d56b60b241..0b461679984fd 100644
--- a/src/core/server/saved_objects/validation/validator.test.ts
+++ b/src/core/server/saved_objects/validation/validator.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsTypeValidator, SavedObjectsValidationMap } from './';
+import { SavedObjectsTypeValidator, SavedObjectsValidationMap } from '.';
 import { SavedObjectSanitizedDoc } from '../serialization';
 import { loggerMock, MockedLogger } from '../../logging/logger.mock';
 
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index fbd6fd1492094..2228c8fee8794 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -7,8 +7,9 @@
 /// <reference types="node" />
 
 import { AddConfigDeprecation } from '@kbn/config';
-import { AnalyticsClient } from '@elastic/analytics';
+import { AnalyticsClient } from '@kbn/analytics-client';
 import apm from 'elastic-apm-node';
+import { AwaitedProperties } from '@kbn/utility-types';
 import Boom from '@hapi/boom';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { CliArgs } from '@kbn/config';
@@ -21,7 +22,7 @@ import { ConfigDeprecationFactory } from '@kbn/config';
 import { ConfigDeprecationProvider } from '@kbn/config';
 import { ConfigPath } from '@kbn/config';
 import { ConfigService } from '@kbn/config';
-import { ContextProviderOpts } from '@elastic/analytics';
+import { ContextProviderOpts } from '@kbn/analytics-client';
 import { DetailedPeerCertificate } from 'tls';
 import type { DocLinks } from '@kbn/doc-links';
 import { Duration } from 'moment';
@@ -34,12 +35,12 @@ import { EcsEventType } from '@kbn/logging';
 import { EnvironmentMode } from '@kbn/config';
 import { errors } from '@elastic/elasticsearch';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Event as Event_2 } from '@elastic/analytics';
-import { EventContext } from '@elastic/analytics';
-import { EventType } from '@elastic/analytics';
-import { EventTypeOpts } from '@elastic/analytics';
+import { Event as Event_2 } from '@kbn/analytics-client';
+import { EventContext } from '@kbn/analytics-client';
+import { EventType } from '@kbn/analytics-client';
+import { EventTypeOpts } from '@kbn/analytics-client';
 import { IncomingHttpHeaders } from 'http';
-import { IShipper } from '@elastic/analytics';
+import { IShipper } from '@kbn/analytics-client';
 import { Logger } from '@kbn/logging';
 import { LoggerFactory } from '@kbn/logging';
 import { LogLevel as LogLevel_2 } from '@kbn/logging';
@@ -48,7 +49,7 @@ import { LogRecord } from '@kbn/logging';
 import { MaybePromise } from '@kbn/utility-types';
 import { ObjectType } from '@kbn/config-schema';
 import { Observable } from 'rxjs';
-import { OptInConfig } from '@elastic/analytics';
+import { OptInConfig } from '@kbn/analytics-client';
 import { PackageInfo } from '@kbn/config';
 import { PathConfigType } from '@kbn/utils';
 import { PeerCertificate } from 'tls';
@@ -56,15 +57,14 @@ import { PublicMethodsOf } from '@kbn/utility-types';
 import { Readable } from 'stream';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { Request as Request_2 } from '@hapi/hapi';
-import type { RequestHandlerContext as RequestHandlerContext_2 } from 'src/core/server';
 import { ResponseObject } from '@hapi/hapi';
 import { ResponseToolkit } from '@hapi/hapi';
 import { SchemaTypeError } from '@kbn/config-schema';
 import { ShallowPromise } from '@kbn/utility-types';
-import { ShipperClassConstructor } from '@elastic/analytics';
+import { ShipperClassConstructor } from '@kbn/analytics-client';
 import { Stream } from 'stream';
-import { TelemetryCounter } from '@elastic/analytics';
-import { TelemetryCounterType } from '@elastic/analytics';
+import { TelemetryCounter } from '@kbn/analytics-client';
+import { TelemetryCounterType } from '@kbn/analytics-client';
 import { Type } from '@kbn/config-schema';
 import { TypeOf } from '@kbn/config-schema';
 import { UiCounterMetricType } from '@kbn/analytics';
@@ -447,6 +447,30 @@ export interface CorePreboot {
     preboot: PrebootServicePreboot;
 }
 
+// @public
+export interface CoreRequestHandlerContext {
+    // (undocumented)
+    deprecations: {
+        client: DeprecationsClient;
+    };
+    // (undocumented)
+    elasticsearch: {
+        client: IScopedClusterClient;
+    };
+    // (undocumented)
+    savedObjects: {
+        client: SavedObjectsClientContract;
+        typeRegistry: ISavedObjectTypeRegistry;
+        getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
+        getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
+        getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
+    };
+    // (undocumented)
+    uiSettings: {
+        client: IUiSettingsClient;
+    };
+}
+
 // @internal
 export interface CoreServicesUsageData {
     // (undocumented)
@@ -841,6 +865,11 @@ export interface CustomHttpResponseOptions<T extends HttpResponsePayload | Respo
     statusCode: number;
 }
 
+// @public (undocumented)
+export type CustomRequestHandlerContext<T> = RequestHandlerContext & {
+    [Key in keyof T]: T[Key] extends Promise<unknown> ? T[Key] : Promise<T[Key]>;
+};
+
 // @internal (undocumented)
 export const DEFAULT_APP_CATEGORIES: Record<string, AppCategory>;
 
@@ -1129,7 +1158,7 @@ export interface HttpAuth {
 
 // @public
 export interface HttpResources {
-    register: <P, Q, B, Context extends RequestHandlerContext_2 = RequestHandlerContext_2>(route: RouteConfig<P, Q, B, 'get'>, handler: HttpResourcesRequestHandler<P, Q, B, Context>) => void;
+    register: <P, Q, B, Context extends RequestHandlerContext = RequestHandlerContext>(route: RouteConfig<P, Q, B, 'get'>, handler: HttpResourcesRequestHandler<P, Q, B, Context>) => void;
 }
 
 // @public
@@ -1140,7 +1169,7 @@ export interface HttpResourcesRenderOptions {
 }
 
 // @public
-export type HttpResourcesRequestHandler<P = unknown, Q = unknown, B = unknown, Context extends RequestHandlerContext_2 = RequestHandlerContext_2> = RequestHandler<P, Q, B, Context, 'get', KibanaResponseFactory & HttpResourcesServiceToolkit>;
+export type HttpResourcesRequestHandler<P = unknown, Q = unknown, B = unknown, Context extends RequestHandlerContext = RequestHandlerContext> = RequestHandler<P, Q, B, Context, 'get', KibanaResponseFactory & HttpResourcesServiceToolkit>;
 
 // @public
 export type HttpResourcesResponseOptions = HttpResponseOptions;
@@ -1190,7 +1219,7 @@ export interface HttpServiceSetup {
     registerOnPreAuth: (handler: OnPreAuthHandler) => void;
     registerOnPreResponse: (handler: OnPreResponseHandler) => void;
     registerOnPreRouting: (handler: OnPreRoutingHandler) => void;
-    registerRouteHandlerContext: <Context extends RequestHandlerContext, ContextName extends keyof Context>(contextName: ContextName, provider: RequestHandlerContextProvider<Context, ContextName>) => RequestHandlerContextContainer;
+    registerRouteHandlerContext: <Context extends RequestHandlerContext, ContextName extends keyof Omit<Context, 'resolve'>>(contextName: ContextName, provider: RequestHandlerContextProvider<Context, ContextName>) => RequestHandlerContextContainer;
 }
 
 // @public (undocumented)
@@ -1222,7 +1251,7 @@ export interface IContextContainer {
 }
 
 // @public
-export type IContextProvider<Context extends RequestHandlerContext, ContextName extends keyof Context> = (context: Omit<Context, ContextName>, ...rest: HandlerParameters<RequestHandler>) => Promise<Context[ContextName]> | Context[ContextName];
+export type IContextProvider<Context extends RequestHandlerContext, ContextName extends keyof Context> = (context: Omit<Context, ContextName>, ...rest: HandlerParameters<RequestHandler>) => MaybePromise<Awaited<Context[ContextName]>>;
 
 // @public
 export interface ICspConfig {
@@ -1465,7 +1494,7 @@ export const kibanaResponseFactory: {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
-    customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<string | Error | {
+    customError: (options: CustomHttpResponseOptions<ResponseError | Buffer | Stream>) => KibanaResponse<string | Error | Buffer | Stream | {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
@@ -1841,26 +1870,14 @@ export interface RegisterDeprecationsConfig {
 export type RequestHandler<P = unknown, Q = unknown, B = unknown, Context extends RequestHandlerContext = RequestHandlerContext, Method extends RouteMethod = any, ResponseFactory extends KibanaResponseFactory = KibanaResponseFactory> = (context: Context, request: KibanaRequest<P, Q, B, Method>, response: ResponseFactory) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
 
 // @public
-export interface RequestHandlerContext {
+export interface RequestHandlerContext extends RequestHandlerContextBase {
     // (undocumented)
-    core: {
-        savedObjects: {
-            client: SavedObjectsClientContract;
-            typeRegistry: ISavedObjectTypeRegistry;
-            getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
-            getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
-            getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
-        };
-        elasticsearch: {
-            client: IScopedClusterClient;
-        };
-        uiSettings: {
-            client: IUiSettingsClient;
-        };
-        deprecations: {
-            client: DeprecationsClient;
-        };
-    };
+    core: Promise<CoreRequestHandlerContext>;
+}
+
+// @public (undocumented)
+export interface RequestHandlerContextBase {
+    resolve: <T extends keyof Omit<this, 'resolve'>>(parts: T[]) => Promise<AwaitedProperties<Pick<this, T>>>;
 }
 
 // @public
@@ -2053,8 +2070,10 @@ export interface SavedObjectReferenceWithContext {
         name: string;
     }>;
     isMissing?: boolean;
+    originId?: string;
     spaces: string[];
     spacesWithMatchingAliases?: string[];
+    spacesWithMatchingOrigins?: string[];
     type: string;
 }
 
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index dc19f5eeea198..c73e98f4bb6c4 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -42,7 +42,6 @@ import { config as uiSettingsConfig } from './ui_settings';
 import { config as statusConfig } from './status';
 import { config as i18nConfig } from './i18n';
 import { ContextService } from './context';
-import { RequestHandlerContext } from '.';
 import {
   InternalCorePreboot,
   InternalCoreSetup,
@@ -316,6 +315,7 @@ export class Server {
     const savedObjectsStart = await this.savedObjects.start({
       elasticsearch: elasticsearchStart,
       pluginsInitialized: this.#pluginsInitialized,
+      docLinks: docLinkStart,
     });
     await this.resolveSavedObjectsStartPromise!(savedObjectsStart);
 
@@ -371,13 +371,9 @@ export class Server {
   }
 
   private registerCoreContext(coreSetup: InternalCoreSetup) {
-    coreSetup.http.registerRouteHandlerContext(
-      coreId,
-      'core',
-      (context, req, res): RequestHandlerContext['core'] => {
-        return new CoreRouteHandlerContext(this.coreStart!, req);
-      }
-    );
+    coreSetup.http.registerRouteHandlerContext(coreId, 'core', async (context, req, res) => {
+      return new CoreRouteHandlerContext(this.coreStart!, req);
+    });
   }
 
   public setupCoreConfig() {
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
index d015f506df6e3..402405e1adb39 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
@@ -9,7 +9,7 @@
 import { defaults } from 'lodash';
 
 import { SavedObjectsClientContract } from '../../saved_objects/types';
-import { SavedObjectsErrorHelpers } from '../../saved_objects/';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
 import { Logger, LogMeta } from '../../logging';
 
 import { getUpgradeableConfig } from './get_upgradeable_config';
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
index dc76f434f02de..1da8bad330c31 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '../../..';
 
 import {
   createTestServers,
diff --git a/src/core/server/ui_settings/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
index 2591e4050341c..8beb13e2d2534 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -7,8 +7,8 @@
  */
 
 import type supertest from 'supertest';
-import type { SavedObjectsClientContract, IUiSettingsClient } from 'src/core/server';
 import type { Client } from '@elastic/elasticsearch';
+import type { SavedObjectsClientContract, IUiSettingsClient } from '../../..';
 
 import {
   createTestServers,
diff --git a/src/core/server/ui_settings/routes/delete.ts b/src/core/server/ui_settings/routes/delete.ts
index f8ab4d5d0c2c4..87c6edf386428 100644
--- a/src/core/server/ui_settings/routes/delete.ts
+++ b/src/core/server/ui_settings/routes/delete.ts
@@ -23,7 +23,7 @@ export function registerDeleteRoute(router: IRouter) {
     { path: '/api/kibana/settings/{key}', validate },
     async (context, request, response) => {
       try {
-        const uiSettingsClient = context.core.uiSettings.client;
+        const uiSettingsClient = (await context.core).uiSettings.client;
 
         await uiSettingsClient.remove(request.params.key);
 
diff --git a/src/core/server/ui_settings/routes/get.ts b/src/core/server/ui_settings/routes/get.ts
index 051d562c39804..0929330cf0238 100644
--- a/src/core/server/ui_settings/routes/get.ts
+++ b/src/core/server/ui_settings/routes/get.ts
@@ -14,7 +14,7 @@ export function registerGetRoute(router: IRouter) {
     { path: '/api/kibana/settings', validate: false },
     async (context, request, response) => {
       try {
-        const uiSettingsClient = context.core.uiSettings.client;
+        const uiSettingsClient = (await context.core).uiSettings.client;
         return response.ok({
           body: {
             settings: await uiSettingsClient.getUserProvided(),
diff --git a/src/core/server/ui_settings/routes/index.ts b/src/core/server/ui_settings/routes/index.ts
index 80a35c5493f98..0cf7233b8af19 100644
--- a/src/core/server/ui_settings/routes/index.ts
+++ b/src/core/server/ui_settings/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '../..';
 
 import { registerDeleteRoute } from './delete';
 import { registerGetRoute } from './get';
diff --git a/src/core/server/ui_settings/routes/set.ts b/src/core/server/ui_settings/routes/set.ts
index 7de287f4ebe6a..91518fb6f3476 100644
--- a/src/core/server/ui_settings/routes/set.ts
+++ b/src/core/server/ui_settings/routes/set.ts
@@ -26,7 +26,7 @@ export function registerSetRoute(router: IRouter) {
     { path: '/api/kibana/settings/{key}', validate },
     async (context, request, response) => {
       try {
-        const uiSettingsClient = context.core.uiSettings.client;
+        const uiSettingsClient = (await context.core).uiSettings.client;
 
         const { key } = request.params;
         const { value } = request.body;
diff --git a/src/core/server/ui_settings/routes/set_many.ts b/src/core/server/ui_settings/routes/set_many.ts
index c4053dd3e7eed..f4f3f509bf920 100644
--- a/src/core/server/ui_settings/routes/set_many.ts
+++ b/src/core/server/ui_settings/routes/set_many.ts
@@ -21,7 +21,7 @@ const validate = {
 export function registerSetManyRoute(router: IRouter) {
   router.post({ path: '/api/kibana/settings', validate }, async (context, request, response) => {
     try {
-      const uiSettingsClient = context.core.uiSettings.client;
+      const uiSettingsClient = (await context.core).uiSettings.client;
 
       const { changes } = request.body;
 
diff --git a/src/core/server/ui_settings/saved_objects/migrations.test.ts b/src/core/server/ui_settings/saved_objects/migrations.test.ts
index 8f430679a1ead..df561ef4152f6 100644
--- a/src/core/server/ui_settings/saved_objects/migrations.test.ts
+++ b/src/core/server/ui_settings/saved_objects/migrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '../..';
 import { migrations } from './migrations';
 
 describe('ui_settings 7.9.0 migrations', () => {
diff --git a/src/core/server/ui_settings/saved_objects/migrations.ts b/src/core/server/ui_settings/saved_objects/migrations.ts
index cb61a10ea1a59..7ed65cfe61894 100644
--- a/src/core/server/ui_settings/saved_objects/migrations.ts
+++ b/src/core/server/ui_settings/saved_objects/migrations.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '../..';
 
 export const migrations = {
   '7.9.0': (doc: SavedObjectUnsanitizedDoc<any>): SavedObjectSanitizedDoc<any> => ({
diff --git a/src/core/server/ui_settings/settings/index.test.ts b/src/core/server/ui_settings/settings/index.test.ts
index a4a66a96d3a2b..073e017d61df7 100644
--- a/src/core/server/ui_settings/settings/index.test.ts
+++ b/src/core/server/ui_settings/settings/index.test.ts
@@ -12,7 +12,7 @@ import { getMiscUiSettings } from './misc';
 import { getNavigationSettings } from './navigation';
 import { getNotificationsSettings } from './notifications';
 import { getThemeSettings } from './theme';
-import { getCoreSettings } from './index';
+import { getCoreSettings } from '.';
 import { getStateSettings } from './state';
 
 describe('getCoreSettings', () => {
diff --git a/src/core/server/ui_settings/ui_settings_config.ts b/src/core/server/ui_settings/ui_settings_config.ts
index de76fe1cbfc8a..2dc151aeecec8 100644
--- a/src/core/server/ui_settings/ui_settings_config.ts
+++ b/src/core/server/ui_settings/ui_settings_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { ConfigDeprecationProvider } from 'src/core/server';
+import { ConfigDeprecationProvider } from '..';
 import { ServiceConfigDescriptor } from '../internal_types';
 
 const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) => [
diff --git a/src/core/test_helpers/kbn_server.ts b/src/core/test_helpers/kbn_server.ts
index 87026fc3fb9b2..c2eca55e59a9e 100644
--- a/src/core/test_helpers/kbn_server.ts
+++ b/src/core/test_helpers/kbn_server.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import {
   createTestEsCluster,
diff --git a/src/core/types/elasticsearch/search.ts b/src/core/types/elasticsearch/search.ts
index 6f2c0c28e670b..96d1bec3c5f1e 100644
--- a/src/core/types/elasticsearch/search.ts
+++ b/src/core/types/elasticsearch/search.ts
@@ -455,6 +455,11 @@ export type AggregateOf<
       reverse_nested: {
         doc_count: number;
       } & SubAggregateOf<TAggregationContainer, TDocument>;
+      random_sampler: {
+        seed: number;
+        probability: number;
+        doc_count: number;
+      } & SubAggregateOf<TAggregationContainer, TDocument>;
       sampler: {
         doc_count: number;
       } & SubAggregateOf<TAggregationContainer, TDocument>;
diff --git a/src/dev/bazel/pkg_npm_types.bzl b/src/dev/bazel/pkg_npm_types.bzl
index 392a8185d9563..03ec4209f6f6c 100644
--- a/src/dev/bazel/pkg_npm_types.bzl
+++ b/src/dev/bazel/pkg_npm_types.bzl
@@ -6,7 +6,7 @@
 # Side Public License, v 1.
 #
 
-load("@rules_nodejs//nodejs/private:ts_config.bzl", "TsConfigInfo")
+load("@npm//@bazel/typescript/internal:ts_config.bzl", "TsConfigInfo")
 load("@build_bazel_rules_nodejs//:providers.bzl", "run_node", "LinkablePackageInfo", "DeclarationInfo", "declaration_info")
 load("@build_bazel_rules_nodejs//internal/linker:link_node_modules.bzl", "module_mappings_aspect")
 
@@ -142,7 +142,7 @@ pkg_npm_types = rule(
     "_packager": attr.label(
       doc = "Target that executes the npm types package assembler binary",
       executable = True,
-      cfg = "exec",
+      cfg = "target",
       default = Label("//packages/kbn-type-summarizer:bazel-cli"),
     ),
   },
diff --git a/src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch b/src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch
new file mode 100644
index 0000000000000..84a9e4a497919
--- /dev/null
+++ b/src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch
@@ -0,0 +1,52 @@
+diff --git a/internal/node/launcher.sh b/internal/node/launcher.sh
+index fd832d02..64820f48 100644
+--- a/internal/node/launcher.sh
++++ b/internal/node/launcher.sh
+@@ -13,6 +13,32 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++# It helps to determine if we are running on a Windows environment (excludes WSL as it acts like Unix)
++function isWindows {
++  case "$(uname -s)" in
++      CYGWIN*)    local IS_WINDOWS=1 ;;
++      MINGW*)     local IS_WINDOWS=1 ;;
++      MSYS_NT*)   local IS_WINDOWS=1 ;;
++      *)          local IS_WINDOWS=0 ;;
++  esac
++
++  echo $IS_WINDOWS
++  return
++}
++
++# It helps to normalizes paths when running on Windows.
++#
++# Example:
++# C:/Users/XUser/_bazel_XUser/7q7kkv32/execroot/A/b/C -> /c/users/xuser/_bazel_xuser/7q7kkv32/execroot/a/b/c
++function normalizeWindowsPath {
++  # Apply the followings paths transformations to normalize paths on Windows
++  # -process driver letter
++  # -convert path separator
++  # -lowercase everything
++  echo $(sed -e 's#^\(.\):#/\L\1#' -e 's#\\#/#g' -e 's/[A-Z]/\L&/g' <<< "$1")
++  return
++}
++
+ # --- begin runfiles.bash initialization v2 ---
+ # Copy-pasted from the Bazel Bash runfiles library v2.
+ set -uo pipefail; f=build_bazel_rules_nodejs/third_party/github.com/bazelbuild/bazel/tools/bash/runfiles/runfiles.bash
+@@ -49,7 +75,13 @@ source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
+ # Case 6a is handled like case 3.
+ if [[ -n "${RUNFILES_MANIFEST_ONLY:-}" ]]; then
+   # Windows only has a manifest file instead of symlinks.
+-  RUNFILES=${RUNFILES_MANIFEST_FILE%/MANIFEST}
++  if [[ $(isWindows) -eq "1" ]]; then
++    # If Windows normalizing the path and case insensitive removing the `/MANIFEST` part of the path
++    NORMALIZED_RUNFILES_MANIFEST_FILE_PATH=$(normalizeWindowsPath $RUNFILES_MANIFEST_FILE)
++    RUNFILES=$(sed 's|\/MANIFEST$||i' <<< $NORMALIZED_RUNFILES_MANIFEST_FILE_PATH)
++  else
++    RUNFILES=${RUNFILES_MANIFEST_FILE%/MANIFEST}
++  fi
+ elif [[ -n "${TEST_SRCDIR:-}" ]]; then
+   # Case 4, bazel has identified runfiles for us.
+   RUNFILES="${TEST_SRCDIR:-}"
diff --git a/src/dev/build/README.md b/src/dev/build/README.md
index 2bf3fbd4bd4f5..776cdf4e4d8d0 100644
--- a/src/dev/build/README.md
+++ b/src/dev/build/README.md
@@ -36,7 +36,7 @@ The majority of this logic is extracted from the legacy grunt build, and is desi
 
 **Platform**: [lib/platform.js] defines the Platform objects, which define the different platforms we build for. Use `config.getTargetPlatforms()` to get the list of platforms we are targeting in this build, `config.getNodePlatforms()` to get the list of platform we will download node for, or `config.getPlatform` to get a specific platform and architecture.
 
-**Log**: We uses the `ToolingLog` defined in [../tooling_log/tooling_log.js]
+**Log**: We use the `ToolingLog` defined in [@kbn/tooling-log]
 
 **Runner**: [lib/runner.js] defines the runner used to execute tasks. It calls tasks with specific arguments based on whether they are global or not.
 
@@ -48,4 +48,4 @@ The majority of this logic is extracted from the legacy grunt build, and is desi
 [lib/runner.js]: ./lib/runner.js
 [lib/build.js]: ./lib/build.js
 [build_distributables.js]: ./build_distributables.js
-[../tooling_log/tooling_log.js]: ../tooling_log/tooling_log.js
+[@kbn/tooling-log]: ../../../packages/kbn-tooling-log
diff --git a/src/dev/build/args.test.ts b/src/dev/build/args.test.ts
index d01a73f08395b..6361b6b618b11 100644
--- a/src/dev/build/args.test.ts
+++ b/src/dev/build/args.test.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog, createAnyInstanceSerializer } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { createAnyInstanceSerializer } from '@kbn/jest-serializers';
 
 import { readCliArgs } from './args';
 
diff --git a/src/dev/build/args.ts b/src/dev/build/args.ts
index d1b094e97fdc5..42274cda867a7 100644
--- a/src/dev/build/args.ts
+++ b/src/dev/build/args.ts
@@ -7,7 +7,7 @@
  */
 
 import getopts from 'getopts';
-import { ToolingLog, pickLevelFromFlags } from '@kbn/dev-utils';
+import { ToolingLog, pickLevelFromFlags } from '@kbn/tooling-log';
 
 import { BuildOptions } from './build_distributables';
 
diff --git a/src/dev/build/build_distributables.ts b/src/dev/build/build_distributables.ts
index f8df9ec61609d..ad9c8323b769d 100644
--- a/src/dev/build/build_distributables.ts
+++ b/src/dev/build/build_distributables.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { Config, createRunner, Task, GlobalTask } from './lib';
 import * as Tasks from './tasks';
@@ -74,7 +74,7 @@ export async function buildDistributables(log: ToolingLog, options: BuildOptions
     await run(Tasks.CreateEmptyDirsAndFiles);
     await run(Tasks.CreateReadme);
     await run(Tasks.BuildBazelPackages);
-    await run(Tasks.BuildPackages);
+    await run(Tasks.BuildXpack);
     await run(Tasks.BuildKibanaPlatformPlugins);
     await run(Tasks.TranspileBabel);
     await run(Tasks.CreatePackageJson);
diff --git a/src/dev/build/lib/build.test.ts b/src/dev/build/lib/build.test.ts
index 176006167ca44..e8d5331439916 100644
--- a/src/dev/build/lib/build.test.ts
+++ b/src/dev/build/lib/build.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { REPO_ROOT } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { Config } from './config';
 import { Build } from './build';
diff --git a/src/dev/build/lib/config.test.ts b/src/dev/build/lib/config.test.ts
index 67b29ba27ee5c..0e373bb8794c3 100644
--- a/src/dev/build/lib/config.test.ts
+++ b/src/dev/build/lib/config.test.ts
@@ -9,7 +9,7 @@
 import { resolve } from 'path';
 
 import { REPO_ROOT, kibanaPackageJson } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 
 import { Config } from './config';
 
diff --git a/src/dev/build/lib/download.ts b/src/dev/build/lib/download.ts
index cb569e8e738ae..d39cb7d77f961 100644
--- a/src/dev/build/lib/download.ts
+++ b/src/dev/build/lib/download.ts
@@ -13,7 +13,8 @@ import { setTimeout } from 'timers/promises';
 import chalk from 'chalk';
 import { createHash } from 'crypto';
 import Axios from 'axios';
-import { ToolingLog, isAxiosResponseError } from '@kbn/dev-utils';
+import { isAxiosResponseError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 // https://github.com/axios/axios/tree/ffea03453f77a8176c51554d5f6c3c6829294649/lib/adapters
 // @ts-expect-error untyped internal module used to prevent axios from using xhr adapter in tests
diff --git a/src/dev/build/lib/exec.test.ts b/src/dev/build/lib/exec.test.ts
index 97e7f2607ea4c..614ae8bdca349 100644
--- a/src/dev/build/lib/exec.test.ts
+++ b/src/dev/build/lib/exec.test.ts
@@ -8,12 +8,8 @@
 
 import Path from 'path';
 
-import {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  createStripAnsiSerializer,
-  createRecursiveSerializer,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createStripAnsiSerializer, createRecursiveSerializer } from '@kbn/jest-serializers';
 
 import { exec } from './exec';
 
diff --git a/src/dev/build/lib/exec.ts b/src/dev/build/lib/exec.ts
index 2418c6145e5c2..ae89c23255e4b 100644
--- a/src/dev/build/lib/exec.ts
+++ b/src/dev/build/lib/exec.ts
@@ -8,7 +8,7 @@
 
 import execa from 'execa';
 import chalk from 'chalk';
-import { ToolingLog, LogLevel } from '@kbn/dev-utils';
+import { ToolingLog, LogLevel } from '@kbn/tooling-log';
 
 import { watchStdioForLine } from './watch_stdio_for_line';
 
diff --git a/src/dev/build/lib/fs.ts b/src/dev/build/lib/fs.ts
index 47b98c9cc398a..1239ad60f145d 100644
--- a/src/dev/build/lib/fs.ts
+++ b/src/dev/build/lib/fs.ts
@@ -19,7 +19,7 @@ import File from 'vinyl';
 import del from 'del';
 import deleteEmpty from 'delete-empty';
 import tar, { ExtractOptions } from 'tar';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 const pipelineAsync = promisify(pipeline);
 const mkdirAsync = promisify(fs.mkdir);
diff --git a/src/dev/build/lib/integration_tests/download.test.ts b/src/dev/build/lib/integration_tests/download.test.ts
index 26e374fa102db..4c5b7025da098 100644
--- a/src/dev/build/lib/integration_tests/download.test.ts
+++ b/src/dev/build/lib/integration_tests/download.test.ts
@@ -13,12 +13,8 @@ import { readFileSync } from 'fs';
 
 import del from 'del';
 import { CI_PARALLEL_PROCESS_PREFIX } from '@kbn/test';
-import {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  createStripAnsiSerializer,
-  createReplaceSerializer,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createStripAnsiSerializer, createReplaceSerializer } from '@kbn/jest-serializers';
 
 import { mkdirp } from '../fs';
 import { downloadToDisk, downloadToString } from '../download';
diff --git a/src/dev/build/lib/runner.test.ts b/src/dev/build/lib/runner.test.ts
index 17dcb8e1e4b24..7e2c29c3c0c98 100644
--- a/src/dev/build/lib/runner.test.ts
+++ b/src/dev/build/lib/runner.test.ts
@@ -6,12 +6,8 @@
  * Side Public License, v 1.
  */
 
-import {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  createStripAnsiSerializer,
-  createRecursiveSerializer,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createStripAnsiSerializer, createRecursiveSerializer } from '@kbn/jest-serializers';
 import { Config } from './config';
 import { createRunner } from './runner';
 import { Build } from './build';
diff --git a/src/dev/build/lib/runner.ts b/src/dev/build/lib/runner.ts
index e12f7d24cfc49..416f6ae584b3f 100644
--- a/src/dev/build/lib/runner.ts
+++ b/src/dev/build/lib/runner.ts
@@ -7,7 +7,7 @@
  */
 
 import chalk from 'chalk';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { isErrorLogged, markErrorLogged } from './errors';
 import { Build } from './build';
@@ -67,7 +67,7 @@ export function createRunner({ config, log }: Options) {
   /**
    * Run a task by calling its `run()` method with three arguments:
    *    `config`: an object with methods for determining top-level config values, see `./config.js`
-   *    `log`: an instance of the `ToolingLog`, see `../../tooling_log/tooling_log.js`
+   *    `log`: an instance of the `ToolingLog`
    *    `builds?`: If task does is not defined as `global: true` then it is called for each build and passed each one here.
    */
   return async function run(task: Task | GlobalTask) {
diff --git a/src/dev/build/lib/scan_copy.ts b/src/dev/build/lib/scan_copy.ts
index 91112fbf04ab4..d8285e1853173 100644
--- a/src/dev/build/lib/scan_copy.ts
+++ b/src/dev/build/lib/scan_copy.ts
@@ -7,17 +7,12 @@
  */
 
 import Fs from 'fs';
-import { basename, join } from 'path';
-import { promisify } from 'util';
+import Fsp from 'fs/promises';
+import Path from 'path';
 
-// @ts-ignore
-import { assertAbsolute, mkdirp } from './fs';
+import { asyncMap, asyncForEach } from '@kbn/std';
 
-const statAsync = promisify(Fs.stat);
-const mkdirAsync = promisify(Fs.mkdir);
-const utimesAsync = promisify(Fs.utimes);
-const copyFileAsync = promisify(Fs.copyFile);
-const readdirAsync = promisify(Fs.readdir);
+import { assertAbsolute, mkdirp } from './fs';
 
 interface Options {
   /**
@@ -32,6 +27,10 @@ interface Options {
    * function that is called with each Record
    */
   filter?: (record: Record) => boolean;
+  /**
+   * define permissions for reach item copied
+   */
+  permissions?: (record: Record) => number | undefined;
   /**
    * Date to use for atime/mtime
    */
@@ -52,48 +51,50 @@ class Record {
  * function or modifying mtime/atime for each file.
  */
 export async function scanCopy(options: Options) {
-  const { source, destination, filter, time } = options;
+  const { source, destination, filter, time, permissions } = options;
 
   assertAbsolute(source);
   assertAbsolute(destination);
 
-  // get filtered Records for files/directories within a directory
-  const getChildRecords = async (parent: Record) => {
-    const names = await readdirAsync(parent.absolute);
-    const records = await Promise.all(
-      names.map(async (name) => {
-        const absolute = join(parent.absolute, name);
-        const stat = await statAsync(absolute);
-        return new Record(stat.isDirectory(), name, absolute, join(parent.absoluteDest, name));
-      })
-    );
+  // create or copy each child of a directory
+  const copyChildren = async (parent: Record) => {
+    const names = await Fsp.readdir(parent.absolute);
 
-    return records.filter((record) => (filter ? filter(record) : true));
-  };
+    const records = await asyncMap(names, async (name) => {
+      const absolute = Path.join(parent.absolute, name);
+      const stat = await Fsp.stat(absolute);
+      return new Record(stat.isDirectory(), name, absolute, Path.join(parent.absoluteDest, name));
+    });
 
-  // create or copy each child of a directory
-  const copyChildren = async (record: Record) => {
-    const children = await getChildRecords(record);
-    await Promise.all(children.map(async (child) => await copy(child)));
-  };
+    await asyncForEach(records, async (rec) => {
+      if (filter && !filter(rec)) {
+        return;
+      }
 
-  // create or copy a record and recurse into directories
-  const copy = async (record: Record) => {
-    if (record.isDirectory) {
-      await mkdirAsync(record.absoluteDest);
-    } else {
-      await copyFileAsync(record.absolute, record.absoluteDest, Fs.constants.COPYFILE_EXCL);
-    }
+      if (rec.isDirectory) {
+        await Fsp.mkdir(rec.absoluteDest, {
+          mode: permissions ? permissions(rec) : undefined,
+        });
+      } else {
+        await Fsp.copyFile(rec.absolute, rec.absoluteDest, Fs.constants.COPYFILE_EXCL);
+        if (permissions) {
+          const perm = permissions(rec);
+          if (perm !== undefined) {
+            await Fsp.chmod(rec.absoluteDest, perm);
+          }
+        }
+      }
 
-    if (time) {
-      await utimesAsync(record.absoluteDest, time, time);
-    }
+      if (time) {
+        await Fsp.utimes(rec.absoluteDest, time, time);
+      }
 
-    if (record.isDirectory) {
-      await copyChildren(record);
-    }
+      if (rec.isDirectory) {
+        await copyChildren(rec);
+      }
+    });
   };
 
   await mkdirp(destination);
-  await copyChildren(new Record(true, basename(source), source, destination));
+  await copyChildren(new Record(true, Path.basename(source), source, destination));
 }
diff --git a/src/dev/build/tasks/build_kibana_platform_plugins.ts b/src/dev/build/tasks/build_kibana_platform_plugins.ts
index aa9101abb507f..ffb73666e4468 100644
--- a/src/dev/build/tasks/build_kibana_platform_plugins.ts
+++ b/src/dev/build/tasks/build_kibana_platform_plugins.ts
@@ -10,7 +10,7 @@ import Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';
 import { lastValueFrom } from 'rxjs';
-import { CiStatsMetric } from '@kbn/dev-utils';
+import { CiStatsMetric } from '@kbn/ci-stats-reporter';
 import {
   runOptimizer,
   OptimizerConfig,
diff --git a/src/dev/build/tasks/build_packages_task.ts b/src/dev/build/tasks/build_packages_task.ts
index 808903661a595..e30ffd082e250 100644
--- a/src/dev/build/tasks/build_packages_task.ts
+++ b/src/dev/build/tasks/build_packages_task.ts
@@ -6,74 +6,56 @@
  * Side Public License, v 1.
  */
 
-import { buildBazelProductionProjects, buildNonBazelProductionProjects } from '@kbn/pm';
+import Path from 'path';
 
-import { mkdirp, Task } from '../lib';
+import { discoverBazelPackages } from '@kbn/bazel-packages';
+import { runBazel } from '@kbn/bazel-runner';
 
-/**
- * High-level overview of how we enable shared packages in production:
- *
- * tl;dr We copy the packages directly into Kibana's `node_modules` folder,
- * which means they will be available when `require(...)`d.
- *
- * During development we rely on `@kbn/pm` to find all the packages
- * in the Kibana repo and run Yarn in all the right places to create symlinks
- * between these packages. This development setup is described in-depth in the
- * readme in `@kbn/pm`.
- *
- * However, for production we can't use `@kbn/pm` as part of the
- * installation as we don't have an install "tool/step" that can kick it off.
- * We also can't include symlinks in the archives for the different platform, so
- * we can't run `@kbn/pm` in the same way we do for development and
- * just package the result. That means we have two options: either we prepare
- * everything in the built package or we perform the necessary actions when
- * Kibana is starting up in production. We decided on the former: all the Kibana
- * packages are prepared as part of the build process.
- *
- * (All of this is a bit different for Kibana plugins as they _do_ have an
- * install step — the plugin CLI tool. However, Kibana plugins are not allowed
- * to have separate packages yet.)
- *
- * How Kibana packages are prepared:
- *
- * 1. Run the build for each package
- * 2. Copy all the packages into the `build/kibana` folder
- * 3. Replace `link:` dependencies with `file:` dependencies in both Kibana's
- *    `package.json` and in all the dependencies. Yarn will then copy the
- *    sources of these dependencies into `node_modules` instead of setting up
- *    symlinks.
- *
- * In the end after the `install dependencies` build step all Kibana packages
- * will be located within the top-level `node_modules` folder, which means
- * normal module resolution will apply and you can `require(...)` any of these
- * packages when running Kibana in production.
- *
- * ## Known limitations
- *
- * - This process _only_ include packages that used by Kibana or any of its
- *   transitive packages, as it depends on only running `yarn` at the top level.
- *   That means a Kibana plugin can only depend on Kibana packages that are used
- *   in some way by Kibana itself in production, as it won't otherwise be
- *   included in the production build.
- */
+import { Task, scanCopy, write, exec } from '../lib';
 
 export const BuildBazelPackages: Task = {
   description: 'Building distributable versions of Bazel packages',
   async run(config, log, build) {
-    await buildBazelProductionProjects({
-      kibanaRoot: config.resolveFromRepo(),
-      buildRoot: build.resolvePath(),
+    const packages = (await discoverBazelPackages()).filter((pkg) => !pkg.isDevOnly());
+
+    log.info(`Preparing Bazel projects production build non-devOnly packages`);
+    await runBazel({
+      log,
+      bazelArgs: ['build', '//packages:build'],
     });
+
+    for (const pkg of packages) {
+      log.info(`Copying build of`, pkg.pkg.name, 'into build');
+
+      const pkgDirInBuild = build.resolvePath(pkg.normalizedRepoRelativeDir);
+
+      // copy the built npm_module target dir into the build, package.json is updated to copy
+      // the sources we actually end up using into the node_modules directory when we run
+      // yarn install
+      await scanCopy({
+        source: config.resolveFromRepo('bazel-bin', pkg.normalizedRepoRelativeDir, 'npm_module'),
+        destination: pkgDirInBuild,
+        permissions: (rec) => (rec.isDirectory ? 0o755 : 0o644),
+      });
+
+      await write(Path.resolve(pkgDirInBuild, 'package.json'), JSON.stringify(pkg.pkg, null, 2));
+    }
   },
 };
 
-export const BuildPackages: Task = {
-  description: 'Building distributable versions of non Bazel packages',
+export const BuildXpack: Task = {
+  description: 'Building distributable versions of x-pack',
   async run(config, log, build) {
-    await mkdirp(config.resolveFromRepo('target'));
-    await buildNonBazelProductionProjects({
-      kibanaRoot: config.resolveFromRepo(),
-      buildRoot: build.resolvePath(),
+    log.info('running x-pack build task');
+    await exec(log, 'yarn', ['build'], {
+      level: 'debug',
+      cwd: config.resolveFromRepo('x-pack'),
+    });
+
+    log.info('copying built x-pack into build dir');
+    await scanCopy({
+      source: config.resolveFromRepo('x-pack/build/plugin/kibana/x-pack'),
+      destination: build.resolvePath('x-pack'),
     });
   },
 };
diff --git a/src/dev/build/tasks/copy_source_task.ts b/src/dev/build/tasks/copy_source_task.ts
index eb53b51293bbb..141eafc57ae1f 100644
--- a/src/dev/build/tasks/copy_source_task.ts
+++ b/src/dev/build/tasks/copy_source_task.ts
@@ -6,6 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { getAllRepoRelativeBazelPackageDirs } from '@kbn/bazel-packages';
+import normalizePath from 'normalize-path';
+
 import { copyAll, Task } from '../lib';
 
 export const CopySource: Task = {
@@ -45,6 +48,8 @@ export const CopySource: Task = {
         'tsconfig*.json',
         '.i18nrc.json',
         'kibana.d.ts',
+        // explicitly ignore all package roots, even if they're not selected by previous patterns
+        ...getAllRepoRelativeBazelPackageDirs().map((dir) => `!${normalizePath(dir)}/**`),
       ],
     });
   },
diff --git a/src/dev/build/tasks/create_archives_task.ts b/src/dev/build/tasks/create_archives_task.ts
index 37c4becae76a8..e9a6b23a3f351 100644
--- a/src/dev/build/tasks/create_archives_task.ts
+++ b/src/dev/build/tasks/create_archives_task.ts
@@ -10,7 +10,7 @@ import Path from 'path';
 import Fs from 'fs';
 import { promisify } from 'util';
 
-import { CiStatsMetric } from '@kbn/dev-utils';
+import { CiStatsMetric } from '@kbn/ci-stats-reporter';
 
 import { mkdirp, compressTar, compressZip, Task } from '../lib';
 
diff --git a/src/dev/build/tasks/download_cloud_dependencies.ts b/src/dev/build/tasks/download_cloud_dependencies.ts
index 31873550f6b4a..25730fc88bd08 100644
--- a/src/dev/build/tasks/download_cloud_dependencies.ts
+++ b/src/dev/build/tasks/download_cloud_dependencies.ts
@@ -15,17 +15,15 @@ export const DownloadCloudDependencies: Task = {
   description: 'Downloading cloud dependencies',
 
   async run(config, log, build) {
+    const subdomain = config.isRelease ? 'artifacts-staging' : 'artifacts-snapshot';
+
     const downloadBeat = async (beat: string, id: string) => {
-      const subdomain = config.isRelease ? 'artifacts' : 'snapshots';
       const version = config.getBuildVersion();
-      const buildId = id.match(/[0-9]\.[0-9]\.[0-9]-[0-9a-z]{8}/);
-      const buildIdUrl = buildId ? `${buildId[0]}/` : '';
-
       const localArchitecture = [process.arch === 'arm64' ? 'arm64' : 'x86_64'];
       const allArchitectures = ['arm64', 'x86_64'];
       const architectures = config.getDockerCrossCompile() ? allArchitectures : localArchitecture;
       const downloads = architectures.map(async (arch) => {
-        const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;
+        const url = `https://${subdomain}.elastic.co/beats/${id}/downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;
         const checksum = await downloadToString({ log, url: url + '.sha512', expectStatus: 200 });
         const destination = config.resolveFromRepo('.beats', Path.basename(url));
         return downloadToDisk({
@@ -41,17 +39,13 @@ export const DownloadCloudDependencies: Task = {
     };
 
     let buildId = '';
-    if (!config.isRelease) {
-      const manifestUrl = `https://artifacts-api.elastic.co/v1/versions/${config.getBuildVersion()}/builds/latest`;
-      try {
-        const manifest = await Axios.get(manifestUrl);
-        buildId = manifest.data.build.build_id;
-      } catch (e) {
-        log.error(
-          `Unable to find Elastic artifacts for ${config.getBuildVersion()} at ${manifestUrl}.`
-        );
-        throw e;
-      }
+    const buildUrl = `https://${subdomain}.elastic.co/beats/latest/${config.getBuildVersion()}.json`;
+    try {
+      const latest = await Axios.get(buildUrl);
+      buildId = latest.data.build_id;
+    } catch (e) {
+      log.error(`Unable to find Beats artifacts for ${config.getBuildVersion()} at ${buildUrl}.`);
+      throw e;
     }
     await del([config.resolveFromRepo('.beats')]);
 
diff --git a/src/dev/build/tasks/generate_packages_optimized_assets.ts b/src/dev/build/tasks/generate_packages_optimized_assets.ts
index c8f215ad7632b..8469a769d8c0b 100644
--- a/src/dev/build/tasks/generate_packages_optimized_assets.ts
+++ b/src/dev/build/tasks/generate_packages_optimized_assets.ts
@@ -19,7 +19,7 @@ import gulpGzip from 'gulp-gzip';
 import gulpPostCSS from 'gulp-postcss';
 // @ts-expect-error
 import gulpTerser from 'gulp-terser';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import terser from 'terser';
 import vfs from 'vinyl-fs';
 import globby from 'globby';
diff --git a/src/dev/build/tasks/install_chromium.js b/src/dev/build/tasks/install_chromium.js
index 0d230e95ecb0a..cb7a9e2075553 100644
--- a/src/dev/build/tasks/install_chromium.js
+++ b/src/dev/build/tasks/install_chromium.js
@@ -7,7 +7,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { install, paths } from '../../../../x-pack/plugins/screenshotting/server/utils';
+import { install, paths } from '@kbn/screenshotting-plugin/server/utils';
 
 export const InstallChromium = {
   description: 'Installing Chromium',
diff --git a/src/dev/build/tasks/install_dependencies_task.ts b/src/dev/build/tasks/install_dependencies_task.ts
index 8237789f4967b..59c9e38911243 100644
--- a/src/dev/build/tasks/install_dependencies_task.ts
+++ b/src/dev/build/tasks/install_dependencies_task.ts
@@ -6,18 +6,20 @@
  * Side Public License, v 1.
  */
 
-import { Project } from '@kbn/pm';
+import { Task, exec } from '../lib';
 
-import { Task } from '../lib';
+const YARN_EXEC = process.env.npm_execpath || 'yarn';
 
 export const InstallDependencies: Task = {
   description: 'Installing node_modules, including production builds of packages',
 
   async run(config, log, build) {
-    const project = await Project.fromPath(build.resolvePath());
-
-    await project.installDependencies({
-      extraArgs: [
+    await exec(
+      log,
+      YARN_EXEC,
+      [
+        'install',
+        '--non-interactive',
         '--production',
         '--ignore-optional',
         '--pure-lockfile',
@@ -27,6 +29,15 @@ export const InstallDependencies: Task = {
         // This is commonly seen in shared folders on virtual machines
         '--no-bin-links',
       ],
-    });
+      {
+        cwd: build.resolvePath(),
+        env: {
+          SASS_BINARY_SITE:
+            'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+          RE2_DOWNLOAD_MIRROR:
+            'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
+        },
+      }
+    );
   },
 };
diff --git a/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
index ffcf8f7644620..20128c05033de 100644
--- a/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
@@ -6,11 +6,8 @@
  * Side Public License, v 1.
  */
 
-import {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  createAnyInstanceSerializer,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createAnyInstanceSerializer } from '@kbn/jest-serializers';
 
 import { Config, Platform } from '../../lib';
 import { DownloadNodeBuilds } from './download_node_builds_task';
diff --git a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
index b8992bf6e590b..bb417cef3d990 100644
--- a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
@@ -10,12 +10,8 @@ import { readFileSync } from 'fs';
 import Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';
-import {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  createAbsolutePathSerializer,
-  createRecursiveSerializer,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createAbsolutePathSerializer, createRecursiveSerializer } from '@kbn/jest-serializers';
 
 import { Config } from '../../lib';
 import { ExtractNodeBuilds } from './extract_node_builds_task';
diff --git a/src/dev/build/tasks/nodejs/node_shasums.test.ts b/src/dev/build/tasks/nodejs/node_shasums.test.ts
index 20d1f297b9ae0..fc888851946e2 100644
--- a/src/dev/build/tasks/nodejs/node_shasums.test.ts
+++ b/src/dev/build/tasks/nodejs/node_shasums.test.ts
@@ -56,7 +56,7 @@ jest.mock('../../lib/download', () => ({
   },
 }));
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { getNodeShasums } from './node_shasums';
 
 describe('src/dev/build/tasks/nodejs/node_shasums', () => {
diff --git a/src/dev/build/tasks/nodejs/node_shasums.ts b/src/dev/build/tasks/nodejs/node_shasums.ts
index ca588352ce7bb..850e28d5d3ead 100644
--- a/src/dev/build/tasks/nodejs/node_shasums.ts
+++ b/src/dev/build/tasks/nodejs/node_shasums.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { downloadToString } from '../../lib/download';
 
 export async function getNodeShasums(log: ToolingLog, nodeVersion: string) {
diff --git a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
index 96d8b7cc6336f..5f495bf3b168f 100644
--- a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
@@ -10,12 +10,8 @@ import Path from 'path';
 import Fs from 'fs';
 
 import { REPO_ROOT } from '@kbn/utils';
-import {
-  ToolingLog,
-  ToolingLogCollectingWriter,
-  createAnyInstanceSerializer,
-  createRecursiveSerializer,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createAnyInstanceSerializer, createRecursiveSerializer } from '@kbn/jest-serializers';
 
 import { Config, Platform } from '../../lib';
 import { VerifyExistingNodeBuilds } from './verify_existing_node_builds_task';
diff --git a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
index 9dfff321fc7a2..7f092f399c8ed 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
@@ -10,7 +10,7 @@ import { resolve } from 'path';
 import { readFileSync } from 'fs';
 import { copyFile } from 'fs/promises';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import Mustache from 'mustache';
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 7ce7459d6eefd..ca81383ba639f 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -40,6 +40,11 @@ kibana_vars=(
     csp.report_to
     data.autocomplete.valueSuggestions.terminateAfter
     data.autocomplete.valueSuggestions.timeout
+    unifiedSearch.autocomplete.valueSuggestions.terminateAfter
+    unifiedSearch.autocomplete.valueSuggestions.timeout
+    unifiedSearch.autocomplete.querySuggestions.enabled
+    unifiedSearch.autocomplete.valueSuggestions.enabled
+    unifiedSearch.autocomplete.valueSuggestions.tiers
     elasticsearch.customHeaders
     elasticsearch.hosts
     elasticsearch.logQueries
@@ -200,12 +205,12 @@ kibana_vars=(
     xpack.alerting.invalidateApiKeysTask.interval
     xpack.alerting.invalidateApiKeysTask.removalDelay
     xpack.alerting.defaultRuleTaskTimeout
-    xpack.alerting.rules.execution.timeout
-    xpack.alerting.rules.execution.ruleTypeOverrides
+    xpack.alerting.rules.run.timeout
+    xpack.alerting.rules.run.ruleTypeOverrides
     xpack.alerting.cancelAlertsOnRuleTimeout
     xpack.alerting.rules.minimumScheduleInterval.value
     xpack.alerting.rules.minimumScheduleInterval.enforce
-    xpack.alerting.rules.execution.actions.max
+    xpack.alerting.rules.run.actions.max
     xpack.alerts.healthCheck.interval
     xpack.alerts.invalidateApiKeysTask.interval
     xpack.alerts.invalidateApiKeysTask.removalDelay
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index c406fe47c1542..264c6e52db0eb 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -10,7 +10,7 @@ import { access, link, unlink, chmod } from 'fs';
 import { resolve, basename } from 'path';
 import { promisify } from 'util';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { kibanaPackageJson } from '@kbn/utils';
 
 import { write, copyAll, mkdirp, exec, Config, Build } from '../../../lib';
diff --git a/src/dev/build/tasks/os_packages/run_fpm.ts b/src/dev/build/tasks/os_packages/run_fpm.ts
index 9c3f370ba7e98..d7c0e5f9ac0e1 100644
--- a/src/dev/build/tasks/os_packages/run_fpm.ts
+++ b/src/dev/build/tasks/os_packages/run_fpm.ts
@@ -8,7 +8,7 @@
 
 import { resolve } from 'path';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { exec, Config, Build } from '../../lib';
 
diff --git a/src/dev/build/tasks/package_json/create_package_json_tasks.ts b/src/dev/build/tasks/package_json/create_package_json_tasks.ts
index 62280252fe34e..e3368656713c9 100644
--- a/src/dev/build/tasks/package_json/create_package_json_tasks.ts
+++ b/src/dev/build/tasks/package_json/create_package_json_tasks.ts
@@ -6,22 +6,45 @@
  * Side Public License, v 1.
  */
 
-import normalizePosixPath from 'normalize-path';
-// @ts-ignore
-import { transformDependencies } from '@kbn/pm';
 import { findUsedDependencies } from './find_used_dependencies';
 import { read, write, Task } from '../../lib';
 
+/**
+ * Replaces `link:` dependencies with `file:` dependencies. When installing
+ * dependencies, these `file:` dependencies will be copied into `node_modules`
+ * instead of being symlinked.
+ *
+ * This will allow us to copy packages into the build and run `yarn`, which
+ * will then _copy_ the `file:` dependencies into `node_modules` instead of
+ * symlinking like we do in development.
+ *
+ * Additionally it also taken care of replacing `link:bazel-bin/` with
+ * `file:` so we can also support the copy of the Bazel packages dist already into
+ * build/packages to be copied into the node_modules
+ */
+export function transformDependencies(dependencies: Record<string, string>) {
+  return Object.fromEntries(
+    Object.entries(dependencies).map(([name, version]) => {
+      if (!version.startsWith('link:')) {
+        return [name, version];
+      }
+
+      if (version.startsWith('link:bazel-bin/')) {
+        return [name, version.replace('link:bazel-bin/', 'file:')];
+      }
+
+      return [name, version.replace('link:', 'file:')];
+    })
+  );
+}
+
 export const CreatePackageJson: Task = {
   description: 'Creating build-ready version of package.json',
 
   async run(config, log, build) {
     const pkg = config.getKibanaPkg();
     const transformedDeps = transformDependencies(pkg.dependencies as { [key: string]: string });
-    const foundPkgDeps = await findUsedDependencies(
-      transformedDeps,
-      normalizePosixPath(build.resolvePath('.'))
-    );
+    const foundPkgDeps = await findUsedDependencies(transformedDeps, build.resolvePath('.'));
 
     const newPkg = {
       name: pkg.name,
diff --git a/src/dev/build/tasks/package_json/find_used_dependencies.ts b/src/dev/build/tasks/package_json/find_used_dependencies.ts
index e49d57c6f794f..4250b0a6b7990 100644
--- a/src/dev/build/tasks/package_json/find_used_dependencies.ts
+++ b/src/dev/build/tasks/package_json/find_used_dependencies.ts
@@ -6,66 +6,56 @@
  * Side Public License, v 1.
  */
 
-import Path from 'path';
 import globby from 'globby';
-import normalize from 'normalize-path';
-// @ts-ignore
-import { parseEntries, dependenciesParseStrategy } from '@kbn/babel-code-parser';
-
-async function getDependencies(cwd: string, entries: string[]) {
-  // Return the dependencies retrieve from the
-  // provided code entries (sanitized) and
-  // parseStrategy (dependencies one)
-  return Object.keys(await parseEntries(cwd, entries, dependenciesParseStrategy, {}));
-}
+import { ImportResolver } from '@kbn/import-resolver';
+import { findUsedNodeModules } from '@kbn/find-used-node-modules';
 
 export async function findUsedDependencies(listedPkgDependencies: any, baseDir: any) {
   // Define the entry points for the server code in order to
-  // start here later looking for the server side dependencies
-  const mainCodeEntries = await globby(normalize(Path.resolve(baseDir, `src/cli*/dist.js`)));
-
-  const discoveredPluginEntries = await globby([
-    normalize(Path.resolve(baseDir, `src/plugins/**/server/index.js`)),
-    `!${normalize(Path.resolve(baseDir, `/src/plugins/**/public`))}`,
-    normalize(Path.resolve(baseDir, `x-pack/plugins/**/server/index.js`)),
-    `!${normalize(Path.resolve(baseDir, `/x-pack/plugins/**/public`))}`,
-  ]);
-
-  // It will include entries that cannot be discovered
-  // statically as they are required with dynamic imports.
-  // In vis_type_timelion the problem is the loadFunctions()
-  // which dynamically requires all the files inside of function folders
-  // Another way would be to include an index file and import all the functions
-  // using named imports
-  const dynamicRequiredEntries = await globby([
-    normalize(Path.resolve(baseDir, 'src/plugins/vis_types/timelion/server/**/*.js')),
-  ]);
+  // look for the server side dependencies
+  const serverEntries = await globby(
+    [
+      // main code entries
+      'src/cli*/dist.js',
+      // core entry
+      'src/core/server/index.js',
+      // plugin entries
+      'src/plugins/**/server/index.js',
+      'x-pack/plugins/**/server/index.js',
+      // entries that are loaded into the server with dynamic require() calls
+      'src/plugins/vis_types/timelion/server/**/*.js',
+    ],
+    {
+      cwd: baseDir,
+      ignore: ['**/public/**'],
+      absolute: true,
+    }
+  );
 
-  // Compose all the needed entries
-  const serverEntries = [...mainCodeEntries, ...discoveredPluginEntries, ...dynamicRequiredEntries];
+  const resolver = ImportResolver.create(baseDir);
 
   // Get the dependencies found searching through the server
   // side code entries that were provided
-  const serverDependencies = await getDependencies(baseDir, serverEntries);
-
-  // List of hardcoded dependencies that we need and that are not discovered
-  // searching through code imports
-  // TODO: remove this once we get rid off @kbn/ui-framework
-  const hardCodedDependencies = ['@kbn/ui-framework'];
-
-  // Consider this as our whiteList for the modules we can't delete
-  const whiteListedModules = [...serverDependencies, ...hardCodedDependencies];
-
-  const listedDependencies = Object.keys(listedPkgDependencies);
-  const filteredListedDependencies = listedDependencies.filter((entry) => {
-    return whiteListedModules.some((nonEntry) => entry === nonEntry);
-  });
-
-  return filteredListedDependencies.reduce((foundUsedDeps: any, usedDep) => {
-    if (listedPkgDependencies[usedDep]) {
-      foundUsedDeps[usedDep] = listedPkgDependencies[usedDep];
+  const usedDeps = [
+    // TODO: remove this once we get rid off @kbn/ui-framework, for now it isn't detectable as "used" so we hard code it
+    '@kbn/ui-framework',
+    // find all the node modules we actually use on the server, including the peerDependencies of our used node_modules which are used within those deps
+    ...(await findUsedNodeModules({
+      resolver,
+      entryPaths: serverEntries,
+      findUsedPeers: true,
+    })),
+  ];
+
+  // only include dependencies in the package.json file that are already listed in the package.json dependencies
+  const neededDeps: Record<string, string> = {};
+
+  for (const dep of usedDeps) {
+    const version = listedPkgDependencies[dep];
+    if (version) {
+      neededDeps[dep] = version;
     }
+  }
 
-    return foundUsedDeps;
-  }, {});
+  return neededDeps;
 }
diff --git a/src/dev/build/tasks/patch_native_modules_task.ts b/src/dev/build/tasks/patch_native_modules_task.ts
index 4bdb5ba7284ee..1c1bebfa86c0e 100644
--- a/src/dev/build/tasks/patch_native_modules_task.ts
+++ b/src/dev/build/tasks/patch_native_modules_task.ts
@@ -8,7 +8,7 @@
 
 import path from 'path';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import {
   deleteAll,
diff --git a/src/dev/build/tasks/transpile_babel_task.ts b/src/dev/build/tasks/transpile_babel_task.ts
index 7e95679df1bf7..37f63d31415e9 100644
--- a/src/dev/build/tasks/transpile_babel_task.ts
+++ b/src/dev/build/tasks/transpile_babel_task.ts
@@ -17,7 +17,7 @@ import { Task, Build } from '../lib';
 
 const asyncPipeline = promisify(pipeline);
 
-const transpileWithBabel = async (srcGlobs: string[], build: Build, presets: string[]) => {
+const transpileWithBabel = async (srcGlobs: string[], build: Build, preset: string) => {
   const buildRoot = build.resolvePath();
 
   await asyncPipeline(
@@ -36,7 +36,18 @@ const transpileWithBabel = async (srcGlobs: string[], build: Build, presets: str
 
     gulpBabel({
       babelrc: false,
-      presets,
+      presets: [
+        [
+          preset,
+          {
+            // we pass this so that @kbn/babel-plugin-synthetic-packages can correct absolute imports
+            // for packages to relative requests, without having to discover the Kibana repo root, which
+            // it can't do because at this point in the build there isn't a package.json file for the
+            // plugin to find.
+            'kibana/rootDir': build.resolvePath('.'),
+          },
+        ],
+      ],
     }),
 
     vfs.dest(buildRoot)
@@ -48,15 +59,19 @@ export const TranspileBabel: Task = {
 
   async run(config, log, build) {
     // Transpile server code
-    await transpileWithBabel(['**/*.{js,ts,tsx}', '!**/public/**'], build, [
-      require.resolve('@kbn/babel-preset/node_preset'),
-    ]);
+    await transpileWithBabel(
+      ['**/*.{js,ts,tsx}', '!**/public/**'],
+      build,
+      require.resolve('@kbn/babel-preset/node_preset')
+    );
 
     // Transpile client code
     // NOTE: For the client, as we have the optimizer, we are only
     // pre-transpiling the typescript based files
-    await transpileWithBabel(['**/public/**/*.{ts,tsx}'], build, [
-      require.resolve('@kbn/babel-preset/webpack_preset'),
-    ]);
+    await transpileWithBabel(
+      ['**/public/**/*.{ts,tsx}'],
+      build,
+      require.resolve('@kbn/babel-preset/webpack_preset')
+    );
   },
 };
diff --git a/src/dev/chromium_version.ts b/src/dev/chromium_version.ts
index eab787a4bd008..0af4c9c2441f1 100644
--- a/src/dev/chromium_version.ts
+++ b/src/dev/chromium_version.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { run, ToolingLog } from '@kbn/dev-utils';
+import { run } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import chalk from 'chalk';
 import cheerio from 'cheerio';
diff --git a/src/dev/code_coverage/ingest_coverage/__tests__/enumerate_patterns.test.js b/src/dev/code_coverage/ingest_coverage/__tests__/enumerate_patterns.test.js
index d8b67b677ae1b..8ec97d3fbd385 100644
--- a/src/dev/code_coverage/ingest_coverage/__tests__/enumerate_patterns.test.js
+++ b/src/dev/code_coverage/ingest_coverage/__tests__/enumerate_patterns.test.js
@@ -7,7 +7,7 @@
  */
 
 import { enumeratePatterns } from '../team_assignment/enumerate_patterns';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 
 const log = new ToolingLog({
diff --git a/src/dev/code_coverage/ingest_coverage/__tests__/transforms.test.js b/src/dev/code_coverage/ingest_coverage/__tests__/transforms.test.js
index 5e33f2ba548aa..266a38dc38e71 100644
--- a/src/dev/code_coverage/ingest_coverage/__tests__/transforms.test.js
+++ b/src/dev/code_coverage/ingest_coverage/__tests__/transforms.test.js
@@ -14,7 +14,7 @@ import {
   teamAssignment,
   last,
 } from '../transforms';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 describe(`Transform fns`, () => {
   describe(`ciRunUrl`, () => {
diff --git a/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts b/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts
index d4704ba05b59c..dd04337a59993 100644
--- a/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts
+++ b/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
 export class Plugin {
   constructor() {}
diff --git a/src/dev/code_coverage/ingest_coverage/transforms.js b/src/dev/code_coverage/ingest_coverage/transforms.js
index cd30c8735d144..c66ee87c694fb 100644
--- a/src/dev/code_coverage/ingest_coverage/transforms.js
+++ b/src/dev/code_coverage/ingest_coverage/transforms.js
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import * as Either from './either.js';
-import * as Maybe from './maybe.js';
-import { always, id, noop, pink, pipe, ccMark } from './utils.js';
+import * as Either from './either';
+import * as Maybe from './maybe';
+import { always, id, noop, pink, pipe, ccMark } from './utils';
 import execa from 'execa';
 import { resolve } from 'path';
 
diff --git a/src/dev/eslint/lint_files.ts b/src/dev/eslint/lint_files.ts
index 5c6118edeb2ec..d74e3cafc8de6 100644
--- a/src/dev/eslint/lint_files.ts
+++ b/src/dev/eslint/lint_files.ts
@@ -9,7 +9,8 @@
 import { CLIEngine } from 'eslint';
 
 import { REPO_ROOT } from '@kbn/utils';
-import { createFailError, ToolingLog } from '@kbn/dev-utils';
+import { createFailError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { File } from '../file';
 
 /**
diff --git a/src/dev/eslint/pick_files_to_lint.ts b/src/dev/eslint/pick_files_to_lint.ts
index 0fd3ab926e14e..c65f4e6343787 100644
--- a/src/dev/eslint/pick_files_to_lint.ts
+++ b/src/dev/eslint/pick_files_to_lint.ts
@@ -8,7 +8,7 @@
 
 import { CLIEngine } from 'eslint';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { File } from '../file';
 
 /**
diff --git a/src/dev/github/search_and_save_pr_list.ts b/src/dev/github/search_and_save_pr_list.ts
index 1c6dbc6c99746..ff5ae8fb67bcc 100644
--- a/src/dev/github/search_and_save_pr_list.ts
+++ b/src/dev/github/search_and_save_pr_list.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { Octokit } from '@octokit/rest';
 import fs from 'fs';
 
diff --git a/src/dev/i18n/integrate_locale_files.ts b/src/dev/i18n/integrate_locale_files.ts
index 773f7659eb082..65558c4624064 100644
--- a/src/dev/i18n/integrate_locale_files.ts
+++ b/src/dev/i18n/integrate_locale_files.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { i18n } from '@kbn/i18n';
 import path from 'path';
 
diff --git a/src/dev/i18n/tasks/check_compatibility.ts b/src/dev/i18n/tasks/check_compatibility.ts
index cf8a294d8a405..b6b94a5aba666 100644
--- a/src/dev/i18n/tasks/check_compatibility.ts
+++ b/src/dev/i18n/tasks/check_compatibility.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { integrateLocaleFiles, I18nConfig } from '..';
 
 export interface I18nFlags {
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 2a067a54d472e..1cfcb7b5cf284 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -76,7 +76,7 @@ export const DEV_ONLY_LICENSE_ALLOWED = ['MPL-2.0'];
 export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
-  '@elastic/ems-client@8.2.0': ['Elastic License 2.0'],
+  '@elastic/ems-client@8.3.0': ['Elastic License 2.0'],
   '@elastic/eui@54.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/dev/notice/cli.js b/src/dev/notice/cli.js
index 67aae0d5913bc..8aece9f51d9e6 100644
--- a/src/dev/notice/cli.js
+++ b/src/dev/notice/cli.js
@@ -12,7 +12,7 @@ import { resolve } from 'path';
 import getopts from 'getopts';
 import dedent from 'dedent';
 import { REPO_ROOT } from '@kbn/utils';
-import { ToolingLog, pickLevelFromFlags } from '@kbn/dev-utils';
+import { ToolingLog, pickLevelFromFlags } from '@kbn/tooling-log';
 
 import { generateNoticeFromSource } from './generate_notice_from_source';
 
diff --git a/src/dev/notice/generate_notice_from_source.ts b/src/dev/notice/generate_notice_from_source.ts
index fc2da1c4fc7dc..8d162154bc5f0 100644
--- a/src/dev/notice/generate_notice_from_source.ts
+++ b/src/dev/notice/generate_notice_from_source.ts
@@ -7,7 +7,7 @@
  */
 
 import vfs from 'vinyl-fs';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 const NOTICE_COMMENT_RE = /\/\*[\s\n\*]*@notice([\w\W]+?)\*\//g;
 const NEWLINE_RE = /\r?\n/g;
diff --git a/src/dev/plugin_discovery/find_plugins.ts b/src/dev/plugin_discovery/find_plugins.ts
index 7e46894813f0e..698a9816a5312 100644
--- a/src/dev/plugin_discovery/find_plugins.ts
+++ b/src/dev/plugin_discovery/find_plugins.ts
@@ -7,7 +7,7 @@
  */
 
 import Path from 'path';
-import { getPluginSearchPaths } from '@kbn/config';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { KibanaPlatformPlugin, simpleKibanaPlatformPluginDiscovery } from '@kbn/plugin-discovery';
 
 import { REPO_ROOT } from '@kbn/utils';
diff --git a/src/dev/run_check_published_api_changes.ts b/src/dev/run_check_published_api_changes.ts
index 452922ac56bcd..7ca27e51dd4b5 100644
--- a/src/dev/run_check_published_api_changes.ts
+++ b/src/dev/run_check_published_api_changes.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog, getTimeReporter } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getTimeReporter } from '@kbn/ci-stats-reporter';
 import {
   Extractor,
   IConfigFile,
diff --git a/src/dev/run_find_plugins_with_circular_deps.ts b/src/dev/run_find_plugins_with_circular_deps.ts
index f9ee7bd84c54f..f174561b49f9b 100644
--- a/src/dev/run_find_plugins_with_circular_deps.ts
+++ b/src/dev/run_find_plugins_with_circular_deps.ts
@@ -9,7 +9,7 @@
 import dedent from 'dedent';
 import { parseDependencyTree, parseCircular, prettyCircular } from 'dpdm';
 import { relative } from 'path';
-import { getPluginSearchPaths } from '@kbn/config';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { run } from '@kbn/dev-utils';
 import { REPO_ROOT } from '@kbn/utils';
 
diff --git a/src/dev/run_i18n_check.ts b/src/dev/run_i18n_check.ts
index 8aa93d33f60fd..074fd47d95683 100644
--- a/src/dev/run_i18n_check.ts
+++ b/src/dev/run_i18n_check.ts
@@ -9,7 +9,9 @@
 import chalk from 'chalk';
 import Listr from 'listr';
 
-import { createFailError, run, ToolingLog, getTimeReporter } from '@kbn/dev-utils';
+import { createFailError, run } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getTimeReporter } from '@kbn/ci-stats-reporter';
 import { ErrorReporter, I18nConfig } from './i18n';
 import {
   extractDefaultMessages,
diff --git a/src/dev/run_licenses_csv_report.js b/src/dev/run_licenses_csv_report.js
index 1923eddff33e9..391361f2ccfec 100644
--- a/src/dev/run_licenses_csv_report.js
+++ b/src/dev/run_licenses_csv_report.js
@@ -13,7 +13,7 @@ import { isNull, isUndefined } from 'lodash';
 import { run } from '@kbn/dev-utils';
 
 import { getInstalledPackages } from './npm';
-import { engines } from '../../package';
+import { engines } from '../../package.json';
 import { LICENSE_OVERRIDES } from './license_checker';
 
 const allDoubleQuoteRE = /"/g;
diff --git a/src/dev/storybook/commands/clean.ts b/src/dev/storybook/commands/clean.ts
index e770939765991..2688ef4bcdb74 100644
--- a/src/dev/storybook/commands/clean.ts
+++ b/src/dev/storybook/commands/clean.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import { join } from 'path';
 import del from 'del';
diff --git a/src/dev/typescript/build_ts_refs.ts b/src/dev/typescript/build_ts_refs.ts
index f3896cf676e27..9640e0951965b 100644
--- a/src/dev/typescript/build_ts_refs.ts
+++ b/src/dev/typescript/build_ts_refs.ts
@@ -8,7 +8,8 @@
 
 import Path from 'path';
 
-import { ToolingLog, ProcRunner } from '@kbn/dev-utils';
+import { ProcRunner } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { ROOT_REFS_CONFIG_PATH } from './root_refs_config';
diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
index 6b47d9b805af7..6d9b372069b22 100644
--- a/src/dev/typescript/projects.ts
+++ b/src/dev/typescript/projects.ts
@@ -9,6 +9,7 @@
 import glob from 'glob';
 import Path from 'path';
 import { REPO_ROOT } from '@kbn/utils';
+import { BAZEL_PACKAGE_DIRS } from '@kbn/bazel-packages';
 import { Project, ProjectOptions } from './project';
 
 /**
@@ -67,12 +68,11 @@ export const PROJECTS = [
     name: 'fleet/cypress',
   }),
 
-  createProject('x-pack/plugins/uptime/e2e/tsconfig.json', {
+  createProject('x-pack/plugins/synthetics/e2e/tsconfig.json', {
     name: 'uptime/synthetics-e2e-tests',
     disableTypeCheck: true,
   }),
 
-  ...findProjects('packages/*/tsconfig.json'),
   ...findProjects('src/plugins/*/tsconfig.json'),
   ...findProjects('src/plugins/chart_expressions/*/tsconfig.json'),
   ...findProjects('src/plugins/vis_types/*/tsconfig.json'),
@@ -83,4 +83,6 @@ export const PROJECTS = [
   ...findProjects('test/interpreter_functional/plugins/*/tsconfig.json'),
   ...findProjects('test/server_integration/__fixtures__/plugins/*/tsconfig.json'),
   ...findProjects('packages/kbn-type-summarizer/tests/tsconfig.json'),
+
+  ...BAZEL_PACKAGE_DIRS.flatMap((dir) => findProjects(`${dir}/*/tsconfig.json`)),
 ];
diff --git a/src/dev/typescript/ref_output_cache/archives.ts b/src/dev/typescript/ref_output_cache/archives.ts
index 4db4022180997..882315b919031 100644
--- a/src/dev/typescript/ref_output_cache/archives.ts
+++ b/src/dev/typescript/ref_output_cache/archives.ts
@@ -12,7 +12,7 @@ import Path from 'path';
 import { promisify } from 'util';
 import { pipeline } from 'stream';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import Axios from 'axios';
 import del from 'del';
 
diff --git a/src/dev/typescript/ref_output_cache/integration_tests/archives.test.ts b/src/dev/typescript/ref_output_cache/integration_tests/archives.test.ts
index 60ba3a4f659b3..b7dc6d28b78ee 100644
--- a/src/dev/typescript/ref_output_cache/integration_tests/archives.test.ts
+++ b/src/dev/typescript/ref_output_cache/integration_tests/archives.test.ts
@@ -12,13 +12,12 @@ import { Readable } from 'stream';
 
 import del from 'del';
 import cpy from 'cpy';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
 import {
-  ToolingLog,
   createAbsolutePathSerializer,
   createRecursiveSerializer,
-  ToolingLogCollectingWriter,
   createStripAnsiSerializer,
-} from '@kbn/dev-utils';
+} from '@kbn/jest-serializers';
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer());
 expect.addSnapshotSerializer(createStripAnsiSerializer());
diff --git a/src/dev/typescript/ref_output_cache/integration_tests/ref_output_cache.test.ts b/src/dev/typescript/ref_output_cache/integration_tests/ref_output_cache.test.ts
index 370ef9d17a04e..a44d309cb9ddd 100644
--- a/src/dev/typescript/ref_output_cache/integration_tests/ref_output_cache.test.ts
+++ b/src/dev/typescript/ref_output_cache/integration_tests/ref_output_cache.test.ts
@@ -13,12 +13,8 @@ import del from 'del';
 import cpy from 'cpy';
 import globby from 'globby';
 import normalize from 'normalize-path';
-import {
-  ToolingLog,
-  createAbsolutePathSerializer,
-  createStripAnsiSerializer,
-  ToolingLogCollectingWriter,
-} from '@kbn/dev-utils';
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
+import { createAbsolutePathSerializer, createStripAnsiSerializer } from '@kbn/jest-serializers';
 
 import { RefOutputCache, OUTDIR_MERGE_BASE_FILENAME } from '../ref_output_cache';
 import { Archives } from '../archives';
diff --git a/src/dev/typescript/ref_output_cache/ref_output_cache.ts b/src/dev/typescript/ref_output_cache/ref_output_cache.ts
index 32b08ec1ba0df..80d2a6052000b 100644
--- a/src/dev/typescript/ref_output_cache/ref_output_cache.ts
+++ b/src/dev/typescript/ref_output_cache/ref_output_cache.ts
@@ -9,7 +9,8 @@
 import Path from 'path';
 import Fs from 'fs/promises';
 
-import { ToolingLog, extract } from '@kbn/dev-utils';
+import { extract } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { kibanaPackageJson } from '@kbn/utils';
 import del from 'del';
 import tempy from 'tempy';
diff --git a/src/dev/typescript/ref_output_cache/repo_info.ts b/src/dev/typescript/ref_output_cache/repo_info.ts
index 0bba010bc185d..ab6470e5b1401 100644
--- a/src/dev/typescript/ref_output_cache/repo_info.ts
+++ b/src/dev/typescript/ref_output_cache/repo_info.ts
@@ -9,7 +9,7 @@
 import Path from 'path';
 
 import execa from 'execa';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 export class RepoInfo {
   constructor(
diff --git a/src/dev/typescript/root_refs_config.ts b/src/dev/typescript/root_refs_config.ts
index e20b1ab46cd82..dc06a53988ab4 100644
--- a/src/dev/typescript/root_refs_config.ts
+++ b/src/dev/typescript/root_refs_config.ts
@@ -10,7 +10,7 @@ import Path from 'path';
 import Fs from 'fs/promises';
 
 import dedent from 'dedent';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import normalize from 'normalize-path';
 
diff --git a/src/fixtures/telemetry_collectors/constants.ts b/src/fixtures/telemetry_collectors/constants.ts
index 37f94730afb40..8a669f9654ac4 100644
--- a/src/fixtures/telemetry_collectors/constants.ts
+++ b/src/fixtures/telemetry_collectors/constants.ts
@@ -7,7 +7,7 @@
  */
 
 import moment, { Moment } from 'moment';
-import { MakeSchemaFrom } from '../../plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface Usage {
   locale: string;
diff --git a/src/fixtures/telemetry_collectors/enum_collector.ts b/src/fixtures/telemetry_collectors/enum_collector.ts
index f0528b7dcee1a..8f137fee45728 100644
--- a/src/fixtures/telemetry_collectors/enum_collector.ts
+++ b/src/fixtures/telemetry_collectors/enum_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/externally_defined_collector.ts b/src/fixtures/telemetry_collectors/externally_defined_collector.ts
index d954bd30fe002..44e0ef959abb5 100644
--- a/src/fixtures/telemetry_collectors/externally_defined_collector.ts
+++ b/src/fixtures/telemetry_collectors/externally_defined_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectorOptions } from 'src/plugins/usage_collection/server';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import type { UsageCollectorOptions } from '@kbn/usage-collection-plugin/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const collectorSet = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts b/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts
index 1bf7f4aa4811a..13f4a5bd8e281 100644
--- a/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts
+++ b/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getUsageCollector } from './get_usage_collector';
 
 export function registerCollector(collectorSet: UsageCollectionSetup) {
diff --git a/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts b/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
index 991f8336e7020..6c5634777b4e3 100644
--- a/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
+++ b/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import type { Usage } from './types';
-import { createUsageCollectionSetupMock } from '../../../plugins/usage_collection/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/imported_schema.ts b/src/fixtures/telemetry_collectors/imported_schema.ts
index 6ea7ded904404..dbad9383bf100 100644
--- a/src/fixtures/telemetry_collectors/imported_schema.ts
+++ b/src/fixtures/telemetry_collectors/imported_schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { externallyDefinedSchema } from './constants';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
diff --git a/src/fixtures/telemetry_collectors/imported_usage_interface.ts b/src/fixtures/telemetry_collectors/imported_usage_interface.ts
index 43f2bc0d6fb5b..8e37434547f55 100644
--- a/src/fixtures/telemetry_collectors/imported_usage_interface.ts
+++ b/src/fixtures/telemetry_collectors/imported_usage_interface.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { Usage } from './constants';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts b/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
index 5a353ddfbd843..2e89de3dd92cc 100644
--- a/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
+++ b/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/nested_collector.ts b/src/fixtures/telemetry_collectors/nested_collector.ts
index 4d78f26f9fb89..1db9c00a25ed8 100644
--- a/src/fixtures/telemetry_collectors/nested_collector.ts
+++ b/src/fixtures/telemetry_collectors/nested_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { Collector } from 'src/plugins/usage_collection/server';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import type { Collector } from '@kbn/usage-collection-plugin/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const collectorSet = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts b/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts
index 5d8f446f3fd63..f749a817a03fa 100644
--- a/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts
+++ b/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import type { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/stats_collector.ts b/src/fixtures/telemetry_collectors/stats_collector.ts
index 6046973f42e84..e572638b11838 100644
--- a/src/fixtures/telemetry_collectors/stats_collector.ts
+++ b/src/fixtures/telemetry_collectors/stats_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeStatsCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/unmapped_collector.ts b/src/fixtures/telemetry_collectors/unmapped_collector.ts
index 60b33bbcb340d..32c4b621c346f 100644
--- a/src/fixtures/telemetry_collectors/unmapped_collector.ts
+++ b/src/fixtures/telemetry_collectors/unmapped_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/working_collector.ts b/src/fixtures/telemetry_collectors/working_collector.ts
index a34f52da6c914..00fd415cba01b 100644
--- a/src/fixtures/telemetry_collectors/working_collector.ts
+++ b/src/fixtures/telemetry_collectors/working_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/working_collector_with_description.ts b/src/fixtures/telemetry_collectors/working_collector_with_description.ts
index 6f57f481de9b4..c382a63ccd6fa 100644
--- a/src/fixtures/telemetry_collectors/working_collector_with_description.ts
+++ b/src/fixtures/telemetry_collectors/working_collector_with_description.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/plugins/advanced_settings/kibana.json b/src/plugins/advanced_settings/kibana.json
index 98b7ec6d7e6d8..b7227b48a215b 100644
--- a/src/plugins/advanced_settings/kibana.json
+++ b/src/plugins/advanced_settings/kibana.json
@@ -5,7 +5,7 @@
   "ui": true,
   "requiredPlugins": ["management"],
   "optionalPlugins": ["home", "usageCollection"],
-  "requiredBundles": ["kibanaReact", "kibanaUtils", "home"],
+  "requiredBundles": ["kibanaReact", "kibanaUtils"],
   "owner": {
     "name": "Kibana Core",
     "githubTeam": "kibana-core"
diff --git a/src/plugins/advanced_settings/public/index.ts b/src/plugins/advanced_settings/public/index.ts
index 83676b4f7c38d..58222c19a5172 100644
--- a/src/plugins/advanced_settings/public/index.ts
+++ b/src/plugins/advanced_settings/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { AdvancedSettingsPlugin } from './plugin';
 export type { AdvancedSettingsSetup, AdvancedSettingsStart } from './types';
 export { ComponentRegistry } from './component_registry';
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
index 5ee1bbf49f56c..0bb3b011c05d8 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
@@ -11,18 +11,14 @@ import { Observable } from 'rxjs';
 import { ReactWrapper } from 'enzyme';
 import { mountWithI18nProvider, shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 import dedent from 'dedent';
-import {
-  PublicUiSettingsParams,
-  UserProvidedValues,
-  UiSettingsType,
-} from '../../../../core/public';
+import { PublicUiSettingsParams, UserProvidedValues, UiSettingsType } from '@kbn/core/public';
 import { FieldSetting } from './types';
 import { AdvancedSettings } from './advanced_settings';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   themeServiceMock,
-} from '../../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { ComponentRegistry } from '../component_registry';
 import { Search } from './components/search';
 
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
index e46dfdf50956b..37496a88240c7 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -20,20 +20,20 @@ import {
   ToastsStart,
   ScopedHistory,
   ThemeServiceStart,
-} from '../../../../core/public';
-import { url } from '../../../kibana_utils/public';
+} from '@kbn/core/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { CallOuts } from './components/call_outs';
 import { Search } from './components/search';
 import { Form } from './components/form';
 import { AdvancedSettingsVoiceAnnouncement } from './components/advanced_settings_voice_announcement';
-import { ComponentRegistry } from '../';
+import { ComponentRegistry } from '..';
 
 import { getAriaName, toEditableConfig, fieldSorter, DEFAULT_CATEGORY } from './lib';
 
 import { FieldSetting, SettingsChanges } from './types';
 import { parseErrorMsg } from './components/search/search';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 
 export const QUERY = 'query';
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx b/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx
index 46905b1e4b751..cb206b0f6dc55 100644
--- a/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { UiSettingsType } from '../../../../../../core/public';
+import { UiSettingsType } from '@kbn/core/public';
 
 import { AdvancedSettingsVoiceAnnouncement } from './advanced_settings_voice_announcement';
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx
index 68cd6936fb9af..555df3c2c5c11 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx
@@ -11,13 +11,13 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
 import { mount, ReactWrapper } from 'enzyme';
 import { FieldSetting } from '../../types';
-import { UiSettingsType } from '../../../../../../core/public';
-import { notificationServiceMock, docLinksServiceMock } from '../../../../../../core/public/mocks';
+import { UiSettingsType } from '@kbn/core/public';
+import { notificationServiceMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { Field, getEditableValue } from './field';
 
-jest.mock('../../../../../kibana_react/public/ui_settings/use_ui_setting', () => ({
+jest.mock('@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting', () => ({
   useUiSetting: jest.fn(),
 }));
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
index 62c000b3ce46f..fd4674a7caf6e 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
@@ -32,10 +32,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { UiSettingsType, DocLinksStart, ToastsStart } from '@kbn/core/public';
 import { FieldCodeEditor } from './field_code_editor';
 import { FieldSetting, FieldState } from '../../types';
 import { isDefaultValue } from '../../lib';
-import { UiSettingsType, DocLinksStart, ToastsStart } from '../../../../../../core/public';
 
 interface FieldProps {
   setting: FieldSetting;
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx
index 5ba1c55e67ec8..819a03cdb616b 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx
@@ -8,7 +8,7 @@
 
 import React, { useCallback } from 'react';
 import { monaco, XJsonLang } from '@kbn/monaco';
-import { CodeEditor, MarkdownLang } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor, MarkdownLang } from '@kbn/kibana-react-plugin/public';
 
 interface FieldCodeEditorProps {
   value: string;
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
index 110fdaf249bd1..4deb1b9c24d1d 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
-import { UiSettingsType } from '../../../../../../core/public';
-import { themeServiceMock, notificationServiceMock } from '../../../../../../core/public/mocks';
+import { UiSettingsType } from '@kbn/core/public';
+import { themeServiceMock, notificationServiceMock } from '@kbn/core/public/mocks';
 import { SettingsChanges } from '../../types';
 import { Form } from './form';
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
index 0d1e19b6c004d..1ffae88335758 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
@@ -26,8 +26,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { KibanaThemeProvider, toMountPoint } from '../../../../../kibana_react/public';
-import { DocLinksStart, ThemeServiceStart, ToastsStart } from '../../../../../../core/public';
+import { KibanaThemeProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { DocLinksStart, ThemeServiceStart, ToastsStart } from '@kbn/core/public';
 
 import { getCategoryName } from '../../lib';
 import { Field, getEditableValue } from '../field';
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts b/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
index 6c2572af76eb3..eeee280f826ae 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
@@ -12,7 +12,7 @@
  * @returns {string} the type to use for determining the display and editor
  */
 
-import { UiSettingsType } from 'src/core/public';
+import { UiSettingsType } from '@kbn/core/public';
 import { FieldSetting } from '../types';
 
 export function getValType(def: Partial<FieldSetting>, value?: any): UiSettingsType {
diff --git a/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts b/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
index fdc60828748c1..4828ea957718d 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { isDefaultValue } from './is_default_value';
-import { UiSettingsType } from '../../../../../core/public';
+import { UiSettingsType } from '@kbn/core/public';
 
 describe('Settings', function () {
   describe('Advanced', function () {
diff --git a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
index 1ededb9cc697e..7de174d409b55 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PublicUiSettingsParams } from 'src/core/public';
+import { PublicUiSettingsParams } from '@kbn/core/public';
 import expect from '@kbn/expect';
 import { toEditableConfig } from './to_editable_config';
 
diff --git a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
index d2ed64aa918a7..b7a08888bb76a 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PublicUiSettingsParams, UserProvidedValues, SavedObjectAttribute } from 'src/core/public';
+import { PublicUiSettingsParams, UserProvidedValues, SavedObjectAttribute } from '@kbn/core/public';
 import { FieldSetting } from '../types';
 import { getValType } from './get_val_type';
 import { getAriaName } from './get_aria_name';
diff --git a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx b/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
index 84eb0d4139fa0..e208ed80a3fdc 100644
--- a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
+++ b/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
@@ -14,11 +14,11 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 
 import { LocationDescriptor } from 'history';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { url } from '../../../kibana_utils/public';
-import { ManagementAppMountParams } from '../../../management/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { StartServicesAccessor } from '../../../../core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 
 import { AdvancedSettings, QUERY } from './advanced_settings';
 import { ComponentRegistry } from '../types';
diff --git a/src/plugins/advanced_settings/public/management_app/types.ts b/src/plugins/advanced_settings/public/management_app/types.ts
index 7af00a3b5bcfe..ec099a3f8fb69 100644
--- a/src/plugins/advanced_settings/public/management_app/types.ts
+++ b/src/plugins/advanced_settings/public/management_app/types.ts
@@ -8,7 +8,7 @@
 
 import type { ReactElement } from 'react';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UiSettingsType } from '../../../../core/public';
+import { UiSettingsType } from '@kbn/core/public';
 
 export interface FieldSetting {
   displayName: string;
diff --git a/src/plugins/advanced_settings/public/plugin.ts b/src/plugins/advanced_settings/public/plugin.ts
index b7f1455f65dfd..2da7d76e0a4ff 100644
--- a/src/plugins/advanced_settings/public/plugin.ts
+++ b/src/plugins/advanced_settings/public/plugin.ts
@@ -7,8 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin } from 'kibana/public';
-import { FeatureCatalogueCategory } from '../../home/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 import { ComponentRegistry } from './component_registry';
 import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
 
@@ -55,7 +54,7 @@ export class AdvancedSettingsPlugin
         icon: 'gear',
         path: '/app/management/kibana/settings',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/src/plugins/advanced_settings/public/types.ts b/src/plugins/advanced_settings/public/types.ts
index b47a188ffdd89..7d6647f0feef9 100644
--- a/src/plugins/advanced_settings/public/types.ts
+++ b/src/plugins/advanced_settings/public/types.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ComponentRegistry } from './component_registry';
-import { HomePublicPluginSetup } from '../../home/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
-import { ManagementSetup } from '../../management/public';
-import { UsageCollectionSetup } from '../../usage_collection/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ComponentRegistry } from './component_registry';
 
 export interface AdvancedSettingsSetup {
   component: ComponentRegistry['setup'];
diff --git a/src/plugins/advanced_settings/server/index.ts b/src/plugins/advanced_settings/server/index.ts
index a935fc09d7f58..74b706407dab2 100644
--- a/src/plugins/advanced_settings/server/index.ts
+++ b/src/plugins/advanced_settings/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { AdvancedSettingsServerPlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/src/plugins/advanced_settings/server/plugin.ts b/src/plugins/advanced_settings/server/plugin.ts
index 78e491b7b9023..8d100ee2e26b2 100644
--- a/src/plugins/advanced_settings/server/plugin.ts
+++ b/src/plugins/advanced_settings/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 import { capabilitiesProvider } from './capabilities_provider';
 
 export class AdvancedSettingsServerPlugin implements Plugin<object, object> {
diff --git a/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts b/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts
index 32adc0d7df0cf..fbdd962a95298 100644
--- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts
+++ b/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts
@@ -8,7 +8,7 @@
 
 import { createStreamingBatchedFunction } from './create_streaming_batched_function';
 import { fetchStreaming as fetchStreamingReal } from '../streaming/fetch_streaming';
-import { AbortError, defer, of } from '../../../kibana_utils/public';
+import { AbortError, defer, of } from '@kbn/kibana-utils-plugin/public';
 import { Subject } from 'rxjs';
 
 const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
diff --git a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts b/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
index 3ff8da08cfce7..c1618c9d3bbc1 100644
--- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
+++ b/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { AbortError, abortSignalToPromise, defer } from '../../../kibana_utils/public';
+import { AbortError, abortSignalToPromise, defer } from '@kbn/kibana-utils-plugin/public';
 import {
   ItemBufferParams,
   TimedItemBufferParams,
diff --git a/src/plugins/bfetch/public/batching/types.ts b/src/plugins/bfetch/public/batching/types.ts
index 3f9647988a4fb..f71ce0ca2a6e4 100644
--- a/src/plugins/bfetch/public/batching/types.ts
+++ b/src/plugins/bfetch/public/batching/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Defer } from '../../../kibana_utils/public';
+import { Defer } from '@kbn/kibana-utils-plugin/public';
 
 export interface BatchItem<Payload, Result> {
   payload: Payload;
diff --git a/src/plugins/bfetch/public/index.ts b/src/plugins/bfetch/public/index.ts
index bba7844a3265b..a4c60cdf127d7 100644
--- a/src/plugins/bfetch/public/index.ts
+++ b/src/plugins/bfetch/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { BfetchPublicPlugin } from './plugin';
 
 export type { BfetchPublicSetup, BfetchPublicStart, BfetchPublicContract } from './plugin';
diff --git a/src/plugins/bfetch/public/mocks.ts b/src/plugins/bfetch/public/mocks.ts
index 3e00c1f3bcedb..aa0a03243c50b 100644
--- a/src/plugins/bfetch/public/mocks.ts
+++ b/src/plugins/bfetch/public/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { BfetchPublicSetup, BfetchPublicStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/public/mocks';
 
 export type Setup = jest.Mocked<BfetchPublicSetup>;
 export type Start = jest.Mocked<BfetchPublicStart>;
diff --git a/src/plugins/bfetch/public/plugin.ts b/src/plugins/bfetch/public/plugin.ts
index 54bcb305d8675..b82d69df95a5b 100644
--- a/src/plugins/bfetch/public/plugin.ts
+++ b/src/plugins/bfetch/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { fetchStreaming as fetchStreamingStatic, FetchStreamingParams } from './streaming';
 import { DISABLE_BFETCH_COMPRESSION, removeLeadingSlash } from '../common';
 import { createStreamingBatchedFunction, StreamingBatchedFunctionParams } from './batching';
 import { BatchedFunc } from './batching/types';
-import { createStartServicesGetter } from '../../kibana_utils/public';
 
 // eslint-disable-next-line
 export interface BfetchPublicSetupDependencies {}
diff --git a/src/plugins/bfetch/server/index.ts b/src/plugins/bfetch/server/index.ts
index 76f86e6975070..f0e6b15f99758 100644
--- a/src/plugins/bfetch/server/index.ts
+++ b/src/plugins/bfetch/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { BfetchServerPlugin } from './plugin';
 
 export type { BfetchServerSetup, BfetchServerStart, BatchProcessingRouteParams } from './plugin';
diff --git a/src/plugins/bfetch/server/mocks.ts b/src/plugins/bfetch/server/mocks.ts
index dfa365d9e70b2..d1be681dd407f 100644
--- a/src/plugins/bfetch/server/mocks.ts
+++ b/src/plugins/bfetch/server/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/server/mocks';
 import { BfetchServerSetup, BfetchServerStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/server/mocks';
 
 export type Setup = jest.Mocked<BfetchServerSetup>;
 export type Start = jest.Mocked<BfetchServerStart>;
diff --git a/src/plugins/bfetch/server/plugin.ts b/src/plugins/bfetch/server/plugin.ts
index f7127445f96c5..f32f3d03862b8 100644
--- a/src/plugins/bfetch/server/plugin.ts
+++ b/src/plugins/bfetch/server/plugin.ts
@@ -14,7 +14,7 @@ import type {
   Logger,
   KibanaRequest,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { map$ } from '@kbn/std';
 import {
diff --git a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
index 6814ed1dd7955..5f7319ed154fc 100644
--- a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
@@ -9,7 +9,7 @@
 import { promisify } from 'util';
 import { Observable } from 'rxjs';
 import { catchError, concatMap, finalize } from 'rxjs/operators';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Stream, PassThrough } from 'stream';
 import { constants, deflate } from 'zlib';
 
diff --git a/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts b/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts
index a237e5597162e..01080655e0ad7 100644
--- a/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Stream, PassThrough } from 'stream';
 
 const delimiter = '\n';
diff --git a/src/plugins/bfetch/server/streaming/create_stream.ts b/src/plugins/bfetch/server/streaming/create_stream.ts
index 756a806a60229..8c4219f052f91 100644
--- a/src/plugins/bfetch/server/streaming/create_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_stream.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { Stream } from 'stream';
 import { Observable } from 'rxjs';
 import { createCompressedStream } from './create_compressed_stream';
diff --git a/src/plugins/bfetch/server/ui_settings.ts b/src/plugins/bfetch/server/ui_settings.ts
index 95854b9604dd3..832ba4d049eb3 100644
--- a/src/plugins/bfetch/server/ui_settings.ts
+++ b/src/plugins/bfetch/server/ui_settings.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UiSettingsParams } from 'src/core/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { DISABLE_BFETCH_COMPRESSION, DISABLE_BFETCH } from '../common';
 
diff --git a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts
index 40d95d5f44af2..ac8cb5c8b86a3 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts
@@ -8,8 +8,8 @@
 
 import { gaugeFunction } from './gauge_function';
 import { GaugeArguments, GaugeShapes } from '..';
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import {
   GaugeCentralMajorModes,
   GaugeColorModes,
diff --git a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts
index c2ce20163e86a..48c7261e43016 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { GaugeExpressionFunctionDefinition } from '../types';
 import {
   EXPRESSION_GAUGE_NAME,
diff --git a/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts
index b090dc5346146..70f87b3402b46 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts
@@ -12,9 +12,9 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/public';
-import { CustomPaletteState } from '../../../../charts/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import {
   EXPRESSION_GAUGE_NAME,
   GAUGE_FUNCTION_RENDERER_NAME,
diff --git a/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts
index 2f1560550690b..c980f3398c611 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts
@@ -7,9 +7,9 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { PersistedState } from '../../../../visualizations/public';
-import type { ChartsPluginSetup } from '../../../../charts/public';
-import type { IFieldFormat, SerializedFieldFormat } from '../../../../field_formats/common';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import type { GaugeExpressionProps } from './expression_functions';
 
 export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat;
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap b/src/plugins/chart_expressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap
index 49b102c82c312..f9e57c5ce6de9 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap
@@ -28,6 +28,12 @@ exports[`GaugeComponent renders the chart 1`] = `
       ]
     }
     base={0}
+    domain={
+      Object {
+        "max": 4,
+        "min": 0,
+      }
+    }
     id="goal"
     labelMajor="Count of records   "
     labelMinor=""
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx
index ef21811402c2a..b3edd51768e68 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { ColorStop } from '@kbn/coloring';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
-import { DatatableColumn, DatatableRow } from 'src/plugins/expressions/common';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import {
   GaugeRenderProps,
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx
index e4687d19aa63c..e0cec63ffdf21 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx
@@ -9,10 +9,10 @@ import React, { FC, memo, useCallback } from 'react';
 import { Chart, Goal, Settings } from '@elastic/charts';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PaletteOutput } from '@kbn/coloring';
-import { FieldFormat } from '../../../../field_formats/common';
-import type { CustomPaletteState } from '../../../../charts/public';
-import { EmptyPlaceholder } from '../../../../charts/public';
-import { isVisDimension } from '../../../../visualizations/common/utils';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { CustomPaletteState } from '@kbn/charts-plugin/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
+import { isVisDimension } from '@kbn/visualizations-plugin/common/utils';
 import {
   GaugeRenderProps,
   GaugeLabelMajorMode,
@@ -399,6 +399,7 @@ export const GaugeComponent: FC<GaugeRenderProps> = memo(
             tooltipValueFormatter={(tooltipValue) => tickFormatter.convert(tooltipValue)}
             bands={bands}
             ticks={ticks}
+            domain={{ min, max }}
             bandFillColor={
               colorMode === GaugeColorModes.PALETTE
                 ? (val) => {
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx
index 93bd51e8b2028..5074f00801109 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const HorizontalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    width="30"
-    height="22"
-    viewBox="0 0 30 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      className="chart-icon__subdued"
-      d="M1 13a1 1 0 00-1 1v2a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-2a1 1 0 00-1-1H1z"
-    />
-    <path
-      className="chart-icon__accent"
-      d="M0 6a1 1 0 011-1h24a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V6z"
-    />
-  </svg>
-);
+export const HorizontalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      width="30"
+      height="22"
+      viewBox="0 0 30 22"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M1 13a1 1 0 00-1 1v2a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-2a1 1 0 00-1-1H1z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M0 6a1 1 0 011-1h24a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V6z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx
index 99f4976d5f38f..49a1e2a817cf7 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const VerticalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    width="30"
-    height="22"
-    viewBox="0 0 30 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      className="chart-icon__subdued"
-      d="M16 22a1 1 0 01-1-1V4a1 1 0 011-1h4a1 1 0 011 1v17a1 1 0 01-1 1h-4z"
-    />
-    <path
-      className="chart-icon__accent"
-      d="M10 0h2a1 1 0 011 1v20a1 1 0 01-1 1h-2a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1V7h-1a1 1 0 010-2h1V2h-1a1 1 0 010-2z"
-    />
-  </svg>
-);
+export const VerticalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      width="30"
+      height="22"
+      viewBox="0 0 30 22"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M16 22a1 1 0 01-1-1V4a1 1 0 011-1h4a1 1 0 011 1v17a1 1 0 01-1 1h-4z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M10 0h2a1 1 0 011 1v20a1 1 0 01-1 1h-2a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1V7h-1a1 1 0 010-2h1V2h-1a1 1 0 010-2z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts b/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts
index cd5379f0e9ed7..686147ab055e0 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts
@@ -7,8 +7,8 @@
  */
 
 import type { CustomPaletteParams } from '@kbn/coloring';
-import type { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
-import { getAccessorByDimension } from '../../../../../visualizations/common/utils';
+import type { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { getAccessorByDimension } from '@kbn/visualizations-plugin/common/utils';
 import { Accessors, GaugeArguments } from '../../../common';
 
 export const getValueFromAccessor = (
diff --git a/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx b/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx
index c75f60f75c004..f51e5432ba09e 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx
@@ -8,10 +8,10 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { PersistedState } from '../../../../visualizations/public';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { EXPRESSION_GAUGE_NAME, GaugeExpressionProps } from '../../common';
 import { getFormatService, getPaletteService, getThemeService } from '../services';
 
diff --git a/src/plugins/chart_expressions/expression_gauge/public/plugin.ts b/src/plugins/chart_expressions/expression_gauge/public/plugin.ts
index 7cc6ebec0d5d8..afa8a28f0e217 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/plugin.ts
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ChartsPluginSetup } from '../../../charts/public';
-import { CoreSetup, CoreStart } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { gaugeFunction } from '../common';
 import { setFormatService, setThemeService, setPaletteService } from './services';
 import { gaugeRenderer } from './expression_renderers';
-import type { FieldFormatsStart } from '../../../field_formats/public';
 
 /** @internal */
 export interface ExpressionGaugePluginSetup {
diff --git a/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts b/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts
index 73b66341c4d9a..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts b/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts
index d18db6340fd45..60bee5353b270 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import { createGetterSetter } from '../../../../kibana_utils/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getPaletteService, setPaletteService] =
   createGetterSetter<PaletteRegistry>('palette');
diff --git a/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts b/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts
index 25eb0fc14ba0b..55ac6fb18cdad 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export const [getThemeService, setThemeService] =
   createGetterSetter<ChartsPluginSetup['theme']>('charts.theme');
diff --git a/src/plugins/chart_expressions/expression_gauge/server/plugin.ts b/src/plugins/chart_expressions/expression_gauge/server/plugin.ts
index deb67436627ba..7b6cd1abb4d39 100644
--- a/src/plugins/chart_expressions/expression_gauge/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_gauge/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { gaugeFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts
index b43c29c200cef..13beee6b0f701 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { heatmapFunction } from './heatmap_function';
-import type { HeatmapArguments } from '../../common';
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import type { HeatmapArguments } from '..';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { EXPRESSION_HEATMAP_GRID_NAME, EXPRESSION_HEATMAP_LEGEND_NAME } from '../constants';
 
 describe('interpreter/functions#heatmap', () => {
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts
index a1a04af76fd8b..c440176962faf 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { DatatableColumn } from '../../../../expressions/public';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import type { DatatableColumn } from '@kbn/expressions-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import {
   prepareLogTable,
   Dimension,
   validateAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
 import { HeatmapExpressionFunctionDefinition } from '../types';
 import {
   EXPRESSION_HEATMAP_NAME,
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts
index 9d3b8f6a29ada..e4d239d7c5a75 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { EXPRESSION_HEATMAP_GRID_NAME } from '../constants';
 import { HeatmapGridConfig, HeatmapGridConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts
index 094520fed1db8..1135708db8c22 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts
@@ -7,7 +7,7 @@
  */
 import { Position } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { EXPRESSION_HEATMAP_LEGEND_NAME } from '../constants';
 import { HeatmapLegendConfig, HeatmapLegendConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts
index d96a803df92f5..d3e7444ad08f2 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts
@@ -11,10 +11,10 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 
-import { CustomPaletteState } from '../../../../charts/common';
+import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import {
   EXPRESSION_HEATMAP_NAME,
   EXPRESSION_HEATMAP_LEGEND_NAME,
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts
index 67160240d284b..0c3610c5a114f 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts
@@ -7,10 +7,10 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { ChartsPluginSetup } from '../../../../charts/public';
-import type { IFieldFormat, SerializedFieldFormat } from '../../../../field_formats/common';
-import type { RangeSelectContext, ValueClickContext } from '../../../../embeddable/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import type { HeatmapExpressionProps } from './expression_functions';
 
 export interface FilterEvent {
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx
index 031d8de079a7f..4f3e77b8f1d6e 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { Settings, TooltipType, Heatmap } from '@elastic/charts';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import { EmptyPlaceholder } from '../../../../charts/public';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
@@ -27,6 +27,17 @@ jest.mock('@elastic/charts', () => {
   };
 });
 
+const actWithTimeout = (action: Function, timer: number = 1) =>
+  act(
+    () =>
+      new Promise((resolve) =>
+        setTimeout(async () => {
+          await action();
+          resolve();
+        }, timer)
+      )
+  );
+
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
 const palettesRegistry = chartPluginMock.createPaletteRegistry();
 const formatService = fieldFormatsServiceMock.createStartContract();
@@ -110,6 +121,9 @@ describe('HeatmapComponent', function () {
 
   it('renders the legend toggle component if uiState is set', async () => {
     const component = mountWithIntl(<HeatmapComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(1);
     });
@@ -118,6 +132,9 @@ describe('HeatmapComponent', function () {
   it('not renders the legend toggle component if uiState is undefined', async () => {
     const newProps = { ...wrapperProps, uiState: undefined } as unknown as HeatmapRenderProps;
     const component = mountWithIntl(<HeatmapComponent {...newProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(0);
     });
@@ -125,6 +142,9 @@ describe('HeatmapComponent', function () {
 
   it('renders the legendColorPicker if uiState is set', async () => {
     const component = mountWithIntl(<HeatmapComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(component.find(Settings).prop('legendColorPicker')).toBeDefined();
     });
@@ -133,6 +153,9 @@ describe('HeatmapComponent', function () {
   it('not renders the legendColorPicker if uiState is undefined', async () => {
     const newProps = { ...wrapperProps, uiState: undefined } as unknown as HeatmapRenderProps;
     const component = mountWithIntl(<HeatmapComponent {...newProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(component.find(Settings).prop('legendColorPicker')).toBeUndefined();
     });
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx
index 40d3563756c18..a9b70d1bc2edd 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx
@@ -22,13 +22,13 @@ import {
   ESCalendarIntervalUnit,
   PartialTheme,
 } from '@elastic/charts';
-import type { CustomPaletteState } from '../../../../charts/public';
-import { search } from '../../../../data/public';
-import { LegendToggle, EmptyPlaceholder } from '../../../../charts/public';
+import type { CustomPaletteState } from '@kbn/charts-plugin/public';
+import { search } from '@kbn/data-plugin/public';
+import { LegendToggle, EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import {
   getAccessorByDimension,
   getFormatByAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
 import type { HeatmapRenderProps, FilterEvent, BrushEvent } from '../../common';
 import { applyPaletteParams, findMinMaxByColumnId, getSortPredicate } from './helpers';
 import {
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx
index 410f8a268bff7..7a49d53222946 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx
@@ -8,25 +8,30 @@
 
 import { EuiIconProps } from '@elastic/eui';
 import React from 'react';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const HeatmapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    width={30}
-    height={22}
-    viewBox="0 0 30 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      className="chart-icon__accent"
-      d="M16 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V1zM0 17a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1v-4zm17-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V9a1 1 0 00-1-1h-4zm-1 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4zm9-17a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1h-4z"
-    />
-    <path
-      className="chart-icon__subdued"
-      d="M0 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm0 8a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V9zm9-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1H9zM8 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H9a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1H9zm15-7a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1h-4z"
-    />
-  </svg>
-);
+export const HeatmapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      width={30}
+      height={22}
+      viewBox="0 0 30 22"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M16 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V1zM0 17a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1v-4zm17-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V9a1 1 0 00-1-1h-4zm-1 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4zm9-17a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1h-4z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M0 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm0 8a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V9zm9-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1H9zM8 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H9a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1H9zm15-7a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1h-4z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts
index 5199d4286e69e..bfda93da53719 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import type { DatatableColumn } from 'src/plugins/expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import type { DatatableColumn } from '@kbn/expressions-plugin/public';
 import {
   applyPaletteParams,
   getDataMinMax,
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts
index b82b52e1a1a49..12cee6852a036 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts
@@ -18,7 +18,7 @@ import {
   DEFAULT_MIN_STOP,
 } from '@kbn/coloring';
 
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions/public';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
 
 import { defaultPaletteParams } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx b/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx
index 0d3d9dcf93be7..e6e2fa3ac709d 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx
@@ -8,10 +8,10 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import {
   EXPRESSION_HEATMAP_NAME,
   HeatmapExpressionProps,
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts b/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts
index cabb938f6f6b4..69ff0751f0114 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ChartsPluginSetup } from '../../../charts/public';
-import { CoreSetup, CoreStart } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { heatmapFunction, heatmapLegendConfig, heatmapGridConfig } from '../common';
 import { setFormatService, setPaletteService, setUISettings, setThemeService } from './services';
 import { heatmapRenderer } from './expression_renderers';
-import type { FieldFormatsStart } from '../../../field_formats/public';
 
 /** @internal */
 export interface ExpressionHeatmapPluginSetup {
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts b/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts
index 73b66341c4d9a..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts b/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts
index 7185422c79cad..7a9eb241082e1 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts
@@ -7,8 +7,8 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export const [getPaletteService, setPaletteService] =
   createGetterSetter<PaletteRegistry>('palette');
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts b/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts
index 5e49e8da28840..4d9a2293eb8f8 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { CoreSetup } from '../../../../../core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
 
 export const [getUISettings, setUISettings] =
   createGetterSetter<CoreSetup['uiSettings']>('core.uiSettings');
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx
index 771a633456e13..f744e85378ec1 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx
@@ -9,8 +9,8 @@
 import React, { createContext, useCallback, useContext } from 'react';
 import { LegendColorPicker, Position } from '@elastic/charts';
 import { PopoverAnchorPosition, EuiWrappingPopover, EuiOutsideClickDetector } from '@elastic/eui';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ColorPicker } from '../../../../charts/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
 
 const KEY_CODE_ENTER = 13;
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts
index 8d33a94c956d0..fb6596f1482f0 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import type { IUiSettingsClient } from '../../../../../core/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 
 /**
  * Get timeZone from uiSettings
diff --git a/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts b/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts
index 858c67da86a6e..1f5597621341d 100644
--- a/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { heatmapFunction, heatmapLegendConfig, heatmapGridConfig } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
index 2c59a9a875d85..65f738e8e227d 100644
--- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { metricVisFunction } from './metric_vis_function';
-import type { MetricArguments } from '../../common';
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import type { MetricArguments } from '..';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { LabelPosition } from '../constants';
 
 describe('interpreter/functions#metric', () => {
diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
index bea25fbf708d7..2310ffb8c5926 100644
--- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
@@ -8,13 +8,13 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { visType } from '../types';
 import {
   prepareLogTable,
   Dimension,
   validateAccessor,
-} from '../../../../visualizations/common/utils';
-import { ColorMode } from '../../../../charts/common';
+} from '@kbn/visualizations-plugin/common/utils';
+import { ColorMode } from '@kbn/charts-plugin/common';
+import { visType } from '../types';
 import { MetricVisExpressionFunctionDefinition } from '../types';
 import { EXPRESSION_METRIC_NAME, LabelPosition } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
index deb5f5e027abf..5ad540fc579f6 100644
--- a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
@@ -12,9 +12,9 @@ import {
   ExpressionFunctionDefinition,
   ExpressionValueRender,
   Style,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { ColorMode, CustomPaletteState } from '../../../../charts/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { VisParams, visType, LabelPositionType } from './expression_renderers';
 import { EXPRESSION_METRIC_NAME } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
index f54fefd9a1267..695b7ad4754fa 100644
--- a/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
@@ -7,14 +7,14 @@
  */
 
 import { $Values } from '@kbn/utility-types';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import {
   ColorMode,
   Labels,
   CustomPaletteState,
   Style as ChartStyle,
-} from '../../../../charts/common';
-import { Style } from '../../../../expressions/common';
+} from '@kbn/charts-plugin/common';
+import { Style } from '@kbn/expressions-plugin/common';
 import { LabelPosition } from '../constants';
 
 export const visType = 'metric';
diff --git a/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts b/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts
index 89872b4461be3..00e068da062e4 100644
--- a/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CustomPaletteState } from 'src/plugins/charts/common';
+import { CustomPaletteState } from '@kbn/charts-plugin/common';
 
 export const getPaletteService = () => {
   return {
diff --git a/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx b/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx
index 039e15d2a67b4..7a278d488bc68 100644
--- a/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { from } from 'rxjs';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable, DatatableColumn } from '../../../../expressions';
-import { Render } from '../../../../presentation_util/public/__stories__';
-import { ColorMode, CustomPaletteState } from '../../../../charts/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
+import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getMetricVisRenderer } from '../expression_renderers';
 import { MetricStyle, MetricVisRenderConfig, visType } from '../../common/types';
 import { LabelPosition } from '../../common/constants';
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx
index 83cefac91a825..f91d3adcd16a8 100644
--- a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx
@@ -8,11 +8,11 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Datatable } from '../../../../expressions/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import MetricVisComponent, { MetricVisComponentProps } from './metric_component';
 import { LabelPosition } from '../../common/constants';
 
-jest.mock('../../../expression_metric/public/services', () => ({
+jest.mock('../services', () => ({
   getFormatService: () => {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { getFormatService } = require('../__mocks__/services');
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx
index ec13a41f86a6e..a7d0eb8cad8c6 100644
--- a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx
@@ -7,18 +7,18 @@
  */
 
 import React, { Component } from 'react';
-import { MetricVisValue } from './metric_value';
-import { VisParams, MetricOptions } from '../../common/types';
-import type { IFieldFormat } from '../../../../field_formats/common';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
 import {
   getColumnByAccessor,
   getAccessor,
   getFormatByAccessor,
-} from '../../../../visualizations/common/utils';
-import { Datatable } from '../../../../expressions/public';
-import { CustomPaletteState } from '../../../../charts/public';
-import { getFormatService, getPaletteService } from '../../../expression_metric/public/services';
-import { ExpressionValueVisDimension } from '../../../../visualizations/public';
+} from '@kbn/visualizations-plugin/common/utils';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { CustomPaletteState } from '@kbn/charts-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { getFormatService, getPaletteService } from '../services';
+import { VisParams, MetricOptions } from '../../common/types';
+import { MetricVisValue } from './metric_value';
 import { formatValue, shouldApplyColor } from '../utils';
 import { needsLightText } from '../utils/palette';
 import { withAutoScale } from './with_auto_scale';
diff --git a/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx b/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx
index 41d9f864c1a20..4026d3c2d1bc6 100644
--- a/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx
@@ -9,10 +9,10 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { VisualizationContainer } from '../../../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { EXPRESSION_METRIC_NAME, MetricVisRenderConfig } from '../../common';
 
 // @ts-ignore
diff --git a/src/plugins/chart_expressions/expression_metric/public/format_service.ts b/src/plugins/chart_expressions/expression_metric/public/format_service.ts
index 19d2f9a5568ce..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_metric/public/format_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_metric/public/plugin.ts b/src/plugins/chart_expressions/expression_metric/public/plugin.ts
index f941b4a9e2f22..439fb398dbb8a 100644
--- a/src/plugins/chart_expressions/expression_metric/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/plugin.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { ChartsPluginSetup } from '../../../charts/public';
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { metricVisFunction } from '../common';
 import { setFormatService, setPaletteService } from './services';
 import { getMetricVisRenderer } from './expression_renderers';
-import { FieldFormatsStart } from '../../../field_formats/public';
 
 /** @internal */
 export interface ExpressionMetricPluginSetup {
diff --git a/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts b/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts
index 73b66341c4d9a..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts b/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts
index d18db6340fd45..60bee5353b270 100644
--- a/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import { createGetterSetter } from '../../../../kibana_utils/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getPaletteService, setPaletteService] =
   createGetterSetter<PaletteRegistry>('palette');
diff --git a/src/plugins/chart_expressions/expression_metric/public/utils/format.ts b/src/plugins/chart_expressions/expression_metric/public/utils/format.ts
index 0339baec9e904..80f5dec8151f6 100644
--- a/src/plugins/chart_expressions/expression_metric/public/utils/format.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/utils/format.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsContentType, IFieldFormat } from '../../../../field_formats/common';
+import { FieldFormatsContentType, IFieldFormat } from '@kbn/field-formats-plugin/common';
 
 export const formatValue = (
   value: number | string,
diff --git a/src/plugins/chart_expressions/expression_metric/server/plugin.ts b/src/plugins/chart_expressions/expression_metric/server/plugin.ts
index 1a04d4702361f..aeead69b806f2 100644
--- a/src/plugins/chart_expressions/expression_metric/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_metric/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { metricVisFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts
index 58f765899f5e3..0ce174b38677f 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   MosaicVisConfig,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { mosaicVisFunction } from './mosaic_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts
index d3179026f3c9e..74a85dd01e6e4 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, MosaicVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts
index 900927a35983c..48ecab49dc23b 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable } from '../../../../expressions/common';
+import { ExpressionFunctionDefinition, Datatable } from '@kbn/expressions-plugin/common';
 import { PARTITION_LABELS_FUNCTION, PARTITION_LABELS_VALUE } from '../constants';
 import {
   ExpressionValuePartitionLabels,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts
index 366683ce80ddb..c542a25c30875 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   PieVisConfig,
   EmptySizeRatios,
@@ -14,8 +14,8 @@ import {
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { pieVisFunction } from './pie_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts
index 5edab8f7c5226..9a30008cc6bb3 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { EmptySizeRatios, LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, PieVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts
index 1d65ba35a5e0c..5d2cd5b8a0c38 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   TreemapVisConfig,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { treemapVisFunction } from './treemap_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts
index cda9e59da0610..062cf7e78b4ea 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, TreemapVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts
index ead4d97a8f8e0..01cbe844728b3 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   WaffleVisConfig,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { waffleVisFunction } from './waffle_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts
index 3ff35d1277dba..2f947a3d5fea6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, WaffleVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts
index bc623fd621345..fe5910990d62a 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts
@@ -6,6 +6,12 @@
  * Side Public License, v 1.
  */
 
+import {
+  ExpressionFunctionDefinition,
+  Datatable,
+  ExpressionValueRender,
+  ExpressionValueBoxed,
+} from '@kbn/expressions-plugin/common';
 import {
   PARTITION_LABELS_VALUE,
   PIE_VIS_EXPRESSION_NAME,
@@ -13,12 +19,6 @@ import {
   MOSAIC_VIS_EXPRESSION_NAME,
   WAFFLE_VIS_EXPRESSION_NAME,
 } from '../constants';
-import {
-  ExpressionFunctionDefinition,
-  Datatable,
-  ExpressionValueRender,
-  ExpressionValueBoxed,
-} from '../../../../expressions/common';
 import {
   RenderValue,
   PieVisConfig,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts
index 7ac7e9deedc20..05613af4f2f33 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts
@@ -8,9 +8,9 @@
 
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, DatatableColumn } from '../../../../expressions/common';
-import { SerializedFieldFormat } from '../../../../field_formats/common';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { ChartTypes, ExpressionValuePartitionLabels } from './expression_functions';
 
 export enum EmptySizeRatios {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts
index af87a59388caf..9dfdaf503c4ee 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts
@@ -8,8 +8,8 @@
 
 import { from } from 'rxjs';
 import { action } from '@storybook/addon-actions';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { getFormatService } from './format_service';
 
 const theme = {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts
index 178b8db605e1a..7cf5674b1b934 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts
@@ -7,7 +7,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ThemeService } from '../../../../charts/public/services';
+import { ThemeService } from '@kbn/charts-plugin/public/services';
 import { uiSettings } from './ui_settings';
 
 const theme = new ThemeService();
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts
index c5838d82867fb..1585133e3b8d6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from 'kibana/public';
+import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from '@kbn/core/public';
 import { Observable } from 'rxjs';
 
 export const uiSettings: IUiSettingsClient = {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx
index bba644f721038..bec4787234766 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx
index b6d6e9055e692..04eda916ae272 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx
index a8f9010ade4ab..ba576fddd59c4 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx
index a97efdabef892..8284c0961ad91 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap b/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap
index 2df18b5813473..3c48d3cb36771 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap
@@ -228,7 +228,7 @@ exports[`PartitionVisComponent should render correct structure for donut 1`] = `
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -656,7 +656,7 @@ exports[`PartitionVisComponent should render correct structure for mosaic 1`] =
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -1035,7 +1035,7 @@ exports[`PartitionVisComponent should render correct structure for pie 1`] = `
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -1447,7 +1447,7 @@ exports[`PartitionVisComponent should render correct structure for treemap 1`] =
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -1847,7 +1847,7 @@ exports[`PartitionVisComponent should render correct structure for waffle 1`] =
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
index 001f2390799e6..1281fb17bd990 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { Settings, TooltipType, SeriesIdentifier } from '@elastic/charts';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { shallow, mount } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
@@ -34,6 +34,17 @@ jest.mock('@elastic/charts', () => {
   };
 });
 
+const actWithTimeout = (action: Function, timer: number = 1) =>
+  act(
+    () =>
+      new Promise((resolve) =>
+        setTimeout(async () => {
+          await action();
+          resolve();
+        }, timer)
+      )
+  );
+
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
 const palettesRegistry = chartPluginMock.createPaletteRegistry();
 const visParams = createMockPieParams();
@@ -131,13 +142,12 @@ describe('PartitionVisComponent', function () {
     expect(component).toMatchSnapshot();
   });
 
-  it('renders the legend on the correct position', () => {
-    const component = shallow(<PartitionVisComponent {...wrapperProps} />);
-    expect(component.find(Settings).prop('legendPosition')).toEqual('right');
-  });
-
   it('renders the legend toggle component', async () => {
     const component = mount(<PartitionVisComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
+
     await act(async () => {
       expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(1);
     });
@@ -145,6 +155,9 @@ describe('PartitionVisComponent', function () {
 
   it('hides the legend if the legend toggle is clicked', async () => {
     const component = mount(<PartitionVisComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     findTestSubject(component, 'vislibToggleLegend').simulate('click');
     await act(async () => {
       expect(component.find(Settings).prop('showLegend')).toEqual(false);
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
index e8ab85f2877ff..ef6d0d1c4525c 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
@@ -21,15 +21,15 @@ import {
 } from '@elastic/charts';
 import { useEuiTheme } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { LegendToggle, ChartsPluginSetup } from '../../../../charts/public';
-import type { PersistedState } from '../../../../visualizations/public';
-import { getColumnByAccessor } from '../../../../visualizations/common/utils';
+import { LegendToggle, ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import {
   Datatable,
   DatatableColumn,
   IInterpreterRenderHandlers,
-} from '../../../../expressions/public';
-import type { FieldFormat } from '../../../../field_formats/common';
+} from '@kbn/expressions-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { DEFAULT_PERCENT_DECIMALS } from '../../common/constants';
 import {
   PartitionVisParams,
@@ -127,12 +127,8 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
 
   useEffect(() => {
     const legendShow = showLegendDefault();
-    const showLegendDef = shouldShowLegend(visType, visParams.legendDisplay, bucketColumns);
-    if (showLegendDef !== legendShow) {
-      setShowLegend(legendShow);
-      props.uiState?.set('vis.legendOpen', legendShow);
-    }
-  }, [showLegendDefault, props.uiState, visParams.legendDisplay, visType, bucketColumns]);
+    setShowLegend(legendShow);
+  }, [showLegendDefault]);
 
   const onRenderChange = useCallback<RenderChangeListener>(
     (isRendered) => {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx
index c728ff89a04f8..6c8f728fbb1c8 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { EmptyPlaceholder } from '../../../../charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import { ChartTypes } from '../../common/types';
 import { getIcon } from '../utils';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
index b0fe277cebfd3..828491f47b93a 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
@@ -11,11 +11,11 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { css } from '@emotion/react';
 import { i18n } from '@kbn/i18n';
-import { ExpressionRenderDefinition } from '../../../../expressions/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { VisTypePieDependencies } from '../plugin';
-import { withSuspense } from '../../../../presentation_util/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
 import { PARTITION_VIS_RENDERER_NAME } from '../../common/constants';
 import { ChartTypes, RenderValue } from '../../common/types';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx
index 5846fe0e7e8ba..3101164bfe88d 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const DonutIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      d="M19.21 21.119a11 11 0 006.595-8.1c.11-.577-.355-1.082-.942-1.082H20.75c-.477 0-.878.342-1.046.788a5.028 5.028 0 11-6.474-6.474c.447-.168.788-.569.788-1.046V1.094c0-.588-.505-1.053-1.082-.943a11 11 0 106.272 20.968h.002z"
-      className="chart-icon__subdued"
-    />
-    <path
-      d="M22.778 3.176A11 11 0 0017.084.154C16.507.042 16 .507 16 1.095v4.116c0 .475.34.875.784 1.044l.14.055A5.026 5.026 0 0119.7 9.17c.168.445.568.784 1.044.784h4.115c.588 0 1.053-.506.942-1.084a11 11 0 00-3.023-5.694z"
-      className="chart-icon__accent"
-    />
-  </svg>
-);
+export const DonutIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        d="M19.21 21.119a11 11 0 006.595-8.1c.11-.577-.355-1.082-.942-1.082H20.75c-.477 0-.878.342-1.046.788a5.028 5.028 0 11-6.474-6.474c.447-.168.788-.569.788-1.046V1.094c0-.588-.505-1.053-1.082-.943a11 11 0 106.272 20.968h.002z"
+        css={chartIcon.subdued}
+      />
+      <path
+        d="M22.778 3.176A11 11 0 0017.084.154C16.507.042 16 .507 16 1.095v4.116c0 .475.34.875.784 1.044l.14.055A5.026 5.026 0 0119.7 9.17c.168.445.568.784 1.044.784h4.115c.588 0 1.053-.506.942-1.084a11 11 0 00-3.023-5.694z"
+        css={chartIcon.accent}
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx
index f8582495f2e0c..1f5c99702f869 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const MosaicIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId} /> : null}
-    <path
-      className="chart-icon__subdued"
-      d="M2 0a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1H2zM2 14a1 1 0 00-1 1v6a1 1 0 001 1h6a1 1 0 001-1v-6a1 1 0 00-1-1H2zM11 13a1 1 0 011-1h6a1 1 0 011 1v8a1 1 0 01-1 1h-6a1 1 0 01-1-1v-8zM12 0a1 1 0 100 2h6a1 1 0 100-2h-6zM21 15a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1h-6a1 1 0 01-1-1v-6zM22 0a1 1 0 00-1 1v4a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1h-6z"
-    />
-    <path
-      className="chart-icon__accent"
-      d="M11 5a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1h-6a1 1 0 01-1-1V5zM1 7a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1H2a1 1 0 01-1-1V7zM22 8a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V9a1 1 0 00-1-1h-6z"
-    />
-  </svg>
-);
+export const MosaicIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId} /> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M2 0a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1H2zM2 14a1 1 0 00-1 1v6a1 1 0 001 1h6a1 1 0 001-1v-6a1 1 0 00-1-1H2zM11 13a1 1 0 011-1h6a1 1 0 011 1v8a1 1 0 01-1 1h-6a1 1 0 01-1-1v-8zM12 0a1 1 0 100 2h6a1 1 0 100-2h-6zM21 15a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1h-6a1 1 0 01-1-1v-6zM22 0a1 1 0 00-1 1v4a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1h-6z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M11 5a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1h-6a1 1 0 01-1-1V5zM1 7a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1H2a1 1 0 01-1-1V7zM22 8a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V9a1 1 0 00-1-1h-6z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx
index 9176ac3fdd5c1..5824b8f40b6e6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const PieIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      d="M17.827 21.189a10.001 10.001 0 005.952-7.148c.124-.578-.343-1.091-.935-1.091H14a1 1 0 01-1-1V3.106c0-.592-.513-1.059-1.092-.935a10 10 0 105.919 19.018z"
-      className="chart-icon__subdued"
-    />
-    <path
-      d="M22.462 3.538A12.29 12.29 0 0016.094.16C15.512.048 15 .514 15 1.106V10a1 1 0 001 1h8.895c.591 0 1.057-.512.945-1.094a12.288 12.288 0 00-3.378-6.368z"
-      className="chart-icon__accent"
-    />
-  </svg>
-);
+export const PieIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        d="M17.827 21.189a10.001 10.001 0 005.952-7.148c.124-.578-.343-1.091-.935-1.091H14a1 1 0 01-1-1V3.106c0-.592-.513-1.059-1.092-.935a10 10 0 105.919 19.018z"
+        css={chartIcon.subdued}
+      />
+      <path
+        d="M22.462 3.538A12.29 12.29 0 0016.094.16C15.512.048 15 .514 15 1.106V10a1 1 0 001 1h8.895c.591 0 1.057-.512.945-1.094a12.288 12.288 0 00-3.378-6.368z"
+        css={chartIcon.accent}
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx
index 1860132fa9ffd..781b79505384d 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx
@@ -8,29 +8,34 @@
 
 import React from 'react';
 import { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const TreemapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      d="M0 1a1 1 0 011-1h13a1 1 0 011 1v20a1 1 0 01-1 1H1a1 1 0 01-1-1V1z"
-      className="chart-icon__subdued"
-    />
-    <path
-      d="M17 1a1 1 0 011-1h11a1 1 0 011 1v12a1 1 0 01-1 1H18a1 1 0 01-1-1V1z"
-      className="chart-icon__accent"
-    />
-    <path
-      d="M29 16H18a1 1 0 00-1 1v4a1 1 0 001 1h11a1 1 0 001-1v-4a1 1 0 00-1-1z"
-      className="chart-icon__subdued"
-    />
-  </svg>
-);
+export const TreemapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        d="M0 1a1 1 0 011-1h13a1 1 0 011 1v20a1 1 0 01-1 1H1a1 1 0 01-1-1V1z"
+        css={chartIcon.subdued}
+      />
+      <path
+        d="M17 1a1 1 0 011-1h11a1 1 0 011 1v12a1 1 0 01-1 1H18a1 1 0 01-1-1V1z"
+        css={chartIcon.accent}
+      />
+      <path
+        d="M29 16H18a1 1 0 00-1 1v4a1 1 0 001 1h11a1 1 0 001-1v-4a1 1 0 00-1-1z"
+        css={chartIcon.subdued}
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx
index 30f05dd57f348..21e26facd8e15 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const WaffleIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId} /> : null}
-    <path
-      className="chart-icon__accent"
-      d="M16 1a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V1zM4 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM17 6a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V7a1 1 0 00-1-1h-2zM23 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM5 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1H5zM4 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V7zM11 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM10 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7zM11 12a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM22 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7z"
-    />
-    <path
-      className="chart-icon__subdued"
-      d="M22 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM4 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM16 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM11 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM23 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM16 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2z"
-    />
-  </svg>
-);
+export const WaffleIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId} /> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M16 1a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V1zM4 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM17 6a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V7a1 1 0 00-1-1h-2zM23 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM5 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1H5zM4 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V7zM11 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM10 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7zM11 12a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM22 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M22 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM4 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM16 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM11 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM23 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM16 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts b/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts
index 824fa3a1861f6..455dd111179d2 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '../../../expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import {
   BucketColumns,
   PartitionVisParams,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts b/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts
index 3bc3cdb31f9b1..54d93a704a746 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { CoreSetup, CoreStart, ThemeServiceStart } from '../../../../core/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { CoreSetup, CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   partitionLabelsFunction,
   pieVisFunction,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/types.ts b/src/plugins/chart_expressions/expression_partition_vis/public/types.ts
index 50fb15cc053a3..22b47bb49dfd2 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/public/types.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/types.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { ValueClickContext } from '../../../embeddable/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import type { ValueClickContext } from '@kbn/embeddable-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import {
   Plugin as ExpressionsPublicPlugin,
   ExpressionsServiceStart,
-} from '../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 
 export type ExpressionPartitionVisPluginSetup = void;
 export type ExpressionPartitionVisPluginStart = void;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts
index f6e20104779fa..fbd68ad5177f4 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DatatableColumn } from '../../../../expressions/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/public';
 import { getFilterClickData, getFilterEventData } from './filter_helpers';
 import { createMockBucketColumns, createMockVisData } from '../mocks';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts
index 5b48d68f68201..c36e160c0c36b 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts
@@ -7,10 +7,10 @@
  */
 
 import { LayerValue, SeriesIdentifier } from '@elastic/charts';
-import { Datatable, DatatableColumn } from '../../../../expressions/public';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { ValueClickContext } from '../../../../embeddable/public';
-import type { FieldFormat } from '../../../../field_formats/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ValueClickContext } from '@kbn/embeddable-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { BucketColumns } from '../../common/types';
 import { FilterEvent } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts
index 18f89cb5f3e4e..d6bbf8e2410a8 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
-import { Datatable } from '../../../../expressions';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { Datatable } from '@kbn/expressions-plugin';
 import { createMockVisData } from '../mocks';
 import { generateFormatters, getAvailableFormatter, getFormatter } from './formatters';
 import { BucketColumns } from '../../common/types';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts
index bbb30169928d4..64139e301842a 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { FieldFormat, FormatFactory } from '../../../../field_formats/common';
-import type { Datatable } from '../../../../expressions/public';
+import type { FieldFormat, FormatFactory } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { BucketColumns } from '../../common/types';
 
 export const generateFormatters = (visData: Datatable, formatFactory: FormatFactory) =>
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx
index 1a9c785ed6dae..04aa0136dcadd 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx
@@ -16,8 +16,8 @@ import {
   LegendColorPickerWrapperContext,
   LegendColorPickerWrapperContextType,
 } from './get_color_picker';
-import { ColorPicker } from '../../../../charts/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { createMockBucketColumns, createMockVisData } from '../mocks';
 
 const bucketColumns = createMockBucketColumns();
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx
index 3f95f77c7ec6c..ebbd72ce52231 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx
@@ -10,9 +10,9 @@ import React, { useCallback, createContext, useContext } from 'react';
 import Color from 'color';
 import { LegendColorPicker, Position } from '@elastic/charts';
 import { PopoverAnchorPosition, EuiWrappingPopover, EuiOutsideClickDetector } from '@elastic/eui';
-import type { DatatableRow } from '../../../../expressions/public';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ColorPicker } from '../../../../charts/public';
+import type { DatatableRow } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
 import { BucketColumns } from '../../common/types';
 
 const KEY_CODE_ENTER = 13;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts
index e365bce5737af..0b5d0d101cf38 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { getColumnByAccessor, getFormatByAccessor } from '../../../../visualizations/common/utils';
-import { DatatableColumn, Datatable } from '../../../../expressions/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { getColumnByAccessor, getFormatByAccessor } from '@kbn/visualizations-plugin/common/utils';
+import { DatatableColumn, Datatable } from '@kbn/expressions-plugin/public';
 import { BucketColumns, PartitionVisParams } from '../../common/types';
 
 const getMetricColumn = (
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts
index cb432bf7b2580..b3efd7f7c0451 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 import { BucketColumns } from '../../common/types';
 
 export interface DistinctSeries {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx
index bf02a074dc18f..9ad76ea7a49a8 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx
@@ -11,11 +11,11 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiContextMenuPanelDescriptor, EuiIcon, EuiPopover, EuiContextMenu } from '@elastic/eui';
 import { LegendAction, SeriesIdentifier, useLegendAction } from '@elastic/charts';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { Datatable } from '../../../../expressions/public';
-import { getFormatByAccessor, getAccessor } from '../../../../visualizations/common/utils';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { getFormatByAccessor, getAccessor } from '@kbn/visualizations-plugin/common/utils';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { PartitionVisParams } from '../../common/types';
-import { FieldFormatsStart } from '../../../../field_formats/public';
 import { FilterEvent } from '../types';
 
 export const getLegendActions = (
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
index 11838c7ce0140..345d6ce068d0c 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { getPartitionTheme } from './get_partition_theme';
 import { createMockPieParams, createMockDonutParams, createMockPartitionVisParams } from '../mocks';
 import { ChartTypes, LabelPositions, PartitionVisParams } from '../../common/types';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts
index 5e0f58a384785..3609be601e1a5 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
-import { DatatableColumn } from '../../../../expressions';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { createMockVisData } from '../mocks';
 import { getSplitDimensionAccessor } from './get_split_dimension_accessor';
 import { BucketColumns } from '../../common/types';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 
 describe('getSplitDimensionAccessor', () => {
   const visData = createMockVisData();
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts
index 6491d79a083ac..d08bac5b61818 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 import { AccessorFn } from '@elastic/charts';
-import { DatatableColumn } from '../../../../expressions/public';
-import { FieldFormat, FormatFactory } from '../../../../field_formats/common';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { getColumnByAccessor } from '../../../../visualizations/common/utils';
+import { DatatableColumn } from '@kbn/expressions-plugin/public';
+import { FieldFormat, FormatFactory } from '@kbn/field-formats-plugin/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { getFormatter } from './formatters';
 
 export const getSplitDimensionAccessor = (
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts
index d951d962d67f2..e076cc65b5136 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts
@@ -7,8 +7,8 @@
  */
 
 import type { PaletteOutput, PaletteDefinition } from '@kbn/coloring';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
-import { Datatable } from '../../../../../expressions';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { Datatable } from '@kbn/expressions-plugin';
 import { byDataColorPaletteMap } from './get_color';
 
 describe('#byDataColorPaletteMap', () => {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts
index f6d88d1fe802e..9e55bec92fbaf 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts
@@ -8,9 +8,9 @@
 import { ShapeTreeNode } from '@elastic/charts';
 import { isEqual } from 'lodash';
 import type { PaletteRegistry, SeriesLayer, PaletteOutput, PaletteDefinition } from '@kbn/coloring';
-import type { FieldFormatsStart } from '../../../../../field_formats/public';
-import { lightenColor } from '../../../../../charts/public';
-import type { Datatable, DatatableRow } from '../../../../../expressions/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { lightenColor } from '@kbn/charts-plugin/public';
+import type { Datatable, DatatableRow } from '@kbn/expressions-plugin/public';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 import { DistinctSeries, getDistinctSeries } from '../get_distinct_series';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts
index 0cc0fea93e6fe..cab4beda3f794 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts
@@ -7,8 +7,8 @@
  */
 import { ShapeTreeNode } from '@elastic/charts';
 import type { PaletteDefinition, SeriesLayer } from '@kbn/coloring';
-import { dataPluginMock } from '../../../../../data/public/mocks';
-import type { DataPublicPluginStart } from '../../../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { getColor } from './get_color';
 import { createMockVisData, createMockBucketColumns, createMockPieParams } from '../../mocks';
 import { ChartTypes } from '../../../common/types';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts
index 8280e7bd2a896..1ba15fe2a055f 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts
@@ -8,9 +8,9 @@
 
 import { Datum, PartitionLayer } from '@elastic/charts';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { FieldFormat } from '../../../../../field_formats/common';
-import type { FieldFormatsStart } from '../../../../../field_formats/public';
-import type { Datatable, DatatableRow } from '../../../../../expressions/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { Datatable, DatatableRow } from '@kbn/expressions-plugin/public';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 import { sortPredicateByType } from './sort_predicate';
 import { byDataColorPaletteMap, getColor } from './get_color';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts
index 90c271daef6a4..70236d53a3e5f 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { FieldFormat, FormatFactory } from '../../../../../field_formats/common';
+import type { FieldFormat, FormatFactory } from '@kbn/field-formats-plugin/common';
 import { BucketColumns } from '../../../common/types';
 import { getAvailableFormatter } from '../formatters';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts
index 1ccfdb7a5b1f9..001b53889c6c6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '../../../../../expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { extractUniqTermsMap } from './sort_predicate';
 
 describe('#extractUniqTermsMap', () => {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts
index c7eaa2c494492..e6cb305157018 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts
@@ -7,7 +7,7 @@
  */
 
 import { ArrayEntry } from '@elastic/charts';
-import { Datatable } from '../../../../../../../src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 
 type SortFn = (([name1, node1]: ArrayEntry, [name2, node2]: ArrayEntry) => number) | undefined;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts
index 9990c1a8e65ea..55fca725a5431 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from '../../../../expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { BucketColumns, ChartTypes, LegendDisplay } from '../../common/types';
 
 type GetLegendIsFlatFn = (splitChartDimension: DatatableColumn | undefined) => boolean;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts b/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts
index 190e43e4c7dfa..3617c4604bb86 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import {
   partitionLabelsFunction,
   pieVisFunction,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/server/types.ts b/src/plugins/chart_expressions/expression_partition_vis/server/types.ts
index 0fdca6e6b319e..43a40b57d74e3 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/server/types.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/server/types.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 
 export type ExpressionPartitionVisPluginSetup = void;
 export type ExpressionPartitionVisPluginStart = void;
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts
index dc77848d37ceb..c9ddd7c30557b 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts
@@ -8,9 +8,9 @@
 
 import { tagcloudFunction } from './tagcloud_function';
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { ExpressionValueVisDimension } from '../../../../visualizations/public';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { ScaleOptions, Orientation } from '../constants';
 
 type Arguments = Parameters<ReturnType<typeof tagcloudFunction>['fn']>[1];
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts
index e4ccecd6a0069..d86f570daf5c1 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts
@@ -11,7 +11,7 @@ import {
   prepareLogTable,
   Dimension,
   validateAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
 import { TagCloudRendererParams } from '../types';
 import { ExpressionTagcloudFunction } from '../types';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts
index 01c29ccc0e77d..d452783c3ca7b 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts
@@ -12,8 +12,8 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
 
 interface TagCloudCommonParams {
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts
index d426aa061a2ab..c7d6d773f001a 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export interface TagCloudTypeProps {
   palettes: ChartsPluginSetup['palettes'];
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx
index 9866ec644ae26..5fcf7d04f0492 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { tagcloudRenderer } from '../expression_renderers';
-import { Render } from '../../../../presentation_util/public/__stories__';
 import { TagcloudRendererConfig } from '../../common/types';
 import { ScaleOptions, Orientation } from '../../common/constants';
 import { palettes } from '../__mocks__/palettes';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx
index a85455b924010..85f77c98e0b50 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx
@@ -7,8 +7,8 @@
  */
 import React from 'react';
 import { Wordcloud, Settings, WordcloudSpec } from '@elastic/charts';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { mount } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import TagCloudChart, { TagCloudChartProps } from './tagcloud_component';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx
index 5860c209f8be8..49f376a8a4aa3 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx
@@ -12,13 +12,13 @@ import { throttle } from 'lodash';
 import { EuiIconTip, EuiResizeObserver } from '@elastic/eui';
 import { Chart, Settings, Wordcloud, RenderChangeListener } from '@elastic/charts';
 import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
-import { IInterpreterRenderHandlers } from '../../../../expressions/public';
-import { getFormatService } from '../format_service';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
 import {
   getColumnByAccessor,
   getAccessor,
   getFormatByAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
+import { getFormatService } from '../format_service';
 import { TagcloudRendererConfig } from '../../common/types';
 import { ScaleOptions, Orientation } from '../../common/constants';
 
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx
index 2cec5453b9b9e..f0940f8f246e8 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx
@@ -11,9 +11,9 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { ClassNames } from '@emotion/react';
 import { i18n } from '@kbn/i18n';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { VisualizationContainer } from '../../../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { ExpressioTagcloudRendererDependencies } from '../plugin';
 import { TagcloudRendererConfig } from '../../common/types';
 import { EXPRESSION_NAME } from '../../common';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts b/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts
index 778170321bcc3..0c8b1dca122a7 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts
@@ -14,8 +14,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts b/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts
index 9385ab3b26772..8333ab8683084 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, ThemeServiceStart } from '../../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../../expressions/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { CoreSetup, CoreStart, Plugin, ThemeServiceStart } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { tagcloudRenderer } from './expression_renderers';
 import { tagcloudFunction } from '../common/expression_functions';
-import { FieldFormatsStart } from '../../../field_formats/public';
 import { setFormatService } from './format_service';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts b/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts
index 11f0d03407fbe..78a581d135c61 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { tagcloudFunction } from '../common/expression_functions';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
index f09ad04e77ddb..f225846687e14 100644
--- a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
@@ -8,7 +8,7 @@
 
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, DatatableRow } from 'src/plugins/expressions';
+import { Datatable, DatatableRow } from '@kbn/expressions-plugin';
 import { LayerTypes } from '../constants';
 import { DataLayerConfigResult, LensMultiTable, XYArgs } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts
index 0862b69ca44f2..9ec3a43e1d710 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LayerTypes, ANNOTATION_LAYER } from '../constants';
 import { AnnotationLayerArgs, AnnotationLayerConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts
index c5cf89a4663c9..e65550c7aeeef 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { AxisExtentConfig, AxisExtentConfigResult } from '../types';
 import { AxisExtentModes, AXIS_EXTENT_CONFIG } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts
index 50302214fc37c..53b9ca238fe78 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { AXIS_TITLES_VISIBILITY_CONFIG } from '../constants';
 import { AxesSettingsConfig, AxisTitlesVisibilityConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts
index ba7fafd3b3685..7f8bf30d956ff 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { DataLayerArgs } from '../types';
-import { dataLayerConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../expressions/common/mocks';
+import { dataLayerConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import { mockPaletteOutput } from '../__mocks__';
 import { LayerTypes } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts
index e9ffa0f41f49f..d09b8481a6842 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { DataLayerArgs, DataLayerConfigResult } from '../types';
 import {
   DATA_LAYER,
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts
index 91bfbc8fbe6f0..b42465da15ef1 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { AxesSettingsConfig } from '../types';
-import { gridlinesConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { gridlinesConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('gridlinesConfig', () => {
   test('produces the correct arguments', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts
index b94b8b5709c03..5010ca39cbdc4 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { GRID_LINES_CONFIG } from '../constants';
 import { AxesSettingsConfig, GridlinesConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts
index 2d54a729d3e5a..c4e795c7f6169 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { LabelsOrientationConfig } from '../types';
-import { labelsOrientationConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { labelsOrientationConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('labelsOrientationConfig', () => {
   test('produces the correct arguments', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts
index 94d726c56f3b2..5143f4a3e25bd 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LABELS_ORIENTATION_CONFIG } from '../constants';
 import { LabelsOrientationConfig, LabelsOrientationConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts
index 2c673ab990ded..9d58903e93c62 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Position } from '@elastic/charts';
-import { createMockExecutionContext } from '../../../../expressions/common/mocks';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import { LegendConfig } from '../types';
 import { legendConfigFunction } from './legend_config';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts
index 384f23aee811a..65f8a725518a3 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts
@@ -8,7 +8,7 @@
 
 import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LEGEND_CONFIG } from '../constants';
 import { LegendConfig, LegendConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts
index c5d0f17ff138d..46f6e7671c0ab 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LayerTypes, REFERENCE_LINE_LAYER, Y_CONFIG } from '../constants';
 import { ReferenceLineLayerArgs, ReferenceLineLayerConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts
index 8b31258377dd9..d856af48f5d88 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { AxesSettingsConfig } from '../types';
-import { tickLabelsConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { tickLabelsConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('tickLabelsConfig', () => {
   test('produces the correct arguments', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts
index 6a882094a56d2..4ee40054d6271 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { TICK_LABELS_CONFIG } from '../constants';
 import { AxesSettingsConfig, TickLabelsConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts
index 69d0bf51b3d64..27e68f0a49891 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { xyVisFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { xyVisFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import { sampleArgs } from '../__mocks__';
 import { XY_VIS } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
index 0f83aeecc7a20..227b7553d6414 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
@@ -7,9 +7,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import { LensMultiTable, XYArgs, XYRender } from '../types';
-import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils';
 import {
   XY_VIS,
   DATA_LAYER,
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts
index e665fc2b8cea0..943c6910952a0 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { FillStyles, IconPositions, LineStyles, YAxisModes, Y_CONFIG } from '../constants';
 import { YConfig, YConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
index 044e75f95fc57..a1984c78fe0ac 100644
--- a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
@@ -9,8 +9,8 @@
 import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable } from '../../../../expressions';
-import { EventAnnotationOutput } from '../../../../event_annotation/common';
+import { Datatable } from '@kbn/expressions-plugin';
+import { EventAnnotationOutput } from '@kbn/event-annotation-plugin/common';
 import {
   AxisExtentModes,
   FillStyles,
diff --git a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
index cc73950438f38..60b9f6a5788b4 100644
--- a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { chartPluginMock } from '../../../../../plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { DataLayerConfigResult, LensMultiTable, XYArgs } from '../../common';
 import { LayerTypes } from '../../common/constants';
 import { mockPaletteOutput, sampleArgs } from '../../common/__mocks__';
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap b/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
index 828a62c85cce3..f534db5a6c4e9 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
+++ b/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`XYChart component annotations should render basic annotation 1`] = `
   dataValues={
     Array [
       Object {
-        "dataValue": 1647591917125,
+        "dataValue": 1647591917140,
         "details": "Annotation",
         "header": "2022-03-18T08:25:17.140Z",
       },
@@ -169,7 +169,7 @@ exports[`XYChart component annotations should render simplified annotation when
   dataValues={
     Array [
       Object {
-        "dataValue": 1647591917125,
+        "dataValue": 1647591917140,
         "details": "Annotation",
         "header": "2022-03-18T08:25:17.140Z",
       },
@@ -288,6 +288,7 @@ exports[`XYChart component it renders area 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
@@ -522,6 +523,7 @@ exports[`XYChart component it renders bar 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
@@ -768,6 +770,7 @@ exports[`XYChart component it renders horizontal bar 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
@@ -1014,6 +1017,7 @@ exports[`XYChart component it renders line 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
@@ -1248,6 +1252,7 @@ exports[`XYChart component it renders stacked area 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
@@ -1490,6 +1495,7 @@ exports[`XYChart component it renders stacked bar 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
@@ -1744,6 +1750,7 @@ exports[`XYChart component it renders stacked horizontal bar 1`] = `
     domain={
       Object {
         "fit": false,
+        "includeDataFromIds": Array [],
         "max": NaN,
         "min": NaN,
       }
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx b/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx
index e8b99a36664df..976bec6678fe5 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx
@@ -19,9 +19,9 @@ import {
 } from '@elastic/charts';
 import moment from 'moment';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import type { EventAnnotationArgs } from '../../../../event_annotation/common';
-import type { FieldFormat } from '../../../../field_formats/common';
-import { defaultAnnotationColor } from '../../../../../../src/plugins/event_annotation/public';
+import type { EventAnnotationArgs } from '@kbn/event-annotation-plugin/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { defaultAnnotationColor } from '@kbn/event-annotation-plugin/public';
 import type { AnnotationLayerArgs, AnnotationLayerConfigResult } from '../../common/types';
 import { AnnotationIcon, hasIcon, Marker, MarkerBody } from '../helpers';
 import { mapVerticalToHorizontalPlacement, LINES_MARKER_SIZE } from '../helpers';
@@ -170,7 +170,12 @@ export const Annotations = ({
         const header =
           formatter?.convert(isGrouped ? roundedTimestamp : exactTimestamp) ||
           moment(isGrouped ? roundedTimestamp : exactTimestamp).toISOString();
-        const strokeWidth = annotation.lineWidth || 1;
+        const strokeWidth = hide ? 1 : annotation.lineWidth || 1;
+        const dataValue = isGrouped
+          ? moment(
+              isBarChart && minInterval ? roundedTimestamp + minInterval / 2 : roundedTimestamp
+            ).valueOf()
+          : moment(exactTimestamp).valueOf();
         return (
           <LineAnnotation
             id={id}
@@ -202,9 +207,7 @@ export const Annotations = ({
             markerPosition={markerPosition}
             dataValues={[
               {
-                dataValue: moment(
-                  isBarChart && minInterval ? roundedTimestamp + minInterval / 2 : roundedTimestamp
-                ).valueOf(),
+                dataValue,
                 header,
                 details: annotation.label,
               },
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx
index a0d6351dad7f9..1f64c45a5cb40 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx
@@ -9,7 +9,7 @@
 import { LineAnnotation, RectAnnotation } from '@elastic/charts';
 import { shallow } from 'enzyme';
 import React from 'react';
-import { FieldFormat } from '../../../../field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { LensMultiTable } from '../../common';
 import { ReferenceLineLayerArgs, YConfig } from '../../common/types';
 import { ReferenceLineAnnotations, ReferenceLineAnnotationsProps } from './reference_lines';
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx
index d71e56bcef6d0..6146cc379227d 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 import { groupBy } from 'lodash';
 import { RectAnnotation, AnnotationDomainType, LineAnnotation, Position } from '@elastic/charts';
 import { euiLightVars } from '@kbn/ui-theme';
-import type { FieldFormat } from '../../../../field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { IconPosition, ReferenceLineLayerArgs, YAxisMode } from '../../common/types';
 import type { LensMultiTable } from '../../common/types';
 import {
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx b/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx
index dbc4c348cb891..257d299616946 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx
@@ -9,9 +9,9 @@
 import { uniq } from 'lodash';
 import React from 'react';
 import moment from 'moment';
-import { Endzones } from '../../../../../plugins/charts/public';
+import { Endzones } from '@kbn/charts-plugin/public';
+import { search } from '@kbn/data-plugin/public';
 import type { LensMultiTable, DataLayerArgs } from '../../common';
-import { search } from '../../../../../plugins/data/public';
 
 export interface XDomain {
   min?: number;
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
index 1a8a16c165e9e..6ac39b1c0f941 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
@@ -33,7 +33,7 @@ import {
   VerticalAlignment,
   XYChartSeriesIdentifier,
 } from '@elastic/charts';
-import { EmptyPlaceholder } from '../../../../../plugins/charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import { XyEndzones } from './x_domain';
 import {
   chartsActiveCursorService,
@@ -51,8 +51,8 @@ import {
   sampleLayer,
 } from '../../common/__mocks__';
 import { XYChart, XYChartRenderProps } from './xy_chart';
-import { eventAnnotationServiceMock } from '../../../../event_annotation/public/mocks';
-import { EventAnnotationOutput } from '../../../../event_annotation/common';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
+import { EventAnnotationOutput } from '@kbn/event-annotation-plugin/common';
 
 const onClickValue = jest.fn();
 const onSelectRange = jest.fn();
@@ -530,6 +530,7 @@ describe('XYChart component', () => {
         fit: false,
         min: 123,
         max: 456,
+        includeDataFromIds: [],
       });
     });
 
@@ -553,6 +554,7 @@ describe('XYChart component', () => {
         fit: true,
         min: NaN,
         max: NaN,
+        includeDataFromIds: [],
       });
     });
 
@@ -582,6 +584,7 @@ describe('XYChart component', () => {
         fit: false,
         min: NaN,
         max: NaN,
+        includeDataFromIds: [],
       });
     });
 
@@ -613,6 +616,7 @@ describe('XYChart component', () => {
         fit: false,
         min: NaN,
         max: NaN,
+        includeDataFromIds: [],
       });
     });
 
@@ -622,44 +626,9 @@ describe('XYChart component', () => {
       const component = shallow(<XYChart {...defaultProps} data={data} args={args} />);
       expect(component.find(Axis).find('[id="left"]').prop('domain')).toEqual({
         fit: false,
-        min: 0,
-        max: 150,
-      });
-    });
-
-    test('it should ignore referenceLine values when set to custom extents', () => {
-      const { data, args } = sampleArgsWithReferenceLine();
-
-      const component = shallow(
-        <XYChart
-          {...defaultProps}
-          data={data}
-          args={{
-            ...args,
-            yLeftExtent: {
-              type: 'axisExtentConfig',
-              mode: 'custom',
-              lowerBound: 123,
-              upperBound: 456,
-            },
-          }}
-        />
-      );
-      expect(component.find(Axis).find('[id="left"]').prop('domain')).toEqual({
-        fit: false,
-        min: 123,
-        max: 456,
-      });
-    });
-
-    test('it should work for negative values in referenceLines', () => {
-      const { data, args } = sampleArgsWithReferenceLine(-150);
-
-      const component = shallow(<XYChart {...defaultProps} data={data} args={args} />);
-      expect(component.find(Axis).find('[id="left"]').prop('domain')).toEqual({
-        fit: false,
-        min: -150,
-        max: 5,
+        min: NaN,
+        max: NaN,
+        includeDataFromIds: ['referenceLine-referenceLine-a-rect'],
       });
     });
   });
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
index eace75970c67a..4f543ae0f09ae 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
@@ -39,20 +39,16 @@ import {
 import { IconType } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { PaletteRegistry, SeriesLayer } from '@kbn/coloring';
-import type { Datatable, DatatableRow, DatatableColumn } from '../../../../expressions/public';
-import { RenderMode } from '../../../../expressions/common';
-import { FieldFormat } from '../../../../field_formats/common';
-import { EmptyPlaceholder } from '../../../../../plugins/charts/public';
+import type { Datatable, DatatableRow, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { RenderMode } from '@kbn/expressions-plugin/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart, useActiveCursor } from '@kbn/charts-plugin/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
 import type { FilterEvent, BrushEvent, FormatFactory } from '../types';
 import type { SeriesType, XYChartProps } from '../../common/types';
 import { isHorizontalChart, getSeriesColor, getAnnotationsLayers, getDataLayers } from '../helpers';
-import { EventAnnotationServiceType } from '../../../../event_annotation/public';
-import {
-  ChartsPluginSetup,
-  ChartsPluginStart,
-  useActiveCursor,
-} from '../../../../../plugins/charts/public';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../plugins/charts/common';
 import {
   getFilteredLayers,
   getReferenceLayers,
@@ -61,7 +57,6 @@ import {
   getAxesConfiguration,
   GroupsConfiguration,
   validateExtent,
-  computeOverallDataDomain,
   getColorAssignments,
   getLinesCausedPaddings,
 } from '../helpers';
@@ -342,42 +337,21 @@ export function XYChart({
         min = extent.lowerBound ?? NaN;
         max = extent.upperBound ?? NaN;
       }
-    } else {
-      const axisHasReferenceLine = referenceLineLayers.some(({ yConfig }) =>
-        yConfig?.some(({ axisMode }) => axisMode === axis.groupId)
-      );
-      if (!fit && axisHasReferenceLine) {
-        // Remove this once the chart will support automatic annotation fit for other type of charts
-        const { min: computedMin, max: computedMax } = computeOverallDataDomain(
-          filteredLayers,
-          axis.series.map(({ accessor }) => accessor),
-          data.tables
-        );
-
-        if (computedMin != null && computedMax != null) {
-          max = Math.max(computedMax, max || 0);
-          min = Math.min(computedMin, min || 0);
-        }
-        for (const { layerId, yConfig } of referenceLineLayers) {
-          const table = data.tables[layerId];
-          for (const { axisMode, forAccessor } of yConfig || []) {
-            if (axis.groupId === axisMode) {
-              for (const row of table.rows) {
-                const value = row[forAccessor];
-                // keep the 0 in view
-                max = Math.max(value, max || 0, 0);
-                min = Math.min(value, min || 0, 0);
-              }
-            }
-          }
-        }
-      }
     }
 
     return {
       fit,
       min,
       max,
+      includeDataFromIds: referenceLineLayers
+        .flatMap((l) =>
+          l.yConfig ? l.yConfig.map((yConfig) => ({ layerId: l.layerId, yConfig })) : []
+        )
+        .filter(({ yConfig }) => yConfig.axisMode === axis.groupId)
+        .map(
+          ({ layerId, yConfig }) =>
+            `${layerId}-${yConfig.forAccessor}-${yConfig.fill !== 'none' ? 'rect' : 'line'}`
+        ),
     };
   };
 
diff --git a/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx b/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx
index 170f4fb9bb87b..a35216821c077 100644
--- a/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx
@@ -8,15 +8,15 @@
 
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ThemeServiceStart } from 'kibana/public';
+import { ThemeServiceStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { ChartsPluginStart } from '../../../../charts/public';
-import { EventAnnotationServiceType } from '../../../../event_annotation/public';
-import { ExpressionRenderDefinition } from '../../../../expressions';
-import { FormatFactory } from '../../../../field_formats/common';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { XYChartProps } from '../../common';
 import { calculateMinInterval } from '../helpers/interval';
 import type { BrushEvent, FilterEvent } from '../types';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts
index 201b0198087da..c5f2f6d7151e5 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts
@@ -8,7 +8,7 @@
 
 import { DataLayerConfigResult } from '../../common';
 import { LayerTypes } from '../../common/constants';
-import { Datatable } from '../../../../../plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { getAxesConfiguration } from './axes_configuration';
 
 describe('axes_configuration', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts
index 16529ecd40e90..38d2220904226 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts
@@ -6,13 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { Datatable } from '@kbn/expressions-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { FormatFactory } from '../types';
 import { AxisExtentConfig, DataLayerConfigResult } from '../../common';
-import { Datatable } from '../../../../../plugins/expressions/public';
-import type {
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../plugins/field_formats/common';
 
 interface FormattedMetric {
   layer: string;
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
index ef0cd36e3598e..ee2f5a0325287 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
@@ -8,7 +8,7 @@
 
 import { uniq, mapValues } from 'lodash';
 import { euiLightVars } from '@kbn/ui-theme';
-import type { Datatable } from '../../../../expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { FormatFactory } from '../types';
 import { isDataLayer } from './visualization';
 import { DataLayerConfigResult, XYLayerConfigResult } from '../../common';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/index.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/index.ts
index cb0300e47ae70..2bb3a5a927774 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/index.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/index.ts
@@ -12,7 +12,6 @@ export * from './state';
 export * from './visualization';
 export * from './fitting_functions';
 export * from './axes_configuration';
-export * from './reference_lines';
 export * from './icon';
 export * from './color_assignment';
 export * from './annotations_icon_set';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
index 7e15b49c311d4..b81fcd33fccad 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 import { XYChartProps } from '../../common';
 import { getFilteredLayers } from './layers';
 import { isDataLayer } from './visualization';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.ts
deleted file mode 100644
index 35419c3a40558..0000000000000
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { partition } from 'lodash';
-import { Datatable } from '../../../../expressions';
-import type { DataLayerConfigResult } from '../../common';
-import { isStackedChart } from './state';
-
-export function computeOverallDataDomain(
-  dataLayers: DataLayerConfigResult[],
-  accessorIds: string[],
-  activeData: Record<string, Datatable>,
-  allowStacking: boolean = true
-) {
-  const accessorMap = new Set(accessorIds);
-  let min: number | undefined;
-  let max: number | undefined;
-  const [stacked, unstacked] = partition(
-    dataLayers,
-    ({ seriesType }) => isStackedChart(seriesType) && allowStacking
-  );
-  for (const { layerId, accessors } of unstacked) {
-    const table = activeData[layerId];
-    if (table) {
-      for (const accessor of accessors) {
-        if (accessorMap.has(accessor)) {
-          for (const row of table.rows) {
-            const value = row[accessor];
-            if (typeof value === 'number') {
-              // when not stacked, do not keep the 0
-              max = max != null ? Math.max(value, max) : value;
-              min = min != null ? Math.min(value, min) : value;
-            }
-          }
-        }
-      }
-    }
-  }
-  // stacked can span multiple layers, so compute an overall max/min by bucket
-  const stackedResults: Record<string, number> = {};
-  for (const { layerId, accessors, xAccessor } of stacked) {
-    const table = activeData[layerId];
-    if (table) {
-      for (const accessor of accessors) {
-        if (accessorMap.has(accessor)) {
-          for (const row of table.rows) {
-            const value = row[accessor];
-            // start with a shared bucket
-            let bucket = 'shared';
-            // but if there's an xAccessor use it as new bucket system
-            if (xAccessor) {
-              bucket = row[xAccessor];
-            }
-            if (typeof value === 'number') {
-              stackedResults[bucket] = stackedResults[bucket] ?? 0;
-              stackedResults[bucket] += value;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  for (const value of Object.values(stackedResults)) {
-    // for stacked extents keep 0 in view
-    max = Math.max(value, max || 0, 0);
-    min = Math.min(value, min || 0, 0);
-  }
-
-  return { min, max };
-}
diff --git a/src/plugins/chart_expressions/expression_xy/public/plugin.ts b/src/plugins/chart_expressions/expression_xy/public/plugin.ts
index c43e3aae11de7..d08ffc0fd2ec6 100755
--- a/src/plugins/chart_expressions/expression_xy/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/plugin.ts
@@ -7,11 +7,12 @@
  */
 
 import moment from 'moment';
-import { LEGACY_TIME_AXIS } from '../../../charts/common';
-import { DataPublicPluginStart } from '../../../data/public';
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { ChartsPluginStart } from '../../../charts/public';
-import { CoreSetup, CoreStart, IUiSettingsClient } from '../../../../core/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart, IUiSettingsClient } from '@kbn/core/public';
+import { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
 import { ExpressionXyPluginSetup, ExpressionXyPluginStart, SetupDeps } from './types';
 import {
   xyVisFunction,
@@ -27,7 +28,6 @@ import {
   axisTitlesVisibilityConfigFunction,
 } from '../common';
 import { GetStartDepsFn, getXyChartRenderer } from './expression_renderers';
-import { EventAnnotationPluginSetup } from '../../../event_annotation/public';
 
 export interface XYPluginStartDependencies {
   data: DataPublicPluginStart;
diff --git a/src/plugins/chart_expressions/expression_xy/public/types.ts b/src/plugins/chart_expressions/expression_xy/public/types.ts
index 36b8f4c13a776..b58641f2c58fa 100755
--- a/src/plugins/chart_expressions/expression_xy/public/types.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/types.ts
@@ -7,12 +7,12 @@
  */
 
 import { IconType } from '@elastic/eui';
-import { DataPublicPluginSetup } from '../../../data/public';
-import { FieldFormatsSetup } from '../../../field_formats/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { IFieldFormat, SerializedFieldFormat } from '../../../../plugins/field_formats/common';
-import type { RangeSelectContext, ValueClickContext } from '../../../../plugins/embeddable/public';
-import { ExpressionsServiceStart, ExpressionsSetup } from '../../../expressions/public';
+import { DataPublicPluginSetup } from '@kbn/data-plugin/public';
+import { FieldFormatsSetup } from '@kbn/field-formats-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import { ExpressionsServiceStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 
 export interface SetupDeps {
   expressions: ExpressionsSetup;
diff --git a/src/plugins/chart_expressions/expression_xy/server/plugin.ts b/src/plugins/chart_expressions/expression_xy/server/plugin.ts
index ff979fd38e1c6..c16bd2eb28161 100755
--- a/src/plugins/chart_expressions/expression_xy/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_xy/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 
 import { ExpressionXyPluginSetup, ExpressionXyPluginStart } from './types';
 import {
diff --git a/src/plugins/chart_expressions/expression_xy/server/types.ts b/src/plugins/chart_expressions/expression_xy/server/types.ts
index 738f52b739229..1b6c46927e786 100755
--- a/src/plugins/chart_expressions/expression_xy/server/types.ts
+++ b/src/plugins/chart_expressions/expression_xy/server/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 
 export type ExpressionXyPluginSetup = void;
 export type ExpressionXyPluginStart = void;
diff --git a/src/plugins/charts/common/constants.ts b/src/plugins/charts/common/constants.ts
index 01fdb5e545bb4..6d895dcba26ed 100644
--- a/src/plugins/charts/common/constants.ts
+++ b/src/plugins/charts/common/constants.ts
@@ -20,3 +20,23 @@ export const paletteIds = [
   'warm',
   'gray',
 ];
+
+// This set of defaults originated in Canvas, which, at present, is the primary
+// consumer of this function.  Changing this default requires a change in Canvas
+// logic, which would likely be a breaking change in 7.x.
+export const defaultCustomColors = [
+  '#882E72',
+  '#B178A6',
+  '#D6C1DE',
+  '#1965B0',
+  '#5289C7',
+  '#7BAFDE',
+  '#4EB265',
+  '#90C987',
+  '#CAE0AB',
+  '#F7EE55',
+  '#F6C141',
+  '#F1932D',
+  '#E8601C',
+  '#DC050C',
+];
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts b/src/plugins/charts/common/expressions/palette/index.ts
similarity index 56%
rename from packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
rename to src/plugins/charts/common/expressions/palette/index.ts
index fab2e61755a5c..cb03733a15df5 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
+++ b/src/plugins/charts/common/expressions/palette/index.ts
@@ -6,9 +6,13 @@
  * Side Public License, v 1.
  */
 
-export * from './ci_stats_reporter';
-export type { Config } from './ci_stats_config';
-export * from './ship_ci_stats_cli';
-export { getTimeReporter } from './report_time';
-export * from './ci_stats_test_group_types';
-export * from './ci_stats_client';
+export { palette } from './palette';
+
+export { systemPalette } from './system_palette';
+export type { SystemPaletteArguments } from './system_palette';
+
+export type {
+  CustomPaletteArguments,
+  CustomPaletteState,
+  PaletteExpressionFunctionDefinition,
+} from './types';
diff --git a/src/plugins/charts/common/palette.test.ts b/src/plugins/charts/common/expressions/palette/palette.test.ts
similarity index 52%
rename from src/plugins/charts/common/palette.test.ts
rename to src/plugins/charts/common/expressions/palette/palette.test.ts
index e2b0680a08ced..771e26ab4aa48 100644
--- a/src/plugins/charts/common/palette.test.ts
+++ b/src/plugins/charts/common/expressions/palette/palette.test.ts
@@ -6,14 +6,9 @@
  * Side Public License, v 1.
  */
 import type { PaletteOutput } from '@kbn/coloring';
-import {
-  palette,
-  defaultCustomColors,
-  systemPalette,
-  CustomPaletteState,
-  CustomPaletteArguments,
-} from './palette';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { palette, CustomPaletteState, CustomPaletteArguments } from '.';
+import { defaultCustomColors } from '../../constants';
 
 describe('palette', () => {
   const fn = functionWrapper(palette()) as (
@@ -21,70 +16,70 @@ describe('palette', () => {
     args?: Partial<CustomPaletteArguments>
   ) => PaletteOutput<CustomPaletteState>;
 
-  it('results a palette', () => {
-    const result = fn(null);
+  it('results a palette', async () => {
+    const result = await fn(null);
     expect(result).toHaveProperty('type', 'palette');
   });
 
   describe('args', () => {
     describe('color', () => {
-      it('sets colors', () => {
-        const result = fn(null, { color: ['red', 'green', 'blue'] });
+      it('sets colors', async () => {
+        const result = await fn(null, { color: ['red', 'green', 'blue'] });
         expect(result.params!.colors).toEqual(['red', 'green', 'blue']);
       });
 
-      it('defaults to pault_tor_14 colors', () => {
-        const result = fn(null);
+      it('defaults to pault_tor_14 colors', async () => {
+        const result = await fn(null);
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
     });
 
     describe('stop', () => {
-      it('sets stops', () => {
-        const result = fn(null, { color: ['red', 'green', 'blue'], stop: [1, 2, 3] });
+      it('sets stops', async () => {
+        const result = await fn(null, { color: ['red', 'green', 'blue'], stop: [1, 2, 3] });
         expect(result.params!.stops).toEqual([1, 2, 3]);
       });
 
-      it('defaults to pault_tor_14 colors', () => {
-        const result = fn(null);
+      it('defaults to pault_tor_14 colors', async () => {
+        const result = await fn(null);
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
     });
 
     describe('gradient', () => {
-      it('sets gradient', () => {
-        let result = fn(null, { gradient: true });
+      it('sets gradient', async () => {
+        let result = await fn(null, { gradient: true });
         expect(result.params).toHaveProperty('gradient', true);
 
-        result = fn(null, { gradient: false });
+        result = await fn(null, { gradient: false });
         expect(result.params).toHaveProperty('gradient', false);
       });
 
-      it('defaults to false', () => {
-        const result = fn(null);
+      it('defaults to false', async () => {
+        const result = await fn(null);
         expect(result.params).toHaveProperty('gradient', false);
       });
     });
 
     describe('reverse', () => {
-      it('reverses order of the colors', () => {
-        const result = fn(null, { reverse: true });
+      it('reverses order of the colors', async () => {
+        const result = await fn(null, { reverse: true });
         expect(result.params!.colors).toEqual(defaultCustomColors.reverse());
       });
 
-      it('keeps the original order of the colors', () => {
-        const result = fn(null, { reverse: false });
+      it('keeps the original order of the colors', async () => {
+        const result = await fn(null, { reverse: false });
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
 
-      it(`defaults to 'false`, () => {
-        const result = fn(null);
+      it(`defaults to 'false`, async () => {
+        const result = await fn(null);
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
 
-      it('keeps the stops order pristine when set', () => {
+      it('keeps the stops order pristine when set', async () => {
         const stops = [1, 2, 3];
-        const result = fn(null, {
+        const result = await fn(null, {
           color: ['red', 'green', 'blue'],
           stop: [1, 2, 3],
           reverse: true,
@@ -94,20 +89,3 @@ describe('palette', () => {
     });
   });
 });
-
-describe('system_palette', () => {
-  const fn = functionWrapper(systemPalette()) as (
-    context: null,
-    args: { name: string; params?: unknown }
-  ) => PaletteOutput<unknown>;
-
-  it('results a palette', () => {
-    const result = fn(null, { name: 'test' });
-    expect(result).toHaveProperty('type', 'palette');
-  });
-
-  it('returns the name', () => {
-    const result = fn(null, { name: 'test' });
-    expect(result).toHaveProperty('name', 'test');
-  });
-});
diff --git a/src/plugins/charts/common/expressions/palette/palette.ts b/src/plugins/charts/common/expressions/palette/palette.ts
new file mode 100644
index 0000000000000..1875f89020963
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/palette.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { i18n } from '@kbn/i18n';
+import type { PaletteExpressionFunctionDefinition } from './types';
+
+export function palette(): PaletteExpressionFunctionDefinition {
+  return {
+    name: 'palette',
+    aliases: [],
+    type: 'palette',
+    inputTypes: ['null'],
+    help: i18n.translate('charts.functions.paletteHelpText', {
+      defaultMessage: 'Creates a color palette.',
+    }),
+    args: {
+      color: {
+        aliases: ['_'],
+        multi: true,
+        types: ['string'],
+        help: i18n.translate('charts.functions.palette.args.colorHelpText', {
+          defaultMessage:
+            'The palette colors. Accepts an {html} color name, {hex}, {hsl}, {hsla}, {rgb}, or {rgba}.',
+          values: {
+            html: 'HTML',
+            rgb: 'RGB',
+            rgba: 'RGBA',
+            hex: 'HEX',
+            hsl: 'HSL',
+            hsla: 'HSLA',
+          },
+        }),
+        required: false,
+      },
+      stop: {
+        multi: true,
+        types: ['number'],
+        help: i18n.translate('charts.functions.palette.args.stopHelpText', {
+          defaultMessage:
+            'The palette color stops. When used, it must be associated with each color.',
+        }),
+        required: false,
+      },
+      continuity: {
+        types: ['string'],
+        options: ['above', 'below', 'all', 'none'],
+        default: 'above',
+        help: '',
+      },
+      rangeMin: {
+        types: ['number'],
+        help: '',
+      },
+      rangeMax: {
+        types: ['number'],
+        help: '',
+      },
+      range: {
+        types: ['string'],
+        options: ['number', 'percent'],
+        default: 'percent',
+        help: '',
+      },
+      gradient: {
+        types: ['boolean'],
+        default: false,
+        help: i18n.translate('charts.functions.palette.args.gradientHelpText', {
+          defaultMessage: 'Make a gradient palette where supported?',
+        }),
+        options: [true, false],
+      },
+      reverse: {
+        types: ['boolean'],
+        default: false,
+        help: i18n.translate('charts.functions.palette.args.reverseHelpText', {
+          defaultMessage: 'Reverse the palette?',
+        }),
+        options: [true, false],
+      },
+    },
+    async fn(...args) {
+      /** Build optimization: prevent adding extra code into initial bundle **/
+      const { paletteExpressionFn } = await import('./palette_fn');
+      return paletteExpressionFn(...args);
+    },
+  };
+}
diff --git a/src/plugins/charts/common/expressions/palette/palette_fn.ts b/src/plugins/charts/common/expressions/palette/palette_fn.ts
new file mode 100644
index 0000000000000..1702c95ab76e7
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/palette_fn.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { last } from 'lodash';
+import { checkIsMaxContinuity, checkIsMinContinuity } from '@kbn/coloring';
+import type { PaletteExpressionFunctionDefinition } from './types';
+import { defaultCustomColors } from '../../constants';
+
+export const paletteExpressionFn: PaletteExpressionFunctionDefinition['fn'] = async (
+  input,
+  args
+) => {
+  const { color, continuity, reverse, gradient, stop, range, rangeMin, rangeMax } = args;
+  const colors = ([] as string[]).concat(color || defaultCustomColors);
+  const stops = ([] as number[]).concat(stop || []);
+  if (stops.length > 0 && colors.length !== stops.length) {
+    throw Error('When stop is used, each color must have an associated stop value.');
+  }
+
+  // If the user has defined stops, choose rangeMin/Max, provided by user or range,
+  // taken from first/last element of ranges or default range (0 or 100).
+  const calculateRange = (
+    userRange: number | undefined,
+    stopsRange: number | undefined,
+    defaultRange: number
+  ) => userRange ?? stopsRange ?? defaultRange;
+
+  const rangeMinDefault = 0;
+  const rangeMaxDefault = 100;
+
+  return {
+    type: 'palette',
+    name: 'custom',
+    params: {
+      colors: reverse ? colors.reverse() : colors,
+      stops,
+      range: range ?? 'percent',
+      gradient,
+      continuity,
+      rangeMin: checkIsMinContinuity(continuity)
+        ? Number.NEGATIVE_INFINITY
+        : calculateRange(rangeMin, stops[0], rangeMinDefault),
+      rangeMax: checkIsMaxContinuity(continuity)
+        ? Number.POSITIVE_INFINITY
+        : calculateRange(rangeMax, last(stops), rangeMaxDefault),
+    },
+  };
+};
diff --git a/src/plugins/charts/common/expressions/palette/system_palette.test.ts b/src/plugins/charts/common/expressions/palette/system_palette.test.ts
new file mode 100644
index 0000000000000..82c55f99723ea
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/system_palette.test.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { PaletteOutput } from '@kbn/coloring';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { systemPalette } from './system_palette';
+
+describe('system_palette', () => {
+  const fn = functionWrapper(systemPalette()) as (
+    context: null,
+    args: { name: string; params?: unknown }
+  ) => PaletteOutput<unknown>;
+
+  it('results a palette', () => {
+    const result = fn(null, { name: 'test' });
+    expect(result).toHaveProperty('type', 'palette');
+  });
+
+  it('returns the name', () => {
+    const result = fn(null, { name: 'test' });
+    expect(result).toHaveProperty('name', 'test');
+  });
+});
diff --git a/src/plugins/charts/common/expressions/palette/system_palette.ts b/src/plugins/charts/common/expressions/palette/system_palette.ts
new file mode 100644
index 0000000000000..e4bfed538570e
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/system_palette.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { i18n } from '@kbn/i18n';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import type { PaletteOutput } from './types';
+import { paletteIds } from '../../constants';
+
+export interface SystemPaletteArguments {
+  name: string;
+}
+
+export function systemPalette(): ExpressionFunctionDefinition<
+  'system_palette',
+  null,
+  SystemPaletteArguments,
+  PaletteOutput
+> {
+  return {
+    name: 'system_palette',
+    aliases: [],
+    type: 'palette',
+    inputTypes: ['null'],
+    help: i18n.translate('charts.functions.systemPaletteHelpText', {
+      defaultMessage: 'Creates a dynamic color palette.',
+    }),
+    args: {
+      name: {
+        types: ['string'],
+        help: i18n.translate('charts.functions.systemPalette.args.nameHelpText', {
+          defaultMessage: 'Name of the palette in the palette list',
+        }),
+        options: paletteIds,
+      },
+    },
+    fn: (input, args) => {
+      return {
+        type: 'palette',
+        name: args.name,
+      };
+    },
+  };
+}
diff --git a/src/plugins/charts/common/expressions/palette/types.ts b/src/plugins/charts/common/expressions/palette/types.ts
new file mode 100644
index 0000000000000..12fef842674f1
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/types.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { PaletteContinuity } from '@kbn/coloring';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+
+export interface PaletteOutput<T = { [key: string]: unknown }> {
+  type: 'palette' | 'system_palette';
+  name: string;
+  params?: T;
+}
+
+export interface CustomPaletteArguments {
+  color?: string[];
+  gradient: boolean;
+  reverse?: boolean;
+  stop?: number[];
+  range?: 'number' | 'percent';
+  rangeMin?: number;
+  rangeMax?: number;
+  continuity?: PaletteContinuity;
+}
+
+export interface CustomPaletteState {
+  colors: string[];
+  gradient: boolean;
+  stops: number[];
+  range: 'number' | 'percent';
+  rangeMin: number;
+  rangeMax: number;
+  continuity?: PaletteContinuity;
+}
+
+export type PaletteExpressionFunctionDefinition = ExpressionFunctionDefinition<
+  'palette',
+  null,
+  CustomPaletteArguments,
+  Promise<PaletteOutput<CustomPaletteState>>
+>;
diff --git a/src/plugins/charts/common/index.ts b/src/plugins/charts/common/index.ts
index 5ad9eb264e78b..74389ce43990f 100644
--- a/src/plugins/charts/common/index.ts
+++ b/src/plugins/charts/common/index.ts
@@ -9,11 +9,14 @@
 export const COLOR_MAPPING_SETTING = 'visualization:colorMapping';
 export const LEGACY_TIME_AXIS = 'visualization:useLegacyTimeAxis';
 
-export type { CustomPaletteArguments, CustomPaletteState, SystemPaletteArguments } from './palette';
+export type {
+  CustomPaletteArguments,
+  CustomPaletteState,
+  SystemPaletteArguments,
+} from './expressions/palette';
+export { palette, systemPalette } from './expressions/palette';
 
-export { defaultCustomColors, palette, systemPalette } from './palette';
-
-export { paletteIds } from './constants';
+export { paletteIds, defaultCustomColors } from './constants';
 export type { ColorSchema, RawColorSchema, ColorMap } from './static';
 export {
   ColorSchemas,
@@ -29,11 +32,3 @@ export {
 } from './static';
 
 export type { ColorSchemaParams, Labels, Style } from './types';
-
-/** @deprecated **/
-/** Please import directly from @kbn/coloring **/
-export { checkIsMinContinuity, checkIsMaxContinuity } from '@kbn/coloring';
-
-/** @deprecated **/
-/** Please import directly from @kbn/coloring **/
-export type { PaletteOutput, PaletteContinuity } from '@kbn/coloring';
diff --git a/src/plugins/charts/common/palette.ts b/src/plugins/charts/common/palette.ts
deleted file mode 100644
index 508fc8f11a70e..0000000000000
--- a/src/plugins/charts/common/palette.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import type { PaletteContinuity } from '@kbn/coloring';
-import { i18n } from '@kbn/i18n';
-import { checkIsMaxContinuity, checkIsMinContinuity } from '@kbn/coloring';
-import { last } from 'lodash';
-import { paletteIds } from './constants';
-
-export interface CustomPaletteArguments {
-  color?: string[];
-  gradient: boolean;
-  reverse?: boolean;
-  stop?: number[];
-  range?: 'number' | 'percent';
-  rangeMin?: number;
-  rangeMax?: number;
-  continuity?: PaletteContinuity;
-}
-
-export interface CustomPaletteState {
-  colors: string[];
-  gradient: boolean;
-  stops: number[];
-  range: 'number' | 'percent';
-  rangeMin: number;
-  rangeMax: number;
-  continuity?: PaletteContinuity;
-}
-
-export interface SystemPaletteArguments {
-  name: string;
-}
-
-export interface PaletteOutput<T = { [key: string]: unknown }> {
-  type: 'palette' | 'system_palette';
-  name: string;
-  params?: T;
-}
-
-export const defaultCustomColors = [
-  // This set of defaults originated in Canvas, which, at present, is the primary
-  // consumer of this function.  Changing this default requires a change in Canvas
-  // logic, which would likely be a breaking change in 7.x.
-  '#882E72',
-  '#B178A6',
-  '#D6C1DE',
-  '#1965B0',
-  '#5289C7',
-  '#7BAFDE',
-  '#4EB265',
-  '#90C987',
-  '#CAE0AB',
-  '#F7EE55',
-  '#F6C141',
-  '#F1932D',
-  '#E8601C',
-  '#DC050C',
-];
-
-export function palette(): ExpressionFunctionDefinition<
-  'palette',
-  null,
-  CustomPaletteArguments,
-  PaletteOutput<CustomPaletteState>
-> {
-  return {
-    name: 'palette',
-    aliases: [],
-    type: 'palette',
-    inputTypes: ['null'],
-    help: i18n.translate('charts.functions.paletteHelpText', {
-      defaultMessage: 'Creates a color palette.',
-    }),
-    args: {
-      color: {
-        aliases: ['_'],
-        multi: true,
-        types: ['string'],
-        help: i18n.translate('charts.functions.palette.args.colorHelpText', {
-          defaultMessage:
-            'The palette colors. Accepts an {html} color name, {hex}, {hsl}, {hsla}, {rgb}, or {rgba}.',
-          values: {
-            html: 'HTML',
-            rgb: 'RGB',
-            rgba: 'RGBA',
-            hex: 'HEX',
-            hsl: 'HSL',
-            hsla: 'HSLA',
-          },
-        }),
-        required: false,
-      },
-      stop: {
-        multi: true,
-        types: ['number'],
-        help: i18n.translate('charts.functions.palette.args.stopHelpText', {
-          defaultMessage:
-            'The palette color stops. When used, it must be associated with each color.',
-        }),
-        required: false,
-      },
-      continuity: {
-        types: ['string'],
-        options: ['above', 'below', 'all', 'none'],
-        default: 'above',
-        help: '',
-      },
-      rangeMin: {
-        types: ['number'],
-        help: '',
-      },
-      rangeMax: {
-        types: ['number'],
-        help: '',
-      },
-      range: {
-        types: ['string'],
-        options: ['number', 'percent'],
-        default: 'percent',
-        help: '',
-      },
-      gradient: {
-        types: ['boolean'],
-        default: false,
-        help: i18n.translate('charts.functions.palette.args.gradientHelpText', {
-          defaultMessage: 'Make a gradient palette where supported?',
-        }),
-        options: [true, false],
-      },
-      reverse: {
-        types: ['boolean'],
-        default: false,
-        help: i18n.translate('charts.functions.palette.args.reverseHelpText', {
-          defaultMessage: 'Reverse the palette?',
-        }),
-        options: [true, false],
-      },
-    },
-    fn: (input, args) => {
-      const { color, continuity, reverse, gradient, stop, range, rangeMin, rangeMax } = args;
-      const colors = ([] as string[]).concat(color || defaultCustomColors);
-      const stops = ([] as number[]).concat(stop || []);
-      if (stops.length > 0 && colors.length !== stops.length) {
-        throw Error('When stop is used, each color must have an associated stop value.');
-      }
-
-      // If the user has defined stops, choose rangeMin/Max, provided by user or range,
-      // taken from first/last element of ranges or default range (0 or 100).
-      const calculateRange = (
-        userRange: number | undefined,
-        stopsRange: number | undefined,
-        defaultRange: number
-      ) => userRange ?? stopsRange ?? defaultRange;
-
-      const rangeMinDefault = 0;
-      const rangeMaxDefault = 100;
-
-      return {
-        type: 'palette',
-        name: 'custom',
-        params: {
-          colors: reverse ? colors.reverse() : colors,
-          stops,
-          range: range ?? 'percent',
-          gradient,
-          continuity,
-          rangeMin: checkIsMinContinuity(continuity)
-            ? Number.NEGATIVE_INFINITY
-            : calculateRange(rangeMin, stops[0], rangeMinDefault),
-          rangeMax: checkIsMaxContinuity(continuity)
-            ? Number.POSITIVE_INFINITY
-            : calculateRange(rangeMax, last(stops), rangeMaxDefault),
-        },
-      };
-    },
-  };
-}
-
-export function systemPalette(): ExpressionFunctionDefinition<
-  'system_palette',
-  null,
-  SystemPaletteArguments,
-  PaletteOutput
-> {
-  return {
-    name: 'system_palette',
-    aliases: [],
-    type: 'palette',
-    inputTypes: ['null'],
-    help: i18n.translate('charts.functions.systemPaletteHelpText', {
-      defaultMessage: 'Creates a dynamic color palette.',
-    }),
-    args: {
-      name: {
-        types: ['string'],
-        help: i18n.translate('charts.functions.systemPalette.args.nameHelpText', {
-          defaultMessage: 'Name of the palette in the palette list',
-        }),
-        options: paletteIds,
-      },
-    },
-    fn: (input, args) => {
-      return {
-        type: 'palette',
-        name: args.name,
-      };
-    },
-  };
-}
diff --git a/src/plugins/charts/public/index.ts b/src/plugins/charts/public/index.ts
index 666bd1cc9ad4f..d6cae90d50057 100644
--- a/src/plugins/charts/public/index.ts
+++ b/src/plugins/charts/public/index.ts
@@ -42,7 +42,3 @@ export {
   LabelRotation,
   defaultCountLabel,
 } from '../common';
-
-/** @deprecated **/
-/** Please import directly from @kbn/coloring **/
-export type { SeriesLayer, PaletteRegistry, PaletteOutput, PaletteDefinition } from '@kbn/coloring';
diff --git a/src/plugins/charts/public/plugin.ts b/src/plugins/charts/public/plugin.ts
index 7802cef3b4934..2313e452b6d06 100644
--- a/src/plugins/charts/public/plugin.ts
+++ b/src/plugins/charts/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
-import { ExpressionsSetup } from '../../expressions/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { palette, systemPalette } from '../common';
 
 import { ThemeService, LegacyColorsService } from './services';
diff --git a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts
index 6bccc456edbb0..e79db95615bb2 100644
--- a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts
+++ b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { parseSyncOptions } from './active_cursor_utils';
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
 describe('active_cursor_utils', () => {
   describe('parseSyncOptions', () => {
diff --git a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts
index 37eeb6bf2d820..bd0bc16d7c977 100644
--- a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts
+++ b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts
@@ -7,7 +7,7 @@
  */
 import { uniq } from 'lodash';
 
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { ActiveCursorSyncOption, DateHistogramSyncOption } from './types';
 import type { ActiveCursorPayload } from './types';
 
diff --git a/src/plugins/charts/public/services/active_cursor/types.ts b/src/plugins/charts/public/services/active_cursor/types.ts
index 0b0180a622efb..0e8bff9af9175 100644
--- a/src/plugins/charts/public/services/active_cursor/types.ts
+++ b/src/plugins/charts/public/services/active_cursor/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PointerEvent } from '@elastic/charts';
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
 /** @public **/
 export type ActiveCursorSyncOption = DateHistogramSyncOption | DatatablesSyncOption;
diff --git a/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts b/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts
index 04d9297ed1d8c..fada0ffa459c7 100644
--- a/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts
+++ b/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts
@@ -5,78 +5,64 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+
+import { TestScheduler } from 'rxjs/testing';
 import { renderHook } from '@testing-library/react-hooks';
+import type { Chart, PointerEvent } from '@elastic/charts';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { RefObject } from 'react';
 
-import { ActiveCursor } from './active_cursor';
+import type { ActiveCursor } from './active_cursor';
 import { useActiveCursor } from './use_active_cursor';
 
 import type { ActiveCursorSyncOption, ActiveCursorPayload } from './types';
-import type { Chart, PointerEvent } from '@elastic/charts';
-import type { Datatable } from '../../../../expressions/public';
+
+/** @internal **/
+type DispatchExternalPointerEventFn = (pointerEvent: PointerEvent) => void;
 
 describe('useActiveCursor', () => {
-  let cursor: ActiveCursorPayload['cursor'];
-  let dispatchExternalPointerEvent: jest.Mock;
+  let testScheduler: TestScheduler;
 
-  const act = (
+  beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => expect(actual).toEqual(expected));
+  });
+
+  const act = async (
     syncOption: ActiveCursorSyncOption,
-    events: Array<Partial<ActiveCursorPayload>>,
-    eventsTimeout = 1
-  ) =>
-    new Promise(async (resolve, reject) => {
-      try {
-        const activeCursor = new ActiveCursor();
-        let allEventsExecuted = false;
-        activeCursor.setup();
-        dispatchExternalPointerEvent.mockImplementation((pointerEvent) => {
-          if (allEventsExecuted) {
-            resolve(pointerEvent);
-          }
-        });
+    events: Record<string, Partial<ActiveCursorPayload>>
+  ): Promise<{ dispatchExternalPointerEvent: DispatchExternalPointerEventFn }> =>
+    new Promise((res) => {
+      testScheduler.run(({ cold }) => {
+        const marble = `${Object.keys(events).join(`-`)} |`;
+        const activeCursor$ = cold(marble, events);
+        const dispatchExternalPointerEvent: DispatchExternalPointerEventFn = jest.fn();
+
         renderHook(() =>
           useActiveCursor(
-            activeCursor,
+            {
+              activeCursor$,
+            } as unknown as ActiveCursor,
             {
               current: {
-                dispatchExternalPointerEvent: dispatchExternalPointerEvent as (
-                  pointerEvent: PointerEvent
-                ) => void,
+                dispatchExternalPointerEvent,
               },
             } as RefObject<Chart>,
             { ...syncOption, debounce: syncOption.debounce ?? 1 }
           )
         );
 
-        for (const e of events) {
-          await new Promise((eventResolve) =>
-            setTimeout(() => {
-              if (e === events[events.length - 1]) {
-                allEventsExecuted = true;
-              }
-
-              activeCursor.activeCursor$!.next({
-                cursor,
-                ...e,
-              });
-              eventResolve(null);
-            }, eventsTimeout)
-          );
-        }
-      } catch (error) {
-        reject(error);
-      }
+        activeCursor$.subscribe({
+          complete: () => {
+            res({ dispatchExternalPointerEvent });
+          },
+        });
+      });
     });
 
-  beforeEach(() => {
-    cursor = {} as ActiveCursorPayload['cursor'];
-    dispatchExternalPointerEvent = jest.fn();
-  });
-
   test('should debounce events', async () => {
-    await act(
+    const { dispatchExternalPointerEvent } = await act(
       {
-        debounce: 50,
+        debounce: 5,
         datatables: [
           {
             columns: [
@@ -90,25 +76,30 @@ describe('useActiveCursor', () => {
           },
         ] as Datatable[],
       },
-      [
-        { accessors: ['foo_index:foo_field'] },
-        { accessors: ['foo_index:foo_field'] },
-        { accessors: ['foo_index:foo_field'] },
-        { accessors: ['foo_index:foo_field'] },
-      ]
+      {
+        a: { accessors: ['foo_index:foo_field'] },
+        b: { accessors: ['foo_index:foo_field'] },
+        c: { accessors: ['foo_index:foo_field'] },
+        d: { accessors: ['foo_index:foo_field'] },
+      }
     );
 
     expect(dispatchExternalPointerEvent).toHaveBeenCalledTimes(1);
   });
 
   test('should trigger cursor pointer update (chart type: time, event type: time)', async () => {
-    await act({ isDateHistogram: true }, [{ isDateHistogram: true }]);
+    const { dispatchExternalPointerEvent } = await act(
+      { isDateHistogram: true },
+      {
+        a: { isDateHistogram: true },
+      }
+    );
 
     expect(dispatchExternalPointerEvent).toHaveBeenCalledTimes(1);
   });
 
   test('should trigger cursor pointer update (chart type: datatable - time based, event type: time)', async () => {
-    await act(
+    const { dispatchExternalPointerEvent } = await act(
       {
         datatables: [
           {
@@ -126,14 +117,14 @@ describe('useActiveCursor', () => {
           },
         ] as unknown as Datatable[],
       },
-      [{ isDateHistogram: true }, { accessors: ['foo_index:foo_field'] }]
+      { a: { isDateHistogram: true }, b: { accessors: ['foo_index:foo_field'] } }
     );
 
     expect(dispatchExternalPointerEvent).toHaveBeenCalledTimes(2);
   });
 
   test('should not trigger cursor pointer update (chart type: datatable, event type: time)', async () => {
-    await act(
+    const { dispatchExternalPointerEvent } = await act(
       {
         datatables: [
           {
@@ -148,14 +139,14 @@ describe('useActiveCursor', () => {
           },
         ] as Datatable[],
       },
-      [{ isDateHistogram: true }, { accessors: ['foo_index:foo_field'] }]
+      { a: { isDateHistogram: true }, b: { accessors: ['foo_index:foo_field'] } }
     );
 
     expect(dispatchExternalPointerEvent).toHaveBeenCalledTimes(1);
   });
 
   test('should works with multi datatables (intersection)', async () => {
-    await act(
+    const { dispatchExternalPointerEvent } = await act(
       {
         datatables: [
           {
@@ -180,7 +171,7 @@ describe('useActiveCursor', () => {
           },
         ] as Datatable[],
       },
-      [{ accessors: ['foo_index:foo_field', 'ib:fb'] }]
+      { a: { accessors: ['foo_index:foo_field', 'ib:fb'] } }
     );
 
     expect(dispatchExternalPointerEvent).toHaveBeenCalledTimes(1);
diff --git a/src/plugins/charts/public/services/legacy_colors/colors.test.ts b/src/plugins/charts/public/services/legacy_colors/colors.test.ts
index d18331bd4c8c2..a1e8f55faf383 100644
--- a/src/plugins/charts/public/services/legacy_colors/colors.test.ts
+++ b/src/plugins/charts/public/services/legacy_colors/colors.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { COLOR_MAPPING_SETTING } from '../../../common';
 import { seedColors } from '../../static/colors';
 import { LegacyColorsService } from './colors';
diff --git a/src/plugins/charts/public/services/legacy_colors/colors.ts b/src/plugins/charts/public/services/legacy_colors/colors.ts
index b01347f461c5a..b2e04cce72f9f 100644
--- a/src/plugins/charts/public/services/legacy_colors/colors.ts
+++ b/src/plugins/charts/public/services/legacy_colors/colors.ts
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { MappedColors } from '../mapped_colors';
 import { seedColors } from '../../static/colors';
diff --git a/src/plugins/charts/public/services/legacy_colors/mock.ts b/src/plugins/charts/public/services/legacy_colors/mock.ts
index 0216025d53e80..f884ac23c19b8 100644
--- a/src/plugins/charts/public/services/legacy_colors/mock.ts
+++ b/src/plugins/charts/public/services/legacy_colors/mock.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { LegacyColorsService } from './colors';
-import { coreMock } from '../../../../../core/public/mocks';
 
 const colors = new LegacyColorsService();
 colors.init(coreMock.createSetup().uiSettings);
diff --git a/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts b/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts
index df52105a7f2e9..529a1c43c989d 100644
--- a/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts
+++ b/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import Color from 'color';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { COLOR_MAPPING_SETTING } from '../../../common';
 import { seedColors } from '../../static/colors';
 import { MappedColors } from './mapped_colors';
diff --git a/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts b/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts
index 71ad283132978..bbcb5b22f32df 100644
--- a/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts
+++ b/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import Color from 'color';
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { COLOR_MAPPING_SETTING } from '../../../common';
 import { createColorPalette } from '../../static/colors';
diff --git a/src/plugins/charts/public/services/palettes/palettes.test.tsx b/src/plugins/charts/public/services/palettes/palettes.test.tsx
index 0acda6990cf9c..a5aad8c1cb8bc 100644
--- a/src/plugins/charts/public/services/palettes/palettes.test.tsx
+++ b/src/plugins/charts/public/services/palettes/palettes.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteDefinition } from '@kbn/coloring';
-import { createColorPalette as createLegacyColorPalette } from '../../../../../../src/plugins/charts/public';
+import { createColorPalette as createLegacyColorPalette } from '../..';
 import { buildPalettes } from './palettes';
 import { colorsServiceMock } from '../legacy_colors/mock';
 import { euiPaletteColorBlind, euiPaletteColorBlindBehindText } from '@elastic/eui';
diff --git a/src/plugins/charts/public/services/palettes/palettes.tsx b/src/plugins/charts/public/services/palettes/palettes.tsx
index d6d8fd718cb55..e2ccb239f5a6c 100644
--- a/src/plugins/charts/public/services/palettes/palettes.tsx
+++ b/src/plugins/charts/public/services/palettes/palettes.tsx
@@ -23,10 +23,7 @@ import {
 } from '@elastic/eui';
 import type { ChartColorConfiguration, PaletteDefinition, SeriesLayer } from '@kbn/coloring';
 import { flatten, zip } from 'lodash';
-import {
-  ChartsPluginSetup,
-  createColorPalette as createLegacyColorPalette,
-} from '../../../../../../src/plugins/charts/public';
+import { ChartsPluginSetup, createColorPalette as createLegacyColorPalette } from '../..';
 import { lightenColor } from './lighten_color';
 import { LegacyColorsService } from '../legacy_colors';
 import { MappedColors } from '../mapped_colors';
diff --git a/src/plugins/charts/public/services/palettes/service.ts b/src/plugins/charts/public/services/palettes/service.ts
index d3c4a4ded3efa..0608c897f6306 100644
--- a/src/plugins/charts/public/services/palettes/service.ts
+++ b/src/plugins/charts/public/services/palettes/service.ts
@@ -7,8 +7,8 @@
  */
 
 import type { PaletteRegistry, PaletteDefinition } from '@kbn/coloring';
-import type { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
-import type { ChartsPluginSetup } from '../../../../../../src/plugins/charts/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ChartsPluginSetup } from '../..';
 import type { LegacyColorsService } from '../legacy_colors';
 
 export interface PaletteSetupPlugins {
diff --git a/src/plugins/charts/public/services/theme/theme.test.tsx b/src/plugins/charts/public/services/theme/theme.test.tsx
index 5154c1ce5ad63..9c9fca6f68b56 100644
--- a/src/plugins/charts/public/services/theme/theme.test.tsx
+++ b/src/plugins/charts/public/services/theme/theme.test.tsx
@@ -16,7 +16,7 @@ import { LIGHT_THEME, DARK_THEME } from '@elastic/charts';
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 
 import { ThemeService } from './theme';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const { uiSettings: setupMockUiSettings } = coreMock.createSetup();
 
diff --git a/src/plugins/charts/public/services/theme/theme.ts b/src/plugins/charts/public/services/theme/theme.ts
index 4397084d890ae..1e5053b473870 100644
--- a/src/plugins/charts/public/services/theme/theme.ts
+++ b/src/plugins/charts/public/services/theme/theme.ts
@@ -9,7 +9,7 @@
 import { useEffect, useRef, useState } from 'react';
 import { Observable, BehaviorSubject } from 'rxjs';
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { DARK_THEME, LIGHT_THEME, PartialTheme, Theme } from '@elastic/charts';
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 
diff --git a/src/plugins/charts/public/static/components/color_picker.scss b/src/plugins/charts/public/static/components/color_picker.scss
deleted file mode 100644
index 5def2b75a4c50..0000000000000
--- a/src/plugins/charts/public/static/components/color_picker.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-$visColorPickerWidth: $euiSizeL * 8; // 8 columns
-
-.visColorPicker__value {
-  width: $visColorPickerWidth;
-}
-
-.visColorPicker__colorBtn {
-  position: relative;
-
-  input[type='radio'] {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    opacity: 0;
-    transform: translate(-50%, -50%);
-  }
-}
-
-.visColorPicker__valueDot {
-  cursor: pointer;
-
-  &:hover {
-    transform: scale(1.4);
-  }
-
-  &-isSelected {
-    border: $euiSizeXS solid;
-    border-radius: 100%;
-  }
-}
diff --git a/src/plugins/charts/public/static/components/color_picker.tsx b/src/plugins/charts/public/static/components/color_picker.tsx
index 25c210b87a0e1..edd68ce6dbbba 100644
--- a/src/plugins/charts/public/static/components/color_picker.tsx
+++ b/src/plugins/charts/public/static/components/color_picker.tsx
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import classNames from 'classnames';
-import React, { BaseSyntheticEvent } from 'react';
-
+import React, { BaseSyntheticEvent, useMemo } from 'react';
+import { css } from '@emotion/react';
 import {
   EuiButtonEmpty,
   EuiFlexItem,
@@ -16,10 +15,10 @@ import {
   euiPaletteColorBlind,
   EuiScreenReaderOnly,
   EuiFlexGroup,
+  useEuiTheme,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { lightenColor } from '../../services/palettes/lighten_color';
-import './color_picker.scss';
 
 export const legacyColors: string[] = [
   '#3F6833',
@@ -80,7 +79,7 @@ export const legacyColors: string[] = [
   '#DEDAF7',
 ];
 
-interface ColorPickerProps {
+export interface ColorPickerProps {
   /**
    * Label that characterizes the color that is going to change
    */
@@ -116,6 +115,24 @@ interface ColorPickerProps {
 }
 const euiColors = euiPaletteColorBlind({ rotations: 4, order: 'group' });
 
+const visColorPickerColorBtnStyle = css`
+  position: relative;
+  input[type='radio'] {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    opacity: 0;
+    transform: translate(-50%, -50%);
+  }
+`;
+
+const visColorPickerValueDotStyle = css`
+  cursor: pointer;
+  &:hover {
+    transform: scale(1.4);
+  }
+`;
+
 export const ColorPicker = ({
   onChange,
   color: selectedColor,
@@ -127,6 +144,22 @@ export const ColorPicker = ({
   layerIndex,
 }: ColorPickerProps) => {
   const legendColors = useLegacyColors ? legacyColors : euiColors;
+  const { euiTheme } = useEuiTheme();
+
+  const visColorPickerValueStyle = useMemo(
+    () => css`
+      width: calc(${euiTheme.size.l} * 8);
+    `,
+    [euiTheme.size.l]
+  );
+
+  const visColorPickerValueDotSelectedStyle = useMemo(
+    () => css`
+      border: ${euiTheme.size.xs} solid;
+      border-radius: 100%;
+    `,
+    [euiTheme.size.xs]
+  );
 
   return (
     <div className="visColorPicker">
@@ -140,9 +173,18 @@ export const ColorPicker = ({
             />
           </legend>
         </EuiScreenReaderOnly>
-        <EuiFlexGroup wrap={true} gutterSize="none" className="visColorPicker__value">
+        <EuiFlexGroup
+          wrap={true}
+          gutterSize="none"
+          css={visColorPickerValueStyle}
+          className="visColorPicker__value"
+        >
           {legendColors.map((color) => (
-            <label key={color} className="visColorPicker__colorBtn">
+            <label
+              key={color}
+              css={visColorPickerColorBtnStyle}
+              className="visColorPicker__colorBtn"
+            >
               <input
                 type="radio"
                 onChange={(e) => onChange(color, e)}
@@ -155,9 +197,11 @@ export const ColorPicker = ({
                 type="dot"
                 size="l"
                 color={selectedColor}
-                className={classNames('visColorPicker__valueDot', {
-                  'visColorPicker__valueDot-isSelected': color === selectedColor,
-                })}
+                css={[
+                  visColorPickerValueDotStyle,
+                  color === selectedColor ? visColorPickerValueDotSelectedStyle : null,
+                ]}
+                className="visColorPicker__valueDot"
                 style={{ color }}
                 data-test-subj={`visColorPickerColor-${color}`}
               />
diff --git a/src/plugins/charts/public/static/components/common_chart_styles.scss b/src/plugins/charts/public/static/components/common_chart_styles.scss
deleted file mode 100644
index a6ced495795c8..0000000000000
--- a/src/plugins/charts/public/static/components/common_chart_styles.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.chart-icon__subdued {
-  fill: $euiTextSubduedColor;
-}
-
-.chart-icon__accent {
-  fill: $euiColorVis0;
-}
\ No newline at end of file
diff --git a/src/plugins/charts/public/static/components/common_chart_styles.ts b/src/plugins/charts/public/static/components/common_chart_styles.ts
new file mode 100644
index 0000000000000..3050b5f4a74ba
--- /dev/null
+++ b/src/plugins/charts/public/static/components/common_chart_styles.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { css } from '@emotion/react';
+import { useEuiTheme } from '@elastic/eui';
+import { euiThemeVars } from '@kbn/ui-theme';
+
+import { useMemo } from 'react';
+
+export const useCommonChartStyles = () => {
+  const { euiTheme } = useEuiTheme();
+
+  const subdued = useMemo(
+    () => css`
+      fill: ${euiTheme.colors.subdued};
+    `,
+    [euiTheme.colors.subdued]
+  );
+
+  const accent = css`
+    fill: ${euiThemeVars.euiColorVis0};
+  `;
+
+  return {
+    chartIcon: { subdued, accent },
+  };
+};
diff --git a/src/plugins/charts/public/static/components/empty_placeholder.scss b/src/plugins/charts/public/static/components/empty_placeholder.scss
deleted file mode 100644
index 3f98da9eecb6a..0000000000000
--- a/src/plugins/charts/public/static/components/empty_placeholder.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.chart__empty-placeholder {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
\ No newline at end of file
diff --git a/src/plugins/charts/public/static/components/empty_placeholder.tsx b/src/plugins/charts/public/static/components/empty_placeholder.tsx
index e4559a0890ff2..15235acfeb2a7 100644
--- a/src/plugins/charts/public/static/components/empty_placeholder.tsx
+++ b/src/plugins/charts/public/static/components/empty_placeholder.tsx
@@ -9,8 +9,23 @@
 import React from 'react';
 import { EuiIcon, EuiText, IconType, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import './empty_placeholder.scss';
-import classnames from 'classnames';
+import { css } from '@emotion/react';
+
+export interface EmptyPlaceholderProps {
+  icon: IconType;
+  iconColor?: string;
+  message?: JSX.Element;
+  dataTestSubj?: string;
+  className?: string;
+}
+
+const style = css`
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+`;
 
 export const EmptyPlaceholder = ({
   icon,
@@ -18,24 +33,17 @@ export const EmptyPlaceholder = ({
   message = <FormattedMessage id="charts.noDataLabel" defaultMessage="No results found" />,
   dataTestSubj = 'emptyPlaceholder',
   className,
-}: {
-  icon: IconType;
-  iconColor?: string;
-  message?: JSX.Element;
-  dataTestSubj?: string;
-  className?: string;
-}) => (
-  <>
-    <EuiText
-      data-test-subj={dataTestSubj}
-      className={classnames('chart__empty-placeholder', className)}
-      textAlign="center"
-      color="subdued"
-      size="xs"
-    >
-      <EuiIcon type={icon} color={iconColor} size="l" />
-      <EuiSpacer size="s" />
-      <p>{message}</p>
-    </EuiText>
-  </>
+}: EmptyPlaceholderProps) => (
+  <EuiText
+    data-test-subj={dataTestSubj}
+    css={style}
+    className={className}
+    textAlign="center"
+    color="subdued"
+    size="xs"
+  >
+    <EuiIcon type={icon} color={iconColor} size="l" />
+    <EuiSpacer size="s" />
+    <p>{message}</p>
+  </EuiText>
 );
diff --git a/src/plugins/charts/public/static/components/index.ts b/src/plugins/charts/public/static/components/index.ts
index ece0b085eff9c..ea621c68e450a 100644
--- a/src/plugins/charts/public/static/components/index.ts
+++ b/src/plugins/charts/public/static/components/index.ts
@@ -6,9 +6,45 @@
  * Side Public License, v 1.
  */
 
-export { LegendToggle } from './legend_toggle';
-export { ColorPicker } from './color_picker';
+import React from 'react';
+import { withSuspense } from '@kbn/shared-ux-utility';
+
 export { CurrentTime } from './current_time';
 export { EmptyPlaceholder } from './empty_placeholder';
-import './common_chart_styles.scss';
+
+export { useCommonChartStyles } from './common_chart_styles';
 export * from './endzones';
+
+/**
+ * The Lazily-loaded `ColorPicker` component.  Consumers should use `React.Suspense` or
+ * the withSuspense` HOC to load this component.
+ */
+export const ColorPickerLazy = React.lazy(() =>
+  import('./color_picker').then(({ ColorPicker }) => ({
+    default: ColorPicker,
+  }))
+);
+
+/**
+ * A `ColorPicker` component that is wrapped by the `withSuspense` HOC. This component can
+ * be used directly by consumers and will load the `ColorPickerLazy` component lazily with
+ * a predefined fallback and error boundary.
+ */
+export const ColorPicker = withSuspense(ColorPickerLazy);
+
+/**
+ * The Lazily-loaded `LegendToggle` component.  Consumers should use `React.Suspense` or
+ * the withSuspense` HOC to load this component.
+ */
+export const LegendToggleLazy = React.lazy(() =>
+  import('./legend_toggle').then(({ LegendToggle }) => ({
+    default: LegendToggle,
+  }))
+);
+
+/**
+ * A `LegendToggle` component that is wrapped by the `withSuspense` HOC. This component can
+ * be used directly by consumers and will load the `LegendToggleLazy` component lazily with
+ * a predefined fallback and error boundary.
+ */
+export const LegendToggle = withSuspense(LegendToggleLazy);
diff --git a/src/plugins/charts/public/static/components/legend_toggle.scss b/src/plugins/charts/public/static/components/legend_toggle.scss
deleted file mode 100644
index 3df799d4bcda4..0000000000000
--- a/src/plugins/charts/public/static/components/legend_toggle.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.echLegend__toggle {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-  margin: $euiSizeXS;
-
-  &--isOpen {
-    background-color: $euiColorLightestShade;
-  }
-
-  &--position-left,
-  &--position-bottom {
-    left: auto;
-    bottom: auto;
-    right: 0;
-    top: 0;
-  }
-}
diff --git a/src/plugins/charts/public/static/components/legend_toggle.tsx b/src/plugins/charts/public/static/components/legend_toggle.tsx
index 8bb4f47838de5..0630fef080323 100644
--- a/src/plugins/charts/public/static/components/legend_toggle.tsx
+++ b/src/plugins/charts/public/static/components/legend_toggle.tsx
@@ -7,15 +7,12 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import classNames from 'classnames';
-
 import { i18n } from '@kbn/i18n';
-import { htmlIdGenerator, EuiButtonIcon } from '@elastic/eui';
+import { htmlIdGenerator, EuiButtonIcon, useEuiTheme } from '@elastic/eui';
 import { Position } from '@elastic/charts';
+import { css } from '@emotion/react';
 
-import './legend_toggle.scss';
-
-interface LegendToggleProps {
+export interface LegendToggleProps {
   onClick: () => void;
   showLegend: boolean;
   legendPosition: Position;
@@ -23,6 +20,35 @@ interface LegendToggleProps {
 
 const LegendToggleComponent = ({ onClick, showLegend, legendPosition }: LegendToggleProps) => {
   const legendId = useMemo(() => htmlIdGenerator()('legend'), []);
+  const { euiTheme } = useEuiTheme();
+
+  const baseStyles = useMemo(
+    () => css`
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      z-index: 1;
+      margin: ${euiTheme.size.xs};
+    `,
+    [euiTheme.size.xs]
+  );
+
+  const isOpenStyle = useMemo(
+    () => css`
+      background-color: ${euiTheme.colors.lightestShade};
+    `,
+    [euiTheme.colors.lightestShade]
+  );
+
+  const positionStyle = useMemo(
+    () => css`
+      left: auto;
+      bottom: auto;
+      right: 0;
+      top: 0;
+    `,
+    []
+  );
 
   return (
     <EuiButtonIcon
@@ -30,9 +56,11 @@ const LegendToggleComponent = ({ onClick, showLegend, legendPosition }: LegendTo
       iconType="list"
       color="text"
       onClick={onClick}
-      className={classNames('echLegend__toggle', `echLegend__toggle--position-${legendPosition}`, {
-        'echLegend__toggle--isOpen': showLegend,
-      })}
+      css={[
+        baseStyles,
+        showLegend ? isOpenStyle : null,
+        ['left', 'bottom'].includes(legendPosition) ? positionStyle : null,
+      ]}
       aria-label={i18n.translate('charts.legend.toggleLegendButtonAriaLabel', {
         defaultMessage: 'Toggle legend',
       })}
diff --git a/src/plugins/charts/public/static/utils/transform_click_event.ts b/src/plugins/charts/public/static/utils/transform_click_event.ts
index ae255455b39b1..3d0cc2b47b215 100644
--- a/src/plugins/charts/public/static/utils/transform_click_event.ts
+++ b/src/plugins/charts/public/static/utils/transform_click_event.ts
@@ -15,8 +15,8 @@ import {
   Datum,
 } from '@elastic/charts';
 
-import { RangeSelectContext, ValueClickContext } from '../../../../embeddable/public';
-import { Datatable } from '../../../../expressions/public';
+import { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 
 export interface ClickTriggerEvent {
   name: 'filterBucket';
diff --git a/src/plugins/charts/server/plugin.ts b/src/plugins/charts/server/plugin.ts
index 86c90c73c38b0..b27e262e99aee 100644
--- a/src/plugins/charts/server/plugin.ts
+++ b/src/plugins/charts/server/plugin.ts
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { COLOR_MAPPING_SETTING, LEGACY_TIME_AXIS, palette, systemPalette } from '../common';
-import { ExpressionsServerSetup } from '../../expressions/server';
 
 interface SetupDependencies {
   expressions: ExpressionsServerSetup;
diff --git a/src/plugins/console/common/constants/api.ts b/src/plugins/console/common/constants/api.ts
index aa0fad1fe4424..3c5aa11519350 100644
--- a/src/plugins/console/common/constants/api.ts
+++ b/src/plugins/console/common/constants/api.ts
@@ -7,3 +7,4 @@
  */
 
 export const API_BASE_PATH = '/api/console';
+export const KIBANA_API_PREFIX = 'kbn:';
diff --git a/src/plugins/console/common/constants/index.ts b/src/plugins/console/common/constants/index.ts
index d8768af8fc8d8..756a79883cbdb 100644
--- a/src/plugins/console/common/constants/index.ts
+++ b/src/plugins/console/common/constants/index.ts
@@ -7,4 +7,4 @@
  */
 
 export { MAJOR_VERSION } from './plugin';
-export { API_BASE_PATH } from './api';
+export { API_BASE_PATH, KIBANA_API_PREFIX } from './api';
diff --git a/src/plugins/console/kibana.json b/src/plugins/console/kibana.json
index e2345514d76b9..0387b909704b6 100644
--- a/src/plugins/console/kibana.json
+++ b/src/plugins/console/kibana.json
@@ -11,5 +11,5 @@
   "configPath": ["console"],
   "requiredPlugins": ["devTools", "share"],
   "optionalPlugins": ["usageCollection", "home"],
-  "requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils", "home"]
+  "requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils"]
 }
diff --git a/src/plugins/console/public/application/components/console_menu.tsx b/src/plugins/console/public/application/components/console_menu.tsx
index 4769765715a65..159c0d600308f 100644
--- a/src/plugins/console/public/application/components/console_menu.tsx
+++ b/src/plugins/console/public/application/components/console_menu.tsx
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 
-import { NotificationsSetup } from 'src/core/public';
+import { NotificationsSetup } from '@kbn/core/public';
 
 import {
   EuiIcon,
diff --git a/src/plugins/console/public/application/components/help_panel.tsx b/src/plugins/console/public/application/components/help_panel.tsx
index 50238006f6ce2..ed57d3178df4b 100644
--- a/src/plugins/console/public/application/components/help_panel.tsx
+++ b/src/plugins/console/public/application/components/help_panel.tsx
@@ -140,6 +140,13 @@ export function HelpPanel(props: Props) {
                 defaultMessage="Select the currently selected or the top most term in auto-complete menu"
               />
             </dd>
+            <dt>Ctrl/Cmd + L</dt>
+            <dd>
+              <FormattedMessage
+                id="console.helpPage.keyboardCommands.goToLineNumberDescription"
+                defaultMessage="Go to line number"
+              />
+            </dd>
             <dt>Esc</dt>
             <dd>
               <FormattedMessage
diff --git a/src/plugins/console/public/application/components/settings_modal.tsx b/src/plugins/console/public/application/components/settings_modal.tsx
index eafc2dea3f873..71ab14001c2c2 100644
--- a/src/plugins/console/public/application/components/settings_modal.tsx
+++ b/src/plugins/console/public/application/components/settings_modal.tsx
@@ -27,6 +27,8 @@ import {
 } from '@elastic/eui';
 
 import { DevToolsSettings } from '../../services';
+import { unregisterCommands } from '../containers/editor/legacy/console_editor/keyboard_shortcuts';
+import type { SenseEditor } from '../models';
 
 export type AutocompleteOptions = 'fields' | 'indices' | 'templates';
 
@@ -62,6 +64,7 @@ interface Props {
   onClose: () => void;
   refreshAutocompleteSettings: (selectedSettings: DevToolsSettings['autocomplete']) => void;
   settings: DevToolsSettings;
+  editorInstance: SenseEditor | null;
 }
 
 export function DevToolsSettingsModal(props: Props) {
@@ -74,7 +77,10 @@ export function DevToolsSettingsModal(props: Props) {
   const [polling, setPolling] = useState(props.settings.polling);
   const [pollInterval, setPollInterval] = useState(props.settings.pollInterval);
   const [tripleQuotes, setTripleQuotes] = useState(props.settings.tripleQuotes);
-  const [historyDisabled, setHistoryDisabled] = useState(props.settings.historyDisabled);
+  const [isHistoryDisabled, setIsHistoryDisabled] = useState(props.settings.isHistoryDisabled);
+  const [isKeyboardShortcutsDisabled, setIsKeyboardShortcutsDisabled] = useState(
+    props.settings.isKeyboardShortcutsDisabled
+  );
 
   const autoCompleteCheckboxes = [
     {
@@ -134,7 +140,8 @@ export function DevToolsSettingsModal(props: Props) {
       polling,
       pollInterval,
       tripleQuotes,
-      historyDisabled,
+      isHistoryDisabled,
+      isKeyboardShortcutsDisabled,
     });
   }
 
@@ -145,6 +152,21 @@ export function DevToolsSettingsModal(props: Props) {
     setPollInterval(sanitizedValue);
   }, []);
 
+  const toggleKeyboardShortcuts = useCallback(
+    (isDisabled: boolean) => {
+      if (props.editorInstance) {
+        unregisterCommands(props.editorInstance);
+        setIsKeyboardShortcutsDisabled(isDisabled);
+      }
+    },
+    [props.editorInstance]
+  );
+
+  const toggleSavingToHistory = useCallback(
+    (isDisabled: boolean) => setIsHistoryDisabled(isDisabled),
+    []
+  );
+
   // It only makes sense to show polling options if the user needs to fetch any data.
   const pollingFields =
     fields || indices || templates ? (
@@ -160,7 +182,7 @@ export function DevToolsSettingsModal(props: Props) {
             <FormattedMessage
               id="console.settingsPage.refreshingDataDescription"
               defaultMessage="Console refreshes autocomplete suggestions by querying Elasticsearch.
-              Less frequent refresh is recommended to reduce bandwith costs."
+              Less frequent refresh is recommended to reduce bandwidth costs."
             />
           }
         >
@@ -267,15 +289,34 @@ export function DevToolsSettingsModal(props: Props) {
           }
         >
           <EuiSwitch
-            checked={historyDisabled}
-            id="historyDisabled"
+            checked={isHistoryDisabled}
             label={
               <FormattedMessage
                 defaultMessage="Disable saving requests to history"
                 id="console.settingsPage.savingRequestsToHistoryMessage"
               />
             }
-            onChange={(e) => setHistoryDisabled(e.target.checked)}
+            onChange={(e) => toggleSavingToHistory(e.target.checked)}
+          />
+        </EuiFormRow>
+
+        <EuiFormRow
+          label={
+            <FormattedMessage
+              id="console.settingsPage.keyboardShortcutsLabel"
+              defaultMessage="Keyboard shortcuts"
+            />
+          }
+        >
+          <EuiSwitch
+            checked={isKeyboardShortcutsDisabled}
+            label={
+              <FormattedMessage
+                defaultMessage="Disable keyboard shortcuts"
+                id="console.settingsPage.disableKeyboardShortcutsMessage"
+              />
+            }
+            onChange={(e) => toggleKeyboardShortcuts(e.target.checked)}
           />
         </EuiFormRow>
 
diff --git a/src/plugins/console/public/application/containers/editor/editor.tsx b/src/plugins/console/public/application/containers/editor/editor.tsx
index df017250664e4..93c11aa53c602 100644
--- a/src/plugins/console/public/application/containers/editor/editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/editor.tsx
@@ -11,19 +11,21 @@ import { debounce } from 'lodash';
 import { EuiProgress } from '@elastic/eui';
 
 import { EditorContentSpinner } from '../../components';
-import { Panel, PanelsContainer } from '../../containers';
+import { Panel, PanelsContainer } from '..';
 import { Editor as EditorUI, EditorOutput } from './legacy/console_editor';
 import { StorageKeys } from '../../../services';
 import { useEditorReadContext, useServicesContext, useRequestReadContext } from '../../contexts';
+import type { SenseEditor } from '../../models';
 
 const INITIAL_PANEL_WIDTH = 50;
 const PANEL_MIN_WIDTH = '100px';
 
 interface Props {
   loading: boolean;
+  setEditorInstance: (instance: SenseEditor) => void;
 }
 
-export const Editor = memo(({ loading }: Props) => {
+export const Editor = memo(({ loading, setEditorInstance }: Props) => {
   const {
     services: { storage },
   } = useServicesContext();
@@ -61,7 +63,10 @@ export const Editor = memo(({ loading }: Props) => {
           {loading ? (
             <EditorContentSpinner />
           ) : (
-            <EditorUI initialTextValue={currentTextObject.text} />
+            <EditorUI
+              initialTextValue={currentTextObject.text}
+              setEditorInstance={setEditorInstance}
+            />
           )}
         </Panel>
         <Panel
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
index d97e223a9599b..b410e240151d7 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-jest.mock('../../../../contexts/editor_context/editor_registry.ts', () => ({
+jest.mock('../../../../contexts/editor_context/editor_registry', () => ({
   instance: {
     setInputEditor: () => {},
     getInputEditor: () => ({
@@ -15,7 +15,7 @@ jest.mock('../../../../contexts/editor_context/editor_registry.ts', () => ({
     }),
   },
 }));
-jest.mock('../../../../components/editor_example.tsx', () => {});
+jest.mock('../../../../components/editor_example', () => {});
 jest.mock('../../../../../lib/mappings/mappings', () => ({
   retrieveAutoCompleteInfo: () => {},
   clearSubscriptions: () => {},
@@ -39,8 +39,8 @@ jest.mock('../../../../models/sense_editor', () => {
   };
 });
 
-jest.mock('../../../../hooks/use_send_current_request_to_es/send_request_to_es', () => ({
-  sendRequestToES: jest.fn(),
+jest.mock('../../../../hooks/use_send_current_request/send_request', () => ({
+  sendRequest: jest.fn(),
 }));
 jest.mock('../../../../../lib/autocomplete/get_endpoint_from_position', () => ({
   getEndpointFromPosition: jest.fn(),
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
index 37da5f93ff675..ba5f1e78d5f01 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
@@ -25,7 +25,7 @@ import {
 } from '../../../../contexts';
 
 // Mocked functions
-import { sendRequestToES } from '../../../../hooks/use_send_current_request_to_es/send_request_to_es';
+import { sendRequest } from '../../../../hooks/use_send_current_request/send_request';
 import { getEndpointFromPosition } from '../../../../../lib/autocomplete/get_endpoint_from_position';
 import type { DevToolsSettings } from '../../../../../services';
 import * as consoleMenuActions from '../console_menu_actions';
@@ -41,7 +41,7 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
         <ServicesContextProvider value={mockedAppContextValue}>
           <RequestContextProvider>
             <EditorContextProvider settings={{} as unknown as DevToolsSettings}>
-              <Editor initialTextValue="" />
+              <Editor initialTextValue="" setEditorInstance={() => {}} />
             </EditorContextProvider>
           </RequestContextProvider>
         </ServicesContextProvider>
@@ -58,15 +58,15 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
     sandbox.restore();
   });
 
-  it('calls send current request to ES', async () => {
+  it('calls send current request', async () => {
     (getEndpointFromPosition as jest.Mock).mockReturnValue({ patterns: [] });
-    (sendRequestToES as jest.Mock).mockRejectedValue({});
+    (sendRequest as jest.Mock).mockRejectedValue({});
     const editor = doMount();
     act(() => {
       editor.find('button[data-test-subj~="sendRequestButton"]').simulate('click');
     });
     await nextTick();
-    expect(sendRequestToES).toBeCalledTimes(1);
+    expect(sendRequest).toBeCalledTimes(1);
   });
 
   it('opens docs', () => {
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
index 9105d86f9e2ec..d01a40bdd44b3 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
@@ -19,14 +19,14 @@ import { debounce } from 'lodash';
 import { decompressFromEncodedURIComponent } from 'lz-string';
 import { parse } from 'query-string';
 import React, { CSSProperties, useCallback, useEffect, useRef, useState } from 'react';
-import { ace } from '../../../../../../../es_ui_shared/public';
+import { ace } from '@kbn/es-ui-shared-plugin/public';
 // @ts-ignore
 import { retrieveAutoCompleteInfo, clearSubscriptions } from '../../../../../lib/mappings/mappings';
 import { ConsoleMenu } from '../../../../components';
 import { useEditorReadContext, useServicesContext } from '../../../../contexts';
 import {
   useSaveCurrentTextObject,
-  useSendCurrentRequestToES,
+  useSendCurrentRequest,
   useSetInputEditor,
 } from '../../../../hooks';
 import * as senseEditor from '../../../../models/sense_editor';
@@ -34,11 +34,13 @@ import { autoIndent, getDocumentation } from '../console_menu_actions';
 import { subscribeResizeChecker } from '../subscribe_console_resize_checker';
 import { applyCurrentSettings } from './apply_editor_settings';
 import { registerCommands } from './keyboard_shortcuts';
+import type { SenseEditor } from '../../../../models/sense_editor';
 
 const { useUIAceKeyboardMode } = ace;
 
 export interface EditorProps {
   initialTextValue: string;
+  setEditorInstance: (instance: SenseEditor) => void;
 }
 
 interface QueryParams {
@@ -62,7 +64,7 @@ const DEFAULT_INPUT_VALUE = `GET _search
 
 const inputId = 'ConAppInputTextarea';
 
-function EditorUI({ initialTextValue }: EditorProps) {
+function EditorUI({ initialTextValue, setEditorInstance }: EditorProps) {
   const {
     services: { history, notifications, settings: settingsService, esHostService, http },
     docLinkVersion,
@@ -70,7 +72,7 @@ function EditorUI({ initialTextValue }: EditorProps) {
 
   const { settings } = useEditorReadContext();
   const setInputEditor = useSetInputEditor();
-  const sendCurrentRequestToES = useSendCurrentRequestToES();
+  const sendCurrentRequest = useSendCurrentRequest();
   const saveCurrentTextObject = useSaveCurrentTextObject();
 
   const editorRef = useRef<HTMLDivElement | null>(null);
@@ -225,12 +227,22 @@ function EditorUI({ initialTextValue }: EditorProps) {
   }, [settings]);
 
   useEffect(() => {
-    registerCommands({
-      senseEditor: editorInstanceRef.current!,
-      sendCurrentRequestToES,
-      openDocumentation,
-    });
-  }, [sendCurrentRequestToES, openDocumentation]);
+    const { isKeyboardShortcutsDisabled } = settings;
+    if (!isKeyboardShortcutsDisabled) {
+      registerCommands({
+        senseEditor: editorInstanceRef.current!,
+        sendCurrentRequest,
+        openDocumentation,
+      });
+    }
+  }, [openDocumentation, settings, sendCurrentRequest]);
+
+  useEffect(() => {
+    const { current: editor } = editorInstanceRef;
+    if (editor) {
+      setEditorInstance(editor);
+    }
+  }, [setEditorInstance]);
 
   return (
     <div style={abs} data-test-subj="console-application" className="conApp">
@@ -250,7 +262,7 @@ function EditorUI({ initialTextValue }: EditorProps) {
             >
               <EuiLink
                 color="success"
-                onClick={sendCurrentRequestToES}
+                onClick={sendCurrentRequest}
                 data-test-subj="sendRequestButton"
                 aria-label={i18n.translate('console.sendRequestButtonTooltip', {
                   defaultMessage: 'Click to send request',
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
index 9f9cdcad9115b..0817b6df5f7ef 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
@@ -5,10 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import { VectorTile } from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
 import { EuiScreenReaderOnly } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useRef } from 'react';
+import { convertMapboxVectorTileToJson } from './mapbox_vector_tile';
 
 // Ensure the modes we might switch to dynamically are available
 import 'brace/mode/text';
@@ -46,7 +48,7 @@ function modeForContentType(contentType?: string) {
   if (!contentType) {
     return 'ace/mode/text';
   }
-  if (isJSONContentType(contentType)) {
+  if (isJSONContentType(contentType) || isMapboxVectorTile(contentType)) {
     // Using hjson will allow us to use comments in editor output and solves the problem with error markers
     return 'ace/mode/hjson';
   } else if (contentType.indexOf('application/yaml') >= 0) {
@@ -86,15 +88,19 @@ function EditorOutputUI() {
         data
           .map((result) => {
             const { value, contentType } = result.response;
+
+            let editorOutput;
             if (readOnlySettings.tripleQuotes && isJSONContentType(contentType)) {
-              return safeExpandLiteralStrings(value as string);
+              editorOutput = safeExpandLiteralStrings(value as string);
+            } else if (isMapboxVectorTile(contentType)) {
+              const vectorTile = new VectorTile(new Protobuf(value as ArrayBuffer));
+              const vectorTileJson = convertMapboxVectorTileToJson(vectorTile);
+              editorOutput = safeExpandLiteralStrings(vectorTileJson as string);
+            } else {
+              editorOutput = value;
             }
-            if (isMapboxVectorTile(contentType)) {
-              return i18n.translate('console.outputCannotPreviewBinaryData', {
-                defaultMessage: 'Cannot preview binary data.',
-              });
-            }
-            return value;
+
+            return editorOutput;
           })
           .join('\n'),
         mode
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
index 4f09a49f3ac96..968d8c2dc5b39 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
@@ -11,15 +11,20 @@ import { SenseEditor } from '../../../../models/sense_editor';
 
 interface Actions {
   senseEditor: SenseEditor;
-  sendCurrentRequestToES: () => void;
+  sendCurrentRequest: () => void;
   openDocumentation: () => void;
 }
 
-export function registerCommands({
-  senseEditor,
-  sendCurrentRequestToES,
-  openDocumentation,
-}: Actions) {
+const COMMANDS = {
+  SEND_TO_ELASTICSEARCH: 'send to Elasticsearch',
+  OPEN_DOCUMENTATION: 'open documentation',
+  AUTO_INDENT_REQUEST: 'auto indent request',
+  MOVE_TO_PREVIOUS_REQUEST: 'move to previous request start or end',
+  MOVE_TO_NEXT_REQUEST: 'move to next request start or end',
+  GO_TO_LINE: 'gotoline',
+};
+
+export function registerCommands({ senseEditor, sendCurrentRequest, openDocumentation }: Actions) {
   const throttledAutoIndent = throttle(() => senseEditor.autoIndent(), 500, {
     leading: true,
     trailing: true,
@@ -28,12 +33,14 @@ export function registerCommands({
 
   coreEditor.registerKeyboardShortcut({
     keys: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
-    name: 'send to Elasticsearch',
-    fn: () => sendCurrentRequestToES(),
+    name: COMMANDS.SEND_TO_ELASTICSEARCH,
+    fn: () => {
+      sendCurrentRequest();
+    },
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'open documentation',
+    name: COMMANDS.OPEN_DOCUMENTATION,
     keys: { win: 'Ctrl-/', mac: 'Command-/' },
     fn: () => {
       openDocumentation();
@@ -41,7 +48,7 @@ export function registerCommands({
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'auto indent request',
+    name: COMMANDS.AUTO_INDENT_REQUEST,
     keys: { win: 'Ctrl-I', mac: 'Command-I' },
     fn: () => {
       throttledAutoIndent();
@@ -49,7 +56,7 @@ export function registerCommands({
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'move to previous request start or end',
+    name: COMMANDS.MOVE_TO_PREVIOUS_REQUEST,
     keys: { win: 'Ctrl-Up', mac: 'Command-Up' },
     fn: () => {
       senseEditor.moveToPreviousRequestEdge();
@@ -57,10 +64,28 @@ export function registerCommands({
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'move to next request start or end',
+    name: COMMANDS.MOVE_TO_NEXT_REQUEST,
     keys: { win: 'Ctrl-Down', mac: 'Command-Down' },
     fn: () => {
       senseEditor.moveToNextRequestEdge(false);
     },
   });
+
+  coreEditor.registerKeyboardShortcut({
+    name: COMMANDS.GO_TO_LINE,
+    keys: { win: 'Ctrl-L', mac: 'Command-L' },
+    fn: (editor) => {
+      const line = parseInt(prompt('Enter line number') ?? '', 10);
+      if (!isNaN(line)) {
+        editor.gotoLine(line);
+      }
+    },
+  });
+}
+
+export function unregisterCommands(senseEditor: SenseEditor) {
+  const coreEditor = senseEditor.getCoreEditor();
+  Object.values(COMMANDS).forEach((command) => {
+    coreEditor.unregisterKeyboardShortcut(command);
+  });
 }
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.test.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.test.ts
new file mode 100644
index 0000000000000..a71d86014b4a8
--- /dev/null
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.test.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+import { VectorTile } from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import { convertMapboxVectorTileToJson } from './convert_mapbox_vector_tile_to_json';
+
+const PATH_TO_PBF = resolve(__dirname, './response.pbf'); // Query sample "GET kibana_sample_data_logs/_mvt/geo.coordinates/8/23/63"
+
+const MOCK_JSON = JSON.parse(`
+{
+	"meta": [
+		{
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[0,4096],
+						[4096,4096],
+						[4096,0],
+						[0,0],
+						[0,4096]
+					]
+				]
+			},
+			"properties": {
+				"_shards.failed": 0,
+				"_shards.skipped": 0,
+				"_shards.successful": 1,
+				"_shards.total": 1,
+				"aggregations._count.avg": 1,
+				"aggregations._count.count": 1,
+				"aggregations._count.max": 1,
+				"aggregations._count.min": 1,
+				"aggregations._count.sum": 1,
+				"hits.total.relation": "eq",
+				"hits.total.value": 1,
+				"timed_out": false,
+				"took": 1
+			}
+		}
+	],
+	"hits": [
+		{
+			"geometry": {
+				"type": "Point",
+				"coordinates": [
+					3619,
+					334
+				]
+			},
+			"properties": {
+				"_id": "vFVzI4ABgP1gvXfjt0mI",
+				"_index": "kibana_sample_data_logs"
+			}
+		}
+	],
+	"aggs": [
+		{
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[3616,336],
+						[3632,336],
+						[3632,320],
+						[3616,320],
+						[3616,336]
+					]
+				]
+			},
+			"properties": {
+				"_key": "16/6114/16148",
+				"_count": 1
+			}
+		}
+	]
+}`);
+
+describe('Convert mapbox vector tile to json', () => {
+  let vectorTile: VectorTile;
+
+  beforeAll(() => {
+    const response = readFileSync(PATH_TO_PBF);
+    vectorTile = new VectorTile(new Protobuf(response));
+  });
+
+  it('function should convert vectorTile to string', () => {
+    expect(() => {
+      const json = convertMapboxVectorTileToJson(vectorTile);
+      JSON.parse(json);
+    }).not.toThrow();
+  });
+
+  it('response should have [meta, aggs, hits] layers', () => {
+    const vectorTileJson = JSON.parse(convertMapboxVectorTileToJson(vectorTile));
+    expect(vectorTileJson).toEqual(MOCK_JSON);
+  });
+});
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.ts
new file mode 100644
index 0000000000000..5a64dd98fe160
--- /dev/null
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { VectorTile, VectorTileLayer, VectorTileFeature } from '@mapbox/vector-tile';
+
+interface MapboxVectorTileJson {
+  [key: string]: {};
+}
+
+export function convertMapboxVectorTileToJson(response: VectorTile) {
+  const data = response.layers;
+  const output: MapboxVectorTileJson = {};
+
+  for (const property in data) {
+    if (data.hasOwnProperty(property)) {
+      const propertyObject: VectorTileLayer = data[property];
+      const featuresArray = [];
+
+      for (let index = 0; index < propertyObject.length; index++) {
+        const feature = propertyObject.feature(index);
+        const properties = feature.properties;
+        const geometry = feature.loadGeometry()[0];
+        const typeName = VectorTileFeature.types[feature.type];
+        let coordinates = [];
+
+        const coordinatesArray = [];
+        for (const value of geometry) {
+          coordinatesArray.push([value.x, value.y]);
+        }
+
+        switch (feature.type) {
+          case 1:
+            coordinates.push(geometry[0].x, geometry[0].y);
+            break;
+          case 2: {
+            coordinates = coordinatesArray;
+            break;
+          }
+          case 3: {
+            coordinates.push(coordinatesArray);
+            break;
+          }
+        }
+
+        featuresArray.push({
+          geometry: {
+            type: typeName,
+            coordinates,
+          },
+          properties,
+        });
+      }
+
+      output[property] = featuresArray;
+    }
+  }
+
+  const sortedOutput = Object.fromEntries(Object.entries(output).sort().reverse()); // "meta" layer is now in top of the result
+
+  return JSON.stringify(sortedOutput, null, '\t');
+}
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/index.ts
similarity index 80%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/index.ts
index df2431f1f6f43..2af786f9ada74 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { useSendCurrentRequestToES } from './use_send_current_request_to_es';
+export { convertMapboxVectorTileToJson } from './convert_mapbox_vector_tile_to_json';
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/response.pbf b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/response.pbf
new file mode 100644
index 0000000000000..f9ac7be4a1887
Binary files /dev/null and b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/response.pbf differ
diff --git a/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts b/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
index 226b3b28a61c4..8485f09de1ee1 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
+++ b/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ResizeChecker } from '../../../../../../kibana_utils/public';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 
 export function subscribeResizeChecker(el: HTMLElement, ...editors: any[]) {
   const checker = new ResizeChecker(el);
diff --git a/src/plugins/console/public/application/containers/main/main.tsx b/src/plugins/console/public/application/containers/main/main.tsx
index 30bf23d94a327..5895b919f9842 100644
--- a/src/plugins/console/public/application/containers/main/main.tsx
+++ b/src/plugins/console/public/application/containers/main/main.tsx
@@ -25,6 +25,7 @@ import { useServicesContext, useEditorReadContext, useRequestReadContext } from
 import { useDataInit } from '../../hooks';
 
 import { getTopNavConfig } from './get_top_nav';
+import type { SenseEditor } from '../../models/sense_editor';
 
 export function Main() {
   const {
@@ -46,6 +47,8 @@ export function Main() {
   const [showSettings, setShowSettings] = useState(false);
   const [showHelp, setShowHelp] = useState(false);
 
+  const [editorInstance, setEditorInstance] = useState<SenseEditor | null>(null);
+
   const renderConsoleHistory = () => {
     return editorsReady ? <ConsoleHistory close={() => setShowHistory(false)} /> : null;
   };
@@ -108,7 +111,7 @@ export function Main() {
         </EuiFlexItem>
         {showingHistory ? <EuiFlexItem grow={false}>{renderConsoleHistory()}</EuiFlexItem> : null}
         <EuiFlexItem>
-          <Editor loading={!done} />
+          <Editor loading={!done} setEditorInstance={setEditorInstance} />
         </EuiFlexItem>
       </EuiFlexGroup>
 
@@ -121,7 +124,9 @@ export function Main() {
         />
       ) : null}
 
-      {showSettings ? <Settings onClose={() => setShowSettings(false)} /> : null}
+      {showSettings ? (
+        <Settings onClose={() => setShowSettings(false)} editorInstance={editorInstance} />
+      ) : null}
 
       {showHelp ? <HelpPanel onClose={() => setShowHelp(false)} /> : null}
     </div>
diff --git a/src/plugins/console/public/application/containers/settings.tsx b/src/plugins/console/public/application/containers/settings.tsx
index f0ec64f4b13b2..b4cbea5833f32 100644
--- a/src/plugins/console/public/application/containers/settings.tsx
+++ b/src/plugins/console/public/application/containers/settings.tsx
@@ -8,13 +8,14 @@
 
 import React from 'react';
 
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 import { AutocompleteOptions, DevToolsSettingsModal } from '../components';
 
 // @ts-ignore
 import { retrieveAutoCompleteInfo } from '../../lib/mappings/mappings';
 import { useServicesContext, useEditorActionContext } from '../contexts';
 import { DevToolsSettings, Settings as SettingsService } from '../../services';
+import type { SenseEditor } from '../models';
 
 const getAutocompleteDiff = (
   newSettings: DevToolsSettings,
@@ -70,9 +71,10 @@ const fetchAutocompleteSettingsIfNeeded = (
 
 export interface Props {
   onClose: () => void;
+  editorInstance: SenseEditor | null;
 }
 
-export function Settings({ onClose }: Props) {
+export function Settings({ onClose, editorInstance }: Props) {
   const {
     services: { settings, http },
   } = useServicesContext();
@@ -102,6 +104,7 @@ export function Settings({ onClose }: Props) {
         refreshAutocompleteSettings(http, settings, selectedSettings)
       }
       settings={settings.toJSON()}
+      editorInstance={editorInstance}
     />
   );
 }
diff --git a/src/plugins/console/public/application/contexts/services_context.mock.ts b/src/plugins/console/public/application/contexts/services_context.mock.ts
index 028f92ab2aa68..5ede7f58d4bdc 100644
--- a/src/plugins/console/public/application/contexts/services_context.mock.ts
+++ b/src/plugins/console/public/application/contexts/services_context.mock.ts
@@ -11,7 +11,7 @@ import {
   httpServiceMock,
   themeServiceMock,
   docLinksServiceMock,
-} from '../../../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 
 import type { ObjectStorageClient } from '../../../common/types';
 import { HistoryMock } from '../../services/history.mock';
diff --git a/src/plugins/console/public/application/contexts/services_context.tsx b/src/plugins/console/public/application/contexts/services_context.tsx
index f8dc6fcab4d41..c60e41d8f14bb 100644
--- a/src/plugins/console/public/application/contexts/services_context.tsx
+++ b/src/plugins/console/public/application/contexts/services_context.tsx
@@ -8,7 +8,7 @@
 
 import React, { createContext, useContext, useEffect } from 'react';
 import { Observable } from 'rxjs';
-import type { NotificationsSetup, CoreTheme, DocLinksStart, HttpSetup } from 'kibana/public';
+import type { NotificationsSetup, CoreTheme, DocLinksStart, HttpSetup } from '@kbn/core/public';
 
 import { History, Settings, Storage } from '../../services';
 import { ObjectStorageClient } from '../../../common/types';
diff --git a/src/plugins/console/public/application/hooks/index.ts b/src/plugins/console/public/application/hooks/index.ts
index 1a9b4e5c472bf..1996330bef66b 100644
--- a/src/plugins/console/public/application/hooks/index.ts
+++ b/src/plugins/console/public/application/hooks/index.ts
@@ -8,6 +8,6 @@
 
 export { useSetInputEditor } from './use_set_input_editor';
 export { useRestoreRequestFromHistory } from './use_restore_request_from_history';
-export { useSendCurrentRequestToES } from './use_send_current_request_to_es';
+export { useSendCurrentRequest } from './use_send_current_request';
 export { useSaveCurrentTextObject } from './use_save_current_text_object';
 export { useDataInit } from './use_data_init';
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request/index.ts b/src/plugins/console/public/application/hooks/use_send_current_request/index.ts
new file mode 100644
index 0000000000000..33bdbef87f2ef
--- /dev/null
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { useSendCurrentRequest } from './use_send_current_request';
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.test.ts b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.test.ts
similarity index 51%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.test.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/send_request.test.ts
index a308cf150f804..60ced085c6891 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.test.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.test.ts
@@ -8,14 +8,14 @@
 
 import type { ContextValue } from '../../contexts';
 
-jest.mock('./send_request_to_es', () => ({ sendRequestToES: jest.fn(() => Promise.resolve()) }));
+jest.mock('./send_request', () => ({ sendRequest: jest.fn(() => Promise.resolve()) }));
 
-import { sendRequestToES } from './send_request_to_es';
+import { sendRequest } from './send_request';
 import { serviceContextMock } from '../../contexts/services_context.mock';
 
-const mockedSendRequestToES = sendRequestToES as jest.Mock;
+const mockedSendRequest = sendRequest as jest.Mock;
 
-describe('sendRequestToES', () => {
+describe('sendRequest', () => {
   let mockContextValue: ContextValue;
 
   beforeEach(() => {
@@ -26,8 +26,8 @@ describe('sendRequestToES', () => {
     jest.resetAllMocks();
   });
 
-  it('should send request to ES', async () => {
-    mockedSendRequestToES.mockResolvedValue([
+  it('should send request', async () => {
+    mockedSendRequest.mockResolvedValue([
       {
         response: {
           statusCode: 200,
@@ -40,17 +40,17 @@ describe('sendRequestToES', () => {
       http: mockContextValue.services.http,
       requests: [{ method: 'PUT', url: 'test', data: [] }],
     };
-    const results = await sendRequestToES(args);
+    const results = await sendRequest(args);
 
     const [request] = results;
     expect(request.response.statusCode).toEqual(200);
     expect(request.response.value).toContain('"acknowledged": true');
-    expect(mockedSendRequestToES).toHaveBeenCalledWith(args);
-    expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+    expect(mockedSendRequest).toHaveBeenCalledWith(args);
+    expect(mockedSendRequest).toHaveBeenCalledTimes(1);
   });
 
-  it('should send multiple requests to ES', async () => {
-    mockedSendRequestToES.mockResolvedValue([
+  it('should send multiple requests', async () => {
+    mockedSendRequest.mockResolvedValue([
       {
         response: {
           statusCode: 200,
@@ -70,17 +70,17 @@ describe('sendRequestToES', () => {
         { method: 'GET', url: 'test-2', data: [] },
       ],
     };
-    const results = await sendRequestToES(args);
+    const results = await sendRequest(args);
 
     const [firstRequest, secondRequest] = results;
     expect(firstRequest.response.statusCode).toEqual(200);
     expect(secondRequest.response.statusCode).toEqual(200);
-    expect(mockedSendRequestToES).toHaveBeenCalledWith(args);
-    expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+    expect(mockedSendRequest).toHaveBeenCalledWith(args);
+    expect(mockedSendRequest).toHaveBeenCalledTimes(1);
   });
 
   it('should handle errors', async () => {
-    mockedSendRequestToES.mockRejectedValue({
+    mockedSendRequest.mockRejectedValue({
       response: {
         statusCode: 500,
         statusText: 'error',
@@ -88,14 +88,47 @@ describe('sendRequestToES', () => {
     });
 
     try {
-      await sendRequestToES({
+      await sendRequest({
         http: mockContextValue.services.http,
         requests: [{ method: 'GET', url: 'test', data: [] }],
       });
     } catch (error) {
       expect(error.response.statusCode).toEqual(500);
       expect(error.response.statusText).toEqual('error');
-      expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+      expect(mockedSendRequest).toHaveBeenCalledTimes(1);
     }
   });
+
+  describe('successful response value', () => {
+    describe('with text', () => {
+      it('should return value with lines separated', async () => {
+        mockedSendRequest.mockResolvedValue('\ntest_index-1    []\ntest_index-2    []\n');
+        const response = await sendRequest({
+          http: mockContextValue.services.http,
+          requests: [{ method: 'GET', url: 'test-1', data: [] }],
+        });
+
+        expect(response).toMatchInlineSnapshot(`
+          "
+          test_index-1    []
+          test_index-2    []
+          "
+        `);
+        expect(mockedSendRequest).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('with parsed json', () => {
+      it('should stringify value', async () => {
+        mockedSendRequest.mockResolvedValue(JSON.stringify({ test: 'some value' }));
+        const response = await sendRequest({
+          http: mockContextValue.services.http,
+          requests: [{ method: 'GET', url: 'test-2', data: [] }],
+        });
+
+        expect(typeof response).toBe('string');
+        expect(mockedSendRequest).toHaveBeenCalledTimes(1);
+      });
+    });
+  });
 });
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.ts
similarity index 64%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/send_request.ts
index 1bac49a037e6e..1247f3f78aa68 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.ts
@@ -6,21 +6,21 @@
  * Side Public License, v 1.
  */
 
-import type { HttpSetup, IHttpFetchError } from 'kibana/public';
+import type { HttpSetup, IHttpFetchError } from '@kbn/core/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import { extractWarningMessages } from '../../../lib/utils';
-import { XJson } from '../../../../../es_ui_shared/public';
 // @ts-ignore
 import * as es from '../../../lib/es/es';
 import { BaseResponseType } from '../../../types';
 
 const { collapseLiteralStrings } = XJson;
 
-export interface EsRequestArgs {
+export interface RequestArgs {
   http: HttpSetup;
   requests: Array<{ url: string; method: string; data: string[] }>;
 }
 
-export interface ESResponseObject<V = unknown> {
+export interface ResponseObject<V = unknown> {
   statusCode: number;
   statusText: string;
   timeMs: number;
@@ -28,17 +28,17 @@ export interface ESResponseObject<V = unknown> {
   value: V;
 }
 
-export interface ESRequestResult<V = unknown> {
+export interface RequestResult<V = unknown> {
   request: { data: string; method: string; path: string };
-  response: ESResponseObject<V>;
+  response: ResponseObject<V>;
 }
 
 let CURRENT_REQ_ID = 0;
-export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]> {
+export function sendRequest(args: RequestArgs): Promise<RequestResult[]> {
   const requests = args.requests.slice();
   return new Promise((resolve, reject) => {
     const reqId = ++CURRENT_REQ_ID;
-    const results: ESRequestResult[] = [];
+    const results: RequestResult[] = [];
     if (reqId !== CURRENT_REQ_ID) {
       return;
     }
@@ -59,11 +59,11 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
         return;
       }
       const req = requests.shift()!;
-      const esPath = req.url;
-      const esMethod = req.method;
-      let esData = collapseLiteralStrings(req.data.join('\n'));
-      if (esData) {
-        esData += '\n';
+      const path = req.url;
+      const method = req.method;
+      let data = collapseLiteralStrings(req.data.join('\n'));
+      if (data) {
+        data += '\n';
       } // append a new line for bulk requests.
 
       const startTime = Date.now();
@@ -71,9 +71,9 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
       try {
         const { response, body } = await es.send({
           http: args.http,
-          method: esMethod,
-          path: esPath,
-          data: esData,
+          method,
+          path,
+          data,
           asResponse: true,
         });
 
@@ -88,7 +88,13 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
             (response.status >= 200 && response.status < 300) || response.status === 404;
 
           if (isSuccess) {
-            let value = JSON.stringify(body, null, 2);
+            let value;
+            // check if object is ArrayBuffer
+            if (body instanceof ArrayBuffer) {
+              value = body;
+            } else {
+              value = typeof body === 'string' ? body : JSON.stringify(body, null, 2);
+            }
 
             const warnings = response.headers.get('warning');
             if (warnings) {
@@ -109,9 +115,9 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
                 value,
               },
               request: {
-                data: esData,
-                method: esMethod,
-                path: esPath,
+                data,
+                method,
+                path,
               },
             });
 
@@ -121,25 +127,19 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
         }
       } catch (error) {
         let value;
-        let contentType: string | null = '';
-
-        const { response, body = {} } = error as IHttpFetchError;
-        if (response) {
-          const { status, headers } = response;
-          if (body) {
-            value = JSON.stringify(body, null, 2); // ES error should be shown
-            contentType = headers.get('Content-Type');
-          } else {
-            value = 'Request failed to get to the server (status code: ' + status + ')';
-            contentType = headers.get('Content-Type');
-          }
+        const { response, body } = error as IHttpFetchError;
+        const contentType = response?.headers.get('Content-Type') ?? '';
+        const statusCode = response?.status ?? 500;
+        const statusText = error?.response?.statusText ?? 'error';
 
-          if (isMultiRequest) {
-            value = '# ' + req.method + ' ' + req.url + '\n' + value;
-          }
+        if (body) {
+          value = JSON.stringify(body, null, 2);
         } else {
-          value =
-            "\n\nFailed to connect to Console's backend.\nPlease check the Kibana server is up and running";
+          value = 'Request failed to get to the server (status code: ' + statusCode + ')';
+        }
+
+        if (isMultiRequest) {
+          value = '# ' + req.method + ' ' + req.url + '\n' + value;
         }
 
         reject({
@@ -147,13 +147,13 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
             value,
             contentType,
             timeMs: Date.now() - startTime,
-            statusCode: error?.response?.status ?? 500,
-            statusText: error?.response?.statusText ?? 'error',
+            statusCode,
+            statusText,
           },
           request: {
-            data: esData,
-            method: esMethod,
-            path: esPath,
+            data,
+            method,
+            path,
           },
         });
       }
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/track.ts b/src/plugins/console/public/application/hooks/use_send_current_request/track.ts
similarity index 100%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/track.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/track.ts
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.test.tsx b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.test.tsx
similarity index 80%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.test.tsx
rename to src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.test.tsx
index e0131dc116a34..d16dc3f832d3a 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.test.tsx
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-jest.mock('./send_request_to_es', () => ({ sendRequestToES: jest.fn() }));
+jest.mock('./send_request', () => ({ sendRequest: jest.fn() }));
 jest.mock('../../contexts/editor_context/editor_registry', () => ({
   instance: { getInputEditor: jest.fn() },
 }));
@@ -21,10 +21,10 @@ import { serviceContextMock } from '../../contexts/services_context.mock';
 import { useRequestActionContext } from '../../contexts/request_context';
 import { instance as editorRegistry } from '../../contexts/editor_context/editor_registry';
 
-import { sendRequestToES } from './send_request_to_es';
-import { useSendCurrentRequestToES } from './use_send_current_request_to_es';
+import { sendRequest } from './send_request';
+import { useSendCurrentRequest } from './use_send_current_request';
 
-describe('useSendCurrentRequestToES', () => {
+describe('useSendCurrentRequest', () => {
   let mockContextValue: ContextValue;
   let dispatch: (...args: unknown[]) => void;
   const contexts = ({ children }: { children: JSX.Element }) => (
@@ -41,18 +41,18 @@ describe('useSendCurrentRequestToES', () => {
     jest.resetAllMocks();
   });
 
-  it('calls send request to ES', async () => {
+  it('calls send request', async () => {
     // Set up mocks
     (mockContextValue.services.settings.toJSON as jest.Mock).mockReturnValue({});
     // This request should succeed
-    (sendRequestToES as jest.Mock).mockResolvedValue([]);
+    (sendRequest as jest.Mock).mockResolvedValue([]);
     (editorRegistry.getInputEditor as jest.Mock).mockImplementation(() => ({
       getRequestsInRange: () => ['test'],
     }));
 
-    const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+    const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
     await act(() => result.current());
-    expect(sendRequestToES).toHaveBeenCalledWith({
+    expect(sendRequest).toHaveBeenCalledWith({
       http: mockContextValue.services.http,
       requests: ['test'],
     });
@@ -64,12 +64,12 @@ describe('useSendCurrentRequestToES', () => {
 
   it('handles known errors', async () => {
     // Set up mocks
-    (sendRequestToES as jest.Mock).mockRejectedValue({ response: 'nada' });
+    (sendRequest as jest.Mock).mockRejectedValue({ response: 'nada' });
     (editorRegistry.getInputEditor as jest.Mock).mockImplementation(() => ({
       getRequestsInRange: () => ['test'],
     }));
 
-    const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+    const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
     await act(() => result.current());
     // Second call should be the request failure
     const [, [requestFailedCall]] = (dispatch as jest.Mock).mock.calls;
@@ -80,12 +80,12 @@ describe('useSendCurrentRequestToES', () => {
 
   it('handles unknown errors', async () => {
     // Set up mocks
-    (sendRequestToES as jest.Mock).mockRejectedValue(NaN /* unexpected error value */);
+    (sendRequest as jest.Mock).mockRejectedValue(NaN /* unexpected error value */);
     (editorRegistry.getInputEditor as jest.Mock).mockImplementation(() => ({
       getRequestsInRange: () => ['test'],
     }));
 
-    const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+    const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
     await act(() => result.current());
     // Second call should be the request failure
     const [, [requestFailedCall]] = (dispatch as jest.Mock).mock.calls;
@@ -100,7 +100,7 @@ describe('useSendCurrentRequestToES', () => {
 
   it('notifies the user about save to history errors once only', async () => {
     // Set up mocks
-    (sendRequestToES as jest.Mock).mockReturnValue(
+    (sendRequest as jest.Mock).mockReturnValue(
       [{ request: {} }, { request: {} }] /* two responses to save history */
     );
     (mockContextValue.services.settings.toJSON as jest.Mock).mockReturnValue({});
@@ -112,7 +112,7 @@ describe('useSendCurrentRequestToES', () => {
       getRequestsInRange: () => ['test', 'test'],
     }));
 
-    const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+    const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
     await act(() => result.current());
 
     expect(dispatch).toHaveBeenCalledTimes(2);
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.ts
similarity index 93%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.ts
index f53a9dadbe108..ed08304d8d660 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.ts
@@ -16,10 +16,10 @@ import { retrieveAutoCompleteInfo } from '../../../lib/mappings/mappings';
 import { instance as registry } from '../../contexts/editor_context/editor_registry';
 import { useRequestActionContext, useServicesContext } from '../../contexts';
 import { StorageQuotaError } from '../../components/storage_quota_error';
-import { sendRequestToES } from './send_request_to_es';
+import { sendRequest } from './send_request';
 import { track } from './track';
 
-export const useSendCurrentRequestToES = () => {
+export const useSendCurrentRequest = () => {
   const {
     services: { history, settings, notifications, trackUiMetric, http },
     theme$,
@@ -46,12 +46,12 @@ export const useSendCurrentRequestToES = () => {
       // Fire and forget
       setTimeout(() => track(requests, editor, trackUiMetric), 0);
 
-      const results = await sendRequestToES({ http, requests });
+      const results = await sendRequest({ http, requests });
 
       let saveToHistoryError: undefined | Error;
-      const { historyDisabled } = settings.toJSON();
+      const { isHistoryDisabled } = settings.toJSON();
 
-      if (!historyDisabled) {
+      if (!isHistoryDisabled) {
         results.forEach(({ request: { path, method, data } }) => {
           try {
             history.addToHistory(path, method, data);
@@ -81,7 +81,7 @@ export const useSendCurrentRequestToES = () => {
                   notifications.toasts.remove(toast);
                 },
                 onDisableSavingToHistory: () => {
-                  settings.setHistoryDisabled(true);
+                  settings.setIsHistoryDisabled(true);
                   notifications.toasts.remove(toast);
                 },
               }),
diff --git a/src/plugins/console/public/application/index.tsx b/src/plugins/console/public/application/index.tsx
index a922bc1a893da..1950ab0c37951 100644
--- a/src/plugins/console/public/application/index.tsx
+++ b/src/plugins/console/public/application/index.tsx
@@ -15,9 +15,9 @@ import {
   I18nStart,
   CoreTheme,
   DocLinksStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
-import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { KibanaThemeProvider } from '../shared_imports';
 import { createStorage, createHistory, createSettings } from '../services';
 import { createUsageTracker } from '../services/tracker';
diff --git a/src/plugins/console/public/application/lib/api.ts b/src/plugins/console/public/application/lib/api.ts
index 3d818e8a7898a..1f32b4d94c0e2 100644
--- a/src/plugins/console/public/application/lib/api.ts
+++ b/src/plugins/console/public/application/lib/api.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { EsConfigApiResponse } from '../../../common/types/api_responses';
 import { sendRequest } from '../../shared_imports';
 
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
index 7a90dbe138f17..f13597e933bb2 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
+++ b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
@@ -297,6 +297,11 @@ export class LegacyCoreEditor implements CoreEditor {
     });
   }
 
+  unregisterKeyboardShortcut(command: string) {
+    // @ts-ignore
+    this.editor.commands.removeCommand(command);
+  }
+
   legacyUpdateUI(range: Range) {
     if (!this.$actions) {
       return;
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
index 58bb12e8958b1..32c4d77a75df7 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
+++ b/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import src from '!!raw-loader!./worker.js';
+import src from '!!raw-loader!./worker';
 
 export const workerModule = {
   id: 'sense_editor/mode/worker',
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
index bc6bda7fdc471..ff9d245f61275 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
@@ -12,7 +12,7 @@ import $ from 'jquery';
 import _ from 'lodash';
 
 import { create } from './create';
-import { XJson } from '../../../../../es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import editorInput1 from './__fixtures__/editor_input1.txt';
 
 const { collapseLiteralStrings } = XJson;
@@ -455,11 +455,11 @@ describe('Editor', () => {
     editorInput1,
     { start: { lineNumber: 7 }, end: { lineNumber: 14 } },
     `
-curl -XGET "http://localhost:9200/_stats?level=shards"
+curl -XGET "http://localhost:9200/_stats?level=shards" -H "kbn-xsrf: reporting"
 
 #in between comment
 
-curl -XPUT "http://localhost:9200/index_1/type1/1" -H 'Content-Type: application/json' -d'
+curl -XPUT "http://localhost:9200/index_1/type1/1" -H "kbn-xsrf: reporting" -H "Content-Type: application/json" -d'
 {
   "f": 1
 }'`.trim()
@@ -470,7 +470,7 @@ curl -XPUT "http://localhost:9200/index_1/type1/1" -H 'Content-Type: application
     editorInput1,
     { start: { lineNumber: 29 }, end: { lineNumber: 33 } },
     `
-curl -XPOST "http://localhost:9200/_sql?format=txt" -H 'Content-Type: application/json' -d'
+curl -XPOST "http://localhost:9200/_sql?format=txt" -H "kbn-xsrf: reporting" -H "Content-Type: application/json" -d'
 {
   "query": "SELECT prenom FROM claude_index WHERE prenom = '\\''claude'\\'' ",
   "fetch_size": 1
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
index 01a7786c5d856..ac65afce2c18a 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
@@ -8,13 +8,13 @@
 
 import _ from 'lodash';
 
-import { XJson } from '../../../../../es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 import RowParser from '../../../lib/row_parser';
 import * as utils from '../../../lib/utils';
 
 // @ts-ignore
-import * as es from '../../../lib/es/es';
+import { constructUrl } from '../../../lib/es/es';
 
 import { CoreEditor, Position, Range } from '../../../types';
 import { createTokenIterator } from '../../factories';
@@ -467,21 +467,22 @@ export class SenseEditor {
         return req;
       }
 
-      const esPath = req.url;
-      const esMethod = req.method;
-      const esData = req.data;
+      const path = req.url;
+      const method = req.method;
+      const data = req.data;
 
       // this is the first url defined in elasticsearch.hosts
-      const url = es.constructESUrl(elasticsearchBaseUrl, esPath);
+      const url = constructUrl(elasticsearchBaseUrl, path);
 
-      let ret = 'curl -X' + esMethod + ' "' + url + '"';
-      if (esData && esData.length) {
-        ret += " -H 'Content-Type: application/json' -d'\n";
-        const dataAsString = collapseLiteralStrings(esData.join('\n'));
+      // Append 'kbn-xsrf' header to bypass (XSRF/CSRF) protections
+      let ret = `curl -X${method.toUpperCase()} "${url}" -H "kbn-xsrf: reporting"`;
+      if (data && data.length) {
+        ret += ` -H "Content-Type: application/json" -d'\n`;
+        const dataAsString = collapseLiteralStrings(data.join('\n'));
 
         // We escape single quoted strings that that are wrapped in single quoted strings
         ret += dataAsString.replace(/'/g, "'\\''");
-        if (esData.length > 1) {
+        if (data.length > 1) {
           ret += '\n';
         } // end with a new line
         ret += "'";
diff --git a/src/plugins/console/public/application/stores/request.ts b/src/plugins/console/public/application/stores/request.ts
index 099ab24326d31..8056ab5a7987f 100644
--- a/src/plugins/console/public/application/stores/request.ts
+++ b/src/plugins/console/public/application/stores/request.ts
@@ -10,18 +10,18 @@ import { Reducer } from 'react';
 import { produce } from 'immer';
 import { identity } from 'fp-ts/lib/function';
 import { BaseResponseType } from '../../types/common';
-import { ESRequestResult } from '../hooks/use_send_current_request_to_es/send_request_to_es';
+import { RequestResult } from '../hooks/use_send_current_request/send_request';
 
 export type Actions =
   | { type: 'sendRequest'; payload: undefined }
-  | { type: 'requestSuccess'; payload: { data: ESRequestResult[] } }
-  | { type: 'requestFail'; payload: ESRequestResult<string> | undefined };
+  | { type: 'requestSuccess'; payload: { data: RequestResult[] } }
+  | { type: 'requestFail'; payload: RequestResult<string> | undefined };
 
 export interface Store {
   requestInFlight: boolean;
   lastResult: {
-    data: ESRequestResult[] | null;
-    error?: ESRequestResult<string>;
+    data: RequestResult[] | null;
+    error?: RequestResult<string>;
   };
 }
 
diff --git a/src/plugins/console/public/index.ts b/src/plugins/console/public/index.ts
index 9a9c5896cd26d..9f335fb4e4e58 100644
--- a/src/plugins/console/public/index.ts
+++ b/src/plugins/console/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import './index.scss';
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { ConsoleUIPlugin } from './plugin';
 
diff --git a/src/plugins/console/public/lib/autocomplete/autocomplete.ts b/src/plugins/console/public/lib/autocomplete/autocomplete.ts
index 63d43a849a681..3e59c4e6bb023 100644
--- a/src/plugins/console/public/lib/autocomplete/autocomplete.ts
+++ b/src/plugins/console/public/lib/autocomplete/autocomplete.ts
@@ -11,24 +11,24 @@ import { i18n } from '@kbn/i18n';
 
 // TODO: All of these imports need to be moved to the core editor so that it can inject components from there.
 import {
-  getTopLevelUrlCompleteComponents,
   getEndpointBodyCompleteComponents,
   getGlobalAutocompleteComponents,
+  getTopLevelUrlCompleteComponents,
   getUnmatchedEndpointComponents,
   // @ts-ignore
 } from '../kb/kb';
 
 import { createTokenIterator } from '../../application/factories';
-import { Position, Token, Range, CoreEditor } from '../../types';
+import type { CoreEditor, Position, Range, Token } from '../../types';
 import type RowParser from '../row_parser';
 
 import * as utils from '../utils';
 
 // @ts-ignore
 import { populateContext } from './engine';
-import { AutoCompleteContext, ResultTerm } from './types';
+import type { AutoCompleteContext, DataAutoCompleteRulesOneOf, ResultTerm } from './types';
 // @ts-ignore
-import { URL_PATH_END_MARKER } from './components/index';
+import { URL_PATH_END_MARKER } from './components';
 
 let lastEvaluatedToken: Token | null = null;
 
@@ -349,14 +349,84 @@ export default function ({
     });
   }
 
+  /**
+   * Get a different set of templates based on the value configured in the request.
+   * For example, when creating a snapshot repository of different types (`fs`, `url` etc),
+   * different properties are inserted in the textarea based on the type.
+   * E.g. https://github.com/elastic/kibana/blob/main/src/plugins/console/server/lib/spec_definitions/json/overrides/snapshot.create_repository.json
+   */
+  function getConditionalTemplate(
+    name: string,
+    autocompleteRules: Record<string, unknown> | null | undefined
+  ) {
+    const obj = autocompleteRules && autocompleteRules[name];
+
+    if (obj) {
+      const currentLineNumber = editor.getCurrentPosition().lineNumber;
+
+      if (hasOneOfIn(obj)) {
+        // Get the line number of value that should provide different templates based on that
+        const startLine = getStartLineNumber(currentLineNumber, obj.__one_of);
+        // Join line values from start to current line
+        const lines = editor.getLines(startLine, currentLineNumber).join('\n');
+        // Get the correct template by comparing the autocomplete rules against the lines
+        const prop = getProperty(lines, obj.__one_of);
+        if (prop && prop.__template) {
+          return prop.__template;
+        }
+      }
+    }
+  }
+
+  /**
+   * Check if object has a property of '__one_of'
+   */
+  function hasOneOfIn(value: unknown): value is { __one_of: DataAutoCompleteRulesOneOf[] } {
+    return typeof value === 'object' && value !== null && '__one_of' in value;
+  }
+
+  /**
+   * Get the start line of value that matches the autocomplete rules condition
+   */
+  function getStartLineNumber(currentLine: number, rules: DataAutoCompleteRulesOneOf[]): number {
+    if (currentLine === 1) {
+      return currentLine;
+    }
+    const value = editor.getLineValue(currentLine);
+    const prop = getProperty(value, rules);
+    if (prop) {
+      return currentLine;
+    }
+    return getStartLineNumber(currentLine - 1, rules);
+  }
+
+  /**
+   * Get the matching property based on the given condition
+   */
+  function getProperty(condition: string, rules: DataAutoCompleteRulesOneOf[]) {
+    return rules.find((rule) => {
+      if (rule.__condition && rule.__condition.lines_regex) {
+        return new RegExp(rule.__condition.lines_regex, 'm').test(condition);
+      }
+      return false;
+    });
+  }
+
   function applyTerm(term: {
     value?: string;
     context?: AutoCompleteContext;
-    template?: { __raw: boolean; value: string };
+    template?: { __raw?: boolean; value?: string; [key: string]: unknown };
     insertValue?: string;
   }) {
     const context = term.context!;
 
+    if (context?.endpoint && term.value) {
+      const { data_autocomplete_rules: autocompleteRules } = context.endpoint;
+      const template = getConditionalTemplate(term.value, autocompleteRules);
+      if (template) {
+        term.template = template;
+      }
+    }
     // make sure we get up to date replacement info.
     addReplacementInfoToContext(context, editor.getCurrentPosition(), term.insertValue);
 
diff --git a/src/plugins/console/public/lib/autocomplete/components/object_component.js b/src/plugins/console/public/lib/autocomplete/components/object_component.js
index bfbbf2f712c02..8273aab093354 100644
--- a/src/plugins/console/public/lib/autocomplete/components/object_component.js
+++ b/src/plugins/console/public/lib/autocomplete/components/object_component.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { SharedComponent } from './index';
+import { SharedComponent } from '.';
 /**
  * @param constants list of components that represent constant keys
  * @param patternsAndWildCards list of components that represent patterns and should be matched only if
diff --git a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
index 24cc510f65acf..547c4f12a3717 100644
--- a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
+++ b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
@@ -13,7 +13,7 @@ import {
   AcceptEndpointComponent,
   ListComponent,
   SimpleParamComponent,
-} from './index';
+} from '.';
 
 import { FullRequestComponent } from './full_request_component';
 
diff --git a/src/plugins/console/public/lib/autocomplete/types.ts b/src/plugins/console/public/lib/autocomplete/types.ts
index 33c543f43be9e..15d32e6426a6c 100644
--- a/src/plugins/console/public/lib/autocomplete/types.ts
+++ b/src/plugins/console/public/lib/autocomplete/types.ts
@@ -15,6 +15,14 @@ export interface ResultTerm {
   value?: string;
 }
 
+export interface DataAutoCompleteRulesOneOf {
+  __condition?: {
+    lines_regex: string;
+  };
+  __template: Record<string, unknown>;
+  [key: string]: unknown;
+}
+
 export interface AutoCompleteContext {
   autoCompleteSet?: null | ResultTerm[];
   endpoint?: null | {
@@ -24,6 +32,7 @@ export interface AutoCompleteContext {
     bodyAutocompleteRootComponents: unknown;
     id?: string;
     documentation?: string;
+    data_autocomplete_rules?: Record<string, unknown> | null;
   };
   urlPath?: null | unknown;
   urlParamsTokenPath?: Array<Record<string, string>> | null;
diff --git a/src/plugins/console/public/lib/es/es.ts b/src/plugins/console/public/lib/es/es.ts
index e17c226d61595..10d0ad95b0496 100644
--- a/src/plugins/console/public/lib/es/es.ts
+++ b/src/plugins/console/public/lib/es/es.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { HttpFetchOptions, HttpResponse, HttpSetup } from 'kibana/public';
-import { API_BASE_PATH } from '../../../common/constants';
+import type { HttpResponse, HttpSetup } from '@kbn/core/public';
+import { trimStart } from 'lodash';
+import { API_BASE_PATH, KIBANA_API_PREFIX } from '../../../common/constants';
 
 const esVersion: string[] = [];
 
@@ -20,7 +21,7 @@ export function getContentType(body: unknown) {
   return 'application/json';
 }
 
-interface SendProps {
+interface SendConfig {
   http: HttpSetup;
   method: string;
   path: string;
@@ -30,6 +31,8 @@ interface SendProps {
   asResponse?: boolean;
 }
 
+type Method = 'get' | 'post' | 'delete' | 'put' | 'patch' | 'head';
+
 export async function send({
   http,
   method,
@@ -38,17 +41,48 @@ export async function send({
   asSystemRequest = false,
   withProductOrigin = false,
   asResponse = false,
-}: SendProps) {
-  const options: HttpFetchOptions = {
+}: SendConfig) {
+  const kibanaRequestUrl = getKibanaRequestUrl(path);
+
+  if (kibanaRequestUrl) {
+    const httpMethod = method.toLowerCase() as Method;
+    const url = new URL(kibanaRequestUrl);
+    const { pathname, searchParams } = url;
+    const query = Object.fromEntries(searchParams.entries());
+    const body = ['post', 'put', 'patch'].includes(httpMethod) ? data : null;
+
+    return await http[httpMethod]<HttpResponse>(pathname, {
+      body,
+      query,
+      asResponse,
+      asSystemRequest,
+    });
+  }
+
+  return await http.post<HttpResponse>(`${API_BASE_PATH}/proxy`, {
     query: { path, method, ...(withProductOrigin && { withProductOrigin }) },
     body: data,
     asResponse,
     asSystemRequest,
-  };
-  return await http.post<HttpResponse>(`${API_BASE_PATH}/proxy`, options);
+  });
 }
 
-export function constructESUrl(baseUri: string, path: string) {
+function getKibanaRequestUrl(path: string) {
+  const isKibanaApiRequest = path.startsWith(KIBANA_API_PREFIX);
+  const kibanaBasePath = window.location.origin;
+
+  if (isKibanaApiRequest) {
+    // window.location.origin is used as a Kibana public base path for sending requests in cURL commands. E.g. "Copy as cURL".
+    return `${kibanaBasePath}/${trimStart(path.replace(KIBANA_API_PREFIX, ''), '/')}`;
+  }
+}
+
+export function constructUrl(baseUri: string, path: string) {
+  const kibanaRequestUrl = getKibanaRequestUrl(path);
+
+  if (kibanaRequestUrl) {
+    return kibanaRequestUrl;
+  }
   baseUri = baseUri.replace(/\/+$/, '');
   path = path.replace(/^\/+/, '');
   return baseUri + '/' + path;
diff --git a/src/plugins/console/public/lib/es/index.ts b/src/plugins/console/public/lib/es/index.ts
index 61d34ba96ec05..f83893e93713e 100644
--- a/src/plugins/console/public/lib/es/index.ts
+++ b/src/plugins/console/public/lib/es/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { send, constructESUrl, getContentType, getVersion } from './es';
+export { send, constructUrl, getContentType, getVersion } from './es';
diff --git a/src/plugins/console/public/lib/kb/kb.test.js b/src/plugins/console/public/lib/kb/kb.test.js
index 25136213c93e2..ff0ddba37281a 100644
--- a/src/plugins/console/public/lib/kb/kb.test.js
+++ b/src/plugins/console/public/lib/kb/kb.test.js
@@ -10,7 +10,7 @@ import _ from 'lodash';
 import { populateContext } from '../autocomplete/engine';
 
 import '../../application/models/sense_editor/sense_editor.test.mocks';
-import * as kb from '../kb';
+import * as kb from '.';
 import * as mappings from '../mappings/mappings';
 
 describe('Knowledge base', () => {
diff --git a/src/plugins/console/public/lib/utils/index.ts b/src/plugins/console/public/lib/utils/index.ts
index fb0729befa60a..3e6eb4a93f1f5 100644
--- a/src/plugins/console/public/lib/utils/index.ts
+++ b/src/plugins/console/public/lib/utils/index.ts
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { XJson } from '../../../../es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
diff --git a/src/plugins/console/public/plugin.ts b/src/plugins/console/public/plugin.ts
index 5157eb4af2765..e6a4d7fff61b0 100644
--- a/src/plugins/console/public/plugin.ts
+++ b/src/plugins/console/public/plugin.ts
@@ -7,9 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/public';
+import { Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 
-import { FeatureCatalogueCategory } from '../../home/public';
 import {
   AppSetupUIPluginDependencies,
   ClientConfigType,
@@ -41,7 +40,7 @@ export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDepen
           icon: 'consoleApp',
           path: '/app/dev_tools#/console',
           showOnHomePage: false,
-          category: FeatureCatalogueCategory.ADMIN,
+          category: 'admin',
         });
       }
 
diff --git a/src/plugins/console/public/services/history.ts b/src/plugins/console/public/services/history.ts
index 972e5283274de..c073411fe10b4 100644
--- a/src/plugins/console/public/services/history.ts
+++ b/src/plugins/console/public/services/history.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { Storage } from './index';
+import { Storage } from '.';
 
 const MAX_NUMBER_OF_HISTORY_ITEMS = 100;
 
diff --git a/src/plugins/console/public/services/settings.ts b/src/plugins/console/public/services/settings.ts
index 1a7eff3e7ca54..aa2280f06064f 100644
--- a/src/plugins/console/public/services/settings.ts
+++ b/src/plugins/console/public/services/settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Storage } from './index';
+import { Storage } from '.';
 
 export const DEFAULT_SETTINGS = Object.freeze({
   fontSize: 14,
@@ -15,7 +15,8 @@ export const DEFAULT_SETTINGS = Object.freeze({
   tripleQuotes: true,
   wrapMode: true,
   autocomplete: Object.freeze({ fields: true, indices: true, templates: true, dataStreams: true }),
-  historyDisabled: false,
+  isHistoryDisabled: false,
+  isKeyboardShortcutsDisabled: false,
 });
 
 export interface DevToolsSettings {
@@ -30,72 +31,96 @@ export interface DevToolsSettings {
   polling: boolean;
   pollInterval: number;
   tripleQuotes: boolean;
-  historyDisabled: boolean;
+  isHistoryDisabled: boolean;
+  isKeyboardShortcutsDisabled: boolean;
+}
+
+enum SettingKeys {
+  FONT_SIZE = 'font_size',
+  WRAP_MODE = 'wrap_mode',
+  TRIPLE_QUOTES = 'triple_quotes',
+  AUTOCOMPLETE_SETTINGS = 'autocomplete_settings',
+  CONSOLE_POLLING = 'console_polling',
+  POLL_INTERVAL = 'poll_interval',
+  IS_HISTORY_DISABLED = 'is_history_disabled',
+  IS_KEYBOARD_SHORTCUTS_DISABLED = 'is_keyboard_shortcuts_disabled',
 }
 
 export class Settings {
   constructor(private readonly storage: Storage) {}
 
   getFontSize() {
-    return this.storage.get('font_size', DEFAULT_SETTINGS.fontSize);
+    return this.storage.get(SettingKeys.FONT_SIZE, DEFAULT_SETTINGS.fontSize);
   }
 
   setFontSize(size: number) {
-    this.storage.set('font_size', size);
+    this.storage.set(SettingKeys.FONT_SIZE, size);
     return true;
   }
 
   getWrapMode() {
-    return this.storage.get('wrap_mode', DEFAULT_SETTINGS.wrapMode);
+    return this.storage.get(SettingKeys.WRAP_MODE, DEFAULT_SETTINGS.wrapMode);
   }
 
   setWrapMode(mode: boolean) {
-    this.storage.set('wrap_mode', mode);
+    this.storage.set(SettingKeys.WRAP_MODE, mode);
     return true;
   }
 
   setTripleQuotes(tripleQuotes: boolean) {
-    this.storage.set('triple_quotes', tripleQuotes);
+    this.storage.set(SettingKeys.TRIPLE_QUOTES, tripleQuotes);
     return true;
   }
 
   getTripleQuotes() {
-    return this.storage.get('triple_quotes', DEFAULT_SETTINGS.tripleQuotes);
+    return this.storage.get(SettingKeys.TRIPLE_QUOTES, DEFAULT_SETTINGS.tripleQuotes);
   }
 
   getAutocomplete() {
-    return this.storage.get('autocomplete_settings', DEFAULT_SETTINGS.autocomplete);
+    return this.storage.get(SettingKeys.AUTOCOMPLETE_SETTINGS, DEFAULT_SETTINGS.autocomplete);
   }
 
   setAutocomplete(settings: object) {
-    this.storage.set('autocomplete_settings', settings);
+    this.storage.set(SettingKeys.AUTOCOMPLETE_SETTINGS, settings);
     return true;
   }
 
   getPolling() {
-    return this.storage.get('console_polling', DEFAULT_SETTINGS.polling);
+    return this.storage.get(SettingKeys.CONSOLE_POLLING, DEFAULT_SETTINGS.polling);
   }
 
   setPolling(polling: boolean) {
-    this.storage.set('console_polling', polling);
+    this.storage.set(SettingKeys.CONSOLE_POLLING, polling);
     return true;
   }
 
-  setHistoryDisabled(disable: boolean) {
-    this.storage.set('disable_history', disable);
+  setIsHistoryDisabled(isDisabled: boolean) {
+    this.storage.set(SettingKeys.IS_HISTORY_DISABLED, isDisabled);
     return true;
   }
 
-  getHistoryDisabled() {
-    return this.storage.get('disable_history', DEFAULT_SETTINGS.historyDisabled);
+  getIsHistoryDisabled() {
+    return this.storage.get(SettingKeys.IS_HISTORY_DISABLED, DEFAULT_SETTINGS.isHistoryDisabled);
   }
 
   setPollInterval(interval: number) {
-    this.storage.set('poll_interval', interval);
+    this.storage.set(SettingKeys.POLL_INTERVAL, interval);
   }
 
   getPollInterval() {
-    return this.storage.get('poll_interval', DEFAULT_SETTINGS.pollInterval);
+    return this.storage.get(SettingKeys.POLL_INTERVAL, DEFAULT_SETTINGS.pollInterval);
+  }
+
+  setIsKeyboardShortcutsDisabled(disable: boolean) {
+    this.storage.set(SettingKeys.IS_KEYBOARD_SHORTCUTS_DISABLED, disable);
+    return true;
+  }
+
+  getIsKeyboardShortcutsDisabled() {
+    return this.storage.get(
+      SettingKeys.IS_KEYBOARD_SHORTCUTS_DISABLED,
+      DEFAULT_SETTINGS.isKeyboardShortcutsDisabled
+    );
   }
 
   toJSON(): DevToolsSettings {
@@ -106,7 +131,8 @@ export class Settings {
       fontSize: parseFloat(this.getFontSize()),
       polling: Boolean(this.getPolling()),
       pollInterval: this.getPollInterval(),
-      historyDisabled: Boolean(this.getHistoryDisabled()),
+      isHistoryDisabled: Boolean(this.getIsHistoryDisabled()),
+      isKeyboardShortcutsDisabled: Boolean(this.getIsKeyboardShortcutsDisabled()),
     };
   }
 
@@ -117,7 +143,8 @@ export class Settings {
     autocomplete,
     polling,
     pollInterval,
-    historyDisabled,
+    isHistoryDisabled,
+    isKeyboardShortcutsDisabled,
   }: DevToolsSettings) {
     this.setFontSize(fontSize);
     this.setWrapMode(wrapMode);
@@ -125,7 +152,8 @@ export class Settings {
     this.setAutocomplete(autocomplete);
     this.setPolling(polling);
     this.setPollInterval(pollInterval);
-    this.setHistoryDisabled(historyDisabled);
+    this.setIsHistoryDisabled(isHistoryDisabled);
+    this.setIsKeyboardShortcutsDisabled(isKeyboardShortcutsDisabled);
   }
 }
 
diff --git a/src/plugins/console/public/services/tracker.ts b/src/plugins/console/public/services/tracker.ts
index 45aef7a3fc5d4..43675c4f9d8dd 100644
--- a/src/plugins/console/public/services/tracker.ts
+++ b/src/plugins/console/public/services/tracker.ts
@@ -7,8 +7,8 @@
  */
 
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { MetricsTracker } from '../types';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 const APP_TRACKER_NAME = 'console';
 
diff --git a/src/plugins/console/public/shared_imports.ts b/src/plugins/console/public/shared_imports.ts
index 4bbf6e5853428..95b96b565e27f 100644
--- a/src/plugins/console/public/shared_imports.ts
+++ b/src/plugins/console/public/shared_imports.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { sendRequest, XJson } from '../../es_ui_shared/public';
+import { sendRequest, XJson } from '@kbn/es-ui-shared-plugin/public';
 
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
 export { sendRequest, collapseLiteralStrings, expandLiteralStrings };
 
-export { KibanaThemeProvider, toMountPoint } from '../../kibana_react/public';
+export { KibanaThemeProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
diff --git a/src/plugins/console/public/types/core_editor.ts b/src/plugins/console/public/types/core_editor.ts
index cc344d6bcc881..db8010afe762b 100644
--- a/src/plugins/console/public/types/core_editor.ts
+++ b/src/plugins/console/public/types/core_editor.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { Editor } from 'brace';
 import { TokensProvider } from './tokens_provider';
 import { Token } from './token';
 
@@ -252,10 +253,15 @@ export interface CoreEditor {
    */
   registerKeyboardShortcut(opts: {
     keys: string | { win?: string; mac?: string };
-    fn: () => void;
+    fn: (editor: Editor) => void;
     name: string;
   }): void;
 
+  /**
+   * Unregister a keyboard shortcut and provide a command name
+   */
+  unregisterKeyboardShortcut(command: string): void;
+
   /**
    * Register a completions function that will be called when the editor
    * detects a change
diff --git a/src/plugins/console/public/types/plugin_dependencies.ts b/src/plugins/console/public/types/plugin_dependencies.ts
index afc49f9a5a986..40d82a4df29ac 100644
--- a/src/plugins/console/public/types/plugin_dependencies.ts
+++ b/src/plugins/console/public/types/plugin_dependencies.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { HomePublicPluginSetup } from '../../../home/public';
-import { DevToolsSetup } from '../../../dev_tools/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { SharePluginSetup, LocatorPublic } from '../../../share/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { DevToolsSetup } from '@kbn/dev-tools-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { SharePluginSetup, LocatorPublic } from '@kbn/share-plugin/public';
 
 import { ConsoleUILocatorParams } from './locator';
 
diff --git a/src/plugins/console/server/config.ts b/src/plugins/console/server/config.ts
index 2183a133e408f..7a24fe2dca401 100644
--- a/src/plugins/console/server/config.ts
+++ b/src/plugins/console/server/config.ts
@@ -10,7 +10,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/src/plugins/console/server/index.ts b/src/plugins/console/server/index.ts
index 598dfa23958c9..84f0d5cbad250 100644
--- a/src/plugins/console/server/index.ts
+++ b/src/plugins/console/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { ConsoleServerPlugin } from './plugin';
 
diff --git a/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js b/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js
index 112f72edcbddc..7b7d4c41a34b1 100644
--- a/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js
+++ b/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { getElasticsearchProxyConfig } from '../lib/elasticsearch_proxy_config';
+import { getElasticsearchProxyConfig } from './elasticsearch_proxy_config';
 import https from 'https';
 import http from 'http';
 
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
index 5543c40d03cb0..c1ae53bbaabc6 100644
--- a/src/plugins/console/server/plugin.ts
+++ b/src/plugins/console/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { SemVer } from 'semver';
 
 import { ProxyConfigCollection } from './lib';
diff --git a/src/plugins/console/server/routes/api/console/es_config/index.ts b/src/plugins/console/server/routes/api/console/es_config/index.ts
index dd8fa5350215f..ed935007914f8 100644
--- a/src/plugins/console/server/routes/api/console/es_config/index.ts
+++ b/src/plugins/console/server/routes/api/console/es_config/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { EsConfigApiResponse } from '../../../../../common/types/api_responses';
-import { RouteDependencies } from '../../../';
+import { RouteDependencies } from '../../..';
 
 export const registerEsConfigRoute = ({ router, services }: RouteDependencies): void => {
   router.get({ path: '/api/console/es_config', validate: false }, async (ctx, req, res) => {
diff --git a/src/plugins/console/server/routes/api/console/proxy/body.test.ts b/src/plugins/console/server/routes/api/console/proxy/body.test.ts
index 80a2e075957de..893f00f975e89 100644
--- a/src/plugins/console/server/routes/api/console/proxy/body.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/body.test.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { IKibanaResponse } from 'src/core/server';
+import { IKibanaResponse } from '@kbn/core/server';
 import { getProxyRouteHandlerDeps } from './mocks';
 
 import { Readable } from 'stream';
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createHandler } from './create_handler';
 import * as requestModule from '../../../../lib/proxy_request';
 import { createResponseStub } from './stubs';
diff --git a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
index 815c507b763f7..8cd0400d82cb0 100644
--- a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
@@ -11,8 +11,12 @@ import * as url from 'url';
 import { pick, trimStart, trimEnd } from 'lodash';
 import { SemVer } from 'semver';
 
-import { KibanaRequest, RequestHandler } from 'kibana/server';
+import { KibanaRequest, RequestHandler } from '@kbn/core/server';
 
+// TODO: find a better way to get information from the request like remoteAddress and remotePort
+// for forwarding.
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ensureRawRequest } from '@kbn/core/server/http/router';
 import { ESConfigForProxy } from '../../../../types';
 import {
   getElasticsearchProxyConfig,
@@ -21,12 +25,7 @@ import {
   setHeaders,
 } from '../../../../lib';
 
-// TODO: find a better way to get information from the request like remoteAddress and remotePort
-// for forwarding.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ensureRawRequest } from '../../../../../../../core/server/http/router';
-
-import { RouteDependencies } from '../../../';
+import { RouteDependencies } from '../../..';
 
 import { Body, Query } from './validation_config';
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/headers.test.ts b/src/plugins/console/server/routes/api/console/proxy/headers.test.ts
index c2db933ad4e7b..27cad7d948696 100644
--- a/src/plugins/console/server/routes/api/console/proxy/headers.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/headers.test.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-jest.mock('../../../../../../../core/server/http/router/request', () => ({
+jest.mock('@kbn/core/server/http/router/request', () => ({
   ensureRawRequest: jest.fn(),
 }));
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ensureRawRequest } from '../../../../../../../core/server/http/router/request';
+import { ensureRawRequest } from '@kbn/core/server/http/router/request';
 
 import { getProxyRouteHandlerDeps } from './mocks';
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/index.ts b/src/plugins/console/server/routes/api/console/proxy/index.ts
index 0b07a26dcfeb1..64103035e08d6 100644
--- a/src/plugins/console/server/routes/api/console/proxy/index.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/index.ts
@@ -9,7 +9,7 @@
 import { routeValidationConfig } from './validation_config';
 import { createHandler } from './create_handler';
 
-import { RouteDependencies } from '../../../';
+import { RouteDependencies } from '../../..';
 
 export const registerProxyRoute = (deps: RouteDependencies) => {
   deps.router.post(
diff --git a/src/plugins/console/server/routes/api/console/proxy/mocks.ts b/src/plugins/console/server/routes/api/console/proxy/mocks.ts
index d06ca90adf556..cef9ea34a11ca 100644
--- a/src/plugins/console/server/routes/api/console/proxy/mocks.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/mocks.ts
@@ -12,11 +12,11 @@ jest.mock('../../../../lib/proxy_request', () => ({
 }));
 
 import { duration } from 'moment';
+import { coreMock, httpServiceMock } from '@kbn/core/server/mocks';
 import { MAJOR_VERSION } from '../../../../../common/constants';
 import { ProxyConfigCollection } from '../../../../lib';
-import { RouteDependencies, ProxyDependencies } from '../../../../routes';
+import { RouteDependencies, ProxyDependencies } from '../../..';
 import { EsLegacyConfigService, SpecDefinitionsService } from '../../../../services';
-import { coreMock, httpServiceMock } from '../../../../../../../core/server/mocks';
 
 const kibanaVersion = new SemVer(MAJOR_VERSION);
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/params.test.ts b/src/plugins/console/server/routes/api/console/proxy/params.test.ts
index edefb2f11f1f1..20f861247bddb 100644
--- a/src/plugins/console/server/routes/api/console/proxy/params.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/params.test.ts
@@ -7,7 +7,7 @@
  */
 import { SemVer } from 'semver';
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { getProxyRouteHandlerDeps } from './mocks'; // import need to come first
 import { createResponseStub } from './stubs'; // import needs to come first
 import { MAJOR_VERSION } from '../../../../../common/constants';
diff --git a/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts b/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts
index 30b537ae5c28f..9762ec9754b71 100644
--- a/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts
@@ -9,7 +9,7 @@
 import { duration } from 'moment';
 import { getProxyRouteHandlerDeps } from './mocks';
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import * as requestModule from '../../../../lib/proxy_request';
 import { createHandler } from './create_handler';
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts b/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts
index 3f7ba81c33c03..fbdc53bc5383b 100644
--- a/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { IKibanaResponse } from 'src/core/server';
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import type { IKibanaResponse } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { getProxyRouteHandlerDeps } from './mocks';
 import { createResponseStub } from './stubs';
 import * as requestModule from '../../../../lib/proxy_request';
diff --git a/src/plugins/console/server/routes/api/console/spec_definitions/index.ts b/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
index 90bd37cb317bf..39079da24877d 100644
--- a/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
+++ b/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { RequestHandler } from 'kibana/server';
-import { RouteDependencies } from '../../../';
+import { RequestHandler } from '@kbn/core/server';
+import { RouteDependencies } from '../../..';
 
 interface SpecDefinitionsRouteResponse {
   es: {
diff --git a/src/plugins/console/server/routes/index.ts b/src/plugins/console/server/routes/index.ts
index 3911e8cfabc60..a3263fff2e435 100644
--- a/src/plugins/console/server/routes/index.ts
+++ b/src/plugins/console/server/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, Logger } from 'kibana/server';
+import { IRouter, Logger } from '@kbn/core/server';
 import { SemVer } from 'semver';
 
 import { EsLegacyConfigService, SpecDefinitionsService } from '../services';
diff --git a/src/plugins/console/server/services/es_legacy_config_service.ts b/src/plugins/console/server/services/es_legacy_config_service.ts
index f599398c2c34a..c604bda08a169 100644
--- a/src/plugins/console/server/services/es_legacy_config_service.ts
+++ b/src/plugins/console/server/services/es_legacy_config_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { firstValueFrom, Observable, Subscription } from 'rxjs';
-import { ElasticsearchConfig } from 'kibana/server';
+import { ElasticsearchConfig } from '@kbn/core/server';
 
 export class EsLegacyConfigService {
   /**
diff --git a/src/plugins/controls/common/control_group/control_group_constants.ts b/src/plugins/controls/common/control_group/control_group_constants.ts
index 467394614e12c..604e411279bad 100644
--- a/src/plugins/controls/common/control_group/control_group_constants.ts
+++ b/src/plugins/controls/common/control_group/control_group_constants.ts
@@ -6,21 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ControlGroupInput } from '..';
 import { ControlStyle, ControlWidth } from '../types';
 
 export const DEFAULT_CONTROL_WIDTH: ControlWidth = 'auto';
 export const DEFAULT_CONTROL_STYLE: ControlStyle = 'oneLine';
-
-export const getDefaultControlGroupInput = (): Omit<ControlGroupInput, 'id'> => ({
-  panels: {},
-  defaultControlWidth: DEFAULT_CONTROL_WIDTH,
-  controlStyle: DEFAULT_CONTROL_STYLE,
-  chainingSystem: 'HIERARCHICAL',
-  ignoreParentSettings: {
-    ignoreFilters: false,
-    ignoreQuery: false,
-    ignoreTimerange: false,
-    ignoreValidations: false,
-  },
-});
diff --git a/src/plugins/controls/common/control_group/control_group_persistable_state.ts b/src/plugins/controls/common/control_group/control_group_persistable_state.ts
index 73f569bb7d247..3826a32e0a039 100644
--- a/src/plugins/controls/common/control_group/control_group_persistable_state.ts
+++ b/src/plugins/controls/common/control_group/control_group_persistable_state.ts
@@ -10,10 +10,10 @@ import {
   EmbeddableInput,
   EmbeddablePersistableStateService,
   EmbeddableStateWithType,
-} from '../../../embeddable/common/types';
+} from '@kbn/embeddable-plugin/common/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { ControlGroupInput, ControlPanelState } from './types';
-import { SavedObjectReference } from '../../../../core/types';
-import { MigrateFunctionsObject } from '../../../kibana_utils/common';
 import { makeControlOrdersZeroBased } from './control_group_migrations';
 
 type ControlGroupInputWithType = Partial<ControlGroupInput> & { type: string };
diff --git a/src/plugins/dashboard/common/embeddable/dashboard_control_group.ts b/src/plugins/controls/common/control_group/control_group_persistence.ts
similarity index 65%
rename from src/plugins/dashboard/common/embeddable/dashboard_control_group.ts
rename to src/plugins/controls/common/control_group/control_group_persistence.ts
index ce6a1f358661e..55a7ad4b5a854 100644
--- a/src/plugins/dashboard/common/embeddable/dashboard_control_group.ts
+++ b/src/plugins/controls/common/control_group/control_group_persistence.ts
@@ -7,12 +7,53 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { ControlGroupInput, getDefaultControlGroupInput } from '../../../controls/common';
-import { RawControlGroupAttributes } from '../types';
+import deepEqual from 'fast-deep-equal';
 
-export const getDefaultDashboardControlGroupInput = getDefaultControlGroupInput;
+import { pick } from 'lodash';
+import { ControlGroupInput } from '..';
+import { DEFAULT_CONTROL_STYLE, DEFAULT_CONTROL_WIDTH } from './control_group_constants';
+import { PersistableControlGroupInput, RawControlGroupAttributes } from './types';
 
-export const controlGroupInputToRawAttributes = (
+const safeJSONParse = <OutType>(jsonString?: string): OutType | undefined => {
+  if (!jsonString && typeof jsonString !== 'string') return;
+  try {
+    return JSON.parse(jsonString) as OutType;
+  } catch {
+    return;
+  }
+};
+
+export const getDefaultControlGroupInput = (): Omit<ControlGroupInput, 'id'> => ({
+  panels: {},
+  defaultControlWidth: DEFAULT_CONTROL_WIDTH,
+  controlStyle: DEFAULT_CONTROL_STYLE,
+  chainingSystem: 'HIERARCHICAL',
+  ignoreParentSettings: {
+    ignoreFilters: false,
+    ignoreQuery: false,
+    ignoreTimerange: false,
+    ignoreValidations: false,
+  },
+});
+
+export const persistableControlGroupInputIsEqual = (
+  a: PersistableControlGroupInput | undefined,
+  b: PersistableControlGroupInput | undefined
+) => {
+  const defaultInput = getDefaultControlGroupInput();
+  const inputA = {
+    ...defaultInput,
+    ...pick(a, ['panels', 'chainingSystem', 'controlStyle', 'ignoreParentSettings']),
+  };
+  const inputB = {
+    ...defaultInput,
+    ...pick(b, ['panels', 'chainingSystem', 'controlStyle', 'ignoreParentSettings']),
+  };
+  if (deepEqual(inputA, inputB)) return true;
+  return false;
+};
+
+export const controlGroupInputToRawControlGroupAttributes = (
   controlGroupInput: Omit<ControlGroupInput, 'id'>
 ): RawControlGroupAttributes => {
   return {
@@ -23,16 +64,7 @@ export const controlGroupInputToRawAttributes = (
   };
 };
 
-const safeJSONParse = <OutType>(jsonString?: string): OutType | undefined => {
-  if (!jsonString && typeof jsonString !== 'string') return;
-  try {
-    return JSON.parse(jsonString) as OutType;
-  } catch {
-    return;
-  }
-};
-
-export const rawAttributesToControlGroupInput = (
+export const rawControlGroupAttributesToControlGroupInput = (
   rawControlGroupAttributes: RawControlGroupAttributes
 ): Omit<ControlGroupInput, 'id'> | undefined => {
   const defaultControlGroupInput = getDefaultControlGroupInput();
@@ -50,7 +82,7 @@ export const rawAttributesToControlGroupInput = (
   };
 };
 
-export const rawAttributesToSerializable = (
+export const rawControlGroupAttributesToSerializable = (
   rawControlGroupAttributes: Omit<RawControlGroupAttributes, 'id'>
 ): SerializableRecord => {
   const defaultControlGroupInput = getDefaultControlGroupInput();
@@ -62,7 +94,7 @@ export const rawAttributesToSerializable = (
   };
 };
 
-export const serializableToRawAttributes = (
+export const serializableToRawControlGroupAttributes = (
   serializable: SerializableRecord
 ): Omit<RawControlGroupAttributes, 'id' | 'type'> => {
   return {
diff --git a/src/plugins/controls/common/control_group/types.ts b/src/plugins/controls/common/control_group/types.ts
index 988109d237cdc..9fbfc54b09a17 100644
--- a/src/plugins/controls/common/control_group/types.ts
+++ b/src/plugins/controls/common/control_group/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableInput, PanelState } from '../../../embeddable/common/types';
+import { EmbeddableInput, PanelState } from '@kbn/embeddable-plugin/common/types';
 import { ControlInput, ControlStyle, ControlWidth } from '../types';
 
 export const CONTROL_GROUP_TYPE = 'control_group';
@@ -29,3 +29,36 @@ export interface ControlGroupInput extends EmbeddableInput, ControlInput {
   controlStyle: ControlStyle;
   panels: ControlsPanels;
 }
+
+// only parts of the Control Group Input should be persisted
+export type PersistableControlGroupInput = Pick<
+  ControlGroupInput,
+  'panels' | 'chainingSystem' | 'controlStyle' | 'ignoreParentSettings'
+>;
+
+// panels are json stringified for storage in a saved object.
+export type RawControlGroupAttributes = Omit<
+  PersistableControlGroupInput,
+  'panels' | 'ignoreParentSettings'
+> & {
+  ignoreParentSettingsJSON: string;
+  panelsJSON: string;
+};
+export interface ControlGroupTelemetry {
+  total: number;
+  chaining_system: {
+    [key: string]: number;
+  };
+  label_position: {
+    [key: string]: number;
+  };
+  ignore_settings: {
+    [key: string]: number;
+  };
+  by_type: {
+    [key: string]: {
+      total: number;
+      details: { [key: string]: number };
+    };
+  };
+}
diff --git a/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts b/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts
index a41eb788d71e2..546b5361ab125 100644
--- a/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts
+++ b/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts
@@ -9,10 +9,10 @@
 import {
   EmbeddableStateWithType,
   EmbeddablePersistableStateService,
-} from '../../../../embeddable/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { OptionsListEmbeddableInput } from './types';
-import { SavedObjectReference } from '../../../../../core/types';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 type OptionsListInputWithType = Partial<OptionsListEmbeddableInput> & { type: string };
 const dataViewReferenceName = 'optionsListDataView';
diff --git a/src/plugins/controls/common/control_types/options_list/types.ts b/src/plugins/controls/common/control_types/options_list/types.ts
index 5561b80b81153..0f889bed7bacb 100644
--- a/src/plugins/controls/common/control_types/options_list/types.ts
+++ b/src/plugins/controls/common/control_types/options_list/types.ts
@@ -7,15 +7,12 @@
  */
 
 import { BoolQuery } from '@kbn/es-query';
-import { FieldSpec } from '../../../../data_views/common';
-import { ControlInput } from '../../types';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
+import { DataControlInput } from '../../types';
 
 export const OPTIONS_LIST_CONTROL = 'optionsListControl';
 
-export interface OptionsListEmbeddableInput extends ControlInput {
-  fieldName: string;
-  dataViewId: string;
-
+export interface OptionsListEmbeddableInput extends DataControlInput {
   selectedOptions?: string[];
   singleSelect?: boolean;
   loading?: boolean;
diff --git a/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts b/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts
index c50fe3f6fb710..bb4c703ba47be 100644
--- a/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts
+++ b/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts
@@ -9,10 +9,10 @@
 import {
   EmbeddableStateWithType,
   EmbeddablePersistableStateService,
-} from '../../../../embeddable/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { RangeSliderEmbeddableInput } from './types';
-import { SavedObjectReference } from '../../../../../core/types';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 type RangeSliderInputWithType = Partial<RangeSliderEmbeddableInput> & { type: string };
 const dataViewReferenceName = 'optionsListDataView';
diff --git a/src/plugins/controls/common/control_types/range_slider/types.ts b/src/plugins/controls/common/control_types/range_slider/types.ts
index e63ec0337a57e..a975fdd27ac31 100644
--- a/src/plugins/controls/common/control_types/range_slider/types.ts
+++ b/src/plugins/controls/common/control_types/range_slider/types.ts
@@ -6,14 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { ControlInput } from '../../types';
+import { DataControlInput } from '../../types';
 
 export const RANGE_SLIDER_CONTROL = 'rangeSliderControl';
 
 export type RangeValue = [string, string];
 
-export interface RangeSliderEmbeddableInput extends ControlInput {
-  fieldName: string;
-  dataViewId: string;
+export interface RangeSliderEmbeddableInput extends DataControlInput {
   value: RangeValue;
 }
diff --git a/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts b/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts
index 660f33a15a33d..b8b3a5f16b51f 100644
--- a/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts
+++ b/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts
@@ -9,10 +9,10 @@
 import {
   EmbeddableStateWithType,
   EmbeddablePersistableStateService,
-} from '../../../../embeddable/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { TimeSliderControlEmbeddableInput } from './types';
-import { SavedObjectReference } from '../../../../../core/types';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 type TimeSliderInputWithType = Partial<TimeSliderControlEmbeddableInput> & { type: string };
 const dataViewReferenceName = 'timeSliderDataView';
diff --git a/src/plugins/controls/common/control_types/time_slider/types.ts b/src/plugins/controls/common/control_types/time_slider/types.ts
index 73d364da80caa..31272380becde 100644
--- a/src/plugins/controls/common/control_types/time_slider/types.ts
+++ b/src/plugins/controls/common/control_types/time_slider/types.ts
@@ -6,12 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ControlInput } from '../../types';
+import { DataControlInput } from '../../types';
 
 export const TIME_SLIDER_CONTROL = 'timeSlider';
 
-export interface TimeSliderControlEmbeddableInput extends ControlInput {
-  fieldName: string;
-  dataViewId: string;
+export interface TimeSliderControlEmbeddableInput extends DataControlInput {
   value?: [number | null, number | null];
 }
diff --git a/src/plugins/controls/common/index.ts b/src/plugins/controls/common/index.ts
index ff2c39346f075..2956570f79189 100644
--- a/src/plugins/controls/common/index.ts
+++ b/src/plugins/controls/common/index.ts
@@ -7,14 +7,37 @@
  */
 
 export type { ControlWidth } from './types';
-export type { ControlPanelState, ControlsPanels, ControlGroupInput } from './control_group/types';
-export type { OptionsListEmbeddableInput } from './control_types/options_list/types';
-export type { RangeSliderEmbeddableInput } from './control_types/range_slider/types';
 
-export { CONTROL_GROUP_TYPE } from './control_group/types';
-export { OPTIONS_LIST_CONTROL } from './control_types/options_list/types';
-export { RANGE_SLIDER_CONTROL } from './control_types/range_slider/types';
-
-export { getDefaultControlGroupInput } from './control_group/control_group_constants';
+// Control Group exports
+export {
+  CONTROL_GROUP_TYPE,
+  type ControlPanelState,
+  type ControlsPanels,
+  type ControlGroupInput,
+  type ControlGroupTelemetry,
+  type RawControlGroupAttributes,
+  type PersistableControlGroupInput,
+} from './control_group/types';
+export {
+  controlGroupInputToRawControlGroupAttributes,
+  rawControlGroupAttributesToControlGroupInput,
+  rawControlGroupAttributesToSerializable,
+  serializableToRawControlGroupAttributes,
+  persistableControlGroupInputIsEqual,
+  getDefaultControlGroupInput,
+} from './control_group/control_group_persistence';
+export {
+  DEFAULT_CONTROL_WIDTH,
+  DEFAULT_CONTROL_STYLE,
+} from './control_group/control_group_constants';
 
+// Control Type exports
+export {
+  OPTIONS_LIST_CONTROL,
+  type OptionsListEmbeddableInput,
+} from './control_types/options_list/types';
+export {
+  type RangeSliderEmbeddableInput,
+  RANGE_SLIDER_CONTROL,
+} from './control_types/range_slider/types';
 export { TIME_SLIDER_CONTROL } from './control_types/time_slider/types';
diff --git a/src/plugins/controls/common/types.ts b/src/plugins/controls/common/types.ts
index d8cb073f64241..abb24299e8180 100644
--- a/src/plugins/controls/common/types.ts
+++ b/src/plugins/controls/common/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { Filter, Query } from '@kbn/es-query';
-import { TimeRange } from '../../data/common';
-import { EmbeddableInput } from '../../embeddable/common/types';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types';
 
 export type ControlWidth = 'auto' | 'small' | 'medium' | 'large';
 export type ControlStyle = 'twoLine' | 'oneLine';
@@ -27,3 +27,8 @@ export type ControlInput = EmbeddableInput & {
   controlStyle?: ControlStyle;
   ignoreParentSettings?: ParentIgnoreSettings;
 };
+
+export type DataControlInput = ControlInput & {
+  fieldName: string;
+  dataViewId: string;
+};
diff --git a/src/plugins/controls/kibana.json b/src/plugins/controls/kibana.json
index 20afd63505a73..e87af3f517af2 100644
--- a/src/plugins/controls/kibana.json
+++ b/src/plugins/controls/kibana.json
@@ -17,7 +17,8 @@
     "expressions",
     "embeddable",
     "dataViews",
-    "data"
+    "data",
+    "unifiedSearch"
   ],
   "optionalPlugins": []
 }
diff --git a/src/plugins/controls/public/__stories__/controls.stories.tsx b/src/plugins/controls/public/__stories__/controls.stories.tsx
index 12e595f483e04..481016af72a36 100644
--- a/src/plugins/controls/public/__stories__/controls.stories.tsx
+++ b/src/plugins/controls/public/__stories__/controls.stories.tsx
@@ -15,23 +15,23 @@ import {
   getFlightOptionsAsync,
   getFlightSearchOptions,
   storybookFlightsDataView,
-} from '../../../presentation_util/public/mocks';
+} from '@kbn/presentation-util-plugin/public/mocks';
+
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 import {
   ControlGroupContainerFactory,
   OptionsListEmbeddableInput,
   RangeSliderEmbeddableInput,
   OPTIONS_LIST_CONTROL,
   RANGE_SLIDER_CONTROL,
-} from '../';
-
-import { ViewMode } from '../../../embeddable/public';
-import { EmbeddablePersistableStateService } from '../../../embeddable/common';
+} from '..';
 
 import { decorators } from './decorators';
 import { ControlsPanels } from '../control_group/types';
 import { ControlGroupContainer } from '../control_group';
 import { pluginServices, registry } from '../services/storybook';
-import { replaceValueSuggestionMethod } from '../services/storybook/data';
+import { replaceValueSuggestionMethod } from '../services/storybook/unified_search';
 import { injectStorybookDataView } from '../services/storybook/data_views';
 import { populateStorybookControlFactories } from './storybook_control_factories';
 import { OptionsListRequest } from '../services/options_list';
diff --git a/src/plugins/controls/public/control_group/component/control_frame_component.tsx b/src/plugins/controls/public/control_group/component/control_frame_component.tsx
index 8ae1aac7867d0..36879bea110d8 100644
--- a/src/plugins/controls/public/control_group/component/control_frame_component.tsx
+++ b/src/plugins/controls/public/control_group/component/control_frame_component.tsx
@@ -17,12 +17,12 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
 import { pluginServices } from '../../services';
 import { EditControlButton } from '../editor/edit_control';
 import { ControlGroupStrings } from '../control_group_strings';
 import { useChildEmbeddable } from '../../hooks/use_child_embeddable';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 
 export interface ControlFrameProps {
   customPrepend?: JSX.Element;
diff --git a/src/plugins/controls/public/control_group/component/control_group_component.tsx b/src/plugins/controls/public/control_group/component/control_group_component.tsx
index 3bc82c0f2aae7..3abee52002db1 100644
--- a/src/plugins/controls/public/control_group/component/control_group_component.tsx
+++ b/src/plugins/controls/public/control_group/component/control_group_component.tsx
@@ -28,11 +28,11 @@ import {
   useSensors,
   LayoutMeasuringStrategy,
 } from '@dnd-kit/core';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
-import { ViewMode } from '../../../../embeddable/public';
 import { controlGroupReducers } from '../state/control_group_reducers';
 import { ControlClone, SortableControl } from './control_group_sortable_item';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 
 export const ControlGroup = () => {
   // Redux embeddable container Context
diff --git a/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx b/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
index 7f7944c8ca319..2741752b4df88 100644
--- a/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
+++ b/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
@@ -12,9 +12,9 @@ import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import classNames from 'classnames';
 
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
 import { ControlFrame, ControlFrameProps } from './control_frame_component';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 
 interface DragInfo {
   isOver?: boolean;
diff --git a/src/plugins/controls/public/control_group/editor/control_editor.tsx b/src/plugins/controls/public/control_group/editor/control_editor.tsx
index 269c39a7cbf9e..3cd5b92e503c1 100644
--- a/src/plugins/controls/public/control_group/editor/control_editor.tsx
+++ b/src/plugins/controls/public/control_group/editor/control_editor.tsx
@@ -35,6 +35,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
+import { EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import {
   ControlEmbeddable,
@@ -44,7 +45,6 @@ import {
 } from '../../types';
 import { CONTROL_WIDTH_OPTIONS } from './editor_constants';
 import { pluginServices } from '../../services';
-import { EmbeddableFactoryDefinition } from '../../../../embeddable/public';
 
 interface EditControlProps {
   embeddable?: ControlEmbeddable;
diff --git a/src/plugins/controls/public/control_group/editor/control_group_editor.tsx b/src/plugins/controls/public/control_group/editor/control_group_editor.tsx
index 95e2066541b5f..8917769f6b151 100644
--- a/src/plugins/controls/public/control_group/editor/control_group_editor.tsx
+++ b/src/plugins/controls/public/control_group/editor/control_group_editor.tsx
@@ -44,10 +44,7 @@ import { ControlStyle, ControlWidth } from '../../types';
 import { ParentIgnoreSettings } from '../..';
 import { ControlsPanels } from '../types';
 import { ControlGroupInput } from '..';
-import {
-  DEFAULT_CONTROL_WIDTH,
-  getDefaultControlGroupInput,
-} from '../../../common/control_group/control_group_constants';
+import { DEFAULT_CONTROL_WIDTH, getDefaultControlGroupInput } from '../../../common';
 
 interface EditControlGroupProps {
   initialInput: ControlGroupInput;
diff --git a/src/plugins/controls/public/control_group/editor/create_control.tsx b/src/plugins/controls/public/control_group/editor/create_control.tsx
index 7ae0416feac2e..085f0d21e7dc0 100644
--- a/src/plugins/controls/public/control_group/editor/create_control.tsx
+++ b/src/plugins/controls/public/control_group/editor/create_control.tsx
@@ -9,12 +9,12 @@
 import { EuiButton, EuiContextMenuItem } from '@elastic/eui';
 import React from 'react';
 
+import { OverlayRef } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../../services';
 import { ControlEditor } from './control_editor';
-import { OverlayRef } from '../../../../../core/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { ControlWidth, ControlInput, IEditableControlFactory } from '../../types';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { DEFAULT_CONTROL_WIDTH } from '../../../common/control_group/control_group_constants';
 import { setFlyoutRef } from '../embeddable/control_group_container';
 
diff --git a/src/plugins/controls/public/control_group/editor/edit_control.tsx b/src/plugins/controls/public/control_group/editor/edit_control.tsx
index 7c114350f3679..11a2e705a13f3 100644
--- a/src/plugins/controls/public/control_group/editor/edit_control.tsx
+++ b/src/plugins/controls/public/control_group/editor/edit_control.tsx
@@ -10,16 +10,16 @@ import { isEqual } from 'lodash';
 import { EuiButtonIcon } from '@elastic/eui';
 import React, { useEffect, useRef } from 'react';
 
+import { OverlayRef } from '@kbn/core/public';
+import { EmbeddableFactoryNotFoundError } from '@kbn/embeddable-plugin/public';
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
 import { ControlEditor } from './control_editor';
 import { pluginServices } from '../../services';
 import { forwardAllContext } from './forward_all_context';
-import { OverlayRef } from '../../../../../core/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { IEditableControlFactory, ControlInput } from '../../types';
 import { controlGroupReducers } from '../state/control_group_reducers';
-import { EmbeddableFactoryNotFoundError } from '../../../../embeddable/public';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 import { ControlGroupContainer, setFlyoutRef } from '../embeddable/control_group_container';
 
 export const EditControlButton = ({ embeddableId }: { embeddableId: string }) => {
diff --git a/src/plugins/controls/public/control_group/editor/edit_control_group.tsx b/src/plugins/controls/public/control_group/editor/edit_control_group.tsx
index 8d9f81637ef65..733d009878937 100644
--- a/src/plugins/controls/public/control_group/editor/edit_control_group.tsx
+++ b/src/plugins/controls/public/control_group/editor/edit_control_group.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { EuiContextMenuItem } from '@elastic/eui';
 
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { OverlayRef } from '@kbn/core/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { ControlGroupEditor } from './control_group_editor';
-import { OverlayRef } from '../../../../../core/public';
 import { pluginServices } from '../../services';
 import { ControlGroupContainer } from '..';
 import { setFlyoutRef } from '../embeddable/control_group_container';
diff --git a/src/plugins/controls/public/control_group/editor/forward_all_context.tsx b/src/plugins/controls/public/control_group/editor/forward_all_context.tsx
index 23d7e60573323..1d700b036fdcd 100644
--- a/src/plugins/controls/public/control_group/editor/forward_all_context.tsx
+++ b/src/plugins/controls/public/control_group/editor/forward_all_context.tsx
@@ -9,13 +9,13 @@
 import { ReactElement } from 'react';
 import React from 'react';
 
-import { ControlGroupInput } from '../types';
-import { pluginServices } from '../../services';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   ReduxContainerContextServices,
   ReduxEmbeddableContext,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { ControlGroupInput } from '../types';
+import { pluginServices } from '../../services';
 
 /**
  * The overlays service creates its divs outside the flow of the component. This necessitates
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
index 263343e299a9c..08f91cc0d613e 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
@@ -9,9 +9,9 @@
 import { Filter } from '@kbn/es-query';
 
 import { Subject } from 'rxjs';
+import { EmbeddableContainerSettings, isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 import { ControlEmbeddable } from '../../types';
 import { ChildEmbeddableOrderCache } from './control_group_container';
-import { EmbeddableContainerSettings, isErrorEmbeddable } from '../../../../embeddable/public';
 import { ControlGroupChainingSystem, ControlGroupInput } from '../../../common/control_group/types';
 
 interface GetPrecedingFiltersProps {
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx b/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
index 5ee41946a14aa..7d892d2a90d0e 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
@@ -23,6 +23,15 @@ import {
   mapTo,
 } from 'rxjs/operators';
 
+import {
+  withSuspense,
+  LazyReduxEmbeddableWrapper,
+  ReduxEmbeddableWrapperPropsWithChildren,
+  SolutionToolbarPopover,
+} from '@kbn/presentation-util-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { Container, EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { OverlayRef } from '@kbn/core/public';
 import {
   ControlGroupInput,
   ControlGroupOutput,
@@ -30,23 +39,14 @@ import {
   ControlsPanels,
   CONTROL_GROUP_TYPE,
 } from '../types';
-import {
-  withSuspense,
-  LazyReduxEmbeddableWrapper,
-  ReduxEmbeddableWrapperPropsWithChildren,
-  SolutionToolbarPopover,
-} from '../../../../presentation_util/public';
 import { pluginServices } from '../../services';
-import { DataView } from '../../../../data_views/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { EditControlGroup } from '../editor/edit_control_group';
 import { ControlGroup } from '../component/control_group_component';
 import { controlGroupReducers } from '../state/control_group_reducers';
-import { Container, EmbeddableFactory } from '../../../../embeddable/public';
 import { ControlEmbeddable, ControlInput, ControlOutput } from '../../types';
 import { ControlGroupChainingSystems } from './control_group_chaining_system';
 import { CreateControlButton, CreateControlButtonTypes } from '../editor/create_control';
-import { OverlayRef } from '../../../../../core/public';
 
 const ControlGroupReduxWrapper = withSuspense<
   ReduxEmbeddableWrapperPropsWithChildren<ControlGroupInput>
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts b/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
index 11bf0bbc4aa7f..f55c49101dc40 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
@@ -14,8 +14,8 @@
  * Side Public License, v 1.
  */
 
-import { Container, EmbeddableFactoryDefinition } from '../../../../embeddable/public';
-import { EmbeddablePersistableStateService } from '../../../../embeddable/common';
+import { Container, EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { ControlGroupInput, CONTROL_GROUP_TYPE } from '../types';
 import { ControlGroupStrings } from '../control_group_strings';
@@ -23,7 +23,7 @@ import {
   createControlGroupExtract,
   createControlGroupInject,
 } from '../../../common/control_group/control_group_persistable_state';
-import { getDefaultControlGroupInput } from '../../../common/control_group/control_group_constants';
+import { getDefaultControlGroupInput } from '../../../common';
 
 export class ControlGroupContainerFactory implements EmbeddableFactoryDefinition {
   public readonly isContainerType = true;
diff --git a/src/plugins/controls/public/control_group/types.ts b/src/plugins/controls/public/control_group/types.ts
index 5f6ec00efffab..05422fd0c9729 100644
--- a/src/plugins/controls/public/control_group/types.ts
+++ b/src/plugins/controls/public/control_group/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { ContainerOutput } from '@kbn/embeddable-plugin/public';
 import { CommonControlOutput } from '../types';
-import { ContainerOutput } from '../../../embeddable/public';
 
 export type ControlGroupOutput = ContainerOutput & CommonControlOutput;
 
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_component.tsx b/src/plugins/controls/public/control_types/options_list/options_list_component.tsx
index 3e3d950f532db..5d72e1eb2564c 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_component.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_component.tsx
@@ -12,15 +12,15 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import classNames from 'classnames';
 import { debounce, isEmpty } from 'lodash';
 
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { OptionsListStrings } from './options_list_strings';
 import { optionsListReducers } from './options_list_reducers';
 import { OptionsListPopover } from './options_list_popover_component';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
 
 import './options_list.scss';
 import { useStateObservable } from '../../hooks/use_state_observable';
 import { OptionsListEmbeddableInput } from './types';
-import { DataViewField } from '../../../../data_views/public';
 
 // OptionsListComponentState is controlled by the embeddable, but is not considered embeddable input.
 export interface OptionsListComponentState {
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx b/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
index 7fe50f010c5b4..d77cf2b2c1a71 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
@@ -10,16 +10,16 @@ import useMount from 'react-use/lib/useMount';
 import React, { useEffect, useState } from 'react';
 import { EuiFormRow, EuiSwitch } from '@elastic/eui';
 
-import { pluginServices } from '../../services';
-import { ControlEditorProps } from '../../types';
-import { OptionsListEmbeddableInput } from './types';
-import { OptionsListStrings } from './options_list_strings';
-import { DataViewListItem, DataView } from '../../../../data_views/common';
+import { DataViewListItem, DataView } from '@kbn/data-views-plugin/common';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { pluginServices } from '../../services';
+import { ControlEditorProps } from '../../types';
+import { OptionsListEmbeddableInput } from './types';
+import { OptionsListStrings } from './options_list_strings';
 
 interface OptionsListEditorState {
   singleSelect?: boolean;
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx b/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx
index 0f5a7524db02b..b315fd00392ea 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx
@@ -20,20 +20,20 @@ import deepEqual from 'fast-deep-equal';
 import { merge, Subject, Subscription, BehaviorSubject } from 'rxjs';
 import { tap, debounceTime, map, distinctUntilChanged, skip } from 'rxjs/operators';
 
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import {
+  withSuspense,
+  LazyReduxEmbeddableWrapper,
+  ReduxEmbeddableWrapperPropsWithChildren,
+} from '@kbn/presentation-util-plugin/public';
 import { OptionsListComponent, OptionsListComponentState } from './options_list_component';
 import { OptionsListEmbeddableInput, OPTIONS_LIST_CONTROL } from './types';
-import { DataView, DataViewField } from '../../../../data_views/public';
-import { Embeddable, IContainer } from '../../../../embeddable/public';
 import { ControlsDataViewsService } from '../../services/data_views';
 import { optionsListReducers } from './options_list_reducers';
 import { OptionsListStrings } from './options_list_strings';
 import { ControlInput, ControlOutput } from '../..';
 import { pluginServices } from '../../services';
-import {
-  withSuspense,
-  LazyReduxEmbeddableWrapper,
-  ReduxEmbeddableWrapperPropsWithChildren,
-} from '../../../../presentation_util/public';
 import { ControlsOptionsListService } from '../../services/options_list';
 
 const OptionsListReduxWrapper = withSuspense<
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx b/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
index 59a56d1fdb2a2..242036ae69c02 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import deepEqual from 'fast-deep-equal';
 
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { OptionsListEditor } from './options_list_editor';
 import { ControlEmbeddable, IEditableControlFactory } from '../../types';
 import { OptionsListEmbeddableInput, OPTIONS_LIST_CONTROL } from './types';
-import { EmbeddableFactoryDefinition, IContainer } from '../../../../embeddable/public';
 import {
   createOptionsListExtract,
   createOptionsListInject,
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx b/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx
index ab83b868445a9..aa6b14c73f6e1 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx
@@ -23,12 +23,12 @@ import {
 } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { OptionsListEmbeddableInput } from './types';
 import { OptionsListStrings } from './options_list_strings';
-import { DataViewField } from '../../../../data_views/public';
 import { optionsListReducers } from './options_list_reducers';
 import { OptionsListComponentState } from './options_list_component';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
 
 export const OptionsListPopover = ({
   field,
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
index 822c88ca10df0..259b6bd7f66a1 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import React, { FC, useCallback, useState } from 'react';
+import React, { FC, useCallback } from 'react';
 import { BehaviorSubject } from 'rxjs';
 
-import { DataViewField } from '../../../../data_views/public';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { useStateObservable } from '../../hooks/use_state_observable';
 import { RangeSliderPopover } from './range_slider_popover';
 import { rangeSliderReducers } from './range_slider_reducers';
@@ -45,16 +45,13 @@ export const RangeSliderComponent: FC<Props> = ({ componentStateSubject }) => {
     componentStateSubject.getValue()
   );
 
-  const { value = ['', ''], id, title } = useEmbeddableSelector((state) => state);
-
-  const [selectedValue, setSelectedValue] = useState<RangeValue>(value || ['', '']);
+  const { value, id, title } = useEmbeddableSelector((state) => state);
 
   const onChangeComplete = useCallback(
     (range: RangeValue) => {
       dispatch(selectRange(range));
-      setSelectedValue(range);
     },
-    [selectRange, setSelectedValue, dispatch]
+    [selectRange, dispatch]
   );
 
   return (
@@ -64,7 +61,7 @@ export const RangeSliderComponent: FC<Props> = ({ componentStateSubject }) => {
       min={min}
       max={max}
       title={title}
-      value={selectedValue}
+      value={value ?? ['', '']}
       onChange={onChangeComplete}
       fieldFormatter={fieldFormatter}
     />
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
index d8ec5ae933c9f..fa0c2c7d3cc45 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
@@ -10,16 +10,16 @@ import useMount from 'react-use/lib/useMount';
 import React, { useEffect, useState } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 
-import { pluginServices } from '../../services';
-import { ControlEditorProps } from '../../types';
-import { RangeSliderEmbeddableInput } from './types';
-import { RangeSliderStrings } from './range_slider_strings';
-import { DataViewListItem, DataView } from '../../../../data_views/common';
+import { DataViewListItem, DataView } from '@kbn/data-views-plugin/common';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { pluginServices } from '../../services';
+import { ControlEditorProps } from '../../types';
+import { RangeSliderEmbeddableInput } from './types';
+import { RangeSliderStrings } from './range_slider_strings';
 
 interface RangeSliderEditorState {
   dataViewListItems: DataViewListItem[];
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
index 965eb2da18e93..1ad34fd361ac6 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
@@ -24,9 +24,9 @@ import {
   withSuspense,
   LazyReduxEmbeddableWrapper,
   ReduxEmbeddableWrapperPropsWithChildren,
-} from '../../../../presentation_util/public';
-import { Embeddable, IContainer } from '../../../../embeddable/public';
-import { DataView, DataViewField } from '../../../../data_views/public';
+} from '@kbn/presentation-util-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 import { ControlsDataViewsService } from '../../services/data_views';
 import { ControlsDataService } from '../../services/data';
@@ -311,7 +311,7 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
     this.updateOutput({ filters: [rangeFilter], dataViews: [dataView], loading: false });
   };
 
-  reload = () => {
+  public reload = () => {
     this.fetchMinMax();
   };
 
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
index fbdaff4f5b349..bd8b8a394988b 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import deepEqual from 'fast-deep-equal';
 
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { RangeSliderEditor } from './range_slider_editor';
 import { ControlEmbeddable, IEditableControlFactory } from '../../types';
 import { RangeSliderEmbeddableInput, RANGE_SLIDER_CONTROL } from './types';
-import { EmbeddableFactoryDefinition, IContainer } from '../../../../embeddable/public';
 import {
   createRangeSliderExtract,
   createRangeSliderInject,
@@ -37,8 +37,8 @@ export class RangeSliderEmbeddableFactory
   ) => {
     if (
       embeddable &&
-      (!deepEqual(newInput.fieldName, embeddable.getInput().fieldName) ||
-        !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId))
+      ((newInput.fieldName && !deepEqual(newInput.fieldName, embeddable.getInput().fieldName)) ||
+        (newInput.dataViewId && !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId)))
     ) {
       // if the field name or data view id has changed in this editing session, selected values are invalid, so reset them.
       newInput.value = ['', ''];
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx
index 5aab250136ac1..89efce270d14c 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx
@@ -21,8 +21,8 @@ import {
 } from '@elastic/eui';
 import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks';
 import moment from 'moment-timezone';
-import { calcAutoIntervalNear } from '../../../../data/common';
-import { ValidatedDualRange } from '../../../../kibana_react/public';
+import { calcAutoIntervalNear } from '@kbn/data-plugin/common';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { TimeSliderStrings } from './time_slider_strings';
 import './time_slider.component.scss';
 
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
index d2198416fdc42..d25d4f145a99d 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import React, { FC, useCallback, useState, useMemo } from 'react';
+import React, { FC, useCallback, useMemo } from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { debounce } from 'lodash';
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { useStateObservable } from '../../hooks/use_state_observable';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
 import { TimeSliderControlEmbeddableInput } from '../../../common/control_types/time_slider/types';
 import { timeSliderReducers } from './time_slider_reducers';
 import { TimeSlider as Component } from './time_slider.component';
@@ -59,10 +59,6 @@ export const TimeSlider: FC<TimeSliderProps> = ({
 
   const { value } = useEmbeddableSelector((state) => state);
 
-  const [selectedValue, setSelectedValue] = useState<[number | null, number | null]>(
-    value || [null, null]
-  );
-
   const dispatchChange = useCallback(
     (range: [number | null, number | null]) => {
       dispatch(selectRange(range));
@@ -75,15 +71,14 @@ export const TimeSlider: FC<TimeSliderProps> = ({
   const onChangeComplete = useCallback(
     (range: [number | null, number | null]) => {
       debouncedDispatchChange(range);
-      setSelectedValue(range);
     },
-    [setSelectedValue, debouncedDispatchChange]
+    [debouncedDispatchChange]
   );
 
   return (
     <Component
       onChange={onChangeComplete}
-      value={selectedValue}
+      value={value ?? [null, null]}
       range={[min, max]}
       dateFormat={dateFormat}
       timezone={timezone}
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
index 4674db37a3729..e9616abcbe13f 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
@@ -10,14 +10,14 @@ import useMount from 'react-use/lib/useMount';
 import React, { useEffect, useState } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 
-import { pluginServices } from '../../services';
-import { ControlEditorProps } from '../../types';
-import { DataViewListItem, DataView } from '../../../../data_views/common';
+import { DataViewListItem, DataView } from '@kbn/data-views-plugin/common';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { pluginServices } from '../../services';
+import { ControlEditorProps } from '../../types';
 import { TimeSliderStrings } from './time_slider_strings';
 
 interface TimeSliderEditorState {
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts
index c4a42e6b03e2c..b4c1f3ce5c7c0 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts
@@ -10,7 +10,7 @@ import { of } from 'rxjs';
 import { delay, map } from 'rxjs/operators';
 import { TimeSliderControlEmbeddableInput } from '.';
 import { TimeSliderControlEmbeddable } from './time_slider_embeddable';
-import { stubLogstashDataView } from '../../../../data_views/common/data_view.stub';
+import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 import { pluginServices } from '../../services';
 import { TestScheduler } from 'rxjs/testing';
 import { buildRangeFilter } from '@kbn/es-query';
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
index fcc8b6652f992..7900cc193ac24 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
@@ -14,19 +14,18 @@ import deepEqual from 'fast-deep-equal';
 import { merge, Subscription, BehaviorSubject, Observable } from 'rxjs';
 import { map, distinctUntilChanged, skip, take, mergeMap } from 'rxjs/operators';
 
-import { TimeSliderControlEmbeddableInput } from '../../../common/control_types/time_slider/types';
-
 import {
   withSuspense,
   LazyReduxEmbeddableWrapper,
   ReduxEmbeddableWrapperPropsWithChildren,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { TimeSliderControlEmbeddableInput } from '../../../common/control_types/time_slider/types';
 
-import { TIME_SLIDER_CONTROL } from '../../';
+import { TIME_SLIDER_CONTROL } from '../..';
 import { ControlsSettingsService } from '../../services/settings';
-import { Embeddable, IContainer } from '../../../../embeddable/public';
 import { ControlsDataService } from '../../services/data';
-import { DataView } from '../../../../data_views/public';
 import { ControlOutput } from '../..';
 import { pluginServices } from '../../services';
 
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
index 23003a9e90641..a49a0b85818f2 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
@@ -8,9 +8,9 @@
 
 import deepEqual from 'fast-deep-equal';
 
-import { TIME_SLIDER_CONTROL } from '../../';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
+import { TIME_SLIDER_CONTROL } from '../..';
 import { ControlEmbeddable, IEditableControlFactory } from '../../types';
-import { EmbeddableFactoryDefinition, IContainer } from '../../../../embeddable/public';
 import {
   createOptionsListExtract,
   createOptionsListInject,
@@ -39,8 +39,8 @@ export class TimesliderEmbeddableFactory
   ) => {
     if (
       embeddable &&
-      (!deepEqual(newInput.fieldName, embeddable.getInput().fieldName) ||
-        !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId))
+      ((newInput.fieldName && !deepEqual(newInput.fieldName, embeddable.getInput().fieldName)) ||
+        (newInput.dataViewId && !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId)))
     ) {
       // if the field name or data view id has changed in this editing session, selected options are invalid, so reset them.
       newInput.value = undefined;
diff --git a/src/plugins/controls/public/controls_service.ts b/src/plugins/controls/public/controls_service.ts
index 69efacbef2915..e13b591bfa91e 100644
--- a/src/plugins/controls/public/controls_service.ts
+++ b/src/plugins/controls/public/controls_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlInput, ControlOutput } from '.';
-import { EmbeddableFactory } from '../../embeddable/public';
 import { ControlTypeRegistry } from './services/controls';
 
 export class ControlsService {
diff --git a/src/plugins/controls/public/plugin.ts b/src/plugins/controls/public/plugin.ts
index b583f14d94ddd..51705640b06f2 100644
--- a/src/plugins/controls/public/plugin.ts
+++ b/src/plugins/controls/public/plugin.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { pluginServices } from './services';
 import {
   ControlsPluginSetup,
@@ -36,7 +37,6 @@ import {
   TimeSliderControlEmbeddableInput,
 } from './control_types/time_slider';
 import { controlsService } from './services/kibana/controls';
-import { EmbeddableFactory } from '../../embeddable/public';
 
 export class ControlsPlugin
   implements
diff --git a/src/plugins/controls/public/services/controls.ts b/src/plugins/controls/public/services/controls.ts
index 7ca396b267e14..5d6731922e6d9 100644
--- a/src/plugins/controls/public/services/controls.ts
+++ b/src/plugins/controls/public/services/controls.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableFactory } from '../../../embeddable/public';
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlOutput, ControlInput } from '../types';
 
 export interface ControlTypeRegistry {
diff --git a/src/plugins/controls/public/services/data.ts b/src/plugins/controls/public/services/data.ts
index 57c2342beb425..4e9db3b68e904 100644
--- a/src/plugins/controls/public/services/data.ts
+++ b/src/plugins/controls/public/services/data.ts
@@ -7,8 +7,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ControlInput } from '../types';
 
 export interface ControlsDataService {
@@ -24,7 +24,6 @@ export interface ControlsDataService {
   ) => Observable<{ min?: number; max?: number }>;
   getDataView: DataPublicPluginStart['dataViews']['get'];
   getDataView$: (id: string) => Observable<DataView>;
-  autocomplete: DataPublicPluginStart['autocomplete'];
   query: DataPublicPluginStart['query'];
   searchSource: DataPublicPluginStart['search']['searchSource'];
   timefilter: DataPublicPluginStart['query']['timefilter']['timefilter'];
diff --git a/src/plugins/controls/public/services/data_views.ts b/src/plugins/controls/public/services/data_views.ts
index 2308366e27660..bed8f12f88481 100644
--- a/src/plugins/controls/public/services/data_views.ts
+++ b/src/plugins/controls/public/services/data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export interface ControlsDataViewsService {
   get: DataViewsPublicPluginStart['get'];
diff --git a/src/plugins/controls/public/services/http.ts b/src/plugins/controls/public/services/http.ts
index 1e3d7f92163bd..ce75c4b75a3d0 100644
--- a/src/plugins/controls/public/services/http.ts
+++ b/src/plugins/controls/public/services/http.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from '../../../../core/public';
+import { CoreSetup } from '@kbn/core/public';
 
 export interface ControlsHTTPService {
   fetch: CoreSetup['http']['fetch'];
diff --git a/src/plugins/controls/public/services/index.ts b/src/plugins/controls/public/services/index.ts
index 1a8c8b0c4bdfe..ac2e8374ad06b 100644
--- a/src/plugins/controls/public/services/index.ts
+++ b/src/plugins/controls/public/services/index.ts
@@ -6,12 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { PluginServices } from '../../../presentation_util/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 import { ControlsDataViewsService } from './data_views';
 import { ControlsOverlaysService } from './overlays';
 import { registry as stubRegistry } from './stub';
 import { ControlsPluginStart } from '../types';
 import { ControlsDataService } from './data';
+import { ControlsUnifiedSearchService } from './unified_search';
 import { ControlsService } from './controls';
 import { ControlsHTTPService } from './http';
 import { ControlsOptionsListService } from './options_list';
@@ -22,6 +23,7 @@ export interface ControlsServices {
   dataViews: ControlsDataViewsService;
   overlays: ControlsOverlaysService;
   data: ControlsDataService;
+  unifiedSearch: ControlsUnifiedSearchService;
   http: ControlsHTTPService;
   settings: ControlsSettingsService;
 
diff --git a/src/plugins/controls/public/services/kibana/controls.ts b/src/plugins/controls/public/services/kibana/controls.ts
index 8b53c62ff0f4e..6cb9e3a564e91 100644
--- a/src/plugins/controls/public/services/kibana/controls.ts
+++ b/src/plugins/controls/public/services/kibana/controls.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlInput, ControlOutput } from '../..';
-import { EmbeddableFactory } from '../../../../embeddable/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
 import { ControlsService, ControlTypeRegistry } from '../controls';
 
 export type ControlsServiceFactory = PluginServiceFactory<ControlsService>;
diff --git a/src/plugins/controls/public/services/kibana/data.ts b/src/plugins/controls/public/services/kibana/data.ts
index 9eb981d90c237..29a96a98c7e76 100644
--- a/src/plugins/controls/public/services/kibana/data.ts
+++ b/src/plugins/controls/public/services/kibana/data.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from 'src/plugins/data_views/common';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { get } from 'lodash';
 import { from } from 'rxjs';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsDataService } from '../data';
 import { ControlsPluginStartDeps } from '../../types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type DataServiceFactory = KibanaPluginServiceFactory<
   ControlsDataService,
@@ -43,7 +43,7 @@ const minMaxAgg = (field?: DataViewField) => {
 
 export const dataServiceFactory: DataServiceFactory = ({ startPlugins }) => {
   const {
-    data: { query: queryPlugin, search, autocomplete },
+    data: { query: queryPlugin, search },
   } = startPlugins;
   const { data } = startPlugins;
 
@@ -95,7 +95,6 @@ export const dataServiceFactory: DataServiceFactory = ({ startPlugins }) => {
       from(fetchFieldRange(dataView, fieldName, input)),
     getDataView: data.dataViews.get,
     getDataView$: (id: string) => from(data.dataViews.get(id)),
-    autocomplete,
     query: queryPlugin,
     searchSource: search.searchSource,
     timefilter: queryPlugin.timefilter.timefilter,
diff --git a/src/plugins/controls/public/services/kibana/data_views.ts b/src/plugins/controls/public/services/kibana/data_views.ts
index c878423390a64..255abf1982f1e 100644
--- a/src/plugins/controls/public/services/kibana/data_views.ts
+++ b/src/plugins/controls/public/services/kibana/data_views.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsDataViewsService } from '../data_views';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type DataViewsServiceFactory = KibanaPluginServiceFactory<
   ControlsDataViewsService,
diff --git a/src/plugins/controls/public/services/kibana/http.ts b/src/plugins/controls/public/services/kibana/http.ts
index 2eda2e4bf3f8c..8cf20652c506a 100644
--- a/src/plugins/controls/public/services/kibana/http.ts
+++ b/src/plugins/controls/public/services/kibana/http.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsHTTPService } from '../http';
 import { ControlsPluginStartDeps } from '../../types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type HttpServiceFactory = KibanaPluginServiceFactory<
   ControlsHTTPService,
diff --git a/src/plugins/controls/public/services/kibana/index.ts b/src/plugins/controls/public/services/kibana/index.ts
index 19a2c0891ac8f..1bb8f600ecf81 100644
--- a/src/plugins/controls/public/services/kibana/index.ts
+++ b/src/plugins/controls/public/services/kibana/index.ts
@@ -11,7 +11,7 @@ import {
   KibanaPluginServiceParams,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsServices } from '..';
 
@@ -22,6 +22,7 @@ import { dataServiceFactory } from './data';
 import { httpServiceFactory } from './http';
 import { optionsListServiceFactory } from './options_list';
 import { settingsServiceFactory } from './settings';
+import { unifiedSearchServiceFactory } from './unified_search';
 
 export const providers: PluginServiceProviders<
   ControlsServices,
@@ -29,6 +30,7 @@ export const providers: PluginServiceProviders<
 > = {
   http: new PluginServiceProvider(httpServiceFactory),
   data: new PluginServiceProvider(dataServiceFactory),
+  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
   overlays: new PluginServiceProvider(overlaysServiceFactory),
   dataViews: new PluginServiceProvider(dataViewsServiceFactory),
   settings: new PluginServiceProvider(settingsServiceFactory),
diff --git a/src/plugins/controls/public/services/kibana/options_list.ts b/src/plugins/controls/public/services/kibana/options_list.ts
index a731b0acca62b..54bd33f5890bd 100644
--- a/src/plugins/controls/public/services/kibana/options_list.ts
+++ b/src/plugins/controls/public/services/kibana/options_list.ts
@@ -10,13 +10,13 @@ import { memoize } from 'lodash';
 import dateMath from '@kbn/datemath';
 import { buildEsQuery } from '@kbn/es-query';
 
-import { TimeRange } from '../../../../data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsOptionsListService, OptionsListRequest } from '../options_list';
 import {
   OptionsListRequestBody,
   OptionsListResponse,
 } from '../../control_types/options_list/types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsDataService } from '../data';
 import { ControlsHTTPService } from '../http';
diff --git a/src/plugins/controls/public/services/kibana/overlays.ts b/src/plugins/controls/public/services/kibana/overlays.ts
index 43b8bd61ccb4a..dc6435f319e5e 100644
--- a/src/plugins/controls/public/services/kibana/overlays.ts
+++ b/src/plugins/controls/public/services/kibana/overlays.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsOverlaysService } from '../overlays';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type OverlaysServiceFactory = KibanaPluginServiceFactory<
   ControlsOverlaysService,
diff --git a/src/plugins/controls/public/services/kibana/settings.ts b/src/plugins/controls/public/services/kibana/settings.ts
index 27e308f19693b..e62c92cf7db1a 100644
--- a/src/plugins/controls/public/services/kibana/settings.ts
+++ b/src/plugins/controls/public/services/kibana/settings.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsSettingsService } from '../settings';
 import { ControlsPluginStartDeps } from '../../types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type SettingsServiceFactory = KibanaPluginServiceFactory<
   ControlsSettingsService,
diff --git a/src/plugins/controls/public/services/kibana/unified_search.ts b/src/plugins/controls/public/services/kibana/unified_search.ts
new file mode 100644
index 0000000000000..15cb3a02ca45e
--- /dev/null
+++ b/src/plugins/controls/public/services/kibana/unified_search.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { ControlsUnifiedSearchService } from '../unified_search';
+import { ControlsPluginStartDeps } from '../../types';
+
+export type UnifiedSearchServiceFactory = KibanaPluginServiceFactory<
+  ControlsUnifiedSearchService,
+  ControlsPluginStartDeps
+>;
+
+export const unifiedSearchServiceFactory: UnifiedSearchServiceFactory = ({ startPlugins }) => {
+  const {
+    unifiedSearch: { autocomplete },
+  } = startPlugins;
+
+  return {
+    autocomplete,
+  };
+};
diff --git a/src/plugins/controls/public/services/options_list.ts b/src/plugins/controls/public/services/options_list.ts
index 479d1bee691bb..e133dc1362698 100644
--- a/src/plugins/controls/public/services/options_list.ts
+++ b/src/plugins/controls/public/services/options_list.ts
@@ -8,8 +8,8 @@
 
 import { Filter, Query } from '@kbn/es-query';
 
-import { TimeRange } from '../../../data/public';
-import { DataView, DataViewField } from '../../../data_views/public';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { OptionsListRequestBody, OptionsListResponse } from '../control_types/options_list/types';
 
 export type OptionsListRequest = Omit<
diff --git a/src/plugins/controls/public/services/overlays.ts b/src/plugins/controls/public/services/overlays.ts
index 9a30fca209c2f..9c18bbbdb2929 100644
--- a/src/plugins/controls/public/services/overlays.ts
+++ b/src/plugins/controls/public/services/overlays.ts
@@ -11,7 +11,7 @@ import {
   OverlayFlyoutOpenOptions,
   OverlayModalConfirmOptions,
   OverlayRef,
-} from '../../../../core/public';
+} from '@kbn/core/public';
 
 export interface ControlsOverlaysService {
   openFlyout(mount: MountPoint, options?: OverlayFlyoutOpenOptions): OverlayRef;
diff --git a/src/plugins/controls/public/services/storybook/data.ts b/src/plugins/controls/public/services/storybook/data.ts
index 3e63066d0d5ff..5d8cacad9b7b3 100644
--- a/src/plugins/controls/public/services/storybook/data.ts
+++ b/src/plugins/controls/public/services/storybook/data.ts
@@ -7,22 +7,13 @@
  */
 
 import { of, Observable } from 'rxjs';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { DataViewField, DataView } from '../../../../data_views/common';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { ControlsDataService } from '../data';
 
-let valueSuggestionMethod = ({ field, query }: { field: DataViewField; query: string }) =>
-  Promise.resolve(['storybook', 'default', 'values']);
-export const replaceValueSuggestionMethod = (
-  newMethod: ({ field, query }: { field: DataViewField; query: string }) => Promise<string[]>
-) => (valueSuggestionMethod = newMethod);
-
 export type DataServiceFactory = PluginServiceFactory<ControlsDataService>;
 export const dataServiceFactory: DataServiceFactory = () => ({
-  autocomplete: {
-    getValueSuggestions: valueSuggestionMethod,
-  } as unknown as DataPublicPluginStart['autocomplete'],
   query: {} as unknown as DataPublicPluginStart['query'],
   searchSource: {
     create: () => ({
diff --git a/src/plugins/controls/public/services/storybook/data_views.ts b/src/plugins/controls/public/services/storybook/data_views.ts
index 5248dfbd70507..11242668abcc5 100644
--- a/src/plugins/controls/public/services/storybook/data_views.ts
+++ b/src/plugins/controls/public/services/storybook/data_views.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
-import { DataViewsPublicPluginStart } from '../../../../data_views/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { ControlsDataViewsService } from '../data_views';
-import { DataView } from '../../../../data_views/common';
 
 export type DataViewsServiceFactory = PluginServiceFactory<ControlsDataViewsService>;
 
diff --git a/src/plugins/controls/public/services/storybook/index.ts b/src/plugins/controls/public/services/storybook/index.ts
index 535befd925f49..751aaeefee9c2 100644
--- a/src/plugins/controls/public/services/storybook/index.ts
+++ b/src/plugins/controls/public/services/storybook/index.ts
@@ -11,9 +11,10 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { ControlsServices } from '..';
 import { dataServiceFactory } from './data';
+import { unifiedSearchServiceFactory } from './unified_search';
 import { overlaysServiceFactory } from './overlays';
 import { dataViewsServiceFactory } from './data_views';
 import { httpServiceFactory } from '../stub/http';
@@ -28,6 +29,7 @@ export const providers: PluginServiceProviders<ControlsServices> = {
   dataViews: new PluginServiceProvider(dataViewsServiceFactory),
   http: new PluginServiceProvider(httpServiceFactory),
   data: new PluginServiceProvider(dataServiceFactory),
+  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
   overlays: new PluginServiceProvider(overlaysServiceFactory),
   settings: new PluginServiceProvider(settingsServiceFactory),
 
diff --git a/src/plugins/controls/public/services/storybook/options_list.ts b/src/plugins/controls/public/services/storybook/options_list.ts
index ee604042a2064..f5288980bab35 100644
--- a/src/plugins/controls/public/services/storybook/options_list.ts
+++ b/src/plugins/controls/public/services/storybook/options_list.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { OptionsListResponse } from '../../control_types/options_list/types';
 import { ControlsOptionsListService, OptionsListRequest } from '../options_list';
 
diff --git a/src/plugins/controls/public/services/storybook/overlays.tsx b/src/plugins/controls/public/services/storybook/overlays.tsx
index 9ab4ea0b2c450..23320f966c09f 100644
--- a/src/plugins/controls/public/services/storybook/overlays.tsx
+++ b/src/plugins/controls/public/services/storybook/overlays.tsx
@@ -15,10 +15,10 @@ import {
   OverlayFlyoutOpenOptions,
   OverlayModalConfirmOptions,
   OverlayRef,
-} from '../../../../../core/public';
+} from '@kbn/core/public';
+import { MountWrapper } from '@kbn/core/public/utils';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsOverlaysService } from '../overlays';
-import { MountWrapper } from '../../../../../core/public/utils';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
 
 type OverlaysServiceFactory = PluginServiceFactory<ControlsOverlaysService>;
 
diff --git a/src/plugins/controls/public/services/storybook/settings.ts b/src/plugins/controls/public/services/storybook/settings.ts
index 40b175bcec7bb..e10108cc435ed 100644
--- a/src/plugins/controls/public/services/storybook/settings.ts
+++ b/src/plugins/controls/public/services/storybook/settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsSettingsService } from '../settings';
 
 export type SettingsServiceFactory = PluginServiceFactory<ControlsSettingsService>;
diff --git a/src/plugins/controls/public/services/storybook/unified_search.ts b/src/plugins/controls/public/services/storybook/unified_search.ts
new file mode 100644
index 0000000000000..cb7df1bd1e483
--- /dev/null
+++ b/src/plugins/controls/public/services/storybook/unified_search.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { ControlsUnifiedSearchService } from '../unified_search';
+
+let valueSuggestionMethod = ({ field, query }: { field: DataViewField; query: string }) =>
+  Promise.resolve(['storybook', 'default', 'values']);
+export const replaceValueSuggestionMethod = (
+  newMethod: ({ field, query }: { field: DataViewField; query: string }) => Promise<string[]>
+) => (valueSuggestionMethod = newMethod);
+
+export type UnifiedSearchServiceFactory = PluginServiceFactory<ControlsUnifiedSearchService>;
+export const unifiedSearchServiceFactory: UnifiedSearchServiceFactory = () => ({
+  autocomplete: {
+    getValueSuggestions: valueSuggestionMethod,
+  } as unknown as UnifiedSearchPublicPluginStart['autocomplete'],
+});
diff --git a/src/plugins/controls/public/services/stub/controls.ts b/src/plugins/controls/public/services/stub/controls.ts
index 0bc1ae9b9d305..f3e065142f637 100644
--- a/src/plugins/controls/public/services/stub/controls.ts
+++ b/src/plugins/controls/public/services/stub/controls.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlInput, ControlOutput } from '../..';
-import { EmbeddableFactory } from '../../../../embeddable/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
 import { ControlsService, ControlTypeRegistry } from '../controls';
 
 export type ControlsServiceFactory = PluginServiceFactory<ControlsService>;
diff --git a/src/plugins/controls/public/services/stub/http.ts b/src/plugins/controls/public/services/stub/http.ts
index d33083b0641fc..dfd1a5afad6b3 100644
--- a/src/plugins/controls/public/services/stub/http.ts
+++ b/src/plugins/controls/public/services/stub/http.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { HttpResponse } from '../../../../../core/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { HttpResponse } from '@kbn/core/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsHTTPService } from '../http';
 
 type HttpServiceFactory = PluginServiceFactory<ControlsHTTPService>;
diff --git a/src/plugins/controls/public/services/stub/index.ts b/src/plugins/controls/public/services/stub/index.ts
index 486c42a999f9a..4cd138689452f 100644
--- a/src/plugins/controls/public/services/stub/index.ts
+++ b/src/plugins/controls/public/services/stub/index.ts
@@ -10,7 +10,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { ControlsServices } from '..';
 import { httpServiceFactory } from './http';
 import { overlaysServiceFactory } from './overlays';
@@ -20,6 +20,7 @@ import { dataServiceFactory } from '../storybook/data';
 import { dataViewsServiceFactory } from '../storybook/data_views';
 import { optionsListServiceFactory } from '../storybook/options_list';
 import { settingsServiceFactory } from '../storybook/settings';
+import { unifiedSearchServiceFactory } from '../storybook/unified_search';
 
 export const providers: PluginServiceProviders<ControlsServices> = {
   http: new PluginServiceProvider(httpServiceFactory),
@@ -27,7 +28,7 @@ export const providers: PluginServiceProviders<ControlsServices> = {
   overlays: new PluginServiceProvider(overlaysServiceFactory),
   dataViews: new PluginServiceProvider(dataViewsServiceFactory),
   settings: new PluginServiceProvider(settingsServiceFactory),
-
+  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
   controls: new PluginServiceProvider(controlsServiceFactory),
   optionsList: new PluginServiceProvider(optionsListServiceFactory),
 };
diff --git a/src/plugins/controls/public/services/stub/overlays.ts b/src/plugins/controls/public/services/stub/overlays.ts
index 3c363111a6646..63f3bc667b017 100644
--- a/src/plugins/controls/public/services/stub/overlays.ts
+++ b/src/plugins/controls/public/services/stub/overlays.ts
@@ -11,8 +11,8 @@ import {
   OverlayFlyoutOpenOptions,
   OverlayModalConfirmOptions,
   OverlayRef,
-} from '../../../../../core/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+} from '@kbn/core/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsOverlaysService } from '../overlays';
 
 type OverlaysServiceFactory = PluginServiceFactory<ControlsOverlaysService>;
diff --git a/src/plugins/controls/public/services/unified_search.ts b/src/plugins/controls/public/services/unified_search.ts
new file mode 100644
index 0000000000000..2c69537b62d65
--- /dev/null
+++ b/src/plugins/controls/public/services/unified_search.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+
+export interface ControlsUnifiedSearchService {
+  autocomplete: UnifiedSearchPublicPluginStart['autocomplete'];
+}
diff --git a/src/plugins/controls/public/types.ts b/src/plugins/controls/public/types.ts
index 745aa1bc32465..d7766eb8d478b 100644
--- a/src/plugins/controls/public/types.ts
+++ b/src/plugins/controls/public/types.ts
@@ -14,11 +14,12 @@ import {
   EmbeddableSetup,
   EmbeddableStart,
   IEmbeddable,
-} from '../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { ControlInput } from '../common/types';
-import { DataPublicPluginStart } from '../../data/public';
 import { ControlsService } from './services/controls';
-import { DataView, DataViewsPublicPluginStart } from '../../data_views/public';
 
 export interface CommonControlOutput {
   filters?: Filter[];
@@ -70,9 +71,10 @@ export interface ControlsPluginSetupDeps {
 }
 export interface ControlsPluginStartDeps {
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   embeddable: EmbeddableStart;
   dataViews: DataViewsPublicPluginStart;
 }
 
 // re-export from common
-export type { ControlWidth, ControlInput, ControlStyle } from '../common/types';
+export type { ControlWidth, ControlInput, DataControlInput, ControlStyle } from '../common/types';
diff --git a/src/plugins/controls/server/control_group/control_group_container_factory.ts b/src/plugins/controls/server/control_group/control_group_container_factory.ts
index 179b7ebd55984..ba50652d3507a 100644
--- a/src/plugins/controls/server/control_group/control_group_container_factory.ts
+++ b/src/plugins/controls/server/control_group/control_group_container_factory.ts
@@ -6,14 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddablePersistableStateService } from '../../../embeddable/common';
-import { EmbeddableRegistryDefinition } from '../../../embeddable/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { CONTROL_GROUP_TYPE } from '../../common';
 import {
   createControlGroupExtract,
   createControlGroupInject,
   migrations,
 } from '../../common/control_group/control_group_persistable_state';
+import { controlGroupTelemetry } from './control_group_telemetry';
 
 export const controlGroupContainerPersistableStateServiceFactory = (
   persistableStateService: EmbeddablePersistableStateService
@@ -22,6 +23,7 @@ export const controlGroupContainerPersistableStateServiceFactory = (
     id: CONTROL_GROUP_TYPE,
     extract: createControlGroupExtract(persistableStateService),
     inject: createControlGroupInject(persistableStateService),
+    telemetry: controlGroupTelemetry,
     migrations,
   };
 };
diff --git a/src/plugins/controls/server/control_group/control_group_telemetry.test.ts b/src/plugins/controls/server/control_group/control_group_telemetry.test.ts
new file mode 100644
index 0000000000000..140b58fd790fc
--- /dev/null
+++ b/src/plugins/controls/server/control_group/control_group_telemetry.test.ts
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ControlGroupTelemetry, RawControlGroupAttributes } from '../../common';
+import { controlGroupTelemetry, initializeControlGroupTelemetry } from './control_group_telemetry';
+
+// controls attributes with all settings ignored + 3 options lists + hierarchical chaining + label above
+const rawControlAttributes1: RawControlGroupAttributes = {
+  controlStyle: 'twoLine',
+  chainingSystem: 'NONE',
+  panelsJSON:
+    '{"6fc71ac6-62f9-4ff4-bf5a-d1e066065376":{"order":0,"width":"auto","type":"optionsListControl","explicitInput":{"title":"Carrier","fieldName":"Carrier","id":"6fc71ac6-62f9-4ff4-bf5a-d1e066065376","enhancements":{}}},"1ca90451-908b-4eae-ac4d-535f2e30c4ad":{"order":2,"width":"auto","type":"optionsListControl","explicitInput":{"title":"DestAirportID","fieldName":"DestAirportID","id":"1ca90451-908b-4eae-ac4d-535f2e30c4ad","enhancements":{}}},"71086bac-316d-415f-8aa8-b9a921bc7f58":{"order":1,"width":"auto","type":"optionsListControl","explicitInput":{"title":"DestRegion","fieldName":"DestRegion","id":"71086bac-316d-415f-8aa8-b9a921bc7f58","enhancements":{}}}}',
+  ignoreParentSettingsJSON:
+    '{"ignoreFilters":true,"ignoreQuery":true,"ignoreTimerange":true,"ignoreValidations":true}',
+};
+
+// controls attributes with some settings ignored + 2 range sliders, 1 time slider + No chaining  + label inline
+const rawControlAttributes2: RawControlGroupAttributes = {
+  controlStyle: 'oneLine',
+  chainingSystem: 'NONE',
+  panelsJSON:
+    '{"9cf90205-e94d-43c9-a3aa-45f359a7522f":{"order":0,"width":"auto","type":"rangeSliderControl","explicitInput":{"title":"DistanceKilometers","fieldName":"DistanceKilometers","id":"9cf90205-e94d-43c9-a3aa-45f359a7522f","enhancements":{}}},"b47916fd-fc03-4dcd-bef1-5c3b7a315723":{"order":1,"width":"auto","type":"timeSlider","explicitInput":{"title":"timestamp","fieldName":"timestamp","id":"b47916fd-fc03-4dcd-bef1-5c3b7a315723","enhancements":{}}},"f6b076c6-9ef5-483e-b08d-d313d60d4b8c":{"order":2,"width":"auto","type":"rangeSliderControl","explicitInput":{"title":"DistanceMiles","fieldName":"DistanceMiles","id":"f6b076c6-9ef5-483e-b08d-d313d60d4b8c","enhancements":{}}}}',
+  ignoreParentSettingsJSON:
+    '{"ignoreFilters":true,"ignoreQuery":false,"ignoreTimerange":false,"ignoreValidations":false}',
+};
+
+// controls attributes with no settings ignored + 2 options lists, 1 range slider, 1 time slider + hierarchical chaining + label inline
+const rawControlAttributes3: RawControlGroupAttributes = {
+  controlStyle: 'oneLine',
+  chainingSystem: 'HIERARCHICAL',
+  panelsJSON:
+    '{"9cf90205-e94d-43c9-a3aa-45f359a7522f":{"order":0,"width":"auto","type":"rangeSliderControl","explicitInput":{"title":"DistanceKilometers","fieldName":"DistanceKilometers","id":"9cf90205-e94d-43c9-a3aa-45f359a7522f","enhancements":{}}},"b47916fd-fc03-4dcd-bef1-5c3b7a315723":{"order":1,"width":"auto","type":"timeSlider","explicitInput":{"title":"timestamp","fieldName":"timestamp","id":"b47916fd-fc03-4dcd-bef1-5c3b7a315723","enhancements":{}}},"ee325e9e-6ec1-41f9-953f-423d59850d44":{"order":2,"width":"auto","type":"optionsListControl","explicitInput":{"title":"Carrier","fieldName":"Carrier","id":"ee325e9e-6ec1-41f9-953f-423d59850d44","enhancements":{}}},"cb0f5fcd-9ad9-4d4a-b489-b75bd060399b":{"order":3,"width":"auto","type":"optionsListControl","explicitInput":{"title":"DestCityName","fieldName":"DestCityName","id":"cb0f5fcd-9ad9-4d4a-b489-b75bd060399b","enhancements":{}}}}',
+  ignoreParentSettingsJSON:
+    '{"ignoreFilters":false,"ignoreQuery":false,"ignoreTimerange":false,"ignoreValidations":false}',
+};
+
+describe('Initialize telemetry', () => {
+  test('initializes telemetry when given blank object', () => {
+    const initializedTelemetry = initializeControlGroupTelemetry({});
+    expect(initializedTelemetry.total).toBe(0);
+    expect(initializedTelemetry.chaining_system).toEqual({});
+    expect(initializedTelemetry.ignore_settings).toEqual({});
+    expect(initializedTelemetry.by_type).toEqual({});
+  });
+
+  test('initializes telemetry without overwriting any keys when given a partial telemetry object', () => {
+    const partialTelemetry: Partial<ControlGroupTelemetry> = {
+      total: 77,
+      chaining_system: { TESTCHAIN: 10, OTHERCHAIN: 1 },
+      by_type: { test1: { total: 10, details: {} } },
+    };
+    const initializedTelemetry = initializeControlGroupTelemetry(partialTelemetry);
+    expect(initializedTelemetry.total).toBe(77);
+    expect(initializedTelemetry.chaining_system).toEqual({ TESTCHAIN: 10, OTHERCHAIN: 1 });
+    expect(initializedTelemetry.ignore_settings).toEqual({});
+    expect(initializedTelemetry.by_type).toEqual({ test1: { total: 10, details: {} } });
+    expect(initializedTelemetry.label_position).toEqual({});
+  });
+
+  test('initiailizes telemetry without overwriting any keys when given a completed telemetry object', () => {
+    const partialTelemetry: Partial<ControlGroupTelemetry> = {
+      total: 5,
+      chaining_system: { TESTCHAIN: 10, OTHERCHAIN: 1 },
+      by_type: { test1: { total: 10, details: {} } },
+      ignore_settings: { ignoreValidations: 12 },
+      label_position: { inline: 10, above: 12 },
+    };
+    const initializedTelemetry = initializeControlGroupTelemetry(partialTelemetry);
+    expect(initializedTelemetry.total).toBe(5);
+    expect(initializedTelemetry.chaining_system).toEqual({ TESTCHAIN: 10, OTHERCHAIN: 1 });
+    expect(initializedTelemetry.ignore_settings).toEqual({ ignoreValidations: 12 });
+    expect(initializedTelemetry.by_type).toEqual({ test1: { total: 10, details: {} } });
+    expect(initializedTelemetry.label_position).toEqual({ inline: 10, above: 12 });
+  });
+});
+
+describe('Control group telemetry function', () => {
+  let finalTelemetry: ControlGroupTelemetry;
+
+  beforeAll(() => {
+    const allControlGroups = [rawControlAttributes1, rawControlAttributes2, rawControlAttributes3];
+
+    finalTelemetry = allControlGroups.reduce<ControlGroupTelemetry>(
+      (telemetrySoFar, rawControlGroupAttributes) => {
+        return controlGroupTelemetry(
+          rawControlGroupAttributes,
+          telemetrySoFar
+        ) as ControlGroupTelemetry;
+      },
+      {} as ControlGroupTelemetry
+    );
+  });
+
+  test('counts all telemetry over multiple runs', () => {
+    expect(finalTelemetry.total).toBe(10);
+  });
+
+  test('counts control types over multiple runs.', () => {
+    expect(finalTelemetry.by_type).toEqual({
+      optionsListControl: {
+        details: {},
+        total: 5,
+      },
+      rangeSliderControl: {
+        details: {},
+        total: 3,
+      },
+      timeSlider: {
+        details: {},
+        total: 2,
+      },
+    });
+  });
+
+  test('collects ignore settings over multiple runs.', () => {
+    expect(finalTelemetry.ignore_settings).toEqual({
+      ignoreFilters: 2,
+      ignoreQuery: 1,
+      ignoreTimerange: 1,
+      ignoreValidations: 1,
+    });
+  });
+
+  test('counts various chaining systems over multiple runs.', () => {
+    expect(finalTelemetry.chaining_system).toEqual({
+      HIERARCHICAL: 1,
+      NONE: 2,
+    });
+  });
+
+  test('counts label positions over multiple runs.', () => {
+    expect(finalTelemetry.label_position).toEqual({
+      oneLine: 2,
+      twoLine: 1,
+    });
+  });
+});
diff --git a/src/plugins/controls/server/control_group/control_group_telemetry.ts b/src/plugins/controls/server/control_group/control_group_telemetry.ts
new file mode 100644
index 0000000000000..83e363e081241
--- /dev/null
+++ b/src/plugins/controls/server/control_group/control_group_telemetry.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { set } from 'lodash';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+import {
+  ControlGroupTelemetry,
+  RawControlGroupAttributes,
+  rawControlGroupAttributesToControlGroupInput,
+} from '../../common';
+import { ControlGroupInput } from '../../common/control_group/types';
+
+export const initializeControlGroupTelemetry = (
+  statsSoFar: Record<string, unknown>
+): ControlGroupTelemetry => {
+  return {
+    total: (statsSoFar?.total as number) ?? 0,
+    chaining_system:
+      (statsSoFar?.chaining_system as ControlGroupTelemetry['chaining_system']) ?? {},
+    ignore_settings:
+      (statsSoFar?.ignore_settings as ControlGroupTelemetry['ignore_settings']) ?? {},
+    label_position: (statsSoFar?.label_position as ControlGroupTelemetry['label_position']) ?? {},
+    by_type: (statsSoFar?.by_type as ControlGroupTelemetry['by_type']) ?? {},
+  };
+};
+
+const reportChainingSystemInUse = (
+  chainingSystemsStats: ControlGroupTelemetry['chaining_system'],
+  chainingSystem: ControlGroupInput['chainingSystem']
+): ControlGroupTelemetry['chaining_system'] => {
+  if (!chainingSystem) return chainingSystemsStats;
+  if (Boolean(chainingSystemsStats[chainingSystem])) {
+    chainingSystemsStats[chainingSystem]++;
+  } else {
+    chainingSystemsStats[chainingSystem] = 1;
+  }
+  return chainingSystemsStats;
+};
+
+const reportLabelPositionsInUse = (
+  labelPositionStats: ControlGroupTelemetry['label_position'],
+  labelPosition: ControlGroupInput['controlStyle'] // controlStyle was renamed labelPosition
+): ControlGroupTelemetry['label_position'] => {
+  if (!labelPosition) return labelPositionStats;
+  if (Boolean(labelPositionStats[labelPosition])) {
+    labelPositionStats[labelPosition]++;
+  } else {
+    labelPositionStats[labelPosition] = 1;
+  }
+  return labelPositionStats;
+};
+
+const reportIgnoreSettingsInUse = (
+  settingsStats: ControlGroupTelemetry['ignore_settings'],
+  settings: ControlGroupInput['ignoreParentSettings']
+): ControlGroupTelemetry['ignore_settings'] => {
+  if (!settings) return settingsStats;
+  for (const [settingKey, settingValue] of Object.entries(settings)) {
+    if (settingValue) {
+      // only report ignore settings which are turned ON
+      const currentValueForSetting = settingsStats[settingKey] ?? 0;
+      set(settingsStats, settingKey, currentValueForSetting + 1);
+    }
+  }
+  return settingsStats;
+};
+
+const reportControlTypes = (
+  controlTypeStats: ControlGroupTelemetry['by_type'],
+  panels: ControlGroupInput['panels']
+): ControlGroupTelemetry['by_type'] => {
+  for (const { type } of Object.values(panels)) {
+    const currentTypeCount = controlTypeStats[type]?.total ?? 0;
+    const currentTypeDetails = controlTypeStats[type]?.details ?? {};
+
+    // here if we need to start tracking details on specific control types, we can call embeddableService.telemetry
+
+    set(controlTypeStats, `${type}.total`, currentTypeCount + 1);
+    set(controlTypeStats, `${type}.details`, currentTypeDetails);
+  }
+  return controlTypeStats;
+};
+
+export const controlGroupTelemetry: PersistableStateService['telemetry'] = (
+  state,
+  stats
+): ControlGroupTelemetry => {
+  const controlGroupStats = initializeControlGroupTelemetry(stats);
+  const controlGroupInput = rawControlGroupAttributesToControlGroupInput(
+    state as unknown as RawControlGroupAttributes
+  );
+  if (!controlGroupInput) return controlGroupStats;
+
+  controlGroupStats.total += Object.keys(controlGroupInput?.panels ?? {}).length;
+
+  controlGroupStats.chaining_system = reportChainingSystemInUse(
+    controlGroupStats.chaining_system,
+    controlGroupInput.chainingSystem
+  );
+
+  controlGroupStats.label_position = reportLabelPositionsInUse(
+    controlGroupStats.label_position,
+    controlGroupInput.controlStyle
+  );
+
+  controlGroupStats.ignore_settings = reportIgnoreSettingsInUse(
+    controlGroupStats.ignore_settings,
+    controlGroupInput.ignoreParentSettings
+  );
+
+  controlGroupStats.by_type = reportControlTypes(
+    controlGroupStats.by_type,
+    controlGroupInput.panels
+  );
+
+  return controlGroupStats;
+};
diff --git a/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts b/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
index 846e3cfe9342c..1dd48cced20a4 100644
--- a/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
+++ b/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableRegistryDefinition } from '../../../../embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { OPTIONS_LIST_CONTROL } from '../../../common';
 import {
   createOptionsListExtract,
diff --git a/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts b/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
index a2eab10cc77dc..9af4800ca00fb 100644
--- a/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
+++ b/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
@@ -12,18 +12,18 @@ import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { Observable } from 'rxjs';
 
+import { CoreSetup, ElasticsearchClient } from '@kbn/core/server';
+import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
+import { FieldSpec, getFieldSubtypeNested } from '@kbn/data-views-plugin/common';
+import { PluginSetup as UnifiedSearchPluginSetup } from '@kbn/unified-search-plugin/server';
 import {
   OptionsListRequestBody,
   OptionsListResponse,
 } from '../../../common/control_types/options_list/types';
-import { CoreSetup, ElasticsearchClient } from '../../../../../core/server';
-import { getKbnServerError, reportServerError } from '../../../../kibana_utils/server';
-import { PluginSetup as DataPluginSetup } from '../../../../data/server';
-import { FieldSpec, getFieldSubtypeNested } from '../../../../data_views/common';
 
 export const setupOptionsListSuggestionsRoute = (
   { http }: CoreSetup,
-  getAutocompleteSettings: DataPluginSetup['autocomplete']['getAutocompleteSettings']
+  getAutocompleteSettings: UnifiedSearchPluginSetup['autocomplete']['getAutocompleteSettings']
 ) => {
   const router = http.createRouter();
 
@@ -53,7 +53,7 @@ export const setupOptionsListSuggestionsRoute = (
       try {
         const suggestionRequest: OptionsListRequestBody = request.body;
         const { index } = request.params;
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
+        const esClient = (await context.core).elasticsearch.client.asCurrentUser;
         const suggestionsResponse = await getOptionsListSuggestions({
           abortedEvent$: request.events.aborted$,
           request: suggestionRequest,
diff --git a/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts b/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
index 0b48dc94707c4..8e8920f12f554 100644
--- a/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
+++ b/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableRegistryDefinition } from '../../../../embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { TIME_SLIDER_CONTROL } from '../../../common';
 import {
   createTimeSliderExtract,
diff --git a/src/plugins/controls/server/index.ts b/src/plugins/controls/server/index.ts
index 5928186715210..cec761ae80e20 100644
--- a/src/plugins/controls/server/index.ts
+++ b/src/plugins/controls/server/index.ts
@@ -9,3 +9,5 @@
 import { ControlsPlugin } from './plugin';
 
 export const plugin = () => new ControlsPlugin();
+
+export { initializeControlGroupTelemetry } from './control_group/control_group_telemetry';
diff --git a/src/plugins/controls/server/plugin.ts b/src/plugins/controls/server/plugin.ts
index 6ff67f702be54..cbe9d39234361 100644
--- a/src/plugins/controls/server/plugin.ts
+++ b/src/plugins/controls/server/plugin.ts
@@ -6,10 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 
-import { EmbeddableSetup } from '../../embeddable/server';
-import { PluginSetup as DataSetup } from '../../data/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { PluginSetup as DataSetup } from '@kbn/data-plugin/server';
+import { PluginSetup as UnifiedSearchSetup } from '@kbn/unified-search-plugin/server';
 import { setupOptionsListSuggestionsRoute } from './control_types/options_list/options_list_suggestions_route';
 import { controlGroupContainerPersistableStateServiceFactory } from './control_group/control_group_container_factory';
 import { optionsListPersistableStateServiceFactory } from './control_types/options_list/options_list_embeddable_factory';
@@ -18,10 +19,11 @@ import { timeSliderPersistableStateServiceFactory } from './control_types/time_s
 interface SetupDeps {
   embeddable: EmbeddableSetup;
   data: DataSetup;
+  unifiedSearch: UnifiedSearchSetup;
 }
 
 export class ControlsPlugin implements Plugin<object, object, SetupDeps> {
-  public setup(core: CoreSetup, { embeddable, data }: SetupDeps) {
+  public setup(core: CoreSetup, { embeddable, unifiedSearch }: SetupDeps) {
     embeddable.registerEmbeddableFactory(optionsListPersistableStateServiceFactory());
     embeddable.registerEmbeddableFactory(timeSliderPersistableStateServiceFactory());
 
@@ -29,7 +31,7 @@ export class ControlsPlugin implements Plugin<object, object, SetupDeps> {
       controlGroupContainerPersistableStateServiceFactory(embeddable)
     );
 
-    setupOptionsListSuggestionsRoute(core, data.autocomplete.getAutocompleteSettings);
+    setupOptionsListSuggestionsRoute(core, unifiedSearch.autocomplete.getAutocompleteSettings);
     return {};
   }
 
diff --git a/src/plugins/controls/storybook/decorator.tsx b/src/plugins/controls/storybook/decorator.tsx
index 603bddf320627..4a618e51c7a55 100644
--- a/src/plugins/controls/storybook/decorator.tsx
+++ b/src/plugins/controls/storybook/decorator.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
+import { PluginServiceRegistry } from '@kbn/presentation-util-plugin/public';
+import { KibanaContextProvider as KibanaReactProvider } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../public/services';
 import { ControlsServices } from '../public/services';
 import { providers } from '../public/services/storybook';
-import { PluginServiceRegistry } from '../../presentation_util/public';
-import { KibanaContextProvider as KibanaReactProvider } from '../../kibana_react/public';
 
 const settings = new Map();
 settings.set('darkMode', true);
diff --git a/src/plugins/controls/tsconfig.json b/src/plugins/controls/tsconfig.json
index 10ec84fbd32f6..5a17afc931340 100644
--- a/src/plugins/controls/tsconfig.json
+++ b/src/plugins/controls/tsconfig.json
@@ -23,6 +23,7 @@
     { "path": "../embeddable/tsconfig.json" },
     { "path": "../presentation_util/tsconfig.json" },
     { "path": "../kibana_react/tsconfig.json" },
-    { "path": "../data/tsconfig.json" }
+    { "path": "../data/tsconfig.json" },
+    { "path": "../unified_search/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/custom_integrations/kibana.json b/src/plugins/custom_integrations/kibana.json
index 7c11f47f4d82a..d9a7618b25642 100755
--- a/src/plugins/custom_integrations/kibana.json
+++ b/src/plugins/custom_integrations/kibana.json
@@ -11,6 +11,6 @@
   "server": true,
   "extraPublicDirs": ["common"],
   "requiredPlugins": [],
-  "requiredBundles": ["presentationUtil"],
+  "requiredBundles": [],
   "optionalPlugins": []
 }
diff --git a/src/plugins/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx b/src/plugins/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx
index 8fa0674c9b467..16a74aa3d6efc 100644
--- a/src/plugins/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx
+++ b/src/plugins/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx
@@ -37,14 +37,14 @@ interface Args {
 }
 
 const args: Args = {
-  eprPackageName: 'nginx',
+  eprPackageName: 'ga_beats',
 };
 
 const argTypes = {
   eprPackageName: {
     control: {
       type: 'radio',
-      options: ['nginx', 'okta', 'aws', 'apache'],
+      options: ['ga_beats', 'beta_beats', 'exp_beats'],
     },
   },
 };
diff --git a/src/plugins/custom_integrations/public/mocks.ts b/src/plugins/custom_integrations/public/mocks.tsx
similarity index 66%
rename from src/plugins/custom_integrations/public/mocks.ts
rename to src/plugins/custom_integrations/public/mocks.tsx
index a8fedbbb712b2..3b95bc542bd79 100644
--- a/src/plugins/custom_integrations/public/mocks.ts
+++ b/src/plugins/custom_integrations/public/mocks.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { pluginServices } from './services';
-import { PluginServiceRegistry } from '../../presentation_util/public';
+import React from 'react';
+import { coreMock } from '@kbn/core/public/mocks';
 import { CustomIntegrationsSetup, CustomIntegrationsStart } from './types';
-import { CustomIntegrationsServices } from './services';
-import { providers } from './services/stub';
+import { CustomIntegrationsServicesProvider } from './services';
+import { servicesFactory } from './services/stub';
 
 function createCustomIntegrationsSetup(): jest.Mocked<CustomIntegrationsSetup> {
   const mock: jest.Mocked<CustomIntegrationsSetup> = {
@@ -21,12 +21,14 @@ function createCustomIntegrationsSetup(): jest.Mocked<CustomIntegrationsSetup> {
 }
 
 function createCustomIntegrationsStart(): jest.Mocked<CustomIntegrationsStart> {
-  const registry = new PluginServiceRegistry<CustomIntegrationsServices>(providers);
-  pluginServices.setRegistry(registry.start({}));
-  const ContextProvider = pluginServices.getContextProvider();
+  const services = servicesFactory({ startPlugins: {}, coreStart: coreMock.createStart() });
 
   return {
-    ContextProvider: jest.fn(ContextProvider),
+    ContextProvider: jest.fn(({ children }) => (
+      <CustomIntegrationsServicesProvider {...services}>
+        {children}
+      </CustomIntegrationsServicesProvider>
+    )),
   };
 }
 
diff --git a/src/plugins/custom_integrations/public/plugin.test.ts b/src/plugins/custom_integrations/public/plugin.test.ts
index 32f25754fe8e0..fe5c87b421390 100644
--- a/src/plugins/custom_integrations/public/plugin.test.ts
+++ b/src/plugins/custom_integrations/public/plugin.test.ts
@@ -8,7 +8,7 @@
 
 import { CustomIntegrationsPlugin } from './plugin';
 
-import { coreMock } from '../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('CustomIntegrationsPlugin', () => {
   beforeEach(() => {});
diff --git a/src/plugins/custom_integrations/public/plugin.ts b/src/plugins/custom_integrations/public/plugin.tsx
similarity index 73%
rename from src/plugins/custom_integrations/public/plugin.ts
rename to src/plugins/custom_integrations/public/plugin.tsx
index a3470fefba46c..2bf045f4071bc 100755
--- a/src/plugins/custom_integrations/public/plugin.ts
+++ b/src/plugins/custom_integrations/public/plugin.tsx
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import React from 'react';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   CustomIntegrationsSetup,
   CustomIntegrationsStart,
@@ -18,8 +19,8 @@ import {
   ROUTES_REPLACEMENT_CUSTOM_INTEGRATIONS,
 } from '../common';
 
-import { pluginServices } from './services';
-import { pluginServiceRegistry } from './services/kibana';
+import { CustomIntegrationsServicesProvider } from './services';
+import { servicesFactory } from './services/kibana';
 
 export class CustomIntegrationsPlugin
   implements Plugin<CustomIntegrationsSetup, CustomIntegrationsStart>
@@ -41,9 +42,15 @@ export class CustomIntegrationsPlugin
     coreStart: CoreStart,
     startPlugins: CustomIntegrationsStartDependencies
   ): CustomIntegrationsStart {
-    pluginServices.setRegistry(pluginServiceRegistry.start({ coreStart, startPlugins }));
+    const services = servicesFactory({ coreStart, startPlugins });
+    const ContextProvider: React.FC = ({ children }) => (
+      <CustomIntegrationsServicesProvider {...services}>
+        {children}
+      </CustomIntegrationsServicesProvider>
+    );
+
     return {
-      ContextProvider: pluginServices.getContextProvider(),
+      ContextProvider,
     };
   }
 
diff --git a/src/plugins/custom_integrations/public/services/index.ts b/src/plugins/custom_integrations/public/services/index.ts
deleted file mode 100644
index 8a257ee1a2cd7..0000000000000
--- a/src/plugins/custom_integrations/public/services/index.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { PluginServices } from '../../../presentation_util/public';
-
-import { CustomIntegrationsFindService } from './find';
-import { CustomIntegrationsPlatformService } from './platform';
-
-/**
- * Services used by the custom integrations plugin.
- */
-export interface CustomIntegrationsServices {
-  find: CustomIntegrationsFindService;
-  platform: CustomIntegrationsPlatformService;
-}
-
-/**
- * The `PluginServices` object for the custom integrations plugin.
- * @see /src/plugins/presentation_util/public/services/create/index.ts
- */
-export const pluginServices = new PluginServices<CustomIntegrationsServices>();
-
-/**
- * A React hook that provides connections to the `CustomIntegrationsFindService`.
- */
-export const useFindService = () => (() => pluginServices.getHooks().find.useService())();
-
-/**
- * A React hook that provides connections to the `CustomIntegrationsPlatformService`.
- */
-export const usePlatformService = () => (() => pluginServices.getHooks().platform.useService())();
diff --git a/src/plugins/custom_integrations/public/services/index.tsx b/src/plugins/custom_integrations/public/services/index.tsx
new file mode 100644
index 0000000000000..ad343a96390b0
--- /dev/null
+++ b/src/plugins/custom_integrations/public/services/index.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, { createContext, FC, useContext } from 'react';
+import { CustomIntegrationsFindService } from './find';
+import { CustomIntegrationsPlatformService } from './platform';
+
+/**
+ * Services used by the custom_integrations plugin.
+ */
+export interface CustomIntegrationsServices {
+  find: CustomIntegrationsFindService;
+  platform: CustomIntegrationsPlatformService;
+}
+
+// The React Context used to provide the services to the CustomIntegrations components.
+const CustomIntegrationsServicesContext = createContext<CustomIntegrationsServices | null>(null);
+
+/**
+ * The `React.Context` Provider component for the `CustomIntegrationsServices` context.  Any
+ * plugin or environment that consumes CustomIntegrationsServices components needs to wrap their React
+ * tree with this provider.
+ *
+ * Within a plugin, you can  use the CustomIntegrations plugin and retrieve a fully-configured
+ * context from the `start` contract.
+ */
+export const CustomIntegrationsServicesProvider: FC<CustomIntegrationsServices> = ({
+  children,
+  ...services
+}) => (
+  <CustomIntegrationsServicesContext.Provider value={services}>
+    {children}
+  </CustomIntegrationsServicesContext.Provider>
+);
+
+/**
+ * React hook for accessing pre-wired `SharedUxServices`.
+ */
+export function useCustomIntegrationsServices() {
+  const context = useContext(CustomIntegrationsServicesContext);
+
+  if (!context) {
+    throw new Error(
+      'CustomIntegrationsServicesContext missing.  Ensure your component or React root is wrapped with CustomIntegrationsServicesProvider.'
+    );
+  }
+
+  return context;
+}
+
+/**
+ * A React hook that provides connections to the `CustomIntegrationsFindService`.
+ */
+export const useFindService = () => useCustomIntegrationsServices().find;
+
+/**
+ * A React hook that provides connections to the `CustomIntegrationsPlatformService`.
+ */
+export const usePlatformService = () => useCustomIntegrationsServices().platform;
diff --git a/src/plugins/custom_integrations/public/services/kibana/find.ts b/src/plugins/custom_integrations/public/services/kibana/find.ts
index 5fc7626baa1e1..62fa040776804 100644
--- a/src/plugins/custom_integrations/public/services/kibana/find.ts
+++ b/src/plugins/custom_integrations/public/services/kibana/find.ts
@@ -11,14 +11,13 @@ import {
   ROUTES_APPEND_CUSTOM_INTEGRATIONS,
   ROUTES_REPLACEMENT_CUSTOM_INTEGRATIONS,
 } from '../../../common';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
+import { KibanaPluginServiceFactory } from '../types';
 
 import { CustomIntegrationsStartDependencies } from '../../types';
 import { CustomIntegrationsFindService, filterCustomIntegrations } from '../find';
 
 /**
  * A type definition for a factory to produce the `CustomIntegrationsFindService` for use in Kibana.
- * @see /src/plugins/presentation_util/public/services/create/factory.ts
  */
 export type CustomIntegrationsFindServiceFactory = KibanaPluginServiceFactory<
   CustomIntegrationsFindService,
diff --git a/src/plugins/custom_integrations/public/services/kibana/index.ts b/src/plugins/custom_integrations/public/services/kibana/index.ts
index d3cf27b9bc7c0..a32075209c71d 100644
--- a/src/plugins/custom_integrations/public/services/kibana/index.ts
+++ b/src/plugins/custom_integrations/public/services/kibana/index.ts
@@ -6,15 +6,9 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginServiceProviders,
-  PluginServiceProvider,
-  PluginServiceRegistry,
-  KibanaPluginServiceParams,
-} from '../../../../presentation_util/public';
-
 import { CustomIntegrationsServices } from '..';
 import { CustomIntegrationsStartDependencies } from '../../types';
+import { KibanaPluginServiceFactory } from '../types';
 
 import { findServiceFactory } from './find';
 import { platformServiceFactory } from './platform';
@@ -22,23 +16,10 @@ import { platformServiceFactory } from './platform';
 export { findServiceFactory } from './find';
 export { platformServiceFactory } from './platform';
 
-/**
- * A set of `PluginServiceProvider`s for use in Kibana.
- * @see /src/plugins/presentation_util/public/services/create/provider.tsx
- */
-export const pluginServiceProviders: PluginServiceProviders<
-  CustomIntegrationsServices,
-  KibanaPluginServiceParams<CustomIntegrationsStartDependencies>
-> = {
-  find: new PluginServiceProvider(findServiceFactory),
-  platform: new PluginServiceProvider(platformServiceFactory),
-};
-
-/**
- * A `PluginServiceRegistry` for use in Kibana.
- * @see /src/plugins/presentation_util/public/services/create/registry.tsx
- */
-export const pluginServiceRegistry = new PluginServiceRegistry<
+export const servicesFactory: KibanaPluginServiceFactory<
   CustomIntegrationsServices,
-  KibanaPluginServiceParams<CustomIntegrationsStartDependencies>
->(pluginServiceProviders);
+  CustomIntegrationsStartDependencies
+> = (params) => ({
+  find: findServiceFactory(params),
+  platform: platformServiceFactory(params),
+});
diff --git a/src/plugins/custom_integrations/public/services/kibana/platform.ts b/src/plugins/custom_integrations/public/services/kibana/platform.ts
index e6fe89b68c975..9b512b7a2760d 100644
--- a/src/plugins/custom_integrations/public/services/kibana/platform.ts
+++ b/src/plugins/custom_integrations/public/services/kibana/platform.ts
@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
+import { KibanaPluginServiceFactory } from '../types';
 
 import type { CustomIntegrationsPlatformService } from '../platform';
 import type { CustomIntegrationsStartDependencies } from '../../types';
 
 /**
  * A type definition for a factory to produce the `CustomIntegrationsPlatformService` for use in Kibana.
- * @see /src/plugins/presentation_util/public/services/create/factory.ts
  */
 export type CustomIntegrationsPlatformServiceFactory = KibanaPluginServiceFactory<
   CustomIntegrationsPlatformService,
diff --git a/src/plugins/custom_integrations/public/services/storybook/index.ts b/src/plugins/custom_integrations/public/services/storybook/index.ts
index 4dfed1b37e294..8d2715de10bfc 100644
--- a/src/plugins/custom_integrations/public/services/storybook/index.ts
+++ b/src/plugins/custom_integrations/public/services/storybook/index.ts
@@ -6,30 +6,19 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginServiceProviders,
-  PluginServiceProvider,
-  PluginServiceRegistry,
-} from '../../../../presentation_util/public';
-
 import { CustomIntegrationsServices } from '..';
 import { findServiceFactory } from '../stub/find';
 import { platformServiceFactory } from '../stub/platform';
+import { PluginServiceFactory } from '../types';
+import { CustomIntegrationsStartDependencies } from '../../types';
 
 export { findServiceFactory } from '../stub/find';
 export { platformServiceFactory } from '../stub/platform';
 
-/**
- * A set of `PluginServiceProvider`s for use in Storybook.
- * @see /src/plugins/presentation_util/public/services/create/provider.tsx
- */
-export const providers: PluginServiceProviders<CustomIntegrationsServices> = {
-  find: new PluginServiceProvider(findServiceFactory),
-  platform: new PluginServiceProvider(platformServiceFactory),
-};
-
-/**
- * A `PluginServiceRegistry` for use in Storybook.
- * @see /src/plugins/presentation_util/public/services/create/registry.tsx
- */
-export const registry = new PluginServiceRegistry<CustomIntegrationsServices>(providers);
+export const servicesFactory: PluginServiceFactory<
+  CustomIntegrationsServices,
+  CustomIntegrationsStartDependencies
+> = (params) => ({
+  find: findServiceFactory(params),
+  platform: platformServiceFactory(params),
+});
diff --git a/src/plugins/custom_integrations/public/services/stub/find.ts b/src/plugins/custom_integrations/public/services/stub/find.ts
index 08def4e63471d..eecb324938b8f 100644
--- a/src/plugins/custom_integrations/public/services/stub/find.ts
+++ b/src/plugins/custom_integrations/public/services/stub/find.ts
@@ -6,16 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
-
 import { CustomIntegrationsFindService, filterCustomIntegrations } from '../find';
+import { PluginServiceFactory } from '../types';
+import { CustomIntegrationsStartDependencies } from '../../types';
 
 /**
  * A type definition for a factory to produce the `CustomIntegrationsFindService` with stubbed output.
- * @see /src/plugins/presentation_util/public/services/create/factory.ts
  */
-export type CustomIntegrationsFindServiceFactory =
-  PluginServiceFactory<CustomIntegrationsFindService>;
+export type CustomIntegrationsFindServiceFactory = PluginServiceFactory<
+  CustomIntegrationsFindService,
+  CustomIntegrationsStartDependencies
+>;
 
 /**
  * A factory to produce the `CustomIntegrationsFindService` with stubbed output.
diff --git a/src/plugins/custom_integrations/public/services/stub/index.ts b/src/plugins/custom_integrations/public/services/stub/index.ts
index fe7465949d565..e322c876ca90c 100644
--- a/src/plugins/custom_integrations/public/services/stub/index.ts
+++ b/src/plugins/custom_integrations/public/services/stub/index.ts
@@ -6,22 +6,19 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginServiceProviders,
-  PluginServiceProvider,
-  PluginServiceRegistry,
-} from '../../../../presentation_util/public';
-
 import { CustomIntegrationsServices } from '..';
 import { findServiceFactory } from './find';
 import { platformServiceFactory } from './platform';
+import { KibanaPluginServiceFactory } from '../types';
+import { CustomIntegrationsStartDependencies } from '../../types';
 
 export { findServiceFactory } from './find';
 export { platformServiceFactory } from './platform';
 
-export const providers: PluginServiceProviders<CustomIntegrationsServices> = {
-  find: new PluginServiceProvider(findServiceFactory),
-  platform: new PluginServiceProvider(platformServiceFactory),
-};
-
-export const registry = new PluginServiceRegistry<CustomIntegrationsServices>(providers);
+export const servicesFactory: KibanaPluginServiceFactory<
+  CustomIntegrationsServices,
+  CustomIntegrationsStartDependencies
+> = (params) => ({
+  find: findServiceFactory(params),
+  platform: platformServiceFactory(params),
+});
diff --git a/src/plugins/custom_integrations/public/services/stub/platform.ts b/src/plugins/custom_integrations/public/services/stub/platform.ts
index 81891c0c3ac40..17a2748382bcd 100644
--- a/src/plugins/custom_integrations/public/services/stub/platform.ts
+++ b/src/plugins/custom_integrations/public/services/stub/platform.ts
@@ -6,16 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
-
 import type { CustomIntegrationsPlatformService } from '../platform';
+import { PluginServiceFactory } from '../types';
+import { CustomIntegrationsStartDependencies } from '../../types';
 
 /**
  * A type definition for a factory to produce the `CustomIntegrationsPlatformService` with stubbed output.
- * @see /src/plugins/presentation_util/public/services/create/factory.ts
  */
-export type CustomIntegrationsPlatformServiceFactory =
-  PluginServiceFactory<CustomIntegrationsPlatformService>;
+export type CustomIntegrationsPlatformServiceFactory = PluginServiceFactory<
+  CustomIntegrationsPlatformService,
+  CustomIntegrationsStartDependencies
+>;
 
 /**
  * A factory to produce the `CustomIntegrationsPlatformService` with stubbed output.
diff --git a/src/plugins/custom_integrations/public/services/types.ts b/src/plugins/custom_integrations/public/services/types.ts
new file mode 100644
index 0000000000000..90998b25e225e
--- /dev/null
+++ b/src/plugins/custom_integrations/public/services/types.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { CoreStart } from '@kbn/core/public';
+
+/**
+ * Parameters necessary to create a Kibana-based service, (e.g. during Plugin
+ * startup or setup).
+ *
+ * The `Start` generic refers to the specific Plugin `TPluginsStart`.
+ */
+export interface KibanaPluginServiceParams<Start extends {}> {
+  coreStart: CoreStart;
+  startPlugins: Start;
+}
+
+/**
+ * A factory function for creating a Kibana-based service.
+ *
+ * The `Service` generic determines the shape of the Service being produced.
+ * The `Start` generic refers to the specific Plugin `TPluginsStart`.
+ */
+export type KibanaPluginServiceFactory<Service, Start extends {}> = (
+  params: KibanaPluginServiceParams<Start>
+) => Service;
+
+/**
+ * A factory function for creating a stubbed service
+ */
+export type PluginServiceFactory<Service, Params extends {} = {}> = (params: Params) => Service;
diff --git a/src/plugins/custom_integrations/server/custom_integration_registry.ts b/src/plugins/custom_integrations/server/custom_integration_registry.ts
index ba1b901b3fb29..e594a2ed514fd 100644
--- a/src/plugins/custom_integrations/server/custom_integration_registry.ts
+++ b/src/plugins/custom_integrations/server/custom_integration_registry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { IntegrationCategory, INTEGRATION_CATEGORY_DISPLAY, CustomIntegration } from '../common';
 
 function isAddable(integration: CustomIntegration): boolean {
diff --git a/src/plugins/custom_integrations/server/index.ts b/src/plugins/custom_integrations/server/index.ts
index e2da055e745c2..95e181903e973 100755
--- a/src/plugins/custom_integrations/server/index.ts
+++ b/src/plugins/custom_integrations/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CustomIntegrationsPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,
diff --git a/src/plugins/custom_integrations/server/language_clients/index.ts b/src/plugins/custom_integrations/server/language_clients/index.ts
index d18eddaf08627..34a804a1470f0 100644
--- a/src/plugins/custom_integrations/server/language_clients/index.ts
+++ b/src/plugins/custom_integrations/server/language_clients/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { CustomIntegrationRegistry } from '../custom_integration_registry';
 import { CustomIntegrationIcon, PLUGIN_ID } from '../../common';
 
diff --git a/src/plugins/custom_integrations/server/mocks.ts b/src/plugins/custom_integrations/server/mocks.ts
index 1846885192853..05921ce278924 100644
--- a/src/plugins/custom_integrations/server/mocks.ts
+++ b/src/plugins/custom_integrations/server/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CustomIntegrationsPluginSetup } from '../server';
+import { CustomIntegrationsPluginSetup } from '.';
 
 function createCustomIntegrationsSetup(): jest.Mocked<CustomIntegrationsPluginSetup> {
   const mock: jest.Mocked<CustomIntegrationsPluginSetup> = {
diff --git a/src/plugins/custom_integrations/server/plugin.test.ts b/src/plugins/custom_integrations/server/plugin.test.ts
index 3b18d2e960c2a..7e08fc3cb1d55 100644
--- a/src/plugins/custom_integrations/server/plugin.test.ts
+++ b/src/plugins/custom_integrations/server/plugin.test.ts
@@ -8,7 +8,7 @@
 
 import { CustomIntegrationsPlugin } from './plugin';
 
-import { coreMock } from '../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('CustomIntegrationsPlugin', () => {
   beforeEach(() => {});
diff --git a/src/plugins/custom_integrations/server/plugin.ts b/src/plugins/custom_integrations/server/plugin.ts
index 330a1288d05a2..4e7c4cffe03d4 100755
--- a/src/plugins/custom_integrations/server/plugin.ts
+++ b/src/plugins/custom_integrations/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
 import { CustomIntegrationsPluginSetup, CustomIntegrationsPluginStart } from './types';
 import { CustomIntegration } from '../common';
diff --git a/src/plugins/custom_integrations/server/routes/define_routes.ts b/src/plugins/custom_integrations/server/routes/define_routes.ts
index 77ec49363dc8f..d8863aa5ffd1a 100644
--- a/src/plugins/custom_integrations/server/routes/define_routes.ts
+++ b/src/plugins/custom_integrations/server/routes/define_routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { CustomIntegrationRegistry } from '../custom_integration_registry';
 import {
   ROUTES_APPEND_CUSTOM_INTEGRATIONS,
diff --git a/src/plugins/custom_integrations/storybook/decorator.tsx b/src/plugins/custom_integrations/storybook/decorator.tsx
index eff12dde9b74a..3ebe753061cd9 100644
--- a/src/plugins/custom_integrations/storybook/decorator.tsx
+++ b/src/plugins/custom_integrations/storybook/decorator.tsx
@@ -11,12 +11,9 @@ import React from 'react';
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { PluginServiceRegistry } from '../../presentation_util/public';
-
-import { pluginServices } from '../public/services';
-import { CustomIntegrationsServices } from '../public/services';
-import { providers } from '../public/services/storybook';
-import { EuiThemeProvider } from '../../kibana_react/common/eui_styled_components';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common/eui_styled_components';
+import { servicesFactory } from '../public/services/storybook';
+import { CustomIntegrationsServicesProvider } from '../public/services';
 
 /**
  * Returns a Storybook Decorator that provides both the `I18nProvider` and access to `PluginServices`
@@ -42,7 +39,10 @@ export const getCustomIntegrationsContextDecorator =
  * so components that access `PluginServices` can be rendered.
  */
 export const getCustomIntegrationsContextProvider = () => {
-  const registry = new PluginServiceRegistry<CustomIntegrationsServices>(providers);
-  pluginServices.setRegistry(registry.start({}));
-  return pluginServices.getContextProvider();
+  const services = servicesFactory({});
+  return ({ children }: { children?: React.ReactNode }) => (
+    <CustomIntegrationsServicesProvider {...services}>
+      {children}
+    </CustomIntegrationsServicesProvider>
+  );
 };
diff --git a/src/plugins/custom_integrations/storybook/index.ts b/src/plugins/custom_integrations/storybook/index.ts
index a9e34e1aeeb7e..3bad5c335cc7f 100644
--- a/src/plugins/custom_integrations/storybook/index.ts
+++ b/src/plugins/custom_integrations/storybook/index.ts
@@ -9,4 +9,4 @@
 export {
   getCustomIntegrationsContextDecorator as getStorybookContextDecorator,
   getCustomIntegrationsContextProvider as getStorybookContextProvider,
-} from '../storybook/decorator';
+} from './decorator';
diff --git a/src/plugins/custom_integrations/tsconfig.json b/src/plugins/custom_integrations/tsconfig.json
index ccb75c358611b..4637688572bb1 100644
--- a/src/plugins/custom_integrations/tsconfig.json
+++ b/src/plugins/custom_integrations/tsconfig.json
@@ -15,6 +15,6 @@
   ],
   "references": [
     { "path": "../../core/tsconfig.json" },
-    { "path": "../presentation_util/tsconfig.json" }
+    { "path": "../kibana_react/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/dashboard/common/bwc/types.ts b/src/plugins/dashboard/common/bwc/types.ts
index ba479210cb009..111e2c52f74bf 100644
--- a/src/plugins/dashboard/common/bwc/types.ts
+++ b/src/plugins/dashboard/common/bwc/types.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'kibana/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import type { Serializable } from '@kbn/utility-types';
 
-import { GridData } from '../';
+import { GridData } from '..';
 
 interface SavedObjectAttributes {
   kibanaSavedObjectMeta: {
diff --git a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts
index 93a6bc6f6df46..ee13926486f8b 100644
--- a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts
+++ b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { createExtract, createInject } from './dashboard_container_persistable_state';
-import { createEmbeddablePersistableStateServiceMock } from '../../../embeddable/common/mocks';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 import { DashboardContainerStateWithType } from '../types';
 
 const persistableStateService = createEmbeddablePersistableStateServiceMock();
diff --git a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts
index 9ef251d7dc54e..5346932f7034c 100644
--- a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts
+++ b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts
@@ -10,14 +10,10 @@ import {
   EmbeddableInput,
   EmbeddablePersistableStateService,
   EmbeddableStateWithType,
-} from '../../../embeddable/common';
-import { SavedObjectReference } from '../../../../core/types';
-import {
-  DashboardContainerControlGroupInput,
-  DashboardContainerStateWithType,
-  DashboardPanelState,
-} from '../types';
-import { CONTROL_GROUP_TYPE } from '../../../controls/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { CONTROL_GROUP_TYPE, PersistableControlGroupInput } from '@kbn/controls-plugin/common';
+import { DashboardContainerStateWithType, DashboardPanelState } from '../types';
 
 const getPanelStatePrefix = (state: DashboardPanelState) => `${state.explicitInput.id}:`;
 
@@ -95,7 +91,7 @@ export const createInject = (
         controlGroupReferences
       );
       workingState.controlGroupInput =
-        injectedControlGroupState as unknown as DashboardContainerControlGroupInput;
+        injectedControlGroupState as unknown as PersistableControlGroupInput;
     }
 
     return workingState as EmbeddableStateWithType;
@@ -160,7 +156,7 @@ export const createExtract = (
           id: controlGroupId,
         });
       workingState.controlGroupInput =
-        extractedControlGroupState as unknown as DashboardContainerControlGroupInput;
+        extractedControlGroupState as unknown as PersistableControlGroupInput;
       const prefixedControlGroupReferences = controlGroupReferences.map((reference) => ({
         ...reference,
         name: `${controlGroupReferencePrefix}${reference.name}`,
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
index d6418c3e1b40d..3a6475b60251c 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
@@ -12,9 +12,9 @@ import {
   InjectDeps,
   injectPanelsReferences,
 } from './embeddable_references';
-import { createEmbeddablePersistableStateServiceMock } from '../../../embeddable/common/mocks';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 import { SavedDashboardPanel } from '../types';
-import { EmbeddableStateWithType } from '../../../embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 
 const embeddablePersistableStateService = createEmbeddablePersistableStateServiceMock();
 const deps: InjectDeps & ExtractDeps = {
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.ts
index 09b05dbdcf16a..6664f70d3392a 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_references.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_references.ts
@@ -7,13 +7,13 @@
  */
 
 import { omit } from 'lodash';
+import { SavedObjectReference } from '@kbn/core/types';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types';
 import {
   convertSavedDashboardPanelToPanelState,
   convertPanelStateToSavedDashboardPanel,
 } from './embeddable_saved_object_converters';
 import { SavedDashboardPanel } from '../types';
-import { SavedObjectReference } from '../../../../core/types';
-import { EmbeddablePersistableStateService } from '../../../embeddable/common/types';
 
 export interface InjectDeps {
   embeddablePersistableStateService: EmbeddablePersistableStateService;
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts
index 66dfc5318be1d..9ec93fa85fc54 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts
@@ -11,7 +11,7 @@ import {
   convertPanelStateToSavedDashboardPanel,
 } from './embeddable_saved_object_converters';
 import { SavedDashboardPanel, DashboardPanelState } from '../types';
-import { EmbeddableInput } from '../../../embeddable/common/types';
+import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types';
 
 test('convertSavedDashboardPanelToPanelState', () => {
   const savedDashboardPanel: SavedDashboardPanel = {
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts
index e62170391381e..aa9519a5a48b9 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts
@@ -7,8 +7,8 @@
  */
 
 import { omit } from 'lodash';
+import { EmbeddableInput, SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common';
 import { DashboardPanelState, SavedDashboardPanel } from '../types';
-import { EmbeddableInput, SavedObjectEmbeddableInput } from '../../../embeddable/common/';
 
 export function convertSavedDashboardPanelToPanelState<
   TEmbeddableInput extends EmbeddableInput | SavedObjectEmbeddableInput = SavedObjectEmbeddableInput
diff --git a/src/plugins/dashboard/common/index.ts b/src/plugins/dashboard/common/index.ts
index e99fe82ffabda..73e01693977d9 100644
--- a/src/plugins/dashboard/common/index.ts
+++ b/src/plugins/dashboard/common/index.ts
@@ -28,11 +28,3 @@ export { migratePanelsTo730 } from './migrate_to_730_panels';
 export const UI_SETTINGS = {
   ENABLE_LABS_UI: 'labs:dashboard:enable_ui',
 };
-
-export {
-  controlGroupInputToRawAttributes,
-  getDefaultDashboardControlGroupInput,
-  rawAttributesToControlGroupInput,
-  rawAttributesToSerializable,
-  serializableToRawAttributes,
-} from './embeddable/dashboard_control_group';
diff --git a/src/plugins/dashboard/common/migrate_to_730_panels.ts b/src/plugins/dashboard/common/migrate_to_730_panels.ts
index ad0fa7658b6fa..f40240bd7247c 100644
--- a/src/plugins/dashboard/common/migrate_to_730_panels.ts
+++ b/src/plugins/dashboard/common/migrate_to_730_panels.ts
@@ -16,7 +16,7 @@ import {
   SavedDashboardPanel620,
   SavedDashboardPanel630,
   SavedDashboardPanel610,
-} from './';
+} from '.';
 import {
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel630,
diff --git a/src/plugins/dashboard/common/saved_dashboard_references.test.ts b/src/plugins/dashboard/common/saved_dashboard_references.test.ts
index 9ab0e7b644496..84bfe6ea48d3a 100644
--- a/src/plugins/dashboard/common/saved_dashboard_references.test.ts
+++ b/src/plugins/dashboard/common/saved_dashboard_references.test.ts
@@ -14,7 +14,7 @@ import {
 } from './saved_dashboard_references';
 
 import { createExtract, createInject } from './embeddable/dashboard_container_persistable_state';
-import { createEmbeddablePersistableStateServiceMock } from '../../embeddable/common/mocks';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 
 const embeddablePersistableStateServiceMock = createEmbeddablePersistableStateServiceMock();
 const dashboardInject = createInject(embeddablePersistableStateServiceMock);
diff --git a/src/plugins/dashboard/common/saved_dashboard_references.ts b/src/plugins/dashboard/common/saved_dashboard_references.ts
index fe549a4c13a1e..e3a3193dd85a1 100644
--- a/src/plugins/dashboard/common/saved_dashboard_references.ts
+++ b/src/plugins/dashboard/common/saved_dashboard_references.ts
@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 import semverGt from 'semver/functions/gt';
-import { SavedObjectAttributes, SavedObjectReference } from '../../../core/types';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types';
 import {
-  DashboardContainerControlGroupInput,
-  DashboardContainerStateWithType,
-  DashboardPanelState,
+  PersistableControlGroupInput,
   RawControlGroupAttributes,
-} from './types';
-import { EmbeddablePersistableStateService } from '../../embeddable/common/types';
+} from '@kbn/controls-plugin/common';
+import { DashboardContainerStateWithType, DashboardPanelState } from './types';
 import {
   convertPanelStateToSavedDashboardPanel,
   convertSavedDashboardPanelToPanelState,
@@ -41,7 +40,7 @@ function dashboardAttributesToState(attributes: SavedObjectAttributes): {
     inputPanels = JSON.parse(attributes.panelsJSON) as SavedDashboardPanel[];
   }
 
-  let controlGroupInput: DashboardContainerControlGroupInput | undefined;
+  let controlGroupInput: PersistableControlGroupInput | undefined;
   if (attributes.controlGroupInput) {
     const rawControlGroupInput =
       attributes.controlGroupInput as unknown as RawControlGroupAttributes;
diff --git a/src/plugins/dashboard/common/types.ts b/src/plugins/dashboard/common/types.ts
index 49caa41251211..941f9437e54e6 100644
--- a/src/plugins/dashboard/common/types.ts
+++ b/src/plugins/dashboard/common/types.ts
@@ -10,8 +10,9 @@ import {
   EmbeddableInput,
   EmbeddableStateWithType,
   PanelState,
-} from '../../../../src/plugins/embeddable/common/types';
-import { SavedObjectEmbeddableInput } from '../../../../src/plugins/embeddable/common/lib/saved_object_embeddable';
+} from '@kbn/embeddable-plugin/common/types';
+import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common/lib/saved_object_embeddable';
+import { PersistableControlGroupInput } from '@kbn/controls-plugin/common';
 import {
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel610,
@@ -22,7 +23,7 @@ import {
 } from './bwc/types';
 
 import { GridData } from './embeddable/types';
-import { ControlGroupInput } from '../../controls/common';
+
 export type PanelId = string;
 export type SavedObjectId = string;
 
@@ -98,23 +99,9 @@ export type SavedDashboardPanel730ToLatest = Pick<
 // Making this interface because so much of the Container type from embeddable is tied up in public
 // Once that is all available from common, we should be able to move the dashboard_container type to our common as well
 
-// dashboard only persists part of the Control Group Input
-export type DashboardContainerControlGroupInput = Pick<
-  ControlGroupInput,
-  'panels' | 'chainingSystem' | 'controlStyle' | 'ignoreParentSettings'
->;
-
-export type RawControlGroupAttributes = Omit<
-  DashboardContainerControlGroupInput,
-  'panels' | 'ignoreParentSettings'
-> & {
-  ignoreParentSettingsJSON: string;
-  panelsJSON: string;
-};
-
 export interface DashboardContainerStateWithType extends EmbeddableStateWithType {
   panels: {
     [panelId: string]: DashboardPanelState<EmbeddableInput & { [k: string]: unknown }>;
   };
-  controlGroupInput?: DashboardContainerControlGroupInput;
+  controlGroupInput?: PersistableControlGroupInput;
 }
diff --git a/src/plugins/dashboard/kibana.json b/src/plugins/dashboard/kibana.json
index 0130d4a5f8118..31bfd0a74cd09 100644
--- a/src/plugins/dashboard/kibana.json
+++ b/src/plugins/dashboard/kibana.json
@@ -30,5 +30,5 @@
   ],
   "server": true,
   "ui": true,
-  "requiredBundles": ["home", "kibanaReact", "kibanaUtils", "presentationUtil"]
+  "requiredBundles": ["kibanaReact", "kibanaUtils", "presentationUtil"]
 }
diff --git a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
index e6404d6327ec3..b682dda9dc3dc 100644
--- a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
@@ -10,12 +10,12 @@ import { AddToLibraryAction } from '.';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput } from '../test_helpers';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 import {
   EmbeddableInput,
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
index 84c968e1c2b24..b79d663df3add 100644
--- a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
@@ -10,10 +10,10 @@ import { DashboardPanelState } from '../embeddable';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { CoreStart } from 'kibana/public';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
 import { ClonePanelAction } from '.';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableFactory,
@@ -22,8 +22,8 @@ import {
   CONTACT_CARD_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
 import { ErrorEmbeddable, IContainer, isErrorEmbeddable } from '../../services/embeddable';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
index 4b2e1e39818ad..0ac6491425502 100644
--- a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import uuid from 'uuid';
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
 import { SavedObject } from '../../services/saved_objects';
 import {
diff --git a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx
index 3c9c1cbbba83e..835c80558c187 100644
--- a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayStart } from '../../../../../core/public';
+import { CoreStart, OverlayStart } from '@kbn/core/public';
 import { dashboardCopyToDashboardAction } from '../../dashboard_strings';
 import { EmbeddableStateTransfer, IEmbeddable } from '../../services/embeddable';
 import { toMountPoint } from '../../services/kibana_react';
diff --git a/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx
index f99b539ecb26c..65808d70bc8b6 100644
--- a/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx
@@ -10,10 +10,10 @@ import { ExpandPanelAction } from './expand_panel_action';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { isErrorEmbeddable } from '../../services/embeddable';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 import {
   CONTACT_CARD_EMBEDDABLE,
@@ -22,7 +22,7 @@ import {
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
 } from '../../services/embeddable_test_samples';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 
diff --git a/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx b/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx
index c08a8d4af68dd..c75bce83651fd 100644
--- a/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import { isErrorEmbeddable, IContainer, ErrorEmbeddable } from '../../services/embeddable';
-import { DashboardContainer } from '../../application/embeddable/dashboard_container';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../../application/test_helpers';
+import { DashboardContainer } from '../embeddable/dashboard_container';
+import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableInput,
@@ -18,14 +18,14 @@ import {
   ContactCardExportableEmbeddableFactory,
   CONTACT_CARD_EXPORTABLE_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { ExportCSVAction } from './export_csv_action';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
-import { DataPublicPluginStart } from '../../../../data/public/types';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { LINE_FEED_CHARACTER } from 'src/plugins/data/common/exports/export_csv';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public/types';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { LINE_FEED_CHARACTER } from '@kbn/data-plugin/common/exports/export_csv';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 describe('Export CSV action', () => {
   const { setup, doStart } = embeddablePluginMock.createInstance();
diff --git a/src/plugins/dashboard/public/application/actions/export_csv_action.tsx b/src/plugins/dashboard/public/application/actions/export_csv_action.tsx
index cffff75251080..2835e1c4dd6e2 100644
--- a/src/plugins/dashboard/public/application/actions/export_csv_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/export_csv_action.tsx
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions/public';
-import { CoreStart } from '../../../../../core/public';
-import { FormatFactory } from '../../../../field_formats/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
 
 import { DataPublicPluginStart, exporters } from '../../services/data';
 import { downloadMultipleAs } from '../../services/share';
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
index 92042f581fad4..1f1570fe02e30 100644
--- a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
@@ -9,10 +9,10 @@
 import { getSampleDashboardInput } from '../test_helpers';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { CoreStart } from 'kibana/public';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
 import { LibraryNotificationAction, UnlinkFromLibraryAction } from '.';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   ErrorEmbeddable,
   IContainer,
@@ -27,8 +27,8 @@ import {
   ContactCardEmbeddableOutput,
   CONTACT_CARD_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
index b867f83985a6e..3360d39f6f245 100644
--- a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 
+import { CoreStart } from '@kbn/core/public';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
-import { CoreStart } from '../../../../../core/public';
 import { KibanaThemeProvider, reactToUiComponent } from '../../services/kibana_react';
 import {
   IEmbeddable,
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx b/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx
index 1dc490836808b..d12332396bb89 100644
--- a/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx
@@ -10,14 +10,14 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 import { DashboardContainer } from '../embeddable/dashboard_container';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { getSampleDashboardInput } from '../test_helpers';
 import {
   LibraryNotificationPopover,
   LibraryNotificationProps,
 } from './library_notification_popover';
-import { CoreStart } from '../../../../../core/public';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { EuiPopover } from '@elastic/eui';
 import { isErrorEmbeddable } from '../../services/embeddable';
@@ -28,8 +28,8 @@ import {
   ContactCardEmbeddableOutput,
   ContactCardEmbeddable,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 describe('LibraryNotificationPopover', () => {
   const { setup, doStart } = embeddablePluginMock.createInstance();
diff --git a/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx
index fa79b02d20dd5..5d07378c6514d 100644
--- a/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx
+++ b/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { toMountPoint } from '../../services/kibana_react';
 import { ReplacePanelFlyout } from './replace_panel_flyout';
 import {
diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx
index 9781736606607..27de8862fbc2a 100644
--- a/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx
@@ -10,9 +10,9 @@ import { ReplacePanelAction } from './replace_panel_action';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { CoreStart } from 'kibana/public';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { isErrorEmbeddable } from '../../services/embeddable';
 import {
   CONTACT_CARD_EMBEDDABLE,
@@ -21,8 +21,8 @@ import {
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx
index 68e6c0861bb55..5291b414bc34e 100644
--- a/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { IEmbeddable, ViewMode, EmbeddableStart } from '../../services/embeddable';
 import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx
index 09195f1491854..5b112ed754b24 100644
--- a/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx
+++ b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
-import { NotificationsStart, Toast } from 'src/core/public';
+import { NotificationsStart, Toast } from '@kbn/core/public';
 import { DashboardPanelState } from '../embeddable';
 import {
   EmbeddableInput,
diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
index f82b8d1bc7a87..14a30ce3b90f3 100644
--- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import {
   ViewMode,
@@ -19,9 +19,9 @@ import {
 import { UnlinkFromLibraryAction } from '.';
 import { getSampleDashboardInput } from '../test_helpers';
 import { DashboardContainer } from '../embeddable/dashboard_container';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableFactory,
@@ -29,8 +29,8 @@ import {
   ContactCardEmbeddableOutput,
   CONTACT_CARD_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx
index 4eae24bc892f7..506d847d87b57 100644
--- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx
@@ -7,6 +7,7 @@
  */
 
 import _ from 'lodash';
+import { NotificationsStart } from '@kbn/core/public';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
 import {
   ViewMode,
@@ -17,7 +18,6 @@ import {
   isReferenceOrValueEmbeddable,
   isErrorEmbeddable,
 } from '../../services/embeddable';
-import { NotificationsStart } from '../../../../../core/public';
 import { dashboardUnlinkFromLibraryAction } from '../../dashboard_strings';
 import { DashboardPanelState, DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '..';
 
diff --git a/src/plugins/dashboard/public/application/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx
index a32e6643a4e3a..f3aedf36b66a7 100644
--- a/src/plugins/dashboard/public/application/dashboard_app.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_app.tsx
@@ -9,9 +9,9 @@
 import { History } from 'history';
 import React, { useEffect, useMemo } from 'react';
 
+import { useKibana, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { useDashboardSelector } from './state';
 import { useDashboardAppState } from './hooks';
-import { useKibana, useExecutionContext } from '../../../kibana_react/public';
 import {
   getDashboardBreadcrumb,
   getDashboardTitle,
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx
index a26a4d4977a84..063301fcdde17 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx
@@ -13,7 +13,7 @@ import { findTestSubject, nextTick } from '@kbn/test-jest-helpers';
 import { DashboardContainer, DashboardContainerServices } from './dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 import { I18nProvider } from '@kbn/i18n-react';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 import { KibanaContextProvider } from '../../services/kibana_react';
 import {
@@ -31,14 +31,10 @@ import {
   ContactCardEmbeddableOutput,
   createEditModeAction,
 } from '../../services/embeddable_test_samples';
-import {
-  applicationServiceMock,
-  coreMock,
-  uiSettingsServiceMock,
-} from '../../../../../core/public/mocks';
-import { inspectorPluginMock } from '../../../../inspector/public/mocks';
-import { uiActionsPluginMock } from '../../../../ui_actions/public/mocks';
-import { getStubPluginServices } from '../../../../presentation_util/public';
+import { applicationServiceMock, coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
 
 const presentationUtil = getStubPluginServices();
 const theme = coreMock.createStart().theme;
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
index 6cbf41925269d..ee4367bc87898 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
@@ -11,9 +11,10 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import uuid from 'uuid';
-import { CoreStart, IUiSettingsClient, KibanaExecutionContext } from 'src/core/public';
-import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import { CoreStart, IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 
+import { ControlGroupContainer } from '@kbn/controls-plugin/public';
 import { UiActionsStart } from '../../services/ui_actions';
 import { RefreshInterval, TimeRange, Query, Filter } from '../../services/data';
 import {
@@ -47,7 +48,6 @@ import {
   combineDashboardFiltersWithControlGroupFilters,
   syncDashboardControlGroup,
 } from '../lib/dashboard_control_group';
-import { ControlGroupContainer } from '../../../../controls/public';
 
 export interface DashboardContainerServices {
   ExitFullScreenButton: React.ComponentType<any>;
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
index 564080831607c..1077cf71454f9 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
@@ -7,9 +7,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { identity, pickBy } from 'lodash';
+import {
+  ControlGroupContainer,
+  ControlGroupInput,
+  ControlGroupOutput,
+  CONTROL_GROUP_TYPE,
+} from '@kbn/controls-plugin/public';
+import { getDefaultControlGroupInput } from '@kbn/controls-plugin/common';
 import { DashboardContainerInput } from '../..';
 import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
 import type { DashboardContainer, DashboardContainerServices } from './dashboard_container';
@@ -24,14 +31,6 @@ import {
   createExtract,
   createInject,
 } from '../../../common/embeddable/dashboard_container_persistable_state';
-import {
-  ControlGroupContainer,
-  ControlGroupInput,
-  ControlGroupOutput,
-  CONTROL_GROUP_TYPE,
-} from '../../../../controls/public';
-
-import { getDefaultDashboardControlGroupInput } from '../../../common/embeddable/dashboard_control_group';
 
 export type DashboardContainerFactory = EmbeddableFactory<
   DashboardContainerInput,
@@ -90,7 +89,7 @@ export class DashboardContainerFactoryDefinition
     const { filters, query, timeRange, viewMode, controlGroupInput, id } = initialInput;
     const controlGroup = await controlsGroupFactory?.create({
       id: `control_group_${id ?? 'new_dashboard'}`,
-      ...getDefaultDashboardControlGroupInput(),
+      ...getDefaultControlGroupInput(),
       ...pickBy(controlGroupInput, identity), // undefined keys in initialInput should not overwrite defaults
       timeRange,
       viewMode,
diff --git a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx
index 0b3a569813845..158dc61e7964d 100644
--- a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
-import { coreMock } from '../../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('DashboardEmptyScreen', () => {
   const setupMock = coreMock.createSetup();
diff --git a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx
index 5ae2d41e69730..3e4bc95fe451e 100644
--- a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx
@@ -18,7 +18,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { IUiSettingsClient, HttpStart } from 'kibana/public';
+import { IUiSettingsClient, HttpStart } from '@kbn/core/public';
 import { emptyScreenStrings } from '../../../dashboard_strings';
 
 export interface DashboardEmptyScreenProps {
diff --git a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx
index 4717082cbe0d0..c0bfe41b2c86d 100644
--- a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx
@@ -16,14 +16,14 @@ import { DashboardGrid, DashboardGridProps } from './dashboard_grid';
 import { DashboardContainer, DashboardContainerServices } from '../dashboard_container';
 import { getSampleDashboardInput } from '../../test_helpers';
 import { KibanaContextProvider } from '../../../services/kibana_react';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   CONTACT_CARD_EMBEDDABLE,
   ContactCardEmbeddableFactory,
 } from '../../../services/embeddable_test_samples';
-import { coreMock, uiSettingsServiceMock } from '../../../../../../core/public/mocks';
-import { getStubPluginServices } from '../../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../../screenshot_mode/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 let dashboardContainer: DashboardContainer | undefined;
 const presentationUtil = getStubPluginServices();
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
index 97e078246aca6..a194c1d2a9d1a 100644
--- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
+++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { EmbeddableInput } from '../../../services/embeddable';
-import { CONTACT_CARD_EMBEDDABLE } from '../../../../../embeddable/public/lib/test_samples';
+import { CONTACT_CARD_EMBEDDABLE } from '@kbn/embeddable-plugin/public/lib/test_samples';
 import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants';
 import { DashboardPanelState } from '../types';
 import { createPanelState } from './create_panel_state';
diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
index 598d6fc5eabb5..9bdb8de1c42c0 100644
--- a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { EuiLoadingChart } from '@elastic/eui';
 import classNames from 'classnames';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { Embeddable, EmbeddableInput, IContainer } from '../../../services/embeddable';
 import { KibanaThemeProvider } from '../../../services/kibana_react';
 
diff --git a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx
index 9075a7f90b103..0fa1d4beba497 100644
--- a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx
@@ -16,18 +16,14 @@ import { DashboardViewport, DashboardViewportProps } from './dashboard_viewport'
 import { DashboardContainer, DashboardContainerServices } from '../dashboard_container';
 import { getSampleDashboardInput } from '../../test_helpers';
 import { KibanaContextProvider } from '../../../services/kibana_react';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
-import {
-  applicationServiceMock,
-  coreMock,
-  uiSettingsServiceMock,
-} from '../../../../../../core/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { applicationServiceMock, coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import {
   ContactCardEmbeddableFactory,
   CONTACT_CARD_EMBEDDABLE,
-} from '../../../../../embeddable/public/lib/test_samples';
-import { getStubPluginServices } from '../../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../../screenshot_mode/public/mocks';
+} from '@kbn/embeddable-plugin/public/lib/test_samples';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 let dashboardContainer: DashboardContainer | undefined;
 const presentationUtil = getStubPluginServices();
diff --git a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
index 0e700e058eef4..82c5bab836a85 100644
--- a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
@@ -8,16 +8,16 @@
 
 import React from 'react';
 import { Subscription } from 'rxjs';
+import {
+  CalloutProps,
+  ControlGroupContainer,
+  LazyControlsCallout,
+} from '@kbn/controls-plugin/public';
 import { ViewMode } from '../../../services/embeddable';
 import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
 import { DashboardGrid } from '../grid';
 import { context } from '../../../services/kibana_react';
 import { DashboardEmptyScreen } from '../empty_screen/dashboard_empty_screen';
-import {
-  CalloutProps,
-  ControlGroupContainer,
-  LazyControlsCallout,
-} from '../../../../../controls/public';
 import { withSuspense } from '../../../services/presentation_util';
 
 export interface DashboardViewportProps {
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
index 039a600d153b2..2f1f88b8b802f 100644
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
@@ -13,17 +13,17 @@ import { createBrowserHistory } from 'history';
 import { renderHook, act, RenderHookResult } from '@testing-library/react-hooks';
 
 import { DashboardSessionStorage } from '../lib';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DashboardConstants } from '../../dashboard_constants';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { SavedObjectLoader } from '../../services/saved_objects';
 import { DashboardAppServices, DashboardAppState } from '../../types';
 import { DashboardContainer } from '../embeddable/dashboard_container';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { EmbeddableFactory, ViewMode } from '../../services/embeddable';
 import { dashboardStateStore, setDescription, setViewMode } from '../state';
 import { DashboardContainerServices } from '../embeddable/dashboard_container';
-import { createKbnUrlStateStorage, defer } from '../../../../kibana_utils/public';
+import { createKbnUrlStateStorage, defer } from '@kbn/kibana-utils-plugin/public';
 import { useDashboardAppState, UseDashboardStateProps } from './use_dashboard_app_state';
 import {
   getSampleDashboardInput,
diff --git a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
index 4db7eabe6d78d..4befdfc188df3 100644
--- a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
+++ b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { DashboardSavedObject } from '../../saved_dashboards';
 import { DashboardContainer, DASHBOARD_CONTAINER_TYPE } from '../embeddable';
 import {
diff --git a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
index cc35fa8307d2f..24d891c658056 100644
--- a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
+++ b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
@@ -7,7 +7,8 @@
  */
 
 import _ from 'lodash';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { ControlGroupInput } from '@kbn/controls-plugin/public';
 import { DashboardSavedObject } from '../../saved_dashboards';
 import { getTagsFromSavedDashboard, migrateAppState } from '.';
 import { EmbeddablePackageState, ViewMode } from '../../services/embeddable';
@@ -22,7 +23,6 @@ import {
 } from '../../types';
 import { convertSavedPanelsToPanelMap } from './convert_dashboard_panels';
 import { deserializeControlGroupFromDashboardSavedObject } from './dashboard_control_group';
-import { ControlGroupInput } from '../../../../controls/public';
 
 interface SavedObjectToDashboardStateProps {
   version: string;
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts b/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
index ef8e2785b8a45..83497babc2654 100644
--- a/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
+++ b/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
@@ -11,16 +11,19 @@ import deepEqual from 'fast-deep-equal';
 import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query';
 import { debounceTime, distinctUntilChanged, distinctUntilKeyChanged } from 'rxjs/operators';
 
-import { pick } from 'lodash';
-import { DashboardContainer, DashboardContainerControlGroupInput } from '..';
+import {
+  ControlGroupInput,
+  controlGroupInputToRawControlGroupAttributes,
+  getDefaultControlGroupInput,
+  persistableControlGroupInputIsEqual,
+  rawControlGroupAttributesToControlGroupInput,
+} from '@kbn/controls-plugin/common';
+import { ControlGroupContainer } from '@kbn/controls-plugin/public';
+
+import { DashboardContainer } from '..';
 import { DashboardState } from '../../types';
 import { DashboardContainerInput, DashboardSavedObject } from '../..';
-import { ControlGroupContainer, ControlGroupInput } from '../../../../controls/public';
-import {
-  controlGroupInputToRawAttributes,
-  getDefaultDashboardControlGroupInput,
-  rawAttributesToControlGroupInput,
-} from '../../../common';
+
 interface DiffChecks {
   [key: string]: (a?: unknown, b?: unknown) => boolean;
 }
@@ -45,7 +48,7 @@ export const syncDashboardControlGroup = async ({
   const subscriptions = new Subscription();
 
   const isControlGroupInputEqual = () =>
-    controlGroupInputIsEqual(
+    persistableControlGroupInputIsEqual(
       controlGroup.getInput(),
       dashboardContainer.getInput().controlGroupInput
     );
@@ -122,7 +125,7 @@ export const syncDashboardControlGroup = async ({
       .subscribe(() => {
         if (!isControlGroupInputEqual()) {
           if (!dashboardContainer.getInput().controlGroupInput) {
-            controlGroup.updateInput(getDefaultDashboardControlGroupInput());
+            controlGroup.updateInput(getDefaultControlGroupInput());
             return;
           }
           controlGroup.updateInput({ ...dashboardContainer.getInput().controlGroupInput });
@@ -152,39 +155,22 @@ export const syncDashboardControlGroup = async ({
   };
 };
 
-export const controlGroupInputIsEqual = (
-  a: DashboardContainerControlGroupInput | undefined,
-  b: DashboardContainerControlGroupInput | undefined
-) => {
-  const defaultInput = getDefaultDashboardControlGroupInput();
-  const inputA = {
-    ...defaultInput,
-    ...pick(a, ['panels', 'chainingSystem', 'controlStyle', 'ignoreParentSettings']),
-  };
-  const inputB = {
-    ...defaultInput,
-    ...pick(b, ['panels', 'chainingSystem', 'controlStyle', 'ignoreParentSettings']),
-  };
-  if (deepEqual(inputA, inputB)) return true;
-  return false;
-};
-
 export const serializeControlGroupToDashboardSavedObject = (
   dashboardSavedObject: DashboardSavedObject,
   dashboardState: DashboardState
 ) => {
   // only save to saved object if control group is not default
   if (
-    controlGroupInputIsEqual(
+    persistableControlGroupInputIsEqual(
       dashboardState.controlGroupInput,
-      getDefaultDashboardControlGroupInput()
+      getDefaultControlGroupInput()
     )
   ) {
     dashboardSavedObject.controlGroupInput = undefined;
     return;
   }
   if (dashboardState.controlGroupInput) {
-    dashboardSavedObject.controlGroupInput = controlGroupInputToRawAttributes(
+    dashboardSavedObject.controlGroupInput = controlGroupInputToRawControlGroupAttributes(
       dashboardState.controlGroupInput
     );
   }
@@ -194,7 +180,7 @@ export const deserializeControlGroupFromDashboardSavedObject = (
   dashboardSavedObject: DashboardSavedObject
 ): Omit<ControlGroupInput, 'id'> | undefined => {
   if (!dashboardSavedObject.controlGroupInput) return;
-  return rawAttributesToControlGroupInput(dashboardSavedObject.controlGroupInput);
+  return rawControlGroupAttributesToControlGroupInput(dashboardSavedObject.controlGroupInput);
 };
 
 export const combineDashboardFiltersWithControlGroupFilters = (
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
index ca4fa85b4b55c..60116c69dca9f 100644
--- a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
+++ b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
@@ -7,12 +7,12 @@
  */
 
 import { History } from 'history';
+import { createQueryParamObservable } from '@kbn/kibana-utils-plugin/public';
 import { DashboardAppLocatorParams, DashboardConstants } from '../..';
 import { DashboardState } from '../../types';
 import { getDashboardTitle } from '../../dashboard_strings';
 import { DashboardSavedObject } from '../../saved_dashboards';
 import { getQueryParams } from '../../services/kibana_utils';
-import { createQueryParamObservable } from '../../../../kibana_utils/public';
 import {
   DataPublicPluginStart,
   noSearchSessionStorageCapabilityMessage,
diff --git a/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts
index 85a8bf54c9266..ec42e18bad858 100644
--- a/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts
+++ b/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts
@@ -10,8 +10,8 @@ import { xor, omit, isEmpty } from 'lodash';
 import fastIsEqual from 'fast-deep-equal';
 import { compareFilters, COMPARE_ALL_OPTIONS, type Filter, isFilterPinned } from '@kbn/es-query';
 
+import { persistableControlGroupInputIsEqual } from '@kbn/controls-plugin/common';
 import { DashboardContainerInput } from '../..';
-import { controlGroupInputIsEqual } from './dashboard_control_group';
 import { DashboardOptions, DashboardPanelMap, DashboardState } from '../../types';
 import { IEmbeddable } from '../../services/embeddable';
 
@@ -84,7 +84,7 @@ export const diffDashboardState = async ({
   );
   const optionsAreEqual = getOptionsAreEqual(originalState.options, newState.options);
   const filtersAreEqual = getFiltersAreEqual(originalState.filters, newState.filters, true);
-  const controlGroupIsEqual = controlGroupInputIsEqual(
+  const controlGroupIsEqual = persistableControlGroupInputIsEqual(
     originalState.controlGroupInput,
     newState.controlGroupInput
   );
diff --git a/src/plugins/dashboard/public/application/lib/help_menu_util.ts b/src/plugins/dashboard/public/application/lib/help_menu_util.ts
index adea5fdc84d47..4a0b882e80ad9 100644
--- a/src/plugins/dashboard/public/application/lib/help_menu_util.ts
+++ b/src/plugins/dashboard/public/application/lib/help_menu_util.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { ChromeStart, DocLinksStart } from '@kbn/core/public';
 
 export function addHelpMenuToAppChrome(chrome: ChromeStart, docLinks: DocLinksStart) {
   chrome.setHelpExtension({
diff --git a/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts b/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts
index 72b06ded8ca76..f785589f1bbd6 100644
--- a/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts
+++ b/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { DashboardSavedObject } from '../..';
-import { SavedObjectsClientContract } from '../../../../../core/public';
 
 export async function attemptLoadDashboardByTitle(
   title: string,
diff --git a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts b/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
index 55366ac50fd2e..0a86ed7efe5f3 100644
--- a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
+++ b/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getSavedDashboardMock } from '../test_helpers';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createSessionRestorationDataProvider, savedObjectToDashboardState } from '.';
 
 describe('createSessionRestorationDataProvider', () => {
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
index 8bf2f0881f4f4..02f939ef69eea 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
@@ -11,6 +11,7 @@ import { Subscription } from 'rxjs';
 import { debounceTime, tap } from 'rxjs/operators';
 
 import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query';
+import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { DashboardContainer } from '../embeddable';
 import { Query } from '../../services/data';
 import { DashboardConstants, DashboardSavedObject } from '../..';
@@ -23,7 +24,6 @@ import {
   setTimeRange,
 } from '../state';
 import { diffDashboardContainerInput } from './diff_dashboard_state';
-import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
 import { DashboardBuildContext, DashboardContainerInput } from '../../types';
 import {
   getSearchSessionIdFromURL,
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
index 227430142325a..0aa9e9c595fc1 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
@@ -9,11 +9,11 @@
 import _ from 'lodash';
 import { debounceTime } from 'rxjs/operators';
 
+import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { migrateAppState } from '.';
 import { DashboardSavedObject } from '../..';
 import { setDashboardState } from '../state';
 import { migrateLegacyQuery } from './migrate_legacy_query';
-import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
 import { applyDashboardFilterState } from './sync_dashboard_filter_state';
 import { DASHBOARD_STATE_STORAGE_KEY } from '../../dashboard_constants';
 import type {
diff --git a/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx b/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
index f2792790f2f5d..5ecbeb966d6e8 100644
--- a/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
+++ b/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import React from 'react';
 
-import { CoreStart, OverlayStart } from '../../../../../core/public';
+import { CoreStart, OverlayStart } from '@kbn/core/public';
 import { toMountPoint } from '../../services/kibana_react';
 import { createConfirmStrings, discardConfirmStrings } from '../../dashboard_strings';
 
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
index 065544409b8cf..a4831d9231b73 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
@@ -11,7 +11,7 @@ import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n-react';
 
 import { DashboardAppServices } from '../../types';
-import { SimpleSavedObject } from '../../../../../core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { KibanaContextProvider } from '../../services/kibana_react';
 import { createKbnUrlStateStorage } from '../../services/kibana_utils';
 import { DashboardListing, DashboardListingProps } from './dashboard_listing';
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
index 0f07a45fa0241..35052c23812c0 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
@@ -17,6 +17,8 @@ import {
   EuiButtonEmpty,
 } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { ApplicationStart, SavedObjectsFindOptionsReference } from '@kbn/core/public';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { attemptLoadDashboardByTitle } from '../lib';
 import { DashboardAppServices, DashboardRedirect } from '../../types';
 import {
@@ -26,7 +28,6 @@ import {
   dashboardUnsavedListingStrings,
   getNewDashboardTitle,
 } from '../../dashboard_strings';
-import { ApplicationStart, SavedObjectsFindOptionsReference } from '../../../../../core/public';
 import { syncQueryStateWithUrl } from '../../services/data';
 import { IKbnUrlStateStorage } from '../../services/kibana_utils';
 import { TableListView, useKibana } from '../../services/kibana_react';
@@ -35,7 +36,6 @@ import { DashboardUnsavedListing } from './dashboard_unsaved_listing';
 import { confirmCreateWithUnsaved, confirmDiscardUnsavedChanges } from './confirm_overlays';
 import { getDashboardListItemLink } from './get_dashboard_list_item_link';
 import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_session_storage';
-import { useExecutionContext } from '../../../../kibana_react/public';
 
 const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
 const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage';
diff --git a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts
index ce9535e549446..2b45977eaafed 100644
--- a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts
+++ b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { getDashboardListItemLink } from './get_dashboard_list_item_link';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createHashHistory } from 'history';
 import { FilterStateStore } from '@kbn/es-query';
-import { createKbnUrlStateStorage } from '../../../../kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { GLOBAL_STATE_STORAGE_KEY } from '../../dashboard_constants';
 
 const DASHBOARD_ID = '13823000-99b9-11ea-9eb6-d9e8adceb647';
diff --git a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts
index 8af3f2a10666f..1589c3dd3fa86 100644
--- a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts
+++ b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { QueryState } from '../../../../data/public';
-import { setStateToKbnUrl } from '../../../../kibana_utils/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { QueryState } from '@kbn/data-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import {
   DashboardConstants,
   createDashboardEditUrl,
diff --git a/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts b/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts
index ee403939a9e8c..35f9789023ec5 100644
--- a/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts
+++ b/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts
@@ -7,11 +7,11 @@
  */
 
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { PersistableControlGroupInput } from '@kbn/controls-plugin/common';
 
 import { Filter, Query, TimeRange } from '../../services/data';
 import { ViewMode } from '../../services/embeddable';
 import { DashboardOptions, DashboardPanelMap, DashboardState } from '../../types';
-import { DashboardContainerControlGroupInput } from '../embeddable';
 
 export const dashboardStateSlice = createSlice({
   name: 'dashboardState',
@@ -44,7 +44,7 @@ export const dashboardStateSlice = createSlice({
     },
     setControlGroupState: (
       state,
-      action: PayloadAction<DashboardContainerControlGroupInput | undefined>
+      action: PayloadAction<PersistableControlGroupInput | undefined>
     ) => {
       state.controlGroupInput = action.payload;
     },
diff --git a/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts
index 20e28359cb36d..69da1dbbe56a2 100644
--- a/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts
+++ b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { DashboardSavedObject } from '../../saved_dashboards';
 
 export function getSavedDashboardMock(
diff --git a/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts b/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
index 656f5672e38c0..ada51e21aaff9 100644
--- a/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
+++ b/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
@@ -6,24 +6,20 @@
  * Side Public License, v 1.
  */
 
-import { DashboardSessionStorage } from '../lib';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { getSavedDashboardMock } from './get_saved_dashboard_mock';
-import { UrlForwardingStart } from '../../../../url_forwarding/public';
-import { NavigationPublicPluginStart } from '../../services/navigation';
-import { DashboardAppServices, DashboardAppCapabilities } from '../../types';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
-import { DataViewsContract, SavedQueryService } from '../../services/data';
-import { savedObjectsPluginMock } from '../../../../saved_objects/public/mocks';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
-import { visualizationsPluginMock } from '../../../../visualizations/public/mocks';
-import { PluginInitializerContext, ScopedHistory } from '../../../../../core/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
+import { visualizationsPluginMock } from '@kbn/visualizations-plugin/public/mocks';
+import { PluginInitializerContext, ScopedHistory } from '@kbn/core/public';
+import { chromeServiceMock, coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { SavedObjectLoader, SavedObjectLoaderFindOptions } from '../../services/saved_objects';
-import {
-  chromeServiceMock,
-  coreMock,
-  uiSettingsServiceMock,
-} from '../../../../../core/public/mocks';
+import { DataViewsContract, SavedQueryService } from '../../services/data';
+import { DashboardAppServices, DashboardAppCapabilities } from '../../types';
+import { NavigationPublicPluginStart } from '../../services/navigation';
+import { getSavedDashboardMock } from './get_saved_dashboard_mock';
+import { DashboardSessionStorage } from '../lib';
 
 export function makeDefaultServices(): DashboardAppServices {
   const core = coreMock.createStart();
diff --git a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
index 23bc301f788c0..6d6b2382f5a14 100644
--- a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
@@ -12,6 +12,18 @@ import { EuiHorizontalRule } from '@elastic/eui';
 import UseUnmount from 'react-use/lib/useUnmount';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
+import { OverlayRef } from '@kbn/core/public';
+import { TopNavMenuProps } from '@kbn/navigation-plugin/public';
+import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import {
+  AddFromLibraryButton,
+  LazyLabsFlyout,
+  PrimaryActionButton,
+  QuickButtonGroup,
+  QuickButtonProps,
+  SolutionToolbar,
+  withSuspense,
+} from '@kbn/presentation-util-plugin/public';
 import { saveDashboard } from '../lib';
 import { TopNavIds } from './top_nav_ids';
 import { EditorMenu } from './editor_menu';
@@ -21,13 +33,10 @@ import { DashboardSaveModal } from './save_modal';
 import { showCloneModal } from './show_clone_modal';
 import { ShowShareModal } from './show_share_modal';
 import { getTopNavConfig } from './get_top_nav_config';
-import { OverlayRef } from '../../../../../core/public';
 import { useKibana } from '../../services/kibana_react';
 import { showOptionsPopover } from './show_options_popover';
 import { DashboardConstants } from '../../dashboard_constants';
-import { TopNavMenuProps } from '../../../../navigation/public';
 import { confirmDiscardUnsavedChanges } from '../listing/confirm_overlays';
-import { BaseVisType, VisTypeAlias } from '../../../../visualizations/public';
 import { DashboardAppState, DashboardSaveOptions, NavAction } from '../../types';
 import { isErrorEmbeddable, openAddPanelFlyout, ViewMode } from '../../services/embeddable';
 import { DashboardAppServices, DashboardEmbedSettings, DashboardRedirect } from '../../types';
@@ -45,16 +54,6 @@ import {
   useDashboardSelector,
 } from '../state';
 
-import {
-  AddFromLibraryButton,
-  LazyLabsFlyout,
-  PrimaryActionButton,
-  QuickButtonGroup,
-  QuickButtonProps,
-  SolutionToolbar,
-  withSuspense,
-} from '../../../../presentation_util/public';
-
 export interface DashboardTopNavState {
   chromeIsVisible: boolean;
   addPanelOverlay?: OverlayRef;
diff --git a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
index 5fece7ff959ce..b0d4270c4bca5 100644
--- a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
@@ -14,8 +14,8 @@ import {
 } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
-import { BaseVisType, VisGroups, VisTypeAlias } from '../../../../visualizations/public';
-import { SolutionToolbarPopover } from '../../../../presentation_util/public';
+import { BaseVisType, VisGroups, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import { SolutionToolbarPopover } from '@kbn/presentation-util-plugin/public';
 import { EmbeddableFactoryDefinition, EmbeddableInput } from '../../services/embeddable';
 import { useKibana } from '../../services/kibana_react';
 import { DashboardAppServices } from '../../types';
diff --git a/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
index 9b286518621aa..90972758e5df1 100644
--- a/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
+++ b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import { ViewMode } from '../../services/embeddable';
 import { TopNavIds } from './top_nav_ids';
 import { NavAction } from '../../types';
-import { TopNavMenuData } from '../../../../navigation/public';
 
 /**
  * @param actions - A mapping of TopNavIds to an action function that should run when the
diff --git a/src/plugins/dashboard/public/application/top_nav/save_modal.test.js b/src/plugins/dashboard/public/application/top_nav/save_modal.test.js
index 5a8cb8d56db69..89cd53fd53624 100644
--- a/src/plugins/dashboard/public/application/top_nav/save_modal.test.js
+++ b/src/plugins/dashboard/public/application/top_nav/save_modal.test.js
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 
-jest.mock('../../../../saved_objects/public', () => ({
+jest.mock('@kbn/saved-objects-plugin/public', () => ({
   SavedObjectSaveModal: () => null,
 }));
 
diff --git a/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx b/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx
index 5c7ec042bf1d9..fc060f965630a 100644
--- a/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { DashboardCloneModal } from './clone_modal';
 import { KibanaThemeProvider } from '../../services/kibana_react';
 
diff --git a/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx b/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx
index c53103075dcfb..8f5e86b4dab6b 100644
--- a/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { EuiWrappingPopover } from '@elastic/eui';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { OptionsMenu } from './options';
 import { KibanaThemeProvider } from '../../services/kibana_react';
 
diff --git a/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx b/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx
index 3bfac12a6b500..015214260a10b 100644
--- a/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx
@@ -10,7 +10,7 @@ import { EuiCheckboxGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import React, { ReactElement, useState } from 'react';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import { DashboardSavedObject } from '../..';
 import { shareModalStrings } from '../../dashboard_strings';
 import { DashboardAppLocatorParams, DASHBOARD_APP_LOCATOR } from '../../locator';
diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
index 8acbe5f4d511f..7cb54db209c1d 100644
--- a/src/plugins/dashboard/public/index.ts
+++ b/src/plugins/dashboard/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DashboardPlugin } from './plugin';
 
 export {
diff --git a/src/plugins/dashboard/public/locator.test.ts b/src/plugins/dashboard/public/locator.test.ts
index 11ec16908b811..bc82477beb192 100644
--- a/src/plugins/dashboard/public/locator.test.ts
+++ b/src/plugins/dashboard/public/locator.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { DashboardAppLocatorDefinition } from './locator';
-import { hashedItemStore } from '../../kibana_utils/public';
-import { mockStorage } from '../../kibana_utils/public/storage/hashed_item_store/mock';
+import { hashedItemStore } from '@kbn/kibana-utils-plugin/public';
+import { mockStorage } from '@kbn/kibana-utils-plugin/public/storage/hashed_item_store/mock';
 import { FilterStateStore } from '@kbn/es-query';
 
 describe('dashboard locator', () => {
diff --git a/src/plugins/dashboard/public/locator.ts b/src/plugins/dashboard/public/locator.ts
index 7fa24ebf0636a..9c187ca0803cf 100644
--- a/src/plugins/dashboard/public/locator.ts
+++ b/src/plugins/dashboard/public/locator.ts
@@ -9,12 +9,12 @@
 import type { SerializableRecord } from '@kbn/utility-types';
 import { flow } from 'lodash';
 import { type Filter } from '@kbn/es-query';
-import type { TimeRange, Query, QueryState, RefreshInterval } from '../../data/public';
-import type { LocatorDefinition, LocatorPublic } from '../../share/public';
+import type { TimeRange, Query, QueryState, RefreshInterval } from '@kbn/data-plugin/public';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type { SavedDashboardPanel } from '../common/types';
 import type { RawDashboardState } from './types';
-import { setStateToKbnUrl } from '../../kibana_utils/public';
-import { ViewMode } from '../../embeddable/public';
 import { DashboardConstants } from './dashboard_constants';
 
 /**
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 2f63062ccf60c..9d10f8d5b42ec 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -10,9 +10,9 @@ import * as React from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
-import { UrlForwardingSetup, UrlForwardingStart } from 'src/plugins/url_forwarding/public';
-import { APP_WRAPPER_CLASS } from '../../../core/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
+import { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import {
   App,
   Plugin,
@@ -24,14 +24,15 @@ import {
   DEFAULT_APP_CATEGORIES,
   PluginInitializerContext,
   SavedObjectsClientContract,
-} from '../../../core/public';
-import { VisualizationsStart } from '../../visualizations/public';
+} from '@kbn/core/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
 
+import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { createKbnUrlTracker } from './services/kibana_utils';
 import { UsageCollectionSetup } from './services/usage_collection';
 import { UiActionsSetup, UiActionsStart } from './services/ui_actions';
 import { PresentationUtilPluginStart } from './services/presentation_util';
-import { FeatureCatalogueCategory, HomePublicPluginSetup } from './services/home';
+import type { HomePublicPluginSetup } from './services/home';
 import { NavigationPublicPluginStart as NavigationStart } from './services/navigation';
 import { DataPublicPluginSetup, DataPublicPluginStart } from './services/data';
 import { SharePluginSetup, SharePluginStart } from './services/share';
@@ -76,7 +77,6 @@ import { DashboardConstants } from './dashboard_constants';
 import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder';
 import { ExportCSVAction } from './application/actions/export_csv_action';
 import { dashboardFeatureCatalog } from './dashboard_strings';
-import { replaceUrlHashQuery } from '../../kibana_utils/public';
 import { SpacesPluginStart } from './services/spaces';
 
 export interface DashboardFeatureFlagConfig {
@@ -321,7 +321,7 @@ export class DashboardPlugin
         icon: 'dashboardApp',
         path: `/app/dashboards#${DashboardConstants.LANDING_PAGE_PATH}`,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         solutionId: 'kibana',
         order: 100,
       });
diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
index 32d80c4016bec..cf79354719dbc 100644
--- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
@@ -7,8 +7,10 @@
  */
 
 import { assign, cloneDeep } from 'lodash';
-import { SavedObjectsClientContract } from 'kibana/public';
-import type { ResolvedSimpleSavedObject } from 'src/core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
+import type { ResolvedSimpleSavedObject } from '@kbn/core/public';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types';
+import { RawControlGroupAttributes } from '@kbn/controls-plugin/common';
 import { EmbeddableStart } from '../services/embeddable';
 import { SavedObject, SavedObjectsStart } from '../services/saved_objects';
 import { Filter, ISearchSource, Query, RefreshInterval } from '../services/data';
@@ -16,9 +18,7 @@ import { Filter, ISearchSource, Query, RefreshInterval } from '../services/data'
 import { createDashboardEditUrl } from '../dashboard_constants';
 import { extractReferences, injectReferences } from '../../common/saved_dashboard_references';
 
-import { SavedObjectAttributes, SavedObjectReference } from '../../../../core/types';
 import { DashboardOptions } from '../types';
-import { RawControlGroupAttributes } from '../application';
 
 export interface DashboardSavedObject extends SavedObject {
   id?: string;
diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
index 94877b6c3c823..e5f919cd2a45a 100644
--- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 
 import { EmbeddableStart } from '../services/embeddable';
 import { SavedObjectLoader, SavedObjectsStart } from '../services/saved_objects';
diff --git a/src/plugins/dashboard/public/services/core.ts b/src/plugins/dashboard/public/services/core.ts
index 38c91842de4f2..7b1aaeb1f990b 100644
--- a/src/plugins/dashboard/public/services/core.ts
+++ b/src/plugins/dashboard/public/services/core.ts
@@ -13,5 +13,5 @@ export type {
   PluginInitializerContext,
   NotificationsStart,
   ApplicationStart,
-} from '../../../../core/public';
-export { ScopedHistory } from '../../../../core/public';
+} from '@kbn/core/public';
+export { ScopedHistory } from '@kbn/core/public';
diff --git a/src/plugins/dashboard/public/services/data.ts b/src/plugins/dashboard/public/services/data.ts
index 02df973dd3976..da5f4e12299db 100644
--- a/src/plugins/dashboard/public/services/data.ts
+++ b/src/plugins/dashboard/public/services/data.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data/public';
+export * from '@kbn/data-plugin/public';
diff --git a/src/plugins/dashboard/public/services/data_views.ts b/src/plugins/dashboard/public/services/data_views.ts
index 4fb2bbaf08503..21e6a2e9e645c 100644
--- a/src/plugins/dashboard/public/services/data_views.ts
+++ b/src/plugins/dashboard/public/services/data_views.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/public';
+export * from '@kbn/data-views-plugin/public';
diff --git a/src/plugins/dashboard/public/services/embeddable.ts b/src/plugins/dashboard/public/services/embeddable.ts
index 2a7d97d0d683b..1fa960f11aed7 100644
--- a/src/plugins/dashboard/public/services/embeddable.ts
+++ b/src/plugins/dashboard/public/services/embeddable.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../embeddable/public';
+export * from '@kbn/embeddable-plugin/public';
diff --git a/src/plugins/dashboard/public/services/embeddable_test_samples.ts b/src/plugins/dashboard/public/services/embeddable_test_samples.ts
index 5d8117d394c82..0c314893230b6 100644
--- a/src/plugins/dashboard/public/services/embeddable_test_samples.ts
+++ b/src/plugins/dashboard/public/services/embeddable_test_samples.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../embeddable/public/lib/test_samples';
+export * from '@kbn/embeddable-plugin/public/lib/test_samples';
diff --git a/src/plugins/dashboard/public/services/home.ts b/src/plugins/dashboard/public/services/home.ts
index ebbb715e53ca6..ee26c3cd9c4bc 100644
--- a/src/plugins/dashboard/public/services/home.ts
+++ b/src/plugins/dashboard/public/services/home.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { HomePublicPluginSetup } from '../../../home/public';
-export { FeatureCatalogueCategory } from '../../../home/public';
+export type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+export { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
diff --git a/src/plugins/dashboard/public/services/kibana_react.ts b/src/plugins/dashboard/public/services/kibana_react.ts
index 8cab64065824d..9ef6416ba44ea 100644
--- a/src/plugins/dashboard/public/services/kibana_react.ts
+++ b/src/plugins/dashboard/public/services/kibana_react.ts
@@ -10,7 +10,7 @@ export type {
   KibanaReactContext,
   KibanaReactContextValue,
   ExitFullScreenButtonProps,
-} from '../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 export {
   context,
   useKibana,
@@ -21,4 +21,4 @@ export {
   ExitFullScreenButton,
   KibanaContextProvider,
   KibanaThemeProvider,
-} from '../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/src/plugins/dashboard/public/services/kibana_utils.ts b/src/plugins/dashboard/public/services/kibana_utils.ts
index 599e9b73f504f..6e54cff517135 100644
--- a/src/plugins/dashboard/public/services/kibana_utils.ts
+++ b/src/plugins/dashboard/public/services/kibana_utils.ts
@@ -10,7 +10,7 @@ export type {
   ISyncStateRef,
   IKbnUrlStateStorage,
   ReduxLikeStateContainer,
-} from '../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 export {
   Storage,
   unhashUrl,
@@ -23,4 +23,4 @@ export {
   SavedObjectNotFound,
   createStateContainer,
   createKbnUrlStateStorage,
-} from '../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
diff --git a/src/plugins/dashboard/public/services/navigation.ts b/src/plugins/dashboard/public/services/navigation.ts
index eb1622eba35e0..9b5b4d515d393 100644
--- a/src/plugins/dashboard/public/services/navigation.ts
+++ b/src/plugins/dashboard/public/services/navigation.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { NavigationPublicPluginStart } from '../../../navigation/public';
+export type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
diff --git a/src/plugins/dashboard/public/services/presentation_util.ts b/src/plugins/dashboard/public/services/presentation_util.ts
index d640b6326729d..0375a87387e08 100644
--- a/src/plugins/dashboard/public/services/presentation_util.ts
+++ b/src/plugins/dashboard/public/services/presentation_util.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { PresentationUtilPluginStart } from '../../../presentation_util/public';
-export { LazyDashboardPicker, withSuspense, useLabs } from '../../../presentation_util/public';
+export type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+export { LazyDashboardPicker, withSuspense, useLabs } from '@kbn/presentation-util-plugin/public';
diff --git a/src/plugins/dashboard/public/services/saved_object_loader.ts b/src/plugins/dashboard/public/services/saved_object_loader.ts
index 521d6645e30f9..3c406357c0294 100644
--- a/src/plugins/dashboard/public/services/saved_object_loader.ts
+++ b/src/plugins/dashboard/public/services/saved_object_loader.ts
@@ -11,8 +11,8 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsFindOptionsReference,
   SavedObjectReference,
-} from 'kibana/public';
-import { SavedObject } from '../../../saved_objects/public';
+} from '@kbn/core/public';
+import { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { upperFirst } from './string_utils';
 
 /**
diff --git a/src/plugins/dashboard/public/services/saved_objects.ts b/src/plugins/dashboard/public/services/saved_objects.ts
index afd778d78b271..79be111f94371 100644
--- a/src/plugins/dashboard/public/services/saved_objects.ts
+++ b/src/plugins/dashboard/public/services/saved_objects.ts
@@ -11,11 +11,11 @@ export type {
   SavedObject,
   SavedObjectsStart,
   SavedObjectSaveOpts,
-} from '../../../saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
 export {
   showSaveModal,
   SavedObjectSaveModal,
   getSavedObjectFinder,
-} from '../../../saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
 export { SavedObjectLoader } from './saved_object_loader';
 export type { SavedObjectLoaderFindOptions } from './saved_object_loader';
diff --git a/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts b/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts
index 585f428960147..b660cae8a2ac5 100644
--- a/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts
+++ b/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts
@@ -11,4 +11,4 @@ export type {
   TagDecoratedSavedObject,
   SavedObjectTagDecoratorTypeGuard,
   SavedObjectTaggingOssPluginStart,
-} from '../../../saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
diff --git a/src/plugins/dashboard/public/services/screenshot_mode.ts b/src/plugins/dashboard/public/services/screenshot_mode.ts
index 577aa3eab36b5..7447737d1c8bf 100644
--- a/src/plugins/dashboard/public/services/screenshot_mode.ts
+++ b/src/plugins/dashboard/public/services/screenshot_mode.ts
@@ -9,4 +9,4 @@
 export type {
   ScreenshotModePluginStart,
   ScreenshotModePluginSetup,
-} from '../../../screenshot_mode/public';
+} from '@kbn/screenshot-mode-plugin/public';
diff --git a/src/plugins/dashboard/public/services/share.ts b/src/plugins/dashboard/public/services/share.ts
index 77a9f44a3cf00..21bbe9e7a9c83 100644
--- a/src/plugins/dashboard/public/services/share.ts
+++ b/src/plugins/dashboard/public/services/share.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { SharePluginStart, SharePluginSetup } from '../../../share/public';
-export { downloadMultipleAs } from '../../../share/public';
+export type { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+export { downloadMultipleAs } from '@kbn/share-plugin/public';
diff --git a/src/plugins/dashboard/public/services/spaces.ts b/src/plugins/dashboard/public/services/spaces.ts
index 4ebe6644e2393..57b987be5cbaa 100644
--- a/src/plugins/dashboard/public/services/spaces.ts
+++ b/src/plugins/dashboard/public/services/spaces.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
+export type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
diff --git a/src/plugins/dashboard/public/services/ui_actions.ts b/src/plugins/dashboard/public/services/ui_actions.ts
index 5dc2e016a121c..79eef5302d556 100644
--- a/src/plugins/dashboard/public/services/ui_actions.ts
+++ b/src/plugins/dashboard/public/services/ui_actions.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { Action, UiActionsSetup, UiActionsStart } from '../../../ui_actions/public';
-export { IncompatibleActionError } from '../../../ui_actions/public';
+export type { Action, UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+export { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
diff --git a/src/plugins/dashboard/public/services/usage_collection.ts b/src/plugins/dashboard/public/services/usage_collection.ts
index dee7499c61138..c8fec98b3b5db 100644
--- a/src/plugins/dashboard/public/services/usage_collection.ts
+++ b/src/plugins/dashboard/public/services/usage_collection.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { UsageCollectionSetup } from '../../../usage_collection/public';
+export type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts
index 575124671cf2b..e250e44d5abce 100644
--- a/src/plugins/dashboard/public/types.ts
+++ b/src/plugins/dashboard/public/types.ts
@@ -15,25 +15,23 @@ import type {
   IUiSettingsClient,
   PluginInitializerContext,
   KibanaExecutionContext,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { History } from 'history';
 import type { Filter } from '@kbn/es-query';
 import { AnyAction, Dispatch } from 'redux';
 import { BehaviorSubject, Subject } from 'rxjs';
 
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import { PersistableControlGroupInput } from '@kbn/controls-plugin/common';
 import { DataView } from './services/data_views';
 import { SharePluginStart } from './services/share';
 import { EmbeddableStart } from './services/embeddable';
 import { DashboardSessionStorage } from './application/lib';
-import { UrlForwardingStart } from '../../url_forwarding/public';
 import { UsageCollectionSetup } from './services/usage_collection';
 import { NavigationPublicPluginStart } from './services/navigation';
 import { Query, RefreshInterval, TimeRange } from './services/data';
-import {
-  DashboardContainerControlGroupInput,
-  DashboardPanelState,
-  SavedDashboardPanel,
-} from '../common/types';
+import { DashboardPanelState, SavedDashboardPanel } from '../common/types';
 import { SavedObjectsTaggingApi } from './services/saved_objects_tagging_oss';
 import { DataPublicPluginStart, DataViewsContract } from './services/data';
 import { ContainerInput, EmbeddableInput, ViewMode } from './services/embeddable';
@@ -41,7 +39,6 @@ import { SavedObjectLoader, SavedObjectsStart } from './services/saved_objects';
 import type { ScreenshotModePluginStart } from './services/screenshot_mode';
 import { IKbnUrlStateStorage } from './services/kibana_utils';
 import type { DashboardContainer, DashboardSavedObject } from '.';
-import { VisualizationsStart } from '../../visualizations/public';
 import { DashboardAppLocatorParams } from './locator';
 import { SpacesPluginStart } from './services/spaces';
 
@@ -74,7 +71,7 @@ export interface DashboardState {
   panels: DashboardPanelMap;
   timeRange?: TimeRange;
 
-  controlGroupInput?: DashboardContainerControlGroupInput;
+  controlGroupInput?: PersistableControlGroupInput;
 }
 
 /**
@@ -84,7 +81,7 @@ export type RawDashboardState = Omit<DashboardState, 'panels'> & { panels: Saved
 
 export interface DashboardContainerInput extends ContainerInput {
   dashboardCapabilities?: DashboardAppCapabilities;
-  controlGroupInput?: DashboardContainerControlGroupInput;
+  controlGroupInput?: PersistableControlGroupInput;
   refreshConfig?: RefreshInterval;
   isEmbeddedExternally?: boolean;
   isFullScreenMode: boolean;
diff --git a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
index 995731341739a..31c236da607a4 100644
--- a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
+++ b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
-import { EmbeddableRegistryDefinition } from '../../../embeddable/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import {
   createExtract,
   createInject,
diff --git a/src/plugins/dashboard/server/index.ts b/src/plugins/dashboard/server/index.ts
index c99ca43ad835e..afbf198c79b9e 100644
--- a/src/plugins/dashboard/server/index.ts
+++ b/src/plugins/dashboard/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { DashboardPlugin } from './plugin';
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/dashboard/server/plugin.ts b/src/plugins/dashboard/server/plugin.ts
index 898c1745efccc..32735f883b167 100644
--- a/src/plugins/dashboard/server/plugin.ts
+++ b/src/plugins/dashboard/server/plugin.ts
@@ -6,20 +6,14 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { createDashboardSavedObjectType } from './saved_objects';
 import { capabilitiesProvider } from './capabilities_provider';
 
 import { DashboardPluginSetup, DashboardPluginStart } from './types';
-import { EmbeddableSetup } from '../../embeddable/server';
-import { UsageCollectionSetup } from '../../usage_collection/server';
 import { registerDashboardUsageCollector } from './usage/register_collector';
 import { dashboardPersistableStateServiceFactory } from './embeddable/dashboard_container_embeddable_factory';
 import { getUISettings } from './ui_settings';
diff --git a/src/plugins/dashboard/server/saved_objects/dashboard.ts b/src/plugins/dashboard/server/saved_objects/dashboard.ts
index 69d0feffde27b..953852bee59cf 100644
--- a/src/plugins/dashboard/server/saved_objects/dashboard.ts
+++ b/src/plugins/dashboard/server/saved_objects/dashboard.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   createDashboardSavedObjectTypeMigrations,
   DashboardSavedObjectTypeMigrationsDeps,
diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts
index 9a2afecf0aa96..0cefab5104d7d 100644
--- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { savedObjectsServiceMock } from '../../../../core/server/mocks';
-import { createEmbeddableSetupMock } from '../../../embeddable/server/mocks';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
+import { createEmbeddableSetupMock } from '@kbn/embeddable-plugin/server/mocks';
 import { createDashboardSavedObjectTypeMigrations } from './dashboard_migrations';
 import { DashboardDoc730ToLatest } from '../../common';
 import {
   createExtract,
   createInject,
 } from '../../common/embeddable/dashboard_container_persistable_state';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
 
 const embeddableSetupMock = createEmbeddableSetupMock();
diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts
index d50c199c7f0d4..b3625bec3e8a9 100644
--- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts
+++ b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts
@@ -12,32 +12,31 @@ import {
   SavedObjectAttributes,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common';
+import {
+  mergeMigrationFunctionMaps,
+  MigrateFunction,
+  MigrateFunctionsObject,
+} from '@kbn/kibana-utils-plugin/common';
+import {
+  CONTROL_GROUP_TYPE,
+  rawControlGroupAttributesToSerializable,
+  serializableToRawControlGroupAttributes,
+} from '@kbn/controls-plugin/common';
 import { migrations730 } from './migrations_730';
 import { SavedDashboardPanel } from '../../common/types';
-import { EmbeddableSetup } from '../../../embeddable/server';
 import { migrateMatchAllQuery } from './migrate_match_all_query';
-import {
-  serializableToRawAttributes,
-  DashboardDoc700To720,
-  DashboardDoc730ToLatest,
-  rawAttributesToSerializable,
-} from '../../common';
+import { DashboardDoc700To720, DashboardDoc730ToLatest } from '../../common';
 import { injectReferences, extractReferences } from '../../common/saved_dashboard_references';
 import {
   convertPanelStateToSavedDashboardPanel,
   convertSavedDashboardPanelToPanelState,
 } from '../../common/embeddable/embeddable_saved_object_converters';
-import { SavedObjectEmbeddableInput } from '../../../embeddable/common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../data/common';
-import {
-  mergeMigrationFunctionMaps,
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../kibana_utils/common';
 import { replaceIndexPatternReference } from './replace_index_pattern_reference';
-import { CONTROL_GROUP_TYPE } from '../../../controls/common';
 
 function migrateIndexPattern(doc: DashboardDoc700To720) {
   const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
@@ -221,12 +220,15 @@ const migrateByValuePanels =
     const { attributes } = doc;
 
     if (attributes?.controlGroupInput) {
-      const controlGroupInput = rawAttributesToSerializable(attributes.controlGroupInput);
+      const controlGroupInput = rawControlGroupAttributesToSerializable(
+        attributes.controlGroupInput
+      );
       const migratedControlGroupInput = migrate({
         ...controlGroupInput,
         type: CONTROL_GROUP_TYPE,
       });
-      attributes.controlGroupInput = serializableToRawAttributes(migratedControlGroupInput);
+      attributes.controlGroupInput =
+        serializableToRawControlGroupAttributes(migratedControlGroupInput);
     }
 
     // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when
diff --git a/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts b/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts
index d26e2c4424f27..cea39fc45b0fe 100644
--- a/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts
+++ b/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { DashboardDoc730ToLatest } from '../../common';
 
 function isDoc(
diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts
index bf8d8fb225842..bf1eb9f4986b7 100644
--- a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { migrateMatchAllQuery } from './migrate_match_all_query';
-import { SavedObjectMigrationContext, SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationContext, SavedObjectMigrationFn } from '@kbn/core/server';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
 
diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts
index 15013fa9c6f26..147aa47a7a6e9 100644
--- a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { get } from 'lodash';
-import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
+import { DEFAULT_QUERY_LANGUAGE } from '@kbn/data-plugin/common';
 
 /**
  * This migration script is related to:
diff --git a/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts b/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts
index 086ef8eddba03..2fc999b067496 100644
--- a/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsServiceMock } from '../../../../core/server/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import { createDashboardSavedObjectTypeMigrations } from './dashboard_migrations';
 import { migrations730 } from './migrations_730';
 import { DashboardDoc700To720, DashboardDoc730ToLatest, DashboardDocPre700 } from '../../common';
 import { RawSavedDashboardPanel730ToLatest } from '../../common';
-import { createEmbeddableSetupMock } from '../../../embeddable/server/mocks';
+import { createEmbeddableSetupMock } from '@kbn/embeddable-plugin/server/mocks';
 
 const mockContext = savedObjectsServiceMock.createMigrationContext();
 const migrations = createDashboardSavedObjectTypeMigrations({
diff --git a/src/plugins/dashboard/server/saved_objects/migrations_730.ts b/src/plugins/dashboard/server/saved_objects/migrations_730.ts
index a21ed5a5afe08..3cc34d8513a45 100644
--- a/src/plugins/dashboard/server/saved_objects/migrations_730.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrations_730.ts
@@ -7,7 +7,7 @@
  */
 
 import { inspect } from 'util';
-import { SavedObjectMigrationContext } from 'kibana/server';
+import { SavedObjectMigrationContext } from '@kbn/core/server';
 import { DashboardDoc730ToLatest } from '../../common';
 import { isDashboardDoc } from './is_dashboard_doc';
 import { moveFiltersToQuery } from './move_filters_to_query';
diff --git a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts
index 41dbcbe05d44f..13db82790c9d0 100644
--- a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { SavedObjectMigrationContext, SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectMigrationFn } from '@kbn/core/server';
 
 import { replaceIndexPatternReference } from './replace_index_pattern_reference';
 
diff --git a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts
index e2ea076de7743..5d5541143f8a7 100644
--- a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts
+++ b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../data/common';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common';
 
 export const replaceIndexPatternReference: SavedObjectMigrationFn<any, any> = (doc) => ({
   ...doc,
diff --git a/src/plugins/dashboard/server/ui_settings.ts b/src/plugins/dashboard/server/ui_settings.ts
index 6efd68da25f2d..292df760ba2ba 100644
--- a/src/plugins/dashboard/server/ui_settings.ts
+++ b/src/plugins/dashboard/server/ui_settings.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { SETTING_CATEGORY } from '../../../../src/plugins/presentation_util/server';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { SETTING_CATEGORY } from '@kbn/presentation-util-plugin/server';
+import { UiSettingsParams } from '@kbn/core/types';
 import { UI_SETTINGS } from '../common';
 
 /**
diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts
index 974d80f9c0f4e..ea981be3515f8 100644
--- a/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts
+++ b/src/plugins/dashboard/server/usage/dashboard_telemetry.test.ts
@@ -7,12 +7,9 @@
  */
 
 import { SavedDashboardPanel730ToLatest } from '../../common';
-import {
-  collectDashboardInfo,
-  getEmptyTelemetryData,
-  collectByValueVisualizationInfo,
-  collectByValueLensInfo,
-} from './dashboard_telemetry';
+import { getEmptyDashboardData, collectPanelsByType } from './dashboard_telemetry';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 
 const visualizationType1ByValue = {
   embeddableConfig: {
@@ -31,6 +28,7 @@ const visualizationType2ByValue = {
   },
   type: 'visualization',
 } as unknown as SavedDashboardPanel730ToLatest;
+
 const visualizationType2ByReference = {
   ...visualizationType2ByValue,
   id: '11111',
@@ -44,6 +42,7 @@ const lensTypeAByValue = {
     },
   },
 } as unknown as SavedDashboardPanel730ToLatest;
+
 const lensTypeAByReference = {
   ...lensTypeAByValue,
   id: '22222',
@@ -93,91 +92,97 @@ const lensXYSeriesB = {
   },
 } as unknown as SavedDashboardPanel730ToLatest;
 
+const embeddablePersistableStateService = createEmbeddablePersistableStateServiceMock();
+
 describe('dashboard telemetry', () => {
+  beforeAll(() => {
+    embeddablePersistableStateService.extract.mockImplementationOnce((state) => {
+      const { HARDCODED_ID, ...restOfState } = state as unknown as Record<string, unknown>;
+      return {
+        state: restOfState as EmbeddableStateWithType,
+        references: [{ id: HARDCODED_ID as string, name: 'refName', type: 'type' }],
+      };
+    });
+
+    embeddablePersistableStateService.inject.mockImplementationOnce((state, references) => {
+      const ref = references.find((r) => r.name === 'refName');
+      return {
+        ...state,
+        HARDCODED_ID: ref!.id,
+      };
+    });
+  });
+
   it('collects information about dashboard panels', () => {
     const panels = [
       visualizationType1ByValue,
       visualizationType2ByValue,
       visualizationType2ByReference,
     ];
-    const collectorData = getEmptyTelemetryData();
-
-    collectDashboardInfo(panels, collectorData);
+    const collectorData = getEmptyDashboardData();
+    collectPanelsByType(panels, collectorData, embeddablePersistableStateService);
 
-    expect(collectorData.panels).toBe(panels.length);
-    expect(collectorData.panelsByValue).toBe(2);
+    expect(collectorData.panels.total).toBe(panels.length);
+    expect(collectorData.panels.by_value).toBe(2);
+    expect(collectorData.panels.by_reference).toBe(1);
   });
 
-  describe('visualizations', () => {
-    it('collects information about by value visualizations', () => {
-      const panels = [
-        visualizationType1ByValue,
-        visualizationType1ByValue,
-        visualizationType2ByValue,
-        visualizationType2ByReference,
-      ];
-
-      const collectorData = getEmptyTelemetryData();
-
-      collectByValueVisualizationInfo(panels, collectorData);
-
-      expect(collectorData.visualizationByValue.type1).toBe(2);
-      expect(collectorData.visualizationByValue.type2).toBe(1);
-    });
-
-    it('handles misshapen visualization panels without errors', () => {
-      const badVisualizationPanel = {
-        embeddableConfig: {},
-        type: 'visualization',
-      } as unknown as SavedDashboardPanel730ToLatest;
-
-      const panels = [badVisualizationPanel, visualizationType1ByValue];
-
-      const collectorData = getEmptyTelemetryData();
+  it('collects information about visualizations', () => {
+    const panels = [
+      visualizationType1ByValue,
+      visualizationType1ByValue,
+      visualizationType2ByValue,
+      visualizationType2ByReference,
+    ];
 
-      collectByValueVisualizationInfo(panels, collectorData);
+    const collectorData = getEmptyDashboardData();
+    collectPanelsByType(panels, collectorData, embeddablePersistableStateService);
 
-      expect(Object.keys(collectorData.visualizationByValue)).toHaveLength(1);
-    });
+    expect(collectorData.panels.by_type.visualization.total).toBe(panels.length);
+    expect(collectorData.panels.by_type.visualization.by_value).toBe(3);
+    expect(collectorData.panels.by_type.visualization.by_reference).toBe(1);
   });
 
-  describe('lens', () => {
-    it('collects information about by value lens', () => {
-      const panels = [
-        lensTypeAByValue,
-        lensTypeAByValue,
-        lensTypeAByValue,
-        lensTypeAByReference,
-        lensXYSeriesA,
-        lensXYSeriesA,
-        lensXYSeriesB,
-      ];
-
-      const collectorData = getEmptyTelemetryData();
-
-      collectByValueLensInfo(panels, collectorData);
-
-      expect(collectorData.lensByValue.a).toBe(3);
-      expect(collectorData.lensByValue.seriesA).toBe(2);
-      expect(collectorData.lensByValue.seriesB).toBe(1);
-      expect(collectorData.lensByValue.formula).toBe(1);
-    });
+  it('collects information about lens', () => {
+    const panels = [
+      lensTypeAByValue,
+      lensTypeAByValue,
+      lensTypeAByValue,
+      lensTypeAByReference,
+      lensXYSeriesA,
+      lensXYSeriesA,
+      lensXYSeriesB,
+    ];
 
-    it('handles misshapen lens panels', () => {
-      const badPanel = {
-        type: 'lens',
-        embeddableConfig: {
-          oops: 'no visualization type',
-        },
-      } as unknown as SavedDashboardPanel730ToLatest;
+    const collectorData = getEmptyDashboardData();
+    collectPanelsByType(panels, collectorData, embeddablePersistableStateService);
 
-      const panels = [badPanel, lensTypeAByValue];
+    expect(collectorData.panels.by_type.lens.total).toBe(panels.length);
+    expect(collectorData.panels.by_type.lens.by_value).toBe(6);
+    expect(collectorData.panels.by_type.lens.by_reference).toBe(1);
+  });
 
-      const collectorData = getEmptyTelemetryData();
+  it('collects information about a mix of panel types', () => {
+    const panels = [
+      visualizationType1ByValue,
+      visualizationType1ByValue,
+      visualizationType2ByReference,
+      lensTypeAByValue,
+      lensTypeAByValue,
+      lensTypeAByValue,
+      lensTypeAByReference,
+      lensXYSeriesA,
+    ];
 
-      collectByValueLensInfo(panels, collectorData);
+    const collectorData = getEmptyDashboardData();
+    collectPanelsByType(panels, collectorData, embeddablePersistableStateService);
 
-      expect(collectorData.lensByValue.a).toBe(1);
-    });
+    expect(collectorData.panels.total).toBe(panels.length);
+    expect(collectorData.panels.by_type.lens.total).toBe(5);
+    expect(collectorData.panels.by_type.lens.by_value).toBe(4);
+    expect(collectorData.panels.by_type.lens.by_reference).toBe(1);
+    expect(collectorData.panels.by_type.visualization.total).toBe(3);
+    expect(collectorData.panels.by_type.visualization.by_value).toBe(2);
+    expect(collectorData.panels.by_type.visualization.by_reference).toBe(1);
   });
 });
diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
index 8d6ebeab08a98..dcb2ad9ba37eb 100644
--- a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
+++ b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
@@ -6,155 +6,84 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository, SavedObjectAttributes } from 'src/core/server';
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+import { isEmpty } from 'lodash';
+import { ISavedObjectsRepository, SavedObjectAttributes } from '@kbn/core/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
+import {
+  type ControlGroupTelemetry,
+  CONTROL_GROUP_TYPE,
+  RawControlGroupAttributes,
+} from '@kbn/controls-plugin/common';
+import { initializeControlGroupTelemetry } from '@kbn/controls-plugin/server';
+
 import { SavedDashboardPanel730ToLatest } from '../../common';
 import { injectReferences } from '../../common/saved_dashboard_references';
-
-interface VisualizationPanel extends SavedDashboardPanel730ToLatest {
-  embeddableConfig: {
-    savedVis?: {
-      type?: string;
-    };
-  };
-}
-
-interface LensPanel extends SavedDashboardPanel730ToLatest {
-  embeddableConfig: {
-    attributes?: {
-      visualizationType?: string;
-      state?: {
-        visualization?: {
-          preferredSeriesType?: string;
-        };
-        datasourceStates?: {
-          indexpattern?: {
-            layers: Record<
-              string,
-              {
-                columns: Record<string, { operationType: string }>;
-              }
-            >;
-          };
+export interface DashboardCollectorData {
+  panels: {
+    total: number;
+    by_reference: number;
+    by_value: number;
+    by_type: {
+      [key: string]: {
+        total: number;
+        by_reference: number;
+        by_value: number;
+        details: {
+          [key: string]: number;
         };
       };
     };
   };
+  controls: ControlGroupTelemetry;
 }
 
-export interface DashboardCollectorData {
-  panels: number;
-  panelsByValue: number;
-  lensByValue: {
-    [key: string]: number;
-  };
-  visualizationByValue: {
-    [key: string]: number;
-  };
-  embeddable: {
-    [key: string]: number;
-  };
-}
-
-export const getEmptyTelemetryData = (): DashboardCollectorData => ({
-  panels: 0,
-  panelsByValue: 0,
-  lensByValue: {},
-  visualizationByValue: {},
-  embeddable: {},
+export const getEmptyDashboardData = (): DashboardCollectorData => ({
+  panels: {
+    total: 0,
+    by_reference: 0,
+    by_value: 0,
+    by_type: {},
+  },
+  controls: initializeControlGroupTelemetry({}),
 });
 
-type DashboardCollectorFunction = (
-  panels: SavedDashboardPanel730ToLatest[],
-  collectorData: DashboardCollectorData
-) => void;
-
-export const collectDashboardInfo: DashboardCollectorFunction = (panels, collectorData) => {
-  collectorData.panels += panels.length;
-  collectorData.panelsByValue += panels.filter((panel) => panel.id === undefined).length;
-};
-
-export const collectByValueVisualizationInfo: DashboardCollectorFunction = (
-  panels,
-  collectorData
-) => {
-  const byValueVisualizations = panels.filter(
-    (panel) => panel.id === undefined && panel.type === 'visualization'
-  );
-
-  for (const panel of byValueVisualizations) {
-    const visPanel = panel as VisualizationPanel;
-
-    if (
-      visPanel.embeddableConfig.savedVis !== undefined &&
-      visPanel.embeddableConfig.savedVis.type !== undefined
-    ) {
-      const type = visPanel.embeddableConfig.savedVis.type;
-
-      if (!collectorData.visualizationByValue[type]) {
-        collectorData.visualizationByValue[type] = 0;
-      }
-
-      collectorData.visualizationByValue[type] = collectorData.visualizationByValue[type] + 1;
-    }
-  }
-};
-
-export const collectByValueLensInfo: DashboardCollectorFunction = (panels, collectorData) => {
-  const byValueLens = panels.filter((panel) => panel.id === undefined && panel.type === 'lens');
-
-  for (const panel of byValueLens) {
-    const lensPanel = panel as LensPanel;
-
-    if (lensPanel.embeddableConfig.attributes?.visualizationType !== undefined) {
-      let type = lensPanel.embeddableConfig.attributes.visualizationType;
-
-      if (type === 'lnsXY') {
-        type =
-          lensPanel.embeddableConfig.attributes.state?.visualization?.preferredSeriesType || type;
-      }
-
-      if (!collectorData.lensByValue[type]) {
-        collectorData.lensByValue[type] = 0;
-      }
-
-      collectorData.lensByValue[type] = collectorData.lensByValue[type] + 1;
-
-      const hasFormula = Object.values(
-        lensPanel.embeddableConfig.attributes.state?.datasourceStates?.indexpattern?.layers || {}
-      ).some((layer) =>
-        Object.values(layer.columns).some((column) => column.operationType === 'formula')
-      );
-
-      if (hasFormula && !collectorData.lensByValue.formula) {
-        collectorData.lensByValue.formula = 0;
-      }
-      if (hasFormula) {
-        collectorData.lensByValue.formula++;
-      }
-    }
-  }
-};
-
-export const collectForPanels: DashboardCollectorFunction = (panels, collectorData) => {
-  collectDashboardInfo(panels, collectorData);
-  collectByValueVisualizationInfo(panels, collectorData);
-  collectByValueLensInfo(panels, collectorData);
-};
+export const getEmptyPanelTypeData = () => ({
+  total: 0,
+  by_reference: 0,
+  by_value: 0,
+  details: {},
+});
 
-export const collectEmbeddableData = (
+export const collectPanelsByType = (
   panels: SavedDashboardPanel730ToLatest[],
   collectorData: DashboardCollectorData,
   embeddableService: EmbeddablePersistableStateService
 ) => {
+  collectorData.panels.total += panels.length;
+
   for (const panel of panels) {
-    collectorData.embeddable = embeddableService.telemetry(
+    const type = panel.type;
+    if (!collectorData.panels.by_type[type]) {
+      collectorData.panels.by_type[type] = getEmptyPanelTypeData();
+    }
+    collectorData.panels.by_type[type].total += 1;
+    if (panel.id === undefined) {
+      collectorData.panels.by_value += 1;
+      collectorData.panels.by_type[type].by_value += 1;
+    } else {
+      collectorData.panels.by_reference += 1;
+      collectorData.panels.by_type[type].by_reference += 1;
+    }
+    // the following "details" need a follow-up that will actually properly consolidate
+    // the data from all embeddables - right now, the only data that is kept is the
+    // telemetry for the **final** embeddable of that type
+    collectorData.panels.by_type[type].details = embeddableService.telemetry(
       {
         ...panel.embeddableConfig,
         id: panel.id || '',
         type: panel.type,
       },
-      collectorData.embeddable
+      collectorData.panels.by_type[type].details
     );
   }
 };
@@ -163,7 +92,7 @@ export async function collectDashboardTelemetry(
   savedObjectClient: Pick<ISavedObjectsRepository, 'find'>,
   embeddableService: EmbeddablePersistableStateService
 ) {
-  const collectorData = getEmptyTelemetryData();
+  const collectorData = getEmptyDashboardData();
   const dashboards = await savedObjectClient.find<SavedObjectAttributes>({
     type: 'dashboard',
   });
@@ -173,12 +102,24 @@ export async function collectDashboardTelemetry(
       embeddablePersistableStateService: embeddableService,
     });
 
+    const controlGroupAttributes: RawControlGroupAttributes | undefined =
+      attributes.controlGroupInput as unknown as RawControlGroupAttributes;
+    if (!isEmpty(controlGroupAttributes)) {
+      collectorData.controls = embeddableService.telemetry(
+        {
+          ...controlGroupAttributes,
+          type: CONTROL_GROUP_TYPE,
+          id: `DASHBOARD_${CONTROL_GROUP_TYPE}`,
+        },
+        collectorData.controls
+      ) as ControlGroupTelemetry;
+    }
+
     const panels = JSON.parse(
       attributes.panelsJSON as string
     ) as unknown as SavedDashboardPanel730ToLatest[];
 
-    collectForPanels(panels, collectorData);
-    collectEmbeddableData(panels, collectorData, embeddableService);
+    collectPanelsByType(panels, collectorData, embeddableService);
   }
 
   return collectorData;
diff --git a/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts b/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts
index c3c32fbcd6a61..694fe2007f844 100644
--- a/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts
+++ b/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository, SavedObjectAttributes } from 'kibana/server';
+import { ISavedObjectsRepository, SavedObjectAttributes } from '@kbn/core/server';
 import { SavedDashboardPanel730ToLatest } from '../../common';
 
 export const findByValueEmbeddables = async (
diff --git a/src/plugins/dashboard/server/usage/register_collector.ts b/src/plugins/dashboard/server/usage/register_collector.ts
index a911fc9b81666..9a7bcd31f8a84 100644
--- a/src/plugins/dashboard/server/usage/register_collector.ts
+++ b/src/plugins/dashboard/server/usage/register_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { collectDashboardTelemetry, DashboardCollectorData } from './dashboard_telemetry';
 
@@ -22,32 +22,90 @@ export function registerDashboardUsageCollector(
       return await collectDashboardTelemetry(soClient, embeddableService);
     },
     schema: {
-      panels: { type: 'long' },
-      panelsByValue: { type: 'long' },
-      lensByValue: {
-        DYNAMIC_KEY: {
-          type: 'long',
-          _meta: {
-            description:
-              'Collection of telemetry metrics for Lens visualizations, which are added to dashboard by "value".',
+      panels: {
+        total: { type: 'long' },
+        by_reference: { type: 'long' },
+        by_value: { type: 'long' },
+        by_type: {
+          DYNAMIC_KEY: {
+            total: {
+              type: 'long',
+              _meta: {
+                description: 'The number of panels that have been added to all dashboards.',
+              },
+            },
+            by_reference: {
+              type: 'long',
+              _meta: {
+                description:
+                  'The number of "by reference" panels that have been added to all dashboards.',
+              },
+            },
+            by_value: {
+              type: 'long',
+              _meta: {
+                description:
+                  'The number of "by value" panels that have been added to all dashboards.',
+              },
+            },
+            details: {
+              DYNAMIC_KEY: {
+                type: 'long',
+                _meta: {
+                  description:
+                    'Collection of telemetry metrics that embeddable service reports. Embeddable service internally calls each embeddable, which in turn calls its dynamic actions, which calls each drill down attached to that embeddable.',
+                },
+              },
+            },
           },
         },
       },
-      visualizationByValue: {
-        DYNAMIC_KEY: {
-          type: 'long',
-          _meta: {
-            description:
-              'Collection of telemetry metrics for visualizations, which are added to dashboard by "value".',
+      controls: {
+        total: { type: 'long' },
+        by_type: {
+          DYNAMIC_KEY: {
+            total: {
+              type: 'long',
+              _meta: {
+                description: 'The number of this type of control in all Control Groups',
+              },
+            },
+            details: {
+              DYNAMIC_KEY: {
+                type: 'long',
+                _meta: {
+                  description:
+                    'Collection of telemetry metrics that embeddable service reports. Will be used for details which are specific to the current control type',
+                },
+              },
+            },
           },
         },
-      },
-      embeddable: {
-        DYNAMIC_KEY: {
-          type: 'long',
-          _meta: {
-            description:
-              'Collection of telemetry metrics that embeddable service reports. Embeddable service internally calls each embeddable, which in turn calls its dynamic actions, which calls each drill down attached to that embeddable.',
+        ignore_settings: {
+          DYNAMIC_KEY: {
+            type: 'long',
+            _meta: {
+              description:
+                'Collection of telemetry metrics that count the number of control groups which have this ignore setting turned on',
+            },
+          },
+        },
+        chaining_system: {
+          DYNAMIC_KEY: {
+            type: 'long',
+            _meta: {
+              description:
+                'Collection of telemetry metrics that count the number of control groups which are using this chaining system',
+            },
+          },
+        },
+        label_position: {
+          DYNAMIC_KEY: {
+            type: 'long',
+            _meta: {
+              description:
+                'Collection of telemetry metrics that count the number of control groups which have their labels in this position',
+            },
           },
         },
       },
diff --git a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts
index 0a178a78f1e22..1fa33a65c4b02 100644
--- a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts
+++ b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { createStubDataView } from 'src/plugins/data_views/common/mocks';
-import type { DataViewsContract } from 'src/plugins/data_views/common';
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions/common';
-import { FieldFormat } from 'src/plugins/field_formats/common';
-import { fieldFormatsMock } from 'src/plugins/field_formats/common/mocks';
+import { createStubDataView } from '@kbn/data-views-plugin/common/mocks';
+import type { DataViewsContract } from '@kbn/data-views-plugin/common';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import type { AggsCommonStart } from '../search';
 import { DatatableUtilitiesService } from './datatable_utilities_service';
 
diff --git a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts
index 7430b3f6bc09c..c5084c52dbc51 100644
--- a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts
+++ b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { DataView, DataViewsContract, DataViewField } from 'src/plugins/data_views/common';
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions/common';
-import type { FieldFormatsStartCommon, FieldFormat } from 'src/plugins/field_formats/common';
+import type { DataView, DataViewsContract, DataViewField } from '@kbn/data-views-plugin/common';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import type { FieldFormatsStartCommon, FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { AggsCommonStart, AggConfig, CreateAggConfigParams, IAggType } from '../search';
 
 export class DatatableUtilitiesService {
diff --git a/src/plugins/data/common/es_query/get_es_query_config.test.ts b/src/plugins/data/common/es_query/get_es_query_config.test.ts
index 984d964ea9b32..e009a0651484e 100644
--- a/src/plugins/data/common/es_query/get_es_query_config.test.ts
+++ b/src/plugins/data/common/es_query/get_es_query_config.test.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import { getEsQueryConfig } from './get_es_query_config';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { UI_SETTINGS } from '..';
 
 const config = {
diff --git a/src/plugins/data/common/exports/export_csv.test.ts b/src/plugins/data/common/exports/export_csv.test.ts
index f108e69c68d56..52f098948e2d8 100644
--- a/src/plugins/data/common/exports/export_csv.test.ts
+++ b/src/plugins/data/common/exports/export_csv.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions';
-import { FieldFormat } from '../../../field_formats/common';
+import { Datatable } from '@kbn/expressions-plugin';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { datatableToCSV } from './export_csv';
 
 function getDefaultOptions() {
diff --git a/src/plugins/data/common/exports/export_csv.tsx b/src/plugins/data/common/exports/export_csv.tsx
index 68f817d1b1484..e5a408f6c10e4 100644
--- a/src/plugins/data/common/exports/export_csv.tsx
+++ b/src/plugins/data/common/exports/export_csv.tsx
@@ -8,8 +8,8 @@
 
 // Inspired by the inspector CSV exporter
 
-import { Datatable } from 'src/plugins/expressions';
-import { FormatFactory } from '../../../field_formats/common';
+import { Datatable } from '@kbn/expressions-plugin';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { createEscapeValue } from './escape_value';
 
 export const LINE_FEED_CHARACTER = '\r\n';
diff --git a/src/plugins/data/common/exports/formula_checks.ts b/src/plugins/data/common/exports/formula_checks.ts
index eed339c15781c..606f62277e0da 100644
--- a/src/plugins/data/common/exports/formula_checks.ts
+++ b/src/plugins/data/common/exports/formula_checks.ts
@@ -7,7 +7,7 @@
  */
 
 import { startsWith } from 'lodash';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { CSV_FORMULA_CHARS } from './constants';
 
 export const cellHasFormulas = (val: string) =>
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index 93aeb918bc53a..8944aa7db2843 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -128,12 +128,12 @@ export type {
   IndexPatternExpressionType,
   IndexPatternLoadStartDependencies,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../data_views/common';
+} from '@kbn/data-views-plugin/common';
 export type {
   IndexPatternsContract,
   DataViewsContract,
   DataViewListItem,
-} from '../../data_views/common';
+} from '@kbn/data-views-plugin/common';
 export {
   RUNTIME_FIELD_TYPES,
   DEFAULT_ASSETS_TO_IGNORE,
@@ -155,4 +155,4 @@ export {
   isMultiField,
   getFieldSubtypeMulti,
   getFieldSubtypeNested,
-} from '../../data_views/common';
+} from '@kbn/data-views-plugin/common';
diff --git a/src/plugins/data/common/mocks.ts b/src/plugins/data/common/mocks.ts
index cf7d6bef6a4e8..8d5523a7e8e8e 100644
--- a/src/plugins/data/common/mocks.ts
+++ b/src/plugins/data/common/mocks.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export * from '../../data_views/common/fields/fields.mocks';
+export * from '@kbn/data-views-plugin/common/fields/fields.mocks';
 export * from './datatable_utilities/mock';
diff --git a/src/plugins/data/common/query/persistable_state.test.ts b/src/plugins/data/common/query/persistable_state.test.ts
index 93f14a0fc2e08..c69f7dee15e37 100644
--- a/src/plugins/data/common/query/persistable_state.test.ts
+++ b/src/plugins/data/common/query/persistable_state.test.ts
@@ -8,7 +8,7 @@
 
 import { extract, inject } from './persistable_state';
 import { Filter } from '@kbn/es-query';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '..';
 
 describe('filter manager persistable state tests', () => {
   const filters: Filter[] = [
diff --git a/src/plugins/data/common/query/persistable_state.ts b/src/plugins/data/common/query/persistable_state.ts
index 177aae391c4fb..4860d892ab5d7 100644
--- a/src/plugins/data/common/query/persistable_state.ts
+++ b/src/plugins/data/common/query/persistable_state.ts
@@ -8,9 +8,9 @@
 
 import uuid from 'uuid';
 import { Filter } from '@kbn/es-query';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
-import { SavedObjectReference } from '../../../../core/types';
-import { MigrateFunctionsObject } from '../../../kibana_utils/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '..';
 
 export const extract = (filters: Filter[]) => {
   const references: SavedObjectReference[] = [];
diff --git a/src/plugins/data/common/search/aggs/agg_config.test.ts b/src/plugins/data/common/search/aggs/agg_config.test.ts
index 93903ee0c3210..d39b351e93612 100644
--- a/src/plugins/data/common/search/aggs/agg_config.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { identity } from 'lodash';
-import type { ExpressionAstExpression } from 'src/plugins/expressions';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin';
 
 import { AggConfig, IAggConfig } from './agg_config';
 import { AggConfigs, CreateAggConfigParams } from './agg_configs';
diff --git a/src/plugins/data/common/search/aggs/agg_config.ts b/src/plugins/data/common/search/aggs/agg_config.ts
index 9cc5d7b97e633..f78452d99eded 100644
--- a/src/plugins/data/common/search/aggs/agg_config.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.ts
@@ -12,10 +12,10 @@ import { i18n } from '@kbn/i18n';
 import type { SerializableRecord } from '@kbn/utility-types';
 import { Assign, Ensure } from '@kbn/utility-types';
 
+import { ExpressionAstExpression, ExpressionAstArgument } from '@kbn/expressions-plugin/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
-import { ExpressionAstExpression, ExpressionAstArgument } from 'src/plugins/expressions/common';
-import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import { ISearchOptions, ISearchSource } from '../../../public';
 
 import { IAggType } from './agg_type';
 import { writeParams } from './agg_params';
diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts
index a675ce5ee1557..c4f1da62ead3a 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.ts
@@ -19,13 +19,13 @@ import {
   ISearchSource,
   RangeFilter,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/plugins/data/public';
+} from '../../../public';
 import { AggConfig, AggConfigSerialized, IAggConfig } from './agg_config';
 import { IAggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { AggGroupNames } from './agg_groups';
 import { IndexPattern } from '../..';
-import { TimeRange, getTime, calculateBounds } from '../../../common';
+import { TimeRange, getTime, calculateBounds } from '../..';
 import { IBucketAggConfig } from './buckets';
 import { insertTimeShiftSplit, mergeTimeShifts } from './utils/time_splits';
 
diff --git a/src/plugins/data/common/search/aggs/agg_params.test.ts b/src/plugins/data/common/search/aggs/agg_params.test.ts
index 963346beb6a4d..c197d21ba8239 100644
--- a/src/plugins/data/common/search/aggs/agg_params.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_params.test.ts
@@ -10,7 +10,7 @@ import { initParams } from './agg_params';
 import { BaseParamType } from './param_types/base';
 import { FieldParamType } from './param_types/field';
 import { OptionedParamType } from './param_types/optioned';
-import { AggParamType } from '../aggs/param_types/agg';
+import { AggParamType } from './param_types/agg';
 
 describe('AggParams class', () => {
   describe('constructor args', () => {
diff --git a/src/plugins/data/common/search/aggs/agg_type.ts b/src/plugins/data/common/search/aggs/agg_type.ts
index 12b81f422aa52..633bd00dd9a35 100644
--- a/src/plugins/data/common/search/aggs/agg_type.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.ts
@@ -9,13 +9,13 @@
 import { constant, noop, identity } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ISearchSource } from 'src/plugins/data/public';
-import { DatatableColumnType } from 'src/plugins/expressions/common';
-import type { RequestAdapter } from 'src/plugins/inspector/common';
-import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import type { RequestAdapter } from '@kbn/inspector-plugin/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ISearchSource } from '../../../public';
 import { initParams } from './agg_params';
 import { AggConfig } from './agg_config';
 import { IAggConfigs } from './agg_configs';
diff --git a/src/plugins/data/common/search/aggs/agg_types.ts b/src/plugins/data/common/search/aggs/agg_types.ts
index d7750c48016cd..2e65152314cf7 100644
--- a/src/plugins/data/common/search/aggs/agg_types.ts
+++ b/src/plugins/data/common/search/aggs/agg_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsStartCommon } from '../../../../field_formats/common';
+import { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
 
 import * as buckets from './buckets';
 import * as metrics from './metrics';
diff --git a/src/plugins/data/common/search/aggs/aggs_service.ts b/src/plugins/data/common/search/aggs/aggs_service.ts
index 6fe7eef5b87b4..a348acb90212b 100644
--- a/src/plugins/data/common/search/aggs/aggs_service.ts
+++ b/src/plugins/data/common/search/aggs/aggs_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
-import { CreateAggConfigParams, IndexPattern, UI_SETTINGS } from '../../../common';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
+import { CreateAggConfigParams, IndexPattern, UI_SETTINGS } from '../..';
 import { GetConfigFn } from '../../types';
 import {
   AggConfigs,
@@ -15,7 +15,7 @@ import {
   getAggTypes,
   getAggTypesFunctions,
   getCalculateAutoTimeExpression,
-} from './';
+} from '.';
 import { AggsCommonSetup, AggsCommonStart } from './types';
 
 /** @internal */
diff --git a/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts b/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts
index 12a2c9b0e9c92..a55588f4dd550 100644
--- a/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts
+++ b/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { IAggConfig } from '../agg_config';
-import { FilterFieldFn, GenericBucket, IAggConfigs } from '../../../../common';
+import { FilterFieldFn, GenericBucket, IAggConfigs } from '../../..';
 import { AggType, AggTypeConfig } from '../agg_type';
 import { AggParamType } from '../param_types/agg';
 import type { FieldTypes } from '../param_types/field';
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
index 625da5c304ad3..f0dc3ad0cb7b3 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../../field_formats/common';
+import { BytesFormat, FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
 import { AggConfigs } from '../../agg_configs';
 import { mockAggTypesRegistry, mockGetFieldFormatsStart } from '../../test_helpers';
 import { BUCKET_TYPES } from '../bucket_agg_types';
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts
index 121a3a6c06b95..f52388478df9b 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts
@@ -9,7 +9,7 @@
 import { createFilterIpRange } from './ip_range';
 import { AggConfigs, CreateAggConfigParams } from '../../agg_configs';
 import { mockAggTypesRegistry } from '../../test_helpers';
-import { IpFormat } from '../../../../../../field_formats/common';
+import { IpFormat } from '@kbn/field-formats-plugin/common';
 import { BUCKET_TYPES } from '../bucket_agg_types';
 import { IBucketAggConfig } from '../bucket_agg_type';
 import { RangeFilter } from '@kbn/es-query';
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
index 6f86186fe4dc3..873b6eb2e104f 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { RangeFilter } from '@kbn/es-query';
-import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../../field_formats/common';
+import { BytesFormat, FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
 import { AggConfigs } from '../../agg_configs';
 import { mockAggTypesRegistry, mockGetFieldFormatsStart } from '../../test_helpers';
 import { IBucketAggConfig } from '../bucket_agg_type';
diff --git a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
index 64ec46ad637e0..e1f5d31075d55 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
@@ -10,7 +10,7 @@ import { get, noop, find, every, omitBy, isNil } from 'lodash';
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES, TimeRange, TimeRangeBounds, UI_SETTINGS } from '../../../../common';
+import { KBN_FIELD_TYPES, TimeRange, TimeRangeBounds, UI_SETTINGS } from '../../..';
 import { IFieldType } from '../../..';
 
 import { ExtendedBounds, extendedBoundsToAst, timerangeToAst } from '../../expressions';
diff --git a/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts b/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts
index b5175efd5cf8a..b158d2f8b7f35 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { ExtendedBoundsOutput, KibanaTimerangeOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggDateHistogramFnName = 'aggDateHistogram';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/date_range.ts b/src/plugins/data/common/search/aggs/buckets/date_range.ts
index 58439ad943d38..8fb0bf2d4ccb5 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_range.ts
@@ -16,7 +16,7 @@ import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { createFilterDateRange } from './create_filter/date_range';
 import { aggDateRangeFnName } from './date_range_fn';
 
-import { KBN_FIELD_TYPES } from '../../../../common/kbn_field_types/types';
+import { KBN_FIELD_TYPES } from '../../../kbn_field_types/types';
 import { BaseAggParams } from '../types';
 
 const dateRangeTitle = i18n.translate('data.search.aggs.buckets.dateRangeTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts b/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts
index c0b18d2e72143..9913c838d60f6 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { DateRangeOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggDateRangeFnName = 'aggDateRange';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts b/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts
index 0e1b235dd576d..2112a106995bd 100644
--- a/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '..';
 import { DIVERSIFIED_SAMPLER_AGG_NAME } from './diversified_sampler';
 
 export const aggDiversifiedSamplerFnName = 'aggDiversifiedSampler';
diff --git a/src/plugins/data/common/search/aggs/buckets/filter_fn.ts b/src/plugins/data/common/search/aggs/buckets/filter_fn.ts
index 1533368d166fa..0390213f6c16c 100644
--- a/src/plugins/data/common/search/aggs/buckets/filter_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filter_fn.ts
@@ -9,10 +9,10 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { GeoBoundingBoxOutput, KibanaQueryOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggFilterFnName = 'aggFilter';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/filters.test.ts b/src/plugins/data/common/search/aggs/buckets/filters.test.ts
index 75112ec53fa18..da9279232fda0 100644
--- a/src/plugins/data/common/search/aggs/buckets/filters.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filters.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Query } from '../../../../common';
+import { Query } from '../../..';
 import { AggConfigs } from '../agg_configs';
 import { AggTypesDependencies } from '../agg_types';
 import { mockAggTypesRegistry, mockAggTypesDependencies } from '../test_helpers';
diff --git a/src/plugins/data/common/search/aggs/buckets/filters.ts b/src/plugins/data/common/search/aggs/buckets/filters.ts
index 2ce6abbef543e..9ba502c399dc2 100644
--- a/src/plugins/data/common/search/aggs/buckets/filters.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filters.ts
@@ -15,7 +15,7 @@ import { createFilterFilters } from './create_filter/filters';
 import { BucketAggType } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggFiltersFnName } from './filters_fn';
-import { getEsQueryConfig, UI_SETTINGS } from '../../../../common';
+import { getEsQueryConfig, UI_SETTINGS } from '../../..';
 import { BaseAggParams } from '../types';
 
 const filtersTitle = i18n.translate('data.search.aggs.buckets.filtersTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/filters_fn.ts b/src/plugins/data/common/search/aggs/buckets/filters_fn.ts
index 1b57b3850fdb2..cbaf013beb7c3 100644
--- a/src/plugins/data/common/search/aggs/buckets/filters_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filters_fn.ts
@@ -9,10 +9,10 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { QueryFilterOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggFiltersFnName = 'aggFilters';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_hash.ts b/src/plugins/data/common/search/aggs/buckets/geo_hash.ts
index d42f381360566..bec2e06efca1f 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_hash.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_hash.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { GeoBoundingBox, geoBoundingBoxToAst } from '../../expressions';
 
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggGeoHashFnName } from './geo_hash_fn';
 import { BaseAggParams } from '../types';
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts b/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts
index c9ee407b0dfc0..c1028133e56b1 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts
@@ -9,10 +9,10 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { GeoBoundingBoxOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggGeoHashFnName = 'aggGeoHash';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_tile.ts b/src/plugins/data/common/search/aggs/buckets/geo_tile.ts
index 87cba9a33a451..ed9ad7b561efe 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_tile.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_tile.ts
@@ -12,7 +12,7 @@ import { noop } from 'lodash';
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggGeoTileFnName } from './geo_tile_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { METRIC_TYPES } from '../metrics/metric_agg_types';
 import { BaseAggParams } from '../types';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts b/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts
index d74a4df890558..60b2f566f023b 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggGeoTileFnName = 'aggGeoTile';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram.ts b/src/plugins/data/common/search/aggs/buckets/histogram.ts
index 2aba5e81f1e7a..5231bbbb91b10 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram.ts
@@ -8,9 +8,9 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
-import { KBN_FIELD_TYPES, UI_SETTINGS } from '../../../../common';
+import { KBN_FIELD_TYPES, UI_SETTINGS } from '../../..';
 
 import { ExtendedBounds, extendedBoundsToAst } from '../../expressions';
 import { AggTypesDependencies } from '../agg_types';
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts b/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
index f46a158844a00..a7af9017fb5d4 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { ExtendedBoundsOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggHistogramFnName = 'aggHistogram';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/ip_range.ts b/src/plugins/data/common/search/aggs/buckets/ip_range.ts
index 948cc08c3aaa9..d723ed62ed01e 100644
--- a/src/plugins/data/common/search/aggs/buckets/ip_range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/ip_range.ts
@@ -15,7 +15,7 @@ import { BUCKET_TYPES } from './bucket_agg_types';
 import { createFilterIpRange } from './create_filter/ip_range';
 import { IpRangeKey, RangeIpRangeAggKey, CidrMaskIpRangeAggKey } from './lib/ip_range';
 import { aggIpRangeFnName } from './ip_range_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const ipRangeTitle = i18n.translate('data.search.aggs.buckets.ipRangeTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts b/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts
index c0543d3c5b4f8..391e38804f604 100644
--- a/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts
@@ -9,8 +9,8 @@
 import { groupBy, isEmpty, isNil, map, mapValues, omit, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 import { CidrOutput, IpRangeOutput } from '../../expressions';
 
 export const aggIpRangeFnName = 'aggIpRange';
diff --git a/src/plugins/data/common/search/aggs/buckets/multi_terms.test.ts b/src/plugins/data/common/search/aggs/buckets/multi_terms.test.ts
index f390bd860a219..0244204ae7e14 100644
--- a/src/plugins/data/common/search/aggs/buckets/multi_terms.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/multi_terms.test.ts
@@ -191,4 +191,27 @@ describe('Multi Terms Agg', () => {
     const { [BUCKET_TYPES.MULTI_TERMS]: params } = aggConfigs.aggs[0].toDsl();
     expect(params.order).toEqual({ 'test-orderAgg.50': 'desc' });
   });
+
+  test('optionally supports shard_size', () => {
+    const aggConfigs = getAggConfigs({
+      fields: ['string_field'],
+      shardSize: 1000,
+      orderAgg: {
+        type: 'count',
+      },
+    });
+    const { [BUCKET_TYPES.MULTI_TERMS]: params } = aggConfigs.aggs[0].toDsl();
+    expect(params.shard_size).toEqual(1000);
+  });
+
+  test('should report precision errors', () => {
+    const aggConfigs = getAggConfigs();
+    const { type } = aggConfigs.aggs[0];
+
+    expect(type.hasPrecisionError).toBeInstanceOf(Function);
+
+    expect(type.hasPrecisionError!({})).toBeFalsy();
+    expect(type.hasPrecisionError!({ doc_count_error_upper_bound: 0 })).toBeFalsy();
+    expect(type.hasPrecisionError!({ doc_count_error_upper_bound: -1 })).toBeTruthy();
+  });
 });
diff --git a/src/plugins/data/common/search/aggs/buckets/multi_terms.ts b/src/plugins/data/common/search/aggs/buckets/multi_terms.ts
index e98580fb99e1f..8dbde951ba183 100644
--- a/src/plugins/data/common/search/aggs/buckets/multi_terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/multi_terms.ts
@@ -32,6 +32,7 @@ export interface AggParamsMultiTerms extends BaseAggParams {
   orderAgg?: AggConfigSerialized;
   order?: 'asc' | 'desc';
   size?: number;
+  shardSize?: number;
   otherBucket?: boolean;
   otherBucketLabel?: string;
   separatorLabel?: string;
@@ -90,6 +91,7 @@ export const getMultiTermsBucketAgg = () => {
     },
     createFilter: createFilterMultiTerms,
     postFlightRequest: createOtherBucketPostFlightRequest(constructMultiTermOtherFilter),
+    hasPrecisionError: (aggBucket) => Boolean(aggBucket?.doc_count_error_upper_bound),
     params: [
       {
         name: 'fields',
@@ -127,6 +129,12 @@ export const getMultiTermsBucketAgg = () => {
         name: 'size',
         default: 5,
       },
+      {
+        name: 'shardSize',
+        write: (aggConfig, output) => {
+          output.params.shard_size = aggConfig.params.shardSize;
+        },
+      },
       {
         name: 'otherBucket',
         default: false,
diff --git a/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts
index 12b9c6d156548..8cafadc9b60a8 100644
--- a/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggMultiTermsFnName = 'aggMultiTerms';
 
@@ -87,6 +87,12 @@ export const aggMultiTerms = (): FunctionDefinition => ({
         defaultMessage: 'Max number of buckets to retrieve',
       }),
     },
+    shardSize: {
+      types: ['number'],
+      help: i18n.translate('data.search.aggs.buckets.terms.shardSize.help', {
+        defaultMessage: 'Number of terms to evaluate during the aggregation.',
+      }),
+    },
     otherBucket: {
       types: ['boolean'],
       help: i18n.translate('data.search.aggs.buckets.multiTerms.otherBucket.help', {
diff --git a/src/plugins/data/common/search/aggs/buckets/range.test.ts b/src/plugins/data/common/search/aggs/buckets/range.test.ts
index 202cc59c83c0f..5c1a8e6ec2aad 100644
--- a/src/plugins/data/common/search/aggs/buckets/range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range.test.ts
@@ -9,7 +9,7 @@
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { BUCKET_TYPES } from './bucket_agg_types';
-import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../../field_formats/common';
+import { FieldFormatsGetConfigFn, NumberFormat } from '@kbn/field-formats-plugin/common';
 
 describe('Range Agg', () => {
   const getConfig = (() => {}) as FieldFormatsGetConfigFn;
diff --git a/src/plugins/data/common/search/aggs/buckets/range.ts b/src/plugins/data/common/search/aggs/buckets/range.ts
index 4c8718c69e589..e15995be5636b 100644
--- a/src/plugins/data/common/search/aggs/buckets/range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 
 import { NumericalRange, numericalRangeToAst } from '../../expressions';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { AggTypesDependencies } from '../agg_types';
 import { BaseAggParams } from '../types';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/range_fn.ts b/src/plugins/data/common/search/aggs/buckets/range_fn.ts
index be7fe7615a9b1..30b0f00fc57de 100644
--- a/src/plugins/data/common/search/aggs/buckets/range_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { NumericalRangeOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggRangeFnName = 'aggRange';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/rare_terms.ts b/src/plugins/data/common/search/aggs/buckets/rare_terms.ts
index bc3c23b026238..4d0c9c9a5e35d 100644
--- a/src/plugins/data/common/search/aggs/buckets/rare_terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/rare_terms.ts
@@ -14,7 +14,7 @@ import { createFilterTerms } from './create_filter/terms';
 import { aggRareTermsFnName } from './rare_terms_fn';
 import { BaseAggParams } from '../types';
 
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 const termsTitle = i18n.translate('data.search.aggs.buckets.rareTermsTitle', {
   defaultMessage: 'Rare terms',
diff --git a/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts
index bdb4556d186ad..6b1dd98884cd5 100644
--- a/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggRareTermsFnName = 'aggRareTerms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts b/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts
index 2cb30eb70a230..1c1c57ba31c26 100644
--- a/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '..';
 import { SAMPLER_AGG_NAME } from './sampler';
 
 export const aggSamplerFnName = 'aggSampler';
diff --git a/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts b/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts
index 9f7559c6fe34f..cbd77ff1dd2f9 100644
--- a/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { AggConfigs } from '../agg_configs';
-import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../../field_formats/common';
+import { FieldFormatsGetConfigFn, NumberFormat } from '@kbn/field-formats-plugin/common';
 import { getShardDelayBucketAgg, SHARD_DELAY_AGG_NAME } from './shard_delay';
 
 describe('Shard Delay Agg', () => {
diff --git a/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts b/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts
index 693c7fe213717..cbf9485b31be4 100644
--- a/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggConfigSerialized } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggConfigSerialized } from '..';
 import { AggParamsShardDelay, SHARD_DELAY_AGG_NAME } from './shard_delay';
 
 export const aggShardDelayFnName = 'aggShardDelay';
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_terms.ts b/src/plugins/data/common/search/aggs/buckets/significant_terms.ts
index 561df31a529aa..57a63aedf0939 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_terms.ts
@@ -12,7 +12,7 @@ import { createFilterTerms } from './create_filter/terms';
 import { isStringType, migrateIncludeExcludeFormat } from './migrate_include_exclude_format';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggSignificantTermsFnName } from './significant_terms_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const significantTermsTitle = i18n.translate('data.search.aggs.buckets.significantTermsTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts
index bb0de838ad640..92018190440bb 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggSignificantTermsFnName = 'aggSignificantTerms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_text.ts b/src/plugins/data/common/search/aggs/buckets/significant_text.ts
index 0436b58a2c998..5e159164b513a 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_text.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_text.ts
@@ -11,7 +11,7 @@ import { BucketAggType } from './bucket_agg_type';
 import { migrateIncludeExcludeFormat } from './migrate_include_exclude_format';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggSignificantTextFnName } from './significant_text_fn';
-import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 import { createFilterTerms } from './create_filter/terms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts b/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts
index 5392b8fd3745c..44d346fb42c74 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggSignificantTextFnName = 'aggSignificantText';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/terms.test.ts b/src/plugins/data/common/search/aggs/buckets/terms.test.ts
index a2d9b94283e8b..b12545455157e 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms.test.ts
@@ -293,6 +293,18 @@ describe('Terms Agg', () => {
       expect(params.order).toEqual({ 'test-orderAgg.50': 'desc' });
     });
 
+    test('optionally supports shard_size', () => {
+      const aggConfigs = getAggConfigs({
+        field: 'string_field',
+        orderAgg: {
+          type: 'count',
+        },
+        shardSize: 1000,
+      });
+      const { [BUCKET_TYPES.TERMS]: params } = aggConfigs.aggs[0].toDsl();
+      expect(params.shard_size).toEqual(1000);
+    });
+
     test('should override "hasPrecisionError" for the "terms" bucket type', () => {
       const aggConfigs = getAggConfigs();
       const { type } = aggConfigs.aggs[0];
diff --git a/src/plugins/data/common/search/aggs/buckets/terms.ts b/src/plugins/data/common/search/aggs/buckets/terms.ts
index bfc5809d5e439..b32ca564d2919 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms.ts
@@ -19,7 +19,7 @@ import {
 import { aggTermsFnName } from './terms_fn';
 import { AggConfigSerialized, BaseAggParams } from '../types';
 
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 import {
   createOtherBucketPostFlightRequest,
@@ -39,6 +39,7 @@ export interface AggParamsTerms extends BaseAggParams {
   orderAgg?: AggConfigSerialized;
   order?: 'asc' | 'desc';
   size?: number;
+  shardSize?: number;
   missingBucket?: boolean;
   missingBucketLabel?: string;
   otherBucket?: boolean;
@@ -115,6 +116,12 @@ export const getTermsBucketAgg = () =>
         name: 'size',
         default: 5,
       },
+      {
+        name: 'shardSize',
+        write: (aggConfig, output) => {
+          output.params.shard_size = aggConfig.params.shardSize;
+        },
+      },
       {
         name: 'otherBucket',
         default: false,
diff --git a/src/plugins/data/common/search/aggs/buckets/terms_fn.test.ts b/src/plugins/data/common/search/aggs/buckets/terms_fn.test.ts
index f55623540649c..0d0a00bc24e06 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms_fn.test.ts
@@ -37,6 +37,7 @@ describe('agg_expression_functions', () => {
               "orderBy": "1",
               "otherBucket": undefined,
               "otherBucketLabel": undefined,
+              "shardSize": undefined,
               "size": undefined,
             },
             "schema": undefined,
@@ -55,6 +56,7 @@ describe('agg_expression_functions', () => {
         order: 'desc',
         orderBy: '2',
         size: 6,
+        shardSize: 1000,
         missingBucket: true,
         missingBucketLabel: 'missing',
         otherBucket: true,
@@ -80,6 +82,7 @@ describe('agg_expression_functions', () => {
             "orderBy": "2",
             "otherBucket": true,
             "otherBucketLabel": "other",
+            "shardSize": 1000,
             "size": 6,
           },
           "schema": "whatever",
@@ -122,6 +125,7 @@ describe('agg_expression_functions', () => {
               "orderBy": "1",
               "otherBucket": undefined,
               "otherBucketLabel": undefined,
+              "shardSize": undefined,
               "size": undefined,
             },
             "schema": undefined,
@@ -130,6 +134,7 @@ describe('agg_expression_functions', () => {
           "orderBy": "1",
           "otherBucket": undefined,
           "otherBucketLabel": undefined,
+          "shardSize": undefined,
           "size": undefined,
         }
       `);
diff --git a/src/plugins/data/common/search/aggs/buckets/terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/terms_fn.ts
index bce1010ede342..045295a7c7c94 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggTermsFnName = 'aggTerms';
 
@@ -86,6 +86,12 @@ export const aggTerms = (): FunctionDefinition => ({
         defaultMessage: 'Max number of buckets to retrieve',
       }),
     },
+    shardSize: {
+      types: ['number'],
+      help: i18n.translate('data.search.aggs.buckets.terms.shardSize.help', {
+        defaultMessage: 'Number of terms to evaluate during the aggregation.',
+      }),
+    },
     missingBucket: {
       types: ['boolean'],
       help: i18n.translate('data.search.aggs.buckets.terms.missingBucket.help', {
diff --git a/src/plugins/data/common/search/aggs/index.test.ts b/src/plugins/data/common/search/aggs/index.test.ts
index ecd821f363b1f..1c1a5e06334c7 100644
--- a/src/plugins/data/common/search/aggs/index.test.ts
+++ b/src/plugins/data/common/search/aggs/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getAggTypes } from './index';
+import { getAggTypes } from '.';
 import { mockGetFieldFormatsStart } from './test_helpers';
 
 import { isBucketAggType } from './buckets/bucket_agg_type';
diff --git a/src/plugins/data/common/search/aggs/metrics/avg.ts b/src/plugins/data/common/search/aggs/metrics/avg.ts
index 6ffafbdf37ee9..1fafc095e35b7 100644
--- a/src/plugins/data/common/search/aggs/metrics/avg.ts
+++ b/src/plugins/data/common/search/aggs/metrics/avg.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggAvgFnName } from './avg_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const averageTitle = i18n.translate('data.search.aggs.metrics.averageTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/avg_fn.ts b/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
index e32de6cd0a83f..9955e1f4dbc2c 100644
--- a/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggAvgFnName = 'aggAvg';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts
index a980f6ac555a2..d537199af3050 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketAvgFnName = 'aggBucketAvg';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts
index 0d3e8a5e7f878..81aeea400a908 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketMaxFnName = 'aggBucketMax';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts
index 3b6c32595909a..844960f352cc2 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketMinFnName = 'aggBucketMin';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts
index ae3502bbc2588..16418c8933633 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketSumFnName = 'aggBucketSum';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/cardinality.ts b/src/plugins/data/common/search/aggs/metrics/cardinality.ts
index f965deb6b0fe8..496cc85440b84 100644
--- a/src/plugins/data/common/search/aggs/metrics/cardinality.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cardinality.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggCardinalityFnName } from './cardinality_fn';
 import { MetricAggType, IMetricAggConfig } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const uniqueCountTitle = i18n.translate('data.search.aggs.metrics.uniqueCountTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
index cdff364f7c45e..351f97dcc3c37 100644
--- a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggCardinalityFnName = 'aggCardinality';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/count_fn.ts b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
index c302e0abf7c5d..b7dedf4301f6c 100644
--- a/src/plugins/data/common/search/aggs/metrics/count_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggCountFnName = 'aggCount';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts b/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts
index 5cdbcfe857585..29324e3a623aa 100644
--- a/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggCumulativeSumFnName = 'aggCumulativeSum';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts b/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
index 8bfe808aede8e..97758b778c20e 100644
--- a/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggDerivativeFnName = 'aggDerivative';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts b/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts
index 0b3d3acd3a603..ffbee1215bdab 100644
--- a/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggFilteredMetricFnName = 'aggFilteredMetric';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts b/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts
index b0f3ec886c5c8..0fd33709da421 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggGeoBoundsFnName } from './geo_bounds_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsGeoBounds extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts b/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts
index b2cfad1805b9f..a787c7a35a0a3 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggGeoBoundsFnName = 'aggGeoBounds';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts b/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts
index e3716084c969a..040fb4c72f50b 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggGeoCentroidFnName } from './geo_centroid_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsGeoCentroid extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts b/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts
index 9215f7afb4c6d..73f7e9ebf3310 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggGeoCentroidFnName = 'aggGeoCentroid';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/max.ts b/src/plugins/data/common/search/aggs/metrics/max.ts
index ce5718a7234ba..53dadb085994b 100644
--- a/src/plugins/data/common/search/aggs/metrics/max.ts
+++ b/src/plugins/data/common/search/aggs/metrics/max.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggMaxFnName } from './max_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const maxTitle = i18n.translate('data.search.aggs.metrics.maxTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/max_fn.ts b/src/plugins/data/common/search/aggs/metrics/max_fn.ts
index 7a1d8ad22fb7e..09ca2def05d50 100644
--- a/src/plugins/data/common/search/aggs/metrics/max_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/max_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMaxFnName = 'aggMax';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/median.ts b/src/plugins/data/common/search/aggs/metrics/median.ts
index 4fdb1ce6b7d81..e43676e4a1ba0 100644
--- a/src/plugins/data/common/search/aggs/metrics/median.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggMedianFnName } from './median_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const medianTitle = i18n.translate('data.search.aggs.metrics.medianTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/median_fn.ts b/src/plugins/data/common/search/aggs/metrics/median_fn.ts
index a9537e1f99ca4..c06c29bc05b50 100644
--- a/src/plugins/data/common/search/aggs/metrics/median_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMedianFnName = 'aggMedian';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/min.ts b/src/plugins/data/common/search/aggs/metrics/min.ts
index ea95827737b87..9d42d2debebca 100644
--- a/src/plugins/data/common/search/aggs/metrics/min.ts
+++ b/src/plugins/data/common/search/aggs/metrics/min.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
 import { aggMinFnName } from './min_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const minTitle = i18n.translate('data.search.aggs.metrics.minTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/min_fn.ts b/src/plugins/data/common/search/aggs/metrics/min_fn.ts
index a97834f310a49..689e34d270a4f 100644
--- a/src/plugins/data/common/search/aggs/metrics/min_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/min_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMinFnName = 'aggMin';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts b/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts
index 1637dad561c37..4b0f23983e55b 100644
--- a/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMovingAvgFnName = 'aggMovingAvg';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts b/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts
index 8f976ba979b95..3d93a368c6597 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { AggTypesDependencies } from '../agg_types';
 import { BaseAggParams } from '../types';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts b/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts
index 60a2882fcec58..bca07d62c3730 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggPercentileRanksFnName = 'aggPercentileRanks';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/percentiles.ts b/src/plugins/data/common/search/aggs/metrics/percentiles.ts
index d0e1c6df77696..c10403a1c6dd4 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentiles.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentiles.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { getResponseAggConfigClass } from './lib/get_response_agg_config_class';
 import type { IResponseAggConfig } from './lib/get_response_agg_config_class';
 import { aggPercentilesFnName } from './percentiles_fn';
diff --git a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
index 1a746a86cbcd5..fa9e4de2b0d4a 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggPercentilesFnName = 'aggPercentiles';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts b/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts
index 8460cb891f1e4..9d5a75e47ac10 100644
--- a/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggSerialDiffFnName = 'aggSerialDiff';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/single_percentile.ts b/src/plugins/data/common/search/aggs/metrics/single_percentile.ts
index 954576e2bbe1f..678e517c831b7 100644
--- a/src/plugins/data/common/search/aggs/metrics/single_percentile.ts
+++ b/src/plugins/data/common/search/aggs/metrics/single_percentile.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggSinglePercentileFnName } from './single_percentile_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const singlePercentileTitle = i18n.translate('data.search.aggs.metrics.singlePercentileTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts b/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts
index edf69031c31ac..3d16f71b322d0 100644
--- a/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggSinglePercentileFnName = 'aggSinglePercentile';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/std_deviation.ts b/src/plugins/data/common/search/aggs/metrics/std_deviation.ts
index 9a4c38e296635..a6b74b083d689 100644
--- a/src/plugins/data/common/search/aggs/metrics/std_deviation.ts
+++ b/src/plugins/data/common/search/aggs/metrics/std_deviation.ts
@@ -13,7 +13,7 @@ import { aggStdDeviationFnName } from './std_deviation_fn';
 import { METRIC_TYPES } from './metric_agg_types';
 import { getResponseAggConfigClass } from './lib/get_response_agg_config_class';
 import type { IResponseAggConfig } from './lib/get_response_agg_config_class';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsStdDeviation extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts b/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts
index c181065d2416e..1993713470dd6 100644
--- a/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggStdDeviationFnName = 'aggStdDeviation';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/sum.ts b/src/plugins/data/common/search/aggs/metrics/sum.ts
index 2f1afcf418ba1..af0bc83912b41 100644
--- a/src/plugins/data/common/search/aggs/metrics/sum.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sum.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { aggSumFnName } from './sum_fn';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const sumTitle = i18n.translate('data.search.aggs.metrics.sumTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/sum_fn.ts b/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
index 063cc10839813..161674b2ea512 100644
--- a/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggSumFnName = 'aggSum';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts b/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts
index 37ce9c4edb8d1..69b1b5e44205d 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts
@@ -11,7 +11,7 @@ import { getTopHitMetricAgg } from './top_hit';
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { IMetricAggConfig } from './metric_agg_type';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 describe('Top hit metric', () => {
   let aggDsl: Record<string, any>;
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit.ts b/src/plugins/data/common/search/aggs/metrics/top_hit.ts
index a4bd99d6b210d..ce120f1271632 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit.ts
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { aggTopHitFnName } from './top_hit_fn';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsTopHit extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts b/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts
index bc20f19253eec..0acc29a814add 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggTopHitFnName = 'aggTopHit';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts b/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts
index 9bf5f581aa0a4..6542c6f398cb9 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts
@@ -10,7 +10,7 @@ import { getTopMetricsMetricAgg } from './top_metrics';
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { IMetricAggConfig } from './metric_agg_type';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 describe('Top metrics metric', () => {
   let aggConfig: IMetricAggConfig;
diff --git a/src/plugins/data/common/search/aggs/metrics/top_metrics.ts b/src/plugins/data/common/search/aggs/metrics/top_metrics.ts
index 2079925e0435b..df90186bbd746 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_metrics.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_metrics.ts
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { aggTopMetricsFnName } from './top_metrics_fn';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsTopMetrics extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts b/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts
index 6fe9ba97fe448..0cdcd701d9376 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggTopMetricsFnName = 'aggTopMetrics';
 
diff --git a/src/plugins/data/common/search/aggs/param_types/base.ts b/src/plugins/data/common/search/aggs/param_types/base.ts
index 8ec528d311e01..8f5c660532df4 100644
--- a/src/plugins/data/common/search/aggs/param_types/base.ts
+++ b/src/plugins/data/common/search/aggs/param_types/base.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
-import { ExpressionAstExpression } from 'src/plugins/expressions/common';
+import { ISearchOptions, ISearchSource } from '../../../../public';
 import { IAggConfigs } from '../agg_configs';
 import { IAggConfig } from '../agg_config';
 
diff --git a/src/plugins/data/common/search/aggs/param_types/field.test.ts b/src/plugins/data/common/search/aggs/param_types/field.test.ts
index f49fec858bfaf..be9b48f7eb0e8 100644
--- a/src/plugins/data/common/search/aggs/param_types/field.test.ts
+++ b/src/plugins/data/common/search/aggs/param_types/field.test.ts
@@ -8,7 +8,7 @@
 
 import { BaseParamType } from './base';
 import { FieldParamType } from './field';
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../common';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../..';
 import { IAggConfig } from '../agg_config';
 
 describe('Field', () => {
diff --git a/src/plugins/data/common/search/aggs/param_types/field.ts b/src/plugins/data/common/search/aggs/param_types/field.ts
index b56787121f724..077978e952e43 100644
--- a/src/plugins/data/common/search/aggs/param_types/field.ts
+++ b/src/plugins/data/common/search/aggs/param_types/field.ts
@@ -7,15 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '@kbn/kibana-utils-plugin/common';
+import { isNestedField, IndexPatternField, DataViewField } from '@kbn/data-views-plugin/common';
 import { IAggConfig } from '../agg_config';
-import {
-  SavedFieldNotFound,
-  SavedFieldTypeInvalidForAgg,
-} from '../../../../../../plugins/kibana_utils/common';
 import { BaseParamType } from './base';
 import { propFilter } from '../utils';
 import { KBN_FIELD_TYPES } from '../../../kbn_field_types/types';
-import { isNestedField, IndexPatternField, DataViewField } from '../../../../../data_views/common';
 
 const filterByType = propFilter('type');
 
diff --git a/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts b/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts
index 91460dcd4f8f5..bcb0a22524689 100644
--- a/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts
+++ b/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts
@@ -11,7 +11,7 @@ import {
   AnyExpressionFunctionDefinition,
   ExpressionFunctionDefinition,
   ExecutionContext,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 /**
  * Takes a function spec and passes in default args,
diff --git a/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts b/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts
index 50c8966d284a0..663de94952bbd 100644
--- a/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts
+++ b/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fieldFormatsMock } from '../../../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 
 import { AggTypesRegistry, AggTypesRegistryStart } from '../agg_types_registry';
 import { AggTypesDependencies, getAggTypes } from '../agg_types';
diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts
index 3781b35e5b767..0d5a51eaef151 100644
--- a/src/plugins/data/common/search/aggs/types.ts
+++ b/src/plugins/data/common/search/aggs/types.ts
@@ -89,7 +89,7 @@ import {
   METRIC_TYPES,
   aggFilteredMetric,
   aggSinglePercentile,
-} from './';
+} from '.';
 import { AggParamsSampler } from './buckets/sampler';
 import { AggParamsDiversifiedSampler } from './buckets/diversified_sampler';
 import { AggParamsSignificantText } from './buckets/significant_text';
diff --git a/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts b/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
index e9ccc3b512756..48ec54a937548 100644
--- a/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
+++ b/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
@@ -7,8 +7,8 @@
  */
 
 import moment from 'moment';
-import { UI_SETTINGS } from '../../../../common/constants';
-import { TimeRange } from '../../../../common/query';
+import { UI_SETTINGS } from '../../../constants';
+import { TimeRange } from '../../../query';
 import { TimeBuckets } from '../buckets/lib/time_buckets';
 import { toAbsoluteDates } from './date_interval_utils';
 import { autoInterval } from '../buckets/_interval_options';
diff --git a/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts b/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts
index d147caf92711f..308f46551af30 100644
--- a/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts
+++ b/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts
@@ -7,7 +7,7 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { TimeRange } from '../../../../../common';
+import { TimeRange } from '../../../..';
 
 export function toAbsoluteDates(range: TimeRange) {
   const fromDate = dateMath.parse(range.from);
diff --git a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
index c8d173461cf3b..ea68be542f42f 100644
--- a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
@@ -8,11 +8,7 @@
 
 import { identity } from 'lodash';
 
-import {
-  FieldFormat,
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../field_formats/common';
+import { FieldFormat, IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { MultiFieldKey } from '../buckets/multi_field_key';
 import { getAggsFormats } from './get_aggs_formats';
 
diff --git a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
index 2233c9338cd58..61b61d70f1375 100644
--- a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
@@ -16,7 +16,7 @@ import {
   FieldFormatsContentType,
   IFieldFormat,
   SerializedFieldFormat,
-} from '../../../../../field_formats/common';
+} from '@kbn/field-formats-plugin/common';
 import { DateRange } from '../../expressions';
 import { convertDateRangeToString } from '../buckets/lib/date_range';
 import { convertIPRangeToString, IpRangeKey } from '../buckets/lib/ip_range';
diff --git a/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts b/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts
index aa6e460b9c4dc..f6b0d364aa46b 100644
--- a/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from 'src/plugins/expressions/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { TimeRange } from '../../../types';
 import type { AggParamsDateHistogram } from '../buckets';
 import { BUCKET_TYPES } from '../buckets/bucket_agg_types';
diff --git a/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts b/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts
index 067f87bd8481e..cdb6ef22fe5ff 100644
--- a/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from 'src/plugins/expressions/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import type { AggParamsHistogram } from '../buckets';
 import { BUCKET_TYPES } from '../buckets/bucket_agg_types';
 
diff --git a/src/plugins/data/common/search/aggs/utils/time_splits.ts b/src/plugins/data/common/search/aggs/utils/time_splits.ts
index 14ec52d17ea71..3f8783a05f91a 100644
--- a/src/plugins/data/common/search/aggs/utils/time_splits.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_splits.ts
@@ -12,7 +12,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { RangeFilter } from '@kbn/es-query';
 import { AggGroupNames } from '../agg_groups';
-import { GenericBucket, AggConfigs, getTime, AggConfig } from '../../../../common';
+import { GenericBucket, AggConfigs, getTime, AggConfig } from '../../..';
 import { IBucketAggConfig } from '../buckets';
 
 /**
diff --git a/src/plugins/data/common/search/expressions/cidr.ts b/src/plugins/data/common/search/expressions/cidr.ts
index f575af2ee84d3..84950165c81c0 100644
--- a/src/plugins/data/common/search/expressions/cidr.ts
+++ b/src/plugins/data/common/search/expressions/cidr.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface Cidr {
   mask: string;
diff --git a/src/plugins/data/common/search/expressions/cidr_to_ast.ts b/src/plugins/data/common/search/expressions/cidr_to_ast.ts
index 45ee5ed079001..82eeb1e6c3964 100644
--- a/src/plugins/data/common/search/expressions/cidr_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/cidr_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionCidr, Cidr } from './cidr';
 
 export const cidrToAst = (cidr: Cidr) => {
diff --git a/src/plugins/data/common/search/expressions/date_range.ts b/src/plugins/data/common/search/expressions/date_range.ts
index e506b0c624f9e..8f67493efad40 100644
--- a/src/plugins/data/common/search/expressions/date_range.ts
+++ b/src/plugins/data/common/search/expressions/date_range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface DateRange {
   from: number | string;
diff --git a/src/plugins/data/common/search/expressions/date_range_to_ast.ts b/src/plugins/data/common/search/expressions/date_range_to_ast.ts
index 93cb32d2c943b..61f5c3880e06f 100644
--- a/src/plugins/data/common/search/expressions/date_range_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/date_range_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionDateRange, DateRange } from './date_range';
 
 export const dateRangeToAst = (dateRange: DateRange) => {
diff --git a/src/plugins/data/common/search/expressions/eql.ts b/src/plugins/data/common/search/expressions/eql.ts
index cef099ca447c0..893b0e0ad9d06 100644
--- a/src/plugins/data/common/search/expressions/eql.ts
+++ b/src/plugins/data/common/search/expressions/eql.ts
@@ -8,11 +8,11 @@
 
 import { i18n } from '@kbn/i18n';
 import { buildEsQuery } from '@kbn/es-query';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { EqlSearchRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { lastValueFrom } from 'rxjs';
-import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
+import { RequestStatistics, RequestAdapter } from '@kbn/inspector-plugin/common';
 import {
   ISearchGeneric,
   KibanaContext,
diff --git a/src/plugins/data/common/search/expressions/eql_raw_response.ts b/src/plugins/data/common/search/expressions/eql_raw_response.ts
index ccdaed47e1676..c77eb9d84c737 100644
--- a/src/plugins/data/common/search/expressions/eql_raw_response.ts
+++ b/src/plugins/data/common/search/expressions/eql_raw_response.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionTypeDefinition } from '../../../../expressions/common';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common';
 import { EqlSearchStrategyResponse } from '..';
 
 const name = 'eql_raw_response';
diff --git a/src/plugins/data/common/search/expressions/es_raw_response.ts b/src/plugins/data/common/search/expressions/es_raw_response.ts
index 97c685777e4c7..6853eba6a9bc7 100644
--- a/src/plugins/data/common/search/expressions/es_raw_response.ts
+++ b/src/plugins/data/common/search/expressions/es_raw_response.ts
@@ -7,7 +7,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ExpressionTypeDefinition } from '../../../../expressions/common';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common';
 
 const name = 'es_raw_response';
 
diff --git a/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts b/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts
index 76e19eb129e5c..ad584ff8dd8bf 100644
--- a/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts
@@ -7,12 +7,12 @@
  */
 
 import { isRangeFilter } from '@kbn/es-query';
-import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../field_formats/common';
+import { BytesFormat, FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
 import { AggConfigs, IAggConfig } from '../../aggs';
 import { mockAggTypesRegistry } from '../../aggs/test_helpers';
 
 import { createFilter } from './create_filter';
-import { Datatable } from '../../../../../expressions/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 
 describe('createFilter', () => {
   let table: Datatable;
diff --git a/src/plugins/data/common/search/expressions/esaggs/create_filter.ts b/src/plugins/data/common/search/expressions/esaggs/create_filter.ts
index 66430e224bb8d..9030cd7623ef7 100644
--- a/src/plugins/data/common/search/expressions/esaggs/create_filter.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/create_filter.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { Filter } from '../../../es_query';
 import { IAggConfig } from '../../aggs';
-import { Datatable } from '../../../../../expressions/common';
 
 const getOtherBucketFilterTerms = (table: Datatable, columnIndex: number, rowIndex: number) => {
   if (rowIndex === -1) {
diff --git a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
index 792b28408c5ff..6ef043a33dcbe 100644
--- a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
@@ -9,10 +9,10 @@
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
 
-import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { buildExpressionFunction } from '../../../../../../plugins/expressions/common';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/common';
 
-import { IndexPatternExpressionType } from '../../../../../data_views/common/expressions';
+import { IndexPatternExpressionType } from '@kbn/data-views-plugin/common/expressions';
 import { IndexPatternsContract } from '../../..';
 
 import { AggsStart, AggExpressionType, aggCountFnName } from '../../aggs';
diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
index d395baed2f08e..4c93667b502c8 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { defer } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Adapters } from 'src/plugins/inspector/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 
-import { calculateBounds, Filter, IndexPattern, Query, TimeRange } from '../../../../common';
+import { calculateBounds, Filter, IndexPattern, Query, TimeRange } from '../../..';
 
 import { IAggConfigs } from '../../aggs';
 import { ISearchStartSearchSource } from '../../search_source';
diff --git a/src/plugins/data/common/search/expressions/esdsl.ts b/src/plugins/data/common/search/expressions/esdsl.ts
index fbf8add29bb93..34a67223b4be5 100644
--- a/src/plugins/data/common/search/expressions/esdsl.ts
+++ b/src/plugins/data/common/search/expressions/esdsl.ts
@@ -8,11 +8,11 @@
 
 import { i18n } from '@kbn/i18n';
 import { buildEsQuery } from '@kbn/es-query';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { lastValueFrom } from 'rxjs';
+import { RequestStatistics, RequestAdapter } from '@kbn/inspector-plugin/common';
 import { EsRawResponse } from './es_raw_response';
-import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
 import { ISearchGeneric, KibanaContext } from '..';
 import { getEsQueryConfig } from '../../es_query';
 import { UiSettingsCommon } from '../..';
diff --git a/src/plugins/data/common/search/expressions/exists_filter.test.ts b/src/plugins/data/common/search/expressions/exists_filter.test.ts
index b6543eb25f924..c567505caaf4b 100644
--- a/src/plugins/data/common/search/expressions/exists_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/exists_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { existsFilterFunction } from './exists_filter';
 
diff --git a/src/plugins/data/common/search/expressions/exists_filter.ts b/src/plugins/data/common/search/expressions/exists_filter.ts
index b7c11daa38379..a14deac30fdc8 100644
--- a/src/plugins/data/common/search/expressions/exists_filter.ts
+++ b/src/plugins/data/common/search/expressions/exists_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { buildFilter, FILTERS } from '@kbn/es-query';
 import { KibanaField, KibanaFilter } from './kibana_context_type';
 import { IndexPattern } from '../..';
diff --git a/src/plugins/data/common/search/expressions/extended_bounds.ts b/src/plugins/data/common/search/expressions/extended_bounds.ts
index 028d1f8445dd3..f629b3f148254 100644
--- a/src/plugins/data/common/search/expressions/extended_bounds.ts
+++ b/src/plugins/data/common/search/expressions/extended_bounds.ts
@@ -8,7 +8,7 @@
 
 import { isNil, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface ExtendedBounds {
   min?: number;
diff --git a/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts b/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts
index 57b88cea5ab67..e6c822ae4808c 100644
--- a/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionExtendedBounds, ExtendedBounds } from './extended_bounds';
 
 export const extendedBoundsToAst = (extendedBounds: ExtendedBounds) => {
diff --git a/src/plugins/data/common/search/expressions/field.test.ts b/src/plugins/data/common/search/expressions/field.test.ts
index ba3e3f0d83515..09672547dbcdb 100644
--- a/src/plugins/data/common/search/expressions/field.test.ts
+++ b/src/plugins/data/common/search/expressions/field.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { fieldFunction } from './field';
 
diff --git a/src/plugins/data/common/search/expressions/field.ts b/src/plugins/data/common/search/expressions/field.ts
index 8c13069f50ad5..ccb9c85576814 100644
--- a/src/plugins/data/common/search/expressions/field.ts
+++ b/src/plugins/data/common/search/expressions/field.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaField } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/filters_to_ast.ts b/src/plugins/data/common/search/expressions/filters_to_ast.ts
index 33e064ddd3076..d139ac664ed48 100644
--- a/src/plugins/data/common/search/expressions/filters_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/filters_to_ast.ts
@@ -7,7 +7,7 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionKibanaFilter } from './kibana_filter';
 
 export const filtersToAst = (filters: Filter[] | Filter) => {
diff --git a/src/plugins/data/common/search/expressions/geo_bounding_box.ts b/src/plugins/data/common/search/expressions/geo_bounding_box.ts
index b763b741acd57..5c546cbb095bc 100644
--- a/src/plugins/data/common/search/expressions/geo_bounding_box.ts
+++ b/src/plugins/data/common/search/expressions/geo_bounding_box.ts
@@ -8,7 +8,7 @@
 
 import { chain, isNil, pick, snakeCase } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 import { GeoPoint, GeoPointOutput } from './geo_point';
 
 // The API Extractor is not handling encapsulated interfaces in union types properly.
diff --git a/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts b/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts
index ab1c4ad793cf4..8d6b99cdad739 100644
--- a/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts
@@ -7,7 +7,7 @@
  */
 
 import { camelCase, chain, isNil, omit } from 'lodash';
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionGeoBoundingBox, GeoBoundingBox } from './geo_bounding_box';
 import { geoPointToAst } from './geo_point_to_ast';
 
diff --git a/src/plugins/data/common/search/expressions/geo_point.ts b/src/plugins/data/common/search/expressions/geo_point.ts
index 60e5cc2c8fb5f..a92663507157f 100644
--- a/src/plugins/data/common/search/expressions/geo_point.ts
+++ b/src/plugins/data/common/search/expressions/geo_point.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 interface Point {
   lat: number;
diff --git a/src/plugins/data/common/search/expressions/geo_point_to_ast.ts b/src/plugins/data/common/search/expressions/geo_point_to_ast.ts
index 221cefb81afa2..7454f1e91cdd6 100644
--- a/src/plugins/data/common/search/expressions/geo_point_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/geo_point_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionGeoPoint, GeoPoint } from './geo_point';
 
 export const geoPointToAst = (point: GeoPoint) => {
diff --git a/src/plugins/data/common/search/expressions/ip_range.ts b/src/plugins/data/common/search/expressions/ip_range.ts
index b63dab6373f02..985466382349a 100644
--- a/src/plugins/data/common/search/expressions/ip_range.ts
+++ b/src/plugins/data/common/search/expressions/ip_range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface IpRange {
   from: string;
diff --git a/src/plugins/data/common/search/expressions/ip_range_to_ast.ts b/src/plugins/data/common/search/expressions/ip_range_to_ast.ts
index 882b90a60e9bc..9682b62c08992 100644
--- a/src/plugins/data/common/search/expressions/ip_range_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/ip_range_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionIpRange, IpRange } from './ip_range';
 
 export const ipRangeToAst = (ipRange: IpRange) => {
diff --git a/src/plugins/data/common/search/expressions/kibana.test.ts b/src/plugins/data/common/search/expressions/kibana.test.ts
index 542cae590375e..c82bc0293cefe 100644
--- a/src/plugins/data/common/search/expressions/kibana.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { kibana } from './kibana';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
diff --git a/src/plugins/data/common/search/expressions/kibana.ts b/src/plugins/data/common/search/expressions/kibana.ts
index 86c451ab2f5ab..aa83662e0b8d4 100644
--- a/src/plugins/data/common/search/expressions/kibana.ts
+++ b/src/plugins/data/common/search/expressions/kibana.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExecutionContext, ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { Adapters } from 'src/plugins/inspector/common';
+import { ExecutionContext, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { ExpressionValueSearchContext, ExecutionContextSearch } from './kibana_context_type';
 
 const toArray = <T>(query: undefined | T | T[]): T[] =>
diff --git a/src/plugins/data/common/search/expressions/kibana_context.test.ts b/src/plugins/data/common/search/expressions/kibana_context.test.ts
index c9fe4ee5b7367..3e07366b76c2d 100644
--- a/src/plugins/data/common/search/expressions/kibana_context.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context.test.ts
@@ -8,7 +8,7 @@
 
 import { FilterStateStore, buildFilter, FILTERS } from '@kbn/es-query';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { ExecutionContext } from 'src/plugins/expressions/common';
+import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { KibanaContext } from './kibana_context_type';
 
 import {
diff --git a/src/plugins/data/common/search/expressions/kibana_context.ts b/src/plugins/data/common/search/expressions/kibana_context.ts
index 6e38e2a3949d5..c95e7e99017c0 100644
--- a/src/plugins/data/common/search/expressions/kibana_context.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context.ts
@@ -8,15 +8,15 @@
 
 import { uniqBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExecutionContext } from 'src/plugins/expressions/common';
-import { Adapters } from 'src/plugins/inspector/common';
+import { ExpressionFunctionDefinition, ExecutionContext } from '@kbn/expressions-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { Filter } from '@kbn/es-query';
 import { Query, uniqFilters } from '@kbn/es-query';
-import { unboxExpressionValue } from '../../../../expressions/common';
+import { unboxExpressionValue } from '@kbn/expressions-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { ExecutionContextSearch, KibanaContext, KibanaFilter } from './kibana_context_type';
 import { KibanaQueryOutput } from './kibana_context_type';
 import { KibanaTimerangeOutput } from './timerange';
-import { SavedObjectReference } from '../../../../../core/types';
 import { SavedObjectsClientCommon } from '../..';
 
 export interface KibanaContextStartDependencies {
diff --git a/src/plugins/data/common/search/expressions/kibana_context_type.ts b/src/plugins/data/common/search/expressions/kibana_context_type.ts
index 673372749c881..ef6b448ae0f8b 100644
--- a/src/plugins/data/common/search/expressions/kibana_context_type.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context_type.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { Filter } from '@kbn/es-query';
-import { ExpressionValueBoxed, ExpressionValueFilter } from 'src/plugins/expressions/common';
+import { ExpressionValueBoxed, ExpressionValueFilter } from '@kbn/expressions-plugin/common';
 import { Query, TimeRange } from '../../query';
 import { adaptToExpressionValueFilter, IndexPatternField } from '../..';
 
diff --git a/src/plugins/data/common/search/expressions/kibana_filter.test.ts b/src/plugins/data/common/search/expressions/kibana_filter.test.ts
index 2ecd2761de46c..b776d1297d7be 100644
--- a/src/plugins/data/common/search/expressions/kibana_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { kibanaFilterFunction } from './kibana_filter';
 
diff --git a/src/plugins/data/common/search/expressions/kibana_filter.ts b/src/plugins/data/common/search/expressions/kibana_filter.ts
index 35da556bb296c..83550f7ab139e 100644
--- a/src/plugins/data/common/search/expressions/kibana_filter.ts
+++ b/src/plugins/data/common/search/expressions/kibana_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaFilter } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/kql.test.ts b/src/plugins/data/common/search/expressions/kql.test.ts
index 378122adf7c91..bc23d5ec11e53 100644
--- a/src/plugins/data/common/search/expressions/kql.test.ts
+++ b/src/plugins/data/common/search/expressions/kql.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
 import { kqlFunction } from './kql';
diff --git a/src/plugins/data/common/search/expressions/kql.ts b/src/plugins/data/common/search/expressions/kql.ts
index 5dd830f92f834..8044848dad4e6 100644
--- a/src/plugins/data/common/search/expressions/kql.ts
+++ b/src/plugins/data/common/search/expressions/kql.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaQueryOutput } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/lucene.test.ts b/src/plugins/data/common/search/expressions/lucene.test.ts
index c87ccecbfa574..f13ed403ac58c 100644
--- a/src/plugins/data/common/search/expressions/lucene.test.ts
+++ b/src/plugins/data/common/search/expressions/lucene.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
 import { luceneFunction } from './lucene';
diff --git a/src/plugins/data/common/search/expressions/lucene.ts b/src/plugins/data/common/search/expressions/lucene.ts
index a00ff7ed5f447..70c2d1d4ac392 100644
--- a/src/plugins/data/common/search/expressions/lucene.ts
+++ b/src/plugins/data/common/search/expressions/lucene.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaQueryOutput } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/numerical_range.ts b/src/plugins/data/common/search/expressions/numerical_range.ts
index 8968117986c03..91f47d34c9db8 100644
--- a/src/plugins/data/common/search/expressions/numerical_range.ts
+++ b/src/plugins/data/common/search/expressions/numerical_range.ts
@@ -8,7 +8,7 @@
 
 import { isNil, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface NumericalRange {
   from?: number;
diff --git a/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts b/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts
index a166a6fe403fd..2c168f06391b3 100644
--- a/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionNumericalRange, NumericalRange } from './numerical_range';
 
 export const numericalRangeToAst = (numericalRange: NumericalRange) => {
diff --git a/src/plugins/data/common/search/expressions/phrase_filter.test.ts b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
index a61cc0bfd68ab..c8d7c89018771 100644
--- a/src/plugins/data/common/search/expressions/phrase_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { phraseFilterFunction } from './phrase_filter';
 
diff --git a/src/plugins/data/common/search/expressions/phrase_filter.ts b/src/plugins/data/common/search/expressions/phrase_filter.ts
index ec241752df0d0..302c4500e2c23 100644
--- a/src/plugins/data/common/search/expressions/phrase_filter.ts
+++ b/src/plugins/data/common/search/expressions/phrase_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { buildFilter, FILTERS } from '@kbn/es-query';
 import { KibanaField, KibanaFilter } from './kibana_context_type';
 import { IndexPattern } from '../..';
diff --git a/src/plugins/data/common/search/expressions/query_filter.ts b/src/plugins/data/common/search/expressions/query_filter.ts
index c5784b431146e..76841c6b4c9b7 100644
--- a/src/plugins/data/common/search/expressions/query_filter.ts
+++ b/src/plugins/data/common/search/expressions/query_filter.ts
@@ -8,7 +8,7 @@
 
 import { isNil, omit, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 import { Query } from '../../query';
 import { KibanaQueryOutput } from './kibana_context_type';
 
diff --git a/src/plugins/data/common/search/expressions/query_filter_to_ast.ts b/src/plugins/data/common/search/expressions/query_filter_to_ast.ts
index cc90643637c6c..d3390ed8d6204 100644
--- a/src/plugins/data/common/search/expressions/query_filter_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/query_filter_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionQueryFilter, QueryFilter } from './query_filter';
 import { queryToAst } from './query_to_ast';
 
diff --git a/src/plugins/data/common/search/expressions/query_to_ast.ts b/src/plugins/data/common/search/expressions/query_to_ast.ts
index 45447ded13476..282a5772fd1e7 100644
--- a/src/plugins/data/common/search/expressions/query_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/query_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { Query } from '../../query';
 import { ExpressionFunctionKql } from './kql';
 import { ExpressionFunctionLucene } from './lucene';
diff --git a/src/plugins/data/common/search/expressions/range.test.ts b/src/plugins/data/common/search/expressions/range.test.ts
index cdd51c0b05925..5892abf6a9799 100644
--- a/src/plugins/data/common/search/expressions/range.test.ts
+++ b/src/plugins/data/common/search/expressions/range.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { rangeFunction } from './range';
 
diff --git a/src/plugins/data/common/search/expressions/range.ts b/src/plugins/data/common/search/expressions/range.ts
index c7649a6e0669c..1faa5e3c60c5d 100644
--- a/src/plugins/data/common/search/expressions/range.ts
+++ b/src/plugins/data/common/search/expressions/range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   gt?: number | string;
diff --git a/src/plugins/data/common/search/expressions/range_filter.test.ts b/src/plugins/data/common/search/expressions/range_filter.test.ts
index 4db21ca1a6db5..549c77907e846 100644
--- a/src/plugins/data/common/search/expressions/range_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/range_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { rangeFilterFunction } from './range_filter';
 
diff --git a/src/plugins/data/common/search/expressions/range_filter.ts b/src/plugins/data/common/search/expressions/range_filter.ts
index f2b4b23c018f1..9fde8b99716f7 100644
--- a/src/plugins/data/common/search/expressions/range_filter.ts
+++ b/src/plugins/data/common/search/expressions/range_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { buildFilter, FILTERS } from '@kbn/es-query';
 import { KibanaField, KibanaFilter } from './kibana_context_type';
 import { IndexPattern } from '../..';
diff --git a/src/plugins/data/common/search/expressions/remove_filter.test.ts b/src/plugins/data/common/search/expressions/remove_filter.test.ts
index f5a924769df70..321dd9b4c83eb 100644
--- a/src/plugins/data/common/search/expressions/remove_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/remove_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { removeFilterFunction } from './remove_filter';
 import { KibanaContext } from './kibana_context_type';
diff --git a/src/plugins/data/common/search/expressions/remove_filter.ts b/src/plugins/data/common/search/expressions/remove_filter.ts
index f45cc4c557a73..751af01008781 100644
--- a/src/plugins/data/common/search/expressions/remove_filter.ts
+++ b/src/plugins/data/common/search/expressions/remove_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaContext } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/select_filter.test.ts b/src/plugins/data/common/search/expressions/select_filter.test.ts
index 8ef2b77b1fcc6..3ccd67ac7fb6d 100644
--- a/src/plugins/data/common/search/expressions/select_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/select_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { selectFilterFunction } from './select_filter';
 import { KibanaContext } from './kibana_context_type';
diff --git a/src/plugins/data/common/search/expressions/select_filter.ts b/src/plugins/data/common/search/expressions/select_filter.ts
index 600da4b16d274..fa60ba2cb1566 100644
--- a/src/plugins/data/common/search/expressions/select_filter.ts
+++ b/src/plugins/data/common/search/expressions/select_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaContext } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/timerange.test.ts b/src/plugins/data/common/search/expressions/timerange.test.ts
index 7a408b72187dc..6106a2836fba8 100644
--- a/src/plugins/data/common/search/expressions/timerange.test.ts
+++ b/src/plugins/data/common/search/expressions/timerange.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
 import { kibanaTimerangeFunction } from './timerange';
diff --git a/src/plugins/data/common/search/expressions/timerange.ts b/src/plugins/data/common/search/expressions/timerange.ts
index ed09bab629519..5ef8cb7a83b62 100644
--- a/src/plugins/data/common/search/expressions/timerange.ts
+++ b/src/plugins/data/common/search/expressions/timerange.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 import { TimeRange } from '../../query';
 
 export type KibanaTimerangeOutput = ExpressionValueBoxed<'timerange', TimeRange>;
diff --git a/src/plugins/data/common/search/expressions/timerange_to_ast.ts b/src/plugins/data/common/search/expressions/timerange_to_ast.ts
index 204e4187d8417..40c98e0b0b51c 100644
--- a/src/plugins/data/common/search/expressions/timerange_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/timerange_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { TimeRange } from '../../query';
 import { ExpressionFunctionKibanaTimerange } from './timerange';
 
diff --git a/src/plugins/data/common/search/expressions/utils/filters_adapter.ts b/src/plugins/data/common/search/expressions/utils/filters_adapter.ts
index 304150ad94813..d8ac85c7aa99e 100644
--- a/src/plugins/data/common/search/expressions/utils/filters_adapter.ts
+++ b/src/plugins/data/common/search/expressions/utils/filters_adapter.ts
@@ -7,7 +7,7 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { ExpressionValueFilter } from 'src/plugins/expressions/common';
+import { ExpressionValueFilter } from '@kbn/expressions-plugin/common';
 
 function getGroupFromFilter(filter: Filter) {
   const { meta } = filter;
diff --git a/src/plugins/data/common/search/expressions/utils/function_wrapper.ts b/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
index b6a87fa306f72..4d0a09a1680c0 100644
--- a/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
+++ b/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
@@ -7,7 +7,7 @@
  */
 
 import { mapValues } from 'lodash';
-import { AnyExpressionFunctionDefinition, ExecutionContext } from 'src/plugins/expressions/common';
+import { AnyExpressionFunctionDefinition, ExecutionContext } from '@kbn/expressions-plugin/common';
 
 /**
  * Takes a function spec and passes in default args,
diff --git a/src/plugins/data/common/search/poll_search.test.ts b/src/plugins/data/common/search/poll_search.test.ts
index 38c52f5d5bec4..0b9c1ce6beb33 100644
--- a/src/plugins/data/common/search/poll_search.test.ts
+++ b/src/plugins/data/common/search/poll_search.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { pollSearch } from './poll_search';
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 
 describe('pollSearch', () => {
   function getMockedSearch$(resolveOnI = 1, finishWithError = false) {
diff --git a/src/plugins/data/common/search/poll_search.ts b/src/plugins/data/common/search/poll_search.ts
index fa31f2cb208a6..8db68eda52758 100644
--- a/src/plugins/data/common/search/poll_search.ts
+++ b/src/plugins/data/common/search/poll_search.ts
@@ -8,12 +8,9 @@
 
 import { from, Observable, timer, defer, fromEvent, EMPTY } from 'rxjs';
 import { expand, map, switchMap, takeUntil, takeWhile, tap } from 'rxjs/operators';
-import type {
-  IAsyncSearchOptions,
-  IKibanaSearchResponse,
-} from '../../../../../src/plugins/data/common';
-import { isErrorResponse, isPartialResponse } from '../../../../../src/plugins/data/common';
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
+import type { IAsyncSearchOptions, IKibanaSearchResponse } from '..';
+import { isErrorResponse, isPartialResponse } from '..';
 
 export const pollSearch = <Response extends IKibanaSearchResponse>(
   search: () => Promise<Response>,
diff --git a/src/plugins/data/common/search/search_source/extract_references.ts b/src/plugins/data/common/search/search_source/extract_references.ts
index 954d336cb8a92..d72cb86c7f426 100644
--- a/src/plugins/data/common/search/search_source/extract_references.ts
+++ b/src/plugins/data/common/search/search_source/extract_references.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { Filter } from '@kbn/es-query';
 import { SerializedSearchSourceFields } from './types';
 
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../..';
 
 export const extractReferences = (
   state: SerializedSearchSourceFields
diff --git a/src/plugins/data/common/search/search_source/fetch/get_search_params.ts b/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
index ae01dcf4ea051..a2b673cd8ecfd 100644
--- a/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
+++ b/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
@@ -8,7 +8,7 @@
 
 import { UI_SETTINGS } from '../../../constants';
 import { GetConfigFn } from '../../../types';
-import { ISearchRequestParams } from '../../index';
+import { ISearchRequestParams } from '../..';
 import type { SearchRequest } from './types';
 
 const sessionId = Date.now();
diff --git a/src/plugins/data/common/search/search_source/fetch/request_error.ts b/src/plugins/data/common/search/search_source/fetch/request_error.ts
index 48e216fa05541..26bbc90e3ba07 100644
--- a/src/plugins/data/common/search/search_source/fetch/request_error.ts
+++ b/src/plugins/data/common/search/search_source/fetch/request_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KbnError } from '../../../../../kibana_utils/common';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 import { IKibanaSearchResponse } from '../../types';
 import { SearchError } from './types';
 
diff --git a/src/plugins/data/common/search/search_source/inject_references.test.ts b/src/plugins/data/common/search/search_source/inject_references.test.ts
index 1785e55acc792..11d098533f449 100644
--- a/src/plugins/data/common/search/search_source/inject_references.test.ts
+++ b/src/plugins/data/common/search/search_source/inject_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { SerializedSearchSourceFields } from './types';
 
 import { injectReferences } from './inject_references';
diff --git a/src/plugins/data/common/search/search_source/inject_references.ts b/src/plugins/data/common/search/search_source/inject_references.ts
index c4b39773c4401..69404f8fe16a0 100644
--- a/src/plugins/data/common/search/search_source/inject_references.ts
+++ b/src/plugins/data/common/search/search_source/inject_references.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { SerializedSearchSourceFields } from './types';
 
 export const injectReferences = (
diff --git a/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts b/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts
index 233eafc49e1a8..bd4b0c2066479 100644
--- a/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts
+++ b/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts
@@ -15,9 +15,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { RequestStatistics } from '@kbn/inspector-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { ISearchSource } from 'src/plugins/data/public';
-import type { RequestStatistics } from 'src/plugins/inspector/common';
+import type { ISearchSource } from '../../../../public';
 
 /** @public */
 export function getRequestInspectorStats(searchSource: ISearchSource) {
diff --git a/src/plugins/data/common/search/search_source/mocks.ts b/src/plugins/data/common/search/search_source/mocks.ts
index 77ba2a761fbf0..eb10855460236 100644
--- a/src/plugins/data/common/search/search_source/mocks.ts
+++ b/src/plugins/data/common/search/search_source/mocks.ts
@@ -8,7 +8,7 @@
 
 import { of } from 'rxjs';
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 import { SearchSource } from './search_source';
 import { ISearchStartSearchSource, ISearchSource, SearchSourceFields } from './types';
diff --git a/src/plugins/data/common/search/search_source/parse_json.ts b/src/plugins/data/common/search/search_source/parse_json.ts
index 6c7d08a4f2b50..31383a9ac4865 100644
--- a/src/plugins/data/common/search/search_source/parse_json.ts
+++ b/src/plugins/data/common/search/search_source/parse_json.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { InvalidJSONProperty } from '@kbn/kibana-utils-plugin/common';
 import { SerializedSearchSourceFields } from './types';
-import { InvalidJSONProperty } from '../../../../kibana_utils/common';
 
 export const parseSearchSourceJSON = (searchSourceJSON: string) => {
   // if we have a searchSource, set its values based on the searchSourceJson field
diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
index 4c8ac7b46d867..eb0c786bebb6c 100644
--- a/src/plugins/data/common/search/search_source/search_source.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -8,10 +8,10 @@
 
 import { lastValueFrom, of, throwError } from 'rxjs';
 import { IndexPattern } from '../..';
-import { SearchSource, SearchSourceDependencies, SortDirection } from './';
-import { AggConfigs, AggTypesRegistryStart } from '../../';
+import { SearchSource, SearchSourceDependencies, SortDirection } from '.';
+import { AggConfigs, AggTypesRegistryStart } from '../..';
 import { mockAggTypesRegistry } from '../aggs/test_helpers';
-import { RequestResponder } from 'src/plugins/inspector/common';
+import { RequestResponder } from '@kbn/inspector-plugin/common';
 import { switchMap } from 'rxjs/operators';
 import { Filter } from '@kbn/es-query';
 
diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
index 1115eff507154..87171a4b54498 100644
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@@ -73,8 +73,9 @@ import {
 import { defer, EMPTY, from, lastValueFrom, Observable } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { buildEsQuery, Filter } from '@kbn/es-query';
+import { fieldWildcardFilter } from '@kbn/kibana-utils-plugin/common';
+import { getHighlightRequest } from '@kbn/field-formats-plugin/common';
 import { normalizeSortRequest } from './normalize_sort_request';
-import { fieldWildcardFilter } from '../../../../kibana_utils/common';
 import {
   AggConfigSerialized,
   IIndexPattern,
@@ -105,8 +106,7 @@ import {
   isErrorResponse,
   isPartialResponse,
   UI_SETTINGS,
-} from '../../../common';
-import { getHighlightRequest } from '../../../../field_formats/common';
+} from '../..';
 import { extractReferences } from './extract_references';
 
 /** @internal */
diff --git a/src/plugins/data/common/search/search_source/search_source_service.test.ts b/src/plugins/data/common/search/search_source/search_source_service.test.ts
index a1b49fc433925..d6b06bb22288e 100644
--- a/src/plugins/data/common/search/search_source/search_source_service.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { IndexPatternsContract } from '../..';
-import { SearchSourceService, SearchSourceDependencies } from './';
+import { SearchSourceService, SearchSourceDependencies } from '.';
 
 describe('SearchSource service', () => {
   let dependencies: jest.Mocked<SearchSourceDependencies>;
diff --git a/src/plugins/data/common/search/search_source/search_source_service.ts b/src/plugins/data/common/search/search_source/search_source_service.ts
index 1a3c835bd9058..c03053c839f4d 100644
--- a/src/plugins/data/common/search/search_source/search_source_service.ts
+++ b/src/plugins/data/common/search/search_source/search_source_service.ts
@@ -7,6 +7,10 @@
  */
 
 import { mapValues } from 'lodash';
+import {
+  mergeMigrationFunctionMaps,
+  MigrateFunctionsObject,
+} from '@kbn/kibana-utils-plugin/common';
 import {
   createSearchSource,
   extractReferences,
@@ -14,12 +18,8 @@ import {
   SearchSource,
   SearchSourceDependencies,
   SerializedSearchSourceFields,
-} from './';
+} from '.';
 import { IndexPatternsContract } from '../..';
-import {
-  mergeMigrationFunctionMaps,
-  MigrateFunctionsObject,
-} from '../../../../kibana_utils/common';
 import { getAllMigrations as filtersGetAllMigrations } from '../../query/persistable_state';
 
 const getAllMigrations = (): MigrateFunctionsObject => {
diff --git a/src/plugins/data/common/search/search_source/types.ts b/src/plugins/data/common/search/search_source/types.ts
index a794ccb552c5f..9ac9c4a057ee9 100644
--- a/src/plugins/data/common/search/search_source/types.ts
+++ b/src/plugins/data/common/search/search_source/types.ts
@@ -7,14 +7,14 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AggConfigSerialized, IAggConfigs } from 'src/plugins/data/public';
 import { SerializableRecord } from '@kbn/utility-types';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AggConfigSerialized, IAggConfigs } from '../../../public';
 import { Query } from '../..';
 import { Filter } from '../../es_query';
 import { IndexPattern } from '../..';
 import type { SearchSource } from './search_source';
-import { PersistableStateService } from '../../../../kibana_utils/common';
 
 /**
  * search source interface
diff --git a/src/plugins/data/common/search/tabify/response_writer.ts b/src/plugins/data/common/search/tabify/response_writer.ts
index 6af0576b9ed4d..ea9acc97a5df0 100644
--- a/src/plugins/data/common/search/tabify/response_writer.ts
+++ b/src/plugins/data/common/search/tabify/response_writer.ts
@@ -7,11 +7,11 @@
  */
 
 import { isEmpty } from 'lodash';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { IAggConfigs } from '../aggs';
 import { tabifyGetColumns } from './get_columns';
 
 import type { TabbedResponseWriterOptions, TabbedAggColumn, TabbedAggRow } from './types';
-import { Datatable, DatatableColumn } from '../../../../expressions/common/expression_types/specs';
 
 interface BufferColumn {
   id: string;
diff --git a/src/plugins/data/common/search/tabify/tabify.ts b/src/plugins/data/common/search/tabify/tabify.ts
index a640e75bac3c4..c8e609212fe43 100644
--- a/src/plugins/data/common/search/tabify/tabify.ts
+++ b/src/plugins/data/common/search/tabify/tabify.ts
@@ -7,7 +7,7 @@
  */
 
 import { get } from 'lodash';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { TabbedAggResponseWriter } from './response_writer';
 import { TabifyBuckets } from './buckets';
 import type { TabbedResponseWriterOptions } from './types';
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.test.ts b/src/plugins/data/common/search/tabify/tabify_docs.test.ts
index dc2e09f4939c9..a514275f2d1cf 100644
--- a/src/plugins/data/common/search/tabify/tabify_docs.test.ts
+++ b/src/plugins/data/common/search/tabify/tabify_docs.test.ts
@@ -10,8 +10,8 @@ import { tabifyDocs, flattenHit } from './tabify_docs';
 import { IndexPattern, DataView } from '../..';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
-import { stubbedSavedObjectIndexPattern } from '../../../../data_views/common/data_view.stub';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
 
 class MockFieldFormatter {}
 
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.ts b/src/plugins/data/common/search/tabify/tabify_docs.ts
index 5db0770b2247f..97787ba74cf32 100644
--- a/src/plugins/data/common/search/tabify/tabify_docs.ts
+++ b/src/plugins/data/common/search/tabify/tabify_docs.ts
@@ -8,8 +8,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { isPlainObject } from 'lodash';
+import { Datatable, DatatableColumn, DatatableColumnType } from '@kbn/expressions-plugin/common';
 import { IndexPattern } from '../..';
-import { Datatable, DatatableColumn, DatatableColumnType } from '../../../../expressions/common';
 
 type ValidMetaFieldNames = keyof Pick<
   estypes.SearchHit,
diff --git a/src/plugins/data/common/search/tabify/utils.test.ts b/src/plugins/data/common/search/tabify/utils.test.ts
index ed29ef58ec0bf..8abaea0ce2618 100644
--- a/src/plugins/data/common/search/tabify/utils.test.ts
+++ b/src/plugins/data/common/search/tabify/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { checkColumnForPrecisionError } from './utils';
-import type { DatatableColumn } from '../../../../expressions';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 
 describe('tabify utils', () => {
   describe('checkDatatableForPrecisionError', () => {
diff --git a/src/plugins/data/common/search/tabify/utils.ts b/src/plugins/data/common/search/tabify/utils.ts
index 1a4f87e2fed73..aba7448f80284 100644
--- a/src/plugins/data/common/search/tabify/utils.ts
+++ b/src/plugins/data/common/search/tabify/utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DatatableColumn } from '../../../../expressions';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 
 /** @public **/
 export const checkColumnForPrecisionError = (column: DatatableColumn) =>
diff --git a/src/plugins/data/common/search/types.ts b/src/plugins/data/common/search/types.ts
index e9b6160c4a75a..bb6788fd1781b 100644
--- a/src/plugins/data/common/search/types.ts
+++ b/src/plugins/data/common/search/types.ts
@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { Observable } from 'rxjs';
+import type { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { IEsSearchRequest, IEsSearchResponse, IndexPattern } from '..';
-import type { RequestAdapter } from '../../../inspector/common';
 
 export type ISearchGeneric = <
   SearchStrategyRequest extends IKibanaSearchRequest = IEsSearchRequest,
diff --git a/src/plugins/data/common/stubs.ts b/src/plugins/data/common/stubs.ts
index ec53b20f6ff3d..034389d5419a1 100644
--- a/src/plugins/data/common/stubs.ts
+++ b/src/plugins/data/common/stubs.ts
@@ -6,6 +6,6 @@
  * Side Public License, v 1.
  */
 
-export * from '../../data_views/common/field.stub';
-export * from '../../data_views/common/data_view.stub';
+export * from '@kbn/data-views-plugin/common/field.stub';
+export * from '@kbn/data-views-plugin/common/data_view.stub';
 export * from './es_query/stubs';
diff --git a/src/plugins/data/config.ts b/src/plugins/data/config.ts
index 2512846554106..c419683de9868 100644
--- a/src/plugins/data/config.ts
+++ b/src/plugins/data/config.ts
@@ -9,28 +9,6 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
-  autocomplete: schema.object({
-    querySuggestions: schema.object({
-      enabled: schema.boolean({ defaultValue: true }),
-    }),
-    valueSuggestions: schema.object({
-      enabled: schema.boolean({ defaultValue: true }),
-      tiers: schema.arrayOf(
-        schema.oneOf([
-          schema.literal('data_content'),
-          schema.literal('data_hot'),
-          schema.literal('data_warm'),
-          schema.literal('data_cold'),
-          schema.literal('data_frozen'),
-        ]),
-        {
-          defaultValue: ['data_hot', 'data_warm', 'data_content', 'data_cold'],
-        }
-      ),
-      terminateAfter: schema.duration({ defaultValue: 100000 }),
-      timeout: schema.duration({ defaultValue: 1000 }),
-    }),
-  }),
   search: schema.object({
     aggs: schema.object({
       shardDelay: schema.object({
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index e3369c2d571a6..fa7453d4c5bda 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -4,7 +4,7 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["bfetch", "expressions", "uiActions", "share", "inspector", "fieldFormats", "dataViews"],
-  "serviceFolders": ["search", "query", "autocomplete", "ui"],
+  "serviceFolders": ["search", "query", "ui"],
   "optionalPlugins": ["usageCollection", "taskManager", "security"],
   "extraPublicDirs": ["common"],
   "requiredBundles": ["kibanaUtils", "kibanaReact", "inspector"],
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts
index 15b20669cd192..a217e580ad608 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts
@@ -10,11 +10,11 @@ import moment from 'moment';
 
 import { createFiltersFromRangeSelectAction } from './create_filters_from_range_select';
 
-import { IndexPatternsContract } from '../../../public';
-import { dataPluginMock } from '../../../public/mocks';
-import { setIndexPatterns, setSearchService } from '../../../public/services';
-import { FieldFormatsGetConfigFn } from '../../../../field_formats/common';
-import { DateFormat } from '../../../../field_formats/public/';
+import { IndexPatternsContract } from '../..';
+import { dataPluginMock } from '../../mocks';
+import { setIndexPatterns, setSearchService } from '../../services';
+import { FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
+import { DateFormat } from '@kbn/field-formats-plugin/public';
 import { RangeFilter } from '@kbn/es-query';
 
 describe('brushEvent', () => {
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts
index 2ae1805c8aa28..0b07194cd9bbc 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts
@@ -8,9 +8,9 @@
 
 import { last } from 'lodash';
 import moment from 'moment';
-import { Datatable } from 'src/plugins/expressions';
-import { esFilters, IFieldType, RangeFilterParams } from '../../../public';
-import { getIndexPatterns, getSearchService } from '../../../public/services';
+import { Datatable } from '@kbn/expressions-plugin';
+import { esFilters, IFieldType, RangeFilterParams } from '../..';
+import { getIndexPatterns, getSearchService } from '../../services';
 import { AggConfigSerialized } from '../../../common/search/aggs';
 
 interface RangeSelectDataContext {
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
index 5163f979d3ff5..1132edabb2b3f 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { IndexPatternsContract } from '../../../public';
-import { dataPluginMock } from '../../../public/mocks';
-import { setIndexPatterns, setSearchService } from '../../../public/services';
+import { IndexPatternsContract } from '../..';
+import { dataPluginMock } from '../../mocks';
+import { setIndexPatterns, setSearchService } from '../../services';
 import { createFiltersFromValueClickAction } from './create_filters_from_value_click';
-import { FieldFormatsGetConfigFn, BytesFormat } from '../../../../field_formats/common';
+import { FieldFormatsGetConfigFn, BytesFormat } from '@kbn/field-formats-plugin/common';
 import { RangeFilter } from '@kbn/es-query';
 
 const mockField = {
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
index 23ab718e512bd..1c7ffe5edf58f 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
@@ -7,9 +7,9 @@
  */
 
 import _ from 'lodash';
-import { Datatable } from '../../../../../plugins/expressions/public';
-import { esFilters, Filter } from '../../../public';
-import { getIndexPatterns, getSearchService } from '../../../public/services';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { esFilters, Filter } from '../..';
+import { getIndexPatterns, getSearchService } from '../../services';
 import { AggConfigSerialized } from '../../../common/search/aggs';
 
 interface ValueClickDataContext {
diff --git a/src/plugins/data/public/actions/select_range_action.ts b/src/plugins/data/public/actions/select_range_action.ts
index 5e04d20813446..d17a74ef13466 100644
--- a/src/plugins/data/public/actions/select_range_action.ts
+++ b/src/plugins/data/public/actions/select_range_action.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions/public';
-import { Action, createAction, UiActionsStart } from '../../../../plugins/ui_actions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { Action, createAction, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { APPLY_FILTER_TRIGGER } from '../triggers';
 import { createFiltersFromRangeSelectAction } from './filters/create_filters_from_range_select';
 
diff --git a/src/plugins/data/public/actions/value_click_action.ts b/src/plugins/data/public/actions/value_click_action.ts
index eb8e991cb8891..a6eb83badd61c 100644
--- a/src/plugins/data/public/actions/value_click_action.ts
+++ b/src/plugins/data/public/actions/value_click_action.ts
@@ -7,8 +7,8 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { Datatable } from 'src/plugins/expressions/public';
-import { Action, createAction, UiActionsStart } from '../../../../plugins/ui_actions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { Action, createAction, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { APPLY_FILTER_TRIGGER } from '../triggers';
 import { createFiltersFromValueClickAction } from './filters/create_filters_from_value_click';
 
diff --git a/src/plugins/data/public/data_views/index.ts b/src/plugins/data/public/data_views/index.ts
index 4fb2bbaf08503..21e6a2e9e645c 100644
--- a/src/plugins/data/public/data_views/index.ts
+++ b/src/plugins/data/public/data_views/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/public';
+export * from '@kbn/data-views-plugin/public';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 6fd357447fad8..9f1bf02ec2cd4 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/109904
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ConfigSchema } from '../config';
 
 export * from './deprecated';
@@ -95,20 +95,6 @@ export {
   DuplicateDataViewError,
 } from '../common';
 
-/*
- * Autocomplete query suggestions:
- */
-
-export type {
-  QuerySuggestion,
-  QuerySuggestionGetFn,
-  QuerySuggestionGetFnArgs,
-  QuerySuggestionBasic,
-  QuerySuggestionField,
-  AutocompleteStart,
-} from './autocomplete';
-
-export { QuerySuggestionTypes } from './autocomplete';
 /*
  * Search:
  */
@@ -273,8 +259,12 @@ export {
   TimeHistory,
   getQueryLog,
   mapAndFlattenFilters,
+  QueryService,
 } from './query';
 
+export { NowProvider } from './now_provider';
+export type { NowProviderInternalContract } from './now_provider';
+
 export type {
   QueryState,
   SavedQuery,
@@ -288,6 +278,7 @@ export type {
   PersistedLog,
   QueryStringContract,
   QuerySetup,
+  TimefilterSetup,
 } from './query';
 
 export type { AggsStart } from './search/aggs';
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 3c0c58c979db7..27e365ce0cb37 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -6,32 +6,19 @@
  * Side Public License, v 1.
  */
 
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { createDatatableUtilitiesMock } from '../common/mocks';
 import { DataPlugin, DataViewsContract } from '.';
-import { fieldFormatsServiceMock } from '../../field_formats/public/mocks';
 import { searchServiceMock } from './search/mocks';
 import { queryServiceMock } from './query/mocks';
-import { AutocompleteStart, AutocompleteSetup } from './autocomplete';
 import { createNowProviderMock } from './now_provider/mocks';
 
 export type Setup = jest.Mocked<ReturnType<DataPlugin['setup']>>;
 export type Start = jest.Mocked<ReturnType<DataPlugin['start']>>;
 
-const autocompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
-  getQuerySuggestions: jest.fn(),
-  getAutocompleteSettings: jest.fn(),
-};
-
-const autocompleteStartMock: jest.Mocked<AutocompleteStart> = {
-  getValueSuggestions: jest.fn(),
-  getQuerySuggestions: jest.fn(),
-  hasQuerySuggestions: jest.fn(),
-};
-
 const createSetupContract = (): Setup => {
   const querySetupMock = queryServiceMock.createSetupContract();
   return {
-    autocomplete: autocompleteSetupMock,
     search: searchServiceMock.createSetupContract(),
     query: querySetupMock,
   };
@@ -58,7 +45,6 @@ const createStartContract = (): Start => {
       createFiltersFromValueClickAction: jest.fn().mockResolvedValue(['yes']),
       createFiltersFromRangeSelectAction: jest.fn(),
     },
-    autocomplete: autocompleteStartMock,
     datatableUtilities: createDatatableUtilitiesMock(),
     search: searchServiceMock.createStartContract(),
     fieldFormats: fieldFormatsServiceMock.createStartContract(),
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 1402a01a3b057..175d05870b0c6 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -8,16 +8,19 @@
 
 import './index.scss';
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import {
+  Storage,
+  IStorageWrapper,
+  createStartServicesGetter,
+} from '@kbn/kibana-utils-plugin/public';
 import { ConfigSchema } from '../config';
-import { Storage, IStorageWrapper, createStartServicesGetter } from '../../kibana_utils/public';
 import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
   DataSetupDependencies,
   DataStartDependencies,
 } from './types';
-import { AutocompleteService } from './autocomplete';
 import { SearchService } from './search/search_service';
 import { QueryService } from './query';
 import {
@@ -48,7 +51,6 @@ export class DataPublicPlugin
       DataStartDependencies
     >
 {
-  private readonly autocomplete: AutocompleteService;
   private readonly searchService: SearchService;
   private readonly queryService: QueryService;
   private readonly storage: IStorageWrapper;
@@ -58,7 +60,6 @@ export class DataPublicPlugin
     this.searchService = new SearchService(initializerContext);
     this.queryService = new QueryService();
 
-    this.autocomplete = new AutocompleteService(initializerContext);
     this.storage = new Storage(window.localStorage);
     this.nowProvider = new NowProvider();
   }
@@ -109,10 +110,6 @@ export class DataPublicPlugin
     );
 
     return {
-      autocomplete: this.autocomplete.setup(core, {
-        timefilter: queryService.timefilter,
-        usageCollection,
-      }),
       search: searchService,
       query: queryService,
     };
@@ -157,7 +154,6 @@ export class DataPublicPlugin
         createFiltersFromValueClickAction,
         createFiltersFromRangeSelectAction,
       },
-      autocomplete: this.autocomplete.start(),
       datatableUtilities,
       fieldFormats,
       indexPatterns: dataViews,
@@ -171,7 +167,6 @@ export class DataPublicPlugin
   }
 
   public stop() {
-    this.autocomplete.clearProviders();
     this.queryService.stop();
     this.searchService.stop();
   }
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 0a995c9207770..9620d79295220 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -15,7 +15,7 @@ import { getFilter } from './test_helpers/get_stub_filter';
 import { getFiltersArray } from './test_helpers/get_filters_array';
 import { Filter, FilterStateStore, UI_SETTINGS } from '../../../common';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const setupMock = coreMock.createSetup();
 
 const uiSettingsMock = (pinnedByDefault: boolean) => (key: string) => {
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index bfedf444cf23e..c874a15b5efc6 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -9,9 +9,10 @@
 import _ from 'lodash';
 import { Subject } from 'rxjs';
 
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 import { isFilterPinned, onlyDisabledFiltersChanged, Filter } from '@kbn/es-query';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common/persistable_state';
 import { sortFilters } from './lib/sort_filters';
 import { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
 
@@ -22,7 +23,6 @@ import {
   COMPARE_ALL_OPTIONS,
   UI_SETTINGS,
 } from '../../../common';
-import { PersistableStateService } from '../../../../kibana_utils/common/persistable_state';
 import {
   getAllMigrations,
   inject,
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
index c90685de56c45..54a26a741c9b3 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern, phraseFilter } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern, phraseFilter } from '../../../../common/stubs';
 import { getDisplayValueFromFilter } from './get_display_value';
-import { FieldFormat } from '../../../../../field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 describe('getDisplayValueFromFilter', () => {
   beforeEach(() => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
index d38c1d6375d8c..71e367bbb1240 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { Filter } from '../../../../common';
-import { DataView, DataViewField } from '../../../../../data_views/public';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
 
 function getValueFormatter(indexPattern?: DataView, key?: string) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
index b3561a757ca8b..9cc81195d1946 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern, phraseFilter } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern, phraseFilter } from '../../../../common/stubs';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
 
 describe('getIndexPatternFromFilter', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
index d4951ebc6efc2..5ecd02b6f9d85 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { Filter } from '../../../../common';
-import { DataView } from '../../../../../data_views/public';
 
 export function getIndexPatternFromFilter(
   filter: Filter,
diff --git a/src/plugins/data/public/query/lib/add_to_query_log.ts b/src/plugins/data/public/query/lib/add_to_query_log.ts
index d45fabd649682..a74e127cd5562 100644
--- a/src/plugins/data/public/query/lib/add_to_query_log.ts
+++ b/src/plugins/data/public/query/lib/add_to_query_log.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { Query } from '../../../common';
 import { getQueryLog } from './get_query_log';
 
diff --git a/src/plugins/data/public/query/lib/get_query_log.ts b/src/plugins/data/public/query/lib/get_query_log.ts
index 51e074cc85e33..08aabecfb2529 100644
--- a/src/plugins/data/public/query/lib/get_query_log.ts
+++ b/src/plugins/data/public/query/lib/get_query_log.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { PersistedLog } from '../persisted_log';
 import { UI_SETTINGS } from '../../../common';
 
diff --git a/src/plugins/data/public/query/persisted_log/persisted_log.ts b/src/plugins/data/public/query/persisted_log/persisted_log.ts
index ab9c3d3fb631b..a4e73d19250e3 100644
--- a/src/plugins/data/public/query/persisted_log/persisted_log.ts
+++ b/src/plugins/data/public/query/persisted_log/persisted_log.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const defaultIsDuplicate = (oldItem: any, newItem: any) => {
   return _.isEqual(oldItem, newItem);
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
index dc6b9586b0b4b..1b634fda28996 100644
--- a/src/plugins/data/public/query/query_service.ts
+++ b/src/plugins/data/public/query/query_service.ts
@@ -7,8 +7,8 @@
  */
 
 import { share } from 'rxjs/operators';
-import { HttpStart, IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { HttpStart, IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { buildEsQuery } from '@kbn/es-query';
 import { FilterManager } from './filter_manager';
 import { createAddToQueryLog } from './lib';
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.test.ts b/src/plugins/data/public/query/query_string/query_string_manager.test.ts
index 32852b4fe7c32..7ba28a7e04cd9 100644
--- a/src/plugins/data/public/query/query_string/query_string_manager.test.ts
+++ b/src/plugins/data/public/query/query_string/query_string_manager.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { QueryStringManager } from './query_string_manager';
-import { Storage } from '../../../../kibana_utils/public/storage';
+import { Storage } from '@kbn/kibana-utils-plugin/public/storage';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { Query } from '../../../common/query';
 
 describe('QueryStringManager', () => {
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.ts b/src/plugins/data/public/query/query_string/query_string_manager.ts
index 0fdbb8965a5e5..fb9c2b1a734fa 100644
--- a/src/plugins/data/public/query/query_string/query_string_manager.ts
+++ b/src/plugins/data/public/query/query_string/query_string_manager.ts
@@ -9,8 +9,8 @@
 import { BehaviorSubject } from 'rxjs';
 import { skip } from 'rxjs/operators';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { CoreStart } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { CoreStart } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { KIBANA_USER_QUERY_LANGUAGE_KEY, Query, UI_SETTINGS } from '../../../common';
 
 export class QueryStringManager {
diff --git a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
index 7527ed60d41f9..e7ac546226326 100644
--- a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
+++ b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { createSavedQueryService } from './saved_query_service';
-import { httpServiceMock } from '../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import type { SavedQueryAttributes } from '../../../common';
 
 const http = httpServiceMock.createStartContract();
diff --git a/src/plugins/data/public/query/saved_query/saved_query_service.ts b/src/plugins/data/public/query/saved_query/saved_query_service.ts
index e73baba66c4f1..fd643a33dd103 100644
--- a/src/plugins/data/public/query/saved_query/saved_query_service.ts
+++ b/src/plugins/data/public/query/saved_query/saved_query_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { SavedQuery } from './types';
 import type { SavedQueryAttributes } from '../../../common';
 
diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
index 32e9ec7fb374a..d1d3ea5865c7e 100644
--- a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
+++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
@@ -10,8 +10,8 @@ import { Subscription } from 'rxjs';
 import { FilterManager } from '../filter_manager';
 import { getFilter } from '../filter_manager/test_helpers/get_stub_filter';
 import { Filter, FilterStateStore, UI_SETTINGS } from '../../../common';
-import { coreMock } from '../../../../../core/public/mocks';
-import { BaseStateContainer, createStateContainer, Storage } from '../../../../kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { BaseStateContainer, createStateContainer, Storage } from '@kbn/kibana-utils-plugin/public';
 import { QueryService, QueryStart } from '../query_service';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { connectToQueryState } from './connect_to_query_state';
diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
index a38d9f2af50ea..b9bb05841f161 100644
--- a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
+++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
@@ -9,7 +9,7 @@
 import { Subscription } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import _ from 'lodash';
-import { BaseStateContainer } from '../../../../kibana_utils/public';
+import { BaseStateContainer } from '@kbn/kibana-utils-plugin/public';
 import { QuerySetup, QueryStart } from '../query_service';
 import { QueryState, QueryStateChange } from './types';
 import { FilterStateStore, COMPARE_ALL_OPTIONS, compareFilters } from '../../../common';
diff --git a/src/plugins/data/public/query/state_sync/create_global_query_observable.ts b/src/plugins/data/public/query/state_sync/create_global_query_observable.ts
index 3577478154c31..2e054229a55da 100644
--- a/src/plugins/data/public/query/state_sync/create_global_query_observable.ts
+++ b/src/plugins/data/public/query/state_sync/create_global_query_observable.ts
@@ -9,10 +9,10 @@
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 import { isFilterPinned } from '@kbn/es-query';
+import { createStateContainer } from '@kbn/kibana-utils-plugin/public';
 import type { TimefilterSetup } from '../timefilter';
 import { FilterManager } from '../filter_manager';
-import { QueryState, QueryStateChange } from './index';
-import { createStateContainer } from '../../../../kibana_utils/public';
+import { QueryState, QueryStateChange } from '.';
 import { compareFilters, COMPARE_ALL_OPTIONS } from '../../../common';
 import type { QueryStringContract } from '../query_string';
 
diff --git a/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts b/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
index 2442ca68f997d..edeaa7c772575 100644
--- a/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
+++ b/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
@@ -11,12 +11,12 @@ import { createBrowserHistory, History } from 'history';
 import { FilterManager } from '../filter_manager';
 import { getFilter } from '../filter_manager/test_helpers/get_stub_filter';
 import { Filter, FilterStateStore, UI_SETTINGS } from '../../../common';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import {
   createKbnUrlStateStorage,
   IKbnUrlStateStorage,
   Storage,
-} from '../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { QueryService, QueryStart } from '../query_service';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { TimefilterContract } from '../timefilter';
diff --git a/src/plugins/data/public/query/state_sync/sync_state_with_url.ts b/src/plugins/data/public/query/state_sync/sync_state_with_url.ts
index 2f068ccdfab4f..fd52ca5ffc979 100644
--- a/src/plugins/data/public/query/state_sync/sync_state_with_url.ts
+++ b/src/plugins/data/public/query/state_sync/sync_state_with_url.ts
@@ -10,7 +10,7 @@ import {
   createStateContainer,
   IKbnUrlStateStorage,
   syncState,
-} from '../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { QuerySetup, QueryStart } from '../query_service';
 import { connectToQueryState } from './connect_to_query_state';
 import { QueryState } from './types';
diff --git a/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
index 94e12f1f6f7ca..9b53f04bd2066 100644
--- a/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
+++ b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 import { keys } from 'lodash';
 import { RangeFilter } from '@kbn/es-query';
-import { TimefilterContract } from '../../timefilter';
+import { TimefilterContract } from '..';
 import { TimeRange } from '../../../../common';
 
 export function convertRangeFilterToTimeRange(filter: RangeFilter) {
diff --git a/src/plugins/data/public/query/timefilter/time_history.ts b/src/plugins/data/public/query/timefilter/time_history.ts
index f83e5e685b581..548973ab815d2 100644
--- a/src/plugins/data/public/query/timefilter/time_history.ts
+++ b/src/plugins/data/public/query/timefilter/time_history.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { PersistedLog } from '../persisted_log';
 import { TimeRange } from '../../../common';
 
diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.ts b/src/plugins/data/public/query/timefilter/timefilter_service.ts
index dcc78b51eac58..a8c9b7a759e9e 100644
--- a/src/plugins/data/public/query/timefilter/timefilter_service.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { TimeHistory, Timefilter, TimeHistoryContract, TimefilterContract } from './index';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { TimeHistory, Timefilter, TimeHistoryContract, TimefilterContract } from '.';
 import { UI_SETTINGS } from '../../../common';
 import { NowProviderInternalContract } from '../../now_provider';
 
diff --git a/src/plugins/data/public/search/aggs/aggs_service.test.ts b/src/plugins/data/public/search/aggs/aggs_service.test.ts
index 83328e196fa0a..4309c68d639d8 100644
--- a/src/plugins/data/public/search/aggs/aggs_service.test.ts
+++ b/src/plugins/data/public/search/aggs/aggs_service.test.ts
@@ -8,10 +8,10 @@
 
 import { BehaviorSubject, Subscription } from 'rxjs';
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { expressionsPluginMock } from '../../../../../plugins/expressions/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { BucketAggType, getAggTypes, MetricAggType } from '../../../common';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { dataPluginMock } from '../../mocks';
 
 import {
diff --git a/src/plugins/data/public/search/aggs/aggs_service.ts b/src/plugins/data/public/search/aggs/aggs_service.ts
index 99930a95831ea..6dc6e3f9c5874 100644
--- a/src/plugins/data/public/search/aggs/aggs_service.ts
+++ b/src/plugins/data/public/search/aggs/aggs_service.ts
@@ -8,9 +8,9 @@
 
 import { Subscription } from 'rxjs';
 
-import { IUiSettingsClient } from 'src/core/public';
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { calculateBounds, TimeRange } from '../../../common';
 import {
   aggsRequiredUiSettings,
diff --git a/src/plugins/data/public/search/collectors/create_usage_collector.test.ts b/src/plugins/data/public/search/collectors/create_usage_collector.test.ts
index 145bb191fde11..031275e76f3bd 100644
--- a/src/plugins/data/public/search/collectors/create_usage_collector.test.ts
+++ b/src/plugins/data/public/search/collectors/create_usage_collector.test.ts
@@ -7,9 +7,9 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart } from '../../../../../core/public';
-import { coreMock } from '../../../../../core/public/mocks';
-import { usageCollectionPluginMock, Setup } from '../../../../usage_collection/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { usageCollectionPluginMock, Setup } from '@kbn/usage-collection-plugin/public/mocks';
 import { createUsageCollector } from './create_usage_collector';
 import { SEARCH_EVENT_TYPE, SearchUsageCollector } from './types';
 import { METRIC_TYPE } from '@kbn/analytics';
diff --git a/src/plugins/data/public/search/collectors/create_usage_collector.ts b/src/plugins/data/public/search/collectors/create_usage_collector.ts
index d4f64fcfa962f..266e3e1e9a1a6 100644
--- a/src/plugins/data/public/search/collectors/create_usage_collector.ts
+++ b/src/plugins/data/public/search/collectors/create_usage_collector.ts
@@ -9,8 +9,8 @@
 import { first } from 'rxjs/operators';
 import { METRIC_TYPE } from '@kbn/analytics';
 import type { UiCounterMetricType } from '@kbn/analytics';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SEARCH_EVENT_TYPE, SearchUsageCollector } from './types';
 
 export const createUsageCollector = (
diff --git a/src/plugins/data/public/search/errors/es_error.tsx b/src/plugins/data/public/search/errors/es_error.tsx
index 71c11af48830f..a8d73baaf4d71 100644
--- a/src/plugins/data/public/search/errors/es_error.tsx
+++ b/src/plugins/data/public/search/errors/es_error.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiCodeBlock, EuiSpacer } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { KbnError } from '../../../../kibana_utils/common';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 import { IEsError } from './types';
 import { getRootCause } from './utils';
 
diff --git a/src/plugins/data/public/search/errors/painless_error.test.tsx b/src/plugins/data/public/search/errors/painless_error.test.tsx
index f07f078ea03a3..c4a540f7d21ab 100644
--- a/src/plugins/data/public/search/errors/painless_error.test.tsx
+++ b/src/plugins/data/public/search/errors/painless_error.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
diff --git a/src/plugins/data/public/search/errors/painless_error.tsx b/src/plugins/data/public/search/errors/painless_error.tsx
index 674197d74d6be..0eac061bde364 100644
--- a/src/plugins/data/public/search/errors/painless_error.tsx
+++ b/src/plugins/data/public/search/errors/painless_error.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiSpacer, EuiText, EuiCodeBlock } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { IEsError, isEsError } from './types';
 import { EsError } from './es_error';
 import { getRootCause } from './utils';
diff --git a/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx b/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx
index 868245e66bf4d..e5f96a79ac8db 100644
--- a/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx
+++ b/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx
@@ -7,7 +7,7 @@
  */
 
 import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/src/plugins/data/public/search/errors/timeout_error.test.tsx b/src/plugins/data/public/search/errors/timeout_error.test.tsx
index f1b83ae959a9e..aa370f395df5e 100644
--- a/src/plugins/data/public/search/errors/timeout_error.test.tsx
+++ b/src/plugins/data/public/search/errors/timeout_error.test.tsx
@@ -8,11 +8,11 @@
 
 import { SearchTimeoutError, TimeoutErrorMode } from './timeout_error';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
-import { AbortError } from '../../../../kibana_utils/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/public';
 
 describe('SearchTimeoutError', () => {
   beforeEach(() => {
diff --git a/src/plugins/data/public/search/errors/timeout_error.tsx b/src/plugins/data/public/search/errors/timeout_error.tsx
index 29b921c9cc12b..878700acdf77a 100644
--- a/src/plugins/data/public/search/errors/timeout_error.tsx
+++ b/src/plugins/data/public/search/errors/timeout_error.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
-import { KbnError } from '../../../../kibana_utils/common';
+import { ApplicationStart } from '@kbn/core/public';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 
 export enum TimeoutErrorMode {
   CONTACT,
diff --git a/src/plugins/data/public/search/errors/types.ts b/src/plugins/data/public/search/errors/types.ts
index 8f18ab06fcd94..560ecbe31a3ff 100644
--- a/src/plugins/data/public/search/errors/types.ts
+++ b/src/plugins/data/public/search/errors/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { KibanaServerError } from '../../../../kibana_utils/common';
+import { KibanaServerError } from '@kbn/kibana-utils-plugin/common';
 
 export interface FailedShard {
   shard: number;
diff --git a/src/plugins/data/public/search/errors/utils.ts b/src/plugins/data/public/search/errors/utils.ts
index 4373939878d68..f90a1fb461804 100644
--- a/src/plugins/data/public/search/errors/utils.ts
+++ b/src/plugins/data/public/search/errors/utils.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { ErrorCause } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { KibanaServerError } from '@kbn/kibana-utils-plugin/common';
 import type { FailedShard, Reason } from './types';
-import { KibanaServerError } from '../../../../kibana_utils/common';
 
 export function getFailedShards(err: KibanaServerError<any>): FailedShard | undefined {
   const errorInfo = err.attributes;
diff --git a/src/plugins/data/public/search/es_search/get_es_preference.test.ts b/src/plugins/data/public/search/es_search/get_es_preference.test.ts
index 9127b8bf75272..881e7b6448be4 100644
--- a/src/plugins/data/public/search/es_search/get_es_preference.test.ts
+++ b/src/plugins/data/public/search/es_search/get_es_preference.test.ts
@@ -8,8 +8,8 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import { getEsPreference } from './get_es_preference';
-import { CoreStart } from '../../../../../core/public';
-import { coreMock } from '../../../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { UI_SETTINGS } from '../../../common';
 
 describe('Get ES preference', () => {
diff --git a/src/plugins/data/public/search/es_search/get_es_preference.ts b/src/plugins/data/public/search/es_search/get_es_preference.ts
index 14e1a7779268c..9cb4fb5ab577c 100644
--- a/src/plugins/data/public/search/es_search/get_es_preference.ts
+++ b/src/plugins/data/public/search/es_search/get_es_preference.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { UI_SETTINGS } from '../../../common';
 
 const defaultSessionId = `${Date.now()}`;
diff --git a/src/plugins/data/public/search/expressions/eql.test.ts b/src/plugins/data/public/search/expressions/eql.test.ts
index 71655a551253c..3be05be44b039 100644
--- a/src/plugins/data/public/search/expressions/eql.test.ts
+++ b/src/plugins/data/public/search/expressions/eql.test.ts
@@ -9,7 +9,7 @@
 import { getEql } from './eql';
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { EqlExpressionFunctionDefinition } from '../../../common/search/expressions';
-import { StartServicesAccessor } from 'kibana/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { of } from 'rxjs';
 
diff --git a/src/plugins/data/public/search/expressions/eql.ts b/src/plugins/data/public/search/expressions/eql.ts
index 03444dd22adc2..676d49867f3b1 100644
--- a/src/plugins/data/public/search/expressions/eql.ts
+++ b/src/plugins/data/public/search/expressions/eql.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { getEqlFn } from '../../../common/search/expressions/eql';
 import { UiSettingsCommon } from '../../../common';
diff --git a/src/plugins/data/public/search/expressions/esaggs.test.ts b/src/plugins/data/public/search/expressions/esaggs.test.ts
index 8acbb8006e954..a837c43d1cf1e 100644
--- a/src/plugins/data/public/search/expressions/esaggs.test.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.test.ts
@@ -9,7 +9,7 @@
 import { omit } from 'lodash';
 import { of as mockOf } from 'rxjs';
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import type { ExecutionContext } from 'src/plugins/expressions/public';
+import type { ExecutionContext } from '@kbn/expressions-plugin/public';
 import type { IndexPatternsContract } from '../../../common';
 import type {
   ISearchStartSearchSource,
diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
index b691dc2237c22..ffdd1663a87b1 100644
--- a/src/plugins/data/public/search/expressions/esaggs.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -9,7 +9,7 @@
 import { get } from 'lodash';
 import { defer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import {
   EsaggsExpressionFunctionDefinition,
   EsaggsStartDependencies,
diff --git a/src/plugins/data/public/search/expressions/esdsl.test.ts b/src/plugins/data/public/search/expressions/esdsl.test.ts
index f39b33c252ded..7ac0d3d5fb133 100644
--- a/src/plugins/data/public/search/expressions/esdsl.test.ts
+++ b/src/plugins/data/public/search/expressions/esdsl.test.ts
@@ -9,7 +9,7 @@
 import { getEsdsl } from './esdsl';
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { EsdslExpressionFunctionDefinition } from '../../../common/search/expressions';
-import { StartServicesAccessor } from 'kibana/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { of } from 'rxjs';
 
diff --git a/src/plugins/data/public/search/expressions/esdsl.ts b/src/plugins/data/public/search/expressions/esdsl.ts
index 8d65f6e4ee688..f4f17be601fb1 100644
--- a/src/plugins/data/public/search/expressions/esdsl.ts
+++ b/src/plugins/data/public/search/expressions/esdsl.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { getEsdslFn } from '../../../common/search/expressions/esdsl';
 import { UiSettingsCommon } from '../../../common';
diff --git a/src/plugins/data/public/search/expressions/kibana_context.ts b/src/plugins/data/public/search/expressions/kibana_context.ts
index a2d97dbc6b5dd..8fad3c8e06c57 100644
--- a/src/plugins/data/public/search/expressions/kibana_context.ts
+++ b/src/plugins/data/public/search/expressions/kibana_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { getKibanaContextFn } from '../../../common/search/expressions';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { SavedObjectsClientCommon } from '../../../common';
diff --git a/src/plugins/data/public/search/fetch/handle_response.test.ts b/src/plugins/data/public/search/fetch/handle_response.test.ts
index f79ab8e9c16fe..cd71f572c27df 100644
--- a/src/plugins/data/public/search/fetch/handle_response.test.ts
+++ b/src/plugins/data/public/search/fetch/handle_response.test.ts
@@ -10,10 +10,10 @@ 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';
+import { notificationServiceMock } from '@kbn/core/public/notifications/notifications_service.mock';
 import { setNotifications } from '../../services';
-import { IKibanaSearchResponse } from 'src/plugins/data/common';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { IKibanaSearchResponse } from '../../../common';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('@kbn/i18n', () => {
   return {
diff --git a/src/plugins/data/public/search/fetch/handle_response.tsx b/src/plugins/data/public/search/fetch/handle_response.tsx
index 6199e52f45955..d37944b5d85cd 100644
--- a/src/plugins/data/public/search/fetch/handle_response.tsx
+++ b/src/plugins/data/public/search/fetch/handle_response.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
-import { IKibanaSearchResponse } from 'src/plugins/data/common';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { IKibanaSearchResponse } from '../../../common';
 import { ShardFailureOpenModalButton } from '../../shard_failure_modal';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { getNotifications } from '../../services';
 import type { SearchRequest } from '..';
 
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
index f1e2e903cadde..9287005db38a0 100644
--- a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
@@ -7,15 +7,15 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart } from '../../../../../core/public';
-import { coreMock, themeServiceMock } from '../../../../../core/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { IEsSearchRequest } from '../../../common/search';
 import { SearchInterceptor } from './search_interceptor';
-import { AbortError } from '../../../../kibana_utils/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/public';
 import { SearchTimeoutError, PainlessError, TimeoutErrorMode, EsError } from '../errors';
-import { ISessionService, SearchSessionState } from '../';
-import { bfetchPluginMock } from '../../../../bfetch/public/mocks';
-import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
+import { ISessionService, SearchSessionState } from '..';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/public/mocks';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
 
 import * as searchPhaseException from '../../../common/search/test_data/search_phase_execution_exception.json';
 import * as resourceNotFoundException from '../../../common/search/test_data/resource_not_found_exception.json';
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
index cebcf19317a8c..07989b101a556 100644
--- a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
@@ -31,9 +31,11 @@ import {
   ThemeServiceSetup,
   ToastsSetup,
   ExecutionContextSetup,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { BatchedFunc, BfetchPublicSetup, DISABLE_BFETCH } from '../../../../bfetch/public';
+import { BatchedFunc, BfetchPublicSetup, DISABLE_BFETCH } from '@kbn/bfetch-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { AbortError, KibanaServerError } from '@kbn/kibana-utils-plugin/public';
 import {
   ENHANCED_ES_SEARCH_STRATEGY,
   IAsyncSearchOptions,
@@ -55,8 +57,6 @@ import {
   TimeoutErrorMode,
   SearchSessionIncompleteWarning,
 } from '../errors';
-import { toMountPoint } from '../../../../kibana_react/public';
-import { AbortError, KibanaServerError } from '../../../../kibana_utils/public';
 import { ISessionService, SearchSessionState } from '../session';
 import { SearchResponseCache } from './search_response_cache';
 import { createRequestHash } from './utils';
diff --git a/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts b/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
index df277c289f973..d97d31112f699 100644
--- a/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
@@ -8,7 +8,7 @@
 
 import { interval, Observable, of, throwError } from 'rxjs';
 import { shareReplay, switchMap, take } from 'rxjs/operators';
-import { IKibanaSearchResponse } from 'src/plugins/data/public';
+import { IKibanaSearchResponse } from '../..';
 import { SearchAbortController } from './search_abort_controller';
 import { SearchResponseCache } from './search_response_cache';
 
diff --git a/src/plugins/data/public/search/search_interceptor/utils.ts b/src/plugins/data/public/search/search_interceptor/utils.ts
index 02c7059a8fdf5..a1818a50d0525 100644
--- a/src/plugins/data/public/search/search_interceptor/utils.ts
+++ b/src/plugins/data/public/search/search_interceptor/utils.ts
@@ -7,7 +7,7 @@
  */
 
 import stringify from 'json-stable-stringify';
-import { Sha256 } from '../../../../../core/public/utils';
+import { Sha256 } from '@kbn/core/public/utils';
 
 export async function createRequestHash(keys: Record<string, any>) {
   return new Sha256().update(stringify(keys), 'utf8').digest('hex');
diff --git a/src/plugins/data/public/search/search_service.test.ts b/src/plugins/data/public/search/search_service.test.ts
index 5bf4c21d48578..8c1fba48c7b4b 100644
--- a/src/plugins/data/public/search/search_service.test.ts
+++ b/src/plugins/data/public/search/search_service.test.ts
@@ -7,11 +7,11 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { coreMock } from '../../../../core/public/mocks';
-import { CoreSetup, CoreStart } from '../../../../core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 
 import { SearchService, SearchServiceSetupDependencies } from './search_service';
-import { bfetchPluginMock } from '../../../bfetch/public/mocks';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/public/mocks';
 
 describe('Search service', () => {
   let searchService: SearchService;
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index b21ad44c7bd6d..52271426d28e1 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -12,9 +12,11 @@ import {
   CoreStart,
   PluginInitializerContext,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { BehaviorSubject } from 'rxjs';
-import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import type { ISearchSetup, ISearchStart } from './types';
 
 import { handleResponse } from './fetch';
@@ -50,9 +52,7 @@ import { AggsService, AggsStartDependencies } from './aggs';
 import { IKibanaSearchResponse, IndexPatternsContract, SearchRequest } from '..';
 import { ISearchInterceptor, SearchInterceptor } from './search_interceptor';
 import { SearchUsageCollector, createUsageCollector } from './collectors';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 import { getEsaggs, getEsdsl, getEql } from './expressions';
-import { ExpressionsSetup } from '../../../expressions/public';
 import { ISessionsClient, ISessionService, SessionsClient, SessionService } from './session';
 import { ConfigSchema } from '../../config';
 import {
diff --git a/src/plugins/data/public/search/session/search_session_state.ts b/src/plugins/data/public/search/session/search_session_state.ts
index c714a3e387641..329d40da89b60 100644
--- a/src/plugins/data/public/search/session/search_session_state.ts
+++ b/src/plugins/data/public/search/session/search_session_state.ts
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import deepEqual from 'fast-deep-equal';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
-import { createStateContainer, StateContainer } from '../../../../kibana_utils/public';
+import { createStateContainer, StateContainer } from '@kbn/kibana-utils-plugin/public';
 import type { SearchSessionSavedObject } from './sessions_client';
 
 /**
diff --git a/src/plugins/data/public/search/session/session_helpers.test.ts b/src/plugins/data/public/search/session/session_helpers.test.ts
index fdebe4bce7586..c06185d438401 100644
--- a/src/plugins/data/public/search/session/session_helpers.test.ts
+++ b/src/plugins/data/public/search/session/session_helpers.test.ts
@@ -12,7 +12,7 @@ import { BehaviorSubject } from 'rxjs';
 import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { SearchSessionState } from './search_session_state';
 import { NowProviderInternalContract } from '../../now_provider';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createNowProviderMock } from '../../now_provider/mocks';
 import { SEARCH_SESSIONS_MANAGEMENT_ID } from './constants';
 import { getSessionsClientMock } from './mocks';
diff --git a/src/plugins/data/public/search/session/session_service.test.ts b/src/plugins/data/public/search/session/session_service.test.ts
index ad131fbea60b2..d377cca07a738 100644
--- a/src/plugins/data/public/search/session/session_service.test.ts
+++ b/src/plugins/data/public/search/session/session_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SessionService, ISessionService } from './session_service';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { take, toArray } from 'rxjs/operators';
 import { getSessionsClientMock } from './mocks';
 import { BehaviorSubject } from 'rxjs';
@@ -17,7 +17,7 @@ import { NowProviderInternalContract } from '../../now_provider';
 import { SEARCH_SESSIONS_MANAGEMENT_ID } from './constants';
 import type { SearchSessionSavedObject, ISessionsClient } from './sessions_client';
 import { SearchSessionStatus } from '../../../common';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 const mockSavedObject: SearchSessionSavedObject = {
   id: 'd7170a35-7e2c-48d6-8dec-9a056721b489',
diff --git a/src/plugins/data/public/search/session/session_service.ts b/src/plugins/data/public/search/session/session_service.ts
index 9a02e336ecf86..4b5d4da33132d 100644
--- a/src/plugins/data/public/search/session/session_service.ts
+++ b/src/plugins/data/public/search/session/session_service.ts
@@ -13,7 +13,7 @@ import {
   PluginInitializerContext,
   StartServicesAccessor,
   ToastsStart as ToastService,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ConfigSchema } from '../../../config';
 import { createSessionStateContainer } from './search_session_state';
diff --git a/src/plugins/data/public/search/session/sessions_client.ts b/src/plugins/data/public/search/session/sessions_client.ts
index c9606501d0a19..71e8d9dafb78d 100644
--- a/src/plugins/data/public/search/session/sessions_client.ts
+++ b/src/plugins/data/public/search/session/sessions_client.ts
@@ -7,13 +7,13 @@
  */
 
 import { PublicContract } from '@kbn/utility-types';
-import { HttpSetup, SavedObjectsFindOptions } from 'kibana/public';
+import { HttpSetup, SavedObjectsFindOptions } from '@kbn/core/public';
 import type {
   SavedObject,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type { SearchSessionSavedObjectAttributes } from '../../../common';
 export type SearchSessionSavedObject = SavedObject<SearchSessionSavedObjectAttributes>;
 export type ISessionsClient = PublicContract<SessionsClient>;
diff --git a/src/plugins/data/public/search/types.ts b/src/plugins/data/public/search/types.ts
index 6a06a93131b89..fa23b8f593688 100644
--- a/src/plugins/data/public/search/types.ts
+++ b/src/plugins/data/public/search/types.ts
@@ -7,12 +7,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { PackageInfo } from 'kibana/server';
+import { PackageInfo } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SearchUsageCollector } from './collectors';
 import { AggsSetup, AggsSetupDependencies, AggsStartDependencies, AggsStart } from './aggs';
 import { ISearchGeneric, ISearchStartSearchSource } from '../../common/search';
 import { IndexPatternsContract } from '../../common';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 import { ISessionsClient, ISessionService } from './session';
 
 export type { ISearchStartSearchSource, SearchUsageCollector };
diff --git a/src/plugins/data/public/services.ts b/src/plugins/data/public/services.ts
index 5c52a1e695359..cb294964a4b4f 100644
--- a/src/plugins/data/public/services.ts
+++ b/src/plugins/data/public/services.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NotificationsStart, CoreStart, ThemeServiceStart } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { NotificationsStart, CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { IndexPatternsContract } from './data_views';
 import { DataPublicPluginStart } from './types';
 
diff --git a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
index 757d318e1d1b7..948905cf1ce90 100644
--- a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
@@ -7,7 +7,7 @@
  */
 
 import { setOverlays } from '../services';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 export const openModal = jest.fn();
 
diff --git a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
index 0cb71f9097f9e..6893ae0126e84 100644
--- a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
@@ -8,7 +8,7 @@
 
 import { openModal } from './shard_failure_open_modal_button.test.mocks';
 import React from 'react';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import ShardFailureOpenModalButton from './shard_failure_open_modal_button';
 import { shardFailureRequest } from './__mocks__/shard_failure_request';
diff --git a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
index a20fe3da06e5a..63547b1391e5b 100644
--- a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiTextAlign } from '@elastic/eui';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { getOverlays } from '../services';
-import { ThemeServiceStart } from '../../../../core/public';
-import { toMountPoint } from '../../../kibana_react/public';
 import { ShardFailureModal } from './shard_failure_modal';
 import { ShardFailureRequest } from './shard_failure_types';
 
diff --git a/src/plugins/data/public/test_utils.ts b/src/plugins/data/public/test_utils.ts
index 2d8009686a4da..c621d7d5ef94b 100644
--- a/src/plugins/data/public/test_utils.ts
+++ b/src/plugins/data/public/test_utils.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { getFieldFormatsRegistry } from '../../field_formats/public/mocks';
+export { getFieldFormatsRegistry } from '@kbn/field-formats-plugin/public/mocks';
diff --git a/src/plugins/data/public/triggers/apply_filter_trigger.ts b/src/plugins/data/public/triggers/apply_filter_trigger.ts
index 69fd76f45d614..f216cb805ab4e 100644
--- a/src/plugins/data/public/triggers/apply_filter_trigger.ts
+++ b/src/plugins/data/public/triggers/apply_filter_trigger.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Trigger } from '../../../ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const APPLY_FILTER_TRIGGER = 'FILTER_TRIGGER';
 export const applyFilterTrigger: Trigger = {
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 55b2637e874e0..b596e02e7f2ac 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -6,21 +6,20 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'src/core/public';
-import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
-import { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { CoreStart } from '@kbn/core/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { UsageCollectionSetup, UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import { Setup as InspectorSetup } from '@kbn/inspector-plugin/public';
 import { DatatableUtilitiesService } from '../common';
-import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
 import { createFiltersFromRangeSelectAction, createFiltersFromValueClickAction } from './actions';
 import type { ISearchSetup, ISearchStart } from './search';
 import { QuerySetup, QueryStart } from './query';
 import { DataViewsContract } from './data_views';
-import { UsageCollectionSetup, UsageCollectionStart } from '../../usage_collection/public';
-import { Setup as InspectorSetup } from '../../inspector/public';
 import { NowProviderPublicContract } from './now_provider';
 
 export interface DataSetupDependencies {
@@ -42,7 +41,6 @@ export interface DataStartDependencies {
  * Data plugin public Setup contract
  */
 export interface DataPublicPluginSetup {
-  autocomplete: AutocompleteSetup;
   search: ISearchSetup;
   query: QuerySetup;
 }
@@ -64,11 +62,6 @@ export interface DataPublicPluginStart {
    * {@link DataPublicPluginStartActions}
    */
   actions: DataPublicPluginStartActions;
-  /**
-   * autocomplete service
-   * {@link AutocompleteStart}
-   */
-  autocomplete: AutocompleteStart;
   /**
    * data views service
    * {@link DataViewsContract}
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
index 4621937664479..307c074ce5c6f 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
@@ -20,11 +20,11 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
+import { IUiSettingsClient } from '@kbn/core/public';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { DataViewRow, DataViewColumn } from '../types';
-import { IUiSettingsClient } from '../../../../../../core/public';
-import { Datatable, DatatableColumn } from '../../../../../expressions/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { UiActionsStart } from '../../../../../ui_actions/public';
 
 interface DataTableFormatState {
   columns: DataViewColumn[];
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx
index 0a55582ebff05..faea07d402f18 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx
@@ -17,7 +17,7 @@ import {
   EuiFlexItem,
   EuiPopover,
 } from '@elastic/eui';
-import { Datatable } from '../../../../../expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 
 interface TableSelectorState {
   isPopoverOpen: boolean;
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx
index eb7f51aad8223..00817e3516720 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx
@@ -7,11 +7,11 @@
  */
 
 import React, { Suspense } from 'react';
-import { getTableViewDescription } from '../index';
+import { getTableViewDescription } from '..';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { TablesAdapter } from '../../../../../expressions/common';
+import { TablesAdapter } from '@kbn/expressions-plugin/common';
 
-jest.mock('../../../../../share/public', () => ({
+jest.mock('@kbn/share-plugin/public', () => ({
   downloadMultipleAs: jest.fn(),
 }));
 jest.mock('../../../../common', () => ({
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx
index f310952a5608d..70c534b4fbbc8 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx
@@ -11,12 +11,12 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 
+import { IUiSettingsClient } from '@kbn/core/public';
+import { InspectorViewProps, Adapters } from '@kbn/inspector-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { TablesAdapter, Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
 import { DataTableFormat } from './data_table';
-import { IUiSettingsClient } from '../../../../../../core/public';
-import { InspectorViewProps, Adapters } from '../../../../../inspector/public';
-import { UiActionsStart } from '../../../../../ui_actions/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { TablesAdapter, Datatable, DatatableColumn } from '../../../../../expressions/public';
 import { TableSelector } from './data_table_selector';
 import { DataDownloadOptions } from './download_options';
 
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx
index 1e0ebe3e3d907..ccb2ec11303bf 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx
@@ -7,10 +7,10 @@
  */
 
 import React, { lazy } from 'react';
-import { IUiSettingsClient } from 'kibana/public';
-import { UiActionsStart } from '../../../../../ui_actions/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { DatatableColumn } from '../../../../../expressions/common/expression_types/specs';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 
 const DataViewComponent = lazy(() => import('./data_view'));
 
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
index cd20f7d598ce3..1be85a7c066d3 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
@@ -19,11 +19,11 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
+import { Datatable } from '@kbn/expressions-plugin';
+import { downloadMultipleAs } from '@kbn/share-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { CSV_MIME_TYPE, datatableToCSV, tableHasFormulas } from '../../../../common';
-import { Datatable } from '../../../../../expressions';
-import { downloadMultipleAs } from '../../../../../share/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { IUiSettingsClient } from '../../../../../../core/public';
 
 interface DataDownloadOptionsState {
   isPopoverOpen: boolean;
diff --git a/src/plugins/data/public/utils/table_inspector_view/index.ts b/src/plugins/data/public/utils/table_inspector_view/index.ts
index 498fe8d7fcca0..01e6100a4a375 100644
--- a/src/plugins/data/public/utils/table_inspector_view/index.ts
+++ b/src/plugins/data/public/utils/table_inspector_view/index.ts
@@ -7,12 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
-import { Adapters, InspectorViewDescription } from '../../../../inspector/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { Adapters, InspectorViewDescription } from '@kbn/inspector-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { getDataViewComponentWrapper } from './components/data_view_wrapper';
-import { UiActionsStart } from '../../../../ui_actions/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
-import { DatatableColumn } from '../../../../expressions/common/expression_types/specs';
 
 export const getTableViewDescription = (
   getStartServices: () => {
diff --git a/src/plugins/data/public/utils/table_inspector_view/types.ts b/src/plugins/data/public/utils/table_inspector_view/types.ts
index 7d57d15d7b3aa..32570ad5aac35 100644
--- a/src/plugins/data/public/utils/table_inspector_view/types.ts
+++ b/src/plugins/data/public/utils/table_inspector_view/types.ts
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { Datatable, DatatableColumn, DatatableRow } from '../../../../expressions/common';
+import { Datatable, DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 
 type DataViewColumnRender = (value: string, _item: DatatableRow) => React.ReactNode | string;
 
diff --git a/src/plugins/data/server/config_deprecations.test.ts b/src/plugins/data/server/config_deprecations.test.ts
index 3df1ea9119292..7da937c840560 100644
--- a/src/plugins/data/server/config_deprecations.test.ts
+++ b/src/plugins/data/server/config_deprecations.test.ts
@@ -9,7 +9,7 @@
 import { cloneDeep } from 'lodash';
 
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 import { autocompleteConfigDeprecationProvider } from './config_deprecations';
 
diff --git a/src/plugins/data/server/config_deprecations.ts b/src/plugins/data/server/config_deprecations.ts
index d98364a8e83c6..7f704dac1f431 100644
--- a/src/plugins/data/server/config_deprecations.ts
+++ b/src/plugins/data/server/config_deprecations.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ConfigDeprecationProvider } from 'src/core/server';
+import type { ConfigDeprecationProvider } from '@kbn/core/server';
 
 export const autocompleteConfigDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot,
diff --git a/src/plugins/data/server/data_views/index.ts b/src/plugins/data/server/data_views/index.ts
index 91a61f4bcb7db..dfe03378f0278 100644
--- a/src/plugins/data/server/data_views/index.ts
+++ b/src/plugins/data/server/data_views/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/server';
+export * from '@kbn/data-views-plugin/server';
diff --git a/src/plugins/data/server/data_views/mocks.ts b/src/plugins/data/server/data_views/mocks.ts
index 69b57ed079127..6bbf835a9de00 100644
--- a/src/plugins/data/server/data_views/mocks.ts
+++ b/src/plugins/data/server/data_views/mocks.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/server/mocks';
+export * from '@kbn/data-views-plugin/server/mocks';
diff --git a/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts b/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts
index 3909003cd4d2c..9c460e639dc37 100644
--- a/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts
+++ b/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts
@@ -10,9 +10,9 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   UiSettingsServiceStart,
-} from 'src/core/server';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import type { IndexPatternsServiceStart } from 'src/plugins/data_views/server';
+} from '@kbn/core/server';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { IndexPatternsServiceStart } from '@kbn/data-views-plugin/server';
 import { DatatableUtilitiesService as DatatableUtilitiesServiceCommon } from '../../common';
 import type { AggsStart } from '../search';
 
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 449d18b542300..b970221c43391 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -9,13 +9,15 @@
 // TODO: https://github.com/elastic/kibana/issues/109904
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { ConfigSchema, configSchema } from '../config';
 import { DataServerPlugin, DataPluginSetup, DataPluginStart } from './plugin';
 
 export * from './deprecated';
 export { getEsQueryConfig, DEFAULT_QUERY_LANGUAGE } from '../common';
 
+export { getRequestAbortedSignal } from './lib';
+
 /**
  * Exporters (CSV)
  */
@@ -43,7 +45,7 @@ export {
   getCapabilitiesForRollupIndices,
 } from './data_views';
 
-export type { IFieldType, IndexPatternAttributes } from '../common';
+export type { IndexPatternAttributes } from '../common';
 export {
   IndexPatternField,
   ES_FIELD_TYPES,
@@ -68,7 +70,6 @@ import {
   // tabify
   calcAutoIntervalLessThan,
 } from '../common';
-import { autocompleteConfigDeprecationProvider } from './config_deprecations';
 
 export type {
   ParsedInterval,
@@ -121,9 +122,7 @@ export type { DataPluginSetup as PluginSetup, DataPluginStart as PluginStart };
 export { DataServerPlugin as Plugin };
 
 export const config: PluginConfigDescriptor<ConfigSchema> = {
-  deprecations: autocompleteConfigDeprecationProvider,
   exposeToBrowser: {
-    autocomplete: true,
     search: true,
   },
   schema: configSchema,
diff --git a/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
index 423ebbdcd43c7..6302af57166c4 100644
--- a/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
+++ b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { registerKqlTelemetryRoute } from './route';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
 import { makeKQLUsageCollector } from './usage_collector';
 import { kqlTelemetry } from '../saved_objects';
 
diff --git a/src/plugins/data/server/kql_telemetry/route.ts b/src/plugins/data/server/kql_telemetry/route.ts
index 7181d2bebd31c..9e1f497ce53e2 100644
--- a/src/plugins/data/server/kql_telemetry/route.ts
+++ b/src/plugins/data/server/kql_telemetry/route.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor, IRouter, Logger } from 'kibana/server';
+import { StartServicesAccessor, IRouter, Logger } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
 export function registerKqlTelemetryRoute(
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
index fb874e4a41c20..679b2e67158eb 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { fetchProvider } from './fetch';
-import { ElasticsearchClient } from 'kibana/server';
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 jest.mock('../../../common', () => ({
   DEFAULT_QUERY_LANGUAGE: '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
index bad26c1cf8f80..3f0d2129c6b92 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
@@ -7,7 +7,7 @@
  */
 
 import { get } from 'lodash';
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../../../common';
 
 const defaultSearchQueryLanguageSetting = DEFAULT_QUERY_LANGUAGE;
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
index 877e0a6b1ef0c..129bf59ca80a9 100644
--- 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
@@ -7,7 +7,7 @@
  */
 
 import { makeKQLUsageCollector } from './make_kql_usage_collector';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 describe('makeKQLUsageCollector', () => {
   let usageCollectionMock: jest.Mocked<UsageCollectionSetup>;
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
index 39ea7d6ab2dec..885c6b1807e92 100644
--- 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
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider, Usage } from './fetch';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
 
 export function makeKQLUsageCollector(usageCollection: UsageCollectionSetup, kibanaIndex: string) {
   const kqlUsageCollector = usageCollection.makeUsageCollector<Usage>({
diff --git a/src/plugins/data/server/mocks.ts b/src/plugins/data/server/mocks.ts
index 355e809888bd4..8df65f7e5b90e 100644
--- a/src/plugins/data/server/mocks.ts
+++ b/src/plugins/data/server/mocks.ts
@@ -6,28 +6,22 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/server/mocks';
+import {
+  createFieldFormatsSetupMock,
+  createFieldFormatsStartMock,
+} from '@kbn/field-formats-plugin/server/mocks';
 import {
   createSearchSetupMock,
   createSearchStartMock,
   createSearchRequestHandlerContext,
 } from './search/mocks';
-import {
-  createFieldFormatsSetupMock,
-  createFieldFormatsStartMock,
-} from '../../field_formats/server/mocks';
 import { createIndexPatternsStartMock } from './data_views/mocks';
 import { createDatatableUtilitiesMock } from './datatable_utilities/mock';
-import { DataRequestHandlerContext } from './search';
-import { AutocompleteSetup } from './autocomplete';
-
-const autocompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
-  getAutocompleteSettings: jest.fn(),
-};
 
 function createSetupContract() {
   return {
     search: createSearchSetupMock(),
-    autocomplete: autocompleteSetupMock,
     /**
      * @deprecated - use directly from "fieldFormats" plugin instead
      */
@@ -49,8 +43,9 @@ function createStartContract() {
 
 function createRequestHandlerContext() {
   return {
+    core: coreMock.createRequestHandlerContext(),
     search: createSearchRequestHandlerContext(),
-  } as unknown as jest.Mocked<DataRequestHandlerContext>;
+  };
 }
 
 export const dataPluginMock = {
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 9d5b3792da566..d1beb335dd35c 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -6,10 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { ConfigSchema } from '../config';
 import { DatatableUtilitiesService } from './datatable_utilities';
 import type { ISearchSetup, ISearchStart, SearchEnhancements } from './search';
@@ -17,19 +19,14 @@ import { SearchService } from './search/search_service';
 import { QueryService } from './query/query_service';
 import { ScriptsService } from './scripts';
 import { KqlTelemetryService } from './kql_telemetry';
-import { UsageCollectionSetup } from '../../usage_collection/server';
-import { AutocompleteService } from './autocomplete';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../field_formats/server';
 import { getUiSettings } from './ui_settings';
 import { QuerySetup } from './query';
-import { AutocompleteSetup } from './autocomplete/autocomplete_service';
 
 interface DataEnhancements {
   search: SearchEnhancements;
 }
 
 export interface DataPluginSetup {
-  autocomplete: AutocompleteSetup;
   search: ISearchSetup;
   query: QuerySetup;
   /**
@@ -81,7 +78,6 @@ export class DataServerPlugin
   private readonly searchService: SearchService;
   private readonly scriptsService: ScriptsService;
   private readonly kqlTelemetryService: KqlTelemetryService;
-  private readonly autocompleteService: AutocompleteService;
   private readonly queryService = new QueryService();
   private readonly logger: Logger;
 
@@ -90,7 +86,6 @@ export class DataServerPlugin
     this.searchService = new SearchService(initializerContext, this.logger);
     this.scriptsService = new ScriptsService();
     this.kqlTelemetryService = new KqlTelemetryService(initializerContext);
-    this.autocompleteService = new AutocompleteService(initializerContext);
   }
 
   public setup(
@@ -110,7 +105,6 @@ export class DataServerPlugin
     });
 
     return {
-      autocomplete: this.autocompleteService.setup(core),
       __enhance: (enhancements: DataEnhancements) => {
         searchSetup.__enhance(enhancements.search);
       },
diff --git a/src/plugins/data/server/query/query_service.ts b/src/plugins/data/server/query/query_service.ts
index 33aeecbc11df1..ea7c05905efee 100644
--- a/src/plugins/data/server/query/query_service.ts
+++ b/src/plugins/data/server/query/query_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { querySavedObjectType } from '../saved_objects';
 import { extract, getAllMigrations, inject, telemetry } from '../../common/query/persistable_state';
 import { registerSavedQueryRoutes } from './routes';
diff --git a/src/plugins/data/server/query/route_handler_context.test.ts b/src/plugins/data/server/query/route_handler_context.test.ts
index f8c14d59e0f85..c0db432ce3fd9 100644
--- a/src/plugins/data/server/query/route_handler_context.test.ts
+++ b/src/plugins/data/server/query/route_handler_context.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { DATA_VIEW_SAVED_OBJECT_TYPE, FilterStateStore } from '../../common';
 import type { SavedObject, SavedQueryAttributes } from '../../common';
 import { registerSavedQueryRouteHandlerContext } from './route_handler_context';
-import { SavedObjectsFindResponse, SavedObjectsUpdateResponse } from 'kibana/server';
+import { SavedObjectsFindResponse, SavedObjectsUpdateResponse } from '@kbn/core/server';
 
 const mockContext = {
   core: coreMock.createRequestHandlerContext(),
@@ -20,7 +20,6 @@ const {
     savedObjects: { client: mockSavedObjectsClient },
   },
 } = mockContext;
-const context = registerSavedQueryRouteHandlerContext(mockContext);
 
 const savedQueryAttributes: SavedQueryAttributes = {
   title: 'foo',
@@ -73,7 +72,15 @@ const savedQueryReferences = [
 ];
 
 describe('saved query route handler context', () => {
-  beforeEach(() => {
+  let context: Awaited<ReturnType<typeof registerSavedQueryRouteHandlerContext>>;
+
+  beforeEach(async () => {
+    context = await registerSavedQueryRouteHandlerContext(
+      coreMock.createCustomRequestHandlerContext({
+        core: mockContext.core,
+      })
+    );
+
     mockSavedObjectsClient.create.mockClear();
     mockSavedObjectsClient.resolve.mockClear();
     mockSavedObjectsClient.find.mockClear();
diff --git a/src/plugins/data/server/query/route_handler_context.ts b/src/plugins/data/server/query/route_handler_context.ts
index 9351bd26408f5..0af658d7692c5 100644
--- a/src/plugins/data/server/query/route_handler_context.ts
+++ b/src/plugins/data/server/query/route_handler_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RequestHandlerContext, SavedObject } from 'kibana/server';
+import { CustomRequestHandlerContext, RequestHandlerContext, SavedObject } from '@kbn/core/server';
 import { isFilters } from '@kbn/es-query';
 import { isQuery, SavedQueryAttributes } from '../../common';
 import { extract, inject } from '../../common/query/persistable_state';
@@ -66,18 +66,16 @@ function verifySavedQuery({ title, query, filters = [] }: SavedQueryAttributes)
   }
 }
 
-export function registerSavedQueryRouteHandlerContext(context: RequestHandlerContext) {
+export async function registerSavedQueryRouteHandlerContext(context: RequestHandlerContext) {
+  const soClient = (await context.core).savedObjects.client;
+
   const createSavedQuery = async (attrs: SavedQueryAttributes) => {
     verifySavedQuery(attrs);
     const { attributes, references } = extractReferences(attrs);
 
-    const savedObject = await context.core.savedObjects.client.create<SavedQueryAttributes>(
-      'query',
-      attributes,
-      {
-        references,
-      }
-    );
+    const savedObject = await soClient.create<SavedQueryAttributes>('query', attributes, {
+      references,
+    });
 
     // TODO: Handle properly
     if (savedObject.error) throw new Error(savedObject.error.message);
@@ -89,14 +87,9 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
     verifySavedQuery(attrs);
     const { attributes, references } = extractReferences(attrs);
 
-    const savedObject = await context.core.savedObjects.client.update<SavedQueryAttributes>(
-      'query',
-      id,
-      attributes,
-      {
-        references,
-      }
-    );
+    const savedObject = await soClient.update<SavedQueryAttributes>('query', id, attributes, {
+      references,
+    });
 
     // TODO: Handle properly
     if (savedObject.error) throw new Error(savedObject.error.message);
@@ -105,8 +98,10 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
   };
 
   const getSavedQuery = async (id: string) => {
-    const { saved_object: savedObject, outcome } =
-      await context.core.savedObjects.client.resolve<SavedQueryAttributes>('query', id);
+    const { saved_object: savedObject, outcome } = await soClient.resolve<SavedQueryAttributes>(
+      'query',
+      id
+    );
     if (outcome === 'conflict') {
       throw new Error(`Multiple saved queries found with ID: ${id} (legacy URL alias conflict)`);
     } else if (savedObject.error) {
@@ -116,20 +111,19 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
   };
 
   const getSavedQueriesCount = async () => {
-    const { total } = await context.core.savedObjects.client.find<SavedQueryAttributes>({
+    const { total } = await soClient.find<SavedQueryAttributes>({
       type: 'query',
     });
     return total;
   };
 
   const findSavedQueries = async ({ page = 1, perPage = 50, search = '' } = {}) => {
-    const { total, saved_objects: savedObjects } =
-      await context.core.savedObjects.client.find<SavedQueryAttributes>({
-        type: 'query',
-        page,
-        perPage,
-        search,
-      });
+    const { total, saved_objects: savedObjects } = await soClient.find<SavedQueryAttributes>({
+      type: 'query',
+      page,
+      perPage,
+      search,
+    });
 
     const savedQueries = savedObjects.map(injectReferences);
 
@@ -137,7 +131,7 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
   };
 
   const getAllSavedQueries = async () => {
-    const finder = context.core.savedObjects.client.createPointInTimeFinder<SavedQueryAttributes>({
+    const finder = soClient.createPointInTimeFinder<SavedQueryAttributes>({
       type: 'query',
       perPage: 100,
     });
@@ -152,8 +146,8 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
     return { total: savedQueries.length, savedQueries };
   };
 
-  const deleteSavedQuery = (id: string) => {
-    return context.core.savedObjects.client.delete('query', id);
+  const deleteSavedQuery = async (id: string) => {
+    return await soClient.delete('query', id);
   };
 
   return {
@@ -167,6 +161,6 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
   };
 }
 
-export interface SavedQueryRouteHandlerContext extends RequestHandlerContext {
-  savedQuery: ReturnType<typeof registerSavedQueryRouteHandlerContext>;
-}
+export type SavedQueryRouteHandlerContext = CustomRequestHandlerContext<{
+  savedQuery: Promise<ReturnType<typeof registerSavedQueryRouteHandlerContext>>;
+}>;
diff --git a/src/plugins/data/server/query/routes.ts b/src/plugins/data/server/query/routes.ts
index 3f813b56b4fb3..16f5d8f9955a7 100644
--- a/src/plugins/data/server/query/routes.ts
+++ b/src/plugins/data/server/query/routes.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { SavedQueryRouteHandlerContext } from './route_handler_context';
 
 const SAVED_QUERY_PATH = '/api/saved_query';
@@ -37,7 +37,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     },
     async (context, request, response) => {
       try {
-        const body = await context.savedQuery.create(request.body);
+        const savedQuery = await context.savedQuery;
+        const body = await savedQuery.create(request.body);
         return response.ok({ body });
       } catch (e) {
         // TODO: Handle properly
@@ -57,7 +58,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     async (context, request, response) => {
       const { id } = request.params;
       try {
-        const body = await context.savedQuery.update(id, request.body);
+        const savedQuery = await context.savedQuery;
+        const body = await savedQuery.update(id, request.body);
         return response.ok({ body });
       } catch (e) {
         // TODO: Handle properly
@@ -76,7 +78,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     async (context, request, response) => {
       const { id } = request.params;
       try {
-        const body = await context.savedQuery.get(id);
+        const savedQuery = await context.savedQuery;
+        const body = await savedQuery.get(id);
         return response.ok({ body });
       } catch (e) {
         // TODO: Handle properly
@@ -92,7 +95,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     },
     async (context, request, response) => {
       try {
-        const count = await context.savedQuery.count();
+        const savedQuery = await context.savedQuery;
+        const count = await savedQuery.count();
         return response.ok({ body: `${count}` });
       } catch (e) {
         // TODO: Handle properly
@@ -114,7 +118,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     },
     async (context, request, response) => {
       try {
-        const body = await context.savedQuery.find(request.body);
+        const savedQuery = await context.savedQuery;
+        const body = await savedQuery.find(request.body);
         return response.ok({ body });
       } catch (e) {
         // TODO: Handle properly
@@ -130,7 +135,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     },
     async (context, request, response) => {
       try {
-        const body = await context.savedQuery.getAll();
+        const savedQuery = await context.savedQuery;
+        const body = await savedQuery.getAll();
         return response.ok({ body });
       } catch (e) {
         // TODO: Handle properly
@@ -149,7 +155,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
     async (context, request, response) => {
       const { id } = request.params;
       try {
-        const body = await context.savedQuery.delete(id);
+        const savedQuery = await context.savedQuery;
+        const body = await savedQuery.delete(id);
         return response.ok({ body });
       } catch (e) {
         // TODO: Handle properly
diff --git a/src/plugins/data/server/saved_objects/kql_telemetry.ts b/src/plugins/data/server/saved_objects/kql_telemetry.ts
index 617e8047e945d..4c887e93fac65 100644
--- a/src/plugins/data/server/saved_objects/kql_telemetry.ts
+++ b/src/plugins/data/server/saved_objects/kql_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const kqlTelemetry: SavedObjectsType = {
   name: 'kql-telemetry',
diff --git a/src/plugins/data/server/saved_objects/migrations/query.ts b/src/plugins/data/server/saved_objects/migrations/query.ts
index 9640725e3edd4..b297276f9a22a 100644
--- a/src/plugins/data/server/saved_objects/migrations/query.ts
+++ b/src/plugins/data/server/saved_objects/migrations/query.ts
@@ -7,10 +7,10 @@
  */
 
 import { mapValues } from 'lodash';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
+import { mergeMigrationFunctionMaps } from '@kbn/kibana-utils-plugin/common';
 import { SavedQueryAttributes } from '../../../common';
 import { extract, getAllMigrations } from '../../../common/query/persistable_state';
-import { mergeMigrationFunctionMaps } from '../../../../kibana_utils/common';
 
 const extractFilterReferences = (doc: SavedObject<SavedQueryAttributes>) => {
   const { state: filters, references } = extract(doc.attributes.filters ?? []);
diff --git a/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts b/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts
index 955028c0f9bf2..561dfd2df7d90 100644
--- a/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts
+++ b/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 /**
  * Drop the previous document's attributes, which report `averageDuration` incorrectly.
diff --git a/src/plugins/data/server/saved_objects/query.ts b/src/plugins/data/server/saved_objects/query.ts
index 6fd34f4802726..3c7e964d6c863 100644
--- a/src/plugins/data/server/saved_objects/query.ts
+++ b/src/plugins/data/server/saved_objects/query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { savedQueryMigrations } from './migrations/query';
 
 export const querySavedObjectType: SavedObjectsType = {
diff --git a/src/plugins/data/server/saved_objects/search_telemetry.ts b/src/plugins/data/server/saved_objects/search_telemetry.ts
index 33ad4b74f3169..9878db7f81cc0 100644
--- a/src/plugins/data/server/saved_objects/search_telemetry.ts
+++ b/src/plugins/data/server/saved_objects/search_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { migrate712 } from './migrations/to_v7_12_0';
 
 export const searchTelemetry: SavedObjectsType = {
diff --git a/src/plugins/data/server/scripts/route.ts b/src/plugins/data/server/scripts/route.ts
index 3be858a36fae2..2427bd91d967d 100644
--- a/src/plugins/data/server/scripts/route.ts
+++ b/src/plugins/data/server/scripts/route.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 
 export function registerScriptsRoute(router: IRouter) {
   router.get(
diff --git a/src/plugins/data/server/scripts/scripts_service.ts b/src/plugins/data/server/scripts/scripts_service.ts
index d0b5a2cf9afe9..899780c570c13 100644
--- a/src/plugins/data/server/scripts/scripts_service.ts
+++ b/src/plugins/data/server/scripts/scripts_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { registerScriptsRoute } from './route';
 
 export class ScriptsService implements Plugin<void> {
diff --git a/src/plugins/data/server/search/aggs/aggs_service.test.ts b/src/plugins/data/server/search/aggs/aggs_service.test.ts
index d03ee17bdaeb9..a78416c6f0625 100644
--- a/src/plugins/data/server/search/aggs/aggs_service.test.ts
+++ b/src/plugins/data/server/search/aggs/aggs_service.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { KibanaRequest, ElasticsearchClient } from 'src/core/server';
+import { KibanaRequest, ElasticsearchClient } from '@kbn/core/server';
 
-import { coreMock } from '../../../../../core/server/mocks';
-import { expressionsPluginMock } from '../../../../../plugins/expressions/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/server/mocks';
 import { BucketAggType, getAggTypes, MetricAggType } from '../../../common';
-import { createFieldFormatsStartMock } from '../../../../field_formats/server/mocks';
+import { createFieldFormatsStartMock } from '@kbn/field-formats-plugin/server/mocks';
 import { createIndexPatternsStartMock } from '../../data_views/mocks';
 
 import { AggsService, AggsSetupDependencies, AggsStartDependencies } from './aggs_service';
diff --git a/src/plugins/data/server/search/aggs/aggs_service.ts b/src/plugins/data/server/search/aggs/aggs_service.ts
index 808c0e9cc8499..4885c5d61f039 100644
--- a/src/plugins/data/server/search/aggs/aggs_service.ts
+++ b/src/plugins/data/server/search/aggs/aggs_service.ts
@@ -12,8 +12,9 @@ import {
   UiSettingsServiceStart,
   SavedObjectsClientContract,
   ElasticsearchClient,
-} from 'src/core/server';
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
+} from '@kbn/core/server';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import {
   AggsCommonService,
   AggConfigs,
@@ -22,7 +23,6 @@ import {
   calculateBounds,
   TimeRange,
 } from '../../../common';
-import { FieldFormatsStart } from '../../../../field_formats/server';
 import { IndexPatternsServiceStart } from '../../data_views';
 import { AggsSetup, AggsStart } from './types';
 
diff --git a/src/plugins/data/server/search/aggs/types.ts b/src/plugins/data/server/search/aggs/types.ts
index 470e60f8e4dd5..d931f4fb361f2 100644
--- a/src/plugins/data/server/search/aggs/types.ts
+++ b/src/plugins/data/server/search/aggs/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
+import { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 import { AggsCommonSetup, AggsStart as Start } from '../../../common';
 
 export type AggsSetup = AggsCommonSetup;
diff --git a/src/plugins/data/server/search/collectors/fetch.ts b/src/plugins/data/server/search/collectors/fetch.ts
index 054d04d6fbcae..08f365d0a6073 100644
--- a/src/plugins/data/server/search/collectors/fetch.ts
+++ b/src/plugins/data/server/search/collectors/fetch.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import { CollectedUsage, ReportedUsage } from './register';
 
 interface SearchTelemetry {
diff --git a/src/plugins/data/server/search/collectors/register.ts b/src/plugins/data/server/search/collectors/register.ts
index a70b9760122a9..927c5274e8128 100644
--- a/src/plugins/data/server/search/collectors/register.ts
+++ b/src/plugins/data/server/search/collectors/register.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider } from './fetch';
 
 export interface CollectedUsage {
diff --git a/src/plugins/data/server/search/collectors/usage.ts b/src/plugins/data/server/search/collectors/usage.ts
index 836ff33b335c4..5b1904737b9bc 100644
--- a/src/plugins/data/server/search/collectors/usage.ts
+++ b/src/plugins/data/server/search/collectors/usage.ts
@@ -7,7 +7,7 @@
  */
 
 import { once, debounce } from 'lodash';
-import type { CoreSetup, Logger } from 'kibana/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 import type { IEsSearchResponse, ISearchOptions } from '../../../common';
 import { isCompleteResponse } from '../../../common';
 import { CollectedUsage } from './register';
diff --git a/src/plugins/data/server/search/errors/no_search_id_in_session.ts b/src/plugins/data/server/search/errors/no_search_id_in_session.ts
index b291df1cee5ba..49f924b6f3f56 100644
--- a/src/plugins/data/server/search/errors/no_search_id_in_session.ts
+++ b/src/plugins/data/server/search/errors/no_search_id_in_session.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KbnError } from '../../../../kibana_utils/common';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 
 export class NoSearchIdInSessionError extends KbnError {
   constructor() {
diff --git a/src/plugins/data/server/search/expressions/eql.ts b/src/plugins/data/server/search/expressions/eql.ts
index e9acac3ffc08f..2eb8e3754dd7b 100644
--- a/src/plugins/data/server/search/expressions/eql.ts
+++ b/src/plugins/data/server/search/expressions/eql.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 import { getEqlFn } from '../../../common/search/expressions/eql';
 
diff --git a/src/plugins/data/server/search/expressions/esaggs.test.ts b/src/plugins/data/server/search/expressions/esaggs.test.ts
index cc5b81657bc55..bd07d8f538456 100644
--- a/src/plugins/data/server/search/expressions/esaggs.test.ts
+++ b/src/plugins/data/server/search/expressions/esaggs.test.ts
@@ -9,8 +9,8 @@
 import { omit } from 'lodash';
 import { of as mockOf } from 'rxjs';
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { KibanaRequest } from 'src/core/server';
-import type { ExecutionContext } from 'src/plugins/expressions/server';
+import { KibanaRequest } from '@kbn/core/server';
+import type { ExecutionContext } from '@kbn/expressions-plugin/server';
 import type { IndexPatternsContract } from '../../../common';
 import type {
   AggsCommonStart,
diff --git a/src/plugins/data/server/search/expressions/esaggs.ts b/src/plugins/data/server/search/expressions/esaggs.ts
index 058538fad4981..912acfab3b3fe 100644
--- a/src/plugins/data/server/search/expressions/esaggs.ts
+++ b/src/plugins/data/server/search/expressions/esaggs.ts
@@ -10,7 +10,7 @@ import { get } from 'lodash';
 import { defer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, StartServicesAccessor } from 'src/core/server';
+import { KibanaRequest, StartServicesAccessor } from '@kbn/core/server';
 import {
   EsaggsExpressionFunctionDefinition,
   EsaggsStartDependencies,
diff --git a/src/plugins/data/server/search/expressions/esdsl.ts b/src/plugins/data/server/search/expressions/esdsl.ts
index e16204c8782e4..cfbfcdc5ca05a 100644
--- a/src/plugins/data/server/search/expressions/esdsl.ts
+++ b/src/plugins/data/server/search/expressions/esdsl.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 import { getEsdslFn } from '../../../common/search/expressions/esdsl';
 
diff --git a/src/plugins/data/server/search/expressions/kibana_context.ts b/src/plugins/data/server/search/expressions/kibana_context.ts
index fd5af4cc4b057..ee28124d09216 100644
--- a/src/plugins/data/server/search/expressions/kibana_context.ts
+++ b/src/plugins/data/server/search/expressions/kibana_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { getKibanaContextFn } from '../../../common/search/expressions';
 import { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 import { SavedObjectsClientCommon } from '../../../common';
diff --git a/src/plugins/data/server/search/routes/bsearch.ts b/src/plugins/data/server/search/routes/bsearch.ts
index 649a86591d0a1..581920feef89d 100644
--- a/src/plugins/data/server/search/routes/bsearch.ts
+++ b/src/plugins/data/server/search/routes/bsearch.ts
@@ -8,8 +8,8 @@
 
 import { firstValueFrom } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import type { ExecutionContextSetup } from 'src/core/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import type { ExecutionContextSetup } from '@kbn/core/server';
 import apm from 'elastic-apm-node';
 import {
   IKibanaSearchRequest,
diff --git a/src/plugins/data/server/search/routes/search.test.ts b/src/plugins/data/server/search/routes/search.test.ts
index 06487d271c6e1..f31e5e8be6de8 100644
--- a/src/plugins/data/server/search/routes/search.test.ts
+++ b/src/plugins/data/server/search/routes/search.test.ts
@@ -8,13 +8,13 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import { from } from 'rxjs';
-import { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { registerSearchRoute } from './search';
 import { DataPluginStart } from '../../plugin';
 import * as searchPhaseException from '../../../common/search/test_data/search_phase_execution_exception.json';
 import * as indexNotFoundException from '../../../common/search/test_data/index_not_found_exception.json';
-import { KbnServerError } from '../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 
 describe('Search service', () => {
   let mockCoreSetup: MockedKeys<CoreSetup<{}, DataPluginStart>>;
diff --git a/src/plugins/data/server/search/routes/search.ts b/src/plugins/data/server/search/routes/search.ts
index 1680a9c4a7237..aa0f69b55816c 100644
--- a/src/plugins/data/server/search/routes/search.ts
+++ b/src/plugins/data/server/search/routes/search.ts
@@ -8,8 +8,8 @@
 
 import { first } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
+import { reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { getRequestAbortedSignal } from '../../lib';
-import { reportServerError } from '../../../../kibana_utils/server';
 import type { DataPluginRouter } from '../types';
 
 export function registerSearchRoute(router: DataPluginRouter): void {
@@ -47,8 +47,9 @@ export function registerSearchRoute(router: DataPluginRouter): void {
       const abortSignal = getRequestAbortedSignal(request.events.aborted$);
 
       try {
-        const response = await context
-          .search!.search(
+        const search = await context.search;
+        const response = await search
+          .search(
             { ...searchRequest, id },
             {
               abortSignal,
@@ -85,7 +86,8 @@ export function registerSearchRoute(router: DataPluginRouter): void {
       const { strategy, id } = request.params;
 
       try {
-        await context.search!.cancel(id, { strategy });
+        const search = await context.search;
+        await search.cancel(id, { strategy });
         return res.ok();
       } catch (err) {
         return reportServerError(res, err);
diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts
index 92487796d363b..121de2e068e3c 100644
--- a/src/plugins/data/server/search/search_service.test.ts
+++ b/src/plugins/data/server/search/search_service.test.ts
@@ -7,15 +7,15 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart, SavedObject } from '../../../../core/server';
-import { coreMock } from '../../../../core/server/mocks';
+import { CoreSetup, CoreStart, SavedObject } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
 
 import { DataPluginStart, DataPluginStartDependencies } from '../plugin';
-import { createFieldFormatsStartMock } from '../../../field_formats/server/mocks';
+import { createFieldFormatsStartMock } from '@kbn/field-formats-plugin/server/mocks';
 import { createIndexPatternsStartMock } from '../data_views/mocks';
 
 import { SearchService, SearchServiceSetupDependencies } from './search_service';
-import { bfetchPluginMock } from '../../../bfetch/server/mocks';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/server/mocks';
 import { lastValueFrom, of } from 'rxjs';
 import type {
   IEsSearchRequest,
@@ -28,7 +28,7 @@ import type {
 } from '.';
 import { NoSearchIdInSessionError } from '.';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { expressionsPluginMock } from '../../../expressions/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { createSearchSessionsClientMock } from './mocks';
 import { ENHANCED_ES_SEARCH_STRATEGY } from '../../common';
 
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 9841263f74542..c59893cdead96 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -18,10 +18,13 @@ import {
   PluginInitializerContext,
   SharedGlobalConfig,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type {
   IScopedSearchClient,
   ISearchSetup,
@@ -34,12 +37,10 @@ import type {
 
 import { AggsService } from './aggs';
 
-import { FieldFormatsStart } from '../../../field_formats/server';
 import { IndexPatternsServiceStart } from '../data_views';
 import { registerSearchRoute } from './routes';
 import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './strategies/es_search';
 import { DataPluginStart, DataPluginStartDependencies } from '../plugin';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
 import { registerUsageCollector } from './collectors/register';
 import { usageProvider } from './collectors/usage';
 import { searchTelemetry } from '../saved_objects';
@@ -87,7 +88,6 @@ import {
 import { aggShardDelay } from '../../common/search/aggs/buckets/shard_delay_fn';
 import { ConfigSchema } from '../../config';
 import { ISearchSessionService, SearchSessionService } from './session';
-import { KbnServerError } from '../../../kibana_utils/server';
 import { registerBsearchRoute } from './routes/bsearch';
 import { getKibanaContext } from './expressions/kibana_context';
 import { enhancedEsSearchStrategyProvider } from './strategies/ese_search';
@@ -143,7 +143,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
 
     core.http.registerRouteHandlerContext<DataRequestHandlerContext, 'search'>(
       'search',
-      async (context, request) => {
+      (context, request) => {
         return this.asScoped(request);
       }
     );
diff --git a/src/plugins/data/server/search/search_source/mocks.ts b/src/plugins/data/server/search/search_source/mocks.ts
index 6c93c39812301..6c6e2cf8a8736 100644
--- a/src/plugins/data/server/search/search_source/mocks.ts
+++ b/src/plugins/data/server/search/search_source/mocks.ts
@@ -7,7 +7,7 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 
 import { searchSourceCommonMock } from '../../../common/search/search_source/mocks';
 import type { ISearchStart, ISearchSetup } from '../types';
diff --git a/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts b/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts
index 045e9d6d540ff..43da5c720feed 100644
--- a/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts
+++ b/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock, httpServerMock } from '../../../../../core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { CachedUiSettingsClient } from './cached_ui_settings_client';
 
diff --git a/src/plugins/data/server/search/services/cached_ui_settings_client.ts b/src/plugins/data/server/search/services/cached_ui_settings_client.ts
index 053f2e2c35f4b..69affb21517d1 100644
--- a/src/plugins/data/server/search/services/cached_ui_settings_client.ts
+++ b/src/plugins/data/server/search/services/cached_ui_settings_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 
 /**
  * {@link IUiSettingsClient} wrapper to ensure uiSettings requested only once within a single KibanaRequest,
diff --git a/src/plugins/data/server/search/session/types.ts b/src/plugins/data/server/search/session/types.ts
index 3083cc7d335e8..76c4cff37cfa2 100644
--- a/src/plugins/data/server/search/session/types.ts
+++ b/src/plugins/data/server/search/session/types.ts
@@ -13,7 +13,7 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { IKibanaSearchRequest, ISearchOptions } from '../../../common/search';
 import { SearchSessionsConfigSchema } from '../../../config';
 
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts
index d32080928d630..32f2d8b1e03d5 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { eqlSearchStrategyProvider } from './eql_search_strategy';
 import { SearchStrategyDependencies } from '../../types';
 import { EqlSearchStrategyRequest } from '../../../../common';
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
index ebb07cff6e05d..33c6f387d6506 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
@@ -8,7 +8,7 @@
 
 import type { TransportResult } from '@elastic/elasticsearch';
 import { tap } from 'rxjs/operators';
-import type { IScopedClusterClient, Logger } from 'kibana/server';
+import type { IScopedClusterClient, Logger } from '@kbn/core/server';
 import {
   EqlSearchStrategyRequest,
   EqlSearchStrategyResponse,
diff --git a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts
index de5962763aed4..7a7f2253b9695 100644
--- a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts
@@ -7,14 +7,14 @@
  */
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock } from '../../../../../../core/server/mocks';
-import { pluginInitializerContextConfigMock } from '../../../../../../core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { pluginInitializerContextConfigMock } from '@kbn/core/server/mocks';
 import { esSearchStrategyProvider } from './es_search_strategy';
 import { SearchStrategyDependencies } from '../../types';
 
 import * as indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
 import { errors } from '@elastic/elasticsearch';
-import { KbnServerError } from '../../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 
 describe('ES search strategy', () => {
   const successBody = {
diff --git a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
index de59402c2c19c..02ebd10f7cb07 100644
--- a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
@@ -8,13 +8,13 @@
 
 import { firstValueFrom, from, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import type { Logger, SharedGlobalConfig } from 'kibana/server';
+import type { Logger, SharedGlobalConfig } from '@kbn/core/server';
+import { getKbnServerError, KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ISearchStrategy } from '../../types';
 import type { SearchUsage } from '../../collectors';
 import { getDefaultSearchParams, getShardTimeout } from './request_utils';
 import { shimHitsTotal, toKibanaSearchResponse } from './response_utils';
 import { searchUsageObserver } from '../../collectors/usage';
-import { getKbnServerError, KbnServerError } from '../../../../../kibana_utils/server';
 
 export const esSearchStrategyProvider = (
   config$: Observable<SharedGlobalConfig>,
diff --git a/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts b/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts
index d6e078c71a87d..b31955be71ce2 100644
--- a/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts
+++ b/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getShardTimeout, getDefaultSearchParams } from './request_utils';
-import { IUiSettingsClient, SharedGlobalConfig } from 'kibana/server';
+import { IUiSettingsClient, SharedGlobalConfig } from '@kbn/core/server';
 
 describe('request utils', () => {
   describe('getShardTimeout', () => {
diff --git a/src/plugins/data/server/search/strategies/es_search/request_utils.ts b/src/plugins/data/server/search/strategies/es_search/request_utils.ts
index 9a57ac56ce250..e0b5cb40e8784 100644
--- a/src/plugins/data/server/search/strategies/es_search/request_utils.ts
+++ b/src/plugins/data/server/search/strategies/es_search/request_utils.ts
@@ -7,7 +7,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IUiSettingsClient, SharedGlobalConfig } from 'kibana/server';
+import type { IUiSettingsClient, SharedGlobalConfig } from '@kbn/core/server';
 import { UI_SETTINGS } from '../../../../common';
 
 export function getShardTimeout(
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
index d4fe74486ee85..b657d5602e99c 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { KbnServerError } from '../../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { errors } from '@elastic/elasticsearch';
 import * as indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
 import * as xContentParseException from '../../../../common/search/test_data/x_content_parse_exception.json';
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index 34cc98131fb48..11229e99526db 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -7,10 +7,11 @@
  */
 
 import type { Observable } from 'rxjs';
-import type { IScopedClusterClient, Logger, SharedGlobalConfig } from 'kibana/server';
+import type { IScopedClusterClient, Logger, SharedGlobalConfig } from '@kbn/core/server';
 import { catchError, tap } from 'rxjs/operators';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { firstValueFrom, from } from 'rxjs';
+import { getKbnServerError, KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ISearchStrategy, SearchStrategyDependencies } from '../../types';
 import type {
   IAsyncSearchOptions,
@@ -25,7 +26,6 @@ import {
   getIgnoreThrottled,
 } from './request_utils';
 import { toAsyncKibanaSearchResponse } from './response_utils';
-import { getKbnServerError, KbnServerError } from '../../../../../kibana_utils/server';
 import { SearchUsage, searchUsageObserver } from '../../collectors';
 import {
   getDefaultSearchParams,
diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
index 91b323de7c07b..878806d9b3559 100644
--- a/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
@@ -11,7 +11,7 @@ import {
   getDefaultAsyncGetParams,
   getIgnoreThrottled,
 } from './request_utils';
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import { UI_SETTINGS } from '../../../../common';
 import moment from 'moment';
 import { SearchSessionsConfigSchema } from '../../../../config';
diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
index 85f9f243ad2b1..ea850c80f90b3 100644
--- a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import { AsyncSearchGetRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { AsyncSearchSubmitRequest } from '@elastic/elasticsearch/lib/api/types';
 import { ISearchOptions, UI_SETTINGS } from '../../../../common';
diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts
index 2734a512e046b..ac676a4084a6a 100644
--- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KbnServerError } from '../../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { errors } from '@elastic/elasticsearch';
 import * as indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
 import { SearchStrategyDependencies } from '../../types';
diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
index 51ab35af3db0f..532062fa1c82d 100644
--- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-import type { IScopedClusterClient, Logger } from 'kibana/server';
+import type { IScopedClusterClient, Logger } from '@kbn/core/server';
 import { catchError, tap } from 'rxjs/operators';
 import { SqlGetAsyncRequest, SqlQueryRequest } from '@elastic/elasticsearch/lib/api/types';
+import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ISearchStrategy, SearchStrategyDependencies } from '../../types';
 import type {
   IAsyncSearchOptions,
@@ -18,7 +19,6 @@ import type {
 import { pollSearch } from '../../../../common';
 import { getDefaultAsyncGetParams, getDefaultAsyncSubmitParams } from './request_utils';
 import { toAsyncKibanaSearchResponse } from './response_utils';
-import { getKbnServerError } from '../../../../../kibana_utils/server';
 
 export const sqlSearchStrategyProvider = (
   logger: Logger,
diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts
index 02372d149779f..70e04e97ea169 100644
--- a/src/plugins/data/server/search/types.ts
+++ b/src/plugins/data/server/search/types.ts
@@ -13,8 +13,8 @@ import type {
   IUiSettingsClient,
   SavedObjectsClientContract,
   KibanaRequest,
-  RequestHandlerContext,
-} from 'src/core/server';
+  CustomRequestHandlerContext,
+} from '@kbn/core/server';
 import {
   ISearchOptions,
   ISearchStartSearchSource,
@@ -126,8 +126,8 @@ export interface ISearchStart<
 
 export type SearchRequestHandlerContext = IScopedSearchClient;
 
-export interface DataRequestHandlerContext extends RequestHandlerContext {
+export type DataRequestHandlerContext = CustomRequestHandlerContext<{
   search: SearchRequestHandlerContext;
-}
+}>;
 
 export type DataPluginRouter = IRouter<DataRequestHandlerContext>;
diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts
index 4783223e49869..2238c43221b84 100644
--- a/src/plugins/data/server/ui_settings.ts
+++ b/src/plugins/data/server/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import type { DocLinksServiceSetup, UiSettingsParams } from 'kibana/server';
+import type { DocLinksServiceSetup, UiSettingsParams } from '@kbn/core/server';
 import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../common';
 
 const luceneQueryLanguageLabel = i18n.translate('data.advancedSettings.searchQueryLanguageLucene', {
diff --git a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
index deab9b8cf824f..9d21af4b2df09 100644
--- a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
+++ b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
@@ -10,7 +10,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import memoizeOne from 'memoize-one';
-import { DataViewField } from '../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 import {
   DataViewSpec,
diff --git a/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx b/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx
index dcc81770c02a0..0eba25613052a 100644
--- a/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx
+++ b/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx
@@ -26,7 +26,7 @@ import {
   EuiFlexGroup,
 } from '@elastic/eui';
 
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 export const EmptyIndexListPrompt = ({
   onRefresh,
diff --git a/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx
index ec5ba142df0d4..686decce9c655 100644
--- a/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx
+++ b/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx
@@ -11,6 +11,7 @@ import useAsync from 'react-use/lib/useAsync';
 
 import { NoDataViewsComponent } from '@kbn/shared-ux-components';
 import { EuiFlyoutBody } from '@elastic/eui';
+import { DEFAULT_ASSETS_TO_IGNORE } from '@kbn/data-plugin/common';
 import { useKibana } from '../../shared_imports';
 
 import { MatchedItem, DataViewEditorContext } from '../../types';
@@ -19,7 +20,6 @@ import { getIndices } from '../../lib';
 
 import { EmptyIndexListPrompt } from './empty_index_list_prompt';
 import { PromptFooter } from './prompt_footer';
-import { DEFAULT_ASSETS_TO_IGNORE } from '../../../../data/common';
 
 const removeAliases = (mItem: MatchedItem) => !mItem.item.indices;
 
diff --git a/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx b/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx
index e2b5b51402060..dc10d06df0769 100644
--- a/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx
+++ b/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { LoadingIndices } from '../loading_indices';
+import { LoadingIndices } from '.';
 import { shallow } from 'enzyme';
 
 describe('LoadingIndices', () => {
diff --git a/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx b/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx
index c26ff17b2d8f1..cad9f323f95ed 100644
--- a/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx
+++ b/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { IndicesList } from '../indices_list';
+import { IndicesList } from '.';
 import { shallow } from 'enzyme';
 import { MatchedItem } from '../../../types';
 
diff --git a/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx b/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx
index c92a653c8c17d..858a00f025e9c 100644
--- a/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx
+++ b/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { StatusMessage } from '../status_message';
+import { StatusMessage } from '.';
 import { shallow } from 'enzyme';
 import { MatchedItem } from '../../../types';
 
diff --git a/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts b/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts
index bc3e4209f5db7..5f23ac0591cec 100644
--- a/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts
+++ b/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { extractTimeFields } from './extract_time_fields';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 
 describe('extractTimeFields', () => {
   it('should handle no date fields', () => {
diff --git a/src/plugins/data_view_editor/public/lib/extract_time_fields.ts b/src/plugins/data_view_editor/public/lib/extract_time_fields.ts
index 82b94b5c6744a..bd6735cedb765 100644
--- a/src/plugins/data_view_editor/public/lib/extract_time_fields.ts
+++ b/src/plugins/data_view_editor/public/lib/extract_time_fields.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexPatternField } from '../../../../plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { TimestampOption } from '../types';
 
 export function extractTimeFields(
diff --git a/src/plugins/data_view_editor/public/lib/get_indices.test.ts b/src/plugins/data_view_editor/public/lib/get_indices.test.ts
index bc4e6b0896065..d4003e8bb4575 100644
--- a/src/plugins/data_view_editor/public/lib/get_indices.test.ts
+++ b/src/plugins/data_view_editor/public/lib/get_indices.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getIndices, responseToItemArray } from './get_indices';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { ResolveIndexResponseItemIndexAttrs } from '../types';
 
 export const successfulResolveResponse = {
diff --git a/src/plugins/data_view_editor/public/lib/get_indices.ts b/src/plugins/data_view_editor/public/lib/get_indices.ts
index 2bf97dd31e45e..0ddd75fa688be 100644
--- a/src/plugins/data_view_editor/public/lib/get_indices.ts
+++ b/src/plugins/data_view_editor/public/lib/get_indices.ts
@@ -7,13 +7,12 @@
  */
 
 import { sortBy } from 'lodash';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
+import { IEsSearchResponse } from '@kbn/data-plugin/public';
 import { Tag, INDEX_PATTERN_TYPE } from '../types';
 import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types';
 
-import { IEsSearchResponse } from '../../../data/public';
-
 const aliasLabel = i18n.translate('indexPatternEditor.aliasLabel', { defaultMessage: 'Alias' });
 const dataStreamLabel = i18n.translate('indexPatternEditor.dataStreamLabel', {
   defaultMessage: 'Data stream',
diff --git a/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts b/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts
index b584532c61b52..b1c80791a1343 100644
--- a/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts
+++ b/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts
@@ -9,7 +9,7 @@
 import { getMatchedIndices } from './get_matched_indices';
 import { Tag, MatchedItem } from '../types';
 
-jest.mock('./../constants', () => ({
+jest.mock('../constants', () => ({
   MAX_NUMBER_OF_MATCHING_INDICES: 6,
 }));
 
diff --git a/src/plugins/data_view_editor/public/open_editor.tsx b/src/plugins/data_view_editor/public/open_editor.tsx
index fcf0fad5a32b0..7fd5163edacc4 100644
--- a/src/plugins/data_view_editor/public/open_editor.tsx
+++ b/src/plugins/data_view_editor/public/open_editor.tsx
@@ -7,9 +7,9 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayRef } from 'src/core/public';
+import { CoreStart, OverlayRef } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 import {
   createKibanaReactContext,
diff --git a/src/plugins/data_view_editor/public/plugin.test.tsx b/src/plugins/data_view_editor/public/plugin.test.tsx
index f8735462fcff5..37e8002067613 100644
--- a/src/plugins/data_view_editor/public/plugin.test.tsx
+++ b/src/plugins/data_view_editor/public/plugin.test.tsx
@@ -7,8 +7,8 @@
  */
 import React from 'react';
 
-jest.mock('../../kibana_react/public', () => {
-  const original = jest.requireActual('../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
@@ -16,10 +16,10 @@ jest.mock('../../kibana_react/public', () => {
   };
 });
 
-import { CoreStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
-import { usageCollectionPluginMock } from '../../usage_collection/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import { DataViewEditorLazy } from './components/data_view_editor_lazy';
 import { DataViewEditorPlugin } from './plugin';
diff --git a/src/plugins/data_view_editor/public/plugin.tsx b/src/plugins/data_view_editor/public/plugin.tsx
index a8aa33620c456..b0186b838987b 100644
--- a/src/plugins/data_view_editor/public/plugin.tsx
+++ b/src/plugins/data_view_editor/public/plugin.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 import { PluginSetup, PluginStart, SetupPlugins, StartPlugins, DataViewEditorProps } from './types';
 import { getEditorOpener } from './open_editor';
diff --git a/src/plugins/data_view_editor/public/shared_imports.ts b/src/plugins/data_view_editor/public/shared_imports.ts
index dd9b8ea2a0e41..cc826dffdb6e5 100644
--- a/src/plugins/data_view_editor/public/shared_imports.ts
+++ b/src/plugins/data_view_editor/public/shared_imports.ts
@@ -10,17 +10,17 @@ export type {
   DataPublicPluginStart,
   GetFieldsOptions,
   IndexPatternAggRestrictions,
-} from '../../data/public';
-export { IndexPattern, IndexPatternField } from '../../data/public';
-export type { DataViewSpec } from '../../data_views/public';
-export { DataView } from '../../data_views/public';
+} from '@kbn/data-plugin/public';
+export { IndexPattern, IndexPatternField } from '@kbn/data-plugin/public';
+export type { DataViewSpec } from '@kbn/data-views-plugin/public';
+export { DataView } from '@kbn/data-views-plugin/public';
 
 export {
   createKibanaReactContext,
   toMountPoint,
   CodeEditor,
   useKibana,
-} from '../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
 export type {
   FormSchema,
@@ -29,7 +29,7 @@ export type {
   FieldConfig,
   ValidationConfig,
   ValidationFuncArg,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   useForm,
   useFormData,
@@ -37,9 +37,9 @@ export {
   Form,
   UseField,
   getFieldValidityAndErrorMessage,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   TextField,
@@ -48,6 +48,6 @@ export {
   SelectField,
   FormRow,
   SuperSelectField,
-} from '../../es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export type { HttpStart } from '../../../core/public';
+export type { HttpStart } from '@kbn/core/public';
diff --git a/src/plugins/data_view_editor/public/test_utils/mocks.ts b/src/plugins/data_view_editor/public/test_utils/mocks.ts
index 5d0296a04ea51..bfd5b296e5421 100644
--- a/src/plugins/data_view_editor/public/test_utils/mocks.ts
+++ b/src/plugins/data_view_editor/public/test_utils/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const noop = () => {};
 
diff --git a/src/plugins/data_view_editor/public/types.ts b/src/plugins/data_view_editor/public/types.ts
index ed0b19f6e529a..fe6928ee73734 100644
--- a/src/plugins/data_view_editor/public/types.ts
+++ b/src/plugins/data_view_editor/public/types.ts
@@ -13,11 +13,11 @@ import {
   NotificationsStart,
   DocLinksStart,
   HttpSetup,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 
-import type { DataView, DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
+import type { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DataPublicPluginStart, IndexPatternAggRestrictions } from './shared_imports';
 
 export interface DataViewEditorContext {
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts
index 4c7a5832f037c..83b9f65a09ef5 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 type HttpResponse = Record<string, any> | any[];
 
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
index 7161776c21fb1..7c626c6550f99 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
@@ -75,8 +75,8 @@ jest.mock('react-use/lib/useDebounce', () => {
   };
 });
 
-jest.mock('../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   /**
    * We mock the CodeEditor because it requires the <KibanaReactContextProvider>
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
index ce0fb1b3a915f..438c358ae9bb5 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
@@ -13,14 +13,14 @@ import React, { FunctionComponent } from 'react';
 import { merge } from 'lodash';
 
 import { defer } from 'rxjs';
-import { notificationServiceMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { notificationServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fieldFormatsMock as fieldFormats } from '@kbn/field-formats-plugin/common/mocks';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { FieldEditorProvider, Context } from '../../../public/components/field_editor_context';
 import { FieldPreviewProvider } from '../../../public/components/preview';
 import { initApi, ApiService } from '../../../public/lib';
 import { init as initHttpRequests } from './http_requests';
-import { fieldFormatsMock as fieldFormats } from '../../../../field_formats/common/mocks';
-import { FieldFormat } from '../../../../field_formats/common';
 
 const dataStart = dataPluginMock.createStartContract();
 const { search } = dataStart;
diff --git a/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx b/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx
index 4bee00f3c4b2a..6cadc094bb35f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { createContext, useContext, FunctionComponent, useMemo } from 'react';
-import { NotificationsStart, CoreStart } from 'src/core/public';
+import { NotificationsStart, CoreStart } from '@kbn/core/public';
 import { FieldFormatsStart } from '../shared_imports';
 import type { DataView, DataPublicPluginStart } from '../shared_imports';
 import { ApiService } from '../lib/api';
diff --git a/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx b/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx
index bd4f62b2c55f3..f2bb91f18c6dd 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx
@@ -7,11 +7,11 @@
  */
 
 import React, { useCallback, useState, useMemo } from 'react';
-import { DocLinksStart, NotificationsStart, CoreStart } from 'src/core/public';
+import { DocLinksStart, NotificationsStart, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import {
   DataViewField,
   DataView,
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx
index afca37bd6f214..d97f9cbb02356 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { BytesFormatEditor } from './bytes';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx
index 750cf8378f334..513a0c2d97c00 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 
 import { ColorFormatEditor } from './color';
-import { FieldFormat, DEFAULT_CONVERTER_COLOR } from '../../../../../../field_formats/common';
+import { FieldFormat, DEFAULT_CONVERTER_COLOR } from '@kbn/field-formats-plugin/common';
 
 const fieldType = 'string';
 const format = {
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx
index 77c357134399b..8418f24bd443f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx
@@ -12,10 +12,10 @@ import { EuiBasicTable, EuiButton, EuiColorPicker, EuiFieldText, EuiSpacer } fro
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DEFAULT_CONVERTER_COLOR } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor } from '../default/default';
 import { formatId } from './constants';
 
-import { DEFAULT_CONVERTER_COLOR } from '../../../../../../field_formats/common';
 import { FormatEditorProps } from '../types';
 
 interface Color {
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx
index dfe51a36685dc..98d73157c63b1 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { DateFormatEditor } from './date';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx
index ba8035541e0f2..4b9cc75c6701f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { DateNanosFormatEditor } from './date_nanos';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx
index 388d51ca8ac25..3130accfa427f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { SampleInput } from '../../types';
 import { DefaultFormatEditor, convertSampleInput } from './default';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx
index fcf73f397b3fe..a3a71becb3ef3 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx
@@ -9,7 +9,7 @@
 import React, { PureComponent, ReactText } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { FieldFormatsContentType } from 'src/plugins/field_formats/common';
+import type { FieldFormatsContentType } from '@kbn/field-formats-plugin/common';
 import type { Sample, SampleInput } from '../../types';
 import type { FormatEditorProps } from '../types';
 import { formatId } from './constants';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
index c2cf5200d1887..31e47f9a7889c 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { DurationFormatEditor } from './duration';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { EuiSwitch } from '@elastic/eui';
 
 const fieldType = 'number';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
index 5ed464dd7bc31..e18c9664cacab 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { Fragment } from 'react';
-import { DurationFormat } from 'src/plugins/field_formats/common';
+import { DurationFormat } from '@kbn/field-formats-plugin/common';
 
 import { EuiFieldNumber, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx
index d21d1eb766f1d..a9460b7e045ca 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx
@@ -11,11 +11,11 @@ import React, { Fragment } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { GeoPointFormat } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor, defaultState } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
-import { GeoPointFormat } from '../../../../../../field_formats/common';
 
 interface GeoPointFormatEditorFormatParams {
   transform: string;
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx
index d16a33f52ea11..ae25602ec1ed8 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { HistogramFormatEditor } from './histogram';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx
index 3f80b101f3970..c54d29f41e88c 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { NumberFormatEditor } from './number';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx
index dfbd43f99142c..65793583d8bf3 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx
@@ -11,13 +11,12 @@ import React, { Fragment } from 'react';
 import { EuiCode, EuiFieldText, EuiFormRow, EuiIcon, EuiLink } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { context as contextType } from '@kbn/kibana-react-plugin/public';
 import { DefaultFormatEditor, defaultState } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
 
-import { context as contextType } from '../../../../../../kibana_react/public';
-
 export interface NumberFormatEditorParams {
   pattern: string;
 }
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx
index bd4daecadd907..535b55cf64549 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { PercentFormatEditor } from './percent';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx
index 9f2bd59d7ceb4..369b2eb972f7d 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 import { StaticLookupFormatEditorFormatParams } from './static_lookup';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { StaticLookupFormatEditor } from './static_lookup';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx
index 2b7ae5e6f270f..8cebd1ebea1d4 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { StringFormatEditor } from './string';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx
index b3138cf6c3198..21e48130a73d9 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx
@@ -11,11 +11,11 @@ import React, { Fragment } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { StringFormat } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor, defaultState } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
-import { StringFormat } from '../../../../../../field_formats/common';
 
 interface StringFormatEditorFormatParams {
   transform: string;
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx
index 0a5154e783546..fb45c15527f04 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx
@@ -9,7 +9,7 @@
 import React, { ChangeEvent } from 'react';
 import { shallow } from 'enzyme';
 import { EuiFieldNumber } from '@elastic/eui';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { TruncateFormatEditor } from './truncate';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts
index cbdd8efb2a4c8..ceb18914ebfc0 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { ComponentType } from 'react';
-import type { FieldFormat } from '../../../../../field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { FormatSelectEditorProps } from '../field_format_editor';
 
 /**
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
index 357ac257c2611..8993e2a3185ce 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
@@ -7,11 +7,11 @@
  */
 
 import React from 'react';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { UrlFormatEditor } from './url';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx
index 03c400a0a3595..d7f76e07ef447 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx
@@ -18,14 +18,14 @@ import {
 } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { context as contextType } from '@kbn/kibana-react-plugin/public';
+import { UrlFormat } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
 
-import { context as contextType } from '../../../../../../kibana_react/public';
 import { FormatEditorProps } from '../types';
-import { UrlFormat } from '../../../../../../field_formats/common';
 
 interface OnChangeParam {
   type: string;
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx
index e921d0beafce1..2cef6a93a1266 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx
@@ -11,12 +11,12 @@ import { EuiCode, EuiFormRow, EuiSelect } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from 'src/plugins/data/public';
-import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
-import { CoreStart } from 'src/core/public';
+import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import type { FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
+import { CoreStart } from '@kbn/core/public';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { DataView } from 'src/plugins/data_views/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FormatEditor } from './format_editor';
 import { FormatEditorServiceStart } from '../../service';
 import { FieldFormatConfig } from '../../types';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx
index c6f5fc9899ac7..2fcaa3420848a 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx
@@ -9,7 +9,7 @@
 import { EuiDelayRender, EuiLoadingContent } from '@elastic/eui';
 import { memoize } from 'lodash';
 import React, { PureComponent, LazyExoticComponent } from 'react';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { FieldFormatEditorFactory, FieldFormatEditor } from './editors';
 
 export interface FormatEditorProps {
diff --git a/src/plugins/data_view_field_editor/public/lib/api.ts b/src/plugins/data_view_field_editor/public/lib/api.ts
index 594cd07ecb70e..67233db393cb8 100644
--- a/src/plugins/data_view_field_editor/public/lib/api.ts
+++ b/src/plugins/data_view_field_editor/public/lib/api.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../common/constants';
 import { sendRequest } from '../shared_imports';
 import { PainlessExecuteContext, FieldPreviewResponse } from '../components/preview';
diff --git a/src/plugins/data_view_field_editor/public/lib/documentation.ts b/src/plugins/data_view_field_editor/public/lib/documentation.ts
index a18a75f63d6b8..81e0709b696bf 100644
--- a/src/plugins/data_view_field_editor/public/lib/documentation.ts
+++ b/src/plugins/data_view_field_editor/public/lib/documentation.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const getLinks = ({ links }: DocLinksStart) => {
   return {
diff --git a/src/plugins/data_view_field_editor/public/lib/remove_fields.ts b/src/plugins/data_view_field_editor/public/lib/remove_fields.ts
index abae8de69dcb6..ac4e336b8a4e7 100644
--- a/src/plugins/data_view_field_editor/public/lib/remove_fields.ts
+++ b/src/plugins/data_view_field_editor/public/lib/remove_fields.ts
@@ -8,10 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { NotificationsStart } from 'src/core/public';
+import { NotificationsStart } from '@kbn/core/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DataView, UsageCollectionStart } from '../shared_imports';
 import { pluginName } from '../constants';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
 
 export async function removeFields(
   fieldNames: string[],
diff --git a/src/plugins/data_view_field_editor/public/open_delete_modal.tsx b/src/plugins/data_view_field_editor/public/open_delete_modal.tsx
index f44367d16d08d..2703653138fe0 100644
--- a/src/plugins/data_view_field_editor/public/open_delete_modal.tsx
+++ b/src/plugins/data_view_field_editor/public/open_delete_modal.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayRef } from 'src/core/public';
+import { CoreStart, OverlayRef } from '@kbn/core/public';
 
 import {
   toMountPoint,
diff --git a/src/plugins/data_view_field_editor/public/open_editor.tsx b/src/plugins/data_view_field_editor/public/open_editor.tsx
index d3a91739dc94a..f6355b0e70e0e 100644
--- a/src/plugins/data_view_field_editor/public/open_editor.tsx
+++ b/src/plugins/data_view_field_editor/public/open_editor.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayRef } from 'src/core/public';
+import { CoreStart, OverlayRef } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
 import {
diff --git a/src/plugins/data_view_field_editor/public/plugin.test.tsx b/src/plugins/data_view_field_editor/public/plugin.test.tsx
index eba7d19a5a0d0..1fc63cf945663 100644
--- a/src/plugins/data_view_field_editor/public/plugin.test.tsx
+++ b/src/plugins/data_view_field_editor/public/plugin.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { registerTestBed } from '@kbn/test-jest-helpers';
 
-jest.mock('../../kibana_react/public', () => {
-  const original = jest.requireActual('../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
@@ -17,11 +17,11 @@ jest.mock('../../kibana_react/public', () => {
   };
 });
 
-import { CoreStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
-import { fieldFormatsServiceMock } from '../../field_formats/public/mocks';
-import { usageCollectionPluginMock } from '../../usage_collection/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import { FieldEditorLoader } from './components/field_editor_loader';
 import { IndexPatternFieldEditorPlugin } from './plugin';
diff --git a/src/plugins/data_view_field_editor/public/plugin.ts b/src/plugins/data_view_field_editor/public/plugin.ts
index 3b13bcd82c110..fe5b5d8390765 100644
--- a/src/plugins/data_view_field_editor/public/plugin.ts
+++ b/src/plugins/data_view_field_editor/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 import type { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types';
 import { getFieldEditorOpener } from './open_editor';
diff --git a/src/plugins/data_view_field_editor/public/shared_imports.ts b/src/plugins/data_view_field_editor/public/shared_imports.ts
index c8332a2afe76d..f51b8f030e724 100644
--- a/src/plugins/data_view_field_editor/public/shared_imports.ts
+++ b/src/plugins/data_view_field_editor/public/shared_imports.ts
@@ -6,19 +6,27 @@
  * Side Public License, v 1.
  */
 
-export type { DataPublicPluginStart } from '../../data/public';
+export type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-export type { DataViewsPublicPluginStart, DataView, DataViewField } from '../../data_views/public';
-export type { FieldFormatsStart } from '../../field_formats/public';
+export type {
+  DataViewsPublicPluginStart,
+  DataView,
+  DataViewField,
+} from '@kbn/data-views-plugin/public';
+export type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
-export type { UsageCollectionStart } from '../../usage_collection/public';
+export type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 
-export type { RuntimeType, RuntimeField } from '../../data/common';
-export { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../../data/common';
+export type { RuntimeType, RuntimeField } from '@kbn/data-plugin/common';
+export { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
-export { createKibanaReactContext, toMountPoint, CodeEditor } from '../../kibana_react/public';
+export {
+  createKibanaReactContext,
+  toMountPoint,
+  CodeEditor,
+} from '@kbn/kibana-react-plugin/public';
 
-export { FieldFormat } from '../../field_formats/common';
+export { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 export type {
   FormSchema,
@@ -26,7 +34,7 @@ export type {
   ValidationFunc,
   FieldConfig,
   ValidationCancelablePromise,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   useForm,
@@ -36,10 +44,14 @@ export {
   Form,
   UseField,
   useBehaviorSubject,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export { TextField, ToggleField, NumericField } from '../../es_ui_shared/static/forms/components';
+export {
+  TextField,
+  ToggleField,
+  NumericField,
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { sendRequest } from '../../es_ui_shared/public';
+export { sendRequest } from '@kbn/es-ui-shared-plugin/public';
diff --git a/src/plugins/data_view_field_editor/server/index.ts b/src/plugins/data_view_field_editor/server/index.ts
index dc6f734a7e503..38ae28ebe9892 100644
--- a/src/plugins/data_view_field_editor/server/index.ts
+++ b/src/plugins/data_view_field_editor/server/index.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IndexPatternPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/data_view_field_editor/server/plugin.ts b/src/plugins/data_view_field_editor/server/plugin.ts
index 18601aad85307..c5bbe9bab7572 100644
--- a/src/plugins/data_view_field_editor/server/plugin.ts
+++ b/src/plugins/data_view_field_editor/server/plugin.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { PluginInitializerContext, CoreSetup, Plugin, Logger } from 'kibana/server';
+import { PluginInitializerContext, CoreSetup, Plugin, Logger } from '@kbn/core/server';
 
 import { ApiRoutes } from './routes';
 
diff --git a/src/plugins/data_view_field_editor/server/routes/field_preview.ts b/src/plugins/data_view_field_editor/server/routes/field_preview.ts
index 022cd92a4bb1e..5595eeeaeddfb 100644
--- a/src/plugins/data_view_field_editor/server/routes/field_preview.ts
+++ b/src/plugins/data_view_field_editor/server/routes/field_preview.ts
@@ -38,7 +38,7 @@ export const registerFieldPreviewRoute = ({ router }: RouteDependencies): void =
       },
     },
     async (ctx, req, res) => {
-      const { client } = ctx.core.elasticsearch;
+      const { client } = (await ctx.core).elasticsearch;
 
       const type = req.body.context.split('_field')[0] as estypes.MappingRuntimeFieldType;
       const body = {
diff --git a/src/plugins/data_view_field_editor/server/shared_imports.ts b/src/plugins/data_view_field_editor/server/shared_imports.ts
index d818f11ceefda..f709280aa013b 100644
--- a/src/plugins/data_view_field_editor/server/shared_imports.ts
+++ b/src/plugins/data_view_field_editor/server/shared_imports.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { handleEsError } from '../../es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/src/plugins/data_view_field_editor/server/types.ts b/src/plugins/data_view_field_editor/server/types.ts
index c86708c12a71e..7868ca4c88650 100644
--- a/src/plugins/data_view_field_editor/server/types.ts
+++ b/src/plugins/data_view_field_editor/server/types.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export interface RouteDependencies {
   router: IRouter;
diff --git a/src/plugins/data_view_management/public/components/breadcrumbs.ts b/src/plugins/data_view_management/public/components/breadcrumbs.ts
index 244bce41f8fd4..6815a772b2648 100644
--- a/src/plugins/data_view_management/public/components/breadcrumbs.ts
+++ b/src/plugins/data_view_management/public/components/breadcrumbs.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export function getListBreadcrumbs() {
   return [
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
index 2d8469975430b..c7b5134bc30f9 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
@@ -11,8 +11,8 @@ import { RouteComponentProps, withRouter } from 'react-router-dom';
 
 import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataView, DataViewField } from '../../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { IndexHeader } from '../index_header';
 import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS } from '../constants';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx
index f9cb95f67eabc..11e14d067012b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx
@@ -9,9 +9,9 @@
 import React, { useEffect, useState } from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
-import type { DataView } from '../../../../../../plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { getEditFieldBreadcrumbs, getCreateFieldBreadcrumbs } from '../../breadcrumbs';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { CreateEditField } from './create_edit_field';
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index 6a7663d9d2f01..ca6f34ffcb8de 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -20,8 +20,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView, DataViewField } from '../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../plugins/kibana_react/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../types';
 import { Tabs } from './tabs';
 import { IndexHeader } from './index_header';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx
index 61de32b1dd20f..03fa92c435247 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx
@@ -8,12 +8,12 @@
 
 import React, { useEffect, useState } from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { DataView } from '../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../plugins/kibana_react/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../types';
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
-import { EditIndexPattern } from '../edit_index_pattern';
+import { EditIndexPattern } from '.';
 
 const EditIndexPatternCont: React.FC<RouteComponentProps<{ id: string }>> = ({ ...props }) => {
   const { dataViews, setBreadcrumbs } = useKibana<IndexPatternManagmentContext>().services;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts
index 82724a96de834..6252ea3ae6ad8 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts
@@ -11,7 +11,7 @@ import {
   createStateContainer,
   syncState,
   createKbnUrlStateStorage,
-} from '../../../../../plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
 interface IEditIndexPatternState {
   tab: string;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
index e40ef6a7ddf2f..ed2029b854972 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonIcon, EuiPageHeader, EuiToolTip } from '@elastic/eui';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 interface IndexHeaderProps {
   indexPattern: DataView;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
index 44385c7b6e41d..6da5b8ffd2e61 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { IndexedFieldItem } from '../../types';
 import { Table, renderFieldName, getConflictModalContent, showDelete } from './table';
-import { overlayServiceMock, themeServiceMock } from 'src/core/public/mocks';
+import { overlayServiceMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 const theme = themeServiceMock.createStartContract();
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
index f8ce07b11d3e8..1646ec0f24ed5 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { PureComponent } from 'react';
-import { OverlayModalStart, ThemeServiceStart } from 'src/core/public';
+import { OverlayModalStart, ThemeServiceStart } from '@kbn/core/public';
 
 import {
   EuiIcon,
@@ -28,9 +28,9 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { toMountPoint } from '../../../../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { DataView } from '../../../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { IndexedFieldItem } from '../../types';
 
 export const showDelete = (field: IndexedFieldItem) =>
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
index ff03bd404b6c4..4cc5792ce756b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
-import { DataViewField, DataView, DataViewType } from 'src/plugins/data_views/public';
+import { DataViewField, DataView, DataViewType } from '@kbn/data-views-plugin/public';
 import { IndexedFieldsTable } from './indexed_fields_table';
 import { getFieldInfo } from '../../utils';
-import { RuntimeField } from 'src/plugins/data_views/common';
+import { RuntimeField } from '@kbn/data-views-plugin/common';
 
 jest.mock('@elastic/eui', () => ({
   EuiFlexGroup: 'eui-flex-group',
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
index ad85499009db0..d26b0726d7814 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -8,8 +8,8 @@
 
 import React, { Component } from 'react';
 import { createSelector } from 'reselect';
-import { OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { DataViewField, DataView } from '../../../../../../plugins/data_views/public';
+import { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import { Table } from './components/table';
 import { IndexedFieldItem } from './types';
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts
index 1467c7579eba7..38c9e847a71ca 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { DataViewFieldBase } from '@kbn/es-query';
-import { DataViewField } from '../../../../../../plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 type IndexedFieldItemBase = Partial<DataViewField> & DataViewFieldBase;
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx
index 9db99e0428463..3e29f39e3334d 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx
@@ -7,11 +7,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { IUiSettingsClient, OverlayStart } from 'src/core/public';
+import type { IUiSettingsClient, OverlayStart } from '@kbn/core/public';
 import { asyncForEach } from '@kbn/std';
 import { EuiConfirmModalProps } from '@elastic/eui';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
-import { DataViewsPublicPluginStart } from '../../../../../plugins/data_views/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 const confirmModalOptionsDelete = {
   confirmButtonText: i18n.translate('indexPatternManagement.editIndexPattern.deleteButton', {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx
index 80809d3a57168..534572b3dad66 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { CallOuts } from '../call_outs';
+import { CallOuts } from '.';
 
 describe('CallOuts', () => {
   test('should render normally', () => {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx
index 99ffb4ada6369..d579a83c8ee72 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { RouteComponentProps } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
-import { scopedHistoryMock } from '../../../../../../../../core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { ScopedHistory } from '@kbn/core/public';
+import { scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { mockManagementPlugin } from '../../../../../mocks';
 
 import { Header } from './header';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
index 651f0c5757f12..dd4a4e6d71dbb 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
@@ -11,9 +11,9 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiText, EuiLink, EuiIcon } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
-import { reactRouterNavigate, useKibana } from '../../../../../../../kibana_react/public';
+import { reactRouterNavigate, useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../../../types';
 
 interface HeaderProps extends RouteComponentProps {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
index c37399e1d02a9..dddb52784f68c 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Table } from '../table';
+import { Table } from '.';
 import { ScriptedFieldItem } from '../../types';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 const getIndexPatternMock = (mockedFields: any = {}) => ({ ...mockedFields } as DataView);
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx
index 1e2226ac4ab38..89407e29e5cd1 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx
@@ -11,8 +11,8 @@ import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiInMemoryTable, EuiBasicTableColumn } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ScriptedFieldItem } from '../../types';
-import { DataView } from '../../../../../../../data_views/public';
 
 interface TableProps {
   indexPattern: DataView;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
index 4febfdf0e1219..54b4a49f0ead8 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 
-import { ScriptedFieldsTable } from '../scripted_fields_table';
-import { DataView } from '../../../../../../plugins/data_views/public';
+import { ScriptedFieldsTable } from '.';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 jest.mock('@elastic/eui', () => ({
   EuiTitle: 'eui-title',
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
index 540131c50b236..2e0822417d41b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
@@ -8,6 +8,7 @@
 
 import React, { Component } from 'react';
 import { EuiSpacer } from '@elastic/eui';
+import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import {
   getSupportedScriptingLanguages,
   getDeprecatedScriptingLanguages,
@@ -16,8 +17,6 @@ import {
 import { Table, Header, CallOuts, DeleteScritpedFieldConfirmationModal } from './components';
 import { ScriptedFieldItem } from './types';
 
-import { DataView, DataViewsPublicPluginStart } from '../../../../../../plugins/data_views/public';
-
 interface ScriptedFieldsTableProps {
   indexPattern: DataView;
   fieldFilter?: string;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx
index 19a0f236a8248..fe9f850dc239a 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Header } from '../header';
+import { Header } from '.';
 
 describe('Header', () => {
   test('should render normally', () => {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
index f9c7f41030837..2c082ced0f1f8 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
@@ -11,7 +11,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { Table, TableProps, TableState } from './table';
 import { EuiTableFieldDataColumnType, keys } from '@elastic/eui';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SourceFiltersTableFilter } from '../../types';
 
 const indexPattern = {} as DataView;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
index 144f6d19599bd..6030f653f9562 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
@@ -19,7 +19,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SourceFiltersTableFilter } from '../../types';
 
 const filterHeader = i18n.translate(
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx
index 13d1bd72c96ef..0f04c82419dac 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { SourceFiltersTable } from './source_filters_table';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 jest.mock('@elastic/eui', () => ({
   EuiButton: 'eui-button',
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
index 80451e95fb5ed..3d3d167f732da 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
@@ -10,8 +10,8 @@ import React, { Component } from 'react';
 import { createSelector } from 'reselect';
 
 import { EuiSpacer } from '@elastic/eui';
+import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { AddFilter, Table, Header, DeleteFilterConfirmationModal } from './components';
-import { DataView, DataViewsPublicPluginStart } from '../../../../../../plugins/data_views/public';
 import { SourceFiltersTableFilter } from './types';
 
 export interface SourceFiltersTableProps {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
index 762d30685ba38..a50e1062f447f 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -23,14 +23,14 @@ import {
   FilterChecked,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { fieldWildcardMatcher } from '../../../../../kibana_utils/public';
+import { fieldWildcardMatcher } from '@kbn/kibana-utils-plugin/public';
 import {
   DataView,
   DataViewField,
   DataViewsPublicPluginStart,
   META_FIELDS,
-} from '../../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
+} from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { createEditIndexPatternPageStateContainer } from '../edit_index_pattern_state_container';
 import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts
index 738f62f647ac2..1c1dd544ad7a9 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getPath } from './utils';
-import { DataViewField, DataView } from '../../../../../data_views/public';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 
 test('getPath() should encode "fieldName"', () => {
   expect(
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts
index e82722b1a5127..6b29057926a64 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts
@@ -8,7 +8,7 @@
 
 import { Dictionary, countBy, defaults, uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { DataView, DataViewField } from '../../../../../../plugins/data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants';
 import { areScriptedFieldsEnabled } from '../../utils';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx
index 1a06fdf425500..89be237adac58 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx
@@ -10,7 +10,7 @@ import React, { PureComponent } from 'react';
 import { shallow } from 'enzyme';
 
 import { FieldFormatEditor } from './field_format_editor';
-import type { FieldFormat } from '../../../../../../field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 class TestEditor extends PureComponent {
   render() {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx
index 3cddad8dc3e76..0b0018629f02d 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx
@@ -12,8 +12,8 @@ import { EuiDelayRender, EuiLoadingContent } from '@elastic/eui';
 import type {
   FieldFormatEditorFactory,
   FieldFormatEditor as InnerFieldFormatEditor,
-} from 'src/plugins/data_view_field_editor/public';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+} from '@kbn/data-view-field-editor-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 export interface FieldFormatEditorProps {
   fieldType: string;
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx
index a295f82e53afb..1233bb853f3a0 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { mockManagementPlugin } from '../../../../mocks';
 import { ScriptingWarningCallOut } from './warning_call_out';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx
index 875354de10e0f..59d40961ac218 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx
@@ -12,7 +12,7 @@ import { EuiCallOut, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../../types';
 
 export interface ScriptingWarningCallOutProps {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx
index 949032e57b71a..78993cf342d4d 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ScriptingHelpFlyout } from './help_flyout';
 
-import { DataView } from '../../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 import { ExecuteScript } from '../../types';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx
index 74bbb90a3d898..19e556d8d3349 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx
@@ -9,11 +9,11 @@
 import React from 'react';
 import { EuiFlyout, EuiFlyoutBody, EuiTabbedContent } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ScriptingSyntax } from './scripting_syntax';
 import { TestScript } from './test_script';
 
 import { ExecuteScript } from '../../types';
-import { DataView } from '../../../../../../data_views/public';
 
 interface ScriptingHelpFlyoutProps {
   indexPattern: DataView;
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx
index fe327bc0e0003..7f2d0e3e33360 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx
@@ -10,7 +10,7 @@ import React, { Fragment } from 'react';
 import { EuiCode, EuiIcon, EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../../types';
 
 export const ScriptingSyntax = () => {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
index 4b5609cf1970a..52bf882331698 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
@@ -25,9 +25,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
 import { Query, buildEsQuery } from '@kbn/es-query';
-import { getEsQueryConfig } from '../../../../../../../plugins/data/public';
-import { DataView } from '../../../../../../../plugins/data_views/public';
-import { context as contextType } from '../../../../../../kibana_react/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { context as contextType } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContextValue } from '../../../../types';
 import { ExecuteScript } from '../../types';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx b/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx
index 875b21ac52444..89f41e8b269ad 100644
--- a/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField, DataViewsContract } from 'src/plugins/data_views/public';
-import { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
+import { DataView, DataViewField, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { FieldEditor, FieldEdiorProps } from './field_editor';
@@ -39,8 +39,8 @@ jest.mock('@elastic/eui', () => ({
   euiPaletteColorBlind: () => ['red'],
 }));
 
-jest.mock('../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx b/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx
index 4455b554eb053..c9e74ba05448f 100644
--- a/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx
@@ -33,20 +33,16 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { PainlessLang } from '@kbn/monaco';
-import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '@kbn/field-types';
+import { DataView, DataViewField, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { context as contextType, CodeEditor } from '@kbn/kibana-react-plugin/public';
 import {
   getEnabledScriptingLanguages,
   getDeprecatedScriptingLanguages,
   getSupportedScriptingLanguages,
 } from '../../scripting_languages';
-import {
-  DataView,
-  DataViewField,
-  DataViewsPublicPluginStart,
-} from '../../../../../plugins/data_views/public';
-import { context as contextType, CodeEditor } from '../../../../kibana_react/public';
 import {
   ScriptingDisabledCallOut,
   ScriptingWarningCallOut,
diff --git a/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts b/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts
index 5bff350b332a0..655e8d9653efd 100644
--- a/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts
+++ b/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExecuteScriptParams, ExecuteScriptResult } from '../types';
 
 export const executeScript = async ({
diff --git a/src/plugins/data_view_management/public/components/field_editor/types.ts b/src/plugins/data_view_management/public/components/field_editor/types.ts
index e134b67d8ab72..440833fa04809 100644
--- a/src/plugins/data_view_management/public/components/field_editor/types.ts
+++ b/src/plugins/data_view_management/public/components/field_editor/types.ts
@@ -8,7 +8,7 @@
 
 import { ReactText } from 'react';
 import { Query } from '@kbn/es-query';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 export type SampleInput = ReactText | ReactText[] | Record<string, ReactText | ReactText[]>;
 export interface Sample {
diff --git a/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx
index 578a0b198bbe8..bff6ea4b82777 100644
--- a/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx
+++ b/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx
@@ -19,13 +19,13 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { RouteComponentProps, withRouter, useLocation } from 'react-router-dom';
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { reactRouterNavigate, useKibana } from '../../../../../plugins/kibana_react/public';
+import { reactRouterNavigate, useKibana } from '@kbn/kibana-react-plugin/public';
+import type { SpacesContextProps } from '@kbn/spaces-plugin/public';
 import { IndexPatternManagmentContext } from '../../types';
 import { IndexPatternTableItem } from '../types';
 import { getIndexPatterns } from '../utils';
 import { getListBreadcrumbs } from '../breadcrumbs';
 import { SpacesList } from './spaces_list';
-import type { SpacesContextProps } from '../../../../../../x-pack/plugins/spaces/public';
 import { removeDataView, RemoveDataViewProps } from '../edit_index_pattern';
 import { deleteModalMsg } from './delete_modal_msg';
 
diff --git a/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx b/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx
index fe616cf5abd64..b5ced1c8af9b5 100644
--- a/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx
+++ b/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx
@@ -9,12 +9,9 @@
 import React, { FC, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
-import type { Capabilities } from 'src/core/public';
-import type {
-  SpacesPluginStart,
-  ShareToSpaceFlyoutProps,
-} from '../../../../../../x-pack/plugins/spaces/public';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/public';
+import type { Capabilities } from '@kbn/core/public';
+import type { SpacesPluginStart, ShareToSpaceFlyoutProps } from '@kbn/spaces-plugin/public';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/public';
 
 interface Props {
   spacesApi: SpacesPluginStart;
diff --git a/src/plugins/data_view_management/public/components/utils.test.ts b/src/plugins/data_view_management/public/components/utils.test.ts
index cb318b79e223d..ef08442a31d9f 100644
--- a/src/plugins/data_view_management/public/components/utils.test.ts
+++ b/src/plugins/data_view_management/public/components/utils.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataViewsContract } from 'src/plugins/data_views/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { getIndexPatterns } from './utils';
 
 const indexPatternContractMock = {
diff --git a/src/plugins/data_view_management/public/components/utils.ts b/src/plugins/data_view_management/public/components/utils.ts
index 1fccc8c694e31..23b076ab05f5a 100644
--- a/src/plugins/data_view_management/public/components/utils.ts
+++ b/src/plugins/data_view_management/public/components/utils.ts
@@ -11,7 +11,7 @@ import {
   DataView,
   DataViewField,
   DataViewListItem,
-} from 'src/plugins/data_views/public';
+} from '@kbn/data-views-plugin/public';
 import { i18n } from '@kbn/i18n';
 
 const defaultIndexPatternListName = i18n.translate(
diff --git a/src/plugins/data_view_management/public/index.ts b/src/plugins/data_view_management/public/index.ts
index 65b71ee6053e3..2b7ad118e4985 100644
--- a/src/plugins/data_view_management/public/index.ts
+++ b/src/plugins/data_view_management/public/index.ts
@@ -17,7 +17,7 @@
  * in the setup/start interfaces in `plugin.ts`. The remaining items exported here are
  * either types, or static code.
  */
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { IndexPatternManagementPlugin } from './plugin';
 export type { IndexPatternManagementSetup, IndexPatternManagementStart } from './plugin';
 
diff --git a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
index 842ee8a966952..0ef1c47541302 100644
--- a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
@@ -12,10 +12,10 @@ import { Router, Switch, Route, Redirect } from 'react-router-dom';
 
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
-import { ManagementAppMountParams } from '../../../management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import {
   IndexPatternTableWithRouter,
   EditIndexPatternContainer,
diff --git a/src/plugins/data_view_management/public/mocks.ts b/src/plugins/data_view_management/public/mocks.ts
index 85c0e219d6a9f..f86a4cc724704 100644
--- a/src/plugins/data_view_management/public/mocks.ts
+++ b/src/plugins/data_view_management/public/mocks.ts
@@ -6,22 +6,22 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
-import { coreMock } from '../../../core/public/mocks';
-import { managementPluginMock } from '../../management/public/mocks';
-import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
-import { unifiedSearchPluginMock } from '../../unified_search/public/mocks';
-import { indexPatternFieldEditorPluginMock } from '../../data_view_field_editor/public/mocks';
-import { indexPatternEditorPluginMock } from '../../data_view_editor/public/mocks';
-import { dataViewPluginMocks } from '../../data_views/public/mocks';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { urlForwardingPluginMock } from '@kbn/url-forwarding-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
+import { indexPatternEditorPluginMock } from '@kbn/data-view-editor-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import {
   IndexPatternManagementSetup,
   IndexPatternManagementStart,
   IndexPatternManagementPlugin,
 } from './plugin';
 import { IndexPatternManagmentContext } from './types';
-import { fieldFormatsServiceMock } from '../../field_formats/public/mocks';
 
 const createSetupContract = (): IndexPatternManagementSetup => ({});
 
diff --git a/src/plugins/data_view_management/public/plugin.ts b/src/plugins/data_view_management/public/plugin.ts
index f78f81297dcb0..02ea4aac4421e 100644
--- a/src/plugins/data_view_management/public/plugin.ts
+++ b/src/plugins/data_view_management/public/plugin.ts
@@ -7,17 +7,17 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { PluginInitializerContext, CoreSetup, Plugin } from 'src/core/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { UrlForwardingSetup } from '../../url_forwarding/public';
-
-import { ManagementSetup } from '../../management/public';
-import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/public';
-import { DataViewEditorStart } from '../../data_view_editor/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
-import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
+import { PluginInitializerContext, CoreSetup, Plugin } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { UrlForwardingSetup } from '@kbn/url-forwarding-plugin/public';
+
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 
 export interface IndexPatternManagementSetupDependencies {
   management: ManagementSetup;
diff --git a/src/plugins/data_view_management/public/scripting_languages/index.ts b/src/plugins/data_view_management/public/scripting_languages/index.ts
index f01802786ea57..58be2a520e5fb 100644
--- a/src/plugins/data_view_management/public/scripting_languages/index.ts
+++ b/src/plugins/data_view_management/public/scripting_languages/index.ts
@@ -7,7 +7,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import { HttpStart, NotificationsStart } from 'src/core/public';
+import { HttpStart, NotificationsStart } from '@kbn/core/public';
 
 export function getSupportedScriptingLanguages(): estypes.ScriptLanguage[] {
   return ['painless'];
diff --git a/src/plugins/data_view_management/public/types.ts b/src/plugins/data_view_management/public/types.ts
index 53e576f32fcb7..56e9735a9001f 100644
--- a/src/plugins/data_view_management/public/types.ts
+++ b/src/plugins/data_view_management/public/types.ts
@@ -14,17 +14,17 @@ import {
   DocLinksStart,
   HttpSetup,
   ApplicationStart,
-} from 'src/core/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
-import { ManagementAppMountParams } from '../../management/public';
-import { IndexPatternManagementStart } from './index';
-import { KibanaReactContextValue } from '../../kibana_react/public';
-import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/public';
-import { DataViewEditorStart } from '../../data_view_editor/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { FieldFormatsStart } from '../../field_formats/public';
-import { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
+} from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { IndexPatternManagementStart } from '.';
 
 export interface IndexPatternManagmentContext {
   application: ApplicationStart;
diff --git a/src/plugins/data_view_management/server/index.ts b/src/plugins/data_view_management/server/index.ts
index 9bfa12d875493..77e1ddf010eaf 100644
--- a/src/plugins/data_view_management/server/index.ts
+++ b/src/plugins/data_view_management/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IndexPatternManagementPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/data_view_management/server/plugin.ts b/src/plugins/data_view_management/server/plugin.ts
index 4c6ec7e255b34..ad9722848116f 100644
--- a/src/plugins/data_view_management/server/plugin.ts
+++ b/src/plugins/data_view_management/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, Plugin } from 'src/core/server';
+import { PluginInitializerContext, CoreSetup, Plugin } from '@kbn/core/server';
 
 import { registerPreviewScriptedFieldRoute, registerResolveIndexRoute } from './routes';
 
diff --git a/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts b/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts
index 19e42c856fba5..296e6b5cd9d61 100644
--- a/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts
+++ b/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts
@@ -7,8 +7,8 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { registerPreviewScriptedFieldRoute } from './preview_scripted_field';
 
 describe('preview_scripted_field route', () => {
diff --git a/src/plugins/data_view_management/server/routes/preview_scripted_field.ts b/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
index 6756761fe9653..3a19872150a8b 100644
--- a/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
+++ b/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export function registerPreviewScriptedFieldRoute(router: IRouter): void {
   router.post(
@@ -24,7 +24,7 @@ export function registerPreviewScriptedFieldRoute(router: IRouter): void {
       },
     },
     async (context, request, res) => {
-      const client = context.core.elasticsearch.client.asCurrentUser;
+      const client = (await context.core).elasticsearch.client.asCurrentUser;
       const { index, name, script, query, additionalFields } = request.body;
 
       try {
diff --git a/src/plugins/data_view_management/server/routes/resolve_index.ts b/src/plugins/data_view_management/server/routes/resolve_index.ts
index f668fb1f1b8de..820e6de1c9d7d 100644
--- a/src/plugins/data_view_management/server/routes/resolve_index.ts
+++ b/src/plugins/data_view_management/server/routes/resolve_index.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export function registerResolveIndexRoute(router: IRouter): void {
   router.get(
@@ -31,7 +31,8 @@ export function registerResolveIndexRoute(router: IRouter): void {
       },
     },
     async (context, req, res) => {
-      const body = await context.core.elasticsearch.client.asCurrentUser.indices.resolveIndex({
+      const esClient = (await context.core).elasticsearch.client;
+      const body = await esClient.asCurrentUser.indices.resolveIndex({
         name: req.params.query,
         expand_wildcards: req.query.expand_wildcards || 'open',
       });
diff --git a/src/plugins/data_views/common/data_view.stub.ts b/src/plugins/data_views/common/data_view.stub.ts
index 2eb6d4f5d7813..a7323ad4a7d1a 100644
--- a/src/plugins/data_views/common/data_view.stub.ts
+++ b/src/plugins/data_views/common/data_view.stub.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
+import { SavedObject } from '@kbn/core/types';
 import { stubFieldSpecMap, stubLogstashFieldSpecMap } from './field.stub';
 import { createStubDataView } from './data_views/data_view.stub';
 export {
   createStubDataView,
   createStubDataView as createStubIndexPattern,
 } from './data_views/data_view.stub';
-import { SavedObject } from '../../../core/types';
 import { DataViewAttributes } from './types';
 
 export const stubDataView = createStubDataView({
diff --git a/src/plugins/data_views/common/data_views/data_view.stub.ts b/src/plugins/data_views/common/data_views/data_view.stub.ts
index bb7696b0e1262..a55c0800e784e 100644
--- a/src/plugins/data_views/common/data_views/data_view.stub.ts
+++ b/src/plugins/data_views/common/data_views/data_view.stub.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { DataView } from './data_view';
 import { DataViewSpec } from '../types';
-import { FieldFormatsStartCommon } from '../../../field_formats/common';
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
 
 /**
  * Create a custom stub index pattern. Use it in your unit tests where an {@link DataView} expected.
diff --git a/src/plugins/data_views/common/data_views/data_view.test.ts b/src/plugins/data_views/common/data_views/data_view.test.ts
index 514aba80bdb1e..f061772a60e04 100644
--- a/src/plugins/data_views/common/data_views/data_view.test.ts
+++ b/src/plugins/data_views/common/data_views/data_view.test.ts
@@ -10,12 +10,12 @@ import { map, last } from 'lodash';
 
 import { IndexPattern } from './data_view';
 
-import { CharacterNotAllowedInField } from '../../../kibana_utils/common';
+import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
 
 import { IndexPatternField } from '../fields';
 
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
-import { FieldFormat } from '../../../field_formats/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { RuntimeField, RuntimeTypeExceptComposite } from '../types';
 import { stubLogstashFields } from '../field.stub';
 import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts
index 4349fc11bced5..d04ff5ab63d31 100644
--- a/src/plugins/data_views/common/data_views/data_view.ts
+++ b/src/plugins/data_views/common/data_views/data_view.ts
@@ -11,18 +11,18 @@
 import _, { each, reject } from 'lodash';
 import { castEsToKbnFieldTypeName, ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/field-types';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
+import {
+  FieldFormatsStartCommon,
+  FieldFormat,
+  SerializedFieldFormat,
+} from '@kbn/field-formats-plugin/common';
 import { FieldAttrs, FieldAttrSet, DataViewAttributes } from '..';
 import type { RuntimeField, RuntimeFieldSpec, RuntimeType, FieldConfiguration } from '../types';
-import { CharacterNotAllowedInField } from '../../../kibana_utils/common';
 
-import { IIndexPattern, IFieldType } from '../../common';
+import { IIndexPattern, IFieldType } from '..';
 import { DataViewField, IIndexPatternFieldList, fieldList } from '../fields';
 import { flattenHitWrapper } from './flatten_hit';
-import {
-  FieldFormatsStartCommon,
-  FieldFormat,
-  SerializedFieldFormat,
-} from '../../../field_formats/common';
 import { DataViewSpec, TypeMeta, SourceFilter, DataViewFieldMap } from '../types';
 import { removeFieldAttrs } from './utils';
 
diff --git a/src/plugins/data_views/common/data_views/data_views.test.ts b/src/plugins/data_views/common/data_views/data_views.test.ts
index 642d0e842654b..ba2e62d457b9c 100644
--- a/src/plugins/data_views/common/data_views/data_views.test.ts
+++ b/src/plugins/data_views/common/data_views/data_views.test.ts
@@ -8,7 +8,7 @@
 
 import { defaults } from 'lodash';
 import { DataViewsService, DataView } from '.';
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 
 import { UiSettingsCommon, SavedObjectsClientCommon, SavedObject } from '../types';
 import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
diff --git a/src/plugins/data_views/common/data_views/data_views.ts b/src/plugins/data_views/common/data_views/data_views.ts
index 9a59179ef4a35..098e895324aa7 100644
--- a/src/plugins/data_views/common/data_views/data_views.ts
+++ b/src/plugins/data_views/common/data_views/data_views.ts
@@ -11,6 +11,8 @@
 import { i18n } from '@kbn/i18n';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
+import { FieldFormatsStartCommon, FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
 import {
   DATA_VIEW_SAVED_OBJECT_TYPE,
   DEFAULT_ASSETS_TO_IGNORE,
@@ -34,9 +36,7 @@ import {
   DataViewFieldMap,
   TypeMeta,
 } from '../types';
-import { FieldFormatsStartCommon, FORMATS_UI_SETTINGS } from '../../../field_formats/common/';
-import { META_FIELDS, SavedObject } from '../../common';
-import { SavedObjectNotFound } from '../../../kibana_utils/common';
+import { META_FIELDS, SavedObject } from '..';
 import { DataViewMissingIndices } from '../lib';
 import { findByTitle } from '../utils';
 import { DuplicateDataViewError, DataViewInsufficientAccessError } from '../errors';
diff --git a/src/plugins/data_views/common/data_views/flatten_hit.test.ts b/src/plugins/data_views/common/data_views/flatten_hit.test.ts
index 0946f30b85e39..24d5ee12885d2 100644
--- a/src/plugins/data_views/common/data_views/flatten_hit.test.ts
+++ b/src/plugins/data_views/common/data_views/flatten_hit.test.ts
@@ -8,7 +8,7 @@
 
 import { DataView } from './data_view';
 
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { flattenHitWrapper } from './flatten_hit';
 import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
 
diff --git a/src/plugins/data_views/common/expressions/load_index_pattern.ts b/src/plugins/data_views/common/expressions/load_index_pattern.ts
index 3c923597a5063..19bb928557988 100644
--- a/src/plugins/data_views/common/expressions/load_index_pattern.ts
+++ b/src/plugins/data_views/common/expressions/load_index_pattern.ts
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { DataViewsContract } from '../data_views';
 import { DataViewSpec } from '..';
-import { SavedObjectReference } from '../../../../core/types';
 
 const name = 'indexPatternLoad';
 const type = 'index_pattern';
diff --git a/src/plugins/data_views/common/fields/data_view_field.test.ts b/src/plugins/data_views/common/fields/data_view_field.test.ts
index 72fbd96d40b65..2bf2c5490f2b0 100644
--- a/src/plugins/data_views/common/fields/data_view_field.test.ts
+++ b/src/plugins/data_views/common/fields/data_view_field.test.ts
@@ -10,7 +10,7 @@ import { IndexPatternField } from './data_view_field';
 import { IndexPattern } from '..';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import { FieldSpec, RuntimeField } from '../types';
-import { FieldFormat } from '../../../field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 describe('Field', function () {
   function flatten(obj: Record<string, any>) {
diff --git a/src/plugins/data_views/common/fields/fields.mocks.ts b/src/plugins/data_views/common/fields/fields.mocks.ts
index 22036f262c2d1..05a51d7ccf120 100644
--- a/src/plugins/data_views/common/fields/fields.mocks.ts
+++ b/src/plugins/data_views/common/fields/fields.mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IFieldType } from './types';
+import { FieldSpec } from '..';
 
-export const fields: IFieldType[] = [
+export const fields: FieldSpec[] = [
   {
     name: 'bytes',
     type: 'number',
@@ -308,4 +308,4 @@ export const fields: IFieldType[] = [
   },
 ];
 
-export const getField = (name: string) => fields.find((field) => field.name === name) as IFieldType;
+export const getField = (name: string) => fields.find((field) => field.name === name) as FieldSpec;
diff --git a/src/plugins/data_views/common/lib/get_title.ts b/src/plugins/data_views/common/lib/get_title.ts
index 69471583f139c..b955fb815dfdf 100644
--- a/src/plugins/data_views/common/lib/get_title.ts
+++ b/src/plugins/data_views/common/lib/get_title.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from '../../../../core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../constants';
 import { DataViewAttributes } from '../types';
 
diff --git a/src/plugins/data_views/common/types.ts b/src/plugins/data_views/common/types.ts
index 606128d484ddb..4032d83b24c5a 100644
--- a/src/plugins/data_views/common/types.ts
+++ b/src/plugins/data_views/common/types.ts
@@ -7,15 +7,15 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { DataViewFieldBase, IFieldSubType, DataViewBase } from '@kbn/es-query';
-import { ToastInputFields, ErrorToastOptions } from 'src/core/public/notifications';
+import { ToastInputFields, ErrorToastOptions } from '@kbn/core/public/notifications';
 // eslint-disable-next-line
 import type { SavedObject } from 'src/core/server';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { FieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { IFieldType } from './fields';
 import { RUNTIME_FIELD_TYPES } from './constants';
 import { DataViewField } from './fields';
-import { FieldFormat, SerializedFieldFormat } from '../../field_formats/common';
 
 export type { QueryDslQueryContainer };
 
diff --git a/src/plugins/data_views/public/data_views/data_view.stub.ts b/src/plugins/data_views/public/data_views/data_view.stub.ts
index f37a8a78b234b..b396807beb510 100644
--- a/src/plugins/data_views/public/data_views/data_view.stub.ts
+++ b/src/plugins/data_views/public/data_views/data_view.stub.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
-import { FieldFormatsStartCommon } from '../../../field_formats/common';
-import { getFieldFormatsRegistry } from '../../../field_formats/public/mocks';
+import { CoreSetup } from '@kbn/core/public';
+import { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
+import { getFieldFormatsRegistry } from '@kbn/field-formats-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import * as commonStubs from '../../common/stubs';
 import { DataView, DataViewSpec } from '../../common';
-import { coreMock } from '../../../../core/public/mocks';
 /**
  * Create a custom stub index pattern. Use it in your unit tests where an {@link DataView} expected.
  * @param spec - Serialized index pattern object
diff --git a/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts b/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
index 2fd17b98f7498..5880bd9fd36fa 100644
--- a/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
+++ b/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { setup } from '../../../../core/test_helpers/http_test_setup';
+import { setup } from '@kbn/core/test_helpers/http_test_setup';
 
 export const { http } = setup((injectedMetadata) => {
   injectedMetadata.getBasePath.mockReturnValue('/hola/daro/');
diff --git a/src/plugins/data_views/public/data_views/data_views_api_client.ts b/src/plugins/data_views/public/data_views/data_views_api_client.ts
index 9a15f19630718..42aa03882de58 100644
--- a/src/plugins/data_views/public/data_views/data_views_api_client.ts
+++ b/src/plugins/data_views/public/data_views/data_views_api_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { DataViewMissingIndices } from '../../common/lib';
 import { GetFieldsOptions, IDataViewsApiClient, GetFieldsOptionsTimePattern } from '../../common';
 
diff --git a/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx b/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx
index fc7b8c9eb42b6..3ddfd24f687af 100644
--- a/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx
+++ b/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx
@@ -9,8 +9,8 @@
 import { EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { CoreStart } from 'kibana/public';
-import { toMountPoint } from '../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 let bannerId: string;
 
diff --git a/src/plugins/data_views/public/expressions/load_index_pattern.ts b/src/plugins/data_views/public/expressions/load_index_pattern.ts
index 76119f3e50a45..5373dfd4864d8 100644
--- a/src/plugins/data_views/public/expressions/load_index_pattern.ts
+++ b/src/plugins/data_views/public/expressions/load_index_pattern.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import {
   getIndexPatternLoadMeta,
   IndexPatternLoadExpressionFunctionDefinition,
diff --git a/src/plugins/data_views/public/plugin.ts b/src/plugins/data_views/public/plugin.ts
index eb05e2ab209fc..95378df130c46 100644
--- a/src/plugins/data_views/public/plugin.ts
+++ b/src/plugins/data_views/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { getIndexPatternLoad } from './expressions';
 import {
   DataViewsPublicPluginSetup,
diff --git a/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts b/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts
index 124a66eba57f2..faf497c60ba31 100644
--- a/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts
+++ b/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectsClientPublicToCommon } from './saved_objects_client_wrapper';
-import { savedObjectsServiceMock } from 'src/core/public/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
 
 import { DataViewSavedObjectConflictError } from '../common';
 
diff --git a/src/plugins/data_views/public/saved_objects_client_wrapper.ts b/src/plugins/data_views/public/saved_objects_client_wrapper.ts
index a5bc83546e3bb..907c964bd4632 100644
--- a/src/plugins/data_views/public/saved_objects_client_wrapper.ts
+++ b/src/plugins/data_views/public/saved_objects_client_wrapper.ts
@@ -7,7 +7,7 @@
  */
 
 import { omit } from 'lodash';
-import { SavedObjectsClient, SimpleSavedObject } from 'src/core/public';
+import { SavedObjectsClient, SimpleSavedObject } from '@kbn/core/public';
 import {
   SavedObjectsClientCommon,
   SavedObjectsClientCommonFindArgs,
diff --git a/src/plugins/data_views/public/services/has_data.test.ts b/src/plugins/data_views/public/services/has_data.test.ts
index 3d1fcef1100bd..c13fffe9fc475 100644
--- a/src/plugins/data_views/public/services/has_data.test.ts
+++ b/src/plugins/data_views/public/services/has_data.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { HasData } from './has_data';
 
diff --git a/src/plugins/data_views/public/services/has_data.ts b/src/plugins/data_views/public/services/has_data.ts
index 628f68140603a..76f6b39ec4982 100644
--- a/src/plugins/data_views/public/services/has_data.ts
+++ b/src/plugins/data_views/public/services/has_data.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, HttpStart } from 'kibana/public';
+import { CoreStart, HttpStart } from '@kbn/core/public';
 import { DEFAULT_ASSETS_TO_IGNORE } from '../../common';
-import { HasDataViewsResponse, IndicesResponse, IndicesResponseModified } from '../';
+import { HasDataViewsResponse, IndicesResponse, IndicesResponseModified } from '..';
 
 export class HasData {
   private removeAliases = (source: IndicesResponseModified): boolean => !source.item.indices;
diff --git a/src/plugins/data_views/public/types.ts b/src/plugins/data_views/public/types.ts
index 5e9f769ba6cb4..612f22335e72a 100644
--- a/src/plugins/data_views/public/types.ts
+++ b/src/plugins/data_views/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DataViewsServicePublicMethods } from './data_views';
 import { HasDataService } from '../common';
 
diff --git a/src/plugins/data_views/public/ui_settings_wrapper.ts b/src/plugins/data_views/public/ui_settings_wrapper.ts
index 91806867b6730..3474451ad720f 100644
--- a/src/plugins/data_views/public/ui_settings_wrapper.ts
+++ b/src/plugins/data_views/public/ui_settings_wrapper.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from 'src/core/public';
+import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from '@kbn/core/public';
 import { UiSettingsCommon } from '../common';
 
 export class UiSettingsPublicToCommon implements UiSettingsCommon {
diff --git a/src/plugins/data_views/server/data_views_service_factory.ts b/src/plugins/data_views/server/data_views_service_factory.ts
index e575362b8c34d..570ced7b62580 100644
--- a/src/plugins/data_views/server/data_views_service_factory.ts
+++ b/src/plugins/data_views/server/data_views_service_factory.ts
@@ -13,9 +13,9 @@ import {
   UiSettingsServiceStart,
   KibanaRequest,
   CoreStart,
-} from 'kibana/server';
+} from '@kbn/core/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { DataViewsService } from '../common';
-import { FieldFormatsStart } from '../../field_formats/server';
 import { UiSettingsServerToCommon } from './ui_settings_wrapper';
 import { IndexPatternsApiServer } from './index_patterns_api_client';
 import { SavedObjectsClientServerToCommon } from './saved_objects_client_wrapper';
diff --git a/src/plugins/data_views/server/deprecations/scripted_fields.ts b/src/plugins/data_views/server/deprecations/scripted_fields.ts
index 0d668466ff099..198a44ed45555 100644
--- a/src/plugins/data_views/server/deprecations/scripted_fields.ts
+++ b/src/plugins/data_views/server/deprecations/scripted_fields.ts
@@ -11,7 +11,7 @@ import {
   DeprecationsDetails,
   GetDeprecationsContext,
   RegisterDeprecationsConfig,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { DataViewAttributes } from '../../common';
 
diff --git a/src/plugins/data_views/server/expressions/load_index_pattern.ts b/src/plugins/data_views/server/expressions/load_index_pattern.ts
index 8604709e81582..091a6aa2c3817 100644
--- a/src/plugins/data_views/server/expressions/load_index_pattern.ts
+++ b/src/plugins/data_views/server/expressions/load_index_pattern.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, StartServicesAccessor } from 'src/core/server';
+import { KibanaRequest, StartServicesAccessor } from '@kbn/core/server';
 
 import {
   getIndexPatternLoadMeta,
diff --git a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts
index 8f1749a4b61fa..b9925838fa975 100644
--- a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts
+++ b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts
@@ -8,7 +8,7 @@
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { IndexPatternsFetcher } from '.';
-import { elasticsearchServiceMock } from '../../../../core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import * as indexNotFoundException from './index_not_found_exception.json';
 
 describe('Index Pattern Fetcher - server', () => {
diff --git a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
index dce48a6d96208..ceb01333c5ff0 100644
--- a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
+++ b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { keyBy } from 'lodash';
 import type { QueryDslQueryContainer } from '../../common/types';
 
diff --git a/src/plugins/data_views/server/fetcher/lib/es_api.ts b/src/plugins/data_views/server/fetcher/lib/es_api.ts
index fe0a8fb126aec..6e611994ee394 100644
--- a/src/plugins/data_views/server/fetcher/lib/es_api.ts
+++ b/src/plugins/data_views/server/fetcher/lib/es_api.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { QueryDslQueryContainer } from '../../../common/types';
 import { convertEsError } from './errors';
 
diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js
index 88486172942c0..88e91749b11d8 100644
--- a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js
+++ b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js
@@ -10,7 +10,7 @@
 import sinon from 'sinon';
 import { identity, shuffle, sortBy } from 'lodash';
 
-import { getFieldCapabilities } from '../field_capabilities';
+import { getFieldCapabilities } from '.';
 
 import { callFieldCapsApi } from '../es_api';
 import * as callFieldCapsApiNS from '../es_api';
diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts
index 9f52c784adda3..875ebb2490613 100644
--- a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -8,7 +8,7 @@
 
 import { defaults, keyBy, sortBy } from 'lodash';
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { callFieldCapsApi } from '../es_api';
 import { readFieldCapsResponse } from './field_caps_response';
 import { mergeOverrides } from './overrides';
diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
index 75bede61e10d8..2581b2b78f5d8 100644
--- a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -10,7 +10,7 @@ import { uniq } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
 import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
-import { FieldDescriptor } from '../../../fetcher';
+import { FieldDescriptor } from '../..';
 
 /**
  *  Read the response from the _field_caps API to determine the type and
diff --git a/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts
index 0d487cae4ef41..f0da3c6dffeaa 100644
--- a/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts
+++ b/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts
@@ -9,7 +9,7 @@
 import { chain } from 'lodash';
 import moment from 'moment';
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { timePatternToWildcard } from './time_pattern_to_wildcard';
 import { callIndexAliasApi } from './es_api';
diff --git a/src/plugins/data_views/server/has_user_index_pattern.test.ts b/src/plugins/data_views/server/has_user_index_pattern.test.ts
index f50462cd7ea5e..29b5473e8f974 100644
--- a/src/plugins/data_views/server/has_user_index_pattern.test.ts
+++ b/src/plugins/data_views/server/has_user_index_pattern.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { hasUserIndexPattern } from './has_user_index_pattern';
-import { elasticsearchServiceMock, savedObjectsClientMock } from '../../../core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 describe('hasUserIndexPattern', () => {
   const esClient = elasticsearchServiceMock.createScopedClusterClient().asCurrentUser;
diff --git a/src/plugins/data_views/server/has_user_index_pattern.ts b/src/plugins/data_views/server/has_user_index_pattern.ts
index b844c2f741258..b2ef306054582 100644
--- a/src/plugins/data_views/server/has_user_index_pattern.ts
+++ b/src/plugins/data_views/server/has_user_index_pattern.ts
@@ -10,7 +10,7 @@ import {
   ElasticsearchClient,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from '../../../core/server';
+} from '@kbn/core/server';
 import { IndexPatternSavedObjectAttrs } from '../common/data_views';
 import { DEFAULT_ASSETS_TO_IGNORE } from '../common/constants';
 
diff --git a/src/plugins/data_views/server/index.ts b/src/plugins/data_views/server/index.ts
index 4ba79373ee5bb..6558d75c50a46 100644
--- a/src/plugins/data_views/server/index.ts
+++ b/src/plugins/data_views/server/index.ts
@@ -16,7 +16,7 @@ export {
 } from './fetcher';
 export type { IndexPatternsServiceStart } from './types';
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DataViewsServerPlugin } from './plugin';
 import { DataViewsServerPluginSetup, DataViewsServerPluginStart } from './types';
 export type { dataViewsServiceFactory } from './data_views_service_factory';
diff --git a/src/plugins/data_views/server/index_patterns_api_client.ts b/src/plugins/data_views/server/index_patterns_api_client.ts
index 4f036449fe7ee..d4b4118e06bc8 100644
--- a/src/plugins/data_views/server/index_patterns_api_client.ts
+++ b/src/plugins/data_views/server/index_patterns_api_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   GetFieldsOptions,
   GetFieldsOptionsTimePattern,
diff --git a/src/plugins/data_views/server/mocks.ts b/src/plugins/data_views/server/mocks.ts
index 63dd54f771bc1..361daf4b937d4 100644
--- a/src/plugins/data_views/server/mocks.ts
+++ b/src/plugins/data_views/server/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { DataViewsService } from '../common';
 
 export function createIndexPatternsStartMock() {
   const dataViewsServiceFactory = jest.fn().mockResolvedValue({ get: jest.fn() });
diff --git a/src/plugins/data_views/server/plugin.ts b/src/plugins/data_views/server/plugin.ts
index 7884db67a9d9c..6ec356a150bd5 100644
--- a/src/plugins/data_views/server/plugin.ts
+++ b/src/plugins/data_views/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { dataViewsServiceFactory } from './data_views_service_factory';
 import { registerRoutes } from './routes';
 import { dataViewSavedObjectType } from './saved_objects';
diff --git a/src/plugins/data_views/server/register_index_pattern_usage_collection.ts b/src/plugins/data_views/server/register_index_pattern_usage_collection.ts
index 5b42db0f75a4d..9c005d531da23 100644
--- a/src/plugins/data_views/server/register_index_pattern_usage_collection.ts
+++ b/src/plugins/data_views/server/register_index_pattern_usage_collection.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { StartServicesAccessor } from 'src/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { StartServicesAccessor } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 import { DataViewsContract } from '../common';
-import { SavedObjectsClient } from '../../../core/server';
 import { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from './types';
 
 interface CountSummary {
diff --git a/src/plugins/data_views/server/rest_api_routes/create_data_view.ts b/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
index 00e6e94887f50..c35344f54c4fa 100644
--- a/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewSpec, DataViewsService } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewSpec, DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
 import { fieldSpecSchema, runtimeFieldSchema, serializedFieldFormatSchema } from './util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import {
   DATA_VIEW_PATH,
@@ -94,8 +94,9 @@ const registerCreateDataViewRouteFactory =
       },
       router.handleLegacyErrors(
         handleErrors(async (ctx, req, res) => {
-          const savedObjectsClient = ctx.core.savedObjects.client;
-          const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+          const core = await ctx.core;
+          const savedObjectsClient = core.savedObjects.client;
+          const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
           const [, , { dataViewsServiceFactory }] = await getStartServices();
 
           const dataViewsService = await dataViewsServiceFactory(
diff --git a/src/plugins/data_views/server/rest_api_routes/default_data_view.ts b/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
index b2f6c3b633724..7ce241176228e 100644
--- a/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService } from 'src/plugins/data_views/common';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import { handleErrors } from './util/handle_errors';
 import { SERVICE_PATH, SERVICE_PATH_LEGACY, SERVICE_KEY, SERVICE_KEY_LEGACY } from '../constants';
@@ -64,8 +64,9 @@ const manageDefaultIndexPatternRoutesFactory =
         validate: {},
       },
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
@@ -103,8 +104,9 @@ const manageDefaultIndexPatternRoutesFactory =
         },
       },
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts b/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
index 277fb7daf9e5d..b3fd0b8a041c8 100644
--- a/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import { SPECIFIC_DATA_VIEW_PATH, SPECIFIC_DATA_VIEW_PATH_LEGACY } from '../constants';
 
@@ -58,8 +58,9 @@ const deleteIndexPatternRouteFactory =
       },
       router.handleLegacyErrors(
         handleErrors(async (ctx, req, res) => {
-          const savedObjectsClient = ctx.core.savedObjects.client;
-          const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+          const core = await ctx.core;
+          const savedObjectsClient = core.savedObjects.client;
+          const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
           const [, , { dataViewsServiceFactory }] = await getStartServices();
           const dataViewsService = await dataViewsServiceFactory(
             savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts
index 453d6c90e5cc6..14a03bce748ff 100644
--- a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts
@@ -9,7 +9,7 @@
 import { updateFields } from './update_fields';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('create runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
index 8e1d1686e2e24..d99aa67c7f153 100644
--- a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
+++ b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { FieldFormatParams, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { DataViewsService } from '../../../common';
 import { handleErrors } from '../util/handle_errors';
 import { serializedFieldFormatSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
-import { FieldFormatParams, SerializedFieldFormat } from '../../../../field_formats/common';
 import type {
   DataViewsServerPluginStartDependencies,
   DataViewsServerPluginStart,
@@ -134,8 +134,9 @@ const updateFieldsActionRouteFactory = (path: string, serviceKey: string) => {
       },
       router.handleLegacyErrors(
         handleErrors(async (ctx, req, res) => {
-          const savedObjectsClient = ctx.core.savedObjects.client;
-          const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+          const core = await ctx.core;
+          const savedObjectsClient = core.savedObjects.client;
+          const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
           const [, , { dataViewsServiceFactory }] = await getStartServices();
           const dataViewsService = await dataViewsServiceFactory(
             savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/get_data_view.ts b/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
index e943165adebab..86185fb0b2777 100644
--- a/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import {
   SPECIFIC_DATA_VIEW_PATH,
@@ -63,8 +63,9 @@ const getDataViewRouteFactory =
       },
       router.handleLegacyErrors(
         handleErrors(async (ctx, req, res) => {
-          const savedObjectsClient = ctx.core.savedObjects.client;
-          const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+          const core = await ctx.core;
+          const savedObjectsClient = core.savedObjects.client;
+          const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
           const [, , { dataViewsServiceFactory }] = await getStartServices();
           const dataViewsService = await dataViewsServiceFactory(
             savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts b/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
index f684f346dbd6d..1031a04456b47 100644
--- a/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsService } from 'src/plugins/data_views/common';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import { SERVICE_PATH, SERVICE_PATH_LEGACY } from '../constants';
 
@@ -45,8 +45,9 @@ const hasUserDataViewRouteFactory =
       },
       router.handleLegacyErrors(
         handleErrors(async (ctx, req, res) => {
-          const savedObjectsClient = ctx.core.savedObjects.client;
-          const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+          const core = await ctx.core;
+          const savedObjectsClient = core.savedObjects.client;
+          const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
           const [, , { dataViewsServiceFactory }] = await getStartServices();
 
           const dataViewsService = await dataViewsServiceFactory(
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts
index ac2e6bc54fe15..2f15f7911cba6 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { createRuntimeField } from './create_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('create runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
index 8753e58c8e240..5c9faaf2c8593 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService, RuntimeField } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService, RuntimeField } from '../../../common';
 import { handleErrors } from '../util/handle_errors';
 import { runtimeFieldSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -92,8 +92,9 @@ const runtimeCreateFieldRouteFactory =
         },
       },
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts
index 8262916e9ef4e..8f36cde01afb1 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { deleteRuntimeField } from './delete_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('delete runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
index b846eb74771d9..e7db34f43cf37 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -73,8 +73,9 @@ const deleteRuntimeFieldRouteFactory =
         },
       },
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts
index 2552e88d5725a..00f15bab6aa3d 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { getRuntimeField } from './get_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('get runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
index b8f87a21b819f..867766eec3124 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -80,8 +80,9 @@ const getRuntimeFieldRouteFactory =
       },
 
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts
index 62d56d46d38fa..a6ec75de0d37f 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { putRuntimeField } from './put_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('put runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
index a50fe84133159..0f5399606dfdc 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService, RuntimeField } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService, RuntimeField } from '../../../common';
 import { handleErrors } from '../util/handle_errors';
 import { runtimeFieldSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -92,8 +92,9 @@ const putRuntimeFieldRouteFactory =
         },
       },
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts
index 3152ac1be91c2..e7718341a4a59 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts
@@ -8,7 +8,7 @@
 
 import { responseFormatter } from './response_formatter';
 import { SERVICE_KEY, SERVICE_KEY_LEGACY } from '../../constants';
-import { DataView, DataViewField } from 'src/plugins/data_views/common';
+import { DataView, DataViewField } from '../../../common';
 
 const dataView = {
   toSpec: () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts
index 7764f5bf0974b..83dc31b4b713d 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from 'src/plugins/data_views/common';
+import { DataView, DataViewField } from '../../../common';
 import { SERVICE_KEY_LEGACY, SERVICE_KEY_TYPE, SERVICE_KEY } from '../../constants';
 
 interface ResponseFormatterArgs {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts
index f3ca214b41d0f..da3c0df626701 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { updateRuntimeField } from './update_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('update runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
index 27893ff1b7c05..1aaf1b112feed 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService, RuntimeField } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService, RuntimeField } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
 import { runtimeFieldSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -93,8 +93,9 @@ const updateRuntimeFieldRouteFactory =
         },
       },
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { dataViewsServiceFactory }] = await getStartServices();
         const dataViewsService = await dataViewsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
index b3660f5841442..759627f926762 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { handleErrors } from '../util/handle_errors';
 import { fieldSpecSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -42,8 +42,9 @@ export const registerCreateScriptedFieldRoute = (
     },
     router.handleLegacyErrors(
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { indexPatternsServiceFactory }] = await getStartServices();
         const indexPatternsService = await indexPatternsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
index 628ba9fb41aa1..7e3333820e4e9 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -43,8 +43,9 @@ export const registerDeleteScriptedFieldRoute = (
     },
     router.handleLegacyErrors(
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { indexPatternsServiceFactory }] = await getStartServices();
         const indexPatternsService = await indexPatternsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
index 82f14faaaed99..befe30f8437f2 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -43,8 +43,9 @@ export const registerGetScriptedFieldRoute = (
     },
     router.handleLegacyErrors(
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { indexPatternsServiceFactory }] = await getStartServices();
         const indexPatternsService = await indexPatternsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
index bd79203b1161f..93312dd6d3cf6 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { handleErrors } from '../util/handle_errors';
 import { fieldSpecSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -42,8 +42,9 @@ export const registerPutScriptedFieldRoute = (
     },
     router.handleLegacyErrors(
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { indexPatternsServiceFactory }] = await getStartServices();
         const indexPatternsService = await indexPatternsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
index fba7488a83a24..ddc9d7ae552e8 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
@@ -7,11 +7,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { FieldSpec } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { FieldSpec } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
 import { fieldSpecSchemaFields } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
@@ -63,8 +63,9 @@ export const registerUpdateScriptedFieldRoute = (
     },
     router.handleLegacyErrors(
       handleErrors(async (ctx, req, res) => {
-        const savedObjectsClient = ctx.core.savedObjects.client;
-        const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+        const core = await ctx.core;
+        const savedObjectsClient = core.savedObjects.client;
+        const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
         const [, , { indexPatternsServiceFactory }] = await getStartServices();
         const indexPatternsService = await indexPatternsServiceFactory(
           savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
index e71ae8c8ec88e..424680f85b498 100644
--- a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
@@ -7,11 +7,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { DataViewSpec, DataViewsService } from 'src/plugins/data_views/common';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewSpec, DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
 import { fieldSpecSchema, runtimeFieldSchema, serializedFieldFormatSchema } from './util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import {
   SPECIFIC_DATA_VIEW_PATH,
@@ -161,8 +161,9 @@ const updateDataViewRouteFactory =
       },
       router.handleLegacyErrors(
         handleErrors(async (ctx, req, res) => {
-          const savedObjectsClient = ctx.core.savedObjects.client;
-          const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+          const core = await ctx.core;
+          const savedObjectsClient = core.savedObjects.client;
+          const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
           const [, , { dataViewsServiceFactory }] = await getStartServices();
 
           const dataViewsService = await dataViewsServiceFactory(
diff --git a/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts b/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts
index f49e6394fd007..c828e064fce84 100644
--- a/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts
+++ b/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandler, RouteMethod, RequestHandlerContext } from 'src/core/server';
+import type { RequestHandler, RouteMethod, RequestHandlerContext } from '@kbn/core/server';
 import { ErrorIndexPatternNotFound } from '../../error';
 
 interface ErrorResponseBody {
diff --git a/src/plugins/data_views/server/routes.ts b/src/plugins/data_views/server/routes.ts
index f21d951cab007..8f6299a58870a 100644
--- a/src/plugins/data_views/server/routes.ts
+++ b/src/plugins/data_views/server/routes.ts
@@ -7,8 +7,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { HttpServiceSetup, StartServicesAccessor } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { HttpServiceSetup, StartServicesAccessor } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { IndexPatternsFetcher } from './fetcher';
 import { routes } from './rest_api_routes';
 import type { DataViewsServerPluginStart, DataViewsServerPluginStartDependencies } from './types';
@@ -56,7 +56,7 @@ export function registerRoutes(
       },
     },
     async (context, request, response) => {
-      const { asCurrentUser } = context.core.elasticsearch.client;
+      const { asCurrentUser } = (await context.core).elasticsearch.client;
       const indexPatterns = new IndexPatternsFetcher(asCurrentUser);
       const { pattern, interval, look_back: lookBack, meta_fields: metaFields } = request.query;
 
diff --git a/src/plugins/data_views/server/routes/fields_for.ts b/src/plugins/data_views/server/routes/fields_for.ts
index 77d39a6ea5d8b..3ad854ab0d6ac 100644
--- a/src/plugins/data_views/server/routes/fields_for.ts
+++ b/src/plugins/data_views/server/routes/fields_for.ts
@@ -12,7 +12,7 @@ import {
   StartServicesAccessor,
   RequestHandler,
   RouteValidatorFullConfig,
-} from '../../../../core/server';
+} from '@kbn/core/server';
 import type { DataViewsServerPluginStart, DataViewsServerPluginStartDependencies } from '../types';
 import { IndexPatternsFetcher } from '../fetcher';
 
@@ -51,7 +51,7 @@ const validate: RouteValidatorFullConfig<{}, IQuery, IBody> = {
   body: schema.maybe(schema.object({ index_filter: schema.any() })),
 };
 const handler: RequestHandler<{}, IQuery, IBody> = async (context, request, response) => {
-  const { asCurrentUser } = context.core.elasticsearch.client;
+  const { asCurrentUser } = (await context.core).elasticsearch.client;
   const indexPatterns = new IndexPatternsFetcher(asCurrentUser);
   const {
     pattern,
diff --git a/src/plugins/data_views/server/routes/has_data_views.test.ts b/src/plugins/data_views/server/routes/has_data_views.test.ts
index 1468026ad66e2..70967ce85edf3 100644
--- a/src/plugins/data_views/server/routes/has_data_views.test.ts
+++ b/src/plugins/data_views/server/routes/has_data_views.test.ts
@@ -7,8 +7,8 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { registerHasDataViewsRoute } from './has_data_views';
 
 describe('preview has_data_views route', () => {
diff --git a/src/plugins/data_views/server/routes/has_data_views.ts b/src/plugins/data_views/server/routes/has_data_views.ts
index 80204221b0aa4..c4982311ce156 100644
--- a/src/plugins/data_views/server/routes/has_data_views.ts
+++ b/src/plugins/data_views/server/routes/has_data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from '../../../../core/server';
+import { IRouter } from '@kbn/core/server';
 import { getIndexPattern, hasUserIndexPattern } from '../has_user_index_pattern';
 
 export const registerHasDataViewsRoute = (router: IRouter): void => {
@@ -16,8 +16,9 @@ export const registerHasDataViewsRoute = (router: IRouter): void => {
       validate: {},
     },
     async (ctx, req, res) => {
-      const savedObjectsClient = ctx.core.savedObjects.client;
-      const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+      const core = await ctx.core;
+      const savedObjectsClient = core.savedObjects.client;
+      const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
       const dataViews = await getIndexPattern({
         esClient: elasticsearchClient,
         soClient: savedObjectsClient,
diff --git a/src/plugins/data_views/server/saved_objects/data_views.ts b/src/plugins/data_views/server/saved_objects/data_views.ts
index 4c54acadee9bc..6319911f3bfd5 100644
--- a/src/plugins/data_views/server/saved_objects/data_views.ts
+++ b/src/plugins/data_views/server/saved_objects/data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsType } from 'kibana/server';
+import type { SavedObjectsType } from '@kbn/core/server';
 import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations';
 import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
 
diff --git a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts
index 7d8ca120d6d6a..7f4d3a912b246 100644
--- a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts
+++ b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectMigrationContext } from 'kibana/server';
+import { SavedObjectMigrationContext } from '@kbn/core/server';
 import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
diff --git a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts
index fc5c5afb3d551..d92b39e8a6c24 100644
--- a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts
+++ b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts
@@ -7,7 +7,7 @@
  */
 
 import { flow, omit } from 'lodash';
-import { SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 
 const migrateAttributeTypeAndAttributeTypeMeta: SavedObjectMigrationFn<any, any> = (doc) => ({
   ...doc,
diff --git a/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts b/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts
index 955028c0f9bf2..561dfd2df7d90 100644
--- a/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts
+++ b/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 /**
  * Drop the previous document's attributes, which report `averageDuration` incorrectly.
diff --git a/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts b/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts
index b03532421ecab..bd7983abd46a9 100644
--- a/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts
+++ b/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectsClientServerToCommon } from './saved_objects_client_wrapper';
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { DataViewSavedObjectConflictError } from '../common';
 
diff --git a/src/plugins/data_views/server/saved_objects_client_wrapper.ts b/src/plugins/data_views/server/saved_objects_client_wrapper.ts
index e00eb9e3375a8..85b7710614536 100644
--- a/src/plugins/data_views/server/saved_objects_client_wrapper.ts
+++ b/src/plugins/data_views/server/saved_objects_client_wrapper.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract, SavedObject } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObject } from '@kbn/core/server';
 import {
   SavedObjectsClientCommon,
   SavedObjectsClientCommonFindArgs,
diff --git a/src/plugins/data_views/server/types.ts b/src/plugins/data_views/server/types.ts
index 343661e1840ba..5e366b328275b 100644
--- a/src/plugins/data_views/server/types.ts
+++ b/src/plugins/data_views/server/types.ts
@@ -11,11 +11,11 @@ import {
   SavedObjectsClientContract,
   ElasticsearchClient,
   KibanaRequest,
-} from 'kibana/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { DataViewsService } from '../common';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../field_formats/server';
 
 type ServiceFactory = (
   savedObjectsClient: SavedObjectsClientContract,
diff --git a/src/plugins/data_views/server/ui_settings_wrapper.ts b/src/plugins/data_views/server/ui_settings_wrapper.ts
index f42d43c1c24f4..51f23d7de4cd6 100644
--- a/src/plugins/data_views/server/ui_settings_wrapper.ts
+++ b/src/plugins/data_views/server/ui_settings_wrapper.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import { UiSettingsCommon } from '../common';
 
 export class UiSettingsServerToCommon implements UiSettingsCommon {
diff --git a/src/plugins/data_views/server/utils.ts b/src/plugins/data_views/server/utils.ts
index a3b6aeb5e8c26..d5d6082dc5ab8 100644
--- a/src/plugins/data_views/server/utils.ts
+++ b/src/plugins/data_views/server/utils.ts
@@ -6,19 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import {
-  IFieldType,
-  DATA_VIEW_SAVED_OBJECT_TYPE,
-  DataViewAttributes,
-  SavedObject,
-} from '../common';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE, DataViewAttributes, SavedObject, FieldSpec } from '../common';
 
 export const getFieldByName = (
   fieldName: string,
   indexPattern: SavedObject<DataViewAttributes>
-): IFieldType | undefined => {
-  const fields: IFieldType[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
+): FieldSpec | undefined => {
+  const fields: FieldSpec[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
   const field = fields && fields.find((f) => f.name === fieldName);
 
   return field;
diff --git a/src/plugins/dev_tools/public/application.tsx b/src/plugins/dev_tools/public/application.tsx
index fa4796a7fb0cb..1a1d7ca9fb430 100644
--- a/src/plugins/dev_tools/public/application.tsx
+++ b/src/plugins/dev_tools/public/application.tsx
@@ -27,8 +27,8 @@ import type {
   ScopedHistory,
   CoreTheme,
   ExecutionContextStart,
-} from 'src/core/public';
-import { KibanaThemeProvider, useExecutionContext } from '../../kibana_react/public';
+} from '@kbn/core/public';
+import { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import type { DocTitleService, BreadcrumbService } from './services';
 
 import { DevToolApp } from './dev_tool';
diff --git a/src/plugins/dev_tools/public/dev_tool.ts b/src/plugins/dev_tools/public/dev_tool.ts
index f2425aa571622..53f79ad686c43 100644
--- a/src/plugins/dev_tools/public/dev_tool.ts
+++ b/src/plugins/dev_tools/public/dev_tool.ts
@@ -9,7 +9,7 @@
 import { Observable } from 'rxjs';
 import { RouteComponentProps } from 'react-router-dom';
 
-import { AppUnmount, CoreTheme } from 'src/core/public';
+import { AppUnmount, CoreTheme } from '@kbn/core/public';
 
 /**
  * Descriptor for a dev tool. A dev tool works similar to an application
diff --git a/src/plugins/dev_tools/public/index.ts b/src/plugins/dev_tools/public/index.ts
index 2326106af3e03..d5e7f2e293df8 100644
--- a/src/plugins/dev_tools/public/index.ts
+++ b/src/plugins/dev_tools/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110892
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DevToolsPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts
index ee729c8f4400c..86c26f099b55d 100644
--- a/src/plugins/dev_tools/public/plugin.ts
+++ b/src/plugins/dev_tools/public/plugin.ts
@@ -7,13 +7,13 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { Plugin, CoreSetup, AppMountParameters, AppDeepLink } from 'src/core/public';
-import { AppUpdater } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters, AppDeepLink } from '@kbn/core/public';
+import { AppUpdater } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { sortBy } from 'lodash';
 
-import { AppNavLinkStatus, DEFAULT_APP_CATEGORIES } from '../../../core/public';
-import { UrlForwardingSetup } from '../../url_forwarding/public';
+import { AppNavLinkStatus, DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import { UrlForwardingSetup } from '@kbn/url-forwarding-plugin/public';
 import { CreateDevToolArgs, DevToolApp, createDevToolApp } from './dev_tool';
 import { DocTitleService, BreadcrumbService } from './services';
 
diff --git a/src/plugins/dev_tools/public/services/breadcrumb.ts b/src/plugins/dev_tools/public/services/breadcrumb.ts
index c12aa7e8ceef2..20b6b62463aa8 100644
--- a/src/plugins/dev_tools/public/services/breadcrumb.ts
+++ b/src/plugins/dev_tools/public/services/breadcrumb.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ManagementAppMountParams } from '../../../management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { i18Texts } from '../constants/texts';
 
 export type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
diff --git a/src/plugins/discover/kibana.json b/src/plugins/discover/kibana.json
index 2b09f2bef4896..f9802782f8e48 100644
--- a/src/plugins/discover/kibana.json
+++ b/src/plugins/discover/kibana.json
@@ -17,7 +17,7 @@
     "dataViewEditor"
   ],
   "optionalPlugins": ["home", "share", "usageCollection", "spaces", "triggersActionsUi"],
-  "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "dataViews"],
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "dataViews"],
   "extraPublicDirs": ["common"],
   "owner": {
     "name": "Data Discovery",
diff --git a/src/plugins/discover/public/__mocks__/config.ts b/src/plugins/discover/public/__mocks__/config.ts
index 42ecbd351af74..6fa506a7df550 100644
--- a/src/plugins/discover/public/__mocks__/config.ts
+++ b/src/plugins/discover/public/__mocks__/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../common';
 
 export const configMock = {
diff --git a/src/plugins/discover/public/__mocks__/index_pattern.ts b/src/plugins/discover/public/__mocks__/index_pattern.ts
index becaa9934afce..839acfcf3ea15 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPatternFieldList, DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 const fields = [
   {
@@ -62,7 +62,7 @@ const fields = [
     filterable: true,
     aggregatable: true,
   },
-] as IIndexPatternFieldList;
+] as DataView['fields'];
 
 fields.getByName = (name: string) => {
   return fields.find((field) => field.name === name);
diff --git a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
index 01f3f537f0745..89a53e474b5b3 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPatternFieldList, DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 const fields = [
   {
@@ -49,7 +49,7 @@ const fields = [
     scripted: true,
     filterable: false,
   },
-] as IIndexPatternFieldList;
+] as DataView['fields'];
 
 fields.getByName = (name: string) => {
   return fields.find((field) => field.name === name);
diff --git a/src/plugins/discover/public/__mocks__/index_patterns.ts b/src/plugins/discover/public/__mocks__/index_patterns.ts
index 0d6f3fa723682..31997300c6490 100644
--- a/src/plugins/discover/public/__mocks__/index_patterns.ts
+++ b/src/plugins/discover/public/__mocks__/index_patterns.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsContract } from '../../../data_views/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { indexPatternMock } from './index_pattern';
 
 export const indexPatternsMock = {
diff --git a/src/plugins/discover/public/__mocks__/saved_search.ts b/src/plugins/discover/public/__mocks__/saved_search.ts
index 04c880e7e1928..d322098a5e418 100644
--- a/src/plugins/discover/public/__mocks__/saved_search.ts
+++ b/src/plugins/discover/public/__mocks__/saved_search.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedSearch } from '../services/saved_searches';
-import { createSearchSourceMock } from '../../../data/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
 import { indexPatternMock } from './index_pattern';
 import { indexPatternWithTimefieldMock } from './index_pattern_with_timefield';
 
diff --git a/src/plugins/discover/public/__mocks__/search_session.ts b/src/plugins/discover/public/__mocks__/search_session.ts
index 78a7a7f90a39e..9763ff7089e0a 100644
--- a/src/plugins/discover/public/__mocks__/search_session.ts
+++ b/src/plugins/discover/public/__mocks__/search_session.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import { createMemoryHistory } from 'history';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { DataPublicPluginStart } from '../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { DiscoverSearchSessionManager } from '../application/main/services/discover_search_session';
 
 export function createSearchSessionMock() {
diff --git a/src/plugins/discover/public/__mocks__/services.ts b/src/plugins/discover/public/__mocks__/services.ts
index 5f9511d2a63fe..81938c8a9ca06 100644
--- a/src/plugins/discover/public/__mocks__/services.ts
+++ b/src/plugins/discover/public/__mocks__/services.ts
@@ -7,8 +7,8 @@
  */
 import { EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 import { DiscoverServices } from '../build_services';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { chromeServiceMock, coreMock, docLinksServiceMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { chromeServiceMock, coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 import {
   CONTEXT_STEP_SETTING,
   DEFAULT_COLUMNS_SETTING,
@@ -17,11 +17,11 @@ import {
   SAMPLE_SIZE_SETTING,
   SORT_DEFAULT_ORDER_SETTING,
 } from '../../common';
-import { UI_SETTINGS } from '../../../data/public';
-import { TopNavMenu } from '../../../navigation/public';
-import { FORMATS_UI_SETTINGS } from 'src/plugins/field_formats/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { TopNavMenu } from '@kbn/navigation-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { LocalStorageMock } from './local_storage_mock';
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 const dataPlugin = dataPluginMock.createStartContract();
 
 export const discoverServiceMock = {
diff --git a/src/plugins/discover/public/__mocks__/start_contract.ts b/src/plugins/discover/public/__mocks__/start_contract.ts
index ac53eb4978c9d..39ccd882dbe59 100644
--- a/src/plugins/discover/public/__mocks__/start_contract.ts
+++ b/src/plugins/discover/public/__mocks__/start_contract.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ApplicationStart, PublicAppInfo } from 'src/core/public';
+import { ApplicationStart, PublicAppInfo } from '@kbn/core/public';
 import { deepFreeze } from '@kbn/std';
 import { BehaviorSubject, Subject } from 'rxjs';
 
diff --git a/src/plugins/discover/public/__mocks__/ui_settings.ts b/src/plugins/discover/public/__mocks__/ui_settings.ts
index 7c6a4768b577f..4a0515f7b7d00 100644
--- a/src/plugins/discover/public/__mocks__/ui_settings.ts
+++ b/src/plugins/discover/public/__mocks__/ui_settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   CONTEXT_TIE_BREAKER_FIELDS_SETTING,
   DEFAULT_COLUMNS_SETTING,
diff --git a/src/plugins/discover/public/application/context/context_app.test.tsx b/src/plugins/discover/public/application/context/context_app.test.tsx
index cf1e7a98e01a3..af3c83eb50d6c 100644
--- a/src/plugins/discover/public/application/context/context_app.test.tsx
+++ b/src/plugins/discover/public/application/context/context_app.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { mockTopNavMenu } from './__mocks__/top_nav_menu';
 import { ContextAppContent } from './context_app_content';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
@@ -18,9 +18,9 @@ import { DiscoverServices } from '../../build_services';
 import { indexPatternsMock } from '../../__mocks__/index_patterns';
 import { act } from 'react-dom/test-utils';
 import { uiSettingsMock } from '../../__mocks__/ui_settings';
-import { themeServiceMock } from '../../../../../core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 import { LocalStorageMock } from '../../__mocks__/local_storage_mock';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockFilterManager = createFilterManagerMock();
 const mockNavigationPlugin = { ui: { TopNavMenu: mockTopNavMenu } };
diff --git a/src/plugins/discover/public/application/context/context_app.tsx b/src/plugins/discover/public/application/context/context_app.tsx
index d2ec535a6ed2c..e84bbf644a895 100644
--- a/src/plugins/discover/public/application/context/context_app.tsx
+++ b/src/plugins/discover/public/application/context/context_app.tsx
@@ -12,9 +12,11 @@ import classNames from 'classnames';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText, EuiPageContent, EuiPage, EuiSpacer } from '@elastic/eui';
 import { cloneDeep } from 'lodash';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
+import { generateFilters } from '@kbn/data-plugin/public';
 import { DOC_TABLE_LEGACY, SEARCH_FIELDS_FROM_SOURCE } from '../../../common';
 import { ContextErrorMessage } from './components/context_error_message';
-import { DataView, DataViewField } from '../../../../data_views/public';
 import { LoadingStatus } from './services/context_query_state';
 import { AppState, isEqualFilters } from './services/context_state';
 import { useColumns } from '../../utils/use_data_grid_columns';
@@ -25,8 +27,6 @@ import { ContextAppContent } from './context_app_content';
 import { SurrDocType } from './services/context';
 import { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import { useDiscoverServices } from '../../utils/use_discover_services';
-import { useExecutionContext } from '../../../../kibana_react/public';
-import { generateFilters } from '../../../../data/public';
 
 const ContextAppContentMemoized = memo(ContextAppContent);
 
diff --git a/src/plugins/discover/public/application/context/context_app_content.test.tsx b/src/plugins/discover/public/application/context/context_app_content.test.tsx
index c25df457807c2..9751f0d38f3d0 100644
--- a/src/plugins/discover/public/application/context/context_app_content.test.tsx
+++ b/src/plugins/discover/public/application/context/context_app_content.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { ActionBar } from './components/action_bar/action_bar';
 import { GetStateReturn } from './services/context_state';
-import { SortDirection } from 'src/plugins/data/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { ContextAppContent, ContextAppContentProps } from './context_app_content';
 import { LoadingStatus } from './services/context_query_state';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
@@ -19,7 +19,7 @@ import { DiscoverGrid } from '../../components/discover_grid/discover_grid';
 import { discoverServiceMock } from '../../__mocks__/services';
 import { DocTableWrapper } from '../../components/doc_table/doc_table_wrapper';
 import { EsHitRecordList } from '../types';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 describe('ContextAppContent test', () => {
   const mountComponent = ({
diff --git a/src/plugins/discover/public/application/context/context_app_content.tsx b/src/plugins/discover/public/application/context/context_app_content.tsx
index ffd6b3540b855..dbc82061ab9a0 100644
--- a/src/plugins/discover/public/application/context/context_app_content.tsx
+++ b/src/plugins/discover/public/application/context/context_app_content.tsx
@@ -9,9 +9,9 @@
 import React, { useState, Fragment, useMemo, useCallback } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiHorizontalRule, EuiText } from '@elastic/eui';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { CONTEXT_STEP_SETTING, DOC_HIDE_TIME_COLUMN_SETTING } from '../../../common';
-import type { DataView } from '../../../../data_views/public';
-import { SortDirection } from '../../../../data/public';
 import { LoadingStatus } from './services/context_query_state';
 import { ActionBar } from './components/action_bar/action_bar';
 import { DiscoverGrid } from '../../components/discover_grid/discover_grid';
diff --git a/src/plugins/discover/public/application/context/services/anchor.test.ts b/src/plugins/discover/public/application/context/services/anchor.test.ts
index 12c7c2c0ccb40..30ff0b039d3e7 100644
--- a/src/plugins/discover/public/application/context/services/anchor.test.ts
+++ b/src/plugins/discover/public/application/context/services/anchor.test.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView } from '../../../../../data_views/public';
-import { SortDirection } from '../../../../../data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { createSearchSourceStub } from './_stubs';
 import { fetchAnchor, updateSearchSource } from './anchor';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
diff --git a/src/plugins/discover/public/application/context/services/anchor.ts b/src/plugins/discover/public/application/context/services/anchor.ts
index 90268c094d91a..a55ed2506537f 100644
--- a/src/plugins/discover/public/application/context/services/anchor.ts
+++ b/src/plugins/discover/public/application/context/services/anchor.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ISearchSource, EsQuerySortValue } from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
+import { ISearchSource, EsQuerySortValue } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { EsHitRecord } from '../../types';
 
 export async function fetchAnchor(
diff --git a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
index c5aaf7f68b9a5..90fe6bfd7e26b 100644
--- a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
@@ -8,11 +8,11 @@
 
 import moment from 'moment';
 import { get, last } from 'lodash';
-import type { DataView } from 'src/plugins/data_views/public';
-import { SortDirection } from 'src/plugins/data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { createContextSearchSourceStub } from './_stubs';
 import { fetchSurroundingDocs, SurrDocType } from './context';
-import { DataPublicPluginStart, Query } from '../../../../../data/public';
+import { DataPublicPluginStart, Query } from '@kbn/data-plugin/public';
 import { EsHitRecord, EsHitRecordList } from '../../types';
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
diff --git a/src/plugins/discover/public/application/context/services/context.successors.test.ts b/src/plugins/discover/public/application/context/services/context.successors.test.ts
index 9fc53de86840b..0c32c3b7ed213 100644
--- a/src/plugins/discover/public/application/context/services/context.successors.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.successors.test.ts
@@ -8,10 +8,10 @@
 
 import moment from 'moment';
 import { get, last } from 'lodash';
-import { SortDirection } from 'src/plugins/data/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import { SortDirection } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { createContextSearchSourceStub } from './_stubs';
-import { DataPublicPluginStart, Query } from '../../../../../data/public';
+import { DataPublicPluginStart, Query } from '@kbn/data-plugin/public';
 import { fetchSurroundingDocs, SurrDocType } from './context';
 import { EsHitRecord, EsHitRecordList } from '../../types';
 
diff --git a/src/plugins/discover/public/application/context/services/context.test.ts b/src/plugins/discover/public/application/context/services/context.test.ts
index df5a279dfe927..c02aad483159d 100644
--- a/src/plugins/discover/public/application/context/services/context.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.test.ts
@@ -8,7 +8,7 @@
 
 import { updateSearchSource } from './context';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { createSearchSourceMock } from '../../../../../data/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
 
 describe('context api', function () {
   test('createSearchSource when useFieldsApi is true', () => {
diff --git a/src/plugins/discover/public/application/context/services/context.ts b/src/plugins/discover/public/application/context/services/context.ts
index 81e11c05e7280..336ca6a21cc33 100644
--- a/src/plugins/discover/public/application/context/services/context.ts
+++ b/src/plugins/discover/public/application/context/services/context.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { Filter } from '@kbn/es-query';
-import { DataView } from 'src/plugins/data_views/public';
-import { DataPublicPluginStart, ISearchSource } from 'src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { DataPublicPluginStart, ISearchSource } from '@kbn/data-plugin/public';
 import { reverseSortDir, SortDirection } from '../utils/sorting';
 import { convertIsoToMillis, extractNanos } from '../utils/date_conversion';
 import { fetchHitsInInterval } from '../utils/fetch_hits_in_interval';
diff --git a/src/plugins/discover/public/application/context/services/context_state.test.ts b/src/plugins/discover/public/application/context/services/context_state.test.ts
index 3eb0e8a1e85d4..4e64ff206647e 100644
--- a/src/plugins/discover/public/application/context/services/context_state.test.ts
+++ b/src/plugins/discover/public/application/context/services/context_state.test.ts
@@ -7,11 +7,11 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { getState } from './context_state';
 import { createBrowserHistory, History } from 'history';
-import { FilterManager } from '../../../../../data/public';
-import { coreMock } from '../../../../../../core/public/mocks';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../common';
 
 const setupMock = coreMock.createSetup();
diff --git a/src/plugins/discover/public/application/context/services/context_state.ts b/src/plugins/discover/public/application/context/services/context_state.ts
index 25d4d5e22126b..77fa33faa14c8 100644
--- a/src/plugins/discover/public/application/context/services/context_state.ts
+++ b/src/plugins/discover/public/application/context/services/context_state.ts
@@ -8,7 +8,7 @@
 
 import { isEqual } from 'lodash';
 import { History } from 'history';
-import { NotificationsStart, IUiSettingsClient } from 'kibana/public';
+import { NotificationsStart, IUiSettingsClient } from '@kbn/core/public';
 import { Filter, compareFilters, COMPARE_ALL_OPTIONS } from '@kbn/es-query';
 import {
   createStateContainer,
@@ -16,9 +16,9 @@ import {
   syncStates,
   withNotifyOnErrors,
   ReduxLikeStateContainer,
-} from '../../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
-import { FilterManager } from '../../../../../data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { handleSourceColumnState } from '../../../utils/state_helpers';
 
 export interface AppState {
diff --git a/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts b/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts
index 3fc2716114513..1d990f4ae8359 100644
--- a/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts
+++ b/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISearchSource, EsQuerySortValue, SortDirection } from '../../../../../data/public';
+import { ISearchSource, EsQuerySortValue, SortDirection } from '@kbn/data-plugin/public';
 import { convertTimeValueToIso } from './date_conversion';
 import { IntervalValue } from './generate_intervals';
 import { EsQuerySearchAfter } from './get_es_query_search_after';
diff --git a/src/plugins/discover/public/application/context/utils/generate_intervals.ts b/src/plugins/discover/public/application/context/utils/generate_intervals.ts
index 5adeb31444ee7..ed86b741f2610 100644
--- a/src/plugins/discover/public/application/context/utils/generate_intervals.ts
+++ b/src/plugins/discover/public/application/context/utils/generate_intervals.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SortDirection } from '../../../../../data/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { SurrDocType } from '../services/context';
 
 export type IntervalValue = number | null;
diff --git a/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts b/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts
index 5fcc831cce746..2bbea70e16160 100644
--- a/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts
+++ b/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { EsQuerySortValue, SortDirection } from 'src/plugins/data/public';
+import type { EsQuerySortValue, SortDirection } from '@kbn/data-plugin/public';
 
 /**
  * Returns `EsQuerySort` which is used to sort records in the ES query
diff --git a/src/plugins/discover/public/application/context/utils/sorting.ts b/src/plugins/discover/public/application/context/utils/sorting.ts
index 5b31176c74f95..600997d7031ff 100644
--- a/src/plugins/discover/public/application/context/utils/sorting.ts
+++ b/src/plugins/discover/public/application/context/utils/sorting.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export enum SortDirection {
   asc = 'asc',
diff --git a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx
index d67ca4e4ca242..eafe84a9bdc7e 100644
--- a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx
+++ b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import { createFilterManagerMock } from '../../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { CONTEXT_TIE_BREAKER_FIELDS_SETTING } from '../../../../common';
 import { DiscoverServices } from '../../../build_services';
 import { FailureReason, LoadingStatus } from '../services/context_query_state';
@@ -20,9 +20,9 @@ import {
 } from '../__mocks__/use_context_app_fetch';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
 import { createContextSearchSourceStub } from '../services/_stubs';
-import { DataView } from '../../../../../data_views/public';
-import { themeServiceMock } from '../../../../../../core/public/mocks';
-import { KibanaContextProvider } from '../../../../../kibana_react/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockFilterManager = createFilterManagerMock();
 
diff --git a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx
index aaed483ae8be6..88d3764a86982 100644
--- a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx
+++ b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx
@@ -7,12 +7,12 @@
  */
 import React, { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { MarkdownSimple, toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { CONTEXT_TIE_BREAKER_FIELDS_SETTING } from '../../../../common';
 import { fetchAnchor } from '../services/anchor';
 import { fetchSurroundingDocs, SurrDocType } from '../services/context';
-import { MarkdownSimple, toMountPoint, wrapWithTheme } from '../../../../../kibana_react/public';
-import type { DataView } from '../../../../../data_views/public';
-import { SortDirection } from '../../../../../data/public';
 import {
   ContextFetchState,
   FailureReason,
diff --git a/src/plugins/discover/public/application/discover_router.tsx b/src/plugins/discover/public/application/discover_router.tsx
index 0270af2383488..6950d03927b8c 100644
--- a/src/plugins/discover/public/application/discover_router.tsx
+++ b/src/plugins/discover/public/application/discover_router.tsx
@@ -10,7 +10,7 @@ import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import React from 'react';
 import { History } from 'history';
 import { EuiErrorBoundary } from '@elastic/eui';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { ContextAppRoute } from './context';
 import { SingleDocRoute } from './doc';
 import { DiscoverMainRoute } from './main';
diff --git a/src/plugins/discover/public/application/doc/components/doc.test.tsx b/src/plugins/discover/public/application/doc/components/doc.test.tsx
index 29453e7f83f19..184e6d16088e8 100644
--- a/src/plugins/discover/public/application/doc/components/doc.test.tsx
+++ b/src/plugins/discover/public/application/doc/components/doc.test.tsx
@@ -15,7 +15,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { Doc, DocProps } from './doc';
 import { SEARCH_FIELDS_FROM_SOURCE as mockSearchFieldsFromSource } from '../../../../common';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { KibanaContextProvider } from '../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockSearchApi = jest.fn();
 
diff --git a/src/plugins/discover/public/application/doc/components/doc.tsx b/src/plugins/discover/public/application/doc/components/doc.tsx
index 590651e1e6335..cd2b27c956b9d 100644
--- a/src/plugins/discover/public/application/doc/components/doc.tsx
+++ b/src/plugins/discover/public/application/doc/components/doc.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent, EuiPage } from '@elastic/eui';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { DocViewer } from '../../../services/doc_views/components/doc_viewer';
 import { ElasticRequestState } from '../types';
 import { useEsDocSearch } from '../../../utils/use_es_doc_search';
diff --git a/src/plugins/discover/public/application/doc/single_doc_route.tsx b/src/plugins/discover/public/application/doc/single_doc_route.tsx
index e2bdc6dc799e6..8ffb6f5d71fb3 100644
--- a/src/plugins/discover/public/application/doc/single_doc_route.tsx
+++ b/src/plugins/discover/public/application/doc/single_doc_route.tsx
@@ -9,6 +9,7 @@ import React, { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { getRootBreadcrumbs } from '../../utils/breadcrumbs';
 import { LoadingIndicator } from '../../components/common/loading_indicator';
 import { useIndexPattern } from '../../utils/use_index_pattern';
@@ -16,7 +17,6 @@ import { withQueryParams } from '../../utils/with_query_params';
 import { useMainRouteBreadcrumb } from '../../utils/use_navigation_props';
 import { Doc } from './components/doc';
 import { useDiscoverServices } from '../../utils/use_discover_services';
-import { useExecutionContext } from '../../../../kibana_react/public';
 
 export interface SingleDocRouteProps {
   /**
diff --git a/src/plugins/discover/public/application/index.tsx b/src/plugins/discover/public/application/index.tsx
index 826a02c29ce1a..8747492640065 100644
--- a/src/plugins/discover/public/application/index.tsx
+++ b/src/plugins/discover/public/application/index.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import { i18n } from '@kbn/i18n';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { discoverRouter } from './discover_router';
-import { toMountPoint, wrapWithTheme } from '../../../kibana_react/public';
 import { DiscoverServices } from '../build_services';
 
 export const renderApp = (element: HTMLElement, services: DiscoverServices) => {
diff --git a/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx b/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx
index a7e5baa8592eb..8f12c4b6383d2 100644
--- a/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { Subject, BehaviorSubject } from 'rxjs';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { DataView } from '../../../../../../data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { setHeaderActionMenuMounter, setUiActions } from '../../../../kibana_services';
 import { esHits } from '../../../../__mocks__/es_hits';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
-import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { GetStateReturn } from '../../services/discover_state';
 import { DataCharts$, DataTotalHits$ } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
@@ -22,8 +22,8 @@ import { FetchStatus } from '../../../types';
 import { Chart } from './point_series';
 import { DiscoverChart } from './discover_chart';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ReactWrapper } from 'enzyme';
 
 setHeaderActionMenuMounter(jest.fn());
diff --git a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx
index bd0f637f14c71..8251abba41fa9 100644
--- a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx
@@ -17,7 +17,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { DataView } from '../../../../../../data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { HitsCounter } from '../hits_counter';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { GetStateReturn } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx b/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx
index d336cd2c092b6..a62bd9c2317dc 100644
--- a/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx
@@ -14,7 +14,7 @@ import { Chart } from './point_series';
 import { DiscoverHistogram } from './histogram';
 import React from 'react';
 import * as hooks from '../../utils/use_data_state';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const chartData = {
   xAxisOrderedValues: [
diff --git a/src/plugins/discover/public/application/main/components/chart/histogram.tsx b/src/plugins/discover/public/application/main/components/chart/histogram.tsx
index 2a71207e82835..c9533f70fc8e9 100644
--- a/src/plugins/discover/public/application/main/components/chart/histogram.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/histogram.tsx
@@ -32,19 +32,19 @@ import {
   XYBrushEvent,
   XYChartElementEvent,
 } from '@elastic/charts';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import {
   CurrentTime,
   Endzones,
   getAdjustedInterval,
   renderEndzoneTooltip,
-} from '../../../../../../charts/public';
+} from '@kbn/charts-plugin/public';
+import { LEGACY_TIME_AXIS, MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
+import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DataCharts$, DataChartsMessage } from '../../utils/use_saved_search';
 import { FetchStatus } from '../../../types';
 import { useDataState } from '../../utils/use_data_state';
-import { LEGACY_TIME_AXIS, MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../charts/common';
 
 export interface DiscoverHistogramProps {
   savedSearchData$: DataCharts$;
diff --git a/src/plugins/discover/public/application/main/components/chart/point_series.ts b/src/plugins/discover/public/application/main/components/chart/point_series.ts
index 88b5c444f4beb..c8795296d6fd8 100644
--- a/src/plugins/discover/public/application/main/components/chart/point_series.ts
+++ b/src/plugins/discover/public/application/main/components/chart/point_series.ts
@@ -9,7 +9,7 @@
 import { uniq } from 'lodash';
 import { Duration, Moment } from 'moment';
 import { Unit } from '@kbn/datemath';
-import { SerializedFieldFormat } from '../../../../../../field_formats/common';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 
 export interface Column {
   id: string;
diff --git a/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts b/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts
index 30b3089ad2f2c..bbd670d217e58 100644
--- a/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts
+++ b/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts
@@ -10,7 +10,7 @@ import type {
   EuiContextMenuPanelItemDescriptor,
   EuiContextMenuPanelDescriptor,
 } from '@elastic/eui';
-import { search } from '../../../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 
 export function useChartPanels(
   toggleHideChart: () => void,
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx
index cfe04094fd6f6..abeb9e942c0ac 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { CALLOUT_STATE_KEY, DocumentExplorerCallout } from './document_explorer_callout';
 import { LocalStorageMock } from '../../../../__mocks__/local_storage_mock';
 import { DiscoverServices } from '../../../../build_services';
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx
index efae6bcc51db5..69dac6b6ce30a 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx
@@ -20,9 +20,9 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DOC_TABLE_LEGACY } from '../../../../../common';
-import { Storage } from '../../../../../../kibana_utils/public';
 
 export const CALLOUT_STATE_KEY = 'discover:docExplorerCalloutClosed';
 
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx
index f065f9c48b5f7..5bf5107dc0349 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   CALLOUT_STATE_KEY,
   DocumentExplorerUpdateCallout,
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx
index 7e45193cba3ee..02972c9cabd26 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx
@@ -16,11 +16,12 @@ import {
   EuiCallOut,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiLink,
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import { Storage } from '../../../../../../kibana_utils/public';
 
 export const CALLOUT_STATE_KEY = 'discover:docExplorerUpdateCalloutClosed';
 
@@ -60,40 +61,48 @@ export const DocumentExplorerUpdateCallout = () => {
     <EuiCallOut
       className="dscDocumentExplorerCallout"
       title={<CalloutTitle onCloseCallout={onCloseCallout} />}
-      iconType="search"
+      iconType="tableDensityNormal"
+      heading="h3"
+      size="s"
     >
       <p>
         <FormattedMessage
           id="discover.docExplorerUpdateCallout.bodyMessage"
-          defaultMessage="Experience the new {documentExplorer}. Understand the shape of your data with {fieldStatistics}."
+          defaultMessage="Perform multi-column sorting, resize columns, set row height, and view data in fullscreen with the {documentExplorer}.
+          Learn more about the structure of your data with {fieldStatistics}."
           values={{
             fieldStatistics: (
-              <span css={semiBoldStyle}>
-                <FormattedMessage
-                  id="discover.docExplorerUpdateCallout.fieldStatistics"
-                  defaultMessage="Field Statistics"
-                />
-              </span>
+              <EuiLink href={docLinks.links.discover.fieldStatistics} external>
+                <span css={semiBoldStyle}>
+                  <FormattedMessage
+                    id="discover.docExplorerUpdateCallout.fieldStatistics"
+                    defaultMessage="field statistics"
+                  />
+                </span>
+              </EuiLink>
             ),
             documentExplorer: (
-              <span css={semiBoldStyle}>
-                <FormattedMessage
-                  id="discover.docExplorerUpdateCallout.documentExplorer"
-                  defaultMessage="Document Explorer"
-                />
-              </span>
+              <EuiLink href={docLinks.links.discover.documentExplorer} external>
+                <span css={semiBoldStyle}>
+                  <FormattedMessage
+                    id="discover.docExplorerUpdateCallout.documentExplorer"
+                    defaultMessage="new document table"
+                  />
+                </span>
+              </EuiLink>
             ),
           }}
         />
       </p>
       <EuiButton
-        iconType="tableDensityNormal"
+        data-test-subj="document-explorer-update-callout-dismiss-button"
+        iconType="check"
         size="s"
-        href={docLinks.links.discover.documentExplorer}
+        onClick={onCloseCallout}
       >
         <FormattedMessage
-          id="discover.docExplorerUpdateCallout.learnMore"
-          defaultMessage="Learn more"
+          id="discover.docExplorerUpdateCallout.dismissButtonLabel"
+          defaultMessage="Got it"
         />
       </EuiButton>
     </EuiCallOut>
@@ -106,7 +115,7 @@ function CalloutTitle({ onCloseCallout }: { onCloseCallout: () => void }) {
       <EuiFlexItem grow={false}>
         <FormattedMessage
           id="discover.docExplorerUpdateCallout.headerMessage"
-          defaultMessage="A better way to explore"
+          defaultMessage="Exploring your data just got better"
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
diff --git a/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx b/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
index ceae378be3bd6..9e51324aefc64 100644
--- a/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
+++ b/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
@@ -9,16 +9,16 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import type { Filter } from '@kbn/es-query';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
-import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import type { Query } from '../../../../../../data/public';
-import type { DataViewField, DataView } from '../../../../../../data_views/public';
+import type { Query } from '@kbn/data-plugin/public';
+import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import {
   EmbeddableInput,
   EmbeddableOutput,
   ErrorEmbeddable,
   IEmbeddable,
   isErrorEmbeddable,
-} from '../../../../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { FIELD_STATISTICS_LOADED } from './constants';
 import type { SavedSearch } from '../../../../services/saved_searches';
 import type { GetStateReturn } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
index 78f18e0218872..6e5b5a513f9bf 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
@@ -18,8 +18,8 @@ import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
 import { DiscoverDocuments } from './discover_documents';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
-import { ElasticSearchHit } from 'src/plugins/discover/public/types';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { ElasticSearchHit } from '../../../../types';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 setHeaderActionMenuMounter(jest.fn());
 
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
index 1c7971fe9a292..955d69509cf01 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
@@ -14,6 +14,7 @@ import {
   EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DocViewFilterFn } from '../../../../services/doc_views/doc_views_types';
 import { DiscoverGrid } from '../../../../components/discover_grid/discover_grid';
@@ -25,7 +26,6 @@ import {
   SEARCH_FIELDS_FROM_SOURCE,
 } from '../../../../../common';
 import { useColumns } from '../../../../utils/use_data_grid_columns';
-import { DataView } from '../../../../../../data_views/public';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { DataDocumentsMsg, DataDocuments$ } from '../../utils/use_saved_search';
 import { AppState, GetStateReturn } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
index 6ff808a65eb5e..43d58f63f5fa6 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
@@ -14,9 +14,9 @@ import { DiscoverLayout, SIDEBAR_CLOSED_KEY } from './discover_layout';
 import { esHits } from '../../../../__mocks__/es_hits';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
-import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
-import type { DataView, DataViewAttributes } from '../../../../../../data_views/public';
-import { SavedObject } from '../../../../../../../core/types';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
 import { GetStateReturn } from '../../services/discover_state';
 import { DiscoverLayoutProps } from './types';
@@ -29,12 +29,12 @@ import {
 } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
-import { RequestAdapter } from '../../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { Chart } from '../chart/point_series';
 import { DiscoverSidebar } from '../sidebar/discover_sidebar';
 import { ElasticSearchHit } from '../../../../types';
-import { LocalStorageMock } from 'src/plugins/discover/public/__mocks__/local_storage_mock';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { LocalStorageMock } from '../../../../__mocks__/local_storage_mock';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../../../../build_services';
 
 setHeaderActionMenuMounter(jest.fn());
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
index 088b89b682ca1..ad1c96e308d12 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -21,11 +21,12 @@ import {
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import classNames from 'classnames';
+import { generateFilters } from '@kbn/data-plugin/public';
+import { DataView, DataViewField, DataViewType } from '@kbn/data-views-plugin/public';
+import { InspectorSession } from '@kbn/inspector-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverNoResults } from '../no_results';
 import { LoadingSpinner } from '../loading_spinner/loading_spinner';
-import { generateFilters } from '../../../../../../data/public';
-import { DataView, DataViewField, DataViewType } from '../../../../../../data_views/public';
 import { DiscoverSidebarResponsive } from '../sidebar';
 import { DiscoverLayoutProps } from './types';
 import { SEARCH_FIELDS_FROM_SOURCE, SHOW_FIELD_STATISTICS } from '../../../../../common';
@@ -34,7 +35,6 @@ import { DiscoverTopNav } from '../top_nav/discover_topnav';
 import { DocViewFilterFn } from '../../../../services/doc_views/doc_views_types';
 import { DiscoverChart } from '../chart';
 import { getResultState } from '../../utils/get_result_state';
-import { InspectorSession } from '../../../../../../inspector/public';
 import { DiscoverUninitialized } from '../uninitialized/uninitialized';
 import { DataMainMsg } from '../../utils/use_saved_search';
 import { useColumns } from '../../../../utils/use_data_grid_columns';
diff --git a/src/plugins/discover/public/application/main/components/layout/types.ts b/src/plugins/discover/public/application/main/components/layout/types.ts
index 4399cacf8c3c6..295351f2cd318 100644
--- a/src/plugins/discover/public/application/main/components/layout/types.ts
+++ b/src/plugins/discover/public/application/main/components/layout/types.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import type { Query, TimeRange, SavedObject } from '../../../../../../data/public';
-import type { DataView, DataViewAttributes } from '../../../../../../data_views/public';
-import { ISearchSource } from '../../../../../../data/public';
+import type { Query, TimeRange, SavedObject } from '@kbn/data-plugin/public';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { AppState, GetStateReturn } from '../../services/discover_state';
 import { DataRefetch$, SavedSearchData } from '../../utils/use_saved_search';
 import { SavedSearch } from '../../../../services/saved_searches';
-import { RequestAdapter } from '../../../../../../inspector';
 import { ElasticSearchHit } from '../../../../types';
 
 export interface DiscoverLayoutProps {
diff --git a/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx b/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx
index cbfd6e05cb646..6ead00f8cce06 100644
--- a/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx
+++ b/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { DiscoverNoResults, DiscoverNoResultsProps } from './no_results';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 beforeEach(() => {
   jest.clearAllMocks();
diff --git a/src/plugins/discover/public/application/main/components/no_results/no_results.tsx b/src/plugins/discover/public/application/main/components/no_results/no_results.tsx
index 223938dedf303..4e6f4425f56e0 100644
--- a/src/plugins/discover/public/application/main/components/no_results/no_results.tsx
+++ b/src/plugins/discover/public/application/main/components/no_results/no_results.tsx
@@ -16,7 +16,7 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { DataPublicPluginStart } from '../../../../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { NoResultsSuggestions } from './no_results_suggestions';
 import './_no_results.scss';
 import { NoResultsIllustration } from './assets/no_results_illustration';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx b/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx
index 3547359209700..bf921dc22234e 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx
@@ -9,9 +9,9 @@
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DiscoverFieldDetails } from '../discover_field_details';
-import { DataViewField } from '../../../../../../../data_views/public';
-import { DataView } from '../../../../../../../data_views/public';
 import { fieldSpecMap } from './fields';
 import { numericField as field } from './fields';
 import { Bucket } from '../types';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts b/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts
index ce630953d9d3c..04f1cb9eb618b 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField, FieldSpec } from '../../../../../../../data_views/public';
+import { DataViewField, FieldSpec } from '@kbn/data-views-plugin/public';
 
 export const fieldSpecMap: Record<string, FieldSpec> = {
   'machine.os': {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
index 9447405e878be..4b2ccf1bff0bb 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
@@ -11,9 +11,9 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 import { DiscoverField } from './discover_field';
-import { DataViewField } from '../../../../../../data_views/public';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
-import { stubDataView } from '../../../../../../data_views/common/data_view.stub';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 
 jest.mock('../../../../kibana_services', () => ({
   getUiActions: jest.fn(() => {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
index e14d9f7a0e5a7..40bc0a9f6df14 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
@@ -25,10 +25,10 @@ import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
 import classNames from 'classnames';
 import { FieldButton, FieldIcon } from '@kbn/react-field';
+import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import { getTypeForFieldIcon } from '../../../../utils/get_type_for_field_icon';
 import { DiscoverFieldDetails } from './discover_field_details';
 import { FieldDetails } from './types';
-import type { DataViewField, DataView } from '../../../../../../data_views/public';
 import { getFieldTypeName } from './lib/get_field_type_name';
 import { DiscoverFieldVisualize } from './discover_field_visualize';
 
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx
index 86f563c546654..ac0dd3e7f8186 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { EuiText, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { StringFieldProgressBar } from './string_progress_bar';
 import { Bucket } from './types';
-import { DataViewField } from '../../../../../../data_views/public';
 import './discover_field_bucket.scss';
 
 interface Props {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx
index e7ae1043851be..075e58829c751 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx
@@ -11,8 +11,8 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 import { DiscoverFieldDetails } from './discover_field_details';
-import { DataViewField } from '../../../../../../data_views/public';
-import { stubDataView } from '../../../../../../data_views/common/data_view.stub';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('discover sidebar field details', function () {
   const onAddFilter = jest.fn();
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx
index dfd01a9769abd..45924257189b7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { EuiText, EuiSpacer, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import { DiscoverFieldBucket } from './discover_field_bucket';
 import { Bucket, FieldDetails } from './types';
-import { DataViewField, DataView } from '../../../../../../data_views/public';
 
 interface DiscoverFieldDetailsProps {
   field: DataViewField;
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
index 454f8620d7b08..1601032fc5af2 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
@@ -13,7 +13,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { DiscoverFieldSearch, Props } from './discover_field_search';
 import { EuiButtonGroupProps, EuiPopover } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 describe('DiscoverFieldSearch', () => {
   const defaultProps = {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx
index 1adb355b6ef40..3cdc0619aa151 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx
@@ -8,7 +8,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 import { triggerVisualizeActions, VisualizeInformation } from './lib/visualize_trigger_utils';
 import type { FieldDetails } from './types';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx
index d2b9e5cd6b587..fcdd85ccb3d70 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DataViewField } from '../../../../../../data_views/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { VisualizeInformation } from './lib/visualize_trigger_utils';
 
 interface DiscoverFieldVisualizeInnerProps {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx
index 488f1ae166772..d640e2fa11594 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx
@@ -12,10 +12,10 @@ import { shallowWithIntl as shallow } from '@kbn/test-jest-helpers';
 import { ShallowWrapper } from 'enzyme';
 import { ChangeIndexPattern } from './change_indexpattern';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { DiscoverIndexPattern, DiscoverIndexPatternProps } from './discover_index_pattern';
 import { EuiSelectable } from '@elastic/eui';
-import type { DataView, DataViewAttributes } from 'src/plugins/data_views/public';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { indexPatternsMock } from '../../../../__mocks__/index_patterns';
 
 const indexPattern = {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx
index 0bbd78ed36cb7..83aa3ce478215 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx
@@ -7,8 +7,8 @@
  */
 
 import React, { useState, useEffect } from 'react';
-import { SavedObject } from 'kibana/public';
-import type { DataView, DataViewAttributes } from 'src/plugins/data_views/public';
+import { SavedObject } from '@kbn/core/public';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { IndexPatternRef } from './types';
 import { ChangeIndexPattern } from './change_indexpattern';
 
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx
index b511dc08f1e91..cddbe087030e7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx
@@ -11,8 +11,8 @@ import { mountWithIntl, findTestSubject } from '@kbn/test-jest-helpers';
 import { EuiContextMenuPanel, EuiPopover, EuiContextMenuItem } from '@elastic/eui';
 import { DiscoverServices } from '../../../../build_services';
 import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
-import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { stubLogstashIndexPattern } from '@kbn/data-plugin/common/stubs';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockServices = {
   history: () => ({
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx
index f993d151f4479..823aa9c0050c0 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx
@@ -15,8 +15,8 @@ import {
   EuiPopover,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import type { DataView } from '../../../../../../data_views/public';
 
 export interface DiscoverIndexPatternManagementProps {
   /**
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
index 3d3c4b9da4516..c26a2c01f256a 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
@@ -10,21 +10,21 @@ import { cloneDeep, each } from 'lodash';
 import { ReactWrapper } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 // @ts-expect-error
-import realHits from '../../../../__fixtures__/real_hits.js';
+import realHits from '../../../../__fixtures__/real_hits';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { DiscoverSidebarProps } from './discover_sidebar';
-import { flattenHit } from '../../../../../../data/public';
-import { DataViewAttributes } from '../../../../../../data_views/public';
-import { SavedObject } from '../../../../../../../core/types';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebarComponent as DiscoverSidebar } from './discover_sidebar';
 import { discoverServiceMock as mockDiscoverServices } from '../../../../__mocks__/services';
-import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
+import { stubLogstashIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
 import { ElasticSearchHit } from '../../../../types';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { BehaviorSubject } from 'rxjs';
 import { FetchStatus } from '../../../types';
 import { AvailableFields$ } from '../../utils/use_saved_search';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
index f3a3f121e36ad..fb6af1bc1b775 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
@@ -25,13 +25,14 @@ import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect';
 
 import { isEqual, sortBy } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { indexPatterns as indexPatternUtils } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverField } from './discover_field';
 import { DiscoverIndexPattern } from './discover_index_pattern';
 import { DiscoverFieldSearch } from './discover_field_search';
 import { FIELDS_LIMIT_SETTING } from '../../../../../common';
 import { groupFields } from './lib/group_fields';
-import { indexPatterns as indexPatternUtils } from '../../../../../../data/public';
 import { getDetails } from './lib/get_details';
 import { FieldFilterState, getDefaultFieldFilter, setFieldFilterProp } from './lib/field_filter';
 import { getIndexPatternFieldList } from './lib/get_index_pattern_field_list';
@@ -39,7 +40,6 @@ import { DiscoverSidebarResponsiveProps } from './discover_sidebar_responsive';
 import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
 import { ElasticSearchHit } from '../../../../types';
-import { DataViewField } from '../../../../../../data_views/public';
 
 /**
  * Default number of available fields displayed and added on scroll
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
index 2adb1e5607a3b..d3af81c06c129 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
@@ -11,13 +11,13 @@ import { BehaviorSubject } from 'rxjs';
 import { ReactWrapper } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 // @ts-expect-error
-import realHits from '../../../../__fixtures__/real_hits.js';
+import realHits from '../../../../__fixtures__/real_hits';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
-import { DataViewAttributes } from '../../../../../../data_views/public';
-import { flattenHit } from '../../../../../../data/public';
-import { SavedObject } from '../../../../../../../core/types';
+import { DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import {
   DiscoverSidebarResponsive,
   DiscoverSidebarResponsiveProps,
@@ -25,10 +25,10 @@ import {
 import { DiscoverServices } from '../../../../build_services';
 import { FetchStatus } from '../../../types';
 import { AvailableFields$, DataDocuments$ } from '../../utils/use_saved_search';
-import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
+import { stubLogstashIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
 import { ElasticSearchHit } from '../../../../types';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockServices = {
   history: () => ({
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
index 506c16de8ee02..f2f58c43d5e7f 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
@@ -26,14 +26,10 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
+import type { DataViewField, DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverIndexPattern } from './discover_index_pattern';
-import type {
-  DataViewField,
-  DataView,
-  DataViewAttributes,
-} from '../../../../../../data_views/public';
-import { SavedObject } from '../../../../../../../core/types';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebar } from './discover_sidebar';
 import { AppState } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js
index 5562d0159a76d..24a2d0d7140e7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js
@@ -8,7 +8,7 @@
 
 import { map, sortBy, without, each, defaults, isObject } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { flattenHit } from '../../../../../../../data/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 
 function getFieldValues(hits, field, indexPattern) {
   const name = field.name;
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts
index f94032afb18d6..d3f8b0064be65 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts
@@ -10,13 +10,13 @@
 
 import { keys, each, cloneDeep, clone, uniq, filter, map } from 'lodash';
 // @ts-expect-error
-import realHits from '../../../../../__fixtures__/real_hits.js';
-import { flattenHit } from '../../../../../../../data/public';
-import type { DataView } from '../../../../../../../data_views/public';
+import realHits from '../../../../../__fixtures__/real_hits';
+import { flattenHit } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
-import { stubLogstashDataView as dataView } from '../../../../../../../data_views/common/data_view.stub';
+import { stubLogstashDataView as dataView } from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('fieldCalculator', function () {
   it('should have a _countMissing that counts nulls & undefineds in an array', function () {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts
index c298c198dd267..7020dfcc418eb 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getDefaultFieldFilter, setFieldFilterProp, isFieldFiltered } from './field_filter';
-import { DataViewField } from '../../../../../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 describe('field_filter', function () {
   it('getDefaultFieldFilter should return default filter state', function () {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts
index 602c25c2c99c9..0ca0cea75ad5c 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from '../../../../../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 export interface FieldFilterState {
   missing: boolean;
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
index 6111b2bf0876d..78e752494c43d 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
-import { DataView, DataViewField } from '../../../../../../../data_views/public';
 import { ElasticSearchHit } from '../../../../../types';
 
 export function getDetails(
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts
index c53e3b494f2cb..eba306098b832 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts
@@ -7,7 +7,7 @@
  */
 
 import { difference } from 'lodash';
-import { DataView, DataViewField } from 'src/plugins/data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { isNestedFieldParent } from '../../../utils/nested_fields';
 
 export function getIndexPatternFieldList(
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts
index afd5eb6964598..10d9d4face166 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts
@@ -8,7 +8,7 @@
 
 import { groupFields } from './group_fields';
 import { getDefaultFieldFilter } from './field_filter';
-import { DataViewField } from '../../../../../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 const fields = [
   {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx
index 8d2a7db8e30a5..587f89d363141 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataViewField, getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
 import { FieldFilterState, isFieldFiltered } from './field_filter';
-import { DataViewField, getFieldSubtypeMulti } from '../../../../../../../data_views/public';
 
 interface GroupedFields {
   selected: DataViewField[];
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts
index 5494f5bfee590..3114e6e574fae 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { DataViewField } from 'src/plugins/data_views/public';
-import type { Action } from 'src/plugins/ui_actions/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
+import type { Action } from '@kbn/ui-actions-plugin/public';
 import { getVisualizeInformation } from './visualize_trigger_utils';
 
 const field = {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts
index ff9406c21c02f..20a0b4a714671 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts
@@ -11,10 +11,10 @@ import {
   VISUALIZE_GEO_FIELD_TRIGGER,
   visualizeFieldTrigger,
   visualizeGeoFieldTrigger,
-} from '../../../../../../../ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getUiActions } from '../../../../../kibana_services';
-import type { DataViewField } from '../../../../../../../data_views/public';
-import { KBN_FIELD_TYPES } from '../../../../../../../data/public';
 
 function getTriggerConstant(type: string) {
   return type === KBN_FIELD_TYPES.GEO_POINT || type === KBN_FIELD_TYPES.GEO_SHAPE
diff --git a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx
index 834e7283bddfb..938d2d55df004 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx
@@ -11,16 +11,16 @@ import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
 import { DiscoverTopNav, DiscoverTopNavProps } from './discover_topnav';
-import { TopNavMenuData } from '../../../../../../navigation/public';
-import { ISearchSource, Query } from '../../../../../../data/public';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
+import { ISearchSource, Query } from '@kbn/data-plugin/public';
 import { GetStateReturn } from '../../services/discover_state';
 import { setHeaderActionMenuMounter } from '../../../../kibana_services';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 
 setHeaderActionMenuMounter(jest.fn());
 
-jest.mock('../../../../../../kibana_react/public', () => ({
-  ...jest.requireActual('../../../../../../kibana_react/public'),
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
+  ...jest.requireActual('@kbn/kibana-react-plugin/public'),
   useKibana: () => ({
     services: jest.requireActual('../../../../__mocks__/services').discoverServiceMock,
   }),
diff --git a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx
index d0b79cf11a519..8656a2fdb7072 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx
@@ -7,13 +7,13 @@
  */
 import React, { useCallback, useMemo } from 'react';
 import { useHistory } from 'react-router-dom';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
+import { DataViewType } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverLayoutProps } from '../layout/types';
 import { getTopNavLinks } from './get_top_nav_links';
-import { Query, TimeRange } from '../../../../../../data/public';
 import { getHeaderActionMenuMounter } from '../../../../kibana_services';
 import { GetStateReturn } from '../../services/discover_state';
-import { DataViewType } from '../../../../../../data_views/public';
 
 export type DiscoverTopNavProps = Pick<
   DiscoverLayoutProps,
diff --git a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts
index 6cf37c5333597..40ef4669db093 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts
+++ b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISearchSource } from 'src/plugins/data/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
 import { getTopNavLinks } from './get_top_nav_links';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx
index abf9a790a2417..f2ac0d2bfa060 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx
@@ -7,17 +7,17 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ISearchSource } from 'src/plugins/data/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { ISearchSource } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { unhashUrl } from '@kbn/kibana-utils-plugin/public';
+import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import { showOpenSearchPanel } from './show_open_search_panel';
 import { getSharingData, showPublicUrlSwitch } from '../../../../utils/get_sharing_data';
-import { unhashUrl } from '../../../../../../kibana_utils/public';
 import { DiscoverServices } from '../../../../build_services';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { onSaveSearch } from './on_save_search';
 import { GetStateReturn } from '../../services/discover_state';
 import { openOptionsPopover } from './open_options_popover';
-import type { TopNavMenuData } from '../../../../../../navigation/public';
 import { openAlertsPopover } from './open_alerts_popover';
 
 /**
diff --git a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx
index c0d4a34a4e429..ec1d9eef5fcc4 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { showSaveModal } from '../../../../../../saved_objects/public';
-jest.mock('../../../../../../saved_objects/public');
+import { showSaveModal } from '@kbn/saved-objects-plugin/public';
+jest.mock('@kbn/saved-objects-plugin/public');
 
 import { onSaveSearch } from './on_save_search';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
 import { DiscoverServices } from '../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
-import { i18nServiceMock } from '../../../../../../../core/public/mocks';
+import { i18nServiceMock } from '@kbn/core/public/mocks';
 
 test('onSaveSearch', async () => {
   const serviceMock = {
diff --git a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx
index c56a7f8f347da..88be94742dfd5 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectSaveModal, showSaveModal } from '../../../../../../saved_objects/public';
+import { SavedObjectSaveModal, showSaveModal } from '@kbn/saved-objects-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearch, SaveSavedSearchOptions } from '../../../../services/saved_searches';
-import { DataView } from '../../../../../../data_views/public';
 import { DiscoverServices } from '../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
 import { setBreadcrumbsTitle } from '../../../../utils/breadcrumbs';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx
index 21d560ccb539d..d414919e567f9 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx
@@ -8,11 +8,11 @@
 
 import React, { useCallback, useState, useMemo } from 'react';
 import ReactDOM from 'react-dom';
-import { I18nStart } from 'kibana/public';
+import { I18nStart } from '@kbn/core/public';
 import { EuiWrappingPopover, EuiLink, EuiContextMenu, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ISearchSource } from '../../../../../../data/common';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { ISearchSource } from '@kbn/data-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../../../../build_services';
 import { updateSearchSource } from '../../utils/update_search_source';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx
index ef64e602280b4..41636ac93139c 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { OptionsPopover } from './open_options_popover';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 test('should display the correct text if datagrid is selected', () => {
   const element = document.createElement('div');
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx
index b52aa21414664..af976ccc7dca3 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreTheme, I18nStart } from 'kibana/public';
+import { CoreTheme, I18nStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import {
@@ -23,10 +23,10 @@ import {
 } from '@elastic/eui';
 import './open_options_popover.scss';
 import { Observable } from 'rxjs';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverServices } from '../../../../build_services';
 import { DOC_TABLE_LEGACY } from '../../../../../common';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../../../../kibana_react/public';
 
 const container = document.createElement('div');
 let isOpen = false;
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx
index 3c972a3f4bb98..3e5a40dd94162 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx
@@ -20,7 +20,7 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
-import { SavedObjectFinderUi } from '../../../../../../saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 
 const SEARCH_OBJECT_TYPE = 'search';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx b/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx
index 6ba1ffd15130a..b437a753af37d 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx
@@ -8,11 +8,11 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreTheme, I18nStart } from 'kibana/public';
+import { CoreTheme, I18nStart } from '@kbn/core/public';
 import { Observable } from 'rxjs';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../../../../build_services';
 import { OpenSearchPanel } from './open_search_panel';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../../../../kibana_react/public';
 
 let isOpen = false;
 
diff --git a/src/plugins/discover/public/application/main/discover_main_app.test.tsx b/src/plugins/discover/public/application/main/discover_main_app.test.tsx
index 86cd009b86d77..ceb06df058fae 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.test.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.test.tsx
@@ -10,11 +10,11 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { DiscoverMainApp } from './discover_main_app';
 import { savedSearchMock } from '../../__mocks__/saved_search';
-import { SavedObject } from '../../../../../core/types';
-import type { DataViewAttributes } from '../../../../data_views/public';
+import { SavedObject } from '@kbn/core/types';
+import type { DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { setHeaderActionMenuMounter } from '../../kibana_services';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { discoverServiceMock } from '../../__mocks__/services';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
index 74bd997df0a42..fd1a438e70d04 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -7,13 +7,13 @@
  */
 import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
+import type { DataViewAttributes } from '@kbn/data-views-plugin/public';
+import type { SavedObject } from '@kbn/data-plugin/public';
 import { DiscoverLayout } from './components/layout';
 import { setBreadcrumbsTitle } from '../../utils/breadcrumbs';
 import { addHelpMenuToAppChrome } from '../../components/help_menu/help_menu_util';
 import { useDiscoverState } from './utils/use_discover_state';
 import { useUrl } from './utils/use_url';
-import type { DataViewAttributes } from '../../../../data_views/public';
-import type { SavedObject } from '../../../../data/public';
 import { SavedSearch } from '../../services/saved_searches';
 import { ElasticSearchHit } from '../../types';
 import { useDiscoverServices } from '../../utils/use_discover_services';
diff --git a/src/plugins/discover/public/application/main/discover_main_route.tsx b/src/plugins/discover/public/application/main/discover_main_route.tsx
index 84d702dab7627..0361cf1764419 100644
--- a/src/plugins/discover/public/application/main/discover_main_route.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_route.tsx
@@ -7,12 +7,14 @@
  */
 import React, { useEffect, useState, memo, useCallback } from 'react';
 import { useParams, useHistory } from 'react-router-dom';
-import { SavedObject } from 'src/plugins/data/public';
-import { ISearchSource } from 'src/plugins/data/public';
+import { SavedObject } from '@kbn/data-plugin/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
 import {
   DataViewAttributes,
   DataViewSavedObjectConflictError,
-} from '../../../../data_views/public';
+} from '@kbn/data-views-plugin/public';
+import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import {
   SavedSearch,
   getSavedSearch,
@@ -22,12 +24,10 @@ import { getState } from './services/discover_state';
 import { loadIndexPattern, resolveIndexPattern } from './utils/resolve_index_pattern';
 import { DiscoverMainApp } from './discover_main_app';
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../../utils/breadcrumbs';
-import { redirectWhenMissing } from '../../../../kibana_utils/public';
 import { LoadingIndicator } from '../../components/common/loading_indicator';
 import { DiscoverError } from '../../components/common/error_alert';
 import { useDiscoverServices } from '../../utils/use_discover_services';
 import { getUrlTracker } from '../../kibana_services';
-import { useExecutionContext } from '../../../../kibana_react/public';
 
 const DiscoverMainAppMemoized = memo(DiscoverMainApp);
 
diff --git a/src/plugins/discover/public/application/main/services/discover_search_session.ts b/src/plugins/discover/public/application/main/services/discover_search_session.ts
index 98376d1e1391a..5797b0381b1bf 100644
--- a/src/plugins/discover/public/application/main/services/discover_search_session.ts
+++ b/src/plugins/discover/public/application/main/services/discover_search_session.ts
@@ -9,12 +9,12 @@
 import { History } from 'history';
 import * as Rx from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { DataPublicPluginStart } from '../../../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   createQueryParamObservable,
   getQueryParams,
   removeQueryParam,
-} from '../../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { SEARCH_SESSION_ID_QUERY_PARAM } from '../../../constants';
 
 export interface DiscoverSearchSessionManagerDeps {
diff --git a/src/plugins/discover/public/application/main/services/discover_state.test.ts b/src/plugins/discover/public/application/main/services/discover_state.test.ts
index 5c9900c6a2d78..f81393454a7c7 100644
--- a/src/plugins/discover/public/application/main/services/discover_state.test.ts
+++ b/src/plugins/discover/public/application/main/services/discover_state.test.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   getState,
   GetStateReturn,
   createSearchSessionRestorationDataProvider,
 } from './discover_state';
 import { createBrowserHistory, History } from 'history';
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import type { SavedSearch } from '../../../services/saved_searches';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../common';
 
diff --git a/src/plugins/discover/public/application/main/services/discover_state.ts b/src/plugins/discover/public/application/main/services/discover_state.ts
index 0d4c947701379..81f25e6151c99 100644
--- a/src/plugins/discover/public/application/main/services/discover_state.ts
+++ b/src/plugins/discover/public/application/main/services/discover_state.ts
@@ -9,7 +9,7 @@
 import { isEqual, cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { History } from 'history';
-import { NotificationsStart, IUiSettingsClient } from 'kibana/public';
+import { NotificationsStart, IUiSettingsClient } from '@kbn/core/public';
 import { Filter, FilterStateStore, compareFilters, COMPARE_ALL_OPTIONS } from '@kbn/es-query';
 import {
   createKbnUrlStateStorage,
@@ -19,7 +19,7 @@ import {
   StateContainer,
   syncState,
   withNotifyOnErrors,
-} from '../../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import {
   connectToQueryState,
   DataPublicPluginStart,
@@ -27,8 +27,8 @@ import {
   Query,
   SearchSessionInfoProvider,
   syncQueryStateWithUrl,
-} from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { migrateLegacyQuery } from '../../../utils/migrate_legacy_query';
 import { DiscoverGridSettings } from '../../../components/discover_grid/types';
 import { SavedSearch } from '../../../services/saved_searches';
diff --git a/src/plugins/discover/public/application/main/utils/calc_field_counts.ts b/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
index 646ac7a10bf0b..cf2b5d7a880b3 100644
--- a/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
+++ b/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView } from '../../../../../data_views/public';
-import { flattenHit } from '../../../../../data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { ElasticSearchHit } from '../../../types';
 
 /**
diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
index bb5d2be1b6d9b..03a414cd70702 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
@@ -8,10 +8,10 @@
 import { FetchStatus } from '../../types';
 import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
 import { reduce } from 'rxjs/operators';
-import { SearchSource } from '../../../../../data/public';
-import { RequestAdapter } from '../../../../../inspector';
+import { SearchSource } from '@kbn/data-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/common';
+import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { AppState } from '../services/discover_state';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { fetchAll } from './fetch_all';
diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.ts b/src/plugins/discover/public/application/main/utils/fetch_all.ts
index da89b88e990a6..a897c2e18f384 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_all.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_all.ts
@@ -5,6 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { Adapters } from '@kbn/inspector-plugin';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
+import { DataViewType } from '@kbn/data-views-plugin/public';
 import {
   sendCompleteMsg,
   sendErrorMsg,
@@ -18,11 +23,8 @@ import type { SavedSearch, SortOrder } from '../../../services/saved_searches';
 import { fetchDocuments } from './fetch_documents';
 import { fetchTotalHits } from './fetch_total_hits';
 import { fetchChart } from './fetch_chart';
-import { ISearchSource } from '../../../../../data/public';
-import { Adapters } from '../../../../../inspector';
 import { AppState } from '../services/discover_state';
 import { FetchStatus } from '../../types';
-import { DataPublicPluginStart } from '../../../../../data/public';
 import {
   DataCharts$,
   DataDocuments$,
@@ -31,8 +33,6 @@ import {
   SavedSearchData,
 } from './use_saved_search';
 import { DiscoverServices } from '../../../build_services';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/common';
-import { DataViewType } from '../../../../../data_views/public';
 
 export interface FetchDeps {
   abortController: AbortController;
diff --git a/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts b/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts
index 17423fad1ae9e..6a5ce76c2e66a 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 import { of, throwError as throwErrorRx } from 'rxjs';
-import { RequestAdapter } from '../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { fetchChart, updateSearchSource } from './fetch_chart';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/common';
+import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { AppState } from '../services/discover_state';
 import { discoverServiceMock } from '../../../__mocks__/services';
-import { calculateBounds, IKibanaSearchResponse } from '../../../../../data/public';
+import { calculateBounds, IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FetchDeps } from './fetch_all';
 
diff --git a/src/plugins/discover/public/application/main/utils/fetch_chart.ts b/src/plugins/discover/public/application/main/utils/fetch_chart.ts
index e279651fccebb..21270e2f94655 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_chart.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_chart.ts
@@ -14,8 +14,8 @@ import {
   search,
   ISearchSource,
   tabifyAggResponse,
-} from '../../../../../data/public';
-import { getChartAggConfigs, getDimensions } from './index';
+} from '@kbn/data-plugin/public';
+import { getChartAggConfigs, getDimensions } from '.';
 import { buildPointSeriesData, Chart } from '../components/chart/point_series';
 import { TimechartBucketInterval } from './use_saved_search';
 import { FetchDeps } from './fetch_all';
diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts
index bca83de0c46dd..5796c488dd8fb 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts
@@ -7,10 +7,10 @@
  */
 import { fetchDocuments } from './fetch_documents';
 import { throwError as throwErrorRx, of } from 'rxjs';
-import { RequestAdapter } from '../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { discoverServiceMock } from '../../../__mocks__/services';
-import { IKibanaSearchResponse } from 'src/plugins/data/public';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import { FetchDeps } from './fetch_all';
 import { fetchTotalHits } from './fetch_total_hits';
diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
index 78535dfcf12ac..d652f544a8f70 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_documents.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { filter, map } from 'rxjs/operators';
 import { lastValueFrom } from 'rxjs';
-import { isCompleteResponse, ISearchSource } from '../../../../../data/public';
+import { isCompleteResponse, ISearchSource } from '@kbn/data-plugin/public';
 import { SAMPLE_SIZE_SETTING } from '../../../../common';
 import { FetchDeps } from './fetch_all';
 
diff --git a/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts b/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts
index 65848d7ddd254..f0e079e146753 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 import { throwError as throwErrorRx, of } from 'rxjs';
-import { RequestAdapter } from '../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { fetchTotalHits } from './fetch_total_hits';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import { IKibanaSearchResponse } from 'src/plugins/data/public';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import { FetchDeps } from './fetch_all';
 
 const getDeps = () =>
diff --git a/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts b/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
index 0a968c43da592..40eb7ebf8db76 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
@@ -9,8 +9,8 @@
 import { i18n } from '@kbn/i18n';
 import { filter, map } from 'rxjs/operators';
 import { lastValueFrom } from 'rxjs';
-import { isCompleteResponse, ISearchSource } from '../../../../../data/public';
-import { DataViewType } from '../../../../../data_views/public';
+import { isCompleteResponse, ISearchSource } from '@kbn/data-plugin/public';
+import { DataViewType } from '@kbn/data-views-plugin/public';
 import { FetchDeps } from './fetch_all';
 
 export function fetchTotalHits(
diff --git a/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts b/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts
index ded1cf1d858af..53200975e0690 100644
--- a/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
-import { ISearchSource } from '../../../../../data/public';
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { getChartAggConfigs } from './get_chart_agg_configs';
 
 describe('getChartAggConfigs', () => {
diff --git a/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts b/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts
index c7210a49fbc32..f816a8dbb2eff 100644
--- a/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts
+++ b/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataPublicPluginStart, ISearchSource } from '../../../../../data/public';
+import { DataPublicPluginStart, ISearchSource } from '@kbn/data-plugin/public';
 
 /**
  * Helper function to apply or remove aggregations to a given search source used for gaining data
diff --git a/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts b/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts
index 1da3a5188ffc9..d50ab1b413e66 100644
--- a/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 import { getDimensions } from './get_dimensions';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
-import { ISearchSource, calculateBounds } from '../../../../../data/public';
+import { ISearchSource, calculateBounds } from '@kbn/data-plugin/public';
 import { getChartAggConfigs } from './get_chart_agg_configs';
 
 test('getDimensions', () => {
diff --git a/src/plugins/discover/public/application/main/utils/get_dimensions.ts b/src/plugins/discover/public/application/main/utils/get_dimensions.ts
index c9a2a198d1f7e..a1ea11609b8ca 100644
--- a/src/plugins/discover/public/application/main/utils/get_dimensions.ts
+++ b/src/plugins/discover/public/application/main/utils/get_dimensions.ts
@@ -7,7 +7,7 @@
  */
 import moment from 'moment';
 import dateMath from '@kbn/datemath';
-import { DataPublicPluginStart, search, IAggConfigs } from '../../../../../data/public';
+import { DataPublicPluginStart, search, IAggConfigs } from '@kbn/data-plugin/public';
 import { Dimensions, HistogramParamsBounds } from '../components/chart/point_series';
 
 export function getDimensions(
diff --git a/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts b/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
index 8c0d614f7ac61..2265de776c065 100644
--- a/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
+++ b/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
@@ -8,12 +8,12 @@
 import { merge } from 'rxjs';
 import { debounceTime, filter, skip, tap } from 'rxjs/operators';
 
-import { FetchStatus } from '../../types';
 import type {
   AutoRefreshDoneFn,
   DataPublicPluginStart,
   ISearchSource,
-} from '../../../../../data/public';
+} from '@kbn/data-plugin/public';
+import { FetchStatus } from '../../types';
 import { DataMain$, DataRefetch$ } from './use_saved_search';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
 
diff --git a/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts b/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
index 7fb51506f6ce4..aa75a04b15bca 100644
--- a/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
@@ -9,7 +9,7 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { getFetch$ } from './get_fetch_observable';
 import { FetchStatus } from '../../types';
-import { DataPublicPluginStart } from '../../../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { createSearchSessionMock } from '../../../__mocks__/search_session';
 import { DataRefetch$ } from './use_saved_search';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
index 1b651643e8443..d6842846a5cf7 100644
--- a/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getStateDefaults } from './get_state_defaults';
-import { createSearchSourceMock, dataPluginMock } from '../../../../../data/public/mocks';
+import { createSearchSourceMock, dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { uiSettingsMock } from '../../../__mocks__/ui_settings';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
index 56197218355cd..b75e3eb612cc4 100644
--- a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
+++ b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
@@ -7,7 +7,9 @@
  */
 
 import { cloneDeep, isEqual } from 'lodash';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import {
   DEFAULT_COLUMNS_SETTING,
   DOC_HIDE_TIME_COLUMN_SETTING,
@@ -15,12 +17,10 @@ import {
   SORT_DEFAULT_ORDER_SETTING,
 } from '../../../../common';
 import { SavedSearch } from '../../../services/saved_searches';
-import { DataPublicPluginStart } from '../../../../../data/public';
 
 import { AppState } from '../services/discover_state';
 import { getDefaultSort, getSortArray } from '../../../components/doc_table';
 import { CHART_HIDDEN_KEY } from '../components/chart/discover_chart';
-import { Storage } from '../../../../../kibana_utils/public';
 
 function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient) {
   if (savedSearch.columns && savedSearch.columns.length > 0) {
diff --git a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts
index aeb51ad0606e5..8b60a6215eaff 100644
--- a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getSwitchIndexPatternAppState } from './get_switch_index_pattern_app_state';
-import { DataView } from '../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 /**
  * Helper function returning an index pattern
diff --git a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
index b047c2743809b..bf9aeee042fb8 100644
--- a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
+++ b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getSortArray, SortPairArr } from '../../../components/doc_table/lib/get_sort';
 
 /**
diff --git a/src/plugins/discover/public/application/main/utils/nested_fields.ts b/src/plugins/discover/public/application/main/utils/nested_fields.ts
index 2690c815717aa..74edeca32b3f6 100644
--- a/src/plugins/discover/public/application/main/utils/nested_fields.ts
+++ b/src/plugins/discover/public/application/main/utils/nested_fields.ts
@@ -7,8 +7,8 @@
  */
 
 import { escapeRegExp } from 'lodash/fp';
-import { getFieldSubtypeNested } from '../../../../../data_views/public';
-import type { DataView } from '../../../../../data_views/public';
+import { getFieldSubtypeNested } from '@kbn/data-views-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 /**
  * This function checks if the given field in a given index pattern is a nested field's parent.
diff --git a/src/plugins/discover/public/application/main/utils/persist_saved_search.ts b/src/plugins/discover/public/application/main/utils/persist_saved_search.ts
index c73cf982d484d..30430abd941a8 100644
--- a/src/plugins/discover/public/application/main/utils/persist_saved_search.ts
+++ b/src/plugins/discover/public/application/main/utils/persist_saved_search.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SavedObjectSaveOpts } from '@kbn/saved-objects-plugin/public';
 import { updateSearchSource } from './update_search_source';
-import { DataView } from '../../../../../data_views/public';
 import { SavedSearch } from '../../../services/saved_searches';
 import { AppState } from '../services/discover_state';
 import type { SortOrder } from '../../../services/saved_searches';
-import { SavedObjectSaveOpts } from '../../../../../saved_objects/public';
 import { DiscoverServices } from '../../../build_services';
 import { saveSavedSearch } from '../../../services/saved_searches';
 
diff --git a/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts b/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts
index 54a26a77e76c6..d58aea6f5a6fe 100644
--- a/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts
+++ b/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts
@@ -7,9 +7,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { DataView, DataViewsContract } from 'src/plugins/data_views/public';
-import type { ISearchSource } from 'src/plugins/data/public';
-import type { IUiSettingsClient, SavedObject, ToastsStart } from 'kibana/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import type { ISearchSource } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient, SavedObject, ToastsStart } from '@kbn/core/public';
 export type IndexPatternSavedObject = SavedObject & { title: string };
 
 interface IndexPatternData {
diff --git a/src/plugins/discover/public/application/main/utils/update_search_source.test.ts b/src/plugins/discover/public/application/main/utils/update_search_source.test.ts
index 3d36cf1cce5da..d21474c631756 100644
--- a/src/plugins/discover/public/application/main/utils/update_search_source.test.ts
+++ b/src/plugins/discover/public/application/main/utils/update_search_source.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { updateSearchSource } from './update_search_source';
-import { createSearchSourceMock } from '../../../../../data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import type { SortOrder } from '../../../services/saved_searches';
 import { discoverServiceMock } from '../../../__mocks__/services';
diff --git a/src/plugins/discover/public/application/main/utils/update_search_source.ts b/src/plugins/discover/public/application/main/utils/update_search_source.ts
index a94023f04e054..3cc547aaab83a 100644
--- a/src/plugins/discover/public/application/main/utils/update_search_source.ts
+++ b/src/plugins/discover/public/application/main/utils/update_search_source.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { DataViewType, DataView } from '@kbn/data-views-plugin/public';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../common';
-import { ISearchSource } from '../../../../../data/public';
-import { DataViewType, DataView } from '../../../../../data_views/public';
 import type { SortOrder } from '../../../services/saved_searches';
 import { DiscoverServices } from '../../../build_services';
 import { getSortForSearchSource } from '../../../components/doc_table';
diff --git a/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts b/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
index 0c85885899232..50c33b72378c9 100644
--- a/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
+++ b/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
@@ -12,7 +12,7 @@ import { discoverServiceMock } from '../../../__mocks__/services';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { useDiscoverState } from './use_discover_state';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { SearchSource } from '../../../../../data/public';
+import { SearchSource } from '@kbn/data-plugin/public';
 
 describe('test useDiscoverState', () => {
   const originalSavedObjectsClient = discoverServiceMock.core.savedObjects.client;
diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.ts
index 8197979e103eb..5c9ea00d6558c 100644
--- a/src/plugins/discover/public/application/main/utils/use_saved_search.ts
+++ b/src/plugins/discover/public/application/main/utils/use_saved_search.ts
@@ -7,12 +7,12 @@
  */
 import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { BehaviorSubject, Subject } from 'rxjs';
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin/public';
+import type { AutoRefreshDoneFn } from '@kbn/data-plugin/public';
 import { DiscoverServices } from '../../../build_services';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
-import { ISearchSource } from '../../../../../data/public';
 import { GetStateReturn } from '../services/discover_state';
-import { RequestAdapter } from '../../../../../inspector/public';
-import type { AutoRefreshDoneFn } from '../../../../../data/public';
 import { validateTimeRange } from './validate_time_range';
 import { Chart } from '../components/chart/point_series';
 import { useSingleton } from './use_singleton';
diff --git a/src/plugins/discover/public/application/main/utils/use_search_session.ts b/src/plugins/discover/public/application/main/utils/use_search_session.ts
index c18261f1ffaac..1bdbc27968f73 100644
--- a/src/plugins/discover/public/application/main/utils/use_search_session.ts
+++ b/src/plugins/discover/public/application/main/utils/use_search_session.ts
@@ -7,12 +7,12 @@
  */
 import { useMemo, useEffect } from 'react';
 import { History } from 'history';
+import { noSearchSessionStorageCapabilityMessage } from '@kbn/data-plugin/public';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
 import {
   createSearchSessionRestorationDataProvider,
   GetStateReturn,
 } from '../services/discover_state';
-import { noSearchSessionStorageCapabilityMessage } from '../../../../../data/public';
 import { DiscoverServices } from '../../../build_services';
 import { SavedSearch } from '../../../services/saved_searches';
 
diff --git a/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts b/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts
index ff3a66b1edfa3..bc0ed5f9c51c9 100644
--- a/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts
+++ b/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { validateTimeRange } from './validate_time_range';
-import { notificationServiceMock } from '../../../../../../core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 
 describe('Discover validateTimeRange', () => {
   test('validates given time ranges correctly', async () => {
diff --git a/src/plugins/discover/public/application/main/utils/validate_time_range.ts b/src/plugins/discover/public/application/main/utils/validate_time_range.ts
index 7744a10f3e8ca..83d5f18de7f95 100644
--- a/src/plugins/discover/public/application/main/utils/validate_time_range.ts
+++ b/src/plugins/discover/public/application/main/utils/validate_time_range.ts
@@ -8,7 +8,7 @@
 
 import dateMath from '@kbn/datemath';
 import { i18n } from '@kbn/i18n';
-import { ToastsStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
 
 /**
  * Validates a given time filter range, provided by URL or UI
diff --git a/src/plugins/discover/public/application/not_found/not_found_route.tsx b/src/plugins/discover/public/application/not_found/not_found_route.tsx
index 28f525039dd1e..d4844c67b827e 100644
--- a/src/plugins/discover/public/application/not_found/not_found_route.tsx
+++ b/src/plugins/discover/public/application/not_found/not_found_route.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiCallOut } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Redirect } from 'react-router-dom';
-import { toMountPoint, wrapWithTheme } from '../../../../kibana_react/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { getUrlTracker } from '../../kibana_services';
 import { useDiscoverServices } from '../../utils/use_discover_services';
 
diff --git a/src/plugins/discover/public/application/view_alert/view_alert_route.tsx b/src/plugins/discover/public/application/view_alert/view_alert_route.tsx
index 2a6fa70ef0e2b..7eaefcbcd3c52 100644
--- a/src/plugins/discover/public/application/view_alert/view_alert_route.tsx
+++ b/src/plugins/discover/public/application/view_alert/view_alert_route.tsx
@@ -9,9 +9,9 @@
 import { useEffect, useMemo } from 'react';
 import { useHistory, useLocation, useParams } from 'react-router-dom';
 import { sha256 } from 'js-sha256';
-import type { Rule } from '../../../../../../x-pack/plugins/alerting/common';
-import { getTime, IndexPattern } from '../../../../data/common';
-import type { Filter } from '../../../../data/public';
+import type { Rule } from '@kbn/alerting-plugin/common';
+import { getTime, IndexPattern } from '@kbn/data-plugin/common';
+import type { Filter } from '@kbn/data-plugin/public';
 import { DiscoverAppLocatorParams } from '../../locator';
 import { useDiscoverServices } from '../../utils/use_discover_services';
 import { getAlertUtils, QueryParams, SearchThresholdAlertParams } from './view_alert_utils';
diff --git a/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx b/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx
index 585da8c676417..6ae74632f9379 100644
--- a/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx
+++ b/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx
@@ -8,12 +8,12 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { CoreStart, ToastsStart } from 'kibana/public';
-import type { Rule } from '../../../../../../x-pack/plugins/alerting/common';
-import type { RuleTypeParams } from '../../../../../../x-pack/plugins/alerting/common';
-import { SerializedSearchSourceFields } from '../../../../data/common';
-import type { DataPublicPluginStart } from '../../../../data/public';
-import { MarkdownSimple, toMountPoint } from '../../../../kibana_react/public';
+import { CoreStart, ToastsStart } from '@kbn/core/public';
+import type { Rule } from '@kbn/alerting-plugin/common';
+import type { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { MarkdownSimple, toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export interface SearchThresholdAlertParams extends RuleTypeParams {
   searchConfiguration: SerializedSearchSourceFields;
diff --git a/src/plugins/discover/public/build_services.ts b/src/plugins/discover/public/build_services.ts
index 100235cb95a0d..d77bc5dde2660 100644
--- a/src/plugins/discover/public/build_services.ts
+++ b/src/plugins/discover/public/build_services.ts
@@ -20,31 +20,31 @@ import {
   HttpStart,
   NotificationsStart,
   ApplicationStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import {
   FilterManager,
   TimefilterContract,
   DataViewsContract,
   DataPublicPluginStart,
-} from 'src/plugins/data/public';
-import { Start as InspectorPublicPluginStart } from 'src/plugins/inspector/public';
-import { SharePluginStart } from 'src/plugins/share/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
+} from '@kbn/data-plugin/public';
+import { Start as InspectorPublicPluginStart } from '@kbn/inspector-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { Storage } from '../../kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
-import { DiscoverStartPlugins } from './plugin';
-import { getHistory } from './kibana_services';
-import { UrlForwardingStart } from '../../url_forwarding/public';
-import { NavigationPublicPluginStart } from '../../navigation/public';
-import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/public';
-import { FieldFormatsStart } from '../../field_formats/public';
-import { EmbeddableStart } from '../../embeddable/public';
-import { DiscoverAppLocator } from './locator';
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 
-import type { SpacesApi } from '../../../../x-pack/plugins/spaces/public';
-import { DataViewEditorStart } from '../../../plugins/data_view_editor/public';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../x-pack/plugins/triggers_actions_ui/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { DiscoverAppLocator } from './locator';
+import { getHistory } from './kibana_services';
+import { DiscoverStartPlugins } from './plugin';
 
 export interface HistoryLocationState {
   referrer: string;
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
index f2b3b130e395c..c5ac7335b69c2 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
@@ -16,7 +16,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DiscoverGrid, DiscoverGridProps } from './discover_grid';
 import { getDocId } from './discover_grid_document_selection';
 import { ElasticSearchHit } from '../../types';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { discoverServiceMock } from '../../__mocks__/services';
 
 function getProps() {
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
index 1074897e6a118..da9892f343d70 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
@@ -20,8 +20,8 @@ import {
   EuiLoadingSpinner,
   EuiIcon,
 } from '@elastic/eui';
-import type { DataView } from '../../../../data_views/public';
-import { flattenHit } from '../../../../data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import { getSchemaDetectors } from './discover_grid_schema';
 import { DiscoverGridFlyout } from './discover_grid_flyout';
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
index 497a8a1d953a7..c94b660b26893 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
@@ -15,7 +15,7 @@ import { DiscoverGridContext } from './discover_grid_context';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { esHits } from '../../__mocks__/es_hits';
 import { EuiButton } from '@elastic/eui';
-import { DataViewField } from 'src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 describe('Discover cell actions ', function () {
   it('should not show cell actions for unfilterable fields', async () => {
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx
index dac15af537563..1ac99da2ee8c0 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx
@@ -9,8 +9,8 @@
 import React, { useContext } from 'react';
 import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataViewField } from '../../../../data_views/public';
-import { flattenHit } from '../../../../data/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { DiscoverGridContext } from './discover_grid_context';
 
 export const FilterInBtn = ({
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx
index 23ccba6638ebb..d441c3e5aba75 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx
@@ -9,9 +9,9 @@
 import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiDataGridColumn, EuiIconTip, EuiScreenReaderOnly } from '@elastic/eui';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { ExpandButton } from './discover_grid_expand_button';
 import { DiscoverGridSettings } from './types';
-import type { DataView } from '../../../../data_views/public';
 import { buildCellActions } from './discover_grid_cell_actions';
 import { getSchemaByKbnType } from './discover_grid_schema';
 import { SelectButton } from './discover_grid_document_selection';
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx
index 33977d24b88a1..41d58cf213336 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import type { ElasticSearchHit } from '../../types';
 
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx
index cfda4b6579054..6452349bbdc77 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx
@@ -11,14 +11,14 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DiscoverGridFlyout, DiscoverGridFlyoutProps } from './discover_grid_flyout';
 import { esHits } from '../../__mocks__/es_hits';
-import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { DiscoverServices } from '../../build_services';
 import { DocViewsRegistry } from '../../services/doc_views/doc_views_registry';
 import { setDocViewsRegistry } from '../../kibana_services';
 import { indexPatternWithTimefieldMock } from '../../__mocks__/index_pattern_with_timefield';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import type { DataView } from '../../../../data_views/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { ElasticSearchHit } from '../../types';
 
 describe('Discover flyout', function () {
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index 1b2e0de906763..a8cd9dc259d8b 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -8,7 +8,7 @@
 
 import React, { useMemo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   EuiFlexGroup,
   EuiFlexItem,
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts b/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts
index 0cd90cebf226f..dde4be2e76841 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { kibanaJSON } from './constants';
-import { KBN_FIELD_TYPES } from '../../../../data/public';
 
 export function getSchemaByKbnType(kbnType: string | undefined) {
   // Default DataGrid schemas: boolean, numeric, datetime, json, currency, string
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
index 901aeb71737ee..be4c69f1ced25 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { getRenderCellValueFn } from './get_render_cell_value';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
-import { flattenHit } from 'src/plugins/data/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { ElasticSearchHit } from '../../types';
 
 jest.mock('../../utils/use_discover_services', () => {
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx
index fe69ecc91d34b..159ebae3f18f0 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx
@@ -8,14 +8,14 @@
 
 import React, { Fragment, useContext, useEffect, useMemo } from 'react';
 import { euiLightVars as themeLight, euiDarkVars as themeDark } from '@kbn/ui-theme';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import {
   EuiDataGridCellValueElementProps,
   EuiDescriptionList,
   EuiDescriptionListTitle,
   EuiDescriptionListDescription,
 } from '@elastic/eui';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DiscoverGridContext } from './discover_grid_context';
 import { JsonCodeEditor } from '../json_code_editor/json_code_editor';
 import { defaultMonacoEditorWidth } from './constants';
diff --git a/src/plugins/discover/public/components/doc_table/_doc_table.scss b/src/plugins/discover/public/components/doc_table/_doc_table.scss
index 164b61d42df19..4553cdc05fdad 100644
--- a/src/plugins/discover/public/components/doc_table/_doc_table.scss
+++ b/src/plugins/discover/public/components/doc_table/_doc_table.scss
@@ -124,3 +124,7 @@
     }
   }
 }
+
+.dscTruncateByHeight {
+  display: inline-block;
+}
diff --git a/src/plugins/discover/public/components/doc_table/actions/columns.test.ts b/src/plugins/discover/public/components/doc_table/actions/columns.test.ts
index 5f3c7d203122f..92cd4dc142fac 100644
--- a/src/plugins/discover/public/components/doc_table/actions/columns.test.ts
+++ b/src/plugins/discover/public/components/doc_table/actions/columns.test.ts
@@ -10,7 +10,7 @@ import { getStateColumnActions } from './columns';
 import { configMock } from '../../../__mocks__/config';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { indexPatternsMock } from '../../../__mocks__/index_patterns';
-import { Capabilities } from '../../../../../../core/types';
+import { Capabilities } from '@kbn/core/types';
 import { AppState } from '../../../application/main/services/discover_state';
 
 function getStateColumnAction(state: {}, setAppState: (state: Partial<AppState>) => void) {
diff --git a/src/plugins/discover/public/components/doc_table/actions/columns.ts b/src/plugins/discover/public/components/doc_table/actions/columns.ts
index ec3d2b42560f9..3d97a9dff273a 100644
--- a/src/plugins/discover/public/components/doc_table/actions/columns.ts
+++ b/src/plugins/discover/public/components/doc_table/actions/columns.ts
@@ -5,7 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Capabilities, IUiSettingsClient } from 'kibana/public';
+import { Capabilities, IUiSettingsClient } from '@kbn/core/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../common';
 import {
   AppState as DiscoverState,
@@ -15,8 +17,6 @@ import {
   AppState as ContextState,
   GetStateReturn as ContextGetStateReturn,
 } from '../../../application/context/services/context_state';
-import { DataViewsContract } from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
 import { popularizeField } from '../../../utils/popularize_field';
 
 /**
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx b/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx
index 56d9a3689a911..e47da5a67c509 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export type SortOrder = [string, string];
 export interface ColumnProps {
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx
index b1f5f69b6d096..b6308023f4f7d 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx
@@ -8,13 +8,13 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { TableHeader } from './table_header';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { SortOrder } from './helpers';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DOC_HIDE_TIME_COLUMN_SETTING } from '../../../../../common';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 
 const defaultUiSettings = {
   get: (key: string) => {
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx
index f1e594cb8b9c8..e3fd1696497fa 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx
@@ -7,13 +7,13 @@
  */
 
 import React, { useMemo } from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { TableHeaderColumn } from './table_header_column';
 import { SortOrder, getDisplayedColumns } from './helpers';
 import { getDefaultSort } from '../../lib/get_default_sort';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
 
 interface Props {
   columns: string[];
diff --git a/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx b/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx
index 61e536129ffdb..f2cfc9c6ad698 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx
@@ -10,16 +10,13 @@ import React from 'react';
 import { mountWithIntl, findTestSubject } from '@kbn/test-jest-helpers';
 import { TableRow, TableRowProps } from './table_row';
 import { setDocViewsRegistry } from '../../../kibana_services';
-import { createFilterManagerMock } from '../../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
 import { DocViewsRegistry } from '../../../services/doc_views/doc_views_registry';
-import { KibanaContextProvider } from '../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { discoverServiceMock } from '../../../__mocks__/services';
 
-import {
-  DOC_HIDE_TIME_COLUMN_SETTING,
-  MAX_DOC_FIELDS_DISPLAYED,
-} from '../../../../../discover/common';
+import { DOC_HIDE_TIME_COLUMN_SETTING, MAX_DOC_FIELDS_DISPLAYED } from '../../../../common';
 
 jest.mock('../lib/row_formatter', () => {
   const originalModule = jest.requireActual('../lib/row_formatter');
diff --git a/src/plugins/discover/public/components/doc_table/components/table_row.tsx b/src/plugins/discover/public/components/doc_table/components/table_row.tsx
index b14db847e3ed8..17c448f35d2a5 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_row.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_row.tsx
@@ -10,9 +10,9 @@ import React, { Fragment, useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiIcon } from '@elastic/eui';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { formatFieldValue } from '../../../utils/format_value';
-import { flattenHit } from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
 import { DocViewer } from '../../../services/doc_views/components/doc_viewer';
 import { TableCell } from './table_row/table_cell';
 import { formatRow, formatTopLevelObject } from '../lib/row_formatter';
diff --git a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx
index 9de67c340f8bd..3e7e9523c2901 100644
--- a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx
+++ b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx
@@ -12,7 +12,7 @@ import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { DocTableWrapper } from './doc_table_wrapper';
 import { DocTableRow } from './components/table_row';
 import { discoverServiceMock } from '../../__mocks__/services';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 describe('Doc table component', () => {
   const mountComponent = (rows?: DocTableRow[]) => {
diff --git a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx
index 334c825d78de0..d636ed37f7f27 100644
--- a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx
+++ b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx
@@ -8,7 +8,7 @@
 
 import React, { forwardRef, useCallback, useMemo } from 'react';
 import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { TableHeader } from './components/table_header/table_header';
 import { SHOW_MULTIFIELDS } from '../../../common';
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts
index c468301060400..af8f8a805f202 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts
@@ -10,7 +10,7 @@ import { getDefaultSort } from './get_default_sort';
 import {
   stubDataView,
   stubDataViewWithoutTimeField,
-} from '../../../../../data_views/common/data_view.stub';
+} from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('getDefaultSort function', function () {
   test('should be a function', function () {
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts
index 341d028206747..f1e3a2e1ffe86 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { isSortable } from './get_sort';
 import { SortOrder } from '../components/table_header/helpers';
 
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts
index dce52adb82519..f778bbd8fecaa 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts
@@ -10,7 +10,7 @@ import { getSort, getSortArray } from './get_sort';
 import {
   stubDataView,
   stubDataViewWithoutTimeField,
-} from '../../../../../data_views/common/data_view.stub';
+} from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('docTable', function () {
   describe('getSort function', function () {
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort.ts
index 5738bb8dc329e..f7cceaa650e2b 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort.ts
@@ -7,7 +7,7 @@
  */
 
 import { isPlainObject } from 'lodash';
-import { DataView } from '../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export type SortPairObj = Record<string, string>;
 export type SortPairArr = [string, string];
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts
index 2d3c00ae3ad10..729d74cb710fa 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts
@@ -8,7 +8,7 @@
 
 import { getSortForSearchSource } from './get_sort_for_search_source';
 import { SortOrder } from '../components/table_header/helpers';
-import { stubDataView, stubDataViewWithoutTimeField } from '../../../../../data/common/stubs';
+import { stubDataView, stubDataViewWithoutTimeField } from '@kbn/data-plugin/common/stubs';
 
 describe('getSortForSearchSource function', function () {
   test('should be a function', function () {
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts
index d2314c41c5044..aa80d682d163d 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
-import type { EsQuerySortValue } from 'src/plugins/data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { EsQuerySortValue } from '@kbn/data-plugin/public';
 import { SortOrder } from '../components/table_header/helpers';
 import { getSort } from './get_sort';
 
diff --git a/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts b/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts
index ca6cfd5cb8d10..9721179867145 100644
--- a/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts
@@ -8,10 +8,10 @@
 
 import ReactDOM from 'react-dom/server';
 import { formatRow, formatTopLevelObject } from './row_formatter';
-import { DataView } from '../../../../../data_views/public';
-import { fieldFormatsMock } from '../../../../../field_formats/common/mocks';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { DiscoverServices } from '../../../build_services';
-import { stubbedSavedObjectIndexPattern } from '../../../../../data/common/stubs';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-plugin/common/stubs';
 
 describe('Row formatter', () => {
   const hit = {
diff --git a/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx b/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx
index 5c8c9c05f5fe3..932a952cec09f 100644
--- a/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx
+++ b/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx
@@ -8,8 +8,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import React, { Fragment } from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { formatHit } from '../../../utils/format_hit';
 
 import './row_formatter.scss';
diff --git a/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx b/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx
index 0882991a42cd1..ebc8f2f84c833 100644
--- a/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx
+++ b/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx
@@ -9,8 +9,8 @@
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { FieldName } from '../field_name';
-import { DataViewField } from '../../../../../data_views/public';
 
 const field = new DataViewField({
   name: 'bytes',
diff --git a/src/plugins/discover/public/components/field_name/field_name.tsx b/src/plugins/discover/public/components/field_name/field_name.tsx
index 8d29606f54ae1..d937e58ff5256 100644
--- a/src/plugins/discover/public/components/field_name/field_name.tsx
+++ b/src/plugins/discover/public/components/field_name/field_name.tsx
@@ -12,9 +12,9 @@ import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { FieldIcon, FieldIconProps } from '@kbn/react-field';
+import { getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { getFieldTypeName } from './field_type_name';
-import { getFieldSubtypeMulti } from '../../../../data_views/public';
-import type { DataViewField } from '../../../../data_views/public';
 
 interface Props {
   fieldName: string;
diff --git a/src/plugins/discover/public/components/help_menu/help_menu_util.ts b/src/plugins/discover/public/components/help_menu/help_menu_util.ts
index d0d5cfde1fe06..8e34d9cc3c127 100644
--- a/src/plugins/discover/public/components/help_menu/help_menu_util.ts
+++ b/src/plugins/discover/public/components/help_menu/help_menu_util.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { ChromeStart, DocLinksStart } from '@kbn/core/public';
 
 export function addHelpMenuToAppChrome(chrome: ChromeStart, docLinks: DocLinksStart) {
   chrome.setHelpExtension({
diff --git a/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx b/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx
index 5c247d0fe7381..5f6faa8ac0e9d 100644
--- a/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx
+++ b/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { monaco, XJsonLang } from '@kbn/monaco';
 import { EuiButtonEmpty, EuiCopy, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { CodeEditor } from '../../../../kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 const codeEditorAriaLabel = i18n.translate('discover.json.codeEditorAriaLabel', {
   defaultMessage: 'Read only JSON view of an elasticsearch document',
diff --git a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
index a5702da29975c..0b5d0bc922160 100644
--- a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
+++ b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
@@ -13,18 +13,19 @@ import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { KibanaExecutionContext } from 'kibana/public';
-import { Container, Embeddable } from '../../../embeddable/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { Container, Embeddable } from '@kbn/embeddable-plugin/public';
+import { Adapters, RequestAdapter } from '@kbn/inspector-plugin/common';
+import { APPLY_FILTER_TRIGGER, FilterManager, generateFilters } from '@kbn/data-plugin/public';
+import { ISearchSource, Query, TimeRange, FilterStateStore } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
 import { SavedSearch } from '../services/saved_searches';
-import { Adapters, RequestAdapter } from '../../../inspector/common';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
-import { APPLY_FILTER_TRIGGER, FilterManager, generateFilters } from '../../../data/public';
 import { DiscoverServices } from '../build_services';
-import { ISearchSource, Query, TimeRange, FilterStateStore } from '../../../data/public';
-import { DataView, DataViewField } from '../../../data_views/public';
 import { SavedSearchEmbeddableComponent } from './saved_search_embeddable_component';
-import { UiActionsStart } from '../../../ui_actions/public';
 import {
   DOC_HIDE_TIME_COLUMN_SETTING,
   DOC_TABLE_LEGACY,
@@ -44,7 +45,6 @@ import { VIEW_MODE } from '../components/view_mode_toggle';
 import { updateSearchSource } from './utils/update_search_source';
 import { FieldStatisticsTable } from '../application/main/components/field_stats_table';
 import { ElasticSearchHit } from '../types';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
 
 export type SearchProps = Partial<DiscoverGridProps> &
   Partial<DocTableProps> & {
diff --git a/src/plugins/discover/public/embeddable/search_embeddable_factory.ts b/src/plugins/discover/public/embeddable/search_embeddable_factory.ts
index be391282ea57d..eeb2200b1f7e7 100644
--- a/src/plugins/discover/public/embeddable/search_embeddable_factory.ts
+++ b/src/plugins/discover/public/embeddable/search_embeddable_factory.ts
@@ -7,14 +7,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   EmbeddableFactoryDefinition,
   Container,
   ErrorEmbeddable,
-} from '../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 
-import { TimeRange } from '../../../data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 
 import { SearchInput, SearchOutput } from './types';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
diff --git a/src/plugins/discover/public/embeddable/types.ts b/src/plugins/discover/public/embeddable/types.ts
index 74fc89e498cdf..10f99e301b0ea 100644
--- a/src/plugins/discover/public/embeddable/types.ts
+++ b/src/plugins/discover/public/embeddable/types.ts
@@ -11,10 +11,10 @@ import {
   EmbeddableInput,
   EmbeddableOutput,
   IEmbeddable,
-} from 'src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import type { Filter } from '@kbn/es-query';
-import { DataView } from '../../../data_views/public';
-import type { TimeRange, Query } from '../../../data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { TimeRange, Query } from '@kbn/data-plugin/public';
 import { SavedSearch } from '../services/saved_searches';
 import { SortOrder } from '../components/doc_table/components/table_header/helpers';
 
diff --git a/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts b/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts
index cd2f6cf88cfa3..3bc82bc25e277 100644
--- a/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts
+++ b/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { updateSearchSource } from './update_search_source';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import type { SortOrder } from '../../services/saved_searches';
diff --git a/src/plugins/discover/public/embeddable/utils/update_search_source.ts b/src/plugins/discover/public/embeddable/utils/update_search_source.ts
index dcc619ec18dae..7f383b910b990 100644
--- a/src/plugins/discover/public/embeddable/utils/update_search_source.ts
+++ b/src/plugins/discover/public/embeddable/utils/update_search_source.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataView } from '../../../../data_views/public';
-import { ISearchSource } from '../../../../data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
 import { getSortForSearchSource } from '../../components/doc_table';
 import { SortPairArr } from '../../components/doc_table/lib/get_sort';
 
diff --git a/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts b/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts
index cf8dc8020b06d..e7a84a0bd1c74 100644
--- a/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts
+++ b/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { ContactCardEmbeddable } from 'src/plugins/embeddable/public/lib/test_samples';
+import { ContactCardEmbeddable } from '@kbn/embeddable-plugin/public/lib/test_samples';
 
 import { ViewSavedSearchAction } from './view_saved_search_action';
 import { SavedSearchEmbeddable } from './saved_search_embeddable';
 import { createStartContractMock } from '../__mocks__/start_contract';
 import { savedSearchMock } from '../__mocks__/saved_search';
 import { discoverServiceMock } from '../__mocks__/services';
-import { DataView } from 'src/plugins/data_views/public';
-import { createFilterManagerMock } from 'src/plugins/data/public/query/filter_manager/filter_manager.mock';
-import { ViewMode } from 'src/plugins/embeddable/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 const applicationMock = createStartContractMock();
 const savedSearch = savedSearchMock;
diff --git a/src/plugins/discover/public/embeddable/view_saved_search_action.ts b/src/plugins/discover/public/embeddable/view_saved_search_action.ts
index b9bbc21cfef2c..59e27de85c2bd 100644
--- a/src/plugins/discover/public/embeddable/view_saved_search_action.ts
+++ b/src/plugins/discover/public/embeddable/view_saved_search_action.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ActionExecutionContext } from 'src/plugins/ui_actions/public';
-import { ApplicationStart } from 'kibana/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable, ViewMode } from '../../../embeddable/public';
-import { Action } from '../../../ui_actions/public';
+import { IEmbeddable, ViewMode } from '@kbn/embeddable-plugin/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 import { SavedSearchEmbeddable } from './saved_search_embeddable';
 import { SEARCH_EMBEDDABLE_TYPE } from '../../common';
 import { getSavedSearchUrl } from '../services/saved_searches';
diff --git a/src/plugins/discover/public/index.ts b/src/plugins/discover/public/index.ts
index 0ce755006b692..936efb7239313 100644
--- a/src/plugins/discover/public/index.ts
+++ b/src/plugins/discover/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DiscoverPlugin } from './plugin';
 
 export type { SavedSearch } from './services/saved_searches';
diff --git a/src/plugins/discover/public/kibana_services.ts b/src/plugins/discover/public/kibana_services.ts
index f055d2b67ade1..e1ddf2b2b148c 100644
--- a/src/plugins/discover/public/kibana_services.ts
+++ b/src/plugins/discover/public/kibana_services.ts
@@ -8,10 +8,10 @@
 
 import { once } from 'lodash';
 import { createHashHistory } from 'history';
-import type { ScopedHistory, AppMountParameters } from 'kibana/public';
-import type { UiActionsStart } from 'src/plugins/ui_actions/public';
+import type { ScopedHistory, AppMountParameters } from '@kbn/core/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { HistoryLocationState } from './build_services';
-import { createGetterSetter } from '../../kibana_utils/public';
 import { DocViewsRegistry } from './services/doc_views/doc_views_registry';
 
 let uiActions: UiActionsStart;
diff --git a/src/plugins/discover/public/locator.test.ts b/src/plugins/discover/public/locator.test.ts
index 5d86211993428..f4b55172e97c1 100644
--- a/src/plugins/discover/public/locator.test.ts
+++ b/src/plugins/discover/public/locator.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { hashedItemStore, getStatesFromKbnUrl } from '../../kibana_utils/public';
-import { mockStorage } from '../../kibana_utils/public/storage/hashed_item_store/mock';
-import { FilterStateStore } from '../../data/public';
+import { hashedItemStore, getStatesFromKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import { mockStorage } from '@kbn/kibana-utils-plugin/public/storage/hashed_item_store/mock';
+import { FilterStateStore } from '@kbn/data-plugin/public';
 import { DiscoverAppLocatorDefinition } from './locator';
 import { SerializableRecord } from '@kbn/utility-types';
 
diff --git a/src/plugins/discover/public/locator.ts b/src/plugins/discover/public/locator.ts
index 38b93f915114f..d1b4d73571550 100644
--- a/src/plugins/discover/public/locator.ts
+++ b/src/plugins/discover/public/locator.ts
@@ -8,9 +8,9 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import type { Filter } from '@kbn/es-query';
-import type { TimeRange, Query, QueryState, RefreshInterval } from '../../data/public';
-import type { LocatorDefinition, LocatorPublic } from '../../share/public';
-import { setStateToKbnUrl } from '../../kibana_utils/public';
+import type { TimeRange, Query, QueryState, RefreshInterval } from '@kbn/data-plugin/public';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type { VIEW_MODE } from './components/view_mode_toggle';
 
 export const DISCOVER_APP_LOCATOR = 'DISCOVER_APP_LOCATOR';
diff --git a/src/plugins/discover/public/mocks.ts b/src/plugins/discover/public/mocks.ts
index 8e109c44864ac..4d7c5817871b4 100644
--- a/src/plugins/discover/public/mocks.ts
+++ b/src/plugins/discover/public/mocks.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { DiscoverSetup, DiscoverStart } from '.';
-import { sharePluginMock } from '../../share/public/mocks';
 
 export type Setup = jest.Mocked<DiscoverSetup>;
 export type Start = jest.Mocked<DiscoverStart>;
diff --git a/src/plugins/discover/public/plugin.tsx b/src/plugins/discover/public/plugin.tsx
index 0f7be875a4f21..8330751cf13f0 100644
--- a/src/plugins/discover/public/plugin.tsx
+++ b/src/plugins/discover/public/plugin.tsx
@@ -16,19 +16,25 @@ import {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
-import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
-import { EmbeddableSetup, EmbeddableStart } from 'src/plugins/embeddable/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
-import { SharePluginStart, SharePluginSetup } from 'src/plugins/share/public';
-import { UrlForwardingSetup, UrlForwardingStart } from 'src/plugins/url_forwarding/public';
-import { HomePublicPluginSetup } from 'src/plugins/home/public';
-import { Start as InspectorPublicPluginStart } from 'src/plugins/inspector/public';
+} from '@kbn/core/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { Start as InspectorPublicPluginStart } from '@kbn/inspector-plugin/public';
 import { EuiLoadingContent } from '@elastic/eui';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../data/public';
-import { SavedObjectsStart } from '../../saved_objects/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { DocViewInput, DocViewInputFn } from './services/doc_views/doc_views_types';
 import { DocViewsRegistry } from './services/doc_views/doc_views_registry';
 import {
@@ -43,17 +49,11 @@ import { registerFeature } from './register_feature';
 import { buildServices } from './build_services';
 import { DiscoverAppLocator, DiscoverAppLocatorDefinition } from './locator';
 import { SearchEmbeddableFactory } from './embeddable';
-import { UsageCollectionSetup } from '../../usage_collection/public';
-import { IndexPatternFieldEditorStart } from '../../../plugins/data_view_field_editor/public';
 import { DeferredSpinner } from './components';
 import { ViewSavedSearchAction } from './embeddable/view_saved_search_action';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
-import { FieldFormatsStart } from '../../field_formats/public';
 import { injectTruncateStyles } from './utils/truncate_styles';
 import { DOC_TABLE_LEGACY, TRUNCATE_MAX_HEIGHT } from '../common';
-import { DataViewEditorStart } from '../../../plugins/data_view_editor/public';
 import { useDiscoverServices } from './utils/use_discover_services';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../x-pack/plugins/triggers_actions_ui/public';
 import { initializeKbnUrlTracking } from './utils/initialize_kbn_url_tracking';
 
 const DocViewerLegacyTable = React.lazy(
diff --git a/src/plugins/discover/public/register_feature.ts b/src/plugins/discover/public/register_feature.ts
index e5abfcd9e4823..49772c9b7336c 100644
--- a/src/plugins/discover/public/register_feature.ts
+++ b/src/plugins/discover/public/register_feature.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export function registerFeature(home: HomePublicPluginSetup) {
   home.featureCatalogue.register({
@@ -24,7 +24,7 @@ export function registerFeature(home: HomePublicPluginSetup) {
     icon: 'discoverApp',
     path: '/app/discover#/',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
     solutionId: 'kibana',
     order: 200,
   });
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx
index 8eab6b1e12c8c..1d5b1d4577652 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { DocViewerTab } from './doc_viewer_tab';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
-import { ElasticSearchHit } from 'src/plugins/discover/public/types';
+import { ElasticSearchHit } from '../../../../types';
 
 describe('DocViewerTab', () => {
   test('changing columns triggers an update', () => {
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx
index 5b59f26a6c7cd..34ed49eb7e272 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx
@@ -7,14 +7,14 @@
  */
 
 import React from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DocViewerSource } from './source';
 import * as hooks from '../../../../utils/use_es_doc_search';
-import * as useUiSettingHook from '../../../../../../kibana_react/public/ui_settings/use_ui_setting';
+import * as useUiSettingHook from '@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting';
 import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
 import { JsonCodeEditorCommon } from '../../../../components/json_code_editor/json_code_editor_common';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockIndexPattern = {
   getComputedFields: () => [],
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx
index 845f078c59fac..5aa813e25fe98 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx
@@ -12,11 +12,11 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { monaco } from '@kbn/monaco';
 import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { JSONCodeEditorCommonMemoized } from '../../../../components/json_code_editor/json_code_editor_common';
 import { DOC_TABLE_LEGACY, SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common';
 import { useEsDocSearch } from '../../../../utils/use_es_doc_search';
-import { DataView } from '../../../../../../data_views/public';
 import { ElasticRequestState } from '../../../../application/doc/types';
 import { getHeight } from './get_height';
 
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx
index abd65d726f3ee..0e75ab7d7800d 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DocViewerLegacyTable } from './table';
-import { DataView } from '../../../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DocViewRenderProps } from '../../../doc_views_types';
 import { ElasticSearchHit } from '../../../../../types';
-import { KibanaContextProvider } from '../../../../../../../kibana_react/public';
-import { DiscoverServices } from 'src/plugins/discover/public/build_services';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { DiscoverServices } from '../../../../../build_services';
 
 const services = {
   uiSettings: {
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx
index aa44f0d56889c..7c8ad53fe641a 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx
@@ -9,9 +9,9 @@
 import '../table.scss';
 import React, { useCallback, useMemo } from 'react';
 import { EuiInMemoryTable } from '@elastic/eui';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { getTypeForFieldIcon } from '../../../../../utils/get_type_for_field_icon';
 import { useDiscoverServices } from '../../../../../utils/use_discover_services';
-import { flattenHit } from '../../../../../../../data/public';
 import { SHOW_MULTIFIELDS } from '../../../../../../common';
 import { DocViewRenderProps, FieldRecordLegacy } from '../../../doc_views_types';
 import { ACTIONS_COLUMN, MAIN_COLUMNS } from './table_columns';
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx
index cae127713704b..3ce4b789bd1ff 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx
@@ -7,11 +7,11 @@
  */
 
 import React from 'react';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { DocViewTableRowBtnFilterRemove } from './table_row_btn_filter_remove';
 import { DocViewTableRowBtnFilterExists } from './table_row_btn_filter_exists';
 import { DocViewTableRowBtnToggleColumn } from './table_row_btn_toggle_column';
 import { DocViewTableRowBtnFilterAdd } from './table_row_btn_filter_add';
-import { DataViewField } from '../../../../../../../data_views/public';
 import { DocViewFilterFn } from '../../../doc_views_types';
 
 interface TableActionsProps {
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx
index 4742dd3d8f585..56673acfb1821 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx
@@ -27,12 +27,12 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { getTypeForFieldIcon } from '../../../../utils/get_type_for_field_icon';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import { Storage } from '../../../../../../kibana_utils/public';
 import { usePager } from '../../../../utils/use_pager';
 import { FieldName } from '../../../../components/field_name/field_name';
-import { flattenHit } from '../../../../../../data/public';
 import { SHOW_MULTIFIELDS } from '../../../../../common';
 import { DocViewRenderProps, FieldRecordLegacy } from '../../doc_views_types';
 import { getFieldsToShow } from '../../../../utils/get_fields_to_show';
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx
index d5dc166e639f3..d687a75e45323 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx
@@ -9,7 +9,7 @@
 import React, { useCallback, useState } from 'react';
 import { EuiButtonIcon, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { DataViewField } from '../../../../../../data_views/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { DocViewFilterFn } from '../../doc_views_types';
 
 interface TableActionsProps {
diff --git a/src/plugins/discover/public/services/doc_views/doc_views_types.ts b/src/plugins/discover/public/services/doc_views/doc_views_types.ts
index 3e02a27e8af1a..171b29a86bb05 100644
--- a/src/plugins/discover/public/services/doc_views/doc_views_types.ts
+++ b/src/plugins/discover/public/services/doc_views/doc_views_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from '../../../../data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { ElasticSearchHit } from '../../types';
 import { IgnoredReason } from '../../utils/get_ignored_reason';
 
diff --git a/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts b/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts
index e189eda2e1b2b..9f9fc86b0288e 100644
--- a/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { SavedObjectsStart } from 'kibana/public';
-import type { DataPublicPluginStart } from '../../../../data/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-import { savedObjectsServiceMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 import { getSavedSearch } from './get_saved_searches';
 
diff --git a/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts b/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts
index 3947b9311c423..444e9f0978182 100644
--- a/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts
+++ b/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts
@@ -6,16 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsStart } from 'kibana/public';
-import type { DataPublicPluginStart } from '../../../../data/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { injectSearchSourceReferences, parseSearchSourceJSON } from '@kbn/data-plugin/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import type { SavedSearchAttributes, SavedSearch } from './types';
 
 import { SAVED_SEARCH_TYPE } from './constants';
 import { fromSavedSearchAttributes } from './saved_searches_utils';
-import { injectSearchSourceReferences, parseSearchSourceJSON } from '../../../../data/public';
-import { SavedObjectNotFound } from '../../../../kibana_utils/public';
-
-import type { SpacesApi } from '../../../../../../x-pack/plugins/spaces/public';
 
 interface GetSavedSearchDependencies {
   search: DataPublicPluginStart['search'];
diff --git a/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts b/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts
index fd6777155a53b..23c1107fe23c1 100644
--- a/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsStart } from 'kibana/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
 
-import { savedObjectsServiceMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 import { saveSavedSearch } from './save_saved_searches';
 import type { SavedSearch } from './types';
diff --git a/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts b/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts
index c3440bdb7696a..e83685015dd46 100644
--- a/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts
+++ b/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { SavedObjectsStart } from 'kibana/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
 import type { SavedSearch, SavedSearchAttributes } from './types';
 
 import { SAVED_SEARCH_TYPE } from './constants';
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts
index a99813795a0d9..62c2e447f6d8b 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts
@@ -12,7 +12,7 @@ import type { History } from 'history';
 import { useSavedSearchAliasMatchRedirect } from './saved_search_alias_match_redirect';
 import type { SavedSearch } from './types';
 
-import { spacesPluginMock } from '../../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 
 describe('useSavedSearchAliasMatchRedirect', () => {
   let spaces: ReturnType<typeof spacesPluginMock.createStartContract>;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts
index 6e80d68839451..e395ccbdaf264 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts
@@ -9,10 +9,10 @@
 import type { History } from 'history';
 import { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import { getSavedSearchUrl } from './saved_searches_utils';
 
 import type { SavedSearch } from './types';
-import type { SpacesApi } from '../../../../../../x-pack/plugins/spaces/public';
 
 interface SavedSearchAliasMatchRedirectProps {
   savedSearch?: SavedSearch;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx
index 6bdea087fcf46..0d2fd18a6afc7 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx
@@ -13,7 +13,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { SavedSearchURLConflictCallout } from './saved_search_url_conflict_callout';
 import type { SavedSearch } from './types';
 
-import { spacesPluginMock } from '../../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 
 describe('SavedSearchURLConflictCallout', () => {
   let spaces: ReturnType<typeof spacesPluginMock.createStartContract>;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts
index 4a13b56a5e8d7..3da3fc346ffaa 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts
@@ -8,10 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 import type { History } from 'history';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import { getSavedSearchUrl } from './saved_searches_utils';
 
 import type { SavedSearch } from './types';
-import type { SpacesApi } from '../../../../../../x-pack/plugins/spaces/public';
 
 interface SavedSearchURLConflictCalloutProps {
   savedSearch?: SavedSearch;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts b/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts
index 13739f0b1f4d1..4a4713badb807 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts
@@ -14,7 +14,7 @@ import {
   throwErrorOnSavedSearchUrlConflict,
 } from './saved_searches_utils';
 
-import { createSearchSourceMock } from '../../../../data/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
 
 import type { SavedSearchAttributes, SavedSearch } from './types';
 
diff --git a/src/plugins/discover/public/services/saved_searches/types.ts b/src/plugins/discover/public/services/saved_searches/types.ts
index b7cd7f4a63f7b..aba95f85afd11 100644
--- a/src/plugins/discover/public/services/saved_searches/types.ts
+++ b/src/plugins/discover/public/services/saved_searches/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsResolveResponse } from 'src/core/public';
-import type { ISearchSource } from '../../../../data/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
+import type { ISearchSource } from '@kbn/data-plugin/public';
 import { DiscoverGridSettingsColumn } from '../../components/discover_grid/types';
 import { VIEW_MODE } from '../../components/view_mode_toggle';
 
diff --git a/src/plugins/discover/public/utils/breadcrumbs.ts b/src/plugins/discover/public/utils/breadcrumbs.ts
index 4d79598ce5389..e89186fc6f38d 100644
--- a/src/plugins/discover/public/utils/breadcrumbs.ts
+++ b/src/plugins/discover/public/utils/breadcrumbs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { SavedSearch } from '../services/saved_searches';
 
diff --git a/src/plugins/discover/public/utils/columns.ts b/src/plugins/discover/public/utils/columns.ts
index 11a9076d555ed..add21e13b5e36 100644
--- a/src/plugins/discover/public/utils/columns.ts
+++ b/src/plugins/discover/public/utils/columns.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 // We store this outside the function as a constant, so we're not creating a new array every time
 // the function is returning this. A changing array might cause the data grid to think it got
diff --git a/src/plugins/discover/public/utils/format_hit.ts b/src/plugins/discover/public/utils/format_hit.ts
index ffc61ff6b0dd9..6af6a8aa61210 100644
--- a/src/plugins/discover/public/utils/format_hit.ts
+++ b/src/plugins/discover/public/utils/format_hit.ts
@@ -8,9 +8,9 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { flattenHit } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { formatFieldValue } from './format_value';
 
 const formattedHitCache = new WeakMap<estypes.SearchHit, FormattedHit>();
diff --git a/src/plugins/discover/public/utils/format_value.test.ts b/src/plugins/discover/public/utils/format_value.test.ts
index 9fbf38c21b4b7..9580c6d0ca605 100644
--- a/src/plugins/discover/public/utils/format_value.test.ts
+++ b/src/plugins/discover/public/utils/format_value.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsStart } from '../../../field_formats/public';
-import type { FieldFormat } from '../../../field_formats/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { indexPatternMock } from '../__mocks__/index_pattern';
 import { formatFieldValue } from './format_value';
 
diff --git a/src/plugins/discover/public/utils/format_value.ts b/src/plugins/discover/public/utils/format_value.ts
index 50318b7d62805..74331e946682e 100644
--- a/src/plugins/discover/public/utils/format_value.ts
+++ b/src/plugins/discover/public/utils/format_value.ts
@@ -7,9 +7,9 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { KBN_FIELD_TYPES } from '../../../data/public';
-import { DataView, DataViewField } from '../../../data_views/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 /**
  * Formats the value of a specific field using the appropriate field formatter if available
diff --git a/src/plugins/discover/public/utils/get_fields_to_show.test.ts b/src/plugins/discover/public/utils/get_fields_to_show.test.ts
index 42dde146073f9..cdefb448e015e 100644
--- a/src/plugins/discover/public/utils/get_fields_to_show.test.ts
+++ b/src/plugins/discover/public/utils/get_fields_to_show.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from '../../../data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { getFieldsToShow } from './get_fields_to_show';
 
 describe('get fields to show', () => {
diff --git a/src/plugins/discover/public/utils/get_fields_to_show.ts b/src/plugins/discover/public/utils/get_fields_to_show.ts
index ddabd1a045883..6a749a89316a0 100644
--- a/src/plugins/discover/public/utils/get_fields_to_show.ts
+++ b/src/plugins/discover/public/utils/get_fields_to_show.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { getFieldSubtypeMulti } from '../../../data_views/public';
-import type { DataView } from '../../../data_views/public';
+import { getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export const getFieldsToShow = (
   fields: string[],
diff --git a/src/plugins/discover/public/utils/get_ignored_reason.test.ts b/src/plugins/discover/public/utils/get_ignored_reason.test.ts
index 7f431b578845b..091a32a29f586 100644
--- a/src/plugins/discover/public/utils/get_ignored_reason.test.ts
+++ b/src/plugins/discover/public/utils/get_ignored_reason.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { getIgnoredReason, IgnoredReason } from './get_ignored_reason';
-import type { DataViewField } from '../../../data_views/public';
-import { KBN_FIELD_TYPES } from '../../../data/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 function field(params: Partial<DataViewField>): DataViewField {
   return {
diff --git a/src/plugins/discover/public/utils/get_ignored_reason.ts b/src/plugins/discover/public/utils/get_ignored_reason.ts
index 891b42073755e..f1aae33e5d35d 100644
--- a/src/plugins/discover/public/utils/get_ignored_reason.ts
+++ b/src/plugins/discover/public/utils/get_ignored_reason.ts
@@ -7,8 +7,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { KBN_FIELD_TYPES } from '../../../data/public';
-import { DataViewField } from '../../../data_views/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 export enum IgnoredReason {
   IGNORE_ABOVE = 'ignore_above',
diff --git a/src/plugins/discover/public/utils/get_sharing_data.test.ts b/src/plugins/discover/public/utils/get_sharing_data.test.ts
index 71fe826360d8f..63031f689fb33 100644
--- a/src/plugins/discover/public/utils/get_sharing_data.test.ts
+++ b/src/plugins/discover/public/utils/get_sharing_data.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Capabilities, IUiSettingsClient } from 'kibana/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import { Capabilities, IUiSettingsClient } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DiscoverServices } from '../build_services';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { createSearchSourceMock } from '../../../data/common/search/search_source/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import {
   DOC_HIDE_TIME_COLUMN_SETTING,
   SORT_DEFAULT_ORDER_SETTING,
diff --git a/src/plugins/discover/public/utils/get_sharing_data.ts b/src/plugins/discover/public/utils/get_sharing_data.ts
index 6a74a54071faa..2e3e385ce71ff 100644
--- a/src/plugins/discover/public/utils/get_sharing_data.ts
+++ b/src/plugins/discover/public/utils/get_sharing_data.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import type { Capabilities } from 'kibana/public';
-import type { IUiSettingsClient } from 'kibana/public';
+import type { Capabilities } from '@kbn/core/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 import type {
   DataPublicPluginStart,
   ISearchSource,
   SerializedSearchSourceFields,
-} from 'src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import type { Filter } from '@kbn/es-query';
 import {
   DOC_HIDE_TIME_COLUMN_SETTING,
diff --git a/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts b/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts
index bffa0fecaed74..bce15f5d5eb22 100644
--- a/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts
+++ b/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from 'src/plugins/data_views/common';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { getTypeForFieldIcon } from './get_type_for_field_icon';
 
 describe('getTypeForFieldIcon', () => {
diff --git a/src/plugins/discover/public/utils/get_type_for_field_icon.ts b/src/plugins/discover/public/utils/get_type_for_field_icon.ts
index bb3f65ed3e01c..429fdf87991eb 100644
--- a/src/plugins/discover/public/utils/get_type_for_field_icon.ts
+++ b/src/plugins/discover/public/utils/get_type_for_field_icon.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from 'src/plugins/data_views/common';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 
 /**
  * Extracts the type from a data view field that will match the right icon.
diff --git a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts
index a3a373adbbf02..2f4ba59aef11a 100644
--- a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts
+++ b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts
@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { AppUpdater } from 'kibana/public';
+import { AppUpdater } from '@kbn/core/public';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DiscoverSetupPlugins } from '../plugin';
 import { initializeKbnUrlTracking } from './initialize_kbn_url_tracking';
 
diff --git a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
index 139f3b5a0c631..0bbbca3629f4c 100644
--- a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
+++ b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { AppUpdater, CoreSetup } from 'kibana/public';
+import { AppUpdater, CoreSetup } from '@kbn/core/public';
 import type { BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { createKbnUrlTracker, replaceUrlHashQuery } from '../../../kibana_utils/public';
+import { createKbnUrlTracker, replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { getScopedHistory } from '../kibana_services';
 import { SEARCH_SESSION_ID_QUERY_PARAM } from '../constants';
 import type { DiscoverSetupPlugins } from '../plugin';
diff --git a/src/plugins/discover/public/utils/migrate_legacy_query.ts b/src/plugins/discover/public/utils/migrate_legacy_query.ts
index f87d5328046d8..f9f22c6383c57 100644
--- a/src/plugins/discover/public/utils/migrate_legacy_query.ts
+++ b/src/plugins/discover/public/utils/migrate_legacy_query.ts
@@ -7,7 +7,7 @@
  */
 
 import { has } from 'lodash';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 /**
  * Creates a standardized query object from old queries that were either strings or pure ES query DSL
diff --git a/src/plugins/discover/public/utils/popularize_field.test.ts b/src/plugins/discover/public/utils/popularize_field.test.ts
index bf81163463b87..1818c0e358bf5 100644
--- a/src/plugins/discover/public/utils/popularize_field.test.ts
+++ b/src/plugins/discover/public/utils/popularize_field.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Capabilities } from 'kibana/public';
-import { DataView, DataViewsContract } from '../../../data_views/public';
+import { Capabilities } from '@kbn/core/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import { popularizeField } from './popularize_field';
 
 const capabilities = {
diff --git a/src/plugins/discover/public/utils/popularize_field.ts b/src/plugins/discover/public/utils/popularize_field.ts
index 3964cf363f193..d94700d1fa0b2 100644
--- a/src/plugins/discover/public/utils/popularize_field.ts
+++ b/src/plugins/discover/public/utils/popularize_field.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { Capabilities } from 'kibana/public';
-import { DataViewsContract } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import type { Capabilities } from '@kbn/core/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 async function popularizeField(
   indexPattern: DataView,
diff --git a/src/plugins/discover/public/utils/row_heights.ts b/src/plugins/discover/public/utils/row_heights.ts
index e3759853f60cf..f1e096b76b9f9 100644
--- a/src/plugins/discover/public/utils/row_heights.ts
+++ b/src/plugins/discover/public/utils/row_heights.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Storage } from '../../../kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { isValidRowHeight } from './validate_row_height';
 
 export interface DataGridOptionsRecord {
diff --git a/src/plugins/discover/public/utils/state_helpers.ts b/src/plugins/discover/public/utils/state_helpers.ts
index e50cd87ad82ee..7a2bc6f440885 100644
--- a/src/plugins/discover/public/utils/state_helpers.ts
+++ b/src/plugins/discover/public/utils/state_helpers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { isEqual } from 'lodash';
 import { SEARCH_FIELDS_FROM_SOURCE, DEFAULT_COLUMNS_SETTING } from '../../common';
 
diff --git a/src/plugins/discover/public/utils/truncate_styles.ts b/src/plugins/discover/public/utils/truncate_styles.ts
index dbe8b770e1793..95a615b5d1cb3 100644
--- a/src/plugins/discover/public/utils/truncate_styles.ts
+++ b/src/plugins/discover/public/utils/truncate_styles.ts
@@ -18,12 +18,19 @@ const TRUNCATE_GRADIENT_HEIGHT = 15;
 const globalThemeCache = createCache({ key: 'truncation' });
 
 const buildStylesheet = (maxHeight: number) => {
+  if (!maxHeight) {
+    return [
+      `
+    .dscTruncateByHeight {
+      max-height: none;
+    }`,
+    ];
+  }
   return [
     `
     .dscTruncateByHeight {
       overflow: hidden;
       max-height: ${maxHeight}px !important;
-      display: inline-block;
     }
     .dscTruncateByHeight:before {
       top: ${maxHeight - TRUNCATE_GRADIENT_HEIGHT}px;
@@ -32,18 +39,7 @@ const buildStylesheet = (maxHeight: number) => {
   ];
 };
 
-const flushThemedGlobals = () => {
-  globalThemeCache.sheet.flush();
-  globalThemeCache.inserted = {};
-  globalThemeCache.registered = {};
-};
-
 export const injectTruncateStyles = (maxHeight: number) => {
-  if (maxHeight <= 0) {
-    flushThemedGlobals();
-    return;
-  }
-
   const serialized = serializeStyles(buildStylesheet(maxHeight), cache.registered);
   if (!globalThemeCache.inserted[serialized.name]) {
     globalThemeCache.insert('', serialized, globalThemeCache.sheet, true);
diff --git a/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx b/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx
index d09e9d8d1c6ba..056055d32da35 100644
--- a/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx
+++ b/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx
@@ -12,7 +12,7 @@ import { indexPatternMock } from '../__mocks__/index_pattern';
 import { configMock } from '../__mocks__/config';
 import { indexPatternsMock } from '../__mocks__/index_patterns';
 import { AppState } from '../application/context/services/context_state';
-import { Capabilities } from '../../../../core/types';
+import { Capabilities } from '@kbn/core/types';
 
 describe('useColumns', () => {
   const defaultProps = {
diff --git a/src/plugins/discover/public/utils/use_data_grid_columns.ts b/src/plugins/discover/public/utils/use_data_grid_columns.ts
index ab492dc10f617..cc9aae7035769 100644
--- a/src/plugins/discover/public/utils/use_data_grid_columns.ts
+++ b/src/plugins/discover/public/utils/use_data_grid_columns.ts
@@ -7,9 +7,9 @@
  */
 
 import { useMemo } from 'react';
-import type { DataView, DataViewsContract } from 'src/plugins/data_views/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 
-import { Capabilities, IUiSettingsClient } from 'kibana/public';
+import { Capabilities, IUiSettingsClient } from '@kbn/core/public';
 import {
   AppState as DiscoverState,
   GetStateReturn as DiscoverGetStateReturn,
diff --git a/src/plugins/discover/public/utils/use_discover_services.ts b/src/plugins/discover/public/utils/use_discover_services.ts
index d9a6a2d77e481..239234c32f359 100644
--- a/src/plugins/discover/public/utils/use_discover_services.ts
+++ b/src/plugins/discover/public/utils/use_discover_services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { useKibana } from '../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../build_services';
 
 export const useDiscoverServices = () => useKibana<DiscoverServices>().services;
diff --git a/src/plugins/discover/public/utils/use_es_doc_search.test.tsx b/src/plugins/discover/public/utils/use_es_doc_search.test.tsx
index 26f048893e6b5..a059ae721ecad 100644
--- a/src/plugins/discover/public/utils/use_es_doc_search.test.tsx
+++ b/src/plugins/discover/public/utils/use_es_doc_search.test.tsx
@@ -9,11 +9,11 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { buildSearchBody, useEsDocSearch } from './use_es_doc_search';
 import { Observable } from 'rxjs';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DocProps } from '../application/doc/components/doc';
 import { ElasticRequestState } from '../application/doc/types';
 import { SEARCH_FIELDS_FROM_SOURCE as mockSearchFieldsFromSource } from '../../common';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import React from 'react';
 
 const mockSearchResult = new Observable();
diff --git a/src/plugins/discover/public/utils/use_es_doc_search.ts b/src/plugins/discover/public/utils/use_es_doc_search.ts
index 106b5828b2f01..27393dca72da3 100644
--- a/src/plugins/discover/public/utils/use_es_doc_search.ts
+++ b/src/plugins/discover/public/utils/use_es_doc_search.ts
@@ -9,7 +9,7 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { firstValueFrom } from 'rxjs';
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DocProps } from '../application/doc/components/doc';
 import { ElasticRequestState } from '../application/doc/types';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../common';
diff --git a/src/plugins/discover/public/utils/use_index_pattern.tsx b/src/plugins/discover/public/utils/use_index_pattern.tsx
index 6146aec13a3e4..208b2a8253e27 100644
--- a/src/plugins/discover/public/utils/use_index_pattern.tsx
+++ b/src/plugins/discover/public/utils/use_index_pattern.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { useEffect, useState } from 'react';
-import { DataView, DataViewsContract } from '../../../data_views/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export const useIndexPattern = (indexPatterns: DataViewsContract, indexPatternId: string) => {
   const [indexPattern, setIndexPattern] = useState<DataView | undefined>(undefined);
diff --git a/src/plugins/discover/public/utils/use_navigation_props.test.tsx b/src/plugins/discover/public/utils/use_navigation_props.test.tsx
index de1f1dbcc9b01..e7b33c3962c7e 100644
--- a/src/plugins/discover/public/utils/use_navigation_props.test.tsx
+++ b/src/plugins/discover/public/utils/use_navigation_props.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { ReactElement } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { createFilterManagerMock } from '../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import {
   getContextHash,
   HistoryState,
@@ -17,7 +17,7 @@ import {
 } from './use_navigation_props';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const filterManager = createFilterManagerMock();
 const defaultProps = {
diff --git a/src/plugins/discover/public/utils/use_navigation_props.tsx b/src/plugins/discover/public/utils/use_navigation_props.tsx
index 74df39e09e41b..008e115448f38 100644
--- a/src/plugins/discover/public/utils/use_navigation_props.tsx
+++ b/src/plugins/discover/public/utils/use_navigation_props.tsx
@@ -12,8 +12,8 @@ import type { Location } from 'history';
 import { stringify } from 'query-string';
 import rison from 'rison-node';
 import { disableFilter } from '@kbn/es-query';
-import { FilterManager } from '../../../data/public';
-import { url } from '../../../kibana_utils/common';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { url } from '@kbn/kibana-utils-plugin/common';
 import { useDiscoverServices } from './use_discover_services';
 
 export type DiscoverNavigationProps = { onClick: () => void } | { href: string };
diff --git a/src/plugins/discover/public/utils/use_row_heights_options.test.tsx b/src/plugins/discover/public/utils/use_row_heights_options.test.tsx
index c91e41c930649..113f34ab723dd 100644
--- a/src/plugins/discover/public/utils/use_row_heights_options.test.tsx
+++ b/src/plugins/discover/public/utils/use_row_heights_options.test.tsx
@@ -8,12 +8,12 @@
 
 import React, { ReactNode } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { Storage } from '../../../kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { DiscoverServices } from '../build_services';
 import { LocalStorageMock } from '../__mocks__/local_storage_mock';
 import { uiSettingsMock } from '../__mocks__/ui_settings';
 import { useRowHeightsOptions } from './use_row_heights_options';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const CONFIG_ROW_HEIGHT = 3;
 
diff --git a/src/plugins/discover/server/plugin.ts b/src/plugins/discover/server/plugin.ts
index 00888d31f8d9b..9147f533d28d6 100644
--- a/src/plugins/discover/server/plugin.ts
+++ b/src/plugins/discover/server/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import type { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
 import { getUiSettings } from './ui_settings';
 import { capabilitiesProvider } from './capabilities_provider';
 import { getSavedSearchObjectType } from './saved_objects';
-import type { PluginSetup as DataPluginSetup } from '../../data/server';
 
 export class DiscoverServerPlugin implements Plugin<object, object> {
   public setup(
diff --git a/src/plugins/discover/server/saved_objects/search.ts b/src/plugins/discover/server/saved_objects/search.ts
index 796ab164cf0af..f30fa932aa133 100644
--- a/src/plugins/discover/server/saved_objects/search.ts
+++ b/src/plugins/discover/server/saved_objects/search.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { SavedObjectsType } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { getAllMigrations } from './search_migrations';
 
 export function getSavedSearchObjectType(
diff --git a/src/plugins/discover/server/saved_objects/search_migrations.test.ts b/src/plugins/discover/server/saved_objects/search_migrations.test.ts
index 9e4c23c91976c..9563bd6dc86c3 100644
--- a/src/plugins/discover/server/saved_objects/search_migrations.test.ts
+++ b/src/plugins/discover/server/saved_objects/search_migrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { getAllMigrations, searchMigrations } from './search_migrations';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
diff --git a/src/plugins/discover/server/saved_objects/search_migrations.ts b/src/plugins/discover/server/saved_objects/search_migrations.ts
index cb8ced07387a1..95da82fa38acf 100644
--- a/src/plugins/discover/server/saved_objects/search_migrations.ts
+++ b/src/plugins/discover/server/saved_objects/search_migrations.ts
@@ -13,11 +13,11 @@ import type {
   SavedObjectAttributes,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
-} from 'kibana/server';
-import { mergeSavedObjectMigrationMaps } from '../../../../core/server';
-import { DEFAULT_QUERY_LANGUAGE } from '../../../data/server';
-import { MigrateFunctionsObject, MigrateFunction } from '../../../kibana_utils/common';
-import type { SerializedSearchSourceFields } from '../../../data/common';
+} from '@kbn/core/server';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
+import { DEFAULT_QUERY_LANGUAGE } from '@kbn/data-plugin/server';
+import { MigrateFunctionsObject, MigrateFunction } from '@kbn/kibana-utils-plugin/common';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface SavedSearchMigrationAttributes extends SavedObjectAttributes {
   kibanaSavedObjectMeta: {
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index 94c85e42673ec..46e2d4d9969c6 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import type { DocLinksServiceSetup, UiSettingsParams } from 'kibana/server';
+import type { DocLinksServiceSetup, UiSettingsParams } from '@kbn/core/server';
 import { METRIC_TYPE } from '@kbn/analytics';
 import {
   DEFAULT_COLUMNS_SETTING,
@@ -286,5 +286,6 @@ export const getUiSettings: (docLinks: DocLinksServiceSetup) => Record<string, U
         'The maximum height that a cell in a table should occupy. Set to 0 to disable truncation.',
     }),
     schema: schema.number({ min: 0 }),
+    requiresPageReload: true,
   },
 });
diff --git a/src/plugins/embeddable/common/lib/get_all_migrations.ts b/src/plugins/embeddable/common/lib/get_all_migrations.ts
index 7ab11089f2ef0..8ef251a2e7c3f 100644
--- a/src/plugins/embeddable/common/lib/get_all_migrations.ts
+++ b/src/plugins/embeddable/common/lib/get_all_migrations.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { baseEmbeddableMigrations } from './migrate_base_input';
 import {
   MigrateFunctionsObject,
   PersistableState,
   PersistableStateMigrateFn,
-} from '../../../kibana_utils/common/persistable_state';
+} from '@kbn/kibana-utils-plugin/common/persistable_state';
+import { baseEmbeddableMigrations } from './migrate_base_input';
 
 export const getAllMigrations = (
   factories: unknown[],
diff --git a/src/plugins/embeddable/common/lib/inject.ts b/src/plugins/embeddable/common/lib/inject.ts
index f4b1eed9cdb7d..d175fce453c07 100644
--- a/src/plugins/embeddable/common/lib/inject.ts
+++ b/src/plugins/embeddable/common/lib/inject.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { CommonEmbeddableStartContract, EmbeddableStateWithType } from '../types';
-import { SavedObjectReference } from '../../../../core/types';
 import { injectBaseEmbeddableInput } from './migrate_base_input';
 
 export const getInjectFunction = (embeddables: CommonEmbeddableStartContract) => {
diff --git a/src/plugins/embeddable/common/lib/migrate_base_input.ts b/src/plugins/embeddable/common/lib/migrate_base_input.ts
index 94b3262335e26..1e64a50fa5c59 100644
--- a/src/plugins/embeddable/common/lib/migrate_base_input.ts
+++ b/src/plugins/embeddable/common/lib/migrate_base_input.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { EmbeddableStateWithType } from '../types';
-import { MigrateFunctionsObject } from '../../../kibana_utils/common';
 
 export const telemetryBaseEmbeddableInput = (
   state: EmbeddableStateWithType,
diff --git a/src/plugins/embeddable/common/types.ts b/src/plugins/embeddable/common/types.ts
index b9d9d4cc34146..b7cdc9bd08df3 100644
--- a/src/plugins/embeddable/common/types.ts
+++ b/src/plugins/embeddable/common/types.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaExecutionContext } from 'src/core/public';
-import { PersistableStateService, PersistableState } from '../../kibana_utils/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { PersistableStateService, PersistableState } from '@kbn/kibana-utils-plugin/common';
 
 export enum ViewMode {
   EDIT = 'edit',
diff --git a/src/plugins/embeddable/public/bootstrap.ts b/src/plugins/embeddable/public/bootstrap.ts
index ec0a81adc7c77..4e21457b6e758 100644
--- a/src/plugins/embeddable/public/bootstrap.ts
+++ b/src/plugins/embeddable/public/bootstrap.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiActionsSetup } from '../../ui_actions/public';
+import { UiActionsSetup } from '@kbn/ui-actions-plugin/public';
 import {
   contextMenuTrigger,
   panelBadgeTrigger,
diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
index 3aedd2c0a3b78..5f93585a39214 100644
--- a/src/plugins/embeddable/public/index.ts
+++ b/src/plugins/embeddable/public/index.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { EmbeddablePublicPlugin } from './plugin';
 
 export type {
diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx b/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
index a8c54ca8cdc33..926b6782b5633 100644
--- a/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
@@ -11,7 +11,7 @@ import { Embeddable, EmbeddableInput, SavedObjectEmbeddableInput } from '../embe
 import { ViewMode } from '../types';
 import { ContactCardEmbeddable } from '../test_samples';
 import { embeddablePluginMock } from '../../mocks';
-import { applicationServiceMock } from '../../../../../core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { of } from 'rxjs';
 
 const { doStart } = embeddablePluginMock.createInstance();
diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
index fde5c2ae62bc0..4bfa26add28ba 100644
--- a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ApplicationStart } from 'kibana/public';
-import { Action } from 'src/plugins/ui_actions/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 import { take } from 'rxjs/operators';
 import { ViewMode } from '../types';
 import { EmbeddableFactoryNotFoundError } from '../errors';
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx
index 859e9be9d29dd..e8c741cdb2e76 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableInput, SavedObjectEmbeddableInput } from '../index';
-import { coreMock } from '../../../../../core/public/mocks';
+import { EmbeddableInput, SavedObjectEmbeddableInput } from '..';
+import { coreMock } from '@kbn/core/public/mocks';
 import { AttributeServiceOptions } from './attribute_service';
-import { CoreStart } from 'src/core/public';
-import { AttributeService, ATTRIBUTE_SERVICE_KEY } from './index';
+import { CoreStart } from '@kbn/core/public';
+import { AttributeService, ATTRIBUTE_SERVICE_KEY } from '.';
 
 export const mockAttributeService = <
   A extends { title: string },
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts
index 8b954b7271e41..05ceb00a58d41 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts
@@ -8,8 +8,8 @@
 
 import { ATTRIBUTE_SERVICE_KEY, AttributeServiceUnwrapResult } from './attribute_service';
 import { mockAttributeService } from './attribute_service.mock';
-import { coreMock } from '../../../../../core/public/mocks';
-import { OnSaveProps } from 'src/plugins/saved_objects/public/save_modal';
+import { coreMock } from '@kbn/core/public/mocks';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public/save_modal';
 
 interface TestAttributes {
   title: string;
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
index 81b836796d31d..aa31c6afcf51a 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
@@ -9,15 +9,15 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { get, omit } from 'lodash';
-import { I18nStart, NotificationsStart } from 'src/core/public';
-import { SavedObjectSaveModal, OnSaveProps, SaveResult } from '../../../../saved_objects/public';
+import { I18nStart, NotificationsStart } from '@kbn/core/public';
+import { SavedObjectSaveModal, OnSaveProps, SaveResult } from '@kbn/saved-objects-plugin/public';
 import {
   EmbeddableInput,
   SavedObjectEmbeddableInput,
   isSavedObjectEmbeddableInput,
   EmbeddableFactoryNotFoundError,
   EmbeddableFactory,
-} from '../index';
+} from '..';
 
 /**
  * The attribute service is a shared, generic service that embeddables can use to provide the functionality
diff --git a/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx b/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx
index e4dfc8ab58d82..fb2a35e634da2 100644
--- a/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx
@@ -16,7 +16,7 @@ import {
   ContactCardEmbeddableOutput,
   ContactCardEmbeddable,
 } from '../test_samples/embeddables/contact_card/contact_card_embeddable';
-import { inspectorPluginMock } from '../../../../inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { mount } from 'enzyme';
 import { embeddablePluginMock, createEmbeddablePanelMock } from '../../mocks';
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts b/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts
index b260c594591fa..17103bc8783ff 100644
--- a/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import { EmbeddableFactoryDefinition } from './embeddable_factory_definition';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { EmbeddableFactory } from './embeddable_factory';
@@ -40,7 +40,7 @@ export const defaultEmbeddableFactoryProvider = <
     getDescription: def.getDescription ? def.getDescription.bind(def) : () => '',
     getIconType: def.getIconType ? def.getIconType.bind(def) : () => 'empty',
     savedObjectMetaData: def.savedObjectMetaData,
-    telemetry: def.telemetry || (() => ({})),
+    telemetry: def.telemetry || ((state, stats) => stats),
     inject: def.inject || ((state: EmbeddableStateWithType) => state),
     extract: def.extract || ((state: EmbeddableStateWithType) => ({ state, references: [] })),
     migrations: def.migrations || {},
diff --git a/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts b/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts
index 01d776610f947..00c4de5ff426f 100644
--- a/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { ViewMode } from '..';
-import { KibanaExecutionContext } from '../../../../../core/types';
+import { KibanaExecutionContext } from '@kbn/core/types';
 import { EmbeddableInput, omitGenericEmbeddableInput, genericEmbeddableInputIsEqual } from '.';
 
 const getGenericEmbeddableState = (state?: Partial<EmbeddableInput>): EmbeddableInput => {
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index 59f02107b0f23..4917f7ff8177b 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -11,7 +11,7 @@ import { cloneDeep } from 'lodash';
 import * as Rx from 'rxjs';
 import { merge } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs/operators';
-import { RenderCompleteDispatcher } from '../../../../kibana_utils/public';
+import { RenderCompleteDispatcher } from '@kbn/kibana-utils-plugin/public';
 import { Adapters } from '../types';
 import { IContainer } from '../containers';
 import { EmbeddableOutput, IEmbeddable } from './i_embeddable';
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
index e6cb585968d40..e1b7a48948743 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from 'src/core/public';
-import { SavedObjectMetaData } from '../../../../saved_objects/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
+import { SavedObjectMetaData } from '@kbn/saved-objects-plugin/public';
+import { PersistableState } from '@kbn/kibana-utils-plugin/common';
+import { UiActionsPresentableGrouping } from '@kbn/ui-actions-plugin/public';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { ErrorEmbeddable } from './error_embeddable';
 import { IContainer } from '../containers/i_container';
 import { PropertySpec } from '../types';
-import { PersistableState } from '../../../../kibana_utils/common';
 import { EmbeddableStateWithType } from '../../../common/types';
-import { UiActionsPresentableGrouping } from '../../../../ui_actions/public';
 
 export interface EmbeddableInstanceConfiguration {
   id: string;
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts
index b783bc5af0a1d..a51ca4b54e831 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts
@@ -7,7 +7,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectAttributes } from 'kibana/server';
+import { SavedObjectAttributes } from '@kbn/core/server';
 import { IEmbeddable } from './i_embeddable';
 import { EmbeddableFactory } from './embeddable_factory';
 import { EmbeddableInput, EmbeddableOutput } from '..';
diff --git a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
index 70c30d314fc82..f769d44cd2756 100644
--- a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
@@ -9,7 +9,7 @@
 import { EuiText, EuiIcon, EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider, Markdown } from '../../../../kibana_react/public';
+import { KibanaThemeProvider, Markdown } from '@kbn/kibana-react-plugin/public';
 import { Embeddable } from './embeddable';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { IContainer } from '../containers';
diff --git a/src/plugins/embeddable/public/lib/errors.test.ts b/src/plugins/embeddable/public/lib/errors.test.ts
index ecc08102609de..a59733b80f498 100644
--- a/src/plugins/embeddable/public/lib/errors.test.ts
+++ b/src/plugins/embeddable/public/lib/errors.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IncompatibleActionError } from 'src/plugins/ui_actions/public';
+import { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
 import { PanelNotFoundError, EmbeddableFactoryNotFoundError } from './errors';
 
 describe('IncompatibleActionError', () => {
diff --git a/src/plugins/embeddable/public/lib/inspector.ts b/src/plugins/embeddable/public/lib/inspector.ts
index 0da02190c6b6d..33e88c0d00fb2 100644
--- a/src/plugins/embeddable/public/lib/inspector.ts
+++ b/src/plugins/embeddable/public/lib/inspector.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../inspector/public';
+export * from '@kbn/inspector-plugin/public';
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
index 81ea83fe06d10..8f0310ba3e07b 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
@@ -13,7 +13,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { I18nProvider } from '@kbn/i18n-react';
 import { CONTEXT_MENU_TRIGGER } from '../triggers';
-import { Action, UiActionsStart } from '../../../../ui_actions/public';
+import { Action, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { Trigger, ViewMode } from '../types';
 import { isErrorEmbeddable } from '../embeddables';
 import { EmbeddablePanel } from './embeddable_panel';
@@ -28,10 +28,10 @@ import {
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
 } from '../test_samples/embeddables/contact_card/contact_card_embeddable';
-import { inspectorPluginMock } from '../../../../inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { EuiBadge } from '@elastic/eui';
 import { embeddablePluginMock } from '../../mocks';
-import { applicationServiceMock, themeServiceMock } from '../../../../../core/public/mocks';
+import { applicationServiceMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 const actionRegistry = new Map<string, Action>();
 const triggerRegistry = new Map<string, Trigger>();
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index bddc882f00034..fbe1a9a96b5c8 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -11,10 +11,10 @@ import classNames from 'classnames';
 import React from 'react';
 import { Subscription } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
+import { CoreStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { buildContextMenuForActions, UiActionsService, Action } from '../ui_actions';
-import { CoreStart, OverlayStart, ThemeServiceStart } from '../../../../../core/public';
-import { toMountPoint } from '../../../../kibana_react/public';
-import { UsageCollectionStart } from '../../../../usage_collection/public';
 
 import { Start as InspectorStartContract } from '../inspector';
 import {
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
index fe6a9ea3c22b3..5abf91ed07fd1 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../../';
+import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../..';
 import { AddPanelAction } from './add_panel_action';
 import {
   MockFilter,
@@ -16,11 +16,11 @@ import {
 } from '../../../../test_samples/embeddables/filterable_embeddable';
 import { FilterableEmbeddableFactory } from '../../../../test_samples/embeddables/filterable_embeddable_factory';
 import { FilterableContainer } from '../../../../test_samples/embeddables/filterable_container';
-import { coreMock, themeServiceMock } from '../../../../../../../../core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { ContactCardEmbeddable } from '../../../../test_samples';
 import { EmbeddableStart } from '../../../../../plugin';
 import { embeddablePluginMock } from '../../../../../mocks';
-import { defaultTrigger } from '../../../../../../../ui_actions/public/triggers';
+import { defaultTrigger } from '@kbn/ui-actions-plugin/public/triggers';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts
index d766c509782a0..2c1c31b177645 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Action, ActionExecutionContext } from 'src/plugins/ui_actions/public';
-import { NotificationsStart, OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { EmbeddableStart } from 'src/plugins/embeddable/public/plugin';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import { EmbeddableStart } from '../../../../../plugin';
 import { ViewMode } from '../../../../types';
 import { openAddPanelFlyout } from './open_add_panel_flyout';
 import { IContainer } from '../../../../containers';
-import { UsageCollectionStart } from '../../../../../../../usage_collection/public';
 
 export const ACTION_ADD_PANEL = 'ACTION_ADD_PANEL';
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
index c860fc7e770b9..59b2af392283e 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
@@ -18,7 +18,7 @@ import { ContactCardEmbeddable } from '../../../../test_samples/embeddables/cont
 import { ContainerInput } from '../../../../containers';
 import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
-import { coreMock } from '../../../../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { embeddablePluginMock } from '../../../../../mocks';
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
index 624d5cc56288a..dcaa3880678ab 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
@@ -10,16 +10,16 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { ReactElement } from 'react';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { CoreSetup, SavedObjectAttributes, SimpleSavedObject, Toast } from 'src/core/public';
+import { CoreSetup, SavedObjectAttributes, SimpleSavedObject, Toast } from '@kbn/core/public';
 
 import { EuiContextMenuItem, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
 
-import { EmbeddableFactory, EmbeddableStart } from 'src/plugins/embeddable/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import { EmbeddableFactory, EmbeddableStart } from '../../../../..';
 import { IContainer } from '../../../../containers';
 import { EmbeddableFactoryNotFoundError } from '../../../../errors';
 import { SavedObjectFinderCreateNew } from './saved_object_finder_create_new';
 import { SavedObjectEmbeddableInput } from '../../../../embeddables';
-import { UsageCollectionStart } from '../../../../../../../usage_collection/public';
 
 interface Props {
   onClose: () => void;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
index 00c6f99abda09..4cc5a7ccb6e11 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
@@ -7,12 +7,12 @@
  */
 
 import React from 'react';
-import { NotificationsStart, OverlayRef, OverlayStart, ThemeServiceStart } from 'src/core/public';
+import { NotificationsStart, OverlayRef, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { EmbeddableStart } from '../../../../../plugin';
-import { toMountPoint } from '../../../../../../../kibana_react/public';
 import { IContainer } from '../../../../containers';
 import { AddPanelFlyout } from './add_panel_flyout';
-import { UsageCollectionStart } from '../../../../../../../usage_collection/public';
 
 export function openAddPanelFlyout(options: {
   embeddable: IContainer;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
index fbfd86cf4ec53..d2aab8eedea2c 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 import { ViewMode } from '../../../../types';
 import { IEmbeddable } from '../../../../embeddables';
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx
index 34acdf6fd1cb1..16c216248a5da 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../';
+import { IEmbeddable } from '../../../..';
 
 interface CustomizePanelProps {
   embeddable: IEmbeddable;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
index dbd1f8eacdf1b..5c7483588d19f 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
@@ -15,7 +15,7 @@ import {
   FilterableEmbeddable,
   ContactCardEmbeddable,
 } from '../../../test_samples';
-import { inspectorPluginMock } from '../../../../../../../plugins/inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { EmbeddableOutput, isErrorEmbeddable, ErrorEmbeddable } from '../../../embeddables';
 import { of } from '../../../../tests/helpers';
 import { embeddablePluginMock } from '../../../../mocks';
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
index 4e9997c9abf11..08c08fc63e896 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Action } from 'src/plugins/ui_actions/public';
-import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 import { IEmbeddable } from '../../../embeddables';
 
 export const ACTION_INSPECT_PANEL = 'openInspector';
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
index 019584a7f1aa4..b04aa4a0bd9a9 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableOutput, isErrorEmbeddable } from '../../../';
+import { EmbeddableOutput, isErrorEmbeddable } from '../../..';
 import { RemovePanelAction } from './remove_panel_action';
 import { EmbeddableStart } from '../../../../plugin';
 import {
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
index eb4b6988b0b7c..667230807ddfb 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
@@ -18,11 +18,11 @@ import {
 } from '@elastic/eui';
 import classNames from 'classnames';
 import React from 'react';
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import { PanelOptionsMenu } from './panel_options_menu';
 import { IEmbeddable } from '../../embeddables';
 import { EmbeddableContext, panelBadgeTrigger, panelNotificationTrigger } from '../../triggers';
-import { uiToReactComponent } from '../../../../../kibana_react/public';
 import { CustomizePanelTitleAction } from '.';
 
 export interface PanelHeaderProps {
diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
index 2dda0df1a85c5..32efb83f27306 100644
--- a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
+++ b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { Storage } from '../../../../kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { EmbeddableStateTransfer } from '.';
-import { ApplicationStart, PublicAppInfo } from '../../../../../core/public';
+import { ApplicationStart, PublicAppInfo } from '@kbn/core/public';
 import { EMBEDDABLE_EDITOR_STATE_KEY, EMBEDDABLE_PACKAGE_STATE_KEY } from './types';
 import { EMBEDDABLE_STATE_TRANSFER_STORAGE_KEY } from './embeddable_state_transfer';
 import { Subject } from 'rxjs';
diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
index fe471ef853b23..193aec8ee5234 100644
--- a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
+++ b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
@@ -7,8 +7,8 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { Storage } from '../../../../kibana_utils/public';
-import { ApplicationStart, PublicAppInfo } from '../../../../../core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { ApplicationStart, PublicAppInfo } from '@kbn/core/public';
 import {
   EmbeddableEditorState,
   isEmbeddableEditorState,
diff --git a/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx b/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx
index 522451285d485..a7e8e70a045f7 100644
--- a/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiFlyoutBody } from '@elastic/eui';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { createAction, IncompatibleActionError } from '../../ui_actions';
-import { CoreStart } from '../../../../../../core/public';
-import { toMountPoint } from '../../../../../kibana_react/public';
 import { Embeddable, EmbeddableInput } from '../../embeddables';
 import { GetMessageModal } from './get_message_modal';
 import { FullNameEmbeddableOutput, hasFullNameOutput } from './say_hello_action';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx
index 09b576d07babf..b69e6dc45c617 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx
@@ -12,7 +12,7 @@ import { EuiCard, EuiFlexItem, EuiFlexGroup, EuiFormRow } from '@elastic/eui';
 import { Subscription } from 'rxjs';
 import { EuiButton } from '@elastic/eui';
 import * as Rx from 'rxjs';
-import { UiActionsStart } from '../../../../../../ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ContactCardEmbeddable, CONTACT_USER_TRIGGER } from './contact_card_embeddable';
 
 interface Props {
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx
index 09a2eb8c5f8dc..82743caf04cce 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDom from 'react-dom';
 import { Subscription } from 'rxjs';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { Container } from '../../../containers';
 import { EmbeddableOutput, Embeddable, EmbeddableInput } from '../../../embeddables';
 import { CONTACT_CARD_EMBEDDABLE } from './contact_card_embeddable_factory';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx
index 6b33d6b44b936..47fb58c1fbbd9 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-import { CoreStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { EmbeddableFactoryDefinition } from '../../../embeddables';
 import { Container } from '../../../containers';
 import { ContactCardEmbeddable, ContactCardEmbeddableInput } from './contact_card_embeddable';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx
index 7b58d5c8b4983..cf6ffdbe84e9f 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-import { CoreStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { EmbeddableFactoryDefinition } from '../../../embeddables';
 import { Container } from '../../../containers';
 import { ContactCardEmbeddableInput } from './contact_card_embeddable';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts
index 7e9e01214e8cc..9493bcbaee458 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { Container, EmbeddableFactoryDefinition } from '../../..';
 import { ContactCardEmbeddable, ContactCardEmbeddableInput } from './contact_card_embeddable';
 import { CONTACT_CARD_EMBEDDABLE } from './contact_card_embeddable_factory';
diff --git a/src/plugins/embeddable/public/lib/triggers/triggers.ts b/src/plugins/embeddable/public/lib/triggers/triggers.ts
index 24b712dfd3639..f00bf34596c2e 100644
--- a/src/plugins/embeddable/public/lib/triggers/triggers.ts
+++ b/src/plugins/embeddable/public/lib/triggers/triggers.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Datatable } from '../../../../expressions';
-import { Trigger, RowClickContext } from '../../../../ui_actions/public';
+import { Datatable } from '@kbn/expressions-plugin';
+import { Trigger, RowClickContext } from '@kbn/ui-actions-plugin/public';
 import { IEmbeddable } from '..';
 
 export interface EmbeddableContext<T extends IEmbeddable = IEmbeddable> {
diff --git a/src/plugins/embeddable/public/lib/ui_actions.ts b/src/plugins/embeddable/public/lib/ui_actions.ts
index 6d3521b6472a4..e17be5ade3bd1 100644
--- a/src/plugins/embeddable/public/lib/ui_actions.ts
+++ b/src/plugins/embeddable/public/lib/ui_actions.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../ui_actions/public';
+export * from '@kbn/ui-actions-plugin/public';
diff --git a/src/plugins/embeddable/public/mocks.tsx b/src/plugins/embeddable/public/mocks.tsx
index 44d2b395a48c3..a626dc5a4b1d9 100644
--- a/src/plugins/embeddable/public/mocks.tsx
+++ b/src/plugins/embeddable/public/mocks.tsx
@@ -7,6 +7,14 @@
  */
 
 import React from 'react';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { UiActionsService } from './lib/ui_actions';
+import { EmbeddablePublicPlugin } from './plugin';
 import {
   EmbeddableStart,
   EmbeddableSetup,
@@ -19,14 +27,6 @@ import {
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
 } from '.';
-import { EmbeddablePublicPlugin } from './plugin';
-import { coreMock, themeServiceMock } from '../../../core/public/mocks';
-import { UiActionsService } from './lib/ui_actions';
-import { CoreStart } from '../../../core/public';
-import { Start as InspectorStart } from '../../inspector/public';
-
-import { inspectorPluginMock } from '../../inspector/public/mocks';
-import { uiActionsPluginMock } from '../../ui_actions/public/mocks';
 
 export { mockAttributeService } from './lib/attribute_service/attribute_service.mock';
 export type Setup = jest.Mocked<EmbeddableSetup>;
diff --git a/src/plugins/embeddable/public/plugin.test.ts b/src/plugins/embeddable/public/plugin.test.ts
index a616b559d3236..82d9801503536 100644
--- a/src/plugins/embeddable/public/plugin.test.ts
+++ b/src/plugins/embeddable/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { testPlugin } from './tests/test_plugin';
 import { EmbeddableFactoryProvider } from './types';
 import { defaultEmbeddableFactoryProvider } from './lib';
diff --git a/src/plugins/embeddable/public/plugin.tsx b/src/plugins/embeddable/public/plugin.tsx
index 4098bd7467062..fe0e93bdc95b6 100644
--- a/src/plugins/embeddable/public/plugin.tsx
+++ b/src/plugins/embeddable/public/plugin.tsx
@@ -10,16 +10,18 @@ import React from 'react';
 import { Subscription } from 'rxjs';
 import { identity } from 'lodash';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { getSavedObjectFinder, showSaveModal } from '../../saved_objects/public';
-import { UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
-import { Start as InspectorStart } from '../../inspector/public';
+import { getSavedObjectFinder, showSaveModal } from '@kbn/saved-objects-plugin/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import {
   PluginInitializerContext,
   CoreSetup,
   CoreStart,
   Plugin,
   PublicAppInfo,
-} from '../../../core/public';
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { migrateToLatest, PersistableStateService } from '@kbn/kibana-utils-plugin/common';
 import {
   EmbeddableFactoryRegistry,
   EmbeddableFactoryProvider,
@@ -40,8 +42,6 @@ import {
 } from './lib';
 import { EmbeddableFactoryDefinition } from './lib/embeddables/embeddable_factory_definition';
 import { EmbeddableStateTransfer } from './lib/state_transfer';
-import { Storage } from '../../kibana_utils/public';
-import { migrateToLatest, PersistableStateService } from '../../kibana_utils/common';
 import { ATTRIBUTE_SERVICE_KEY, AttributeService } from './lib/attribute_service';
 import { AttributeServiceOptions } from './lib/attribute_service/attribute_service';
 import { EmbeddableStateWithType, CommonEmbeddableStartContract } from '../common/types';
@@ -251,7 +251,7 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
     }
     this.enhancements.set(enhancement.id, {
       id: enhancement.id,
-      telemetry: enhancement.telemetry || (() => ({})),
+      telemetry: enhancement.telemetry || ((state, stats) => stats),
       inject: enhancement.inject || identity,
       extract:
         enhancement.extract ||
diff --git a/src/plugins/embeddable/public/services.ts b/src/plugins/embeddable/public/services.ts
index 96088e086a771..60c4b81311960 100644
--- a/src/plugins/embeddable/public/services.ts
+++ b/src/plugins/embeddable/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceSetup } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceSetup>('Theme');
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 3e071594eea30..c082255faff28 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -36,7 +36,7 @@ import {
   FilterableContainer,
   FilterableContainerInput,
 } from '../lib/test_samples/embeddables/filterable_container';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { testPlugin } from './test_plugin';
 import { of } from './helpers';
 import { createEmbeddablePanelMock } from '../mocks';
diff --git a/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx b/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
index baae08b23cfa1..25280c3ee8092 100644
--- a/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
+++ b/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
@@ -19,13 +19,13 @@ import {
   ContactCardEmbeddableFactory,
 } from '../lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { testPlugin } from './test_plugin';
 import { CustomizePanelModal } from '../lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal';
 import { EmbeddableStart } from '../plugin';
 import { createEmbeddablePanelMock } from '../mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 let api: EmbeddableStart;
 let container: Container;
diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts
index 55b29f7f17a64..d9a7b72ada15a 100644
--- a/src/plugins/embeddable/public/tests/explicit_input.test.ts
+++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts
@@ -20,7 +20,7 @@ import { HELLO_WORLD_EMBEDDABLE, HelloWorldEmbeddableFactoryDefinition } from '.
 import { FilterableContainer } from '../lib/test_samples/embeddables/filterable_container';
 import { isErrorEmbeddable } from '../lib';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createEmbeddablePanelMock } from '../mocks';
 
 const { setup, doStart, coreStart, uiActions } = testPlugin(
diff --git a/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx b/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx
index 366d0ed9ed152..7bf9ce0889534 100644
--- a/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx
+++ b/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Embeddable, EmbeddableInput, IContainer } from '../../';
+import { Embeddable, EmbeddableInput, IContainer } from '../..';
 
 export const HELLO_WORLD_EMBEDDABLE = 'HELLO_WORLD_EMBEDDABLE';
 
diff --git a/src/plugins/embeddable/public/tests/test_plugin.ts b/src/plugins/embeddable/public/tests/test_plugin.ts
index c515d1b05cd5f..6587d42dfda12 100644
--- a/src/plugins/embeddable/public/tests/test_plugin.ts
+++ b/src/plugins/embeddable/public/tests/test_plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/public';
-import { UiActionsStart } from '../../../ui_actions/public';
-import { uiActionsPluginMock } from '../../../ui_actions/public/mocks';
-import { inspectorPluginMock } from '../../../inspector/public/mocks';
-import { coreMock } from '../../../../core/public/mocks';
+import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { EmbeddablePublicPlugin, EmbeddableSetup, EmbeddableStart } from '../plugin';
 
 export interface TestPluginReturn {
diff --git a/src/plugins/embeddable/public/types.ts b/src/plugins/embeddable/public/types.ts
index 8cfe77a3a6db0..29f38c2f1916b 100644
--- a/src/plugins/embeddable/public/types.ts
+++ b/src/plugins/embeddable/public/types.ts
@@ -7,7 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
+import { PersistableState, PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import {
   EmbeddableFactory,
   EmbeddableInput,
@@ -15,7 +16,6 @@ import {
   IEmbeddable,
   EmbeddableFactoryDefinition,
 } from './lib/embeddables';
-import { PersistableState, PersistableStateDefinition } from '../../kibana_utils/common';
 
 export type EmbeddableFactoryRegistry = Map<string, EmbeddableFactory>;
 export type EnhancementsRegistry = Map<string, EnhancementRegistryItem>;
diff --git a/src/plugins/embeddable/server/plugin.ts b/src/plugins/embeddable/server/plugin.ts
index f9ad0a1bda372..51fa1edb2c634 100644
--- a/src/plugins/embeddable/server/plugin.ts
+++ b/src/plugins/embeddable/server/plugin.ts
@@ -7,8 +7,13 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { identity } from 'lodash';
+import {
+  PersistableStateService,
+  PersistableStateMigrateFn,
+  MigrateFunctionsObject,
+} from '@kbn/kibana-utils-plugin/common';
 import {
   EmbeddableFactoryRegistry,
   EnhancementsRegistry,
@@ -22,11 +27,6 @@ import {
   getMigrateFunction,
   getTelemetryFunction,
 } from '../common/lib';
-import {
-  PersistableStateService,
-  PersistableStateMigrateFn,
-  MigrateFunctionsObject,
-} from '../../kibana_utils/common';
 import { EmbeddableStateWithType, CommonEmbeddableStartContract } from '../common/types';
 import { getAllMigrations } from '../common/lib/get_all_migrations';
 
@@ -94,7 +94,7 @@ export class EmbeddableServerPlugin implements Plugin<EmbeddableSetup, Embeddabl
     }
     this.enhancements.set(enhancement.id, {
       id: enhancement.id,
-      telemetry: enhancement.telemetry || (() => ({})),
+      telemetry: enhancement.telemetry || ((state, stats) => stats),
       inject: enhancement.inject || identity,
       extract:
         enhancement.extract ||
@@ -127,7 +127,7 @@ export class EmbeddableServerPlugin implements Plugin<EmbeddableSetup, Embeddabl
     }
     this.embeddableFactories.set(factory.id, {
       id: factory.id,
-      telemetry: factory.telemetry || (() => ({})),
+      telemetry: factory.telemetry || ((state, stats) => stats),
       inject: factory.inject || identity,
       extract: factory.extract || ((state: EmbeddableStateWithType) => ({ state, references: [] })),
       migrations: factory.migrations || {},
diff --git a/src/plugins/embeddable/server/types.ts b/src/plugins/embeddable/server/types.ts
index ba5314692e430..9b0479d6bc25d 100644
--- a/src/plugins/embeddable/server/types.ts
+++ b/src/plugins/embeddable/server/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { PersistableState, PersistableStateDefinition } from '../../kibana_utils/common';
+import { PersistableState, PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import { EmbeddableStateWithType } from '../common/types';
 
 export type EmbeddableFactoryRegistry = Map<string, EmbeddableRegistryItem>;
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx
index 7d8d00156e541..bc1b795d1a46c 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import React, { createContext, useContext } from 'react';
 
 import { useRequest } from '../../../public/request';
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx
index 9953a8fedb39b..7fe745c22f225 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx
@@ -8,7 +8,7 @@
 
 import { EuiSpacer, EuiEmptyPrompt, EuiPageContent } from '@elastic/eui';
 import React from 'react';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { Error } from '../types';
 
 interface Props {
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts
index 240eeb59f9a45..595e65577aa1a 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts
@@ -8,7 +8,7 @@
 
 import { errors } from '@elastic/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { kibanaResponseFactory as response } from 'src/core/server';
+import { kibanaResponseFactory as response } from '@kbn/core/server';
 import { handleEsError } from './handle_es_error';
 
 const { ResponseError } = errors;
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts
index d1853c988dbce..7620c71ae8956 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts
@@ -8,7 +8,7 @@
 
 import { errors } from '@elastic/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { IKibanaResponse, KibanaResponseFactory } from 'kibana/server';
+import { IKibanaResponse, KibanaResponseFactory } from '@kbn/core/server';
 import { getEsCause } from './es_error_parser';
 
 interface EsErrorHandlerParams {
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts b/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts
index df6129e7cf013..9118ea5089a1f 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts
@@ -12,7 +12,7 @@ import collapsingTests from './__fixtures__/utils_string_collapsing.txt';
 // @ts-ignore
 import expandingTests from './__fixtures__/utils_string_expanding.txt';
 
-import * as utils from './index';
+import * as utils from '.';
 import { extractJSONStringValues } from './parser';
 
 describe('JSON to XJSON conversion tools', () => {
diff --git a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx
index 4f6c954d4c37d..721b7b4a071ff 100644
--- a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx
+++ b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx
@@ -13,9 +13,9 @@ import { findTestSubject, takeMountedSnapshot } from '@elastic/eui/lib/test';
 import { compressToEncodedURIComponent } from 'lz-string';
 
 import { ViewApiRequestFlyout } from './view_api_request_flyout';
-import type { UrlService } from 'src/plugins/share/common/url_service';
-import { ApplicationStart } from 'src/core/public';
-import { applicationServiceMock } from 'src/core/public/mocks';
+import type { UrlService } from '@kbn/share-plugin/common/url_service';
+import { ApplicationStart } from '@kbn/core/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 
 const payload = {
   title: 'Test title',
diff --git a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx
index fa7bc6088f5c0..7ee8b464ce521 100644
--- a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx
+++ b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx
@@ -23,9 +23,9 @@ import {
   EuiCodeBlock,
   EuiCopy,
 } from '@elastic/eui';
-import type { UrlService } from 'src/plugins/share/common/url_service';
-import { ApplicationStart, APP_WRAPPER_CLASS } from '../../../../../core/public';
-import { RedirectAppLinks } from '../../../../kibana_react/public';
+import type { UrlService } from '@kbn/share-plugin/common/url_service';
+import { ApplicationStart, APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
 type FlyoutProps = Omit<EuiFlyoutProps, 'onClose'>;
 interface ViewApiRequestFlyoutProps {
diff --git a/src/plugins/es_ui_shared/public/indices/constants/index.ts b/src/plugins/es_ui_shared/public/indices/constants/index.ts
index 5591c3776804b..f7858c94dcab9 100644
--- a/src/plugins/es_ui_shared/public/indices/constants/index.ts
+++ b/src/plugins/es_ui_shared/public/indices/constants/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { indexPatterns } from '../../../../data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [...indexPatterns.ILLEGAL_CHARACTERS_VISIBLE, '*'];
 
diff --git a/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts b/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
index 3ef33b651f4d2..4f52490067192 100644
--- a/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
+++ b/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
@@ -8,7 +8,7 @@
 
 import sinon from 'sinon';
 
-import { HttpSetup, HttpFetchOptions } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchOptions } from '@kbn/core/public';
 import {
   SendRequestConfig,
   SendRequestResponse,
diff --git a/src/plugins/es_ui_shared/public/request/send_request.ts b/src/plugins/es_ui_shared/public/request/send_request.ts
index bdc6386ad15c6..518ae5fb14bc6 100644
--- a/src/plugins/es_ui_shared/public/request/send_request.ts
+++ b/src/plugins/es_ui_shared/public/request/send_request.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup, HttpFetchQuery } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchQuery } from '@kbn/core/public';
 
 export interface SendRequestConfig {
   path: string;
diff --git a/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx b/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
index 82d3764dbf72a..db694a29b793e 100644
--- a/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
+++ b/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
-import { HttpSetup, HttpFetchOptions } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchOptions } from '@kbn/core/public';
 import { SendRequestConfig, SendRequestResponse } from './send_request';
 import { useRequest, UseRequestResponse, UseRequestConfig } from './use_request';
 
diff --git a/src/plugins/es_ui_shared/public/request/use_request.ts b/src/plugins/es_ui_shared/public/request/use_request.ts
index 1241d6222a38f..d03ad222d20bf 100644
--- a/src/plugins/es_ui_shared/public/request/use_request.ts
+++ b/src/plugins/es_ui_shared/public/request/use_request.ts
@@ -8,7 +8,7 @@
 
 import { useEffect, useCallback, useState, useRef, useMemo } from 'react';
 
-import { HttpSetup } from '../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { sendRequest, SendRequestConfig } from './send_request';
 
 export interface UseRequestConfig extends SendRequestConfig {
diff --git a/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx b/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx
index 981fd7c0a773b..7f3e476b21251 100644
--- a/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx
@@ -42,7 +42,8 @@ export const ComboBoxField = ({ field, euiFieldProps = {}, idAria, ...rest }: Pr
 
   const onCreateComboOption = (value: string) => {
     // Note: for now, all validations for a comboBox array item have to be synchronous
-    // If there is a need to support asynchronous validation, we'll work on it (and will need to update the <EuiComboBox /> logic).
+    // If there is a need to support asynchronous validation, we'll need to update this handler and
+    // make the <EuiComboBox /> "onCreateOption" handler async).
     const { isValid } = field.validate({
       value,
       validationType: VALIDATION_TYPES.ARRAY_ITEM,
@@ -84,7 +85,7 @@ export const ComboBoxField = ({ field, euiFieldProps = {}, idAria, ...rest }: Pr
         placeholder={i18n.translate('esUi.forms.comboBoxField.placeHolderText', {
           defaultMessage: 'Type and then hit "ENTER"',
         })}
-        selectedOptions={(field.value as any[]).map((v) => ({ label: v }))}
+        selectedOptions={(field.value as string[]).map((v) => ({ label: v }))}
         onCreateOption={onCreateComboOption}
         onChange={onComboChange}
         onSearchChange={onSearchComboChange}
diff --git a/src/plugins/es_ui_shared/static/forms/docs/core/form_hook.mdx b/src/plugins/es_ui_shared/static/forms/docs/core/form_hook.mdx
index d66c0d867c275..46fac236123fd 100644
--- a/src/plugins/es_ui_shared/static/forms/docs/core/form_hook.mdx
+++ b/src/plugins/es_ui_shared/static/forms/docs/core/form_hook.mdx
@@ -212,3 +212,22 @@ Sets field errors imperatively.
 ```js
 form.setFieldErrors('name', [{ message: 'There is an error in the field' }]);
 ```
+
+### updateFieldValues()
+
+**Arguments:** `updatedFormData: Partial<T>, options?: { runDeserializer?: boolean }` 
+
+Update multiple field values at once. You don't need to provide all the form fields, **partial** update is supported. This method is mainly useful to update an array of object fields or to avoid multiple `form.setFieldValue()` calls.
+
+```js
+// Update an array of object (e.g "myArray[0].foo", "myArray[0].baz"...)
+form.updateFieldValues({
+  myArray: [
+    { foo: 'bar', baz: true },
+    { foo2: 'bar2', baz: false }
+  ]
+});
+
+// or simply multiple fields at once
+form.updateFieldValues({ foo: 'bar', baz: false })
+```
\ No newline at end of file
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 1b6667fce41ab..52cd12b09a32e 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
@@ -6,12 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { indexPatterns } from '@kbn/data-plugin/public';
 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>> => {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx
index dc8695190bdaf..8e9bdd35ffb7e 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx
@@ -77,11 +77,7 @@ describe('<UseArray />', () => {
                 <>
                   {items.map(({ id, path }) => {
                     return (
-                      <UseField
-                        key={id}
-                        path={`${path}.name`}
-                        data-test-subj={`nameField__${id}`}
-                      />
+                      <UseField key={id} path={`${path}.name`} data-test-subj={`${path}Name`} />
                     );
                   })}
                 </>
@@ -102,7 +98,7 @@ describe('<UseArray />', () => {
     } = setup();
 
     await act(async () => {
-      setInputValue('nameField__0', 'John');
+      setInputValue('users[0]Name', 'John');
     });
 
     const formData = onFormData.mock.calls[onFormData.mock.calls.length - 1][0];
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
index 78379aa9fffbf..d6ada976c875c 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import uuid from 'uuid';
 import { useEffect, useRef, useCallback, useMemo } from 'react';
 
 import { FormHook, FieldConfig } from '../types';
@@ -37,6 +36,25 @@ export interface FormArrayField {
   form: FormHook;
 }
 
+let uniqueId = 0;
+
+export const createArrayItem = (path: string, index: number, isNew = true): ArrayItem => ({
+  id: uniqueId++,
+  path: `${path}[${index}]`,
+  isNew,
+});
+
+/**
+ * We create an internal field to represent the Array items. This field is not returned
+ * as part as the form data but is used internally to run validation on the array items.
+ * It is this internal field value (ArrayItem[]) that we then map to actual form fields
+ * (in the children func <UseArray>{({ items }) => (...)}</UseArray>)
+ *
+ * @param path The array path in the form data
+ * @returns The internal array field path
+ */
+export const getInternalArrayFieldPath = (path: string): string => `${path}__array__`;
+
 /**
  * Use UseArray to dynamically add fields to your form.
  *
@@ -60,41 +78,26 @@ export const UseArray = ({
   children,
 }: Props) => {
   const isMounted = useRef(false);
-  const uniqueId = useRef(0);
 
   const form = useFormContext();
   const { getFieldDefaultValue } = form;
 
-  const getNewItemAtIndex = useCallback(
-    (index: number): ArrayItem => ({
-      id: uniqueId.current++,
-      path: `${path}[${index}]`,
-      isNew: true,
-    }),
-    [path]
-  );
-
   const fieldDefaultValue = useMemo<ArrayItem[]>(() => {
     const defaultValues = readDefaultValueOnForm
       ? getFieldDefaultValue<unknown[]>(path)
       : undefined;
 
     if (defaultValues) {
-      return defaultValues.map((_, index) => ({
-        id: uniqueId.current++,
-        path: `${path}[${index}]`,
-        isNew: false,
-      }));
+      return defaultValues.map((_, index) => createArrayItem(path, index, false));
     }
 
-    return new Array(initialNumberOfItems).fill('').map((_, i) => getNewItemAtIndex(i));
-  }, [path, initialNumberOfItems, readDefaultValueOnForm, getFieldDefaultValue, getNewItemAtIndex]);
+    return new Array(initialNumberOfItems).fill('').map((_, i) => createArrayItem(path, i));
+  }, [path, initialNumberOfItems, readDefaultValueOnForm, getFieldDefaultValue]);
 
   // Create an internal hook field which behaves like any other form field except that it is not
   // outputed in the form data (when calling form.submit() or form.getFormData())
   // This allow us to run custom validations (passed to the props) on the Array items
-
-  const internalFieldPath = useMemo(() => `${path}__${uuid.v4()}`, [path]);
+  const internalFieldPath = useMemo(() => getInternalArrayFieldPath(path), [path]);
 
   const fieldConfigBase: FieldConfig<ArrayItem[]> & InternalFieldConfig<ArrayItem[]> = {
     defaultValue: fieldDefaultValue,
@@ -132,9 +135,9 @@ export const UseArray = ({
   const addItem = useCallback(() => {
     setValue((previousItems) => {
       const itemIndex = previousItems.length;
-      return [...previousItems, getNewItemAtIndex(itemIndex)];
+      return [...previousItems, createArrayItem(path, itemIndex)];
     });
-  }, [setValue, getNewItemAtIndex]);
+  }, [setValue, path]);
 
   const removeItem = useCallback(
     (id: number) => {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
index afaaaaedef23e..9f57432b5d6a1 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
@@ -6,12 +6,13 @@
  * Side Public License, v 1.
  */
 
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed, getRandomString, TestBed } from '../shared_imports';
 import { emptyField } from '../../helpers/field_validators';
-import { Form, UseField } from '../components';
+import { ComboBoxField } from '../../components';
+import { Form, UseField, UseArray } from '../components';
 import {
   FormSubmitHandler,
   OnUpdateHandler,
@@ -274,7 +275,7 @@ describe('useForm() hook', () => {
       onFormData.mockReset();
     });
 
-    test('should set the default value of a field ', async () => {
+    test('should set the default value of a field ', () => {
       const defaultValue = {
         title: getRandomString(),
         subTitle: getRandomString(),
@@ -285,6 +286,7 @@ describe('useForm() hook', () => {
 
       const TestComp = ({ onData }: { onData: OnUpdateHandler }) => {
         const { form } = useForm({ defaultValue });
+        formHook = form;
         const { subscribe } = form;
 
         useEffect(() => subscribe(onData).unsubscribe, [subscribe, onData]);
@@ -316,6 +318,40 @@ describe('useForm() hook', () => {
           name: defaultValue.user.name,
         },
       });
+
+      expect(formHook?.__getFormDefaultValue()).toEqual({
+        ...defaultValue,
+        subTitle: 'hasBeenOverridden',
+      });
+    });
+
+    test('should be updated with the UseField "defaultValue" prop', () => {
+      const TestComp = () => {
+        const { form } = useForm({ defaultValue: { name: 'Mike' } });
+        const [_, setDate] = useState(new Date());
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            {/* "John" should be set in the form defaultValue */}
+            <UseField path="name" defaultValue="John" />
+            <button data-test-subj="forceUpdateBtn" onClick={() => setDate(new Date())}>
+              Force udpate
+            </button>
+          </Form>
+        );
+      };
+
+      const { find } = registerTestBed(TestComp, { memoryRouter: { wrapComponent: false } })();
+
+      expect(formHook?.__getFormDefaultValue()).toEqual({ name: 'John' });
+
+      // Make sure a re-render of the component does not re-update the defaultValue
+      act(() => {
+        find('forceUpdateBtn').simulate('click');
+      });
+
+      expect(formHook?.__getFormDefaultValue()).toEqual({ name: 'John' });
     });
   });
 
@@ -653,4 +689,321 @@ describe('useForm() hook', () => {
       expect(errors).toEqual(['Field1 can not be empty', 'Field2 is invalid']);
     });
   });
+
+  describe('form.updateFieldValues()', () => {
+    test('should update field values and discard unknwon fields provided', async () => {
+      const TestComp = () => {
+        const { form } = useForm();
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            <UseField path="field1" config={{ defaultValue: 'field1_defaultValue' }} />
+            <UseField path="field2.a" config={{ defaultValue: 'field2_a_defaultValue' }} />
+            <UseField path="field2.b" config={{ defaultValue: 'field2_b_defaultValue' }} />
+          </Form>
+        );
+      };
+
+      registerTestBed(TestComp)();
+
+      expect(formHook!.getFormData()).toEqual({
+        field1: 'field1_defaultValue',
+        field2: {
+          a: 'field2_a_defaultValue',
+          b: 'field2_b_defaultValue',
+        },
+      });
+
+      await act(async () => {
+        formHook!.updateFieldValues({
+          field1: 'field1_updated',
+          field2: {
+            a: 'field2_a_updated',
+            b: 'field2_b_updated',
+          },
+          unknownField: 'foo',
+        });
+      });
+
+      expect(formHook!.getFormData()).toEqual({
+        field1: 'field1_updated',
+        field2: {
+          a: 'field2_a_updated',
+          b: 'field2_b_updated',
+        },
+      });
+    });
+
+    test('should update an array of object fields', async () => {
+      const TestComp = () => {
+        const { form } = useForm();
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            <UseArray path="users">
+              {({ items }) => (
+                <>
+                  {items.map(({ id, path, isNew }) => (
+                    <div key={id}>
+                      <UseField
+                        path={`${path}.name`}
+                        config={{ defaultValue: 'John' }}
+                        readDefaultValueOnForm={!isNew}
+                      />
+                      <UseField
+                        path={`${path}.lastName`}
+                        config={{ defaultValue: 'Snow' }}
+                        readDefaultValueOnForm={!isNew}
+                      />
+                    </div>
+                  ))}
+                </>
+              )}
+            </UseArray>
+          </Form>
+        );
+      };
+
+      registerTestBed(TestComp)();
+
+      if (formHook === null) {
+        throw new Error('Formhook has not been set.');
+      }
+
+      expect(formHook.getFormData()).toEqual({
+        users: [
+          {
+            name: 'John',
+            lastName: 'Snow',
+          },
+        ],
+      });
+
+      const newFormData = {
+        users: [
+          {
+            name: 'User1_name',
+            lastName: 'User1_lastName',
+          },
+          {
+            name: 'User2_name',
+            lastName: 'User2_lastName',
+          },
+        ],
+      };
+
+      await act(async () => {
+        formHook!.updateFieldValues(newFormData);
+      });
+
+      expect(formHook.getFormData()).toEqual(newFormData);
+    });
+
+    test('should update an array of string fields (ComboBox)', async () => {
+      const TestComp = () => {
+        const { form } = useForm();
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            <UseField path="tags" defaultValue={['foo', 'bar']} component={ComboBoxField} />
+          </Form>
+        );
+      };
+
+      registerTestBed(TestComp)();
+
+      if (formHook === null) {
+        throw new Error('Formhook has not been set.');
+      }
+
+      expect(formHook.getFormData()).toEqual({
+        tags: ['foo', 'bar'],
+      });
+
+      const newFormData = {
+        tags: ['updated', 'array'],
+      };
+
+      await act(async () => {
+        formHook!.updateFieldValues(newFormData);
+      });
+
+      expect(formHook.getFormData()).toEqual(newFormData);
+    });
+
+    test('should update recursively an array of object fields', async () => {
+      const TestComp = () => {
+        const { form } = useForm();
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            <UseArray path="users">
+              {({ items: userItems }) => (
+                <>
+                  {userItems.map(({ id: userId, path: userPath }) => (
+                    <div key={userId}>
+                      <UseField path={`${userPath}.name`} config={{ defaultValue: 'John' }} />
+                      <UseArray path={`${userPath}.address`}>
+                        {({ items: addressItems }) => (
+                          <>
+                            {addressItems.map(
+                              ({ id: addressId, path: addressPath, isNew: isNewAddress }) => (
+                                <div key={addressId}>
+                                  <UseField
+                                    path={`${addressPath}.street`}
+                                    config={{ defaultValue: 'Street name' }}
+                                    readDefaultValueOnForm={!isNewAddress}
+                                  />
+                                  <UseField
+                                    path={`${addressPath}.city`}
+                                    config={{ defaultValue: 'Lagos' }}
+                                    readDefaultValueOnForm={!isNewAddress}
+                                  />
+                                </div>
+                              )
+                            )}
+                          </>
+                        )}
+                      </UseArray>
+                      <UseField
+                        path={`${userPath}.tags`}
+                        config={{ defaultValue: ['blue', 'red'] }}
+                        component={ComboBoxField}
+                      />
+                    </div>
+                  ))}
+                </>
+              )}
+            </UseArray>
+          </Form>
+        );
+      };
+
+      registerTestBed(TestComp)();
+
+      if (formHook === null) {
+        throw new Error('Formhook has not been set.');
+      }
+
+      expect(formHook.getFormData()).toEqual({
+        users: [
+          {
+            name: 'John',
+            address: [
+              {
+                street: 'Street name',
+                city: 'Lagos',
+              },
+            ],
+            tags: ['blue', 'red'],
+          },
+        ],
+      });
+
+      const newFormData = {
+        users: [
+          {
+            name: 'Balbina',
+            tags: ['yellow', 'pink'],
+            address: [
+              {
+                street: 'Rua direita',
+                city: 'Burgau',
+              },
+            ],
+          },
+          {
+            name: 'Mike',
+            tags: ['green', 'black', 'orange'],
+            address: [
+              {
+                street: 'Calle de Callao',
+                city: 'Madrid',
+              },
+              {
+                street: 'Rue de Flagey',
+                city: 'Brussels',
+              },
+            ],
+          },
+        ],
+      };
+
+      await act(async () => {
+        formHook!.updateFieldValues(newFormData);
+      });
+
+      expect(formHook.getFormData()).toEqual(newFormData);
+    });
+
+    describe('deserializer', () => {
+      const formDefaultValue = { foo: 'initial' };
+      const deserializer = (formData: typeof formDefaultValue) => ({
+        foo: { label: formData.foo.toUpperCase(), value: formData.foo },
+      });
+
+      const TestComp = () => {
+        const { form } = useForm({ defaultValue: formDefaultValue, deserializer });
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            <UseField path="foo">{() => null}</UseField>
+          </Form>
+        );
+      };
+
+      test('should run deserializer on the new form data provided', async () => {
+        registerTestBed(TestComp)();
+
+        if (formHook === null) {
+          throw new Error('Formhook has not been set.');
+        }
+
+        expect(formHook.getFormData()).toEqual({
+          foo: { label: 'INITIAL', value: 'initial' },
+        });
+
+        const newFormData = {
+          foo: 'updated',
+        };
+
+        await act(async () => {
+          formHook!.updateFieldValues(newFormData);
+        });
+
+        expect(formHook.getFormData()).toEqual({
+          foo: { label: 'UPDATED', value: 'updated' },
+        });
+      });
+
+      test('should not run deserializer on the new form data provided', async () => {
+        registerTestBed(TestComp)();
+
+        if (formHook === null) {
+          throw new Error('Formhook has not been set.');
+        }
+
+        expect(formHook.getFormData()).toEqual({
+          foo: { label: 'INITIAL', value: 'initial' },
+        });
+
+        const newFormData = {
+          foo: 'updated',
+        };
+
+        await act(async () => {
+          formHook!.updateFieldValues(newFormData, { runDeserializer: false });
+        });
+
+        expect(formHook.getFormData()).toEqual({
+          foo: 'updated',
+        });
+      });
+    });
+  });
 });
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
index 3966f9cc61a70..b6b45c76e7115 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
@@ -7,11 +7,19 @@
  */
 
 import { useState, useRef, useEffect, useMemo, useCallback } from 'react';
-import { get } from 'lodash';
+import { get, mergeWith } from 'lodash';
 import { set } from '@elastic/safer-lodash-set';
 
 import { FormHook, FieldHook, FormData, FieldsMap, FormConfig } from '../types';
-import { mapFormFields, unflattenObject, flattenObject, Subject, Subscription } from '../lib';
+import {
+  mapFormFields,
+  unflattenObject,
+  flattenObject,
+  stripOutUndefinedValues,
+  Subject,
+  Subscription,
+} from '../lib';
+import { createArrayItem, getInternalArrayFieldPath } from '../components/use_array';
 
 const DEFAULT_OPTIONS = {
   valueChangeDebounceTime: 500,
@@ -37,23 +45,23 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
 
   // Strip out any "undefined" value and run the deserializer
   const initDefaultValue = useCallback(
-    (_defaultValue?: Partial<T>): I | undefined => {
+    (_defaultValue?: Partial<T>, runDeserializer: boolean = true): I | undefined => {
       if (_defaultValue === undefined || Object.keys(_defaultValue).length === 0) {
         return undefined;
       }
 
-      const filtered = Object.entries(_defaultValue as object)
-        .filter(({ 1: value }) => value !== undefined)
-        .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {} as T);
+      const filtered = stripOutUndefinedValues<T>(_defaultValue);
 
-      return deserializer ? deserializer(filtered) : (filtered as unknown as I);
+      return runDeserializer && deserializer
+        ? stripOutUndefinedValues(deserializer(filtered))
+        : (filtered as unknown as I);
     },
     [deserializer]
   );
 
   // We create this stable reference to be able to initialize our "defaultValueDeserialized" ref below
   // as we can't initialize useRef by calling a function (e.g. useRef(initDefaultValue()))
-  const defaultValueMemoized = useMemo<I | undefined>(() => {
+  const defaultValueInitialized = useMemo<I | undefined>(() => {
     return initDefaultValue(defaultValue);
   }, [defaultValue, initDefaultValue]);
 
@@ -91,7 +99,7 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
    * Keep a reference to the form defaultValue once it has been deserialized.
    * This allows us to reset the form and put back the initial value of each fields
    */
-  const defaultValueDeserialized = useRef(defaultValueMemoized);
+  const defaultValueDeserialized = useRef(defaultValueInitialized);
 
   /**
    * We have both a state and a ref for the error messages so the consumer can, in the same callback,
@@ -440,6 +448,77 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
     []
   );
 
+  const updateFieldValues: FormHook<T, I>['updateFieldValues'] = useCallback(
+    (updatedFormData, { runDeserializer = true } = {}) => {
+      if (
+        !updatedFormData ||
+        typeof updatedFormData !== 'object' ||
+        Object.keys(updatedFormData).length === 0
+      ) {
+        return;
+      }
+
+      const updatedFormDataInitialized = initDefaultValue(updatedFormData, runDeserializer);
+
+      const mergedDefaultValue = mergeWith(
+        {},
+        defaultValueDeserialized.current,
+        updatedFormDataInitialized,
+        (_, srcValue) => {
+          if (Array.isArray(srcValue)) {
+            // Arrays are returned as provided, we don't want to merge
+            // previous array values with the new ones.
+            return srcValue;
+          }
+        }
+      );
+
+      defaultValueDeserialized.current = stripOutUndefinedValues<I>(mergedDefaultValue);
+
+      const doUpdateValues = (obj: object, currentObjPath: string[] = []) => {
+        Object.entries(obj).forEach(([key, value]) => {
+          const fullPath = [...currentObjPath, key].join('.');
+          const internalArrayfieldPath = getInternalArrayFieldPath(fullPath);
+
+          // Check if there is an **internal array** (created by <UseArray />) defined at this key.
+          // If there is one, we update that field value and don't go any further as from there it will
+          // be the individual fields (children) declared inside the UseArray that will read the "defaultValue"
+          // object of the form (which we've updated above).
+          if (Array.isArray(value) && fieldsRefs.current[internalArrayfieldPath]) {
+            const field = fieldsRefs.current[internalArrayfieldPath];
+            const fieldValue = value.map((_, index) => createArrayItem(fullPath, index, false));
+            field.setValue(fieldValue);
+            return;
+          }
+
+          if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+            // We make sure that at least _some_ leaf fields are present in the fieldsRefs object
+            // If not, we should not consider this as a multi fields but single field (e.g. a select field whose value is { label: 'Foo', value: 'foo' })
+            const hasSomeLeafField = Object.keys(value).some(
+              (leaf) => fieldsRefs.current[`${fullPath}.${leaf}`] !== undefined
+            );
+
+            if (hasSomeLeafField) {
+              // Recursively update internal objects
+              doUpdateValues(value, [...currentObjPath, key]);
+              return;
+            }
+          }
+
+          const field = fieldsRefs.current[fullPath];
+          if (!field) {
+            return;
+          }
+
+          field.setValue(value);
+        });
+      };
+
+      doUpdateValues(updatedFormDataInitialized!);
+    },
+    [initDefaultValue]
+  );
+
   const submit: FormHook<T, I>['submit'] = useCallback(
     async (e) => {
       if (e) {
@@ -536,6 +615,7 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
       getFieldDefaultValue,
       getFormData,
       getErrors,
+      updateFieldValues,
       reset,
       validateFields,
       __options: formOptions,
@@ -563,6 +643,7 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
     getErrors,
     getFormDefaultValue,
     getFieldDefaultValue,
+    updateFieldValues,
     reset,
     formOptions,
     getFormData$,
@@ -578,16 +659,6 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
   // ----------------------------------
   // -- EFFECTS
   // ----------------------------------
-
-  useEffect(() => {
-    if (!isMounted.current) {
-      return;
-    }
-
-    // Whenever the "defaultValue" prop changes, reinitialize our ref
-    defaultValueDeserialized.current = defaultValueMemoized;
-  }, [defaultValueMemoized]);
-
   useEffect(() => {
     isMounted.current = true;
 
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts
index b65dc0570acba..2bdf942c38d3a 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts
@@ -10,4 +10,4 @@ export type { Subscription } from './subject';
 
 export { Subject } from './subject';
 
-export { flattenObject, unflattenObject, mapFormFields } from './utils';
+export { flattenObject, unflattenObject, mapFormFields, stripOutUndefinedValues } from './utils';
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts
index f7d7429889eb2..df17700fc8c44 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { flattenObject } from './utils';
+import { flattenObject, stripOutUndefinedValues } from './utils';
 
 describe('Form lib utils', () => {
   describe('flattenObject', () => {
@@ -40,4 +40,28 @@ describe('Form lib utils', () => {
       });
     });
   });
+
+  describe('stripOutUndefinedValues', () => {
+    test('should remove all undefined values', () => {
+      const obj = {
+        foo: undefined,
+        bar: {
+          a: true,
+          b: undefined,
+          c: ['foo', undefined, 'bar'],
+          d: {
+            d: undefined,
+          },
+        },
+      };
+
+      expect(stripOutUndefinedValues(obj)).toEqual({
+        bar: {
+          a: true,
+          c: ['foo', undefined, 'bar'],
+          d: {},
+        },
+      });
+    });
+  });
 });
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts
index 8df6506ec2e7b..54f6726abb115 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts
@@ -56,6 +56,24 @@ export const flattenObject = (
     return acc;
   }, {});
 
+/**
+ * Deeply remove all "undefined" value inside an Object
+ *
+ * @param obj The object to process
+ * @returns The object without any "undefined"
+ */
+export const stripOutUndefinedValues = <R>(obj: GenericObject): R => {
+  return Object.entries(obj)
+    .filter(({ 1: value }) => value !== undefined)
+    .reduce((acc, [key, value]) => {
+      if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+        return { ...acc, [key]: stripOutUndefinedValues(value) };
+      }
+
+      return { ...acc, [key]: value };
+    }, {} as R);
+};
+
 /**
  * Helper to map the object of fields to any of its value
  *
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
index 80af60619a4e8..22b9fdc6229a7 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
@@ -42,6 +42,30 @@ export interface FormHook<T extends FormData = FormData, I extends FormData = T>
   getFormData: () => T;
   /* Returns an array with of all errors in the form. */
   getErrors: () => string[];
+  /**
+   * Update multiple field values at once. You don't need to provide all the form
+   * fields, **partial** update is supported. This method is mainly useful to update an array
+   * of object fields.
+   *
+   * @example
+   * ```js
+   * // Update an array of fields
+   * form.updateFieldValues({ myArray: [{ foo: 'bar', baz: true }, { foo2: 'bar2', baz: false }] })
+   *
+   * // or simply multiple fields at once
+   * form.updateFieldValues({ foo: 'bar', baz: false })
+   * ```
+   */
+  updateFieldValues: (
+    updatedFormData: Partial<T> & FormData,
+    options?: {
+      /**
+       * Flag to indicate if the deserializer(s) are run against the provided form data.
+       * @default true
+       */
+      runDeserializer?: boolean;
+    }
+  ) => void;
   /**
    * Reset the form states to their initial value and optionally
    * all the fields to their initial values.
diff --git a/src/plugins/event_annotation/common/event_annotation_group/index.ts b/src/plugins/event_annotation/common/event_annotation_group/index.ts
index 85f1d9dff900c..f6a1f38459c13 100644
--- a/src/plugins/event_annotation/common/event_annotation_group/index.ts
+++ b/src/plugins/event_annotation/common/event_annotation_group/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import type { EventAnnotationOutput } from '../manual_event_annotation/types';
 
diff --git a/src/plugins/event_annotation/common/manual_event_annotation/index.ts b/src/plugins/event_annotation/common/manual_event_annotation/index.ts
index 108df93b34180..167adcb3ed739 100644
--- a/src/plugins/event_annotation/common/manual_event_annotation/index.ts
+++ b/src/plugins/event_annotation/common/manual_event_annotation/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import type { EventAnnotationArgs, EventAnnotationOutput } from './types';
 export const manualEventAnnotation: ExpressionFunctionDefinition<
diff --git a/src/plugins/event_annotation/public/event_annotation_service/types.ts b/src/plugins/event_annotation/public/event_annotation_service/types.ts
index bb0b6eb4cc200..c44b2d1e536d5 100644
--- a/src/plugins/event_annotation/public/event_annotation_service/types.ts
+++ b/src/plugins/event_annotation/public/event_annotation_service/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionAstExpression } from '../../../expressions/common/ast';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin/common/ast';
 import { EventAnnotationArgs } from '../../common';
 
 export interface EventAnnotationServiceType {
diff --git a/src/plugins/event_annotation/public/plugin.ts b/src/plugins/event_annotation/public/plugin.ts
index 83cdc0546a7f5..f3f4fcfcc60f6 100644
--- a/src/plugins/event_annotation/public/plugin.ts
+++ b/src/plugins/event_annotation/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
-import { ExpressionsSetup } from '../../expressions/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { manualEventAnnotation, eventAnnotationGroup } from '../common';
 import { EventAnnotationService } from './event_annotation_service';
 
diff --git a/src/plugins/event_annotation/server/plugin.ts b/src/plugins/event_annotation/server/plugin.ts
index ef4e0216fb5ac..0643611af9bb3 100644
--- a/src/plugins/event_annotation/server/plugin.ts
+++ b/src/plugins/event_annotation/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { manualEventAnnotation, eventAnnotationGroup } from '../common';
-import { ExpressionsServerSetup } from '../../expressions/server';
 
 interface SetupDependencies {
   expressions: ExpressionsServerSetup;
diff --git a/src/plugins/expression_error/public/components/debug_component.tsx b/src/plugins/expression_error/public/components/debug_component.tsx
index 6cb927380d669..a9c1729d646e1 100644
--- a/src/plugins/expression_error/public/components/debug_component.tsx
+++ b/src/plugins/expression_error/public/components/debug_component.tsx
@@ -8,8 +8,8 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '../../../expressions';
-import { withSuspense } from '../../../presentation_util/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions } from '../../common/types';
 import { LazyDebugComponent } from '.';
 
diff --git a/src/plugins/expression_error/public/components/error/error.tsx b/src/plugins/expression_error/public/components/error/error.tsx
index 2b42aa0f7eccd..4fe51aede4a64 100644
--- a/src/plugins/expression_error/public/components/error/error.tsx
+++ b/src/plugins/expression_error/public/components/error/error.tsx
@@ -9,8 +9,8 @@
 import React, { FC } from 'react';
 import { EuiButtonIcon, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { ShowDebugging } from './show_debugging';
-import { Markdown } from '../../../../kibana_react/public';
 
 export interface Props {
   payload: {
diff --git a/src/plugins/expression_error/public/components/error_component.tsx b/src/plugins/expression_error/public/components/error_component.tsx
index 2a019c9ce6945..fd84e298e93d3 100644
--- a/src/plugins/expression_error/public/components/error_component.tsx
+++ b/src/plugins/expression_error/public/components/error_component.tsx
@@ -8,8 +8,8 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { EuiIcon, useResizeObserver, EuiPopover } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '../../../expressions';
-import { withSuspense } from '../../../presentation_util/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { ErrorRendererConfig } from '../../common/types';
 import { LazyErrorComponent } from '.';
 
diff --git a/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx b/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx
index 378e22f834e1d..6f6a72c85d6c2 100644
--- a/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx
+++ b/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getErrorRenderer } from '../error_renderer';
-import { Render } from '../../../../presentation_util/public/__stories__';
 
 storiesOf('renderers/error', module).add('default', () => {
   const thrownError = new Error('There was an error');
diff --git a/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx b/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx
index d4c74a9c646e7..acf3c73226604 100644
--- a/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx
+++ b/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx
@@ -9,12 +9,12 @@
 import { render, unmountComponentAtNode } from 'react-dom';
 import React from 'react';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { ExpressionRenderDefinition } from 'src/plugins/expressions/common';
+import { CoreTheme } from '@kbn/core/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../../../src/plugins/presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { LazyDebugRenderComponent } from '../components';
 import { JSON } from '../../common';
 
diff --git a/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx b/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx
index 65847a18d4e0a..4b96881f081b5 100644
--- a/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx
+++ b/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx
@@ -9,13 +9,13 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { ErrorRendererConfig } from '../../common/types';
 import { LazyErrorRenderComponent } from '../components';
 
diff --git a/src/plugins/expression_error/public/plugin.ts b/src/plugins/expression_error/public/plugin.ts
index de3793b6a30ae..654ef2dfaedd2 100755
--- a/src/plugins/expression_error/public/plugin.ts
+++ b/src/plugins/expression_error/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { debugRendererFactory, errorRendererFactory } from './expression_renderers';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_image/__fixtures__/function_specs.ts b/src/plugins/expression_image/__fixtures__/function_specs.ts
index 2117a8fc4b726..1fe2563f3c274 100644
--- a/src/plugins/expression_image/__fixtures__/function_specs.ts
+++ b/src/plugins/expression_image/__fixtures__/function_specs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { imageFunction } from '../common/expression_functions';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
 
 export const functionSpecs = [imageFunction].map((fn) => new ExpressionFunction(fn()));
diff --git a/src/plugins/expression_image/common/expression_functions/image_function.test.ts b/src/plugins/expression_image/common/expression_functions/image_function.test.ts
index 7deaeb90b411b..389fe7ec4ac19 100644
--- a/src/plugins/expression_image/common/expression_functions/image_function.test.ts
+++ b/src/plugins/expression_image/common/expression_functions/image_function.test.ts
@@ -7,12 +7,12 @@
  */
 
 import expect from '@kbn/expect';
-import { ExecutionContext } from 'src/plugins/expressions';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 import {
   functionWrapper,
   getElasticLogo,
   getElasticOutline,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { imageFunction as image } from './image_function';
 
 describe('image', () => {
diff --git a/src/plugins/expression_image/common/expression_functions/image_function.ts b/src/plugins/expression_image/common/expression_functions/image_function.ts
index 8394681e1b10b..c4bf2a2ec9b84 100644
--- a/src/plugins/expression_image/common/expression_functions/image_function.ts
+++ b/src/plugins/expression_image/common/expression_functions/image_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { getElasticLogo, resolveWithMissingImage } from '../../../presentation_util/common/lib';
+import { getElasticLogo, resolveWithMissingImage } from '@kbn/presentation-util-plugin/common/lib';
 import { BASE64, URL } from '../constants';
 import { ExpressionImageFunction, ImageMode } from '../types';
 
diff --git a/src/plugins/expression_image/common/types/expression_functions.ts b/src/plugins/expression_image/common/types/expression_functions.ts
index 5ee9ed93cc87b..2b4b3a605df23 100644
--- a/src/plugins/expression_image/common/types/expression_functions.ts
+++ b/src/plugins/expression_image/common/types/expression_functions.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition } from '../../../expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export enum ImageMode {
   CONTAIN = 'contain',
diff --git a/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx b/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx
index dc54194d5d83f..16efe9ee4a817 100644
--- a/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx
+++ b/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Render, waitFor } from '../../../../presentation_util/public/__stories__';
+import { Render, waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
 import { getImageRenderer } from '../image_renderer';
-import { getElasticLogo } from '../../../../../../src/plugins/presentation_util/common/lib';
 import { ImageMode } from '../../../common';
 
 const Renderer = ({ elasticLogo }: { elasticLogo: string }) => {
diff --git a/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx b/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx
index 161fcef8be0fc..2ee79c6dae1a0 100644
--- a/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx
+++ b/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx
@@ -7,13 +7,13 @@
  */
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { getElasticLogo, defaultTheme$, isValidUrl } from '../../../presentation_util/public';
+import { CoreTheme } from '@kbn/core/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { getElasticLogo, defaultTheme$, isValidUrl } from '@kbn/presentation-util-plugin/public';
 import { ImageRendererConfig } from '../../common/types';
 
 const strings = {
diff --git a/src/plugins/expression_image/public/plugin.ts b/src/plugins/expression_image/public/plugin.ts
index ba7e2baded8d8..c6bc06209236e 100755
--- a/src/plugins/expression_image/public/plugin.ts
+++ b/src/plugins/expression_image/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { imageRendererFactory } from './expression_renderers';
 import { imageFunction } from '../common/expression_functions';
 
diff --git a/src/plugins/expression_image/server/plugin.ts b/src/plugins/expression_image/server/plugin.ts
index b342bb96647ce..f474c3e05948d 100755
--- a/src/plugins/expression_image/server/plugin.ts
+++ b/src/plugins/expression_image/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { imageFunction } from '../common/expression_functions';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_metric/__fixtures__/function_specs.ts b/src/plugins/expression_metric/__fixtures__/function_specs.ts
index 3d36840b47e0d..10a0c2ae31b3c 100644
--- a/src/plugins/expression_metric/__fixtures__/function_specs.ts
+++ b/src/plugins/expression_metric/__fixtures__/function_specs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { metricFunction } from '../common/expression_functions';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
 
 export const functionSpecs = [metricFunction].map((fn) => new ExpressionFunction(fn()));
diff --git a/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts b/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts
index 88249728526d0..825bcbe54b46a 100644
--- a/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts
+++ b/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions';
-import { functionWrapper, fontStyle } from '../../../presentation_util/common/lib';
+import { ExecutionContext } from '@kbn/expressions-plugin';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { metricFunction } from './metric_function';
 
 describe('metric', () => {
diff --git a/src/plugins/expression_metric/common/expression_functions/metric_function.ts b/src/plugins/expression_metric/common/expression_functions/metric_function.ts
index 184ef37834e01..53184d0359b73 100644
--- a/src/plugins/expression_metric/common/expression_functions/metric_function.ts
+++ b/src/plugins/expression_metric/common/expression_functions/metric_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { openSans } from '../../../expressions/common/fonts';
+import { openSans } from '@kbn/expressions-plugin/common/fonts';
 import { FONT_FAMILY, FONT_WEIGHT, CSS, NUMERALJS } from '../constants';
 import { ExpressionMetricFunction } from '../types';
 
diff --git a/src/plugins/expression_metric/common/types/expression_functions.ts b/src/plugins/expression_metric/common/types/expression_functions.ts
index 69573eec26b8f..c2fa2e7a718ce 100644
--- a/src/plugins/expression_metric/common/types/expression_functions.ts
+++ b/src/plugins/expression_metric/common/types/expression_functions.ts
@@ -5,7 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender, Style } from '../../../expressions';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionValueRender,
+  Style,
+} from '@kbn/expressions-plugin';
 
 export type Input = number | string | null;
 
diff --git a/src/plugins/expression_metric/common/types/expression_renderers.ts b/src/plugins/expression_metric/common/types/expression_renderers.ts
index 0f8635edd7f95..656a973448752 100644
--- a/src/plugins/expression_metric/common/types/expression_renderers.ts
+++ b/src/plugins/expression_metric/common/types/expression_renderers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Style } from '../../../expressions/common';
+import { Style } from '@kbn/expressions-plugin/common';
 
 export interface MetricRendererConfig {
   /** The text to display under the metric */
diff --git a/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx b/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx
index 5835730e35f9b..eefb6656e7d42 100644
--- a/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx
+++ b/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx
@@ -8,9 +8,9 @@
 
 import React, { CSSProperties } from 'react';
 import { storiesOf } from '@storybook/react';
-import { Style } from 'src/plugins/expressions';
+import { Style } from '@kbn/expressions-plugin';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getMetricRenderer } from '../metric_renderer';
-import { Render } from '../../../../presentation_util/public/__stories__';
 import { MetricRendererConfig } from '../../../common';
 
 const labelFontSpec: CSSProperties = {
diff --git a/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx b/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx
index 6a11910d4f26f..f5a5452c1388f 100644
--- a/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx
+++ b/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx
@@ -7,13 +7,13 @@
  */
 import React, { CSSProperties, lazy } from 'react';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { MetricRendererConfig } from '../../common/types';
 
 const strings = {
diff --git a/src/plugins/expression_metric/public/plugin.ts b/src/plugins/expression_metric/public/plugin.ts
index 6830fd904751c..25d5f08cc8614 100755
--- a/src/plugins/expression_metric/public/plugin.ts
+++ b/src/plugins/expression_metric/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { metricFunction } from '../common/expression_functions';
 import { metricRendererFactory } from './expression_renderers';
 
diff --git a/src/plugins/expression_metric/server/plugin.ts b/src/plugins/expression_metric/server/plugin.ts
index 29281faf0b790..4f5edabdca3b3 100755
--- a/src/plugins/expression_metric/server/plugin.ts
+++ b/src/plugins/expression_metric/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { metricFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts
index 4c7e4771a8e0a..b01f67f41b608 100644
--- a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts
+++ b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 import {
   getElasticLogo,
   getElasticOutline,
   functionWrapper,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { repeatImageFunction } from './repeat_image_function';
 
 describe('repeatImage', () => {
diff --git a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts
index ebc72ab10af42..c62fced4ddf7e 100644
--- a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts
+++ b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts
@@ -11,7 +11,7 @@ import {
   getElasticOutline,
   isValidUrl,
   resolveWithMissingImage,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { CONTEXT, BASE64, URL } from '../constants';
 import { ExpressionRepeatImageFunction } from '../types';
 
diff --git a/src/plugins/expression_repeat_image/common/types/expression_functions.ts b/src/plugins/expression_repeat_image/common/types/expression_functions.ts
index 3e278ddcc97c5..2be479bbaff3e 100644
--- a/src/plugins/expression_repeat_image/common/types/expression_functions.ts
+++ b/src/plugins/expression_repeat_image/common/types/expression_functions.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender } from '../../../expressions';
+import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin';
 
 interface Arguments {
   image: string | null;
diff --git a/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx b/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx
index e837932b9469a..297c91d98d0cd 100644
--- a/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx
+++ b/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx
@@ -8,7 +8,7 @@
 
 import React, { ReactElement, useEffect, useState } from 'react';
 import { times } from 'lodash';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { RepeatImageRendererConfig } from '../../common';
 
 interface RepeatImageComponentProps extends RepeatImageRendererConfig {
diff --git a/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx b/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx
index c727ca9562fad..639d89ffd2cb9 100644
--- a/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx
+++ b/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx
@@ -8,13 +8,10 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo, getElasticOutline } from '@kbn/presentation-util-plugin/common/lib';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getRepeatImageRenderer } from '../repeat_image_renderer';
-import {
-  getElasticLogo,
-  getElasticOutline,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
-import { waitFor } from '../../../../../../src/plugins/presentation_util/public/__stories__';
 
 const Renderer = ({
   elasticLogo,
diff --git a/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx b/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx
index 5e5bc04f317d2..ce3d8c7c666d2 100644
--- a/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx
+++ b/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx
@@ -8,18 +8,18 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { CoreTheme } from '@kbn/core/public';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { CoreSetup } from '../../../../core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
 import {
   defaultTheme$,
   getElasticOutline,
   isValidUrl,
   withSuspense,
-} from '../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { RepeatImageRendererConfig } from '../../common/types';
 
 const strings = {
diff --git a/src/plugins/expression_repeat_image/public/plugin.ts b/src/plugins/expression_repeat_image/public/plugin.ts
index 2f275f9218d50..a4f9f98049e3d 100755
--- a/src/plugins/expression_repeat_image/public/plugin.ts
+++ b/src/plugins/expression_repeat_image/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { repeatImageFunction } from '../common/expression_functions';
 import { repeatImageRendererFactory } from './expression_renderers';
 
diff --git a/src/plugins/expression_repeat_image/server/plugin.ts b/src/plugins/expression_repeat_image/server/plugin.ts
index eff5e24ef65fa..8c316e3c17d61 100755
--- a/src/plugins/expression_repeat_image/server/plugin.ts
+++ b/src/plugins/expression_repeat_image/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { repeatImageFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts
index 999fd31980c6e..73c851772d650 100644
--- a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts
+++ b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts
@@ -10,10 +10,10 @@ import {
   functionWrapper,
   getElasticOutline,
   getElasticLogo,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { revealImageFunction, errors } from './reveal_image_function';
 import { Origin } from '../types';
-import { ExecutionContext } from 'src/plugins/expressions';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 
 describe('revealImageFunction', () => {
   const fn = functionWrapper(revealImageFunction);
diff --git a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts
index 7056bb10518e8..5f03df6308391 100644
--- a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts
+++ b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts
@@ -11,9 +11,9 @@ import {
   resolveWithMissingImage,
   getElasticOutline,
   isValidUrl,
-} from '../../../presentation_util/common/lib';
-import { ExpressionRevealImageFunction, Origin, Position } from '../../common/types';
-import { BASE64, URL } from '../../common/constants';
+} from '@kbn/presentation-util-plugin/common/lib';
+import { ExpressionRevealImageFunction, Origin, Position } from '../types';
+import { BASE64, URL } from '../constants';
 
 const strings = {
   help: i18n.translate('expressionRevealImage.functions.revealImageHelpText', {
diff --git a/src/plugins/expression_reveal_image/common/types/expression_functions.ts b/src/plugins/expression_reveal_image/common/types/expression_functions.ts
index 2d836bf8ad997..e8dca801aa69a 100644
--- a/src/plugins/expression_reveal_image/common/types/expression_functions.ts
+++ b/src/plugins/expression_reveal_image/common/types/expression_functions.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin';
 
 export enum Origin {
   TOP = 'top',
diff --git a/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx b/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx
index 1f09ff06b4b2a..3b89454c7213c 100644
--- a/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx
+++ b/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx
@@ -8,10 +8,10 @@
 
 import React, { useRef, useState, useEffect, useCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { css, CSSObject } from '@emotion/react';
+import { isValidUrl } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions, RevealImageRendererConfig, OriginString } from '../../common/types';
-import { isValidUrl } from '../../../presentation_util/public';
 
 const revealImageParentStyle = css`
   height: 100%;
diff --git a/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx b/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx
index 22dd2ef4156df..06bb5ba3d4d32 100644
--- a/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx
+++ b/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getRevealImageRenderer } from '../';
-import { getElasticOutline, getElasticLogo } from '../../../../presentation_util/public';
-import { Render, waitFor } from '../../../../presentation_util/public/__stories__';
+import { getElasticOutline, getElasticLogo } from '@kbn/presentation-util-plugin/public';
+import { Render, waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getRevealImageRenderer } from '..';
 import { Origin } from '../../../common/types/expression_functions';
 
 const Renderer = ({
diff --git a/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx b/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx
index 6bdd014296419..77502502b9736 100644
--- a/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx
+++ b/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx
@@ -8,13 +8,13 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { RevealImageRendererConfig } from '../../common/types';
 
 export const strings = {
diff --git a/src/plugins/expression_reveal_image/public/plugin.ts b/src/plugins/expression_reveal_image/public/plugin.ts
index 17bff3f33e8ac..89a074f7095d5 100755
--- a/src/plugins/expression_reveal_image/public/plugin.ts
+++ b/src/plugins/expression_reveal_image/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { revealImageRendererFactory } from './expression_renderers';
 import { revealImageFunction } from '../common/expression_functions';
 
diff --git a/src/plugins/expression_reveal_image/server/plugin.ts b/src/plugins/expression_reveal_image/server/plugin.ts
index c85ff9c620814..58ebe7b42609e 100644
--- a/src/plugins/expression_reveal_image/server/plugin.ts
+++ b/src/plugins/expression_reveal_image/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { revealImageFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_shape/__fixtures__/function_specs.ts b/src/plugins/expression_shape/__fixtures__/function_specs.ts
index c75cb5c61caa1..8d18bb9f2afd6 100644
--- a/src/plugins/expression_shape/__fixtures__/function_specs.ts
+++ b/src/plugins/expression_shape/__fixtures__/function_specs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { shapeFunction } from '../common/expression_functions';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
 
 export const functionSpecs = [shapeFunction].map((fn) => new ExpressionFunction(fn()));
diff --git a/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts b/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts
index 489808fb52b13..e30c093760c38 100644
--- a/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts
+++ b/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '../../../expressions';
-import { functionWrapper, fontStyle } from '../../../presentation_util/common/lib';
+import { ExecutionContext } from '@kbn/expressions-plugin';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { progressFunction, errors } from './progress_function';
 
 describe('progress', () => {
diff --git a/src/plugins/expression_shape/common/expression_functions/progress_function.ts b/src/plugins/expression_shape/common/expression_functions/progress_function.ts
index 56ee8878e531c..49b2f12952fdb 100644
--- a/src/plugins/expression_shape/common/expression_functions/progress_function.ts
+++ b/src/plugins/expression_shape/common/expression_functions/progress_function.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { Style, openSans } from '../../../expressions/common';
+import { Style, openSans } from '@kbn/expressions-plugin/common';
 import { CSS, FONT_FAMILY, FONT_WEIGHT, BOOLEAN_TRUE, BOOLEAN_FALSE } from '../constants';
 import { ExpressionProgressFunction, Progress } from '../types';
 
diff --git a/src/plugins/expression_shape/common/types/expression_functions.ts b/src/plugins/expression_shape/common/types/expression_functions.ts
index 2486be13f51bf..88f17298fcf47 100644
--- a/src/plugins/expression_shape/common/types/expression_functions.ts
+++ b/src/plugins/expression_shape/common/types/expression_functions.ts
@@ -6,7 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunctionDefinition, ExpressionValueRender, Style } from '../../../expressions';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionValueRender,
+  Style,
+} from '@kbn/expressions-plugin';
 
 export enum Shape {
   ARROW = 'arrow',
diff --git a/src/plugins/expression_shape/public/components/progress/progress_component.tsx b/src/plugins/expression_shape/public/components/progress/progress_component.tsx
index e9c71753e8ff6..d7cd700ed82da 100644
--- a/src/plugins/expression_shape/public/components/progress/progress_component.tsx
+++ b/src/plugins/expression_shape/public/components/progress/progress_component.tsx
@@ -8,11 +8,11 @@
 
 import React, { CSSProperties, RefCallback, useCallback, useEffect, useRef, useState } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '../../../../expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions, ProgressRendererConfig } from '../../../common/types';
 import { ShapeRef, SvgConfig, SvgTextAttributes } from '../reusable/types';
 import { getShapeContentElement } from '../reusable/shape_factory';
-import { withSuspense } from '../../../../presentation_util/public';
 import { getTextAttributes, getViewBox } from './utils';
 import { getId } from '../../../common/lib';
 import { getDefaultShapeData } from '../reusable';
diff --git a/src/plugins/expression_shape/public/components/shape/shape_component.tsx b/src/plugins/expression_shape/public/components/shape/shape_component.tsx
index 9e7aba33f5834..ef3259e9b8300 100644
--- a/src/plugins/expression_shape/public/components/shape/shape_component.tsx
+++ b/src/plugins/expression_shape/public/components/shape/shape_component.tsx
@@ -8,7 +8,7 @@
 
 import React, { useState, useEffect, useCallback, RefCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { withSuspense } from '../../../../presentation_util/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import {
   ShapeRef,
   ShapeAttributes,
diff --git a/src/plugins/expression_shape/public/components/shape/types.ts b/src/plugins/expression_shape/public/components/shape/types.ts
index 279bf29575214..33531b3eb8571 100644
--- a/src/plugins/expression_shape/public/components/shape/types.ts
+++ b/src/plugins/expression_shape/public/components/shape/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IInterpreterRenderHandlers } from '../../../../../../src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { ShapeRendererConfig } from '../../../common/types';
 
 export interface ShapeComponentProps extends ShapeRendererConfig {
diff --git a/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx b/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx
index 862718f775c5e..a0d617fa48056 100644
--- a/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getProgressRenderer } from '../progress_renderer';
 import { Progress } from '../../../common';
 
diff --git a/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx b/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx
index d7098e8378c60..8bd77ec638cc2 100644
--- a/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getShapeRenderer } from '../';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getShapeRenderer } from '..';
 import { Shape } from '../../../common/types';
 
 storiesOf('renderers/shape', module).add('default', () => {
diff --git a/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx b/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx
index b618d24d26fb0..1ce90f02c9cab 100644
--- a/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx
@@ -8,15 +8,15 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { CoreTheme } from '@kbn/core/public';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { CoreSetup } from '../../../../core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { ProgressRendererConfig } from '../../common/types';
 import { LazyProgressComponent } from '../components/progress';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
 
 const ProgressComponent = withSuspense(LazyProgressComponent);
 
diff --git a/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx b/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx
index fb2a32884d03b..7cfe2bcf326ed 100644
--- a/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx
@@ -8,13 +8,13 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { ShapeRendererConfig } from '../../common/types';
 import { LazyShapeComponent } from '../components/shape';
 
diff --git a/src/plugins/expression_shape/public/plugin.ts b/src/plugins/expression_shape/public/plugin.ts
index 5728b92e97f94..cafc49a404da3 100755
--- a/src/plugins/expression_shape/public/plugin.ts
+++ b/src/plugins/expression_shape/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { shapeRendererFactory, progressRendererFactory } from './expression_renderers';
 import { shapeFunction, progressFunction } from '../common/expression_functions';
 
diff --git a/src/plugins/expression_shape/server/plugin.ts b/src/plugins/expression_shape/server/plugin.ts
index a98d0fe3f17fe..41538ba489656 100644
--- a/src/plugins/expression_shape/server/plugin.ts
+++ b/src/plugins/expression_shape/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { shapeFunction, progressFunction } from '../common/expression_functions';
 
 interface SetupDeps {
diff --git a/src/plugins/expressions/common/execution/container.ts b/src/plugins/expressions/common/execution/container.ts
index 955d0346f3bb7..f55d69e3afbcd 100644
--- a/src/plugins/expressions/common/execution/container.ts
+++ b/src/plugins/expressions/common/execution/container.ts
@@ -9,7 +9,7 @@
 import {
   StateContainer,
   createStateContainer,
-} from '../../../kibana_utils/common/state_containers';
+} from '@kbn/kibana-utils-plugin/common/state_containers';
 import { ExecutorState, defaultState as executorDefaultState } from '../executor';
 import { ExpressionAstExpression } from '../ast';
 import { ExpressionValue } from '../expression_types';
diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts
index b065d39a16e2e..78d88adfa3dbd 100644
--- a/src/plugins/expressions/common/execution/execution.test.ts
+++ b/src/plugins/expressions/common/execution/execution.test.ts
@@ -12,7 +12,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { Execution } from './execution';
 import { parseExpression, ExpressionAstExpression } from '../ast';
 import { createUnitTestExecutor } from '../test_helpers';
-import { ExpressionFunctionDefinition } from '../../common';
+import { ExpressionFunctionDefinition } from '..';
 import { ExecutionContract } from './execution_contract';
 
 beforeAll(() => {
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index 4c7549061914c..17b6338a48f89 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -21,11 +21,11 @@ import {
   ReplaySubject,
 } from 'rxjs';
 import { catchError, finalize, map, pluck, shareReplay, switchMap, tap } from 'rxjs/operators';
+import { now, AbortError } from '@kbn/kibana-utils-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { Executor } from '../executor';
 import { createExecutionContainer, ExecutionContainer } from './container';
 import { createError } from '../util';
-import { now, AbortError } from '../../../kibana_utils/common';
-import { Adapters } from '../../../inspector/common';
 import { isExpressionValueError, ExpressionValueError } from '../expression_types/specs/error';
 import {
   ExpressionAstArgument,
diff --git a/src/plugins/expressions/common/execution/execution_contract.ts b/src/plugins/expressions/common/execution/execution_contract.ts
index 5167868582332..34e11ad4c4948 100644
--- a/src/plugins/expressions/common/execution/execution_contract.ts
+++ b/src/plugins/expressions/common/execution/execution_contract.ts
@@ -8,10 +8,10 @@
 
 import { of, Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { Execution, ExecutionResult } from './execution';
 import { ExpressionValueError } from '../expression_types/specs';
 import { ExpressionAstExpression } from '../ast';
-import { Adapters } from '../../../inspector/common/adapters';
 
 /**
  * `ExecutionContract` is a wrapper around `Execution` class. It provides the
diff --git a/src/plugins/expressions/common/execution/types.ts b/src/plugins/expressions/common/execution/types.ts
index e1e65ada632a9..44d6fef6f79a6 100644
--- a/src/plugins/expressions/common/execution/types.ts
+++ b/src/plugins/expressions/common/execution/types.ts
@@ -8,11 +8,11 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'src/core/server';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 
+import { Adapters, RequestAdapter } from '@kbn/inspector-plugin/common';
 import { Datatable, ExpressionType } from '../expression_types';
-import { Adapters, RequestAdapter } from '../../../inspector/common';
 import { TablesAdapter } from '../util/tables_adapter';
 import { ExpressionsInspectorAdapter } from '../util';
 
diff --git a/src/plugins/expressions/common/executor/container.ts b/src/plugins/expressions/common/executor/container.ts
index 91d4247a97cce..3ea5ff1f68920 100644
--- a/src/plugins/expressions/common/executor/container.ts
+++ b/src/plugins/expressions/common/executor/container.ts
@@ -9,7 +9,7 @@
 import {
   StateContainer,
   createStateContainer,
-} from '../../../kibana_utils/common/state_containers';
+} from '@kbn/kibana-utils-plugin/common/state_containers';
 import { ExpressionFunction } from '../expression_functions';
 import { ExpressionType } from '../expression_types';
 
diff --git a/src/plugins/expressions/common/executor/executor.test.ts b/src/plugins/expressions/common/executor/executor.test.ts
index be985c2720f8b..35f0b9c13aa1a 100644
--- a/src/plugins/expressions/common/executor/executor.test.ts
+++ b/src/plugins/expressions/common/executor/executor.test.ts
@@ -11,8 +11,8 @@ import * as expressionTypes from '../expression_types';
 import * as expressionFunctions from '../expression_functions';
 import { Execution } from '../execution';
 import { ExpressionAstFunction, parseExpression, formatExpression } from '../ast';
-import { MigrateFunction } from '../../../kibana_utils/common/persistable_state';
-import { SavedObjectReference } from 'src/core/types';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common/persistable_state';
+import { SavedObjectReference } from '@kbn/core/types';
 
 describe('Executor', () => {
   test('can instantiate', () => {
diff --git a/src/plugins/expressions/common/executor/executor.ts b/src/plugins/expressions/common/executor/executor.ts
index e9398f1d17c58..0a5e8d388fe00 100644
--- a/src/plugins/expressions/common/executor/executor.ts
+++ b/src/plugins/expressions/common/executor/executor.ts
@@ -11,6 +11,13 @@
 import { cloneDeep, mapValues } from 'lodash';
 import { Observable } from 'rxjs';
 import type { SerializableRecord } from '@kbn/utility-types';
+import { SavedObjectReference } from '@kbn/core/types';
+import {
+  MigrateFunctionsObject,
+  migrateToLatest,
+  PersistableStateService,
+  VersionedState,
+} from '@kbn/kibana-utils-plugin/common';
 import { ExecutorState, ExecutorContainer } from './container';
 import { createExecutorContainer } from './container';
 import { AnyExpressionFunctionDefinition, ExpressionFunction } from '../expression_functions';
@@ -21,13 +28,6 @@ import { AnyExpressionTypeDefinition } from '../expression_types/types';
 import { ExpressionAstExpression, ExpressionAstFunction } from '../ast';
 import { ExpressionValueError, typeSpecs } from '../expression_types/specs';
 import { ALL_NAMESPACES, getByAlias } from '../util';
-import { SavedObjectReference } from '../../../../core/types';
-import {
-  MigrateFunctionsObject,
-  migrateToLatest,
-  PersistableStateService,
-  VersionedState,
-} from '../../../kibana_utils/common';
 import { ExpressionExecutionParams } from '../service';
 
 export interface ExpressionExecOptions {
diff --git a/src/plugins/expressions/common/expression_functions/expression_function.ts b/src/plugins/expressions/common/expression_functions/expression_function.ts
index 951a5aab37961..287b126cafbd8 100644
--- a/src/plugins/expressions/common/expression_functions/expression_function.ts
+++ b/src/plugins/expressions/common/expression_functions/expression_function.ts
@@ -7,16 +7,16 @@
  */
 
 import { identity } from 'lodash';
-import { AnyExpressionFunctionDefinition } from './types';
-import { ExpressionFunctionParameter } from './expression_function_parameter';
-import { ExpressionValue } from '../expression_types/types';
-import { ExpressionAstFunction } from '../ast';
-import { SavedObjectReference } from '../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import {
   MigrateFunctionsObject,
   GetMigrationFunctionObjectFn,
   PersistableState,
-} from '../../../kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
+import { AnyExpressionFunctionDefinition } from './types';
+import { ExpressionFunctionParameter } from './expression_function_parameter';
+import { ExpressionValue } from '../expression_types/types';
+import { ExpressionAstFunction } from '../ast';
 
 export class ExpressionFunction implements PersistableState<ExpressionAstFunction['arguments']> {
   /**
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts
index 053f97ffc8fb0..62aacc3903be9 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-jest.mock('../../../../common');
+jest.mock('../../..');
 
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { getUiSettingFn } from '../ui_setting';
 import { functionWrapper } from './utils';
 
diff --git a/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts b/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts
index 8e352e12d49c5..c1a3c572031dc 100644
--- a/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts
@@ -7,9 +7,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '../..';
 import { UiSetting } from '../../expression_types/specs/ui_setting';
 
 interface UiSettingsClient {
diff --git a/src/plugins/expressions/common/expression_functions/types.ts b/src/plugins/expressions/common/expression_functions/types.ts
index 62107d17ab67a..14f7c14a6759d 100644
--- a/src/plugins/expressions/common/expression_functions/types.ts
+++ b/src/plugins/expressions/common/expression_functions/types.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import { ArgumentType } from './arguments';
 import { TypeToString, TypeString, UnmappedTypeStrings } from '../types/common';
 import { ExecutionContext } from '../execution/types';
@@ -21,7 +22,6 @@ import {
   ExpressionFunctionOverallMetric,
 } from './specs';
 import { ExpressionAstFunction } from '../ast';
-import { PersistableStateDefinition } from '../../../kibana_utils/common';
 
 /**
  * `ExpressionFunctionDefinition` is the interface plugins have to implement to
diff --git a/src/plugins/expressions/common/expression_types/specs/datatable.ts b/src/plugins/expressions/common/expression_types/specs/datatable.ts
index 2a4820508210d..0e1e76acddca4 100644
--- a/src/plugins/expressions/common/expression_types/specs/datatable.ts
+++ b/src/plugins/expressions/common/expression_types/specs/datatable.ts
@@ -8,7 +8,7 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import { map, pick, zipObject } from 'lodash';
-import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { ExpressionTypeDefinition, ExpressionValueBoxed } from '../types';
 import { PointSeries, PointSeriesColumn } from './pointseries';
diff --git a/src/plugins/expressions/common/service/expressions_services.ts b/src/plugins/expressions/common/service/expressions_services.ts
index f15bb49e4ecf9..d873a1957cd1f 100644
--- a/src/plugins/expressions/common/service/expressions_services.ts
+++ b/src/plugins/expressions/common/service/expressions_services.ts
@@ -9,22 +9,22 @@
 import { Observable } from 'rxjs';
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'src/core/server';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 
+import { SavedObjectReference } from '@kbn/core/types';
+import {
+  MigrateFunctionsObject,
+  PersistableStateService,
+  VersionedState,
+} from '@kbn/kibana-utils-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { Executor } from '../executor';
 import { AnyExpressionRenderDefinition, ExpressionRendererRegistry } from '../expression_renderers';
 import { ExpressionAstExpression } from '../ast';
 import { ExecutionContract, ExecutionResult } from '../execution';
 import { AnyExpressionTypeDefinition, ExpressionValueError } from '../expression_types';
 import { AnyExpressionFunctionDefinition } from '../expression_functions';
-import { SavedObjectReference } from '../../../../core/types';
-import {
-  MigrateFunctionsObject,
-  PersistableStateService,
-  VersionedState,
-} from '../../../kibana_utils/common';
-import { Adapters } from '../../../inspector/common/adapters';
 import {
   clog,
   createTable,
diff --git a/src/plugins/expressions/common/util/create_default_inspector_adapters.ts b/src/plugins/expressions/common/util/create_default_inspector_adapters.ts
index 693a9d6e8cf70..505360483c21f 100644
--- a/src/plugins/expressions/common/util/create_default_inspector_adapters.ts
+++ b/src/plugins/expressions/common/util/create_default_inspector_adapters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RequestAdapter } from '../../../inspector/common';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { TablesAdapter } from './tables_adapter';
 import { ExpressionsInspectorAdapter } from './expressions_inspector_adapter';
 
diff --git a/src/plugins/expressions/common/util/create_error.ts b/src/plugins/expressions/common/util/create_error.ts
index aa4e44730add6..4d787a391df37 100644
--- a/src/plugins/expressions/common/util/create_error.ts
+++ b/src/plugins/expressions/common/util/create_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionValueError } from '../../common';
+import { ExpressionValueError } from '..';
 
 export type SerializedError = {
   name: string;
diff --git a/src/plugins/expressions/public/expression_functions/ui_setting.ts b/src/plugins/expressions/public/expression_functions/ui_setting.ts
index dd5be4ad736b2..6b16952279c69 100644
--- a/src/plugins/expressions/public/expression_functions/ui_setting.ts
+++ b/src/plugins/expressions/public/expression_functions/ui_setting.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { getUiSettingFn as getCommonUiSettingFn } from '../../common';
 
 export function getUiSettingFn({ getStartServices }: Pick<CoreSetup, 'getStartServices'>) {
diff --git a/src/plugins/expressions/public/index.ts b/src/plugins/expressions/public/index.ts
index a0ef158dfb621..054f80ca8a78e 100644
--- a/src/plugins/expressions/public/index.ts
+++ b/src/plugins/expressions/public/index.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ExpressionsPublicPlugin } from './plugin';
 
 // Kibana Platform.
diff --git a/src/plugins/expressions/public/loader.ts b/src/plugins/expressions/public/loader.ts
index f0571d82f427e..6482da0af21ee 100644
--- a/src/plugins/expressions/public/loader.ts
+++ b/src/plugins/expressions/public/loader.ts
@@ -10,7 +10,7 @@ import { BehaviorSubject, Observable, Subject, Subscription, asyncScheduler, ide
 import { filter, map, delay, shareReplay, throttleTime } from 'rxjs/operators';
 import { defaults } from 'lodash';
 import { SerializableRecord, UnwrapObservable } from '@kbn/utility-types';
-import { Adapters } from '../../inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { IExpressionLoaderParams } from './types';
 import { ExpressionAstExpression } from '../common';
 import { ExecutionContract } from '../common/execution/execution_contract';
diff --git a/src/plugins/expressions/public/mocks.tsx b/src/plugins/expressions/public/mocks.tsx
index bf5daab911efe..38d6a4752ab9b 100644
--- a/src/plugins/expressions/public/mocks.tsx
+++ b/src/plugins/expressions/public/mocks.tsx
@@ -7,10 +7,9 @@
  */
 
 import React from 'react';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ExpressionsSetup, ExpressionsStart, plugin as pluginInitializer } from '.';
 
-import { coreMock } from '../../../core/public/mocks';
-
 export type Setup = jest.Mocked<ExpressionsSetup>;
 export type Start = jest.Mocked<ExpressionsStart>;
 
diff --git a/src/plugins/expressions/public/plugin.ts b/src/plugins/expressions/public/plugin.ts
index 4991d6bcc4f40..338783c0a5ba4 100644
--- a/src/plugins/expressions/public/plugin.ts
+++ b/src/plugins/expressions/public/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { pick } from 'lodash';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { SerializableRecord } from '@kbn/utility-types';
 import type { ExpressionsServiceSetup, ExpressionsServiceStart } from '../common';
 import {
diff --git a/src/plugins/expressions/public/services/expressions_services.ts b/src/plugins/expressions/public/services/expressions_services.ts
index 388af81629c31..64f0097868232 100644
--- a/src/plugins/expressions/public/services/expressions_services.ts
+++ b/src/plugins/expressions/public/services/expressions_services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { ExpressionsService as CommonExpressionsService } from '../../common';
 import { getUiSettingFn } from '../expression_functions';
 
diff --git a/src/plugins/expressions/public/services/index.ts b/src/plugins/expressions/public/services/index.ts
index 198ff129bcce3..29a528f196ce5 100644
--- a/src/plugins/expressions/public/services/index.ts
+++ b/src/plugins/expressions/public/services/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NotificationsStart } from 'kibana/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
+import { NotificationsStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { ExpressionsService, ExpressionRendererRegistry } from '../../common';
 
 export const [getNotifications, setNotifications] =
diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts
index 35bda400756d0..322c2895f9bb5 100644
--- a/src/plugins/expressions/public/types/index.ts
+++ b/src/plugins/expressions/public/types/index.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaExecutionContext } from 'src/core/public';
-import { Adapters } from '../../../inspector/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import {
   IInterpreterRenderHandlers,
   ExpressionValue,
diff --git a/src/plugins/expressions/server/expression_functions/ui_setting.ts b/src/plugins/expressions/server/expression_functions/ui_setting.ts
index 0d3d5b1c1f997..a490b003ce90b 100644
--- a/src/plugins/expressions/server/expression_functions/ui_setting.ts
+++ b/src/plugins/expressions/server/expression_functions/ui_setting.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { getUiSettingFn as getCommonUiSettingFn } from '../../common';
 
 export function getUiSettingFn({ getStartServices }: Pick<CoreSetup, 'getStartServices'>) {
diff --git a/src/plugins/expressions/server/index.ts b/src/plugins/expressions/server/index.ts
index 4baac3dd5285b..facb1b80fb759 100644
--- a/src/plugins/expressions/server/index.ts
+++ b/src/plugins/expressions/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ExpressionsServerPlugin } from './plugin';
 
 export type { ExpressionsServerSetup, ExpressionsServerStart } from './plugin';
diff --git a/src/plugins/expressions/server/mocks.ts b/src/plugins/expressions/server/mocks.ts
index cb6392e04fc9e..df5232ab5faf5 100644
--- a/src/plugins/expressions/server/mocks.ts
+++ b/src/plugins/expressions/server/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/server/mocks';
 import { ExpressionsServerSetup, ExpressionsServerStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/server/mocks';
 
 export type Setup = jest.Mocked<ExpressionsServerSetup>;
 export type Start = jest.Mocked<ExpressionsServerStart>;
diff --git a/src/plugins/expressions/server/plugin.ts b/src/plugins/expressions/server/plugin.ts
index ccdcd81036f95..750d61ec5eb03 100644
--- a/src/plugins/expressions/server/plugin.ts
+++ b/src/plugins/expressions/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { pick } from 'lodash';
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { ExpressionsService, ExpressionsServiceSetup, ExpressionsServiceStart } from '../common';
 
 export type ExpressionsServerSetup = ExpressionsServiceSetup;
diff --git a/src/plugins/expressions/server/services/expressions_services.ts b/src/plugins/expressions/server/services/expressions_services.ts
index 914745436f151..ce07e1922dd4b 100644
--- a/src/plugins/expressions/server/services/expressions_services.ts
+++ b/src/plugins/expressions/server/services/expressions_services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { ExpressionsService as CommonExpressionsService } from '../../common';
 import { getUiSettingFn } from '../expression_functions';
 
diff --git a/src/plugins/field_formats/common/converters/date_nanos_shared.ts b/src/plugins/field_formats/common/converters/date_nanos_shared.ts
index daffc289a7c7b..47a3c9830a5f1 100644
--- a/src/plugins/field_formats/common/converters/date_nanos_shared.ts
+++ b/src/plugins/field_formats/common/converters/date_nanos_shared.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { memoize, noop } from 'lodash';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import moment, { Moment } from 'moment';
-import { FieldFormat, FIELD_FORMAT_IDS } from '../';
+import { FieldFormat, FIELD_FORMAT_IDS } from '..';
 import { TextContextTypeConvert } from '../types';
 
 interface FractPatternObject {
diff --git a/src/plugins/field_formats/common/field_formats_registry.ts b/src/plugins/field_formats/common/field_formats_registry.ts
index 19af3a1f976ab..7235511718297 100644
--- a/src/plugins/field_formats/common/field_formats_registry.ts
+++ b/src/plugins/field_formats/common/field_formats_registry.ts
@@ -23,7 +23,7 @@ import {
 } from './types';
 import { baseFormatters } from './constants/base_formatters';
 import { FieldFormat } from './field_format';
-import { FORMATS_UI_SETTINGS } from '../common/constants/ui_settings';
+import { FORMATS_UI_SETTINGS } from './constants/ui_settings';
 import { FieldFormatNotFoundError } from './errors';
 
 export class FieldFormatsRegistry {
diff --git a/src/plugins/field_formats/public/mocks.ts b/src/plugins/field_formats/public/mocks.ts
index cf7cc5732c6a6..759c91d8e6ad3 100644
--- a/src/plugins/field_formats/public/mocks.ts
+++ b/src/plugins/field_formats/public/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { baseFormattersPublic } from './lib/constants';
 import { FieldFormatsRegistry, FORMATS_UI_SETTINGS } from '../common';
 import type { FieldFormatsSetup, FieldFormatsStart } from '.';
diff --git a/src/plugins/field_formats/public/plugin.test.ts b/src/plugins/field_formats/public/plugin.test.ts
index 808413667918d..063769ba8ff0e 100644
--- a/src/plugins/field_formats/public/plugin.test.ts
+++ b/src/plugins/field_formats/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DateFormat } from './lib/converters/date';
 import { FieldFormatsPlugin } from './plugin';
 
diff --git a/src/plugins/field_formats/public/plugin.ts b/src/plugins/field_formats/public/plugin.ts
index 0e90aa9b48c8e..6b33b056ec180 100755
--- a/src/plugins/field_formats/public/plugin.ts
+++ b/src/plugins/field_formats/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from '../../../core/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 import { FieldFormatsRegistry, FORMATS_UI_SETTINGS } from '../common';
 import { baseFormattersPublic } from './lib';
 import { FormatFactory } from '../common/types';
diff --git a/src/plugins/field_formats/server/index.ts b/src/plugins/field_formats/server/index.ts
index d3cac3bfb00c2..bcc94c38dd0d8 100755
--- a/src/plugins/field_formats/server/index.ts
+++ b/src/plugins/field_formats/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FieldFormatsPlugin } from './plugin';
 export { DateFormat, DateNanosFormat } from './lib/converters';
 
diff --git a/src/plugins/field_formats/server/plugin.test.ts b/src/plugins/field_formats/server/plugin.test.ts
index da598c69d027c..1bbbd82fa8321 100644
--- a/src/plugins/field_formats/server/plugin.test.ts
+++ b/src/plugins/field_formats/server/plugin.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { DateFormat } from './lib/converters/date_server';
-import { coreMock, httpServerMock } from '../../../core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { FieldFormatsPlugin } from './plugin';
 
 describe('FieldFormats registry server plugin', () => {
diff --git a/src/plugins/field_formats/server/plugin.ts b/src/plugins/field_formats/server/plugin.ts
index e2c64807433a9..55abfe68eddb7 100755
--- a/src/plugins/field_formats/server/plugin.ts
+++ b/src/plugins/field_formats/server/plugin.ts
@@ -13,7 +13,7 @@ import {
   CoreStart,
   Plugin,
   IUiSettingsClient,
-} from '../../../core/server';
+} from '@kbn/core/server';
 import { FieldFormatsStart, FieldFormatsSetup } from './types';
 import { DateFormat, DateNanosFormat } from './lib/converters';
 import { baseFormatters, FieldFormatInstanceType, FieldFormatsRegistry } from '../common';
diff --git a/src/plugins/field_formats/server/types.ts b/src/plugins/field_formats/server/types.ts
index eaf9c9ffdc390..a241aa6493556 100755
--- a/src/plugins/field_formats/server/types.ts
+++ b/src/plugins/field_formats/server/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { IUiSettingsClient } from '@kbn/core/server';
 import { FieldFormatInstanceType, FieldFormatsRegistry } from '../common';
-import { IUiSettingsClient } from '../../../core/server';
 
 export interface FieldFormatsSetup {
   /**
diff --git a/src/plugins/field_formats/server/ui_settings.ts b/src/plugins/field_formats/server/ui_settings.ts
index 0fe2ed58818dd..4d38bbc72fbe2 100644
--- a/src/plugins/field_formats/server/ui_settings.ts
+++ b/src/plugins/field_formats/server/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 // @ts-ignore untyped module
 import numeralLanguages from '@elastic/numeral/languages';
 import { FORMATS_UI_SETTINGS } from '../common';
diff --git a/src/plugins/home/public/application/application.tsx b/src/plugins/home/public/application/application.tsx
index b5a340fafacc0..36cc7a7c1b785 100644
--- a/src/plugins/home/public/application/application.tsx
+++ b/src/plugins/home/public/application/application.tsx
@@ -9,13 +9,13 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
-import { ScopedHistory, CoreStart, CoreTheme } from 'kibana/public';
+import { ScopedHistory, CoreStart, CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 // @ts-ignore
 import { HomeApp } from './components/home_app';
 import { getServices } from './kibana_services';
diff --git a/src/plugins/home/public/application/components/add_data/add_data.test.tsx b/src/plugins/home/public/application/components/add_data/add_data.test.tsx
index 009b72791263b..92a43fc081172 100644
--- a/src/plugins/home/public/application/components/add_data/add_data.test.tsx
+++ b/src/plugins/home/public/application/components/add_data/add_data.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { AddData } from './add_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 jest.mock('../app_navigation_handler', () => {
   return {
diff --git a/src/plugins/home/public/application/components/add_data/add_data.tsx b/src/plugins/home/public/application/components/add_data/add_data.tsx
index 090443c4a6f85..8946e3e80a217 100644
--- a/src/plugins/home/public/application/components/add_data/add_data.tsx
+++ b/src/plugins/home/public/application/components/add_data/add_data.tsx
@@ -20,10 +20,10 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { createAppNavigationHandler } from '../app_navigation_handler';
 import { getServices } from '../../kibana_services';
-import { RedirectAppLinks } from '../../../../../kibana_react/public';
 
 interface Props {
   addBasePath: (path: string) => string;
diff --git a/src/plugins/home/public/application/components/home.test.tsx b/src/plugins/home/public/application/components/home.test.tsx
index f27a286488c2b..578afe8de6b86 100644
--- a/src/plugins/home/public/application/components/home.test.tsx
+++ b/src/plugins/home/public/application/components/home.test.tsx
@@ -8,10 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
+
 import type { HomeProps } from './home';
 import { Home } from './home';
-
-import { FeatureCatalogueCategory } from '../../services';
 import { Welcome } from './welcome';
 
 let mockHasIntegrationsPermission = true;
@@ -33,7 +32,7 @@ jest.mock('../kibana_services', () => ({
   }),
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   overviewPageActions: jest.fn().mockReturnValue([]),
   OverviewPageFooter: jest.fn().mockReturnValue(<></>),
   KibanaPageTemplate: jest.fn().mockReturnValue(<></>),
@@ -132,7 +131,7 @@ describe('home', () => {
         icon: 'indexPatternApp',
         path: 'index_management_landing_page',
         showOnHomePage: true,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin' as const,
       };
 
       const component = await renderHome({
@@ -150,7 +149,7 @@ describe('home', () => {
         icon: 'managementApp',
         path: 'management_landing_page',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin' as const,
       };
 
       const component = await renderHome({
@@ -172,7 +171,7 @@ describe('home', () => {
             path: 'path-to-advanced_settings',
             showOnHomePage: false,
             title: 'Advanced settings',
-            category: FeatureCatalogueCategory.ADMIN,
+            category: 'admin',
           },
         ],
       });
diff --git a/src/plugins/home/public/application/components/home.tsx b/src/plugins/home/public/application/components/home.tsx
index 1fb0b3c790ab7..a18fd9b7547ab 100644
--- a/src/plugins/home/public/application/components/home.tsx
+++ b/src/plugins/home/public/application/components/home.tsx
@@ -10,10 +10,13 @@ import React, { Component } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
-import { KibanaPageTemplate, OverviewPageFooter } from '../../../../kibana_react/public';
+import { KibanaPageTemplate, OverviewPageFooter } from '@kbn/kibana-react-plugin/public';
 import { HOME_APP_BASE_PATH } from '../../../common/constants';
-import type { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../services';
-import { FeatureCatalogueCategory } from '../../services';
+import type {
+  FeatureCatalogueEntry,
+  FeatureCatalogueSolution,
+  FeatureCatalogueCategory,
+} from '../../services';
 import { getServices } from '../kibana_services';
 import { AddData } from './add_data';
 import { ManageData } from './manage_data';
@@ -126,7 +129,7 @@ export class Home extends Component<HomeProps, State> {
     const { application, trackUiMetric } = getServices();
     const isDarkMode = getServices().uiSettings?.get('theme:darkMode') || false;
     const devTools = this.findDirectoryById('console');
-    const manageDataFeatures = this.getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
+    const manageDataFeatures = this.getFeaturesByCategory('admin');
 
     // Show card for console if none of the manage data plugins are available, most likely in OSS
     if (manageDataFeatures.length < 1 && devTools) {
diff --git a/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx b/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
index f602ee5aa4439..e6baad44bf816 100644
--- a/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
+++ b/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { ManageData } from './manage_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { ApplicationStart } from 'kibana/public';
-import { FeatureCatalogueEntry, FeatureCatalogueCategory } from '../../../services';
+import { ApplicationStart } from '@kbn/core/public';
+import { FeatureCatalogueEntry } from '../../../services';
 
 jest.mock('../app_navigation_handler', () => {
   return {
@@ -41,7 +41,7 @@ const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
 
 const mockFeatures: FeatureCatalogueEntry[] = [
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description: 'Control who has access and what tasks they can perform.',
     icon: 'securityApp',
     id: 'security',
@@ -51,7 +51,7 @@ const mockFeatures: FeatureCatalogueEntry[] = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description: 'Track the real-time health and performance of your deployment.',
     icon: 'monitoringApp',
     id: 'monitoring',
@@ -61,7 +61,7 @@ const mockFeatures: FeatureCatalogueEntry[] = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description:
       'Save snapshots to a backup repository, and restore to recover index and cluster state.',
     icon: 'storage',
@@ -72,7 +72,7 @@ const mockFeatures: FeatureCatalogueEntry[] = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description: 'Define lifecycle policies to automatically perform operations as an index ages.',
     icon: 'indexSettings',
     id: 'index_lifecycle_management',
diff --git a/src/plugins/home/public/application/components/manage_data/manage_data.tsx b/src/plugins/home/public/application/components/manage_data/manage_data.tsx
index 15f5dadb43493..092d9b2e7a504 100644
--- a/src/plugins/home/public/application/components/manage_data/manage_data.tsx
+++ b/src/plugins/home/public/application/components/manage_data/manage_data.tsx
@@ -17,13 +17,13 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { FeatureCatalogueEntry } from '../../../services';
 import { createAppNavigationHandler } from '../app_navigation_handler';
 // @ts-expect-error untyped component
 import { Synopsis } from '../synopsis';
 import { getServices } from '../../kibana_services';
-import { RedirectAppLinks } from '../../../../../kibana_react/public';
 
 interface Props {
   addBasePath: (path: string) => string;
diff --git a/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx b/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
index d53151c32a5ab..a6c7a1c0f8f4e 100644
--- a/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
+++ b/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
@@ -10,8 +10,8 @@ import { snakeCase } from 'lodash';
 import React, { FC, MouseEvent } from 'react';
 import { EuiCard, EuiFlexItem } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { KibanaPageTemplateSolutionNavAvatar } from '../../../../../kibana_react/public';
-import { FeatureCatalogueSolution } from '../../../';
+import { KibanaPageTemplateSolutionNavAvatar } from '@kbn/kibana-react-plugin/public';
+import { FeatureCatalogueSolution } from '../../..';
 import { createAppNavigationHandler } from '../app_navigation_handler';
 import { getServices } from '../../kibana_services';
 
diff --git a/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx b/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
index 11813bf86538f..41978b97cd5a3 100644
--- a/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
+++ b/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
@@ -10,7 +10,7 @@ import React, { FC } from 'react';
 import { EuiFlexGroup, EuiHorizontalRule, EuiScreenReaderOnly } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { SolutionPanel } from './solution_panel';
-import { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../../';
+import { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../..';
 
 const sortByOrder = (
   { order: orderA = 0 }: FeatureCatalogueSolution | FeatureCatalogueEntry,
diff --git a/src/plugins/home/public/application/components/tutorial/introduction.test.js b/src/plugins/home/public/application/components/tutorial/introduction.test.js
index c599c8748e925..6f7b6b31289ed 100644
--- a/src/plugins/home/public/application/components/tutorial/introduction.test.js
+++ b/src/plugins/home/public/application/components/tutorial/introduction.test.js
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 
 import { Introduction } from './introduction';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { TutorialsCategory } from '../../../../common/constants';
 
 const basePathMock = httpServiceMock.createBasePath();
diff --git a/src/plugins/home/public/application/components/tutorial/tutorial.js b/src/plugins/home/public/application/components/tutorial/tutorial.js
index 00cbf013856da..de222dbe6155d 100644
--- a/src/plugins/home/public/application/components/tutorial/tutorial.js
+++ b/src/plugins/home/public/application/components/tutorial/tutorial.js
@@ -18,7 +18,7 @@ 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 { KibanaPageTemplate } from '../../../../../kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 const INSTRUCTIONS_TYPE = {
   ELASTIC_CLOUD: 'elasticCloud',
diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js
index 3ecbb73e849fc..e4868796c288d 100644
--- a/src/plugins/home/public/application/components/tutorial_directory.js
+++ b/src/plugins/home/public/application/components/tutorial_directory.js
@@ -15,7 +15,7 @@ import { i18n } from '@kbn/i18n';
 import { Synopsis } from './synopsis';
 import { SampleDataSetCards } from './sample_data_set_cards';
 import { getServices } from '../kibana_services';
-import { KibanaPageTemplate } from '../../../../kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { getTutorials } from '../load_tutorials';
 
 const SAMPLE_DATA_TAB_ID = 'sampleData';
diff --git a/src/plugins/home/public/application/kibana_services.ts b/src/plugins/home/public/application/kibana_services.ts
index 3ccfd9413a88a..af4591c8e7368 100644
--- a/src/plugins/home/public/application/kibana_services.ts
+++ b/src/plugins/home/public/application/kibana_services.ts
@@ -15,16 +15,16 @@ import {
   SavedObjectsClientContract,
   IUiSettingsClient,
   ApplicationStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UrlForwardingStart } from '../../../url_forwarding/public';
-import { DataViewsContract } from '../../../data_views/public';
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 import { TutorialService } from '../services/tutorials';
 import { AddDataService } from '../services/add_data';
 import { FeatureCatalogueRegistry } from '../services/feature_catalogue';
 import { EnvironmentService } from '../services/environment';
 import { ConfigSchema } from '../../config';
-import { SharePluginSetup } from '../../../share/public';
 import type { WelcomeService } from '../services/welcome';
 
 export interface HomeKibanaServices {
diff --git a/src/plugins/home/public/index.ts b/src/plugins/home/public/index.ts
index 3450f4f9d2caf..17e5d1f599eca 100644
--- a/src/plugins/home/public/index.ts
+++ b/src/plugins/home/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 export type {
   FeatureCatalogueSetup,
@@ -16,10 +16,9 @@ export type {
   HomePublicPluginStart,
 } from './plugin';
 
-export { FeatureCatalogueCategory } from './services';
-
 export type {
   AddDataTab,
+  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueRegistry,
   FeatureCatalogueSolution,
diff --git a/src/plugins/home/public/plugin.test.ts b/src/plugins/home/public/plugin.test.ts
index 57a1f5ec112aa..12243944ef0f0 100644
--- a/src/plugins/home/public/plugin.test.ts
+++ b/src/plugins/home/public/plugin.test.ts
@@ -8,9 +8,9 @@
 
 import { registryMock, environmentMock, tutorialMock } from './plugin.test.mocks';
 import { HomePublicPlugin } from './plugin';
-import { coreMock } from '../../../core/public/mocks';
-import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
-import { SharePluginSetup } from '../../share/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { urlForwardingPluginMock } from '@kbn/url-forwarding-plugin/public/mocks';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 
 const mockInitializerContext = coreMock.createPluginInitializerContext();
 const mockShare = {} as SharePluginSetup;
diff --git a/src/plugins/home/public/plugin.ts b/src/plugins/home/public/plugin.ts
index 9179635d2cc0c..641d43a68ab13 100644
--- a/src/plugins/home/public/plugin.ts
+++ b/src/plugins/home/public/plugin.ts
@@ -12,13 +12,20 @@ import {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { PLUGIN_ID, HOME_APP_BASE_PATH } from '../common/constants';
+import { setServices } from './application/kibana_services';
+import { ConfigSchema } from '../config';
 import {
   EnvironmentService,
   EnvironmentServiceSetup,
-  FeatureCatalogueCategory,
   FeatureCatalogueRegistry,
   FeatureCatalogueRegistrySetup,
   TutorialService,
@@ -28,14 +35,6 @@ import {
   WelcomeService,
   WelcomeServiceSetup,
 } from './services';
-import { ConfigSchema } from '../config';
-import { setServices } from './application/kibana_services';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { UsageCollectionSetup } from '../../usage_collection/public';
-import { UrlForwardingSetup, UrlForwardingStart } from '../../url_forwarding/public';
-import { AppNavLinkStatus } from '../../../core/public';
-import { PLUGIN_ID, HOME_APP_BASE_PATH } from '../common/constants';
-import { SharePluginSetup } from '../../share/public';
 
 export interface HomePluginStartDependencies {
   dataViews: DataViewsPublicPluginStart;
@@ -124,7 +123,7 @@ export class HomePublicPlugin
       icon: 'indexOpen',
       showOnHomePage: true,
       path: `${HOME_APP_BASE_PATH}#/tutorial_directory`,
-      category: 'data' as FeatureCatalogueCategory.DATA,
+      category: 'data',
       order: 500,
     });
 
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
index 4198ceb54b26a..759ff5e3d0d23 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
@@ -8,7 +8,6 @@
 
 import {
   FeatureCatalogueRegistry,
-  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
 } from './feature_catalogue_registry';
@@ -20,7 +19,7 @@ const DASHBOARD_FEATURE: FeatureCatalogueEntry = {
   icon: 'dashboardApp',
   path: `/app/kibana#dashboard`,
   showOnHomePage: true,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data',
 };
 
 const KIBANA_SOLUTION: FeatureCatalogueSolution = {
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
index 0b38d8359890d..2bc84b44f5540 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
@@ -6,15 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { IconType } from '@elastic/eui';
 
 /** @public */
-export enum FeatureCatalogueCategory {
-  ADMIN = 'admin',
-  DATA = 'data',
-  OTHER = 'other',
-}
+export type FeatureCatalogueCategory = 'admin' | 'data' | 'other';
 
 /** @public */
 export interface FeatureCatalogueEntry {
diff --git a/src/plugins/home/public/services/feature_catalogue/index.ts b/src/plugins/home/public/services/feature_catalogue/index.ts
index c89f26c8f8949..d344298ed3797 100644
--- a/src/plugins/home/public/services/feature_catalogue/index.ts
+++ b/src/plugins/home/public/services/feature_catalogue/index.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-export { FeatureCatalogueCategory, FeatureCatalogueRegistry } from './feature_catalogue_registry';
+export { FeatureCatalogueRegistry } from './feature_catalogue_registry';
 
 export type {
+  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
   FeatureCatalogueRegistrySetup,
diff --git a/src/plugins/home/public/services/index.ts b/src/plugins/home/public/services/index.ts
index 41bc9ee258ceb..9bb73fa281c6c 100644
--- a/src/plugins/home/public/services/index.ts
+++ b/src/plugins/home/public/services/index.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-export { FeatureCatalogueCategory, FeatureCatalogueRegistry } from './feature_catalogue';
+export { FeatureCatalogueRegistry } from './feature_catalogue';
 
 export type {
+  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
   FeatureCatalogueRegistrySetup,
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
index feffc2f2e003c..d93f864fb7af4 100644
--- a/src/plugins/home/server/index.ts
+++ b/src/plugins/home/server/index.ts
@@ -22,7 +22,7 @@ export type {
   SampleObject,
   ScopedTutorialContextFactory,
 } from './services';
-import { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { HomeServerPlugin } from './plugin';
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/home/server/plugin.test.ts b/src/plugins/home/server/plugin.test.ts
index 5af0c4a578eeb..449740897d9ac 100644
--- a/src/plugins/home/server/plugin.test.ts
+++ b/src/plugins/home/server/plugin.test.ts
@@ -8,8 +8,8 @@
 
 import { registryForTutorialsMock, registryForSampleDataMock } from './plugin.test.mocks';
 import { HomeServerPlugin, HomeServerPluginSetupDependencies } from './plugin';
-import { coreMock, httpServiceMock } from '../../../core/server/mocks';
-import { customIntegrationsMock } from '../../custom_integrations/server/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/server/mocks';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/server/mocks';
 
 describe('HomeServerPlugin', () => {
   let homeServerPluginSetupDependenciesMock: HomeServerPluginSetupDependencies;
diff --git a/src/plugins/home/server/plugin.ts b/src/plugins/home/server/plugin.ts
index 04d2d80898b50..8a4d22c144c79 100644
--- a/src/plugins/home/server/plugin.ts
+++ b/src/plugins/home/server/plugin.ts
@@ -6,7 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import {
   TutorialsRegistry,
   TutorialsRegistrySetup,
@@ -15,11 +17,9 @@ import {
   SampleDataRegistrySetup,
   SampleDataRegistryStart,
 } from './services';
-import { UsageCollectionSetup } from '../../usage_collection/server';
 import { capabilitiesProvider } from './capabilities_provider';
 import { sampleDataTelemetry } from './saved_objects';
 import { registerRoutes } from './routes';
-import { CustomIntegrationsPluginSetup } from '../../custom_integrations/server';
 
 export interface HomeServerPluginSetupDependencies {
   usageCollection?: UsageCollectionSetup;
diff --git a/src/plugins/home/server/routes/fetch_es_hits_status.ts b/src/plugins/home/server/routes/fetch_es_hits_status.ts
index b3cfef51920f1..0ce090c6bfeed 100644
--- a/src/plugins/home/server/routes/fetch_es_hits_status.ts
+++ b/src/plugins/home/server/routes/fetch_es_hits_status.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export const registerHitsStatusRoute = (router: IRouter) => {
   router.post(
@@ -22,7 +22,7 @@ export const registerHitsStatusRoute = (router: IRouter) => {
     },
     router.handleLegacyErrors(async (context, req, res) => {
       const { index, query } = req.body;
-      const client = context.core.elasticsearch.client;
+      const client = (await context.core).elasticsearch.client;
 
       try {
         const body = await client.asCurrentUser.search({
diff --git a/src/plugins/home/server/routes/index.ts b/src/plugins/home/server/routes/index.ts
index 905304e059660..6a5ff1cf7fb5a 100644
--- a/src/plugins/home/server/routes/index.ts
+++ b/src/plugins/home/server/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { registerHitsStatusRoute } from './fetch_es_hits_status';
 
 export const registerRoutes = (router: IRouter) => {
diff --git a/src/plugins/home/server/saved_objects/sample_data_telemetry.ts b/src/plugins/home/server/saved_objects/sample_data_telemetry.ts
index d786154aaf4bd..31b7d3f9cb23b 100644
--- a/src/plugins/home/server/saved_objects/sample_data_telemetry.ts
+++ b/src/plugins/home/server/saved_objects/sample_data_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const sampleDataTelemetry: SavedObjectsType = {
   name: 'sample-data-telemetry',
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
index c2f56c1d6049d..8a520d23c0a45 100644
--- 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
@@ -9,7 +9,7 @@
 /* eslint max-len: 0 */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export const getSavedObjects = (): SavedObject[] => [
   {
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
index 8552d74201fe2..279ab629352c7 100644
--- 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
@@ -9,7 +9,7 @@
 /* eslint max-len: 0 */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export const getSavedObjects = (): SavedObject[] => [
   {
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
index aa2a0d077e30a..a38dd2120e8f1 100644
--- 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
@@ -8,7 +8,7 @@
 
 /* eslint max-len: 0 */
 import { i18n } from '@kbn/i18n';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export const getSavedObjects = (): SavedObject[] => [
   {
diff --git a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts
index 93a3e8c1d5f9c..6a4be4728a7aa 100644
--- a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts
+++ b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts
@@ -8,8 +8,8 @@
 
 import { mockBuildNode } from './find_sample_objects.test.mock';
 
-import type { SavedObject, SavedObjectsFindResponse } from 'src/core/server';
-import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { SavedObject, SavedObjectsFindResponse } from '@kbn/core/server';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { findSampleObjects } from './find_sample_objects';
 
 describe('findSampleObjects', () => {
diff --git a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts
index 904470acc2c84..a03780611e292 100644
--- a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts
+++ b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts
@@ -7,7 +7,7 @@
  */
 
 import * as esKuery from '@kbn/es-query';
-import type { Logger, SavedObjectsClientContract } from 'src/core/server';
+import type { Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 const MAX_OBJECTS_TO_FIND = 10000; // we only expect up to a few dozen, search for 10k to be safe; anything over this is ignored
 
diff --git a/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts b/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
index e22a552b7d7bd..47772f925dd3b 100644
--- a/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
+++ b/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IScopedClusterClient, Logger } from 'kibana/server';
+import { IScopedClusterClient, Logger } from '@kbn/core/server';
 import type { DataIndexSchema } from './sample_dataset_registry_types';
 import {
   translateTimeRelativeToDifference,
diff --git a/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts b/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts
index d06dcacff18d9..4ba7e1ae107e9 100644
--- a/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts
+++ b/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import { CustomIntegrationsPluginSetup } from '../../../../../custom_integrations/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { HOME_APP_BASE_PATH } from '../../../../common/constants';
 import { GLOBE_ICON_PATH } from '../data_sets/logs';
 
diff --git a/src/plugins/home/server/services/sample_data/routes/install.ts b/src/plugins/home/server/services/sample_data/routes/install.ts
index 21c77ec51e5ef..f057e6861518e 100644
--- a/src/plugins/home/server/services/sample_data/routes/install.ts
+++ b/src/plugins/home/server/services/sample_data/routes/install.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, Logger } from 'src/core/server';
+import { IRouter, Logger } from '@kbn/core/server';
 import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { SampleDataUsageTracker } from '../usage/usage';
 import { getSampleDataInstaller } from './utils';
@@ -38,7 +38,7 @@ export function createInstallRoute(
       //  @ts-ignore Custom query validation used
       const now = query.now ? new Date(query.now) : new Date();
 
-      const sampleDataInstaller = getSampleDataInstaller({
+      const sampleDataInstaller = await getSampleDataInstaller({
         datasetId: sampleDataset.id,
         sampleDatasets,
         logger,
diff --git a/src/plugins/home/server/services/sample_data/routes/list.ts b/src/plugins/home/server/services/sample_data/routes/list.ts
index 6bcc40c0c93e3..39690b3944d0c 100644
--- a/src/plugins/home/server/services/sample_data/routes/list.ts
+++ b/src/plugins/home/server/services/sample_data/routes/list.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter, Logger, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, Logger, RequestHandlerContext } from '@kbn/core/server';
 import type { AppLinkData, SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { createIndexName } from '../lib/create_index_name';
 import type { FindSampleObjectsResponseObject } from '../lib/find_sample_objects';
@@ -78,7 +78,7 @@ async function findExistingSampleObjects(
     .map(({ savedObjects }) => savedObjects.map(({ type, id }) => ({ type, id })))
     .flat();
   const objectTypes = getUniqueObjectTypes(objects);
-  const client = getSavedObjectsClient(context, objectTypes);
+  const client = await getSavedObjectsClient(context, objectTypes);
   const findSampleObjectsResult = await findSampleObjects({ client, logger, objects });
 
   let objectCounter = 0;
@@ -101,18 +101,20 @@ async function getSampleDatasetStatus(
     return { status: NOT_INSTALLED };
   }
 
+  const { elasticsearch } = await context.core;
+
   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.client.asCurrentUser.indices.exists({
+      const indexExists = await elasticsearch.client.asCurrentUser.indices.exists({
         index,
       });
       if (!indexExists) {
         return { status: NOT_INSTALLED };
       }
 
-      const count = await context.core.elasticsearch.client.asCurrentUser.count({
+      const count = await elasticsearch.client.asCurrentUser.count({
         index,
       });
       if (count.count === 0) {
diff --git a/src/plugins/home/server/services/sample_data/routes/uninstall.ts b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
index 52f725da4906b..d2700b4985a79 100644
--- a/src/plugins/home/server/services/sample_data/routes/uninstall.ts
+++ b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { IRouter, Logger } from 'src/core/server';
+import type { IRouter, Logger } from '@kbn/core/server';
 import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { SampleDataUsageTracker } from '../usage/usage';
 import { getSampleDataInstaller } from './utils';
@@ -32,7 +32,7 @@ export function createUninstallRoute(
         return response.notFound();
       }
 
-      const sampleDataInstaller = getSampleDataInstaller({
+      const sampleDataInstaller = await getSampleDataInstaller({
         datasetId: sampleDataset.id,
         sampleDatasets,
         logger,
diff --git a/src/plugins/home/server/services/sample_data/routes/utils.ts b/src/plugins/home/server/services/sample_data/routes/utils.ts
index 36b5534d9f4af..f4e99e4c04c93 100644
--- a/src/plugins/home/server/services/sample_data/routes/utils.ts
+++ b/src/plugins/home/server/services/sample_data/routes/utils.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandlerContext, Logger } from 'src/core/server';
+import type { RequestHandlerContext, Logger } from '@kbn/core/server';
 import type { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { SampleDataInstaller } from '../sample_data_installer';
 import { getUniqueObjectTypes } from '../lib/utils';
 
-export const getSampleDataInstaller = ({
+export const getSampleDataInstaller = async ({
   datasetId,
   context,
   sampleDatasets,
@@ -22,14 +22,15 @@ export const getSampleDataInstaller = ({
   sampleDatasets: SampleDatasetSchema[];
   logger: Logger;
 }) => {
+  const core = await context.core;
   const sampleDataset = sampleDatasets.find(({ id }) => id === datasetId)!;
-  const { getImporter, client: soClient } = context.core.savedObjects;
+  const { getImporter, client: soClient } = core.savedObjects;
   const objectTypes = getUniqueObjectTypes(sampleDataset.savedObjects);
-  const savedObjectsClient = getSavedObjectsClient(context, objectTypes);
+  const savedObjectsClient = await getSavedObjectsClient(context, objectTypes);
   const soImporter = getImporter(savedObjectsClient);
 
   return new SampleDataInstaller({
-    esClient: context.core.elasticsearch.client,
+    esClient: core.elasticsearch.client,
     soImporter,
     soClient,
     logger,
@@ -37,8 +38,11 @@ export const getSampleDataInstaller = ({
   });
 };
 
-export const getSavedObjectsClient = (context: RequestHandlerContext, objectTypes: string[]) => {
-  const { getClient, typeRegistry } = context.core.savedObjects;
+export const getSavedObjectsClient = async (
+  context: RequestHandlerContext,
+  objectTypes: string[]
+) => {
+  const { getClient, typeRegistry } = (await context.core).savedObjects;
   const includedHiddenTypes = objectTypes.filter((supportedType) =>
     typeRegistry.isHidden(supportedType)
   );
diff --git a/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts b/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts
index 205b00e3df94f..d103bdb18f779 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts
@@ -8,13 +8,13 @@
 
 import { Readable } from 'stream';
 import { insertDataIntoIndexMock, findSampleObjectsMock } from './sample_data_installer.test.mocks';
-import type { SavedObjectsImportFailure } from 'kibana/server';
+import type { SavedObjectsImportFailure } from '@kbn/core/server';
 import {
   savedObjectsClientMock,
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   loggingSystemMock,
-} from '../../../../../core/server/mocks';
+} from '@kbn/core/server/mocks';
 import type { SampleDatasetSchema } from './lib/sample_dataset_registry_types';
 import { SampleDataInstaller } from './sample_data_installer';
 import { SampleDataInstallError } from './errors';
diff --git a/src/plugins/home/server/services/sample_data/sample_data_installer.ts b/src/plugins/home/server/services/sample_data/sample_data_installer.ts
index 5aec4a6b2d516..048924ef3aba3 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_installer.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_installer.ts
@@ -13,7 +13,7 @@ import type {
   ISavedObjectsImporter,
   Logger,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { SampleDatasetSchema, DataIndexSchema } from './lib/sample_dataset_registry_types';
 import { dateToIso8601IgnoringTime } from './lib/translate_timestamp';
 import { createIndexName } from './lib/create_index_name';
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts
index 3d836d233d72c..30aa2d7e48d2f 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts
@@ -7,14 +7,14 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup } from '../../../../../core/server';
+import { CoreSetup } from '@kbn/core/server';
 
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
-import { customIntegrationsMock } from '../../../../custom_integrations/server/mocks';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/server/mocks';
 import { SampleDataRegistry } from './sample_data_registry';
-import { usageCollectionPluginMock } from '../../../../usage_collection/server/mocks';
-import { UsageCollectionSetup } from '../../../../usage_collection/server/plugin';
-import { coreMock } from '../../../../../core/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server/plugin';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('SampleDataRegistry', () => {
   let mockCoreSetup: MockedKeys<CoreSetup>;
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
index f8dd12746832b..4ee78da7128e6 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_registry.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
@@ -6,8 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { SavedObject } from 'src/core/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/server';
+import { SavedObject } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import {
   SampleDatasetProvider,
   SampleDatasetSchema,
@@ -18,10 +20,8 @@ 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';
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
 import { registerSampleDatasetWithIntegration } from './lib/register_with_integrations';
 
 export class SampleDataRegistry {
diff --git a/src/plugins/home/server/services/sample_data/usage/collector.ts b/src/plugins/home/server/services/sample_data/usage/collector.ts
index 06c0c9239942b..5f32d4c79369c 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectionSetup } from '../../../../../usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider, TelemetryResponse } from './collector_fetch';
 
 export function makeSampleDataUsageCollector(
diff --git a/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
index c37c55bf02535..54df964e4bdec 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { fetchProvider } from './collector_fetch';
 
 const getMockFetchClients = (hits?: unknown[]) => {
diff --git a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
index 3342912919a62..66e1a7099f7eb 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
@@ -8,8 +8,8 @@
 
 import { get } from 'lodash';
 import moment from 'moment';
-import { SearchResponse } from 'src/core/server';
-import { CollectorFetchContext } from '../../../../../usage_collection/server';
+import { SearchResponse } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 
 interface SearchHit {
   _id: string;
diff --git a/src/plugins/home/server/services/sample_data/usage/usage.ts b/src/plugins/home/server/services/sample_data/usage/usage.ts
index b491b58c426f5..58c9ebb6aec18 100644
--- a/src/plugins/home/server/services/sample_data/usage/usage.ts
+++ b/src/plugins/home/server/services/sample_data/usage/usage.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Logger, SavedObjectsServiceStart } from 'kibana/server';
+import { Logger, SavedObjectsServiceStart } from '@kbn/core/server';
 
 const SAVED_OBJECT_ID = 'sample-data-telemetry';
 
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 e4012c1ab2ef3..f0746764f4641 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
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import type { TutorialSchema } from './tutorial_schema';
 export { TutorialsCategory } from '../../../../common/constants';
 
diff --git a/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts b/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
index dec1d23e05787..537e6267d0293 100644
--- a/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
+++ b/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
@@ -8,9 +8,9 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import { TutorialsRegistry } from './tutorials_registry';
-import { coreMock } from '../../../../../core/server/mocks';
-import { CoreSetup } from '../../../../../core/server';
-import { httpServerMock } from '../../../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { CoreSetup } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   TutorialProvider,
@@ -18,8 +18,8 @@ import {
   TutorialsCategory,
   ScopedTutorialContextFactory,
 } from './lib/tutorials_registry_types';
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
-import { customIntegrationsMock } from '../../../../custom_integrations/server/mocks';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/server/mocks';
 
 const INVALID_TUTORIAL: TutorialSchema = {
   id: 'test',
diff --git a/src/plugins/home/server/services/tutorials/tutorials_registry.ts b/src/plugins/home/server/services/tutorials/tutorials_registry.ts
index 7d93a57b2073d..0ef800f63228b 100644
--- a/src/plugins/home/server/services/tutorials/tutorials_registry.ts
+++ b/src/plugins/home/server/services/tutorials/tutorials_registry.ts
@@ -6,7 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
 import {
   TutorialProvider,
   TutorialContextFactory,
@@ -15,8 +17,6 @@ import {
 } from './lib/tutorials_registry_types';
 import { TutorialSchema, tutorialSchema } from './lib/tutorial_schema';
 import { builtInTutorials } from '../../tutorials/register';
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
-import { IntegrationCategory } from '../../../../custom_integrations/common';
 import { HOME_APP_BASE_PATH } from '../../../common/constants';
 
 function registerTutorialWithCustomIntegrations(
diff --git a/src/plugins/input_control_vis/public/components/editor/control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
index cb0ea78d613b3..794c793b39673 100644
--- a/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
@@ -19,10 +19,10 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { RangeControlEditor } from './range_control_editor';
 import { ListControlEditor } from './list_control_editor';
 import { getTitle, ControlParams, CONTROL_TYPES, ControlParamsOptions } from '../../editor_utils';
-import { DataView } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 import './control_editor.scss';
diff --git a/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx b/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
index 2182843d30975..94284fef23cb8 100644
--- a/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
@@ -11,7 +11,7 @@ import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { getDepsMock, getIndexPatternMock } from '../../test_utils';
 import ControlsTab, { ControlsTabProps } from './controls_tab';
-import { Vis } from '../../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 const indexPatternsMock = {
   get: getIndexPatternMock,
diff --git a/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx b/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
index 0b000aa61f34e..ad32a1395f427 100644
--- a/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
@@ -19,8 +19,8 @@ import {
   EuiSelect,
 } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { DataView } from '../../../../data_views/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ControlEditor } from './control_editor';
 import {
   addControl,
diff --git a/src/plugins/input_control_vis/public/components/editor/field_select.tsx b/src/plugins/input_control_vis/public/components/editor/field_select.tsx
index 7cc818b71d795..841622c880757 100644
--- a/src/plugins/input_control_vis/public/components/editor/field_select.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/field_select.tsx
@@ -12,7 +12,7 @@ import React, { Component } from 'react';
 import { injectI18n, FormattedMessage, InjectedIntlProps } from '@kbn/i18n-react';
 import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { DataView, DataViewField } from '../../../../data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 interface FieldSelectUiState {
   isLoading: boolean;
diff --git a/src/plugins/input_control_vis/public/components/editor/index.tsx b/src/plugins/input_control_vis/public/components/editor/index.tsx
index f34bdcf7b63ec..d6100a018bf2f 100644
--- a/src/plugins/input_control_vis/public/components/editor/index.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { InputControlVisDependencies } from '../../plugin';
 import { InputControlVisParams } from '../../types';
 
diff --git a/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
index 57fb9cdce6d86..633b34902ff97 100644
--- a/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
@@ -9,7 +9,7 @@
 import React, { ComponentType } from 'react';
 import { injectI18n, InjectedIntlProps } from '@kbn/i18n-react';
 import { EuiFormRow } from '@elastic/eui';
-import { IndexPatternSelectProps } from '../../../../unified_search/public';
+import { IndexPatternSelectProps } from '@kbn/unified-search-plugin/public';
 
 export type IndexPatternSelectFormRowUiProps = InjectedIntlProps & {
   onChange: (opt: any) => void;
diff --git a/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
index 3a8dcccce6515..5bcb7ffcf09a3 100644
--- a/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
@@ -11,11 +11,11 @@ import React, { PureComponent, ComponentType } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFormRow, EuiFieldNumber, EuiSwitch, EuiSelect } from '@elastic/eui';
 
+import { IndexPatternSelectProps } from '@kbn/unified-search-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import { IndexPatternSelectProps } from '../../../../unified_search/public';
-import { DataView, DataViewField } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface ListControlEditorState {
diff --git a/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx b/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
index 45907fc08e1c2..a1285aeac5308 100644
--- a/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { Vis } from '../../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import OptionsTab, { OptionsTabProps } from './options_tab';
 
 describe('OptionsTab', () => {
diff --git a/src/plugins/input_control_vis/public/components/editor/options_tab.tsx b/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
index 17f07730bd1b7..850c92395be80 100644
--- a/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
@@ -12,7 +12,7 @@ import { EuiForm, EuiFormRow, EuiSwitch } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSwitchEvent } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { InputControlVisParams } from '../../types';
 
 export type OptionsTabProps = VisEditorOptionsProps<InputControlVisParams>;
diff --git a/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
index 32d1f9aef5549..a77d2f1c2f261 100644
--- a/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
@@ -11,11 +11,11 @@ import React, { Component, Fragment, ComponentType } from 'react';
 import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { IndexPatternSelectProps } from '@kbn/unified-search-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import { IndexPatternSelectProps } from '../../../../unified_search/public';
-import { DataView, DataViewField } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface RangeControlEditorProps {
diff --git a/src/plugins/input_control_vis/public/components/vis/range_control.tsx b/src/plugins/input_control_vis/public/components/vis/range_control.tsx
index fd0b81df7aeea..dd003a74369df 100644
--- a/src/plugins/input_control_vis/public/components/vis/range_control.tsx
+++ b/src/plugins/input_control_vis/public/components/vis/range_control.tsx
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 import React, { PureComponent } from 'react';
-import { ValidatedDualRange } from '../../../../kibana_react/public';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { FormRow } from './form_row';
 import { RangeControl as RangeControlClass } from '../../control/range_control_factory';
 
diff --git a/src/plugins/input_control_vis/public/control/create_search_source.ts b/src/plugins/input_control_vis/public/control/create_search_source.ts
index c9db1de9f7f22..847c5ba4500d4 100644
--- a/src/plugins/input_control_vis/public/control/create_search_source.ts
+++ b/src/plugins/input_control_vis/public/control/create_search_source.ts
@@ -11,9 +11,9 @@ import {
   SerializedSearchSourceFields,
   TimefilterContract,
   DataPublicPluginStart,
-} from 'src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export async function createSearchSource(
   { create }: DataPublicPluginStart['search']['searchSource'],
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
index 7759ba3b34607..f0b1b8d4344e6 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 
 import { FilterManager } from './filter_manager';
-import { coreMock } from '../../../../../core/public/mocks';
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
 import { Filter } from '@kbn/es-query';
 
 const setupMock = coreMock.createSetup();
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
index 420cb8fe844d7..376060a68cff9 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
@@ -9,8 +9,8 @@
 import { Filter } from '@kbn/es-query';
 import _ from 'lodash';
 
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
-import { DataView } from '../../../../data_views/public';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export abstract class FilterManager {
   protected indexPattern: DataView | undefined;
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
index 45e67ad742a64..cdec8be5e218c 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
@@ -9,8 +9,8 @@
 import { Filter } from '@kbn/es-query';
 import expect from '@kbn/expect';
 
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
-import { DataView } from '../../../../data_views/public';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { PhraseFilterManager } from './phrase_filter_manager';
 
 describe('PhraseFilterManager', function () {
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
index 0653d25f16d44..60d0947212611 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
@@ -17,8 +17,8 @@ import {
   isPhraseFilter,
   PhraseFilter,
 } from '@kbn/es-query';
+import { DataViewsContract, FilterManager as QueryFilterManager } from '@kbn/data-plugin/public';
 import { FilterManager } from './filter_manager';
-import { DataViewsContract, FilterManager as QueryFilterManager } from '../../../../data/public';
 
 export class PhraseFilterManager extends FilterManager {
   constructor(
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
index a329773720bc9..00084be816830 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 
 import { RangeFilterManager } from './range_filter_manager';
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
-import { DataView } from '../../../../data_views/public';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { RangeFilter, RangeFilterMeta } from '@kbn/es-query';
 
 describe('RangeFilterManager', function () {
diff --git a/src/plugins/input_control_vis/public/control/list_control_factory.ts b/src/plugins/input_control_vis/public/control/list_control_factory.ts
index f6bd0bc0cd28a..c44fba0b2cbb8 100644
--- a/src/plugins/input_control_vis/public/control/list_control_factory.ts
+++ b/src/plugins/input_control_vis/public/control/list_control_factory.ts
@@ -12,8 +12,8 @@ import {
   TimefilterContract,
   SerializedSearchSourceFields,
   DataPublicPluginStart,
-} from 'src/plugins/data/public';
-import { DataViewField } from '../../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
 import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
 import { createSearchSource } from './create_search_source';
diff --git a/src/plugins/input_control_vis/public/control/range_control_factory.ts b/src/plugins/input_control_vis/public/control/range_control_factory.ts
index 6cd477d28b4f6..41cc48049a5c9 100644
--- a/src/plugins/input_control_vis/public/control/range_control_factory.ts
+++ b/src/plugins/input_control_vis/public/control/range_control_factory.ts
@@ -9,8 +9,8 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import { TimefilterContract, DataPublicPluginStart } from 'src/plugins/data/public';
-import { DataViewField } from '../../../data_views/public';
+import { TimefilterContract, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
 import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { createSearchSource } from './create_search_source';
diff --git a/src/plugins/input_control_vis/public/index.ts b/src/plugins/input_control_vis/public/index.ts
index 9d024af3464f4..41f7e4a4afd31 100644
--- a/src/plugins/input_control_vis/public/index.ts
+++ b/src/plugins/input_control_vis/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { InputControlVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/input_control_vis/public/input_control_fn.test.ts b/src/plugins/input_control_vis/public/input_control_fn.test.ts
index a1137030f1ac8..13d0406fd53de 100644
--- a/src/plugins/input_control_vis/public/input_control_fn.test.ts
+++ b/src/plugins/input_control_vis/public/input_control_fn.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { createInputControlVisFn } from './input_control_fn';
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 
 describe('interpreter/functions#input_control_vis', () => {
   const fn = functionWrapper(createInputControlVisFn());
diff --git a/src/plugins/input_control_vis/public/input_control_fn.ts b/src/plugins/input_control_vis/public/input_control_fn.ts
index 6018543777e60..ae7a67f8fc0f5 100644
--- a/src/plugins/input_control_vis/public/input_control_fn.ts
+++ b/src/plugins/input_control_vis/public/input_control_fn.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../expressions/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
 import { InputControlVisParams } from './types';
 
 interface Arguments {
diff --git a/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx b/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx
index 81ff7a5aa47f1..5e9710c0c63a7 100644
--- a/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx
+++ b/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import { InputControlVisDependencies } from './plugin';
 import { InputControlRenderValue } from './input_control_fn';
 import type { InputControlVisControllerType } from './vis_controller';
diff --git a/src/plugins/input_control_vis/public/input_control_vis_type.ts b/src/plugins/input_control_vis/public/input_control_vis_type.ts
index 64d2a5c3571f1..c5eb5ad5d91fe 100644
--- a/src/plugins/input_control_vis/public/input_control_vis_type.ts
+++ b/src/plugins/input_control_vis/public/input_control_vis_type.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { VisGroups, VisTypeDefinition } from '../../visualizations/public';
+import { VisGroups, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { getControlsTab, OptionsTabLazy } from './components/editor';
 import { InputControlVisDependencies } from './plugin';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/input_control_vis/public/plugin.ts b/src/plugins/input_control_vis/public/plugin.ts
index 0f8f601d5edbc..f1f3cf609d728 100644
--- a/src/plugins/input_control_vis/public/plugin.ts
+++ b/src/plugins/input_control_vis/public/plugin.ts
@@ -6,12 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 
-import { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { VisualizationsSetup, VisualizationsStart } from '../../visualizations/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import {
+  UnifiedSearchPublicPluginStart,
+  UnifiedSearchPluginSetup,
+} from '@kbn/unified-search-plugin/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
 import { createInputControlVisFn } from './input_control_fn';
 import { getInputControlVisRenderer } from './input_control_vis_renderer';
 import { createInputControlVisTypeDefinition } from './input_control_vis_type';
@@ -26,6 +29,7 @@ export interface InputControlSettings {
 export interface InputControlVisDependencies {
   core: InputControlVisCoreSetup;
   data: DataPublicPluginSetup;
+  unifiedSearch: UnifiedSearchPluginSetup;
   getSettings: () => Promise<InputControlSettings>;
 }
 
@@ -34,6 +38,7 @@ export interface InputControlVisPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
   data: DataPublicPluginSetup;
+  unifiedSearch: UnifiedSearchPluginSetup;
 }
 
 /** @internal */
@@ -50,15 +55,16 @@ export class InputControlVisPlugin implements Plugin<void, void> {
 
   public setup(
     core: InputControlVisCoreSetup,
-    { expressions, visualizations, data }: InputControlVisPluginSetupDependencies
+    { expressions, visualizations, unifiedSearch, data }: InputControlVisPluginSetupDependencies
   ) {
     const visualizationDependencies: Readonly<InputControlVisDependencies> = {
       core,
-      data,
+      unifiedSearch,
       getSettings: async () => {
-        const { timeout, terminateAfter } = data.autocomplete.getAutocompleteSettings();
+        const { timeout, terminateAfter } = unifiedSearch.autocomplete.getAutocompleteSettings();
         return { autocompleteTimeout: timeout, autocompleteTerminateAfter: terminateAfter };
       },
+      data,
     };
 
     expressions.registerFunction(createInputControlVisFn);
diff --git a/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts b/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
index 40f01b05d18b2..0292cd759a0a1 100644
--- a/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
+++ b/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 /**
  * Returns forced **Partial** IndexPattern for use in tests
diff --git a/src/plugins/input_control_vis/public/to_ast.test.ts b/src/plugins/input_control_vis/public/to_ast.test.ts
index 7b8511c5bca90..bbe79f2e677b6 100644
--- a/src/plugins/input_control_vis/public/to_ast.test.ts
+++ b/src/plugins/input_control_vis/public/to_ast.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { InputControlVisParams } from './types';
 import { toExpressionAst } from './to_ast';
 
diff --git a/src/plugins/input_control_vis/public/to_ast.ts b/src/plugins/input_control_vis/public/to_ast.ts
index d70f0234bf7c3..ee6e783656ff8 100644
--- a/src/plugins/input_control_vis/public/to_ast.ts
+++ b/src/plugins/input_control_vis/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
-import { Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { InputControlExpressionFunctionDefinition } from './input_control_fn';
 import { InputControlVisParams } from './types';
 
diff --git a/src/plugins/input_control_vis/public/vis_controller.tsx b/src/plugins/input_control_vis/public/vis_controller.tsx
index 51c88962f3cb2..229a8741c2bfd 100644
--- a/src/plugins/input_control_vis/public/vis_controller.tsx
+++ b/src/plugins/input_control_vis/public/vis_controller.tsx
@@ -11,11 +11,11 @@ import { isEqual } from 'lodash';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Subscription } from 'rxjs';
 
-import { I18nStart } from 'kibana/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { I18nStart } from '@kbn/core/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { Filter } from '@kbn/es-query';
-import { VisualizationContainer } from '../../visualizations/public';
-import { FilterManager } from '../../data/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 
 import { InputControlVis } from './components/vis/input_control_vis';
 import { getControlFactory } from './control/control_factory';
diff --git a/src/plugins/inspector/public/index.ts b/src/plugins/inspector/public/index.ts
index 5ad7898550974..388f5f55e2c86 100644
--- a/src/plugins/inspector/public/index.ts
+++ b/src/plugins/inspector/public/index.ts
@@ -11,7 +11,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { InspectorPublicPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/inspector/public/mocks.ts b/src/plugins/inspector/public/mocks.ts
index 25f339825409b..bd2e6aa7e2b5f 100644
--- a/src/plugins/inspector/public/mocks.ts
+++ b/src/plugins/inspector/public/mocks.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 import { Setup as PluginSetup, Start as PluginStart } from '.';
 import { InspectorViewRegistry } from './view_registry';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/public/mocks';
-import type { SharePluginStart } from '../../share/public';
 
 export type Setup = jest.Mocked<PluginSetup>;
 export type Start = jest.Mocked<PluginStart>;
diff --git a/src/plugins/inspector/public/plugin.tsx b/src/plugins/inspector/public/plugin.tsx
index 14a141f7c2ec1..6842a271e9819 100644
--- a/src/plugins/inspector/public/plugin.tsx
+++ b/src/plugins/inspector/public/plugin.tsx
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import * as React from 'react';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { toMountPoint } from '../../kibana_react/public';
-import { SharePluginStart } from '../../share/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { InspectorViewRegistry } from './view_registry';
 import { InspectorOptions, InspectorSession } from './types';
 import { InspectorPanel } from './ui/inspector_panel';
diff --git a/src/plugins/inspector/public/types.ts b/src/plugins/inspector/public/types.ts
index cd83da7eb73af..040a283bc4972 100644
--- a/src/plugins/inspector/public/types.ts
+++ b/src/plugins/inspector/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { OverlayRef } from '../../../core/public';
+import { OverlayRef } from '@kbn/core/public';
 import { Adapters } from '../common';
 
 /**
diff --git a/src/plugins/inspector/public/ui/inspector_panel.test.tsx b/src/plugins/inspector/public/ui/inspector_panel.test.tsx
index 4466a293ca6b3..777611fb0e110 100644
--- a/src/plugins/inspector/public/ui/inspector_panel.test.tsx
+++ b/src/plugins/inspector/public/ui/inspector_panel.test.tsx
@@ -11,10 +11,10 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { InspectorPanel } from './inspector_panel';
 import { InspectorViewDescription } from '../types';
 import { Adapters } from '../../common';
-import type { ApplicationStart, HttpSetup, IUiSettingsClient } from 'kibana/public';
-import { SharePluginStart } from '../../../share/public';
-import { sharePluginMock } from '../../../share/public/mocks';
-import { applicationServiceMock } from '../../../../core/public/mocks';
+import type { ApplicationStart, HttpSetup, IUiSettingsClient } from '@kbn/core/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 
 describe('InspectorPanel', () => {
   let adapters: Adapters;
diff --git a/src/plugins/inspector/public/ui/inspector_panel.tsx b/src/plugins/inspector/public/ui/inspector_panel.tsx
index 3c6e3c079c8ec..4615d61b76652 100644
--- a/src/plugins/inspector/public/ui/inspector_panel.tsx
+++ b/src/plugins/inspector/public/ui/inspector_panel.tsx
@@ -18,12 +18,12 @@ import {
   EuiFlyoutBody,
   EuiLoadingSpinner,
 } from '@elastic/eui';
-import { ApplicationStart, HttpStart, IUiSettingsClient } from 'kibana/public';
+import { ApplicationStart, HttpStart, IUiSettingsClient } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { InspectorViewDescription } from '../types';
 import { Adapters } from '../../common';
 import { InspectorViewChooser } from './inspector_view_chooser';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { SharePluginStart } from '../../../share/public';
 
 function hasAdaptersChanged(oldAdapters: Adapters, newAdapters: Adapters) {
   return (
diff --git a/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx b/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx
index 216ccbe8d0c2c..df2b3d5c88b93 100644
--- a/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx
+++ b/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx
@@ -16,7 +16,7 @@ import { i18n } from '@kbn/i18n';
 import { XJsonLang } from '@kbn/monaco';
 import { compressToEncodedURIComponent } from 'lz-string';
 import React, { useCallback } from 'react';
-import { CodeEditor, useKibana } from '../../../../../../kibana_react/public';
+import { CodeEditor, useKibana } from '@kbn/kibana-react-plugin/public';
 import { InspectorPluginStartDeps } from '../../../../plugin';
 
 interface RequestCodeViewerProps {
diff --git a/src/plugins/interactive_setup/public/cluster_address_form.test.tsx b/src/plugins/interactive_setup/public/cluster_address_form.test.tsx
index 098012bd36310..51ca8dd830c3f 100644
--- a/src/plugins/interactive_setup/public/cluster_address_form.test.tsx
+++ b/src/plugins/interactive_setup/public/cluster_address_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { ClusterAddressForm } from './cluster_address_form';
 import { Providers } from './plugin';
diff --git a/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx b/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx
index 21c8d193fbec1..2e66d9b4f125e 100644
--- a/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx
+++ b/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { ClusterConfigurationForm } from './cluster_configuration_form';
 import { Providers } from './plugin';
diff --git a/src/plugins/interactive_setup/public/doc_link.tsx b/src/plugins/interactive_setup/public/doc_link.tsx
index d283dd08b7f7c..850e3ad4da5c4 100644
--- a/src/plugins/interactive_setup/public/doc_link.tsx
+++ b/src/plugins/interactive_setup/public/doc_link.tsx
@@ -11,7 +11,7 @@ import { EuiLink } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React, { useCallback } from 'react';
 
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 import { useKibana } from './use_kibana';
 
diff --git a/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx b/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx
index a344129aa8e5b..53f95ce62d7a7 100644
--- a/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx
+++ b/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import type { EnrollmentToken } from '../common';
 import { decodeEnrollmentToken, EnrollmentTokenForm } from './enrollment_token_form';
diff --git a/src/plugins/interactive_setup/public/plugin.tsx b/src/plugins/interactive_setup/public/plugin.tsx
index 2deba1ce5b1a2..aa688cd0e53b5 100644
--- a/src/plugins/interactive_setup/public/plugin.tsx
+++ b/src/plugins/interactive_setup/public/plugin.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import type { Observable } from 'rxjs';
 
+import type { CoreSetup, CoreStart, CoreTheme, Plugin } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { CoreSetup, CoreStart, CoreTheme, Plugin } from 'src/core/public';
 
 import { App } from './app';
 import { KibanaThemeProvider } from './theme'; // TODO: replace this with the one exported from `kibana_react` after https://github.com/elastic/kibana/issues/119204 is implemented.
diff --git a/src/plugins/interactive_setup/public/progress_indicator.tsx b/src/plugins/interactive_setup/public/progress_indicator.tsx
index 21bdcd2f78688..74bb10529d725 100644
--- a/src/plugins/interactive_setup/public/progress_indicator.tsx
+++ b/src/plugins/interactive_setup/public/progress_indicator.tsx
@@ -13,10 +13,10 @@ import React, { useEffect, useState } from 'react';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
 
+import type { IHttpFetchError } from '@kbn/core/public';
+import type { StatusResponse } from '@kbn/core/types/status';
 import { i18n } from '@kbn/i18n';
-import type { IHttpFetchError } from 'kibana/public';
 
-import type { StatusResponse } from '../../../core/types/status';
 import { useKibana } from './use_kibana';
 
 export interface ProgressIndicatorProps {
diff --git a/src/plugins/interactive_setup/public/submit_error_callout.tsx b/src/plugins/interactive_setup/public/submit_error_callout.tsx
index 7c4524dcfee96..8ccf5ae2a78f4 100644
--- a/src/plugins/interactive_setup/public/submit_error_callout.tsx
+++ b/src/plugins/interactive_setup/public/submit_error_callout.tsx
@@ -10,8 +10,8 @@ import { EuiButton, EuiCallOut } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React from 'react';
 
+import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
 
 import {
   ERROR_COMPATIBILITY_FAILURE,
diff --git a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx
index 5d1bc9798ee17..c261494dd78d0 100644
--- a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx
+++ b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx
@@ -13,8 +13,8 @@ import React, { useEffect } from 'react';
 import { act } from 'react-dom/test-utils';
 import { BehaviorSubject, of } from 'rxjs';
 
+import type { CoreTheme } from '@kbn/core/public';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { CoreTheme } from 'src/core/public';
 
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
diff --git a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx
index b1de6bd143049..238d8b8c930ab 100644
--- a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx
+++ b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx
@@ -12,7 +12,8 @@ import React, { useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
+
 import { getColorMode } from './utils';
 
 interface KibanaThemeProviderProps {
diff --git a/src/plugins/interactive_setup/public/theme/utils.ts b/src/plugins/interactive_setup/public/theme/utils.ts
index 052804073f226..19cbd19c81cfc 100644
--- a/src/plugins/interactive_setup/public/theme/utils.ts
+++ b/src/plugins/interactive_setup/public/theme/utils.ts
@@ -9,7 +9,7 @@
 import { COLOR_MODES_STANDARD } from '@elastic/eui';
 import type { EuiThemeColorModeStandard } from '@elastic/eui';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 /**
  * Copied from the `kibana_react` plugin, remove once https://github.com/elastic/kibana/issues/119204 is implemented.
diff --git a/src/plugins/interactive_setup/public/use_kibana.ts b/src/plugins/interactive_setup/public/use_kibana.ts
index 12b01e2eae70c..7ef58b0d480b4 100644
--- a/src/plugins/interactive_setup/public/use_kibana.ts
+++ b/src/plugins/interactive_setup/public/use_kibana.ts
@@ -8,7 +8,7 @@
 
 import constate from 'constate';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 export const [KibanaProvider, useKibana] = constate(({ services }: { services: CoreStart }) => {
   return services;
diff --git a/src/plugins/interactive_setup/public/verification_code_form.test.tsx b/src/plugins/interactive_setup/public/verification_code_form.test.tsx
index 4848a2838f9d9..efa5721c8d5b8 100644
--- a/src/plugins/interactive_setup/public/verification_code_form.test.tsx
+++ b/src/plugins/interactive_setup/public/verification_code_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { Providers } from './plugin';
 import { VerificationCodeForm } from './verification_code_form';
diff --git a/src/plugins/interactive_setup/public/verification_code_form.tsx b/src/plugins/interactive_setup/public/verification_code_form.tsx
index fce48293b702b..a61b11e464271 100644
--- a/src/plugins/interactive_setup/public/verification_code_form.tsx
+++ b/src/plugins/interactive_setup/public/verification_code_form.tsx
@@ -18,9 +18,9 @@ import {
 import type { FunctionComponent } from 'react';
 import React from 'react';
 
+import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
 
 import { VERIFICATION_CODE_LENGTH } from '../common';
 import { getCommandLineSnippet } from './get_command_line_snippet';
diff --git a/src/plugins/interactive_setup/server/compatibility_error.ts b/src/plugins/interactive_setup/server/compatibility_error.ts
index f739c93e52acf..85f34f2b2079f 100644
--- a/src/plugins/interactive_setup/server/compatibility_error.ts
+++ b/src/plugins/interactive_setup/server/compatibility_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { NodesVersionCompatibility } from 'src/core/server';
+import type { NodesVersionCompatibility } from '@kbn/core/server';
 
 export class CompatibilityError extends Error {
   constructor(private meta: NodesVersionCompatibility) {
diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.test.ts b/src/plugins/interactive_setup/server/elasticsearch_service.test.ts
index 63d95673cacb4..717c6bf56481a 100644
--- a/src/plugins/interactive_setup/server/elasticsearch_service.test.ts
+++ b/src/plugins/interactive_setup/server/elasticsearch_service.test.ts
@@ -10,11 +10,11 @@ import { errors } from '@elastic/elasticsearch';
 import { BehaviorSubject } from 'rxjs';
 import tls from 'tls';
 
+import { pollEsNodesVersion } from '@kbn/core/server';
+import type { NodesVersionCompatibility } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
 
-import { pollEsNodesVersion } from '../../../../src/core/server';
-import type { NodesVersionCompatibility } from '../../../../src/core/server';
 import { ElasticsearchConnectionStatus } from '../common';
 import { ConfigSchema } from './config';
 import type { ElasticsearchServiceSetup } from './elasticsearch_service';
@@ -22,7 +22,7 @@ import { ElasticsearchService } from './elasticsearch_service';
 import { interactiveSetupMock } from './mocks';
 
 jest.mock('tls');
-jest.mock('../../../../src/core/server', () => ({
+jest.mock('@kbn/core/server', () => ({
   pollEsNodesVersion: jest.fn(),
 }));
 
diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.ts b/src/plugins/interactive_setup/server/elasticsearch_service.ts
index 41183eb67f121..25c704a89024b 100644
--- a/src/plugins/interactive_setup/server/elasticsearch_service.ts
+++ b/src/plugins/interactive_setup/server/elasticsearch_service.ts
@@ -27,9 +27,9 @@ import type {
   ICustomClusterClient,
   Logger,
   ScopeableRequest,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { pollEsNodesVersion } from '@kbn/core/server';
 
-import { pollEsNodesVersion } from '../../../../src/core/server';
 import { ElasticsearchConnectionStatus } from '../common';
 import type { Certificate, PingResult } from '../common';
 import { CompatibilityError } from './compatibility_error';
diff --git a/src/plugins/interactive_setup/server/index.ts b/src/plugins/interactive_setup/server/index.ts
index 2f9a2cf3adec0..885a4f4afa544 100644
--- a/src/plugins/interactive_setup/server/index.ts
+++ b/src/plugins/interactive_setup/server/index.ts
@@ -11,7 +11,7 @@ import type {
   PluginConfigDescriptor,
   PluginInitializer,
   PluginInitializerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { InteractiveSetupPlugin } from './plugin';
diff --git a/src/plugins/interactive_setup/server/kibana_config_writer.test.ts b/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
index d097d7cc4a05d..1d17ce10d5e6d 100644
--- a/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
+++ b/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
@@ -10,7 +10,7 @@ jest.mock('fs/promises');
 jest.mock('crypto');
 import { constants } from 'fs';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { KibanaConfigWriter } from './kibana_config_writer';
 
diff --git a/src/plugins/interactive_setup/server/kibana_config_writer.ts b/src/plugins/interactive_setup/server/kibana_config_writer.ts
index eac1bd0cef175..94a5676840f9c 100644
--- a/src/plugins/interactive_setup/server/kibana_config_writer.ts
+++ b/src/plugins/interactive_setup/server/kibana_config_writer.ts
@@ -12,8 +12,8 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 import path from 'path';
 
+import type { Logger } from '@kbn/core/server';
 import { getFlattenedObject } from '@kbn/std';
-import type { Logger } from 'src/core/server';
 
 import { getDetailedErrorMessage } from './errors';
 
diff --git a/src/plugins/interactive_setup/server/plugin.ts b/src/plugins/interactive_setup/server/plugin.ts
index 86f0d29bc2884..ee09c2c71e752 100644
--- a/src/plugins/interactive_setup/server/plugin.ts
+++ b/src/plugins/interactive_setup/server/plugin.ts
@@ -10,8 +10,13 @@ import chalk from 'chalk';
 import type { Subscription } from 'rxjs';
 
 import type { TypeOf } from '@kbn/config-schema';
+import type {
+  CorePreboot,
+  Logger,
+  PluginInitializerContext,
+  PrebootPlugin,
+} from '@kbn/core/server';
 import { getDataPath } from '@kbn/utils';
-import type { CorePreboot, Logger, PluginInitializerContext, PrebootPlugin } from 'src/core/server';
 
 import { ElasticsearchConnectionStatus } from '../common';
 import type { ConfigSchema, ConfigType } from './config';
diff --git a/src/plugins/interactive_setup/server/routes/configure.test.ts b/src/plugins/interactive_setup/server/routes/configure.test.ts
index 575f53dfb434f..def3a8dcdb11a 100644
--- a/src/plugins/interactive_setup/server/routes/configure.test.ts
+++ b/src/plugins/interactive_setup/server/routes/configure.test.ts
@@ -9,9 +9,9 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   ElasticsearchConnectionStatus,
diff --git a/src/plugins/interactive_setup/server/routes/enroll.test.ts b/src/plugins/interactive_setup/server/routes/enroll.test.ts
index eddc06860deaf..a803792cfa9eb 100644
--- a/src/plugins/interactive_setup/server/routes/enroll.test.ts
+++ b/src/plugins/interactive_setup/server/routes/enroll.test.ts
@@ -9,9 +9,9 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   ElasticsearchConnectionStatus,
diff --git a/src/plugins/interactive_setup/server/routes/enroll.ts b/src/plugins/interactive_setup/server/routes/enroll.ts
index 4c204aac51c90..162cb623e4ddb 100644
--- a/src/plugins/interactive_setup/server/routes/enroll.ts
+++ b/src/plugins/interactive_setup/server/routes/enroll.ts
@@ -10,6 +10,7 @@ import { first } from 'rxjs/operators';
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '.';
 import {
   ElasticsearchConnectionStatus,
   ERROR_COMPATIBILITY_FAILURE,
@@ -23,7 +24,6 @@ import { CompatibilityError } from '../compatibility_error';
 import { ElasticsearchService } from '../elasticsearch_service';
 import type { EnrollResult } from '../elasticsearch_service';
 import type { WriteConfigParameters } from '../kibana_config_writer';
-import type { RouteDefinitionParams } from './';
 
 /**
  * Defines routes to deal with Elasticsearch `enroll_kibana` APIs.
diff --git a/src/plugins/interactive_setup/server/routes/index.mock.ts b/src/plugins/interactive_setup/server/routes/index.mock.ts
index 15ec86031b6f2..b4d9823831e7d 100644
--- a/src/plugins/interactive_setup/server/routes/index.mock.ts
+++ b/src/plugins/interactive_setup/server/routes/index.mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock, httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { coreMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { ConfigSchema } from '../config';
 import { elasticsearchServiceMock } from '../elasticsearch_service.mock';
diff --git a/src/plugins/interactive_setup/server/routes/index.ts b/src/plugins/interactive_setup/server/routes/index.ts
index f1f6b34fb689c..804bc9bddbc91 100644
--- a/src/plugins/interactive_setup/server/routes/index.ts
+++ b/src/plugins/interactive_setup/server/routes/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { IBasePath, IRouter, Logger, PrebootServicePreboot } from '@kbn/core/server';
 import type { PublicContract, PublicMethodsOf } from '@kbn/utility-types';
-import type { IBasePath, IRouter, Logger, PrebootServicePreboot } from 'src/core/server';
 
 import type { ConfigType } from '../config';
 import type { ElasticsearchServiceSetup } from '../elasticsearch_service';
diff --git a/src/plugins/interactive_setup/server/routes/ping.test.ts b/src/plugins/interactive_setup/server/routes/ping.test.ts
index ffa98071129d2..4e98fc841fc57 100644
--- a/src/plugins/interactive_setup/server/routes/ping.test.ts
+++ b/src/plugins/interactive_setup/server/routes/ping.test.ts
@@ -9,9 +9,9 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { ERROR_OUTSIDE_PREBOOT_STAGE, ERROR_PING_FAILURE } from '../../common';
 import { interactiveSetupMock } from '../mocks';
diff --git a/src/plugins/interactive_setup/server/routes/status.test.ts b/src/plugins/interactive_setup/server/routes/status.test.ts
index b40c765a8a53a..dd4f0db7a64d0 100644
--- a/src/plugins/interactive_setup/server/routes/status.test.ts
+++ b/src/plugins/interactive_setup/server/routes/status.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter, RequestHandler, RequestHandlerContext } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from './index.mock';
 import { defineStatusRoute } from './status';
diff --git a/src/plugins/interactive_setup/server/routes/verify.test.ts b/src/plugins/interactive_setup/server/routes/verify.test.ts
index 05858dce0f710..bedbc0cf418aa 100644
--- a/src/plugins/interactive_setup/server/routes/verify.test.ts
+++ b/src/plugins/interactive_setup/server/routes/verify.test.ts
@@ -7,9 +7,9 @@
  */
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from './index.mock';
 import { defineVerifyRoute } from './verify';
diff --git a/src/plugins/interactive_setup/server/verification_code.test.ts b/src/plugins/interactive_setup/server/verification_code.test.ts
index 7387f285a2f62..ec9aa48ab2b97 100644
--- a/src/plugins/interactive_setup/server/verification_code.test.ts
+++ b/src/plugins/interactive_setup/server/verification_code.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { VERIFICATION_CODE_LENGTH } from '../common';
 import { VerificationCode } from './verification_code';
diff --git a/src/plugins/interactive_setup/server/verification_code.ts b/src/plugins/interactive_setup/server/verification_code.ts
index 849ece5f4e0b0..4e737a865e850 100644
--- a/src/plugins/interactive_setup/server/verification_code.ts
+++ b/src/plugins/interactive_setup/server/verification_code.ts
@@ -9,7 +9,7 @@
 import chalk from 'chalk';
 import crypto from 'crypto';
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 import { VERIFICATION_CODE_LENGTH } from '../common';
 
diff --git a/src/plugins/interactive_setup/server/verification_service.test.ts b/src/plugins/interactive_setup/server/verification_service.test.ts
index 1721362d1c635..b16d230c27419 100644
--- a/src/plugins/interactive_setup/server/verification_service.test.ts
+++ b/src/plugins/interactive_setup/server/verification_service.test.ts
@@ -8,7 +8,7 @@
 
 import fs from 'fs';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { VerificationCode } from './verification_code';
 import { VerificationService } from './verification_service';
diff --git a/src/plugins/interactive_setup/server/verification_service.ts b/src/plugins/interactive_setup/server/verification_service.ts
index b158b23bd3b6d..a361225d6c32b 100644
--- a/src/plugins/interactive_setup/server/verification_service.ts
+++ b/src/plugins/interactive_setup/server/verification_service.ts
@@ -9,8 +9,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import type { Logger } from '@kbn/core/server';
 import { getDataPath } from '@kbn/utils';
-import type { Logger } from 'src/core/server';
 
 import { getDetailedErrorMessage } from './errors';
 import { VerificationCode } from './verification_code';
diff --git a/src/plugins/kibana_overview/public/application.tsx b/src/plugins/kibana_overview/public/application.tsx
index 4c0608d1b62ea..adfd53c04ef48 100644
--- a/src/plugins/kibana_overview/public/application.tsx
+++ b/src/plugins/kibana_overview/public/application.tsx
@@ -10,12 +10,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
-import { NewsfeedApiEndpoint } from '../../../../src/plugins/newsfeed/public';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { NewsfeedApiEndpoint } from '@kbn/newsfeed-plugin/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { AppPluginStartDependencies } from './types';
 import { KibanaOverviewApp } from './components/app';
 
diff --git a/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx b/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx
index ed091ff96c5f2..b5a8b93a8128a 100644
--- a/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx
+++ b/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx
@@ -9,11 +9,10 @@
 import React from 'react';
 import { AddData } from './add_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
 
 const mockFeatures = [
   {
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as const,
     description: 'Ingest data from popular apps and services.',
     showOnHomePage: true,
     icon: 'indexOpen',
@@ -23,7 +22,7 @@ const mockFeatures = [
     title: 'Ingest data',
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Add and manage your fleet of Elastic Agents and integrations.',
     showOnHomePage: true,
     icon: 'indexManagementApp',
@@ -33,7 +32,7 @@ const mockFeatures = [
     title: 'Add Elastic Agent',
   },
   {
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as const,
     description: 'Import your own CSV, NDJSON, or log file',
     showOnHomePage: true,
     icon: 'document',
diff --git a/src/plugins/kibana_overview/public/components/add_data/add_data.tsx b/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
index 1be7cd133bca2..172fd7864a0b9 100644
--- a/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
+++ b/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
@@ -10,12 +10,9 @@ import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
-import { RedirectAppLinks, useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import {
-  FeatureCatalogueEntry,
-  FeatureCatalogueCategory,
-} from '../../../../../../src/plugins/home/public';
+import { CoreStart } from '@kbn/core/public';
+import { RedirectAppLinks, useKibana } from '@kbn/kibana-react-plugin/public';
+import { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
 // @ts-expect-error untyped component
 import { Synopsis } from '../synopsis';
 import { METRIC_TYPE, trackUiMetric } from '../../lib/ui_metric';
@@ -97,7 +94,7 @@ AddData.propTypes = {
       icon: PropTypes.string.isRequired,
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
-      category: PropTypes.oneOf(Object.values(FeatureCatalogueCategory)).isRequired,
+      category: PropTypes.string.isRequired,
       order: PropTypes.number as PropTypes.Validator<number | undefined>,
     }).isRequired
   ).isRequired,
diff --git a/src/plugins/kibana_overview/public/components/app.tsx b/src/plugins/kibana_overview/public/components/app.tsx
index ce1ebde281c8c..90e7051882cfd 100644
--- a/src/plugins/kibana_overview/public/components/app.tsx
+++ b/src/plugins/kibana_overview/public/components/app.tsx
@@ -10,10 +10,10 @@ import React, { useEffect, useState } from 'react';
 import { Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
-import { CoreStart } from 'src/core/public';
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { FetchResult } from 'src/plugins/newsfeed/public';
-import { FeatureCatalogueEntry, FeatureCatalogueSolution } from 'src/plugins/home/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { FetchResult } from '@kbn/newsfeed-plugin/public';
+import { FeatureCatalogueEntry, FeatureCatalogueSolution } from '@kbn/home-plugin/public';
 import { Overview } from './overview';
 
 interface KibanaOverviewAppDeps {
diff --git a/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx b/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx
index f5e72a3e0a867..44a5cafe0f3c1 100644
--- a/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx
+++ b/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx
@@ -9,11 +9,10 @@
 import React from 'react';
 import { ManageData } from './manage_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
 
 const mockFeatures = [
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Control who has access and what tasks they can perform.',
     icon: 'securityApp',
     id: 'security',
@@ -23,7 +22,7 @@ const mockFeatures = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Track the real-time health and performance of your deployment.',
     icon: 'monitoringApp',
     id: 'monitoring',
@@ -33,7 +32,7 @@ const mockFeatures = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description:
       'Save snapshots to a backup repository, and restore to recover index and cluster state.',
     icon: 'storage',
@@ -44,7 +43,7 @@ const mockFeatures = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Define lifecycle policies to automatically perform operations as an index ages.',
     icon: 'indexSettings',
     id: 'index_lifecycle_management',
diff --git a/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx b/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx
index 85f354d8a81cb..376af562221c7 100644
--- a/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx
+++ b/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx
@@ -10,12 +10,9 @@ import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
-import { RedirectAppLinks, useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import {
-  FeatureCatalogueEntry,
-  FeatureCatalogueCategory,
-} from '../../../../../../src/plugins/home/public';
+import { CoreStart } from '@kbn/core/public';
+import { RedirectAppLinks, useKibana } from '@kbn/kibana-react-plugin/public';
+import { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
 // @ts-expect-error untyped component
 import { Synopsis } from '../synopsis';
 import { METRIC_TYPE, trackUiMetric } from '../../lib/ui_metric';
@@ -84,7 +81,7 @@ ManageData.propTypes = {
       icon: PropTypes.string.isRequired,
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
-      category: PropTypes.oneOf(Object.values(FeatureCatalogueCategory)).isRequired,
+      category: PropTypes.string.isRequired,
       order: PropTypes.number as PropTypes.Validator<number | undefined>,
     }).isRequired
   ).isRequired,
diff --git a/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx b/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx
index 1960249086629..354d99e64c6be 100644
--- a/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx
+++ b/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx
@@ -9,7 +9,7 @@
 import React, { FC } from 'react';
 import { EuiLink, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { FetchResult } from 'src/plugins/newsfeed/public';
+import { FetchResult } from '@kbn/newsfeed-plugin/public';
 
 interface Props {
   newsFetchResult: FetchResult;
diff --git a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
index 1a52bf05b9238..37bb37a21c201 100644
--- a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
@@ -682,6 +682,7 @@ exports[`Overview when there is no user data view 1`] = `
       Object {
         "actions": Object {
           "elasticAgent": Object {
+            "data-test-subj": "kbnOverviewAddIntegrations",
             "description": "Use Elastic Agent or Beats to collect data and build out Analytics solutions.",
             "title": "Add integrations",
           },
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts b/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts
index 7f1e7f7d7ac52..4c58de5cdd245 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts
+++ b/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts
@@ -10,7 +10,7 @@ import React from 'react';
 
 export const hasUserDataViewMock = jest.fn();
 
-jest.doMock('../../../../../../src/plugins/kibana_react/public', () => ({
+jest.doMock('@kbn/kibana-react-plugin/public', () => ({
   useKibana: jest.fn().mockReturnValue({
     services: {
       http: { basePath: { prepend: jest.fn((path: string) => (path ? path : 'path')) } },
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
index 85aee7411d7ad..3682629bf64d7 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
@@ -14,8 +14,7 @@ import { act } from 'react-dom/test-utils';
 import { ReactWrapper } from 'enzyme';
 import { Overview } from './overview';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
-
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 const mockNewsFetchResult = {
   error: null,
   feedItems: [
@@ -103,7 +102,7 @@ const mockFeatures = [
     icon: 'dashboardApp',
     path: 'dashboard_landing_page',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as FeatureCatalogueCategory,
   },
   {
     id: 'discover',
@@ -112,7 +111,7 @@ const mockFeatures = [
     icon: 'discoverApp',
     path: 'discover_landing_page',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as FeatureCatalogueCategory,
   },
   {
     id: 'canvas',
@@ -121,7 +120,7 @@ const mockFeatures = [
     icon: 'canvasApp',
     path: 'canvas_landing_page',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as FeatureCatalogueCategory,
   },
 ];
 
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx
index b387715710ce4..5859ea2e8a58b 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx
@@ -19,7 +19,7 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import {
   RedirectAppLinks,
@@ -29,13 +29,13 @@ import {
   KibanaPageTemplateProps,
   overviewPageActions,
   OverviewPageFooter,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { FetchResult } from '../../../../../../src/plugins/newsfeed/public';
+} from '@kbn/kibana-react-plugin/public';
+import { FetchResult } from '@kbn/newsfeed-plugin/public';
 import {
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
   FeatureCatalogueCategory,
-} from '../../../../../../src/plugins/home/public';
+} from '@kbn/home-plugin/public';
 import { PLUGIN_ID, PLUGIN_PATH } from '../../../common';
 import { AppPluginStartDependencies } from '../../types';
 import { AddData } from '../add_data';
@@ -68,7 +68,7 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
     .get('MANAGEMENT_APP_LOCATOR')
     ?.useUrl({ sectionId: '' });
 
-  const getFeaturesByCategory = (category: string) =>
+  const getFeaturesByCategory = (category: FeatureCatalogueCategory) =>
     features
       .filter((feature) => feature.showOnHomePage && feature.category === category)
       .sort(sortByOrder);
@@ -78,8 +78,8 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
 
   const findFeatureById = (featureId: string) => features.find(({ id }) => id === featureId);
   const kibanaApps = features.filter(({ solutionId }) => solutionId === 'kibana').sort(sortByOrder);
-  const addDataFeatures = getFeaturesByCategory(FeatureCatalogueCategory.DATA);
-  const manageDataFeatures = getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
+  const addDataFeatures = getFeaturesByCategory('data');
+  const manageDataFeatures = getFeaturesByCategory('admin');
   const devTools = findFeatureById('console');
   const noDataConfig: KibanaPageTemplateProps['noDataConfig'] = {
     solution: i18n.translate('kibanaOverview.noDataConfig.solutionName', {
@@ -98,6 +98,7 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
           defaultMessage:
             'Use Elastic Agent or Beats to collect data and build out Analytics solutions.',
         }),
+        'data-test-subj': 'kbnOverviewAddIntegrations',
       },
     },
     docsLink: docLinks.links.kibana.guide,
diff --git a/src/plugins/kibana_overview/public/lib/ui_metric.ts b/src/plugins/kibana_overview/public/lib/ui_metric.ts
index 9b19d485cf664..cf7af82f4cee8 100644
--- a/src/plugins/kibana_overview/public/lib/ui_metric.ts
+++ b/src/plugins/kibana_overview/public/lib/ui_metric.ts
@@ -7,7 +7,7 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export { METRIC_TYPE };
 
diff --git a/src/plugins/kibana_overview/public/plugin.ts b/src/plugins/kibana_overview/public/plugin.ts
index 2b0340fc7fe55..e5b33ed1544f2 100644
--- a/src/plugins/kibana_overview/public/plugin.ts
+++ b/src/plugins/kibana_overview/public/plugin.ts
@@ -17,7 +17,7 @@ import {
   DEFAULT_APP_CATEGORIES,
   AppStatus,
   AppNavLinkStatus,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import {
   KibanaOverviewPluginSetup,
   KibanaOverviewPluginStart,
diff --git a/src/plugins/kibana_overview/public/types.ts b/src/plugins/kibana_overview/public/types.ts
index 43c9746a6abbe..7698b944bfc2f 100644
--- a/src/plugins/kibana_overview/public/types.ts
+++ b/src/plugins/kibana_overview/public/types.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { HomePublicPluginSetup, HomePublicPluginStart } from 'src/plugins/home/public';
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import { NewsfeedPublicPluginStart } from 'src/plugins/newsfeed/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { SharePluginStart } from '../../share/public';
+import { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { NewsfeedPublicPluginStart } from '@kbn/newsfeed-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface KibanaOverviewPluginSetup {}
diff --git a/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts b/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
index 038e39a0060f1..40757d9b794aa 100644
--- a/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
+++ b/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
@@ -8,7 +8,7 @@
 
 import { ComponentType, createElement as h } from 'react';
 import { render as renderReact, unmountComponentAtNode } from 'react-dom';
-import { UiComponent, UiComponentInstance } from '../../../kibana_utils/public';
+import { UiComponent, UiComponentInstance } from '@kbn/kibana-utils-plugin/public';
 
 /**
  * Transform a React component into a `UiComponent`.
diff --git a/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx b/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
index 0a435f89bff37..27f1938c6ae7f 100644
--- a/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
+++ b/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
@@ -8,7 +8,7 @@
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { UiComponent } from '../../../kibana_utils/public';
+import { UiComponent } from '@kbn/kibana-utils-plugin/public';
 import { uiToReactComponent } from './ui_to_react_component';
 import { reactToUiComponent } from './react_to_ui_component';
 
diff --git a/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts b/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
index c85366e4bc4f7..1f8a5c6c46501 100644
--- a/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
+++ b/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
@@ -7,7 +7,7 @@
  */
 
 import { FC, createElement as h, useRef, useLayoutEffect, useMemo } from 'react';
-import { UiComponent, UiComponentInstance } from '../../../kibana_utils/public';
+import { UiComponent, UiComponentInstance } from '@kbn/kibana-utils-plugin/public';
 
 /**
  * Transforms `UiComponent` into a React component.
diff --git a/src/plugins/kibana_react/public/app_links/click_handler.test.ts b/src/plugins/kibana_react/public/app_links/click_handler.test.ts
index 1569203c394df..868e3d91d1218 100644
--- a/src/plugins/kibana_react/public/app_links/click_handler.test.ts
+++ b/src/plugins/kibana_react/public/app_links/click_handler.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { MouseEvent } from 'react';
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createNavigateToUrlClickHandler } from './click_handler';
 
 const createLink = ({
diff --git a/src/plugins/kibana_react/public/app_links/click_handler.ts b/src/plugins/kibana_react/public/app_links/click_handler.ts
index dc55c9f508471..05ef24009d612 100644
--- a/src/plugins/kibana_react/public/app_links/click_handler.ts
+++ b/src/plugins/kibana_react/public/app_links/click_handler.ts
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { getClosestLink, hasActiveModifierKey } from './utils';
 
 interface CreateCrossAppClickHandlerOptions {
diff --git a/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx b/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx
index 6c87306221988..133cab06e6b6f 100644
--- a/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx
+++ b/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { MouseEvent } from 'react';
 import { mount } from 'enzyme';
-import { applicationServiceMock } from '../../../../core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 /** @deprecated Use `RedirectAppLinks` from `@kbn/shared-ux-components */
 import { RedirectAppLinks } from './redirect_app_link';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx b/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx
index 757239278921f..339055c3e1da5 100644
--- a/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx
+++ b/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx
@@ -9,7 +9,7 @@
 import React, { FunctionComponent, useRef, useMemo } from 'react';
 import classNames from 'classnames';
 import useObservable from 'react-use/lib/useObservable';
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createNavigateToUrlClickHandler } from './click_handler';
 
 interface RedirectCrossAppLinksProps extends React.HTMLAttributes<HTMLDivElement> {
diff --git a/src/plugins/kibana_react/public/context/context.test.tsx b/src/plugins/kibana_react/public/context/context.test.tsx
index a806f3eb66f75..46a5914eece9d 100644
--- a/src/plugins/kibana_react/public/context/context.test.tsx
+++ b/src/plugins/kibana_react/public/context/context.test.tsx
@@ -9,8 +9,8 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { context, createKibanaReactContext, useKibana, KibanaContextProvider } from './context';
-import { coreMock, overlayServiceMock } from '../../../../core/public/mocks';
-import { CoreStart } from '../../../../core/public';
+import { coreMock, overlayServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
 
 let container: HTMLDivElement | null;
 
diff --git a/src/plugins/kibana_react/public/context/types.ts b/src/plugins/kibana_react/public/context/types.ts
index 486a587dfe499..4962267974d79 100644
--- a/src/plugins/kibana_react/public/context/types.ts
+++ b/src/plugins/kibana_react/public/context/types.ts
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { CoreStart } from '../../../../core/public';
+import { CoreStart } from '@kbn/core/public';
 import { KibanaReactOverlays } from '../overlays';
 import { KibanaReactNotifications } from '../notifications';
 
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
index f62ac1c280aa6..6b45111df836e 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { ExitFullScreenButton } from './exit_full_screen_button';
 import { keys } from '@elastic/eui';
-import type { ChromeStart } from '../../../../core/public';
+import type { ChromeStart } from '@kbn/core/public';
 
 const MockChrome = {
   setIsVisible: jest.fn(),
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
index 5c559a8f9e06a..33871742acbb3 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import React, { PureComponent } from 'react';
 import { EuiScreenReaderOnly, keys } from '@elastic/eui';
 import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
-import type { ChromeStart } from '../../../../core/public';
+import type { ChromeStart } from '@kbn/core/public';
 
 export interface ExitFullScreenButtonProps {
   onExitFullScreenMode: () => void;
diff --git a/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx b/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx
index f5ac538207107..518849569a46a 100644
--- a/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx
+++ b/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { createNotifications } from './create_notifications';
 // eslint-disable-next-lien
-import { notificationServiceMock } from '../../../../core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 
 test('throws if no overlays service provided', () => {
   const notifications = createNotifications({});
diff --git a/src/plugins/kibana_react/public/notifications/types.ts b/src/plugins/kibana_react/public/notifications/types.ts
index 43061df0e0510..5b07ba16dda24 100644
--- a/src/plugins/kibana_react/public/notifications/types.ts
+++ b/src/plugins/kibana_react/public/notifications/types.ts
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { Toast } from '../../../../core/public';
+import { Toast } from '@kbn/core/public';
 
 export interface ToastInput {
   title?: React.ReactNode;
diff --git a/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx b/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx
index f7e4ef997c6f9..85be2c2a50514 100644
--- a/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx
+++ b/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx
@@ -8,7 +8,7 @@
 
 import * as React from 'react';
 import { createReactOverlays } from './create_react_overlays';
-import { overlayServiceMock } from '../../../../core/public/mocks';
+import { overlayServiceMock } from '@kbn/core/public/mocks';
 
 test('throws if no overlays service provided', () => {
   const overlays = createReactOverlays({});
diff --git a/src/plugins/kibana_react/public/overlays/types.ts b/src/plugins/kibana_react/public/overlays/types.ts
index 725f8784c0cf4..f81be56a272ac 100644
--- a/src/plugins/kibana_react/public/overlays/types.ts
+++ b/src/plugins/kibana_react/public/overlays/types.ts
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { CoreStart } from '../../../../core/public';
+import { CoreStart } from '@kbn/core/public';
 
 export interface KibanaReactOverlays {
   openFlyout: (
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
index 389cccd08da8e..cb5d60fd330fd 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import { overviewPageActions } from './overview_page_actions';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 jest.mock('../../app_links', () => ({
   RedirectAppLinks: jest.fn((element: JSX.Element) => element),
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
index 5d61cc3e96bd0..9101224f60e13 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { RedirectAppLinks } from '../../app_links';
 
 interface Props {
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
index cf2397b9693e9..b7a93dd33a0be 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
@@ -10,7 +10,7 @@ import React, { FC, MouseEvent } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { RedirectAppLinks } from '../../app_links';
 import { useKibana } from '../../context';
 import { useUiSetting$ } from '../../ui_settings';
diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
index 19a197e8badd7..2cec3045c31c1 100644
--- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
+++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
@@ -8,7 +8,7 @@
 
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { EuiButton, EuiCard, EuiTextColor, EuiScreenReaderOnly } from '@elastic/eui';
 import { useKibana } from '../../../context';
 import { NoDataPageActions, NO_DATA_RECOMMENDED } from '../no_data_page';
diff --git a/src/plugins/kibana_react/public/page_template/page_template.tsx b/src/plugins/kibana_react/public/page_template/page_template.tsx
index 77469b240a19d..bd5213c9a2608 100644
--- a/src/plugins/kibana_react/public/page_template/page_template.tsx
+++ b/src/plugins/kibana_react/public/page_template/page_template.tsx
@@ -21,6 +21,7 @@ import { KibanaPageTemplateInner, KibanaPageTemplateWithSolutionNav } from './pa
 
 /**
  * A thin wrapper around EuiPageTemplate with a few Kibana specific additions
+ * @deprecated Use `KibanaPageTemplateProps` from `kbn-shared-ux-components`.
  */
 export type KibanaPageTemplateProps = EuiPageTemplateProps & {
   /**
@@ -41,6 +42,7 @@ export type KibanaPageTemplateProps = EuiPageTemplateProps & {
   noDataConfig?: NoDataPageProps;
 };
 
+/** @deprecated Use `KibanaPageTemplate` from `kbn-shared-ux-components`. */
 export const KibanaPageTemplate: FunctionComponent<KibanaPageTemplateProps> = ({
   template,
   className,
diff --git a/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx b/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
index bad8baee55fd3..c4fa5363461ba 100644
--- a/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
+++ b/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
@@ -10,11 +10,8 @@ import React, { ComponentType, useState } from 'react';
 import classNames from 'classnames';
 import { useIsWithinBreakpoints } from '@elastic/eui';
 import { EuiPageSideBarProps } from '@elastic/eui/src/components/page/page_side_bar';
-import {
-  KibanaPageTemplateSolutionNav,
-  KibanaPageTemplateSolutionNavProps,
-} from '../page_template/solution_nav';
-import { KibanaPageTemplateProps } from '../page_template';
+import { KibanaPageTemplateSolutionNav, KibanaPageTemplateSolutionNavProps } from './solution_nav';
+import { KibanaPageTemplateProps } from '.';
 
 // https://reactjs.org/docs/higher-order-components.html#convention-wrap-the-display-name-for-easy-debugging
 function getDisplayName(Component: ComponentType<any>) {
diff --git a/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx b/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx
index 5abd77c9dc9b6..e65767abaf8ae 100644
--- a/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx
+++ b/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { MouseEvent } from 'react';
 import { History, parsePath } from 'history';
 
diff --git a/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx b/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx
index 72c54a1110637..13423047bc3f0 100644
--- a/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx
+++ b/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx
@@ -8,9 +8,9 @@
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { ToastsStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
 import React from 'react';
-import { themeServiceMock, applicationServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock, applicationServiceMock } from '@kbn/core/public/mocks';
 import { TableListView } from './table_list_view';
 
 const requiredProps = {
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 55e822e68f489..ece2fa37cc832 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
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ThemeServiceStart, HttpFetchError, ToastsStart, ApplicationStart } from 'kibana/public';
+import { ThemeServiceStart, HttpFetchError, ToastsStart, ApplicationStart } from '@kbn/core/public';
 import { debounce, keyBy, sortBy, uniq } from 'lodash';
 import React from 'react';
 import { KibanaPageTemplate } from '../page_template';
diff --git a/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx b/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx
index 10c1f32e6ec26..890a36960b341 100644
--- a/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx
+++ b/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx
@@ -13,7 +13,7 @@ import { of, BehaviorSubject } from 'rxjs';
 import { useEuiTheme } from '@elastic/eui';
 import type { UseEuiTheme } from '@elastic/eui';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { CoreTheme } from 'src/core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
 describe('KibanaThemeProvider', () => {
diff --git a/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx b/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx
index 56ca7642f1cde..f5afe687f29c0 100644
--- a/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx
+++ b/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx
@@ -10,7 +10,7 @@ import React, { FC, useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { Observable } from 'rxjs';
 import { EuiThemeProvider } from '@elastic/eui';
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { getColorMode } from './utils';
 
 interface KibanaThemeProviderProps {
diff --git a/src/plugins/kibana_react/public/theme/utils.ts b/src/plugins/kibana_react/public/theme/utils.ts
index fe8092949d431..fc397396e5625 100644
--- a/src/plugins/kibana_react/public/theme/utils.ts
+++ b/src/plugins/kibana_react/public/theme/utils.ts
@@ -8,7 +8,7 @@
 
 import { COLOR_MODES_STANDARD } from '@elastic/eui';
 import type { EuiThemeColorModeStandard } from '@elastic/eui';
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 /* IMPORTANT: This code has been copied to the `interactive_setup` plugin, any changes here should be applied there too.
 That copy and this comment can be removed once https://github.com/elastic/kibana/issues/119204 is implemented.*/
diff --git a/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx b/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx
index b07b93653c3e5..dca0108d79223 100644
--- a/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx
+++ b/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { Observable } from 'rxjs';
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
 export const wrapWithTheme = (
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 44dea2aa420a7..466af1ad18324 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
@@ -13,7 +13,7 @@ import { useUiSetting$ } from './use_ui_setting';
 import { createKibanaReactContext } from '../context';
 import { KibanaServices } from '../context/types';
 import { Subject } from 'rxjs';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import useObservable from 'react-use/lib/useObservable';
 
 jest.mock('react-use/lib/useObservable');
diff --git a/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts b/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts
index e2c538056153c..9614176bb262e 100644
--- a/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts
+++ b/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaExecutionContext, CoreStart } from 'kibana/public';
+import type { KibanaExecutionContext, CoreStart } from '@kbn/core/public';
 import useDeepCompareEffect from 'react-use/lib/useDeepCompareEffect';
 
 /**
diff --git a/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx b/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
index 39e345568a298..c7200a934f5a6 100644
--- a/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
+++ b/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
-import { MountPoint, UnmountCallback } from 'kibana/public';
+import { MountPoint, UnmountCallback } from '@kbn/core/public';
 import { MountPointPortal } from './mount_point_portal';
 import { act } from 'react-dom/test-utils';
 
diff --git a/src/plugins/kibana_react/public/util/mount_point_portal.tsx b/src/plugins/kibana_react/public/util/mount_point_portal.tsx
index d0753c68d1f2d..e449d5ebf7cd6 100644
--- a/src/plugins/kibana_react/public/util/mount_point_portal.tsx
+++ b/src/plugins/kibana_react/public/util/mount_point_portal.tsx
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { useRef, useEffect, useState, Component } from 'react';
 import ReactDOM from 'react-dom';
-import { MountPoint } from 'kibana/public';
+import { MountPoint } from '@kbn/core/public';
 import { useIfMounted } from './utils';
 
 interface MountPointPortalProps {
diff --git a/src/plugins/kibana_react/public/util/to_mount_point.test.tsx b/src/plugins/kibana_react/public/util/to_mount_point.test.tsx
index 74566763d9215..09755d0f5b1de 100644
--- a/src/plugins/kibana_react/public/util/to_mount_point.test.tsx
+++ b/src/plugins/kibana_react/public/util/to_mount_point.test.tsx
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { of, BehaviorSubject } from 'rxjs';
 import { useEuiTheme } from '@elastic/eui';
 import type { UseEuiTheme } from '@elastic/eui';
-import type { CoreTheme } from 'src/core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { toMountPoint } from './to_mount_point';
 
 describe('toMountPoint', () => {
diff --git a/src/plugins/kibana_react/public/util/to_mount_point.tsx b/src/plugins/kibana_react/public/util/to_mount_point.tsx
index 192f3a0ba2082..915b787a12b48 100644
--- a/src/plugins/kibana_react/public/util/to_mount_point.tsx
+++ b/src/plugins/kibana_react/public/util/to_mount_point.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { MountPoint, CoreTheme } from 'kibana/public';
+import type { MountPoint, CoreTheme } from '@kbn/core/public';
 import { KibanaThemeProvider } from '../theme';
 
 export interface ToMountPointOptions {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts
index 5acd1fb9c9c3a..9c0fab85844bb 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { SavedObjectsErrorHelpers } from '../../../../../../core/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { SAVED_OBJECTS_DAILY_TYPE, SAVED_OBJECTS_TRANSACTIONAL_TYPE } from '../saved_objects_types';
 import { rollDailyData } from './daily';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts
index 4a00818336082..7cd326eeec346 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts
@@ -8,12 +8,8 @@
 
 import moment from 'moment';
 import type { Logger } from '@kbn/logging';
-import {
-  ISavedObjectsRepository,
-  SavedObject,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../core/server';
-import { getDailyId } from '../../../../../usage_collection/common/application_usage';
+import { ISavedObjectsRepository, SavedObject, SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { getDailyId } from '@kbn/usage-collection-plugin/common/application_usage';
 import {
   ApplicationUsageDaily,
   ApplicationUsageTransactional,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts
index 9fea955ab5d8a..e5dd0996e440d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../../usage_collection/common/constants';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
 import { SAVED_OBJECTS_DAILY_TYPE, SAVED_OBJECTS_TOTAL_TYPE } from '../saved_objects_types';
 import { rollTotals } from './total';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts
index e27c7b897d995..6c55d0f7535af 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts
@@ -7,8 +7,8 @@
  */
 
 import type { Logger } from '@kbn/logging';
-import type { ISavedObjectsRepository } from 'kibana/server';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../../usage_collection/common/constants';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
 import {
   ApplicationUsageDaily,
   ApplicationUsageTotal,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
index 9823a2589fac1..35f649f4e4e21 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectAttributes, SavedObjectsServiceSetup } from 'kibana/server';
+import type { SavedObjectAttributes, SavedObjectsServiceSetup } from '@kbn/core/server';
 
 /**
  * Used for accumulating the totals of all the stats older than 90d
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
index 4e267e0d15270..b99a65accd072 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { ApplicationUsageTelemetryReport } from './types';
 
 const commonSchema: MakeSchemaFrom<ApplicationUsageTelemetryReport[string]> = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts
index 38864945a17d0..611cfee77415e 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
-} from '../../../../usage_collection/server/mocks';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../usage_collection/common/constants';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import {
   registerApplicationUsageCollector,
   transformByApplicationViews,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
index a01f1bca4f0e0..15856c21760ce 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
@@ -8,9 +8,9 @@
 
 import moment from 'moment';
 import { timer } from 'rxjs';
-import { ISavedObjectsRepository, Logger, SavedObjectsServiceSetup } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../usage_collection/common/constants';
+import { ISavedObjectsRepository, Logger, SavedObjectsServiceSetup } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
 import {
   ApplicationUsageDaily,
   ApplicationUsageTotal,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts
index b3f9c2a329468..dd1cc0381caf7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts
@@ -7,12 +7,12 @@
  */
 
 import { cloudDetailsMock, detectCloudServiceMock } from './cloud_provider_collector.test.mocks';
-import { loggingSystemMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import { registerCloudProviderUsageCollector } from './cloud_provider_collector';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts
index 2b3cbce6fa3e1..3db7edf9a0c73 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { CloudDetector } from './detector';
 
 interface Usage {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts
index 8f78bc962dd28..a55f200a4ce25 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts
@@ -10,10 +10,10 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerConfigUsageCollector } from './register_config_usage_collector';
-import { coreUsageDataServiceMock, loggingSystemMock } from '../../../../../core/server/mocks';
-import type { ConfigUsageData } from '../../../../../core/server';
+import { coreUsageDataServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { ConfigUsageData } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts
index ad7f570432abf..71e56dbde8ab9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
-import { ConfigUsageData, CoreUsageDataStart } from '../../../../../core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { ConfigUsageData, CoreUsageDataStart } from '@kbn/core/server';
 
 export function registerConfigUsageCollector(
   usageCollection: UsageCollectionSetup,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts
index 0bb3b2ff923fa..39cd57a3d4745 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts
@@ -10,10 +10,10 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerCoreUsageCollector } from './core_usage_collector';
-import { coreUsageDataServiceMock, loggingSystemMock } from '../../../../../core/server/mocks';
-import type { CoreUsageData } from '../../../../../core/server';
+import { coreUsageDataServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { CoreUsageData } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
index a208832baf719..9e0d7cfc8e8ba 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CoreUsageData, CoreUsageDataStart } from '../../../../../core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CoreUsageData, CoreUsageDataStart } from '@kbn/core/server';
 
 export function getCoreUsageCollector(
   usageCollection: UsageCollectionSetup,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
index ee88ba1f33e10..e8ada00137da4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { CspConfig, ICspConfig } from '../../../../../core/server';
+import { CspConfig, ICspConfig } from '@kbn/core/server';
 import { createCspCollector } from './csp_collector';
-import { httpServiceMock, loggingSystemMock } from '../../../../../core/server/mocks';
+import { httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts
index fa0cd55cd3072..35be96f253cb9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup, UsageCollectorOptions } from 'src/plugins/usage_collection/server';
-import { HttpServiceSetup, CspConfig } from '../../../../../core/server';
+import { UsageCollectionSetup, UsageCollectorOptions } from '@kbn/usage-collection-plugin/server';
+import { HttpServiceSetup, CspConfig } from '@kbn/core/server';
 
 interface Usage {
   strict: boolean;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts
index 96d5240c935f8..dd3b538e090fa 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts
@@ -10,10 +10,10 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerEventLoopDelaysCollector } from './event_loop_delays_usage_collector';
-import { loggingSystemMock, savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
-import type { SavedObjectsFindResponse } from '../../../../../core/server';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts
index 774e021d7a549..c9b23038d2e35 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts
@@ -7,8 +7,8 @@
  */
 
 import { timer } from 'rxjs';
-import { SavedObjectsServiceSetup, ISavedObjectsRepository, Logger } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceSetup, ISavedObjectsRepository, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { rollDailyData } from './rollups';
 import { registerSavedObjectTypes, EventLoopDelaysDaily } from './saved_objects';
 import { eventLoopDelaysUsageSchema, EventLoopDelaysUsageReport } from './schema';
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts
index cb59d6a44b07e..844524ae18f7e 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { rollDailyData } from './daily';
-import { loggingSystemMock, savedObjectsRepositoryMock } from '../../../../../../core/server/mocks';
-import type { SavedObjectsFindResponse } from '../../../../../../core/server';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 
 describe('rollDailyData', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts
index 29072335d272b..5fb2b8fb6bd65 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Logger } from '@kbn/logging';
-import { ISavedObjectsRepository } from '../../../../../../core/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { deleteHistogramSavedObjects } from '../saved_objects';
 
 /**
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
index d4f069560443b..8910279ab4ab4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { Logger, ISavedObjectsRepository } from '../../../../../../../core/server';
+import type { Logger, ISavedObjectsRepository } from '@kbn/core/server';
 import {
   createTestServers,
   TestElasticsearchUtils,
   TestKibanaUtils,
   createRootWithCorePlugins,
-} from '../../../../../../../core/test_helpers/kbn_server';
+} from '@kbn/core/test_helpers/kbn_server';
 import { rollDailyData } from '../daily';
-import { metricsServiceMock } from '../../../../../../../core/server/mocks';
+import { metricsServiceMock } from '@kbn/core/server/mocks';
 
 import {
   SAVED_OBJECTS_DAILY_TYPE,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts
index ddae0ff302829..e6313991d64ce 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts
@@ -11,8 +11,8 @@ import {
   serializeSavedObjectId,
   deleteHistogramSavedObjects,
 } from './saved_objects';
-import { savedObjectsRepositoryMock, metricsServiceMock } from '../../../../../core/server/mocks';
-import type { SavedObjectsFindResponse } from '../../../../../core/server/';
+import { savedObjectsRepositoryMock, metricsServiceMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 
 describe('serializeSavedObjectId', () => {
   it('returns serialized id', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts
index 57a9bb3b739c0..cf0c5372450e5 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts
@@ -10,9 +10,9 @@ import type {
   SavedObjectAttributes,
   SavedObjectsServiceSetup,
   ISavedObjectsRepository,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import moment from 'moment';
-import type { IntervalHistogram } from 'kibana/server';
+import type { IntervalHistogram } from '@kbn/core/server';
 export const SAVED_OBJECTS_DAILY_TYPE = 'event_loop_delays_daily';
 
 export interface EventLoopDelaysDaily extends SavedObjectAttributes, IntervalHistogram {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts
index 7ac0bd408c49b..0342ee9822796 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface EventLoopDelaysUsageReport {
   daily: Array<{
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts
index 92549b926eafc..0b7375191c78f 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { savedObjectsRepositoryMock, metricsServiceMock } from '../../../../../core/server/mocks';
+import { savedObjectsRepositoryMock, metricsServiceMock } from '@kbn/core/server/mocks';
 import { startTrackingEventLoopDelaysUsage } from './track_delays';
 
 describe('startTrackingEventLoopDelaysUsage', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
index 39d4cbcb84824..7e8c8fab39eaf 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
@@ -8,8 +8,8 @@
 
 import { takeUntil, finalize, map } from 'rxjs/operators';
 import { Observable, timer } from 'rxjs';
-import type { ISavedObjectsRepository } from 'kibana/server';
-import type { EventLoopDelaysMonitor } from '../../../../../core/server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import type { EventLoopDelaysMonitor } from '@kbn/core/server';
 import {
   MONITOR_EVENT_LOOP_DELAYS_START,
   MONITOR_EVENT_LOOP_DELAYS_INTERVAL,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts
index 49b1943033719..241349d3d71cb 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { Subject } from 'rxjs';
-import { loggingSystemMock, metricsServiceMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, metricsServiceMock } from '@kbn/core/server/mocks';
 import { startTrackingEventLoopDelaysThreshold } from './track_threshold';
-import { usageCountersServiceMock } from '../../../../usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 describe('startTrackingEventLoopDelaysThreshold', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
index d30db883cae60..f2322a782dbf7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
@@ -8,14 +8,14 @@
 
 import { takeUntil, finalize } from 'rxjs/operators';
 import { Observable, timer } from 'rxjs';
-import type { Logger } from 'kibana/server';
-import type { UsageCounter } from '../../../../usage_collection/server';
+import type { Logger } from '@kbn/core/server';
+import type { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import type { EventLoopDelaysMonitor } from '@kbn/core/server';
 import {
   MONITOR_EVENT_LOOP_THRESHOLD_START,
   MONITOR_EVENT_LOOP_THRESHOLD_INTERVAL,
   MONITOR_EVENT_LOOP_WARN_THRESHOLD,
 } from './constants';
-import type { EventLoopDelaysMonitor } from '../../../../../core/server';
 
 /**
  * The monitoring of the event loop starts immediately.
diff --git a/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts
index 34ab4a5be7d28..186ea64da7a95 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts
@@ -8,8 +8,8 @@
 
 import { i18nLoader } from '@kbn/i18n';
 import { size } from 'lodash';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { I18nServiceSetup } from '../../../../../core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { I18nServiceSetup } from '@kbn/core/server';
 import { getIntegrityHashes, Integrities } from './file_integrity';
 
 export interface UsageStats {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index 1abb7409709e0..7a19ff022226e 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { UsageStats } from './types';
 
 export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
index 8295342c527ab..0d7c5f5238836 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
@@ -6,18 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, uiSettingsServiceMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, uiSettingsServiceMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import {
   registerManagementUsageCollector,
   createCollectorFetch,
 } from './telemetry_management_collector';
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
index 3c29824d96f96..b18fed38ef9e4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { UsageStats } from './types';
 import { REDACTED_KEYWORD } from '../../../common/constants';
 import { stackManagementSchema } from './schema';
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
index 312fb9b9bc1d9..1f8f95536ee19 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
@@ -11,11 +11,11 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import { registerOpsStatsCollector } from '.';
-import { OpsMetrics } from '../../../../../core/server';
-import { loggingSystemMock, metricsServiceMock } from '../../../../../core/server/mocks';
+import { OpsMetrics } from '@kbn/core/server';
+import { loggingSystemMock, metricsServiceMock } from '@kbn/core/server/mocks';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
index ca7cca2a9de8c..d8e4b35996bed 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
@@ -9,8 +9,8 @@
 import { Observable } from 'rxjs';
 import { cloneDeep, omit } from 'lodash';
 import moment from 'moment';
-import { OpsMetrics } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { OpsMetrics } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { KIBANA_STATS_TYPE } from '../../../common/constants';
 interface OpsStatsMetrics extends Omit<OpsMetrics, 'response_times' | 'collected_at'> {
   timestamp: string;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts
index 8fb75d1ae08e3..688bdf46ca56c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
 function mockGetSavedObjectsCounts<TBody>(params: TBody) {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts
index cb3c09efa0e3b..a06829062ed64 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export async function getSavedObjectsCounts(
   esClient: ElasticsearchClient,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
index 0f5152daa31a7..1768d4b0c916b 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
   createUsageCollectionSetupMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { getKibanaSavedObjectCounts, registerKibanaUsageCollector } from './kibana_usage_collector';
 
 const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
index 9bd8da2be54df..fb3d3c89537c4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { snakeCase } from 'lodash';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
index a5bda0c0b3713..2d356caec33eb 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
@@ -9,7 +9,7 @@
 import {
   createCollectorFetchContextMock,
   createUsageCollectionSetupMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerSavedObjectsCountUsageCollector } from './saved_objects_count_collector';
 
 describe('saved_objects_count_collector', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
index f541b1ef452e6..966053c76a2d3 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
 interface SavedObjectsCountUsageByType {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
index 6b70a8c97e651..4516e5174d402 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCountersSavedObject } from '../../../../../usage_collection/server';
+import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
 
 export const rawUsageCounters: UsageCountersSavedObject[] = [
   {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
index 122e637d2b20c..9d702be86aa48 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
@@ -14,9 +14,9 @@ import {
 import { BehaviorSubject } from 'rxjs';
 import { rawUiCounters } from './__fixtures__/ui_counter_saved_objects';
 import { rawUsageCounters } from './__fixtures__/usage_counter_saved_objects';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { UI_COUNTER_SAVED_OBJECT_TYPE } from './ui_counter_saved_object_type';
-import { USAGE_COUNTERS_SAVED_OBJECT_TYPE } from '../../../../usage_collection/server';
+import { USAGE_COUNTERS_SAVED_OBJECT_TYPE } from '@kbn/usage-collection-plugin/server';
 
 describe('transformRawUsageCounterObject', () => {
   it('transforms usage counters savedObject raw entries', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
index 12c0a21f5353d..5d741a6df8e3d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
@@ -9,11 +9,6 @@
 import moment from 'moment';
 import { mergeWith } from 'lodash';
 import type { Subject } from 'rxjs';
-import {
-  UICounterSavedObject,
-  UICounterSavedObjectAttributes,
-  UI_COUNTER_SAVED_OBJECT_TYPE,
-} from './ui_counter_saved_object_type';
 
 import {
   CollectorFetchContext,
@@ -22,12 +17,17 @@ import {
   UsageCountersSavedObject,
   UsageCountersSavedObjectAttributes,
   serializeCounterKey,
-} from '../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 import {
   deserializeUiCounterName,
   serializeUiCounterName,
-} from '../../../../usage_collection/common/ui_counters';
+} from '@kbn/usage-collection-plugin/common/ui_counters';
+import {
+  UICounterSavedObject,
+  UICounterSavedObjectAttributes,
+  UI_COUNTER_SAVED_OBJECT_TYPE,
+} from './ui_counter_saved_object_type';
 
 interface UiCounterEvent {
   appName: string;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts
index 55da239d8ef2a..859a50e01401a 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts
@@ -8,7 +8,7 @@
 
 import { Subject, timer } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { Logger, ISavedObjectsRepository } from 'kibana/server';
+import { Logger, ISavedObjectsRepository } from '@kbn/core/server';
 import { ROLL_INDICES_INTERVAL, ROLL_INDICES_START } from './constants';
 import { rollUiCounterIndices } from './rollups';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts
index f69ddde6a65bd..e5414ed0d5001 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts
@@ -9,8 +9,8 @@
 import moment from 'moment';
 import * as Rx from 'rxjs';
 import { isSavedObjectOlderThan, rollUiCounterIndices } from './rollups';
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { SavedObjectsFindResult } from 'kibana/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 
 import {
   UICounterSavedObjectAttributes,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts
index d92110251c79b..ca472fe0825f9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository, Logger } from 'kibana/server';
+import { ISavedObjectsRepository, Logger } from '@kbn/core/server';
 import moment from 'moment';
 import type { Subject } from 'rxjs';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts
index 4d31fc1599e3f..2d4e680a61a2f 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectAttributes, SavedObjectsServiceSetup } from 'kibana/server';
+import { SavedObject, SavedObjectAttributes, SavedObjectsServiceSetup } from '@kbn/core/server';
 
 export interface UICounterSavedObjectAttributes extends SavedObjectAttributes {
   count: number;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts
index cbc848bb5af46..0a5ed52ce9416 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
-import { registerUiMetricUsageCollector } from './';
+import { registerUiMetricUsageCollector } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts
index f14c2539379eb..d93a637ed5780 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { UIMetricUsage } from './telemetry_ui_metric_collector';
 
 const commonSchema: MakeSchemaFrom<UIMetricUsage>[string] = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
index 582e20b9b5b96..3d49bca3bb2a4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
@@ -10,8 +10,8 @@ import {
   ISavedObjectsRepository,
   SavedObjectAttributes,
   SavedObjectsServiceSetup,
-} from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { uiMetricSchema } from './schema';
 
 interface UIMetricsSavedObjects extends SavedObjectAttributes {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
index d0a45fb86b1f8..344d36542646d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCountersSavedObject } from '../../../../../usage_collection/server';
+import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
 
 export const rawUsageCounters: UsageCountersSavedObject[] = [
   {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
index ad940c825c436..3899dac73f939 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
@@ -13,7 +13,7 @@ import {
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
   UsageCountersSavedObject,
   UsageCountersSavedObjectAttributes,
-} from '../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 interface UsageCounterEvent {
   domainId: string;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts
index 30ad993d54a8e..8237d46efb930 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts
@@ -7,7 +7,7 @@
  */
 
 import { timer } from 'rxjs';
-import { Logger, ISavedObjectsRepository } from 'kibana/server';
+import { Logger, ISavedObjectsRepository } from '@kbn/core/server';
 import { ROLL_INDICES_INTERVAL, ROLL_INDICES_START } from './constants';
 import { rollUsageCountersIndices } from './rollups';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
index c6cdaae20a8bc..4397468244a1f 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
@@ -8,13 +8,13 @@
 
 import moment from 'moment';
 import { isSavedObjectOlderThan, rollUsageCountersIndices } from './rollups';
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { SavedObjectsFindResult } from '../../../../../../core/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 
 import {
   UsageCountersSavedObjectAttributes,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-} from '../../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
index 99bbcee368d1c..621b40fb21e9c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
@@ -6,15 +6,14 @@
  * Side Public License, v 1.
  */
 
-import type { ISavedObjectsRepository, Logger } from 'kibana/server';
+import type { ISavedObjectsRepository, Logger } from '@kbn/core/server';
 import moment from 'moment';
 
-import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
-
 import {
   UsageCountersSavedObject,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-} from '../../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
+import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
 
 export function isSavedObjectOlderThan({
   numberOfDays,
diff --git a/src/plugins/kibana_usage_collection/server/index.ts b/src/plugins/kibana_usage_collection/server/index.ts
index 3b4ddd97bb3d8..2a674035ebe29 100644
--- a/src/plugins/kibana_usage_collection/server/index.ts
+++ b/src/plugins/kibana_usage_collection/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { KibanaUsageCollectionPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,
diff --git a/src/plugins/kibana_usage_collection/server/plugin.test.ts b/src/plugins/kibana_usage_collection/server/plugin.test.ts
index 75c323ba0332f..a6604ac0bc1cd 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.test.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.test.ts
@@ -10,13 +10,13 @@ import {
   coreMock,
   savedObjectsRepositoryMock,
   uiSettingsServiceMock,
-} from '../../../core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   CollectorOptions,
   createUsageCollectionSetupMock,
-} from '../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { cloudDetailsMock } from './mocks';
-import { plugin } from './';
+import { plugin } from '.';
 
 describe('kibana_usage_collection', () => {
   const pluginInstance = plugin(coreMock.createPluginInitializerContext({}));
diff --git a/src/plugins/kibana_usage_collection/server/plugin.ts b/src/plugins/kibana_usage_collection/server/plugin.ts
index 19adea4f009a2..4442757e2df68 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { Subject } from 'rxjs';
 import type {
   PluginInitializerContext,
@@ -19,8 +19,8 @@ import type {
   OpsMetrics,
   Logger,
   CoreUsageDataStart,
-} from 'src/core/server';
-import { SavedObjectsClient, EventLoopDelaysMonitor } from '../../../core/server';
+} from '@kbn/core/server';
+import { SavedObjectsClient, EventLoopDelaysMonitor } from '@kbn/core/server';
 import {
   startTrackingEventLoopDelaysUsage,
   startTrackingEventLoopDelaysThreshold,
diff --git a/src/plugins/kibana_utils/common/persistable_state/types.ts b/src/plugins/kibana_utils/common/persistable_state/types.ts
index 5491396b19615..4db588d15741f 100644
--- a/src/plugins/kibana_utils/common/persistable_state/types.ts
+++ b/src/plugins/kibana_utils/common/persistable_state/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord, Serializable } from '@kbn/utility-types';
-import { SavedObjectReference } from '../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 
 /**
  * Versioned state is a POJO JavaScript object that can be serialized to JSON,
diff --git a/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts b/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
index c8234997e338a..dae657faf7641 100644
--- a/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
+++ b/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from '../../../../core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { createStartServicesGetter } from './create_start_service_getter';
 import { Defer } from '../../common/defer';
 
diff --git a/src/plugins/kibana_utils/public/core/create_start_service_getter.ts b/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
index 6a9f2e0c17b19..d81f15492c242 100644
--- a/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
+++ b/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, StartServicesAccessor } from '../../../../core/public';
+import { CoreStart, StartServicesAccessor } from '@kbn/core/public';
 
 interface StartServices<Plugins = unknown, OwnContract = unknown, Core = CoreStart> {
   plugins: Plugins;
diff --git a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
index 6913c94a6bb5f..b5e81707a7a79 100644
--- a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
+++ b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
@@ -12,8 +12,8 @@ import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import ReactDOM from 'react-dom';
 
-import { ApplicationStart, HttpStart, ToastsSetup } from 'kibana/public';
-import type { ThemeServiceStart } from '../../../../core/public';
+import { ApplicationStart, HttpStart, ToastsSetup } from '@kbn/core/public';
+import type { ThemeServiceStart } from '@kbn/core/public';
 import { SavedObjectNotFound } from '..';
 import { KibanaThemeProvider } from '../theme';
 
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 16cfbf4abd01e..4aa6244e1b24e 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { KibanaUtilsPublicPlugin } from './plugin';
 
 export type { Get, Set, UiComponent, UiComponentInstance } from '../common';
diff --git a/src/plugins/kibana_utils/public/plugin.ts b/src/plugins/kibana_utils/public/plugin.ts
index b255aa34ccfdb..d483754da5b22 100644
--- a/src/plugins/kibana_utils/public/plugin.ts
+++ b/src/plugins/kibana_utils/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { History } from 'history';
 import { setVersion } from './set_version';
 
diff --git a/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts b/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts
index 35e80598da063..fe3a63539b28c 100644
--- a/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts
+++ b/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Sha256 } from '../../../../../core/public/utils';
+import { Sha256 } from '@kbn/core/public/utils';
 import { hashedItemStore } from '../../storage/hashed_item_store';
 
 // This prefix is used to identify hash strings that have been encoded in the URL.
diff --git a/src/plugins/kibana_utils/public/state_management/url/errors.ts b/src/plugins/kibana_utils/public/state_management/url/errors.ts
index e2574a8abcf5a..184ac5d128bd1 100644
--- a/src/plugins/kibana_utils/public/state_management/url/errors.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/errors.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 
 export const restoreUrlErrorTitle = i18n.translate(
   'kibana_utils.stateManagement.url.restoreUrlErrorTitle',
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts
index 32704af6213b8..384bbcfd0fe01 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts
@@ -21,7 +21,7 @@ import {
   setStateToKbnUrl,
   getStateFromKbnUrl,
 } from './kbn_url_storage';
-import { ScopedHistory } from '../../../../../core/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 describe('kbn_url_storage', () => {
   describe('getStateFromUrl & setStateToUrl', () => {
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
index 3c748fab8e0c1..d9cae8bd14e52 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
@@ -10,8 +10,8 @@ import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { createMemoryHistory, History } from 'history';
 import { createKbnUrlTracker, KbnUrlTracker } from './kbn_url_tracker';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { App, AppUpdater, ToastsSetup } from 'kibana/public';
-import { coreMock } from '../../../../../core/public/mocks';
+import { App, AppUpdater, ToastsSetup } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { unhashUrl } from './hash_unhash_url';
 
 jest.mock('./hash_unhash_url', () => ({
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
index cc5903694f591..7cfb3f9a1e964 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
@@ -8,7 +8,7 @@
 
 import { createHashHistory, History, UnregisterCallback } from 'history';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { AppUpdater, ToastsSetup } from 'kibana/public';
+import { AppUpdater, ToastsSetup } from '@kbn/core/public';
 import { setStateToKbnUrl } from './kbn_url_storage';
 import { unhashUrl } from './hash_unhash_url';
 
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
index 4021ee7790bb8..1c900aac9e539 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
@@ -11,9 +11,9 @@ import { createKbnUrlStateStorage, IKbnUrlStateStorage } from './create_kbn_url_
 import { History, createBrowserHistory } from 'history';
 import { takeUntil, toArray } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { ScopedHistory } from '../../../../../core/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { withNotifyOnErrors } from '../../state_management/url';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('KbnUrlStateStorage', () => {
   describe('useHash: false', () => {
diff --git a/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts b/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts
index 0f2176b5d4ba9..9f4174e4abdd3 100644
--- a/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts
+++ b/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts
@@ -19,7 +19,7 @@ import { HashedItemStore } from './hashed_item_store';
  */
 export const mockStorage = new StubBrowserStorage();
 const mockHashedItemStore = new HashedItemStore(mockStorage);
-jest.mock('./', () => {
+jest.mock('.', () => {
   return {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     HashedItemStore: require('./hashed_item_store').HashedItemStore,
diff --git a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx
index 5d1bc9798ee17..bda4a5cd689b8 100644
--- a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx
+++ b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx
@@ -14,7 +14,7 @@ import { act } from 'react-dom/test-utils';
 import { BehaviorSubject, of } from 'rxjs';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { CoreTheme } from 'src/core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
diff --git a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx
index 7c7963eff984b..334bcc9a7ed26 100644
--- a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx
+++ b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx
@@ -12,7 +12,7 @@ import React, { useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { getColorMode } from './utils';
 
 interface KibanaThemeProviderProps {
diff --git a/src/plugins/kibana_utils/public/theme/utils.ts b/src/plugins/kibana_utils/public/theme/utils.ts
index 887e4fe61fbe1..de733c672971d 100644
--- a/src/plugins/kibana_utils/public/theme/utils.ts
+++ b/src/plugins/kibana_utils/public/theme/utils.ts
@@ -9,7 +9,7 @@
 import { COLOR_MODES_STANDARD } from '@elastic/eui';
 import type { EuiThemeColorModeStandard } from '@elastic/eui';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 /**
  * Copied from the `kibana_react` plugin, to avoid cyclical dependency
diff --git a/src/plugins/kibana_utils/server/report_server_error.ts b/src/plugins/kibana_utils/server/report_server_error.ts
index 57b8c4e207f72..0fcc0c34cc4a9 100644
--- a/src/plugins/kibana_utils/server/report_server_error.ts
+++ b/src/plugins/kibana_utils/server/report_server_error.ts
@@ -7,7 +7,7 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { KibanaResponseFactory } from 'kibana/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { KbnError } from '../common';
 
 export class KbnServerError extends KbnError {
diff --git a/src/plugins/management/common/locator.ts b/src/plugins/management/common/locator.ts
index bff90cea5d111..5169919846d9d 100644
--- a/src/plugins/management/common/locator.ts
+++ b/src/plugins/management/common/locator.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
+import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 import { MANAGEMENT_APP_ID } from './contants';
 
 export const MANAGEMENT_APP_LOCATOR = 'MANAGEMENT_APP_LOCATOR';
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
index 9f033637de963..bf285cbbeadd3 100644
--- a/src/plugins/management/kibana.json
+++ b/src/plugins/management/kibana.json
@@ -4,7 +4,7 @@
   "server": true,
   "ui": true,
   "optionalPlugins": ["home", "share"],
-  "requiredBundles": ["kibanaReact", "kibanaUtils", "home"],
+  "requiredBundles": ["kibanaReact", "kibanaUtils"],
   "owner": {
     "name": "Vis Editors",
     "githubTeam": "kibana-vis-editors"
diff --git a/src/plugins/management/public/application.tsx b/src/plugins/management/public/application.tsx
index 3e2c4f7c04e40..dc16faa4f6d04 100644
--- a/src/plugins/management/public/application.tsx
+++ b/src/plugins/management/public/application.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { ManagementApp, ManagementAppDependencies } from './components/management_app';
 
 export const renderApp = async (
diff --git a/src/plugins/management/public/components/management_app/management_app.tsx b/src/plugins/management/public/components/management_app/management_app.tsx
index 4d306ffd2e266..52d5eb3da0606 100644
--- a/src/plugins/management/public/components/management_app/management_app.tsx
+++ b/src/plugins/management/public/components/management_app/management_app.tsx
@@ -10,17 +10,17 @@ import './management_app.scss';
 import React, { useState, useEffect, useCallback } from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from 'kibana/public';
+import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
 
-import { ManagementSection, MANAGEMENT_BREADCRUMB } from '../../utils';
-import { ManagementRouter } from './management_router';
-import { managementSidebarNav } from '../management_sidebar_nav/management_sidebar_nav';
 import {
   KibanaPageTemplate,
   KibanaPageTemplateProps,
   reactRouterNavigate,
   KibanaThemeProvider,
-} from '../../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { ManagementSection, MANAGEMENT_BREADCRUMB } from '../../utils';
+import { ManagementRouter } from './management_router';
+import { managementSidebarNav } from '../management_sidebar_nav/management_sidebar_nav';
 import { SectionsServiceStart } from '../../types';
 
 interface ManagementAppProps {
diff --git a/src/plugins/management/public/components/management_app/management_router.tsx b/src/plugins/management/public/components/management_app/management_router.tsx
index 8f52d629bdb9b..79c537451ac51 100644
--- a/src/plugins/management/public/components/management_app/management_router.tsx
+++ b/src/plugins/management/public/components/management_app/management_router.tsx
@@ -8,7 +8,7 @@
 
 import React, { memo } from 'react';
 import { Route, Router, Switch, Redirect } from 'react-router-dom';
-import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from 'kibana/public';
+import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
 import { ManagementAppWrapper } from '../management_app_wrapper';
 import { ManagementLandingPage } from '../landing';
 import { ManagementAppDependencies } from './management_app';
diff --git a/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx b/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx
index 57de84ec5aec6..5516803070f0e 100644
--- a/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx
+++ b/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx
@@ -8,11 +8,11 @@
 
 import React, { createRef, Component } from 'react';
 
-import { ChromeBreadcrumb, AppMountParameters, ScopedHistory } from 'kibana/public';
+import { ChromeBreadcrumb, AppMountParameters, ScopedHistory } from '@kbn/core/public';
 import classNames from 'classnames';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { ManagementApp } from '../../utils';
 import { Unmount } from '../../types';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
 
 interface ManagementSectionWrapperProps {
   app: ManagementApp;
diff --git a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
index bf1b81061f6a9..0cfcd81b57b2a 100644
--- a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
+++ b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { sortBy } from 'lodash';
 
 import { EuiIcon, EuiSideNavItemType, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { ManagementApp, ManagementSection } from '../../utils';
 
 import { ManagementItem } from '../../utils/management_item';
-import { reactRouterNavigate } from '../../../../kibana_react/public';
 
 interface ManagementSidebarNavProps {
   sections: ManagementSection[];
diff --git a/src/plugins/management/public/index.ts b/src/plugins/management/public/index.ts
index 41d244ad44d5a..685f5dee6f15a 100644
--- a/src/plugins/management/public/index.ts
+++ b/src/plugins/management/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ManagementPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/management/public/management_sections_service.ts b/src/plugins/management/public/management_sections_service.ts
index 1b14a661159a5..7344057e2e993 100644
--- a/src/plugins/management/public/management_sections_service.ts
+++ b/src/plugins/management/public/management_sections_service.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { ManagementSection, RegisterManagementSectionArgs } from './utils';
 import {
   IngestSection,
@@ -23,7 +24,6 @@ import {
   DefinedSections,
   ManagementSectionsStartPrivate,
 } from './types';
-import { createGetterSetter } from '../../kibana_utils/public';
 
 const [getSectionsServiceStartPrivate, setSectionsServiceStartPrivate] =
   createGetterSetter<ManagementSectionsStartPrivate>('SectionsServiceStartPrivate');
diff --git a/src/plugins/management/public/mocks/index.ts b/src/plugins/management/public/mocks/index.ts
index bf9a7ff0b8216..92f6f9e1ed4ce 100644
--- a/src/plugins/management/public/mocks/index.ts
+++ b/src/plugins/management/public/mocks/index.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { ManagementSetup, ManagementStart, DefinedSections } from '../types';
-import { ManagementSection } from '../index';
-import { sharePluginMock } from '../../../share/public/mocks';
+import { ManagementSection } from '..';
 
 export const createManagementSectionMock = () =>
   ({
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
index acec140fd6521..0cdb83d4b6793 100644
--- a/src/plugins/management/public/plugin.ts
+++ b/src/plugins/management/public/plugin.ts
@@ -8,9 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
-import type { SharePluginSetup, SharePluginStart } from 'src/plugins/share/public';
-import { ManagementSetup, ManagementStart } from './types';
-import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import {
   CoreSetup,
   CoreStart,
@@ -22,7 +21,8 @@ import {
   AppStatus,
   AppNavLinkStatus,
   AppDeepLink,
-} from '../../../core/public';
+} from '@kbn/core/public';
+import { ManagementSetup, ManagementStart } from './types';
 
 import { MANAGEMENT_APP_ID } from '../common/contants';
 import { ManagementAppLocatorDefinition } from '../common/locator';
@@ -89,7 +89,7 @@ export class ManagementPlugin
         icon: 'managementApp',
         path: '/app/management',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
         visible: () => this.hasAnyEnabledApps,
       });
     }
diff --git a/src/plugins/management/public/types.ts b/src/plugins/management/public/types.ts
index 87b336928db91..5d8d963ea981e 100644
--- a/src/plugins/management/public/types.ts
+++ b/src/plugins/management/public/types.ts
@@ -7,10 +7,10 @@
  */
 
 import { Observable } from 'rxjs';
-import { ScopedHistory, Capabilities } from 'kibana/public';
-import type { LocatorPublic } from 'src/plugins/share/common';
+import { ScopedHistory, Capabilities } from '@kbn/core/public';
+import type { LocatorPublic } from '@kbn/share-plugin/common';
+import { ChromeBreadcrumb, CoreTheme } from '@kbn/core/public';
 import { ManagementSection, RegisterManagementSectionArgs } from './utils';
-import { ChromeBreadcrumb, CoreTheme } from '../../../core/public/';
 import type { ManagementAppLocatorParams } from '../common/locator';
 
 export interface ManagementSetup {
diff --git a/src/plugins/management/server/index.ts b/src/plugins/management/server/index.ts
index d6d4a89535599..69f90d0876f85 100644
--- a/src/plugins/management/server/index.ts
+++ b/src/plugins/management/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ManagementServerPlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/src/plugins/management/server/plugin.ts b/src/plugins/management/server/plugin.ts
index 13471ad73083d..d902921581ef7 100644
--- a/src/plugins/management/server/plugin.ts
+++ b/src/plugins/management/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
-import { LocatorPublic } from 'src/plugins/share/common';
-import type { SharePluginSetup } from 'src/plugins/share/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
+import { LocatorPublic } from '@kbn/share-plugin/common';
+import type { SharePluginSetup } from '@kbn/share-plugin/server';
 import { ManagementAppLocatorDefinition, ManagementAppLocatorParams } from '../common/locator';
 import { capabilitiesProvider } from './capabilities_provider';
 
diff --git a/src/plugins/maps_ems/public/index.ts b/src/plugins/maps_ems/public/index.ts
index 9b09e1d804ae7..48158e74f3e83 100644
--- a/src/plugins/maps_ems/public/index.ts
+++ b/src/plugins/maps_ems/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'kibana/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import type { EMSClient } from '@elastic/ems-client';
 import { MapsEmsPlugin } from './plugin';
 import type { MapConfig } from '../config';
diff --git a/src/plugins/maps_ems/public/kibana_services.ts b/src/plugins/maps_ems/public/kibana_services.ts
index 6e7fe0ccd5cab..6e49b58fbae81 100644
--- a/src/plugins/maps_ems/public/kibana_services.ts
+++ b/src/plugins/maps_ems/public/kibana_services.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import type { MapConfig } from '../config';
-import { LicensingPluginStart } from '../../../../x-pack/plugins/licensing/public';
-import { ILicense } from '../../../../x-pack/plugins/licensing/common/types';
 import { LICENSE_CHECK_ID } from '../common';
 
 let kibanaVersion: string;
diff --git a/src/plugins/maps_ems/public/plugin.ts b/src/plugins/maps_ems/public/plugin.ts
index bd77a2accd0bc..eae66181737c6 100644
--- a/src/plugins/maps_ems/public/plugin.ts
+++ b/src/plugins/maps_ems/public/plugin.ts
@@ -6,17 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import {
   setKibanaVersion,
   setLicensingPluginStart,
   setMapConfig,
   getIsEnterprisePlus,
 } from './kibana_services';
-import type { MapsEmsPluginPublicSetup, MapsEmsPluginPublicStart } from './index';
+import type { MapsEmsPluginPublicSetup, MapsEmsPluginPublicStart } from '.';
 import type { MapConfig } from '../config';
 import { createEMSSettings } from '../common/ems_settings';
-import type { LicensingPluginStart } from '../../../../x-pack/plugins/licensing/public';
 import { createEMSClientLazy } from './lazy_load_bundle';
 
 interface MapsEmsStartPublicDependencies {
diff --git a/src/plugins/maps_ems/server/index.ts b/src/plugins/maps_ems/server/index.ts
index 874a8f5e7792c..a0a5cd6c7e72e 100644
--- a/src/plugins/maps_ems/server/index.ts
+++ b/src/plugins/maps_ems/server/index.ts
@@ -11,11 +11,11 @@ import {
   PluginInitializerContext,
   Plugin,
   PluginConfigDescriptor,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { MapConfig, mapConfigSchema } from '../config';
 import { EMSSettings, LICENSE_CHECK_ID } from '../common';
-import { LicensingPluginSetup } from '../../../../x-pack/plugins/licensing/server';
-import { ILicense } from '../../../../x-pack/plugins/licensing/common/types';
 export type { EMSSettings } from '../common';
 
 export const config: PluginConfigDescriptor<MapConfig> = {
diff --git a/src/plugins/navigation/public/index.ts b/src/plugins/navigation/public/index.ts
index 91b68ecab644b..904e4ed2c5e7c 100644
--- a/src/plugins/navigation/public/index.ts
+++ b/src/plugins/navigation/public/index.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new NavigationPublicPlugin(initializerContext);
 }
diff --git a/src/plugins/navigation/public/plugin.ts b/src/plugins/navigation/public/plugin.ts
index dc3d8f2043a76..9d04acdeacba6 100644
--- a/src/plugins/navigation/public/plugin.ts
+++ b/src/plugins/navigation/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   NavigationPublicPluginSetup,
   NavigationPublicPluginStart,
@@ -31,14 +31,14 @@ export class NavigationPublicPlugin
   }
 
   public start(
-    { i18n }: CoreStart,
+    core: CoreStart,
     { unifiedSearch }: NavigationPluginStartDependencies
   ): NavigationPublicPluginStart {
     const extensions = this.topNavMenuExtensionsRegistry.getAll();
 
     return {
       ui: {
-        TopNavMenu: createTopNav(unifiedSearch, extensions, i18n),
+        TopNavMenu: createTopNav(unifiedSearch, extensions),
       },
     };
   }
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 a26627c84a52b..46e2ed5336f7a 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
@@ -7,15 +7,14 @@
  */
 
 import React from 'react';
-import { I18nStart } from 'kibana/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
+import { I18nProvider } from '@kbn/i18n-react';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { TopNavMenuProps, TopNavMenu } from './top_nav_menu';
 import { RegisteredTopNavMenuData } from './top_nav_menu_data';
 
 export function createTopNav(
   unifiedSearch: UnifiedSearchPublicPluginStart,
-  extraConfig: RegisteredTopNavMenuData[],
-  i18n: I18nStart
+  extraConfig: RegisteredTopNavMenuData[]
 ) {
   return (props: TopNavMenuProps) => {
     const relevantConfig = extraConfig.filter(
@@ -24,9 +23,9 @@ export function createTopNav(
     const config = (props.config || []).concat(relevantConfig);
 
     return (
-      <i18n.Context>
+      <I18nProvider>
         <TopNavMenu {...props} unifiedSearch={unifiedSearch} config={config} />
-      </i18n.Context>
+      </I18nProvider>
     );
   };
 }
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
index 7d263d010d46a..85a9803ffced6 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -9,11 +9,11 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import { MountPoint } from 'kibana/public';
+import { MountPoint } from '@kbn/core/public';
 import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
-import type { UnifiedSearchPublicPluginStart } from '../../../unified_search/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 
 const unifiedSearch = {
   ui: {
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
index fcc2f08263392..7eb7365ed79f3 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -10,10 +10,10 @@ import React, { ReactElement } from 'react';
 import { EuiBadge, EuiBadgeGroup, EuiBadgeProps, EuiHeaderLinks } from '@elastic/eui';
 import classNames from 'classnames';
 
-import { MountPoint } from '../../../../core/public';
-import { MountPointPortal } from '../../../kibana_react/public';
-import { UnifiedSearchPublicPluginStart } from '../../../unified_search/public';
-import { StatefulSearchBarProps, SearchBarProps } from '../../../unified_search/public';
+import { MountPoint } from '@kbn/core/public';
+import { MountPointPortal } from '@kbn/kibana-react-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { StatefulSearchBarProps, SearchBarProps } from '@kbn/unified-search-plugin/public';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
 
diff --git a/src/plugins/navigation/public/types.ts b/src/plugins/navigation/public/types.ts
index 29b204a798fa5..40f83697cc9d6 100644
--- a/src/plugins/navigation/public/types.ts
+++ b/src/plugins/navigation/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { TopNavMenuProps, TopNavMenuExtensionsRegistrySetup } from './top_nav_menu';
-import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
 
 export interface NavigationPublicPluginSetup {
   registerMenuItem: TopNavMenuExtensionsRegistrySetup['register'];
diff --git a/src/plugins/newsfeed/kibana.json b/src/plugins/newsfeed/kibana.json
index 004c35005950c..b928caf37ea93 100644
--- a/src/plugins/newsfeed/kibana.json
+++ b/src/plugins/newsfeed/kibana.json
@@ -7,5 +7,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
+  "requiredBundles": ["kibanaReact"],
   "requiredPlugins": ["screenshotMode"]
 }
diff --git a/src/plugins/newsfeed/public/index.ts b/src/plugins/newsfeed/public/index.ts
index f9d59ca6d99dd..31a47cb8db6c8 100644
--- a/src/plugins/newsfeed/public/index.ts
+++ b/src/plugins/newsfeed/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import {
   NewsfeedPublicPluginSetup,
   NewsfeedPublicPluginStart,
diff --git a/src/plugins/newsfeed/public/plugin.test.ts b/src/plugins/newsfeed/public/plugin.test.ts
index 3497a1e52697d..a082b81dc84be 100644
--- a/src/plugins/newsfeed/public/plugin.test.ts
+++ b/src/plugins/newsfeed/public/plugin.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { take } from 'rxjs/operators';
-import { coreMock } from '../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { NewsfeedPublicPlugin } from './plugin';
 import { NewsfeedApiEndpoint } from './lib/api';
-import { screenshotModePluginMock } from '../../screenshot_mode/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 describe('Newsfeed plugin', () => {
   let plugin: NewsfeedPublicPlugin;
diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx
index 2194e1cc43381..344e99ee8e484 100644
--- a/src/plugins/newsfeed/public/plugin.tsx
+++ b/src/plugins/newsfeed/public/plugin.tsx
@@ -12,7 +12,14 @@ import ReactDOM from 'react-dom';
 import React from 'react';
 import moment from 'moment';
 import { I18nProvider } from '@kbn/i18n-react';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  CoreTheme,
+  Plugin,
+} from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { NewsfeedPluginBrowserConfig, NewsfeedPluginStartDependencies } from './types';
 import { NewsfeedNavButton } from './components/newsfeed_header_nav_button';
 import { getApi, NewsfeedApi, NewsfeedApiEndpoint } from './lib/api';
@@ -48,7 +55,7 @@ export class NewsfeedPublicPlugin
     const api = this.createNewsfeedApi(this.config, NewsfeedApiEndpoint.KIBANA, isScreenshotMode);
     core.chrome.navControls.registerRight({
       order: 1000,
-      mount: (target) => this.mount(api, target),
+      mount: (target) => this.mount(api, target, core.theme.theme$),
     });
 
     return {
@@ -84,11 +91,13 @@ export class NewsfeedPublicPlugin
     };
   }
 
-  private mount(api: NewsfeedApi, targetDomElement: HTMLElement) {
+  private mount(api: NewsfeedApi, targetDomElement: HTMLElement, theme$: Rx.Observable<CoreTheme>) {
     ReactDOM.render(
-      <I18nProvider>
-        <NewsfeedNavButton newsfeedApi={api} />
-      </I18nProvider>,
+      <KibanaThemeProvider theme$={theme$}>
+        <I18nProvider>
+          <NewsfeedNavButton newsfeedApi={api} />
+        </I18nProvider>
+      </KibanaThemeProvider>,
       targetDomElement
     );
     return () => ReactDOM.unmountComponentAtNode(targetDomElement);
diff --git a/src/plugins/newsfeed/public/types.ts b/src/plugins/newsfeed/public/types.ts
index a7ff917f6f975..c681bee1e2609 100644
--- a/src/plugins/newsfeed/public/types.ts
+++ b/src/plugins/newsfeed/public/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { Duration, Moment } from 'moment';
-import type { ScreenshotModePluginStart } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
 export interface NewsfeedPluginStartDependencies {
   screenshotMode: ScreenshotModePluginStart;
 }
diff --git a/src/plugins/newsfeed/server/index.ts b/src/plugins/newsfeed/server/index.ts
index fefb725e2804e..60df08a9b95e1 100644
--- a/src/plugins/newsfeed/server/index.ts
+++ b/src/plugins/newsfeed/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { NewsfeedPlugin } from './plugin';
 import { configSchema, NewsfeedConfigType } from './config';
 
diff --git a/src/plugins/newsfeed/server/plugin.ts b/src/plugins/newsfeed/server/plugin.ts
index 882676c55a93a..179d91bec46c0 100644
--- a/src/plugins/newsfeed/server/plugin.ts
+++ b/src/plugins/newsfeed/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'kibana/server';
+import { Plugin } from '@kbn/core/server';
 
 export class NewsfeedPlugin implements Plugin {
   public setup() {}
diff --git a/src/plugins/newsfeed/tsconfig.json b/src/plugins/newsfeed/tsconfig.json
index 1388e11087254..e1558370fdd04 100644
--- a/src/plugins/newsfeed/tsconfig.json
+++ b/src/plugins/newsfeed/tsconfig.json
@@ -9,6 +9,7 @@
   "include": ["public/**/*", "server/**/*", "common/*", "../../../typings/**/*"],
   "references": [
     { "path": "../../core/tsconfig.json" },
+    { "path": "../kibana_react/tsconfig.json"},
     { "path": "../screenshot_mode/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts b/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts
index 51e82d785e86c..096ffc217cc42 100644
--- a/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts
+++ b/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts
@@ -11,7 +11,7 @@ import {
   ExpressionValueBoxed,
   typeSpecs,
   ExpressionFunctionDefinition,
-} from '../../../../expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 type DefaultFnResultType = typeof typeSpecs[number] &
   ExpressionFunctionDefinition<
diff --git a/src/plugins/presentation_util/common/lib/utils/default_theme.ts b/src/plugins/presentation_util/common/lib/utils/default_theme.ts
index c403937016ec8..fb744534b4e46 100644
--- a/src/plugins/presentation_util/common/lib/utils/default_theme.ts
+++ b/src/plugins/presentation_util/common/lib/utils/default_theme.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
 
 export const defaultTheme$: Observable<CoreTheme> = new Observable((subscriber) =>
diff --git a/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts b/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts
index d999db22b4057..c574d18b8de31 100644
--- a/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts
+++ b/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts
@@ -7,8 +7,8 @@
  */
 
 import { map, uniq } from 'lodash';
+import { DataView, DataViewField, IIndexPatternFieldList } from '@kbn/data-views-plugin/public';
 import { flights } from './flights_data';
-import { DataView, DataViewField, IIndexPatternFieldList } from '../../../../data_views/public';
 
 export type Flight = typeof flights[number];
 export type FlightField = keyof Flight;
diff --git a/src/plugins/presentation_util/public/__stories__/render.tsx b/src/plugins/presentation_util/public/__stories__/render.tsx
index 76725d08956bd..bd6463ca254d6 100644
--- a/src/plugins/presentation_util/public/__stories__/render.tsx
+++ b/src/plugins/presentation_util/public/__stories__/render.tsx
@@ -8,7 +8,7 @@
 
 import { action } from '@storybook/addon-actions';
 import React, { useRef, useEffect } from 'react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 
 export const defaultHandlers: IInterpreterRenderHandlers = {
   getRenderMode: () => 'view',
diff --git a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx
index f8c1539ecda28..29c82fda2d213 100644
--- a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx
+++ b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx
@@ -9,8 +9,8 @@
 import React, { useState } from 'react';
 
 import useMount from 'react-use/lib/useMount';
+import { DataView, DataViewListItem } from '@kbn/data-views-plugin/common';
 import { DataViewPicker } from './data_view_picker';
-import { DataView, DataViewListItem } from '../../../../data_views/common';
 import { injectStorybookDataView } from '../../services/storybook/data_views';
 import { storybookFlightsDataView } from '../../mocks';
 import { pluginServices, registry, StorybookParams } from '../../services/storybook';
diff --git a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
index ec9cb26ed3dce..47c3625971f18 100644
--- a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
+++ b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
@@ -9,9 +9,9 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { EuiPopover, EuiPopoverTitle, EuiSelectable, EuiSelectableProps } from '@elastic/eui';
-import { DataViewListItem } from '../../../../data_views/common';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 
-import { ToolbarButton, ToolbarButtonProps } from '../../../../kibana_react/public';
+import { ToolbarButton, ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 
 import './data_view_picker.scss';
 
diff --git a/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts b/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts
index 96d991719a63b..be592b430f0e5 100644
--- a/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts
@@ -14,7 +14,7 @@ import {
   ExpressionFunction,
   ExpressionFunctionParameter,
   getByAlias,
-} from '../../../../expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 const MARKER = 'EXPRESSIONS_SUGGESTION_MARKER';
 
diff --git a/src/plugins/presentation_util/public/components/expression_input/constants.ts b/src/plugins/presentation_util/public/components/expression_input/constants.ts
index f937d55cbf9bb..ab58dc3a0f2cf 100644
--- a/src/plugins/presentation_util/public/components/expression_input/constants.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/constants.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CodeEditorProps } from '../../../../kibana_react/public';
+import { CodeEditorProps } from '@kbn/kibana-react-plugin/public';
 
 export const LANGUAGE_CONFIGURATION = {
   autoClosingPairs: [
diff --git a/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx b/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx
index 648171959791f..46db57e1e20ff 100644
--- a/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx
+++ b/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { action } from '@storybook/addon-actions';
 import { Meta } from '@storybook/react';
 
-import { ExpressionFunction, ExpressionFunctionParameter, Style } from 'src/plugins/expressions';
-import { ExpressionInput } from '../expression_input';
+import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin';
+import { ExpressionInput } from '.';
 import { registerExpressionsLanguage } from './language';
 
 const content: ExpressionFunctionParameter<'string'> = {
diff --git a/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx b/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx
index dc971e1b4e5f2..24ee158494274 100644
--- a/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx
+++ b/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx
@@ -12,7 +12,7 @@ import { debounce } from 'lodash';
 import type { monaco } from '@kbn/monaco';
 import usePrevious from 'react-use/lib/usePrevious';
 
-import { CodeEditor } from '../../../../kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { ExpressionInputProps } from '../types';
 import { EXPRESSIONS_LANGUAGE_ID } from '../../../common';
diff --git a/src/plugins/presentation_util/public/components/expression_input/language.ts b/src/plugins/presentation_util/public/components/expression_input/language.ts
index 6dc3c252ebb03..3035de0176b60 100644
--- a/src/plugins/presentation_util/public/components/expression_input/language.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/language.ts
@@ -7,7 +7,7 @@
  */
 
 import { monaco } from '@kbn/monaco';
-import { ExpressionFunction } from 'src/plugins/expressions/common';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { EXPRESSIONS_LANGUAGE_ID } from '../../../common';
 
 /**
diff --git a/src/plugins/presentation_util/public/components/expression_input/providers.ts b/src/plugins/presentation_util/public/components/expression_input/providers.ts
index 1b1e0e076749d..e8306bffcf496 100644
--- a/src/plugins/presentation_util/public/components/expression_input/providers.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/providers.ts
@@ -7,7 +7,7 @@
  */
 
 import { monaco } from '@kbn/monaco';
-import { ExpressionFunction } from '../../../../expressions/common';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import {
   AutocompleteSuggestion,
   getAutocompleteSuggestions,
diff --git a/src/plugins/presentation_util/public/components/expression_input/reference.ts b/src/plugins/presentation_util/public/components/expression_input/reference.ts
index 4912af60cf176..3e4ca7b185a52 100644
--- a/src/plugins/presentation_util/public/components/expression_input/reference.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/reference.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunction, ExpressionFunctionParameter } from 'src/plugins/expressions/common';
+import { ExpressionFunction, ExpressionFunctionParameter } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 
 const BOLD_MD_TOKEN = '**';
diff --git a/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx b/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx
index f2462f3a25bb4..6bb48cc5fede2 100644
--- a/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx
+++ b/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { FieldPicker } from './field_picker';
-import { DataViewField } from '../../../../data_views/common';
 import { storybookFlightsDataView } from '../../mocks';
 
 export default {
diff --git a/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx b/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx
index f9fb6f985b629..b47e425f67bb2 100644
--- a/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx
+++ b/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx
@@ -13,8 +13,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiText } from '@elastic/eui';
 import { FieldButton, FieldIcon } from '@kbn/react-field';
 
+import { DataView, DataViewField } from '@kbn/data-views-plugin/common';
 import { FieldSearch } from './field_search';
-import { DataView, DataViewField } from '../../../../data_views/common';
 
 import './field_picker.scss';
 
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
index 40fdab429ae55..4e0a7886d8795 100644
--- a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
@@ -7,12 +7,12 @@
  */
 import { createContext, useContext } from 'react';
 
+import type { ContainerInput, EmbeddableInput } from '@kbn/embeddable-plugin/public';
 import type {
   GenericEmbeddableReducers,
   ReduxContainerContextServices,
   ReduxEmbeddableContextServices,
 } from './types';
-import type { ContainerInput, EmbeddableInput } from '../../../../embeddable/public';
 
 /**
  * When creating the context, a generic EmbeddableInput as placeholder is used. This will later be cast to
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
index a23dcf944812b..7b7ac93c14a97 100644
--- a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
@@ -14,19 +14,19 @@ import { debounceTime, finalize } from 'rxjs/operators';
 import { Filter } from '@kbn/es-query';
 import { isEqual } from 'lodash';
 
-import {
-  ReduxEmbeddableWrapperProps,
-  ReduxContainerContextServices,
-  ReduxEmbeddableContextServices,
-  ReduxEmbeddableWrapperPropsWithChildren,
-} from './types';
 import {
   IContainer,
   IEmbeddable,
   EmbeddableInput,
   EmbeddableOutput,
   isErrorEmbeddable,
-} from '../../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import {
+  ReduxEmbeddableWrapperProps,
+  ReduxContainerContextServices,
+  ReduxEmbeddableContextServices,
+  ReduxEmbeddableWrapperPropsWithChildren,
+} from './types';
 import { getManagedEmbeddablesStore } from './generic_embeddable_store';
 import { ReduxEmbeddableContext, useReduxEmbeddableContext } from './redux_embeddable_context';
 
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/types.ts b/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
index 4fcc01ed51c48..72d5d87821ae4 100644
--- a/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
@@ -20,7 +20,7 @@ import {
   EmbeddableOutput,
   IContainer,
   IEmbeddable,
-} from '../../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 
 export interface GenericEmbeddableReducers<InputType> {
   /**
diff --git a/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx b/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
index 6c36cf8b8e3a7..a13d7f0c76d5b 100644
--- a/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
+++ b/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
@@ -10,7 +10,7 @@ import React, { useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { OnSaveProps, SavedObjectSaveModal } from '../../../../plugins/saved_objects/public';
+import { OnSaveProps, SavedObjectSaveModal } from '@kbn/saved-objects-plugin/public';
 
 import { pluginServices } from '../services';
 import { SaveModalDashboardProps } from './types';
diff --git a/src/plugins/presentation_util/public/components/types.ts b/src/plugins/presentation_util/public/components/types.ts
index ea2e9e4773de5..dc63726c38fd2 100644
--- a/src/plugins/presentation_util/public/components/types.ts
+++ b/src/plugins/presentation_util/public/components/types.ts
@@ -10,9 +10,9 @@ import type { MutableRefObject } from 'react';
 import type { monaco } from '@kbn/monaco';
 import type { CSSProperties, HTMLAttributes } from 'react';
 
-import type { ExpressionFunction } from '../../../expressions/common';
+import type { ExpressionFunction } from '@kbn/expressions-plugin/common';
 
-import { OnSaveProps, SaveModalState } from '../../../../plugins/saved_objects/public';
+import { OnSaveProps, SaveModalState } from '@kbn/saved-objects-plugin/public';
 
 interface SaveModalDocumentInfo {
   id?: string;
diff --git a/src/plugins/presentation_util/public/index.ts b/src/plugins/presentation_util/public/index.ts
index 61e677f7231ce..35b13d248d8c8 100644
--- a/src/plugins/presentation_util/public/index.ts
+++ b/src/plugins/presentation_util/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110893
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { ExpressionFunction } from 'src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { PresentationUtilPlugin } from './plugin';
 import { pluginServices } from './services';
 
diff --git a/src/plugins/presentation_util/public/mocks.ts b/src/plugins/presentation_util/public/mocks.ts
index b569cb7436668..53cbce3469c67 100644
--- a/src/plugins/presentation_util/public/mocks.ts
+++ b/src/plugins/presentation_util/public/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { PresentationUtilPluginStart } from './types';
 import { pluginServices } from './services';
 import { registry } from './services/kibana';
diff --git a/src/plugins/presentation_util/public/plugin.ts b/src/plugins/presentation_util/public/plugin.ts
index 9cd9027a53e76..de6898b107a2d 100644
--- a/src/plugins/presentation_util/public/plugin.ts
+++ b/src/plugins/presentation_util/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { pluginServices } from './services';
 import { registry } from './services/kibana';
 import {
diff --git a/src/plugins/presentation_util/public/services/create/factory.ts b/src/plugins/presentation_util/public/services/create/factory.ts
index 49ed5ef8aaf8d..b606693f31463 100644
--- a/src/plugins/presentation_util/public/services/create/factory.ts
+++ b/src/plugins/presentation_util/public/services/create/factory.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { CoreStart, AppUpdater, PluginInitializerContext } from 'src/core/public';
+import { CoreStart, AppUpdater, PluginInitializerContext } from '@kbn/core/public';
 
 /**
  * A factory function for creating a service.
diff --git a/src/plugins/presentation_util/public/services/dashboards.ts b/src/plugins/presentation_util/public/services/dashboards.ts
index cbca79223063b..1ee60f6a3b26b 100644
--- a/src/plugins/presentation_util/public/services/dashboards.ts
+++ b/src/plugins/presentation_util/public/services/dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SimpleSavedObject } from 'src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { PartialDashboardAttributes } from './kibana/dashboards';
 
 export interface PresentationDashboardsService {
diff --git a/src/plugins/presentation_util/public/services/data_views.ts b/src/plugins/presentation_util/public/services/data_views.ts
index 9ab260034a1db..8393c419e6873 100644
--- a/src/plugins/presentation_util/public/services/data_views.ts
+++ b/src/plugins/presentation_util/public/services/data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export interface PresentationDataViewsService {
   get: DataViewsPublicPluginStart['get'];
diff --git a/src/plugins/presentation_util/public/services/labs.ts b/src/plugins/presentation_util/public/services/labs.ts
index 70c40eaafa2ef..0a1fbe31c34b8 100644
--- a/src/plugins/presentation_util/public/services/labs.ts
+++ b/src/plugins/presentation_util/public/services/labs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   EnvironmentName,
   projectIDs,
diff --git a/src/plugins/presentation_util/public/services/storybook/data_views.ts b/src/plugins/presentation_util/public/services/storybook/data_views.ts
index ecdd3d48c4658..4ae31925deca0 100644
--- a/src/plugins/presentation_util/public/services/storybook/data_views.ts
+++ b/src/plugins/presentation_util/public/services/storybook/data_views.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { PluginServiceFactory } from '../create';
 import { PresentationDataViewsService } from '../data_views';
-import { DataViewsPublicPluginStart } from '../../../../data_views/public';
-import { DataView } from '../../../../data_views/common';
 
 export type DataViewsServiceFactory = PluginServiceFactory<PresentationDataViewsService>;
 
diff --git a/src/plugins/presentation_util/public/types.ts b/src/plugins/presentation_util/public/types.ts
index a918ee3adaf35..2cda0aa4bf557 100644
--- a/src/plugins/presentation_util/public/types.ts
+++ b/src/plugins/presentation_util/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { registerExpressionsLanguage } from '.';
 import { PresentationLabsService } from './services/labs';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PresentationUtilPluginSetup {}
diff --git a/src/plugins/presentation_util/server/plugin.ts b/src/plugins/presentation_util/server/plugin.ts
index eb55373920625..eb488a6cb45b1 100644
--- a/src/plugins/presentation_util/server/plugin.ts
+++ b/src/plugins/presentation_util/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { getUISettings } from './ui_settings';
 
 export class PresentationUtilPlugin implements Plugin<object, object> {
diff --git a/src/plugins/presentation_util/server/ui_settings.ts b/src/plugins/presentation_util/server/ui_settings.ts
index 450354832c3ac..54bd082bad655 100644
--- a/src/plugins/presentation_util/server/ui_settings.ts
+++ b/src/plugins/presentation_util/server/ui_settings.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { UiSettingsParams } from '@kbn/core/types';
 import { projects, projectIDs, ProjectID } from '../common';
 
 export const SETTING_CATEGORY = 'Presentation Labs';
diff --git a/src/plugins/presentation_util/storybook/decorator.tsx b/src/plugins/presentation_util/storybook/decorator.tsx
index 0f97de79daa85..8a6c112635302 100644
--- a/src/plugins/presentation_util/storybook/decorator.tsx
+++ b/src/plugins/presentation_util/storybook/decorator.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
+import { KibanaContextProvider as KibanaReactProvider } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../public/services';
 import { PresentationUtilServices } from '../public/services';
 import { providers, StorybookParams } from '../public/services/storybook';
 import { PluginServiceRegistry } from '../public/services/create';
-import { KibanaContextProvider as KibanaReactProvider } from '../../kibana_react/public';
 
 const settings = new Map();
 settings.set('darkMode', true);
diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
index 758ae14db8e17..7a447b88c83ff 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
@@ -25,7 +25,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 import * as sinon from 'sinon';
 import { SavedObjectFinderUi as SavedObjectFinder } from './saved_object_finder';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('SavedObjectsFinder', () => {
   const doc = {
diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
index a4c8f1f64276b..9d4c801733263 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
@@ -36,7 +36,7 @@ import {
   CoreStart,
   IUiSettingsClient,
   SavedObjectsStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import { LISTING_LIMIT_SETTING } from '../../common';
 
diff --git a/src/plugins/saved_objects/public/plugin.ts b/src/plugins/saved_objects/public/plugin.ts
index 236bbb921340f..dda247b191a3a 100644
--- a/src/plugins/saved_objects/public/plugin.ts
+++ b/src/plugins/saved_objects/public/plugin.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, Plugin } from 'src/core/public';
+import { CoreStart, Plugin } from '@kbn/core/public';
 
 import './index.scss';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import {
   createSavedObjectClass,
   SavedObjectDecoratorRegistry,
   SavedObjectDecoratorConfig,
 } from './saved_object';
-import { DataPublicPluginStart } from '../../data/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
 import { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common';
 import { SavedObject } from './types';
 
diff --git a/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx
index ec25c06c3c54b..7903faeb509c0 100644
--- a/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx
+++ b/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { I18nStart } from '../../../../core/public';
+import { I18nStart } from '@kbn/core/public';
 
 /**
  * Represents the result of trying to persist the saved object.
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
index 40baff22f52c8..d26f0e5c602f7 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
@@ -7,13 +7,13 @@
  */
 
 import { cloneDeep, defaults, forOwn, assign } from 'lodash';
-import { EsResponse, SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../../types';
-import { SavedObjectNotFound } from '../../../../kibana_utils/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import {
   IndexPattern,
   injectSearchSourceReferences,
   parseSearchSourceJSON,
-} from '../../../../data/public';
+} from '@kbn/data-plugin/public';
+import { EsResponse, SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../../types';
 import { expandShorthand } from './field_mapping';
 
 /**
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx b/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
index b1093873f730e..6b09d4118d7dc 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
+++ b/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
@@ -7,10 +7,10 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export function confirmModalPromise(
   message = '',
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
index 7ed729b4b7a0f..66d67b0496429 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import { SavedObject, SavedObjectKibanaServices } from '../../types';
 import { OVERWRITE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts b/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
index b82c16456efbd..0957400e9f956 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { SAVE_DUPLICATE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 import { SavedObject } from '../../types';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts
index 26e62e3d61aeb..ee780d279ed7b 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { expandShorthand } from './mapping_setup';
-import { ES_FIELD_TYPES } from '../../../../../data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 describe('mapping_setup', () => {
   it('allows shortcuts for field types by just setting the value to the type name', () => {
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts
index 0acbc7877565a..766d631204dc2 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts
@@ -7,10 +7,10 @@
  */
 
 import { mapValues, isString } from 'lodash';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { FieldMappingSpec, MappingObject } from './types';
 
 // import from ./common/types to prevent circular dependency of kibana_utils <-> data plugin
-import { ES_FIELD_TYPES } from '../../../../../data/public';
 
 /** @private */
 type ShorthandFieldMapObject = FieldMappingSpec | ES_FIELD_TYPES | 'json';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts
index cb6a96fe175ec..142d24d5a9432 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ES_FIELD_TYPES } from '../../../../../data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 /** @public */
 export interface FieldMappingSpec {
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
index d61fe1c13eee4..398c00b27e4e9 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
@@ -7,11 +7,7 @@
  */
 
 import { findObjectByTitle } from './find_object_by_title';
-import {
-  SimpleSavedObject,
-  SavedObjectsClientContract,
-  SavedObject,
-} from '../../../../../core/public';
+import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from '@kbn/core/public';
 
 describe('findObjectByTitle', () => {
   const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
index f5a38dd74321e..53b05265eecb7 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectsClientContract,
   SimpleSavedObject,
   SavedObjectAttributes,
-} from '../../../../../core/public';
+} from '@kbn/core/public';
 
 /**
  * Returns an object matching a given title
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts b/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
index 64843ce9260d2..b8aa5d386cd35 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
-import { DataViewsContract } from '../../../../data_views/public';
 
 /**
  * After creation or fetching from ES, ensure that the searchSources index indexPattern
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
index b6dddf8d82b72..5f67c471c3862 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
@@ -7,7 +7,7 @@
  */
 
 import { cloneDeep, assign } from 'lodash';
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
 
 /**
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
index bd5e632f80435..bc51775dda428 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from 'kibana/public';
-import { SavedObjectsClientContract } from '../../../../../core/public';
+import { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from '@kbn/core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { saveWithConfirmation } from './save_with_confirmation';
 import * as deps from './confirm_modal_promise';
 import { OVERWRITE_REJECTED } from '../../constants';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
index 527a666c79c73..3f4ddbf9836d9 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
@@ -13,7 +13,7 @@ import {
   SavedObjectsCreateOptions,
   OverlayStart,
   SavedObjectsClientContract,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { OVERWRITE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
index c5e6e158a2cbd..108b297c50377 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
@@ -7,8 +7,8 @@
  */
 
 import { forOwn } from 'lodash';
+import { extractSearchSourceReferences } from '@kbn/data-plugin/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
-import { extractSearchSourceReferences } from '../../../../data/public';
 import { expandShorthand } from './field_mapping';
 
 export function serializeSavedObject(savedObject: SavedObject, config: SavedObjectConfig) {
diff --git a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
index 01fc75df459bc..d53d9981957d9 100644
--- a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
@@ -15,11 +15,11 @@ import {
 } from '../types';
 import { SavedObjectDecorator } from './decorators';
 
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock, createSearchSourceMock } from '../../../../plugins/data/public/mocks';
-import { createStubIndexPattern } from '../../../../plugins/data/common/stubs';
-import { SavedObjectAttributes, SimpleSavedObject } from 'kibana/public';
-import { DataView } from '../../../data/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock, createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
+import { createStubIndexPattern } from '@kbn/data-plugin/common/stubs';
+import { SavedObjectAttributes, SimpleSavedObject } from '@kbn/core/public';
+import { DataView } from '@kbn/data-plugin/common';
 import { savedObjectsDecoratorRegistryMock } from './decorators/registry.mock';
 
 describe('Saved Object', () => {
diff --git a/src/plugins/saved_objects/public/types.ts b/src/plugins/saved_objects/public/types.ts
index c0848307b8b61..a7a3029db1ba1 100644
--- a/src/plugins/saved_objects/public/types.ts
+++ b/src/plugins/saved_objects/public/types.ts
@@ -12,14 +12,14 @@ import {
   SavedObjectsClientContract,
   SavedObjectAttributes,
   SavedObjectReference,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import {
   IndexPattern,
   ISearchSource,
   ISearchStart,
   SerializedSearchSourceFields,
-} from '../../data/public';
-import { DataViewsContract } from '../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 /**
  * @deprecated
diff --git a/src/plugins/saved_objects/server/plugin.ts b/src/plugins/saved_objects/server/plugin.ts
index 0343ad04336e5..c540846a191f8 100644
--- a/src/plugins/saved_objects/server/plugin.ts
+++ b/src/plugins/saved_objects/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { uiSettings } from './ui_settings';
 
 export class SavedObjectsServerPlugin implements Plugin<object, object> {
diff --git a/src/plugins/saved_objects/server/ui_settings.ts b/src/plugins/saved_objects/server/ui_settings.ts
index 4fa1fb221b42f..6028a1a57f83c 100644
--- a/src/plugins/saved_objects/server/ui_settings.ts
+++ b/src/plugins/saved_objects/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common';
 
 export const uiSettings: Record<string, UiSettingsParams> = {
diff --git a/src/plugins/saved_objects_management/common/types.ts b/src/plugins/saved_objects_management/common/types.ts
index cb771a2aa0ab6..957fec6a87e53 100644
--- a/src/plugins/saved_objects_management/common/types.ts
+++ b/src/plugins/saved_objects_management/common/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from 'src/core/types';
-import type { SavedObjectsNamespaceType } from 'src/core/public';
+import type { SavedObject } from '@kbn/core/types';
+import type { SavedObjectsNamespaceType } from '@kbn/core/public';
 
 /**
  * The metadata injected into a {@link SavedObject | saved object} when returning
diff --git a/src/plugins/saved_objects_management/kibana.json b/src/plugins/saved_objects_management/kibana.json
index 4e9977915f5cd..f9f0df88b9920 100644
--- a/src/plugins/saved_objects_management/kibana.json
+++ b/src/plugins/saved_objects_management/kibana.json
@@ -10,5 +10,5 @@
   "requiredPlugins": ["management", "data", "dataViews"],
   "optionalPlugins": ["home", "savedObjectsTaggingOss", "spaces"],
   "extraPublicDirs": ["public/lib"],
-  "requiredBundles": ["kibanaReact", "home"]
+  "requiredBundles": ["kibanaReact"]
 }
diff --git a/src/plugins/saved_objects_management/public/index.ts b/src/plugins/saved_objects_management/public/index.ts
index 99ffae349bb48..d9aad59688fb5 100644
--- a/src/plugins/saved_objects_management/public/index.ts
+++ b/src/plugins/saved_objects_management/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 export type {
diff --git a/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts b/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts
index 1d29a39b5c7e4..370939d62e1d2 100644
--- a/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { SavedObjectWithMetadata } from '../types';
 
 export async function bulkGetObjects(
diff --git a/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts b/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
index 7a50bb9897987..eb14f96c700ec 100644
--- a/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
+++ b/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsFindOptionsReference } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptionsReference } from '@kbn/core/public';
 
 export async function fetchExportByTypeAndSearch({
   http,
diff --git a/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts b/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
index 401bd882aea9d..d6d8d9a7c01ae 100644
--- a/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 export async function fetchExportObjects(
   http: HttpStart,
diff --git a/src/plugins/saved_objects_management/public/lib/find_objects.ts b/src/plugins/saved_objects_management/public/lib/find_objects.ts
index 9dafae0be303f..aff66e0a08cc6 100644
--- a/src/plugins/saved_objects_management/public/lib/find_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/find_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsFindOptions } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptions } from '@kbn/core/public';
 import { keysToCamelCaseShallow } from './case_conversion';
 import { SavedObjectWithMetadata } from '../types';
 
diff --git a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
index b2465e09a3888..7e68dbc6be37d 100644
--- a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 
 interface GetAllowedTypesResponse {
diff --git a/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
index 26841b43e909e..c52ce26e96a39 100644
--- a/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectGetRelationshipsResponse } from '../types';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getRelationships } from './get_relationships';
 
 describe('getRelationships', () => {
diff --git a/src/plugins/saved_objects_management/public/lib/get_relationships.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
index 9002442f6db9c..f0431144573d4 100644
--- a/src/plugins/saved_objects_management/public/lib/get_relationships.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { get } from 'lodash';
 import { SavedObjectGetRelationshipsResponse } from '../types';
 
diff --git a/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
index ebe4c9c2f376d..6d31d7085606a 100644
--- a/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsFindOptionsReference } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptionsReference } from '@kbn/core/public';
 
 export async function getSavedObjectCounts({
   http,
diff --git a/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts b/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts
index 533797aa8e526..8f5114224e9aa 100644
--- a/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { taggingApiMock } from '../../../saved_objects_tagging_oss/public/mocks';
+import { taggingApiMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
 import { getTagFindReferences } from './get_tag_references';
 
 const tagNameToRef = (name: string) => ({
diff --git a/src/plugins/saved_objects_management/public/lib/get_tag_references.ts b/src/plugins/saved_objects_management/public/lib/get_tag_references.ts
index 835545b1477a5..fbeec9113cd6d 100644
--- a/src/plugins/saved_objects_management/public/lib/get_tag_references.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_tag_references.ts
@@ -7,8 +7,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsFindOptionsReference } from 'kibana/server';
-import { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/server';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 export const getTagFindReferences = ({
   selectedTags,
diff --git a/src/plugins/saved_objects_management/public/lib/import_file.ts b/src/plugins/saved_objects_management/public/lib/import_file.ts
index c3e984c6dd38e..a9774b306557b 100644
--- a/src/plugins/saved_objects_management/public/lib/import_file.ts
+++ b/src/plugins/saved_objects_management/public/lib/import_file.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsImportResponse } from 'src/core/public';
+import { HttpStart, SavedObjectsImportResponse } from '@kbn/core/public';
 import { ImportMode } from '../management_section/objects_table/components/import_mode_control';
 
 export async function importFile(
diff --git a/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
index c44003eeaf071..6e354d994220b 100644
--- a/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectsImportUnknownError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportResponse,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { processImportResponse } from './process_import_response';
 
 describe('processImportResponse()', () => {
diff --git a/src/plugins/saved_objects_management/public/lib/process_import_response.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
index 67c66bce1b331..4f2624c73ed1e 100644
--- a/src/plugins/saved_objects_management/public/lib/process_import_response.ts
+++ b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
@@ -16,7 +16,7 @@ import {
   SavedObjectsImportFailure,
   SavedObjectsImportSuccess,
   SavedObjectsImportWarning,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 export interface FailedImport {
   obj: Omit<SavedObjectsImportFailure, 'error'>;
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
index 6e6b15f5ec135..c9a206925564e 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsImportUnknownError } from 'src/core/public';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { SavedObjectsImportUnknownError } from '@kbn/core/public';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { resolveImportErrors } from './resolve_import_errors';
 
 function getFormData(form: Map<string, any>) {
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
index b6699385f20e4..9e90627096742 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectsImportRetry,
   SavedObjectsImportResponse,
   SavedObjectsImportAmbiguousConflictError,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { Required } from '@kbn/utility-types';
 import { FailedImport, ProcessedImportResponse } from './process_import_response';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
index bca3741bf2741..b3822d92e4aab 100644
--- a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -12,12 +12,12 @@ import { Router, Switch, Route } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import { CoreSetup } from 'src/core/public';
-import { wrapWithTheme } from '../../../kibana_react/public';
-import { ManagementAppMountParams } from '../../../management/public';
+import { CoreSetup } from '@kbn/core/public';
+import { wrapWithTheme } from '@kbn/kibana-react-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 import { StartDependencies, SavedObjectsManagementPluginStart } from '../plugin';
-import { getAllowedTypes } from './../lib';
+import { getAllowedTypes } from '../lib';
 
 interface MountParams {
   core: CoreSetup<StartDependencies, SavedObjectsManagementPluginStart>;
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx
index 58d6da8ce935b..b904bd8035627 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { XJsonLang } from '@kbn/monaco';
 import { omit } from 'lodash';
 import { EuiButtonEmpty, EuiCopy, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { CodeEditor } from '../../../../../kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { SavedObjectWithMetadata } from '../../../../common';
 
 export interface InspectProps {
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
index 40936d27589a9..61fda64215301 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n-react';
 import { NotFoundErrors } from './not_found_errors';
-import { docLinksServiceMock } from '../../../../../../core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 describe('NotFoundErrors component', () => {
   const mountError = (type: string) =>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
index 56a317b54c4fd..c6cf64115d6a2 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
@@ -11,7 +11,7 @@ import { EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiLink } from '@elastic/eui';
-import { DocLinksStart } from '../../../../../../core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 interface NotFoundErrors {
   type: string;
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx
index ba0a584a94074..fd7d71a39dcd2 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx
@@ -21,7 +21,7 @@ import {
   uiSettingsServiceMock,
   scopedHistoryMock,
   docLinksServiceMock,
-} from '../../../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 
 import {
   SavedObjectEdition,
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
index 64b6e27309dd2..6a695858fca35 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
@@ -10,7 +10,7 @@ import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { get } from 'lodash';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   Capabilities,
   SavedObjectsClientContract,
@@ -20,7 +20,7 @@ import {
   HttpSetup,
   IUiSettingsClient,
   DocLinksStart,
-} from '../../../../../core/public';
+} from '@kbn/core/public';
 import { Header, Inspect, NotFoundErrors } from './components';
 import { bulkGetObjects } from '../../lib/bulk_get_objects';
 import { SavedObjectWithMetadata } from '../../types';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
index 62a1c6357df05..9509d72bdad40 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
@@ -10,10 +10,10 @@ import { importFileMock, resolveImportErrorsMock } from './flyout.test.mocks';
 
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
-import { coreMock, httpServiceMock } from '../../../../../../core/public/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/public/mocks';
 import { Flyout, FlyoutProps, FlyoutState } from './flyout';
 import { ShallowWrapper } from 'enzyme';
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 const mockFile = {
   name: 'foo.ndjson',
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index 5b0408110fd85..dd46606a60316 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -31,9 +31,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { HttpStart, IBasePath } from 'src/core/public';
-import { ISearchStart } from '../../../../../data/public';
-import type { DataViewsContract, DataView } from '../../../../../data_views/public';
+import { HttpStart, IBasePath } from '@kbn/core/public';
+import { ISearchStart } from '@kbn/data-plugin/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import {
   importFile,
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
index 03d3631398cda..bb949f855ff18 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { mountWithI18nProvider } from '@kbn/test-jest-helpers';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { ImportSummary, ImportSummaryProps } from './import_summary';
 import { FailedImport } from '../../../lib';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
index 016ba282c561f..70788ac04af4b 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
@@ -27,7 +27,7 @@ import type {
   SavedObjectsImportSuccess,
   SavedObjectsImportWarning,
   IBasePath,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { getDefaultTitle, getSavedObjectLabel, FailedImport } from '../../../lib';
 import './import_summary.scss';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
index 751335e4670d9..adb920d3a6133 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { Relationships, RelationshipsProps } from './relationships';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
index 9fef685250937..75614ba83ec16 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
@@ -24,7 +24,7 @@ import {
 import { SearchFilterConfig } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { IBasePath } from 'src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
 import {
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
index c0b795f9e9610..4ee1510a7627c 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { keys } from '@elastic/eui';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { actionServiceMock } from '../../../services/action_service.mock';
 import { columnServiceMock } from '../../../services/column_service.mock';
 import { Table, TableProps } from './table';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
index fb0e55fb272a1..ff5d49da99c61 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart, IBasePath } from 'src/core/public';
+import { ApplicationStart, IBasePath } from '@kbn/core/public';
 import React, { PureComponent, Fragment } from 'react';
 import {
   EuiSearchBar,
@@ -27,7 +27,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedObjectsTaggingApi } from '../../../../../saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
 import { SavedObjectWithMetadata } from '../../../types';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index 5382cc39989ed..28a31890664b9 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -26,9 +26,9 @@ import {
   notificationServiceMock,
   savedObjectsServiceMock,
   applicationServiceMock,
-} from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { dataViewPluginMocks } from '../../../../data_views/public/mocks';
+} from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import type { SavedObjectManagementTypeInfo } from '../../../common/types';
 import { actionServiceMock } from '../../services/action_service.mock';
 import { columnServiceMock } from '../../services/column_service.mock';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
index 12ef7ba075cdb..c8330e0eb9cf3 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -19,10 +19,11 @@ import {
   OverlayStart,
   NotificationsStart,
   ApplicationStart,
-} from 'src/core/public';
-import { RedirectAppLinks } from '../../../../kibana_react/public';
-import { SavedObjectsTaggingApi } from '../../../../saved_objects_tagging_oss/public';
-import { DataViewsContract } from '../../../../data_views/public';
+} from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../../common/types';
 import {
   parseQuery,
@@ -49,7 +50,6 @@ import {
   DeleteConfirmModal,
   ExportModal,
 } from './components';
-import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 
 interface ExportAllOption {
   id: string;
diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx
index 8d71a6429490e..f77c7bfed86d6 100644
--- a/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx
@@ -10,8 +10,8 @@ import React, { useEffect } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
 import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
-import { CoreStart, ChromeBreadcrumb, ScopedHistory } from 'src/core/public';
-import { RedirectAppLinks } from '../../../kibana_react/public';
+import { CoreStart, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { SavedObjectEdition } from './object_view';
 import './saved_objects_edition_page.scss';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
index 129c35a6a93f9..dac81d87730c0 100644
--- a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
@@ -12,11 +12,11 @@ import { get } from 'lodash';
 import { Query } from '@elastic/eui';
 import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
-import { CoreStart, ChromeBreadcrumb } from 'src/core/public';
-import type { SpacesApi, SpacesContextProps } from '../../../../../x-pack/plugins/spaces/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsContract } from '../../../data_views/public';
-import { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
+import { CoreStart, ChromeBreadcrumb } from '@kbn/core/public';
+import type { SpacesApi, SpacesContextProps } from '@kbn/spaces-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 import {
   SavedObjectsManagementActionServiceStart,
diff --git a/src/plugins/saved_objects_management/public/plugin.test.ts b/src/plugins/saved_objects_management/public/plugin.test.ts
index 311cd811c455a..14f5a45d3bb94 100644
--- a/src/plugins/saved_objects_management/public/plugin.test.ts
+++ b/src/plugins/saved_objects_management/public/plugin.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/public/mocks';
-import { homePluginMock } from '../../home/public/mocks';
-import { managementPluginMock } from '../../management/public/mocks';
-import { dataViewPluginMocks } from '../../data_views/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 describe('SavedObjectsManagementPlugin', () => {
diff --git a/src/plugins/saved_objects_management/public/plugin.ts b/src/plugins/saved_objects_management/public/plugin.ts
index 97093fc9f4b77..af899499a54ab 100644
--- a/src/plugins/saved_objects_management/public/plugin.ts
+++ b/src/plugins/saved_objects_management/public/plugin.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
-import { ManagementSetup } from '../../management/public';
-import { DataPublicPluginStart } from '../../data/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { HomePublicPluginSetup, FeatureCatalogueCategory } from '../../home/public';
-import { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import {
   SavedObjectsManagementActionService,
   SavedObjectsManagementActionServiceSetup,
@@ -76,7 +76,7 @@ export class SavedObjectsManagementPlugin
         icon: 'savedObjectsApp',
         path: '/app/management/kibana/objects',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/src/plugins/saved_objects_management/public/services/action_service.test.ts b/src/plugins/saved_objects_management/public/services/action_service.test.ts
index 7a2536611f58a..3068a55b728b1 100644
--- a/src/plugins/saved_objects_management/public/services/action_service.test.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { spacesPluginMock } from '../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import {
   CopyToSpaceSavedObjectsManagementAction,
   ShareToSpaceSavedObjectsManagementAction,
diff --git a/src/plugins/saved_objects_management/public/services/action_service.ts b/src/plugins/saved_objects_management/public/services/action_service.ts
index b72ca3d2535de..a13db8c590f8a 100644
--- a/src/plugins/saved_objects_management/public/services/action_service.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import {
   CopyToSpaceSavedObjectsManagementAction,
   ShareToSpaceSavedObjectsManagementAction,
diff --git a/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx b/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx
index 5773f64a1e628..3d51f6e52a728 100644
--- a/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx
+++ b/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx
@@ -10,10 +10,7 @@ import React, { useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type {
-  CopyToSpaceFlyoutProps,
-  SpacesApiUi,
-} from '../../../../../../x-pack/plugins/spaces/public';
+import type { CopyToSpaceFlyoutProps, SpacesApiUi } from '@kbn/spaces-plugin/public';
 import type { SavedObjectsManagementRecord } from '../types';
 import { SavedObjectsManagementAction } from '../types';
 
@@ -33,7 +30,7 @@ export class CopyToSpaceSavedObjectsManagementAction extends SavedObjectsManagem
 
   public euiAction = {
     name: i18n.translate('savedObjectsManagement.copyToSpace.actionTitle', {
-      defaultMessage: 'Copy to space',
+      defaultMessage: 'Copy to spaces',
     }),
     description: i18n.translate('savedObjectsManagement.copyToSpace.actionDescription', {
       defaultMessage: 'Make a copy of this saved object in one or more spaces',
diff --git a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx
index 235f8d4508a64..fd62beb4a12fd 100644
--- a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx
+++ b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { spacesPluginMock } from '../../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import type { SavedObjectsManagementRecord } from '../types';
 import { ShareToSpaceSavedObjectsManagementAction } from './share_saved_objects_to_space_action';
 
diff --git a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx
index b1a80c71e4ea2..cec28e07fdaf3 100644
--- a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx
+++ b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx
@@ -10,10 +10,7 @@ import React, { useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type {
-  ShareToSpaceFlyoutProps,
-  SpacesApiUi,
-} from '../../../../../../x-pack/plugins/spaces/public';
+import type { ShareToSpaceFlyoutProps, SpacesApiUi } from '@kbn/spaces-plugin/public';
 import type { SavedObjectsManagementRecord } from '../types';
 import { SavedObjectsManagementAction } from '../types';
 
@@ -33,10 +30,10 @@ export class ShareToSpaceSavedObjectsManagementAction extends SavedObjectsManage
 
   public euiAction = {
     name: i18n.translate('savedObjectsManagement.shareToSpace.actionTitle', {
-      defaultMessage: 'Assign spaces',
+      defaultMessage: 'Share to spaces',
     }),
     description: i18n.translate('savedObjectsManagement.shareToSpace.actionDescription', {
-      defaultMessage: 'Change the spaces this object is assigned to',
+      defaultMessage: 'Share this object to one or more spaces',
     }),
     icon: 'share',
     type: 'icon',
diff --git a/src/plugins/saved_objects_management/public/services/column_service.test.ts b/src/plugins/saved_objects_management/public/services/column_service.test.ts
index 1124e71b36c52..a2a0528800427 100644
--- a/src/plugins/saved_objects_management/public/services/column_service.test.ts
+++ b/src/plugins/saved_objects_management/public/services/column_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { spacesPluginMock } from '../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { ShareToSpaceSavedObjectsManagementColumn } from './columns';
 import {
   SavedObjectsManagementColumnService,
diff --git a/src/plugins/saved_objects_management/public/services/column_service.ts b/src/plugins/saved_objects_management/public/services/column_service.ts
index d9c88ec8834e5..1606948b41ca5 100644
--- a/src/plugins/saved_objects_management/public/services/column_service.ts
+++ b/src/plugins/saved_objects_management/public/services/column_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import { ShareToSpaceSavedObjectsManagementColumn } from './columns';
 import { SavedObjectsManagementColumn } from './types';
 
diff --git a/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx b/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx
index ed99aeccf00ce..732ead0756168 100644
--- a/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx
+++ b/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx
@@ -10,14 +10,14 @@ import React, { useMemo, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type { Capabilities, SavedObjectsNamespaceType } from 'src/core/public';
+import type { Capabilities, SavedObjectsNamespaceType } from '@kbn/core/public';
 import { EuiIconTip, EuiToolTip } from '@elastic/eui';
 
 import type {
   ShareToSpaceFlyoutProps,
   SpaceListProps,
   SpacesApiUi,
-} from '../../../../../../x-pack/plugins/spaces/public';
+} from '@kbn/spaces-plugin/public';
 import type { SavedObjectsManagementRecord } from '../types';
 import { SavedObjectsManagementColumn } from '../types';
 import { SHAREABLE_SOON_OBJECT_TYPES } from './constants';
diff --git a/src/plugins/saved_objects_management/public/services/types/action.ts b/src/plugins/saved_objects_management/public/services/types/action.ts
index b0ab229065555..598dbc63c8ff2 100644
--- a/src/plugins/saved_objects_management/public/services/types/action.ts
+++ b/src/plugins/saved_objects_management/public/services/types/action.ts
@@ -7,7 +7,7 @@
  */
 
 import { ReactNode } from 'react';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import { SavedObjectsManagementRecord } from '.';
 
 interface ActionContext {
diff --git a/src/plugins/saved_objects_management/public/services/types/column.ts b/src/plugins/saved_objects_management/public/services/types/column.ts
index fcdb33015df59..ea3d8d5f99045 100644
--- a/src/plugins/saved_objects_management/public/services/types/column.ts
+++ b/src/plugins/saved_objects_management/public/services/types/column.ts
@@ -7,7 +7,7 @@
  */
 
 import { EuiTableFieldDataColumnType } from '@elastic/eui';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import { SavedObjectsManagementRecord } from '.';
 
 interface ColumnContext {
diff --git a/src/plugins/saved_objects_management/public/services/types/record.ts b/src/plugins/saved_objects_management/public/services/types/record.ts
index fc92c83cfc790..6aff08af9795b 100644
--- a/src/plugins/saved_objects_management/public/services/types/record.ts
+++ b/src/plugins/saved_objects_management/public/services/types/record.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference, SavedObjectsNamespaceType } from 'src/core/public';
+import { SavedObjectReference, SavedObjectsNamespaceType } from '@kbn/core/public';
 
 export interface SavedObjectsManagementRecord {
   type: string;
diff --git a/src/plugins/saved_objects_management/server/index.ts b/src/plugins/saved_objects_management/server/index.ts
index 942d7b0734aee..1ec0db16fd62b 100644
--- a/src/plugins/saved_objects_management/server/index.ts
+++ b/src/plugins/saved_objects_management/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) =>
diff --git a/src/plugins/saved_objects_management/server/lib/find_all.test.ts b/src/plugins/saved_objects_management/server/lib/find_all.test.ts
index 1fbe9c41592ba..59c2efd36a8f4 100644
--- a/src/plugins/saved_objects_management/server/lib/find_all.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_all.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { times } from 'lodash';
-import { SavedObjectsFindOptions, SavedObjectsFindResult } from 'src/core/server';
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
+import { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { findAll } from './find_all';
 
 describe('findAll', () => {
diff --git a/src/plugins/saved_objects_management/server/lib/find_all.ts b/src/plugins/saved_objects_management/server/lib/find_all.ts
index 8d908234c6961..bb27bbd3765ef 100644
--- a/src/plugins/saved_objects_management/server/lib/find_all.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_all.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectsClientContract,
   SavedObject,
   SavedObjectsCreatePointInTimeFinderOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 export const findAll = async (
   client: SavedObjectsClientContract,
diff --git a/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts b/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts
index 0da14cbee4fd5..2d1ba251c89af 100644
--- a/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject, SavedObjectError } from 'src/core/types';
-import type { SavedObjectsFindResponse } from 'src/core/server';
+import type { SavedObject, SavedObjectError } from '@kbn/core/types';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 import { findRelationships } from './find_relationships';
 import { managementMock } from '../services/management.mock';
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 const createObj = (parts: Partial<SavedObject<any>>): SavedObject<any> => ({
   id: 'id',
diff --git a/src/plugins/saved_objects_management/server/lib/find_relationships.ts b/src/plugins/saved_objects_management/server/lib/find_relationships.ts
index 9d62667282ddd..329d985b0b266 100644
--- a/src/plugins/saved_objects_management/server/lib/find_relationships.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_relationships.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { injectMetaAttributes } from './inject_meta_attributes';
 import { ISavedObjectsManagement } from '../services';
 import {
diff --git a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
index 7b5f52d6bf968..308d2fe8709f2 100644
--- a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from 'src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { injectMetaAttributes } from './inject_meta_attributes';
 import { managementMock } from '../services/management.mock';
 
diff --git a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
index d5b585371cbdf..f46a3110e7ec5 100644
--- a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
+++ b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from 'src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { ISavedObjectsManagement } from '../services';
 import { SavedObjectWithMetadata } from '../types';
 
diff --git a/src/plugins/saved_objects_management/server/plugin.test.ts b/src/plugins/saved_objects_management/server/plugin.test.ts
index aa63fb21d087b..dbdd7efecaad9 100644
--- a/src/plugins/saved_objects_management/server/plugin.test.ts
+++ b/src/plugins/saved_objects_management/server/plugin.test.ts
@@ -8,7 +8,7 @@
 
 import { registerRoutesMock } from './plugin.test.mocks';
 import { SavedObjectsManagementPlugin } from './plugin';
-import { coreMock } from '../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('SavedObjectsManagementPlugin', () => {
   let plugin: SavedObjectsManagementPlugin;
diff --git a/src/plugins/saved_objects_management/server/plugin.ts b/src/plugins/saved_objects_management/server/plugin.ts
index 379ef29b02105..93f8e6695cd2b 100644
--- a/src/plugins/saved_objects_management/server/plugin.ts
+++ b/src/plugins/saved_objects_management/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { firstValueFrom, Subject } from 'rxjs';
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './types';
 import { SavedObjectsManagement } from './services';
 import { registerRoutes } from './routes';
diff --git a/src/plugins/saved_objects_management/server/routes/bulk_get.ts b/src/plugins/saved_objects_management/server/routes/bulk_get.ts
index c277653b6f350..9e31b1c24b0b8 100644
--- a/src/plugins/saved_objects_management/server/routes/bulk_get.ts
+++ b/src/plugins/saved_objects_management/server/routes/bulk_get.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { injectMetaAttributes } from '../lib';
 import { ISavedObjectsManagement } from '../services';
 
@@ -29,7 +29,7 @@ export const registerBulkGetRoute = (
     },
     router.handleLegacyErrors(async (context, req, res) => {
       const managementService = await managementServicePromise;
-      const { getClient, typeRegistry } = context.core.savedObjects;
+      const { getClient, typeRegistry } = (await context.core).savedObjects;
 
       const objects = req.body;
       const uniqueTypes = objects.reduce((acc, { type }) => acc.add(type), new Set<string>());
diff --git a/src/plugins/saved_objects_management/server/routes/find.ts b/src/plugins/saved_objects_management/server/routes/find.ts
index 45fbd311c2ee0..05e69da5d3204 100644
--- a/src/plugins/saved_objects_management/server/routes/find.ts
+++ b/src/plugins/saved_objects_management/server/routes/find.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { injectMetaAttributes } from '../lib';
 import { ISavedObjectsManagement } from '../services';
 
@@ -47,7 +47,7 @@ export const registerFindRoute = (
     router.handleLegacyErrors(async (context, req, res) => {
       const { query } = req;
       const managementService = await managementServicePromise;
-      const { getClient, typeRegistry } = context.core.savedObjects;
+      const { getClient, typeRegistry } = (await context.core).savedObjects;
 
       const searchTypes = Array.isArray(query.type) ? query.type : [query.type];
       const includedFields = Array.isArray(query.fields) ? query.fields : [query.fields];
diff --git a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
index 65465fbfa67d8..cdd6dc215d69b 100644
--- a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
+++ b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, SavedObjectsType } from 'src/core/server';
+import { IRouter, SavedObjectsType } from '@kbn/core/server';
 import { SavedObjectManagementTypeInfo } from '../../common';
 
 const convertType = (sot: SavedObjectsType): SavedObjectManagementTypeInfo => {
@@ -25,7 +25,7 @@ export const registerGetAllowedTypesRoute = (router: IRouter) => {
       validate: false,
     },
     async (context, req, res) => {
-      const allowedTypes = context.core.savedObjects.typeRegistry
+      const allowedTypes = (await context.core).savedObjects.typeRegistry
         .getImportableAndExportableTypes()
         .filter((type) => type.management!.visibleInManagement ?? true)
         .map(convertType);
diff --git a/src/plugins/saved_objects_management/server/routes/index.test.ts b/src/plugins/saved_objects_management/server/routes/index.test.ts
index 9c3d235a83e36..8c640d261d212 100644
--- a/src/plugins/saved_objects_management/server/routes/index.test.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { registerRoutes } from './index';
+import { registerRoutes } from '.';
 import { ISavedObjectsManagement } from '../services';
-import { coreMock, httpServiceMock } from '../../../../core/server/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/server/mocks';
 
 describe('registerRoutes', () => {
   it('registers the management routes', () => {
diff --git a/src/plugins/saved_objects_management/server/routes/index.ts b/src/plugins/saved_objects_management/server/routes/index.ts
index 5370088d27977..a66a3aa28470f 100644
--- a/src/plugins/saved_objects_management/server/routes/index.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpServiceSetup } from 'src/core/server';
+import { HttpServiceSetup } from '@kbn/core/server';
 import { ISavedObjectsManagement } from '../services';
 import { registerFindRoute } from './find';
 import { registerBulkGetRoute } from './bulk_get';
diff --git a/src/plugins/saved_objects_management/server/routes/relationships.ts b/src/plugins/saved_objects_management/server/routes/relationships.ts
index 9e2c2031d8abd..8900987a645fe 100644
--- a/src/plugins/saved_objects_management/server/routes/relationships.ts
+++ b/src/plugins/saved_objects_management/server/routes/relationships.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { chain } from 'lodash';
 import { findRelationships } from '../lib';
 import { ISavedObjectsManagement } from '../services';
@@ -32,7 +32,7 @@ export const registerRelationshipsRoute = (
     },
     router.handleLegacyErrors(async (context, req, res) => {
       const managementService = await managementServicePromise;
-      const { getClient, typeRegistry } = context.core.savedObjects;
+      const { getClient, typeRegistry } = (await context.core).savedObjects;
       const { type, id } = req.params;
       const { size, savedObjectTypes: maybeArraySavedObjectTypes } = req.query;
       const savedObjectTypes = Array.isArray(maybeArraySavedObjectTypes)
diff --git a/src/plugins/saved_objects_management/server/routes/scroll_count.ts b/src/plugins/saved_objects_management/server/routes/scroll_count.ts
index 9a021be4c0cde..26dd1d57b4cf9 100644
--- a/src/plugins/saved_objects_management/server/routes/scroll_count.ts
+++ b/src/plugins/saved_objects_management/server/routes/scroll_count.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, SavedObjectsCreatePointInTimeFinderOptions } from 'src/core/server';
+import { IRouter, SavedObjectsCreatePointInTimeFinderOptions } from '@kbn/core/server';
 import { chain } from 'lodash';
 import { findAll } from '../lib';
 
@@ -31,7 +31,7 @@ export const registerScrollForCountRoute = (router: IRouter) => {
       },
     },
     router.handleLegacyErrors(async (context, req, res) => {
-      const { getClient, typeRegistry } = context.core.savedObjects;
+      const { getClient, typeRegistry } = (await context.core).savedObjects;
       const { typesToInclude, searchString, references } = req.body;
 
       const includedHiddenTypes = chain(typesToInclude)
diff --git a/src/plugins/saved_objects_management/server/services/management.test.ts b/src/plugins/saved_objects_management/server/services/management.test.ts
index a96a0697ea3b6..39966bc88e8b3 100644
--- a/src/plugins/saved_objects_management/server/services/management.test.ts
+++ b/src/plugins/saved_objects_management/server/services/management.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectsManagement } from './management';
-import { SavedObjectsType, SavedObjectTypeRegistry } from '../../../../core/server';
+import { SavedObjectsType, SavedObjectTypeRegistry } from '@kbn/core/server';
 
 describe('SavedObjectsManagement', () => {
   let registry: SavedObjectTypeRegistry;
diff --git a/src/plugins/saved_objects_management/server/services/management.ts b/src/plugins/saved_objects_management/server/services/management.ts
index 176c52c5a21bc..d3584fdb11127 100644
--- a/src/plugins/saved_objects_management/server/services/management.ts
+++ b/src/plugins/saved_objects_management/server/services/management.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { ISavedObjectTypeRegistry, SavedObject } from 'src/core/server';
+import { ISavedObjectTypeRegistry, SavedObject } from '@kbn/core/server';
 
 export type ISavedObjectsManagement = PublicMethodsOf<SavedObjectsManagement>;
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/api.ts b/src/plugins/saved_objects_tagging_oss/public/api.ts
index 3f4dac2d9c29f..61d6fe29e64d9 100644
--- a/src/plugins/saved_objects_tagging_oss/public/api.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/api.ts
@@ -9,9 +9,9 @@
 import { Observable } from 'rxjs';
 import { SearchFilterConfig, EuiTableFieldDataColumnType } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
-import { SavedObject, SavedObjectReference } from '../../../core/types';
-import { SavedObjectsFindOptionsReference } from '../../../core/public';
-import { SavedObject as SavedObjectClass } from '../../saved_objects/public';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
+import { SavedObject as SavedObjectClass } from '@kbn/saved-objects-plugin/public';
 import { TagDecoratedSavedObject } from './decorator';
 import { ITagsClient, Tag } from '../common';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts
index b66b0863cad51..8067110fc3830 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts
@@ -8,7 +8,7 @@
 
 import { extractTagReferencesMock, injectTagReferencesMock } from './decorate_config.test.mocks';
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 import { decorateConfig } from './decorate_config';
 
 describe('decorateConfig', () => {
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts
index 5a85b9a2bd0c2..2a5193134d08c 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 import { injectTagReferences } from './inject_tag_references';
 import { extractTagReferences } from './extract_tag_references';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts
index 80edbaaf875f3..b43460b7c1e44 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../core/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { extractTagReferences } from './extract_tag_references';
 
 const ref = (type: string, id: string, name = `ref-to-${type}-${id}`): SavedObjectReference => ({
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts
index 354f6825d8220..2b2cc2af62c62 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 
 /**
  * Extract the tag references from the object's attribute
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts
index b353c41dbcdde..1278bc894b5fe 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectDecoratorFactory } from '../../../saved_objects/public';
+import { SavedObjectDecoratorFactory } from '@kbn/saved-objects-plugin/public';
 import { InternalTagDecoratedSavedObject } from './types';
 import { decorateConfig } from './decorate_config';
 import { decorateObject } from './decorate_object';
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts
index 7ca7c50505f27..f4cc18ef17c8e 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectDecoratorConfig } from '../../../saved_objects/public';
+import { SavedObjectDecoratorConfig } from '@kbn/saved-objects-plugin/public';
 import { tagDecoratorFactory, decoratorId } from './factory';
 import { InternalTagDecoratedSavedObject } from './types';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts
index 941596aad850d..b0f77047460d9 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../core/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { injectTagReferences } from './inject_tag_references';
 import { InternalTagDecoratedSavedObject } from './types';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts
index a73b70dd87c06..1c0507eca9e79 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 import { InternalTagDecoratedSavedObject } from './types';
 
 /**
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts
index 5cc822cd6d0b3..c7f8e0040ee74 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from '../../../saved_objects/public';
+import { SavedObject } from '@kbn/saved-objects-plugin/public';
 
 /**
  * @public
diff --git a/src/plugins/saved_objects_tagging_oss/public/index.ts b/src/plugins/saved_objects_tagging_oss/public/index.ts
index 6e9a0bf3d832e..cb22cb9ce4864 100644
--- a/src/plugins/saved_objects_tagging_oss/public/index.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { SavedObjectTaggingOssPlugin } from './plugin';
 
 export type { SavedObjectTaggingOssPluginSetup, SavedObjectTaggingOssPluginStart } from './types';
diff --git a/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts b/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts
index 30b764df59315..fef1930646ad5 100644
--- a/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/public/mocks';
-import { savedObjectsPluginMock } from '../../saved_objects/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
 import { tagDecoratorConfig } from './decorator';
 import { taggingApiMock } from './api.mock';
 import { SavedObjectTaggingOssPlugin } from './plugin';
diff --git a/src/plugins/saved_objects_tagging_oss/public/plugin.ts b/src/plugins/saved_objects_tagging_oss/public/plugin.ts
index f923a08eb0b06..70a3a35134d25 100644
--- a/src/plugins/saved_objects_tagging_oss/public/plugin.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from 'src/core/public';
-import { SavedObjectSetup } from '../../saved_objects/public';
+import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from '@kbn/core/public';
+import { SavedObjectSetup } from '@kbn/saved-objects-plugin/public';
 import { SavedObjectTaggingOssPluginSetup, SavedObjectTaggingOssPluginStart } from './types';
 import { SavedObjectsTaggingApi } from './api';
 import { tagDecoratorConfig } from './decorator';
diff --git a/src/plugins/screenshot_mode/public/plugin.test.ts b/src/plugins/screenshot_mode/public/plugin.test.ts
index f2c0970d0ff60..8a71f3cdcca67 100644
--- a/src/plugins/screenshot_mode/public/plugin.test.ts
+++ b/src/plugins/screenshot_mode/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ScreenshotModePlugin } from './plugin';
 import { setScreenshotModeEnabled, setScreenshotModeDisabled } from '../common';
 
diff --git a/src/plugins/screenshot_mode/public/plugin.ts b/src/plugins/screenshot_mode/public/plugin.ts
index 2df8585cd6817..2008e46e9b2d6 100644
--- a/src/plugins/screenshot_mode/public/plugin.ts
+++ b/src/plugins/screenshot_mode/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import type { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { getScreenshotContext, getScreenshotMode } from '../common';
 import type { ScreenshotModePluginSetup, ScreenshotModePluginStart } from './types';
 
diff --git a/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts b/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts
index 6d783970bd362..57a9306708aee 100644
--- a/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts
+++ b/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { KBN_SCREENSHOT_MODE_HEADER } from '../common';
 import { isScreenshotMode } from './is_screenshot_mode';
 
diff --git a/src/plugins/screenshot_mode/server/is_screenshot_mode.ts b/src/plugins/screenshot_mode/server/is_screenshot_mode.ts
index 8b8819f462770..8769a69998577 100644
--- a/src/plugins/screenshot_mode/server/is_screenshot_mode.ts
+++ b/src/plugins/screenshot_mode/server/is_screenshot_mode.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import { KBN_SCREENSHOT_MODE_HEADER } from '../common';
 
 export const isScreenshotMode = (request: KibanaRequest): boolean => {
diff --git a/src/plugins/screenshot_mode/server/plugin.ts b/src/plugins/screenshot_mode/server/plugin.ts
index ff150b2f1a934..fc900170f7a83 100644
--- a/src/plugins/screenshot_mode/server/plugin.ts
+++ b/src/plugins/screenshot_mode/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'src/core/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
 import type {
   ScreenshotModeRequestHandlerContext,
   ScreenshotModePluginSetup,
diff --git a/src/plugins/screenshot_mode/server/types.ts b/src/plugins/screenshot_mode/server/types.ts
index 5b9e50657674a..08655d2f0118d 100644
--- a/src/plugins/screenshot_mode/server/types.ts
+++ b/src/plugins/screenshot_mode/server/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandlerContext, KibanaRequest } from 'src/core/server';
+import type { CustomRequestHandlerContext, KibanaRequest } from '@kbn/core/server';
 
 export interface ScreenshotModePluginStart {
   /**
@@ -32,8 +32,8 @@ export interface ScreenshotModePluginSetup extends ScreenshotModePluginStart {
   setScreenshotModeEnabled(): void;
 }
 
-export interface ScreenshotModeRequestHandlerContext extends RequestHandlerContext {
+export type ScreenshotModeRequestHandlerContext = CustomRequestHandlerContext<{
   screenshotMode: {
     isScreenshot: boolean;
   };
-}
+}>;
diff --git a/src/plugins/share/common/anonymous_access/types.ts b/src/plugins/share/common/anonymous_access/types.ts
index 7ab731dfabaaa..768117ca29496 100644
--- a/src/plugins/share/common/anonymous_access/types.ts
+++ b/src/plugins/share/common/anonymous_access/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 
 /**
  * The contract that is used to check anonymous access for the purposes of sharing public links. The implementation is intended to be
diff --git a/src/plugins/share/common/url_service/__tests__/locators.test.ts b/src/plugins/share/common/url_service/__tests__/locators.test.ts
index 93ba76c7399f4..dfbcbe132dc6b 100644
--- a/src/plugins/share/common/url_service/__tests__/locators.test.ts
+++ b/src/plugins/share/common/url_service/__tests__/locators.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from 'src/plugins/kibana_utils/common';
+import { of } from '@kbn/kibana-utils-plugin/common';
 import { testLocator, TestLocatorState, urlServiceTestSetup } from './setup';
 
 describe('locators', () => {
diff --git a/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts b/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts
index 0a2064478f7ba..c14f4e9ca45b4 100644
--- a/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts
+++ b/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaLocation, LocatorDefinition } from '../../url_service';
+import type { KibanaLocation, LocatorDefinition } from '..';
 import { shortUrlAssertValid } from './short_url_assert_valid';
 
 export const LEGACY_SHORT_URL_LOCATOR_ID = 'LEGACY_SHORT_URL_LOCATOR';
diff --git a/src/plugins/share/common/url_service/locators/locator.test.ts b/src/plugins/share/common/url_service/locators/locator.test.ts
index 17c6df8587296..6961d1a9b39d2 100644
--- a/src/plugins/share/common/url_service/locators/locator.test.ts
+++ b/src/plugins/share/common/url_service/locators/locator.test.ts
@@ -9,7 +9,7 @@
 import { LocatorDefinition } from './types';
 import { Locator, LocatorDependencies } from './locator';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaLocation } from 'src/plugins/share/public';
+import { KibanaLocation } from '../../../public';
 import { LocatorGetUrlParams } from '.';
 import { decompressFromBase64 } from 'lz-string';
 
diff --git a/src/plugins/share/common/url_service/locators/locator.ts b/src/plugins/share/common/url_service/locators/locator.ts
index d33bb8c12bcd6..b014a09442aa2 100644
--- a/src/plugins/share/common/url_service/locators/locator.ts
+++ b/src/plugins/share/common/url_service/locators/locator.ts
@@ -8,9 +8,9 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { SavedObjectReference } from 'kibana/server';
+import type { SavedObjectReference } from '@kbn/core/server';
 import { DependencyList } from 'react';
-import type { PersistableState } from 'src/plugins/kibana_utils/common';
+import type { PersistableState } from '@kbn/kibana-utils-plugin/common';
 import { useLocatorUrl } from './use_locator_url';
 import type {
   LocatorDefinition,
diff --git a/src/plugins/share/common/url_service/locators/locator_client.ts b/src/plugins/share/common/url_service/locators/locator_client.ts
index 78a84e8564df4..637c8f7f2718f 100644
--- a/src/plugins/share/common/url_service/locators/locator_client.ts
+++ b/src/plugins/share/common/url_service/locators/locator_client.ts
@@ -7,9 +7,9 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import type { LocatorDependencies } from './locator';
 import type { LocatorDefinition, LocatorPublic, ILocatorClient, LocatorData } from './types';
 import { Locator } from './locator';
diff --git a/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts b/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts
index ade5103670534..1f82c92bc28b5 100644
--- a/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts
+++ b/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaLocation, LocatorDefinition } from '../../url_service';
+import type { KibanaLocation, LocatorDefinition } from '..';
 
 export const SHORT_URL_REDIRECT_LOCATOR = 'SHORT_URL_REDIRECT_LOCATOR';
 
diff --git a/src/plugins/share/common/url_service/locators/types.ts b/src/plugins/share/common/url_service/locators/types.ts
index 641906a8b9191..78b9b0d80b1c6 100644
--- a/src/plugins/share/common/url_service/locators/types.ts
+++ b/src/plugins/share/common/url_service/locators/types.ts
@@ -13,7 +13,7 @@ import {
   PersistableState,
   PersistableStateService,
   VersionedState,
-} from 'src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import type { FormatSearchParamsOptions } from './redirect';
 
 /**
diff --git a/src/plugins/share/common/url_service/locators/use_locator_url.ts b/src/plugins/share/common/url_service/locators/use_locator_url.ts
index a8fefc5010bcf..7c06bea0ce635 100644
--- a/src/plugins/share/common/url_service/locators/use_locator_url.ts
+++ b/src/plugins/share/common/url_service/locators/use_locator_url.ts
@@ -9,7 +9,7 @@
 import { DependencyList, useEffect, useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { LocatorGetUrlParams, LocatorPublic } from '../../../common/url_service';
+import { LocatorGetUrlParams, LocatorPublic } from '..';
 
 export const useLocatorUrl = <P extends SerializableRecord>(
   locator: LocatorPublic<P> | null | undefined,
diff --git a/src/plugins/share/public/components/share_context_menu.tsx b/src/plugins/share/public/components/share_context_menu.tsx
index 66cef3e663af3..3550711ac84c3 100644
--- a/src/plugins/share/public/components/share_context_menu.tsx
+++ b/src/plugins/share/public/components/share_context_menu.tsx
@@ -12,7 +12,7 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiContextMenu, EuiContextMenuPanelDescriptor } from '@elastic/eui';
 
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 
 import { UrlPanelContent } from './url_panel_content';
 import { ShareMenuItem, ShareContextMenuPanelItem, UrlParamExtension } from '../types';
diff --git a/src/plugins/share/public/components/url_panel_content.tsx b/src/plugins/share/public/components/url_panel_content.tsx
index 2399466ca575a..54d3c8aa7e7ec 100644
--- a/src/plugins/share/public/components/url_panel_content.tsx
+++ b/src/plugins/share/public/components/url_panel_content.tsx
@@ -26,7 +26,7 @@ import { format as formatUrl, parse as parseUrl } from 'url';
 
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 
 import { UrlParamExtension } from '../types';
 import {
diff --git a/src/plugins/share/public/index.ts b/src/plugins/share/public/index.ts
index c4c097f992538..d33e4110ff3a4 100644
--- a/src/plugins/share/public/index.ts
+++ b/src/plugins/share/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 export { CSV_QUOTE_VALUES_SETTING, CSV_SEPARATOR_SETTING } from '../common/constants';
 
diff --git a/src/plugins/share/public/plugin.test.ts b/src/plugins/share/public/plugin.test.ts
index a13946e75caf4..ece207a67aa40 100644
--- a/src/plugins/share/public/plugin.test.ts
+++ b/src/plugins/share/public/plugin.test.ts
@@ -8,8 +8,8 @@
 
 import { registryMock, managerMock } from './plugin.test.mocks';
 import { SharePlugin } from './plugin';
-import { CoreStart } from 'kibana/public';
-import { coreMock } from '../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { anonymousAccessMock } from '../common/anonymous_access/index.mock';
 
 describe('SharePlugin', () => {
diff --git a/src/plugins/share/public/plugin.ts b/src/plugins/share/public/plugin.ts
index 5a7ff7b12cdd2..792e0dae0b986 100644
--- a/src/plugins/share/public/plugin.ts
+++ b/src/plugins/share/public/plugin.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import { ShareMenuManager, ShareMenuManagerStart } from './services';
 import { ShareMenuRegistry, ShareMenuRegistrySetup } from './services';
 import { UrlService } from '../common/url_service';
diff --git a/src/plugins/share/public/services/share_menu_manager.tsx b/src/plugins/share/public/services/share_menu_manager.tsx
index dc847ffd07351..a6be0c4811cab 100644
--- a/src/plugins/share/public/services/share_menu_manager.tsx
+++ b/src/plugins/share/public/services/share_menu_manager.tsx
@@ -11,8 +11,8 @@ import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { EuiWrappingPopover } from '@elastic/eui';
 
-import { CoreStart, ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
+import { CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { ShareContextMenu } from '../components/share_context_menu';
 import { ShareMenuItem, ShowShareMenuOptions } from '../types';
 import { ShareMenuRegistryStart } from './share_menu_registry';
diff --git a/src/plugins/share/public/types.ts b/src/plugins/share/public/types.ts
index 084108bf49fa9..15634e31011e2 100644
--- a/src/plugins/share/public/types.ts
+++ b/src/plugins/share/public/types.ts
@@ -9,7 +9,7 @@
 import { ComponentType } from 'react';
 import { EuiContextMenuPanelDescriptor } from '@elastic/eui';
 import { EuiContextMenuPanelItemDescriptorEntry } from '@elastic/eui/src/components/context_menu/context_menu';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import type { UrlService } from '../common/url_service';
 import type { BrowserShortUrlClientFactoryCreateParams } from './url_service/short_urls/short_url_client_factory';
 import type { BrowserShortUrlClient } from './url_service/short_urls/short_url_client';
diff --git a/src/plugins/share/public/url_service/redirect/components/page.tsx b/src/plugins/share/public/url_service/redirect/components/page.tsx
index f6aa4d62767c5..bb65cbcdb3fec 100644
--- a/src/plugins/share/public/url_service/redirect/components/page.tsx
+++ b/src/plugins/share/public/url_service/redirect/components/page.tsx
@@ -9,11 +9,11 @@
 import * as React from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { EuiPageTemplate } from '@elastic/eui';
-import { ThemeServiceSetup } from 'kibana/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { Error } from './error';
 import { RedirectManager } from '../redirect_manager';
 import { Spinner } from './spinner';
-import { KibanaThemeProvider } from '../../../../../kibana_react/public';
 
 export interface PageProps {
   manager: Pick<RedirectManager, 'error$'>;
diff --git a/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts b/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts
index 817e0e0fbad6a..6d8401926ea2d 100644
--- a/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts
+++ b/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts
@@ -8,7 +8,7 @@
 
 import { RedirectManager } from './redirect_manager';
 import { MockUrlService } from '../../mocks';
-import { MigrateFunction } from 'src/plugins/kibana_utils/common';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 
 const setup = () => {
   const url = new MockUrlService();
diff --git a/src/plugins/share/public/url_service/redirect/redirect_manager.ts b/src/plugins/share/public/url_service/redirect/redirect_manager.ts
index 1f38b78670d55..1bcf2eeea34dd 100644
--- a/src/plugins/share/public/url_service/redirect/redirect_manager.ts
+++ b/src/plugins/share/public/url_service/redirect/redirect_manager.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup } from 'src/core/public';
+import type { CoreSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
 import type { Location } from 'history';
-import { migrateToLatest } from '../../../../kibana_utils/common';
+import { migrateToLatest } from '@kbn/kibana-utils-plugin/common';
 import type { UrlService } from '../../../common/url_service';
 import { parseSearchParams, RedirectOptions } from '../../../common/url_service/locators/redirect';
 import {
@@ -66,7 +66,7 @@ export class RedirectManager {
         let redirectUrl = (locatorState as LegacyShortUrlLocatorParams).url;
         const storeInSessionStorage = core.uiSettings.get('state:storeInSessionStorage');
         if (storeInSessionStorage) {
-          const { hashUrl } = await import('../../../../kibana_utils/public');
+          const { hashUrl } = await import('@kbn/kibana-utils-plugin/public');
           redirectUrl = hashUrl(redirectUrl);
         }
         const url = core.http.basePath.prepend(redirectUrl);
diff --git a/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts b/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts
index 0f385c42e2de5..8a125206d1c80 100644
--- a/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts
+++ b/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from '../../../../kibana_utils';
+import { of } from '@kbn/kibana-utils-plugin';
 import {
   KibanaLocation,
   Locator,
diff --git a/src/plugins/share/server/index.ts b/src/plugins/share/server/index.ts
index 73cd4cc89af70..c55d91d053b50 100644
--- a/src/plugins/share/server/index.ts
+++ b/src/plugins/share/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SharePlugin } from './plugin';
 
 export type { SharePluginSetup, SharePluginStart } from './plugin';
diff --git a/src/plugins/share/server/plugin.ts b/src/plugins/share/server/plugin.ts
index 595aefb9d630b..437257704501c 100644
--- a/src/plugins/share/server/plugin.ts
+++ b/src/plugins/share/server/plugin.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { CSV_SEPARATOR_SETTING, CSV_QUOTE_VALUES_SETTING } from '../common/constants';
 import { UrlService } from '../common/url_service';
 import {
diff --git a/src/plugins/share/server/url_service/http/register_url_service_routes.ts b/src/plugins/share/server/url_service/http/register_url_service_routes.ts
index 9fe0714c7245b..6547423851078 100644
--- a/src/plugins/share/server/url_service/http/register_url_service_routes.ts
+++ b/src/plugins/share/server/url_service/http/register_url_service_routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, IRouter } from 'kibana/server';
+import { CoreSetup, IRouter } from '@kbn/core/server';
 import { ServerUrlService } from '../types';
 import { registerCreateRoute } from './short_urls/register_create_route';
 import { registerGetRoute } from './short_urls/register_get_route';
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
index ca408fbfa8989..1208f6fda4d1e 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { UrlServiceError } from '../../error';
 import { ServerUrlService } from '../../types';
 
@@ -34,7 +34,7 @@ export const registerCreateRoute = (router: IRouter, url: ServerUrlService) => {
       },
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
-      const savedObjects = ctx.core.savedObjects.client;
+      const savedObjects = (await ctx.core).savedObjects.client;
       const shortUrls = url.shortUrls.get({ savedObjects });
       const { locatorId, params, slug, humanReadableSlug } = req.body;
       const locator = url.locators.get(locatorId);
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
index 2e241cddc15ca..ddc29117a3acc 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ServerUrlService } from '../../types';
 
 export const registerDeleteRoute = (router: IRouter, url: ServerUrlService) => {
@@ -25,7 +25,7 @@ export const registerDeleteRoute = (router: IRouter, url: ServerUrlService) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const id = req.params.id;
-      const savedObjects = ctx.core.savedObjects.client;
+      const savedObjects = (await ctx.core).savedObjects.client;
       const shortUrls = url.shortUrls.get({ savedObjects });
 
       await shortUrls.delete(id);
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
index 149df5cf3999f..8e783b3fcfd3d 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ServerUrlService } from '../../types';
 
 export const registerGetRoute = (router: IRouter, url: ServerUrlService) => {
@@ -25,7 +25,7 @@ export const registerGetRoute = (router: IRouter, url: ServerUrlService) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const id = req.params.id;
-      const savedObjects = ctx.core.savedObjects.client;
+      const savedObjects = (await ctx.core).savedObjects.client;
       const shortUrls = url.shortUrls.get({ savedObjects });
       const shortUrl = await shortUrls.get(id);
 
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts
index 679d5ad671700..6a7e8f542d62b 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, IRouter } from 'kibana/server';
+import { CoreSetup, IRouter } from '@kbn/core/server';
 
 /**
  * This endpoint maintains the legacy /goto/<short_url_id> route. It loads the
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
index a89048b4bbd18..47290d5754545 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { UrlServiceError } from '../../error';
 import { ServerUrlService } from '../../types';
 
@@ -26,7 +26,7 @@ export const registerResolveRoute = (router: IRouter, url: ServerUrlService) =>
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const slug = req.params.slug;
-      const savedObjects = ctx.core.savedObjects.client;
+      const savedObjects = (await ctx.core).savedObjects.client;
 
       try {
         const shortUrls = url.shortUrls.get({ savedObjects });
diff --git a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts
index 651169f6101a9..d68040ffb5471 100644
--- a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts
+++ b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts
@@ -11,7 +11,7 @@ import type {
   SavedObjectMigrationMap,
   SavedObjectsType,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { ServerShortUrlClientFactory } from '..';
 import { UrlService, LocatorDefinition } from '../../../common/url_service';
 import { LegacyShortUrlLocatorDefinition } from '../../../common/url_service/locators/legacy_short_url_locator';
diff --git a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts
index b2fcefcc767cf..929928eda3f9a 100644
--- a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts
+++ b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts
@@ -10,8 +10,8 @@ import type {
   SavedObjectMigrationMap,
   SavedObjectsServiceSetup,
   SavedObjectsType,
-} from 'kibana/server';
-import type { LocatorData } from 'src/plugins/share/common/url_service';
+} from '@kbn/core/server';
+import type { LocatorData } from '../../../common/url_service';
 import type { ServerUrlService } from '..';
 
 export const registerUrlServiceSavedObjectType = (
diff --git a/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts b/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts
index 8c6ad49fcb9bb..5fc108cdbf56c 100644
--- a/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts
+++ b/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts
@@ -11,7 +11,7 @@ import { UrlService, LocatorDefinition } from '../../../common/url_service';
 import { LegacyShortUrlLocatorDefinition } from '../../../common/url_service/locators/legacy_short_url_locator';
 import { MemoryShortUrlStorage } from './storage/memory_short_url_storage';
 import { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { UrlServiceError } from '../error';
 
 const setup = () => {
diff --git a/src/plugins/share/server/url_service/short_urls/short_url_client.ts b/src/plugins/share/server/url_service/short_urls/short_url_client.ts
index dc1b6127a7c18..762ded11bf8ee 100644
--- a/src/plugins/share/server/url_service/short_urls/short_url_client.ts
+++ b/src/plugins/share/server/url_service/short_urls/short_url_client.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { generateSlug } from 'random-word-slugs';
 import { ShortUrlRecord } from '.';
 import type {
diff --git a/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts b/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts
index 63456c36daa68..fe8872f4974ea 100644
--- a/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts
+++ b/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { ShortUrlStorage } from './types';
 import type { IShortUrlClientFactory, ILocatorClient } from '../../../common/url_service';
 import { ServerShortUrlClient } from './short_url_client';
diff --git a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts
index 5d1b0bfa0bf55..da06d9f248beb 100644
--- a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts
+++ b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from 'src/plugins/kibana_utils/common';
+import { of } from '@kbn/kibana-utils-plugin/common';
 import { MemoryShortUrlStorage } from './memory_short_url_storage';
 
 describe('.create()', () => {
diff --git a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts
index fafd00344eecd..b85d79e56b246 100644
--- a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts
+++ b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts
@@ -8,8 +8,8 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ShortUrlData } from 'src/plugins/share/common/url_service/short_urls/types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { ShortUrlData } from '../../../../common/url_service/short_urls/types';
 import { ShortUrlStorage, ShortUrlRecord } from '../types';
 
 const clone = <P>(obj: P): P => JSON.parse(JSON.stringify(obj)) as P;
diff --git a/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts b/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts
index 49d5bfb4741d5..1b38e47eb3ad7 100644
--- a/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts
+++ b/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObject, SavedObjectReference, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObject, SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
 import { ShortUrlRecord } from '..';
 import { UrlServiceError } from '../..';
 import { LEGACY_SHORT_URL_LOCATOR_ID } from '../../../../common/url_service/locators/legacy_short_url_locator';
diff --git a/src/plugins/share/server/url_service/short_urls/types.ts b/src/plugins/share/server/url_service/short_urls/types.ts
index 9a9d9006eb371..32cb546ec4112 100644
--- a/src/plugins/share/server/url_service/short_urls/types.ts
+++ b/src/plugins/share/server/url_service/short_urls/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { ShortUrlData } from '../../../common/url_service/short_urls/types';
 
 /**
diff --git a/src/plugins/shared_ux/public/plugin.ts b/src/plugins/shared_ux/public/plugin.ts
index a46e7862882d4..8806de85b9304 100755
--- a/src/plugins/shared_ux/public/plugin.ts
+++ b/src/plugins/shared_ux/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   SharedUXPluginSetup,
   SharedUXPluginStart,
diff --git a/src/plugins/shared_ux/public/services/types.ts b/src/plugins/shared_ux/public/services/types.ts
index 15191a493d378..895b2fb231a37 100644
--- a/src/plugins/shared_ux/public/services/types.ts
+++ b/src/plugins/shared_ux/public/services/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { CoreStart, AppUpdater, PluginInitializerContext } from 'src/core/public';
+import { CoreStart, AppUpdater, PluginInitializerContext } from '@kbn/core/public';
 
 /**
  * Parameters necessary to create a Kibana-based service, (e.g. during Plugin
diff --git a/src/plugins/shared_ux/public/types/index.ts b/src/plugins/shared_ux/public/types/index.ts
index 42ed661276778..5a6aace584bec 100644
--- a/src/plugins/shared_ux/public/types/index.ts
+++ b/src/plugins/shared_ux/public/types/index.ts
@@ -9,7 +9,7 @@
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
 import { SharedUxServices } from '@kbn/shared-ux-services';
-import { DataViewEditorStart } from 'src/plugins/data_view_editor/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
 
 /** @internal */
 export interface SharedUXPluginSetup {}
diff --git a/src/plugins/shared_ux/server/index.ts b/src/plugins/shared_ux/server/index.ts
index 4658588c54c90..44c72b244aaf9 100755
--- a/src/plugins/shared_ux/server/index.ts
+++ b/src/plugins/shared_ux/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SharedUXPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/shared_ux/server/plugin.ts b/src/plugins/shared_ux/server/plugin.ts
index 85724bf7699b0..f0ea504884610 100755
--- a/src/plugins/shared_ux/server/plugin.ts
+++ b/src/plugins/shared_ux/server/plugin.ts
@@ -6,13 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
 import { SharedUXPluginSetup, SharedUXPluginStart } from './types';
 
diff --git a/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx b/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx
index 558b283058a21..3e60534ce410a 100644
--- a/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx
+++ b/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import { OptedInNoticeBanner } from './opted_in_notice_banner';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { mockTelemetryConstants } from '../mocks';
 
 const mockHttp = httpServiceMock.createStartContract();
diff --git a/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx b/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx
index a68da24947844..da9db9eec7321 100644
--- a/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx
+++ b/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx
@@ -12,7 +12,7 @@ import * as React from 'react';
 import { EuiButton, EuiLink, EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PATH_TO_ADVANCED_SETTINGS } from '../../common/constants';
 import { TelemetryConstants } from '..';
 
diff --git a/src/plugins/telemetry/public/index.ts b/src/plugins/telemetry/public/index.ts
index 47b90ed13c96d..e07f2c7f4e42c 100644
--- a/src/plugins/telemetry/public/index.ts
+++ b/src/plugins/telemetry/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import type { TelemetryPluginConfig } from './plugin';
 import { TelemetryPlugin } from './plugin';
 export type {
diff --git a/src/plugins/telemetry/public/mocks.ts b/src/plugins/telemetry/public/mocks.ts
index 202c306c94020..f562cbad270d9 100644
--- a/src/plugins/telemetry/public/mocks.ts
+++ b/src/plugins/telemetry/public/mocks.ts
@@ -10,7 +10,7 @@ import {
   overlayServiceMock,
   httpServiceMock,
   notificationServiceMock,
-} from '../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { TelemetryService } from './services/telemetry_service';
 import { TelemetryNotifications } from './services/telemetry_notifications/telemetry_notifications';
 import { TelemetryPluginStart, TelemetryPluginSetup, TelemetryPluginConfig } from './plugin';
diff --git a/src/plugins/telemetry/public/plugin.test.ts b/src/plugins/telemetry/public/plugin.test.ts
index 4473e41572fef..5d9e03fcbae20 100644
--- a/src/plugins/telemetry/public/plugin.test.ts
+++ b/src/plugins/telemetry/public/plugin.test.ts
@@ -7,11 +7,11 @@
  */
 
 import { TelemetryPlugin } from './plugin';
-import { coreMock } from '../../../core/public/mocks';
-import { homePluginMock } from '../../home/public/mocks';
-import { screenshotModePluginMock } from '../../screenshot_mode/public/mocks';
-import { HomePublicPluginSetup } from '../../home/public';
-import { ScreenshotModePluginSetup } from '../../screenshot_mode/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
 let screenshotMode: ScreenshotModePluginSetup;
 let home: HomePublicPluginSetup;
diff --git a/src/plugins/telemetry/public/plugin.ts b/src/plugins/telemetry/public/plugin.ts
index b227a0b751e03..133b2c6157c3c 100644
--- a/src/plugins/telemetry/public/plugin.ts
+++ b/src/plugins/telemetry/public/plugin.ts
@@ -16,10 +16,11 @@ import type {
   SavedObjectsBatchResponse,
   ApplicationStart,
   DocLinksStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { TelemetrySender, TelemetryService, TelemetryNotifications } from './services';
 import type {
   TelemetrySavedObjectAttributes,
@@ -31,7 +32,6 @@ import {
   getTelemetrySendUsageFrom,
 } from '../common/telemetry_config';
 import { getNotifyUserAboutOptInDefault } from '../common/telemetry_config/get_telemetry_notify_user_about_optin_default';
-import { HomePublicPluginSetup } from '../../home/public';
 import { renderWelcomeTelemetryNotice } from './render_welcome_telemetry_notice';
 
 /**
@@ -134,7 +134,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
   }
 
   public setup(
-    { http, notifications, getStartServices }: CoreSetup,
+    { analytics, http, notifications, getStartServices }: CoreSetup,
     { screenshotMode, home }: TelemetryPluginSetupDependencies
   ): TelemetryPluginSetup {
     const config = this.config;
@@ -155,6 +155,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
 
     this.telemetrySender = new TelemetrySender(this.telemetryService, async () => {
       await this.refreshConfig();
+      analytics.optIn({ global: { enabled: this.telemetryService!.isOptedIn } });
     });
 
     if (home && !this.config.hidePrivacyStatement) {
@@ -179,6 +180,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
   }
 
   public start({
+    analytics,
     http,
     overlays,
     application,
@@ -211,6 +213,9 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
 
       // Refresh and get telemetry config
       const updatedConfig = await this.refreshConfig();
+
+      analytics.optIn({ global: { enabled: this.telemetryService!.isOptedIn } });
+
       const telemetryBanner = updatedConfig?.banner;
 
       this.maybeStartTelemetryPoller();
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts
index b77364e4bc385..7f051f7d9fc03 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { renderOptInBanner } from './render_opt_in_banner';
-import { overlayServiceMock } from '../../../../../core/public/mocks';
+import { overlayServiceMock } from '@kbn/core/public/mocks';
 import { mockTelemetryConstants } from '../../mocks';
 
 describe('renderOptInBanner', () => {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx
index 7626be56bfa46..23754471e1630 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx
@@ -7,9 +7,9 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { OptInBanner } from '../../components/opt_in_banner';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { TelemetryConstants } from '../..';
 
 interface RenderBannerConfig {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts
index bc56f9ff6107f..e4678fc8ef5fc 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { renderOptedInNoticeBanner } from './render_opted_in_notice_banner';
-import { overlayServiceMock, httpServiceMock } from '../../../../../core/public/mocks';
+import { overlayServiceMock, httpServiceMock } from '@kbn/core/public/mocks';
 import { mockTelemetryConstants } from '../../mocks';
 
 describe('renderOptedInNoticeBanner', () => {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx
index ca2b34de06afd..30720e43fcadf 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx
@@ -7,9 +7,9 @@
  */
 
 import React from 'react';
-import { HttpStart, OverlayStart } from 'kibana/public';
+import { HttpStart, OverlayStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { OptedInNoticeBanner } from '../../components/opted_in_notice_banner';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { TelemetryConstants } from '../..';
 
 interface RenderBannerConfig {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts b/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts
index e674942acb9bd..7a4da14bdb528 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, OverlayStart } from 'kibana/public';
+import { HttpStart, OverlayStart } from '@kbn/core/public';
 import { renderOptedInNoticeBanner } from './render_opted_in_notice_banner';
 import { renderOptInBanner } from './render_opt_in_banner';
 import { TelemetryService } from '../telemetry_service';
diff --git a/src/plugins/telemetry/public/services/telemetry_sender.ts b/src/plugins/telemetry/public/services/telemetry_sender.ts
index 72f226ce52b83..6ffed583ec95c 100644
--- a/src/plugins/telemetry/public/services/telemetry_sender.ts
+++ b/src/plugins/telemetry/public/services/telemetry_sender.ts
@@ -9,9 +9,9 @@
 import type { Subscription } from 'rxjs';
 import { fromEvent, interval, merge } from 'rxjs';
 import { exhaustMap } from 'rxjs/operators';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { LOCALSTORAGE_KEY, PAYLOAD_CONTENT_ENCODING } from '../../common/constants';
 import { TelemetryService } from './telemetry_service';
-import { Storage } from '../../../kibana_utils/public';
 import type { EncryptedTelemetryPayload } from '../../common/types';
 import { isReportIntervalExpired } from '../../common/is_report_interval_expired';
 
diff --git a/src/plugins/telemetry/public/services/telemetry_service.ts b/src/plugins/telemetry/public/services/telemetry_service.ts
index 7499a403bcd95..e01a900e190d7 100644
--- a/src/plugins/telemetry/public/services/telemetry_service.ts
+++ b/src/plugins/telemetry/public/services/telemetry_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { TelemetryPluginConfig } from '../plugin';
 import { getTelemetryChannelEndpoint } from '../../common/telemetry_config';
 import type { UnencryptedTelemetryPayload, EncryptedTelemetryPayload } from '../../common/types';
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index c6a237ee2b09c..ca9a57bb4462a 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -3,37 +3,111 @@
     "dashboard": {
       "properties": {
         "panels": {
-          "type": "long"
-        },
-        "panelsByValue": {
-          "type": "long"
-        },
-        "lensByValue": {
           "properties": {
-            "DYNAMIC_KEY": {
-              "type": "long",
-              "_meta": {
-                "description": "Collection of telemetry metrics for Lens visualizations, which are added to dashboard by \"value\"."
+            "total": {
+              "type": "long"
+            },
+            "by_reference": {
+              "type": "long"
+            },
+            "by_value": {
+              "type": "long"
+            },
+            "by_type": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "properties": {
+                    "total": {
+                      "type": "long",
+                      "_meta": {
+                        "description": "The number of panels that have been added to all dashboards."
+                      }
+                    },
+                    "by_reference": {
+                      "type": "long",
+                      "_meta": {
+                        "description": "The number of \"by reference\" panels that have been added to all dashboards."
+                      }
+                    },
+                    "by_value": {
+                      "type": "long",
+                      "_meta": {
+                        "description": "The number of \"by value\" panels that have been added to all dashboards."
+                      }
+                    },
+                    "details": {
+                      "properties": {
+                        "DYNAMIC_KEY": {
+                          "type": "long",
+                          "_meta": {
+                            "description": "Collection of telemetry metrics that embeddable service reports. Embeddable service internally calls each embeddable, which in turn calls its dynamic actions, which calls each drill down attached to that embeddable."
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
               }
             }
           }
         },
-        "visualizationByValue": {
+        "controls": {
           "properties": {
-            "DYNAMIC_KEY": {
-              "type": "long",
-              "_meta": {
-                "description": "Collection of telemetry metrics for visualizations, which are added to dashboard by \"value\"."
+            "total": {
+              "type": "long"
+            },
+            "by_type": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "properties": {
+                    "total": {
+                      "type": "long",
+                      "_meta": {
+                        "description": "The number of this type of control in all Control Groups"
+                      }
+                    },
+                    "details": {
+                      "properties": {
+                        "DYNAMIC_KEY": {
+                          "type": "long",
+                          "_meta": {
+                            "description": "Collection of telemetry metrics that embeddable service reports. Will be used for details which are specific to the current control type"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
               }
-            }
-          }
-        },
-        "embeddable": {
-          "properties": {
-            "DYNAMIC_KEY": {
-              "type": "long",
-              "_meta": {
-                "description": "Collection of telemetry metrics that embeddable service reports. Embeddable service internally calls each embeddable, which in turn calls its dynamic actions, which calls each drill down attached to that embeddable."
+            },
+            "ignore_settings": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long",
+                  "_meta": {
+                    "description": "Collection of telemetry metrics that count the number of control groups which have this ignore setting turned on"
+                  }
+                }
+              }
+            },
+            "chaining_system": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long",
+                  "_meta": {
+                    "description": "Collection of telemetry metrics that count the number of control groups which are using this chaining system"
+                  }
+                }
+              }
+            },
+            "label_position": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long",
+                  "_meta": {
+                    "description": "Collection of telemetry metrics that count the number of control groups which have their labels in this position"
+                  }
+                }
               }
             }
           }
diff --git a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
index 6b26254d0d339..185ac8be49b59 100644
--- a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
+++ b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
@@ -7,10 +7,10 @@
  */
 
 import { Observable, firstValueFrom } from 'rxjs';
-import { ISavedObjectsRepository, SavedObjectsClient } from '../../../../../core/server';
+import { ISavedObjectsRepository, SavedObjectsClient } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getTelemetrySavedObject, TelemetrySavedObject } from '../../telemetry_repository';
 import { getTelemetryOptIn, getTelemetrySendUsageFrom } from '../../../common/telemetry_config';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
 import { TelemetryConfigType } from '../../config';
 
 export interface TelemetryUsageStats {
diff --git a/src/plugins/telemetry/server/collectors/usage/schema.ts b/src/plugins/telemetry/server/collectors/usage/schema.ts
index 348d86b6e89c1..b5de37533c01e 100644
--- a/src/plugins/telemetry/server/collectors/usage/schema.ts
+++ b/src/plugins/telemetry/server/collectors/usage/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { LicenseUsage, StaticTelemetryUsage } from './telemetry_usage_collector';
 
 const licenseSchema: MakeSchemaFrom<LicenseUsage> = {
diff --git a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
index 2acc6676d13db..80d88dce3e789 100644
--- a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
@@ -15,7 +15,7 @@ import {
   readTelemetryFile,
   MAX_FILE_SIZE,
 } from './telemetry_usage_collector';
-import { usageCollectionPluginMock } from '../../../../usage_collection/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const mockUsageCollector = () => {
   return usageCollectionPluginMock.createSetupContract();
diff --git a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
index 3c0428c10eb80..71cda893264e1 100644
--- a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
@@ -11,7 +11,7 @@ import { safeLoad } from 'js-yaml';
 import { dirname, join } from 'path';
 import { Observable, firstValueFrom } from 'rxjs';
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { TelemetryConfigType } from '../../config';
 
diff --git a/src/plugins/telemetry/server/config/config.ts b/src/plugins/telemetry/server/config/config.ts
index 020a01f3b41b8..bc3d8bf190efb 100644
--- a/src/plugins/telemetry/server/config/config.ts
+++ b/src/plugins/telemetry/server/config/config.ts
@@ -8,7 +8,7 @@
 
 import { schema, TypeOf, Type } from '@kbn/config-schema';
 import { getConfigPath } from '@kbn/utils';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const clusterEnvSchema: [Type<'prod'>, Type<'staging'>] = [
   schema.literal('prod'),
diff --git a/src/plugins/telemetry/server/fetcher.test.ts b/src/plugins/telemetry/server/fetcher.test.ts
index c6e62659ec93f..87466b7c05fcb 100644
--- a/src/plugins/telemetry/server/fetcher.test.ts
+++ b/src/plugins/telemetry/server/fetcher.test.ts
@@ -8,7 +8,7 @@
 
 /* eslint-disable dot-notation */
 import { FetcherTask } from './fetcher';
-import { coreMock } from '../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('FetcherTask', () => {
   describe('sendIfDue', () => {
diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
index a09e9ca6ee667..efc8ac184d28b 100644
--- a/src/plugins/telemetry/server/fetcher.ts
+++ b/src/plugins/telemetry/server/fetcher.ts
@@ -8,14 +8,14 @@
 
 import { firstValueFrom, Observable, Subscription, timer } from 'rxjs';
 import fetch from 'node-fetch';
-import type { TelemetryCollectionManagerPluginStart } from 'src/plugins/telemetry_collection_manager/server';
+import type { TelemetryCollectionManagerPluginStart } from '@kbn/telemetry-collection-manager-plugin/server';
 import {
   PluginInitializerContext,
   Logger,
   SavedObjectsClientContract,
   SavedObjectsClient,
   CoreStart,
-} from '../../../core/server';
+} from '@kbn/core/server';
 import {
   getTelemetryChannelEndpoint,
   getTelemetryOptIn,
diff --git a/src/plugins/telemetry/server/index.ts b/src/plugins/telemetry/server/index.ts
index 6b56996c756aa..3c67764953ef4 100644
--- a/src/plugins/telemetry/server/index.ts
+++ b/src/plugins/telemetry/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'kibana/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 import type { TelemetryConfigType } from './config';
 import { TelemetryPlugin } from './plugin';
 
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
index 2bab4fb4c7fe9..7c01b85130977 100644
--- a/src/plugins/telemetry/server/plugin.ts
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -9,11 +9,11 @@
 import { URL } from 'url';
 import type { Observable } from 'rxjs';
 import { firstValueFrom, ReplaySubject } from 'rxjs';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   TelemetryCollectionManagerPluginSetup,
   TelemetryCollectionManagerPluginStart,
-} from 'src/plugins/telemetry_collection_manager/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
 import type {
   CoreSetup,
   PluginInitializerContext,
@@ -21,9 +21,9 @@ import type {
   CoreStart,
   Plugin,
   Logger,
-} from 'src/core/server';
-import type { SecurityPluginStart } from '../../../../x-pack/plugins/security/server';
-import { SavedObjectsClient } from '../../../core/server';
+} from '@kbn/core/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 import { registerRoutes } from './routes';
 import { registerCollection } from './telemetry_collection';
 import {
diff --git a/src/plugins/telemetry/server/routes/index.ts b/src/plugins/telemetry/server/routes/index.ts
index 6b249ac9c280d..da752fd4c836a 100644
--- a/src/plugins/telemetry/server/routes/index.ts
+++ b/src/plugins/telemetry/server/routes/index.ts
@@ -7,8 +7,8 @@
  */
 
 import type { Observable } from 'rxjs';
-import type { IRouter, Logger, SavedObjectsClient } from 'kibana/server';
-import type { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import type { IRouter, Logger, SavedObjectsClient } from '@kbn/core/server';
+import type { TelemetryCollectionManagerPluginSetup } from '@kbn/telemetry-collection-manager-plugin/server';
 import { registerTelemetryOptInRoutes } from './telemetry_opt_in';
 import { registerTelemetryUsageStatsRoutes, SecurityGetter } from './telemetry_usage_stats';
 import { registerTelemetryOptInStatsRoutes } from './telemetry_opt_in_stats';
diff --git a/src/plugins/telemetry/server/routes/telemetry_last_reported.ts b/src/plugins/telemetry/server/routes/telemetry_last_reported.ts
index 4e4a62ce6c37c..2b5ffbd7ec4d6 100644
--- a/src/plugins/telemetry/server/routes/telemetry_last_reported.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_last_reported.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter, SavedObjectsClient } from 'kibana/server';
+import type { IRouter, SavedObjectsClient } from '@kbn/core/server';
 import type { Observable } from 'rxjs';
 import { firstValueFrom } from 'rxjs';
 import { getTelemetrySavedObject, updateTelemetrySavedObject } from '../telemetry_repository';
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
index 92f5b0a746819..06e443670518d 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -8,12 +8,12 @@
 
 import { firstValueFrom, Observable } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import { IRouter, Logger } from 'kibana/server';
+import { IRouter, Logger } from '@kbn/core/server';
 import {
   StatsGetterConfig,
   TelemetryCollectionManagerPluginSetup,
-} from 'src/plugins/telemetry_collection_manager/server';
-import { SavedObjectsErrorHelpers } from '../../../../core/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { getTelemetryAllowChangingOptInStatus } from '../../common/telemetry_config';
 import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
 
@@ -48,12 +48,13 @@ export function registerTelemetryOptInRoutes({
     },
     async (context, req, res) => {
       const newOptInStatus = req.body.enabled;
+      const soClient = (await context.core).savedObjects.client;
       const attributes: TelemetrySavedObjectAttributes = {
         enabled: newOptInStatus,
         lastVersionChecked: currentKibanaVersion,
       };
       const config = await firstValueFrom(config$);
-      const telemetrySavedObject = await getTelemetrySavedObject(context.core.savedObjects.client);
+      const telemetrySavedObject = await getTelemetrySavedObject(soClient);
 
       if (telemetrySavedObject === false) {
         // If we get false, we couldn't get the saved object due to lack of permissions
@@ -96,7 +97,7 @@ export function registerTelemetryOptInRoutes({
       }
 
       try {
-        await updateTelemetrySavedObject(context.core.savedObjects.client, attributes);
+        await updateTelemetrySavedObject(soClient, attributes);
       } catch (e) {
         if (SavedObjectsErrorHelpers.isForbiddenError(e)) {
           return res.forbidden();
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts
index 00bf675a0494a..b8b2fa179ba4c 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts
@@ -9,7 +9,7 @@
 jest.mock('node-fetch');
 import fetch from 'node-fetch';
 import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
-import { StatsGetterConfig } from 'src/plugins/telemetry_collection_manager/server';
+import { StatsGetterConfig } from '@kbn/telemetry-collection-manager-plugin/server';
 
 describe('sendTelemetryOptInStatus', () => {
   const mockClusterUuid = 'mk_uuid';
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
index 6139eee3e10ca..12a90300cf782 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
@@ -8,12 +8,12 @@
 
 import fetch from 'node-fetch';
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import {
   TelemetryCollectionManagerPluginSetup,
   StatsGetterConfig,
-} from 'src/plugins/telemetry_collection_manager/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
 import { getTelemetryChannelEndpoint } from '../../common/telemetry_config';
 import { PAYLOAD_CONTENT_ENCODING } from '../../common/constants';
 import type { UnencryptedTelemetryPayload } from '../../common/types';
diff --git a/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts b/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts
index bc7569585c127..9dde180ff980d 100644
--- a/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { registerTelemetryUsageStatsRoutes } from './telemetry_usage_stats';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
-import type { RequestHandlerContext, IRouter } from 'src/core/server';
-import { securityMock } from '../../../../../x-pack/plugins/security/server/mocks';
-import { telemetryCollectionManagerPluginMock } from '../../../telemetry_collection_manager/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { RequestHandlerContext, IRouter } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { telemetryCollectionManagerPluginMock } from '@kbn/telemetry-collection-manager-plugin/server/mocks';
 
 async function runRequest(
   mockRouter: IRouter<RequestHandlerContext>,
diff --git a/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts b/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
index 4647f5afe0760..9095f04f4f5e0 100644
--- a/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
@@ -7,12 +7,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import {
   TelemetryCollectionManagerPluginSetup,
   StatsGetterConfig,
-} from 'src/plugins/telemetry_collection_manager/server';
-import type { SecurityPluginStart } from '../../../../../x-pack/plugins/security/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export type SecurityGetter = () => SecurityPluginStart | undefined;
 
diff --git a/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
index 516e7c6970fe5..cb990b68fd9b5 100644
--- a/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import {
   TelemetrySavedObject,
   TelemetrySavedObjectAttributes,
@@ -21,7 +21,7 @@ export function registerTelemetryUserHasSeenNotice(router: IRouter) {
       validate: false,
     },
     async (context, req, res) => {
-      const internalRepository = context.core.savedObjects.client;
+      const internalRepository = (await context.core).savedObjects.client;
       const telemetrySavedObject: TelemetrySavedObject = await getTelemetrySavedObject(
         internalRepository
       );
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts
index 3c96b45ed3262..f60cf7262d752 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getClusterInfo } from './get_cluster_info';
 
 export function mockGetClusterInfo<ClusterInfo>(clusterInfo: ClusterInfo) {
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
index 667b8564e4d33..3e73ea28eb9ab 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Get the cluster info from the connected cluster.
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts
index 84a0fdaacb5b1..3d5f420e99554 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getClusterStats } from './get_cluster_stats';
 import { TIMEOUT } from './constants';
 
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
index f420291d1c131..8cec4cd5c4e55 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ClusterDetailsGetter } from 'src/plugins/telemetry_collection_manager/server';
-import { ElasticsearchClient } from 'src/core/server';
+import { ClusterDetailsGetter } from '@kbn/telemetry-collection-manager-plugin/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { TIMEOUT } from './constants';
 
 /**
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
index 310ba6a3ee41d..fc96b5adc70d6 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
@@ -8,7 +8,7 @@
 
 import { buildDataTelemetryPayload, getDataTelemetry } from './get_data_telemetry';
 import { DATA_DATASETS_INDEX_PATTERNS, DATA_DATASETS_INDEX_PATTERNS_UNIQUE } from './constants';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 describe('get_data_telemetry', () => {
   describe('DATA_DATASETS_INDEX_PATTERNS', () => {
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
index 174e200a6c996..ba7c700c041da 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import {
   DATA_DATASETS_INDEX_PATTERNS_UNIQUE,
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
index 4340eaafd2d8f..15ca075175cb5 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
@@ -7,9 +7,9 @@
  */
 
 import { omit } from 'lodash';
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import type { StatsCollectionContext } from 'src/plugins/telemetry_collection_manager/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { StatsCollectionContext } from '@kbn/telemetry-collection-manager-plugin/server';
 
 export interface KibanaUsageStats {
   kibana: {
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
index fa45438e00fbe..35577923f66bf 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
@@ -13,9 +13,9 @@ import { getLocalStats, handleLocalStats } from './get_local_stats';
 import {
   usageCollectionPluginMock,
   createCollectorFetchContextMock,
-} from '../../../usage_collection/server/mocks';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
-import { StatsCollectionConfig } from '../../../telemetry_collection_manager/server';
+} from '@kbn/usage-collection-plugin/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { StatsCollectionConfig } from '@kbn/telemetry-collection-manager-plugin/server';
 
 function mockUsageCollection(kibanaUsage = {}) {
   const usageCollection = usageCollectionPluginMock.createSetupContract();
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
index 73de59ae8156a..ccd03f26fe5b5 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
@@ -10,7 +10,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   StatsGetter,
   StatsCollectionContext,
-} from 'src/plugins/telemetry_collection_manager/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
 import { getClusterInfo } from './get_cluster_info';
 import { getClusterStats } from './get_cluster_stats';
 import { getKibana, handleKibanaStats, KibanaUsageStats } from './get_kibana';
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts
index 65bb6eed344aa..9575e7827fc77 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts
@@ -8,7 +8,7 @@
 
 import { getNodesUsage } from './get_nodes_usage';
 import { TIMEOUT } from './constants';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const mockedNodesFetchResponse = {
   cluster_name: 'test cluster',
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
index b701a696f210d..8243cf586e537 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TIMEOUT } from './constants';
 
diff --git a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
index 0520e9fef0dd7..23e4a269b21e2 100644
--- a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import { TelemetryCollectionManagerPluginSetup } from '@kbn/telemetry-collection-manager-plugin/server';
 import { getLocalStats } from './get_local_stats';
 import { getClusterUuids } from './get_cluster_stats';
 
diff --git a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
index 5ea8211739a13..379232e7571ea 100644
--- a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { getTelemetrySavedObject } from './get_telemetry_saved_object';
-import { SavedObjectsErrorHelpers } from '../../../../core/server';
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 describe('getTelemetrySavedObject', () => {
   it('returns null when saved object not found', async () => {
diff --git a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
index 1a43e32d23653..56d13f3c6ad22 100644
--- a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '../../../../core/server';
-import { TelemetrySavedObject } from './';
+import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '@kbn/core/server';
+import { TelemetrySavedObject } from '.';
 
 type GetTelemetrySavedObject = (
   repository: SavedObjectsClientContract
diff --git a/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts b/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
index f0dd142bc89be..8ecb10d741bb9 100644
--- a/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '../../../../core/server';
-import { TelemetrySavedObjectAttributes } from './';
+import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '@kbn/core/server';
+import { TelemetrySavedObjectAttributes } from '.';
 
 export async function updateTelemetrySavedObject(
   savedObjectsClient: SavedObjectsClientContract,
diff --git a/src/plugins/telemetry_collection_manager/server/index.ts b/src/plugins/telemetry_collection_manager/server/index.ts
index c0cd124a132c0..ededc6abb87dd 100644
--- a/src/plugins/telemetry_collection_manager/server/index.ts
+++ b/src/plugins/telemetry_collection_manager/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { TelemetryCollectionManagerPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,
diff --git a/src/plugins/telemetry_collection_manager/server/plugin.test.ts b/src/plugins/telemetry_collection_manager/server/plugin.test.ts
index 990e237b6b272..5ffe8235b3930 100644
--- a/src/plugins/telemetry_collection_manager/server/plugin.test.ts
+++ b/src/plugins/telemetry_collection_manager/server/plugin.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/server/mocks';
-import { usageCollectionPluginMock } from '../../usage_collection/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { TelemetryCollectionManagerPlugin } from './plugin';
 import type { BasicStatsPayload, CollectionStrategyConfig, StatsGetterConfig } from './types';
 import { TelemetrySavedObjectsClient } from './telemetry_saved_objects_client';
diff --git a/src/plugins/telemetry_collection_manager/server/plugin.ts b/src/plugins/telemetry_collection_manager/server/plugin.ts
index cffe736f8eeaf..be4632ce21338 100644
--- a/src/plugins/telemetry_collection_manager/server/plugin.ts
+++ b/src/plugins/telemetry_collection_manager/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   PluginInitializerContext,
   CoreSetup,
@@ -17,7 +17,7 @@ import type {
   SavedObjectsServiceStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type {
   TelemetryCollectionManagerPluginSetup,
diff --git a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts
index a1aa9a3070d01..ff8ccc9c45b6f 100644
--- a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts
+++ b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { TelemetrySavedObjectsClient } from './telemetry_saved_objects_client';
-import { savedObjectsRepositoryMock } from '../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 describe('TelemetrySavedObjectsClient', () => {
   test("find requests are extended with `namespaces:['*']`", async () => {
diff --git a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts
index 01d89c5731158..15907903c46c3 100644
--- a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts
+++ b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsFindOptions, SavedObjectsFindResponse } from 'src/core/server';
-import { SavedObjectsClient } from '../../../core/server';
+import type { SavedObjectsFindOptions, SavedObjectsFindResponse } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 
 /**
  * Extends the SavedObjectsClient to fit the telemetry fetching requirements (i.e.: find objects from all namespaces by default)
diff --git a/src/plugins/telemetry_collection_manager/server/types.ts b/src/plugins/telemetry_collection_manager/server/types.ts
index 9658c0d68d05d..fd3b3ef85f43a 100644
--- a/src/plugins/telemetry_collection_manager/server/types.ts
+++ b/src/plugins/telemetry_collection_manager/server/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type { TelemetryCollectionManagerPlugin } from './plugin';
 
 export interface TelemetryCollectionManagerPluginSetup {
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
index ecf99187cbaa6..a8d67792b8625 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import TelemetryManagementSection from './telemetry_management_section';
-import { TelemetryService } from '../../../telemetry/public/services';
-import { coreMock } from '../../../../core/public/mocks';
+import { TelemetryService } from '@kbn/telemetry-plugin/public/services';
+import { coreMock } from '@kbn/core/public/mocks';
 import { render } from '@testing-library/react';
-import type { DocLinksStart } from 'src/core/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 describe('TelemetryManagementSectionComponent', () => {
   const coreStart = coreMock.createStart();
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
index 331b9f895b8a5..c50c3e4719852 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
@@ -11,11 +11,11 @@ import { EuiCallOut, EuiForm, EuiLink, EuiSpacer, EuiSplitPanel, EuiTitle } from
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
-import type { DocLinksStart, ToastsStart } from 'src/core/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
+import type { DocLinksStart, ToastsStart } from '@kbn/core/public';
+import { LazyField } from '@kbn/advanced-settings-plugin/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { OptInExampleFlyout } from './opt_in_example_flyout';
-import { LazyField } from '../../../advanced_settings/public';
-import { TrackApplicationView } from '../../../usage_collection/public';
 
 type TelemetryService = TelemetryPluginSetup['telemetryService'];
 
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
index 8dfaf56f2cc37..75cb161df926f 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
@@ -8,8 +8,8 @@
 
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import type { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
-import { DocLinksStart } from 'kibana/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
+import { DocLinksStart } from '@kbn/core/public';
 import type TelemetryManagementSection from './telemetry_management_section';
 
 export type TelemetryManagementSectionWrapperProps = Omit<
diff --git a/src/plugins/telemetry_management_section/public/plugin.tsx b/src/plugins/telemetry_management_section/public/plugin.tsx
index 91e3d4b9422e0..8595a39615c69 100644
--- a/src/plugins/telemetry_management_section/public/plugin.tsx
+++ b/src/plugins/telemetry_management_section/public/plugin.tsx
@@ -7,10 +7,10 @@
  */
 
 import React from 'react';
-import type { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
-import type { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { CoreStart, CoreSetup, DocLinksStart } from 'src/core/public';
+import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { CoreStart, CoreSetup, DocLinksStart } from '@kbn/core/public';
 
 import {
   telemetryManagementSectionWrapper,
diff --git a/src/plugins/ui_actions/public/actions/action.test.ts b/src/plugins/ui_actions/public/actions/action.test.ts
index 239271424a0f6..a318ae6a0ce89 100644
--- a/src/plugins/ui_actions/public/actions/action.test.ts
+++ b/src/plugins/ui_actions/public/actions/action.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ActionExecutionContext, createAction } from '../../../ui_actions/public';
+import { ActionExecutionContext, createAction } from '..';
 import { defaultTrigger } from '../triggers';
 
 const sayHelloAction = createAction<{ amICompatible: boolean }>({
diff --git a/src/plugins/ui_actions/public/actions/action.ts b/src/plugins/ui_actions/public/actions/action.ts
index 2cca606ca9701..99dfd1844c66d 100644
--- a/src/plugins/ui_actions/public/actions/action.ts
+++ b/src/plugins/ui_actions/public/actions/action.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiComponent } from 'src/plugins/kibana_utils/public';
+import { UiComponent } from '@kbn/kibana-utils-plugin/public';
 import { Presentable } from '../util/presentable';
 import { Trigger } from '../triggers';
 
diff --git a/src/plugins/ui_actions/public/actions/action_internal.ts b/src/plugins/ui_actions/public/actions/action_internal.ts
index 9f5639b329cb4..a701c54fce647 100644
--- a/src/plugins/ui_actions/public/actions/action_internal.ts
+++ b/src/plugins/ui_actions/public/actions/action_internal.ts
@@ -8,10 +8,10 @@
 
 // @ts-ignore
 import React from 'react';
-import type { UiComponent } from 'src/plugins/kibana_utils/public';
+import type { UiComponent } from '@kbn/kibana-utils-plugin/public';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import { Action, ActionContext as Context, ActionDefinition, ActionMenuItemProps } from './action';
 import { Presentable, PresentableGrouping } from '../util/presentable';
-import { uiToReactComponent } from '../../../kibana_react/public';
 
 /**
  * @internal
diff --git a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
index f389a2fac8a71..1e27cda319bbf 100644
--- a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
+++ b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
@@ -10,7 +10,7 @@ import * as React from 'react';
 import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { uiToReactComponent } from '../../../kibana_react/public';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import { Action, ActionExecutionContext } from '../actions';
 import { Trigger } from '../triggers';
 
diff --git a/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx b/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx
index 04449d7b656bc..8c7cf620d4a82 100644
--- a/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx
+++ b/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { EuiContextMenu, EuiContextMenuPanelDescriptor, EuiPopover } from '@elastic/eui';
 import { EventEmitter } from 'events';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getTheme } from '../services';
 
 let activeSession: ContextMenuSession | null = null;
diff --git a/src/plugins/ui_actions/public/index.ts b/src/plugins/ui_actions/public/index.ts
index a93b5e3f958a9..29598b1c51b9b 100644
--- a/src/plugins/ui_actions/public/index.ts
+++ b/src/plugins/ui_actions/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UiActionsPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/ui_actions/public/mocks.ts b/src/plugins/ui_actions/public/mocks.ts
index d9f4db9b9041e..4b53a73bbbbd1 100644
--- a/src/plugins/ui_actions/public/mocks.ts
+++ b/src/plugins/ui_actions/public/mocks.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart } from 'src/core/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { UiActionsSetup, UiActionsStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/public/mocks';
 
 export type Setup = jest.Mocked<UiActionsSetup>;
 export type Start = jest.Mocked<UiActionsStart>;
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index 2a2ad100a53d3..14c19f0b32184 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { UiActionsService } from './service';
 import { rowClickTrigger, visualizeFieldTrigger, visualizeGeoFieldTrigger } from './triggers';
diff --git a/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts b/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts
index aa6a76bf9a5f8..804ef1bcf858e 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts
@@ -7,8 +7,8 @@
  */
 
 import { uniqBy } from 'lodash';
+import { defer as createDefer, Defer } from '@kbn/kibana-utils-plugin/public';
 import { Action } from '../actions';
-import { defer as createDefer, Defer } from '../../../kibana_utils/public';
 import { buildContextMenuForActions, openContextMenu } from '../context_menu';
 import { Trigger } from '../triggers';
 
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
index 8d89b62ec208d..f6f4f3af8727c 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
@@ -11,7 +11,7 @@ import { Action, ActionDefinition, ActionInternal, createAction } from '../actio
 import { createHelloWorldAction } from '../tests/test_samples';
 import { TriggerRegistry, ActionRegistry } from '../types';
 import { Trigger } from '../triggers';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 const FOO_TRIGGER = 'FOO_TRIGGER';
 const BAR_TRIGGER = 'BAR_TRIGGER';
diff --git a/src/plugins/ui_actions/public/services.ts b/src/plugins/ui_actions/public/services.ts
index 96088e086a771..60c4b81311960 100644
--- a/src/plugins/ui_actions/public/services.ts
+++ b/src/plugins/ui_actions/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceSetup } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceSetup>('Theme');
diff --git a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
index d372064c9ad37..37a02726d25ef 100644
--- a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { uiActionsPluginMock } from '../mocks';
-import { createHelloWorldAction } from '../tests/test_samples';
+import { createHelloWorldAction } from './test_samples';
 import { Action, createAction } from '../actions';
 import { Trigger } from '../triggers';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 let action: Action<{ name: string }>;
 let uiActions: ReturnType<typeof uiActionsPluginMock.createPlugin>;
diff --git a/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx b/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
index 4e0ba2852a421..c62c8fa1097d8 100644
--- a/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
+++ b/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge, EuiFlyoutBody } from '@elastic/eui';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint, reactToUiComponent } from '@kbn/kibana-react-plugin/public';
 import { createAction, Action } from '../../actions';
-import { toMountPoint, reactToUiComponent } from '../../../../kibana_react/public';
 
 const ReactMenuItem: React.FC = () => {
   return (
diff --git a/src/plugins/ui_actions/public/triggers/row_click_trigger.ts b/src/plugins/ui_actions/public/triggers/row_click_trigger.ts
index 40ffba7b79886..058366b765b55 100644
--- a/src/plugins/ui_actions/public/triggers/row_click_trigger.ts
+++ b/src/plugins/ui_actions/public/triggers/row_click_trigger.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { Trigger } from '.';
-import type { Datatable } from '../../../expressions';
 
 export const ROW_CLICK_TRIGGER = 'ROW_CLICK_TRIGGER';
 
diff --git a/src/plugins/ui_actions/public/util/presentable.ts b/src/plugins/ui_actions/public/util/presentable.ts
index 9e690b9ef3c08..6cc1116101cf0 100644
--- a/src/plugins/ui_actions/public/util/presentable.ts
+++ b/src/plugins/ui_actions/public/util/presentable.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiComponent } from 'src/plugins/kibana_utils/public';
+import { UiComponent } from '@kbn/kibana-utils-plugin/public';
 
 /**
  * Represents something that can be displayed to user in UI.
diff --git a/src/plugins/unified_search/config.ts b/src/plugins/unified_search/config.ts
index c0067771b6803..4814dddea4052 100644
--- a/src/plugins/unified_search/config.ts
+++ b/src/plugins/unified_search/config.ts
@@ -8,6 +8,29 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 
-export const configSchema = schema.object({});
+export const configSchema = schema.object({
+  autocomplete: schema.object({
+    querySuggestions: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+    }),
+    valueSuggestions: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+      tiers: schema.arrayOf(
+        schema.oneOf([
+          schema.literal('data_content'),
+          schema.literal('data_hot'),
+          schema.literal('data_warm'),
+          schema.literal('data_cold'),
+          schema.literal('data_frozen'),
+        ]),
+        {
+          defaultValue: ['data_hot', 'data_warm', 'data_content', 'data_cold'],
+        }
+      ),
+      terminateAfter: schema.duration({ defaultValue: 100000 }),
+      timeout: schema.duration({ defaultValue: 1000 }),
+    }),
+  }),
+});
 
 export type ConfigSchema = TypeOf<typeof configSchema>;
diff --git a/src/plugins/unified_search/kibana.json b/src/plugins/unified_search/kibana.json
index 8673c6ec783bb..b947141a0c68a 100755
--- a/src/plugins/unified_search/kibana.json
+++ b/src/plugins/unified_search/kibana.json
@@ -7,8 +7,10 @@
     "name": "Unified Search",
     "githubTeam": "kibana-app-services"
   },
-  "server": false,
+  "server": true,
   "ui": true,
   "requiredPlugins": ["dataViews", "data", "uiActions"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "data"],
+  "serviceFolders": ["autocomplete"],
+  "configPath": ["unifiedSearch"]
 }
diff --git a/src/plugins/unified_search/public/actions/apply_filter_action.ts b/src/plugins/unified_search/public/actions/apply_filter_action.ts
index e9fb75c5bd6d5..36524cf3ff826 100644
--- a/src/plugins/unified_search/public/actions/apply_filter_action.ts
+++ b/src/plugins/unified_search/public/actions/apply_filter_action.ts
@@ -7,12 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ThemeServiceSetup } from 'kibana/public';
-import { toMountPoint } from '../../../kibana_react/public';
-import { Action, createAction, IncompatibleActionError } from '../../../ui_actions/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { Action, createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { Filter, FilterManager, TimefilterContract, esFilters } from '@kbn/data-plugin/public';
 import { getOverlays, getIndexPatterns } from '../services';
 import { applyFiltersPopover } from '../apply_filters';
-import { Filter, FilterManager, TimefilterContract, esFilters } from '../../../data/public';
 
 export const ACTION_GLOBAL_APPLY_FILTER = 'ACTION_GLOBAL_APPLY_FILTER';
 
diff --git a/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
index 1daf3a719284f..25d6f27bc51f1 100644
--- a/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
@@ -19,10 +19,10 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Component } from 'react';
-import { getDisplayValueFromFilter, mapAndFlattenFilters } from '../../../data/public';
+import { getDisplayValueFromFilter, mapAndFlattenFilters } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterLabel } from '../filter_bar';
-import { Filter } from '../../../data/common';
-import { DataView } from '../../../data_views/public';
 
 interface Props {
   filters: Filter[];
diff --git a/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
index 45567f4c93d31..4cefbd1a202a0 100644
--- a/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
@@ -7,8 +7,8 @@
  */
 
 import React from 'react';
-import { Filter } from '../../../data/common';
-import { DataView } from '../../../data_views/common';
+import { Filter } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 
 type CancelFnType = () => void;
 type SubmitFnType = (filters: Filter[]) => void;
diff --git a/src/plugins/data/public/autocomplete/autocomplete_service.ts b/src/plugins/unified_search/public/autocomplete/autocomplete_service.ts
similarity index 89%
rename from src/plugins/data/public/autocomplete/autocomplete_service.ts
rename to src/plugins/unified_search/public/autocomplete/autocomplete_service.ts
index 0d21c7e765501..97d128df5a782 100644
--- a/src/plugins/data/public/autocomplete/autocomplete_service.ts
+++ b/src/plugins/unified_search/public/autocomplete/autocomplete_service.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 import moment from 'moment';
-import type { TimefilterSetup } from '../query';
+import type { TimefilterSetup } from '@kbn/data-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { QuerySuggestionGetFn } from './providers/query_suggestion_provider';
 import {
   getEmptyValueSuggestions,
@@ -17,13 +18,12 @@ import {
 import type { ValueSuggestionsGetFn } from './providers/value_suggestion_provider';
 
 import { ConfigSchema } from '../../config';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 import { createUsageCollector } from './collectors';
 import {
   KUERY_LANGUAGE_NAME,
   setupKqlQuerySuggestionProvider,
 } from './providers/kql_query_suggestion';
-import { DataPublicPluginStart, DataStartDependencies } from '../types';
+import { UnifiedSearchPublicPluginStart, UnifiedSearchStartDependencies } from '../types';
 
 export class AutocompleteService {
   autocompleteConfig: ConfigSchema['autocomplete'];
@@ -50,7 +50,7 @@ export class AutocompleteService {
 
   /** @public **/
   public setup(
-    core: CoreSetup<DataStartDependencies, DataPublicPluginStart>,
+    core: CoreSetup<UnifiedSearchStartDependencies, UnifiedSearchPublicPluginStart>,
     {
       timefilter,
       usageCollection,
diff --git a/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts b/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
similarity index 92%
rename from src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts
rename to src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
index 326fcb1e8153d..102b50402e3fa 100644
--- a/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts
+++ b/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
@@ -8,8 +8,8 @@
 
 import { first } from 'rxjs/operators';
 import { METRIC_TYPE } from '@kbn/analytics';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { AUTOCOMPLETE_EVENT_TYPE, AutocompleteUsageCollector } from './types';
 
 export const createUsageCollector = (
diff --git a/src/plugins/data/public/autocomplete/collectors/index.ts b/src/plugins/unified_search/public/autocomplete/collectors/index.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/collectors/index.ts
rename to src/plugins/unified_search/public/autocomplete/collectors/index.ts
diff --git a/src/plugins/data/public/autocomplete/collectors/types.ts b/src/plugins/unified_search/public/autocomplete/collectors/types.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/collectors/types.ts
rename to src/plugins/unified_search/public/autocomplete/collectors/types.ts
diff --git a/src/plugins/data/public/autocomplete/index.ts b/src/plugins/unified_search/public/autocomplete/index.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/index.ts
rename to src/plugins/unified_search/public/autocomplete/index.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/README.md b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/README.md
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/README.md
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/README.md
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
similarity index 93%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
index 24d9cdbfa6b3c..24a27bcb99fbe 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { KueryNode } from '@kbn/data-plugin/public';
 import { setupGetConjunctionSuggestions } from './conjunction';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
similarity index 69%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
index 4cad30943f4cf..ad757f5afbf9c 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
@@ -10,24 +10,21 @@ import React from 'react';
 import { $Keys } from 'utility-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { KqlQuerySuggestionProvider } from './types';
-import {
-  QuerySuggestion,
-  QuerySuggestionTypes,
-} from '../../../../../../../src/plugins/data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '../query_suggestion_provider';
 
 const bothArgumentsText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.andOperatorDescription.bothArgumentsText"
+    id="unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText"
     defaultMessage="both arguments"
-    description="Part of data.kueryAutocomplete.andOperatorDescription. Full text: 'Requires both arguments to be true'"
+    description="Part of unifiedSearch.kueryAutocomplete.andOperatorDescription. Full text: 'Requires both arguments to be true'"
   />
 );
 
 const oneOrMoreArgumentsText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText"
+    id="unifiedSearch.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText"
     defaultMessage="one or more arguments"
-    description="Part of data.kueryAutocomplete.orOperatorDescription. Full text: 'Requires one or more arguments to be true'"
+    description="Part of unifiedSearch.kueryAutocomplete.orOperatorDescription. Full text: 'Requires one or more arguments to be true'"
   />
 );
 
@@ -35,20 +32,20 @@ const conjunctions: Record<string, JSX.Element> = {
   and: (
     <p>
       <FormattedMessage
-        id="data.kueryAutocomplete.andOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.andOperatorDescription"
         defaultMessage="Requires {bothArguments} to be true"
         values={{
           bothArguments: <span className="kbnSuggestionItem__callout">{bothArgumentsText}</span>,
         }}
         description="Full text: ' Requires both arguments to be true'. See
-          'data.kueryAutocomplete.andOperatorDescription.bothArgumentsText' for 'both arguments' part."
+          'unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText' for 'both arguments' part."
       />
     </p>
   ),
   or: (
     <p>
       <FormattedMessage
-        id="data.kueryAutocomplete.orOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.orOperatorDescription"
         defaultMessage="Requires {oneOrMoreArguments} to be true"
         values={{
           oneOrMoreArguments: (
@@ -56,7 +53,7 @@ const conjunctions: Record<string, JSX.Element> = {
           ),
         }}
         description="Full text: 'Requires one or more arguments to be true'. See
-          'data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText' for 'one or more arguments' part."
+          'unifiedSearch.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText' for 'one or more arguments' part."
       />
     </p>
   ),
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
similarity index 97%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
index 9462b8c5d171f..4446fcf685bde 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
@@ -8,13 +8,10 @@
 
 import indexPatternResponse from './__fixtures__/index_pattern_response.json';
 
+import { indexPatterns as indexPatternsUtils, KueryNode } from '@kbn/data-plugin/public';
 import { setupGetFieldSuggestions } from './field';
-import {
-  indexPatterns as indexPatternsUtils,
-  QuerySuggestionGetFnArgs,
-  KueryNode,
-} from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx
similarity index 93%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx
index a0008101b5aec..139405f6af9f4 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx
@@ -6,15 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { IFieldType, indexPatterns as indexPatternsUtils } from '@kbn/data-plugin/public';
 import { flatten } from 'lodash';
 import { escapeKuery } from './lib/escape_kuery';
 import { sortPrefixFirst } from './sort_prefix_first';
-import {
-  IFieldType,
-  indexPatterns as indexPatternsUtils,
-  QuerySuggestionField,
-  QuerySuggestionTypes,
-} from '../../../../../../../src/plugins/data/public';
+import { QuerySuggestionField, QuerySuggestionTypes } from '../query_suggestion_provider';
 import { KqlQuerySuggestionProvider } from './types';
 
 const keywordComparator = (first: IFieldType, second: IFieldType) => {
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/index.ts
similarity index 91%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/index.ts
index c40f1dd925345..1002863fec7f4 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { $Keys } from 'utility-types';
 import { flatten, uniqBy } from 'lodash';
 import { fromKueryExpression } from '@kbn/es-query';
@@ -14,12 +14,12 @@ import { setupGetFieldSuggestions } from './field';
 import { setupGetValueSuggestions } from './value';
 import { setupGetOperatorSuggestions } from './operator';
 import { setupGetConjunctionSuggestions } from './conjunction';
+import { UnifiedSearchPublicPluginStart } from '../../../types';
 import {
   QuerySuggestion,
   QuerySuggestionGetFnArgs,
   QuerySuggestionGetFn,
-  DataPublicPluginStart,
-} from '../../../../../../../src/plugins/data/public';
+} from '../query_suggestion_provider';
 
 const cursorSymbol = '@kuery-cursor@';
 
@@ -29,7 +29,7 @@ const dedup = (suggestions: QuerySuggestion[]): QuerySuggestion[] =>
 export const KUERY_LANGUAGE_NAME = 'kuery';
 
 export const setupKqlQuerySuggestionProvider = (
-  core: CoreSetup<object, DataPublicPluginStart>
+  core: CoreSetup<object, UnifiedSearchPublicPluginStart>
 ): QuerySuggestionGetFn => {
   const providers = {
     field: setupGetFieldSuggestions(core),
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
similarity index 95%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
index ab1d79eb522c1..a40678ad4ac16 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
@@ -9,8 +9,9 @@
 import indexPatternResponse from './__fixtures__/index_pattern_response.json';
 
 import { setupGetOperatorSuggestions } from './operator';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { KueryNode } from '@kbn/data-plugin/public';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.tsx
similarity index 65%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.tsx
index 4e1efef73a42b..ee53d5cb3d391 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.tsx
@@ -12,48 +12,48 @@ import { $Keys } from 'utility-types';
 import { flatten } from 'lodash';
 
 import { KqlQuerySuggestionProvider } from './types';
-import { QuerySuggestionTypes } from '../../../../../../../src/plugins/data/public';
+import { QuerySuggestionTypes } from '../query_suggestion_provider';
 
 const equalsText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.equalOperatorDescription.equalsText"
+    id="unifiedSearch.kueryAutocomplete.equalOperatorDescription.equalsText"
     defaultMessage="equals"
-    description="Part of data.kueryAutocomplete.equalOperatorDescription. Full text: 'equals some value'"
+    description="Part of unifiedSearch.kueryAutocomplete.equalOperatorDescription. Full text: 'equals some value'"
   />
 );
 const lessThanOrEqualToText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText"
+    id="unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText"
     defaultMessage="less than or equal to"
-    description="Part of data.kueryAutocomplete.lessThanOrEqualOperatorDescription. Full text: 'is less than or equal to some value'"
+    description="Part of unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription. Full text: 'is less than or equal to some value'"
   />
 );
 const greaterThanOrEqualToText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText"
+    id="unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText"
     defaultMessage="greater than or equal to"
-    description="Part of data.kueryAutocomplete.greaterThanOrEqualOperatorDescription. Full text: 'is greater than or equal to some value'"
+    description="Part of unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription. Full text: 'is greater than or equal to some value'"
   />
 );
 const lessThanText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.lessThanOperatorDescription.lessThanText"
+    id="unifiedSearch.kueryAutocomplete.lessThanOperatorDescription.lessThanText"
     defaultMessage="less than"
-    description="Part of data.kueryAutocomplete.lessThanOperatorDescription. Full text: 'is less than some value'"
+    description="Part of unifiedSearch.kueryAutocomplete.lessThanOperatorDescription. Full text: 'is less than some value'"
   />
 );
 const greaterThanText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText"
+    id="unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText"
     defaultMessage="greater than"
-    description="Part of data.kueryAutocomplete.greaterThanOperatorDescription. Full text: 'is greater than some value'"
+    description="Part of unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription. Full text: 'is greater than some value'"
   />
 );
 const existsText = (
   <FormattedMessage
-    id="data.kueryAutocomplete.existOperatorDescription.existsText"
+    id="unifiedSearch.kueryAutocomplete.existOperatorDescription.existsText"
     defaultMessage="exists"
-    description="Part of data.kueryAutocomplete.existOperatorDescription. Full text: 'exists in any form'"
+    description="Part of unifiedSearch.kueryAutocomplete.existOperatorDescription. Full text: 'exists in any form'"
   />
 );
 
@@ -61,11 +61,11 @@ const operators = {
   ':': {
     description: (
       <FormattedMessage
-        id="data.kueryAutocomplete.equalOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.equalOperatorDescription"
         defaultMessage="{equals} some value"
         values={{ equals: <span className="kbnSuggestionItem__callout">{equalsText}</span> }}
         description="Full text: 'equals some value'. See
-        'data.kueryAutocomplete.equalOperatorDescription.equalsText' for 'equals' part."
+        'unifiedSearch.kueryAutocomplete.equalOperatorDescription.equalsText' for 'equals' part."
       />
     ),
     fieldTypes: [
@@ -84,7 +84,7 @@ const operators = {
   '<=': {
     description: (
       <FormattedMessage
-        id="data.kueryAutocomplete.lessThanOrEqualOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription"
         defaultMessage="is {lessThanOrEqualTo} some value"
         values={{
           lessThanOrEqualTo: (
@@ -92,7 +92,7 @@ const operators = {
           ),
         }}
         description="Full text: 'is less than or equal to some value'. See
-        'data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText' for 'less than or equal to' part."
+        'unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText' for 'less than or equal to' part."
       />
     ),
     fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -100,7 +100,7 @@ const operators = {
   '>=': {
     description: (
       <FormattedMessage
-        id="data.kueryAutocomplete.greaterThanOrEqualOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription"
         defaultMessage="is {greaterThanOrEqualTo} some value"
         values={{
           greaterThanOrEqualTo: (
@@ -108,7 +108,7 @@ const operators = {
           ),
         }}
         description="Full text: 'is greater than or equal to some value'. See
-        'data.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText' for 'greater than or equal to' part."
+        'unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText' for 'greater than or equal to' part."
       />
     ),
     fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -116,11 +116,11 @@ const operators = {
   '<': {
     description: (
       <FormattedMessage
-        id="data.kueryAutocomplete.lessThanOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.lessThanOperatorDescription"
         defaultMessage="is {lessThan} some value"
         values={{ lessThan: <span className="kbnSuggestionItem__callout">{lessThanText}</span> }}
         description="Full text: 'is less than some value'. See
-        'data.kueryAutocomplete.lessThanOperatorDescription.lessThanText' for 'less than' part."
+        'unifiedSearch.kueryAutocomplete.lessThanOperatorDescription.lessThanText' for 'less than' part."
       />
     ),
     fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -128,13 +128,13 @@ const operators = {
   '>': {
     description: (
       <FormattedMessage
-        id="data.kueryAutocomplete.greaterThanOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription"
         defaultMessage="is {greaterThan} some value"
         values={{
           greaterThan: <span className="kbnSuggestionItem__callout">{greaterThanText}</span>,
         }}
         description="Full text: 'is greater than some value'. See
-        'data.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText' for 'greater than' part."
+        'unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText' for 'greater than' part."
       />
     ),
     fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -142,11 +142,11 @@ const operators = {
   ': *': {
     description: (
       <FormattedMessage
-        id="data.kueryAutocomplete.existOperatorDescription"
+        id="unifiedSearch.kueryAutocomplete.existOperatorDescription"
         defaultMessage="{exists} in any form"
         values={{ exists: <span className="kbnSuggestionItem__callout">{existsText}</span> }}
         description="Full text: 'exists in any form'. See
-        'data.kueryAutocomplete.existOperatorDescription.existsText' for 'exists' part."
+        'unifiedSearch.kueryAutocomplete.existOperatorDescription.existsText' for 'exists' part."
       />
     ),
     fieldTypes: undefined,
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/types.ts
similarity index 67%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/types.ts
index 12a0dae97ebaa..e9ca34e546f0b 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/types.ts
@@ -6,14 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { CoreSetup } from '@kbn/core/public';
 import { KueryNode } from '@kbn/es-query';
-import { CoreSetup } from 'kibana/public';
-import {
-  DataPublicPluginStart,
-  QuerySuggestionBasic,
-  QuerySuggestionGetFnArgs,
-} from '../../../../../../../src/plugins/data/public';
+import type { UnifiedSearchPublicPluginStart } from '../../../types';
+import { QuerySuggestionBasic, QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 
 export type KqlQuerySuggestionProvider<T = QuerySuggestionBasic> = (
-  core: CoreSetup<object, DataPublicPluginStart>
+  core: CoreSetup<object, UnifiedSearchPublicPluginStart>
 ) => (querySuggestionsGetFnArgs: QuerySuggestionGetFnArgs, kueryNode: KueryNode) => Promise<T[]>;
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
similarity index 96%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
index 27031209c42a5..3405d26824a26 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
@@ -8,8 +8,10 @@
 
 import { setupGetValueSuggestions } from './value';
 import indexPatternResponse from './__fixtures__/index_pattern_response.json';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../../../../../../src/plugins/data/public';
+
+import { coreMock } from '@kbn/core/public/mocks';
+import { KueryNode } from '@kbn/data-plugin/public';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts
similarity index 87%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts
index cee7d37a1a12d..06b0fc9639a3c 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts
@@ -7,16 +7,12 @@
  */
 
 import { flatten } from 'lodash';
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
+import { IFieldType, IIndexPattern } from '@kbn/data-plugin/public';
 import { escapeQuotes } from './lib/escape_kuery';
 import { KqlQuerySuggestionProvider } from './types';
-import {
-  DataPublicPluginStart,
-  IFieldType,
-  IIndexPattern,
-  QuerySuggestion,
-  QuerySuggestionTypes,
-} from '../../../../../../../src/plugins/data/public';
+import type { UnifiedSearchPublicPluginStart } from '../../../types';
+import { QuerySuggestion, QuerySuggestionTypes } from '../query_suggestion_provider';
 
 const wrapAsSuggestions = (start: number, end: number, query: string, values: string[]) =>
   values
@@ -29,7 +25,7 @@ const wrapAsSuggestions = (start: number, end: number, query: string, values: st
     }));
 
 export const setupGetValueSuggestions: KqlQuerySuggestionProvider = (
-  core: CoreSetup<object, DataPublicPluginStart>
+  core: CoreSetup<object, UnifiedSearchPublicPluginStart>
 ) => {
   const autoCompleteServicePromise = core
     .getStartServices()
diff --git a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts b/src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts
similarity index 90%
rename from src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
rename to src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts
index 0cb229c9b41bc..056fcb716054a 100644
--- a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ValueSuggestionsMethod } from '../../../common';
-import { IFieldType, IIndexPattern } from '../../../common';
+import { ValueSuggestionsMethod } from '@kbn/data-plugin/common';
+import { IFieldType, IIndexPattern } from '@kbn/data-plugin/common';
 
 export enum QuerySuggestionTypes {
   Field = 'field',
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts
similarity index 97%
rename from src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts
index 4a68c7232ea7e..a17172a2b6072 100644
--- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern, stubFields } from '../../stubs';
-import type { TimefilterSetup } from '../../query';
+import { IUiSettingsClient, CoreSetup } from '@kbn/core/public';
+import { stubIndexPattern, stubFields } from '@kbn/data-plugin/public/stubs';
+import type { TimefilterSetup } from '@kbn/data-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { setupValueSuggestionProvider } from './value_suggestion_provider';
 import type { ValueSuggestionsGetFn } from './value_suggestion_provider';
-import { IUiSettingsClient, CoreSetup } from 'kibana/public';
-import { UI_SETTINGS } from '../../../common';
 
 describe('FieldSuggestions', () => {
   let getValueSuggestions: ValueSuggestionsGetFn;
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts
similarity index 94%
rename from src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
rename to src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts
index 0caf2d4ced530..054a243064329 100644
--- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts
@@ -6,12 +6,17 @@
  * Side Public License, v 1.
  */
 
+import { CoreSetup } from '@kbn/core/public';
 import dateMath from '@kbn/datemath';
 import { buildQueryFromFilters } from '@kbn/es-query';
 import { memoize } from 'lodash';
-import { CoreSetup } from 'src/core/public';
-import { IIndexPattern, IFieldType, UI_SETTINGS, ValueSuggestionsMethod } from '../../../common';
-import type { TimefilterSetup } from '../../query';
+import {
+  IIndexPattern,
+  IFieldType,
+  UI_SETTINGS,
+  ValueSuggestionsMethod,
+} from '@kbn/data-plugin/common';
+import type { TimefilterSetup } from '@kbn/data-plugin/public';
 import { AutocompleteUsageCollector } from '../collectors';
 
 export type ValueSuggestionsGetFn = (args: ValueSuggestionsGetFnArgs) => Promise<any[]>;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_bar.tsx b/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
index 136d83525a9f6..43b511b2c9f7d 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
@@ -22,13 +22,13 @@ import classNames from 'classnames';
 import React, { useState, useRef } from 'react';
 
 import { METRIC_TYPE } from '@kbn/analytics';
-import { FilterEditor } from './filter_editor';
-import { FILTER_EDITOR_WIDTH, FilterItem } from './filter_item';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterOptions } from './filter_options';
-import { useKibana } from '../../../kibana_react/public';
-import { UI_SETTINGS } from '../../../data/common';
-import { IDataPluginServices } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { FILTER_EDITOR_WIDTH, FilterItem } from './filter_item';
+import { FilterEditor } from './filter_editor';
 
 export interface Props {
   filters: Filter[];
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
index 9bc8aa382bb03..87d0eca815cd8 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
@@ -10,8 +10,8 @@ import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { FilterEditor, Props } from '.';
 import React from 'react';
 
-jest.mock('../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
index 7596b5ba557a1..f136da2a7503a 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
@@ -32,6 +32,9 @@ import {
 import { get } from 'lodash';
 import React, { Component } from 'react';
 import { XJsonLang } from '@kbn/monaco';
+import { DataView, IFieldType } from '@kbn/data-views-plugin/common';
+import { getIndexPatternFromFilter } from '@kbn/data-plugin/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import {
   getFieldFromFilter,
@@ -44,9 +47,6 @@ import { Operator } from './lib/filter_operators';
 import { PhraseValueInput } from './phrase_value_input';
 import { PhrasesValuesInput } from './phrases_values_input';
 import { RangeValueInput } from './range_value_input';
-import { DataView, IFieldType } from '../../../../data_views/common';
-import { getIndexPatternFromFilter } from '../../../../data/public';
-import { CodeEditor } from '../../../../kibana_react/public';
 
 export interface Props {
   filter: Filter;
@@ -371,6 +371,7 @@ class FilterEditorUI extends Component<Props, State> {
             field={this.state.selectedField}
             values={this.state.params}
             onChange={this.onParamsChange}
+            onParamsUpdate={this.onParamsUpdate}
             timeRangeForSuggestionsOverride={this.props.timeRangeForSuggestionsOverride}
             fullWidth
           />
@@ -469,6 +470,10 @@ class FilterEditorUI extends Component<Props, State> {
     this.setState({ params });
   };
 
+  private onParamsUpdate = (value: string) => {
+    this.setState((prevState) => ({ params: [value, ...(prevState.params || [])] }));
+  };
+
   private onQueryDslChange = (queryDsl: string) => {
     this.setState({ queryDsl });
   };
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
index 7790bd601dcf5..d6c44228eb72f 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
@@ -13,8 +13,8 @@ import {
   rangeFilter,
   stubIndexPattern,
   stubFields,
-} from '../../../../../data/common/stubs';
-import { toggleFilterNegated } from '../../../../../data/common';
+} from '@kbn/data-plugin/common/stubs';
+import { toggleFilterNegated } from '@kbn/data-plugin/common';
 import {
   getFieldFromFilter,
   getFilterableFields,
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
index 488a6942dce85..f85b9a9e788d8 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
@@ -10,9 +10,9 @@ import dateMath from '@kbn/datemath';
 import { Filter, FieldFilter } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import isSemverValid from 'semver/functions/valid';
+import { isFilterable, IFieldType, IpAddress } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
-import { isFilterable, IFieldType, IpAddress } from '../../../../../data/common';
-import { DataView } from '../../../../../data_views/common';
 
 export function getFieldFromFilter(filter: FieldFilter, indexPattern: DataView) {
   return indexPattern.fields.find((field) => field.name === filter.meta.key);
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
index b3756701aaa9c..3bd0db41cb10c 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import FilterLabel from './filter_label';
 import { render } from '@testing-library/react';
-import { phraseFilter } from '../../../../../data/common/stubs';
+import { phraseFilter } from '@kbn/data-plugin/common/stubs';
 
 test('alias', () => {
   const filter = {
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
index 099f211deef00..0f5ea0cc136ad 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
@@ -9,8 +9,8 @@
 import React, { Fragment } from 'react';
 import { EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { Filter, FILTERS } from '@kbn/data-plugin/common';
 import { existsOperator, isOneOfOperator } from './filter_operators';
-import { Filter, FILTERS } from '../../../../../data/common';
 import type { FilterLabelStatus } from '../../filter_item';
 
 export interface FilterLabelProps {
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
index 515a4e7f85f65..c1e4d5361e3f8 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { FILTERS } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
-import { IFieldType } from '../../../../../data_views/common';
+import { IFieldType } from '@kbn/data-views-plugin/common';
 
 export interface Operator {
   message: string;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
index 68ed20e8c34dd..50acadea2a990 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
@@ -7,12 +7,13 @@
  */
 
 import React from 'react';
+import { withKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
+import { IFieldType, UI_SETTINGS } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
 import { debounce } from 'lodash';
 
-import { withKibana, KibanaReactContextValue } from '../../../../kibana_react/public';
-import { IFieldType, UI_SETTINGS } from '../../../../data/common';
-import { DataView } from '../../../../data_views/common';
-import { IDataPluginServices } from '../../../../data/public';
+import { getAutocomplete } from '../../services';
 
 export interface PhraseSuggestorProps {
   kibana: KibanaReactContextValue<IDataPluginServices>;
@@ -79,8 +80,7 @@ export class PhraseSuggestorUI<T extends PhraseSuggestorProps> extends React.Com
       return;
     }
     this.setState({ isLoading: true });
-
-    const suggestions = await this.services.data.autocomplete.getValueSuggestions({
+    const suggestions = await getAutocomplete().getValueSuggestions({
       indexPattern,
       field,
       query,
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
index 6b8667b5043fe..cf8ef5dbabb20 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
@@ -10,10 +10,10 @@ import { EuiFormRow } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { uniq } from 'lodash';
 import React from 'react';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor';
 import { ValueInputType } from './value_input_type';
-import { withKibana } from '../../../../kibana_react/public';
 
 interface Props extends PhraseSuggestorProps {
   value?: string;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
index 0a89ba59d3299..aa819007001a2 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
@@ -10,13 +10,14 @@ import { EuiFormRow } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { uniq } from 'lodash';
 import React from 'react';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor';
-import { withKibana } from '../../../../kibana_react/public';
 
 interface Props extends PhraseSuggestorProps {
   values?: string[];
   onChange: (values: string[]) => void;
+  onParamsUpdate: (value: string) => void;
   intl: InjectedIntl;
   fullWidth?: boolean;
 }
@@ -24,7 +25,7 @@ interface Props extends PhraseSuggestorProps {
 class PhrasesValuesInputUI extends PhraseSuggestorUI<Props> {
   public render() {
     const { suggestions } = this.state;
-    const { values, intl, onChange, fullWidth } = this.props;
+    const { values, intl, onChange, fullWidth, onParamsUpdate } = this.props;
     const options = values ? uniq([...values, ...suggestions]) : suggestions;
     return (
       <EuiFormRow
@@ -40,11 +41,14 @@ class PhrasesValuesInputUI extends PhraseSuggestorUI<Props> {
             id: 'unifiedSearch.filter.filterEditor.valuesSelectPlaceholder',
             defaultMessage: 'Select values',
           })}
+          delimiter=","
           options={options}
           getLabel={(option) => option}
           selectedOptions={values || []}
           onSearchChange={this.onSearchChange}
-          onCreateOption={(option: string) => onChange([...(values || []), option])}
+          onCreateOption={(option: string) => {
+            onParamsUpdate(option.trim());
+          }}
           onChange={onChange}
           isClearable={false}
           data-test-subj="filterParamsComboBox phrasesParamsComboxBox"
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
index bb36682cb607d..3c1046d928981 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
@@ -11,8 +11,8 @@ import { EuiFormControlLayoutDelimited } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { get } from 'lodash';
 import React from 'react';
-import { useKibana } from '../../../../kibana_react/public';
-import { IFieldType } from '../../../../data/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IFieldType } from '@kbn/data-plugin/common';
 import { ValueInputType } from './value_input_type';
 
 interface RangeParams {
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
index 3b6f8a6879dfb..e66c5d52770f5 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
@@ -10,8 +10,8 @@ import { EuiFieldNumber, EuiFieldText, EuiSelect } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
+import { IFieldType } from '@kbn/data-views-plugin/common';
 import { validateParams } from './lib/filter_editor_utils';
-import { IFieldType } from '../../../../data_views/common';
 
 interface Props {
   value?: string | number;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_item.tsx b/src/plugins/unified_search/public/filter_bar/filter_item.tsx
index 571278fcf05d1..2f48a4ea4c758 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_item.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_item.tsx
@@ -17,11 +17,11 @@ import {
 } from '@kbn/es-query';
 import classNames from 'classnames';
 import React, { MouseEvent, useState, useEffect, HTMLAttributes } from 'react';
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { getIndexPatternFromFilter, getDisplayValueFromFilter } from '@kbn/data-plugin/public';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
-import { DataView } from '../../../data_views/public';
-import { getIndexPatternFromFilter, getDisplayValueFromFilter } from '../../../data/public';
 import { getIndexPatterns } from '../services';
 
 type PanelOptions = 'pinFilter' | 'editFilter' | 'negateFilter' | 'disableFilter' | 'deleteFilter';
diff --git a/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx b/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
index 69ef9edee5803..974b94e95b0e0 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
@@ -10,7 +10,7 @@ import { EuiBadge, EuiBadgeProps, useInnerText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { FC } from 'react';
 import { Filter, isFilterPinned } from '@kbn/es-query';
-import { FilterLabel } from '../';
+import { FilterLabel } from '..';
 import type { FilterLabelStatus } from '../filter_item';
 
 interface Props {
diff --git a/src/plugins/unified_search/public/index.ts b/src/plugins/unified_search/public/index.ts
index 3eb528dc07ba1..1200234a793a4 100755
--- a/src/plugins/unified_search/public/index.ts
+++ b/src/plugins/unified_search/public/index.ts
@@ -5,21 +5,33 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ConfigSchema } from '../config';
-import { UnifiedSearchPublicPlugin } from './plugin';
-
 export type { IndexPatternSelectProps } from './index_pattern_select';
 export type { QueryStringInputProps } from './query_string_input';
 export { QueryStringInput } from './query_string_input';
 export type { StatefulSearchBarProps, SearchBarProps } from './search_bar';
-export type { UnifiedSearchPublicPluginStart } from './types';
+export type { UnifiedSearchPublicPluginStart, UnifiedSearchPluginSetup } from './types';
 export { SearchBar } from './search_bar';
 export { FilterLabel, FilterItem } from './filter_bar';
 
 export type { ApplyGlobalFilterActionContext } from './actions';
 export { ACTION_GLOBAL_APPLY_FILTER } from './actions';
 
+/*
+ * Autocomplete query suggestions:
+ */
+export type {
+  QuerySuggestion,
+  QuerySuggestionGetFn,
+  QuerySuggestionGetFnArgs,
+  AutocompleteStart,
+} from './autocomplete';
+
+export { QuerySuggestionTypes } from './autocomplete';
+
+import { UnifiedSearchPublicPlugin } from './plugin';
+
 // This exports static code and TypeScript types,
 // as well as, Kibana Platform `plugin()` initializer.
 export function plugin(initializerContext: PluginInitializerContext<ConfigSchema>) {
diff --git a/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx b/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
index 4a86ab32db9ec..505b1deda7cdf 100644
--- a/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
+++ b/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
@@ -9,8 +9,8 @@
 import _ from 'lodash';
 import React from 'react';
 
-import { IndexPatternsContract } from '../../../data/public';
-import { IndexPatternSelect, IndexPatternSelectProps } from './';
+import { IndexPatternsContract } from '@kbn/data-plugin/public';
+import { IndexPatternSelect, IndexPatternSelectProps } from '.';
 
 // Takes in stateful runtime dependencies and pre-wires them to the component
 export function createIndexPatternSelect(indexPatternService: IndexPatternsContract) {
diff --git a/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx b/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
index 7555d00bac8b3..335787d2ee38a 100644
--- a/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
+++ b/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
@@ -11,7 +11,7 @@ import React, { Component } from 'react';
 
 import { Required } from '@kbn/utility-types';
 import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
-import { IndexPatternsContract } from '../../../data/public';
+import { IndexPatternsContract } from '@kbn/data-plugin/public';
 
 export type IndexPatternSelectProps = Required<
   Omit<
diff --git a/src/plugins/unified_search/public/mocks.ts b/src/plugins/unified_search/public/mocks.ts
index eacbb72cc55ac..e119c58e89f3f 100644
--- a/src/plugins/unified_search/public/mocks.ts
+++ b/src/plugins/unified_search/public/mocks.ts
@@ -7,12 +7,31 @@
  */
 
 import { UnifiedSearchPublicPlugin } from './plugin';
+import { AutocompleteStart, AutocompleteSetup } from './autocomplete';
 
 export type Setup = jest.Mocked<ReturnType<UnifiedSearchPublicPlugin['setup']>>;
 export type Start = jest.Mocked<ReturnType<UnifiedSearchPublicPlugin['start']>>;
 
+const autocompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
+  getQuerySuggestions: jest.fn(),
+  getAutocompleteSettings: jest.fn(),
+};
+
+const autocompleteStartMock: jest.Mocked<AutocompleteStart> = {
+  getValueSuggestions: jest.fn(),
+  getQuerySuggestions: jest.fn(),
+  hasQuerySuggestions: jest.fn(),
+};
+
+const createSetupContract = (): Setup => {
+  return {
+    autocomplete: autocompleteSetupMock,
+  };
+};
+
 const createStartContract = (): Start => {
   return {
+    autocomplete: autocompleteStartMock,
     ui: {
       IndexPatternSelect: jest.fn(),
       SearchBar: jest.fn().mockReturnValue(null),
@@ -22,4 +41,5 @@ const createStartContract = (): Start => {
 
 export const unifiedSearchPluginMock = {
   createStartContract,
+  createSetupContract,
 };
diff --git a/src/plugins/unified_search/public/plugin.ts b/src/plugins/unified_search/public/plugin.ts
index 9a7121ddc9114..93f1aaf19fae8 100755
--- a/src/plugins/unified_search/public/plugin.ts
+++ b/src/plugins/unified_search/public/plugin.ts
@@ -8,39 +8,52 @@
 
 import './index.scss';
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { Storage, IStorageWrapper } from '../../kibana_utils/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Storage, IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
 import { ConfigSchema } from '../config';
-import { setIndexPatterns, setTheme, setOverlays } from './services';
-import type { UsageCollectionSetup } from '../../usage_collection/public';
+import { setIndexPatterns, setTheme, setOverlays, setAutocomplete } from './services';
+import { AutocompleteService } from './autocomplete';
 import { createSearchBar } from './search_bar';
 import { createIndexPatternSelect } from './index_pattern_select';
-import { UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart } from './types';
-import type { UnifiedSearchStartDependencies, UnifiedSearchSetupDependencies } from './types';
+import type {
+  UnifiedSearchStartDependencies,
+  UnifiedSearchSetupDependencies,
+  UnifiedSearchPluginSetup,
+  UnifiedSearchPublicPluginStart,
+} from './types';
 import { createFilterAction } from './actions/apply_filter_action';
 import { ACTION_GLOBAL_APPLY_FILTER } from './actions';
-import { APPLY_FILTER_TRIGGER } from '../../data/public';
 
 export class UnifiedSearchPublicPlugin
   implements Plugin<UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart>
 {
   private readonly storage: IStorageWrapper;
+  private readonly autocomplete: AutocompleteService;
   private usageCollection: UsageCollectionSetup | undefined;
 
   constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
     this.storage = new Storage(window.localStorage);
+
+    this.autocomplete = new AutocompleteService(initializerContext);
   }
 
   public setup(
-    core: CoreSetup,
-    { uiActions, data }: UnifiedSearchSetupDependencies
+    core: CoreSetup<UnifiedSearchStartDependencies, UnifiedSearchPublicPluginStart>,
+    { uiActions, data, usageCollection }: UnifiedSearchSetupDependencies
   ): UnifiedSearchPluginSetup {
     const { query } = data;
     uiActions.registerAction(
       createFilterAction(query.filterManager, query.timefilter.timefilter, core.theme)
     );
 
-    return {};
+    return {
+      autocomplete: this.autocomplete.setup(core, {
+        timefilter: query.timefilter,
+        usageCollection,
+      }),
+    };
   }
 
   public start(
@@ -50,6 +63,8 @@ export class UnifiedSearchPublicPlugin
     setTheme(core.theme);
     setOverlays(core.overlays);
     setIndexPatterns(dataViews);
+    const autocompleteStart = this.autocomplete.start();
+    setAutocomplete(autocompleteStart);
 
     const SearchBar = createSearchBar({
       core,
@@ -68,8 +83,11 @@ export class UnifiedSearchPublicPlugin
         IndexPatternSelect: createIndexPatternSelect(dataViews),
         SearchBar,
       },
+      autocomplete: autocompleteStart,
     };
   }
 
-  public stop() {}
+  public stop() {
+    this.autocomplete.clearProviders();
+  }
 }
diff --git a/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts b/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
index ed2d57afe348c..77853da4e5ec2 100644
--- a/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
+++ b/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
@@ -7,7 +7,7 @@
  */
 
 import { isEmpty } from 'lodash';
-import { DataViewsContract } from '../../../data_views/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export async function fetchIndexPatterns(
   indexPatternsService: DataViewsContract,
diff --git a/src/plugins/unified_search/public/query_string_input/index.tsx b/src/plugins/unified_search/public/query_string_input/index.tsx
index d0f22a2f41c52..74b3c2060b4e7 100644
--- a/src/plugins/unified_search/public/query_string_input/index.tsx
+++ b/src/plugins/unified_search/public/query_string_input/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { withKibana } from '../../../kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import type { QueryBarTopRowProps } from './query_bar_top_row';
 import type { QueryStringInputProps } from './query_string_input';
 
diff --git a/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx b/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
index 8106c9daf2817..0223fc85a3ddb 100644
--- a/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { QueryLanguageSwitcher, QueryLanguageSwitcherProps } from './language_switcher';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { coreMock } from '../../../../core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { EuiButtonEmpty, EuiIcon, EuiPopover } from '@elastic/eui';
 const startMock = coreMock.createStart();
diff --git a/src/plugins/unified_search/public/query_string_input/language_switcher.tsx b/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
index 0454d3066cd16..db42339e464c3 100644
--- a/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
+++ b/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
@@ -22,7 +22,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { useKibana } from '../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export interface QueryLanguageSwitcherProps {
   language: string;
diff --git a/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
index e417f274fa557..a5a481d9520f3 100644
--- a/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
+++ b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { ReactElement, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiText, EuiTourStep } from '@elastic/eui';
-import { IStorageWrapper } from '../../../kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const NO_DATA_POPOVER_STORAGE_KEY = 'data.noDataPopover';
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
index e8ca82782d11f..189f12765ad15 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
@@ -14,12 +14,15 @@ import { render } from '@testing-library/react';
 import { EMPTY } from 'rxjs';
 
 import QueryBarTopRow from './query_bar_top_row';
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { stubIndexPattern } from '../../../data/public/stubs';
-import { UI_SETTINGS } from '../../../data/common';
+import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { setAutocomplete } from '../services';
+import { unifiedSearchPluginMock } from '../mocks';
+
 const startMock = coreMock.createStart();
 
 const mockTimeHistory = {
@@ -112,6 +115,11 @@ describe('QueryBarTopRowTopRow', () => {
     jest.clearAllMocks();
   });
 
+  beforeEach(() => {
+    const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+    setAutocomplete(autocompleteStart.autocomplete);
+  });
+
   it('Should render query and time picker', () => {
     const { getByText, getByTestId } = render(
       wrapQueryBarTopRowInContext({
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
index c5e27e5ca3336..de1fa659aa133 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -29,12 +29,12 @@ import {
   TimeHistoryContract,
   Query,
   getQueryLog,
-} from '../../../data/public';
-import { DataView } from '../../../data_views/public';
-import type { PersistedLog } from '../../../data/public';
-import { useKibana, withKibana } from '../../../kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { PersistedLog } from '@kbn/data-plugin/public';
+import { useKibana, withKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import QueryStringInputUI from './query_string_input';
-import { UI_SETTINGS } from '../../../data/common';
 import { NoDataPopover } from './no_data_popover';
 import { shallowEqual } from '../utils';
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
index f8c80473d4f0a..97ec8575f7ff5 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern } from '../../../data/public/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
 
 export const mockPersistedLog = {
   add: jest.fn(),
@@ -21,7 +21,7 @@ export const mockFetchIndexPatterns = jest
   .fn()
   .mockReturnValue(Promise.resolve([stubIndexPattern]));
 
-jest.mock('../../../data/public/query/persisted_log', () => ({
+jest.mock('@kbn/data-plugin/public/query/persisted_log', () => ({
   PersistedLog: mockPersistedLogFactory,
 }));
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
index 4a48b3cc42420..b4eed13da7f58 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
@@ -23,10 +23,13 @@ import { EuiTextArea, EuiIcon } from '@elastic/eui';
 import { QueryLanguageSwitcher } from './language_switcher';
 import QueryStringInputUI from './query_string_input';
 
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { stubIndexPattern } from '../../../data/public/stubs';
-import { KibanaContextProvider, withKibana } from '../../../kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
+import { KibanaContextProvider, withKibana } from '@kbn/kibana-react-plugin/public';
+
+import { setAutocomplete } from '../services';
+import { unifiedSearchPluginMock } from '../mocks';
 
 jest.useFakeTimers();
 
@@ -92,6 +95,11 @@ describe('QueryStringInput', () => {
     jest.clearAllMocks();
   });
 
+  beforeEach(() => {
+    const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+    setAutocomplete(autocompleteStart.autocomplete);
+  });
+
   it('Should render the given query', async () => {
     const { getByText } = render(
       wrapQueryStringInputInContext({
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
index a9b093eb3c8bb..a9f4127809ab7 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
@@ -27,27 +27,22 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { compact, debounce, isEqual, isFunction } from 'lodash';
-import { Toast } from '../../../../core/public';
-import {
-  IDataPluginServices,
-  Query,
-  QuerySuggestion,
-  QuerySuggestionTypes,
-  getQueryLog,
-} from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { Toast } from '@kbn/core/public';
+import { IDataPluginServices, Query, getQueryLog } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { PersistedLog } from '@kbn/data-plugin/public';
+import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '@kbn/data-plugin/common';
+import { KibanaReactContextValue, toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { matchPairs } from './match_pairs';
 import { toUser } from './to_user';
 import { fromUser } from './from_user';
-import type { PersistedLog } from '../../../data/public';
-import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '../../../data/common';
-import { KibanaReactContextValue, toMountPoint } from '../../../kibana_react/public';
 import { fetchIndexPatterns } from './fetch_index_patterns';
 import { QueryLanguageSwitcher } from './language_switcher';
 import type { SuggestionsListSize } from '../typeahead/suggestions_component';
 import { SuggestionsComponent } from '../typeahead';
 import { onRaf } from '../utils';
-import { getTheme } from '../services';
+import { QuerySuggestion, QuerySuggestionTypes } from '../autocomplete';
+import { getTheme, getAutocomplete } from '../services';
 
 export interface QueryStringInputProps {
   indexPatterns: Array<DataView | string>;
@@ -201,7 +196,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
     const queryString = this.getQueryString();
 
     const recentSearchSuggestions = this.getRecentSearchSuggestions(queryString);
-    const hasQuerySuggestions = this.services.data.autocomplete.hasQuerySuggestions(language);
+    const hasQuerySuggestions = getAutocomplete().hasQuerySuggestions(language);
 
     if (
       !hasQuerySuggestions ||
@@ -222,7 +217,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
       if (this.abortController) this.abortController.abort();
       this.abortController = new AbortController();
       const suggestions =
-        (await this.services.data.autocomplete.getQuerySuggestions({
+        (await getAutocomplete().getQuerySuggestions({
           language,
           indexPatterns,
           query: queryString,
diff --git a/src/plugins/unified_search/public/saved_query_form/index.ts b/src/plugins/unified_search/public/saved_query_form/index.ts
index 1590b8fc98927..d6553e6693790 100644
--- a/src/plugins/unified_search/public/saved_query_form/index.ts
+++ b/src/plugins/unified_search/public/saved_query_form/index.ts
@@ -7,5 +7,5 @@
  */
 
 // @internal
-export type { SavedQueryMeta } from '../saved_query_form/save_query_form';
-export { SaveQueryForm } from '../saved_query_form/save_query_form';
+export type { SavedQueryMeta } from './save_query_form';
+export { SaveQueryForm } from './save_query_form';
diff --git a/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx b/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
index 5aee148bb58bc..53c5ec3310da2 100644
--- a/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
+++ b/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { sortBy, isEqual } from 'lodash';
-import { SavedQuery, SavedQueryService } from '../../../data/public';
+import { SavedQuery, SavedQueryService } from '@kbn/data-plugin/public';
 
 interface Props {
   savedQuery?: SavedQuery;
diff --git a/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx b/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
index a99c49515aee5..71fbd8aad6e48 100644
--- a/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
+++ b/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
@@ -11,7 +11,7 @@ import { EuiListGroupItem, EuiConfirmModal, EuiIconTip } from '@elastic/eui';
 import React, { Fragment, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
-import { SavedQuery } from '../../../data/public';
+import { SavedQuery } from '@kbn/data-plugin/public';
 
 interface Props {
   savedQuery: SavedQuery;
diff --git a/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx b/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
index 29d7bda08cbc5..07d3a9d799a66 100644
--- a/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
+++ b/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
@@ -24,7 +24,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect, useState, Fragment, useRef } from 'react';
 import { sortBy } from 'lodash';
-import { SavedQuery, SavedQueryService } from '../../../data/public';
+import { SavedQuery, SavedQueryService } from '@kbn/data-plugin/public';
 import { SavedQueryListItem } from './saved_query_list_item';
 
 const perPage = 50;
diff --git a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
index a3491c1540ff0..3d8aa26af22af 100644
--- a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
@@ -8,18 +8,18 @@
 
 import _ from 'lodash';
 import React, { useEffect, useRef } from 'react';
-import { CoreStart } from '../../../../core/public';
-import { IStorageWrapper } from '../../../kibana_utils/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { QueryStart, SavedQuery, DataPublicPluginStart } from '../../../data/public';
-import { Filter, Query, TimeRange } from '../../../data/common';
+import { CoreStart } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { QueryStart, SavedQuery, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Filter, Query, TimeRange } from '@kbn/data-plugin/common';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SearchBar } from '.';
 import type { SearchBarOwnProps } from '.';
 import { useFilterManager } from './lib/use_filter_manager';
 import { useTimefilter } from './lib/use_timefilter';
 import { useSavedQuery } from './lib/use_saved_query';
 import { useQueryStringManager } from './lib/use_query_string_manager';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 interface StatefulSearchBarDeps {
   core: CoreStart;
diff --git a/src/plugins/unified_search/public/search_bar/index.tsx b/src/plugins/unified_search/public/search_bar/index.tsx
index 75fa878b5426a..f8c9de7ec7d87 100644
--- a/src/plugins/unified_search/public/search_bar/index.tsx
+++ b/src/plugins/unified_search/public/search_bar/index.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { injectI18n } from '@kbn/i18n-react';
-import { withKibana } from '../../../kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import type { SearchBarProps } from './search_bar';
 
 const Fallback = () => <div />;
diff --git a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
index e43833e25dfef..d05f4e8bb9aa0 100644
--- a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { clearStateFromSavedQuery } from './clear_saved_query';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { DataPublicPluginStart } from '../../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 describe('clearStateFromSavedQuery', () => {
   let dataMock: jest.Mocked<DataPublicPluginStart>;
diff --git a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
index 685dff3853422..dfe90be4cf0d1 100644
--- a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QueryStart } from '../../../../data/public';
+import { QueryStart } from '@kbn/data-plugin/public';
 
 export const clearStateFromSavedQuery = (queryService: QueryStart) => {
   queryService.filterManager.removeAll();
diff --git a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
index c9813097839b6..67a2e4ea71c6a 100644
--- a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { populateStateFromSavedQuery } from './populate_state_from_saved_query';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { DataPublicPluginStart, SavedQuery } from '../../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { DataPublicPluginStart, SavedQuery } from '@kbn/data-plugin/public';
 import { getFilter } from '../../test_helpers/get_stub_filter';
-import { FilterStateStore } from '../../../../data/common';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 
 describe('populateStateFromSavedQuery', () => {
   let dataMock: jest.Mocked<DataPublicPluginStart>;
diff --git a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
index 20023150ff263..cf53433f32c55 100644
--- a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QueryStart, SavedQuery } from '../../../../data/public';
+import { QueryStart, SavedQuery } from '@kbn/data-plugin/public';
 
 export const populateStateFromSavedQuery = (queryService: QueryStart, savedQuery: SavedQuery) => {
   const {
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
index 871e1112761ad..511e05e043b26 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
@@ -8,7 +8,7 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, Filter } from '../../../../data/public';
+import { DataPublicPluginStart, Filter } from '@kbn/data-plugin/public';
 
 interface UseFilterManagerProps {
   filters?: Filter[];
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
index a9fc57ecbca3e..10b2c7b64e97c 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
@@ -8,8 +8,8 @@
 
 import { useState, useEffect, useMemo } from 'react';
 import { Subscription } from 'rxjs';
-import { Query } from '../../../../data/public';
-import type { QueryStringContract } from '../../../../data/public';
+import { Query } from '@kbn/data-plugin/public';
+import type { QueryStringContract } from '@kbn/data-plugin/public';
 
 interface UseQueryStringProps {
   query?: Query;
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
index bf6e46a096b55..7e8b41c73fcfd 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
@@ -9,9 +9,9 @@
 import { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { CoreStart } from 'kibana/public';
-import { SavedQuery } from '../../../../data/public';
-import { DataPublicPluginStart } from '../../../../data/public';
+import { CoreStart } from '@kbn/core/public';
+import { SavedQuery } from '@kbn/data-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { populateStateFromSavedQuery } from './populate_state_from_saved_query';
 import { clearStateFromSavedQuery } from './clear_saved_query';
 
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts b/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
index e8396bff7d27e..66d69f414c55c 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
@@ -8,7 +8,7 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, TimeRange, RefreshInterval } from '../../../../data/public';
+import { DataPublicPluginStart, TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
 
 interface UseTimefilterProps {
   dateRangeFrom?: string;
diff --git a/src/plugins/unified_search/public/search_bar/search_bar.test.tsx b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
index 727947dab984b..14310b69809e0 100644
--- a/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
@@ -9,14 +9,14 @@
 import React from 'react';
 import SearchBar from './search_bar';
 
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
-import { IIndexPattern } from '../../../data/public';
+import { IIndexPattern } from '@kbn/data-plugin/public';
 
 const mockTimeHistory = {
   get: () => {
diff --git a/src/plugins/unified_search/public/search_bar/search_bar.tsx b/src/plugins/unified_search/public/search_bar/search_bar.tsx
index 4a212db08998e..c829ab66bb60a 100644
--- a/src/plugins/unified_search/public/search_bar/search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.tsx
@@ -16,15 +16,15 @@ import memoizeOne from 'memoize-one';
 
 import { METRIC_TYPE } from '@kbn/analytics';
 import { Query, Filter } from '@kbn/es-query';
-import { withKibana, KibanaReactContextValue } from '../../../kibana_react/public';
+import { withKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
 
-import QueryBarTopRow from '../query_string_input/query_bar_top_row';
-import type { TimeHistoryContract, SavedQuery } from '../../../data/public';
-import type { SavedQueryAttributes } from '../../../data/common';
-import { IDataPluginServices } from '../../../data/public';
+import type { TimeHistoryContract, SavedQuery } from '@kbn/data-plugin/public';
+import type { SavedQueryAttributes } from '@kbn/data-plugin/common';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterBar } from '../filter_bar';
-import { TimeRange } from '../../../data/common';
-import { DataView } from '../../../data_views/public';
+import QueryBarTopRow from '../query_string_input/query_bar_top_row';
 import { SavedQueryMeta, SaveQueryForm } from '../saved_query_form';
 import { SavedQueryManagementComponent } from '../saved_query_management';
 
diff --git a/src/plugins/unified_search/public/services.ts b/src/plugins/unified_search/public/services.ts
index eb2008a107b31..f67801dd37730 100644
--- a/src/plugins/unified_search/public/services.ts
+++ b/src/plugins/unified_search/public/services.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceStart, OverlayStart } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
-import { DataViewsContract } from '../../data_views/public';
+import { ThemeServiceStart, OverlayStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { AutocompleteStart } from '.';
 
 export const [getIndexPatterns, setIndexPatterns] =
   createGetterSetter<DataViewsContract>('IndexPatterns');
@@ -16,3 +17,6 @@ export const [getIndexPatterns, setIndexPatterns] =
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceStart>('Theme');
 
 export const [getOverlays, setOverlays] = createGetterSetter<OverlayStart>('Overlays');
+
+export const [getAutocomplete, setAutocomplete] =
+  createGetterSetter<AutocompleteStart>('Autocomplete');
diff --git a/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
index 037c89774b6c2..2954526d7ede8 100644
--- a/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
+++ b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Filter, FilterStateStore } from '../../../data/public';
+import { Filter, FilterStateStore } from '@kbn/data-plugin/public';
 
 export function getFilter(
   store: FilterStateStore,
diff --git a/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
index 39d140a10229f..31c38ad94815a 100644
--- a/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
@@ -8,7 +8,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '../autocomplete';
 import { SuggestionComponent } from './suggestion_component';
 
 const noop = () => {
diff --git a/src/plugins/unified_search/public/typeahead/suggestion_component.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
index dc5b94800f97b..b8b3f2640c31a 100644
--- a/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
@@ -9,7 +9,7 @@
 import { EuiIcon } from '@elastic/eui';
 import classNames from 'classnames';
 import React, { useCallback } from 'react';
-import { QuerySuggestion } from '../../../data/public';
+import { QuerySuggestion } from '../autocomplete';
 import { SuggestionOnClick, SuggestionOnMouseEnter } from './types';
 
 function getEuiIconType(type: string) {
diff --git a/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
index 947b1a0be4d1f..6a21041f69530 100644
--- a/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
@@ -8,7 +8,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '../autocomplete';
 import { SuggestionComponent } from './suggestion_component';
 import SuggestionsComponent from './suggestions_component';
 
diff --git a/src/plugins/unified_search/public/typeahead/suggestions_component.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
index 9446653df2ee7..75e446cf2d6e8 100644
--- a/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
@@ -13,7 +13,7 @@ import classNames from 'classnames';
 import styled from 'styled-components';
 
 import useRafState from 'react-use/lib/useRafState';
-import { QuerySuggestion } from '../../../data/public';
+import { QuerySuggestion } from '../autocomplete';
 import { SuggestionComponent } from './suggestion_component';
 import {
   SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE,
diff --git a/src/plugins/unified_search/public/typeahead/types.ts b/src/plugins/unified_search/public/typeahead/types.ts
index 25d4909800044..1a58c29d028e1 100644
--- a/src/plugins/unified_search/public/typeahead/types.ts
+++ b/src/plugins/unified_search/public/typeahead/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QuerySuggestion } from '../../../data/public';
+import { QuerySuggestion } from '../autocomplete';
 
 export type SuggestionOnClick = (suggestion: QuerySuggestion, index: number) => void;
 
diff --git a/src/plugins/unified_search/public/types.ts b/src/plugins/unified_search/public/types.ts
index b5de235e7a563..29cf59f41a871 100755
--- a/src/plugins/unified_search/public/types.ts
+++ b/src/plugins/unified_search/public/types.ts
@@ -5,19 +5,24 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataViewsPublicPluginStart } from '../../data_views/public';
-import type { FieldFormatsStart } from '../../field_formats/public';
-import { IndexPatternSelectProps, StatefulSearchBarProps } from './index';
-import type { DataPublicPluginStart } from '../../data/public';
-import type { UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
+
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
+import type { IndexPatternSelectProps, StatefulSearchBarProps } from '.';
 
 export interface UnifiedSearchSetupDependencies {
   uiActions: UiActionsSetup;
   data: DataPublicPluginStart;
+  usageCollection?: UsageCollectionSetup;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface UnifiedSearchPluginSetup {}
+export interface UnifiedSearchPluginSetup {
+  autocomplete: AutocompleteSetup;
+}
 
 export interface UnifiedSearchStartDependencies {
   dataViews: DataViewsPublicPluginStart;
@@ -38,6 +43,11 @@ export interface UnifiedSearchPublicPluginStartUi {
  * Unified search plugin public Start contract
  */
 export interface UnifiedSearchPublicPluginStart {
+  /**
+   * autocomplete service
+   * {@link AutocompleteStart}
+   */
+  autocomplete: AutocompleteStart;
   /**
    * prewired UI components
    * {@link DataPublicPluginStartUi}
diff --git a/src/plugins/data/server/autocomplete/autocomplete_service.ts b/src/plugins/unified_search/server/autocomplete/autocomplete_service.ts
similarity index 95%
rename from src/plugins/data/server/autocomplete/autocomplete_service.ts
rename to src/plugins/unified_search/server/autocomplete/autocomplete_service.ts
index 071acc13c8117..8ab86f8a05d90 100644
--- a/src/plugins/data/server/autocomplete/autocomplete_service.ts
+++ b/src/plugins/unified_search/server/autocomplete/autocomplete_service.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { registerRoutes } from './routes';
 import { ConfigSchema } from '../../config';
 
diff --git a/src/plugins/data/server/autocomplete/index.ts b/src/plugins/unified_search/server/autocomplete/index.ts
similarity index 100%
rename from src/plugins/data/server/autocomplete/index.ts
rename to src/plugins/unified_search/server/autocomplete/index.ts
diff --git a/src/plugins/data/server/autocomplete/routes.ts b/src/plugins/unified_search/server/autocomplete/routes.ts
similarity index 93%
rename from src/plugins/data/server/autocomplete/routes.ts
rename to src/plugins/unified_search/server/autocomplete/routes.ts
index bdefd4df87b59..4b4321fdf9b8a 100644
--- a/src/plugins/data/server/autocomplete/routes.ts
+++ b/src/plugins/unified_search/server/autocomplete/routes.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { registerValueSuggestionsRoute } from './value_suggestions_route';
 import { ConfigSchema } from '../../config';
 
diff --git a/src/plugins/data/server/autocomplete/terms_agg.test.ts b/src/plugins/unified_search/server/autocomplete/terms_agg.test.ts
similarity index 98%
rename from src/plugins/data/server/autocomplete/terms_agg.test.ts
rename to src/plugins/unified_search/server/autocomplete/terms_agg.test.ts
index f9d45475d9e2f..f27fa9d594f97 100644
--- a/src/plugins/data/server/autocomplete/terms_agg.test.ts
+++ b/src/plugins/unified_search/server/autocomplete/terms_agg.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../core/server/mocks';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { ConfigSchema } from '../../config';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { termsAggSuggestions } from './terms_agg';
diff --git a/src/plugins/data/server/autocomplete/terms_agg.ts b/src/plugins/unified_search/server/autocomplete/terms_agg.ts
similarity index 97%
rename from src/plugins/data/server/autocomplete/terms_agg.ts
rename to src/plugins/unified_search/server/autocomplete/terms_agg.ts
index 742812adafbb9..ffdaca8caad4b 100644
--- a/src/plugins/data/server/autocomplete/terms_agg.ts
+++ b/src/plugins/unified_search/server/autocomplete/terms_agg.ts
@@ -7,10 +7,10 @@
  */
 
 import { get, map } from 'lodash';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IFieldType, getFieldSubtypeNested } from '@kbn/data-plugin/common';
 import { ConfigSchema } from '../../config';
-import { IFieldType, getFieldSubtypeNested } from '../../common';
 import { findIndexPatternById, getFieldByName } from '../data_views';
 
 export async function termsAggSuggestions(
diff --git a/src/plugins/data/server/autocomplete/terms_enum.test.ts b/src/plugins/unified_search/server/autocomplete/terms_enum.test.ts
similarity index 95%
rename from src/plugins/data/server/autocomplete/terms_enum.test.ts
rename to src/plugins/unified_search/server/autocomplete/terms_enum.test.ts
index ce2741f612ba8..bc2a4e010a765 100644
--- a/src/plugins/data/server/autocomplete/terms_enum.test.ts
+++ b/src/plugins/unified_search/server/autocomplete/terms_enum.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { termsEnumSuggestions } from './terms_enum';
-import { coreMock } from '../../../../core/server/mocks';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { ConfigSchema } from '../../config';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { TermsEnumResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
@@ -39,7 +39,7 @@ describe('_terms_enum suggestions', () => {
       'fieldName',
       'query',
       [],
-      { name: 'field_name', type: 'string' }
+      { name: 'field_name', type: 'string', searchable: true, aggregatable: true }
     );
 
     const [[args]] = esClientMock.termsEnum.mock.calls;
diff --git a/src/plugins/data/server/autocomplete/terms_enum.ts b/src/plugins/unified_search/server/autocomplete/terms_enum.ts
similarity index 95%
rename from src/plugins/data/server/autocomplete/terms_enum.ts
rename to src/plugins/unified_search/server/autocomplete/terms_enum.ts
index e4dca0a739087..924b5b3a1671e 100644
--- a/src/plugins/data/server/autocomplete/terms_enum.ts
+++ b/src/plugins/unified_search/server/autocomplete/terms_enum.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IFieldType } from '../../common';
+import { IFieldType } from '@kbn/data-plugin/common';
 import { findIndexPatternById, getFieldByName } from '../data_views';
 import { ConfigSchema } from '../../config';
 
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/unified_search/server/autocomplete/value_suggestions_route.ts
similarity index 86%
rename from src/plugins/data/server/autocomplete/value_suggestions_route.ts
rename to src/plugins/unified_search/server/autocomplete/value_suggestions_route.ts
index 302abae2bdc84..74a7e5202a541 100644
--- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts
+++ b/src/plugins/unified_search/server/autocomplete/value_suggestions_route.ts
@@ -7,10 +7,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { firstValueFrom, Observable } from 'rxjs';
-import { getRequestAbortedSignal } from '../lib';
-import { getKbnServerError, reportServerError } from '../../../kibana_utils/server';
+import { getRequestAbortedSignal } from '@kbn/data-plugin/server';
+import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ConfigSchema } from '../../config';
 import { termsEnumSuggestions } from './terms_enum';
 import { termsAggSuggestions } from './terms_agg';
@@ -45,13 +45,14 @@ export function registerValueSuggestionsRoute(router: IRouter, config$: Observab
       const { field: fieldName, query, filters, fieldMeta, method } = request.body;
       const { index } = request.params;
       const abortSignal = getRequestAbortedSignal(request.events.aborted$);
+      const { savedObjects, elasticsearch } = await context.core;
 
       try {
         const fn = method === 'terms_agg' ? termsAggSuggestions : termsEnumSuggestions;
         const body = await fn(
           config,
-          context.core.savedObjects.client,
-          context.core.elasticsearch.client.asCurrentUser,
+          savedObjects.client,
+          elasticsearch.client.asCurrentUser,
           index,
           fieldName,
           query,
diff --git a/src/plugins/unified_search/server/config_deprecations.test.ts b/src/plugins/unified_search/server/config_deprecations.test.ts
new file mode 100644
index 0000000000000..8c65acfae6291
--- /dev/null
+++ b/src/plugins/unified_search/server/config_deprecations.test.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { cloneDeep } from 'lodash';
+
+import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
+
+import { autocompleteConfigDeprecationProvider } from './config_deprecations';
+
+const deprecationContext = configDeprecationsMock.createContext();
+
+const applyConfigDeprecations = (settings: Record<string, any> = {}) => {
+  const deprecations = autocompleteConfigDeprecationProvider(configDeprecationFactory);
+  const deprecationMessages: string[] = [];
+  const migrated = applyDeprecations(
+    settings,
+    deprecations.map((deprecation) => ({
+      deprecation,
+      path: '',
+      context: deprecationContext,
+    })),
+    () =>
+      ({ message }) =>
+        deprecationMessages.push(message)
+  );
+  return {
+    messages: deprecationMessages,
+    migrated: migrated.config,
+  };
+};
+
+describe('Config Deprecations', () => {
+  it('does not report deprecations for default configurationc', () => {
+    const configFirstStep = { data: { autocomplete: { valueSuggestions: {} } } };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(configFirstStep));
+    expect(migrated).toEqual(configFirstStep);
+    expect(messages).toHaveLength(0);
+  });
+
+  it('renames kibana.autocompleteTerminateAfter to unifiedSearch.autocomplete.valueSuggestions.terminateAfter', () => {
+    const config = {
+      kibana: {
+        autocompleteTerminateAfter: 123,
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.kibana?.autocompleteTerminateAfter).not.toBeDefined();
+    expect(migrated.unifiedSearch.autocomplete.valueSuggestions.terminateAfter).toEqual(123);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "Setting \\"kibana.autocompleteTerminateAfter\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.terminateAfter\\"",
+      ]
+    `);
+  });
+
+  it('renames kibana.autocompleteTimeout to unifiedSearch.autocomplete.valueSuggestions.timeout', () => {
+    const config = {
+      kibana: {
+        autocompleteTimeout: 123,
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.kibana?.autocompleteTimeout).not.toBeDefined();
+    expect(migrated.unifiedSearch.autocomplete.valueSuggestions.timeout).toEqual(123);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "Setting \\"kibana.autocompleteTimeout\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.timeout\\"",
+      ]
+    `);
+  });
+
+  it('renames data.autocomplete.querySuggestions.enabled to unifiedSearch.autocomplete.querySuggestions.enabled', () => {
+    const config = {
+      data: {
+        autocomplete: {
+          querySuggestions: {
+            enabled: false,
+          },
+        },
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.data?.autocomplete.querySuggestions.enabled).not.toBeDefined();
+    expect(migrated.unifiedSearch.autocomplete.querySuggestions.enabled).toEqual(false);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "Setting \\"data.autocomplete.querySuggestions.enabled\\" has been replaced by \\"unifiedSearch.autocomplete.querySuggestions.enabled\\"",
+      ]
+    `);
+  });
+
+  it('renames data.autocomplete.valueSuggestions.enabled to unifiedSearch.autocomplete.valueSuggestions.enabled', () => {
+    const config = {
+      data: {
+        autocomplete: {
+          valueSuggestions: {
+            enabled: false,
+          },
+        },
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.data?.autocomplete.valueSuggestions.enabled).not.toBeDefined();
+    expect(migrated.unifiedSearch.autocomplete.valueSuggestions.enabled).toEqual(false);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "Setting \\"data.autocomplete.valueSuggestions.enabled\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.enabled\\"",
+      ]
+    `);
+  });
+
+  it('renames data.autocomplete.valueSuggestions.tiers to unifiedSearch.autocomplete.valueSuggestions.tiers', () => {
+    const config = {
+      data: {
+        autocomplete: {
+          valueSuggestions: {
+            tiers: [],
+          },
+        },
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.data?.autocomplete.valueSuggestions.tiers).not.toBeDefined();
+    expect(migrated.unifiedSearch.autocomplete.valueSuggestions.tiers).toEqual([]);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "Setting \\"data.autocomplete.valueSuggestions.tiers\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.tiers\\"",
+      ]
+    `);
+  });
+});
diff --git a/src/plugins/unified_search/server/config_deprecations.ts b/src/plugins/unified_search/server/config_deprecations.ts
new file mode 100644
index 0000000000000..de083caffad09
--- /dev/null
+++ b/src/plugins/unified_search/server/config_deprecations.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ConfigDeprecationProvider } from '@kbn/core/server';
+
+export const autocompleteConfigDeprecationProvider: ConfigDeprecationProvider = ({
+  renameFromRoot,
+}) => [
+  renameFromRoot(
+    'data.autocomplete.valueSuggestions.terminateAfter',
+    'unifiedSearch.autocomplete.valueSuggestions.terminateAfter',
+    { level: 'warning' }
+  ),
+  renameFromRoot(
+    'kibana.autocompleteTerminateAfter',
+    'unifiedSearch.autocomplete.valueSuggestions.terminateAfter',
+    { level: 'warning' }
+  ),
+  renameFromRoot(
+    'data.autocomplete.valueSuggestions.timeout',
+    'unifiedSearch.autocomplete.valueSuggestions.timeout',
+    {
+      level: 'warning',
+    }
+  ),
+  renameFromRoot(
+    'kibana.autocompleteTimeout',
+    'unifiedSearch.autocomplete.valueSuggestions.timeout',
+    {
+      level: 'warning',
+    }
+  ),
+  renameFromRoot(
+    'data.autocomplete.querySuggestions.enabled',
+    'unifiedSearch.autocomplete.querySuggestions.enabled',
+    {
+      level: 'warning',
+    }
+  ),
+  renameFromRoot(
+    'data.autocomplete.valueSuggestions.enabled',
+    'unifiedSearch.autocomplete.valueSuggestions.enabled',
+    {
+      level: 'warning',
+    }
+  ),
+  renameFromRoot(
+    'data.autocomplete.valueSuggestions.tiers',
+    'unifiedSearch.autocomplete.valueSuggestions.tiers',
+    {
+      level: 'warning',
+    }
+  ),
+];
diff --git a/src/plugins/unified_search/server/data_views/index.ts b/src/plugins/unified_search/server/data_views/index.ts
new file mode 100644
index 0000000000000..dfe03378f0278
--- /dev/null
+++ b/src/plugins/unified_search/server/data_views/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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from '@kbn/data-views-plugin/server';
diff --git a/src/plugins/unified_search/server/index.ts b/src/plugins/unified_search/server/index.ts
new file mode 100644
index 0000000000000..d1948f32e2fe9
--- /dev/null
+++ b/src/plugins/unified_search/server/index.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
+import { ConfigSchema, configSchema } from '../config';
+import {
+  UnifiedSearchServerPlugin,
+  UnifiedSearchServerPluginSetup,
+  UnifiedSearchServerPluginStart,
+} from './plugin';
+
+import { autocompleteConfigDeprecationProvider } from './config_deprecations';
+
+/**
+ * Static code to be shared externally
+ * @public
+ */
+
+export function plugin(initializerContext: PluginInitializerContext<ConfigSchema>) {
+  return new UnifiedSearchServerPlugin(initializerContext);
+}
+
+export type {
+  UnifiedSearchServerPluginSetup as PluginSetup,
+  UnifiedSearchServerPluginStart as PluginStart,
+};
+export { UnifiedSearchServerPlugin as Plugin };
+
+export const config: PluginConfigDescriptor<ConfigSchema> = {
+  deprecations: autocompleteConfigDeprecationProvider,
+  exposeToBrowser: {
+    autocomplete: true,
+  },
+  schema: configSchema,
+};
diff --git a/src/plugins/unified_search/server/mocks.ts b/src/plugins/unified_search/server/mocks.ts
new file mode 100644
index 0000000000000..7f63abcdaae0c
--- /dev/null
+++ b/src/plugins/unified_search/server/mocks.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { AutocompleteSetup } from './autocomplete';
+
+const autocompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
+  getAutocompleteSettings: jest.fn(),
+};
+
+function createSetupContract() {
+  return {
+    autocomplete: autocompleteSetupMock,
+  };
+}
+
+export const dataPluginMock = {
+  createSetupContract,
+};
diff --git a/src/plugins/unified_search/server/plugin.ts b/src/plugins/unified_search/server/plugin.ts
new file mode 100644
index 0000000000000..6328eeba2f416
--- /dev/null
+++ b/src/plugins/unified_search/server/plugin.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { ConfigSchema } from '../config';
+import { AutocompleteService } from './autocomplete';
+import { AutocompleteSetup } from './autocomplete/autocomplete_service';
+
+export interface UnifiedSearchServerPluginSetup {
+  autocomplete: AutocompleteSetup;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchServerPluginStart {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchServerPluginSetupDependencies {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchServerPluginStartDependencies {}
+
+export class UnifiedSearchServerPlugin implements Plugin<UnifiedSearchServerPluginSetup> {
+  private readonly autocompleteService: AutocompleteService;
+
+  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
+    this.autocompleteService = new AutocompleteService(initializerContext);
+  }
+
+  public setup(
+    core: CoreSetup<UnifiedSearchServerPluginStartDependencies, UnifiedSearchServerPluginStart>,
+    {}: UnifiedSearchServerPluginSetupDependencies
+  ) {
+    return {
+      autocomplete: this.autocompleteService.setup(core),
+    };
+  }
+
+  public start(core: CoreStart, {}: UnifiedSearchServerPluginStartDependencies) {
+    return {};
+  }
+
+  public stop() {}
+}
+
+export { UnifiedSearchServerPlugin as Plugin };
diff --git a/src/plugins/unified_search/tsconfig.json b/src/plugins/unified_search/tsconfig.json
index 3ff1ba630ac27..41dc76f1305be 100644
--- a/src/plugins/unified_search/tsconfig.json
+++ b/src/plugins/unified_search/tsconfig.json
@@ -9,7 +9,9 @@
   "include": [
     "public/**/*",
     "config.ts",
-    "public/**/*.json"
+    "public/**/*.json",
+    "server/**/*",
+    "config.ts",
   ],
   "references": [
     { "path": "../../core/tsconfig.json" },
diff --git a/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts b/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts
index c45bde0d67891..56a3224a20495 100644
--- a/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts
+++ b/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { Location } from 'history';
-import type { AppMountParameters, CoreSetup, ScopedHistory } from 'kibana/public';
-import { coreMock } from '../../../../core/public/mocks';
+import type { AppMountParameters, CoreSetup, ScopedHistory } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { UrlForwardingStart } from '../plugin';
 import { createLegacyUrlForwardApp } from './forward_app';
 
diff --git a/src/plugins/url_forwarding/public/forward_app/forward_app.ts b/src/plugins/url_forwarding/public/forward_app/forward_app.ts
index 3a66e207f8c26..5b4d62334ffcf 100644
--- a/src/plugins/url_forwarding/public/forward_app/forward_app.ts
+++ b/src/plugins/url_forwarding/public/forward_app/forward_app.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { App, AppMountParameters, CoreSetup } from 'kibana/public';
-import { AppNavLinkStatus } from '../../../../core/public';
+import { App, AppMountParameters, CoreSetup } from '@kbn/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { navigateToLegacyKibanaUrl } from './navigate_to_legacy_kibana_url';
 import { ForwardDefinition, UrlForwardingStart } from '../plugin';
 
diff --git a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts
index dda9b16238b2c..7b06fd4f67e2c 100644
--- a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts
+++ b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ForwardDefinition } from '../index';
+import { ForwardDefinition } from '..';
 import { navigateToLegacyKibanaUrl } from './navigate_to_legacy_kibana_url';
-import { CoreStart } from '../../../../core/public';
-import { coreMock } from '../../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('migrate legacy kibana urls', () => {
   let forwardDefinitions: ForwardDefinition[];
diff --git a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts
index aa1e05e005404..b14b423e46014 100644
--- a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts
+++ b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart, IBasePath } from 'kibana/public';
-import { ForwardDefinition } from '../index';
+import { ApplicationStart, IBasePath } from '@kbn/core/public';
+import { ForwardDefinition } from '..';
 import { normalizePath } from './normalize_path';
 
 export const navigateToLegacyKibanaUrl = (
diff --git a/src/plugins/url_forwarding/public/plugin.ts b/src/plugins/url_forwarding/public/plugin.ts
index ee56ba73eb24e..e9518668f7749 100644
--- a/src/plugins/url_forwarding/public/plugin.ts
+++ b/src/plugins/url_forwarding/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, CoreSetup } from 'kibana/public';
+import { CoreStart, CoreSetup } from '@kbn/core/public';
 import { createLegacyUrlForwardApp } from './forward_app';
 import { navigateToLegacyKibanaUrl } from './forward_app/navigate_to_legacy_kibana_url';
 
diff --git a/src/plugins/usage_collection/public/index.ts b/src/plugins/usage_collection/public/index.ts
index d5ac73b7758f5..bc5d418f48233 100644
--- a/src/plugins/usage_collection/public/index.ts
+++ b/src/plugins/usage_collection/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import { UsageCollectionPlugin } from './plugin';
 
 export type { UsageCollectionSetup, UsageCollectionStart } from './plugin';
diff --git a/src/plugins/usage_collection/public/plugin.tsx b/src/plugins/usage_collection/public/plugin.tsx
index 450c8903e1a5e..cbd637c237656 100644
--- a/src/plugins/usage_collection/public/plugin.tsx
+++ b/src/plugins/usage_collection/public/plugin.tsx
@@ -16,8 +16,8 @@ import type {
   CoreSetup,
   CoreStart,
   HttpSetup,
-} from 'src/core/public';
-import { Storage } from '../../kibana_utils/public';
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { createReporter, trackApplicationUsageChange } from './services';
 import { ApplicationUsageContext } from './components/track_application_view';
 
diff --git a/src/plugins/usage_collection/public/services/create_reporter.ts b/src/plugins/usage_collection/public/services/create_reporter.ts
index fb187d1c0c486..95d5fff9cc943 100644
--- a/src/plugins/usage_collection/public/services/create_reporter.ts
+++ b/src/plugins/usage_collection/public/services/create_reporter.ts
@@ -7,7 +7,7 @@
  */
 
 import { Reporter, Storage } from '@kbn/analytics';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 interface AnalyicsReporterConfig {
   localStorage: Storage;
diff --git a/src/plugins/usage_collection/server/collector/collector.test.ts b/src/plugins/usage_collection/server/collector/collector.test.ts
index 8c7971e52a4b9..e75a88d5adeea 100644
--- a/src/plugins/usage_collection/server/collector/collector.test.ts
+++ b/src/plugins/usage_collection/server/collector/collector.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock } from '../../../../core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Collector } from './collector';
 
 const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts
index 1ff04cf3650c0..4bec62f983595 100644
--- a/src/plugins/usage_collection/server/collector/collector.ts
+++ b/src/plugins/usage_collection/server/collector/collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { CollectorFetchMethod, CollectorOptions, ICollector } from './types';
 
 export class Collector<TFetchReturn, ExtraOptions extends object = {}>
diff --git a/src/plugins/usage_collection/server/collector/collector_set.test.ts b/src/plugins/usage_collection/server/collector/collector_set.test.ts
index 87e841f3de4c5..a3e8d2de19e60 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.test.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.test.ts
@@ -16,8 +16,8 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   executionContextServiceMock,
-} from '../../../../core/server/mocks';
-import type { ExecutionContextSetup, Logger } from 'src/core/server';
+} from '@kbn/core/server/mocks';
+import type { ExecutionContextSetup, Logger } from '@kbn/core/server';
 
 describe('CollectorSet', () => {
   let logger: jest.Mocked<Logger>;
diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts
index 3a7c0a66ac60d..90cf7e6450ea4 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.ts
@@ -13,7 +13,7 @@ import type {
   SavedObjectsClientContract,
   KibanaExecutionContext,
   ExecutionContextSetup,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { Collector } from './collector';
 import type { ICollector, CollectorOptions } from './types';
 import { UsageCollector, UsageCollectorOptions } from './usage_collector';
diff --git a/src/plugins/usage_collection/server/collector/types.ts b/src/plugins/usage_collection/server/collector/types.ts
index 141faf0ef2f6b..98271ef804952 100644
--- a/src/plugins/usage_collection/server/collector/types.ts
+++ b/src/plugins/usage_collection/server/collector/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
 
-import type { PossibleSchemaTypes } from '@elastic/analytics';
+import type { PossibleSchemaTypes } from '@kbn/analytics-client';
 
 export type {
   AllowedSchemaTypes,
@@ -16,7 +16,7 @@ export type {
   AllowedSchemaBooleanTypes,
   AllowedSchemaNumberTypes,
   PossibleSchemaTypes,
-} from '@elastic/analytics';
+} from '@kbn/analytics-client';
 
 /**
  * Helper to find out whether to keep recursively looking or if we are on an end value
diff --git a/src/plugins/usage_collection/server/collector/usage_collector.ts b/src/plugins/usage_collection/server/collector/usage_collector.ts
index 2ed8c2a50dbaf..9a368798fcd82 100644
--- a/src/plugins/usage_collection/server/collector/usage_collector.ts
+++ b/src/plugins/usage_collection/server/collector/usage_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { CollectorOptions } from './types';
 import { Collector } from './collector';
 
diff --git a/src/plugins/usage_collection/server/config.ts b/src/plugins/usage_collection/server/config.ts
index f09dc7d431b33..bc183e31c0089 100644
--- a/src/plugins/usage_collection/server/config.ts
+++ b/src/plugins/usage_collection/server/config.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { DEFAULT_MAXIMUM_WAIT_TIME_FOR_ALL_COLLECTORS_IN_S } from '../common/constants';
 
 export const configSchema = schema.object({
diff --git a/src/plugins/usage_collection/server/index.ts b/src/plugins/usage_collection/server/index.ts
index 907a61a752052..7e66b1bd323b0 100644
--- a/src/plugins/usage_collection/server/index.ts
+++ b/src/plugins/usage_collection/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { UsageCollectionPlugin } from './plugin';
 
 export type {
diff --git a/src/plugins/usage_collection/server/mocks.ts b/src/plugins/usage_collection/server/mocks.ts
index ac7ad69ed4bce..bc59cf3cbef22 100644
--- a/src/plugins/usage_collection/server/mocks.ts
+++ b/src/plugins/usage_collection/server/mocks.ts
@@ -11,11 +11,11 @@ import {
   executionContextServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { CollectorOptions, CollectorSet } from './collector';
 import { Collector } from './collector/collector';
-import { UsageCollectionSetup, CollectorFetchContext } from './index';
+import { UsageCollectionSetup, CollectorFetchContext } from '.';
 import { usageCountersServiceMock } from './usage_counters/usage_counters_service.mock';
 export type { CollectorOptions };
 export { Collector };
diff --git a/src/plugins/usage_collection/server/plugin.ts b/src/plugins/usage_collection/server/plugin.ts
index 7cde8bad706dd..c8c44679cfa23 100644
--- a/src/plugins/usage_collection/server/plugin.ts
+++ b/src/plugins/usage_collection/server/plugin.ts
@@ -15,7 +15,7 @@ import type {
   Plugin,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { ConfigType } from './config';
 import { CollectorSet } from './collector';
 import type { Collector, CollectorOptions, UsageCollectorOptions } from './collector';
diff --git a/src/plugins/usage_collection/server/report/store_application_usage.test.ts b/src/plugins/usage_collection/server/report/store_application_usage.test.ts
index c4c9e5746e6cb..97028f3cc92f2 100644
--- a/src/plugins/usage_collection/server/report/store_application_usage.test.ts
+++ b/src/plugins/usage_collection/server/report/store_application_usage.test.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getDailyId } from '../../common/application_usage';
 import { storeApplicationUsage } from './store_application_usage';
 import { ApplicationUsageReport } from './schema';
diff --git a/src/plugins/usage_collection/server/report/store_application_usage.ts b/src/plugins/usage_collection/server/report/store_application_usage.ts
index 2058b054fda8c..5add00a2704e3 100644
--- a/src/plugins/usage_collection/server/report/store_application_usage.ts
+++ b/src/plugins/usage_collection/server/report/store_application_usage.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { Writable } from '@kbn/utility-types';
-import { ISavedObjectsRepository } from 'src/core/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { ApplicationUsageReport } from './schema';
 import { getDailyId } from '../../common/application_usage';
 
diff --git a/src/plugins/usage_collection/server/report/store_report.test.ts b/src/plugins/usage_collection/server/report/store_report.test.ts
index 789e01020bb2e..b80c0eb6ab9ef 100644
--- a/src/plugins/usage_collection/server/report/store_report.test.ts
+++ b/src/plugins/usage_collection/server/report/store_report.test.ts
@@ -8,7 +8,7 @@
 
 import { storeApplicationUsageMock } from './store_report.test.mocks';
 
-import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { storeReport } from './store_report';
 import { ReportSchemaType } from './schema';
 import { METRIC_TYPE } from '@kbn/analytics';
diff --git a/src/plugins/usage_collection/server/report/store_report.ts b/src/plugins/usage_collection/server/report/store_report.ts
index 1647fb8893be1..234bab7d7202c 100644
--- a/src/plugins/usage_collection/server/report/store_report.ts
+++ b/src/plugins/usage_collection/server/report/store_report.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository } from 'src/core/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import moment from 'moment';
 import { chain, sumBy } from 'lodash';
 import { ReportSchemaType } from './schema';
diff --git a/src/plugins/usage_collection/server/routes/index.ts b/src/plugins/usage_collection/server/routes/index.ts
index 20949224c0f6d..b96414707f78b 100644
--- a/src/plugins/usage_collection/server/routes/index.ts
+++ b/src/plugins/usage_collection/server/routes/index.ts
@@ -11,7 +11,7 @@ import {
   ISavedObjectsRepository,
   MetricsServiceSetup,
   ServiceStatus,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { Observable } from 'rxjs';
 import { CollectorSet } from '../collector';
 import { registerUiCountersRoute } from './ui_counters';
diff --git a/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts b/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts
index 181535552a7f6..4412eeb78c428 100644
--- a/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts
+++ b/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts
@@ -8,18 +8,14 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import {
-  MetricsServiceSetup,
-  ServiceStatus,
-  ServiceStatusLevels,
-} from '../../../../../core/server';
+import { MetricsServiceSetup, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import {
   contextServiceMock,
   loggingSystemMock,
   metricsServiceMock,
   executionContextServiceMock,
-} from '../../../../../core/server/mocks';
-import { createHttpServer } from '../../../../../core/server/test_utils';
+} from '@kbn/core/server/mocks';
+import { createHttpServer } from '@kbn/core/server/test_utils';
 import { registerStatsRoute } from '../stats';
 import supertest from 'supertest';
 import { CollectorSet } from '../../collector';
diff --git a/src/plugins/usage_collection/server/routes/stats/stats.ts b/src/plugins/usage_collection/server/routes/stats/stats.ts
index f987d83a5bb5f..d9c27afb5fb2a 100644
--- a/src/plugins/usage_collection/server/routes/stats/stats.ts
+++ b/src/plugins/usage_collection/server/routes/stats/stats.ts
@@ -18,7 +18,7 @@ import {
   SavedObjectsClientContract,
   ServiceStatus,
   ServiceStatusLevels,
-} from '../../../../../core/server';
+} from '@kbn/core/server';
 import { CollectorSet } from '../../collector';
 const SNAPSHOT_REGEX = /-snapshot/i;
 
@@ -89,8 +89,9 @@ export function registerStatsRoute({
 
       let extended;
       if (isExtended) {
-        const { asCurrentUser } = context.core.elasticsearch.client;
-        const savedObjectsClient = context.core.savedObjects.client;
+        const core = await context.core;
+        const { asCurrentUser } = core.elasticsearch.client;
+        const savedObjectsClient = core.savedObjects.client;
 
         const [usage, clusterUuid] = await Promise.all([
           shouldGetUsage
diff --git a/src/plugins/usage_collection/server/routes/ui_counters.ts b/src/plugins/usage_collection/server/routes/ui_counters.ts
index c03541b1032b6..f4d7385195012 100644
--- a/src/plugins/usage_collection/server/routes/ui_counters.ts
+++ b/src/plugins/usage_collection/server/routes/ui_counters.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, ISavedObjectsRepository } from 'src/core/server';
+import { IRouter, ISavedObjectsRepository } from '@kbn/core/server';
 import { storeReport, reportSchema } from '../report';
 import { UsageCounter } from '../usage_counters';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
index f857d449312e6..cb3c5e7683b16 100644
--- a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { serializeCounterKey, storeCounter } from './saved_objects';
-import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { CounterMetric } from './usage_counter';
 import moment from 'moment';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
index 34de2adac8086..2752696f24711 100644
--- a/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
+++ b/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
@@ -11,7 +11,7 @@ import type {
   SavedObjectsRepository,
   SavedObjectAttributes,
   SavedObjectsServiceSetup,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import moment from 'moment';
 import type { CounterMetric } from './usage_counter';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
index 8a76368c8cd9d..406fa9c9ee7ca 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
@@ -8,7 +8,7 @@
 
 /* eslint-disable dot-notation */
 import { UsageCountersService } from './usage_counters_service';
-import { loggingSystemMock, coreMock } from '../../../../core/server/mocks';
+import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
 import * as rxOp from 'rxjs/operators';
 import moment from 'moment';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
index b3ddb93d1855d..095f314a8e80b 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
@@ -12,8 +12,8 @@ import {
   SavedObjectsRepository,
   SavedObjectsServiceSetup,
   SavedObjectsServiceStart,
-} from 'src/core/server';
-import type { Logger, LogMeta } from 'src/core/server';
+} from '@kbn/core/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 
 import moment from 'moment';
 import { CounterMetric, UsageCounter } from './usage_counter';
diff --git a/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts b/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts
index 5b40e1c422672..a6ef90756d42b 100644
--- a/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts
+++ b/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggConfig, IndexPatternField } from '../../../data/public';
+import { IAggConfig, IndexPatternField } from '@kbn/data-plugin/public';
 
 type AggTypeFieldFilter = (field: IndexPatternField, aggConfig: IAggConfig) => boolean;
 
diff --git a/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts b/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts
index 39ed7f69de338..879c6f340bde7 100644
--- a/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts
+++ b/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggType, IAggConfig, IndexPattern, search } from '../../../data/public';
+import { IAggType, IAggConfig, IndexPattern, search } from '@kbn/data-plugin/public';
 
 const { propFilter } = search.aggs;
 const filterByName = propFilter('name');
diff --git a/src/plugins/vis_default_editor/public/components/agg.test.tsx b/src/plugins/vis_default_editor/public/components/agg.test.tsx
index 7d3892d9beaab..b3688fefaee74 100644
--- a/src/plugins/vis_default_editor/public/components/agg.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import { IndexPattern, IAggType, AggGroupNames } from 'src/plugins/data/public';
-import type { Schema } from '../../../visualizations/public';
+import { IndexPattern, IAggType, AggGroupNames } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { DefaultEditorAggParams } from './agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/agg.tsx b/src/plugins/vis_default_editor/public/components/agg.tsx
index b813519d8caf9..3413eb46a9c34 100644
--- a/src/plugins/vis_default_editor/public/components/agg.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig, TimeRange } from 'src/plugins/data/public';
+import { IAggConfig, TimeRange } from '@kbn/data-plugin/public';
 import { DefaultEditorAggParams } from './agg_params';
 import { DefaultEditorAggCommonProps } from './agg_common_props';
 import { AGGS_ACTION_KEYS, AggsAction } from './agg_group_state';
diff --git a/src/plugins/vis_default_editor/public/components/agg_add.tsx b/src/plugins/vis_default_editor/public/components/agg_add.tsx
index afd830ff87fea..b42eab5fb9ec0 100644
--- a/src/plugins/vis_default_editor/public/components/agg_add.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_add.tsx
@@ -18,8 +18,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { IAggConfig, AggGroupNames } from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+import { IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 interface DefaultEditorAggAddProps {
   group?: IAggConfig[];
diff --git a/src/plugins/vis_default_editor/public/components/agg_common_props.ts b/src/plugins/vis_default_editor/public/components/agg_common_props.ts
index 7c097ef9a3e8d..0f9882a53fe2e 100644
--- a/src/plugins/vis_default_editor/public/components/agg_common_props.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_common_props.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { VisParams, Schema } from 'src/plugins/visualizations/public';
-import type { IAggType, IAggConfig, AggGroupName } from 'src/plugins/data/public';
+import type { VisParams, Schema } from '@kbn/visualizations-plugin/public';
+import type { IAggType, IAggConfig, AggGroupName } from '@kbn/data-plugin/public';
 
 import type { EditorVisState } from './sidebar/state/reducers';
 
diff --git a/src/plugins/vis_default_editor/public/components/agg_group.test.tsx b/src/plugins/vis_default_editor/public/components/agg_group.test.tsx
index 55179e7e20ae8..91edd90655956 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import type { IAggConfigs, IAggConfig } from 'src/plugins/data/public';
-import { ISchemas } from 'src/plugins/visualizations/public';
-import { createMockedVisEditorSchemas } from 'src/plugins/visualizations/public/mocks';
+import type { IAggConfigs, IAggConfig } from '@kbn/data-plugin/public';
+import { ISchemas } from '@kbn/visualizations-plugin/public';
+import { createMockedVisEditorSchemas } from '@kbn/visualizations-plugin/public/mocks';
 
 import { DefaultEditorAggGroup, DefaultEditorAggGroupProps } from './agg_group';
 import { DefaultEditorAgg } from './agg';
diff --git a/src/plugins/vis_default_editor/public/components/agg_group.tsx b/src/plugins/vis_default_editor/public/components/agg_group.tsx
index c13b260437d59..26304ba7f17f0 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group.tsx
@@ -19,8 +19,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames, AggGroupLabels, IAggConfig, TimeRange } from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+import { AggGroupNames, AggGroupLabels, IAggConfig, TimeRange } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
 import { AddSchema, ReorderAggs, DefaultEditorAggCommonProps } from './agg_common_props';
diff --git a/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts b/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts
index 0889844bd86cd..dffd971b0e79c 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { IAggConfig } from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+import type { IAggConfig } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import {
   isAggRemovable,
diff --git a/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx b/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx
index f5d5529a4b4e8..95f1cdf01aad7 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx
@@ -7,8 +7,8 @@
  */
 
 import { findIndex, isEmpty } from 'lodash';
-import type { IAggConfig } from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+import type { IAggConfig } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import { getSchemaByName } from '../schemas';
 import type { AggsState } from './agg_group_state';
diff --git a/src/plugins/vis_default_editor/public/components/agg_group_state.tsx b/src/plugins/vis_default_editor/public/components/agg_group_state.tsx
index 5a1fa6056f925..2bf7b3e31f727 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group_state.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group_state.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 
 export enum AGGS_ACTION_KEYS {
   TOUCHED = 'aggsTouched',
diff --git a/src/plugins/vis_default_editor/public/components/agg_param_props.ts b/src/plugins/vis_default_editor/public/components/agg_param_props.ts
index f115f99f2f13c..98428967ab370 100644
--- a/src/plugins/vis_default_editor/public/components/agg_param_props.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_param_props.ts
@@ -11,8 +11,8 @@ import {
   AggParam,
   IndexPatternField,
   OptionedValueProp,
-} from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from './utils';
 import { EditorVisState } from './sidebar/state/reducers';
diff --git a/src/plugins/vis_default_editor/public/components/agg_params.test.tsx b/src/plugins/vis_default_editor/public/components/agg_params.test.tsx
index 2f71ae3b7ecd1..fd75b06c41250 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_params.test.tsx
@@ -9,13 +9,13 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { IndexPattern, IAggConfig, AggGroupNames } from 'src/plugins/data/public';
+import { IndexPattern, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import {
   DefaultEditorAggParams as PureDefaultEditorAggParams,
   DefaultEditorAggParamsProps,
 } from './agg_params';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { dataPluginMock } from '../../../data/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { EditorVisState } from './sidebar/state/reducers';
 
 const mockEditorConfig = {
diff --git a/src/plugins/vis_default_editor/public/components/agg_params.tsx b/src/plugins/vis_default_editor/public/components/agg_params.tsx
index 03c4823d22c8c..a664a0f1fe3fa 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_params.tsx
@@ -11,9 +11,10 @@ import { EuiForm, EuiAccordion, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useUnmount from 'react-use/lib/useUnmount';
 
-import { IAggConfig, IndexPattern, AggGroupNames } from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+import { IAggConfig, IndexPattern, AggGroupNames } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
 import {
@@ -30,7 +31,6 @@ import {
 import { DefaultEditorCommonProps } from './agg_common_props';
 import { EditorParamConfig, TimeIntervalParam, FixedParam, getEditorConfig } from './utils';
 import { getSchemaByName } from '../schemas';
-import { useKibana } from '../../../kibana_react/public';
 import { VisDefaultEditorKibanaServices } from '../types';
 
 const FIXED_VALUE_PROP = 'fixedValue';
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts
index c38af03646216..7bf2328ab3b06 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts
@@ -12,8 +12,8 @@ import {
   IAggConfig,
   IAggType,
   IndexPattern,
-} from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import {
   getAggParamsToRender,
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
index 55db880a83932..5c51ac8dd4521 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -15,8 +15,8 @@ import {
   IAggType,
   IndexPattern,
   IndexPatternField,
-} from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import { filterAggTypes, filterAggTypeFields } from '../agg_filters';
 import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_map.ts b/src/plugins/vis_default_editor/public/components/agg_params_map.ts
index 283e1d7511b75..e7361af3b7e6d 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_map.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_map.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { AggGroupNames, BUCKET_TYPES, METRIC_TYPES, search } from '@kbn/data-plugin/public';
 import * as controls from './controls';
-import { AggGroupNames, BUCKET_TYPES, METRIC_TYPES, search } from '../../../data/public';
 import { wrapWithInlineComp } from './controls/utils';
 
 const { siblingPipelineType, parentPipelineType } = search.aggs;
diff --git a/src/plugins/vis_default_editor/public/components/agg_select.tsx b/src/plugins/vis_default_editor/public/components/agg_select.tsx
index 279658111cdf1..dc0fc9b2ff22d 100644
--- a/src/plugins/vis_default_editor/public/components/agg_select.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_select.tsx
@@ -12,10 +12,10 @@ import React, { useEffect, useCallback, useState } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow, EuiLink, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { IAggType, IndexPattern } from 'src/plugins/data/public';
+import { IAggType, IndexPattern } from '@kbn/data-plugin/public';
 
-import { DocLinksStart } from '../../../../core/public';
-import { useKibana } from '../../../kibana_react/public';
+import { DocLinksStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComboBoxGroupedOptions } from '../utils';
 import { AGG_TYPE_ACTION_KEYS, AggTypeAction } from './agg_params_state';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx b/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
index ba87c7ac8c6dc..ba19df4f2d978 100644
--- a/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisParams } from 'src/plugins/visualizations/public';
-import { IAggConfig } from 'src/plugins/data/public';
+import { VisParams } from '@kbn/visualizations-plugin/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import { DefaultEditorAggCommonProps } from '../agg_common_props';
 
 export interface AggControlProps {
diff --git a/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx b/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
index 42c0afaa6b9d5..34d3bc520f00b 100644
--- a/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
@@ -9,7 +9,7 @@
 import React, { FunctionComponent } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import {
   safeMakeLabel,
   useAvailableOptions,
diff --git a/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx
index 1c721cde37b2b..89a6109c52fc7 100644
--- a/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx
@@ -10,7 +10,7 @@ import React, { useCallback } from 'react';
 import { EuiFieldText, EuiFlexItem, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { search } from '../../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 import { InputList, InputListConfig, InputModel, InputObject, InputItem } from './input_list';
 
 const EMPTY_STRING = '';
diff --git a/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
index 39959f7560ce2..a63848c1d14ce 100644
--- a/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
@@ -10,8 +10,8 @@ import React, { useCallback } from 'react';
 import { EuiFieldText, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { search } from '@kbn/data-plugin/public';
 import { InputList, InputListConfig, InputObject, InputModel, InputItem } from './input_list';
-import { search } from '../../../../../data/public';
 
 const EMPTY_STRING = '';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx
index 00da70d7687f8..f2400d9c6462d 100644
--- a/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DateRangesParamEditor } from './date_ranges';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import { docLinksServiceMock } from '../../../../../core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 describe('DateRangesParamEditor component', () => {
   let setValue: jest.Mock;
diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
index f060cfb311023..96cb0761d610c 100644
--- a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
@@ -26,9 +26,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { isEqual, omit } from 'lodash';
 import useMount from 'react-use/lib/useMount';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 const FROM_PLACEHOLDER = '\u2212\u221E';
diff --git a/src/plugins/vis_default_editor/public/components/controls/field.test.tsx b/src/plugins/vis_default_editor/public/components/controls/field.test.tsx
index 55ea1dbfc56a3..af86377b179d1 100644
--- a/src/plugins/vis_default_editor/public/components/controls/field.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/field.test.tsx
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { mount, shallow, ReactWrapper } from 'enzyme';
 import { EuiComboBoxProps, EuiComboBox } from '@elastic/eui';
 
-import { IAggConfig, IndexPatternField, AggParam } from 'src/plugins/data/public';
+import { IAggConfig, IndexPatternField, AggParam } from '@kbn/data-plugin/public';
 import { ComboBoxGroupedOptions } from '../../utils';
 import { FieldParamEditor, FieldParamEditorProps } from './field';
 import { EditorVisState } from '../sidebar/state/reducers';
diff --git a/src/plugins/vis_default_editor/public/components/controls/field.tsx b/src/plugins/vis_default_editor/public/components/controls/field.tsx
index f8db2d89888a2..88f00d073609e 100644
--- a/src/plugins/vis_default_editor/public/components/controls/field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/field.tsx
@@ -19,7 +19,7 @@ import {
   IFieldParamType,
   IndexPatternField,
   KBN_FIELD_TYPES,
-} from '../../../../../plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { formatListAsProse, parseCommaSeparatedList, useValidation } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { ComboBoxGroupedOptions } from '../../utils';
diff --git a/src/plugins/vis_default_editor/public/components/controls/filter.tsx b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
index 120c3b8871c45..9796179ed2a9c 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filter.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
@@ -10,10 +10,10 @@ import React, { useState } from 'react';
 import { EuiForm, EuiButtonIcon, EuiFieldText, EuiFormRow, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig, Query, DataPublicPluginStart } from '../../../../data/public';
-import { QueryStringInput } from '../../../../unified_search/public';
+import { IAggConfig, Query, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface FilterRowProps {
   id: string;
diff --git a/src/plugins/vis_default_editor/public/components/controls/filters.tsx b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
index 8a73520c91376..3236e16903b9f 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filters.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
@@ -12,9 +12,9 @@ import { htmlIdGenerator, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useMount from 'react-use/lib/useMount';
 
-import { Query, DataPublicPluginStart } from '../../../../data/public';
-import { IUiSettingsClient } from '../../../../../core/public';
-import { useKibana } from '../../../../kibana_react/public';
+import { Query, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { FilterRow } from './filter';
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx b/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
index d83035ea31fcc..30e49f8696892 100644
--- a/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
@@ -9,7 +9,7 @@
 import React, { useEffect, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 import { SwitchParamEditor } from './switch';
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx b/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
index 242d0357dc3f8..ca22abfbbc2a2 100644
--- a/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
@@ -7,9 +7,9 @@
  */
 
 import React, { useEffect } from 'react';
+import { search } from '@kbn/data-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 import { StringParamEditor } from './string';
-import { search } from '../../../../data/public';
 import { SimpleNumberList } from './components/simple_number_list';
 const { isNumberType } = search.aggs;
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx b/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
index 6ad6f6179dfc8..f8ffe53781021 100644
--- a/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
@@ -10,9 +10,9 @@ import React, { useCallback, useEffect } from 'react';
 import { EuiFormRow, EuiFieldNumber, EuiFieldNumberProps, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
-import { UI_SETTINGS } from '../../../../data/public';
 
 export interface SizeParamEditorProps extends AggParamEditorProps<number | ''> {
   iconTip?: React.ReactNode;
diff --git a/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx b/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
index 22959e70f7299..40ec11c010a1a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import { DEFAULT_OPTIONS, aggFilter, MetricAggParamEditor } from './metric_agg';
 
 jest.mock('./utils', () => ({
diff --git a/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx b/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
index 5b4a0b47c735d..d3e4e9201a89e 100644
--- a/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
@@ -8,9 +8,9 @@
 
 import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+import { search } from '@kbn/data-plugin/public';
 import { SwitchParamEditor } from './switch';
 
-import { search } from '../../../../data/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function MissingBucketParamEditor(props: AggParamEditorProps<boolean>) {
diff --git a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
index e5f90dc382e49..e1d7a058acd61 100644
--- a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { UI_SETTINGS } from '../../../../data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/order.tsx b/src/plugins/vis_default_editor/public/components/controls/order.tsx
index d6c0904b76cc1..68a909878465a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order.tsx
@@ -10,7 +10,7 @@ import React, { useEffect } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { OptionedValueProp } from 'src/plugins/data/public';
+import { OptionedValueProp } from '@kbn/data-plugin/public';
 import { AggParamEditorProps, OptionedParamEditorProps } from '../agg_param_props';
 
 function OrderParamEditor({
diff --git a/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx b/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx
index d3dd9900f4eda..00d04898782e7 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx
@@ -9,7 +9,7 @@
 import React, { useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../../../data/public';
+import { AggParamType, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/controls/order_by.tsx b/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
index 690face8f1261..5cde95a9a5060 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
@@ -11,6 +11,7 @@ import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useMount from 'react-use/lib/useMount';
 
+import { search } from '@kbn/data-plugin/public';
 import {
   isCompatibleAggregation,
   useAvailableOptions,
@@ -18,7 +19,6 @@ import {
   useValidation,
 } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
-import { search } from '../../../../data/public';
 
 const { termsAggFilter } = search.aggs;
 const DEFAULT_VALUE = '_key';
diff --git a/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx b/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx
index a02bdc6cdb6b4..17555391abc8a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import { PalettePicker, PalettePickerProps } from './palette_picker';
-import { chartPluginMock } from '../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EuiColorPalettePicker } from '@elastic/eui';
 
 describe('PalettePicker', function () {
diff --git a/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx b/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
index a94c68c944d12..260ef34718107 100644
--- a/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { AggParamEditorProps } from '../agg_param_props';
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
 import { PercentilesEditor } from './percentiles';
 import { EditorVisState } from '../sidebar/state/reducers';
diff --git a/src/plugins/vis_default_editor/public/components/controls/precision.tsx b/src/plugins/vis_default_editor/public/components/controls/precision.tsx
index 34fc484df8c5a..2e9c2b252fa63 100644
--- a/src/plugins/vis_default_editor/public/components/controls/precision.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/precision.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 
 import { EuiRange, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function PrecisionParamEditor({ agg, value, setValue }: AggParamEditorProps<number>) {
diff --git a/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx b/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx
index 6e5ae78e54dc1..4c98ad351716a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx
@@ -11,8 +11,8 @@ import React, { useState, useMemo, useCallback } from 'react';
 import { EuiFormRow, EuiIconTip, EuiScreenReaderOnly } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { XJsonLang } from '@kbn/monaco';
-import { CodeEditor } from '../../../../kibana_react/public';
-import { XJson } from '../../../../es_ui_shared/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx b/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx
index fa04dc7981bee..7d7c60df6e4a2 100644
--- a/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx
@@ -9,7 +9,7 @@
 import React, { useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../../../data/public';
+import { AggParamType, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx b/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx
index 5b5115e58ce35..2b05c3332846a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx
@@ -11,7 +11,7 @@ import { EuiFormLabel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useMount from 'react-use/lib/useMount';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../../../data/public';
+import { AggParamType, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/controls/test_utils.ts b/src/plugins/vis_default_editor/public/components/controls/test_utils.ts
index 39001c7748a33..8e6095e1e6ed0 100644
--- a/src/plugins/vis_default_editor/public/components/controls/test_utils.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/test_utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggConfig, AggParam } from 'src/plugins/data/public';
+import { IAggConfig, AggParam } from '@kbn/data-plugin/public';
 import { EditorConfig } from '../utils';
 import { EditorVisState } from '../sidebar/state/reducers';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx b/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx
index d1179bcb162ef..c23e91a68b8bf 100644
--- a/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx
@@ -12,7 +12,7 @@ import { TimeIntervalParamEditor } from './time_interval';
 import { aggParamCommonPropsMock } from './test_utils';
 import { AggParamEditorProps } from '../agg_param_props';
 
-jest.mock('../../../../data/public', () => ({
+jest.mock('@kbn/data-plugin/public', () => ({
   search: {
     aggs: {
       isValidInterval: jest.fn().mockReturnValue(true),
@@ -22,7 +22,7 @@ jest.mock('../../../../data/public', () => ({
   },
 }));
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 
 describe('TimeIntervalParamEditor', () => {
   let props: AggParamEditorProps<string>;
diff --git a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
index 9b5c450669eee..f6d4a9e003d2b 100644
--- a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
@@ -12,7 +12,7 @@ import { EuiFormRow, EuiIconTip, EuiComboBox, EuiComboBoxOptionOption } from '@e
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { search, AggParamOption } from '../../../../data/public';
+import { search, AggParamOption } from '@kbn/data-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 const { parseEsInterval, InvalidEsCalendarIntervalError } = search.aggs;
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
index 95e3a74a66d70..c8ced47ff92c0 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
@@ -14,7 +14,7 @@ import {
   TopAggregateParamEditorProps,
 } from './top_aggregate';
 import { aggParamCommonPropsMock } from './test_utils';
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 
 describe('TopAggregateParamEditor', () => {
   let agg: IAggConfig;
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
index 35c352635a27c..62cc98a9293a6 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
@@ -16,7 +16,7 @@ import {
   AggParam,
   OptionedValueProp,
   OptionedParamType,
-} from 'src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { AggParamEditorProps, OptionedParamEditorProps } from '../agg_param_props';
 
 export interface AggregateValueProp extends OptionedValueProp {
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_field.tsx b/src/plugins/vis_default_editor/public/components/controls/top_field.tsx
index 49a3e236746d2..a74025a578e15 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_field.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FieldParamEditor } from './field';
 import { getCompatibleAggs } from './top_aggregate';
 import { AggParamEditorProps } from '../agg_param_props';
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx b/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx
index 8ca5d62346e15..022d3ed779be0 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FieldParamEditor } from './field';
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts b/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
index 4d85ce4c3d42c..7b304199a2944 100644
--- a/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
@@ -9,7 +9,7 @@
 import { useEffect, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 
 type AggFilter = string[];
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts b/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
index febedd49621fd..ae622e059e921 100644
--- a/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
@@ -9,7 +9,7 @@
 import { useCallback } from 'react';
 import type { SerializableRecord } from '@kbn/utility-types';
 
-import { IAggConfig, AggParamType } from 'src/plugins/data/public';
+import { IAggConfig, AggParamType } from '@kbn/data-plugin/public';
 
 type SetValue = (value?: IAggConfig) => void;
 
diff --git a/src/plugins/vis_default_editor/public/components/options/basic_options.tsx b/src/plugins/vis_default_editor/public/components/options/basic_options.tsx
index 5cec0743b94fd..d7d6057aabcc7 100644
--- a/src/plugins/vis_default_editor/public/components/options/basic_options.tsx
+++ b/src/plugins/vis_default_editor/public/components/options/basic_options.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { VisEditorOptionsProps } from '../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { SwitchOption } from './switch';
 import { SelectOption } from './select';
 
diff --git a/src/plugins/vis_default_editor/public/components/options/color_schema.tsx b/src/plugins/vis_default_editor/public/components/options/color_schema.tsx
index 3ce9e2ec72fa0..6858842651958 100644
--- a/src/plugins/vis_default_editor/public/components/options/color_schema.tsx
+++ b/src/plugins/vis_default_editor/public/components/options/color_schema.tsx
@@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
 import { EuiLink, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { ColorSchemaParams, ColorSchema } from 'src/plugins/charts/public';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { ColorSchemaParams, ColorSchema } from '@kbn/charts-plugin/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { SelectOption } from './select';
 import { SwitchOption } from './switch';
 
diff --git a/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx b/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx
index 0a593dd753b53..9dc3f1aea1c64 100644
--- a/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx
+++ b/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { SwitchOption } from './switch';
-import { useKibana } from '../../../../kibana_react/public';
-import { FORMATS_UI_SETTINGS } from '../../../../field_formats/common';
 
 export interface PercentageModeOptionProps {
   setValue: (
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx b/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx
index b033a4d77a6c2..abf88e665019f 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx
@@ -19,7 +19,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import useDebounce from 'react-use/lib/useDebounce';
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { discardChanges, EditorAction } from './state';
 
 interface DefaultEditorControlsProps {
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
index 15169500aad62..c7b2878e2656b 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
@@ -16,8 +16,8 @@ import {
   IMetricAggType,
   search,
   TimeRange,
-} from '../../../../data/public';
-import type { ISchemas } from '../../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { ISchemas } from '@kbn/visualizations-plugin/public';
 import { DefaultEditorAggGroup } from '../agg_group';
 import {
   EditorAction,
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
index 5fcf3d4ecf133..bb8d6d9ecf97f 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -23,10 +23,10 @@ import {
   Vis,
   PersistedState,
   VisualizeEmbeddableContract,
-} from 'src/plugins/visualizations/public';
-import type { Schema } from 'src/plugins/visualizations/public';
-import { TimeRange } from 'src/plugins/data/public';
-import { SavedSearch } from 'src/plugins/discover/public';
+} from '@kbn/visualizations-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { SavedSearch } from '@kbn/discover-plugin/public';
 import { DefaultEditorNavBar } from './navbar';
 import { DefaultEditorControls } from './controls';
 import { setStateParamValue, useEditorReducer, useEditorFormState, discardChanges } from './state';
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
index af800c857f0cb..b11e72c117d8e 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -24,10 +24,10 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
-import { Vis } from 'src/plugins/visualizations/public';
-import { SavedSearch, getSavedSearchUrl } from '../../../../discover/public';
-import { ApplicationStart } from '../../../../../core/public';
-import { useKibana } from '../../../../kibana_react/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { SavedSearch, getSavedSearchUrl } from '@kbn/discover-plugin/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface LinkedSearchProps {
   savedSearch: SavedSearch;
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts
index 1023aeae2438e..e53890de3196e 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Vis, VisParams, Schema } from 'src/plugins/visualizations/public';
-import type { IAggConfig } from 'src/plugins/data/public';
+import { Vis, VisParams, Schema } from '@kbn/visualizations-plugin/public';
+import type { IAggConfig } from '@kbn/data-plugin/public';
 
 import { EditorStateActionTypes } from './constants';
 
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts
index c3161845c6b36..b033450d19d9a 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts
@@ -9,11 +9,11 @@
 import { useReducer, useCallback } from 'react';
 import { EventEmitter } from 'events';
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { createEditorStateReducer, initEditorState, EditorVisState } from './reducers';
 import { EditorStateActionTypes } from './constants';
 import { EditorAction } from './actions';
-import { useKibana } from '../../../../../kibana_react/public';
 import { VisDefaultEditorKibanaServices } from '../../../types';
 
 export * from './editor_form_state';
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
index 54012b9d89590..8afac862ffb44 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
@@ -8,8 +8,8 @@
 
 import { cloneDeep } from 'lodash';
 
-import { Vis } from 'src/plugins/visualizations/public';
-import { AggGroupNames, DataPublicPluginStart } from '../../../../../data/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { AggGroupNames, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { EditorStateActionTypes } from './constants';
 import { getEnabledMetricAggsCount } from '../../agg_group_helper';
 import { EditorAction } from './actions';
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts b/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts
index b092d37af6293..463e5024eb5b5 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts
@@ -9,7 +9,7 @@
 import { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { Vis, VisEditorOptionsProps } from '../../../../visualizations/public';
+import { Vis, VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 import { DefaultEditorDataTab, DefaultEditorDataTabProps } from './data_tab';
 
diff --git a/src/plugins/vis_default_editor/public/components/utils/editor_config.ts b/src/plugins/vis_default_editor/public/components/utils/editor_config.ts
index a5b85c83f29c9..b8e61d1910509 100644
--- a/src/plugins/vis_default_editor/public/components/utils/editor_config.ts
+++ b/src/plugins/vis_default_editor/public/components/utils/editor_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from 'src/plugins/data/public';
+import { IndexPattern } from '@kbn/data-plugin/public';
 
 /**
  * A hidden parameter can be hidden from the UI completely.
diff --git a/src/plugins/vis_default_editor/public/default_editor.tsx b/src/plugins/vis_default_editor/public/default_editor.tsx
index c8e127947e3d0..cc7ff066f1274 100644
--- a/src/plugins/vis_default_editor/public/default_editor.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor.tsx
@@ -17,9 +17,9 @@ import {
   Vis,
   VisualizeEmbeddableContract,
   EditorRenderProps,
-} from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../kibana_react/public';
-import { Storage } from '../../kibana_utils/public';
+} from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { DefaultEditorSideBar } from './components/sidebar';
 import { getInitialWidth } from './editor_size';
diff --git a/src/plugins/vis_default_editor/public/default_editor_controller.tsx b/src/plugins/vis_default_editor/public/default_editor_controller.tsx
index 5de603faf8533..883a87ad789b1 100644
--- a/src/plugins/vis_default_editor/public/default_editor_controller.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor_controller.tsx
@@ -11,9 +11,9 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { EventEmitter } from 'events';
 import { EuiErrorBoundary, EuiLoadingChart } from '@elastic/eui';
 
-import { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
-import { IEditorController, EditorRenderProps } from 'src/plugins/visualizations/public';
-import { KibanaThemeProvider } from '../../kibana_react/public';
+import { Vis, VisualizeEmbeddableContract } from '@kbn/visualizations-plugin/public';
+import { IEditorController, EditorRenderProps } from '@kbn/visualizations-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getTheme } from './services';
 
 // @ts-ignore
diff --git a/src/plugins/vis_default_editor/public/index.ts b/src/plugins/vis_default_editor/public/index.ts
index d89a898467b98..90c9f487d9f92 100644
--- a/src/plugins/vis_default_editor/public/index.ts
+++ b/src/plugins/vis_default_editor/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DefaultEditorController } from './default_editor_controller';
 import { VisDefaultEditorPlugin } from './plugin';
 
diff --git a/src/plugins/vis_default_editor/public/plugin.ts b/src/plugins/vis_default_editor/public/plugin.ts
index 0b39f1a5b193a..1758fd1b6ff3c 100644
--- a/src/plugins/vis_default_editor/public/plugin.ts
+++ b/src/plugins/vis_default_editor/public/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 
+import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { DefaultEditorController } from './default_editor_controller';
 import { setTheme } from './services';
-import type { VisualizationsSetup } from '../../visualizations/public';
 
 export interface VisDefaultEditorSetupDependencies {
   visualizations: VisualizationsSetup;
diff --git a/src/plugins/vis_default_editor/public/schemas.ts b/src/plugins/vis_default_editor/public/schemas.ts
index f59ecd0b33178..355b92e2e89f4 100644
--- a/src/plugins/vis_default_editor/public/schemas.ts
+++ b/src/plugins/vis_default_editor/public/schemas.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Schema } from '../../visualizations/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 export const getSchemaByName = (schemas: Schema[], schemaName?: string) => {
   return schemas.find((s) => s.name === schemaName) || ({} as Schema);
diff --git a/src/plugins/vis_default_editor/public/services.ts b/src/plugins/vis_default_editor/public/services.ts
index d76fbc4542f4c..5f637ae0d9eae 100644
--- a/src/plugins/vis_default_editor/public/services.ts
+++ b/src/plugins/vis_default_editor/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceStart } from 'kibana/public';
-import { createGetterSetter } from '../../kibana_utils/common';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/common';
 
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceStart>('ThemeService');
diff --git a/src/plugins/vis_default_editor/public/types.ts b/src/plugins/vis_default_editor/public/types.ts
index 5354b78a9dceb..68375151e5068 100644
--- a/src/plugins/vis_default_editor/public/types.ts
+++ b/src/plugins/vis_default_editor/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export interface VisDefaultEditorKibanaServices {
   data: DataPublicPluginStart;
diff --git a/src/plugins/vis_default_editor/public/utils.test.ts b/src/plugins/vis_default_editor/public/utils.test.ts
index 0339ac4a43c36..4e7d22cdb4b12 100644
--- a/src/plugins/vis_default_editor/public/utils.test.ts
+++ b/src/plugins/vis_default_editor/public/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { groupAndSortBy } from './utils';
-import { AggGroupNames } from 'src/plugins/data/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
 
 const aggs = [
   {
diff --git a/src/plugins/vis_type_markdown/public/index.ts b/src/plugins/vis_type_markdown/public/index.ts
index 8aef539a32277..a94db9b3bfca5 100644
--- a/src/plugins/vis_type_markdown/public/index.ts
+++ b/src/plugins/vis_type_markdown/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MarkdownPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_type_markdown/public/markdown_fn.test.ts b/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
index 148a15fb9fc8a..c942245354a91 100644
--- a/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import { createMarkdownVisFn } from './markdown_fn';
 import { Arguments } from './types';
 
diff --git a/src/plugins/vis_type_markdown/public/markdown_fn.ts b/src/plugins/vis_type_markdown/public/markdown_fn.ts
index 5a531b4be660e..e319ca884e134 100644
--- a/src/plugins/vis_type_markdown/public/markdown_fn.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Render } from '../../expressions/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 import { Arguments, MarkdownVisParams } from './types';
 
 export interface MarkdownVisRenderValue {
diff --git a/src/plugins/vis_type_markdown/public/markdown_options.test.tsx b/src/plugins/vis_type_markdown/public/markdown_options.test.tsx
index 93e00bf2badae..75a2fdf742337 100644
--- a/src/plugins/vis_type_markdown/public/markdown_options.test.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_options.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { MarkdownVisParams } from './types';
 import { MarkdownOptions } from './markdown_options';
 
diff --git a/src/plugins/vis_type_markdown/public/markdown_options.tsx b/src/plugins/vis_type_markdown/public/markdown_options.tsx
index f57f853e18636..8311ffb89c6dc 100644
--- a/src/plugins/vis_type_markdown/public/markdown_options.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_options.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { MarkdownVisParams } from './types';
 
 function MarkdownOptions({ stateParams, setValue }: VisEditorOptionsProps<MarkdownVisParams>) {
diff --git a/src/plugins/vis_type_markdown/public/markdown_renderer.tsx b/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
index f3e57ec03c144..38805bd5ce697 100644
--- a/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
@@ -8,8 +8,8 @@
 
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { VisualizationContainer } from '../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { MarkdownVisRenderValue } from './markdown_fn';
 
 // @ts-ignore
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis.ts b/src/plugins/vis_type_markdown/public/markdown_vis.ts
index dec26da934858..7fcf9fb6311e6 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_vis.ts
@@ -8,10 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { DefaultEditorSize } from '@kbn/vis-default-editor-plugin/public';
+import { VisGroups, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { MarkdownOptions } from './markdown_options';
 import { SettingsOptions } from './settings_options_lazy';
-import { DefaultEditorSize } from '../../vis_default_editor/public';
-import { VisGroups, VisTypeDefinition } from '../../visualizations/public';
 import { toExpressionAst } from './to_ast';
 import { MarkdownVisParams } from './types';
 
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
index 0276750bdc415..60df18d60a15e 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { useEffect } from 'react';
-import { Markdown } from '../../kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { MarkdownVisParams } from './types';
 
 import './markdown_vis.scss';
diff --git a/src/plugins/vis_type_markdown/public/plugin.ts b/src/plugins/vis_type_markdown/public/plugin.ts
index d0b739cb4b0fa..97848aab8afc7 100644
--- a/src/plugins/vis_type_markdown/public/plugin.ts
+++ b/src/plugins/vis_type_markdown/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { VisualizationsSetup } from '../../visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 
 import { markdownVisDefinition } from './markdown_vis';
 import { createMarkdownVisFn } from './markdown_fn';
diff --git a/src/plugins/vis_type_markdown/public/settings_options.tsx b/src/plugins/vis_type_markdown/public/settings_options.tsx
index d0fe584a6348a..0ba0b273de1b5 100644
--- a/src/plugins/vis_type_markdown/public/settings_options.tsx
+++ b/src/plugins/vis_type_markdown/public/settings_options.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { SwitchOption, RangeOption } from '../../vis_default_editor/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { SwitchOption, RangeOption } from '@kbn/vis-default-editor-plugin/public';
 import { MarkdownVisParams } from './types';
 
 function SettingsOptions({ stateParams, setValue }: VisEditorOptionsProps<MarkdownVisParams>) {
diff --git a/src/plugins/vis_type_markdown/public/to_ast.test.ts b/src/plugins/vis_type_markdown/public/to_ast.test.ts
index 402e5aeb655a3..d1ced131a5ac2 100644
--- a/src/plugins/vis_type_markdown/public/to_ast.test.ts
+++ b/src/plugins/vis_type_markdown/public/to_ast.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { toExpressionAst } from './to_ast';
-import { Vis } from '../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 describe('markdown vis toExpressionAst function', () => {
   let vis: Vis;
diff --git a/src/plugins/vis_type_markdown/public/to_ast.ts b/src/plugins/vis_type_markdown/public/to_ast.ts
index daeedd9d8c373..4da10e88eb609 100644
--- a/src/plugins/vis_type_markdown/public/to_ast.ts
+++ b/src/plugins/vis_type_markdown/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisToExpressionAst } from '../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { MarkdownVisExpressionFunctionDefinition } from './markdown_fn';
 import { MarkdownVisParams } from './types';
 
diff --git a/src/plugins/vis_type_markdown/public/types.ts b/src/plugins/vis_type_markdown/public/types.ts
index 927be64ea0ff9..e8ed2b9f0e317 100644
--- a/src/plugins/vis_type_markdown/public/types.ts
+++ b/src/plugins/vis_type_markdown/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Style } from 'src/plugins/expressions/public';
+import { Style } from '@kbn/expressions-plugin/public';
 
 export interface Arguments {
   markdown: string;
diff --git a/src/plugins/vis_type_markdown/server/index.ts b/src/plugins/vis_type_markdown/server/index.ts
index cc1c995a185f9..d2deba39e9987 100644
--- a/src/plugins/vis_type_markdown/server/index.ts
+++ b/src/plugins/vis_type_markdown/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/gauge/public/editor/collections.ts b/src/plugins/vis_types/gauge/public/editor/collections.ts
index 3f52ffbead01c..ef0a27211ec6c 100644
--- a/src/plugins/vis_types/gauge/public/editor/collections.ts
+++ b/src/plugins/vis_types/gauge/public/editor/collections.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { colorSchemas } from '../../../../charts/public';
+import { colorSchemas } from '@kbn/charts-plugin/public';
 import { Alignment, GaugeType } from '../types';
 
 export const getGaugeTypes = () => [
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx
index 8fbe8b1567ae3..54b831032366f 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx
@@ -9,7 +9,7 @@
 import React, { useCallback } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { GaugeTypeProps, GaugeVisParams } from '../../../types';
 import { RangesPanel } from './ranges_panel';
 import { StylePanel } from './style_panel';
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx
index 087a43c5dd005..f48f16b4ef5be 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SwitchOption, TextInputOption } from '../../../../../../vis_default_editor/public';
-import { GaugeOptionsInternalProps } from '../gauge';
+import { SwitchOption, TextInputOption } from '@kbn/vis-default-editor-plugin/public';
+import { GaugeOptionsInternalProps } from '.';
 
 function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInternalProps) {
   return (
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx
index 1dc36ef6a7015..908d71b0b98df 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx
@@ -16,9 +16,9 @@ import {
   SwitchOption,
   ColorSchemaOptions,
   PercentageModeOption,
-} from '../../../../../../vis_default_editor/public';
-import { ColorSchemaParams, ColorSchemas, colorSchemas } from '../../../../../../charts/public';
-import { GaugeOptionsInternalProps } from '../gauge';
+} from '@kbn/vis-default-editor-plugin/public';
+import { ColorSchemaParams, ColorSchemas, colorSchemas } from '@kbn/charts-plugin/public';
+import { GaugeOptionsInternalProps } from '.';
 import { Gauge } from '../../../types';
 
 function RangesPanel({
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx
index 6ccb7be1cd31e..57d624d6614cf 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx
@@ -11,10 +11,10 @@ import { EuiPanel, EuiSpacer, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { SelectOption } from '../../../../../../vis_default_editor/public';
-import { GaugeOptionsInternalProps } from '../gauge';
-import { AggGroupNames } from '../../../../../../data/public';
-import { getGaugeCollections } from './../../collections';
+import { SelectOption } from '@kbn/vis-default-editor-plugin/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { GaugeOptionsInternalProps } from '.';
+import { getGaugeCollections } from '../../collections';
 
 const gaugeCollections = getGaugeCollections();
 
diff --git a/src/plugins/vis_types/gauge/public/editor/components/index.tsx b/src/plugins/vis_types/gauge/public/editor/components/index.tsx
index 7cb1ca9a26c69..e05361b327469 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/index.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/index.tsx
@@ -8,7 +8,7 @@
 
 import React, { lazy } from 'react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { GaugeTypeProps, GaugeVisParams } from '../../types';
 
 const GaugeOptionsLazy = lazy(() => import('./gauge'));
diff --git a/src/plugins/vis_types/gauge/public/plugin.ts b/src/plugins/vis_types/gauge/public/plugin.ts
index 8c11892192766..1db42c7cc01df 100755
--- a/src/plugins/vis_types/gauge/public/plugin.ts
+++ b/src/plugins/vis_types/gauge/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
-import { CoreSetup } from '../../../../core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../common';
 import { VisTypeGaugePluginSetup } from './types';
 import { gaugeVisType, goalVisType } from './vis_type';
diff --git a/src/plugins/vis_types/gauge/public/to_ast.test.ts b/src/plugins/vis_types/gauge/public/to_ast.test.ts
index 4f76e8e5f727e..f3b8ee90b5b55 100644
--- a/src/plugins/vis_types/gauge/public/to_ast.test.ts
+++ b/src/plugins/vis_types/gauge/public/to_ast.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from 'src/plugins/data/public';
-import { Vis } from 'src/plugins/visualizations/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { GaugeVisParams } from './types';
 
diff --git a/src/plugins/vis_types/gauge/public/to_ast.ts b/src/plugins/vis_types/gauge/public/to_ast.ts
index 3728453b52583..85148b713b319 100644
--- a/src/plugins/vis_types/gauge/public/to_ast.ts
+++ b/src/plugins/vis_types/gauge/public/to_ast.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import type {
   GaugeExpressionFunctionDefinition,
   GaugeShape,
-} from '../../../chart_expressions/expression_gauge/common';
+} from '@kbn/expression-gauge-plugin/common';
 import { GaugeType, GaugeVisParams } from './types';
 import { getStopsWithColorsFromRanges } from './utils';
 import { getEsaggsFn } from './to_ast_esaggs';
diff --git a/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts b/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts
index ecf3f3e637177..4b098342c6de2 100644
--- a/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 import { GaugeVisParams } from './types';
 
diff --git a/src/plugins/vis_types/gauge/public/types.ts b/src/plugins/vis_types/gauge/public/types.ts
index c160b2ccf2f3f..65998f7b00c27 100755
--- a/src/plugins/vis_types/gauge/public/types.ts
+++ b/src/plugins/vis_types/gauge/public/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { $Values } from '@kbn/utility-types';
-import { Range } from '../../../expressions/public';
-import { ColorSchemaParams, Labels, Style } from '../../../charts/public';
+import { Range } from '@kbn/expressions-plugin/public';
+import { ColorSchemaParams, Labels, Style } from '@kbn/charts-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface VisTypeGaugePluginSetup {}
diff --git a/src/plugins/vis_types/gauge/public/utils/palette.ts b/src/plugins/vis_types/gauge/public/utils/palette.ts
index ff3a4b10a0118..5c7322fa3ea99 100644
--- a/src/plugins/vis_types/gauge/public/utils/palette.ts
+++ b/src/plugins/vis_types/gauge/public/utils/palette.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ColorSchemas, getHeatmapColors } from '../../../../charts/common';
-import { Range } from '../../../../expressions';
+import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
+import { Range } from '@kbn/expressions-plugin';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;
diff --git a/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx b/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
index 648d34cdee7bd..1516e35a9c169 100644
--- a/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
+++ b/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { ColorMode, ColorSchemas } from '../../../../charts/public';
-import { AggGroupNames } from '../../../../data/public';
-import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
+import { ColorMode, ColorSchemas } from '@kbn/charts-plugin/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
 import { Alignment, GaugeType, GaugeTypeProps } from '../types';
 import { toExpressionAst } from '../to_ast';
diff --git a/src/plugins/vis_types/gauge/public/vis_type/goal.tsx b/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
index e56e87ee70dff..d0b4095a05130 100644
--- a/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
+++ b/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames } from '../../../../data/public';
-import { ColorMode, ColorSchemas } from '../../../../charts/public';
-import { VisTypeDefinition } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { ColorMode, ColorSchemas } from '@kbn/charts-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 
 import { getGaugeOptions } from '../editor/components';
 import { toExpressionAst } from '../to_ast';
diff --git a/src/plugins/vis_types/gauge/server/index.ts b/src/plugins/vis_types/gauge/server/index.ts
index 8d958e63356e2..1c506253e85e0 100755
--- a/src/plugins/vis_types/gauge/server/index.ts
+++ b/src/plugins/vis_types/gauge/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeGaugeServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/gauge/server/plugin.ts b/src/plugins/vis_types/gauge/server/plugin.ts
index 0334f963c720c..f3bef549a4791 100755
--- a/src/plugins/vis_types/gauge/server/plugin.ts
+++ b/src/plugins/vis_types/gauge/server/plugin.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, Plugin, UiSettingsParams } from '@kbn/core/server';
 
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx
index bb1467c658f76..c10f75129c47c 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
-import type { PersistedState } from '../../../../../visualizations/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import HeatmapOptions, { HeatmapOptionsProps } from './heatmap';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx
index b7cf530b1254f..f592ee3933c1c 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx
@@ -24,9 +24,9 @@ import {
   PercentageModeOption,
   LongLegendOptions,
   LegendSizeSettings,
-} from '../../../../../vis_default_editor/public';
-import { colorSchemas } from '../../../../../charts/public';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
+} from '@kbn/vis-default-editor-plugin/public';
+import { colorSchemas } from '@kbn/charts-plugin/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { HeatmapVisParams, HeatmapTypeProps, ValueAxis } from '../../types';
 import { LabelsPanel } from './labels_panel';
 import { legendPositions, scaleTypes } from '../collections';
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/index.tsx b/src/plugins/vis_types/heatmap/public/editor/components/index.tsx
index 1313d335b06fe..59db84b0db665 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/index.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { HeatmapVisParams, HeatmapTypeProps } from '../../types';
 
 const HeatmapOptionsLazy = lazy(() => import('./heatmap'));
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx b/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx
index 3bdfcb34eb13b..0b16e538fb481 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx
@@ -12,8 +12,8 @@ import { EuiColorPicker, EuiFormRow, EuiPanel, EuiSpacer, EuiTitle } from '@elas
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { SwitchOption } from '../../../../../vis_default_editor/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 import { HeatmapVisParams, ValueAxis } from '../../types';
 
 const VERTICAL_ROTATION = 270;
diff --git a/src/plugins/vis_types/heatmap/public/plugin.ts b/src/plugins/vis_types/heatmap/public/plugin.ts
index 622f68ed707e5..c84c8830318c2 100644
--- a/src/plugins/vis_types/heatmap/public/plugin.ts
+++ b/src/plugins/vis_types/heatmap/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
-import type { VisualizationsSetup } from '../../../visualizations/public';
-import type { ChartsPluginSetup } from '../../../charts/public';
-import type { FieldFormatsStart } from '../../../field_formats/public';
-import type { UsageCollectionSetup } from '../../../usage_collection/public';
-import type { DataPublicPluginStart } from '../../../data/public';
+import { CoreSetup } from '@kbn/core/public';
+import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../common';
 import { heatmapVisType } from './vis_type';
 
diff --git a/src/plugins/vis_types/heatmap/public/to_ast.test.ts b/src/plugins/vis_types/heatmap/public/to_ast.test.ts
index ec6dfd92e5d6a..8c7e3372df867 100644
--- a/src/plugins/vis_types/heatmap/public/to_ast.test.ts
+++ b/src/plugins/vis_types/heatmap/public/to_ast.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { sampleAreaVis } from './sample_vis.test.mocks';
-import { buildExpression } from '../../../expressions/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 
 import { toExpressionAst } from './to_ast';
 import { HeatmapVisParams } from './types';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/heatmap/public/to_ast.ts b/src/plugins/vis_types/heatmap/public/to_ast.ts
index d6dc8a8038591..5b52ab1feeb3a 100644
--- a/src/plugins/vis_types/heatmap/public/to_ast.ts
+++ b/src/plugins/vis_types/heatmap/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisToExpressionAst, getVisSchemas, SchemaConfig } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { VisToExpressionAst, getVisSchemas, SchemaConfig } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { getStopsWithColorsFromRanges, getStopsWithColorsFromColorsNumber } from './utils/palette';
 import type { HeatmapVisParams } from './types';
 import { getEsaggsFn } from './to_ast_esaggs';
diff --git a/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts b/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts
index 9b6e02928f7a9..7a95c59646f45 100644
--- a/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 import { HeatmapVisParams } from './types';
 
diff --git a/src/plugins/vis_types/heatmap/public/types.ts b/src/plugins/vis_types/heatmap/public/types.ts
index 9806b6de772ae..8301d246e9f63 100644
--- a/src/plugins/vis_types/heatmap/public/types.ts
+++ b/src/plugins/vis_types/heatmap/public/types.ts
@@ -7,8 +7,8 @@
  */
 import { UiCounterMetricType } from '@kbn/analytics';
 import type { Position } from '@elastic/charts';
-import type { ChartsPluginSetup, Style, Labels, ColorSchemas } from '../../../charts/public';
-import { Range } from '../../../expressions/public';
+import type { ChartsPluginSetup, Style, Labels, ColorSchemas } from '@kbn/charts-plugin/public';
+import { Range } from '@kbn/expressions-plugin/public';
 
 export interface HeatmapTypeProps {
   showElasticChartsOptions?: boolean;
diff --git a/src/plugins/vis_types/heatmap/public/utils/palette.test.ts b/src/plugins/vis_types/heatmap/public/utils/palette.test.ts
index 511ab12d9e462..a0724249c61ee 100644
--- a/src/plugins/vis_types/heatmap/public/utils/palette.test.ts
+++ b/src/plugins/vis_types/heatmap/public/utils/palette.test.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Range } from '../../../../expressions';
-import type { ColorSchemas } from '../../../../charts/common';
+import type { Range } from '@kbn/expressions-plugin';
+import type { ColorSchemas } from '@kbn/charts-plugin/common';
 import { getStopsWithColorsFromRanges, getStopsWithColorsFromColorsNumber } from './palette';
 
 describe('getFilterClickData', () => {
diff --git a/src/plugins/vis_types/heatmap/public/utils/palette.ts b/src/plugins/vis_types/heatmap/public/utils/palette.ts
index 18f1681bad9c1..4379aea2df6a8 100644
--- a/src/plugins/vis_types/heatmap/public/utils/palette.ts
+++ b/src/plugins/vis_types/heatmap/public/utils/palette.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ColorSchemas, getHeatmapColors } from '../../../../charts/common';
-import { Range } from '../../../../expressions';
+import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
+import { Range } from '@kbn/expressions-plugin';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;
diff --git a/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx b/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
index 775d689e3ec68..a9c2d242a2335 100644
--- a/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
+++ b/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { ColorSchemas } from '../../../../charts/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { ColorSchemas } from '@kbn/charts-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { HeatmapTypeProps, HeatmapVisParams, AxisType, ScaleType } from '../types';
 import { toExpressionAst } from '../to_ast';
 import { getHeatmapOptions } from '../editor/components';
diff --git a/src/plugins/vis_types/heatmap/server/index.ts b/src/plugins/vis_types/heatmap/server/index.ts
index 97d30c275a0ac..077fc3013b7fe 100644
--- a/src/plugins/vis_types/heatmap/server/index.ts
+++ b/src/plugins/vis_types/heatmap/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeHeatmapServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/heatmap/server/plugin.ts b/src/plugins/vis_types/heatmap/server/plugin.ts
index 13854f49236a7..b14afa2ac67e8 100644
--- a/src/plugins/vis_types/heatmap/server/plugin.ts
+++ b/src/plugins/vis_types/heatmap/server/plugin.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, Plugin, UiSettingsParams } from '@kbn/core/server';
 
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
index 8a3873e134192..aba6c75316de5 100644
--- a/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
+++ b/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
@@ -18,7 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import {
   ColorRanges,
   SetColorRangeValue,
@@ -27,8 +27,8 @@ import {
   ColorSchemaOptions,
   RangeOption,
   PercentageModeOption,
-} from '../../../../vis_default_editor/public';
-import { ColorMode, colorSchemas } from '../../../../charts/public';
+} from '@kbn/vis-default-editor-plugin/public';
+import { ColorMode, colorSchemas } from '@kbn/charts-plugin/public';
 import { MetricVisParam, VisParams } from '../types';
 
 const metricColorMode = [
diff --git a/src/plugins/vis_types/metric/public/index.ts b/src/plugins/vis_types/metric/public/index.ts
index bd472ba2be13c..f136a58abaa97 100644
--- a/src/plugins/vis_types/metric/public/index.ts
+++ b/src/plugins/vis_types/metric/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MetricVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/metric/public/metric_vis_type.ts b/src/plugins/vis_types/metric/public/metric_vis_type.ts
index 12f68f3b0e17e..b4abdd180a6e8 100644
--- a/src/plugins/vis_types/metric/public/metric_vis_type.ts
+++ b/src/plugins/vis_types/metric/public/metric_vis_type.ts
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ColorSchemas, ColorMode } from '@kbn/charts-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
 import { MetricVisOptions } from './components';
-import { ColorSchemas, ColorMode } from '../../../charts/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
-import { AggGroupNames } from '../../../data/public';
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
 
diff --git a/src/plugins/vis_types/metric/public/plugin.ts b/src/plugins/vis_types/metric/public/plugin.ts
index a88bbc8e5f2e9..9e79d1d23efda 100644
--- a/src/plugins/vis_types/metric/public/plugin.ts
+++ b/src/plugins/vis_types/metric/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { createMetricVisTypeDefinition } from './metric_vis_type';
 import { ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/metric/public/to_ast.test.ts b/src/plugins/vis_types/metric/public/to_ast.test.ts
index 1c8987bfab5d5..bb9a5f0873f11 100644
--- a/src/plugins/vis_types/metric/public/to_ast.test.ts
+++ b/src/plugins/vis_types/metric/public/to_ast.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from 'src/plugins/data/public';
-import { Vis } from 'src/plugins/visualizations/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
diff --git a/src/plugins/vis_types/metric/public/to_ast.ts b/src/plugins/vis_types/metric/public/to_ast.ts
index 852aa70269994..22176341f45ab 100644
--- a/src/plugins/vis_types/metric/public/to_ast.ts
+++ b/src/plugins/vis_types/metric/public/to_ast.ts
@@ -7,14 +7,14 @@
  */
 
 import { get } from 'lodash';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { inter } from '../../../expressions/common';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { inter } from '@kbn/expressions-plugin/common';
 
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 import { VisParams } from './types';
 import { getStopsWithColorsFromRanges } from './utils';
 
diff --git a/src/plugins/vis_types/metric/public/types.ts b/src/plugins/vis_types/metric/public/types.ts
index 98065348fa91d..c26a5940fe050 100644
--- a/src/plugins/vis_types/metric/public/types.ts
+++ b/src/plugins/vis_types/metric/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Range } from '../../../expressions/public';
-import { ExpressionValueVisDimension } from '../../../visualizations/public';
-import { ColorMode, Labels, Style, ColorSchemas } from '../../../charts/public';
+import { Range } from '@kbn/expressions-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { ColorMode, Labels, Style, ColorSchemas } from '@kbn/charts-plugin/public';
 
 export const visType = 'metric';
 
diff --git a/src/plugins/vis_types/metric/public/utils/palette.ts b/src/plugins/vis_types/metric/public/utils/palette.ts
index ff3a4b10a0118..5c7322fa3ea99 100644
--- a/src/plugins/vis_types/metric/public/utils/palette.ts
+++ b/src/plugins/vis_types/metric/public/utils/palette.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ColorSchemas, getHeatmapColors } from '../../../../charts/common';
-import { Range } from '../../../../expressions';
+import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
+import { Range } from '@kbn/expressions-plugin';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;
diff --git a/src/plugins/vis_types/metric/server/index.ts b/src/plugins/vis_types/metric/server/index.ts
index a14a44b6caa80..db7446c9ef81a 100644
--- a/src/plugins/vis_types/metric/server/index.ts
+++ b/src/plugins/vis_types/metric/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/pie/public/editor/collections.ts b/src/plugins/vis_types/pie/public/editor/collections.ts
index dd9d3fb3737b0..da695c2037710 100644
--- a/src/plugins/vis_types/pie/public/editor/collections.ts
+++ b/src/plugins/vis_types/pie/public/editor/collections.ts
@@ -11,7 +11,7 @@ import {
   LabelPositions,
   ValueFormats,
   EmptySizeRatios,
-} from '../../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
 
 export const getLabelPositions = [
   {
diff --git a/src/plugins/vis_types/pie/public/editor/components/index.tsx b/src/plugins/vis_types/pie/public/editor/components/index.tsx
index 591eaba64ecc5..f21af20f6b2af 100644
--- a/src/plugins/vis_types/pie/public/editor/components/index.tsx
+++ b/src/plugins/vis_types/pie/public/editor/components/index.tsx
@@ -7,9 +7,9 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common';
 import { PieTypeProps } from '../../types';
-import { PartitionVisParams } from '../../../../../chart_expressions/expression_partition_vis/common';
 
 const PieOptionsLazy = lazy(() => import('./pie'));
 
diff --git a/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx b/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx
index aac0c5aef6001..c69bfe3409dcc 100644
--- a/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx
+++ b/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import PieOptions, { PieOptionsProps } from './pie';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
 
diff --git a/src/plugins/vis_types/pie/public/editor/components/pie.tsx b/src/plugins/vis_types/pie/public/editor/components/pie.tsx
index 9be0726ae9eb3..f1f335f186ffd 100644
--- a/src/plugins/vis_types/pie/public/editor/components/pie.tsx
+++ b/src/plugins/vis_types/pie/public/editor/components/pie.tsx
@@ -30,17 +30,17 @@ import {
   PalettePicker,
   LongLegendOptions,
   LegendSizeSettings,
-} from '../../../../../vis_default_editor/public';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
-import { TruncateLabelsOption } from './truncate_labels';
-import { DEFAULT_PERCENT_DECIMALS } from '../../../common';
-import { PieTypeProps } from '../../types';
+} from '@kbn/vis-default-editor-plugin/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import {
   PartitionVisParams,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
-} from '../../../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
+import { TruncateLabelsOption } from './truncate_labels';
+import { DEFAULT_PERCENT_DECIMALS } from '../../../common';
+import { PieTypeProps } from '../../types';
 
 import { emptySizeRatioOptions, getLabelPositions, getValuesFormats } from '../collections';
 import { getLegendPositions } from '../positions';
@@ -103,8 +103,8 @@ const PieOptions = (props: PieOptionsProps) => {
   );
 
   useEffect(() => {
-    setLegendVisibility(legendUiStateValue);
-  }, [legendUiStateValue]);
+    setLegendVisibility(legendUiStateValue ?? stateParams.legendDisplay === LegendDisplay.SHOW);
+  }, [legendUiStateValue, stateParams.legendDisplay]);
 
   useEffect(() => {
     const fetchPalettes = async () => {
diff --git a/src/plugins/vis_types/pie/public/plugin.ts b/src/plugins/vis_types/pie/public/plugin.ts
index 1c0a3994bb8dc..ac219d29b5479 100644
--- a/src/plugins/vis_types/pie/public/plugin.ts
+++ b/src/plugins/vis_types/pie/public/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, DocLinksStart, ThemeServiceStart } from 'src/core/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { CoreSetup, DocLinksStart, ThemeServiceStart } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
 import { pieVisType } from './vis_type';
 
diff --git a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
index 53140c822bd9b..f8836f208d916 100644
--- a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
+++ b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { LegendDisplay } from '../../../chart_expressions/expression_partition_vis/common';
+import { LegendDisplay } from '@kbn/expression-partition-vis-plugin/common';
 
 export const samplePieVis = {
   type: {
diff --git a/src/plugins/vis_types/pie/public/to_ast.test.ts b/src/plugins/vis_types/pie/public/to_ast.test.ts
index 62421d30c2ac0..b035c36d04c37 100644
--- a/src/plugins/vis_types/pie/public/to_ast.test.ts
+++ b/src/plugins/vis_types/pie/public/to_ast.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
-import { PartitionVisParams } from '../../../chart_expressions/expression_partition_vis/common';
+import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common';
 import { samplePieVis } from './sample_vis.test.mocks';
 import { toExpressionAst } from './to_ast';
 
diff --git a/src/plugins/vis_types/pie/public/to_ast.ts b/src/plugins/vis_types/pie/public/to_ast.ts
index 37f01fcc59340..aaac3040d7bd3 100644
--- a/src/plugins/vis_types/pie/public/to_ast.ts
+++ b/src/plugins/vis_types/pie/public/to_ast.ts
@@ -7,15 +7,15 @@
  */
 
 import type { PaletteOutput } from '@kbn/coloring';
-import { getVisSchemas, VisToExpressionAst, SchemaConfig } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, VisToExpressionAst, SchemaConfig } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   PIE_VIS_EXPRESSION_NAME,
   PARTITION_LABELS_FUNCTION,
   PieVisExpressionFunctionDefinition,
   PartitionVisParams,
   LabelsParams,
-} from '../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
 import { getEsaggsFn } from './to_ast_esaggs';
 
 const prepareDimension = (params: SchemaConfig) => {
diff --git a/src/plugins/vis_types/pie/public/to_ast_esaggs.ts b/src/plugins/vis_types/pie/public/to_ast_esaggs.ts
index 3f41a59e3aa8e..ed689d065d66c 100644
--- a/src/plugins/vis_types/pie/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/pie/public/to_ast_esaggs.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
-import { PartitionVisParams } from '../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/data-plugin/public';
+import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common';
 
 /**
  * Get esaggs expressions function
diff --git a/src/plugins/vis_types/pie/public/types/types.ts b/src/plugins/vis_types/pie/public/types/types.ts
index ebddd6470f133..de8151bffbfcb 100644
--- a/src/plugins/vis_types/pie/public/types/types.ts
+++ b/src/plugins/vis_types/pie/public/types/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { SerializedFieldFormat } from '../../../../field_formats/common';
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export interface Dimension {
   accessor: number;
diff --git a/src/plugins/vis_types/pie/public/vis_type/pie.ts b/src/plugins/vis_types/pie/public/vis_type/pie.ts
index c9cc573e27781..d3b0cde93a741 100644
--- a/src/plugins/vis_types/pie/public/vis_type/pie.ts
+++ b/src/plugins/vis_types/pie/public/vis_type/pie.ts
@@ -8,17 +8,17 @@
 
 import { i18n } from '@kbn/i18n';
 import { Position } from '@elastic/charts';
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../../visualizations/public';
-import { DEFAULT_PERCENT_DECIMALS } from '../../common';
-import { PieTypeProps } from '../types';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import {
   PartitionVisParams,
   LabelPositions,
   ValueFormats,
   EmptySizeRatios,
   LegendDisplay,
-} from '../../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
+import { DEFAULT_PERCENT_DECIMALS } from '../../common';
+import { PieTypeProps } from '../types';
 import { toExpressionAst } from '../to_ast';
 import { getPieOptions } from '../editor/components';
 
diff --git a/src/plugins/vis_types/pie/server/index.ts b/src/plugins/vis_types/pie/server/index.ts
index 1e92bedb3d11c..528db1ad401fc 100644
--- a/src/plugins/vis_types/pie/server/index.ts
+++ b/src/plugins/vis_types/pie/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypePieServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/pie/server/plugin.ts b/src/plugins/vis_types/pie/server/plugin.ts
index 49b74e63b8c3c..024e1ecac8e33 100644
--- a/src/plugins/vis_types/pie/server/plugin.ts
+++ b/src/plugins/vis_types/pie/server/plugin.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, Plugin, UiSettingsParams } from '@kbn/core/server';
 
 import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
index 74297e3323641..c90f8d93ac892 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { TableVisBasic } from './table_vis_basic';
 import { FormattedColumn, TableVisConfig, TableVisUiState } from '../types';
-import { DatatableColumn } from 'src/plugins/expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { createTableVisCell } from './table_vis_cell';
 import { createGridColumns } from './table_vis_columns';
 
diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
index 300435997129e..991012684f17d 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
@@ -17,7 +17,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { orderBy } from 'lodash';
 
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { createTableVisCell } from './table_vis_cell';
 import { TableContext, TableVisConfig, TableVisUseUiStateProps } from '../types';
 import { usePagination } from '../utils';
diff --git a/src/plugins/vis_types/table/public/components/table_vis_cell.tsx b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
index 7d7af447db489..a0ebbbd062842 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 
-import { DatatableRow } from 'src/plugins/expressions';
+import { DatatableRow } from '@kbn/expressions-plugin';
 import { FormattedColumns } from '../types';
 
 export const createTableVisCell =
diff --git a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
index ce323c7c38611..9aa30f95f1809 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { EuiDataGridColumnCellActionProps, EuiDataGridColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn, DatatableRow, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { DatatableColumn, DatatableRow, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { FormattedColumns, TableVisUiState } from '../types';
 
 interface FilterCellData {
diff --git a/src/plugins/vis_types/table/public/components/table_vis_controls.tsx b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
index 9ebda35e9caed..36894e306d0e3 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
@@ -17,15 +17,15 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../kibana_react/public';
-import { exporters } from '../../../../data/public';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { exporters } from '@kbn/data-plugin/public';
 import {
   CSV_SEPARATOR_SETTING,
   CSV_QUOTE_VALUES_SETTING,
   downloadFileAs,
-} from '../../../../share/public';
+} from '@kbn/share-plugin/public';
 import { getFormatService } from '../services';
 
 interface TableVisControlsProps {
diff --git a/src/plugins/vis_types/table/public/components/table_vis_options.tsx b/src/plugins/vis_types/table/public/components/table_vis_options.tsx
index c816778079dae..7023716025b21 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_options.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_options.tsx
@@ -12,13 +12,13 @@ import { EuiIconTip, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { search } from '../../../../data/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { search } from '@kbn/data-plugin/public';
 import {
   SwitchOption,
   SelectOption,
   NumberInputOption,
-} from '../../../../vis_default_editor/public';
+} from '@kbn/vis-default-editor-plugin/public';
 import { TableVisParams } from '../../common';
 import { totalAggregations } from './utils';
 
diff --git a/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx b/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
index e1b641eceb5ca..ea9058e68f613 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
@@ -9,7 +9,7 @@
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../../common';
 
 const TableOptionsComponent = lazy(() => import('./table_vis_options'));
diff --git a/src/plugins/vis_types/table/public/components/table_vis_split.tsx b/src/plugins/vis_types/table/public/components/table_vis_split.tsx
index ebb4330f45b05..3e90000d309d7 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_split.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_split.tsx
@@ -8,7 +8,7 @@
 
 import React, { memo } from 'react';
 
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { TableGroup, TableVisConfig, TableVisUseUiStateProps } from '../types';
 import { TableVisBasic } from './table_vis_basic';
 
diff --git a/src/plugins/vis_types/table/public/components/table_visualization.test.tsx b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
index a8c0ae2507373..b3ce828e39bbb 100644
--- a/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
+++ b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
@@ -12,8 +12,8 @@ jest.mock('../utils', () => ({
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { coreMock } from '../../../../../core/public/mocks';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { coreMock } from '@kbn/core/public/mocks';
 import { TableVisConfig, TableVisData } from '../types';
 import TableVisualizationComponent from './table_visualization';
 import { useUiState } from '../utils';
diff --git a/src/plugins/vis_types/table/public/components/table_visualization.tsx b/src/plugins/vis_types/table/public/components/table_visualization.tsx
index 356913146890b..336d6a8ce5ec6 100644
--- a/src/plugins/vis_types/table/public/components/table_visualization.tsx
+++ b/src/plugins/vis_types/table/public/components/table_visualization.tsx
@@ -10,10 +10,10 @@ import './table_visualization.scss';
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
 
-import { CoreStart } from 'kibana/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import type { PersistedState } from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { TableVisConfig, TableVisData } from '../types';
 import { TableVisBasic } from './table_vis_basic';
 import { TableVisSplit } from './table_vis_split';
diff --git a/src/plugins/vis_types/table/public/plugin.ts b/src/plugins/vis_types/table/public/plugin.ts
index e36b4a14c3a57..7acf9595c7aa5 100644
--- a/src/plugins/vis_types/table/public/plugin.ts
+++ b/src/plugins/vis_types/table/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
-import { DataPublicPluginStart } from '../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { setFormatService } from './services';
 import { registerTableVis } from './register_vis';
 
diff --git a/src/plugins/vis_types/table/public/register_vis.ts b/src/plugins/vis_types/table/public/register_vis.ts
index b80dccccaff0a..09922e77a2b72 100644
--- a/src/plugins/vis_types/table/public/register_vis.ts
+++ b/src/plugins/vis_types/table/public/register_vis.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { TablePluginSetupDependencies, TablePluginStartDependencies } from './plugin';
 import { createTableVisFn } from './table_vis_fn';
 import { getTableVisRenderer } from './table_vis_renderer';
diff --git a/src/plugins/vis_types/table/public/services.ts b/src/plugins/vis_types/table/public/services.ts
index e1e6daf3615ef..88129d3760dd1 100644
--- a/src/plugins/vis_types/table/public/services.ts
+++ b/src/plugins/vis_types/table/public/services.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<DataPublicPluginStart['fieldFormats']>('table data.fieldFormats');
diff --git a/src/plugins/vis_types/table/public/table_vis_fn.test.ts b/src/plugins/vis_types/table/public/table_vis_fn.test.ts
index 2ddb68695387f..98336d6cc67d4 100644
--- a/src/plugins/vis_types/table/public/table_vis_fn.test.ts
+++ b/src/plugins/vis_types/table/public/table_vis_fn.test.ts
@@ -10,8 +10,8 @@ import { createTableVisFn } from './table_vis_fn';
 import { tableVisResponseHandler } from './utils';
 import { TableVisConfig } from './types';
 
-import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../expressions/common/expression_types/specs';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 
 jest.mock('./utils', () => ({
   tableVisResponseHandler: jest.fn().mockReturnValue({
diff --git a/src/plugins/vis_types/table/public/table_vis_fn.ts b/src/plugins/vis_types/table/public/table_vis_fn.ts
index 99c8992ff5984..e6589c9811ed2 100644
--- a/src/plugins/vis_types/table/public/table_vis_fn.ts
+++ b/src/plugins/vis_types/table/public/table_vis_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
-import { prepareLogTable, Dimension } from '../../../visualizations/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
+import { prepareLogTable, Dimension } from '@kbn/visualizations-plugin/public';
 import { TableVisData, TableVisConfig } from './types';
 import { VIS_TYPE_TABLE } from '../common';
 import { tableVisResponseHandler } from './utils';
diff --git a/src/plugins/vis_types/table/public/table_vis_renderer.tsx b/src/plugins/vis_types/table/public/table_vis_renderer.tsx
index 09c6c57150e62..0c552e3745cf7 100644
--- a/src/plugins/vis_types/table/public/table_vis_renderer.tsx
+++ b/src/plugins/vis_types/table/public/table_vis_renderer.tsx
@@ -9,11 +9,11 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { CoreStart } from 'kibana/public';
-import { VisualizationContainer } from '../../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../../expressions/common/expression_renderers';
+import { CoreStart } from '@kbn/core/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { TableVisRenderValue } from './table_vis_fn';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 
 const TableVisualizationComponent = lazy(() => import('./components/table_visualization'));
 
diff --git a/src/plugins/vis_types/table/public/table_vis_type.ts b/src/plugins/vis_types/table/public/table_vis_type.ts
index a432bd94dacb6..8662f45c02e7e 100644
--- a/src/plugins/vis_types/table/public/table_vis_type.ts
+++ b/src/plugins/vis_types/table/public/table_vis_type.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames } from '../../../data/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { TableVisParams, VIS_TYPE_TABLE } from '../common';
 import { TableOptions } from './components/table_vis_options_lazy';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_types/table/public/to_ast.test.ts b/src/plugins/vis_types/table/public/to_ast.test.ts
index e8f987909a534..da112d94c0c18 100644
--- a/src/plugins/vis_types/table/public/to_ast.test.ts
+++ b/src/plugins/vis_types/table/public/to_ast.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { AggTypes, TableVisParams } from '../common';
-import { buildExpressionFunction } from '../../../expressions/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 
 const mockSchemas = {
   metric: [{ accessor: 1, format: { id: 'number' }, params: {}, label: 'Count', aggType: 'count' }],
@@ -32,11 +32,11 @@ const mockTableExpression = {
   toAst: jest.fn(),
 };
 
-jest.mock('../../../visualizations/public', () => ({
+jest.mock('@kbn/visualizations-plugin/public', () => ({
   getVisSchemas: () => mockSchemas,
 }));
 
-jest.mock('../../../expressions/public', () => ({
+jest.mock('@kbn/expressions-plugin/public', () => ({
   buildExpression: jest.fn(() => mockTableExpression),
   buildExpressionFunction: jest.fn(() => mockTableExpressionFunction),
 }));
diff --git a/src/plugins/vis_types/table/public/to_ast.ts b/src/plugins/vis_types/table/public/to_ast.ts
index 0268708f22dfe..ac3799fb51cea 100644
--- a/src/plugins/vis_types/table/public/to_ast.ts
+++ b/src/plugins/vis_types/table/public/to_ast.ts
@@ -9,9 +9,9 @@
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../common';
 import { TableExpressionFunctionDefinition } from './table_vis_fn';
 
diff --git a/src/plugins/vis_types/table/public/types.ts b/src/plugins/vis_types/table/public/types.ts
index 4df6f2b94e17b..b61de821d76cf 100644
--- a/src/plugins/vis_types/table/public/types.ts
+++ b/src/plugins/vis_types/table/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IFieldFormat } from 'src/plugins/field_formats/common';
-import { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
-import { ExpressionValueVisDimension } from 'src/plugins/visualizations/public';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../common';
 
 export interface ColumnWidthData {
diff --git a/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
index 51eef1446bac6..ef24b56713069 100644
--- a/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
+++ b/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
@@ -12,7 +12,7 @@ jest.mock('../services', () => ({
   })),
 }));
 
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { TableContext } from '../types';
 import { addPercentageColumn } from './add_percentage_column';
 
diff --git a/src/plugins/vis_types/table/public/utils/add_percentage_column.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
index e606baafccec4..519742a54203e 100644
--- a/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
+++ b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
@@ -8,7 +8,7 @@
 
 import { findIndex } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { DatatableColumn } from 'src/plugins/expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { getFormatService } from '../services';
 import { FormattedColumns, TableContext } from '../types';
 
diff --git a/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
index 59f6b4fdd808d..4992d2abfc005 100644
--- a/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
+++ b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
@@ -14,7 +14,7 @@ jest.mock('../services', () => ({
   })),
 }));
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { AggTypes } from '../../common';
 import { TableVisConfig } from '../types';
 import { createFormattedTable } from './create_formatted_table';
diff --git a/src/plugins/vis_types/table/public/utils/create_formatted_table.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
index a623e18e67a33..ccbcb0cbec199 100644
--- a/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
+++ b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
@@ -7,7 +7,7 @@
  */
 
 import { chain } from 'lodash';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { getFormatService } from '../services';
 import { FormattedColumn, FormattedColumns, TableVisConfig, TableContext } from '../types';
 import { AggTypes } from '../../common';
diff --git a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
index 0c4c4c08cce0c..72b482979b271 100644
--- a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
+++ b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
@@ -30,8 +30,8 @@ jest.mock('./add_percentage_column', () => ({
   })),
 }));
 
-import { Datatable } from 'src/plugins/expressions';
-import { ExpressionValueVisDimension } from 'src/plugins/visualizations/public';
+import { Datatable } from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { AggTypes } from '../../common';
 import { TableGroup, TableVisConfig } from '../types';
 import { addPercentageColumn } from './add_percentage_column';
diff --git a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
index 8769e811c6f6c..6a6400b3125f4 100644
--- a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
+++ b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { getFormatService } from '../services';
 import { TableVisData, TableGroup, TableVisConfig, TableContext } from '../types';
 import { addPercentageColumn } from './add_percentage_column';
diff --git a/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts b/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
index be1f9d3a10cf7..5d6d0594e8e62 100644
--- a/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
+++ b/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { act, renderHook } from '@testing-library/react-hooks';
-import type { PersistedState } from 'src/plugins/visualizations/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { TableVisUiState } from '../../types';
 import { useUiState } from './use_ui_state';
 
diff --git a/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts b/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
index 59df2c645cbc7..f0b9b09ec521a 100644
--- a/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
+++ b/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
@@ -8,7 +8,7 @@
 
 import { debounce, isEqual } from 'lodash';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import type { PersistedState } from 'src/plugins/visualizations/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 
 import { ColumnWidthData, TableVisUiState, TableVisUseUiStateProps } from '../../types';
 
diff --git a/src/plugins/vis_types/table/server/index.ts b/src/plugins/vis_types/table/server/index.ts
index 2f84e8daef450..0d1eade453f6c 100644
--- a/src/plugins/vis_types/table/server/index.ts
+++ b/src/plugins/vis_types/table/server/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, PluginConfigDescriptor } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CoreSetup, PluginConfigDescriptor } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { configSchema, ConfigSchema } from '../config';
 import { registerVisTypeTableUsageCollector } from './usage_collector';
diff --git a/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts b/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
index 85912aa4d5bdf..cba5bce0c5bbf 100644
--- a/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getStats } from './get_stats';
-import type { SavedObjectsClientContract } from '../../../../../core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const mockVisualizations = {
   saved_objects: [
diff --git a/src/plugins/vis_types/table/server/usage_collector/get_stats.ts b/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
index ac8d759c94c76..288a48a20cc81 100644
--- a/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { VIS_TYPE_TABLE } from '../../common';
-
 import type {
   ISavedObjectsRepository,
   SavedObjectsClientContract,
   SavedObjectsFindResult,
-} from '../../../../../core/server';
-import type { SavedVisState } from '../../../../visualizations/common';
+} from '@kbn/core/server';
+import type { SavedVisState } from '@kbn/visualizations-plugin/common';
+import { VIS_TYPE_TABLE } from '../../common';
 
 export interface VisTypeTableUsage {
   /**
diff --git a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
index b65c698f219a6..7d6c4e54ff8fd 100644
--- a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
@@ -9,7 +9,7 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerVisTypeTableUsageCollector } from './register_usage_collector';
 import { getStats } from './get_stats';
 
diff --git a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
index ed176fc9222bc..75cc7c0b11f1a 100644
--- a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getStats, VisTypeTableUsage } from './get_stats';
-import type { UsageCollectionSetup } from '../../../../usage_collection/server';
 
 export function registerVisTypeTableUsageCollector(collectorSet: UsageCollectionSetup) {
   const collector = collectorSet.makeUsageCollector<VisTypeTableUsage | undefined>({
diff --git a/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx b/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
index bb5af48bf0075..1cb504ec08d9e 100644
--- a/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
+++ b/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { TagCloudVisParams, TagCloudTypeProps } from '../types';
 
 const TagCloudOptionsLazy = lazy(() => import('./tag_cloud_options'));
diff --git a/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx b/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
index 870a05bcb9277..a5c23dc50319d 100644
--- a/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
+++ b/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
@@ -10,9 +10,9 @@ import React, { useState, useEffect } from 'react';
 import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { VisEditorOptionsProps } from '../../../../visualizations/public';
-import { SelectOption, SwitchOption, PalettePicker } from '../../../../vis_default_editor/public';
-import { ValidatedDualRange } from '../../../../kibana_react/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { SelectOption, SwitchOption, PalettePicker } from '@kbn/vis-default-editor-plugin/public';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { TagCloudVisParams, TagCloudTypeProps } from '../types';
 import { collections } from './collections';
 
diff --git a/src/plugins/vis_types/tagcloud/public/index.ts b/src/plugins/vis_types/tagcloud/public/index.ts
index a37da7fee9acf..6a471a5813d01 100644
--- a/src/plugins/vis_types/tagcloud/public/index.ts
+++ b/src/plugins/vis_types/tagcloud/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { TagCloudPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/tagcloud/public/plugin.ts b/src/plugins/vis_types/tagcloud/public/plugin.ts
index cc99480de7099..8d9dbdedc7fe3 100644
--- a/src/plugins/vis_types/tagcloud/public/plugin.ts
+++ b/src/plugins/vis_types/tagcloud/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 import { getTagCloudVisTypeDefinition } from './tag_cloud_type';
 import { ConfigSchema } from '../config';
diff --git a/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts b/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
index daad73c082980..b29ffac33121c 100644
--- a/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
+++ b/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AggGroupNames } from '../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
 import { getTagCloudOptions } from './components/get_tag_cloud_options';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_types/tagcloud/public/to_ast.test.ts b/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
index 789acda46ec5e..2c3fcc5799742 100644
--- a/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
+++ b/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis, VisToExpressionAstParams } from '../../../visualizations/public';
+import { Vis, VisToExpressionAstParams } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { TagCloudVisParams } from './types';
 
@@ -30,7 +30,7 @@ const mockedSchemas = {
   ],
 };
 
-jest.mock('../../../visualizations/public', () => ({
+jest.mock('@kbn/visualizations-plugin/public', () => ({
   getVisSchemas: () => mockedSchemas,
 }));
 
diff --git a/src/plugins/vis_types/tagcloud/public/to_ast.ts b/src/plugins/vis_types/tagcloud/public/to_ast.ts
index c66660e78a78a..78461475a3d3d 100644
--- a/src/plugins/vis_types/tagcloud/public/to_ast.ts
+++ b/src/plugins/vis_types/tagcloud/public/to_ast.ts
@@ -10,9 +10,9 @@ import type { PaletteOutput } from '@kbn/coloring';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { TagCloudVisParams } from './types';
 
 const prepareDimension = (params: SchemaConfig) => {
diff --git a/src/plugins/vis_types/tagcloud/public/types.ts b/src/plugins/vis_types/tagcloud/public/types.ts
index e3c5c057a3405..5fc177cceb191 100644
--- a/src/plugins/vis_types/tagcloud/public/types.ts
+++ b/src/plugins/vis_types/tagcloud/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { PaletteOutput } from '@kbn/coloring';
-import type { ChartsPluginSetup } from '../../../charts/public';
-import { ExpressionValueVisDimension } from '../../../visualizations/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 
 interface TagCloudCommonParams {
   scale: 'linear' | 'log' | 'square root';
diff --git a/src/plugins/vis_types/tagcloud/server/index.ts b/src/plugins/vis_types/tagcloud/server/index.ts
index a14a44b6caa80..db7446c9ef81a 100644
--- a/src/plugins/vis_types/tagcloud/server/index.ts
+++ b/src/plugins/vis_types/tagcloud/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/timelion/common/parser_async.ts b/src/plugins/vis_types/timelion/common/parser_async.ts
index 8d52c4f2132c3..e8dd2e3fd0a50 100644
--- a/src/plugins/vis_types/timelion/common/parser_async.ts
+++ b/src/plugins/vis_types/timelion/common/parser_async.ts
@@ -10,6 +10,6 @@ import { ParsedExpression } from './parser';
 
 /** Build optimizations, we want to exclude the parser from the main bundle **/
 export const parseTimelionExpressionAsync = async (input: string): Promise<ParsedExpression> => {
-  const { parseTimelionExpression } = await import('../common/parser');
+  const { parseTimelionExpression } = await import('./parser');
   return parseTimelionExpression(input);
 };
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx b/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
index 597d1a10dd051..8d1d5285e2989 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
@@ -11,7 +11,7 @@ import { EuiFormLabel } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { monaco } from '@kbn/monaco';
 
-import { CodeEditor, useKibana } from '../../../../kibana_react/public';
+import { CodeEditor, useKibana } from '@kbn/kibana-react-plugin/public';
 import { suggest, getSuggestion } from './timelion_expression_input_helpers';
 import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
 import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts b/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
index 701da1d6a6fb7..cc274d411b2ea 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
+++ b/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
@@ -9,7 +9,7 @@
 import { SUGGESTION_TYPE, suggest } from './timelion_expression_input_helpers';
 import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
 import { setIndexPatterns } from '../helpers/plugin_services';
-import { DataViewsContract } from 'src/plugins/data_views/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { ITimelionFunction } from '../../common/types';
 
 describe('Timelion expression suggestions', () => {
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx b/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
index fc080ff578bee..b513896b54dba 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
@@ -10,9 +10,9 @@ import React, { useMemo, useCallback } from 'react';
 import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 const { isValidEsInterval } = search.aggs;
-import { useValidation } from '../../../../vis_default_editor/public';
+import { useValidation } from '@kbn/vis-default-editor-plugin/public';
 
 const intervalOptions = [
   {
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
index 401c26cdb8b37..8137d8defd18c 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
@@ -20,9 +20,10 @@ import {
 import { EuiTitle } from '@elastic/eui';
 import { RangeFilterParams } from '@kbn/es-query';
 
-import { useKibana } from '../../../../kibana_react/public';
-import { useActiveCursor } from '../../../../charts/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useActiveCursor } from '@kbn/charts-plugin/public';
 
+import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { AreaSeriesComponent, BarSeriesComponent } from './series';
 
 import {
@@ -37,7 +38,6 @@ import { colors } from '../helpers/chart_constants';
 import { getCharts, getFieldFormats } from '../helpers/plugin_services';
 
 import type { Series, Sheet } from '../helpers/timelion_request_handler';
-import type { IInterpreterRenderHandlers } from '../../../../expressions';
 import type { TimelionVisDependencies } from '../plugin';
 
 import './timelion_vis.scss';
diff --git a/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts b/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
index 494135280343e..31e4cdaf176c3 100644
--- a/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
@@ -7,11 +7,11 @@
  */
 
 import { get } from 'lodash';
-import { isNestedField } from '../../../..//data_views/common';
+import { isNestedField } from '@kbn/data-views-plugin/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getIndexPatterns } from './plugin_services';
 import { TimelionFunctionArgs } from '../../common/types';
 import { TimelionExpressionFunction, TimelionExpressionArgument } from '../../common/parser';
-import { KBN_FIELD_TYPES } from '../../../../data/public';
 
 export function getArgValueSuggestions() {
   const indexPatterns = getIndexPatterns();
diff --git a/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts b/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
index 9f3b3d6512058..44fc531e77b78 100644
--- a/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 export function getTimezone(config: IUiSettingsClient) {
   if (config.isDefault('dateFormat:tz')) {
diff --git a/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts b/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
index 80078d9e2672e..d2bc0a2fb32fb 100644
--- a/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
@@ -8,8 +8,8 @@
 
 import moment from 'moment-timezone';
 import { Position, AxisSpec } from '@elastic/charts';
-import type { TimefilterContract } from 'src/plugins/data/public';
-import type { IUiSettingsClient } from 'kibana/public';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 
 import { calculateInterval } from '../../common/lib';
 import { xaxisFormatterProvider } from './xaxis_formatter';
diff --git a/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts b/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
index 811004bfe1933..2ba22f6bf3cb8 100644
--- a/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import type { ISearchStart } from 'src/plugins/data/public';
-import type { DataViewsContract } from 'src/plugins/data_views/public';
-import type { ChartsPluginStart } from 'src/plugins/charts/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { createGetterSetter } from '../../../../kibana_utils/public';
+import type { ISearchStart } from '@kbn/data-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getIndexPatterns, setIndexPatterns] =
   createGetterSetter<DataViewsContract>('dataViews');
diff --git a/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
index a8807cfe87b8a..b31de9e7c9383 100644
--- a/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
@@ -7,14 +7,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { KibanaExecutionContext } from 'kibana/public';
-import { DataView } from 'src/plugins/data/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { DataView } from '@kbn/data-plugin/common';
 import { Filter, buildEsQuery } from '@kbn/es-query';
-import { KibanaContext, TimeRange, Query, getEsQueryConfig } from '../../../../data/public';
+import { KibanaContext, TimeRange, Query, getEsQueryConfig } from '@kbn/data-plugin/public';
 import { TimelionVisDependencies } from '../plugin';
 import { getTimezone } from './get_timezone';
 import { TimelionVisParams } from '../timelion_vis_fn';
-import { getDataSearch, getIndexPatterns } from '../helpers/plugin_services';
+import { getDataSearch, getIndexPatterns } from './plugin_services';
 import { VisSeries } from '../../common/vis_data';
 
 interface Stats {
diff --git a/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts b/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
index 204d842cc37a0..d2eac375214b0 100644
--- a/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 export function xaxisFormatterProvider(config: IUiSettingsClient) {
   function getFormat(esInterval: any) {
diff --git a/src/plugins/vis_types/timelion/public/index.ts b/src/plugins/vis_types/timelion/public/index.ts
index 960eda3dc558f..21cbd23ef8bb1 100644
--- a/src/plugins/vis_types/timelion/public/index.ts
+++ b/src/plugins/vis_types/timelion/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { TimelionVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts b/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
index 5dd8431a5a2ab..50682a901030f 100644
--- a/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
+++ b/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
@@ -10,8 +10,8 @@ import { cloneDeep, defaults, mergeWith, compact } from 'lodash';
 import $ from 'jquery';
 import moment, { Moment } from 'moment-timezone';
 
-import { TimefilterContract } from 'src/plugins/data/public';
-import { IUiSettingsClient } from 'kibana/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 import { calculateInterval } from '../../common/lib';
 import { xaxisFormatterProvider } from '../helpers/xaxis_formatter';
diff --git a/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
index edb250dfe1200..30497f39da35f 100644
--- a/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
+++ b/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
@@ -13,8 +13,8 @@ import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash';
 import { useResizeObserver } from '@elastic/eui';
 import { RangeFilterParams } from '@kbn/es-query';
 
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { useKibana } from '../../../../kibana_react/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DEFAULT_TIME_FORMAT } from '../../common/lib';
 
 import {
diff --git a/src/plugins/vis_types/timelion/public/plugin.ts b/src/plugins/vis_types/timelion/public/plugin.ts
index 1e94c7c28bb42..eadacdd21d152 100644
--- a/src/plugins/vis_types/timelion/public/plugin.ts
+++ b/src/plugins/vis_types/timelion/public/plugin.ts
@@ -14,18 +14,18 @@ import type {
   IUiSettingsClient,
   HttpSetup,
   ThemeServiceStart,
-} from 'kibana/public';
-import type { Plugin as ExpressionsPlugin } from 'src/plugins/expressions/public';
+} from '@kbn/core/public';
+import type { Plugin as ExpressionsPlugin } from '@kbn/expressions-plugin/public';
 import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
   TimefilterContract,
-} from 'src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import type { VisualizationsSetup } from 'src/plugins/visualizations/public';
-import type { ChartsPluginSetup, ChartsPluginStart } from 'src/plugins/charts/public';
+} from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import type { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
 
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { getTimelionVisualizationConfig } from './timelion_vis_fn';
 import { getTimelionVisDefinition } from './timelion_vis_type';
 import {
diff --git a/src/plugins/vis_types/timelion/public/timelion_options.tsx b/src/plugins/vis_types/timelion/public/timelion_options.tsx
index 7879eb88e0bd2..d3b95c291bf56 100644
--- a/src/plugins/vis_types/timelion/public/timelion_options.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_options.tsx
@@ -9,8 +9,8 @@
 import React, { useCallback } from 'react';
 import { EuiPanel } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import { TimelionVisParams } from './timelion_vis_fn';
 import { TimelionInterval, TimelionExpressionInput } from './components';
diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts b/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
index 4bb195312f3b7..a7afb338c8edc 100644
--- a/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
@@ -9,11 +9,11 @@
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
-import { ExpressionFunctionDefinition, Render } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
+import { KibanaContext, Query, TimeRange } from '@kbn/data-plugin/public';
 import { TimelionSuccessResponse } from './helpers/timelion_request_handler';
 import { TIMELION_VIS_NAME } from './timelion_vis_type';
 import { TimelionVisDependencies } from './plugin';
-import { KibanaContext, Query, TimeRange } from '../../../data/public';
 
 type Input = KibanaContext | null;
 type Output = Promise<Render<TimelionRenderValue>>;
diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
index e865c3c8d7fb2..5e2c40d51217c 100644
--- a/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
@@ -9,10 +9,10 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import { RangeFilterParams } from '@kbn/es-query';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
-import { VisualizationContainer } from '../../../visualizations/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
 import { TimelionVisDependencies } from './plugin';
 import { TimelionRenderValue } from './timelion_vis_fn';
 import { UI_SETTINGS } from '../common/constants';
diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
index 3462ae8df5cd5..cac1f127e11c9 100644
--- a/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
@@ -9,7 +9,8 @@
 import React, { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { DefaultEditorSize } from '../../../vis_default_editor/public';
+import { DefaultEditorSize } from '@kbn/vis-default-editor-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisParams } from '@kbn/visualizations-plugin/public';
 import { TimelionOptionsProps } from './timelion_options';
 import { TimelionVisDependencies } from './plugin';
 import { toExpressionAst } from './to_ast';
@@ -17,8 +18,6 @@ import { getIndexPatterns } from './helpers/plugin_services';
 
 import { parseTimelionExpressionAsync } from '../common/parser_async';
 
-import { VIS_EVENT_TO_TRIGGER, VisParams } from '../../../visualizations/public';
-
 const TimelionOptions = lazy(() => import('./timelion_options'));
 
 export const TIMELION_VIS_NAME = 'timelion';
diff --git a/src/plugins/vis_types/timelion/public/to_ast.test.ts b/src/plugins/vis_types/timelion/public/to_ast.test.ts
index 44955a399770f..d4a31dd40804e 100644
--- a/src/plugins/vis_types/timelion/public/to_ast.test.ts
+++ b/src/plugins/vis_types/timelion/public/to_ast.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { TimelionVisParams } from './timelion_vis_fn';
 import { toExpressionAst } from './to_ast';
 
diff --git a/src/plugins/vis_types/timelion/public/to_ast.ts b/src/plugins/vis_types/timelion/public/to_ast.ts
index cf0a24a0e3d3e..feb1f27e5bb76 100644
--- a/src/plugins/vis_types/timelion/public/to_ast.ts
+++ b/src/plugins/vis_types/timelion/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { TimelionExpressionFunctionDefinition, TimelionVisParams } from './timelion_vis_fn';
 
 export const toExpressionAst = (vis: Vis<TimelionVisParams>) => {
diff --git a/src/plugins/vis_types/timelion/server/handlers/chain_runner.js b/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
index fac1a68acc907..3abab865d0123 100644
--- a/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
+++ b/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
@@ -10,10 +10,10 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 
-import parseSheet from './lib/parse_sheet.js';
-import repositionArguments from './lib/reposition_arguments.js';
-import indexArguments from './lib/index_arguments.js';
-import validateTime from './lib/validate_time.js';
+import parseSheet from './lib/parse_sheet';
+import repositionArguments from './lib/reposition_arguments';
+import indexArguments from './lib/index_arguments';
+import validateTime from './lib/validate_time';
 import { calculateInterval } from '../../common/lib';
 
 export default function chainRunner(tlConfig) {
diff --git a/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js b/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
index a2aa844a1edc4..87d08b0b0a3eb 100644
--- a/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
+++ b/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import buildTarget from '../../lib/build_target.js';
+import buildTarget from '../../lib/build_target';
 
 export default function tlConfigFn(setup) {
   let targetSeries;
diff --git a/src/plugins/vis_types/timelion/server/index.ts b/src/plugins/vis_types/timelion/server/index.ts
index 4bf47dff7076d..771ac24120cd7 100644
--- a/src/plugins/vis_types/timelion/server/index.ts
+++ b/src/plugins/vis_types/timelion/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { TimelionPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/timelion/server/lib/as_sorted.js b/src/plugins/vis_types/timelion/server/lib/as_sorted.js
index 1947b18439d86..a50da88f38b89 100644
--- a/src/plugins/vis_types/timelion/server/lib/as_sorted.js
+++ b/src/plugins/vis_types/timelion/server/lib/as_sorted.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import unzipPairs from './unzip_pairs.js';
+import unzipPairs from './unzip_pairs';
 
 export default function asSorted(timeValObject, fn) {
   const data = unzipPairs(timeValObject);
diff --git a/src/plugins/vis_types/timelion/server/lib/build_target.js b/src/plugins/vis_types/timelion/server/lib/build_target.js
index d332bec977089..b7967bbb48e41 100644
--- a/src/plugins/vis_types/timelion/server/lib/build_target.js
+++ b/src/plugins/vis_types/timelion/server/lib/build_target.js
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import splitInterval from './split_interval.js';
+import splitInterval from './split_interval';
 
 export default function (tlConfig) {
   const min = moment(tlConfig.time.from);
diff --git a/src/plugins/vis_types/timelion/server/lib/classes/datasource.js b/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
index 50129494bf84c..f3f03b40c441b 100644
--- a/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
+++ b/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import loadFunctions from '../load_functions.js';
+import loadFunctions from '../load_functions';
 const fitFunctions = loadFunctions('fit_functions');
 import TimelionFunction from './timelion_function';
 import { offsetTime, preprocessOffset } from '../offset_time';
diff --git a/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js b/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
index 0abef484bbf14..7a50b7aded903 100644
--- a/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
+++ b/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import loadFunctions from '../load_functions.js';
+import loadFunctions from '../load_functions';
 const fitFunctions = loadFunctions('fit_functions');
 
 export default class TimelionFunction {
diff --git a/src/plugins/vis_types/timelion/server/lib/config_manager.ts b/src/plugins/vis_types/timelion/server/lib/config_manager.ts
index 3ab60b0afaaed..2de5469fb313c 100644
--- a/src/plugins/vis_types/timelion/server/lib/config_manager.ts
+++ b/src/plugins/vis_types/timelion/server/lib/config_manager.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 export class ConfigManager {
   private esShardTimeout: number = 0;
diff --git a/src/plugins/vis_types/timelion/server/lib/functions_md.js b/src/plugins/vis_types/timelion/server/lib/functions_md.js
index aeed4f02fc996..2dcd185c8182c 100644
--- a/src/plugins/vis_types/timelion/server/lib/functions_md.js
+++ b/src/plugins/vis_types/timelion/server/lib/functions_md.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import loadFunctions from './load_functions.js';
+import loadFunctions from './load_functions';
 const functions = loadFunctions('series_functions/');
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/lib/load_functions.test.js b/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
index 1508670523733..5fafaf02d774e 100644
--- a/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
+++ b/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const fn = require(`src/plugins/vis_types/timelion/server/lib/load_functions`);
+const fn = require('./load_functions');
 
 const expect = require('chai').expect;
 
diff --git a/src/plugins/vis_types/timelion/server/plugin.ts b/src/plugins/vis_types/timelion/server/plugin.ts
index f6d31033c1ff5..f3f9f1c7deadc 100644
--- a/src/plugins/vis_types/timelion/server/plugin.ts
+++ b/src/plugins/vis_types/timelion/server/plugin.ts
@@ -8,12 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type {
-  PluginStart,
-  DataRequestHandlerContext,
-} from '../../../../../src/plugins/data/server';
-import type { PluginStart as DataViewPluginStart } from '../../../../../src/plugins/data_views/server';
-import { CoreSetup, PluginInitializerContext, Plugin } from '../../../../../src/core/server';
+import type { PluginStart, DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { PluginStart as DataViewPluginStart } from '@kbn/data-views-plugin/server';
+import { CoreSetup, PluginInitializerContext, Plugin } from '@kbn/core/server';
 import loadFunctions from './lib/load_functions';
 import { functionsRoute } from './routes/functions';
 import { runRoute } from './routes/run';
diff --git a/src/plugins/vis_types/timelion/server/routes/functions.ts b/src/plugins/vis_types/timelion/server/routes/functions.ts
index ea33e639bac30..8fadb0d834542 100644
--- a/src/plugins/vis_types/timelion/server/routes/functions.ts
+++ b/src/plugins/vis_types/timelion/server/routes/functions.ts
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { LoadFunctions } from '../lib/load_functions';
 
 export function functionsRoute(router: IRouter, { functions }: { functions: LoadFunctions }) {
diff --git a/src/plugins/vis_types/timelion/server/routes/run.ts b/src/plugins/vis_types/timelion/server/routes/run.ts
index bf829fe708854..e136f1ab5a241 100644
--- a/src/plugins/vis_types/timelion/server/routes/run.ts
+++ b/src/plugins/vis_types/timelion/server/routes/run.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, Logger, CoreSetup } from 'kibana/server';
+import { IRouter, Logger, CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import _ from 'lodash';
 // @ts-ignore
-import chainRunnerFn from '../handlers/chain_runner.js';
+import chainRunnerFn from '../handlers/chain_runner';
 // @ts-ignore
 import getNamespacesSettings from '../lib/get_namespaced_settings';
 // @ts-ignore
@@ -77,10 +77,11 @@ export function runRoute(
     },
     router.handleLegacyErrors(async (context, request, response) => {
       const [, { dataViews }] = await core.getStartServices();
-      const uiSettings = await context.core.uiSettings.client.getAll();
+      const coreCtx = await context.core;
+      const uiSettings = await coreCtx.uiSettings.client.getAll();
       const indexPatternsService = await dataViews.dataViewsServiceFactory(
-        context.core.savedObjects.client,
-        context.core.elasticsearch.client.asCurrentUser
+        coreCtx.savedObjects.client,
+        coreCtx.elasticsearch.client.asCurrentUser
       );
 
       const tlConfig = getTlConfig({
diff --git a/src/plugins/vis_types/timelion/server/series_functions/abs.js b/src/plugins/vis_types/timelion/server/series_functions/abs.js
index 0b1bab3389858..6a279a7f7ad9e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/abs.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/abs.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/abs.test.js b/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
index 77bc6f0f19233..80e914383f73a 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
@@ -10,8 +10,8 @@ import fn from './abs';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-const seriesList = require('./fixtures/series_list.js')();
-import invoke from './helpers/invoke_series_fn.js';
+const seriesList = require('./fixtures/series_list')();
+import invoke from './helpers/invoke_series_fn';
 
 describe('abs.js', function () {
   it('should return the positive value of every value', function () {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
index ea874c725f1fa..f2a0bcf8eab73 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import fn from './index';
+import fn from '.';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from '../helpers/invoke_series_fn.js';
+import invoke from '../helpers/invoke_series_fn';
 
 describe('aggregate', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('../fixtures/series_list.js')();
+    seriesList = require('../fixtures/series_list')();
   });
 
   it('first', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
index 746af7994f0b3..de40b2f0e88db 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../../lib/alter.js';
+import alter from '../../lib/alter';
 import Chainable from '../../lib/classes/chainable';
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/bars.js b/src/plugins/vis_types/timelion/server/series_functions/bars.js
index 729df7b160d2f..2b4a53e816b23 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/bars.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/bars.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('bars', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/bars.test.js b/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
index 09a13ae02b26f..9504489ac8f5c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
@@ -10,12 +10,12 @@ import fn from './bars';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('bars.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('creates the bars property, with defaults, on all series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/color.js b/src/plugins/vis_types/timelion/server/series_functions/color.js
index fd93a0e0e03c1..080a223bcf60d 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/color.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/color.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 import tinygradient from 'tinygradient';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/color.test.js b/src/plugins/vis_types/timelion/server/series_functions/color.test.js
index 87dfa35f96f48..00f5e2819d065 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/color.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/color.test.js
@@ -10,12 +10,12 @@ import fn from './color';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('color.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('sets the color, on all series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/condition.js b/src/plugins/vis_types/timelion/server/series_functions/condition.js
index d4ed81b35cb06..0bebddc9498a2 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/condition.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/condition.js
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
-import argType from '../handlers/lib/arg_type.js';
+import argType from '../handlers/lib/arg_type';
 
 export default new Chainable('condition', {
   args: [
diff --git a/src/plugins/vis_types/timelion/server/series_functions/condition.test.js b/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
index d69b4b73205e7..4e84f59faa2cf 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
@@ -9,7 +9,7 @@
 import fn from './condition';
 import moment from 'moment';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 import getSeriesList from './helpers/get_single_series_list';
 import _ from 'lodash';
 
@@ -17,7 +17,7 @@ describe('condition.js', function () {
   let comparable;
   let seriesList;
   beforeEach(function () {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
     comparable = getSeriesList('', [
       [moment.utc('1980-01-01T00:00:00.000Z'), 12],
       [moment.utc('1981-01-01T00:00:00.000Z'), 33],
diff --git a/src/plugins/vis_types/timelion/server/series_functions/cusum.js b/src/plugins/vis_types/timelion/server/series_functions/cusum.js
index ecd61ee250847..7f8a2b554bada 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/cusum.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/cusum.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js b/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
index 70022da8ab4d7..6a791f33ea391 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
@@ -10,12 +10,12 @@ import fn from './cusum';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('cusum.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('progressively adds the numbers in the list', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/derivative.js b/src/plugins/vis_types/timelion/server/series_functions/derivative.js
index ba7493a108e26..f6d4c3fc424b4 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/derivative.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/derivative.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js b/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
index f720b15110fd2..e729b21652478 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
@@ -10,12 +10,12 @@ import fn from './derivative';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('derivative.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('gets the change in the set', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/divide.js b/src/plugins/vis_types/timelion/server/series_functions/divide.js
index 3fcd1ded41af2..b2104ad3fce04 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/divide.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/divide.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('divide', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/divide.test.js b/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
index aa9e5b03eeded..a651901478369 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
@@ -10,12 +10,12 @@ import fn from './divide';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('divide.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('divides by a single number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js b/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
index 6f718a6ec8e16..6d58158acb322 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
@@ -7,7 +7,7 @@
  */
 
 import { of } from 'rxjs';
-import es from './index';
+import es from '.';
 import tlConfigFn from '../fixtures/tl_config';
 import * as aggResponse from './lib/agg_response_to_series_list';
 import buildRequest from './lib/build_request';
@@ -16,8 +16,8 @@ import esResponse from '../fixtures/es_response';
 
 import _ from 'lodash';
 import sinon from 'sinon';
-import invoke from '../helpers/invoke_series_fn.js';
-import { UI_SETTINGS } from '../../../../../data/server';
+import invoke from '../helpers/invoke_series_fn';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 
 describe('es', () => {
   let tlConfig;
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/index.js b/src/plugins/vis_types/timelion/server/series_functions/es/index.js
index a86ee64f00568..2001a39bf7901 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/index.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/index.js
@@ -117,7 +117,8 @@ export default new Datasource('es', {
     // we need to handle this scenario by aborting underlying server requests
     const abortSignal = getRequestAbortedSignal(tlConfig.request.events.aborted$);
 
-    const resp = await tlConfig.context.search
+    const searchContext = await tlConfig.context.search;
+    const resp = await searchContext
       .search(
         body,
         {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
index 99b5d0bacd858..2a69e87589aeb 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
@@ -10,7 +10,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import { buildAggBody } from './agg_body';
 import createDateAgg from './create_date_agg';
-import { UI_SETTINGS } from '../../../../../../data/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 
 export default function buildRequest(config, tlConfig, scriptFields, runtimeFields, timeout) {
   const bool = { must: [] };
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
index e12ad035a2b61..a80c4888f9479 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
@@ -7,7 +7,7 @@
  */
 
 import { buildAggBody } from './agg_body';
-import { search, METRIC_TYPES } from '../../../../../../data/server';
+import { search, METRIC_TYPES } from '@kbn/data-plugin/server';
 
 const { dateHistogramInterval } = search.aggs;
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/first.js b/src/plugins/vis_types/timelion/server/series_functions/first.js
index 51e47274ef3e5..9e309a7f3f81e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/first.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/first.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('first', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/first.test.js b/src/plugins/vis_types/timelion/server/series_functions/first.test.js
index f070f6f96e0c7..b95581860c8f5 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/first.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/first.test.js
@@ -9,8 +9,8 @@
 import fn from './first';
 
 const expect = require('chai').expect;
-const seriesList = require('./fixtures/series_list.js')();
-import invoke from './helpers/invoke_series_fn.js';
+const seriesList = require('./fixtures/series_list')();
+import invoke from './helpers/invoke_series_fn';
 
 describe('first.js', function () {
   it('should return exactly the data input', function () {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/fit.js b/src/plugins/vis_types/timelion/server/series_functions/fit.js
index 69ec31f829499..e53ab6255e0c4 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/fit.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fit.js
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
-import loadFunctions from '../lib/load_functions.js';
+import loadFunctions from '../lib/load_functions';
 const fitFunctions = loadFunctions('fit_functions');
 
 export default new Chainable('fit', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/fit.test.js b/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
index b755a3f80e338..20c18204fa2d8 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-const fn = require(`src/plugins/vis_types/timelion/server/series_functions/fit`);
+const fn = require('./fit');
 import moment from 'moment';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 import getSeriesList from './helpers/get_single_series_list';
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js b/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
index f3eb378095fc7..6c344d3abf3a0 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
@@ -14,7 +14,7 @@ import esResponse from './es_response';
 export default function () {
   const functions = require('../../lib/load_functions')('series_functions');
 
-  const tlConfig = require('../../handlers/lib/tl_config.js')({
+  const tlConfig = require('../../handlers/lib/tl_config')({
     getFunction: (name) => {
       if (!functions[name]) throw new Error('No such function: ' + name);
       return functions[name];
diff --git a/src/plugins/vis_types/timelion/server/series_functions/hide.js b/src/plugins/vis_types/timelion/server/series_functions/hide.js
index 4f445ca91e21e..b309f1eba05d1 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/hide.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/hide.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('hide', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/hide.test.js b/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
index c0778186af7fc..d189832245610 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
@@ -10,12 +10,12 @@ import fn from './hide';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('hide.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('hides a series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/label.js b/src/plugins/vis_types/timelion/server/series_functions/label.js
index 30a5c626251d1..a0e6f8ef3cb3b 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/label.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/label.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('label', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/label.test.js b/src/plugins/vis_types/timelion/server/series_functions/label.test.js
index 0f1eff24cb27c..cb763036bbc3c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/label.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/label.test.js
@@ -10,12 +10,12 @@ import fn from './label';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('label.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('changes the label on the series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/legend.js b/src/plugins/vis_types/timelion/server/series_functions/legend.js
index 7fe4889936c03..2efd489c362e0 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/legend.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/legend.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 import { DEFAULT_TIME_FORMAT } from '../../common/lib';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/legend.test.js b/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
index aa60b63d49bc7..ec77767565430 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
@@ -9,12 +9,12 @@
 import fn from './legend';
 
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('legend.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should create the _global object if it does not exist', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/lines.js b/src/plugins/vis_types/timelion/server/series_functions/lines.js
index 2479de0e2914a..555e62ebf4aab 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/lines.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/lines.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('lines', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/lines.test.js b/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
index 64f6bd9d65f6c..3c10fcc75b0bc 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
@@ -9,12 +9,12 @@
 import fn from './lines';
 
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('lines.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should simply set show, steps, stack and lineWidth', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/log.js b/src/plugins/vis_types/timelion/server/series_functions/log.js
index ec5d687335dfa..b3b04d0824d98 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/log.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/log.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/log.test.js b/src/plugins/vis_types/timelion/server/series_functions/log.test.js
index da0f5bb31a2bf..681d4cc5617ef 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/log.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/log.test.js
@@ -10,12 +10,12 @@ import fn from './log';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('log.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should return the log10 value of every value', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/max.js b/src/plugins/vis_types/timelion/server/series_functions/max.js
index be31e651b12d4..e598abeb8f5f8 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/max.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/max.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('max', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/max.test.js b/src/plugins/vis_types/timelion/server/series_functions/max.test.js
index 7211cabbef180..e3161909590e2 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/max.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/max.test.js
@@ -10,12 +10,12 @@ import fn from './max';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('max.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('keeps the max of a series vs a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/min.js b/src/plugins/vis_types/timelion/server/series_functions/min.js
index 2382f8cd96bc3..ed9fed9dd5248 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/min.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/min.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('min', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/min.test.js b/src/plugins/vis_types/timelion/server/series_functions/min.test.js
index 07c5bd3d018d4..eb7ddd5964408 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/min.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/min.test.js
@@ -10,12 +10,12 @@ import fn from './min';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('min.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('keeps the min of a series vs a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
index 5d017909a784d..cba15e4fb0495 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 import { toMS } from '../../common/lib/to_milliseconds';
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
index 6a5b62497ec68..843da98979e98 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
@@ -14,7 +14,7 @@ import _ from 'lodash';
 import buckets from './fixtures/bucket_list';
 import getSeries from './helpers/get_series';
 import getSeriesList from './helpers/get_series_list';
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 function getFivePointSeries() {
   return getSeriesList([
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingstd.js b/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
index 90ddf6c26a9b7..c52f2162f0d2e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js b/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
index 3c91cc4ec05b9..a0246cf7a79bb 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
@@ -10,7 +10,7 @@ import fn from './movingstd';
 
 import moment from 'moment';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 import getSeries from './helpers/get_series';
 import getSeriesList from './helpers/get_series_list';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/multiply.js b/src/plugins/vis_types/timelion/server/series_functions/multiply.js
index 8e07676a32be4..1eb717f6091c5 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/multiply.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/multiply.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('multiply', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js b/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
index c0755dc6ed120..8f21a9301673e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
@@ -10,12 +10,12 @@ import fn from './multiply';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('multiply.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('multiplies by a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/points.js b/src/plugins/vis_types/timelion/server/series_functions/points.js
index 2c0f184c7ccae..908ecea8cdfa1 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/points.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/points.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/points.test.js b/src/plugins/vis_types/timelion/server/series_functions/points.test.js
index e510ac7361493..80148c45a4d2e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/points.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/points.test.js
@@ -11,12 +11,12 @@ import fn from './points';
 import _ from 'lodash';
 import assert from 'chai';
 const expect = assert.expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('points.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should set the point radius', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/precision.js b/src/plugins/vis_types/timelion/server/series_functions/precision.js
index b22b6cedddae3..b55c23851f20c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/precision.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/precision.js
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
-import alter from '../lib/alter.js';
+import reduce from '../lib/reduce';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('precision', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/precision.test.js b/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
index 7a06aa221f269..1e09925cfb83c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
@@ -10,12 +10,12 @@ import fn from './precision';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('precision.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('keeps the min of a series vs a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/props.js b/src/plugins/vis_types/timelion/server/series_functions/props.js
index 58cc06f149048..938c7e470bb55 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/props.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/props.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/range.js b/src/plugins/vis_types/timelion/server/series_functions/range.js
index 36d7fc1b21446..7411c4ec6dd3c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/range.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/range.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/range.test.js b/src/plugins/vis_types/timelion/server/series_functions/range.test.js
index 5acad54fc8b24..486cef637cb28 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/range.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/range.test.js
@@ -10,12 +10,12 @@ import fn from './range';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('range.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
     seriesList.list[0].data = [
       [1000, 20],
       [2000, 10],
diff --git a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
index a823ae860c6d9..b459355d65cb4 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import { toMS } from '../../common/lib/to_milliseconds';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
diff --git a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
index 4f081e7027a5e..872dfc89e4bfe 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
@@ -10,12 +10,12 @@ import fn from './scale_interval';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('scale_interval.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('Can multiply to transform one interval to another', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/static.test.js b/src/plugins/vis_types/timelion/server/series_functions/static.test.js
index 8294d84e81e5a..89f4a9404c478 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/static.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/static.test.js
@@ -10,7 +10,7 @@ import fn from './static';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('static.js', () => {
   it('returns a series in which all numbers are the same', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/subtract.js b/src/plugins/vis_types/timelion/server/series_functions/subtract.js
index b8b49d10d60fc..314996cbdc0fc 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/subtract.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/subtract.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('subtract', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js b/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
index a452365164126..0f40688d53518 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
@@ -10,12 +10,12 @@ import fn from './subtract';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('subtract.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('it throws an error if first argument is not seriesList', async () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/sum.js b/src/plugins/vis_types/timelion/server/series_functions/sum.js
index 3927551eff2f5..ea2ec7dcb9de5 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/sum.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/sum.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('sum', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/sum.test.js b/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
index efed2df3b30c5..179e2faa7cfe7 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
@@ -10,12 +10,12 @@ import fn from './sum';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('sum.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('it adds a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/title.js b/src/plugins/vis_types/timelion/server/series_functions/title.js
index 8443c3892b6ee..2f45635e2cf28 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/title.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/title.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('title', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/title.test.js b/src/plugins/vis_types/timelion/server/series_functions/title.test.js
index fc1ac042556e1..653c833575665 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/title.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/title.test.js
@@ -10,12 +10,12 @@ import fn from './title';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('title.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('sets the title property', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/trim.js b/src/plugins/vis_types/timelion/server/series_functions/trim.js
index ab24c43b965c6..7e8587883f096 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/trim.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/trim.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/trim.test.js b/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
index 201fed167dff3..6158c0dbabdd6 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
@@ -10,12 +10,12 @@ import fn from './trim';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('trim.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('Sets the first and last values to null by default', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js b/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
index c2eb07890a102..344e5a47fafde 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import worldbank from './worldbank.js';
+import worldbank from './worldbank';
 import Datasource from '../lib/classes/datasource';
 
 export default new Datasource('worldbank_indicators', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/yaxis.js b/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
index b33ee592d7a8d..46ed7e18b0ea7 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 const tickFormatters = {
   bits: 'bits',
diff --git a/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js b/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
index d68aa7ac70117..74e8966bfd7cb 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
@@ -8,12 +8,12 @@
 
 import fn from './yaxis';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('yaxis.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('creates the yaxes array', () => {
diff --git a/src/plugins/vis_types/timelion/server/ui_settings.ts b/src/plugins/vis_types/timelion/server/ui_settings.ts
index 30c170b135da8..e57c5142b9ea6 100644
--- a/src/plugins/vis_types/timelion/server/ui_settings.ts
+++ b/src/plugins/vis_types/timelion/server/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import type { UiSettingsParams } from 'kibana/server';
+import type { UiSettingsParams } from '@kbn/core/server';
 
 import { UI_SETTINGS } from '../common/constants';
 
@@ -23,8 +23,7 @@ export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
       }),
       deprecation: {
         message: i18n.translate('timelion.uiSettings.legacyChartsLibraryDeprication', {
-          defaultMessage:
-            'This setting is deprecated and will not be supported in a future version.',
+          defaultMessage: 'This setting is deprecated and will not be supported as of 8.4.',
         }),
         docLinksKey: 'timelionSettings',
       },
diff --git a/src/plugins/vis_types/timeseries/common/agg_utils.test.ts b/src/plugins/vis_types/timeseries/common/agg_utils.test.ts
index 21fa870c2ca04..2a350d54de2c6 100644
--- a/src/plugins/vis_types/timeseries/common/agg_utils.test.ts
+++ b/src/plugins/vis_types/timeseries/common/agg_utils.test.ts
@@ -13,7 +13,7 @@ import {
   getAggsByPredicate,
   getAggsByType,
 } from './agg_utils';
-import { METRIC_TYPES } from '../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from './enums';
 import type { Metric } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/common/agg_utils.ts b/src/plugins/vis_types/timeseries/common/agg_utils.ts
index 71f13542b10f4..93b89d23b9793 100644
--- a/src/plugins/vis_types/timeseries/common/agg_utils.ts
+++ b/src/plugins/vis_types/timeseries/common/agg_utils.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { filter } from 'lodash';
 import { Assign } from 'utility-types';
-import { METRIC_TYPES } from '../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from './enums';
 import type { Metric, MetricType } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/common/calculate_label.test.ts b/src/plugins/vis_types/timeseries/common/calculate_label.test.ts
index 7e612ed1aaddd..9d9aa170e9d88 100644
--- a/src/plugins/vis_types/timeseries/common/calculate_label.test.ts
+++ b/src/plugins/vis_types/timeseries/common/calculate_label.test.ts
@@ -9,7 +9,7 @@
 import { calculateLabel } from './calculate_label';
 import type { Metric } from './types';
 import { SanitizedFieldType } from './types';
-import { KBN_FIELD_TYPES } from '../../../data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 describe('calculateLabel(metric, metrics)', () => {
   test('returns the metric.alias if set', () => {
diff --git a/src/plugins/vis_types/timeseries/common/calculate_label.ts b/src/plugins/vis_types/timeseries/common/calculate_label.ts
index e5cf053d310aa..d9b03d8de615e 100644
--- a/src/plugins/vis_types/timeseries/common/calculate_label.ts
+++ b/src/plugins/vis_types/timeseries/common/calculate_label.ts
@@ -8,9 +8,9 @@
 
 import { includes, startsWith } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { getMetricLabel } from './agg_utils';
 import { extractFieldLabel } from './fields_utils';
-import { METRIC_TYPES } from '../../../data/common';
 import { TSVB_METRIC_TYPES } from './enums';
 import type { Metric, SanitizedFieldType } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/common/fields_utils.test.ts b/src/plugins/vis_types/timeseries/common/fields_utils.test.ts
index 6dd00d803b7c3..cea7315024300 100644
--- a/src/plugins/vis_types/timeseries/common/fields_utils.test.ts
+++ b/src/plugins/vis_types/timeseries/common/fields_utils.test.ts
@@ -12,10 +12,10 @@ import {
   getMultiFieldLabel,
   createCachedFieldValueFormatter,
 } from './fields_utils';
-import { FieldSpec, KBN_FIELD_TYPES } from '../../../data/common';
-import { DataView } from '../../../data_views/common';
-import { stubLogstashDataView } from '../../../data/common/stubs';
-import { FieldFormatsRegistry, StringFormat } from '../../../field_formats/common';
+import { FieldSpec, KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { stubLogstashDataView } from '@kbn/data-plugin/common/stubs';
+import { FieldFormatsRegistry, StringFormat } from '@kbn/field-formats-plugin/common';
 
 describe('fields_utils', () => {
   describe('toSanitizedFieldType', () => {
diff --git a/src/plugins/vis_types/timeseries/common/fields_utils.ts b/src/plugins/vis_types/timeseries/common/fields_utils.ts
index 02a62b9246d54..e47967fc47f1b 100644
--- a/src/plugins/vis_types/timeseries/common/fields_utils.ts
+++ b/src/plugins/vis_types/timeseries/common/fields_utils.ts
@@ -7,10 +7,14 @@
  */
 import { i18n } from '@kbn/i18n';
 
-import { isNestedField, FieldSpec, DataView } from '../../../data/common';
+import { isNestedField, FieldSpec, DataView } from '@kbn/data-plugin/common';
+import {
+  FieldFormat,
+  FieldFormatsRegistry,
+  FIELD_FORMAT_IDS,
+} from '@kbn/field-formats-plugin/common';
 import { FieldNotFoundError } from './errors';
 import type { FetchedIndexPattern, SanitizedFieldType } from './types';
-import { FieldFormat, FieldFormatsRegistry, FIELD_FORMAT_IDS } from '../../../field_formats/common';
 
 export const extractFieldLabel = (
   fields: SanitizedFieldType[],
diff --git a/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts b/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts
index 0d4b293a3242b..1de76eefbfd01 100644
--- a/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts
+++ b/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts
@@ -12,7 +12,7 @@ import {
   fetchIndexPattern,
 } from './index_patterns_utils';
 import { Panel } from './types';
-import type { DataView, DataViewsService } from '../../../data_views/public';
+import type { DataView, DataViewsService } from '@kbn/data-views-plugin/public';
 
 describe('isStringTypeIndexPattern', () => {
   test('should returns true on string-based index', () => {
diff --git a/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts b/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts
index 4c4abf0023de0..81bb104bcb194 100644
--- a/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts
+++ b/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts
@@ -7,8 +7,8 @@
  */
 
 import { uniq } from 'lodash';
-import type { Panel, IndexPatternValue, FetchedIndexPattern } from '../common/types';
-import { DataViewsService } from '../../../data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { Panel, IndexPatternValue, FetchedIndexPattern } from './types';
 
 export const isStringTypeIndexPattern = (
   indexPatternValue: IndexPatternValue
diff --git a/src/plugins/vis_types/timeseries/common/types/index.ts b/src/plugins/vis_types/timeseries/common/types/index.ts
index 2fa775765b496..4076ca1a0bb24 100644
--- a/src/plugins/vis_types/timeseries/common/types/index.ts
+++ b/src/plugins/vis_types/timeseries/common/types/index.ts
@@ -7,8 +7,8 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { KBN_FIELD_TYPES, Query } from '../../../../data/common';
-import type { DataView } from '../../../../data_views/public';
+import { KBN_FIELD_TYPES, Query } from '@kbn/data-plugin/common';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { Panel } from './panel_model';
 
 export type { Metric, Series, Panel, MetricType } from './panel_model';
diff --git a/src/plugins/vis_types/timeseries/common/types/panel_model.ts b/src/plugins/vis_types/timeseries/common/types/panel_model.ts
index 1ccf7412a3e98..cdb294f0ed630 100644
--- a/src/plugins/vis_types/timeseries/common/types/panel_model.ts
+++ b/src/plugins/vis_types/timeseries/common/types/panel_model.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Query, METRIC_TYPES, KBN_FIELD_TYPES } from '../../../../data/common';
+import { Query, METRIC_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { PANEL_TYPES, TOOLTIP_MODES, TSVB_METRIC_TYPES } from '../enums';
-import type { IndexPatternValue, Annotation } from './index';
+import type { IndexPatternValue, Annotation } from '.';
 import type {
   ColorRules,
   BackgroundColorRules,
diff --git a/src/plugins/vis_types/timeseries/common/validate_interval.ts b/src/plugins/vis_types/timeseries/common/validate_interval.ts
index 78a2410f905c9..3047d10e00143 100644
--- a/src/plugins/vis_types/timeseries/common/validate_interval.ts
+++ b/src/plugins/vis_types/timeseries/common/validate_interval.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { parseInterval, TimeRangeBounds } from '@kbn/data-plugin/common';
 import { GTE_INTERVAL_RE } from './interval_regexp';
-import { parseInterval, TimeRangeBounds } from '../../../data/common';
 import { ValidateIntervalError } from './errors';
 
 export function validateInterval(bounds: TimeRangeBounds, interval: string, maxBuckets: number) {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts b/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts
index 40d80a014e36b..55668a94c8470 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts
@@ -9,7 +9,7 @@
 import type { EuiComboBoxOptionOption, EuiComboBoxProps } from '@elastic/eui';
 import { isFieldEnabled } from '../../../../../common/check_ui_restrictions';
 
-import type { SanitizedFieldType } from '../../../../..//common/types';
+import type { SanitizedFieldType } from '../../../../../common/types';
 import type { TimeseriesUIRestrictions } from '../../../../../common/ui_restrictions';
 
 export const INVALID_FIELD_ID = 'INVALID_FIELD';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js
index b24ac14717561..18bb47c9f4426 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js
@@ -24,7 +24,7 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getSupportedFieldsByMetricType } from '../lib/get_supported_fields_by_metric_type';
 import { getDataStart } from '../../../services';
 import { QueryBarWrapper } from '../query_bar_wrapper';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js
index bebbbc6f8614f..f634a475d52eb 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { FilterRatioAgg } from './filter_ratio';
 import { FIELDS, METRIC, SERIES, PANEL } from '../../../test_utils';
 import { EuiComboBox } from '@elastic/eui';
-import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { setDataStart } from '../../../services';
 
 jest.mock('../query_bar_wrapper', () => ({
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
index b97968ff62241..17e8e9fc233b7 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
@@ -12,7 +12,7 @@ import { Agg } from './agg';
 import { FieldSelect } from './field_select';
 import { FIELDS, METRIC, SERIES, PANEL } from '../../../test_utils';
 import { setDataStart } from '../../../services';
-import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 jest.mock('../query_bar_wrapper', () => ({
   QueryBarWrapper: jest.fn(() => null),
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js
index c098eb83ddf98..7f6c2505010b2 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js
@@ -23,7 +23,7 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { Percentiles, newPercentile } from './percentile_ui';
 import { PercentileHdr } from './percentile_hdr';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
index 57dfa23c815d8..fd689f917030b 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
@@ -16,6 +16,7 @@ import {
   EuiFlexGrid,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { AggSelect } from '../agg_select';
 import { FieldSelect } from '../field_select';
 // @ts-ignore
@@ -26,7 +27,6 @@ import { createNumberHandler } from '../../lib/create_number_handler';
 import { AggRow } from '../agg_row';
 import { PercentileRankValues } from './percentile_rank_values';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../data/public';
 import type { Metric, Panel, SanitizedFieldType, Series } from '../../../../../common/types';
 import { TSVB_DEFAULT_COLOR } from '../../../../../common/constants';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js
index 35786efa98c5f..31cdeebee39e8 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js
@@ -26,7 +26,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 const UNIT_OPTIONS = [
   {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js
index 375d576f8cf28..f949ad2b628c0 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js
@@ -25,7 +25,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 const RESTRICT_FIELDS = KBN_FIELD_TYPES.NUMBER;
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js
index 7dec7d94236e0..e49faca9ec253 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js
@@ -24,7 +24,7 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { PANEL_TYPES } from '../../../../common/enums';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx b/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx
index b571c958e1a08..0b0be9bebf39d 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx
@@ -20,8 +20,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { KBN_FIELD_TYPES, Query } from '@kbn/data-plugin/public';
 import { getDataViewsStart } from '../../services';
-import { KBN_FIELD_TYPES, Query } from '../../../../../../plugins/data/public';
 
 import { AddDeleteButtons } from './add_delete_buttons';
 import { ColorPicker } from './color_picker';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx b/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx
index 006682d4bfa37..498b51af2da51 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx
@@ -10,7 +10,7 @@ import React, { useCallback } from 'react';
 import uuid from 'uuid';
 import { EuiSpacer, EuiTitle, EuiButton, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { AnnotationRow } from './annotation_row';
 import { collectionActions, CollectionActionsProps } from './lib/collection_actions';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js b/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
index 26d8a91824a83..e653f75ea7c4e 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
@@ -26,7 +26,7 @@ import { createTextHandler } from './lib/create_text_handler';
 import { IndexPatternSelect } from './lib/index_pattern_select';
 import { YesNo } from './yes_no';
 import { LastValueModePopover } from './last_value_mode_popover';
-import { KBN_FIELD_TYPES } from '../../../../../data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { isGteInterval, validateReInterval, isAutoInterval } from './lib/get_interval';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
@@ -37,7 +37,7 @@ import { VisDataContext } from '../contexts/vis_data_context';
 import { PanelModelContext } from '../contexts/panel_model_context';
 import { FormValidationContext } from '../contexts/form_validation_context';
 import { getUISettings, getDataViewsStart } from '../../services';
-import { UI_SETTINGS } from '../../../../../data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { fetchIndexPattern } from '../../../common/index_patterns_utils';
 
 const RESTRICT_FIELDS = [KBN_FIELD_TYPES.DATE];
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts
index 2eaee96099110..4bd0684dfed84 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { checkIfNumericMetric } from './check_if_numeric_metric';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts
index 139c13d7ddbda..a7cf2810d1e37 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
-import { KBN_FIELD_TYPES } from '../../../../../../data/public';
 
 import type { Metric, IndexPatternValue } from '../../../../common/types';
 import type { VisFields } from '../../lib/fetch_fields';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
index 996cabb9f7963..1bf4fb4f24a60 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import type { FieldFormatMap } from '@kbn/data-plugin/common';
 import { DATA_FORMATTERS } from '../../../../common/enums';
 import { aggs } from '../../../../common/agg_utils';
 import type { Series } from '../../../../common/types';
-import type { FieldFormatMap } from '../../../../../../data/common';
 
 export const checkIfSeriesHaveSameFormatters = (
   seriesModel: Series[],
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
index 651fe6fbd36f5..3e0dc222b5920 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView, DataViewField } from 'src/plugins/data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { PanelData } from '../../../../common/types';
 import { TimeseriesVisParams } from '../../../types';
 import { convertSeriesToDataTable, addMetaToColumns } from './convert_series_to_datatable';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts
index e18611365ce06..1219a7fde22cc 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts
@@ -5,16 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView } from 'src/plugins/data_views/public';
-import { DatatableRow, DatatableColumn, DatatableColumnType } from 'src/plugins/expressions/public';
-import { Query } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { DatatableRow, DatatableColumn, DatatableColumnType } from '@kbn/expressions-plugin/public';
+import { Query } from '@kbn/data-plugin/common';
+import { BUCKET_TYPES as DATA_PLUGIN_BUCKET_TYPES, MultiFieldKey } from '@kbn/data-plugin/common';
 import { TimeseriesVisParams } from '../../../types';
 import type { PanelData, Metric } from '../../../../common/types';
 import { getMultiFieldLabel, getFieldsForTerms } from '../../../../common/fields_utils';
-import {
-  BUCKET_TYPES as DATA_PLUGIN_BUCKET_TYPES,
-  MultiFieldKey,
-} from '../../../../../../data/common';
 import { BUCKET_TYPES, TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { fetchIndexPattern } from '../../../../common/index_patterns_utils';
 import { getDataStart, getDataViewsStart } from '../../../services';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts
index 956dd9416e8ff..c5f4799ca2167 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { createFieldFormatter } from './create_field_formatter';
-import { getFieldFormatsRegistry } from '../../../../../../data/public/test_utils';
+import { getFieldFormatsRegistry } from '@kbn/data-plugin/public/test_utils';
 import { setFieldFormats } from '../../../services';
-import { FORMATS_UI_SETTINGS } from 'src/plugins/field_formats/common';
-import type { CoreSetup } from 'kibana/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
+import type { CoreSetup } from '@kbn/core/public';
 
 const mockUiSettings = {
   get: jest.fn((item: keyof typeof mockUiSettings) => mockUiSettings[item]),
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts
index a7606895e84aa..0d605618cf864 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts
@@ -7,11 +7,11 @@
  */
 
 import { isNumber } from 'lodash';
-import { getFieldFormats } from '../../../services';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
+import type { FieldFormatMap } from '@kbn/data-plugin/common';
+import type { FieldFormatsContentType } from '@kbn/field-formats-plugin/common';
 import { isEmptyValue, DISPLAY_EMPTY_VALUE } from '../../../../common/last_value_utils';
-import { FIELD_FORMAT_IDS } from '../../../../../../field_formats/common';
-import type { FieldFormatMap } from '../../../../../../data/common';
-import type { FieldFormatsContentType } from '../../../../../../field_formats/common';
+import { getFieldFormats } from '../../../services';
 
 const DEFAULT_FIELD_FORMAT = { id: 'number' };
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts
index 91ed3000641a2..31f743b01ac24 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
-import { ValueClickContext } from 'src/plugins/embeddable/public';
+import { ValueClickContext } from '@kbn/embeddable-plugin/public';
 import { X_ACCESSOR_INDEX } from '../../visualizations/constants';
 import { BUCKET_TYPES } from '../../../../common/enums';
 import { TimeseriesVisParams } from '../../../types';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts
index 3cb7ee0388f94..0d6d2953f1ac4 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { getUISettings } from '../../../services';
-import { UI_SETTINGS } from '../../../../../../data/public';
 
 export function getDefaultQueryLanguage() {
   return getUISettings().get(UI_SETTINGS.SEARCH_QUERY_LANGUAGE);
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts
index ea86ef6dc7ae9..59faf6d425503 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { search } from '../../../../../../../plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 import { GTE_INTERVAL_RE } from '../../../../common/interval_regexp';
 import { AUTO_INTERVAL } from '../../../../common/constants';
 import { isVisTableData } from '../../../../common/vis_data_utils';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
index 2909e7804b1bf..c44c34b570c9a 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 
 export function getSupportedFieldsByMetricType(type) {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
index 878b4f7655f3e..c905a7813dcdb 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
@@ -7,7 +7,7 @@
  */
 
 import { getSupportedFieldsByMetricType } from './get_supported_fields_by_metric_type';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 describe('getSupportedFieldsByMetricType', () => {
   const shouldHaveHistogramAndNumbers = (type) =>
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx
index be32104289d09..844c79de2cf28 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx
@@ -8,13 +8,13 @@
 
 import React, { useCallback, useState, useEffect } from 'react';
 import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
+import type { DataViewsService } from '@kbn/data-views-plugin/public';
 import { getDataViewsStart } from '../../../../services';
 
 import { SwitchModePopover } from './switch_mode_popover';
 
 import type { SelectIndexComponentProps } from './types';
 import type { IndexPatternValue } from '../../../../../common/types';
-import type { DataViewsService } from '../../../../../../../data_views/public';
 
 /** @internal **/
 type IdsWithTitle = Awaited<ReturnType<DataViewsService['getIdsWithTitle']>>;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx
index 6cc1c8d1e6968..9d830f03fa1d4 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiFormRow, EuiText, EuiLink, htmlIdGenerator } from '@elastic/eui';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getCoreStart } from '../../../../services';
 import { PanelModelContext } from '../../../contexts/panel_model_context';
 
@@ -19,7 +20,6 @@ import { ComboBoxSelect } from './combo_box_select';
 
 import type { IndexPatternValue, FetchedIndexPattern } from '../../../../../common/types';
 import { USE_KIBANA_INDEXES_KEY } from '../../../../../common/constants';
-import type { DataView } from '../../../../../../../data_views/public';
 
 export interface IndexPatternSelectProps {
   indexPatternName: string;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts
index e922fd6c7ed0a..fb745db6fa7dc 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { Assign } from '@kbn/utility-types';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { FetchedIndexPattern, IndexPatternValue } from '../../../../../common/types';
-import type { DataView } from '../../../../../../../data_views/public';
 
 /** @internal **/
 export interface SelectIndexComponentProps {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts
index 9c7cc1225c5ac..5c36b202b7b07 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts
@@ -7,7 +7,7 @@
  */
 
 import uuid from 'uuid';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import type { Metric } from '../../../../common/types';
 
 export const newMetricAggFn = (): Metric => {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js
index 9bccc13d19269..58fbe2c3d37c0 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js
@@ -9,7 +9,7 @@
 import { isNumber } from 'lodash';
 import handlebars from 'handlebars';
 import { isEmptyValue, DISPLAY_EMPTY_VALUE } from '../../../../common/last_value_utils';
-import { inputFormats, outputFormats, isDuration } from '../lib/durations';
+import { inputFormats, outputFormats, isDuration } from './durations';
 import { getFieldFormats } from '../../../services';
 
 export const createTickFormatter = (format = '0,0.[00]', template, getConfig = null) => {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js
index 8053c066114a3..1793ba8b62e35 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js
@@ -7,10 +7,10 @@
  */
 
 import { createTickFormatter } from './tick_formatter';
-import { getFieldFormatsRegistry } from '../../../../../../data/public/test_utils';
+import { getFieldFormatsRegistry } from '@kbn/data-plugin/public/test_utils';
 import { setFieldFormats } from '../../../services';
-import { UI_SETTINGS } from '../../../../../../data/public';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 
 const mockUiSettings = {
   get: (item) => {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts
index fee6670b49b9c..af5a14eed423e 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Datatable } from 'src/plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 
 export interface TSVBTables {
   [key: string]: Datatable;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js b/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js
index 8dd92b97e0ee7..8252f2e4d563e 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js
@@ -15,7 +15,7 @@ import React, { Component } from 'react';
 import { createTickFormatter } from './lib/tick_formatter';
 import { convertSeriesToVars } from './lib/convert_series_to_vars';
 import _ from 'lodash';
-import { CodeEditor, MarkdownLang } from '../../../../../kibana_react/public';
+import { CodeEditor, MarkdownLang } from '@kbn/kibana-react-plugin/public';
 
 import { EuiText, EuiCodeBlock, EuiSpacer, EuiTitle } from '@elastic/eui';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx b/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx
index 489896662033b..38185891de37f 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import { PalettePicker, PalettePickerProps } from './palette_picker';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EuiColorPalettePicker } from '@elastic/eui';
 import { PALETTES } from '../../../common/enums';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx b/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx
index 0e8e7108d8e38..7e0ed4023a1b9 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx
@@ -24,6 +24,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
+import { CodeEditor, CssLang } from '@kbn/kibana-react-plugin/public';
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
 // @ts-expect-error not typed yet
@@ -37,7 +38,6 @@ import { QueryBarWrapper } from '../query_bar_wrapper';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
 import { VisDataContext } from '../../contexts/vis_data_context';
 import { PanelConfigProps, PANEL_CONFIG_TABS } from './types';
-import { CodeEditor, CssLang } from '../../../../../../kibana_react/public';
 
 export class MarkdownPanelConfig extends Component<
   PanelConfigProps,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx b/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx
index cefcd9c2e5421..f7afd46c07c05 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx
@@ -27,6 +27,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { i18n } from '@kbn/i18n';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { FieldSelect } from '../aggs/field_select';
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
@@ -41,7 +42,6 @@ import { BUCKET_TYPES } from '../../../../common/enums';
 import { PanelConfigProps, PANEL_CONFIG_TABS } from './types';
 import { TimeseriesVisParams } from '../../../types';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
-import { KBN_FIELD_TYPES } from '../../../../../../data/public';
 
 export class TablePanelConfig extends Component<
   PanelConfigProps,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts b/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts
index ec55121a14e9f..75f5ed9a8ffaf 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { IUiSettingsClient } from 'kibana/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { TimeseriesVisData } from '../../../../common/types';
 import { TimeseriesVisParams } from '../../../types';
 import { VisFields } from '../../lib/fetch_fields';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx b/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
index 0a4971d66476e..f83180dcea225 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
@@ -8,10 +8,10 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 
+import { QueryStringInput, QueryStringInputProps } from '@kbn/unified-search-plugin/public';
 import { CoreStartContext } from '../contexts/query_input_bar_context';
 import type { IndexPatternValue } from '../../../common/types';
 
-import { QueryStringInput, QueryStringInputProps } from '../../../../../unified_search/public';
 import { getDataViewsStart } from '../../services';
 import { fetchIndexPattern, isStringTypeIndexPattern } from '../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js b/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js
index 4810932c9b4ac..bfc31f7e46d48 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js
@@ -25,7 +25,7 @@ import {
   EuiFieldText,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { STACKED_OPTIONS } from '../../visualizations/constants';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
index f2bf6425cf775..6784943b11188 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
@@ -11,9 +11,9 @@ import './timeseries_visualization.scss';
 import React, { Suspense, useCallback, useEffect, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingChart } from '@elastic/eui';
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
-import { IUiSettingsClient } from 'src/core/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { PersistedState } from 'src/plugins/visualizations/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
 import type { PaletteRegistry } from '@kbn/coloring';
 import { TimeseriesLoading } from './timeseries_loading';
 import { TimeseriesVisTypes } from './vis_types';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx b/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
index 4b3d51ad5d42a..904084fafaeba 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
@@ -11,16 +11,14 @@ import * as Rx from 'rxjs';
 import { share } from 'rxjs/operators';
 import { isEqual, isEmpty, debounce } from 'lodash';
 import { EventEmitter } from 'events';
-import type { IUiSettingsClient } from 'kibana/public';
-import type { DataView } from 'src/plugins/data_views/public';
-import type {
-  Vis,
-  VisualizeEmbeddableContract,
-} from '../../../../../../plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../../../../plugins/kibana_react/public';
-import { Storage } from '../../../../../../plugins/kibana_utils/public';
-
-import type { TimeRange } from '../../../../../../plugins/data/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { Vis, VisualizeEmbeddableContract } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+
+import type { TimeRange } from '@kbn/data-plugin/public';
+import type { EditorRenderProps } from '@kbn/visualizations-plugin/public';
 import type { IndexPatternValue, TimeseriesVisData } from '../../../common/types';
 
 // @ts-expect-error
@@ -33,7 +31,6 @@ import { fetchFields, VisFields } from '../lib/fetch_fields';
 import { getDataStart, getCoreStart } from '../../services';
 import type { TimeseriesVisParams } from '../../types';
 import { UseIndexPatternModeCallout } from './use_index_patter_mode_callout';
-import type { EditorRenderProps } from '../../../../../visualizations/public';
 
 const VIS_STATE_DEBOUNCE_DELAY = 200;
 const APP_NAME = 'VisEditor';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts b/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts
index 9061e71283e0c..bbc4dcddf6128 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts
@@ -8,12 +8,12 @@
 
 import React, { lazy } from 'react';
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
-import { IUiSettingsClient } from 'src/core/public';
-import { PersistedState } from 'src/plugins/visualizations/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
 import type { PaletteRegistry } from '@kbn/coloring';
+import type { FieldFormatMap } from '@kbn/data-plugin/common';
 import { TimeseriesVisParams } from '../../../types';
 import type { TimeseriesVisData, PanelData } from '../../../../common/types';
-import type { FieldFormatMap } from '../../../../../../data/common';
 import { FetchedIndexPattern } from '../../../../common/types';
 
 /**
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js
index 17a293627b314..85be7ff98332d 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js
@@ -11,7 +11,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { get } from 'lodash';
 import { ClassNames } from '@emotion/react';
-import { Markdown } from '../../../../../../../../plugins/kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorComponent } from '../../error';
 import { replaceVars } from '../../lib/replace_vars';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js
index f3cb92b31b309..74f53e7bf6ed3 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js
@@ -37,7 +37,7 @@ import { QueryBarWrapper } from '../../query_bar_wrapper';
 import { DATA_FORMATTERS } from '../../../../../common/enums';
 import { isConfigurationFeatureEnabled } from '../../../../../common/check_ui_restrictions';
 import { filterCannotBeAppliedErrorMessage } from '../../../../../common/errors';
-import { KBN_FIELD_TYPES } from '../../../../../../../data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 export class TableSeriesConfig extends Component {
   UNSAFE_componentWillMount() {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
index 549aa1b70082f..a194a6212519d 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
@@ -10,7 +10,7 @@ import _, { isArray, last, get } from 'lodash';
 import React, { Component } from 'react';
 import { parse as parseUrl } from 'url';
 import PropTypes from 'prop-types';
-import { RedirectAppLinks } from '../../../../../../../kibana_react/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { getMetricsField } from '../../lib/get_metrics_field';
 import { createTickFormatter } from '../../lib/tick_formatter';
 import { createFieldFormatter } from '../../lib/create_field_formatter';
@@ -21,7 +21,7 @@ import { ExternalUrlErrorModal } from '../../lib/external_url_error_modal';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { getFieldFormats, getCoreStart } from '../../../../services';
 import { DATA_FORMATTERS } from '../../../../../common/enums';
-import { FIELD_FORMAT_IDS } from '../../../../../../../../plugins/field_formats/common';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 
 import {
   createCachedFieldValueFormatter,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
index d9d5cdb576c03..3a9ec7c6cb648 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { ColorPicker } from '../../color_picker';
 import { AddDeleteButtons } from '../../add_delete_buttons';
-import { Aggs } from '../../../components/aggs/aggs';
+import { Aggs } from '../../aggs/aggs';
 import { TimeseriesConfig as SeriesConfig } from './config';
 import { SeriesDragHandler } from '../../series_drag_handler';
 import {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
index 0fb4e99b1e973..007e763997e13 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
@@ -18,8 +18,8 @@ import { createTickFormatter } from '../../lib/tick_formatter';
 import { createFieldFormatter } from '../../lib/create_field_formatter';
 import { checkIfSeriesHaveSameFormatters } from '../../lib/check_if_series_have_same_formatters';
 import { TimeSeries } from '../../../visualizations/views/timeseries';
-import { MarkdownSimple } from '../../../../../../../../plugins/kibana_react/public';
-import { LEGACY_TIME_AXIS } from '../../../../../../../../plugins/charts/common';
+import { MarkdownSimple } from '@kbn/kibana-react-plugin/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import { replaceVars } from '../../lib/replace_vars';
 import { getInterval } from '../../lib/get_interval';
 import { createIntervalBasedFormatter } from '../../lib/create_interval_based_formatter';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
index 0fd909af7376d..fe6f73ce66f79 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
@@ -12,12 +12,12 @@ import { TimeSeries } from '../../../visualizations/views/timeseries';
 import TimeseriesVisualization from './vis';
 import { setFieldFormats, setCharts, setUISettings } from '../../../../services';
 import { createFieldFormatter } from '../../lib/create_field_formatter';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../field_formats/common';
-import { METRIC_TYPES } from '../../../../../../../data/common';
-import { getFieldFormatsRegistry } from '../../../../../../../data/public/test_utils';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../../charts/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
+import { getFieldFormatsRegistry } from '@kbn/data-plugin/public/test_utils';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/public';
 
-jest.mock('../../../../../../../data/public/services', () => ({
+jest.mock('@kbn/data-plugin/public/services', () => ({
   getUiSettings: () => ({ get: jest.fn() }),
 }));
 
diff --git a/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts b/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts
index 1b63026777462..93cf557bdc84b 100644
--- a/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts
+++ b/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts
@@ -7,8 +7,8 @@
  */
 
 import React from 'react';
-import { IUiSettingsClient, SavedObjectsClientContract } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient, SavedObjectsClientContract } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 export interface ICoreStartContext {
   appName: string;
diff --git a/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx b/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx
index 01958e77c78d5..d8ab097eedde5 100644
--- a/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx
@@ -14,11 +14,11 @@ import type {
   VisualizeEmbeddableContract,
   IEditorController,
   EditorRenderProps,
-} from 'src/plugins/visualizations/public';
+} from '@kbn/visualizations-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getUISettings, getI18n, getCoreStart, getDataViewsStart } from '../services';
 import { VisEditor } from './components/vis_editor_lazy';
 import type { TimeseriesVisParams } from '../types';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 
 export const TSVB_EDITOR_NAME = 'tsvbEditor';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts b/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts
index c447acb74dc37..7c90bc3228913 100644
--- a/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { getSplitByTermsColor, SplitByTermsColorProps } from './get_split_by_terms_color';
 
 const chartsRegistry = chartPluginMock.createPaletteRegistry();
diff --git a/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts b/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts
index 9f3b3d6512058..44fc531e77b78 100644
--- a/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts
+++ b/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 export function getTimezone(config: IUiSettingsClient) {
   if (config.isDefault('dateFormat:tz')) {
diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
index c8e845ce6b54c..3fff0f2cce6cb 100644
--- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
+++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
@@ -36,7 +36,7 @@ import {
   MULTILAYER_TIME_AXIS_STYLE,
   renderEndzoneTooltip,
   useActiveCursor,
-} from '../../../../../../../charts/public';
+} from '@kbn/charts-plugin/public';
 import { getAxisLabelString } from '../../../components/lib/get_axis_label_string';
 import { calculateDomainForSeries } from './utils/series_domain_calculation';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts
index 53157286328e2..38e0a8c9fad3a 100644
--- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { calculateDomainForSeries } from './series_domain_calculation';
-import { PanelData } from 'src/plugins/vis_types/timeseries/common/types';
+import { PanelData } from '../../../../../../common/types';
 
 describe('calculateDomainForSeries', () => {
   it('should return 0 for domainStart and 3 for domainEnd', () => {
diff --git a/src/plugins/vis_types/timeseries/public/index.ts b/src/plugins/vis_types/timeseries/public/index.ts
index a3180678b53a0..d0051df4de71e 100644
--- a/src/plugins/vis_types/timeseries/public/index.ts
+++ b/src/plugins/vis_types/timeseries/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MetricsPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/timeseries/public/metrics_fn.ts b/src/plugins/vis_types/timeseries/public/metrics_fn.ts
index 5eadf170b768c..58b1f581b4a65 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_fn.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaContext } from '../../../data/public';
-import { ExpressionFunctionDefinition, Render } from '../../../expressions/public';
+import { KibanaContext } from '@kbn/data-plugin/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 
 import type { TimeseriesVisData } from '../common/types';
 import { metricsRequestHandler } from './request_handler';
diff --git a/src/plugins/vis_types/timeseries/public/metrics_type.test.ts b/src/plugins/vis_types/timeseries/public/metrics_type.test.ts
index d87dfa23f7dee..3c05a4c13fc27 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_type.test.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_type.test.ts
@@ -7,12 +7,12 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { setDataViewsStart } from './services';
 import type { TimeseriesVisParams } from './types';
-import type { Vis } from 'src/plugins/visualizations/public';
+import type { Vis } from '@kbn/visualizations-plugin/public';
 import { metricsVisDefinition } from './metrics_type';
-import { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 describe('metricsVisDefinition', () => {
   describe('getUsedIndexPattern', () => {
     const indexPattern1 = { id: '1', title: 'pattern1' } as unknown as DataView;
@@ -24,7 +24,10 @@ describe('metricsVisDefinition', () => {
         async getDefault() {
           return indexPattern1;
         },
-        async find(title: string) {
+        async find(title: string, size: number) {
+          if (size !== 1) {
+            throw new Error('trying to fetch too many data views');
+          }
           if (title === 'pattern1') return [indexPattern1];
           if (title === 'pattern2') return [indexPattern2];
           return [];
diff --git a/src/plugins/vis_types/timeseries/public/metrics_type.ts b/src/plugins/vis_types/timeseries/public/metrics_type.ts
index 7b1f6e4bd5eb3..c013553e44197 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_type.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_type.ts
@@ -8,7 +8,15 @@
 
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
-import type { DataViewsContract, DataView } from 'src/plugins/data_views/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
+import {
+  Vis,
+  VIS_EVENT_TO_TRIGGER,
+  VisGroups,
+  VisParams,
+  VisTypeDefinition,
+} from '@kbn/visualizations-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin/public';
 import { TSVB_EDITOR_NAME } from './application/editor_controller';
 import { PANEL_TYPES, TOOLTIP_MODES } from '../common/enums';
 import {
@@ -17,17 +25,9 @@ import {
 } from '../common/index_patterns_utils';
 import { TSVB_DEFAULT_COLOR } from '../common/constants';
 import { toExpressionAst } from './to_ast';
-import {
-  Vis,
-  VIS_EVENT_TO_TRIGGER,
-  VisGroups,
-  VisParams,
-  VisTypeDefinition,
-} from '../../../visualizations/public';
 import { getDataViewsStart } from './services';
 import type { TimeseriesVisDefaultParams, TimeseriesVisParams } from './types';
 import type { IndexPatternValue, Panel } from '../common/types';
-import { RequestAdapter } from '../../../inspector/public';
 
 export const withReplacedIds = (
   vis: Vis<TimeseriesVisParams | TimeseriesVisDefaultParams>
@@ -71,7 +71,7 @@ async function resolveIndexPattern(
 ) {
   if (!indexPatternValue) return;
   if (isStringTypeIndexPattern(indexPatternValue)) {
-    return await indexPatterns.find(indexPatternValue);
+    return await indexPatterns.find(indexPatternValue, 1);
   }
 
   if (indexPatternValue.id) {
diff --git a/src/plugins/vis_types/timeseries/public/plugin.ts b/src/plugins/vis_types/timeseries/public/plugin.ts
index e669e9132b47a..caac927930ea1 100644
--- a/src/plugins/vis_types/timeseries/public/plugin.ts
+++ b/src/plugins/vis_types/timeseries/public/plugin.ts
@@ -6,9 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { EditorController, TSVB_EDITOR_NAME } from './application/editor_controller';
 
 import { createMetricsFn } from './metrics_fn';
@@ -22,9 +25,6 @@ import {
   setDataViewsStart,
   setCharts,
 } from './services';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
-import { ChartsPluginStart } from '../../../charts/public';
 import { getTimeseriesVisRenderer } from './timeseries_vis_renderer';
 
 /** @internal */
diff --git a/src/plugins/vis_types/timeseries/public/request_handler.ts b/src/plugins/vis_types/timeseries/public/request_handler.ts
index dcb1b0691602d..d963fc76b5ead 100644
--- a/src/plugins/vis_types/timeseries/public/request_handler.ts
+++ b/src/plugins/vis_types/timeseries/public/request_handler.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
-import type { Adapters } from 'src/plugins/inspector';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import type { Adapters } from '@kbn/inspector-plugin';
+import { KibanaContext, handleResponse } from '@kbn/data-plugin/public';
 import { getTimezone } from './application/lib/get_timezone';
 import { getUISettings, getDataStart, getCoreStart } from './services';
 import { ROUTES, UI_SETTINGS } from '../common/constants';
-import { KibanaContext, handleResponse } from '../../../data/public';
 
 import type { TimeseriesVisParams } from './types';
 import type { TimeseriesVisData } from '../common/types';
diff --git a/src/plugins/vis_types/timeseries/public/services.ts b/src/plugins/vis_types/timeseries/public/services.ts
index 329d3642e0ce4..5dc3dc0124829 100644
--- a/src/plugins/vis_types/timeseries/public/services.ts
+++ b/src/plugins/vis_types/timeseries/public/services.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { I18nStart, IUiSettingsClient, CoreStart } from 'src/core/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { ChartsPluginStart } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
+import { I18nStart, IUiSettingsClient, CoreStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
diff --git a/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx b/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
index f1b68737c268e..5c4e124c92d31 100644
--- a/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
+++ b/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
@@ -11,17 +11,17 @@ import { get } from 'lodash';
 import { render, unmountComponentAtNode } from 'react-dom';
 
 import { I18nProvider } from '@kbn/i18n-react';
-import { IUiSettingsClient, ThemeServiceStart } from 'kibana/public';
+import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
 
-import { VisualizationContainer, PersistedState } from '../../../visualizations/public';
+import { VisualizationContainer, PersistedState } from '@kbn/visualizations-plugin/public';
 
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { TimeseriesVisData } from '../common/types';
 import { isVisTableData } from '../common/vis_data_utils';
 
 import type { TimeseriesVisParams } from './types';
-import type { ExpressionRenderDefinition } from '../../../expressions/common';
 import type { TimeseriesRenderValue } from './metrics_fn';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 
 const TimeseriesVisualization = lazy(
   () => import('./application/components/timeseries_visualization')
diff --git a/src/plugins/vis_types/timeseries/public/to_ast.ts b/src/plugins/vis_types/timeseries/public/to_ast.ts
index 91fc7465f122f..5a6d79d67413f 100644
--- a/src/plugins/vis_types/timeseries/public/to_ast.ts
+++ b/src/plugins/vis_types/timeseries/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import type { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import type { Vis } from '@kbn/visualizations-plugin/public';
 import type { TimeseriesExpressionFunctionDefinition } from './metrics_fn';
 import type { TimeseriesVisParams } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts b/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts
index f9b02823804df..8405a685122ed 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataView } from '../../../../data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 import { getDataSourceInfo } from './get_datasource_info';
 const dataViewsMap: Record<string, DataView> = {
   test1: { id: 'test1', title: 'test1', timeFieldName: 'timeField1' } as DataView,
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts b/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts
index 641890b68b83c..fef35f229359f 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { VisualizeEditorLayersContext } from '../../../../visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import type { Metric } from '../../common/types';
 import { SUPPORTED_METRICS } from './supported_metrics';
 import {
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts b/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts
index 97189e4f9c826..0ce0d0883b670 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts
@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataView } from '../../../../data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 import type { Panel, Series } from '../../common/types';
-import { triggerTSVBtoLensConfiguration } from './';
+import { triggerTSVBtoLensConfiguration } from '.';
 
 const dataViewsMap: Record<string, DataView> = {
   test1: { id: 'test1', title: 'test1', timeFieldName: 'timeField1' } as DataView,
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/index.ts b/src/plugins/vis_types/timeseries/public/trigger_action/index.ts
index 5cdbc72d08fe3..80ef6500c130c 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/index.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/index.ts
@@ -9,7 +9,7 @@ import type { PaletteOutput } from '@kbn/coloring';
 import type {
   NavigateToLensContext,
   VisualizeEditorLayersContext,
-} from '../../../../visualizations/public';
+} from '@kbn/visualizations-plugin/public';
 import type { Panel } from '../../common/types';
 import { PANEL_TYPES } from '../../common/enums';
 import { getDataSourceInfo } from './get_datasource_info';
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts
index 8b1a5f5e68dec..3abb325b4c75a 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { METRIC_TYPES } from 'src/plugins/data/public';
+import { METRIC_TYPES } from '@kbn/data-plugin/public';
 import type { Metric, MetricType } from '../../common/types';
 import { getPercentilesSeries, getParentPipelineSeries } from './metrics_helpers';
 
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts
index a71f43f2a6a25..9f6c7dd4236b1 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Query } from '../../../../data/common';
+import { Query } from '@kbn/data-plugin/common';
 import type { Metric, MetricType } from '../../common/types';
 import { SUPPORTED_METRICS } from './supported_metrics';
 
diff --git a/src/plugins/vis_types/timeseries/public/vis_state.test.ts b/src/plugins/vis_types/timeseries/public/vis_state.test.ts
index 82e52a0493391..bc25a2b89d778 100644
--- a/src/plugins/vis_types/timeseries/public/vis_state.test.ts
+++ b/src/plugins/vis_types/timeseries/public/vis_state.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { updateOldState } from '../../../visualizations/public';
+import { updateOldState } from '@kbn/visualizations-plugin/public';
 
 /**
  * The reason we add this test is to ensure that `convertNumIdsToStringsForTSVB` of the updateOldState runs correctly
diff --git a/src/plugins/vis_types/timeseries/server/index.ts b/src/plugins/vis_types/timeseries/server/index.ts
index d6b1174177bb6..ee274ecd6d859 100644
--- a/src/plugins/vis_types/timeseries/server/index.ts
+++ b/src/plugins/vis_types/timeseries/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { VisTypeTimeseriesConfig, config as configSchema } from './config';
 import { VisTypeTimeseriesPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/get_vis_data.ts b/src/plugins/vis_types/timeseries/server/lib/get_vis_data.ts
index a76132e0fbd21..360256ccb628b 100644
--- a/src/plugins/vis_types/timeseries/server/lib/get_vis_data.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/get_vis_data.ts
@@ -28,7 +28,7 @@ export async function getVisData(
   request: VisTypeTimeseriesVisDataRequest,
   framework: Framework
 ): Promise<TimeseriesVisData> {
-  const uiSettings = requestContext.core.uiSettings.client;
+  const uiSettings = (await requestContext.core).uiSettings.client;
   const esShardTimeout = await framework.getEsShardTimeout();
   const fieldFormatService = await framework.getFieldFormatsService(uiSettings);
   const indexPatternsService = await framework.getIndexPatternsService(requestContext);
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts
index f407b224ac7cd..0afc300b89444 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewsService } from 'src/plugins/data_views/common';
+import { DataView, DataViewsService } from '@kbn/data-views-plugin/common';
 import { fetchIndexPattern } from '../../../../common/index_patterns_utils';
 import {
   getCachedIndexPatternFetcher,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts
index 9bab0e520e74b..c82e75f018195 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { getIndexPatternKey, fetchIndexPattern } from '../../../../common/index_patterns_utils';
 
-import type { DataViewsService } from '../../../../../../data_views/common';
 import type { IndexPatternValue, FetchedIndexPattern } from '../../../../common/types';
 
 export const getCachedIndexPatternFetcher = (
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts
index 788ce2ff44a3c..1b8e505485a65 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
 import type { VisTypeTimeseriesVisDataRequest } from '../../../types';
-import type { SearchStrategy, SearchCapabilities } from '../index';
-import type { DataViewsService } from '../../../../../../data_views/common';
+import type { SearchStrategy, SearchCapabilities } from '..';
 import type { CachedIndexPatternFetcher } from './cached_index_pattern_fetcher';
 import type { IndexPatternValue } from '../../../../common/types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
index 8677a44941c43..9fb7fc2a32317 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsService } from '../../../../../../data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { from } from 'rxjs';
 
 import { AbstractSearchStrategy, EsSearchRequest } from './abstract_search_strategy';
-import type { FieldSpec } from '../../../../../../data/common';
+import type { FieldSpec } from '@kbn/data-plugin/common';
 import type { CachedIndexPatternFetcher } from '../lib/cached_index_pattern_fetcher';
 import type {
   VisTypeTimeseriesRequestHandlerContext,
@@ -84,7 +84,7 @@ describe('AbstractSearchStrategy', () => {
     );
 
     expect(responses).toEqual([{}]);
-    expect(requestContext.search.search).toHaveBeenCalledWith(
+    expect((await requestContext.search).search).toHaveBeenCalledWith(
       {
         params: {
           body: {},
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
index de770b30fb823..167bc9cec8e03 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -8,7 +8,7 @@
 import { tap } from 'rxjs/operators';
 import { omit } from 'lodash';
 import type { Observable } from 'rxjs';
-import { DataViewsService } from '../../../../../../data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { toSanitizedFieldType } from '../../../../common/fields_utils';
 
 import type { FetchedIndexPattern, TrackedEsSearches } from '../../../../common/types';
@@ -46,11 +46,12 @@ export abstract class AbstractSearchStrategy {
     // User may abort the request without waiting for the results
     // we need to handle this scenario by aborting underlying server requests
     const abortSignal = getRequestAbortedSignal(req.events.aborted$);
+    const searchContext = await requestContext.search;
 
     esRequests.forEach(({ body, index, trackingEsSearchMeta }) => {
       const startTime = Date.now();
       requests.push(
-        requestContext.search
+        searchContext
           .search(
             {
               indexType,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
index 9b683b87c90c7..ca20f87641f88 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { AbstractSearchStrategy } from './abstract_search_strategy';
 import { DefaultSearchCapabilities } from '../capabilities/default_search_capabilities';
 
-import type { DataViewsService } from '../../../../../../data_views/common';
 import type { FetchedIndexPattern } from '../../../../common/types';
 import type {
   VisTypeTimeseriesRequestHandlerContext,
@@ -22,7 +22,7 @@ export class DefaultSearchStrategy extends AbstractSearchStrategy {
     requestContext: VisTypeTimeseriesRequestHandlerContext,
     req: VisTypeTimeseriesRequest
   ) {
-    const uiSettings = requestContext.core.uiSettings.client;
+    const uiSettings = (await requestContext.core).uiSettings.client;
 
     return {
       isViable: true,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
index 32adce54fc597..d36abcfddfe08 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
@@ -8,7 +8,7 @@
 
 import { RollupSearchStrategy } from './rollup_search_strategy';
 
-import type { DataViewsService } from '../../../../../../data_views/common';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { CachedIndexPatternFetcher } from '../lib/cached_index_pattern_fetcher';
 import type {
   VisTypeTimeseriesRequestHandlerContext,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
index 32c9952e235d5..35223f5159a86 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getCapabilitiesForRollupIndices } from '../../../../../../data/server';
-import type { DataViewsService } from '../../../../../../data_views/common';
+import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { AbstractSearchStrategy, EsSearchRequest } from './abstract_search_strategy';
 import { RollupSearchCapabilities } from '../capabilities/rollup_search_capabilities';
 
@@ -38,10 +38,10 @@ export class RollupSearchStrategy extends AbstractSearchStrategy {
     indexPattern: string
   ) {
     try {
-      const body =
-        await requestContext.core.elasticsearch.client.asCurrentUser.rollup.getRollupIndexCaps({
-          index: indexPattern,
-        });
+      const esClient = (await requestContext.core).elasticsearch.client;
+      const body = await esClient.asCurrentUser.rollup.getRollupIndexCaps({
+        index: indexPattern,
+      });
 
       return body;
     } catch (e) {
@@ -64,7 +64,7 @@ export class RollupSearchStrategy extends AbstractSearchStrategy {
     ) {
       const rollupData = await this.getRollupData(requestContext, indexPatternString);
       const rollupIndices = getRollupIndices(rollupData);
-      const uiSettings = requestContext.core.uiSettings.client;
+      const uiSettings = (await requestContext.core).uiSettings.client;
 
       isViable = rollupIndices.length === 1;
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js
index eac2c4af65291..a832eebde9cfc 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js
@@ -8,7 +8,7 @@
 
 import { get, max, min, sum, noop } from 'lodash';
 import { toPercentileNumber } from '../../../../common/to_percentile_number';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { getAggByPredicate } from '../../../../common/agg_utils';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts
index 58c96eca99b61..9486d5f238727 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts
@@ -7,6 +7,7 @@
  */
 import type { Unit } from '@kbn/datemath';
 
+import { search } from '@kbn/data-plugin/server';
 import {
   getUnitValue,
   parseInterval,
@@ -15,7 +16,6 @@ import {
 } from './unit_to_seconds';
 import { getTimerange } from './get_timerange';
 import { INTERVAL_STRING_RE, GTE_INTERVAL_RE } from '../../../../common/interval_regexp';
-import { search } from '../../../../../../data/server';
 import type { SearchCapabilities } from '../../search_strategies';
 import type { VisTypeTimeseriesVisDataRequest } from '../../../types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts
index 06df19ab73856..732ef151a6928 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts
@@ -7,8 +7,8 @@
  */
 
 import { startsWith } from 'lodash';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { toPercentileNumber } from '../../../../common/to_percentile_number';
-import { METRIC_TYPES } from '../../../../../../data/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import type { Metric } from '../../../../common/types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts
index 07b030782d6d7..424e8ed0738d3 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
-import { UI_SETTINGS } from '../../../../../../data/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 
 export async function getEsQueryConfig(uiSettings: IUiSettingsClient) {
   const allowLeadingWildcards = await uiSettings.get(UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS);
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts
index ee82a245085c5..79e44e5b4bb82 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts
@@ -8,7 +8,7 @@
 
 import Color from 'color';
 import { get, isPlainObject } from 'lodash';
-import { overwrite } from '../helpers';
+import { overwrite } from '.';
 
 import { calculateLabel } from '../../../../common/calculate_label';
 import { SERIES_SEPARATOR } from '../../../../common/constants';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts
index fd061cd363695..16897774ba9c0 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { mapEmptyToZero } from './map_empty_to_zero';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 
 describe('mapEmptyToZero(metric, buckets)', () => {
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts
index 26014b229bae9..0be4f0514a9f7 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 // @ts-expect-error not typed yet
 import { getAggValue } from './get_agg_value';
-import { METRIC_TYPES } from '../../../../../../data/common';
 import type { Metric } from '../../../../common/types';
 import type { PanelDataArray } from '../../../../common/types/vis_data';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
index 53893a50673bf..8bd8b485e0dbf 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
@@ -6,12 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { search, UI_SETTINGS } from '@kbn/data-plugin/server';
 import { overwrite } from '../../helpers';
 import { getBucketSize, getTimerange } from '../../helpers';
 import { validateField } from '../../../../../common/fields_utils';
 
-import { search, UI_SETTINGS } from '../../../../../../../../plugins/data/server';
-
 import type { AnnotationsRequestProcessorsFunction } from './types';
 
 const { dateHistogramInterval } = search.aggs;
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts
index eaf2c5ae2e7bf..e6478302518f1 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts
@@ -7,9 +7,9 @@
  */
 
 import { buildEsQuery } from '@kbn/es-query';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 import { getBucketSize, getTimerange, overwrite } from '../../helpers';
 import { validateField } from '../../../../../common/fields_utils';
-import { UI_SETTINGS } from '../../../../../../../data/server';
 
 import type { AnnotationsRequestProcessorsFunction } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
index ae2563fbfb64b..425cdd30d033b 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IUiSettingsClient } from 'kibana/server';
+import type { IUiSettingsClient } from '@kbn/core/server';
 import type { EsQueryConfig } from '@kbn/es-query';
 import type { VisTypeTimeseriesVisDataRequest } from '../../../../types';
 import type { Annotation, FetchedIndexPattern, Panel } from '../../../../../common/types';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
index a5ea36d742305..95e46c6a6a8aa 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
@@ -10,7 +10,7 @@ import { overwrite } from '../../helpers';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { offsetTime } from '../../offset_time';
 import { isLastValueTimerangeMode } from '../../helpers/get_timerange_mode';
-import { search, UI_SETTINGS } from '../../../../../../../../plugins/data/server';
+import { search, UI_SETTINGS } from '@kbn/data-plugin/server';
 
 const { dateHistogramInterval } = search.aggs;
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
index 379a3fb4cc3a2..ece2b2d316eda 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
@@ -9,7 +9,7 @@
 import { DefaultSearchCapabilities } from '../../../search_strategies/capabilities/default_search_capabilities';
 import { dateHistogram } from './date_histogram';
 import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
-import { UI_SETTINGS } from '../../../../../../../data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 describe('dateHistogram(req, panel, series)', () => {
   let panel;
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
index 86c5311f51dcb..225797d7ccfe2 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
@@ -9,7 +9,7 @@
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { bucketTransform } from '../../helpers/bucket_transform';
 import { overwrite } from '../../helpers';
-import { UI_SETTINGS } from '../../../../../../../data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 export const filter = (metric) => metric.type === 'positive_rate';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts
index 72d3a8e3c1e57..f8346e2638a02 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { TableSearchRequest } from '../table/types';
+import type { TableSearchRequest } from './types';
 import type { Series } from '../../../../../common/types';
 
 export function calculateAggRoot(doc: TableSearchRequest, column: Series) {
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts
index 246c133e93608..00c8f93f1c00a 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { search, UI_SETTINGS } from '@kbn/data-plugin/server';
 import { overwrite, getBucketSize, isLastValueTimerangeMode, getTimerange } from '../../helpers';
 import { calculateAggRoot } from './calculate_agg_root';
-import { search, UI_SETTINGS } from '../../../../../../../../plugins/data/server';
 
 import type { TableRequestProcessorsFunction, TableSearchRequestMeta } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts
index e03a65ffebbd1..3a94f28c37fc7 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { calculateAggRoot } from './calculate_agg_root';
-import { UI_SETTINGS } from '../../../../../../../data/common';
 
 import type { TableRequestProcessorsFunction } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts
index 6ab50858fe98b..ef407932afedd 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IUiSettingsClient } from 'kibana/server';
+import type { IUiSettingsClient } from '@kbn/core/server';
 import { EsQueryConfig } from '@kbn/es-query';
 import type { FetchedIndexPattern, Panel } from '../../../../../common/types';
 import type { SearchCapabilities } from '../../../search_strategies';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts
index 43019c509eae1..1f17b1ecdf2c7 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts
@@ -7,7 +7,7 @@
  */
 
 import { get, isEmpty } from 'lodash';
-import type { SearchResponse } from 'kibana/server';
+import type { SearchResponse } from '@kbn/core/server';
 import { overwrite } from '../../helpers';
 import type { Annotation } from '../../../../../common/types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts
index 813cf1a5b9a6f..637406c1746ff 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import { BUCKET_TYPES, PANEL_TYPES, TSVB_METRIC_TYPES } from '../../../../../common/enums';
 import {
   createCachedFieldValueFormatter,
@@ -13,7 +14,6 @@ import {
   MULTI_FIELD_VALUES_SEPARATOR,
 } from '../../../../../common/fields_utils';
 import type { Panel, PanelData, Series } from '../../../../../common/types';
-import type { FieldFormatsRegistry } from '../../../../../../../field_formats/common';
 import type { createFieldsFetcher } from '../../../search_strategies/lib/fields_fetcher';
 import type { CachedIndexPatternFetcher } from '../../../search_strategies/lib/cached_index_pattern_fetcher';
 import type { BaseMeta } from '../../request_processors/types';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts
index b16524f27f213..f8bbddbec5aae 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts
@@ -8,7 +8,7 @@
 
 import { _legacyBuildProcessorFunction } from '../build_processor_function';
 // @ts-ignore
-import { processors } from '../request_processors/series/index';
+import { processors } from '../request_processors/series';
 
 /**
  * Builds series request body
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts
index 5244bca66a5b3..c9d80e955ddf0 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts
@@ -8,6 +8,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import type { Panel } from '../../../../common/types';
 import { _legacyBuildProcessorFunction } from '../build_processor_function';
 // @ts-expect-error
@@ -17,7 +18,6 @@ import {
   FieldsFetcherServices,
 } from '../../search_strategies/lib/fields_fetcher';
 import { VisTypeTimeseriesVisDataRequest } from '../../../types';
-import type { FieldFormatsRegistry } from '../../../../../../field_formats/common';
 
 export function handleResponseBody(
   panel: Panel,
diff --git a/src/plugins/vis_types/timeseries/server/plugin.ts b/src/plugins/vis_types/timeseries/server/plugin.ts
index 2dc1b6458e8d6..31ca2667ed3a7 100644
--- a/src/plugins/vis_types/timeseries/server/plugin.ts
+++ b/src/plugins/vis_types/timeseries/server/plugin.ts
@@ -14,17 +14,18 @@ import {
   Logger,
   KibanaRequest,
   IUiSettingsClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { firstValueFrom, Observable } from 'rxjs';
 import { Server } from '@hapi/hapi';
 import { map } from 'rxjs/operators';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { PluginStart } from '@kbn/data-plugin/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { PluginStart as DataViewsPublicPluginStart } from '@kbn/data-views-plugin/server';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import { VisTypeTimeseriesConfig } from './config';
 import { getVisData } from './lib/get_vis_data';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
-import { HomeServerPluginSetup } from '../../../home/server';
-import { PluginStart } from '../../../data/server';
-import type { DataViewsService } from '../../../data_views/common';
-import type { PluginStart as DataViewsPublicPluginStart } from '../../../data_views/server';
 import { visDataRoutes } from './routes/vis';
 import { fieldsRoutes } from './routes/fields';
 import { getUiSettings } from './ui_settings';
@@ -32,7 +33,6 @@ import type {
   VisTypeTimeseriesRequestHandlerContext,
   VisTypeTimeseriesVisDataRequest,
 } from './types';
-import type { FieldFormatsRegistry } from '../../../field_formats/common';
 
 import {
   SearchStrategyRegistry,
@@ -109,10 +109,10 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
         ),
       getIndexPatternsService: async (requestContext) => {
         const [, { dataViews }] = await core.getStartServices();
-
+        const { elasticsearch, savedObjects } = await requestContext.core;
         return await dataViews.dataViewsServiceFactory(
-          requestContext.core.savedObjects.client,
-          requestContext.core.elasticsearch.client.asCurrentUser
+          savedObjects.client,
+          elasticsearch.client.asCurrentUser
         );
       },
       getFieldFormatsService: async (uiSettings) => {
diff --git a/src/plugins/vis_types/timeseries/server/types.ts b/src/plugins/vis_types/timeseries/server/types.ts
index 8eeb4b5a68f89..afbd80510028b 100644
--- a/src/plugins/vis_types/timeseries/server/types.ts
+++ b/src/plugins/vis_types/timeseries/server/types.ts
@@ -8,11 +8,11 @@
 
 import { Observable } from 'rxjs';
 import { EsQueryConfig } from '@kbn/es-query';
-import { SharedGlobalConfig } from 'kibana/server';
-import type { IRouter, IUiSettingsClient, KibanaRequest } from 'src/core/server';
-import type { DataViewsService } from '../../../data_views/common';
-import type { DataRequestHandlerContext } from '../../../data/server';
-import type { FieldFormatsRegistry } from '../../../field_formats/common';
+import { SharedGlobalConfig } from '@kbn/core/server';
+import type { IRouter, IUiSettingsClient, KibanaRequest } from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import type { Series, VisPayload } from '../common/types';
 import type { SearchStrategyRegistry } from './lib/search_strategies';
 import type { CachedIndexPatternFetcher } from './lib/search_strategies/lib/cached_index_pattern_fetcher';
diff --git a/src/plugins/vis_types/timeseries/server/ui_settings.ts b/src/plugins/vis_types/timeseries/server/ui_settings.ts
index 3d30482dec916..1a6e54de060a0 100644
--- a/src/plugins/vis_types/timeseries/server/ui_settings.ts
+++ b/src/plugins/vis_types/timeseries/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { UI_SETTINGS } from '../common/constants';
 
 export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts
index 573c6c0e00fe2..6304e7e6518ba 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts
@@ -7,11 +7,8 @@
  */
 
 import { getStats } from './get_usage_collector';
-import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
-import type {
-  SavedObjectsClientContract,
-  SavedObjectsFindResponse,
-} from '../../../../../core/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
+import type { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
 import { TIME_RANGE_DATA_MODES } from '../../common/enums';
 
 const mockedSavedObject = {
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts
index cc08b8789d368..1a6c060cd7f96 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { TIME_RANGE_DATA_MODES } from '../../common/enums';
-import { findByValueEmbeddables } from '../../../../dashboard/server';
+import { findByValueEmbeddables } from '@kbn/dashboard-plugin/server';
 
 import type {
   SavedObjectsClientContract,
   ISavedObjectsRepository,
   SavedObjectsFindResult,
-} from '../../../../../core/server';
-import type { HomeServerPluginSetup } from '../../../../home/server';
-import type { SavedVisState } from '../../../../visualizations/common';
+} from '@kbn/core/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { SavedVisState } from '@kbn/visualizations-plugin/common';
+import { TIME_RANGE_DATA_MODES } from '../../common/enums';
 import type { Panel } from '../../common/types';
 
 export interface TimeseriesUsage {
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts
index 3714cc6b30c45..2c4f0f08d216c 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
-import { createUsageCollectionSetupMock } from '../../../../usage_collection/server/mocks';
-import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { registerTimeseriesUsageCollector } from './register_timeseries_collector';
 
 describe('registerTimeseriesUsageCollector', () => {
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts
index e8fd666fb28d1..d06bf7f3a64b5 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { getStats, TimeseriesUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../../usage_collection/server';
-import type { HomeServerPluginSetup } from '../../../../home/server';
 
 export function registerTimeseriesUsageCollector(
   collectorSet: UsageCollectionSetup,
diff --git a/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx b/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx
index 9d2a18d6e0077..51e854ed5b525 100644
--- a/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx
+++ b/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx
@@ -9,11 +9,10 @@
 import React from 'react';
 import { EuiCallOut, EuiButtonIcon } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
 import { VegaSpec } from '../data_model/types';
 import { getDocLinks } from '../services';
 
-import { BUCKET_TYPES } from '../../../../data/public';
-
 export const DeprecatedHistogramIntervalInfo = () => (
   <EuiCallOut
     className="hide-for-sharing"
diff --git a/src/plugins/vis_types/vega/public/components/vega_info_message.tsx b/src/plugins/vis_types/vega/public/components/vega_info_message.tsx
index 265613ef1e6ce..b15de8e4972be 100644
--- a/src/plugins/vis_types/vega/public/components/vega_info_message.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_info_message.tsx
@@ -8,13 +8,13 @@
 
 import React, { useMemo } from 'react';
 import { parse } from 'hjson';
+import type { Vis } from '@kbn/visualizations-plugin/public';
 import { ExperimentalMapLayerInfo, shouldShowMapLayerInfo } from './experimental_map_vis_info';
 import {
   DeprecatedHistogramIntervalInfo,
   shouldShowDeprecatedHistogramIntervalInfo,
 } from './deprecated_interval_info';
 
-import type { Vis } from '../../../../visualizations/public';
 import type { VegaSpec } from '../data_model/types';
 
 const parseSpec = (spec: string) => {
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
index f9b6f3c0e36df..c74f02b730d3f 100644
--- a/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
@@ -10,7 +10,7 @@ import React, { useEffect, useRef, useMemo, useCallback } from 'react';
 import { EuiResizeObserver, EuiResizeObserverProps } from '@elastic/eui';
 import { throttle } from 'lodash';
 
-import type { IInterpreterRenderHandlers, RenderMode } from 'src/plugins/expressions';
+import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin';
 import { createVegaVisualization } from '../vega_visualization';
 import { VegaVisualizationDependencies } from '../plugin';
 import { VegaParser } from '../data_model/vega_parser';
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
index 46e5e331c9455..5349436374fc5 100644
--- a/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
@@ -14,8 +14,8 @@ import React, { useCallback, useState } from 'react';
 import compactStringify from 'json-stringify-pretty-compact';
 import { i18n } from '@kbn/i18n';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { CodeEditor, HJsonLang } from '../../../../kibana_react/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { CodeEditor, HJsonLang } from '@kbn/kibana-react-plugin/public';
 import { getNotifications } from '../services';
 import { VisParams } from '../vega_fn';
 import { VegaHelpMenu } from './vega_help_menu';
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
index 06915e68b7a87..eb713d8099b38 100644
--- a/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
@@ -8,7 +8,7 @@
 
 import React, { lazy } from 'react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { VisParams } from '../vega_fn';
 
 const VegaVisEditor = lazy(() => import('./vega_vis_editor'));
diff --git a/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
index f52101212662d..0b364194a7aa7 100644
--- a/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
+++ b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { cloneDeep, isPlainObject } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Assign } from 'utility-types';
+import { dateHistogramInterval } from '@kbn/data-plugin/common';
 import { TimeCache } from './time_cache';
 import { SearchAPI } from './search_api';
 import {
@@ -23,7 +24,6 @@ import {
   Query,
   ContextVarsObject,
 } from './types';
-import { dateHistogramInterval } from '../../../../data/common';
 
 const TIMEFILTER: string = '%timefilter%';
 const AUTOINTERVAL: string = '%autointerval%';
diff --git a/src/plugins/vis_types/vega/public/data_model/search_api.test.ts b/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
index 4ca87386e4054..45a8799df0a38 100644
--- a/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { extendSearchParamsWithRuntimeFields } from './search_api';
-import { dataViewPluginMocks } from '../../../../data_views/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
-import { getSearchParamsFromRequest } from '../../../../data/public';
-import type { DataViewsPublicPluginStart } from '../../../../data_views/public';
+import { getSearchParamsFromRequest } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 const mockComputedFields = (
   dataViewsStart: DataViewsPublicPluginStart,
diff --git a/src/plugins/vis_types/vega/public/data_model/search_api.ts b/src/plugins/vis_types/vega/public/data_model/search_api.ts
index 19889edf11a82..042bc34dea0f1 100644
--- a/src/plugins/vis_types/vega/public/data_model/search_api.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.ts
@@ -8,17 +8,17 @@
 
 import { combineLatest, from } from 'rxjs';
 import { map, tap, switchMap } from 'rxjs/operators';
-import type { CoreStart, IUiSettingsClient, KibanaExecutionContext } from 'kibana/public';
+import type { CoreStart, IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
 import {
   getSearchParamsFromRequest,
   SearchRequest,
   DataPublicPluginStart,
   IEsSearchResponse,
-} from '../../../../data/public';
-import type { DataViewsPublicPluginStart } from '../../../../data_views/public';
-import { search as dataPluginSearch } from '../../../../data/public';
+} from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { search as dataPluginSearch } from '@kbn/data-plugin/public';
+import type { RequestResponder } from '@kbn/inspector-plugin/public';
 import type { VegaInspectorAdapters } from '../vega_inspector';
-import type { RequestResponder } from '../../../../inspector/public';
 
 /** @internal **/
 export const extendSearchParamsWithRuntimeFields = async (
diff --git a/src/plugins/vis_types/vega/public/data_model/time_cache.ts b/src/plugins/vis_types/vega/public/data_model/time_cache.ts
index cc9619e143437..8ce622755cb83 100644
--- a/src/plugins/vis_types/vega/public/data_model/time_cache.ts
+++ b/src/plugins/vis_types/vega/public/data_model/time_cache.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from '../../../../data/public';
-import { TimeRange } from '../../../../data/common';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { CacheBounds } from './types';
 
 /**
diff --git a/src/plugins/vis_types/vega/public/index.ts b/src/plugins/vis_types/vega/public/index.ts
index 0cf1a12582790..746432663dcfd 100644
--- a/src/plugins/vis_types/vega/public/index.ts
+++ b/src/plugins/vis_types/vega/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ConfigSchema } from '../config';
 import { VegaPlugin as Plugin } from './plugin';
 
diff --git a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
index 70a03a5de995f..da89d9b904d9f 100644
--- a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
+++ b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { dataViewPluginMocks } from '../../../../data_views/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { extractIndexPatternsFromSpec } from './extract_index_pattern';
 import { setDataViews } from '../services';
 
diff --git a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
index a2d22dce614cb..7a52ca254f7ea 100644
--- a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
+++ b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
@@ -7,10 +7,10 @@
  */
 
 import { flatten } from 'lodash';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getDataViews } from '../services';
 
 import type { Data, VegaSpec } from '../data_model/types';
-import type { DataView } from '../../../../data_views/public';
 
 export const extractIndexPatternsFromSpec = async (spec: VegaSpec) => {
   const dataViews = getDataViews();
diff --git a/src/plugins/vis_types/vega/public/plugin.ts b/src/plugins/vis_types/vega/public/plugin.ts
index e33f6141e7358..a95d646427306 100644
--- a/src/plugins/vis_types/vega/public/plugin.ts
+++ b/src/plugins/vis_types/vega/public/plugin.ts
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../data/public';
-import type { DataViewsPublicPluginStart } from '../../../data_views/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { Setup as InspectorSetup } from '../../../inspector/public';
-
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { Setup as InspectorSetup } from '@kbn/inspector-plugin/public';
+
+import type { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 import {
   setNotifications,
   setData,
@@ -26,7 +27,6 @@ import {
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
-import type { MapsEmsPluginPublicStart } from '../../../maps_ems/public';
 import type { IServiceSettings } from './vega_view/vega_map_view/service_settings/service_settings_types';
 
 import { ConfigSchema } from '../config';
diff --git a/src/plugins/vis_types/vega/public/services.ts b/src/plugins/vis_types/vega/public/services.ts
index af162c204acda..f7f0444803a00 100644
--- a/src/plugins/vis_types/vega/public/services.ts
+++ b/src/plugins/vis_types/vega/public/services.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, NotificationsStart, IUiSettingsClient, DocLinksStart } from 'src/core/public';
+import { CoreStart, NotificationsStart, IUiSettingsClient, DocLinksStart } from '@kbn/core/public';
 
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import type { MapsEmsPluginPublicStart } from '../../../maps_ems/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import type { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 
 export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
 
diff --git a/src/plugins/vis_types/vega/public/to_ast.ts b/src/plugins/vis_types/vega/public/to_ast.ts
index f9ff7effafe49..d453b8ec06302 100644
--- a/src/plugins/vis_types/vega/public/to_ast.ts
+++ b/src/plugins/vis_types/vega/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { VegaExpressionFunctionDefinition, VisParams } from './vega_fn';
 
 export const toExpressionAst = (vis: Vis<VisParams>) => {
diff --git a/src/plugins/vis_types/vega/public/vega_fn.ts b/src/plugins/vis_types/vega/public/vega_fn.ts
index 36a534545f078..f8e9eff3bf555 100644
--- a/src/plugins/vis_types/vega/public/vega_fn.ts
+++ b/src/plugins/vis_types/vega/public/vega_fn.ts
@@ -8,15 +8,15 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExecutionContextSearch } from '../../../data/public';
+import { ExecutionContextSearch } from '@kbn/data-plugin/public';
 import {
   ExecutionContext,
   ExpressionFunctionDefinition,
   Render,
-} from '../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
+import { KibanaContext, TimeRange, Query } from '@kbn/data-plugin/public';
 import { VegaVisualizationDependencies } from './plugin';
-import { VegaInspectorAdapters } from './vega_inspector/index';
-import { KibanaContext, TimeRange, Query } from '../../../data/public';
+import { VegaInspectorAdapters } from './vega_inspector';
 import { VegaParser } from './data_model/vega_parser';
 
 type Input = KibanaContext | { type: 'null' };
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx b/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
index 9c13857076d8b..4e028fa3fb3cf 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
@@ -18,8 +18,8 @@ import {
   EuiSpacer,
   CommonProps,
 } from '@elastic/eui';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { VegaAdapter } from '../vega_adapter';
-import { CodeEditor } from '../../../../../kibana_react/public';
 
 interface SpecViewerProps extends CommonProps {
   vegaAdapter: VegaAdapter;
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
index 91f159c86af98..54c6e108505d1 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
@@ -12,9 +12,9 @@ import React, { useState, useEffect } from 'react';
 import { EuiTabbedContent, EuiCallOut } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
+import { InspectorViewProps } from '@kbn/inspector-plugin/public';
 import { VegaInspectorAdapters } from './vega_inspector';
 import { DataViewer, SignalViewer, SpecViewer } from './components';
-import { InspectorViewProps } from '../../../../inspector/public';
 
 export type VegaDataInspectorProps = InspectorViewProps<VegaInspectorAdapters>;
 
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
index 1ca95b84f53ae..02fe668276c93 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
@@ -10,9 +10,9 @@ import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import { Adapters, RequestAdapter, InspectorViewDescription } from '../../../../inspector/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Adapters, RequestAdapter, InspectorViewDescription } from '@kbn/inspector-plugin/public';
 import { VegaAdapter } from './vega_adapter';
 import type { VegaDataInspectorProps } from './vega_data_inspector';
 
diff --git a/src/plugins/vis_types/vega/public/vega_request_handler.ts b/src/plugins/vis_types/vega/public/vega_request_handler.ts
index f632c8e93965c..8670fd9499529 100644
--- a/src/plugins/vis_types/vega/public/vega_request_handler.ts
+++ b/src/plugins/vis_types/vega/public/vega_request_handler.ts
@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
-import type { DataView } from 'src/plugins/data_views/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { Filter, buildEsQuery } from '@kbn/es-query';
-import { getEsQueryConfig, TimeRange, Query } from '../../../data/public';
+import { getEsQueryConfig, TimeRange, Query } from '@kbn/data-plugin/public';
 
 import { SearchAPI } from './data_model/search_api';
 import { TimeCache } from './data_model/time_cache';
diff --git a/src/plugins/vis_types/vega/public/vega_type.ts b/src/plugins/vis_types/vega/public/vega_type.ts
index 23f0e385d2b33..798930db1f975 100644
--- a/src/plugins/vis_types/vega/public/vega_type.ts
+++ b/src/plugins/vis_types/vega/public/vega_type.ts
@@ -9,8 +9,12 @@
 import { i18n } from '@kbn/i18n';
 import { parse } from 'hjson';
 
-import { DefaultEditorSize } from '../../../vis_default_editor/public';
-import { VIS_EVENT_TO_TRIGGER, VisGroups, VisTypeDefinition } from '../../../visualizations/public';
+import { DefaultEditorSize } from '@kbn/vis-default-editor-plugin/public';
+import {
+  VIS_EVENT_TO_TRIGGER,
+  VisGroups,
+  VisTypeDefinition,
+} from '@kbn/visualizations-plugin/public';
 
 import { getDefaultSpec } from './default_spec';
 import { extractIndexPatternsFromSpec } from './lib/extract_index_pattern';
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
index 1ddd2849e3f39..0f4f5574c5742 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IExternalUrl } from 'kibana/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import type { IExternalUrl } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import type { IServiceSettings } from './vega_map_view/service_settings/service_settings_types';
 import { VegaParser } from '../data_model/vega_parser';
 import { createVegaStateRestorer } from '../lib/vega_state_restorer';
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts
index 60f699904c965..d219581647612 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Style } from '@kbn/mapbox-gl';
+import type { StyleSpecification } from '@kbn/mapbox-gl';
 
 export const vegaLayerId = 'vega';
 export const defaultMapConfig = {
@@ -15,7 +15,7 @@ export const defaultMapConfig = {
   tileSize: 256,
 };
 
-export const defaultMabBoxStyle: Style = {
+export const defaultMabBoxStyle: StyleSpecification = {
   /**
    * according to the MapBox documentation that value should be '8'
    * @see (https://docs.mapbox.com/mapbox-gl-js/style-spec/root/#version)
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts
index 69e951d383e12..d90926610685b 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import type { MapsEmsPluginPublicStart, MapConfig } from '@kbn/maps-ems-plugin/public';
 import type { IServiceSettings } from './service_settings_types';
 import { ServiceSettings } from './service_settings';
 import { getMapsEms } from '../../../services';
-import type { MapsEmsPluginPublicStart, MapConfig } from '../../../../../../maps_ems/public';
 
 export async function getServiceSettings(): Promise<IServiceSettings> {
   const mapsEms: MapsEmsPluginPublicStart = getMapsEms();
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts
index 058760b5b2f0b..87ae6082acab4 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts
@@ -9,9 +9,9 @@
 import _ from 'lodash';
 import MarkdownIt from 'markdown-it';
 import type { EMSClient, FileLayer as EMSFileLayer, TMSService } from '@elastic/ems-client';
+import type { MapConfig, TileMapConfig } from '@kbn/maps-ems-plugin/public';
 import type { FileLayer, IServiceSettings, TmsLayer } from './service_settings_types';
 import { ORIGIN_LEGACY, TMS_IN_YML_ID } from './service_settings_types';
-import type { MapConfig, TileMapConfig } from '../../../../../../maps_ems/public';
 /**
  * This class provides access to the EMS-layers and the kibana.yml configured layers through a single interface.
  */
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts
index 35d8c9ffb2de2..577c966fd0fa0 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type { TMSService } from '@elastic/ems-client';
-import type { MapConfig, TileMapConfig } from '../../../../../../maps_ems/public';
+import type { MapConfig, TileMapConfig } from '@kbn/maps-ems-plugin/public';
 
 export const ORIGIN_LEGACY = {
   EMS: 'elastic_maps_service',
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
index c0453f470de4b..6c0d693349ef6 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
@@ -14,11 +14,11 @@ import { VegaParser } from '../../data_model/vega_parser';
 import { TimeCache } from '../../data_model/time_cache';
 import { SearchAPI } from '../../data_model/search_api';
 import vegaMap from '../../test_utils/vega_map_test.json';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../../data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../data_views/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
-import type { IServiceSettings } from '../vega_map_view/service_settings/service_settings_types';
+import type { IServiceSettings } from './service_settings/service_settings_types';
 
 import {
   setInjectedVars,
@@ -29,14 +29,14 @@ import {
 } from '../../services';
 import { initVegaLayer, initTmsRasterLayer } from './layers';
 
-import { mapboxgl } from '@kbn/mapbox-gl';
+import { maplibregl } from '@kbn/mapbox-gl';
 
 jest.mock('@kbn/mapbox-gl', () => {
   const zoomTo = jest.fn();
   const setCenter = jest.fn();
   const fitBounds = jest.fn();
   return {
-    mapboxgl: {
+    maplibregl: {
       mocks: {
         zoomTo,
         setCenter,
@@ -171,7 +171,7 @@ describe('vega_map_view/view', () => {
       await vegaMapView.init();
 
       const { longitude, latitude, scrollWheelZoom } = vegaMapView._parser.mapConfig;
-      expect(mapboxgl.Map).toHaveBeenCalledWith({
+      expect(maplibregl.Map).toHaveBeenCalledWith({
         style: {
           version: 8,
           sources: {},
@@ -195,7 +195,7 @@ describe('vega_map_view/view', () => {
       await vegaMapView.init();
 
       const { longitude, latitude, scrollWheelZoom } = vegaMapView._parser.mapConfig;
-      expect(mapboxgl.Map).toHaveBeenCalledWith({
+      expect(maplibregl.Map).toHaveBeenCalledWith({
         style: {
           version: 8,
           sources: {},
@@ -217,7 +217,7 @@ describe('vega_map_view/view', () => {
       const vegaMapView = await createVegaMapView();
       await vegaMapView.init();
 
-      expect(mapboxgl.NavigationControl).toHaveBeenCalled();
+      expect(maplibregl.NavigationControl).toHaveBeenCalled();
     });
 
     describe('setMapView', () => {
@@ -225,25 +225,25 @@ describe('vega_map_view/view', () => {
       beforeEach(async () => {
         vegaMapView = await createVegaMapView();
         await vegaMapView.init();
-        mapboxgl.mocks.setCenter.mockReset();
-        mapboxgl.mocks.zoomTo.mockReset();
-        mapboxgl.mocks.fitBounds.mockReset();
+        maplibregl.mocks.setCenter.mockReset();
+        maplibregl.mocks.zoomTo.mockReset();
+        maplibregl.mocks.fitBounds.mockReset();
       });
 
       test('should set just lat lng', async () => {
         vegaMapView.setMapViewHandler(1, 2);
-        expect(mapboxgl.mocks.setCenter).toHaveBeenCalledWith({ lat: 1, lng: 2 });
+        expect(maplibregl.mocks.setCenter).toHaveBeenCalledWith({ lat: 1, lng: 2 });
       });
 
       test('should set just lng lat via array', async () => {
         vegaMapView.setMapViewHandler([1, 2]);
-        expect(mapboxgl.mocks.setCenter).toHaveBeenCalledWith({ lat: 2, lng: 1 });
+        expect(maplibregl.mocks.setCenter).toHaveBeenCalledWith({ lat: 2, lng: 1 });
       });
 
       test('should set lat lng and zoom', async () => {
         vegaMapView.setMapViewHandler(1, 2, 6);
-        expect(mapboxgl.mocks.setCenter).toHaveBeenCalledWith({ lat: 1, lng: 2 });
-        expect(mapboxgl.mocks.zoomTo).toHaveBeenCalledWith(6);
+        expect(maplibregl.mocks.setCenter).toHaveBeenCalledWith({ lat: 1, lng: 2 });
+        expect(maplibregl.mocks.zoomTo).toHaveBeenCalledWith(6);
       });
 
       test('should set bounds', async () => {
@@ -251,7 +251,7 @@ describe('vega_map_view/view', () => {
           [1, 2],
           [6, 7],
         ]);
-        expect(mapboxgl.mocks.fitBounds).toHaveBeenCalledWith([
+        expect(maplibregl.mocks.fitBounds).toHaveBeenCalledWith([
           { lat: 2, lng: 1 },
           { lat: 7, lng: 6 },
         ]);
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts
index 2050e0271d03f..fe1d6a27f3605 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts
@@ -7,11 +7,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Map, Style, MapboxOptions } from '@kbn/mapbox-gl';
+import type { Map, StyleSpecification, MapOptions } from '@kbn/mapbox-gl';
 
 import { View, parse, expressionFunction } from 'vega';
 
-import { mapboxgl } from '@kbn/mapbox-gl';
+import { maplibregl } from '@kbn/mapbox-gl';
 
 import { initTmsRasterLayer, initVegaLayer } from './layers';
 import { VegaBaseView } from '../vega_base_view';
@@ -76,7 +76,7 @@ export class VegaMapView extends VegaBaseView {
     return Boolean(this._parser.mapConfig.zoomControl);
   }
 
-  private getMapParams(defaults: { maxZoom: number; minZoom: number }): Partial<MapboxOptions> {
+  private getMapParams(defaults: { maxZoom: number; minZoom: number }): Partial<MapOptions> {
     const { longitude, latitude, scrollWheelZoom } = this._parser.mapConfig;
     const { zoom, maxZoom, minZoom } = validateZoomSettings(
       this._parser.mapConfig,
@@ -106,8 +106,8 @@ export class VegaMapView extends VegaBaseView {
   }
 
   private async initMapContainer(vegaView: View) {
-    let style: Style = defaultMabBoxStyle;
-    let customAttribution: MapboxOptions['customAttribution'] = [];
+    let style: StyleSpecification = defaultMabBoxStyle;
+    let customAttribution: MapOptions['customAttribution'] = [];
     const zoomSettings = {
       minZoom: defaultMapConfig.minZoom,
       maxZoom: defaultMapConfig.maxZoom,
@@ -129,7 +129,7 @@ export class VegaMapView extends VegaBaseView {
       zoomSettings.maxZoom = defaultMapConfig.maxZoom;
       zoomSettings.minZoom = defaultMapConfig.minZoom;
       customAttribution = this._serviceSettings.getAttributionsFromTMSServce(tmsService);
-      style = (await tmsService.getVectorStyleSheet()) as Style;
+      style = (await tmsService.getVectorStyleSheet()) as StyleSpecification;
     } else {
       const config = this._serviceSettings.getTileMapConfig();
       customAttribution = config.options.attribution;
@@ -140,7 +140,7 @@ export class VegaMapView extends VegaBaseView {
 
     // For the correct geration of the PDF/PNG report, we must wait until the map is fully rendered.
     return new Promise((resolve) => {
-      const mapBoxInstance = new mapboxgl.Map({
+      const mapBoxInstance = new maplibregl.Map({
         style,
         customAttribution,
         container: this._$container.get(0),
@@ -171,7 +171,10 @@ export class VegaMapView extends VegaBaseView {
 
   private initControls(mapBoxInstance: Map) {
     if (this.shouldShowZoomControl) {
-      mapBoxInstance.addControl(new mapboxgl.NavigationControl({ showCompass: false }), 'top-left');
+      mapBoxInstance.addControl(
+        new maplibregl.NavigationControl({ showCompass: false }),
+        'top-left'
+      );
     }
 
     // disable map rotation using right click + drag
diff --git a/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
index ac36c9f2d20e1..1584755d84fea 100644
--- a/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
+++ b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
@@ -9,9 +9,9 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { VisualizationContainer } from '../../../visualizations/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { RenderValue } from './vega_fn';
 const LazyVegaVisComponent = lazy(() =>
diff --git a/src/plugins/vis_types/vega/public/vega_visualization.test.js b/src/plugins/vis_types/vega/public/vega_visualization.test.js
index af5b6e0d61ada..d1c821e962021 100644
--- a/src/plugins/vis_types/vega/public/vega_visualization.test.js
+++ b/src/plugins/vis_types/vega/public/vega_visualization.test.js
@@ -19,9 +19,9 @@ import { VegaParser } from './data_model/vega_parser';
 import { SearchAPI } from './data_model/search_api';
 
 import { setInjectedVars, setData, setNotifications } from './services';
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { dataViewPluginMocks } from '../../../data_views/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('./default_spec', () => ({
   getDefaultSpec: () => jest.requireActual('./test_utils/default.spec.json'),
diff --git a/src/plugins/vis_types/vega/public/vega_visualization.ts b/src/plugins/vis_types/vega/public/vega_visualization.ts
index 49e6355a7109d..6540abc5a99dc 100644
--- a/src/plugins/vis_types/vega/public/vega_visualization.ts
+++ b/src/plugins/vis_types/vega/public/vega_visualization.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { IInterpreterRenderHandlers, RenderMode } from 'src/plugins/expressions';
+import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin';
 import { VegaParser } from './data_model/vega_parser';
 import { VegaVisualizationDependencies } from './plugin';
 import { getNotifications, getData } from './services';
diff --git a/src/plugins/vis_types/vega/server/index.ts b/src/plugins/vis_types/vega/server/index.ts
index 62bc9a1494acf..42e03c0ceefc5 100644
--- a/src/plugins/vis_types/vega/server/index.ts
+++ b/src/plugins/vis_types/vega/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeVegaPlugin } from './plugin';
diff --git a/src/plugins/vis_types/vega/server/plugin.ts b/src/plugins/vis_types/vega/server/plugin.ts
index 51a783456d6b2..e5e9bdaefe987 100644
--- a/src/plugins/vis_types/vega/server/plugin.ts
+++ b/src/plugins/vis_types/vega/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { registerVegaUsageCollector } from './usage_collector';
 import {
   ConfigObservable,
diff --git a/src/plugins/vis_types/vega/server/types.ts b/src/plugins/vis_types/vega/server/types.ts
index 626d22b59181a..3f0c3f6f9dbe7 100644
--- a/src/plugins/vis_types/vega/server/types.ts
+++ b/src/plugins/vis_types/vega/server/types.ts
@@ -7,9 +7,9 @@
  */
 
 import { Observable } from 'rxjs';
-import { SharedGlobalConfig } from 'kibana/server';
-import { HomeServerPluginSetup } from '../../../home/server';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
+import { SharedGlobalConfig } from '@kbn/core/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 export type ConfigObservable = Observable<SharedGlobalConfig>;
 
diff --git a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
index 627f8c2eea83c..e7154ea2b7da6 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { getStats } from './get_usage_collector';
-import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
-import type { HomeServerPluginSetup } from '../../../../home/server';
-import type { SavedObjectsClientContract } from '../../../../../core/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const mockedSavedObjects = [
   // vega-lite lib spec
diff --git a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
index 0e67af1c2e890..21afe9f141b88 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
@@ -8,11 +8,8 @@
 
 import { parse } from 'hjson';
 
-import type {
-  SavedObjectsClientContract,
-  SavedObjectsFindResult,
-} from '../../../../../core/server';
-import type { SavedVisState } from '../../../../visualizations/common';
+import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
+import type { SavedVisState } from '@kbn/visualizations-plugin/common';
 import type { VegaSavedObjectAttributes, VisTypeVegaPluginSetupDependencies } from '../types';
 
 type UsageCollectorDependencies = Pick<VisTypeVegaPluginSetupDependencies, 'home'>;
diff --git a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
index 0597f3b856f04..098515d15d9df 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
@@ -9,11 +9,11 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
 import { registerVegaUsageCollector } from './register_vega_collector';
 
-import type { HomeServerPluginSetup } from '../../../../home/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import type { ConfigObservable } from '../types';
 
 describe('registerVegaUsageCollector', () => {
diff --git a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
index 27af5aa57e38b..adf35f81396d1 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getStats, VegaUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../../usage_collection/server';
 import type { ConfigObservable, VisTypeVegaPluginSetupDependencies } from '../types';
 
 export function registerVegaUsageCollector(
diff --git a/src/plugins/vis_types/vislib/public/gauge.ts b/src/plugins/vis_types/vislib/public/gauge.ts
index 5edc33edb84fa..c1eb884124d62 100644
--- a/src/plugins/vis_types/vislib/public/gauge.ts
+++ b/src/plugins/vis_types/vislib/public/gauge.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ColorSchemaParams, Labels, Style } from '../../../charts/public';
-import { RangeValues } from '../../../vis_default_editor/public';
-import { gaugeVisType } from '../../gauge/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
+import { ColorSchemaParams, Labels, Style } from '@kbn/charts-plugin/public';
+import { RangeValues } from '@kbn/vis-default-editor-plugin/public';
+import { gaugeVisType } from '@kbn/vis-type-gauge-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 
 import { Alignment, GaugeType } from './types';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_types/vislib/public/goal.ts b/src/plugins/vis_types/vislib/public/goal.ts
index 205b3a7a4280a..a6410f9b4cd3d 100644
--- a/src/plugins/vis_types/vislib/public/goal.ts
+++ b/src/plugins/vis_types/vislib/public/goal.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisTypeDefinition } from '../../../visualizations/public';
-import { goalVisType } from '../../gauge/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
+import { goalVisType } from '@kbn/vis-type-gauge-plugin/public';
 
 import { toExpressionAst } from './to_ast';
 import { GaugeVisParams } from './gauge';
diff --git a/src/plugins/vis_types/vislib/public/heatmap.ts b/src/plugins/vis_types/vislib/public/heatmap.ts
index 8336ef0b62e0a..f6945ab768889 100644
--- a/src/plugins/vis_types/vislib/public/heatmap.ts
+++ b/src/plugins/vis_types/vislib/public/heatmap.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { RangeValues } from '../../../vis_default_editor/public';
-import { heatmapVisType } from '../../heatmap/public';
+import { RangeValues } from '@kbn/vis-default-editor-plugin/public';
+import { heatmapVisType } from '@kbn/vis-type-heatmap-plugin/public';
 
-import { ColorSchemaParams } from '../../../charts/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
-import { ValueAxis } from '../../xy/public';
+import { ColorSchemaParams } from '@kbn/charts-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
+import { ValueAxis } from '@kbn/vis-type-xy-plugin/public';
 
 import { TimeMarker } from './vislib/visualizations/time_marker';
 import { CommonVislibParams } from './types';
diff --git a/src/plugins/vis_types/vislib/public/index.ts b/src/plugins/vis_types/vislib/public/index.ts
index bd6cf6d9c892d..4d5b33a2dab64 100644
--- a/src/plugins/vis_types/vislib/public/index.ts
+++ b/src/plugins/vis_types/vislib/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { VisTypeVislibPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/vislib/public/pie.ts b/src/plugins/vis_types/vislib/public/pie.ts
index 66d4c326fa47b..27996346ccb28 100644
--- a/src/plugins/vis_types/vislib/public/pie.ts
+++ b/src/plugins/vis_types/vislib/public/pie.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { pieVisType } from '../../pie/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
+import { pieVisType } from '@kbn/vis-type-pie-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { CommonVislibParams } from './types';
 import { toExpressionAst } from './to_ast_pie';
 
diff --git a/src/plugins/vis_types/vislib/public/pie_fn.test.ts b/src/plugins/vis_types/vislib/public/pie_fn.test.ts
index 42061397d0ac7..2112a32b4ff5d 100644
--- a/src/plugins/vis_types/vislib/public/pie_fn.test.ts
+++ b/src/plugins/vis_types/vislib/public/pie_fn.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { Datatable } from 'src/plugins/expressions';
-import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
+import type { Datatable } from '@kbn/expressions-plugin';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import { createPieVisFn } from './pie_fn';
 // @ts-ignore
 import { vislibSlicesResponseHandler } from './vislib/response_handler';
diff --git a/src/plugins/vis_types/vislib/public/pie_fn.ts b/src/plugins/vis_types/vislib/public/pie_fn.ts
index dd5d2689af74d..06d1f5f4baf9a 100644
--- a/src/plugins/vis_types/vislib/public/pie_fn.ts
+++ b/src/plugins/vis_types/vislib/public/pie_fn.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
 
 // @ts-ignore
 import { vislibSlicesResponseHandler } from './vislib/response_handler';
diff --git a/src/plugins/vis_types/vislib/public/plugin.ts b/src/plugins/vis_types/vislib/public/plugin.ts
index 23013bc582387..6d2f199ca898e 100644
--- a/src/plugins/vis_types/vislib/public/plugin.ts
+++ b/src/plugins/vis_types/vislib/public/plugin.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { LEGACY_PIE_CHARTS_LIBRARY } from '../../pie/common/index';
-import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../../heatmap/common/index';
-import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../../gauge/common/index';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { LEGACY_PIE_CHARTS_LIBRARY } from '@kbn/vis-type-pie-plugin/common';
+import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '@kbn/vis-type-heatmap-plugin/common';
+import { LEGACY_GAUGE_CHARTS_LIBRARY } from '@kbn/vis-type-gauge-plugin/common';
 import { heatmapVisTypeDefinition } from './heatmap';
 
 import { createVisTypeVislibVisFn } from './vis_type_vislib_vis_fn';
diff --git a/src/plugins/vis_types/vislib/public/services.ts b/src/plugins/vis_types/vislib/public/services.ts
index 7afe16867bab4..ebc15fc7f4b49 100644
--- a/src/plugins/vis_types/vislib/public/services.ts
+++ b/src/plugins/vis_types/vislib/public/services.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceStart } from 'kibana/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export const [getDataActions, setDataActions] =
   createGetterSetter<DataPublicPluginStart['actions']>('vislib data.actions');
diff --git a/src/plugins/vis_types/vislib/public/to_ast.test.ts b/src/plugins/vis_types/vislib/public/to_ast.test.ts
index 70a1f938a8266..1628fb1812d34 100644
--- a/src/plugins/vis_types/vislib/public/to_ast.test.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 
 import { BasicVislibParams } from './types';
 import { toExpressionAst } from './to_ast';
-import { sampleAreaVis } from '../../xy/public/sample_vis.test.mocks';
+import { sampleAreaVis } from '@kbn/vis-type-xy-plugin/public/sample_vis.test.mocks';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/vislib/public/to_ast.ts b/src/plugins/vis_types/vislib/public/to_ast.ts
index c1de94ba0f5f9..6ef3ec72f4ab0 100644
--- a/src/plugins/vis_types/vislib/public/to_ast.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast.ts
@@ -13,12 +13,12 @@ import {
   VisToExpressionAstParams,
   getVisSchemas,
   VisParams,
-} from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import type { Dimensions } from '../../xy/public';
-import type { DateHistogramParams, HistogramParams } from '../../../visualizations/public';
+} from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import type { Dimensions } from '@kbn/vis-type-xy-plugin/public';
+import type { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
-import { BUCKET_TYPES } from '../../../data/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
 
 import { vislibVisName, VisTypeVislibExpressionFunctionDefinition } from './vis_type_vislib_vis_fn';
 import { BasicVislibParams, VislibChartType } from './types';
diff --git a/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts b/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts
index d34989917e707..6874f812c41ff 100644
--- a/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 /**
  * Get esaggs expressions function
diff --git a/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts b/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts
index 6202df3f65094..49a44c3de4a89 100644
--- a/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 
 import { PieVisParams } from './pie';
-import { samplePieVis } from '../../pie/public/sample_vis.test.mocks';
+import { samplePieVis } from '@kbn/vis-type-pie-plugin/public/sample_vis.test.mocks';
 import { toExpressionAst } from './to_ast_pie';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/vislib/public/to_ast_pie.ts b/src/plugins/vis_types/vislib/public/to_ast_pie.ts
index 90c181f8ac74e..9f7bda7740a44 100644
--- a/src/plugins/vis_types/vislib/public/to_ast_pie.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast_pie.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getVisSchemas, VisToExpressionAst } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 
 import { PieVisParams } from './pie';
 import { vislibPieName, VisTypeVislibPieExpressionFunctionDefinition } from './pie_fn';
diff --git a/src/plugins/vis_types/vislib/public/types.ts b/src/plugins/vis_types/vislib/public/types.ts
index 9184e2a4c884c..dd4c724be1d17 100644
--- a/src/plugins/vis_types/vislib/public/types.ts
+++ b/src/plugins/vis_types/vislib/public/types.ts
@@ -9,7 +9,7 @@
 import { $Values } from '@kbn/utility-types';
 import { Position } from '@elastic/charts';
 
-import { Labels } from '../../../charts/public';
+import { Labels } from '@kbn/charts-plugin/public';
 import {
   CategoryAxis,
   Dimensions,
@@ -17,7 +17,7 @@ import {
   SeriesParam,
   ThresholdLine,
   ValueAxis,
-} from '../../../vis_types/xy/public';
+} from '@kbn/vis-type-xy-plugin/public';
 import { TimeMarker } from './vislib/visualizations/time_marker';
 
 /**
diff --git a/src/plugins/vis_types/vislib/public/vis_controller.tsx b/src/plugins/vis_types/vislib/public/vis_controller.tsx
index 94a7e819f16f0..5a39811961882 100644
--- a/src/plugins/vis_types/vislib/public/vis_controller.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_controller.tsx
@@ -9,10 +9,10 @@
 import $ from 'jquery';
 import React, { RefObject } from 'react';
 
-import { mountReactNode } from '../../../../core/public/utils';
-import { ChartsPluginSetup } from '../../../charts/public';
-import type { PersistedState } from '../../../visualizations/public';
-import { IInterpreterRenderHandlers } from '../../../expressions/public';
+import { mountReactNode } from '@kbn/core/public/utils';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
 
 import { VisTypeVislibCoreSetup } from './plugin';
 import { VisLegend, CUSTOM_LEGEND_VIS_TYPES } from './vislib/components/legend';
diff --git a/src/plugins/vis_types/vislib/public/vis_renderer.tsx b/src/plugins/vis_types/vislib/public/vis_renderer.tsx
index 906c8efb69cf2..767cd6275b9b1 100644
--- a/src/plugins/vis_types/vislib/public/vis_renderer.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_renderer.tsx
@@ -9,10 +9,10 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { ExpressionRenderDefinition } from '../../../expressions/public';
-import { VisualizationContainer } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 import { VisTypeVislibCoreSetup } from './plugin';
 import { VislibRenderValue, vislibVisName } from './vis_type_vislib_vis_fn';
diff --git a/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts b/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts
index 0658ed1b7c4b1..26385d70a9aaa 100644
--- a/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts
+++ b/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
 
 // @ts-ignore
 import { vislibSeriesResponseHandler } from './vislib/response_handler';
diff --git a/src/plugins/vis_types/vislib/public/vis_wrapper.tsx b/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
index e3948807005e6..a800abd3d11fb 100644
--- a/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
@@ -10,9 +10,9 @@ import React, { useEffect, useMemo, useRef } from 'react';
 import { EuiResizeObserver } from '@elastic/eui';
 import { debounce } from 'lodash';
 
-import { IInterpreterRenderHandlers } from '../../../expressions/public';
-import type { PersistedState } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 import { VislibRenderValue } from './vis_type_vislib_vis_fn';
 import { createVislibVisController, VislibVisController } from './vis_controller';
diff --git a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx
index 3ec280951d5f7..577a76dd84454 100644
--- a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx
+++ b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx
@@ -14,8 +14,8 @@ import { i18n } from '@kbn/i18n';
 import { asyncForEach } from '@kbn/std';
 import { EuiPopoverProps, EuiIcon, keys, htmlIdGenerator } from '@elastic/eui';
 
-import { PersistedState } from '../../../../../../visualizations/public';
-import { IInterpreterRenderHandlers } from '../../../../../../expressions/public';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
 
 import { getDataActions } from '../../../services';
 import { CUSTOM_LEGEND_VIS_TYPES, LegendItem } from './models';
diff --git a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx
index 5752a0ac09e8f..c137a689aafba 100644
--- a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx
+++ b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx
@@ -20,8 +20,8 @@ import {
   EuiButtonGroupOptionProps,
 } from '@elastic/eui';
 
+import { ColorPicker } from '@kbn/charts-plugin/public';
 import { LegendItem } from './models';
-import { ColorPicker } from '../../../../../../charts/public';
 
 interface Props {
   item: LegendItem;
diff --git a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
index ecd741bc4d5d0..9fdc6ca88728e 100644
--- a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
+++ b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
@@ -9,7 +9,7 @@
 import { last } from 'lodash';
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../plugins/field_formats/common';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { getValueForPercentageMode } from '../../percentage_mode_transform';
 
 function getMax(handler, config, isGauge) {
diff --git a/src/plugins/vis_types/vislib/public/vislib/errors.ts b/src/plugins/vis_types/vislib/public/vislib/errors.ts
index 67a9d79363e73..b394bbf6383aa 100644
--- a/src/plugins/vis_types/vislib/public/vislib/errors.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/errors.ts
@@ -9,7 +9,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { i18n } from '@kbn/i18n';
-import { KbnError } from '../../../../kibana_utils/public';
+import { KbnError } from '@kbn/kibana-utils-plugin/public';
 
 export class VislibError extends KbnError {
   constructor(message: string) {
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
index 43fdb3c198474..6191bf9e195d6 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Dimensions, Dimension } from '../../../../../pie/public';
+import type { Dimensions, Dimension } from '@kbn/vis-type-pie-plugin/public';
 import { buildHierarchicalData } from './build_hierarchical_data';
 import { Table, TableParent } from '../../types';
 
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
index e5b11fcc0339c..da63b0b5a97a4 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
@@ -7,9 +7,9 @@
  */
 
 import { toArray } from 'lodash';
+import type { Dimensions } from '@kbn/vis-type-pie-plugin/public';
 import { getFormatService } from '../../../services';
 import { Table } from '../../types';
-import type { Dimensions } from '../../../../../pie/public';
 
 interface Slice {
   name: string;
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
index 9256276b1e9c7..5887080210c94 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Dimension } from '../../../../../xy/public';
+import type { Dimension } from '@kbn/vis-type-xy-plugin/public';
 
 import { addToSiri, Serie } from './_add_to_siri';
 import { Point } from './_get_point';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts
index c334a83f3dd6a..612a75b7e282f 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getAggId } from '../../../../../xy/public';
-import type { Dimension } from '../../../../../xy/public';
+import { getAggId } from '@kbn/vis-type-xy-plugin/public';
+import type { Dimension } from '@kbn/vis-type-xy-plugin/public';
 
 import { Point } from './_get_point';
 
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
index e4ebb1fa47929..50cfdf0bad73c 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Dimension, Dimensions } from '../../../../../xy/public';
+import type { Dimension, Dimensions } from '@kbn/vis-type-xy-plugin/public';
 
 import { getAspects } from './_get_aspects';
 import { Aspect } from './point_series';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts
index 1fecf09f77380..aea0135ec2819 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Dimensions } from '../../../../../xy/public';
+import type { Dimensions } from '@kbn/vis-type-xy-plugin/public';
 
 import { makeFakeXAspect } from './_fake_x_aspect';
 import { Aspects } from './point_series';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts
index bf7ff40904130..3c1bac9a057c9 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IFieldFormatsRegistry } from '../../../../../../field_formats/common';
+import { IFieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 
 import { getPoint } from './_get_point';
 import { setFormatService } from '../../../services';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
index 251888aa19498..c3bef9fc021f8 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 
-import type { DateHistogramParams, HistogramParams } from '../../../../../../visualizations/public';
+import type { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { initXAxis } from './_init_x_axis';
 import { makeFakeXAspect } from './_fake_x_aspect';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
index 4d39147587169..8f683bbc66cfb 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 import _ from 'lodash';
 
-import type { DateHistogramParams } from '../../../../../../visualizations/public';
+import type { DateHistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { orderedDateAxis } from './_ordered_date_axis';
 import { OrderedChart } from './point_series';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts
index d6e6531866d4b..d28095678f41d 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 
-import type { Dimensions } from '../../../../../xy/public';
+import type { Dimensions } from '@kbn/vis-type-xy-plugin/public';
 
 import { buildPointSeriesData } from './point_series';
 import { Table, Column } from '../../types';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts
index ec9f0169a48fc..5c82dce313e63 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts
@@ -8,8 +8,8 @@
 
 import { Duration } from 'moment';
 
-import type { Dimension, Dimensions } from '../../../../../xy/public';
-import type { DateHistogramParams, HistogramParams } from '../../../../../../visualizations/public';
+import type { Dimension, Dimensions } from '@kbn/vis-type-xy-plugin/public';
+import type { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { getSeries } from './_get_series';
 import { getAspects } from './_get_aspects';
diff --git a/src/plugins/vis_types/vislib/public/vislib/lib/handler.js b/src/plugins/vis_types/vislib/public/vislib/lib/handler.js
index 7a68b128faf09..fe8388e025b94 100644
--- a/src/plugins/vis_types/vislib/public/vislib/lib/handler.js
+++ b/src/plugins/vis_types/vislib/public/vislib/lib/handler.js
@@ -11,7 +11,7 @@ import _ from 'lodash';
 import MarkdownIt from 'markdown-it';
 import moment from 'moment';
 
-import { dispatchRenderComplete } from '../../../../../kibana_utils/public';
+import { dispatchRenderComplete } from '@kbn/kibana-utils-plugin/public';
 
 import { visTypes as chartTypes } from '../visualizations/vis_types';
 import { NoResults } from '../errors';
diff --git a/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx b/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx
index 4338b0bc99cca..083af7aabb957 100644
--- a/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx
+++ b/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom/server';
 import { EuiIcon } from '@elastic/eui';
-import { KibanaThemeProvider } from '../../../../../kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getTheme } from '../../services';
 
 interface Props {
diff --git a/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js b/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js
index 7313d1c8f8eac..dd86dadee94cb 100644
--- a/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js
+++ b/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js
@@ -8,8 +8,8 @@
 
 import _ from 'lodash';
 import $ from 'jquery';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 import { Vis } from '../vis';
 
diff --git a/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js b/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js
index 4073aeeed434b..7baf50407b64f 100644
--- a/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js
+++ b/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js
@@ -9,8 +9,8 @@
 import d3 from 'd3';
 import _ from 'lodash';
 
-import { getHeatmapColors } from '../../../../../../charts/public';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
+import { getHeatmapColors } from '@kbn/charts-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { getValueForPercentageMode } from '../../percentage_mode_transform';
 
 const arcAngles = {
diff --git a/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js b/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js
index ecab91103d614..cfa627bf37ef6 100644
--- a/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js
+++ b/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js
@@ -12,8 +12,8 @@ import moment from 'moment';
 import { isColorDark } from '@elastic/eui';
 
 import { PointSeries } from './_point_series';
-import { getHeatmapColors } from '../../../../../../../plugins/charts/public';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../plugins/field_formats/common';
+import { getHeatmapColors } from '@kbn/charts-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { getValueForPercentageMode } from '../../percentage_mode_transform';
 
 const defaults = {
diff --git a/src/plugins/vis_types/vislib/server/plugin.ts b/src/plugins/vis_types/vislib/server/plugin.ts
index dfbb30a13dbb1..e59da32896a56 100644
--- a/src/plugins/vis_types/vislib/server/plugin.ts
+++ b/src/plugins/vis_types/vislib/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { getUiSettings } from './ui_settings';
 
 export class VisTypeVislibServerPlugin implements Plugin<object, object> {
diff --git a/src/plugins/vis_types/vislib/server/ui_settings.ts b/src/plugins/vis_types/vislib/server/ui_settings.ts
index 1c7a7cdedc4e0..0247cf94aa75a 100644
--- a/src/plugins/vis_types/vislib/server/ui_settings.ts
+++ b/src/plugins/vis_types/vislib/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { HEATMAP_MAX_BUCKETS_SETTING } from '../common';
 
 export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
diff --git a/src/plugins/vis_types/xy/public/components/xy_current_time.tsx b/src/plugins/vis_types/xy/public/components/xy_current_time.tsx
index 1ecf661355868..68f1dd0d60b13 100644
--- a/src/plugins/vis_types/xy/public/components/xy_current_time.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_current_time.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { DomainRange } from '@elastic/charts';
-import { CurrentTime } from '../../../../charts/public';
+import { CurrentTime } from '@kbn/charts-plugin/public';
 
 interface XYCurrentTime {
   enabled: boolean;
diff --git a/src/plugins/vis_types/xy/public/components/xy_endzones.tsx b/src/plugins/vis_types/xy/public/components/xy_endzones.tsx
index fbf398b886ffa..50982cc30dc3c 100644
--- a/src/plugins/vis_types/xy/public/components/xy_endzones.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_endzones.tsx
@@ -10,7 +10,7 @@ import React, { FC } from 'react';
 
 import { DomainRange } from '@elastic/charts';
 
-import { Endzones } from '../../../../charts/public';
+import { Endzones } from '@kbn/charts-plugin/public';
 
 interface XYEndzones {
   enabled: boolean;
diff --git a/src/plugins/vis_types/xy/public/components/xy_settings.tsx b/src/plugins/vis_types/xy/public/components/xy_settings.tsx
index 1cb38e5af3e7c..836a46236e228 100644
--- a/src/plugins/vis_types/xy/public/components/xy_settings.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_settings.tsx
@@ -26,7 +26,7 @@ import {
   HorizontalAlignment,
 } from '@elastic/charts';
 
-import { renderEndzoneTooltip } from '../../../../charts/public';
+import { renderEndzoneTooltip } from '@kbn/charts-plugin/public';
 
 import { getThemeService } from '../services';
 import { VisConfig } from '../types';
diff --git a/src/plugins/vis_types/xy/public/config/get_aspects.ts b/src/plugins/vis_types/xy/public/config/get_aspects.ts
index 666a913e48402..ee4b403301d87 100644
--- a/src/plugins/vis_types/xy/public/config/get_aspects.ts
+++ b/src/plugins/vis_types/xy/public/config/get_aspects.ts
@@ -10,7 +10,7 @@ import { compact } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn } from '../../../../expressions/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/public';
 
 import { Aspect, Dimension, Aspects, Dimensions } from '../types';
 import { getFormatService } from '../services';
diff --git a/src/plugins/vis_types/xy/public/config/get_axis.ts b/src/plugins/vis_types/xy/public/config/get_axis.ts
index 23605feddd381..62e2345c80566 100644
--- a/src/plugins/vis_types/xy/public/config/get_axis.ts
+++ b/src/plugins/vis_types/xy/public/config/get_axis.ts
@@ -10,9 +10,9 @@ import { identity } from 'lodash';
 
 import { AxisSpec, TickFormatter, YDomainRange, ScaleType as ECScaleType } from '@elastic/charts';
 
-import { LabelRotation } from '../../../../charts/public';
-import { BUCKET_TYPES } from '../../../../data/public';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../charts/common';
+import { LabelRotation } from '@kbn/charts-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
 
 import {
   Aspect,
diff --git a/src/plugins/vis_types/xy/public/config/get_config.ts b/src/plugins/vis_types/xy/public/config/get_config.ts
index 7aad30c5b743e..1a78b65f19f33 100644
--- a/src/plugins/vis_types/xy/public/config/get_config.ts
+++ b/src/plugins/vis_types/xy/public/config/get_config.ts
@@ -8,9 +8,9 @@
 
 import { Fit, ScaleContinuousType } from '@elastic/charts';
 
-import { Datatable } from '../../../../expressions/public';
-import { BUCKET_TYPES } from '../../../../data/public';
-import { DateHistogramParams } from '../../../../visualizations/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { DateHistogramParams } from '@kbn/visualizations-plugin/public';
 
 import {
   Aspect,
@@ -27,7 +27,7 @@ import { getTooltip } from './get_tooltip';
 import { getLegend } from './get_legend';
 import { getAxis } from './get_axis';
 import { getAspects } from './get_aspects';
-import { ChartType } from '../index';
+import { ChartType } from '..';
 import { getSafeId } from '../utils/accessors';
 
 export function getConfig(
diff --git a/src/plugins/vis_types/xy/public/editor/collections.ts b/src/plugins/vis_types/xy/public/editor/collections.ts
index 71f7a639379e0..6df826b3016de 100644
--- a/src/plugins/vis_types/xy/public/editor/collections.ts
+++ b/src/plugins/vis_types/xy/public/editor/collections.ts
@@ -9,9 +9,9 @@
 import { i18n } from '@kbn/i18n';
 import { Fit } from '@elastic/charts';
 
+import { LabelRotation } from '@kbn/charts-plugin/public';
 import { AxisMode, ChartMode, InterpolationMode, ThresholdLineStyle } from '../types';
 import { ChartType } from '../../common';
-import { LabelRotation } from '../../../../charts/public';
 import { getScaleTypes } from './scale_types';
 import { getPositions } from './positions';
 
diff --git a/src/plugins/vis_types/xy/public/editor/common_config.tsx b/src/plugins/vis_types/xy/public/editor/common_config.tsx
index 6c071969f0cd8..499a9884e100d 100644
--- a/src/plugins/vis_types/xy/public/editor/common_config.tsx
+++ b/src/plugins/vis_types/xy/public/editor/common_config.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { VisEditorOptionsProps } from '../../../../visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 import type { VisParams } from '../types';
 import { MetricsAxisOptions, PointSeriesOptions } from './components/options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx b/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx
index 4d50dcd20228f..53f9fbf6873bd 100644
--- a/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx
@@ -8,7 +8,7 @@
 
 import React, { useEffect, useState, useCallback } from 'react';
 
-import { VisEditorOptionsProps } from '../../../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 export interface ValidationVisOptionsProps<T> extends VisEditorOptionsProps<T> {
   setMultipleValidity(paramName: string, isValid: boolean): void;
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx
index ef3e591220efc..86708407566cc 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx
@@ -13,7 +13,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 
-import { SelectOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { LabelOptions, SetAxisLabel } from './label_options';
 import { CategoryAxis } from '../../../../types';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx
index f1643746cd84e..1d609187f83c5 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx
@@ -11,7 +11,7 @@ import React, { useMemo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 
-import { SelectOption } from '../../../../../../../vis_default_editor/public';
+import { SelectOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { SeriesParam, ValueAxis } from '../../../../types';
 import { LineOptions } from './line_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx
index 2152849983513..ef998270fbebd 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx
@@ -10,7 +10,7 @@ import React, { useCallback, useEffect } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { NumberInputOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { ValueAxis } from '../../../../types';
 import { YExtents } from './y_extents';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx
index 6a32b1f75016b..20a4b209e8055 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx
@@ -11,11 +11,11 @@ import { mount, shallow } from 'enzyme';
 
 import { Position } from '@elastic/charts';
 
-import { IAggConfig, IAggType } from 'src/plugins/data/public';
+import { IAggConfig, IAggType } from '@kbn/data-plugin/public';
 
 import { ChartType } from '../../../../../common';
 import { VisParams, SeriesParam, ValueAxis } from '../../../../types';
-import MetricsAxisOptions from './index';
+import MetricsAxisOptions from '.';
 import { ValidationVisOptionsProps } from '../../common';
 import { ValueAxesPanel } from './value_axes_panel';
 import { CategoryAxisPanel } from './category_axis_panel';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx
index 0397eec7b2c73..a8535f9d148eb 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx
@@ -12,7 +12,8 @@ import { cloneDeep, get } from 'lodash';
 import { EuiSpacer } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 
-import { BUCKET_TYPES, IAggConfig } from '../../../../../../../data/public';
+import { BUCKET_TYPES, IAggConfig } from '@kbn/data-plugin/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import { getUISettings } from '../../../../services';
 
 import { VisParams, ValueAxis, SeriesParam, CategoryAxis } from '../../../../types';
@@ -29,7 +30,6 @@ import {
   mapPositionOpposingOpposite,
 } from './utils';
 import { getSeriesParams } from '../../../../utils/get_series_params';
-import { LEGACY_TIME_AXIS } from '../../../../../../../charts/common';
 
 export type SetParamByIndex = <P extends keyof ValueAxis, O extends keyof SeriesParam>(
   axesName: 'valueAxes' | 'seriesParams',
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx
index d24ebaa61d1d3..2c7f394f6a0aa 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx
@@ -12,8 +12,8 @@ import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiToolTip } from '@ela
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { SelectOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
-import { Labels } from '../../../../../../../charts/public';
+import { SelectOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
+import { Labels } from '@kbn/charts-plugin/public';
 
 import { TruncateLabelsOption } from '../../common';
 import { getRotateOptions } from '../../../collections';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx
index 41bbfec7ee939..e01a96728785a 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { NumberInputOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { LineOptions, LineOptionsParams } from './line_options';
 import { seriesParam } from './mocks';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx
index 355b04f07d00d..7f75cf3f0724b 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx
@@ -15,7 +15,7 @@ import {
   NumberInputOption,
   SelectOption,
   SwitchOption,
-} from '../../../../../../../vis_default_editor/public';
+} from '@kbn/vis-default-editor-plugin/public';
 
 import { SeriesParam } from '../../../../types';
 import { SetChart } from './chart_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts
index 1541837dacc30..7bf1191165882 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts
@@ -8,8 +8,8 @@
 
 import { Position } from '@elastic/charts';
 
-import { Vis } from '../../../../../../../visualizations/public';
-import { Style } from '../../../../../../../charts/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { Style } from '@kbn/charts-plugin/public';
 
 import {
   ValueAxis,
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx
index 41d5f7c2c9794..d71773ed81e7b 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiRange, EuiFormRow, EuiSpacer } from '@elastic/eui';
 
-import { SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { SeriesParam } from '../../../../types';
 import { SetChart } from './chart_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx
index 1928b47c64a6e..f078eff843e43 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx
@@ -12,7 +12,7 @@ import { EuiPanel, EuiTitle, EuiSpacer, EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { Vis } from '../../../../../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 import { ValueAxis, SeriesParam } from '../../../../types';
 import { ChartOptions } from './chart_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx
index ceb655fa47107..afcc2a14ea42c 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { Position } from '@elastic/charts';
 
-import { TextInputOption } from '../../../../../../../vis_default_editor/public';
+import { TextInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { ValueAxis, ScaleType } from '../../../../types';
 import { LabelOptions } from './label_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx
index aa20eb84222bd..b1dcdfdbab1fa 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx
@@ -10,11 +10,7 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiAccordion, EuiHorizontalRule } from '@elastic/eui';
 
-import {
-  SelectOption,
-  SwitchOption,
-  TextInputOption,
-} from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption, TextInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { ValueAxis } from '../../../../types';
 import { LabelOptions, SetAxisLabel } from './label_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx
index da7005210865d..2be0c8e955423 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx
@@ -11,7 +11,7 @@ import { mount, shallow } from 'enzyme';
 
 import { ScaleType } from '../../../../types';
 import { YExtents, YExtentsProps } from './y_extents';
-import { NumberInputOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 describe('YExtents component', () => {
   let setMultipleValidity: jest.Mock;
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx
index ce546339a9912..5b37ae97a1966 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx
@@ -10,7 +10,7 @@ import React, { useEffect, useCallback } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { NumberInputOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { Scale, ScaleType } from '../../../../types';
 import { SetScale } from './value_axis_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx
index b073f32ea3a58..8a633e9bda53e 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx
@@ -11,11 +11,7 @@ import type { PaletteRegistry } from '@kbn/coloring';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiFormRow, EuiRange } from '@elastic/eui';
-import {
-  SelectOption,
-  SwitchOption,
-  PalettePicker,
-} from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption, PalettePicker } from '@kbn/vis-default-editor-plugin/public';
 
 import { ChartType } from '../../../../../common';
 import { VisParams } from '../../../../types';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx
index 14a5c2667499f..2a07cbafe027f 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 
-import { SelectOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 import { VisParams, ValueAxis } from '../../../../types';
 import { ValidationVisOptionsProps } from '../../common';
 
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx
index 55ec844c09194..15b5adf00b41f 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx
@@ -17,8 +17,8 @@ import {
   SwitchOption,
   LongLegendOptions,
   LegendSizeSettings,
-} from '../../../../../../../vis_default_editor/public';
-import { BUCKET_TYPES } from '../../../../../../../data/public';
+} from '@kbn/vis-default-editor-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
 
 import { VisParams } from '../../../../types';
 import { GridPanel } from './grid_panel';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx
index 12588975a5a0e..47640c36a3264 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx
@@ -16,7 +16,7 @@ import {
   SelectOption,
   SwitchOption,
   RequiredNumberInputOption,
-} from '../../../../../../../vis_default_editor/public';
+} from '@kbn/vis-default-editor-plugin/public';
 import { ValidationVisOptionsProps } from '../../common';
 import { VisParams } from '../../../../types';
 import { getThresholdLineStyles } from '../../../collections';
diff --git a/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts b/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts
index 08958915da4a4..5283a54e57f30 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { CategoryAxis } from '../types';
 import type { ExpressionValueScale } from './vis_scale';
 import type { ExpressionValueLabel } from './label';
diff --git a/src/plugins/vis_types/xy/public/expression_functions/label.ts b/src/plugins/vis_types/xy/public/expression_functions/label.ts
index e733aebaa627c..cd3eea2b68bc7 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/label.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/label.ts
@@ -7,12 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Labels } from '../../../../charts/public';
+import type { Labels } from '@kbn/charts-plugin/public';
 import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 
 export type ExpressionValueLabel = ExpressionValueBoxed<
   'label',
diff --git a/src/plugins/vis_types/xy/public/expression_functions/series_param.ts b/src/plugins/vis_types/xy/public/expression_functions/series_param.ts
index 174ed4c057974..df5ed2ec0d9b4 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/series_param.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/series_param.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { SeriesParam } from '../types';
 
 export interface Arguments extends Omit<SeriesParam, 'data'> {
diff --git a/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts b/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts
index a4f5cf98fb968..9a496158bf5a7 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { ThresholdLine } from '../types';
 
 export type ExpressionValueThresholdLine = ExpressionValueBoxed<
diff --git a/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts b/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts
index 3b673394463f0..f3b8e9cdc61d0 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { TimeMarker } from '../types';
 
 export type ExpressionValueTimeMarker = ExpressionValueBoxed<
diff --git a/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts b/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts
index a92d35dc9fefd..8b32084d8b588 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionValueCategoryAxis } from './category_axis';
-import type { CategoryAxis } from '../types';
 import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
+import type { ExpressionValueCategoryAxis } from './category_axis';
+import type { CategoryAxis } from '../types';
 
 interface Arguments {
   name: string;
diff --git a/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts b/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts
index ddf14ead20a25..33952473e5916 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { Scale } from '../types';
 
 export type ExpressionValueScale = ExpressionValueBoxed<
diff --git a/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts b/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts
index afd5f39f75742..9ed19e2549389 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts
@@ -12,8 +12,8 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   Render,
-} from '../../../../expressions/common';
-import { prepareLogTable, Dimension } from '../../../../visualizations/public';
+} from '@kbn/expressions-plugin/common';
+import { prepareLogTable, Dimension } from '@kbn/visualizations-plugin/public';
 import type { ChartType } from '../../common';
 import type { VisParams, XYVisConfig } from '../types';
 
diff --git a/src/plugins/vis_types/xy/public/mocks.ts b/src/plugins/vis_types/xy/public/mocks.ts
index 187850e41b3a8..b65ed6caab97c 100644
--- a/src/plugins/vis_types/xy/public/mocks.ts
+++ b/src/plugins/vis_types/xy/public/mocks.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Datatable } from '../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { VisParams } from './types';
 
 export const visData = {
diff --git a/src/plugins/vis_types/xy/public/plugin.ts b/src/plugins/vis_types/xy/public/plugin.ts
index 9f81d6848d2e5..00b036594e4d4 100644
--- a/src/plugins/vis_types/xy/public/plugin.ts
+++ b/src/plugins/vis_types/xy/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup, VisualizationsStart } from '../../../visualizations/public';
-import { ChartsPluginSetup, ChartsPluginStart } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import {
   setDataActions,
   setFormatService,
diff --git a/src/plugins/vis_types/xy/public/services.ts b/src/plugins/vis_types/xy/public/services.ts
index d8c8689eee298..6ee38238c9cf4 100644
--- a/src/plugins/vis_types/xy/public/services.ts
+++ b/src/plugins/vis_types/xy/public/services.ts
@@ -7,10 +7,10 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { CoreSetup, DocLinksStart } from '../../../../core/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { ChartsPluginSetup, ChartsPluginStart } from '../../../charts/public';
+import { CoreSetup, DocLinksStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
 
 export const [getUISettings, setUISettings] =
   createGetterSetter<CoreSetup['uiSettings']>('xy core.uiSettings');
diff --git a/src/plugins/vis_types/xy/public/to_ast.test.ts b/src/plugins/vis_types/xy/public/to_ast.test.ts
index cbe25bc1fef6f..ed35017d53edf 100644
--- a/src/plugins/vis_types/xy/public/to_ast.test.ts
+++ b/src/plugins/vis_types/xy/public/to_ast.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 import { sampleAreaVis } from './sample_vis.test.mocks';
 
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/xy/public/to_ast.ts b/src/plugins/vis_types/xy/public/to_ast.ts
index 0046a6f89a6d5..bf2ca297f9f38 100644
--- a/src/plugins/vis_types/xy/public/to_ast.ts
+++ b/src/plugins/vis_types/xy/public/to_ast.ts
@@ -13,11 +13,12 @@ import {
   getVisSchemas,
   DateHistogramParams,
   HistogramParams,
-} from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { BUCKET_TYPES } from '../../../data/public';
-import { Labels } from '../../../charts/public';
+} from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { Labels } from '@kbn/charts-plugin/public';
 
+import { TimeRangeBounds } from '@kbn/data-plugin/common';
 import {
   Dimensions,
   Dimension,
@@ -32,7 +33,6 @@ import {
 import { visName, VisTypeXyExpressionFunctionDefinition } from './expression_functions/xy_vis_fn';
 import { XyVisType } from '../common';
 import { getEsaggsFn } from './to_ast_esaggs';
-import { TimeRangeBounds } from '../../../data/common';
 import { getSeriesParams } from './utils/get_series_params';
 import { getSafeId } from './utils/accessors';
 
diff --git a/src/plugins/vis_types/xy/public/to_ast_esaggs.ts b/src/plugins/vis_types/xy/public/to_ast_esaggs.ts
index ff9dbd9ca7664..1a9079079ebda 100644
--- a/src/plugins/vis_types/xy/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/xy/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 import { VisParams } from './types';
 
diff --git a/src/plugins/vis_types/xy/public/types/param.ts b/src/plugins/vis_types/xy/public/types/param.ts
index c0913226f9614..708eb1cbdd196 100644
--- a/src/plugins/vis_types/xy/public/types/param.ts
+++ b/src/plugins/vis_types/xy/public/types/param.ts
@@ -8,14 +8,14 @@
 
 import type { Fit, Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import type { Style, Labels } from '../../../../charts/public';
+import type { Style, Labels } from '@kbn/charts-plugin/public';
 import type {
   SchemaConfig,
   ExpressionValueXYDimension,
   FakeParams,
   HistogramParams,
   DateHistogramParams,
-} from '../../../../visualizations/public';
+} from '@kbn/visualizations-plugin/public';
 import type { ChartType, XyVisType } from '../../common';
 import type {
   ExpressionValueCategoryAxis,
diff --git a/src/plugins/vis_types/xy/public/types/vis_type.ts b/src/plugins/vis_types/xy/public/types/vis_type.ts
index 311714ed3587d..39d762465c34f 100644
--- a/src/plugins/vis_types/xy/public/types/vis_type.ts
+++ b/src/plugins/vis_types/xy/public/types/vis_type.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { VisTypeDefinition } from '../../../../visualizations/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { ChartType } from '../../common';
 
 import { VisParams } from './param';
diff --git a/src/plugins/vis_types/xy/public/utils/accessors.test.ts b/src/plugins/vis_types/xy/public/utils/accessors.test.ts
index ebb389054af7e..882c3d382a237 100644
--- a/src/plugins/vis_types/xy/public/utils/accessors.test.ts
+++ b/src/plugins/vis_types/xy/public/utils/accessors.test.ts
@@ -11,7 +11,7 @@ import {
   getComplexAccessor,
   isPercentileIdEqualToSeriesId,
 } from './accessors';
-import { BUCKET_TYPES } from '../../../../data/common';
+import { BUCKET_TYPES } from '@kbn/data-plugin/common';
 import { AccessorFn, Datum } from '@elastic/charts';
 
 describe('XY chart datum accessors', () => {
diff --git a/src/plugins/vis_types/xy/public/utils/accessors.tsx b/src/plugins/vis_types/xy/public/utils/accessors.tsx
index 0acde395bbdb7..9739a9d3328ea 100644
--- a/src/plugins/vis_types/xy/public/utils/accessors.tsx
+++ b/src/plugins/vis_types/xy/public/utils/accessors.tsx
@@ -7,8 +7,8 @@
  */
 
 import { AccessorFn, Accessor } from '@elastic/charts';
-import { BUCKET_TYPES } from '../../../../data/public';
-import { FakeParams } from '../../../../visualizations/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { FakeParams } from '@kbn/visualizations-plugin/public';
 import type { Aspect } from '../types';
 
 export const COMPLEX_X_ACCESSOR = '__customXAccessor__';
diff --git a/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts b/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts
index 78457c2fd56cd..65b43495d8c6d 100644
--- a/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts
+++ b/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts
@@ -7,7 +7,7 @@
  */
 import type { Accessor, AccessorFn } from '@elastic/charts';
 import { computeRatioByGroups } from '@elastic/charts';
-import type { DatatableRow } from '../../../../expressions/public';
+import type { DatatableRow } from '@kbn/expressions-plugin/public';
 
 export const computePercentageData = (
   rows: DatatableRow[],
diff --git a/src/plugins/vis_types/xy/public/utils/domain.ts b/src/plugins/vis_types/xy/public/utils/domain.ts
index 5b1310863979a..1f07509f55aa1 100644
--- a/src/plugins/vis_types/xy/public/utils/domain.ts
+++ b/src/plugins/vis_types/xy/public/utils/domain.ts
@@ -11,9 +11,9 @@ import { unitOfTime } from 'moment';
 
 import { DomainRange } from '@elastic/charts';
 
-import { getAdjustedInterval } from '../../../../charts/public';
-import { Datatable } from '../../../../expressions/public';
-import { DateHistogramParams, HistogramParams } from '../../../../visualizations/public';
+import { getAdjustedInterval } from '@kbn/charts-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { Aspect } from '../types';
 
diff --git a/src/plugins/vis_types/xy/public/utils/get_all_series.ts b/src/plugins/vis_types/xy/public/utils/get_all_series.ts
index cdb8f816d7e4f..6ec625cb884c1 100644
--- a/src/plugins/vis_types/xy/public/utils/get_all_series.ts
+++ b/src/plugins/vis_types/xy/public/utils/get_all_series.ts
@@ -7,7 +7,7 @@
  */
 
 import { TickFormatter } from '@elastic/charts';
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 import { Column, Aspect } from '../types';
 
 interface SplitAccessors {
diff --git a/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx b/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx
index 89cb8d50d4b8e..6c541fc27161e 100644
--- a/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx
+++ b/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx
@@ -12,8 +12,8 @@ import { EuiPopover } from '@elastic/eui';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ComponentType, ReactWrapper } from 'enzyme';
 import { getColorPicker } from './get_color_picker';
-import { ColorPicker } from '../../../../charts/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 
 jest.mock('@elastic/charts', () => {
   const original = jest.requireActual('@elastic/charts');
diff --git a/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx b/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx
index 6e1a61875b5af..18ba4296e2545 100644
--- a/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx
+++ b/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx
@@ -10,8 +10,8 @@ import React, { useCallback } from 'react';
 
 import { LegendColorPicker, Position, XYChartSeriesIdentifier, SeriesName } from '@elastic/charts';
 import { PopoverAnchorPosition, EuiWrappingPopover, EuiOutsideClickDetector } from '@elastic/eui';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ColorPicker } from '../../../../charts/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
 
 function getAnchorPosition(legendPosition: Position): PopoverAnchorPosition {
   switch (legendPosition) {
diff --git a/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx b/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx
index d52e3a457f8e9..028bb31ef7637 100644
--- a/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx
+++ b/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx
@@ -17,7 +17,7 @@ import {
   useLegendAction,
 } from '@elastic/charts';
 
-import { ClickTriggerEvent } from '../../../../charts/public';
+import { ClickTriggerEvent } from '@kbn/charts-plugin/public';
 
 export const getLegendActions = (
   canFilter: (data: ClickTriggerEvent | null) => Promise<boolean>,
diff --git a/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts b/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts
index 5c22527d5b9d7..21b2dac5da322 100644
--- a/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts
+++ b/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { AggConfigs } from '../../../../data/public';
+import type { AggConfigs } from '@kbn/data-plugin/public';
 import type { SeriesParam } from '../types';
 import { getSeriesParams } from './get_series_params';
 import { sampleAreaVis } from '../sample_vis.test.mocks';
diff --git a/src/plugins/vis_types/xy/public/utils/get_series_params.ts b/src/plugins/vis_types/xy/public/utils/get_series_params.ts
index 0acd2a0913282..84ee04fa01919 100644
--- a/src/plugins/vis_types/xy/public/utils/get_series_params.ts
+++ b/src/plugins/vis_types/xy/public/utils/get_series_params.ts
@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import type { AggConfigs } from '@kbn/data-plugin/public';
 import { ValueAxis, SeriesParam, ChartMode, InterpolationMode } from '../types';
 import { ChartType } from '../../common';
-import type { AggConfigs } from '../../../../data/public';
 
 const makeSerie = (
   id: string,
diff --git a/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx b/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx
index 6f56eff3c2a92..6be7c31cb1060 100644
--- a/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx
+++ b/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { AreaSeries, BarSeries, CurveType } from '@elastic/charts';
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 import { renderAllSeries } from './render_all_series';
 import {
   getVisConfig,
diff --git a/src/plugins/vis_types/xy/public/utils/render_all_series.tsx b/src/plugins/vis_types/xy/public/utils/render_all_series.tsx
index d9e4e9a47c23f..0e3787a27560d 100644
--- a/src/plugins/vis_types/xy/public/utils/render_all_series.tsx
+++ b/src/plugins/vis_types/xy/public/utils/render_all_series.tsx
@@ -20,7 +20,7 @@ import {
   LabelOverflowConstraint,
 } from '@elastic/charts';
 
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 
 import { ChartType } from '../../common';
 import { SeriesParam, VisConfig, Aspect } from '../types';
diff --git a/src/plugins/vis_types/xy/public/vis_component.tsx b/src/plugins/vis_types/xy/public/vis_component.tsx
index 05d2d0b0765cd..3bc7eb4a77c52 100644
--- a/src/plugins/vis_types/xy/public/vis_component.tsx
+++ b/src/plugins/vis_types/xy/public/vis_component.tsx
@@ -30,9 +30,9 @@ import {
   getBrushFromChartBrushEventFn,
   ClickTriggerEvent,
   useActiveCursor,
-} from '../../../charts/public';
-import { Datatable, IInterpreterRenderHandlers } from '../../../expressions/public';
-import type { PersistedState } from '../../../visualizations/public';
+} from '@kbn/charts-plugin/public';
+import { Datatable, IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { VisParams } from './types';
 import {
   getAdjustedDomain,
diff --git a/src/plugins/vis_types/xy/public/vis_renderer.tsx b/src/plugins/vis_types/xy/public/vis_renderer.tsx
index e4fb02af1ed49..abdb4c0cca6cf 100644
--- a/src/plugins/vis_types/xy/public/vis_renderer.tsx
+++ b/src/plugins/vis_types/xy/public/vis_renderer.tsx
@@ -9,17 +9,17 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import { IUiSettingsClient, ThemeServiceStart } from 'kibana/public';
+import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
 
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { VisualizationContainer } from '../../../visualizations/public';
-import type { PersistedState } from '../../../visualizations/public';
-import type { ExpressionRenderDefinition } from '../../../expressions/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin/public';
 
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import type { XyVisType } from '../common';
 import type { VisComponentType } from './vis_component';
 import { RenderValue, visName } from './expression_functions/xy_vis_fn';
-import { LEGACY_TIME_AXIS } from '../../../charts/common';
 
 // @ts-ignore
 const VisComponent = lazy<VisComponentType>(() => import('./vis_component'));
diff --git a/src/plugins/vis_types/xy/public/vis_types/area.ts b/src/plugins/vis_types/xy/public/vis_types/area.ts
index d5e35dbc9f3de..8c83c8ac4dcd5 100644
--- a/src/plugins/vis_types/xy/public/vis_types/area.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/area.ts
@@ -11,9 +11,9 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Fit, Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 
 import {
   ChartMode,
diff --git a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts
index d1ca6bf3455ff..5176a54c61924 100644
--- a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { VisParams } from 'src/plugins/visualizations/common';
+import { VisParams } from '@kbn/visualizations-plugin/common';
 import { getVisTypeFromParams } from './get_vis_type_from_params';
 
 describe('extracting visualization type from vis params', () => {
diff --git a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts
index abe67052cd97a..c1f79b041e807 100644
--- a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { VisParams } from 'src/plugins/visualizations/common';
+import { VisParams } from '@kbn/visualizations-plugin/common';
 
 export const getVisTypeFromParams = (params?: VisParams) => {
   let type = params?.seriesParams?.[0]?.type;
diff --git a/src/plugins/vis_types/xy/public/vis_types/histogram.ts b/src/plugins/vis_types/xy/public/vis_types/histogram.ts
index c0b3e5f4e5073..d0a4307af198c 100644
--- a/src/plugins/vis_types/xy/public/vis_types/histogram.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/histogram.ts
@@ -11,9 +11,10 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 import {
   ChartMode,
   AxisType,
@@ -25,7 +26,6 @@ import {
 import { toExpressionAst } from '../to_ast';
 import { ChartType } from '../../common';
 import { optionTabs } from '../editor/common_config';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
 import { getVisTypeFromParams } from './get_vis_type_from_params';
 
 export const histogramVisTypeDefinition = {
diff --git a/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts b/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts
index f62e4e2287115..2e6708667ded2 100644
--- a/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts
@@ -11,9 +11,10 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 import {
   ChartMode,
   AxisType,
@@ -25,7 +26,6 @@ import {
 import { toExpressionAst } from '../to_ast';
 import { ChartType } from '../../common';
 import { optionTabs } from '../editor/common_config';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
 import { getVisTypeFromParams } from './get_vis_type_from_params';
 
 export const horizontalBarVisTypeDefinition = {
diff --git a/src/plugins/vis_types/xy/public/vis_types/line.ts b/src/plugins/vis_types/xy/public/vis_types/line.ts
index c14339bd1d652..536a71eb6e540 100644
--- a/src/plugins/vis_types/xy/public/vis_types/line.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/line.ts
@@ -11,9 +11,9 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Position, Fit } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 
 import {
   ChartMode,
diff --git a/src/plugins/vis_types/xy/server/index.ts b/src/plugins/vis_types/xy/server/index.ts
index 9dfa405ee27b8..9ee8a69c9d777 100644
--- a/src/plugins/vis_types/xy/server/index.ts
+++ b/src/plugins/vis_types/xy/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeXYServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/xy/server/plugin.ts b/src/plugins/vis_types/xy/server/plugin.ts
index 5cb0687cf1889..3e739678763ae 100644
--- a/src/plugins/vis_types/xy/server/plugin.ts
+++ b/src/plugins/vis_types/xy/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'src/core/server';
+import { Plugin } from '@kbn/core/server';
 
 export class VisTypeXYServerPlugin implements Plugin {
   public setup() {
diff --git a/src/plugins/visualizations/common/expression_functions/range.ts b/src/plugins/visualizations/common/expression_functions/range.ts
index 04751ef01985e..5772c089790ab 100644
--- a/src/plugins/visualizations/common/expression_functions/range.ts
+++ b/src/plugins/visualizations/common/expression_functions/range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable, Range } from '../../../expressions/common';
+import { ExpressionFunctionDefinition, Datatable, Range } from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   from: number;
diff --git a/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts b/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts
index 990631c260479..0a7614c1750cf 100644
--- a/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts
+++ b/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { Arguments, visDimension } from './vis_dimension';
-import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../expressions/common';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import moment from 'moment';
 
 describe('interpreter/functions#vis_dimension', () => {
diff --git a/src/plugins/visualizations/common/expression_functions/vis_dimension.ts b/src/plugins/visualizations/common/expression_functions/vis_dimension.ts
index bd5694cb69a03..99574e1c36756 100644
--- a/src/plugins/visualizations/common/expression_functions/vis_dimension.ts
+++ b/src/plugins/visualizations/common/expression_functions/vis_dimension.ts
@@ -12,7 +12,7 @@ import {
   ExpressionValueBoxed,
   Datatable,
   DatatableColumn,
-} from '../../../expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { findAccessorOrFail } from '../utils/accessors';
 
 export interface Arguments {
diff --git a/src/plugins/visualizations/common/expression_functions/xy_dimension.ts b/src/plugins/visualizations/common/expression_functions/xy_dimension.ts
index 5bbddd48e9b8b..19872529cb9f9 100644
--- a/src/plugins/visualizations/common/expression_functions/xy_dimension.ts
+++ b/src/plugins/visualizations/common/expression_functions/xy_dimension.ts
@@ -7,15 +7,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionValueVisDimension } from './vis_dimension';
 
 import type {
   ExpressionFunctionDefinition,
   ExpressionValueBoxed,
   Datatable,
   DatatableColumn,
-} from '../../../expressions/common';
-import type { SerializedFieldFormat } from '../../../field_formats/common';
+} from '@kbn/expressions-plugin/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { ExpressionValueVisDimension } from './vis_dimension';
 
 export interface DateHistogramParams {
   date: boolean;
diff --git a/src/plugins/visualizations/common/locator.test.ts b/src/plugins/visualizations/common/locator.test.ts
index c08c6a910327e..7dcdd7191d60b 100644
--- a/src/plugins/visualizations/common/locator.test.ts
+++ b/src/plugins/visualizations/common/locator.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { VisualizeLocatorDefinition } from './locator';
-import { FilterStateStore } from '../../data/common';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 
 describe('visualize locator', () => {
   let definition: VisualizeLocatorDefinition;
diff --git a/src/plugins/visualizations/common/locator.ts b/src/plugins/visualizations/common/locator.ts
index 8e562eedb765a..60ac8230090fb 100644
--- a/src/plugins/visualizations/common/locator.ts
+++ b/src/plugins/visualizations/common/locator.ts
@@ -8,8 +8,8 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import { Filter } from '@kbn/es-query';
-import type { Query, RefreshInterval, TimeRange } from 'src/plugins/data/common';
-import type { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
+import type { Query, RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 import type { SavedVisState } from './types';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
diff --git a/src/plugins/visualizations/common/locator_location.ts b/src/plugins/visualizations/common/locator_location.ts
index 1e6ee3d362d68..c4c86007fd124 100644
--- a/src/plugins/visualizations/common/locator_location.ts
+++ b/src/plugins/visualizations/common/locator_location.ts
@@ -12,7 +12,7 @@ import type { ParsedQuery } from 'query-string';
 import { stringify } from 'query-string';
 import rison from 'rison-node';
 import { isFilterPinned } from '@kbn/es-query';
-import { url } from '../../kibana_utils/common';
+import { url } from '@kbn/kibana-utils-plugin/common';
 import { GLOBAL_STATE_STORAGE_KEY, STATE_STORAGE_KEY, VisualizeConstants } from './constants';
 import type { VisualizeLocatorParams } from './locator';
 
diff --git a/src/plugins/visualizations/common/types.ts b/src/plugins/visualizations/common/types.ts
index 4d0424fc3f8a1..978e424477be6 100644
--- a/src/plugins/visualizations/common/types.ts
+++ b/src/plugins/visualizations/common/types.ts
@@ -7,9 +7,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectAttributes } from 'kibana/server';
+import { SavedObjectAttributes } from '@kbn/core/server';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { AggConfigSerialized, SerializedSearchSourceFields } from 'src/plugins/data/common';
+import { AggConfigSerialized, SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface VisParams {
   [key: string]: any;
diff --git a/src/plugins/visualizations/common/utils/accessors.ts b/src/plugins/visualizations/common/utils/accessors.ts
index d290eabf93080..83ec3aa802ac3 100644
--- a/src/plugins/visualizations/common/utils/accessors.ts
+++ b/src/plugins/visualizations/common/utils/accessors.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { i18n } from '@kbn/i18n';
-import { Datatable, DatatableColumn } from '../../../expressions/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '../expression_functions';
 
 const getAccessorByIndex = (accessor: number, columns: Datatable['columns']) =>
diff --git a/src/plugins/visualizations/common/utils/prepare_log_table.ts b/src/plugins/visualizations/common/utils/prepare_log_table.ts
index 36234a0fcaa58..6ff3a80e35f87 100644
--- a/src/plugins/visualizations/common/utils/prepare_log_table.ts
+++ b/src/plugins/visualizations/common/utils/prepare_log_table.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { ExpressionValueVisDimension } from '../expression_functions/vis_dimension';
 import { ExpressionValueXYDimension } from '../expression_functions/xy_dimension';
-import { Datatable, DatatableColumn } from '../../../expressions/common/expression_types/specs';
 
 type DimensionColumn = ExpressionValueVisDimension | ExpressionValueXYDimension | string;
 
diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json
index 3a4dc81ed8df7..2588a3e9854e6 100644
--- a/src/plugins/visualizations/kibana.json
+++ b/src/plugins/visualizations/kibana.json
@@ -17,7 +17,7 @@
     "dataViews"
   ],
   "optionalPlugins": ["home", "share", "usageCollection", "spaces", "savedObjectsTaggingOss"],
-  "requiredBundles": ["kibanaUtils", "discover", "kibanaReact", "home"],
+  "requiredBundles": ["kibanaUtils", "discover", "kibanaReact"],
   "extraPublicDirs": ["common/constants", "common/utils", "common/expression_functions"],
   "owner": {
     "name": "Vis Editors",
diff --git a/src/plugins/visualizations/public/components/visualization_container.tsx b/src/plugins/visualizations/public/components/visualization_container.tsx
index a978718c9aa2b..bfe3cf3aaa526 100644
--- a/src/plugins/visualizations/public/components/visualization_container.tsx
+++ b/src/plugins/visualizations/public/components/visualization_container.tsx
@@ -10,7 +10,7 @@ import React, { ReactNode, Suspense, lazy } from 'react';
 import { EuiLoadingChart } from '@elastic/eui';
 import classNames from 'classnames';
 
-import { IInterpreterRenderHandlers } from '../../../expressions/common';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 
 export interface VisualizationContainerProps {
   'data-test-subj'?: string;
diff --git a/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts b/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts
index b5cd655e712e9..744537b534f95 100644
--- a/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts
+++ b/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { IContainer, ErrorEmbeddable, AttributeService } from '@kbn/embeddable-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { Vis } from '../types';
 import type {
   VisualizeInput,
@@ -14,17 +16,11 @@ import type {
   VisualizeByReferenceInput,
   VisualizeSavedObjectAttributes,
 } from './visualize_embeddable';
-import {
-  IContainer,
-  ErrorEmbeddable,
-  AttributeService,
-} from '../../../../plugins/embeddable/public';
 import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
 import { getUISettings, getHttp, getTimeFilter, getCapabilities } from '../services';
 import { urlFor } from '../utils/saved_visualize_utils';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
-import type { DataView } from '../../../data_views/public';
 import { createVisualizeEmbeddableAsync } from './visualize_embeddable_async';
 
 export const createVisEmbeddableFromObject =
diff --git a/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx b/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx
index b363553e6c9b2..3cb35f4bf69b0 100644
--- a/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx
+++ b/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { Embeddable, EmbeddableOutput } from '../../../../plugins/embeddable/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Embeddable, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 
 import { DisabledLabVisualization } from './disabled_lab_visualization';
 import { VisualizeInput } from './visualize_embeddable';
diff --git a/src/plugins/visualizations/public/embeddable/events.ts b/src/plugins/visualizations/public/embeddable/events.ts
index a1c60ce3c9252..0e6dc57f49922 100644
--- a/src/plugins/visualizations/public/embeddable/events.ts
+++ b/src/plugins/visualizations/public/embeddable/events.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ROW_CLICK_TRIGGER } from '../../../ui_actions/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../plugins/data/public';
-import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER } from '../../../../plugins/embeddable/public';
+import { ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
 
 export interface VisEventToTrigger {
   ['applyFilter']: typeof APPLY_FILTER_TRIGGER;
diff --git a/src/plugins/visualizations/public/embeddable/to_ast.ts b/src/plugins/visualizations/public/embeddable/to_ast.ts
index 95b64fe4e6e17..dc4e931781f7b 100644
--- a/src/plugins/visualizations/public/embeddable/to_ast.ts
+++ b/src/plugins/visualizations/public/embeddable/to_ast.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunctionKibana, ExpressionFunctionKibanaContext } from '../../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { ExpressionFunctionKibana, ExpressionFunctionKibanaContext } from '@kbn/data-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 
+import { queryToAst, filtersToAst } from '@kbn/data-plugin/common';
 import { VisToExpressionAst } from '../types';
-import { queryToAst, filtersToAst } from '../../../data/common';
 
 /**
  * Creates an ast expression for a visualization based on kibana context (query, filters, timerange)
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
index 7854012bf61fe..efb60c16b4bf9 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
@@ -13,11 +13,10 @@ import React from 'react';
 import { render } from 'react-dom';
 import { EuiLoadingChart } from '@elastic/eui';
 import { Filter, onlyDisabledFiltersChanged } from '@kbn/es-query';
-import type { SavedObjectAttributes, KibanaExecutionContext } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
-import { TimeRange, Query, TimefilterContract } from '../../../../plugins/data/public';
-import type { DataView } from '../../../../plugins/data_views/public';
+import type { SavedObjectAttributes, KibanaExecutionContext } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { TimeRange, Query, TimefilterContract } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   EmbeddableInput,
   EmbeddableOutput,
@@ -27,13 +26,15 @@ import {
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
   AttributeService,
-} from '../../../../plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import {
   IExpressionLoaderParams,
   ExpressionLoader,
   ExpressionRenderError,
   ExpressionAstExpression,
-} from '../../../../plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
+import type { RenderMode } from '@kbn/expressions-plugin';
+import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import { Vis, SerializedVis } from '../vis';
 import { getExecutionContext, getExpressions, getTheme, getUiActions } from '../services';
 import { VIS_EVENT_TO_TRIGGER } from './events';
@@ -41,7 +42,6 @@ import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 import { getSavedVisualization } from '../utils/saved_visualize_utils';
 import { VisSavedObject } from '../types';
 import { toExpressionAst } from './to_ast';
-import type { RenderMode } from '../../../expressions';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
 
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts
index 814a5996af638..98fa2108bbca1 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import { VisualizeEmbeddableFactory, VisualizeInput } from '.';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
index 2760b64472a5e..05e7ea218325b 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
@@ -8,15 +8,15 @@
 
 import { i18n } from '@kbn/i18n';
 import { first } from 'rxjs/operators';
-import type { SavedObjectMetaData, OnSaveProps } from 'src/plugins/saved_objects/public';
-import type { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import type { SavedObjectMetaData, OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import type { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 
 import {
   injectSearchSourceReferences,
   extractSearchSourceReferences,
   SerializedSearchSourceFields,
-} from '../../../data/public';
-import type { SavedObjectAttributes, SavedObjectReference } from '../../../../core/public';
+} from '@kbn/data-plugin/public';
+import type { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/public';
 
 import {
   EmbeddableFactoryDefinition,
@@ -24,7 +24,9 @@ import {
   ErrorEmbeddable,
   IContainer,
   AttributeService,
-} from '../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { checkForDuplicateTitle } from '@kbn/saved-objects-plugin/public';
+import type { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import type { DisabledLabEmbeddable } from './disabled_lab_embeddable';
 import type {
   VisualizeByReferenceInput,
@@ -53,8 +55,6 @@ import {
 } from '../utils/saved_visualization_references';
 import { createVisEmbeddableFromObject } from './create_vis_embeddable_from_object';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
-import { checkForDuplicateTitle } from '../../../saved_objects/public';
-import type { StartServicesGetter } from '../../../kibana_utils/public';
 import type { VisualizationsStartDeps } from '../plugin';
 
 interface VisualizationAttributes extends SavedObjectAttributes {
diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts
index 73f02a44dac13..22217e9de9abe 100644
--- a/src/plugins/visualizations/public/index.ts
+++ b/src/plugins/visualizations/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PublicContract } from '@kbn/utility-types';
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { VisualizationsPlugin, VisualizationsSetup, VisualizationsStart } from './plugin';
 import type { VisualizeEmbeddableFactory, VisualizeEmbeddable } from './embeddable';
 
diff --git a/src/plugins/visualizations/public/mocks.ts b/src/plugins/visualizations/public/mocks.ts
index 901ca34c34521..35cc96daf4f7d 100644
--- a/src/plugins/visualizations/public/mocks.ts
+++ b/src/plugins/visualizations/public/mocks.ts
@@ -6,25 +6,25 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
-import { Schema, VisualizationsSetup, VisualizationsStart } from './';
-import { Schemas } from './vis_types';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { coreMock, applicationServiceMock } from '@kbn/core/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
+import { urlForwardingPluginMock } from '@kbn/url-forwarding-plugin/public/mocks';
+import { navigationPluginMock } from '@kbn/navigation-plugin/public/mocks';
+import { presentationUtilPluginMock } from '@kbn/presentation-util-plugin/public/mocks';
+import { savedObjectTaggingOssPluginMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 import { VisualizationsPlugin } from './plugin';
-import { spacesPluginMock } from '../../../../x-pack/plugins/spaces/public/mocks';
-import { coreMock, applicationServiceMock } from '../../../core/public/mocks';
-import { embeddablePluginMock } from '../../../plugins/embeddable/public/mocks';
-import { expressionsPluginMock } from '../../../plugins/expressions/public/mocks';
-import { dataPluginMock } from '../../../plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../plugins/data_views/public/mocks';
-import { usageCollectionPluginMock } from '../../../plugins/usage_collection/public/mocks';
-import { uiActionsPluginMock } from '../../../plugins/ui_actions/public/mocks';
-import { inspectorPluginMock } from '../../../plugins/inspector/public/mocks';
-import { savedObjectsPluginMock } from '../../../plugins/saved_objects/public/mocks';
-import { urlForwardingPluginMock } from '../../../plugins/url_forwarding/public/mocks';
-import { navigationPluginMock } from '../../../plugins/navigation/public/mocks';
-import { presentationUtilPluginMock } from '../../../plugins/presentation_util/public/mocks';
-import { savedObjectTaggingOssPluginMock } from '../../saved_objects_tagging_oss/public/mocks';
-import { screenshotModePluginMock } from '../../screenshot_mode/public/mocks';
+import { Schemas } from './vis_types';
+import { Schema, VisualizationsSetup, VisualizationsStart } from '.';
 
 const createSetupContract = (): VisualizationsSetup => ({
   createBaseVisualization: jest.fn(),
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
index a4934e0b8edff..7cba4ef19b254 100644
--- a/src/plugins/visualizations/public/plugin.ts
+++ b/src/plugins/visualizations/public/plugin.ts
@@ -15,8 +15,59 @@ import {
   AppUpdater,
   DEFAULT_APP_CATEGORIES,
   ScopedHistory,
-} from '../../../core/public';
-import { VisualizeConstants } from '../common/constants';
+} from '@kbn/core/public';
+
+import {
+  createKbnUrlStateStorage,
+  createKbnUrlTracker,
+  createStartServicesGetter,
+  Storage,
+  withNotifyOnErrors,
+} from '@kbn/kibana-utils-plugin/public';
+
+import type {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  ApplicationStart,
+  SavedObjectsClientContract,
+} from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { UiActionsStart, UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import type {
+  Setup as InspectorSetup,
+  Start as InspectorStart,
+} from '@kbn/inspector-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import type { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { TypesSetup, TypesStart } from './vis_types';
+import type { VisualizeServices } from './visualize_app/types';
+import { visualizeEditorTrigger } from './triggers';
+import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry';
+import { showNewVisModal } from './wizard';
+import { VisualizeLocatorDefinition } from '../common/locator';
+import { xyDimension as xyDimensionExpressionFunction } from '../common/expression_functions/xy_dimension';
+import { visDimension as visDimensionExpressionFunction } from '../common/expression_functions/vis_dimension';
+import { range as rangeExpressionFunction } from '../common/expression_functions/range';
+import { TypesService } from './vis_types/types_service';
+import {
+  createVisEmbeddableFromObject,
+  VISUALIZE_EMBEDDABLE_TYPE,
+  VisualizeEmbeddableFactory,
+} from './embeddable';
 import {
   setUISettings,
   setTypes,
@@ -38,59 +89,7 @@ import {
   setTheme,
   setExecutionContext,
 } from './services';
-import {
-  createVisEmbeddableFromObject,
-  VISUALIZE_EMBEDDABLE_TYPE,
-  VisualizeEmbeddableFactory,
-} from './embeddable';
-import { TypesService } from './vis_types/types_service';
-import { range as rangeExpressionFunction } from '../common/expression_functions/range';
-import { visDimension as visDimensionExpressionFunction } from '../common/expression_functions/vis_dimension';
-import { xyDimension as xyDimensionExpressionFunction } from '../common/expression_functions/xy_dimension';
-
-import {
-  createKbnUrlStateStorage,
-  createKbnUrlTracker,
-  createStartServicesGetter,
-  Storage,
-  withNotifyOnErrors,
-} from '../../kibana_utils/public';
-import { VisualizeLocatorDefinition } from '../common/locator';
-import { showNewVisModal } from './wizard';
-import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry';
-import { FeatureCatalogueCategory } from '../../home/public';
-import { visualizeEditorTrigger } from './triggers';
-
-import type { VisualizeServices } from './visualize_app/types';
-import type {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  ApplicationStart,
-  SavedObjectsClientContract,
-} from '../../../core/public';
-import type { UsageCollectionSetup } from '../../usage_collection/public';
-import type { UiActionsStart, UiActionsSetup } from '../../ui_actions/public';
-import type { SavedObjectsStart } from '../../saved_objects/public';
-import type { TypesSetup, TypesStart } from './vis_types';
-import type {
-  Setup as InspectorSetup,
-  Start as InspectorStart,
-} from '../../../plugins/inspector/public';
-import type { DataPublicPluginSetup, DataPublicPluginStart } from '../../../plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../plugins/data_views/public';
-import type { ExpressionsSetup, ExpressionsStart } from '../../expressions/public';
-import type { EmbeddableSetup, EmbeddableStart } from '../../embeddable/public';
-import type { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
-import type { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
-import type { SharePluginSetup, SharePluginStart } from '../../share/public';
-import type { UrlForwardingSetup, UrlForwardingStart } from '../../url_forwarding/public';
-import type { PresentationUtilPluginStart } from '../../presentation_util/public';
-import type { UsageCollectionStart } from '../../usage_collection/public';
-import type { ScreenshotModePluginStart } from '../../screenshot_mode/public';
-import type { HomePublicPluginSetup } from '../../home/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
+import { VisualizeConstants } from '../common/constants';
 
 /**
  * Interface for this plugin's returned setup/start contracts.
@@ -323,7 +322,7 @@ export class VisualizationsPlugin
         icon: 'visualizeApp',
         path: `/app/visualize#${VisualizeConstants.LANDING_PAGE_PATH}`,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
       });
     }
 
diff --git a/src/plugins/visualizations/public/services.ts b/src/plugins/visualizations/public/services.ts
index 8564c8225f1a7..af19c9302b4f5 100644
--- a/src/plugins/visualizations/public/services.ts
+++ b/src/plugins/visualizations/public/services.ts
@@ -17,15 +17,15 @@ import type {
   DocLinksStart,
   ThemeServiceStart,
   ExecutionContextSetup,
-} from '../../../core/public';
+} from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart, TimefilterContract } from '@kbn/data-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type { TypesStart } from './vis_types';
-import { createGetterSetter } from '../../../plugins/kibana_utils/public';
-import { DataPublicPluginStart, TimefilterContract } from '../../../plugins/data/public';
-import { UsageCollectionSetup } from '../../../plugins/usage_collection/public';
-import { ExpressionsStart } from '../../../plugins/expressions/public';
-import { UiActionsStart } from '../../../plugins/ui_actions/public';
-import { EmbeddableStart } from '../../embeddable/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
diff --git a/src/plugins/visualizations/public/triggers/index.ts b/src/plugins/visualizations/public/triggers/index.ts
index eedeac1695717..2050185db15e4 100644
--- a/src/plugins/visualizations/public/triggers/index.ts
+++ b/src/plugins/visualizations/public/triggers/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Trigger } from '../../../ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const VISUALIZE_EDITOR_TRIGGER = 'VISUALIZE_EDITOR_TRIGGER';
 export const visualizeEditorTrigger: Trigger = {
diff --git a/src/plugins/visualizations/public/types.ts b/src/plugins/visualizations/public/types.ts
index abc62e711cdc9..9235b62c11bd9 100644
--- a/src/plugins/visualizations/public/types.ts
+++ b/src/plugins/visualizations/public/types.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsMigrationVersion, SavedObjectsResolveResponse } from 'src/core/public';
+import type { SavedObjectsMigrationVersion, SavedObjectsResolveResponse } from '@kbn/core/public';
 import {
   IAggConfigs,
   SerializedSearchSourceFields,
   TimefilterContract,
   AggConfigSerialized,
-} from '../../../plugins/data/public';
-import type { ISearchSource } from '../../data/common';
-import { ExpressionAstExpression } from '../../expressions/public';
+} from '@kbn/data-plugin/public';
+import type { ISearchSource } from '@kbn/data-plugin/common';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin/public';
 
 import type { Vis } from './vis';
 import type { PersistedState } from './persisted_state';
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts
index c0820cce45c90..3dc876a7e32e7 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import type { SavedObject } from '../../../../saved_objects/public';
+import type { OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { findObjectByTitle } from './find_object_by_title';
 import { displayDuplicateTitleConfirmModal } from './display_duplicate_title_confirm_modal';
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx b/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx
index 3c29fd958465b..66395d4b3722e 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import type { OverlayStart } from 'kibana/public';
+import type { OverlayStart } from '@kbn/core/public';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export function confirmModalPromise(
   message = '',
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts
index 48ada48511812..9291b2a29e0a0 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { OverlayStart } from 'kibana/public';
-import type { SavedObject } from '../../../../saved_objects/public';
+import type { OverlayStart } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts
index d61fe1c13eee4..398c00b27e4e9 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts
@@ -7,11 +7,7 @@
  */
 
 import { findObjectByTitle } from './find_object_by_title';
-import {
-  SimpleSavedObject,
-  SavedObjectsClientContract,
-  SavedObject,
-} from '../../../../../core/public';
+import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from '@kbn/core/public';
 
 describe('findObjectByTitle', () => {
   const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts
index 10289ac0f2f53..92fa0e0437695 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsClientContract,
   SimpleSavedObject,
   SavedObjectAttributes,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 /** Returns an object matching a given title */
 export async function findObjectByTitle<T extends SavedObjectAttributes>(
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts
index 6d2c8f6bbe089..fc5581eb3ed05 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts
@@ -6,8 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from 'kibana/public';
-import type { SavedObjectsClientContract } from 'kibana/public';
+import type {
+  SavedObjectAttributes,
+  SavedObjectsCreateOptions,
+  OverlayStart,
+} from '@kbn/core/public';
+import type { SavedObjectsClientContract } from '@kbn/core/public';
 import { saveWithConfirmation } from './save_with_confirmation';
 import * as deps from './confirm_modal_promise';
 import { OVERWRITE_REJECTED } from './constants';
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts
index de9ba38343548..a33fbd18f1b4f 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts
@@ -13,7 +13,7 @@ import type {
   SavedObjectsCreateOptions,
   OverlayStart,
   SavedObjectsClientContract,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { OVERWRITE_REJECTED } from './constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts b/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts
index 5e9af25e58249..b0920f60f5399 100644
--- a/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { VisParams } from '../../../common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 const isControlsVis = (visType: string) => visType === 'input_control_vis';
 
diff --git a/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts b/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts
index 0f7d78c88d5ed..5b53c53248b71 100644
--- a/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts
@@ -10,13 +10,13 @@ import {
   SavedObjectAttribute,
   SavedObjectAttributes,
   SavedObjectReference,
-} from '../../../../../core/public';
-import { SavedVisState, VisSavedObject } from '../../types';
+} from '@kbn/core/public';
 import {
   extractSearchSourceReferences,
   injectSearchSourceReferences,
   SerializedSearchSourceFields,
-} from '../../../../data/public';
+} from '@kbn/data-plugin/public';
+import { SavedVisState, VisSavedObject } from '../../types';
 
 import { extractTimeSeriesReferences, injectTimeSeriesReferences } from './timeseries_references';
 import { extractControlsReferences, injectControlsReferences } from './controls_references';
diff --git a/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts b/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts
index 36217579b88a6..a9e942b91a684 100644
--- a/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { VisParams } from '../../../common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 /** @internal **/
 const REF_NAME_POSTFIX = '_ref_name';
diff --git a/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts b/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts
index fe2453fbb78a4..b5a8ab1acd6fd 100644
--- a/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { ISearchSource } from '../../../data/common';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
-import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { SavedObjectsClientContract } from '../../../../core/public';
+import type { ISearchSource } from '@kbn/data-plugin/common';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   findListItems,
   getSavedVisualization,
@@ -36,7 +36,7 @@ const mockParseSearchSourceJSON = jest.fn();
 const mockInjectSearchSourceReferences = jest.fn();
 const mockExtractSearchSourceReferences = jest.fn((...args) => [{}, []]);
 
-jest.mock('../../../../plugins/data/public', () => ({
+jest.mock('@kbn/data-plugin/public', () => ({
   extractSearchSourceReferences: jest.fn((...args) => mockExtractSearchSourceReferences(...args)),
   injectSearchSourceReferences: jest.fn((...args) => mockInjectSearchSourceReferences(...args)),
   parseSearchSourceJSON: jest.fn((...args) => mockParseSearchSourceJSON(...args)),
diff --git a/src/plugins/visualizations/public/utils/saved_visualize_utils.ts b/src/plugins/visualizations/public/utils/saved_visualize_utils.ts
index 875211a39757d..5b8ba8ce04cb4 100644
--- a/src/plugins/visualizations/public/utils/saved_visualize_utils.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualize_utils.ts
@@ -13,18 +13,18 @@ import type {
   SavedObjectsClientContract,
   SavedObjectAttributes,
   SavedObjectReference,
-} from 'kibana/public';
-import type { OverlayStart } from '../../../../core/public';
-import { SavedObjectNotFound } from '../../../kibana_utils/public';
+} from '@kbn/core/public';
+import type { OverlayStart } from '@kbn/core/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import {
   extractSearchSourceReferences,
   injectSearchSourceReferences,
   parseSearchSourceJSON,
   DataPublicPluginStart,
-} from '../../../../plugins/data/public';
+} from '@kbn/data-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { saveWithConfirmation, checkForDuplicateTitle } from './saved_objects_utils';
-import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
 import { VisualizationsAppExtension } from '../vis_types/vis_type_alias_registry';
 import type {
   VisSavedObject,
diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts
index 47a667a4f36b9..9614e5f415fe7 100644
--- a/src/plugins/visualizations/public/vis.ts
+++ b/src/plugins/visualizations/public/vis.ts
@@ -20,15 +20,14 @@ import { isFunction, defaults, cloneDeep } from 'lodash';
 import { Assign } from '@kbn/utility-types';
 import { i18n } from '@kbn/i18n';
 
+import { IAggConfigs, ISearchSource, AggConfigSerialized } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { getSavedSearch, throwErrorOnSavedSearchUrlConflict } from '@kbn/discover-plugin/public';
 import { PersistedState } from './persisted_state';
 import { getTypes, getAggs, getSearch, getSavedObjects, getSpaces } from './services';
-import { IAggConfigs, ISearchSource, AggConfigSerialized } from '../../data/public';
-import type { DataView } from '../../data_views/public';
 import { BaseVisType } from './vis_types';
 import { SerializedVis, SerializedVisData, VisParams } from '../common/types';
 
-import { getSavedSearch, throwErrorOnSavedSearchUrlConflict } from '../../discover/public';
-
 export type { SerializedVis, SerializedVisData };
 
 export interface VisData {
diff --git a/src/plugins/visualizations/public/vis_schemas.ts b/src/plugins/visualizations/public/vis_schemas.ts
index f80f85fb55a60..795631b9b4f07 100644
--- a/src/plugins/visualizations/public/vis_schemas.ts
+++ b/src/plugins/visualizations/public/vis_schemas.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SerializedFieldFormat } from '../../field_formats/common';
-import { IAggConfig, search } from '../../data/public';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { IAggConfig, search } from '@kbn/data-plugin/public';
 
 import { Vis, VisToExpressionAstParams } from './types';
 
diff --git a/src/plugins/visualizations/public/vis_types/schemas.ts b/src/plugins/visualizations/public/vis_types/schemas.ts
index 1e14cb90cf046..528a2269f7283 100644
--- a/src/plugins/visualizations/public/vis_types/schemas.ts
+++ b/src/plugins/visualizations/public/vis_types/schemas.ts
@@ -7,7 +7,7 @@
  */
 
 import _, { defaults } from 'lodash';
-import { AggGroupNames, AggParam } from '../../../data/public';
+import { AggGroupNames, AggParam } from '@kbn/data-plugin/public';
 import type { ISchemas, Schema } from './types';
 
 /** @private **/
diff --git a/src/plugins/visualizations/public/vis_types/types.ts b/src/plugins/visualizations/public/vis_types/types.ts
index ee4459e4e772e..0e7e44b6ea38e 100644
--- a/src/plugins/visualizations/public/vis_types/types.ts
+++ b/src/plugins/visualizations/public/vis_types/types.ts
@@ -9,9 +9,9 @@
 import type { IconType } from '@elastic/eui';
 import type { ReactNode } from 'react';
 import type { PaletteOutput } from '@kbn/coloring';
-import type { Adapters } from 'src/plugins/inspector';
-import type { AggGroupNames, AggParam, AggGroupName, Query } from '../../../data/public';
-import type { DataView } from '../../../data_views/public';
+import type { Adapters } from '@kbn/inspector-plugin';
+import type { AggGroupNames, AggParam, AggGroupName, Query } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { Vis, VisEditorOptionsProps, VisParams, VisToExpressionAst } from '../types';
 import { VisGroups } from './vis_groups_enum';
 
diff --git a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
index a8b00b15a1ede..2945aaa1a0cc8 100644
--- a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
+++ b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from '../../../../core/types/saved_objects';
+import { SavedObject } from '@kbn/core/types/saved_objects';
 import { BaseVisType } from './base_vis_type';
 
 export type VisualizationStage = 'experimental' | 'beta' | 'production';
diff --git a/src/plugins/visualizations/public/visualize_app/app.tsx b/src/plugins/visualizations/public/visualize_app/app.tsx
index de744ebce1c91..156cc9b99b16e 100644
--- a/src/plugins/visualizations/public/visualize_app/app.tsx
+++ b/src/plugins/visualizations/public/visualize_app/app.tsx
@@ -10,9 +10,9 @@ import './app.scss';
 import React, { useEffect } from 'react';
 import { Route, Switch, useLocation } from 'react-router-dom';
 
-import { AppMountParameters } from 'kibana/public';
-import { syncQueryStateWithUrl } from '../../../data/public';
-import { useKibana } from '../../../kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { syncQueryStateWithUrl } from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { VisualizeServices } from './types';
 import {
   VisualizeEditor,
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx
index b0244ea5fbb05..a85e8d0cd6561 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx
@@ -10,8 +10,8 @@ import './visualize_editor.scss';
 import React, { useEffect, useState } from 'react';
 import { EventEmitter } from 'events';
 
-import { VisualizeInput } from 'src/plugins/visualizations/public';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { VisualizeInput } from '../..';
 import {
   useChromeVisibility,
   useVisByValue,
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx
index c281b211768a1..fc505d1d74e00 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx
@@ -11,7 +11,7 @@ import React, { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { EventEmitter } from 'events';
 
-import { useExecutionContext, useKibana } from '../../../../kibana_react/public';
+import { useExecutionContext, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   useChromeVisibility,
   useSavedVisInstance,
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx
index e2d169d263e45..bc2d20611d3fc 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
 import { VisualizeEditorCommon } from './visualize_editor_common';
 import { VisualizeEditorVisInstance } from '../types';
-import { SplitChartWarning } from './split_chart_warning';
+import { VizChartWarning } from './viz_chart_warning';
 
 const mockGetLegacyUrlConflict = jest.fn();
 const mockRedirectLegacyUrl = jest.fn(() => Promise.resolve());
-jest.mock('../../../../kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   useKibana: jest.fn(() => ({
     services: {
       spaces: {
@@ -42,7 +42,11 @@ jest.mock('../../../../kibana_react/public', () => ({
 
 jest.mock('../../services', () => ({
   getUISettings: jest.fn(() => ({
-    get: jest.fn(),
+    get: jest.fn(
+      (token) =>
+        Boolean(token === 'visualization:visualize:legacyPieChartsLibrary') ||
+        Boolean(token === 'timelion:legacyChartsLibrary')
+    ),
   })),
 }));
 
@@ -157,7 +161,7 @@ describe('VisualizeEditorCommon', () => {
         }
       />
     );
-    expect(wrapper.find(SplitChartWarning).length).toBe(1);
+    expect(wrapper.find(VizChartWarning).length).toBe(1);
   });
 
   it('should not display a warning callout for XY charts with split aggs', async () => {
@@ -198,6 +202,88 @@ describe('VisualizeEditorCommon', () => {
         }
       />
     );
-    expect(wrapper.find(SplitChartWarning).length).toBe(0);
+    expect(wrapper.find(VizChartWarning).length).toBe(0);
+  });
+
+  it('should display a warning callout for old pie implementation', async () => {
+    const wrapper = shallowWithIntl(
+      <VisualizeEditorCommon
+        appState={null}
+        hasUnsavedChanges={false}
+        setHasUnsavedChanges={() => {}}
+        hasUnappliedChanges={false}
+        isEmbeddableRendered={false}
+        onAppLeave={() => {}}
+        visEditorRef={React.createRef()}
+        visInstance={
+          {
+            savedVis: {
+              id: 'test',
+              sharingSavedObjectProps: {
+                outcome: 'conflict',
+                aliasTargetId: 'alias_id',
+              },
+            },
+            vis: {
+              type: {
+                title: 'pie',
+                name: 'pie',
+              },
+              data: {
+                aggs: {
+                  aggs: [
+                    {
+                      schema: 'buckets',
+                    },
+                  ],
+                },
+              },
+            },
+          } as unknown as VisualizeEditorVisInstance
+        }
+      />
+    );
+    expect(wrapper.find(VizChartWarning).length).toBe(1);
+  });
+
+  it('should display a warning callout for old timelion implementation', async () => {
+    const wrapper = shallowWithIntl(
+      <VisualizeEditorCommon
+        appState={null}
+        hasUnsavedChanges={false}
+        setHasUnsavedChanges={() => {}}
+        hasUnappliedChanges={false}
+        isEmbeddableRendered={false}
+        onAppLeave={() => {}}
+        visEditorRef={React.createRef()}
+        visInstance={
+          {
+            savedVis: {
+              id: 'test',
+              sharingSavedObjectProps: {
+                outcome: 'conflict',
+                aliasTargetId: 'alias_id',
+              },
+            },
+            vis: {
+              type: {
+                title: 'timelion',
+                name: 'timelion',
+              },
+              data: {
+                aggs: {
+                  aggs: [
+                    {
+                      schema: 'buckets',
+                    },
+                  ],
+                },
+              },
+            },
+          } as unknown as VisualizeEditorVisInstance
+        }
+      />
+    );
+    expect(wrapper.find(VizChartWarning).length).toBe(1);
   });
 });
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx
index 922a55609c1e3..f69f53e4a24ab 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx
@@ -11,13 +11,13 @@ import React, { RefObject, useCallback, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiScreenReaderOnly } from '@elastic/eui';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { VisualizeTopNav } from './visualize_top_nav';
 import { ExperimentalVisInfo } from './experimental_vis_info';
-import { useKibana } from '../../../../kibana_react/public';
-import { urlFor } from '../../../../visualizations/public';
+import { urlFor } from '../..';
 import { getUISettings } from '../../services';
-import { SplitChartWarning } from './split_chart_warning';
+import { VizChartWarning } from './viz_chart_warning';
 import {
   SavedVisInstance,
   VisualizeAppState,
@@ -28,6 +28,7 @@ import {
 import {
   CHARTS_CONFIG_TOKENS,
   CHARTS_WITHOUT_SMALL_MULTIPLES,
+  CHARTS_TO_BE_DEPRECATED,
   isSplitChart as isSplitChartFn,
 } from '../utils/split_chart_warning_helpers';
 
@@ -121,8 +122,10 @@ export const VisualizeEditorCommon = ({
 
   const chartsWithoutSmallMultiples: string[] = Object.values(CHARTS_WITHOUT_SMALL_MULTIPLES);
   const chartNeedsWarning = chartName ? chartsWithoutSmallMultiples.includes(chartName) : false;
+  const deprecatedCharts: string[] = Object.values(CHARTS_TO_BE_DEPRECATED);
+  const deprecatedChartsNeedWarning = chartName ? deprecatedCharts.includes(chartName) : false;
   const chartToken =
-    chartName && chartNeedsWarning
+    chartName && (chartNeedsWarning || deprecatedChartsNeedWarning)
       ? CHARTS_CONFIG_TOKENS[chartName as CHARTS_WITHOUT_SMALL_MULTIPLES]
       : undefined;
 
@@ -150,11 +153,18 @@ export const VisualizeEditorCommon = ({
       )}
       {visInstance?.vis?.type?.stage === 'experimental' && <ExperimentalVisInfo />}
       {!hasLegacyChartsEnabled && isSplitChart && chartNeedsWarning && chartToken && chartName && (
-        <SplitChartWarning
+        <VizChartWarning
           chartType={chartName as CHARTS_WITHOUT_SMALL_MULTIPLES}
           chartConfigToken={chartToken}
         />
       )}
+      {hasLegacyChartsEnabled && deprecatedChartsNeedWarning && chartToken && chartName && (
+        <VizChartWarning
+          chartType={chartName as CHARTS_TO_BE_DEPRECATED}
+          chartConfigToken={chartToken}
+          mode="new"
+        />
+      )}
       {visInstance?.vis?.type?.getInfoMessage?.(visInstance.vis)}
       {getLegacyUrlConflictCallout()}
       {visInstance && (
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx
index e38d854247786..59017aa643cc7 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx
@@ -17,16 +17,16 @@ import useMount from 'react-use/lib/useMount';
 
 import { useLocation } from 'react-router-dom';
 
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
+import { useKibana, TableListView, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { findListItems } from '../../utils/saved_visualize_utils';
 import { showNewVisModal } from '../../wizard';
 import { getTypes } from '../../services';
-import { SavedObjectsFindOptionsReference } from '../../../../../core/public';
-import { useKibana, TableListView, useExecutionContext } from '../../../../kibana_react/public';
 import {
   VISUALIZE_ENABLE_LABS_SETTING,
   SAVED_OBJECTS_LIMIT_SETTING,
   SAVED_OBJECTS_PER_PAGE_SETTING,
-} from '../../../../visualizations/public';
+} from '../..';
 import { VisualizeServices } from '../types';
 import { VisualizeConstants } from '../../../common/constants';
 import { getTableColumns, getNoItemsMessage } from '../utils';
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx
index 679526d063278..7fd668594b014 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 
-import { useKibana, toMountPoint, KibanaThemeProvider } from '../../../../kibana_react/public';
+import { useKibana, toMountPoint, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { VisualizeServices } from '../types';
 import { VisualizeConstants } from '../../../common/constants';
 
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx
index 276c99ec4ca5c..a6c1710afbed8 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx
@@ -8,10 +8,11 @@
 
 import React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
 
-import { AppMountParameters, OverlayRef } from 'kibana/public';
+import { AppMountParameters, OverlayRef } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   VisualizeServices,
   VisualizeAppState,
@@ -20,8 +21,7 @@ import {
 } from '../types';
 import { VISUALIZE_APP_NAME } from '../../../common/constants';
 import { getTopNavConfig } from '../utils';
-import type { DataView } from '../../../../data_views/public';
-import type { NavigateToLensContext } from '../../../../visualizations/public';
+import type { NavigateToLensContext } from '../..';
 
 const LOCAL_STORAGE_EDIT_IN_LENS_BADGE = 'EDIT_IN_LENS_BADGE_VISIBLE';
 
diff --git a/src/plugins/visualizations/public/visualize_app/components/split_chart_warning.tsx b/src/plugins/visualizations/public/visualize_app/components/viz_chart_warning.tsx
similarity index 61%
rename from src/plugins/visualizations/public/visualize_app/components/split_chart_warning.tsx
rename to src/plugins/visualizations/public/visualize_app/components/viz_chart_warning.tsx
index 679aa6aa2fbe1..649f797eaf174 100644
--- a/src/plugins/visualizations/public/visualize_app/components/split_chart_warning.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/viz_chart_warning.tsx
@@ -8,32 +8,42 @@
 
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { VisualizeServices } from '../types';
-import { CHARTS_WITHOUT_SMALL_MULTIPLES } from '../utils/split_chart_warning_helpers';
-import type { CHARTS_WITHOUT_SMALL_MULTIPLES as CHART_WITHOUT_SMALL_MULTIPLES } from '../utils/split_chart_warning_helpers';
+import {
+  CHARTS_WITHOUT_SMALL_MULTIPLES,
+  CHARTS_TO_BE_DEPRECATED,
+} from '../utils/split_chart_warning_helpers';
+import type {
+  CHARTS_WITHOUT_SMALL_MULTIPLES as CHART_WITHOUT_SMALL_MULTIPLES,
+  CHARTS_TO_BE_DEPRECATED as CHART_TO_BE_DEPRECATED,
+} from '../utils/split_chart_warning_helpers';
 
 interface Props {
-  chartType: CHART_WITHOUT_SMALL_MULTIPLES;
+  chartType: CHART_WITHOUT_SMALL_MULTIPLES | CHART_TO_BE_DEPRECATED;
   chartConfigToken: string;
+  mode?: 'old' | 'new';
 }
 
 interface WarningMessageProps {
   canEditAdvancedSettings: boolean | Readonly<{ [x: string]: boolean }>;
   advancedSettingsLink: string;
+  mode?: 'old' | 'new';
 }
 
 const SwitchToOldLibraryMessage: FC<WarningMessageProps> = ({
   canEditAdvancedSettings,
   advancedSettingsLink,
+  mode = 'old',
 }) => {
   return (
     <>
       {canEditAdvancedSettings && (
         <FormattedMessage
           id="visualizations.newChart.conditionalMessage.newLibrary"
-          defaultMessage="Switch to the old library in {link}"
+          defaultMessage="Switch to the {type} library in {link}"
           values={{
             link: (
               <EuiLink href={advancedSettingsLink}>
@@ -43,6 +53,14 @@ const SwitchToOldLibraryMessage: FC<WarningMessageProps> = ({
                 />
               </EuiLink>
             ),
+            type:
+              mode === 'old'
+                ? i18n.translate('visualizations.newChart.libraryMode.old', {
+                    defaultMessage: 'old',
+                  })
+                : i18n.translate('visualizations.newChart.libraryMode.new', {
+                    defaultMessage: 'new',
+                  }),
           }}
         />
       )}
@@ -97,12 +115,48 @@ const HeatmapWarningFormatMessage: FC<WarningMessageProps> = (props) => {
   );
 };
 
+const PieWarningFormatMessage: FC<WarningMessageProps> = (props) => {
+  return (
+    <FormattedMessage
+      id="visualizations.oldPieChart.notificationMessage"
+      defaultMessage="You are using the legacy charts library, which will be removed in a future version. {conditionalMessage}"
+      values={{
+        conditionalMessage: (
+          <>
+            <SwitchToOldLibraryMessage {...props} />
+            <ContactAdminMessage {...props} />
+          </>
+        ),
+      }}
+    />
+  );
+};
+
+const TimelionWarningFormatMessage: FC<WarningMessageProps> = (props) => {
+  return (
+    <FormattedMessage
+      id="visualizations.oldTimelionChart.notificationMessage"
+      defaultMessage="You are using the legacy charts library, which will be removed in 8.4. {conditionalMessage}"
+      values={{
+        conditionalMessage: (
+          <>
+            <SwitchToOldLibraryMessage {...props} />
+            <ContactAdminMessage {...props} />
+          </>
+        ),
+      }}
+    />
+  );
+};
+
 const warningMessages = {
   [CHARTS_WITHOUT_SMALL_MULTIPLES.heatmap]: HeatmapWarningFormatMessage,
   [CHARTS_WITHOUT_SMALL_MULTIPLES.gauge]: GaugeWarningFormatMessage,
+  [CHARTS_TO_BE_DEPRECATED.pie]: PieWarningFormatMessage,
+  [CHARTS_TO_BE_DEPRECATED.timelion]: TimelionWarningFormatMessage,
 };
 
-export const SplitChartWarning: FC<Props> = ({ chartType, chartConfigToken }) => {
+export const VizChartWarning: FC<Props> = ({ chartType, chartConfigToken, mode }) => {
   const { services } = useKibana<VisualizeServices>();
   const canEditAdvancedSettings = services.application.capabilities.advancedSettings.save;
   const advancedSettingsLink = services.application.getUrlForApp('management', {
@@ -112,11 +166,12 @@ export const SplitChartWarning: FC<Props> = ({ chartType, chartConfigToken }) =>
   const WarningMessage = warningMessages[chartType];
   return (
     <EuiCallOut
-      data-test-subj="vizSplitChartWarning"
+      data-test-subj="vizChartWarning"
       title={
         <WarningMessage
           advancedSettingsLink={advancedSettingsLink}
           canEditAdvancedSettings={canEditAdvancedSettings}
+          mode={mode}
         />
       }
       iconType="alert"
diff --git a/src/plugins/visualizations/public/visualize_app/constants.ts b/src/plugins/visualizations/public/visualize_app/constants.ts
index fd256cb5bbb86..b663171f93e94 100644
--- a/src/plugins/visualizations/public/visualize_app/constants.ts
+++ b/src/plugins/visualizations/public/visualize_app/constants.ts
@@ -8,3 +8,5 @@
 
 export const NEW_HEATMAP_CHARTS_LIBRARY = 'visualization:visualize:legacyHeatmapChartsLibrary';
 export const NEW_GAUGE_CHARTS_LIBRARY = 'visualization:visualize:legacyGaugeChartsLibrary';
+export const NEW_PIE_CHARTS_LIBRARY = 'visualization:visualize:legacyPieChartsLibrary';
+export const NEW_TIMELION_CHARTS_LIBRARY = 'timelion:legacyChartsLibrary';
diff --git a/src/plugins/visualizations/public/visualize_app/index.tsx b/src/plugins/visualizations/public/visualize_app/index.tsx
index c3bc01deff020..c29eef172ffe6 100644
--- a/src/plugins/visualizations/public/visualize_app/index.tsx
+++ b/src/plugins/visualizations/public/visualize_app/index.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router } from 'react-router-dom';
 
-import { AppMountParameters } from 'kibana/public';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { VisualizeApp } from './app';
 import { VisualizeServices } from './types';
 import { addHelpMenuToAppChrome, addBadgeToAppChrome } from './utils';
diff --git a/src/plugins/visualizations/public/visualize_app/types.ts b/src/plugins/visualizations/public/visualize_app/types.ts
index 59cd94d210269..8eb57495d95ab 100644
--- a/src/plugins/visualizations/public/visualize_app/types.ts
+++ b/src/plugins/visualizations/public/visualize_app/types.ts
@@ -18,34 +18,33 @@ import type {
   ScopedHistory,
   AppMountParameters,
   ThemeServiceStart,
-} from 'kibana/public';
-
-import type {
-  Vis,
-  VisualizeEmbeddableContract,
-  VisSavedObject,
-  PersistedState,
-  VisParams,
-} from 'src/plugins/visualizations/public';
+} from '@kbn/core/public';
 
 import type {
   Storage,
   IKbnUrlStateStorage,
   ReduxLikeStateContainer,
-} from 'src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
-import type { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
+import type { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
 import type { Filter } from '@kbn/es-query';
-import type { Query, DataPublicPluginStart, TimeRange } from 'src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { EmbeddableStart, EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
-import type { UrlForwardingStart } from 'src/plugins/url_forwarding/public';
-import type { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
-import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
-import type { UsageCollectionStart } from '../../../usage_collection/public';
-import type { SavedSearch } from '../../../discover/public';
+import type { Query, DataPublicPluginStart, TimeRange } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { EmbeddableStart, EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import type { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { SavedSearch } from '@kbn/discover-plugin/public';
+import type {
+  Vis,
+  VisualizeEmbeddableContract,
+  VisSavedObject,
+  PersistedState,
+  VisParams,
+} from '..';
 
 import type { SavedVisState } from '../types';
 import type { createVisEmbeddableFromObject } from '../embeddable';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts
index 0474e60cea676..48dce29fbac65 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
+import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { createVisualizeAppState } from './create_visualize_app_state';
 import { migrateAppState } from './migrate_app_state';
 import { visualizeAppStateStub } from './stubs';
@@ -14,7 +14,7 @@ import { visualizeAppStateStub } from './stubs';
 const mockStartStateSync = jest.fn();
 const mockStopStateSync = jest.fn();
 
-jest.mock('../../../../kibana_utils/public', () => ({
+jest.mock('@kbn/kibana-utils-plugin/public', () => ({
   createStateContainer: jest.fn(() => 'stateContainer'),
   syncState: jest.fn(() => ({
     start: mockStartStateSync,
@@ -25,7 +25,7 @@ jest.mock('./migrate_app_state', () => ({
   migrateAppState: jest.fn(() => 'migratedAppState'),
 }));
 
-const { createStateContainer, syncState } = jest.requireMock('../../../../kibana_utils/public');
+const { createStateContainer, syncState } = jest.requireMock('@kbn/kibana-utils-plugin/public');
 
 describe('createVisualizeAppState', () => {
   const kbnUrlStateStorage = {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts
index bd0406460a3c9..ab3e631663f40 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts
@@ -8,12 +8,12 @@
 
 import { isFunction, omitBy, union } from 'lodash';
 
-import { migrateAppState } from './migrate_app_state';
 import {
   createStateContainer,
   syncState,
   IKbnUrlStateStorage,
-} from '../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
+import { migrateAppState } from './migrate_app_state';
 import type { SavedVisState } from '../../types';
 import type { VisualizeAppState, VisualizeAppStateTransitions } from '../types';
 
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx b/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx
index 1d29e9822e1fd..5775d4e5bf535 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx
@@ -19,11 +19,11 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
-import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
-import { VisualizationListItem } from 'src/plugins/visualizations/public';
-import type { SavedObjectsTaggingApi } from 'src/plugins/saved_objects_tagging_oss/public';
-import { RedirectAppLinks } from '../../../../kibana_react/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { VisualizationListItem } from '../..';
 import { getVisualizeListItemLink } from './get_visualize_list_item_link';
 import { getUsageCollector } from '../../services';
 import { VISUALIZE_APP_NAME } from '../../../common/constants';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx
index 62ed8343b33c7..a7f2f3427c785 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { Observable } from 'rxjs';
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { showPublicUrlSwitch, getTopNavConfig, TopNavConfigParams } from './get_top_nav_config';
 import type {
   VisualizeEditorVisInstance,
@@ -14,8 +14,8 @@ import type {
   VisualizeServices,
 } from '../types';
 import { createVisualizeServicesMock } from './mocks';
-import { sharePluginMock } from '../../../../share/public/mocks';
-import { createEmbeddableStateTransferMock } from '../../../../embeddable/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { createEmbeddableStateTransferMock } from '@kbn/embeddable-plugin/public/mocks';
 import { visualizeAppStateStub } from './stubs';
 
 describe('showPublicUrlSwitch', () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx
index 376dde50ec97e..7cdd79b2ee490 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx
@@ -13,26 +13,27 @@ import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiBetaBadgeProps } from '@elastic/eui';
 import { parse } from 'query-string';
 
-import { Capabilities } from 'src/core/public';
-import { TopNavMenuData } from 'src/plugins/navigation/public';
-import { saveVisualization } from '../../utils/saved_visualize_utils';
-import {
-  VISUALIZE_EMBEDDABLE_TYPE,
-  VisualizeInput,
-  getFullPath,
-  NavigateToLensContext,
-} from '../../../../visualizations/public';
+import { Capabilities } from '@kbn/core/public';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import {
   showSaveModal,
   SavedObjectSaveModalOrigin,
   SavedObjectSaveOpts,
   OnSaveProps,
-} from '../../../../saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
 import {
   LazySavedObjectSaveModalDashboard,
   withSuspense,
-} from '../../../../presentation_util/public';
-import { unhashUrl } from '../../../../kibana_utils/public';
+} from '@kbn/presentation-util-plugin/public';
+import { unhashUrl } from '@kbn/kibana-utils-plugin/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { saveVisualization } from '../../utils/saved_visualize_utils';
+import {
+  VISUALIZE_EMBEDDABLE_TYPE,
+  VisualizeInput,
+  getFullPath,
+  NavigateToLensContext,
+} from '../..';
 
 import {
   VisualizeServices,
@@ -41,7 +42,6 @@ import {
 } from '../types';
 import { VISUALIZE_APP_NAME, VisualizeConstants } from '../../../common/constants';
 import { getEditBreadcrumbs } from './breadcrumbs';
-import { EmbeddableStateTransfer } from '../../../../embeddable/public';
 import { VISUALIZE_APP_LOCATOR, VisualizeLocatorParams } from '../../../common/locator';
 import { getUiActions } from '../../services';
 import { VISUALIZE_EDITOR_TRIGGER } from '../../triggers';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts
index f8934e0aeb5a9..ebc17b1e32c91 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts
@@ -6,13 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getSavedSearch } from '../../../../discover/public';
-import type {
-  VisualizeInput,
-  VisSavedObject,
-  Vis,
-  VisParams,
-} from 'src/plugins/visualizations/public';
+import { getSavedSearch } from '@kbn/discover-plugin/public';
+import type { VisualizeInput, VisSavedObject, Vis, VisParams } from '../..';
 import {
   getVisualizationInstance,
   getVisualizationInstanceFromInput,
@@ -43,7 +38,7 @@ jest.mock('../../vis_async', () => ({
 }));
 const { createVisAsync } = jest.requireMock('../../vis_async');
 
-jest.mock('../../../../discover/public', () => ({
+jest.mock('@kbn/discover-plugin/public', () => ({
   getSavedSearch: jest.fn().mockResolvedValue({
     id: 'savedSearch',
     title: 'savedSearchTitle',
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts
index dda06717257df..60947ce0dbd6f 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts
@@ -6,24 +6,24 @@
  * Side Public License, v 1.
  */
 
+import { cloneDeep } from 'lodash';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
+import type { ExpressionValueError } from '@kbn/expressions-plugin/public';
+import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '@kbn/kibana-utils-plugin/common';
+import {
+  getSavedSearch,
+  SavedSearch,
+  throwErrorOnSavedSearchUrlConflict,
+} from '@kbn/discover-plugin/public';
+import { createVisAsync } from '../../vis_async';
+import { convertToSerializedVis, getSavedVisualization } from '../../utils/saved_visualize_utils';
 import {
   SerializedVis,
   Vis,
   VisSavedObject,
   VisualizeEmbeddableContract,
   VisualizeInput,
-} from 'src/plugins/visualizations/public';
-import { cloneDeep } from 'lodash';
-import type { SerializedSearchSourceFields } from 'src/plugins/data/public';
-import type { ExpressionValueError } from 'src/plugins/expressions/public';
-import { createVisAsync } from '../../vis_async';
-import { convertToSerializedVis, getSavedVisualization } from '../../utils/saved_visualize_utils';
-import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '../../../../kibana_utils/common';
-import {
-  getSavedSearch,
-  SavedSearch,
-  throwErrorOnSavedSearchUrlConflict,
-} from '../../../../discover/public';
+} from '../..';
 import type { VisualizeServices } from '../types';
 
 function isErrorRelatedToRuntimeFields(error: ExpressionValueError['error']) {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts
index 7fe571b25f98c..13dd9e3891fb6 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { getVisualizeListItemLink } from './get_visualize_list_item_link';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createHashHistory } from 'history';
 import { FilterStateStore } from '@kbn/es-query';
-import { createKbnUrlStateStorage } from '../../../../kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { GLOBAL_STATE_STORAGE_KEY } from '../../../common/constants';
 
 jest.mock('../../services', () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts
index bfbd0721b5b2c..fc41486fae84a 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
-import { QueryState } from '../../../../data/public';
-import { setStateToKbnUrl } from '../../../../kibana_utils/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+import { QueryState } from '@kbn/data-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { getUISettings } from '../../services';
 import { GLOBAL_STATE_STORAGE_KEY, VISUALIZE_APP_NAME } from '../../../common/constants';
 
diff --git a/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts b/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts
index fd92dc8259a1f..9c7beafdeb22d 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts
@@ -7,7 +7,7 @@
  */
 
 import { has } from 'lodash';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 /**
  * Creates a standardized query object from old queries that were either strings or pure ES query DSL
diff --git a/src/plugins/visualizations/public/visualize_app/utils/mocks.ts b/src/plugins/visualizations/public/visualize_app/utils/mocks.ts
index 4ac506e470ef2..65bad216859ef 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/mocks.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/mocks.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { VisualizeServices } from '../types';
 
 export const createVisualizeServicesMock = () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts b/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
index d40f15aa08657..a00ab83669bb8 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
@@ -7,19 +7,32 @@
  */
 
 import { $Values } from '@kbn/utility-types';
-import { AggConfigs } from '../../../../data/common';
-import { NEW_HEATMAP_CHARTS_LIBRARY, NEW_GAUGE_CHARTS_LIBRARY } from '../constants';
+import { AggConfigs } from '@kbn/data-plugin/common';
+import {
+  NEW_HEATMAP_CHARTS_LIBRARY,
+  NEW_GAUGE_CHARTS_LIBRARY,
+  NEW_PIE_CHARTS_LIBRARY,
+  NEW_TIMELION_CHARTS_LIBRARY,
+} from '../constants';
 
 export const CHARTS_WITHOUT_SMALL_MULTIPLES = {
   heatmap: 'heatmap',
   gauge: 'gauge',
 } as const;
 
+export const CHARTS_TO_BE_DEPRECATED = {
+  pie: 'pie',
+  timelion: 'timelion',
+} as const;
+
 export type CHARTS_WITHOUT_SMALL_MULTIPLES = $Values<typeof CHARTS_WITHOUT_SMALL_MULTIPLES>;
+export type CHARTS_TO_BE_DEPRECATED = $Values<typeof CHARTS_TO_BE_DEPRECATED>;
 
 export const CHARTS_CONFIG_TOKENS = {
   [CHARTS_WITHOUT_SMALL_MULTIPLES.heatmap]: NEW_HEATMAP_CHARTS_LIBRARY,
   [CHARTS_WITHOUT_SMALL_MULTIPLES.gauge]: NEW_GAUGE_CHARTS_LIBRARY,
+  [CHARTS_TO_BE_DEPRECATED.pie]: NEW_PIE_CHARTS_LIBRARY,
+  [CHARTS_TO_BE_DEPRECATED.timelion]: NEW_TIMELION_CHARTS_LIBRARY,
 } as const;
 
 export const isSplitChart = (chartType: string | undefined, aggs?: AggConfigs) => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts
index 6ea5fcec88924..0160ce66556ea 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts
@@ -8,7 +8,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
-import { chromeServiceMock } from '../../../../../../core/public/mocks';
+import { chromeServiceMock } from '@kbn/core/public/mocks';
 import { useChromeVisibility } from './use_chrome_visibility';
 
 describe('useChromeVisibility', () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts
index 574d62d0854b6..b843e7526e586 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts
@@ -7,7 +7,7 @@
  */
 
 import { useState, useEffect } from 'react';
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
 
 export const useChromeVisibility = (chrome: ChromeStart) => {
   const [isVisible, setIsVisible] = useState<boolean>();
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts
index e8cedb3c4a5f9..93f9e2ae0b0a4 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts
@@ -10,13 +10,13 @@ import { renderHook } from '@testing-library/react-hooks';
 import { EventEmitter } from 'events';
 
 import { setTypes } from '../../../services';
-import { coreMock } from '../../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { useSavedVisInstance } from './use_saved_vis_instance';
-import { redirectWhenMissing } from '../../../../../kibana_utils/public';
+import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
 import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';
 import { VisualizeConstants } from '../../../../common/constants';
 import { createVisEditorsRegistry } from '../../../vis_editors_registry';
-import { createEmbeddableStateTransferMock } from '../../../../../embeddable/public/mocks';
+import { createEmbeddableStateTransferMock } from '@kbn/embeddable-plugin/public/mocks';
 import type { VisualizeServices } from '../../types';
 import type { TypesStart } from '../../../vis_types';
 
@@ -50,8 +50,8 @@ jest.mock('../breadcrumbs', () => ({
   getCreateBreadcrumbs: jest.fn((text) => text),
 }));
 
-jest.mock('../../../../../kibana_utils/public', () => {
-  const actual = jest.requireActual('../../../../../kibana_utils/public');
+jest.mock('@kbn/kibana-utils-plugin/public', () => {
+  const actual = jest.requireActual('@kbn/kibana-utils-plugin/public');
   return {
     ...actual,
     redirectWhenMissing: jest.fn(),
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts
index 366092d327d9b..37495fea848cd 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts
@@ -8,7 +8,7 @@
 
 import { EventEmitter } from 'events';
 import { useEffect, useRef, useState } from 'react';
-import { VisualizeInput } from 'src/plugins/visualizations/public';
+import { VisualizeInput } from '../../..';
 import { ByValueVisInstance, VisualizeServices, IEditorController } from '../../types';
 import { getVisualizationInstanceFromInput } from '../get_visualization_instance';
 import { getEditBreadcrumbs } from '../breadcrumbs';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts
index 0a64371a16e34..61b1853c0f241 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts
@@ -18,12 +18,12 @@ import { createVisualizeServicesMock } from '../mocks';
 
 jest.mock('../utils');
 jest.mock('../create_visualize_app_state');
-jest.mock('../../../../../data/public');
+jest.mock('@kbn/data-plugin/public');
 
 describe('useVisualizeAppState', () => {
   const { visStateToEditorState } = jest.requireMock('../utils');
   const { createVisualizeAppState } = jest.requireMock('../create_visualize_app_state');
-  const { connectToQueryState } = jest.requireMock('../../../../../data/public');
+  const { connectToQueryState } = jest.requireMock('@kbn/data-plugin/public');
   const stopStateSyncMock = jest.fn();
   const stateContainerGetStateMock = jest.fn(() => visualizeAppStateStub);
   const stopSyncingAppFiltersMock = jest.fn();
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
index c6e8f9efdd035..70f3413da0419 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
@@ -13,13 +13,9 @@ import { EventEmitter } from 'events';
 import { i18n } from '@kbn/i18n';
 import { FilterStateStore } from '@kbn/es-query';
 
-import {
-  KibanaThemeProvider,
-  MarkdownSimple,
-  toMountPoint,
-} from '../../../../../kibana_react/public';
+import { KibanaThemeProvider, MarkdownSimple, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { connectToQueryState } from '@kbn/data-plugin/public';
 import { migrateLegacyQuery } from '../migrate_legacy_query';
-import { connectToQueryState } from '../../../../../data/public';
 import {
   VisualizeServices,
   VisualizeAppStateContainer,
diff --git a/src/plugins/visualizations/public/visualize_app/utils/utils.ts b/src/plugins/visualizations/public/visualize_app/utils/utils.ts
index 6f71cb33e7321..27d15ddc84d90 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/utils.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/utils.ts
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type { History } from 'history';
-import type { ChromeStart, DocLinksStart } from 'kibana/public';
+import type { ChromeStart, DocLinksStart } from '@kbn/core/public';
 import type { Filter } from '@kbn/es-query';
-import { redirectWhenMissing } from '../../../../kibana_utils/public';
+import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
 import { VisualizeConstants } from '../../../common/constants';
 import { convertFromSerializedVis } from '../../utils/saved_visualize_utils';
 import type { VisualizeServices, VisualizeEditorVisInstance } from '../types';
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
index ae9d13b879cf7..f7dbd4c484fba 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TypesStart, BaseVisType, VisGroups } from '../../vis_types';
 import { GroupSelection } from './group_selection';
-import { DocLinksStart } from '../../../../../core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 describe('GroupSelection', () => {
   const defaultVisTypeParams = {
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
index bd6e64597ec8f..d380c4244ad25 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
@@ -28,7 +28,7 @@ import {
   EuiDescriptionList,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DocLinksStart } from '../../../../../core/public';
+import { DocLinksStart } from '@kbn/core/public';
 import type { BaseVisType, TypesStart } from '../../vis_types';
 import { VisGroups } from '../../vis_types/vis_groups_enum';
 import type { VisTypeAlias } from '../../vis_types/vis_type_alias_registry';
diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
index ae65251409c20..d807091f45438 100644
--- a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
+++ b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TypesStart, VisGroups, BaseVisType } from '../vis_types';
 import NewVisModal from './new_vis_modal';
-import { ApplicationStart, SavedObjectsStart, DocLinksStart } from '../../../../core/public';
-import { embeddablePluginMock } from '../../../embeddable/public/mocks';
+import { ApplicationStart, SavedObjectsStart, DocLinksStart } from '@kbn/core/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 describe('NewVisModal', () => {
   const defaultVisTypeParams = {
diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
index 2620ae01aa15a..839ba364719a2 100644
--- a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
+++ b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
@@ -17,13 +17,13 @@ import {
   IUiSettingsClient,
   SavedObjectsStart,
   DocLinksStart,
-} from '../../../../core/public';
+} from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 import { SearchSelection } from './search_selection';
 import { GroupSelection } from './group_selection';
 import { AggBasedSelection } from './agg_based_selection';
 import type { TypesStart, BaseVisType, VisTypeAlias } from '../vis_types';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
-import { EmbeddableStateTransfer } from '../../../embeddable/public';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
 import './dialog.scss';
 
diff --git a/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx b/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx
index 9d9098f00b753..e6179593de8d6 100644
--- a/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx
@@ -10,9 +10,9 @@ import { EuiModalBody, EuiModalHeader, EuiModalHeaderTitle } from '@elastic/eui'
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { IUiSettingsClient, SavedObjectsStart } from '../../../../../core/public';
+import { IUiSettingsClient, SavedObjectsStart } from '@kbn/core/public';
 
-import { SavedObjectFinderUi } from '../../../../../plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import type { BaseVisType } from '../../vis_types';
 import { DialogNavigation } from '../dialog_navigation';
 
diff --git a/src/plugins/visualizations/public/wizard/show_new_vis.tsx b/src/plugins/visualizations/public/wizard/show_new_vis.tsx
index 13e8cd1851bf1..2df53fbfd078e 100644
--- a/src/plugins/visualizations/public/wizard/show_new_vis.tsx
+++ b/src/plugins/visualizations/public/wizard/show_new_vis.tsx
@@ -10,7 +10,7 @@ import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { EuiPortal, EuiProgress } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   getHttp,
   getSavedObjects,
diff --git a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
index 24b05ca80d760..42fcc34984b4d 100644
--- a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
+++ b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
@@ -10,8 +10,8 @@ import semverGte from 'semver/functions/gte';
 import { makeVisualizeEmbeddableFactory } from './make_visualize_embeddable_factory';
 import { getAllMigrations } from '../migrations/visualization_saved_object_migrations';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SerializedSearchSourceFields } from 'src/plugins/data/public';
-import { GetMigrationFunctionObjectFn } from 'src/plugins/kibana_utils/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
+import { GetMigrationFunctionObjectFn } from '@kbn/kibana-utils-plugin/common';
 
 describe('embeddable migrations', () => {
   test('should have same versions registered as saved object migrations versions (>7.13.0)', () => {
diff --git a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
index 614ebdd104319..e9dd45e1f84fc 100644
--- a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
+++ b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
@@ -7,15 +7,15 @@
  */
 
 import { flow, mapValues } from 'lodash';
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SerializedSearchSourceFields } from 'src/plugins/data/public';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
   MigrateFunction,
-} from '../../../kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import {
   commonAddSupportOfDualIndexSelectionModeInTSVB,
   commonHideTSVBLastValueIndicator,
diff --git a/src/plugins/visualizations/server/index.ts b/src/plugins/visualizations/server/index.ts
index f10caf44b3ccd..8ced8ed138b90 100644
--- a/src/plugins/visualizations/server/index.ts
+++ b/src/plugins/visualizations/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { VisualizationsPlugin } from './plugin';
 
 export { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
diff --git a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts
index 083e1ae51575b..99dbf548e6f44 100644
--- a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts
+++ b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
 
diff --git a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
index e480d03e137ae..4b729afa62307 100644
--- a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
+++ b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
@@ -7,12 +7,12 @@
  */
 
 import { cloneDeep, get, omit, has, flow, forOwn, mapValues } from 'lodash';
-import type { SavedObjectMigrationFn, SavedObjectMigrationMap } from 'kibana/server';
-import { mergeSavedObjectMigrationMaps } from '../../../../core/server';
-import { MigrateFunctionsObject, MigrateFunction } from '../../../kibana_utils/common';
+import type { SavedObjectMigrationFn, SavedObjectMigrationMap } from '@kbn/core/server';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
+import { MigrateFunctionsObject, MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 
-import { DEFAULT_QUERY_LANGUAGE, SerializedSearchSourceFields } from '../../../data/common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../data_views/common';
+import { DEFAULT_QUERY_LANGUAGE, SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import {
   commonAddSupportOfDualIndexSelectionModeInTSVB,
   commonHideTSVBLastValueIndicator,
diff --git a/src/plugins/visualizations/server/plugin.ts b/src/plugins/visualizations/server/plugin.ts
index 7ad8a44200bc1..eabea76bd31c9 100644
--- a/src/plugins/visualizations/server/plugin.ts
+++ b/src/plugins/visualizations/server/plugin.ts
@@ -9,21 +9,21 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { PluginSetup as DataPluginSetup } from 'src/plugins/data/server';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
-import { registerVisualizationsCollector } from './usage_collector';
-import { capabilitiesProvider } from './capabilities_provider';
-
-import type { VisualizationsPluginSetup, VisualizationsPluginStart } from './types';
+import { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
 import type {
   PluginInitializerContext,
   CoreSetup,
   CoreStart,
   Plugin,
   Logger,
-} from '../../../core/server';
-import type { UsageCollectionSetup } from '../../usage_collection/server';
-import type { EmbeddableSetup } from '../../embeddable/server';
+} from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
+import { registerVisualizationsCollector } from './usage_collector';
+import { capabilitiesProvider } from './capabilities_provider';
+
+import type { VisualizationsPluginSetup, VisualizationsPluginStart } from './types';
 import { makeVisualizeEmbeddableFactory } from './embeddable/make_visualize_embeddable_factory';
 import { getVisualizationSavedObjectType } from './saved_objects';
 
diff --git a/src/plugins/visualizations/server/saved_objects/visualization.ts b/src/plugins/visualizations/server/saved_objects/visualization.ts
index c27d406ab29fe..30d60a36abcfc 100644
--- a/src/plugins/visualizations/server/saved_objects/visualization.ts
+++ b/src/plugins/visualizations/server/saved_objects/visualization.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { SavedObjectsType } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { getAllMigrations } from '../migrations/visualization_saved_object_migrations';
 
 export const getVisualizationSavedObjectType = (
diff --git a/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts b/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts
index ab31d622e62c7..38e0036feec24 100644
--- a/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { getStats } from './get_usage_collector';
-import type { SavedObjectsClientContract } from '../../../../core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const defaultMockSavedObjects = [
   {
diff --git a/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts b/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts
index c2fa148cf121c..f53b4b01864c5 100644
--- a/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts
@@ -7,10 +7,10 @@
  */
 
 import { countBy, groupBy, mapValues, max, min, values } from 'lodash';
+import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
 import { getPastDays } from './get_past_days';
 
-import type { SavedObjectsClientContract, SavedObjectsFindResult } from '../../../../core/server';
-import type { SavedVisState } from '../../../visualizations/common';
+import type { SavedVisState } from '../../common';
 
 interface VisSummary {
   type: string;
diff --git a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts
index e8f9df8516632..9f0fbd6571cde 100644
--- a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts
+++ b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts
@@ -8,7 +8,7 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
 import { registerVisualizationsCollector } from './register_visualizations_collector';
 
diff --git a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts
index b7ca4268c9a89..bf00e83be4b87 100644
--- a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts
+++ b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getStats, VisualizationUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../usage_collection/server';
 
 export function registerVisualizationsCollector(collectorSet: UsageCollectionSetup) {
   const collector = collectorSet.makeUsageCollector<VisualizationUsage | undefined>({
diff --git a/test/accessibility/apps/visualize.ts b/test/accessibility/apps/visualize.ts
index c1dbedb59da1e..f3ffc71d3e592 100644
--- a/test/accessibility/apps/visualize.ts
+++ b/test/accessibility/apps/visualize.ts
@@ -14,6 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Visualize', () => {
     it('visualize', async () => {
+      await PageObjects.visualize.gotoVisualizationLandingPage();
       await a11y.testAppSnapshot();
     });
 
@@ -22,8 +23,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await a11y.testAppSnapshot();
     });
 
-    it.skip('create visualize button', async () => {
-      await PageObjects.visualize.clickNewVisualization();
+    it('create visualize button', async () => {
+      await PageObjects.visualize.clickAggBasedVisualizations();
+      await PageObjects.visualize.waitForVisualizationSelectPage();
+      await PageObjects.visualize.clickAreaChart();
       await a11y.testAppSnapshot();
     });
   });
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts
index bda7ec2aadebb..31c9302e5ece8 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import type { Event, IShipper } from 'src/core/public';
+import type { Event, IShipper } from '@kbn/core/public';
 
 export class CustomShipper implements IShipper {
   public static shipperName = 'FTR-helpers-shipper';
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
index c1856de48a3d2..21789d0aab005 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { ReplaySubject, firstValueFrom, filter, take, toArray } from 'rxjs';
-import type { Plugin, CoreSetup, Event } from 'src/core/public';
+import type { Plugin, CoreSetup, Event } from '@kbn/core/public';
 import { CustomShipper } from './custom_shipper';
 import './types';
 
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts
index 413335ee8293f..0b4cd0ec731b9 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Event, EventType } from 'src/core/public';
+import type { Event, EventType } from '@kbn/core/public';
 
 declare global {
   interface Window {
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts
index e9d8c3b609209..0feb1f2d13e7c 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import type { IShipper, Event } from 'src/core/server';
+import type { IShipper, Event } from '@kbn/core/server';
 
 export class CustomShipper implements IShipper {
   public static shipperName = 'FTR-helpers-shipper';
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
index 7ed851e76fd55..b5cdea559b11b 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
@@ -8,7 +8,7 @@
 
 import { firstValueFrom, ReplaySubject, filter, take, toArray } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import type { Plugin, CoreSetup, Event } from 'src/core/server';
+import type { Plugin, CoreSetup, Event } from '@kbn/core/server';
 import { CustomShipper } from './custom_shipper';
 
 export class AnalyticsFTRHelpers implements Plugin {
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts
index a0d943736db4f..e94e34126c7d4 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts
@@ -7,8 +7,8 @@
  */
 
 import { Subject } from 'rxjs';
-import { TelemetryCounterType } from '@elastic/analytics';
-import type { Event, EventContext, IShipper, TelemetryCounter } from 'src/core/public';
+import { TelemetryCounterType } from '@kbn/analytics-client';
+import type { Event, EventContext, IShipper, TelemetryCounter } from '@kbn/core/public';
 
 export interface Action {
   action: string;
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
index 6d0e7a9509aed..d98fddfc6943b 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
@@ -8,7 +8,7 @@
 
 import { BehaviorSubject, firstValueFrom, ReplaySubject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
-import type { Plugin, CoreSetup, TelemetryCounter, CoreStart } from 'src/core/public';
+import type { Plugin, CoreSetup, TelemetryCounter, CoreStart } from '@kbn/core/public';
 import type { Action } from './custom_shipper';
 import { CustomShipper } from './custom_shipper';
 import './types';
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts
index 37203512e3674..fd6836bd4d699 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { TelemetryCounter } from 'src/core/public';
+import type { TelemetryCounter } from '@kbn/core/public';
 import type { Action } from './custom_shipper';
 
 declare global {
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts
index 949623314e603..7d0b2bb1b6db2 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts
@@ -7,8 +7,8 @@
  */
 
 import { Subject } from 'rxjs';
-import { TelemetryCounterType } from '@elastic/analytics';
-import type { IShipper, Event, EventContext, TelemetryCounter } from 'src/core/server';
+import { TelemetryCounterType } from '@kbn/analytics-client';
+import type { IShipper, Event, EventContext, TelemetryCounter } from '@kbn/core/server';
 
 export interface Action {
   action: string;
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
index 35d235b896aae..8ee729a8346bb 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
@@ -9,7 +9,7 @@
 import { BehaviorSubject, firstValueFrom, ReplaySubject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
-import type { Plugin, CoreSetup, CoreStart, TelemetryCounter } from 'src/core/server';
+import type { Plugin, CoreSetup, CoreStart, TelemetryCounter } from '@kbn/core/server';
 import type { Action } from './custom_shipper';
 import { CustomShipper } from './custom_shipper';
 
@@ -61,13 +61,18 @@ export class AnalyticsPluginAPlugin implements Plugin {
         validate: {
           query: schema.object({
             takeNumberOfCounters: schema.number({ min: 1 }),
+            eventType: schema.string(),
           }),
         },
       },
       async (context, req, res) => {
-        const { takeNumberOfCounters } = req.query;
+        const { takeNumberOfCounters, eventType } = req.query;
 
-        return res.ok({ body: stats.slice(-takeNumberOfCounters) });
+        return res.ok({
+          body: stats
+            .filter((counter) => counter.event_type === eventType)
+            .slice(-takeNumberOfCounters),
+        });
       }
     );
 
diff --git a/test/analytics/config.ts b/test/analytics/config.ts
index 46fa5d892997a..1ecac5af0d01a 100644
--- a/test/analytics/config.ts
+++ b/test/analytics/config.ts
@@ -34,6 +34,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       ...functionalConfig.get('kbnTestServer'),
       serverArgs: [
         ...functionalConfig.get('kbnTestServer.serverArgs'),
+        // Disabling telemetry so it doesn't call opt-in before the tests run.
+        '--telemetry.enabled=false',
         `--plugin-path=${path.resolve(__dirname, './__fixtures__/plugins/analytics_plugin_a')}`,
         `--plugin-path=${path.resolve(__dirname, './__fixtures__/plugins/analytics_ftr_helpers')}`,
       ],
diff --git a/test/analytics/services/kibana_ebt.ts b/test/analytics/services/kibana_ebt.ts
index cdb6e5ae28d95..fd64cbbbc0105 100644
--- a/test/analytics/services/kibana_ebt.ts
+++ b/test/analytics/services/kibana_ebt.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
-import '../__fixtures__/plugins/analytics_ftr_helpers/public/types';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
+import '@kbn/analytics-ftr-helpers-plugin/public/types';
 
 export function KibanaEBTServerProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/analytics/tests/analytics_from_the_browser.ts b/test/analytics/tests/analytics_from_the_browser.ts
index 9c866204ce18e..7acabf2112c5d 100644
--- a/test/analytics/tests/analytics_from_the_browser.ts
+++ b/test/analytics/tests/analytics_from_the_browser.ts
@@ -7,10 +7,10 @@
  */
 
 import expect from '@kbn/expect';
-import type { TelemetryCounter } from 'src/core/server';
+import type { TelemetryCounter } from '@kbn/core/server';
+import { Action } from '@kbn/analytics-plugin-a-plugin/server/custom_shipper';
 import { FtrProviderContext } from '../services';
-import { Action } from '../__fixtures__/plugins/analytics_plugin_a/server/custom_shipper';
-import '../__fixtures__/plugins/analytics_plugin_a/public/types';
+import '@kbn/analytics-plugin-a-plugin/public/types';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const { common } = getPageObjects(['common']);
@@ -23,7 +23,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     ): Promise<TelemetryCounter[]> => {
       return await browser.execute(
         ({ takeNumberOfCounters }) =>
-          window.__analyticsPluginA__.stats.slice(-takeNumberOfCounters),
+          window.__analyticsPluginA__.stats
+            .filter((counter) => counter.event_type === 'test-plugin-lifecycle')
+            .slice(-takeNumberOfCounters),
         { takeNumberOfCounters: _takeNumberOfCounters }
       );
     };
@@ -70,6 +72,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(context).to.have.property('user_agent');
       expect(context.user_agent).to.be.a('string');
 
+      const reportEventContext = actions[2].meta[1].context;
+      expect(reportEventContext).to.have.property('user_agent');
+      expect(reportEventContext.user_agent).to.be.a('string');
+
       expect(actions).to.eql([
         { action: 'optIn', meta: true },
         { action: 'extendContext', meta: context },
@@ -85,7 +91,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             {
               timestamp: actions[2].meta[1].timestamp,
               event_type: 'test-plugin-lifecycle',
-              context,
+              context: reportEventContext,
               properties: { plugin: 'analyticsPluginA', step: 'start' },
             },
           ],
@@ -103,7 +109,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         {
           timestamp: actions[2].meta[1].timestamp,
           event_type: 'test-plugin-lifecycle',
-          context,
+          context: reportEventContext,
           properties: { plugin: 'analyticsPluginA', step: 'start' },
         },
       ]);
diff --git a/test/analytics/tests/analytics_from_the_server.ts b/test/analytics/tests/analytics_from_the_server.ts
index 8555d91031d27..e5e3573b20fcd 100644
--- a/test/analytics/tests/analytics_from_the_server.ts
+++ b/test/analytics/tests/analytics_from_the_server.ts
@@ -7,9 +7,9 @@
  */
 
 import expect from '@kbn/expect';
-import type { TelemetryCounter } from 'src/core/server';
+import type { TelemetryCounter } from '@kbn/core/server';
+import { Action } from '@kbn/analytics-plugin-a-plugin/server/custom_shipper';
 import { FtrProviderContext } from '../services';
-import { Action } from '../__fixtures__/plugins/analytics_plugin_a/server/custom_shipper';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -20,7 +20,7 @@ export default function ({ getService }: FtrProviderContext) {
   ): Promise<TelemetryCounter[]> => {
     const resp = await supertest
       .get(`/internal/analytics_plugin_a/stats`)
-      .query({ takeNumberOfCounters })
+      .query({ takeNumberOfCounters, eventType: 'test-plugin-lifecycle' })
       .set('kbn-xsrf', 'xxx')
       .expect(200);
 
diff --git a/test/api_integration/apis/custom_integration/integrations.ts b/test/api_integration/apis/custom_integration/integrations.ts
index e71cc045da321..c4fda918328f8 100644
--- a/test/api_integration/apis/custom_integration/integrations.ts
+++ b/test/api_integration/apis/custom_integration/integrations.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         expect(resp.body).to.be.an('array');
 
-        expect(resp.body.length).to.be(38);
+        expect(resp.body.length).to.be(42);
 
         // Test for sample data card
         expect(resp.body.findIndex((c: { id: string }) => c.id === 'sample_data_all')).to.be.above(
diff --git a/test/api_integration/apis/data_view_field_editor/field_preview.ts b/test/api_integration/apis/data_view_field_editor/field_preview.ts
index 4fea3229462d9..0c2446af541e9 100644
--- a/test/api_integration/apis/data_view_field_editor/field_preview.ts
+++ b/test/api_integration/apis/data_view_field_editor/field_preview.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { getErrorCodeFromErrorReason } from '../../../../src/plugins/data_view_field_editor/public/lib/runtime_field_validation';
+import { getErrorCodeFromErrorReason } from '@kbn/data-view-field-editor-plugin/public/lib/runtime_field_validation';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { API_BASE_PATH } from './constants';
 
diff --git a/test/api_integration/apis/index_patterns/constants.ts b/test/api_integration/apis/index_patterns/constants.ts
index 3de4f80dd657d..8194966bcdcb8 100644
--- a/test/api_integration/apis/index_patterns/constants.ts
+++ b/test/api_integration/apis/index_patterns/constants.ts
@@ -13,7 +13,7 @@ import {
   SERVICE_KEY,
   SERVICE_PATH,
   SERVICE_PATH_LEGACY,
-} from '../../../../src/plugins/data_views/server';
+} from '@kbn/data-views-plugin/server';
 
 const legacyConfig = {
   name: 'legacy index pattern api',
diff --git a/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts b/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts
index c32b9b4241206..2b3ffca019370 100644
--- a/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts
+++ b/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import type { DeprecationsGetResponse } from 'src/core/server/types';
+import type { DeprecationsGetResponse } from '@kbn/core/server/types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js
index d5ca92c371617..3f0b00c02f1ae 100644
--- a/test/api_integration/apis/index_patterns/es_errors/errors.js
+++ b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -15,7 +15,7 @@ import {
   createNoMatchingIndicesError,
   isNoMatchingIndicesError,
   convertEsError,
-} from '../../../../../src/plugins/data_views/server/fetcher/lib/errors';
+} from '@kbn/data-views-plugin/server/fetcher/lib/errors';
 
 import { getIndexNotFoundError, getDocNotFoundError } from './lib';
 
diff --git a/test/api_integration/apis/saved_objects/find.ts b/test/api_integration/apis/saved_objects/find.ts
index c8623f08e6f97..4afcc4f162a62 100644
--- a/test/api_integration/apis/saved_objects/find.ts
+++ b/test/api_integration/apis/saved_objects/find.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { SavedObject } from '@kbn/core/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { SavedObject } from '../../../../src/core/server';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts
index 205325ae745bb..0d9cfed365a00 100644
--- a/test/api_integration/apis/saved_objects/import.ts
+++ b/test/api_integration/apis/saved_objects/import.ts
@@ -9,7 +9,7 @@
 import expect from '@kbn/expect';
 import { join } from 'path';
 import dedent from 'dedent';
-import type { SavedObjectsImportFailure } from 'src/core/server';
+import type { SavedObjectsImportFailure } from '@kbn/core/server';
 import type { FtrProviderContext } from '../../ftr_provider_context';
 
 const createConflictError = (
diff --git a/test/api_integration/apis/search/bsearch.ts b/test/api_integration/apis/search/bsearch.ts
index 6aee2b542da0f..6b2cde859feb6 100644
--- a/test/api_integration/apis/search/bsearch.ts
+++ b/test/api_integration/apis/search/bsearch.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import request from 'superagent';
-import { inflateResponse } from '../../../../src/plugins/bfetch/public/streaming';
+import { inflateResponse } from '@kbn/bfetch-plugin/public/streaming';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { painlessErrReq } from './painless_err_req';
 import { verifyErrorResponse } from './verify_error';
diff --git a/test/api_integration/apis/telemetry/opt_in.ts b/test/api_integration/apis/telemetry/opt_in.ts
index 7e0564ac44a43..cbd2745976c6a 100644
--- a/test/api_integration/apis/telemetry/opt_in.ts
+++ b/test/api_integration/apis/telemetry/opt_in.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository';
+import { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/telemetry_repository';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
diff --git a/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts b/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts
index ec44cec39c29a..deb6218e145af 100644
--- a/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts
+++ b/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts
@@ -10,7 +10,7 @@ import type { ObjectType, Type } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
 import { set } from '@elastic/safer-lodash-set';
 import { get, merge } from 'lodash';
-import type { AllowedSchemaTypes } from 'src/plugins/usage_collection/server';
+import type { AllowedSchemaTypes } from '@kbn/usage-collection-plugin/server';
 
 /**
  * Type that defines all the possible values that the Telemetry Schema accepts.
diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts
index 019dcfd621655..9d3bfa9c25b81 100644
--- a/test/api_integration/apis/ui_counters/ui_counters.ts
+++ b/test/api_integration/apis/ui_counters/ui_counters.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 import { ReportManager, METRIC_TYPE, UiCounterMetricType, Report } from '@kbn/analytics';
 import moment from 'moment';
+import { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UsageCountersSavedObject } from '../../../../src/plugins/usage_collection/server';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/api_integration/services/supertest.ts b/test/api_integration/services/supertest.ts
index 709b9ddd75c22..6680c7b203bd5 100644
--- a/test/api_integration/services/supertest.ts
+++ b/test/api_integration/services/supertest.ts
@@ -8,10 +8,10 @@
 
 import { systemIndicesSuperuser } from '@kbn/test';
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import { format as formatUrl } from 'url';
 
 import supertest from 'supertest';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 export function KibanaSupertestProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
diff --git a/test/common/fixtures/plugins/coverage/public/plugin.ts b/test/common/fixtures/plugins/coverage/public/plugin.ts
index d611565550b45..0c7d3f238a27d 100644
--- a/test/common/fixtures/plugins/coverage/public/plugin.ts
+++ b/test/common/fixtures/plugins/coverage/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'kibana/server';
+import { Plugin } from '@kbn/core/server';
 
 declare global {
   interface Window {
diff --git a/test/common/fixtures/plugins/newsfeed/server/index.ts b/test/common/fixtures/plugins/newsfeed/server/index.ts
index 8077c979014d9..21e28f5435cc2 100644
--- a/test/common/fixtures/plugins/newsfeed/server/index.ts
+++ b/test/common/fixtures/plugins/newsfeed/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'kibana/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 import { NewsFeedSimulatorPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/test/common/fixtures/plugins/newsfeed/server/plugin.ts b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
index a592a832532ce..85dadcfa8d7d2 100644
--- a/test/common/fixtures/plugins/newsfeed/server/plugin.ts
+++ b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import type { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 export class NewsFeedSimulatorPlugin implements Plugin {
   constructor(private readonly initializerContext: PluginInitializerContext) {}
diff --git a/test/common/services/bsearch.ts b/test/common/services/bsearch.ts
index d9fe89d9e4b9c..3c8a58c46867b 100644
--- a/test/common/services/bsearch.ts
+++ b/test/common/services/bsearch.ts
@@ -9,7 +9,7 @@
 import expect from '@kbn/expect';
 import request from 'superagent';
 import type SuperTest from 'supertest';
-import { IEsSearchResponse } from 'src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { RetryService } from './retry/retry';
 
diff --git a/test/common/services/es_archiver.ts b/test/common/services/es_archiver.ts
index 3212e80928686..f5b7ee8cc5885 100644
--- a/test/common/services/es_archiver.ts
+++ b/test/common/services/es_archiver.ts
@@ -8,7 +8,7 @@
 
 import { EsArchiver } from '@kbn/es-archiver';
 import { FtrProviderContext } from '../ftr_provider_context';
-import * as KibanaServer from '../../common/services/kibana_server';
+import * as KibanaServer from './kibana_server';
 
 export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiver {
   const config = getService('config');
diff --git a/test/common/services/index_patterns.ts b/test/common/services/index_patterns.ts
index 1e7e998ae24d9..316bafaa71fcc 100644
--- a/test/common/services/index_patterns.ts
+++ b/test/common/services/index_patterns.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataViewSpec } from '@kbn/data-plugin/common';
 import { FtrService } from '../ftr_provider_context';
-import { DataViewSpec } from '../../../src/plugins/data/common';
 
 export class IndexPatternsService extends FtrService {
   private readonly kibanaServer = this.ctx.getService('kibanaServer');
diff --git a/test/common/services/randomness.ts b/test/common/services/randomness.ts
index 82f06fb681066..c799c34539f15 100644
--- a/test/common/services/randomness.ts
+++ b/test/common/services/randomness.ts
@@ -7,7 +7,7 @@
  */
 
 import Chance from 'chance';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { FtrService } from '../ftr_provider_context';
 
diff --git a/test/common/services/retry/retry_for_success.ts b/test/common/services/retry/retry_for_success.ts
index ed2ff480db20d..8b131db4c05e5 100644
--- a/test/common/services/retry/retry_for_success.ts
+++ b/test/common/services/retry/retry_for_success.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { inspect } from 'util';
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
diff --git a/test/common/services/retry/retry_for_truthy.ts b/test/common/services/retry/retry_for_truthy.ts
index 6bee196fa9597..dca9c3f2c02cf 100644
--- a/test/common/services/retry/retry_for_truthy.ts
+++ b/test/common/services/retry/retry_for_truthy.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 import { retryForSuccess } from './retry_for_success';
 
diff --git a/test/common/services/saved_object_info/saved_object_info.ts b/test/common/services/saved_object_info/saved_object_info.ts
index 3442efcc98438..a1b98cbd408bf 100644
--- a/test/common/services/saved_object_info/saved_object_info.ts
+++ b/test/common/services/saved_object_info/saved_object_info.ts
@@ -12,7 +12,7 @@ import { Either, fromNullable, chain, getOrElse, toError } from 'fp-ts/Either';
 import { flow, pipe } from 'fp-ts/function';
 import * as TE from 'fp-ts/lib/TaskEither';
 import * as T from 'fp-ts/lib/Task';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { FtrService } from '../../ftr_provider_context';
 import { print } from './utils';
 
diff --git a/test/common/services/saved_object_info/utils.ts b/test/common/services/saved_object_info/utils.ts
index f007710f2b14b..24a63dd60636d 100644
--- a/test/common/services/saved_object_info/utils.ts
+++ b/test/common/services/saved_object_info/utils.ts
@@ -7,7 +7,8 @@
  */
 
 import { inspect } from 'util';
-import { createFlagError, ToolingLog } from '@kbn/dev-utils';
+import { createFlagError } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 interface ResolvedPayload {
   xs: any;
diff --git a/test/common/services/security/role.ts b/test/common/services/security/role.ts
index 98cf597fc76d4..51b50a5dda82f 100644
--- a/test/common/services/security/role.ts
+++ b/test/common/services/security/role.ts
@@ -7,7 +7,7 @@
  */
 
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 
 export class Role {
diff --git a/test/common/services/security/role_mappings.ts b/test/common/services/security/role_mappings.ts
index af9204866ad47..6dad4dec41d78 100644
--- a/test/common/services/security/role_mappings.ts
+++ b/test/common/services/security/role_mappings.ts
@@ -7,7 +7,7 @@
  */
 
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 
 export class RoleMappings {
diff --git a/test/common/services/security/system_indices_user.ts b/test/common/services/security/system_indices_user.ts
index 091621207a671..9bfaddd9f0306 100644
--- a/test/common/services/security/system_indices_user.ts
+++ b/test/common/services/security/system_indices_user.ts
@@ -7,7 +7,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import {
   systemIndicesSuperuser,
   createEsClientForFtrConfig,
diff --git a/test/common/services/security/user.ts b/test/common/services/security/user.ts
index d6813105ecbf6..8276834fd519c 100644
--- a/test/common/services/security/user.ts
+++ b/test/common/services/security/user.ts
@@ -7,7 +7,7 @@
  */
 
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 
 export class User {
diff --git a/test/examples/bfetch_explorer/index.ts b/test/examples/bfetch_explorer/index.ts
index e5b4789bf9178..247cef07a487e 100644
--- a/test/examples/bfetch_explorer/index.ts
+++ b/test/examples/bfetch_explorer/index.ts
@@ -14,7 +14,7 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
   const PageObjects = getPageObjects(['common', 'header']);
 
   describe('bfetch explorer', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     before(async () => {
       await browser.setWindowSize(1300, 900);
       await PageObjects.common.navigateToApp('bfetch-explorer', { insertTimestamp: false });
diff --git a/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts b/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts
index 79a29517780a7..389c877432493 100644
--- a/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts
+++ b/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/data_view_field_editor_example/index.ts b/test/examples/data_view_field_editor_example/index.ts
index 6a5e76d767f50..0f8517cb3ed29 100644
--- a/test/examples/data_view_field_editor_example/index.ts
+++ b/test/examples/data_view_field_editor_example/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
@@ -20,7 +20,7 @@ export default function ({
   const PageObjects = getPageObjects(['common', 'header', 'settings']);
 
   describe('data view field editor example', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     before(async () => {
       await esArchiver.emptyKibanaIndex();
       await browser.setWindowSize(1300, 900);
diff --git a/test/examples/embeddables/adding_children.ts b/test/examples/embeddables/adding_children.ts
index dcc7467689a18..1b99413b184f7 100644
--- a/test/examples/embeddables/adding_children.ts
+++ b/test/examples/embeddables/adding_children.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts
index 6be6d833a8ddf..073b9d9ee3b86 100644
--- a/test/examples/embeddables/dashboard.ts
+++ b/test/examples/embeddables/dashboard.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 export const testDashboardInput = {
   panels: {
diff --git a/test/examples/embeddables/hello_world_embeddable.ts b/test/examples/embeddables/hello_world_embeddable.ts
index ba3897c0e473b..9e74246f2e2ba 100644
--- a/test/examples/embeddables/hello_world_embeddable.ts
+++ b/test/examples/embeddables/hello_world_embeddable.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/embeddables/index.ts b/test/examples/embeddables/index.ts
index b6ec314875566..364c4001383a7 100644
--- a/test/examples/embeddables/index.ts
+++ b/test/examples/embeddables/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
@@ -18,7 +18,7 @@ export default function ({
   const PageObjects = getPageObjects(['common', 'header']);
 
   describe('embeddable explorer', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     before(async () => {
       await browser.setWindowSize(1300, 900);
       await PageObjects.common.navigateToApp('embeddableExplorer');
diff --git a/test/examples/embeddables/list_container.ts b/test/examples/embeddables/list_container.ts
index b5fc35e84a956..d91dc9447b9e5 100644
--- a/test/examples/embeddables/list_container.ts
+++ b/test/examples/embeddables/list_container.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/embeddables/todo_embeddable.ts b/test/examples/embeddables/todo_embeddable.ts
index 351e89a20f4e5..a26d0f098429e 100644
--- a/test/examples/embeddables/todo_embeddable.ts
+++ b/test/examples/embeddables/todo_embeddable.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/expressions_explorer/expressions.ts b/test/examples/expressions_explorer/expressions.ts
index 9aef64a392a7b..9d55458426776 100644
--- a/test/examples/expressions_explorer/expressions.ts
+++ b/test/examples/expressions_explorer/expressions.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import testSubjSelector from '@kbn/test-subj-selector';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/expressions_explorer/index.ts b/test/examples/expressions_explorer/index.ts
index 843b3da369d81..34f3c77cb0d3e 100644
--- a/test/examples/expressions_explorer/index.ts
+++ b/test/examples/expressions_explorer/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
@@ -18,7 +18,7 @@ export default function ({
   const PageObjects = getPageObjects(['common', 'header']);
 
   describe('expressions explorer', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     before(async () => {
       await browser.setWindowSize(1300, 900);
       await PageObjects.common.navigateToApp('expressionsExplorer');
diff --git a/test/examples/field_formats/index.ts b/test/examples/field_formats/index.ts
index bbef5cca2e447..f9692c910fda0 100644
--- a/test/examples/field_formats/index.ts
+++ b/test/examples/field_formats/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Field formats example', function () {
     before(async () => {
-      this.tags('ciGroup2');
+      this.tags('ciGroup11');
       await PageObjects.common.navigateToApp('fieldFormatsExample');
     });
 
diff --git a/test/examples/hello_world/index.ts b/test/examples/hello_world/index.ts
index d1a37968a9a6c..1ffb7ff6d69af 100644
--- a/test/examples/hello_world/index.ts
+++ b/test/examples/hello_world/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) {
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
 
   describe('Hello world', function () {
     before(async () => {
-      this.tags('ciGroup2');
+      this.tags('ciGroup11');
       await PageObjects.common.navigateToApp('helloWorld');
     });
 
diff --git a/test/examples/partial_results/index.ts b/test/examples/partial_results/index.ts
index 8fb2824163024..84ccff4cd35b7 100644
--- a/test/examples/partial_results/index.ts
+++ b/test/examples/partial_results/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Partial Results Example', function () {
     before(async () => {
-      this.tags('ciGroup2');
+      this.tags('ciGroup11');
       await PageObjects.common.navigateToApp('partialResultsExample');
 
       const element = await testSubjects.find('example-help');
diff --git a/test/examples/routing/index.ts b/test/examples/routing/index.ts
index bef282c436a21..949d8cfc7547a 100644
--- a/test/examples/routing/index.ts
+++ b/test/examples/routing/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) {
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
 
   describe('routing examples', function () {
     before(async () => {
-      this.tags('ciGroup2');
+      this.tags('ciGroup11');
       await PageObjects.common.navigateToApp('routingExample');
     });
 
diff --git a/test/examples/state_sync/index.ts b/test/examples/state_sync/index.ts
index 83ab9edaa1cf0..a33c014f4dd9d 100644
--- a/test/examples/state_sync/index.ts
+++ b/test/examples/state_sync/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
@@ -17,7 +17,7 @@ export default function ({
   const browser = getService('browser');
 
   describe('state sync examples', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     before(async () => {
       await browser.setWindowSize(1300, 900);
     });
diff --git a/test/examples/state_sync/todo_app.ts b/test/examples/state_sync/todo_app.ts
index ed1deeb7901c1..68ed23c5a3eda 100644
--- a/test/examples/state_sync/todo_app.ts
+++ b/test/examples/state_sync/todo_app.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
diff --git a/test/examples/ui_actions/index.ts b/test/examples/ui_actions/index.ts
index 3827d9c8d641e..b04d361cc86ec 100644
--- a/test/examples/ui_actions/index.ts
+++ b/test/examples/ui_actions/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
@@ -18,7 +18,7 @@ export default function ({
   const PageObjects = getPageObjects(['common', 'header']);
 
   describe('ui actions explorer', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     before(async () => {
       await browser.setWindowSize(1300, 900);
       await PageObjects.common.navigateToApp('uiActionsExplorer');
diff --git a/test/examples/ui_actions/ui_actions.ts b/test/examples/ui_actions/ui_actions.ts
index 51a6c00d247e8..967a56252c0cb 100644
--- a/test/examples/ui_actions/ui_actions.ts
+++ b/test/examples/ui_actions/ui_actions.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/functional/apps/console/_autocomplete.ts b/test/functional/apps/console/_autocomplete.ts
index 4b424b2a79c66..7bf872373c6c7 100644
--- a/test/functional/apps/console/_autocomplete.ts
+++ b/test/functional/apps/console/_autocomplete.ts
@@ -7,10 +7,12 @@
  */
 
 import expect from '@kbn/expect';
+import { asyncForEach } from '@kbn/std';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');
+  const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'console']);
 
   describe('console autocomplete feature', function describeIndexTests() {
@@ -25,6 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should provide basic auto-complete functionality', async () => {
       await PageObjects.console.enterRequest();
+      await PageObjects.console.pressEnter();
       await PageObjects.console.enterText(`{\n\t"query": {`);
       await PageObjects.console.pressEnter();
       await PageObjects.console.promptAutocomplete();
@@ -37,6 +40,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       beforeEach(async () => {
         await PageObjects.console.clearTextArea();
         await PageObjects.console.enterRequest();
+        await PageObjects.console.pressEnter();
       });
       it('should add a comma after previous non empty line', async () => {
         await PageObjects.console.enterText(`{\n\t"query": {\n\t\t"match": {}`);
@@ -62,5 +66,48 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         expect(lastChar).to.be.eql(',');
       });
     });
+
+    describe('with conditional templates', async () => {
+      const CONDITIONAL_TEMPLATES = [
+        {
+          type: 'fs',
+          template: `"location": "path"`,
+        },
+        {
+          type: 'url',
+          template: `"url": ""`,
+        },
+        { type: 's3', template: `"bucket": ""` },
+        {
+          type: 'azure',
+          template: `"path": ""`,
+        },
+      ];
+
+      beforeEach(async () => {
+        await PageObjects.console.clearTextArea();
+        await PageObjects.console.enterRequest('\n POST _snapshot/test_repo');
+        await PageObjects.console.pressEnter();
+      });
+
+      await asyncForEach(CONDITIONAL_TEMPLATES, async ({ type, template }) => {
+        it('should insert different templates depending on the value of type', async () => {
+          await PageObjects.console.enterText(`{\n\t"type": "${type}"`);
+          await PageObjects.console.pressEnter();
+          // Prompt autocomplete for 'settings'
+          await PageObjects.console.promptAutocomplete('s');
+
+          await retry.waitFor('autocomplete to be visible', () =>
+            PageObjects.console.isAutocompleteVisible()
+          );
+          await PageObjects.console.pressEnter();
+          await retry.try(async () => {
+            const request = await PageObjects.console.getRequest();
+            log.debug(request);
+            expect(request).to.contain(`${template}`);
+          });
+        });
+      });
+    });
   });
 }
diff --git a/test/functional/apps/console/_console.ts b/test/functional/apps/console/_console.ts
index 367f1ccb56256..52218b88be60d 100644
--- a/test/functional/apps/console/_console.ts
+++ b/test/functional/apps/console/_console.ts
@@ -106,5 +106,21 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
       });
     });
+
+    describe('with kbn: prefix in request', () => {
+      before(async () => {
+        await PageObjects.console.clearTextArea();
+      });
+      it('it should send successful request to Kibana API', async () => {
+        const expectedResponseContains = 'default space';
+        await PageObjects.console.enterRequest('\n GET kbn:/api/spaces/space');
+        await PageObjects.console.clickPlay();
+        await retry.try(async () => {
+          const actualResponse = await PageObjects.console.getResponse();
+          log.debug(actualResponse);
+          expect(actualResponse).to.contain(expectedResponseContains);
+        });
+      });
+    });
   });
 }
diff --git a/test/functional/apps/console/_vector_tile.ts b/test/functional/apps/console/_vector_tile.ts
new file mode 100644
index 0000000000000..b02db523b95ac
--- /dev/null
+++ b/test/functional/apps/console/_vector_tile.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'console', 'header', 'home']);
+  const retry = getService('retry');
+
+  describe('console vector tiles response validation', function describeIndexTests() {
+    before(async () => {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
+        useActualUrl: true,
+      });
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.home.addSampleDataSet('logs');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.common.navigateToApp('console');
+      await PageObjects.console.dismissTutorial();
+      await PageObjects.console.clearTextArea();
+    });
+
+    it('should validate response', async () => {
+      await PageObjects.console.enterText(`GET kibana_sample_data_logs/_mvt/geo.coordinates/0/0/0`);
+      await PageObjects.console.clickPlay();
+      await retry.try(async () => {
+        const actualResponse = await PageObjects.console.getResponse();
+        expect(actualResponse).to.contain('"meta": [');
+      });
+    });
+
+    after(async () => {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
+        useActualUrl: true,
+      });
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.home.removeSampleDataSet('logs');
+    });
+  });
+}
diff --git a/test/functional/apps/console/index.js b/test/functional/apps/console/index.js
index 7a1fb578b4e4a..c3d0553514cb5 100644
--- a/test/functional/apps/console/index.js
+++ b/test/functional/apps/console/index.js
@@ -18,5 +18,6 @@ export default function ({ getService, loadTestFile }) {
 
     loadTestFile(require.resolve('./_console'));
     loadTestFile(require.resolve('./_autocomplete'));
+    loadTestFile(require.resolve('./_vector_tile'));
   });
 }
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.ts b/test/functional/apps/dashboard/create_and_add_embeddables.ts
index d8bf67b6d2873..30100f0e1aa07 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.ts
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.ts
@@ -8,8 +8,8 @@
 
 import expect from '@kbn/expect';
 
-import { VisualizeConstants } from '../../../../src/plugins/visualizations/common/constants';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../src/plugins/visualizations/common/constants';
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '@kbn/visualizations-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard/dashboard_state.ts b/test/functional/apps/dashboard/dashboard_state.ts
index d3643753c8e83..d931475766776 100644
--- a/test/functional/apps/dashboard/dashboard_state.ts
+++ b/test/functional/apps/dashboard/dashboard_state.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 import chroma from 'chroma-js';
 
+import { DEFAULT_PANEL_WIDTH } from '@kbn/dashboard-plugin/public/application/embeddable/dashboard_constants';
 import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dashboard_page';
-import { DEFAULT_PANEL_WIDTH } from '../../../../src/plugins/dashboard/public/application/embeddable/dashboard_constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard/dashboard_unsaved_listing.ts b/test/functional/apps/dashboard/dashboard_unsaved_listing.ts
index d9451eda5ff62..a1db57784b5f8 100644
--- a/test/functional/apps/dashboard/dashboard_unsaved_listing.ts
+++ b/test/functional/apps/dashboard/dashboard_unsaved_listing.ts
@@ -106,7 +106,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('can discard unsaved changes using the discard link', async () => {
-      await PageObjects.dashboard.clickUnsavedChangesDiscard(dashboardTitle);
+      await PageObjects.dashboard.clickUnsavedChangesDiscard(
+        `discard-unsaved-${dashboardTitle.split(' ').join('-')}`
+      );
       await PageObjects.dashboard.expectUnsavedChangesDoesNotExist(dashboardTitle);
       await PageObjects.dashboard.loadSavedDashboard(dashboardTitle);
       await PageObjects.dashboard.switchToEditMode();
diff --git a/test/functional/apps/dashboard/index.ts b/test/functional/apps/dashboard/index.ts
index c9a62447f223a..4f69504ef7d5c 100644
--- a/test/functional/apps/dashboard/index.ts
+++ b/test/functional/apps/dashboard/index.ts
@@ -115,7 +115,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     // TODO: Remove when vislib is removed
     // https://github.com/elastic/kibana/issues/56143
     describe('new charts library', function () {
-      this.tags('ciGroup6');
+      this.tags('ciGroup5');
 
       before(async () => {
         await loadLogstash();
diff --git a/test/functional/apps/dashboard/panel_context_menu.ts b/test/functional/apps/dashboard/panel_context_menu.ts
index 337848f7864cc..8c82c162f5e86 100644
--- a/test/functional/apps/dashboard/panel_context_menu.ts
+++ b/test/functional/apps/dashboard/panel_context_menu.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
 import { PIE_CHART_VIS_NAME } from '../../page_objects/dashboard_page';
-import { VisualizeConstants } from '../../../../src/plugins/visualizations/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard/url_field_formatter.ts b/test/functional/apps/dashboard/url_field_formatter.ts
index be480066c0365..8e9dd7b66e79f 100644
--- a/test/functional/apps/dashboard/url_field_formatter.ts
+++ b/test/functional/apps/dashboard/url_field_formatter.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard_elements/controls/options_list.ts b/test/functional/apps/dashboard_elements/controls/options_list.ts
index 39522c43fc847..a4da1c217f92b 100644
--- a/test/functional/apps/dashboard_elements/controls/options_list.ts
+++ b/test/functional/apps/dashboard_elements/controls/options_list.ts
@@ -116,6 +116,36 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
       });
 
+      it('editing field clears selections', async () => {
+        const secondId = (await dashboardControls.getAllControlIds())[1];
+        await dashboardControls.optionsListOpenPopover(secondId);
+        await dashboardControls.optionsListPopoverSelectOption('hiss');
+        await dashboardControls.optionsListEnsurePopoverIsClosed(secondId);
+
+        await dashboardControls.editExistingControl(secondId);
+        await dashboardControls.controlsEditorSetfield('animal.keyword');
+        await dashboardControls.controlEditorSave();
+
+        const selectionString = await dashboardControls.optionsListGetSelectionsString(secondId);
+        expect(selectionString).to.be('Select...');
+      });
+
+      it('editing other control settings keeps selections', async () => {
+        const secondId = (await dashboardControls.getAllControlIds())[1];
+        await dashboardControls.optionsListOpenPopover(secondId);
+        await dashboardControls.optionsListPopoverSelectOption('dog');
+        await dashboardControls.optionsListPopoverSelectOption('cat');
+        await dashboardControls.optionsListEnsurePopoverIsClosed(secondId);
+
+        await dashboardControls.editExistingControl(secondId);
+        await dashboardControls.controlEditorSetTitle('Animal');
+        await dashboardControls.controlEditorSetWidth('large');
+        await dashboardControls.controlEditorSave();
+
+        const selectionString = await dashboardControls.optionsListGetSelectionsString(secondId);
+        expect(selectionString).to.be('dog, cat');
+      });
+
       it('deletes an existing control', async () => {
         const firstId = (await dashboardControls.getAllControlIds())[0];
 
diff --git a/test/functional/apps/dashboard_elements/controls/range_slider.ts b/test/functional/apps/dashboard_elements/controls/range_slider.ts
index 27f1244120a7a..1ce8f05cae190 100644
--- a/test/functional/apps/dashboard_elements/controls/range_slider.ts
+++ b/test/functional/apps/dashboard_elements/controls/range_slider.ts
@@ -25,6 +25,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     'header',
   ]);
 
+  const validateRange = async (
+    compare: 'value' | 'placeholder', // if 'value', compare actual selections; otherwise, compare the default range
+    controlId: string,
+    expectedLowerBound: string,
+    expectedUpperBound: string
+  ) => {
+    expect(await dashboardControls.rangeSliderGetLowerBoundAttribute(controlId, compare)).to.be(
+      expectedLowerBound
+    );
+    expect(await dashboardControls.rangeSliderGetUpperBoundAttribute(controlId, compare)).to.be(
+      expectedUpperBound
+    );
+  };
+
   describe('Range Slider Control', async () => {
     before(async () => {
       await security.testUser.setRoles([
@@ -82,12 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
         expect(await dashboardControls.getControlsCount()).to.be(2);
         const secondId = (await dashboardControls.getAllControlIds())[1];
-        expect(
-          await dashboardControls.rangeSliderGetLowerBoundAttribute(secondId, 'placeholder')
-        ).to.be('100');
-        expect(
-          await dashboardControls.rangeSliderGetUpperBoundAttribute(secondId, 'placeholder')
-        ).to.be('1200');
+        validateRange('placeholder', secondId, '100', '1200');
         // data views should be properly propagated from the control group to the dashboard
         expect(await filterBar.getIndexPatterns()).to.be('logstash-*,kibana_sample_data_flights');
       });
@@ -112,12 +121,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await dashboardControls.controlsEditorSetfield('dayOfWeek');
         await dashboardControls.controlEditorSave();
         await dashboardControls.rangeSliderWaitForLoading();
-        expect(
-          await dashboardControls.rangeSliderGetLowerBoundAttribute(firstId, 'placeholder')
-        ).to.be('0');
-        expect(
-          await dashboardControls.rangeSliderGetUpperBoundAttribute(firstId, 'placeholder')
-        ).to.be('6');
+        validateRange('placeholder', firstId, '0', '6');
+
         // when creating a new filter, the ability to select a data view should be removed, because the dashboard now only has one data view
         await retry.try(async () => {
           await testSubjects.click('addFilter');
@@ -150,31 +155,38 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       it('applies filter from the first control on the second control', async () => {
         await dashboardControls.rangeSliderWaitForLoading();
         const secondId = (await dashboardControls.getAllControlIds())[1];
-        const availableMin = await dashboardControls.rangeSliderGetLowerBoundAttribute(
-          secondId,
-          'placeholder'
-        );
-        expect(availableMin).to.be('100');
-        const availabeMax = await dashboardControls.rangeSliderGetUpperBoundAttribute(
-          secondId,
-          'placeholder'
-        );
-        expect(availabeMax).to.be('1000');
+        validateRange('placeholder', secondId, '100', '1000');
+      });
+
+      it('editing field clears selections', async () => {
+        const secondId = (await dashboardControls.getAllControlIds())[1];
+        await dashboardControls.editExistingControl(secondId);
+        await dashboardControls.controlsEditorSetfield('FlightDelayMin');
+        await dashboardControls.controlEditorSave();
+
+        await dashboardControls.rangeSliderWaitForLoading();
+        validateRange('value', secondId, '', '');
+      });
+
+      it('editing other control settings keeps selections', async () => {
+        const secondId = (await dashboardControls.getAllControlIds())[1];
+        await dashboardControls.rangeSliderSetLowerBound(secondId, '50');
+        await dashboardControls.rangeSliderSetUpperBound(secondId, '100');
+        await dashboardControls.rangeSliderWaitForLoading();
+
+        await dashboardControls.editExistingControl(secondId);
+        await dashboardControls.controlEditorSetTitle('Minimum Flight Delay');
+        await dashboardControls.controlEditorSetWidth('large');
+        await dashboardControls.controlEditorSave();
+
+        await dashboardControls.rangeSliderWaitForLoading();
+        validateRange('value', secondId, '50', '100');
       });
 
       it('can clear out selections by clicking the reset button', async () => {
         const firstId = (await dashboardControls.getAllControlIds())[0];
         await dashboardControls.rangeSliderClearSelection(firstId);
-        const lowerBoundSelection = await dashboardControls.rangeSliderGetLowerBoundAttribute(
-          firstId,
-          'value'
-        );
-        expect(lowerBoundSelection.length).to.be(0);
-        const upperBoundSelection = await dashboardControls.rangeSliderGetUpperBoundAttribute(
-          firstId,
-          'value'
-        );
-        expect(upperBoundSelection.length).to.be(0);
+        validateRange('value', firstId, '', '');
       });
 
       it('deletes an existing control', async () => {
diff --git a/test/functional/apps/discover/_data_view_editor.ts b/test/functional/apps/discover/_data_view_editor.ts
index 8e0b42469dbbc..01954088ad941 100644
--- a/test/functional/apps/discover/_data_view_editor.ts
+++ b/test/functional/apps/discover/_data_view_editor.ts
@@ -43,7 +43,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover integration with data view editor', function describeIndexTests() {
     before(async function () {
-      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
+      const roles = config.get('esTestCluster.ccs')
+        ? ['kibana_admin', 'test_logstash_reader', 'ccs_remote_search']
+        : ['kibana_admin', 'test_logstash_reader'];
+      await security.testUser.setRoles(roles);
       await esNode.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.savedObjects.clean({ types: ['saved-search', 'index-pattern'] });
       await kibanaServer.importExport.load(kbnDirectory);
diff --git a/test/functional/apps/discover/_discover.ts b/test/functional/apps/discover/_discover.ts
index 03a8dbcffa2d9..88df8f7798ba8 100644
--- a/test/functional/apps/discover/_discover.ts
+++ b/test/functional/apps/discover/_discover.ts
@@ -25,7 +25,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     defaultIndex: 'logstash-*',
   };
 
-  describe('discover test', function describeIndexTests() {
+  // FLAKY: https://github.com/elastic/kibana/issues/130694
+  describe.skip('discover test', function describeIndexTests() {
     before(async function () {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
diff --git a/test/functional/apps/discover/_field_data_with_fields_api.ts b/test/functional/apps/discover/_field_data_with_fields_api.ts
index 402783694cbd5..d7912d6d0959f 100644
--- a/test/functional/apps/discover/_field_data_with_fields_api.ts
+++ b/test/functional/apps/discover/_field_data_with_fields_api.ts
@@ -34,8 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
     });
-    // FLAKY: https://github.com/elastic/kibana/issues/127905
-    describe.skip('field data', function () {
+    describe('field data', function () {
       it('search php should show the correct hit count', async function () {
         const expectedHitCount = '445';
         await retry.try(async function () {
@@ -92,12 +91,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           hash.replace('columns:!()', 'columns:!(relatedContent)'),
           { useActualUrl: true }
         );
+
+        await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.try(async function tryingForTime() {
           expect(await PageObjects.discover.getDocHeader()).to.contain('relatedContent');
-        });
 
-        const field = await PageObjects.discover.getDocTableIndex(1);
-        expect(field).to.contain('relatedContent.url');
+          const field = await PageObjects.discover.getDocTableIndex(1);
+          expect(field).to.contain('relatedContent.url');
+        });
 
         const marks = await PageObjects.discover.getMarks();
         expect(marks.length).to.be.above(0);
diff --git a/test/functional/apps/discover/_filter_editor.ts b/test/functional/apps/discover/_filter_editor.ts
index 0fb8837598904..b2fbfbb71c7ee 100644
--- a/test/functional/apps/discover/_filter_editor.ts
+++ b/test/functional/apps/discover/_filter_editor.ts
@@ -16,6 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const filterBar = getService('filterBar');
+  const security = getService('security');
   const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
   const defaultSettings = {
     defaultIndex: 'logstash-*',
@@ -23,6 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover filter editor', function describeIndexTests() {
     before(async function () {
+      await security.testUser.setRoles(['kibana_admin', 'version_test', 'test_logstash_reader']);
       log.debug('load kibana index with default index pattern');
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
@@ -111,5 +113,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
       });
     });
+
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
   });
 }
diff --git a/test/functional/apps/discover/_large_string.ts b/test/functional/apps/discover/_large_string.ts
index de3f0f2c40ae1..11938f262ceeb 100644
--- a/test/functional/apps/discover/_large_string.ts
+++ b/test/functional/apps/discover/_large_string.ts
@@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       await PageObjects.common.navigateToApp('discover');
       await retry.try(async function tryingForTime() {
-        const rowData = await PageObjects.discover.getDocTableIndex(1);
+        const rowData = await PageObjects.discover.getDocTableIndex(1, true);
         expect(rowData).to.contain(expectedText);
       });
     });
diff --git a/test/functional/apps/discover/_search_on_page_load.ts b/test/functional/apps/discover/_search_on_page_load.ts
index 3df6ce1c13c43..91943b28c6db0 100644
--- a/test/functional/apps/discover/_search_on_page_load.ts
+++ b/test/functional/apps/discover/_search_on_page_load.ts
@@ -18,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
   const testSubjects = getService('testSubjects');
+  const refreshButtonSelector = 'refreshDataButton';
 
   const defaultSettings = {
     defaultIndex: 'logstash-*',
@@ -58,63 +59,57 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/118432
-    describe.skip(`when it's false`, () => {
+    describe(`when it's false`, () => {
       beforeEach(async () => await initSearchOnPageLoad(false));
 
       it('should not fetch data from ES initially', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
       });
 
       it('should not fetch on indexPattern change', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
         await PageObjects.discover.selectIndexPattern('date-nested');
 
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
       });
 
       it('should fetch data from ES after refreshDataButton click', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
-        /**
-         * We should wait for debounce timeout expired 100 ms,
-         * otherwise click event will be skipped. See getFetch$ implementation.
-         */
-        await PageObjects.common.sleep(100);
-        await testSubjects.click('refreshDataButton');
+        await testSubjects.click(refreshButtonSelector);
+        await testSubjects.missingOrFail(refreshButtonSelector);
 
         await retry.waitFor('number of fetches to be 1', waitForFetches(1));
-        expect(await testSubjects.exists('refreshDataButton')).to.be(false);
       });
 
       it('should fetch data from ES after submit query', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
         await queryBar.submitQuery();
+        await testSubjects.missingOrFail(refreshButtonSelector);
 
         await retry.waitFor('number of fetches to be 1', waitForFetches(1));
-        expect(await testSubjects.exists('refreshDataButton')).to.be(false);
       });
 
       it('should fetch data from ES after choosing commonly used time range', async function () {
         await PageObjects.discover.selectIndexPattern('logstash-*');
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
         await PageObjects.timePicker.setCommonlyUsedTime('This_week');
+        await testSubjects.missingOrFail(refreshButtonSelector);
 
         await retry.waitFor('number of fetches to be 1', waitForFetches(1));
-        expect(await testSubjects.exists('refreshDataButton')).to.be(false);
       });
     });
 
-    it(`when it's false should fetch data from ES initially`, async function () {
+    it(`when it's true should fetch data from ES initially`, async function () {
       await initSearchOnPageLoad(true);
       await retry.waitFor('number of fetches to be 1', waitForFetches(1));
     });
diff --git a/test/functional/apps/getting_started/index.ts b/test/functional/apps/getting_started/index.ts
index ae7fdc3c1d4fa..c88999e23be3d 100644
--- a/test/functional/apps/getting_started/index.ts
+++ b/test/functional/apps/getting_started/index.ts
@@ -13,7 +13,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
 
   describe('Getting Started ', function () {
-    this.tags(['ciGroup6']);
+    this.tags(['ciGroup5']);
 
     before(async function () {
       await browser.setWindowSize(1200, 800);
diff --git a/test/functional/apps/home/index.js b/test/functional/apps/home/index.js
index 257ee724f6c8b..992c5b1f2f474 100644
--- a/test/functional/apps/home/index.js
+++ b/test/functional/apps/home/index.js
@@ -10,7 +10,7 @@ export default function ({ getService, loadTestFile }) {
   const browser = getService('browser');
 
   describe('homepage app', function () {
-    this.tags('ciGroup6');
+    this.tags('ciGroup5');
 
     before(function () {
       return browser.setWindowSize(1200, 800);
diff --git a/test/functional/apps/management/_field_formatter.ts b/test/functional/apps/management/_field_formatter.ts
index 383e1e5e300a9..18672ceea1517 100644
--- a/test/functional/apps/management/_field_formatter.ts
+++ b/test/functional/apps/management/_field_formatter.ts
@@ -7,8 +7,8 @@
  */
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import expect from '@kbn/expect';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { FIELD_FORMAT_IDS } from '../../../../src/plugins/field_formats/common';
 import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/management/_index_pattern_filter.ts b/test/functional/apps/management/_index_pattern_filter.ts
index 732065282d546..edfd32952da49 100644
--- a/test/functional/apps/management/_index_pattern_filter.ts
+++ b/test/functional/apps/management/_index_pattern_filter.ts
@@ -16,7 +16,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   // FLAKY: https://github.com/elastic/kibana/issues/128558
-  describe.skip('index pattern filter', function describeIndexTests() {
+  // Failing: See https://github.com/elastic/kibana/issues/130190
+  describe.skip('data view filter', function describeIndexTests() {
     before(async function () {
       await esArchiver.emptyKibanaIndex();
       await kibanaServer.uiSettings.replace({});
diff --git a/test/functional/apps/management/_scripted_fields_filter.ts b/test/functional/apps/management/_scripted_fields_filter.ts
index 4f6d1a41d0523..1093c7f82fd4a 100644
--- a/test/functional/apps/management/_scripted_fields_filter.ts
+++ b/test/functional/apps/management/_scripted_fields_filter.ts
@@ -17,8 +17,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['settings']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/126027
-  describe.skip('filter scripted fields', function describeIndexTests() {
+  describe('filter scripted fields', function describeIndexTests() {
     before(async function () {
       // delete .kibana index and then wait for Kibana to re-create it
       await browser.setWindowSize(1200, 800);
@@ -80,7 +79,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(lang).to.be('expression');
         }
       });
-      await PageObjects.settings.clearScriptedFieldLanguageFilter('expression');
     });
   });
 }
diff --git a/test/functional/apps/visualize/_add_to_dashboard.ts b/test/functional/apps/visualize/_add_to_dashboard.ts
index 4343f8b1469d6..9e8984675eccd 100644
--- a/test/functional/apps/visualize/_add_to_dashboard.ts
+++ b/test/functional/apps/visualize/_add_to_dashboard.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dashboardExpect = getService('dashboardExpect');
diff --git a/test/functional/apps/visualize/_data_table.ts b/test/functional/apps/visualize/_data_table.ts
index 77973b8fb9b67..e165e40e83dc1 100644
--- a/test/functional/apps/visualize/_data_table.ts
+++ b/test/functional/apps/visualize/_data_table.ts
@@ -93,6 +93,31 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
     });
 
+    it('should show correct data when partial rows is on', async () => {
+      const expectedChartData = [
+        ['0B', '2,088'],
+        ['1.953KB', '2,748'],
+        ['3.906KB', '2,707'],
+        ['5.859KB', '2,876'],
+        ['7.813KB', '2,863'],
+        ['9.766KB', '147'],
+        ['11.719KB', '148'],
+        ['13.672KB', '129'],
+        ['15.625KB', '161'],
+        ['17.578KB', '137'],
+      ];
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.checkSwitch('showPartialRows');
+      await PageObjects.visEditor.clickGo();
+
+      return retry.try(async function () {
+        await inspector.open();
+        await inspector.expectTableData(expectedChartData);
+        await inspector.close();
+        await PageObjects.visEditor.uncheckSwitch('showPartialRows');
+      });
+    });
+
     it('should show percentage columns', async () => {
       async function expectValidTableData() {
         const data = await PageObjects.visChart.getTableVisContent();
diff --git a/test/functional/apps/visualize/_lab_mode.ts b/test/functional/apps/visualize/_lab_mode.ts
index d3a02a8d17291..2af593f2acc4a 100644
--- a/test/functional/apps/visualize/_lab_mode.ts
+++ b/test/functional/apps/visualize/_lab_mode.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../src/plugins/visualizations/common/constants';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '@kbn/visualizations-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts
index c27d2281d6119..3f6661aaecf00 100644
--- a/test/functional/apps/visualize/_tsvb_time_series.ts
+++ b/test/functional/apps/visualize/_tsvb_time_series.ts
@@ -27,8 +27,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const browser = getService('browser');
   const kibanaServer = getService('kibanaServer');
 
-  // Failing: See https://github.com/elastic/kibana/issues/129785
-  describe.skip('visual builder', function describeIndexTests() {
+  describe('visual builder', function describeIndexTests() {
     before(async () => {
       await security.testUser.setRoles([
         'kibana_admin',
@@ -172,62 +171,62 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
 
         describe('Clicking on the chart', () => {
-          it(`should create a filter`, async () => {
-            await visualBuilder.setMetricsGroupByTerms('machine.os.raw', {
-              include: 'win 7',
-              exclude: 'ios',
-            });
-            await visualBuilder.clickSeriesOption();
+          const act = async (visName: string, clickCoordinates: { x: number; y: number }) => {
             await testSubjects.click('visualizeSaveButton');
 
-            await timeToVisualize.saveFromModal('My TSVB viz 1', {
+            await timeToVisualize.saveFromModal(visName, {
               addToDashboard: 'new',
               saveToLibrary: false,
             });
 
             await dashboard.waitForRenderComplete();
-            const el = await elasticChart.getCanvas();
 
             await retry.try(async () => {
-              // click on specific coordinates
-              await browser
-                .getActions()
-                .move({ x: 105, y: 115, origin: el._webElement })
-                .click()
-                .perform();
-              await common.sleep(2000);
-              await testSubjects.click('applyFiltersPopoverButton');
-              await testSubjects.missingOrFail('applyFiltersPopoverButton');
+              const el = await elasticChart.getCanvas();
+
+              await el.clickMouseButton({
+                xOffset: clickCoordinates.x,
+                yOffset: clickCoordinates.y,
+              });
+              await common.sleep(1000);
+              await testSubjects.existOrFail('applyFiltersPopoverButton');
             });
 
+            await testSubjects.click('applyFiltersPopoverButton');
+          };
+
+          const cleanup = async () => {
+            const discardDashboardPromptButton = 'discardDashboardPromptButton';
+            await common.navigateToApp('dashboard');
+            if (await testSubjects.exists(discardDashboardPromptButton)) {
+              await dashboard.clickUnsavedChangesDiscard(discardDashboardPromptButton, true);
+            }
+          };
+
+          afterEach(async () => {
+            await cleanup();
+          });
+
+          it(`should create a filter`, async () => {
+            await visualBuilder.setMetricsGroupByTerms('machine.os.raw', {
+              include: 'win 7',
+              exclude: 'ios',
+            });
+            await act('viz_1', { x: 105, y: 115 });
             const hasMachineRawFilter = await filterBar.hasFilter('machine.os.raw', 'win 7');
             expect(hasMachineRawFilter).to.be(true);
           });
 
           it('should create a filter for series with multiple split by terms fields one of which has formatting', async () => {
-            const expectedFilterPills = ['0, win xp, logstash-2015.09.20'];
+            const expectedFilterPills = ['0, win 7'];
             await visualBuilder.setMetricsGroupByTerms('bytes');
             await visualBuilder.setAnotherGroupByTermsField('machine.os.raw');
-            await visualBuilder.setAnotherGroupByTermsField('_index');
-
             await visualBuilder.clickSeriesOption();
             await visualBuilder.setChartType('Bar');
-            await visualBuilder.setStackedType('Stacked');
             await visualBuilder.clickPanelOptions('timeSeries');
             await visualBuilder.setIntervalValue('1w');
 
-            const el = await elasticChart.getCanvas();
-            await el.scrollIntoViewIfNecessary();
-            await browser
-              .getActions()
-              .move({ x: 100, y: 65, origin: el._webElement })
-              .click()
-              .perform();
-
-            await retry.try(async () => {
-              await testSubjects.click('applyFiltersPopoverButton');
-              await testSubjects.missingOrFail('applyFiltersPopoverButton');
-            });
+            await act('vis_2', { x: -100, y: 10 });
 
             const filterPills = await filterBar.getFiltersLabel();
             expect(filterPills).to.eql(expectedFilterPills);
diff --git a/test/functional/config.ccs.ts b/test/functional/config.ccs.ts
index ecb42758785e5..8137635b474da 100644
--- a/test/functional/config.ccs.ts
+++ b/test/functional/config.ccs.ts
@@ -12,7 +12,7 @@ import { RemoteEsProvider } from './services/remote_es/remote_es';
 
 // eslint-disable-next-line import/no-default-export
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+  const functionalConfig = await readConfigFile(require.resolve('./config'));
 
   return {
     ...functionalConfig.getAll(),
diff --git a/test/functional/fixtures/es_archiver/many_fields/data.json.gz b/test/functional/fixtures/es_archiver/many_fields/data.json.gz
new file mode 100644
index 0000000000000..78c564e96da2a
Binary files /dev/null and b/test/functional/fixtures/es_archiver/many_fields/data.json.gz differ
diff --git a/test/functional/fixtures/es_archiver/many_fields/mappings.json b/test/functional/fixtures/es_archiver/many_fields/mappings.json
new file mode 100644
index 0000000000000..491085676c16e
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/many_fields/mappings.json
@@ -0,0 +1,38111 @@
+{
+  "type": "index",
+  "value" : {
+    "index": "indices-stats",
+    "mappings" : {
+      "properties" : {
+        "_all" : {
+          "properties" : {
+            "primaries" : {
+              "properties" : {
+                "bulk" : {
+                  "properties" : {
+                    "avg_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "avg_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "avg_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_operations" : {
+                      "type" : "long"
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "completion" : {
+                  "properties" : {
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "docs" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "deleted" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "fielddata" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "flush" : {
+                  "properties" : {
+                    "periodic" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "get" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "exists_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "exists_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "exists_total" : {
+                      "type" : "long"
+                    },
+                    "getTime" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "missing_total" : {
+                      "type" : "long"
+                    },
+                    "time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "indexing" : {
+                  "properties" : {
+                    "delete_current" : {
+                      "type" : "long"
+                    },
+                    "delete_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "delete_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "delete_total" : {
+                      "type" : "long"
+                    },
+                    "index_current" : {
+                      "type" : "long"
+                    },
+                    "index_failed" : {
+                      "type" : "long"
+                    },
+                    "index_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "index_total" : {
+                      "type" : "long"
+                    },
+                    "is_throttled" : {
+                      "type" : "boolean"
+                    },
+                    "noop_update_total" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "merges" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "current_docs" : {
+                      "type" : "long"
+                    },
+                    "current_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "current_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_auto_throttle" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_auto_throttle_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_docs" : {
+                      "type" : "long"
+                    },
+                    "total_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_stopped_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_stopped_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_throttled_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_throttled_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "query_cache" : {
+                  "properties" : {
+                    "cache_count" : {
+                      "type" : "long"
+                    },
+                    "cache_size" : {
+                      "type" : "long"
+                    },
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    },
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "recovery" : {
+                  "properties" : {
+                    "current_as_source" : {
+                      "type" : "long"
+                    },
+                    "current_as_target" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "refresh" : {
+                  "properties" : {
+                    "external_total" : {
+                      "type" : "long"
+                    },
+                    "external_total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "external_total_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "listeners" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "request_cache" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "search" : {
+                  "properties" : {
+                    "fetch_current" : {
+                      "type" : "long"
+                    },
+                    "fetch_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fetch_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "fetch_total" : {
+                      "type" : "long"
+                    },
+                    "open_contexts" : {
+                      "type" : "long"
+                    },
+                    "query_current" : {
+                      "type" : "long"
+                    },
+                    "query_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "query_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "query_total" : {
+                      "type" : "long"
+                    },
+                    "scroll_current" : {
+                      "type" : "long"
+                    },
+                    "scroll_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "scroll_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "scroll_total" : {
+                      "type" : "long"
+                    },
+                    "suggest_current" : {
+                      "type" : "long"
+                    },
+                    "suggest_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "suggest_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "suggest_total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "segments" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "doc_values_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "doc_values_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "file_sizes" : {
+                      "type" : "object"
+                    },
+                    "fixed_bit_set" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fixed_bit_set_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "index_writer_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_writer_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "max_unsafe_auto_id_timestamp" : {
+                      "type" : "long"
+                    },
+                    "memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "norms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "norms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "points_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "points_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "stored_fields_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "stored_fields_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "term_vectors_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "term_vectors_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "terms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "terms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "version_map_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "version_map_memory_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "shard_stats" : {
+                  "properties" : {
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "store" : {
+                  "properties" : {
+                    "reserved" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "reserved_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_data_set_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_data_set_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "translog" : {
+                  "properties" : {
+                    "earliest_last_modified_age" : {
+                      "type" : "long"
+                    },
+                    "operations" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_operations" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "uncommitted_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "warmer" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                }
+              }
+            },
+            "total" : {
+              "properties" : {
+                "bulk" : {
+                  "properties" : {
+                    "avg_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "avg_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "avg_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_operations" : {
+                      "type" : "long"
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "completion" : {
+                  "properties" : {
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "docs" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "deleted" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "fielddata" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "flush" : {
+                  "properties" : {
+                    "periodic" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "get" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "exists_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "exists_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "exists_total" : {
+                      "type" : "long"
+                    },
+                    "getTime" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "missing_total" : {
+                      "type" : "long"
+                    },
+                    "time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "indexing" : {
+                  "properties" : {
+                    "delete_current" : {
+                      "type" : "long"
+                    },
+                    "delete_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "delete_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "delete_total" : {
+                      "type" : "long"
+                    },
+                    "index_current" : {
+                      "type" : "long"
+                    },
+                    "index_failed" : {
+                      "type" : "long"
+                    },
+                    "index_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "index_total" : {
+                      "type" : "long"
+                    },
+                    "is_throttled" : {
+                      "type" : "boolean"
+                    },
+                    "noop_update_total" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "merges" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "current_docs" : {
+                      "type" : "long"
+                    },
+                    "current_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "current_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_auto_throttle" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_auto_throttle_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_docs" : {
+                      "type" : "long"
+                    },
+                    "total_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_stopped_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_stopped_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_throttled_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_throttled_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "query_cache" : {
+                  "properties" : {
+                    "cache_count" : {
+                      "type" : "long"
+                    },
+                    "cache_size" : {
+                      "type" : "long"
+                    },
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    },
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "recovery" : {
+                  "properties" : {
+                    "current_as_source" : {
+                      "type" : "long"
+                    },
+                    "current_as_target" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "refresh" : {
+                  "properties" : {
+                    "external_total" : {
+                      "type" : "long"
+                    },
+                    "external_total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "external_total_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "listeners" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "request_cache" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "search" : {
+                  "properties" : {
+                    "fetch_current" : {
+                      "type" : "long"
+                    },
+                    "fetch_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fetch_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "fetch_total" : {
+                      "type" : "long"
+                    },
+                    "open_contexts" : {
+                      "type" : "long"
+                    },
+                    "query_current" : {
+                      "type" : "long"
+                    },
+                    "query_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "query_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "query_total" : {
+                      "type" : "long"
+                    },
+                    "scroll_current" : {
+                      "type" : "long"
+                    },
+                    "scroll_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "scroll_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "scroll_total" : {
+                      "type" : "long"
+                    },
+                    "suggest_current" : {
+                      "type" : "long"
+                    },
+                    "suggest_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "suggest_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "suggest_total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "segments" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "doc_values_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "doc_values_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "file_sizes" : {
+                      "type" : "object"
+                    },
+                    "fixed_bit_set" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fixed_bit_set_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "index_writer_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_writer_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "max_unsafe_auto_id_timestamp" : {
+                      "type" : "long"
+                    },
+                    "memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "norms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "norms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "points_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "points_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "stored_fields_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "stored_fields_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "term_vectors_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "term_vectors_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "terms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "terms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "version_map_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "version_map_memory_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "shard_stats" : {
+                  "properties" : {
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "store" : {
+                  "properties" : {
+                    "reserved" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "reserved_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_data_set_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_data_set_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "translog" : {
+                  "properties" : {
+                    "earliest_last_modified_age" : {
+                      "type" : "long"
+                    },
+                    "operations" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_operations" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "uncommitted_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "warmer" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "_shards" : {
+          "properties" : {
+            "failed" : {
+              "type" : "long"
+            },
+            "successful" : {
+              "type" : "long"
+            },
+            "total" : {
+              "type" : "long"
+            }
+          }
+        },
+        "indices" : {
+          "properties" : {
+            "apm-agent-configuration" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "apm-custom-link" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "ds-" : {
+              "properties" : {
+                "logs-deprecation" : {
+                  "properties" : {
+                    "elasticsearch-default-2022" : {
+                      "properties" : {
+                        "03" : {
+                          "properties" : {
+                            "07-000001" : {
+                              "properties" : {
+                                "primaries" : {
+                                  "properties" : {
+                                    "bulk" : {
+                                      "properties" : {
+                                        "avg_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "avg_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "avg_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "completion" : {
+                                      "properties" : {
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "docs" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "deleted" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "fielddata" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "flush" : {
+                                      "properties" : {
+                                        "periodic" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "get" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "exists_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_total" : {
+                                          "type" : "long"
+                                        },
+                                        "getTime" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "missing_total" : {
+                                          "type" : "long"
+                                        },
+                                        "time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "indexing" : {
+                                      "properties" : {
+                                        "delete_current" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "delete_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_total" : {
+                                          "type" : "long"
+                                        },
+                                        "index_current" : {
+                                          "type" : "long"
+                                        },
+                                        "index_failed" : {
+                                          "type" : "long"
+                                        },
+                                        "index_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "index_total" : {
+                                          "type" : "long"
+                                        },
+                                        "is_throttled" : {
+                                          "type" : "boolean"
+                                        },
+                                        "noop_update_total" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "merges" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "current_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "current_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "current_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_auto_throttle" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_auto_throttle_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_stopped_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_stopped_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_throttled_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_throttled_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "query_cache" : {
+                                      "properties" : {
+                                        "cache_count" : {
+                                          "type" : "long"
+                                        },
+                                        "cache_size" : {
+                                          "type" : "long"
+                                        },
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        },
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "recovery" : {
+                                      "properties" : {
+                                        "current_as_source" : {
+                                          "type" : "long"
+                                        },
+                                        "current_as_target" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "refresh" : {
+                                      "properties" : {
+                                        "external_total" : {
+                                          "type" : "long"
+                                        },
+                                        "external_total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "external_total_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "listeners" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "request_cache" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "search" : {
+                                      "properties" : {
+                                        "fetch_current" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fetch_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_total" : {
+                                          "type" : "long"
+                                        },
+                                        "open_contexts" : {
+                                          "type" : "long"
+                                        },
+                                        "query_current" : {
+                                          "type" : "long"
+                                        },
+                                        "query_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "query_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "query_total" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_current" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "scroll_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_total" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_current" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "suggest_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "segments" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "doc_values_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "doc_values_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "file_sizes" : {
+                                          "type" : "object"
+                                        },
+                                        "fixed_bit_set" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fixed_bit_set_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "index_writer_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_writer_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "long"
+                                        },
+                                        "memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "norms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "norms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "points_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "points_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "stored_fields_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "stored_fields_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "term_vectors_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "term_vectors_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "terms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "terms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "version_map_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "version_map_memory_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "shard_stats" : {
+                                      "properties" : {
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "store" : {
+                                      "properties" : {
+                                        "reserved" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "reserved_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_data_set_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_data_set_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "translog" : {
+                                      "properties" : {
+                                        "earliest_last_modified_age" : {
+                                          "type" : "long"
+                                        },
+                                        "operations" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "uncommitted_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "warmer" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shards" : {
+                                  "properties" : {
+                                    "0" : {
+                                      "properties" : {
+                                        "bulk" : {
+                                          "properties" : {
+                                            "avg_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "avg_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "avg_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total_operations" : {
+                                              "type" : "long"
+                                            },
+                                            "total_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "commit" : {
+                                          "properties" : {
+                                            "generation" : {
+                                              "type" : "long"
+                                            },
+                                            "id" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "num_docs" : {
+                                              "type" : "long"
+                                            },
+                                            "user_data" : {
+                                              "properties" : {
+                                                "es_version" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "history_uuid" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "local_checkpoint" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "max_seq_no" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "max_unsafe_auto_id_timestamp" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "min_retained_seq_no" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "translog_uuid" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "completion" : {
+                                          "properties" : {
+                                            "size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "docs" : {
+                                          "properties" : {
+                                            "count" : {
+                                              "type" : "long"
+                                            },
+                                            "deleted" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "fielddata" : {
+                                          "properties" : {
+                                            "evictions" : {
+                                              "type" : "long"
+                                            },
+                                            "memory_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "flush" : {
+                                          "properties" : {
+                                            "periodic" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "get" : {
+                                          "properties" : {
+                                            "current" : {
+                                              "type" : "long"
+                                            },
+                                            "exists_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "exists_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "exists_total" : {
+                                              "type" : "long"
+                                            },
+                                            "getTime" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "missing_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "missing_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "missing_total" : {
+                                              "type" : "long"
+                                            },
+                                            "time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "indexing" : {
+                                          "properties" : {
+                                            "delete_current" : {
+                                              "type" : "long"
+                                            },
+                                            "delete_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "delete_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "delete_total" : {
+                                              "type" : "long"
+                                            },
+                                            "index_current" : {
+                                              "type" : "long"
+                                            },
+                                            "index_failed" : {
+                                              "type" : "long"
+                                            },
+                                            "index_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "index_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "index_total" : {
+                                              "type" : "long"
+                                            },
+                                            "is_throttled" : {
+                                              "type" : "boolean"
+                                            },
+                                            "noop_update_total" : {
+                                              "type" : "long"
+                                            },
+                                            "throttle_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "throttle_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "merges" : {
+                                          "properties" : {
+                                            "current" : {
+                                              "type" : "long"
+                                            },
+                                            "current_docs" : {
+                                              "type" : "long"
+                                            },
+                                            "current_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "current_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_auto_throttle" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_auto_throttle_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_docs" : {
+                                              "type" : "long"
+                                            },
+                                            "total_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_stopped_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_stopped_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total_throttled_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_throttled_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "query_cache" : {
+                                          "properties" : {
+                                            "cache_count" : {
+                                              "type" : "long"
+                                            },
+                                            "cache_size" : {
+                                              "type" : "long"
+                                            },
+                                            "evictions" : {
+                                              "type" : "long"
+                                            },
+                                            "hit_count" : {
+                                              "type" : "long"
+                                            },
+                                            "memory_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "miss_count" : {
+                                              "type" : "long"
+                                            },
+                                            "total_count" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "recovery" : {
+                                          "properties" : {
+                                            "current_as_source" : {
+                                              "type" : "long"
+                                            },
+                                            "current_as_target" : {
+                                              "type" : "long"
+                                            },
+                                            "throttle_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "throttle_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "refresh" : {
+                                          "properties" : {
+                                            "external_total" : {
+                                              "type" : "long"
+                                            },
+                                            "external_total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "external_total_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "listeners" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "request_cache" : {
+                                          "properties" : {
+                                            "evictions" : {
+                                              "type" : "long"
+                                            },
+                                            "hit_count" : {
+                                              "type" : "long"
+                                            },
+                                            "memory_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "miss_count" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "retention_leases" : {
+                                          "properties" : {
+                                            "leases" : {
+                                              "properties" : {
+                                                "id" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "retaining_seq_no" : {
+                                                  "type" : "long"
+                                                },
+                                                "source" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "timestamp" : {
+                                                  "type" : "long"
+                                                }
+                                              }
+                                            },
+                                            "primary_term" : {
+                                              "type" : "long"
+                                            },
+                                            "version" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "routing" : {
+                                          "properties" : {
+                                            "node" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "primary" : {
+                                              "type" : "boolean"
+                                            },
+                                            "state" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "search" : {
+                                          "properties" : {
+                                            "fetch_current" : {
+                                              "type" : "long"
+                                            },
+                                            "fetch_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "fetch_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "fetch_total" : {
+                                              "type" : "long"
+                                            },
+                                            "open_contexts" : {
+                                              "type" : "long"
+                                            },
+                                            "query_current" : {
+                                              "type" : "long"
+                                            },
+                                            "query_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "query_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "query_total" : {
+                                              "type" : "long"
+                                            },
+                                            "scroll_current" : {
+                                              "type" : "long"
+                                            },
+                                            "scroll_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "scroll_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "scroll_total" : {
+                                              "type" : "long"
+                                            },
+                                            "suggest_current" : {
+                                              "type" : "long"
+                                            },
+                                            "suggest_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "suggest_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "suggest_total" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "segments" : {
+                                          "properties" : {
+                                            "count" : {
+                                              "type" : "long"
+                                            },
+                                            "doc_values_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "doc_values_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "file_sizes" : {
+                                              "type" : "object"
+                                            },
+                                            "fixed_bit_set" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "fixed_bit_set_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "index_writer_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "index_writer_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "max_unsafe_auto_id_timestamp" : {
+                                              "type" : "long"
+                                            },
+                                            "memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "norms_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "norms_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "points_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "points_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "stored_fields_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "stored_fields_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "term_vectors_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "term_vectors_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "terms_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "terms_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "version_map_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "version_map_memory_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "seq_no" : {
+                                          "properties" : {
+                                            "global_checkpoint" : {
+                                              "type" : "long"
+                                            },
+                                            "local_checkpoint" : {
+                                              "type" : "long"
+                                            },
+                                            "max_seq_no" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "shard_path" : {
+                                          "properties" : {
+                                            "data_path" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "is_custom_data_path" : {
+                                              "type" : "boolean"
+                                            },
+                                            "state_path" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "shard_stats" : {
+                                          "properties" : {
+                                            "total_count" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "store" : {
+                                          "properties" : {
+                                            "reserved" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "reserved_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_data_set_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_data_set_size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "translog" : {
+                                          "properties" : {
+                                            "earliest_last_modified_age" : {
+                                              "type" : "long"
+                                            },
+                                            "operations" : {
+                                              "type" : "long"
+                                            },
+                                            "size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "uncommitted_operations" : {
+                                              "type" : "long"
+                                            },
+                                            "uncommitted_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "uncommitted_size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "warmer" : {
+                                          "properties" : {
+                                            "current" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "total" : {
+                                  "properties" : {
+                                    "bulk" : {
+                                      "properties" : {
+                                        "avg_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "avg_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "avg_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "completion" : {
+                                      "properties" : {
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "docs" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "deleted" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "fielddata" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "flush" : {
+                                      "properties" : {
+                                        "periodic" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "get" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "exists_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_total" : {
+                                          "type" : "long"
+                                        },
+                                        "getTime" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "missing_total" : {
+                                          "type" : "long"
+                                        },
+                                        "time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "indexing" : {
+                                      "properties" : {
+                                        "delete_current" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "delete_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_total" : {
+                                          "type" : "long"
+                                        },
+                                        "index_current" : {
+                                          "type" : "long"
+                                        },
+                                        "index_failed" : {
+                                          "type" : "long"
+                                        },
+                                        "index_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "index_total" : {
+                                          "type" : "long"
+                                        },
+                                        "is_throttled" : {
+                                          "type" : "boolean"
+                                        },
+                                        "noop_update_total" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "merges" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "current_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "current_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "current_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_auto_throttle" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_auto_throttle_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_stopped_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_stopped_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_throttled_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_throttled_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "query_cache" : {
+                                      "properties" : {
+                                        "cache_count" : {
+                                          "type" : "long"
+                                        },
+                                        "cache_size" : {
+                                          "type" : "long"
+                                        },
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        },
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "recovery" : {
+                                      "properties" : {
+                                        "current_as_source" : {
+                                          "type" : "long"
+                                        },
+                                        "current_as_target" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "refresh" : {
+                                      "properties" : {
+                                        "external_total" : {
+                                          "type" : "long"
+                                        },
+                                        "external_total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "external_total_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "listeners" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "request_cache" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "search" : {
+                                      "properties" : {
+                                        "fetch_current" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fetch_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_total" : {
+                                          "type" : "long"
+                                        },
+                                        "open_contexts" : {
+                                          "type" : "long"
+                                        },
+                                        "query_current" : {
+                                          "type" : "long"
+                                        },
+                                        "query_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "query_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "query_total" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_current" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "scroll_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_total" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_current" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "suggest_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "segments" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "doc_values_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "doc_values_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "file_sizes" : {
+                                          "type" : "object"
+                                        },
+                                        "fixed_bit_set" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fixed_bit_set_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "index_writer_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_writer_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "long"
+                                        },
+                                        "memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "norms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "norms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "points_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "points_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "stored_fields_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "stored_fields_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "term_vectors_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "term_vectors_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "terms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "terms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "version_map_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "version_map_memory_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "shard_stats" : {
+                                      "properties" : {
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "store" : {
+                                      "properties" : {
+                                        "reserved" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "reserved_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_data_set_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_data_set_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "translog" : {
+                                      "properties" : {
+                                        "earliest_last_modified_age" : {
+                                          "type" : "long"
+                                        },
+                                        "operations" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "uncommitted_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "warmer" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "ds-ilm-history-5-2022" : {
+              "properties" : {
+                "03" : {
+                  "properties" : {
+                    "07-000001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "min_retained_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-agents-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-enrollment-api-keys-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-policies-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-policies-leader-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-servers-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "geoip_databases" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "kibana-event-log-8" : {
+              "properties" : {
+                "0" : {
+                  "properties" : {
+                    "1-000001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "min_retained_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "kibana_8" : {
+              "properties" : {
+                "0" : {
+                  "properties" : {
+                    "1_001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "kibana_security_session_1" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "kibana_task_manager_8" : {
+              "properties" : {
+                "0" : {
+                  "properties" : {
+                    "1_001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "security-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "mapping" : {
+          "total_fields" : {
+            "limit" : "50000"
+          }
+        },
+        "number_of_shards" : "1",
+        "number_of_replicas" : "0"
+      }
+    }
+  }
+}
diff --git a/test/functional/fixtures/kbn_archiver/many_fields_data_view.json b/test/functional/fixtures/kbn_archiver/many_fields_data_view.json
new file mode 100644
index 0000000000000..c5f1366b734de
--- /dev/null
+++ b/test/functional/fixtures/kbn_archiver/many_fields_data_view.json
@@ -0,0 +1,18 @@
+{
+  "attributes": {
+    "fieldAttrs": "{}",
+    "fields": "[]",
+    "runtimeFieldMap": "{}",
+    "title": "indices-stats*",
+    "typeMeta": "{}"
+  },
+  "coreMigrationVersion": "8.3.0",
+  "id": "35796250-bb09-11ec-a8e4-a9868e049a39",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2022-04-13T09:07:56.793Z",
+  "version": "WzQwLDFd"
+}
\ No newline at end of file
diff --git a/test/functional/page_objects/console_page.ts b/test/functional/page_objects/console_page.ts
index 32c859cc1aed9..7aaf842f28d14 100644
--- a/test/functional/page_objects/console_page.ts
+++ b/test/functional/page_objects/console_page.ts
@@ -83,10 +83,11 @@ export class ConsolePageObject extends FtrService {
     }
   }
 
-  public async promptAutocomplete() {
+  // Prompt autocomplete window and provide a initial letter of properties to narrow down the results. E.g. 'b' = 'bool'
+  public async promptAutocomplete(letter = 'b') {
     const textArea = await this.testSubjects.find('console-textarea');
     await textArea.clickMouseButton();
-    await textArea.type('b');
+    await textArea.type(letter);
     await this.retry.waitFor('autocomplete to be visible', () => this.isAutocompleteVisible());
   }
 
@@ -101,7 +102,6 @@ export class ConsolePageObject extends FtrService {
   public async enterRequest(request: string = '\nGET _search') {
     const textArea = await this.getEditorTextArea();
     await textArea.pressKeys(request);
-    await textArea.pressKeys(Key.ENTER);
   }
 
   public async enterText(text: string) {
diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts
index 4a77b5673e9fe..cd936baa1a41a 100644
--- a/test/functional/page_objects/dashboard_page.ts
+++ b/test/functional/page_objects/dashboard_page.ts
@@ -143,10 +143,10 @@ export class DashboardPageObject extends FtrService {
     await this.testSubjects.click(`edit-unsaved-${title.split(' ').join('-')}`);
   }
 
-  public async clickUnsavedChangesDiscard(title: string, confirmDiscard = true) {
-    this.log.debug(`Click Unsaved Changes Discard for `, title);
-    await this.testSubjects.existOrFail(`discard-unsaved-${title.split(' ').join('-')}`);
-    await this.testSubjects.click(`discard-unsaved-${title.split(' ').join('-')}`);
+  public async clickUnsavedChangesDiscard(testSubject: string, confirmDiscard = true) {
+    this.log.debug(`Click Unsaved Changes Discard for `, testSubject);
+    await this.testSubjects.existOrFail(testSubject);
+    await this.testSubjects.click(testSubject);
     if (confirmDiscard) {
       await this.common.clickConfirmOnModal();
     } else {
diff --git a/test/functional/page_objects/dashboard_page_controls.ts b/test/functional/page_objects/dashboard_page_controls.ts
index 0f52bf1255693..179e27d09cf55 100644
--- a/test/functional/page_objects/dashboard_page_controls.ts
+++ b/test/functional/page_objects/dashboard_page_controls.ts
@@ -7,13 +7,13 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
 import {
   OPTIONS_LIST_CONTROL,
   ControlWidth,
   RANGE_SLIDER_CONTROL,
-} from '../../../src/plugins/controls/common';
-import { ControlGroupChainingSystem } from '../../../src/plugins/controls/common/control_group/types';
+} from '@kbn/controls-plugin/common';
+import { ControlGroupChainingSystem } from '@kbn/controls-plugin/common/control_group/types';
+import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 import { FtrService } from '../ftr_provider_context';
 
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 842f13f2666e1..ce25370493823 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -7,7 +7,6 @@
  */
 
 import expect from '@kbn/expect';
-import _saved_queries from '../apps/discover/_saved_queries';
 import { FtrService } from '../ftr_provider_context';
 
 export class DiscoverPageObject extends FtrService {
@@ -244,7 +243,7 @@ export class DiscoverPageObject extends FtrService {
     return (await this.kibanaServer.uiSettings.get('doc_table:legacy')) === true;
   }
 
-  public async getDocTableIndex(index: number) {
+  public async getDocTableIndex(index: number, visibleText = false) {
     const isLegacyDefault = await this.useLegacyTable();
     if (isLegacyDefault) {
       const row = await this.find.byCssSelector(`tr.kbnDocTable__row:nth-child(${index})`);
@@ -252,7 +251,16 @@ export class DiscoverPageObject extends FtrService {
     }
 
     const row = await this.dataGrid.getRow({ rowIndex: index - 1 });
-    const result = await Promise.all(row.map(async (cell) => await cell.getVisibleText()));
+    const result = await Promise.all(
+      row.map(async (cell) => {
+        if (visibleText) {
+          return await cell.getVisibleText();
+        } else {
+          const textContent = await cell.getAttribute('textContent');
+          return textContent.trim();
+        }
+      })
+    );
     // Remove control columns
     return result.slice(2).join(' ');
   }
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index dfaaecff0a0c7..29fbe04f59e97 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -273,8 +273,12 @@ export class SettingsPageObject extends FtrService {
 
   async clearFieldTypeFilter(type: string) {
     await this.testSubjects.clickWhenNotDisabled('indexedFieldTypeFilterDropdown');
-    await this.testSubjects.existOrFail('indexedFieldTypeFilterDropdown-popover');
-    await this.testSubjects.existOrFail(`indexedFieldTypeFilterDropdown-option-${type}-checked`);
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail('indexedFieldTypeFilterDropdown-popover');
+    });
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail(`indexedFieldTypeFilterDropdown-option-${type}-checked`);
+    });
     await this.testSubjects.click(`indexedFieldTypeFilterDropdown-option-${type}-checked`);
     await this.testSubjects.existOrFail(`indexedFieldTypeFilterDropdown-option-${type}`);
     await this.browser.pressKeys(this.browser.keys.ESCAPE);
@@ -291,10 +295,14 @@ export class SettingsPageObject extends FtrService {
 
   async clearScriptedFieldLanguageFilter(type: string) {
     await this.testSubjects.clickWhenNotDisabled('scriptedFieldLanguageFilterDropdown');
-    await this.testSubjects.existOrFail('scriptedFieldLanguageFilterDropdown-popover');
-    await this.testSubjects.existOrFail(
-      `scriptedFieldLanguageFilterDropdown-option-${type}-checked`
-    );
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail('scriptedFieldLanguageFilterDropdown-popover');
+    });
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail(
+        `scriptedFieldLanguageFilterDropdown-option-${type}-checked`
+      );
+    });
     await this.testSubjects.click(`scriptedFieldLanguageFilterDropdown-option-${type}-checked`);
     await this.testSubjects.existOrFail(`scriptedFieldLanguageFilterDropdown-option-${type}`);
     await this.browser.pressKeys(this.browser.keys.ESCAPE);
diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
index 37933a91a9d70..5c3c0d81890dd 100644
--- a/test/functional/page_objects/time_picker.ts
+++ b/test/functional/page_objects/time_picker.ts
@@ -48,7 +48,9 @@ export class TimePickerPageObject extends FtrService {
   }
 
   async ensureHiddenNoDataPopover() {
-    const isVisible = await this.testSubjects.exists('noDataPopoverDismissButton');
+    const isVisible = await this.testSubjects.exists('noDataPopoverDismissButton', {
+      timeout: 100,
+    });
     if (isVisible) {
       await this.testSubjects.click('noDataPopoverDismissButton');
     }
@@ -103,15 +105,19 @@ export class TimePickerPageObject extends FtrService {
   private async showStartEndTimes() {
     // This first await makes sure the superDatePicker has loaded before we check for the ShowDatesButton
     await this.testSubjects.exists('superDatePickerToggleQuickMenuButton', { timeout: 20000 });
-    const isShowDatesButton = await this.testSubjects.exists('superDatePickerShowDatesButton');
-    if (isShowDatesButton) {
-      await this.testSubjects.click('superDatePickerShowDatesButton');
-    }
-    await this.testSubjects.exists('superDatePickerstartDatePopoverButton');
-    // Close the start date popover which opens automatically if `superDatePickerShowDatesButton` is clicked
-    if (isShowDatesButton) {
-      await this.testSubjects.click('superDatePickerstartDatePopoverButton');
-    }
+    await this.retry.tryForTime(5000, async () => {
+      const isShowDatesButton = await this.testSubjects.exists('superDatePickerShowDatesButton', {
+        timeout: 50,
+      });
+      if (isShowDatesButton) {
+        await this.testSubjects.click('superDatePickerShowDatesButton', 50);
+      }
+      await this.testSubjects.exists('superDatePickerstartDatePopoverButton', { timeout: 1000 });
+      // Close the start date popover which opens automatically if `superDatePickerShowDatesButton` is clicked
+      if (isShowDatesButton) {
+        await this.testSubjects.click('superDatePickerstartDatePopoverButton');
+      }
+    });
   }
 
   /**
@@ -156,11 +162,12 @@ export class TimePickerPageObject extends FtrService {
 
     await this.retry.waitFor('Timepicker popover to close', async () => {
       await this.browser.pressKeys(this.browser.keys.ESCAPE);
-      return !(await this.testSubjects.exists('superDatePickerAbsoluteDateInput'));
+      return !(await this.testSubjects.exists('superDatePickerAbsoluteDateInput', { timeout: 50 }));
     });
 
     const superDatePickerApplyButtonExists = await this.testSubjects.exists(
-      'superDatePickerApplyTimeButton'
+      'superDatePickerApplyTimeButton',
+      { timeout: 100 }
     );
     if (superDatePickerApplyButtonExists) {
       // Timepicker is in top nav
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index af4bf6fc40299..20aec8ba5d984 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { FtrService } from '../ftr_provider_context';
-import { VisualizeConstants } from '../../../src/plugins/visualizations/common/constants';
-import { FORMATS_UI_SETTINGS } from '../../../src/plugins/field_formats/common';
 
 // TODO: Remove & Refactor to use the TTV page objects
 interface VisualizeSaveModalArgs {
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index bbce097fa9fff..926bd5ab6b734 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -174,7 +174,8 @@ export class DataGridService extends FtrService {
 
     const textArr = [];
     for (const cell of result) {
-      textArr.push(await cell.getVisibleText());
+      const textContent = await cell.getAttribute('textContent');
+      textArr.push(textContent.trim());
     }
     return Promise.resolve(textArr);
   }
diff --git a/test/functional/services/lib/compare_pngs.ts b/test/functional/services/lib/compare_pngs.ts
index 5fb0c4d6ad1dc..7a48bd9e4c6fd 100644
--- a/test/functional/services/lib/compare_pngs.ts
+++ b/test/functional/services/lib/compare_pngs.ts
@@ -8,7 +8,7 @@
 
 import { parse, join } from 'path';
 import Jimp from 'jimp';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { promises as fs } from 'fs';
 import path from 'path';
 
diff --git a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
index ae03721a6e7b8..1a35f7c39aa28 100644
--- a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
+++ b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
@@ -11,7 +11,7 @@ import { WebElement, WebDriver, By, Key } from 'selenium-webdriver';
 import { PNG } from 'pngjs';
 import cheerio from 'cheerio';
 import testSubjSelector from '@kbn/test-subj-selector';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { CustomCheerio, CustomCheerioStatic } from './custom_cheerio_api';
 // @ts-ignore not supported yet
 import { scrollIntoViewIfNecessary } from './scroll_into_view_if_necessary';
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index 2945418f5f4c7..21eae36a67b7c 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -12,7 +12,7 @@ import Fs from 'fs';
 import * as Rx from 'rxjs';
 import { mergeMap, map, takeUntil, catchError, ignoreElements } from 'rxjs/operators';
 import { Lifecycle } from '@kbn/test';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import chromeDriver from 'chromedriver';
 // @ts-ignore types not available
 import geckoDriver from 'geckodriver';
diff --git a/test/functional/services/supertest.ts b/test/functional/services/supertest.ts
index 0ffae35c90e41..32ecc3f51759d 100644
--- a/test/functional/services/supertest.ts
+++ b/test/functional/services/supertest.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import { format as formatUrl } from 'url';
 
 import supertest from 'supertest';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function KibanaSupertestProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
diff --git a/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts b/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
index 3373da1180d09..8af208ce69da9 100644
--- a/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
+++ b/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
@@ -9,7 +9,7 @@
 import fs from 'fs/promises';
 import path from 'path';
 
-import type { PluginInitializer, PrebootPlugin } from 'kibana/server';
+import type { PluginInitializer, PrebootPlugin } from '@kbn/core/server';
 
 export const plugin: PluginInitializer<void, never> = (initializerContext): PrebootPlugin => ({
   setup: (core) => {
diff --git a/test/interactive_setup_api_integration/tests/enrollment_flow.ts b/test/interactive_setup_api_integration/tests/enrollment_flow.ts
index 53454207b73ed..f35509f49480a 100644
--- a/test/interactive_setup_api_integration/tests/enrollment_flow.ts
+++ b/test/interactive_setup_api_integration/tests/enrollment_flow.ts
@@ -20,7 +20,7 @@ export default function (context: FtrProviderContext) {
   const config = context.getService('config');
 
   describe('Interactive setup APIs - Enrollment flow', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     let kibanaVerificationCode: string;
     let elasticsearchCaFingerprint: string;
diff --git a/test/interactive_setup_api_integration/tests/manual_configuration_flow.ts b/test/interactive_setup_api_integration/tests/manual_configuration_flow.ts
index 2db59dd446fc4..94a06363367ad 100644
--- a/test/interactive_setup_api_integration/tests/manual_configuration_flow.ts
+++ b/test/interactive_setup_api_integration/tests/manual_configuration_flow.ts
@@ -19,7 +19,7 @@ export default function (context: FtrProviderContext) {
   const config = context.getService('config');
 
   describe('Interactive setup APIs - Manual configuration flow', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     let kibanaVerificationCode: string;
     let elasticsearchCaCertificate: string;
diff --git a/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts b/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts
index 97a3e490e9650..a3964c5fd5aa6 100644
--- a/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts
+++ b/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts
@@ -18,7 +18,7 @@ export default function (context: FtrProviderContext) {
   const config = context.getService('config');
 
   describe('Interactive setup APIs - Manual configuration flow without TLS', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     let kibanaVerificationCode: string;
     before(async () => {
diff --git a/test/interactive_setup_functional/tests/enrollment_token.ts b/test/interactive_setup_functional/tests/enrollment_token.ts
index 56311c9458cef..20d9da6539692 100644
--- a/test/interactive_setup_functional/tests/enrollment_token.ts
+++ b/test/interactive_setup_functional/tests/enrollment_token.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
 
   describe('Interactive Setup Functional Tests (Enrollment token)', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     const elasticsearchConfig = config.get('servers.elasticsearch');
     let verificationCode: string;
diff --git a/test/interactive_setup_functional/tests/manual_configuration.ts b/test/interactive_setup_functional/tests/manual_configuration.ts
index 3c7c5d9c08d76..68c5068acd267 100644
--- a/test/interactive_setup_functional/tests/manual_configuration.ts
+++ b/test/interactive_setup_functional/tests/manual_configuration.ts
@@ -19,7 +19,7 @@ export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
 
   describe('Interactive Setup Functional Tests (Manual configuration)', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     let verificationCode: string;
     before(async function () {
diff --git a/test/interactive_setup_functional/tests/manual_configuration_without_security.ts b/test/interactive_setup_functional/tests/manual_configuration_without_security.ts
index 2111dc3cce7e7..20f7bac890da4 100644
--- a/test/interactive_setup_functional/tests/manual_configuration_without_security.ts
+++ b/test/interactive_setup_functional/tests/manual_configuration_without_security.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObject }: FtrProviderContext) {
   const log = getService('log');
 
   describe('Interactive Setup Functional Tests (Manual configuration without Security)', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     let verificationCode: string;
     before(async function () {
diff --git a/test/interactive_setup_functional/tests/manual_configuration_without_tls.ts b/test/interactive_setup_functional/tests/manual_configuration_without_tls.ts
index b8e391dc6f93f..04e31b4ae8454 100644
--- a/test/interactive_setup_functional/tests/manual_configuration_without_tls.ts
+++ b/test/interactive_setup_functional/tests/manual_configuration_without_tls.ts
@@ -19,7 +19,7 @@ export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
 
   describe('Interactive Setup Functional Tests (Manual configuration without TLS)', function () {
-    this.tags(['skipCloud', 'ciGroup2']);
+    this.tags(['skipCloud', 'ciGroup11']);
 
     let verificationCode: string;
     before(async function () {
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx
index 66db420c99997..9acbf092f97ae 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { Main } from './components/main';
 
 export const renderApp = ({ element }: AppMountParameters) => {
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
index 6d132c3acb730..426137101c705 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
@@ -10,10 +10,7 @@ import './main.scss';
 import React from 'react';
 import { EuiPage, EuiPageBody, EuiPageContent, EuiPageContentHeader } from '@elastic/eui';
 import { first, pluck } from 'rxjs/operators';
-import {
-  IInterpreterRenderHandlers,
-  ExpressionValue,
-} from '../../../../../../../src/plugins/expressions/public';
+import { IInterpreterRenderHandlers, ExpressionValue } from '@kbn/expressions-plugin/public';
 import { ExpressionRenderHandler } from '../../types';
 import { getExpressions } from '../../services';
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts
index 897fbf832d561..ec3b4549e2958 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'src/core/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import { Plugin, StartDeps } from './plugin';
 export type { StartDeps };
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts
index c4f37f121b84b..fbf14f3e3b38f 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/public';
 import { ExpressionsStart } from './types';
 import { setExpressions } from './services';
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts
index 5846fe5723c53..35b7c93c54301 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../../src/plugins/kibana_utils/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { ExpressionsStart } from './types';
 
 export const [getExpressions, setExpressions] = createGetterSetter<ExpressionsStart>('Expressions');
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts
index 02872843cf8bc..56d04da36f62a 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsStart, ExpressionRenderHandler } from 'src/plugins/expressions/public';
-import { Adapters } from 'src/plugins/inspector/public';
+import { ExpressionsStart, ExpressionRenderHandler } from '@kbn/expressions-plugin/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 
 export type { ExpressionsStart, Adapters };
 export { ExpressionRenderHandler };
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts
index 4a6ce20d80f62..0230677a9d7e1 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from '../../../../../src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { TestPlugin, TestPluginSetup, TestPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<TestPluginSetup, TestPluginStart> = () => new TestPlugin();
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
index a4903fedd22d5..2a87a70c804bb 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
@@ -8,9 +8,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { pluck } from 'rxjs/operators';
-import { CoreSetup, Plugin, HttpResponsePayload } from '../../../../../src/core/server';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
-import { ExpressionsServerStart } from '../../../../../src/plugins/expressions/server';
+import { CoreSetup, Plugin, HttpResponsePayload } from '@kbn/core/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { ExpressionsServerStart } from '@kbn/expressions-plugin/server';
 
 export interface TestStartDeps {
   data: DataPluginStart;
diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts
index b52bd7904a256..843fee17d866c 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { DatatableRow } from 'src/plugins/expressions';
+import { DatatableRow } from '@kbn/expressions-plugin';
 import { ExpectExpression, expectExpressionProvider } from './helpers';
 import { FtrProviderContext } from '../../../functional/ftr_provider_context';
 
diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
index 8fbb71a25edc5..6ab2d776fdcf9 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { ExpectExpression, expectExpressionProvider } from './helpers';
 import { FtrProviderContext } from '../../../functional/ftr_provider_context';
 
diff --git a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
index 24906032245bf..94e32e7f0a10e 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ExpressionValue } from 'src/plugins/expressions';
+import { ExpressionValue } from '@kbn/expressions-plugin';
 import { FtrProviderContext } from '../../../functional/ftr_provider_context';
 
 declare global {
diff --git a/test/new_visualize_flow/dashboard_embedding.ts b/test/new_visualize_flow/dashboard_embedding.ts
index 3470973f9c96c..57e997043906b 100644
--- a/test/new_visualize_flow/dashboard_embedding.ts
+++ b/test/new_visualize_flow/dashboard_embedding.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../functional/ftr_provider_context';
 
 /**
  * This tests both that one of each visualization can be added to a dashboard (as opposed to opening an existing
diff --git a/test/new_visualize_flow/index.ts b/test/new_visualize_flow/index.ts
index 02245002e8336..7cb55069d7d9b 100644
--- a/test/new_visualize_flow/index.ts
+++ b/test/new_visualize_flow/index.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../functional/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile, getService }: FtrProviderContext) {
   describe('New Visualize Flow', function () {
-    this.tags('ciGroup2');
+    this.tags('ciGroup11');
     const esArchiver = getService('esArchiver');
     before(async () => {
       await esArchiver.loadIfNeeded(
diff --git a/test/package/Vagrantfile b/test/package/Vagrantfile
index 6a094e013c341..2a7e465531333 100644
--- a/test/package/Vagrantfile
+++ b/test/package/Vagrantfile
@@ -1,6 +1,6 @@
 Vagrant.configure("2") do |config|
   config.vm.synced_folder '../../target/', '/packages'
-
+  config.vm.boot_timeout = 600
   config.vm.define "deb" do |deb|
     deb.vm.provider :virtualbox do |vb|
       vb.memory = 2048
diff --git a/test/plugin_functional/plugins/app_link_test/public/app.tsx b/test/plugin_functional/plugins/app_link_test/public/app.tsx
index ca0c12dfff894..24b851f64aa5f 100644
--- a/test/plugin_functional/plugins/app_link_test/public/app.tsx
+++ b/test/plugin_functional/plugins/app_link_test/public/app.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, IBasePath, ApplicationStart } from 'kibana/public';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
+import { AppMountParameters, IBasePath, ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
 const FooApp = ({
   appId,
diff --git a/test/plugin_functional/plugins/app_link_test/public/index.ts b/test/plugin_functional/plugins/app_link_test/public/index.ts
index deec3d61a0d64..61f988c985e6f 100644
--- a/test/plugin_functional/plugins/app_link_test/public/index.ts
+++ b/test/plugin_functional/plugins/app_link_test/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppLinkPlugin, CoreAppLinkPluginSetup, CoreAppLinkPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/app_link_test/public/plugin.ts b/test/plugin_functional/plugins/app_link_test/public/plugin.ts
index 8d75cb09469bc..a4c80bdcfc578 100644
--- a/test/plugin_functional/plugins/app_link_test/public/plugin.ts
+++ b/test/plugin_functional/plugins/app_link_test/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { renderApp } from './app';
 
 export class CoreAppLinkPlugin implements Plugin<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> {
diff --git a/test/plugin_functional/plugins/core_app_status/public/application.tsx b/test/plugin_functional/plugins/core_app_status/public/application.tsx
index 6194947ac3515..8a3a8eefd4cbc 100644
--- a/test/plugin_functional/plugins/core_app_status/public/application.tsx
+++ b/test/plugin_functional/plugins/core_app_status/public/application.tsx
@@ -20,7 +20,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const AppStatusApp = ({ appId }: { appId: string }) => (
   <EuiPage>
diff --git a/test/plugin_functional/plugins/core_app_status/public/index.ts b/test/plugin_functional/plugins/core_app_status/public/index.ts
index 32289f4ebd0bc..17d3e9edab313 100644
--- a/test/plugin_functional/plugins/core_app_status/public/index.ts
+++ b/test/plugin_functional/plugins/core_app_status/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppStatusPlugin, CoreAppStatusPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<{}, CoreAppStatusPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
index e166af63a3ca4..e5be727bea174 100644
--- a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
@@ -14,7 +14,7 @@ import {
   AppUpdatableFields,
   CoreStart,
   AppMountParameters,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { renderApp } from './application';
 import './types';
 
diff --git a/test/plugin_functional/plugins/core_history_block/public/app.tsx b/test/plugin_functional/plugins/core_history_block/public/app.tsx
index 28866426f281b..29ccf03ad890a 100644
--- a/test/plugin_functional/plugins/core_history_block/public/app.tsx
+++ b/test/plugin_functional/plugins/core_history_block/public/app.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Switch, Route, Prompt } from 'react-router-dom';
-import type { AppMountParameters, IBasePath, ApplicationStart } from 'kibana/public';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
+import type { AppMountParameters, IBasePath, ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
 const HomePage = ({
   basePath,
diff --git a/test/plugin_functional/plugins/core_history_block/public/index.ts b/test/plugin_functional/plugins/core_history_block/public/index.ts
index deec3d61a0d64..61f988c985e6f 100644
--- a/test/plugin_functional/plugins/core_history_block/public/index.ts
+++ b/test/plugin_functional/plugins/core_history_block/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppLinkPlugin, CoreAppLinkPluginSetup, CoreAppLinkPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_history_block/public/plugin.ts b/test/plugin_functional/plugins/core_history_block/public/plugin.ts
index 3483d8dfee513..d88044cf8058f 100644
--- a/test/plugin_functional/plugins/core_history_block/public/plugin.ts
+++ b/test/plugin_functional/plugins/core_history_block/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { renderApp } from './app';
 
 export class CoreAppLinkPlugin implements Plugin<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> {
diff --git a/test/plugin_functional/plugins/core_http/public/index.ts b/test/plugin_functional/plugins/core_http/public/index.ts
index 7b353cb1d2905..f79197b69b917 100644
--- a/test/plugin_functional/plugins/core_http/public/index.ts
+++ b/test/plugin_functional/plugins/core_http/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreHttpPlugin, CoreHttpPluginSetup, CoreHttpPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreHttpPluginSetup, CoreHttpPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_http/public/plugin.tsx b/test/plugin_functional/plugins/core_http/public/plugin.tsx
index 64b59847ffd1b..ec57278ae3cf9 100644
--- a/test/plugin_functional/plugins/core_http/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_http/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CoreHttpPlugin implements Plugin<CoreHttpPluginSetup, CoreHttpPluginStart> {
   public setup({ http }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_http/server/plugin.ts b/test/plugin_functional/plugins/core_http/server/plugin.ts
index 533e3b22b368b..f767f96c44408 100644
--- a/test/plugin_functional/plugins/core_http/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_http/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'kibana/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class CoreHttpPlugin implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
index 6682c00b2482e..29195feb67a44 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -25,7 +25,7 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 
-import { CoreStart, AppMountParameters } from 'kibana/public';
+import { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="fooAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/index.ts b/test/plugin_functional/plugins/core_plugin_a/public/index.ts
index 58ed51e923b1e..70dc8ec7b54e7 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_a/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CorePluginAPlugin, CorePluginAPluginSetup, CorePluginAPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CorePluginAPluginSetup, CorePluginAPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
index b7b1b8dd2eed3..0f3478efc3c75 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CorePluginAPlugin implements Plugin<CorePluginAPluginSetup, CorePluginAPluginStart> {
   public setup(core: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts
index c65690e8532fd..a0f1ce279d652 100644
--- a/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup, RequestHandlerContext } from 'kibana/server';
+import type { Plugin, CoreSetup, CustomRequestHandlerContext } from '@kbn/core/server';
 
 export interface PluginAApiRequestContext {
   ping: () => Promise<string>;
 }
 
-interface PluginARequstHandlerContext extends RequestHandlerContext {
+type PluginARequstHandlerContext = CustomRequestHandlerContext<{
   pluginA: PluginAApiRequestContext;
-}
+}>;
 
 export class CorePluginAPlugin implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
@@ -23,7 +23,8 @@ export class CorePluginAPlugin implements Plugin {
       (context) => {
         return {
           ping: async () => {
-            const body = await context.core.elasticsearch.client.asInternalUser.ping();
+            const esClient = (await context.core).elasticsearch.client;
+            const body = await esClient.asInternalUser.ping();
             return String(body);
           },
         };
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx b/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx
index 7205fff3fa714..bf8f2740668a4 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx
@@ -20,7 +20,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const App = ({ appName }: { appName: string }) => (
   <EuiPage>
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts b/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts
index 82ee6dbf5688a..3e0bc13adc440 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppLeavePlugin, CoreAppLeavePluginSetup, CoreAppLeavePluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreAppLeavePluginSetup, CoreAppLeavePluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx
index 0739c858307c8..aab64fc657696 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CoreAppLeavePlugin
   implements Plugin<CoreAppLeavePluginSetup, CoreAppLeavePluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
index 28615a19b6831..5f937e6e8dcbe 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
@@ -25,7 +25,7 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 
-import { CoreStart, AppMountParameters } from 'kibana/public';
+import { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="barAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/index.ts b/test/plugin_functional/plugins/core_plugin_b/public/index.ts
index eb59363c23930..28d230275bc36 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import {
   CorePluginBDeps,
   CorePluginBPlugin,
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 2fbf57b2a7104..536515606ea38 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
-import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { CorePluginAPluginSetup } from '@kbn/core-plugin-a-plugin/public/plugin';
 
 declare global {
   interface Window {
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 ae7abdaebba10..9a34e82b38131 100644
--- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
@@ -6,20 +6,21 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, RequestHandlerContext } from 'kibana/server';
+import { Plugin, CoreSetup, CustomRequestHandlerContext } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { PluginAApiRequestContext } from '../../core_plugin_a/server';
+import { PluginAApiRequestContext } from '@kbn/core-plugin-a-plugin/server';
 
-interface PluginBContext extends RequestHandlerContext {
+type PluginBContext = CustomRequestHandlerContext<{
   pluginA: PluginAApiRequestContext;
-}
+}>;
 
 export class CorePluginBPlugin implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
     const router = core.http.createRouter<PluginBContext>();
     router.get({ path: '/core_plugin_b', validate: false }, async (context, req, res) => {
-      if (!context.pluginA) throw new Error('pluginA is disabled');
-      const response = await context.pluginA.ping();
+      const pluginAContext = await context.pluginA;
+      if (!pluginAContext) throw new Error('pluginA is disabled');
+      const response = await pluginAContext.ping();
       return res.ok({ body: `Pong via plugin A: ${response}` });
     });
 
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx b/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx
index a3b84c86f39fa..b8e03bfef4c95 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx
@@ -21,7 +21,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="chromelessAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts b/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts
index b54d3cbea9681..12b3a5f54541c 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   CorePluginChromelessPlugin,
   CorePluginChromelessPluginSetup,
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx
index 47b33479e45ff..1e089790bc6a3 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CorePluginChromelessPlugin
   implements Plugin<CorePluginChromelessPluginSetup, CorePluginChromelessPluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx b/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
index 90814bd552d37..595124184d699 100644
--- a/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
@@ -25,7 +25,7 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 
-import { CoreStart, AppMountParameters } from 'kibana/public';
+import { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="dlAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts b/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
index d908134d27d62..a59d179042ee6 100644
--- a/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   CorePluginDeepLinksPlugin,
   CorePluginDeepLinksPluginSetup,
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx
index d53810d32c324..f7e3102f0b230 100644
--- a/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
-import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../../src/core/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '@kbn/core/public';
 
 export class CorePluginDeepLinksPlugin
   implements Plugin<CorePluginDeepLinksPluginSetup, CorePluginDeepLinksPluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx b/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx
index e2166a249e34b..bfb149c3f184f 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const DeprecationsApp = () => <div>Deprcations App</div>;
 
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts b/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts
index bb6b3f0740b3b..ea8dd52735843 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import {
   CorePluginDeprecationsPlugin,
   CorePluginDeprecationsPluginSetup,
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx
index 1ae9b15be97d1..443ccd8c2e1da 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
index aca0fca301a13..22a69c55b80bc 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
@@ -8,7 +8,7 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { get } from 'lodash';
-import type { PluginConfigDescriptor } from 'kibana/server';
+import type { PluginConfigDescriptor } from '@kbn/core/server';
 import type { ConfigDeprecation } from '@kbn/config';
 
 const configSchema = schema.object({
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
index 8e78a2c279d67..9edfe5034a3d0 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
@@ -6,7 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup, GetDeprecationsContext, DeprecationsDetails } from 'kibana/server';
+import type {
+  Plugin,
+  CoreSetup,
+  GetDeprecationsContext,
+  DeprecationsDetails,
+} from '@kbn/core/server';
 import { registerRoutes } from './routes';
 async function getDeprecations({
   savedObjectsClient,
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts
index d6bf065898f93..aba6cd5b38e4c 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { HttpServiceSetup } from 'kibana/server';
+import type { HttpServiceSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
 export function registerRoutes(http: HttpServiceSetup) {
@@ -33,7 +33,7 @@ export function registerRoutes(http: HttpServiceSetup) {
       }
 
       if (keyId) {
-        const client = context.core.savedObjects.getClient();
+        const client = (await context.core).savedObjects.getClient();
         await client.delete('test-deprecations-plugin', keyId, {
           refresh: true,
         });
diff --git a/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts
index 530b90eb5e6d0..d7dad3f7b3d29 100644
--- a/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'kibana/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class CorePluginExecutionContext implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
@@ -20,10 +20,8 @@ export class CorePluginExecutionContext implements Plugin {
         },
       },
       async (context, request, response) => {
-        const { headers } = await context.core.elasticsearch.client.asCurrentUser.ping(
-          {},
-          { meta: true }
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const { headers } = await esClient.asCurrentUser.ping({}, { meta: true });
         return response.ok({ body: headers || {} });
       }
     );
diff --git a/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx b/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx
index 7205fff3fa714..bf8f2740668a4 100644
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx
@@ -20,7 +20,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const App = ({ appName }: { appName: string }) => (
   <EuiPage>
diff --git a/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts b/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts
index d5bcab69d7957..de210b22b017e 100644
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreHelpMenuPlugin, CoreHelpMenuPluginSetup, CoreHelpMenuPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreHelpMenuPluginSetup, CoreHelpMenuPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx
index 15357639f155b..5f10db820153f 100644
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CoreHelpMenuPlugin
   implements Plugin<CoreHelpMenuPluginSetup, CoreHelpMenuPluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
index f0d58fa4b0d00..fce258c1b8b00 100644
--- a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
 export class CorePluginRouteTimeoutsPlugin implements Plugin {
diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx
index 751d59cfe06b9..79346a5c222b1 100644
--- a/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CorePluginStaticAssets implements Plugin {
   public setup(core: CoreSetup, deps: {}) {}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
index a9a8ff754fbbd..5afd4d0cdc866 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
+++ b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 import '../types';
 
 export const plugin = () => new CoreProviderPlugin();
diff --git a/test/plugin_functional/plugins/core_provider_plugin/types.ts b/test/plugin_functional/plugins/core_provider_plugin/types.ts
index 85dc0f425519e..4b01019000ef8 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/types.ts
+++ b/test/plugin_functional/plugins/core_provider_plugin/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/plugins/data_search/server/index.ts b/test/plugin_functional/plugins/data_search/server/index.ts
index 4aab40a19e3e0..f7fb397aaedaa 100644
--- a/test/plugin_functional/plugins/data_search/server/index.ts
+++ b/test/plugin_functional/plugins/data_search/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { DataSearchTestPlugin, TestPluginSetup, TestPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<TestPluginSetup, TestPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/data_search/server/plugin.ts b/test/plugin_functional/plugins/data_search/server/plugin.ts
index f48d57ae45460..5258211c544bb 100644
--- a/test/plugin_functional/plugins/data_search/server/plugin.ts
+++ b/test/plugin_functional/plugins/data_search/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 
 export interface DataSearchTestStartDeps {
   data: DataPluginStart;
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
index ab046ab6a0131..ba161e05aaac8 100644
--- a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
@@ -6,16 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart, ICustomClusterClient } from 'src/core/server';
+import { Plugin, CoreSetup, CoreStart, ICustomClusterClient } from '@kbn/core/server';
 
 export class ElasticsearchClientPlugin implements Plugin {
   private client?: ICustomClusterClient;
+
   public setup(core: CoreSetup) {
     const router = core.http.createRouter();
     router.get(
       { path: '/api/elasticsearch_client_plugin/context/ping', validate: false },
       async (context, req, res) => {
-        const body = await context.core.elasticsearch.client.asInternalUser.ping();
+        const esClient = (await context.core).elasticsearch.client;
+        const body = await esClient.asInternalUser.ping();
         return res.ok({ body: JSON.stringify(body) });
       }
     );
@@ -39,5 +41,6 @@ export class ElasticsearchClientPlugin implements Plugin {
   public start(core: CoreStart) {
     this.client = core.elasticsearch.createClient('my-custom-client-test');
   }
+
   public stop() {}
 }
diff --git a/test/plugin_functional/plugins/index_patterns/server/index.ts b/test/plugin_functional/plugins/index_patterns/server/index.ts
index f776ad9a76224..e40b2e7534bfb 100644
--- a/test/plugin_functional/plugins/index_patterns/server/index.ts
+++ b/test/plugin_functional/plugins/index_patterns/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import {
   IndexPatternsTestPlugin,
   IndexPatternsTestPluginSetup,
diff --git a/test/plugin_functional/plugins/index_patterns/server/plugin.ts b/test/plugin_functional/plugins/index_patterns/server/plugin.ts
index f168779c2e638..5e6836de2a986 100644
--- a/test/plugin_functional/plugins/index_patterns/server/plugin.ts
+++ b/test/plugin_functional/plugins/index_patterns/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 
 export interface IndexPatternsTestStartDeps {
   data: DataPluginStart;
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts
index da745baafe30b..a7453f8c8ba65 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   SampelPanelActionTestPlugin,
   SampelPanelActionTestPluginSetup,
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts
index b1ff7ba4ee7ff..e36cdac61e3fb 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/public';
-import { UiActionsSetup } from '../../../../../src/plugins/ui_actions/public';
-import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { createSamplePanelAction } from './sample_panel_action';
 import { createSamplePanelLink } from './sample_panel_link';
 
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx
index e55de5fbcacb9..e35e10b4808b0 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
 import React from 'react';
 
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export const SAMPLE_PANEL_ACTION = 'samplePanelAction';
 
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts
index 2c4d95b5067a5..a95f17df8251e 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Action, createAction } from '../../../../../src/plugins/ui_actions/public';
+import { Action, createAction } from '@kbn/ui-actions-plugin/public';
 
 export const SAMPLE_PANEL_LINK = 'samplePanelLink';
 
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx b/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx
index dbfd6cdcd0018..045a36840a394 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { AppPluginDependencies } from './types';
 
 export const renderApp = (
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/index.ts b/test/plugin_functional/plugins/kbn_top_nav/public/index.ts
index 13fef691bb24c..95390c82d7466 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/index.ts
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { TopNavTestPlugin, TopNavTestPluginSetup, TopNavTestPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<TopNavTestPluginSetup, TopNavTestPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx b/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx
index 9813206d3b702..55dac9b58379c 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin, AppMountParameters } from 'kibana/public';
-import { NavigationPublicPluginSetup } from '../../../../../src/plugins/navigation/public';
+import { CoreSetup, Plugin, AppMountParameters } from '@kbn/core/public';
+import { NavigationPublicPluginSetup } from '@kbn/navigation-plugin/public';
 import { AppPluginDependencies } from './types';
 
 export class TopNavTestPlugin implements Plugin<TopNavTestPluginSetup, TopNavTestPluginStart> {
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/types.ts b/test/plugin_functional/plugins/kbn_top_nav/public/types.ts
index 0618575397a06..f209e5e3f472b 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/types.ts
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 export interface AppPluginDependencies {
   navigation: NavigationPublicPluginStart;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts
index 1f6a864d2c852..7c435bb951c9b 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   CustomVisualizationsPublicPlugin,
   CustomVisualizationsSetup,
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts
index b1f1cec78bd64..a81cb2d827267 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from 'src/plugins/visualizations/public';
-import { Plugin as ExpressionsPlugin } from '../../../../../src/plugins/expressions/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { Plugin as ExpressionsPlugin } from '@kbn/expressions-plugin/public';
 
 import { SelfChangingEditor } from './self_changing_vis/self_changing_editor';
 import { selfChangingVisFn, SelfChangingVisParams } from './self_changing_vis_fn';
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx
index 3b622ea642957..2ffe694e37b5e 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 interface CounterParams {
   counter: number;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts
index 6176173e24717..7066ce1d3cdfd 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunctionDefinition, Render } from 'src/plugins/expressions/public';
-import { KibanaContext } from 'src/plugins/data/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
+import { KibanaContext } from '@kbn/data-plugin/public';
 
 export interface SelfChangingVisParams {
   counter: number;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx
index 6a62fa629921f..4dcae9672861c 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import { SelfChangingComponent } from './self_changing_vis/self_changing_components';
 import { SelfChangingVisRenderValue } from './self_changing_vis_fn';
 
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts
index 4e74e3170c3e8..1dd1c73eef39a 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts
@@ -6,11 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisToExpressionAst } from 'src/plugins/visualizations/public';
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../src/plugins/expressions/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   SelfChangingVisExpressionFunctionDefinition,
   SelfChangingVisParams,
diff --git a/test/plugin_functional/plugins/management_test_plugin/public/index.ts b/test/plugin_functional/plugins/management_test_plugin/public/index.ts
index 813845e2255c1..878748bf0d963 100644
--- a/test/plugin_functional/plugins/management_test_plugin/public/index.ts
+++ b/test/plugin_functional/plugins/management_test_plugin/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   ManagementTestPlugin,
   ManagementTestPluginSetup,
diff --git a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
index a2cbe6aa5e48f..99129b2375f3d 100644
--- a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
+++ b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
@@ -9,8 +9,8 @@
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Switch, Route, Link } from 'react-router-dom';
-import { CoreSetup, Plugin } from 'kibana/public';
-import { ManagementSetup } from '../../../../../src/plugins/management/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
 
 export class ManagementTestPlugin
   implements Plugin<ManagementTestPluginSetup, ManagementTestPluginStart>
diff --git a/test/plugin_functional/plugins/rendering_plugin/public/index.ts b/test/plugin_functional/plugins/rendering_plugin/public/index.ts
index b836a53eaeaee..df88a9223cd41 100644
--- a/test/plugin_functional/plugins/rendering_plugin/public/index.ts
+++ b/test/plugin_functional/plugins/rendering_plugin/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { RenderingPlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new RenderingPlugin();
diff --git a/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx b/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx
index 985dac86bc85f..c18f096a6d82d 100644
--- a/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx
+++ b/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class RenderingPlugin implements Plugin {
   public setup(core: CoreSetup) {
diff --git a/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts b/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts
index d2e4d4386cbfd..fdf3f0853d84b 100644
--- a/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts
+++ b/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 import { schema } from '@kbn/config-schema';
 
diff --git a/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts b/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts
index 0fd5c467d081b..ce8119cfd0acc 100644
--- a/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts
+++ b/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class SavedObjectExportTransformsPlugin implements Plugin {
   public setup({ savedObjects, getStartServices }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts b/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts
index aef9a6139be4d..364f094ccf7cb 100644
--- a/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts
+++ b/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class SavedObjectImportWarningsPlugin implements Plugin {
   public setup({ savedObjects }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts b/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts
index da2a0a2def1c2..6f72129959ea7 100644
--- a/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts
+++ b/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class SavedObjectsHiddenTypePlugin implements Plugin {
   public setup({ savedObjects }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/session_notifications/public/index.ts b/test/plugin_functional/plugins/session_notifications/public/index.ts
index 1bfe0c39ffede..c8729cf62fd98 100644
--- a/test/plugin_functional/plugins/session_notifications/public/index.ts
+++ b/test/plugin_functional/plugins/session_notifications/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { SessionNotificationsPlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new SessionNotificationsPlugin();
diff --git a/test/plugin_functional/plugins/session_notifications/public/plugin.tsx b/test/plugin_functional/plugins/session_notifications/public/plugin.tsx
index 79b1f1a85b12a..c84cb0530c09c 100644
--- a/test/plugin_functional/plugins/session_notifications/public/plugin.tsx
+++ b/test/plugin_functional/plugins/session_notifications/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { AppPluginDependenciesStart, AppPluginDependenciesSetup } from './types';
 
 export class SessionNotificationsPlugin implements Plugin {
diff --git a/test/plugin_functional/plugins/session_notifications/public/types.ts b/test/plugin_functional/plugins/session_notifications/public/types.ts
index 5201fe69ef1dc..8345a112e0c08 100644
--- a/test/plugin_functional/plugins/session_notifications/public/types.ts
+++ b/test/plugin_functional/plugins/session_notifications/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginSetup } from '../../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { NavigationPublicPluginSetup } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export interface AppPluginDependenciesSetup {
   navigation: NavigationPublicPluginSetup;
diff --git a/test/plugin_functional/plugins/telemetry/public/plugin.ts b/test/plugin_functional/plugins/telemetry/public/plugin.ts
index 441675b1aa4ed..fd3be98b198ed 100644
--- a/test/plugin_functional/plugins/telemetry/public/plugin.ts
+++ b/test/plugin_functional/plugins/telemetry/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'src/core/public';
-import type { TelemetryPluginSetup } from '../../../../../src/plugins/telemetry/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
 
 interface TelemetryTestPluginSetupDependencies {
   telemetry: TelemetryPluginSetup;
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
index bf04d757a57ca..daa02f90426fa 100644
--- a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
+++ b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class UiSettingsPlugin implements Plugin {
   public setup(core: CoreSetup) {
@@ -23,13 +23,13 @@ export class UiSettingsPlugin implements Plugin {
 
     const router = core.http.createRouter();
     router.get({ path: '/api/ui-settings-plugin', validate: false }, async (context, req, res) => {
-      const uiSettingsValue = await context.core.uiSettings.client.get<number>(
-        'ui_settings_plugin'
-      );
+      const { uiSettings } = await context.core;
+      const uiSettingsValue = await uiSettings.client.get<number>('ui_settings_plugin');
       return res.ok({ body: { uiSettingsValue } });
     });
   }
 
   public start() {}
+
   public stop() {}
 }
diff --git a/test/plugin_functional/plugins/usage_collection/server/plugin.ts b/test/plugin_functional/plugins/usage_collection/server/plugin.ts
index 523fbcfe058dc..ff7b3f4221182 100644
--- a/test/plugin_functional/plugins/usage_collection/server/plugin.ts
+++ b/test/plugin_functional/plugins/usage_collection/server/plugin.ts
@@ -6,11 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'kibana/server';
-import {
-  UsageCollectionSetup,
-  UsageCounter,
-} from '../../../../../src/plugins/usage_collection/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { registerRoutes } from './routes';
 
 export interface TestPluginDepsSetup {
diff --git a/test/plugin_functional/plugins/usage_collection/server/routes.ts b/test/plugin_functional/plugins/usage_collection/server/routes.ts
index e67e454512779..45b0ad4433f61 100644
--- a/test/plugin_functional/plugins/usage_collection/server/routes.ts
+++ b/test/plugin_functional/plugins/usage_collection/server/routes.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { HttpServiceSetup } from 'kibana/server';
-import { UsageCounter } from '../../../../../src/plugins/usage_collection/server';
+import type { HttpServiceSetup } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function registerRoutes(http: HttpServiceSetup, usageCounter: UsageCounter) {
   const router = http.createRouter();
diff --git a/test/plugin_functional/test_suites/application_links/redirect_app_links.ts b/test/plugin_functional/test_suites/application_links/redirect_app_links.ts
index 41e50eedec323..940ca8983a398 100644
--- a/test/plugin_functional/test_suites/application_links/redirect_app_links.ts
+++ b/test/plugin_functional/test_suites/application_links/redirect_app_links.ts
@@ -9,7 +9,7 @@
 import url from 'url';
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_app_status/public/types';
+import '@kbn/core-app-status-plugin/public/types';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/test_suites/core/deprecations.ts b/test/plugin_functional/test_suites/core/deprecations.ts
index bb533c18f7340..4b63f62670cca 100644
--- a/test/plugin_functional/test_suites/core/deprecations.ts
+++ b/test/plugin_functional/test_suites/core/deprecations.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
-import type { DomainDeprecationDetails, DeprecationsGetResponse } from 'src/core/server/types';
-import type { ResolveDeprecationResponse } from 'src/core/public';
+import type { DomainDeprecationDetails, DeprecationsGetResponse } from '@kbn/core/server/types';
+import type { ResolveDeprecationResponse } from '@kbn/core/public';
 import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
diff --git a/test/plugin_functional/test_suites/core_plugins/application_status.ts b/test/plugin_functional/test_suites/core_plugins/application_status.ts
index 4c5e5f3103017..8dbb62290d389 100644
--- a/test/plugin_functional/test_suites/core_plugins/application_status.ts
+++ b/test/plugin_functional/test_suites/core_plugins/application_status.ts
@@ -12,9 +12,9 @@ import {
   AppNavLinkStatus,
   AppStatus,
   AppUpdatableFields,
-} from '../../../../src/core/public/application/types';
+} from '@kbn/core/public/application/types';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_app_status/public/types';
+import '@kbn/core-app-status-plugin/public/types';
 
 const getKibanaUrl = (pathname?: string, search?: string) =>
   Url.format({
diff --git a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts b/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
index de6ba6cb243f6..b823084aeb5ec 100644
--- a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
+++ b/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/plugin_functional/test_suites/core_plugins/execution_context.ts b/test/plugin_functional/test_suites/core_plugins/execution_context.ts
index 6d1da821d3daa..9ca1c202b3140 100644
--- a/test/plugin_functional/test_suites/core_plugins/execution_context.ts
+++ b/test/plugin_functional/test_suites/core_plugins/execution_context.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   describe('execution context', function () {
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index d7789b5e62a3b..5f124adc92960 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import expect from '@kbn/expect';
 
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 import { PluginFunctionalProviderContext } from '../../services';
 
 declare global {
@@ -85,11 +85,11 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         // Ensure that your change does not unintentionally expose any sensitive values!
         'console.ui.enabled (boolean)',
         'dashboard.allowByValueEmbeddables (boolean)',
-        'data.autocomplete.querySuggestions.enabled (boolean)',
-        'data.autocomplete.valueSuggestions.enabled (boolean)',
-        'data.autocomplete.valueSuggestions.terminateAfter (duration)',
-        'data.autocomplete.valueSuggestions.tiers (array)',
-        'data.autocomplete.valueSuggestions.timeout (duration)',
+        'unifiedSearch.autocomplete.querySuggestions.enabled (boolean)',
+        'unifiedSearch.autocomplete.valueSuggestions.enabled (boolean)',
+        'unifiedSearch.autocomplete.valueSuggestions.terminateAfter (duration)',
+        'unifiedSearch.autocomplete.valueSuggestions.tiers (array)',
+        'unifiedSearch.autocomplete.valueSuggestions.timeout (duration)',
         'data.search.aggs.shardDelay.enabled (boolean)',
         'enterpriseSearch.host (string)',
         'home.disableWelcomeScreen (boolean)',
diff --git a/test/plugin_functional/test_suites/core_plugins/status.ts b/test/plugin_functional/test_suites/core_plugins/status.ts
index 10ca8c6722046..dd1d98e2d3971 100644
--- a/test/plugin_functional/test_suites/core_plugins/status.ts
+++ b/test/plugin_functional/test_suites/core_plugins/status.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ServiceStatusLevels } from '../../../../src/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
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 1d6b33e41b772..cd35a2c0252c5 100644
--- a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const PageObjects = getPageObjects(['common']);
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 7b3f011a5aab3..ccbbf7f4d4259 100644
--- a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const PageObjects = getPageObjects(['common']);
diff --git a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
index 7947616ac6568..3fd87c20889a1 100644
--- a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
+++ b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts b/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts
index 90cb27e5babef..1b2fa3343d7aa 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
-import type { SavedObject } from '../../../../src/core/types';
-import type { SavedObjectsExportResultDetails } from '../../../../src/core/server';
+import type { SavedObject } from '@kbn/core/types';
+import type { SavedObjectsExportResultDetails } from '@kbn/core/server';
 import { PluginFunctionalProviderContext } from '../../services';
 
 function parseNdJson(input: string): Array<SavedObject<any>> {
diff --git a/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts b/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
index e6d8aa4189f28..9e154ddde153c 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
@@ -9,9 +9,9 @@
 import { join } from 'path';
 import expect from '@kbn/expect';
 import type { Response } from 'supertest';
+import { SavedObject } from '@kbn/core/types';
+import type { SavedObjectManagementTypeInfo } from '@kbn/saved-objects-management-plugin/common/types';
 import type { PluginFunctionalProviderContext } from '../../services';
-import { SavedObject } from '../../../../src/core/types';
-import type { SavedObjectManagementTypeInfo } from '../../../../src/plugins/saved_objects_management/common/types';
 
 function parseNdJson(input: string): Array<SavedObject<any>> {
   return input.split('\n').map((str) => JSON.parse(str));
diff --git a/test/plugin_functional/test_suites/telemetry/telemetry.ts b/test/plugin_functional/test_suites/telemetry/telemetry.ts
index 97db6593874ea..3b087c2705c10 100644
--- a/test/plugin_functional/test_suites/telemetry/telemetry.ts
+++ b/test/plugin_functional/test_suites/telemetry/telemetry.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { KBN_SCREENSHOT_MODE_ENABLED_KEY } from '@kbn/screenshot-mode-plugin/public';
 import { PluginFunctionalProviderContext } from '../../services';
-import { KBN_SCREENSHOT_MODE_ENABLED_KEY } from '../../../../src/plugins/screenshot_mode/public';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const browser = getService('browser');
diff --git a/test/plugin_functional/test_suites/usage_collection/usage_counters.ts b/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
index f1591165b8d65..0e49b4ddbc91b 100644
--- a/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
+++ b/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
@@ -7,11 +7,11 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from '../../services';
 import {
   UsageCountersSavedObject,
   serializeCounterKey,
-} from '../../../../src/plugins/usage_collection/server/usage_counters';
+} from '@kbn/usage-collection-plugin/server/usage_counters';
+import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
index b2e4f0dd322c4..302f21c377760 100644
--- a/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
@@ -8,12 +8,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { Subject } from 'rxjs';
-import {
-  Plugin,
-  CoreSetup,
-  ServiceStatus,
-  ServiceStatusLevels,
-} from '../../../../../../src/core/server';
+import { Plugin, CoreSetup, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 
 export class StatusPluginAPlugin implements Plugin {
   private status$ = new Subject<ServiceStatus>();
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
index 191e8135f69a9..8b0173aa09a90 100644
--- a/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'kibana/server';
+import { Plugin } from '@kbn/core/server';
 
 export class StatusPluginBPlugin implements Plugin {
   public setup() {}
diff --git a/test/server_integration/http/platform/status.ts b/test/server_integration/http/platform/status.ts
index c6ca805703bfd..48006576128ce 100644
--- a/test/server_integration/http/platform/status.ts
+++ b/test/server_integration/http/platform/status.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import type { ServiceStatus, ServiceStatusLevels } from '../../../../src/core/server';
+import type { ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import { FtrProviderContext } from '../../services/types';
 
 type ServiceStatusSerialized = Omit<ServiceStatus, 'level'> & { level: string };
diff --git a/test/server_integration/http/ssl/config.js b/test/server_integration/http/ssl/config.js
index 14381de6667fd..260ba7424d676 100644
--- a/test/server_integration/http/ssl/config.js
+++ b/test/server_integration/http/ssl/config.js
@@ -15,7 +15,7 @@ export default async function ({ readConfigFile }) {
   const certificateAuthorities = [readFileSync(CA_CERT_PATH)];
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/server_integration/http/ssl_redirect/config.js b/test/server_integration/http/ssl_redirect/config.js
index d19883bcfe241..aed7f23593820 100644
--- a/test/server_integration/http/ssl_redirect/config.js
+++ b/test/server_integration/http/ssl_redirect/config.js
@@ -19,7 +19,7 @@ export default async function ({ readConfigFile }) {
   const redirectPort = httpConfig.get('servers.kibana.port') + 1234;
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/server_integration/http/ssl_with_p12/config.js b/test/server_integration/http/ssl_with_p12/config.js
index c4621500e927d..5d2de9e9a9b54 100644
--- a/test/server_integration/http/ssl_with_p12/config.js
+++ b/test/server_integration/http/ssl_with_p12/config.js
@@ -15,7 +15,7 @@ export default async function ({ readConfigFile }) {
   const certificateAuthorities = [readFileSync(CA_CERT_PATH)];
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/server_integration/http/ssl_with_p12_intermediate/config.js b/test/server_integration/http/ssl_with_p12_intermediate/config.js
index 7f32bad648351..ffcb9da0fa047 100644
--- a/test/server_integration/http/ssl_with_p12_intermediate/config.js
+++ b/test/server_integration/http/ssl_with_p12_intermediate/config.js
@@ -15,7 +15,7 @@ export default async function ({ readConfigFile }) {
   const certificateAuthorities = [readFileSync(CA1_CERT_PATH), readFileSync(CA2_CERT_PATH)];
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/ui_capabilities/newsfeed_err/test.ts b/test/ui_capabilities/newsfeed_err/test.ts
index 2c0c9e60c6995..52c1c0644299a 100644
--- a/test/ui_capabilities/newsfeed_err/test.ts
+++ b/test/ui_capabilities/newsfeed_err/test.ts
@@ -15,7 +15,7 @@ export default function uiCapabilitiesTests({ getService, getPageObjects }: FtrP
   const PageObjects = getPageObjects(['common', 'newsfeed']);
 
   describe('Newsfeed icon button handle errors', function () {
-    this.tags('ciGroup6');
+    this.tags('ciGroup5');
 
     before(async () => {
       await PageObjects.newsfeed.resetPage();
diff --git a/test/visual_regression/tests/discover/index.ts b/test/visual_regression/tests/discover/index.ts
index 3f82f5405972e..fe634c02400a4 100644
--- a/test/visual_regression/tests/discover/index.ts
+++ b/test/visual_regression/tests/discover/index.ts
@@ -16,7 +16,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const browser = getService('browser');
 
   describe('discover app', function () {
-    this.tags('ciGroup6');
+    this.tags('ciGroup5');
 
     before(function () {
       return browser.setWindowSize(SCREEN_WIDTH, 1000);
diff --git a/test/visual_regression/tests/vega/index.ts b/test/visual_regression/tests/vega/index.ts
index c6b4cbd2d01b5..71f22a3058d91 100644
--- a/test/visual_regression/tests/vega/index.ts
+++ b/test/visual_regression/tests/vega/index.ts
@@ -16,7 +16,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const browser = getService('browser');
 
   describe('vega app', function () {
-    this.tags('ciGroup6');
+    this.tags('ciGroup5');
 
     before(function () {
       return browser.setWindowSize(SCREEN_WIDTH, 1000);
diff --git a/tsconfig.base.json b/tsconfig.base.json
index b7c6505389f0c..ac35847201b7f 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -2,13 +2,442 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      // Setup @kbn paths for Bazel compilations
-      "@kbn/*": [
-        "node_modules/@kbn/*",
-        "bazel-out/darwin-fastbuild/bin/packages/kbn-*",
-        "bazel-out/k8-fastbuild/bin/packages/kbn-*",
-        "bazel-out/x64_windows-fastbuild/bin/packages/kbn-*"
-      ],
+      "@kbn/core": ["src/core"],
+      "@kbn/core/*": ["src/core/*"],
+      // START AUTOMATED PACKAGE LISTING
+      "@kbn/bfetch-explorer-plugin": ["examples/bfetch_explorer"],
+      "@kbn/bfetch-explorer-plugin/*": ["examples/bfetch_explorer/*"],
+      "@kbn/dashboard-embeddable-examples-plugin": ["examples/dashboard_embeddable_examples"],
+      "@kbn/dashboard-embeddable-examples-plugin/*": ["examples/dashboard_embeddable_examples/*"],
+      "@kbn/data-view-field-editor-example-plugin": ["examples/data_view_field_editor_example"],
+      "@kbn/data-view-field-editor-example-plugin/*": ["examples/data_view_field_editor_example/*"],
+      "@kbn/developer-examples-plugin": ["examples/developer_examples"],
+      "@kbn/developer-examples-plugin/*": ["examples/developer_examples/*"],
+      "@kbn/embeddable-examples-plugin": ["examples/embeddable_examples"],
+      "@kbn/embeddable-examples-plugin/*": ["examples/embeddable_examples/*"],
+      "@kbn/embeddable-explorer-plugin": ["examples/embeddable_explorer"],
+      "@kbn/embeddable-explorer-plugin/*": ["examples/embeddable_explorer/*"],
+      "@kbn/expressions-explorer-plugin": ["examples/expressions_explorer"],
+      "@kbn/expressions-explorer-plugin/*": ["examples/expressions_explorer/*"],
+      "@kbn/field-formats-example-plugin": ["examples/field_formats_example"],
+      "@kbn/field-formats-example-plugin/*": ["examples/field_formats_example/*"],
+      "@kbn/hello-world-plugin": ["examples/hello_world"],
+      "@kbn/hello-world-plugin/*": ["examples/hello_world/*"],
+      "@kbn/locator-examples-plugin": ["examples/locator_examples"],
+      "@kbn/locator-examples-plugin/*": ["examples/locator_examples/*"],
+      "@kbn/locator-explorer-plugin": ["examples/locator_explorer"],
+      "@kbn/locator-explorer-plugin/*": ["examples/locator_explorer/*"],
+      "@kbn/paertial-results-example-plugin": ["examples/partial_results_example"],
+      "@kbn/paertial-results-example-plugin/*": ["examples/partial_results_example/*"],
+      "@kbn/preboot-example-plugin": ["examples/preboot_example"],
+      "@kbn/preboot-example-plugin/*": ["examples/preboot_example/*"],
+      "@kbn/routing-example-plugin": ["examples/routing_example"],
+      "@kbn/routing-example-plugin/*": ["examples/routing_example/*"],
+      "@kbn/screenshot-mode-example-plugin": ["examples/screenshot_mode_example"],
+      "@kbn/screenshot-mode-example-plugin/*": ["examples/screenshot_mode_example/*"],
+      "@kbn/search-examples-plugin": ["examples/search_examples"],
+      "@kbn/search-examples-plugin/*": ["examples/search_examples/*"],
+      "@kbn/share-examples-plugin": ["examples/share_examples"],
+      "@kbn/share-examples-plugin/*": ["examples/share_examples/*"],
+      "@kbn/state-containers-examples-plugin": ["examples/state_containers_examples"],
+      "@kbn/state-containers-examples-plugin/*": ["examples/state_containers_examples/*"],
+      "@kbn/ui-actions-examples-plugin": ["examples/ui_action_examples"],
+      "@kbn/ui-actions-examples-plugin/*": ["examples/ui_action_examples/*"],
+      "@kbn/ui-actions-explorer-plugin": ["examples/ui_actions_explorer"],
+      "@kbn/ui-actions-explorer-plugin/*": ["examples/ui_actions_explorer/*"],
+      "@kbn/advanced-settings-plugin": ["src/plugins/advanced_settings"],
+      "@kbn/advanced-settings-plugin/*": ["src/plugins/advanced_settings/*"],
+      "@kbn/bfetch-plugin": ["src/plugins/bfetch"],
+      "@kbn/bfetch-plugin/*": ["src/plugins/bfetch/*"],
+      "@kbn/expression-gauge-plugin": ["src/plugins/chart_expressions/expression_gauge"],
+      "@kbn/expression-gauge-plugin/*": ["src/plugins/chart_expressions/expression_gauge/*"],
+      "@kbn/expression-heatmap-plugin": ["src/plugins/chart_expressions/expression_heatmap"],
+      "@kbn/expression-heatmap-plugin/*": ["src/plugins/chart_expressions/expression_heatmap/*"],
+      "@kbn/expression-metric-vis-plugin": ["src/plugins/chart_expressions/expression_metric"],
+      "@kbn/expression-metric-vis-plugin/*": ["src/plugins/chart_expressions/expression_metric/*"],
+      "@kbn/expression-partition-vis-plugin": ["src/plugins/chart_expressions/expression_partition_vis"],
+      "@kbn/expression-partition-vis-plugin/*": ["src/plugins/chart_expressions/expression_partition_vis/*"],
+      "@kbn/expression-tagcloud-plugin": ["src/plugins/chart_expressions/expression_tagcloud"],
+      "@kbn/expression-tagcloud-plugin/*": ["src/plugins/chart_expressions/expression_tagcloud/*"],
+      "@kbn/expression-xy-plugin": ["src/plugins/chart_expressions/expression_xy"],
+      "@kbn/expression-xy-plugin/*": ["src/plugins/chart_expressions/expression_xy/*"],
+      "@kbn/charts-plugin": ["src/plugins/charts"],
+      "@kbn/charts-plugin/*": ["src/plugins/charts/*"],
+      "@kbn/console-plugin": ["src/plugins/console"],
+      "@kbn/console-plugin/*": ["src/plugins/console/*"],
+      "@kbn/controls-plugin": ["src/plugins/controls"],
+      "@kbn/controls-plugin/*": ["src/plugins/controls/*"],
+      "@kbn/custom-integrations-plugin": ["src/plugins/custom_integrations"],
+      "@kbn/custom-integrations-plugin/*": ["src/plugins/custom_integrations/*"],
+      "@kbn/dashboard-plugin": ["src/plugins/dashboard"],
+      "@kbn/dashboard-plugin/*": ["src/plugins/dashboard/*"],
+      "@kbn/data-view-editor-plugin": ["src/plugins/data_view_editor"],
+      "@kbn/data-view-editor-plugin/*": ["src/plugins/data_view_editor/*"],
+      "@kbn/data-view-field-editor-plugin": ["src/plugins/data_view_field_editor"],
+      "@kbn/data-view-field-editor-plugin/*": ["src/plugins/data_view_field_editor/*"],
+      "@kbn/data-view-management-plugin": ["src/plugins/data_view_management"],
+      "@kbn/data-view-management-plugin/*": ["src/plugins/data_view_management/*"],
+      "@kbn/data-views-plugin": ["src/plugins/data_views"],
+      "@kbn/data-views-plugin/*": ["src/plugins/data_views/*"],
+      "@kbn/data-plugin": ["src/plugins/data"],
+      "@kbn/data-plugin/*": ["src/plugins/data/*"],
+      "@kbn/dev-tools-plugin": ["src/plugins/dev_tools"],
+      "@kbn/dev-tools-plugin/*": ["src/plugins/dev_tools/*"],
+      "@kbn/discover-plugin": ["src/plugins/discover"],
+      "@kbn/discover-plugin/*": ["src/plugins/discover/*"],
+      "@kbn/embeddable-plugin": ["src/plugins/embeddable"],
+      "@kbn/embeddable-plugin/*": ["src/plugins/embeddable/*"],
+      "@kbn/es-ui-shared-plugin": ["src/plugins/es_ui_shared"],
+      "@kbn/es-ui-shared-plugin/*": ["src/plugins/es_ui_shared/*"],
+      "@kbn/event-annotation-plugin": ["src/plugins/event_annotation"],
+      "@kbn/event-annotation-plugin/*": ["src/plugins/event_annotation/*"],
+      "@kbn/expression-error-plugin": ["src/plugins/expression_error"],
+      "@kbn/expression-error-plugin/*": ["src/plugins/expression_error/*"],
+      "@kbn/expression-image-plugin": ["src/plugins/expression_image"],
+      "@kbn/expression-image-plugin/*": ["src/plugins/expression_image/*"],
+      "@kbn/expression-metric-plugin": ["src/plugins/expression_metric"],
+      "@kbn/expression-metric-plugin/*": ["src/plugins/expression_metric/*"],
+      "@kbn/expression-repeat-image-plugin": ["src/plugins/expression_repeat_image"],
+      "@kbn/expression-repeat-image-plugin/*": ["src/plugins/expression_repeat_image/*"],
+      "@kbn/expression-reveal-image-plugin": ["src/plugins/expression_reveal_image"],
+      "@kbn/expression-reveal-image-plugin/*": ["src/plugins/expression_reveal_image/*"],
+      "@kbn/expression-shape-plugin": ["src/plugins/expression_shape"],
+      "@kbn/expression-shape-plugin/*": ["src/plugins/expression_shape/*"],
+      "@kbn/expressions-plugin": ["src/plugins/expressions"],
+      "@kbn/expressions-plugin/*": ["src/plugins/expressions/*"],
+      "@kbn/field-formats-plugin": ["src/plugins/field_formats"],
+      "@kbn/field-formats-plugin/*": ["src/plugins/field_formats/*"],
+      "@kbn/home-plugin": ["src/plugins/home"],
+      "@kbn/home-plugin/*": ["src/plugins/home/*"],
+      "@kbn/input-control-vis-plugin": ["src/plugins/input_control_vis"],
+      "@kbn/input-control-vis-plugin/*": ["src/plugins/input_control_vis/*"],
+      "@kbn/inspector-plugin": ["src/plugins/inspector"],
+      "@kbn/inspector-plugin/*": ["src/plugins/inspector/*"],
+      "@kbn/interactive-setup-plugin": ["src/plugins/interactive_setup"],
+      "@kbn/interactive-setup-plugin/*": ["src/plugins/interactive_setup/*"],
+      "@kbn/kibana-overview-plugin": ["src/plugins/kibana_overview"],
+      "@kbn/kibana-overview-plugin/*": ["src/plugins/kibana_overview/*"],
+      "@kbn/kibana-react-plugin": ["src/plugins/kibana_react"],
+      "@kbn/kibana-react-plugin/*": ["src/plugins/kibana_react/*"],
+      "@kbn/kibana-usage-collection-plugin": ["src/plugins/kibana_usage_collection"],
+      "@kbn/kibana-usage-collection-plugin/*": ["src/plugins/kibana_usage_collection/*"],
+      "@kbn/kibana-utils-plugin": ["src/plugins/kibana_utils"],
+      "@kbn/kibana-utils-plugin/*": ["src/plugins/kibana_utils/*"],
+      "@kbn/management-plugin": ["src/plugins/management"],
+      "@kbn/management-plugin/*": ["src/plugins/management/*"],
+      "@kbn/maps-ems-plugin": ["src/plugins/maps_ems"],
+      "@kbn/maps-ems-plugin/*": ["src/plugins/maps_ems/*"],
+      "@kbn/navigation-plugin": ["src/plugins/navigation"],
+      "@kbn/navigation-plugin/*": ["src/plugins/navigation/*"],
+      "@kbn/newsfeed-plugin": ["src/plugins/newsfeed"],
+      "@kbn/newsfeed-plugin/*": ["src/plugins/newsfeed/*"],
+      "@kbn/presentation-util-plugin": ["src/plugins/presentation_util"],
+      "@kbn/presentation-util-plugin/*": ["src/plugins/presentation_util/*"],
+      "@kbn/saved-objects-management-plugin": ["src/plugins/saved_objects_management"],
+      "@kbn/saved-objects-management-plugin/*": ["src/plugins/saved_objects_management/*"],
+      "@kbn/saved-objects-tagging-oss-plugin": ["src/plugins/saved_objects_tagging_oss"],
+      "@kbn/saved-objects-tagging-oss-plugin/*": ["src/plugins/saved_objects_tagging_oss/*"],
+      "@kbn/saved-objects-plugin": ["src/plugins/saved_objects"],
+      "@kbn/saved-objects-plugin/*": ["src/plugins/saved_objects/*"],
+      "@kbn/screenshot-mode-plugin": ["src/plugins/screenshot_mode"],
+      "@kbn/screenshot-mode-plugin/*": ["src/plugins/screenshot_mode/*"],
+      "@kbn/share-plugin": ["src/plugins/share"],
+      "@kbn/share-plugin/*": ["src/plugins/share/*"],
+      "@kbn/shared-ux-plugin": ["src/plugins/shared_ux"],
+      "@kbn/shared-ux-plugin/*": ["src/plugins/shared_ux/*"],
+      "@kbn/telemetry-collection-manager-plugin": ["src/plugins/telemetry_collection_manager"],
+      "@kbn/telemetry-collection-manager-plugin/*": ["src/plugins/telemetry_collection_manager/*"],
+      "@kbn/telemetry-management-section-plugin": ["src/plugins/telemetry_management_section"],
+      "@kbn/telemetry-management-section-plugin/*": ["src/plugins/telemetry_management_section/*"],
+      "@kbn/telemetry-plugin": ["src/plugins/telemetry"],
+      "@kbn/telemetry-plugin/*": ["src/plugins/telemetry/*"],
+      "@kbn/ui-actions-plugin": ["src/plugins/ui_actions"],
+      "@kbn/ui-actions-plugin/*": ["src/plugins/ui_actions/*"],
+      "@kbn/unified-search-plugin": ["src/plugins/unified_search"],
+      "@kbn/unified-search-plugin/*": ["src/plugins/unified_search/*"],
+      "@kbn/url-forwarding-plugin": ["src/plugins/url_forwarding"],
+      "@kbn/url-forwarding-plugin/*": ["src/plugins/url_forwarding/*"],
+      "@kbn/usage-collection-plugin": ["src/plugins/usage_collection"],
+      "@kbn/usage-collection-plugin/*": ["src/plugins/usage_collection/*"],
+      "@kbn/vis-default-editor-plugin": ["src/plugins/vis_default_editor"],
+      "@kbn/vis-default-editor-plugin/*": ["src/plugins/vis_default_editor/*"],
+      "@kbn/vis-type-markdown-plugin": ["src/plugins/vis_type_markdown"],
+      "@kbn/vis-type-markdown-plugin/*": ["src/plugins/vis_type_markdown/*"],
+      "@kbn/vis-type-gauge-plugin": ["src/plugins/vis_types/gauge"],
+      "@kbn/vis-type-gauge-plugin/*": ["src/plugins/vis_types/gauge/*"],
+      "@kbn/vis-type-heatmap-plugin": ["src/plugins/vis_types/heatmap"],
+      "@kbn/vis-type-heatmap-plugin/*": ["src/plugins/vis_types/heatmap/*"],
+      "@kbn/vis-type-metric-plugin": ["src/plugins/vis_types/metric"],
+      "@kbn/vis-type-metric-plugin/*": ["src/plugins/vis_types/metric/*"],
+      "@kbn/vis-type-pie-plugin": ["src/plugins/vis_types/pie"],
+      "@kbn/vis-type-pie-plugin/*": ["src/plugins/vis_types/pie/*"],
+      "@kbn/vis-type-table-plugin": ["src/plugins/vis_types/table"],
+      "@kbn/vis-type-table-plugin/*": ["src/plugins/vis_types/table/*"],
+      "@kbn/vis-type-tagcloud-plugin": ["src/plugins/vis_types/tagcloud"],
+      "@kbn/vis-type-tagcloud-plugin/*": ["src/plugins/vis_types/tagcloud/*"],
+      "@kbn/vis-type-timelion-plugin": ["src/plugins/vis_types/timelion"],
+      "@kbn/vis-type-timelion-plugin/*": ["src/plugins/vis_types/timelion/*"],
+      "@kbn/vis-type-timeseries-plugin": ["src/plugins/vis_types/timeseries"],
+      "@kbn/vis-type-timeseries-plugin/*": ["src/plugins/vis_types/timeseries/*"],
+      "@kbn/vis-type-vega-plugin": ["src/plugins/vis_types/vega"],
+      "@kbn/vis-type-vega-plugin/*": ["src/plugins/vis_types/vega/*"],
+      "@kbn/vis-type-vislib-plugin": ["src/plugins/vis_types/vislib"],
+      "@kbn/vis-type-vislib-plugin/*": ["src/plugins/vis_types/vislib/*"],
+      "@kbn/vis-type-xy-plugin": ["src/plugins/vis_types/xy"],
+      "@kbn/vis-type-xy-plugin/*": ["src/plugins/vis_types/xy/*"],
+      "@kbn/visualizations-plugin": ["src/plugins/visualizations"],
+      "@kbn/visualizations-plugin/*": ["src/plugins/visualizations/*"],
+      "@kbn/analytics-ftr-helpers-plugin": ["test/analytics/__fixtures__/plugins/analytics_ftr_helpers"],
+      "@kbn/analytics-ftr-helpers-plugin/*": ["test/analytics/__fixtures__/plugins/analytics_ftr_helpers/*"],
+      "@kbn/analytics-plugin-a-plugin": ["test/analytics/__fixtures__/plugins/analytics_plugin_a"],
+      "@kbn/analytics-plugin-a-plugin/*": ["test/analytics/__fixtures__/plugins/analytics_plugin_a/*"],
+      "@kbn/coverage-fixtures-plugin": ["test/common/fixtures/plugins/coverage"],
+      "@kbn/coverage-fixtures-plugin/*": ["test/common/fixtures/plugins/coverage/*"],
+      "@kbn/newsfeed-fixtures-plugin": ["test/common/fixtures/plugins/newsfeed"],
+      "@kbn/newsfeed-fixtures-plugin/*": ["test/common/fixtures/plugins/newsfeed/*"],
+      "@kbn/kbn-tp-run-pipeline-plugin": ["test/interpreter_functional/plugins/kbn_tp_run_pipeline"],
+      "@kbn/kbn-tp-run-pipeline-plugin/*": ["test/interpreter_functional/plugins/kbn_tp_run_pipeline/*"],
+      "@kbn/app-link-test-plugin": ["test/plugin_functional/plugins/app_link_test"],
+      "@kbn/app-link-test-plugin/*": ["test/plugin_functional/plugins/app_link_test/*"],
+      "@kbn/core-app-status-plugin": ["test/plugin_functional/plugins/core_app_status"],
+      "@kbn/core-app-status-plugin/*": ["test/plugin_functional/plugins/core_app_status/*"],
+      "@kbn/core-history-block-plugin": ["test/plugin_functional/plugins/core_history_block"],
+      "@kbn/core-history-block-plugin/*": ["test/plugin_functional/plugins/core_history_block/*"],
+      "@kbn/core-http-plugin": ["test/plugin_functional/plugins/core_http"],
+      "@kbn/core-http-plugin/*": ["test/plugin_functional/plugins/core_http/*"],
+      "@kbn/core-plugin-a-plugin": ["test/plugin_functional/plugins/core_plugin_a"],
+      "@kbn/core-plugin-a-plugin/*": ["test/plugin_functional/plugins/core_plugin_a/*"],
+      "@kbn/core-plugin-appleave-plugin": ["test/plugin_functional/plugins/core_plugin_appleave"],
+      "@kbn/core-plugin-appleave-plugin/*": ["test/plugin_functional/plugins/core_plugin_appleave/*"],
+      "@kbn/core-plugin-b-plugin": ["test/plugin_functional/plugins/core_plugin_b"],
+      "@kbn/core-plugin-b-plugin/*": ["test/plugin_functional/plugins/core_plugin_b/*"],
+      "@kbn/core-plugin-chromeless-plugin": ["test/plugin_functional/plugins/core_plugin_chromeless"],
+      "@kbn/core-plugin-chromeless-plugin/*": ["test/plugin_functional/plugins/core_plugin_chromeless/*"],
+      "@kbn/core-plugin-deep-links-plugin": ["test/plugin_functional/plugins/core_plugin_deep_links"],
+      "@kbn/core-plugin-deep-links-plugin/*": ["test/plugin_functional/plugins/core_plugin_deep_links/*"],
+      "@kbn/core-plugin-deprecations-plugin": ["test/plugin_functional/plugins/core_plugin_deprecations"],
+      "@kbn/core-plugin-deprecations-plugin/*": ["test/plugin_functional/plugins/core_plugin_deprecations/*"],
+      "@kbn/core-plugin-execution-context-plugin": ["test/plugin_functional/plugins/core_plugin_execution_context"],
+      "@kbn/core-plugin-execution-context-plugin/*": ["test/plugin_functional/plugins/core_plugin_execution_context/*"],
+      "@kbn/core-plugin-helpmenu-plugin": ["test/plugin_functional/plugins/core_plugin_helpmenu"],
+      "@kbn/core-plugin-helpmenu-plugin/*": ["test/plugin_functional/plugins/core_plugin_helpmenu/*"],
+      "@kbn/core-plugin-route-timeouts-plugin": ["test/plugin_functional/plugins/core_plugin_route_timeouts"],
+      "@kbn/core-plugin-route-timeouts-plugin/*": ["test/plugin_functional/plugins/core_plugin_route_timeouts/*"],
+      "@kbn/core-plugin-static-assets-plugin": ["test/plugin_functional/plugins/core_plugin_static_assets"],
+      "@kbn/core-plugin-static-assets-plugin/*": ["test/plugin_functional/plugins/core_plugin_static_assets/*"],
+      "@kbn/core-provider-plugin": ["test/plugin_functional/plugins/core_provider_plugin"],
+      "@kbn/core-provider-plugin/*": ["test/plugin_functional/plugins/core_provider_plugin/*"],
+      "@kbn/data-search-plugin": ["test/plugin_functional/plugins/data_search"],
+      "@kbn/data-search-plugin/*": ["test/plugin_functional/plugins/data_search/*"],
+      "@kbn/elasticsearch-client-plugin": ["test/plugin_functional/plugins/elasticsearch_client_plugin"],
+      "@kbn/elasticsearch-client-plugin/*": ["test/plugin_functional/plugins/elasticsearch_client_plugin/*"],
+      "@kbn/index-patterns-test-plugin": ["test/plugin_functional/plugins/index_patterns"],
+      "@kbn/index-patterns-test-plugin/*": ["test/plugin_functional/plugins/index_patterns/*"],
+      "@kbn/kbn-sample-panel-action-plugin": ["test/plugin_functional/plugins/kbn_sample_panel_action"],
+      "@kbn/kbn-sample-panel-action-plugin/*": ["test/plugin_functional/plugins/kbn_sample_panel_action/*"],
+      "@kbn/kbn-top-nav-plugin": ["test/plugin_functional/plugins/kbn_top_nav"],
+      "@kbn/kbn-top-nav-plugin/*": ["test/plugin_functional/plugins/kbn_top_nav/*"],
+      "@kbn/kbn-tp-custom-visualizations-plugin": ["test/plugin_functional/plugins/kbn_tp_custom_visualizations"],
+      "@kbn/kbn-tp-custom-visualizations-plugin/*": ["test/plugin_functional/plugins/kbn_tp_custom_visualizations/*"],
+      "@kbn/management-test-plugin": ["test/plugin_functional/plugins/management_test_plugin"],
+      "@kbn/management-test-plugin/*": ["test/plugin_functional/plugins/management_test_plugin/*"],
+      "@kbn/rendering-plugin": ["test/plugin_functional/plugins/rendering_plugin"],
+      "@kbn/rendering-plugin/*": ["test/plugin_functional/plugins/rendering_plugin/*"],
+      "@kbn/saved-object-export-transforms-plugin": ["test/plugin_functional/plugins/saved_object_export_transforms"],
+      "@kbn/saved-object-export-transforms-plugin/*": ["test/plugin_functional/plugins/saved_object_export_transforms/*"],
+      "@kbn/saved-object-import-warnings-plugin": ["test/plugin_functional/plugins/saved_object_import_warnings"],
+      "@kbn/saved-object-import-warnings-plugin/*": ["test/plugin_functional/plugins/saved_object_import_warnings/*"],
+      "@kbn/saved-objects-hidden-type-plugin": ["test/plugin_functional/plugins/saved_objects_hidden_type"],
+      "@kbn/saved-objects-hidden-type-plugin/*": ["test/plugin_functional/plugins/saved_objects_hidden_type/*"],
+      "@kbn/session-notifications-plugin": ["test/plugin_functional/plugins/session_notifications"],
+      "@kbn/session-notifications-plugin/*": ["test/plugin_functional/plugins/session_notifications/*"],
+      "@kbn/telemetry-test-plugin": ["test/plugin_functional/plugins/telemetry"],
+      "@kbn/telemetry-test-plugin/*": ["test/plugin_functional/plugins/telemetry/*"],
+      "@kbn/ui-settings-plugin": ["test/plugin_functional/plugins/ui_settings_plugin"],
+      "@kbn/ui-settings-plugin/*": ["test/plugin_functional/plugins/ui_settings_plugin/*"],
+      "@kbn/usage-collection-test-plugin": ["test/plugin_functional/plugins/usage_collection"],
+      "@kbn/usage-collection-test-plugin/*": ["test/plugin_functional/plugins/usage_collection/*"],
+      "@kbn/alerting-example-plugin": ["x-pack/examples/alerting_example"],
+      "@kbn/alerting-example-plugin/*": ["x-pack/examples/alerting_example/*"],
+      "@kbn/embedded-lens-example-plugin": ["x-pack/examples/embedded_lens_example"],
+      "@kbn/embedded-lens-example-plugin/*": ["x-pack/examples/embedded_lens_example/*"],
+      "@kbn/exploratory-view-example-plugin": ["x-pack/examples/exploratory_view_example"],
+      "@kbn/exploratory-view-example-plugin/*": ["x-pack/examples/exploratory_view_example/*"],
+      "@kbn/reporting-example-plugin": ["x-pack/examples/reporting_example"],
+      "@kbn/reporting-example-plugin/*": ["x-pack/examples/reporting_example/*"],
+      "@kbn/screenshotting-example-plugin": ["x-pack/examples/screenshotting_example"],
+      "@kbn/screenshotting-example-plugin/*": ["x-pack/examples/screenshotting_example/*"],
+      "@kbn/testing-embedded-lens-plugin": ["x-pack/examples/testing_embedded_lens"],
+      "@kbn/testing-embedded-lens-plugin/*": ["x-pack/examples/testing_embedded_lens/*"],
+      "@kbn/third-party-lens-navigation-prompt-plugin": ["x-pack/examples/third_party_lens_navigation_prompt"],
+      "@kbn/third-party-lens-navigation-prompt-plugin/*": ["x-pack/examples/third_party_lens_navigation_prompt/*"],
+      "@kbn/third-party-vis-lens-example-plugin": ["x-pack/examples/third_party_vis_lens_example"],
+      "@kbn/third-party-vis-lens-example-plugin/*": ["x-pack/examples/third_party_vis_lens_example/*"],
+      "@kbn/ui-actions-enhanced-examples-plugin": ["x-pack/examples/ui_actions_enhanced_examples"],
+      "@kbn/ui-actions-enhanced-examples-plugin/*": ["x-pack/examples/ui_actions_enhanced_examples/*"],
+      "@kbn/actions-plugin": ["x-pack/plugins/actions"],
+      "@kbn/actions-plugin/*": ["x-pack/plugins/actions/*"],
+      "@kbn/alerting-plugin": ["x-pack/plugins/alerting"],
+      "@kbn/alerting-plugin/*": ["x-pack/plugins/alerting/*"],
+      "@kbn/apm-plugin": ["x-pack/plugins/apm"],
+      "@kbn/apm-plugin/*": ["x-pack/plugins/apm/*"],
+      "@kbn/banners-plugin": ["x-pack/plugins/banners"],
+      "@kbn/banners-plugin/*": ["x-pack/plugins/banners/*"],
+      "@kbn/canvas-plugin": ["x-pack/plugins/canvas"],
+      "@kbn/canvas-plugin/*": ["x-pack/plugins/canvas/*"],
+      "@kbn/cases-plugin": ["x-pack/plugins/cases"],
+      "@kbn/cases-plugin/*": ["x-pack/plugins/cases/*"],
+      "@kbn/cloud-security-posture-plugin": ["x-pack/plugins/cloud_security_posture"],
+      "@kbn/cloud-security-posture-plugin/*": ["x-pack/plugins/cloud_security_posture/*"],
+      "@kbn/cloud-plugin": ["x-pack/plugins/cloud"],
+      "@kbn/cloud-plugin/*": ["x-pack/plugins/cloud/*"],
+      "@kbn/cross-cluster-replication-plugin": ["x-pack/plugins/cross_cluster_replication"],
+      "@kbn/cross-cluster-replication-plugin/*": ["x-pack/plugins/cross_cluster_replication/*"],
+      "@kbn/dashboard-enhanced-plugin": ["x-pack/plugins/dashboard_enhanced"],
+      "@kbn/dashboard-enhanced-plugin/*": ["x-pack/plugins/dashboard_enhanced/*"],
+      "@kbn/data-enhanced-plugin": ["x-pack/plugins/data_enhanced"],
+      "@kbn/data-enhanced-plugin/*": ["x-pack/plugins/data_enhanced/*"],
+      "@kbn/data-visualizer-plugin": ["x-pack/plugins/data_visualizer"],
+      "@kbn/data-visualizer-plugin/*": ["x-pack/plugins/data_visualizer/*"],
+      "@kbn/discover-enhanced-plugin": ["x-pack/plugins/discover_enhanced"],
+      "@kbn/discover-enhanced-plugin/*": ["x-pack/plugins/discover_enhanced/*"],
+      "@kbn/url-drilldown-plugin": ["x-pack/plugins/drilldowns/url_drilldown"],
+      "@kbn/url-drilldown-plugin/*": ["x-pack/plugins/drilldowns/url_drilldown/*"],
+      "@kbn/embeddable-enhanced-plugin": ["x-pack/plugins/embeddable_enhanced"],
+      "@kbn/embeddable-enhanced-plugin/*": ["x-pack/plugins/embeddable_enhanced/*"],
+      "@kbn/encrypted-saved-objects-plugin": ["x-pack/plugins/encrypted_saved_objects"],
+      "@kbn/encrypted-saved-objects-plugin/*": ["x-pack/plugins/encrypted_saved_objects/*"],
+      "@kbn/enterprise-search-plugin": ["x-pack/plugins/enterprise_search"],
+      "@kbn/enterprise-search-plugin/*": ["x-pack/plugins/enterprise_search/*"],
+      "@kbn/event-log-plugin": ["x-pack/plugins/event_log"],
+      "@kbn/event-log-plugin/*": ["x-pack/plugins/event_log/*"],
+      "@kbn/features-plugin": ["x-pack/plugins/features"],
+      "@kbn/features-plugin/*": ["x-pack/plugins/features/*"],
+      "@kbn/file-upload-plugin": ["x-pack/plugins/file_upload"],
+      "@kbn/file-upload-plugin/*": ["x-pack/plugins/file_upload/*"],
+      "@kbn/fleet-plugin": ["x-pack/plugins/fleet"],
+      "@kbn/fleet-plugin/*": ["x-pack/plugins/fleet/*"],
+      "@kbn/global-search-bar-plugin": ["x-pack/plugins/global_search_bar"],
+      "@kbn/global-search-bar-plugin/*": ["x-pack/plugins/global_search_bar/*"],
+      "@kbn/global-search-providers-plugin": ["x-pack/plugins/global_search_providers"],
+      "@kbn/global-search-providers-plugin/*": ["x-pack/plugins/global_search_providers/*"],
+      "@kbn/global-search-plugin": ["x-pack/plugins/global_search"],
+      "@kbn/global-search-plugin/*": ["x-pack/plugins/global_search/*"],
+      "@kbn/graph-plugin": ["x-pack/plugins/graph"],
+      "@kbn/graph-plugin/*": ["x-pack/plugins/graph/*"],
+      "@kbn/grokdebugger-plugin": ["x-pack/plugins/grokdebugger"],
+      "@kbn/grokdebugger-plugin/*": ["x-pack/plugins/grokdebugger/*"],
+      "@kbn/index-lifecycle-management-plugin": ["x-pack/plugins/index_lifecycle_management"],
+      "@kbn/index-lifecycle-management-plugin/*": ["x-pack/plugins/index_lifecycle_management/*"],
+      "@kbn/index-management-plugin": ["x-pack/plugins/index_management"],
+      "@kbn/index-management-plugin/*": ["x-pack/plugins/index_management/*"],
+      "@kbn/infra-plugin": ["x-pack/plugins/infra"],
+      "@kbn/infra-plugin/*": ["x-pack/plugins/infra/*"],
+      "@kbn/ingest-pipelines-plugin": ["x-pack/plugins/ingest_pipelines"],
+      "@kbn/ingest-pipelines-plugin/*": ["x-pack/plugins/ingest_pipelines/*"],
+      "@kbn/lens-plugin": ["x-pack/plugins/lens"],
+      "@kbn/lens-plugin/*": ["x-pack/plugins/lens/*"],
+      "@kbn/license-api-guard-plugin": ["x-pack/plugins/license_api_guard"],
+      "@kbn/license-api-guard-plugin/*": ["x-pack/plugins/license_api_guard/*"],
+      "@kbn/license-management-plugin": ["x-pack/plugins/license_management"],
+      "@kbn/license-management-plugin/*": ["x-pack/plugins/license_management/*"],
+      "@kbn/licensing-plugin": ["x-pack/plugins/licensing"],
+      "@kbn/licensing-plugin/*": ["x-pack/plugins/licensing/*"],
+      "@kbn/lists-plugin": ["x-pack/plugins/lists"],
+      "@kbn/lists-plugin/*": ["x-pack/plugins/lists/*"],
+      "@kbn/logstash-plugin": ["x-pack/plugins/logstash"],
+      "@kbn/logstash-plugin/*": ["x-pack/plugins/logstash/*"],
+      "@kbn/maps-plugin": ["x-pack/plugins/maps"],
+      "@kbn/maps-plugin/*": ["x-pack/plugins/maps/*"],
+      "@kbn/ml-plugin": ["x-pack/plugins/ml"],
+      "@kbn/ml-plugin/*": ["x-pack/plugins/ml/*"],
+      "@kbn/monitoring-collection-plugin": ["x-pack/plugins/monitoring_collection"],
+      "@kbn/monitoring-collection-plugin/*": ["x-pack/plugins/monitoring_collection/*"],
+      "@kbn/monitoring-plugin": ["x-pack/plugins/monitoring"],
+      "@kbn/monitoring-plugin/*": ["x-pack/plugins/monitoring/*"],
+      "@kbn/observability-plugin": ["x-pack/plugins/observability"],
+      "@kbn/observability-plugin/*": ["x-pack/plugins/observability/*"],
+      "@kbn/osquery-plugin": ["x-pack/plugins/osquery"],
+      "@kbn/osquery-plugin/*": ["x-pack/plugins/osquery/*"],
+      "@kbn/painless-lab-plugin": ["x-pack/plugins/painless_lab"],
+      "@kbn/painless-lab-plugin/*": ["x-pack/plugins/painless_lab/*"],
+      "@kbn/remote-clusters-plugin": ["x-pack/plugins/remote_clusters"],
+      "@kbn/remote-clusters-plugin/*": ["x-pack/plugins/remote_clusters/*"],
+      "@kbn/reporting-plugin": ["x-pack/plugins/reporting"],
+      "@kbn/reporting-plugin/*": ["x-pack/plugins/reporting/*"],
+      "@kbn/rollup-plugin": ["x-pack/plugins/rollup"],
+      "@kbn/rollup-plugin/*": ["x-pack/plugins/rollup/*"],
+      "@kbn/rule-registry-plugin": ["x-pack/plugins/rule_registry"],
+      "@kbn/rule-registry-plugin/*": ["x-pack/plugins/rule_registry/*"],
+      "@kbn/runtime-fields-plugin": ["x-pack/plugins/runtime_fields"],
+      "@kbn/runtime-fields-plugin/*": ["x-pack/plugins/runtime_fields/*"],
+      "@kbn/saved-objects-tagging-plugin": ["x-pack/plugins/saved_objects_tagging"],
+      "@kbn/saved-objects-tagging-plugin/*": ["x-pack/plugins/saved_objects_tagging/*"],
+      "@kbn/screenshotting-plugin": ["x-pack/plugins/screenshotting"],
+      "@kbn/screenshotting-plugin/*": ["x-pack/plugins/screenshotting/*"],
+      "@kbn/searchprofiler-plugin": ["x-pack/plugins/searchprofiler"],
+      "@kbn/searchprofiler-plugin/*": ["x-pack/plugins/searchprofiler/*"],
+      "@kbn/security-solution-plugin": ["x-pack/plugins/security_solution"],
+      "@kbn/security-solution-plugin/*": ["x-pack/plugins/security_solution/*"],
+      "@kbn/security-plugin": ["x-pack/plugins/security"],
+      "@kbn/security-plugin/*": ["x-pack/plugins/security/*"],
+      "@kbn/session-view-plugin": ["x-pack/plugins/session_view"],
+      "@kbn/session-view-plugin/*": ["x-pack/plugins/session_view/*"],
+      "@kbn/snapshot-restore-plugin": ["x-pack/plugins/snapshot_restore"],
+      "@kbn/snapshot-restore-plugin/*": ["x-pack/plugins/snapshot_restore/*"],
+      "@kbn/spaces-plugin": ["x-pack/plugins/spaces"],
+      "@kbn/spaces-plugin/*": ["x-pack/plugins/spaces/*"],
+      "@kbn/stack-alerts-plugin": ["x-pack/plugins/stack_alerts"],
+      "@kbn/stack-alerts-plugin/*": ["x-pack/plugins/stack_alerts/*"],
+      "@kbn/synthetics-plugin": ["x-pack/plugins/synthetics"],
+      "@kbn/synthetics-plugin/*": ["x-pack/plugins/synthetics/*"],
+      "@kbn/task-manager-plugin": ["x-pack/plugins/task_manager"],
+      "@kbn/task-manager-plugin/*": ["x-pack/plugins/task_manager/*"],
+      "@kbn/telemetry-collection-xpack-plugin": ["x-pack/plugins/telemetry_collection_xpack"],
+      "@kbn/telemetry-collection-xpack-plugin/*": ["x-pack/plugins/telemetry_collection_xpack/*"],
+      "@kbn/timelines-plugin": ["x-pack/plugins/timelines"],
+      "@kbn/timelines-plugin/*": ["x-pack/plugins/timelines/*"],
+      "@kbn/transform-plugin": ["x-pack/plugins/transform"],
+      "@kbn/transform-plugin/*": ["x-pack/plugins/transform/*"],
+      "@kbn/translations-plugin": ["x-pack/plugins/translations"],
+      "@kbn/translations-plugin/*": ["x-pack/plugins/translations/*"],
+      "@kbn/triggers-actions-ui-plugin": ["x-pack/plugins/triggers_actions_ui"],
+      "@kbn/triggers-actions-ui-plugin/*": ["x-pack/plugins/triggers_actions_ui/*"],
+      "@kbn/ui-actions-enhanced-plugin": ["x-pack/plugins/ui_actions_enhanced"],
+      "@kbn/ui-actions-enhanced-plugin/*": ["x-pack/plugins/ui_actions_enhanced/*"],
+      "@kbn/upgrade-assistant-plugin": ["x-pack/plugins/upgrade_assistant"],
+      "@kbn/upgrade-assistant-plugin/*": ["x-pack/plugins/upgrade_assistant/*"],
+      "@kbn/ux-plugin": ["x-pack/plugins/ux"],
+      "@kbn/ux-plugin/*": ["x-pack/plugins/ux/*"],
+      "@kbn/watcher-plugin": ["x-pack/plugins/watcher"],
+      "@kbn/watcher-plugin/*": ["x-pack/plugins/watcher/*"],
+      "@kbn/alerting-fixture-plugin": ["x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts"],
+      "@kbn/alerting-fixture-plugin/*": ["x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/*"],
+      "@kbn/test-feature-usage-plugin": ["x-pack/test/licensing_plugin/plugins/test_feature_usage"],
+      "@kbn/test-feature-usage-plugin/*": ["x-pack/test/licensing_plugin/plugins/test_feature_usage/*"],
+      "@kbn/elasticsearch-client-xpack-plugin": ["x-pack/test/plugin_api_integration/plugins/elasticsearch_client"],
+      "@kbn/elasticsearch-client-xpack-plugin/*": ["x-pack/test/plugin_api_integration/plugins/elasticsearch_client/*"],
+      "@kbn/event-log-fixture-plugin": ["x-pack/test/plugin_api_integration/plugins/event_log"],
+      "@kbn/event-log-fixture-plugin/*": ["x-pack/test/plugin_api_integration/plugins/event_log/*"],
+      "@kbn/feature-usage-test-plugin": ["x-pack/test/plugin_api_integration/plugins/feature_usage_test"],
+      "@kbn/feature-usage-test-plugin/*": ["x-pack/test/plugin_api_integration/plugins/feature_usage_test/*"],
+      "@kbn/sample-task-plugin": ["x-pack/test/plugin_api_integration/plugins/sample_task_plugin"],
+      "@kbn/sample-task-plugin/*": ["x-pack/test/plugin_api_integration/plugins/sample_task_plugin/*"],
+      "@kbn/task-manager-performance-plugin": ["x-pack/test/plugin_api_perf/plugins/task_manager_performance"],
+      "@kbn/task-manager-performance-plugin/*": ["x-pack/test/plugin_api_perf/plugins/task_manager_performance/*"],
+      "@kbn/global-search-test-plugin": ["x-pack/test/plugin_functional/plugins/global_search_test"],
+      "@kbn/global-search-test-plugin/*": ["x-pack/test/plugin_functional/plugins/global_search_test/*"],
+      "@kbn/resolver-test-plugin": ["x-pack/test/plugin_functional/plugins/resolver_test"],
+      "@kbn/resolver-test-plugin/*": ["x-pack/test/plugin_functional/plugins/resolver_test/*"],
+      "@kbn/timelines-test-plugin": ["x-pack/test/plugin_functional/plugins/timelines_test"],
+      "@kbn/timelines-test-plugin/*": ["x-pack/test/plugin_functional/plugins/timelines_test/*"],
+      "@kbn/security-test-endpoints-plugin": ["x-pack/test/security_functional/fixtures/common/test_endpoints"],
+      "@kbn/security-test-endpoints-plugin/*": ["x-pack/test/security_functional/fixtures/common/test_endpoints/*"],
+      "@kbn/application-usage-test-plugin": ["x-pack/test/usage_collection/plugins/application_usage_test"],
+      "@kbn/application-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/application_usage_test/*"],
+      "@kbn/stack-management-usage-test-plugin": ["x-pack/test/usage_collection/plugins/stack_management_usage_test"],
+      "@kbn/stack-management-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/stack_management_usage_test/*"],
+      // END AUTOMATED PACKAGE LISTING
       // Allows for importing from `kibana` package for the exported types.
       "kibana": ["./kibana"],
       "kibana/public": ["src/core/public"],
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 3960cdd76a761..f72f8d135ff3d 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -60,7 +60,7 @@
     "xpack.transform": "plugins/transform",
     "xpack.triggersActionsUI": "plugins/triggers_actions_ui",
     "xpack.upgradeAssistant": "plugins/upgrade_assistant",
-    "xpack.uptime": ["plugins/uptime"],
+    "xpack.uptime": ["plugins/synthetics"],
     "xpack.ux": ["plugins/ux"],
     "xpack.urlDrilldown": "plugins/drilldowns/url_drilldown",
     "xpack.watcher": "plugins/watcher",
diff --git a/x-pack/examples/alerting_example/common/constants.ts b/x-pack/examples/alerting_example/common/constants.ts
index 83cb074328f42..9840b4d507e8b 100644
--- a/x-pack/examples/alerting_example/common/constants.ts
+++ b/x-pack/examples/alerting_example/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../plugins/alerting/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 
 export const ALERTING_EXAMPLE_APP_ID = 'AlertingExample';
 
diff --git a/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx b/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx
index 27b8684e1a17e..58707025b2c69 100644
--- a/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx
+++ b/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx
@@ -23,7 +23,7 @@ import {
   AlertConditionsGroup,
   RuleTypeModel,
   RuleTypeParamsExpressionProps,
-} from '../../../../plugins/triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import {
   AlwaysFiringParams,
   AlwaysFiringActionGroupIds,
diff --git a/x-pack/examples/alerting_example/public/alert_types/astros.tsx b/x-pack/examples/alerting_example/public/alert_types/astros.tsx
index d7fe322a083b1..eee4e92b623f7 100644
--- a/x-pack/examples/alerting_example/public/alert_types/astros.tsx
+++ b/x-pack/examples/alerting_example/public/alert_types/astros.tsx
@@ -19,10 +19,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { flatten } from 'lodash';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { ALERTING_EXAMPLE_APP_ID, Craft, Operator } from '../../common/constants';
-import { SanitizedRule } from '../../../../plugins/alerting/common';
-import { PluginSetupContract as AlertingSetup } from '../../../../plugins/alerting/public';
-import { RuleTypeModel } from '../../../../plugins/triggers_actions_ui/public';
 
 export function registerNavigation(alerting: AlertingSetup) {
   alerting.registerNavigation(
diff --git a/x-pack/examples/alerting_example/public/alert_types/index.ts b/x-pack/examples/alerting_example/public/alert_types/index.ts
index 5b62fe138c018..4cb30b9f4df02 100644
--- a/x-pack/examples/alerting_example/public/alert_types/index.ts
+++ b/x-pack/examples/alerting_example/public/alert_types/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { registerNavigation as registerPeopleInSpaceNavigation } from './astros';
 import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
-import { SanitizedRule } from '../../../../plugins/alerting/common';
-import { PluginSetupContract as AlertingSetup } from '../../../../plugins/alerting/public';
 
 export function registerNavigation(alerting: AlertingSetup) {
   // register default navigation
diff --git a/x-pack/examples/alerting_example/public/application.tsx b/x-pack/examples/alerting_example/public/application.tsx
index a9d0b9fc84905..6e45211111018 100644
--- a/x-pack/examples/alerting_example/public/application.tsx
+++ b/x-pack/examples/alerting_example/public/application.tsx
@@ -9,15 +9,15 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, RouteComponentProps } from 'react-router-dom';
 import { EuiPage } from '@elastic/eui';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { Page } from './components/page';
 import { DocumentationPage } from './components/documentation';
 import { ViewAlertPage } from './components/view_alert';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../plugins/triggers_actions_ui/public';
 import { AlertingExamplePublicStartDeps } from './plugin';
 import { ViewPeopleInSpaceAlertPage } from './components/view_astros_alert';
-import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
 
 export interface AlertingExampleComponentParams {
   http: CoreStart['http'];
diff --git a/x-pack/examples/alerting_example/public/components/view_alert.tsx b/x-pack/examples/alerting_example/public/components/view_alert.tsx
index bade2e484fbe1..b85577f334a5c 100644
--- a/x-pack/examples/alerting_example/public/components/view_alert.tsx
+++ b/x-pack/examples/alerting_example/public/components/view_alert.tsx
@@ -19,13 +19,13 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { isEmpty } from 'lodash';
-import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 import {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
-} from '../../../../plugins/alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 import { Rule, RuleTaskState } from '../../common/types';
 
 type Props = RouteComponentProps & {
diff --git a/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx b/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx
index abb0111bf3374..be1e0799cf51d 100644
--- a/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx
+++ b/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx
@@ -21,13 +21,13 @@ import {
   EuiStat,
 } from '@elastic/eui';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { isEmpty } from 'lodash';
-import { ALERTING_EXAMPLE_APP_ID, AlwaysFiringParams } from '../../common/constants';
 import {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
-} from '../../../../plugins/alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { ALERTING_EXAMPLE_APP_ID, AlwaysFiringParams } from '../../common/constants';
 import { Rule, RuleTaskState } from '../../common/types';
 
 type Props = RouteComponentProps & {
diff --git a/x-pack/examples/alerting_example/public/plugin.tsx b/x-pack/examples/alerting_example/public/plugin.tsx
index 25b6800ade2e8..4c3fd1ae88e5f 100644
--- a/x-pack/examples/alerting_example/public/plugin.tsx
+++ b/x-pack/examples/alerting_example/public/plugin.tsx
@@ -5,23 +5,18 @@
  * 2.0.
  */
 
-import {
-  Plugin,
-  CoreSetup,
-  AppMountParameters,
-  AppNavLinkStatus,
-} from '../../../../src/core/public';
-import { PluginSetupContract as AlertingSetup } from '../../../plugins/alerting/public';
-import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../plugins/triggers_actions_ui/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { getAlertType as getAlwaysFiringAlertType } from './alert_types/always_firing';
 import { getAlertType as getPeopleInSpaceAlertType } from './alert_types/astros';
 import { registerNavigation } from './alert_types';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
 
 export type Setup = void;
 export type Start = void;
diff --git a/x-pack/examples/alerting_example/server/alert_types/always_firing.ts b/x-pack/examples/alerting_example/server/alert_types/always_firing.ts
index 1896db426da5f..a1fa6581f4aca 100644
--- a/x-pack/examples/alerting_example/server/alert_types/always_firing.ts
+++ b/x-pack/examples/alerting_example/server/alert_types/always_firing.ts
@@ -7,7 +7,7 @@
 
 import uuid from 'uuid';
 import { range } from 'lodash';
-import { RuleType } from '../../../../plugins/alerting/server';
+import { RuleType } from '@kbn/alerting-plugin/server';
 import {
   DEFAULT_INSTANCES_TO_GENERATE,
   ALERTING_EXAMPLE_APP_ID,
diff --git a/x-pack/examples/alerting_example/server/alert_types/astros.ts b/x-pack/examples/alerting_example/server/alert_types/astros.ts
index a29b280a34fff..f929fbb2e0879 100644
--- a/x-pack/examples/alerting_example/server/alert_types/astros.ts
+++ b/x-pack/examples/alerting_example/server/alert_types/astros.ts
@@ -6,7 +6,7 @@
  */
 
 import axios from 'axios';
-import { RuleType } from '../../../../plugins/alerting/server';
+import { RuleType } from '@kbn/alerting-plugin/server';
 import { Operator, Craft, ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 
 interface PeopleInSpace {
diff --git a/x-pack/examples/alerting_example/server/index.ts b/x-pack/examples/alerting_example/server/index.ts
index 92722eed31fa3..f14bbe1baac9d 100644
--- a/x-pack/examples/alerting_example/server/index.ts
+++ b/x-pack/examples/alerting_example/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { AlertingExamplePlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new AlertingExamplePlugin();
diff --git a/x-pack/examples/alerting_example/server/plugin.ts b/x-pack/examples/alerting_example/server/plugin.ts
index 2420be798ec84..272611e95ec85 100644
--- a/x-pack/examples/alerting_example/server/plugin.ts
+++ b/x-pack/examples/alerting_example/server/plugin.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 // import directly to support examples functional tests (@kbn-test/src/functional_tests/lib/babel_register_for_test_plugins.js)
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/utils/default_app_categories';
-import { PluginSetupContract as AlertingSetup } from '../../../plugins/alerting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../plugins/features/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/utils/default_app_categories';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 import { alertType as alwaysFiringAlert } from './alert_types/always_firing';
 import { alertType as peopleInSpaceAlert } from './alert_types/astros';
diff --git a/x-pack/examples/embedded_lens_example/public/app.tsx b/x-pack/examples/embedded_lens_example/public/app.tsx
index 950e2f454ad2e..3ef7721c58c02 100644
--- a/x-pack/examples/embedded_lens_example/public/app.tsx
+++ b/x-pack/examples/embedded_lens_example/public/app.tsx
@@ -19,9 +19,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import type { DataView } from 'src/plugins/data_views/public';
-import type { CoreStart } from 'kibana/public';
-import type { StartDependencies } from './plugin';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
 import type {
   TypedLensByValueInput,
   PersistedIndexPatternLayer,
@@ -29,10 +28,11 @@ import type {
   LensEmbeddableInput,
   FormulaPublicApi,
   DateHistogramIndexPatternColumn,
-} from '../../../plugins/lens/public';
+} from '@kbn/lens-plugin/public';
 
-import { ViewMode } from '../../../../src/plugins/embeddable/public';
-import { ActionExecutionContext } from '../../../../src/plugins/ui_actions/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import type { StartDependencies } from './plugin';
 
 // Generate a Lens state based on some app-specific input parameters.
 // `TypedLensByValueInput` can be used for type-safety - it uses the same interfaces as Lens-internal code.
diff --git a/x-pack/examples/embedded_lens_example/public/mount.tsx b/x-pack/examples/embedded_lens_example/public/mount.tsx
index e438b6946b8b6..49775bca09b72 100644
--- a/x-pack/examples/embedded_lens_example/public/mount.tsx
+++ b/x-pack/examples/embedded_lens_example/public/mount.tsx
@@ -9,7 +9,7 @@ import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { EuiCallOut } from '@elastic/eui';
 
-import type { CoreSetup, AppMountParameters } from 'kibana/public';
+import type { CoreSetup, AppMountParameters } from '@kbn/core/public';
 import type { StartDependencies } from './plugin';
 
 export const mount =
diff --git a/x-pack/examples/embedded_lens_example/public/plugin.ts b/x-pack/examples/embedded_lens_example/public/plugin.ts
index f0f799ea8f8ec..f0ca19229895a 100644
--- a/x-pack/examples/embedded_lens_example/public/plugin.ts
+++ b/x-pack/examples/embedded_lens_example/public/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { LensPublicStart } from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/exploratory_view_example/public/app.tsx b/x-pack/examples/exploratory_view_example/public/app.tsx
index a0aba95ddf521..35ace0b045a38 100644
--- a/x-pack/examples/exploratory_view_example/public/app.tsx
+++ b/x-pack/examples/exploratory_view_example/public/app.tsx
@@ -18,10 +18,10 @@ import {
   EuiPageHeaderSection,
   EuiTitle,
 } from '@elastic/eui';
-import { IndexPattern } from 'src/plugins/data/public';
-import { CoreStart } from 'kibana/public';
+import { IndexPattern } from '@kbn/data-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { AllSeries } from '@kbn/observability-plugin/public';
 import { StartDependencies } from './plugin';
-import { AllSeries } from '../../../plugins/observability/public';
 
 export const App = (props: {
   core: CoreStart;
diff --git a/x-pack/examples/exploratory_view_example/public/mount.tsx b/x-pack/examples/exploratory_view_example/public/mount.tsx
index b589db9d531b7..f763621e5ef2f 100644
--- a/x-pack/examples/exploratory_view_example/public/mount.tsx
+++ b/x-pack/examples/exploratory_view_example/public/mount.tsx
@@ -7,12 +7,9 @@
 
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { CoreSetup, AppMountParameters, APP_WRAPPER_CLASS } from '../../../../src/core/public';
+import { CoreSetup, AppMountParameters, APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { StartDependencies } from './plugin';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../src/plugins/kibana_react/public';
 export const mount =
   (coreSetup: CoreSetup<StartDependencies>) =>
   async ({ element }: AppMountParameters) => {
diff --git a/x-pack/examples/exploratory_view_example/public/plugin.ts b/x-pack/examples/exploratory_view_example/public/plugin.ts
index 6b7e2a93918d8..b8fd68e25379c 100644
--- a/x-pack/examples/exploratory_view_example/public/plugin.ts
+++ b/x-pack/examples/exploratory_view_example/public/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { ObservabilityPublicStart } from '../../../plugins/observability/public';
-import type { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ObservabilityPublicStart } from '@kbn/observability-plugin/public';
+import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/reporting_example/common/locator.ts b/x-pack/examples/reporting_example/common/locator.ts
index cbb7c7d110571..17ae845178c81 100644
--- a/x-pack/examples/reporting_example/common/locator.ts
+++ b/x-pack/examples/reporting_example/common/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import type { LocatorDefinition } from '../../../../src/plugins/share/public';
-import { PLUGIN_ID } from '../common';
+import type { LocatorDefinition } from '@kbn/share-plugin/public';
+import { PLUGIN_ID } from '.';
 import type { MyForwardableState } from '../public/types';
 
 export const REPORTING_EXAMPLE_LOCATOR_ID = 'REPORTING_EXAMPLE_LOCATOR_ID';
diff --git a/x-pack/examples/reporting_example/public/application.tsx b/x-pack/examples/reporting_example/public/application.tsx
index c1e18b13ebe5e..24ca76c3c903a 100644
--- a/x-pack/examples/reporting_example/public/application.tsx
+++ b/x-pack/examples/reporting_example/public/application.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Route, Switch } from 'react-router-dom';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { CaptureTest } from './containers/capture_test';
 import { Main } from './containers/main';
 import { ApplicationContextProvider } from './application_context';
diff --git a/x-pack/examples/reporting_example/public/containers/main.tsx b/x-pack/examples/reporting_example/public/containers/main.tsx
index 2a72f0ee71661..b6487c6130812 100644
--- a/x-pack/examples/reporting_example/public/containers/main.tsx
+++ b/x-pack/examples/reporting_example/public/containers/main.tsx
@@ -33,14 +33,14 @@ import React, { useEffect, useState } from 'react';
 import { BrowserRouter as Router, useHistory } from 'react-router-dom';
 import * as Rx from 'rxjs';
 import { takeWhile } from 'rxjs/operators';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 import type {
   JobAppParamsPDF,
   JobParamsPDFV2,
   JobParamsPNGV2,
-} from '../../../../plugins/reporting/common/types';
-import type { ReportingStart } from '../../../../plugins/reporting/public';
-import { LayoutTypes } from '../../../../plugins/screenshotting/public';
+} from '@kbn/reporting-plugin/common/types';
+import type { ReportingStart } from '@kbn/reporting-plugin/public';
+import { LayoutTypes } from '@kbn/screenshotting-plugin/public';
 import { REPORTING_EXAMPLE_LOCATOR_ID } from '../../common';
 import { useApplicationContext } from '../application_context';
 import { ROUTES } from '../constants';
diff --git a/x-pack/examples/reporting_example/public/plugin.ts b/x-pack/examples/reporting_example/public/plugin.ts
index 6ee103fe8286e..9a65b4d67888a 100644
--- a/x-pack/examples/reporting_example/public/plugin.ts
+++ b/x-pack/examples/reporting_example/public/plugin.ts
@@ -11,7 +11,7 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import { PLUGIN_ID, PLUGIN_NAME, ReportingExampleLocatorDefinition } from '../common';
 import { SetupDeps, StartDeps, MyForwardableState } from './types';
 
diff --git a/x-pack/examples/reporting_example/public/types.ts b/x-pack/examples/reporting_example/public/types.ts
index 732de505acf76..9aff6a439ba38 100644
--- a/x-pack/examples/reporting_example/public/types.ts
+++ b/x-pack/examples/reporting_example/public/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
-import { ReportingStart } from '../../../plugins/reporting/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
 import type { MyForwardableState } from '../common';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/examples/screenshotting_example/README.md b/x-pack/examples/screenshotting_example/README.md
new file mode 100755
index 0000000000000..8b1d817fbdf6e
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/README.md
@@ -0,0 +1,13 @@
+# Screenshotting Example
+
+Screenshotting integration example plugin.
+
+This plugin demonstrates the usage of the screenshotting plugin capabilities. The interaction happens on the backend via an API endpoint exposed by the plugin.
+
+The plugin provides a way to input an expression on the front-end side. The expression will be rendered by an internal screenshotting application in Chromium on the backend.
+
+To run this example, use the following command:
+
+```bash
+$ yarn start --run-examples
+```
diff --git a/x-pack/examples/screenshotting_example/common/index.ts b/x-pack/examples/screenshotting_example/common/index.ts
new file mode 100644
index 0000000000000..5a0828196d7f0
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/common/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ScreenshotResult } from '@kbn/screenshotting-plugin/server';
+
+export interface ScreenshottingExpressionResponse {
+  errors?: string[];
+  image?: string;
+  metrics?: ScreenshotResult['metrics'];
+}
+
+export const API_ENDPOINT = '/api/examples/screenshotting/expression';
diff --git a/x-pack/examples/screenshotting_example/kibana.json b/x-pack/examples/screenshotting_example/kibana.json
new file mode 100644
index 0000000000000..82ea3ead70b2e
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/kibana.json
@@ -0,0 +1,19 @@
+{
+  "id": "screenshottingExample",
+  "version": "0.1.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": true,
+  "owner": {
+    "name": "Kibana Reporting Services",
+    "githubTeam": "kibana-reporting-services"
+  },
+  "description": "An example integration with the screenshotting plugin.",
+  "optionalPlugins": [],
+  "requiredPlugins": [
+    "screenshotting",
+    "developerExamples",
+    "kibanaReact",
+    "navigation"
+  ]
+}
diff --git a/x-pack/examples/screenshotting_example/public/app/app.tsx b/x-pack/examples/screenshotting_example/public/app/app.tsx
new file mode 100644
index 0000000000000..24513b7b4b643
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/app/app.tsx
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useCallback, useContext, useState } from 'react';
+import {
+  EuiButton,
+  EuiCallOut,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiImage,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiSpacer,
+  EuiStat,
+  EuiText,
+  EuiTextArea,
+  EuiTitle,
+} from '@elastic/eui';
+import { API_ENDPOINT, ScreenshottingExpressionResponse } from '../../common';
+import { HttpContext } from './http_context';
+
+export function App() {
+  const http = useContext(HttpContext);
+  const [expression, setExpression] = useState<string>();
+  const [loading, setLoading] = useState(false);
+  const [response, setResponse] = useState<ScreenshottingExpressionResponse>();
+
+  const handleClick = useCallback(async () => {
+    try {
+      setLoading(true);
+      setResponse(
+        await http?.get<ScreenshottingExpressionResponse>(API_ENDPOINT, {
+          query: { expression },
+        })
+      );
+    } finally {
+      setLoading(false);
+    }
+  }, [expression, http]);
+  const handleChange = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setExpression(e.target.value);
+  }, []);
+
+  return (
+    <EuiPage>
+      <EuiPageBody style={{ maxWidth: 1200, margin: '0 auto' }}>
+        <EuiPageHeader>
+          <EuiPageHeaderSection>
+            <EuiTitle size="l">
+              <h1>Screenshotting Demo</h1>
+            </EuiTitle>
+          </EuiPageHeaderSection>
+        </EuiPageHeader>
+        <EuiPageContent>
+          <EuiPageContentBody>
+            <EuiText>
+              <p>This example captures a screenshot of an expression provided below.</p>
+            </EuiText>
+            <EuiSpacer size={'m'} />
+            <EuiTextArea
+              placeholder="Expression to render"
+              fullWidth
+              onChange={handleChange}
+              data-test-subj="expression"
+            />
+            <EuiSpacer size={'m'} />
+            <EuiButton
+              iconType="play"
+              onClick={handleClick}
+              isDisabled={!expression}
+              isLoading={loading}
+              data-test-subj="run"
+            >
+              Run
+            </EuiButton>
+            {!!response && <EuiHorizontalRule />}
+            {response?.errors && (
+              <>
+                <EuiCallOut
+                  title="Sorry, there was an error"
+                  color="danger"
+                  iconType="alert"
+                  data-test-subj="error"
+                >
+                  <p>{response.errors.join('\n')}</p>
+                </EuiCallOut>
+                <EuiSpacer size={'m'} />
+              </>
+            )}
+            <EuiFlexGroup justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>
+                {response?.image && (
+                  <EuiImage
+                    src={`data:image/png;base64,${response.image}`}
+                    alt="Screenshot"
+                    size="xl"
+                    allowFullScreen
+                    hasShadow
+                    data-test-subj="image"
+                  />
+                )}
+              </EuiFlexItem>
+              <EuiFlexItem>
+                {response?.metrics && (
+                  <>
+                    <EuiStat
+                      title={`${response.metrics.cpuInPercentage ?? 'N/A'}%`}
+                      description="CPU"
+                      titleColor="primary"
+                      data-test-subj="cpu"
+                    />
+                    <EuiSpacer size={'m'} />
+                    <EuiStat
+                      title={`${response.metrics.memoryInMegabytes ?? 'N/A'} MB`}
+                      description="Memory"
+                      titleColor="primary"
+                      data-test-subj="memory"
+                    />
+                  </>
+                )}
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPageContentBody>
+        </EuiPageContent>
+      </EuiPageBody>
+    </EuiPage>
+  );
+}
diff --git a/x-pack/examples/screenshotting_example/public/app/http_context.ts b/x-pack/examples/screenshotting_example/public/app/http_context.ts
new file mode 100644
index 0000000000000..e33a7bee5c6ce
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/app/http_context.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createContext } from 'react';
+import type { HttpStart } from '@kbn/core/public';
+
+export const HttpContext = createContext<HttpStart | undefined>(undefined);
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/index.ts b/x-pack/examples/screenshotting_example/public/app/index.ts
similarity index 71%
rename from x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/index.ts
rename to x-pack/examples/screenshotting_example/public/app/index.ts
index a06fceab29d4c..67d215f3d81e7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/index.ts
+++ b/x-pack/examples/screenshotting_example/public/app/index.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export * from '../../../state/async_resource_state';
-export * from './trusted_apps_list_page_state';
+export * from './app';
+export * from './http_context';
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/index.ts b/x-pack/examples/screenshotting_example/public/index.ts
similarity index 66%
rename from x-pack/plugins/fleet/server/services/preconfiguration/index.ts
rename to x-pack/examples/screenshotting_example/public/index.ts
index e9ebc473af8f2..2d9a1d5fbb25b 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/index.ts
+++ b/x-pack/examples/screenshotting_example/public/index.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
-export { resetPreconfiguredAgentPolicies } from './reset_agent_policies';
+import { ScreenshottingExamplePlugin } from './plugin';
 
-export { ensurePreconfiguredOutputs } from './outputs';
+export function plugin() {
+  return new ScreenshottingExamplePlugin();
+}
diff --git a/x-pack/examples/screenshotting_example/public/plugin.tsx b/x-pack/examples/screenshotting_example/public/plugin.tsx
new file mode 100644
index 0000000000000..03cb974567dbb
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/plugin.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import type { AppMountParameters, CoreSetup, Plugin } from '@kbn/core/public';
+import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+
+import { App, HttpContext } from './app';
+
+interface SetupDeps {
+  developerExamples: DeveloperExamplesSetup;
+}
+
+const APPLICATION_ID = 'screenshottingExample';
+const APPLICATION_NAME = 'Screenshotting Example';
+
+export class ScreenshottingExamplePlugin implements Plugin<void, void> {
+  setup({ application, getStartServices }: CoreSetup, { developerExamples }: SetupDeps): void {
+    application.register({
+      id: APPLICATION_ID,
+      title: APPLICATION_NAME,
+      navLinkStatus: AppNavLinkStatus.hidden,
+      mount: async ({ element }: AppMountParameters) => {
+        const [{ http }] = await getStartServices();
+
+        ReactDOM.render(
+          <HttpContext.Provider value={http}>
+            <App />
+          </HttpContext.Provider>,
+          element
+        );
+        return () => ReactDOM.unmountComponentAtNode(element);
+      },
+    });
+
+    developerExamples.register({
+      appId: APPLICATION_ID,
+      title: APPLICATION_NAME,
+      description: 'An example integration with the screenshotting plugin.',
+    });
+  }
+
+  start() {}
+}
diff --git a/x-pack/examples/screenshotting_example/server/index.ts b/x-pack/examples/screenshotting_example/server/index.ts
new file mode 100644
index 0000000000000..2d9a1d5fbb25b
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/server/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ScreenshottingExamplePlugin } from './plugin';
+
+export function plugin() {
+  return new ScreenshottingExamplePlugin();
+}
diff --git a/x-pack/examples/screenshotting_example/server/plugin.ts b/x-pack/examples/screenshotting_example/server/plugin.ts
new file mode 100644
index 0000000000000..9ca74c6e16353
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/server/plugin.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { lastValueFrom } from 'rxjs';
+import { schema } from '@kbn/config-schema';
+import type { CoreSetup, Plugin } from '@kbn/core/server';
+import type { ScreenshottingStart } from '@kbn/screenshotting-plugin/server';
+import { API_ENDPOINT, ScreenshottingExpressionResponse } from '../common';
+
+interface StartDeps {
+  screenshotting: ScreenshottingStart;
+}
+
+export class ScreenshottingExamplePlugin implements Plugin<void, void> {
+  setup({ http, getStartServices }: CoreSetup<StartDeps>) {
+    const router = http.createRouter();
+
+    router.get(
+      {
+        path: API_ENDPOINT,
+        validate: {
+          query: schema.object({
+            expression: schema.string(),
+          }),
+        },
+      },
+      async (context, request, response) => {
+        const [, { screenshotting }] = await getStartServices();
+        const { metrics, results } = await lastValueFrom(
+          screenshotting.getScreenshots({
+            request,
+            expression: request.query.expression,
+          })
+        );
+
+        return response.ok({
+          body: JSON.stringify({
+            metrics,
+            image: results[0]?.screenshots[0]?.data.toString('base64'),
+            errors: results[0]?.renderErrors,
+          } as ScreenshottingExpressionResponse),
+        });
+      }
+    );
+  }
+
+  start() {}
+}
diff --git a/x-pack/examples/screenshotting_example/tsconfig.json b/x-pack/examples/screenshotting_example/tsconfig.json
new file mode 100644
index 0000000000000..b28f046f7b94b
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types"
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "common/**/*.ts",
+    "../../../typings/**/*"
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
+    { "path": "../../../src/plugins/navigation/tsconfig.json" },
+    { "path": "../../../src/plugins/screenshot_mode/tsconfig.json" },
+    { "path": "../../../examples/developer_examples/tsconfig.json" },
+    { "path": "../../plugins/screenshotting/tsconfig.json" }
+  ]
+}
diff --git a/x-pack/examples/testing_embedded_lens/public/app.tsx b/x-pack/examples/testing_embedded_lens/public/app.tsx
index ba6e1f8ebcbe9..6df9f25310117 100644
--- a/x-pack/examples/testing_embedded_lens/public/app.tsx
+++ b/x-pack/examples/testing_embedded_lens/public/app.tsx
@@ -17,11 +17,11 @@ import {
   EuiPanel,
   EuiCallOut,
 } from '@elastic/eui';
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import useDebounce from 'react-use/lib/useDebounce';
-import { DOCUMENT_FIELD_NAME } from '../../../plugins/lens/common/constants';
-import type { DataView } from '../../../../src/plugins/data_views/public';
-import { ViewMode } from '../../../../src/plugins/embeddable/public';
+import { DOCUMENT_FIELD_NAME } from '@kbn/lens-plugin/common/constants';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type {
   TypedLensByValueInput,
   PersistedIndexPatternLayer,
@@ -36,14 +36,10 @@ import type {
   RangeIndexPatternColumn,
   PieVisualizationState,
   MedianIndexPatternColumn,
-} from '../../../plugins/lens/public';
+} from '@kbn/lens-plugin/public';
+import type { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { CodeEditor, HJsonLang, KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import type { StartDependencies } from './plugin';
-import type { ActionExecutionContext } from '../../../../src/plugins/ui_actions/public';
-import {
-  CodeEditor,
-  HJsonLang,
-  KibanaContextProvider,
-} from '../../../../src/plugins/kibana_react/public';
 
 type RequiredType = 'date' | 'string' | 'number';
 type FieldsMap = Record<RequiredType, string>;
diff --git a/x-pack/examples/testing_embedded_lens/public/mount.tsx b/x-pack/examples/testing_embedded_lens/public/mount.tsx
index f3739ac9a481d..ee58520c29c3c 100644
--- a/x-pack/examples/testing_embedded_lens/public/mount.tsx
+++ b/x-pack/examples/testing_embedded_lens/public/mount.tsx
@@ -9,9 +9,9 @@ import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { EuiCallOut } from '@elastic/eui';
 
-import type { CoreSetup, AppMountParameters } from 'kibana/public';
+import type { CoreSetup, AppMountParameters } from '@kbn/core/public';
+import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import type { StartDependencies } from './plugin';
-import type { TypedLensByValueInput } from '../../../plugins/lens/public';
 
 export const mount =
   (coreSetup: CoreSetup<StartDependencies>) =>
diff --git a/x-pack/examples/testing_embedded_lens/public/plugin.ts b/x-pack/examples/testing_embedded_lens/public/plugin.ts
index 374f830d0bb2e..5895151ab0797 100644
--- a/x-pack/examples/testing_embedded_lens/public/plugin.ts
+++ b/x-pack/examples/testing_embedded_lens/public/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { LensPublicStart } from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
 import image from './image.png';
 
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts b/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
index b7a7e4ab10c0e..b8f21580b24ab 100644
--- a/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
+++ b/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataViewsPublicPluginStart, DataView } from '../../../../src/plugins/data_views/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
 import {
   DateHistogramIndexPatternColumn,
   IndexPatternPersistedState,
   LensPublicSetup,
   LensPublicStart,
-} from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
-import { TypedLensByValueInput, PersistedIndexPatternLayer } from '../../../plugins/lens/public';
+} from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { TypedLensByValueInput, PersistedIndexPatternLayer } from '@kbn/lens-plugin/public';
 import image from './image.png';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/third_party_vis_lens_example/public/expression.tsx b/x-pack/examples/third_party_vis_lens_example/public/expression.tsx
index 6e38f2e582209..b93a15bbada3f 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/expression.tsx
+++ b/x-pack/examples/third_party_vis_lens_example/public/expression.tsx
@@ -13,9 +13,9 @@ import type {
   ExpressionFunctionDefinition,
   ExpressionRenderDefinition,
   IInterpreterRenderHandlers,
-} from '../../../../src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { RotatingNumberState } from '../common/types';
-import { FormatFactory } from '../../../../src/plugins/field_formats/common';
 
 export const getRotatingNumberRenderer = (
   formatFactory: Promise<FormatFactory>
diff --git a/x-pack/examples/third_party_vis_lens_example/public/plugin.ts b/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
index 9b34972f12b00..123d7ef6367cd 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
+++ b/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataViewsPublicPluginStart, DataView } from '../../../../src/plugins/data_views/public';
-import { LensPublicSetup, LensPublicStart } from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
-import { TypedLensByValueInput, PersistedIndexPatternLayer } from '../../../plugins/lens/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
+import { LensPublicSetup, LensPublicStart } from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { TypedLensByValueInput, PersistedIndexPatternLayer } from '@kbn/lens-plugin/public';
 import { getRotatingNumberRenderer, rotatingNumberFunction } from './expression';
 import { getRotatingNumberVisualization } from './visualization';
 import { RotatingNumberState } from '../common/types';
diff --git a/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx b/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx
index a1796eee9b253..f122d17977f6f 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx
+++ b/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx
@@ -9,12 +9,12 @@ import React from 'react';
 import { EuiFormRow, EuiColorPicker } from '@elastic/eui';
 import { render } from 'react-dom';
 import { Ast } from '@kbn/interpreter';
-import { ThemeServiceStart } from '../../../../src/core/public';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
-import { Visualization, OperationMetadata } from '../../../plugins/lens/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Visualization, OperationMetadata } from '@kbn/lens-plugin/public';
+import { layerTypes } from '@kbn/lens-plugin/public';
 import type { RotatingNumberState } from '../common/types';
 import { DEFAULT_COLOR } from '../common/constants';
-import { layerTypes } from '../../../plugins/lens/public';
 
 const toExpression = (state: RotatingNumberState): Ast | null => {
   if (!state.accessor) {
diff --git a/x-pack/examples/third_party_vis_lens_example/server/index.ts b/x-pack/examples/third_party_vis_lens_example/server/index.ts
index cab22f4ad29c9..cba785e2c3783 100644
--- a/x-pack/examples/third_party_vis_lens_example/server/index.ts
+++ b/x-pack/examples/third_party_vis_lens_example/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { ThirdPartyVisLensExamplePlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new ThirdPartyVisLensExamplePlugin();
diff --git a/x-pack/examples/third_party_vis_lens_example/server/plugin.ts b/x-pack/examples/third_party_vis_lens_example/server/plugin.ts
index b3e99b665c494..ab58781654e5a 100644
--- a/x-pack/examples/third_party_vis_lens_example/server/plugin.ts
+++ b/x-pack/examples/third_party_vis_lens_example/server/plugin.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Plugin, CoreSetup } from 'kibana/server';
-import { LensServerPluginSetup } from '../../../plugins/lens/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { DEFAULT_COLOR } from '../common/constants';
 import { RotatingNumberState as Post81RotatingNumberState } from '../common/types';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx
index 792b978c99241..4ca214aa2cff4 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx
@@ -18,11 +18,8 @@ import {
   EuiFlexItem,
   EuiFlexGroup,
 } from '@elastic/eui';
+import { EmbeddableRoot, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { SampleMlJob, SampleApp1ClickContext } from '../../triggers';
-import {
-  EmbeddableRoot,
-  VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
 import { ButtonEmbeddable } from '../../embeddables/button_embeddable';
 import { useUiActions } from '../../context';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts b/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts
index 597bee10b51d6..bf9b31abd5c12 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts
@@ -6,8 +6,8 @@
  */
 
 import { createContext, useContext } from 'react';
-import { CoreStart } from 'src/core/public';
-import { UiActionsEnhancedDynamicActionManager } from '../../../../plugins/ui_actions_enhanced/public';
+import { CoreStart } from '@kbn/core/public';
+import { UiActionsEnhancedDynamicActionManager } from '@kbn/ui-actions-enhanced-plugin/public';
 import { StartDependencies } from '../plugin';
 
 export interface UiActionsExampleAppContextValue {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx
index 2db7255e607d0..6a405db14fc1d 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiFieldText, EuiFormRow } from '@elastic/eui';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
-import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
+import { CollectConfigProps as CollectConfigPropsBase } from '@kbn/kibana-utils-plugin/public';
 import { SAMPLE_APP1_CLICK_TRIGGER, SampleApp1ClickContext } from '../../triggers';
 
 export interface Config extends SerializableRecord {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
index 1bb911530dc50..3dde2100ddc82 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
@@ -8,9 +8,9 @@
 import {
   DashboardEnhancedAbstractDashboardDrilldown as AbstractDashboardDrilldown,
   DashboardEnhancedAbstractDashboardDrilldownConfig as Config,
-} from '../../../../../plugins/dashboard_enhanced/public';
+} from '@kbn/dashboard-enhanced-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import { SAMPLE_APP1_CLICK_TRIGGER, SampleApp1ClickContext } from '../../triggers';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 
 export const APP1_TO_DASHBOARD_DRILLDOWN = 'APP1_TO_DASHBOARD_DRILLDOWN';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
index daac998872c14..6d6865595fced 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
@@ -8,9 +8,9 @@
 import {
   DashboardEnhancedAbstractDashboardDrilldown as AbstractDashboardDrilldown,
   DashboardEnhancedAbstractDashboardDrilldownConfig as Config,
-} from '../../../../../plugins/dashboard_enhanced/public';
+} from '@kbn/dashboard-enhanced-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import { SAMPLE_APP2_CLICK_TRIGGER, SampleApp2ClickContext } from '../../triggers';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 
 export const APP2_TO_DASHBOARD_DRILLDOWN = 'APP2_TO_DASHBOARD_DRILLDOWN';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx
index 971f50c1efc3a..df61fe6a1344b 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx
@@ -7,14 +7,14 @@
 
 import React from 'react';
 import { EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
 import {
   ChartActionContext,
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/embeddable-plugin/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
 
 export type ActionContext = ChartActionContext;
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx
index c7c50fa6dc433..49081d60cd2de 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx
@@ -7,14 +7,11 @@
 
 import React from 'react';
 import { EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
-import {
-  RangeSelectContext,
-  SELECT_RANGE_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
-import { BaseActionFactoryContext } from '../../../../../plugins/ui_actions_enhanced/public/dynamic_actions';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
+import { RangeSelectContext, SELECT_RANGE_TRIGGER } from '@kbn/embeddable-plugin/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
+import { BaseActionFactoryContext } from '@kbn/ui-actions-enhanced-plugin/public/dynamic_actions';
 
 export type Config = {
   name: string;
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
index 4e0d69084fc3c..2abf5ff0ac7d2 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
@@ -6,16 +6,16 @@
  */
 
 import React from 'react';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
 import { StartDependencies as Start } from '../../plugin';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { StartServicesGetter } from '../../../../../../src/plugins/kibana_utils/public';
 import { ActionContext, Config, CollectConfigProps } from './types';
 import { CollectConfigContainer } from './collect_config_container';
 import { SAMPLE_DASHBOARD_TO_DISCOVER_DRILLDOWN } from './constants';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
 import { txtGoToDiscover } from './i18n';
-import { APPLY_FILTER_TRIGGER } from '../../../../../../src/plugins/data/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
 
 const isOutputWithIndexPatterns = (
   output: unknown
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
index 1047668fd9950..1bfd523d293d9 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
+import { CollectConfigProps as CollectConfigPropsBase } from '@kbn/kibana-utils-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
 
 export type ActionContext = ApplyGlobalFilterActionContext & { embeddable: IEmbeddable };
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts b/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts
index 8f5228c29f59e..df44e9061fc0e 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts
@@ -7,12 +7,8 @@
 
 import { createElement } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AdvancedUiActionsStart } from '../../../../../plugins/ui_actions_enhanced/public';
-import {
-  Embeddable,
-  EmbeddableInput,
-  VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
+import { AdvancedUiActionsStart } from '@kbn/ui-actions-enhanced-plugin/public';
+import { Embeddable, EmbeddableInput, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { ButtonEmbeddableComponent } from './button_embeddable_component';
 
 export const BUTTON_EMBEDDABLE = 'BUTTON_EMBEDDABLE';
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx
index 3fd42488b2839..76708ac558fc8 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { CoreSetup, AppMountParameters } from 'kibana/public';
+import { CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { StartDependencies, UiActionsEnhancedExamplesStart } from './plugin';
 import { UiActionsExampleAppContextValue, context } from './context';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts b/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
index 76cfe32ea9ec3..2c020314d05a3 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
@@ -6,22 +6,26 @@
  */
 
 import { createElement as h } from 'react';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
-import { Plugin, CoreSetup, CoreStart, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { Plugin, CoreSetup, CoreStart, AppNavLinkStatus } from '@kbn/core/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   AdvancedUiActionsSetup,
   AdvancedUiActionsStart,
-} from '../../../../x-pack/plugins/ui_actions_enhanced/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import { DashboardSetup, DashboardStart } from '@kbn/dashboard-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import {
+  UiActionsEnhancedMemoryActionStorage,
+  UiActionsEnhancedDynamicActionManager,
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import { DashboardHelloWorldDrilldown } from './drilldowns/dashboard_hello_world_drilldown';
 import { DashboardToDiscoverDrilldown } from './drilldowns/dashboard_to_discover_drilldown';
 import { App1ToDashboardDrilldown } from './drilldowns/app1_to_dashboard_drilldown';
 import { App1HelloWorldDrilldown } from './drilldowns/app1_hello_world_drilldown';
-import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';
-import { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
-import { DashboardSetup, DashboardStart } from '../../../../src/plugins/dashboard/public';
 import { DashboardHelloWorldOnlyRangeSelectDrilldown } from './drilldowns/dashboard_hello_world_only_range_select_drilldown';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
 import {
   sampleApp1ClickTrigger,
   sampleApp2ClickTrigger,
@@ -30,10 +34,6 @@ import {
   sampleApp2ClickContext,
 } from './triggers';
 import { mount } from './mount';
-import {
-  UiActionsEnhancedMemoryActionStorage,
-  UiActionsEnhancedDynamicActionManager,
-} from '../../../plugins/ui_actions_enhanced/public';
 import { App2ToDashboardDrilldown } from './drilldowns/app2_to_dashboard_drilldown';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts
index 1d277ba1788b8..79ae512c3c818 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Trigger } from '../../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const SAMPLE_APP1_CLICK_TRIGGER = 'SAMPLE_APP1_CLICK_TRIGGER';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts
index 2e4cd9ec4287b..79b1221fd5717 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Trigger } from '../../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const SAMPLE_APP2_CLICK_TRIGGER = 'SAMPLE_APP2_CLICK_TRIGGER';
 
diff --git a/x-pack/package.json b/x-pack/package.json
index 182ee65c1d12e..b5a72343268a8 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -13,7 +13,6 @@
   },
   "kibana": {
     "build": {
-      "intermediateBuildDirectory": "build/plugin/kibana/x-pack",
       "oss": false
     },
     "clean": {
diff --git a/x-pack/plugins/actions/common/types.ts b/x-pack/plugins/actions/common/types.ts
index d31472dd03710..20de64a7cc3b5 100644
--- a/x-pack/plugins/actions/common/types.ts
+++ b/x-pack/plugins/actions/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface ActionType {
   id: string;
diff --git a/x-pack/plugins/actions/server/action_type_registry.test.ts b/x-pack/plugins/actions/server/action_type_registry.test.ts
index 1bb0e76d7226b..760aafbefbba8 100644
--- a/x-pack/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_registry';
 import { ActionType, ExecutorType } from './types';
 import { ActionExecutor, ExecutorError, ILicenseState, TaskRunnerFactory } from './lib';
 import { actionsConfigMock } from './actions_config.mock';
 import { licenseStateMock } from './lib/license_state.mock';
 import { ActionsConfigurationUtilities } from './actions_config';
-import { licensingMock } from '../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
 const mockTaskManager = taskManagerMock.createSetup();
diff --git a/x-pack/plugins/actions/server/action_type_registry.ts b/x-pack/plugins/actions/server/action_type_registry.ts
index 9f8d2dec2128d..00851fcab7398 100644
--- a/x-pack/plugins/actions/server/action_type_registry.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import { RunContext, TaskManagerSetupContract } from '../../task_manager/server';
+import { RunContext, TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { ActionType as CommonActionType } from '../common';
 import { ActionsConfigurationUtilities } from './actions_config';
-import { LicensingPluginSetup } from '../../licensing/server';
 import {
   ExecutorError,
   getActionTypeFeatureUsageName,
diff --git a/x-pack/plugins/actions/server/actions_client.test.ts b/x-pack/plugins/actions/server/actions_client.test.ts
index 41bb5171de405..0b20e7078dd3b 100644
--- a/x-pack/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client.test.ts
@@ -13,19 +13,16 @@ import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_regist
 import { ActionsClient } from './actions_client';
 import { ExecutorType, ActionType } from './types';
 import { ActionExecutor, TaskRunnerFactory, ILicenseState } from './lib';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { actionsConfigMock } from './actions_config.mock';
 import { getActionsConfigurationUtilities } from './actions_config';
 import { licenseStateMock } from './lib/license_state.mock';
-import { licensingMock } from '../../licensing/server/mocks';
-import { httpServerMock, loggingSystemMock } from '../../../../src/core/server/mocks';
-import { auditLoggerMock } from '../../security/server/audit/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-import {
-  elasticsearchServiceMock,
-  savedObjectsClientMock,
-} from '../../../../src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { actionExecutorMock } from './lib/action_executor.mock';
 import uuid from 'uuid';
 import { ActionsAuthorization } from './authorization/actions_authorization';
@@ -36,12 +33,12 @@ import {
 import { actionsAuthorizationMock } from './authorization/actions_authorization.mock';
 import { trackLegacyRBACExemption } from './lib/track_legacy_rbac_exemption';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { Logger } from 'kibana/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { connectorTokenClientMock } from './builtin_action_types/lib/connector_token_client.mock';
 import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
-jest.mock('../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
index 18e67c5ca8076..cafbc6e6bd999 100644
--- a/x-pack/plugins/actions/server/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 import { i18n } from '@kbn/i18n';
 import { omitBy, isUndefined } from 'lodash';
@@ -18,8 +18,9 @@ import {
   SavedObject,
   KibanaRequest,
   SavedObjectsUtils,
-} from '../../../../src/core/server';
-import { AuditLogger } from '../../security/server';
+} from '@kbn/core/server';
+import { AuditLogger } from '@kbn/security-plugin/server';
+import { RunNowResult } from '@kbn/task-manager-plugin/server';
 import { ActionType } from '../common';
 import { ActionTypeRegistry } from './action_type_registry';
 import { validateConfig, validateSecrets, ActionExecutorContract, validateConnector } from './lib';
@@ -43,7 +44,6 @@ import {
   AuthorizationMode,
 } from './authorization/get_authorization_mode_by_source';
 import { connectorAuditEvent, ConnectorAuditAction } from './lib/audit_events';
-import { RunNowResult } from '../../task_manager/server';
 import { trackLegacyRBACExemption } from './lib/track_legacy_rbac_exemption';
 
 // We are assuming there won't be many actions. This is why we will load
diff --git a/x-pack/plugins/actions/server/actions_config.test.ts b/x-pack/plugins/actions/server/actions_config.test.ts
index 217f9593ee6d8..15261da6fd952 100644
--- a/x-pack/plugins/actions/server/actions_config.test.ts
+++ b/x-pack/plugins/actions/server/actions_config.test.ts
@@ -14,8 +14,8 @@ import {
   EnabledActionTypes,
 } from './actions_config';
 import { resolveCustomHosts } from './lib/custom_host_settings';
-import { Logger } from '../../../../src/core/server';
-import { loggingSystemMock } from '../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import moment from 'moment';
 
diff --git a/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts b/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts
index ea469c01decbb..09310c398bc53 100644
--- a/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts
+++ b/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { securityMock } from '../../../../plugins/security/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { ActionsAuthorization } from './actions_authorization';
 import {
   ACTION_SAVED_OBJECT_TYPE,
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
 } from '../constants/saved_objects';
-import { AuthenticatedUser } from '../../../security/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
 import { AuthorizationMode } from './get_authorization_mode_by_source';
 
 const request = {} as KibanaRequest;
diff --git a/x-pack/plugins/actions/server/authorization/actions_authorization.ts b/x-pack/plugins/actions/server/authorization/actions_authorization.ts
index 8f7885b81b284..f09670c216613 100644
--- a/x-pack/plugins/actions/server/authorization/actions_authorization.ts
+++ b/x-pack/plugins/actions/server/authorization/actions_authorization.ts
@@ -6,8 +6,8 @@
  */
 
 import Boom from '@hapi/boom';
-import { KibanaRequest } from 'src/core/server';
-import { SecurityPluginSetup } from '../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   ACTION_SAVED_OBJECT_TYPE,
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts
index c55e457af5ab4..6d882be8705c3 100644
--- a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts
+++ b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts
@@ -9,7 +9,7 @@ import {
   getAuthorizationModeBySource,
   AuthorizationMode,
 } from './get_authorization_mode_by_source';
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import uuid from 'uuid';
 import { asSavedObjectExecutionSource } from '../lib';
 
diff --git a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts
index 659a51df7fbbd..f811c5ddad998 100644
--- a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts
+++ b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { ActionExecutionSource, isSavedObjectExecutionSource } from '../lib';
 import { ALERT_SAVED_OBJECT_TYPE } from '../constants/saved_objects';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
index 456a105a0f081..729e1e8c9ac2f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
@@ -9,7 +9,7 @@ jest.mock('./lib/send_email', () => ({
   sendEmail: jest.fn(),
 }));
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { actionsConfigMock } from '../actions_config.mock';
 import { validateConfig, validateConnector, validateParams, validateSecrets } from '../lib';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.ts b/x-pack/plugins/actions/server/builtin_action_types/email.ts
index ed9509cf98bc6..29c4f9fb595bd 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts
@@ -11,9 +11,9 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import nodemailerGetService from 'nodemailer/lib/well-known';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 
+import { Logger } from '@kbn/core/server';
 import { sendEmail, JSON_TRANSPORT_SERVICE, SendEmailOptions, Transport } from './lib/send_email';
 import { portSchema } from './lib/schemas';
-import { Logger } from '../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
 import { renderMustacheString, renderMustacheObject } from '../lib/mustache_renderer';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
index 7f9aa2298fc14..cca2f8c045d3d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -20,7 +20,7 @@ import {
 } from './es_index';
 import { AlertHistoryEsIndexConnectorId } from '../../common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 const ACTION_TYPE_ID = '.index';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/es_index.ts b/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
index 6ab24293d18ad..2a2ca0504d3ac 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
@@ -8,7 +8,7 @@
 import { curry, find } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { renderMustacheObject } from '../lib/mustache_renderer';
 import { buildAlertHistoryDocument, AlertHistoryEsIndexConnectorId } from '../../common';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
index 12001a472ca49..2465e64179a7b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
@@ -7,13 +7,13 @@
 
 import { ActionExecutor, TaskRunnerFactory } from '../lib';
 import { ActionTypeRegistry } from '../action_type_registry';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
-import { registerBuiltInActionTypes } from './index';
-import { Logger } from '../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { registerBuiltInActionTypes } from '.';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../actions_config.mock';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 
 const ACTION_TYPE_IDS = [
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.ts b/x-pack/plugins/actions/server/builtin_action_types/index.ts
index 5c9c8e784af7e..26ca6b7b1820e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Logger } from '@kbn/core/server';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { ActionsConfigurationUtilities } from '../actions_config';
-import { Logger } from '../../../../../src/core/server';
 
 import { getActionType as getEmailActionType } from './email';
 import { getActionType as getIndexActionType } from './es_index';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts
index a1ad8aae92aa4..b682d069397b8 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceMock, apiParams } from './mocks';
 import { ExternalService } from './types';
 import { api } from './api';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
index c8b107094723f..af94c79e46309 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
@@ -8,6 +8,7 @@
 import { curry } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 
+import { Logger } from '@kbn/core/server';
 import { validate } from './validators';
 import {
   ExternalIncidentServiceConfiguration,
@@ -31,7 +32,6 @@ import {
   ExecutorSubActionGetIncidentParams,
 } from './types';
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ActionParamsType = TypeOf<typeof ExecutorParamsSchema>;
 interface GetActionTypeParams {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
index 1254d86e99066..c62a1f3230e64 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalService } from './service';
 import { request, createAxiosResponse } from '../lib/axios_utils';
 import { ExternalService } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
index a3262a526e2f4..5f5147c67e104 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 import { isEmpty } from 'lodash';
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   CreateCommentParams,
   CreateIncidentParams,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
index 74d53901d55d9..ad504585b6f4b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
@@ -8,6 +8,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import {
   ExternalIncidentServiceConfigurationSchema,
   ExternalIncidentServiceSecretConfigurationSchema,
@@ -22,7 +23,6 @@ import {
   ExecutorSubActionCommonFieldsParamsSchema,
 } from './schema';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { Logger } from '../../../../../../src/core/server';
 
 export type JiraPublicConfigurationType = TypeOf<typeof ExternalIncidentServiceConfigurationSchema>;
 export type JiraSecretConfigurationType = TypeOf<
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
index d0177e0e5a8a2..a172a2b6391e1 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
@@ -9,7 +9,7 @@ import axios from 'axios';
 import { Agent as HttpsAgent } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   addTimeZoneToDate,
   request,
@@ -18,7 +18,7 @@ import {
   throwIfResponseIsNotValid,
   createAxiosResponse,
 } from './axios_utils';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { getCustomAgents } from './get_custom_agents';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
index 43c9d276e6574..a7a9d135f2f2e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
@@ -7,7 +7,7 @@
 
 import { isObjectLike, isEmpty } from 'lodash';
 import { AxiosInstance, Method, AxiosResponse, AxiosBasicCredentials } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getCustomAgents } from './get_custom_agents';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
index 149ac79522f73..d5daa33cbb47c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
@@ -15,9 +15,9 @@ import { schema } from '@kbn/config-schema';
 
 import { request } from './axios_utils';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { createReadySignal } from '../../../../event_log/server/lib/ready_signal';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { createReadySignal } from '@kbn/event-log-plugin/server/lib/ready_signal';
 import { ActionsConfig } from '../../config';
 import {
   ActionsConfigurationUtilities,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts
index 1fa02d172ab36..e3e9f3b362ae9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { ConnectorTokenClient } from './connector_token_client';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ConnectorToken } from '../../types';
 
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
-jest.mock('../../../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts
index b5a91d6e3db69..949ec855ee3f0 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts
@@ -6,13 +6,9 @@
  */
 
 import { omitBy, isUndefined } from 'lodash';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { Logger, SavedObjectsClientContract, SavedObjectsUtils } from '@kbn/core/server';
 import { ConnectorToken } from '../../types';
-import { EncryptedSavedObjectsClient } from '../../../../encrypted_saved_objects/server';
-import {
-  Logger,
-  SavedObjectsClientContract,
-  SavedObjectsUtils,
-} from '../../../../../../src/core/server';
 import { CONNECTOR_TOKEN_SAVED_OBJECT_TYPE } from '../../constants/saved_objects';
 
 export const MAX_TOKENS_RETURNED = 1;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts
index ed6497573a362..d68cc9a5e4398 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts
@@ -10,8 +10,8 @@ jest.mock('jsonwebtoken', () => ({
 }));
 
 import jwt from 'jsonwebtoken';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createJWTAssertion } from './create_jwt_assertion';
 
 const jwtSign = jwt.sign as jest.Mock;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts
index 79230a99a3822..f4723e59b418c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts
@@ -6,7 +6,7 @@
  */
 
 import jwt, { Algorithm } from 'jsonwebtoken';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export interface JWTClaims {
   audience: string;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
index 0c1112da5909f..4d83cce7be1a7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
@@ -8,9 +8,9 @@
 import { Agent as HttpsAgent } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getCustomAgents } from './get_custom_agents';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
index a98622a374bea..2654198828eef 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
@@ -9,7 +9,7 @@ import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent, AgentOptions } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
index 893191b2ca2b4..c31addd53f44b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
index 46e90ec3be697..5892442a1a319 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
@@ -6,8 +6,8 @@
  */
 
 import { PeerCertificate } from 'tls';
+import { Logger } from '@kbn/core/server';
 import { SSLSettings } from '../../types';
-import { Logger } from '../../../../../../src/core/server';
 
 export function getNodeSSLOptions(
   logger: Logger,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts
index 07ab8d4ba260f..374e91890c1e6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts
@@ -6,7 +6,7 @@
  */
 
 import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Services } from '../../types';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts
index 7cd6b105a34ac..fb93ac5ef28ec 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts
@@ -6,7 +6,7 @@
  */
 
 import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts
index a8dbe4ebc0743..95964214dd6b1 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
   create: jest.fn(),
 }));
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { requestOAuthClientCredentialsToken } from './request_oauth_client_credentials_token';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts
index 3acd01be6954f..784e5958803a2 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { OAuthTokenResponse, requestOAuthToken } from './request_oauth_token';
-import { RewriteResponseCase } from '../../../../actions/common';
+import { RewriteResponseCase } from '../../../common';
 
 export const OAUTH_CLIENT_CREDENTIALS_GRANT_TYPE = 'client_credentials';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts
index 9ee510bd991f2..43d4fd7180549 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
   create: jest.fn(),
 }));
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { requestOAuthJWTToken } from './request_oauth_jwt_token';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts
index 91c1d8a999b23..84b31f590413f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { OAuthTokenResponse, requestOAuthToken } from './request_oauth_token';
-import { RewriteResponseCase } from '../../../../actions/common';
+import { RewriteResponseCase } from '../../../common';
 
 // This is a standard for JSON Web Token (JWT) Profile
 // for OAuth 2.0 Client Authentication and Authorization Grants https://datatracker.ietf.org/doc/html/rfc7523#section-8.1
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts
index d8280d2fcdebd..443a9234d7a08 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
   create: jest.fn(),
 }));
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { requestOAuthToken } from './request_oauth_token';
 import { actionsConfigMock } from '../../actions_config.mock';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts
index 6e4fc40ed21be..a7b845a504c83 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts
@@ -8,10 +8,10 @@
 import qs from 'query-string';
 import axios from 'axios';
 import stringify from 'json-stable-stringify';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { AsApiContract } from '../../../../actions/common';
+import { AsApiContract } from '../../../common';
 
 export interface OAuthTokenResponse {
   tokenType: string;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
index c3fc1c8128ffc..65aad21db447e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
@@ -16,9 +16,9 @@ jest.mock('./request_oauth_client_credentials_token', () => ({
   requestOAuthClientCredentialsToken: jest.fn(),
 }));
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { sendEmail } from './send_email';
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import nodemailer from 'nodemailer';
 import { ProxySettings } from '../../types';
 import { actionsConfigMock } from '../../actions_config.mock';
@@ -26,7 +26,7 @@ import { CustomHostSettings } from '../../config';
 import { sendEmailGraphApi } from './send_email_graph_api';
 import { requestOAuthClientCredentialsToken } from './request_oauth_client_credentials_token';
 import { ConnectorTokenClient } from './connector_token_client';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { connectorTokenClientMock } from './connector_token_client.mock';
 
 const createTransportMock = nodemailer.createTransport as jest.Mock;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
index 378edc174e790..a664b22f9df34 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
@@ -9,7 +9,7 @@
 import nodemailer from 'nodemailer';
 import { default as MarkdownIt } from 'markdown-it';
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { CustomHostSettings } from '../../config';
 import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts
index 63cd3523b0026..fc67302b9bb0a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
 }));
 
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { CustomHostSettings } from '../../config';
 import { ProxySettings } from '../../types';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts
index ea1579095bb97..c16cd884cb753 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts
@@ -8,7 +8,7 @@
 // @ts-expect-error missing type def
 import stringify from 'json-stringify-safe';
 import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { SendEmailOptions } from './send_email';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index f6567d6da3713..c3628acc43b2f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -15,7 +15,7 @@ import { Services } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { postPagerduty } from './lib/post_pagerduty';
 import { createActionTypeRegistry } from './index.test';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { actionsConfigMock } from '../actions_config.mock';
 import { actionsMock } from '../mocks';
 import {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
index 4f5cb557d4b93..d9aac7f58108c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -9,8 +9,8 @@ import { curry, isUndefined, pick, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 import moment from 'moment';
+import { Logger } from '@kbn/core/server';
 import { postPagerduty } from './lib/post_pagerduty';
-import { Logger } from '../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts
index 48a66710ba629..c92148b26319a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { api } from './api';
 import { externalServiceMock, apiParams } from './mocks';
 import { ExternalService } from './types';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts
index 528f25da12a47..b036d655feba8 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts
@@ -8,6 +8,7 @@
 import { curry } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 
+import { Logger } from '@kbn/core/server';
 import { validate } from './validators';
 import {
   ExternalIncidentServiceConfiguration,
@@ -29,7 +30,6 @@ import {
   ExecutorSubActionCommonFieldsParams,
 } from './types';
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ActionParamsType = TypeOf<typeof ExecutorParamsSchema>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
index 094b8150850df..e51117c93301c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalService, getValueTextContent, formatUpdateRequest } from './service';
 import { request, createAxiosResponse } from '../lib/axios_utils';
 import { ExternalService } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { incidentTypes, resilientFields, severity } from './mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
index a469c631fac37..acad4707c29fc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 import { omitBy, isNil } from 'lodash/fp';
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   ExternalService,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts
index 640733d5916ce..da37e6c072ac5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts
@@ -8,6 +8,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import {
   ExecutorParamsSchema,
   ExecutorSubActionCommonFieldsParamsSchema,
@@ -21,7 +22,6 @@ import {
 } from './schema';
 
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ResilientPublicConfigurationType = TypeOf<
   typeof ExternalIncidentServiceConfigurationSchema
diff --git a/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts b/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts
index 45fd2048a3bd7..776d412d84143 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { validateParams } from '../lib';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { createActionTypeRegistry } from './index.test';
 import { actionsMock } from '../mocks';
 import {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
index 6c54c1b9f2ff1..5641db63b9811 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
@@ -9,7 +9,7 @@ import { curry } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { Logger, LogMeta } from '../../../../../src/core/server';
+import { Logger, LogMeta } from '@kbn/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { withoutControlCharacters } from './lib/string_utils';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts
index 7969f2e53d3d9..ce7439bc05df5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceMock, apiParams, serviceNowCommonFields, serviceNowChoices } from './mocks';
 import { ExternalService } from './types';
 import { api } from './api';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts
index c918c4a52670a..be10a10dfb819 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceITOMMock, itomEventParams } from './mocks';
 import { ExternalServiceITOM } from './types';
 import { apiITOM, prepareParams } from './api_itom';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
index e5a161611fcb1..0eab1bf7fe089 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceSIRMock, sirParams } from './mocks';
 import { ExternalServiceSIR, ObservableTypes } from './types';
 import { apiSIR, combineObservables, formatObservables, prepareParams } from './api_sir';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
index 1e07cf858f332..e22c65a3694bb 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
@@ -8,6 +8,7 @@
 import { curry } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 
+import { Logger } from '@kbn/core/server';
 import { validate } from './validators';
 import {
   ExternalIncidentServiceConfiguration,
@@ -22,7 +23,6 @@ import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from
 import { createExternalService } from './service';
 import { api as commonAPI } from './api';
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 import {
   ExecutorParams,
   ExecutorSubActionPushParams,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts
index db3eb3b448e6f..c179277956aa9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts
@@ -10,8 +10,8 @@ import axios, { AxiosResponse } from 'axios';
 import { createExternalService } from './service';
 import * as utils from '../lib/axios_utils';
 import { ExternalService, ServiceNowITSMIncident } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { serviceNowCommonFields, serviceNowChoices } from './mocks';
 import { snExternalServiceConfig } from './config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
index 5e657e1890695..8e606ca5f8ef7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
@@ -7,6 +7,7 @@
 
 import axios, { AxiosResponse } from 'axios';
 
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   ExternalService,
@@ -21,7 +22,6 @@ import {
 } from './types';
 
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 import { ServiceNowPublicConfigurationType, ServiceNowSecretConfigurationType } from './types';
 import { request } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts
index a0277be2a0d24..57e7a7506171a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalServiceITOM } from './service_itom';
 import * as utils from '../lib/axios_utils';
 import { ExternalServiceITOM } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { snExternalServiceConfig } from './config';
 import { itomEventParams, serviceNowChoices } from './mocks';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts
index aa135e07dbc64..65c9c70545acc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts
@@ -6,6 +6,7 @@
  */
 import axios from 'axios';
 
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   SNProductsConfigValue,
@@ -14,7 +15,6 @@ import {
   ExecutorSubActionAddEventParams,
 } from './types';
 
-import { Logger } from '../../../../../../src/core/server';
 import { ServiceNowSecretConfigurationType } from './types';
 import { request } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts
index 0fc94b6287abd..cbd47fb2552c7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalServiceSIR } from './service_sir';
 import * as utils from '../lib/axios_utils';
 import { ExternalServiceSIR } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { observables } from './mocks';
 import { snExternalServiceConfig } from './config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts
index 03433f11f9465..41c02a57643e3 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts
@@ -7,6 +7,7 @@
 
 import axios from 'axios';
 
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   SNProductsConfigValue,
@@ -16,7 +17,6 @@ import {
   ServiceFactory,
 } from './types';
 
-import { Logger } from '../../../../../../src/core/server';
 import { ServiceNowSecretConfigurationType } from './types';
 import { request } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts
index 352a0c22c7ec8..270abfed3fb35 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts
@@ -9,6 +9,7 @@
 
 import { AxiosError, AxiosResponse } from 'axios';
 import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import {
   ExecutorParamsSchemaITSM,
   ExecutorSubActionCommonFieldsParamsSchema,
@@ -25,7 +26,6 @@ import {
   ExternalIncidentServiceConfigurationBaseSchema,
 } from './schema';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ServiceNowPublicConfigurationBaseType = TypeOf<
   typeof ExternalIncidentServiceConfigurationBaseSchema
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts
index 3eaf5305d5d26..7d66949d4473f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts
@@ -7,8 +7,8 @@
 
 import { AxiosError } from 'axios';
 
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   prepareIncident,
   createServiceError,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts
index 3bd4864b71e7a..f18d09cdaedb9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Incident, PartialIncident, ResponseError, ServiceNowError } from './types';
 import { FIELD_PREFIX } from './config';
 import { addTimeZoneToDate, getErrorMessage } from '../lib/axios_utils';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index 7953f0ab365e8..bcff352180656 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Services, ActionTypeExecutorResult } from '../types';
 import { validateParams, validateSecrets } from '../lib';
 import { getActionType, SlackActionType, SlackActionTypeExecutorOptions } from './slack';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
index d0fb4a8c4b935..5fce521eb5f09 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -14,7 +14,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { IncomingWebhook, IncomingWebhookResult } from '@slack/webhook';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, getOrElse } from 'fp-ts/lib/Option';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getRetryAfterIntervalFromHeaders } from './lib/http_rersponse_retry_header';
 import { renderMustacheString } from '../lib/mustache_renderer';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
index 21bc4894c5717..9701eff3f0cdc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
@@ -7,8 +7,8 @@
 
 import axios from 'axios';
 
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { Logger } from '../../../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { request, createAxiosResponse } from '../lib/axios_utils';
 import { createExternalService } from './service';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts b/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
index aeb21b81ebc5d..eb4ce4fda4cc6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Services } from '../types';
 import { validateParams, validateSecrets } from '../lib';
 import axios from 'axios';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/teams.ts b/x-pack/plugins/actions/server/builtin_action_types/teams.ts
index ffd42b82c286f..87429344abc01 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/teams.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/teams.ts
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, getOrElse } from 'fp-ts/lib/Option';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getRetryAfterIntervalFromHeaders } from './lib/http_rersponse_retry_header';
 import { isOk, promiseResult, Result } from './lib/result_type';
 import { request } from './lib/axios_utils';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
index 1dbc6b2c6f606..2f68c6465fa18 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -9,7 +9,7 @@ import { Services } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { actionsConfigMock } from '../actions_config.mock';
 import { createActionTypeRegistry } from './index.test';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { actionsMock } from '../mocks';
 import axios from 'axios';
 import {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
index 93c9bbdbab18a..a36b971635e36 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -11,12 +11,12 @@ import axios, { AxiosError, AxiosResponse } from 'axios';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, getOrElse } from 'fp-ts/lib/Option';
+import { Logger } from '@kbn/core/server';
 import { getRetryAfterIntervalFromHeaders } from './lib/http_rersponse_retry_header';
 import { nullableType } from './lib/nullable';
 import { isOk, promiseResult, Result } from './lib/result_type';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
-import { Logger } from '../../../../../src/core/server';
 import { request } from './lib/axios_utils';
 import { renderMustacheString } from '../lib/mustache_renderer';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts b/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts
index 989ab4ff63c9e..1ea95b4bf0b44 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts
@@ -14,7 +14,7 @@ import { validateConfig, validateSecrets, validateParams, validateConnector } fr
 import { postXmatters } from './lib/post_xmatters';
 import { actionsConfigMock } from '../actions_config.mock';
 import { createActionTypeRegistry } from './index.test';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { actionsMock } from '../mocks';
 import {
   ActionParamsType,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts b/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts
index 9158b981c5a8c..670581d25d62d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { curry, isString } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
-import { Logger } from '../../../../../src/core/server';
 import { postXmatters } from './lib/post_xmatters';
 
 export type XmattersActionType = ActionType<
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts
index 6d3647be4b65d..a3cf697be9fcd 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult, SavedObjectsSerializer } from 'kibana/server';
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
-import { spacesMock } from '../../../spaces/server/mocks';
+import type { SavedObjectsFindResult, SavedObjectsSerializer } from '@kbn/core/server';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 import { CleanupTasksOpts, cleanupTasks } from './cleanup_tasks';
-import { TaskInstance } from '../../../task_manager/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 describe('cleanupTasks', () => {
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
index 3009bfe1a277b..e9c3c4e93fc82 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
@@ -10,9 +10,9 @@ import {
   ElasticsearchClient,
   SavedObjectsFindResult,
   SavedObjectsSerializer,
-} from 'kibana/server';
-import { TaskInstance } from '../../../task_manager/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+} from '@kbn/core/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   bulkDelete,
   extractBulkResponseDeleteFailures,
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts
index 3c27a38e818ef..f3baeb420cc31 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts
@@ -8,8 +8,8 @@
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ensureScheduled } from './ensure_scheduled';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('ensureScheduled', () => {
   const logger = loggingSystemMock.create().get();
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts
index 6dc1ce44982c1..d40f1ea15e1f9 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
+import { TaskManagerStartContract, asInterval } from '@kbn/task-manager-plugin/server';
 import { TASK_ID, TASK_TYPE } from './constants';
 import { ActionsConfig } from '../config';
-import { TaskManagerStartContract, asInterval } from '../../../task_manager/server';
 
 export async function ensureScheduled(
   taskManager: TaskManagerStartContract,
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts
index e7ac962251f87..6dd2075f648d9 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/server';
+import { CoreStart } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
-import { spacesMock } from '../../../spaces/server/mocks';
-import { esKuery } from '../../../../../src/plugins/data/server';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
+import { esKuery } from '@kbn/data-plugin/server';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
   savedObjectsServiceMock,
   elasticsearchServiceMock,
-} from '../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { FindAndCleanupTasksOpts, findAndCleanupTasks } from './find_and_cleanup_tasks';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts
index 8d00c952454b3..fc180a47b3e2b 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts
@@ -6,12 +6,12 @@
  */
 
 import { nodeBuilder } from '@kbn/es-query';
-import { Logger, CoreStart } from 'kibana/server';
+import { Logger, CoreStart } from '@kbn/core/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
 import { ActionTypeRegistryContract } from '../types';
 import { cleanupTasks, CleanupTasksResult } from './cleanup_tasks';
-import { TaskInstance } from '../../../task_manager/server';
 
 export interface FindAndCleanupTasksOpts {
   logger: Logger;
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts
index c93cc12b49731..398a5ae324038 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { TransportResult } from '@elastic/elasticsearch';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts
index 7a9b664387ff4..6eee015ebd03d 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult, SavedObjectsSerializer } from 'kibana/server';
+import { SavedObjectsFindResult, SavedObjectsSerializer } from '@kbn/core/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { spaceIdToNamespace } from '../../lib';
-import { TaskInstance } from '../../../../task_manager/server';
-import { SpacesPluginStart } from '../../../../spaces/server';
 
 interface GetRawActionTaskParamsIdFromTaskOpts {
   task: SavedObjectsFindResult<TaskInstance>;
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts
index a12ab16facdcd..55023844befd9 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/server';
+import { CoreStart } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
 import { registerTaskDefinition } from './register_task_definition';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
-import { loggingSystemMock, coreMock } from '../../../../../src/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { TaskRunnerOpts } from './task_runner';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts
index c9a6b486a6463..7b447bc17c2b7 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
 import { TASK_TYPE } from './constants';
 import { taskRunner, TaskRunnerOpts } from './task_runner';
-import { TaskManagerSetupContract } from '../../../task_manager/server';
 
 export function registerTaskDefinition(
   taskManager: TaskManagerSetupContract,
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts
index d465e532b0284..117e53a2c2145 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/server';
+import { CoreStart } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
-import { loggingSystemMock, coreMock } from '../../../../../src/core/server/mocks';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
+import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { taskRunner, TaskRunnerOpts } from './task_runner';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts
index 38eb672238c7f..141247330d4b0 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Logger, CoreStart } from 'kibana/server';
+import { Logger, CoreStart } from '@kbn/core/server';
+import { RunContext, asInterval } from '@kbn/task-manager-plugin/server';
 import { ActionsConfig } from '../config';
-import { RunContext, asInterval } from '../../../task_manager/server';
 import { ActionsPluginsStart } from '../plugin';
 import { ActionTypeRegistryContract } from '../types';
 import { findAndCleanupTasks } from './find_and_cleanup_tasks';
diff --git a/x-pack/plugins/actions/server/config.test.ts b/x-pack/plugins/actions/server/config.test.ts
index 7f3ce5bee6e02..4f39956d910a9 100644
--- a/x-pack/plugins/actions/server/config.test.ts
+++ b/x-pack/plugins/actions/server/config.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { configSchema, ActionsConfig, getValidatedConfig } from './config';
-import { Logger } from '../../../..//src/core/server';
-import { loggingSystemMock } from '../../../..//src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 const mockLogger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts
index cf05ee9a24eec..1f279f20c27c3 100644
--- a/x-pack/plugins/actions/server/config.ts
+++ b/x-pack/plugins/actions/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { Logger } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export enum AllowedHosts {
   Any = '*',
diff --git a/x-pack/plugins/actions/server/constants/plugin.ts b/x-pack/plugins/actions/server/constants/plugin.ts
index cecf56cf22a52..0d9d147275f07 100644
--- a/x-pack/plugins/actions/server/constants/plugin.ts
+++ b/x-pack/plugins/actions/server/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 
 export const PLUGIN = {
   ID: 'actions',
diff --git a/x-pack/plugins/actions/server/create_execute_function.test.ts b/x-pack/plugins/actions/server/create_execute_function.test.ts
index ffbf150119510..a503b1adeb40c 100644
--- a/x-pack/plugins/actions/server/create_execute_function.test.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import uuid from 'uuid';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { createExecutionEnqueuerFunction } from './create_execute_function';
-import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from './action_type_registry.mock';
 import {
   asHttpRequestExecutionSource,
diff --git a/x-pack/plugins/actions/server/create_execute_function.ts b/x-pack/plugins/actions/server/create_execute_function.ts
index 46337441caace..ed5ddcacc5e6e 100644
--- a/x-pack/plugins/actions/server/create_execute_function.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from '../../../../src/core/server';
-import { RunNowResult, TaskManagerStartContract } from '../../task_manager/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { RunNowResult, TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import {
   RawAction,
   ActionTypeRegistryContract,
diff --git a/x-pack/plugins/actions/server/feature.ts b/x-pack/plugins/actions/server/feature.ts
index ecb2e0e0b9ea3..c176e9f261551 100644
--- a/x-pack/plugins/actions/server/feature.ts
+++ b/x-pack/plugins/actions/server/feature.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import {
   ACTION_SAVED_OBJECT_TYPE,
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
   CONNECTOR_TOKEN_SAVED_OBJECT_TYPE,
 } from './constants/saved_objects';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
 
 /**
  * The order of appearance in the feature privilege page
diff --git a/x-pack/plugins/actions/server/index.test.ts b/x-pack/plugins/actions/server/index.test.ts
index fe8cf98a48f43..43f69da15de2f 100644
--- a/x-pack/plugins/actions/server/index.test.ts
+++ b/x-pack/plugins/actions/server/index.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from 'src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.actions';
 const applyStackAlertDeprecations = (settings: Record<string, unknown> = {}) => {
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index 9af6db47d076c..7b5863eabf0a9 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -6,7 +6,7 @@
  */
 import { get } from 'lodash';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { ActionsPlugin } from './plugin';
 import { configSchema, ActionsConfig, CustomHostSettings } from './config';
 import { ActionsClient as ActionsClientClass } from './actions_client';
diff --git a/x-pack/plugins/actions/server/lib/action_execution_source.ts b/x-pack/plugins/actions/server/lib/action_execution_source.ts
index 95ee211c6e9b4..f5e1570dfa4c5 100644
--- a/x-pack/plugins/actions/server/lib/action_execution_source.ts
+++ b/x-pack/plugins/actions/server/lib/action_execution_source.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectReference } from 'src/core/server';
+import { KibanaRequest, SavedObjectReference } from '@kbn/core/server';
 
 export enum ActionExecutionSourceType {
   SAVED_OBJECT = 'SAVED_OBJECT',
diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
index 3d6e49fa13584..881877d74bb9d 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { KibanaRequest } from '../../../../../src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionExecutor } from './action_executor';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { eventLoggerMock } from '../../../event_log/server/mocks';
-import { spacesServiceMock } from '../../../spaces/server/spaces_service/spaces_service.mock';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/mocks';
+import { spacesServiceMock } from '@kbn/spaces-plugin/server/spaces_service/spaces_service.mock';
 import { ActionType } from '../types';
 import { actionsMock, actionsClientMock } from '../mocks';
 import { pick } from 'lodash';
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index 8869ed79dd2a6..fe77b72f47aa3 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -6,9 +6,12 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { Logger, KibanaRequest } from 'src/core/server';
+import { Logger, KibanaRequest } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 import { withSpan } from '@kbn/apm-utils';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
+import { IEventLogger, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import {
   validateParams,
   validateConfig,
@@ -22,10 +25,7 @@ import {
   PreConfiguredAction,
   RawAction,
 } from '../types';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { SpacesServiceStart } from '../../../spaces/server';
 import { EVENT_LOG_ACTIONS } from '../constants/event_log';
-import { IEventLogger, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
 import { ActionsClient } from '../actions_client';
 import { ActionExecutionSource } from './action_execution_source';
 import { RelatedSavedObjects } from './related_saved_objects';
diff --git a/x-pack/plugins/actions/server/lib/action_task_params_utils.ts b/x-pack/plugins/actions/server/lib/action_task_params_utils.ts
index a4b1afb9497dc..4c2d1b4c9dc20 100644
--- a/x-pack/plugins/actions/server/lib/action_task_params_utils.ts
+++ b/x-pack/plugins/actions/server/lib/action_task_params_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectAttribute, SavedObjectReference } from 'src/core/server/types';
+import { SavedObjectAttribute, SavedObjectReference } from '@kbn/core/server/types';
 import { RelatedSavedObjects } from './related_saved_objects';
 
 export const ACTION_REF_NAME = `actionRef`;
diff --git a/x-pack/plugins/actions/server/lib/audit_events.ts b/x-pack/plugins/actions/server/lib/audit_events.ts
index 5231c9bab7c37..2ad012c6e6473 100644
--- a/x-pack/plugins/actions/server/lib/audit_events.ts
+++ b/x-pack/plugins/actions/server/lib/audit_events.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { EcsEventOutcome, EcsEventType } from 'src/core/server';
-import { AuditEvent } from '../../../security/server';
+import type { EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { AuditEvent } from '@kbn/security-plugin/server';
 
 export enum ConnectorAuditAction {
   CREATE = 'connector_create',
diff --git a/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts b/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts
index c6686e97a4c8b..5d556398dc668 100644
--- a/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts
+++ b/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts
@@ -6,7 +6,7 @@
  */
 
 import { set } from 'lodash';
-import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
+import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import { RelatedSavedObjects } from './related_saved_objects';
 
 export type Event = Exclude<IEvent, undefined>;
diff --git a/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts b/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
index 48c9352566118..f4712f74d5e31 100644
--- a/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
+++ b/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
@@ -11,8 +11,8 @@ import { schema, ByteSizeValue } from '@kbn/config-schema';
 import moment from 'moment';
 
 import { ActionsConfig } from '../config';
-import { Logger } from '../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { resolveCustomHosts, getCanonicalCustomHostUrl } from './custom_host_settings';
 
diff --git a/x-pack/plugins/actions/server/lib/custom_host_settings.ts b/x-pack/plugins/actions/server/lib/custom_host_settings.ts
index 0ff8624d42cfe..47b68fc1dc815 100644
--- a/x-pack/plugins/actions/server/lib/custom_host_settings.ts
+++ b/x-pack/plugins/actions/server/lib/custom_host_settings.ts
@@ -7,7 +7,7 @@
 
 import { readFileSync } from 'fs';
 import { cloneDeep } from 'lodash';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfig, CustomHostSettings } from '../config';
 
 type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
diff --git a/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts b/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts
index f101525b5eaa7..2bd3a6aa24576 100644
--- a/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts
+++ b/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/common/types';
 import { ActionType } from '../types';
-import { LICENSE_TYPE } from '../../../licensing/common/types';
 import { ServerLogActionTypeId, IndexActionTypeId } from '../builtin_action_types';
 import { ActionTypeConfig, ActionTypeSecrets, ActionTypeParams } from '../types';
 
diff --git a/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts b/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
index 6344a399012f0..792f22ae5e016 100644
--- a/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
+++ b/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type ActionTypeDisabledReason =
diff --git a/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts b/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
index eec099b211146..8b9ce4c0116c1 100644
--- a/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
+++ b/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type PreconfiguredActionDisabledFrom = 'update' | 'delete';
diff --git a/x-pack/plugins/actions/server/lib/errors/types.ts b/x-pack/plugins/actions/server/lib/errors/types.ts
index c8cd7d6d294f7..2b664da0941e8 100644
--- a/x-pack/plugins/actions/server/lib/errors/types.ts
+++ b/x-pack/plugins/actions/server/lib/errors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory, IKibanaResponse } from '../../../../../../src/core/server';
+import { KibanaResponseFactory, IKibanaResponse } from '@kbn/core/server';
 
 export interface ErrorThatHandlesItsOwnResponse extends Error {
   sendResponse(res: KibanaResponseFactory): IKibanaResponse;
diff --git a/x-pack/plugins/actions/server/lib/license_state.test.ts b/x-pack/plugins/actions/server/lib/license_state.test.ts
index d071bd919467c..de03113d4a1db 100644
--- a/x-pack/plugins/actions/server/lib/license_state.test.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.test.ts
@@ -8,8 +8,8 @@
 import { ActionType } from '../types';
 import { Subject } from 'rxjs';
 import { LicenseState, ILicenseState } from './license_state';
-import { licensingMock } from '../../../licensing/server/mocks';
-import { ILicense } from '../../../licensing/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 describe('checkLicense()', () => {
   const getRawLicense = jest.fn();
diff --git a/x-pack/plugins/actions/server/lib/license_state.ts b/x-pack/plugins/actions/server/lib/license_state.ts
index 04c87b270e933..c863e6a6b7b74 100644
--- a/x-pack/plugins/actions/server/lib/license_state.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.ts
@@ -9,11 +9,11 @@ import { i18n } from '@kbn/i18n';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Observable, Subscription } from 'rxjs';
 import { assertNever } from '@kbn/std';
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { PLUGIN } from '../constants/plugin';
 import { ActionType } from '../types';
 import { ActionTypeDisabledError } from './errors';
-import { LicensingPluginStart } from '../../../licensing/server';
 import { getActionTypeFeatureUsageName } from './get_action_type_feature_usage_name';
 
 export type ILicenseState = PublicMethodsOf<LicenseState>;
diff --git a/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts b/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts
index 8fd13d1375697..b9d87fe96e975 100644
--- a/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts
+++ b/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { validatedRelatedSavedObjects } from './related_saved_objects';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { Logger } from '../../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 
 const loggerMock = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/actions/server/lib/related_saved_objects.ts b/x-pack/plugins/actions/server/lib/related_saved_objects.ts
index 160587a3a9a8b..a4b2f8a1dfdfb 100644
--- a/x-pack/plugins/actions/server/lib/related_saved_objects.ts
+++ b/x-pack/plugins/actions/server/lib/related_saved_objects.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export type RelatedSavedObjects = TypeOf<typeof RelatedSavedObjectsSchema>;
 
diff --git a/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts b/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts
index 826c4e44b2b85..94410c3272e0f 100644
--- a/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts
+++ b/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SpacesPluginStart } from '../../../spaces/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 export function spaceIdToNamespace(spaces?: SpacesPluginStart, spaceId?: string) {
   return spaces && spaceId ? spaces.spacesService.spaceIdToNamespace(spaceId) : undefined;
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
index 2793d82544955..7fd09f2237eac 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -8,13 +8,13 @@
 import sinon from 'sinon';
 import { ExecutorError } from './executor_error';
 import { ActionExecutor } from './action_executor';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerFactory } from './task_runner_factory';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { actionExecutorMock } from './action_executor.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { savedObjectsClientMock, loggingSystemMock, httpServiceMock } from 'src/core/server/mocks';
-import { eventLoggerMock } from '../../../event_log/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock, httpServiceMock } from '@kbn/core/server/mocks';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/mocks';
 import { ActionTypeDisabledError } from './errors';
 import { actionsClientMock } from '../mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
index 221c84664f47e..3c94c243b56a5 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
@@ -9,7 +9,7 @@ import { pick } from 'lodash';
 import type { Request } from '@hapi/hapi';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fromNullable, getOrElse } from 'fp-ts/lib/Option';
-import { addSpaceIdToPath } from '../../../spaces/server';
+import { addSpaceIdToPath } from '@kbn/spaces-plugin/server';
 import {
   Logger,
   SavedObjectsClientContract,
@@ -17,11 +17,11 @@ import {
   SavedObjectReference,
   IBasePath,
   SavedObject,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ActionExecutorContract } from './action_executor';
 import { ExecutorError } from './executor_error';
-import { RunContext } from '../../../task_manager/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
 import {
   ActionTaskParams,
   ActionTypeRegistryContract,
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts
index ffd8e7f17c11f..b9669fb63ae3f 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyRBACExemption } from './track_legacy_rbac_exemption';
 
 describe('trackLegacyRBACExemption', () => {
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts
index 73c859c4cd21e..1103754b85d46 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function trackLegacyRBACExemption(source: string, usageCounter?: UsageCounter) {
   if (usageCounter) {
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts
index f4a1ce07ab985..1c48cdd902111 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyRouteUsage } from './track_legacy_route_usage';
 
 describe('trackLegacyRouteUsage', () => {
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts
index 528a75a0a18bd..2d33322630ef4 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function trackLegacyRouteUsage(route: string, usageCounter?: UsageCounter) {
   if (usageCounter) {
diff --git a/x-pack/plugins/actions/server/mocks.ts b/x-pack/plugins/actions/server/mocks.ts
index bdfdab5124e29..00cca942fe14b 100644
--- a/x-pack/plugins/actions/server/mocks.ts
+++ b/x-pack/plugins/actions/server/mocks.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { actionsClientMock } from './actions_client.mock';
-import { PluginSetupContract, PluginStartContract, renderActionParameterTemplates } from './plugin';
-import { Services } from './types';
 import {
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { actionsClientMock } from './actions_client.mock';
+import { PluginSetupContract, PluginStartContract, renderActionParameterTemplates } from './plugin';
+import { Services } from './types';
 import { actionsAuthorizationMock } from './authorization/actions_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
-import { Logger } from '../../../../src/core/server';
 export { actionsAuthorizationMock };
 export { actionsClientMock };
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
diff --git a/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts b/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts
index 8e888503451a5..705979f022dc4 100644
--- a/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts
+++ b/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('inMemoryMetrics', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts
index 4949f0d443989..488e4b5d20e3a 100644
--- a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from 'src/core/public/mocks';
-import { CoreSetup } from '../../../../../src/core/server';
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { coreMock } from '@kbn/core/public/mocks';
+import { CoreSetup } from '@kbn/core/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerClusterCollector } from './register_cluster_collector';
 import { ActionsPluginsStart } from '../plugin';
 import { ClusterActionsMetric } from './types';
diff --git a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts
index b09b1d99db87e..895eb44bfceec 100644
--- a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import stats from 'stats-lite';
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import {
   IdleTaskWithExpiredRunAt,
   RunningOrClaimingTaskWithExpiredRetryAt,
-} from '../../../task_manager/server';
-import { CoreSetup } from '../../../../../src/core/server';
+} from '@kbn/task-manager-plugin/server';
+import { CoreSetup } from '@kbn/core/server';
 import { ActionsPluginsStart } from '../plugin';
 import { ClusterActionsMetric } from './types';
 
diff --git a/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts b/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts
index 8ec7a3620943a..19fce333ecc3a 100644
--- a/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerNodeCollector } from './register_node_collector';
 import { NodeActionsMetric } from './types';
 import { IN_MEMORY_METRICS } from '.';
diff --git a/x-pack/plugins/actions/server/monitoring/register_node_collector.ts b/x-pack/plugins/actions/server/monitoring/register_node_collector.ts
index 7aab4f274e72a..f2e0473ed63a1 100644
--- a/x-pack/plugins/actions/server/monitoring/register_node_collector.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_node_collector.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
 
 export function registerNodeCollector({
diff --git a/x-pack/plugins/actions/server/monitoring/types.ts b/x-pack/plugins/actions/server/monitoring/types.ts
index 39e6840ded7e3..6ce104118757e 100644
--- a/x-pack/plugins/actions/server/monitoring/types.ts
+++ b/x-pack/plugins/actions/server/monitoring/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MetricResult } from '../../../monitoring_collection/server';
+import { MetricResult } from '@kbn/monitoring-collection-plugin/server';
 
 export type ClusterActionsMetric = MetricResult<{
   overdue: {
diff --git a/x-pack/plugins/actions/server/plugin.test.ts b/x-pack/plugins/actions/server/plugin.test.ts
index 2d854df6a5853..d89a3c96b01b9 100644
--- a/x-pack/plugins/actions/server/plugin.test.ts
+++ b/x-pack/plugins/actions/server/plugin.test.ts
@@ -7,14 +7,14 @@
 
 import moment from 'moment';
 import { schema, ByteSizeValue } from '@kbn/config-schema';
-import { PluginInitializerContext, RequestHandlerContext } from '../../../../src/core/server';
-import { coreMock, httpServerMock } from '../../../../src/core/server/mocks';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
-import { eventLogMock } from '../../event_log/server/mocks';
+import { PluginInitializerContext, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { eventLogMock } from '@kbn/event-log-plugin/server/mocks';
 import { ActionType, ActionsApiRequestHandlerContext } from './types';
 import { ActionsConfig } from './config';
 import {
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
index 2262258c20ef2..ba8757b70b522 100644
--- a/x-pack/plugins/actions/server/plugin.ts
+++ b/x-pack/plugins/actions/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
   PluginInitializerContext,
   Plugin,
@@ -18,18 +18,23 @@ import {
   ElasticsearchServiceStart,
   SavedObjectsClientContract,
   SavedObjectsBulkGetObject,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 
 import {
   EncryptedSavedObjectsClient,
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../encrypted_saved_objects/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
-import { SpacesPluginStart, SpacesPluginSetup } from '../../spaces/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { SecurityPluginSetup } from '../../security/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { SpacesPluginStart, SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { IEventLogger, IEventLogService } from '@kbn/event-log-plugin/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import {
   ensureCleanupFailedExecutionsTaskScheduled,
   registerCleanupFailedExecutionsTaskDefinition,
@@ -65,7 +70,6 @@ import {
 import { getActionsConfigurationUtilities } from './actions_config';
 
 import { defineRoutes } from './routes';
-import { IEventLogger, IEventLogService } from '../../event_log/server';
 import { initializeActionsTelemetry, scheduleActionsTelemetry } from './usage/task';
 import {
   ACTION_SAVED_OBJECT_TYPE,
@@ -89,7 +93,6 @@ import { ACTIONS_FEATURE_ID, AlertHistoryEsIndexConnectorId } from '../common';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER } from './constants/event_log';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
 import { InMemoryMetrics, registerClusterCollector, registerNodeCollector } from './monitoring';
-import { MonitoringCollectionSetup } from '../../monitoring_collection/server';
 
 export interface PluginSetupContract {
   registerType<
@@ -551,6 +554,8 @@ export class ActionsPlugin implements Plugin<PluginSetupContract, PluginStartCon
     return async function actionsRouteHandlerContext(context, request) {
       const [{ savedObjects }, { taskManager, encryptedSavedObjects }] =
         await core.getStartServices();
+      const coreContext = await context.core;
+
       return {
         getActionsClient: () => {
           if (isESOCanEncrypt !== true) {
@@ -566,7 +571,7 @@ export class ActionsPlugin implements Plugin<PluginSetupContract, PluginStartCon
             unsecuredSavedObjectsClient,
             actionTypeRegistry: actionTypeRegistry!,
             defaultKibanaIndex,
-            scopedClusterClient: context.core.elasticsearch.client,
+            scopedClusterClient: coreContext.elasticsearch.client,
             preconfiguredActions,
             request,
             authorization: instantiateAuthorization(request),
diff --git a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts
index 4a7c5908963f6..5c2d7fc370fa3 100644
--- a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts
+++ b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   createAlertHistoryIndexTemplate,
   getAlertHistoryIndexTemplate,
diff --git a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
index 0a1c5037e7f8a..670e3f2953a4e 100644
--- a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
+++ b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ALERT_HISTORY_PREFIX } from '../../../common';
 import mappings from './mappings.json';
 
diff --git a/x-pack/plugins/actions/server/routes/connector_types.test.ts b/x-pack/plugins/actions/server/routes/connector_types.test.ts
index ebbdc703556d5..298c985e4eec9 100644
--- a/x-pack/plugins/actions/server/routes/connector_types.test.ts
+++ b/x-pack/plugins/actions/server/routes/connector_types.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { connectorTypesRoute } from './connector_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
-import { LicenseType } from '../../../../plugins/licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 import { actionsClientMock } from '../mocks';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/connector_types.ts b/x-pack/plugins/actions/server/routes/connector_types.ts
index 9f9ad5b2aea68..b937e56dfa0ac 100644
--- a/x-pack/plugins/actions/server/routes/connector_types.ts
+++ b/x-pack/plugins/actions/server/routes/connector_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { ActionType, BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionsRequestHandlerContext } from '../types';
@@ -31,7 +31,7 @@ export const connectorTypesRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         return res.ok({
           body: rewriteBodyRes(await actionsClient.listTypes()),
         });
diff --git a/x-pack/plugins/actions/server/routes/create.test.ts b/x-pack/plugins/actions/server/routes/create.test.ts
index 51a55309b52ae..5089b7f96286f 100644
--- a/x-pack/plugins/actions/server/routes/create.test.ts
+++ b/x-pack/plugins/actions/server/routes/create.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { createActionRoute } from './create';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 import { omit } from 'lodash';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
index 0c243b6a4eaa9..0dd050c55328e 100644
--- a/x-pack/plugins/actions/server/routes/create.ts
+++ b/x-pack/plugins/actions/server/routes/create.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteRequestCase, RewriteResponseCase } from '../../common';
@@ -51,7 +51,7 @@ export const createActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const action = rewriteBodyReq(req.body);
         return res.ok({
           body: rewriteBodyRes(await actionsClient.create({ action })),
diff --git a/x-pack/plugins/actions/server/routes/delete.test.ts b/x-pack/plugins/actions/server/routes/delete.test.ts
index 438f366e5cb73..160092eb8c101 100644
--- a/x-pack/plugins/actions/server/routes/delete.test.ts
+++ b/x-pack/plugins/actions/server/routes/delete.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { deleteActionRoute } from './delete';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../mocks';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/delete.ts b/x-pack/plugins/actions/server/routes/delete.ts
index 653ce32e69eb0..1537999664ee8 100644
--- a/x-pack/plugins/actions/server/routes/delete.ts
+++ b/x-pack/plugins/actions/server/routes/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH } from '../../common';
 import { ActionsRequestHandlerContext } from '../types';
@@ -29,7 +29,7 @@ export const deleteActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const { id } = req.params;
         await actionsClient.delete({ id });
         return res.noContent();
diff --git a/x-pack/plugins/actions/server/routes/execute.test.ts b/x-pack/plugins/actions/server/routes/execute.test.ts
index 322c9aeb15600..6bcab72fbc869 100644
--- a/x-pack/plugins/actions/server/routes/execute.test.ts
+++ b/x-pack/plugins/actions/server/routes/execute.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { executeActionRoute } from './execute';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { asHttpRequestExecutionSource } from '../lib';
@@ -14,7 +14,7 @@ import { actionsClientMock } from '../actions_client.mock';
 import { ActionTypeExecutorResult } from '../types';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/execute.ts b/x-pack/plugins/actions/server/routes/execute.ts
index 7e8110365e87a..fff947155bec3 100644
--- a/x-pack/plugins/actions/server/routes/execute.ts
+++ b/x-pack/plugins/actions/server/routes/execute.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 
 import { ActionTypeExecutorResult, ActionsRequestHandlerContext } from '../types';
@@ -46,7 +46,7 @@ export const executeActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const { params } = req.body;
         const { id } = req.params;
         const body: ActionTypeExecutorResult<unknown> = await actionsClient.execute({
diff --git a/x-pack/plugins/actions/server/routes/get.test.ts b/x-pack/plugins/actions/server/routes/get.test.ts
index 1107ec243bc01..bf51ccaa4b0e5 100644
--- a/x-pack/plugins/actions/server/routes/get.test.ts
+++ b/x-pack/plugins/actions/server/routes/get.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { getActionRoute } from './get';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/server/routes/get.ts
index 3f4a67c3bfbcd..352670bd5b170 100644
--- a/x-pack/plugins/actions/server/routes/get.ts
+++ b/x-pack/plugins/actions/server/routes/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
@@ -41,7 +41,7 @@ export const getActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const { id } = req.params;
         return res.ok({
           body: rewriteBodyRes(await actionsClient.get({ id })),
diff --git a/x-pack/plugins/actions/server/routes/get_all.test.ts b/x-pack/plugins/actions/server/routes/get_all.test.ts
index 69684457f3dd8..ea65a3bdf4dd1 100644
--- a/x-pack/plugins/actions/server/routes/get_all.test.ts
+++ b/x-pack/plugins/actions/server/routes/get_all.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { getAllActionRoute } from './get_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/get_all.ts b/x-pack/plugins/actions/server/routes/get_all.ts
index 2d3a2727e9663..3710b60ce5101 100644
--- a/x-pack/plugins/actions/server/routes/get_all.ts
+++ b/x-pack/plugins/actions/server/routes/get_all.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionsRequestHandlerContext, FindActionResult } from '../types';
@@ -34,7 +34,7 @@ export const getAllActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const result = await actionsClient.getAll();
         return res.ok({
           body: rewriteBodyRes(result),
diff --git a/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts b/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
index bbcedf18142ef..26048c25ce157 100644
--- a/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
+++ b/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { getWellKnownEmailServiceRoute } from './get_well_known_email_service';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts b/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
index c2b7e23ce0c79..9a74bd7afc90e 100644
--- a/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
+++ b/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import nodemailerGetService from 'nodemailer/lib/well-known';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 import { ILicenseState } from '../lib';
diff --git a/x-pack/plugins/actions/server/routes/index.ts b/x-pack/plugins/actions/server/routes/index.ts
index a6470d366c039..48d87e9d62c58 100644
--- a/x-pack/plugins/actions/server/routes/index.ts
+++ b/x-pack/plugins/actions/server/routes/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../lib';
 import { ActionsRequestHandlerContext } from '../types';
 import { createActionRoute } from './create';
diff --git a/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts b/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts
index c5d0776d6c58b..d31a2bbf9f8d5 100644
--- a/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'kibana/server';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { identity } from 'lodash';
 import type { MethodKeysOf } from '@kbn/utility-types';
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { ActionType } from '../../../common';
 import { ActionsClientMock, actionsClientMock } from '../../actions_client.mock';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/create.test.ts b/x-pack/plugins/actions/server/routes/legacy/create.test.ts
index 9e4ab8272dd6d..a79720c8f21e4 100644
--- a/x-pack/plugins/actions/server/routes/legacy/create.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/create.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { createActionRoute } from './create';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { verifyAccessAndContext } from '../verify_access_and_context';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../verify_access_and_context.ts', () => ({
+jest.mock('../verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/create.ts b/x-pack/plugins/actions/server/routes/legacy/create.ts
index 9713c01905b7f..120a7e5336235 100644
--- a/x-pack/plugins/actions/server/routes/legacy/create.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/create.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ActionsRequestHandlerContext } from '../../types';
 import { ILicenseState } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
@@ -35,7 +35,7 @@ export const createActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const action = req.body;
         trackLegacyRouteUsage('create', usageCounter);
         return res.ok({
diff --git a/x-pack/plugins/actions/server/routes/legacy/delete.test.ts b/x-pack/plugins/actions/server/routes/legacy/delete.test.ts
index 7284d18919716..e16614a57fd04 100644
--- a/x-pack/plugins/actions/server/routes/legacy/delete.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/delete.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { deleteActionRoute } from './delete';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../mocks';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/delete.ts b/x-pack/plugins/actions/server/routes/legacy/delete.ts
index 656ece6f1c6f5..dd5f99aebd974 100644
--- a/x-pack/plugins/actions/server/routes/legacy/delete.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/delete.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
@@ -34,7 +34,7 @@ export const deleteActionRoute = (
       if (!context.actions) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
       }
-      const actionsClient = context.actions.getActionsClient();
+      const actionsClient = (await context.actions).getActionsClient();
       const { id } = req.params;
       trackLegacyRouteUsage('delete', usageCounter);
       try {
diff --git a/x-pack/plugins/actions/server/routes/legacy/execute.test.ts b/x-pack/plugins/actions/server/routes/legacy/execute.test.ts
index 6372d893842d7..1f9e7bb7566da 100644
--- a/x-pack/plugins/actions/server/routes/legacy/execute.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/execute.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { executeActionRoute } from './execute';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { verifyApiAccess, ActionTypeDisabledError, asHttpRequestExecutionSource } from '../../lib';
 import { actionsClientMock } from '../../actions_client.mock';
 import { ActionTypeExecutorResult } from '../../types';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/execute.ts b/x-pack/plugins/actions/server/routes/legacy/execute.ts
index 33174861122d4..e54e5f6c50397 100644
--- a/x-pack/plugins/actions/server/routes/legacy/execute.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/execute.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../../lib';
 
 import { ActionTypeExecutorResult, ActionsRequestHandlerContext } from '../../types';
@@ -43,7 +43,7 @@ export const executeActionRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
       }
 
-      const actionsClient = context.actions.getActionsClient();
+      const actionsClient = (await context.actions).getActionsClient();
       const { params } = req.body;
       const { id } = req.params;
       trackLegacyRouteUsage('execute', usageCounter);
diff --git a/x-pack/plugins/actions/server/routes/legacy/get.test.ts b/x-pack/plugins/actions/server/routes/legacy/get.test.ts
index 91b8e53b64e7d..df3c3822ab08c 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getActionRoute } from './get';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/get.ts b/x-pack/plugins/actions/server/routes/legacy/get.ts
index bd8c1096979e2..f103720233507 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
@@ -34,7 +34,7 @@ export const getActionRoute = (
       if (!context.actions) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
       }
-      const actionsClient = context.actions.getActionsClient();
+      const actionsClient = (await context.actions).getActionsClient();
       const { id } = req.params;
       trackLegacyRouteUsage('get', usageCounter);
       return res.ok({
diff --git a/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts b/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts
index b4c6792f415ea..f7cdb56082a10 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getAllActionRoute } from './get_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/get_all.ts b/x-pack/plugins/actions/server/routes/legacy/get_all.ts
index 6c91c2466d70d..6fc478b04d51f 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get_all.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get_all.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState, verifyApiAccess } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
@@ -27,7 +27,7 @@ export const getAllActionRoute = (
       if (!context.actions) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
       }
-      const actionsClient = context.actions.getActionsClient();
+      const actionsClient = (await context.actions).getActionsClient();
       const result = await actionsClient.getAll();
       trackLegacyRouteUsage('getAll', usageCounter);
       return res.ok({
diff --git a/x-pack/plugins/actions/server/routes/legacy/index.ts b/x-pack/plugins/actions/server/routes/legacy/index.ts
index a974237f0a95d..37ed5efbd99b9 100644
--- a/x-pack/plugins/actions/server/routes/legacy/index.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../../lib';
 import { ActionsRequestHandlerContext } from '../../types';
 import { createActionRoute } from './create';
diff --git a/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts b/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts
index a6536d42f7e8a..3737d507a7bae 100644
--- a/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { listActionTypesRoute } from './list_action_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { LicenseType } from '../../../../../plugins/licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 import { actionsClientMock } from '../../mocks';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts b/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts
index 5ce25826ca5cc..92213c0b9be61 100644
--- a/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState, verifyApiAccess } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
@@ -27,7 +27,7 @@ export const listActionTypesRoute = (
       if (!context.actions) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
       }
-      const actionsClient = context.actions.getActionsClient();
+      const actionsClient = (await context.actions).getActionsClient();
       trackLegacyRouteUsage('listActionTypes', usageCounter);
       return res.ok({
         body: await actionsClient.listTypes(),
diff --git a/x-pack/plugins/actions/server/routes/legacy/update.test.ts b/x-pack/plugins/actions/server/routes/legacy/update.test.ts
index d813b765150c6..d9c956d3fd35c 100644
--- a/x-pack/plugins/actions/server/routes/legacy/update.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/update.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { updateActionRoute } from './update';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess, ActionTypeDisabledError } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/update.ts b/x-pack/plugins/actions/server/routes/legacy/update.ts
index 7ddce9bc799c5..a4e441d5d9846 100644
--- a/x-pack/plugins/actions/server/routes/legacy/update.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/update.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
@@ -41,7 +41,7 @@ export const updateActionRoute = (
       if (!context.actions) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
       }
-      const actionsClient = context.actions.getActionsClient();
+      const actionsClient = (await context.actions).getActionsClient();
       const { id } = req.params;
       const { name, config, secrets } = req.body;
       trackLegacyRouteUsage('update', usageCounter);
diff --git a/x-pack/plugins/actions/server/routes/update.test.ts b/x-pack/plugins/actions/server/routes/update.test.ts
index 653fcba75da95..2856ea6014fd8 100644
--- a/x-pack/plugins/actions/server/routes/update.test.ts
+++ b/x-pack/plugins/actions/server/routes/update.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { updateActionRoute } from './update';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/update.ts b/x-pack/plugins/actions/server/routes/update.ts
index 276ce80751726..a8892c814fc66 100644
--- a/x-pack/plugins/actions/server/routes/update.ts
+++ b/x-pack/plugins/actions/server/routes/update.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
@@ -48,7 +48,7 @@ export const updateActionRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const actionsClient = context.actions.getActionsClient();
+        const actionsClient = (await context.actions).getActionsClient();
         const { id } = req.params;
         const { name, config, secrets } = req.body;
 
diff --git a/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts b/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts
index f13bc7279e346..4b07216172473 100644
--- a/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts
+++ b/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts
@@ -11,7 +11,7 @@ import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('../lib/verify_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/verify_access_and_context.ts b/x-pack/plugins/actions/server/routes/verify_access_and_context.ts
index 3f1fe4b1c229f..304a5bae6765d 100644
--- a/x-pack/plugins/actions/server/routes/verify_access_and_context.ts
+++ b/x-pack/plugins/actions/server/routes/verify_access_and_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { ILicenseState, isErrorThatHandlesItsOwnResponse, verifyApiAccess } from '../lib';
 import { ActionsRequestHandlerContext } from '../types';
 
diff --git a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts
index 6d7fd940612f3..399efe023c3fd 100644
--- a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts
@@ -11,9 +11,9 @@ import {
   isPreconfiguredAction,
 } from './action_task_params_migrations';
 import { ActionTaskParams } from '../types';
-import { SavedObjectReference, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
 const context = migrationMocks.createContext();
 const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
diff --git a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts
index ceb82146a03eb..b0778d680e70e 100644
--- a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts
+++ b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts
@@ -12,10 +12,10 @@ import {
   SavedObjectMigrationFn,
   SavedObjectMigrationContext,
   SavedObjectReference,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import type { IsMigrationNeededPredicate } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ActionTaskParams, PreConfiguredAction } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
-import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
 import { RelatedSavedObjects } from '../lib/related_saved_objects';
 
 interface ActionTaskParamsLogMeta extends LogMeta {
diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
index 6c61d9849c72c..d350e40c1b362 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
@@ -8,9 +8,9 @@
 import uuid from 'uuid';
 import { getActionsMigrations } from './actions_migrations';
 import { RawAction } from '../types';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
 const context = migrationMocks.createContext();
 const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
index 2e5b1b5d916fe..4c113a09b81b5 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
@@ -11,10 +11,10 @@ import {
   SavedObjectUnsanitizedDoc,
   SavedObjectMigrationFn,
   SavedObjectMigrationContext,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import type { IsMigrationNeededPredicate } from '@kbn/encrypted-saved-objects-plugin/server';
 import { RawAction } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
-import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
 
 interface ActionsLogMeta extends LogMeta {
   migrations: { actionDocument: SavedObjectUnsanitizedDoc<RawAction> };
diff --git a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts
index f52cd14382658..58aff2bbe0c9d 100644
--- a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { RawAction } from '../types';
 import { getImportWarnings } from './get_import_warnings';
 
diff --git a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts
index 941d6d0fd6aaa..2c8eef94f9a4d 100644
--- a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts
+++ b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectsImportWarning } from 'kibana/server';
+import { SavedObject, SavedObjectsImportWarning } from '@kbn/core/server';
 import { RawAction } from '../types';
 
 export function getImportWarnings(
diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts
index e0d60cd14834e..27850b6945a21 100644
--- a/x-pack/plugins/actions/server/saved_objects/index.ts
+++ b/x-pack/plugins/actions/server/saved_objects/index.ts
@@ -10,8 +10,9 @@ import type {
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
   SavedObjectsTypeMappingDefinition,
-} from 'kibana/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import { getOldestIdleActionTask } from '@kbn/task-manager-plugin/server';
 import mappings from './mappings.json';
 import { getActionsMigrations } from './actions_migrations';
 import { getActionTaskParamsMigrations } from './action_task_params_migrations';
@@ -24,7 +25,6 @@ import {
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
   CONNECTOR_TOKEN_SAVED_OBJECT_TYPE,
 } from '../constants/saved_objects';
-import { getOldestIdleActionTask } from '../../../task_manager/server';
 
 export function setupSavedObjects(
   savedObjects: SavedObjectsServiceSetup,
diff --git a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts
index 82c1c55cd8020..50ddd0a429649 100644
--- a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts
@@ -7,11 +7,11 @@
 
 import { transformConnectorsForExport } from './transform_connectors_for_export';
 import { ActionTypeRegistry, ActionTypeRegistryOpts } from '../action_type_registry';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../actions_config.mock';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ActionExecutor, TaskRunnerFactory } from '../lib';
 import { registerBuiltInActionTypes } from '../builtin_action_types';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
diff --git a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts
index 050fa20b7fdab..250346f33d4af 100644
--- a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts
+++ b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { validateSecrets } from '../lib';
 import { RawAction, ActionType } from '../types';
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index ec9a194da5f42..9cb4f1aec63e8 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -6,21 +6,22 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { ActionTypeRegistry } from './action_type_registry';
-import { PluginSetupContract, PluginStartContract } from './plugin';
-import { ActionsClient } from './actions_client';
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectAttributes,
   ElasticsearchClient,
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   SavedObjectReference,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { ActionTypeRegistry } from './action_type_registry';
+import { PluginSetupContract, PluginStartContract } from './plugin';
+import { ActionsClient } from './actions_client';
 import { ActionTypeExecutorResult } from '../common';
 import { TaskInfo } from './lib/action_executor';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
+
 export type { ActionTypeExecutorResult } from '../common';
 export type { GetFieldsByIssueTypeResponse as JiraGetFieldsResponse } from './builtin_action_types/jira/types';
 export type { GetCommonFieldsResponse as ServiceNowGetFieldsResponse } from './builtin_action_types/servicenow/types';
@@ -46,9 +47,9 @@ export interface ActionsApiRequestHandlerContext {
   listTypes: ActionTypeRegistry['list'];
 }
 
-export interface ActionsRequestHandlerContext extends RequestHandlerContext {
+export type ActionsRequestHandlerContext = CustomRequestHandlerContext<{
   actions: ActionsApiRequestHandlerContext;
-}
+}>;
 
 export interface ActionsPlugin {
   setup: PluginSetupContract;
@@ -97,6 +98,7 @@ interface ValidatorType<Type> {
 
 export interface ActionValidationService {
   isHostnameAllowed(hostname: string): boolean;
+
   isUriAllowed(uri: string): boolean;
 }
 
@@ -116,11 +118,13 @@ export interface ActionType<
     secrets?: ValidatorType<Secrets>;
     connector?: (config: Config, secrets: Secrets) => string | null;
   };
+
   renderParameterTemplates?(
     params: Params,
     variables: Record<string, unknown>,
     actionId?: string
   ): Params;
+
   executor: ExecutorType<Config, Secrets, Params, ExecutorResultData>;
 }
 
@@ -146,6 +150,7 @@ interface PersistedActionTaskExecutorParams {
   spaceId: string;
   actionTaskParamsId: string;
 }
+
 interface EphemeralActionTaskExecutorParams {
   spaceId: string;
   taskParams: ActionTaskParams;
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
index c389529aa7e82..1d947c8fedfe3 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getExecutionsPerDayCount, getInUseTotalCount, getTotalCount } from './actions_telemetry';
 
 describe('actions telemetry', () => {
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
index 473c440ed37fb..ce3e69139d6e3 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertHistoryEsIndexConnectorId } from '../../common';
 import { ActionResult, PreConfiguredAction } from '../types';
 
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts
index 6288b022e4736..7efc54a5f99d3 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { registerActionsUsageCollector } from './actions_usage_collector';
 import { configSchema, ActionsConfig } from '../config';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 
 const mockTaskManagerStart = taskManagerMock.createStart();
 
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index 3e690d18063d6..1a6b22b0b0ce6 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { get } from 'lodash';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import { ActionsUsage, byServiceProviderTypeSchema, byTypeSchema } from './types';
 import { ActionsConfig } from '../config';
 
diff --git a/x-pack/plugins/actions/server/usage/task.ts b/x-pack/plugins/actions/server/usage/task.ts
index ccc7fa54983cf..5591a817bd598 100644
--- a/x-pack/plugins/actions/server/usage/task.ts
+++ b/x-pack/plugins/actions/server/usage/task.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Logger, CoreSetup } from 'kibana/server';
+import { Logger, CoreSetup } from '@kbn/core/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { PreConfiguredAction } from '../types';
 import { getTotalCount, getInUseTotalCount, getExecutionsPerDayCount } from './actions_telemetry';
 
diff --git a/x-pack/plugins/actions/server/usage/types.ts b/x-pack/plugins/actions/server/usage/types.ts
index 2d041b1ba0d0e..4d9f9c6ef17ff 100644
--- a/x-pack/plugins/actions/server/usage/types.ts
+++ b/x-pack/plugins/actions/server/usage/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface ActionsUsage {
   alert_history_connector_enabled: boolean;
diff --git a/x-pack/plugins/alerting/common/execution_log_types.ts b/x-pack/plugins/alerting/common/execution_log_types.ts
index df74c46ad9b43..4fff1f14ca5bd 100644
--- a/x-pack/plugins/alerting/common/execution_log_types.ts
+++ b/x-pack/plugins/alerting/common/execution_log_types.ts
@@ -12,7 +12,7 @@ export const executionLogSortableColumns = [
   'es_search_duration',
   'schedule_delay',
   'num_triggered_actions',
-  'num_scheduled_actions',
+  'num_generated_actions',
 ] as const;
 
 export type ExecutionLogSortFields = typeof executionLogSortableColumns[number];
@@ -27,7 +27,7 @@ export interface IExecutionLog {
   num_new_alerts: number;
   num_recovered_alerts: number;
   num_triggered_actions: number;
-  num_scheduled_actions: number;
+  num_generated_actions: number;
   num_succeeded_actions: number;
   num_errored_actions: number;
   total_search_duration_ms: number;
diff --git a/x-pack/plugins/alerting/common/rule.ts b/x-pack/plugins/alerting/common/rule.ts
index 9b6b93cc3af17..3d3b66f18a436 100644
--- a/x-pack/plugins/alerting/common/rule.ts
+++ b/x-pack/plugins/alerting/common/rule.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectAttributes,
   SavedObjectsResolveResponse,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { RuleExecutionMetrics } from '.';
 import { RuleNotifyWhenType } from './rule_notify_when_type';
 
@@ -50,7 +50,7 @@ export enum RuleExecutionStatusWarningReasons {
 export interface RuleExecutionStatus {
   status: RuleExecutionStatuses;
   numberOfTriggeredActions?: number;
-  numberOfScheduledActions?: number;
+  numberOfGeneratedActions?: number;
   metrics?: RuleExecutionMetrics;
   lastExecutionDate: Date;
   lastDuration?: number;
diff --git a/x-pack/plugins/alerting/common/rule_task_instance.ts b/x-pack/plugins/alerting/common/rule_task_instance.ts
index 01d97efd57b15..8465222c0ff62 100644
--- a/x-pack/plugins/alerting/common/rule_task_instance.ts
+++ b/x-pack/plugins/alerting/common/rule_task_instance.ts
@@ -24,7 +24,7 @@ const ruleExecutionMetricsSchema = t.partial({
 
 const alertExecutionStore = t.partial({
   numberOfTriggeredActions: t.number,
-  numberOfScheduledActions: t.number,
+  numberOfGeneratedActions: t.number,
   triggeredActionsStatus: t.string,
 });
 
diff --git a/x-pack/plugins/alerting/common/rule_type.ts b/x-pack/plugins/alerting/common/rule_type.ts
index e98a641ba91fd..cce1e6f5e9542 100644
--- a/x-pack/plugins/alerting/common/rule_type.ts
+++ b/x-pack/plugins/alerting/common/rule_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { RecoveredActionGroupId, DefaultActionGroupId } from './builtin_action_groups';
 
 interface ConsumerPrivileges {
diff --git a/x-pack/plugins/alerting/public/alert_api.test.ts b/x-pack/plugins/alerting/public/alert_api.test.ts
index eae4bc72a02e8..2f09643e499e3 100644
--- a/x-pack/plugins/alerting/public/alert_api.test.ts
+++ b/x-pack/plugins/alerting/public/alert_api.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Rule, RuleType } from '../common';
-import { httpServiceMock } from '../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRule, loadRuleType, loadRuleTypes } from './alert_api';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/alerting/public/alert_api.ts b/x-pack/plugins/alerting/public/alert_api.ts
index 93ea8c79bdd34..79d59f9aab54b 100644
--- a/x-pack/plugins/alerting/public/alert_api.ts
+++ b/x-pack/plugins/alerting/public/alert_api.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { BASE_ALERTING_API_PATH, INTERNAL_BASE_ALERTING_API_PATH } from '../common';
 import type { Rule, RuleType } from '../common';
-import { AsApiContract } from '../../actions/common';
 import { transformRule, transformRuleType, ApiRule } from './lib/common_transformations';
 
 export async function loadRuleTypes({ http }: { http: HttpSetup }): Promise<RuleType[]> {
diff --git a/x-pack/plugins/alerting/public/lib/common_transformations.ts b/x-pack/plugins/alerting/public/lib/common_transformations.ts
index 8f1f0c5c72d84..1b306aae0ae2f 100644
--- a/x-pack/plugins/alerting/public/lib/common_transformations.ts
+++ b/x-pack/plugins/alerting/public/lib/common_transformations.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { RuleExecutionStatus, Rule, RuleAction, RuleType } from '../../common';
-import { AsApiContract } from '../../../actions/common';
 
 function transformAction(input: AsApiContract<RuleAction>): RuleAction {
   const { connector_type_id: actionTypeId, ...rest } = input;
diff --git a/x-pack/plugins/alerting/public/plugin.ts b/x-pack/plugins/alerting/public/plugin.ts
index e1d683d74cc9f..57ab4172b4689 100644
--- a/x-pack/plugins/alerting/public/plugin.ts
+++ b/x-pack/plugins/alerting/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, CoreStart } from 'src/core/public';
+import { CoreSetup, Plugin, CoreStart } from '@kbn/core/public';
 
 import { AlertNavigationRegistry, AlertNavigationHandler } from './alert_navigation_registry';
 import { loadRule, loadRuleType } from './alert_api';
diff --git a/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts b/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts
index 254da05c0dd53..f8d61e64c9eaf 100644
--- a/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts
+++ b/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Alert } from './alert';
 import { createAlertFactory } from './create_alert_factory';
 import { getRecoveredAlerts } from '../lib';
diff --git a/x-pack/plugins/alerting/server/alert/create_alert_factory.ts b/x-pack/plugins/alerting/server/alert/create_alert_factory.ts
index ad83b0a416c72..9528273fb28db 100644
--- a/x-pack/plugins/alerting/server/alert/create_alert_factory.ts
+++ b/x-pack/plugins/alerting/server/alert/create_alert_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { AlertInstanceContext, AlertInstanceState } from '../types';
 import { Alert } from './alert';
 import { getRecoveredAlerts } from '../lib';
diff --git a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts
index 4ff92109ab224..0e382c651dc5f 100644
--- a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts
+++ b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts
@@ -7,14 +7,14 @@
 
 import { Request } from '@hapi/hapi';
 import { ruleTypeRegistryMock } from './rule_type_registry.mock';
-import { KibanaRequest } from '../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
-import { securityMock } from '../../security/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import {
   AlertingAuthorizationClientFactory,
   AlertingAuthorizationClientFactoryOpts,
 } from './alerting_authorization_client_factory';
-import { featuresPluginMock } from '../../features/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 
 jest.mock('./authorization/alerting_authorization');
 
diff --git a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts
index 0888f2e7a09f2..3a8a0a072cc16 100644
--- a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts
+++ b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
-import { RuleTypeRegistry } from './types';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../features/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { Space } from '@kbn/spaces-plugin/server';
 import { AlertingAuthorization } from './authorization/alerting_authorization';
-import { Space } from '../../spaces/server';
+import { RuleTypeRegistry } from './types';
 
 export interface AlertingAuthorizationClientFactoryOpts {
   ruleTypeRegistry: RuleTypeRegistry;
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
index 5497394c8db4b..1b102fa1a8f39 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { fromKueryExpression } from '@kbn/es-query';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { securityMock } from '../../../../plugins/security/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import {
   PluginStartContract as FeaturesStartContract,
   KibanaFeature,
-} from '../../../features/server';
-import { featuresPluginMock } from '../../../features/server/mocks';
+} from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import {
   AlertingAuthorization,
   WriteOperations,
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
index f7b154777baa4..b9acfed7dcc65 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
@@ -7,14 +7,14 @@
 
 import Boom from '@hapi/boom';
 import { map, mapValues, fromPairs, has } from 'lodash';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { KueryNode } from '@kbn/es-query';
-import { ALERTS_FEATURE_ID, RuleTypeRegistry } from '../types';
-import { SecurityPluginSetup } from '../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { Space } from '@kbn/spaces-plugin/server';
 import { RegistryRuleType } from '../rule_type_registry';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
-import { Space } from '../../../spaces/server';
+import { ALERTS_FEATURE_ID, RuleTypeRegistry } from '../types';
 import {
   asFiltersByRuleTypeAndConsumer,
   asFiltersBySpaceId,
diff --git a/x-pack/plugins/alerting/server/config.test.ts b/x-pack/plugins/alerting/server/config.test.ts
index b08145219c24b..08ef06921a143 100644
--- a/x-pack/plugins/alerting/server/config.test.ts
+++ b/x-pack/plugins/alerting/server/config.test.ts
@@ -22,17 +22,88 @@ describe('config validation', () => {
         },
         "maxEphemeralActionsPerAlert": 10,
         "rules": Object {
-          "execution": Object {
-            "actions": Object {
-              "max": 100000,
-            },
-          },
           "minimumScheduleInterval": Object {
             "enforce": false,
             "value": "1m",
           },
+          "run": Object {
+            "actions": Object {
+              "max": 100000,
+            },
+          },
         },
       }
     `);
   });
+
+  describe('rules.minimumScheduleInterval.value', () => {
+    test('allows 1d as a value', () => {
+      const config: Record<string, unknown> = {
+        rules: {
+          minimumScheduleInterval: {
+            value: '1d',
+          },
+        },
+      };
+      const validatedConfig = configSchema.validate(config);
+      expect(validatedConfig.rules.minimumScheduleInterval.value).toMatchInlineSnapshot(`"1d"`);
+    });
+
+    test(`doesn't allow 2d as a value`, () => {
+      const config: Record<string, unknown> = {
+        rules: {
+          minimumScheduleInterval: {
+            value: '2d',
+          },
+        },
+      };
+      expect(() => configSchema.validate(config)).toThrowErrorMatchingInlineSnapshot(
+        `"[rules.minimumScheduleInterval.value]: duration cannot exceed one day"`
+      );
+    });
+
+    test(`doesn't allow 25h as a value`, () => {
+      const config: Record<string, unknown> = {
+        rules: {
+          minimumScheduleInterval: {
+            value: '25h',
+          },
+        },
+      };
+      expect(() => configSchema.validate(config)).toThrowErrorMatchingInlineSnapshot(
+        `"[rules.minimumScheduleInterval.value]: duration cannot exceed one day"`
+      );
+    });
+  });
+
+  describe('rules.run.actions.max', () => {
+    test('allows 100000 as a value', () => {
+      const config: Record<string, unknown> = {
+        rules: {
+          run: {
+            actions: {
+              max: 100000,
+            },
+          },
+        },
+      };
+      const validatedConfig = configSchema.validate(config);
+      expect(validatedConfig.rules.run.actions.max).toMatchInlineSnapshot(`100000`);
+    });
+
+    test(`doesn't allow 100001 as a value`, () => {
+      const config: Record<string, unknown> = {
+        rules: {
+          run: {
+            actions: {
+              max: 100001,
+            },
+          },
+        },
+      };
+      expect(() => configSchema.validate(config)).toThrowErrorMatchingInlineSnapshot(
+        `"[rules.run.actions.max]: Value must be equal to or lower than [100000]."`
+      );
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/config.ts b/x-pack/plugins/alerting/server/config.ts
index c727c137aa9a2..64c09a9b4bb09 100644
--- a/x-pack/plugins/alerting/server/config.ts
+++ b/x-pack/plugins/alerting/server/config.ts
@@ -6,8 +6,9 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { validateDurationSchema } from './lib';
+import { validateDurationSchema, parseDuration } from './lib';
 
+const ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
 const ruleTypeSchema = schema.object({
   id: schema.string(),
   timeout: schema.maybe(schema.string({ validate: validateDurationSchema })),
@@ -16,15 +17,25 @@ const ruleTypeSchema = schema.object({
 const rulesSchema = schema.object({
   minimumScheduleInterval: schema.object({
     value: schema.string({
-      validate: validateDurationSchema,
+      validate: (duration: string) => {
+        const validationResult = validateDurationSchema(duration);
+        if (validationResult) {
+          return validationResult;
+        }
+
+        const parsedDurationMs = parseDuration(duration);
+        if (parsedDurationMs > ONE_DAY_IN_MS) {
+          return 'duration cannot exceed one day';
+        }
+      },
       defaultValue: '1m',
     }),
     enforce: schema.boolean({ defaultValue: false }), // if enforce is false, only warnings will be shown
   }),
-  execution: schema.object({
+  run: schema.object({
     timeout: schema.maybe(schema.string({ validate: validateDurationSchema })),
     actions: schema.object({
-      max: schema.number({ defaultValue: 100000 }),
+      max: schema.number({ defaultValue: 100000, max: 100000 }),
     }),
     ruleTypeOverrides: schema.maybe(schema.arrayOf(ruleTypeSchema)),
   }),
diff --git a/x-pack/plugins/alerting/server/constants/plugin.ts b/x-pack/plugins/alerting/server/constants/plugin.ts
index 4c5cc39c1512e..05fd33ebf8dd3 100644
--- a/x-pack/plugins/alerting/server/constants/plugin.ts
+++ b/x-pack/plugins/alerting/server/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 
 export const PLUGIN = {
   ID: 'alerting',
diff --git a/x-pack/plugins/alerting/server/health/get_health.test.ts b/x-pack/plugins/alerting/server/health/get_health.test.ts
index 19d528d44e54f..3715113c84232 100644
--- a/x-pack/plugins/alerting/server/health/get_health.test.ts
+++ b/x-pack/plugins/alerting/server/health/get_health.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  savedObjectsServiceMock,
-} from '../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import { RuleExecutionStatusErrorReasons, HealthStatus } from '../types';
 import { getAlertingHealthStatus, getHealth } from './get_health';
 
diff --git a/x-pack/plugins/alerting/server/health/get_health.ts b/x-pack/plugins/alerting/server/health/get_health.ts
index 2bf554894917d..b101d0187e7e8 100644
--- a/x-pack/plugins/alerting/server/health/get_health.ts
+++ b/x-pack/plugins/alerting/server/health/get_health.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISavedObjectsRepository, SavedObjectsServiceStart } from 'src/core/server';
+import { ISavedObjectsRepository, SavedObjectsServiceStart } from '@kbn/core/server';
 import { AlertsHealth, HealthStatus, RawRule, RuleExecutionStatusErrorReasons } from '../types';
 
 export const getHealth = async (
diff --git a/x-pack/plugins/alerting/server/health/task.ts b/x-pack/plugins/alerting/server/health/task.ts
index 889dafdfa02a1..0c3be1e623a2d 100644
--- a/x-pack/plugins/alerting/server/health/task.ts
+++ b/x-pack/plugins/alerting/server/health/task.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreStart, Logger } from 'kibana/server';
+import { CoreStart, Logger } from '@kbn/core/server';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { AlertingConfig } from '../config';
 import { AlertingPluginsStart } from '../plugin';
 import { HealthStatus } from '../types';
diff --git a/x-pack/plugins/alerting/server/index.ts b/x-pack/plugins/alerting/server/index.ts
index f73fb7f964b25..1ff36f483a211 100644
--- a/x-pack/plugins/alerting/server/index.ts
+++ b/x-pack/plugins/alerting/server/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { RulesClient as RulesClientClass } from './rules_client';
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
 import { AlertingPlugin } from './plugin';
 import { configSchema } from './config';
 import { AlertsConfigType } from './types';
@@ -60,12 +60,8 @@ export const config: PluginConfigDescriptor<AlertsConfigType> = {
       'xpack.alerting.invalidateApiKeysTask.removalDelay',
       { level: 'warning' }
     ),
-    renameFromRoot(
-      'xpack.alerting.defaultRuleTaskTimeout',
-      'xpack.alerting.rules.execution.timeout',
-      {
-        level: 'warning',
-      }
-    ),
+    renameFromRoot('xpack.alerting.defaultRuleTaskTimeout', 'xpack.alerting.rules.run.timeout', {
+      level: 'warning',
+    }),
   ],
 };
diff --git a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts
index 61d9ccfef1e62..85ab0b579e762 100644
--- a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts
+++ b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { markApiKeyForInvalidation } from './mark_api_key_for_invalidation';
 
 describe('markApiKeyForInvalidation', () => {
diff --git a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts
index 72bcc6bcb4556..16bc2cf101102 100644
--- a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts
+++ b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectsClientContract } from 'src/core/server';
+import { Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 export const markApiKeyForInvalidation = async (
   { apiKey }: { apiKey: string | null },
diff --git a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts
index 8b3c6716b1cd3..29161b8336f5e 100644
--- a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts
+++ b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts
@@ -11,14 +11,14 @@ import {
   SavedObjectsFindResponse,
   KibanaRequest,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { InvalidateAPIKeysParams, SecurityPluginStart } from '../../../security/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { InvalidateAPIKeysParams, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { InvalidateAPIKeyResult } from '../rules_client';
 import { AlertingConfig } from '../config';
 import { timePeriodBeforeDate } from '../lib/get_cadence';
diff --git a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts
index b0a46807af5c1..70ec1524fec16 100644
--- a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts
+++ b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts
@@ -7,7 +7,7 @@
 
 import { random, mean } from 'lodash';
 import { SanitizedRule, AlertSummary } from '../types';
-import { IValidatedEvent } from '../../../event_log/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 import { alertSummaryFromEventLog } from './alert_summary_from_event_log';
 
diff --git a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts
index e42a135b3de04..ff9bc776cfb95 100644
--- a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts
+++ b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts
@@ -6,8 +6,8 @@
  */
 
 import { mean } from 'lodash';
+import { IEvent } from '@kbn/event-log-plugin/server';
 import { SanitizedRule, AlertSummary, AlertStatus } from '../types';
-import { IEvent } from '../../../event_log/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 
 const Millis2Nanos = 1000 * 1000;
diff --git a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
index 9c16c3af555c2..51b43793efd45 100644
--- a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
+++ b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { IEvent } from '@kbn/event-log-plugin/server';
 import { AlertInstanceState } from '../types';
-import { IEvent } from '../../../event_log/server';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 
 export type Event = Exclude<IEvent, undefined>;
diff --git a/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts b/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts
index d7c1325b8464d..c95fbb2e0b34c 100644
--- a/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts
+++ b/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export class RuleMutedError extends Error implements ErrorThatHandlesItsOwnResponse {
diff --git a/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts b/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts
index f907436ddf955..387f48fdaefcb 100644
--- a/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts
+++ b/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type RuleTypeDisabledReason =
diff --git a/x-pack/plugins/alerting/server/lib/errors/types.ts b/x-pack/plugins/alerting/server/lib/errors/types.ts
index 1b83526610270..78b114d71c511 100644
--- a/x-pack/plugins/alerting/server/lib/errors/types.ts
+++ b/x-pack/plugins/alerting/server/lib/errors/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaResponseFactory, IKibanaResponse } from '../../../../../../src/core/server';
+import { KibanaResponseFactory, IKibanaResponse } from '@kbn/core/server';
 
 export interface ErrorThatHandlesItsOwnResponse extends Error {
   sendResponse(res: KibanaResponseFactory): IKibanaResponse;
diff --git a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts
index 70cfe4294020f..4665194b7a4cc 100644
--- a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts
+++ b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { formatExecutionErrorsResult } from './format_execution_log_errors';
-import { QueryEventsBySavedObjectResult } from '../../../event_log/server';
+import { QueryEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 
 describe('formatExecutionErrorsResult', () => {
   test('should return empty results if data is undefined', () => {
diff --git a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts
index ef5b931310f6a..34970350b1461 100644
--- a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts
+++ b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { QueryEventsBySavedObjectResult, IValidatedEvent } from '../../../event_log/server';
+import { QueryEventsBySavedObjectResult, IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { IExecutionErrors, IExecutionErrorsResult } from '../../common';
 
 const EXECUTION_UUID_FIELD = 'kibana.alert.rule.execution.uuid';
diff --git a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts
index 80090effca9d1..6927ef86dd47c 100644
--- a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts
+++ b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.test.ts
@@ -83,7 +83,7 @@ describe('getExecutionLogAggregation', () => {
         sort: [{ notsortable: { order: 'asc' } }],
       });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"Invalid sort field \\"notsortable\\" - must be one of [timestamp,execution_duration,total_search_duration,es_search_duration,schedule_delay,num_triggered_actions,num_scheduled_actions]"`
+      `"Invalid sort field \\"notsortable\\" - must be one of [timestamp,execution_duration,total_search_duration,es_search_duration,schedule_delay,num_triggered_actions,num_generated_actions]"`
     );
   });
 
@@ -95,7 +95,7 @@ describe('getExecutionLogAggregation', () => {
         sort: [{ notsortable: { order: 'asc' } }, { timestamp: { order: 'asc' } }],
       });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"Invalid sort field \\"notsortable\\" - must be one of [timestamp,execution_duration,total_search_duration,es_search_duration,schedule_delay,num_triggered_actions,num_scheduled_actions]"`
+      `"Invalid sort field \\"notsortable\\" - must be one of [timestamp,execution_duration,total_search_duration,es_search_duration,schedule_delay,num_triggered_actions,num_generated_actions]"`
     );
   });
 
@@ -211,9 +211,9 @@ describe('getExecutionLogAggregation', () => {
                       field: 'kibana.alert.rule.execution.metrics.number_of_triggered_actions',
                     },
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     max: {
-                      field: 'kibana.alert.rule.execution.metrics.number_of_scheduled_actions',
+                      field: 'kibana.alert.rule.execution.metrics.number_of_generated_actions',
                     },
                   },
                   executionDuration: { max: { field: 'event.duration' } },
@@ -298,7 +298,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -383,7 +383,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -463,7 +463,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 0,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -482,7 +482,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 5,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -532,7 +532,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -620,7 +620,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -700,7 +700,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 0,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -719,7 +719,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 5,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -769,7 +769,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 0.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 0.0,
                   },
                   outcomeAndMessage: {
@@ -849,7 +849,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -929,7 +929,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 0,
           num_recovered_alerts: 0,
           num_triggered_actions: 0,
-          num_scheduled_actions: 0,
+          num_generated_actions: 0,
           num_succeeded_actions: 0,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -948,7 +948,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 5,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -998,7 +998,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -1083,7 +1083,7 @@ describe('formatExecutionLogResult', () => {
                   numTriggeredActions: {
                     value: 5.0,
                   },
-                  numScheduledActions: {
+                  numGeneratedActions: {
                     value: 5.0,
                   },
                   outcomeAndMessage: {
@@ -1163,7 +1163,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 5,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 0,
           num_errored_actions: 5,
           total_search_duration_ms: 0,
@@ -1182,7 +1182,7 @@ describe('formatExecutionLogResult', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 5,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
diff --git a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts
index fbe72508dab2b..03e1077b02eda 100644
--- a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts
+++ b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts
@@ -8,8 +8,8 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import Boom from '@hapi/boom';
 import { flatMap, get } from 'lodash';
+import { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 import { parseDuration } from '.';
-import { AggregateEventsBySavedObjectResult } from '../../../event_log/server';
 import { IExecutionLog, IExecutionLogResult } from '../../common';
 
 const DEFAULT_MAX_BUCKETS_LIMIT = 1000; // do not retrieve more than this number of executions
@@ -26,8 +26,8 @@ const ES_SEARCH_DURATION_FIELD = 'kibana.alert.rule.execution.metrics.es_search_
 const TOTAL_SEARCH_DURATION_FIELD = 'kibana.alert.rule.execution.metrics.total_search_duration_ms';
 const NUMBER_OF_TRIGGERED_ACTIONS_FIELD =
   'kibana.alert.rule.execution.metrics.number_of_triggered_actions';
-const NUMBER_OF_SCHEDULED_ACTIONS_FIELD =
-  'kibana.alert.rule.execution.metrics.number_of_scheduled_actions';
+const NUMBER_OF_GENERATED_ACTIONS_FIELD =
+  'kibana.alert.rule.execution.metrics.number_of_generated_actions';
 const EXECUTION_UUID_FIELD = 'kibana.alert.rule.execution.uuid';
 
 const Millis2Nanos = 1000 * 1000;
@@ -59,7 +59,7 @@ interface IExecutionUuidAggBucket extends estypes.AggregationsStringTermsBucketK
     esSearchDuration: estypes.AggregationsMaxAggregate;
     totalSearchDuration: estypes.AggregationsMaxAggregate;
     numTriggeredActions: estypes.AggregationsMaxAggregate;
-    numScheduledActions: estypes.AggregationsMaxAggregate;
+    numGeneratedActions: estypes.AggregationsMaxAggregate;
     outcomeAndMessage: estypes.AggregationsTopHitsAggregate;
   };
   alertCounts: IAlertCounts;
@@ -90,7 +90,7 @@ const ExecutionLogSortFields: Record<string, string> = {
   es_search_duration: 'ruleExecution>esSearchDuration',
   schedule_delay: 'ruleExecution>scheduleDelay',
   num_triggered_actions: 'ruleExecution>numTriggeredActions',
-  num_scheduled_actions: 'ruleExecution>numScheduledActions',
+  num_generated_actions: 'ruleExecution>numGeneratedActions',
 };
 
 export function getExecutionLogAggregation({ page, perPage, sort }: IExecutionLogAggOptions) {
@@ -204,9 +204,9 @@ export function getExecutionLogAggregation({ page, perPage, sort }: IExecutionLo
                     field: NUMBER_OF_TRIGGERED_ACTIONS_FIELD,
                   },
                 },
-                numScheduledActions: {
+                numGeneratedActions: {
                   max: {
-                    field: NUMBER_OF_SCHEDULED_ACTIONS_FIELD,
+                    field: NUMBER_OF_GENERATED_ACTIONS_FIELD,
                   },
                 },
                 executionDuration: {
@@ -285,7 +285,7 @@ function formatExecutionLogAggBucket(bucket: IExecutionUuidAggBucket): IExecutio
     num_new_alerts: bucket?.alertCounts?.buckets?.newAlerts?.doc_count ?? 0,
     num_recovered_alerts: bucket?.alertCounts?.buckets?.recoveredAlerts?.doc_count ?? 0,
     num_triggered_actions: bucket?.ruleExecution?.numTriggeredActions?.value ?? 0,
-    num_scheduled_actions: bucket?.ruleExecution?.numScheduledActions?.value ?? 0,
+    num_generated_actions: bucket?.ruleExecution?.numGeneratedActions?.value ?? 0,
     num_succeeded_actions: actionExecutionSuccess,
     num_errored_actions: actionExecutionError,
     total_search_duration_ms: bucket?.ruleExecution?.totalSearchDuration?.value ?? 0,
diff --git a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts
index 6a41d5068682d..9336c380c1742 100644
--- a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts
@@ -14,7 +14,7 @@ const config = {
     value: '2m',
     enforce: false,
   },
-  execution: {
+  run: {
     timeout: '1m',
     actions: { max: 1000 },
   },
@@ -22,8 +22,8 @@ const config = {
 
 const configWithRuleType = {
   ...config,
-  execution: {
-    ...config.execution,
+  run: {
+    ...config.run,
     ruleTypeOverrides: [
       {
         id: ruleTypeId,
@@ -35,7 +35,7 @@ const configWithRuleType = {
 
 const configWithoutTimeout = {
   ...config,
-  execution: {
+  run: {
     actions: { max: 1000 },
   },
 };
diff --git a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts
index abb6c6e971711..e6721d65e309f 100644
--- a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts
@@ -18,7 +18,7 @@ export const getRuleTaskTimeout = ({
   ruleTaskTimeout?: string;
   ruleTypeId: string;
 }): string => {
-  const ruleTypeConfig = config.execution.ruleTypeOverrides?.find(
+  const ruleTypeConfig = config.run.ruleTypeOverrides?.find(
     (ruleType) => ruleTypeId === ruleType.id
   );
 
@@ -27,9 +27,6 @@ export const getRuleTaskTimeout = ({
   // if not, ruleTaskTimeout is applied that is passed from the rule type registering plugin
   // if none of above is set, DEFAULT_EXECUTION_TIMEOUT is applied
   return (
-    ruleTypeConfig?.timeout ||
-    config.execution.timeout ||
-    ruleTaskTimeout ||
-    DEFAULT_EXECUTION_TIMEOUT
+    ruleTypeConfig?.timeout || config.run.timeout || ruleTaskTimeout || DEFAULT_EXECUTION_TIMEOUT
   );
 };
diff --git a/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts b/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts
index e8956bd065038..e6477945eebda 100644
--- a/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts
@@ -14,7 +14,7 @@ const config = {
     value: '2m',
     enforce: false,
   },
-  execution: {
+  run: {
     timeout: '1m',
     actions: { max: 1000 },
   },
@@ -22,8 +22,8 @@ const config = {
 
 const configWithRuleType = {
   ...config,
-  execution: {
-    ...config.execution,
+  run: {
+    ...config.run,
     ruleTypeOverrides: [
       {
         id: ruleTypeId,
@@ -36,7 +36,7 @@ const configWithRuleType = {
 describe('get rules config', () => {
   test('returns the rule type specific config and keeps the default values that are not overwritten', () => {
     expect(getExecutionConfigForRuleType({ config: configWithRuleType, ruleTypeId })).toEqual({
-      execution: {
+      run: {
         id: ruleTypeId,
         timeout: '1m',
         actions: { max: 20 },
@@ -46,7 +46,7 @@ describe('get rules config', () => {
 
   test('returns the default config when there is no rule type specific config', () => {
     expect(getExecutionConfigForRuleType({ config, ruleTypeId })).toEqual({
-      execution: config.execution,
+      run: config.run,
     });
   });
 });
diff --git a/x-pack/plugins/alerting/server/lib/get_rules_config.ts b/x-pack/plugins/alerting/server/lib/get_rules_config.ts
index 12f75254a5656..14d3bdc36285f 100644
--- a/x-pack/plugins/alerting/server/lib/get_rules_config.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rules_config.ts
@@ -15,13 +15,13 @@ export const getExecutionConfigForRuleType = ({
   config: RulesConfig;
   ruleTypeId: string;
 }): RuleTypeConfig => {
-  const ruleTypeExecutionConfig = config.execution.ruleTypeOverrides?.find(
+  const ruleTypeExecutionConfig = config.run.ruleTypeOverrides?.find(
     (ruleType) => ruleType.id === ruleTypeId
   );
 
   return {
-    execution: {
-      ...omit(config.execution, 'ruleTypeOverrides'),
+    run: {
+      ...omit(config.run, 'ruleTypeOverrides'),
       ...ruleTypeExecutionConfig,
     },
   };
diff --git a/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts b/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts
index 214b95c5ef50c..4413941dfc293 100644
--- a/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts
+++ b/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts
@@ -7,7 +7,7 @@
 
 import { isAlertSavedObjectNotFoundError, isEsUnavailableError } from './is_alerting_error';
 import { ErrorWithReason } from './error_with_reason';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import uuid from 'uuid';
 import { RuleExecutionStatusErrorReasons } from '../types';
 
diff --git a/x-pack/plugins/alerting/server/lib/is_alerting_error.ts b/x-pack/plugins/alerting/server/lib/is_alerting_error.ts
index abd6ac64bf8b7..5759909712d41 100644
--- a/x-pack/plugins/alerting/server/lib/is_alerting_error.ts
+++ b/x-pack/plugins/alerting/server/lib/is_alerting_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { isErrorWithReason } from './error_with_reason';
 
 export function isAlertSavedObjectNotFoundError(err: Error, ruleId: string) {
diff --git a/x-pack/plugins/alerting/server/lib/license_state.test.ts b/x-pack/plugins/alerting/server/lib/license_state.test.ts
index 0a261c7248484..535033851b3e0 100644
--- a/x-pack/plugins/alerting/server/lib/license_state.test.ts
+++ b/x-pack/plugins/alerting/server/lib/license_state.test.ts
@@ -8,8 +8,8 @@
 import { RuleType } from '../types';
 import { Subject } from 'rxjs';
 import { LicenseState, ILicenseState } from './license_state';
-import { licensingMock } from '../../../licensing/server/mocks';
-import { ILicense } from '../../../licensing/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 describe('checkLicense()', () => {
   const getRawLicense = jest.fn();
diff --git a/x-pack/plugins/alerting/server/lib/license_state.ts b/x-pack/plugins/alerting/server/lib/license_state.ts
index 340d608002fc5..6e422c802c5e3 100644
--- a/x-pack/plugins/alerting/server/lib/license_state.ts
+++ b/x-pack/plugins/alerting/server/lib/license_state.ts
@@ -11,8 +11,8 @@ import type { PublicMethodsOf } from '@kbn/utility-types';
 import { assertNever } from '@kbn/std';
 import { capitalize } from 'lodash';
 import { Observable, Subscription } from 'rxjs';
-import { LicensingPluginStart } from '../../../licensing/server';
-import { ILicense, LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 import { PLUGIN } from '../constants/plugin';
 import { getRuleTypeFeatureUsageName } from './get_rule_type_feature_usage_name';
 import {
diff --git a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts
index abcc0407c54d0..8cce79e22fe88 100644
--- a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts
+++ b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { retryIfConflicts, RetryForConflictsAttempts } from './retry_if_conflicts';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('retry_if_conflicts', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts
index 068a28bc54453..8b7a3b5f76c8a 100644
--- a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts
+++ b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts
@@ -11,7 +11,7 @@
 // have the caller make explicit conflict checks, where the conflict was
 // caused by a background update.
 
-import { Logger, SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { Logger, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 type RetryableForConflicts<T> = () => Promise<T>;
 
diff --git a/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts b/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts
index ff43f4ffac8a9..19da38e283a11 100644
--- a/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts
+++ b/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   RuleExecutionStatusErrorReasons,
   RuleExecutionStatusWarningReasons,
@@ -34,13 +34,13 @@ describe('RuleExecutionStatus', () => {
       const status = executionStatusFromState({
         alertExecutionStore: {
           numberOfTriggeredActions: 0,
-          numberOfScheduledActions: 0,
+          numberOfGeneratedActions: 0,
           triggeredActionsStatus: ActionsCompletion.COMPLETE,
         },
       } as RuleExecutionState);
       checkDateIsNearNow(status.lastExecutionDate);
       expect(status.numberOfTriggeredActions).toBe(0);
-      expect(status.numberOfScheduledActions).toBe(0);
+      expect(status.numberOfGeneratedActions).toBe(0);
       expect(status.status).toBe('ok');
       expect(status.error).toBe(undefined);
       expect(status.warning).toBe(undefined);
@@ -51,14 +51,14 @@ describe('RuleExecutionStatus', () => {
         alertInstances: {},
         alertExecutionStore: {
           numberOfTriggeredActions: 0,
-          numberOfScheduledActions: 0,
+          numberOfGeneratedActions: 0,
           triggeredActionsStatus: ActionsCompletion.COMPLETE,
         },
         metrics,
       });
       checkDateIsNearNow(status.lastExecutionDate);
       expect(status.numberOfTriggeredActions).toBe(0);
-      expect(status.numberOfScheduledActions).toBe(0);
+      expect(status.numberOfGeneratedActions).toBe(0);
       expect(status.status).toBe('ok');
       expect(status.error).toBe(undefined);
       expect(status.warning).toBe(undefined);
@@ -70,14 +70,14 @@ describe('RuleExecutionStatus', () => {
         alertInstances: { a: {} },
         alertExecutionStore: {
           numberOfTriggeredActions: 0,
-          numberOfScheduledActions: 0,
+          numberOfGeneratedActions: 0,
           triggeredActionsStatus: ActionsCompletion.COMPLETE,
         },
         metrics,
       });
       checkDateIsNearNow(status.lastExecutionDate);
       expect(status.numberOfTriggeredActions).toBe(0);
-      expect(status.numberOfScheduledActions).toBe(0);
+      expect(status.numberOfGeneratedActions).toBe(0);
       expect(status.status).toBe('active');
       expect(status.error).toBe(undefined);
       expect(status.warning).toBe(undefined);
@@ -88,7 +88,7 @@ describe('RuleExecutionStatus', () => {
       const status = executionStatusFromState({
         alertExecutionStore: {
           numberOfTriggeredActions: 1,
-          numberOfScheduledActions: 2,
+          numberOfGeneratedActions: 2,
           triggeredActionsStatus: ActionsCompletion.COMPLETE,
         },
         alertInstances: { a: {} },
@@ -96,7 +96,7 @@ describe('RuleExecutionStatus', () => {
       });
       checkDateIsNearNow(status.lastExecutionDate);
       expect(status.numberOfTriggeredActions).toBe(1);
-      expect(status.numberOfScheduledActions).toBe(2);
+      expect(status.numberOfGeneratedActions).toBe(2);
       expect(status.status).toBe('active');
       expect(status.error).toBe(undefined);
       expect(status.warning).toBe(undefined);
diff --git a/x-pack/plugins/alerting/server/lib/rule_execution_status.ts b/x-pack/plugins/alerting/server/lib/rule_execution_status.ts
index a87aed321b16b..f4161022e9544 100644
--- a/x-pack/plugins/alerting/server/lib/rule_execution_status.ts
+++ b/x-pack/plugins/alerting/server/lib/rule_execution_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   RuleExecutionStatus,
   RuleExecutionStatusValues,
@@ -35,7 +35,7 @@ export function executionStatusFromState(state: RuleExecutionState): RuleExecuti
   return {
     metrics: state.metrics,
     numberOfTriggeredActions: state.alertExecutionStore.numberOfTriggeredActions,
-    numberOfScheduledActions: state.alertExecutionStore.numberOfScheduledActions,
+    numberOfGeneratedActions: state.alertExecutionStore.numberOfGeneratedActions,
     lastExecutionDate: new Date(),
     status,
     ...(hasIncompleteAlertExecution && {
diff --git a/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.test.ts b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.test.ts
new file mode 100644
index 0000000000000..3ea70a2992c16
--- /dev/null
+++ b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
+import { trackDeprecatedRouteUsage } from './track_deprecated_route_usage';
+
+describe('trackDeprecatedRouteUsage', () => {
+  it('should call `usageCounter.incrementCounter`', () => {
+    const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
+    const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
+
+    trackDeprecatedRouteUsage('test', mockUsageCounter);
+    expect(mockUsageCounter.incrementCounter).toHaveBeenCalledWith({
+      counterName: `deprecatedRoute_test`,
+      counterType: 'deprecatedApiUsage',
+      incrementBy: 1,
+    });
+  });
+
+  it('should do nothing if no usage counter is provided', () => {
+    let err;
+    try {
+      trackDeprecatedRouteUsage('test', undefined);
+    } catch (e) {
+      err = e;
+    }
+    expect(err).toBeUndefined();
+  });
+});
diff --git a/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.ts b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.ts
new file mode 100644
index 0000000000000..aa163d5cd409a
--- /dev/null
+++ b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+
+export function trackDeprecatedRouteUsage(route: string, usageCounter?: UsageCounter) {
+  if (usageCounter) {
+    usageCounter.incrementCounter({
+      counterName: `deprecatedRoute_${route}`,
+      counterType: 'deprecatedApiUsage',
+      incrementBy: 1,
+    });
+  }
+}
diff --git a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts
index f4a1ce07ab985..1c48cdd902111 100644
--- a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts
+++ b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyRouteUsage } from './track_legacy_route_usage';
 
 describe('trackLegacyRouteUsage', () => {
diff --git a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts
index 528a75a0a18bd..2d33322630ef4 100644
--- a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts
+++ b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function trackLegacyRouteUsage(route: string, usageCounter?: UsageCounter) {
   if (usageCounter) {
diff --git a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
index 046b18553d042..e86cd98f4a490 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { createWrappedScopedClusterClientFactory } from './wrap_scoped_cluster_client';
 
 const esQuery = {
diff --git a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
index 914d6f8c6da30..af77191474d89 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
@@ -20,7 +20,7 @@ import type {
   SearchRequest as SearchRequestWithBody,
   AggregationsAggregate,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient, ElasticsearchClient, Logger } from 'src/core/server';
+import { IScopedClusterClient, ElasticsearchClient, Logger } from '@kbn/core/server';
 import { RuleExecutionMetrics } from '../types';
 import { Rule } from '../types';
 
diff --git a/x-pack/plugins/alerting/server/mocks.ts b/x-pack/plugins/alerting/server/mocks.ts
index d9951b4a79759..f7525c2c5f570 100644
--- a/x-pack/plugins/alerting/server/mocks.ts
+++ b/x-pack/plugins/alerting/server/mocks.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { rulesClientMock } from './rules_client.mock';
-import { PluginSetupContract, PluginStartContract } from './plugin';
-import { Alert, AlertFactoryDoneUtils } from './alert';
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
   httpServerMock,
-} from '../../../../src/core/server/mocks';
-import { dataPluginMock } from '../../../../src/plugins/data/server/mocks';
+} from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { rulesClientMock } from './rules_client.mock';
+import { PluginSetupContract, PluginStartContract } from './plugin';
+import { Alert, AlertFactoryDoneUtils } from './alert';
 import { AlertInstanceContext, AlertInstanceState } from './types';
 
 export { rulesClientMock };
diff --git a/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts b/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts
index 630aba27485e4..6a139df0aa844 100644
--- a/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts
+++ b/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('inMemoryMetrics', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts
index 73bef5b29172b..ac90fc283ca77 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from 'src/core/public/mocks';
-import { CoreSetup } from '../../../../../src/core/server';
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { coreMock } from '@kbn/core/public/mocks';
+import { CoreSetup } from '@kbn/core/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerClusterCollector } from './register_cluster_collector';
 import { AlertingPluginsStart } from '../plugin';
 import { ClusterRulesMetric } from './types';
diff --git a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts
index 63dd6053d3889..f1764d922069f 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import stats from 'stats-lite';
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import {
   IdleTaskWithExpiredRunAt,
   RunningOrClaimingTaskWithExpiredRetryAt,
-} from '../../../task_manager/server';
-import { CoreSetup } from '../../../../../src/core/server';
+} from '@kbn/task-manager-plugin/server';
+import { CoreSetup } from '@kbn/core/server';
 import { AlertingPluginsStart } from '../plugin';
 import { ClusterRulesMetric } from './types';
 
diff --git a/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts b/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts
index 7c5dea1d2eb5f..a17cf5b47020b 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerNodeCollector } from './register_node_collector';
 import { NodeRulesMetric } from './types';
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
diff --git a/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts b/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts
index 4e364e5c812fb..839787c6e78fc 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import { IN_MEMORY_METRICS } from '.';
 import { InMemoryMetrics } from './in_memory_metrics';
 
diff --git a/x-pack/plugins/alerting/server/monitoring/types.ts b/x-pack/plugins/alerting/server/monitoring/types.ts
index 20cb3fb5bb4e5..4b159dd8349ae 100644
--- a/x-pack/plugins/alerting/server/monitoring/types.ts
+++ b/x-pack/plugins/alerting/server/monitoring/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MetricResult } from '../../../monitoring_collection/server';
+import { MetricResult } from '@kbn/monitoring-collection-plugin/server';
 
 export type ClusterRulesMetric = MetricResult<{
   overdue: {
diff --git a/x-pack/plugins/alerting/server/plugin.test.ts b/x-pack/plugins/alerting/server/plugin.test.ts
index 8eb73aa25954b..949328d065536 100644
--- a/x-pack/plugins/alerting/server/plugin.test.ts
+++ b/x-pack/plugins/alerting/server/plugin.test.ts
@@ -6,21 +6,21 @@
  */
 
 import { AlertingPlugin, PluginSetupContract } from './plugin';
-import { createUsageCollectionSetupMock } from 'src/plugins/usage_collection/server/mocks';
-import { coreMock, statusServiceMock } from '../../../../src/core/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
-import { eventLogServiceMock } from '../../event_log/server/event_log_service.mock';
-import { KibanaRequest } from 'kibana/server';
-import { featuresPluginMock } from '../../features/server/mocks';
-import { KibanaFeature } from '../../features/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { coreMock, statusServiceMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { eventLogServiceMock } from '@kbn/event-log-plugin/server/event_log_service.mock';
+import { KibanaRequest } from '@kbn/core/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/server';
 import { AlertingConfig } from './config';
 import { RuleType } from './types';
-import { eventLogMock } from '../../event_log/server/mocks';
-import { actionsMock } from '../../actions/server/mocks';
-import { dataPluginMock } from '../../../../src/plugins/data/server/mocks';
-import { monitoringCollectionMock } from '../../monitoring_collection/server/mocks';
+import { eventLogMock } from '@kbn/event-log-plugin/server/mocks';
+import { actionsMock } from '@kbn/actions-plugin/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
 
 const generateAlertingConfig = (): AlertingConfig => ({
   healthCheck: {
@@ -34,7 +34,7 @@ const generateAlertingConfig = (): AlertingConfig => ({
   cancelAlertsOnRuleTimeout: true,
   rules: {
     minimumScheduleInterval: { value: '1m', enforce: false },
-    execution: {
+    run: {
       actions: {
         max: 1000,
       },
@@ -51,7 +51,7 @@ const sampleRuleType: RuleType<never, never, never, never, never, 'default'> = {
   defaultActionGroupId: 'default',
   producer: 'test',
   config: {
-    execution: {
+    run: {
       actions: {
         max: 1000,
       },
@@ -127,7 +127,7 @@ describe('Alerting Plugin', () => {
         ...generateAlertingConfig(),
         rules: {
           minimumScheduleInterval: { value: '1m', enforce: false },
-          execution: {
+          run: {
             actions: {
               max: 123,
             },
@@ -142,7 +142,7 @@ describe('Alerting Plugin', () => {
       setupContract.registerType(ruleType);
 
       expect(ruleType.config).toEqual({
-        execution: {
+        run: {
           actions: { max: 123 },
         },
       });
@@ -153,7 +153,7 @@ describe('Alerting Plugin', () => {
         ...generateAlertingConfig(),
         rules: {
           minimumScheduleInterval: { value: '1m', enforce: false },
-          execution: {
+          run: {
             actions: { max: 123 },
             ruleTypeOverrides: [{ id: sampleRuleType.id, timeout: '1d' }],
           },
@@ -167,7 +167,7 @@ describe('Alerting Plugin', () => {
       setupContract.registerType(ruleType);
 
       expect(ruleType.config).toEqual({
-        execution: {
+        run: {
           id: sampleRuleType.id,
           actions: {
             max: 123,
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 85279ec615331..9696c523b095b 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -8,19 +8,17 @@
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { BehaviorSubject } from 'rxjs';
 import { pick } from 'lodash';
-import { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../encrypted_saved_objects/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
-import { SpacesPluginStart } from '../../spaces/server';
-import { RulesClient } from './rules_client';
-import { RuleTypeRegistry } from './rule_type_registry';
-import { TaskRunnerFactory } from './task_runner';
-import { RulesClientFactory } from './rules_client_factory';
-import { ILicenseState, LicenseState } from './lib/license_state';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   KibanaRequest,
   Logger,
@@ -32,14 +30,31 @@ import {
   ServiceStatus,
   SavedObjectsBulkGetObject,
   ServiceStatusLevels,
-} from '../../../../src/core/server';
-import { AlertingRequestHandlerContext, ALERTS_FEATURE_ID } from './types';
-import { defineRoutes } from './routes';
-import { LICENSE_TYPE, LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
+} from '@kbn/core/server';
+import {
+  LICENSE_TYPE,
+  LicensingPluginSetup,
+  LicensingPluginStart,
+} from '@kbn/licensing-plugin/server';
 import {
   PluginSetupContract as ActionsPluginSetupContract,
   PluginStartContract as ActionsPluginStartContract,
-} from '../../actions/server';
+} from '@kbn/actions-plugin/server';
+import {
+  IEventLogger,
+  IEventLogService,
+  IEventLogClientService,
+} from '@kbn/event-log-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
+import { RulesClient } from './rules_client';
+import { RuleTypeRegistry } from './rule_type_registry';
+import { TaskRunnerFactory } from './task_runner';
+import { RulesClientFactory } from './rules_client_factory';
+import { ILicenseState, LicenseState } from './lib/license_state';
+import { AlertingRequestHandlerContext, ALERTS_FEATURE_ID } from './types';
+import { defineRoutes } from './routes';
 import {
   AlertInstanceContext,
   AlertInstanceState,
@@ -50,8 +65,6 @@ import {
 } from './types';
 import { registerAlertingUsageCollector } from './usage';
 import { initializeAlertingTelemetry, scheduleAlertingTelemetry } from './usage/task';
-import { IEventLogger, IEventLogService, IEventLogClientService } from '../../event_log/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../features/server';
 import { setupSavedObjects } from './saved_objects';
 import {
   initializeApiKeyInvalidator,
@@ -63,8 +76,6 @@ import { getHealth } from './health/get_health';
 import { AlertingAuthorizationClientFactory } from './alerting_authorization_client_factory';
 import { AlertingAuthorization } from './authorization';
 import { getSecurityHealth, SecurityHealth } from './lib/get_security_health';
-import { PluginStart as DataPluginStart } from '../../../../src/plugins/data/server';
-import { MonitoringCollectionSetup } from '../../monitoring_collection/server';
 import { registerNodeCollector, registerClusterCollector, InMemoryMetrics } from './monitoring';
 import { getExecutionConfigForRuleType } from './lib/get_rules_config';
 import { getRuleTaskTimeout } from './lib/get_rule_task_timeout';
diff --git a/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
index c94d46e3a4558..dbc0407324e6d 100644
--- a/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'kibana/server';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { identity } from 'lodash';
 import type { MethodKeysOf } from '@kbn/utility-types';
-import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { rulesClientMock, RulesClientMock } from '../rules_client.mock';
 import { AlertsHealth, RuleType } from '../../common';
 import type { AlertingRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts b/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts
index 038e923f28f0c..7123f1bf4ad6c 100644
--- a/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts
+++ b/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts
@@ -6,19 +6,19 @@
  */
 
 import { aggregateRulesRoute } from './aggregate_rules';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { trackLegacyTerminology } from './lib/track_legacy_terminology';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 const rulesClient = rulesClientMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
 const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/aggregate_rules.ts b/x-pack/plugins/alerting/server/routes/aggregate_rules.ts
index 8c44f57b83789..312def72dd65e 100644
--- a/x-pack/plugins/alerting/server/routes/aggregate_rules.ts
+++ b/x-pack/plugins/alerting/server/routes/aggregate_rules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../lib';
 import { AggregateResult, AggregateOptions } from '../rules_client';
 import { RewriteResponseCase, RewriteRequestCase, verifyAccessAndContext } from './lib';
@@ -73,7 +73,7 @@ export const aggregateRulesRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const options = rewriteQueryReq({
           ...req.query,
           has_reference: req.query.has_reference || undefined,
diff --git a/x-pack/plugins/alerting/server/routes/create_rule.test.ts b/x-pack/plugins/alerting/server/routes/create_rule.test.ts
index 62c7819fb5b05..cbb7965cab081 100644
--- a/x-pack/plugins/alerting/server/routes/create_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/create_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { createRuleRoute } from './create_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -16,12 +16,12 @@ import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib';
 import { AsApiContract } from './lib';
 import { SanitizedRule } from '../types';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/create_rule.ts b/x-pack/plugins/alerting/server/routes/create_rule.ts
index 5278f748f0ce4..cf044c94f2529 100644
--- a/x-pack/plugins/alerting/server/routes/create_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/create_rule.ts
@@ -110,7 +110,7 @@ export const createRuleRoute = ({ router, licenseState, usageCounter }: RouteOpt
     handleDisabledApiKeysError(
       router.handleLegacyErrors(
         verifyAccessAndContext(licenseState, async function (context, req, res) {
-          const rulesClient = context.alerting.getRulesClient();
+          const rulesClient = (await context.alerting).getRulesClient();
           const rule = req.body;
           const params = req.params;
 
diff --git a/x-pack/plugins/alerting/server/routes/delete_rule.test.ts b/x-pack/plugins/alerting/server/routes/delete_rule.test.ts
index b7d1a2c9c7fc6..b64dff27c5b90 100644
--- a/x-pack/plugins/alerting/server/routes/delete_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/delete_rule.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { deleteRuleRoute } from './delete_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -14,7 +14,7 @@ import { rulesClientMock } from '../rules_client.mock';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/delete_rule.ts b/x-pack/plugins/alerting/server/routes/delete_rule.ts
index 27da50b180fe5..e4ccd491046d1 100644
--- a/x-pack/plugins/alerting/server/routes/delete_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/delete_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { verifyAccessAndContext } from './lib';
@@ -28,7 +28,7 @@ export const deleteRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         await rulesClient.delete({ id });
         return res.noContent();
diff --git a/x-pack/plugins/alerting/server/routes/disable_rule.test.ts b/x-pack/plugins/alerting/server/routes/disable_rule.test.ts
index baecc8f198fff..6f4806b8e17f5 100644
--- a/x-pack/plugins/alerting/server/routes/disable_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/disable_rule.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { disableRuleRoute } from './disable_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
@@ -14,7 +14,7 @@ import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/disable_rule.ts b/x-pack/plugins/alerting/server/routes/disable_rule.ts
index 74bf9d11166be..99795e7ee2bf2 100644
--- a/x-pack/plugins/alerting/server/routes/disable_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/disable_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
@@ -28,7 +28,7 @@ export const disableRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         try {
           await rulesClient.disable({ id });
diff --git a/x-pack/plugins/alerting/server/routes/enable_rule.test.ts b/x-pack/plugins/alerting/server/routes/enable_rule.test.ts
index 9a8b3fe1b4226..cb75ec87d2bfb 100644
--- a/x-pack/plugins/alerting/server/routes/enable_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/enable_rule.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { enableRuleRoute } from './enable_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
@@ -14,7 +14,7 @@ import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/enable_rule.ts b/x-pack/plugins/alerting/server/routes/enable_rule.ts
index e62e6aa30221f..84a4086cd245c 100644
--- a/x-pack/plugins/alerting/server/routes/enable_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/enable_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
@@ -28,7 +28,7 @@ export const enableRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         try {
           await rulesClient.enable({ id });
diff --git a/x-pack/plugins/alerting/server/routes/find_rules.test.ts b/x-pack/plugins/alerting/server/routes/find_rules.test.ts
index 33791dcac1038..1641a73eab238 100644
--- a/x-pack/plugins/alerting/server/routes/find_rules.test.ts
+++ b/x-pack/plugins/alerting/server/routes/find_rules.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { findRulesRoute } from './find_rules';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -17,7 +17,7 @@ const rulesClient = rulesClientMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
 const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/find_rules.ts b/x-pack/plugins/alerting/server/routes/find_rules.ts
index 7d7f878780ac3..ef8b8b29057c0 100644
--- a/x-pack/plugins/alerting/server/routes/find_rules.ts
+++ b/x-pack/plugins/alerting/server/routes/find_rules.ts
@@ -6,8 +6,8 @@
  */
 
 import { omit } from 'lodash';
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { FindOptions, FindResult } from '../rules_client';
@@ -140,7 +140,7 @@ const buildFindRulesRoute = ({
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
 
         trackLegacyTerminology(
           [req.query.search, req.query.search_fields, req.query.sort_field].filter(
diff --git a/x-pack/plugins/alerting/server/routes/get_rule.test.ts b/x-pack/plugins/alerting/server/routes/get_rule.test.ts
index 4384e02352d95..065cd567f1f69 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { getRuleRoute } from './get_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -16,7 +16,7 @@ import { SanitizedRule } from '../types';
 import { AsApiContract } from './lib';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule.ts b/x-pack/plugins/alerting/server/routes/get_rule.ts
index 52b73d22680f9..f4414b0364dcb 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule.ts
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash';
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { verifyAccessAndContext, RewriteResponseCase } from './lib';
 import {
@@ -85,7 +85,7 @@ const buildGetRuleRoute = ({
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         const rule = await rulesClient.get({ id, excludeFromPublicApi });
         return res.ok({
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
index 4193e769dc513..a6b0e88bbf5af 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getRuleAlertSummaryRoute } from './get_rule_alert_summary';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../rules_client.mock';
 import { AlertSummary } from '../types';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
index 097eee875fcee..c0d31d1ccbfac 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { GetAlertSummaryParams } from '../rules_client';
@@ -72,7 +72,7 @@ export const getRuleAlertSummaryRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         const summary = await rulesClient.getAlertSummary(rewriteReq({ id, ...req.query }));
         return res.ok({ body: rewriteBodyRes(summary) });
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts
index 2394e159a9f19..cbcff65cdbdca 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getRuleExecutionLogRoute } from './get_rule_execution_log';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../rules_client.mock';
 import { IExecutionLogWithErrorsResult } from '../../common';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -38,7 +38,7 @@ describe('getRuleExecutionLogRoute', () => {
         num_new_alerts: 5,
         num_recovered_alerts: 0,
         num_triggered_actions: 5,
-        num_scheduled_actions: 5,
+        num_generated_actions: 5,
         num_succeeded_actions: 5,
         num_errored_actions: 0,
         total_search_duration_ms: 0,
@@ -57,7 +57,7 @@ describe('getRuleExecutionLogRoute', () => {
         num_new_alerts: 5,
         num_recovered_alerts: 5,
         num_triggered_actions: 5,
-        num_scheduled_actions: 5,
+        num_generated_actions: 5,
         num_succeeded_actions: 5,
         num_errored_actions: 0,
         total_search_duration_ms: 0,
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts
index 066f72e4f9459..650bdd83a0a83 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { GetExecutionLogByIdParams } from '../rules_client';
@@ -25,7 +25,7 @@ const sortFieldSchema = schema.oneOf([
   schema.object({ es_search_duration: schema.object({ order: sortOrderSchema }) }),
   schema.object({ schedule_delay: schema.object({ order: sortOrderSchema }) }),
   schema.object({ num_triggered_actions: schema.object({ order: sortOrderSchema }) }),
-  schema.object({ num_scheduled_actions: schema.object({ order: sortOrderSchema }) }),
+  schema.object({ num_generated_actions: schema.object({ order: sortOrderSchema }) }),
 ]);
 
 const sortFieldsSchema = schema.arrayOf(sortFieldSchema, {
@@ -67,7 +67,7 @@ export const getRuleExecutionLogRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         return res.ok({
           body: await rulesClient.getExecutionLogForRule(rewriteReq({ id, ...req.query })),
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts
index 36f1e6c5f8f42..04d3704c88714 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { getRuleStateRoute } from './get_rule_state';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../rules_client.mock';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_state.ts b/x-pack/plugins/alerting/server/routes/get_rule_state.ts
index 1ebe3ab367443..50ad1f776110e 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_state.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_state.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { RewriteResponseCase, verifyAccessAndContext } from './lib';
@@ -44,7 +44,7 @@ export const getRuleStateRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         const state = await rulesClient.getAlertState({ id });
         return state ? res.ok({ body: rewriteBodyRes(state) }) : res.noContent();
diff --git a/x-pack/plugins/alerting/server/routes/health.test.ts b/x-pack/plugins/alerting/server/routes/health.test.ts
index 7b3ba5ee2a873..b525122e3d00c 100644
--- a/x-pack/plugins/alerting/server/routes/health.test.ts
+++ b/x-pack/plugins/alerting/server/routes/health.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { healthRoute } from './health';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { rulesClientMock } from '../rules_client.mock';
 import { HealthStatus } from '../types';
 import { alertsMock } from '../mocks';
@@ -19,7 +19,7 @@ import { RegistryAlertTypeWithAuth } from '../authorization';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/health.ts b/x-pack/plugins/alerting/server/routes/health.ts
index 993dd0d554836..4d3934911221e 100644
--- a/x-pack/plugins/alerting/server/routes/health.ts
+++ b/x-pack/plugins/alerting/server/routes/health.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ILicenseState } from '../lib';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { RewriteResponseCase, verifyAccessAndContext } from './lib';
 import {
   AlertingRequestHandlerContext,
@@ -52,15 +52,16 @@ export const healthRoute = (
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
         try {
+          const alertingContext = await context.alerting;
           // Verify that user has access to at least one rule type
-          const ruleTypes = Array.from(await context.alerting.getRulesClient().listAlertTypes());
+          const ruleTypes = Array.from(await alertingContext.getRulesClient().listAlertTypes());
           if (ruleTypes.length > 0) {
-            const alertingFrameworkHealth = await context.alerting.getFrameworkHealth();
+            const alertingFrameworkHealth = await alertingContext.getFrameworkHealth();
 
             const securityHealth = await getSecurityHealth(
               async () => (licenseState ? licenseState.getIsSecurityEnabled() : null),
               async () => encryptedSavedObjects.canEncrypt,
-              context.alerting.areApiKeysEnabled
+              alertingContext.areApiKeysEnabled
             );
 
             const frameworkHealth: AlertingFrameworkHealth = {
diff --git a/x-pack/plugins/alerting/server/routes/index.ts b/x-pack/plugins/alerting/server/routes/index.ts
index e03e726bb2b2c..392ec591d9608 100644
--- a/x-pack/plugins/alerting/server/routes/index.ts
+++ b/x-pack/plugins/alerting/server/routes/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ILicenseState } from '../lib';
 import { defineLegacyRoutes } from './legacy';
 import { AlertingRequestHandlerContext } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { createRuleRoute } from './create_rule';
 import { getRuleRoute, getInternalRuleRoute } from './get_rule';
 import { updateRuleRoute } from './update_rule';
@@ -60,7 +60,7 @@ export function defineRoutes(opts: RouteOptions) {
   getRuleStateRoute(router, licenseState);
   healthRoute(router, licenseState, encryptedSavedObjects);
   ruleTypesRoute(router, licenseState);
-  muteAllRuleRoute(router, licenseState);
+  muteAllRuleRoute(router, licenseState, usageCounter);
   muteAlertRoute(router, licenseState);
   unmuteAllRuleRoute(router, licenseState);
   unmuteAlertRoute(router, licenseState);
diff --git a/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts b/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts
index cab779a42ce20..a2fad24b24c0f 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { aggregateAlertRoute } from './aggregate';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 const rulesClient = rulesClientMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
@@ -23,7 +23,7 @@ jest.mock('../../lib/track_legacy_route_usage', () => ({
   trackLegacyRouteUsage: jest.fn(),
 }));
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts b/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts
index bd4aa7750738c..ba520cc401262 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { renameKeys } from './../lib/rename_keys';
+import { renameKeys } from '../lib/rename_keys';
 import { FindOptions } from '../../rules_client';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
@@ -53,7 +53,7 @@ export const aggregateAlertRoute = (
       if (!context.alerting) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
 
       trackLegacyRouteUsage('aggregate', usageCounter);
       trackLegacyTerminology(
diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.test.ts b/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
index cd584543d57e0..60b299be6db97 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
@@ -6,20 +6,20 @@
  */
 
 import { createAlertRoute } from './create';
-import { httpServiceMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { Rule } from '../../../common/rule';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.ts b/x-pack/plugins/alerting/server/routes/legacy/create.ts
index b6669a605022d..e7583033ae4ba 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/create.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/create.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { validateDurationSchema } from '../../lib';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import {
   SanitizedRule,
   RuleNotifyWhenType,
@@ -64,7 +64,7 @@ export const createAlertRoute = ({ router, licenseState, usageCounter }: RouteOp
         if (!context.alerting) {
           return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
         }
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const alert = req.body;
         const params = req.params;
         const notifyWhen = alert?.notifyWhen ? (alert.notifyWhen as RuleNotifyWhenType) : null;
diff --git a/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts b/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts
index ae1c5327bd27c..fee6b3db736fe 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { deleteAlertRoute } from './delete';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/delete.ts b/x-pack/plugins/alerting/server/routes/legacy/delete.ts
index 66d05e580a3a2..4fcf85678db53 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/delete.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -35,7 +35,7 @@ export const deleteAlertRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('delete', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       await rulesClient.delete({ id });
       return res.noContent();
diff --git a/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts b/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts
index 1e9f5531d19d2..2e8629b5e3fe9 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts
@@ -4,18 +4,18 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { disableAlertRoute } from './disable';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/disable.ts b/x-pack/plugins/alerting/server/routes/legacy/disable.ts
index 1345c4ae4428a..5572220eb2171 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/disable.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/disable.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -36,7 +36,7 @@ export const disableAlertRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('disable', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       try {
         await rulesClient.disable({ id });
diff --git a/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts b/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts
index eb839ba3e7b83..d63c330c54300 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts
@@ -4,18 +4,18 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { enableAlertRoute } from './enable';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/enable.ts b/x-pack/plugins/alerting/server/routes/legacy/enable.ts
index ec3b4b0a0fc20..eb86b5db65da1 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/enable.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/enable.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
@@ -38,7 +38,7 @@ export const enableAlertRoute = (
           return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
         }
         trackLegacyRouteUsage('enable', usageCounter);
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         try {
           await rulesClient.enable({ id });
diff --git a/x-pack/plugins/alerting/server/routes/legacy/find.test.ts b/x-pack/plugins/alerting/server/routes/legacy/find.test.ts
index 0d18b70a5944d..026a4f81688e3 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/find.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/find.test.ts
@@ -4,19 +4,19 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { findAlertRoute } from './find';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/find.ts b/x-pack/plugins/alerting/server/routes/legacy/find.ts
index fc8076343e713..9a33f5b2dc5fd 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/find.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/find.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { renameKeys } from './../lib/rename_keys';
+import { renameKeys } from '../lib/rename_keys';
 import { FindOptions } from '../../rules_client';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
@@ -66,7 +66,7 @@ export const findAlertRoute = (
         ) as string[],
         usageCounter
       );
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
 
       const query = req.query;
       const renameMap = {
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get.test.ts
index 8c2233ae280b7..6860140ce2540 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get.test.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { getAlertRoute } from './get';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { Rule } from '../../../common';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get.ts b/x-pack/plugins/alerting/server/routes/legacy/get.ts
index df8259789d53c..62fdde5507148 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
@@ -35,7 +35,7 @@ export const getAlertRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('get', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       return res.ok({
         body: await rulesClient.get({ id, excludeFromPublicApi: true }),
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
index d7b81ff5c26d0..672ccee369aac 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
@@ -4,18 +4,18 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { getAlertInstanceSummaryRoute } from './get_alert_instance_summary';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../../rules_client.mock';
 import { AlertSummary } from '../../types';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts
index e94c0a858646d..c33aea8060d77 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -46,7 +46,7 @@ export const getAlertInstanceSummaryRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('instanceSummary', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       const { dateStart } = req.query;
       const summary = await rulesClient.getAlertSummary({ id, dateStart });
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts
index f164e0fa0bc81..42527256925f7 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts
@@ -4,17 +4,17 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { getAlertStateRoute } from './get_alert_state';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts
index 2bd2d343b98ba..86a56403b39ae 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -35,7 +35,7 @@ export const getAlertStateRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('state', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       const state = await rulesClient.getAlertState({ id });
       return state ? res.ok({ body: state }) : res.noContent();
diff --git a/x-pack/plugins/alerting/server/routes/legacy/health.test.ts b/x-pack/plugins/alerting/server/routes/legacy/health.test.ts
index c5371f6fcb5e7..453d743d8e794 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/health.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/health.test.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { healthRoute } from './health';
-import { httpServiceMock } from 'src/core/server/mocks';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { rulesClientMock } from '../../rules_client.mock';
 import { HealthStatus, RecoveredActionGroup } from '../../types';
 import { alertsMock } from '../../mocks';
@@ -18,7 +18,7 @@ import { RegistryAlertTypeWithAuth } from '../../authorization';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/health.ts b/x-pack/plugins/alerting/server/routes/legacy/health.ts
index 2d9609969f306..02b8c8279b815 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/health.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/health.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { AlertingFrameworkHealth } from '../../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../../encrypted_saved_objects/server';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { getSecurityHealth } from '../../lib/get_security_health';
 
@@ -32,15 +32,16 @@ export function healthRoute(
       }
       trackLegacyRouteUsage('health', usageCounter);
       try {
+        const alertingContext = await context.alerting;
         // Verify that user has access to at least one rule type
-        const ruleTypes = Array.from(await context.alerting.getRulesClient().listAlertTypes());
+        const ruleTypes = Array.from(await alertingContext.getRulesClient().listAlertTypes());
         if (ruleTypes.length > 0) {
-          const alertingFrameworkHealth = await context.alerting.getFrameworkHealth();
+          const alertingFrameworkHealth = await alertingContext.getFrameworkHealth();
 
           const securityHealth = await getSecurityHealth(
             async () => (licenseState ? licenseState.getIsSecurityEnabled() : null),
             async () => encryptedSavedObjects.canEncrypt,
-            context.alerting.areApiKeysEnabled
+            alertingContext.areApiKeysEnabled
           );
 
           const frameworkHealth: AlertingFrameworkHealth = {
diff --git a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts
index 45c5c62913996..9ab197a47f648 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { listAlertTypesRoute } from './list_alert_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryAlertTypeWithAuth } from '../../authorization';
@@ -18,7 +18,7 @@ import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts
index 250d3d1bdeedc..8cfef8af46247 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -27,8 +27,9 @@ export const listAlertTypesRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('listAlertTypes', usageCounter);
+      const alertingContext = await context.alerting;
       return res.ok({
-        body: Array.from(await context.alerting.getRulesClient().listAlertTypes()),
+        body: Array.from(await alertingContext.getRulesClient().listAlertTypes()),
       });
     })
   );
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts
index 9d84fd75a68c5..ee3dca51a4340 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { muteAllAlertRoute } from './mute_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts
index f35ffe93ccda4..dcbc0c19dbe35 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -36,7 +36,7 @@ export const muteAllAlertRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('muteAll', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       try {
         await rulesClient.muteAll({ id });
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts
index 5e17c42528e14..648a2a963246f 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { muteAlertInstanceRoute } from './mute_instance';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts
index af6aea1e0f6c7..f6c6a28ecc865 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { renameKeys } from './../lib/rename_keys';
+import { renameKeys } from '../lib/rename_keys';
 import { MuteOptions } from '../../rules_client';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
@@ -41,7 +41,7 @@ export const muteAlertInstanceRoute = (
 
       trackLegacyRouteUsage('muteInstance', usageCounter);
 
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
 
       const renameMap = {
         alert_id: 'alertId',
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts
index f3530786667ff..e781fee392ce6 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { unmuteAllAlertRoute } from './unmute_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts
index a6cd687271cc4..31f82849ea1da 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -36,7 +36,7 @@ export const unmuteAllAlertRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('unmuteAll', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { id } = req.params;
       try {
         await rulesClient.unmuteAll({ id });
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts
index fa109fa09f250..0cc1856bc6a27 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { unmuteAlertInstanceRoute } from './unmute_instance';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts
index d4684bda7f0fa..4d5b9b02da5f1 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
@@ -37,7 +37,7 @@ export const unmuteAlertInstanceRoute = (
         return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
       }
       trackLegacyRouteUsage('unmuteInstance', usageCounter);
-      const rulesClient = context.alerting.getRulesClient();
+      const rulesClient = (await context.alerting).getRulesClient();
       const { alertId, alertInstanceId } = req.params;
       try {
         await rulesClient.unmuteInstance({ alertId, alertInstanceId });
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update.test.ts b/x-pack/plugins/alerting/server/routes/legacy/update.test.ts
index 5396e267fa525..61073c0d4e3bf 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update.test.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { updateAlertRoute } from './update';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { RuleNotifyWhenType } from '../../../common';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update.ts b/x-pack/plugins/alerting/server/routes/legacy/update.ts
index b740be04829e8..07bde524076c1 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { validateDurationSchema } from '../../lib';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import {
@@ -64,7 +64,7 @@ export const updateAlertRoute = (
           return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
         }
         trackLegacyRouteUsage('update', usageCounter);
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         const { name, actions, params, schedule, tags, throttle, notifyWhen } = req.body;
         try {
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts
index 5ae3ec2f5387f..e4fa2539c391f 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { updateApiKeyRoute } from './update_api_key';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts
index ab5ff254fca86..f0f7716b00771 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
@@ -38,7 +38,7 @@ export const updateApiKeyRoute = (
           return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
         }
         trackLegacyRouteUsage('updateApiKey', usageCounter);
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         try {
           await rulesClient.updateApiKey({ id });
diff --git a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts
index b9065059f52f0..6dbfea0090952 100644
--- a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { countUsageOfPredefinedIds } from './count_usage_of_predefined_ids';
 
 beforeEach(() => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts
index 1956000d4e22b..8955e321c3fe5 100644
--- a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export interface CountUsageOfPredefinedIdsOptions {
   predefinedId?: string;
diff --git a/x-pack/plugins/alerting/server/routes/lib/error_handler.ts b/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
index 0699a43ef42be..7e8243e7d501c 100644
--- a/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { RequestHandlerWrapper } from 'kibana/server';
+import { RequestHandlerWrapper } from '@kbn/core/server';
 
 export const handleDisabledApiKeysError: RequestHandlerWrapper = (handler) => {
   return async (context, request, response) => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts
index 5c6838e144aa2..117e0c5456bd2 100644
--- a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyTerminology, LEGACY_TERMS } from './track_legacy_terminology';
 
 describe('trackLegacyTerminology', () => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts
index e825cb990fc4d..c0c1fd155b7fd 100644
--- a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { flatten } from 'lodash';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export const LEGACY_TERMS = ['alertTypeId', 'actionTypeId'];
 
diff --git a/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts b/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts
index f0177f04bf9b2..09930a4b59165 100644
--- a/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { ILicenseState, isErrorThatHandlesItsOwnResponse, verifyApiAccess } from '../../lib';
 import { AlertingRequestHandlerContext } from '../../types';
 
diff --git a/x-pack/plugins/alerting/server/routes/mute_alert.test.ts b/x-pack/plugins/alerting/server/routes/mute_alert.test.ts
index 0fc28412abc6f..ef67a6d2ef3bf 100644
--- a/x-pack/plugins/alerting/server/routes/mute_alert.test.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_alert.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { muteAlertRoute } from './mute_alert';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/mute_alert.ts b/x-pack/plugins/alerting/server/routes/mute_alert.ts
index 67e6f3b4002d7..22d9a1670dde5 100644
--- a/x-pack/plugins/alerting/server/routes/mute_alert.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_alert.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { MuteOptions } from '../rules_client';
@@ -38,7 +38,7 @@ export const muteAlertRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const params = rewriteParamsReq(req.params);
         try {
           await rulesClient.muteInstance(params);
diff --git a/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts b/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts
index 277add6ec1647..131c20eb84a72 100644
--- a/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts
@@ -4,19 +4,24 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { muteAllRuleRoute } from './mute_all_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
+import { trackDeprecatedRouteUsage } from '../lib/track_deprecated_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
+jest.mock('../lib/track_deprecated_route_usage', () => ({
+  trackDeprecatedRouteUsage: jest.fn(),
+}));
+
 beforeEach(() => {
   jest.resetAllMocks();
 });
@@ -77,4 +82,19 @@ describe('muteAllRuleRoute', () => {
 
     expect(res.forbidden).toHaveBeenCalledWith({ body: { message: 'Fail' } });
   });
+
+  it('should track every call', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+    const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
+    const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
+
+    muteAllRuleRoute(router, licenseState, mockUsageCounter);
+    const [, handler] = router.post.mock.calls[0];
+    const [context, req, res] = mockHandlerArguments({ rulesClient }, { params: {}, body: {} }, [
+      'ok',
+    ]);
+    await handler(context, req, res);
+    expect(trackDeprecatedRouteUsage).toHaveBeenCalledWith('muteAll', mockUsageCounter);
+  });
 });
diff --git a/x-pack/plugins/alerting/server/routes/mute_all_rule.ts b/x-pack/plugins/alerting/server/routes/mute_all_rule.ts
index ad3c93f415ea2..41b561db0b2fd 100644
--- a/x-pack/plugins/alerting/server/routes/mute_all_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_all_rule.ts
@@ -5,11 +5,13 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
 import { AlertingRequestHandlerContext, BASE_ALERTING_API_PATH } from '../types';
+import { trackDeprecatedRouteUsage } from '../lib/track_deprecated_route_usage';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -17,7 +19,8 @@ const paramSchema = schema.object({
 
 export const muteAllRuleRoute = (
   router: IRouter<AlertingRequestHandlerContext>,
-  licenseState: ILicenseState
+  licenseState: ILicenseState,
+  usageCounter?: UsageCounter
 ) => {
   router.post(
     {
@@ -28,8 +31,9 @@ export const muteAllRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
+        trackDeprecatedRouteUsage('muteAll', usageCounter);
         try {
           await rulesClient.muteAll({ id });
           return res.noContent();
diff --git a/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts b/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts
index b03369a74b865..656874b5cf332 100644
--- a/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { resolveRuleRoute } from './resolve_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -16,7 +16,7 @@ import { ResolvedSanitizedRule } from '../types';
 import { AsApiContract } from './lib';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/resolve_rule.ts b/x-pack/plugins/alerting/server/routes/resolve_rule.ts
index e6cacb8231b5f..cde747f9272fe 100644
--- a/x-pack/plugins/alerting/server/routes/resolve_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/resolve_rule.ts
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash';
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { verifyAccessAndContext, RewriteResponseCase } from './lib';
 import {
@@ -73,7 +73,7 @@ export const resolveRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         const rule = await rulesClient.resolve({ id });
         return res.ok({
diff --git a/x-pack/plugins/alerting/server/routes/rule_types.test.ts b/x-pack/plugins/alerting/server/routes/rule_types.test.ts
index 880db9b9e9886..4eb4d1f713d5e 100644
--- a/x-pack/plugins/alerting/server/routes/rule_types.test.ts
+++ b/x-pack/plugins/alerting/server/routes/rule_types.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { ruleTypesRoute } from './rule_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -17,7 +17,7 @@ import { AsApiContract } from './lib';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/rule_types.ts b/x-pack/plugins/alerting/server/routes/rule_types.ts
index 0427fffab04d1..5d6c9e9a3f0f4 100644
--- a/x-pack/plugins/alerting/server/routes/rule_types.ts
+++ b/x-pack/plugins/alerting/server/routes/rule_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { RegistryAlertTypeWithAuth } from '../authorization';
 import { RewriteResponseCase, verifyAccessAndContext } from './lib';
@@ -54,7 +54,8 @@ export const ruleTypesRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const ruleTypes = Array.from(await context.alerting.getRulesClient().listAlertTypes());
+        const rulesClient = (await context.alerting).getRulesClient();
+        const ruleTypes = Array.from(await rulesClient.listAlertTypes());
         return res.ok({
           body: rewriteBodyRes(ruleTypes),
         });
diff --git a/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts b/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts
index f7e83301385ad..dd0af1c77ac1a 100644
--- a/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { snoozeRuleRoute } from './snooze_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/snooze_rule.ts b/x-pack/plugins/alerting/server/routes/snooze_rule.ts
index 3b2167cc79fa3..a408a4d3175df 100644
--- a/x-pack/plugins/alerting/server/routes/snooze_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/snooze_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleMutedError } from '../lib';
 import { verifyAccessAndContext, RewriteRequestCase } from './lib';
@@ -44,7 +44,7 @@ export const snoozeRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const params = req.params;
         const body = rewriteBodyReq(req.body);
         try {
diff --git a/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts b/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts
index bfc281cb16b2f..6f9c553831e77 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { unmuteAlertRoute } from './unmute_alert';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/unmute_alert.ts b/x-pack/plugins/alerting/server/routes/unmute_alert.ts
index 0269f53fa8827..1e4191745f621 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_alert.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_alert.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { MuteOptions } from '../rules_client';
@@ -38,7 +38,7 @@ export const unmuteAlertRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const params = rewriteParamsReq(req.params);
         try {
           await rulesClient.unmuteInstance(params);
diff --git a/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts b/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts
index ff97819506276..8671247987bd4 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { unmuteAllRuleRoute } from './unmute_all_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts b/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts
index 05ae9be2ba6e5..4e102f96cf381 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
@@ -28,7 +28,7 @@ export const unmuteAllRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         try {
           await rulesClient.unmuteAll({ id });
diff --git a/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts b/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts
index 260e4b4150043..0a67c3aa608dc 100644
--- a/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { unsnoozeRuleRoute } from './unsnooze_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts b/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts
index f779f1681d482..b91fb24bea56a 100644
--- a/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleMutedError } from '../lib';
 import { verifyAccessAndContext } from './lib';
@@ -28,7 +28,7 @@ export const unsnoozeRuleRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const params = req.params;
         try {
           await rulesClient.unsnooze({ ...params });
diff --git a/x-pack/plugins/alerting/server/routes/update_rule.test.ts b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
index f39ad53c8786d..853a002ade57c 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { updateRuleRoute } from './update_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -19,7 +19,7 @@ import { AsApiContract } from './lib';
 import { PartialRule } from '../types';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/update_rule.ts b/x-pack/plugins/alerting/server/routes/update_rule.ts
index 5c416e50b4ff2..d2130e1f33541 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, RuleTypeDisabledError, validateDurationSchema } from '../lib';
 import { RuleNotifyWhenType } from '../../common';
 import { UpdateOptions } from '../rules_client';
@@ -119,7 +119,7 @@ export const updateRuleRoute = (
     handleDisabledApiKeysError(
       router.handleLegacyErrors(
         verifyAccessAndContext(licenseState, async function (context, req, res) {
-          const rulesClient = context.alerting.getRulesClient();
+          const rulesClient = (await context.alerting).getRulesClient();
           const { id } = req.params;
           const rule = req.body;
           try {
diff --git a/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts b/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts
index 2622c260d7938..4b2847eb16f73 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { updateRuleApiKeyRoute } from './update_rule_api_key';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts b/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts
index a6644e455a9be..4e99b54e76af4 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
@@ -28,7 +28,7 @@ export const updateRuleApiKeyRoute = (
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
         const { id } = req.params;
         try {
           await rulesClient.updateApiKey({ id });
diff --git a/x-pack/plugins/alerting/server/rule_type_registry.test.ts b/x-pack/plugins/alerting/server/rule_type_registry.test.ts
index f4102a2bc6227..abaeee60759e9 100644
--- a/x-pack/plugins/alerting/server/rule_type_registry.test.ts
+++ b/x-pack/plugins/alerting/server/rule_type_registry.test.ts
@@ -8,11 +8,11 @@
 import { TaskRunnerFactory } from './task_runner';
 import { RuleTypeRegistry, ConstructorOptions } from './rule_type_registry';
 import { ActionGroup, RuleType } from './types';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ILicenseState } from './lib/license_state';
 import { licenseStateMock } from './lib/license_state.mock';
-import { licensingMock } from '../../licensing/server/mocks';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
 const logger = loggingSystemMock.create().get();
@@ -61,7 +61,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -87,7 +87,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -125,7 +125,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -154,7 +154,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -186,7 +186,7 @@ describe('Create Lifecycle', () => {
         producer: 'alerts',
         defaultScheduleInterval: 'foobar',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -279,7 +279,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -313,7 +313,7 @@ describe('Create Lifecycle', () => {
         minimumLicenseRequired: 'basic',
         isExportable: true,
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -351,7 +351,7 @@ describe('Create Lifecycle', () => {
         minimumLicenseRequired: 'basic',
         isExportable: true,
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -393,7 +393,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -424,7 +424,7 @@ describe('Create Lifecycle', () => {
         producer: 'alerts',
         ruleTaskTimeout: '20m',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -461,7 +461,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -489,7 +489,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -510,7 +510,7 @@ describe('Create Lifecycle', () => {
           executor: jest.fn(),
           producer: 'alerts',
           config: {
-            execution: {
+            run: {
               actions: { max: 1000 },
             },
           },
@@ -537,7 +537,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -561,7 +561,7 @@ describe('Create Lifecycle', () => {
           "state": Array [],
         },
         "config": Object {
-          "execution": Object {
+          "run": Object {
             "actions": Object {
               "max": 1000,
             },
@@ -616,7 +616,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -715,7 +715,7 @@ describe('Create Lifecycle', () => {
         minimumLicenseRequired: 'basic',
         recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -753,7 +753,7 @@ function ruleTypeWithVariables<ActionGroupIds extends string>(
     async executor() {},
     producer: 'alerts',
     config: {
-      execution: {
+      run: {
         actions: { max: 1000 },
       },
     },
diff --git a/x-pack/plugins/alerting/server/rule_type_registry.ts b/x-pack/plugins/alerting/server/rule_type_registry.ts
index bc548b8ae2286..338450746781b 100644
--- a/x-pack/plugins/alerting/server/rule_type_registry.ts
+++ b/x-pack/plugins/alerting/server/rule_type_registry.ts
@@ -10,9 +10,9 @@ import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 import typeDetect from 'type-detect';
 import { intersection } from 'lodash';
-import { Logger } from 'kibana/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { RunContext, TaskManagerSetupContract } from '../../task_manager/server';
+import { Logger } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { RunContext, TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerFactory } from './task_runner';
 import {
   RuleType,
diff --git a/x-pack/plugins/alerting/server/rules_client/audit_events.ts b/x-pack/plugins/alerting/server/rules_client/audit_events.ts
index 2192073a1244b..a60cc503d3c8e 100644
--- a/x-pack/plugins/alerting/server/rules_client/audit_events.ts
+++ b/x-pack/plugins/alerting/server/rules_client/audit_events.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { EcsEventOutcome, EcsEventType } from 'src/core/server';
-import { AuditEvent } from '../../../security/server';
+import { EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { AuditEvent } from '@kbn/security-plugin/server';
 
 export enum RuleAuditAction {
   CREATE = 'rule_create',
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
index 26385cfac3f78..3479ca374e596 100644
--- a/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
@@ -6,8 +6,8 @@
  */
 
 import { snakeCase } from 'lodash';
+import { SavedObjectAttribute } from '@kbn/core/server';
 import { RuleTypeParams, MappedParams, MappedParamsProperties } from '../../types';
-import { SavedObjectAttribute } from '../../../../../../src/core/server';
 import {
   iterateFilterKureyNode,
   IterateFilterKureyNodeParams,
diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
index ac53486d279fd..d925315928f2c 100644
--- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts
+++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
@@ -19,8 +19,21 @@ import {
   PluginInitializerContext,
   SavedObjectsUtils,
   SavedObjectAttributes,
-} from '../../../../../src/core/server';
-import { ActionsClient, ActionsAuthorization } from '../../../actions/server';
+} from '@kbn/core/server';
+import { ActionsClient, ActionsAuthorization } from '@kbn/actions-plugin/server';
+import {
+  GrantAPIKeyResult as SecurityPluginGrantAPIKeyResult,
+  InvalidateAPIKeyResult as SecurityPluginInvalidateAPIKeyResult,
+} from '@kbn/security-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
+import {
+  IEvent,
+  IEventLogClient,
+  IEventLogger,
+  SAVED_OBJECT_REL_PRIMARY,
+} from '@kbn/event-log-plugin/server';
+import { AuditLogger } from '@kbn/security-plugin/server';
 import {
   Rule,
   PartialRule,
@@ -41,12 +54,6 @@ import {
   RawAlertInstance as RawAlert,
 } from '../types';
 import { validateRuleTypeParams, ruleExecutionStatusFromRaw, getRuleNotifyWhenType } from '../lib';
-import {
-  GrantAPIKeyResult as SecurityPluginGrantAPIKeyResult,
-  InvalidateAPIKeyResult as SecurityPluginInvalidateAPIKeyResult,
-} from '../../../security/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { TaskManagerStartContract } from '../../../task_manager/server';
 import { taskInstanceToAlertTaskInstance } from '../task_runner/alert_task_instance';
 import { RegistryRuleType, UntypedNormalizedRuleType } from '../rule_type_registry';
 import {
@@ -57,15 +64,8 @@ import {
   AlertingAuthorizationFilterType,
   AlertingAuthorizationFilterOpts,
 } from '../authorization';
-import {
-  IEvent,
-  IEventLogClient,
-  IEventLogger,
-  SAVED_OBJECT_REL_PRIMARY,
-} from '../../../event_log/server';
 import { parseIsoOrRelativeDate } from '../lib/iso_or_relative_date';
 import { alertSummaryFromEventLog } from '../lib/alert_summary_from_event_log';
-import { AuditLogger } from '../../../security/server';
 import { parseDuration } from '../../common/parse_duration';
 import { retryIfConflicts } from '../lib/retry_if_conflicts';
 import { partiallyUpdateAlert } from '../saved_objects';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts
index af27decb73a2a..b74059e4be3d6 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
index 8a9cd1d4acc7f..d695acf574aeb 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
@@ -7,21 +7,21 @@
 
 import { schema } from '@kbn/config-schema';
 import { RulesClient, ConstructorOptions, CreateOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization, ActionsClient } from '../../../../actions/server';
-import { TaskStatus } from '../../../../task_manager/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization, ActionsClient } from '@kbn/actions-plugin/server';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { getDefaultRuleMonitoring } from '../../task_runner/task_runner';
 
-jest.mock('../../../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
@@ -1167,7 +1167,7 @@ describe('create()', () => {
         injectReferences: injectReferencesFn,
       },
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
@@ -1340,7 +1340,7 @@ describe('create()', () => {
         injectReferences: injectReferencesFn,
       },
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
@@ -2099,7 +2099,7 @@ describe('create()', () => {
       async executor() {},
       producer: 'alerts',
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
@@ -2629,7 +2629,7 @@ describe('create()', () => {
         injectReferences: jest.fn(),
       },
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
index db19346e34946..f6194ec6c1a5f 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
index 5a6a7265d3a33..f15b647a8e396 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
@@ -6,19 +6,19 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { InvalidatePendingApiKey } from '../../types';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
-import { eventLoggerMock } from '../../../../event_log/server/event_logger.mock';
-import { TaskStatus } from '../../../../task_manager/server';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
 
 jest.mock('uuid', () => ({
   v4: () => '5f6aa57d-3e22-484e-bae8-cbed868f4d28',
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
index 36ffd44a1df30..0a4737006d557 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { TaskStatus } from '../../../../task_manager/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { InvalidatePendingApiKey } from '../../types';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
index a803859f58af6..6ba7469335b88 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
 import { nodeTypes, fromKueryExpression } from '@kbn/es-query';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
index 8ff06637b2efd..eb61f754bb6b3 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
index 238dad71f6344..88f6e466be821 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { TaskStatus } from '../../../../task_manager/server';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { getBeforeSetup } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts
index 64f28096b788f..6dcd64565c562 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts
@@ -7,17 +7,17 @@
 
 import { omit, mean } from 'lodash';
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { eventLogClientMock } from '../../../../event_log/server/mocks';
-import { QueryEventsBySavedObjectResult } from '../../../../event_log/server';
-import { SavedObject } from 'kibana/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { eventLogClientMock } from '@kbn/event-log-plugin/server/mocks';
+import { QueryEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
+import { SavedObject } from '@kbn/core/server';
 import { EventsFactory } from '../../lib/alert_summary_from_event_log.test';
 import { RawRule } from '../../types';
 import { getBeforeSetup, mockedDateString, setGlobalDate } from './lib';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts
index df5f9252a98a0..0eee41402000f 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts
@@ -7,18 +7,18 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { eventLogClientMock } from '../../../../event_log/server/mocks';
-import { SavedObject } from 'kibana/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { eventLogClientMock } from '@kbn/event-log-plugin/server/mocks';
+import { SavedObject } from '@kbn/core/server';
 import { RawRule } from '../../types';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, mockedDateString, setGlobalDate } from './lib';
 import { getExecutionLogAggregation } from '../../lib/get_execution_log_aggregation';
 
@@ -131,7 +131,7 @@ const aggregateResults = {
               numTriggeredActions: {
                 value: 5.0,
               },
-              numScheduledActions: {
+              numGeneratedActions: {
                 value: 5.0,
               },
               outcomeAndMessage: {
@@ -216,7 +216,7 @@ const aggregateResults = {
               numTriggeredActions: {
                 value: 5.0,
               },
-              numScheduledActions: {
+              numGeneratedActions: {
                 value: 5.0,
               },
               outcomeAndMessage: {
@@ -635,7 +635,7 @@ describe('getExecutionLogForRule()', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 0,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -654,7 +654,7 @@ describe('getExecutionLogForRule()', () => {
           num_new_alerts: 5,
           num_recovered_alerts: 5,
           num_triggered_actions: 5,
-          num_scheduled_actions: 5,
+          num_generated_actions: 5,
           num_succeeded_actions: 5,
           num_errored_actions: 0,
           total_search_duration_ms: 0,
@@ -929,7 +929,7 @@ describe('getExecutionLogForRule()', () => {
         getExecutionLogByIdParams({ sort: [{ foo: { order: 'desc' } }] })
       )
     ).rejects.toMatchInlineSnapshot(
-      `[Error: Invalid sort field "foo" - must be one of [timestamp,execution_duration,total_search_duration,es_search_duration,schedule_delay,num_triggered_actions,num_scheduled_actions]]`
+      `[Error: Invalid sort field "foo" - must be one of [timestamp,execution_duration,total_search_duration,es_search_duration,schedule_delay,num_triggered_actions,num_generated_actions]]`
     );
   });
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/lib.ts b/x-pack/plugins/alerting/server/rules_client/tests/lib.ts
index 489dbb27b9e18..b25fd2ab2c489 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/lib.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/lib.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { IEventLogClient } from '../../../../event_log/server';
-import { actionsClientMock } from '../../../../actions/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { IEventLogClient } from '@kbn/event-log-plugin/server';
+import { actionsClientMock } from '@kbn/actions-plugin/server/mocks';
+import { eventLogClientMock } from '@kbn/event-log-plugin/server/mocks';
 import { ConstructorOptions } from '../rules_client';
-import { eventLogClientMock } from '../../../../event_log/server/mocks';
 import { RuleTypeRegistry } from '../../rule_type_registry';
 import { RecoveredActionGroup } from '../../../common';
 
@@ -92,7 +92,7 @@ export function getBeforeSetup(
     async executor() {},
     producer: 'alerts',
     config: {
-      execution: {
+      run: {
         actions: { max: 1000 },
       },
     },
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts
index 7a5d3863923fb..0a3f5981a33a0 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts
@@ -6,17 +6,17 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import {
   AlertingAuthorization,
   RegistryAlertTypeWithAuth,
 } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { getBeforeSetup } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts
index 3d4b3a6ec3d03..7f8ae28a20c6e 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts
index c0000c3ae6a43..d566ea8c18bd5 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
index 3387d5a30bed1..20aced1c32369 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts
index 1ff4c8be3df02..cf063eea07862 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts
index 3de2d654c9c5f..6f52b6291474f 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
index 4bc0276a9ae1a..c2005d8a061b5 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
@@ -8,22 +8,22 @@
 import uuid from 'uuid';
 import { schema } from '@kbn/config-schema';
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
 import { IntervalSchedule, InvalidatePendingApiKey } from '../../types';
 import { RecoveredActionGroup } from '../../../common';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
 import { resolvable } from '../../test_utils';
-import { ActionsAuthorization, ActionsClient } from '../../../../actions/server';
-import { TaskStatus } from '../../../../task_manager/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization, ActionsClient } from '@kbn/actions-plugin/server';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
-jest.mock('../../../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts
index 9ce129f361a01..abc0db48ac167 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { InvalidatePendingApiKey } from '../../types';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
diff --git a/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts b/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts
index 626207bad4bb4..3732c79075f97 100644
--- a/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts
@@ -8,17 +8,17 @@
 import { cloneDeep } from 'lodash';
 
 import { RulesClient, ConstructorOptions } from './rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from './rule_type_registry.mock';
 import { alertingAuthorizationMock } from './authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { actionsClientMock, actionsAuthorizationMock } from '../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsClientMock, actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from './authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../actions/server';
-import { SavedObjectsErrorHelpers } from '../../../../src/core/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { RetryForConflictsAttempts } from './lib/retry_if_conflicts';
-import { TaskStatus } from '../../task_manager/server/task';
+import { TaskStatus } from '@kbn/task-manager-plugin/server/task';
 import { RecoveredActionGroup } from '../common';
 
 let rulesClient: RulesClient;
diff --git a/x-pack/plugins/alerting/server/rules_client_factory.test.ts b/x-pack/plugins/alerting/server/rules_client_factory.test.ts
index cf8e4604f01d9..080480e8b3d1e 100644
--- a/x-pack/plugins/alerting/server/rules_client_factory.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client_factory.test.ts
@@ -8,19 +8,19 @@
 import { Request } from '@hapi/hapi';
 import { RulesClientFactory, RulesClientFactoryOpts } from './rules_client_factory';
 import { ruleTypeRegistryMock } from './rule_type_registry.mock';
-import { taskManagerMock } from '../../task_manager/server/mocks';
-import { KibanaRequest } from '../../../../src/core/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   savedObjectsClientMock,
   savedObjectsServiceMock,
   loggingSystemMock,
-} from '../../../../src/core/server/mocks';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { AuthenticatedUser } from '../../security/common/model';
-import { securityMock } from '../../security/server/mocks';
-import { PluginStartContract as ActionsStartContract } from '../../actions/server';
-import { actionsMock, actionsAuthorizationMock } from '../../actions/server/mocks';
-import { eventLogMock } from '../../event_log/server/mocks';
+} from '@kbn/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { PluginStartContract as ActionsStartContract } from '@kbn/actions-plugin/server';
+import { actionsMock, actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
+import { eventLogMock } from '@kbn/event-log-plugin/server/mocks';
 import { alertingAuthorizationMock } from './authorization/alerting_authorization.mock';
 import { alertingAuthorizationClientFactoryMock } from './alerting_authorization_client_factory.mock';
 import { AlertingAuthorization } from './authorization';
diff --git a/x-pack/plugins/alerting/server/rules_client_factory.ts b/x-pack/plugins/alerting/server/rules_client_factory.ts
index 19231030c4007..19184d3baa329 100644
--- a/x-pack/plugins/alerting/server/rules_client_factory.ts
+++ b/x-pack/plugins/alerting/server/rules_client_factory.ts
@@ -10,14 +10,14 @@ import {
   Logger,
   SavedObjectsServiceStart,
   PluginInitializerContext,
-} from 'src/core/server';
-import { PluginStartContract as ActionsPluginStartContract } from '../../actions/server';
-import { RulesClient } from './rules_client';
+} from '@kbn/core/server';
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
+import { IEventLogClientService, IEventLogger } from '@kbn/event-log-plugin/server';
 import { RuleTypeRegistry, SpaceIdToNamespaceFunction } from './types';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { EncryptedSavedObjectsClient } from '../../encrypted_saved_objects/server';
-import { TaskManagerStartContract } from '../../task_manager/server';
-import { IEventLogClientService, IEventLogger } from '../../../plugins/event_log/server';
+import { RulesClient } from './rules_client';
 import { AlertingAuthorizationClientFactory } from './alerting_authorization_client_factory';
 import { AlertingRulesConfig } from './config';
 export interface RulesClientFactoryOpts {
diff --git a/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts b/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts
index ffed0e0b5efbc..7ad94643f47cf 100644
--- a/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts
@@ -9,9 +9,9 @@ import {
   SavedObjectAttributes,
   SavedObjectReference,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
-import { RuleTypeParams } from '../../index';
-import { Query } from '../../../../../../src/plugins/data/common/query';
+} from '@kbn/core/server';
+import { Query } from '@kbn/data-plugin/common/query';
+import { RuleTypeParams } from '../..';
 import { RawRule } from '../../types';
 
 // These definitions are dupes of the SO-types in stack_alerts/geo_containment
diff --git a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts
index 0bf2db556c2dc..1eff02d732231 100644
--- a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { RawRule } from '../types';
 import { getImportWarnings } from './get_import_warnings';
 
diff --git a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts
index 0058cd82c9d83..6bd7feacb635d 100644
--- a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectsImportWarning } from 'kibana/server';
+import { SavedObject, SavedObjectsImportWarning } from '@kbn/core/server';
 
 export function getImportWarnings(
   rulesSavedObjects: Array<SavedObject<unknown>>
diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
index 16736a24a9a38..47e172005ccbe 100644
--- a/x-pack/plugins/alerting/server/saved_objects/index.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -11,10 +11,10 @@ import type {
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
   SavedObjectsTypeMappingDefinition,
-} from 'kibana/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import mappings from './mappings.json';
 import { getMigrations } from './migrations';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { transformRulesForExport } from './transform_rule_for_export';
 import { RawRule } from '../types';
 import { getImportWarnings } from './get_import_warnings';
diff --git a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts
index 6bd3dfc99472b..0f2677dc49751 100644
--- a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts
@@ -8,13 +8,13 @@
 import { MockedLogger, loggerMock } from '@kbn/logging-mocks';
 import { TaskRunnerFactory } from '../task_runner';
 import { RuleTypeRegistry, ConstructorOptions } from '../rule_type_registry';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ILicenseState } from '../lib/license_state';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { isRuleExportable } from './is_rule_exportable';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 let ruleTypeRegistryParams: ConstructorOptions;
 let logger: MockedLogger;
diff --git a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts
index 31ada226cacfd..34339a1fdb388 100644
--- a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObject } from 'kibana/server';
+import { Logger, SavedObject } from '@kbn/core/server';
 import { RawRule } from '../types';
 import { RuleTypeRegistry } from '../rule_type_registry';
 
diff --git a/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts b/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
index 28b1f599f9575..6b736006fc074 100644
--- a/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
@@ -8,9 +8,9 @@
 import uuid from 'uuid';
 import { getMigrations, isAnyActionSupportIncidents } from './migrations';
 import { RawRule } from '../types';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { RuleType, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
 const migrationContext = migrationMocks.createContext();
diff --git a/x-pack/plugins/alerting/server/saved_objects/migrations.ts b/x-pack/plugins/alerting/server/saved_objects/migrations.ts
index 91e03eb4da6c2..18de27eb6919e 100644
--- a/x-pack/plugins/alerting/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/migrations.ts
@@ -16,12 +16,12 @@ import {
   SavedObjectAttributes,
   SavedObjectAttribute,
   SavedObjectReference,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import type { IsMigrationNeededPredicate } from '@kbn/encrypted-saved-objects-plugin/server';
 import { RawRule, RawRuleAction, RawRuleExecutionStatus } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
-import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
 import { extractRefsFromGeoContainmentAlert } from './geo_containment/migrations';
-import { getMappedParams } from '../../server/rules_client/lib/mapped_params_utils';
+import { getMappedParams } from '../rules_client/lib/mapped_params_utils';
 
 const SIEM_APP_ID = 'securitySolution';
 const SIEM_SERVER_APP_ID = 'siem';
diff --git a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts
index 37729dada3168..7560632d12e5a 100644
--- a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts
@@ -9,10 +9,10 @@ import {
   SavedObjectsClientContract,
   ISavedObjectsRepository,
   SavedObjectsErrorHelpers,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 
 import { partiallyUpdateAlert, PartiallyUpdateableAlertAttributes } from './partially_update_alert';
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 const MockSavedObjectsClientContract = savedObjectsClientMock.create();
 const MockISavedObjectsRepository =
diff --git a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts
index 76303722fc876..2c275a5f602fc 100644
--- a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts
@@ -6,15 +6,14 @@
  */
 
 import { pick } from 'lodash';
-import { RawRule } from '../types';
-
 import {
   SavedObjectsClient,
   SavedObjectsErrorHelpers,
   SavedObjectsUpdateOptions,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { RawRule } from '../types';
 
-import { AlertAttributesExcludedFromAAD, AlertAttributesExcludedFromAADType } from './index';
+import { AlertAttributesExcludedFromAAD, AlertAttributesExcludedFromAADType } from '.';
 
 export type PartiallyUpdateableAlertAttributes = Partial<
   Pick<RawRule, AlertAttributesExcludedFromAADType>
diff --git a/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts b/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts
index 5b89f6394e3c5..4c1aafa9e5cb7 100644
--- a/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { getRuleExecutionStatusPending } from '../lib/rule_execution_status';
 import { RawRule } from '../types';
 
diff --git a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts
index f5183e9e19dcc..3faea1a4d2261 100644
--- a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { AlertTaskInstance, taskInstanceToAlertTaskInstance } from './alert_task_instance';
 import uuid from 'uuid';
 import { SanitizedRule } from '../types';
diff --git a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts
index fd61b37a277de..d831fe8c63b07 100644
--- a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts
+++ b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts
@@ -8,7 +8,7 @@
 import * as t from 'io-ts';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
-import { ConcreteTaskInstance } from '../../../task_manager/server';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import {
   SanitizedRule,
   RuleTaskState,
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
index af0220ccba987..db84953291c73 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
@@ -7,15 +7,15 @@
 
 import { createExecutionHandler } from './create_execution_handler';
 import { ActionsCompletion, AlertExecutionStore, CreateExecutionHandlerOptions } from './types';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   actionsClientMock,
   actionsMock,
   renderActionParameterTemplatesDefault,
-} from '../../../actions/server/mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
-import { KibanaRequest } from 'kibana/server';
-import { asSavedObjectExecutionSource } from '../../../actions/server';
+} from '@kbn/actions-plugin/server/mocks';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { KibanaRequest } from '@kbn/core/server';
+import { asSavedObjectExecutionSource } from '@kbn/actions-plugin/server';
 import { InjectActionParamsOpts } from './inject_action_params';
 import { NormalizedRuleType } from '../rule_type_registry';
 import { AlertInstanceContext, AlertInstanceState, RuleTypeParams, RuleTypeState } from '../types';
@@ -49,7 +49,7 @@ const ruleType: NormalizedRuleType<
   executor: jest.fn(),
   producer: 'alerts',
   config: {
-    execution: {
+    run: {
       actions: { max: 1000 },
     },
   },
@@ -122,7 +122,7 @@ describe('Create Execution Handler', () => {
     );
     alertExecutionStore = {
       numberOfTriggeredActions: 0,
-      numberOfScheduledActions: 0,
+      numberOfGeneratedActions: 0,
       triggeredActionsStatus: ActionsCompletion.COMPLETE,
     };
   });
@@ -476,7 +476,7 @@ describe('Create Execution Handler', () => {
       ruleType: {
         ...ruleType,
         config: {
-          execution: {
+          run: {
             actions: { max: 2 },
           },
         },
@@ -508,7 +508,7 @@ describe('Create Execution Handler', () => {
 
     alertExecutionStore = {
       numberOfTriggeredActions: 0,
-      numberOfScheduledActions: 0,
+      numberOfGeneratedActions: 0,
       triggeredActionsStatus: ActionsCompletion.COMPLETE,
     };
 
@@ -521,7 +521,7 @@ describe('Create Execution Handler', () => {
     });
 
     expect(alertExecutionStore.numberOfTriggeredActions).toBe(2);
-    expect(alertExecutionStore.numberOfScheduledActions).toBe(3);
+    expect(alertExecutionStore.numberOfGeneratedActions).toBe(3);
     expect(alertExecutionStore.triggeredActionsStatus).toBe(ActionsCompletion.PARTIAL);
     expect(actionsClient.enqueueExecution).toHaveBeenCalledTimes(2);
   });
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
index 7752817f17c85..b6b6eb0eaf880 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
@@ -4,15 +4,15 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { asSavedObjectExecutionSource } from '@kbn/actions-plugin/server';
+import { SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
+import { isEphemeralTaskRejectedDueToCapacityError } from '@kbn/task-manager-plugin/server';
 import { transformActionParams } from './transform_action_params';
-import { asSavedObjectExecutionSource } from '../../../actions/server';
-import { SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
 import { EVENT_LOG_ACTIONS } from '../plugin';
 import { injectActionParams } from './inject_action_params';
 import { AlertInstanceContext, AlertInstanceState, RuleTypeParams, RuleTypeState } from '../types';
 
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
-import { isEphemeralTaskRejectedDueToCapacityError } from '../../../task_manager/server';
 import { createAlertEventLogRecordObject } from '../lib/create_alert_event_log_record_object';
 import { ActionsCompletion, CreateExecutionHandlerOptions, ExecutionHandlerOptions } from './types';
 
@@ -107,7 +107,7 @@ export function createExecutionHandler<
         }),
       }));
 
-    alertExecutionStore.numberOfScheduledActions += actions.length;
+    alertExecutionStore.numberOfGeneratedActions += actions.length;
 
     const ruleLabel = `${ruleType.id}:${ruleId}: '${ruleName}'`;
 
@@ -115,7 +115,7 @@ export function createExecutionHandler<
     let ephemeralActionsToSchedule = maxEphemeralActionsPerRule;
 
     for (const action of actions) {
-      if (alertExecutionStore.numberOfTriggeredActions >= ruleType.config!.execution.actions.max) {
+      if (alertExecutionStore.numberOfTriggeredActions >= ruleType.config!.run.actions.max) {
         alertExecutionStore.triggeredActionsStatus = ActionsCompletion.PARTIAL;
         break;
       }
diff --git a/x-pack/plugins/alerting/server/task_runner/fixtures.ts b/x-pack/plugins/alerting/server/task_runner/fixtures.ts
index 613f3ed9e1645..7a851a713c961 100644
--- a/x-pack/plugins/alerting/server/task_runner/fixtures.ts
+++ b/x-pack/plugins/alerting/server/task_runner/fixtures.ts
@@ -6,6 +6,7 @@
  */
 
 import { isNil } from 'lodash';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
 import {
   Rule,
   RuleExecutionStatusWarningReasons,
@@ -14,7 +15,6 @@ import {
 } from '../../common';
 import { getDefaultRuleMonitoring } from './task_runner';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
-import { TaskStatus } from '../../../task_manager/server';
 import { EVENT_LOG_ACTIONS } from '../plugin';
 
 interface GeneratorParams {
@@ -109,7 +109,7 @@ export const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
   executor: jest.fn(),
   producer: 'alerts',
   config: {
-    execution: {
+    run: {
       actions: { max: 1000 },
     },
   },
@@ -216,7 +216,7 @@ export const generateEventLog = ({
   actionId,
   status,
   numberOfTriggeredActions,
-  numberOfScheduledActions,
+  numberOfGeneratedActions,
   savedObjects = [generateAlertSO('1')],
 }: GeneratorParams = {}) => ({
   ...(status === 'error' && {
@@ -240,10 +240,10 @@ export const generateEventLog = ({
         ...(consumer && { consumer }),
         execution: {
           uuid: '5f6aa57d-3e22-484e-bae8-cbed868f4d28',
-          ...((!isNil(numberOfTriggeredActions) || !isNil(numberOfScheduledActions)) && {
+          ...((!isNil(numberOfTriggeredActions) || !isNil(numberOfGeneratedActions)) && {
             metrics: {
               number_of_triggered_actions: numberOfTriggeredActions,
-              number_of_scheduled_actions: numberOfScheduledActions,
+              number_of_generated_actions: numberOfGeneratedActions,
               number_of_searches: 3,
               es_search_duration_ms: 33,
               total_search_duration_ms: 23423,
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
index 21109b60e012d..5ed33093cd8bc 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -7,7 +7,7 @@
 
 import sinon from 'sinon';
 import { schema } from '@kbn/config-schema';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   RuleExecutorOptions,
   RuleTypeParams,
@@ -20,10 +20,10 @@ import {
   ConcreteTaskInstance,
   isUnrecoverableError,
   RunNowResult,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
 import { TaskRunner } from './task_runner';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
@@ -32,16 +32,16 @@ import {
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
-import { actionsMock, actionsClientMock } from '../../../actions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
+import { actionsMock, actionsClientMock } from '@kbn/actions-plugin/server/mocks';
 import { alertsMock, rulesClientMock } from '../mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
-import { IEventLogger } from '../../../event_log/server';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { omit } from 'lodash';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { ExecuteOptions } from '../../../actions/server/create_execute_function';
+import { ExecuteOptions } from '@kbn/actions-plugin/server/create_execute_function';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 import moment from 'moment';
 import {
@@ -70,7 +70,7 @@ import {
 import { EVENT_LOG_ACTIONS } from '../plugin';
 import { IN_MEMORY_METRICS } from '../monitoring';
 import { translations } from '../constants/translations';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 
 jest.mock('uuid', () => ({
   v4: () => '5f6aa57d-3e22-484e-bae8-cbed868f4d28',
@@ -235,7 +235,7 @@ describe('Task Runner', () => {
     expect(logger.debug).nthCalledWith(1, 'executing rule test:1 at 1970-01-01T00:00:00.000Z');
     expect(logger.debug).nthCalledWith(
       2,
-      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfScheduledActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"ok"}'
+      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfGeneratedActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"ok"}'
     );
 
     const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
@@ -315,7 +315,7 @@ describe('Task Runner', () => {
       );
       expect(logger.debug).nthCalledWith(
         3,
-        'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":1,"numberOfScheduledActions":1,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+        'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":1,"numberOfGeneratedActions":1,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
       );
 
       const eventLogger = customTaskRunnerFactoryInitializerParams.eventLogger;
@@ -371,7 +371,7 @@ describe('Task Runner', () => {
           outcome: 'success',
           status: 'active',
           numberOfTriggeredActions: 1,
-          numberOfScheduledActions: 1,
+          numberOfGeneratedActions: 1,
           task: true,
           consumer: 'bar',
         })
@@ -423,7 +423,7 @@ describe('Task Runner', () => {
     );
     expect(logger.debug).nthCalledWith(
       4,
-      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfScheduledActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfGeneratedActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
     );
 
     const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
@@ -466,7 +466,7 @@ describe('Task Runner', () => {
         outcome: 'success',
         status: 'active',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
         consumer: 'bar',
       })
@@ -588,7 +588,7 @@ describe('Task Runner', () => {
       );
       expect(logger.debug).nthCalledWith(
         4,
-        'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":1,"numberOfScheduledActions":1,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+        'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":1,"numberOfGeneratedActions":1,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
       );
       expect(mockUsageCounter.incrementCounter).not.toHaveBeenCalled();
     }
@@ -777,7 +777,7 @@ describe('Task Runner', () => {
         outcome: 'success',
         status: 'active',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
         consumer: 'bar',
       })
@@ -842,7 +842,7 @@ describe('Task Runner', () => {
           outcome: 'success',
           status: 'active',
           numberOfTriggeredActions: 1,
-          numberOfScheduledActions: 1,
+          numberOfGeneratedActions: 1,
           task: true,
           consumer: 'bar',
         })
@@ -916,7 +916,7 @@ describe('Task Runner', () => {
           outcome: 'success',
           status: 'active',
           numberOfTriggeredActions: 1,
-          numberOfScheduledActions: 1,
+          numberOfGeneratedActions: 1,
           task: true,
           consumer: 'bar',
         })
@@ -1034,7 +1034,7 @@ describe('Task Runner', () => {
           outcome: 'success',
           status: 'active',
           numberOfTriggeredActions: 1,
-          numberOfScheduledActions: 1,
+          numberOfGeneratedActions: 1,
           task: true,
           consumer: 'bar',
         })
@@ -1116,7 +1116,7 @@ describe('Task Runner', () => {
       );
       expect(logger.debug).nthCalledWith(
         4,
-        'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":2,"numberOfScheduledActions":2,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+        'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":2,"numberOfGeneratedActions":2,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
       );
 
       const eventLogger = customTaskRunnerFactoryInitializerParams.eventLogger;
@@ -1183,7 +1183,7 @@ describe('Task Runner', () => {
           outcome: 'success',
           status: 'active',
           numberOfTriggeredActions: 2,
-          numberOfScheduledActions: 2,
+          numberOfGeneratedActions: 2,
           task: true,
           consumer: 'bar',
         })
@@ -1257,7 +1257,7 @@ describe('Task Runner', () => {
       );
       expect(logger.debug).nthCalledWith(
         4,
-        `ruleExecutionStatus for test:${alertId}: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":2,"numberOfScheduledActions":2,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}`
+        `ruleExecutionStatus for test:${alertId}: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":2,"numberOfGeneratedActions":2,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}`
       );
 
       const eventLogger = customTaskRunnerFactoryInitializerParams.eventLogger;
@@ -1445,7 +1445,7 @@ describe('Task Runner', () => {
         outcome: 'success',
         status: 'active',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 2,
+        numberOfGeneratedActions: 2,
         task: true,
         consumer: 'bar',
       })
@@ -2051,7 +2051,7 @@ describe('Task Runner', () => {
         outcome: 'success',
         status: 'active',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
         consumer: 'bar',
       })
@@ -2154,7 +2154,7 @@ describe('Task Runner', () => {
         outcome: 'success',
         status: 'active',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
         consumer: 'bar',
       })
@@ -2246,7 +2246,7 @@ describe('Task Runner', () => {
         status: 'active',
         consumer: 'bar',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
       })
     );
@@ -2336,7 +2336,7 @@ describe('Task Runner', () => {
         status: 'ok',
         consumer: 'bar',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
       })
     );
@@ -2422,7 +2422,7 @@ describe('Task Runner', () => {
         status: 'ok',
         consumer: 'bar',
         numberOfTriggeredActions: 0,
-        numberOfScheduledActions: 0,
+        numberOfGeneratedActions: 0,
         task: true,
       })
     );
@@ -2484,7 +2484,7 @@ describe('Task Runner', () => {
     expect(logger.debug).nthCalledWith(1, 'executing rule test:1 at 1970-01-01T00:00:00.000Z');
     expect(logger.debug).nthCalledWith(
       2,
-      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfScheduledActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"ok"}'
+      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfGeneratedActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"ok"}'
     );
 
     const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
@@ -2645,7 +2645,7 @@ describe('Task Runner', () => {
     const ruleTypeWithConfig = {
       ...ruleType,
       config: {
-        execution: {
+        run: {
           actions: { max: 3 },
         },
       },
@@ -2718,7 +2718,7 @@ describe('Task Runner', () => {
     const runnerResult = await taskRunner.run();
 
     expect(actionsClient.enqueueExecution).toHaveBeenCalledTimes(
-      ruleTypeWithConfig.config.execution.actions.max
+      ruleTypeWithConfig.config.run.actions.max
     );
 
     expect(
@@ -2818,8 +2818,8 @@ describe('Task Runner', () => {
         action: EVENT_LOG_ACTIONS.execute,
         outcome: 'success',
         status: 'warning',
-        numberOfTriggeredActions: ruleTypeWithConfig.config.execution.actions.max,
-        numberOfScheduledActions: mockActions.length,
+        numberOfTriggeredActions: ruleTypeWithConfig.config.run.actions.max,
+        numberOfGeneratedActions: mockActions.length,
         reason: RuleExecutionStatusWarningReasons.MAX_EXECUTABLE_ACTIONS,
         task: true,
         consumer: 'bar',
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index 36c8bddb1ff82..36703e7c28dd7 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -7,12 +7,13 @@
 import apm from 'elastic-apm-node';
 import { cloneDeep, mapValues, omit, pickBy, set, without } from 'lodash';
 import type { Request } from '@hapi/hapi';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import uuid from 'uuid';
-import { addSpaceIdToPath } from '../../../spaces/server';
-import { KibanaRequest, Logger } from '../../../../../src/core/server';
+import { addSpaceIdToPath } from '@kbn/spaces-plugin/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ConcreteTaskInstance, throwUnrecoverableError } from '@kbn/task-manager-plugin/server';
+import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
-import { ConcreteTaskInstance, throwUnrecoverableError } from '../../../task_manager/server';
 import { createExecutionHandler, ExecutionHandler } from './create_execution_handler';
 import { Alert, createAlertFactory } from '../alert';
 import {
@@ -45,7 +46,6 @@ import { asErr, asOk, map, promiseResult, resolveErr, Resultable } from '../lib/
 import { getExecutionDurationPercentiles, getExecutionSuccessRatio } from '../lib/monitoring';
 import { taskInstanceToAlertTaskInstance } from './alert_task_instance';
 import { EVENT_LOG_ACTIONS } from '../plugin';
-import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
 import { isAlertSavedObjectNotFoundError, isEsUnavailableError } from '../lib/is_alerting_error';
 import { partiallyUpdateAlert } from '../saved_objects';
 import {
@@ -493,7 +493,7 @@ export class TaskRunner<
 
     const alertExecutionStore: AlertExecutionStore = {
       numberOfTriggeredActions: 0,
-      numberOfScheduledActions: 0,
+      numberOfGeneratedActions: 0,
       triggeredActionsStatus: ActionsCompletion.COMPLETE,
     };
 
@@ -822,8 +822,8 @@ export class TaskRunner<
       );
       set(
         event,
-        'kibana.alert.rule.execution.metrics.number_of_scheduled_actions',
-        executionStatus.numberOfScheduledActions
+        'kibana.alert.rule.execution.metrics.number_of_generated_actions',
+        executionStatus.numberOfGeneratedActions
       );
     }
 
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
index 1e24ac986f015..66a7b85a94259 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   RuleExecutorOptions,
   RuleTypeParams,
@@ -14,10 +14,10 @@ import {
   AlertInstanceState,
   AlertInstanceContext,
 } from '../types';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
 import { TaskRunner } from './task_runner';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
@@ -26,16 +26,16 @@ import {
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
-import { actionsMock, actionsClientMock } from '../../../actions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
+import { actionsMock, actionsClientMock } from '@kbn/actions-plugin/server/mocks';
 import { alertsMock, rulesClientMock } from '../mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
-import { IEventLogger } from '../../../event_log/server';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
 import { Rule, RecoveredActionGroup } from '../../common';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 
 jest.mock('uuid', () => ({
@@ -58,7 +58,7 @@ const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
   cancelAlertsOnRuleTimeout: true,
   ruleTaskTimeout: '5m',
   config: {
-    execution: {
+    run: {
       actions: { max: 1000 },
     },
   },
@@ -333,7 +333,7 @@ describe('Task Runner Cancel', () => {
               metrics: {
                 number_of_searches: 3,
                 number_of_triggered_actions: 0,
-                number_of_scheduled_actions: 0,
+                number_of_generated_actions: 0,
                 es_search_duration_ms: 33,
                 total_search_duration_ms: 23423,
               },
@@ -523,7 +523,7 @@ describe('Task Runner Cancel', () => {
     );
     expect(logger.debug).nthCalledWith(
       7,
-      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfScheduledActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":0,"numberOfGeneratedActions":0,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
     );
 
     const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
@@ -617,7 +617,7 @@ describe('Task Runner Cancel', () => {
               metrics: {
                 number_of_searches: 3,
                 number_of_triggered_actions: 0,
-                number_of_scheduled_actions: 0,
+                number_of_generated_actions: 0,
                 es_search_duration_ms: 33,
                 total_search_duration_ms: 23423,
               },
@@ -683,7 +683,7 @@ describe('Task Runner Cancel', () => {
     );
     expect(logger.debug).nthCalledWith(
       6,
-      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":1,"numberOfScheduledActions":1,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+      'ruleExecutionStatus for test:1: {"metrics":{"numSearches":3,"esSearchDurationMs":33,"totalSearchDurationMs":23423},"numberOfTriggeredActions":1,"numberOfGeneratedActions":1,"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
     );
 
     const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
@@ -896,7 +896,7 @@ describe('Task Runner Cancel', () => {
               metrics: {
                 number_of_searches: 3,
                 number_of_triggered_actions: 1,
-                number_of_scheduled_actions: 1,
+                number_of_generated_actions: 1,
                 es_search_duration_ms: 33,
                 total_search_duration_ms: 23423,
               },
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
index 8cda4f9567d3f..0fe747ab7a93e 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -6,10 +6,10 @@
  */
 
 import sinon from 'sinon';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
@@ -17,14 +17,14 @@ import {
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { actionsMock } from '../../../actions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { actionsMock } from '@kbn/actions-plugin/server/mocks';
 import { rulesClientMock } from '../mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { executionContextServiceMock } from '../../../../../src/core/server/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 
 const inMemoryMetrics = inMemoryMetricsMock.create();
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
index 2cba16152e198..5a32e86593fa4 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type {
   Logger,
   KibanaRequest,
@@ -16,10 +16,12 @@ import type {
   SavedObjectsServiceStart,
   ElasticsearchServiceStart,
   UiSettingsServiceStart,
-} from '../../../../../src/core/server';
-import { RunContext } from '../../../task_manager/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server';
+} from '@kbn/core/server';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import {
   RuleTypeParams,
   RuleTypeRegistry,
@@ -29,10 +31,8 @@ import {
   AlertInstanceContext,
 } from '../types';
 import { TaskRunner } from './task_runner';
-import { IEventLogger } from '../../../event_log/server';
 import { RulesClient } from '../rules_client';
 import { NormalizedRuleType } from '../rule_type_registry';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 import { InMemoryMetrics } from '../monitoring';
 
 export interface TaskRunnerContext {
diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
index e325d597da145..6235e630ba0bb 100644
--- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
@@ -6,7 +6,10 @@
  */
 
 import { transformActionParams } from './transform_action_params';
-import { actionsMock, renderActionParameterTemplatesDefault } from '../../../actions/server/mocks';
+import {
+  actionsMock,
+  renderActionParameterTemplatesDefault,
+} from '@kbn/actions-plugin/server/mocks';
 
 const actionsPlugin = actionsMock.createStart();
 const actionTypeId = 'test-actionTypeId';
diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
index 387bdc00125f0..322a16c1c238e 100644
--- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
+++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 import {
   RuleActionParams,
   AlertInstanceState,
   AlertInstanceContext,
   RuleTypeParams,
 } from '../types';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server';
 
 interface TransformActionParamsOptions {
   actionsPlugin: ActionsPluginStartContract;
diff --git a/x-pack/plugins/alerting/server/task_runner/types.ts b/x-pack/plugins/alerting/server/task_runner/types.ts
index d5ad11f246c49..735470cf7220b 100644
--- a/x-pack/plugins/alerting/server/task_runner/types.ts
+++ b/x-pack/plugins/alerting/server/task_runner/types.ts
@@ -6,7 +6,10 @@
  */
 
 import { Dictionary } from 'lodash';
-import { KibanaRequest, Logger } from 'kibana/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 import {
   ActionGroup,
   RuleAction,
@@ -20,12 +23,9 @@ import {
   RuleTaskState,
   SanitizedRule,
 } from '../../common';
-import { ConcreteTaskInstance } from '../../../task_manager/server';
 import { Alert } from '../alert';
-import { IEventLogger } from '../../../event_log/server';
 import { NormalizedRuleType } from '../rule_type_registry';
 import { ExecutionHandler } from './create_execution_handler';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server';
 import { RawRule } from '../types';
 
 export interface RuleTaskRunResultWithActions {
@@ -163,6 +163,6 @@ export enum ActionsCompletion {
 
 export interface AlertExecutionStore {
   numberOfTriggeredActions: number;
-  numberOfScheduledActions: number;
+  numberOfGeneratedActions: number;
   triggeredActionsStatus: ActionsCompletion;
 }
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
index cfd03f4edf184..32c6e41c63268 100644
--- a/x-pack/plugins/alerting/server/types.ts
+++ b/x-pack/plugins/alerting/server/types.ts
@@ -7,21 +7,21 @@
 
 import type {
   IRouter,
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   SavedObjectReference,
   IUiSettingsClient,
-} from 'src/core/server';
+  IScopedClusterClient,
+  SavedObjectAttributes,
+  SavedObjectsClientContract,
+} from '@kbn/core/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { ISearchStartSearchSource } from '@kbn/data-plugin/common';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 import { AlertFactoryDoneUtils, PublicAlert } from './alert';
 import { RuleTypeRegistry as OrigruleTypeRegistry } from './rule_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { RulesClient } from './rules_client';
 export * from '../common';
-import {
-  IScopedClusterClient,
-  SavedObjectAttributes,
-  SavedObjectsClientContract,
-} from '../../../../src/core/server';
 import {
   Rule,
   RuleTypeParams,
@@ -41,8 +41,6 @@ import {
   RuleMonitoring,
   MappedParams,
 } from '../common';
-import { LicenseType } from '../../licensing/server';
-import { ISearchStartSearchSource } from '../../../../src/plugins/data/common';
 import { RuleTypeConfig } from './config';
 export type WithoutQueryAndParams<T> = Pick<T, Exclude<keyof T, 'query' | 'params'>>;
 export type SpaceIdToNamespaceFunction = (spaceId?: string) => string | undefined;
@@ -60,9 +58,9 @@ export interface AlertingApiRequestHandlerContext {
 /**
  * @internal
  */
-export interface AlertingRequestHandlerContext extends RequestHandlerContext {
+export type AlertingRequestHandlerContext = CustomRequestHandlerContext<{
   alerting: AlertingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts b/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts
index 61383656e67d5..e43283e14e822 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import {
   getTotalCountAggregations,
   getTotalCountInUse,
@@ -264,12 +264,12 @@ Object {
       },
       countTotal: 4,
       countTotalFailures: 4,
-      scheduledActionsPercentiles: {
+      generatedActionsPercentiles: {
         p50: 4,
         p90: 26,
         p99: 26,
       },
-      scheduledActionsPercentilesByType: {
+      generatedActionsPercentilesByType: {
         p50: {
           '__index-threshold': 4,
           logs__alert__document__count: 10,
diff --git a/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts b/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts
index 2e360374faa42..78ec88d959a8b 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get, merge } from 'lodash';
 import { AlertingUsage } from './types';
 import { NUM_ALERTING_RULE_TYPES } from './alerting_usage_collector';
@@ -47,9 +47,9 @@ const ruleTypeMetric = {
   },
 };
 
-const scheduledActionsPercentilesAgg = {
+const generatedActionsPercentilesAgg = {
   percentiles: {
-    field: 'kibana.alert.rule.execution.metrics.number_of_scheduled_actions',
+    field: 'kibana.alert.rule.execution.metrics.number_of_generated_actions',
     percents: [50, 90, 99],
   },
 };
@@ -425,14 +425,14 @@ export async function getExecutionsPerDayCount(
         avgTotalSearchDuration: {
           avg: { field: 'kibana.alert.rule.execution.metrics.total_search_duration_ms' },
         },
-        percentileScheduledActions: scheduledActionsPercentilesAgg,
+        percentileScheduledActions: generatedActionsPercentilesAgg,
         aggsByType: {
           terms: {
             field: 'rule.category',
             size: NUM_ALERTING_RULE_TYPES,
           },
           aggs: {
-            percentileScheduledActions: scheduledActionsPercentilesAgg,
+            percentileScheduledActions: generatedActionsPercentilesAgg,
           },
         },
       },
@@ -465,7 +465,7 @@ export async function getExecutionsPerDayCount(
     searchResult.aggregations.avgTotalSearchDuration.value
   );
 
-  const aggsScheduledActionsPercentiles =
+  const aggsGeneratedActionsPercentiles =
     // @ts-expect-error aggegation type is not specified
     searchResult.aggregations.percentileScheduledActions.values;
 
@@ -571,18 +571,18 @@ export async function getExecutionsPerDayCount(
       }),
       {}
     ),
-    scheduledActionsPercentiles: Object.keys(aggsScheduledActionsPercentiles).reduce(
+    generatedActionsPercentiles: Object.keys(aggsGeneratedActionsPercentiles).reduce(
       // ES DSL aggregations are returned as `any` by esClient.search
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (acc: any, curr: string) => ({
         ...acc,
         ...(percentileFieldNameMapping[curr]
-          ? { [percentileFieldNameMapping[curr]]: aggsScheduledActionsPercentiles[curr] }
+          ? { [percentileFieldNameMapping[curr]]: aggsGeneratedActionsPercentiles[curr] }
           : {}),
       }),
       {}
     ),
-    scheduledActionsPercentilesByType: parsePercentileAggsByRuleType(
+    generatedActionsPercentilesByType: parsePercentileAggsByRuleType(
       aggsByTypeBuckets,
       'percentileScheduledActions.values'
     ),
diff --git a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts
index e05086949b349..fd8960adf4d8c 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { registerAlertingUsageCollector } from './alerting_usage_collector';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 const taskManagerStart = taskManagerMock.createStart();
 
 beforeEach(() => jest.resetAllMocks());
diff --git a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts
index b0990bab9491d..b80afbc81e77e 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { get } from 'lodash';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import { AlertingUsage } from './types';
 
 const byTypeSchema: MakeSchemaFrom<AlertingUsage>['count_by_type'] = {
@@ -68,14 +68,14 @@ const byReasonSchema: MakeSchemaFrom<AlertingUsage>['count_rules_executions_fail
     unknown: { type: 'long' },
   };
 
-const byPercentileSchema: MakeSchemaFrom<AlertingUsage>['percentile_num_scheduled_actions_per_day'] =
+const byPercentileSchema: MakeSchemaFrom<AlertingUsage>['percentile_num_generated_actions_per_day'] =
   {
     p50: { type: 'long' },
     p90: { type: 'long' },
     p99: { type: 'long' },
   };
 
-const byPercentileSchemaByType: MakeSchemaFrom<AlertingUsage>['percentile_num_scheduled_actions_by_type_per_day'] =
+const byPercentileSchemaByType: MakeSchemaFrom<AlertingUsage>['percentile_num_generated_actions_by_type_per_day'] =
   {
     p50: byTypeSchema,
     p90: byTypeSchema,
@@ -176,12 +176,12 @@ export function createAlertingUsageCollector(
           avg_es_search_duration_by_type_per_day: {},
           avg_total_search_duration_per_day: 0,
           avg_total_search_duration_by_type_per_day: {},
-          percentile_num_scheduled_actions_per_day: {
+          percentile_num_generated_actions_per_day: {
             p50: 0,
             p90: 0,
             p99: 0,
           },
-          percentile_num_scheduled_actions_by_type_per_day: {
+          percentile_num_generated_actions_by_type_per_day: {
             p50: {},
             p90: {},
             p99: {},
@@ -237,8 +237,8 @@ export function createAlertingUsageCollector(
       avg_es_search_duration_by_type_per_day: byTypeSchema,
       avg_total_search_duration_per_day: { type: 'long' },
       avg_total_search_duration_by_type_per_day: byTypeSchema,
-      percentile_num_scheduled_actions_per_day: byPercentileSchema,
-      percentile_num_scheduled_actions_by_type_per_day: byPercentileSchemaByType,
+      percentile_num_generated_actions_per_day: byPercentileSchema,
+      percentile_num_generated_actions_by_type_per_day: byPercentileSchemaByType,
     },
   });
 }
diff --git a/x-pack/plugins/alerting/server/usage/task.ts b/x-pack/plugins/alerting/server/usage/task.ts
index 0d0d2d802a3fb..cb2f1e7af1f2f 100644
--- a/x-pack/plugins/alerting/server/usage/task.ts
+++ b/x-pack/plugins/alerting/server/usage/task.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Logger, CoreSetup } from 'kibana/server';
+import { Logger, CoreSetup } from '@kbn/core/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 
 import {
   getTotalCountAggregations,
@@ -144,10 +144,10 @@ export function telemetryTaskRunner(
                   avg_total_search_duration_per_day: dailyExecutionCounts.avgTotalSearchDuration,
                   avg_total_search_duration_by_type_per_day:
                     dailyExecutionCounts.avgTotalSearchDurationByType,
-                  percentile_num_scheduled_actions_per_day:
-                    dailyExecutionCounts.scheduledActionsPercentiles,
-                  percentile_num_scheduled_actions_by_type_per_day:
-                    dailyExecutionCounts.scheduledActionsPercentilesByType,
+                  percentile_num_generated_actions_per_day:
+                    dailyExecutionCounts.generatedActionsPercentiles,
+                  percentile_num_generated_actions_by_type_per_day:
+                    dailyExecutionCounts.generatedActionsPercentilesByType,
                 },
                 runAt: getNextMidnight(),
               };
diff --git a/x-pack/plugins/alerting/server/usage/types.ts b/x-pack/plugins/alerting/server/usage/types.ts
index 00bd3b46f91b1..3023d9ab0e13c 100644
--- a/x-pack/plugins/alerting/server/usage/types.ts
+++ b/x-pack/plugins/alerting/server/usage/types.ts
@@ -25,12 +25,12 @@ export interface AlertingUsage {
     string,
     Record<string, number>
   >;
-  percentile_num_scheduled_actions_per_day: {
+  percentile_num_generated_actions_per_day: {
     p50: number;
     p90: number;
     p99: number;
   };
-  percentile_num_scheduled_actions_by_type_per_day: {
+  percentile_num_generated_actions_by_type_per_day: {
     p50: Record<string, number>;
     p90: Record<string, number>;
     p99: Record<string, number>;
diff --git a/x-pack/plugins/apm/.storybook/preview.js b/x-pack/plugins/apm/.storybook/preview.js
index 18343c15a6465..3200746243d47 100644
--- a/x-pack/plugins/apm/.storybook/preview.js
+++ b/x-pack/plugins/apm/.storybook/preview.js
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { EuiThemeProviderDecorator } from '../../../../src/plugins/kibana_react/common';
+import { EuiThemeProviderDecorator } from '@kbn/kibana-react-plugin/common';
 
 export const decorators = [EuiThemeProviderDecorator];
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
index 0ffa21cbd4a4d..c9d33d37b6601 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { omit } from 'lodash';
-import { filterByAgent, settingDefinitions } from '../setting_definitions';
+import { filterByAgent, settingDefinitions } from '.';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import { SettingDefinition } from './types';
 
diff --git a/x-pack/plugins/apm/common/alert_types.ts b/x-pack/plugins/apm/common/alert_types.ts
index f2f021b81d76d..afb052b28bbd2 100644
--- a/x-pack/plugins/apm/common/alert_types.ts
+++ b/x-pack/plugins/apm/common/alert_types.ts
@@ -11,10 +11,10 @@ import type {
   AsDuration,
   AsPercent,
   TimeUnitChar,
-} from '../../observability/common';
-import type { ActionGroup } from '../../alerting/common';
+} from '@kbn/observability-plugin/common';
+import type { ActionGroup } from '@kbn/alerting-plugin/common';
+import { formatDurationFromTimeUnitChar } from '@kbn/observability-plugin/common';
 import { ANOMALY_SEVERITY, ANOMALY_THRESHOLD } from './ml_constants';
-import { formatDurationFromTimeUnitChar } from '../../observability/common';
 
 export const APM_SERVER_FEATURE_ID = 'apm';
 
diff --git a/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts b/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts
index ab630decb70c8..6f25c72e1859b 100644
--- a/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts
+++ b/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { DATAFEED_STATE, JOB_STATE } from '../../../ml/common';
+import { DATAFEED_STATE, JOB_STATE } from '@kbn/ml-plugin/common';
 import { Environment } from '../environment_rt';
 
 export interface ApmMlJob {
diff --git a/x-pack/plugins/apm/common/anomaly_detection/index.ts b/x-pack/plugins/apm/common/anomaly_detection/index.ts
index cdb1c62b9eed5..be80902b1d93b 100644
--- a/x-pack/plugins/apm/common/anomaly_detection/index.ts
+++ b/x-pack/plugins/apm/common/anomaly_detection/index.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ANOMALY_SEVERITY } from '../ml_constants';
 import {
   getSeverityType,
   getSeverityColor as mlGetSeverityColor,
-} from '../../../ml/common';
+} from '@kbn/ml-plugin/common';
+import { ANOMALY_SEVERITY } from '../ml_constants';
 import { ServiceHealthStatus } from '../service_health_status';
 
 export interface ServiceAnomalyStats {
diff --git a/x-pack/plugins/apm/common/fetch_options.ts b/x-pack/plugins/apm/common/fetch_options.ts
index 2f862ec7cbc38..14b8900e6ed26 100644
--- a/x-pack/plugins/apm/common/fetch_options.ts
+++ b/x-pack/plugins/apm/common/fetch_options.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 
 export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
   pathname: string;
diff --git a/x-pack/plugins/apm/common/license_check.test.ts b/x-pack/plugins/apm/common/license_check.test.ts
index be50490fe0e81..8b82d1d9f0171 100644
--- a/x-pack/plugins/apm/common/license_check.test.ts
+++ b/x-pack/plugins/apm/common/license_check.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { License } from '../../licensing/common/license';
+import { License } from '@kbn/licensing-plugin/common/license';
 import { isActiveGoldLicense, isActivePlatinumLicense } from './license_check';
 
 describe('License check', () => {
diff --git a/x-pack/plugins/apm/common/license_check.ts b/x-pack/plugins/apm/common/license_check.ts
index 7efc50f4aed9b..6d732dc7917e2 100644
--- a/x-pack/plugins/apm/common/license_check.ts
+++ b/x-pack/plugins/apm/common/license_check.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense, LicenseType } from '../../licensing/common/types';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 
 function isActiveLicense(licenseType: LicenseType, license?: ILicense) {
   return license && license.isActive && license.hasAtLeast(licenseType);
diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/apm/common/service_health_status.ts
index b5318f9333e4f..a58ae8cb04125 100644
--- a/x-pack/plugins/apm/common/service_health_status.ts
+++ b/x-pack/plugins/apm/common/service_health_status.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EuiTheme } from '../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { ANOMALY_SEVERITY } from './ml_constants';
 
 export enum ServiceHealthStatus {
diff --git a/x-pack/plugins/apm/common/utils/formatters/duration.ts b/x-pack/plugins/apm/common/utils/formatters/duration.ts
index 5b20b2e1827a1..bf83ed2e093ea 100644
--- a/x-pack/plugins/apm/common/utils/formatters/duration.ts
+++ b/x-pack/plugins/apm/common/utils/formatters/duration.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { memoize } from 'lodash';
-import { NOT_AVAILABLE_LABEL } from '../../../common/i18n';
+import { NOT_AVAILABLE_LABEL } from '../../i18n';
 import { asDecimalOrInteger, asInteger, asDecimal } from './formatters';
 import { TimeUnit } from './datetime';
 import { Maybe } from '../../../typings/common';
diff --git a/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts b/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts
index f049ab9bb5488..227f9272d547e 100644
--- a/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts
+++ b/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import moment from 'moment';
-import { parseInterval } from '../../../../../src/plugins/data/common';
+import { parseInterval } from '@kbn/data-plugin/common';
 
 export function getOffsetInMs({
   start,
diff --git a/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts b/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
index add9673d88246..7cce6c440a225 100644
--- a/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
+++ b/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { joinByKey } from './';
+import { joinByKey } from '.';
 
 describe('joinByKey', () => {
   it('joins by a string key', () => {
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts
similarity index 86%
rename from x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts
rename to x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts
index 1fade825bc4cb..a74d4ba27610d 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts
@@ -35,8 +35,8 @@ describe('Infrastracture feature flag', () => {
     cy.loginAsPowerUser();
   });
 
-  describe('when infrastracture feature is enabled', () => {
-    it('shows the flag as enabled in kibana advanced settings', () => {
+  describe('when infrastracture feature is disabled', () => {
+    it('shows the flag as disabled in kibana advanced settings', () => {
       cy.visit(settingsPath);
 
       cy.get(infraToggle)
@@ -50,8 +50,16 @@ describe('Infrastracture feature flag', () => {
     });
   });
 
-  describe('when infrastracture feature is disabled', () => {
-    it('shows the flag as disabled in kibana advanced settings', () => {
+  describe('when infrastracture feature is enabled', () => {
+    after(() => {
+      // Reverts to default state, which is infrastructureView disabled
+      cy.visit(settingsPath);
+      cy.get(infraToggle).click();
+      cy.contains('Save changes').should('not.be.disabled');
+      cy.contains('Save changes').click();
+    });
+
+    it('shows the flag as enabled in kibana advanced settings', () => {
       cy.visit(settingsPath);
       cy.get(infraToggle).click();
       cy.contains('Save changes').should('not.be.disabled');
@@ -65,6 +73,7 @@ describe('Infrastracture feature flag', () => {
     it('shows infrastructure tab in service overview page', () => {
       cy.visit(serviceOverviewPath);
       cy.contains('a[role="tab"]', 'Infrastructure').click();
+      cy.contains('Infrastructure data coming soon');
     });
   });
 });
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
index f0f306a538331..50ac9fd81e2ec 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
@@ -14,21 +14,15 @@ const end = '2021-10-10T00:15:00.000Z';
 
 const serviceInventoryHref = url.format({
   pathname: '/app/apm/services',
-  query: { rangeFrom: start, rangeTo: end },
-});
-
-const apisToIntercept = [
-  {
-    endpoint: '/internal/apm/service?*',
-    name: 'servicesMainStatistics',
-  },
-  {
-    endpoint: '/internal/apm/services/detailed_statistics?*',
-    name: 'servicesDetailedStatistics',
+  query: {
+    comparisonEnabled: 'true',
+    environment: 'ENVIRONMENT_ALL',
+    rangeFrom: start,
+    rangeTo: end,
+    offset: '1d',
   },
-];
+});
 
-// flaky test
 describe.skip('Home page', () => {
   before(async () => {
     await synthtrace.index(
@@ -47,12 +41,12 @@ describe.skip('Home page', () => {
     cy.loginAsReadOnlyUser();
   });
 
-  it('Redirects to service page with environment, rangeFrom and rangeTo added to the URL', () => {
+  it('Redirects to service page with comparisonEnabled, environment, rangeFrom, rangeTo and offset added to the URL', () => {
     cy.visit('/app/apm');
 
     cy.url().should(
       'include',
-      'app/apm/services?environment=ENVIRONMENT_ALL&rangeFrom=now-15m&rangeTo=now'
+      'app/apm/services?comparisonEnabled=true&environment=ENVIRONMENT_ALL&rangeFrom=now-15m&rangeTo=now&offset=1d'
     );
   });
 
@@ -66,17 +60,11 @@ describe.skip('Home page', () => {
 
   describe('navigations', () => {
     it('navigates to service overview page with transaction type', () => {
-      apisToIntercept.map(({ endpoint, name }) => {
-        cy.intercept('GET', endpoint).as(name);
-      });
-
       cy.visit(serviceInventoryHref);
 
       cy.contains('Services');
+      cy.contains('opbeans-rum').click({ force: true });
 
-      cy.get('[data-test-subj="serviceLink_rum-js"]').then((element) => {
-        element[0].click();
-      });
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'page-load'
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts
index ecee9c3c4f63e..0dab9c6f2440f 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts
@@ -37,6 +37,9 @@ const aliasNames = apiRequestsToIntercept.map(
 
 describe('When navigating to the service inventory', () => {
   before(async () => {
+    cy.loginAsReadOnlyUser();
+    cy.visit(serviceInventoryHref);
+
     const { rangeFrom, rangeTo } = timeRange;
     await synthtrace.index(
       opbeans({
@@ -50,11 +53,6 @@ describe('When navigating to the service inventory', () => {
     await synthtrace.clean();
   });
 
-  beforeEach(() => {
-    cy.loginAsReadOnlyUser();
-    cy.visit(serviceInventoryHref);
-  });
-
   it('has no detectable a11y violations on load', () => {
     cy.contains('h1', 'Services');
     // set skipFailures to true to not fail the test when there are accessibility failures
@@ -77,11 +75,14 @@ describe('When navigating to the service inventory', () => {
     cy.contains('h1', 'opbeans-node');
   });
 
-  describe('Calls APIs', () => {
+  describe.skip('Calls APIs', () => {
     beforeEach(() => {
       apiRequestsToIntercept.map(({ endpoint, aliasName }) => {
         cy.intercept('GET', endpoint).as(aliasName);
       });
+
+      cy.loginAsReadOnlyUser();
+      cy.visit(serviceInventoryHref);
     });
 
     it('with the correct environment when changing the environment', () => {
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts
index 9caf8ede5e527..e989d5470c4c6 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts
@@ -69,11 +69,10 @@ describe('Service overview - header filters', () => {
     await synthtrace.clean();
   });
 
-  beforeEach(() => {
-    cy.loginAsReadOnlyUser();
-  });
-
   describe('Filtering by transaction type', () => {
+    beforeEach(() => {
+      cy.loginAsReadOnlyUser();
+    });
     it('changes url when selecting different value', () => {
       cy.visit(serviceOverviewHref);
       cy.contains('opbeans-node');
@@ -95,7 +94,6 @@ describe('Service overview - header filters', () => {
         cy.intercept('GET', endpoint).as(name);
       });
       cy.visit(serviceOverviewHref);
-      cy.contains('opbeans-node');
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'request'
@@ -120,6 +118,9 @@ describe('Service overview - header filters', () => {
   });
 
   describe('Filtering by kuerybar', () => {
+    beforeEach(() => {
+      cy.loginAsReadOnlyUser();
+    });
     it('filters by transaction.name', () => {
       cy.visit(
         url.format({
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts
index 0935d23d02696..48fe14b44c793 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts
@@ -85,8 +85,7 @@ const aliasNamesWithComparison = apiRequestsToInterceptWithComparison.map(
 
 const aliasNames = [...aliasNamesNoComparison, ...aliasNamesWithComparison];
 
-// flaky test
-describe.skip('Service Overview', () => {
+describe('Service Overview', () => {
   before(async () => {
     await synthtrace.index(
       opbeans({
@@ -127,6 +126,12 @@ describe.skip('Service Overview', () => {
     });
 
     it('persists transaction type selected when clicking on Transactions tab', () => {
+      cy.intercept(
+        'GET',
+        '/internal/apm/services/opbeans-node/transaction_types?*'
+      ).as('transactionTypesRequest');
+      cy.wait('@transactionTypesRequest');
+
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'request'
@@ -144,6 +149,11 @@ describe.skip('Service Overview', () => {
     });
 
     it('persists transaction type selected when clicking on View Transactions link', () => {
+      cy.intercept(
+        'GET',
+        '/internal/apm/services/opbeans-node/transaction_types?*'
+      ).as('transactionTypesRequest');
+      cy.wait('@transactionTypesRequest');
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'request'
@@ -238,14 +248,11 @@ describe.skip('Service Overview', () => {
     });
 
     it('when selecting a different comparison window', () => {
-      cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+      cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
 
       // selects another comparison type
-      cy.get('[data-test-subj="comparisonSelect"]').select('week');
-      cy.get('[data-test-subj="comparisonSelect"]').should(
-        'have.value',
-        'week'
-      );
+      cy.get('[data-test-subj="comparisonSelect"]').select('1w');
+      cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1w');
       cy.expectAPIsToHaveBeenCalledWith({
         apisIntercepted: aliasNamesWithComparison,
         value: 'offset',
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts
index f844969850b84..cd2d2c064bdc6 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts
@@ -50,7 +50,6 @@ const apisToIntercept = [
   },
 ];
 
-// Skipping tests since it's flaky.
 describe.skip('Service overview: Time Comparison', () => {
   before(async () => {
     await synthtrace.index(
@@ -71,7 +70,8 @@ describe.skip('Service overview: Time Comparison', () => {
 
   it('enables by default the time comparison feature with Last 24 hours selected', () => {
     cy.visit(serviceOverviewPath);
-    cy.url().should('include', 'comparisonEnabled=true&offset=1d');
+    cy.url().should('include', 'comparisonEnabled=true');
+    cy.url().should('include', 'offset=1d');
   });
 
   describe('when comparison is toggled off', () => {
@@ -92,7 +92,6 @@ describe.skip('Service overview: Time Comparison', () => {
         cy.intercept('GET', endpoint).as(name);
       });
       cy.visit(serviceOverviewHref);
-      cy.contains('opbeans-java');
 
       cy.get('[data-test-subj="comparisonSelect"]').should('be.enabled');
       const offset = `offset=1d`;
@@ -106,6 +105,8 @@ describe.skip('Service overview: Time Comparison', () => {
         }
       );
 
+      cy.contains('opbeans-java');
+
       // toggles off comparison
       cy.contains('Comparison').click();
       cy.get('[data-test-subj="comparisonSelect"]').should('be.disabled');
@@ -127,32 +128,52 @@ describe.skip('Service overview: Time Comparison', () => {
     cy.visit(serviceOverviewPath);
     cy.contains('opbeans-java');
     // opens the page with "Day before" selected
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
 
     // selects another comparison type
-    cy.get('[data-test-subj="comparisonSelect"]').select('week');
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'week');
+    cy.get('[data-test-subj="comparisonSelect"]').select('1w');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1w');
   });
 
   it('changes comparison type when a new time range is selected', () => {
-    cy.visit(serviceOverviewPath);
+    cy.visit(serviceOverviewHref);
     cy.contains('opbeans-java');
     // Time comparison default value
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
     cy.contains('Day before');
     cy.contains('Week before');
 
+    cy.selectAbsoluteTimeRange(
+      '2021-10-10T00:00:00.000Z',
+      '2021-10-20T00:00:00.000Z'
+    );
+
+    cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
+
+    cy.get('[data-test-subj="comparisonSelect"]').should(
+      'have.value',
+      '864000000ms'
+    );
+    cy.get('[data-test-subj="comparisonSelect"]').should(
+      'not.contain.text',
+      'Day before'
+    );
+    cy.get('[data-test-subj="comparisonSelect"]').should(
+      'not.contain.text',
+      'Week before'
+    );
+
     cy.changeTimeRange('Today');
     cy.contains('Day before');
     cy.contains('Week before');
 
     cy.changeTimeRange('Last 24 hours');
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
     cy.contains('Day before');
     cy.contains('Week before');
 
     cy.changeTimeRange('Last 7 days');
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'week');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1w');
     cy.get('[data-test-subj="comparisonSelect"]').should(
       'contain.text',
       'Week before'
@@ -162,20 +183,6 @@ describe.skip('Service overview: Time Comparison', () => {
       'Day before'
     );
     cy.contains('Week before');
-
-    cy.changeTimeRange('Last 30 days');
-    cy.get('[data-test-subj="comparisonSelect"]').should(
-      'have.value',
-      'period'
-    );
-    cy.get('[data-test-subj="comparisonSelect"]').should(
-      'not.contain.text',
-      'Day before'
-    );
-    cy.get('[data-test-subj="comparisonSelect"]').should(
-      'not.contain.text',
-      'Week before'
-    );
   });
 
   it('hovers over throughput chart shows previous and current period', () => {
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts b/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts
index 98bad66b1cc76..8e61908f56e0e 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts
@@ -53,12 +53,12 @@ Cypress.Commands.add(
     cy.get('[data-test-subj="superDatePickerstartDatePopoverButton"]').click();
     cy.get('[data-test-subj="superDatePickerAbsoluteDateInput"]')
       .eq(0)
-      .clear()
+      .clear({ force: true })
       .type(moment(start).format(format), { force: true });
     cy.get('[data-test-subj="superDatePickerendDatePopoverButton"]').click();
     cy.get('[data-test-subj="superDatePickerAbsoluteDateInput"]')
       .eq(1)
-      .clear()
+      .clear({ force: true })
       .type(moment(end).format(format), { force: true });
   }
 );
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts b/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts
index e2025c01d4c7a..5f5d1eb3b3614 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts
@@ -6,11 +6,7 @@
  */
 
 Cypress.on('uncaught:exception', (err, runnable) => {
-  // @see https://stackoverflow.com/a/50387233/434980
-  // ResizeObserver error can be safely ignored
-  if (err.message.includes('ResizeObserver loop limit exceeded')) {
-    return false;
-  }
+  return false;
 });
 
 import './commands';
diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts b/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
index aa56557c09df8..b87f35adcccf2 100644
--- a/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
+++ b/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
@@ -7,6 +7,4 @@
 
 import { GenericFtrProviderContext } from '@kbn/test';
 
-import { services } from './services';
-
-export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
+export type FtrProviderContext = GenericFtrProviderContext<{}, {}>;
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 8b5ac68f07a22..9bb1c52b52d7c 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -16,7 +16,8 @@
     "licensing",
     "observability",
     "ruleRegistry",
-    "triggersActionsUi"
+    "triggersActionsUi",
+    "unifiedSearch"
   ],
   "optionalPlugins": [
     "actions",
@@ -35,7 +36,6 @@
   "configPath": ["xpack", "apm"],
   "requiredBundles": [
     "fleet",
-    "home",
     "kibanaReact",
     "kibanaUtils",
     "ml",
diff --git a/x-pack/plugins/apm/public/application/application.test.tsx b/x-pack/plugins/apm/public/application/application.test.tsx
index 5a7df0708caed..dd74d072c306d 100644
--- a/x-pack/plugins/apm/public/application/application.test.tsx
+++ b/x-pack/plugins/apm/public/application/application.test.tsx
@@ -9,13 +9,13 @@ import React from 'react';
 import { act } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import { Observable } from 'rxjs';
-import { AppMountParameters, DocLinksStart, HttpStart } from 'src/core/public';
+import { AppMountParameters, DocLinksStart, HttpStart } from '@kbn/core/public';
 import { mockApmPluginContextValue } from '../context/apm_plugin/mock_apm_plugin_context';
 import { createCallApmApi } from '../services/rest/create_call_apm_api';
-import { renderApp as renderApmApp } from './';
+import { renderApp as renderApmApp } from '.';
 import { disableConsoleWarning } from '../utils/test_helpers';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 
 jest.mock('../services/rest/data_view', () => ({
diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
index 5fd8697a1352b..19e16237c1272 100644
--- a/x-pack/plugins/apm/public/application/index.tsx
+++ b/x-pack/plugins/apm/public/application/index.tsx
@@ -8,20 +8,20 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import 'react-vis/dist/style.css';
-import type { ObservabilityRuleTypeRegistry } from '../../../observability/public';
-import { ConfigSchema } from '../';
+import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
 import {
   AppMountParameters,
   CoreStart,
   APP_WRAPPER_CLASS,
-} from '../../../../../src/core/public';
+} from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ConfigSchema } from '..';
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 import { createCallApmApi } from '../services/rest/create_call_apm_api';
 import { createStaticDataView } from '../services/rest/data_view';
 import { setHelpExtension } from '../set_help_extension';
 import { setReadonlyBadge } from '../update_badge';
 import { ApmAppRoot } from '../components/routing/app_root';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 
 /**
  * This module is rendered asynchronously in the Kibana platform.
diff --git a/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx b/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
index 84a5eeccd3228..110f00fe0d0cf 100644
--- a/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   AlertType,
   APM_SERVER_FEATURE_ID,
diff --git a/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx b/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
index 2015bf2228b6c..67ea6e8d568f1 100644
--- a/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
@@ -21,9 +21,9 @@ import {
 } from '@elastic/charts';
 import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { Coordinate } from '../../../../typings/timeseries';
 import { useTheme } from '../../../hooks/use_theme';
-import { IUiSettingsClient } from '../../../../../../../src/core/public';
 import { getTimeZone } from '../../shared/charts/helper/timezone';
 
 interface ChartPreviewProps {
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx
index 3f3eb0becdc26..fb4f777c1f19e 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx
@@ -7,9 +7,9 @@
 
 import { Meta, Story } from '@storybook/react';
 import React, { useState } from 'react';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { RuleParams, ErrorCountAlertTrigger } from '.';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
 
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
index 5a59a6902b368..63fa0ca5f8fc9 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { defaults, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ForLastExpression } from '@kbn/triggers-actions-ui-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { asInteger } from '../../../../common/utils/formatters';
 import { useFetcher } from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts
index 7fabd1c1ff87a..e82cedda7ef62 100644
--- a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts
+++ b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'kibana/public';
+import { Capabilities } from '@kbn/core/public';
 import { ApmPluginSetupDeps } from '../../plugin';
 import { getAlertingCapabilities } from './get_alerting_capabilities';
 
diff --git a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
index aaa3dc55f38fc..af0cf2c19dc0f 100644
--- a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
+++ b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'kibana/public';
+import { Capabilities } from '@kbn/core/public';
 import { ApmPluginSetupDeps } from '../../plugin';
 
 export const getAlertingCapabilities = (
diff --git a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
index 69ed7d73c3115..2e94ba483faec 100644
--- a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { lazy } from 'react';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import type { ObservabilityRuleTypeRegistry } from '../../../../observability/public';
+import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
 import {
   getAlertUrlErrorCount,
   getAlertUrlTransaction,
diff --git a/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx b/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx
index 7ca4024e58286..a5c516f17546b 100644
--- a/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx
@@ -8,7 +8,7 @@
 import { render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { ServiceAlertTrigger } from './';
+import { ServiceAlertTrigger } from '.';
 
 function Wrapper({ children }: { children?: ReactNode }) {
   return <MemoryRouter>{children}</MemoryRouter>;
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
index de9f018fa3d97..576f4637aa1d5 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
@@ -7,9 +7,9 @@
 
 import { Story } from '@storybook/react';
 import React, { ComponentType, useState } from 'react';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { RuleParams, TransactionDurationAlertTrigger } from '.';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
 
 const KibanaReactContext = createKibanaReactContext({
   notifications: { toasts: { add: () => {} } },
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
index dceb8bf7ff07c..e6745a70a5cd6 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
@@ -9,9 +9,9 @@ import { EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { defaults, map, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ForLastExpression } from '@kbn/triggers-actions-ui-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { getDurationFormatter } from '../../../../common/utils/formatters';
 import { useFetcher } from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx
index 392adb9c589a4..6a580339e0268 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx
@@ -8,8 +8,8 @@
 import { i18n } from '@kbn/i18n';
 import { defaults, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { ANOMALY_SEVERITY } from '../../../../common/ml_constants';
 import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
index 8f638d6de7557..fdc2be4e5c969 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
@@ -7,9 +7,9 @@
 
 import { defaults, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ForLastExpression } from '@kbn/triggers-actions-ui-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { asPercent } from '../../../../common/utils/formatters';
 import { useFetcher } from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx
index f471777d965ef..34b2184321f5f 100644
--- a/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx
@@ -8,7 +8,7 @@
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getNodeName, NodeType } from '../../../../../common/connections';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx b/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
index a530b950cf061..8bb1933f84955 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
@@ -11,8 +11,8 @@ import { EuiBasicTable, EuiBasicTableColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/table_types';
 import type { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
-import { useUiTracker } from '../../../../../observability/public';
 import { useTheme } from '../../../hooks/use_theme';
 import type { FieldValuePair } from '../../../../common/correlations/types';
 
diff --git a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
index c970838f8b8c3..c689c06ec45a4 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
@@ -26,7 +26,7 @@ import type { Direction } from '@elastic/eui/src/services/sort/sort_direction';
 
 import { i18n } from '@kbn/i18n';
 
-import { useUiTracker } from '../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 
 import {
   asPercent,
diff --git a/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts b/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts
index 12799e5edc726..eafead65fb77f 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts
+++ b/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import type { HistogramItem } from '../../../../common/correlations/types';
 import { TransactionDistributionChartData } from '../../shared/charts/transaction_distribution_chart';
 import { LatencyCorrelation } from '../../../../common/correlations/latency_correlations/types';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx
index 5bf7e30a3df5d..ce2469a5ab40e 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx
@@ -12,12 +12,12 @@ import { of } from 'rxjs';
 
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { merge } from 'lodash';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import type { IKibanaSearchResponse } from 'src/plugins/data/public';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import type { IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import type { LatencyCorrelationsResponse } from '../../../../common/correlations/latency_correlations/types';
 import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
index f3734dae5d247..f4efe77b0ca6d 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
@@ -25,7 +25,7 @@ import { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/tab
 import { i18n } from '@kbn/i18n';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useUiTracker } from '../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 
 import { asPreciseDecimal } from '../../../../common/utils/formatters';
 import { LatencyCorrelation } from '../../../../common/correlations/latency_correlations/types';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts b/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts
index 26f63e1ab0c59..e95eca4cf0417 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts
+++ b/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts
@@ -8,7 +8,7 @@
 import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
 import { chunk, debounce } from 'lodash';
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 import { EVENT_OUTCOME } from '../../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../../common/event_outcome';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts b/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts
index 428fdcda7cfc6..910dad59e4e61 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts
+++ b/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts
@@ -8,7 +8,7 @@
 import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
 import { chunk, debounce } from 'lodash';
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 import {
   DEBOUNCE_INTERVAL,
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx
index c280f90f0c0fa..a6743f5b7d768 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import { mockMoment } from '../../../../utils/test_helpers';
-import { DetailView } from './index';
+import { DetailView } from '.';
 
 describe('DetailView', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx
index a0dbbb552d8cd..03c866dcc7f06 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx
@@ -18,7 +18,7 @@ import { i18n } from '@kbn/i18n';
 import { first } from 'lodash';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import type { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import type { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
 import type { ApmUrlParams } from '../../../../context/url_params_context/types';
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx
index 67d22aaf6740a..84c7f21502a51 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx
@@ -6,12 +6,12 @@
  */
 
 import React, { ComponentType } from 'react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   ApmPluginContext,
   ApmPluginContextValue,
 } from '../../../../context/apm_plugin/apm_plugin_context';
-import { ErrorDistribution } from './';
+import { ErrorDistribution } from '.';
 import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 
 export default {
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
index 071ef02922c4b..bac23d55099a5 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
 import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
 import { useBreadcrumb } from '../../../context/breadcrumbs/use_breadcrumb';
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx
index 6e86c8c951710..cf5c4b7139649 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx
@@ -13,9 +13,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { asInteger } from '../../../../../common/utils/formatters';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
 import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import { truncate, unit } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx b/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx
index 930cece64f96a..57f4197476244 100644
--- a/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx
+++ b/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx
@@ -16,7 +16,7 @@ import {
   EuiPopoverTitle,
   EuiText,
 } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 const PopoverContent = euiStyled(EuiText)`
   max-width: 480px;
diff --git a/x-pack/plugins/apm/public/components/app/service_groups/index.tsx b/x-pack/plugins/apm/public/components/app/service_groups/index.tsx
index d62ecd6281191..13271d6291830 100644
--- a/x-pack/plugins/apm/public/components/app/service_groups/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_groups/index.tsx
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { ServiceGroupsList } from './service_groups_list/.';
-export { ServiceGroupSaveButton } from './service_group_save/.';
+export { ServiceGroupsList } from './service_groups_list';
+export { ServiceGroupSaveButton } from './service_group_save';
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
index 082ab1733547e..5baabca805b7c 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
@@ -9,6 +9,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiEmptyPrompt } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import uuid from 'uuid';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { apmServiceInventoryOptimizedSorting } from '@kbn/observability-plugin/common';
 import { useAnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
 import { useLocalStorage } from '../../../hooks/use_local_storage';
 import { useApmParams } from '../../../hooks/use_apm_params';
@@ -17,9 +19,8 @@ import { useTimeRange } from '../../../hooks/use_time_range';
 import { SearchBar } from '../../shared/search_bar';
 import { ServiceList } from './service_list';
 import { MLCallout, shouldDisplayMlCallout } from '../../shared/ml_callout';
+import { useProgressiveFetcher } from '../../../hooks/use_progressive_fetcher';
 import { joinByKey } from '../../../../common/utils/join_by_key';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { apmServiceInventoryOptimizedSorting } from '../../../../../observability/common';
 import { ServiceInventoryFieldName } from '../../../../common/service_inventory';
 import { orderServiceItems } from './service_list/order_service_items';
 
@@ -62,7 +63,7 @@ function useServicesFetcher() {
     [start, end, environment, kuery, serviceGroup]
   );
 
-  const mainStatisticsFetch = useFetcher(
+  const mainStatisticsFetch = useProgressiveFetcher(
     (callApmApi) => {
       if (start && end) {
         return callApmApi('GET /internal/apm/services', {
@@ -88,9 +89,14 @@ function useServicesFetcher() {
 
   const { data: mainStatisticsData = initialData } = mainStatisticsFetch;
 
-  const comparisonFetch = useFetcher(
+  const comparisonFetch = useProgressiveFetcher(
     (callApmApi) => {
-      if (start && end && mainStatisticsData.items.length) {
+      if (
+        start &&
+        end &&
+        mainStatisticsData.items.length &&
+        mainStatisticsFetch.status === FETCH_STATUS.SUCCESS
+      ) {
         return callApmApi('GET /internal/apm/services/detailed_statistics', {
           params: {
             query: {
@@ -141,11 +147,23 @@ export function ServiceInventory() {
     !userHasDismissedCallout &&
     shouldDisplayMlCallout(anomalyDetectionSetupState);
 
-  const isLoading =
-    sortedAndFilteredServicesFetch.status === FETCH_STATUS.LOADING ||
-    (sortedAndFilteredServicesFetch.status === FETCH_STATUS.SUCCESS &&
-      sortedAndFilteredServicesFetch.data?.services.length === 0 &&
-      mainStatisticsFetch.status === FETCH_STATUS.LOADING);
+  const useOptimizedSorting =
+    useKibana().services.uiSettings?.get<boolean>(
+      apmServiceInventoryOptimizedSorting
+    ) || false;
+
+  let isLoading: boolean;
+
+  if (useOptimizedSorting) {
+    isLoading =
+      // ensures table is usable when sorted and filtered services have loaded
+      sortedAndFilteredServicesFetch.status === FETCH_STATUS.LOADING ||
+      (sortedAndFilteredServicesFetch.status === FETCH_STATUS.SUCCESS &&
+        sortedAndFilteredServicesFetch.data?.services.length === 0 &&
+        mainStatisticsFetch.status === FETCH_STATUS.LOADING);
+  } else {
+    isLoading = mainStatisticsFetch.status === FETCH_STATUS.LOADING;
+  }
 
   const isFailure = mainStatisticsFetch.status === FETCH_STATUS.FAILURE;
   const noItemsMessage = (
@@ -169,9 +187,7 @@ export function ServiceInventory() {
     ...preloadedServices,
   ].some((item) => 'healthStatus' in item);
 
-  const tiebreakerField = useKibana().services.uiSettings?.get<boolean>(
-    apmServiceInventoryOptimizedSorting
-  )
+  const tiebreakerField = useOptimizedSorting
     ? ServiceInventoryFieldName.ServiceName
     : ServiceInventoryFieldName.Throughput;
 
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx
index 61e4f2b3ae766..cbda5f9d3ccfd 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx
@@ -8,15 +8,15 @@
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { AnomalyDetectionSetupState } from '../../../../common/anomaly_detection/get_anomaly_detection_setup_state';
 import { AnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
-import { ServiceInventory } from './';
+import { ServiceInventory } from '.';
 
 const stories: Meta<{}> = {
   title: 'app/ServiceInventory',
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx
index 290f1e6b69b77..5073bd72381e2 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx
@@ -8,13 +8,13 @@
 import { Meta, Story } from '@storybook/react';
 import React, { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { ServiceHealthStatus } from '../../../../../common/service_health_status';
 import { ServiceInventoryFieldName } from '../../../../../common/service_inventory';
 import type { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
-import { ServiceList } from './';
+import { ServiceList } from '.';
 import { items } from './__fixtures__/service_api_mock_data';
 
 type Args = ComponentProps<typeof ServiceList>;
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx
index 5a781cf00336a..df06c3d8c485d 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx
@@ -10,7 +10,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { Breakpoints } from '../../../../hooks/use_breakpoints';
-import { getServiceColumns } from './';
+import { getServiceColumns } from '.';
 import * as stories from './service_list.stories';
 import * as timeSeriesColor from '../../../shared/charts/helper/get_timeseries_color';
 
diff --git a/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts b/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts
index 74a49d06d761b..d8d2b1de4d302 100644
--- a/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts
+++ b/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getInfrastructureKQLFilter } from './';
+import { getInfrastructureKQLFilter } from '.';
 
 describe('service logs', () => {
   const serviceName = 'opbeans-node';
diff --git a/x-pack/plugins/apm/public/components/app/service_logs/index.tsx b/x-pack/plugins/apm/public/components/app/service_logs/index.tsx
index 2cd94bf5de207..93f3b3a3a2f27 100644
--- a/x-pack/plugins/apm/public/components/app/service_logs/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_logs/index.tsx
@@ -10,9 +10,9 @@ import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
+import { LogStream } from '@kbn/infra-plugin/public';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
 import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
-import { LogStream } from '../../../../../infra/public';
 import { APIReturnType } from '../../../services/rest/create_call_apm_api';
 
 import {
diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
index b3615c7fcc42f..e8cdd733eaef6 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
@@ -17,11 +17,11 @@ import {
 } from '@elastic/eui';
 import { Meta, Story } from '@storybook/react';
 import React, { useEffect, useState } from 'react';
-import { CoreStart } from '../../../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import {
   CodeEditor,
   createKibanaReactContext,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { Cytoscape } from '../cytoscape';
 import { Centerer } from './centerer';
 import exampleResponseHipsterStore from './example_response_hipster_store.json';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx b/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
index 90d4179cba466..6aea9b6939b5b 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
@@ -8,7 +8,7 @@
 import { EuiButtonIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext, useEffect, useState } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { useTheme } from '../../../hooks/use_theme';
 import { getLegacyApmHref } from '../../shared/links/apm/apm_link';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts b/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
index 24d605a85b69e..c04fb31613d33 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
+++ b/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
@@ -7,7 +7,7 @@
 
 import cytoscape from 'cytoscape';
 import { CSSProperties } from 'react';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { ServiceAnomalyStats } from '../../../../common/anomaly_detection';
 import {
   SERVICE_NAME,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
index 684082e90cf15..bf076b56bc373 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
@@ -8,7 +8,7 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CytoscapeContext } from './cytoscape';
 import { useTheme } from '../../../hooks/use_theme';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
index 796be0659e617..b844ff2cff098 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
@@ -7,11 +7,11 @@
 
 import { render } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React, { ReactNode } from 'react';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
-import { License } from '../../../../../licensing/common/license';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { License } from '@kbn/licensing-plugin/common/license';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { LicenseContext } from '../../../context/license/license_context';
 import * as useFetcherModule from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx
index dd728be30c71a..f10d557b845cb 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx
@@ -14,7 +14,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   getSeverity,
   ServiceAnomalyStats,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx
index 3b50913d49648..ffff0fa9d56d0 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import { METRIC_TYPE } from '@kbn/analytics';
 import React from 'react';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { ContentsProps } from '.';
 import { useAnyOfApmParams } from '../../../../hooks/use_apm_params';
 import { useApmRouter } from '../../../../hooks/use_apm_router';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx
index c8ab7a653b201..a564e0419046f 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx
@@ -12,8 +12,8 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import React, { Fragment } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ContentsProps } from '.';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import {
   SPAN_DESTINATION_SERVICE_RESOURCE,
   SPAN_TYPE,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx
index bd2d897ea2752..44429ad67a141 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx
@@ -7,11 +7,11 @@
 
 import { Meta, Story } from '@storybook/react';
 import cytoscape from 'cytoscape';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { Popover } from '.';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx
index e0cfb8f16f61d..78d23e3ebf8dd 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx
@@ -11,8 +11,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import type { ContentsProps } from '.';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import {
   SPAN_SUBTYPE,
   SPAN_TYPE,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
index 3deb1f49cf188..21a65b5dc090b 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
@@ -8,12 +8,12 @@
 import { renderHook } from '@testing-library/react-hooks';
 import cytoscape from 'cytoscape';
 import dagre from 'cytoscape-dagre';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useCytoscapeEventHandlers } from './use_cytoscape_event_handlers';
 import lodash from 'lodash';
 
-jest.mock('../../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public');
 
 cytoscape.use(dagre);
 
diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
index 5510025c158d6..cce9972aa91c9 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
+++ b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
@@ -8,8 +8,8 @@
 import cytoscape from 'cytoscape';
 import { debounce } from 'lodash';
 import { useEffect } from 'react';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getAnimationOptions, getNodeHeight } from './cytoscape_options';
 
 /*
diff --git a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
index 0bf38d9d57e3f..9e4fb9b67509f 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
@@ -19,7 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   getServiceNodeName,
   SERVICE_NODE_NAME_MISSING,
diff --git a/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
index 9c14c683018e8..bb7ee9115dd53 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
@@ -7,7 +7,7 @@
 import { EuiToolTip, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   getServiceNodeName,
   SERVICE_NODE_NAME_MISSING,
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx
index b4a68e381f422..eb2febf0c3a95 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx
@@ -8,15 +8,15 @@
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import type { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import type { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import type { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import {
   APMServiceContext,
   APMServiceContextValue,
 } from '../../../context/apm_service/apm_service_context';
-import { ServiceOverview } from './';
+import { ServiceOverview } from '.';
 
 const stories: Meta<{}> = {
   title: 'app/ServiceOverview',
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
index 4e912d7a0a453..7cb1dad9f091f 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
@@ -9,7 +9,7 @@ import { EuiIcon, EuiToolTip } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getNodeName, NodeType } from '../../../../../common/connections';
 import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
 import { useApmParams } from '../../../../hooks/use_apm_params';
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx
index 2e7883be350b6..e20273c24767f 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx
@@ -9,7 +9,7 @@ import { EuiBasicTableColumn, RIGHT_ALIGNMENT } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { asInteger } from '../../../../../common/utils/formatters';
 import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import { truncate } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx
index 26a117224ace1..978c168de418c 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx
@@ -12,7 +12,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
-import { ActionMenu } from '../../../../../../observability/public';
+import { ActionMenu } from '@kbn/observability-plugin/public';
 import { isJavaAgentName } from '../../../../../common/agent_name';
 import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
 import {
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
index 932f2f5d215e7..fd8b43700f9b6 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
@@ -14,7 +14,7 @@ import {
   SectionLinks,
   SectionSubtitle,
   SectionTitle,
-} from '../../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { isJavaAgentName } from '../../../../../../common/agent_name';
 import { SERVICE_NODE_NAME } from '../../../../../../common/elasticsearch_fieldnames';
 import { useApmPluginContext } from '../../../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
index 360b918516665..decc23e053565 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import moment from 'moment';
 import { APIReturnType } from '../../../../../services/rest/create_call_apm_api';
 import { getInfraHref } from '../../../../shared/links/infra_link';
diff --git a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx
index e1739d3ba8b91..1c92d6831e87f 100644
--- a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx
@@ -30,8 +30,8 @@ import { find, sumBy } from 'lodash';
 import { rgba } from 'polished';
 import React, { useMemo, useState } from 'react';
 import seedrandom from 'seedrandom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useChartTheme } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import {
   getValueTypeConfig,
   ProfileNode,
diff --git a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx
index a625d87f05d9c..1801cbc365f35 100644
--- a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useChartTheme } from '../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import {
   getValueTypeConfig,
   ProfilingValueType,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx
index 1b43a85addb05..e8d9f1f9cef38 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx
@@ -7,11 +7,11 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { AgentConfiguration } from '../../../../../../common/agent_configuration/configuration_types';
 import { FETCH_STATUS } from '../../../../../hooks/use_fetcher';
 import { createCallApmApi } from '../../../../../services/rest/create_call_apm_api';
-import { AgentConfigurationCreateEdit } from './index';
+import { AgentConfigurationCreateEdit } from '.';
 import {
   ApmPluginContext,
   ApmPluginContextValue,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts
index 6594a30bf2bdf..add3d1d870bb1 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { AgentConfigurationIntake } from '../../../../../../../common/agent_configuration/configuration_types';
 import {
   getOptionLabel,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx
index 19c18bac8d5b1..f4e8f52cdc1df 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx
@@ -23,7 +23,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useMemo, useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { useUiTracker } from '../../../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getOptionLabel } from '../../../../../../../common/agent_configuration/all_option';
 import { AgentConfigurationIntake } from '../../../../../../../common/agent_configuration/configuration_types';
 import {
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx
index 341cba5826bf3..dd644d89efeef 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState } from 'react';
 import { EuiConfirmModal } from '@elastic/eui';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { getOptionLabel } from '../../../../../../common/agent_configuration/all_option';
 import {
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx
index 08d26569b8ece..ad75c7ff60edf 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx
@@ -6,12 +6,12 @@
  */
 import { Meta, Story } from '@storybook/react';
 import React, { ComponentProps } from 'react';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import type { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { AgentKeysTable } from './agent_keys_table';
-import { ApiKey } from '../../../../../../security/common/model';
 
 type Args = ComponentProps<typeof AgentKeysTable>;
 
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx
index e1ced3fabcd77..bfe56c3c8d1ad 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx
@@ -12,8 +12,8 @@ import {
   EuiBasicTableColumn,
   EuiInMemoryTableProps,
 } from '@elastic/eui';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { TimestampTooltip } from '../../../shared/timestamp_tooltip';
-import { ApiKey } from '../../../../../../security/common/model';
 import { ConfirmDeleteModal } from './confirm_delete_modal';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx
index cad8d8016fc8e..f080745c149a1 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx
@@ -8,9 +8,9 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { callApmApi } from '../../../../services/rest/create_call_apm_api';
-import { ApiKey } from '../../../../../../security/common/model';
 
 interface Props {
   agentKey: ApiKey;
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx
index 858fcc07bb6bf..03916eda5cfa3 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx
@@ -17,6 +17,7 @@ import {
   EuiButton,
   EuiLoadingSpinner,
 } from '@elastic/eui';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { useFetcher, FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import { PermissionDenied } from './prompts/permission_denied';
 import { ApiKeysNotEnabled } from './prompts/api_keys_not_enabled';
@@ -25,7 +26,6 @@ import { CreateAgentKeyFlyout } from './create_agent_key';
 import { AgentKeyCallOut } from './create_agent_key/agent_key_callout';
 import { CreateApiKeyResponse } from '../../../../../common/agent_key_types';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { ApiKey } from '../../../../../../security/common/model';
 
 const INITIAL_DATA = {
   areApiKeysEnabled: false,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx
index 5d667b9f3e1a4..8aa5eb475bd6f 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx
@@ -8,7 +8,7 @@ import { EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export function ApiKeysNotEnabled() {
   const {
diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts
index d986c292bea10..844d35b43524f 100644
--- a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { callApmApi } from '../../../../services/rest/create_call_apm_api';
 
 const errorToastTitle = i18n.translate(
diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx
index 69b92a9a50a36..50cb040c0c065 100644
--- a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx
@@ -20,7 +20,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
-import { MLJobsAwaitingNodeWarning } from '../../../../../../ml/public';
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
 import { AnomalyDetectionSetupState } from '../../../../../common/anomaly_detection/get_anomaly_detection_setup_state';
 import { getEnvironmentLabel } from '../../../../../common/environment_filter_values';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
@@ -32,7 +32,7 @@ import { MLManageJobsLink } from '../../../shared/links/machine_learning_links/m
 import { LoadingStatePrompt } from '../../../shared/loading_state_prompt';
 import { ITableColumn, ManagedTable } from '../../../shared/managed_table';
 import { MLCallout, shouldDisplayMlCallout } from '../../../shared/ml_callout';
-import { AnomalyDetectionApiResponse } from './index';
+import { AnomalyDetectionApiResponse } from '.';
 import { JobsListStatus } from './jobs_list_status';
 
 type Jobs = AnomalyDetectionApiResponse['jobs'];
diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx
index 1df6dc0332b2a..7433c4c331fe7 100644
--- a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx
@@ -7,7 +7,7 @@
 import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { DATAFEED_STATE, JOB_STATE } from '../../../../../../ml/common';
+import { DATAFEED_STATE, JOB_STATE } from '@kbn/ml-plugin/common';
 import { MLManageJobsLink } from '../../../shared/links/machine_learning_links/mlmanage_jobs_link';
 
 export function JobsListStatus({
diff --git a/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx b/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx
index 383be90168a10..62adbd0d68ac6 100644
--- a/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx
@@ -22,7 +22,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useEffect, useState } from 'react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { ApmPluginStartDeps } from '../../../../plugin';
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx
index 55943a82dd7ec..68e8be3413ea2 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx
@@ -8,7 +8,7 @@
 import { fireEvent, render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { act } from 'react-dom/test-utils';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { MockApmPluginContextWrapper } from '../../../../../context/apm_plugin/mock_apm_plugin_context';
 import * as apmApi from '../../../../../services/rest/create_call_apm_api';
 import { DeleteButton } from './delete_button';
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx
index ee0193d8376d6..f0d1c7e5e1861 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import React, { useState } from 'react';
 import { callApmApi } from '../../../../../services/rest/create_call_apm_api';
 import { useApmPluginContext } from '../../../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts
index ce18ad4ff3264..81f6b88994e64 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  getSelectOptions,
-  replaceTemplateVariables,
-} from '../create_edit_custom_link_flyout/helper';
+import { getSelectOptions, replaceTemplateVariables } from './helper';
 import { Transaction } from '../../../../../../typings/es_schemas/ui/transaction';
 
 describe('Custom link helper', () => {
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx
index ea6dac148e844..206a60c90e0d4 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ComponentProps } from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { createCallApmApi } from '../../../../../services/rest/create_call_apm_api';
 import { LinkPreview } from './link_preview';
 
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts
index 7884d6740d5ea..da18d894ff02f 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import {
   Filter,
   CustomLink,
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx
index fe997306f4b1d..e9979746426a3 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { getCallApmApiSpy } from '../../../../services/rest/call_apm_api_spy';
 import { CustomLinkOverview } from '.';
-import { License } from '../../../../../../licensing/common/license';
+import { License } from '@kbn/licensing-plugin/common/license';
 import { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import {
   mockApmPluginContextValue,
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx
index 375a4b5ac1156..0e39d37254b67 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx
@@ -15,7 +15,7 @@ import {
   htmlIdGenerator,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { ElasticDocsLink } from '../../../shared/links/elastic_docs_link';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx
index 41d99e4551cc0..e0ae029d09b0c 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import moment from 'moment';
 import { useLocalStorage } from '../../../../hooks/use_local_storage';
 import { SchemaOverview } from './schema_overview';
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx
index 4d5063624b101..51a82e43d008b 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx
@@ -8,10 +8,10 @@
 import type { Meta, Story } from '@storybook/react';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { createCallApmApi } from '../../../../services/rest/create_call_apm_api';
-import { Schema } from './';
+import { Schema } from '.';
 import { ConfirmSwitchModal } from './confirm_switch_modal';
 
 interface Args {
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
index 5871b139ae6ec..1e31eb8ccbe67 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 import semverLt from 'semver/functions/lt';
-import { PackagePolicy } from '../../../../../../fleet/common/types';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types';
 import { ElasticDocsLink } from '../../../shared/links/elastic_docs_link';
 import rocketLaunchGraphic from './blog_rocket_720x420.png';
 import { MigrationInProgressPanel } from './migration_in_progress_panel';
diff --git a/x-pack/plugins/apm/public/components/app/trace_link/index.tsx b/x-pack/plugins/apm/public/components/app/trace_link/index.tsx
index 21d38e3954f27..689531e912829 100644
--- a/x-pack/plugins/apm/public/components/app/trace_link/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_link/index.tsx
@@ -8,7 +8,7 @@
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
 import { getRedirectToTransactionDetailPageUrl } from './get_redirect_to_transaction_detail_page_url';
 import { getRedirectToTracePageUrl } from './get_redirect_to_trace_page_url';
diff --git a/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx b/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx
index ffeab11e1f276..d8a5127af21a3 100644
--- a/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx
@@ -9,7 +9,7 @@ import { act, render, waitFor } from '@testing-library/react';
 import { shallow } from 'enzyme';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { TraceLink } from './';
+import { TraceLink } from '.';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import {
   mockApmPluginContextValue,
diff --git a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
index 141aaee1b826e..21ae0f9820890 100644
--- a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
@@ -8,13 +8,14 @@
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import React from 'react';
 import { useApmParams } from '../../../hooks/use_apm_params';
-import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
+import { FETCH_STATUS } from '../../../hooks/use_fetcher';
 import { APIReturnType } from '../../../services/rest/create_call_apm_api';
 import { SearchBar } from '../../shared/search_bar';
 import { TraceList } from './trace_list';
 import { useFallbackToTransactionsFetcher } from '../../../hooks/use_fallback_to_transactions_fetcher';
 import { AggregatedTransactionsBadge } from '../../shared/aggregated_transactions_badge';
 import { useTimeRange } from '../../../hooks/use_time_range';
+import { useProgressiveFetcher } from '../../../hooks/use_progressive_fetcher';
 
 type TracesAPIResponse = APIReturnType<'GET /internal/apm/traces'>;
 const DEFAULT_RESPONSE: TracesAPIResponse = {
@@ -31,7 +32,7 @@ export function TraceOverview() {
 
   const { start, end } = useTimeRange({ rangeFrom, rangeTo });
 
-  const { status, data = DEFAULT_RESPONSE } = useFetcher(
+  const { status, data = DEFAULT_RESPONSE } = useProgressiveFetcher(
     (callApmApi) => {
       if (start && end) {
         return callApmApi('GET /internal/apm/traces', {
diff --git a/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx
index a3e48ee00e0d8..5fbaae7411ff7 100644
--- a/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx
@@ -9,8 +9,8 @@ import { EuiIcon, EuiToolTip, RIGHT_ALIGNMENT } from '@elastic/eui';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ApmRoutes } from '../../routing/apm_route_config';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import {
   asMillisecondDuration,
   asTransactionRate,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx
index e2530458ae980..03132d482f374 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx
@@ -10,10 +10,10 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React, { ReactNode } from 'react';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { merge } from 'lodash';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
 import { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import {
@@ -23,7 +23,7 @@ import {
 import * as useFetcherModule from '../../../../hooks/use_fetcher';
 import { fromQuery } from '../../../shared/links/url_helpers';
 
-import { getFormattedSelection, TransactionDistribution } from './index';
+import { getFormattedSelection, TransactionDistribution } from '.';
 
 function Wrapper({ children }: { children?: ReactNode }) {
   const KibanaReactContext = createKibanaReactContext({
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx
index ca2a3584c8942..fe551cc0e96b8 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx
@@ -19,7 +19,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx
index af66f818309a0..3044d365e1958 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx
@@ -9,10 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  METRIC_TYPE,
-  useTrackMetric,
-} from '../../../../../observability/public';
+import { METRIC_TYPE, useTrackMetric } from '@kbn/observability-plugin/public';
 
 import { isActivePlatinumLicense } from '../../../../common/license_check';
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx
index df3e75a3c8f2e..e3dec8b3d9aa3 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx
@@ -9,10 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  METRIC_TYPE,
-  useTrackMetric,
-} from '../../../../../observability/public';
+import { METRIC_TYPE, useTrackMetric } from '@kbn/observability-plugin/public';
 
 import { isActivePlatinumLicense } from '../../../../common/license_check';
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx
index c5001e25b0801..aeaea322fff96 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx
@@ -9,7 +9,7 @@ import { EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { LogStream } from '../../../../../../infra/public';
+import { LogStream } from '@kbn/infra-plugin/public';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
 import type { ApmUrlParams } from '../../../../context/url_params_context/types';
 import { fromQuery, toQuery } from '../../../shared/links/url_helpers';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx
index 6ca1a78db28b1..695ebfd9a8976 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx
@@ -14,7 +14,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import React, { Dispatch, SetStateAction, useState } from 'react';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Margins } from '../../../../../shared/charts/timeline';
 import {
   IWaterfall,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx
index 14f47fe22b4c0..29dd5ffde6547 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { EventOutcome } from '../../../../../../../typings/es_schemas/raw/fields/event_outcome';
 import { useTheme } from '../../../../../../hooks/use_theme';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 const ResetLineHeight = euiStyled.span`
   line-height: initial;
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx
index c64a121c91882..04c3734eebaff 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { History } from 'history';
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Timeline } from '../../../../../shared/charts/timeline';
 import { fromQuery, toQuery } from '../../../../../shared/links/url_helpers';
 import { getAgentMarks } from '../marks/get_agent_marks';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx
index 8549f09bba248..16a80ce09efd0 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiFlyout } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const ResponsiveFlyout = euiStyled(EuiFlyout)`
   width: 100%;
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx
index 5d3c1d733e040..d50305c22e543 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx
@@ -22,8 +22,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
 import { isEmpty } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CompositeSpanDurationSummaryItem } from '../../../../../../shared/summary/composite_span_duration_summary_item';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { Span } from '../../../../../../../../typings/es_schemas/ui/span';
 import { Transaction } from '../../../../../../../../typings/es_schemas/ui/transaction';
 import { DiscoverSpanLink } from '../../../../../../shared/links/discover_links/discover_span_link';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx
index f87967f762f25..c008bd8d2f064 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx
@@ -9,7 +9,7 @@ import { Story } from '@storybook/react';
 import React, { ComponentProps, ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MockApmPluginContextWrapper } from '../../../../../../../context/apm_plugin/mock_apm_plugin_context';
-import { SpanFlyout } from './';
+import { SpanFlyout } from '.';
 
 type Args = ComponentProps<typeof SpanFlyout>;
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx
index 18ec931bb7302..19d487ce35fb1 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx
@@ -7,10 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import {
-  METRIC_TYPE,
-  useUiTracker,
-} from '../../../../../../../../../observability/public';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import {
   SERVICE_NAME,
   SPAN_DESTINATION_SERVICE_RESOURCE,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx
index 4c845e16348e7..aac15e48d8840 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx
@@ -8,7 +8,7 @@
 import { EuiIcon, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment, ReactNode, useEffect, useRef, useState } from 'react';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 const ToggleButtonContainer = euiStyled.div`
   margin-top: ${({ theme }) => theme.eui.euiSizeS}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx
index 7f8fbf62130b3..47aec921f3513 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx
@@ -9,7 +9,7 @@ import { Story } from '@storybook/react';
 import React, { ComponentProps, ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MockApmPluginContextWrapper } from '../../../../../../../context/apm_plugin/mock_apm_plugin_context';
-import { TransactionFlyout } from './';
+import { TransactionFlyout } from '.';
 
 type Args = ComponentProps<typeof TransactionFlyout>;
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx
index 51e9cbeaba6f7..9190fd5924174 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx
@@ -8,8 +8,8 @@
 import { EuiBadge, EuiIcon, EuiText, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useTheme } from '../../../../../../hooks/use_theme';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
 import { isRumAgentName } from '../../../../../../../common/agent_name';
 import {
   TRACE_ID,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx
index db82e9e360207..82d85891e36da 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx
@@ -9,7 +9,7 @@ import { Meta, Story } from '@storybook/react';
 import React, { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MockApmPluginContextWrapper } from '../../../../../context/apm_plugin/mock_apm_plugin_context';
-import { WaterfallContainer } from './index';
+import { WaterfallContainer } from '.';
 import { getWaterfall } from './waterfall/waterfall_helpers/waterfall_helpers';
 import {
   inferredSpans,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
index 2c71bcf49917b..b28649d9bc56f 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
@@ -8,7 +8,7 @@
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
 import { getRedirectToTransactionDetailPageUrl } from '../trace_link/get_redirect_to_transaction_detail_page_url';
 import { useApmParams } from '../../../hooks/use_apm_params';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
index 82164f34adb79..5398d245ace48 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
@@ -7,9 +7,9 @@
 
 import { queryByLabelText } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { ApmServiceContextProvider } from '../../../context/apm_service/apm_service_context';
 import { UrlParamsProvider } from '../../../context/url_params_context/url_params_context';
@@ -22,7 +22,7 @@ import {
   renderWithTheme,
 } from '../../../utils/test_helpers';
 import { fromQuery } from '../../shared/links/url_helpers';
-import { TransactionOverview } from './';
+import { TransactionOverview } from '.';
 
 const KibanaReactContext = createKibanaReactContext({
   uiSettings: { get: () => true },
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
index a82fa3121bb3b..238ffc760d93f 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
@@ -18,14 +18,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { ComponentType } from 'react';
 import styled from 'styled-components';
+import { Markdown, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   AgentRuntimeAttachmentProps,
   CreateAgentInstructions,
 } from './agent_instructions_mappings';
-import {
-  Markdown,
-  useKibana,
-} from '../../../../../../../src/plugins/kibana_react/public';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import { AgentIcon } from '../../shared/agent_icon';
 import type {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts
index 212bb9554dd05..dd3f63cb51361 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import Mustache from 'mustache';
 
 const TEMPLATE_TAGS = ['{', '}'];
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx
index 40b902b7729d0..0dcf338288933 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx
@@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
 import {
   CustomAssetsAccordionProps,
   CustomAssetsAccordion,
-} from '../../../../fleet/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ApmPluginStartDeps } from '../../plugin';
 
 export function ApmCustomAssetsExtension() {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx
index 6b3ba6a8f05db..ab08467fc7dbe 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { EuiButton, EuiText, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AgentEnrollmentFlyoutFinalStepExtension } from '../../../../fleet/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { AgentEnrollmentFlyoutFinalStepExtension } from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ApmPluginStartDeps } from '../../plugin';
 
 function StepComponent() {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx
index 7f9ec6e069773..dc7010a57d743 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx
@@ -7,6 +7,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { getAgentAuthorizationSettings } from './settings_definition/agent_authorization_settings';
 import { getApmSettings } from './settings_definition/apm_settings';
 import {
@@ -25,7 +26,6 @@ import {
 import { SettingsForm, SettingsSection } from './settings_form';
 import { isSettingsFormValid, mergeNewVars } from './settings_form/utils';
 import { PackagePolicyVars } from './typings';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   updateAPMPolicy: (newVars: PackagePolicyVars, isValid: boolean) => void;
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx
index 7a5e073fed337..20d60658e8833 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx
@@ -16,9 +16,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import styled from 'styled-components';
-import { FormRowOnChange } from './';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import { FormRowOnChange } from '.';
 import { SettingsRow } from '../typings';
-import { CodeEditor } from '../../../../../../../../src/plugins/kibana_react/public';
 
 const FixedHeightDiv = styled.div`
   height: 300px;
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts
index 4cf8326d3b2f4..9d9d2fb2a6200 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts
@@ -6,18 +6,18 @@
  */
 import * as t from 'io-ts';
 import { ReactNode } from 'react';
-import { PackagePolicyConfigRecordEntry } from '../../../../../fleet/common';
+import { PackagePolicyConfigRecordEntry } from '@kbn/fleet-plugin/common';
 
 export type {
   PackagePolicyCreateExtensionComponentProps,
   PackagePolicyEditExtensionComponentProps,
-} from '../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 
 export type {
   NewPackagePolicy,
   PackagePolicy,
   PackagePolicyConfigRecordEntry,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 
 export type PackagePolicyVars = Record<string, PackagePolicyConfigRecordEntry>;
 
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
index e1fb6dee9ca96..861f587f9c42c 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const getLazyApmAgentsTabExtension = () => {
   return lazy<PackagePolicyEditExtensionComponent>(async () => {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx
index 6bde5e9416635..f51ee17ce8e83 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const getLazyAPMPolicyCreateExtension = () => {
   return lazy<PackagePolicyCreateExtensionComponent>(async () => {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx
index f79d7b58b1621..feb5a6dd93875 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const getLazyAPMPolicyEditExtension = () => {
   return lazy<PackagePolicyEditExtensionComponent>(async () => {
diff --git a/x-pack/plugins/apm/public/components/routing/app_root.tsx b/x-pack/plugins/apm/public/components/routing/app_root.tsx
index 3c66f39e268ec..b82a44a598249 100644
--- a/x-pack/plugins/apm/public/components/routing/app_root.tsx
+++ b/x-pack/plugins/apm/public/components/routing/app_root.tsx
@@ -10,17 +10,17 @@ import { RouteRenderer, RouterProvider } from '@kbn/typed-react-router-config';
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { DefaultTheme, ThemeProvider } from 'styled-components';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import {
   KibanaContextProvider,
   RedirectAppLinks,
   useUiSetting$,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import {
   HeaderMenuPortal,
   InspectorContextProvider,
-} from '../../../../observability/public';
-import { ScrollToTopOnPathChange } from '../../components/app/main/scroll_to_top_on_path_change';
+} from '@kbn/observability-plugin/public';
+import { ScrollToTopOnPathChange } from '../app/main/scroll_to_top_on_path_change';
 import { AnomalyDetectionJobsContextProvider } from '../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
 import {
   ApmPluginContext,
diff --git a/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx b/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx
index 6776acebf9f2e..f309c69932903 100644
--- a/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx
+++ b/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import React from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { RedirectTo } from './redirect_to';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { enableServiceGroups } from '../../../../observability/public';
 import { useFetcher, FETCH_STATUS } from '../../hooks/use_fetcher';
 
 export function ServiceGroupsRedirect({
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
index e138027d05554..9d534b0bfc53c 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
@@ -11,13 +11,13 @@ import { useLocation } from 'react-router-dom';
 import {
   useKibana,
   KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { EnvironmentsContextProvider } from '../../../context/environments_context/environments_context';
 import { useFetcher, FETCH_STATUS } from '../../../hooks/use_fetcher';
 import { ApmPluginStartDeps } from '../../../plugin';
 import { ApmEnvironmentFilter } from '../../shared/environment_filter';
 import { getNoDataConfig } from './no_data_config';
-import { enableServiceGroups } from '../../../../../observability/public';
 import { ServiceGroupSaveButton } from '../../app/service_groups';
 
 // Paths that must skip the no data screen
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx
index 1d04dd83ef99f..9245302539efb 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx
@@ -8,8 +8,8 @@
 import type { Story, StoryContext } from '@storybook/react';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { APMServiceContext } from '../../../../context/apm_service/apm_service_context';
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx
index ec54fa1f228ce..0fba7e3b99804 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx
@@ -8,9 +8,9 @@
 import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { createExploratoryViewUrl } from '../../../../../../observability/public';
-import { ALL_VALUES_SELECTED } from '../../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
+import { ALL_VALUES_SELECTED } from '@kbn/observability-plugin/public';
 import {
   isIosAgentName,
   isRumAgentName,
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx
index 03a50d6082583..39cc5ee12dc54 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { isMetricsTabHidden, isJVMsTabHidden } from './';
+import { isMetricsTabHidden, isJVMsTabHidden } from '.';
 
 describe('APM service template', () => {
   describe('isMetricsTabHidden', () => {
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
index 8a2d837857060..598692780ef8d 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
@@ -15,7 +15,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { omit } from 'lodash';
 import React from 'react';
-import { enableInfrastructureView } from '../../../../../../observability/public';
+import { enableInfrastructureView } from '@kbn/observability-plugin/public';
 import {
   isIosAgentName,
   isJavaAgentName,
diff --git a/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts b/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts
index d753901471eea..144afb113b67f 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts
+++ b/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaPageTemplateProps } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 
 export function getNoDataConfig({
   docsLink,
diff --git a/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx
index 3c078e1a56deb..51a8f03c74a6e 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx
@@ -17,10 +17,10 @@ import { i18n } from '@kbn/i18n';
 import {
   useKibana,
   KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { useFetcher } from '../../../hooks/use_fetcher';
 import { ApmPluginStartDeps } from '../../../plugin';
-import { enableServiceGroups } from '../../../../../observability/public';
 import { useApmRouter } from '../../../hooks/use_apm_router';
 import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
 import { ApmMainTemplate } from './apm_main_template';
diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
index a1a5e38bdd2ea..341c6b5c8a6e7 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
@@ -6,10 +6,10 @@
  */
 
 import type { Meta, Story } from '@storybook/react';
-import type { CoreStart, DocLinksStart } from 'kibana/public';
+import type { CoreStart, DocLinksStart } from '@kbn/core/public';
 import React, { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import type { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { SettingsTemplate } from './settings_template';
diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
index 08cacc38e89f0..aaec73e11ed68 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { History } from 'history';
 import { useHistory } from 'react-router-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { ApmMainTemplate } from './apm_main_template';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { getLegacyApmHref } from '../../shared/links/apm/apm_link';
diff --git a/x-pack/plugins/apm/public/components/routing/track_pageview.tsx b/x-pack/plugins/apm/public/components/routing/track_pageview.tsx
index af0682a56ec2b..ea31702a187ac 100644
--- a/x-pack/plugins/apm/public/components/routing/track_pageview.tsx
+++ b/x-pack/plugins/apm/public/components/routing/track_pageview.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useRoutePath } from '@kbn/typed-react-router-config';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 export function TrackPageview({ children }: { children: React.ReactElement }) {
   const routePath = useRoutePath();
diff --git a/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx b/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
index fce7c2b2a2a69..67b07f73490b1 100644
--- a/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
@@ -16,7 +16,7 @@ import type { Story } from '@storybook/react';
 import React from 'react';
 import { AGENT_NAMES } from '../../../../common/agent_name';
 import { getAgentIcon } from './get_agent_icon';
-import { AgentIcon } from './index';
+import { AgentIcon } from '.';
 
 export default {
   title: 'shared/AgentIcon',
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
index 164a413a548ee..374cf76c1c2ac 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
@@ -13,7 +13,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { IBasePath } from '../../../../../../../src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import { AlertType } from '../../../../common/alert_types';
 import { AlertingFlyout } from '../../alerting/alerting_flyout';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
index e47c4853827de..4de3536d61593 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
@@ -8,7 +8,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ApmMlJob } from '../../../../common/anomaly_detection/apm_ml_job';
 import { getAnomalyDetectionSetupState } from '../../../../common/anomaly_detection/get_anomaly_detection_setup_state';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx
index 8a18bf0b3eed1..b9302a3ef857a 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx
@@ -8,11 +8,11 @@
 import { EuiHeaderLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   enableInspectEsQueries,
   useInspectorContext,
-} from '../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 
 export function InspectorHeaderLink() {
diff --git a/x-pack/plugins/apm/public/components/shared/backend_link.tsx b/x-pack/plugins/apm/public/components/shared/backend_link.tsx
index 92cad37273b02..6dde4e269ec54 100644
--- a/x-pack/plugins/apm/public/components/shared/backend_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/backend_link.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import React from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmRouter } from '../../hooks/use_apm_router';
 import { truncate } from '../../utils/style';
 import { ApmRoutes } from '../routing/apm_route_config';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
index 0d4c856a33a3d..62d7d8a9f6cc6 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
@@ -24,8 +24,8 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { Annotation } from '../../../../../common/annotations';
-import { useChartTheme } from '../../../../../../observability/public';
 import {
   asAbsoluteDateTime,
   asPercent,
@@ -36,14 +36,14 @@ import { useChartPointerEventContext } from '../../../../context/chart_pointer_e
 import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import { useTheme } from '../../../../hooks/use_theme';
 import { unit } from '../../../../utils/style';
-import { ChartContainer } from '../../charts/chart_container';
-import { isTimeseriesEmpty, onBrushEnd } from '../../charts/helper/helper';
+import { ChartContainer } from '../chart_container';
+import { isTimeseriesEmpty, onBrushEnd } from '../helper/helper';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { useTimeRange } from '../../../../hooks/use_time_range';
 import {
   getMaxY,
   getResponseTimeTickFormatter,
-} from '../../../shared/charts/transaction_charts/helper';
+} from '../transaction_charts/helper';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { getTimeZone } from '../helper/timezone';
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx b/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
index ffb62b7c62aac..089cdc87c08d5 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
@@ -8,7 +8,8 @@
 import { Fit } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import { rgba } from 'polished';
-import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { getSeverity } from '@kbn/ml-plugin/public';
 import { getSeverityColor } from '../../../../../common/anomaly_detection';
 import {
   ANOMALY_SEVERITY,
@@ -16,7 +17,6 @@ import {
 } from '../../../../../common/ml_constants';
 import { ServiceAnomalyTimeseries } from '../../../../../common/anomaly_detection/service_anomaly_timeseries';
 import { APMChartSpec } from '../../../../../typings/timeseries';
-import { getSeverity } from '../../../../../../ml/public';
 
 export function getChartAnomalyTimeseries({
   anomalyTimeseries,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
index acf3677af4938..946d6912f98d0 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from '../../../../../../../../src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { getDomainTZ, getTimeTicksTZ, getTimeZone } from './timezone';
 
 describe('Timezone helper', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
index f807d83c8977f..6514a0fd2bb7f 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
@@ -6,9 +6,9 @@
  */
 
 import d3 from 'd3';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { getTimezoneOffsetInMs } from './get_timezone_offset_in_ms';
-import { IUiSettingsClient } from '../../../../../../../../src/core/public';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
 
 interface Params {
   domain: [number, number];
diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx
index 4c93d2b513818..bf859151fb773 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx
@@ -22,7 +22,7 @@ import { EuiPanel, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useChartTheme } from '../../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { SERVICE_NODE_NAME } from '../../../../../common/elasticsearch_fieldnames';
 import {
   asTransactionRate,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
index 80bfcca05aabc..42bd5fc354337 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
@@ -10,7 +10,7 @@ import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import {
   InstancesLatencyDistributionChart,
   InstancesLatencyDistributionChartProps,
-} from './';
+} from '.';
 
 export default {
   title: 'shared/charts/InstancesLatencyDistributionChart',
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
index dd8543bc88c9f..e38674057cd85 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
@@ -13,13 +13,13 @@ import { LatencyAggregationType } from '../../../../../common/latency_aggregatio
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 import { useLicenseContext } from '../../../../context/license/use_license_context';
 import { useTransactionLatencyChartsFetcher } from '../../../../hooks/use_transaction_latency_chart_fetcher';
-import { TimeseriesChart } from '../../../shared/charts/timeseries_chart';
+import { TimeseriesChart } from '../timeseries_chart';
 import {
   getMaxY,
   getResponseTimeTickFormatter,
-} from '../../../shared/charts/transaction_charts/helper';
-import { MLHeader } from '../../../shared/charts/transaction_charts/ml_header';
-import * as urlHelpers from '../../../shared/links/url_helpers';
+} from '../transaction_charts/helper';
+import { MLHeader } from '../transaction_charts/ml_header';
+import * as urlHelpers from '../../links/url_helpers';
 import { getComparisonChartTheme } from '../../time_comparison/get_comparison_chart_theme';
 import { useEnvironmentsContext } from '../../../../context/environments_context/use_environments_context';
 import { ApmMlDetectorType } from '../../../../../common/anomaly_detection/apm_ml_detectors';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
index 34ca6a205dbc9..127983bfbf544 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
@@ -8,7 +8,7 @@
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
 import type { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
@@ -19,7 +19,7 @@ import {
   APIReturnType,
   createCallApmApi,
 } from '../../../../services/rest/create_call_apm_api';
-import { LatencyChart } from './';
+import { LatencyChart } from '.';
 
 interface Args {
   latencyChartResponse: APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/charts/latency'>;
diff --git a/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx
index 680cd70bb4d83..a726ab28cf04e 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx
@@ -21,7 +21,7 @@ import {
   EuiLoadingChart,
 } from '@elastic/eui';
 import React from 'react';
-import { useChartTheme } from '../../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { Coordinate } from '../../../../../typings/timeseries';
 import { useTheme } from '../../../../hooks/use_theme';
 import { unit } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx
index a75eb157335fe..131d82f4cb428 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useTheme } from '../../../../hooks/use_theme';
 
 export enum Shape {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx
index e421190d6793c..27fe750b06521 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
 import { AgentMarker } from './agent_marker';
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx
index 9e97129b199db..46c04983464e8 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx
@@ -7,7 +7,7 @@
 
 import { EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { asDuration } from '../../../../../../common/utils/formatters';
 import { useTheme } from '../../../../../hooks/use_theme';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx
index 3f27ddbf78af4..17ad34f70c008 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPopover, EuiText } from '@elastic/eui';
 import React, { useState } from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   TRACE_ID,
   TRANSACTION_ID,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx
index 698801b5a8d37..cadf1078937c6 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { Marker } from './';
+import { Marker } from '.';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
 import { ErrorMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks';
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx
index e4e26ce637bfe..d91e65662e11a 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
 import { ErrorMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks';
 import { AgentMarker } from './agent_marker';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts b/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts
index f12df738d84b7..67fdc04d6529c 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { scaleLinear } from 'd3-scale';
-import { Margins } from './';
+import { Margins } from '.';
 
 export type PlotValues = ReturnType<typeof getPlotValues>;
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx
index 4dddb4bee226d..31d5be127214e 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx
@@ -10,7 +10,7 @@ import React, { ReactNode } from 'react';
 import { XAxis, XYPlot } from 'react-vis';
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 import { useTheme } from '../../../../hooks/use_theme';
-import { Mark } from './';
+import { Mark } from '.';
 import { LastTickValue } from './last_tick_value';
 import { Marker } from './marker';
 import { PlotValues } from './plot_utils';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
index 3c15262a658d6..632e354341632 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
@@ -25,7 +25,7 @@ import { EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useChartTheme } from '../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { ServiceAnomalyTimeseries } from '../../../../common/anomaly_detection/service_anomaly_timeseries';
 import { asAbsoluteDateTime } from '../../../../common/utils/formatters';
 import { Coordinate, TimeSeries } from '../../../../typings/timeseries';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx
index 0ae6fc00b2804..98ff3a16ec519 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx
@@ -9,7 +9,7 @@ import { EuiFlexItem, EuiIconTip, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { MLSingleMetricLink } from '../../links/machine_learning_links/mlsingle_metric_link';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx
index b8d070c64ca9f..6af1c89fd1991 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx
@@ -7,7 +7,7 @@
 
 import type { HistogramItem } from '../../../../../common/correlations/types';
 
-import { replaceHistogramDotsWithBars } from './index';
+import { replaceHistogramDotsWithBars } from '.';
 
 describe('TransactionDistributionChart', () => {
   describe('replaceHistogramDotsWithBars', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx
index 91d3c0a727877..edc55596adb4d 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx
@@ -29,7 +29,7 @@ import { euiPaletteColorBlind } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { useChartTheme } from '../../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 import type { HistogramItem } from '../../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx b/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx
index 737c1a54a2f09..a5632ead92ecd 100644
--- a/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx
@@ -13,7 +13,7 @@ import React from 'react';
 import { useLocation } from 'react-router-dom';
 import qs from 'query-string';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import { DatePicker } from './';
+import { DatePicker } from '.';
 
 let history: MemoryHistory;
 
diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx b/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx
index 20433a89f359f..146cc87737c65 100644
--- a/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx
@@ -8,7 +8,7 @@
 import { EuiSuperDatePicker } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { clearCache } from '../../../services/rest/call_api';
 import { fromQuery, toQuery } from '../links/url_helpers';
diff --git a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx
index 6dbbc864297a2..8270c8aa64d41 100644
--- a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React from 'react';
-import { KeyValueFilterList } from './';
+import { KeyValueFilterList } from '.';
 import {
   expectTextsInDocument,
   renderWithTheme,
diff --git a/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx b/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx
index ed91aefdfcf9e..e7cc34cb75d44 100644
--- a/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx
+++ b/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx
@@ -7,7 +7,7 @@
 
 import { isBoolean, isNumber, isObject } from 'lodash';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
 
 const EmptyValue = euiStyled.span`
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts b/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
index fcfea9df339cc..0b3cbcb5efe79 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx b/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
index 0fb84aa7164bb..753d3b6460ea3 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
@@ -10,11 +10,9 @@ import { i18n } from '@kbn/i18n';
 import { uniqueId } from 'lodash';
 import React, { useState } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import {
-  esKuery,
-  QuerySuggestion,
-} from '../../../../../../../src/plugins/data/public';
+import { QuerySuggestion } from '@kbn/unified-search-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { esKuery } from '@kbn/data-plugin/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { useLegacyUrlParams } from '../../../context/url_params_context/use_url_params';
 import { useApmParams } from '../../../hooks/use_apm_params';
@@ -58,7 +56,7 @@ export function KueryBar(props: {
   });
   const { urlParams } = useLegacyUrlParams();
   const location = useLocation();
-  const { data } = useApmPluginContext().plugins;
+  const { unifiedSearch } = useApmPluginContext().plugins;
 
   let currentRequestCheck;
 
@@ -106,7 +104,7 @@ export function KueryBar(props: {
 
     try {
       const suggestions = (
-        (await data.autocomplete.getQuerySuggestions({
+        (await unifiedSearch.autocomplete.getQuerySuggestions({
           language: 'kuery',
           indexPatterns: [dataView],
           boolFilter:
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js
index 26b99c4e54f65..9c2ee835b8f72 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { EuiIcon } from '@elastic/eui';
 import { unit } from '../../../../utils/style';
 import { tint } from 'polished';
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js
index e6f482e88afc0..3f38b61c9a5e0 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js
@@ -9,7 +9,7 @@ import { isEmpty } from 'lodash';
 import { tint } from 'polished';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { unit } from '../../../../utils/style';
 import Suggestion from './suggestion';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx b/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx
index 366003c101789..b518cb23d91ff 100644
--- a/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { AgentConfigurationIntake } from '../../../../../common/agent_configuration/configuration_types';
 import { getLegacyApmHref } from './apm_link';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx b/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx
index 10e101d6af2b1..b8eb716d15cbb 100644
--- a/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { pick } from 'lodash';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx b/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx
index 919d140c54c1e..4df9bc0447aa1 100644
--- a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx
@@ -7,7 +7,7 @@
 
 import { EuiLink } from '@elastic/eui';
 import { Location } from 'history';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 import rison, { RisonValue } from 'rison-node';
diff --git a/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx b/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
index e38eaf0ea8124..1e5c3a6748a1f 100644
--- a/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
@@ -6,10 +6,10 @@
  */
 
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import React from 'react';
 import url from 'url';
-import { InfraAppId } from '../../../../../infra/public';
+import { InfraAppId } from '@kbn/infra-plugin/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { fromQuery } from './url_helpers';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/kibana.ts b/x-pack/plugins/apm/public/components/shared/links/kibana.ts
index e05ccf4e6fcff..f8a59036c85bb 100644
--- a/x-pack/plugins/apm/public/components/shared/links/kibana.ts
+++ b/x-pack/plugins/apm/public/components/shared/links/kibana.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IBasePath } from '../../../../../../../src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 
 export function getUpgradeAssistantHref(basePath: IBasePath) {
diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
index 541b00f8291b0..9da957f97c974 100644
--- a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
@@ -7,9 +7,9 @@
 
 import React, { ReactNode } from 'react';
 import { EuiLink } from '@elastic/eui';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TimePickerRefreshInterval } from '../../date_picker/typings';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
index ef92691336c34..cc2d855550af3 100644
--- a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
@@ -7,9 +7,9 @@
 
 import React, { ReactNode } from 'react';
 import { EuiLink } from '@elastic/eui';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TimePickerRefreshInterval } from '../../date_picker/typings';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts b/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts
index 093a953dffe94..6be36d8823833 100644
--- a/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts
+++ b/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts
@@ -7,7 +7,7 @@
 
 import { History } from 'history';
 import { parse, stringify } from 'query-string';
-import { url } from '../../../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 export function toQuery(search?: string): APMQueryParamsRaw {
   return search ? parse(search.slice(1), { sort: false }) : {};
diff --git a/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx b/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx
index 15246d5375abe..60df610b05e6e 100644
--- a/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ReactNode } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useBreakpoints } from '../../../hooks/use_breakpoints';
 
 /**
diff --git a/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx b/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx
index 469e384a06ee4..fb6dd69128200 100644
--- a/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx
@@ -9,7 +9,7 @@ import { RouterProvider } from '@kbn/typed-react-router-config';
 import { render } from '@testing-library/react';
 import { createMemoryHistory, Location, MemoryHistory } from 'history';
 import qs from 'query-string';
-import { RedirectWithDefaultEnvironment } from './';
+import { RedirectWithDefaultEnvironment } from '.';
 import { apmRouter } from '../../routing/apm_route_config';
 import * as useApmPluginContextExports from '../../../context/apm_plugin/use_apm_plugin_context';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
diff --git a/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx b/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx
index b8f505bf3e3c0..fb5c98ba515fa 100644
--- a/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx
@@ -13,9 +13,9 @@ import { isRouteWithTimeRange } from '../is_route_with_time_range';
 import {
   TimeRangeComparisonEnum,
   dayAndWeekBeforeToOffset,
-} from '../../../components/shared/time_comparison/get_comparison_options';
+} from '../time_comparison/get_comparison_options';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
-import { getComparisonEnabled } from '../../../components/shared/time_comparison/get_comparison_enabled';
+import { getComparisonEnabled } from '../time_comparison/get_comparison_enabled';
 import { toBoolean } from '../../../context/url_params_context/helpers';
 
 export function RedirectWithOffset({
diff --git a/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx b/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
index 6cf6c2090c661..d6fc9eb0eecb5 100644
--- a/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
@@ -9,7 +9,7 @@ import { getByTestId, fireEvent, getByText } from '@testing-library/react';
 import { createMemoryHistory, MemoryHistory } from 'history';
 import React from 'react';
 import { Router } from 'react-router-dom';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockApmPluginContextWrapper } from '../../context/apm_plugin/mock_apm_plugin_context';
 import { ApmServiceContextProvider } from '../../context/apm_service/apm_service_context';
 import { UrlParamsProvider } from '../../context/url_params_context/url_params_context';
@@ -18,7 +18,7 @@ import * as useFetcherHook from '../../hooks/use_fetcher';
 import * as useServiceTransactionTypesHook from '../../context/apm_service/use_service_transaction_types_fetcher';
 import { renderWithTheme } from '../../utils/test_helpers';
 import { fromQuery } from './links/url_helpers';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { SearchBar } from './search_bar';
 
 function setup({
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
index 2e15ea9f0db5f..862d1e7f10dba 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
@@ -6,11 +6,11 @@
  */
 
 import { fireEvent, render } from '@testing-library/react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { merge } from 'lodash';
 // import { renderWithTheme } from '../../../../utils/test_helpers';
 import React, { ReactNode } from 'react';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import {
@@ -19,7 +19,7 @@ import {
 } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import * as fetcherHook from '../../../hooks/use_fetcher';
 import { ServiceIcons } from '.';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 const KibanaReactContext = createKibanaReactContext({
   usageCollection: { reportUiCounter: () => {} },
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
index 97c1ecf3476fa..60757bc0b99be 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
@@ -7,13 +7,13 @@
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import {
   APIReturnType,
   createCallApmApi,
 } from '../../../services/rest/create_call_apm_api';
-import { ServiceIcons } from './';
+import { ServiceIcons } from '.';
 
 type ServiceDetailsReturnType =
   APIReturnType<'GET /internal/apm/services/{serviceName}/metadata/details'>;
diff --git a/x-pack/plugins/apm/public/components/shared/service_link.tsx b/x-pack/plugins/apm/public/components/shared/service_link.tsx
index d8f346f63b2ae..dc4f56ac57053 100644
--- a/x-pack/plugins/apm/public/components/shared/service_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_link.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import React from 'react';
 import { TypeOf } from '@kbn/typed-react-router-config';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate } from '../../utils/style';
 import { useApmRouter } from '../../hooks/use_apm_router';
 import { AgentIcon } from './agent_icon';
diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts b/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts
index 2abb7d03bce80..f9d74fe1bc956 100644
--- a/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts
+++ b/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts
@@ -23,7 +23,7 @@ import mysqlIcon from './icons/mysql.svg';
 import postgresqlIcon from './icons/postgresql.svg';
 import redisIcon from './icons/redis.svg';
 import websocketIcon from './icons/websocket.svg';
-import javaIcon from '../../shared/agent_icon/icons/java.svg';
+import javaIcon from '../agent_icon/icons/java.svg';
 
 const defaultSpanTypeIcons: { [key: string]: string } = {
   cache: databaseIcon,
diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx b/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
index d68b042159bb9..a56f10df28ca5 100644
--- a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
@@ -15,7 +15,7 @@ import {
 import type { Story } from '@storybook/react';
 import React from 'react';
 import { getSpanIcon, spanTypeIcons } from './get_span_icon';
-import { SpanIcon } from './index';
+import { SpanIcon } from '.';
 
 const spanTypes = Object.keys(spanTypeIcons);
 
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx
index 0ee4f66e2c24c..afa9fd640472d 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx
@@ -8,8 +8,8 @@
 import { EuiAccordion, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stacktrace } from '.';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 
 const Accordion = euiStyled(EuiAccordion)`
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
index a03b0b5f2ae01..9ba8919affc74 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
@@ -13,7 +13,7 @@ import javascript from 'react-syntax-highlighter/dist/cjs/languages/hljs/javascr
 import python from 'react-syntax-highlighter/dist/cjs/languages/hljs/python';
 import ruby from 'react-syntax-highlighter/dist/cjs/languages/hljs/ruby';
 import xcode from 'react-syntax-highlighter/dist/cjs/styles/hljs/xcode';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { StackframeWithLineContext } from '../../../../typings/es_schemas/raw/fields/stackframe';
 
 SyntaxHighlighter.registerLanguage('javascript', javascript);
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx
index 8c9b9ae26c140..796faf775a30a 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ComponentType } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import {
   CSharpFrameHeadingRenderer,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
index 6d2288235899e..1fc295a35cbb7 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 import { DefaultFrameHeadingRenderer } from './default_frame_heading_renderer';
 
 export function CSharpFrameHeadingRenderer({
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
index cc101697155ee..da01abf6d94e3 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function DefaultFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
index 847e05de38868..4b4864e7f1f76 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function JavaFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
index d3430c63722ce..a50f782f19ec2 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function JavaScriptFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
index efda5b3b5c98c..0446c790225e5 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function RubyFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx
index 965d6bf8d5df8..eb32a2aa8ce4d 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { isEmpty, last } from 'lodash';
 import React, { Fragment } from 'react';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
-import { EmptyMessage } from '../../shared/empty_message';
+import { EmptyMessage } from '../empty_message';
 import { LibraryStacktrace } from './library_stacktrace';
 import { Stackframe as StackframeComponent } from './stackframe';
 
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx
index 11017dd09d4ee..1957f9cff382d 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx
@@ -8,7 +8,7 @@
 import { EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { Stackframe as StackframeComponent } from './stackframe';
 
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx
index 48c81b2365d2d..b8de428d819e1 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx
@@ -7,7 +7,7 @@
 
 import { EuiAccordion } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   Stackframe as StackframeType,
   StackframeWithLineContext,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts b/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts
index 432ebb1d9492b..35a43a2e0cc76 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
-import { getGroupedStackframes } from './';
+import { getGroupedStackframes } from '.';
 import stacktracesMock from './__fixtures__/stacktraces.json';
 
 describe('Stacktrace', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx
index 01abfbe0915dc..2844589cc60a8 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx
@@ -8,7 +8,7 @@
 import { EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { KeyValueTable } from '../key_value_table';
 import { flattenObject } from '../../../utils/flatten_object';
diff --git a/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx b/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx
index 49488ba09e068..ae76e4116e358 100644
--- a/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate } from '../../../utils/style';
 
 export interface IStickyProperty {
diff --git a/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx b/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx
index 2e3a1af38e2ff..742ea46cee539 100644
--- a/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx
@@ -8,10 +8,10 @@
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
-import { SuggestionsSelect } from './';
+import { SuggestionsSelect } from '.';
 
 interface Args {
   allOption: EuiComboBoxOptionOption<string>;
diff --git a/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx b/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx
index 17189f1e40d94..1f339188db149 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBadge } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useTheme } from '../../../hooks/use_theme';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx
index 3e1848af316fe..6091a6ff8c73d 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 import { HttpInfoSummaryItem } from '.';
 import * as exampleTransactions from '../__fixtures__/transactions';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 describe('HttpInfoSummaryItem', () => {
   describe('render', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx
index 51e574324dfa6..082a124dee890 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx
@@ -8,7 +8,7 @@
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate, unit } from '../../../../utils/style';
 import { HttpStatusBadge } from '../http_status_badge';
 
diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx b/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx
index 3972dc15dbea1..62b2407e7cadf 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { HttpStatusBadge } from './index';
+import { HttpStatusBadge } from '.';
 import {
   successColor,
   neutralColor,
diff --git a/x-pack/plugins/apm/public/components/shared/summary/index.tsx b/x-pack/plugins/apm/public/components/shared/summary/index.tsx
index 1880ee00f3de7..649d9bdb66447 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Maybe } from '../../../../typings/common';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx b/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx
index 7ceec331ae8fe..4b4ab9b61365c 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
-import { Summary } from './';
+import { Summary } from '.';
 import { TimestampTooltip } from '../timestamp_tooltip';
 import { DurationSummaryItem } from './duration_summary_item';
 import { ErrorCountSummaryItemBadge } from './error_count_summary_item_badge';
diff --git a/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx b/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx
index 20fd19a06c9eb..1ca8bd1fc8bed 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { UserAgent } from '../../../../typings/es_schemas/raw/fields/user_agent';
 
 type UserAgentSummaryItemProps = UserAgent;
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts
index 23e1c94729204..12811360cabc8 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { getComparisonEnabled } from './get_comparison_enabled';
 
 describe('getComparisonEnabled', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts
index 5f2ca5dca4656..916e55709d6ef 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreStart } from 'kibana/public';
-import { enableComparisonByDefault } from '../../../../../observability/public';
+import { CoreStart } from '@kbn/core/public';
+import { enableComparisonByDefault } from '@kbn/observability-plugin/public';
 
 export function getComparisonEnabled({
   core,
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx
index 93d24208a0681..3d0c0b0cd9d8f 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx
@@ -8,13 +8,13 @@
 import { render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   expectTextsInDocument,
   expectTextsNotInDocument,
 } from '../../../utils/test_helpers';
-import { TimeComparison } from './';
-import * as urlHelpers from '../../shared/links/url_helpers';
+import { TimeComparison } from '.';
+import * as urlHelpers from '../links/url_helpers';
 import moment from 'moment';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx
index d587d363d921d..f776d32c7c6d1 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx
@@ -9,12 +9,12 @@ import { EuiCheckbox, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
 import { useBreakpoints } from '../../../hooks/use_breakpoints';
 import { useTimeRange } from '../../../hooks/use_time_range';
-import * as urlHelpers from '../../shared/links/url_helpers';
+import * as urlHelpers from '../links/url_helpers';
 import { getComparisonOptions } from './get_comparison_options';
 
 const PrependContainer = euiStyled.div`
diff --git a/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx b/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx
index 2b9ab7d8c5dbf..1072799a2106f 100644
--- a/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import moment from 'moment-timezone';
-import { TimestampTooltip } from './index';
+import { TimestampTooltip } from '.';
 import { mockNow } from '../../../utils/test_helpers';
 
 describe('TimestampTooltip', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx
index 5cd7188c8ba8b..d20a158b62c77 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx
@@ -7,10 +7,7 @@
 
 import Mustache from 'mustache';
 import React from 'react';
-import {
-  SectionLink,
-  SectionLinks,
-} from '../../../../../../observability/public';
+import { SectionLink, SectionLinks } from '@kbn/observability-plugin/public';
 import { CustomLink } from '../../../../../common/custom_link/custom_link_types';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
 import { unit } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx
index 68442ede98347..e9c7e6ec01d16 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx
@@ -21,7 +21,7 @@ import {
   Section,
   SectionSubtitle,
   SectionTitle,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { NO_PERMISSION_LABEL } from '../../../../../common/custom_link';
 import {
   CustomLink,
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
index 1d37dde6c6343..2b3a08028ccec 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Location } from 'history';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { getSections } from './sections';
 
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
index 8fbf0ea1f3235..29db2d09b3bcf 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { isEmpty, pickBy } from 'lodash';
 import moment from 'moment';
 import url from 'url';
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
index ebdbf759bcddc..9c5dd2bbe03b6 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
@@ -8,7 +8,7 @@
 import { act, fireEvent, render } from '@testing-library/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { License } from '../../../../../licensing/common/license';
+import { License } from '@kbn/licensing-plugin/common/license';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import {
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx
index 253c792246139..8b010e79fb7b9 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx
@@ -17,7 +17,7 @@ import {
   SectionLinks,
   SectionSubtitle,
   SectionTitle,
-} from '../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { useLicenseContext } from '../../../context/license/use_license_context';
diff --git a/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx b/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx
index 3b649d77172ee..5f41838858e6a 100644
--- a/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate } from '../../../utils/style';
 
 const tooltipAnchorClassname = '_apm_truncate_tooltip_anchor_';
diff --git a/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx b/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx
index 59a0d1fec8006..67209c23324ad 100644
--- a/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { createContext } from 'react';
-import type { ObservabilityRuleTypeRegistry } from '../../../../observability/public';
-import { ConfigSchema } from '../..';
+import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
+import { MapsStartApi } from '@kbn/maps-plugin/public';
+import { ObservabilityPublicStart } from '@kbn/observability-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 import { ApmPluginSetupDeps } from '../../plugin';
-import { MapsStartApi } from '../../../../maps/public';
-import { ObservabilityPublicStart } from '../../../../observability/public';
-import { Start as InspectorPluginStart } from '../../../../../../src/plugins/inspector/public';
+import { ConfigSchema } from '../..';
 
 export interface ApmPluginContextValue {
   appMountParameters: AppMountParameters;
diff --git a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
index 025338bb53517..ddc7db4c6e5f4 100644
--- a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
@@ -10,16 +10,16 @@ import { RouterProvider } from '@kbn/typed-react-router-config';
 import { useHistory } from 'react-router-dom';
 import { createMemoryHistory, History } from 'history';
 import { merge } from 'lodash';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { UrlService } from '../../../../../../src/plugins/share/common/url_service';
-import { createObservabilityRuleTypeRegistryMock } from '../../../../observability/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { UrlService } from '@kbn/share-plugin/common/url_service';
+import { createObservabilityRuleTypeRegistryMock } from '@kbn/observability-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { MlLocatorDefinition } from '@kbn/ml-plugin/public';
+import { enableComparisonByDefault } from '@kbn/observability-plugin/public';
 import { ApmPluginContext, ApmPluginContextValue } from './apm_plugin_context';
 import { ConfigSchema } from '../..';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { createCallApmApi } from '../../services/rest/create_call_apm_api';
 import { apmRouter } from '../../components/routing/apm_route_config';
-import { MlLocatorDefinition } from '../../../../ml/public';
-import { enableComparisonByDefault } from '../../../../observability/public';
 
 const coreStart = coreMock.createStart({ basePath: '/basepath' });
 
diff --git a/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx b/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx
index 906d2b19abf9f..541fa1197ec2b 100644
--- a/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx
+++ b/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx
@@ -9,10 +9,10 @@ import {
   RouteMatch,
   useMatchRoutes,
 } from '@kbn/typed-react-router-config';
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { compact, isEqual } from 'lodash';
 import React, { createContext, useMemo, useState } from 'react';
-import { useBreadcrumbs } from '../../../../observability/public';
+import { useBreadcrumbs } from '@kbn/observability-plugin/public';
 
 export interface Breadcrumb {
   title: string;
diff --git a/x-pack/plugins/apm/public/context/license/license_context.tsx b/x-pack/plugins/apm/public/context/license/license_context.tsx
index 356fd791abdd0..1ec6fe2d4dbe3 100644
--- a/x-pack/plugins/apm/public/context/license/license_context.tsx
+++ b/x-pack/plugins/apm/public/context/license/license_context.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import useObservable from 'react-use/lib/useObservable';
-import { ILicense } from '../../../../licensing/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { useApmPluginContext } from '../apm_plugin/use_apm_plugin_context';
 import { InvalidLicenseNotification } from './invalid_license_notification';
 
diff --git a/x-pack/plugins/apm/public/feature_catalogue_entry.ts b/x-pack/plugins/apm/public/feature_catalogue_entry.ts
index eadc8b6cbbcb6..8a6a70bd91164 100644
--- a/x-pack/plugins/apm/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/apm/public/feature_catalogue_entry.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 
 export const featureCatalogueEntry = {
   id: 'apm',
@@ -19,5 +19,5 @@ export const featureCatalogueEntry = {
   icon: 'apmApp',
   path: '/app/apm',
   showOnHomePage: false,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data' as FeatureCatalogueCategory,
 };
diff --git a/x-pack/plugins/apm/public/hooks/use_current_user.ts b/x-pack/plugins/apm/public/hooks/use_current_user.ts
index 6f7c999c01e86..0e95bb27bbb87 100644
--- a/x-pack/plugins/apm/public/hooks/use_current_user.ts
+++ b/x-pack/plugins/apm/public/hooks/use_current_user.ts
@@ -6,9 +6,9 @@
  */
 
 import { useState, useEffect } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { ApmPluginStartDeps } from '../plugin';
-import { AuthenticatedUser } from '../../../security/common/model';
 
 export function useCurrentUser() {
   const {
diff --git a/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts b/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts
index a0b06c241a28c..eb6ca4f38f623 100644
--- a/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts
+++ b/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts
@@ -6,7 +6,7 @@
  */
 import qs from 'query-string';
 import { useHistory, useLocation } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { TimePickerTimeDefaults } from '../components/shared/date_picker/typings';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
 
diff --git a/x-pack/plugins/apm/public/hooks/use_default_environment.ts b/x-pack/plugins/apm/public/hooks/use_default_environment.ts
index ed95bd7853bcd..0f266379aaa47 100644
--- a/x-pack/plugins/apm/public/hooks/use_default_environment.ts
+++ b/x-pack/plugins/apm/public/hooks/use_default_environment.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { defaultApmServiceEnvironment } from '../../../observability/common';
+import { defaultApmServiceEnvironment } from '@kbn/observability-plugin/common';
 import { ENVIRONMENT_ALL } from '../../common/environment_filter_values';
 import { Environment } from '../../common/environment_rt';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx b/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx
index eb78f386105b5..ed4d1f0791992 100644
--- a/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx
@@ -7,8 +7,8 @@
 
 import { renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import React, { ReactNode } from 'react';
-import { CoreStart } from '../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { delay } from '../utils/test_helpers';
 import { FetcherResult, useFetcher } from './use_fetcher';
 
diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx b/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
index e0c62fa8953d9..139a43c9a9d9b 100644
--- a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
@@ -7,14 +7,14 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useMemo, useState } from 'react';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useInspectorContext } from '@kbn/observability-plugin/public';
 import { useTimeRangeId } from '../context/time_range_id/use_time_range_id';
 import {
   AutoAbortedAPMClient,
   callApmApi,
 } from '../services/rest/create_call_apm_api';
-import { useInspectorContext } from '../../../observability/public';
 
 export enum FETCH_STATUS {
   LOADING = 'loading',
diff --git a/x-pack/plugins/apm/public/hooks/use_local_storage.ts b/x-pack/plugins/apm/public/hooks/use_local_storage.ts
index 502824135db2a..5adbb36432127 100644
--- a/x-pack/plugins/apm/public/hooks/use_local_storage.ts
+++ b/x-pack/plugins/apm/public/hooks/use_local_storage.ts
@@ -5,38 +5,38 @@
  * 2.0.
  */
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 
 export function useLocalStorage<T>(key: string, defaultValue: T) {
-  const [item, setItem] = useState<T>(getFromStorage(key, defaultValue));
+  // This is necessary to fix a race condition issue.
+  // It guarantees that the latest value will be always returned after the value is updated
+  const [storageUpdate, setStorageUpdate] = useState(0);
 
-  const updateFromStorage = () => {
-    const storedItem = getFromStorage(key, defaultValue);
-    setItem(storedItem);
-  };
+  const item = useMemo(() => {
+    return getFromStorage(key, defaultValue);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [key, storageUpdate, defaultValue]);
 
   const saveToStorage = (value: T) => {
     if (value === undefined) {
       window.localStorage.removeItem(key);
     } else {
       window.localStorage.setItem(key, JSON.stringify(value));
-      updateFromStorage();
+      setStorageUpdate(storageUpdate + 1);
     }
   };
 
   useEffect(() => {
-    window.addEventListener('storage', (event: StorageEvent) => {
+    function onUpdate(event: StorageEvent) {
       if (event.key === key) {
-        updateFromStorage();
+        setStorageUpdate(storageUpdate + 1);
       }
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  // item state must be updated with a new key or default value
-  useEffect(() => {
-    setItem(getFromStorage(key, defaultValue));
-  }, [key, defaultValue]);
+    }
+    window.addEventListener('storage', onUpdate);
+    return () => {
+      window.removeEventListener('storage', onUpdate);
+    };
+  }, [key, setStorageUpdate, storageUpdate]);
 
   return [item, saveToStorage] as const;
 }
diff --git a/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts b/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts
index d289c29b60b37..5eb1f6bb8f0bf 100644
--- a/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts
+++ b/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { ML_PAGES, useMlHref } from '../../../ml/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { ML_PAGES, useMlHref } from '@kbn/ml-plugin/public';
 import { TimePickerRefreshInterval } from '../components/shared/date_picker/typings';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
 import { useLegacyUrlParams } from '../context/url_params_context/use_url_params';
diff --git a/x-pack/plugins/apm/public/hooks/use_progressive_fetcher.tsx b/x-pack/plugins/apm/public/hooks/use_progressive_fetcher.tsx
new file mode 100644
index 0000000000000..a3268fe8d2958
--- /dev/null
+++ b/x-pack/plugins/apm/public/hooks/use_progressive_fetcher.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { OmitByValue, Assign } from 'utility-types';
+import type {
+  ClientRequestParamsOf,
+  EndpointOf,
+  ReturnOf,
+} from '@kbn/server-route-repository';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import {
+  apmProgressiveLoading,
+  getProbabilityFromProgressiveLoadingQuality,
+  ProgressiveLoadingQuality,
+} from '@kbn/observability-plugin/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import type { APMServerRouteRepository } from '../../server';
+
+import type {
+  APMClient,
+  APMClientOptions,
+} from '../services/rest/create_call_apm_api';
+import { FetcherResult, FETCH_STATUS, useFetcher } from './use_fetcher';
+
+type APMProgressivelyLoadingServerRouteRepository = OmitByValue<
+  {
+    [key in keyof APMServerRouteRepository]: ClientRequestParamsOf<
+      APMServerRouteRepository,
+      key
+    > extends {
+      params: { query: { probability: any } };
+    }
+      ? APMServerRouteRepository[key]
+      : undefined;
+  },
+  undefined
+>;
+
+type WithoutProbabilityParameter<T extends Record<string, any>> = {
+  params: { query: {} };
+} & Assign<
+  T,
+  {
+    params: Omit<T['params'], 'query'> & {
+      query: Omit<T['params']['query'], 'probability'>;
+    };
+  }
+>;
+
+type APMProgressiveAPIClient = <
+  TEndpoint extends EndpointOf<APMProgressivelyLoadingServerRouteRepository>
+>(
+  endpoint: TEndpoint,
+  options: Omit<APMClientOptions, 'signal'> &
+    WithoutProbabilityParameter<
+      ClientRequestParamsOf<
+        APMProgressivelyLoadingServerRouteRepository,
+        TEndpoint
+      >
+    >
+) => Promise<ReturnOf<APMProgressivelyLoadingServerRouteRepository, TEndpoint>>;
+
+function clientWithProbability(
+  regularCallApmApi: APMClient,
+  probability: number
+) {
+  return <
+    TEndpoint extends EndpointOf<APMProgressivelyLoadingServerRouteRepository>
+  >(
+    endpoint: TEndpoint,
+    options: Omit<APMClientOptions, 'signal'> &
+      WithoutProbabilityParameter<
+        ClientRequestParamsOf<
+          APMProgressivelyLoadingServerRouteRepository,
+          TEndpoint
+        >
+      >
+  ) => {
+    return regularCallApmApi(endpoint, {
+      ...options,
+      params: {
+        ...options.params,
+        query: {
+          ...options.params.query,
+          probability,
+        },
+      },
+    } as any);
+  };
+}
+
+export function useProgressiveFetcher<TReturn>(
+  callback: (
+    callApmApi: APMProgressiveAPIClient
+  ) => Promise<TReturn> | undefined,
+  dependencies: any[],
+  options?: Parameters<typeof useFetcher>[2]
+): FetcherResult<TReturn> {
+  const {
+    services: { uiSettings },
+  } = useKibana();
+
+  const progressiveLoadingQuality =
+    uiSettings?.get<ProgressiveLoadingQuality>(apmProgressiveLoading) ??
+    ProgressiveLoadingQuality.off;
+
+  const sampledProbability = getProbabilityFromProgressiveLoadingQuality(
+    progressiveLoadingQuality
+  );
+
+  const sampledFetch = useFetcher(
+    (regularCallApmApi) => {
+      if (progressiveLoadingQuality === ProgressiveLoadingQuality.off) {
+        return;
+      }
+      return callback(
+        clientWithProbability(regularCallApmApi, sampledProbability)
+      );
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    dependencies,
+    options
+  );
+
+  const unsampledFetch = useFetcher(
+    (regularCallApmApi) => {
+      return callback(clientWithProbability(regularCallApmApi, 1));
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    dependencies
+  );
+
+  const fetches = [unsampledFetch, sampledFetch];
+
+  const isError = unsampledFetch.status === FETCH_STATUS.FAILURE;
+
+  const usedFetch =
+    (!isError &&
+      fetches.find((fetch) => fetch.status === FETCH_STATUS.SUCCESS)) ||
+    unsampledFetch;
+
+  const status =
+    unsampledFetch.status === FETCH_STATUS.LOADING &&
+    usedFetch.status === FETCH_STATUS.SUCCESS
+      ? FETCH_STATUS.LOADING
+      : usedFetch.status;
+
+  return {
+    ...usedFetch,
+    status,
+  };
+}
diff --git a/x-pack/plugins/apm/public/hooks/use_theme.tsx b/x-pack/plugins/apm/public/hooks/use_theme.tsx
index d140e82977fb0..8c18ac38efc33 100644
--- a/x-pack/plugins/apm/public/hooks/use_theme.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_theme.tsx
@@ -7,7 +7,7 @@
 
 import { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
-import { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 export function useTheme(): EuiTheme {
   const theme = useContext(ThemeContext);
diff --git a/x-pack/plugins/apm/public/index.ts b/x-pack/plugins/apm/public/index.ts
index 9b2175dd465bc..1a5177b7f1f8c 100644
--- a/x-pack/plugins/apm/public/index.ts
+++ b/x-pack/plugins/apm/public/index.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  PluginInitializer,
-  PluginInitializerContext,
-} from '../../../../src/core/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import { ApmPlugin, ApmPluginSetup, ApmPluginStart } from './plugin';
 
 export interface ConfigSchema {
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 83aad1b3b4fe6..627196a9a4bdc 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+
 import { i18n } from '@kbn/i18n';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { UsageCollectionStart } from 'src/plugins/usage_collection/public';
-import type { ConfigSchema } from '.';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import {
   AppMountParameters,
   CoreSetup,
@@ -16,33 +16,37 @@ import {
   DEFAULT_APP_CATEGORIES,
   Plugin,
   PluginInitializerContext,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import type {
-  DataPublicPluginSetup,
   DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { Start as InspectorPluginStart } from '../../../../src/plugins/inspector/public';
+  DataPublicPluginSetup,
+} from '@kbn/data-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 import type {
   PluginSetupContract as AlertingPluginPublicSetup,
   PluginStartContract as AlertingPluginPublicStart,
-} from '../../alerting/public';
-import type { FeaturesPluginSetup } from '../../features/public';
-import type { FleetStart } from '../../fleet/public';
-import type { LicensingPluginSetup } from '../../licensing/public';
-import type { MapsStartApi } from '../../maps/public';
-import type { MlPluginSetup, MlPluginStart } from '../../ml/public';
+} from '@kbn/alerting-plugin/public';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/public';
+import type { FleetStart } from '@kbn/fleet-plugin/public';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
 import {
   FetchDataParams,
   METRIC_TYPE,
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../observability/public';
+} from '@kbn/observability-plugin/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { SecurityPluginStart } from '@kbn/security-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { registerApmAlerts } from './components/alerting/register_apm_alerts';
 import {
   getApmEnrollmentFlyoutData,
@@ -52,9 +56,7 @@ import { getLazyApmAgentsTabExtension } from './components/fleet_integration/laz
 import { getLazyAPMPolicyCreateExtension } from './components/fleet_integration/lazy_apm_policy_create_extension';
 import { getLazyAPMPolicyEditExtension } from './components/fleet_integration/lazy_apm_policy_edit_extension';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
-import type { SecurityPluginStart } from '../../security/public';
-import { SpacesPluginStart } from '../../spaces/public';
-import { enableServiceGroups } from '../../observability/public';
+import type { ConfigSchema } from '.';
 
 export type ApmPluginSetup = ReturnType<ApmPlugin['setup']>;
 
@@ -63,6 +65,7 @@ export type ApmPluginStart = void;
 export interface ApmPluginSetupDeps {
   alerting?: AlertingPluginPublicSetup;
   data: DataPublicPluginSetup;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   features: FeaturesPluginSetup;
   home?: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/apm/public/services/call_api.test.ts b/x-pack/plugins/apm/public/services/call_api.test.ts
index e172d41001f16..63ea230fe216e 100644
--- a/x-pack/plugins/apm/public/services/call_api.test.ts
+++ b/x-pack/plugins/apm/public/services/call_api.test.ts
@@ -7,7 +7,7 @@
 
 import { mockNow } from '../utils/test_helpers';
 import { clearCache, callApi } from './rest/call_api';
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 
 type CoreMock = CoreStart & {
   http: {
diff --git a/x-pack/plugins/apm/public/services/call_apm_api.test.ts b/x-pack/plugins/apm/public/services/call_apm_api.test.ts
index 2e74d36b97b38..dceeba14504c3 100644
--- a/x-pack/plugins/apm/public/services/call_apm_api.test.ts
+++ b/x-pack/plugins/apm/public/services/call_apm_api.test.ts
@@ -7,7 +7,7 @@
 
 import * as callApiExports from './rest/call_api';
 import { createCallApmApi, callApmApi } from './rest/create_call_apm_api';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 const callApi = jest
   .spyOn(callApiExports, 'callApi')
diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
index c52d38489a85e..f6a3f87fe4bf0 100644
--- a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
+++ b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
@@ -8,7 +8,7 @@
 import {
   ApmFetchDataResponse,
   FetchDataParams,
-} from '../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { callApmApi } from './create_call_apm_api';
 
 export const fetchObservabilityOverviewPageData = async ({
diff --git a/x-pack/plugins/apm/public/services/rest/call_api.ts b/x-pack/plugins/apm/public/services/rest/call_api.ts
index 196878a08821e..c0458241460e8 100644
--- a/x-pack/plugins/apm/public/services/rest/call_api.ts
+++ b/x-pack/plugins/apm/public/services/rest/call_api.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import { isString, startsWith } from 'lodash';
 import LRU from 'lru-cache';
 import hash from 'object-hash';
-import { enableInspectEsQueries } from '../../../../observability/public';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/public';
 import { FetchOptions } from '../../../common/fetch_options';
 
 function fetchOptionsWithDebug(
diff --git a/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts b/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts
index 214f91198e35f..e9450ec67cc88 100644
--- a/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts
+++ b/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import type {
   ClientRequestParamsOf,
   formatRequest as formatRequestType,
@@ -18,6 +18,7 @@ import type {
 // so in order to do targeted imports they must me imported separately, and
 // an error is expected here
 import { formatRequest } from '@kbn/server-route-repository/target_node/format_request';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
 import { FetchOptions } from '../../../common/fetch_options';
 import { CallApi, callApi } from './call_api';
 import type {
@@ -25,7 +26,6 @@ import type {
   APIEndpoint,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../server';
-import { InspectResponse } from '../../../../observability/typings/common';
 
 export type APMClientOptions = Omit<
   FetchOptions,
diff --git a/x-pack/plugins/apm/public/set_help_extension.ts b/x-pack/plugins/apm/public/set_help_extension.ts
index 9015a28822a75..0b79f81cce2d2 100644
--- a/x-pack/plugins/apm/public/set_help_extension.ts
+++ b/x-pack/plugins/apm/public/set_help_extension.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { getUpgradeAssistantHref } from './components/shared/links/kibana';
 
 export function setHelpExtension({ chrome, http }: CoreStart) {
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
index 0fe659700a1eb..2ef44b9538318 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
@@ -6,10 +6,10 @@
  */
 
 import { Story } from '@storybook/react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React from 'react';
 import { POLICY_ELASTIC_AGENT_ON_CLOUD } from '../../../common/fleet';
-import TutorialConfigAgent from './';
+import TutorialConfigAgent from '.';
 import { APIReturnType } from '../../services/rest/create_call_apm_api';
 
 export type APIResponseType = APIReturnType<'GET /internal/apm/fleet/agents'>;
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts
index 0336c5942127d..b0613c8536756 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts
@@ -6,7 +6,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import { POLICY_ELASTIC_AGENT_ON_CLOUD } from '../../../common/fleet';
-import { APIResponseType } from './';
+import { APIResponseType } from '.';
 
 const DEFAULT_STANDALONE_CONFIG_LABEL = i18n.translate(
   'xpack.apm.tutorial.agent_config.defaultStandaloneConfig',
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
index ab2163cc961bf..c41f6df5369f6 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
@@ -5,13 +5,13 @@
  * 2.0.
  */
 import { fireEvent, render, screen } from '@testing-library/react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React from 'react';
 import {
   expectTextsInDocument,
   expectTextsNotInDocument,
 } from '../../utils/test_helpers';
-import TutorialConfigAgent from './';
+import TutorialConfigAgent from '.';
 
 const policyElasticAgentOnCloudAgent = {
   id: 'policy-elastic-agent-on-cloud',
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
index 68952193282fd..72fb4f453eff8 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
@@ -6,7 +6,7 @@
  */
 import { EuiCodeBlock, EuiLoadingSpinner, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React, { useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
 import { APIReturnType } from '../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx
index 4a4bfb252bfe5..67d568c0114e8 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React from 'react';
-import TutorialConfigAgent from './';
+import TutorialConfigAgent from '.';
 
 interface Props {
   http: HttpStart;
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
index 87a0d216648f9..9fc4cf32fe000 100644
--- a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
@@ -16,7 +16,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { APIReturnType } from '../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx
index 733b7a91ed663..b5d0857042812 100644
--- a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx
@@ -7,7 +7,7 @@
 
 import { Story } from '@storybook/react';
 import React from 'react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import TutorialFleetInstructions from '.';
 
 interface Args {
diff --git a/x-pack/plugins/apm/public/update_badge.ts b/x-pack/plugins/apm/public/update_badge.ts
index addaf88ab7f39..a81a3181008d8 100644
--- a/x-pack/plugins/apm/public/update_badge.ts
+++ b/x-pack/plugins/apm/public/update_badge.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 export function setReadonlyBadge({ application, chrome }: CoreStart) {
   const canSave = application.capabilities.apm.save;
diff --git a/x-pack/plugins/apm/public/utils/test_helpers.tsx b/x-pack/plugins/apm/public/utils/test_helpers.tsx
index 042d84a75bf76..d365cfc26d658 100644
--- a/x-pack/plugins/apm/public/utils/test_helpers.tsx
+++ b/x-pack/plugins/apm/public/utils/test_helpers.tsx
@@ -18,11 +18,11 @@ import moment from 'moment';
 import { Moment } from 'moment-timezone';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { APMConfig } from '../../server';
 import { MockApmPluginContextWrapper } from '../context/apm_plugin/mock_apm_plugin_context';
diff --git a/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js b/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js
index 9cbfe73eeb6dc..c8f1eb764155f 100644
--- a/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js
+++ b/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js
@@ -8,9 +8,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-const {
-  aggregateLatencyMetrics,
-} = require('./aggregate_latency_metrics/index.ts');
+const { aggregateLatencyMetrics } = require('./aggregate_latency_metrics');
 
 aggregateLatencyMetrics().catch((err) => {
   if (err.meta && err.meta.body) {
diff --git a/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js b/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js
index 8d8b0c2d3d813..25bbe25e74a3f 100644
--- a/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js
+++ b/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js
@@ -20,4 +20,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./create_apm_users_and_roles/create_apm_users_and_roles_cli.ts');
+require('./create_apm_users_and_roles/create_apm_users_and_roles_cli');
diff --git a/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts b/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts
index a4979146c5af4..71aa4184e983a 100644
--- a/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts
+++ b/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts
@@ -6,7 +6,7 @@
  */
 /* eslint-disable no-console */
 
-import { Role } from '../../../../security/common/model';
+import { Role } from '@kbn/security-plugin/common/model';
 import { callKibana, isAxiosError } from './call_kibana';
 import { Elasticsearch, Kibana } from '../create_apm_users_and_roles';
 
diff --git a/x-pack/plugins/apm/scripts/create_functional_tests_archive.js b/x-pack/plugins/apm/scripts/create_functional_tests_archive.js
index 55290f00a6d8c..b1b766990ad67 100644
--- a/x-pack/plugins/apm/scripts/create_functional_tests_archive.js
+++ b/x-pack/plugins/apm/scripts/create_functional_tests_archive.js
@@ -9,4 +9,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./create_functional_tests_archive/index.ts');
+require('./create_functional_tests_archive');
diff --git a/x-pack/plugins/apm/scripts/infer_route_return_types.js b/x-pack/plugins/apm/scripts/infer_route_return_types.js
index cd973ff36d3ab..8bf3bdbcdf3d3 100644
--- a/x-pack/plugins/apm/scripts/infer_route_return_types.js
+++ b/x-pack/plugins/apm/scripts/infer_route_return_types.js
@@ -9,4 +9,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./infer_route_return_types/index.ts');
+require('./infer_route_return_types');
diff --git a/x-pack/plugins/apm/scripts/shared/get_es_client.ts b/x-pack/plugins/apm/scripts/shared/get_es_client.ts
index 3ee5642852c06..bd81b139d86ae 100644
--- a/x-pack/plugins/apm/scripts/shared/get_es_client.ts
+++ b/x-pack/plugins/apm/scripts/shared/get_es_client.ts
@@ -10,7 +10,7 @@ import type { ClientOptions } from '@elastic/elasticsearch/lib/client';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 
 export type ESClient = ReturnType<typeof getEsClient>;
 
diff --git a/x-pack/plugins/apm/scripts/test/jest.js b/x-pack/plugins/apm/scripts/test/jest.js
index 9ff5c9a4a3793..c4c5d24d839b3 100644
--- a/x-pack/plugins/apm/scripts/test/jest.js
+++ b/x-pack/plugins/apm/scripts/test/jest.js
@@ -13,7 +13,7 @@ const { run } = require('jest');
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'test';
 
-const config = require('../../jest.config.js');
+const config = require('../../jest.config');
 
 const argv = [...process.argv.slice(2), '--config', JSON.stringify(config)];
 
diff --git a/x-pack/plugins/apm/scripts/upload_telemetry_data.js b/x-pack/plugins/apm/scripts/upload_telemetry_data.js
index f101fb73aba95..e82e197097dd8 100644
--- a/x-pack/plugins/apm/scripts/upload_telemetry_data.js
+++ b/x-pack/plugins/apm/scripts/upload_telemetry_data.js
@@ -9,4 +9,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./upload_telemetry_data/index.ts');
+require('./upload_telemetry_data');
diff --git a/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts b/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts
index 5ac4f6ad8b406..0f8a6f874d72f 100644
--- a/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts
+++ b/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts
@@ -15,7 +15,7 @@
 import { merge, chunk, flatten, omit } from 'lodash';
 import { argv } from 'yargs';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { CollectTelemetryParams } from '../../server/lib/apm_telemetry/collect_data_telemetry';
 import { downloadTelemetryTemplate } from '../shared/download_telemetry_template';
diff --git a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts b/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
index 8761e46df9aaa..b57628a3f326b 100644
--- a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
+++ b/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
@@ -7,11 +7,11 @@
 
 import { kibanaPackageJson } from '@kbn/utils';
 
-import { GetDeprecationsContext } from '../../../../../src/core/server';
-import { CloudSetup } from '../../../cloud/server';
-import { getDeprecations } from './';
-import { APMRouteHandlerResources } from '../';
-import { AgentPolicy } from '../../../fleet/common';
+import { GetDeprecationsContext } from '@kbn/core/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { getDeprecations } from '.';
+import { APMRouteHandlerResources } from '..';
+import { AgentPolicy } from '@kbn/fleet-plugin/common';
 
 const deprecationContext = {
   esClient: {},
diff --git a/x-pack/plugins/apm/server/deprecations/index.ts b/x-pack/plugins/apm/server/deprecations/index.ts
index 76637842e9503..6545e4bfeff09 100644
--- a/x-pack/plugins/apm/server/deprecations/index.ts
+++ b/x-pack/plugins/apm/server/deprecations/index.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { GetDeprecationsContext, DeprecationsDetails } from 'src/core/server';
+import { GetDeprecationsContext, DeprecationsDetails } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { CloudSetup } from '../../../cloud/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   getCloudAgentPolicy,
   getApmPackagePolicy,
 } from '../routes/fleet/get_cloud_apm_package_policy';
-import { APMRouteHandlerResources } from '../';
+import { APMRouteHandlerResources } from '..';
 
 export function getDeprecations({
   cloudSetup,
diff --git a/x-pack/plugins/apm/server/feature.ts b/x-pack/plugins/apm/server/feature.ts
index 4c1fe784ea490..adf1759312449 100644
--- a/x-pack/plugins/apm/server/feature.ts
+++ b/x-pack/plugins/apm/server/feature.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LicenseType } from '../../licensing/common/types';
-import { AlertType, APM_SERVER_FEATURE_ID } from '../common/alert_types';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import {
   LicensingPluginSetup,
   LicensingApiRequestHandlerContext,
-} from '../../licensing/server';
+} from '@kbn/licensing-plugin/server';
+import { AlertType, APM_SERVER_FEATURE_ID } from '../common/alert_types';
 
 export const APM_FEATURE = {
   id: APM_SERVER_FEATURE_ID,
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 958bfb672083a..6c853ea02a34b 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -9,8 +9,8 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import {
   PluginConfigDescriptor,
   PluginInitializerContext,
-} from 'src/core/server';
-import { maxSuggestions } from '../../observability/common';
+} from '@kbn/core/server';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { SearchAggregatedTransactionSetting } from '../common/aggregated_transactions';
 import { APMPlugin } from './plugin';
 
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts
index fbc08aa657f71..57f76e9805be7 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts
@@ -8,7 +8,7 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 import { Setup } from '../helpers/setup_request';
 
 interface SharedFields {
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts
index f988043023ac0..ced20138e9739 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-import { termQuery, termsQuery } from '../../../../observability/server';
+import { termQuery, termsQuery } from '@kbn/observability-plugin/server';
 import {
   ApmMlDetectorType,
   getApmMlDetectorIndex,
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
index d855adee4a9ba..3be864fe8127e 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { snakeCase } from 'lodash';
 import moment from 'moment';
 import uuid from 'uuid/v4';
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts
index 37279d3320585..69c7252a3c1be 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts
@@ -7,7 +7,7 @@
 
 import type { Logger } from '@kbn/logging';
 import { compact, keyBy } from 'lodash';
-import { rangeQuery } from '../../../../observability/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { apmMlAnomalyQuery } from './apm_ml_anomaly_query';
 import {
   ApmMlDetectorType,
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
index 1f989ba17fe7c..6d290d5ad8506 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlPluginSetup } from '../../../../ml/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { ApmMlJob } from '../../../common/anomaly_detection/apm_ml_job';
 import { Environment } from '../../../common/environment_rt';
 import { withApmSpan } from '../../utils/with_apm_span';
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
index 8aee60357ba73..2a196c3e04638 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
@@ -6,12 +6,12 @@
  */
 
 import { merge } from 'lodash';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 import { ApmIndicesConfig } from '../../../routes/settings/apm_indices/get_apm_indices';
 import { tasks } from './tasks';
 import { APMDataTelemetry } from '../types';
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index 70f23d389f256..d8e1638ad4a57 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -6,18 +6,14 @@
  */
 
 import { Observable, firstValueFrom } from 'rxjs';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import {
-  CoreSetup,
-  Logger,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
-import { unwrapEsResponse } from '../../../../observability/server';
-import { APMConfig } from '../..';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CoreSetup, Logger, SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { unwrapEsResponse } from '@kbn/observability-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+import { APMConfig } from '../..';
 import {
   APM_TELEMETRY_SAVED_OBJECT_ID,
   APM_TELEMETRY_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts
index 76c897dec5693..63bacf6264e25 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import {
   AggregatedTransactionsCounts,
   APMUsage,
diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts
index 2eb0ed3db02bd..4e3dd452276d5 100644
--- a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts
+++ b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts
@@ -7,6 +7,7 @@
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import objectHash from 'object-hash';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { getOffsetInMs } from '../../../../common/utils/get_offset_in_ms';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../common/environment_filter_values';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
@@ -23,7 +24,6 @@ import {
   SPAN_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery } from '../../../../../observability/server';
 import { Setup } from '../../helpers/setup_request';
 import { withApmSpan } from '../../../utils/with_apm_span';
 import { Node, NodeType } from '../../../../common/connections';
diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts
index ff46db949d122..a0cd85c857a05 100644
--- a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts
+++ b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts
@@ -8,6 +8,7 @@
 import { sum } from 'lodash';
 import objectHash from 'object-hash';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import { getOffsetInMs } from '../../../../common/utils/get_offset_in_ms';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../common/environment_filter_values';
@@ -24,7 +25,6 @@ import {
   SPAN_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery } from '../../../../../observability/server';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { EventOutcome } from '../../../../common/event_outcome';
 import { Setup } from '../../helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
index a9799c0cfb60c..36d0de8ccde96 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
@@ -8,11 +8,11 @@
 /* eslint-disable no-console */
 
 import chalk from 'chalk';
-import { KibanaRequest } from '../../../../../../../src/core/server';
-import { RequestStatus } from '../../../../../../../src/plugins/inspector';
-import { WrappedElasticsearchClientError } from '../../../../../observability/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { RequestStatus } from '@kbn/inspector-plugin';
+import { WrappedElasticsearchClientError } from '@kbn/observability-plugin/server';
+import { getInspectResponse } from '@kbn/observability-plugin/server';
 import { inspectableEsQueriesMap } from '../../../routes/apm_routes/register_apm_server_routes';
-import { getInspectResponse } from '../../../../../observability/server';
 
 function formatObj(obj: Record<string, any>) {
   return JSON.stringify(obj, null, 2);
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
index 386372fbf655e..1156930018991 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 export function cancelEsRequestOnAbort<T extends Promise<any>>(
   promise: T,
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
index d69740c51d04d..0e316e81773b4 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
@@ -8,8 +8,8 @@ import { setTimeout as setTimeoutPromise } from 'timers/promises';
 import {
   contextServiceMock,
   executionContextServiceMock,
-} from '../../../../../../../../src/core/server/mocks';
-import { createHttpServer } from 'src/core/server/test_utils';
+} from '@kbn/core/server/mocks';
+import { createHttpServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
 import { APMEventClient } from '.';
 
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
index 4b8f63e33799c..0fcf02f95ac0e 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
@@ -10,17 +10,14 @@ import type {
   TermsEnumResponse,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ValuesType } from 'utility-types';
-import { withApmSpan } from '../../../../utils/with_apm_span';
-import { Profile } from '../../../../../typings/es_schemas/ui/profile';
-import {
-  ElasticsearchClient,
-  KibanaRequest,
-} from '../../../../../../../../src/core/server';
+import { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
 import {
   ESSearchRequest,
   InferSearchResponseOf,
-} from '../../../../../../../../src/core/types/elasticsearch';
-import { unwrapEsResponse } from '../../../../../../observability/server';
+} from '@kbn/core/types/elasticsearch';
+import { unwrapEsResponse } from '@kbn/observability-plugin/server';
+import { Profile } from '../../../../../typings/es_schemas/ui/profile';
+import { withApmSpan } from '../../../../utils/with_apm_span';
 import { ProcessorEvent } from '../../../../../common/processor_event';
 import { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
 import { Metric } from '../../../../../typings/es_schemas/ui/metric';
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
index e62720e9fbd0c..3fc6b40f9cfe7 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
@@ -6,12 +6,9 @@
  */
 
 import { uniq, defaultsDeep, cloneDeep } from 'lodash';
+import { ESSearchRequest, ESFilter } from '@kbn/core/types/elasticsearch';
 import { PROCESSOR_EVENT } from '../../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../../common/processor_event';
-import {
-  ESSearchRequest,
-  ESFilter,
-} from '../../../../../../../../src/core/types/elasticsearch';
 import { APMEventESSearchRequest, APMEventESTermsEnumRequest } from '.';
 import { ApmIndicesConfig } from '../../../../routes/settings/apm_indices/get_apm_indices';
 
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
index bd54c0916ef96..522fd5c078af3 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
@@ -6,12 +6,12 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { unwrapEsResponse } from '../../../../../../observability/server';
-import { APMRouteHandlerResources } from '../../../../routes/typings';
+import { unwrapEsResponse } from '@kbn/observability-plugin/server';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { APMRouteHandlerResources } from '../../../../routes/typings';
 import {
   callAsyncWithDebug,
   getDebugBody,
@@ -21,14 +21,16 @@ import { cancelEsRequestOnAbort } from '../cancel_es_request_on_abort';
 
 export type APMIndexDocumentParams<T> = estypes.IndexRequest<T>;
 
-export type APMInternalClient = ReturnType<typeof createInternalESClient>;
+export type APMInternalClient = Awaited<
+  ReturnType<typeof createInternalESClient>
+>;
 
-export function createInternalESClient({
+export async function createInternalESClient({
   context,
   debug,
   request,
 }: Pick<APMRouteHandlerResources, 'context' | 'request'> & { debug: boolean }) {
-  const { asInternalUser } = context.core.elasticsearch.client;
+  const { asInternalUser } = (await context.core).elasticsearch.client;
 
   function callEs<T extends { body: any }>(
     operationName: string,
diff --git a/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts
index 6af6d3342986c..f3f7a4262c8af 100644
--- a/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getBucketSizeForAggregatedTransactions } from './';
+import { getBucketSizeForAggregatedTransactions } from '.';
 
 describe('getBucketSizeForAggregatedTransactions', () => {
   describe('when searchAggregatedTransactions is enabled', () => {
diff --git a/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts b/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts
index b13c8022d89d3..f15e364b06158 100644
--- a/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { withApmSpan } from '../../utils/with_apm_span';
 
 export type InternalSavedObjectsClient = Awaited<
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index ae47abb01942e..818f999754610 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { setupRequest } from './setup_request';
 import { APMConfig } from '../..';
 import { APMRouteHandlerResources } from '../../routes/typings';
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
index fb2d46bfa5aa2..2701d754350f5 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { KibanaRequest } from '@kbn/core/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { isActivePlatinumLicense } from '../../../common/license_check';
 import { APMConfig } from '../..';
-import { KibanaRequest } from '../../../../../../src/core/server';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { APMRouteHandlerResources } from '../../routes/typings';
 import {
   ApmIndicesConfig,
@@ -42,36 +42,38 @@ export async function setupRequest({
 }: APMRouteHandlerResources) {
   return withApmSpan('setup_request', async () => {
     const { query } = params;
+    const coreContext = await context.core;
+    const licensingContext = await context.licensing;
 
     const [indices, includeFrozen] = await Promise.all([
       getApmIndices({
-        savedObjectsClient: context.core.savedObjects.client,
+        savedObjectsClient: coreContext.savedObjects.client,
         config,
       }),
       withApmSpan('get_ui_settings', () =>
-        context.core.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN)
+        coreContext.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN)
       ),
     ]);
 
     return {
       indices,
       apmEventClient: new APMEventClient({
-        esClient: context.core.elasticsearch.client.asCurrentUser,
+        esClient: coreContext.elasticsearch.client.asCurrentUser,
         debug: query._inspect,
         request,
         indices,
         options: { includeFrozen },
       }),
-      internalClient: createInternalESClient({
+      internalClient: await createInternalESClient({
         context,
         request,
         debug: query._inspect,
       }),
       ml:
-        plugins.ml && isActivePlatinumLicense(context.licensing.license)
+        plugins.ml && isActivePlatinumLicense(licensingContext.license)
           ? getMlSetup(
               plugins.ml.setup,
-              context.core.savedObjects.client,
+              coreContext.savedObjects.client,
               request
             )
           : undefined,
@@ -82,7 +84,9 @@ export async function setupRequest({
 
 function getMlSetup(
   ml: Required<APMRouteHandlerResources['plugins']>['ml']['setup'],
-  savedObjectsClient: APMRouteHandlerResources['context']['core']['savedObjects']['client'],
+  savedObjectsClient: Awaited<
+    APMRouteHandlerResources['context']['core']
+  >['savedObjects']['client'],
   request: KibanaRequest
 ) {
   return {
diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts b/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts
index 094d5ed6350df..9b596c8438161 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FAAS_COLDSTART } from '../../../common/elasticsearch_fieldnames';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { FAAS_COLDSTART } from '../../../common/elasticsearch_fieldnames';
 
 export const getColdstartAggregation = () => ({
   terms: {
diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts b/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts
index 240cbceb6c878..5108af744273f 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { EVENT_OUTCOME } from '../../../common/elasticsearch_fieldnames';
-import { EventOutcome } from '../../../common/event_outcome';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { EVENT_OUTCOME } from '../../../common/elasticsearch_fieldnames';
+import { EventOutcome } from '../../../common/event_outcome';
 
 export const getOutcomeAggregation = () => ({
   terms: {
diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts b/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
index a28fe1ad1ecea..7db898af4a810 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { getSearchAggregatedTransactions } from '.';
 import { Setup } from '../setup_request';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { APMEventClient } from '../create_es_client/create_apm_event_client';
 import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts b/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts
index 573cb0a3cf6b4..f98540a85b761 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
   TRANSACTION_DURATION,
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts
index 2a47c4e441dec..f334a9c9f82e6 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
+import { termQuery } from '@kbn/observability-plugin/server';
 import {
   FAAS_COLDSTART,
   SERVICE_NAME,
@@ -12,7 +14,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Coordinate } from '../../../typings/timeseries';
 import {
@@ -26,7 +27,6 @@ import {
   getColdstartAggregation,
   getTransactionColdstartRateTimeSeries,
 } from '../helpers/transaction_coldstart_rate';
-import { termQuery } from '../../../../observability/server';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
 
 export async function getColdstartRate({
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts
index 06c0419f5999e..3d2c678c35cfc 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts
@@ -5,6 +5,11 @@
  * 2.0.
  */
 
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -12,11 +17,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Coordinate } from '../../../typings/timeseries';
 import {
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index f705b3c8e9162..ad058a535206e 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -13,13 +13,13 @@ import {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { isEmpty, mapValues } from 'lodash';
-import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { experimentalRuleFieldMap } from '../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
-import { Dataset } from '../../rule_registry/server';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
+import { Dataset } from '@kbn/rule-registry-plugin/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { APMConfig, APM_SERVER_FEATURE_ID } from '.';
-import { UI_SETTINGS } from '../../../../src/plugins/data/common';
 import { APM_FEATURE, registerFeaturesUsage } from './feature';
 import { registerApmAlerts } from './routes/alerts/register_apm_alerts';
 import { registerFleetPolicyCallbacks } from './routes/fleet/register_fleet_policy_callbacks';
@@ -218,12 +218,13 @@ export class APMPlugin
         request: KibanaRequest;
         context: ApmPluginRequestHandlerContext;
       }) => {
+        const coreContext = await context.core;
         const [indices, includeFrozen] = await Promise.all([
           boundGetApmIndices(),
-          context.core.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN),
+          coreContext.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN),
         ]);
 
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
+        const esClient = coreContext.elasticsearch.client.asCurrentUser;
 
         return new APMEventClient({
           debug: debug ?? false,
diff --git a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
index e3e98cc3c1773..545e90914f4d2 100644
--- a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
+++ b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { SetupUX } from '../routes/rum_client/route';
 import {
   AGENT_NAME,
   TRANSACTION_TYPE,
   SERVICE_LANGUAGE_NAME,
 } from '../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../observability/server';
 import { ProcessorEvent } from '../../common/processor_event';
 import { TRANSACTION_PAGE_LOAD } from '../../common/transaction_types';
 import { getEsFilter } from '../routes/rum_client/ui_filters/get_es_filter';
diff --git a/x-pack/plugins/apm/server/projections/typings.ts b/x-pack/plugins/apm/server/projections/typings.ts
index 5558fba4cde2a..6ba7d315bfa6d 100644
--- a/x-pack/plugins/apm/server/projections/typings.ts
+++ b/x-pack/plugins/apm/server/projections/typings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { AggregationOptionsByType } from '../../../../../src/core/types/elasticsearch';
+import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
 import { APMEventESSearchRequest } from '../lib/helpers/create_es_client/create_apm_event_client';
 
 export type Projection = Omit<APMEventESSearchRequest, 'body'> & {
diff --git a/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts b/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts
index 16b2c6f8e6061..8294630dad9d4 100644
--- a/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts
+++ b/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mergeProjection } from './index';
+import { mergeProjection } from '.';
 
 describe('mergeProjection', () => {
   it('overrides arrays', () => {
diff --git a/x-pack/plugins/apm/server/routes/agent_keys/create_agent_key.ts b/x-pack/plugins/apm/server/routes/agent_keys/create_agent_key.ts
index 3b47b81a86416..0bcd85a88ce8c 100644
--- a/x-pack/plugins/apm/server/routes/agent_keys/create_agent_key.ts
+++ b/x-pack/plugins/apm/server/routes/agent_keys/create_agent_key.ts
@@ -26,6 +26,7 @@ export async function createAgentKey({
     privileges,
     resources: [resource],
   };
+  const coreContext = await context.core;
 
   // Elasticsearch will allow a user without the right apm privileges to create API keys, but the keys won't validate
   // check first whether the user has the right privileges, and bail out early if not
@@ -33,7 +34,7 @@ export async function createAgentKey({
     application: userApplicationPrivileges,
     username,
     has_all_requested: hasRequiredPrivileges,
-  } = await context.core.elasticsearch.client.asCurrentUser.security.hasPrivileges(
+  } = await coreContext.elasticsearch.client.asCurrentUser.security.hasPrivileges(
     {
       body: {
         application: [application],
@@ -80,11 +81,9 @@ export async function createAgentKey({
   };
 
   const agentKey =
-    await context.core.elasticsearch.client.asCurrentUser.security.createApiKey(
-      {
-        body,
-      }
-    );
+    await coreContext.elasticsearch.client.asCurrentUser.security.createApiKey({
+      body,
+    });
 
   return {
     agentKey,
diff --git a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts b/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts
index dff7b3b5c32ab..239cc6ca896c4 100644
--- a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts
+++ b/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { ApmPluginRequestHandlerContext } from '../typings';
-import { ApiKey } from '../../../../security/common/model';
 
 export async function getAgentKeys({
   context,
@@ -27,7 +27,7 @@ export async function getAgentKeys({
     },
   };
 
-  const esClient = context.core.elasticsearch.client;
+  const esClient = (await context.core).elasticsearch.client;
   const apiResponse = await esClient.asCurrentUser.transport.request<{
     api_keys: ApiKey[];
   }>({
diff --git a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys_privileges.ts b/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys_privileges.ts
index 29514739f2225..c9fba5d6ec71e 100644
--- a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys_privileges.ts
+++ b/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys_privileges.ts
@@ -15,8 +15,9 @@ export async function getAgentKeysPrivileges({
   context: ApmPluginRequestHandlerContext;
   securityPluginStart: NonNullable<APMPluginStartDependencies['security']>;
 }) {
+  const esClient = (await context.core).elasticsearch.client;
   const [securityHasPrivilegesResponse, areApiKeysEnabled] = await Promise.all([
-    context.core.elasticsearch.client.asCurrentUser.security.hasPrivileges({
+    esClient.asCurrentUser.security.hasPrivileges({
       body: {
         cluster: ['manage_security', 'manage_api_key', 'manage_own_api_key'],
       },
diff --git a/x-pack/plugins/apm/server/routes/agent_keys/invalidate_agent_key.ts b/x-pack/plugins/apm/server/routes/agent_keys/invalidate_agent_key.ts
index ec244f8e9bee3..95ee67f0dff37 100644
--- a/x-pack/plugins/apm/server/routes/agent_keys/invalidate_agent_key.ts
+++ b/x-pack/plugins/apm/server/routes/agent_keys/invalidate_agent_key.ts
@@ -15,12 +15,11 @@ export async function invalidateAgentKey({
   id: string;
   isAdmin: boolean;
 }) {
+  const esClient = (await context.core).elasticsearch.client;
   const { invalidated_api_keys: invalidatedAgentKeys } =
-    await context.core.elasticsearch.client.asCurrentUser.security.invalidateApiKey(
-      {
-        body: { ids: [id], owner: !isAdmin },
-      }
-    );
+    await esClient.asCurrentUser.security.invalidateApiKey({
+      body: { ids: [id], owner: !isAdmin },
+    });
 
   return {
     invalidatedAgentKeys,
diff --git a/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts b/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts
index ebab01464de6b..2f2925d612e04 100644
--- a/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts
@@ -8,8 +8,8 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../src/core/types/elasticsearch';
-import { RuleExecutorServices } from '../../../../alerting/server';
+} from '@kbn/core/types/elasticsearch';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 export async function alertingEsClient<TParams extends ESSearchRequest>({
   scopedClusterClient,
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts
index 6b5fb0c5fb1b4..0247e4088ccab 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { rangeQuery, termQuery } from '../../../../../observability/server';
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts
index 708acd6d7f8ea..f283a912bc3cd 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { AlertParams } from '../route';
-import { rangeQuery, termQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { Setup } from '../../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts
index cf3380c105ac8..71e52640e014d 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rangeQuery, termQuery } from '../../../../../observability/server';
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts
index 2f4245c89694a..9aa99572141d5 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts
@@ -6,7 +6,7 @@
  */
 import { registerAnomalyAlertType } from './register_anomaly_alert_type';
 import { ANOMALY_SEVERITY } from '../../../common/ml_constants';
-import { MlPluginSetup } from '../../../../ml/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import * as GetServiceAnomalies from '../service_map/get_service_anomalies';
 import { createRuleTypeMocks } from './test_utils';
 import { ApmMlJob } from '../../../common/anomaly_detection/apm_ml_job';
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts
index f84fe4d3169fb..7f978c4f61161 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts
@@ -14,10 +14,10 @@ import {
   ALERT_SEVERITY,
 } from '@kbn/rule-data-utils';
 import { compact } from 'lodash';
-import { ESSearchResponse } from 'src/core/types/elasticsearch';
-import { KibanaRequest } from '../../../../../../src/core/server';
-import { termQuery } from '../../../../observability/server';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { KibanaRequest } from '@kbn/core/server';
+import { termQuery } from '@kbn/observability-plugin/server';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import {
   AlertType,
   ALERT_TYPES_CONFIG,
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts b/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts
index dfe0310e919b4..e6fcba2555ada 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts
@@ -6,14 +6,14 @@
  */
 
 import { Observable } from 'rxjs';
-import { IBasePath, Logger } from 'kibana/server';
-import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../alerting/server';
-import { IRuleDataClient } from '../../../../rule_registry/server';
+import { IBasePath, Logger } from '@kbn/core/server';
+import { PluginSetupContract as AlertingPluginSetupContract } from '@kbn/alerting-plugin/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { registerTransactionDurationAlertType } from './register_transaction_duration_alert_type';
 import { registerAnomalyAlertType } from './register_anomaly_alert_type';
 import { registerErrorCountAlertType } from './register_error_count_alert_type';
 import { APMConfig } from '../..';
-import { MlPluginSetup } from '../../../../ml/server';
 import { registerTransactionErrorRateAlertType } from './register_transaction_error_rate_alert_type';
 
 export interface RegisterRuleDependencies {
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
index c1567d3c9ba6e..7c9422d34948d 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
@@ -12,7 +12,8 @@ import {
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
+import { termQuery } from '@kbn/observability-plugin/server';
 import {
   ENVIRONMENT_NOT_DEFINED,
   getEnvironmentEsField,
@@ -32,11 +33,10 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { getApmIndices } from '../../routes/settings/apm_indices/get_apm_indices';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 import { alertingEsClient } from './alerting_es_client';
 import { RegisterRuleDependencies } from './register_apm_alerts';
-import { termQuery } from '../../../../observability/server';
 
 const paramsSchema = schema.object({
   windowSize: schema.number(),
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
index fd90addd04965..58fd9323f8702 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
@@ -13,9 +13,9 @@ import {
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
 import { firstValueFrom } from 'rxjs';
+import { asDuration } from '@kbn/observability-plugin/common/utils/formatters';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import { getAlertUrlTransaction } from '../../../common/utils/formatters';
-import { asDuration } from '../../../../observability/common/utils/formatters';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
 import { SearchAggregatedTransactionSetting } from '../../../common/aggregated_transactions';
 import {
   AlertType,
@@ -40,7 +40,7 @@ import {
   getDocumentTypeFilterForTransactions,
   getDurationFieldForTransactions,
 } from '../../lib/helpers/transactions';
-import { getApmIndices } from '../../routes/settings/apm_indices/get_apm_indices';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 import { alertingEsClient } from './alerting_es_client';
 import { RegisterRuleDependencies } from './register_apm_alerts';
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
index 0119534912ba5..ceecaeb961dd6 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
@@ -12,13 +12,15 @@ import {
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
+import { asPercent } from '@kbn/observability-plugin/common/utils/formatters';
+import { termQuery } from '@kbn/observability-plugin/server';
 import {
   ENVIRONMENT_NOT_DEFINED,
   getEnvironmentEsField,
   getEnvironmentLabel,
 } from '../../../common/environment_filter_values';
 import { getAlertUrlTransaction } from '../../../common/utils/formatters';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
 import {
   AlertType,
   ALERT_TYPES_CONFIG,
@@ -36,14 +38,12 @@ import { EventOutcome } from '../../../common/event_outcome';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { asDecimalOrInteger } from '../../../common/utils/formatters';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { getApmIndices } from '../../routes/settings/apm_indices/get_apm_indices';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 import { alertingEsClient } from './alerting_es_client';
 import { RegisterRuleDependencies } from './register_apm_alerts';
 import { SearchAggregatedTransactionSetting } from '../../../common/aggregated_transactions';
 import { getDocumentTypeFilterForTransactions } from '../../lib/helpers/transactions';
-import { asPercent } from '../../../../observability/common/utils/formatters';
-import { termQuery } from '../../../../observability/server';
 
 const paramsSchema = schema.object({
   windowSize: schema.number(),
diff --git a/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts b/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts
index 71a4e0d3d111e..5302f632781f0 100644
--- a/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IBasePath, Logger } from 'kibana/server';
+import { IBasePath, Logger } from '@kbn/core/server';
 import { of } from 'rxjs';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
-import { IRuleDataClient } from '../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../rule_registry/server/mocks';
-import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../../alerting/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { PluginSetupContract as AlertingPluginSetupContract } from '@kbn/alerting-plugin/server';
 import { APMConfig, APM_SERVER_FEATURE_ID } from '../../..';
 
 export const createRuleTypeMocks = () => {
diff --git a/x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts b/x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts
index b0869b7abcbce..5e6ac627364d8 100644
--- a/x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts
+++ b/x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts
@@ -38,7 +38,7 @@ import { eventMetadataRouteRepository } from '../event_metadata/route';
 import { suggestionsRouteRepository } from '../suggestions/route';
 import { agentKeysRouteRepository } from '../agent_keys/route';
 
-const getTypedGlobalApmServerRouteRepository = () => {
+function getTypedGlobalApmServerRouteRepository() {
   const repository = {
     ...dataViewRouteRepository,
     ...environmentsRouteRepository,
@@ -70,7 +70,7 @@ const getTypedGlobalApmServerRouteRepository = () => {
   };
 
   return repository;
-};
+}
 
 const getGlobalApmServerRouteRepository = (): ServerRouteRepository => {
   return getTypedGlobalApmServerRouteRepository();
diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
index 03067d727501d..1af4e9d772280 100644
--- a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
+++ b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
@@ -11,7 +11,7 @@ import {
   ServerRouteRepository,
 } from '@kbn/server-route-repository';
 import * as t from 'io-ts';
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { APMConfig } from '../..';
 import { APMRouteCreateOptions, APMRouteHandlerResources } from '../typings';
 import { registerRoutes } from './register_apm_server_routes';
diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts
index aa8b5feec4afc..6de9c99cdbcd3 100644
--- a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts
+++ b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import * as t from 'io-ts';
-import { KibanaRequest, RouteRegistrar } from 'src/core/server';
+import { KibanaRequest, RouteRegistrar } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
 import agent from 'elastic-apm-node';
 import { ServerRouteRepository } from '@kbn/server-route-repository';
@@ -18,10 +18,10 @@ import {
   routeValidationObject,
 } from '@kbn/server-route-repository';
 import { jsonRt, mergeRt } from '@kbn/io-ts-utils';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
 import { pickKeys } from '../../../common/utils/pick_keys';
 import { APMRouteHandlerResources, TelemetryUsageCounter } from '../typings';
 import type { ApmPluginRequestHandlerContext } from '../typings';
-import { InspectResponse } from '../../../../observability/typings/common';
 
 const inspectRt = t.exact(
   t.partial({
diff --git a/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts
index 378db134e7cf7..52857a4c77367 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { EventOutcome } from '../../../common/event_outcome';
 import {
   EVENT_OUTCOME,
   SPAN_DESTINATION_SERVICE_RESOURCE,
 } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../lib/helpers/metrics';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts
index 8f72d83fcc0b0..3ed74c7af713c 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SPAN_DESTINATION_SERVICE_RESOURCE,
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_SUM,
 } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../lib/helpers/metrics';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts
index 1f40b975a8f9e..3392b4f2d1622 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { maybe } from '../../../common/utils/maybe';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { SPAN_DESTINATION_SERVICE_RESOURCE } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 
 export async function getMetadataForBackend({
diff --git a/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts
index 64fdc3eb264f8..3544faa2ebad8 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SPAN_DESTINATION_SERVICE_RESOURCE,
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
 } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts b/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts
index 7251718396660..573d4792be429 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kqlQuery } from '../../../../observability/server';
+import { kqlQuery } from '@kbn/observability-plugin/server';
 import { NodeType } from '../../../common/connections';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { getConnectionStats } from '../../lib/connections/get_connection_stats';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts
index 31204c960c87d..c9ccb0ef476de 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kqlQuery } from '../../../../observability/server';
+import { kqlQuery } from '@kbn/observability-plugin/server';
 import { SPAN_DESTINATION_SERVICE_RESOURCE } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { getConnectionStats } from '../../lib/connections/get_connection_stats';
diff --git a/x-pack/plugins/apm/server/routes/backends/route.ts b/x-pack/plugins/apm/server/routes/backends/route.ts
index d8f619af58199..7dd9ed47335df 100644
--- a/x-pack/plugins/apm/server/routes/backends/route.ts
+++ b/x-pack/plugins/apm/server/routes/backends/route.ts
@@ -16,7 +16,7 @@ import { getTopBackends } from './get_top_backends';
 import { getUpstreamServicesForBackend } from './get_upstream_services_for_backend';
 import { getThroughputChartsForBackend } from './get_throughput_charts_for_backend';
 import { getErrorRateChartsForBackend } from './get_error_rate_charts_for_backend';
-import { ConnectionStatsItemWithImpact } from './../../../common/connections';
+import { ConnectionStatsItemWithImpact } from '../../../common/connections';
 import { offsetRt } from '../../../common/offset_rt';
 
 const topBackendsRoute = createApmServerRoute({
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts
index 13910ef7104fb..4ff00f93bec80 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FieldValuePair } from '../../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts
index 1c979bc3e4c6d..40674a1b5de43 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts
@@ -10,7 +10,7 @@ import { getNumericFieldStatsRequest } from './get_numeric_field_stats';
 import { getKeywordFieldStatsRequest } from './get_keyword_field_stats';
 import { getBooleanFieldStatsRequest } from './get_boolean_field_stats';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchFieldsStats } from './get_fields_stats';
 
 const params = {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts
index c500d1d49dd6e..6c021b7995dd3 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FieldValuePair } from '../../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts
index e44996337f4b1..f0dc541cb5d9d 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { chunk } from 'lodash';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import { FieldValuePair } from '../../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts
index 35b8eab5712ec..0661a3f4db373 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FieldValuePair } from '../../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts
index 192377b88a992..085c9975c53d4 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   NumericFieldStats,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts b/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts
index 58ee5051d8863..33f8544baf049 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   SERVICE_NAME,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts
index 8f5029c7a3e9e..7573ebaea2ec9 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts
index c859853f6896b..858d6ea35caff 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts
index 10994c6c017e0..97e907d1bfd24 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import { splitAllSettledPromises } from '../utils';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts
index 5c6b8f3594aa0..3410615056670 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type {
   FieldValuePair,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts
index 46a980a53ab48..8e49b6b2dbfe9 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { CorrelationsParams } from '../../../../common/correlations/types';
 import { FailedTransactionsCorrelation } from '../../../../common/correlations/failed_transactions_correlations/types';
 import { EVENT_OUTCOME } from '../../../../common/elasticsearch_fieldnames';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts
index 0ecbd6477fda7..bbe20474b658d 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import { hasPrefixToInclude } from '../../../../common/correlations/utils';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts
index 2d6347362e8ea..b8a4ae2518ed4 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { CorrelationsParams } from '../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts
index 4f7c44e5f3107..23d5a579bff02 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts
index 6bcec359c157a..9546d94ac59ce 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts
index d8fada32cb74c..31f2bab8dd738 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts
index 867a4defcb01b..c0ec2e7589937 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { CorrelationsParams } from '../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts
index 7b60d93d0b745..929f2286d970b 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts
index 943718c986a7a..dbf1bd1a6d1f9 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts
index 891c2af077e63..803692f88eb1c 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts
index d260a22fb6e84..77b264a2cdb5f 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts
@@ -9,7 +9,7 @@ import { scaleLog } from 'd3-scale';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type { CorrelationsParams } from '../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts
index ee59925c47f27..c3c4c814cd328 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { CorrelationsParams } from '../../../../common/correlations/types';
 import type { FailedTransactionsCorrelation } from '../../../../common/correlations/failed_transactions_correlations/types';
@@ -16,7 +16,7 @@ import { splitAllSettledPromises } from '../utils';
 import {
   fetchFailedTransactionsCorrelationPValues,
   fetchTransactionDurationHistogramRangeSteps,
-} from './index';
+} from '.';
 
 export const fetchPValues = async (
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts
index 876225179aaa7..9904df5d068e8 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts
index e7ecb03fa342e..fba4e68450b07 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import { SIGNIFICANT_VALUE_DIGITS } from '../../../../common/correlations/constants';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts
index 2b233958ce273..d4a0e3fab87bb 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts
index b2b591519dc9c..6f56ca6b9ff8f 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts
index 2fc1e69eab356..c7293fc87e3d1 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts
@@ -7,7 +7,7 @@
 
 import { range } from 'lodash';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type {
   FieldValuePair,
@@ -26,7 +26,7 @@ import {
   fetchTransactionDurationHistogramRangeSteps,
   fetchTransactionDurationPercentiles,
   fetchTransactionDurationRanges,
-} from './index';
+} from '.';
 
 export const fetchSignificantCorrelations = async (
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/apm/server/routes/correlations/route.ts b/x-pack/plugins/apm/server/routes/correlations/route.ts
index b0735c7c57b36..b2bca48574f5d 100644
--- a/x-pack/plugins/apm/server/routes/correlations/route.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/route.ts
@@ -27,13 +27,13 @@ import { withApmSpan } from '../../utils/with_apm_span';
 
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { environmentRt, kueryRt, rangeRt } from '../default_api_types';
-import { LatencyCorrelation } from './../../../common/correlations/latency_correlations/types';
+import { LatencyCorrelation } from '../../../common/correlations/latency_correlations/types';
 import {
   FieldStats,
   TopValuesStats,
-} from './../../../common/correlations/field_stats_types';
-import { FieldValuePair } from './../../../common/correlations/types';
-import { FailedTransactionsCorrelation } from './../../../common/correlations/failed_transactions_correlations/types';
+} from '../../../common/correlations/field_stats_types';
+import { FieldValuePair } from '../../../common/correlations/types';
+import { FailedTransactionsCorrelation } from '../../../common/correlations/failed_transactions_correlations/types';
 
 const INVALID_LICENSE = i18n.translate('xpack.apm.correlations.license.text', {
   defaultMessage:
@@ -57,12 +57,14 @@ const fieldCandidatesRoute = createApmServerRoute({
   options: { tags: ['access:apm'] },
   handler: async (resources): Promise<{ fieldCandidates: string[] }> => {
     const { context } = resources;
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const { license } = await context.licensing;
+    if (!isActivePlatinumLicense(license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
 
     const { indices } = await setupRequest(resources);
-    const esClient = resources.context.core.elasticsearch.client.asCurrentUser;
+    const esClient = (await resources.context.core).elasticsearch.client
+      .asCurrentUser;
 
     return withApmSpan(
       'get_correlations_field_candidates',
@@ -102,12 +104,14 @@ const fieldStatsRoute = createApmServerRoute({
     errors: any[];
   }> => {
     const { context } = resources;
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const { license } = await context.licensing;
+    if (!isActivePlatinumLicense(license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
 
     const { indices } = await setupRequest(resources);
-    const esClient = resources.context.core.elasticsearch.client.asCurrentUser;
+    const esClient = (await resources.context.core).elasticsearch.client
+      .asCurrentUser;
 
     const { fieldsToSample, ...params } = resources.params.body;
 
@@ -151,12 +155,14 @@ const fieldValueStatsRoute = createApmServerRoute({
     import('./../../../common/correlations/field_stats_types').TopValuesStats
   > => {
     const { context } = resources;
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const { license } = await context.licensing;
+    if (!isActivePlatinumLicense(license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
 
     const { indices } = await setupRequest(resources);
-    const esClient = resources.context.core.elasticsearch.client.asCurrentUser;
+    const esClient = (await resources.context.core).elasticsearch.client
+      .asCurrentUser;
 
     const { fieldName, fieldValue, ...params } = resources.params.query;
 
@@ -202,12 +208,14 @@ const fieldValuePairsRoute = createApmServerRoute({
     errors: any[];
   }> => {
     const { context } = resources;
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const { license } = await context.licensing;
+    if (!isActivePlatinumLicense(license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
 
     const { indices } = await setupRequest(resources);
-    const esClient = resources.context.core.elasticsearch.client.asCurrentUser;
+    const esClient = (await resources.context.core).elasticsearch.client
+      .asCurrentUser;
 
     const { fieldCandidates, ...params } = resources.params.body;
 
@@ -260,12 +268,14 @@ const significantCorrelationsRoute = createApmServerRoute({
     fallbackResult?: import('./../../../common/correlations/latency_correlations/types').LatencyCorrelation;
   }> => {
     const { context } = resources;
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const { license } = await context.licensing;
+    if (!isActivePlatinumLicense(license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
 
     const { indices } = await setupRequest(resources);
-    const esClient = resources.context.core.elasticsearch.client.asCurrentUser;
+    const esClient = (await resources.context.core).elasticsearch.client
+      .asCurrentUser;
 
     const { fieldValuePairs, ...params } = resources.params.body;
 
@@ -318,12 +328,14 @@ const pValuesRoute = createApmServerRoute({
     fallbackResult?: import('./../../../common/correlations/failed_transactions_correlations/types').FailedTransactionsCorrelation;
   }> => {
     const { context } = resources;
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const { license } = await context.licensing;
+    if (!isActivePlatinumLicense(license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
 
     const { indices } = await setupRequest(resources);
-    const esClient = resources.context.core.elasticsearch.client.asCurrentUser;
+    const esClient = (await resources.context.core).elasticsearch.client
+      .asCurrentUser;
 
     const { fieldCandidates, ...params } = resources.params.body;
 
diff --git a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts
index cdea5cd43f02f..d42a5a7eb3a9b 100644
--- a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts
@@ -7,7 +7,7 @@
 
 import { createStaticDataView } from './create_static_data_view';
 import { Setup } from '../../lib/helpers/setup_request';
-import * as HistoricalAgentData from '../../routes/historical_data/has_historical_agent_data';
+import * as HistoricalAgentData from '../historical_data/has_historical_agent_data';
 import { InternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { APMConfig } from '../..';
 
diff --git a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts
index a6818a6056f3b..9f22eaa6b9c30 100644
--- a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { APM_STATIC_INDEX_PATTERN_ID } from '../../../common/index_pattern_constants';
-import { hasHistoricalAgentData } from '../../routes/historical_data/has_historical_agent_data';
+import { hasHistoricalAgentData } from '../historical_data/has_historical_agent_data';
 import { Setup } from '../../lib/helpers/setup_request';
-import { APMRouteHandlerResources } from '../../routes/typings';
+import { APMRouteHandlerResources } from '../typings';
 import { InternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getApmDataViewTitle } from './get_apm_data_view_title';
diff --git a/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts b/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts
index 24e846cf73ee4..8d2c61cce4d81 100644
--- a/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  IndexPatternsFetcher,
-  FieldDescriptor,
-} from '../../../../../../src/plugins/data/server';
-import { APMRouteHandlerResources } from '../../routes/typings';
+import { IndexPatternsFetcher, FieldDescriptor } from '@kbn/data-plugin/server';
+import { APMRouteHandlerResources } from '../typings';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { getApmDataViewTitle } from './get_apm_data_view_title';
@@ -26,14 +23,15 @@ export const getDynamicDataView = ({
   logger,
 }: Pick<APMRouteHandlerResources, 'logger' | 'config' | 'context'>) => {
   return withApmSpan('get_dynamic_data_view', async () => {
+    const coreContext = await context.core;
     const apmIndicies = await getApmIndices({
-      savedObjectsClient: context.core.savedObjects.client,
+      savedObjectsClient: coreContext.savedObjects.client,
       config,
     });
     const dataViewTitle = getApmDataViewTitle(apmIndicies);
 
     const DataViewsFetcher = new IndexPatternsFetcher(
-      context.core.elasticsearch.client.asCurrentUser
+      coreContext.elasticsearch.client.asCurrentUser
     );
 
     // Since `getDynamicDataView` is called in setup_request (and thus by every endpoint)
diff --git a/x-pack/plugins/apm/server/routes/data_view/route.ts b/x-pack/plugins/apm/server/routes/data_view/route.ts
index 01d835b149d2e..4b2a3dbb7252d 100644
--- a/x-pack/plugins/apm/server/routes/data_view/route.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/route.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { createStaticDataView } from './create_static_data_view';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { getDynamicDataView } from './get_dynamic_data_view';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
-import { ISavedObjectsRepository } from '../../../../../../src/core/server';
 
 const staticDataViewRoute = createApmServerRoute({
   endpoint: 'POST /internal/apm/data_view/static',
diff --git a/x-pack/plugins/apm/server/routes/default_api_types.ts b/x-pack/plugins/apm/server/routes/default_api_types.ts
index e2b969f00edc5..78668e0bf2472 100644
--- a/x-pack/plugins/apm/server/routes/default_api_types.ts
+++ b/x-pack/plugins/apm/server/routes/default_api_types.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { isoToEpochRt } from '@kbn/io-ts-utils';
+import { isoToEpochRt, toNumberRt } from '@kbn/io-ts-utils';
 
 export { environmentRt } from '../../common/environment_rt';
 
@@ -15,4 +15,7 @@ export const rangeRt = t.type({
   end: isoToEpochRt,
 });
 
+export const probabilityRt = t.type({
+  probability: toNumberRt,
+});
 export const kueryRt = t.type({ kuery: t.string });
diff --git a/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts b/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts
index f479fd185b889..bbfb9071d3bc6 100644
--- a/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts
+++ b/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { termQuery } from '../../../../observability/server';
+import { termQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
diff --git a/x-pack/plugins/apm/server/routes/environments/get_environments.ts b/x-pack/plugins/apm/server/routes/environments/get_environments.ts
index 3b208ef875899..6676b8061c354 100644
--- a/x-pack/plugins/apm/server/routes/environments/get_environments.ts
+++ b/x-pack/plugins/apm/server/routes/environments/get_environments.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_values';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery, termQuery } from '../../../../observability/server';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
 import { Setup } from '../../lib/helpers/setup_request';
 import { Environment } from '../../../common/environment_rt';
diff --git a/x-pack/plugins/apm/server/routes/environments/route.ts b/x-pack/plugins/apm/server/routes/environments/route.ts
index 0b01f6193ff2f..03fb07fd51cb8 100644
--- a/x-pack/plugins/apm/server/routes/environments/route.ts
+++ b/x-pack/plugins/apm/server/routes/environments/route.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { maxSuggestions } from '../../../../observability/common';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { getEnvironments } from './get_environments';
@@ -46,7 +46,8 @@ const environmentsRoute = createApmServerRoute({
       end,
       kuery: '',
     });
-    const size = await context.core.uiSettings.client.get<number>(
+    const coreContext = await context.core;
+    const size = await coreContext.uiSettings.client.get<number>(
       maxSuggestions
     );
     const environments = await getEnvironments({
diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts
index dd2dd3bc9ff3e..34fd6be58a57d 100644
--- a/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts
+++ b/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
+import {
+  rangeQuery,
+  kqlQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   ERROR_GROUP_ID,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import {
-  rangeQuery,
-  kqlQuery,
-  termQuery,
-} from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { Setup } from '../../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
index 3ffa084f63463..12d78e529fd74 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { keyBy } from 'lodash';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { offsetPreviousPeriodCoordinates } from '../../../../common/utils/offset_previous_period_coordinate';
 import { Coordinate } from '../../../../typings/timeseries';
 import {
@@ -12,7 +13,6 @@ import {
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getBucketSize } from '../../../lib/helpers/get_bucket_size';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
index d6b58b197914d..4dce3280ec39c 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
@@ -6,7 +6,7 @@
  */
 
 import { AggregationsTermsAggregationOrder } from '@elastic/elasticsearch/lib/api/types';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   ERROR_CULPRIT,
   ERROR_EXC_HANDLED,
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts
index 7dabc62b00ed1..8df5235950cef 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
 import {
   ERROR_GROUP_ID,
@@ -12,7 +13,6 @@ import {
   TRANSACTION_SAMPLED,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getTransaction } from '../../transactions/get_transaction';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts b/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts
index 670932ea6dbbd..1feeab80875e0 100644
--- a/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts
@@ -10,8 +10,8 @@ import {
   SavedObjectsClientContract,
   Logger,
   KibanaRequest,
-} from 'kibana/server';
-import { PackagePolicy } from '../../../../fleet/common';
+} from '@kbn/core/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
 import {
   APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE,
   APM_SERVER_SCHEMA_SAVED_OBJECT_ID,
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_agents.ts b/x-pack/plugins/apm/server/routes/fleet/get_agents.ts
index bcfe42428dbe2..28b7bf755fa35 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_agents.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_agents.ts
@@ -9,7 +9,7 @@ import {
   CoreSetup,
   CoreStart,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
index 89ab9df051f70..4ad330d2bd475 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
@@ -9,7 +9,7 @@ import {
   CoreSetup,
   CoreStart,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts
index 28b40447136ce..023ba2755ea9a 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts
@@ -6,8 +6,8 @@
  */
 
 import yaml from 'js-yaml';
-import { KibanaRequest } from 'kibana/server';
-import { RegistryVarsEntry } from '../../../../fleet/common';
+import { KibanaRequest } from '@kbn/core/server';
+import { RegistryVarsEntry } from '@kbn/fleet-plugin/common';
 import {
   POLICY_ELASTIC_AGENT_ON_CLOUD,
   INPUT_VAR_NAME_TO_SCHEMA_PATH,
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts b/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts
index d48e2315eace3..d196503c3f91c 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { AgentPolicy, PackagePolicy } from '@kbn/fleet-plugin/common';
 import { Maybe } from '../../../typings/common';
-import { AgentPolicy, PackagePolicy } from '../../../../fleet/common';
 import { APMPluginStartDependencies } from '../../types';
 import { POLICY_ELASTIC_AGENT_ON_CLOUD } from '../../../common/fleet';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts b/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
index ba5b9f4b919e9..e5d088af2df8a 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 import { APM_PACKAGE_NAME } from './get_cloud_apm_package_policy';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts
index cdc56ba9794f6..2e2473e425a27 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { getUnsupportedApmServerSchema } from './get_unsupported_apm_server_schema';
 
 const apmServerSchema = {
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts
index fa2b4c585cb9d..2a9e4b9b08dbb 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { INPUT_VAR_NAME_TO_SCHEMA_PATH } from '../../../common/fleet';
 import {
   APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts b/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts
index 1e4e596ab76e7..e36c0fd93d210 100644
--- a/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 
 export function isSuperuser({
diff --git a/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts b/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
index 8a26321248ff3..e6311fa4fc9e6 100644
--- a/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { APMPlugin, APMRouteHandlerResources } from '../..';
 import {
   PostPackagePolicyCreateCallback,
   PutPackagePolicyUpdateCallback,
-} from '../../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import {
   NewPackagePolicy,
   UpdatePackagePolicy,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { APMPlugin, APMRouteHandlerResources } from '../..';
 import { AgentConfiguration } from '../../../common/agent_configuration/configuration_types';
 import { AGENT_NAME } from '../../../common/elasticsearch_fieldnames';
 import { APMPluginStartDependencies } from '../../types';
diff --git a/x-pack/plugins/apm/server/routes/fleet/route.ts b/x-pack/plugins/apm/server/routes/fleet/route.ts
index 2b6412647641c..76f05d50fff41 100644
--- a/x-pack/plugins/apm/server/routes/fleet/route.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/route.ts
@@ -157,7 +157,7 @@ const getUnsupportedApmServerSchemaRoute = createApmServerRoute({
     resources
   ): Promise<{ unsupported: Array<{ key: string; value: any }> }> => {
     const { context } = resources;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     return {
       unsupported: await getUnsupportedApmServerSchema({ savedObjectsClient }),
     };
@@ -185,7 +185,7 @@ const getMigrationCheckRoute = createApmServerRoute({
     if (!plugins.fleet || !plugins.security) {
       throw Boom.internal(FLEET_SECURITY_REQUIRED_MESSAGE);
     }
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const [fleetPluginStart, securityPluginStart] = await Promise.all([
       plugins.fleet.start(),
       plugins.security.start(),
@@ -231,7 +231,7 @@ const createCloudApmPackagePolicyRoute = createApmServerRoute({
     if (!plugins.fleet || !plugins.security) {
       throw Boom.internal(FLEET_SECURITY_REQUIRED_MESSAGE);
     }
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const coreStart = await resources.core.start();
     const esClient = coreStart.elasticsearch.client.asScoped(
       resources.request
diff --git a/x-pack/plugins/apm/server/routes/fleet/source_maps.ts b/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
index 1d70076a828dd..93b6fb592b47b 100644
--- a/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
@@ -9,10 +9,10 @@ import {
   CoreStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { promisify } from 'util';
 import { unzip } from 'zlib';
-import { Artifact } from '../../../../fleet/server';
+import { Artifact } from '@kbn/fleet-plugin/server';
 import { SourceMap } from '../source_maps/route';
 import { APMPluginStartDependencies } from '../../types';
 import { getApmPackgePolicies } from './get_apm_package_policies';
diff --git a/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts b/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
index c3660eee0afae..0f92f7f081ee6 100644
--- a/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
@@ -9,7 +9,7 @@ import {
   CoreSetup,
   CoreStart,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { TelemetryUsageCounter } from '../typings';
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index 1604d22a209a7..8b199cc76085e 100644
--- a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -7,6 +7,7 @@
 
 import { sum, round } from 'lodash';
 import { euiLightVars as theme } from '@kbn/ui-theme';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { isFiniteNumber } from '../../../../../../common/utils/is_finite_number';
 import { Setup } from '../../../../../lib/helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../../../../lib/helpers/metrics';
@@ -26,10 +27,6 @@ import {
   environmentQuery,
   serviceNodeNameQuery,
 } from '../../../../../../common/utils/environment_query';
-import {
-  kqlQuery,
-  rangeQuery,
-} from '../../../../../../../observability/server';
 import { ProcessorEvent } from '../../../../../../common/processor_event';
 
 export async function fetchAndTransformGcMetrics({
diff --git a/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts
index 52a099bdcf405..f767fb71f15c6 100644
--- a/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts
@@ -8,8 +8,9 @@
 import { Unionize } from 'utility-types';
 import { euiLightVars as theme } from '@kbn/ui-theme';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { getVizColorForIndex } from '../../../common/viz_colors';
-import { AggregationOptionsByType } from '../../../../../../src/core/types/elasticsearch';
 import { APMEventESSearchRequest } from '../../lib/helpers/create_es_client/create_apm_event_client';
 import { getMetricsDateHistogramParams } from '../../lib/helpers/metrics';
 import { Setup } from '../../lib/helpers/setup_request';
@@ -18,7 +19,6 @@ import {
   environmentQuery,
   serviceNodeNameQuery,
 } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 
diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts b/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts
index 74b70e5fa7d60..07bbdb4b348b5 100644
--- a/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts
+++ b/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery } from '../../../../observability/server';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts b/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts
index 83e51d7d638fe..214072d78ff76 100644
--- a/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts
+++ b/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   TRANSACTION_PAGE_LOAD,
   TRANSACTION_REQUEST,
 } from '../../../common/transaction_types';
 import { TRANSACTION_TYPE } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts b/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts
index 6cb3bc069e072..67689c9e718f2 100644
--- a/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts
@@ -6,13 +6,13 @@
  */
 
 import moment from 'moment';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { SetupUX } from './route';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery } from '../../../../observability/server';
 import { TRANSACTION_PAGE_LOAD } from '../../../common/transaction_types';
 
 export async function hasRumData({
diff --git a/x-pack/plugins/apm/server/routes/rum_client/route.ts b/x-pack/plugins/apm/server/routes/rum_client/route.ts
index d7d1e2837c53e..c325692299d5e 100644
--- a/x-pack/plugins/apm/server/routes/rum_client/route.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client/route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import * as t from 'io-ts';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { isoToEpochRt } from '@kbn/io-ts-utils';
 import { setupRequest, Setup } from '../../lib/helpers/setup_request';
 import { getClientMetrics } from './get_client_metrics';
diff --git a/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts b/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts
index 5259cd6e1ee61..8d759140fc659 100644
--- a/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import {
diff --git a/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts b/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts
index 6ef5ada473a71..c650158dc3fe5 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { APM_SERVICE_GROUP_SAVED_OBJECT_TYPE } from '../../../common/service_groups';
 
 interface Options {
diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts b/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts
index d9202e2548fc7..9ae682812de05 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ServiceGroup,
   SavedServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts b/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
index 2c4668ac9e916..6307d273e12f5 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ServiceGroup,
   SavedServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts b/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
index d3fe63dde47eb..a9b0d9fe8c57b 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { MAX_NUMBER_OF_SERVICES_IN_GROUP } from '../../../common/service_groups';
diff --git a/x-pack/plugins/apm/server/routes/service_groups/route.ts b/x-pack/plugins/apm/server/routes/service_groups/route.ts
index 347c76b676443..160aea5abfe70 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/route.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/route.ts
@@ -9,11 +9,11 @@ import * as t from 'io-ts';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { kueryRt, rangeRt } from '../default_api_types';
-import { getServiceGroups } from '../service_groups/get_service_groups';
-import { getServiceGroup } from '../service_groups/get_service_group';
-import { saveServiceGroup } from '../service_groups/save_service_group';
-import { deleteServiceGroup } from '../service_groups/delete_service_group';
-import { lookupServices } from '../service_groups/lookup_services';
+import { getServiceGroups } from './get_service_groups';
+import { getServiceGroup } from './get_service_group';
+import { saveServiceGroup } from './save_service_group';
+import { deleteServiceGroup } from './delete_service_group';
+import { lookupServices } from './lookup_services';
 import {
   ServiceGroup,
   SavedServiceGroup,
@@ -28,7 +28,7 @@ const serviceGroupsRoute = createApmServerRoute({
     resources
   ): Promise<{ serviceGroups: SavedServiceGroup[] }> => {
     const { context } = resources;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const serviceGroups = await getServiceGroups({ savedObjectsClient });
     return { serviceGroups };
   },
@@ -46,7 +46,7 @@ const serviceGroupRoute = createApmServerRoute({
   },
   handler: async (resources): Promise<{ serviceGroup: SavedServiceGroup }> => {
     const { context, params } = resources;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const serviceGroup = await getServiceGroup({
       savedObjectsClient,
       serviceGroupId: params.query.serviceGroup,
@@ -75,7 +75,7 @@ const serviceGroupSaveRoute = createApmServerRoute({
   handler: async (resources): Promise<void> => {
     const { context, params } = resources;
     const { start, end, serviceGroupId } = params.query;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const setup = await setupRequest(resources);
     const items = await lookupServices({
       setup,
@@ -107,7 +107,7 @@ const serviceGroupDeleteRoute = createApmServerRoute({
   handler: async (resources): Promise<void> => {
     const { context, params } = resources;
     const { serviceGroupId } = params.query;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     await deleteServiceGroup({
       savedObjectsClient,
       serviceGroupId,
diff --git a/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts b/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts
index 5dda1cca11c54..6f21fa0ef38c7 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   APM_SERVICE_GROUP_SAVED_OBJECT_TYPE,
   ServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts b/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts
index b3bd4d1510180..8c2254af1deb2 100644
--- a/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rangeQuery } from '../../../../observability/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { TRACE_ID } from '../../../common/elasticsearch_fieldnames';
 import {
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts
index 6eedc3b3d0329..1519cd07987a3 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts
@@ -8,8 +8,9 @@
 import Boom from '@hapi/boom';
 import { sortBy, uniqBy } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ESSearchResponse } from '../../../../../../src/core/types/elasticsearch';
-import { MlPluginSetup } from '../../../../ml/server';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { getSeverity, ML_ERRORS } from '../../../common/anomaly_detection';
 import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 import { getServiceHealthStatus } from '../../../common/service_health_status';
@@ -17,7 +18,6 @@ import {
   TRANSACTION_PAGE_LOAD,
   TRANSACTION_REQUEST,
 } from '../../../common/transaction_types';
-import { rangeQuery } from '../../../../observability/server';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getMlJobsWithAPMGroup } from '../../lib/anomaly_detection/get_ml_jobs_with_apm_group';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts
index 837be066133b2..bb04a7f5ce689 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { chunk } from 'lodash';
+import { rangeQuery, termsQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery, termsQuery } from '../../../../observability/server';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts
index 995aae9372554..76bccabc803ed 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rangeQuery } from '../../../../observability/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SPAN_DESTINATION_SERVICE_RESOURCE,
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
index 884da3991d731..225c78bd89dcb 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
-import { rangeQuery } from '../../../../observability/server';
+import { sumBy } from 'lodash';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_SYSTEM_CPU_PERCENT,
@@ -84,7 +84,7 @@ export function getServiceMapServiceNodeInfo({
       ...environmentQuery(environment),
     ];
 
-    const minutes = Math.abs((end - start) / (1000 * 60));
+    const minutes = (end - start) / 1000 / 60;
     const numBuckets = 20;
     const { intervalString, bucketSize } =
       getBucketSizeForAggregatedTransactions({
@@ -193,7 +193,6 @@ async function getTransactionStats({
           ],
         },
       },
-      track_total_hits: true,
       aggs: {
         duration: { avg: { field: durationField } },
         timeseries: {
@@ -215,7 +214,10 @@ async function getTransactionStats({
     params
   );
 
-  const totalRequests = response.hits.total.value;
+  const throughputValue = sumBy(
+    response.aggregations?.timeseries.buckets,
+    'doc_count'
+  );
 
   return {
     latency: {
@@ -226,7 +228,7 @@ async function getTransactionStats({
       })),
     },
     throughput: {
-      value: totalRequests > 0 ? totalRequests / minutes : null,
+      value: throughputValue ? throughputValue / minutes : null,
       timeseries: response.aggregations?.timeseries.buckets.map((bucket) => {
         return {
           x: bucket.key + offsetInMs,
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts
index 6f6c6a4401526..31710b253d07c 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts
@@ -7,6 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { sortBy, take, uniq } from 'lodash';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import {
   SERVICE_ENVIRONMENT,
@@ -16,7 +17,6 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { SERVICE_MAP_TIMEOUT_ERROR } from '../../../common/service_map';
-import { rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Setup } from '../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/service_map/route.ts b/x-pack/plugins/apm/server/routes/service_map/route.ts
index b357958d219a9..0bad4c251fddb 100644
--- a/x-pack/plugins/apm/server/routes/service_map/route.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/route.ts
@@ -88,12 +88,14 @@ const serviceMapRoute = createApmServerRoute({
     if (!config.serviceMapEnabled) {
       throw Boom.notFound();
     }
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+
+    const licensingContext = await context.licensing;
+    if (!isActivePlatinumLicense(licensingContext.license)) {
       throw Boom.forbidden(invalidLicenseMessage);
     }
 
     notifyFeatureUsage({
-      licensingPlugin: context.licensing,
+      licensingPlugin: licensingContext,
       featureName: 'serviceMaps',
     });
 
@@ -107,7 +109,7 @@ const serviceMapRoute = createApmServerRoute({
       },
     } = params;
 
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const [setup, serviceGroup] = await Promise.all([
       setupRequest(resources),
       serviceGroupId
@@ -164,7 +166,9 @@ const serviceMapServiceNodeRoute = createApmServerRoute({
     if (!config.serviceMapEnabled) {
       throw Boom.notFound();
     }
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+
+    const licensingContext = await context.licensing;
+    if (!isActivePlatinumLicense(licensingContext.license)) {
       throw Boom.forbidden(invalidLicenseMessage);
     }
     const setup = await setupRequest(resources);
@@ -226,7 +230,8 @@ const serviceMapBackendNodeRoute = createApmServerRoute({
     if (!config.serviceMapEnabled) {
       throw Boom.notFound();
     }
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    const licensingContext = await context.licensing;
+    if (!isActivePlatinumLicense(licensingContext.license)) {
       throw Boom.forbidden(invalidLicenseMessage);
     }
     const setup = await setupRequest(resources);
diff --git a/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts b/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts
index 58c105289be9c..f0b710069d244 100644
--- a/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts
+++ b/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   METRIC_JAVA_HEAP_MEMORY_USED,
   METRIC_JAVA_NON_HEAP_MEMORY_USED,
@@ -19,7 +20,6 @@ import {
   SERVICE_NODE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Setup } from '../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap
index 4014f2a4a2acc..e09c50708c476 100644
--- a/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap
@@ -81,50 +81,57 @@ Array [
     },
     "body": Object {
       "aggs": Object {
-        "services": Object {
+        "sample": Object {
           "aggs": Object {
-            "transactionType": Object {
+            "services": Object {
               "aggs": Object {
-                "avg_duration": Object {
-                  "avg": Object {
-                    "field": "transaction.duration.us",
-                  },
-                },
-                "environments": Object {
-                  "terms": Object {
-                    "field": "service.environment",
-                  },
-                },
-                "outcomes": Object {
-                  "terms": Object {
-                    "field": "event.outcome",
-                    "include": Array [
-                      "failure",
-                      "success",
-                    ],
-                  },
-                },
-                "sample": Object {
-                  "top_metrics": Object {
-                    "metrics": Array [
-                      Object {
-                        "field": "agent.name",
+                "transactionType": Object {
+                  "aggs": Object {
+                    "avg_duration": Object {
+                      "avg": Object {
+                        "field": "transaction.duration.us",
+                      },
+                    },
+                    "environments": Object {
+                      "terms": Object {
+                        "field": "service.environment",
+                      },
+                    },
+                    "outcomes": Object {
+                      "terms": Object {
+                        "field": "event.outcome",
+                        "include": Array [
+                          "failure",
+                          "success",
+                        ],
+                      },
+                    },
+                    "sample": Object {
+                      "top_metrics": Object {
+                        "metrics": Array [
+                          Object {
+                            "field": "agent.name",
+                          },
+                        ],
+                        "sort": Object {
+                          "@timestamp": "desc",
+                        },
                       },
-                    ],
-                    "sort": Object {
-                      "@timestamp": "desc",
                     },
                   },
+                  "terms": Object {
+                    "field": "transaction.type",
+                  },
                 },
               },
               "terms": Object {
-                "field": "transaction.type",
+                "field": "service.name",
+                "size": 50,
               },
             },
           },
-          "terms": Object {
-            "field": "service.name",
-            "size": 50,
+          "random_sampler": Object {
+            "probability": 1,
           },
         },
       },
@@ -155,29 +162,36 @@ Array [
     },
     "body": Object {
       "aggs": Object {
-        "services": Object {
+        "sample": Object {
           "aggs": Object {
-            "environments": Object {
-              "terms": Object {
-                "field": "service.environment",
-              },
-            },
-            "latest": Object {
-              "top_metrics": Object {
-                "metrics": Array [
-                  Object {
-                    "field": "agent.name",
+            "services": Object {
+              "aggs": Object {
+                "environments": Object {
+                  "terms": Object {
+                    "field": "service.environment",
                   },
-                ],
-                "sort": Object {
-                  "@timestamp": "desc",
                 },
+                "latest": Object {
+                  "top_metrics": Object {
+                    "metrics": Array [
+                      Object {
+                        "field": "agent.name",
+                      },
+                    ],
+                    "sort": Object {
+                      "@timestamp": "desc",
+                    },
+                  },
+                },
+              },
+              "terms": Object {
+                "field": "service.name",
+                "size": 50,
               },
             },
           },
-          "terms": Object {
-            "field": "service.name",
-            "size": 50,
+          "random_sampler": Object {
+            "probability": 1,
           },
         },
       },
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts b/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts
index 523775de170e7..1126b530b4fe0 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { isFiniteNumber } from '../../../../common/utils/is_finite_number';
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
 import { Annotation, AnnotationType } from '../../../../common/annotations';
 import {
   SERVICE_NAME,
   SERVICE_VERSION,
 } from '../../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts b/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts
index 7ce9eddf65981..9106edc0ec453 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts
@@ -6,16 +6,16 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { ElasticsearchClient, Logger } from 'kibana/server';
-import { rangeQuery } from '../../../../../observability/server';
-import { environmentQuery } from '../../../../common/utils/environment_query';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   unwrapEsResponse,
   WrappedElasticsearchClientError,
-} from '../../../../../observability/server';
-import { ESSearchResponse } from '../../../../../../../src/core/types/elasticsearch';
-import { Annotation as ESAnnotation } from '../../../../../observability/common/annotations';
-import { ScopedAnnotationsClient } from '../../../../../observability/server';
+} from '@kbn/observability-plugin/server';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { Annotation as ESAnnotation } from '@kbn/observability-plugin/common/annotations';
+import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
+import { environmentQuery } from '../../../../common/utils/environment_query';
 import { Annotation, AnnotationType } from '../../../../common/annotations';
 import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
 import { withApmSpan } from '../../../utils/with_apm_span';
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts b/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts
index e5bc2501407c3..d642d86b59245 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts
@@ -8,7 +8,7 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 import {
   inspectSearchParams,
   SearchParamsMock,
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/index.ts b/x-pack/plugins/apm/server/routes/services/annotations/index.ts
index 488a4ce6e4c20..0423263fe5227 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/index.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
-import { ScopedAnnotationsClient } from '../../../../../observability/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
 import { getDerivedServiceAnnotations } from './get_derived_service_annotations';
 import { Setup } from '../../../lib/helpers/setup_request';
 import { getStoredAnnotations } from './get_stored_annotations';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_agent.ts b/x-pack/plugins/apm/server/routes/services/get_service_agent.ts
index fede626bb9d49..e96dcdb6bf0fd 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_agent.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_agent.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   AGENT_NAME,
   SERVICE_NAME,
   SERVICE_RUNTIME_NAME,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 
 interface ServiceAgent {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts b/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts
index a0b8eb1768d6f..4fc7667fa2349 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { sortBy, take } from 'lodash';
+import { kqlQuery } from '@kbn/observability-plugin/server';
 import { getNodeName } from '../../../common/connections';
-import { kqlQuery } from '../../../../observability/server';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts b/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts
index 79d7ff4f1f41e..e4e44ac44082b 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { Setup } from '../../lib/helpers/setup_request';
-import { rangeQuery, kqlQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts b/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts
index 957d655b98e5d..1bc44bf2c2b77 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 import { merge } from 'lodash';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   METRICSET_NAME,
   SERVICE_NAME,
   SERVICE_NODE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import { maybe } from '../../../common/utils/maybe';
 import {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
index c1cfbed24c91d..8a191228255a9 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { AggregationOptionsByType } from 'src/core/types/elasticsearch';
+import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_PROCESS_CPU_PERCENT,
@@ -17,7 +18,6 @@ import {
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
 import { Coordinate } from '../../../../typings/timeseries';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getBucketSize } from '../../../lib/helpers/get_bucket_size';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts
index 7aa80322269b4..8231675baff8e 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -14,7 +15,6 @@ import { EventOutcome } from '../../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
 import { Coordinate } from '../../../../typings/timeseries';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts b/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
index 6b7f16084e5f3..4769a1986ec43 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   AGENT,
@@ -24,7 +25,6 @@ import {
   FAAS_TRIGGER_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { ContainerType } from '../../../common/service_metadata';
-import { rangeQuery } from '../../../../observability/server';
 import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts b/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts
index 6082ae6c5b112..b1724e2c07db6 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   AGENT_NAME,
@@ -17,7 +18,6 @@ import {
   HOST_OS_PLATFORM,
 } from '../../../common/elasticsearch_fieldnames';
 import { ContainerType } from '../../../common/service_metadata';
-import { rangeQuery } from '../../../../observability/server';
 import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts b/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts
index 89e0e42e95914..e782a99201ccf 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
   HOST_NAME,
@@ -16,7 +17,6 @@ import {
   SERVICE_NODE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import {
   environmentQuery,
   serviceNodeNameQuery,
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts
index 2bc9ea328030d..0bf0b83431e45 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts
@@ -6,6 +6,7 @@
  */
 
 import { keyBy } from 'lodash';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -15,7 +16,6 @@ import {
 import { EventOutcome } from '../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
 import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Coordinate } from '../../../typings/timeseries';
 import {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts b/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts
index 979d79c84578a..985b5bc3e1dc4 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -13,7 +14,6 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
-import { rangeQuery, kqlQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts b/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts
index a3761df72156e..51ce7c35d3fb8 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts
index 4e8795aacc228..4fc1636deda2f 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts
@@ -10,7 +10,7 @@ import {
   getServiceHealthStatus,
   ServiceHealthStatus,
 } from '../../../../common/service_health_status';
-import { getServiceAnomalies } from '../../../routes/service_map/get_service_anomalies';
+import { getServiceAnomalies } from '../../service_map/get_service_anomalies';
 import { ServicesItemsSetup } from './get_services_items';
 
 interface AggregationParams {
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts
index 10f235063f9cb..75322ebcd0551 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
@@ -23,7 +23,7 @@ import {
   getDurationFieldForTransactions,
   getProcessorEventForTransactions,
 } from '../../../lib/helpers/transactions';
-import { calculateThroughput } from '../../../lib/helpers/calculate_throughput';
+import { calculateThroughputWithRange } from '../../../lib/helpers/calculate_throughput';
 import {
   calculateFailedTransactionRate,
   getOutcomeAggregation,
@@ -35,6 +35,7 @@ import { ServiceGroup } from '../../../../common/service_groups';
 interface AggregationParams {
   environment: string;
   kuery: string;
+  probability: number;
   setup: ServicesItemsSetup;
   searchAggregatedTransactions: boolean;
   maxNumServices: number;
@@ -46,6 +47,7 @@ interface AggregationParams {
 export async function getServiceTransactionStats({
   environment,
   kuery,
+  probability,
   setup,
   searchAggregatedTransactions,
   maxNumServices,
@@ -90,28 +92,35 @@ export async function getServiceTransactionStats({
           },
         },
         aggs: {
-          services: {
-            terms: {
-              field: SERVICE_NAME,
-              size: maxNumServices,
+          sample: {
+            random_sampler: {
+              probability,
             },
             aggs: {
-              transactionType: {
+              services: {
                 terms: {
-                  field: TRANSACTION_TYPE,
+                  field: SERVICE_NAME,
+                  size: maxNumServices,
                 },
                 aggs: {
-                  ...metrics,
-                  environments: {
+                  transactionType: {
                     terms: {
-                      field: SERVICE_ENVIRONMENT,
+                      field: TRANSACTION_TYPE,
                     },
-                  },
-                  sample: {
-                    top_metrics: {
-                      metrics: [{ field: AGENT_NAME } as const],
-                      sort: {
-                        '@timestamp': 'desc' as const,
+                    aggs: {
+                      ...metrics,
+                      environments: {
+                        terms: {
+                          field: SERVICE_ENVIRONMENT,
+                        },
+                      },
+                      sample: {
+                        top_metrics: {
+                          metrics: [{ field: AGENT_NAME } as const],
+                          sort: {
+                            '@timestamp': 'desc' as const,
+                          },
+                        },
                       },
                     },
                   },
@@ -125,7 +134,7 @@ export async function getServiceTransactionStats({
   );
 
   return (
-    response.aggregations?.services.buckets.map((bucket) => {
+    response.aggregations?.sample.services.buckets.map((bucket) => {
       const topTransactionTypeBucket =
         bucket.transactionType.buckets.find(
           ({ key }) =>
@@ -145,7 +154,7 @@ export async function getServiceTransactionStats({
         transactionErrorRate: calculateFailedTransactionRate(
           topTransactionTypeBucket.outcomes
         ),
-        throughput: calculateThroughput({
+        throughput: calculateThroughputWithRange({
           start,
           end,
           value: topTransactionTypeBucket.doc_count,
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts
index e70813308084a..45049db6ef8f1 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { Setup } from '../../../lib/helpers/setup_request';
@@ -21,6 +21,7 @@ import { ServiceGroup } from '../../../../common/service_groups';
 export async function getServicesFromErrorAndMetricDocuments({
   environment,
   setup,
+  probability,
   maxNumServices,
   kuery,
   start,
@@ -29,6 +30,7 @@ export async function getServicesFromErrorAndMetricDocuments({
 }: {
   setup: Setup;
   environment: string;
+  probability: number;
   maxNumServices: number;
   kuery: string;
   start: number;
@@ -56,21 +58,28 @@ export async function getServicesFromErrorAndMetricDocuments({
           },
         },
         aggs: {
-          services: {
-            terms: {
-              field: SERVICE_NAME,
-              size: maxNumServices,
+          sample: {
+            random_sampler: {
+              probability,
             },
             aggs: {
-              environments: {
+              services: {
                 terms: {
-                  field: SERVICE_ENVIRONMENT,
+                  field: SERVICE_NAME,
+                  size: maxNumServices,
                 },
-              },
-              latest: {
-                top_metrics: {
-                  metrics: [{ field: AGENT_NAME } as const],
-                  sort: { '@timestamp': 'desc' },
+                aggs: {
+                  environments: {
+                    terms: {
+                      field: SERVICE_ENVIRONMENT,
+                    },
+                  },
+                  latest: {
+                    top_metrics: {
+                      metrics: [{ field: AGENT_NAME } as const],
+                      sort: { '@timestamp': 'desc' },
+                    },
+                  },
                 },
               },
             },
@@ -81,7 +90,7 @@ export async function getServicesFromErrorAndMetricDocuments({
   );
 
   return (
-    response.aggregations?.services.buckets.map((bucket) => {
+    response.aggregations?.sample.services.buckets.map((bucket) => {
       return {
         serviceName: bucket.key as string,
         environments: bucket.environments.buckets.map(
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts
index 1235af756b76e..a5936dd68d026 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts
@@ -21,6 +21,7 @@ const MAX_NUMBER_OF_SERVICES = 50;
 export async function getServicesItems({
   environment,
   kuery,
+  probability,
   setup,
   searchAggregatedTransactions,
   logger,
@@ -30,6 +31,7 @@ export async function getServicesItems({
 }: {
   environment: string;
   kuery: string;
+  probability: number;
   setup: ServicesItemsSetup;
   searchAggregatedTransactions: boolean;
   logger: Logger;
@@ -41,6 +43,7 @@ export async function getServicesItems({
     const params = {
       environment,
       kuery,
+      probability,
       setup,
       searchAggregatedTransactions,
       maxNumServices: MAX_NUMBER_OF_SERVICES,
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/index.ts b/x-pack/plugins/apm/server/routes/services/get_services/index.ts
index 223c0b3f613ef..fb133e4f5ad1a 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/index.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/index.ts
@@ -14,6 +14,7 @@ import { ServiceGroup } from '../../../../common/service_groups';
 export async function getServices({
   environment,
   kuery,
+  probability,
   setup,
   searchAggregatedTransactions,
   logger,
@@ -23,6 +24,7 @@ export async function getServices({
 }: {
   environment: string;
   kuery: string;
+  probability: number;
   setup: Setup;
   searchAggregatedTransactions: boolean;
   logger: Logger;
@@ -34,6 +36,7 @@ export async function getServices({
     const items = await getServicesItems({
       environment,
       kuery,
+      probability,
       setup,
       searchAggregatedTransactions,
       logger,
diff --git a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
index 744cd70e9eeb2..5f1b4faad8dc3 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
@@ -6,7 +6,7 @@
  */
 
 import { keyBy } from 'lodash';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
@@ -39,6 +39,7 @@ export async function getServiceTransactionDetailedStatistics({
   offset,
   start,
   end,
+  probability,
 }: {
   serviceNames: string[];
   environment: string;
@@ -48,6 +49,7 @@ export async function getServiceTransactionDetailedStatistics({
   offset?: string;
   start: number;
   end: number;
+  probability: number;
 }) {
   const { apmEventClient } = setup;
   const { offsetInMs, startWithOffset, endWithOffset } = getOffsetInMs({
@@ -91,33 +93,42 @@ export async function getServiceTransactionDetailedStatistics({
           },
         },
         aggs: {
-          services: {
-            terms: {
-              field: SERVICE_NAME,
+          sample: {
+            random_sampler: {
+              probability,
             },
             aggs: {
-              transactionType: {
+              services: {
                 terms: {
-                  field: TRANSACTION_TYPE,
+                  field: SERVICE_NAME,
+                  size: serviceNames.length,
                 },
                 aggs: {
-                  ...metrics,
-                  timeseries: {
-                    date_histogram: {
-                      field: '@timestamp',
-                      fixed_interval: getBucketSizeForAggregatedTransactions({
-                        start: startWithOffset,
-                        end: endWithOffset,
-                        numBuckets: 20,
-                        searchAggregatedTransactions,
-                      }).intervalString,
-                      min_doc_count: 0,
-                      extended_bounds: {
-                        min: startWithOffset,
-                        max: endWithOffset,
+                  transactionType: {
+                    terms: {
+                      field: TRANSACTION_TYPE,
+                    },
+                    aggs: {
+                      ...metrics,
+                      timeseries: {
+                        date_histogram: {
+                          field: '@timestamp',
+                          fixed_interval:
+                            getBucketSizeForAggregatedTransactions({
+                              start: startWithOffset,
+                              end: endWithOffset,
+                              numBuckets: 20,
+                              searchAggregatedTransactions,
+                            }).intervalString,
+                          min_doc_count: 0,
+                          extended_bounds: {
+                            min: startWithOffset,
+                            max: endWithOffset,
+                          },
+                        },
+                        aggs: metrics,
                       },
                     },
-                    aggs: metrics,
                   },
                 },
               },
@@ -129,7 +140,7 @@ export async function getServiceTransactionDetailedStatistics({
   );
 
   return keyBy(
-    response.aggregations?.services.buckets.map((bucket) => {
+    response.aggregations?.sample.services.buckets.map((bucket) => {
       const topTransactionTypeBucket =
         bucket.transactionType.buckets.find(
           ({ key }) =>
diff --git a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/index.ts b/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/index.ts
index d0fa24913a214..3009f9214ac31 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/index.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/index.ts
@@ -18,6 +18,7 @@ export async function getServicesDetailedStatistics({
   offset,
   start,
   end,
+  probability,
 }: {
   serviceNames: string[];
   environment: string;
@@ -27,6 +28,7 @@ export async function getServicesDetailedStatistics({
   offset?: string;
   start: number;
   end: number;
+  probability: number;
 }) {
   return withApmSpan('get_service_detailed_statistics', async () => {
     const commonProps = {
@@ -37,6 +39,7 @@ export async function getServicesDetailedStatistics({
       searchAggregatedTransactions,
       start,
       end,
+      probability,
     };
 
     const [currentPeriod, previousPeriod] = await Promise.all([
diff --git a/x-pack/plugins/apm/server/routes/services/get_throughput.ts b/x-pack/plugins/apm/server/routes/services/get_throughput.ts
index fc266d8c8f8ee..c5f2686cc942f 100644
--- a/x-pack/plugins/apm/server/routes/services/get_throughput.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_throughput.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts
index 3713b4faa73d9..aa65316e2a0c3 100644
--- a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts
@@ -5,8 +5,10 @@
  * 2.0.
  */
 import { keyBy, last } from 'lodash';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import util from 'util';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { maybe } from '../../../../common/utils/maybe';
 import { ProfileStackFrame } from '../../../../typings/es_schemas/ui/profile';
 import {
@@ -15,13 +17,11 @@ import {
   getValueTypeConfig,
 } from '../../../../common/profiling';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
 import {
   PROFILE_STACK,
   PROFILE_TOP_ID,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { APMEventClient } from '../../../lib/helpers/create_es_client/create_apm_event_client';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts
index 47df939467d0e..5a95b332e9ee9 100644
--- a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts
+++ b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { mapKeys, mapValues } from 'lodash';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
   PROFILE_ID,
@@ -17,7 +18,6 @@ import {
 import { Setup } from '../../../lib/helpers/setup_request';
 import { getBucketSize } from '../../../lib/helpers/get_bucket_size';
 import { environmentQuery } from '../../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 
 const configMap = mapValues(
   mapKeys(ProfilingValueType, (val, key) => val),
diff --git a/x-pack/plugins/apm/server/routes/services/queries.test.ts b/x-pack/plugins/apm/server/routes/services/queries.test.ts
index 9b2b54a9a11b9..8faa7b9857bf7 100644
--- a/x-pack/plugins/apm/server/routes/services/queries.test.ts
+++ b/x-pack/plugins/apm/server/routes/services/queries.test.ts
@@ -8,7 +8,7 @@
 import { getServiceAgent } from './get_service_agent';
 import { getServiceTransactionTypes } from './get_service_transaction_types';
 import { getServicesItems } from './get_services/get_services_items';
-import { hasHistoricalAgentData } from '../../routes/historical_data/has_historical_agent_data';
+import { hasHistoricalAgentData } from '../historical_data/has_historical_agent_data';
 import {
   SearchParamsMock,
   inspectSearchParams,
@@ -60,6 +60,7 @@ describe('services queries', () => {
         start: 0,
         end: 50000,
         serviceGroup: null,
+        probability: 1,
       })
     );
 
diff --git a/x-pack/plugins/apm/server/routes/services/route.ts b/x-pack/plugins/apm/server/routes/services/route.ts
index fb5b7a56e72fb..63a52da218d1a 100644
--- a/x-pack/plugins/apm/server/routes/services/route.ts
+++ b/x-pack/plugins/apm/server/routes/services/route.ts
@@ -9,6 +9,13 @@ import Boom from '@hapi/boom';
 import { isoToEpochRt, jsonRt, toNumberRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
 import { uniq } from 'lodash';
+import {
+  UnknownMLCapabilitiesError,
+  InsufficientMLCapabilities,
+  MLPrivilegesUninitialized,
+} from '@kbn/ml-plugin/server';
+import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
+import { Annotation } from '@kbn/observability-plugin/common/annotations';
 import { latencyAggregationTypeRt } from '../../../common/latency_aggregation_types';
 import { ProfilingValueType } from '../../../common/profiling';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
@@ -29,23 +36,21 @@ import { getServiceProfilingTimeline } from './profiling/get_service_profiling_t
 import { getServiceInfrastructure } from './get_service_infrastructure';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
-import { environmentRt, kueryRt, rangeRt } from '../default_api_types';
+import {
+  environmentRt,
+  kueryRt,
+  rangeRt,
+  probabilityRt,
+} from '../default_api_types';
 import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
 import { getServicesDetailedStatistics } from './get_services_detailed_statistics';
 import { getServiceDependenciesBreakdown } from './get_service_dependencies_breakdown';
 import { getAnomalyTimeseries } from '../../lib/anomaly_detection/get_anomaly_timeseries';
-import {
-  UnknownMLCapabilitiesError,
-  InsufficientMLCapabilities,
-  MLPrivilegesUninitialized,
-} from '../../../../ml/server';
 import { getServiceInstancesDetailedStatisticsPeriods } from './get_service_instances/detailed_statistics';
 import { ML_ERRORS } from '../../../common/anomaly_detection';
-import { ScopedAnnotationsClient } from '../../../../observability/server';
-import { Annotation } from './../../../../observability/common/annotations';
-import { ConnectionStatsItemWithImpact } from './../../../common/connections';
+import { ConnectionStatsItemWithImpact } from '../../../common/connections';
 import { getSortedAndFilteredServices } from './get_services/get_sorted_and_filtered_services';
-import { ServiceHealthStatus } from './../../../common/service_health_status';
+import { ServiceHealthStatus } from '../../../common/service_health_status';
 import { getServiceGroup } from '../service_groups/get_service_group';
 import { offsetRt } from '../../../common/offset_rt';
 
@@ -57,6 +62,7 @@ const servicesRoute = createApmServerRoute({
       kueryRt,
       rangeRt,
       t.partial({ serviceGroup: t.string }),
+      probabilityRt,
     ]),
   }),
   options: { tags: ['access:apm'] },
@@ -105,8 +111,9 @@ const servicesRoute = createApmServerRoute({
       start,
       end,
       serviceGroup: serviceGroupId,
+      probability,
     } = params.query;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
 
     const [setup, serviceGroup] = await Promise.all([
       setupRequest(resources),
@@ -123,6 +130,7 @@ const servicesRoute = createApmServerRoute({
     return getServices({
       environment,
       kuery,
+      probability,
       setup,
       searchAggregatedTransactions,
       logger,
@@ -137,10 +145,14 @@ const servicesDetailedStatisticsRoute = createApmServerRoute({
   endpoint: 'GET /internal/apm/services/detailed_statistics',
   params: t.type({
     query: t.intersection([
-      environmentRt,
-      kueryRt,
-      rangeRt,
-      offsetRt,
+      // t.intersection seemingly only supports 5 arguments so let's wrap them in another intersection
+      t.intersection([
+        environmentRt,
+        kueryRt,
+        rangeRt,
+        offsetRt,
+        probabilityRt,
+      ]),
       t.type({ serviceNames: jsonRt.pipe(t.array(t.string)) }),
     ]),
   }),
@@ -181,8 +193,15 @@ const servicesDetailedStatisticsRoute = createApmServerRoute({
   }> => {
     const setup = await setupRequest(resources);
     const { params } = resources;
-    const { environment, kuery, offset, serviceNames, start, end } =
-      params.query;
+    const {
+      environment,
+      kuery,
+      offset,
+      serviceNames,
+      start,
+      end,
+      probability,
+    } = params.query;
     const searchAggregatedTransactions = await getSearchAggregatedTransactions({
       ...setup,
       start,
@@ -203,6 +222,7 @@ const servicesDetailedStatisticsRoute = createApmServerRoute({
       serviceNames,
       start,
       end,
+      probability,
     });
   },
 });
@@ -383,6 +403,7 @@ const serviceAnnotationsRoute = createApmServerRoute({
     const { params, plugins, context, request, logger } = resources;
     const { serviceName } = params.path;
     const { environment, start, end } = params.query;
+    const esClient = (await context.core).elasticsearch.client;
 
     const { observability } = plugins;
 
@@ -411,7 +432,7 @@ const serviceAnnotationsRoute = createApmServerRoute({
       searchAggregatedTransactions,
       serviceName,
       annotationsClient,
-      client: context.core.elasticsearch.client.asCurrentUser,
+      client: esClient.asCurrentUser,
       logger,
       start,
       end,
@@ -1218,7 +1239,8 @@ const sortedAndFilteredServicesRoute = createApmServerRoute({
       };
     }
 
-    const savedObjectsClient = resources.context.core.savedObjects.client;
+    const savedObjectsClient = (await resources.context.core).savedObjects
+      .client;
 
     const [setup, serviceGroup] = await Promise.all([
       setupRequest(resources),
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts
index e5f6b36789302..d52b048bc6b46 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchHit } from '../../../../../../../src/core/types/elasticsearch';
+import { SearchHit } from '@kbn/core/types/elasticsearch';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 
 // needed for backwards compatability
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts
index a14019f4dbdec..05e9b4d87589a 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import {
   createOrUpdateIndex,
   Mappings,
-} from '../../../../../observability/server';
+} from '@kbn/observability-plugin/server';
 import { APMConfig } from '../../..';
 import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
 
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
index ac95f36107994..18e2fe0f34a6d 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchHit } from '../../../../../../../src/core/types/elasticsearch';
+import { SearchHit } from '@kbn/core/types/elasticsearch';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 import {
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
index f2cfbe857ba48..72869ef165fa2 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
@@ -8,7 +8,7 @@
 import * as t from 'io-ts';
 import Boom from '@hapi/boom';
 import { toBooleanRt } from '@kbn/io-ts-utils';
-import { maxSuggestions } from '../../../../../observability/common';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { setupRequest } from '../../../lib/helpers/setup_request';
 import { createOrUpdateConfiguration } from './create_or_update_configuration';
 import { searchConfigurations } from './search_configurations';
@@ -269,6 +269,7 @@ const listAgentConfigurationEnvironmentsRoute = createApmServerRoute({
   }> => {
     const setup = await setupRequest(resources);
     const { context, params } = resources;
+    const coreContext = await context.core;
 
     const { serviceName, start, end } = params.query;
     const searchAggregatedTransactions = await getSearchAggregatedTransactions({
@@ -278,7 +279,7 @@ const listAgentConfigurationEnvironmentsRoute = createApmServerRoute({
       start,
       end,
     });
-    const size = await context.core.uiSettings.client.get<number>(
+    const size = await coreContext.uiSettings.client.get<number>(
       maxSuggestions
     );
     const environments = await getEnvironments({
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts
index 194e1eff4e657..ecaddcc2286fa 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchHit } from '../../../../../../../src/core/types/elasticsearch';
+import { SearchHit } from '@kbn/core/types/elasticsearch';
 import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts
index 974b7f57289db..fa15ef06ff16a 100644
--- a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts
@@ -7,7 +7,8 @@
 
 import * as t from 'io-ts';
 import Boom from '@hapi/boom';
-import { maxSuggestions } from '../../../../../observability/common';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { isActivePlatinumLicense } from '../../../../common/license_check';
 import { ML_ERRORS } from '../../../../common/anomaly_detection';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
@@ -19,7 +20,6 @@ import { notifyFeatureUsage } from '../../../feature';
 import { updateToV3 } from './update_to_v3';
 import { environmentStringRt } from '../../../../common/environment_rt';
 import { getMlJobsWithAPMGroup } from '../../../lib/anomaly_detection/get_ml_jobs_with_apm_group';
-import { ElasticsearchClient } from '../../../../../../../src/core/server';
 
 // get ML anomaly detection jobs for each environment
 const anomalyDetectionJobsRoute = createApmServerRoute({
@@ -37,8 +37,9 @@ const anomalyDetectionJobsRoute = createApmServerRoute({
   }> => {
     const setup = await setupRequest(resources);
     const { context } = resources;
+    const licensingContext = await context.licensing;
 
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    if (!isActivePlatinumLicense(licensingContext.license)) {
       throw Boom.forbidden(ML_ERRORS.INVALID_LICENSE);
     }
 
@@ -69,17 +70,18 @@ const createAnomalyDetectionJobsRoute = createApmServerRoute({
   handler: async (resources): Promise<{ jobCreated: true }> => {
     const { params, context, logger } = resources;
     const { environments } = params.body;
+    const licensingContext = await context.licensing;
 
     const setup = await setupRequest(resources);
 
-    if (!isActivePlatinumLicense(context.licensing.license)) {
+    if (!isActivePlatinumLicense(licensingContext.license)) {
       throw Boom.forbidden(ML_ERRORS.INVALID_LICENSE);
     }
 
     await createAnomalyDetectionJobs(setup, environments, logger);
 
     notifyFeatureUsage({
-      licensingPlugin: context.licensing,
+      licensingPlugin: licensingContext,
       featureName: 'ml',
     });
 
@@ -93,13 +95,14 @@ const anomalyDetectionEnvironmentsRoute = createApmServerRoute({
   options: { tags: ['access:apm'] },
   handler: async (resources): Promise<{ environments: string[] }> => {
     const setup = await setupRequest(resources);
+    const coreContext = await resources.context.core;
 
     const searchAggregatedTransactions = await getSearchAggregatedTransactions({
       apmEventClient: setup.apmEventClient,
       config: setup.config,
       kuery: '',
     });
-    const size = await resources.context.core.uiSettings.client.get<number>(
+    const size = await coreContext.uiSettings.client.get<number>(
       maxSuggestions
     );
     const environments = await getAllEnvironments({
diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts
index b23a28648482e..4c0cd118fab2b 100644
--- a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts
+++ b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts
@@ -7,8 +7,8 @@
 import { Logger } from '@kbn/logging';
 import { uniq } from 'lodash';
 import pLimit from 'p-limit';
-import { ElasticsearchClient } from '../../../../../../../src/core/server';
-import { JOB_STATE } from '../../../../../ml/common';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { JOB_STATE } from '@kbn/ml-plugin/common';
 import { createAnomalyDetectionJobs } from '../../../lib/anomaly_detection/create_anomaly_detection_jobs';
 import { getAnomalyDetectionJobs } from '../../../lib/anomaly_detection/get_anomaly_detection_jobs';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts
index 7d98502ee5d93..bebb92d6b6445 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsClient } from 'src/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+import { ApmIndicesConfig } from '@kbn/observability-plugin/common/typings';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
@@ -13,7 +14,6 @@ import {
 import { APMConfig } from '../../..';
 import { APMRouteHandlerResources } from '../../typings';
 import { withApmSpan } from '../../../utils/with_apm_span';
-import { ApmIndicesConfig } from '../../../../../observability/common/typings';
 import { APMIndices } from '../../../saved_objects/apm_indices';
 
 export type { ApmIndicesConfig };
@@ -74,9 +74,8 @@ export async function getApmIndexSettings({
     ReturnType<typeof getApmIndicesSavedObject>
   >;
   try {
-    apmIndicesSavedObject = await getApmIndicesSavedObject(
-      context.core.savedObjects.client
-    );
+    const soClient = (await context.core).savedObjects.client;
+    apmIndicesSavedObject = await getApmIndicesSavedObject(soClient);
   } catch (error: any) {
     if (error.output && error.output.statusCode === 404) {
       apmIndicesSavedObject = {};
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts
index f0d19050954d9..796c4312eb2ea 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts
@@ -9,7 +9,7 @@ import * as t from 'io-ts';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
 import { getApmIndices, getApmIndexSettings } from './get_apm_indices';
 import { saveApmIndices } from './save_apm_indices';
-import { APMConfig } from '../../../';
+import { APMConfig } from '../../..';
 
 // get list of apm indices and values
 const apmIndexSettingsRoute = createApmServerRoute({
@@ -46,8 +46,9 @@ const apmIndicesRoute = createApmServerRoute({
     import('./../../../../../observability/common/typings').ApmIndicesConfig
   > => {
     const { context, config } = resources;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     return await getApmIndices({
-      savedObjectsClient: context.core.savedObjects.client,
+      savedObjectsClient,
       config,
     });
   },
@@ -80,7 +81,7 @@ const saveApmIndicesRoute = createApmServerRoute({
   > => {
     const { params, context } = resources;
     const { body } = params;
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     return await saveApmIndices(savedObjectsClient, body);
   },
 });
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts
index 0c91bccb42999..e72282ba6275a 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { saveApmIndices } from './save_apm_indices';
-import { SavedObjectsClientContract } from '../../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 describe('saveApmIndices', () => {
   it('should trim and strip empty settings', async () => {
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts
index 2bd4273910bbf..4e0b412084f6e 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from '../../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts
index 752a7769caea0..4f9fc321a19f9 100644
--- a/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   createOrUpdateIndex,
   Mappings,
-} from '../../../../../observability/server';
+} from '@kbn/observability-plugin/server';
 import { APMConfig } from '../../..';
 import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
 
diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/route.ts b/x-pack/plugins/apm/server/routes/settings/custom_link/route.ts
index ca111a50ce924..1bd6328bdcee5 100644
--- a/x-pack/plugins/apm/server/routes/settings/custom_link/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/custom_link/route.ts
@@ -54,7 +54,9 @@ const listCustomLinksRoute = createApmServerRoute({
     >;
   }> => {
     const { context, params } = resources;
-    if (!isActiveGoldLicense(context.licensing.license)) {
+    const licensingContext = await context.licensing;
+
+    if (!isActiveGoldLicense(licensingContext.license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
     const setup = await setupRequest(resources);
@@ -76,14 +78,16 @@ const createCustomLinkRoute = createApmServerRoute({
   options: { tags: ['access:apm', 'access:apm_write'] },
   handler: async (resources): Promise<void> => {
     const { context, params } = resources;
-    if (!isActiveGoldLicense(context.licensing.license)) {
+    const licensingContext = await context.licensing;
+
+    if (!isActiveGoldLicense(licensingContext.license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
     const setup = await setupRequest(resources);
     const customLink = params.body;
 
     notifyFeatureUsage({
-      licensingPlugin: context.licensing,
+      licensingPlugin: licensingContext,
       featureName: 'customLinks',
     });
 
@@ -104,8 +108,9 @@ const updateCustomLinkRoute = createApmServerRoute({
   },
   handler: async (resources): Promise<void> => {
     const { params, context } = resources;
+    const licensingContext = await context.licensing;
 
-    if (!isActiveGoldLicense(context.licensing.license)) {
+    if (!isActiveGoldLicense(licensingContext.license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
     const setup = await setupRequest(resources);
@@ -133,8 +138,9 @@ const deleteCustomLinkRoute = createApmServerRoute({
   },
   handler: async (resources): Promise<{ result: string }> => {
     const { context, params } = resources;
+    const licensingContext = await context.licensing;
 
-    if (!isActiveGoldLicense(context.licensing.license)) {
+    if (!isActiveGoldLicense(licensingContext.license)) {
       throw Boom.forbidden(INVALID_LICENSE);
     }
     const setup = await setupRequest(resources);
diff --git a/x-pack/plugins/apm/server/routes/source_maps/route.ts b/x-pack/plugins/apm/server/routes/source_maps/route.ts
index 6e172e8ed3663..738192377beb0 100644
--- a/x-pack/plugins/apm/server/routes/source_maps/route.ts
+++ b/x-pack/plugins/apm/server/routes/source_maps/route.ts
@@ -6,8 +6,9 @@
  */
 import Boom from '@hapi/boom';
 import * as t from 'io-ts';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { jsonRt } from '@kbn/io-ts-utils';
+import { Artifact } from '@kbn/fleet-plugin/server';
 import {
   createApmArtifact,
   deleteApmArtifact,
@@ -19,7 +20,6 @@ import {
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { stringFromBufferRt } from '../../utils/string_from_buffer_rt';
-import { Artifact } from '../../../../fleet/server';
 
 export const sourceMapRt = t.intersection([
   t.type({
diff --git a/x-pack/plugins/apm/server/routes/suggestions/route.ts b/x-pack/plugins/apm/server/routes/suggestions/route.ts
index 5db74e64c9a2e..b49204cd86fc6 100644
--- a/x-pack/plugins/apm/server/routes/suggestions/route.ts
+++ b/x-pack/plugins/apm/server/routes/suggestions/route.ts
@@ -6,8 +6,8 @@
  */
 
 import * as t from 'io-ts';
-import { maxSuggestions } from '../../../../observability/common';
-import { getSuggestions } from '../suggestions/get_suggestions';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
+import { getSuggestions } from './get_suggestions';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
@@ -27,7 +27,8 @@ const suggestionsRoute = createApmServerRoute({
       config: setup.config,
       kuery: '',
     });
-    const size = await context.core.uiSettings.client.get<number>(
+    const coreContext = await context.core;
+    const size = await coreContext.uiSettings.client.get<number>(
       maxSuggestions
     );
     const suggestions = await getSuggestions({
diff --git a/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts b/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts
index 7b0bb729324d7..f6903eba7476c 100644
--- a/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts
+++ b/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts
@@ -7,6 +7,11 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { sortBy } from 'lodash';
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { Setup } from '../../lib/helpers/setup_request';
@@ -14,11 +19,6 @@ import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { calculateImpactBuilder } from './calculate_impact_builder';
 import { calculateThroughputWithRange } from '../../lib/helpers/calculate_throughput';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../observability/server';
 import {
   getDurationFieldForTransactions,
   getDocumentTypeFilterForTransactions,
@@ -41,6 +41,7 @@ export type BucketKey = Record<
 interface TopTracesParams {
   environment: string;
   kuery: string;
+  probability: number;
   transactionName?: string;
   searchAggregatedTransactions: boolean;
   start: number;
@@ -50,6 +51,7 @@ interface TopTracesParams {
 export function getTopTracesPrimaryStats({
   environment,
   kuery,
+  probability,
   transactionName,
   searchAggregatedTransactions,
   start,
@@ -101,47 +103,52 @@ export function getTopTracesPrimaryStats({
             },
           },
           aggs: {
-            transaction_groups: {
-              composite: {
-                sources: asMutableArray([
-                  { [SERVICE_NAME]: { terms: { field: SERVICE_NAME } } },
-                  {
-                    [TRANSACTION_NAME]: {
-                      terms: { field: TRANSACTION_NAME },
-                    },
-                  },
-                ] as const),
-                // traces overview is hardcoded to 10000
-                size: 10000,
-              },
+            sample: {
+              random_sampler: { probability },
               aggs: {
-                transaction_type: {
-                  top_metrics: {
-                    sort: {
-                      '@timestamp': 'desc' as const,
-                    },
-                    metrics: [
-                      {
-                        field: TRANSACTION_TYPE,
-                      } as const,
+                transaction_groups: {
+                  composite: {
+                    sources: asMutableArray([
+                      { [SERVICE_NAME]: { terms: { field: SERVICE_NAME } } },
                       {
-                        field: AGENT_NAME,
-                      } as const,
-                    ],
-                  },
-                },
-                avg: {
-                  avg: {
-                    field: getDurationFieldForTransactions(
-                      searchAggregatedTransactions
-                    ),
+                        [TRANSACTION_NAME]: {
+                          terms: { field: TRANSACTION_NAME },
+                        },
+                      },
+                    ] as const),
+                    // traces overview is hardcoded to 10000
+                    size: 10000,
                   },
-                },
-                sum: {
-                  sum: {
-                    field: getDurationFieldForTransactions(
-                      searchAggregatedTransactions
-                    ),
+                  aggs: {
+                    transaction_type: {
+                      top_metrics: {
+                        sort: {
+                          '@timestamp': 'desc' as const,
+                        },
+                        metrics: [
+                          {
+                            field: TRANSACTION_TYPE,
+                          } as const,
+                          {
+                            field: AGENT_NAME,
+                          } as const,
+                        ],
+                      },
+                    },
+                    avg: {
+                      avg: {
+                        field: getDurationFieldForTransactions(
+                          searchAggregatedTransactions
+                        ),
+                      },
+                    },
+                    sum: {
+                      sum: {
+                        field: getDurationFieldForTransactions(
+                          searchAggregatedTransactions
+                        ),
+                      },
+                    },
                   },
                 },
               },
@@ -152,12 +159,12 @@ export function getTopTracesPrimaryStats({
     );
 
     const calculateImpact = calculateImpactBuilder(
-      response.aggregations?.transaction_groups.buckets.map(
+      response.aggregations?.sample.transaction_groups.buckets.map(
         ({ sum }) => sum.value
       )
     );
 
-    const items = response.aggregations?.transaction_groups.buckets.map(
+    const items = response.aggregations?.sample.transaction_groups.buckets.map(
       (bucket) => {
         return {
           key: bucket.key as BucketKey,
diff --git a/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts b/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts
index 43da43ca10601..d754c2d53b71f 100644
--- a/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts
+++ b/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts
@@ -9,6 +9,7 @@ import {
   QueryDslQueryContainer,
   Sort,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   TRACE_ID,
@@ -17,7 +18,6 @@ import {
   PARENT_ID,
   ERROR_LOG_LEVEL,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 
 export async function getTraceItems(
diff --git a/x-pack/plugins/apm/server/routes/traces/route.ts b/x-pack/plugins/apm/server/routes/traces/route.ts
index 05aa27f27196d..c767a4e67aa63 100644
--- a/x-pack/plugins/apm/server/routes/traces/route.ts
+++ b/x-pack/plugins/apm/server/routes/traces/route.ts
@@ -10,7 +10,12 @@ import { setupRequest } from '../../lib/helpers/setup_request';
 import { getTraceItems } from './get_trace_items';
 import { getTopTracesPrimaryStats } from './get_top_traces_primary_stats';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
-import { environmentRt, kueryRt, rangeRt } from '../default_api_types';
+import {
+  environmentRt,
+  kueryRt,
+  probabilityRt,
+  rangeRt,
+} from '../default_api_types';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
 import { getRootTransactionByTraceId } from '../transactions/get_transaction_by_trace';
 import { getTransaction } from '../transactions/get_transaction';
@@ -18,7 +23,7 @@ import { getTransaction } from '../transactions/get_transaction';
 const tracesRoute = createApmServerRoute({
   endpoint: 'GET /internal/apm/traces',
   params: t.type({
-    query: t.intersection([environmentRt, kueryRt, rangeRt]),
+    query: t.intersection([environmentRt, kueryRt, rangeRt, probabilityRt]),
   }),
   options: { tags: ['access:apm'] },
   handler: async (
@@ -37,7 +42,7 @@ const tracesRoute = createApmServerRoute({
   }> => {
     const setup = await setupRequest(resources);
     const { params } = resources;
-    const { environment, kuery, start, end } = params.query;
+    const { environment, kuery, start, end, probability } = params.query;
     const searchAggregatedTransactions = await getSearchAggregatedTransactions({
       ...setup,
       kuery,
@@ -48,6 +53,7 @@ const tracesRoute = createApmServerRoute({
     return await getTopTracesPrimaryStats({
       environment,
       kuery,
+      probability,
       setup,
       searchAggregatedTransactions,
       start,
diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts
index 1d2602dcafc75..41d4c60fd72b4 100644
--- a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts
@@ -11,7 +11,7 @@ import noDataResponse from './mock_responses/no_data.json';
 import dataResponse from './mock_responses/data.json';
 import { APMConfig } from '../../..';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
-import { ApmIndicesConfig } from '../../../routes/settings/apm_indices/get_apm_indices';
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
 
 const mockIndices: ApmIndicesConfig = {
   sourcemap: 'myIndex',
diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts
index 9c229a005b355..122a56e28ed61 100644
--- a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts
@@ -6,6 +6,7 @@
  */
 
 import { flatten, orderBy, last } from 'lodash';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { asPercent } from '../../../../common/utils/formatters';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
@@ -17,7 +18,6 @@ import {
   TRANSACTION_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../../lib/helpers/setup_request';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getMetricsDateHistogramParams } from '../../../lib/helpers/metrics';
 import { MAX_KPIS } from './constants';
diff --git a/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts b/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts
index cb8289200959e..82da75e560431 100644
--- a/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts
@@ -5,6 +5,11 @@
  * 2.0.
  */
 
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_NAME,
@@ -12,11 +17,6 @@ import {
 } from '../../../../common/elasticsearch_fieldnames';
 import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
 import { offsetPreviousPeriodCoordinates } from '../../../../common/utils/offset_previous_period_coordinate';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts b/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts
index 0522fb3a1899d..efbab5bf030f7 100644
--- a/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   TRACE_ID,
   TRANSACTION_ID,
 } from '../../../../common/elasticsearch_fieldnames';
-import { rangeQuery, termQuery } from '../../../../../observability/server';
 import { Setup } from '../../../lib/helpers/setup_request';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
diff --git a/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts b/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts
index d4ceafd9f6306..40ce7fbcbf047 100644
--- a/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { withApmSpan } from '../../../../utils/with_apm_span';
 import {
   SERVICE_NAME,
@@ -15,7 +16,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../../common/processor_event';
-import { rangeQuery, kqlQuery } from '../../../../../../observability/server';
 import { environmentQuery } from '../../../../../common/utils/environment_query';
 import { Setup } from '../../../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index b9c74068b3788..9764b427ee7d7 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -7,28 +7,28 @@
 
 import {
   CoreSetup,
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   Logger,
   KibanaRequest,
   CoreStart,
-} from 'src/core/server';
-import { IRuleDataClient } from '../../../rule_registry/server';
-import { AlertingApiRequestHandlerContext } from '../../../alerting/server';
-import type { RacApiRequestHandlerContext } from '../../../rule_registry/server';
-import { LicensingApiRequestHandlerContext } from '../../../licensing/server';
+} from '@kbn/core/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { RacApiRequestHandlerContext } from '@kbn/rule-registry-plugin/server';
+import { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { APMConfig } from '..';
 import {
   APMPluginSetupDependencies,
   APMPluginStartDependencies,
 } from '../types';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
 import { UxUIFilters } from '../../common/ux_ui_filter';
 
-export interface ApmPluginRequestHandlerContext extends RequestHandlerContext {
+export type ApmPluginRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
   alerting: AlertingApiRequestHandlerContext;
   rac: RacApiRequestHandlerContext;
-}
+}>;
 
 export interface APMRouteCreateOptions {
   options: {
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
index fe6650fb356ff..19c90f41461c2 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { updateApmOssIndexPaths } from './migrations/update_apm_oss_index_paths';
 
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts b/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts
index 84c52e85c4397..4515903d306f8 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE } from '../../common/apm_saved_object_constants';
 
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts b/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts
index 114386d630c97..3a3c866aa942b 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { APM_SERVICE_GROUP_SAVED_OBJECT_TYPE } from '../../common/service_groups';
 
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts b/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts
index e8eacd4e36f63..102944d95d7f6 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { APM_TELEMETRY_SAVED_OBJECT_ID } from '../../common/apm_saved_object_constants';
 
 export const apmTelemetry: SavedObjectsType = {
diff --git a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts
index 71488ab007c67..4f794d48c3056 100644
--- a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts
+++ b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { CoreStart, Logger } from 'src/core/server';
+import type { CoreStart, Logger } from '@kbn/core/server';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts
index 3f97191a5b88a..8098318ce61e6 100644
--- a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts
+++ b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts
@@ -8,8 +8,8 @@ import type {
   CoreStart,
   Logger,
   ISavedObjectsRepository,
-} from 'src/core/server';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
index 654c0e675a053..ed486842bbf3a 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -10,8 +10,9 @@ import {
   INSTRUCTION_VARIANT,
   TutorialSchema,
   InstructionSetSchema,
-} from '../../../../../../src/plugins/home/server';
+} from '@kbn/home-plugin/server';
 
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   createNodeAgentInstructions,
   createDjangoAgentInstructions,
@@ -24,7 +25,6 @@ import {
   createDotNetAgentInstructions,
   createPhpAgentInstructions,
 } from '../../../common/tutorial/instructions/apm_agent_instructions';
-import { CloudSetup } from '../../../../cloud/server';
 import { APMConfig } from '../..';
 import { getOnPremApmServerInstructionSet } from './on_prem_apm_server_instruction_set';
 
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
index ff0a9953bcbed..a89365b1b56da 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APMConfig } from '../..';
 import {
   INSTRUCTION_VARIANT,
   InstructionsSchema,
-} from '../../../../../../src/plugins/home/server';
+} from '@kbn/home-plugin/server';
+import { APMConfig } from '../..';
 import {
   createDjangoAgentInstructions,
   createDotNetAgentInstructions,
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts
index 8c327a62f0d8e..d9731988f0fea 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APMConfig } from '../..';
 import {
   InstructionsSchema,
   INSTRUCTION_VARIANT,
-} from '../../../../../../src/plugins/home/server';
+} from '@kbn/home-plugin/server';
+import { APMConfig } from '../..';
 import {
   createDownloadServerDeb,
   createDownloadServerOsx,
diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/apm/server/tutorial/index.ts
index cae2f1fcfaa68..682d1979e12c7 100644
--- a/x-pack/plugins/apm/server/tutorial/index.ts
+++ b/x-pack/plugins/apm/server/tutorial/index.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APMConfig } from '..';
 import {
   ArtifactsSchema,
   TutorialsCategory,
   TutorialSchema,
-} from '../../../../../src/plugins/home/server';
-import { CloudSetup } from '../../../cloud/server';
+} from '@kbn/home-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { APMConfig } from '..';
 import { APM_STATIC_INDEX_PATTERN_ID } from '../../common/index_pattern_constants';
 import { getApmDataViewAttributes } from '../routes/data_view/get_apm_data_view_attributes';
 import { getApmDataViewTitle } from '../routes/data_view/get_apm_data_view_title';
diff --git a/x-pack/plugins/apm/server/types.ts b/x-pack/plugins/apm/server/types.ts
index 0044a5abe8176..d375886728748 100644
--- a/x-pack/plugins/apm/server/types.ts
+++ b/x-pack/plugins/apm/server/types.ts
@@ -6,46 +6,49 @@
  */
 
 import { Observable } from 'rxjs';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   RuleRegistryPluginSetupContract,
   RuleRegistryPluginStartContract,
-} from '../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/data-plugin/server';
+import {
+  SpacesPluginSetup,
+  SpacesPluginStart,
+} from '@kbn/spaces-plugin/server';
 import {
   HomeServerPluginSetup,
   HomeServerPluginStart,
-} from '../../../../src/plugins/home/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { ActionsPlugin } from '../../actions/server';
-import { AlertingPlugin } from '../../alerting/server';
-import { CloudSetup } from '../../cloud/server';
+} from '@kbn/home-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { ActionsPlugin } from '@kbn/actions-plugin/server';
+import { AlertingPlugin } from '@kbn/alerting-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../features/server';
+} from '@kbn/features-plugin/server';
 import {
   LicensingPluginSetup,
   LicensingPluginStart,
-} from '../../licensing/server';
-import { MlPluginSetup, MlPluginStart } from '../../ml/server';
-import { ObservabilityPluginSetup } from '../../observability/server';
+} from '@kbn/licensing-plugin/server';
+import { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/server';
+import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';
 import {
   SecurityPluginSetup,
   SecurityPluginStart,
-} from '../../security/server';
+} from '@kbn/security-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import {
   FleetSetupContract as FleetPluginSetup,
   FleetStartContract as FleetPluginStart,
-} from '../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import { APMConfig } from '.';
 import { ApmIndicesConfig } from './routes/settings/apm_indices/get_apm_indices';
 import { APMEventClient } from './lib/helpers/create_es_client/create_apm_event_client';
diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx
index c0abf3a69623e..e16c20b566def 100644
--- a/x-pack/plugins/apm/server/utils/test_helpers.tsx
+++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { APMConfig } from '../';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { APMConfig } from '..';
 import { ApmIndicesConfig } from '../routes/settings/apm_indices/get_apm_indices';
 import { UxUIFilters } from '../../common/ux_ui_filter';
 
diff --git a/x-pack/plugins/apm/typings/common.d.ts b/x-pack/plugins/apm/typings/common.d.ts
index 046e3d012b42b..d265c7b8410f1 100644
--- a/x-pack/plugins/apm/typings/common.d.ts
+++ b/x-pack/plugins/apm/typings/common.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import '../../infra/types/eui';
+import '@kbn/infra-plugin/types/eui';
 import './apm_rum_react';
 
 // Allow unknown properties in an object
diff --git a/x-pack/plugins/apm/typings/timeseries.ts b/x-pack/plugins/apm/typings/timeseries.ts
index c48c3507b77fc..b675873fc1d3c 100644
--- a/x-pack/plugins/apm/typings/timeseries.ts
+++ b/x-pack/plugins/apm/typings/timeseries.ts
@@ -15,7 +15,7 @@ import {
   SeriesColorAccessorFn,
   SeriesColorsArray,
 } from '@elastic/charts';
-import { Maybe } from '../typings/common';
+import { Maybe } from './common';
 
 export interface Coordinate {
   x: number;
diff --git a/x-pack/plugins/banners/public/components/banner.tsx b/x-pack/plugins/banners/public/components/banner.tsx
index 5a1e20621f3d4..e89206ca5a61e 100644
--- a/x-pack/plugins/banners/public/components/banner.tsx
+++ b/x-pack/plugins/banners/public/components/banner.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import { Markdown } from '../../../../../src/plugins/kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { BannerConfiguration } from '../../common';
 
 import './banner.scss';
diff --git a/x-pack/plugins/banners/public/get_banner_info.test.ts b/x-pack/plugins/banners/public/get_banner_info.test.ts
index cfb9bc26db47b..86a87d64df435 100644
--- a/x-pack/plugins/banners/public/get_banner_info.test.ts
+++ b/x-pack/plugins/banners/public/get_banner_info.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getBannerInfo } from './get_banner_info';
 
 describe('getBannerInfo', () => {
diff --git a/x-pack/plugins/banners/public/get_banner_info.ts b/x-pack/plugins/banners/public/get_banner_info.ts
index 56b32b26bef7c..d1617b9f44ee8 100644
--- a/x-pack/plugins/banners/public/get_banner_info.ts
+++ b/x-pack/plugins/banners/public/get_banner_info.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { BannerInfoResponse } from '../common';
 
 export const getBannerInfo = async (http: HttpStart): Promise<BannerInfoResponse> => {
diff --git a/x-pack/plugins/banners/public/index.ts b/x-pack/plugins/banners/public/index.ts
index d38a4d4785e09..94e782604a227 100644
--- a/x-pack/plugins/banners/public/index.ts
+++ b/x-pack/plugins/banners/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { BannersPlugin } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, {}, {}> = (contextInitializer) =>
diff --git a/x-pack/plugins/banners/public/plugin.test.tsx b/x-pack/plugins/banners/public/plugin.test.tsx
index 057b4110f20a1..78079b8f42fbd 100644
--- a/x-pack/plugins/banners/public/plugin.test.tsx
+++ b/x-pack/plugins/banners/public/plugin.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { getBannerInfoMock } from './plugin.test.mocks';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { screenshotModePluginMock } from '../../../../src/plugins/screenshot_mode/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 import { BannerConfiguration } from '../common/types';
 import { BannersPlugin } from './plugin';
 
diff --git a/x-pack/plugins/banners/public/plugin.tsx b/x-pack/plugins/banners/public/plugin.tsx
index 79aeb15387963..a8ea40f86ad24 100644
--- a/x-pack/plugins/banners/public/plugin.tsx
+++ b/x-pack/plugins/banners/public/plugin.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Banner } from './components';
 import { getBannerInfo } from './get_banner_info';
 import { BannerPluginStartDependencies } from './types';
diff --git a/x-pack/plugins/banners/public/types.ts b/x-pack/plugins/banners/public/types.ts
index b0d6cf788977c..b7c891e725680 100644
--- a/x-pack/plugins/banners/public/types.ts
+++ b/x-pack/plugins/banners/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ScreenshotModePluginStart } from '../../../../src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
 
 export interface BannerPluginStartDependencies {
   screenshotMode: ScreenshotModePluginStart;
diff --git a/x-pack/plugins/banners/server/config.ts b/x-pack/plugins/banners/server/config.ts
index cc0e18c32e310..03aa54b455e81 100644
--- a/x-pack/plugins/banners/server/config.ts
+++ b/x-pack/plugins/banners/server/config.ts
@@ -7,7 +7,7 @@
 
 // import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { isHexColor } from './utils';
 
 const configSchema = schema.object({
diff --git a/x-pack/plugins/banners/server/index.ts b/x-pack/plugins/banners/server/index.ts
index 2036eda7e6502..053de8b5c12b2 100644
--- a/x-pack/plugins/banners/server/index.ts
+++ b/x-pack/plugins/banners/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { BannersPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/banners/server/plugin.test.ts b/x-pack/plugins/banners/server/plugin.test.ts
index b3f8c7be696cd..6b0d7a7d35f70 100644
--- a/x-pack/plugins/banners/server/plugin.test.ts
+++ b/x-pack/plugins/banners/server/plugin.test.ts
@@ -7,7 +7,7 @@
 
 import { registerRoutesMock, registerSettingsMock } from './plugin.test.mocks';
 
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { BannersPlugin } from './plugin';
 import { BannersConfigType } from './config';
 
diff --git a/x-pack/plugins/banners/server/plugin.ts b/x-pack/plugins/banners/server/plugin.ts
index 852ba135c478b..ab7a11c5d40f8 100644
--- a/x-pack/plugins/banners/server/plugin.ts
+++ b/x-pack/plugins/banners/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { BannersConfigType } from './config';
 import { BannersRequestHandlerContext } from './types';
 import { registerRoutes } from './routes';
diff --git a/x-pack/plugins/banners/server/routes/info.ts b/x-pack/plugins/banners/server/routes/info.ts
index 806c4a7ae6b39..17d60cdbc532f 100644
--- a/x-pack/plugins/banners/server/routes/info.ts
+++ b/x-pack/plugins/banners/server/routes/info.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
-import { ILicense } from '../../../licensing/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { BannersConfigType } from '../config';
 import { BannerInfoResponse, BannerConfiguration, BannerPlacement } from '../../common';
 import { BannersRouter } from '../types';
@@ -21,11 +21,11 @@ export const registerInfoRoute = (router: BannersRouter, config: BannersConfigTy
       },
     },
     async (ctx, req, res) => {
-      const allowed = isValidLicense(ctx.licensing.license);
+      const allowed = isValidLicense((await ctx.licensing).license);
 
       const bannerConfig =
         req.auth.isAuthenticated && config.disableSpaceBanners === false
-          ? await getBannerConfig(ctx.core.uiSettings.client)
+          ? await getBannerConfig((await ctx.core).uiSettings.client)
           : config;
 
       return res.ok({
diff --git a/x-pack/plugins/banners/server/types.ts b/x-pack/plugins/banners/server/types.ts
index 96f7224e62c22..992a182378d63 100644
--- a/x-pack/plugins/banners/server/types.ts
+++ b/x-pack/plugins/banners/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { RequestHandlerContext, IRouter } from 'src/core/server';
-import { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import { CustomRequestHandlerContext, IRouter } from '@kbn/core/server';
+import { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
-export interface BannersRequestHandlerContext extends RequestHandlerContext {
+export type BannersRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
-}
+}>;
 
 export type BannersRouter = IRouter<BannersRequestHandlerContext>;
diff --git a/x-pack/plugins/banners/server/ui_settings.test.ts b/x-pack/plugins/banners/server/ui_settings.test.ts
index 9fae019774336..f83ef6f4bba59 100644
--- a/x-pack/plugins/banners/server/ui_settings.test.ts
+++ b/x-pack/plugins/banners/server/ui_settings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { uiSettingsServiceMock } from '../../../../src/core/server/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/server/mocks';
 import { BannersConfigType } from './config';
 import { registerSettings } from './ui_settings';
 
diff --git a/x-pack/plugins/banners/server/ui_settings.ts b/x-pack/plugins/banners/server/ui_settings.ts
index d35ab76c41a58..7d6f12589d164 100644
--- a/x-pack/plugins/banners/server/ui_settings.ts
+++ b/x-pack/plugins/banners/server/ui_settings.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { UiSettingsServiceSetup } from 'src/core/server';
+import { UiSettingsServiceSetup } from '@kbn/core/server';
 import { BannersConfigType } from './config';
 import { isHexColor } from './utils';
 
diff --git a/x-pack/plugins/canvas/__fixtures__/function_specs.ts b/x-pack/plugins/canvas/__fixtures__/function_specs.ts
index a307d420e888a..62f8445e74a0d 100644
--- a/x-pack/plugins/canvas/__fixtures__/function_specs.ts
+++ b/x-pack/plugins/canvas/__fixtures__/function_specs.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { functions as browserFns } from '../canvas_plugin_src/functions/browser';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
+import { functionSpecs as shapeFunctionSpecs } from '@kbn/expression-shape-plugin/__fixtures__';
+import { functionSpecs as imageFunctionSpecs } from '@kbn/expression-image-plugin/__fixtures__';
+import { functionSpecs as metricFunctionSpecs } from '@kbn/expression-metric-plugin/__fixtures__';
 import { initFunctions } from '../public/functions';
-import { functionSpecs as shapeFunctionSpecs } from '../../../../src/plugins/expression_shape/__fixtures__';
-import { functionSpecs as imageFunctionSpecs } from '../../../../src/plugins/expression_image/__fixtures__';
-import { functionSpecs as metricFunctionSpecs } from '../../../../src/plugins/expression_metric/__fixtures__';
+import { functions as browserFns } from '../canvas_plugin_src/functions/browser';
 
 export const functionSpecs = browserFns
   .concat(...(initFunctions({} as any) as any))
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts
index aa18e235f5fd9..60b46474f2912 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { openSans } from '../../../common/lib/fonts';
 import { ElementFactory } from '../../../types';
 import { SetupInitializer } from '../../plugin';
-import { FORMATS_UI_SETTINGS } from '../../../../../../src/plugins/field_formats/common';
 
 export const metricElementInitializer: SetupInitializer<ElementFactory> = (core, setup) => {
   return () => ({
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
index 1f447c7ed834e..6c7a14a2b070a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionTypeDefinition } from '../../../../../src/plugins/expressions';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin';
 import { EmbeddableInput } from '../../types';
 import { EmbeddableTypes } from './embeddable_types';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
index 79bb75af677ae..a5d9cfef54955 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../plugins/maps/common';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../src/plugins/visualizations/common/constants';
-import { LENS_EMBEDDABLE_TYPE } from '../../../../plugins/lens/common/constants';
-import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../src/plugins/discover/common';
+import { MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/common';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '@kbn/visualizations-plugin/common/constants';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-plugin/common/constants';
+import { SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-plugin/common';
 
 export const EmbeddableTypes: {
   lens: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
index 97aa934280414..7bdb13cff93c0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
@@ -8,7 +8,7 @@
 import {
   ExpressionFunctionDefinition,
   ExpressionValueFilter,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 // @ts-expect-error untyped local
 import { buildESRequest } from '../../../common/lib/request/build_es_request';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
index 761d07499b100..f4349af6e785e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
@@ -8,7 +8,7 @@
 import {
   ExpressionFunctionDefinition,
   ExpressionValueFilter,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { lastValueFrom } from 'rxjs';
 
 // @ts-expect-error untyped local
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
index bf1d0549b6c9d..483976a98f458 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
@@ -8,7 +8,7 @@
 import {
   ExpressionFunctionDefinition,
   ExpressionValueFilter,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { lastValueFrom } from 'rxjs';
 import { searchService } from '../../../public/services';
 import { ESSQL_SEARCH_STRATEGY } from '../../../common/lib/constants';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js
index 823ee074a9ddc..89e975bd1a9fe 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  functionWrapper,
-  fontStyle,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from '../common/__fixtures__/test_tables';
 import { markdown } from './markdown';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
index e11396619f270..78f2b25a9c686 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
@@ -10,7 +10,7 @@ import {
   Render,
   Style,
   ExpressionFunctionDefinition,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Context = Datatable | null;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
index 9d56278e2c324..49e7fddb3d4c3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js
index 9e6729d38259f..125affb217f5b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getElasticLogo } from '../../../../../../../src/plugins/presentation_util/common/lib';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
 
 export const fontStyle = {
   type: 'style',
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js
index 7d983e02f1123..e08b07f106bc4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { all } from './all';
 
 describe('all', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts
index b95e3490cbda7..357dc29714835 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js
index d2a7cd5565ece..53e7819ff3105 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { alterColumn } from './alterColumn';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts
index 77bf11c71a35a..d4076741c11ad 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts
@@ -6,7 +6,7 @@
  */
 
 import { omit } from 'lodash';
-import { Datatable } from 'src/plugins/expressions/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { DatatableColumn, DatatableColumnType, ExpressionFunctionDefinition } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js
index b691595409c62..887e3bdd54253 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { any } from './any';
 
 describe('any', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts
index 95c76de34d870..a9ac341e15b5f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js
index fe297e00e7b35..92b276424b214 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { asFn } from './as';
 
 describe('as', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts
index fd1cc57ad4db7..876f2505c15cb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Position } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js
index 1538ee8254ec3..3b6ad9314ec69 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { axisConfig } from './axisConfig';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js
index 5bdc013eff594..3914377eaec23 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { caseFn } from './case';
 
 describe('case', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
index 89329d6982716..e4219abfc446f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
@@ -7,7 +7,7 @@
 
 import { Observable, defer, isObservable, of } from 'rxjs';
 import { map, concatMap } from 'rxjs/operators';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js
index 0834dc27d321b..c6a90c9cd30f1 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { clear } from './clear';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts
index c4fa4d74b05ea..957b698a1807f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export function clear(): ExpressionFunctionDefinition<'clear', any, {}, null> {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js
index 0184920285a6d..e8cef3d2a62af 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { columns } from './columns';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js
index c04f132a577fd..814f9403965a0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { compare } from './compare';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
index 7867220676321..fceef5f1df111 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
 export enum Operation {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
index 12aad5d609414..19d727ffa2b3f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { isValidUrl } from '@kbn/presentation-util-plugin/common/lib';
 import { ContainerStyle, Overflow, BackgroundRepeat, BackgroundSize } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
-import { isValidUrl } from '../../../../../../src/plugins/presentation_util/common/lib';
 
 interface Output extends ContainerStyle {
   type: 'containerStyle';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js
index 15c7ccdbf5ce0..5035e55e9f12e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  functionWrapper,
-  getElasticLogo,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper, getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { containerStyle } from './containerStyle';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js
index e4c45f228aa17..6182fb3e7a3a7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable, emptyTable } from './__fixtures__/test_tables';
 import { context } from './context';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts
index e8180c4c96178..a0abf6cd5bef5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export function context(): ExpressionFunctionDefinition<'context', unknown, {}, unknown> {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
index 7401bbb6aabee..06de11353edaf 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { csv } from './csv';
-import { Datatable, ExecutionContext } from 'src/plugins/expressions';
-import { Adapters } from 'src/plugins/inspector';
+import { Datatable, ExecutionContext } from '@kbn/expressions-plugin';
+import { Adapters } from '@kbn/inspector-plugin';
 
 const errors = getFunctionErrors().csv;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
index 078721fc08d05..741ed8d1c90b8 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
@@ -6,7 +6,7 @@
  */
 
 import Papa from 'papaparse';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js
index cd06ce5fbb463..e8cf389f98f71 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { date } from './date';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts
index 79ec46248f28d..ea32890754392 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js
index 00429779e2ff1..de436f95b9db7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { doFn } from './do';
 
 describe('do', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts
index 782ae707d4b70..a8390a0c7f823 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts
index b64761bb5a822..6c95160222016 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable, relationalTable } from './__fixtures__/test_tables';
 import { dropdownControl } from './dropdownControl';
-import { ExecutionContext } from 'src/plugins/expressions';
-import { Adapters } from 'src/plugins/inspector';
+import { ExecutionContext } from '@kbn/expressions-plugin';
+import { Adapters } from '@kbn/inspector-plugin';
 import { SerializableRecord } from '@kbn/utility-types';
 
 describe('dropdownControl', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js
index 5e710fc109396..4ecd61fe45199 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { eq } from './eq';
 
 describe('eq', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts
index d85b96d0ebbdb..46c752f641113 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js
index 9d3dcb6a99167..6367bb243c682 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyFilter } from './__fixtures__/test_filters';
 import { exactly } from './exactly';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js
index f81e3ae241304..ac7835caea6a4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { filterrows } from './filterrows';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js
index e725dccc8ca34..ea7063965e4b7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { formatdate } from './formatdate';
 
 describe('formatdate', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts
index ec1f3b78c1955..8d386ddbea98b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js
index e957bf115198f..9c32721f0bef3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { formatnumber } from './formatnumber';
 
 describe('formatnumber', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts
index f44bfbf630605..c4e9b46733a10 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts
@@ -6,7 +6,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js
index a556c2ddeb48a..fc8ba402a23aa 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { getCell } from './getCell';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts
index bdc3678f74a48..8b7bcff0b8822 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js
index 53675fca2b3ae..93835e6f8a5a9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { gt } from './gt';
 
 describe('gt', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts
index 651e82e938993..95aa0d58d5201 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js
index aefb2ccf926ae..a684a6caf82f9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { gte } from './gte';
 
 describe('gte', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts
index b9b024465e4f1..0f95a4012b947 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js
index 4721eaf6cb530..212955b523425 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { head } from './head';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js
index bcf42e850ce28..b3485aa155fd3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { ifFn } from './if';
 
 describe('if', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
index 82bfb87c173b0..39ed7a37f51f2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, defer, of } from 'rxjs';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js
index 94fef857983bc..ae95b602de1be 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { joinRows } from './join_rows';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js
index 1ecfca9fc2f94..19d5ffc1e1a61 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { lt } from './lt';
 
 describe('lt', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts
index c86cc03de98c6..4235ec94aa571 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Context = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js
index f32d2d23027c3..fe4de213c6998 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { lte } from './lte';
 
 describe('lte', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts
index 579df347af641..3e4cb0b35c90d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
index cf9280d38ea10..386060fe3af35 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n/functions';
 import { MapCenter } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js
index 88c7a5c18bc7a..aa3b5b21523f0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { neq } from './neq';
 
 describe('neq', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
index 180c4475dce37..351904ed95a92 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = boolean | number | string | null;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js
index 282cb2460d61c..c65157fa238c9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { ply } from './ply';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js
index 1725af3522ba3..19ad94705123a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { DEFAULT_ELEMENT_CSS } from '../../../common/lib/constants';
 import { testTable } from './__fixtures__/test_tables';
 import { fontStyle, getContainerStyle } from './__fixtures__/test_styles';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
index df5f8233d462f..63d76f3f397b9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { ExpressionValueRender, ContainerStyle } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 import { DEFAULT_ELEMENT_CSS } from '../../../common/lib/constants';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js
index 6025ff354cd8d..92a5212d8c8d5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { replace } from './replace';
 
 describe('replace', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts
index e9c0d7e4f8c2f..aacd58217168c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js
index 987096cc0d3dc..36c64c2f0774c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { rounddate } from './rounddate';
 
 describe('rounddate', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts
index cc52d58a4ba06..b33652a3ca2e8 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js
index 7a32849e9161a..7d6f4633a9314 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { rowCount } from './rowCount';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts
index 49b6d13b5a368..179bffe9bb4b1 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts
index a404ae8a5ec84..de89cbc03ee89 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 const name = 'seriesStyle';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js
index 6e91b84d82b6f..a819cd0b0de50 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { seriesStyle } from './seriesStyle';
 
 describe('seriesStyle', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js
index f59c517c91d88..fdabe478bdae4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { sort } from './sort';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts
index 7216ea670c971..f4f8f6f7a05e7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts
@@ -6,7 +6,7 @@
  */
 
 import { sortBy } from 'lodash';
-import { ExpressionFunctionDefinition, Datatable } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, Datatable } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js
index 0260c9e77c424..554c73a42c7ef 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable, emptyTable } from './__fixtures__/test_tables';
 import { staticColumn } from './staticColumn';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
index 032e7298e02f1..18c4554f6c1f3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
@@ -10,7 +10,7 @@ import {
   ExpressionFunctionDefinition,
   Datatable,
   DatatableColumnType,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js
index 48af07b7cd880..d525553706339 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { string } from './string';
 
 describe('string', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts
index faa004254d7cc..6ed9a67c57e40 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js
index d0ea8fff0a45d..1ee2061d598c7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { switchFn } from './switch';
 
 describe('switch', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
index 3e676c829a301..4f344c6141c9b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
@@ -7,7 +7,7 @@
 
 import { Observable, combineLatest, defer, of } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Case } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js
index e04b4a4cc1469..2d839a7059f2f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  functionWrapper,
-  fontStyle,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { table } from './table';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts
index 39bc8a8c84a96..c1b00d6592cb6 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable, Render, Style } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js
index 75744f91ccb57..63f51945a6152 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { tail } from './tail';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
index 1edf2a6775476..3eb4872d8fba0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n/functions';
 import { TimeRange } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js
index 38b0d1bff606e..8028df8a662a4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyFilter } from './__fixtures__/test_filters';
 import { timefilter } from './timefilter';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
index c71c3ade08369..08cfe9a4741a4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Render } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js
index b4a476807b7ee..dce41b2808334 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { timefilterControl } from './timefilterControl';
 
 describe('timefilterControl', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
index 8ec299c60dae5..2554d2efd1bc9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
@@ -6,19 +6,16 @@
  */
 
 import { mapValues } from 'lodash';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import {
   ExpressionFunctionDefinition,
   ExpressionAstFunction,
-} from 'src/plugins/expressions/common';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/expressions-plugin/common';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { ExpressionValueFilter, EmbeddableInput } from '../../../types';
 import { EmbeddableExpressionType, EmbeddableExpression } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { decode, encode } from '../../../common/lib/embeddable_dataurl';
 import { InitializeArguments } from '.';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
index 29200d938b53a..3e1f4af69c69d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EmbeddableStart } from 'src/plugins/embeddable/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import { embeddableFunctionFactory } from './embeddable';
 import { savedLens } from './saved_lens';
 import { savedMap } from './saved_map';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
index 67947691f7757..2d8dab316ede2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { PaletteOutput } from 'src/plugins/charts/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import type { PaletteOutput } from '@kbn/coloring';
 import { Filter as DataFilter } from '@kbn/es-query';
-import { TimeRange } from 'src/plugins/data/common';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter, EmbeddableInput, TimeRange as TimeRangeArg } from '../../../types';
 import {
@@ -17,7 +18,6 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 interface Arguments {
   id: string;
   title: string | null;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
index a7471c755155c..2c09f33d7e25d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { MapEmbeddableInput } from '@kbn/maps-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter, MapCenter, TimeRange as TimeRangeArg } from '../../../types';
 import {
@@ -14,8 +16,6 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { MapEmbeddableInput } from '../../../../../plugins/maps/public';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 
 interface Arguments {
   id: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
index ebe9a275c44af..8e9b7c3643098 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { SearchInput } from 'src/plugins/discover/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { SearchInput } from '@kbn/discover-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
@@ -16,7 +17,6 @@ import {
 import { buildEmbeddableFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 
 interface Arguments {
   id: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
index 4a0668740bb4b..cb88c1b9c3b15 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
@@ -6,8 +6,9 @@
  */
 
 import { omit } from 'lodash';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
-import { VisualizeInput } from 'src/plugins/visualizations/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { VisualizeInput } from '@kbn/visualizations-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
@@ -16,7 +17,6 @@ import {
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter, TimeRange as TimeRangeArg, SeriesStyle } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 
 interface Arguments {
   id: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
index 5dc1790e67d7d..81e308f27e9ec 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { sortBy } from 'lodash';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { queryDatatable } from '../../../../common/lib/datatable/query';
 import { DemoRows } from './demo_rows_types';
 import { getDemoRows } from './get_demo_rows';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts
index 8b46e818209f3..2bf5925d2b02b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts
@@ -9,7 +9,7 @@ import {
   ExpressionValueFilter,
   ExpressionAstExpression,
   ExpressionAstFunction,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 import { fromExpression } from '@kbn/interpreter';
 import { buildFiltersFunction } from '../../../common/functions';
 import type { FiltersFunction } from '../../../common/functions';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
index 38438ffb4ad66..195de0a38a581 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
@@ -8,14 +8,14 @@
 import { evaluate } from '@kbn/tinymath';
 import { groupBy, zipObject, omit, uniqBy } from 'lodash';
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import {
   Datatable,
   DatatableRow,
   PointSeries,
   PointSeriesColumnName,
   PointSeriesColumns,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { pivotObjectArray } from '../../../../common/lib/pivot_object_array';
 import { unquoteString } from '../../../../common/lib/unquote_string';
 import { isColumnReference } from './lib/is_column_reference';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts
index 80ac627747318..63db2643cced7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { parse } from '@kbn/tinymath';
-import { DatatableColumn } from 'src/plugins/expressions/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { getFieldType } from '../../../../../common/lib/get_field_type';
 import { isColumnReference } from './is_column_reference';
 import { getFieldNames } from './get_field_names';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
index 6153d20b657f5..b7f814269c020 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import { CanvasSetup } from '../public';
-import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
 
 import { functions } from './functions/browser';
 import { initFunctions } from './functions/external';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index 4c001828a6b23..8add1aa41b83e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -7,21 +7,21 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from '../../../../../../src/core/public';
-import { StartDeps } from '../../plugin';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   IEmbeddable,
   EmbeddableFactory,
   EmbeddableFactoryNotFoundError,
   isErrorEmbeddable,
-} from '../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import type { EmbeddableContainerContext } from '@kbn/embeddable-plugin/public';
+import { StartDeps } from '../../plugin';
 import { EmbeddableExpression } from '../../expression_types/embeddable';
 import { RendererStrings } from '../../../i18n';
 import { embeddableInputToExpression } from './embeddable_input_to_expression';
 import { RendererFactory, EmbeddableInput } from '../../../types';
 import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../common/lib';
-import type { EmbeddableContainerContext } from '../../../../../../src/plugins/embeddable/public/';
 
 const { embeddable: strings } = RendererStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
index a4cb737a2213e..66f69a2a0cf32 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import {
   embeddableInputToExpression,
   inputToExpressionTypeMap,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
index 80830eac24021..e57f14d3884eb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry } from '@kbn/coloring';
 import { EmbeddableTypes, EmbeddableInput } from '../../expression_types';
 import { toExpression as mapToExpression } from './input_type_to_expression/map';
 import { toExpression as visualizationToExpression } from './input_type_to_expression/visualization';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
index 9382ec20ec320..ab00a2117f7fa 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
@@ -8,7 +8,7 @@
 import { toExpression } from './lens';
 import { SavedLensInput } from '../../../functions/external/saved_lens';
 import { fromExpression, Ast } from '@kbn/interpreter';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 const baseEmbeddableInput = {
   id: 'elementId',
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
index 1d3a5eb9164b7..8f791668d75f9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
@@ -6,7 +6,7 @@
  */
 
 import { toExpression as toExpressionString } from '@kbn/interpreter';
-import { PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry } from '@kbn/coloring';
 import { SavedLensInput } from '../../../functions/external/saved_lens';
 
 export function toExpression(input: SavedLensInput, palettes: PaletteRegistry): string {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
index 03746f38b4696..c716a048edda0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MapEmbeddableInput } from '../../../../../../plugins/maps/public';
+import { MapEmbeddableInput } from '@kbn/maps-plugin/public';
 
 export function toExpression(input: MapEmbeddableInput & { savedObjectId: string }): string {
   const expressionParts = [] as string[];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
index 364d7cd0755db..d7dc7b1554310 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { VisualizeInput } from 'src/plugins/visualizations/public';
+import { VisualizeInput } from '@kbn/visualizations-plugin/public';
 
 export function toExpression(input: VisualizeInput & { savedObjectId: string }): string {
   const expressionParts = [] as string[];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts
index 9b79c50a92098..cf9ee71a294b7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts
@@ -5,18 +5,12 @@
  * 2.0.
  */
 
-import { imageRendererFactory } from '../../../../../src/plugins/expression_image/public';
-import { metricRendererFactory } from '../../../../../src/plugins/expression_metric/public';
-import {
-  errorRendererFactory,
-  debugRendererFactory,
-} from '../../../../../src/plugins/expression_error/public';
-import { revealImageRendererFactory } from '../../../../../src/plugins/expression_reveal_image/public';
-import { repeatImageRendererFactory } from '../../../../../src/plugins/expression_repeat_image/public';
-import {
-  shapeRendererFactory,
-  progressRendererFactory,
-} from '../../../../../src/plugins/expression_shape/public';
+import { imageRendererFactory } from '@kbn/expression-image-plugin/public';
+import { metricRendererFactory } from '@kbn/expression-metric-plugin/public';
+import { errorRendererFactory, debugRendererFactory } from '@kbn/expression-error-plugin/public';
+import { revealImageRendererFactory } from '@kbn/expression-reveal-image-plugin/public';
+import { repeatImageRendererFactory } from '@kbn/expression-repeat-image-plugin/public';
+import { shapeRendererFactory, progressRendererFactory } from '@kbn/expression-shape-plugin/public';
 
 export const renderFunctions = [];
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
index a31021cba4c10..12e1948260a96 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { StartInitializer } from '../../../plugin';
 import { RendererFactory } from '../../../../types';
 import { AdvancedFilter } from './component';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
index 5e4ea42990e47..76323793ab698 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
@@ -9,7 +9,7 @@ import { fromExpression, toExpression, Ast } from '@kbn/interpreter';
 import { get } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';
 import { RendererFactory } from '../../../../types';
 import { StartInitializer } from '../../../plugin';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
index f7e9d333f8683..9ae72a82c8870 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
@@ -8,8 +8,8 @@
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { toExpression } from '@kbn/interpreter';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
-import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';
 import { RendererStrings } from '../../../../i18n';
 import { TimeFilter } from './components';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
index c41cdce77b1ed..db12daf4c340c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getMarkdownRenderer } from '../';
+import { getMarkdownRenderer } from '..';
 import { Render } from '../../__stories__/render';
 
 const markdown = getMarkdownRenderer();
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx
index 498e09e14b7e0..137fe31f9b667 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx
@@ -7,14 +7,14 @@
 
 import React, { CSSProperties } from 'react';
 import ReactDOM from 'react-dom';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { defaultTheme$ } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common/lib';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { StartInitializer } from '../../plugin';
 import { RendererStrings } from '../../../i18n';
 import { Return as Config } from '../../functions/browser/markdown';
-import { Markdown } from '../../../../../../src/plugins/kibana_react/public';
 import { RendererFactory } from '../../../types';
 
 const { markdown: strings } = RendererStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
index af132cc1a4b0e..4b1a6b4c776d9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { pie } from '../';
+import { pie } from '..';
 import { Render } from '../../__stories__/render';
 
 const pieOptions = {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
index 50f9c0e414754..8943517931dec 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { plot } from '../';
+import { plot } from '..';
 import { Render } from '../../__stories__/render';
 
 const plotOptions = {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx
index ec918f89321ad..f12b48194024a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx
@@ -7,10 +7,10 @@
 
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { defaultTheme$ } from '../../../../../src/plugins/presentation_util/common/lib';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common/lib';
 import { StartInitializer } from '../plugin';
 import { Datatable as DatatableComponent } from '../../public/components/datatable';
 import { RendererStrings } from '../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx
index a89c56c66ce27..a8cf9919c5036 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx
@@ -7,10 +7,10 @@
 
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { defaultTheme$ } from '../../../../../src/plugins/presentation_util/common/lib';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common/lib';
 import { StartInitializer } from '../plugin';
 import { RendererStrings } from '../../i18n';
 import { RendererFactory } from '../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
index 15f10617a654e..8534257a95868 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
@@ -9,13 +9,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiSpacer, EuiFormRow, EuiButtonGroup } from '@elastic/eui';
 import { get } from 'lodash';
-import { AssetPicker } from '../../../../public/components/asset_picker';
 import {
   encode,
   getElasticOutline,
   isValidHttpUrl,
   resolveFromArgs,
-} from '../../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { AssetPicker } from '../../../../public/components/asset_picker';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { VALID_IMAGE_TYPES } from '../../../../common/lib/constants';
 import { ArgumentStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx
index 6277f41b89fe5..3fd307b18b488 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import { Assign } from '@kbn/utility-types';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { NumberFormatArgInput, Props as ComponentProps } from './number_format';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentFactory } from '../../../../types/arguments';
 import { ArgumentStrings } from '../../../../i18n';
 import { SetupInitializer } from '../../../plugin';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../src/plugins/field_formats/common';
 
 const { NumberFormat: strings } = ArgumentStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx
index eddefb8dadd2c..609913a84ed3d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
-import { ExpressionAstExpression } from 'src/plugins/expressions';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentStrings } from '../../../../i18n';
 import { ColorPalette } from '../../../../common/lib';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts
index e701f0fcbf9f7..94457fec0c92f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { getType } from '@kbn/interpreter';
-import { ExpressionAstArgument, ExpressionAstFunction } from 'src/plugins/expressions';
+import { ExpressionAstArgument, ExpressionAstFunction } from '@kbn/expressions-plugin';
 import { identifyPalette, ColorPalette, identifyPartialPalette } from '../../../../common/lib';
 import { ArgumentStrings } from '../../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js
index 72fd42a1ff99e..4289360df8263 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js
@@ -9,7 +9,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
-import { ShapePickerPopover } from '../../../public/components/shape_picker_popover/';
+import { ShapePickerPopover } from '../../../public/components/shape_picker_popover';
 import { ArgumentStrings } from '../../../i18n';
 
 const { Shape: strings } = ArgumentStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx
index 5b9764160b11f..39c1b8bf39f21 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSelect } from '@elastic/eui';
-import { DatatableColumn, ExpressionAstExpression } from 'src/plugins/expressions';
+import { DatatableColumn, ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
 import { ArgumentStrings } from '../../../i18n';
 import { ResolvedArgProps, ResolvedColumns } from '../../../public/expression_types/arg';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
index 8321cc1026333..86731ca161177 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
@@ -9,7 +9,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { EsqlLang } from '@kbn/monaco';
 import { EuiFormRow, EuiLink, EuiText } from '@elastic/eui';
-import { CodeEditorField } from '../../../../../../src/plugins/kibana_react/public';
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import { getSimpleArg, setSimpleArg } from '../../../public/lib/arg_helpers';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
 import { DataSourceStrings, SQL_URL } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js
index c3855ad31e3f5..27172e26620ed 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  getElasticLogo,
-  resolveFromArgs,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { getElasticLogo, resolveFromArgs } from '@kbn/presentation-util-plugin/common/lib';
 import { ViewStrings } from '../../../i18n';
 
 const { Image: strings } = ViewStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts
index 775588226aa80..77f6f8d2c5517 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { openSans } from '../../../common/lib/fonts';
 import { ViewStrings } from '../../../i18n';
 import { SetupInitializer } from '../../plugin';
-import { FORMATS_UI_SETTINGS } from '../../../../../../src/plugins/field_formats/common';
 
 const { Metric: strings } = ViewStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js
index 340b770db1e6a..9ca9b1ada72bb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { getAvailableProgressShapes } from '@kbn/expression-shape-plugin/common';
 import { openSans } from '../../../common/lib/fonts';
-import { getAvailableProgressShapes } from '../../../../../../src/plugins/expression_shape/common';
 import { ViewStrings } from '../../../i18n';
 
 const { Progress: strings } = ViewStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js
index 1c84b0b27fd19..8189435df1e35 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getAvailableShapes } from '../../../../../../src/plugins/expression_shape/common';
+import { getAvailableShapes } from '@kbn/expression-shape-plugin/common';
 import { ViewStrings } from '../../../i18n';
 
 const { Shape: strings } = ViewStrings;
diff --git a/x-pack/plugins/canvas/common/functions/filters.ts b/x-pack/plugins/canvas/common/functions/filters.ts
index 86645b633f18a..f33974dd56a49 100644
--- a/x-pack/plugins/canvas/common/functions/filters.ts
+++ b/x-pack/plugins/canvas/common/functions/filters.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/public';
 import { ExpressionValueFilter } from '../../types';
 import { getFunctionHelp } from '../../i18n';
 
diff --git a/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts b/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts
index 9209eec105b23..6b8ef6e6ccdee 100644
--- a/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts
+++ b/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts
@@ -8,10 +8,10 @@
 import { buildQueryFilter, Filter } from '@kbn/es-query';
 import dateMath from '@kbn/datemath';
 import { maxBy, minBy } from 'lodash';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { ExpressionValueFilter } from '../../types';
 // @ts-expect-error untyped local
 import { buildBoolArray } from './build_bool_array';
-import { TimeRange } from '../../../../../src/plugins/data/common';
 
 export interface EmbeddableFilterInput {
   filters: Filter[];
diff --git a/x-pack/plugins/canvas/common/lib/fonts.ts b/x-pack/plugins/canvas/common/lib/fonts.ts
index dfe9529c38248..b7db14f31bacb 100644
--- a/x-pack/plugins/canvas/common/lib/fonts.ts
+++ b/x-pack/plugins/canvas/common/lib/fonts.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from '../../../../../src/plugins/expressions/common/fonts';
+export * from '@kbn/expressions-plugin/common/fonts';
diff --git a/x-pack/plugins/canvas/common/locator.ts b/x-pack/plugins/canvas/common/locator.ts
index 147e4fd860982..6fd9d4440932f 100644
--- a/x-pack/plugins/canvas/common/locator.ts
+++ b/x-pack/plugins/canvas/common/locator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 
 import { CANVAS_APP } from './lib/constants';
 
diff --git a/x-pack/plugins/canvas/i18n/elements/apply_strings.ts b/x-pack/plugins/canvas/i18n/elements/apply_strings.ts
index 82c1fba0a38f4..20555950331e7 100644
--- a/x-pack/plugins/canvas/i18n/elements/apply_strings.ts
+++ b/x-pack/plugins/canvas/i18n/elements/apply_strings.ts
@@ -6,7 +6,7 @@
  */
 
 import { ElementFactory } from '../../types';
-import { getElementStrings } from './index';
+import { getElementStrings } from '.';
 
 /**
  * This function takes a set of Canvas Element specification factories, runs them,
diff --git a/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts b/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts
index 6589bf36cbec5..9e237789eb946 100644
--- a/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts
+++ b/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts
@@ -7,7 +7,7 @@
 
 import { getElementStrings } from './element_strings';
 import { initializeElementsSpec } from '../../canvas_plugin_src/elements';
-import { coreMock } from '../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const elementSpecs = initializeElementsSpec(coreMock.createSetup() as any, {} as any);
 
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
index 6d3ac403050c3..99d607e05b03c 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { mapCenter } from '../../../canvas_plugin_src/functions/common/map_center';
-import { FunctionHelp } from '../';
+import { FunctionHelp } from '..';
 import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof mapCenter>> = {
diff --git a/x-pack/plugins/canvas/i18n/functions/function_help.ts b/x-pack/plugins/canvas/i18n/functions/function_help.ts
index 520d32af1c272..0c7498b96b984 100644
--- a/x-pack/plugins/canvas/i18n/functions/function_help.ts
+++ b/x-pack/plugins/canvas/i18n/functions/function_help.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { UnionToIntersection } from '@kbn/utility-types';
 import { CanvasFunction, FunctionFactory } from '../../types';
 
diff --git a/x-pack/plugins/canvas/i18n/templates/apply_strings.ts b/x-pack/plugins/canvas/i18n/templates/apply_strings.ts
index 4473dce71e5e7..977f0ae008c2c 100644
--- a/x-pack/plugins/canvas/i18n/templates/apply_strings.ts
+++ b/x-pack/plugins/canvas/i18n/templates/apply_strings.ts
@@ -8,7 +8,7 @@
 import { CanvasTemplate } from '../../types';
 import { getTemplateStrings } from './template_strings';
 
-import { TagStrings } from '../../i18n';
+import { TagStrings } from '..';
 
 /**
  * This function takes a set of Canvas  templates
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index a00dd94ce346c..48f4d9a6b0d58 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -32,7 +32,6 @@
   "optionalPlugins": ["home", "reporting", "spaces", "usageCollection"],
   "requiredBundles": [
     "discover",
-    "home",
     "kibanaReact",
     "kibanaUtils",
     "lens",
diff --git a/x-pack/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx
index e1aaa2bbeb993..e0658f471f860 100644
--- a/x-pack/plugins/canvas/public/application.tsx
+++ b/x-pack/plugins/canvas/public/application.tsx
@@ -15,13 +15,10 @@ import { BehaviorSubject } from 'rxjs';
 
 import { includes, remove } from 'lodash';
 
-import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from 'kibana/public';
+import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from '@kbn/core/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
-import { PluginServices } from '../../../../src/plugins/presentation_util/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps, CanvasSetupDeps } from './plugin';
 import { App } from './components/app';
diff --git a/x-pack/plugins/canvas/public/components/app/index.tsx b/x-pack/plugins/canvas/public/components/app/index.tsx
index 0cb229608086c..d9a8b5fa54695 100644
--- a/x-pack/plugins/canvas/public/components/app/index.tsx
+++ b/x-pack/plugins/canvas/public/components/app/index.tsx
@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
 import { History } from 'history';
 // @ts-expect-error
 import createHashStateHistory from 'history-extra/dist/createHashStateHistory';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { skipWhile, timeout, take } from 'rxjs/operators';
 import { useNavLinkService } from '../../services';
 // @ts-expect-error
diff --git a/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx
index 952c4fa66e9d0..58e89af71b856 100644
--- a/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx
+++ b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx
@@ -9,7 +9,7 @@ import React, { useState, useEffect, useCallback, useRef, memo, ReactPortal } fr
 import deepEqual from 'react-fast-compare';
 import usePrevious from 'react-use/lib/usePrevious';
 import useEffectOnce from 'react-use/lib/useEffectOnce';
-import { ExpressionAstExpression, ExpressionValue } from 'src/plugins/expressions';
+import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin';
 import { ExpressionFormHandlers } from '../../../common/lib/expression_form_handlers';
 import { UpdatePropsRef } from '../../../types/arguments';
 
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx
index 0dc698c4bd2eb..48cb570c4d7f7 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx
@@ -9,7 +9,7 @@ import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { reduxDecorator, getAddonPanelParameters } from '../../../../storybook';
-import { Asset, AssetComponent } from '../';
+import { Asset, AssetComponent } from '..';
 import { AIRPLANE, MARKER, assets } from './assets';
 
 storiesOf('components/Assets/Asset', module)
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx
index f27c1f8f078c4..5e0e3116e5e4f 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx
@@ -10,7 +10,7 @@ import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import { reduxDecorator, getAddonPanelParameters } from '../../../../storybook';
 
-import { AssetManager, AssetManagerComponent } from '../';
+import { AssetManager, AssetManagerComponent } from '..';
 import { assets } from './assets';
 
 storiesOf('components/Assets/AssetManager', module)
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts
index 6c658f728e73c..6475202bacf30 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts
+++ b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts
@@ -8,10 +8,10 @@
 import { Dispatch } from 'redux';
 import { connect } from 'react-redux';
 import { get } from 'lodash';
+import { encode } from '@kbn/presentation-util-plugin/public';
 // @ts-expect-error untyped local
 import { findExistingAsset } from '../../lib/find_existing_asset';
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
-import { encode } from '../../../../../../src/plugins/presentation_util/public';
 import { getId } from '../../lib/get_id';
 // @ts-expect-error untyped local
 import { elementsRegistry } from '../../lib/elements_registry';
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx
index a072579be2e82..b1929fd8e9313 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/public';
 import { CustomElementModal } from '../custom_element_modal';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
-import { getElasticLogo } from '../../../../../../../src/plugins/presentation_util/public';
 
 storiesOf('components/Elements/CustomElementModal', module)
   .add('with title', () => (
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
index 51ffe57fe5e76..c4b77955dccd3 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
@@ -28,8 +28,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { encode } from '@kbn/presentation-util-plugin/public';
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
-import { encode } from '../../../../../../src/plugins/presentation_util/public';
 import { ElementCard } from '../element_card';
 
 const MAX_NAME_LENGTH = 40;
diff --git a/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx b/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx
index 157b612afbb23..4543236c2bd5c 100644
--- a/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx
@@ -11,8 +11,8 @@ import { EuiCallOut, EuiText } from '@elastic/eui';
 import React from 'react';
 // @ts-expect-error untyped local
 import { DatasourceComponent } from '../datasource_component';
-import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
-import { Datasource } from '../../../../public/expression_types/datasource';
+import { templateFromReactComponent } from '../../../lib/template_from_react_component';
+import { Datasource } from '../../../expression_types/datasource';
 
 const TestDatasource = ({ args }: any) => (
   <EuiCallOut title="My Test Data Source" iconType="iInCircle">
diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
index cff085f504f9d..2912911df1b50 100644
--- a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
+++ b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
@@ -19,8 +19,8 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withSuspense } from '../../../../../../../src/plugins/presentation_util/public';
-import { LazyErrorComponent } from '../../../../../../../src/plugins/expression_error/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { LazyErrorComponent } from '@kbn/expression-error-plugin/public';
 import { Datatable } from '../../datatable';
 
 const Error = withSuspense(LazyErrorComponent);
diff --git a/x-pack/plugins/canvas/public/components/download/download.tsx b/x-pack/plugins/canvas/public/components/download/download.tsx
index 89cd999481007..0a553c7172046 100644
--- a/x-pack/plugins/canvas/public/components/download/download.tsx
+++ b/x-pack/plugins/canvas/public/components/download/download.tsx
@@ -9,7 +9,7 @@ import { toByteArray } from 'base64-js';
 import fileSaver from 'file-saver';
 import PropTypes from 'prop-types';
 import React, { ReactElement } from 'react';
-import { parseDataUrl } from '../../../../../../src/plugins/presentation_util/public';
+import { parseDataUrl } from '@kbn/presentation-util-plugin/public';
 
 interface Props {
   children: ReactElement<any>;
diff --git a/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx b/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx
index 74cd86c8d17dd..8a28179eb33ba 100644
--- a/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/public';
 import { ElementCard } from '../element_card';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
-import { getElasticLogo } from '../../../../../../../src/plugins/presentation_util/public';
 
 storiesOf('components/Elements/ElementCard', module)
   .addDecorator((story) => (
diff --git a/x-pack/plugins/canvas/public/components/element_card/element_card.tsx b/x-pack/plugins/canvas/public/components/element_card/element_card.tsx
index dca778e4c06ab..30a5b17cd5e42 100644
--- a/x-pack/plugins/canvas/public/components/element_card/element_card.tsx
+++ b/x-pack/plugins/canvas/public/components/element_card/element_card.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiCard, EuiIcon } from '@elastic/eui';
-import { TagList } from '../tag_list/';
+import { TagList } from '../tag_list';
 
 export interface Props {
   /**
diff --git a/x-pack/plugins/canvas/public/components/element_content/element_content.tsx b/x-pack/plugins/canvas/public/components/element_content/element_content.tsx
index e5202f9c97aa3..0a9e935aa2320 100644
--- a/x-pack/plugins/canvas/public/components/element_content/element_content.tsx
+++ b/x-pack/plugins/canvas/public/components/element_content/element_content.tsx
@@ -10,7 +10,7 @@ import { omitBy, isNil } from 'lodash';
 // @ts-expect-error Untyped library
 import Style from 'style-it';
 
-import { ExpressionRenderer } from 'src/plugins/expressions';
+import { ExpressionRenderer } from '@kbn/expressions-plugin';
 import { getType } from '@kbn/interpreter';
 import { Loading } from '../loading';
 import { RenderWithFn } from '../render_with_fn';
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
index dc32f63c95bd8..0ac0dd279560b 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
@@ -9,10 +9,7 @@ import React, { FC, useCallback } from 'react';
 import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  SavedObjectFinderUi,
-  SavedObjectMetaData,
-} from '../../../../../../src/plugins/saved_objects/public/';
+import { SavedObjectFinderUi, SavedObjectMetaData } from '@kbn/saved-objects-plugin/public';
 import { useEmbeddablesService, usePlatformService } from '../../services';
 
 const strings = {
diff --git a/x-pack/plugins/canvas/public/components/expression/expression.tsx b/x-pack/plugins/canvas/public/components/expression/expression.tsx
index 86bb36d7cdb9c..537203cfcbf6f 100644
--- a/x-pack/plugins/canvas/public/components/expression/expression.tsx
+++ b/x-pack/plugins/canvas/public/components/expression/expression.tsx
@@ -22,11 +22,11 @@ import { i18n } from '@kbn/i18n';
 // @ts-expect-error
 import { Shortcuts } from 'react-shortcuts';
 
-import { ExpressionInputEditorRef } from 'src/plugins/presentation_util/public';
+import { ExpressionInputEditorRef } from '@kbn/presentation-util-plugin/public';
 import { ExpressionInput } from '../expression_input';
 import { ToolTipShortcut } from '../tool_tip_shortcut';
 import { ExpressionFunction } from '../../../types';
-import { FormState } from './';
+import { FormState } from '.';
 
 const strings = {
   getCancelButtonLabel: () =>
diff --git a/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx b/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx
index 803b92b2f8db2..0f8b14ff52277 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx
@@ -8,10 +8,10 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-import { ExpressionFunction, ExpressionFunctionParameter, Style } from 'src/plugins/expressions';
+import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin';
 
+import { registerExpressionsLanguage } from '@kbn/presentation-util-plugin/public';
 import { ExpressionInput } from '../expression_input';
-import { registerExpressionsLanguage } from '../../../../../../../src/plugins/presentation_util/public';
 
 const content: ExpressionFunctionParameter<'string'> = {
   name: 'content',
diff --git a/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx b/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx
index 0917e633306aa..37c022d01541b 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx
+++ b/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx
@@ -12,7 +12,7 @@ import {
   LazyExpressionInput,
   ExpressionInputProps,
   withSuspense,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 interface Props extends Omit<ExpressionInputProps, 'height'> {
   /** Optional string for displaying error messages */
diff --git a/x-pack/plugins/canvas/public/components/function_form/index.tsx b/x-pack/plugins/canvas/public/components/function_form/index.tsx
index 1194943f385e4..5200fb310c6bf 100644
--- a/x-pack/plugins/canvas/public/components/function_form/index.tsx
+++ b/x-pack/plugins/canvas/public/components/function_form/index.tsx
@@ -9,10 +9,7 @@ import React, { useCallback } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { Ast } from '@kbn/interpreter';
 import deepEqual from 'react-fast-compare';
-import {
-  ExpressionAstExpression,
-  ExpressionValue,
-} from '../../../../../../src/plugins/expressions';
+import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin';
 import { findExpressionType } from '../../lib/find_expression_type';
 import { getId } from '../../lib/get_id';
 // @ts-expect-error unconverted action function
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
index 49b5aaaf1b209..4b54956bcbec1 100644
--- a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import { ExpressionFunction } from 'src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { EuiButtonEmpty } from '@elastic/eui';
 import copy from 'copy-to-clipboard';
 import { CanvasPluginServices } from '../../services';
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
index 7f7f897b4f28e..7c1f11db071b4 100644
--- a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
@@ -7,11 +7,11 @@
 
 // @ts-expect-error untyped lib
 import pluralize from 'pluralize';
-import { ExpressionFunction, ExpressionFunctionParameter } from 'src/plugins/expressions';
+import { ExpressionFunction, ExpressionFunctionParameter } from '@kbn/expressions-plugin';
+import { isValidDataUrl } from '@kbn/presentation-util-plugin/public';
 import { functions as browserFunctions } from '../../../canvas_plugin_src/functions/browser';
 import { functions as serverFunctions } from '../../../canvas_plugin_src/functions/server';
 import { DATATABLE_COLUMN_TYPES } from '../../../common/lib';
-import { isValidDataUrl } from '../../../../../../src/plugins/presentation_util/public';
 import { getFunctionExamples, FunctionExample } from './function_examples';
 
 const ALPHABET = 'abcdefghijklmnopqrstuvwxyz'.split('');
diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
index 9331de3fcad4b..737e90b499546 100644
--- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
@@ -8,10 +8,10 @@
 import React, { FC, useState, lazy, Suspense } from 'react';
 import { EuiButtonEmpty, EuiPortal, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunction } from 'src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 
 import { KeyboardShortcutsDoc } from '../keyboard_shortcuts_doc';
-import { CanvasPluginServices } from '../../services/';
+import { CanvasPluginServices } from '../../services';
 
 let FunctionReferenceGenerator: null | React.LazyExoticComponent<any> = null;
 
diff --git a/x-pack/plugins/canvas/public/components/home/home.component.tsx b/x-pack/plugins/canvas/public/components/home/home.component.tsx
index 6e98439a0c530..dbfbd8a920c7e 100644
--- a/x-pack/plugins/canvas/public/components/home/home.component.tsx
+++ b/x-pack/plugins/canvas/public/components/home/home.component.tsx
@@ -7,8 +7,8 @@
 
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { KibanaPageTemplate } from '../../../../../../src/plugins/kibana_react/public';
-import { withSuspense } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 
 import { WorkpadCreate } from './workpad_create';
 import { LazyWorkpadTemplates } from './workpad_templates';
diff --git a/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts b/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts
index 045ff8b52e259..4c12deef54af1 100644
--- a/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts
+++ b/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts
@@ -9,7 +9,7 @@ import { useCallback } from 'react';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { CANVAS, JSON as JSONString } from '../../../../i18n/constants';
 import { useNotifyService } from '../../../services';
 import { getId } from '../../../lib/get_id';
diff --git a/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx b/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx
index f5d41313ff571..b75c8864ad495 100644
--- a/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx
+++ b/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useState, useEffect, createContext, Dispatch, SetStateAction } from 'react';
-import { useFindWorkpads } from './../hooks';
+import { useFindWorkpads } from '../hooks';
 import { FoundWorkpad } from '../../../services/workpad';
 import { Loading } from '../loading';
 import { MyWorkpads as Component } from './my_workpads.component';
diff --git a/x-pack/plugins/canvas/public/components/paginate/paginate.tsx b/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
index 322d18b07fd1c..9b65f2151b98f 100644
--- a/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
+++ b/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { InPaginateProps } from './';
+import { InPaginateProps } from '.';
 
 export type PaginateProps = Omit<InPaginateProps, 'startPage'> & {
   pageNumber: number;
diff --git a/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx
index 3c1b5f3537ac0..b5d4967464c17 100644
--- a/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx
@@ -8,7 +8,7 @@
 import React, { FC, useState } from 'react';
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
-import { PalettePicker } from '../../palette_picker';
+import { PalettePicker } from '..';
 
 import { paulTor14, ColorPalette } from '../../../../../common/lib/palettes';
 import { CustomColorPalette } from '../../types';
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx
index 3f0611479c3b5..6b03873723c18 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { ElementGrid } from '../element_grid';
 import { getTestCustomElements } from './fixtures/test_elements';
 
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx
index 29cb1c8d525ce..6e30d04fe2976 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getElasticLogo } from '../../../../../../../../src/plugins/presentation_util/public';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/public';
 
 export const getTestCustomElements = async () => {
   const { elasticLogo } = await getElasticLogo();
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx
index 50e9ee8ac5a89..5044f82b67f50 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { SavedElementsModal } from '../saved_elements_modal.component';
 import { getTestCustomElements } from './fixtures/test_elements';
 import { CustomElement } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx b/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx
index 5fdea5591f538..0f6634b026ac1 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx
@@ -8,8 +8,8 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { getAvailableShapes } from '@kbn/expression-shape-plugin/common';
 import { ShapePicker } from '../shape_picker';
-import { getAvailableShapes } from '../../../../../../../src/plugins/expression_shape/common';
 
 storiesOf('components/Shapes/ShapePicker', module).add('default', () => (
   <ShapePicker shapes={getAvailableShapes()} onChange={action('onChange')} />
diff --git a/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx
index 0470699943bf1..b27c49dc2c875 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx
@@ -8,8 +8,8 @@
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGrid, EuiFlexItem, EuiLink } from '@elastic/eui';
+import { Shape } from '@kbn/expression-shape-plugin/common';
 import { ShapePreview } from '../shape_preview';
-import { Shape } from '../../../../../../src/plugins/expression_shape/common';
 
 interface Props {
   shapes: Shape[];
diff --git a/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx
index babc03b8f6763..1d0ee9ffee532 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx
@@ -8,11 +8,8 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { getAvailableShapes, Shape } from '@kbn/expression-shape-plugin/common';
 import { ShapePickerPopover } from '../shape_picker_popover';
-import {
-  getAvailableShapes,
-  Shape,
-} from '../../../../../../../src/plugins/expression_shape/common';
 
 class Interactive extends React.Component<{}, { value: string }> {
   public state = {
diff --git a/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx
index 5701c3cb1e799..25198b073700a 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx
@@ -8,10 +8,10 @@
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiLink, EuiPanel } from '@elastic/eui';
+import { Shape } from '@kbn/expression-shape-plugin/common';
 import { Popover } from '../popover';
 import { ShapePicker } from '../shape_picker';
 import { ShapePreview } from '../shape_preview';
-import { Shape } from '../../../../../../src/plugins/expression_shape/common';
 
 interface Props {
   shapes: Shape[];
diff --git a/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx b/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx
index de7ce4b411860..db152953ba9c9 100644
--- a/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx
@@ -7,8 +7,8 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { Shape } from '@kbn/expression-shape-plugin/public';
 import { ShapePreview } from '../shape_preview';
-import { Shape } from '../../../../../../../src/plugins/expression_shape/public';
 
 storiesOf('components/Shapes/ShapePreview', module)
   .add('arrow', () => <ShapePreview shape={Shape.ARROW} />)
diff --git a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx
index 4edc1d9ef9e7c..46782f4730f77 100644
--- a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx
@@ -14,8 +14,8 @@ import {
   SvgConfig,
   ShapeRef,
   ViewBoxParams,
-} from '../../../../../../src/plugins/expression_shape/public';
-import { withSuspense } from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/expression-shape-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 
 interface Props {
   shape?: string;
diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
index 8d4a1506ad8a2..a51dcf79e11c9 100644
--- a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
@@ -9,7 +9,7 @@ import React, { FC, useState } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiSelect, EuiSpacer, EuiButtonGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FontValue } from 'src/plugins/expressions';
+import { FontValue } from '@kbn/expressions-plugin';
 
 import { FontPicker } from '../font_picker';
 import { ColorPickerPopover } from '../color_picker_popover';
diff --git a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
index 0d9ff68c9f46f..9d5d77859cf8d 100644
--- a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, MouseEventHandler, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { Sidebar } from '../../components/sidebar';
-import { Toolbar } from '../../components/toolbar';
+import { Sidebar } from '../sidebar';
+import { Toolbar } from '../toolbar';
 import { Workpad } from '../workpad';
 import { WorkpadHeader } from '../workpad_header';
 import { CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR } from '../../../common/lib/constants';
diff --git a/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts
index 96e0ab70840ad..140de2b73ddf0 100644
--- a/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { addColor, removeColor } from '../../state/actions/workpad';
 import { getWorkpadColors } from '../../state/selectors/workpad';
 
-import { WorkpadColorPicker as Component } from '../workpad_color_picker/workpad_color_picker.component';
+import { WorkpadColorPicker as Component } from './workpad_color_picker.component';
 import { State } from '../../../types';
 
 const mapStateToProps = (state: State) => ({
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
index 01048bc0af301..c6c900df06dc4 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
@@ -8,8 +8,8 @@
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import React from 'react';
-import { EmbeddableFactoryDefinition, IEmbeddable } from 'src/plugins/embeddable/public';
-import { BaseVisType, VisTypeAlias } from 'src/plugins/visualizations/public';
+import { EmbeddableFactoryDefinition, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
 import { EditorMenu } from '../editor_menu.component';
 
 const testFactories: EmbeddableFactoryDefinition[] = [
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
index e8f762f9731a1..ed84d13641260 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
@@ -12,9 +12,9 @@ import {
   EuiContextMenuItemIcon,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { EmbeddableFactoryDefinition } from '../../../../../../../src/plugins/embeddable/public';
-import { BaseVisType, VisTypeAlias } from '../../../../../../../src/plugins/visualizations/public';
-import { SolutionToolbarPopover } from '../../../../../../../src/plugins/presentation_util/public';
+import { EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
+import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import { SolutionToolbarPopover } from '@kbn/presentation-util-plugin/public';
 
 const strings = {
   getEditorMenuButtonLabel: () =>
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
index a6bb98e9aba9b..c02ac90f8066c 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
@@ -7,21 +7,14 @@
 
 import React, { FC, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { trackCanvasUiMetric, METRIC_TYPE } from '../../../../public/lib/ui_metric';
+import { BaseVisType, VisGroups, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import { EmbeddableFactoryDefinition, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { trackCanvasUiMetric, METRIC_TYPE } from '../../../lib/ui_metric';
 import {
   useEmbeddablesService,
   usePlatformService,
   useVisualizationsService,
 } from '../../../services';
-import {
-  BaseVisType,
-  VisGroups,
-  VisTypeAlias,
-} from '../../../../../../../src/plugins/visualizations/public';
-import {
-  EmbeddableFactoryDefinition,
-  EmbeddableInput,
-} from '../../../../../../../src/plugins/embeddable/public';
 import { CANVAS_APP } from '../../../../common/lib';
 import { encode } from '../../../../common/lib/embeddable_dataurl';
 import { ElementSpec } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
index 69b26c87287bc..d45b723dd53cd 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
@@ -10,7 +10,7 @@ import React, { FunctionComponent, useState } from 'react';
 import PropTypes from 'prop-types';
 import { EuiContextMenu, EuiIcon, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { PrimaryActionPopover } from '../../../../../../../src/plugins/presentation_util/public';
+import { PrimaryActionPopover } from '@kbn/presentation-util-plugin/public';
 import { getId } from '../../../lib/get_id';
 import { CONTEXT_MENU_TOP_BORDER_CLASSNAME } from '../../../../common/lib';
 import { ElementSpec } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
index 39d29e134cca6..75d6f8064f32a 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
@@ -9,10 +9,7 @@ import React, { useState } from 'react';
 import { EuiButtonEmpty, EuiNotificationBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  LazyLabsFlyout,
-  withSuspense,
-} from '../../../../../../../src/plugins/presentation_util/public';
+import { LazyLabsFlyout, withSuspense } from '@kbn/presentation-util-plugin/public';
 
 import { useLabsService } from '../../../services';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
index 8c9360d50cb27..5fcd5e93e805a 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { RedirectOptions } from 'src/plugins/share/public';
-import { JobAppParamsPDFV2 } from '../../../../../reporting/common/types';
+import type { RedirectOptions } from '@kbn/share-plugin/public';
+import { JobAppParamsPDFV2 } from '@kbn/reporting-plugin/common/types';
 import { CanvasAppLocatorParams, CANVAS_APP_LOCATOR } from '../../../../common/locator';
 import { CanvasWorkpad } from '../../../../types';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
index 85a30d3003402..5bba9ce3895f5 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
@@ -16,10 +16,10 @@ import {
   AddFromLibraryButton,
   QuickButtonGroup,
   SolutionToolbar,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { getElementStrings } from '../../../i18n';
 import { CommitFn, ElementSpec } from '../../../types';
-import { ToolTipShortcut } from '../tool_tip_shortcut/';
+import { ToolTipShortcut } from '../tool_tip_shortcut';
 import { RefreshControl } from './refresh_control';
 // @ts-expect-error untyped local
 import { FullscreenControl } from './fullscreen_control';
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx
index bd802650e68f1..5b68c3eab09d0 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import { EuiSpacer, EuiTitle } from '@elastic/eui';
 import { BorderForm } from './border_form';
 import { AppearanceForm } from './appearance_form';
-import { CanvasWorkpad } from '../.../../../../../types';
+import { CanvasWorkpad } from '../../../../types';
 import { Arguments as AppearanceArguments } from './appearance_form';
 import { Arguments as BorderArguments } from './border_form';
 import { ArgTypesStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx
index 6a98a0dcfa56a..76cde0be02baa 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx
@@ -8,7 +8,7 @@
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
 import { ColorPickerPopover } from '../../../components/color_picker_popover';
-import { CanvasWorkpad } from '../.../../../../../types';
+import { CanvasWorkpad } from '../../../../types';
 import { ArgTypesStrings } from '../../../../i18n';
 
 const { ContainerStyle: strings } = ArgTypesStrings;
diff --git a/x-pack/plugins/canvas/public/expression_types/function_form.tsx b/x-pack/plugins/canvas/public/expression_types/function_form.tsx
index f66cfd301c7d8..c5440b19441ce 100644
--- a/x-pack/plugins/canvas/public/expression_types/function_form.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/function_form.tsx
@@ -17,7 +17,7 @@ import { SidebarSectionTitle } from '../components/sidebar/sidebar_section_title
 import { BaseForm, BaseFormProps } from './base_form';
 import { Arg, ArgUiConfig, ResolvedArgProps } from './arg';
 import { ArgDisplayType, Args, ArgType, ArgTypeDef, ArgValue, ExpressionType } from './types';
-import { Model, Transform, View } from '../expression_types';
+import { Model, Transform, View } from '.';
 import {
   AssetType,
   CanvasElement,
diff --git a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
index 9f6e57e94a256..be9661eb891f7 100644
--- a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 
 export const featureCatalogueEntry = {
   id: 'canvas',
@@ -20,7 +20,7 @@ export const featureCatalogueEntry = {
   icon: 'canvasApp',
   path: '/app/canvas',
   showOnHomePage: false,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data' as FeatureCatalogueCategory,
   solutionId: 'kibana',
   order: 300,
 };
diff --git a/x-pack/plugins/canvas/public/functions/asset.ts b/x-pack/plugins/canvas/public/functions/asset.ts
index 08ffad9471a98..4048d0fe099b3 100644
--- a/x-pack/plugins/canvas/public/functions/asset.ts
+++ b/x-pack/plugins/canvas/public/functions/asset.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/public';
 // @ts-expect-error unconverted local lib
 import { getState } from '../state/store';
 import { getAssetById } from '../state/selectors/assets';
diff --git a/x-pack/plugins/canvas/public/functions/index.ts b/x-pack/plugins/canvas/public/functions/index.ts
index 7a3ca9a2619bb..ad91d6b98fa7f 100644
--- a/x-pack/plugins/canvas/public/functions/index.ts
+++ b/x-pack/plugins/canvas/public/functions/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry } from '@kbn/coloring';
 import { asset } from './asset';
 import { filtersFunctionFactory } from './filters';
 import { timelionFunctionFactory } from './timelion';
diff --git a/x-pack/plugins/canvas/public/functions/pie.test.js b/x-pack/plugins/canvas/public/functions/pie.test.js
index 6f1b66018fb49..757261310beb5 100644
--- a/x-pack/plugins/canvas/public/functions/pie.test.js
+++ b/x-pack/plugins/canvas/public/functions/pie.test.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { fontStyle, functionWrapper } from '@kbn/presentation-util-plugin/public';
 import { testPie } from '../../canvas_plugin_src/functions/common/__fixtures__/test_pointseries';
-import { fontStyle, functionWrapper } from '../../../../../src/plugins/presentation_util/public';
 import {
   grayscalePalette,
   seriesStyle,
diff --git a/x-pack/plugins/canvas/public/functions/pie.ts b/x-pack/plugins/canvas/public/functions/pie.ts
index 11e487273b31c..67df9d896350c 100644
--- a/x-pack/plugins/canvas/public/functions/pie.ts
+++ b/x-pack/plugins/canvas/public/functions/pie.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, keyBy, map, groupBy } from 'lodash';
-import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
 import { getLegendConfig } from '../../common/lib/get_legend_config';
 import { getFunctionHelp } from '../../i18n';
 import {
diff --git a/x-pack/plugins/canvas/public/functions/plot.test.js b/x-pack/plugins/canvas/public/functions/plot.test.js
index 1f74698ccaf4e..b69fd40555363 100644
--- a/x-pack/plugins/canvas/public/functions/plot.test.js
+++ b/x-pack/plugins/canvas/public/functions/plot.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { fontStyle, functionWrapper } from '../../../../../src/plugins/presentation_util/public';
+import { fontStyle, functionWrapper } from '@kbn/presentation-util-plugin/public';
 import { testPlot } from '../../canvas_plugin_src/functions/common/__fixtures__/test_pointseries';
 import {
   grayscalePalette,
diff --git a/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts b/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts
index b35037d4b556c..2d58e926d28c8 100644
--- a/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts
+++ b/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts
@@ -6,8 +6,8 @@
  */
 
 import { get, map } from 'lodash';
+import { Style, PointSeriesColumns } from '@kbn/expressions-plugin/common';
 import { Ticks, AxisConfig, isAxisConfig } from '../../../types';
-import { Style, PointSeriesColumns } from '../../../../../../src/plugins/expressions/common';
 
 type Position = 'bottom' | 'top' | 'left' | 'right';
 interface Config {
diff --git a/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js b/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js
index 7a142a02412c2..579dceb6fcfe9 100644
--- a/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js
+++ b/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { fontStyle } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { defaultSpec, getFontSpec } from './get_font_spec';
 
 describe('getFontSpec', () => {
diff --git a/x-pack/plugins/canvas/public/functions/plot/index.ts b/x-pack/plugins/canvas/public/functions/plot/index.ts
index 477c704190146..00542af70c8db 100644
--- a/x-pack/plugins/canvas/public/functions/plot/index.ts
+++ b/x-pack/plugins/canvas/public/functions/plot/index.ts
@@ -7,8 +7,8 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import { groupBy, get, keyBy, map, sortBy } from 'lodash';
-import { ExpressionFunctionDefinition, Style } from 'src/plugins/expressions';
-import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public';
+import { ExpressionFunctionDefinition, Style } from '@kbn/expressions-plugin';
+import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
 import { getLegendConfig } from '../../../common/lib/get_legend_config';
 import { getFlotAxisConfig } from './get_flot_axis_config';
 import { getFontSpec } from './get_font_spec';
diff --git a/x-pack/plugins/canvas/public/functions/timelion.ts b/x-pack/plugins/canvas/public/functions/timelion.ts
index 81893db1bbd4b..f457bad07f92e 100644
--- a/x-pack/plugins/canvas/public/functions/timelion.ts
+++ b/x-pack/plugins/canvas/public/functions/timelion.ts
@@ -9,14 +9,14 @@ import { flatten } from 'lodash';
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
 
-import { TimeRange } from 'src/plugins/data/common';
-import { ExpressionFunctionDefinition, DatatableRow } from 'src/plugins/expressions/public';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { ExpressionFunctionDefinition, DatatableRow } from '@kbn/expressions-plugin/public';
 import { fetch } from '../../common/lib/fetch';
 // @ts-expect-error untyped local
 import { buildBoolArray } from '../../common/lib/build_bool_array';
 import { Datatable, ExpressionValueFilter } from '../../types';
 import { getFunctionHelp } from '../../i18n';
-import { InitializeArguments } from './';
+import { InitializeArguments } from '.';
 
 const errors = {
   timelionError: () =>
diff --git a/x-pack/plugins/canvas/public/functions/to.ts b/x-pack/plugins/canvas/public/functions/to.ts
index 2866ed4d1cded..bf3d1e2ba4f10 100644
--- a/x-pack/plugins/canvas/public/functions/to.ts
+++ b/x-pack/plugins/canvas/public/functions/to.ts
@@ -6,7 +6,7 @@
  */
 
 import { castProvider } from '@kbn/interpreter';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/public';
 import { getFunctionHelp, getFunctionErrors } from '../../i18n';
 import { InitializeArguments } from '.';
 
diff --git a/x-pack/plugins/canvas/public/index.ts b/x-pack/plugins/canvas/public/index.ts
index 95d4333c6e9e5..5c2780b88d124 100644
--- a/x-pack/plugins/canvas/public/index.ts
+++ b/x-pack/plugins/canvas/public/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
-import { CoreStart } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { CanvasServices } from './services';
 import { CanvasSetup, CanvasStart, CanvasStartDeps, CanvasPlugin } from './plugin';
 
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
index 0f71039e7409c..146842c4e3322 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { select } from './select';
-import { Json, Selector, Vector2d, Vector3d, TransformMatrix2d, TransformMatrix3d } from './index';
+import { Json, Selector, Vector2d, Vector3d, TransformMatrix2d, TransformMatrix3d } from '.';
 import {
   mvMultiply as mult2d,
   ORIGIN as UNIT2D,
diff --git a/x-pack/plugins/canvas/public/lib/breadcrumbs.ts b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
index b926c30674298..02036be10322d 100644
--- a/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
+++ b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from '../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
 export const getBaseBreadcrumb = (): ChromeBreadcrumb => ({
   text: 'Canvas',
diff --git a/x-pack/plugins/canvas/public/lib/clipboard.test.ts b/x-pack/plugins/canvas/public/lib/clipboard.test.ts
index e51e4b32f3e41..cb8b019390539 100644
--- a/x-pack/plugins/canvas/public/lib/clipboard.test.ts
+++ b/x-pack/plugins/canvas/public/lib/clipboard.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-jest.mock('../../../../../src/plugins/kibana_utils/public');
+jest.mock('@kbn/kibana-utils-plugin/public');
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { setClipboardData, getClipboardData } from './clipboard';
 import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants';
 import { elements } from '../../__fixtures__/workpads';
diff --git a/x-pack/plugins/canvas/public/lib/create_handlers.ts b/x-pack/plugins/canvas/public/lib/create_handlers.ts
index 3536bed0f92b3..66993c0d39bae 100644
--- a/x-pack/plugins/canvas/public/lib/create_handlers.ts
+++ b/x-pack/plugins/canvas/public/lib/create_handlers.ts
@@ -9,7 +9,7 @@ import { isEqual } from 'lodash';
 import {
   ExpressionRendererEvent,
   IInterpreterRenderHandlers,
-} from 'src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
 import { updateEmbeddableExpression, fetchEmbeddableRenderable } from '../state/actions/embeddable';
 import { RendererHandlers, CanvasElement } from '../../types';
 import { pluginServices } from '../services';
diff --git a/x-pack/plugins/canvas/public/lib/es_service.ts b/x-pack/plugins/canvas/public/lib/es_service.ts
index 0ff6c9e5d110f..7b86716aef7e5 100644
--- a/x-pack/plugins/canvas/public/lib/es_service.ts
+++ b/x-pack/plugins/canvas/public/lib/es_service.ts
@@ -6,7 +6,7 @@
  */
 
 // TODO - clint: convert to service abstraction
-import { IndexPatternAttributes } from 'src/plugins/data/public';
+import { IndexPatternAttributes } from '@kbn/data-plugin/public';
 
 import { API_ROUTE } from '../../common/lib/constants';
 import { fetch } from '../../common/lib/fetch';
diff --git a/x-pack/plugins/canvas/public/lib/loading_indicator.ts b/x-pack/plugins/canvas/public/lib/loading_indicator.ts
index a78c4711c8206..920e732b21bb2 100644
--- a/x-pack/plugins/canvas/public/lib/loading_indicator.ts
+++ b/x-pack/plugins/canvas/public/lib/loading_indicator.ts
@@ -6,7 +6,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
 let isActive = false;
 
diff --git a/x-pack/plugins/canvas/public/lib/storage.ts b/x-pack/plugins/canvas/public/lib/storage.ts
index 92221b9398446..f449d785f16b9 100644
--- a/x-pack/plugins/canvas/public/lib/storage.ts
+++ b/x-pack/plugins/canvas/public/lib/storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { getWindow } from './get_window';
 
 export enum StorageType {
diff --git a/x-pack/plugins/canvas/public/lib/template.js b/x-pack/plugins/canvas/public/lib/template.js
index 55ee6ff6e89d0..edac3b37cbdb8 100644
--- a/x-pack/plugins/canvas/public/lib/template.js
+++ b/x-pack/plugins/canvas/public/lib/template.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { tagsRegistry } from '../lib/tags_registry';
 import { getDefaultWorkpad } from '../state/defaults';
+import { tagsRegistry } from './tags_registry';
 import { getId } from './get_id';
 
 const defaultWorkpad = getDefaultWorkpad();
diff --git a/x-pack/plugins/canvas/public/lib/ui_metric.ts b/x-pack/plugins/canvas/public/lib/ui_metric.ts
index dc1b56a58fc0f..a4fc282646e52 100644
--- a/x-pack/plugins/canvas/public/lib/ui_metric.ts
+++ b/x-pack/plugins/canvas/public/lib/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export { METRIC_TYPE };
 
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 1c2ce763f42e2..5d3d3f8a3e202 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -6,10 +6,10 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import type { SharePluginSetup } from 'src/plugins/share/public';
-import { ChartsPluginSetup, ChartsPluginStart } from 'src/plugins/charts/public';
-import { VisualizationsStart } from 'src/plugins/visualizations/public';
-import { ReportingStart } from '../../reporting/public';
+import type { SharePluginSetup } from '@kbn/share-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
 import {
   CoreSetup,
   CoreStart,
@@ -18,22 +18,22 @@ import {
   AppUpdater,
   DEFAULT_APP_CATEGORIES,
   PluginInitializerContext,
-} from '../../../../src/core/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { SpacesPluginStart } from '../../spaces/public';
-import { initLoadingIndicator } from './lib/loading_indicator';
-import { getSessionStorage } from './lib/storage';
-import { SESSIONSTORAGE_LASTPATH, CANVAS_APP } from '../common/lib/constants';
-import { CanvasAppLocatorDefinition } from '../common/locator';
+} from '@kbn/core/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
-import { ExpressionsSetup, ExpressionsStart } from '../../../../src/plugins/expressions/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
-import { BfetchPublicSetup } from '../../../../src/plugins/bfetch/public';
-import { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public';
+import { CanvasAppLocatorDefinition } from '../common/locator';
+import { SESSIONSTORAGE_LASTPATH, CANVAS_APP } from '../common/lib/constants';
+import { getSessionStorage } from './lib/storage';
+import { initLoadingIndicator } from './lib/loading_indicator';
 import { getPluginApi, CanvasApi } from './plugin_api';
 import { setupExpressions } from './setup_expressions';
 
diff --git a/x-pack/plugins/canvas/public/plugin_api.ts b/x-pack/plugins/canvas/public/plugin_api.ts
index aafbc2237a531..be98100d041e5 100644
--- a/x-pack/plugins/canvas/public/plugin_api.ts
+++ b/x-pack/plugins/canvas/public/plugin_api.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import {
   AnyExpressionFunctionDefinition,
   AnyExpressionTypeDefinition,
@@ -12,7 +13,6 @@ import {
   AnyRendererFactory,
 } from '../types';
 import { ElementFactory } from '../types';
-import { ExpressionsSetup } from '../../../../src/plugins/expressions/public';
 
 type SpecPromiseFn<T extends any> = () => Promise<T[]>;
 type AddToRegistry<T extends any> = (add: T[] | SpecPromiseFn<T>) => void;
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts
index e54e4d5065564..f4b4e25095209 100644
--- a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts
@@ -8,7 +8,7 @@
 import { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { WorkpadPageRouteParams } from '../';
+import { WorkpadPageRouteParams } from '..';
 import { getWorkpad } from '../../../state/selectors/workpad';
 // @ts-expect-error
 import { setPage } from '../../../state/actions/pages';
diff --git a/x-pack/plugins/canvas/public/services/embeddables.ts b/x-pack/plugins/canvas/public/services/embeddables.ts
index 26b150b7a5349..2dad3da3d330b 100644
--- a/x-pack/plugins/canvas/public/services/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/embeddables.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  EmbeddableFactory,
-  EmbeddableStateTransfer,
-} from '../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactory, EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 
 export interface CanvasEmbeddablesService {
   getEmbeddableFactories: () => IterableIterator<EmbeddableFactory>;
diff --git a/x-pack/plugins/canvas/public/services/index.ts b/x-pack/plugins/canvas/public/services/index.ts
index 4bf025c274859..2c01378851ee5 100644
--- a/x-pack/plugins/canvas/public/services/index.ts
+++ b/x-pack/plugins/canvas/public/services/index.ts
@@ -7,7 +7,7 @@
 
 export * from './legacy';
 
-import { PluginServices } from '../../../../../src/plugins/presentation_util/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasCustomElementService } from './custom_element';
 import { CanvasEmbeddablesService } from './embeddables';
diff --git a/x-pack/plugins/canvas/public/services/kibana/custom_element.ts b/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
index 093373d55a3c5..4f580330ef7c2 100644
--- a/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { CustomElement } from '../../../types';
diff --git a/x-pack/plugins/canvas/public/services/kibana/embeddables.ts b/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
index 8d1a86edab3d8..c0bfdcbb8aa1d 100644
--- a/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasEmbeddablesService } from '../embeddables';
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/expressions.ts b/x-pack/plugins/canvas/public/services/kibana/expressions.ts
index 6174c56aa2b71..614357a3e3867 100644
--- a/x-pack/plugins/canvas/public/services/kibana/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/expressions.ts
@@ -9,11 +9,11 @@ import {
   ExpressionAstExpression,
   ExpressionExecutionParams,
   ExpressionValue,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 import { pluck } from 'rxjs/operators';
+import { ExpressionsServiceStart } from '@kbn/expressions-plugin/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { buildEmbeddableFilters } from '../../../common/lib/build_embeddable_filters';
-import { ExpressionsServiceStart } from '../../../../../../src/plugins/expressions/public';
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasFiltersService } from './filters';
 import { CanvasNotifyService } from '../notify';
diff --git a/x-pack/plugins/canvas/public/services/kibana/filters.ts b/x-pack/plugins/canvas/public/services/kibana/filters.ts
index 872b6759b389b..793b073aaf231 100644
--- a/x-pack/plugins/canvas/public/services/kibana/filters.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 // @ts-expect-error untyped local
 import { getState, getStore } from '../../state/store';
 import { State } from '../../../types';
diff --git a/x-pack/plugins/canvas/public/services/kibana/index.ts b/x-pack/plugins/canvas/public/services/kibana/index.ts
index c1ceb531657d0..cd5e704296405 100644
--- a/x-pack/plugins/canvas/public/services/kibana/index.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/index.ts
@@ -10,7 +10,7 @@ import {
   PluginServiceProvider,
   PluginServiceRegistry,
   KibanaPluginServiceParams,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPluginServices } from '..';
 import { CanvasStartDeps } from '../../plugin';
diff --git a/x-pack/plugins/canvas/public/services/kibana/labs.ts b/x-pack/plugins/canvas/public/services/kibana/labs.ts
index 58cbf4d181c17..f6dd9135c809d 100644
--- a/x-pack/plugins/canvas/public/services/kibana/labs.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/labs.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  KibanaPluginServiceFactory,
-  projectIDs,
-} from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory, projectIDs } from '@kbn/presentation-util-plugin/public';
 import { UI_SETTINGS } from '../../../common';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasLabsService } from '../labs';
diff --git a/x-pack/plugins/canvas/public/services/kibana/nav_link.ts b/x-pack/plugins/canvas/public/services/kibana/nav_link.ts
index afbcbde03d49e..cf68b69155ad7 100644
--- a/x-pack/plugins/canvas/public/services/kibana/nav_link.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/nav_link.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { SESSIONSTORAGE_LASTPATH } from '../../../common/lib/constants';
 import { getSessionStorage } from '../../lib/storage';
diff --git a/x-pack/plugins/canvas/public/services/kibana/notify.ts b/x-pack/plugins/canvas/public/services/kibana/notify.ts
index 22d4b6f8a476d..8448a1d515fe4 100644
--- a/x-pack/plugins/canvas/public/services/kibana/notify.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/notify.ts
@@ -6,10 +6,10 @@
  */
 
 import { get } from 'lodash';
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
+import { ToastInputFields } from '@kbn/core/public';
 import { formatMsg } from '../../lib/format_msg';
-import { ToastInputFields } from '../../../../../../src/core/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasNotifyService } from '../notify';
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/platform.ts b/x-pack/plugins/canvas/public/services/kibana/platform.ts
index aea8c6e7f7a95..8a6ea957ab97c 100644
--- a/x-pack/plugins/canvas/public/services/kibana/platform.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/platform.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasPlatformService } from '../platform';
diff --git a/x-pack/plugins/canvas/public/services/kibana/reporting.ts b/x-pack/plugins/canvas/public/services/kibana/reporting.ts
index 02611acdea4da..56b9b91e45fc6 100644
--- a/x-pack/plugins/canvas/public/services/kibana/reporting.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/reporting.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasReportingService } from '../reporting';
diff --git a/x-pack/plugins/canvas/public/services/kibana/visualizations.ts b/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
index e319ec1c1f427..6f1728953ee8e 100644
--- a/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasVisualizationsService } from '../visualizations';
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/workpad.ts b/x-pack/plugins/canvas/public/services/kibana/workpad.ts
index 7399c12d96a86..9a8a5f1d9a428 100644
--- a/x-pack/plugins/canvas/public/services/kibana/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/workpad.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/public';
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { SavedObject } from '@kbn/core/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasWorkpadService, ResolveWorkpadResponse } from '../workpad';
diff --git a/x-pack/plugins/canvas/public/services/labs.ts b/x-pack/plugins/canvas/public/services/labs.ts
index 6d8171cdfe1de..960e48a009007 100644
--- a/x-pack/plugins/canvas/public/services/labs.ts
+++ b/x-pack/plugins/canvas/public/services/labs.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  projectIDs,
-  PresentationLabsService,
-} from '../../../../../src/plugins/presentation_util/public';
+import { projectIDs, PresentationLabsService } from '@kbn/presentation-util-plugin/public';
 
 export interface CanvasLabsService extends PresentationLabsService {
   projectIDs: typeof projectIDs;
diff --git a/x-pack/plugins/canvas/public/services/legacy/index.ts b/x-pack/plugins/canvas/public/services/legacy/index.ts
index 82ef3f248f7fd..c5311f37dd4c5 100644
--- a/x-pack/plugins/canvas/public/services/legacy/index.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/index.ts
@@ -6,12 +6,12 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { CoreSetup, CoreStart, AppUpdater } from '../../../../../../src/core/public';
+import { CoreSetup, CoreStart, AppUpdater } from '@kbn/core/public';
 import { CanvasSetupDeps, CanvasStartDeps } from '../../plugin';
 import { searchServiceFactory } from './search';
 
 export type { SearchService } from './search';
-export { ExpressionsService } from '../../../../../../src/plugins/expressions/common';
+export { ExpressionsService } from '@kbn/expressions-plugin/common';
 export * from './context';
 
 export type CanvasServiceFactory<Service> = (
diff --git a/x-pack/plugins/canvas/public/services/legacy/reporting.ts b/x-pack/plugins/canvas/public/services/legacy/reporting.ts
index e594475360dff..411a892baed29 100644
--- a/x-pack/plugins/canvas/public/services/legacy/reporting.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/reporting.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ReportingStart } from '../../../../reporting/public';
-import { CanvasServiceFactory } from './';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
+import { CanvasServiceFactory } from '.';
 
 export interface ReportingService {
   start?: ReportingStart;
diff --git a/x-pack/plugins/canvas/public/services/legacy/search.ts b/x-pack/plugins/canvas/public/services/legacy/search.ts
index 0fe5c89c77096..849817196f0cb 100644
--- a/x-pack/plugins/canvas/public/services/legacy/search.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/search.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { CanvasServiceFactory } from '.';
 
 export interface SearchService {
diff --git a/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts b/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts
index af43e9ed75c98..6a90ed878d425 100644
--- a/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CanvasServices, services } from '../';
+import { CanvasServices, services } from '..';
 import { searchService } from './search';
 
 export const stubs: CanvasServices = {
diff --git a/x-pack/plugins/canvas/public/services/notify.ts b/x-pack/plugins/canvas/public/services/notify.ts
index 67c5cb6bf79c4..83e7b4e71ee72 100644
--- a/x-pack/plugins/canvas/public/services/notify.ts
+++ b/x-pack/plugins/canvas/public/services/notify.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToastInputFields } from '../../../../../src/core/public';
+import { ToastInputFields } from '@kbn/core/public';
 
 export interface CanvasNotifyService {
   error: (err: string | Error, opts?: ToastInputFields) => void;
diff --git a/x-pack/plugins/canvas/public/services/platform.ts b/x-pack/plugins/canvas/public/services/platform.ts
index c476fac3b8789..613c89770e6e8 100644
--- a/x-pack/plugins/canvas/public/services/platform.ts
+++ b/x-pack/plugins/canvas/public/services/platform.ts
@@ -13,9 +13,9 @@ import {
   ChromeBreadcrumb,
   IBasePath,
   ChromeStart,
-} from '../../../../../src/core/public';
+} from '@kbn/core/public';
 
-import { SpacesPluginStart } from '../../../spaces/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
 export interface CanvasPlatformService {
   getBasePath: () => string;
diff --git a/x-pack/plugins/canvas/public/services/reporting.ts b/x-pack/plugins/canvas/public/services/reporting.ts
index 9ec5bd6a06a4c..71d90421eafa8 100644
--- a/x-pack/plugins/canvas/public/services/reporting.ts
+++ b/x-pack/plugins/canvas/public/services/reporting.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReportingStart } from '../../../reporting/public';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
 
 type ReportingPanelPDFComponent = ReportingStart['components']['ReportingPanelPDFV2'];
 export interface CanvasReportingService {
diff --git a/x-pack/plugins/canvas/public/services/storybook/index.ts b/x-pack/plugins/canvas/public/services/storybook/index.ts
index 06ac743265f4d..52cad460662b2 100644
--- a/x-pack/plugins/canvas/public/services/storybook/index.ts
+++ b/x-pack/plugins/canvas/public/services/storybook/index.ts
@@ -8,7 +8,7 @@
 import {
   PluginServiceProviders,
   PluginServiceProvider,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPluginServices } from '..';
 import { pluginServiceProviders as stubProviders } from '../stubs';
diff --git a/x-pack/plugins/canvas/public/services/storybook/notify.ts b/x-pack/plugins/canvas/public/services/storybook/notify.ts
index 7ffd2ef9d1453..f6f97c42a1741 100644
--- a/x-pack/plugins/canvas/public/services/storybook/notify.ts
+++ b/x-pack/plugins/canvas/public/services/storybook/notify.ts
@@ -7,7 +7,7 @@
 
 import { action } from '@storybook/addon-actions';
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { StorybookParams } from '.';
 import { CanvasNotifyService } from '../notify';
diff --git a/x-pack/plugins/canvas/public/services/storybook/workpad.ts b/x-pack/plugins/canvas/public/services/storybook/workpad.ts
index 5dd40997900c6..9f40ccccafb3d 100644
--- a/x-pack/plugins/canvas/public/services/storybook/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/storybook/workpad.ts
@@ -8,7 +8,7 @@
 import moment from 'moment';
 
 import { action } from '@storybook/addon-actions';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { getId } from '../../lib/get_id';
 // @ts-expect-error
 import { getDefaultWorkpad } from '../../state/defaults';
diff --git a/x-pack/plugins/canvas/public/services/stubs/custom_element.ts b/x-pack/plugins/canvas/public/services/stubs/custom_element.ts
index d30b5db36949a..551c06ef4b65e 100644
--- a/x-pack/plugins/canvas/public/services/stubs/custom_element.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/custom_element.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasCustomElementService } from '../custom_element';
 
 type CanvasCustomElementServiceFactory = PluginServiceFactory<CanvasCustomElementService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/embeddables.ts b/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
index 9c2cf4d0650ab..435992bd3b5d9 100644
--- a/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasEmbeddablesService } from '../embeddables';
 
 type EmbeddablesServiceFactory = PluginServiceFactory<CanvasEmbeddablesService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/expressions.ts b/x-pack/plugins/canvas/public/services/stubs/expressions.ts
index 776b553b75d55..aaec0bb9edf6a 100644
--- a/x-pack/plugins/canvas/public/services/stubs/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/expressions.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { AnyExpressionRenderDefinition } from 'src/plugins/expressions';
-import { plugin } from '../../../../../../src/plugins/expressions/public';
+import { AnyExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { plugin } from '@kbn/expressions-plugin/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { functions as functionDefinitions } from '../../../canvas_plugin_src/functions/common';
 import { renderFunctions } from '../../../canvas_plugin_src/renderers/core';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
 import {
   CanvasExpressionsService,
   CanvasExpressionsServiceRequiredServices,
diff --git a/x-pack/plugins/canvas/public/services/stubs/filters.ts b/x-pack/plugins/canvas/public/services/stubs/filters.ts
index 972dbfd6dc0e4..19d237bb9c390 100644
--- a/x-pack/plugins/canvas/public/services/stubs/filters.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasFiltersService } from '../filters';
 
 export type CanvasFiltersServiceFactory = PluginServiceFactory<CanvasFiltersService, {}>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/index.ts b/x-pack/plugins/canvas/public/services/stubs/index.ts
index d90b1a3c92201..bb47f0506ce89 100644
--- a/x-pack/plugins/canvas/public/services/stubs/index.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/index.ts
@@ -11,7 +11,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPluginServices } from '..';
 import { customElementServiceFactory } from './custom_element';
diff --git a/x-pack/plugins/canvas/public/services/stubs/labs.ts b/x-pack/plugins/canvas/public/services/stubs/labs.ts
index 74ab460f733d8..617dc4b2b0ec1 100644
--- a/x-pack/plugins/canvas/public/services/stubs/labs.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/labs.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  PluginServiceFactory,
-  projectIDs,
-} from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory, projectIDs } from '@kbn/presentation-util-plugin/public';
 import { CanvasLabsService } from '../labs';
 
 type CanvasLabsServiceFactory = PluginServiceFactory<CanvasLabsService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/nav_link.ts b/x-pack/plugins/canvas/public/services/stubs/nav_link.ts
index cd371db54bded..becbdebcd6328 100644
--- a/x-pack/plugins/canvas/public/services/stubs/nav_link.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/nav_link.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasNavLinkService } from '../nav_link';
 
 type CanvasNavLinkServiceFactory = PluginServiceFactory<CanvasNavLinkService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/notify.ts b/x-pack/plugins/canvas/public/services/stubs/notify.ts
index 0ad322a414f0d..2406afe3ca8a2 100644
--- a/x-pack/plugins/canvas/public/services/stubs/notify.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/notify.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasNotifyService } from '../notify';
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/platform.ts b/x-pack/plugins/canvas/public/services/stubs/platform.ts
index b50f2d3589827..6a0b122069935 100644
--- a/x-pack/plugins/canvas/public/services/stubs/platform.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/platform.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPlatformService } from '../platform';
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/reporting.tsx b/x-pack/plugins/canvas/public/services/stubs/reporting.tsx
index 6b34ccdf9eebe..71c376efbaba9 100644
--- a/x-pack/plugins/canvas/public/services/stubs/reporting.tsx
+++ b/x-pack/plugins/canvas/public/services/stubs/reporting.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasReportingService } from '../reporting';
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/visualizations.ts b/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
index 4c5525aea143a..812287bf078fb 100644
--- a/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasVisualizationsService } from '../visualizations';
 
 type VisualizationsServiceFactory = PluginServiceFactory<CanvasVisualizationsService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/workpad.ts b/x-pack/plugins/canvas/public/services/stubs/workpad.ts
index 6268fa128df0f..f0f877d6d33c2 100644
--- a/x-pack/plugins/canvas/public/services/stubs/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/workpad.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 // @ts-expect-error
 import { getDefaultWorkpad, getExportedWorkpad } from '../../state/defaults';
diff --git a/x-pack/plugins/canvas/public/services/visualizations.ts b/x-pack/plugins/canvas/public/services/visualizations.ts
index c602b1dd39f3d..dc816f764e5ec 100644
--- a/x-pack/plugins/canvas/public/services/visualizations.ts
+++ b/x-pack/plugins/canvas/public/services/visualizations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { VisualizationsStart } from '../../../../../src/plugins/visualizations/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
 
 export interface CanvasVisualizationsService {
   showNewVisModal: VisualizationsStart['showNewVisModal'];
diff --git a/x-pack/plugins/canvas/public/services/workpad.ts b/x-pack/plugins/canvas/public/services/workpad.ts
index 36780a5df1dfd..1b4b912365e3a 100644
--- a/x-pack/plugins/canvas/public/services/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsResolveResponse } from 'src/core/public';
+import { SavedObjectsResolveResponse } from '@kbn/core/public';
 import { CanvasWorkpad, CanvasTemplate } from '../../types';
 import { CanvasRenderedWorkpad } from '../../shareable_runtime/types';
 
diff --git a/x-pack/plugins/canvas/public/setup_expressions.ts b/x-pack/plugins/canvas/public/setup_expressions.ts
index 54f1c6dbc0d96..2098ad62ad756 100644
--- a/x-pack/plugins/canvas/public/setup_expressions.ts
+++ b/x-pack/plugins/canvas/public/setup_expressions.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../src/core/public';
-import { serializeProvider } from '../../../../src/plugins/expressions/common';
+import { CoreSetup } from '@kbn/core/public';
+import { serializeProvider } from '@kbn/expressions-plugin/common';
 import { API_ROUTE_FUNCTIONS } from '../common/lib/constants';
 
 import { CanvasSetupDeps } from './plugin';
diff --git a/x-pack/plugins/canvas/public/store.ts b/x-pack/plugins/canvas/public/store.ts
index 7fe4eb21ee46f..83e36a41da322 100644
--- a/x-pack/plugins/canvas/public/store.ts
+++ b/x-pack/plugins/canvas/public/store.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { CoreSetup } from '@kbn/core/public';
 import {
   createStore as createReduxStore,
   destroyStore as destroy,
@@ -15,7 +16,6 @@ import {
 // @ts-expect-error untyped local
 import { getInitialState } from './state/initial_state';
 
-import { CoreSetup } from '../../../../src/core/public';
 import { API_ROUTE_FUNCTIONS } from '../common/lib/constants';
 
 export async function createStore(core: CoreSetup) {
diff --git a/x-pack/plugins/canvas/scripts/shareable_runtime.js b/x-pack/plugins/canvas/scripts/shareable_runtime.js
index b760a92811b8e..d182543b5a092 100644
--- a/x-pack/plugins/canvas/scripts/shareable_runtime.js
+++ b/x-pack/plugins/canvas/scripts/shareable_runtime.js
@@ -51,9 +51,10 @@ run(
     if (flags.run) {
       log.info('Starting Webpack Dev Server...');
       execa.sync(
-        'yarn',
+        process.execPath,
         [
-          'webpack-dev-server',
+          '--preserve-symlinks',
+          require.resolve('webpack-dev-server/bin/webpack-dev-server'),
           '--config',
           webpackConfig,
           ...(process.stdout.isTTY && !process.env.CI ? ['--progress'] : []),
@@ -87,9 +88,10 @@ run(
     clean();
     log.info('Building Canvas Shareable Workpad Runtime...');
     execa.sync(
-      'yarn',
+      process.execPath,
       [
-        'webpack',
+        '--preserve-symlinks',
+        require.resolve('webpack/bin/webpack'),
         '--config',
         webpackConfig,
         '--hide-modules',
diff --git a/x-pack/plugins/canvas/server/collectors/collector.ts b/x-pack/plugins/canvas/server/collectors/collector.ts
index 00a246ca8fa30..f98bd319a8ac0 100644
--- a/x-pack/plugins/canvas/server/collectors/collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { TelemetryCollector } from '../../types';
 
 import { workpadCollector, workpadSchema, WorkpadTelemetry } from './workpad_collector';
diff --git a/x-pack/plugins/canvas/server/collectors/collector_helpers.ts b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
index aa88d910098a5..b6781582db3bd 100644
--- a/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
+++ b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
@@ -11,7 +11,7 @@
  */
 
 import { isAst } from '@kbn/interpreter';
-import { ExpressionAstNode } from '../../../../../src/plugins/expressions/common';
+import { ExpressionAstNode } from '@kbn/expressions-plugin/common';
 
 export function collectFns(ast: ExpressionAstNode, cb: (functionName: string) => void) {
   if (!isAst(ast)) {
diff --git a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
index bd855c93ed507..66238abfe89df 100644
--- a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
@@ -6,14 +6,14 @@
  */
 
 import { get } from 'lodash';
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { parseExpression } from '@kbn/expressions-plugin/common';
 import { collectFns } from './collector_helpers';
 import {
   TelemetryCollector,
   TelemetryCustomElement,
   TelemetryCustomElementDocument,
 } from '../../types';
-import { parseExpression } from '../../../../../src/plugins/expressions/common';
 
 const CUSTOM_ELEMENT_TYPE = 'canvas-element';
 interface CustomElementSearch {
diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
index b47ea33a24f4c..72c0206226090 100644
--- a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
@@ -7,11 +7,11 @@
 
 import { sum as arraySum, min as arrayMin, max as arrayMax, get } from 'lodash';
 import moment from 'moment';
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { parseExpression } from '@kbn/expressions-plugin/common';
 import { CANVAS_TYPE } from '../../common/lib/constants';
 import { collectFns } from './collector_helpers';
 import { TelemetryCollector, CanvasWorkpad } from '../../types';
-import { parseExpression } from '../../../../../src/plugins/expressions/common';
 
 interface WorkpadSearch {
   [CANVAS_TYPE]: CanvasWorkpad;
diff --git a/x-pack/plugins/canvas/server/feature.test.ts b/x-pack/plugins/canvas/server/feature.test.ts
index d5325a2c1607b..d6ec20258f5cf 100644
--- a/x-pack/plugins/canvas/server/feature.test.ts
+++ b/x-pack/plugins/canvas/server/feature.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReportingStart } from '../../reporting/server/types';
+import { ReportingStart } from '@kbn/reporting-plugin/server/types';
 import { getCanvasFeature } from './feature';
 
 let mockReportingPlugin: ReportingStart;
diff --git a/x-pack/plugins/canvas/server/feature.ts b/x-pack/plugins/canvas/server/feature.ts
index 84298464e94fc..f5fc320fbeb50 100644
--- a/x-pack/plugins/canvas/server/feature.ts
+++ b/x-pack/plugins/canvas/server/feature.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { KibanaFeatureConfig } from '../../features/common';
-import { ReportingSetup } from '../../reporting/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { ReportingSetup } from '@kbn/reporting-plugin/server';
 
 /*
  * Register Canvas as a Kibana feature,
diff --git a/x-pack/plugins/canvas/server/index.ts b/x-pack/plugins/canvas/server/index.ts
index 79888c98c8caa..d6d375b7259ac 100644
--- a/x-pack/plugins/canvas/server/index.ts
+++ b/x-pack/plugins/canvas/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CanvasPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/canvas/server/lib/essql_strategy.ts b/x-pack/plugins/canvas/server/lib/essql_strategy.ts
index 4e69f4831d375..39e019591b1cf 100644
--- a/x-pack/plugins/canvas/server/lib/essql_strategy.ts
+++ b/x-pack/plugins/canvas/server/lib/essql_strategy.ts
@@ -8,9 +8,9 @@
 import { from } from 'rxjs';
 import { map, zipObject } from 'lodash';
 
-import { ISearchStrategy } from 'src/plugins/data/server';
+import { ISearchStrategy } from '@kbn/data-plugin/server';
 
-import { getKbnServerError } from '../../../../../src/plugins/kibana_utils/server';
+import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { EssqlSearchStrategyRequest, EssqlSearchStrategyResponse } from '../../types';
 
 import { buildBoolArray } from '../../common/lib/request/build_bool_array';
diff --git a/x-pack/plugins/canvas/server/mocks/workpad_route_context.ts b/x-pack/plugins/canvas/server/mocks/workpad_route_context.ts
index 13e4e34b20b66..fb5ad3285e766 100644
--- a/x-pack/plugins/canvas/server/mocks/workpad_route_context.ts
+++ b/x-pack/plugins/canvas/server/mocks/workpad_route_context.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CanvasRouteHandlerContext } from '../workpad_route_context';
 
-export interface MockWorkpadRouteContext extends CanvasRouteHandlerContext {
+export interface MockWorkpadRouteContext extends AwaitedProperties<CanvasRouteHandlerContext> {
   canvas: {
     workpad: {
       create: jest.Mock;
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index de4d452508cf2..67675b9f2513b 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { CoreSetup, PluginInitializerContext, Plugin, Logger, CoreStart } from 'src/core/server';
+import { CoreSetup, PluginInitializerContext, Plugin, Logger, CoreStart } from '@kbn/core/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from 'src/plugins/data/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { HomeServerPluginSetup } from 'src/plugins/home/server';
-import { EmbeddableSetup } from 'src/plugins/embeddable/server';
+} from '@kbn/data-plugin/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { ReportingSetup } from '@kbn/reporting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { ESSQL_SEARCH_STRATEGY } from '../common/lib/constants';
-import { ReportingSetup } from '../../reporting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import { getCanvasFeature } from './feature';
 import { initRoutes } from './routes';
 import { registerCanvasUsageCollector } from './collectors';
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 f565c911274f8..5920377c85336 100644
--- a/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
+++ b/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler, RequestHandlerContext } from 'src/core/server';
+import { RequestHandler, RequestHandlerContext } from '@kbn/core/server';
 
 export const catchErrorHandler: <P, Q, B, Context extends RequestHandlerContext>(
   fn: RequestHandler<P, Q, B, Context>
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts
index fe34eeeb6e631..69bb51de7d5c5 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts
@@ -6,10 +6,11 @@
  */
 
 import sinon from 'sinon';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { AwaitedProperties } from '@kbn/utility-types';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeCreateCustomElementRoute } from './create';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -18,7 +19,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 const mockedUUID = '123abc';
 const now = new Date();
@@ -54,7 +55,11 @@ describe('POST custom element', () => {
       body: mockCustomElement,
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ ok: true });
@@ -82,7 +87,11 @@ describe('POST custom element', () => {
       throw mockRouteContext.core.savedObjects.client.errors.createBadRequestError('bad request');
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
   });
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/create.ts b/x-pack/plugins/canvas/server/routes/custom_elements/create.ts
index 9e5b38002dc06..8164c124e27dc 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/create.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/create.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { getId } from '../../../common/lib/get_id';
 import { CustomElementSchema } from './custom_element_schema';
@@ -34,7 +34,8 @@ export function initializeCreateCustomElementRoute(deps: RouteInitializerDeps) {
       const now = new Date().toISOString();
       const { id, ...payload } = customElement;
 
-      await context.core.savedObjects.client.create<CustomElementAttributes>(
+      const soClient = (await context.core).savedObjects.client;
+      await soClient.create<CustomElementAttributes>(
         CUSTOM_ELEMENT_TYPE,
         {
           ...payload,
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts
index 5d7321d6943d1..e989f1c7741f6 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeDeleteCustomElementRoute } from './delete';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -17,7 +18,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 describe('DELETE custom element', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -39,7 +40,11 @@ describe('DELETE custom element', () => {
       },
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ ok: true });
@@ -62,7 +67,11 @@ describe('DELETE custom element', () => {
       throw mockRouteContext.core.savedObjects.client.errors.createBadRequestError('bad request');
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
   });
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts b/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts
index 53f1f271c80a7..60092f2a721f9 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { okResponse } from '../ok_response';
 import { catchErrorHandler } from '../catch_error_handler';
@@ -23,7 +23,8 @@ export function initializeDeleteCustomElementRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      await context.core.savedObjects.client.delete(CUSTOM_ELEMENT_TYPE, request.params.id);
+      const soClient = (await context.core).savedObjects.client;
+      await soClient.delete(CUSTOM_ELEMENT_TYPE, request.params.id);
       return response.ok({ body: okResponse });
     })
   );
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts
index e84eb835ce225..65a9d528a849d 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { initializeFindCustomElementsRoute } from './find';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -16,7 +17,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 describe('Find custom element', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -52,7 +53,11 @@ describe('Find custom element', () => {
       },
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
     expect(findMock.mock.calls[0][0].search).toBe(`${name}* | ${name}`);
     expect(findMock.mock.calls[0][0].perPage).toBe(perPage);
@@ -88,7 +93,11 @@ describe('Find custom element', () => {
       },
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/find.ts b/x-pack/plugins/canvas/server/routes/custom_elements/find.ts
index 069fd149069c8..0f7f492cef87c 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/find.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/find.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectAttributes } from 'src/core/server';
-import { RouteInitializerDeps } from '../';
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 
 export function initializeFindCustomElementsRoute(deps: RouteInitializerDeps) {
@@ -24,7 +24,7 @@ export function initializeFindCustomElementsRoute(deps: RouteInitializerDeps) {
       },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const savedObjectsClient = (await context.core).savedObjects.client;
       const { name, page, perPage } = request.query;
 
       try {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts
index ee1db89bda228..e12b1840d58c4 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeGetCustomElementRoute } from './get';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -17,7 +18,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 describe('GET custom element', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -48,7 +49,11 @@ describe('GET custom element', () => {
 
     mockRouteContext.core.savedObjects.client = savedObjectsClient;
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`
@@ -84,7 +89,11 @@ describe('GET custom element', () => {
     });
     mockRouteContext.core.savedObjects.client = savedObjectsClient;
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.payload).toMatchInlineSnapshot(`
       Object {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/get.ts b/x-pack/plugins/canvas/server/routes/custom_elements/get.ts
index 26e8c14305c27..06696ca017ca8 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/get.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { CustomElementAttributes } from './custom_element_attributes';
 import { catchErrorHandler } from '../catch_error_handler';
@@ -23,7 +23,8 @@ export function initializeGetCustomElementRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      const customElement = await context.core.savedObjects.client.get<CustomElementAttributes>(
+      const soClient = (await context.core).savedObjects.client;
+      const customElement = await soClient.get<CustomElementAttributes>(
         CUSTOM_ELEMENT_TYPE,
         request.params.id
       );
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/index.ts b/x-pack/plugins/canvas/server/routes/custom_elements/index.ts
index ec84cd4987246..86d40d1d01ba3 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/index.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeFindCustomElementsRoute } from './find';
 import { initializeGetCustomElementRoute } from './get';
 import { initializeCreateCustomElementRoute } from './create';
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts
index d19fb5516bd47..cc24f5ad708ab 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts
@@ -6,11 +6,12 @@
  */
 
 import sinon from 'sinon';
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CustomElement } from '../../../types';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeUpdateCustomElementRoute } from './update';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { okResponse } from '../ok_response';
 import { getMockedRouterDeps } from '../test_helpers';
 
@@ -20,7 +21,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 const now = new Date();
 const nowIso = now.toISOString();
@@ -82,7 +83,11 @@ describe('PUT custom element', () => {
 
     mockRouteContext.core.savedObjects.client = savedObjectsClient;
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual(okResponse);
@@ -117,7 +122,11 @@ describe('PUT custom element', () => {
       );
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(404);
   });
 
@@ -144,7 +153,11 @@ describe('PUT custom element', () => {
       throw mockRouteContext.core.savedObjects.client.errors.createBadRequestError('bad request');
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
   });
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/update.ts b/x-pack/plugins/canvas/server/routes/custom_elements/update.ts
index e38e9467e2854..d0c1b8072e1d0 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/update.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/update.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { omit } from 'lodash';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { CustomElementUpdateSchema } from './custom_element_schema';
 import { CustomElementAttributes } from './custom_element_attributes';
@@ -37,14 +37,14 @@ export function initializeUpdateCustomElementRoute(deps: RouteInitializerDeps) {
       const id = request.params.id;
 
       const now = new Date().toISOString();
+      const soClient = (await context.core).savedObjects.client;
 
-      const customElementObject =
-        await context.core.savedObjects.client.get<CustomElementAttributes>(
-          CUSTOM_ELEMENT_TYPE,
-          id
-        );
+      const customElementObject = await soClient.get<CustomElementAttributes>(
+        CUSTOM_ELEMENT_TYPE,
+        id
+      );
 
-      await context.core.savedObjects.client.create<CustomElementAttributes>(
+      await soClient.create<CustomElementAttributes>(
         CUSTOM_ELEMENT_TYPE,
         {
           ...customElementObject.attributes,
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
index ee17b2d3035b8..06a30af03c921 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
+++ b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { initializeESFieldsRoute } from './es_fields';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServerMock, elasticsearchServiceMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock, elasticsearchServiceMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -16,7 +17,7 @@ const mockRouteContext = {
       client: elasticsearchServiceMock.createScopedClusterClient(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 const path = `api/canvas/workpad/find`;
 
@@ -71,7 +72,11 @@ describe('Retrieve ES Fields', () => {
 
     fieldCapsMock.mockResolvedValueOnce(mockResults);
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`
@@ -99,7 +104,11 @@ describe('Retrieve ES Fields', () => {
 
     fieldCapsMock.mockResolvedValueOnce(mockResults);
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot('Object {}');
@@ -127,7 +136,11 @@ describe('Retrieve ES Fields', () => {
 
     fieldCapsMock.mockResolvedValueOnce(mockResults);
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`Object {}`);
@@ -148,7 +161,11 @@ describe('Retrieve ES Fields', () => {
     fieldCapsMock.mockRejectedValueOnce(new Error('Index not found'));
 
     await expect(
-      routeHandler(mockRouteContext, request, kibanaResponseFactory)
+      routeHandler(
+        coreMock.createCustomRequestHandlerContext(mockRouteContext),
+        request,
+        kibanaResponseFactory
+      )
     ).rejects.toThrowError('Index not found');
   });
 });
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts
index f9523cee0ce4d..1923d4648a2a3 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts
+++ b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts
@@ -28,7 +28,7 @@ export function initializeESFieldsRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      const client = context.core.elasticsearch.client.asCurrentUser;
+      const client = (await context.core).elasticsearch.client.asCurrentUser;
       const { index, fields } = request.query;
 
       const config = {
diff --git a/x-pack/plugins/canvas/server/routes/functions/functions.test.ts b/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
index 9265850553d7e..9a308b8f0b545 100644
--- a/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
+++ b/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-import { ExpressionFunction } from 'src/plugins/expressions/common/expression_functions';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common/expression_functions';
 import { initializeGetFunctionsRoute } from './functions';
 import { getMockedRouterDeps } from '../test_helpers';
 import { API_ROUTE_FUNCTIONS } from '../../../common/lib';
diff --git a/x-pack/plugins/canvas/server/routes/functions/functions.ts b/x-pack/plugins/canvas/server/routes/functions/functions.ts
index 47b35a4f6c17b..a2cc8f0a365e9 100644
--- a/x-pack/plugins/canvas/server/routes/functions/functions.ts
+++ b/x-pack/plugins/canvas/server/routes/functions/functions.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { serializeProvider } from '../../../../../../src/plugins/expressions/common';
-import { RouteInitializerDeps } from '../';
+import { serializeProvider } from '@kbn/expressions-plugin/common';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_FUNCTIONS } from '../../../common/lib/constants';
 
 interface FunctionCall {
diff --git a/x-pack/plugins/canvas/server/routes/index.ts b/x-pack/plugins/canvas/server/routes/index.ts
index b7ba5637119f8..73829cb372e70 100644
--- a/x-pack/plugins/canvas/server/routes/index.ts
+++ b/x-pack/plugins/canvas/server/routes/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter, Logger } from 'src/core/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
+import { IRouter, Logger } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { initCustomElementsRoutes } from './custom_elements';
 import { initESFieldsRoutes } from './es_fields';
 import { initShareablesRoutes } from './shareables';
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.test.ts b/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
index d91b7160ccb91..cb93695a1ee49 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
@@ -8,8 +8,8 @@
 import fs from 'fs';
 import { SHAREABLE_RUNTIME_FILE } from '../../../shareable_runtime/constants';
 
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { initializeDownloadShareableWorkpadRoute } from './download';
 import { getMockedRouterDeps } from '../test_helpers';
 
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.ts b/x-pack/plugins/canvas/server/routes/shareables/download.ts
index 89104cf2e4884..27b3765d240ec 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/download.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.ts
@@ -7,7 +7,7 @@
 
 import { readFileSync } from 'fs';
 import { SHAREABLE_RUNTIME_FILE } from '../../../shareable_runtime/constants';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD } from '../../../common/lib/constants';
 
 export function initializeDownloadShareableWorkpadRoute(deps: RouteInitializerDeps) {
diff --git a/x-pack/plugins/canvas/server/routes/shareables/index.ts b/x-pack/plugins/canvas/server/routes/shareables/index.ts
index 0d06bb3397151..a14975632a26b 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/index.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeZipShareableWorkpadRoute } from './zip';
 import { initializeDownloadShareableWorkpadRoute } from './download';
 
diff --git a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
index 73387db51aab4..a0a741fa6b538 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
@@ -9,8 +9,8 @@ jest.mock('archiver');
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const archiver = require('archiver') as jest.Mock;
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { initializeZipShareableWorkpadRoute } from './zip';
 import { getMockedRouterDeps } from '../test_helpers';
 import { API_ROUTE_SHAREABLE_ZIP } from '../../../common/lib';
diff --git a/x-pack/plugins/canvas/server/routes/templates/index.ts b/x-pack/plugins/canvas/server/routes/templates/index.ts
index f291de34c4bf3..26ca9756eb20d 100644
--- a/x-pack/plugins/canvas/server/routes/templates/index.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeListTemplates } from './list';
 
 export function initTemplateRoutes(deps: RouteInitializerDeps) {
diff --git a/x-pack/plugins/canvas/server/routes/templates/list.test.ts b/x-pack/plugins/canvas/server/routes/templates/list.test.ts
index d055692e17191..a1480eb0eaea1 100644
--- a/x-pack/plugins/canvas/server/routes/templates/list.test.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/list.test.ts
@@ -6,9 +6,10 @@
  */
 
 import { badRequest } from '@hapi/boom';
+import { AwaitedProperties } from '@kbn/utility-types';
 import { initializeListTemplates } from './list';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -17,7 +18,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 describe('Find workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -50,7 +51,11 @@ describe('Find workpad', () => {
       path: `api/canvas/templates/list`,
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
 
     expect(response.payload).toMatchInlineSnapshot(`
@@ -77,7 +82,11 @@ describe('Find workpad', () => {
       path: `api/canvas/templates/list`,
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
     expect(response.payload).toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/canvas/server/routes/templates/list.ts b/x-pack/plugins/canvas/server/routes/templates/list.ts
index 3115743d66b0a..c0e32fb3722b1 100644
--- a/x-pack/plugins/canvas/server/routes/templates/list.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/list.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { TEMPLATE_TYPE, API_ROUTE_TEMPLATES } from '../../../common/lib/constants';
 import { catchErrorHandler } from '../catch_error_handler';
 import { CanvasTemplate } from '../../../types';
@@ -21,7 +21,7 @@ export function initializeListTemplates(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const savedObjectsClient = (await context.core).savedObjects.client;
 
       const templates = await savedObjectsClient.find<CanvasTemplate>({
         type: TEMPLATE_TYPE,
diff --git a/x-pack/plugins/canvas/server/routes/test_helpers.ts b/x-pack/plugins/canvas/server/routes/test_helpers.ts
index bc1aaee41f9e8..30d63576ed6f2 100644
--- a/x-pack/plugins/canvas/server/routes/test_helpers.ts
+++ b/x-pack/plugins/canvas/server/routes/test_helpers.ts
@@ -9,9 +9,9 @@ import {
   httpServiceMock,
   loggingSystemMock,
   elasticsearchServiceMock,
-} from 'src/core/server/mocks';
-import { bfetchPluginMock } from '../../../../../src/plugins/bfetch/server/mocks';
-import { expressionsPluginMock } from '../../../../../src/plugins/expressions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/server/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/server/mocks';
 
 export function getMockedRouterDeps() {
   const httpService = httpServiceMock.createSetupContract();
diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
index 87ead1bf897f9..304d7864950e4 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { AwaitedProperties } from '@kbn/utility-types';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { workpadRouteContextMock, MockWorkpadRouteContext } from '../../mocks';
 import { initializeCreateWorkpadRoute } from './create';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 import { getMockedRouterDeps } from '../test_helpers';
 
 let mockRouteContext = {
@@ -18,7 +19,7 @@ let mockRouteContext = {
     },
   },
   canvas: workpadRouteContextMock.create(),
-} as unknown as MockWorkpadRouteContext;
+} as unknown as AwaitedProperties<MockWorkpadRouteContext>;
 
 jest.mock('uuid/v4', () => jest.fn().mockReturnValue('123abc'));
 
@@ -33,7 +34,7 @@ describe('POST workpad', () => {
         },
       },
       canvas: workpadRouteContextMock.create(),
-    } as unknown as MockWorkpadRouteContext;
+    } as unknown as AwaitedProperties<MockWorkpadRouteContext>;
 
     const routerDeps = getMockedRouterDeps();
     initializeCreateWorkpadRoute(routerDeps);
@@ -57,7 +58,11 @@ describe('POST workpad', () => {
       body: mockWorkpad,
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ ok: true, id });
@@ -75,7 +80,11 @@ describe('POST workpad', () => {
       throw mockRouteContext.core.savedObjects.client.errors.createBadRequestError('bad request');
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
   });
@@ -109,7 +118,11 @@ describe('POST workpad', () => {
       body: cloneFromTemplateBody,
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ ok: true, id });
diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.ts b/x-pack/plugins/canvas/server/routes/workpad/create.ts
index 2a0c47fee4c9e..dec03c8945ac6 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/create.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/create.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD, TEMPLATE_TYPE } from '../../../common/lib/constants';
 import { CanvasWorkpad } from '../../../types';
 import { WorkpadSchema } from './workpad_schema';
@@ -50,14 +50,16 @@ export function initializeCreateWorkpadRoute(deps: RouteInitializerDeps) {
       let workpad = request.body as CanvasWorkpad;
 
       if (isCreateFromTemplate(request.body)) {
-        const templateSavedObject = await context.core.savedObjects.client.get<TemplateAttributes>(
+        const soClient = (await context.core).savedObjects.client;
+        const templateSavedObject = await soClient.get<TemplateAttributes>(
           TEMPLATE_TYPE,
           request.body.templateId
         );
         workpad = templateSavedObject.attributes.template;
       }
 
-      const createdObject = await context.canvas.workpad.create(workpad);
+      const canvasContext = await context.canvas;
+      const createdObject = await canvasContext.workpad.create(workpad);
 
       return response.ok({
         body: { ...okResponse, id: createdObject.id },
diff --git a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
index b3f1ebd4db528..f29bad869a8a6 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeDeleteWorkpadRoute } from './delete';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -17,7 +18,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 describe('DELETE workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -39,7 +40,11 @@ describe('DELETE workpad', () => {
       },
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ ok: true });
@@ -59,7 +64,11 @@ describe('DELETE workpad', () => {
       throw mockRouteContext.core.savedObjects.client.errors.createBadRequestError('bad request');
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
   });
diff --git a/x-pack/plugins/canvas/server/routes/workpad/delete.ts b/x-pack/plugins/canvas/server/routes/workpad/delete.ts
index 0a1d0d7826b52..0a1f69e273d05 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/delete.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 import { okResponse } from '../ok_response';
 import { catchErrorHandler } from '../catch_error_handler';
@@ -23,7 +23,8 @@ export function initializeDeleteWorkpadRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      context.core.savedObjects.client.delete(CANVAS_TYPE, request.params.id);
+      const soClient = (await context.core).savedObjects.client;
+      await soClient.delete(CANVAS_TYPE, request.params.id);
       return response.ok({ body: okResponse });
     })
   );
diff --git a/x-pack/plugins/canvas/server/routes/workpad/find.test.ts b/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
index 6379b6f8258b7..39626e95c3f06 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { initializeFindWorkpadsRoute } from './find';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
@@ -16,7 +17,7 @@ const mockRouteContext = {
       client: savedObjectsClientMock.create(),
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 describe('Find workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -52,7 +53,11 @@ describe('Find workpad', () => {
       },
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
     expect(findMock.mock.calls[0][0].search).toBe(`${name}* | ${name}`);
     expect(findMock.mock.calls[0][0].perPage).toBe(perPage);
@@ -88,7 +93,11 @@ describe('Find workpad', () => {
       },
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/canvas/server/routes/workpad/find.ts b/x-pack/plugins/canvas/server/routes/workpad/find.ts
index 5e7a3606755b5..43db20ee11db5 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/find.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/find.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectAttributes } from 'src/core/server';
-import { RouteInitializerDeps } from '../';
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RouteInitializerDeps } from '..';
 import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 
 export function initializeFindWorkpadsRoute(deps: RouteInitializerDeps) {
@@ -24,7 +24,7 @@ export function initializeFindWorkpadsRoute(deps: RouteInitializerDeps) {
       },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const savedObjectsClient = (await context.core).savedObjects.client;
       const { name, page, perPage } = request.query;
 
       try {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
index cae485b62f66f..217072d045321 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeGetWorkpadRoute } from './get';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { workpadWithGroupAsElement } from '../../../__fixtures__/workpads';
 import { CanvasWorkpad } from '../../../types';
 import { getMockedRouterDeps } from '../test_helpers';
@@ -16,7 +17,7 @@ import { workpadRouteContextMock, MockWorkpadRouteContext } from '../../mocks';
 
 const mockRouteContext = {
   canvas: workpadRouteContextMock.create(),
-} as unknown as MockWorkpadRouteContext;
+} as unknown as AwaitedProperties<MockWorkpadRouteContext>;
 
 describe('GET workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -48,7 +49,11 @@ describe('GET workpad', () => {
       references: [],
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`
@@ -83,7 +88,11 @@ describe('GET workpad', () => {
       references: [],
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     const workpad = response.payload as CanvasWorkpad;
 
     expect(response.status).toBe(200);
@@ -108,7 +117,11 @@ describe('GET workpad', () => {
       throw savedObjectsClient.errors.createGenericNotFoundError(CANVAS_TYPE, id);
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.payload).toMatchInlineSnapshot(`
       Object {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/get.ts b/x-pack/plugins/canvas/server/routes/workpad/get.ts
index 11e39adc4ca32..fe38b768f64a1 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/get.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 import { catchErrorHandler } from '../catch_error_handler';
 import { shimWorkpad } from './shim_workpad';
@@ -23,7 +23,8 @@ export function initializeGetWorkpadRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      const workpad = await context.canvas.workpad.get(request.params.id);
+      const canvasContext = await context.canvas;
+      const workpad = await canvasContext.workpad.get(request.params.id);
 
       shimWorkpad(workpad);
 
diff --git a/x-pack/plugins/canvas/server/routes/workpad/import.ts b/x-pack/plugins/canvas/server/routes/workpad/import.ts
index 35d362f43becc..4734e1e554f64 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/import.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/import.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD_IMPORT } from '../../../common/lib/constants';
 import { ImportedCanvasWorkpad } from '../../../types';
 import { ImportedWorkpadSchema } from './workpad_schema';
@@ -32,7 +32,8 @@ export function initializeImportWorkpadRoute(deps: RouteInitializerDeps) {
     catchErrorHandler(async (context, request, response) => {
       const workpad = request.body as ImportedCanvasWorkpad;
 
-      const createdObject = await context.canvas.workpad.import(workpad);
+      const canvasContext = await context.canvas;
+      const createdObject = await canvasContext.workpad.import(workpad);
 
       return response.ok({
         body: { ...okResponse, id: createdObject.id },
diff --git a/x-pack/plugins/canvas/server/routes/workpad/index.ts b/x-pack/plugins/canvas/server/routes/workpad/index.ts
index b97d58ee232f1..067b54e7cbebe 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/index.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeFindWorkpadsRoute } from './find';
 import { initializeGetWorkpadRoute } from './get';
 import { initializeCreateWorkpadRoute } from './create';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts b/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts
index bc93e115e137f..80fde2fadc18b 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeResolveWorkpadRoute } from './resolve';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { workpadWithGroupAsElement } from '../../../__fixtures__/workpads';
 import { CanvasWorkpad } from '../../../types';
 import { getMockedRouterDeps } from '../test_helpers';
@@ -16,7 +17,7 @@ import { workpadRouteContextMock, MockWorkpadRouteContext } from '../../mocks';
 
 const mockRouteContext = {
   canvas: workpadRouteContextMock.create(),
-} as unknown as MockWorkpadRouteContext;
+} as unknown as AwaitedProperties<MockWorkpadRouteContext>;
 
 describe('RESOLVE workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
@@ -55,7 +56,11 @@ describe('RESOLVE workpad', () => {
       alias_target_id: aliasId,
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toMatchInlineSnapshot(`
@@ -97,7 +102,11 @@ describe('RESOLVE workpad', () => {
       outcome: 'exactMatch',
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     const workpad = response.payload.workpad as CanvasWorkpad;
 
     expect(response.status).toBe(200);
@@ -122,7 +131,11 @@ describe('RESOLVE workpad', () => {
       throw savedObjectsClient.errors.createGenericNotFoundError(CANVAS_TYPE, id);
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.payload).toMatchInlineSnapshot(`
       Object {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/resolve.ts b/x-pack/plugins/canvas/server/routes/workpad/resolve.ts
index e5643a9a81353..d2a4b71f35af9 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/resolve.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/resolve.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 import { catchErrorHandler } from '../catch_error_handler';
 import { shimWorkpad } from './shim_workpad';
@@ -23,7 +23,8 @@ export function initializeResolveWorkpadRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      const resolved = await context.canvas.workpad.resolve(request.params.id);
+      const canvasContext = await context.canvas;
+      const resolved = await canvasContext.workpad.resolve(request.params.id);
       const { saved_object: workpad } = resolved;
 
       shimWorkpad(workpad);
diff --git a/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts b/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts
index 63fa5bb252985..755c0c3391bf3 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { WorkpadAttributes } from './workpad_attributes';
 
 export function shimWorkpad(workpad: SavedObject<WorkpadAttributes>) {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
index 240298564fdba..2467ed56bdc37 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
+import { AwaitedProperties } from '@kbn/utility-types';
 import sinon from 'sinon';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeUpdateWorkpadRoute, initializeUpdateWorkpadAssetsRoute } from './update';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { workpads } from '../../../__fixtures__/workpads';
 import { okResponse } from '../ok_response';
 import { getMockedRouterDeps } from '../test_helpers';
@@ -22,7 +23,7 @@ const mockRouteContext = {
     },
   },
   canvas: workpadRouteContextMock.create(),
-} as unknown as MockWorkpadRouteContext;
+} as unknown as AwaitedProperties<MockWorkpadRouteContext>;
 
 const workpad = workpads[0];
 const now = new Date();
@@ -62,7 +63,11 @@ describe('PUT workpad', () => {
 
     mockRouteContext.canvas.workpad.update.mockResolvedValue(true);
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(200);
     expect(response.payload).toEqual(okResponse);
@@ -85,7 +90,11 @@ describe('PUT workpad', () => {
       );
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(404);
   });
@@ -104,7 +113,11 @@ describe('PUT workpad', () => {
       throw mockRouteContext.core.savedObjects.client.errors.createBadRequestError('bad request');
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
 
     expect(response.status).toBe(400);
   });
@@ -160,7 +173,11 @@ describe('update assets', () => {
       references: [],
     });
 
-    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+    const response = await routeHandler(
+      coreMock.createCustomRequestHandlerContext(mockRouteContext),
+      request,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
 
     expect(mockRouteContext.canvas.workpad.update).toBeCalledWith(id, {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.ts b/x-pack/plugins/canvas/server/routes/workpad/update.ts
index 2fe3c8fc9e3ed..d74e57f824f51 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/update.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/update.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { CanvasWorkpad } from '../../../types';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import {
   API_ROUTE_WORKPAD,
   API_ROUTE_WORKPAD_STRUCTURES,
@@ -40,7 +40,8 @@ export function initializeUpdateWorkpadRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      await context.canvas.workpad.update(request.params.id, request.body as CanvasWorkpad);
+      const canvasContext = await context.canvas;
+      await canvasContext.workpad.update(request.params.id, request.body as CanvasWorkpad);
 
       return response.ok({
         body: okResponse,
@@ -65,7 +66,8 @@ export function initializeUpdateWorkpadRoute(deps: RouteInitializerDeps) {
       },
     },
     catchErrorHandler(async (context, request, response) => {
-      await context.canvas.workpad.update(request.params.id, request.body as CanvasWorkpad);
+      const canvasContext = await context.canvas;
+      await canvasContext.workpad.update(request.params.id, request.body as CanvasWorkpad);
 
       return response.ok({
         body: okResponse,
@@ -101,7 +103,8 @@ export function initializeUpdateWorkpadAssetsRoute(deps: RouteInitializerDeps) {
         assets: AssetsRecordSchema.validate(request.body),
       };
 
-      await context.canvas.workpad.update(request.params.id, workpadAssets as CanvasWorkpad);
+      const canvasContext = await context.canvas;
+      await canvasContext.workpad.update(request.params.id, workpadAssets as CanvasWorkpad);
 
       return response.ok({
         body: okResponse,
diff --git a/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts b/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
index d891a5405a424..da219146a3609 100644
--- a/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
+++ b/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SampleDataRegistrySetup } from 'src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { CANVAS as label } from '../../i18n';
-import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from './index';
+import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from '.';
 
 export function loadSampleData(
   addSavedObjectsToSampleDataset: SampleDataRegistrySetup['addSavedObjectsToSampleDataset'],
diff --git a/x-pack/plugins/canvas/server/saved_objects/custom_element.ts b/x-pack/plugins/canvas/server/saved_objects/custom_element.ts
index 82305b2fdd95f..db87909fbd44f 100644
--- a/x-pack/plugins/canvas/server/saved_objects/custom_element.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/custom_element.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CUSTOM_ELEMENT_TYPE } from '../../common/lib/constants';
 import { customElementMigrationsFactory, CanvasSavedObjectTypeMigrationsDeps } from './migrations';
 
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts
index 20eba14c5cff0..d0afe5ec8e814 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts
@@ -6,8 +6,9 @@
  */
 import { Ast, fromExpression, toExpression } from '@kbn/interpreter';
 import { Serializable } from '@kbn/utility-types';
-import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { flowRight, mapValues } from 'lodash';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import {
   CanvasElement,
   CanvasTemplateElement,
@@ -16,10 +17,6 @@ import {
   CustomElementContent,
   CustomElementNode,
 } from '../../../types';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
 import { WorkpadAttributes } from '../../routes/workpad/workpad_attributes';
 import { CanvasSavedObjectTypeMigrationsDeps } from './types';
 
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts
index 88913b50c3c4c..dcfab92b4e859 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { mergeMigrationFunctionMaps } from '@kbn/kibana-utils-plugin/common';
 import {
   customElementExpressionsMigrationsFactory,
   templateWorkpadExpressionsMigrationsFactory,
@@ -11,7 +12,6 @@ import {
 } from './expressions';
 import { CanvasSavedObjectTypeMigrationsDeps } from './types';
 import { workpadMigrationsFactory as workpadMigrationsFactoryFn } from './workpad';
-import { mergeMigrationFunctionMaps } from '../../../../../../src/plugins/kibana_utils/common';
 
 export const workpadMigrationsFactory = (deps: CanvasSavedObjectTypeMigrationsDeps) =>
   mergeMigrationFunctionMaps(
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts
index f1dcbd5fe9e7c..86707fc006214 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 
 export const removeAttributesId: SavedObjectMigrationFn<any, any> = (doc) => {
   if (typeof doc.attributes === 'object' && doc.attributes !== null) {
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts
index f9b3fd86fc0f5..366e29bf65d2c 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/public';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/public';
 
 export interface CanvasSavedObjectTypeMigrationsDeps {
   expressions: ExpressionsServiceSetup;
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts
index d4d7e2b429711..c37d7292e28c8 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { removeAttributesId } from './remove_attributes_id';
 import { CanvasSavedObjectTypeMigrationsDeps } from './types';
 
diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad.ts b/x-pack/plugins/canvas/server/saved_objects/workpad.ts
index db22025e625e8..b23ea62f88954 100644
--- a/x-pack/plugins/canvas/server/saved_objects/workpad.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CANVAS_TYPE } from '../../common/lib/constants';
 import { workpadMigrationsFactory } from './migrations';
 import type { CanvasSavedObjectTypeMigrationsDeps } from './migrations';
diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts b/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts
index 6d76dc61bd96b..917561559f380 100644
--- a/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts
@@ -6,12 +6,11 @@
  */
 
 import { fromExpression, toExpression } from '@kbn/interpreter';
-import { PersistableStateService } from '../../../../../src/plugins/kibana_utils/common';
-import { SavedObjectReference } from '../../../../../src/core/server';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+import { SavedObjectReference } from '@kbn/core/server';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { WorkpadAttributes } from '../routes/workpad/workpad_attributes';
 
-import type { ExpressionAstExpression } from '../../../../../src/plugins/expressions';
-
 export const extractReferences = (
   workpad: WorkpadAttributes,
   expressions: PersistableStateService<ExpressionAstExpression>
diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts b/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts
index a55c7348c62bb..ec852113e1ca4 100644
--- a/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { TEMPLATE_TYPE } from '../../common/lib/constants';
 import {
   CanvasSavedObjectTypeMigrationsDeps,
diff --git a/x-pack/plugins/canvas/server/setup_interpreter.ts b/x-pack/plugins/canvas/server/setup_interpreter.ts
index 849ad79717056..fdd56e4857329 100644
--- a/x-pack/plugins/canvas/server/setup_interpreter.ts
+++ b/x-pack/plugins/canvas/server/setup_interpreter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { functions } from '../canvas_plugin_src/functions/server';
 import {
   initFunctions as initExternalFunctions,
diff --git a/x-pack/plugins/canvas/server/templates/index.ts b/x-pack/plugins/canvas/server/templates/index.ts
index 524f4c8a9265a..fbd4276e40cd9 100644
--- a/x-pack/plugins/canvas/server/templates/index.ts
+++ b/x-pack/plugins/canvas/server/templates/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsRepository } from 'src/core/server';
+import { SavedObjectsRepository } from '@kbn/core/server';
 
 import { TEMPLATE_TYPE } from '../../common/lib/constants';
 
diff --git a/x-pack/plugins/canvas/server/ui_settings.ts b/x-pack/plugins/canvas/server/ui_settings.ts
index 3e7de1dbb7d79..308700abf5cb0 100644
--- a/x-pack/plugins/canvas/server/ui_settings.ts
+++ b/x-pack/plugins/canvas/server/ui_settings.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { SETTING_CATEGORY } from '../../../../src/plugins/presentation_util/server';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { SETTING_CATEGORY } from '@kbn/presentation-util-plugin/server';
+import { UiSettingsParams } from '@kbn/core/types';
 import { UI_SETTINGS } from '../common';
 
 /**
diff --git a/x-pack/plugins/canvas/server/workpad_route_context.test.ts b/x-pack/plugins/canvas/server/workpad_route_context.test.ts
index 9626b2ffd9575..290eed19d0fc5 100644
--- a/x-pack/plugins/canvas/server/workpad_route_context.test.ts
+++ b/x-pack/plugins/canvas/server/workpad_route_context.test.ts
@@ -7,9 +7,10 @@
 
 import sinon from 'sinon';
 import { fromExpression } from '@kbn/interpreter';
+import { AwaitedProperties } from '@kbn/utility-types';
 import { createWorkpadRouteContext } from './workpad_route_context';
-import { RequestHandlerContext, SavedObjectReference } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { RequestHandlerContext, SavedObjectReference } from '@kbn/core/server';
+import { savedObjectsClientMock, coreMock } from '@kbn/core/server/mocks';
 import { CanvasWorkpad } from '../types';
 import { CANVAS_TYPE } from '../common/lib/constants';
 
@@ -26,7 +27,7 @@ const mockContext = {
       client: savedObjectsClient,
     },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 const workpadRouteContext = createWorkpadRouteContext({
   expressions: mockedExpressionService as any,
@@ -86,7 +87,7 @@ describe('workpad route context', () => {
       };
 
       const canvasContext = await workpadRouteContext(
-        mockContext,
+        coreMock.createCustomRequestHandlerContext(mockContext),
         undefined as any,
         undefined as any
       );
@@ -120,7 +121,7 @@ describe('workpad route context', () => {
     it('injects references to the saved object', async () => {
       const id = 'so-id';
       const canvasContext = await workpadRouteContext(
-        mockContext,
+        coreMock.createCustomRequestHandlerContext(mockContext),
         undefined as any,
         undefined as any
       );
@@ -145,7 +146,7 @@ describe('workpad route context', () => {
     it('injects references to the saved object', async () => {
       const id = 'so-id';
       const canvasContext = await workpadRouteContext(
-        mockContext,
+        coreMock.createCustomRequestHandlerContext(mockContext),
         undefined as any,
         undefined as any
       );
@@ -172,7 +173,7 @@ describe('workpad route context', () => {
       const createdDate = new Date(2020, 1, 1).toISOString();
 
       const canvasContext = await workpadRouteContext(
-        mockContext,
+        coreMock.createCustomRequestHandlerContext(mockContext),
         undefined as any,
         undefined as any
       );
diff --git a/x-pack/plugins/canvas/server/workpad_route_context.ts b/x-pack/plugins/canvas/server/workpad_route_context.ts
index 2e4cad231dd84..0ae1699b8f57f 100644
--- a/x-pack/plugins/canvas/server/workpad_route_context.ts
+++ b/x-pack/plugins/canvas/server/workpad_route_context.ts
@@ -6,19 +6,19 @@
  */
 
 import {
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   RequestHandlerContextProvider,
   SavedObject,
   SavedObjectsResolveResponse,
-} from 'kibana/server';
-import { ExpressionsServiceStart } from 'src/plugins/expressions';
+} from '@kbn/core/server';
+import { ExpressionsServiceStart } from '@kbn/expressions-plugin';
 import { WorkpadAttributes } from './routes/workpad/workpad_attributes';
 import { CANVAS_TYPE } from '../common/lib/constants';
 import { injectReferences, extractReferences } from './saved_objects/workpad_references';
 import { getId } from '../common/lib/get_id';
 import { CanvasWorkpad, ImportedCanvasWorkpad } from '../types';
 
-export interface CanvasRouteHandlerContext extends RequestHandlerContext {
+export type CanvasRouteHandlerContext = CustomRequestHandlerContext<{
   canvas: {
     workpad: {
       create: (attributes: CanvasWorkpad) => Promise<SavedObject<WorkpadAttributes>>;
@@ -31,7 +31,7 @@ export interface CanvasRouteHandlerContext extends RequestHandlerContext {
       ) => Promise<SavedObject<WorkpadAttributes>>;
     };
   };
-}
+}>;
 
 interface Deps {
   expressions: ExpressionsServiceStart;
@@ -40,109 +40,107 @@ interface Deps {
 export const createWorkpadRouteContext: (
   deps: Deps
 ) => RequestHandlerContextProvider<CanvasRouteHandlerContext, 'canvas'> = ({ expressions }) => {
-  return (context) => ({
-    workpad: {
-      create: async (workpad: CanvasWorkpad) => {
-        const now = new Date().toISOString();
-        const { id: maybeId, ...attributes } = workpad;
-
-        const id = maybeId ? maybeId : getId('workpad');
-
-        const { workpad: extractedAttributes, references } = extractReferences(
-          attributes,
-          expressions
-        );
-
-        return await context.core.savedObjects.client.create<WorkpadAttributes>(
-          CANVAS_TYPE,
-          {
-            ...extractedAttributes,
-            '@timestamp': now,
-            '@created': now,
-          },
-          { id, references }
-        );
-      },
-      import: async (workpad: ImportedCanvasWorkpad) => {
-        const now = new Date().toISOString();
-        const { id: maybeId, ...workpadWithoutId } = workpad;
-
-        // Functionality of running migrations on import of workpads was implemented in v8.1.0.
-        // As only attributes of the saved object workpad are exported, to run migrations it is necessary
-        // to specify the minimal version of possible migrations to execute them. It is v8.0.0 in the current case.
-        const DEFAULT_MIGRATION_VERSION = { [CANVAS_TYPE]: '8.0.0' };
-        const DEFAULT_CORE_MIGRATION_VERSION = '8.0.0';
-
-        const id = maybeId ? maybeId : getId('workpad');
-
-        return await context.core.savedObjects.client.create<WorkpadAttributes>(
-          CANVAS_TYPE,
-          {
-            isWriteable: true,
-            ...workpadWithoutId,
-            '@timestamp': now,
-            '@created': now,
-          },
-          {
-            migrationVersion: DEFAULT_MIGRATION_VERSION,
-            coreMigrationVersion: DEFAULT_CORE_MIGRATION_VERSION,
+  return async (context) => {
+    const soClient = (await context.core).savedObjects.client;
+    return {
+      workpad: {
+        create: async (workpad: CanvasWorkpad) => {
+          const now = new Date().toISOString();
+          const { id: maybeId, ...attributes } = workpad;
+
+          const id = maybeId ? maybeId : getId('workpad');
+
+          const { workpad: extractedAttributes, references } = extractReferences(
+            attributes,
+            expressions
+          );
+
+          return await soClient.create<WorkpadAttributes>(
+            CANVAS_TYPE,
+            {
+              ...extractedAttributes,
+              '@timestamp': now,
+              '@created': now,
+            },
+            { id, references }
+          );
+        },
+        import: async (workpad: ImportedCanvasWorkpad) => {
+          const now = new Date().toISOString();
+          const { id: maybeId, ...workpadWithoutId } = workpad;
+
+          // Functionality of running migrations on import of workpads was implemented in v8.1.0.
+          // As only attributes of the saved object workpad are exported, to run migrations it is necessary
+          // to specify the minimal version of possible migrations to execute them. It is v8.0.0 in the current case.
+          const DEFAULT_MIGRATION_VERSION = { [CANVAS_TYPE]: '8.0.0' };
+          const DEFAULT_CORE_MIGRATION_VERSION = '8.0.0';
+
+          const id = maybeId ? maybeId : getId('workpad');
+
+          return await soClient.create<WorkpadAttributes>(
+            CANVAS_TYPE,
+            {
+              isWriteable: true,
+              ...workpadWithoutId,
+              '@timestamp': now,
+              '@created': now,
+            },
+            {
+              migrationVersion: DEFAULT_MIGRATION_VERSION,
+              coreMigrationVersion: DEFAULT_CORE_MIGRATION_VERSION,
+              id,
+            }
+          );
+        },
+        get: async (id: string) => {
+          const workpad = await soClient.get<WorkpadAttributes>(CANVAS_TYPE, id);
+
+          workpad.attributes = injectReferences(
+            workpad.attributes,
+            workpad.references,
+            expressions
+          );
+
+          return workpad;
+        },
+        resolve: async (id: string) => {
+          const resolved = await soClient.resolve<WorkpadAttributes>(CANVAS_TYPE, id);
+
+          resolved.saved_object.attributes = injectReferences(
+            resolved.saved_object.attributes,
+            resolved.saved_object.references,
+            expressions
+          );
+
+          return resolved;
+        },
+        update: async (id: string, { id: omittedId, ...workpad }: Partial<CanvasWorkpad>) => {
+          const now = new Date().toISOString();
+
+          const workpadObject = await soClient.get<WorkpadAttributes>(CANVAS_TYPE, id);
+
+          const injectedAttributes = injectReferences(
+            workpadObject.attributes,
+            workpadObject.references,
+            expressions
+          );
+
+          const updatedAttributes = {
+            ...injectedAttributes,
+            ...workpad,
+            '@timestamp': now, // always update the modified time
+            '@created': workpadObject.attributes['@created'], // ensure created is not modified
+          } as WorkpadAttributes;
+
+          const extracted = extractReferences(updatedAttributes, expressions);
+
+          return await soClient.create(CANVAS_TYPE, extracted.workpad, {
+            overwrite: true,
             id,
-          }
-        );
-      },
-      get: async (id: string) => {
-        const workpad = await context.core.savedObjects.client.get<WorkpadAttributes>(
-          CANVAS_TYPE,
-          id
-        );
-
-        workpad.attributes = injectReferences(workpad.attributes, workpad.references, expressions);
-
-        return workpad;
-      },
-      resolve: async (id: string) => {
-        const resolved = await context.core.savedObjects.client.resolve<WorkpadAttributes>(
-          CANVAS_TYPE,
-          id
-        );
-
-        resolved.saved_object.attributes = injectReferences(
-          resolved.saved_object.attributes,
-          resolved.saved_object.references,
-          expressions
-        );
-
-        return resolved;
-      },
-      update: async (id: string, { id: omittedId, ...workpad }: Partial<CanvasWorkpad>) => {
-        const now = new Date().toISOString();
-
-        const workpadObject = await context.core.savedObjects.client.get<WorkpadAttributes>(
-          CANVAS_TYPE,
-          id
-        );
-
-        const injectedAttributes = injectReferences(
-          workpadObject.attributes,
-          workpadObject.references,
-          expressions
-        );
-
-        const updatedAttributes = {
-          ...injectedAttributes,
-          ...workpad,
-          '@timestamp': now, // always update the modified time
-          '@created': workpadObject.attributes['@created'], // ensure created is not modified
-        } as WorkpadAttributes;
-
-        const extracted = extractReferences(updatedAttributes, expressions);
-
-        return await context.core.savedObjects.client.create(CANVAS_TYPE, extracted.workpad, {
-          overwrite: true,
-          id,
-          references: extracted.references,
-        });
+            references: extracted.references,
+          });
+        },
       },
-    },
-  });
+    };
+  };
 };
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx
index ee609f42f1cf9..ac35952a29765 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx
@@ -7,9 +7,9 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { imageFunction } from '@kbn/expression-image-plugin/__fixtures__';
 import { ExampleContext } from '../../test/context_example';
 
-import { imageFunction } from '../../../../../../src/plugins/expression_image/__fixtures__';
 import { sharedWorkpads } from '../../test';
 import { RenderedElement, RenderedElementComponent } from '../rendered_element';
 
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
index 01c0a633fbdb7..2488aaac9c2e8 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
@@ -8,7 +8,7 @@
 import React, { FC, PureComponent } from 'react';
 // @ts-expect-error untyped library
 import Style from 'style-it';
-import { AnyExpressionFunctionDefinition } from '../../../../../src/plugins/expressions';
+import { AnyExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { Positionable } from '../../public/components/positionable/positionable';
 import { elementToShape } from '../../public/components/workpad_page/positioning_utils';
 import { CanvasRenderedElement } from '../types';
diff --git a/x-pack/plugins/canvas/shareable_runtime/index.ts b/x-pack/plugins/canvas/shareable_runtime/index.ts
index 8b3b5007c853e..08de4d4c7ae85 100644
--- a/x-pack/plugins/canvas/shareable_runtime/index.ts
+++ b/x-pack/plugins/canvas/shareable_runtime/index.ts
@@ -7,7 +7,7 @@
 
 export * from './api';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../src/core/server/core_app/assets/legacy_light_theme.css';
+import '@kbn/core/server/core_app/assets/legacy_light_theme.css';
 import '../public/style/index.scss';
 import '@elastic/eui/dist/eui_theme_light.css';
 import '@kbn/ui-framework/dist/kui_light.css';
diff --git a/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
index f8aebc04efe5c..8d8e2e1f26739 100644
--- a/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
+++ b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
@@ -5,23 +5,17 @@
  * 2.0.
  */
 
-import { getMarkdownRenderer } from '../canvas_plugin_src/renderers/markdown';
-import { pie } from '../canvas_plugin_src/renderers/pie';
-import { plot } from '../canvas_plugin_src/renderers/plot';
-import { getTableRenderer } from '../canvas_plugin_src/renderers/table';
+import { getImageRenderer } from '@kbn/expression-image-plugin/public';
+import { getErrorRenderer, getDebugRenderer } from '@kbn/expression-error-plugin/public';
+import { getRevealImageRenderer } from '@kbn/expression-reveal-image-plugin/public';
+import { getRepeatImageRenderer } from '@kbn/expression-repeat-image-plugin/public';
+import { getShapeRenderer, getProgressRenderer } from '@kbn/expression-shape-plugin/public';
+import { getMetricRenderer } from '@kbn/expression-metric-plugin/public';
 import { getTextRenderer } from '../canvas_plugin_src/renderers/text';
-import { getImageRenderer } from '../../../../src/plugins/expression_image/public';
-import {
-  getErrorRenderer,
-  getDebugRenderer,
-} from '../../../../src/plugins/expression_error/public';
-import { getRevealImageRenderer } from '../../../../src/plugins/expression_reveal_image/public';
-import { getRepeatImageRenderer } from '../../../../src/plugins/expression_repeat_image/public';
-import {
-  getShapeRenderer,
-  getProgressRenderer,
-} from '../../../../src/plugins/expression_shape/public';
-import { getMetricRenderer } from '../../../../src/plugins/expression_metric/public';
+import { getTableRenderer } from '../canvas_plugin_src/renderers/table';
+import { plot } from '../canvas_plugin_src/renderers/plot';
+import { pie } from '../canvas_plugin_src/renderers/pie';
+import { getMarkdownRenderer } from '../canvas_plugin_src/renderers/markdown';
 
 const unboxFactory = (factory) => factory();
 
diff --git a/x-pack/plugins/canvas/shareable_runtime/test/context.tsx b/x-pack/plugins/canvas/shareable_runtime/test/context.tsx
index 394a666599bc6..915d53d862df8 100644
--- a/x-pack/plugins/canvas/shareable_runtime/test/context.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/test/context.tsx
@@ -10,7 +10,7 @@ import {
   initialCanvasShareableState,
   CanvasShareableStateProvider,
   useCanvasShareableState,
-} from '../context/index';
+} from '../context';
 import { renderFunctions } from '../supported_renderers';
 import { CanvasShareableState } from '../types';
 import { RendererSpec } from '../../types';
diff --git a/x-pack/plugins/canvas/shareable_runtime/types.ts b/x-pack/plugins/canvas/shareable_runtime/types.ts
index 751fb3f795524..4dbbb2bbc904c 100644
--- a/x-pack/plugins/canvas/shareable_runtime/types.ts
+++ b/x-pack/plugins/canvas/shareable_runtime/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { RefObject } from 'react';
-import { SavedObject, SavedObjectAttributes } from 'src/core/public';
+import { SavedObject, SavedObjectAttributes } from '@kbn/core/public';
 
 import { ElementPosition, CanvasPage, CanvasWorkpad, RendererSpec } from '../types';
 
diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
index 42e96ab4471fe..1a22af80da28d 100644
--- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
+++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
@@ -38,15 +38,8 @@ module.exports = {
     filename: '[name].js',
     library: LIBRARY_NAME,
   },
-  // Include a require alias for legacy UI code and styles
   resolve: {
     alias: {
-      'data/interpreter': path.resolve(
-        KIBANA_ROOT,
-        'src/plugins/data/public/expressions/interpreter'
-      ),
-      'kbn/interpreter': path.resolve(KIBANA_ROOT, 'packages/kbn-interpreter/target/common'),
-      tinymath: path.resolve(KIBANA_ROOT, 'node_modules/tinymath/lib/tinymath.min.js'),
       core_app_image_assets: path.resolve(KIBANA_ROOT, 'src/core/public/core_app/images'),
     },
     extensions: ['.js', '.json', '.ts', '.tsx', '.scss'],
diff --git a/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx b/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx
index 953a8152a01e6..2c67e20ae2de8 100644
--- a/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx
+++ b/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const settings = new Map();
 settings.set('darkMode', true);
diff --git a/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx b/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx
index eaed712ba869f..4c610a943a1f2 100644
--- a/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx
+++ b/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { PluginServiceRegistry } from '../../../../../src/plugins/presentation_util/public';
+import { PluginServiceRegistry } from '@kbn/presentation-util-plugin/public';
 import { pluginServices, CanvasPluginServices } from '../../public/services';
 import { pluginServiceProviders, StorybookParams } from '../../public/services/storybook';
 import { LegacyServicesProvider } from '../../public/services/legacy';
diff --git a/x-pack/plugins/canvas/storybook/storyshots.test.tsx b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
index 1b05145d561f5..24bbcdb8be0c6 100644
--- a/x-pack/plugins/canvas/storybook/storyshots.test.tsx
+++ b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
@@ -61,8 +61,8 @@ import { EuiObserver } from '@elastic/eui/test-env/components/observer/observer'
 jest.mock('@elastic/eui/test-env/components/observer/observer');
 EuiObserver.mockImplementation(() => 'EuiObserver');
 
-import { ExpressionInput } from '../../../../src/plugins/presentation_util/public/components/expression_input';
-jest.mock('../../../../src/plugins/presentation_util/public/components/expression_input');
+import { ExpressionInput } from '@kbn/presentation-util-plugin/public/components/expression_input';
+jest.mock('@kbn/presentation-util-plugin/public/components/expression_input');
 // @ts-expect-error
 ExpressionInput.mockImplementation(() => 'ExpressionInput');
 
diff --git a/x-pack/plugins/canvas/types/elements.ts b/x-pack/plugins/canvas/types/elements.ts
index 0119c0a842f50..81c869e230052 100644
--- a/x-pack/plugins/canvas/types/elements.ts
+++ b/x-pack/plugins/canvas/types/elements.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionAstExpression } from 'src/plugins/expressions';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { CanvasElement } from '.';
 
 export interface ElementSpec {
diff --git a/x-pack/plugins/canvas/types/embeddables.ts b/x-pack/plugins/canvas/types/embeddables.ts
index b78efece59d8f..b548a2f0627a0 100644
--- a/x-pack/plugins/canvas/types/embeddables.ts
+++ b/x-pack/plugins/canvas/types/embeddables.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { Filter } from '@kbn/es-query';
-import { EmbeddableInput as Input } from '../../../../src/plugins/embeddable/common/';
+import { EmbeddableInput as Input } from '@kbn/embeddable-plugin/common';
 
 export type EmbeddableInput = Input & {
   timeRange?: TimeRange;
diff --git a/x-pack/plugins/canvas/types/functions.ts b/x-pack/plugins/canvas/types/functions.ts
index 5dfa547abe344..fc5f48dd901e3 100644
--- a/x-pack/plugins/canvas/types/functions.ts
+++ b/x-pack/plugins/canvas/types/functions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { functions as commonFunctions } from '../canvas_plugin_src/functions/common';
 import { functions as browserFunctions } from '../canvas_plugin_src/functions/browser';
 import { functions as serverFunctions } from '../canvas_plugin_src/functions/server';
diff --git a/x-pack/plugins/canvas/types/index.ts b/x-pack/plugins/canvas/types/index.ts
index 930f337292088..2932aea617b16 100644
--- a/x-pack/plugins/canvas/types/index.ts
+++ b/x-pack/plugins/canvas/types/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export * from '../../../../src/plugins/expressions/common';
+export * from '@kbn/expressions-plugin/common';
 export * from './assets';
 export * from './canvas';
 export * from './elements';
diff --git a/x-pack/plugins/canvas/types/renderers.ts b/x-pack/plugins/canvas/types/renderers.ts
index 7c9b785dbb2bb..f1457d3fc6f93 100644
--- a/x-pack/plugins/canvas/types/renderers.ts
+++ b/x-pack/plugins/canvas/types/renderers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 
 type GenericRendererCallback = (callback: () => void) => void;
 
diff --git a/x-pack/plugins/canvas/types/state.ts b/x-pack/plugins/canvas/types/state.ts
index b283de1386f55..b411a7aae7ed7 100644
--- a/x-pack/plugins/canvas/types/state.ts
+++ b/x-pack/plugins/canvas/types/state.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaContext } from 'src/plugins/data/common';
+import { KibanaContext } from '@kbn/data-plugin/common';
 import {
   AnyExpressionFunctionDefinition,
   Datatable,
@@ -15,7 +15,7 @@ import {
   Render,
   Style,
   Range,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 import { Datasource, Model, Transform, View } from '../public/expression_types';
 import { AssetType } from './assets';
 import { CanvasWorkpad, Sidebar } from './canvas';
diff --git a/x-pack/plugins/canvas/types/strategy.ts b/x-pack/plugins/canvas/types/strategy.ts
index 2cc4c72116cdb..a3675466cf278 100644
--- a/x-pack/plugins/canvas/types/strategy.ts
+++ b/x-pack/plugins/canvas/types/strategy.ts
@@ -7,7 +7,7 @@
 
 import { TransportResult } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IKibanaSearchRequest } from 'src/plugins/data/common';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/common';
 import { ExpressionValueFilter } from '.';
 export interface EssqlSearchStrategyRequest extends IKibanaSearchRequest {
   count: number;
diff --git a/x-pack/plugins/canvas/types/telemetry.ts b/x-pack/plugins/canvas/types/telemetry.ts
index 16f3b75e5d8ab..6e46b8c4cbe69 100644
--- a/x-pack/plugins/canvas/types/telemetry.ts
+++ b/x-pack/plugins/canvas/types/telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
   Function for collecting information about canvas usage
diff --git a/x-pack/plugins/cases/common/api/cases/comment.ts b/x-pack/plugins/cases/common/api/cases/comment.ts
index 900f90156d431..8cdab3dbd597d 100644
--- a/x-pack/plugins/cases/common/api/cases/comment.ts
+++ b/x-pack/plugins/cases/common/api/cases/comment.ts
@@ -153,12 +153,15 @@ export const FindQueryParamsRt = rt.partial({
   ...SavedObjectFindOptionsRt.props,
 });
 
+export const BulkCreateCommentRequestRt = rt.array(CommentRequestRt);
+
 export type FindQueryParams = rt.TypeOf<typeof FindQueryParamsRt>;
 export type AttributesTypeActions = rt.TypeOf<typeof AttributesTypeActionsRt>;
 export type AttributesTypeAlerts = rt.TypeOf<typeof AttributesTypeAlertsRt>;
 export type AttributesTypeUser = rt.TypeOf<typeof AttributesTypeUserRt>;
 export type CommentAttributes = rt.TypeOf<typeof CommentAttributesRt>;
 export type CommentRequest = rt.TypeOf<typeof CommentRequestRt>;
+export type BulkCreateCommentRequest = rt.TypeOf<typeof BulkCreateCommentRequestRt>;
 export type CommentResponse = rt.TypeOf<typeof CommentResponseRt>;
 export type CommentResponseUserType = rt.TypeOf<typeof CommentResponseTypeUserRt>;
 export type CommentResponseAlertsType = rt.TypeOf<typeof CommentResponseTypeAlertsRt>;
diff --git a/x-pack/plugins/cases/common/api/connectors/index.ts b/x-pack/plugins/cases/common/api/connectors/index.ts
index 96eb505623201..bb1892525f8e0 100644
--- a/x-pack/plugins/cases/common/api/connectors/index.ts
+++ b/x-pack/plugins/cases/common/api/connectors/index.ts
@@ -7,7 +7,7 @@
 
 import * as rt from 'io-ts';
 
-import { ActionResult, ActionType } from '../../../../actions/common';
+import { ActionResult, ActionType } from '@kbn/actions-plugin/common';
 import { JiraFieldsRT } from './jira';
 import { ResilientFieldsRT } from './resilient';
 import { ServiceNowITSMFieldsRT } from './servicenow_itsm';
diff --git a/x-pack/plugins/cases/common/api/helpers.ts b/x-pack/plugins/cases/common/api/helpers.ts
index 9aebb7d0ccd9d..0fe187389cae1 100644
--- a/x-pack/plugins/cases/common/api/helpers.ts
+++ b/x-pack/plugins/cases/common/api/helpers.ts
@@ -14,6 +14,7 @@ import {
   CASE_PUSH_URL,
   CASE_CONFIGURE_DETAILS_URL,
   CASE_ALERTS_URL,
+  CASE_COMMENT_DELETE_URL,
 } from '../constants';
 
 export const getCaseDetailsUrl = (id: string): string => {
@@ -32,6 +33,10 @@ export const getCaseCommentDetailsUrl = (caseId: string, commentId: string): str
   return CASE_COMMENT_DETAILS_URL.replace('{case_id}', caseId).replace('{comment_id}', commentId);
 };
 
+export const getCaseCommentDeleteUrl = (caseId: string, commentId: string): string => {
+  return CASE_COMMENT_DELETE_URL.replace('{case_id}', caseId).replace('{comment_id}', commentId);
+};
+
 export const getCaseUserActionUrl = (id: string): string => {
   return CASE_USER_ACTIONS_URL.replace('{case_id}', id);
 };
diff --git a/x-pack/plugins/cases/common/constants.ts b/x-pack/plugins/cases/common/constants.ts
index a1ac829b33cce..29a8029dda063 100644
--- a/x-pack/plugins/cases/common/constants.ts
+++ b/x-pack/plugins/cases/common/constants.ts
@@ -59,6 +59,7 @@ export const CASE_CONFIGURE_CONNECTORS_URL = `${CASE_CONFIGURE_URL}/connectors`
 
 export const CASE_COMMENTS_URL = `${CASE_DETAILS_URL}/comments` as const;
 export const CASE_COMMENT_DETAILS_URL = `${CASE_DETAILS_URL}/comments/{comment_id}` as const;
+export const CASE_COMMENT_DELETE_URL = `${CASE_DETAILS_URL}/comments/{comment_id}` as const;
 export const CASE_PUSH_URL = `${CASE_DETAILS_URL}/connector/{connector_id}/_push` as const;
 export const CASE_REPORTERS_URL = `${CASES_URL}/reporters` as const;
 export const CASE_STATUS_URL = `${CASES_URL}/status` as const;
@@ -70,6 +71,14 @@ export const CASE_DETAILS_ALERTS_URL = `${CASE_DETAILS_URL}/alerts` as const;
 
 export const CASE_METRICS_DETAILS_URL = `${CASES_URL}/metrics/{case_id}` as const;
 
+/**
+ * Internal routes
+ */
+
+export const CASES_INTERNAL_URL = '/internal/cases' as const;
+export const INTERNAL_BULK_CREATE_ATTACHMENTS_URL =
+  `${CASES_INTERNAL_URL}/{case_id}/attachments/_bulk_create` as const;
+
 /**
  * Action routes
  */
@@ -89,8 +98,11 @@ export const SUPPORTED_CONNECTORS = [
 /**
  * Alerts
  */
-export const MAX_ALERTS_PER_CASE = 5000 as const;
+export const MAX_ALERTS_PER_CASE = 1000 as const;
 
+/**
+ * Owner
+ */
 export const SECURITY_SOLUTION_OWNER = 'securitySolution' as const;
 export const OBSERVABILITY_OWNER = 'observability' as const;
 
@@ -105,6 +117,9 @@ export const OWNER_INFO = {
   },
 } as const;
 
+/**
+ * Searching
+ */
 export const MAX_DOCS_PER_PAGE = 10000 as const;
 export const MAX_CONCURRENT_SEARCHES = 10 as const;
 
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index bc40077873eae..c0c68f5d9964a 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsResolveResponse } from 'src/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
 import {
   CaseAttributes,
   CaseConnector,
@@ -17,6 +17,7 @@ import {
   CaseUserActionResponse,
   CaseMetricsResponse,
   CommentResponse,
+  CommentResponseAlertsType,
 } from '../api';
 import { SnakeToCamelCase } from '../types';
 
@@ -57,6 +58,7 @@ export type CaseViewRefreshPropInterface = null | {
 };
 
 export type Comment = SnakeToCamelCase<CommentResponse>;
+export type AlertComment = SnakeToCamelCase<CommentResponseAlertsType>;
 export type CaseUserActions = SnakeToCamelCase<CaseUserActionResponse>;
 export type CaseExternalService = SnakeToCamelCase<CaseExternalServiceBasic>;
 
diff --git a/x-pack/plugins/cases/common/utils/connectors_api.ts b/x-pack/plugins/cases/common/utils/connectors_api.ts
index 3ab8f856d925e..c6021dc6d66b0 100644
--- a/x-pack/plugins/cases/common/utils/connectors_api.ts
+++ b/x-pack/plugins/cases/common/utils/connectors_api.ts
@@ -9,7 +9,7 @@
  * Actions and connectors API endpoint helpers
  */
 
-import { ACTION_URL, ACTION_TYPES_URL, CONNECTORS_URL } from '../../common/constants';
+import { ACTION_URL, ACTION_TYPES_URL, CONNECTORS_URL } from '../constants';
 
 /**
  *
diff --git a/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts b/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts
index 69d01b0051e18..52863d5dd8d1f 100644
--- a/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts
+++ b/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts
@@ -6,7 +6,7 @@
  */
 
 import { Plugin } from 'unified';
-import type { TimeRange } from 'src/plugins/data/common';
+import type { TimeRange } from '@kbn/data-plugin/common';
 import { LENS_ID } from './constants';
 
 export interface LensSerializerProps {
diff --git a/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts b/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts
index e9bda7ae469e2..a91970bc97295 100644
--- a/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts
+++ b/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts
@@ -12,7 +12,7 @@ import remarkStringify from 'remark-stringify';
 import unified from 'unified';
 
 import { SerializableRecord } from '@kbn/utility-types';
-import type { TimeRange } from 'src/plugins/data/common';
+import type { TimeRange } from '@kbn/data-plugin/common';
 import { LENS_ID, LensParser, LensSerializer } from './lens';
 import { TimelineSerializer, TimelineParser } from './timeline';
 
diff --git a/x-pack/plugins/cases/kibana.json b/x-pack/plugins/cases/kibana.json
index 45ae5533a0e79..865f06b8764f6 100644
--- a/x-pack/plugins/cases/kibana.json
+++ b/x-pack/plugins/cases/kibana.json
@@ -33,7 +33,6 @@
      "management"
   ],
   "requiredBundles": [
-    "home",
     "savedObjects"
   ],
   "server":true,
diff --git a/x-pack/plugins/cases/public/application.tsx b/x-pack/plugins/cases/public/application.tsx
index a528fa2376dbb..151a531b73809 100644
--- a/x-pack/plugins/cases/public/application.tsx
+++ b/x-pack/plugins/cases/public/application.tsx
@@ -15,8 +15,8 @@ import {
   KibanaContextProvider,
   KibanaThemeProvider,
   useUiSetting$,
-} from '../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider as StyledComponentsThemeProvider } from '../../../../src/plugins/kibana_react/common';
+} from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider as StyledComponentsThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { RenderAppProps } from './types';
 import { CasesApp } from './components/app';
 
diff --git a/x-pack/plugins/cases/public/client/api/index.test.ts b/x-pack/plugins/cases/public/client/api/index.test.ts
index 9dd5245c03dd4..8bf4ca682fe3b 100644
--- a/x-pack/plugins/cases/public/client/api/index.test.ts
+++ b/x-pack/plugins/cases/public/client/api/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { createClientAPI } from '.';
 import { allCases, casesStatus } from '../../containers/mock';
 
diff --git a/x-pack/plugins/cases/public/client/api/index.ts b/x-pack/plugins/cases/public/client/api/index.ts
index b35fff84fdb09..8f55f7a4f0739 100644
--- a/x-pack/plugins/cases/public/client/api/index.ts
+++ b/x-pack/plugins/cases/public/client/api/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   CasesByAlertId,
   CasesByAlertIDRequest,
diff --git a/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts b/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts
index d4906c2702146..ea3b508e3113c 100644
--- a/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts
+++ b/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import { canUseCases } from './can_use_cases';
 
 type CasesCapabilities = Pick<
diff --git a/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts b/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
index ad05be1b07cd3..d34e2c9bf5912 100644
--- a/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
+++ b/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import { OBSERVABILITY_OWNER, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 
 export type CasesOwners = typeof SECURITY_SOLUTION_OWNER | typeof OBSERVABILITY_OWNER;
diff --git a/x-pack/plugins/cases/public/common/hooks.test.tsx b/x-pack/plugins/cases/public/common/hooks.test.tsx
index f122d3312a643..a83932551f394 100644
--- a/x-pack/plugins/cases/public/common/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/hooks.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
 
-import { TestProviders } from '../common/mock';
+import { TestProviders } from './mock';
 import { useIsMainApplication } from './hooks';
 import { useApplication } from '../components/cases_context/use_application';
 
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts
index ffd1f2bc4c8c9..5062d73dd9b2f 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { notificationServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import {
   createKibanaContextProviderMock,
   createStartServicesMock,
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
index 127274e5ed55f..02a099f9c6a1f 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
@@ -10,16 +10,16 @@ import moment from 'moment-timezone';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import {
   FEATURE_ID,
   DEFAULT_DATE_FORMAT,
   DEFAULT_DATE_FORMAT_TZ,
 } from '../../../../common/constants';
-import { AuthenticatedUser } from '../../../../../security/common/model';
 import { convertToCamelCase } from '../../../containers/utils';
 import { StartServices } from '../../../types';
 import { useUiSetting, useKibana } from './kibana_react';
-import { NavigateToAppOptions } from '../../../../../../../src/core/public';
 
 export const useDateFormat = (): string => useUiSetting<string>(DEFAULT_DATE_FORMAT);
 
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts
index 90291201d74e1..49b7028a8f883 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts
@@ -9,15 +9,15 @@
 
 import React from 'react';
 
-import { PublicAppInfo } from 'kibana/public';
+import { PublicAppInfo } from '@kbn/core/public';
 import { RecursivePartial } from '@elastic/eui/src/components/common';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { securityMock } from '../../../../../security/public/mocks';
-import { spacesPluginMock } from '../../../../../spaces/public/mocks';
-import { triggersActionsUiMock } from '../../../../../triggers_actions_ui/public/mocks';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 import { BehaviorSubject } from 'rxjs';
 import { registerConnectorsToMockActionRegistry } from '../../mock/register_connectors';
 import { connectorsMock } from '../../mock/connectors';
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts
index 921463c4c41ab..0884b57048e78 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts
@@ -10,7 +10,7 @@ import {
   useKibana,
   useUiSetting,
   useUiSetting$,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
 
 const useTypedKibana = () => useKibana<StartServices>();
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/services.ts b/x-pack/plugins/cases/public/common/lib/kibana/services.ts
index 3a1f220d9794f..30198b812e4aa 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/services.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { CasesUiConfigType } from '../../../../common/ui/types';
 
 type GlobalServices = Pick<CoreStart, 'http'>;
diff --git a/x-pack/plugins/cases/public/common/mock/register_connectors.ts b/x-pack/plugins/cases/public/common/mock/register_connectors.ts
index b86968e4bf801..ee7063141a693 100644
--- a/x-pack/plugins/cases/public/common/mock/register_connectors.ts
+++ b/x-pack/plugins/cases/public/common/mock/register_connectors.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { actionTypeRegistryMock } from '../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 import { CaseActionConnector } from '../../../common/ui/types';
 
 const getUniqueActionTypeIds = (connectors: CaseActionConnector[]) =>
diff --git a/x-pack/plugins/cases/public/common/mock/test_providers.tsx b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
index db155c2aae0df..75803bb3820aa 100644
--- a/x-pack/plugins/cases/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
@@ -11,7 +11,7 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { ThemeProvider } from 'styled-components';
 
 import { render as reactRender, RenderOptions, RenderResult } from '@testing-library/react';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 import { CasesFeatures } from '../../../common/ui/types';
 import { CasesProvider } from '../../components/cases_context';
diff --git a/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts b/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts
index 52ddcd8b20ffc..af8685cd16fb6 100644
--- a/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts
+++ b/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AppNavLinkStatus } from '../../../../../../src/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { getCasesDeepLinks } from './deep_links';
 
 describe('getCasesDeepLinks', () => {
diff --git a/x-pack/plugins/cases/public/common/navigation/deep_links.ts b/x-pack/plugins/cases/public/common/navigation/deep_links.ts
index 860299a05008d..6743d22e74dac 100644
--- a/x-pack/plugins/cases/public/common/navigation/deep_links.ts
+++ b/x-pack/plugins/cases/public/common/navigation/deep_links.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { AppDeepLink } from '../../../../../../src/core/public';
+import type { AppDeepLink } from '@kbn/core/public';
 import { DEFAULT_BASE_PATH, getCreateCasePath, getCasesConfigurePath } from './paths';
 
 export const CasesDeepLinkId = {
diff --git a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
index cd6cf13e7256d..7d296db032a75 100644
--- a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
 
 import { APP_ID } from '../../../common/constants';
-import { useNavigation } from '../../common/lib/kibana';
-import { TestProviders } from '../../common/mock';
+import { useNavigation } from '../lib/kibana';
+import { TestProviders } from '../mock';
 import {
   useCasesNavigation,
   useAllCasesNavigation,
@@ -21,7 +21,7 @@ import {
 import { CasesDeepLinkId } from './deep_links';
 
 const useNavigationMock = useNavigation as jest.Mock;
-jest.mock('../../common/lib/kibana');
+jest.mock('../lib/kibana');
 
 const navigateTo = jest.fn();
 const getAppUrl = jest.fn();
diff --git a/x-pack/plugins/cases/public/common/shared_imports.ts b/x-pack/plugins/cases/public/common/shared_imports.ts
index 21040543fae69..84c34a6186fa8 100644
--- a/x-pack/plugins/cases/public/common/shared_imports.ts
+++ b/x-pack/plugins/cases/public/common/shared_imports.ts
@@ -15,7 +15,7 @@ export type {
   ValidationFunc,
   FieldConfig,
   ValidationConfig,
-} from '../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   getUseField,
   getFieldValidityAndErrorMessage,
@@ -28,10 +28,7 @@ export {
   useFormContext,
   useFormData,
   VALIDATION_TYPES,
-} from '../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-export {
-  Field,
-  SelectField,
-} from '../../../../../src/plugins/es_ui_shared/static/forms/components';
-export { fieldValidators } from '../../../../../src/plugins/es_ui_shared/static/forms/helpers';
-export type { ERROR_CODE } from '../../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+export { Field, SelectField } from '@kbn/es-ui-shared-plugin/static/forms/components';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
+export type { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
index 517d1cfdd77b1..4dfbe6495364d 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
@@ -6,15 +6,15 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { useToasts } from '../common/lib/kibana';
-import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../common/mock';
+import { useToasts } from './lib/kibana';
+import { AppMockRenderer, createAppMockRenderer, TestProviders } from './mock';
 import { CaseToastSuccessContent, useCasesToast } from './use_cases_toast';
 import { alertComment, basicComment, mockCase } from '../containers/mock';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { SupportedCaseAttachment } from '../types';
 
-jest.mock('../common/lib/kibana');
+jest.mock('./lib/kibana');
 
 const useToastsMock = useToasts as jest.Mock;
 
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
index d02f792d601cf..8abb18d3099f3 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
@@ -8,10 +8,10 @@
 import { EuiButtonEmpty, EuiText } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Case, CommentType } from '../../common';
-import { useToasts } from '../common/lib/kibana';
-import { useCaseViewNavigation } from '../common/navigation';
+import { useToasts } from './lib/kibana';
+import { useCaseViewNavigation } from './navigation';
 import { CaseAttachments } from '../types';
 import {
   CASE_ALERT_SUCCESS_SYNC_TEXT,
diff --git a/x-pack/plugins/cases/public/components/__mock__/form.ts b/x-pack/plugins/cases/public/components/__mock__/form.ts
index a2bd59d5dd541..809aa56374d1a 100644
--- a/x-pack/plugins/cases/public/components/__mock__/form.ts
+++ b/x-pack/plugins/cases/public/components/__mock__/form.ts
@@ -5,13 +5,11 @@
  * 2.0.
  */
 
-import { useForm } from '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form';
-import { useFormData } from '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data';
+import { useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form';
+import { useFormData } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form_data';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
-jest.mock(
-  '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data'
-);
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form_data');
 
 export const mockFormHook = {
   isSubmitted: false,
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.test.tsx b/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
index f7535e6f52071..b9a253adc76f5 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
@@ -14,17 +14,17 @@ import { TestProviders } from '../../common/mock';
 
 import { CommentRequest, CommentType } from '../../../common/api';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { AddComment, AddCommentProps, AddCommentRefObject } from '.';
 import { CasesTimelineIntegrationProvider } from '../timeline_context';
 import { timelineIntegrationMock } from '../__mock__/timeline';
 
-jest.mock('../../containers/use_post_comment');
+jest.mock('../../containers/use_create_attachments');
 
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 const onCommentSaving = jest.fn();
 const onCommentPosted = jest.fn();
-const postComment = jest.fn();
+const createAttachments = jest.fn();
 
 const addCommentProps: AddCommentProps = {
   id: 'newComment',
@@ -36,10 +36,10 @@ const addCommentProps: AddCommentProps = {
   statusActionButton: null,
 };
 
-const defaultPostComment = {
+const defaultResponse = {
   isLoading: false,
   isError: false,
-  postComment,
+  createAttachments,
 };
 
 const sampleData: CommentRequest = {
@@ -51,7 +51,7 @@ const sampleData: CommentRequest = {
 describe('AddComment ', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    usePostCommentMock.mockImplementation(() => defaultPostComment);
+    useCreateAttachmentsMock.mockImplementation(() => defaultResponse);
   });
 
   it('should post comment on submit click', async () => {
@@ -72,9 +72,9 @@ describe('AddComment ', () => {
     wrapper.find(`[data-test-subj="submit-comment"]`).first().simulate('click');
     await waitFor(() => {
       expect(onCommentSaving).toBeCalled();
-      expect(postComment).toBeCalledWith({
+      expect(createAttachments).toBeCalledWith({
         caseId: addCommentProps.caseId,
-        data: sampleData,
+        data: [sampleData],
         updateCase: onCommentPosted,
       });
       expect(wrapper.find(`[data-test-subj="add-comment"] textarea`).text()).toBe('');
@@ -82,7 +82,10 @@ describe('AddComment ', () => {
   });
 
   it('should render spinner and disable submit when loading', () => {
-    usePostCommentMock.mockImplementation(() => ({ ...defaultPostComment, isLoading: true }));
+    useCreateAttachmentsMock.mockImplementation(() => ({
+      ...defaultResponse,
+      isLoading: true,
+    }));
     const wrapper = mount(
       <TestProviders>
         <AddComment {...{ ...addCommentProps, showLoading: true }} />
@@ -96,7 +99,10 @@ describe('AddComment ', () => {
   });
 
   it('should disable submit button when isLoading is true', () => {
-    usePostCommentMock.mockImplementation(() => ({ ...defaultPostComment, isLoading: true }));
+    useCreateAttachmentsMock.mockImplementation(() => ({
+      ...defaultResponse,
+      isLoading: true,
+    }));
     const wrapper = mount(
       <TestProviders>
         <AddComment {...addCommentProps} />
@@ -109,7 +115,10 @@ describe('AddComment ', () => {
   });
 
   it('should hide the component when the user does not have crud permissions', () => {
-    usePostCommentMock.mockImplementation(() => ({ ...defaultPostComment, isLoading: true }));
+    useCreateAttachmentsMock.mockImplementation(() => ({
+      ...defaultResponse,
+      isLoading: true,
+    }));
     const wrapper = mount(
       <TestProviders>
         <AddComment {...{ ...addCommentProps, userCanCrud: false }} />
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.tsx b/x-pack/plugins/cases/public/components/add_comment/index.tsx
index dea692f7c71a1..f3630d16cda79 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.tsx
@@ -18,7 +18,7 @@ import styled from 'styled-components';
 import { isEmpty } from 'lodash';
 
 import { CommentType } from '../../../common/api';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { Case } from '../../containers/types';
 import { EuiMarkdownEditorRef, MarkdownEditorForm } from '../markdown_editor';
 import { Form, useForm, UseField, useFormData } from '../../common/shared_imports';
@@ -71,7 +71,7 @@ export const AddComment = React.memo(
       const editorRef = useRef<EuiMarkdownEditorRef>(null);
       const [focusOnContext, setFocusOnContext] = useState(false);
       const { owner } = useCasesContext();
-      const { isLoading, postComment } = usePostComment();
+      const { isLoading, createAttachments } = useCreateAttachments();
 
       const { form } = useForm<AddCommentFormSchema>({
         defaultValue: initialCommentValue,
@@ -112,14 +112,14 @@ export const AddComment = React.memo(
           if (onCommentSaving != null) {
             onCommentSaving();
           }
-          postComment({
+          createAttachments({
             caseId,
-            data: { ...data, type: CommentType.user, owner: owner[0] },
+            data: [{ ...data, type: CommentType.user, owner: owner[0] }],
             updateCase: onCommentPosted,
           });
           reset();
         }
-      }, [submit, onCommentSaving, postComment, caseId, owner, onCommentPosted, reset]);
+      }, [submit, onCommentSaving, createAttachments, caseId, owner, onCommentPosted, reset]);
 
       /**
        * Focus on the text area when a quote has been added.
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
index c8e656b8117eb..ef6d789e97a36 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
@@ -29,15 +29,15 @@ import { useConnectors } from '../../containers/configure/use_connectors';
 import { useKibana } from '../../common/lib/kibana';
 import { AllCasesList } from './all_cases_list';
 import { CasesColumns, GetCasesColumn, useCasesColumns } from './columns';
-import { triggersActionsUiMock } from '../../../../triggers_actions_ui/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 import { registerConnectorsToMockActionRegistry } from '../../common/mock/register_connectors';
 import { createStartServicesMock } from '../../common/lib/kibana/kibana_react.mock';
 import { waitForComponentToUpdate } from '../../common/test_utils';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { useGetTags } from '../../containers/use_get_tags';
 import { useGetReporters } from '../../containers/use_get_reporters';
 
-jest.mock('../../containers/use_post_comment');
+jest.mock('../../containers/use_create_attachments');
 jest.mock('../../containers/use_bulk_update_case');
 jest.mock('../../containers/use_delete_cases');
 jest.mock('../../containers/use_get_cases');
@@ -61,7 +61,7 @@ const useGetTagsMock = useGetTags as jest.Mock;
 const useGetReportersMock = useGetReporters as jest.Mock;
 const useKibanaMock = useKibana as jest.MockedFunction<typeof useKibana>;
 const useConnectorsMock = useConnectors as jest.Mock;
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 
 const mockTriggersActionsUiService = triggersActionsUiMock.createStart();
 
@@ -88,7 +88,10 @@ describe('AllCasesListGeneric', () => {
   const fetchCasesStatus = jest.fn();
   const onRowClick = jest.fn();
   const emptyTag = getEmptyTagValue().props.children;
-  usePostCommentMock.mockReturnValue({ status: { isLoading: false }, postComment: jest.fn() });
+  useCreateAttachmentsMock.mockReturnValue({
+    status: { isLoading: false },
+    createAttachments: jest.fn(),
+  });
 
   const defaultGetCases = {
     ...useGetCasesMockState,
@@ -811,15 +814,16 @@ describe('AllCasesListGeneric', () => {
   });
 
   it('should hide the alerts column if the alert feature is disabled', async () => {
-    expect.assertions(1);
-
-    const { findAllByTestId } = render(
+    const result = render(
       <TestProviders features={{ alerts: { enabled: false } }}>
         <AllCasesList />
       </TestProviders>
     );
 
-    await expect(findAllByTestId('case-table-column-alertsCount')).rejects.toThrow();
+    await waitFor(() => {
+      expect(result.getByTestId('cases-table')).toBeTruthy();
+      expect(result.queryAllByTestId('case-table-column-alertsCount').length).toBe(0);
+    });
   });
 
   it('should show the alerts column if the alert feature is enabled', async () => {
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
index 25360800554b2..f0eea39d551a7 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
@@ -14,14 +14,14 @@ import { Case, CaseStatuses, StatusAll } from '../../../../common';
 import { AppMockRenderer, createAppMockRenderer } from '../../../common/mock';
 import { useCasesToast } from '../../../common/use_cases_toast';
 import { alertComment } from '../../../containers/mock';
-import { usePostComment } from '../../../containers/use_post_comment';
+import { useCreateAttachments } from '../../../containers/use_create_attachments';
 import { SupportedCaseAttachment } from '../../../types';
 import { CasesContext } from '../../cases_context';
 import { CasesContextStoreActionsList } from '../../cases_context/cases_context_reducer';
 import { useCasesAddToExistingCaseModal } from './use_cases_add_to_existing_case_modal';
 
 jest.mock('../../../common/use_cases_toast');
-jest.mock('../../../containers/use_post_comment');
+jest.mock('../../../containers/use_create_attachments');
 // dummy mock, will call onRowclick when rendering
 jest.mock('./all_cases_selector_modal', () => {
   return {
@@ -46,11 +46,11 @@ const TestComponent: React.FC = () => {
   return <button type="button" data-test-subj="open-modal" onClick={onClick} />;
 };
 
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 
 describe('use cases add to existing case modal hook', () => {
-  usePostCommentMock.mockReturnValue({
-    postComment: jest.fn(),
+  useCreateAttachmentsMock.mockReturnValue({
+    createAttachments: jest.fn(),
   });
 
   const dispatch = jest.fn();
@@ -130,10 +130,10 @@ describe('use cases add to existing case modal hook', () => {
     );
   });
 
-  it('should call postComment when a case is selected and show a toast message', async () => {
-    const mockedPostMessage = jest.fn();
-    usePostCommentMock.mockReturnValueOnce({
-      postComment: mockedPostMessage,
+  it('should call createAttachments when a case is selected and show a toast message', async () => {
+    const mockBulkCreateAttachments = jest.fn();
+    useCreateAttachmentsMock.mockReturnValueOnce({
+      createAttachments: mockBulkCreateAttachments,
     });
 
     const mockedToastSuccess = jest.fn();
@@ -150,19 +150,20 @@ describe('use cases add to existing case modal hook', () => {
     userEvent.click(result.getByTestId('open-modal'));
 
     await waitFor(() => {
-      expect(mockedPostMessage).toHaveBeenCalledWith({
+      expect(mockBulkCreateAttachments).toHaveBeenCalledTimes(1);
+      expect(mockBulkCreateAttachments).toHaveBeenCalledWith({
         caseId: 'test',
-        data: alertComment,
+        data: [alertComment],
         throwOnError: true,
       });
     });
     expect(mockedToastSuccess).toHaveBeenCalled();
   });
 
-  it('should not call postComment nor show toast success when  a case is not selected', async () => {
-    const mockedPostMessage = jest.fn();
-    usePostCommentMock.mockReturnValueOnce({
-      postComment: mockedPostMessage,
+  it('should not call createAttachments nor show toast success when  a case is not selected', async () => {
+    const mockBulkCreateAttachments = jest.fn();
+    useCreateAttachmentsMock.mockReturnValueOnce({
+      createAttachments: mockBulkCreateAttachments,
     });
 
     const mockedToastSuccess = jest.fn();
@@ -180,15 +181,15 @@ describe('use cases add to existing case modal hook', () => {
     // give a small delay for the reducer to run
 
     act(() => {
-      expect(mockedPostMessage).not.toHaveBeenCalled();
+      expect(mockBulkCreateAttachments).not.toHaveBeenCalled();
       expect(mockedToastSuccess).not.toHaveBeenCalled();
     });
   });
 
   it('should not show toast success when a case is selected with attachments and fails to update attachments', async () => {
-    const mockedPostMessage = jest.fn().mockRejectedValue(new Error('Impossible'));
-    usePostCommentMock.mockReturnValueOnce({
-      postComment: mockedPostMessage,
+    const mockBulkCreateAttachments = jest.fn().mockRejectedValue(new Error('Impossible'));
+    useCreateAttachmentsMock.mockReturnValueOnce({
+      createAttachments: mockBulkCreateAttachments,
     });
 
     const mockedToast = jest.fn();
@@ -206,15 +207,15 @@ describe('use cases add to existing case modal hook', () => {
     userEvent.click(result.getByTestId('open-modal'));
 
     await waitFor(() => {
-      expect(mockedPostMessage).toHaveBeenCalledWith({
+      expect(mockBulkCreateAttachments).toHaveBeenCalledWith({
         caseId: 'test',
-        data: alertComment,
+        data: [alertComment],
         throwOnError: true,
       });
     });
 
     act(() => {
-      expect(mockedPostMessage).toHaveBeenCalled();
+      expect(mockBulkCreateAttachments).toHaveBeenCalled();
       expect(mockedToast).not.toHaveBeenCalled();
     });
   });
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
index 651b01c2242f3..269e411e8eb89 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
@@ -14,7 +14,7 @@ import { CasesContextStoreActionsList } from '../../cases_context/cases_context_
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import { useCasesAddToNewCaseFlyout } from '../../create/flyout/use_cases_add_to_new_case_flyout';
 import { CaseAttachments } from '../../../types';
-import { usePostComment } from '../../../containers/use_post_comment';
+import { useCreateAttachments } from '../../../containers/use_create_attachments';
 
 type AddToExistingFlyoutProps = AllCasesSelectorModalProps & {
   toastTitle?: string;
@@ -39,7 +39,7 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingFlyoutProps)
 
   const { dispatch } = useCasesContext();
   const casesToasts = useCasesToast();
-  const { postComment } = usePostComment();
+  const { createAttachments } = useCreateAttachments();
 
   const closeModal = useCallback(() => {
     dispatch({
@@ -66,13 +66,12 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingFlyoutProps)
         // add attachments to the case
         const attachments = props.attachments;
         if (attachments !== undefined && attachments.length > 0) {
-          for (const attachment of attachments) {
-            await postComment({
-              caseId: theCase.id,
-              data: attachment,
-              throwOnError: true,
-            });
-          }
+          await createAttachments({
+            caseId: theCase.id,
+            data: attachments,
+            throwOnError: true,
+          });
+
           casesToasts.showSuccessAttach({
             theCase,
             attachments: props.attachments,
@@ -82,14 +81,14 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingFlyoutProps)
         }
       } catch (error) {
         // error toast is handled
-        // inside the postComment method
+        // inside the createAttachments method
       }
 
       if (props.onRowClick) {
         props.onRowClick(theCase);
       }
     },
-    [casesToasts, closeModal, createNewCaseFlyout, postComment, props]
+    [casesToasts, closeModal, createNewCaseFlyout, createAttachments, props]
   );
 
   const openModal = useCallback(() => {
diff --git a/x-pack/plugins/cases/public/components/case_view/index.test.tsx b/x-pack/plugins/cases/public/components/case_view/index.test.tsx
index d7d8ca6df8f8d..e092865b5eba8 100644
--- a/x-pack/plugins/cases/public/components/case_view/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/index.test.tsx
@@ -21,7 +21,7 @@ import {
   connectorsMock,
 } from '../../containers/mock';
 import { TestProviders } from '../../common/mock';
-import { SpacesApi } from '../../../../spaces/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import { useUpdateCase } from '../../containers/use_update_case';
 import { UseGetCase, useGetCase } from '../../containers/use_get_case';
 import { useGetCaseMetrics } from '../../containers/use_get_case_metrics';
diff --git a/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx b/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx
index 9c850b7417fc9..f816d39e8c0e0 100644
--- a/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx
@@ -12,7 +12,7 @@ import {
   basicCaseNumericValueFeatures,
   basicCaseStatusFeatures,
 } from '../../../containers/mock';
-import { CaseViewMetrics } from './index';
+import { CaseViewMetrics } from '.';
 import { CaseMetrics, CaseMetricsFeature } from '../../../../common/ui';
 import { TestProviders } from '../../../common/mock';
 
diff --git a/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx b/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx
index f3bfcee1ab947..df19d1776d86a 100644
--- a/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx
@@ -8,6 +8,7 @@
 import React, { useMemo } from 'react';
 import prettyMilliseconds from 'pretty-ms';
 import { EuiFlexGrid, EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiSpacer } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CaseMetrics, CaseMetricsFeature } from '../../../../common/ui';
 import {
   CASE_CREATED,
@@ -20,7 +21,6 @@ import {
 import { getMaybeDate } from '../../formatted_date/maybe_date';
 import { FormattedRelativePreferenceDate } from '../../formatted_date';
 import { getEmptyTagValue } from '../../empty_value';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { CaseViewMetricsProps } from './types';
 
 export const CaseStatusMetrics: React.FC<Pick<CaseViewMetricsProps, 'metrics' | 'features'>> =
diff --git a/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx b/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx
index 0e975562d1c78..39b3f8613120a 100644
--- a/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx
@@ -7,6 +7,7 @@
 
 import React, { useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CaseMetrics, CaseMetricsFeature } from '../../../../common/ui';
 import {
   ASSOCIATED_HOSTS_METRIC,
@@ -15,7 +16,6 @@ import {
   TOTAL_ALERTS_METRIC,
   TOTAL_CONNECTORS_METRIC,
 } from './translations';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { CaseViewMetricsProps } from './types';
 
 export const CaseViewMetricItems: React.FC<Pick<CaseViewMetricsProps, 'metrics' | 'features'>> =
diff --git a/x-pack/plugins/cases/public/components/case_view/translations.ts b/x-pack/plugins/cases/public/components/case_view/translations.ts
index 7d6d81a22ca11..761cecb1121ca 100644
--- a/x-pack/plugins/cases/public/components/case_view/translations.ts
+++ b/x-pack/plugins/cases/public/components/case_view/translations.ts
@@ -83,6 +83,14 @@ export const EDIT_COMMENT = i18n.translate('xpack.cases.caseView.edit.comment',
   defaultMessage: 'Edit comment',
 });
 
+export const DELETE_COMMENT = i18n.translate('xpack.cases.caseView.delete.comment', {
+  defaultMessage: 'Delete comment',
+});
+
+export const DELETE_COMMENT_TITLE = i18n.translate('xpack.cases.caseView.deleteTitle.comment', {
+  defaultMessage: 'Delete this comment?',
+});
+
 export const ON = i18n.translate('xpack.cases.caseView.actionLabel.on', {
   defaultMessage: 'on',
 });
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
index cf8d86eb1700a..a5fe9f655ef44 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
@@ -9,11 +9,11 @@ import React, { useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiIconTip, EuiSuperSelect } from '@elastic/eui';
 import styled from 'styled-components';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ActionConnector } from '../../containers/configure/types';
 import * as i18n from './translations';
 import { useKibana } from '../../common/lib/kibana';
 import { getConnectorIcon, isDeprecatedConnector } from '../utils';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
 
 export interface Props {
   connectors: ActionConnector[];
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
index 918252369c26b..2ee1c328f4699 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
@@ -27,7 +27,7 @@ import {
   useActionTypesResponse,
 } from './__mock__';
 import { ConnectorTypes } from '../../../common/api';
-import { actionTypeRegistryMock } from '../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 
 jest.mock('../../common/lib/kibana');
 jest.mock('../../containers/configure/use_connectors');
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
index 44c1979aa0fda..61172b9998667 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
@@ -11,6 +11,8 @@ import styled, { css } from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ActionConnectorTableItem } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { SUPPORTED_CONNECTORS } from '../../../common/constants';
 import { useKibana } from '../../common/lib/kibana';
 import { useConnectors } from '../../containers/configure/use_connectors';
@@ -19,9 +21,6 @@ import { useCaseConfigure } from '../../containers/configure/use_configure';
 
 import { ClosureType } from '../../containers/configure/types';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ActionConnectorTableItem } from '../../../../triggers_actions_ui/public/types';
-
 import { SectionWrapper, ContentWrapper, WhitePageWrapper } from '../wrappers';
 import { Connectors } from './connectors';
 import { ClosureOptions } from './closure_options';
diff --git a/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx b/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
index b914b4c7edab2..44e5179f1e02e 100644
--- a/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
@@ -13,7 +13,7 @@ import { connectorsMock } from '../../containers/mock';
 import { getFormMock } from '../__mock__/form';
 import { useKibana } from '../../common/lib/kibana';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../../common/lib/kibana');
 
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts b/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
index 593e5fa5497f5..1512929ec9dd0 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getIssueTypes, getFieldsByIssueType, getIssues, getIssue } from './api';
 
 const issueTypesResponse = {
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/api.ts b/x-pack/plugins/cases/public/components/connectors/jira/api.ts
index b4bbec156f04d..286d44c5916d4 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import { ActionTypeExecutorResult } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { getExecuteConnectorUrl } from '../../../../common/utils';
 import {
   ConnectorExecutorResult,
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
index f3d14f02ca1f3..955a03c614888 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getFieldsByIssueType } from './api';
 import { Fields } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
index 6322b59527e4e..3be1093eeaccb 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIssueTypes } from './api';
 import { IssueTypes } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx
index f4ab31c9daa2d..230bf5636d62d 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx
@@ -7,7 +7,7 @@
 
 import { isEmpty, debounce } from 'lodash/fp';
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIssues } from './api';
 import { Issues } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx
index 857b07e41d2f2..aa7bd2ea0d4f6 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIssue } from './api';
 import { Issue } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/api.ts b/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
index 6d803b6fbe542..2afb2d5d35f22 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
 import {
   ConnectorExecutorResult,
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx
index 588e2ee715a88..0f58b8e37cc7c 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIncidentTypes } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx
index 1d647ca1848fe..fa3b63ea4c7d0 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getSeverity } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
index e73488257d9d2..739250bee0d19 100644
--- a/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
+++ b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionTypeExecutorResult, RewriteResponseCase } from '../../../../actions/common';
+import { ActionTypeExecutorResult, RewriteResponseCase } from '@kbn/actions-plugin/common';
 
 export type ConnectorExecutorResult<T> = ReturnType<
   RewriteResponseCase<ActionTypeExecutorResult<T>>
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts
index 9ea46e5e427b7..20a0b4b78d849 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getChoices } from './api';
 import { choices } from '../mock';
 
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
index de3ea1f16c359..3224c65cc9319 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
 import {
   ConnectorExecutorResult,
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
index fa8e648a0981e..19452cb3ac3ae 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getChoices } from './api';
 import { Choice } from './types';
diff --git a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
index e2448bf8fbf8a..6a2ac8e15dedb 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
@@ -12,11 +12,14 @@ import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eu
 import * as i18n from '../translations';
 import { Case } from '../../../../common/ui/types';
 import { CreateCaseForm } from '../form';
-import { UsePostComment } from '../../../containers/use_post_comment';
+import { UseCreateAttachments } from '../../../containers/use_create_attachments';
 import { CaseAttachments } from '../../../types';
 
 export interface CreateCaseFlyoutProps {
-  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
+  afterCaseCreated?: (
+    theCase: Case,
+    createAttachments: UseCreateAttachments['createAttachments']
+  ) => Promise<void>;
   onClose?: () => void;
   onSuccess?: (theCase: Case) => Promise<void>;
   attachments?: CaseAttachments;
diff --git a/x-pack/plugins/cases/public/components/create/form.tsx b/x-pack/plugins/cases/public/components/create/form.tsx
index c353ddc08a310..ac2729564b387 100644
--- a/x-pack/plugins/cases/public/components/create/form.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.tsx
@@ -27,7 +27,7 @@ import { ActionConnector } from '../../../common/api';
 import { Case } from '../../containers/types';
 import { CasesTimelineIntegration, CasesTimelineIntegrationProvider } from '../timeline_context';
 import { InsertTimeline } from '../insert_timeline';
-import { UsePostComment } from '../../containers/use_post_comment';
+import { UseCreateAttachments } from '../../containers/use_create_attachments';
 import { SubmitCaseButton } from './submit_button';
 import { FormContext } from './form_context';
 import { useCasesFeatures } from '../cases_context/use_cases_features';
@@ -61,7 +61,10 @@ export interface CreateCaseFormFieldsProps {
 export interface CreateCaseFormProps extends Pick<Partial<CreateCaseFormFieldsProps>, 'withSteps'> {
   onCancel: () => void;
   onSuccess: (theCase: Case) => Promise<void>;
-  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
+  afterCaseCreated?: (
+    theCase: Case,
+    createAttachments: UseCreateAttachments['createAttachments']
+  ) => Promise<void>;
   timelineIntegration?: CasesTimelineIntegration;
   attachments?: CaseAttachments;
 }
diff --git a/x-pack/plugins/cases/public/components/create/form_context.test.tsx b/x-pack/plugins/cases/public/components/create/form_context.test.tsx
index 1255131c17791..634f518ae5ebd 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.test.tsx
@@ -14,7 +14,7 @@ import { CommentType, ConnectorTypes } from '../../../common/api';
 import { useKibana } from '../../common/lib/kibana';
 import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
 import { usePostCase } from '../../containers/use_post_case';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { useGetTags } from '../../containers/use_get_tags';
 import { useConnectors } from '../../containers/configure/use_connectors';
 import { useCaseConfigure } from '../../containers/configure/use_configure';
@@ -41,11 +41,12 @@ import { usePostPushToService } from '../../containers/use_post_push_to_service'
 import { Choice } from '../connectors/servicenow/types';
 import userEvent from '@testing-library/user-event';
 import { connectorsMock } from '../../common/mock/connectors';
+import { CaseAttachments } from '../../types';
 
 const sampleId = 'case-id';
 
 jest.mock('../../containers/use_post_case');
-jest.mock('../../containers/use_post_comment');
+jest.mock('../../containers/use_create_attachments');
 jest.mock('../../containers/use_post_push_to_service');
 jest.mock('../../containers/use_get_tags');
 jest.mock('../../containers/configure/use_connectors');
@@ -62,7 +63,7 @@ jest.mock('../../common/lib/kibana');
 const useConnectorsMock = useConnectors as jest.Mock;
 const useCaseConfigureMock = useCaseConfigure as jest.Mock;
 const usePostCaseMock = usePostCase as jest.Mock;
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 const usePostPushToServiceMock = usePostPushToService as jest.Mock;
 const useGetIncidentTypesMock = useGetIncidentTypes as jest.Mock;
 const useGetSeverityMock = useGetSeverity as jest.Mock;
@@ -132,7 +133,7 @@ describe('Create case', () => {
   const fetchTags = jest.fn();
   const onFormSubmitSuccess = jest.fn();
   const afterCaseCreated = jest.fn();
-  const postComment = jest.fn();
+  const createAttachments = jest.fn();
   let onChoicesSuccess: (values: Choice[]) => void;
   let mockedContext: AppMockRenderer;
 
@@ -142,7 +143,7 @@ describe('Create case', () => {
       ...sampleData,
     });
     usePostCaseMock.mockImplementation(() => defaultPostCase);
-    usePostCommentMock.mockImplementation(() => ({ postComment }));
+    useCreateAttachmentsMock.mockImplementation(() => ({ createAttachments }));
     usePostPushToServiceMock.mockImplementation(() => defaultPostPushToService);
     useConnectorsMock.mockReturnValue(sampleConnectorData);
     useCaseConfigureMock.mockImplementation(() => useCaseConfigureResponse);
@@ -733,12 +734,12 @@ describe('Create case', () => {
           id: sampleId,
           ...sampleData,
         },
-        postComment
+        createAttachments
       );
     });
   });
 
-  it('should call `postComment` with the attachments after the case is created', async () => {
+  it('should call createAttachments with the attachments after the case is created', async () => {
     useConnectorsMock.mockReturnValue({
       ...sampleConnectorData,
       connectors: connectorsMock,
@@ -778,8 +779,32 @@ describe('Create case', () => {
     await act(async () => {
       userEvent.click(wrapper.getByTestId('create-case-submit'));
     });
-    expect(postComment).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments[0] });
-    expect(postComment).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments[1] });
+
+    expect(createAttachments).toHaveBeenCalledTimes(1);
+    expect(createAttachments).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments });
+  });
+
+  it('should NOT call createAttachments if the attachments are an empty array', async () => {
+    useConnectorsMock.mockReturnValue({
+      ...sampleConnectorData,
+      connectors: connectorsMock,
+    });
+    const attachments: CaseAttachments = [];
+
+    const wrapper = mockedContext.render(
+      <FormContext onSuccess={onFormSubmitSuccess} attachments={attachments}>
+        <CreateCaseFormFields {...defaultCreateCaseForm} />
+        <SubmitCaseButton />
+      </FormContext>
+    );
+
+    await fillFormReactTestingLib(wrapper);
+
+    await act(async () => {
+      userEvent.click(wrapper.getByTestId('create-case-submit'));
+    });
+
+    expect(createAttachments).not.toHaveBeenCalled();
   });
 
   it(`should call callbacks in correct order`, async () => {
@@ -826,21 +851,21 @@ describe('Create case', () => {
     wrapper.find(`[data-test-subj="create-case-submit"]`).first().simulate('click');
     await waitFor(() => {
       expect(postCase).toHaveBeenCalled();
-      expect(postComment).toHaveBeenCalled();
+      expect(createAttachments).toHaveBeenCalled();
       expect(afterCaseCreated).toHaveBeenCalled();
       expect(pushCaseToExternalService).toHaveBeenCalled();
       expect(onFormSubmitSuccess).toHaveBeenCalled();
     });
 
     const postCaseOrder = postCase.mock.invocationCallOrder[0];
-    const postCommentOrder = postComment.mock.invocationCallOrder[0];
+    const createAttachmentsOrder = createAttachments.mock.invocationCallOrder[0];
     const afterCaseOrder = afterCaseCreated.mock.invocationCallOrder[0];
     const pushCaseToExternalServiceOrder = pushCaseToExternalService.mock.invocationCallOrder[0];
     const onFormSubmitSuccessOrder = onFormSubmitSuccess.mock.invocationCallOrder[0];
 
     expect(
-      postCaseOrder < postCommentOrder &&
-        postCommentOrder < afterCaseOrder &&
+      postCaseOrder < createAttachmentsOrder &&
+        createAttachmentsOrder < afterCaseOrder &&
         afterCaseOrder < pushCaseToExternalServiceOrder &&
         pushCaseToExternalServiceOrder < onFormSubmitSuccessOrder
     ).toBe(true);
diff --git a/x-pack/plugins/cases/public/components/create/form_context.tsx b/x-pack/plugins/cases/public/components/create/form_context.tsx
index 8a89dfea3a811..4385053a8c8c0 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.tsx
@@ -15,7 +15,10 @@ import { usePostPushToService } from '../../containers/use_post_push_to_service'
 import { useConnectors } from '../../containers/configure/use_connectors';
 import { Case } from '../../containers/types';
 import { NONE_CONNECTOR_ID } from '../../../common/api';
-import { UsePostComment, usePostComment } from '../../containers/use_post_comment';
+import {
+  UseCreateAttachments,
+  useCreateAttachments,
+} from '../../containers/use_create_attachments';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { useCasesFeatures } from '../cases_context/use_cases_features';
 import { getConnectorById } from '../utils';
@@ -32,7 +35,10 @@ const initialCaseValue: FormProps = {
 };
 
 interface Props {
-  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
+  afterCaseCreated?: (
+    theCase: Case,
+    createAttachments: UseCreateAttachments['createAttachments']
+  ) => Promise<void>;
   children?: JSX.Element | JSX.Element[];
   onSuccess?: (theCase: Case) => Promise<void>;
   attachments?: CaseAttachments;
@@ -48,7 +54,7 @@ export const FormContext: React.FC<Props> = ({
   const { owner } = useCasesContext();
   const { isSyncAlertsEnabled } = useCasesFeatures();
   const { postCase } = usePostCase();
-  const { postComment } = usePostComment();
+  const { createAttachments } = useCreateAttachments();
   const { pushCaseToExternalService } = usePostPushToService();
 
   const submitCase = useCallback(
@@ -77,20 +83,15 @@ export const FormContext: React.FC<Props> = ({
         });
 
         // add attachments to the case
-        if (updatedCase && Array.isArray(attachments)) {
-          // TODO currently the API only supports to add a comment at the time
-          // once the API is updated we should use bulk post comment #124814
-          // this operation is intentionally made in sequence
-          for (const attachment of attachments) {
-            await postComment({
-              caseId: updatedCase.id,
-              data: attachment,
-            });
-          }
+        if (updatedCase && Array.isArray(attachments) && attachments.length > 0) {
+          await createAttachments({
+            caseId: updatedCase.id,
+            data: attachments,
+          });
         }
 
         if (afterCaseCreated && updatedCase) {
-          await afterCaseCreated(updatedCase, postComment);
+          await afterCaseCreated(updatedCase, createAttachments);
         }
 
         if (updatedCase?.id && connectorToUpdate.id !== 'none') {
@@ -113,7 +114,7 @@ export const FormContext: React.FC<Props> = ({
       afterCaseCreated,
       onSuccess,
       attachments,
-      postComment,
+      createAttachments,
       pushCaseToExternalService,
     ]
   );
diff --git a/x-pack/plugins/cases/public/components/create/owner_selector.tsx b/x-pack/plugins/cases/public/components/create/owner_selector.tsx
index eaa5382260d21..34bef0b98ff78 100644
--- a/x-pack/plugins/cases/public/components/create/owner_selector.tsx
+++ b/x-pack/plugins/cases/public/components/create/owner_selector.tsx
@@ -17,7 +17,7 @@ import {
   useGeneratedHtmlId,
 } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SECURITY_SOLUTION_OWNER } from '../../../common';
 import { OBSERVABILITY_OWNER, OWNER_INFO } from '../../../common/constants';
 
diff --git a/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx b/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx
index 87d4ea8f1e586..3f8f47f2b96ae 100644
--- a/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx
@@ -10,7 +10,7 @@ import { mount } from 'enzyme';
 import { render, waitFor, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { EditConnector, EditConnectorProps } from './index';
+import { EditConnector, EditConnectorProps } from '.';
 import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
 import { basicCase, basicPush, caseUserActions, connectorsMock } from '../../containers/mock';
 import { CaseConnector } from '../../containers/configure/types';
diff --git a/x-pack/plugins/cases/public/components/header_page/index.test.tsx b/x-pack/plugins/cases/public/components/header_page/index.test.tsx
index bd4069cd11679..55ca3671ce974 100644
--- a/x-pack/plugins/cases/public/components/header_page/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/header_page/index.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 
 import '../../common/mock/match_media';
 import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
-import { HeaderPage } from './index';
+import { HeaderPage } from '.';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
 jest.mock('../../common/navigation/hooks');
diff --git a/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx b/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx
index 5b396acc95389..1a745221bbc48 100644
--- a/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx
@@ -17,7 +17,7 @@ import { getFormMock } from '../__mock__/form';
 import { InsertTimeline } from '.';
 import { useTimelineContext } from '../timeline_context/use_timeline_context';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../timeline_context/use_timeline_context');
 
 const useFormMock = useForm as jest.Mock;
diff --git a/x-pack/plugins/cases/public/components/link_icon/index.test.tsx b/x-pack/plugins/cases/public/components/link_icon/index.test.tsx
index 4600f0dc4adc4..8136457a5c905 100644
--- a/x-pack/plugins/cases/public/components/link_icon/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/link_icon/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { LinkIcon } from './index';
+import { LinkIcon } from '.';
 
 describe('LinkIcon', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
index 2105618ae0315..65a2653bb298b 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
@@ -27,12 +27,12 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { useLocation } from 'react-router-dom';
 import styled from 'styled-components';
 
-import type { TypedLensByValueInput } from '../../../../../../lens/public';
+import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import type { EmbeddablePackageState } from '@kbn/embeddable-plugin/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import { DRAFT_COMMENT_STORAGE_ID, ID } from './constants';
 import { CommentEditorContext } from '../../context';
 import { ModalContainer } from './modal_container';
-import type { EmbeddablePackageState } from '../../../../../../../../src/plugins/embeddable/public';
 import { SavedObjectFinderUi } from './saved_objects_finder';
 import { useLensDraftComment } from './use_lens_draft_comment';
 import { VISUALIZATION } from './translations';
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx
index 1ca3f53291eb0..c25710aed2d5d 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { createGlobalStyle } from '../../../../../../../../src/plugins/kibana_react/common';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
+import { createGlobalStyle } from '@kbn/kibana-react-plugin/common';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import { LENS_VISUALIZATION_HEIGHT } from './constants';
 
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx
index e33704c4d690f..7d7ce5d638489 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx
@@ -35,9 +35,9 @@ import {
 import { Direction } from '@elastic/eui/src/services/sort/sort_direction';
 import { i18n } from '@kbn/i18n';
 
-import { SimpleSavedObject, CoreStart } from 'src/core/public';
+import { SimpleSavedObject, CoreStart } from '@kbn/core/public';
 
-import { LISTING_LIMIT_SETTING } from '../../../../../../../../src/plugins/saved_objects/public';
+import { LISTING_LIMIT_SETTING } from '@kbn/saved-objects-plugin/public';
 
 export interface SavedObjectMetaData<T = unknown> {
   type: string;
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
index 8060b53831279..1d6a5ec8ca11a 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
@@ -8,7 +8,7 @@
 import { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { TypedLensByValueInput } from '../../../../../../lens/public';
+import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import {
   parseCommentString,
diff --git a/x-pack/plugins/cases/public/components/subtitle/index.test.tsx b/x-pack/plugins/cases/public/components/subtitle/index.test.tsx
index 20120edc91937..96755ca5d41ba 100644
--- a/x-pack/plugins/cases/public/components/subtitle/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/subtitle/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { Subtitle } from './index';
+import { Subtitle } from '.';
 
 describe('Subtitle', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/tag_list/index.test.tsx b/x-pack/plugins/cases/public/components/tag_list/index.test.tsx
index 2ced7502b3c3f..da1d8c1c63ab1 100644
--- a/x-pack/plugins/cases/public/components/tag_list/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/tag_list/index.test.tsx
@@ -12,13 +12,13 @@ import { TagList, TagListProps } from '.';
 import { getFormMock } from '../__mock__/form';
 import { TestProviders } from '../../common/mock';
 import { waitFor } from '@testing-library/react';
-import { useForm } from '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form';
+import { useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form';
 import { useGetTags } from '../../containers/use_get_tags';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../../containers/use_get_tags');
 jest.mock(
-  '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider',
+  '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/components/form_data_provider',
   () => ({
     FormDataProvider: ({ children }: { children: ({ tags }: { tags: string[] }) => void }) =>
       children({ tags: ['rad', 'dude'] }),
diff --git a/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts b/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts
index 7c7625507fe9e..ce42b36a471e3 100644
--- a/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts
+++ b/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useCallback, useEffect } from 'react';
 import { useKibana, useNavigation } from '../../common/lib/kibana';
 import { CasesDeepLinkId, ICasesDeepLinkId } from '../../common/navigation';
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/alert.test.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/alert.test.tsx
index bdffe3c50c4a4..03515b6a2b244 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/alert.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/alert.test.tsx
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import { omit, merge } from 'lodash';
 import { CommentResponseAlertsType } from '../../../../common/api';
 import { SnakeToCamelCase } from '../../../../common/types';
-import { getRuleId, getRuleName } from './alert';
+import { getRuleId, getRuleInfo, getRuleName } from './alert';
 import { Ecs } from '../../../containers/types';
 
 describe('rule getters', () => {
@@ -135,4 +136,71 @@ describe('rule getters', () => {
       expect(funcToExec(comment, alert)).toEqual(expectedResult);
     });
   });
+
+  describe('getRuleInfo', () => {
+    const defaultComment = {
+      alertId: ['alert-id-1', 'alert-id-2'],
+      alertIndex: ['alert-index-1', 'alert-index-2'],
+      rule: {
+        id: '1',
+        name: 'Rule name1',
+      },
+    } as unknown as SnakeToCamelCase<CommentResponseAlertsType>;
+
+    const signal = { rule: { id: '1', name: 'Rule name1' } };
+    const kibana = { alert: { rule: { uuid: 'rule id1', name: 'other rule name1' } } };
+
+    const defaultAlert = {
+      'alert-id-1': {
+        signal,
+        kibana,
+      },
+    };
+
+    const nullRule = {
+      id: null,
+      name: null,
+    };
+
+    const tests = [
+      // Alert id is missing from the comment
+      [{ ruleId: null, ruleName: null }, omit(defaultComment, 'alertId'), {}],
+      // All information is in the comment. The alert data are empty
+      [{ ruleId: '1', ruleName: 'Rule name1' }, defaultComment, {}],
+      // The comment does not contain the rule info but the alert data does
+      [{ ruleId: '1', ruleName: 'Rule name1' }, omit(defaultComment, 'rule'), defaultAlert],
+      // The comment has the rule info as null but the alert data has the info
+      [
+        { ruleId: '1', ruleName: 'Rule name1' },
+        merge({}, defaultComment, { rule: nullRule }),
+        defaultAlert,
+      ],
+      // The comment has the rule info and the alert data has the info
+      [{ ruleId: '1', ruleName: 'Rule name1' }, defaultComment, defaultAlert],
+      // The comment does not contain the rule info neither the alert data does
+      [{ ruleId: null, ruleName: null }, omit(defaultComment, 'rule'), {}],
+      // The comment does not contain the rule info and the alert data contains only the signal attribute
+      [
+        { ruleId: '1', ruleName: 'Rule name1' },
+        omit(defaultComment, 'rule'),
+        { 'alert-id-1': { signal } },
+      ],
+      // The comment does not contain the rule info and the alert data contains only the kibana attribute
+      [
+        { ruleId: 'rule id1', ruleName: 'other rule name1' },
+        omit(defaultComment, 'rule'),
+        { 'alert-id-1': { kibana } },
+      ],
+    ] as Array<
+      [
+        Record<string, unknown>,
+        SnakeToCamelCase<CommentResponseAlertsType>,
+        Record<string, unknown>
+      ]
+    >;
+
+    it.each(tests)('returns the correct rule info: %s', (expectedResult, comment, alert) => {
+      expect(getRuleInfo(comment, alert)).toEqual(expectedResult);
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/alert.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/alert.tsx
index 95e996498554a..939bd458ebdc0 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/alert.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/alert.tsx
@@ -7,15 +7,15 @@
 
 import React from 'react';
 import { get, isEmpty } from 'lodash';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiCommentProps, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { ALERT_RULE_NAME, ALERT_RULE_UUID } from '@kbn/rule-data-utils';
 
-import { CommentType, CommentResponseAlertsType } from '../../../../common/api';
+import { CommentResponseAlertsType } from '../../../../common/api';
 import { UserActionBuilder, UserActionBuilderArgs } from '../types';
 import { UserActionTimestamp } from '../timestamp';
 import { SnakeToCamelCase } from '../../../../common/types';
 import { UserActionUsernameWithAvatar } from '../avatar_username';
-import { AlertCommentEvent } from './alert_event';
+import { MultipleAlertsCommentEvent, SingleAlertCommentEvent } from './alert_event';
 import { UserActionCopyLink } from '../copy_link';
 import { UserActionShowAlert } from './show_alert';
 
@@ -29,7 +29,7 @@ type BuilderArgs = Pick<
   | 'onShowAlertDetails'
 > & { comment: SnakeToCamelCase<CommentResponseAlertsType> };
 
-export const createAlertAttachmentUserActionBuilder = ({
+const getSingleAlertUserAction = ({
   userAction,
   comment,
   alertData,
@@ -37,62 +37,122 @@ export const createAlertAttachmentUserActionBuilder = ({
   loadingAlertData,
   onRuleDetailsClick,
   onShowAlertDetails,
-}: BuilderArgs): ReturnType<UserActionBuilder> => ({
-  // TODO: Fix this manually. Issue #123375
-  // eslint-disable-next-line react/display-name
+}: BuilderArgs): EuiCommentProps[] => {
+  const alertId = getNonEmptyField(comment.alertId);
+  const alertIndex = getNonEmptyField(comment.index);
+
+  if (!alertId || !alertIndex) {
+    return [];
+  }
+
+  const alertField: unknown | undefined = alertData[alertId];
+  const ruleId = getRuleId(comment, alertField);
+  const ruleName = getRuleName(comment, alertField);
+
+  return [
+    {
+      username: (
+        <UserActionUsernameWithAvatar
+          username={userAction.createdBy.username}
+          fullName={userAction.createdBy.fullName}
+        />
+      ),
+      className: 'comment-alert',
+      type: 'update',
+      event: (
+        <SingleAlertCommentEvent
+          actionId={userAction.actionId}
+          getRuleDetailsHref={getRuleDetailsHref}
+          loadingAlertData={loadingAlertData}
+          onRuleDetailsClick={onRuleDetailsClick}
+          ruleId={ruleId}
+          ruleName={ruleName}
+        />
+      ),
+      'data-test-subj': `user-action-alert-${userAction.type}-${userAction.action}-action-${userAction.actionId}`,
+      timestamp: <UserActionTimestamp createdAt={userAction.createdAt} />,
+      timelineIcon: 'bell',
+      actions: (
+        <EuiFlexGroup responsive={false}>
+          <EuiFlexItem grow={false}>
+            <UserActionCopyLink id={userAction.actionId} />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <UserActionShowAlert
+              id={userAction.actionId}
+              alertId={alertId}
+              index={alertIndex}
+              onShowAlertDetails={onShowAlertDetails}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ),
+    },
+  ];
+};
+
+const getMultipleAlertsUserAction = ({
+  userAction,
+  comment,
+  alertData,
+  getRuleDetailsHref,
+  loadingAlertData,
+  onRuleDetailsClick,
+}: BuilderArgs): EuiCommentProps[] => {
+  if (!Array.isArray(comment.alertId)) {
+    return [];
+  }
+
+  const totalAlerts = comment.alertId.length;
+  const { ruleId, ruleName } = getRuleInfo(comment, alertData);
+
+  return [
+    {
+      username: (
+        <UserActionUsernameWithAvatar
+          username={userAction.createdBy.username}
+          fullName={userAction.createdBy.fullName}
+        />
+      ),
+      className: 'comment-alert',
+      type: 'update',
+      event: (
+        <MultipleAlertsCommentEvent
+          actionId={userAction.actionId}
+          loadingAlertData={loadingAlertData}
+          totalAlerts={totalAlerts}
+          ruleId={ruleId}
+          ruleName={ruleName}
+          getRuleDetailsHref={getRuleDetailsHref}
+          onRuleDetailsClick={onRuleDetailsClick}
+        />
+      ),
+      'data-test-subj': `user-action-alert-${userAction.type}-${userAction.action}-action-${userAction.actionId}`,
+      timestamp: <UserActionTimestamp createdAt={userAction.createdAt} />,
+      timelineIcon: 'bell',
+      actions: (
+        <EuiFlexGroup responsive={false}>
+          <EuiFlexItem grow={false}>
+            <UserActionCopyLink id={userAction.actionId} />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ),
+    },
+  ];
+};
+
+export const createAlertAttachmentUserActionBuilder = (
+  params: BuilderArgs
+): ReturnType<UserActionBuilder> => ({
   build: () => {
-    const alertId = getNonEmptyField(comment.alertId);
-    const alertIndex = getNonEmptyField(comment.index);
+    const { comment } = params;
+    const alertId = Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId];
 
-    if (!alertId || !alertIndex) {
-      return [];
+    if (alertId.length === 1) {
+      return getSingleAlertUserAction(params);
     }
 
-    const alertField: unknown | undefined = alertData[alertId];
-    const ruleId = getRuleId(comment, alertField);
-    const ruleName = getRuleName(comment, alertField);
-
-    return [
-      {
-        username: (
-          <UserActionUsernameWithAvatar
-            username={userAction.createdBy.username}
-            fullName={userAction.createdBy.fullName}
-          />
-        ),
-        className: 'comment-alert',
-        type: 'update',
-        event: (
-          <AlertCommentEvent
-            alertId={alertId}
-            getRuleDetailsHref={getRuleDetailsHref}
-            loadingAlertData={loadingAlertData}
-            onRuleDetailsClick={onRuleDetailsClick}
-            ruleId={ruleId}
-            ruleName={ruleName}
-            commentType={CommentType.alert}
-          />
-        ),
-        'data-test-subj': `user-action-alert-${userAction.type}-${userAction.action}-action-${userAction.actionId}`,
-        timestamp: <UserActionTimestamp createdAt={userAction.createdAt} />,
-        timelineIcon: 'bell',
-        actions: (
-          <EuiFlexGroup responsive={false}>
-            <EuiFlexItem grow={false}>
-              <UserActionCopyLink id={userAction.actionId} />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <UserActionShowAlert
-                id={userAction.actionId}
-                alertId={alertId}
-                index={alertIndex}
-                onShowAlertDetails={onShowAlertDetails}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        ),
-      },
-    ];
+    return getMultipleAlertsUserAction(params);
   },
 });
 
@@ -143,3 +203,17 @@ function getNonEmptyField(field: string | string[] | undefined | null): string |
 
   return firstItem;
 }
+
+export function getRuleInfo(comment: BuilderArgs['comment'], alertData: BuilderArgs['alertData']) {
+  const alertId = getNonEmptyField(comment.alertId);
+
+  if (!alertId) {
+    return { ruleId: null, ruleName: null };
+  }
+
+  const alertField: unknown | undefined = alertData[alertId];
+  const ruleId = getRuleId(comment, alertField);
+  const ruleName = getRuleName(comment, alertField);
+
+  return { ruleId, ruleName };
+}
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx
index 948a15eeba88e..dbedcd4e1d84d 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx
@@ -8,25 +8,22 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { TestProviders } from '../../../common/mock';
+import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../../common/mock';
 import { useKibana } from '../../../common/lib/kibana';
-import { AlertCommentEvent } from './alert_event';
-import { CommentType } from '../../../../common/api';
+import { MultipleAlertsCommentEvent, SingleAlertCommentEvent } from './alert_event';
 
 const props = {
-  alertId: 'alert-id-1',
+  actionId: 'action-id-1',
   getRuleDetailsHref: jest.fn().mockReturnValue('https://example.com'),
   onRuleDetailsClick: jest.fn(),
   ruleId: 'rule-id-1',
   ruleName: 'Awesome rule',
-  alertsCount: 1,
-  commentType: CommentType.alert,
 };
 
 jest.mock('../../../common/lib/kibana');
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
-describe('UserActionAvatar ', () => {
+describe('Alert events', () => {
   let navigateToApp: jest.Mock;
 
   beforeEach(() => {
@@ -35,70 +32,144 @@ describe('UserActionAvatar ', () => {
     useKibanaMock().services.application.navigateToApp = navigateToApp;
   });
 
-  it('it renders', async () => {
-    const wrapper = mount(
-      <TestProviders>
-        <AlertCommentEvent {...props} />
-      </TestProviders>
-    );
-
-    expect(
-      wrapper.find(`[data-test-subj="alert-rule-link-alert-id-1"]`).first().exists()
-    ).toBeTruthy();
-    expect(wrapper.text()).toBe('added an alert from Awesome rule');
+  describe('SingleAlertCommentEvent', () => {
+    it('it renders', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().exists()
+      ).toBeTruthy();
+      expect(wrapper.text()).toBe('added an alert from Awesome rule');
+    });
+
+    it('does NOT render the link when the rule id is null', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} ruleId={null} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().exists()
+      ).toBeFalsy();
+
+      expect(wrapper.text()).toBe('added an alert from Awesome rule');
+    });
+
+    it('does NOT render the link when the href is invalid but it shows the rule name', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} getRuleDetailsHref={undefined} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().exists()
+      ).toBeFalsy();
+
+      expect(wrapper.text()).toBe('added an alert from Awesome rule');
+    });
+
+    it('show Unknown rule if the rule name is invalid', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} ruleName={null} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().exists()
+      ).toBeTruthy();
+      expect(wrapper.text()).toBe('added an alert from Unknown rule');
+    });
+
+    it('navigate to app on link click', async () => {
+      const onRuleDetailsClick = jest.fn();
+
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} onRuleDetailsClick={onRuleDetailsClick} />
+        </TestProviders>
+      );
+
+      wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().simulate('click');
+      expect(onRuleDetailsClick).toHaveBeenCalled();
+    });
+
+    it('shows the loading spinner if the alerts data are loading', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} loadingAlertData={true} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-loading-spinner-action-id-1"]`).first().exists()
+      ).toBeTruthy();
+    });
   });
 
-  it('does NOT render the link when the rule is null', async () => {
-    const wrapper = mount(
-      <TestProviders>
-        <AlertCommentEvent {...props} ruleId={null} />
-      </TestProviders>
-    );
-
-    expect(
-      wrapper.find(`[data-test-subj="alert-rule-link-alert-id-1"]`).first().exists()
-    ).toBeFalsy();
-
-    expect(wrapper.text()).toBe('added an alert from Awesome rule');
-  });
-
-  it('does NOT render the link when the href is invalid but it shows the rule name', async () => {
-    const wrapper = mount(
-      <TestProviders>
-        <AlertCommentEvent {...props} getRuleDetailsHref={undefined} />
-      </TestProviders>
-    );
-
-    expect(
-      wrapper.find(`[data-test-subj="alert-rule-link-alert-id-1"]`).first().exists()
-    ).toBeFalsy();
-
-    expect(wrapper.text()).toBe('added an alert from Awesome rule');
-  });
-
-  it('show Unknown rule if the rule name is invalid', async () => {
-    const wrapper = mount(
-      <TestProviders>
-        <AlertCommentEvent {...props} ruleName={null} />
-      </TestProviders>
-    );
-
-    expect(
-      wrapper.find(`[data-test-subj="alert-rule-link-alert-id-1"]`).first().exists()
-    ).toBeTruthy();
-    expect(wrapper.text()).toBe('added an alert from Unknown rule');
-  });
-
-  it('navigate to app on link click', async () => {
-    const onRuleDetailsClick = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <AlertCommentEvent {...props} onRuleDetailsClick={onRuleDetailsClick} />
-      </TestProviders>
-    );
-
-    wrapper.find(`[data-test-subj="alert-rule-link-alert-id-1"]`).first().simulate('click');
-    expect(onRuleDetailsClick).toHaveBeenCalled();
+  describe('MultipleAlertsCommentEvent', () => {
+    let appMock: AppMockRenderer;
+
+    beforeEach(() => {
+      appMock = createAppMockRenderer();
+      jest.clearAllMocks();
+    });
+
+    it('renders correctly', async () => {
+      const result = appMock.render(<MultipleAlertsCommentEvent {...props} totalAlerts={2} />);
+
+      expect(result.getByTestId('multiple-alerts-user-action-action-id-1')).toHaveTextContent(
+        'added 2 alerts from Awesome rule'
+      );
+      expect(result.getByTestId('alert-rule-link-action-id-1')).toHaveTextContent('Awesome rule');
+    });
+
+    it('does NOT render the link when the rule id is null', async () => {
+      const result = appMock.render(
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} ruleId={null} />
+      );
+
+      expect(result.getByTestId('multiple-alerts-user-action-action-id-1')).toHaveTextContent(
+        'added 2 alerts from Awesome rule'
+      );
+      expect(result.queryByTestId('alert-rule-link-action-id-1')).toBeFalsy();
+    });
+
+    it('does NOT render the link when the href is invalid but it shows the rule name', async () => {
+      const result = appMock.render(
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} getRuleDetailsHref={undefined} />
+      );
+
+      expect(result.getByTestId('multiple-alerts-user-action-action-id-1')).toHaveTextContent(
+        'added 2 alerts from Awesome rule'
+      );
+      expect(result.queryByTestId('alert-rule-link-action-id-1')).toBeFalsy();
+    });
+
+    it('show Unknown rule if the rule name is invalid', async () => {
+      const result = appMock.render(
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} ruleName={null} />
+      );
+
+      expect(result.getByTestId('multiple-alerts-user-action-action-id-1')).toHaveTextContent(
+        'added 2 alerts from Unknown rule'
+      );
+
+      expect(result.getByTestId('alert-rule-link-action-id-1')).toHaveTextContent('Unknown rule');
+    });
+
+    it('shows the loading spinner if the alerts data are loading', async () => {
+      const result = appMock.render(
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} loadingAlertData={true} />
+      );
+
+      expect(result.getByTestId('alert-loading-spinner-action-id-1')).toBeTruthy();
+    });
   });
 });
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx
index 03e4c9b56d0c6..81f45bbb267e9 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx
@@ -9,60 +9,108 @@ import React, { memo, useCallback } from 'react';
 import { isEmpty } from 'lodash';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
-import { CommentType } from '../../../../common/api';
 import * as i18n from '../translations';
 import { LinkAnchor } from '../../links';
 import { RuleDetailsNavigation } from '../types';
 
-interface Props {
-  alertId: string;
-  commentType: CommentType;
-  getRuleDetailsHref?: RuleDetailsNavigation['href'];
-  onRuleDetailsClick?: RuleDetailsNavigation['onClick'];
+interface SingleAlertProps {
+  actionId: string;
   ruleId?: string | null;
   ruleName?: string | null;
-  alertsCount?: number;
+  getRuleDetailsHref?: RuleDetailsNavigation['href'];
+  onRuleDetailsClick?: RuleDetailsNavigation['onClick'];
   loadingAlertData?: boolean;
 }
 
-const AlertCommentEventComponent: React.FC<Props> = ({
-  alertId,
+interface MultipleAlertsProps extends SingleAlertProps {
+  totalAlerts: number;
+}
+
+const RuleLink: React.FC<SingleAlertProps> = memo(
+  ({ onRuleDetailsClick, getRuleDetailsHref, ruleId, ruleName, loadingAlertData, actionId }) => {
+    const onLinkClick = useCallback(
+      (ev) => {
+        ev.preventDefault();
+        if (onRuleDetailsClick) onRuleDetailsClick(ruleId, ev);
+      },
+      [ruleId, onRuleDetailsClick]
+    );
+
+    const ruleDetailsHref = getRuleDetailsHref?.(ruleId);
+    const finalRuleName = ruleName ?? i18n.UNKNOWN_RULE;
+
+    if (loadingAlertData) {
+      return <EuiLoadingSpinner size="m" data-test-subj={`alert-loading-spinner-${actionId}`} />;
+    }
+
+    if (!isEmpty(ruleId) && ruleDetailsHref != null) {
+      return (
+        <LinkAnchor
+          onClick={onLinkClick}
+          href={ruleDetailsHref}
+          data-test-subj={`alert-rule-link-${actionId}`}
+        >
+          {finalRuleName}
+        </LinkAnchor>
+      );
+    }
+
+    return <>{finalRuleName}</>;
+  }
+);
+
+RuleLink.displayName = 'RuleLink';
+
+const SingleAlertCommentEventComponent: React.FC<SingleAlertProps> = ({
+  actionId,
   getRuleDetailsHref,
   loadingAlertData = false,
   onRuleDetailsClick,
   ruleId,
   ruleName,
-  alertsCount,
-  commentType,
 }) => {
-  const onLinkClick = useCallback(
-    (ev) => {
-      ev.preventDefault();
-      if (onRuleDetailsClick) onRuleDetailsClick(ruleId, ev);
-    },
-    [ruleId, onRuleDetailsClick]
+  return (
+    <span data-test-subj={`single-alert-user-action-${actionId}`}>
+      {`${i18n.ALERT_COMMENT_LABEL_TITLE} `}
+      <RuleLink
+        actionId={actionId}
+        ruleId={ruleId}
+        ruleName={ruleName}
+        getRuleDetailsHref={getRuleDetailsHref}
+        onRuleDetailsClick={onRuleDetailsClick}
+        loadingAlertData={loadingAlertData}
+      />
+    </span>
   );
-  const detectionsRuleDetailsHref = getRuleDetailsHref?.(ruleId);
-  const finalRuleName = ruleName ?? i18n.UNKNOWN_RULE;
+};
+
+SingleAlertCommentEventComponent.displayName = 'SingleAlertCommentEvent';
+
+export const SingleAlertCommentEvent = memo(SingleAlertCommentEventComponent);
 
+const MultipleAlertsCommentEventComponent: React.FC<MultipleAlertsProps> = ({
+  actionId,
+  getRuleDetailsHref,
+  loadingAlertData = false,
+  onRuleDetailsClick,
+  ruleId,
+  ruleName,
+  totalAlerts,
+}) => {
   return (
-    <>
-      {`${i18n.ALERT_COMMENT_LABEL_TITLE} `}
-      {loadingAlertData && <EuiLoadingSpinner size="m" />}
-      {!loadingAlertData && !isEmpty(ruleId) && detectionsRuleDetailsHref != null && (
-        <LinkAnchor
-          onClick={onLinkClick}
-          href={detectionsRuleDetailsHref}
-          data-test-subj={`alert-rule-link-${alertId ?? 'deleted'}`}
-        >
-          {finalRuleName}
-        </LinkAnchor>
-      )}
-      {!loadingAlertData && !isEmpty(ruleId) && detectionsRuleDetailsHref == null && finalRuleName}
-      {!loadingAlertData && isEmpty(ruleId) && finalRuleName}
-    </>
+    <span data-test-subj={`multiple-alerts-user-action-${actionId}`}>
+      {`${i18n.MULTIPLE_ALERTS_COMMENT_LABEL_TITLE(totalAlerts)}`}{' '}
+      <RuleLink
+        actionId={actionId}
+        ruleId={ruleId}
+        ruleName={ruleName}
+        getRuleDetailsHref={getRuleDetailsHref}
+        onRuleDetailsClick={onRuleDetailsClick}
+        loadingAlertData={loadingAlertData}
+      />
+    </span>
   );
 };
-AlertCommentEventComponent.displayName = 'AlertCommentEvent';
 
-export const AlertCommentEvent = memo(AlertCommentEventComponent);
+MultipleAlertsCommentEventComponent.displayName = 'MultipleAlertsCommentEvent';
+export const MultipleAlertsCommentEvent = memo(MultipleAlertsCommentEventComponent);
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx
index df3374c848e56..f7023d92d5f54 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx
@@ -86,27 +86,62 @@ describe('createCommentUserActionBuilder', () => {
     expect(screen.getByText('Solve this fast!')).toBeInTheDocument();
   });
 
-  it('renders correctly an alert', async () => {
-    const userAction = getAlertUserAction();
-
-    const builder = createCommentUserActionBuilder({
-      ...builderArgs,
-      caseData: {
-        ...builderArgs.caseData,
-        comments: [alertComment],
-      },
-      userAction,
+  describe('Single alert', () => {
+    it('renders correctly a single alert', async () => {
+      const userAction = getAlertUserAction();
+
+      const builder = createCommentUserActionBuilder({
+        ...builderArgs,
+        caseData: {
+          ...builderArgs.caseData,
+          comments: [alertComment],
+        },
+        userAction,
+      });
+
+      const createdUserAction = builder.build();
+      render(
+        <TestProviders>
+          <EuiCommentList comments={createdUserAction} />
+        </TestProviders>
+      );
+
+      expect(screen.getByTestId('single-alert-user-action-alert-action-id')).toHaveTextContent(
+        'added an alert from Awesome rule'
+      );
     });
+  });
 
-    const createdUserAction = builder.build();
-    render(
-      <TestProviders>
-        <EuiCommentList comments={createdUserAction} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('added an alert from')).toBeInTheDocument();
-    expect(screen.getByText('Awesome rule')).toBeInTheDocument();
+  describe('Multiple alerts', () => {
+    it('renders correctly multiple alerts', async () => {
+      const userAction = getAlertUserAction();
+
+      const builder = createCommentUserActionBuilder({
+        ...builderArgs,
+        caseData: {
+          ...builderArgs.caseData,
+          comments: [
+            {
+              ...alertComment,
+              alertId: ['alert-id-1', 'alert-id-2'],
+              index: ['alert-index-1', 'alert-index-2'],
+            },
+          ],
+        },
+        userAction,
+      });
+
+      const createdUserAction = builder.build();
+      render(
+        <TestProviders>
+          <EuiCommentList comments={createdUserAction} />
+        </TestProviders>
+      );
+
+      expect(screen.getByTestId('multiple-alerts-user-action-alert-action-id')).toHaveTextContent(
+        'added 2 alerts from Awesome rule'
+      );
+    });
   });
 
   it('renders correctly an action', async () => {
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
index 9c0b539720748..07bca8bff8286 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
@@ -47,6 +47,7 @@ const getCreateCommentUserAction = ({
   handleManageMarkdownEditId,
   handleSaveComment,
   handleManageQuote,
+  handleDeleteComment,
   getRuleDetailsHref,
   loadingAlertData,
   onRuleDetailsClick,
@@ -72,6 +73,7 @@ const getCreateCommentUserAction = ({
         handleManageMarkdownEditId,
         handleSaveComment,
         handleManageQuote,
+        handleDeleteComment,
       });
 
       return userBuilder.build();
@@ -114,8 +116,10 @@ export const createCommentUserActionBuilder: UserActionBuilder = ({
   onShowAlertDetails,
   handleManageMarkdownEditId,
   handleSaveComment,
+  handleDeleteComment,
   handleManageQuote,
   handleOutlineComment,
+  actionsNavigation,
 }) => ({
   build: () => {
     const commentUserAction = userAction as UserActionResponse<CommentUserAction>;
@@ -145,7 +149,9 @@ export const createCommentUserActionBuilder: UserActionBuilder = ({
         onShowAlertDetails,
         handleManageMarkdownEditId,
         handleSaveComment,
+        handleDeleteComment,
         handleManageQuote,
+        actionsNavigation,
       });
 
       return commentAction;
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
index c059be0f20797..a4e6fe6cf2887 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
@@ -25,6 +25,7 @@ type BuilderArgs = Pick<
   | 'handleSaveComment'
   | 'handleManageQuote'
   | 'commentRefs'
+  | 'handleDeleteComment'
 > & {
   comment: SnakeToCamelCase<CommentResponseUserType>;
   outlined: boolean;
@@ -42,6 +43,7 @@ export const createUserAttachmentUserActionBuilder = ({
   handleManageMarkdownEditId,
   handleSaveComment,
   handleManageQuote,
+  handleDeleteComment,
 }: BuilderArgs): ReturnType<UserActionBuilder> => ({
   // TODO: Fix this manually. Issue #123375
   // eslint-disable-next-line react/display-name
@@ -85,10 +87,13 @@ export const createUserAttachmentUserActionBuilder = ({
           id={comment.id}
           commentMarkdown={comment.comment}
           editLabel={i18n.EDIT_COMMENT}
+          deleteLabel={i18n.DELETE_COMMENT}
+          deleteConfirmTitle={i18n.DELETE_COMMENT_TITLE}
           quoteLabel={i18n.QUOTE}
           isLoading={isLoading}
           onEdit={handleManageMarkdownEditId.bind(null, comment.id)}
           onQuote={handleManageQuote.bind(null, comment.comment)}
+          onDelete={handleDeleteComment.bind(null, comment.id)}
           userCanCrud={userCanCrud}
         />
       ),
diff --git a/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx b/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx
index 0a1f02b4aaebf..bea47933dccd6 100644
--- a/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx
@@ -15,10 +15,13 @@ export interface UserActionContentToolbarProps {
   commentMarkdown: string;
   id: string;
   editLabel: string;
+  deleteLabel?: string;
+  deleteConfirmTitle?: string;
   quoteLabel: string;
   isLoading: boolean;
   onEdit: (id: string) => void;
   onQuote: (id: string) => void;
+  onDelete?: (id: string) => void;
   userCanCrud: boolean;
 }
 
@@ -26,10 +29,13 @@ const UserActionContentToolbarComponent = ({
   commentMarkdown,
   id,
   editLabel,
+  deleteLabel,
+  deleteConfirmTitle,
   quoteLabel,
   isLoading,
   onEdit,
   onQuote,
+  onDelete,
   userCanCrud,
 }: UserActionContentToolbarProps) => (
   <EuiFlexGroup responsive={false} alignItems="center">
@@ -41,9 +47,12 @@ const UserActionContentToolbarComponent = ({
         id={id}
         editLabel={editLabel}
         quoteLabel={quoteLabel}
+        deleteLabel={deleteLabel}
+        deleteConfirmTitle={deleteConfirmTitle}
         isLoading={isLoading}
         onEdit={onEdit}
         onQuote={onQuote}
+        onDelete={onDelete}
         userCanCrud={userCanCrud}
         commentMarkdown={commentMarkdown}
       />
diff --git a/x-pack/plugins/cases/public/components/user_actions/index.tsx b/x-pack/plugins/cases/public/components/user_actions/index.tsx
index d980ef029e447..9cdfb37902c55 100644
--- a/x-pack/plugins/cases/public/components/user_actions/index.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/index.tsx
@@ -114,6 +114,7 @@ export const UserActions = React.memo(
       handleOutlineComment,
       handleSaveComment,
       handleManageQuote,
+      handleDeleteComment,
       handleUpdate,
     } = useUserActionsHandler({ fetchUserActions, updateCase });
 
@@ -202,6 +203,7 @@ export const UserActions = React.memo(
               alertData: manualAlertsData,
               handleOutlineComment,
               handleManageMarkdownEditId,
+              handleDeleteComment,
               handleSaveComment,
               handleManageQuote,
               onShowAlertDetails,
@@ -227,6 +229,7 @@ export const UserActions = React.memo(
         manualAlertsData,
         handleOutlineComment,
         handleManageMarkdownEditId,
+        handleDeleteComment,
         handleSaveComment,
         handleManageQuote,
         onShowAlertDetails,
diff --git a/x-pack/plugins/cases/public/components/user_actions/mock.ts b/x-pack/plugins/cases/public/components/user_actions/mock.ts
index 7000f407f97e5..f44c64109e7ea 100644
--- a/x-pack/plugins/cases/public/components/user_actions/mock.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/mock.ts
@@ -53,6 +53,7 @@ export const getMockBuilderArgs = (): UserActionBuilderArgs => {
   const onShowAlertDetails = jest.fn();
   const handleManageMarkdownEditId = jest.fn();
   const handleSaveComment = jest.fn();
+  const handleDeleteComment = jest.fn();
   const handleManageQuote = jest.fn();
   const handleOutlineComment = jest.fn();
 
@@ -74,6 +75,7 @@ export const getMockBuilderArgs = (): UserActionBuilderArgs => {
     onShowAlertDetails,
     handleManageMarkdownEditId,
     handleSaveComment,
+    handleDeleteComment,
     handleManageQuote,
     handleOutlineComment,
   };
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx
index 167a7fb977929..0084301183e68 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx
@@ -8,6 +8,8 @@
 import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { UserActionPropertyActions } from './property_actions';
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 jest.mock('../../common/lib/kibana');
 
@@ -36,7 +38,7 @@ describe('UserActionPropertyActions ', () => {
     jest.clearAllMocks();
   });
 
-  it('it renders', async () => {
+  it('renders', async () => {
     expect(
       wrapper.find('[data-test-subj="user-action-title-loading"]').first().exists()
     ).toBeFalsy();
@@ -44,7 +46,7 @@ describe('UserActionPropertyActions ', () => {
     expect(wrapper.find('[data-test-subj="property-actions"]').first().exists()).toBeTruthy();
   });
 
-  it('it shows the edit and quote buttons', async () => {
+  it('shows the edit and quote buttons', async () => {
     wrapper.find('[data-test-subj="property-actions-ellipses"]').first().simulate('click');
     wrapper.find('[data-test-subj="property-actions-pencil"]').exists();
     wrapper.find('[data-test-subj="property-actions-quote"]').exists();
@@ -62,7 +64,7 @@ describe('UserActionPropertyActions ', () => {
     expect(onEdit).toHaveBeenCalledWith(props.id);
   });
 
-  it('it shows the spinner when loading', async () => {
+  it('shows the spinner when loading', async () => {
     wrapper = mount(<UserActionPropertyActions {...props} isLoading={true} />);
     expect(
       wrapper.find('[data-test-subj="user-action-title-loading"]').first().exists()
@@ -70,4 +72,51 @@ describe('UserActionPropertyActions ', () => {
 
     expect(wrapper.find('[data-test-subj="property-actions"]').first().exists()).toBeFalsy();
   });
+
+  describe('Delete button', () => {
+    const onDelete = jest.fn();
+    const deleteProps = {
+      ...props,
+      onDelete,
+      deleteLabel: 'delete me',
+      deleteConfirmlabel: 'confirm delete me',
+    };
+    it('shows the delete button', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      expect(renderResult.getByTestId('property-actions-trash')).toBeTruthy();
+    });
+
+    it('shows a confirm dialog when the delete button is clicked', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      userEvent.click(renderResult.getByTestId('property-actions-trash'));
+
+      expect(renderResult.getByTestId('property-actions-confirm-modal')).toBeTruthy();
+    });
+
+    it('closes the confirm dialog when the cancel button is clicked', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      userEvent.click(renderResult.getByTestId('property-actions-trash'));
+      expect(renderResult.getByTestId('property-actions-confirm-modal')).toBeTruthy();
+
+      userEvent.click(renderResult.getByTestId('confirmModalCancelButton'));
+      expect(renderResult.queryByTestId('property-actions-confirm-modal')).toBe(null);
+    });
+
+    it('calls onDelete when the confirm is pressed', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      userEvent.click(renderResult.getByTestId('property-actions-trash'));
+      expect(renderResult.getByTestId('property-actions-confirm-modal')).toBeTruthy();
+
+      userEvent.click(renderResult.getByTestId('confirmModalConfirmButton'));
+      expect(onDelete).toHaveBeenCalledWith(deleteProps.id);
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx
index 86e1ac0e1f481..898ef87a0b2b9 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx
@@ -5,18 +5,22 @@
  * 2.0.
  */
 
-import React, { memo, useMemo, useCallback } from 'react';
-import { EuiLoadingSpinner } from '@elastic/eui';
+import React, { memo, useMemo, useCallback, useState } from 'react';
+import { EuiConfirmModal, EuiLoadingSpinner } from '@elastic/eui';
 
 import { PropertyActions } from '../property_actions';
 import { useLensOpenVisualization } from '../markdown_editor/plugins/lens/use_lens_open_visualization';
+import { CANCEL_BUTTON, CONFIRM_BUTTON } from './translations';
 
 interface UserActionPropertyActionsProps {
   id: string;
   editLabel: string;
+  deleteLabel?: string;
+  deleteConfirmTitle?: string;
   quoteLabel: string;
   isLoading: boolean;
   onEdit: (id: string) => void;
+  onDelete?: (id: string) => void;
   onQuote: (id: string) => void;
   userCanCrud: boolean;
   commentMarkdown: string;
@@ -26,8 +30,11 @@ const UserActionPropertyActionsComponent = ({
   id,
   editLabel,
   quoteLabel,
+  deleteLabel,
+  deleteConfirmTitle,
   isLoading,
   onEdit,
+  onDelete,
   onQuote,
   userCanCrud,
   commentMarkdown,
@@ -35,6 +42,22 @@ const UserActionPropertyActionsComponent = ({
   const { canUseEditor, actionConfig } = useLensOpenVisualization({ comment: commentMarkdown });
   const onEditClick = useCallback(() => onEdit(id), [id, onEdit]);
   const onQuoteClick = useCallback(() => onQuote(id), [id, onQuote]);
+  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
+
+  const onDeleteClick = useCallback(() => {
+    setShowDeleteConfirm(true);
+  }, []);
+
+  const onDeleteConfirmClick = useCallback(() => {
+    if (onDelete) {
+      onDelete(id);
+    }
+    setShowDeleteConfirm(false);
+  }, [id, onDelete]);
+
+  const onDeleteCancelClick = useCallback(() => {
+    setShowDeleteConfirm(false);
+  }, []);
 
   const propertyActions = useMemo(
     () =>
@@ -46,6 +69,15 @@ const UserActionPropertyActionsComponent = ({
                 label: editLabel,
                 onClick: onEditClick,
               },
+              ...(deleteLabel && onDelete
+                ? [
+                    {
+                      iconType: 'trash',
+                      label: deleteLabel,
+                      onClick: onDeleteClick,
+                    },
+                  ]
+                : []),
               {
                 iconType: 'quote',
                 label: quoteLabel,
@@ -55,7 +87,18 @@ const UserActionPropertyActionsComponent = ({
           : [],
         canUseEditor && actionConfig ? [actionConfig] : [],
       ].flat(),
-    [userCanCrud, editLabel, onEditClick, quoteLabel, onQuoteClick, canUseEditor, actionConfig]
+    [
+      userCanCrud,
+      editLabel,
+      onEditClick,
+      deleteLabel,
+      onDelete,
+      onDeleteClick,
+      quoteLabel,
+      onQuoteClick,
+      canUseEditor,
+      actionConfig,
+    ]
   );
 
   if (!propertyActions.length) {
@@ -66,6 +109,18 @@ const UserActionPropertyActionsComponent = ({
     <>
       {isLoading && <EuiLoadingSpinner data-test-subj="user-action-title-loading" />}
       {!isLoading && <PropertyActions propertyActions={propertyActions} />}
+      {showDeleteConfirm ? (
+        <EuiConfirmModal
+          title={deleteConfirmTitle}
+          onCancel={onDeleteCancelClick}
+          onConfirm={onDeleteConfirmClick}
+          cancelButtonText={CANCEL_BUTTON}
+          confirmButtonText={CONFIRM_BUTTON}
+          buttonColor="danger"
+          defaultFocusedButton="confirm"
+          data-test-subj="property-actions-confirm-modal"
+        />
+      ) : null}
     </>
   );
 };
diff --git a/x-pack/plugins/cases/public/components/user_actions/translations.ts b/x-pack/plugins/cases/public/components/user_actions/translations.ts
index 40d6fc5bc2ad8..ad881a2e78c21 100644
--- a/x-pack/plugins/cases/public/components/user_actions/translations.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/translations.ts
@@ -36,17 +36,10 @@ export const ALERT_COMMENT_LABEL_TITLE = i18n.translate(
   }
 );
 
-export const GENERATED_ALERT_COMMENT_LABEL_TITLE = i18n.translate(
-  'xpack.cases.caseView.generatedAlertCommentLabelTitle',
-  {
-    defaultMessage: 'were added from',
-  }
-);
-
-export const GENERATED_ALERT_COUNT_COMMENT_LABEL_TITLE = (totalCount: number) =>
-  i18n.translate('xpack.cases.caseView.generatedAlertCountCommentLabelTitle', {
-    values: { totalCount },
-    defaultMessage: `{totalCount} {totalCount, plural, =1 {alert} other {alerts}}`,
+export const MULTIPLE_ALERTS_COMMENT_LABEL_TITLE = (totalAlerts: number) =>
+  i18n.translate('xpack.cases.caseView.generatedAlertCommentLabelTitle', {
+    values: { totalAlerts },
+    defaultMessage: 'added {totalAlerts} alerts from',
   });
 
 export const SHOW_ALERT_TOOLTIP = i18n.translate('xpack.cases.caseView.showAlertTooltip', {
@@ -70,3 +63,11 @@ export const OTHER_ENDPOINTS = (endpoints: number): string =>
     values: { endpoints },
     defaultMessage: ` and {endpoints} {endpoints, plural, =1 {other} other {others}}`,
   });
+
+export const CANCEL_BUTTON = i18n.translate('xpack.cases.caseView.delete.cancel', {
+  defaultMessage: 'Cancel',
+});
+
+export const CONFIRM_BUTTON = i18n.translate('xpack.cases.caseView.delete.confirm', {
+  defaultMessage: 'Delete',
+});
diff --git a/x-pack/plugins/cases/public/components/user_actions/types.ts b/x-pack/plugins/cases/public/components/user_actions/types.ts
index 37beaca4dc6b6..080ccf095c4f6 100644
--- a/x-pack/plugins/cases/public/components/user_actions/types.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/types.ts
@@ -55,6 +55,7 @@ export interface UserActionBuilderArgs {
   handleOutlineComment: (id: string) => void;
   handleManageMarkdownEditId: (id: string) => void;
   handleSaveComment: ({ id, version }: { id: string; version: string }, content: string) => void;
+  handleDeleteComment: (id: string) => void;
   handleManageQuote: (quote: string) => void;
   onShowAlertDetails: (alertId: string, index: string) => void;
   actionsNavigation?: ActionsNavigation;
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
index a90cac5b15d56..56b70391d4155 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
@@ -56,24 +56,6 @@ describe('useUserActionsHandler', () => {
     });
   });
 
-  it('init', async () => {
-    const { result } = renderHook<UseUserActionsHandlerArgs, UseUserActionsHandler>(() =>
-      useUserActionsHandler({ fetchUserActions, updateCase })
-    );
-
-    expect(result.current).toEqual({
-      loadingCommentIds: [],
-      selectedOutlineCommentId: '',
-      manageMarkdownEditIds: [],
-      commentRefs: result.current.commentRefs,
-      handleManageMarkdownEditId: result.current.handleManageMarkdownEditId,
-      handleOutlineComment: result.current.handleOutlineComment,
-      handleSaveComment: result.current.handleSaveComment,
-      handleManageQuote: result.current.handleManageQuote,
-      handleUpdate: result.current.handleUpdate,
-    });
-  });
-
   it('should saves a comment', async () => {
     const { result } = renderHook<UseUserActionsHandlerArgs, UseUserActionsHandler>(() =>
       useUserActionsHandler({ fetchUserActions, updateCase })
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
index 61f5329908c04..4981e86251c18 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
@@ -14,6 +14,7 @@ import { AddCommentRefObject } from '../add_comment';
 import { UserActionMarkdownRefObject } from './markdown_form';
 import { UserActionBuilderArgs, UserActionTreeProps } from './types';
 import { NEW_COMMENT_ID } from './constants';
+import { useDeleteComment } from '../../containers/use_delete_comment';
 
 export type UseUserActionsHandlerArgs = Pick<
   UserActionTreeProps,
@@ -30,6 +31,7 @@ export type UseUserActionsHandler = Pick<
   | 'handleOutlineComment'
   | 'handleSaveComment'
   | 'handleManageQuote'
+  | 'handleDeleteComment'
 > & { handleUpdate: (updatedCase: Case) => void };
 
 const isAddCommentRef = (
@@ -48,6 +50,7 @@ export const useUserActionsHandler = ({
     useLensDraftComment();
   const handlerTimeoutId = useRef(0);
   const { isLoadingIds, patchComment } = useUpdateComment();
+  const { deleteComment } = useDeleteComment();
   const [selectedOutlineCommentId, setSelectedOutlineCommentId] = useState('');
   const [manageMarkdownEditIds, setManageMarkdownEditIds] = useState<string[]>([]);
   const commentRefs = useRef<
@@ -80,6 +83,13 @@ export const useUserActionsHandler = ({
     [caseId, fetchUserActions, patchComment, updateCase]
   );
 
+  const handleDeleteComment = useCallback(
+    (id: string) => {
+      deleteComment({ caseId, commentId: id, fetchUserActions, updateCase });
+    },
+    [caseId, deleteComment, fetchUserActions, updateCase]
+  );
+
   const handleOutlineComment = useCallback(
     (id: string) => {
       const moveToTarget = document.getElementById(`${id}-permLink`);
@@ -160,6 +170,7 @@ export const useUserActionsHandler = ({
     handleManageMarkdownEditId,
     handleOutlineComment,
     handleSaveComment,
+    handleDeleteComment,
     handleManageQuote,
     handleUpdate,
   };
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx
index a1930c17a70b1..545b1f4ae13c2 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx
@@ -16,7 +16,7 @@ import {
   UtilityBarGroup,
   UtilityBarSection,
   UtilityBarText,
-} from './index';
+} from '.';
 
 describe('UtilityBar', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx
index 8fc67cefc0f61..88977fa9bc587 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarAction } from './index';
+import { UtilityBarAction } from '.';
 
 describe('UtilityBarAction', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx
index 546dcf48bba9a..bf7bb34ab5b64 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarGroup, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarText } from '.';
 
 describe('UtilityBarGroup', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx
index f06ff651b5419..142cca8fc9e32 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from '.';
 
 describe('UtilityBarSection', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx
index 456a1f4bed3be..afeae82a19e85 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarText } from './index';
+import { UtilityBarText } from '.';
 
 describe('UtilityBarText', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utils.test.ts b/x-pack/plugins/cases/public/components/utils.test.ts
index e3cc753e75746..71218492dec95 100644
--- a/x-pack/plugins/cases/public/components/utils.test.ts
+++ b/x-pack/plugins/cases/public/components/utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { actionTypeRegistryMock } from '../../../triggers_actions_ui/public/application/action_type_registry.mock';
-import { triggersActionsUiMock } from '../../../triggers_actions_ui/public/mocks';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 import { getConnectorIcon, isDeprecatedConnector } from './utils';
 
 describe('Utils', () => {
diff --git a/x-pack/plugins/cases/public/containers/__mocks__/api.ts b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
index 2cd30eb15d2d1..1f5c1652edfff 100644
--- a/x-pack/plugins/cases/public/containers/__mocks__/api.ts
+++ b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
@@ -101,12 +101,18 @@ export const patchCasesStatus = async (
   signal: AbortSignal
 ): Promise<Case[]> => Promise.resolve(allCases.cases);
 
-export const postComment = async (
+export const createAttachments = async (
   newComment: CommentRequest,
   caseId: string,
   signal: AbortSignal
 ): Promise<Case> => Promise.resolve(basicCase);
 
+export const deleteComment = async (
+  caseId: string,
+  commentId: string,
+  signal: AbortSignal
+): Promise<void> => Promise.resolve(undefined);
+
 export const patchComment = async (
   caseId: string,
   commentId: string,
diff --git a/x-pack/plugins/cases/public/containers/api.test.tsx b/x-pack/plugins/cases/public/containers/api.test.tsx
index e656544084d09..6b8bd6f65bc6d 100644
--- a/x-pack/plugins/cases/public/containers/api.test.tsx
+++ b/x-pack/plugins/cases/public/containers/api.test.tsx
@@ -8,10 +8,15 @@
 import { KibanaServices } from '../common/lib/kibana';
 
 import { ConnectorTypes, CommentType, CaseStatuses } from '../../common/api';
-import { CASES_URL, SECURITY_SOLUTION_OWNER } from '../../common/constants';
+import {
+  CASES_URL,
+  INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
+  SECURITY_SOLUTION_OWNER,
+} from '../../common/constants';
 
 import {
   deleteCases,
+  deleteComment,
   getActionLicense,
   getCase,
   getCases,
@@ -23,7 +28,7 @@ import {
   patchCasesStatus,
   patchComment,
   postCase,
-  postComment,
+  createAttachments,
   pushCase,
   resolveCase,
 } from './api';
@@ -45,6 +50,7 @@ import {
   tags,
   caseUserActionsSnake,
   casesStatusSnake,
+  basicCaseId,
 } from './mock';
 
 import { DEFAULT_FILTER_OPTIONS, DEFAULT_QUERY_PARAMS } from './use_get_cases';
@@ -458,28 +464,43 @@ describe('Case Configuration API', () => {
     });
   });
 
-  describe('postComment', () => {
+  describe('createAttachments', () => {
     beforeEach(() => {
       fetchMock.mockClear();
       fetchMock.mockResolvedValue(basicCaseSnake);
     });
-    const data = {
-      comment: 'comment',
-      owner: SECURITY_SOLUTION_OWNER,
-      type: CommentType.user as const,
-    };
+    const data = [
+      {
+        comment: 'comment',
+        owner: SECURITY_SOLUTION_OWNER,
+        type: CommentType.user as const,
+      },
+      {
+        alertId: 'test-id',
+        index: 'test-index',
+        rule: {
+          id: 'test-rule',
+          name: 'Test',
+        },
+        owner: SECURITY_SOLUTION_OWNER,
+        type: CommentType.alert as const,
+      },
+    ];
 
     test('should be called with correct check url, method, signal', async () => {
-      await postComment(data, basicCase.id, abortCtrl.signal);
-      expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/${basicCase.id}/comments`, {
-        method: 'POST',
-        body: JSON.stringify(data),
-        signal: abortCtrl.signal,
-      });
+      await createAttachments(data, basicCase.id, abortCtrl.signal);
+      expect(fetchMock).toHaveBeenCalledWith(
+        INTERNAL_BULK_CREATE_ATTACHMENTS_URL.replace('{case_id}', basicCase.id),
+        {
+          method: 'POST',
+          body: JSON.stringify(data),
+          signal: abortCtrl.signal,
+        }
+      );
     });
 
     test('should return correct response', async () => {
-      const resp = await postComment(data, basicCase.id, abortCtrl.signal);
+      const resp = await createAttachments(data, basicCase.id, abortCtrl.signal);
       expect(resp).toEqual(basicCase);
     });
   });
@@ -509,4 +530,25 @@ describe('Case Configuration API', () => {
       expect(resp).toEqual(pushedCase);
     });
   });
+
+  describe('deleteComment', () => {
+    beforeEach(() => {
+      fetchMock.mockClear();
+      fetchMock.mockResolvedValue(null);
+    });
+    const commentId = 'ab1234';
+
+    test('should be called with correct check url, method, signal', async () => {
+      const resp = await deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        signal: abortCtrl.signal,
+      });
+      expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/${basicCase.id}/comments/${commentId}`, {
+        method: 'DELETE',
+        signal: abortCtrl.signal,
+      });
+      expect(resp).toBe(undefined);
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index 9d250e2ae6e0c..d4593dd1f2813 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -9,6 +9,7 @@ import { omit } from 'lodash';
 
 import { StatusAll, ResolvedCase } from '../../common/ui/types';
 import {
+  BulkCreateCommentRequest,
   CasePatchRequest,
   CasePostRequest,
   CaseResponse,
@@ -26,12 +27,14 @@ import {
   getCaseUserActionUrl,
   User,
   CaseMetricsResponse,
+  getCaseCommentDeleteUrl,
 } from '../../common/api';
 import {
   CASE_REPORTERS_URL,
   CASE_STATUS_URL,
   CASE_TAGS_URL,
   CASES_URL,
+  INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
 } from '../../common/constants';
 import { getAllConnectorTypesUrl } from '../../common/utils/connectors_api';
 
@@ -271,6 +274,21 @@ export const patchComment = async ({
   return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
 };
 
+export const deleteComment = async ({
+  caseId,
+  commentId,
+  signal,
+}: {
+  caseId: string;
+  commentId: string;
+  signal: AbortSignal;
+}): Promise<void> => {
+  await KibanaServices.get().http.fetch<CaseResponse>(getCaseCommentDeleteUrl(caseId, commentId), {
+    method: 'DELETE',
+    signal,
+  });
+};
+
 export const deleteCases = async (caseIds: string[], signal: AbortSignal): Promise<string> => {
   const response = await KibanaServices.get().http.fetch<string>(CASES_URL, {
     method: 'DELETE',
@@ -308,3 +326,19 @@ export const getActionLicense = async (signal: AbortSignal): Promise<ActionLicen
 
   return convertArrayToCamelCase(response) as ActionLicense[];
 };
+
+export const createAttachments = async (
+  attachments: BulkCreateCommentRequest,
+  caseId: string,
+  signal: AbortSignal
+): Promise<Case> => {
+  const response = await KibanaServices.get().http.fetch<CaseResponse>(
+    INTERNAL_BULK_CREATE_ATTACHMENTS_URL.replace('{case_id}', caseId),
+    {
+      method: 'POST',
+      body: JSON.stringify(attachments),
+      signal,
+    }
+  );
+  return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
+};
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index 5c2fcd70db2bb..69931629a77cb 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -7,7 +7,12 @@
 
 import { ActionLicense, AllCases, Case, CasesStatus, CaseUserActions, Comment } from './types';
 
-import type { ResolvedCase, CaseMetrics, CaseMetricsFeature } from '../../common/ui/types';
+import type {
+  ResolvedCase,
+  CaseMetrics,
+  CaseMetricsFeature,
+  AlertComment,
+} from '../../common/ui/types';
 import {
   Actions,
   ActionTypes,
@@ -65,7 +70,7 @@ export const basicComment: Comment = {
   version: 'WzQ3LDFc',
 };
 
-export const alertComment: Comment = {
+export const alertComment: AlertComment = {
   alertId: 'alert-id-1',
   index: 'alert-index-1',
   type: CommentType.alert,
diff --git a/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
similarity index 60%
rename from x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
rename to x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
index a3e6147c98439..428b28e02dcc5 100644
--- a/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
@@ -9,7 +9,7 @@ import { renderHook, act } from '@testing-library/react-hooks';
 
 import { CommentType } from '../../common/api';
 import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
-import { usePostComment, UsePostComment } from './use_post_comment';
+import { useCreateAttachments, UseCreateAttachments } from './use_create_attachments';
 import { basicCaseId } from './mock';
 import * as api from './api';
 import { useToasts } from '../common/lib/kibana';
@@ -19,18 +19,20 @@ jest.mock('../common/lib/kibana');
 
 const useToastMock = useToasts as jest.Mock;
 
-describe('usePostComment', () => {
+describe('useCreateAttachments', () => {
   const toastErrorMock = jest.fn();
   useToastMock.mockReturnValue({
     addError: toastErrorMock,
   });
 
   const abortCtrl = new AbortController();
-  const samplePost = {
-    comment: 'a comment',
-    type: CommentType.user as const,
-    owner: SECURITY_SOLUTION_OWNER,
-  };
+  const samplePost = [
+    {
+      comment: 'a comment',
+      type: CommentType.user as const,
+      owner: SECURITY_SOLUTION_OWNER,
+    },
+  ];
   const updateCaseCallback = jest.fn();
   beforeEach(() => {
     jest.clearAllMocks();
@@ -39,45 +41,65 @@ describe('usePostComment', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
       expect(result.current).toEqual({
         isLoading: false,
         isError: false,
-        postComment: result.current.postComment,
+        createAttachments: result.current.createAttachments,
       });
     });
   });
 
-  it('calls postComment with correct arguments - case', async () => {
-    const spyOnPostCase = jest.spyOn(api, 'postComment');
+  it('calls createAttachments with data not as an array', async () => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
 
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
       });
       await waitForNextUpdate();
-      expect(spyOnPostCase).toBeCalledWith(samplePost, basicCaseId, abortCtrl.signal);
+      expect(spyOnBulkCreateAttachments).toBeCalledWith(samplePost, basicCaseId, abortCtrl.signal);
+      expect(toastErrorMock).not.toHaveBeenCalled();
+    });
+  });
+
+  it('calls createAttachments with data as an array', async () => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
+      );
+      await waitForNextUpdate();
+
+      result.current.createAttachments({
+        caseId: basicCaseId,
+        data: samplePost,
+        updateCase: updateCaseCallback,
+      });
+      await waitForNextUpdate();
+      expect(spyOnBulkCreateAttachments).toBeCalledWith(samplePost, basicCaseId, abortCtrl.signal);
       expect(toastErrorMock).not.toHaveBeenCalled();
     });
   });
 
   it('post case', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
@@ -86,18 +108,18 @@ describe('usePostComment', () => {
       expect(result.current).toEqual({
         isLoading: false,
         isError: false,
-        postComment: result.current.postComment,
+        createAttachments: result.current.createAttachments,
       });
     });
   });
 
   it('set isLoading to true when posting case', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
@@ -108,17 +130,17 @@ describe('usePostComment', () => {
   });
 
   it('set isError true and shows a toast error when an error occurs', async () => {
-    const spyOnPostCase = jest.spyOn(api, 'postComment');
-    spyOnPostCase.mockImplementation(() => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
+    spyOnBulkCreateAttachments.mockImplementation(() => {
       throw new Error('Something went wrong');
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
@@ -127,7 +149,7 @@ describe('usePostComment', () => {
       expect(result.current).toEqual({
         isLoading: false,
         isError: true,
-        postComment: result.current.postComment,
+        createAttachments: result.current.createAttachments,
       });
 
       expect(toastErrorMock).toHaveBeenCalledWith(expect.any(Error), {
@@ -137,18 +159,18 @@ describe('usePostComment', () => {
   });
 
   it('throws an error when invoked with throwOnError true', async () => {
-    const spyOnPostCase = jest.spyOn(api, 'postComment');
-    spyOnPostCase.mockImplementation(() => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
+    spyOnBulkCreateAttachments.mockImplementation(() => {
       throw new Error('This is not possible');
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
       async function test() {
-        await result.current.postComment({
+        await result.current.createAttachments({
           caseId: basicCaseId,
           data: samplePost,
           updateCase: updateCaseCallback,
diff --git a/x-pack/plugins/cases/public/containers/use_post_comment.tsx b/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
similarity index 82%
rename from x-pack/plugins/cases/public/containers/use_post_comment.tsx
rename to x-pack/plugins/cases/public/containers/use_create_attachments.tsx
index ebfcf607701ba..e6de525f36e6a 100644
--- a/x-pack/plugins/cases/public/containers/use_post_comment.tsx
+++ b/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
-import { CommentRequest } from '../../common/api';
+import { BulkCreateCommentRequest } from '../../common/api';
 
-import { postComment } from './api';
+import { createAttachments } from './api';
 import * as i18n from './translations';
 import { Case } from './types';
 import { useToasts } from '../common/lib/kibana';
@@ -43,15 +43,15 @@ const dataFetchReducer = (state: NewCommentState, action: Action): NewCommentSta
 
 export interface PostComment {
   caseId: string;
-  data: CommentRequest;
+  data: BulkCreateCommentRequest;
   updateCase?: (newCase: Case) => void;
   throwOnError?: boolean;
 }
-export interface UsePostComment extends NewCommentState {
-  postComment: (args: PostComment) => Promise<void>;
+export interface UseCreateAttachments extends NewCommentState {
+  createAttachments: (args: PostComment) => Promise<void>;
 }
 
-export const usePostComment = (): UsePostComment => {
+export const useCreateAttachments = (): UseCreateAttachments => {
   const [state, dispatch] = useReducer(dataFetchReducer, {
     isLoading: false,
     isError: false,
@@ -60,7 +60,7 @@ export const usePostComment = (): UsePostComment => {
   const isCancelledRef = useRef(false);
   const abortCtrlRef = useRef(new AbortController());
 
-  const postMyComment = useCallback(
+  const fetch = useCallback(
     async ({ caseId, data, updateCase, throwOnError }: PostComment) => {
       try {
         isCancelledRef.current = false;
@@ -68,7 +68,7 @@ export const usePostComment = (): UsePostComment => {
         abortCtrlRef.current = new AbortController();
         dispatch({ type: 'FETCH_INIT' });
 
-        const response = await postComment(data, caseId, abortCtrlRef.current.signal);
+        const response = await createAttachments(data, caseId, abortCtrlRef.current.signal);
 
         if (!isCancelledRef.current) {
           dispatch({ type: 'FETCH_SUCCESS' });
@@ -102,5 +102,5 @@ export const usePostComment = (): UsePostComment => {
     []
   );
 
-  return { ...state, postComment: postMyComment };
+  return { ...state, createAttachments: fetch };
 };
diff --git a/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
new file mode 100644
index 0000000000000..8cf0eb6c78faa
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { act, renderHook } from '@testing-library/react-hooks';
+import { useDeleteComment, UseDeleteComment } from './use_delete_comment';
+import * as api from './api';
+import { basicCaseId } from './mock';
+
+jest.mock('../common/lib/kibana');
+jest.mock('./api');
+
+const commentId = 'ab124';
+const fetchUserActions = jest.fn();
+const updateCase = jest.fn();
+
+describe('useDeleteComment', () => {
+  it('init', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+      expect(result.current).toEqual({
+        isError: false,
+        deleteComment: result.current.deleteComment,
+      });
+    });
+  });
+
+  it('calls deleteComment with correct arguments - case', async () => {
+    const spyOnDeleteComment = jest.spyOn(api, 'deleteComment');
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+
+      result.current.deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        fetchUserActions,
+        updateCase,
+      });
+      await waitForNextUpdate();
+      expect(spyOnDeleteComment).toBeCalledWith({
+        caseId: basicCaseId,
+        commentId,
+        signal: expect.any(AbortSignal),
+      });
+      expect(result.current.isError).toBe(false);
+    });
+  });
+
+  it('fetches the case information', async () => {
+    const spyOnGetCase = jest.spyOn(api, 'getCase');
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+
+      result.current.deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        fetchUserActions,
+        updateCase,
+      });
+      await waitForNextUpdate();
+      expect(spyOnGetCase).toBeCalledWith(basicCaseId, true, expect.any(AbortSignal));
+    });
+  });
+
+  it('sets isError when fails to delete a case', async () => {
+    const spyOnDeleteComment = jest.spyOn(api, 'deleteComment');
+    spyOnDeleteComment.mockRejectedValue(new Error('Not possible :O'));
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+
+      result.current.deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        fetchUserActions,
+        updateCase,
+      });
+      await waitForNextUpdate();
+      expect(spyOnDeleteComment).toBeCalledWith({
+        caseId: basicCaseId,
+        commentId,
+        signal: expect.any(AbortSignal),
+      });
+
+      expect(result.current.isError).toBe(true);
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_comment.tsx b/x-pack/plugins/cases/public/containers/use_delete_comment.tsx
new file mode 100644
index 0000000000000..3568450659aac
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_delete_comment.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useReducer, useCallback, useRef, useEffect } from 'react';
+import { useToasts } from '../common/lib/kibana';
+import { deleteComment, getCase } from './api';
+import * as i18n from './translations';
+import { Case } from './types';
+
+interface CommentDeleteState {
+  isError: boolean;
+}
+interface CommentDelete {
+  commentId: string;
+}
+
+type Action =
+  | { type: 'FETCH_INIT'; payload: string }
+  | { type: 'FETCH_SUCCESS'; payload: CommentDelete }
+  | { type: 'FETCH_FAILURE'; payload: string };
+
+const dataFetchReducer = (state: CommentDeleteState, action: Action): CommentDeleteState => {
+  switch (action.type) {
+    case 'FETCH_INIT':
+      return {
+        ...state,
+        isError: false,
+      };
+
+    case 'FETCH_SUCCESS':
+      return {
+        ...state,
+        isError: false,
+      };
+    case 'FETCH_FAILURE':
+      return {
+        ...state,
+        isError: true,
+      };
+    default:
+      return state;
+  }
+};
+
+interface DeleteComment {
+  caseId: string;
+  commentId: string;
+  fetchUserActions: () => void;
+  updateCase: (newCase: Case) => void;
+}
+
+export interface UseDeleteComment extends CommentDeleteState {
+  deleteComment: ({ caseId, commentId, fetchUserActions }: DeleteComment) => void;
+}
+
+export const useDeleteComment = (): UseDeleteComment => {
+  const [state, dispatch] = useReducer(dataFetchReducer, {
+    isError: false,
+  });
+  const toasts = useToasts();
+  const isCancelledRef = useRef(false);
+  const abortCtrlRef = useRef(new AbortController());
+
+  const dispatchDeleteComment = useCallback(
+    async ({ caseId, commentId, fetchUserActions, updateCase }: DeleteComment) => {
+      try {
+        isCancelledRef.current = false;
+        abortCtrlRef.current.abort();
+        abortCtrlRef.current = new AbortController();
+        dispatch({ type: 'FETCH_INIT', payload: commentId });
+
+        await deleteComment({
+          caseId,
+          commentId,
+          signal: abortCtrlRef.current.signal,
+        });
+
+        if (!isCancelledRef.current) {
+          const theCase = await getCase(caseId, true, abortCtrlRef.current.signal);
+          updateCase(theCase);
+          fetchUserActions();
+          dispatch({ type: 'FETCH_SUCCESS', payload: { commentId } });
+        }
+      } catch (error) {
+        if (!isCancelledRef.current) {
+          if (error.name !== 'AbortError') {
+            toasts.addError(
+              error.body && error.body.message ? new Error(error.body.message) : error,
+              { title: i18n.ERROR_TITLE }
+            );
+          }
+          dispatch({ type: 'FETCH_FAILURE', payload: commentId });
+        }
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  useEffect(
+    () => () => {
+      isCancelledRef.current = true;
+      abortCtrlRef.current.abort();
+    },
+    []
+  );
+
+  return { ...state, deleteComment: dispatchDeleteComment };
+};
diff --git a/x-pack/plugins/cases/public/containers/use_messages_storage.tsx b/x-pack/plugins/cases/public/containers/use_messages_storage.tsx
index 2a590d29340e4..2f6e9fd107780 100644
--- a/x-pack/plugins/cases/public/containers/use_messages_storage.tsx
+++ b/x-pack/plugins/cases/public/containers/use_messages_storage.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback, useMemo } from 'react';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 export interface UseMessagesStorage {
   getMessages: (plugin: string) => string[];
diff --git a/x-pack/plugins/cases/public/containers/utils.ts b/x-pack/plugins/cases/public/containers/utils.ts
index 303600fdb3398..cd1682c0cd988 100644
--- a/x-pack/plugins/cases/public/containers/utils.ts
+++ b/x-pack/plugins/cases/public/containers/utils.ts
@@ -11,7 +11,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { ToastInputFields } from 'kibana/public';
+import { ToastInputFields } from '@kbn/core/public';
 import {
   CasesFindResponse,
   CasesFindResponseRt,
diff --git a/x-pack/plugins/cases/public/index.tsx b/x-pack/plugins/cases/public/index.tsx
index f81cb1d0a57cd..e267960d91a80 100644
--- a/x-pack/plugins/cases/public/index.tsx
+++ b/x-pack/plugins/cases/public/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { CasesUiPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/cases/public/plugin.ts b/x-pack/plugins/cases/public/plugin.ts
index 7ae68ee141d6e..3b124f920e889 100644
--- a/x-pack/plugins/cases/public/plugin.ts
+++ b/x-pack/plugins/cases/public/plugin.ts
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { CasesUiStart, CasesPluginSetup, CasesPluginStart } from './types';
 import { KibanaServices } from './common/lib/kibana';
 import { CasesUiConfigType } from '../common/ui/types';
 import { APP_ID, APP_PATH } from '../common/constants';
 import { APP_TITLE, APP_DESC } from './common/translations';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import { ManagementAppMountParams } from '../../../../src/plugins/management/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
 import { useCasesAddToExistingCaseModal } from './components/all_cases/selector_modal/use_cases_add_to_existing_case_modal';
 import { useCasesAddToNewCaseFlyout } from './components/create/flyout/use_cases_add_to_new_case_flyout';
 import { createClientAPI } from './client/api';
@@ -51,7 +50,7 @@ export class CasesUiPlugin
         icon: 'watchesApp',
         path: APP_PATH,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/x-pack/plugins/cases/public/types.ts b/x-pack/plugins/cases/public/types.ts
index 63c767f412456..65cc1de25d345 100644
--- a/x-pack/plugins/cases/public/types.ts
+++ b/x-pack/plugins/cases/public/types.ts
@@ -5,21 +5,18 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { ReactElement, ReactNode } from 'react';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import {
-  ManagementSetup,
-  ManagementAppMountParams,
-} from '../../../../src/plugins/management/public';
-import { FeaturesPluginStart } from '../..//features/public';
-import type { LensPublicStart } from '../../lens/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import type { SpacesPluginStart } from '../../spaces/public';
-import type { TriggersAndActionsUIPublicPluginStart as TriggersActionsStart } from '../../triggers_actions_ui/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ManagementSetup, ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart as TriggersActionsStart } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   CasesByAlertId,
   CasesByAlertIDRequest,
diff --git a/x-pack/plugins/cases/server/authorization/audit_logger.test.ts b/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
index 3c465a6f843c0..d06881b8c230d 100644
--- a/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
+++ b/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { auditLoggerMock } from '../../../../plugins/security/server/audit/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { Operations } from '.';
 import { AuthorizationAuditLogger } from './audit_logger';
 import { ReadOperations } from './types';
diff --git a/x-pack/plugins/cases/server/authorization/audit_logger.ts b/x-pack/plugins/cases/server/authorization/audit_logger.ts
index a59dfaaa4dabe..09dd5771c4a11 100644
--- a/x-pack/plugins/cases/server/authorization/audit_logger.ts
+++ b/x-pack/plugins/cases/server/authorization/audit_logger.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
+import { AuditEvent, AuditLogger } from '@kbn/security-plugin/server';
 import { DATABASE_CATEGORY, ECS_OUTCOMES, isWriteOperation, OperationDetails } from '.';
-import { AuditEvent, AuditLogger } from '../../../security/server';
 import { OwnerEntity } from './types';
 
 interface CreateAuditMsgParams {
diff --git a/x-pack/plugins/cases/server/authorization/authorization.test.ts b/x-pack/plugins/cases/server/authorization/authorization.test.ts
index 650119bab0079..7f7d4ea801555 100644
--- a/x-pack/plugins/cases/server/authorization/authorization.test.ts
+++ b/x-pack/plugins/cases/server/authorization/authorization.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { securityMock } from '../../../../plugins/security/server/mocks';
-import { httpServerMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { featuresPluginMock } from '../../../../plugins/features/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { Authorization, Operations } from '.';
-import { Space } from '../../../spaces/server';
+import { Space } from '@kbn/spaces-plugin/server';
 import { AuthorizationAuditLogger } from './audit_logger';
-import { KibanaRequest } from 'kibana/server';
-import { KibanaFeature } from '../../../../plugins/features/common';
-import { AuditLogger, SecurityPluginStart } from '../../../security/server';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { AuditLogger, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
 
 describe('authorization', () => {
   let request: KibanaRequest;
diff --git a/x-pack/plugins/cases/server/authorization/authorization.ts b/x-pack/plugins/cases/server/authorization/authorization.ts
index 453d5c5783f8c..f2bcc1308ea33 100644
--- a/x-pack/plugins/cases/server/authorization/authorization.ts
+++ b/x-pack/plugins/cases/server/authorization/authorization.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'kibana/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import Boom from '@hapi/boom';
-import { SecurityPluginStart } from '../../../security/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { AuthFilterHelpers, GetSpaceFn, OwnerEntity } from './types';
 import { getOwnersFilter } from './utils';
 import { AuthorizationAuditLogger, OperationDetails } from '.';
diff --git a/x-pack/plugins/cases/server/authorization/index.ts b/x-pack/plugins/cases/server/authorization/index.ts
index 0239aad4a4424..cd3ceebf02f92 100644
--- a/x-pack/plugins/cases/server/authorization/index.ts
+++ b/x-pack/plugins/cases/server/authorization/index.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { EcsEventCategory, EcsEventOutcome, EcsEventType } from 'kibana/server';
+import { EcsEventCategory, EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { CasesSupportedOperations } from '@kbn/security-plugin/server';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_CONFIGURE_SAVED_OBJECT,
@@ -13,7 +14,6 @@ import {
   CASE_USER_ACTION_SAVED_OBJECT,
 } from '../../common/constants';
 import { Verbs, ReadOperations, WriteOperations, OperationDetails } from './types';
-import { CasesSupportedOperations } from '../../../security/server';
 
 export * from './authorization';
 export * from './audit_logger';
diff --git a/x-pack/plugins/cases/server/authorization/types.ts b/x-pack/plugins/cases/server/authorization/types.ts
index 2c9a5959f0965..8c672ffb9d245 100644
--- a/x-pack/plugins/cases/server/authorization/types.ts
+++ b/x-pack/plugins/cases/server/authorization/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { EcsEventType, KibanaRequest } from 'kibana/server';
+import { EcsEventType, KibanaRequest } from '@kbn/core/server';
 import type { KueryNode } from '@kbn/es-query';
-import { Space } from '../../../spaces/server';
-import { CasesSupportedOperations } from '../../../security/server';
+import { Space } from '@kbn/spaces-plugin/server';
+import { CasesSupportedOperations } from '@kbn/security-plugin/server';
 
 /**
  * The tenses for describing the action performed by a API route
diff --git a/x-pack/plugins/cases/server/client/attachments/add.ts b/x-pack/plugins/cases/server/client/attachments/add.ts
index b503c79e3f362..2c58845ec6d57 100644
--- a/x-pack/plugins/cases/server/client/attachments/add.ts
+++ b/x-pack/plugins/cases/server/client/attachments/add.ts
@@ -10,7 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsUtils } from '../../../../../../src/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 import { CaseResponse, CommentRequest, CommentRequestRt, throwErrors } from '../../../common/api';
 
diff --git a/x-pack/plugins/cases/server/client/attachments/bulk_create.ts b/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
new file mode 100644
index 0000000000000..efd6fa833c9e4
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import Boom from '@hapi/boom';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+
+import { SavedObjectsUtils } from '@kbn/core/server';
+
+import {
+  BulkCreateCommentRequest,
+  BulkCreateCommentRequestRt,
+  CaseResponse,
+  CommentRequest,
+  throwErrors,
+} from '../../../common/api';
+
+import { CaseCommentModel } from '../../common/models';
+import { createCaseError } from '../../common/error';
+import { CasesClientArgs } from '..';
+
+import { decodeCommentRequest } from '../utils';
+import { Operations, OwnerEntity } from '../../authorization';
+
+export interface BulkCreateArgs {
+  caseId: string;
+  attachments: BulkCreateCommentRequest;
+}
+
+/**
+ * Create an attachment to a case.
+ *
+ * @ignore
+ */
+export const bulkCreate = async (
+  args: BulkCreateArgs,
+  clientArgs: CasesClientArgs
+): Promise<CaseResponse> => {
+  const { attachments, caseId } = args;
+
+  pipe(
+    BulkCreateCommentRequestRt.decode(attachments),
+    fold(throwErrors(Boom.badRequest), identity)
+  );
+
+  attachments.forEach((attachment) => {
+    decodeCommentRequest(attachment);
+  });
+
+  const { logger, authorization } = clientArgs;
+
+  try {
+    const [attachmentsWithIds, entities]: [Array<{ id: string } & CommentRequest>, OwnerEntity[]] =
+      attachments.reduce<[Array<{ id: string } & CommentRequest>, OwnerEntity[]]>(
+        ([a, e], attachment) => {
+          const savedObjectID = SavedObjectsUtils.generateId();
+          return [
+            [...a, { id: savedObjectID, ...attachment }],
+            [...e, { owner: attachment.owner, id: savedObjectID }],
+          ];
+        },
+        [[], []]
+      );
+
+    await authorization.ensureAuthorized({
+      operation: Operations.createComment,
+      entities,
+    });
+
+    const model = await CaseCommentModel.create(caseId, clientArgs);
+    const updatedModel = await model.bulkCreate({
+      attachments: attachmentsWithIds,
+    });
+
+    return await updatedModel.encodeWithComments();
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed while bulk creating attachment to case id: ${caseId} error: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
diff --git a/x-pack/plugins/cases/server/client/attachments/client.ts b/x-pack/plugins/cases/server/client/attachments/client.ts
index ab77ae3f01836..63b039890aff9 100644
--- a/x-pack/plugins/cases/server/client/attachments/client.ts
+++ b/x-pack/plugins/cases/server/client/attachments/client.ts
@@ -12,6 +12,7 @@ import { CasesClientInternal } from '../client_internal';
 import { IAllCommentsResponse, ICaseResponse, ICommentsResponse } from '../typedoc_interfaces';
 import { CasesClientArgs } from '../types';
 import { AddArgs, addComment } from './add';
+import { bulkCreate, BulkCreateArgs } from './bulk_create';
 import { DeleteAllArgs, deleteAll, DeleteArgs, deleteComment } from './delete';
 import {
   find,
@@ -33,6 +34,7 @@ export interface AttachmentsSubClient {
    * Adds an attachment to a case.
    */
   add(params: AddArgs): Promise<ICaseResponse>;
+  bulkCreate(params: BulkCreateArgs): Promise<ICaseResponse>;
   /**
    * Deletes all attachments associated with a single case.
    */
@@ -77,6 +79,7 @@ export const createAttachmentsSubClient = (
 ): AttachmentsSubClient => {
   const attachmentSubClient: AttachmentsSubClient = {
     add: (params: AddArgs) => addComment(params, clientArgs),
+    bulkCreate: (params: BulkCreateArgs) => bulkCreate(params, clientArgs),
     deleteAll: (deleteAllArgs: DeleteAllArgs) => deleteAll(deleteAllArgs, clientArgs),
     delete: (deleteArgs: DeleteArgs) => deleteComment(deleteArgs, clientArgs),
     find: (findArgs: FindArgs) => find(findArgs, clientArgs),
diff --git a/x-pack/plugins/cases/server/client/attachments/delete.ts b/x-pack/plugins/cases/server/client/attachments/delete.ts
index 6071570029d63..68852dd1edea8 100644
--- a/x-pack/plugins/cases/server/client/attachments/delete.ts
+++ b/x-pack/plugins/cases/server/client/attachments/delete.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import pMap from 'p-map';
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { Actions, ActionTypes, CommentAttributes } from '../../../common/api';
 import { CASE_SAVED_OBJECT, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
 import { CasesClientArgs } from '../types';
diff --git a/x-pack/plugins/cases/server/client/attachments/get.ts b/x-pack/plugins/cases/server/client/attachments/get.ts
index 6e9e924fbee30..8f31c745d2657 100644
--- a/x-pack/plugins/cases/server/client/attachments/get.ts
+++ b/x-pack/plugins/cases/server/client/attachments/get.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 import {
   AlertResponse,
diff --git a/x-pack/plugins/cases/server/client/cases/create.ts b/x-pack/plugins/cases/server/client/cases/create.ts
index 23b295602c213..ab9f6a4305800 100644
--- a/x-pack/plugins/cases/server/client/cases/create.ts
+++ b/x-pack/plugins/cases/server/client/cases/create.ts
@@ -10,7 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsUtils } from '../../../../../../src/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 import {
   throwErrors,
diff --git a/x-pack/plugins/cases/server/client/cases/delete.ts b/x-pack/plugins/cases/server/client/cases/delete.ts
index 8d0a97079f1cc..3e3f70433a624 100644
--- a/x-pack/plugins/cases/server/client/cases/delete.ts
+++ b/x-pack/plugins/cases/server/client/cases/delete.ts
@@ -7,7 +7,7 @@
 
 import pMap from 'p-map';
 import { Boom } from '@hapi/boom';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { CommentAttributes } from '../../../common/api';
 import { MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
 import { CasesClientArgs } from '..';
diff --git a/x-pack/plugins/cases/server/client/cases/get.ts b/x-pack/plugins/cases/server/client/cases/get.ts
index 76f0667023e54..a26b01d8cd211 100644
--- a/x-pack/plugins/cases/server/client/cases/get.ts
+++ b/x-pack/plugins/cases/server/client/cases/get.ts
@@ -9,7 +9,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObject, SavedObjectsResolveResponse } from 'kibana/server';
+import { SavedObject, SavedObjectsResolveResponse } from '@kbn/core/server';
 import {
   CaseResponseRt,
   CaseResponse,
diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
index b19a5ebdb0e5c..42fe71f902a72 100644
--- a/x-pack/plugins/cases/server/client/cases/push.ts
+++ b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { nodeBuilder } from '@kbn/es-query';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 
 import {
   ActionConnector,
diff --git a/x-pack/plugins/cases/server/client/cases/types.ts b/x-pack/plugins/cases/server/client/cases/types.ts
index f1d56e7132bd1..7a9abe061d8cd 100644
--- a/x-pack/plugins/cases/server/client/cases/types.ts
+++ b/x-pack/plugins/cases/server/client/cases/types.ts
@@ -9,16 +9,16 @@
 import {
   PushToServiceApiParams as JiraPushToServiceApiParams,
   Incident as JiraIncident,
-} from '../../../../actions/server/builtin_action_types/jira/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/jira/types';
 import {
   PushToServiceApiParams as ResilientPushToServiceApiParams,
   Incident as ResilientIncident,
-} from '../../../../actions/server/builtin_action_types/resilient/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/resilient/types';
 import {
   PushToServiceApiParamsITSM as ServiceNowITSMPushToServiceApiParams,
   PushToServiceApiParamsSIR as ServiceNowSIRPushToServiceApiParams,
   ServiceNowITSMIncident,
-} from '../../../../actions/server/builtin_action_types/servicenow/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/servicenow/types';
 import { CaseResponse, ConnectorMappingsAttributes } from '../../../common/api';
 
 export type Incident = JiraIncident | ResilientIncident | ServiceNowITSMIncident;
diff --git a/x-pack/plugins/cases/server/client/cases/update.ts b/x-pack/plugins/cases/server/client/cases/update.ts
index 184810098bde4..ae53cb03c28a7 100644
--- a/x-pack/plugins/cases/server/client/cases/update.ts
+++ b/x-pack/plugins/cases/server/client/cases/update.ts
@@ -15,7 +15,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsFindResult,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { nodeBuilder } from '@kbn/es-query';
 
diff --git a/x-pack/plugins/cases/server/client/cases/utils.test.ts b/x-pack/plugins/cases/server/client/cases/utils.test.ts
index 664509ba6b03e..3dca8014957da 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { actionsClientMock } from '../../../../actions/server/actions_client.mock';
+import { actionsClientMock } from '@kbn/actions-plugin/server/actions_client.mock';
 import { mockCases } from '../../routes/api/__fixtures__';
 
 import { BasicParams, ExternalServiceParams, Incident } from './types';
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index 4c7e444c114ac..42a9a54466906 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { flow } from 'lodash';
+import { ActionsClient } from '@kbn/actions-plugin/server';
 import { isPushedUserAction } from '../../../common/utils/user_actions';
 import {
   ActionConnector,
@@ -23,8 +24,7 @@ import {
   CommentRequestActionsType,
   ActionTypes,
 } from '../../../common/api';
-import { ActionsClient } from '../../../../actions/server';
-import { CasesClientGetAlertsResponse } from '../../client/alerts/types';
+import { CasesClientGetAlertsResponse } from '../alerts/types';
 import {
   BasicParams,
   EntityInformation,
diff --git a/x-pack/plugins/cases/server/client/configure/client.test.ts b/x-pack/plugins/cases/server/client/configure/client.test.ts
index 971748bd8295a..fa3f2b3f987f1 100644
--- a/x-pack/plugins/cases/server/client/configure/client.test.ts
+++ b/x-pack/plugins/cases/server/client/configure/client.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { CasesClientArgs } from '../types';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getConnectors } from './client';
-import { actionsClientMock } from '../../../../actions/server/mocks';
-import { ActionType } from '../../../../actions/common/types';
+import { actionsClientMock } from '@kbn/actions-plugin/server/mocks';
+import { ActionType } from '@kbn/actions-plugin/common/types';
 
 describe('client', () => {
   describe('getConnectors', () => {
diff --git a/x-pack/plugins/cases/server/client/configure/client.ts b/x-pack/plugins/cases/server/client/configure/client.ts
index 831fe273af92e..c4b07019627e4 100644
--- a/x-pack/plugins/cases/server/client/configure/client.ts
+++ b/x-pack/plugins/cases/server/client/configure/client.ts
@@ -11,11 +11,10 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import {
-  SavedObject,
-  SavedObjectsFindResponse,
-  SavedObjectsUtils,
-} from '../../../../../../src/core/server';
+import { SavedObject, SavedObjectsFindResponse, SavedObjectsUtils } from '@kbn/core/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { FindActionResult } from '@kbn/actions-plugin/server/types';
+import { ActionType } from '@kbn/actions-plugin/common';
 import {
   CaseConfigurationsResponseRt,
   CaseConfigureResponseRt,
@@ -38,9 +37,6 @@ import { CasesClientInternal } from '../client_internal';
 import { CasesClientArgs } from '../types';
 import { getMappings } from './get_mappings';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FindActionResult } from '../../../../actions/server/types';
-import { ActionType } from '../../../../actions/common';
 import { Operations } from '../../authorization';
 import { combineAuthorizedAndOwnerFilter } from '../utils';
 import { MappingsArgs, CreateMappingsArgs, UpdateMappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/configure/create_mappings.ts b/x-pack/plugins/cases/server/client/configure/create_mappings.ts
index bb4c32ae57071..52f00453ef0ec 100644
--- a/x-pack/plugins/cases/server/client/configure/create_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/create_mappings.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorMappingsAttributes } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import { createCaseError } from '../../common/error';
 import { CasesClientArgs } from '..';
 import { CreateMappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/configure/get_mappings.ts b/x-pack/plugins/cases/server/client/configure/get_mappings.ts
index 2fa0e8454bacf..2a3f151156f8b 100644
--- a/x-pack/plugins/cases/server/client/configure/get_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/get_mappings.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorMappings } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import { createCaseError } from '../../common/error';
 import { CasesClientArgs } from '..';
 import { MappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/configure/update_mappings.ts b/x-pack/plugins/cases/server/client/configure/update_mappings.ts
index 3d529e51e7561..490ec69cc5a26 100644
--- a/x-pack/plugins/cases/server/client/configure/update_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/update_mappings.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorMappingsAttributes } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import { createCaseError } from '../../common/error';
 import { CasesClientArgs } from '..';
 import { UpdateMappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/factory.ts b/x-pack/plugins/cases/server/client/factory.ts
index da43d6864f156..238799cf3e6e1 100644
--- a/x-pack/plugins/cases/server/client/factory.ts
+++ b/x-pack/plugins/cases/server/client/factory.ts
@@ -10,8 +10,11 @@ import {
   SavedObjectsServiceStart,
   Logger,
   ElasticsearchClient,
-} from 'kibana/server';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../../security/server';
+} from '@kbn/core/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { SAVED_OBJECT_TYPES } from '../../common/constants';
 import { Authorization } from '../authorization/authorization';
 import { GetSpaceFn } from '../authorization/types';
@@ -23,9 +26,6 @@ import {
   AttachmentService,
   AlertService,
 } from '../services';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
-import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
-import { LensServerPluginSetup } from '../../../lens/server';
 
 import { AuthorizationAuditLogger } from '../authorization';
 import { CasesClient, createCasesClient } from '.';
diff --git a/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts b/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
index 239277259539e..8616196088884 100644
--- a/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
@@ -8,7 +8,7 @@
 import { CaseResponse } from '../../../../common/api';
 import { createCasesClientMock } from '../../mocks';
 import { CasesClientArgs } from '../../types';
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createAttachmentServiceMock } from '../../../services/mocks';
 
 import { Actions } from './actions';
diff --git a/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts b/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts
index 529590bfbc7dc..6f8a7b284d1eb 100644
--- a/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts
@@ -7,7 +7,7 @@
 
 import { CasesClientMock, createCasesClientMock } from '../../mocks';
 import { CasesClientArgs } from '../../types';
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { AlertDetails } from './details';
 import { mockAlertsService } from '../test_utils/alerts';
diff --git a/x-pack/plugins/cases/server/client/metrics/connectors.test.ts b/x-pack/plugins/cases/server/client/metrics/connectors.test.ts
index 0b15b94525b02..c0bcdbdda8964 100644
--- a/x-pack/plugins/cases/server/client/metrics/connectors.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/connectors.test.ts
@@ -7,7 +7,7 @@
 
 import { createCasesClientMock } from '../mocks';
 import { CasesClientArgs } from '../types';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createUserActionServiceMock } from '../../services/mocks';
 import { Connectors } from './connectors';
 
diff --git a/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts b/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
index 11c158835e9fb..03b03eafa7d97 100644
--- a/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
@@ -10,13 +10,13 @@ import { CaseAttributes, CaseResponse, CaseStatuses } from '../../../common/api'
 import { CasesClientMock, createCasesClientMock } from '../mocks';
 import { CasesClientArgs } from '../types';
 import { createAuthorizationMock } from '../../authorization/mock';
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   createAttachmentServiceMock,
   createCaseServiceMock,
   createUserActionServiceMock,
 } from '../../services/mocks';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { mockAlertsService } from './test_utils/alerts';
 import { createStatusChangeSavedObject } from './test_utils/lifespan';
 
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
index 61b6c2ff3d1bd..efb9062bfdfe0 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { CaseStatuses, CaseUserActionResponse } from '../../../common/api';
 import { getStatusInfo } from './lifespan';
 
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
index 2f00393f8636b..6198886036471 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import {
   CaseMetricsResponse,
   CaseStatuses,
diff --git a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
index 07b4248315435..2e5176b6f21a6 100644
--- a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { CaseStatuses, CaseUserActionResponse } from '../../../../common/api';
 
 export function createStatusChangeSavedObject(
diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
index ecedc7cb05071..6ad4663f1e5ea 100644
--- a/x-pack/plugins/cases/server/client/mocks.ts
+++ b/x-pack/plugins/cases/server/client/mocks.ts
@@ -46,6 +46,7 @@ type AttachmentsSubClientMock = jest.Mocked<AttachmentsSubClient>;
 const createAttachmentsSubClientMock = (): AttachmentsSubClientMock => {
   return {
     add: jest.fn(),
+    bulkCreate: jest.fn(),
     deleteAll: jest.fn(),
     delete: jest.fn(),
     find: jest.fn(),
diff --git a/x-pack/plugins/cases/server/client/types.ts b/x-pack/plugins/cases/server/client/types.ts
index e3d7b8a541b9d..d071e72099bf9 100644
--- a/x-pack/plugins/cases/server/client/types.ts
+++ b/x-pack/plugins/cases/server/client/types.ts
@@ -6,7 +6,9 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { SavedObjectsClientContract, Logger } from '@kbn/core/server';
+import { ActionsClient } from '@kbn/actions-plugin/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { User } from '../../common/api';
 import { Authorization } from '../authorization/authorization';
 import {
@@ -17,8 +19,6 @@ import {
   AttachmentService,
   AlertService,
 } from '../services';
-import { ActionsClient } from '../../../actions/server';
-import { LensServerPluginSetup } from '../../../lens/server';
 
 /**
  * Parameters for initializing a cases client
diff --git a/x-pack/plugins/cases/server/client/user_actions/get.ts b/x-pack/plugins/cases/server/client/user_actions/get.ts
index 9b10d9df2b9a6..1385ea6106e4b 100644
--- a/x-pack/plugins/cases/server/client/user_actions/get.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/get.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import {
   CaseUserActionsResponse,
   CaseUserActionsResponseRt,
diff --git a/x-pack/plugins/cases/server/common/error.ts b/x-pack/plugins/cases/server/common/error.ts
index 3478131f65537..e994d249e858b 100644
--- a/x-pack/plugins/cases/server/common/error.ts
+++ b/x-pack/plugins/cases/server/common/error.ts
@@ -6,7 +6,7 @@
  */
 
 import { Boom, isBoom } from '@hapi/boom';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export interface HTTPError extends Error {
   statusCode: number;
diff --git a/x-pack/plugins/cases/server/common/models/case_with_comments.ts b/x-pack/plugins/cases/server/common/models/case_with_comments.ts
index 14c0b6aec5eac..97d896ba08056 100644
--- a/x-pack/plugins/cases/server/common/models/case_with_comments.ts
+++ b/x-pack/plugins/cases/server/common/models/case_with_comments.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectReference,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   CaseResponse,
   CaseResponseRt,
@@ -24,8 +24,13 @@ import {
   CaseAttributes,
   ActionTypes,
   Actions,
+  CommentRequestAlertType,
 } from '../../../common/api';
-import { CASE_SAVED_OBJECT, MAX_DOCS_PER_PAGE } from '../../../common/constants';
+import {
+  CASE_SAVED_OBJECT,
+  MAX_ALERTS_PER_CASE,
+  MAX_DOCS_PER_PAGE,
+} from '../../../common/constants';
 import { CasesClientArgs } from '../../client';
 import { createCaseError } from '../error';
 import {
@@ -34,9 +39,11 @@ import {
   transformNewComment,
   getOrUpdateLensReferences,
   createAlertUpdateRequest,
+  isCommentRequestTypeAlert,
 } from '../utils';
 
 type CaseCommentModelParams = Omit<CasesClientArgs, 'authorization'>;
+const ALERT_LIMIT_MSG = `Case has already reach the maximum allowed number (${MAX_ALERTS_PER_CASE}) of attached alerts on a case`;
 
 /**
  * This class represents a case that can have a comment attached to it.
@@ -188,17 +195,9 @@ export class CaseCommentModel {
     id: string;
   }): Promise<CaseCommentModel> {
     try {
-      this.validateCreateCommentRequest(commentReq);
+      await this.validateCreateCommentRequest([commentReq]);
 
-      let references = this.buildRefsToCase();
-
-      if (commentReq.type === CommentType.user && commentReq?.comment) {
-        const commentStringReferences = getOrUpdateLensReferences(
-          this.params.lensEmbeddableFactory,
-          commentReq.comment
-        );
-        references = [...references, ...commentStringReferences];
-      }
+      const references = [...this.buildRefsToCase(), ...this.getCommentReferences(commentReq)];
 
       const [comment, commentableCase] = await Promise.all([
         this.params.attachmentService.create({
@@ -215,7 +214,7 @@ export class CaseCommentModel {
       ]);
 
       await Promise.all([
-        commentableCase.handleAlertComments(comment, commentReq),
+        commentableCase.handleAlertComments([commentReq]),
         this.createCommentUserAction(comment, commentReq),
       ]);
 
@@ -229,14 +228,48 @@ export class CaseCommentModel {
     }
   }
 
-  private validateCreateCommentRequest(req: CommentRequest) {
-    if (req.type === CommentType.alert && this.caseInfo.attributes.status === CaseStatuses.closed) {
+  private async validateCreateCommentRequest(req: CommentRequest[]) {
+    const totalAlertsInReq = req
+      .filter<CommentRequestAlertType>(isCommentRequestTypeAlert)
+      .reduce((count, attachment) => {
+        const ids = Array.isArray(attachment.alertId) ? attachment.alertId : [attachment.alertId];
+        return count + ids.length;
+      }, 0);
+
+    const reqHasAlerts = totalAlertsInReq > 0;
+
+    if (reqHasAlerts && this.caseInfo.attributes.status === CaseStatuses.closed) {
       throw Boom.badRequest('Alert cannot be attached to a closed case');
     }
 
-    if (req.owner !== this.caseInfo.attributes.owner) {
+    if (req.some((attachment) => attachment.owner !== this.caseInfo.attributes.owner)) {
       throw Boom.badRequest('The owner field of the comment must match the case');
     }
+
+    if (reqHasAlerts) {
+      /**
+       * This check is for optimization reasons.
+       * It saves one aggregation if the total number
+       * of alerts of the request is already greater than
+       * MAX_ALERTS_PER_CASE
+       */
+      if (totalAlertsInReq > MAX_ALERTS_PER_CASE) {
+        throw Boom.badRequest(ALERT_LIMIT_MSG);
+      }
+
+      await this.validateAlertsLimitOnCase(totalAlertsInReq);
+    }
+  }
+
+  private async validateAlertsLimitOnCase(totalAlertsInReq: number) {
+    const alertsValueCount = await this.params.attachmentService.valueCountAlertsAttachedToCase({
+      unsecuredSavedObjectsClient: this.params.unsecuredSavedObjectsClient,
+      caseId: this.caseInfo.id,
+    });
+
+    if (alertsValueCount + totalAlertsInReq > MAX_ALERTS_PER_CASE) {
+      throw Boom.badRequest(ALERT_LIMIT_MSG);
+    }
   }
 
   private buildRefsToCase(): SavedObjectReference[] {
@@ -249,20 +282,38 @@ export class CaseCommentModel {
     ];
   }
 
-  private async handleAlertComments(comment: SavedObject<CommentAttributes>, req: CommentRequest) {
-    if (
-      comment.attributes.type === CommentType.alert &&
-      this.caseInfo.attributes.settings.syncAlerts
-    ) {
-      await this.updateAlertsStatus(req);
+  private getCommentReferences(commentReq: CommentRequest) {
+    let references: SavedObjectReference[] = [];
+
+    if (commentReq.type === CommentType.user && commentReq?.comment) {
+      const commentStringReferences = getOrUpdateLensReferences(
+        this.params.lensEmbeddableFactory,
+        commentReq.comment
+      );
+      references = [...references, ...commentStringReferences];
     }
+
+    return references;
   }
 
-  private async updateAlertsStatus(req: CommentRequest) {
-    const alertsToUpdate = createAlertUpdateRequest({
-      comment: req,
-      status: this.caseInfo.attributes.status,
-    });
+  private async handleAlertComments(attachments: CommentRequest[]) {
+    const alerts = attachments.filter(
+      (attachment) =>
+        attachment.type === CommentType.alert && this.caseInfo.attributes.settings.syncAlerts
+    );
+
+    await this.updateAlertsStatus(alerts);
+  }
+
+  private async updateAlertsStatus(alerts: CommentRequest[]) {
+    const alertsToUpdate = alerts
+      .map((alert) =>
+        createAlertUpdateRequest({
+          comment: alert,
+          status: this.caseInfo.attributes.status,
+        })
+      )
+      .flat();
 
     await this.params.alertsService.updateAlertsStatus(alertsToUpdate);
   }
@@ -285,6 +336,19 @@ export class CaseCommentModel {
     });
   }
 
+  private async bulkCreateCommentUserAction(attachments: Array<{ id: string } & CommentRequest>) {
+    await this.params.userActionService.bulkCreateAttachmentCreation({
+      unsecuredSavedObjectsClient: this.params.unsecuredSavedObjectsClient,
+      caseId: this.caseInfo.id,
+      attachments: attachments.map(({ id, ...attachment }) => ({
+        id,
+        owner: attachment.owner,
+        attachment,
+      })),
+      user: this.params.user,
+    });
+  }
+
   private formatForEncoding(totalComment: number) {
     return {
       id: this.caseInfo.id,
@@ -322,4 +386,54 @@ export class CaseCommentModel {
       });
     }
   }
+  public async bulkCreate({
+    attachments,
+  }: {
+    attachments: Array<{ id: string } & CommentRequest>;
+  }): Promise<CaseCommentModel> {
+    try {
+      await this.validateCreateCommentRequest(attachments);
+
+      const caseReference = this.buildRefsToCase();
+
+      const [newlyCreatedAttachments, commentableCase] = await Promise.all([
+        this.params.attachmentService.bulkCreate({
+          unsecuredSavedObjectsClient: this.params.unsecuredSavedObjectsClient,
+          attachments: attachments.map(({ id, ...attachment }) => {
+            return {
+              attributes: transformNewComment({
+                createdDate: new Date().toISOString(),
+                ...attachment,
+                ...this.params.user,
+              }),
+              references: [...caseReference, ...this.getCommentReferences(attachment)],
+              id,
+            };
+          }),
+        }),
+        this.updateCaseUserAndDate(new Date().toISOString()),
+      ]);
+
+      const savedObjectsWithoutErrors = newlyCreatedAttachments.saved_objects.filter(
+        (attachment) => attachment.error == null
+      );
+
+      const attachmentsWithoutErrors = attachments.filter((attachment) =>
+        savedObjectsWithoutErrors.some((so) => so.id === attachment.id)
+      );
+
+      await Promise.all([
+        commentableCase.handleAlertComments(attachmentsWithoutErrors),
+        this.bulkCreateCommentUserAction(attachmentsWithoutErrors),
+      ]);
+
+      return commentableCase;
+    } catch (error) {
+      throw createCaseError({
+        message: `Failed bulk creating attachments on a commentable case, case id: ${this.caseInfo.id}: ${error}`,
+        error,
+        logger: this.params.logger,
+      });
+    }
+  }
 }
diff --git a/x-pack/plugins/cases/server/common/utils.test.ts b/x-pack/plugins/cases/server/common/utils.test.ts
index 0479dc73ff6b6..47af4b11a0a96 100644
--- a/x-pack/plugins/cases/server/common/utils.test.ts
+++ b/x-pack/plugins/cases/server/common/utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsFindResponse } from 'kibana/server';
-import { makeLensEmbeddableFactory } from '../../../lens/server/embeddable/make_lens_embeddable_factory';
+import { SavedObject, SavedObjectsFindResponse } from '@kbn/core/server';
+import { makeLensEmbeddableFactory } from '@kbn/lens-plugin/server/embeddable/make_lens_embeddable_factory';
 import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
 import {
   CaseResponse,
diff --git a/x-pack/plugins/cases/server/common/utils.ts b/x-pack/plugins/cases/server/common/utils.ts
index 8bbf247b24773..9385e83c948c9 100644
--- a/x-pack/plugins/cases/server/common/utils.ts
+++ b/x-pack/plugins/cases/server/common/utils.ts
@@ -10,10 +10,10 @@ import {
   SavedObjectsFindResponse,
   SavedObject,
   SavedObjectReference,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { flatMap, uniqWith, xorWith } from 'lodash';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { AlertInfo } from './types';
-import { LensServerPluginSetup } from '../../../lens/server';
 
 import {
   CaseAttributes,
diff --git a/x-pack/plugins/cases/server/connectors/types.ts b/x-pack/plugins/cases/server/connectors/types.ts
index 16f4efa3b1327..83dab22ec920f 100644
--- a/x-pack/plugins/cases/server/connectors/types.ts
+++ b/x-pack/plugins/cases/server/connectors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { CaseResponse, ConnectorMappingsAttributes } from '../../common/api';
 import { CasesClientGetAlertsResponse } from '../client/alerts/types';
 import { CasesClientFactory } from '../client/factory';
diff --git a/x-pack/plugins/cases/server/features.ts b/x-pack/plugins/cases/server/features.ts
index 33a3315b7d9d3..dabd3b37e5bb0 100644
--- a/x-pack/plugins/cases/server/features.ts
+++ b/x-pack/plugins/cases/server/features.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { KibanaFeatureConfig } from '../../features/common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 
 import { APP_ID, FEATURE_ID } from '../common/constants';
 
diff --git a/x-pack/plugins/cases/server/index.ts b/x-pack/plugins/cases/server/index.ts
index 765d21af8538c..ee8dc44d402ed 100644
--- a/x-pack/plugins/cases/server/index.ts
+++ b/x-pack/plugins/cases/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 export { CasesClient } from './client';
 import { ConfigType, ConfigSchema } from './config';
 import { CasePlugin } from './plugin';
diff --git a/x-pack/plugins/cases/server/plugin.ts b/x-pack/plugins/cases/server/plugin.ts
index 5eba2f75cdaaa..4ec2415bae54d 100644
--- a/x-pack/plugins/cases/server/plugin.ts
+++ b/x-pack/plugins/cases/server/plugin.ts
@@ -5,14 +5,31 @@
  * 2.0.
  */
 
-import { IContextProvider, KibanaRequest, Logger, PluginInitializerContext } from 'kibana/server';
-import { CoreSetup, CoreStart } from 'src/core/server';
-
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
+import {
+  IContextProvider,
+  KibanaRequest,
+  Logger,
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+} from '@kbn/core/server';
+
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   PluginSetupContract as ActionsPluginSetup,
   PluginStartContract as ActionsPluginStart,
-} from '../../actions/server';
+} from '@kbn/actions-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import {
+  PluginStartContract as FeaturesPluginStart,
+  PluginSetupContract as FeaturesPluginSetup,
+} from '@kbn/features-plugin/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { APP_ID } from '../common/constants';
 
 import {
@@ -27,18 +44,11 @@ import {
 import { CasesClient } from './client';
 import type { CasesRequestHandlerContext } from './types';
 import { CasesClientFactory } from './client/factory';
-import { SpacesPluginStart } from '../../spaces/server';
-import {
-  PluginStartContract as FeaturesPluginStart,
-  PluginSetupContract as FeaturesPluginSetup,
-} from '../../features/server';
-import { LensServerPluginSetup } from '../../lens/server';
 import { getCasesKibanaFeature } from './features';
 import { registerRoutes } from './routes/api/register_routes';
 import { getExternalRoutes } from './routes/api/get_external_routes';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
 import { createCasesTelemetry, scheduleCasesTelemetryTask } from './telemetry';
+import { getInternalRoutes } from './routes/api/get_internal_routes';
 
 export interface PluginsSetup {
   actions: ActionsPluginSetup;
@@ -130,7 +140,7 @@ export class CasePlugin {
 
     registerRoutes({
       router,
-      routes: getExternalRoutes(),
+      routes: [...getExternalRoutes(), ...getInternalRoutes()],
       logger: this.logger,
       kibanaVersion: this.kibanaVersion,
       telemetryUsageCounter,
@@ -188,10 +198,11 @@ export class CasePlugin {
       return {
         getCasesClient: async () => {
           const [{ savedObjects }] = await core.getStartServices();
+          const coreContext = await context.core;
 
           return this.clientFactory.create({
             request,
-            scopedClusterClient: context.core.elasticsearch.client.asCurrentUser,
+            scopedClusterClient: coreContext.elasticsearch.client.asCurrentUser,
             savedObjectsService: savedObjects,
           });
         },
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts
index 3c6bec265e3ea..08c8cd44f4ad1 100644
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts
+++ b/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { AuthenticatedUser } from '../../../../../security/server';
-import { securityMock } from '../../../../../security/server/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { nullUser } from '../../../common/utils';
 
 function createAuthenticationMock({
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts
index a05c9e320d897..cf5de90f4f61f 100644
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts
+++ b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import {
   CaseAttributes,
   CaseStatuses,
diff --git a/x-pack/plugins/cases/server/routes/api/cases/alerts/get_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/alerts/get_cases.ts
index 00a368e834a0a..8a9c02cf574d7 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/alerts/get_cases.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/alerts/get_cases.ts
@@ -24,7 +24,8 @@ export const getCasesByAlertIdRoute = createCasesRoute({
     try {
       const alertID = request.params.alert_id;
 
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const options = request.query as CasesByAlertIDRequest;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/cases/delete_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/delete_cases.ts
index a63d07037de01..5a397841f976d 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/delete_cases.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/delete_cases.ts
@@ -21,7 +21,8 @@ export const deleteCaseRoute = createCasesRoute({
   },
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       await client.cases.delete(request.query.ids);
 
       return response.noContent();
diff --git a/x-pack/plugins/cases/server/routes/api/cases/find_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/find_cases.ts
index 711c6909df46c..2a42bb3fa3353 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/find_cases.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/find_cases.ts
@@ -15,7 +15,8 @@ export const findCaseRoute = createCasesRoute({
   path: `${CASES_URL}/_find`,
   handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const options = request.query as CasesFindRequest;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/cases/get_case.ts b/x-pack/plugins/cases/server/routes/api/cases/get_case.ts
index f0e53e82f1494..736b9b973ce7d 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/get_case.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/get_case.ts
@@ -41,7 +41,8 @@ export const getCaseRoute = createCasesRoute({
         );
       }
 
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const id = request.params.case_id;
 
       return response.ok({
@@ -70,7 +71,8 @@ export const resolveCaseRoute = createCasesRoute({
   params,
   handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const id = request.params.case_id;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/cases/patch_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/patch_cases.ts
index c148a45220a74..bb9649aaa092c 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/patch_cases.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/patch_cases.ts
@@ -15,7 +15,8 @@ export const patchCaseRoute = createCasesRoute({
   path: CASES_URL,
   handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const cases = request.body as CasesPatchRequest;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/cases/post_case.ts b/x-pack/plugins/cases/server/routes/api/cases/post_case.ts
index 226d0308a3152..8c4d43274f21a 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/post_case.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/post_case.ts
@@ -15,7 +15,8 @@ export const postCaseRoute = createCasesRoute({
   path: CASES_URL,
   handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const theCase = request.body as CasePostRequest;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/cases/push_case.ts b/x-pack/plugins/cases/server/routes/api/cases/push_case.ts
index 175838a9d313c..9ee30ed34f2a5 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/push_case.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/push_case.ts
@@ -21,7 +21,8 @@ export const pushCaseRoute: CaseRoute = createCasesRoute({
   path: CASE_PUSH_URL,
   handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
 
       const params = pipe(
         CasePushRequestParamsRt.decode(request.params),
diff --git a/x-pack/plugins/cases/server/routes/api/cases/reporters/get_reporters.ts b/x-pack/plugins/cases/server/routes/api/cases/reporters/get_reporters.ts
index ee413d73565ee..56465fd7be1c4 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/reporters/get_reporters.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/reporters/get_reporters.ts
@@ -15,7 +15,8 @@ export const getReportersRoute = createCasesRoute({
   path: CASE_REPORTERS_URL,
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       const options = request.query as AllReportersFindRequest;
 
       return response.ok({ body: await client.cases.getReporters({ ...options }) });
diff --git a/x-pack/plugins/cases/server/routes/api/cases/tags/get_tags.ts b/x-pack/plugins/cases/server/routes/api/cases/tags/get_tags.ts
index 7dfa948aa623c..8c2071750f5e6 100644
--- a/x-pack/plugins/cases/server/routes/api/cases/tags/get_tags.ts
+++ b/x-pack/plugins/cases/server/routes/api/cases/tags/get_tags.ts
@@ -15,7 +15,8 @@ export const getTagsRoute = createCasesRoute({
   path: CASE_TAGS_URL,
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       const options = request.query as AllTagsFindRequest;
 
       return response.ok({ body: await client.cases.getTags({ ...options }) });
diff --git a/x-pack/plugins/cases/server/routes/api/comments/delete_all_comments.ts b/x-pack/plugins/cases/server/routes/api/comments/delete_all_comments.ts
index 0a1ebd3b66a74..317ebaec20a13 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/delete_all_comments.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/delete_all_comments.ts
@@ -20,7 +20,8 @@ export const deleteAllCommentsRoute = createCasesRoute({
   },
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
 
       await client.attachments.deleteAll({
         caseID: request.params.case_id,
diff --git a/x-pack/plugins/cases/server/routes/api/comments/delete_comment.ts b/x-pack/plugins/cases/server/routes/api/comments/delete_comment.ts
index 220fbffc76cc0..775fabb846408 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/delete_comment.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/delete_comment.ts
@@ -22,7 +22,8 @@ export const deleteCommentRoute = createCasesRoute({
   },
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       await client.attachments.delete({
         attachmentID: request.params.comment_id,
         caseID: request.params.case_id,
diff --git a/x-pack/plugins/cases/server/routes/api/comments/find_comments.ts b/x-pack/plugins/cases/server/routes/api/comments/find_comments.ts
index 14c6090d62ea1..23a7ecb601534 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/find_comments.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/find_comments.ts
@@ -32,7 +32,8 @@ export const findCommentsRoute = createCasesRoute({
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       return response.ok({
         body: await client.attachments.find({
           caseID: request.params.case_id,
diff --git a/x-pack/plugins/cases/server/routes/api/comments/get_alerts.ts b/x-pack/plugins/cases/server/routes/api/comments/get_alerts.ts
index 4fa793059ed63..a0b0da466e7ce 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/get_alerts.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/get_alerts.ts
@@ -23,7 +23,8 @@ export const getAllAlertsAttachedToCaseRoute = createCasesRoute({
     try {
       const caseId = request.params.case_id;
 
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
 
       return response.ok({
         body: await casesClient.attachments.getAllAlertsAttachToCase({ caseId }),
diff --git a/x-pack/plugins/cases/server/routes/api/comments/get_all_comment.ts b/x-pack/plugins/cases/server/routes/api/comments/get_all_comment.ts
index 44f8f59550fb3..72b8f7e6ac98b 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/get_all_comment.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/get_all_comment.ts
@@ -23,9 +23,10 @@ export const getAllCommentsRoute = createCasesRoute({
     }),
   },
   options: { deprecated: true },
-  handler: async ({ context, request, response, logger, kibanaVersion }) => {
+  handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
 
       return response.ok({
         body: await client.attachments.getAll({
diff --git a/x-pack/plugins/cases/server/routes/api/comments/get_comment.ts b/x-pack/plugins/cases/server/routes/api/comments/get_comment.ts
index 91adf832f1ea6..2a863f3ee4df4 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/get_comment.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/get_comment.ts
@@ -22,7 +22,8 @@ export const getCommentRoute = createCasesRoute({
   },
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
 
       return response.ok({
         body: await client.attachments.get({
diff --git a/x-pack/plugins/cases/server/routes/api/comments/patch_comment.ts b/x-pack/plugins/cases/server/routes/api/comments/patch_comment.ts
index ebc17daa25611..4bb6493475a9c 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/patch_comment.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/patch_comment.ts
@@ -31,7 +31,8 @@ export const patchCommentRoute = createCasesRoute({
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
 
       return response.ok({
         body: await client.attachments.update({
diff --git a/x-pack/plugins/cases/server/routes/api/comments/post_comment.ts b/x-pack/plugins/cases/server/routes/api/comments/post_comment.ts
index 1ececb3653741..f501f3a425801 100644
--- a/x-pack/plugins/cases/server/routes/api/comments/post_comment.ts
+++ b/x-pack/plugins/cases/server/routes/api/comments/post_comment.ts
@@ -21,7 +21,8 @@ export const postCommentRoute = createCasesRoute({
   },
   handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const caseId = request.params.case_id;
       const comment = request.body as CommentRequest;
 
diff --git a/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts b/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts
index 8dabf7862fc88..72ca1f6a38324 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts
@@ -15,7 +15,8 @@ export const getCaseConfigureRoute = createCasesRoute({
   path: CASE_CONFIGURE_URL,
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       const options = request.query as GetConfigureFindRequest;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts b/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts
index da99cd19065d6..4c28b896bd855 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts
@@ -17,7 +17,8 @@ export const getConnectorsRoute = createCasesRoute({
   path: `${CASE_CONFIGURE_CONNECTORS_URL}/_find`,
   handler: async ({ context, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
 
       return response.ok({ body: await client.configure.getConnectors() });
     } catch (error) {
diff --git a/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts b/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
index 40b0d5123f429..b6754dc6da8f6 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
@@ -30,7 +30,8 @@ export const patchCaseConfigureRoute = createCasesRoute({
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       const configuration = request.body as CasesConfigurePatch;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts b/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts
index bb64175fb52ad..102d618fdc052 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts
@@ -25,7 +25,8 @@ export const postCaseConfigureRoute = createCasesRoute({
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
 
       return response.ok({
         body: await client.configure.create(query),
diff --git a/x-pack/plugins/cases/server/routes/api/get_internal_routes.ts b/x-pack/plugins/cases/server/routes/api/get_internal_routes.ts
new file mode 100644
index 0000000000000..10d379c080abb
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/get_internal_routes.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { bulkCreateAttachmentsRoute } from './internal/bulk_create_attachments';
+import { CaseRoute } from './types';
+
+export const getInternalRoutes = () => [bulkCreateAttachmentsRoute] as CaseRoute[];
diff --git a/x-pack/plugins/cases/server/routes/api/internal/bulk_create_attachments.ts b/x-pack/plugins/cases/server/routes/api/internal/bulk_create_attachments.ts
new file mode 100644
index 0000000000000..cd2facd2391e3
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/internal/bulk_create_attachments.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { INTERNAL_BULK_CREATE_ATTACHMENTS_URL } from '../../../../common/constants';
+import { BulkCreateCommentRequest } from '../../../../common/api';
+import { createCaseError } from '../../../common/error';
+import { createCasesRoute } from '../create_cases_route';
+import { escapeHatch } from '../utils';
+
+export const bulkCreateAttachmentsRoute = createCasesRoute({
+  method: 'post',
+  path: INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
+  params: {
+    params: schema.object({
+      case_id: schema.string(),
+    }),
+    body: schema.arrayOf(escapeHatch),
+  },
+  handler: async ({ context, request, response }) => {
+    try {
+      const casesContext = await context.cases;
+      const casesClient = await casesContext.getCasesClient();
+      const caseId = request.params.case_id;
+      const attachments = request.body as BulkCreateCommentRequest;
+
+      return response.ok({
+        body: await casesClient.attachments.bulkCreate({ caseId, attachments }),
+      });
+    } catch (error) {
+      throw createCaseError({
+        message: `Failed to bulk create attachments in route case id: ${request.params.case_id}: ${error}`,
+        error,
+      });
+    }
+  },
+});
diff --git a/x-pack/plugins/cases/server/routes/api/metrics/get_case_metrics.ts b/x-pack/plugins/cases/server/routes/api/metrics/get_case_metrics.ts
index b86b84410abe6..13bfa2093f623 100644
--- a/x-pack/plugins/cases/server/routes/api/metrics/get_case_metrics.ts
+++ b/x-pack/plugins/cases/server/routes/api/metrics/get_case_metrics.ts
@@ -24,7 +24,8 @@ export const getCaseMetricRoute = createCasesRoute({
   },
   handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       return response.ok({
         body: await client.metrics.getCaseMetrics({
           caseId: request.params.case_id,
diff --git a/x-pack/plugins/cases/server/routes/api/register_routes.test.ts b/x-pack/plugins/cases/server/routes/api/register_routes.test.ts
index 4082ed3f6e6ae..07aa3fc70a75f 100644
--- a/x-pack/plugins/cases/server/routes/api/register_routes.test.ts
+++ b/x-pack/plugins/cases/server/routes/api/register_routes.test.ts
@@ -7,13 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
-import {
-  httpServerMock,
-  httpServiceMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 import { CasesRouter } from '../../types';
 import { createCasesRoute } from './create_cases_route';
diff --git a/x-pack/plugins/cases/server/routes/api/register_routes.ts b/x-pack/plugins/cases/server/routes/api/register_routes.ts
index a4545d82efef7..e46491ffad80a 100644
--- a/x-pack/plugins/cases/server/routes/api/register_routes.ts
+++ b/x-pack/plugins/cases/server/routes/api/register_routes.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Headers, RouteRegistrar } from 'kibana/server';
+import { Headers, RouteRegistrar } from '@kbn/core/server';
 import { CasesRequestHandlerContext } from '../../types';
 import { RegisterRoutesDeps } from './types';
 import {
diff --git a/x-pack/plugins/cases/server/routes/api/stats/get_status.ts b/x-pack/plugins/cases/server/routes/api/stats/get_status.ts
index c245f435835f6..d35d366534c14 100644
--- a/x-pack/plugins/cases/server/routes/api/stats/get_status.ts
+++ b/x-pack/plugins/cases/server/routes/api/stats/get_status.ts
@@ -19,9 +19,10 @@ export const getStatusRoute: CaseRoute = createCasesRoute({
   method: 'get',
   path: CASE_STATUS_URL,
   options: { deprecated: true },
-  handler: async ({ context, request, response, logger, kibanaVersion }) => {
+  handler: async ({ context, request, response }) => {
     try {
-      const client = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const client = await caseContext.getCasesClient();
       return response.ok({
         body: await client.metrics.getStatusTotalsByType(request.query as CasesStatusRequest),
       });
diff --git a/x-pack/plugins/cases/server/routes/api/types.ts b/x-pack/plugins/cases/server/routes/api/types.ts
index ffa06526dc68c..d49861881d586 100644
--- a/x-pack/plugins/cases/server/routes/api/types.ts
+++ b/x-pack/plugins/cases/server/routes/api/types.ts
@@ -12,9 +12,9 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   RouteValidatorConfig,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type { CasesRequestHandlerContext, CasesRouter } from '../../types';
 
 type TelemetryUsageCounter = ReturnType<UsageCollectionSetup['createUsageCounter']>;
diff --git a/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts b/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts
index ae686969974ea..257db8ab70f00 100644
--- a/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts
+++ b/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts
@@ -23,9 +23,10 @@ export const getUserActionsRoute = createCasesRoute({
     }),
   },
   options: { deprecated: true },
-  handler: async ({ context, request, response, logger, kibanaVersion }) => {
+  handler: async ({ context, request, response }) => {
     try {
-      const casesClient = await context.cases.getCasesClient();
+      const caseContext = await context.cases;
+      const casesClient = await caseContext.getCasesClient();
       const caseId = request.params.case_id;
 
       return response.ok({
diff --git a/x-pack/plugins/cases/server/routes/api/utils.test.ts b/x-pack/plugins/cases/server/routes/api/utils.test.ts
index ec9dff072d359..d7415276d3e71 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.test.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { isBoom, boomify } from '@hapi/boom';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { HTTPError } from '../../common/error';
 import { extractWarningValueFromWarningHeader, logDeprecatedEndpoint, wrapError } from './utils';
 
diff --git a/x-pack/plugins/cases/server/routes/api/utils.ts b/x-pack/plugins/cases/server/routes/api/utils.ts
index 41fe1db9a7eb6..3e595e74f042d 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.ts
@@ -7,7 +7,7 @@
 
 import { Boom, boomify, isBoom } from '@hapi/boom';
 import { schema } from '@kbn/config-schema';
-import type { CustomHttpResponseOptions, ResponseError, Headers, Logger } from 'kibana/server';
+import type { CustomHttpResponseOptions, ResponseError, Headers, Logger } from '@kbn/core/server';
 import { CaseError, isCaseError, HTTPError, isHTTPError } from '../../common/error';
 
 /**
diff --git a/x-pack/plugins/cases/server/saved_object_types/cases.ts b/x-pack/plugins/cases/server/saved_object_types/cases.ts
index 31eadd9bd5142..441bd818189ae 100644
--- a/x-pack/plugins/cases/server/saved_object_types/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/cases.ts
@@ -11,7 +11,7 @@ import {
   SavedObject,
   SavedObjectsExportTransformContext,
   SavedObjectsType,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { CASE_SAVED_OBJECT } from '../../common/constants';
 import { ESCaseAttributes } from '../services/cases/types';
 import { handleExport } from './import_export/export';
diff --git a/x-pack/plugins/cases/server/saved_object_types/comments.ts b/x-pack/plugins/cases/server/saved_object_types/comments.ts
index 06a15fab14e43..8fe3c67d160a4 100644
--- a/x-pack/plugins/cases/server/saved_object_types/comments.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/comments.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_COMMENT_SAVED_OBJECT } from '../../common/constants';
 import { createCommentsMigrations, CreateCommentsMigrationsDeps } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/configure.ts b/x-pack/plugins/cases/server/saved_object_types/configure.ts
index c9303b848dc23..6dac42da7fb46 100644
--- a/x-pack/plugins/cases/server/saved_object_types/configure.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/configure.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_CONFIGURE_SAVED_OBJECT } from '../../common/constants';
 import { configureMigrations } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts b/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts
index b9bb275f080cf..a8d5ccf605158 100644
--- a/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../common/constants';
 import { connectorMappingsMigrations } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts b/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
index 54610e62e1eff..78710558793fc 100644
--- a/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
@@ -11,7 +11,7 @@ import {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsExportTransformContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { CaseUserActionAttributes, CommentAttributes } from '../../../common/api';
 import {
   CASE_COMMENT_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
index 2510a80e62b3a..bdc6b6ca18e64 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectSanitizedDoc } from 'kibana/server';
+import { SavedObjectSanitizedDoc } from '@kbn/core/server';
 import {
   CaseAttributes,
   CaseFullExternalService,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
index 7ab22781d77e6..eaa93a585015f 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
@@ -8,11 +8,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { cloneDeep, unset } from 'lodash';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { addOwnerToSO, SanitizedCaseOwner } from '.';
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../src/core/server';
 import { ESConnectorFields } from '../../services';
 import { ConnectorTypes } from '../../../common/api';
 import {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts
index 837a1e4f10d70..5dc48b3c1c92c 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts
@@ -19,18 +19,15 @@ import {
 } from '../../../common/utils/markdown_plugins/utils';
 import { CommentType } from '../../../common/api';
 
-import { savedObjectsServiceMock } from '../../../../../../src/core/server/mocks';
-import { makeLensEmbeddableFactory } from '../../../../lens/server/embeddable/make_lens_embeddable_factory';
-import { LensDocShape715 } from '../../../../lens/server';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
+import { makeLensEmbeddableFactory } from '@kbn/lens-plugin/server/embeddable/make_lens_embeddable_factory';
+import { LensDocShape715 } from '@kbn/lens-plugin/server';
 import {
   SavedObjectReference,
   SavedObjectsMigrationLogger,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/core/server';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
 import { GENERATED_ALERT, SUB_CASE_SAVED_OBJECT } from './constants';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
index e30d138cc657f..be7306657f6b4 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
@@ -7,18 +7,15 @@
 
 import { mapValues, trimEnd, mergeWith, cloneDeep, unset } from 'lodash';
 import type { SerializableRecord } from '@kbn/utility-types';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import {
   SavedObjectUnsanitizedDoc,
   SavedObjectSanitizedDoc,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
   SavedObjectMigrationContext,
-} from '../../../../../../src/core/server';
-import { LensServerPluginSetup } from '../../../../lens/server';
+} from '@kbn/core/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { CommentType } from '../../../common/api';
 import {
   isLensMarkdownNode,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
index 7d9189673079d..ac48732c07096 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectSanitizedDoc } from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { SavedObjectSanitizedDoc } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorTypes } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts
index f940069d33621..ebf0fc2dcfc19 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts
@@ -7,10 +7,7 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../src/core/server';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { ConnectorTypes } from '../../../common/api';
 import { addOwnerToSO, SanitizedCaseOwner } from '.';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts
index be656abb2d42c..e24bbdd424053 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../src/core/server';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 
 export { caseMigrations } from './cases';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts
index d4c60003782fd..4542cbc269683 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts
@@ -9,9 +9,9 @@ import {
   SavedObject,
   SavedObjectMigrationContext,
   SavedObjectsMigrationLogger,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { cloneDeep, omit, set } from 'lodash';
-import { migrationMocks } from 'src/core/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { removeRuleInformation } from './alerts';
 
 describe('alert user actions', () => {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts
index 8642c9b2af9ba..8c5ad2b254b60 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectMigrationContext,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { CommentRequestAlertType, CommentType } from '../../../../common/api';
 import { GENERATED_ALERT } from '../constants';
 import { logError } from '../utils';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts
index 15f3242b82a45..a26581721eee6 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts
@@ -12,8 +12,8 @@ import {
   SavedObjectSanitizedDoc,
   SavedObjectsMigrationLogger,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import {
   CASE_USER_ACTION_SAVED_OBJECT,
   SECURITY_SOLUTION_OWNER,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts
index 00261cd578239..c22b5f8c89479 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts
@@ -14,7 +14,8 @@ import {
   SavedObjectReference,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import {
   CaseAttributes,
   CaseConnector,
@@ -27,7 +28,6 @@ import {
   PUSH_CONNECTOR_ID_REFERENCE_NAME,
 } from '../../../common/constants';
 import { getNoneCaseConnector } from '../../../common/utils';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../../actions/server';
 import { UserActionVersion800 } from './types';
 import { logError } from '../utils';
 import { USER_ACTION_OLD_ID_REF_NAME, USER_ACTION_OLD_PUSH_ID_REF_NAME } from './constants';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts
index d977e470a7fe3..eaabacf6ed93e 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts
@@ -7,11 +7,8 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { addOwnerToSO, SanitizedCaseOwner } from '..';
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../../src/core/server';
 
 import { ConnectorTypes } from '../../../../common/api';
 import { removeRuleInformation } from './alerts';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts
index 2b18eb48f9d0e..7ac7711b79db3 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { CommentType } from '../../../../common/api';
 import {
   CASE_USER_ACTION_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts
index 0c2974a73a129..0a04c858e7d4d 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts
@@ -14,7 +14,7 @@ import {
   SavedObjectReference,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   Actions,
   ActionTypes,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts
index 565688cd6ac3c..3284c09df274f 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsMigrationLogger } from 'kibana/server';
-import { migrationMocks } from '../../../../../../src/core/server/mocks';
+import { SavedObjectsMigrationLogger } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { logError } from './utils';
 
 describe('migration utils', () => {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts
index 993d70181974d..65c1d42271845 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogMeta, SavedObjectMigrationContext } from '../../../../../../src/core/server';
+import { LogMeta, SavedObjectMigrationContext } from '@kbn/core/server';
 
 interface MigrationLogMeta extends LogMeta {
   migrations: {
diff --git a/x-pack/plugins/cases/server/saved_object_types/telemetry.ts b/x-pack/plugins/cases/server/saved_object_types/telemetry.ts
index 8fb643d2e7839..932fc39a6b180 100644
--- a/x-pack/plugins/cases/server/saved_object_types/telemetry.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/telemetry.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_TELEMETRY_SAVED_OBJECT } from '../../common/constants';
 
 export const casesTelemetrySavedObjectType: SavedObjectsType = {
diff --git a/x-pack/plugins/cases/server/saved_object_types/user_actions.ts b/x-pack/plugins/cases/server/saved_object_types/user_actions.ts
index 0f06535fddb70..33a29c06517e2 100644
--- a/x-pack/plugins/cases/server/saved_object_types/user_actions.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/user_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_USER_ACTION_SAVED_OBJECT } from '../../common/constants';
 import { userActionsMigrations } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/services/alerts/index.test.ts b/x-pack/plugins/cases/server/services/alerts/index.test.ts
index 3104b85e0b0b9..02e58b3a4e5ac 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.test.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.test.ts
@@ -7,7 +7,7 @@
 
 import { CaseStatuses } from '../../../common/api';
 import { AlertService } from '.';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('updateAlertsStatus', () => {
   const esClient = elasticsearchServiceMock.createElasticsearchClient();
diff --git a/x-pack/plugins/cases/server/services/alerts/index.ts b/x-pack/plugins/cases/server/services/alerts/index.ts
index e205899ead380..69c44b30fec28 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.ts
@@ -8,16 +8,16 @@
 import pMap from 'p-map';
 import { isEmpty } from 'lodash';
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import {
+  ALERT_WORKFLOW_STATUS,
+  STATUS_VALUES,
+} from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import { CaseStatuses } from '../../../common/api';
 import { MAX_ALERTS_PER_CASE, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
 import { createCaseError } from '../../common/error';
 import { AlertInfo } from '../../common/types';
 import { UpdateAlertRequest } from '../../client/alerts/types';
-import {
-  ALERT_WORKFLOW_STATUS,
-  STATUS_VALUES,
-} from '../../../../rule_registry/common/technical_rule_data_field_names';
 import { AggregationBuilder, AggregationResponse } from '../../client/metrics/types';
 
 export class AlertService {
diff --git a/x-pack/plugins/cases/server/services/attachments/index.ts b/x-pack/plugins/cases/server/services/attachments/index.ts
index 1b52a6c2bf153..661fd2973d105 100644
--- a/x-pack/plugins/cases/server/services/attachments/index.ts
+++ b/x-pack/plugins/cases/server/services/attachments/index.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectReference,
   SavedObjectsClientContract,
   SavedObjectsUpdateOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { KueryNode } from '@kbn/es-query';
@@ -36,7 +36,13 @@ interface AttachedToCaseArgs extends ClientArgs {
 }
 
 type GetAllAlertsAttachToCaseArgs = AttachedToCaseArgs;
-type CountAlertsAttachedToCaseArgs = AttachedToCaseArgs;
+type AlertsAttachedToCaseArgs = AttachedToCaseArgs;
+
+interface AttachmentsAttachedToCaseArgs extends AttachedToCaseArgs {
+  attachmentType: CommentType;
+  aggregations: Record<string, estypes.AggregationsAggregationContainer>;
+}
+
 interface CountActionsAttachedToCaseArgs extends AttachedToCaseArgs {
   aggregations: Record<string, estypes.AggregationsAggregationContainer>;
 }
@@ -51,6 +57,14 @@ interface CreateAttachmentArgs extends ClientArgs {
   id: string;
 }
 
+interface BulkCreateAttachments extends ClientArgs {
+  attachments: Array<{
+    attributes: AttachmentAttributes;
+    references: SavedObjectReference[];
+    id: string;
+  }>;
+}
+
 interface UpdateArgs {
   attachmentId: string;
   updatedAttributes: AttachmentPatchAttributes;
@@ -71,52 +85,50 @@ interface CommentStats {
 export class AttachmentService {
   constructor(private readonly log: Logger) {}
 
-  public async countAlertsAttachedToCase({
-    unsecuredSavedObjectsClient,
-    caseId,
-    filter,
-  }: CountAlertsAttachedToCaseArgs): Promise<number | undefined> {
+  public async countAlertsAttachedToCase(
+    params: AlertsAttachedToCaseArgs
+  ): Promise<number | undefined> {
     try {
-      this.log.debug(`Attempting to count alerts for case id ${caseId}`);
-      const alertsFilter = buildFilter({
-        filters: [CommentType.alert],
-        field: 'type',
-        operator: 'or',
-        type: CASE_COMMENT_SAVED_OBJECT,
-      });
-
-      const combinedFilter = combineFilters([alertsFilter, filter]);
-
-      const response = await unsecuredSavedObjectsClient.find<
-        AttachmentAttributes,
-        { alerts: { value: number } }
-      >({
-        type: CASE_COMMENT_SAVED_OBJECT,
-        hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
-        page: 1,
-        perPage: 1,
-        sortField: defaultSortField,
-        aggs: this.buildCountAlertsAggs(),
-        filter: combinedFilter,
+      this.log.debug(`Attempting to count alerts for case id ${params.caseId}`);
+      const res = await this.executeCaseAggregations<{ alerts: { value: number } }>({
+        ...params,
+        attachmentType: CommentType.alert,
+        aggregations: this.buildAlertsAggs('cardinality'),
       });
 
-      return response.aggregations?.alerts?.value;
+      return res?.alerts?.value;
     } catch (error) {
-      this.log.error(`Error while counting alerts for case id ${caseId}: ${error}`);
+      this.log.error(`Error while counting alerts for case id ${params.caseId}: ${error}`);
       throw error;
     }
   }
 
-  private buildCountAlertsAggs(): Record<string, estypes.AggregationsAggregationContainer> {
+  private buildAlertsAggs(agg: string): Record<string, estypes.AggregationsAggregationContainer> {
     return {
       alerts: {
-        cardinality: {
+        [agg]: {
           field: `${CASE_COMMENT_SAVED_OBJECT}.attributes.alertId`,
         },
       },
     };
   }
 
+  public async valueCountAlertsAttachedToCase(params: AlertsAttachedToCaseArgs): Promise<number> {
+    try {
+      this.log.debug(`Attempting to value count alerts for case id ${params.caseId}`);
+      const res = await this.executeCaseAggregations<{ alerts: { value: number } }>({
+        ...params,
+        attachmentType: CommentType.alert,
+        aggregations: this.buildAlertsAggs('value_count'),
+      });
+
+      return res?.alerts?.value ?? 0;
+    } catch (error) {
+      this.log.error(`Error while value counting alerts for case id ${params.caseId}: ${error}`);
+      throw error;
+    }
+  }
+
   /**
    * Retrieves all the alerts attached to a case.
    */
@@ -158,29 +170,27 @@ export class AttachmentService {
   }
 
   /**
-   * Executes the aggregations against the actions attached to a case.
+   * Executes the aggregations against a type of attachment attached to a case.
    */
-  public async executeCaseActionsAggregations({
+  public async executeCaseAggregations<Agg extends AggregationResponse = AggregationResponse>({
     unsecuredSavedObjectsClient,
     caseId,
     filter,
     aggregations,
-  }: CountActionsAttachedToCaseArgs): Promise<AggregationResponse | undefined> {
+    attachmentType,
+  }: AttachmentsAttachedToCaseArgs): Promise<Agg | undefined> {
     try {
-      this.log.debug(`Attempting to count actions for case id ${caseId}`);
-      const actionsFilter = buildFilter({
-        filters: [CommentType.actions],
+      this.log.debug(`Attempting to aggregate for case id ${caseId}`);
+      const attachmentFilter = buildFilter({
+        filters: attachmentType,
         field: 'type',
         operator: 'or',
         type: CASE_COMMENT_SAVED_OBJECT,
       });
 
-      const combinedFilter = combineFilters([actionsFilter, filter]);
+      const combinedFilter = combineFilters([attachmentFilter, filter]);
 
-      const response = await unsecuredSavedObjectsClient.find<
-        AttachmentAttributes,
-        AggregationResponse
-      >({
+      const response = await unsecuredSavedObjectsClient.find<AttachmentAttributes, Agg>({
         type: CASE_COMMENT_SAVED_OBJECT,
         hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
         page: 1,
@@ -192,7 +202,22 @@ export class AttachmentService {
 
       return response.aggregations;
     } catch (error) {
-      this.log.error(`Error while counting actions for case id ${caseId}: ${error}`);
+      this.log.error(`Error while executing aggregation for case id ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Executes the aggregations against the actions attached to a case.
+   */
+  public async executeCaseActionsAggregations(
+    params: CountActionsAttachedToCaseArgs
+  ): Promise<AggregationResponse | undefined> {
+    try {
+      this.log.debug(`Attempting to count actions for case id ${params.caseId}`);
+      return await this.executeCaseAggregations({ ...params, attachmentType: CommentType.actions });
+    } catch (error) {
+      this.log.error(`Error while counting actions for case id ${params.caseId}: ${error}`);
       throw error;
     }
   }
@@ -245,6 +270,18 @@ export class AttachmentService {
     }
   }
 
+  public async bulkCreate({ unsecuredSavedObjectsClient, attachments }: BulkCreateAttachments) {
+    try {
+      this.log.debug(`Attempting to bulk create attachments`);
+      return await unsecuredSavedObjectsClient.bulkCreate(
+        attachments.map((attachment) => ({ type: CASE_COMMENT_SAVED_OBJECT, ...attachment }))
+      );
+    } catch (error) {
+      this.log.error(`Error on bulk create attachments: ${error}`);
+      throw error;
+    }
+  }
+
   public async update({
     unsecuredSavedObjectsClient,
     attachmentId,
diff --git a/x-pack/plugins/cases/server/services/cases/index.test.ts b/x-pack/plugins/cases/server/services/cases/index.test.ts
index 821f0a8aaa2f9..7e576b83404db 100644
--- a/x-pack/plugins/cases/server/services/cases/index.test.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.test.ts
@@ -15,7 +15,7 @@
 
 import { CaseAttributes, CaseConnector, CaseFullExternalService } from '../../../common/api';
 import { CASE_SAVED_OBJECT } from '../../../common/constants';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   SavedObject,
   SavedObjectReference,
@@ -23,8 +23,8 @@ import {
   SavedObjectsFindResult,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { loggerMock } from '@kbn/logging-mocks';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import { getNoneCaseConnector } from '../../common/utils';
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index 684edcc077f8e..26557d4ea7748 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -16,12 +16,12 @@ import {
   SavedObjectsBulkUpdateResponse,
   SavedObjectsUpdateResponse,
   SavedObjectsResolveResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { nodeBuilder, KueryNode } from '@kbn/es-query';
 
-import { SecurityPluginSetup } from '../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/services/cases/transform.test.ts b/x-pack/plugins/cases/server/services/cases/transform.test.ts
index 7235bc26bcf73..93b417c5b73b4 100644
--- a/x-pack/plugins/cases/server/services/cases/transform.test.ts
+++ b/x-pack/plugins/cases/server/services/cases/transform.test.ts
@@ -16,7 +16,7 @@ import {
   transformSavedObjectToExternalModel,
   transformUpdateResponseToExternalModel,
 } from './transform';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorTypes } from '../../../common/api';
 import {
   CONNECTOR_ID_REFERENCE_NAME,
diff --git a/x-pack/plugins/cases/server/services/cases/transform.ts b/x-pack/plugins/cases/server/services/cases/transform.ts
index 956bc3953595e..c013475bd2e9c 100644
--- a/x-pack/plugins/cases/server/services/cases/transform.ts
+++ b/x-pack/plugins/cases/server/services/cases/transform.ts
@@ -14,8 +14,8 @@ import {
   SavedObjectsBulkUpdateResponse,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ESCaseAttributes, ExternalServicesWithoutConnectorId } from './types';
 import {
   CONNECTOR_ID_REFERENCE_NAME,
diff --git a/x-pack/plugins/cases/server/services/configure/index.test.ts b/x-pack/plugins/cases/server/services/configure/index.test.ts
index 94df7c21a82a9..dbe5a157994da 100644
--- a/x-pack/plugins/cases/server/services/configure/index.test.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.test.ts
@@ -12,7 +12,7 @@ import {
   ConnectorTypes,
 } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   SavedObject,
   SavedObjectReference,
@@ -20,8 +20,8 @@ import {
   SavedObjectsFindResult,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { loggerMock } from '@kbn/logging-mocks';
 import { CaseConfigureService } from '.';
 import { ESCasesConfigureAttributes } from './types';
diff --git a/x-pack/plugins/cases/server/services/configure/index.ts b/x-pack/plugins/cases/server/services/configure/index.ts
index 0c22d95a5ee33..2b8bc3c6b7cc8 100644
--- a/x-pack/plugins/cases/server/services/configure/index.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.ts
@@ -11,13 +11,13 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { SavedObjectFindOptionsKueryNode } from '../../common/types';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import { CasesConfigureAttributes, CasesConfigurePatch } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT } from '../../../common/constants';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import {
   transformFieldsToESModel,
   transformESConnectorToExternalModel,
diff --git a/x-pack/plugins/cases/server/services/connector_mappings/index.ts b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
index 46b9f4bac0064..302a546ca69ea 100644
--- a/x-pack/plugins/cases/server/services/connector_mappings/index.ts
+++ b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference, SavedObjectsClientContract } from 'kibana/server';
+import { Logger, SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../../common/constants';
 import { ConnectorMappings } from '../../../common/api';
diff --git a/x-pack/plugins/cases/server/services/connector_reference_handler.ts b/x-pack/plugins/cases/server/services/connector_reference_handler.ts
index c6249243bf981..f11c3317f690e 100644
--- a/x-pack/plugins/cases/server/services/connector_reference_handler.ts
+++ b/x-pack/plugins/cases/server/services/connector_reference_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { NONE_CONNECTOR_ID } from '../../common/api';
 
 interface Reference {
diff --git a/x-pack/plugins/cases/server/services/index.ts b/x-pack/plugins/cases/server/services/index.ts
index 9a43aa43c2874..bfd551d27e23e 100644
--- a/x-pack/plugins/cases/server/services/index.ts
+++ b/x-pack/plugins/cases/server/services/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { ConnectorTypes } from '../../common/api';
 
 export { CasesService } from './cases';
diff --git a/x-pack/plugins/cases/server/services/mocks.ts b/x-pack/plugins/cases/server/services/mocks.ts
index 8e21db9ccb4e0..a9f3d427bba65 100644
--- a/x-pack/plugins/cases/server/services/mocks.ts
+++ b/x-pack/plugins/cases/server/services/mocks.ts
@@ -74,6 +74,7 @@ export const createUserActionServiceMock = (): CaseUserActionServiceMock => {
     bulkCreateCaseDeletion: jest.fn(),
     bulkCreateUpdateCase: jest.fn(),
     bulkCreateAttachmentDeletion: jest.fn(),
+    bulkCreateAttachmentCreation: jest.fn(),
     createUserAction: jest.fn(),
     create: jest.fn(),
     getAll: jest.fn(),
@@ -102,12 +103,15 @@ export const createAttachmentServiceMock = (): AttachmentServiceMock => {
     get: jest.fn(),
     delete: jest.fn(),
     create: jest.fn(),
+    bulkCreate: jest.fn(),
     update: jest.fn(),
     bulkUpdate: jest.fn(),
     getAllAlertsAttachToCase: jest.fn(),
     countAlertsAttachedToCase: jest.fn(),
     executeCaseActionsAggregations: jest.fn(),
     getCaseCommentStats: jest.fn(),
+    valueCountAlertsAttachedToCase: jest.fn(),
+    executeCaseAggregations: jest.fn(),
   };
 
   // the cast here is required because jest.Mocked tries to include private members and would throw an error
diff --git a/x-pack/plugins/cases/server/services/test_utils.ts b/x-pack/plugins/cases/server/services/test_utils.ts
index c2b24c42c8a69..16c6445af774f 100644
--- a/x-pack/plugins/cases/server/services/test_utils.ts
+++ b/x-pack/plugins/cases/server/services/test_utils.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference, SavedObjectsFindResult } from 'kibana/server';
+import { SavedObject, SavedObjectReference, SavedObjectsFindResult } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ESConnectorFields } from '.';
 import { CONNECTOR_ID_REFERENCE_NAME, PUSH_CONNECTOR_ID_REFERENCE_NAME } from '../common/constants';
 import {
@@ -18,7 +19,6 @@ import {
 } from '../../common/api';
 import { CASE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../common/constants';
 import { ESCaseAttributes, ExternalServicesWithoutConnectorId } from './cases/types';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../actions/server';
 
 /**
  * This is only a utility interface to help with constructing test cases. After the migration, the ES format will no longer
diff --git a/x-pack/plugins/cases/server/services/transform.test.ts b/x-pack/plugins/cases/server/services/transform.test.ts
index f7f49d285b80c..32bce1cf08231 100644
--- a/x-pack/plugins/cases/server/services/transform.test.ts
+++ b/x-pack/plugins/cases/server/services/transform.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../actions/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorTypes } from '../../common/api';
 import { createESJiraConnector, createJiraConnector } from './test_utils';
 import {
diff --git a/x-pack/plugins/cases/server/services/transform.ts b/x-pack/plugins/cases/server/services/transform.ts
index 8956bfe42954e..e8467a9031f13 100644
--- a/x-pack/plugins/cases/server/services/transform.ts
+++ b/x-pack/plugins/cases/server/services/transform.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { CaseConnector, ConnectorTypeFields } from '../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../actions/server';
 import { getNoneCaseConnector } from '../common/utils';
 import { ESCaseConnector, ESConnectorFields } from '.';
 
diff --git a/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts b/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts
index 90eddb80361b8..d4123bda14762 100644
--- a/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../../common/constants';
 import {
   CASE_REF_NAME,
@@ -20,7 +21,6 @@ import {
   NONE_CONNECTOR_ID,
   User,
 } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import {
   BuilderParameters,
   BuilderReturnValue,
diff --git a/x-pack/plugins/cases/server/services/user_actions/index.test.ts b/x-pack/plugins/cases/server/services/user_actions/index.test.ts
index 084f319cbb1e0..eb1b57622d24d 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.test.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.test.ts
@@ -7,9 +7,9 @@
 
 import { get } from 'lodash';
 import { loggerMock } from '@kbn/logging-mocks';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { SavedObject, SavedObjectsFindResponse, SavedObjectsFindResult } from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { SavedObject, SavedObjectsFindResponse, SavedObjectsFindResult } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import {
   Actions,
   ActionTypes,
diff --git a/x-pack/plugins/cases/server/services/user_actions/index.ts b/x-pack/plugins/cases/server/services/user_actions/index.ts
index c80d2d6da4c98..7739437f9e607 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.ts
@@ -14,7 +14,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { KueryNode } from '@kbn/es-query';
@@ -91,7 +91,7 @@ interface BulkCreateBulkUpdateCaseUserActions extends ClientArgs {
   user: User;
 }
 
-interface BulkCreateAttachmentDeletionUserAction extends Omit<CommonUserActionArgs, 'owner'> {
+interface BulkCreateAttachmentUserAction extends Omit<CommonUserActionArgs, 'owner'> {
   attachments: Array<{ id: string; owner: string; attachment: CommentRequest }>;
 }
 
@@ -241,18 +241,19 @@ export class CaseUserActionService {
     await this.bulkCreate({ unsecuredSavedObjectsClient, actions: userActionsWithReferences });
   }
 
-  public async bulkCreateAttachmentDeletion({
+  private async bulkCreateAttachment({
     unsecuredSavedObjectsClient,
     caseId,
     attachments,
     user,
-  }: BulkCreateAttachmentDeletionUserAction): Promise<void> {
-    this.log.debug(`Attempting to create a create case user action`);
+    action = Actions.create,
+  }: BulkCreateAttachmentUserAction): Promise<void> {
+    this.log.debug(`Attempting to create a bulk create case user action`);
     const userActionsWithReferences = attachments.reduce<BuilderReturnValue[]>(
       (acc, attachment) => {
         const userActionBuilder = this.builderFactory.getBuilder(ActionTypes.comment);
-        const deleteCommentUserAction = userActionBuilder?.build({
-          action: Actions.delete,
+        const commentUserAction = userActionBuilder?.build({
+          action,
           caseId,
           user,
           owner: attachment.owner,
@@ -260,11 +261,11 @@ export class CaseUserActionService {
           payload: { attachment: attachment.attachment },
         });
 
-        if (deleteCommentUserAction == null) {
+        if (commentUserAction == null) {
           return acc;
         }
 
-        return [...acc, deleteCommentUserAction];
+        return [...acc, commentUserAction];
       },
       []
     );
@@ -272,6 +273,36 @@ export class CaseUserActionService {
     await this.bulkCreate({ unsecuredSavedObjectsClient, actions: userActionsWithReferences });
   }
 
+  public async bulkCreateAttachmentDeletion({
+    unsecuredSavedObjectsClient,
+    caseId,
+    attachments,
+    user,
+  }: BulkCreateAttachmentUserAction): Promise<void> {
+    await this.bulkCreateAttachment({
+      unsecuredSavedObjectsClient,
+      caseId,
+      attachments,
+      user,
+      action: Actions.delete,
+    });
+  }
+
+  public async bulkCreateAttachmentCreation({
+    unsecuredSavedObjectsClient,
+    caseId,
+    attachments,
+    user,
+  }: BulkCreateAttachmentUserAction): Promise<void> {
+    await this.bulkCreateAttachment({
+      unsecuredSavedObjectsClient,
+      caseId,
+      attachments,
+      user,
+      action: Actions.create,
+    });
+  }
+
   public async createUserAction<T extends keyof BuilderParameters>({
     unsecuredSavedObjectsClient,
     action,
diff --git a/x-pack/plugins/cases/server/services/user_actions/types.ts b/x-pack/plugins/cases/server/services/user_actions/types.ts
index 435e4169323a1..f681a9186181c 100644
--- a/x-pack/plugins/cases/server/services/user_actions/types.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   CasePostRequest,
   CaseSettings,
diff --git a/x-pack/plugins/cases/server/telemetry/index.ts b/x-pack/plugins/cases/server/telemetry/index.ts
index 6031cc0746bbb..fdba46d01240f 100644
--- a/x-pack/plugins/cases/server/telemetry/index.ts
+++ b/x-pack/plugins/cases/server/telemetry/index.ts
@@ -11,9 +11,9 @@ import {
   Logger,
   PluginInitializerContext,
   SavedObjectsErrorHelpers,
-} from '../../../../../src/core/server';
-import { TaskManagerSetupContract } from '../../../task_manager/server';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { collectTelemetryData } from './collect_telemetry_data';
 import {
   CASE_TELEMETRY_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts b/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts
index 2d4a550977b69..1cb02f1065be2 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  loggingSystemMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getAlertsTelemetryData } from './alerts';
 
 describe('alerts', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts b/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
index d7d2b4d82d8b8..f41ec19a0045a 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResponse } from 'kibana/server';
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getCasesTelemetryData } from './cases';
 
 describe('getCasesTelemetryData', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts b/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts
index be37d3dc946bf..e21b008b39fcb 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  loggingSystemMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getUserCommentsTelemetryData } from './comments';
 
 describe('comments', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts b/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts
index 88253a8a4b2d3..6fd1da4903ed6 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  loggingSystemMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getConfigurationTelemetryData } from './configuration';
 
 describe('configuration', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts b/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts
index 79b102db835a9..a0ecce25f3bf1 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getConnectorsTelemetryData } from './connectors';
 
 describe('getConnectorsTelemetryData', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/connectors.ts b/x-pack/plugins/cases/server/telemetry/queries/connectors.ts
index d9166e10c81c3..efafbfb09feb9 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/connectors.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/connectors.ts
@@ -7,7 +7,7 @@
 
 import { AggregationsAggregationContainer } from '@elastic/elasticsearch/lib/api/types';
 import { KueryNode } from '@kbn/es-query';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { CASE_USER_ACTION_SAVED_OBJECT } from '../../../common/constants';
 import { buildFilter } from '../../client/utils';
 import {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts b/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts
index c84aaf401264e..38ca202514af1 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getPushedTelemetryData } from './pushes';
 
 describe('pushes', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts b/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts
index df857523e4c3d..c01c8d329c5b0 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getUserActionsTelemetryData } from './user_actions';
 
 describe('user_actions', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts b/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts
index 13bcc51ab0be1..74687f6218ef9 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import {
   findValueInBuckets,
   getAggregationsBuckets,
diff --git a/x-pack/plugins/cases/server/telemetry/queries/utils.ts b/x-pack/plugins/cases/server/telemetry/queries/utils.ts
index f404e62b17fc7..70e719ef9fa31 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/utils.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/utils.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { KueryNode } from '@kbn/es-query';
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts b/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts
index 35433416434c4..d33e68597f107 100644
--- a/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts
+++ b/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { Logger } from '@kbn/core/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import { CASES_TELEMETRY_TASK_NAME } from '../../common/constants';
 
 const MINUTES_ON_HALF_DAY = 60 * 12;
diff --git a/x-pack/plugins/cases/server/telemetry/types.ts b/x-pack/plugins/cases/server/telemetry/types.ts
index e39f657b76be9..ec880855f3302 100644
--- a/x-pack/plugins/cases/server/telemetry/types.ts
+++ b/x-pack/plugins/cases/server/telemetry/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ISavedObjectsRepository, Logger } from 'kibana/server';
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { ISavedObjectsRepository, Logger } from '@kbn/core/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface Buckets {
   buckets: Array<{
diff --git a/x-pack/plugins/cases/server/types.ts b/x-pack/plugins/cases/server/types.ts
index c3b8e0a273221..2154aec6f5324 100644
--- a/x-pack/plugins/cases/server/types.ts
+++ b/x-pack/plugins/cases/server/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, CustomRequestHandlerContext } from '@kbn/core/server';
 import {
   ActionTypeConfig,
   ActionTypeSecrets,
   ActionTypeParams,
   ActionType,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../actions/server/types';
+} from '@kbn/actions-plugin/server/types';
 import { CasesClient } from './client';
 
 export interface CaseRequestContext {
@@ -22,9 +22,9 @@ export interface CaseRequestContext {
 /**
  * @internal
  */
-export interface CasesRequestHandlerContext extends RequestHandlerContext {
+export type CasesRequestHandlerContext = CustomRequestHandlerContext<{
   cases: CaseRequestContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/cloud/public/fullstory.ts b/x-pack/plugins/cloud/public/fullstory.ts
deleted file mode 100644
index 602b1c4cc63d3..0000000000000
--- a/x-pack/plugins/cloud/public/fullstory.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { sha256 } from 'js-sha256'; // loaded here to reduce page load bundle size when FullStory is disabled
-import type { IBasePath, PackageInfo } from '../../../../src/core/public';
-
-export interface FullStoryDeps {
-  basePath: IBasePath;
-  orgId: string;
-  packageInfo: PackageInfo;
-}
-
-export type FullstoryUserVars = Record<string, any>;
-export type FullstoryVars = Record<string, any>;
-
-export interface FullStoryApi {
-  identify(userId: string, userVars?: FullstoryUserVars): void;
-  setVars(pageName: string, vars?: FullstoryVars): void;
-  setUserVars(userVars?: FullstoryUserVars): void;
-  event(eventName: string, eventProperties: Record<string, any>): void;
-}
-
-export interface FullStoryService {
-  fullStory: FullStoryApi;
-  sha256: typeof sha256;
-}
-
-export const initializeFullStory = ({
-  basePath,
-  orgId,
-  packageInfo,
-}: FullStoryDeps): FullStoryService => {
-  // @ts-expect-error
-  window._fs_debug = false;
-  // @ts-expect-error
-  window._fs_host = 'fullstory.com';
-  // @ts-expect-error
-  window._fs_script = basePath.prepend(`/internal/cloud/${packageInfo.buildNum}/fullstory.js`);
-  // @ts-expect-error
-  window._fs_org = orgId;
-  // @ts-expect-error
-  window._fs_namespace = 'FSKibana';
-
-  /* eslint-disable */
-  (function(m,n,e,t,l,o,g,y){
-      if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
-      // @ts-expect-error
-      g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
-      // @ts-expect-error
-      o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src=_fs_script;
-      // @ts-expect-error
-      y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
-      // @ts-expect-error
-      g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
-      // @ts-expect-error
-      g.anonymize=function(){g.identify(!!0)};
-      // @ts-expect-error
-      g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
-      // @ts-expect-error
-      g.log = function(a,b){g("log",[a,b])};
-      // @ts-expect-error
-      g.consent=function(a){g("consent",!arguments.length||a)};
-      // @ts-expect-error
-      g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
-      // @ts-expect-error
-      g.clearUserCookie=function(){};
-      // @ts-expect-error
-      g.setVars=function(n, p){g('setVars',[n,p]);};
-      // @ts-expect-error
-      g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
-      // @ts-expect-error
-      if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
-      // @ts-expect-error
-      g._v="1.3.0";
-      // @ts-expect-error
-  })(window,document,window['_fs_namespace'],'script','user');
-  /* eslint-enable */
-
-  // @ts-expect-error
-  const fullStory: FullStoryApi = window.FSKibana;
-
-  return {
-    fullStory,
-    sha256,
-  };
-};
diff --git a/x-pack/plugins/cloud/public/index.ts b/x-pack/plugins/cloud/public/index.ts
index 73aa3a350e8ea..d50798cb15cd2 100644
--- a/x-pack/plugins/cloud/public/index.ts
+++ b/x-pack/plugins/cloud/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { CloudPlugin } from './plugin';
 
 export type { CloudSetup, CloudConfigType, CloudStart } from './plugin';
diff --git a/x-pack/plugins/cloud/public/mocks.tsx b/x-pack/plugins/cloud/public/mocks.tsx
index 5bef215ffb0ea..f31596f3930f5 100644
--- a/x-pack/plugins/cloud/public/mocks.tsx
+++ b/x-pack/plugins/cloud/public/mocks.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 
 import { CloudStart } from '.';
-import { ServicesProvider } from '../public/services';
+import { ServicesProvider } from './services';
 
 function createSetupMock() {
   return {
diff --git a/x-pack/plugins/cloud/public/plugin.test.mocks.ts b/x-pack/plugins/cloud/public/plugin.test.mocks.ts
deleted file mode 100644
index 1c185d0194912..0000000000000
--- a/x-pack/plugins/cloud/public/plugin.test.mocks.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { sha256 } from 'js-sha256';
-import type { FullStoryDeps, FullStoryApi, FullStoryService } from './fullstory';
-
-export const fullStoryApiMock: jest.Mocked<FullStoryApi> = {
-  event: jest.fn(),
-  setUserVars: jest.fn(),
-  setVars: jest.fn(),
-  identify: jest.fn(),
-};
-export const initializeFullStoryMock = jest.fn<FullStoryService, [FullStoryDeps]>(() => ({
-  fullStory: fullStoryApiMock,
-  sha256,
-}));
-jest.doMock('./fullstory', () => {
-  return { initializeFullStory: initializeFullStoryMock };
-});
diff --git a/x-pack/plugins/cloud/public/plugin.test.ts b/x-pack/plugins/cloud/public/plugin.test.ts
index edbf724e25390..5e0294178a5da 100644
--- a/x-pack/plugins/cloud/public/plugin.test.ts
+++ b/x-pack/plugins/cloud/public/plugin.test.ts
@@ -6,17 +6,16 @@
  */
 
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
-import { homePluginMock } from 'src/plugins/home/public/mocks';
-import { securityMock } from '../../security/public/mocks';
-import { fullStoryApiMock, initializeFullStoryMock } from './plugin.test.mocks';
-import { CloudPlugin, CloudConfigType, loadFullStoryUserId } from './plugin';
-import { Observable, Subject } from 'rxjs';
-import { KibanaExecutionContext } from 'kibana/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+import { CloudPlugin, CloudConfigType, loadUserId } from './plugin';
+import { firstValueFrom, Observable, Subject } from 'rxjs';
+import { KibanaExecutionContext } from '@kbn/core/public';
 
 describe('Cloud Plugin', () => {
   describe('#setup', () => {
-    describe('setupFullstory', () => {
+    describe('setupFullStory', () => {
       beforeEach(() => {
         jest.clearAllMocks();
       });
@@ -65,72 +64,82 @@ describe('Cloud Plugin', () => {
         );
 
         const setup = plugin.setup(coreSetup, securityEnabled ? { security: securitySetup } : {});
-        // Wait for fullstory dynamic import to resolve
+        // Wait for FullStory dynamic import to resolve
         await new Promise((r) => setImmediate(r));
 
-        return { initContext, plugin, setup };
+        return { initContext, plugin, setup, coreSetup };
       };
 
-      it('calls initializeFullStory with correct args when enabled and org_id are set', async () => {
-        const { initContext } = await setupPlugin({
+      test('register the shipper FullStory with correct args when enabled and org_id are set', async () => {
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        expect(initializeFullStoryMock).toHaveBeenCalled();
-        const { basePath, orgId, packageInfo } = initializeFullStoryMock.mock.calls[0][0];
-        expect(basePath.prepend).toBeDefined();
-        expect(orgId).toEqual('foo');
-        expect(packageInfo).toEqual(initContext.env.packageInfo);
+        expect(coreSetup.analytics.registerShipper).toHaveBeenCalled();
+        expect(coreSetup.analytics.registerShipper).toHaveBeenCalledWith(expect.anything(), {
+          fullStoryOrgId: 'foo',
+          scriptUrl: '/internal/cloud/100/fullstory.js',
+          namespace: 'FSKibana',
+        });
       });
 
-      it('calls FS.identify with hashed user ID when security is available', async () => {
-        await setupPlugin({
+      test('register the context provider for the cloud user with hashed user ID when security is available', async () => {
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(
-          '5ef112cfdae3dea57097bc276e275b2816e73ef2a398dc0ffaf5b6b4e3af2041',
-          {
-            version_str: 'version',
-            version_major_int: -1,
-            version_minor_int: -1,
-            version_patch_int: -1,
-            org_id_str: 'cloudId',
-          }
-        );
+        expect(coreSetup.analytics.registerContextProvider).toHaveBeenCalled();
+
+        const [{ context$ }] = coreSetup.analytics.registerContextProvider.mock.calls.find(
+          ([{ name }]) => name === 'cloud_user_id'
+        )!;
+
+        await expect(firstValueFrom(context$)).resolves.toEqual({
+          userId: '5ef112cfdae3dea57097bc276e275b2816e73ef2a398dc0ffaf5b6b4e3af2041',
+        });
       });
 
       it('user hash includes org id', async () => {
-        await setupPlugin({
+        const { coreSetup: coreSetup1 } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' }, id: 'esOrg1' },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        const hashId1 = fullStoryApiMock.identify.mock.calls[0][0];
+        const [{ context$: context1$ }] =
+          coreSetup1.analytics.registerContextProvider.mock.calls.find(
+            ([{ name }]) => name === 'cloud_user_id'
+          )!;
+
+        const hashId1 = await firstValueFrom(context1$);
 
-        await setupPlugin({
+        const { coreSetup: coreSetup2 } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' }, id: 'esOrg2' },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        const hashId2 = fullStoryApiMock.identify.mock.calls[1][0];
+        const [{ context$: context2$ }] =
+          coreSetup2.analytics.registerContextProvider.mock.calls.find(
+            ([{ name }]) => name === 'cloud_user_id'
+          )!;
+
+        const hashId2 = await firstValueFrom(context2$);
 
         expect(hashId1).not.toEqual(hashId2);
       });
 
-      it('calls FS.setVars everytime an app changes', async () => {
+      it('emits the execution context provider everytime an app changes', async () => {
         const currentContext$ = new Subject<KibanaExecutionContext>();
-        const { plugin } = await setupPlugin({
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           currentUserProps: {
             username: '1234',
@@ -138,23 +147,34 @@ describe('Cloud Plugin', () => {
           currentContext$,
         });
 
+        const [{ context$ }] = coreSetup.analytics.registerContextProvider.mock.calls.find(
+          ([{ name }]) => name === 'execution_context'
+        )!;
+
+        let latestContext;
+        context$.subscribe((context) => {
+          latestContext = context;
+        });
+
         // takes the app name
-        expect(fullStoryApiMock.setVars).not.toHaveBeenCalled();
+        expect(latestContext).toBeUndefined();
         currentContext$.next({
           name: 'App1',
           description: '123',
         });
 
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
+        await new Promise((r) => setImmediate(r));
+
+        expect(latestContext).toEqual({
           pageName: 'App1',
-          app_id_str: 'App1',
+          applicationId: 'App1',
         });
 
         // context clear
         currentContext$.next({});
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
-          pageName: 'App1',
-          app_id_str: 'App1',
+        expect(latestContext).toEqual({
+          pageName: '',
+          applicationId: 'unknown',
         });
 
         // different app
@@ -163,11 +183,11 @@ describe('Cloud Plugin', () => {
           page: 'page2',
           id: '123',
         });
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
+        expect(latestContext).toEqual({
           pageName: 'App2:page2',
-          app_id_str: 'App2',
-          page_str: 'page2',
-          ent_id_str: '123',
+          applicationId: 'App2',
+          page: 'page2',
+          entityId: '123',
         });
 
         // Back to first app
@@ -177,25 +197,25 @@ describe('Cloud Plugin', () => {
           id: '123',
         });
 
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
+        expect(latestContext).toEqual({
           pageName: 'App1:page3',
-          app_id_str: 'App1',
-          page_str: 'page3',
-          ent_id_str: '123',
+          applicationId: 'App1',
+          page: 'page3',
+          entityId: '123',
         });
-
-        expect(currentContext$.observers.length).toBe(1);
-        plugin.stop();
-        expect(currentContext$.observers.length).toBe(0);
       });
 
-      it('does not call FS.identify when security is not available', async () => {
-        await setupPlugin({
+      it('does not register the cloud user id context provider when security is not available', async () => {
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           securityEnabled: false,
         });
 
-        expect(fullStoryApiMock.identify).not.toHaveBeenCalled();
+        expect(
+          coreSetup.analytics.registerContextProvider.mock.calls.find(
+            ([{ name }]) => name === 'cloud_user_id'
+          )
+        ).toBeUndefined();
       });
 
       describe('with memory', () => {
@@ -219,58 +239,44 @@ describe('Cloud Plugin', () => {
           delete window.performance.memory;
         });
 
-        it('calls FS.event when security is available', async () => {
-          const { initContext } = await setupPlugin({
+        it('reports an event when security is available', async () => {
+          const { initContext, coreSetup } = await setupPlugin({
             config: { full_story: { enabled: true, org_id: 'foo' } },
             currentUserProps: {
               username: '1234',
             },
           });
 
-          expect(fullStoryApiMock.event).toHaveBeenCalledWith('Loaded Kibana', {
-            kibana_version_str: initContext.env.packageInfo.version,
-            memory_js_heap_size_limit_int: 3,
-            memory_js_heap_size_total_int: 2,
-            memory_js_heap_size_used_int: 1,
+          expect(coreSetup.analytics.reportEvent).toHaveBeenCalledWith('Loaded Kibana', {
+            kibana_version: initContext.env.packageInfo.version,
+            memory_js_heap_size_limit: 3,
+            memory_js_heap_size_total: 2,
+            memory_js_heap_size_used: 1,
           });
         });
       });
 
-      it('calls FS.event when security is not available', async () => {
-        const { initContext } = await setupPlugin({
+      it('reports an event when security is not available', async () => {
+        const { initContext, coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           securityEnabled: false,
         });
 
-        expect(fullStoryApiMock.event).toHaveBeenCalledWith('Loaded Kibana', {
-          kibana_version_str: initContext.env.packageInfo.version,
-        });
-      });
-
-      it('calls FS.event when FS.identify throws an error', async () => {
-        fullStoryApiMock.identify.mockImplementationOnce(() => {
-          throw new Error(`identify failed!`);
-        });
-        const { initContext } = await setupPlugin({
-          config: { full_story: { enabled: true, org_id: 'foo' } },
-          currentUserProps: {
-            username: '1234',
-          },
-        });
-
-        expect(fullStoryApiMock.event).toHaveBeenCalledWith('Loaded Kibana', {
-          kibana_version_str: initContext.env.packageInfo.version,
+        expect(coreSetup.analytics.reportEvent).toHaveBeenCalledWith('Loaded Kibana', {
+          kibana_version: initContext.env.packageInfo.version,
         });
       });
 
       it('does not call initializeFullStory when enabled=false', async () => {
-        await setupPlugin({ config: { full_story: { enabled: false, org_id: 'foo' } } });
-        expect(initializeFullStoryMock).not.toHaveBeenCalled();
+        const { coreSetup } = await setupPlugin({
+          config: { full_story: { enabled: false, org_id: 'foo' } },
+        });
+        expect(coreSetup.analytics.registerShipper).not.toHaveBeenCalled();
       });
 
       it('does not call initializeFullStory when org_id is undefined', async () => {
-        await setupPlugin({ config: { full_story: { enabled: true } } });
-        expect(initializeFullStoryMock).not.toHaveBeenCalled();
+        const { coreSetup } = await setupPlugin({ config: { full_story: { enabled: true } } });
+        expect(coreSetup.analytics.registerShipper).not.toHaveBeenCalled();
       });
     });
 
@@ -659,7 +665,7 @@ describe('Cloud Plugin', () => {
 
     it('returns principal ID when username specified', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockResolvedValue({
             username: '1234',
           }),
@@ -670,7 +676,7 @@ describe('Cloud Plugin', () => {
 
     it('returns undefined if getCurrentUser throws', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockRejectedValue(new Error(`Oh no!`)),
         })
       ).toBeUndefined();
@@ -678,7 +684,7 @@ describe('Cloud Plugin', () => {
 
     it('returns undefined if getCurrentUser returns undefined', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockResolvedValue(undefined),
         })
       ).toBeUndefined();
@@ -686,7 +692,7 @@ describe('Cloud Plugin', () => {
 
     it('returns undefined and logs if username undefined', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockResolvedValue({
             username: undefined,
             metadata: { foo: 'bar' },
@@ -694,7 +700,7 @@ describe('Cloud Plugin', () => {
         })
       ).toBeUndefined();
       expect(consoleMock).toHaveBeenLastCalledWith(
-        `[cloud.full_story] username not specified. User metadata: {"foo":"bar"}`
+        `[cloud.analytics] username not specified. User metadata: {"foo":"bar"}`
       );
     });
   });
diff --git a/x-pack/plugins/cloud/public/plugin.tsx b/x-pack/plugins/cloud/public/plugin.tsx
index 89f24971de25c..bffc1d9496422 100644
--- a/x-pack/plugins/cloud/public/plugin.tsx
+++ b/x-pack/plugins/cloud/public/plugin.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import {
+import type {
   CoreSetup,
   CoreStart,
   Plugin,
@@ -14,16 +14,20 @@ import {
   HttpStart,
   IBasePath,
   ExecutionContextStart,
-} from 'src/core/public';
+  AnalyticsServiceSetup,
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import useObservable from 'react-use/lib/useObservable';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { compact, isUndefined, omitBy } from 'lodash';
+import { BehaviorSubject, from, of, Subscription } from 'rxjs';
+import { exhaustMap, filter, map } from 'rxjs/operators';
+import { compact } from 'lodash';
+
 import type {
   AuthenticatedUser,
   SecurityPluginSetup,
   SecurityPluginStart,
-} from '../../security/public';
+} from '@kbn/security-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
 import {
   ELASTIC_SUPPORT_LINK,
@@ -31,7 +35,6 @@ import {
   GET_CHAT_USER_DATA_ROUTE_PATH,
 } from '../common/constants';
 import type { GetChatUserDataResponseBody } from '../common/types';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import { createUserMenuLinks } from './user_menu_links';
 import { getFullCloudUrl } from './utils';
 import { ChatConfig, ServicesProvider } from './services';
@@ -83,10 +86,14 @@ export interface CloudSetup {
   isCloudEnabled: boolean;
 }
 
-interface SetupFullstoryDeps extends CloudSetupDependencies {
-  executionContextPromise?: Promise<ExecutionContextStart>;
+interface SetupFullStoryDeps {
+  analytics: AnalyticsServiceSetup;
   basePath: IBasePath;
-  esOrgId?: string;
+}
+interface SetupTelemetryContextDeps extends CloudSetupDependencies {
+  analytics: AnalyticsServiceSetup;
+  executionContextPromise: Promise<ExecutionContextStart>;
+  cloudId?: string;
 }
 
 interface SetupChatDeps extends Pick<CloudSetupDependencies, 'security'> {
@@ -94,7 +101,7 @@ interface SetupChatDeps extends Pick<CloudSetupDependencies, 'security'> {
 }
 
 export class CloudPlugin implements Plugin<CloudSetup> {
-  private config!: CloudConfigType;
+  private readonly config: CloudConfigType;
   private isCloudEnabled: boolean;
   private appSubscription?: Subscription;
   private chatConfig$ = new BehaviorSubject<ChatConfig>({ enabled: false });
@@ -109,12 +116,17 @@ export class CloudPlugin implements Plugin<CloudSetup> {
       return coreStart.executionContext;
     });
 
-    this.setupFullstory({
-      basePath: core.http.basePath,
+    this.setupTelemetryContext({
+      analytics: core.analytics,
       security,
       executionContextPromise,
-      esOrgId: this.config.id,
-    }).catch((e) =>
+      cloudId: this.config.id,
+    }).catch((e) => {
+      // eslint-disable-next-line no-console
+      console.debug(`Error setting up TelemetryContext: ${e.toString()}`);
+    });
+
+    this.setupFullStory({ analytics: core.analytics, basePath: core.http.basePath }).catch((e) =>
       // eslint-disable-next-line no-console
       console.debug(`Error setting up FullStory: ${e.toString()}`)
     );
@@ -230,109 +242,158 @@ export class CloudPlugin implements Plugin<CloudSetup> {
     return user?.roles.includes('superuser') ?? true;
   }
 
-  private async setupFullstory({
-    basePath,
-    security,
-    executionContextPromise,
-    esOrgId,
-  }: SetupFullstoryDeps) {
-    const { enabled, org_id: fsOrgId } = this.config.full_story;
-    if (!enabled || !fsOrgId) {
-      return; // do not load any fullstory code in the browser if not enabled
+  /**
+   * If the right config is provided, register the FullStory shipper to the analytics client.
+   * @param analytics Core's Analytics service's setup contract.
+   * @param basePath Core's http.basePath helper.
+   * @private
+   */
+  private async setupFullStory({ analytics, basePath }: SetupFullStoryDeps) {
+    const { enabled, org_id: fullStoryOrgId } = this.config.full_story;
+    if (!enabled || !fullStoryOrgId) {
+      return; // do not load any FullStory code in the browser if not enabled
     }
 
     // Keep this import async so that we do not load any FullStory code into the browser when it is disabled.
-    const fullStoryChunkPromise = import('./fullstory');
-    const userIdPromise: Promise<string | undefined> = security
-      ? loadFullStoryUserId({ getCurrentUser: security.authc.getCurrentUser })
-      : Promise.resolve(undefined);
-
-    // We need to call FS.identify synchronously after FullStory is initialized, so we must load the user upfront
-    const [{ initializeFullStory }, userId] = await Promise.all([
-      fullStoryChunkPromise,
-      userIdPromise,
-    ]);
-
-    const { fullStory, sha256 } = initializeFullStory({
-      basePath,
-      orgId: fsOrgId,
-      packageInfo: this.initializerContext.env.packageInfo,
+    const { FullStoryShipper } = await import('@kbn/analytics-shippers-fullstory');
+    analytics.registerShipper(FullStoryShipper, {
+      fullStoryOrgId,
+      // Load an Elastic-internally audited script. Ideally, it should be hosted on a CDN.
+      scriptUrl: basePath.prepend(
+        `/internal/cloud/${this.initializerContext.env.packageInfo.buildNum}/fullstory.js`
+      ),
+      namespace: 'FSKibana',
     });
+  }
 
-    // Very defensive try/catch to avoid any UnhandledPromiseRejections
-    try {
-      // This needs to be called syncronously to be sure that we populate the user ID soon enough to make sessions merging
-      // across domains work
-      if (userId) {
-        // Join the cloud org id and the user to create a truly unique user id.
-        // The hashing here is to keep it at clear as possible in our source code that we do not send literal user IDs
-        const hashedId = sha256(esOrgId ? `${esOrgId}:${userId}` : `${userId}`);
-
-        executionContextPromise
-          ?.then(async (executionContext) => {
-            this.appSubscription = executionContext.context$.subscribe((context) => {
-              const { name, page, id } = context;
-              // Update the current context every time it changes
-              fullStory.setVars(
-                'page',
-                omitBy(
-                  {
-                    // Read about the special pageName property
-                    // https://help.fullstory.com/hc/en-us/articles/1500004101581-FS-setVars-API-Sending-custom-page-data-to-FullStory
-                    pageName: `${compact([name, page]).join(':')}`,
-                    app_id_str: name ?? 'unknown',
-                    page_str: page,
-                    ent_id_str: id,
-                  },
-                  isUndefined
-                )
-              );
-            });
+  /**
+   * Set up the Analytics context providers.
+   * @param analytics Core's Analytics service. The Setup contract.
+   * @param security The security plugin.
+   * @param executionContextPromise Core's executionContext's start contract.
+   * @param esOrgId The Cloud Org ID.
+   * @private
+   */
+  private async setupTelemetryContext({
+    analytics,
+    security,
+    executionContextPromise,
+    cloudId,
+  }: SetupTelemetryContextDeps) {
+    // Some context providers can be moved to other places for better domain isolation.
+    // Let's use https://github.com/elastic/kibana/issues/125690 for that purpose.
+    analytics.registerContextProvider({
+      name: 'kibana_version',
+      context$: of({ version: this.initializerContext.env.packageInfo.version }),
+      schema: { version: { type: 'keyword', _meta: { description: 'The version of Kibana' } } },
+    });
+
+    analytics.registerContextProvider({
+      name: 'cloud_org_id',
+      context$: of({ cloudId }),
+      schema: {
+        cloudId: {
+          type: 'keyword',
+          _meta: { description: 'The Cloud ID', optional: true },
+        },
+      },
+    });
+
+    // This needs to be called synchronously to be sure that we populate the user ID soon enough to make sessions merging
+    // across domains work
+    if (security) {
+      analytics.registerContextProvider({
+        name: 'cloud_user_id',
+        context$: from(loadUserId({ getCurrentUser: security.authc.getCurrentUser })).pipe(
+          filter((userId): userId is string => Boolean(userId)),
+          exhaustMap(async (userId) => {
+            const { sha256 } = await import('js-sha256');
+            // Join the cloud org id and the user to create a truly unique user id.
+            // The hashing here is to keep it at clear as possible in our source code that we do not send literal user IDs
+            return { userId: sha256(cloudId ? `${cloudId}:${userId}` : `${userId}`) };
           })
-          .catch((e) => {
-            // eslint-disable-next-line no-console
-            console.error(
-              `[cloud.full_story] Could not retrieve application service due to error: ${e.toString()}`,
-              e
-            );
-          });
-        const kibanaVer = this.initializerContext.env.packageInfo.version;
-        // TODO: use semver instead
-        const parsedVer = (kibanaVer.indexOf('.') > -1 ? kibanaVer.split('.') : []).map((s) =>
-          parseInt(s, 10)
-        );
-        // `str` suffix is required for evn vars, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
-        fullStory.identify(hashedId, {
-          version_str: kibanaVer,
-          version_major_int: parsedVer[0] ?? -1,
-          version_minor_int: parsedVer[1] ?? -1,
-          version_patch_int: parsedVer[2] ?? -1,
-          org_id_str: esOrgId,
-        });
-      }
-    } catch (e) {
-      // eslint-disable-next-line no-console
-      console.error(
-        `[cloud.full_story] Could not call FS.identify due to error: ${e.toString()}`,
-        e
-      );
+        ),
+        schema: {
+          userId: {
+            type: 'keyword',
+            _meta: { description: 'The user id scoped as seen by Cloud (hashed)' },
+          },
+        },
+      });
     }
 
+    const executionContext = await executionContextPromise;
+    analytics.registerContextProvider({
+      name: 'execution_context',
+      context$: executionContext.context$.pipe(
+        // Update the current context every time it changes
+        map(({ name, page, id }) => ({
+          pageName: `${compact([name, page]).join(':')}`,
+          applicationId: name ?? 'unknown',
+          page,
+          entityId: id,
+        }))
+      ),
+      schema: {
+        pageName: {
+          type: 'keyword',
+          _meta: { description: 'The name of the current page' },
+        },
+        page: {
+          type: 'keyword',
+          _meta: { description: 'The current page', optional: true },
+        },
+        applicationId: {
+          type: 'keyword',
+          _meta: { description: 'The id of the current application' },
+        },
+        entityId: {
+          type: 'keyword',
+          _meta: {
+            description:
+              'The id of the current entity (dashboard, visualization, canvas, lens, etc)',
+            optional: true,
+          },
+        },
+      },
+    });
+
+    analytics.registerEventType({
+      eventType: 'Loaded Kibana',
+      schema: {
+        kibana_version: {
+          type: 'keyword',
+          _meta: { description: 'The version of Kibana', optional: true },
+        },
+        memory_js_heap_size_limit: {
+          type: 'long',
+          _meta: { description: 'The maximum size of the heap', optional: true },
+        },
+        memory_js_heap_size_total: {
+          type: 'long',
+          _meta: { description: 'The total size of the heap', optional: true },
+        },
+        memory_js_heap_size_used: {
+          type: 'long',
+          _meta: { description: 'The used size of the heap', optional: true },
+        },
+      },
+    });
+
     // Get performance information from the browser (non standard property
     // @ts-expect-error 2339
     const memory = window.performance.memory;
     let memoryInfo = {};
     if (memory) {
       memoryInfo = {
-        memory_js_heap_size_limit_int: memory.jsHeapSizeLimit,
-        memory_js_heap_size_total_int: memory.totalJSHeapSize,
-        memory_js_heap_size_used_int: memory.usedJSHeapSize,
+        memory_js_heap_size_limit: memory.jsHeapSizeLimit,
+        memory_js_heap_size_total: memory.totalJSHeapSize,
+        memory_js_heap_size_used: memory.usedJSHeapSize,
       };
     }
-    // Record an event that Kibana was opened so we can easily search for sessions that use Kibana
-    fullStory.event('Loaded Kibana', {
-      // `str` suffix is required, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
-      kibana_version_str: this.initializerContext.env.packageInfo.version,
+
+    analytics.reportEvent('Loaded Kibana', {
+      kibana_version: this.initializerContext.env.packageInfo.version,
       ...memoryInfo,
     });
   }
@@ -376,7 +437,7 @@ export class CloudPlugin implements Plugin<CloudSetup> {
 }
 
 /** @internal exported for testing */
-export const loadFullStoryUserId = async ({
+export const loadUserId = async ({
   getCurrentUser,
 }: {
   getCurrentUser: () => Promise<AuthenticatedUser>;
@@ -391,7 +452,7 @@ export const loadFullStoryUserId = async ({
     if (!currentUser.username) {
       // eslint-disable-next-line no-console
       console.debug(
-        `[cloud.full_story] username not specified. User metadata: ${JSON.stringify(
+        `[cloud.analytics] username not specified. User metadata: ${JSON.stringify(
           currentUser.metadata
         )}`
       );
@@ -400,7 +461,7 @@ export const loadFullStoryUserId = async ({
     return currentUser.username;
   } catch (e) {
     // eslint-disable-next-line no-console
-    console.error(`[cloud.full_story] Error loading the current user: ${e.toString()}`, e);
+    console.error(`[cloud.analytics] Error loading the current user: ${e.toString()}`, e);
     return undefined;
   }
 };
diff --git a/x-pack/plugins/cloud/public/user_menu_links.ts b/x-pack/plugins/cloud/public/user_menu_links.ts
index f00911d577c59..55c41831cc18c 100644
--- a/x-pack/plugins/cloud/public/user_menu_links.ts
+++ b/x-pack/plugins/cloud/public/user_menu_links.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UserMenuLink } from '../../security/public';
+import { UserMenuLink } from '@kbn/security-plugin/public';
 import { CloudConfigType } from '.';
 import { getFullCloudUrl } from './utils';
 
diff --git a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts
index 494e697403147..f9fdef5319d59 100644
--- a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts
+++ b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { createCloudUsageCollector } from './cloud_usage_collector';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const mockUsageCollection = () => ({
   makeUsageCollector: jest.fn().mockImplementation((args: any) => ({ ...args })),
diff --git a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
index 87a7c18cc146e..28f6e8c94d0b8 100644
--- a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
+++ b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 interface Config {
   isCloudEnabled: boolean;
diff --git a/x-pack/plugins/cloud/server/config.ts b/x-pack/plugins/cloud/server/config.ts
index c5a122c2ec702..bee83e23475b5 100644
--- a/x-pack/plugins/cloud/server/config.ts
+++ b/x-pack/plugins/cloud/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const apmConfigSchema = schema.object({
   url: schema.maybe(schema.string()),
diff --git a/x-pack/plugins/cloud/server/index.ts b/x-pack/plugins/cloud/server/index.ts
index eda2fa0a7324e..4381ddaa0c3cc 100644
--- a/x-pack/plugins/cloud/server/index.ts
+++ b/x-pack/plugins/cloud/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CloudPlugin } from './plugin';
 
 export type { CloudSetup } from './plugin';
diff --git a/x-pack/plugins/cloud/server/plugin.ts b/x-pack/plugins/cloud/server/plugin.ts
index a5cf423fb8295..fbf3c925cff87 100644
--- a/x-pack/plugins/cloud/server/plugin.ts
+++ b/x-pack/plugins/cloud/server/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import type { SecurityPluginSetup } from '../../security/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { CloudConfigType } from './config';
 import { registerCloudUsageCollector } from './collectors';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
diff --git a/x-pack/plugins/cloud/server/routes/chat.test.ts b/x-pack/plugins/cloud/server/routes/chat.test.ts
index e12278e264e5e..c21b72bd9d10c 100644
--- a/x-pack/plugins/cloud/server/routes/chat.test.ts
+++ b/x-pack/plugins/cloud/server/routes/chat.test.ts
@@ -11,9 +11,9 @@ jest.mock('jsonwebtoken', () => ({
   },
 }));
 
-import { httpServiceMock, httpServerMock } from '../../../../../src/core/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { kibanaResponseFactory } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { registerChatRoute } from './chat';
 
 describe('chat route', () => {
diff --git a/x-pack/plugins/cloud/server/routes/chat.ts b/x-pack/plugins/cloud/server/routes/chat.ts
index 1bc3505c087ae..3efb2cc34b3a1 100644
--- a/x-pack/plugins/cloud/server/routes/chat.ts
+++ b/x-pack/plugins/cloud/server/routes/chat.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../src/core/server';
-import type { SecurityPluginSetup, AuthenticatedUser } from '../../../security/server';
+import { IRouter } from '@kbn/core/server';
+import type { SecurityPluginSetup, AuthenticatedUser } from '@kbn/security-plugin/server';
 import { GET_CHAT_USER_DATA_ROUTE_PATH } from '../../common/constants';
 import type { GetChatUserDataResponseBody } from '../../common/types';
 import { generateSignedJwt } from '../util/generate_jwt';
diff --git a/x-pack/plugins/cloud/server/routes/fullstory.ts b/x-pack/plugins/cloud/server/routes/fullstory.ts
index c614d803eed9f..e9f4835494a4e 100644
--- a/x-pack/plugins/cloud/server/routes/fullstory.ts
+++ b/x-pack/plugins/cloud/server/routes/fullstory.ts
@@ -9,7 +9,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { createHash } from 'crypto';
 import { once } from 'lodash';
-import { HttpResources, HttpResponseOptions, PackageInfo } from '../../../../../src/core/server';
+import { HttpResources, HttpResponseOptions, PackageInfo } from '@kbn/core/server';
 
 const MINUTE = 60;
 const HOUR = 60 * MINUTE;
diff --git a/x-pack/plugins/cloud_security_posture/common/constants.ts b/x-pack/plugins/cloud_security_posture/common/constants.ts
index 37cddf0eba9a5..363adc568ba9b 100644
--- a/x-pack/plugins/cloud_security_posture/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/common/constants.ts
@@ -5,18 +5,23 @@
  * 2.0.
  */
 
-export const STATS_ROUTE_PATH = '/api/csp/stats';
-export const FINDINGS_ROUTE_PATH = '/api/csp/findings';
-export const BENCHMARKS_ROUTE_PATH = '/api/csp/benchmarks';
-export const UPDATE_RULES_CONFIG_ROUTE_PATH = '/api/csp/update_rules_config';
+export const STATS_ROUTE_PATH = '/internal/cloud_security_posture/stats';
+export const FINDINGS_ROUTE_PATH = '/internal/cloud_security_posture/findings';
+export const BENCHMARKS_ROUTE_PATH = '/internal/cloud_security_posture/benchmarks';
+export const UPDATE_RULES_CONFIG_ROUTE_PATH =
+  '/internal/cloud_security_posture/update_rules_config';
 
 export const CSP_FINDINGS_INDEX_NAME = 'findings';
 export const CIS_KUBERNETES_PACKAGE_NAME = 'cis_kubernetes_benchmark';
+export const FINDINGS_DATA_STREAM_NAME =
+  // Currently 'cis_kubernetes_benchmark.findings', To be refactored to 'cloud_security_posture.findings'
+  CIS_KUBERNETES_PACKAGE_NAME + '.' + CSP_FINDINGS_INDEX_NAME;
 export const LATEST_FINDINGS_INDEX_NAME = 'cloud_security_posture.findings_latest';
 export const BENCHMARK_SCORE_INDEX_NAME = 'cloud_security_posture.scores';
 
 export const AGENT_LOGS_INDEX_PATTERN = '.logs-cis_kubernetes_benchmark.metadata*';
-export const CSP_KUBEBEAT_INDEX_PATTERN = 'logs-cis_kubernetes_benchmark.findings*';
+export const CSP_KUBEBEAT_INDEX_PATTERN = 'logs-cis_kubernetes_benchmark.findings-*';
+export const FINDINGS_INDEX_PATTERN = 'logs-' + FINDINGS_DATA_STREAM_NAME + '-default*';
 export const LATEST_FINDINGS_INDEX_PATTERN = 'logs-' + LATEST_FINDINGS_INDEX_NAME + '-default';
 export const BENCHMARK_SCORE_INDEX_PATTERN = 'logs-' + BENCHMARK_SCORE_INDEX_NAME + '-default';
 
@@ -29,4 +34,5 @@ export const INTERNAL_FEATURE_FLAGS = {
   showBenchmarks: false,
   showManageRulesMock: false,
   showRisksMock: false,
+  showFindingsGroupBy: false,
 } as const;
diff --git a/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule.ts b/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule.ts
index d5c8e9fab1f2e..a2c7f06e0a676 100644
--- a/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule.ts
+++ b/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule.ts
@@ -18,9 +18,12 @@ export const cspRuleSchema = rt.object({
   default_value: rt.string(),
   remediation: rt.string(),
   benchmark: rt.object({ name: rt.string(), version: rt.string() }),
+  rego_rule_id: rt.string(),
   tags: rt.arrayOf(rt.string()),
   enabled: rt.boolean(),
   muted: rt.boolean(),
+  package_policy_id: rt.string(),
+  policy_id: rt.string(),
 });
 
 export type CspRuleSchema = TypeOf<typeof cspRuleSchema>;
diff --git a/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule_template.ts b/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule_template.ts
index e6c7740f87fd3..ec772e1595f0e 100644
--- a/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule_template.ts
+++ b/x-pack/plugins/cloud_security_posture/common/schemas/csp_rule_template.ts
@@ -7,17 +7,18 @@
 import { schema as rt, TypeOf } from '@kbn/config-schema';
 
 const cspRuleTemplateSchema = rt.object({
+  id: rt.string(),
   name: rt.string(),
+  tags: rt.arrayOf(rt.string()),
   description: rt.string(),
   rationale: rt.string(),
-  impact: rt.string(),
   default_value: rt.string(),
+  impact: rt.string(),
   remediation: rt.string(),
   benchmark: rt.object({ name: rt.string(), version: rt.string() }),
-  severity: rt.string(),
-  benchmark_rule_id: rt.string(),
   rego_rule_id: rt.string(),
-  tags: rt.arrayOf(rt.string()),
+  enabled: rt.boolean(),
+  muted: rt.boolean(),
 });
 export const cloudSecurityPostureRuleTemplateSavedObjectType = 'csp-rule-template';
 export type CloudSecurityPostureRuleTemplateSchema = TypeOf<typeof cspRuleTemplateSchema>;
diff --git a/x-pack/plugins/cloud_security_posture/common/types.ts b/x-pack/plugins/cloud_security_posture/common/types.ts
index b9403128220f5..0aee5ce2f350d 100644
--- a/x-pack/plugins/cloud_security_posture/common/types.ts
+++ b/x-pack/plugins/cloud_security_posture/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PackagePolicy, GetAgentPoliciesResponseItem } from '../../fleet/common';
+import type { PackagePolicy, GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 
 export type Evaluation = 'passed' | 'failed' | 'NA';
 /** number between 1-100 */
diff --git a/x-pack/plugins/cloud_security_posture/public/application/app.tsx b/x-pack/plugins/cloud_security_posture/public/application/app.tsx
index 23e5178be326f..c18a9c0083026 100755
--- a/x-pack/plugins/cloud_security_posture/public/application/app.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/application/app.tsx
@@ -10,14 +10,11 @@ import { Router, Redirect, Switch, Route } from 'react-router-dom';
 import type { RouteProps } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { EuiErrorBoundary } from '@elastic/eui';
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
 import { allNavigationItems } from '../common/navigation/constants';
 import { CspNavigationItem } from '../common/navigation/types';
 import { UnknownRoute } from '../components/unknown_route';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
-import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '../../../../../src/core/public';
 import type { CspClientPluginStartDeps } from '../types';
 import { pageToComponentMapping } from './constants';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/application/index.tsx b/x-pack/plugins/cloud_security_posture/public/application/index.tsx
index 38fbef254ea44..f299745fa2ba0 100644
--- a/x-pack/plugins/cloud_security_posture/public/application/index.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/application/index.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { CspApp } from './app';
-import type { AppMountParameters, CoreStart } from '../../../../../src/core/public';
 import type { CspClientPluginStartDeps } from '../types';
 
 export const renderApp = (
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx b/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx
index cd7d97cadee04..0a9f2c2134a6e 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx
@@ -10,7 +10,7 @@ import {
   epmRouteService,
   type GetInfoResponse,
   type DefaultPackagesInstallationError,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { CIS_KUBERNETES_PACKAGE_NAME } from '../../../common/constants';
 import { useKibana } from '../hooks/use_kibana';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts
index 91bedbf83769d..4ab446395686f 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts
@@ -6,7 +6,7 @@
  */
 
 import { useQuery } from 'react-query';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComplianceDashboardData } from '../../../common/types';
 import { STATS_ROUTE_PATH } from '../../../common/constants';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts
index 3e83187ef9ba1..20d22b93cb9d2 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts
@@ -6,7 +6,7 @@
  */
 
 import { useQuery } from 'react-query';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import { CspClientPluginStartDeps } from '../../types';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts
index b2d1d2a7b6bbe..1c6f252080e11 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreStart } from '../../../../../../src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import { useKibana as useKibanaBase } from '@kbn/kibana-react-plugin/public';
 import type { CspClientPluginStartDeps } from '../../types';
-import { useKibana as useKibanaBase } from '../../../../../../src/plugins/kibana_react/public';
 
 type CspKibanaContext = CoreStart & CspClientPluginStartDeps;
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_navigate_findings.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_navigate_findings.ts
index 6cc1582d7ff7b..b5ce12095f99a 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_navigate_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_navigate_findings.ts
@@ -9,9 +9,9 @@ import { useHistory } from 'react-router-dom';
 import { Query } from '@kbn/es-query';
 import { allNavigationItems } from '../navigation/constants';
 import { encodeQuery } from '../navigation/query_utils';
-import { CspFindingsRequest } from '../../pages/findings/use_findings';
+import { FindingsBaseURLQuery } from '../../pages/findings/types';
 
-const getFindingsQuery = (queryValue: Query['query']): Pick<CspFindingsRequest, 'query'> => {
+const getFindingsQuery = (queryValue: Query['query']): Pick<FindingsBaseURLQuery, 'query'> => {
   const query =
     typeof queryValue === 'string'
       ? queryValue
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts
index f11b09bc559dc..ca2ee7cd5f9e8 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ChromeBreadcrumb, CoreStart } from 'kibana/public';
+import type { ChromeBreadcrumb, CoreStart } from '@kbn/core/public';
 import { useEffect } from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PLUGIN_ID } from '../../../common';
 import type { CspNavigationItem } from './types';
 import { CLOUD_POSTURE } from './translations';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts
index f8b7685c776e0..a6a63847f5c77 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { pagePathGetters } from '../../../../fleet/public';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useKibana } from '../hooks/use_kibana';
 
 const CIS_INTEGRATION_PATH = pagePathGetters.integrations_all({ searchTerm: 'CIS' }).join('');
diff --git a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx
index e280bd6f0da89..c191e88a68c3c 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx
@@ -7,7 +7,7 @@
 import React, { type ComponentProps } from 'react';
 import { render, screen } from '@testing-library/react';
 import Chance from 'chance';
-import { coreMock } from '../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createNavigationItemFixture } from '../test/fixtures/navigation_item';
 import { createReactQueryResponse } from '../test/fixtures/react_query';
 import { TestProvider } from '../test/test_provider';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx
index cc973169c2e86..d7dab061742cb 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx
@@ -9,10 +9,7 @@ import type { UseQueryResult } from 'react-query';
 import { NavLink } from 'react-router-dom';
 import { EuiEmptyPrompt, EuiErrorBoundary, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  KibanaPageTemplate,
-  type KibanaPageTemplateProps,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate, type KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { allNavigationItems } from '../common/navigation/constants';
 import type { CspNavigationItem } from '../common/navigation/types';
 import { CspLoadingState } from './csp_loading_state';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx
index cb4ddba3ad64c..990140f3cf949 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import type { UseQueryResult } from 'react-query/types/react/types';
-import { createStubDataView } from '../../../../../../src/plugins/data_views/public/data_views/data_view.stub';
+import { createStubDataView } from '@kbn/data-views-plugin/public/data_views/data_view.stub';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import { useKubebeatDataView } from '../../common/api/use_kubebeat_data_view';
 import { createCspBenchmarkIntegrationFixture } from '../../test/fixtures/csp_benchmark_integration';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
index 865f5169e4f31..0eaeae1bee104 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
@@ -15,9 +15,9 @@ import {
 import React from 'react';
 import moment from 'moment';
 import { Link, useHistory, generatePath } from 'react-router-dom';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { TABLE_COLUMN_HEADERS } from './translations';
 import type { Benchmark } from '../../../common/types';
-import { pagePathGetters } from '../../../../fleet/public';
 import { useKibana } from '../../common/hooks/use_kibana';
 import { allNavigationItems } from '../../common/navigation/constants';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
index 345ea32af817a..53e65d05ce08d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
@@ -6,7 +6,7 @@
  */
 
 import { useQuery } from 'react-query';
-import type { ListResult } from '../../../../fleet/common';
+import type { ListResult } from '@kbn/fleet-plugin/common';
 import { BENCHMARKS_ROUTE_PATH } from '../../../common/constants';
 import { BenchmarksQuerySchema } from '../../../common/schemas/benchmark';
 import { useKibana } from '../../common/hooks/use_kibana';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx
index dd872b49aec62..540402b986e5b 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx
@@ -23,8 +23,8 @@ import { FormattedDate, FormattedTime } from '@kbn/i18n-react';
 import moment from 'moment';
 import { statusColors } from '../../../common/constants';
 import type { PostureTrend, Stats } from '../../../../common/types';
-import * as TEXT from '../translations';
 import { CompactFormattedNumber } from '../../../components/compact_formatted_number';
+import { RULE_FAILED, RULE_PASSED } from '../../../../common/constants';
 
 interface CloudPostureScoreChartProps {
   trend: PostureTrend[];
@@ -41,8 +41,8 @@ const ScoreChart = ({
   partitionOnElementClick,
 }: Omit<CloudPostureScoreChartProps, 'trend'>) => {
   const data = [
-    { label: TEXT.PASSED, value: totalPassed },
-    { label: TEXT.FAILED, value: totalFailed },
+    { label: RULE_PASSED, value: totalPassed },
+    { label: RULE_FAILED, value: totalFailed },
   ];
 
   return (
@@ -69,7 +69,7 @@ const ScoreChart = ({
             groupByRollup: (d: { label: string }) => d.label,
             shape: {
               fillColor: (d, index) =>
-                d.dataName === 'Passed' ? statusColors.success : statusColors.danger,
+                d.dataName === RULE_PASSED ? statusColors.success : statusColors.danger,
             },
           },
         ]}
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
index ff564744384e0..f7d73f92809d3 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
@@ -7,13 +7,13 @@
 
 import React from 'react';
 import { EuiSpacer, EuiIcon } from '@elastic/eui';
+import { type KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { allNavigationItems } from '../../common/navigation/constants';
 import { useCspBreadcrumbs } from '../../common/navigation/use_csp_breadcrumbs';
 import { SummarySection } from './dashboard_sections/summary_section';
 import { BenchmarksSection } from './dashboard_sections/benchmarks_section';
 import { useComplianceDashboardDataApi } from '../../common/api';
 import { CspPageTemplate } from '../../components/csp_page_template';
-import { type KibanaPageTemplateProps } from '../../../../../../src/plugins/kibana_react/public';
 import { CLOUD_POSTURE, NO_DATA_CONFIG_TEXT } from './translations';
 
 const getNoDataConfig = (onClick: () => void): KibanaPageTemplateProps['noDataConfig'] => ({
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
index 0e5de30cf6479..ad760ca06d215 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
@@ -11,15 +11,15 @@ import { of } from 'rxjs';
 import { useKubebeatDataView } from '../../common/api/use_kubebeat_data_view';
 import { Findings } from './findings';
 import { TestProvider } from '../../test/test_provider';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { UnifiedSearchPublicPluginStart } from '../../../../../../src/plugins/unified_search/public';
-import { unifiedSearchPluginMock } from '../../../../../../src/plugins/unified_search/public/mocks';
-import { createStubDataView } from '../../../../../../src/plugins/data_views/public/data_views/data_view.stub';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { createStubDataView } from '@kbn/data-views-plugin/public/data_views/data_view.stub';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import * as TEST_SUBJECTS from './test_subjects';
 import { useCisKubernetesIntegration } from '../../common/api/use_cis_kubernetes_integration';
-import type { DataView } from '../../../../../../src/plugins/data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 
 jest.mock('../../common/api/use_kubebeat_data_view');
 jest.mock('../../common/api/use_cis_kubernetes_integration');
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_by_resource_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_by_resource_table.test.tsx
new file mode 100644
index 0000000000000..3018de31aeb58
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_by_resource_table.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { render, screen, within } from '@testing-library/react';
+import * as TEST_SUBJECTS from './test_subjects';
+import { FindingsByResourceTable, formatNumber, getResourceId } from './findings_by_resource_table';
+import * as TEXT from './translations';
+import type { PropsOf } from '@elastic/eui';
+import Chance from 'chance';
+import numeral from '@elastic/numeral';
+
+const chance = new Chance();
+
+const getFakeFindingsByResource = () => ({
+  resource_id: chance.guid(),
+  cluster_id: chance.guid(),
+  cis_section: chance.word(),
+  failed_findings: {
+    total: chance.integer(),
+    normalized: chance.integer({ min: 0, max: 1 }),
+  },
+});
+
+type TableProps = PropsOf<typeof FindingsByResourceTable>;
+
+describe('<FindingsByResourceTable />', () => {
+  it('renders the zero state when status success and data has a length of zero ', async () => {
+    const props: TableProps = {
+      loading: false,
+      data: { page: [] },
+      error: null,
+    };
+
+    render(<FindingsByResourceTable {...props} />);
+
+    expect(screen.getByText(TEXT.NO_FINDINGS)).toBeInTheDocument();
+  });
+
+  it('renders the table with provided items', () => {
+    const data = Array.from({ length: 10 }, getFakeFindingsByResource);
+
+    const props: TableProps = {
+      loading: false,
+      data: { page: data },
+      error: null,
+    };
+
+    render(<FindingsByResourceTable {...props} />);
+
+    data.forEach((item, i) => {
+      const row = screen.getByTestId(
+        TEST_SUBJECTS.getFindingsByResourceTableRowTestId(getResourceId(item))
+      );
+      expect(row).toBeInTheDocument();
+      expect(within(row).getByText(item.resource_id)).toBeInTheDocument();
+      expect(within(row).getByText(item.cluster_id)).toBeInTheDocument();
+      expect(within(row).getByText(item.cis_section)).toBeInTheDocument();
+      expect(within(row).getByText(formatNumber(item.failed_findings.total))).toBeInTheDocument();
+      expect(
+        within(row).getByText(new RegExp(numeral(item.failed_findings.normalized).format('0%')))
+      ).toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_by_resource_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_by_resource_table.tsx
new file mode 100644
index 0000000000000..d2acee177686a
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_by_resource_table.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import {
+  EuiTableFieldDataColumnType,
+  EuiEmptyPrompt,
+  EuiBasicTable,
+  EuiTextColor,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import numeral from '@elastic/numeral';
+import { extractErrorMessage } from '../../../common/utils/helpers';
+import * as TEST_SUBJECTS from './test_subjects';
+import * as TEXT from './translations';
+import type { CspFindingsByResourceResult } from './use_findings_by_resource';
+
+export const formatNumber = (value: number) =>
+  value < 1000 ? value : numeral(value).format('0.0a');
+
+type FindingsGroupByResourceProps = CspFindingsByResourceResult;
+type CspFindingsByResource = NonNullable<CspFindingsByResourceResult['data']>['page'][number];
+
+export const getResourceId = (resource: CspFindingsByResource) =>
+  [resource.resource_id, resource.cluster_id, resource.cis_section].join('/');
+
+const FindingsByResourceTableComponent = ({
+  error,
+  data,
+  loading,
+}: FindingsGroupByResourceProps) => {
+  const getRowProps = (row: CspFindingsByResource) => ({
+    'data-test-subj': TEST_SUBJECTS.getFindingsByResourceTableRowTestId(getResourceId(row)),
+  });
+
+  if (!loading && !data?.page.length)
+    return <EuiEmptyPrompt iconType="logoKibana" title={<h2>{TEXT.NO_FINDINGS}</h2>} />;
+
+  return (
+    <EuiBasicTable
+      loading={loading}
+      error={error ? extractErrorMessage(error) : undefined}
+      items={data?.page || []}
+      columns={columns}
+      rowProps={getRowProps}
+    />
+  );
+};
+
+const columns: Array<EuiTableFieldDataColumnType<CspFindingsByResource>> = [
+  {
+    field: 'resource_id',
+    name: (
+      <FormattedMessage
+        id="xpack.csp.findings.groupByResourceTable.resourceIdColumnLabel"
+        defaultMessage="Resource ID"
+      />
+    ),
+    render: (resourceId: CspFindingsByResource['resource_id']) => <EuiLink>{resourceId}</EuiLink>,
+  },
+  {
+    field: 'cis_section',
+    truncateText: true,
+    name: (
+      <FormattedMessage
+        id="xpack.csp.findings.groupByResourceTable.cisSectionColumnLabel"
+        defaultMessage="CIS Section"
+      />
+    ),
+  },
+  {
+    field: 'cluster_id',
+    truncateText: true,
+    name: (
+      <FormattedMessage
+        id="xpack.csp.findings.groupByResourceTable.clusterIdColumnLabel"
+        defaultMessage="Cluster ID"
+      />
+    ),
+  },
+  {
+    field: 'failed_findings',
+    truncateText: true,
+    name: (
+      <FormattedMessage
+        id="xpack.csp.findings.groupByResourceTable.failedFindingsColumnLabel"
+        defaultMessage="Failed Findings"
+      />
+    ),
+    render: (failedFindings: CspFindingsByResource['failed_findings']) => (
+      <EuiFlexGroup gutterSize="xs">
+        <EuiFlexItem grow={false}>
+          <EuiTextColor color="danger">{formatNumber(failedFindings.total)}</EuiTextColor>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <span>({numeral(failedFindings.normalized).format('0%')})</span>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    ),
+  },
+];
+
+export const FindingsByResourceTable = React.memo(FindingsByResourceTableComponent);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.test.tsx
new file mode 100644
index 0000000000000..ea2cd9ce7c0cf
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.test.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { render } from '@testing-library/react';
+import { FindingsContainer, getDefaultQuery } from './findings_container';
+import { createStubDataView } from '@kbn/data-views-plugin/common/mocks';
+import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { TestProvider } from '../../test/test_provider';
+import { getFindingsQuery } from './use_findings';
+import { encodeQuery } from '../../common/navigation/query_utils';
+import { useLocation } from 'react-router-dom';
+import { RisonObject } from 'rison-node';
+import { buildEsQuery } from '@kbn/es-query';
+import { getFindingsCountAggQuery } from './use_findings_count';
+
+jest.mock('../../common/api/use_kubebeat_data_view');
+jest.mock('../../common/api/use_cis_kubernetes_integration');
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({ push: jest.fn() }),
+  useLocation: jest.fn(),
+}));
+
+beforeEach(() => {
+  jest.restoreAllMocks();
+});
+
+describe('<FindingsContainer />', () => {
+  it('data#search.search fn called with URL query', () => {
+    const query = getDefaultQuery();
+    const dataMock = dataPluginMock.createStartContract();
+    const dataView = createStubDataView({
+      spec: {
+        id: CSP_KUBEBEAT_INDEX_PATTERN,
+      },
+    });
+
+    (useLocation as jest.Mock).mockReturnValue({
+      search: encodeQuery(query as unknown as RisonObject),
+    });
+
+    render(
+      <TestProvider
+        deps={{
+          data: dataMock,
+          unifiedSearch: unifiedSearchPluginMock.createStartContract(),
+        }}
+      >
+        <FindingsContainer dataView={dataView} />
+      </TestProvider>
+    );
+
+    const baseQuery = {
+      index: dataView.title,
+      query: buildEsQuery(dataView, query.query, query.filters),
+    };
+
+    expect(dataMock.search.search).toHaveBeenNthCalledWith(1, {
+      params: getFindingsCountAggQuery(baseQuery),
+    });
+
+    expect(dataMock.search.search).toHaveBeenNthCalledWith(2, {
+      params: getFindingsQuery({
+        ...baseQuery,
+        sort: query.sort,
+        size: query.size,
+        from: query.from,
+      }),
+    });
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx
index 5b1d60b69e069..213592d50e069 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx
@@ -4,38 +4,95 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React from 'react';
-import { EuiSpacer, EuiTitle, useEuiTheme } from '@elastic/eui';
+import React, { useMemo } from 'react';
+import { EuiComboBoxOptionOption, EuiSpacer, EuiTitle, useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import type { DataView } from '@kbn/data-plugin/common';
+import { SortDirection } from '@kbn/data-plugin/common';
+import { buildEsQuery } from '@kbn/es-query';
 import { FindingsTable } from './findings_table';
 import { FindingsSearchBar } from './findings_search_bar';
 import * as TEST_SUBJECTS from './test_subjects';
-import type { DataView } from '../../../../../../src/plugins/data/common';
-import { SortDirection } from '../../../../../../src/plugins/data/common';
 import { useUrlQuery } from '../../common/hooks/use_url_query';
-import { useFindings, type CspFindingsRequest } from './use_findings';
+import { useFindings } from './use_findings';
+import type { FindingsGroupByNoneQuery } from './use_findings';
+import type { FindingsBaseURLQuery } from './types';
+import { useFindingsByResource } from './use_findings_by_resource';
+import { FindingsGroupBySelector } from './findings_group_by_selector';
+import { INTERNAL_FEATURE_FLAGS } from '../../../common/constants';
+import { useFindingsCounter } from './use_findings_count';
+import { FindingsDistributionBar } from './findings_distribution_bar';
+import { FindingsByResourceTable } from './findings_by_resource_table';
 
 // TODO: define this as a schema with default values
-const getDefaultQuery = (): CspFindingsRequest => ({
+export const getDefaultQuery = (): FindingsBaseURLQuery & FindingsGroupByNoneQuery => ({
   query: { language: 'kuery', query: '' },
   filters: [],
   sort: [{ ['@timestamp']: SortDirection.desc }],
   from: 0,
   size: 10,
+  groupBy: 'none',
 });
 
+const getGroupByOptions = (): Array<EuiComboBoxOptionOption<FindingsBaseURLQuery['groupBy']>> => [
+  {
+    value: 'none',
+    label: i18n.translate('xpack.csp.findings.groupBySelector.groupByNoneLabel', {
+      defaultMessage: 'None',
+    }),
+  },
+  {
+    value: 'resource',
+    label: i18n.translate('xpack.csp.findings.groupBySelector.groupByResourceIdLabel', {
+      defaultMessage: 'Resource',
+    }),
+  },
+];
+
 export const FindingsContainer = ({ dataView }: { dataView: DataView }) => {
-  const { urlQuery: findingsQuery, setUrlQuery, key } = useUrlQuery(getDefaultQuery);
-  const findingsResult = useFindings(dataView, findingsQuery, key);
   const { euiTheme } = useEuiTheme();
+  const groupByOptions = useMemo(getGroupByOptions, []);
+  const { urlQuery, setUrlQuery } = useUrlQuery(getDefaultQuery);
+
+  const baseEsQuery = useMemo(
+    () => ({
+      index: dataView.title,
+      // TODO: this will throw for malformed query
+      // page will display an error boundary with the JS error
+      // will be accounted for before releasing the feature
+      query: buildEsQuery(dataView, urlQuery.query, urlQuery.filters),
+    }),
+    [dataView, urlQuery]
+  );
+
+  const findingsGroupByResource = useFindingsByResource({
+    ...baseEsQuery,
+    enabled: urlQuery.groupBy === 'resource',
+  });
+
+  const findingsCount = useFindingsCounter({
+    ...baseEsQuery,
+    enabled: urlQuery.groupBy === 'none',
+  });
+
+  const findingsGroupByNone = useFindings({
+    ...baseEsQuery,
+    enabled: urlQuery.groupBy === 'none',
+    size: urlQuery.size,
+    from: urlQuery.from,
+    sort: urlQuery.sort,
+  });
+
   return (
     <div data-test-subj={TEST_SUBJECTS.FINDINGS_CONTAINER}>
       <FindingsSearchBar
         dataView={dataView}
         setQuery={setUrlQuery}
-        {...findingsQuery}
-        {...findingsResult}
+        query={urlQuery.query}
+        filters={urlQuery.filters}
+        loading={findingsGroupByNone.isLoading}
       />
       <div
         css={css`
@@ -44,7 +101,43 @@ export const FindingsContainer = ({ dataView }: { dataView: DataView }) => {
       >
         <PageTitle />
         <EuiSpacer />
-        <FindingsTable setQuery={setUrlQuery} {...findingsQuery} {...findingsResult} />
+        {INTERNAL_FEATURE_FLAGS.showFindingsGroupBy && (
+          <FindingsGroupBySelector
+            type={urlQuery.groupBy}
+            onChange={(type) => setUrlQuery({ groupBy: type[0]?.value })}
+            options={groupByOptions}
+          />
+        )}
+        <EuiSpacer />
+        {urlQuery.groupBy === 'none' && (
+          <>
+            <FindingsDistributionBar
+              total={findingsGroupByNone.data?.total || 0}
+              passed={findingsCount.data?.passed || 0}
+              failed={findingsCount.data?.failed || 0}
+              pageStart={urlQuery.from + 1} // API index is 0, but UI is 1
+              pageEnd={urlQuery.from + urlQuery.size}
+            />
+            <EuiSpacer />
+            <FindingsTable
+              {...urlQuery}
+              setQuery={setUrlQuery}
+              data={findingsGroupByNone.data}
+              error={findingsGroupByNone.error}
+              loading={findingsGroupByNone.isLoading}
+            />
+          </>
+        )}
+        {urlQuery.groupBy === 'resource' && (
+          <>
+            <FindingsByResourceTable
+              {...urlQuery}
+              data={findingsGroupByResource.data}
+              error={findingsGroupByResource.error}
+              loading={findingsGroupByResource.isLoading}
+            />
+          </>
+        )}
       </div>
     </div>
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_distribution_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_distribution_bar.tsx
new file mode 100644
index 0000000000000..0654f7d9f0999
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_distribution_bar.tsx
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { useMemo } from 'react';
+import { css } from '@emotion/react';
+import {
+  EuiHealth,
+  EuiBadge,
+  EuiTextColor,
+  EuiSpacer,
+  EuiFlexGroup,
+  EuiFlexItem,
+  useEuiTheme,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import numeral from '@elastic/numeral';
+
+interface Props {
+  total: number;
+  passed: number;
+  failed: number;
+  pageStart: number;
+  pageEnd: number;
+}
+
+const formatNumber = (value: number) => (value < 1000 ? value : numeral(value).format('0.0a'));
+
+export const FindingsDistributionBar = ({ failed, passed, total, pageEnd, pageStart }: Props) => {
+  const count = useMemo(
+    () =>
+      total
+        ? { total, passed: passed / total, failed: failed / total }
+        : { total: 0, passed: 0, failed: 0 },
+    [total, failed, passed]
+  );
+
+  return (
+    <div>
+      <Counters {...{ failed, passed, total, pageEnd, pageStart }} />
+      <EuiSpacer size="s" />
+      <DistributionBar {...count} />
+    </div>
+  );
+};
+
+const Counters = ({ pageStart, pageEnd, total, failed, passed }: Props) => (
+  <EuiFlexGroup justifyContent="spaceBetween">
+    <EuiFlexItem>
+      {!!total && <CurrentPageOfTotal pageStart={pageStart} pageEnd={pageEnd} total={total} />}
+    </EuiFlexItem>
+    <EuiFlexItem
+      css={css`
+        align-items: flex-end;
+      `}
+    >
+      {!!total && <PassedFailedCounters passed={passed} failed={failed} />}
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
+
+const PassedFailedCounters = ({ passed, failed }: Pick<Props, 'passed' | 'failed'>) => {
+  const { euiTheme } = useEuiTheme();
+  return (
+    <div
+      css={css`
+        display: grid;
+        grid-template-columns: auto auto;
+        grid-column-gap: ${euiTheme.size.m};
+      `}
+    >
+      <Counter
+        label={i18n.translate('xpack.csp.findings.distributionBar.totalPassedLabel', {
+          defaultMessage: 'Passed',
+        })}
+        color={euiTheme.colors.success}
+        value={passed}
+      />
+      <Counter
+        label={i18n.translate('xpack.csp.findings.distributionBar.totalFailedLabel', {
+          defaultMessage: 'Failed',
+        })}
+        color={euiTheme.colors.danger}
+        value={failed}
+      />
+    </div>
+  );
+};
+
+const CurrentPageOfTotal = ({
+  pageEnd,
+  pageStart,
+  total,
+}: Pick<Props, 'pageEnd' | 'pageStart' | 'total'>) => (
+  <EuiTextColor color="subdued">
+    <FormattedMessage
+      id="xpack.csp.findings.distributionBar.showingPageOfTotalLabel"
+      defaultMessage="Showing {pageStart}-{pageEnd} of {total} Findings"
+      values={{
+        pageStart: <b>{pageStart}</b>,
+        pageEnd: <b>{pageEnd}</b>,
+        total: <b>{formatNumber(total)}</b>,
+      }}
+    />
+  </EuiTextColor>
+);
+
+const DistributionBar: React.FC<Omit<Props, 'pageEnd' | 'pageStart'>> = ({ passed, failed }) => {
+  const { euiTheme } = useEuiTheme();
+  return (
+    <EuiFlexGroup
+      gutterSize="none"
+      css={css`
+        height: 8px;
+        background: ${euiTheme.colors.subdued};
+      `}
+    >
+      <DistributionBarPart value={passed} color={euiTheme.colors.success} />
+      <DistributionBarPart value={failed} color={euiTheme.colors.danger} />
+    </EuiFlexGroup>
+  );
+};
+
+const DistributionBarPart = ({ value, color }: { value: number; color: string }) => (
+  <div
+    css={css`
+      flex: ${value};
+      background: ${color};
+      height: 100%;
+    `}
+  />
+);
+
+const Counter = ({ label, value, color }: { label: string; value: number; color: string }) => (
+  <EuiFlexGroup gutterSize="s" alignItems="center">
+    <EuiFlexItem>
+      <EuiHealth color={color}>{label}</EuiHealth>
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <EuiBadge>{formatNumber(value)}</EuiBadge>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_group_by_selector.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_group_by_selector.tsx
new file mode 100644
index 0000000000000..84adf919a5fe1
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_group_by_selector.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { EuiComboBox, EuiFormLabel, type EuiComboBoxOptionOption } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import type { FindingsGroupByKind } from './types';
+
+interface Props {
+  type: FindingsGroupByKind;
+  options: Array<EuiComboBoxOptionOption<FindingsGroupByKind>>;
+  onChange(selectedOptions: Array<EuiComboBoxOptionOption<FindingsGroupByKind>>): void;
+}
+
+export const FindingsGroupBySelector = ({ type, options, onChange }: Props) => (
+  <EuiComboBox
+    prepend={<GroupByLabel />}
+    singleSelection={{ asPlainText: true }}
+    options={options}
+    selectedOptions={options.filter((o) => o.value === type)}
+    onChange={onChange}
+  />
+);
+
+const GroupByLabel = () => (
+  <EuiFormLabel>
+    <FormattedMessage
+      id="xpack.csp.findings.groupBySelector.groupByLabel"
+      defaultMessage="Group by"
+    />
+  </EuiFormLabel>
+);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
index ee0202786f042..89673dabbf91f 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
@@ -7,27 +7,27 @@
 import React from 'react';
 import { css } from '@emotion/react';
 import { EuiThemeComputed, useEuiTheme } from '@elastic/eui';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-plugin/common';
 import * as TEST_SUBJECTS from './test_subjects';
-import type { CspFindingsRequest, CspFindingsResponse } from './use_findings';
+import type { CspFindingsResult } from './use_findings';
+import type { FindingsBaseURLQuery } from './types';
 import type { CspClientPluginStartDeps } from '../../types';
 import { PLUGIN_NAME } from '../../../common';
-import type { DataView } from '../../../../../../src/plugins/data/common';
 import { FINDINGS_SEARCH_PLACEHOLDER } from './translations';
 
-type SearchBarQueryProps = Pick<CspFindingsRequest, 'query' | 'filters'>;
+type SearchBarQueryProps = Pick<FindingsBaseURLQuery, 'query' | 'filters'>;
 
-interface BaseFindingsSearchBarProps extends SearchBarQueryProps {
+interface FindingsSearchBarProps extends SearchBarQueryProps {
   setQuery(v: Partial<SearchBarQueryProps>): void;
+  loading: CspFindingsResult['loading'];
 }
 
-type FindingsSearchBarProps = CspFindingsResponse & BaseFindingsSearchBarProps;
-
 export const FindingsSearchBar = ({
   dataView,
   query,
   filters,
-  status,
+  loading,
   setQuery,
 }: FindingsSearchBarProps & { dataView: DataView }) => {
   const { euiTheme } = useEuiTheme();
@@ -47,7 +47,7 @@ export const FindingsSearchBar = ({
         showQueryInput={true}
         showDatePicker={false}
         showSaveQuery={false}
-        isLoading={status === 'loading'}
+        isLoading={loading}
         indexPatterns={[dataView]}
         query={query}
         filters={filters}
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
index 2d7955dfd0213..28d14b42ae099 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
@@ -14,7 +14,7 @@ import type { CspFinding } from './types';
 
 const chance = new Chance();
 
-const getFakeFindings = (): CspFinding & { id: string } => ({
+const getFakeFindings = (name: string): CspFinding & { id: string } => ({
   id: chance.word(),
   result: {
     evaluation: chance.weighted(['passed', 'failed'], [0.5, 0.5]),
@@ -23,7 +23,7 @@ const getFakeFindings = (): CspFinding & { id: string } => ({
     },
   },
   rule: {
-    name: chance.word(),
+    name,
     description: chance.paragraph(),
     impact: chance.word(),
     remediation: chance.word(),
@@ -54,12 +54,11 @@ const getFakeFindings = (): CspFinding & { id: string } => ({
 
 type TableProps = PropsOf<typeof FindingsTable>;
 
-// FLAKY: https://github.com/elastic/kibana/issues/126664
-describe.skip('<FindingsTable />', () => {
+describe('<FindingsTable />', () => {
   it('renders the zero state when status success and data has a length of zero ', async () => {
     const props: TableProps = {
-      status: 'success',
-      data: { data: [], total: 0 },
+      loading: false,
+      data: { page: [], total: 0 },
       error: null,
       sort: [],
       from: 1,
@@ -73,11 +72,12 @@ describe.skip('<FindingsTable />', () => {
   });
 
   it('renders the table with provided items', () => {
-    const data = Array.from({ length: 10 }, getFakeFindings);
+    const names = chance.unique(chance.sentence, 10);
+    const data = names.map(getFakeFindings);
 
     const props: TableProps = {
-      status: 'success',
-      data: { data, total: 10 },
+      loading: false,
+      data: { page: data, total: 10 },
       error: null,
       sort: [],
       from: 0,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx
index c4bb50ca74b2e..189cf42994382 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx
@@ -16,22 +16,20 @@ import {
   EuiBasicTableProps,
 } from '@elastic/eui';
 import moment from 'moment';
+import { SortDirection } from '@kbn/data-plugin/common';
 import { extractErrorMessage } from '../../../common/utils/helpers';
 import * as TEST_SUBJECTS from './test_subjects';
 import * as TEXT from './translations';
 import type { CspFinding } from './types';
 import { CspEvaluationBadge } from '../../components/csp_evaluation_badge';
-import type { CspFindingsRequest, CspFindingsResponse } from './use_findings';
-import { SortDirection } from '../../../../../../src/plugins/data/common';
+import type { FindingsGroupByNoneQuery, CspFindingsResult } from './use_findings';
 import { FindingsRuleFlyout } from './findings_flyout';
 
-type TableQueryProps = Pick<CspFindingsRequest, 'sort' | 'from' | 'size'>;
-
-interface BaseFindingsTableProps extends TableQueryProps {
-  setQuery(query: Partial<TableQueryProps>): void;
+interface BaseFindingsTableProps extends FindingsGroupByNoneQuery {
+  setQuery(query: Partial<FindingsGroupByNoneQuery>): void;
 }
 
-type FindingsTableProps = CspFindingsResponse & BaseFindingsTableProps;
+type FindingsTableProps = CspFindingsResult & BaseFindingsTableProps;
 
 const FindingsTableComponent = ({
   setQuery,
@@ -39,7 +37,8 @@ const FindingsTableComponent = ({
   size,
   sort = [],
   error,
-  ...props
+  data,
+  loading,
 }: FindingsTableProps) => {
   const [selectedFinding, setSelectedFinding] = useState<CspFinding>();
 
@@ -48,9 +47,9 @@ const FindingsTableComponent = ({
       getEuiPaginationFromEsSearchSource({
         from,
         size,
-        total: props.status === 'success' ? props.data.total : 0,
+        total: data?.total,
       }),
-    [from, size, props]
+    [from, size, data]
   );
 
   const sorting = useMemo(() => getEuiSortFromEsSearchSource(sort), [sort]);
@@ -70,7 +69,7 @@ const FindingsTableComponent = ({
   );
 
   // Show "zero state"
-  if (props.status === 'success' && !props.data.data.length)
+  if (!loading && !data?.page.length)
     // TODO: use our own logo
     return (
       <EuiEmptyPrompt
@@ -84,9 +83,9 @@ const FindingsTableComponent = ({
     <>
       <EuiBasicTable
         data-test-subj={TEST_SUBJECTS.FINDINGS_TABLE}
-        loading={props.status === 'loading'}
+        loading={loading}
         error={error ? extractErrorMessage(error) : undefined}
-        items={props.data?.data || []}
+        items={data?.page || []}
         columns={columns}
         pagination={pagination}
         sorting={sorting}
@@ -108,17 +107,17 @@ const getEuiPaginationFromEsSearchSource = ({
   size: pageSize,
   total,
 }: Pick<FindingsTableProps, 'from' | 'size'> & {
-  total: number;
+  total: number | undefined;
 }): EuiBasicTableProps<CspFinding>['pagination'] => ({
   pageSize,
   pageIndex: Math.ceil(pageIndex / pageSize),
-  totalItemCount: total,
+  totalItemCount: total || 0,
   pageSizeOptions: [10, 25, 100],
   showPerPageOptions: true,
 });
 
 const getEuiSortFromEsSearchSource = (
-  sort: TableQueryProps['sort']
+  sort: FindingsGroupByNoneQuery['sort']
 ): EuiBasicTableProps<CspFinding>['sorting'] => {
   if (!sort.length) return;
 
@@ -132,7 +131,7 @@ const getEuiSortFromEsSearchSource = (
 const getEsSearchQueryFromEuiTableParams = ({
   page,
   sort,
-}: Criteria<CspFinding>): Partial<TableQueryProps> => ({
+}: Criteria<CspFinding>): Partial<FindingsGroupByNoneQuery> => ({
   ...(!!page && { from: page.index * page.size, size: page.size }),
   sort: sort ? [{ [sort.field]: SortDirection[sort.direction] }] : undefined,
 });
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/test_subjects.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/test_subjects.ts
index 51bcafd46060d..778e54de82db6 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/test_subjects.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/test_subjects.ts
@@ -9,3 +9,5 @@ export const FINDINGS_SEARCH_BAR = 'findings_search_bar';
 export const FINDINGS_TABLE = 'findings_table';
 export const FINDINGS_CONTAINER = 'findings_container';
 export const FINDINGS_TABLE_ZERO_STATE = 'findings_table_zero_state';
+export const getFindingsByResourceTableRowTestId = (id: string) =>
+  `findings_resource_table_row_${id}`;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/types.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/types.ts
index efa2a04e06bc1..79d8f3507c896 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/types.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/types.ts
@@ -4,6 +4,33 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { BoolQuery, Filter, Query } from '@kbn/es-query';
+import { UseQueryResult } from 'react-query';
+
+export type FindingsGroupByKind = 'none' | 'resource';
+
+export interface FindingsBaseURLQuery {
+  groupBy: FindingsGroupByKind;
+  query: Query;
+  filters: Filter[];
+}
+
+export interface FindingsBaseEsQuery {
+  index: string;
+  query?: {
+    bool: BoolQuery;
+  };
+}
+
+export interface FindingsQueryStatus {
+  enabled: boolean;
+}
+
+export interface FindingsQueryResult<TData = unknown, TError = unknown> {
+  loading: UseQueryResult['isLoading'];
+  error: TError;
+  data: TData;
+}
 
 // TODO: this needs to be defined in a versioned schema
 export interface CspFinding {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
index 25054747808dc..1f7e8dae483bf 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
@@ -4,43 +4,35 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Filter } from '@kbn/es-query';
-import { type UseQueryResult, useQuery } from 'react-query';
-import type { AggregationsAggregate, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
+import { useQuery } from 'react-query';
 import { number } from 'io-ts';
 import { lastValueFrom } from 'rxjs';
+import type { EsQuerySortValue, IEsSearchResponse } from '@kbn/data-plugin/common';
+import type { CoreStart } from '@kbn/core/public';
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { extractErrorMessage } from '../../../common/utils/helpers';
-import type {
-  DataView,
-  EsQuerySortValue,
-  IKibanaSearchResponse,
-  SerializedSearchSourceFields,
-} from '../../../../../../src/plugins/data/common';
-import type { CspClientPluginStartDeps } from '../../types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import * as TEXT from './translations';
-import type { CoreStart } from '../../../../../../src/core/public';
-import type { CspFinding } from './types';
-
-interface CspFindings {
-  data: CspFinding[];
-  total: number;
+import type { CspFinding, FindingsQueryResult } from './types';
+import { useKibana } from '../../common/hooks/use_kibana';
+import type { FindingsBaseEsQuery, FindingsQueryStatus } from './types';
+
+interface UseFindingsOptions
+  extends FindingsBaseEsQuery,
+    FindingsGroupByNoneQuery,
+    FindingsQueryStatus {}
+
+export interface FindingsGroupByNoneQuery {
+  from: NonNullable<estypes.SearchRequest['from']>;
+  size: NonNullable<estypes.SearchRequest['size']>;
+  sort: EsQuerySortValue[];
 }
 
-export interface CspFindingsRequest
-  extends Required<Pick<SerializedSearchSourceFields, 'sort' | 'size' | 'from' | 'query'>> {
-  filters: Filter[];
+interface CspFindingsData {
+  page: CspFinding[];
+  total: number;
 }
 
-type ResponseProps = 'data' | 'error' | 'status';
-type Result = UseQueryResult<CspFindings, unknown>;
-
-// TODO: use distributive Pick
-export type CspFindingsResponse =
-  | Pick<Extract<Result, { status: 'success' }>, ResponseProps>
-  | Pick<Extract<Result, { status: 'error' }>, ResponseProps>
-  | Pick<Extract<Result, { status: 'idle' }>, ResponseProps>
-  | Pick<Extract<Result, { status: 'loading' }>, ResponseProps>;
+export type CspFindingsResult = FindingsQueryResult<CspFindingsData | undefined, unknown>;
 
 const FIELDS_WITHOUT_KEYWORD_MAPPING = new Set(['@timestamp']);
 
@@ -65,72 +57,49 @@ const mapEsQuerySortKey = (sort: readonly EsQuerySortValue[]): EsQuerySortValue[
     return acc;
   }, []);
 
-const showResponseErrorToast =
-  ({ toasts }: CoreStart['notifications']) =>
-  (error: unknown): void => {
-    if (error instanceof Error) toasts.addError(error, { title: TEXT.SEARCH_FAILED });
-    else toasts.addDanger(extractErrorMessage(error, TEXT.SEARCH_FAILED));
-  };
+export const showErrorToast = (
+  toasts: CoreStart['notifications']['toasts'],
+  error: unknown
+): void => {
+  if (error instanceof Error) toasts.addError(error, { title: TEXT.SEARCH_FAILED });
+  else toasts.addDanger(extractErrorMessage(error, TEXT.SEARCH_FAILED));
+};
 
-const extractFindings = ({
-  rawResponse: { hits },
-}: IKibanaSearchResponse<
-  SearchResponse<CspFinding, Record<string, AggregationsAggregate>>
->): CspFindings => ({
-  // TODO: use 'fields' instead of '_source' ?
-  data: hits.hits.map((hit) => hit._source!),
-  total: number.is(hits.total) ? hits.total : 0,
+export const getFindingsQuery = ({
+  index,
+  query,
+  size,
+  from,
+  sort,
+}: Omit<UseFindingsOptions, 'enabled'>) => ({
+  index,
+  query,
+  size,
+  from,
+  sort: mapEsQuerySortKey(sort),
 });
 
-const createFindingsSearchSource = (
-  {
-    query,
-    dataView,
-    filters,
-    ...rest
-  }: Omit<CspFindingsRequest, 'queryKey'> & { dataView: DataView },
-  queryService: CspClientPluginStartDeps['data']['query']
-): SerializedSearchSourceFields => {
-  if (query) queryService.queryString.setQuery(query);
-
-  return {
-    ...rest,
-    sort: mapEsQuerySortKey(rest.sort),
-    filter: queryService.filterManager.getFilters(),
-    query: queryService.queryString.getQuery(),
-    index: dataView.id, // TODO: constant
-  };
-};
-
-/**
- * @description a react-query#mutation wrapper on the data plugin searchSource
- * @todo use 'searchAfter'. currently limited to 10k docs. see https://github.com/elastic/kibana/issues/116776
- */
-export const useFindings = (
-  dataView: DataView,
-  searchProps: CspFindingsRequest,
-  urlKey?: string // Needed when URL query (searchProps) didn't change (now-15) but require a refetch
-): CspFindingsResponse => {
+export const useFindings = ({ enabled, index, query, sort, from, size }: UseFindingsOptions) => {
   const {
-    notifications,
-    data: { query, search },
-  } = useKibana<CspClientPluginStartDeps>().services;
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
 
   return useQuery(
-    ['csp_findings', { searchProps, urlKey }],
-    async () => {
-      const source = await search.searchSource.create(
-        createFindingsSearchSource({ ...searchProps, dataView }, query)
-      );
-
-      const response = await lastValueFrom(source.fetch$());
-
-      return response;
-    },
+    ['csp_findings', { index, query, sort, from, size }],
+    () =>
+      lastValueFrom<IEsSearchResponse<CspFinding>>(
+        data.search.search({
+          params: getFindingsQuery({ index, query, sort, from, size }),
+        })
+      ),
     {
-      cacheTime: 0,
-      onError: showResponseErrorToast(notifications!),
-      select: extractFindings,
+      enabled,
+      select: ({ rawResponse: { hits } }) => ({
+        page: hits.hits.map((hit) => hit._source!),
+        total: number.is(hits.total) ? hits.total : 0,
+      }),
+      onError: (err) => showErrorToast(toasts, err),
     }
   );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_by_resource.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_by_resource.ts
new file mode 100644
index 0000000000000..b5596d55a6664
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_by_resource.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { useQuery } from 'react-query';
+import { lastValueFrom } from 'rxjs';
+import { IKibanaSearchRequest, IKibanaSearchResponse } from '@kbn/data-plugin/common';
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { useKibana } from '../../common/hooks/use_kibana';
+import { showErrorToast } from './use_findings';
+import type { FindingsBaseEsQuery, FindingsQueryResult, FindingsQueryStatus } from './types';
+
+interface UseFindingsByResourceOptions extends FindingsBaseEsQuery, FindingsQueryStatus {}
+
+type FindingsAggRequest = IKibanaSearchRequest<estypes.SearchRequest>;
+type FindingsAggResponse = IKibanaSearchResponse<
+  estypes.SearchResponse<{}, FindingsByResourceAggs>
+>;
+
+export type CspFindingsByResourceResult = FindingsQueryResult<
+  ReturnType<typeof useFindingsByResource>['data'] | undefined,
+  unknown
+>;
+
+interface FindingsByResourceAggs extends estypes.AggregationsCompositeAggregate {
+  groupBy: {
+    buckets: FindingsAggBucket[];
+  };
+}
+
+interface FindingsAggBucket {
+  doc_count: number;
+  failed_findings: { doc_count: number };
+  key: {
+    resource_id: string;
+    cluster_id: string;
+    cis_section: string;
+  };
+}
+
+export const getFindingsByResourceAggQuery = ({
+  index,
+  query,
+}: Omit<UseFindingsByResourceOptions, 'enabled'>): estypes.SearchRequest => ({
+  index,
+  size: 0,
+  body: {
+    query,
+    aggs: {
+      groupBy: {
+        composite: {
+          size: 10 * 1000,
+          sources: [
+            { resource_id: { terms: { field: 'resource_id.keyword' } } },
+            { cluster_id: { terms: { field: 'cluster_id.keyword' } } },
+            { cis_section: { terms: { field: 'rule.section' } } },
+          ],
+        },
+        aggs: {
+          failed_findings: {
+            filter: { term: { 'result.evaluation.keyword': 'failed' } },
+          },
+        },
+      },
+    },
+  },
+});
+
+export const useFindingsByResource = ({ enabled, index, query }: UseFindingsByResourceOptions) => {
+  const {
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
+
+  return useQuery(
+    ['csp_findings_resource', { index, query }],
+    () =>
+      lastValueFrom(
+        data.search.search<FindingsAggRequest, FindingsAggResponse>({
+          params: getFindingsByResourceAggQuery({ index, query }),
+        })
+      ),
+    {
+      enabled,
+      select: ({ rawResponse }) => ({
+        page: rawResponse.aggregations?.groupBy.buckets.map(createFindingsByResource) || [],
+      }),
+      onError: (err) => showErrorToast(toasts, err),
+    }
+  );
+};
+
+const createFindingsByResource = (bucket: FindingsAggBucket) => ({
+  ...bucket.key,
+  failed_findings: {
+    total: bucket.failed_findings.doc_count,
+    normalized: bucket.doc_count > 0 ? bucket.failed_findings.doc_count / bucket.doc_count : 0,
+  },
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_count.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_count.ts
new file mode 100644
index 0000000000000..6ed56ea1d4397
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_count.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { useQuery } from 'react-query';
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { lastValueFrom } from 'rxjs';
+import type { IKibanaSearchRequest, IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { useKibana } from '../../common/hooks/use_kibana';
+import { showErrorToast } from './use_findings';
+import type { FindingsBaseEsQuery, FindingsQueryStatus } from './types';
+
+interface UseFindingsCountOptions extends FindingsBaseEsQuery, FindingsQueryStatus {}
+
+type FindingsAggRequest = IKibanaSearchRequest<estypes.SearchRequest>;
+type FindingsAggResponse = IKibanaSearchResponse<estypes.SearchResponse<{}, FindingsAggs>>;
+interface FindingsAggs extends estypes.AggregationsMultiBucketAggregateBase {
+  count: {
+    buckets: Array<{
+      key: string;
+      doc_count: number;
+    }>;
+  };
+}
+
+export const getFindingsCountAggQuery = ({ index, query }: FindingsBaseEsQuery) => ({
+  index,
+  size: 0,
+  track_total_hits: true,
+  body: {
+    query,
+    aggs: { count: { terms: { field: 'result.evaluation.keyword' } } },
+  },
+});
+
+export const useFindingsCounter = ({ enabled, index, query }: UseFindingsCountOptions) => {
+  const {
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
+
+  return useQuery(
+    ['csp_findings_counts', { index, query }],
+    () =>
+      lastValueFrom(
+        data.search.search<FindingsAggRequest, FindingsAggResponse>({
+          params: getFindingsCountAggQuery({ index, query }),
+        })
+      ),
+    {
+      enabled,
+      onError: (err) => showErrorToast(toasts, err),
+      select: (response) =>
+        Object.fromEntries(
+          response.rawResponse.aggregations!.count.buckets.map((bucket) => [
+            bucket.key,
+            bucket.doc_count,
+          ])!
+        ) as Record<'passed' | 'failed', number>,
+    }
+  );
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx
index 288f9e2f30c01..6157a22c9738d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx
@@ -9,10 +9,10 @@ import React, { useMemo } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiTextColor, EuiEmptyPrompt } from '@elastic/eui';
 import * as t from 'io-ts';
+import type { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { RulesContainer, type PageUrlParams } from './rules_container';
 import { allNavigationItems } from '../../common/navigation/constants';
 import { useCspBreadcrumbs } from '../../common/navigation/use_csp_breadcrumbs';
-import type { KibanaPageTemplateProps } from '../../../../../../src/plugins/kibana_react/public';
 import { CspNavigationItem } from '../../common/navigation/types';
 import { extractErrorMessage } from '../../../common/utils/helpers';
 import { useCspIntegration } from './use_csp_integration';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx
index 5801d293114bd..47d0bc0a9dd22 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { LOADING_STATE_TEST_SUBJECT } from '../../components/csp_page_template';
-import { Rules } from './index';
+import { Rules } from '.';
 import { render, screen } from '@testing-library/react';
 import { QueryClient } from 'react-query';
 import { TestProvider } from '../../test/test_provider';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx
index 96659337e0c1a..cf77fba3c513f 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx
@@ -15,6 +15,7 @@ import {
 } from '@elastic/eui';
 import { useParams } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { extractErrorMessage, isNonNullable } from '../../../common/utils/helpers';
 import { RulesTable } from './rules_table';
 import { RulesBottomBar } from './rules_bottom_bar';
@@ -28,7 +29,6 @@ import {
 } from './use_csp_rules';
 import * as TEST_SUBJECTS from './test_subjects';
 import { RuleFlyout } from './rules_flyout';
-import { pagePathGetters } from '../../../../fleet/public';
 import { useKibana } from '../../common/hooks/use_kibana';
 
 interface RulesPageData {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx
index 52e07ae9e016c..358db6edb7bb1 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import { useQuery } from 'react-query';
+import { type PackagePolicy, packagePolicyRouteService } from '@kbn/fleet-plugin/common';
 import { type PageUrlParams } from './rules_container';
 import { useKibana } from '../../common/hooks/use_kibana';
-import { type PackagePolicy, packagePolicyRouteService } from '../../../../../plugins/fleet/common';
 
 export const useCspIntegration = ({ packagePolicyId }: PageUrlParams) => {
   const { http } = useKibana().services;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts
index 32e1a2635a857..87f06fe70df76 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts
@@ -6,8 +6,8 @@
  */
 import { useQuery, useMutation, useQueryClient } from 'react-query';
 import { FunctionKeys } from 'utility-types';
+import type { SavedObjectsFindOptions, SimpleSavedObject } from '@kbn/core/public';
 import { cspRuleAssetSavedObjectType, type CspRuleSchema } from '../../../common/schemas/csp_rule';
-import type { SavedObjectsFindOptions, SimpleSavedObject } from '../../../../../../src/core/public';
 import { useKibana } from '../../common/hooks/use_kibana';
 import { UPDATE_FAILED } from './translations';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/plugin.ts b/x-pack/plugins/cloud_security_posture/public/plugin.ts
index d4cdeddd48d92..e0fccaf23e048 100755
--- a/x-pack/plugins/cloud_security_posture/public/plugin.ts
+++ b/x-pack/plugins/cloud_security_posture/public/plugin.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { AppMountParameters, CoreSetup, CoreStart, Plugin } from '../../../../src/core/public';
+import type { AppMountParameters, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 import type {
   CspClientPluginSetup,
   CspClientPluginStart,
@@ -13,7 +14,6 @@ import type {
   CspClientPluginStartDeps,
 } from './types';
 import { PLUGIN_NAME, PLUGIN_ID } from '../common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 
 export class CspPlugin
   implements
@@ -35,7 +35,7 @@ export class CspPlugin
       category: DEFAULT_APP_CATEGORIES.security,
       async mount(params: AppMountParameters) {
         // Load application bundle
-        const { renderApp } = await import('./application/index');
+        const { renderApp } = await import('./application');
         // Get start services as specified in kibana.json
         const [coreStart, depsStart] = await core.getStartServices();
         // Render the application
diff --git a/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx b/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx
index 3806dcb955587..068285abacdcc 100755
--- a/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx
@@ -9,9 +9,9 @@ import React, { useMemo } from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Router, Switch, Route } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import type { CspAppDeps } from '../application/app';
 
 export const TestProvider: React.FC<Partial<CspAppDeps>> = ({
diff --git a/x-pack/plugins/cloud_security_posture/public/types.ts b/x-pack/plugins/cloud_security_posture/public/types.ts
index 7fc100ebeffbd..54cd9e22eb45f 100755
--- a/x-pack/plugins/cloud_security_posture/public/types.ts
+++ b/x-pack/plugins/cloud_security_posture/public/types.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CspClientPluginSetup {}
diff --git a/x-pack/plugins/cloud_security_posture/server/config.ts b/x-pack/plugins/cloud_security_posture/server/config.ts
index e40adadc55e98..5e258bffc2670 100644
--- a/x-pack/plugins/cloud_security_posture/server/config.ts
+++ b/x-pack/plugins/cloud_security_posture/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, type TypeOf } from '@kbn/config-schema';
-import type { PluginConfigDescriptor } from 'kibana/server';
+import type { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: false }),
diff --git a/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts b/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts
index f98122bf28bc7..c30bf09a60e0f 100644
--- a/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts
+++ b/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts
@@ -6,7 +6,7 @@
  */
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient, Logger } from '../../../../../src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { benchmarkScoreMapping } from './benchmark_score_mapping';
 import { latestFindingsMapping } from './latest_findings_mapping';
 import {
@@ -21,20 +21,22 @@ export const initializeCspTransformsIndices = async (
   esClient: ElasticsearchClient,
   logger: Logger
 ) => {
-  createIndexIfNotExists(
-    esClient,
-    LATEST_FINDINGS_INDEX_NAME,
-    LATEST_FINDINGS_INDEX_PATTERN,
-    latestFindingsMapping,
-    logger
-  );
-  createIndexIfNotExists(
-    esClient,
-    BENCHMARK_SCORE_INDEX_NAME,
-    BENCHMARK_SCORE_INDEX_PATTERN,
-    benchmarkScoreMapping,
-    logger
-  );
+  return Promise.all([
+    createIndexIfNotExists(
+      esClient,
+      LATEST_FINDINGS_INDEX_NAME,
+      LATEST_FINDINGS_INDEX_PATTERN,
+      latestFindingsMapping,
+      logger
+    ),
+    createIndexIfNotExists(
+      esClient,
+      BENCHMARK_SCORE_INDEX_NAME,
+      BENCHMARK_SCORE_INDEX_PATTERN,
+      benchmarkScoreMapping,
+      logger
+    ),
+  ]);
 };
 
 export const createIndexIfNotExists = async (
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/benchmark_score_transform.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/benchmark_score_transform.ts
new file mode 100644
index 0000000000000..8837fea0fa183
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/benchmark_score_transform.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/types';
+import {
+  LATEST_FINDINGS_INDEX_PATTERN,
+  BENCHMARK_SCORE_INDEX_PATTERN,
+} from '../../common/constants';
+
+export const benchmarkScoreTransform: TransformPutTransformRequest = {
+  transform_id: 'cloud_security_posture.score-default-0.0.1',
+  description: 'Calculate latest findings score',
+  source: {
+    index: LATEST_FINDINGS_INDEX_PATTERN,
+  },
+  dest: {
+    index: BENCHMARK_SCORE_INDEX_PATTERN,
+  },
+  frequency: '30m',
+  sync: {
+    time: {
+      field: 'event.ingested',
+      delay: '60s',
+    },
+  },
+  retention_policy: {
+    time: {
+      field: '@timestamp',
+      max_age: '30d',
+    },
+  },
+  pivot: {
+    group_by: {
+      '@timestamp': {
+        date_histogram: {
+          field: '@timestamp',
+          calendar_interval: '1m',
+        },
+      },
+    },
+    aggregations: {
+      total_findings: {
+        value_count: {
+          field: 'result.evaluation.keyword',
+        },
+      },
+      passed_findings: {
+        filter: {
+          term: {
+            'result.evaluation.keyword': 'passed',
+          },
+        },
+      },
+      failed_findings: {
+        filter: {
+          term: {
+            'result.evaluation.keyword': 'failed',
+          },
+        },
+      },
+      score_by_cluster_id: {
+        terms: {
+          field: 'cluster_id.keyword',
+        },
+        aggregations: {
+          total_findings: {
+            value_count: {
+              field: 'result.evaluation.keyword',
+            },
+          },
+          passed_findings: {
+            filter: {
+              term: {
+                'result.evaluation.keyword': 'passed',
+              },
+            },
+          },
+          failed_findings: {
+            filter: {
+              term: {
+                'result.evaluation.keyword': 'failed',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+  _meta: {
+    managed: 'true',
+  },
+};
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.test.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.test.ts
new file mode 100644
index 0000000000000..65a4507de2511
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { createTransformIfNotExists, startTransformIfNotStarted } from './create_transforms';
+import { latestFindingsTransform } from './latest_findings_transform';
+
+const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
+
+describe('createTransformIfNotExist', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    jest.resetAllMocks();
+  });
+
+  it('expect not to create if already exists', async () => {
+    mockEsClient.transform.getTransform.mockResolvedValue({ transforms: [], count: 1 });
+    await createTransformIfNotExists(mockEsClient, latestFindingsTransform, logger);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledTimes(0);
+  });
+
+  it('expect to create if does not already exist', async () => {
+    mockEsClient.transform.getTransform.mockRejectedValue({ statusCode: 404 });
+    await createTransformIfNotExists(mockEsClient, latestFindingsTransform, logger);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledWith(latestFindingsTransform);
+  });
+
+  it('expect not to create if get error is not 404', async () => {
+    mockEsClient.transform.getTransform.mockRejectedValue({ statusCode: 400 });
+    await createTransformIfNotExists(mockEsClient, latestFindingsTransform, logger);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledTimes(0);
+  });
+});
+
+function getTransformWithState(state: string) {
+  return {
+    state,
+    checkpointing: { last: { checkpoint: 1 } },
+    id: '',
+    stats: {
+      documents_indexed: 0,
+      documents_processed: 0,
+      exponential_avg_checkpoint_duration_ms: 0,
+      exponential_avg_documents_indexed: 0,
+      exponential_avg_documents_processed: 0,
+      index_failures: 0,
+      index_time_in_ms: 0,
+      index_total: 0,
+      pages_processed: 0,
+      processing_time_in_ms: 0,
+      processing_total: 0,
+      search_failures: 0,
+      search_time_in_ms: 0,
+      search_total: 0,
+      trigger_count: 0,
+    },
+  };
+}
+
+describe('startTransformIfNotStarted', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    jest.resetAllMocks();
+  });
+
+  ['failed', 'stopping', 'started', 'aborting', 'indexing'].forEach((state) =>
+    it(`expect not to start if state is ${state}`, async () => {
+      mockEsClient.transform.getTransformStats.mockResolvedValue({
+        transforms: [getTransformWithState(state)],
+        count: 1,
+      });
+      await startTransformIfNotStarted(mockEsClient, latestFindingsTransform.transform_id, logger);
+      expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
+      expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledWith({
+        transform_id: latestFindingsTransform.transform_id,
+      });
+      expect(mockEsClient.transform.startTransform).toHaveBeenCalledTimes(0);
+    })
+  );
+
+  it('expect not to start if transform not found', async () => {
+    mockEsClient.transform.getTransformStats.mockResolvedValue({
+      transforms: [],
+      count: 0,
+    });
+    await startTransformIfNotStarted(mockEsClient, latestFindingsTransform.transform_id, logger);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.startTransform).toHaveBeenCalledTimes(0);
+  });
+
+  it('expect to start if state is stopped', async () => {
+    mockEsClient.transform.getTransformStats.mockResolvedValue({
+      transforms: [getTransformWithState('stopped')],
+      count: 1,
+    });
+    await startTransformIfNotStarted(mockEsClient, latestFindingsTransform.transform_id, logger);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.startTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.startTransform).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.ts
new file mode 100644
index 0000000000000..3347d5f36b5d8
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { transformError } from '@kbn/securitysolution-es-utils';
+import { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/types';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { latestFindingsTransform } from './latest_findings_transform';
+import { benchmarkScoreTransform } from './benchmark_score_transform';
+
+// TODO: Move transforms to integration package
+export const initializeCspTransforms = async (esClient: ElasticsearchClient, logger: Logger) => {
+  return Promise.all([
+    initializeTransform(esClient, latestFindingsTransform, logger),
+    initializeTransform(esClient, benchmarkScoreTransform, logger),
+  ]);
+};
+
+export const initializeTransform = async (
+  esClient: ElasticsearchClient,
+  transform: TransformPutTransformRequest,
+  logger: Logger
+) => {
+  return createTransformIfNotExists(esClient, transform, logger).then((succeeded) => {
+    if (succeeded) {
+      startTransformIfNotStarted(esClient, transform.transform_id, logger);
+    }
+  });
+};
+
+/**
+ * Checks if a transform exists, And if not creates it
+ *
+ * @param transform - the transform to create. If a transform with the same transform_id already exists, nothing is created or updated.
+ *
+ * @return true if the transform exits or created, false otherwise.
+ */
+export const createTransformIfNotExists = async (
+  esClient: ElasticsearchClient,
+  transform: TransformPutTransformRequest,
+  logger: Logger
+) => {
+  try {
+    await esClient.transform.getTransform({
+      transform_id: transform.transform_id,
+    });
+    return true;
+  } catch (existErr) {
+    const existError = transformError(existErr);
+    if (existError.statusCode === 404) {
+      try {
+        await esClient.transform.putTransform(transform);
+        return true;
+      } catch (createErr) {
+        const createError = transformError(createErr);
+        logger.error(
+          `Failed to create transform ${transform.transform_id}: ${createError.message}`
+        );
+      }
+    } else {
+      logger.error(
+        `Failed to check if transform ${transform.transform_id} exists: ${existError.message}`
+      );
+    }
+  }
+  return false;
+};
+
+export const startTransformIfNotStarted = async (
+  esClient: ElasticsearchClient,
+  transformId: string,
+  logger: Logger
+) => {
+  try {
+    const transformStats = await esClient.transform.getTransformStats({
+      transform_id: transformId,
+    });
+    if (transformStats.count <= 0) {
+      logger.error(`Failed starting transform ${transformId}: couldn't find transform`);
+      return;
+    }
+    const fetchedTransformStats = transformStats.transforms[0];
+    if (fetchedTransformStats.state === 'stopped') {
+      try {
+        return await esClient.transform.startTransform({ transform_id: transformId });
+      } catch (startErr) {
+        const startError = transformError(startErr);
+        logger.error(`Failed starting transform ${transformId}: ${startError.message}`);
+      }
+    } else if (
+      fetchedTransformStats.state === 'stopping' ||
+      fetchedTransformStats.state === 'aborting' ||
+      fetchedTransformStats.state === 'failed'
+    ) {
+      logger.error(
+        `Not starting transform ${transformId} since it's state is: ${fetchedTransformStats.state}`
+      );
+    }
+  } catch (statsErr) {
+    const statsError = transformError(statsErr);
+    logger.error(`Failed to check if transform ${transformId} is started: ${statsError.message}`);
+  }
+};
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_findings_transform.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_findings_transform.ts
new file mode 100644
index 0000000000000..fc042149f3193
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_findings_transform.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/types';
+import { FINDINGS_INDEX_PATTERN, LATEST_FINDINGS_INDEX_PATTERN } from '../../common/constants';
+
+export const latestFindingsTransform: TransformPutTransformRequest = {
+  transform_id: 'cloud_security_posture.findings_latest-default-0.0.1',
+  description: 'Defines findings transformation to view only the latest finding per resource',
+  source: {
+    index: FINDINGS_INDEX_PATTERN,
+  },
+  dest: {
+    index: LATEST_FINDINGS_INDEX_PATTERN,
+  },
+  frequency: '5m',
+  sync: {
+    time: {
+      field: 'event.ingested',
+      delay: '60s',
+    },
+  },
+  retention_policy: {
+    time: {
+      field: '@timestamp',
+      max_age: '3d',
+    },
+  },
+  latest: {
+    sort: '@timestamp',
+    unique_key: ['resource_id.keyword', 'rule.name.keyword', 'agent.id.keyword'],
+  },
+  _meta: {
+    managed: 'true',
+  },
+};
diff --git a/x-pack/plugins/cloud_security_posture/server/fleet_integration/fleet_integration.test.ts b/x-pack/plugins/cloud_security_posture/server/fleet_integration/fleet_integration.test.ts
new file mode 100644
index 0000000000000..8872c359fc770
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/fleet_integration/fleet_integration.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
+import { CIS_KUBERNETES_PACKAGE_NAME } from '../../common/constants';
+import { onPackagePolicyPostCreateCallback } from './fleet_integration';
+
+describe('create CSP rules with post package create callback', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+  let mockSoClient: jest.Mocked<SavedObjectsClientContract>;
+  const ruleAttributes = {
+    id: '41308bcdaaf665761478bb6f0d745a5c',
+    name: 'Ensure that the API server pod specification file permissions are set to 644 or more restrictive (Automated)',
+    tags: ['CIS', 'Kubernetes', 'CIS 1.1.1', 'Master Node Configuration Files'],
+    description:
+      'Ensure that the API server pod specification file has permissions of `644` or more restrictive.\n',
+    rationale:
+      'The API server pod specification file controls various parameters that set the behavior of the API server. You should restrict its file permissions to maintain the integrity of the file. The file should be writable by only the administrators on the system.\n',
+    default_value: 'By default, the `kube-apiserver.yaml` file has permissions of `640`.\n',
+    impact: 'None\n',
+    remediation:
+      'Run the below command (based on the file location on your system) on the\nmaster node.\nFor example,\n```\nchmod 644 /etc/kubernetes/manifests/kube-apiserver.yaml\n```\n',
+    benchmark: {
+      name: 'CIS Kubernetes V1.20',
+      version: 'v1.0.0',
+    },
+    enabled: true,
+    rego_rule_id: 'cis_1_2_2',
+  };
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    mockSoClient = savedObjectsClientMock.create();
+  });
+  it('should create stateful rules based on rule template', async () => {
+    const mockPackagePolicy = createPackagePolicyMock();
+    mockPackagePolicy.package!.name = CIS_KUBERNETES_PACKAGE_NAME;
+    mockSoClient.find.mockResolvedValueOnce({
+      saved_objects: [
+        {
+          type: 'csp-rule-template',
+          id: 'csp_rule_template-41308bcdaaf665761478bb6f0d745a5c',
+          attributes: { ...ruleAttributes },
+        },
+      ],
+      pit_id: undefined,
+    } as unknown as SavedObjectsFindResponse);
+
+    await onPackagePolicyPostCreateCallback(logger, mockPackagePolicy, mockSoClient);
+
+    expect(mockSoClient.bulkCreate.mock.calls[0][0]).toMatchObject([
+      {
+        type: 'csp_rule',
+        attributes: {
+          ...ruleAttributes,
+          package_policy_id: mockPackagePolicy.id,
+          policy_id: mockPackagePolicy.policy_id,
+        },
+      },
+    ]);
+  });
+
+  it('should not create rules when the package policy is not csp package', async () => {
+    const mockPackagePolicy = createPackagePolicyMock();
+    mockPackagePolicy.package!.name = 'not_csp_package';
+
+    await onPackagePolicyPostCreateCallback(logger, mockPackagePolicy, mockSoClient);
+    expect(mockSoClient.find).toHaveBeenCalledTimes(0);
+    expect(mockSoClient.bulkCreate).toHaveBeenCalledTimes(0);
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/server/fleet_integration/fleet_integration.ts b/x-pack/plugins/cloud_security_posture/server/fleet_integration/fleet_integration.ts
new file mode 100644
index 0000000000000..4693a3e55337b
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/fleet_integration/fleet_integration.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type {
+  SavedObjectsBulkCreateObject,
+  SavedObjectsFindResponse,
+  SavedObjectsFindResult,
+  ISavedObjectsRepository,
+  SavedObjectsClientContract,
+  Logger,
+} from '@kbn/core/server';
+import { PackagePolicy, DeletePackagePoliciesResponse } from '@kbn/fleet-plugin/common';
+import {
+  cloudSecurityPostureRuleTemplateSavedObjectType,
+  CloudSecurityPostureRuleTemplateSchema,
+} from '../../common/schemas/csp_rule_template';
+import { CIS_KUBERNETES_PACKAGE_NAME } from '../../common/constants';
+import { CspRuleSchema, cspRuleAssetSavedObjectType } from '../../common/schemas/csp_rule';
+
+type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends ReadonlyArray<
+  infer ElementType
+>
+  ? ElementType
+  : never;
+
+const isCspPackagePolicy = <T extends { package?: { name: string } }>(
+  packagePolicy: T
+): boolean => {
+  return packagePolicy.package?.name === CIS_KUBERNETES_PACKAGE_NAME;
+};
+
+/**
+ * Callback to handle creation of PackagePolicies in Fleet
+ */
+export const onPackagePolicyPostCreateCallback = async (
+  logger: Logger,
+  packagePolicy: PackagePolicy,
+  savedObjectsClient: SavedObjectsClientContract
+): Promise<void> => {
+  // We only care about Cloud Security Posture package policies
+  if (!isCspPackagePolicy(packagePolicy)) {
+    return;
+  }
+  // Create csp-rules from the generic asset
+  const existingRuleTemplates: SavedObjectsFindResponse<CloudSecurityPostureRuleTemplateSchema> =
+    await savedObjectsClient.find({ type: cloudSecurityPostureRuleTemplateSavedObjectType });
+
+  if (existingRuleTemplates.total === 0) {
+    return;
+  }
+
+  const cspRules = generateRulesFromTemplates(
+    packagePolicy.id,
+    packagePolicy.policy_id,
+    existingRuleTemplates.saved_objects
+  );
+
+  try {
+    await savedObjectsClient.bulkCreate(cspRules);
+    logger.info(`Generated CSP rules for package ${packagePolicy.policy_id}`);
+  } catch (e) {
+    logger.error('failed to generate rules out of template');
+    logger.error(e);
+  }
+};
+
+/**
+ * Callback to handle deletion of PackagePolicies in Fleet
+ */
+export const onPackagePolicyDeleteCallback = async (
+  logger: Logger,
+  deletedPackagePolicy: ArrayElement<DeletePackagePoliciesResponse>,
+  soClient: ISavedObjectsRepository
+): Promise<void> => {
+  try {
+    const { saved_objects: cspRules }: SavedObjectsFindResponse<CspRuleSchema> =
+      await soClient.find({
+        type: cspRuleAssetSavedObjectType,
+        filter: `${cspRuleAssetSavedObjectType}.attributes.package_policy_id: ${deletedPackagePolicy.id} AND ${cspRuleAssetSavedObjectType}.attributes.policy_id: ${deletedPackagePolicy.policy_id}`,
+      });
+    await Promise.all(
+      cspRules.map((rule) => soClient.delete(cspRuleAssetSavedObjectType, rule.id))
+    );
+  } catch (e) {
+    logger.error(`Failed to delete CSP rules after delete package ${deletedPackagePolicy.id}`);
+    logger.error(e);
+  }
+};
+
+const generateRulesFromTemplates = (
+  packagePolicyId: string,
+  policyId: string,
+  cspRuleTemplates: Array<SavedObjectsFindResult<CloudSecurityPostureRuleTemplateSchema>>
+): Array<SavedObjectsBulkCreateObject<CspRuleSchema>> =>
+  cspRuleTemplates.map((template) => ({
+    type: cspRuleAssetSavedObjectType,
+    attributes: {
+      ...template.attributes,
+      package_policy_id: packagePolicyId,
+      policy_id: policyId,
+    },
+  }));
diff --git a/x-pack/plugins/cloud_security_posture/server/index.ts b/x-pack/plugins/cloud_security_posture/server/index.ts
index 82f2872a859f7..16fc2a2434bf9 100755
--- a/x-pack/plugins/cloud_security_posture/server/index.ts
+++ b/x-pack/plugins/cloud_security_posture/server/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { PluginInitializerContext } from '../../../../src/core/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 import { CspPlugin } from './plugin';
 
 export type { CspServerPluginSetup, CspServerPluginStart } from './types';
diff --git a/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts b/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts
index f769ea171c176..a455bf46d66c7 100644
--- a/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts
+++ b/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts
@@ -10,7 +10,7 @@ import {
   PackageService,
   AgentPolicyServiceInterface,
   PackagePolicyServiceInterface,
-} from '../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 
 export interface CspAppServiceDependencies {
   packageService: PackageService;
diff --git a/x-pack/plugins/cloud_security_posture/server/plugin.ts b/x-pack/plugins/cloud_security_posture/server/plugin.ts
index 386eb2373ad63..754d496965c20 100755
--- a/x-pack/plugins/cloud_security_posture/server/plugin.ts
+++ b/x-pack/plugins/cloud_security_posture/server/plugin.ts
@@ -11,7 +11,10 @@ import type {
   CoreStart,
   Plugin,
   Logger,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
+import { DeepReadonly } from 'utility-types';
+import { DeletePackagePoliciesResponse, PackagePolicy } from '@kbn/fleet-plugin/common';
 import { CspAppService } from './lib/csp_app_services';
 import type {
   CspServerPluginSetup,
@@ -23,8 +26,12 @@ import type {
 import { defineRoutes } from './routes';
 import { cspRuleTemplateAssetType } from './saved_objects/csp_rule_template';
 import { cspRuleAssetType } from './saved_objects/csp_rule_type';
-import { initializeCspRules } from './saved_objects/initialize_rules';
 import { initializeCspTransformsIndices } from './create_indices/create_transforms_indices';
+import {
+  onPackagePolicyPostCreateCallback,
+  onPackagePolicyDeleteCallback,
+} from './fleet_integration/fleet_integration';
+import { CIS_KUBERNETES_PACKAGE_NAME } from '../common/constants';
 
 export interface CspAppContext {
   logger: Logger;
@@ -41,9 +48,11 @@ export class CspPlugin
     >
 {
   private readonly logger: Logger;
+
   constructor(initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get();
   }
+
   private readonly CspAppService = new CspAppService();
 
   public setup(
@@ -71,9 +80,42 @@ export class CspPlugin
       ...plugins.fleet,
     });
 
-    initializeCspRules(core.savedObjects.createInternalRepository());
     initializeCspTransformsIndices(core.elasticsearch.client.asInternalUser, this.logger);
+    plugins.fleet.fleetSetupCompleted().then(() => {
+      plugins.fleet.registerExternalCallback(
+        'packagePolicyPostCreate',
+        async (
+          packagePolicy: PackagePolicy,
+          context: RequestHandlerContext,
+          request: KibanaRequest
+        ): Promise<PackagePolicy> => {
+          if (packagePolicy.package?.name === CIS_KUBERNETES_PACKAGE_NAME) {
+            const soClient = (await context.core).savedObjects.client;
+            await onPackagePolicyPostCreateCallback(this.logger, packagePolicy, soClient);
+          }
+
+          return packagePolicy;
+        }
+      );
+
+      plugins.fleet.registerExternalCallback(
+        'postPackagePolicyDelete',
+        async (deletedPackagePolicies: DeepReadonly<DeletePackagePoliciesResponse>) => {
+          for (const deletedPackagePolicy of deletedPackagePolicies) {
+            if (deletedPackagePolicy.package?.name === CIS_KUBERNETES_PACKAGE_NAME) {
+              await onPackagePolicyDeleteCallback(
+                this.logger,
+                deletedPackagePolicy,
+                core.savedObjects.createInternalRepository()
+              );
+            }
+          }
+        }
+      );
+    });
+
     return {};
   }
+
   public stop() {}
 }
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts
index 384c1d49f03b7..4ed7bdb000344 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts
@@ -9,13 +9,13 @@ import {
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   ElasticsearchClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server/elasticsearch/client/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'src/core/server/http/router/request';
+import { KibanaRequest } from '@kbn/core/server/http/router/request';
 import {
   benchmarksInputSchema,
   DEFAULT_BENCHMARKS_PER_PAGE,
@@ -28,13 +28,13 @@ import {
   createBenchmarkEntry,
 } from './benchmarks';
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   createMockAgentPolicyService,
   createPackagePolicyServiceMock,
-} from '../../../../fleet/server/mocks';
-import { createPackagePolicyMock } from '../../../../fleet/common/mocks';
-import { AgentPolicy } from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/server/mocks';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
+import { AgentPolicy } from '@kbn/fleet-plugin/common';
 
 import { CspAppService } from '../../lib/csp_app_services';
 import { CspAppContext } from '../../plugin';
@@ -88,7 +88,7 @@ describe('benchmarks API', () => {
 
     const [config] = router.get.mock.calls[0];
 
-    expect(config.path).toEqual('/api/csp/benchmarks');
+    expect(config.path).toEqual('/internal/cloud_security_posture/benchmarks');
   });
 
   it('should accept to a user with fleet.all privilege', async () => {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
index 9b862be55988a..2112701f42d4a 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
@@ -6,19 +6,19 @@
  */
 
 import { uniq, map } from 'lodash';
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import type {
   PackagePolicyServiceInterface,
   AgentPolicyServiceInterface,
   AgentService,
-} from '../../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import type {
   GetAgentPoliciesResponseItem,
   PackagePolicy,
   AgentPolicy,
   ListResult,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { BENCHMARKS_ROUTE_PATH, CIS_KUBERNETES_PACKAGE_NAME } from '../../../common/constants';
 import {
   BENCHMARK_PACKAGE_POLICY_PREFIX,
@@ -146,12 +146,12 @@ export const defineGetBenchmarksRoute = (router: CspRouter, cspContext: CspAppCo
       validate: { query: benchmarksInputSchema },
     },
     async (context, request, response) => {
-      if (!context.fleet.authz.fleet.all) {
+      if (!(await context.fleet).authz.fleet.all) {
         return response.forbidden();
       }
 
       try {
-        const soClient = context.core.savedObjects.client;
+        const soClient = (await context.core).savedObjects.client;
         const { query } = request;
 
         const agentService = cspContext.service.agentService;
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts
index 95addd9c055de..bc67722a81c99 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { httpServerMock, httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServerMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-'src/core/server/elasticsearch/client/mocks';
+'@kbn/core/server/elasticsearch/client/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'src/core/server/http/router/request';
+import { KibanaRequest } from '@kbn/core/server/http/router/request';
 import { defineGetComplianceDashboardRoute } from './compliance_dashboard';
 
 import { CspAppService } from '../../lib/csp_app_services';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
index 99046d38dfcc6..d1c0d7c0eb014 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
@@ -5,16 +5,10 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
 import { transformError } from '@kbn/securitysolution-es-utils';
-import type {
-  AggregationsMultiBucketAggregateBase as Aggregation,
-  AggregationsTopHitsAggregate,
-  QueryDslQueryContainer,
-  SearchRequest,
-} from '@elastic/elasticsearch/lib/api/types';
+import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import type { ComplianceDashboardData } from '../../../common/types';
-import { CSP_KUBEBEAT_INDEX_PATTERN, STATS_ROUTE_PATH } from '../../../common/constants';
+import { LATEST_FINDINGS_INDEX_PATTERN, STATS_ROUTE_PATH } from '../../../common/constants';
 import { CspAppContext } from '../../plugin';
 import { getResourcesTypes } from './get_resources_types';
 import { ClusterWithoutTrend, getClusters } from './get_clusters';
@@ -22,59 +16,11 @@ import { getStats } from './get_stats';
 import { CspRouter } from '../../types';
 import { getTrends, Trends } from './get_trends';
 
-export interface ClusterBucket {
-  ordered_top_hits: AggregationsTopHitsAggregate;
-}
-
-interface ClustersQueryResult {
-  aggs_by_cluster_id: Aggregation<ClusterBucket>;
-}
-
 export interface KeyDocCount<TKey = string> {
   key: TKey;
   doc_count: number;
 }
 
-export const getLatestFindingQuery = (): SearchRequest => ({
-  index: CSP_KUBEBEAT_INDEX_PATTERN,
-  size: 0,
-  query: {
-    match_all: {},
-  },
-  aggs: {
-    aggs_by_cluster_id: {
-      terms: { field: 'cluster_id.keyword' },
-      aggs: {
-        ordered_top_hits: {
-          top_hits: {
-            size: 1,
-            sort: {
-              '@timestamp': {
-                order: 'desc',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-});
-
-const getLatestCyclesIds = async (esClient: ElasticsearchClient): Promise<string[]> => {
-  const queryResult = await esClient.search<unknown, ClustersQueryResult>(getLatestFindingQuery(), {
-    meta: true,
-  });
-
-  const clusters = queryResult.body.aggregations?.aggs_by_cluster_id.buckets;
-  if (!Array.isArray(clusters)) throw new Error('missing aggs by cluster id');
-
-  return clusters.map((c) => {
-    const topHit = c.ordered_top_hits.hits.hits[0];
-    if (!topHit) throw new Error('missing cluster latest hit');
-    return topHit._source.cycle_id;
-  });
-};
-
 const getClustersTrends = (clustersWithoutTrends: ClusterWithoutTrend[], trends: Trends) =>
   clustersWithoutTrends.map((cluster) => ({
     ...cluster,
@@ -87,7 +33,6 @@ const getClustersTrends = (clustersWithoutTrends: ClusterWithoutTrend[], trends:
 const getSummaryTrend = (trends: Trends) =>
   trends.map(({ timestamp, summary }) => ({ timestamp, ...summary }));
 
-// TODO: Utilize ES "Point in Time" feature https://www.elastic.co/guide/en/elasticsearch/reference/current/point-in-time-api.html
 export const defineGetComplianceDashboardRoute = (
   router: CspRouter,
   cspContext: CspAppContext
@@ -99,23 +44,30 @@ export const defineGetComplianceDashboardRoute = (
     },
     async (context, _, response) => {
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
-        const latestCyclesIds = await getLatestCyclesIds(esClient);
+        const esClient = (await context.core).elasticsearch.client.asCurrentUser;
+
+        const { id: pitId } = await esClient.openPointInTime({
+          index: LATEST_FINDINGS_INDEX_PATTERN,
+          keep_alive: '30s',
+        });
+
         const query: QueryDslQueryContainer = {
-          bool: {
-            should: latestCyclesIds.map((id) => ({
-              match: { 'cycle_id.keyword': { query: id } },
-            })),
-          },
+          match_all: {},
         };
 
         const [stats, resourcesTypes, clustersWithoutTrends, trends] = await Promise.all([
-          getStats(esClient, query),
-          getResourcesTypes(esClient, query),
-          getClusters(esClient, query),
+          getStats(esClient, query, pitId),
+          getResourcesTypes(esClient, query, pitId),
+          getClusters(esClient, query, pitId),
           getTrends(esClient),
         ]);
 
+        // Try closing the PIT, if it fails we can safely ignore the error since it closes itself after the keep alive
+        //   ends. Not waiting on the promise returned from the `closePointInTime` call to avoid delaying the request
+        esClient.closePointInTime({ id: pitId }).catch((err) => {
+          cspContext.logger.warn(`Could not close PIT for stats endpoint: ${err}`);
+        });
+
         const clusters = getClustersTrends(clustersWithoutTrends, trends);
         const trend = getSummaryTrend(trends);
 
@@ -131,6 +83,7 @@ export const defineGetComplianceDashboardRoute = (
         });
       } catch (err) {
         const error = transformError(err);
+        cspContext.logger.error(`Error while fetching CSP stats: ${err}`);
 
         return response.customError({
           body: { message: error.message },
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
index a030a744c2d2d..4a4afda9a12b2 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   AggregationsMultiBucketAggregateBase as Aggregation,
   QueryDslQueryContainer,
@@ -14,7 +14,6 @@ import type {
 import { Cluster } from '../../../common/types';
 import { getResourceTypeFromAggs, resourceTypeAggQuery } from './get_resources_types';
 import type { ResourceTypeQueryResult } from './get_resources_types';
-import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import { findingsEvaluationAggsQuery, getStatsFromFindingsEvaluationsAggs } from './get_stats';
 import { KeyDocCount } from './compliance_dashboard';
 
@@ -37,8 +36,7 @@ interface ClustersQueryResult {
 
 export type ClusterWithoutTrend = Omit<Cluster, 'trend'>;
 
-export const getClustersQuery = (query: QueryDslQueryContainer): SearchRequest => ({
-  index: CSP_KUBEBEAT_INDEX_PATTERN,
+export const getClustersQuery = (query: QueryDslQueryContainer, pitId: string): SearchRequest => ({
   size: 0,
   query,
   aggs: {
@@ -66,6 +64,9 @@ export const getClustersQuery = (query: QueryDslQueryContainer): SearchRequest =
       },
     },
   },
+  pit: {
+    id: pitId,
+  },
 });
 
 export const getClustersFromAggs = (clusters: ClusterBucket[]): ClusterWithoutTrend[] =>
@@ -102,13 +103,14 @@ export const getClustersFromAggs = (clusters: ClusterBucket[]): ClusterWithoutTr
 
 export const getClusters = async (
   esClient: ElasticsearchClient,
-  query: QueryDslQueryContainer
+  query: QueryDslQueryContainer,
+  pitId: string
 ): Promise<ClusterWithoutTrend[]> => {
-  const queryResult = await esClient.search<unknown, ClustersQueryResult>(getClustersQuery(query), {
-    meta: true,
-  });
+  const queryResult = await esClient.search<unknown, ClustersQueryResult>(
+    getClustersQuery(query, pitId)
+  );
 
-  const clusters = queryResult.body.aggregations?.aggs_by_cluster_id.buckets;
+  const clusters = queryResult.aggregations?.aggs_by_cluster_id.buckets;
   if (!Array.isArray(clusters)) throw new Error('missing aggs by cluster id');
 
   return getClustersFromAggs(clusters);
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts
index 8d31fb7a8e88d..ecb5ee755fb64 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   AggregationsMultiBucketAggregateBase as Aggregation,
   QueryDslQueryContainer,
@@ -13,7 +13,6 @@ import type {
 } from '@elastic/elasticsearch/lib/api/types';
 import type { ComplianceDashboardData } from '../../../common/types';
 import { KeyDocCount } from './compliance_dashboard';
-import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 
 export interface ResourceTypeQueryResult {
   aggs_by_resource_type: Aggregation<ResourceTypeBucket>;
@@ -44,11 +43,13 @@ export const resourceTypeAggQuery = {
   },
 };
 
-export const getRisksEsQuery = (query: QueryDslQueryContainer): SearchRequest => ({
-  index: CSP_KUBEBEAT_INDEX_PATTERN,
+export const getRisksEsQuery = (query: QueryDslQueryContainer, pitId: string): SearchRequest => ({
   size: 0,
   query,
   aggs: resourceTypeAggQuery,
+  pit: {
+    id: pitId,
+  },
 });
 
 export const getResourceTypeFromAggs = (
@@ -63,14 +64,14 @@ export const getResourceTypeFromAggs = (
 
 export const getResourcesTypes = async (
   esClient: ElasticsearchClient,
-  query: QueryDslQueryContainer
+  query: QueryDslQueryContainer,
+  pitId: string
 ): Promise<ComplianceDashboardData['resourcesTypes']> => {
   const resourceTypesQueryResult = await esClient.search<unknown, ResourceTypeQueryResult>(
-    getRisksEsQuery(query),
-    { meta: true }
+    getRisksEsQuery(query, pitId)
   );
 
-  const resourceTypes = resourceTypesQueryResult.body.aggregations?.aggs_by_resource_type.buckets;
+  const resourceTypes = resourceTypesQueryResult.aggregations?.aggs_by_resource_type.buckets;
   if (!Array.isArray(resourceTypes)) throw new Error('missing resources types buckets');
 
   return getResourceTypeFromAggs(resourceTypes);
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
index 82d1dd9a5d49f..788a519138aa0 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { QueryDslQueryContainer, SearchRequest } from '@elastic/elasticsearch/lib/api/types';
-import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import type { ComplianceDashboardData, Score } from '../../../common/types';
 
 /**
@@ -36,10 +35,16 @@ export const findingsEvaluationAggsQuery = {
   },
 };
 
-export const getEvaluationsQuery = (query: QueryDslQueryContainer): SearchRequest => ({
-  index: CSP_KUBEBEAT_INDEX_PATTERN,
+export const getEvaluationsQuery = (
+  query: QueryDslQueryContainer,
+  pitId: string
+): SearchRequest => ({
   query,
+  size: 0,
   aggs: findingsEvaluationAggsQuery,
+  pit: {
+    id: pitId,
+  },
 });
 
 export const getStatsFromFindingsEvaluationsAggs = (
@@ -61,13 +66,14 @@ export const getStatsFromFindingsEvaluationsAggs = (
 
 export const getStats = async (
   esClient: ElasticsearchClient,
-  query: QueryDslQueryContainer
+  query: QueryDslQueryContainer,
+  pitId: string
 ): Promise<ComplianceDashboardData['stats']> => {
   const evaluationsQueryResult = await esClient.search<unknown, FindingsEvaluationsQueryResult>(
-    getEvaluationsQuery(query),
-    { meta: true }
+    getEvaluationsQuery(query, pitId)
   );
-  const findingsEvaluations = evaluationsQueryResult.body.aggregations;
+
+  const findingsEvaluations = evaluationsQueryResult.aggregations;
   if (!findingsEvaluations) throw new Error('missing findings evaluations');
 
   return getStatsFromFindingsEvaluationsAggs(findingsEvaluations);
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
index a432d275fdb64..eba14cb8215c2 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { BENCHMARK_SCORE_INDEX_PATTERN } from '../../../common/constants';
 import { Stats } from '../../../common/types';
 import { calculatePostureScore } from './get_stats';
@@ -25,7 +25,7 @@ export interface ScoreTrendDoc {
   >;
 }
 
-export const getTrendsAggsQuery = () => ({
+export const getTrendsQuery = () => ({
   index: BENCHMARK_SCORE_INDEX_PATTERN,
   size: 5,
   sort: '@timestamp:desc',
@@ -60,7 +60,7 @@ export const getTrendsFromQueryResult = (scoreTrendDocs: ScoreTrendDoc[]): Trend
   }));
 
 export const getTrends = async (esClient: ElasticsearchClient): Promise<Trends> => {
-  const trendsQueryResult = await esClient.search<ScoreTrendDoc>(getTrendsAggsQuery());
+  const trendsQueryResult = await esClient.search<ScoreTrendDoc>(getTrendsQuery());
 
   if (!trendsQueryResult.hits.hits) throw new Error('missing trend results from score index');
 
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts
index c558caea1e9d9..270466d2e3adf 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import {
   savedObjectsClientMock,
   httpServiceMock,
   loggingSystemMock,
   httpServerMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   convertRulesConfigToYaml,
   createRulesConfig,
@@ -23,8 +23,8 @@ import {
 
 import { CspAppService } from '../../lib/csp_app_services';
 import { CspAppContext } from '../../plugin';
-import { createPackagePolicyMock } from '../../../../fleet/common/mocks';
-import { createPackagePolicyServiceMock } from '../../../../fleet/server/mocks';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
 
 import { cspRuleAssetSavedObjectType, CspRuleSchema } from '../../../common/schemas/csp_rule';
 import {
@@ -32,7 +32,7 @@ import {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { Chance } from 'chance';
 
 describe('Update rules configuration API', () => {
@@ -58,7 +58,7 @@ describe('Update rules configuration API', () => {
 
     const [config, _] = router.post.mock.calls[0];
 
-    expect(config.path).toEqual('/api/csp/update_rules_config');
+    expect(config.path).toEqual('/internal/cloud_security_posture/update_rules_config');
   });
 
   it('should accept to a user with fleet.all privilege', async () => {
@@ -110,9 +110,10 @@ describe('Update rules configuration API', () => {
   });
 
   it('validate getCspRules input parameters', async () => {
+    const packagePolicy = createPackagePolicyMock();
     mockSoClient = savedObjectsClientMock.create();
     mockSoClient.find.mockResolvedValueOnce({} as SavedObjectsFindResponse);
-    await getCspRules(mockSoClient);
+    await getCspRules(mockSoClient, packagePolicy);
     expect(mockSoClient.find).toBeCalledTimes(1);
     expect(mockSoClient.find).toHaveBeenCalledWith(
       expect.objectContaining({ type: cspRuleAssetSavedObjectType })
@@ -127,23 +128,21 @@ describe('Update rules configuration API', () => {
       saved_objects: [
         {
           type: 'csp_rule',
-          id: '1.1.1',
-          attributes: { enabled: true },
+          rego_rule_id: '1.1.1',
+          attributes: { enabled: true, rego_rule_id: 'cis_1_1_1' },
         },
         {
           type: 'csp_rule',
-          id: '1.1.2',
-          attributes: { enabled: false },
+          attributes: { enabled: false, rego_rule_id: 'cis_1_1_2' },
         },
         {
           type: 'csp_rule',
-          id: '1.1.3',
-          attributes: { enabled: true },
+          attributes: { enabled: true, rego_rule_id: 'cis_1_1_3' },
         },
       ],
-    } as SavedObjectsFindResponse<CspRuleSchema>;
+    } as unknown as SavedObjectsFindResponse<CspRuleSchema>;
     const cspConfig = await createRulesConfig(cspRules);
-    expect(cspConfig).toMatchObject({ activated_rules: { cis_k8s: ['1.1.1', '1.1.3'] } });
+    expect(cspConfig).toMatchObject({ activated_rules: { cis_k8s: ['cis_1_1_1', 'cis_1_1_3'] } });
   });
 
   it('create empty csp rules config when all rules are disabled', async () => {
@@ -154,16 +153,19 @@ describe('Update rules configuration API', () => {
       saved_objects: [
         {
           type: 'csp_rule',
-          id: '1.1.1',
-          attributes: { enabled: false },
+          rego_rule_id: '1.1.1',
+          attributes: { enabled: false, rego_rule_id: 'cis_1_1_1' },
+        },
+        {
+          type: 'csp_rule',
+          attributes: { enabled: false, rego_rule_id: 'cis_1_1_2' },
         },
         {
           type: 'csp_rule',
-          id: '1.1.2',
-          attributes: { enabled: false },
+          attributes: { enabled: false, rego_rule_id: 'cis_1_1_3' },
         },
       ],
-    } as SavedObjectsFindResponse<CspRuleSchema>;
+    } as unknown as SavedObjectsFindResponse<CspRuleSchema>;
     const cspConfig = await createRulesConfig(cspRules);
     expect(cspConfig).toMatchObject({ activated_rules: { cis_k8s: [] } });
   });
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts
index a57d3902f266c..7b9e63f8bd69e 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts
@@ -8,7 +8,7 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { schema as rt } from '@kbn/config-schema';
 import { transformError } from '@kbn/securitysolution-es-utils';
 
@@ -16,13 +16,13 @@ import { produce } from 'immer';
 import { unset } from 'lodash';
 import yaml from 'js-yaml';
 
-import { PackagePolicy, PackagePolicyConfigRecord } from '../../../../fleet/common';
+import { PackagePolicy, PackagePolicyConfigRecord } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { CspAppContext } from '../../plugin';
 import { CspRulesConfigSchema } from '../../../common/schemas/csp_configuration';
 import { CspRuleSchema, cspRuleAssetSavedObjectType } from '../../../common/schemas/csp_rule';
 import { UPDATE_RULES_CONFIG_ROUTE_PATH } from '../../../common/constants';
 import { CIS_KUBERNETES_PACKAGE_NAME } from '../../../common/constants';
-import { PackagePolicyServiceInterface } from '../../../../fleet/server';
 import { CspRouter } from '../../types';
 
 export const getPackagePolicy = async (
@@ -44,10 +44,13 @@ export const getPackagePolicy = async (
   return packagePolicies![0];
 };
 
-export const getCspRules = async (soClient: SavedObjectsClientContract) => {
+export const getCspRules = async (
+  soClient: SavedObjectsClientContract,
+  packagePolicy: PackagePolicy
+) => {
   const cspRules = await soClient.find<CspRuleSchema>({
     type: cspRuleAssetSavedObjectType,
-    search: '',
+    filter: `${cspRuleAssetSavedObjectType}.attributes.package_policy_id: ${packagePolicy.id} AND ${cspRuleAssetSavedObjectType}.attributes.policy_id: ${packagePolicy.policy_id}`,
     searchFields: ['name'],
     // TODO: research how to get all rules
     perPage: 10000,
@@ -59,10 +62,9 @@ export const createRulesConfig = (
   cspRules: SavedObjectsFindResponse<CspRuleSchema>
 ): CspRulesConfigSchema => {
   const activatedRules = cspRules.saved_objects.filter((cspRule) => cspRule.attributes.enabled);
-
   const config = {
     activated_rules: {
-      cis_k8s: activatedRules.map((activatedRule) => activatedRule.id),
+      cis_k8s: activatedRules.map((activatedRule) => activatedRule.attributes.rego_rule_id),
     },
   };
   return config;
@@ -106,13 +108,14 @@ export const defineUpdateRulesConfigRoute = (router: CspRouter, cspContext: CspA
       validate: { query: configurationUpdateInputSchema },
     },
     async (context, request, response) => {
-      if (!context.fleet.authz.fleet.all) {
+      if (!(await context.fleet).authz.fleet.all) {
         return response.forbidden();
       }
 
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
-        const soClient = context.core.savedObjects.client;
+        const coreContext = await context.core;
+        const esClient = coreContext.elasticsearch.client.asCurrentUser;
+        const soClient = coreContext.savedObjects.client;
         const packagePolicyService = cspContext.service.packagePolicyService;
         const packagePolicyId = request.query.package_policy_id;
 
@@ -125,7 +128,7 @@ export const defineUpdateRulesConfigRoute = (router: CspRouter, cspContext: CspA
           packagePolicyId
         );
 
-        const cspRules = await getCspRules(soClient);
+        const cspRules = await getCspRules(soClient, packagePolicy);
         const rulesConfig = createRulesConfig(cspRules);
         const dataYaml = convertRulesConfigToYaml(rulesConfig);
 
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts
index c41245db04685..35d359929af99 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts
@@ -8,10 +8,10 @@ import {
   elasticsearchClientMock,
   ElasticsearchClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server/elasticsearch/client/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'src/core/server/http/router/request';
-import { httpServerMock, httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server/http/router/request';
+import { httpServerMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { CspAppService } from '../../lib/csp_app_services';
 import { CspAppContext } from '../../plugin';
 import {
@@ -54,7 +54,7 @@ describe('findings API', () => {
 
     const [config, _] = router.get.mock.calls[0];
 
-    expect(config.path).toEqual('/api/csp/findings');
+    expect(config.path).toEqual('/internal/cloud_security_posture/findings');
   });
 
   it('should accept to a user with fleet.all privilege', async () => {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts
index cdbbfbe5ff69d..4c9851be902b3 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { SearchRequest, QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { QueryDslBoolQuery } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
@@ -111,12 +111,12 @@ export const defineFindingsIndexRoute = (router: CspRouter, cspContext: CspAppCo
       validate: { query: findingsInputSchema },
     },
     async (context, request, response) => {
-      if (!context.fleet.authz.fleet.all) {
+      if (!(await context.fleet).authz.fleet.all) {
         return response.forbidden();
       }
 
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
+        const esClient = (await context.core).elasticsearch.client.asCurrentUser;
         const options = buildOptionsRequest(request.query);
 
         const latestCycleIds =
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts
index 53dcb705d0fc1..38a67e95df4a7 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts
@@ -8,8 +8,8 @@
 import {
   elasticsearchClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server/elasticsearch/client/mocks';
-import { loggingSystemMock } from 'src/core/server/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getLatestCycleIds } from './get_latest_cycle_ids';
 
 const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts
index 4b4119801e2b5..781a60727f596 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { AggregationsFiltersAggregate, SearchRequest } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { AGENT_LOGS_INDEX_PATTERN } from '../../../common/constants';
 
 const getAgentLogsEsQuery = (): SearchRequest => ({
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.ts
deleted file mode 100644
index 8f3d6df65b6b5..0000000000000
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { SavedObjectsBulkCreateObject } from 'src/core/server';
-import type { CspRuleSchema } from '../../../common/schemas/csp_rule';
-import { cspRuleAssetSavedObjectType } from '../../../common/schemas/csp_rule';
-
-const benchmark = { name: 'CIS', version: '1.4.1' } as const;
-
-const RULES: CspRuleSchema[] = [
-  {
-    id: '1.1.1',
-    name: 'Ensure that the API server pod specification file permissions are set to 644 or more restrictive (Automated)',
-    description: 'Disable anonymous requests to the API server',
-    rationale:
-      'When enabled, requests that are not rejected by other configured authentication methods\nare treated as anonymous requests. These requests are then served by the API server. You\nshould rely on authentication to authorize access and disallow anonymous requests.\nIf you are using RBAC authorization, it is generally considered reasonable to allow\nanonymous access to the API Server for health checks and discovery purposes, and hence\nthis recommendation is not scored. However, you should consider whether anonymous\ndiscovery is an acceptable risk for your purposes.',
-    impact: 'Anonymous requests will be rejected.',
-    default_value: 'By default, anonymous access is enabled.',
-    remediation:
-      'Edit the API server pod specification file /etc/kubernetes/manifests/kubeapiserver.yaml on the master node and set the below parameter.\n--anonymous-auth=false',
-    tags: [],
-    enabled: true,
-    muted: false,
-    benchmark,
-  },
-  {
-    id: '1.1.2',
-    name: 'Ensure that the --basic-auth-file argument is not set (Scored)',
-    description: 'Do not use basic authentication',
-    rationale:
-      'Basic authentication uses plaintext credentials for authentication. Currently, the basic\nauthentication credentials last indefinitely, and the password cannot be changed without\nrestarting API server. The basic authentication is currently supported for convenience.\nHence, basic authentication should not be used',
-    impact:
-      'You will have to configure and use alternate authentication mechanisms such as tokens and\ncertificates. Username and password for basic authentication could no longer be used.',
-    default_value: 'By default, basic authentication is not set',
-    remediation:
-      'Follow the documentation and configure alternate mechanisms for authentication. Then,\nedit the API server pod specification file /etc/kubernetes/manifests/kubeapiserver.yaml on the master node and remove the --basic-auth-file=<filename>\nparameter.',
-    tags: [],
-    enabled: true,
-    muted: false,
-    benchmark,
-  },
-];
-
-export const CIS_BENCHMARK_1_4_1_RULES: Array<SavedObjectsBulkCreateObject<CspRuleSchema>> =
-  RULES.map((rule) => ({
-    attributes: rule,
-    id: rule.id,
-    type: cspRuleAssetSavedObjectType,
-  }));
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts
index e1082cc59db3f..a75386728ce8b 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   type CloudSecurityPostureRuleTemplateSchema,
   cloudSecurityPostureRuleTemplateSavedObjectType,
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts
index 4b323c127c0e6..a6309f321328f 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { SavedObjectsType, SavedObjectsValidationMap } from '../../../../../src/core/server';
+import type { SavedObjectsType, SavedObjectsValidationMap } from '@kbn/core/server';
 import {
   type CspRuleSchema,
   cspRuleSchema,
@@ -29,6 +29,12 @@ export const ruleAssetSavedObjectMappings: SavedObjectsType<CspRuleSchema>['mapp
         },
       },
     },
+    package_policy_id: {
+      type: 'keyword',
+    },
+    policy_id: {
+      type: 'keyword',
+    },
     description: {
       type: 'text',
     },
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.ts
deleted file mode 100644
index 71e7697296acb..0000000000000
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { ISavedObjectsRepository } from 'src/core/server';
-import { CIS_BENCHMARK_1_4_1_RULES } from './cis_1_4_1/rules';
-import { cspRuleAssetSavedObjectType } from '../../common/schemas/csp_rule';
-
-export const initializeCspRules = async (client: ISavedObjectsRepository) => {
-  const existingRules = await client.find({ type: cspRuleAssetSavedObjectType, perPage: 1 });
-
-  // TODO: version?
-  if (existingRules.total !== 0) return;
-
-  try {
-    await client.bulkCreate(CIS_BENCHMARK_1_4_1_RULES);
-  } catch (e) {
-    // TODO: add logger
-    // TODO: handle error
-  }
-};
diff --git a/x-pack/plugins/cloud_security_posture/server/types.ts b/x-pack/plugins/cloud_security_posture/server/types.ts
index 9fe602424321c..ccbded12bddb2 100644
--- a/x-pack/plugins/cloud_security_posture/server/types.ts
+++ b/x-pack/plugins/cloud_security_posture/server/types.ts
@@ -8,16 +8,11 @@
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
-import type {
-  RouteMethod,
-  KibanaResponseFactory,
-  RequestHandler,
-  IRouter,
-} from '../../../../src/core/server';
+import type { RouteMethod, KibanaResponseFactory, RequestHandler, IRouter } from '@kbn/core/server';
 
-import type { FleetStartContract, FleetRequestHandlerContext } from '../../fleet/server';
+import type { FleetStartContract, FleetRequestHandlerContext } from '@kbn/fleet-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CspServerPluginSetup {}
diff --git a/x-pack/plugins/cross_cluster_replication/common/constants/index.ts b/x-pack/plugins/cross_cluster_replication/common/constants/index.ts
index a800afcf77ae4..327e83250e021 100644
--- a/x-pack/plugins/cross_cluster_replication/common/constants/index.ts
+++ b/x-pack/plugins/cross_cluster_replication/common/constants/index.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const platinumLicense: LicenseType = 'platinum';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js
index b47dc3e321f8b..e04cbb836157f 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import './mocks';
 import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './helpers';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js
index 61d5eae72bcfd..b8566af668230 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import './mocks';
 import { setupEnvironment, pageHelpers, nextTick, delay } from './helpers';
 import { RemoteClustersFormField } from '../../app/components';
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js
index 43bdcd8b3a414..8e54f122d8d42 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../../common/constants';
 
 // Register helpers to mock HTTP Requests
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
index 1d030dff5f2f7..f906501fcc4c4 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { docLinksServiceMock } from '../../../../../../../src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 import { init as initDocumentation } from '../../../app/services/documentation_links';
 import { init as initHttpRequests } from './http_requests';
 import { setHttpClient } from '../../../app/services/api';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/app.tsx b/x-pack/plugins/cross_cluster_replication/public/app/app.tsx
index 90d26f0d68288..fcfe84b3c37e8 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/app.tsx
+++ b/x-pack/plugins/cross_cluster_replication/public/app/app.tsx
@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react';
 import { Route, Switch, Router, Redirect } from 'react-router-dom';
-import { ScopedHistory, ApplicationStart } from 'kibana/public';
+import { ScopedHistory, ApplicationStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
index 449a43bc4e5bf..55eee4a03e760 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
@@ -30,7 +30,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 import { extractQueryParams, indices } from '../../shared_imports';
 import { routing } from '../services/routing';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js
index 5420681335504..64d9de4f16098 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js
@@ -11,7 +11,7 @@ import { connect } from 'react-redux';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiConfirmModal, EuiLink } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { routing } from '../../services/routing';
 import { resumeFollowerIndex } from '../../store/actions';
 import { arrify } from '../../../../common/services/utils';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/index.tsx b/x-pack/plugins/cross_cluster_replication/public/app/index.tsx
index cee244c2de006..318cdfb2a1c92 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/index.tsx
+++ b/x-pack/plugins/cross_cluster_replication/public/app/index.tsx
@@ -18,7 +18,7 @@ import {
   DocLinksStart,
   CoreTheme,
   ExecutionContextStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { KibanaThemeProvider, useExecutionContext } from '../shared_imports';
 import { init as initBreadcrumbs, SetBreadcrumbs } from './services/breadcrumbs';
 import { init as initDocumentation } from './services/documentation_links';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js
index ac568a233e7c1..917477503a067 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js
@@ -13,7 +13,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiPageContent, EuiEmptyPrompt, EuiPageContentBody } from '@elastic/eui';
 
 import { listBreadcrumb, editBreadcrumb, setBreadcrumbs } from '../../services/breadcrumbs';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import {
   AutoFollowPatternForm,
   AutoFollowPatternPageTitle,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js
index ffec09844326d..684246f103b19 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { setBreadcrumbs, listBreadcrumb, editBreadcrumb } from '../../services/breadcrumbs';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import {
   FollowerIndexForm,
   FollowerIndexPageTitle,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
index 3921fee1b12e0..7f2093602331b 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContent, EuiButton, EuiEmptyPrompt, EuiText, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, PageError, PageLoading } from '../../../../shared_imports';
 import { trackUiMetric, METRIC_TYPE } from '../../../services/track_ui_metric';
 import { API_STATUS, UIM_AUTO_FOLLOW_PATTERN_LIST_LOAD } from '../../../constants';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
index 1776e06cea8df..5c966eac9219d 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
@@ -18,7 +18,7 @@ import {
   EuiOverlayMask,
   EuiHealth,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { API_STATUS, UIM_AUTO_FOLLOW_PATTERN_SHOW_DETAILS_CLICK } from '../../../../../constants';
 import {
   AutoFollowPatternDeleteProvider,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js
index aa7bc965465c6..9718f6f34eef8 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import moment from 'moment';
 
-import { getIndexListUri } from '../../../../../../../../../plugins/index_management/public';
+import { getIndexListUri } from '@kbn/index-management-plugin/public';
 
 import {
   EuiButtonEmpty,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js
index 5d5d29e4cdba4..75263594d5a42 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js
@@ -33,7 +33,7 @@ import {
 import 'react-ace';
 import 'brace/theme/textmate';
 
-import { getIndexListUri } from '../../../../../../../../../plugins/index_management/public';
+import { getIndexListUri } from '@kbn/index-management-plugin/public';
 import { routing } from '../../../../../services/routing';
 import { API_STATUS } from '../../../../../constants';
 import { ContextMenu } from '../context_menu';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js
index c0a05f1d86c5b..6b4170cf18c02 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js
@@ -23,7 +23,7 @@ import { FollowerIndexActionsProvider } from '../../../../../components';
 import { routing } from '../../../../../services/routing';
 import { trackUiMetric } from '../../../../../services/track_ui_metric';
 import { ContextMenu } from '../context_menu';
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 const actionI18nTexts = {
   pause: i18n.translate(
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
index 072e081de8df8..a91df597c3f03 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContent, EuiButton, EuiEmptyPrompt, EuiText, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, PageLoading, PageError } from '../../../../shared_imports';
 import { trackUiMetric, METRIC_TYPE } from '../../../services/track_ui_metric';
 import { API_STATUS, UIM_FOLLOWER_INDEX_LIST_LOAD } from '../../../constants';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js b/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
index d7fda8dc25aca..3b07c8972815c 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
@@ -9,7 +9,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { indices } from '../../shared_imports';
 
 const { indexNameBeginsWithPeriod, findIllegalCharactersInIndexName, indexNameContainsSpaces } =
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts
index 5682c87a15faf..4ccd6c5f74901 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 export type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts
index 65bbfd919f94d..267f71b58bbdb 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DocLinksStart } from 'src/core/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 export let documentationLinks: DocLinksStart['links'];
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts
index b9612e1671708..e0ef03e12da04 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IToasts, FatalErrorsSetup } from 'src/core/public';
+import { IToasts, FatalErrorsSetup } from '@kbn/core/public';
 
 let _toasts: IToasts;
 let _fatalErrors: FatalErrorsSetup;
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts
index 14e053a251a3f..f6f2d7c562690 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
 
 import { UIM_APP_NAME } from '../constants';
diff --git a/x-pack/plugins/cross_cluster_replication/public/index.ts b/x-pack/plugins/cross_cluster_replication/public/index.ts
index 205c1e7bd01b2..9f94ab24826d3 100644
--- a/x-pack/plugins/cross_cluster_replication/public/index.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { CrossClusterReplicationPlugin } from './plugin';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/plugin.ts b/x-pack/plugins/cross_cluster_replication/public/plugin.ts
index 5699ad0980dc4..a13fd64d927cd 100644
--- a/x-pack/plugins/cross_cluster_replication/public/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/plugin.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { firstValueFrom } from 'rxjs';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
 import { PLUGIN, MANAGEMENT_ID } from '../common/constants';
 import { init as initUiMetric } from './app/services/track_ui_metric';
diff --git a/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts b/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
index d9a0db5cd1a7d..7bea4593c7054 100644
--- a/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
@@ -11,11 +11,8 @@ export {
   SectionLoading,
   PageError,
   PageLoading,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
diff --git a/x-pack/plugins/cross_cluster_replication/public/types.ts b/x-pack/plugins/cross_cluster_replication/public/types.ts
index 7c7aeebeebe3f..b6130a1ff1343 100644
--- a/x-pack/plugins/cross_cluster_replication/public/types.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { IndexManagementPluginSetup } from '../../index_management/public';
-import { RemoteClustersPluginSetup } from '../../remote_clusters/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
+import { RemoteClustersPluginSetup } from '@kbn/remote-clusters-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface PluginDependencies {
   usageCollection: UsageCollectionSetup;
diff --git a/x-pack/plugins/cross_cluster_replication/server/config.ts b/x-pack/plugins/cross_cluster_replication/server/config.ts
index 732137e308a0d..bac5f917f22a6 100644
--- a/x-pack/plugins/cross_cluster_replication/server/config.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/index.ts b/x-pack/plugins/cross_cluster_replication/server/index.ts
index 7a0984a6117bf..a24e95bddede1 100644
--- a/x-pack/plugins/cross_cluster_replication/server/index.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CrossClusterReplicationServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/cross_cluster_replication/server/plugin.ts b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
index 31c9647cad788..657468b76d615 100644
--- a/x-pack/plugins/cross_cluster_replication/server/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { firstValueFrom, Observable } from 'rxjs';
-import { CoreSetup, CoreStart, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
-import { IScopedClusterClient } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
-import { Index } from '../../index_management/server';
+import { Index } from '@kbn/index-management-plugin/server';
 import { PLUGIN } from '../common/constants';
 import { SetupDependencies, StartDependencies } from './types';
 import { registerApiRoutes } from './routes';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts
index f778dc3eedd1a..b0af4faedf325 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.ts
index 3fe320fe5bdd4..d01ecb03dbaed 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.ts
@@ -34,7 +34,7 @@ export const registerCreateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id, ...rest } = request.body;
       const body = serializeAutoFollowPattern(rest as AutoFollowPattern);
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts
index 6469b4a2ce576..5818abd739b19 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.ts
index 63ade6d1bd070..95da1239061b1 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.ts
@@ -30,7 +30,7 @@ export const registerDeleteRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts
index 67ea716976417..3e137953f8ab7 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.ts
index 7cd9508bd7372..006199673410e 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.ts
@@ -23,7 +23,7 @@ export const registerFetchRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const { patterns } = await client.asCurrentUser.ccr.getAutoFollowPattern();
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts
index a2bf912a99728..aa3197586c3f0 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.ts
index a5a70805d518d..0a0c2f4317d77 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.ts
@@ -31,7 +31,7 @@ export const registerGetRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
 
       try {
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts
index f74da91047ce7..8f672cc80cd33 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.ts
index 1428e33dee660..b355d37fc5919 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.ts
@@ -29,7 +29,7 @@ export const registerPauseRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts
index 1837f1c17b384..9f1da2bd45534 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.ts
index 912ecd689054d..79d31f84398f1 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.ts
@@ -29,7 +29,7 @@ export const registerResumeRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts
index 19d165a80eb3b..b7cd60b61d67d 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.ts
index 98a716eb88cc6..0a0ec51ad44d1 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.ts
@@ -39,7 +39,7 @@ export const registerUpdateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const body = serializeAutoFollowPattern(request.body as AutoFollowPattern);
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts
index dbee279a01336..e4b80b273d4eb 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts
@@ -22,7 +22,7 @@ export const registerPermissionsRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       if (!license.isEsSecurityEnabled) {
         // If security has been disabled in elasticsearch.yml. we'll just let the user use CCR
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_stats_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_stats_route.ts
index bab31c53a83a2..b9bf86d877a69 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_stats_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_stats_route.ts
@@ -23,7 +23,7 @@ export const registerStatsRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const { auto_follow_stats: autoFollowStats } = await client.asCurrentUser.ccr.stats();
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts
index 8de168e8a17d1..90573088b47e2 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.ts
index 0aae8f9c115bc..84b6096cb3f5b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.ts
@@ -44,7 +44,7 @@ export const registerCreateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { name, ...rest } = request.body;
       const body = removeEmptyFields(serializeFollowerIndex(rest as FollowerIndex));
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts
index 3d818f40b0262..0513f75edb33b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.ts
index 7bbe2c8c05d4a..da71d96669efb 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.ts
@@ -23,7 +23,7 @@ export const registerFetchRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const { follower_indices: followerIndices } = await client.asCurrentUser.ccr.followInfo({
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts
index a0af8827b8744..11b13beef0ad3 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.ts
index c33ed97c289f0..44babd1bbcc46 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.ts
@@ -30,7 +30,7 @@ export const registerGetRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
 
       try {
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts
index 920de2777ad2e..cf8b3a66c6fbd 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.ts
index 6c888e0a6e8bd..3d77ffefec9fe 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.ts
@@ -27,7 +27,7 @@ export const registerPauseRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts
index 1cd54a898dc39..ac2959486859b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.ts
index 206de7d62fb38..da01b3d0e891f 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.ts
@@ -27,7 +27,7 @@ export const registerResumeRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts
index 8ef9c84594a46..7dde0daa4ebdc 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts
index e240a10df0684..f7987029ebc77 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts
@@ -27,7 +27,7 @@ export const registerUnfollowRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
index d2cd579687106..0e098da67a25b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts
index 0bacbd5fb3450..3c0850ac5984c 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts
@@ -44,7 +44,7 @@ export const registerUpdateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { id } = request.params;
 
       // We need to first pause the follower and then resume it by passing the advanced settings
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts
index c125d6b4552fd..057f4a9863e45 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandlerContext } from 'src/core/server';
+import { RequestHandlerContext } from '@kbn/core/server';
 import { License } from '../../shared_imports';
 
 export function mockRouteContext(mockedFunctions: unknown): RequestHandlerContext {
diff --git a/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts b/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts
index e9e3ed72aed64..ad01d3942d4d2 100644
--- a/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export { License } from '../../license_api_guard/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export { License } from '@kbn/license-api-guard-plugin/server';
diff --git a/x-pack/plugins/cross_cluster_replication/server/types.ts b/x-pack/plugins/cross_cluster_replication/server/types.ts
index 18d2c45039eba..6752bf397203b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/types.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
-import { IndexManagementPluginSetup } from '../../index_management/server';
-import { RemoteClustersPluginSetup } from '../../remote_clusters/server';
+import { IRouter } from '@kbn/core/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
+import { RemoteClustersPluginSetup } from '@kbn/remote-clusters-plugin/server';
 import { License, handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts
index 7a7a70472b7df..61c42b74e9e83 100644
--- a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts
+++ b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { createExtract, createInject } from './dashboard_drilldown_persistable_state';
-import { SerializedEvent } from '../../../../ui_actions_enhanced/common';
+import { SerializedEvent } from '@kbn/ui-actions-enhanced-plugin/common';
 
 const drilldownId = 'test_id';
 const extract = createExtract({ drilldownId });
diff --git a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts
index 04ee451c91c75..fe71ebd65ea8f 100644
--- a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts
+++ b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from '../../../../../../src/core/types';
-import { PersistableStateService } from '../../../../../../src/plugins/kibana_utils/common';
-import { SerializedAction, SerializedEvent } from '../../../../ui_actions_enhanced/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+import { SerializedAction, SerializedEvent } from '@kbn/ui-actions-enhanced-plugin/common';
 import { DrilldownConfig } from './types';
 
 type DashboardDrilldownPersistableState = PersistableStateService<SerializedEvent>;
diff --git a/x-pack/plugins/dashboard_enhanced/public/index.ts b/x-pack/plugins/dashboard_enhanced/public/index.ts
index 545696abb0ac5..ce765b86aeb54 100644
--- a/x-pack/plugins/dashboard_enhanced/public/index.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DashboardEnhancedPlugin } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/dashboard_enhanced/public/plugin.ts b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
index 339269f95e51e..8c16c8c7d14bb 100644
--- a/x-pack/plugins/dashboard_enhanced/public/plugin.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
@@ -5,13 +5,16 @@
  * 2.0.
  */
 
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { SharePluginStart, SharePluginSetup } from '../../../../src/plugins/share/public';
-import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import {
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
 import { DashboardDrilldownsService } from './services';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/public';
-import { DashboardStart } from '../../../../src/plugins/dashboard/public';
 
 export interface SetupDependencies {
   uiActionsEnhanced: AdvancedUiActionsSetup;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
index 1e58b13c00004..22f0f9148861c 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
@@ -5,24 +5,24 @@
  * 2.0.
  */
 
-import type { KibanaLocation } from 'src/plugins/share/public';
+import type { KibanaLocation } from '@kbn/share-plugin/public';
 import React from 'react';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { DashboardStart } from 'src/plugins/dashboard/public';
-import { DrilldownConfig } from '../../../../common/drilldowns/dashboard_drilldown/types';
-import { reactToUiComponent } from '../../../../../../../src/plugins/kibana_react/public';
-import { CollectConfigContainer } from './components';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
 import {
   AdvancedUiActionsStart,
   UiActionsEnhancedBaseActionFactoryContext as BaseActionFactoryContext,
   UiActionsEnhancedDrilldownDefinition as Drilldown,
-} from '../../../../../ui_actions_enhanced/public';
-import { txtGoToDashboard } from './i18n';
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import {
   CollectConfigProps,
   StartServicesGetter,
   UiComponent,
-} from '../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
+import { DrilldownConfig } from '../../../../common/drilldowns/dashboard_drilldown/types';
+import { CollectConfigContainer } from './components';
+import { txtGoToDashboard } from './i18n';
 import { Config } from './types';
 
 export interface Params {
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx
index 7b6caabfd5a7e..4a9818b3f23f5 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 import { debounce, findIndex } from 'lodash';
-import { SimpleSavedObject } from '../../../../../../../../src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
 import { DashboardDrilldownConfig } from './dashboard_drilldown_config';
 import { txtDestinationDashboardNotFound } from './i18n';
-import { CollectConfigProps } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { Config } from '../types';
 import { Params } from '../abstract_dashboard_drilldown';
 
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts
index 13f29ea490f7f..599ecce6217e2 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UiActionsEnhancedBaseActionFactoryContext } from '../../../../../ui_actions_enhanced/public';
+import { UiActionsEnhancedBaseActionFactoryContext } from '@kbn/ui-actions-enhanced-plugin/public';
 import { DrilldownConfig } from '../../../../common';
 
 export type Config = DrilldownConfig;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts
index ce96b3497e9ff..b9cfe79e19fa9 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { APPLY_FILTER_TRIGGER } from '../../../../../../../src/plugins/data/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
 import {
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
   IEmbeddable,
   Container as EmbeddableContainer,
-} from '../../../../../../../src/plugins/embeddable/public';
-import { isEnhancedEmbeddable } from '../../../../../embeddable_enhanced/public';
-import { UiActionsEnhancedDrilldownTemplate as DrilldownTemplate } from '../../../../../ui_actions_enhanced/public';
+} from '@kbn/embeddable-plugin/public';
+import { isEnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
+import { UiActionsEnhancedDrilldownTemplate as DrilldownTemplate } from '@kbn/ui-actions-enhanced-plugin/public';
 
 /**
  * We know that VALUE_CLICK_TRIGGER and SELECT_RANGE_TRIGGER are also triggering APPLY_FILTER_TRIGGER.
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
index 2026781c705d7..295bf8968bd5d 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
@@ -10,11 +10,11 @@ import {
   FlyoutCreateDrilldownAction,
   OpenFlyoutAddDrilldownParams,
 } from './flyout_create_drilldown';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
-import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
-import { UiActionsEnhancedActionFactory } from '../../../../../../ui_actions_enhanced/public/';
+import { uiActionsEnhancedPluginMock } from '@kbn/ui-actions-enhanced-plugin/public/mocks';
+import { UiActionsEnhancedActionFactory } from '@kbn/ui-actions-enhanced-plugin/public';
 
 const overlays = coreMock.createStart().overlays;
 const uiActionsEnhanced = uiActionsEnhancedPluginMock.createStartContract();
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
index e1627ea1cb6c3..c8715c9e3b416 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
@@ -9,19 +9,15 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { distinctUntilChanged, filter, map, skip, take, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { Action } from '../../../../../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
-import {
-  CONTEXT_MENU_TRIGGER,
-  EmbeddableContext,
-  ViewMode,
-} from '../../../../../../../../src/plugins/embeddable/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { CONTEXT_MENU_TRIGGER, EmbeddableContext, ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   isEnhancedEmbeddable,
   embeddableEnhancedDrilldownGrouping,
-} from '../../../../../../embeddable_enhanced/public';
+} from '@kbn/embeddable-enhanced-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { StartDependencies } from '../../../../plugin';
-import { StartServicesGetter } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { ensureNestedTriggers, createDrilldownTemplatesFromSiblings } from '../drilldown_shared';
 
 export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
index e4c2d5b657630..b0aef4d4eb719 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
@@ -7,10 +7,10 @@
 
 import { Subject } from 'rxjs';
 import { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_edit_drilldown';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
-import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
-import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { uiActionsEnhancedPluginMock } from '@kbn/ui-actions-enhanced-plugin/public/mocks';
+import { EnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
 import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
 
 const overlays = coreMock.createStart().overlays;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
index 09ea886f9a2d0..44bfbb26421c6 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
@@ -8,24 +8,17 @@
 import React from 'react';
 import { distinctUntilChanged, filter, map, skip, take, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { Action } from '../../../../../../../../src/plugins/ui_actions/public';
-import {
-  reactToUiComponent,
-  toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
-import {
-  EmbeddableContext,
-  ViewMode,
-  CONTEXT_MENU_TRIGGER,
-} from '../../../../../../../../src/plugins/embeddable/public';
-import { txtDisplayName } from './i18n';
-import { MenuItem } from './menu_item';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { reactToUiComponent, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { EmbeddableContext, ViewMode, CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 import {
   isEnhancedEmbeddable,
   embeddableEnhancedDrilldownGrouping,
-} from '../../../../../../embeddable_enhanced/public';
+} from '@kbn/embeddable-enhanced-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { txtDisplayName } from './i18n';
+import { MenuItem } from './menu_item';
 import { StartDependencies } from '../../../../plugin';
-import { StartServicesGetter } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { createDrilldownTemplatesFromSiblings, ensureNestedTriggers } from '../drilldown_shared';
 
 export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
index 5c03d90212ff2..d266e1b6faf5f 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { render, act } from '@testing-library/react';
 import { MenuItem } from './menu_item';
-import { createStateContainer } from '../../../../../../../../src/plugins/kibana_utils/public';
-import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../../../../../ui_actions_enhanced/public';
-import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
+import { createStateContainer } from '@kbn/kibana-utils-plugin/public';
+import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '@kbn/ui-actions-enhanced-plugin/public';
+import { EnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
 
 test('<MenuItem/>', () => {
   const state = createStateContainer<{ events: object[] }>({ events: [] });
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
index b7cc002a7120b..eb0dab1c46856 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import { EuiNotificationBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { useContainerState } from '../../../../../../../../src/plugins/kibana_utils/public';
-import { EnhancedEmbeddableContext } from '../../../../../../embeddable_enhanced/public';
+import { useContainerState } from '@kbn/kibana-utils-plugin/public';
+import { EnhancedEmbeddableContext } from '@kbn/embeddable-enhanced-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { txtDisplayName } from './i18n';
-import { ActionExecutionContext } from '../../../../../../../../src/plugins/ui_actions/public';
 
 export const MenuItem: React.FC<{ context: ActionExecutionContext<EnhancedEmbeddableContext> }> = ({
   context,
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
index fa25a48ba0c91..067b27fd12e5b 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Embeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public';
-import { EnhancedEmbeddable } from '../../../../../embeddable_enhanced/public';
+import { Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { EnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
 import {
   UiActionsEnhancedMemoryActionStorage as MemoryActionStorage,
   UiActionsEnhancedDynamicActionManager as DynamicActionManager,
   AdvancedUiActionsStart,
-} from '../../../../../ui_actions_enhanced/public';
-import { uiActionsEnhancedPluginMock } from '../../../../../ui_actions_enhanced/public/mocks';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { uiActionsEnhancedPluginMock } from '@kbn/ui-actions-enhanced-plugin/public/mocks';
 
 export class MockEmbeddable extends Embeddable {
   public rootType = 'dashboard';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
index 0ecd403edaaf3..cc65ae1556e08 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { SetupDependencies, StartDependencies } from '../../plugin';
-import { CONTEXT_MENU_TRIGGER } from '../../../../../../src/plugins/embeddable/public';
 import { FlyoutCreateDrilldownAction, FlyoutEditDrilldownAction } from './actions';
 import { EmbeddableToDashboardDrilldown } from './embeddable_to_dashboard_drilldown';
-import { createStartServicesGetter } from '../../../../../../src/plugins/kibana_utils/public';
 
 interface BootstrapParams {
   enableDrilldowns: boolean;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
index 6c4a9d31c583c..abc2c8b33e5de 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
@@ -8,16 +8,16 @@
 import type { Filter, RangeFilter } from '@kbn/es-query';
 import { EmbeddableToDashboardDrilldown } from './embeddable_to_dashboard_drilldown';
 import { AbstractDashboardDrilldownConfig as Config } from '../abstract_dashboard_drilldown';
-import { savedObjectsServiceMock } from '../../../../../../../src/core/public/mocks';
-import { FilterStateStore, Query, TimeRange } from '../../../../../../../src/plugins/data/common';
-import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/unified_search/public';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import { FilterStateStore, Query, TimeRange } from '@kbn/data-plugin/common';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
 import {
   DashboardAppLocatorDefinition,
   DashboardAppLocatorParams,
-} from '../../../../../../../src/plugins/dashboard/public/locator';
+} from '@kbn/dashboard-plugin/public/locator';
 import { StartDependencies } from '../../../plugin';
-import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_utils/public/core';
-import { EnhancedEmbeddableContext } from '../../../../../embeddable_enhanced/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public/core';
+import { EnhancedEmbeddableContext } from '@kbn/embeddable-enhanced-plugin/public';
 
 describe('.isConfigValid()', () => {
   const drilldown = new EmbeddableToDashboardDrilldown({} as any);
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
index d3478013b96d0..bf625aabe8cb8 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
@@ -5,12 +5,9 @@
  * 2.0.
  */
 import { type Filter, isFilters, isFilterPinned } from '@kbn/es-query';
-import type { KibanaLocation } from 'src/plugins/share/public';
-import {
-  DashboardAppLocatorParams,
-  cleanEmptyKeys,
-} from '../../../../../../../src/plugins/dashboard/public';
-import { setStateToKbnUrl } from '../../../../../../../src/plugins/kibana_utils/public';
+import type { KibanaLocation } from '@kbn/share-plugin/public';
+import { DashboardAppLocatorParams, cleanEmptyKeys } from '@kbn/dashboard-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import {
   APPLY_FILTER_TRIGGER,
   isQuery,
@@ -18,9 +15,10 @@ import {
   Query,
   TimeRange,
   extractTimeRange,
-} from '../../../../../../../src/plugins/data/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/unified_search/public';
-import { IEmbeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/data-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
+import { IEmbeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { EnhancedEmbeddableContext } from '@kbn/embeddable-enhanced-plugin/public';
 import {
   AbstractDashboardDrilldown,
   AbstractDashboardDrilldownParams,
@@ -28,7 +26,6 @@ import {
 } from '../abstract_dashboard_drilldown';
 import { EMBEDDABLE_TO_DASHBOARD_DRILLDOWN } from './constants';
 import { createExtract, createInject } from '../../../../common';
-import { EnhancedEmbeddableContext } from '../../../../../embeddable_enhanced/public';
 
 interface EmbeddableQueryInput extends EmbeddableInput {
   query?: Query;
diff --git a/x-pack/plugins/dashboard_enhanced/server/index.ts b/x-pack/plugins/dashboard_enhanced/server/index.ts
index 3351cd9547903..8fa8ea33c1788 100644
--- a/x-pack/plugins/dashboard_enhanced/server/index.ts
+++ b/x-pack/plugins/dashboard_enhanced/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DashboardEnhancedPlugin } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/dashboard_enhanced/server/plugin.ts b/x-pack/plugins/dashboard_enhanced/server/plugin.ts
index 89d4d70a1f6f4..18ae458ea9873 100644
--- a/x-pack/plugins/dashboard_enhanced/server/plugin.ts
+++ b/x-pack/plugins/dashboard_enhanced/server/plugin.ts
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server';
-import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import {
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '@kbn/ui-actions-enhanced-plugin/server';
 import { EMBEDDABLE_TO_DASHBOARD_DRILLDOWN, createExtract, createInject } from '../common';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/data_enhanced/config.ts b/x-pack/plugins/data_enhanced/config.ts
index e08381316a29c..eb3ee0da41839 100644
--- a/x-pack/plugins/data_enhanced/config.ts
+++ b/x-pack/plugins/data_enhanced/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { searchSessionsConfigSchema } from '../../../src/plugins/data/config';
+import { searchSessionsConfigSchema } from '@kbn/data-plugin/config';
 
 export const configSchema = schema.object({
   search: schema.object({
diff --git a/x-pack/plugins/data_enhanced/public/index.ts b/x-pack/plugins/data_enhanced/public/index.ts
index 38b8d7d5c5fdf..7af1aff1b3106 100644
--- a/x-pack/plugins/data_enhanced/public/index.ts
+++ b/x-pack/plugins/data_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DataEnhancedPlugin, DataEnhancedSetup, DataEnhancedStart } from './plugin';
 import { ConfigSchema } from '../config';
 
@@ -14,7 +14,4 @@ export const plugin = (initializerContext: PluginInitializerContext<ConfigSchema
 
 export type { DataEnhancedSetup, DataEnhancedStart };
 
-export {
-  ENHANCED_ES_SEARCH_STRATEGY,
-  EQL_SEARCH_STRATEGY,
-} from '../../../../src/plugins/data/common';
+export { ENHANCED_ES_SEARCH_STRATEGY, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
diff --git a/x-pack/plugins/data_enhanced/public/plugin.ts b/x-pack/plugins/data_enhanced/public/plugin.ts
index ee76cce9b9d2b..f1bb9d7b4b4b6 100644
--- a/x-pack/plugins/data_enhanced/public/plugin.ts
+++ b/x-pack/plugins/data_enhanced/public/plugin.ts
@@ -7,22 +7,22 @@
 
 import React from 'react';
 import moment from 'moment';
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,
   SearchUsageCollector,
-} from '../../../../src/plugins/data/public';
-import { BfetchPublicSetup } from '../../../../src/plugins/bfetch/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { SharePluginStart } from '../../../../src/plugins/share/public';
+} from '@kbn/data-plugin/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
 import { registerSearchSessionsMgmt } from './search/sessions_mgmt';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
 import { createConnectedSearchSessionIndicator } from './search';
 import { ConfigSchema } from '../config';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { ScreenshotModePluginStart } from '../../../../src/plugins/screenshot_mode/public';
 
 export interface DataEnhancedSetupDependencies {
   bfetch: BfetchPublicSetup;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx
index 7f5117740f38c..d2be863170a4b 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
-import type { ManagementAppMountParams } from 'src/plugins/management/public';
+import { CoreSetup } from '@kbn/core/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import type {
   AppDependencies,
   IManagementSectionsPluginsSetup,
   IManagementSectionsPluginsStart,
   SessionsConfigSchema,
-} from '../';
-import { APP } from '../';
+} from '..';
+import { APP } from '..';
 import { SearchSessionsMgmtAPI } from '../lib/api';
 import { AsyncSearchIntroDocumentation } from '../lib/documentation';
 import { renderApp } from './render';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx
index 1406cf98a843e..563179064062b 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AppDependencies } from '../';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { AppDependencies } from '..';
 import { SearchSessionsMgmtMain } from '../components/main';
 
 export const renderApp = (
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx
index 127a63b647a24..d612aada1084a 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx
@@ -9,10 +9,10 @@ import { EuiConfirmModal } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
-import { CoreStart } from 'kibana/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
-import { IClickActionDescriptor } from '../';
+import { IClickActionDescriptor } from '..';
 import { OnActionDismiss } from './types';
 import { UISession } from '../../types';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx
index d8b5e9de16688..bb64fef09aba8 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx
@@ -10,10 +10,10 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
 import moment from 'moment';
-import { CoreStart } from 'kibana/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
-import { IClickActionDescriptor } from '../';
+import { IClickActionDescriptor } from '..';
 import { OnActionDismiss } from './types';
 import { UISession } from '../../types';
 import extendSessionIcon from '../../icons/extend_session.svg';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx
index c3860fe3e276b..4ab246b5ee403 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { IClickActionDescriptor } from '../';
+import { CoreStart } from '@kbn/core/public';
+import { IClickActionDescriptor } from '..';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { UISession } from '../../types';
 import { createDeleteActionDescriptor } from './delete_button';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx
index 2b917c28c4b3b..823ab99c0213f 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx
@@ -8,14 +8,14 @@
 import { EuiFlyoutBody, EuiFlyoutHeader, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
-import { CoreStart } from 'kibana/public';
-import { UISession } from '../../types';
-import { IClickActionDescriptor } from '..';
+import { CoreStart } from '@kbn/core/public';
 import {
   CodeEditor,
   createKibanaReactContext,
   toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { UISession } from '../../types';
+import { IClickActionDescriptor } from '..';
 import './inspect_button.scss';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx
index dbacb6d094391..35661dce80da6 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx
@@ -17,7 +17,7 @@ import {
   EuiContextMenuPanelItemSeparator,
 } from '@elastic/eui/src/components/context_menu/context_menu';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React, { useState } from 'react';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { UISession } from '../../types';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx
index e87b19ed20b10..1891892b93c74 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx
@@ -20,10 +20,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
-import { IClickActionDescriptor } from '../';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { IClickActionDescriptor } from '..';
 import { OnActionDismiss } from './types';
 import { UISession } from '../../types';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx
index b79a4939b3fdd..fac9cda42eef2 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx
@@ -7,21 +7,21 @@
 
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { mount, ReactWrapper } from 'enzyme';
-import { CoreSetup, CoreStart, DocLinksStart } from 'kibana/public';
+import { CoreSetup, CoreStart, DocLinksStart } from '@kbn/core/public';
 import moment from 'moment';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
-import { SessionsClient } from 'src/plugins/data/public/search';
+import { coreMock } from '@kbn/core/public/mocks';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
 import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '..';
 import { SearchSessionsMgmtAPI } from '../lib/api';
 import { AsyncSearchIntroDocumentation } from '../lib/documentation';
 import { LocaleWrapper } from '../__mocks__';
 import { SearchSessionsMgmtMain } from './main';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { managementPluginMock } from '../../../../../../../src/plugins/management/public/mocks';
-import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
-import { sharePluginMock } from '../../../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
 let mockCoreStart: MockedKeys<CoreStart>;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx
index 8d83b9ab60138..e065a20003dd9 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx
@@ -7,10 +7,10 @@
 
 import { EuiButtonEmpty, EuiPageHeader, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { CoreStart, HttpStart } from 'kibana/public';
+import type { CoreStart, HttpStart } from '@kbn/core/public';
 import React from 'react';
-import type { SessionsConfigSchema } from '../';
-import { IManagementSectionsPluginsSetup } from '../';
+import type { SessionsConfigSchema } from '..';
+import { IManagementSectionsPluginsSetup } from '..';
 import type { SearchSessionsMgmtAPI } from '../lib/api';
 import type { AsyncSearchIntroDocumentation } from '../lib/documentation';
 import { SearchSessionsMgmtTable } from './table';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx
index b3d299bd30613..83f4494dff504 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx
@@ -8,7 +8,7 @@
 import { EuiTextProps, EuiToolTipProps } from '@elastic/eui';
 import { mount } from 'enzyme';
 import React from 'react';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common/';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { UISession } from '../types';
 import { LocaleWrapper } from '../__mocks__';
 import { getStatusText, StatusIndicator } from './status';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx
index 1f62ca05f50cb..577e89f2c761b 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx
@@ -8,10 +8,10 @@
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { ReactElement } from 'react';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { dateString } from '../lib/date_string';
 import { UISession } from '../types';
-import { StatusDef as StatusAttributes, TableText } from './';
+import { StatusDef as StatusAttributes, TableText } from '.';
 
 // Shared helper function
 export const getStatusText = (statusType: string): string => {
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx
index 791c3e5d939a1..33e085fbb646d 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx
@@ -8,7 +8,7 @@
 import { FieldValueOptionType, SearchFilterConfig } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { TableText } from '../';
+import { TableText } from '..';
 import { UISession } from '../../types';
 import { getStatusText } from '../status';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx
index eb1f82cc01e37..2023aed902c9f 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx
@@ -8,20 +8,20 @@
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { act, waitFor } from '@testing-library/react';
 import { mount, ReactWrapper } from 'enzyme';
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import React from 'react';
-import { coreMock } from 'src/core/public/mocks';
-import { SessionsClient } from 'src/plugins/data/public/search';
-import { SearchSessionStatus } from '../../../../../../../../src/plugins/data/common';
-import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../../';
+import { coreMock } from '@kbn/core/public/mocks';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
+import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../..';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { LocaleWrapper } from '../../__mocks__';
 import { SearchSessionsMgmtTable } from './table';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { managementPluginMock } from '../../../../../../../../src/plugins/management/public/mocks';
-import { SharePluginStart } from '../../../../../../../../src/plugins/share/public';
-import { sharePluginMock } from '../../../../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
 let mockCoreStart: CoreStart;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx
index 5dbcb1cfb9990..88ffb5ed2d749 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx
@@ -7,14 +7,14 @@
 
 import { EuiButton, EuiInMemoryTable, EuiSearchBarProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 import useInterval from 'react-use/lib/useInterval';
-import { TableText } from '../';
+import { SEARCH_SESSIONS_TABLE_ID } from '@kbn/data-plugin/common';
+import { TableText } from '..';
 import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../..';
-import { SEARCH_SESSIONS_TABLE_ID } from '../../../../../../../../src/plugins/data/common/';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { getColumns } from '../../lib/get_columns';
 import { UISession } from '../../types';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
index 87d3792df2fb7..35eb3cb4e36a4 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
@@ -6,16 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { CoreStart, HttpStart, I18nStart, IUiSettingsClient } from 'kibana/public';
-import { CoreSetup } from 'kibana/public';
-import type { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { CoreStart, HttpStart, I18nStart, IUiSettingsClient } from '@kbn/core/public';
+import { CoreSetup } from '@kbn/core/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import { SEARCH_SESSIONS_MANAGEMENT_ID } from '@kbn/data-plugin/public';
 import type { ConfigSchema } from '../../../config';
 import type { DataEnhancedStartDependencies } from '../../plugin';
 import type { SearchSessionsMgmtAPI } from './lib/api';
 import type { AsyncSearchIntroDocumentation } from './lib/documentation';
-import { SEARCH_SESSIONS_MANAGEMENT_ID } from '../../../../../../src/plugins/data/public';
 
 export interface IManagementSectionsPluginsSetup {
   data: DataPublicPluginSetup;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts
index a0b6aa80f2500..69c0d165ac6c0 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts
@@ -6,16 +6,16 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import moment from 'moment';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { SavedObjectsFindResponse } from 'src/core/server';
-import { SessionsClient } from 'src/plugins/data/public/search';
-import type { SessionsConfigSchema } from '../';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
-import { sharePluginMock } from '../../../../../../../src/plugins/share/public/mocks';
-import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
+import type { SessionsConfigSchema } from '..';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { SearchSessionsMgmtAPI } from './api';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
index ba6ab57eb0ea3..bb58efd01d957 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
@@ -6,17 +6,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ApplicationStart, NotificationsStart, SavedObject } from 'kibana/public';
+import type { ApplicationStart, NotificationsStart, SavedObject } from '@kbn/core/public';
 import moment from 'moment';
 import { from, race, timer } from 'rxjs';
 import { mapTo, tap } from 'rxjs/operators';
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 import { SerializableRecord } from '@kbn/utility-types';
-import {
-  ISessionsClient,
-  SearchUsageCollector,
-} from '../../../../../../../src/plugins/data/public';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { ISessionsClient, SearchUsageCollector } from '@kbn/data-plugin/public';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { ACTION } from '../components/actions';
 import {
   PersistedSearchSessionSavedObjectAttributes,
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts
index 545c7f7ec26b2..03279199912c0 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export class AsyncSearchIntroDocumentation {
   private docUrl: string = '';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx
index 9578d56e44b1c..35da6b995169a 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx
@@ -8,21 +8,21 @@
 import { EuiTableFieldDataColumnType } from '@elastic/eui';
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { mount } from 'enzyme';
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import { ReactElement } from 'react';
-import { coreMock } from 'src/core/public/mocks';
-import { SessionsClient } from 'src/plugins/data/public/search';
-import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
+import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '..';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { OnActionComplete } from '../components';
 import { UISession } from '../types';
 import { SearchSessionsMgmtAPI } from './api';
 import { getColumns } from './get_columns';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { managementPluginMock } from '../../../../../../../src/plugins/management/public/mocks';
-import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
-import { sharePluginMock } from '../../../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
 let mockCoreStart: CoreStart;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
index 375f642b29d8f..d9a71639f8fe2 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
@@ -17,16 +17,16 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { capitalize } from 'lodash';
 import React from 'react';
-import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
-import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
+import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '..';
 import { TableText } from '../components';
 import { OnActionComplete, PopoverActionsMenu } from '../components';
 import { StatusIndicator } from '../components/status';
-import { dateString } from '../lib/date_string';
+import { dateString } from './date_string';
 import { SearchSessionsMgmtAPI } from './api';
 import { getExpirationStatus } from './get_expiration_status';
 import { UISession } from '../types';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts
index bbd769207b567..a220b414ba659 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import { SessionsConfigSchema } from '../';
+import { SessionsConfigSchema } from '..';
 
 export const getExpirationStatus = (config: SessionsConfigSchema, expires: string | null) => {
   const tNow = moment.utc().valueOf();
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts
index 7489a1ce26aa5..c66290a968240 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  SearchSessionSavedObjectAttributes,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
+import { SearchSessionSavedObjectAttributes, SearchSessionStatus } from '@kbn/data-plugin/common';
 import { ACTION } from './components/actions';
 
 export const DATE_STRING_FORMAT = 'D MMM, YYYY, HH:mm:ss';
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
index a6dbe850b5e4f..7c93d5cd78e68 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
@@ -8,8 +8,8 @@
 import React, { ReactNode } from 'react';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { render, waitFor, screen, act } from '@testing-library/react';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public/';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createConnectedSearchSessionIndicator } from './connected_search_session_indicator';
 import { BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -19,12 +19,12 @@ import {
   SearchSessionState,
   SearchUsageCollector,
   TimefilterContract,
-} from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+} from '@kbn/data-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { TOUR_RESTORE_STEP_KEY, TOUR_TAKING_TOO_LONG_STEP_KEY } from './search_session_tour';
 import userEvent from '@testing-library/user-event';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { createSearchUsageCollectorMock } from '../../../../../../../src/plugins/data/public/search/collectors/mocks';
+import { createSearchUsageCollectorMock } from '@kbn/data-plugin/public/search/collectors/mocks';
 
 const coreStart = coreMock.createStart();
 const application = coreStart.application;
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
index f1ce93181f1ac..23abbf3084073 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
@@ -10,15 +10,11 @@ import { debounce, distinctUntilChanged, mapTo, switchMap, tap } from 'rxjs/oper
 import { merge, of, timer } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 import { i18n } from '@kbn/i18n';
+import { ISessionService, SearchSessionState, SearchUsageCollector } from '@kbn/data-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { ApplicationStart, IBasePath } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { SearchSessionIndicator, SearchSessionIndicatorRef } from '../search_session_indicator';
-import {
-  ISessionService,
-  SearchSessionState,
-  SearchUsageCollector,
-} from '../../../../../../../src/plugins/data/public';
-import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
-import { ApplicationStart, IBasePath } from '../../../../../../../src/core/public';
-import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
 import { useSearchSessionTour } from './search_session_tour';
 
 export interface SearchSessionIndicatorDeps {
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx
index 50ee3737ad92b..2d9c29681a41c 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx
@@ -7,12 +7,9 @@
 
 import { useCallback, useEffect } from 'react';
 import { once } from 'lodash';
-import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { SearchSessionState, SearchUsageCollector } from '@kbn/data-plugin/public';
 import { SearchSessionIndicatorRef } from '../search_session_indicator';
-import {
-  SearchSessionState,
-  SearchUsageCollector,
-} from '../../../../../../../src/plugins/data/public';
 
 const TOUR_TAKING_TOO_LONG_TIMEOUT = 10000;
 export const TOUR_TAKING_TOO_LONG_STEP_KEY = `data.searchSession.tour.takingTooLong`;
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx
index e9577c3464d11..654dfee17c5a2 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { SearchSessionState } from '@kbn/data-plugin/public';
 import { SearchSessionIndicator } from './search_session_indicator';
-import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
 
 storiesOf('components/SearchSessionIndicator', module).add('default', () => {
   const [searchSessionName, setSearchSessionName] = React.useState('Discover session');
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
index 69bd6931b6c5b..26563bfa02fa7 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
@@ -10,7 +10,7 @@ import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { SearchSessionIndicator } from './search_session_indicator';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
+import { SearchSessionState } from '@kbn/data-plugin/public';
 
 function Container({ children }: { children?: ReactNode }) {
   return <IntlProvider locale="en">{children}</IntlProvider>;
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx
index 205f04b07a944..540cb6b5bebd4 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx
@@ -22,9 +22,9 @@ import {
 import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { SearchSessionState } from '@kbn/data-plugin/public';
 import { CheckInEmptyCircle, PartialClock } from './custom_icons';
 import './search_session_indicator.scss';
-import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
 import { SearchSessionName } from './components';
 
 export interface SearchSessionIndicatorProps {
diff --git a/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts b/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts
index ed079fe948750..260577298e81b 100644
--- a/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts
+++ b/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers, Logger } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers, Logger } from '@kbn/core/server';
 import { fetchProvider } from './fetch';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 describe('fetchProvider', () => {
   let fetchFn: any;
diff --git a/x-pack/plugins/data_enhanced/server/collectors/fetch.ts b/x-pack/plugins/data_enhanced/server/collectors/fetch.ts
index 82597a9003051..eb3b50b3a64e9 100644
--- a/x-pack/plugins/data_enhanced/server/collectors/fetch.ts
+++ b/x-pack/plugins/data_enhanced/server/collectors/fetch.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'kibana/server';
-import { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
-import { SEARCH_SESSION_TYPE } from '../../../../../src/plugins/data/common';
+import { Logger } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
+import { SEARCH_SESSION_TYPE } from '@kbn/data-plugin/common';
 import { ReportedUsage } from './register';
 
 interface SessionPersistedTermsBucket {
diff --git a/x-pack/plugins/data_enhanced/server/collectors/register.ts b/x-pack/plugins/data_enhanced/server/collectors/register.ts
index 6e482a618a292..6b98627fce11f 100644
--- a/x-pack/plugins/data_enhanced/server/collectors/register.ts
+++ b/x-pack/plugins/data_enhanced/server/collectors/register.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider } from './fetch';
 
 export interface ReportedUsage {
diff --git a/x-pack/plugins/data_enhanced/server/index.ts b/x-pack/plugins/data_enhanced/server/index.ts
index 4f9f78f2fc783..a56f7216c4706 100644
--- a/x-pack/plugins/data_enhanced/server/index.ts
+++ b/x-pack/plugins/data_enhanced/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { EnhancedDataServerPlugin } from './plugin';
 import { configSchema, ConfigSchema } from '../config';
 
@@ -20,9 +20,6 @@ export function plugin(initializerContext: PluginInitializerContext<ConfigSchema
   return new EnhancedDataServerPlugin(initializerContext);
 }
 
-export {
-  ENHANCED_ES_SEARCH_STRATEGY,
-  EQL_SEARCH_STRATEGY,
-} from '../../../../src/plugins/data/common';
+export { ENHANCED_ES_SEARCH_STRATEGY, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 
 export { EnhancedDataServerPlugin as Plugin };
diff --git a/x-pack/plugins/data_enhanced/server/plugin.ts b/x-pack/plugins/data_enhanced/server/plugin.ts
index 28df0a5aa70cf..007764ec95f0c 100644
--- a/x-pack/plugins/data_enhanced/server/plugin.ts
+++ b/x-pack/plugins/data_enhanced/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { registerSessionRoutes } from './routes';
 import { searchSessionSavedObjectType } from './saved_objects';
 import type {
diff --git a/x-pack/plugins/data_enhanced/server/routes/session.test.ts b/x-pack/plugins/data_enhanced/server/routes/session.test.ts
index ebc501346aed2..c6625a3491886 100644
--- a/x-pack/plugins/data_enhanced/server/routes/session.test.ts
+++ b/x-pack/plugins/data_enhanced/server/routes/session.test.ts
@@ -7,13 +7,10 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 
-import type { CoreSetup, Logger } from 'kibana/server';
-import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
-import type {
-  PluginStart as DataPluginStart,
-  DataRequestHandlerContext,
-} from '../../../../../src/plugins/data/server';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import type { CoreSetup, Logger } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import { registerSessionRoutes } from './session';
 
 enum PostHandlerIndex {
@@ -25,7 +22,7 @@ enum PostHandlerIndex {
 
 describe('registerSessionRoutes', () => {
   let mockCoreSetup: MockedKeys<CoreSetup<{}, DataPluginStart>>;
-  let mockContext: jest.Mocked<DataRequestHandlerContext>;
+  let mockContext: ReturnType<typeof dataPluginMock.createRequestHandlerContext>;
   let mockLogger: Logger;
 
   beforeEach(() => {
@@ -46,7 +43,7 @@ describe('registerSessionRoutes', () => {
     const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
     const [, saveHandler] = mockRouter.post.mock.calls[PostHandlerIndex.SAVE];
 
-    saveHandler(mockContext, mockRequest, mockResponse);
+    await saveHandler(mockContext, mockRequest, mockResponse);
 
     expect(mockContext.search!.saveSession).toHaveBeenCalledWith(sessionId, { name });
   });
@@ -61,7 +58,7 @@ describe('registerSessionRoutes', () => {
     const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
     const [[, getHandler]] = mockRouter.get.mock.calls;
 
-    getHandler(mockContext, mockRequest, mockResponse);
+    await getHandler(mockContext, mockRequest, mockResponse);
 
     expect(mockContext.search!.getSession).toHaveBeenCalledWith(id);
   });
@@ -80,7 +77,7 @@ describe('registerSessionRoutes', () => {
     const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
     const [, findHandler] = mockRouter.post.mock.calls[PostHandlerIndex.FIND];
 
-    findHandler(mockContext, mockRequest, mockResponse);
+    await findHandler(mockContext, mockRequest, mockResponse);
 
     expect(mockContext.search!.findSessions).toHaveBeenCalledWith(body);
   });
@@ -98,7 +95,7 @@ describe('registerSessionRoutes', () => {
     const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
     const [, updateHandler] = mockRouter.put.mock.calls[0];
 
-    updateHandler(mockContext, mockRequest, mockResponse);
+    await updateHandler(mockContext, mockRequest, mockResponse);
 
     expect(mockContext.search!.updateSession).toHaveBeenCalledWith(id, body);
   });
@@ -113,7 +110,7 @@ describe('registerSessionRoutes', () => {
     const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
     const [, cancelHandler] = mockRouter.post.mock.calls[PostHandlerIndex.CANCEL];
 
-    cancelHandler(mockContext, mockRequest, mockResponse);
+    await cancelHandler(mockContext, mockRequest, mockResponse);
 
     expect(mockContext.search!.cancelSession).toHaveBeenCalledWith(id);
   });
@@ -145,7 +142,7 @@ describe('registerSessionRoutes', () => {
     const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
     const [, extendHandler] = mockRouter.post.mock.calls[PostHandlerIndex.EXTEND];
 
-    extendHandler(mockContext, mockRequest, mockResponse);
+    await extendHandler(mockContext, mockRequest, mockResponse);
 
     expect(mockContext.search.extendSession).toHaveBeenCalledWith(id, new Date(expires));
   });
diff --git a/x-pack/plugins/data_enhanced/server/routes/session.ts b/x-pack/plugins/data_enhanced/server/routes/session.ts
index 3f36bd0a75746..a0eea258c4db5 100644
--- a/x-pack/plugins/data_enhanced/server/routes/session.ts
+++ b/x-pack/plugins/data_enhanced/server/routes/session.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
-import { reportServerError } from '../../../../../src/plugins/kibana_utils/server';
+import { Logger } from '@kbn/core/server';
+import { reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { DataEnhancedPluginRouter } from '../type';
 
 const STORE_SEARCH_SESSIONS_ROLE_TAG = `access:store_search_session`;
@@ -36,7 +36,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
         request.body;
 
       try {
-        const response = await context.search!.saveSession(sessionId, {
+        const searchContext = await context.search;
+        const response = await searchContext.saveSession(sessionId, {
           name,
           appId,
           expires,
@@ -70,7 +71,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
     async (context, request, res) => {
       const { id } = request.params;
       try {
-        const response = await context.search!.getSession(id);
+        const searchContext = await context.search;
+        const response = await searchContext!.getSession(id);
 
         return res.ok({
           body: response,
@@ -104,7 +106,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
     async (context, request, res) => {
       const { page, perPage, sortField, sortOrder, filter, searchFields, search } = request.body;
       try {
-        const response = await context.search!.findSessions({
+        const searchContext = await context.search;
+        const response = await searchContext!.findSessions({
           page,
           perPage,
           sortField,
@@ -139,7 +142,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
     async (context, request, res) => {
       const { id } = request.params;
       try {
-        await context.search!.deleteSession(id);
+        const searchContext = await context.search;
+        await searchContext.deleteSession(id);
 
         return res.ok();
       } catch (e) {
@@ -165,7 +169,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
     async (context, request, res) => {
       const { id } = request.params;
       try {
-        await context.search!.cancelSession(id);
+        const searchContext = await context.search;
+        await searchContext.cancelSession(id);
 
         return res.ok();
       } catch (e) {
@@ -196,7 +201,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
       const { id } = request.params;
       const { name, expires } = request.body;
       try {
-        const response = await context.search!.updateSession(id, { name, expires });
+        const searchContext = await context.search;
+        const response = await searchContext.updateSession(id, { name, expires });
 
         return res.ok({
           body: response,
@@ -227,7 +233,8 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger:
       const { id } = request.params;
       const { expires } = request.body;
       try {
-        const response = await context.search!.extendSession(id, new Date(expires));
+        const searchContext = await context.search;
+        const response = await searchContext.extendSession(id, new Date(expires));
 
         return res.ok({
           body: response,
diff --git a/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts b/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts
index f921ed78eb247..68f37e1e2adac 100644
--- a/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts
+++ b/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
-import { SEARCH_SESSION_TYPE } from '../../../../../src/plugins/data/common';
+import { SavedObjectsType } from '@kbn/core/server';
+import { SEARCH_SESSION_TYPE } from '@kbn/data-plugin/common';
 import { searchSessionSavedObjectMigrations } from './search_session_migration';
 
 export const searchSessionSavedObjectType: SavedObjectsType = {
diff --git a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts
index aa344da68f931..a94b22de5b0ed 100644
--- a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts
+++ b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts
@@ -11,9 +11,9 @@ import {
   SearchSessionSavedObjectAttributesPre$7$14$0,
   SearchSessionSavedObjectAttributesPre$8$0$0,
 } from './search_session_migration';
-import { SavedObject } from '../../../../../src/core/types';
-import { SEARCH_SESSION_TYPE, SearchSessionStatus } from '../../../../../src/plugins/data/common';
-import { SavedObjectMigrationContext } from 'kibana/server';
+import { SavedObject } from '@kbn/core/types';
+import { SEARCH_SESSION_TYPE, SearchSessionStatus } from '@kbn/data-plugin/common';
+import { SavedObjectMigrationContext } from '@kbn/core/server';
 
 describe('7.12.0 -> 7.13.0', () => {
   const mockCompletedSessionSavedObject: SavedObject<SearchSessionSavedObjectAttributesPre$7$13$0> =
diff --git a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts
index 4fa5964929f7c..f2de5df91de95 100644
--- a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts
+++ b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationMap, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import {
   SearchSessionSavedObjectAttributes as SearchSessionSavedObjectAttributesLatest,
   SearchSessionStatus,
-} from '../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 
 /**
  * Search sessions were released in 7.12.0
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts
index 85bfbc8d037db..d7e472f4b3245 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts
@@ -11,15 +11,15 @@ import {
   SearchSessionSavedObjectAttributes,
   ENHANCED_ES_SEARCH_STRATEGY,
   EQL_SEARCH_STRATEGY,
-} from '../../../../../../src/plugins/data/common';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+} from '@kbn/data-plugin/common';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchStatus } from './types';
 import moment from 'moment';
 import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsDeleteOptions,
   SavedObjectsClientContract,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 jest.useFakeTimers();
 
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts
index 180f276620a6c..20903d4508bb1 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult } from 'kibana/server';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 import moment from 'moment';
 import { EMPTY } from 'rxjs';
 import { catchError, concatMap } from 'rxjs/operators';
@@ -16,7 +16,7 @@ import {
   SearchSessionSavedObjectAttributes,
   SearchSessionStatus,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchStatus } from './types';
 import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
index e0b1b74b57d02..f27dba05d88e1 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { checkPersistedSessionsProgress } from './check_persisted_sessions';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionsConfig } from './types';
 import moment from 'moment';
-import { SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 describe('checkPersistedSessionsProgress', () => {
   let mockClient: any;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
index 3e89383c16d5e..2f4cfaaa015c6 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
@@ -12,7 +12,7 @@ import {
   SEARCH_SESSION_TYPE,
   SearchSessionStatus,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchSessionsResponse } from './types';
 import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
index 61d1635dabe1b..dfc77935d2275 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
@@ -12,7 +12,7 @@ import {
   SEARCH_SESSION_TYPE,
   SearchSessionStatus,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchSessionsResponse } from './types';
 import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
index 207dabe7c43d9..d78e0567eaec4 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
@@ -6,14 +6,11 @@
  */
 
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
-import {
-  SearchSessionStatus,
-  ENHANCED_ES_SEARCH_STRATEGY,
-} from '../../../../../../src/plugins/data/common';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchSessionStatus, ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionsConfig, SearchStatus } from './types';
 import moment from 'moment';
-import { SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { of, Subject, throwError } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 jest.useFakeTimers();
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
index 74306bac39f7d..f59883350898b 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { SavedObjectsClientContract, Logger } from '@kbn/core/server';
 import { from, Observable, EMPTY } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import {
   SearchSessionSavedObjectAttributes,
   SEARCH_SESSION_TYPE,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { CheckSearchSessionsDeps, CheckSearchSessionsFn, SearchSessionsConfig } from './types';
 
 export interface GetSessionsDeps {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts
index aa8c2c0e3aa00..26a31fdbac20d 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts
@@ -7,10 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import type { TransportResult } from '@elastic/elasticsearch';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { SearchSessionRequestInfo } from '@kbn/data-plugin/common';
+import { AsyncSearchStatusResponse } from '@kbn/data-plugin/server';
 import { SearchStatus } from './types';
-import { SearchSessionRequestInfo } from '../../../../../../src/plugins/data/common';
-import { AsyncSearchStatusResponse } from '../../../../../../src/plugins/data/server';
 
 export async function getSearchStatus(
   client: ElasticsearchClient,
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
index 336bc890268ce..e15e494fdd6b9 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
@@ -7,7 +7,7 @@
 
 import { SearchSessionsConfig, SearchStatus } from './types';
 import { getSessionStatus } from './get_session_status';
-import { SearchSessionStatus } from '../../../../../../src/plugins/data/common';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import moment from 'moment';
 
 describe('getSessionStatus', () => {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
index e7ae52b6c88ae..d6a4670c5e396 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
@@ -6,10 +6,7 @@
  */
 
 import moment from 'moment';
-import {
-  SearchSessionSavedObjectAttributes,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common/';
+import { SearchSessionSavedObjectAttributes, SearchSessionStatus } from '@kbn/data-plugin/common';
 import { SearchSessionsConfig, SearchStatus } from './types';
 
 export function getSessionStatus(
diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
index 437e146f0d0f7..0f7f4975082a6 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
@@ -9,21 +9,17 @@ import {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionService } from './session_service';
 import { createRequestHash } from './utils';
 import moment from 'moment';
-import { coreMock } from '../../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { ConfigSchema } from '../../../config';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { AuthenticatedUser } from '../../../../security/common/model';
-import {
-  nodeBuilder,
-  SEARCH_SESSION_TYPE,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
-import { TaskManagerStartContract } from '../../../../task_manager/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { nodeBuilder, SEARCH_SESSION_TYPE, SearchSessionStatus } from '@kbn/data-plugin/common';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 const MAX_UPDATE_RETRIES = 3;
 
diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
index 84266e2545810..a22e559ecd142 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
@@ -17,27 +17,24 @@ import {
   SavedObject,
   SavedObjectsFindOptions,
   SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   IKibanaSearchRequest,
   ISearchOptions,
   ENHANCED_ES_SEARCH_STRATEGY,
   SEARCH_SESSION_TYPE,
-} from '../../../../../../src/plugins/data/common';
-import {
-  ISearchSessionService,
-  NoSearchIdInSessionError,
-} from '../../../../../../src/plugins/data/server';
-import { AuthenticatedUser, SecurityPluginSetup } from '../../../../security/server';
+} from '@kbn/data-plugin/common';
+import { ISearchSessionService, NoSearchIdInSessionError } from '@kbn/data-plugin/server';
+import { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import {
   SearchSessionRequestInfo,
   SearchSessionSavedObjectAttributes,
   SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { createRequestHash } from './utils';
 import { ConfigSchema } from '../../../config';
 import {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts b/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
index a4c9b6039ff64..a8d47d5babd57 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
@@ -8,9 +8,9 @@
 import { Duration } from 'moment';
 import { filter, takeUntil } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
-import { RunContext, TaskRunCreatorFunction } from '../../../../task_manager/server';
-import { CoreSetup, SavedObjectsClient } from '../../../../../../src/core/server';
-import { SEARCH_SESSION_TYPE } from '../../../../../../src/plugins/data/common';
+import { RunContext, TaskRunCreatorFunction } from '@kbn/task-manager-plugin/server';
+import { CoreSetup, SavedObjectsClient } from '@kbn/core/server';
+import { SEARCH_SESSION_TYPE } from '@kbn/data-plugin/common';
 import { DataEnhancedStartDependencies } from '../../type';
 import {
   SearchSessionTaskSetupDeps,
diff --git a/x-pack/plugins/data_enhanced/server/search/session/types.ts b/x-pack/plugins/data_enhanced/server/search/session/types.ts
index eadc3821c1043..37e1cb2486154 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/types.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/types.ts
@@ -10,13 +10,13 @@ import {
   Logger,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { Observable } from 'rxjs';
-import { KueryNode, SearchSessionSavedObjectAttributes } from 'src/plugins/data/common';
+import { KueryNode, SearchSessionSavedObjectAttributes } from '@kbn/data-plugin/common';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../../x-pack/plugins/task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ConfigSchema } from '../../../config';
 
 export enum SearchStatus {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
index 3b6b0a7a16d85..03bdad773f647 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
@@ -6,18 +6,15 @@
  */
 
 import { bulkUpdateSessions, updateSessionStatus } from './update_session_status';
-import {
-  SearchSessionStatus,
-  SearchSessionSavedObjectAttributes,
-} from '../../../../../../src/plugins/data/common';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchSessionStatus, SearchSessionSavedObjectAttributes } from '@kbn/data-plugin/common';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchStatus } from './types';
 import moment from 'moment';
 import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsClientContract,
   SavedObjectsFindResult,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 describe('bulkUpdateSessions', () => {
   let mockClient: any;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
index 4758e7cb22684..2f6ef6ab3fc53 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult, SavedObjectsUpdateResponse } from 'kibana/server';
+import { SavedObjectsFindResult, SavedObjectsUpdateResponse } from '@kbn/core/server';
 import {
   SearchSessionRequestInfo,
   SearchSessionSavedObjectAttributes,
   SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { getSearchStatus } from './get_search_status';
 import { getSessionStatus } from './get_session_status';
 import {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/utils.ts b/x-pack/plugins/data_enhanced/server/search/session/utils.ts
index 55c875602694f..f7f3c3c17505b 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/utils.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/utils.ts
@@ -7,9 +7,9 @@
 
 import { createHash } from 'crypto';
 import stringify from 'json-stable-stringify';
-import { SavedObjectsFindResult } from 'kibana/server';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 import moment from 'moment';
-import { SearchSessionSavedObjectAttributes } from 'src/plugins/data/common';
+import { SearchSessionSavedObjectAttributes } from '@kbn/data-plugin/common';
 
 /**
  * Generate the hash for this request so that, in the future, this hash can be used to look up
diff --git a/x-pack/plugins/data_enhanced/server/type.ts b/x-pack/plugins/data_enhanced/server/type.ts
index 215700c5dcc5c..df465cdbb381d 100644
--- a/x-pack/plugins/data_enhanced/server/type.ts
+++ b/x-pack/plugins/data_enhanced/server/type.ts
@@ -5,15 +5,18 @@
  * 2.0.
  */
 
-import type { IRouter } from 'kibana/server';
-import type { DataRequestHandlerContext } from '../../../../src/plugins/data/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+import type { IRouter } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+} from '@kbn/data-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 /**
  * @internal
diff --git a/x-pack/plugins/data_visualizer/common/constants.ts b/x-pack/plugins/data_visualizer/common/constants.ts
index 55b37f9667e57..f31a42cc7784c 100644
--- a/x-pack/plugins/data_visualizer/common/constants.ts
+++ b/x-pack/plugins/data_visualizer/common/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KBN_FIELD_TYPES } from '../../../../src/plugins/data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 export const APP_ID = 'data_visualizer';
 export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize';
diff --git a/x-pack/plugins/data_visualizer/common/services/time_buckets.js b/x-pack/plugins/data_visualizer/common/services/time_buckets.js
index 92b60cbf6ca10..4b1d61e26d66f 100644
--- a/x-pack/plugins/data_visualizer/common/services/time_buckets.js
+++ b/x-pack/plugins/data_visualizer/common/services/time_buckets.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { FIELD_FORMAT_IDS } from '../../../../../src/plugins/field_formats/common';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { ary, assign, isPlainObject, isString, sortBy } from 'lodash';
 import moment from 'moment';
 import dateMath from '@kbn/datemath';
diff --git a/x-pack/plugins/data_visualizer/common/types/field_request_config.ts b/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
index e15e39ffb46de..5f21748575831 100644
--- a/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
+++ b/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { JobFieldType } from './index';
+import type { JobFieldType } from '.';
 
 export interface Percentile {
   percent: number;
diff --git a/x-pack/plugins/data_visualizer/common/types/field_stats.ts b/x-pack/plugins/data_visualizer/common/types/field_stats.ts
index c874f163acebc..fe8d1960876b6 100644
--- a/x-pack/plugins/data_visualizer/common/types/field_stats.ts
+++ b/x-pack/plugins/data_visualizer/common/types/field_stats.ts
@@ -7,8 +7,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Query } from '@kbn/es-query';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from '../utils/object_utils';
-import { IKibanaSearchResponse } from '../../../../../src/plugins/data/common';
 import { TimeBucketsInterval } from '../services/time_buckets';
 
 export interface FieldData {
diff --git a/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts b/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts
index dcd7da74b85ef..7f2419cc009db 100644
--- a/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts
+++ b/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Percentile, JobFieldType, FieldVisStats } from './index';
+import type { Percentile, JobFieldType, FieldVisStats } from '.';
 export interface MetricFieldVisStats {
   avg?: number;
   distribution?: {
diff --git a/x-pack/plugins/data_visualizer/common/types/index.ts b/x-pack/plugins/data_visualizer/common/types/index.ts
index 381f7a556b18d..6ab0649bfb9e6 100644
--- a/x-pack/plugins/data_visualizer/common/types/index.ts
+++ b/x-pack/plugins/data_visualizer/common/types/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SimpleSavedObject } from 'kibana/public';
+import type { SimpleSavedObject } from '@kbn/core/public';
 import { isPopulatedObject } from '../utils/object_utils';
 export type { JobFieldType } from './job_field_type';
 export type {
diff --git a/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
index a9ec27c7b1577..6b2cb78d73274 100644
--- a/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
+++ b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from './object_utils';
-import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
 
diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
index f3fbc867e77c0..65b1035640405 100644
--- a/x-pack/plugins/data_visualizer/kibana.json
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -25,7 +25,6 @@
     "cloud"
   ],
   "requiredBundles": [
-    "home",
     "kibanaReact",
     "maps",
     "esUiShared",
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
index 7ebc4476e0cba..2498797b761a7 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
@@ -19,6 +19,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { CombinedField } from './types';
 import { GeoPointForm } from './geo_point';
 import { CombinedFieldLabel } from './combined_field_label';
@@ -29,7 +30,6 @@ import {
   removeCombinedFieldsFromMappings,
   removeCombinedFieldsFromPipeline,
 } from './utils';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   mappingsString: string;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
index 24f933f015366..3d5bcb94a596a 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
@@ -21,6 +21,7 @@ import {
   EuiFormErrorText,
 } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { CombinedField } from './types';
 import {
   createGeoPointCombinedField,
@@ -29,7 +30,6 @@ import {
   getFieldNames,
   getNameCollisionMsg,
 } from './utils';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   addCombinedField: (combinedField: CombinedField) => void;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
index 84f67c3222885..cb0763ecde504 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
@@ -8,12 +8,12 @@
 import { i18n } from '@kbn/i18n';
 import { cloneDeep } from 'lodash';
 import uuid from 'uuid/v4';
-import { CombinedField } from './types';
 import type {
   FindFileStructureResponse,
   IngestPipeline,
   Mappings,
-} from '../../../../../../file_upload/common';
+} from '@kbn/file-upload-plugin/common';
+import { CombinedField } from './types';
 
 const COMMON_LAT_NAMES = ['latitude', 'lat'];
 const COMMON_LON_NAMES = ['longitude', 'long', 'lon'];
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
index 52ae5e685316d..34885090d643f 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
@@ -10,11 +10,7 @@ import { Subscription } from 'rxjs';
 import { debounce } from 'lodash';
 
 import { EuiSuperDatePicker, OnRefreshProps } from '@elastic/eui';
-import {
-  TimeHistoryContract,
-  TimeRange,
-  UI_SETTINGS,
-} from '../../../../../../../../src/plugins/data/public';
+import { TimeHistoryContract, TimeRange, UI_SETTINGS } from '@kbn/data-plugin/public';
 
 import { useUrlState } from '../../util/url_state';
 import { useDataVisualizerKibana } from '../../../kibana_context';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
index d38e93b66a8da..2ef8759441fc1 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
@@ -20,9 +20,9 @@ import {
   XYBrushEvent,
 } from '@elastic/charts';
 import moment from 'moment';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
 import { useDataVisualizerKibana } from '../../../../kibana_context';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../../../../src/plugins/charts/common';
 
 export interface DocumentCountChartPoint {
   time: number | string;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
index 6be247f5f39c9..38689f73541d6 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
@@ -8,20 +8,20 @@
 import React, { useEffect, useRef, useState } from 'react';
 
 import { htmlIdGenerator } from '@elastic/eui';
-import { INITIAL_LOCATION, LayerDescriptor } from '../../../../../../maps/common';
+import { INITIAL_LOCATION, LayerDescriptor } from '@kbn/maps-plugin/common';
 import {
   MapEmbeddable,
   MapEmbeddableInput,
   MapEmbeddableOutput,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../maps/public/embeddable';
-import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../../maps/public';
+} from '@kbn/maps-plugin/public/embeddable';
+import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   isErrorEmbeddable,
   ViewMode,
-} from '../../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 import './_embedded_map.scss';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
index 202f9f9620b67..216ed34e0333a 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
@@ -7,8 +7,8 @@
 
 import { Feature, Point } from 'geojson';
 import { euiPaletteColorBlind } from '@elastic/eui';
+import { LAYER_TYPE, SOURCE_TYPES } from '@kbn/maps-plugin/common';
 import { DEFAULT_GEO_REGEX } from './geo_point_content';
-import { LAYER_TYPE, SOURCE_TYPES } from '../../../../../../../maps/common';
 
 export const convertWKTGeoToLonLat = (
   value: string | number
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
index 77ce45b4f2296..8a0b1d7a3dfe6 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
@@ -6,7 +6,8 @@
  */
 
 import React, { FC, useEffect, useState } from 'react';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { ES_GEO_FIELD_TYPE, LayerDescriptor } from '@kbn/maps-plugin/common';
 import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content';
 import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
@@ -14,7 +15,6 @@ import { ExamplesList } from '../../examples_list';
 import { FieldVisConfig } from '../../stats_table/types';
 import { useDataVisualizerKibana } from '../../../../kibana_context';
 import { JOB_FIELD_TYPES } from '../../../../../../common/constants';
-import { ES_GEO_FIELD_TYPE, LayerDescriptor } from '../../../../../../../maps/common';
 import { EmbeddedMapComponent } from '../../embedded_map';
 import { ExpandedRowPanel } from '../../stats_table/components/field_data_expanded_row/expanded_row_panel';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
index 17e9c9b4e2b1c..c108ca238de8a 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
@@ -6,6 +6,7 @@
  */
 
 import React from 'react';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { GeoPointContentWithMap } from './geo_point_content_with_map';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
 import {
@@ -19,7 +20,6 @@ import {
 } from '../stats_table/components/field_data_expanded_row';
 import { NotInDocsContent } from '../not_in_docs_content';
 import { FieldVisConfig } from '../stats_table/types';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query';
 import { LoadingIndicator } from '../loading_indicator';
 import { ErrorMessageContent } from '../stats_table/components/field_data_expanded_row/error_message';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
index 88304972ef491..73e69b00132d3 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
@@ -8,8 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { Action } from '@elastic/eui/src/components/basic_table/action_types';
 import { MutableRefObject } from 'react';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
 import { getCompatibleLensDataType, getLensAttributes } from './lens_utils';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { FieldVisConfig } from '../../stats_table/types';
 import { DataVisualizerKibanaReactContextValue } from '../../../../kibana_context';
@@ -18,7 +19,6 @@ import {
   Refresh,
 } from '../../../../index_data_visualizer/services/timefilter_refresh_service';
 import { JOB_FIELD_TYPES } from '../../../../../../common/constants';
-import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../../../../../../src/plugins/ui_actions/public';
 import { APP_ID } from '../../../../../../common/constants';
 
 export function getActions(
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
index 7043d7fc47cbc..731499cee2f89 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
@@ -7,8 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
-import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
+import { DataView } from '@kbn/data-views-plugin/public';
 import type {
   DateHistogramIndexPatternColumn,
   GenericIndexPatternColumn,
@@ -16,8 +15,9 @@ import type {
   TermsIndexPatternColumn,
   TypedLensByValueInput,
   XYLayerConfig,
-} from '../../../../../../../lens/public';
-import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '../../../../../../../lens/common/constants';
+} from '@kbn/lens-plugin/public';
+import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '@kbn/lens-plugin/common/constants';
+import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { FieldVisConfig } from '../../stats_table/types';
 import { JOB_FIELD_TYPES } from '../../../../../../common/constants';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
index 26002f0404c44..05d07111c80ac 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { getFieldNames, getSupportedFieldType } from './get_field_names';
 import { FileBasedFieldVisConfig } from '../stats_table/types';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
index dae5c6524d168..ec6243d45d508 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo, FC, useState } from 'react';
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
-import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import type { DataVisualizerTableState } from '../../../../../common/types';
 import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table';
 import type { FileBasedFieldVisConfig } from '../../../../../common/types/field_vis_config';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
index 8ac53aaf3b3a7..b6868ced4de69 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
@@ -6,8 +6,8 @@
  */
 
 import { difference } from 'lodash';
-import { ES_FIELD_TYPES } from '../../../../../../../../src/plugins/data/common';
-import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
+import type { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import type { JobFieldType } from '../../../../../common/types';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
 export function getFieldNames(results: FindFileStructureResponse) {
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
index 54dfbe72c3c7f..9d93106f7e609 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 
 export function createFilebeatConfig(
   index: string,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
index 4766228fc2bf8..b4ebc4094d503 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
@@ -21,9 +21,9 @@ import {
   EuiCode,
   EuiCopy,
 } from '@elastic/eui';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { createFilebeatConfig } from './filebeat_config';
 import { useDataVisualizerKibana } from '../../../kibana_context'; // copy context?
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 export enum EDITOR_MODE {
   HIDDEN,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
index be734b33e9b92..57395b506af28 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
@@ -9,9 +9,9 @@ import React, { FC, useState, useEffect } from 'react';
 import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui';
-import { TimeRange, RefreshInterval } from '../../../../../../../../src/plugins/data/public';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
-import type { FileUploadPluginStart } from '../../../../../../file_upload/public';
+import { TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 
 type LinkType = 'file' | 'index';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
index bf767c7e65207..6587bc6dd66e2 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
@@ -16,8 +16,8 @@ import {
   STYLE_TYPE,
   COLOR_MAP_TYPE,
   VectorLayerDescriptor,
-} from '../../../../../../../../maps/common';
-import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
+} from '@kbn/maps-plugin/common';
+import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import { EmbeddedMapComponent } from '../../../embedded_map';
 import { FieldVisStats } from '../../../../../../../common/types';
 import { ExpandedRowPanel } from './expanded_row_panel';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
index 18e079bbf4d1f..c10d4cdbc7c1c 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { FC, useCallback, useEffect, useState } from 'react';
+import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import type { FieldDataRowProps } from '../../types/field_data_row';
 import { TopValues } from '../../../top_values';
-import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
 import { useDataVisualizerKibana } from '../../../../../kibana_context';
 import { DocumentStatsTable } from './document_stats';
 import { ExpandedRowContent } from './expanded_row_content';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
index d20217f673449..73f2643cb7ae8 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
@@ -10,7 +10,7 @@ import { render } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import '@testing-library/jest-dom/extend-expect';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
index 60199859458f9..e8c619072c534 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
@@ -15,7 +15,7 @@ import { euiPaletteColorBlind, EuiDataGridColumn } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
index fd34fe40d31ea..d202b4f5a268c 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataViewField } from '../../../../../../../../../src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import {
   FieldVisConfig,
   FileBasedFieldVisConfig,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx
index f98ff857a0778..594ac9c72c306 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx
@@ -19,11 +19,11 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { roundToDecimalPlace, kibanaFieldFormat } from '../utils';
 import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header';
 import { FieldVisStats } from '../../../../../common/types';
 import { ExpandedRowPanel } from '../stats_table/components/field_data_expanded_row/expanded_row_panel';
-import { DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 
 interface Props {
   stats: FieldVisStats | undefined;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts
index fdac866c286c2..bce8ce3bfef0c 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEqual } from 'lodash';
-import type { AnalysisResult, InputOverrides } from '../../../../../../file_upload/common';
+import type { AnalysisResult, InputOverrides } from '@kbn/file-upload-plugin/common';
 import { MB, FILE_FORMATS } from '../../../../../common/constants';
 
 export const DEFAULT_LINES_TO_SAMPLE = 1000;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
index d9c791b2a67ff..d9617ae61e2ec 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { JOB_FIELD_TYPES } from '../../../../common/constants';
-import { DataViewField } from '../../../../../../../src/plugins/data_views/public';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
 
 export const getJobTypeLabel = (type: string) => {
   return type in jobTypeLabels ? jobTypeLabels[type as keyof typeof jobTypeLabels] : null;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
index b0bd51e1b9a39..91baf60ed065a 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { FC } from 'react';
 
 import { EuiTitle, EuiSpacer, EuiDescriptionList } from '@elastic/eui';
-import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { FILE_FORMATS } from '../../../../../common/constants';
 
 export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ results }) => {
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
index 9fbed83136f8f..d10f978c120ea 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
@@ -33,7 +33,7 @@ import {
   // getCharsetOptions,
 } from './options';
 import { isTimestampFormatValid } from './overrides_validation';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { replaceFieldInGrokPattern } from '../../../common/util/grok_pattern';
 import {
   convertDelimiter,
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
index a81b3b5865008..e035d0ececd8c 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
@@ -11,7 +11,7 @@ import { FILE_FORMATS } from '../../../../../common/constants';
 
 import { Overrides } from './overrides';
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
index dd9c2a8331079..aa368695ce46c 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
@@ -20,7 +20,7 @@ import {
   EuiText,
   EuiSubSteps,
 } from '@elastic/eui';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 
 interface Props {
   results: FindFileStructureResponse;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
index ae0a979008eff..0d3408a77e7c8 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
@@ -30,7 +30,7 @@ import {
   processResults,
 } from '../../../common/components/utils';
 
-import { Chat } from '../../../../../../cloud/public';
+import { Chat } from '@kbn/cloud-plugin/public';
 
 import { MODE } from './constants';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
index c2c0910098a18..8bf6682768226 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
@@ -11,8 +11,8 @@ import React, { FC } from 'react';
 import { EuiCallOut, EuiSpacer, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui';
 
 import numeral from '@elastic/numeral';
+import { FindFileStructureErrorResponse } from '@kbn/file-upload-plugin/common';
 import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../../common/constants';
-import { FindFileStructureErrorResponse } from '../../../../../../file_upload/common';
 
 interface FileTooLargeProps {
   fileSize: number;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
index bba52ff16e302..4e3da71e83ebb 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
@@ -18,9 +18,9 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { CombinedField, CombinedFieldsForm } from '../../../common/components/combined_fields';
 import { JsonEditor, EDITOR_MODE } from '../json_editor';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 import { CreateDataViewToolTip } from './create_data_view_tooltip';
 const EDITOR_HEIGHT = '300px';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
index 4ac0f07b124f0..ccf5b2d5f43ee 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
@@ -10,10 +10,10 @@ import React, { FC } from 'react';
 
 import { EuiTabbedContent, EuiSpacer } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { SimpleSettings } from './simple';
 import { AdvancedSettings } from './advanced';
 import { CombinedField } from '../../../common/components/combined_fields';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 
 interface Props {
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
index 8968f626c9d45..15df480ff6a8b 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
@@ -19,7 +19,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 
 import { FileContents } from '../file_contents';
 import { AnalysisSummary } from '../analysis_summary';
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx
index bd0438319fd52..60a67ef8e33d5 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx
@@ -6,14 +6,11 @@
  */
 import '../_index.scss';
 import React, { FC } from 'react';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getCoreStart, getPluginsStart } from '../../kibana_services';
 
 // @ts-ignore
-import { FileDataVisualizerView } from './components/file_data_visualizer_view/index';
+import { FileDataVisualizerView } from './components/file_data_visualizer_view';
 import { ResultLink } from '../common/components/results_links';
 
 interface Props {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
index 9f7ac3b270410..c3bb0eef960ba 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
@@ -10,7 +10,7 @@ import React, { FC, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiTitle } from '@elastic/eui';
-import { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 import { useUrlState } from '../../../common/util/url_state';
 import { LinkCard } from '../../../common/components/link_card';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx
index 26c4a2126303c..bd8c888e8bd52 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { EuiButtonIcon, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 import { dataVisualizerRefresh$, Refresh } from '../../services/timefilter_refresh_service';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx
index cbb90672297fe..aeebdcd6b89f6 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, useCallback, useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { TimefilterContract } from 'src/plugins/data/public';
-import { DataView } from 'src/plugins/data/common';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
 
 import {
   EuiButton,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
index 3cc3fa329359d..c7cfc11c4d630 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -6,12 +6,12 @@
  */
 
 import moment from 'moment';
-import { TimefilterContract } from 'src/plugins/data/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 import dateMath from '@kbn/datemath';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { i18n } from '@kbn/i18n';
-import type { ToastsStart } from 'kibana/public';
-import { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { ToastsStart } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
 import { getTimeFieldRange } from '../../services/time_field_range';
 import type { GetTimeFieldRangeResponse } from '../../../../../common/types/time_field_request';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
index 733f7d6bcd3e3..9ce1fb4f552e5 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
@@ -21,7 +21,8 @@ import {
 import { Required } from 'utility-types';
 import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
-import { Query, generateFilters } from '../../../../../../../../src/plugins/data/public';
+import { Query, generateFilters } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { FullTimeRangeSelector } from '../full_time_range_selector';
 import { usePageUrlState, useUrlState } from '../../../common/util/url_state';
 import {
@@ -48,7 +49,6 @@ import { HelpMenu } from '../../../common/components/help_menu';
 import { createMergedEsQuery } from '../../utils/saved_search_utils';
 import { DataVisualizerDataViewManagement } from '../data_view_management';
 import { ResultLink } from '../../../common/components/results_links';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 import { useDataVisualizerGridData } from '../../hooks/use_data_visualizer_grid_data';
 import { DataVisualizerGridInput } from '../../embeddables/grid_embeddable/grid_embeddable';
 import './_index.scss';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
index 138c9e50b90a7..e7ac50c906660 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
@@ -9,11 +9,11 @@ import React, { FC, useEffect, useState } from 'react';
 import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Query, Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { ShardSizeFilter } from './shard_size_select';
 import { DataVisualizerFieldNamesFilter } from './field_name_filter';
 import { DataVisualizerFieldTypeFilter } from './field_type_filter';
-import { TimeRange } from '../../../../../../../../src/plugins/data/common';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 import { JobFieldType } from '../../../../../common/types';
 import { SearchQueryLanguage } from '../../types/combined_query';
 import { useDataVisualizerKibana } from '../../../kibana_context';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
index eac3732006525..b50428100675c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subject } from 'rxjs';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React, { Suspense, useCallback, useEffect, useState } from 'react';
 import useObservable from 'react-use/lib/useObservable';
@@ -19,17 +19,14 @@ import {
   EmbeddableInput,
   EmbeddableOutput,
   IContainer,
-} from '../../../../../../../../src/plugins/embeddable/public';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/embeddable-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Query } from '@kbn/data-plugin/common';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { SavedSearch } from '@kbn/discover-plugin/public';
 import { DATA_VISUALIZER_GRID_EMBEDDABLE_TYPE } from './constants';
 import { EmbeddableLoading } from './embeddable_loading_fallback';
 import { DataVisualizerStartDependencies } from '../../../../plugin';
-import { Query } from '../../../../../../../../src/plugins/data/common';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
-import { SavedSearch } from '../../../../../../../../src/plugins/discover/public';
 import {
   DataVisualizerTable,
   ItemIdToExpandedRowMap,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx
index 08ddc2d5fe3c2..8394c21ba8d3e 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx
@@ -6,11 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { StartServicesAccessor } from 'kibana/public';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../../../src/plugins/embeddable/public';
+import { StartServicesAccessor } from '@kbn/core/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { DATA_VISUALIZER_GRID_EMBEDDABLE_TYPE } from './constants';
 import {
   DataVisualizerGridEmbeddableInput,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts
index add99a8d2501d..bb3d541e3ca79 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
-import { EmbeddableSetup } from '../../../../../../../src/plugins/embeddable/public';
+import { CoreSetup } from '@kbn/core/public';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/public';
 import { DataVisualizerGridEmbeddableFactory } from './grid_embeddable/grid_embeddable_factory';
 import { DataVisualizerPluginStart, DataVisualizerStartDependencies } from '../../../plugin';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
index 7c821f698d8df..eecebf6b9f947 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { merge } from 'rxjs';
 import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types';
 import { i18n } from '@kbn/i18n';
+import { DataViewField, KBN_FIELD_TYPES, UI_SETTINGS } from '@kbn/data-plugin/common';
 import { DataVisualizerIndexBasedAppState } from '../types/index_data_visualizer_state';
 import { useDataVisualizerKibana } from '../../kibana_context';
 import { getEsQueryFromSavedSearch } from '../utils/saved_search_utils';
@@ -17,11 +18,6 @@ import { MetricFieldsStats } from '../../common/components/stats_table/component
 import { useTimefilter } from './use_time_filter';
 import { dataVisualizerRefresh$ } from '../services/timefilter_refresh_service';
 import { TimeBuckets } from '../../../../common/services/time_buckets';
-import {
-  DataViewField,
-  KBN_FIELD_TYPES,
-  UI_SETTINGS,
-} from '../../../../../../../src/plugins/data/common';
 import { FieldVisConfig } from '../../common/components/stats_table/types';
 import {
   JOB_FIELD_TYPES,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
index 750c1d417e84d..b6b1a21f312f9 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { last, cloneDeep } from 'lodash';
 import { mergeMap, switchMap } from 'rxjs/operators';
 import { Comparators } from '@elastic/eui';
+import type { ISearchOptions } from '@kbn/data-plugin/common';
 import type {
   DataStatsFetchProgress,
   FieldStatsSearchStrategyReturnBase,
@@ -28,7 +29,6 @@ import {
 import type { FieldStats, FieldStatsError } from '../../../../common/types/field_stats';
 import { getInitialProgress, getReducer } from '../progress_utils';
 import { MAX_EXAMPLES_DEFAULT } from '../search_strategy/requests/constants';
-import type { ISearchOptions } from '../../../../../../../src/plugins/data/common';
 import { getFieldsStats } from '../search_strategy/requests/get_fields_stats';
 import { MAX_CONCURRENT_REQUESTS } from '../constants/index_data_visualizer_viewer';
 import { filterFields } from '../../common/components/fields_stats_grid/filter_fields';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
index 0ad8ec7037153..4eb9f71d00d66 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
@@ -9,8 +9,13 @@ import { useCallback, useEffect, useState, useRef, useMemo, useReducer } from 'r
 import { from, of, Subscription, Observable } from 'rxjs';
 import { mergeMap, last, map, toArray } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import type { ToastsStart } from 'kibana/public';
+import type { ToastsStart } from '@kbn/core/public';
 import { chunk } from 'lodash';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+} from '@kbn/data-plugin/common';
 import { useDataVisualizerKibana } from '../../kibana_context';
 import {
   AggregatableFieldOverallStats,
@@ -20,11 +25,6 @@ import {
   processAggregatableFieldsExistResponse,
   processNonAggregatableFieldsExistResponse,
 } from '../search_strategy/requests/overall_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-} from '../../../../../../../src/plugins/data/common';
 import type { OverallStats } from '../types/overall_stats';
 import { getDefaultPageState } from '../components/index_data_visualizer_view/index_data_visualizer_view';
 import { extractErrorProperties } from '../utils/error_utils';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
index bdb2d7b77d0e9..0a11f51fa3a26 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
@@ -10,12 +10,10 @@ import { useHistory, useLocation } from 'react-router-dom';
 import { parse, stringify } from 'query-string';
 import { isEqual } from 'lodash';
 import { encode } from 'rison-node';
-import { SimpleSavedObject } from 'kibana/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { getCoreStart, getPluginsStart } from '../../kibana_services';
 import {
   IndexDataVisualizerViewProps,
@@ -31,7 +29,6 @@ import {
   isRisonSerializationRequired,
 } from '../common/util/url_state';
 import { useDataVisualizerKibana } from '../kibana_context';
-import { DataView } from '../../../../../../src/plugins/data_views/public';
 import { ResultLink } from '../common/components/results_links';
 import { DATA_VISUALIZER_APP_LOCATOR, IndexDataVisualizerLocatorParams } from './locator';
 import { DATA_VISUALIZER_INDEX_VIEWER } from './constants/index_data_visualizer_viewer';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts
index 970707e3efca9..0f197f4a13ddd 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts
@@ -8,9 +8,9 @@ import { encode } from 'rison-node';
 import { stringify } from 'query-string';
 import { SerializableRecord } from '@kbn/utility-types';
 import { Filter } from '@kbn/es-query';
-import { RefreshInterval, TimeRange } from '../../../../../../../src/plugins/data/common';
-import { LocatorDefinition, LocatorPublic } from '../../../../../../../src/plugins/share/common';
-import { QueryState } from '../../../../../../../src/plugins/data/public';
+import { RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
+import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
+import { QueryState } from '@kbn/data-plugin/public';
 import { Dictionary, isRisonSerializationRequired } from '../../common/util/url_state';
 import { SearchQueryLanguage } from '../types/combined_query';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
index b5359915ef63e..bceb354295d9c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
@@ -8,6 +8,12 @@ import { get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import {
   buildSamplerAggregation,
   getSamplerAggregationsResponsePath,
@@ -20,12 +26,6 @@ import type {
   FieldStatsCommonRequestParams,
 } from '../../../../../common/types/field_stats';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { extractErrorProperties } from '../../utils/error_utils';
 
 export const getBooleanFieldsStatsRequest = (
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
index 07bdc8c14301c..705fe8c002319 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
@@ -9,6 +9,12 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import {
   buildSamplerAggregation,
   getSamplerAggregationsResponsePath,
@@ -16,12 +22,6 @@ import {
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
 import type { FieldStatsCommonRequestParams } from '../../../../../common/types/field_stats';
 import type { Field, DateFieldStats, Aggs } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 import { extractErrorProperties } from '../../utils/error_utils';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
index 618e47bb97e1d..8b057caecee7c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
@@ -8,6 +8,12 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { combineLatest, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import { buildBaseFilterCriteria } from '../../../../../common/utils/query_utils';
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
 import type {
@@ -15,12 +21,6 @@ import type {
   FieldExamples,
   FieldStatsCommonRequestParams,
 } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 import { extractErrorProperties } from '../../utils/error_utils';
 import { MAX_EXAMPLES_DEFAULT } from './constants';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts
index 747d4007ac1ff..4dd0b3a7ba40a 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts
@@ -6,10 +6,10 @@
  */
 
 import type { Observable } from 'rxjs';
+import type { ISearchOptions } from '@kbn/data-plugin/common';
+import { ISearchStart } from '@kbn/data-plugin/public';
 import type { FieldStatsCommonRequestParams } from '../../../../../common/types/field_stats';
 import type { FieldStatsError } from '../../../../../common/types/field_stats';
-import type { ISearchOptions } from '../../../../../../../../src/plugins/data/common';
-import { ISearchStart } from '../../../../../../../../src/plugins/data/public';
 import type { FieldStats } from '../../../../../common/types/field_stats';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
 import { fetchDateFieldsStats } from './get_date_field_stats';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
index a9746917082ad..163cb2585f3a6 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
@@ -10,6 +10,12 @@ import { find, get } from 'lodash';
 import { catchError, map } from 'rxjs/operators';
 import { Observable, of } from 'rxjs';
 import { AggregationsTermsAggregation } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+} from '@kbn/data-plugin/common';
+import type { ISearchStart } from '@kbn/data-plugin/public';
 import {
   MAX_PERCENT,
   PERCENTILE_SPACING,
@@ -29,12 +35,6 @@ import type {
   FieldStatsError,
 } from '../../../../../common/types/field_stats';
 import { processDistributionData } from '../../utils/process_distribution_data';
-import {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-} from '../../../../../../../../src/plugins/data/common';
-import type { ISearchStart } from '../../../../../../../../src/plugins/data/public';
 import { extractErrorProperties } from '../../utils/error_utils';
 import { isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
index 024464c1947c8..af4777a677bf9 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
@@ -9,6 +9,12 @@ import { get } from 'lodash';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { AggregationsTermsAggregation } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import { SAMPLER_TOP_TERMS_SHARD_SIZE, SAMPLER_TOP_TERMS_THRESHOLD } from './constants';
 import {
   buildSamplerAggregation,
@@ -22,12 +28,6 @@ import type {
   FieldStatsCommonRequestParams,
   StringFieldStats,
 } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 import { extractErrorProperties } from '../../utils/error_utils';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts
index a96244ece334a..3ede45b2ae66d 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts
@@ -8,6 +8,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { Query } from '@kbn/es-query';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
 import {
   buildBaseFilterCriteria,
   buildSamplerAggregation,
@@ -16,7 +17,6 @@ import {
 } from '../../../../../common/utils/query_utils';
 import { getDatafeedAggregations } from '../../../../../common/utils/datafeed_utils';
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
-import { IKibanaSearchResponse } from '../../../../../../../../src/plugins/data/common';
 import { AggregatableField, NonAggregatableField } from '../../types/overall_stats';
 import { AggCardinality, Aggs } from '../../../../../common/types/field_stats';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
index 81c5a9097e0ef..4a1506dc5b56f 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { Query } from '../../../../../../../src/plugins/data/common/query';
+import { Query } from '@kbn/data-plugin/common/query';
 import { SearchQueryLanguage } from './combined_query';
 
 export interface ListingPageUrlState {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
index 58c4c820c28d7..d89a9aca112b3 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import Boom from '@hapi/boom';
 import { isPopulatedObject } from '../../../../common/utils/object_utils';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts
index 22ed1ca637717..4fa100c3fcb92 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts
@@ -11,12 +11,12 @@ import {
   getEsQueryFromSavedSearch,
 } from './saved_search_utils';
 import type { SavedSearchSavedObject } from '../../../../common/types';
-import type { SavedSearch } from '../../../../../../../src/plugins/discover/public';
+import type { SavedSearch } from '@kbn/discover-plugin/public';
 import type { Filter, FilterStateStore } from '@kbn/es-query';
-import { stubbedSavedObjectIndexPattern } from '../../../../../../../src/plugins/data_views/common/data_view.stub';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { fieldFormatsMock } from '../../../../../../../src/plugins/field_formats/common/mocks';
-import { uiSettingsServiceMock } from 'src/core/public/mocks';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 // helper function to create data views
 function createMockDataView(id: string) {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
index 4d3db6092f835..7a5231a89abd0 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   fromKueryExpression,
   toElasticsearchQuery,
@@ -16,13 +16,13 @@ import {
   Filter,
 } from '@kbn/es-query';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { isSavedSearchSavedObject, SavedSearchSavedObject } from '../../../../common/types';
-import { SearchSource } from '../../../../../../../src/plugins/data/common';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
+import { SearchSource } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SavedSearch } from '@kbn/discover-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../types/combined_query';
-import { SavedSearch } from '../../../../../../../src/plugins/discover/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
+import { isSavedSearchSavedObject, SavedSearchSavedObject } from '../../../../common/types';
 
 const DEFAULT_QUERY = {
   bool: {
diff --git a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
index 83fcc104fbe4b..7c4a213432f86 100644
--- a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
+++ b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { KibanaReactContextValue, useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaReactContextValue, useKibana } from '@kbn/kibana-react-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { DataVisualizerStartDependencies } from '../plugin';
-import type { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 
 export type StartServices = CoreStart &
   DataVisualizerStartDependencies & {
diff --git a/x-pack/plugins/data_visualizer/public/application/shared_imports.ts b/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
index df07c0cc0d161..33a84886aaaec 100644
--- a/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
+++ b/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-export { EuiCodeEditor } from '../../../../../src/plugins/es_ui_shared/public';
-export type { EuiCodeEditorProps } from '../../../../../src/plugins/es_ui_shared/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+export type { EuiCodeEditorProps } from '@kbn/es-ui-shared-plugin/public';
 
-import { XJson } from '../../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
 export { XJsonMode } from '@kbn/ace';
diff --git a/x-pack/plugins/data_visualizer/public/kibana_services.ts b/x-pack/plugins/data_visualizer/public/kibana_services.ts
index 458d3aca9e525..0d4ab456db835 100644
--- a/x-pack/plugins/data_visualizer/public/kibana_services.ts
+++ b/x-pack/plugins/data_visualizer/public/kibana_services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { DataVisualizerStartDependencies } from './plugin';
 
 let coreStart: CoreStart;
diff --git a/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts
index f04c611c2fae9..0eddbbc248ed9 100644
--- a/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts
+++ b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application';
 import { getCoreStart } from '../kibana_services';
 
diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts
index f73d155c87d31..a18d7f730d8b1 100644
--- a/x-pack/plugins/data_visualizer/public/plugin.ts
+++ b/x-pack/plugins/data_visualizer/public/plugin.ts
@@ -5,29 +5,29 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import type { CloudStart } from '../../cloud/public';
-import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
-import type { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
-import { Plugin } from '../../../../src/core/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { CloudStart } from '@kbn/cloud-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import { Plugin } from '@kbn/core/public';
 
-import { setStartServices } from './kibana_services';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
-import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { MapsStartApi } from '../../maps/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import type { LensPublicStart } from '../../lens/public';
-import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api';
 import { getMaxBytesFormatted } from './application/common/util/get_max_bytes';
 import { registerHomeAddData, registerHomeFeatureCatalogue } from './register_home';
 import { registerEmbeddables } from './application/index_data_visualizer/embeddables';
-import { FieldFormatsStart } from '../../../../src/plugins/field_formats/public';
-import type { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { setStartServices } from './kibana_services';
 import { IndexDataVisualizerLocatorDefinition } from './application/index_data_visualizer/locator';
 
 export interface DataVisualizerSetupDependencies {
diff --git a/x-pack/plugins/data_visualizer/public/register_home.ts b/x-pack/plugins/data_visualizer/public/register_home.ts
index 0619382bd994c..ec7fd39762d08 100644
--- a/x-pack/plugins/data_visualizer/public/register_home.ts
+++ b/x-pack/plugins/data_visualizer/public/register_home.ts
@@ -6,8 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { FileDataVisualizerWrapper } from './lazy_load_bundle/component_wrapper';
 import {
   featureTitle,
@@ -36,7 +35,7 @@ export function registerHomeFeatureCatalogue(home: HomePublicPluginSetup) {
     icon: 'document',
     path: applicationPath,
     showOnHomePage: true,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
     order: 520,
   });
 }
diff --git a/x-pack/plugins/data_visualizer/server/index.ts b/x-pack/plugins/data_visualizer/server/index.ts
index f88303829c558..08b06005539b0 100644
--- a/x-pack/plugins/data_visualizer/server/index.ts
+++ b/x-pack/plugins/data_visualizer/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DataVisualizerPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) => new DataVisualizerPlugin();
diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts
index 9ef6ca5ae6a69..5f16df8b5ffb7 100644
--- a/x-pack/plugins/data_visualizer/server/plugin.ts
+++ b/x-pack/plugins/data_visualizer/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { StartDeps, SetupDeps } from './types';
 import { registerWithCustomIntegrations } from './register_custom_integration';
 
diff --git a/x-pack/plugins/data_visualizer/server/register_custom_integration.ts b/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
index 5ff58c5ed4d90..d41538a87a147 100644
--- a/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
+++ b/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { applicationPath, featureId, featureTitle } from '../common/constants';
 
 export function registerWithCustomIntegrations(customIntegrations: CustomIntegrationsPluginSetup) {
diff --git a/x-pack/plugins/data_visualizer/server/types/deps.ts b/x-pack/plugins/data_visualizer/server/types/deps.ts
index 8ee8c75abe543..aeb2fcf3af921 100644
--- a/x-pack/plugins/data_visualizer/server/types/deps.ts
+++ b/x-pack/plugins/data_visualizer/server/types/deps.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { SecurityPluginStart } from '../../../security/server';
-import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
-import { CustomIntegrationsPluginSetup } from '../../../../../src/plugins/custom_integrations/server';
-import { HomeServerPluginSetup } from '../../../../../src/plugins/home/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
 export interface StartDeps {
   security?: SecurityPluginStart;
diff --git a/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
index e0e6e263128e9..b49887655e91c 100644
--- a/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
+++ b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CustomHttpResponseOptions, ResponseError } from 'kibana/server';
+import { CustomHttpResponseOptions, ResponseError } from '@kbn/core/server';
 import { boomify, isBoom } from '@hapi/boom';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
index 52b60012f62f2..be15cc0b27153 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DiscoverStart } from '../../../../../../src/plugins/discover/public';
-import { ViewMode, IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
-import { StartServicesGetter } from '../../../../../../src/plugins/kibana_utils/public';
-import { CoreStart } from '../../../../../../src/core/public';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
-import { DOC_TYPE as LENS_DOC_TYPE } from '../../../../lens/common/constants';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { ViewMode, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
+import { DOC_TYPE as LENS_DOC_TYPE } from '@kbn/lens-plugin/common/constants';
 import * as shared from './shared';
 
 export const ACTION_EXPLORE_DATA = 'ACTION_EXPLORE_DATA';
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
index f4c6e89280274..5ac612c8c5fd2 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
@@ -7,16 +7,16 @@
 import type { Filter, RangeFilter } from '@kbn/es-query';
 import { ExploreDataChartAction } from './explore_data_chart_action';
 import { Params, PluginDeps } from './abstract_explore_data_action';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ExploreDataChartActionContext } from './explore_data_chart_action';
 import { i18n } from '@kbn/i18n';
 import {
   VisualizeEmbeddableContract,
   VISUALIZE_EMBEDDABLE_TYPE,
-} from '../../../../../../src/plugins/visualizations/public';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
-import { DiscoverAppLocator } from '../../../../../../src/plugins/discover/public';
-import { sharePluginMock } from '../../../../../../src/plugins/share/public/mocks';
+} from '@kbn/visualizations-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { DiscoverAppLocator } from '@kbn/discover-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 const i18nTranslateSpy = i18n.translate as unknown as jest.SpyInstance;
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
index 94ebece3a77d8..a213563a04a46 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
@@ -5,15 +5,12 @@
  * 2.0.
  */
 
-import { Action } from '../../../../../../src/plugins/ui_actions/public';
-import {
-  DiscoverAppLocatorParams,
-  SearchInput,
-} from '../../../../../../src/plugins/discover/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
-import { extractTimeRange } from '../../../../../../src/plugins/data/public';
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { DiscoverAppLocatorParams, SearchInput } from '@kbn/discover-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
+import { extractTimeRange } from '@kbn/data-plugin/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import * as shared from './shared';
 import { AbstractExploreDataAction } from './abstract_explore_data_action';
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
index 7008800e9c9f4..974f4126778fb 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
@@ -7,15 +7,15 @@
 
 import { ExploreDataContextMenuAction } from './explore_data_context_menu_action';
 import { Params, PluginDeps } from './abstract_explore_data_action';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { i18n } from '@kbn/i18n';
 import {
   VisualizeEmbeddableContract,
   VISUALIZE_EMBEDDABLE_TYPE,
-} from '../../../../../../src/plugins/visualizations/public';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
-import { DiscoverAppLocator } from '../../../../../../src/plugins/discover/public';
-import { sharePluginMock } from '../../../../../../src/plugins/share/public/mocks';
+} from '@kbn/visualizations-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { DiscoverAppLocator } from '@kbn/discover-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 const i18nTranslateSpy = i18n.translate as unknown as jest.SpyInstance;
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
index 28f41fdb18711..ce0d6e8c912fa 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
@@ -5,15 +5,11 @@
  * 2.0.
  */
 import type { Filter } from '@kbn/es-query';
-import { Action } from '../../../../../../src/plugins/ui_actions/public';
-import {
-  EmbeddableContext,
-  EmbeddableInput,
-  IEmbeddable,
-} from '../../../../../../src/plugins/embeddable/public';
-import { Query, TimeRange } from '../../../../../../src/plugins/data/public';
-import { DiscoverAppLocatorParams } from '../../../../../../src/plugins/discover/public';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableContext, EmbeddableInput, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
+import { DiscoverAppLocatorParams } from '@kbn/discover-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import * as shared from './shared';
 import { AbstractExploreDataAction } from './abstract_explore_data_action';
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts
index b2370a0f5e264..e4adad896052c 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
 
 const isOutputWithIndexPatterns = (
   output: unknown
diff --git a/x-pack/plugins/discover_enhanced/public/index.ts b/x-pack/plugins/discover_enhanced/public/index.ts
index ed00872d1c8d2..da1a00bc059ca 100644
--- a/x-pack/plugins/discover_enhanced/public/index.ts
+++ b/x-pack/plugins/discover_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializerContext } from 'kibana/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import { DiscoverEnhancedPlugin } from './plugin';
 
 export type { ExploreDataContextMenuAction, ExploreDataChartAction } from './actions';
diff --git a/x-pack/plugins/discover_enhanced/public/plugin.ts b/x-pack/plugins/discover_enhanced/public/plugin.ts
index 63a7e1b6c1c6b..e1fd9e0c74951 100644
--- a/x-pack/plugins/discover_enhanced/public/plugin.ts
+++ b/x-pack/plugins/discover_enhanced/public/plugin.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { PluginInitializerContext } from 'kibana/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../src/plugins/data/public';
-import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';
-import { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
-import { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
 import {
   EmbeddableSetup,
   EmbeddableStart,
   CONTEXT_MENU_TRIGGER,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { ExploreDataContextMenuAction, ExploreDataChartAction } from './actions';
 import { Config } from '../common';
 
diff --git a/x-pack/plugins/discover_enhanced/server/config.ts b/x-pack/plugins/discover_enhanced/server/config.ts
index 95ac46a662ea0..7e07c978f13b2 100644
--- a/x-pack/plugins/discover_enhanced/server/config.ts
+++ b/x-pack/plugins/discover_enhanced/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 export const configSchema = schema.object({
   actions: schema.object({
diff --git a/x-pack/plugins/discover_enhanced/server/index.ts b/x-pack/plugins/discover_enhanced/server/index.ts
index 1d9535801f6f9..95ce6a4b8d3ba 100644
--- a/x-pack/plugins/discover_enhanced/server/index.ts
+++ b/x-pack/plugins/discover_enhanced/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DiscoverEnhancedPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/discover_enhanced/server/plugin.ts b/x-pack/plugins/discover_enhanced/server/plugin.ts
index 50751cd550419..32ceb730309ba 100644
--- a/x-pack/plugins/discover_enhanced/server/plugin.ts
+++ b/x-pack/plugins/discover_enhanced/server/plugin.ts
@@ -6,13 +6,8 @@
  */
 
 import { firstValueFrom, Observable } from 'rxjs';
-import {
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  PluginInitializerContext,
-} from '../../../../src/core/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { Config } from '../common';
 
 interface SetupDependencies {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/index.ts b/x-pack/plugins/drilldowns/url_drilldown/public/index.ts
index 62b200c7fe6c6..43a7b23a14a08 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/index.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UrlDrilldownPlugin } from './plugin';
 
 export function plugin(context: PluginInitializerContext) {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts
index 07ad8de533a9a..22ec6ed873fa1 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts
@@ -5,13 +5,9 @@
  * 2.0.
  */
 
-import { DatatableColumnType } from '../../../../../../../src/plugins/expressions/common';
-import { Query, Filter, TimeRange } from '../../../../../../../src/plugins/data/public';
-import {
-  Embeddable,
-  EmbeddableInput,
-  EmbeddableOutput,
-} from '../../../../../../../src/plugins/embeddable/public';
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import { Query, Filter, TimeRange } from '@kbn/data-plugin/public';
+import { Embeddable, EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 
 export const createPoint = ({
   field,
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts
index c8d187549a66b..58af9e619111a 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { IExternalUrl } from 'src/core/public';
-import { uiSettingsServiceMock } from 'src/core/public/mocks';
+import { IExternalUrl } from '@kbn/core/public';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { UrlDrilldown, ActionContext, Config } from './url_drilldown';
 import {
   IEmbeddable,
   VALUE_CLICK_TRIGGER,
   SELECT_RANGE_TRIGGER,
   CONTEXT_MENU_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { DatatableColumnType } from '../../../../../../src/plugins/expressions/common';
-import { of } from '../../../../../../src/plugins/kibana_utils';
+} from '@kbn/embeddable-plugin/public';
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import { of } from '@kbn/kibana-utils-plugin';
 import { createPoint, rowClickData, TestEmbeddable } from './test/data';
-import { ROW_CLICK_TRIGGER } from '../../../../../../src/plugins/ui_actions/public';
+import { ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
 
 const mockDataPoints = [
   {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx
index f56fb7a9df933..eebd8afc5460d 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { IExternalUrl, IUiSettingsClient } from 'src/core/public';
+import { IExternalUrl, IUiSettingsClient } from '@kbn/core/public';
 import {
   ChartActionContext,
   CONTEXT_MENU_TRIGGER,
@@ -14,15 +14,15 @@ import {
   EmbeddableInput,
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { ROW_CLICK_TRIGGER } from '../../../../../../src/plugins/ui_actions/public';
-import { Query, Filter, TimeRange } from '../../../../../../src/plugins/data/public';
-import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/embeddable-plugin/public';
+import { ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import { Query, Filter, TimeRange } from '@kbn/data-plugin/public';
+import { CollectConfigProps as CollectConfigPropsBase } from '@kbn/kibana-utils-plugin/public';
 import {
   reactToUiComponent,
   UrlTemplateEditorVariable,
   KibanaContextProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import {
   UiActionsEnhancedDrilldownDefinition as Drilldown,
   UrlDrilldownGlobalScope,
@@ -31,7 +31,7 @@ import {
   urlDrilldownValidateUrlTemplate,
   urlDrilldownCompileUrl,
   UiActionsEnhancedBaseActionFactoryContext as BaseActionFactoryContext,
-} from '../../../../ui_actions_enhanced/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import { txtUrlDrilldownDisplayName } from './i18n';
 import { getEventVariableList, getEventScopeValues } from './variables/event_variables';
 import { getContextVariableList, getContextScopeValues } from './variables/context_variables';
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts
index 491501b9dd4a7..6940fb61ed38d 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts
@@ -8,16 +8,13 @@
 import { i18n } from '@kbn/i18n';
 import { monaco } from '@kbn/monaco';
 import { getFlattenedObject } from '@kbn/std';
+import type { Filter, Query, TimeRange } from '@kbn/data-plugin/public';
+import { EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
+import type { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import { txtValue } from './i18n';
-import type { Filter, Query, TimeRange } from '../../../../../../../src/plugins/data/public';
-import {
-  EmbeddableInput,
-  EmbeddableOutput,
-} from '../../../../../../../src/plugins/embeddable/public';
 import type { EmbeddableWithQueryInput } from '../url_drilldown';
 import { deleteUndefinedKeys } from './util';
 import type { ActionFactoryContext } from '../url_drilldown';
-import type { UrlTemplateEditorVariable } from '../../../../../../../src/plugins/kibana_react/public';
 
 /**
  * Part of context scope extracted from an embeddable
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts
index d66d998d7440c..924fdcd1db515 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts
@@ -10,10 +10,7 @@ import {
   getEventVariableList,
   ValueClickTriggerEventScope,
 } from './event_variables';
-import {
-  RowClickContext,
-  ROW_CLICK_TRIGGER,
-} from '../../../../../../../src/plugins/ui_actions/public';
+import { RowClickContext, ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
 import { createPoint, rowClickData } from '../test/data';
 
 describe('VALUE_CLICK_TRIGGER', () => {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts
index 8eb798eea74cb..fa3358fe096a2 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts
@@ -16,17 +16,14 @@ import {
   SELECT_RANGE_TRIGGER,
   ValueClickContext,
   VALUE_CLICK_TRIGGER,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { RowClickContext, ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import type { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import type {
   ActionContext,
   ActionFactoryContext,
   EmbeddableWithQueryInput,
 } from '../url_drilldown';
-import {
-  RowClickContext,
-  ROW_CLICK_TRIGGER,
-} from '../../../../../../../src/plugins/ui_actions/public';
-import type { UrlTemplateEditorVariable } from '../../../../../../../src/plugins/kibana_react/public';
 import { deleteUndefinedKeys, toPrimitiveOrUndefined, Primitive } from './util';
 
 /**
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts
index 7338e6b471211..90edc4b70c0a1 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { monaco } from '@kbn/monaco';
+import { UrlDrilldownGlobalScope } from '@kbn/ui-actions-enhanced-plugin/public';
+import type { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import { txtValue } from './i18n';
-import { UrlDrilldownGlobalScope } from '../../../../../ui_actions_enhanced/public';
-import type { UrlTemplateEditorVariable } from '../../../../../../../src/plugins/kibana_react/public';
 
 const kind = monaco.languages.CompletionItemKind.Constant;
 const sortPrefix = '3.';
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts b/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts
index 053803d69a3e6..aa1b4500a2298 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import {
   AdvancedUiActionsSetup,
   AdvancedUiActionsStart,
   urlDrilldownGlobalScopeProvider,
-} from '../../../ui_actions_enhanced/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { UrlDrilldown } from './lib';
-import { createStartServicesGetter } from '../../../../../src/plugins/kibana_utils/public';
 
 export interface SetupDependencies {
   embeddable: EmbeddableSetup;
diff --git a/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts b/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts
index 62af88f843b83..86ca2030d2ae7 100644
--- a/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { UiActionsPresentableGrouping as PresentableGrouping } from '../../../../../src/plugins/ui_actions/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { UiActionsPresentableGrouping as PresentableGrouping } from '@kbn/ui-actions-plugin/public';
 
 export const drilldownGrouping: PresentableGrouping<{
   embeddable?: IEmbeddable;
diff --git a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts
index 5b15306eae554..87f0d4e8cf04c 100644
--- a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts
@@ -7,7 +7,7 @@
 
 import { PanelNotificationsAction } from './panel_notifications_action';
 import { EnhancedEmbeddableContext } from '../types';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 const createContext = (events: unknown[] = [], isEditMode = false): EnhancedEmbeddableContext =>
   ({
diff --git a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts
index 2675d3449d693..8f8004c363aac 100644
--- a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { EnhancedEmbeddableContext, EnhancedEmbeddable } from '../types';
 
 export const txtOneDrilldown = i18n.translate(
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
index 3cbd9cc85feba..c96a325b55f27 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { Embeddable, ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { Embeddable, ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   EmbeddableActionStorage,
   EmbeddableWithDynamicActionsInput,
 } from './embeddable_action_storage';
-import { UiActionsEnhancedSerializedEvent } from '../../../ui_actions_enhanced/public';
-import { of } from '../../../../../src/plugins/kibana_utils/public';
+import { UiActionsEnhancedSerializedEvent } from '@kbn/ui-actions-enhanced-plugin/public';
+import { of } from '@kbn/kibana-utils-plugin/public';
 // use real const to make test fail in case someone accidentally changes it
-import { APPLY_FILTER_TRIGGER } from '../../../../../src/plugins/data/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
 
 class TestEmbeddable extends Embeddable<EmbeddableWithDynamicActionsInput> {
   public readonly type = 'test';
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
index 65904ab5826ff..63291f652d3f3 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
@@ -10,12 +10,8 @@ import {
   DynamicActionsState,
   UiActionsEnhancedAbstractActionStorage as AbstractActionStorage,
   UiActionsEnhancedSerializedEvent as SerializedEvent,
-} from '../../../ui_actions_enhanced/public';
-import {
-  EmbeddableInput,
-  EmbeddableOutput,
-  IEmbeddable,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from '@kbn/embeddable-plugin/public';
 
 export interface EmbeddableWithDynamicActionsInput extends EmbeddableInput {
   enhancements?: {
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts
index faf1bdd5c4855..7a2dc821180b2 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
 import { EnhancedEmbeddable } from '../types';
 
 export const isEnhancedEmbeddable = <E>(
diff --git a/x-pack/plugins/embeddable_enhanced/public/index.ts b/x-pack/plugins/embeddable_enhanced/public/index.ts
index 8c64f376754a5..63bd6d17ddcb9 100644
--- a/x-pack/plugins/embeddable_enhanced/public/index.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { EmbeddableEnhancedPlugin } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/embeddable_enhanced/public/plugin.ts b/x-pack/plugins/embeddable_enhanced/public/plugin.ts
index 4e83b5b0ffcd2..8f82efdb10671 100644
--- a/x-pack/plugins/embeddable_enhanced/public/plugin.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { SavedObjectAttributes } from 'kibana/public';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
@@ -18,17 +18,17 @@ import {
   defaultEmbeddableFactoryProvider,
   EmbeddableContext,
   PANEL_NOTIFICATION_TRIGGER,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import {
+  UiActionsEnhancedDynamicActionManager as DynamicActionManager,
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import { EnhancedEmbeddable } from './types';
 import {
   EmbeddableActionStorage,
   EmbeddableWithDynamicActions,
 } from './embeddables/embeddable_action_storage';
-import {
-  UiActionsEnhancedDynamicActionManager as DynamicActionManager,
-  AdvancedUiActionsSetup,
-  AdvancedUiActionsStart,
-} from '../../ui_actions_enhanced/public';
 import { PanelNotificationsAction } from './actions';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/embeddable_enhanced/public/types.ts b/x-pack/plugins/embeddable_enhanced/public/types.ts
index 3a930f3f9ff58..7500a37e120cc 100644
--- a/x-pack/plugins/embeddable_enhanced/public/types.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IEmbeddable } from '../../../../src/plugins/embeddable/public';
-import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../ui_actions_enhanced/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '@kbn/ui-actions-enhanced-plugin/public';
 
 export type EnhancedEmbeddable<E extends IEmbeddable = IEmbeddable> = E & {
   enhancements: {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts b/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts
index be05825192d35..ed519de96b52b 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
 import { getCreateMigration } from './create_migration';
 import { EncryptionError, EncryptionErrorOperation } from './crypto';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts b/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts
index f166e018d9c9d..6ef6b82d20e0a 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts
@@ -11,7 +11,7 @@ import type {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectUnsanitizedDoc,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { EncryptionError } from './crypto';
 import type { EncryptedSavedObjectsService, EncryptedSavedObjectTypeRegistration } from './crypto';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
index 3b87362b6dea1..57238786dd499 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
@@ -8,9 +8,9 @@
 import type { Crypto } from '@elastic/node-crypto';
 import nodeCrypto from '@elastic/node-crypto';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { mockAuthenticatedUser } from '@kbn/security-plugin/common/model/authenticated_user.mock';
 
-import { mockAuthenticatedUser } from '../../../security/common/model/authenticated_user.mock';
 import { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError } from './encryption_error';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
index 1e1f09dabcf53..321b93c8452ee 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
@@ -9,9 +9,9 @@ import type { Crypto, EncryptOutput } from '@elastic/node-crypto';
 import stringify from 'json-stable-stringify';
 import typeDetect from 'type-detect';
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
+import type { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
-import type { AuthenticatedUser } from '../../../security/common/model';
 import { EncryptedSavedObjectAttributesDefinition } from './encrypted_saved_object_type_definition';
 import { EncryptionError, EncryptionErrorOperation } from './encryption_error';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts
index 3f343f4a0e15b..a1c598bef2413 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts
@@ -9,14 +9,14 @@ import type {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   loggingSystemMock,
   savedObjectsClientMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError, EncryptionErrorOperation } from './encryption_error';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
index 1a6d1173d1652..6caf76e63508a 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ISavedObjectTypeRegistry,
   KibanaRequest,
@@ -13,9 +12,10 @@ import type {
   SavedObject,
   SavedObjectsBulkUpdateObject,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { AuthenticatedUser, SecurityPluginSetup } from '../../../security/server';
 import { getDescriptorNamespace } from '../saved_objects/get_descriptor_namespace';
 import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError } from './encryption_error';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/index.ts b/x-pack/plugins/encrypted_saved_objects/server/index.ts
index fef302739b7ad..4a75e0f6855b8 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { EncryptedSavedObjectsPlugin } from './plugin';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
index 9d345c5e0af0f..f4708e182ad31 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
-import { securityMock } from '../../security/server/mocks';
 import { ConfigSchema } from './config';
 import { EncryptedSavedObjectsPlugin } from './plugin';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
index 23738026e0ab6..5ba387128ef7e 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
@@ -7,9 +7,9 @@
 
 import nodeCrypto from '@elastic/node-crypto';
 
-import type { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import type { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
-import type { SecurityPluginSetup } from '../../security/server';
 import type { ConfigType } from './config';
 import type { CreateEncryptedSavedObjectsMigrationFn } from './create_migration';
 import { getCreateMigration } from './create_migration';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
index 9c8add9da3ad3..822427687759f 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { ConfigType } from '../config';
 import { ConfigSchema } from '../config';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts
index 680ad0be015c0..d0318c0bb06d3 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { IRouter, Logger } from '@kbn/core/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { IRouter, Logger } from 'src/core/server';
 
 import type { ConfigType } from '../config';
 import type { EncryptionKeyRotationService } from '../crypto';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
index a052b847a50f7..b1c7f3b38139b 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { Type } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { EncryptionKeyRotationService } from '../crypto';
 import { routeDefinitionParamsMock } from './index.mock';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
index f59c4fa61f4aa..9305446767e9d 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from './';
+import type { RouteDefinitionParams } from '.';
 
 /**
  * The default maximum value of from + size for searches to .kibana index. Since we cannot use scroll
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
index 116a112fa1652..724178f9b7088 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import type { SavedObjectsBulkResolveResponse, SavedObjectsClientContract } from 'src/core/server';
-import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
+import type { SavedObjectsBulkResolveResponse, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks';
+import { mockAuthenticatedUser } from '@kbn/security-plugin/common/model/authenticated_user.mock';
 
-import { mockAuthenticatedUser } from '../../../security/common/model/authenticated_user.mock';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptionError } from '../crypto';
 import { EncryptionErrorOperation } from '../crypto/encryption_error';
 import { encryptedSavedObjectsServiceMock } from '../crypto/index.mock';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
-jest.mock('src/core/server/saved_objects/service/lib/utils', () => {
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => {
   const { SavedObjectsUtils } = jest.requireActual(
-    'src/core/server/saved_objects/service/lib/utils'
+    '@kbn/core/server/saved_objects/service/lib/utils'
   );
   return {
     SavedObjectsUtils: {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
index 2cdbc76504fb4..84141db8967a7 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
@@ -33,10 +33,10 @@ import type {
   SavedObjectsUpdateObjectsSpacesOptions,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
+import type { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
-import { SavedObjectsUtils } from '../../../../../src/core/server';
-import type { AuthenticatedUser } from '../../../security/common/model';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { getDescriptorNamespace } from './get_descriptor_namespace';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts
index bb4ae1f59f02f..e70888f8b20f0 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
+import { savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks';
 
 import { getDescriptorNamespace } from './get_descriptor_namespace';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts
index 4e01c516dc3af..b7eed57731ed0 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import type { ISavedObjectTypeRegistry } from 'src/core/server';
-
-import { SavedObjectsUtils } from '../../../../../src/core/server';
+import type { ISavedObjectTypeRegistry } from '@kbn/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 export const getDescriptorNamespace = (
   typeRegistry: ISavedObjectTypeRegistry,
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
index 972292670d05f..032842e0047c0 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
@@ -9,20 +9,20 @@ import type {
   ISavedObjectsRepository,
   ISavedObjectTypeRegistry,
   SavedObject,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsRepositoryMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
-import { securityMock } from '../../../security/server/mocks';
+import type { ClientInstanciator } from '.';
+import { setupSavedObjects } from '.';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { encryptedSavedObjectsServiceMock } from '../crypto/index.mock';
-import type { ClientInstanciator } from './';
-import { setupSavedObjects } from './';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
 describe('#setupSavedObjects', () => {
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 1268113eb19bb..3d9d36206b5c9 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,7 +5,6 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ISavedObjectsRepository,
   ISavedObjectTypeRegistry,
@@ -13,9 +12,10 @@ import type {
   SavedObjectsBaseOptions,
   SavedObjectsServiceSetup,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { SecurityPluginSetup } from '../../../security/server';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 import { getDescriptorNamespace, normalizeNamespace } from './get_descriptor_namespace';
diff --git a/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts b/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts
index 4cd7ceef0b758..b3860fca6159d 100644
--- a/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts
+++ b/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { isVersionMismatch } from './index';
+import { isVersionMismatch } from '.';
 
 describe('isVersionMismatch', () => {
   it('no mismatch if major and minor are the same', () => {
diff --git a/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts b/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts
index fe027f8fe756c..b9747998ab73d 100644
--- a/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts
+++ b/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { stripTrailingSlash, stripLeadingSlash } from './';
+import { stripTrailingSlash, stripLeadingSlash } from '.';
 
 describe('Strip Trailing Slash helper', () => {
   it('strips trailing slashes', () => {
diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json
index c09f40ba8d303..bc12b7f447ab4 100644
--- a/x-pack/plugins/enterprise_search/kibana.json
+++ b/x-pack/plugins/enterprise_search/kibana.json
@@ -7,7 +7,7 @@
   "optionalPlugins": ["usageCollection", "home", "cloud", "customIntegrations"],
   "server": true,
   "ui": true,
-  "requiredBundles": ["home", "kibanaReact"],
+  "requiredBundles": ["kibanaReact"],
   "owner": {
     "name": "Enterprise Search",
     "githubTeam": "enterprise-search-frontend"
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
index 24dcf601442ad..ba8ed14a7ba35 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 export const mockHttpValues = {
   http: httpServiceMock.createSetupContract(),
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
index f2c6ccfacf2bb..e65f0a542ada5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
-import { securityMock } from '../../../../../security/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 
 import { mockHistory } from '../react_router/state.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
index f227928b45821..0ea858d0f2f50 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 
 export const mockLicensingValues = {
   license: licensingMock.createLicense(),
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx
index 0923f9497a8fe..d36ac9c2ced4a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx
@@ -20,7 +20,7 @@ import { LogRetentionTooltip, LogRetentionCallout, LogRetentionOptions } from '.
 import { AnalyticsFilters } from './components';
 import { ANALYTICS_TITLE } from './constants';
 
-import { AnalyticsLogic } from './';
+import { AnalyticsLogic } from '.';
 
 interface Props {
   title: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
index a87555c58014a..cf0d36ef3e95d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
@@ -17,7 +17,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { DEFAULT_START_DATE, DEFAULT_END_DATE } from './constants';
 
-import { AnalyticsLogic } from './';
+import { AnalyticsLogic } from '.';
 
 describe('AnalyticsLogic', () => {
   const { mount } = new LogicMounter(AnalyticsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx
index 68f08d8d84724..c69eb768183fd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx
@@ -13,7 +13,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { AnalyticsRouter } from './';
+import { AnalyticsRouter } from '.';
 
 describe('AnalyticsRouter', () => {
   // Detailed route testing is better done via E2E tests
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx
index 8883d0d1ffcbd..c8158137fe602 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiStat } from '@elastic/eui';
 
-import { AnalyticsCards } from './';
+import { AnalyticsCards } from '.';
 
 describe('AnalyticsCards', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx
index 8a5d2cbf89c4a..c1b5ce46ad682 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { Chart, Settings, LineSeries, Axis } from '@elastic/charts';
 
-import { AnalyticsChart } from './';
+import { AnalyticsChart } from '.';
 
 describe('AnalyticsChart', () => {
   const MOCK_DATA = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx
index 7abb02110e2d9..51da936216241 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx
@@ -16,7 +16,7 @@ import { EuiSelect, EuiDatePickerRange, EuiButton } from '@elastic/eui';
 
 import { DEFAULT_START_DATE, DEFAULT_END_DATE } from '../constants';
 
-import { AnalyticsFilters } from './';
+import { AnalyticsFilters } from '.';
 
 describe('AnalyticsFilters', () => {
   const { history } = mockKibanaValues;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
index dd99d368a0105..e1d985ad92b48 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { KibanaLogic } from '../../../../shared/kibana';
 
 import { DEFAULT_START_DATE, DEFAULT_END_DATE, SERVER_DATE_FORMAT } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx
index de04a21d48a23..4fbd70069f9d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx
@@ -15,7 +15,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFieldSearch } from '@elastic/eui';
 
-import { AnalyticsSearch } from './';
+import { AnalyticsSearch } from '.';
 
 describe('AnalyticsSearch', () => {
   const { navigateToUrl } = mockKibanaValues;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx
index b561a57120440..f4272a7ea1337 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiIcon } from '@elastic/eui';
 
-import { AnalyticsSection } from './';
+import { AnalyticsSection } from '.';
 
 describe('AnalyticsSection', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx
index e25e4d8c16bb2..7ed8f59e379e5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx
@@ -17,7 +17,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 
 import { runActionColumnTests } from './test_helpers/shared_columns_tests';
 
-import { AnalyticsTable } from './';
+import { AnalyticsTable } from '.';
 
 describe('AnalyticsTable', () => {
   const items = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx
index 00cb12060822e..9e87bbb6dcea5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx
@@ -15,7 +15,7 @@ import { EuiBasicTable, EuiLink, EuiBadge, EuiEmptyPrompt } from '@elastic/eui';
 
 import { mountWithIntl } from '../../../../../test_helpers';
 
-import { QueryClicksTable } from './';
+import { QueryClicksTable } from '.';
 
 describe('QueryClicksTable', () => {
   const items = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx
index 6ec89751a62e9..c3cfdf33f9d8a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx
@@ -17,7 +17,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 
 import { runActionColumnTests } from './test_helpers/shared_columns_tests';
 
-import { RecentQueriesTable } from './';
+import { RecentQueriesTable } from '.';
 
 describe('RecentQueriesTable', () => {
   const items = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx
index aa949a01f7d79..dd88d6ed28e35 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx
@@ -12,6 +12,7 @@ import { useValues } from 'kea';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '..';
 import { EuiButtonEmptyTo } from '../../../../shared/react_router_helpers';
 import { CursorIcon } from '../../../icons';
 
@@ -39,7 +40,6 @@ import {
   TOP_QUERIES_NO_CLICKS,
   RECENT_QUERIES,
 } from '../constants';
-import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '../index';
 
 import './analytics.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx
index f3fee2553d2fd..0eb3002f6472f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx
@@ -15,7 +15,7 @@ import { shallow } from 'enzyme';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsCards, AnalyticsChart, QueryClicksTable } from '../components';
 
-import { QueryDetail } from './';
+import { QueryDetail } from '.';
 
 describe('QueryDetail', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx
index 814173744249f..8c2819e86bf40 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx
@@ -12,11 +12,11 @@ import { useValues } from 'kea';
 import { EuiPanel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '..';
 import { useDecodedParams } from '../../../utils/encode_path_params';
 
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSection, QueryClicksTable } from '../components';
-import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '../index';
 
 const QUERY_DETAIL_TITLE = i18n.translate(
   'xpack.enterpriseSearch.appSearch.engine.analytics.queryDetail.title',
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx
index 20a25db3a7adf..46f4e9d2f3ee0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { RecentQueriesTable } from '../components';
 
-import { RecentQueries } from './';
+import { RecentQueries } from '.';
 
 describe('RecentQueries', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx
index 7a86da9dfd8c1..df6efdf06bc26 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, RecentQueriesTable } from '../components';
 import { RECENT_QUERIES } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx
index 98362e42c5536..f69d10f42d174 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueries } from './';
+import { TopQueries } from '.';
 
 describe('TopQueries', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx
index 81b3d08770be6..f43bb807140a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx
index dfbda1c68ca84..6898d32879f9c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueriesNoClicks } from './';
+import { TopQueriesNoClicks } from '.';
 
 describe('TopQueriesNoClicks', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx
index 2aec88bd372fe..413ca7594a9bd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES_NO_CLICKS } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx
index 60e33660f87d7..e644e338db034 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueriesNoResults } from './';
+import { TopQueriesNoResults } from '.';
 
 describe('TopQueriesNoResults', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx
index 835b259330c83..df76d8349f70c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES_NO_RESULTS } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx
index b4c9f0fb40f71..c966624f14757 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueriesWithClicks } from './';
+import { TopQueriesWithClicks } from '.';
 
 describe('TopQueriesWithClicks', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx
index 9bea265df55ae..fcc87848fd58d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES_WITH_CLICKS } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx
index 25fdfbdec8fdf..2caf70fe6d2b0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx
@@ -28,7 +28,7 @@ import { i18n } from '@kbn/i18n';
 
 import { getStatusColor, attemptToFormatJson } from '../utils';
 
-import { ApiLogLogic } from './';
+import { ApiLogLogic } from '.';
 
 export const ApiLogFlyout: React.FC = () => {
   const { isFlyoutOpen, apiLog } = useValues(ApiLogLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx
index e0d7c30bd0141..25e6803a9883b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx
@@ -8,7 +8,7 @@
 import { LogicMounter } from '../../../../__mocks__/kea_logic';
 import { mockApiLog } from '../__mocks__/api_log.mock';
 
-import { ApiLogLogic } from './';
+import { ApiLogLogic } from '.';
 
 describe('ApiLogLogic', () => {
   const { mount } = new LogicMounter(ApiLogLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx
index 5b082ce8d26ba..94aa8e6faeae0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx
@@ -18,7 +18,7 @@ import { LogRetentionCallout, LogRetentionTooltip } from '../log_retention';
 
 import { ApiLogsTable, NewApiEventsPrompt } from './components';
 
-import { ApiLogs } from './';
+import { ApiLogs } from '.';
 
 describe('ApiLogs', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx
index d3eef77db21f0..06bf16cbcbddf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx
@@ -19,7 +19,7 @@ import { ApiLogFlyout } from './api_log';
 import { ApiLogsTable, NewApiEventsPrompt, EmptyState } from './components';
 import { API_LOGS_TITLE, RECENT_API_EVENTS } from './constants';
 
-import { ApiLogsLogic } from './';
+import { ApiLogsLogic } from '.';
 
 export const ApiLogs: React.FC = () => {
   const { dataLoading, apiLogs, meta } = useValues(ApiLogsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
index 35fa74374acb2..614f3506b4ef9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
@@ -19,7 +19,7 @@ import { DEFAULT_META } from '../../../shared/constants';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { ApiLogsLogic } from './';
+import { ApiLogsLogic } from '.';
 
 describe('ApiLogsLogic', () => {
   const { mount, unmount } = new LogicMounter(ApiLogsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx
index 55d1bb1198fda..4580f8313fa05 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx
@@ -23,7 +23,7 @@ import { EuiBasicTable, EuiBadge, EuiHealth, EuiButtonEmpty } from '@elastic/eui
 import { DEFAULT_META } from '../../../../shared/constants';
 import { mountWithIntl } from '../../../../test_helpers';
 
-import { ApiLogsTable } from './';
+import { ApiLogsTable } from '.';
 
 describe('ApiLogsTable', () => {
   const apiLogs = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx
index 17a05a8e24ed6..454b68398b4ff 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx
@@ -19,14 +19,14 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedRelative } from '@kbn/i18n-react';
 
+import { ApiLogsLogic } from '..';
 import { convertMetaToPagination, handlePageChange } from '../../../../shared/table_pagination';
 
 import { ApiLogLogic } from '../api_log';
-import { ApiLogsLogic } from '../index';
 import { ApiLog } from '../types';
 import { getStatusColor } from '../utils';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 import './api_logs_table.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx
index cb1c34a19c018..46aabf57da0c7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx
index 5fd1d12f24842..1f7f6f7f96488 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiButtonEmpty } from '@elastic/eui';
 
-import { NewApiEventsPrompt } from './';
+import { NewApiEventsPrompt } from '.';
 
 describe('NewApiEventsPrompt', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx
index 1f834e061bd2c..8ac6b3a921ee0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx
@@ -12,7 +12,7 @@ import { useValues, useActions } from 'kea';
 import { EuiPanel, EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { ApiLogsLogic } from '../';
+import { ApiLogsLogic } from '..';
 
 import './new_api_events_prompt.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx
index 128dcdcb778cf..4533ca04c75bc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx
@@ -29,13 +29,13 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { CANCEL_BUTTON_LABEL, SAVE_BUTTON_LABEL } from '../../../../../shared/constants';
 import {
   DAYS_UNIT_LABEL,
   HOURS_UNIT_LABEL,
   MONTHS_UNIT_LABEL,
   WEEKS_UNIT_LABEL,
-} from '../../../../..//shared/constants/units';
-import { CANCEL_BUTTON_LABEL, SAVE_BUTTON_LABEL } from '../../../../../shared/constants';
+} from '../../../../../shared/constants/units';
 
 import { WEB_CRAWLER_DOCS_URL } from '../../../../routes';
 import { CrawlUnits } from '../../types';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx
index a206cdef4a737..240295394a2d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFieldText, EuiFormRow } from '@elastic/eui';
 
-import { FormKeyName } from './';
+import { FormKeyName } from '.';
 
 describe('FormKeyName', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx
index 6f52a27dd628d..0128509da1928 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCheckbox } from '@elastic/eui';
 
-import { FormKeyReadWriteAccess } from './';
+import { FormKeyReadWriteAccess } from '.';
 
 describe('FormKeyReadWriteAccess', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx
index 9cd518be2aaa5..f3af239a02992 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx
@@ -15,7 +15,7 @@ import { EuiSelect } from '@elastic/eui';
 
 import { ApiTokenTypes, TOKEN_TYPE_INFO } from '../../constants';
 
-import { FormKeyType } from './';
+import { FormKeyType } from '.';
 
 describe('FormKeyType', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx
index 38eec0b371576..de1e3ad2358de 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { FormKeyUpdateWarning } from './';
+import { FormKeyUpdateWarning } from '.';
 
 describe('FormKeyUpdateWarning', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx
index b86c1c592c4cd..904a3b76d1486 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlyout } from '@elastic/eui';
 
-import { CredentialsFlyout } from './';
+import { CredentialsFlyout } from '.';
 
 describe('CredentialsFlyout', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx
index 84acd7e38a291..8a0539b70d542 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx
@@ -19,7 +19,7 @@ import { ApiToken } from '../types';
 
 import { Key } from './key';
 
-import { CredentialsList } from './';
+import { CredentialsList } from '.';
 
 describe('CredentialsList', () => {
   const apiToken: ApiToken = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx
index 69c2cc4b987b1..7608e4d0861f9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
index c2b40a2c0aa08..c15089726b6fc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
@@ -23,7 +23,7 @@ import { AutomatedCuration } from './automated_curation';
 
 import { ManualCuration } from './manual_curation';
 
-import { Curation } from './';
+import { Curation } from '.';
 
 describe('Curation', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts
index 193d397b1fb50..4e25477d65dbf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts
@@ -17,7 +17,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../../test_helpers';
 
-import { CurationLogic } from './';
+import { CurationLogic } from '.';
 
 describe('CurationLogic', () => {
   const { mount } = new LogicMounter(CurationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx
index 7160931bcf402..823189c006c8d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx
@@ -16,7 +16,7 @@ import { EuiEmptyPrompt, EuiButtonEmpty, EuiBadge } from '@elastic/eui';
 import { DataPanel } from '../../../data_panel';
 import { CurationResult } from '../results';
 
-import { HiddenDocuments } from './';
+import { HiddenDocuments } from '.';
 
 describe('HiddenDocuments', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx
index eaf3e16774420..e7e98feba4ecb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx
@@ -18,7 +18,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 import { DataPanel } from '../../../data_panel';
 import { CurationResult } from '../results';
 
-import { OrganicDocuments } from './';
+import { OrganicDocuments } from '.';
 
 describe('OrganicDocuments', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx
index 4d8e9e9ed3d4a..0df3e20c52fbd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx
@@ -23,7 +23,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 import { DataPanel } from '../../../data_panel';
 import { CurationResult } from '../results';
 
-import { PromotedDocuments } from './';
+import { PromotedDocuments } from '.';
 
 describe('PromotedDocuments', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx
index f27c7ef959b50..5b3ef09ffd2ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiSelect } from '@elastic/eui';
 
-import { ActiveQuerySelect } from './';
+import { ActiveQuerySelect } from '.';
 
 describe('ActiveQuerySelect', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx
index 1ff34c5875a0c..a305ab53b4258 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx
@@ -15,7 +15,7 @@ import { EuiButton, EuiModal } from '@elastic/eui';
 
 import { MultiInputRows } from '../../../multi_input_rows';
 
-import { ManageQueriesModal } from './';
+import { ManageQueriesModal } from '.';
 
 describe('ManageQueriesModal', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx
index 5b5c814a24c5b..9a180ff64774b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiButton } from '@elastic/eui';
 
-import { AddResultButton } from './';
+import { AddResultButton } from '.';
 
 describe('AddResultButton', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx
index 956b0ba0645c2..912764d4db255 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 
 import { CurationLogic } from '..';
 
-import { AddResultLogic } from './';
+import { AddResultLogic } from '.';
 
 export const AddResultButton: React.FC = () => {
   const { openFlyout } = useActions(AddResultLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx
index 71469e4e3f8cb..e544b6f7dccf8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlyout, EuiFieldSearch, EuiEmptyPrompt } from '@elastic/eui';
 
-import { CurationResult, AddResultFlyout } from './';
+import { CurationResult, AddResultFlyout } from '.';
 
 describe('AddResultFlyout', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx
index 4c5ba8f1447fd..adee89181d43f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx
@@ -36,7 +36,7 @@ import {
 } from '../../constants';
 import { CurationLogic } from '../curation_logic';
 
-import { AddResultLogic, CurationResult } from './';
+import { AddResultLogic, CurationResult } from '.';
 
 export const AddResultFlyout: React.FC = () => {
   const searchLogic = SearchLogic({ id: 'add-results-flyout' });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts
index f1013fa4a6dfb..a1f485ac2503e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts
@@ -8,7 +8,7 @@
 import { LogicMounter } from '../../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/engine_logic.mock';
 
-import { AddResultLogic } from './';
+import { AddResultLogic } from '.';
 
 describe('AddResultLogic', () => {
   const { mount } = new LogicMounter(AddResultLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx
index 36a2f47956c21..d50234b74c820 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx
@@ -14,7 +14,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { Result } from '../../../result';
 
-import { CurationResult } from './';
+import { CurationResult } from '.';
 
 describe('CurationResult', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts
index d8fcc01c29a96..80719bf829a21 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts
@@ -19,7 +19,7 @@ import { DEFAULT_META } from '../../../shared/constants';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { CurationsLogic } from './';
+import { CurationsLogic } from '.';
 
 describe('CurationsLogic', () => {
   const { mount } = new LogicMounter(CurationsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx
index 9598212d3e0c9..2a67d21399454 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx
@@ -12,7 +12,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { CurationsRouter } from './';
+import { CurationsRouter } from '.';
 
 describe('CurationsRouter', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx
index 9aa1759cec5c0..6cd475a125cb2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx
@@ -12,6 +12,7 @@ import { useActions } from 'kea';
 import { EuiPanel, EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { CurationsLogic } from '..';
 import { AppSearchPageTemplate } from '../../layout';
 import { MultiInputRows } from '../../multi_input_rows';
 
@@ -20,7 +21,6 @@ import {
   QUERY_INPUTS_BUTTON,
   QUERY_INPUTS_PLACEHOLDER,
 } from '../constants';
-import { CurationsLogic } from '../index';
 import { getCurationsBreadcrumbs } from '../utils';
 
 export const CurationCreation: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts
index fe1beea237818..797d8012f76b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts
@@ -6,7 +6,8 @@
  */
 
 import { kea, MakeLogicType } from 'kea';
-import { HttpSetup } from 'kibana/public';
+
+import { HttpSetup } from '@kbn/core/public';
 
 import { i18n } from '@kbn/i18n';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
index ba3ac33be3c47..3de39f21e1de0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
@@ -98,26 +98,6 @@ describe('Curations', () => {
     expect(tabs.length).toBe(2);
   });
 
-  it('renders a New! badge  when suggestions are not active', () => {
-    setMockValues(set('engine.adaptive_relevance_suggestions_active', false, values));
-    const wrapper = shallow(<Curations />);
-
-    expect(getPageTitle(wrapper)).toEqual('Curated results');
-
-    const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
-    expect(tabs.at(1).prop('append')).not.toBeUndefined();
-  });
-
-  it('hides the badge when suggestions are active', () => {
-    setMockValues(set('engine.adaptive_relevance_suggestions_active', true, values));
-    const wrapper = shallow(<Curations />);
-
-    expect(getPageTitle(wrapper)).toEqual('Curated results');
-
-    const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
-    expect(tabs.at(2).prop('append')).toBeUndefined();
-  });
-
   it('renders an overview view', () => {
     setMockValues({ ...values, selectedPageTab: 'overview' });
     const wrapper = shallow(<Curations />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
index 048566409ab9f..5edfd1b969964 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
@@ -9,7 +9,6 @@ import React, { useEffect } from 'react';
 
 import { useValues, useActions } from 'kea';
 
-import { EuiBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { EuiButtonTo } from '../../../../shared/react_router_helpers';
@@ -33,8 +32,6 @@ export const Curations: React.FC = () => {
     engine: { adaptive_relevance_suggestions_active: adaptiveRelevanceSuggestionsActive },
   } = useValues(EngineLogic);
 
-  const suggestionsEnabled = adaptiveRelevanceSuggestionsActive;
-
   const OVERVIEW_TAB = {
     label: i18n.translate(
       'xpack.enterpriseSearch.appSearch.engine.curations.overviewPageTabLabel',
@@ -63,13 +60,6 @@ export const Curations: React.FC = () => {
     ),
     isSelected: selectedPageTab === 'settings',
     onClick: () => onSelectPageTab('settings'),
-    append: suggestionsEnabled ? undefined : (
-      <EuiBadge color="success">
-        {i18n.translate('xpack.enterpriseSearch.appSearch.engine.curations.newBadgeLabel', {
-          defaultMessage: 'New!',
-        })}
-      </EuiBadge>
-    ),
   };
 
   const pageTabs = adaptiveRelevanceSuggestionsActive
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx
index e86b06b423a9d..7bbe276aedf69 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx
@@ -28,6 +28,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
 import { getEnterpriseSearchUrl } from '../../../../shared/enterprise_search_url';
 import { API_CLIENTS_DOCS_URL, INDEXING_DOCS_URL } from '../../../routes';
@@ -35,7 +36,6 @@ import { EngineLogic } from '../../engine';
 import { EngineDetails } from '../../engine/types';
 
 import { DOCUMENTS_API_JSON_EXAMPLE, FLYOUT_ARIA_LABEL_ID } from '../constants';
-import { DocumentCreationLogic } from '../index';
 
 export const ApiCodeExample: React.FC = () => (
   <>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx
index 8fec70d7abcdd..b7dce0f996a6c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx
@@ -25,11 +25,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
 
 import { FLYOUT_ARIA_LABEL_ID } from '../constants';
 import { Errors } from '../creation_response_components';
-import { DocumentCreationLogic } from '../index';
 
 import './paste_json_text.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx
index a31a46007a8b4..d70cd260d573f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx
@@ -19,7 +19,7 @@ import {
   UploadJsonFileTabContent,
   PasteJsonTextFooterContent,
   UploadJsonFileFooterContent,
-} from './';
+} from '.';
 
 describe('JsonFlyout', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx
index 3f78c10ee2195..f9ed45bf38996 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx
@@ -20,16 +20,16 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic, ActiveJsonTab } from '..';
 import { FLYOUT_ARIA_LABEL_ID } from '../constants';
 import { Errors } from '../creation_response_components';
-import { DocumentCreationLogic, ActiveJsonTab } from '../index';
 
 import {
   PasteJsonTextTabContent,
   UploadJsonFileTabContent,
   PasteJsonTextFooterContent,
   UploadJsonFileFooterContent,
-} from './';
+} from '.';
 
 import './json_flyout.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx
index 4eae3b4f520de..2fd7aac12a5e5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx
@@ -20,11 +20,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL, CONTINUE_BUTTON_LABEL } from '../../../../shared/constants';
 import { AppLogic } from '../../../app_logic';
 
-import { DocumentCreationLogic } from '../index';
-
 import './paste_json_text.scss';
 
 export const PasteJsonTextTabContent: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx
index 1087e3d927559..343d2ca4470d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx
@@ -13,9 +13,9 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiButtonEmpty } from '@elastic/eui';
 
-import { DocumentCreationButtons } from '../';
+import { DocumentCreationButtons } from '..';
 
-import { ShowCreationModes } from './';
+import { ShowCreationModes } from '.';
 
 describe('ShowCreationModes', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx
index ff34f0ff7a0b7..7380e085a5e3c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic, DocumentCreationButtons } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
 import { FLYOUT_ARIA_LABEL_ID } from '../constants';
-import { DocumentCreationLogic, DocumentCreationButtons } from '../index';
 
 export const ShowCreationModes: React.FC = () => {
   const { closeDocumentCreation } = useActions(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx
index ec172f0434dc3..8d9dd2419d2bb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx
@@ -20,11 +20,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL, CONTINUE_BUTTON_LABEL } from '../../../../shared/constants';
 import { AppLogic } from '../../../app_logic';
 
-import { DocumentCreationLogic } from '../index';
-
 export const UploadJsonFileTabContent: React.FC = () => {
   const {
     configuredLimits: {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx
index 3a3e7fd66d314..b0f7180700525 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { Errors } from './';
+import { Errors } from '.';
 
 describe('Errors', () => {
   it('does not render if no errors or warnings to render', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx
index 3564d8ad088ee..755b8b3c1c916 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx
@@ -11,8 +11,8 @@ import { useValues } from 'kea';
 
 import { EuiCallOut } from '@elastic/eui';
 
+import { DocumentCreationLogic } from '..';
 import { DOCUMENT_CREATION_ERRORS, DOCUMENT_CREATION_WARNINGS } from '../constants';
-import { DocumentCreationLogic } from '../index';
 
 export const Errors: React.FC = () => {
   const { errors, warnings } = useValues(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx
index 39608c6e8f81d..13c629f758a59 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx
@@ -20,7 +20,7 @@ import {
   SchemaFieldsSummary,
 } from './summary_sections';
 
-import { Summary } from './';
+import { Summary } from '.';
 
 describe('Summary', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx
index 9452bbbf85935..430155a7471c8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx
@@ -21,9 +21,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic } from '..';
 import { CLOSE_BUTTON_LABEL } from '../../../../shared/constants';
 import { FLYOUT_ARIA_LABEL_ID, DOCUMENT_CREATION_ERRORS } from '../constants';
-import { DocumentCreationLogic } from '../index';
 import { DocumentCreationStep } from '../types';
 
 import {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx
index f2e863c2a9983..e156b0fb0a708 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx
@@ -12,7 +12,7 @@ import { useValues } from 'kea';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DocumentCreationLogic } from '../';
+import { DocumentCreationLogic } from '..';
 
 import { ExampleDocumentJson, MoreDocumentsText } from './summary_documents';
 import { SummarySectionAccordion, SummarySectionEmpty } from './summary_section';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx
index 3671f69356de7..a99987272fe23 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx
@@ -19,7 +19,7 @@ import { EuiCard, EuiText } from '@elastic/eui';
 
 import { EuiCardTo } from '../../../shared/react_router_helpers';
 
-import { DocumentCreationButtons } from './';
+import { DocumentCreationButtons } from '.';
 
 describe('DocumentCreationButtons', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx
index 838c47e62cc5d..07de7b3ec0c34 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx
@@ -33,7 +33,7 @@ import { generateEnginePath } from '../engine';
 
 import illustration from './illustration.svg';
 
-import { DocumentCreationLogic } from './';
+import { DocumentCreationLogic } from '.';
 
 interface Props {
   isFlyout?: boolean;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx
index 2e8111eb00f1e..ad137906aeb92 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx
@@ -21,7 +21,7 @@ import {
 import { Summary } from './creation_response_components';
 import { DocumentCreationStep } from './types';
 
-import { DocumentCreationLogic } from './';
+import { DocumentCreationLogic } from '.';
 
 export const DocumentCreationFlyout: React.FC = () => {
   const { closeDocumentCreation } = useActions(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts
index e0f49c788a9e1..3e39c50ff8de7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts
@@ -23,7 +23,7 @@ jest.mock('./utils', () => ({
 }));
 import { readUploadedFileAsText } from './utils';
 
-import { DocumentCreationLogic } from './';
+import { DocumentCreationLogic } from '.';
 
 describe('DocumentCreationLogic', () => {
   const { mount } = new LogicMounter(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx
index b8bb26fa9ad63..88f255f5a3a47 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx
index 3e8a9c1ab307c..2871e4f96015f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx
@@ -25,7 +25,7 @@ import { CustomizationModal } from './customization_modal';
 import { SearchExperienceContent } from './search_experience_content';
 import { Fields } from './types';
 
-import { SearchExperience } from './';
+import { SearchExperience } from '.';
 
 describe('SearchExperience', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
index 2b65c627793e2..acd53a89a7f1f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
@@ -18,7 +18,7 @@ import { ApiTokenTypes } from '../credentials/constants';
 
 import { EngineTypes } from './types';
 
-import { EngineLogic } from './';
+import { EngineLogic } from '.';
 
 describe('EngineLogic', () => {
   const { mount, unmount } = new LogicMounter(EngineLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
index 76a7278df6ee6..a50fdb1c1f988 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
@@ -42,7 +42,7 @@ import { SCHEMA_TITLE } from '../schema';
 import { SEARCH_UI_TITLE } from '../search_ui';
 import { SYNONYMS_TITLE } from '../synonyms';
 
-import { EngineLogic, generateEnginePath } from './';
+import { EngineLogic, generateEnginePath } from '.';
 
 import './engine_nav.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
index 669a729000744..251a51f402bf2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
@@ -46,7 +46,7 @@ import { SearchUI } from '../search_ui';
 import { SourceEngines } from '../source_engines';
 import { Synonyms } from '../synonyms';
 
-import { EngineLogic, getEngineBreadcrumbs } from './';
+import { EngineLogic, getEngineBreadcrumbs } from '.';
 
 export const EngineRouter: React.FC = () => {
   const {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts
index 820d89e473922..28121607cf897 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts
@@ -10,7 +10,7 @@ import { generateEncodedPath } from '../../utils/encode_path_params';
 
 import { ENGINES_TITLE } from '../engines';
 
-import { EngineLogic } from './';
+import { EngineLogic } from '.';
 
 /**
  * Generate a path with engineName automatically filled from EngineLogic state
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx
index 7d033cf3d8282..1faf2f93fa1b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx
@@ -14,7 +14,7 @@ import { useLocation } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { EngineCreation } from './';
+import { EngineCreation } from '.';
 
 describe('EngineCreation', () => {
   const DEFAULT_VALUES = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.tsx
index 28cbc818b60c7..33a8135fa63d4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.tsx
@@ -33,6 +33,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
+import { docLinks } from '../../../shared/doc_links';
 import { parseQueryParams } from '../../../shared/query_params';
 import { ENGINES_TITLE } from '../engines';
 import { AppSearchPageTemplate } from '../layout';
@@ -212,7 +213,10 @@ export const EngineCreation: React.FC = () => {
                             </p>
                             <p>
                               <small>
-                                <EuiLink href="#" target="_blank">
+                                <EuiLink
+                                  href={docLinks.appSearchElasticsearchIndexedEngines}
+                                  target="_blank"
+                                >
                                   {i18n.translate(
                                     'xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLink',
                                     {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx
index 136c9c6603e5c..99990e2b32aea 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx
@@ -11,6 +11,7 @@ import { useValues } from 'kea';
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
+import { EngineOverviewLogic } from '..';
 import { EuiButtonEmptyTo } from '../../../../shared/react_router_helpers';
 import { ENGINE_ANALYTICS_PATH, ENGINE_API_LOGS_PATH } from '../../../routes';
 import { AnalyticsChart, convertToChartData } from '../../analytics';
@@ -19,7 +20,6 @@ import { DataPanel } from '../../data_panel';
 import { generateEnginePath } from '../../engine';
 
 import { VIEW_ANALYTICS, VIEW_API_LOGS, LAST_7_DAYS } from '../constants';
-import { EngineOverviewLogic } from '../index';
 
 export const TotalCharts: React.FC = () => {
   const { startDate, queriesPerDay, operationsPerDay } = useValues(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx
index 35c6fa439a416..9a5fd0066db37 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
+import { EngineOverviewLogic } from '..';
 import { AnalyticsCards } from '../../analytics';
 import { TOTAL_QUERIES, TOTAL_DOCUMENTS, TOTAL_CLICKS } from '../../analytics/constants';
-import { EngineOverviewLogic } from '../index';
 
 export const TotalStats: React.FC = () => {
   const { totalQueries, documentCount, totalClicks } = useValues(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
index be416b69b1aa9..943158a1935bb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
@@ -14,7 +14,7 @@ import { shallow } from 'enzyme';
 import { EmptyEngineOverview } from './engine_overview_empty';
 import { EngineOverviewMetrics } from './engine_overview_metrics';
 
-import { EngineOverview } from './';
+import { EngineOverview } from '.';
 
 describe('EngineOverview', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
index 6f0454ca73754..69e7cf3053d30 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
@@ -15,7 +15,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { EngineOverviewLogic } from './';
+import { EngineOverviewLogic } from '.';
 
 describe('EngineOverviewLogic', () => {
   const { mount } = new LogicMounter(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
index d245b293467f3..66292e0d3618d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
@@ -19,7 +19,7 @@ import { TotalStats, TotalCharts, RecentApiLogs } from './components';
 
 import { SuggestedCurationsCallout } from './components/suggested_curations_callout';
 
-import { EngineOverviewLogic } from './';
+import { EngineOverviewLogic } from '.';
 
 export const EngineOverviewMetrics: React.FC = () => {
   const { loadOverviewMetrics } = useActions(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx
index 350412825b996..ceee401b637b1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyMetaEnginesState } from './';
+import { EmptyMetaEnginesState } from '.';
 
 describe('EmptyMetaEnginesState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx
index 9117fdd0be87d..8fcb57a510a2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx
@@ -15,7 +15,7 @@ import { EuiEmptyPrompt } from '@elastic/eui';
 
 import { SampleEngineCreationCta } from '../../sample_engine_creation_cta';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   describe('when the user can manage/create engines', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts
index 4ab9137436ffe..bc954790debba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-jest.mock('../../../../engines', () => ({
+jest.mock('../../..', () => ({
   EnginesLogic: { actions: { deleteEngine: jest.fn() } },
 }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
index b0ca36a777838..1e76ab2b749fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
@@ -15,10 +15,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedNumber } from '@kbn/i18n-react';
 
+import { EnginesLogic } from '../..';
 import { MANAGE_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../../../../../shared/constants';
 import { FormattedDateTime } from '../../../../utils/formatted_date_time';
 import { EngineDetails } from '../../../engine/types';
-import { EnginesLogic } from '../../../engines';
 
 import { navigateToEngine } from './engine_link_helpers';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx
index b46dfa7e19dd9..d67f2bd776db2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx
@@ -12,10 +12,9 @@ import { ShallowWrapper } from 'enzyme';
 
 import { EuiBasicTable, EuiButtonIcon } from '@elastic/eui';
 
+import { EnginesLogic } from '../../..';
 import { rerender } from '../../../../../../test_helpers';
 
-import { EnginesLogic } from '../../../../engines';
-
 import * as engineLinkHelpers from '../engine_link_helpers';
 
 export const runSharedColumnsTests = (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts
index 9659745aeb61d..2624df01c5c09 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts
@@ -18,7 +18,7 @@ import { DEFAULT_META } from '../../../shared/constants';
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 import { EngineDetails, EngineTypes } from '../engine/types';
 
-import { EnginesLogic } from './';
+import { EnginesLogic } from '.';
 
 describe('EnginesLogic', () => {
   const { mount } = new LogicMounter(EnginesLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx
index 90fc47a8d493a..e7d11b0ad5ec5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx
@@ -17,7 +17,7 @@ import { rerender } from '../../../test_helpers';
 import { EnginesTable } from './components/tables/engines_table';
 import { MetaEnginesTable } from './components/tables/meta_engines_table';
 
-import { EnginesOverview } from './';
+import { EnginesOverview } from '.';
 
 describe('EnginesOverview', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
index e1c9ea53c0c0b..b307835534dd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorConnecting } from './';
+import { ErrorConnecting } from '.';
 
 describe('ErrorConnecting', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
index 84dcb07a07474..4eb1eb0a3d36b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx
index c6ccdc78b16f3..2cbcf54748661 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx
@@ -14,11 +14,10 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 
+import { LogRetentionOptions } from '..';
 import { mountWithIntl } from '../../../../test_helpers';
 
-import { LogRetentionOptions } from '../index';
-
-import { LogRetentionCallout } from './';
+import { LogRetentionCallout } from '.';
 
 describe('LogRetentionCallout', () => {
   const actions = { fetchLogRetention: jest.fn() };
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx
index 6c0f6bd3dd31f..387b98a67eaf1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx
@@ -13,6 +13,7 @@ import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { LogRetentionLogic, LogRetentionOptions, renderLogRetentionDate } from '..';
 import { EuiLinkTo } from '../../../../shared/react_router_helpers';
 
 import { AppLogic } from '../../../app_logic';
@@ -21,8 +22,6 @@ import { ANALYTICS_TITLE } from '../../analytics';
 import { API_LOGS_TITLE } from '../../api_logs';
 import { CRAWLER_TITLE } from '../../crawler';
 
-import { LogRetentionLogic, LogRetentionOptions, renderLogRetentionDate } from '../index';
-
 export const AUDIT_LOGS_TITLE = i18n.translate('xpack.enterpriseSearch.appSearch.audit.title', {
   defaultMessage: 'Audit',
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx
index db5f058b28015..f42dc80fe235d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx
@@ -14,9 +14,9 @@ import { shallow, mount } from 'enzyme';
 
 import { EuiIconTip } from '@elastic/eui';
 
-import { LogRetentionOptions, LogRetentionMessage } from '../';
+import { LogRetentionOptions, LogRetentionMessage } from '..';
 
-import { LogRetentionTooltip } from './';
+import { LogRetentionTooltip } from '.';
 
 describe('LogRetentionTooltip', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx
index ac701d4cc067b..98c5c95978a1d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx
@@ -12,10 +12,9 @@ import { useValues, useActions } from 'kea';
 import { EuiIconTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { LogRetentionLogic, LogRetentionMessage, LogRetentionOptions } from '..';
 import { AppLogic } from '../../../app_logic';
 
-import { LogRetentionLogic, LogRetentionMessage, LogRetentionOptions } from '../index';
-
 interface Props {
   type: LogRetentionOptions;
   position?: 'top' | 'right' | 'bottom' | 'left';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts
index 0a41ae4e87266..fba8b118d4d24 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts
@@ -15,7 +15,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { LogRetentionOptions } from './types';
 
-import { LogRetentionLogic } from './';
+import { LogRetentionLogic } from '.';
 
 describe('LogRetentionLogic', () => {
   const { mount } = new LogicMounter(LogRetentionLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx
index 9ae85e65eea99..31c8b4d492752 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx
@@ -15,7 +15,7 @@ import { mountWithIntl } from '../../../../test_helpers';
 
 import { LogRetentionOptions } from '../types';
 
-import { LogRetentionMessage } from './';
+import { LogRetentionMessage } from '.';
 
 describe('LogRetentionMessage', () => {
   const analytics = LogRetentionOptions.Analytics;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx
index fe7ea2d959289..7697fc1ca9b19 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx
@@ -14,7 +14,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { MetaEngineCreation } from './';
+import { MetaEngineCreation } from '.';
 
 const DEFAULT_VALUES = {
   // MetaEngineLogic
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
index 63952bc2a6de7..a0f2cb30e33e6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
@@ -21,7 +21,7 @@ jest.mock('./multi_input_rows_logic', () => ({
 }));
 import { MultiInputRowsLogic } from './multi_input_rows_logic';
 
-import { MultiInputRows } from './';
+import { MultiInputRows } from '.';
 
 describe('MultiInputRows', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
index 6fed726eb5e0b..add77d2d1e6c3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
@@ -13,7 +13,7 @@ import { NotFoundPrompt } from '../../../shared/not_found';
 import { SendAppSearchTelemetry } from '../../../shared/telemetry';
 import { AppSearchPageTemplate } from '../layout';
 
-import { NotFound } from './';
+import { NotFound } from '.';
 
 describe('NotFound', () => {
   const wrapper = shallow(<NotFound />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx
index 4f6c1c4248fe6..10da642cf7248 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 
 import { useActions } from 'kea';
 
+import { RelevanceTuningLogic } from '../..';
 import { MultiInputRows } from '../../../multi_input_rows';
 
-import { RelevanceTuningLogic } from '../../index';
 import { ValueBoost } from '../../types';
 
 interface Props {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx
index 454437a203bc2..371aa1c61095e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx
index 0d09148d3de3f..b2067e90ac94a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { ValueBadge } from './';
+import { ValueBadge } from '.';
 
 describe('ValueBadge', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
index 605c5ee9d7e80..6fb6dee86aea5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
@@ -18,7 +18,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { Boost, BoostOperation, BoostType, FunctionalBoostFunction } from './types';
 
-import { RelevanceTuningLogic } from './';
+import { RelevanceTuningLogic } from '.';
 
 describe('RelevanceTuningLogic', () => {
   const { mount } = new LogicMounter(RelevanceTuningLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx
index 8798c1a4bc529..99f43e70a6fdc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
index d6802c303807b..e78c1805c6ee7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
@@ -113,13 +113,6 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
-    it('setRoleMappings', () => {
-      RoleMappingsLogic.actions.setRoleMappings({ roleMappings: [asRoleMapping] });
-
-      expect(RoleMappingsLogic.values.roleMappings).toEqual([asRoleMapping]);
-      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
-    });
-
     describe('setElasticsearchUser', () => {
       it('sets user', () => {
         RoleMappingsLogic.actions.setElasticsearchUser(elasticsearchUsers[0]);
@@ -323,7 +316,10 @@ describe('RoleMappingsLogic', () => {
   describe('listeners', () => {
     describe('enableRoleBasedAccess', () => {
       it('calls API and sets values', async () => {
-        const setRoleMappingsSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappings');
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
         RoleMappingsLogic.actions.enableRoleBasedAccess();
 
@@ -333,7 +329,7 @@ describe('RoleMappingsLogic', () => {
           '/internal/app_search/role_mappings/enable_role_based_access'
         );
         await nextTick();
-        expect(setRoleMappingsSpy).toHaveBeenCalledWith(mappingsServerProps);
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
       itShowsServerErrorAsFlashMessage(http.post, () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
index 39e7df34f2aca..0579eef8ea5fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
@@ -47,9 +47,6 @@ const emptyUser = { username: '', email: '' } as ElasticsearchUser;
 interface RoleMappingsActions extends RoleMappingsBaseActions {
   setRoleMapping(roleMapping: ASRoleMapping): { roleMapping: ASRoleMapping };
   setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
-  setRoleMappings({ roleMappings }: { roleMappings: ASRoleMapping[] }): {
-    roleMappings: ASRoleMapping[];
-  };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
   handleAccessAllEnginesChange(selected: boolean): { selected: boolean };
   handleEngineSelectionChange(engineNames: string[]): { engineNames: string[] };
@@ -322,8 +319,8 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const route = '/internal/app_search/role_mappings/enable_role_based_access';
 
       try {
-        const response = await http.post<{ roleMappings: ASRoleMapping[] }>(route);
-        actions.setRoleMappings(response);
+        await http.post<{ roleMappings: ASRoleMapping[] }>(route);
+        actions.initializeRoleMappings();
       } catch (e) {
         flashAPIErrors(e);
       }
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx
index c3c1c07f27078..a445b3108c447 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx
@@ -17,7 +17,7 @@ import { docLinks } from '../../../../shared/doc_links';
 
 import { SchemaAddFieldModal } from '../../../../shared/schema';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx
index 5d2b5c8a8eacf..cc4d5cfcdb66b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx
@@ -13,7 +13,7 @@ import { mount } from 'enzyme';
 
 import { EuiTable, EuiTableHeaderCell, EuiTableRow } from '@elastic/eui';
 
-import { MetaEnginesConflictsTable } from './';
+import { MetaEnginesConflictsTable } from '.';
 
 describe('MetaEnginesConflictsTable', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx
index a37caafe69a59..d433015d8de2c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx
@@ -24,7 +24,7 @@ import { ENGINES_TITLE } from '../../engines';
 
 import { MetaEngineSchemaLogic } from '../schema_meta_engine_logic';
 
-import { TruncatedEnginesList } from './';
+import { TruncatedEnginesList } from '.';
 
 export const MetaEnginesConflictsTable: React.FC = () => {
   const { conflictingFields } = useValues(MetaEngineSchemaLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx
index e4235336b1d4b..c54a4a5ea32cb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx
@@ -13,7 +13,7 @@ import { mount } from 'enzyme';
 
 import { EuiTable, EuiTableHeaderCell, EuiTableRow, EuiTableRowCell } from '@elastic/eui';
 
-import { MetaEnginesSchemaTable } from './';
+import { MetaEnginesSchemaTable } from '.';
 
 describe('MetaEnginesSchemaTable', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx
index 2367ad4e0c53e..207674438e139 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx
@@ -25,7 +25,7 @@ import { ENGINES_TITLE } from '../../engines';
 
 import { MetaEngineSchemaLogic } from '../schema_meta_engine_logic';
 
-import { TruncatedEnginesList } from './';
+import { TruncatedEnginesList } from '.';
 
 export const MetaEnginesSchemaTable: React.FC = () => {
   const { schema, fields } = useValues(MetaEngineSchemaLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx
index 452cfe648e28f..09fd2a8b5cd11 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx
@@ -20,7 +20,7 @@ import {
   ConfirmSchemaButton,
 } from './schema_callouts';
 
-import { SchemaCallouts } from './';
+import { SchemaCallouts } from '.';
 
 describe('SchemaCallouts', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx
index bf9596b061acf..65debc9b790e8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx
@@ -15,7 +15,7 @@ import { EuiTable, EuiTableHeaderCell, EuiTableRow, EuiHealth } from '@elastic/e
 
 import { SchemaFieldTypeSelect } from '../../../../shared/schema';
 
-import { SchemaTable } from './';
+import { SchemaTable } from '.';
 
 describe('SchemaTable', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx
index 193d727be00b5..34e66e7c496fa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { TruncatedEnginesList } from './';
+import { TruncatedEnginesList } from '.';
 
 describe('TruncatedEnginesList', () => {
   it('renders a list of engines with links to their schema pages', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx
index 4dd7a869ca27e..4c97cbdf0ed48 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx
@@ -16,7 +16,7 @@ import { shallow } from 'enzyme';
 
 import { SchemaErrorsAccordion } from '../../../../shared/schema';
 
-import { ReindexJob } from './';
+import { ReindexJob } from '.';
 
 describe('ReindexJob', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx
index f1713c36045e9..42a09ddc5b345 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx
@@ -18,7 +18,7 @@ import { rerender } from '../../../test_helpers';
 import { ReindexJob } from './reindex_job';
 import { Schema, MetaEngineSchema } from './views';
 
-import { SchemaRouter } from './';
+import { SchemaRouter } from '.';
 
 describe('SchemaRouter', () => {
   const wrapper = shallow(<SchemaRouter />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx
index 60a0513b774fd..c654ce8d9f601 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx
@@ -17,7 +17,7 @@ import { EuiCallOut } from '@elastic/eui';
 
 import { MetaEnginesSchemaTable, MetaEnginesConflictsTable } from '../components';
 
-import { MetaEngineSchema } from './';
+import { MetaEngineSchema } from '.';
 
 describe('MetaEngineSchema', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx
index 02d3fd19afffe..7ec8d4731e550 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx
@@ -20,7 +20,7 @@ import { getPageHeaderActions, getPageTitle, getPageDescription } from '../../..
 
 import { SchemaCallouts, SchemaTable } from '../components';
 
-import { Schema } from './';
+import { Schema } from '.';
 
 describe('Schema', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx
index f9f0dd611b953..0fb691827c4bc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx
@@ -17,7 +17,7 @@ import { shallow } from 'enzyme';
 import { SearchUIForm } from './components/search_ui_form';
 import { SearchUIGraphic } from './components/search_ui_graphic';
 
-import { SearchUI } from './';
+import { SearchUI } from '.';
 
 describe('SearchUI', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts
index 58f6f3d98eb28..7e1bbf6cdb84e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts
@@ -18,7 +18,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { ActiveField } from './types';
 
-import { SearchUILogic } from './';
+import { SearchUILogic } from '.';
 
 describe('SearchUILogic', () => {
   const { mount } = new LogicMounter(SearchUILogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
index ddbf046d75ec1..647f4589295d6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
@@ -11,7 +11,7 @@ import { AppSearchPageTemplate } from '../layout';
 
 import { LogRetentionPanel, LogRetentionConfirmationModal } from './log_retention';
 
-import { SETTINGS_TITLE } from './';
+import { SETTINGS_TITLE } from '.';
 
 export const Settings: React.FC = () => {
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx
index 0b4a86870a69d..9a059e1d2015c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx
@@ -12,7 +12,7 @@ import { shallow } from 'enzyme';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SetupGuideLayout } from '../../../shared/setup_guide';
 
-import { SetupGuide } from './';
+import { SetupGuide } from '.';
 
 describe('SetupGuide', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx
index cdfdbadf6759c..cb059a5b86e7d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState, SynonymModal } from './';
+import { EmptyState, SynonymModal } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx
index ac8383ccea9ee..ef5e1dafa443f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 
 import { SYNONYMS_DOCS_URL } from '../../../routes';
 
-import { SynonymModal, SynonymIcon } from './';
+import { SynonymModal, SynonymIcon } from '.';
 
 export const EmptyState: React.FC = () => {
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx
index 7a1ba289865ee..a617c9286cc2a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCard, EuiButton } from '@elastic/eui';
 
-import { SynonymCard, SynonymIcon } from './';
+import { SynonymCard, SynonymIcon } from '.';
 
 describe('SynonymCard', () => {
   const MOCK_SYNONYM_SET = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx
index 9670abc4a09e5..28f6a251240cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx
@@ -11,12 +11,12 @@ import { useActions } from 'kea';
 
 import { EuiCard, EuiFlexGroup, EuiFlexItem, EuiText, EuiButton } from '@elastic/eui';
 
+import { SynonymsLogic } from '..';
 import { MANAGE_BUTTON_LABEL } from '../../../../shared/constants';
 
-import { SynonymsLogic } from '../index';
 import { SynonymSet } from '../types';
 
-import { SynonymIcon } from './';
+import { SynonymIcon } from '.';
 
 export const SynonymCard: React.FC<SynonymSet> = (synonymSet) => {
   const { openModal } = useActions(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx
index 8120532fbd6f6..9418c3f396c5e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SynonymIcon } from './';
+import { SynonymIcon } from '.';
 
 describe('SynonymIcon', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx
index 15b74d1cdbca9..ec0dde74ecf32 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx
@@ -15,7 +15,7 @@ import { EuiModal } from '@elastic/eui';
 
 import { MultiInputRows } from '../../multi_input_rows';
 
-import { SynonymModal } from './';
+import { SynonymModal } from '.';
 
 describe('SynonymModal', () => {
   const MOCK_SYNONYM_SET = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx
index 3db4f4b732675..5df254768faac 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx
@@ -22,6 +22,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { SynonymsLogic } from '..';
 import {
   CANCEL_BUTTON_LABEL,
   DELETE_BUTTON_LABEL,
@@ -31,7 +32,6 @@ import { FlashMessages } from '../../../../shared/flash_messages';
 import { MultiInputRows } from '../../multi_input_rows';
 
 import { SYNONYM_CREATE_TITLE, SYNONYM_UPDATE_TITLE, DELETE_CONFIRMATION } from '../constants';
-import { SynonymsLogic } from '../index';
 
 export const SynonymModal: React.FC = () => {
   const { isModalOpen, modalLoading, activeSynonymSet } = useValues(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx
index 64ac3066b51a5..11a04825e2f20 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx
@@ -19,7 +19,7 @@ import { rerender, getPageHeaderActions } from '../../../test_helpers';
 
 import { SynonymCard, SynonymModal } from './components';
 
-import { Synonyms } from './';
+import { Synonyms } from '.';
 
 describe('Synonyms', () => {
   const MOCK_SYNONYM_SET = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx
index 4a68bc381f764..14108f11487b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx
@@ -18,7 +18,7 @@ import { AppSearchPageTemplate } from '../layout';
 import { SynonymCard, SynonymModal, EmptyState } from './components';
 import { SYNONYMS_TITLE } from './constants';
 
-import { SynonymsLogic } from './';
+import { SynonymsLogic } from '.';
 
 export const Synonyms: React.FC = () => {
   const { loadSynonyms, onPaginate, openModal } = useActions(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts
index b00619359f6c8..92f07030e76b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts
@@ -18,7 +18,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { SYNONYMS_PAGE_META } from './constants';
 
-import { SynonymsLogic } from './';
+import { SynonymsLogic } from '.';
 
 describe('SynonymsLogic', () => {
   const { mount } = new LogicMounter(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 9e45f833162c9..19cfa874fc76c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -33,7 +33,7 @@ import { RoleMappings } from './components/role_mappings';
 import { Settings } from './components/settings';
 import { SetupGuide } from './components/setup_guide';
 
-import { AppSearch, AppSearchUnconfigured, AppSearchConfigured } from './';
+import { AppSearch, AppSearchUnconfigured, AppSearchConfigured } from '.';
 
 describe('AppSearch', () => {
   it('always renders the Setup Guide', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts
index f7464d1861265..74a2b78410db0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts
@@ -7,7 +7,7 @@
 
 import { mockUseParams } from '../../../__mocks__/react_router';
 
-import { encodePathParams, generateEncodedPath, useDecodedParams } from './';
+import { encodePathParams, generateEncodedPath, useDecodedParams } from '.';
 
 describe('encodePathParams', () => {
   it('encodeURIComponent()s all object values', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx
index 47d1fe6b69d56..d29c58bca81e2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { mountWithIntl } from '../../../test_helpers';
 
-import { FormattedDateTime } from './';
+import { FormattedDateTime } from '.';
 
 describe('FormattedDateTime', () => {
   it('renders a standard i18n-friendly combined date & time stamp', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts
index 2eb7f5cb3cdfb..ccf1bf0bd9272 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts
@@ -11,7 +11,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { recursivelyFetchEngines } from './';
+import { recursivelyFetchEngines } from '.';
 
 describe('recursivelyFetchEngines', () => {
   const { http } = mockHttpValues;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
index b9db9e11d2a8d..af0a31945d61f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
@@ -7,7 +7,7 @@
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../../../common/__mocks__';
 
-import { getRoleAbilities } from './';
+import { getRoleAbilities } from '.';
 
 describe('getRoleAbilities', () => {
   const mockRole = DEFAULT_INITIAL_APP_DATA.appSearch.role as any;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts
index ecbf885ac3b5c..f63b80e4ce894 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { roleHasScopedEngines } from './';
+import { roleHasScopedEngines } from '.';
 
 describe('roleHasScopedEngines', () => {
   it('returns false for owner and admin roles', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx
index e1c9ea53c0c0b..b307835534dd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorConnecting } from './';
+import { ErrorConnecting } from '.';
 
 describe('ErrorConnecting', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx
index 5787af231e2ec..3922084352e15 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SetEnterpriseSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx
index b0d40cf1ccca4..a7757c6410c82 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx
@@ -12,7 +12,7 @@ jest.mock('../search_index/index_nav', () => ({
   useSearchIndicesNav: () => [],
 }));
 
-import { useEnterpriseSearchContentNav } from './';
+import { useEnterpriseSearchContentNav } from '.';
 
 describe('useEnterpriseSearchContentNav', () => {
   it('returns an array of top-level Enterprise Search nav items', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx
index c9fcf95474544..8f01c875a625f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx
@@ -13,7 +13,7 @@ import { NotFoundPrompt } from '../../../shared/not_found';
 import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry';
 import { EnterpriseSearchContentPageTemplate } from '../layout';
 
-import { NotFound } from './';
+import { NotFound } from '.';
 
 describe('NotFound', () => {
   const wrapper = shallow(<NotFound />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx
index daa79a5c75299..306389ad0018d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx
@@ -12,7 +12,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { SearchIndexRouter } from './';
+import { SearchIndexRouter } from '.';
 
 describe('SearchIndexRouter', () => {
   it('renders Search index routes', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx
index bb6297c55f145..51f2e8c5dc719 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx
@@ -12,7 +12,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { SearchIndicesRouter } from './';
+import { SearchIndicesRouter } from '.';
 
 describe('SearchIndicesRouter', () => {
   it('renders Search index routes', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx
index 0672d4c7eca30..4d96af036d52f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx
@@ -28,7 +28,7 @@ import {
   EnterpriseSearchContent,
   EnterpriseSearchContentUnconfigured,
   EnterpriseSearchContentConfigured,
-} from './';
+} from '.';
 
 describe('EnterpriseSearchContent', () => {
   it('always renders the Setup Guide', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_card/elasticsearch_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_card/elasticsearch_card.tsx
index 0283249ac2890..fd84267ebb8e4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_card/elasticsearch_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_card/elasticsearch_card.tsx
@@ -11,9 +11,9 @@ import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle, EuiSpacer } fro
 
 import { i18n } from '@kbn/i18n';
 
+import { ElasticsearchResources } from '../../../shared/elasticsearch_resources';
 import { EuiButtonTo } from '../../../shared/react_router_helpers';
 import { ELASTICSEARCH_GUIDE_PATH } from '../../routes';
-import { ElasticsearchResources } from '../elasticsearch_resources';
 
 export const ElasticsearchCard: React.FC = () => {
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx
index 8f30abf2daaa0..a6070724bb878 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx
@@ -13,7 +13,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiButtonIcon, EuiCopy, EuiFieldText } from '@elastic/eui';
 
-import { ElasticsearchCloudId } from './';
+import { ElasticsearchCloudId } from '.';
 
 const execCommandMock = (global.document.execCommand = jest.fn());
 const warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx
index 7dce063701072..07849ce476268 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx
@@ -13,7 +13,7 @@ import { EuiSteps, EuiSelect } from '@elastic/eui';
 
 import { ElasticsearchClientInstructions } from '../elasticsearch_client_instructions';
 
-import { ElasticsearchGuide } from './';
+import { ElasticsearchGuide } from '.';
 
 describe('Elasticsearch Guide Component', () => {
   let wrapper: ShallowWrapper;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.tsx
index fb1bc7a2820e2..d722cfd637cce 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.tsx
@@ -24,10 +24,10 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { docLinks } from '../../../shared/doc_links';
+import { ElasticsearchResources } from '../../../shared/elasticsearch_resources';
 
 import { ElasticsearchClientInstructions } from '../elasticsearch_client_instructions';
 import { ElasticsearchCloudId } from '../elasticsearch_cloud_id';
-import { ElasticsearchResources } from '../elasticsearch_resources';
 
 // Replace FormattedMessage with i18n strings
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
index e1c9ea53c0c0b..b307835534dd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorConnecting } from './';
+import { ErrorConnecting } from '.';
 
 describe('ErrorConnecting', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
index 979847b4cf1c6..b0299930d514d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SendEnterpriseSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/index.ts
index 09a1e910fbbda..ea69823f82b87 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/index.ts
@@ -7,3 +7,4 @@
 
 export { useEnterpriseSearchOverviewNav } from './nav';
 export { EnterpriseSearchOverviewPageTemplate } from './page_template';
+export { EnterpriseSearchOverviewHeaderActions } from './kibana_header_actions';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/kibana_header_actions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/kibana_header_actions.test.tsx
new file mode 100644
index 0000000000000..88f5da60e3627
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/kibana_header_actions.test.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { mount } from 'enzyme';
+
+import { EuiPopover, EuiButtonEmpty } from '@elastic/eui';
+
+import { EnterpriseSearchOverviewHeaderActions } from './kibana_header_actions';
+
+describe('Enterprise Search overview HeaderActions', () => {
+  it('renders', () => {
+    const wrapper = mount(<EnterpriseSearchOverviewHeaderActions />);
+    const popover = wrapper.find(EuiPopover);
+
+    expect(popover.find(EuiButtonEmpty).text()).toContain('Deployment details');
+    expect(popover.prop('isOpen')).toBeFalsy();
+  });
+
+  it('opens popover when clicked', () => {
+    const wrapper = mount(<EnterpriseSearchOverviewHeaderActions />);
+
+    expect(wrapper.find(EuiPopover).prop('isOpen')).toBeFalsy();
+    wrapper.find(EuiPopover).find(EuiButtonEmpty).simulate('click');
+    wrapper.update();
+
+    expect(wrapper.find(EuiPopover).prop('isOpen')).toBeTruthy();
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/kibana_header_actions.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/kibana_header_actions.tsx
new file mode 100644
index 0000000000000..0383618ecf87b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/kibana_header_actions.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+
+import {
+  EuiHeaderLinks,
+  EuiIcon,
+  EuiCopy,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiPopover,
+  EuiFormRow,
+  EuiFieldText,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiPopoverTitle,
+  EuiPopoverFooter,
+  EuiText,
+} from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+export const EnterpriseSearchOverviewHeaderActions: React.FC = () => {
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+  // TODO change it with actual value
+  // TODO make this conditional only for users on cloud, as on-prem users will not have a deployment id to show.
+  const clientId = 'fgdshjafghj13eshfdjag718yfhjdskf';
+
+  return (
+    <EuiHeaderLinks>
+      <EuiPopover
+        button={
+          <EuiButtonEmpty onClick={() => setIsPopoverOpen(!isPopoverOpen)}>
+            <EuiIcon type="iInCircle" />
+            &nbsp;
+            {i18n.translate('xpack.enterpriseSearch.overview.deploymentDetails', {
+              defaultMessage: 'Deployment details',
+            })}
+          </EuiButtonEmpty>
+        }
+        isOpen={isPopoverOpen}
+        closePopover={() => setIsPopoverOpen(false)}
+      >
+        <EuiPopoverTitle>
+          {i18n.translate('xpack.enterpriseSearch.overview.deploymentDetails', {
+            defaultMessage: 'Deployment details',
+          })}
+        </EuiPopoverTitle>
+        <EuiText grow={false}>
+          <p>
+            {i18n.translate('xpack.enterpriseSearch.overview.deploymentDetails.description', {
+              defaultMessage:
+                'Send data to Elastic from your applications by referencing your deployment and Elasticsearch information.',
+            })}
+          </p>
+        </EuiText>
+        <EuiSpacer />
+        <EuiFormRow
+          fullWidth
+          label={i18n.translate('xpack.enterpriseSearch.overview.deploymentDetails.clientIdLabel', {
+            defaultMessage: 'Client ID',
+          })}
+        >
+          <EuiFlexGroup alignItems="center">
+            <EuiFlexItem grow>
+              <EuiFieldText readOnly value={clientId} fullWidth />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiCopy
+                beforeMessage={i18n.translate(
+                  'xpack.enterpriseSearch.overview.deploymentDetails.copyToClipboard',
+                  { defaultMessage: 'Copy to clipboard' }
+                )}
+                afterMessage={i18n.translate(
+                  'xpack.enterpriseSearch.overview.deploymentDetails.copiedToClipboard',
+                  { defaultMessage: 'Copied Client ID to clipboard' }
+                )}
+                textToCopy={clientId}
+              >
+                {(copy) => (
+                  <EuiButtonIcon
+                    aria-label={i18n.translate(
+                      'xpack.enterpriseSearch.overview.deploymentDetails.copyButtonAriaLabel',
+                      { defaultMessage: 'Copy to clipboard' }
+                    )}
+                    onClick={copy}
+                    iconType="copyClipboard"
+                    color="primary"
+                    display="base"
+                    size="s"
+                  />
+                )}
+              </EuiCopy>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFormRow>
+        <EuiPopoverFooter>
+          {/* TODO need link to Create and manage API keys*/}
+          <EuiButton>
+            {i18n.translate('xpack.enterpriseSearch.overview.createAndManageButton', {
+              defaultMessage: 'Create and manage API keys',
+            })}
+          </EuiButton>
+        </EuiPopoverFooter>
+      </EuiPopover>
+    </EuiHeaderLinks>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx
index 2551628ddcfe3..411bda5dfe2be 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx
@@ -9,7 +9,7 @@ jest.mock('../../../shared/layout', () => ({
   generateNavLink: jest.fn(({ to, items }) => ({ href: to, items })),
 }));
 
-import { useEnterpriseSearchOverviewNav } from './';
+import { useEnterpriseSearchOverviewNav } from '.';
 
 describe('useEnterpriseSearchOverviewNav', () => {
   it('returns an array of top-level Enterprise Search nav items', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
index 75a9700691ebb..746a681452973 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
@@ -15,7 +15,7 @@ import { EuiPanel, EuiText } from '@elastic/eui';
 
 import { ManageLicenseButton } from '../../../shared/licensing';
 
-import { LicenseCallout } from './';
+import { LicenseCallout } from '.';
 
 describe('LicenseCallout', () => {
   it('renders when non-platinum or on trial', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/index.ts
new file mode 100644
index 0000000000000..83d1f526c36cb
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { OverviewContent } from './overview_content';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/overview_content.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/overview_content.test.tsx
new file mode 100644
index 0000000000000..53c31eaf0498a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/overview_content.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setMockValues } from '../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiEmptyPrompt } from '@elastic/eui';
+
+import { AddContentEmptyPrompt } from '../../../shared/add_content_empty_prompt';
+import { GettingStartedSteps } from '../../../shared/getting_started_steps';
+
+import { LicenseCallout } from '../license_callout';
+import { SetupGuideCta } from '../setup_guide';
+import { TrialCallout } from '../trial_callout';
+
+import { OverviewContent } from '.';
+
+describe('OverviewContent', () => {
+  const props = {
+    access: {},
+    isWorkplaceSearchAdmin: true,
+  };
+
+  it('renders the overview page, Getting Started steps & setup guide CTAs with no host set', () => {
+    setMockValues({ config: { host: '' } });
+    const wrapper = shallow(<OverviewContent {...props} />);
+
+    expect(wrapper.find(GettingStartedSteps)).toHaveLength(1);
+    expect(wrapper.find(AddContentEmptyPrompt)).toHaveLength(1);
+    expect(wrapper.find(SetupGuideCta)).toHaveLength(1);
+    expect(wrapper.find(LicenseCallout)).toHaveLength(0);
+  });
+
+  it('renders the trial callout', () => {
+    setMockValues({ config: { host: 'localhost' } });
+    const wrapper = shallow(<OverviewContent {...props} />);
+
+    expect(wrapper.find(TrialCallout)).toHaveLength(1);
+  });
+
+  // TODO Refactor this and other tests according to the search indices permissions
+  describe('access checks when host is set', () => {
+    beforeEach(() => {
+      setMockValues({ config: { host: 'localhost' } });
+    });
+
+    it('renders the license callout when user has access to a product', () => {
+      setMockValues({ config: { host: 'localhost' } });
+      const wrapper = shallow(
+        <OverviewContent {...props} access={{ hasWorkplaceSearchAccess: true }} />
+      );
+
+      expect(wrapper.find(LicenseCallout)).toHaveLength(1);
+    });
+
+    it('renders empty prompt and overview or license callout if the user does not have access', () => {
+      const wrapper = shallow(<OverviewContent {...props} />);
+
+      expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+      expect(wrapper.find(GettingStartedSteps)).toHaveLength(0);
+      expect(wrapper.find(AddContentEmptyPrompt)).toHaveLength(0);
+      expect(wrapper.find(LicenseCallout)).toHaveLength(0);
+      expect(wrapper.find(SetupGuideCta)).toHaveLength(0);
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/overview_content.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/overview_content.tsx
new file mode 100644
index 0000000000000..3824a09a0bc1c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/overview_content/overview_content.tsx
@@ -0,0 +1,159 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { useValues } from 'kea';
+
+import {
+  EuiButton,
+  EuiEmptyPrompt,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiImage,
+  EuiLink,
+  EuiPageBody,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+import { Chat } from '@kbn/cloud-plugin/public';
+import { i18n } from '@kbn/i18n';
+
+import { AddContentEmptyPrompt } from '../../../shared/add_content_empty_prompt';
+import { docLinks } from '../../../shared/doc_links';
+import { ElasticsearchResources } from '../../../shared/elasticsearch_resources';
+import { GettingStartedSteps } from '../../../shared/getting_started_steps';
+import { KibanaLogic } from '../../../shared/kibana';
+import { SetEnterpriseSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
+import { SendEnterpriseSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
+
+import { EnterpriseSearchOverviewPageTemplate } from '../layout';
+import { LicenseCallout } from '../license_callout';
+import illustration from '../product_selector/lock_light.svg';
+import { SetupGuideCta } from '../setup_guide';
+
+import { TrialCallout } from '../trial_callout';
+
+interface OverviewContentProps {
+  access: {
+    hasAppSearchAccess?: boolean;
+    hasWorkplaceSearchAccess?: boolean;
+  };
+  isWorkplaceSearchAdmin: boolean;
+}
+
+export const OverviewContent: React.FC<OverviewContentProps> = ({ access }) => {
+  const { hasAppSearchAccess, hasWorkplaceSearchAccess } = access;
+  const { config } = useValues(KibanaLogic);
+
+  // TODO Refactor this and the tests according to the search indices permissions
+  // If Enterprise Search has been set up and the user does not have access to either product, show a message saying they
+  // need to contact an administrator to get access to one of the products.
+  const shouldShowEnterpriseSearchOverview =
+    !config.host || hasAppSearchAccess || hasWorkplaceSearchAccess;
+
+  const enterpriseSearchOverview = (
+    <>
+      <AddContentEmptyPrompt />
+      <EuiSpacer size="xxl" />
+      <EuiFlexGroup>
+        <EuiFlexItem>
+          <GettingStartedSteps />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <ElasticsearchResources />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="xxl" />
+
+      {config.host ? <LicenseCallout /> : <SetupGuideCta />}
+    </>
+  );
+
+  const insufficientAccessMessage = (
+    <EuiEmptyPrompt
+      icon={
+        <EuiImage
+          size="fullWidth"
+          src={illustration}
+          alt={i18n.translate(
+            'xpack.enterpriseSearch.overviewContent.insufficientPermissionsIllustration',
+            { defaultMessage: 'Insufficient permissions illustration' }
+          )}
+        />
+      }
+      title={
+        <h2>
+          {i18n.translate('xpack.enterpriseSearch.overviewContent.insufficientPermissionsTitle', {
+            defaultMessage: 'Insufficient permissions',
+          })}
+        </h2>
+      }
+      layout="horizontal"
+      color="plain"
+      body={
+        <>
+          <p>
+            {i18n.translate('xpack.enterpriseSearch.overviewContent.insufficientPermissionsBody', {
+              defaultMessage:
+                'You don’t have access to view this page. If you feel this may be an error, please contact your administrator.',
+            })}
+          </p>
+        </>
+      }
+      actions={
+        <EuiButton color="primary" fill href="/">
+          {i18n.translate(
+            'xpack.enterpriseSearch.overviewContent.insufficientPermissionsButtonLabel',
+            {
+              defaultMessage: 'Go to the Kibana dashboard',
+            }
+          )}
+        </EuiButton>
+      }
+      footer={
+        <>
+          <EuiTitle size="xxs">
+            <span>
+              {i18n.translate(
+                'xpack.enterpriseSearch.overviewContent.insufficientPermissionsFooterBody',
+                {
+                  defaultMessage: 'Go to the Kibana dashboard',
+                }
+              )}
+            </span>
+          </EuiTitle>{' '}
+          <EuiLink href={docLinks.kibanaSecurity} target="_blank">
+            {i18n.translate(
+              'xpack.enterpriseSearch.overviewContent.insufficientPermissionsFooterLinkLabel',
+              {
+                defaultMessage: 'Read documentation',
+              }
+            )}
+          </EuiLink>
+        </>
+      }
+    />
+  );
+  return (
+    <EnterpriseSearchOverviewPageTemplate
+      pageHeader={{
+        pageTitle: i18n.translate('xpack.enterpriseSearch.overviewContent.heading', {
+          defaultMessage: 'Welcome to Enterprise Search',
+        }),
+      }}
+    >
+      <SetPageChrome />
+      <SendTelemetry action="viewed" metric="overview" />
+      <TrialCallout />
+      <EuiPageBody paddingSize="none">
+        {shouldShowEnterpriseSearchOverview ? enterpriseSearchOverview : insufficientAccessMessage}
+        <Chat />
+      </EuiPageBody>
+    </EnterpriseSearchOverviewPageTemplate>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
index d15cb817f9064..e19f731611d01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
@@ -16,7 +16,7 @@ import { EuiCard } from '@elastic/eui';
 import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { EuiButtonTo } from '../../../shared/react_router_helpers';
 
-import { ProductCard } from './';
+import { ProductCard } from '.';
 
 describe('ProductCard', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
index 0af49e71880ab..0a6b331b36540 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
@@ -21,7 +21,7 @@ import { ProductCard } from '../product_card';
 import { SetupGuideCta } from '../setup_guide';
 import { TrialCallout } from '../trial_callout';
 
-import { ProductSelector } from './';
+import { ProductSelector } from '.';
 
 const props = {
   access: {},
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
index 4ed45acdfbbae..d525e6ec4eb52 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
@@ -20,14 +20,15 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import { Chat } from '@kbn/cloud-plugin/public';
 import { i18n } from '@kbn/i18n';
 
 import {
   KibanaPageTemplate,
   KibanaPageTemplateSolutionNavAvatar,
   NO_DATA_PAGE_TEMPLATE_PROPS,
-} from '../../../../../../../../src/plugins/kibana_react/public';
-import { Chat } from '../../../../../../cloud/public';
+} from '@kbn/kibana-react-plugin/public';
+
 import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { docLinks } from '../../../shared/doc_links';
 import { KibanaLogic } from '../../../shared/kibana';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
index 44f06de7ff137..be42627debc73 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
@@ -12,7 +12,7 @@ import { shallow } from 'enzyme';
 import { SetEnterpriseSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SetupGuideLayout } from '../../../shared/setup_guide';
 
-import { SetupGuide } from './';
+import { SetupGuide } from '.';
 
 describe('SetupGuide', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
index dd18d0d59c056..2516382914d6e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SetupGuideCta } from './';
+import { SetupGuideCta } from '.';
 
 describe('SetupGuideCta', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
index 72958acacb034..add9ea062a179 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { TrialCallout } from './';
+import { TrialCallout } from '.';
 
 describe('TrialCallout', () => {
   it('renders when non-platinum or on trial', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
index e5d883ee819f7..50bec925e1ce8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
@@ -18,7 +18,7 @@ import { ErrorConnecting } from './components/error_connecting';
 import { ProductSelector } from './components/product_selector';
 import { SetupGuide } from './components/setup_guide';
 
-import { EnterpriseSearchOverview } from './';
+import { EnterpriseSearchOverview } from '.';
 
 describe('EnterpriseSearchOverview', () => {
   it('renders the Setup Guide and Product Selector', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index cb47dfe124780..c8722adfebbd2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -9,17 +9,17 @@ import React from 'react';
 
 import { getContext } from 'kea';
 
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { licensingMock } from '../../../licensing/public/mocks';
-import { securityMock } from '../../../security/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 
 import { AppSearch } from './app_search';
 import { EnterpriseSearchOverview } from './enterprise_search_overview';
 import { KibanaLogic } from './shared/kibana';
 import { WorkplaceSearch } from './workplace_search';
 
-import { renderApp, renderHeaderActions } from './';
+import { renderApp, renderHeaderActions } from '.';
 
 describe('renderApp', () => {
   const kibanaDeps = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index 62c9835b5aec6..45179f6b55deb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -13,13 +13,11 @@ import { Router } from 'react-router-dom';
 import { getContext, resetContext } from 'kea';
 import { Store } from 'redux';
 
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { AppMountParameters, CoreStart } from '../../../../../src/core/public';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+
 import { InitialAppData } from '../../common/types';
 import { PluginsStart, ClientConfigType, ClientData } from '../plugin';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.scss b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.scss
new file mode 100644
index 0000000000000..c0fafb151174d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.scss
@@ -0,0 +1,7 @@
+.addContentEmptyPrompt {
+  @include euiBreakpoint('xs','s') {
+    flex-direction: column-reverse;
+  }
+
+  border-bottom: $euiBorderThin;
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.test.tsx
new file mode 100644
index 0000000000000..b9e23f00f06b5
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.test.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { shallow, ShallowWrapper } from 'enzyme';
+
+import { EuiLinkTo } from '../react_router_helpers';
+
+import { AddContentEmptyPrompt } from '.';
+
+describe('AddContentEmptyPrompt', () => {
+  let wrapper: ShallowWrapper;
+
+  beforeAll(() => {
+    wrapper = shallow(<AddContentEmptyPrompt />);
+  });
+
+  it('renders', () => {
+    expect(wrapper.find('h2').text()).toEqual('Add content to Enterprise Search');
+    expect(wrapper.find(EuiLinkTo).prop('to')).toEqual(
+      '/app/enterprise_search/content/search_indices'
+    );
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.tsx
new file mode 100644
index 0000000000000..0679739a7683c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/add_content_empty_prompt.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { generatePath } from 'react-router-dom';
+
+import {
+  EuiImage,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton,
+  EuiLink,
+  EuiPanel,
+  EuiTitle,
+  EuiText,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { ENTERPRISE_SEARCH_CONTENT_PLUGIN } from '../../../../common/constants';
+import { SEARCH_INDICES_PATH } from '../../enterprise_search_content/routes';
+import { EuiLinkTo } from '../react_router_helpers';
+
+import searchIndicesIllustration from './search_indices.svg';
+import './add_content_empty_prompt.scss';
+
+export const AddContentEmptyPrompt: React.FC = () => {
+  return (
+    <EuiPanel color="transparent" paddingSize="l">
+      <EuiFlexGroup className="addContentEmptyPrompt" justifyContent="spaceBetween" direction="row">
+        <EuiFlexItem grow>
+          <EuiFlexGroup direction="column" responsive={false}>
+            <EuiFlexItem grow>
+              <EuiTitle>
+                <h2>
+                  {i18n.translate('xpack.enterpriseSearch.overview.emptyState.heading', {
+                    defaultMessage: 'Add content to Enterprise Search',
+                  })}
+                </h2>
+              </EuiTitle>
+              <EuiSpacer size="l" />
+              <EuiText grow={false}>
+                <p>
+                  {i18n.translate('xpack.enterpriseSearch.emptyState.description', {
+                    defaultMessage:
+                      "Data you add in Enterprise Search is called a Search index and it's searchable in both App and Workplace Search. Now you can use your connectors in App Search and your web crawlers in Workplace Search.",
+                  })}
+                </p>
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiFlexGroup alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiLinkTo
+                    to={generatePath(ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL + SEARCH_INDICES_PATH)}
+                    shouldNotCreateHref
+                  >
+                    <EuiButton color="primary" fill>
+                      {i18n.translate('xpack.enterpriseSearch.overview.emptyState.buttonTitle', {
+                        defaultMessage: 'Add content to Enterprise Search',
+                      })}
+                    </EuiButton>
+                  </EuiLinkTo>
+                </EuiFlexItem>
+                <EuiFlexItem>
+                  {/* TODO need link for Learn More link*/}
+                  <EuiLink href="#" target="_blank">
+                    {i18n.translate('xpack.enterpriseSearch.overview.emptyState.footerLinkTitle', {
+                      defaultMessage: 'Learn more',
+                    })}
+                  </EuiLink>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiImage
+            size="l"
+            float="right"
+            src={searchIndicesIllustration}
+            alt={i18n.translate('xpack.enterpriseSearch.overview.searchIndices.image.altText', {
+              defaultMessage: 'Search indices illustration',
+            })}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/index.ts
new file mode 100644
index 0000000000000..1ae85c30a2f5c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { AddContentEmptyPrompt } from './add_content_empty_prompt';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/search_indices.svg b/x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/search_indices.svg
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/search_indices.svg
rename to x-pack/plugins/enterprise_search/public/applications/shared/add_content_empty_prompt/search_indices.svg
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts
index b14af1c69795a..6b98606649331 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { docLinksServiceMock } from '../../../../../../../src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
-import { docLinks } from './';
+import { docLinks } from '.';
 
 describe('DocLinks', () => {
   it('setDocLinks', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
index 6030609e8a1a0..b507e5466f13f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 class DocLinks {
   public appSearchApis: string;
@@ -16,6 +16,7 @@ class DocLinks {
   public appSearchCurations: string;
   public appSearchDuplicateDocuments: string;
   public appSearchEntryPoints: string;
+  public appSearchElasticsearchIndexedEngines: string;
   public appSearchGuide: string;
   public appSearchIndexingDocs: string;
   public appSearchIndexingDocsSchema: string;
@@ -95,6 +96,7 @@ class DocLinks {
     this.appSearchCurations = '';
     this.appSearchDuplicateDocuments = '';
     this.appSearchEntryPoints = '';
+    this.appSearchElasticsearchIndexedEngines = '';
     this.appSearchGuide = '';
     this.appSearchIndexingDocs = '';
     this.appSearchIndexingDocsSchema = '';
@@ -174,6 +176,8 @@ class DocLinks {
     this.appSearchCrawlRules = docLinks.links.appSearch.crawlRules;
     this.appSearchCurations = docLinks.links.appSearch.curations;
     this.appSearchDuplicateDocuments = docLinks.links.appSearch.duplicateDocuments;
+    this.appSearchElasticsearchIndexedEngines =
+      docLinks.links.appSearch.elasticsearchIndexedEngines;
     this.appSearchEntryPoints = docLinks.links.appSearch.entryPoints;
     this.appSearchGuide = docLinks.links.appSearch.guide;
     this.appSearchIndexingDocs = docLinks.links.appSearch.indexingDocuments;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/elasticsearch_resources.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/elasticsearch_resources.test.tsx
new file mode 100644
index 0000000000000..3dd3b1c8ddfac
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/elasticsearch_resources.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+jest.mock('../doc_links', () => ({
+  docLinks: {
+    elasticsearchGettingStarted: 'elasticsearchGettingStarted-link',
+    elasticsearchCreateIndex: 'elasticsearchCreateIndex-link',
+    clientsGuide: 'elasticsearchClientsGuide-link',
+  },
+}));
+import React from 'react';
+
+import { shallow, ShallowWrapper } from 'enzyme';
+
+import { EuiLink } from '@elastic/eui';
+
+import { ElasticsearchResources } from '.';
+
+describe('ElasticsearchResources', () => {
+  let wrapper: ShallowWrapper;
+
+  beforeAll(() => {
+    wrapper = shallow(<ElasticsearchResources />);
+  });
+
+  it('renders', () => {
+    expect(wrapper.find('h4').text()).toEqual('Resources');
+
+    expect(wrapper.find(EuiLink).at(0).prop('href')).toEqual('elasticsearchGettingStarted-link');
+    expect(wrapper.find(EuiLink).at(0).text()).toEqual('Getting started with Elasticsearch');
+
+    expect(wrapper.find(EuiLink).at(1).prop('href')).toEqual('elasticsearchCreateIndex-link');
+    expect(wrapper.find(EuiLink).at(1).text()).toEqual('Create a new index');
+
+    expect(wrapper.find(EuiLink).at(2).prop('href')).toEqual('elasticsearchClientsGuide-link');
+    expect(wrapper.find(EuiLink).at(2).text()).toEqual('Setup a language client');
+
+    expect(wrapper.find(EuiLink).at(3).prop('href')).toEqual(
+      'https://github.com/elastic/search-ui/tree/master/packages/search-ui-elasticsearch-connector'
+    );
+    expect(wrapper.find(EuiLink).at(3).text()).toEqual('Search UI for Elasticsearch');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_resources/elasticsearch_resources.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/elasticsearch_resources.tsx
similarity index 92%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_resources/elasticsearch_resources.tsx
rename to x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/elasticsearch_resources.tsx
index b7d0390f40077..6a274e75179b1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_resources/elasticsearch_resources.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/elasticsearch_resources.tsx
@@ -10,10 +10,10 @@ import React from 'react';
 import { EuiSpacer, EuiPanel, EuiTitle, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { docLinks } from '../../../shared/doc_links';
+import { docLinks } from '../doc_links';
 
 export const ElasticsearchResources: React.FC = () => (
-  <EuiPanel hasShadow={false} color="subdued">
+  <EuiPanel hasShadow grow={false} color="subdued">
     <EuiTitle size="xs">
       <h4>
         {i18n.translate('xpack.enterpriseSearch.overview.elasticsearchResources.title', {
@@ -40,7 +40,7 @@ export const ElasticsearchResources: React.FC = () => (
     <EuiLink href={docLinks.clientsGuide} target="_blank">
       {i18n.translate(
         'xpack.enterpriseSearch.overview.elasticsearchResources.elasticsearchClients',
-        { defaultMessage: 'Elasticsearch clients' }
+        { defaultMessage: 'Setup a language client' }
       )}
     </EuiLink>
     <EuiSpacer size="s" />
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_resources/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_resources/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/shared/elasticsearch_resources/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts
index 784e09671013a..01d5eb741cb01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { externalUrl, getEnterpriseSearchUrl, getAppSearchUrl, getWorkplaceSearchUrl } from './';
+import { externalUrl, getEnterpriseSearchUrl, getAppSearchUrl, getWorkplaceSearchUrl } from '.';
 
 describe('Enterprise Search external URL helpers', () => {
   describe('getter/setter tests', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx
index 38b12d8070fa1..867702b8326ab 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 
 import { mountWithIntl } from '../../test_helpers';
 
-import { ErrorStatePrompt } from './';
+import { ErrorStatePrompt } from '.';
 
 describe('ErrorState', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
index d807f1d2322ff..4e2ee38b8a464 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
@@ -10,11 +10,10 @@ import React, { useEffect } from 'react';
 import { useValues } from 'kea';
 
 import { EuiEmptyPrompt, EuiCode, EuiLink, EuiCodeBlock } from '@elastic/eui';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { CloudSetup } from '../../../../../cloud/public';
-
 import { HttpLogic } from '../http';
 import { KibanaLogic } from '../kibana';
 import { EuiButtonTo, EuiLinkTo } from '../react_router_helpers';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
index 40863087004d6..20a20ddba6ab8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
+import { HttpResponse } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
-import { HttpResponse } from 'src/core/public';
-
 import { FlashMessagesLogic } from './flash_messages_logic';
 import { flashErrorToast } from './set_message_helpers';
 import { IFlashMessage } from './types';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/getting_started_steps.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/getting_started_steps.test.tsx
new file mode 100644
index 0000000000000..0595e39475b4b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/getting_started_steps.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+jest.mock('../doc_links', () => ({
+  docLinks: {
+    elasticsearchGettingStarted: 'elasticsearchGettingStarted-link',
+    elasticsearchCreateIndex: 'elasticsearchCreateIndex-link',
+    clientsGuide: 'elasticsearchClientsGuide-link',
+  },
+}));
+import React from 'react';
+
+import { shallow, ShallowWrapper } from 'enzyme';
+
+import { EuiSteps } from '@elastic/eui';
+
+import { EuiLinkTo } from '../react_router_helpers';
+
+import { IconRow } from './icon_row';
+
+import { GettingStartedSteps } from '.';
+
+describe('GettingStartedSteps', () => {
+  let wrapper: ShallowWrapper;
+
+  beforeAll(() => {
+    wrapper = shallow(<GettingStartedSteps />);
+  });
+
+  it('renders', () => {
+    const steps = wrapper
+      .find(EuiSteps)
+      .prop('steps')
+      .map(({ title, children, status, ...rest }) => ({
+        title,
+        status,
+        children: shallow(<div>{children}</div>),
+        ...rest,
+      }));
+
+    expect(steps[0].title).toEqual('Add your documents and data to Enterprise Search');
+    expect(steps[0].status).toEqual('current');
+    expect(steps[0].children.find(IconRow).length).toEqual(1);
+
+    expect(steps[1].title).toEqual('Build a search experience');
+    expect(steps[1].status).toEqual('incomplete');
+    expect(steps[1].children.find(EuiLinkTo).prop('to')).toEqual('/elasticsearch_guide');
+
+    expect(steps[2].title).toEqual('Tune your search relevance');
+    expect(steps[2].status).toEqual('incomplete');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/getting_started_steps.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/getting_started_steps.tsx
new file mode 100644
index 0000000000000..e9a3f477c7049
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/getting_started_steps.tsx
@@ -0,0 +1,181 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+
+import {
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiPopover,
+  EuiSpacer,
+  EuiSteps,
+  EuiText,
+  EuiContextMenuPanel,
+  EuiContextMenuItem,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { ELASTICSEARCH_GUIDE_PATH } from '../../enterprise_search_overview/routes';
+
+import { EuiLinkTo } from '../react_router_helpers';
+
+import { IconRow } from './icon_row';
+
+export const GettingStartedSteps: React.FC = () => {
+  // TODO replace with logic file
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem>
+        <EuiSteps
+          steps={[
+            {
+              title: i18n.translate(
+                'xpack.enterpriseSearch.overview.gettingStartedSteps.addData.title',
+                { defaultMessage: 'Add your documents and data to Enterprise Search' }
+              ),
+              children: (
+                <>
+                  <EuiText>
+                    <p>
+                      {i18n.translate(
+                        'xpack.enterpriseSearch.overview.gettingStartedSteps.addData.message',
+                        {
+                          defaultMessage:
+                            'Get started by adding your data to Enterprise Search. You can use the Elastic Web Crawler, API endpoints, existing Elasticsearch indices or third party connectors like Google Drive, Microsoft Sharepoint and more.',
+                        }
+                      )}
+                    </p>
+                  </EuiText>
+                  <EuiSpacer size="m" />
+                  <IconRow />
+                </>
+              ),
+              status: 'current',
+            },
+            {
+              title: i18n.translate(
+                'xpack.enterpriseSearch.overview.gettingStartedSteps.buildSearchExperience.title',
+                { defaultMessage: 'Build a search experience' }
+              ),
+              children: (
+                <>
+                  <EuiText>
+                    <p>
+                      {i18n.translate(
+                        'xpack.enterpriseSearch.overview.gettingStartedSteps.buildSearchExperience.message',
+                        {
+                          defaultMessage:
+                            'You can use Search Engines to build customized search experiences for your customers or internal teams with App Search or Workplace Search. Or you can use Search UI to connect directly to an Elasticsearch index to build client-side search experinces for your users.',
+                        }
+                      )}
+                    </p>
+                  </EuiText>
+                  <EuiSpacer size="m" />
+                  <EuiFlexGroup alignItems="center" gutterSize="s">
+                    <EuiFlexItem grow={false}>
+                      <EuiPopover
+                        button={
+                          <EuiButton
+                            iconType="arrowDown"
+                            iconSide="right"
+                            fill
+                            onClick={() => setIsPopoverOpen(!isPopoverOpen)}
+                          >
+                            {i18n.translate(
+                              'xpack.enterpriseSearch.overview.gettingStartedSteps.createASearchEngineButton',
+                              { defaultMessage: 'Create a search engine' }
+                            )}
+                          </EuiButton>
+                        }
+                        isOpen={isPopoverOpen}
+                        closePopover={() => setIsPopoverOpen(false)}
+                      >
+                        {/* TODO add onclick for these links*/}
+                        <EuiContextMenuPanel
+                          items={[
+                            <EuiContextMenuItem key="" onClick={() => {}}>
+                              <EuiText size="s">
+                                <h4>
+                                  {i18n.translate(
+                                    'xpack.enterpriseSearch.overview.gettingStartedSteps.createAppSearchEngine.title',
+                                    { defaultMessage: 'Create an App Search engine' }
+                                  )}
+                                </h4>
+                                {i18n.translate(
+                                  'xpack.enterpriseSearch.overview.gettingStartedSteps.createAppSearchEngine.description',
+                                  {
+                                    defaultMessage:
+                                      'All the power of Elasticsearch, without the learning curve.',
+                                  }
+                                )}
+                              </EuiText>
+                            </EuiContextMenuItem>,
+                            <EuiContextMenuItem key="" onClick={() => {}}>
+                              <EuiText size="s">
+                                <h4>
+                                  {i18n.translate(
+                                    'xpack.enterpriseSearch.overview.gettingStartedSteps.createWorkplaceSearchGroup.title',
+                                    { defaultMessage: 'Create a Workplace Search group' }
+                                  )}
+                                </h4>
+                                {i18n.translate(
+                                  'xpack.enterpriseSearch.overview.gettingStartedSteps.createWorkplaceSearchGroup.description',
+                                  {
+                                    defaultMessage: 'A secure search experience for internal teams',
+                                  }
+                                )}
+                              </EuiText>
+                            </EuiContextMenuItem>,
+                          ]}
+                        />
+                      </EuiPopover>
+                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}>
+                      <EuiLinkTo to={ELASTICSEARCH_GUIDE_PATH}>
+                        <EuiIcon type="iInCircle" />
+                        &nbsp;
+                        {i18n.translate(
+                          'xpack.enterpriseSearch.overview.gettingStartedSteps.searchWithElasticsearchLink',
+                          { defaultMessage: 'Search with the Elasticsearch API' }
+                        )}
+                      </EuiLinkTo>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                </>
+              ),
+              status: 'incomplete',
+            },
+            {
+              title: i18n.translate(
+                'xpack.enterpriseSearch.overview.gettingStartedSteps.tuneSearchExperience.title',
+                { defaultMessage: 'Tune your search relevance' }
+              ),
+              children: (
+                <EuiText>
+                  <p>
+                    {i18n.translate(
+                      'xpack.enterpriseSearch.overview.gettingStartedSteps.tuneSearchExperience.message',
+                      {
+                        defaultMessage:
+                          "Dive into analytics and tune the result settings to help your users find exactly what they're looking for",
+                      }
+                    )}
+                  </p>
+                </EuiText>
+              ),
+              status: 'incomplete',
+            },
+          ]}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/icon_row.scss b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/icon_row.scss
new file mode 100644
index 0000000000000..6992cdead2803
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/icon_row.scss
@@ -0,0 +1,13 @@
+.gettingStartedSteps {
+  .grayscaleSvg {
+    filter: grayscale(1);
+  }
+
+  .addManyMoreButton {
+    border: $euiBorderThin;
+  }
+
+  .iconTooltip {
+    border-bottom: $euiBorderThin;
+  }
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/icon_row.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/icon_row.tsx
new file mode 100644
index 0000000000000..8ae50183914d3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/icon_row.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiBadge, EuiToolTip, EuiText } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { images } from '../../workplace_search/components/shared/assets/source_icons';
+
+import './icon_row.scss';
+
+const icons = [
+  {
+    icon: 'logoElasticsearch',
+    title: 'Elasticsearch',
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.elasticsearch.tooltip', {
+      defaultMessage:
+        'Use App and Workplace Search Search Engines with existing Elasticsearch indices',
+    }),
+  },
+  {
+    icon: 'desktop',
+    title: i18n.translate('xpack.enterpriseSearch.overview.iconRow.api.title', {
+      defaultMessage: 'API',
+    }),
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.api.tooltip', {
+      defaultMessage: 'POST documents to an API endpoint from your own applications',
+    }),
+  },
+  {
+    icon: 'globe',
+    title: i18n.translate('xpack.enterpriseSearch.overview.iconRow.crawler.title', {
+      defaultMessage: 'Elastic Web Crawler',
+    }),
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.crawler.tooltip', {
+      defaultMessage: 'Automatically index content from your websites',
+    }),
+  },
+  {
+    icon: images.confluence,
+    title: i18n.translate('xpack.enterpriseSearch.overview.iconRow.confluence.title', {
+      defaultMessage: 'Confluence',
+    }),
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.confluence.tooltip', {
+      defaultMessage: 'Index content from Atlassian Confluence',
+    }),
+  },
+  {
+    icon: images.googleDrive,
+    title: i18n.translate('xpack.enterpriseSearch.overview.iconRow.googleDrive.title', {
+      defaultMessage: 'Google Drive',
+    }),
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.googleDrive.tooltip', {
+      defaultMessage: 'Index documents from Google Drive',
+    }),
+  },
+  {
+    icon: images.sharePoint,
+    title: i18n.translate('xpack.enterpriseSearch.overview.iconRow.sharePoint.title', {
+      defaultMessage: 'Microsoft SharePoint',
+    }),
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.sharePoint.tooltip', {
+      defaultMessage: 'Index content from Microsoft SharePoint',
+    }),
+  },
+  {
+    icon: images.github,
+    title: i18n.translate('xpack.enterpriseSearch.overview.iconRow.github.title', {
+      defaultMessage: 'GitHub',
+    }),
+    tooltip: i18n.translate('xpack.enterpriseSearch.overview.iconRow.github.tooltip', {
+      defaultMessage: 'Index issues, pull requests, and more from GitHub',
+    }),
+  },
+];
+
+export const IconRow: React.FC = () => {
+  return (
+    <EuiFlexGroup gutterSize="s" alignItems="center" className="gettingStartedSteps">
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
+          {icons.map((item, index) => {
+            return (
+              <EuiFlexItem grow={false} key={index}>
+                <EuiToolTip
+                  content={
+                    <EuiText>
+                      <h4 className="iconTooltip">{item.title}</h4>
+                      {item.tooltip}
+                    </EuiText>
+                  }
+                >
+                  <EuiIcon className="grayscaleSvg" type={item.icon} size="m" color="text" />
+                </EuiToolTip>
+              </EuiFlexItem>
+            );
+          })}
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiBadge color="hollow">
+          {i18n.translate('xpack.enterpriseSearch.overview.iconRow.manyMoreBadge', {
+            defaultMessage: 'And many more',
+          })}
+        </EuiBadge>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/index.ts
new file mode 100644
index 0000000000000..71ad56d84cb09
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started_steps/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { GettingStartedSteps } from './getting_started_steps';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
index 4151cd67882ff..1d4372ca5b734 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
@@ -7,7 +7,7 @@
 
 import { resetContext } from 'kea';
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import { HttpLogic, HttpValues, mountHttpLogic } from './http_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
index 9b9600e2ce8f4..f9b3a758885cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
@@ -7,7 +7,7 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { HttpSetup, HttpInterceptorResponseError, HttpResponse } from 'src/core/public';
+import { HttpSetup, HttpInterceptorResponseError, HttpResponse } from '@kbn/core/public';
 
 import { ERROR_CONNECTING_HEADER, READ_ONLY_MODE_HEADER } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
index 704542bca918f..873357e0528af 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
@@ -10,10 +10,10 @@ import { FC } from 'react';
 import { History } from 'history';
 import { kea, MakeLogicType } from 'kea';
 
-import { ApplicationStart, ChromeBreadcrumb } from '../../../../../../../src/core/public';
-import { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
-import { CloudSetup } from '../../../../../cloud/public';
-import { SecurityPluginStart } from '../../../../../security/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
+import { ApplicationStart, ChromeBreadcrumb } from '@kbn/core/public';
+import { SecurityPluginStart } from '@kbn/security-plugin/public';
 
 import { HttpLogic } from '../http';
 import { createHref, CreateHrefOptions } from '../react_router_helpers';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx
index d396aba895587..f4867468d5477 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx
@@ -32,7 +32,7 @@ jest.mock('./generate_title', () => ({
 }));
 import { enterpriseSearchTitle, appSearchTitle, workplaceSearchTitle } from './generate_title';
 
-import { SetEnterpriseSearchChrome, SetAppSearchChrome, SetWorkplaceSearchChrome } from './';
+import { SetEnterpriseSearchChrome, SetAppSearchChrome, SetWorkplaceSearchChrome } from '.';
 
 describe('Set Kibana Chrome helpers', () => {
   const mockCurrentPath = (pathname: string) =>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
index 22c976dfa7638..37082a23f4440 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
@@ -13,7 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { KibanaPageTemplate } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+
 import { FlashMessages } from '../flash_messages';
 import { Loading } from '../loading';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
index 934d571418d0e..0597ea1b0dbbe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
@@ -13,10 +13,7 @@ import { useValues } from 'kea';
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  KibanaPageTemplate,
-  KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate, KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 
 import { FlashMessages } from '../flash_messages';
 import { HttpLogic } from '../http';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
index 5d210cee1a926..85a26abeef1e1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
@@ -8,7 +8,7 @@
 import { resetContext } from 'kea';
 import { BehaviorSubject } from 'rxjs';
 
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 
 import { LicensingLogic, mountLicensingLogic } from './licensing_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
index f94a1fff0cd31..ca7bf87e130bf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
@@ -8,7 +8,7 @@
 import { kea, MakeLogicType } from 'kea';
 import { Observable, Subscription } from 'rxjs';
 
-import { ILicense } from '../../../../../licensing/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 
 interface LicensingValues {
   license: ILicense | null;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx
index 07c71def01bed..ec96ca66c706c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx
@@ -13,11 +13,11 @@ import { shallow } from 'enzyme';
 
 import { EuiButton } from '@elastic/eui';
 
-import { docLinks } from '../../shared/doc_links';
+import { docLinks } from '../doc_links';
 
 import { EuiButtonTo } from '../react_router_helpers';
 
-import { ManageLicenseButton } from './';
+import { ManageLicenseButton } from '.';
 
 describe('ManageLicenseButton', () => {
   describe('when the user can access license management', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
index eb3e5f027a2d4..21ebdc92c6af4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiLoadingLogo, EuiLoadingSpinner } from '@elastic/eui';
 
-import { Loading, LoadingOverlay } from './';
+import { Loading, LoadingOverlay } from '.';
 
 describe('Loading', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
index 683b378942558..11ae0dbeafa76 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EntSearchLogStream } from './';
+import { EntSearchLogStream } from '.';
 
 const fakeSourceId = 'fake-source-id';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
index e7e796797cbac..bd06139cd18a1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { LogStream, LogStreamProps } from '../../../../../infra/public';
+import { LogStream, LogStreamProps } from '@kbn/infra-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 /*
  * EnterpriseSearchLogStream is a light wrapper on top of infra's embeddable LogStream component.
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
index c21aeff2780b6..0301d4528b7ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
@@ -15,7 +15,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { EuiButtonTo } from '../react_router_helpers';
 
-import { NotFoundPrompt } from './';
+import { NotFoundPrompt } from '.';
 
 describe('NotFoundPrompt', () => {
   const subject = (props?: object) =>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts
index fea67df216f77..20254c59439c4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { parseQueryParams } from './';
+import { parseQueryParams } from '.';
 
 describe('parseQueryParams', () => {
   it('parse query strings', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts
index 2ffe87279d44f..146624e8462dc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts
@@ -7,9 +7,9 @@
 
 import { mockHistory } from '../../__mocks__/react_router';
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { createHref } from './';
+import { createHref } from '.';
 
 describe('createHref', () => {
   const dependencies = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts
index ea28fc4d440c5..a399d632140b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts
@@ -7,7 +7,7 @@
 
 import { History } from 'history';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 /**
  * This helper uses React Router's createHref function to generate links with router basenames included.
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx
index df942ea10975f..357d60f588469 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-jest.mock('./', () => ({
+jest.mock('.', () => ({
   generateReactRouterProps: ({ to }: { to: string }) => ({
     href: `/app/enterprise_search${to}`,
     onClick: () => {},
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
index e47c02be84232..a48827de4b86b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
@@ -24,7 +24,7 @@ import {
 } from '@elastic/eui';
 import { EuiPanelProps } from '@elastic/eui/src/components/panel/panel';
 
-import { generateReactRouterProps, ReactRouterProps } from './';
+import { generateReactRouterProps, ReactRouterProps } from '.';
 
 /**
  * Correctly typed component helpers with React-Router-friendly `href` and `onClick` props
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts
index dc8bf28a44407..05e00eb8cc3a6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts
@@ -8,7 +8,7 @@
 import { mockKibanaValues } from '../../__mocks__/kea_logic';
 import { mockHistory } from '../../__mocks__/react_router';
 
-import { generateReactRouterProps } from './';
+import { generateReactRouterProps } from '.';
 
 describe('generateReactRouterProps', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts
index d80eca19207bd..994468721856f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts
@@ -10,7 +10,7 @@ import React from 'react';
 import { HttpLogic } from '../http';
 import { KibanaLogic } from '../kibana';
 
-import { letBrowserHandleEvent, createHref } from './';
+import { letBrowserHandleEvent, createHref } from '.';
 
 /**
  * Generates the `href` and `onClick` props for React-Router-friendly links
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts
index 9668ca69c73bb..1046f47f8f380 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { letBrowserHandleEvent } from '../react_router_helpers';
+import { letBrowserHandleEvent } from '.';
 
 describe('letBrowserHandleEvent', () => {
   const event = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
index 5bae7b00dda10..c5b1cfc866b08 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { DeactivatedUserCallout } from './';
+import { DeactivatedUserCallout } from '.';
 
 describe('DeactivatedUserCallout', () => {
   it('renders with new', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
index bcaf26ccf2cfc..5f4ba7ba4cb7a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
@@ -22,7 +22,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { CANCEL_BUTTON_LABEL } from '../../shared/constants/actions';
+import { CANCEL_BUTTON_LABEL } from '../constants/actions';
 
 import {
   ROLE_MAPPING_FLYOUT_CREATE_TITLE,
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
index b325863b54430..516882922223b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
@@ -11,7 +11,8 @@ import { useValues } from 'kea';
 
 import { EuiEmptyPrompt, EuiButton, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
 
-import type { AuthenticatedUser } from '../../../../../security/public';
+import type { AuthenticatedUser } from '@kbn/security-plugin/public';
+
 import { KibanaLogic } from '../kibana/kibana_logic';
 import { ProductName } from '../types';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
index 5c4eac2d93f33..a8c96b874fec9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
@@ -7,7 +7,7 @@
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { AttributeName, ElasticsearchUser } from '../../shared/types';
+import { AttributeName, ElasticsearchUser } from '../types';
 
 export interface RoleMappingsBaseServerDetails {
   attributes: string[];
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
index 05ccafbe3e38f..f14e1ec20154f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { UserAddedInfo } from './';
+import { UserAddedInfo } from '.';
 
 describe('UserAddedInfo', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
index 9e516192772d6..2ca96706db4d0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
@@ -19,7 +19,7 @@ import {
   UPDATE_USER_DESCRIPTION,
 } from './constants';
 
-import { UserFlyout } from './';
+import { UserFlyout } from '.';
 
 describe('UserFlyout', () => {
   const closeUserFlyout = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
index d5272a26715b6..920704baddf91 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
@@ -13,7 +13,7 @@ import { EuiText, EuiButtonIcon, EuiCopy } from '@elastic/eui';
 
 import { EXISTING_INVITATION_LABEL } from './constants';
 
-import { UserInvitationCallout } from './';
+import { UserInvitationCallout } from '.';
 
 describe('UserInvitationCallout', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
index bc700268d46fc..874c506e57bc9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
@@ -17,7 +17,7 @@ import { RoleTypes as ASRole } from '../../app_search/types';
 
 import { REQUIRED_LABEL, USERNAME_NO_USERS_TEXT } from './constants';
 
-import { UserSelector } from './';
+import { UserSelector } from '.';
 
 const simulatedEvent = {
   target: { value: 'foo' },
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
index 077ef44c66b2f..a1c456d518d8e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
@@ -18,11 +18,11 @@ import {
 } from '@elastic/eui';
 
 import { RoleTypes as ASRole } from '../../app_search/types';
-import { ElasticsearchUser } from '../../shared/types';
 import { Role as WSRole } from '../../workplace_search/types';
 
 import { USERNAME_LABEL, EMAIL_LABEL } from '../constants';
 import { docLinks } from '../doc_links';
+import { ElasticsearchUser } from '../types';
 
 const SMTP_URL = `${docLinks.enterpriseSearchMailService}`;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
index 9110c09827c49..74989b3ebddca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 
-import { UsersEmptyPrompt } from './';
+import { UsersEmptyPrompt } from '.';
 
 describe('UsersEmptyPrompt', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
index 9bae93079e89f..fe7dfb841d0e3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiButton, EuiText, EuiTitle } from '@elastic/eui';
 
-import { UsersHeading } from './';
+import { UsersHeading } from '.';
 
 describe('UsersHeading', () => {
   const onClick = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
index 02204d7079b0c..b890d1a257cb1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
@@ -24,7 +24,7 @@ import { engines } from '../../app_search/__mocks__/engines.mock';
 
 import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
 
-import { UsersTable } from './';
+import { UsersTable } from '.';
 
 describe('UsersTable', () => {
   const initializeSingleUserRoleMapping = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
index 4caeeada29b7b..44c2a78b090f5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
@@ -11,8 +11,8 @@ import { EuiBadge, EuiBasicTableColumn, EuiInMemoryTable, EuiTextColor } from '@
 import type { EuiSearchBarOnChangeArgs } from '@elastic/eui';
 
 import { ASRoleMapping } from '../../app_search/types';
-import { SingleUserRoleMapping } from '../../shared/types';
 import { WSRoleMapping } from '../../workplace_search/types';
+import { SingleUserRoleMapping } from '../types';
 
 import {
   INVITATION_PENDING_LABEL,
@@ -27,7 +27,7 @@ import {
   ENGINES_LABEL,
 } from './constants';
 
-import { UsersAndRolesRowActions } from './';
+import { UsersAndRolesRowActions } from '.';
 
 interface AccessItem {
   name: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx
index e81f530f02ee9..8da4a7d6abce1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx
@@ -12,10 +12,10 @@ import { shallow, mount } from 'enzyme';
 import { EuiForm, EuiFieldText, EuiModal } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { SchemaFieldTypeSelect } from '../index';
+import { SchemaFieldTypeSelect } from '..';
 import { SchemaType } from '../types';
 
-import { SchemaAddFieldModal } from './';
+import { SchemaAddFieldModal } from '.';
 
 describe('SchemaAddFieldModal', () => {
   const addNewField = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx
index 6b85ba4f681f9..32191abbbae21 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx
@@ -24,9 +24,9 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { SchemaFieldTypeSelect } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../constants';
 import { FIELD_NAME, FIELD_TYPE } from '../constants';
-import { SchemaFieldTypeSelect } from '../index';
 import { SchemaType } from '../types';
 
 import {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
index 19d04ea3de17e..0ba15ed5fbf2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
@@ -15,7 +15,7 @@ import { EuiLinkTo } from '../../react_router_helpers';
 
 import { SchemaType } from '../types';
 
-import { SchemaErrorsAccordion } from './';
+import { SchemaErrorsAccordion } from '.';
 
 describe('SchemaErrorsAccordion', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx
index 332317fde1835..8e11e572c69f2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SchemaErrorsCallout } from './';
+import { SchemaErrorsCallout } from '.';
 
 describe('SchemaErrorsCallout', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx
index 6d51a06273712..c3bd26947244d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiSelect } from '@elastic/eui';
 
-import { SchemaFieldTypeSelect } from './';
+import { SchemaFieldTypeSelect } from '.';
 
 describe('SchemaFieldTypeSelect', () => {
   const updateExistingFieldType = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx
index e33b9d29689c4..34edb9eb8be7b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx
@@ -18,7 +18,7 @@ import { rerender } from '../../test_helpers';
 import { CloudSetupInstructions } from './cloud/instructions';
 import { SetupInstructions } from './instructions';
 
-import { SetupGuideLayout } from './';
+import { SetupGuideLayout } from '.';
 
 describe('SetupGuideLayout', () => {
   let wrapper: ShallowWrapper;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts
index 32059f4dc7ae5..ea9297acae0a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { convertMetaToPagination, handlePageChange, updateMetaPageIndex } from './';
+import { convertMetaToPagination, handlePageChange, updateMetaPageIndex } from '.';
 
 describe('convertMetaToPagination', () => {
   expect(
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx
index bd9b7fb5bfbe3..3ec501b1e79ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx
@@ -16,7 +16,7 @@ import {
   SendEnterpriseSearchTelemetry,
   SendAppSearchTelemetry,
   SendWorkplaceSearchTelemetry,
-} from './';
+} from '.';
 
 describe('Telemetry component helpers', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
index f9bf55b4fe800..6d8329fa64979 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { TruncatedContent } from './';
+import { TruncatedContent } from '.';
 
 const content = 'foobarbaz';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
index e4738d0af8bca..56ee678742933 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { truncate, truncateBeginning } from './';
+import { truncate, truncateBeginning } from '.';
 
 import './truncated_content.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx
index f60ccf2d19e50..38630969010df 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { VersionMismatchError } from './version_mismatch_error';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts b/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts
index 8f17edf6628fa..0340f7d130b5d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts
@@ -7,8 +7,8 @@
 
 import { mockFlashMessageHelpers } from '../__mocks__/kea_logic';
 
+import { HttpHandler } from '@kbn/core/public';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { HttpHandler } from 'src/core/public';
 
 export const itShowsServerErrorAsFlashMessage = (httpMethod: HttpHandler, callback: () => void) => {
   const { flashAPIErrors } = mockFlashMessageHelpers;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx
index 9df11ab2308da..4cd5250ae058e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiHeader, EuiPopover } from '@elastic/eui';
 
-import { AccountHeader } from './';
+import { AccountHeader } from '.';
 
 describe('AccountHeader', () => {
   const mockValues = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx
index 188949b2539c2..58b5065e7dbda 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { externalUrl } from '../../../shared/enterprise_search_url';
 
-import { WorkplaceSearchHeaderActions } from './';
+import { WorkplaceSearchHeaderActions } from '.';
 
 describe('WorkplaceSearchHeaderActions', () => {
   const ENT_SEARCH_URL = 'http://localhost:3002';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
index 01df4bdd02d55..1e73c6156619e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
@@ -18,7 +18,7 @@ jest.mock('../../views/settings/components/settings_sub_nav', () => ({
   useSettingsSubNav: () => [],
 }));
 
-import { useWorkplaceSearchNav } from './';
+import { useWorkplaceSearchNav } from '.';
 
 describe('useWorkplaceSearchNav', () => {
   it('returns an array of top-level Workplace Search nav items', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx
index 6847e91d46f6e..b916f401480d9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx
@@ -14,12 +14,11 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
+import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '..';
 import { FlashMessages } from '../../../../shared/flash_messages';
 import { SetWorkplaceSearchChrome } from '../../../../shared/kibana_chrome';
 import { Loading } from '../../../../shared/loading';
 
-import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '../index';
-
 import { PersonalDashboardLayout } from './personal_dashboard_layout';
 
 describe('PersonalDashboardLayout', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx
index 141c87325a08d..dfbed1a0d2007 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx
@@ -19,6 +19,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '..';
 import { FlashMessages } from '../../../../shared/flash_messages';
 import { HttpLogic } from '../../../../shared/http';
 import { SetWorkplaceSearchChrome } from '../../../../shared/kibana_chrome';
@@ -27,7 +28,6 @@ import { Loading } from '../../../../shared/loading';
 
 import { PRIVATE_SOURCES_PATH, PERSONAL_SETTINGS_PATH } from '../../../routes';
 import { PERSONAL_DASHBOARD_READ_ONLY_MODE_WARNING } from '../../../views/content_sources/constants';
-import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '../index';
 
 import './personal_dashboard_layout.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx
index 32f21c158736f..a08fe0fc0a999 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCodeBlock, EuiFormLabel } from '@elastic/eui';
 
-import { ApiKey } from './';
+import { ApiKey } from '.';
 
 const key = '123abc';
 const label = 'foo';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts
index 5b893250235f7..238082054e53a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts
@@ -15,13 +15,17 @@ import googleDrive from './google_drive.svg';
 import jira from './jira.svg';
 import jiraServer from './jira_server.svg';
 import loadingSmall from './loading_small.svg';
+import networkDrive from './network_drive.svg';
 import oneDrive from './onedrive.svg';
+import outlook from './outlook.svg';
 import salesforce from './salesforce.svg';
 import serviceNow from './servicenow.svg';
 import sharePoint from './sharepoint.svg';
 import sharePointServer from './sharepoint_server.svg';
 import slack from './slack.svg';
+import teams from './teams.svg';
 import zendesk from './zendesk.svg';
+import zoom from './zoom.svg';
 
 export const images = {
   box,
@@ -42,12 +46,16 @@ export const images = {
   jiraServer,
   jiraCloud: jira,
   loadingSmall,
+  networkDrive,
   oneDrive,
+  outlook,
   salesforce,
   salesforceSandbox: salesforce,
   serviceNow,
   sharePoint,
   sharePointServer,
   slack,
+  teams,
   zendesk,
+  zoom,
 } as { [key: string]: string };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/network_drive.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/network_drive.svg
new file mode 100644
index 0000000000000..cc07fbbc50877
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/network_drive.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#a)"><path d="m50.8142 23.5717h-4.2c4.143 8.1938 6.3015 17.2469 6.3015 26.4286 0 9.1816-2.1585 18.2347-6.3015 26.4285h4.5714c7.0093 0 13.7316-2.7844 18.6879-7.7407s7.7407-11.6785 7.7407-18.6878-2.7844-13.7315-7.7407-18.6879c-4.9563-4.9563-11.6786-7.7407-18.6879-7.7407zm-.8142-23.5857279c-6.6174-.0042253-13.1691 1.3119779-19.2715 3.8714579 5.3516 4.32083 9.9142 9.53597 13.4857 15.41427h8.0714l.0715.0857c7.7784.5043 15.0733 3.9498 20.4037 9.637s8.2968 13.1897 8.2968 20.9844-2.9664 15.2973-8.2968 20.9845-12.6253 9.1327-20.4037 9.6369l-.0715.1001h-8.0714c-3.5715 5.8782-8.1341 11.0935-13.4857 15.4143 6.8282 2.8556 14.2051 4.1594 21.5985 3.8181 7.3933-.3415 14.6186-2.3201 21.1544-5.7929 6.5358-3.4729 12.2191-8.3534 16.6398-14.2894 4.4206-5.936 7.4683-12.7794 8.9231-20.0362 1.4547-7.2568 1.2807-14.7461-.5104-21.9274-1.791-7.1813-5.1539-13.8753-9.846-19.5991s-10.5964-10.33458-17.2868-13.49953c-6.6903-3.16494-13.9999-4.8051405-21.4011-4.8021979zm-10.8714 19.2857279c-3.4579-5.1394-7.7617-9.65573-12.7287-13.35712-7.308 3.93332-13.5268 9.61712-18.09986 16.54282 4.21966-2.0886 8.86316-3.1785 13.57146-3.1857zm0 61.4286h-17.2571c-4.7102-.005-9.3553-1.1002-13.57146-3.2 4.57606 6.9408 10.80566 12.6353 18.12846 16.5714 4.9508-3.7106 9.2437-8.2257 12.7001-13.3571zm2.6428-4.2858c4.4971-8.0826 6.8574-17.1791 6.8574-26.4285 0-9.2495-2.3603-18.346-6.8574-26.4286h-19.8999c-6.6584-.0024-13.07027 2.5194-17.94297 7.0571-.04357.1274-.09606.2515-.15712.3715 1.44454-1.374 3.03486-2.586 4.74278-3.6143-1.70792 1.0283-3.29824 2.2403-4.74278 3.6143-5.02806 12.1627-5.02806 25.823 0 37.9857.06106.12.11355.244.15712.3714 4.87578 4.5328 11.28557 7.0539 17.94297 7.0571z" fill="#0060d5"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/outlook.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/outlook.svg
new file mode 100644
index 0000000000000..932a3756a522b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/outlook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="62" height="62" viewBox="19 19 62 62" fill="none"><g clip-path="url(#C)"><path d="M83.65 51.55a1.49 1.49 0 0 0-.71-1.279h-.008l-.028-.016-23.095-13.671a3.15 3.15 0 0 0-.31-.184 3.1 3.1 0 0 0-2.843 0 3.15 3.15 0 0 0-.31.184L33.252 50.256l-.028.016c-.706.439-.922 1.367-.483 2.073.129.208.308.381.519.505L56.355 66.52a3.48 3.48 0 0 0 .31.184 3.1 3.1 0 0 0 2.843 0 3.48 3.48 0 0 0 .31-.184l23.095-13.671c.461-.269.743-.765.738-1.299z" fill="#0a2767"/><path d="M35.944 42.422H51.1v13.893H35.944V42.422zM80.55 28.3v-6.355A2.88 2.88 0 0 0 77.74 19H38.41a2.88 2.88 0 0 0-2.81 2.945V28.3l23.25 6.2 21.7-6.2z" fill="#0364b8"/><path d="M35.6 28.3h15.5v13.95H35.6V28.3z" fill="#0078d4"/><path d="M66.6 28.3H51.1v13.95L66.6 56.2h13.95V42.25L66.6 28.3z" fill="#28a8ea"/><path d="M51.1 42.25h15.5V56.2H51.1V42.25z" fill="#0078d4"/><path d="M51.1 56.2h15.5v13.95H51.1V56.2z" fill="#0364b8"/><path d="M35.944 56.315H51.1v12.629H35.944V56.315z" fill="#14447d"/><path d="M66.6 56.2h13.95v13.95H66.6V56.2z" fill="#0078d4"/><path d="M82.94 52.764l-.029.016-23.095 12.989-.31.174a3.22 3.22 0 0 1-1.252.31l-1.262-.738c-.107-.053-.21-.113-.31-.178L33.277 51.978h-.011l-.766-.428v26.294A3.18 3.18 0 0 0 35.698 81h44.804c.026 0 .05-.012.078-.012a3.92 3.92 0 0 0 1.085-.226 3.13 3.13 0 0 0 .436-.226c.104-.059.282-.187.282-.187a3.13 3.13 0 0 0 1.268-2.503V51.55c-.001.503-.272.967-.71 1.214z" fill="url(#A)"/><path opacity=".5" d="M82.41 51.446v1.612L58.261 69.685 33.26 51.989c0-.009-.007-.016-.016-.016l-2.294-1.379v-1.163l.945-.015 2 1.147.046.016.17.109 23.56 13.438.899.527a4.29 4.29 0 0 1 .248-.093c.047-.031 23.328-13.128 23.328-13.128l.264.016z" fill="#0a2767"/><path d="M82.94 52.764l-.029.017L59.816 65.77l-.31.174a3.24 3.24 0 0 1-2.843 0 3.52 3.52 0 0 1-.31-.174L33.258 52.781l-.028-.017c-.446-.242-.725-.706-.73-1.214v26.294c.011 1.754 1.442 3.167 3.196 3.156h44.758c1.754.011 3.185-1.402 3.196-3.156V51.55c-.001.503-.272.967-.71 1.214z" fill="#1490df"/><g fill="#000"><path opacity=".1" d="M60.152 65.578l-.346.194a3.35 3.35 0 0 1-.31.175 3.21 3.21 0 0 1-1.218.322l8.787 10.391 15.328 3.694a3.16 3.16 0 0 0 .972-1.214L60.152 65.578z"/><path opacity=".05" d="M61.717 64.697l-1.911 1.074c-.1.064-.204.122-.31.175a3.21 3.21 0 0 1-1.218.322l4.117 11.351 20.003 2.73c.788-.592 1.252-1.519 1.252-2.505v-.339L61.717 64.697z"/></g><path d="M35.74 81h44.71c.688.004 1.359-.214 1.914-.62L56.99 65.517c-.107-.054-.21-.113-.31-.178L33.275 51.981h-.011l-.764-.431v26.204c-.002 1.791 1.449 3.244 3.239 3.246z" fill="#28a8ea"/><g fill="#000"><path opacity=".1" d="M54.2 34.241v33.061a2.85 2.85 0 0 1-1.783 2.635 2.67 2.67 0 0 1-1.054.217H32.5V32.95h3.1V31.4h15.764a2.85 2.85 0 0 1 2.837 2.841z"/><path opacity=".2" d="M52.65 35.791v33.061c.004.374-.075.745-.233 1.085-.43 1.061-1.459 1.757-2.604 1.762H32.5V32.95h17.313a2.6 2.6 0 0 1 1.287.326 2.82 2.82 0 0 1 1.55 2.516z"/><path opacity=".2" d="M52.65 35.791v29.962a2.86 2.86 0 0 1-2.837 2.847H32.5V32.95h17.313a2.6 2.6 0 0 1 1.287.326 2.82 2.82 0 0 1 1.55 2.516z"/><path opacity=".2" d="M51.1 35.791v29.961a2.85 2.85 0 0 1-2.837 2.847H32.5V32.95h15.764a2.84 2.84 0 0 1 2.837 2.84z"/></g><path d="M19.841 32.95h28.418a2.84 2.84 0 0 1 2.841 2.841v28.418a2.84 2.84 0 0 1-2.841 2.841H19.841A2.84 2.84 0 0 1 17 64.209V35.791a2.84 2.84 0 0 1 2.841-2.841z" fill="url(#B)"/><path d="M25.88 44.866c.7-1.492 1.831-2.741 3.246-3.585 1.567-.897 3.352-1.345 5.157-1.293 1.673-.036 3.324.388 4.773 1.226a8.19 8.19 0 0 1 3.157 3.425c.761 1.568 1.14 3.294 1.107 5.038a11.67 11.67 0 0 1-1.139 5.27c-.715 1.474-1.847 2.707-3.255 3.545-1.504.864-3.216 1.299-4.951 1.259a9.33 9.33 0 0 1-4.878-1.24c-1.374-.813-2.484-2.005-3.199-3.432-.765-1.546-1.149-3.252-1.119-4.977-.032-1.806.345-3.596 1.102-5.236zm3.46 8.417c.373.943 1.006 1.761 1.826 2.359a4.77 4.77 0 0 0 2.852.859c1.084.043 2.153-.268 3.044-.887a5.14 5.14 0 0 0 1.773-2.359 9.16 9.16 0 0 0 .566-3.291 10.02 10.02 0 0 0-.533-3.332 5.27 5.27 0 0 0-1.717-2.458c-.869-.648-1.935-.976-3.018-.93a4.92 4.92 0 0 0-2.919.867 5.41 5.41 0 0 0-1.86 2.379c-.846 2.186-.851 4.608-.012 6.797l-.002-.003z" fill="#fff"/><path d="M66.6 28.3h13.95v13.95H66.6V28.3z" fill="#50d9ff"/></g><defs><linearGradient id="A" x1="58.075" y1="51.55" x2="58.075" y2="81" gradientUnits="userSpaceOnUse"><stop stop-color="#35b8f1"/><stop offset="1" stop-color="#28a8ea"/></linearGradient><linearGradient id="B" x1="22.924" y1="30.73" x2="45.176" y2="69.27" gradientUnits="userSpaceOnUse"><stop stop-color="#1784d9"/><stop offset=".5" stop-color="#107ad5"/><stop offset="1" stop-color="#0a63c9"/></linearGradient><clipPath id="C"><path fill="#fff" transform="translate(17 19)" d="M0 0h66.65v62H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/teams.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/teams.svg
new file mode 100644
index 0000000000000..bf3aef9277eb6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/teams.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62" height="62" viewBox="19 19 62 62" fill="none"><g clip-path="url(#B)"><g fill="#5059c9"><path d="M62.246 42.628h16.015a2.74 2.74 0 0 1 2.74 2.74v14.587a10.07 10.07 0 0 1-10.068 10.069h-.048a10.07 10.07 0 0 1-10.07-10.067V44.06a1.43 1.43 0 0 1 1.432-1.432zm10.824-2.884a6.49 6.49 0 0 0 6.488-6.488 6.49 6.49 0 0 0-6.488-6.488 6.49 6.49 0 0 0-6.488 6.488 6.49 6.49 0 0 0 6.488 6.488z"/></g><g fill="#7b83eb"><path d="M52.884 39.744c5.176 0 9.372-4.196 9.372-9.372S58.06 21 52.884 21s-9.372 4.196-9.372 9.372 4.196 9.372 9.372 9.372zm12.496 2.884H38.945a2.71 2.71 0 0 0-2.643 2.773v16.638c-.209 8.972 6.889 16.417 15.86 16.636 8.971-.22 16.069-7.665 15.861-16.636V45.401a2.71 2.71 0 0 0-2.643-2.773z"/></g><g fill="#000"><path opacity=".1" d="M53.605 42.628v23.315c-.007 1.069-.655 2.03-1.644 2.437-.315.133-.653.202-.995.202H37.571l-.505-1.442c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h14.664z"/><path opacity=".2" d="M52.163 42.628v24.757c0 .342-.069.68-.202.995-.407.989-1.368 1.636-2.437 1.644H38.249l-.678-1.442a14.29 14.29 0 0 1-.505-1.442c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h13.222z"/><path opacity=".2" d="M52.163 42.628v21.873a2.66 2.66 0 0 1-2.639 2.639H37.067c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h13.222z"/><path opacity=".2" d="M50.721 42.628v21.873a2.66 2.66 0 0 1-2.639 2.639H37.067c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h11.78z"/><path opacity=".1" d="M53.605 35.174v4.542l-.721.029c-.245 0-.476-.014-.721-.029a7.91 7.91 0 0 1-1.442-.231 9.37 9.37 0 0 1-6.488-5.508c-.199-.465-.353-.948-.462-1.442h7.195a2.65 2.65 0 0 1 2.639 2.638z"/><use xlink:href="#C" opacity=".2"/><use xlink:href="#C" opacity=".2"/><path opacity=".2" d="M50.721 36.615v2.869a9.37 9.37 0 0 1-6.488-5.508h3.85a2.65 2.65 0 0 1 2.639 2.639z"/></g><path d="M21.643 33.977h26.435c1.46 0 2.643 1.183 2.643 2.643v26.435c0 1.46-1.183 2.643-2.643 2.643H21.643c-1.46 0-2.643-1.183-2.643-2.643V36.62c0-1.46 1.183-2.643 2.643-2.643z" fill="url(#A)"/><path d="M41.816 44.038h-5.284v14.39h-3.367v-14.39h-5.26v-2.791h13.911v2.791z" fill="#fff"/></g><defs><linearGradient id="A" x1="24.511" y1="31.911" x2="45.21" y2="67.763" gradientUnits="userSpaceOnUse"><stop stop-color="#5a62c3"/><stop offset=".5" stop-color="#4d55bd"/><stop offset="1" stop-color="#3940ab"/></linearGradient><clipPath id="B"><path fill="#fff" transform="translate(19 21)" d="M0 0h62v57.674H0z"/></clipPath><path id="C" d="M52.163 36.615v3.1a7.91 7.91 0 0 1-1.442-.231 9.37 9.37 0 0 1-6.489-5.508h5.292a2.65 2.65 0 0 1 2.639 2.639z"/></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/zoom.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/zoom.svg
new file mode 100644
index 0000000000000..d7498817bc62d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/zoom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="62" height="62" viewBox="19 19 62 62" fill="none"><path d="M19 39.46C19 28.16 28.16 19 39.46 19h21.08C71.84 19 81 28.16 81 39.46v21.08C81 71.84 71.84 81 60.54 81H39.46C28.16 81 19 71.84 19 60.54V39.46z" fill="url(#A)"/><path d="M32.764 42.56a2.23 2.23 0 0 1 2.232-2.232h16.678c3.287 0 5.952 2.665 5.952 5.952v11.16a2.23 2.23 0 0 1-2.232 2.232H38.716c-3.287 0-5.952-2.665-5.952-5.952V42.56zm26.164 4.981a3.75 3.75 0 0 1 1.348-2.876l4.163-3.454c1.581-1.312 2.859-.706 2.859 1.348v14.88c0 2.054-1.278 2.66-2.859 1.348l-4.163-3.454a3.75 3.75 0 0 1-1.348-2.876v-4.918z" fill="#fff"/><defs><linearGradient id="A" x1="50" y1="-49.26" x2="50" y2="148.862" gradientUnits="userSpaceOnUse"><stop stop-color="#57a2ff"/><stop offset="1" stop-color="#3c82fb"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx
index 991c7a061b4bb..16ba01e4e57ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiLoadingSpinner, EuiTextColor } from '@elastic/eui';
 
-import { ComponentLoader } from './';
+import { ComponentLoader } from '.';
 
 describe('ComponentLoader', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx
index 9301ebb85582f..6e060ee4f2e5a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx
@@ -13,7 +13,7 @@ import { EuiSpacer } from '@elastic/eui';
 
 import { ViewContentHeader } from '../view_content_header';
 
-import { ContentSection } from './';
+import { ContentSection } from '.';
 
 const props = {
   children: <div className="children" />,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx
index 101d1e0eb2239..023707459566f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCopy, EuiButtonIcon, EuiFieldText } from '@elastic/eui';
 
-import { CredentialItem } from './';
+import { CredentialItem } from '.';
 
 const label = 'Credential';
 const testSubj = 'CredentialItemTest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx
index 97abb3929f985..4fdb17eae0acd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiBadge } from '@elastic/eui';
 
-import { LicenseBadge } from './';
+import { LicenseBadge } from '.';
 
 describe('LicenseBadge', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx
index 6133bd30eec16..5be6a508fd74f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx
@@ -14,7 +14,7 @@ import { shallow } from 'enzyme';
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { ProductButton } from './';
+import { ProductButton } from '.';
 
 describe('ProductButton', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
index 68f83d935aadc..ec7742e68dd84 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiIcon } from '@elastic/eui';
 
-import { SourceIcon } from './';
+import { SourceIcon } from '.';
 
 describe('SourceIcon', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
index b19aa44446f75..03f5afba25be0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
@@ -15,7 +15,7 @@ import { EuiTableRow, EuiSwitch, EuiIcon } from '@elastic/eui';
 
 import { SourceIcon } from '../source_icon';
 
-import { SourceRow } from './';
+import { SourceRow } from '.';
 
 const onToggle = jest.fn();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
index 63ca5e8153d41..00ae2d2d9b214 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
@@ -15,7 +15,7 @@ import { EuiTable, EuiTableHeaderCell } from '@elastic/eui';
 
 import { SourceRow } from '../source_row';
 
-import { SourcesTable } from './';
+import { SourcesTable } from '.';
 
 const onToggle = jest.fn();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx
index c1c18b51f9fd3..5abc4af128680 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiPopover, EuiCopy, EuiButton, EuiButtonIcon } from '@elastic/eui';
 
-import { StatusItem } from './';
+import { StatusItem } from '.';
 
 describe('SourceRow', () => {
   const details = ['foo', 'bar'];
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
index d22ddcce49dc4..a0c8337ae795d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlexGroup, EuiTablePagination } from '@elastic/eui';
 
-import { TablePaginationBar } from './';
+import { TablePaginationBar } from '.';
 
 const onChange = jest.fn();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
index f15c74ed1054b..ea3b1cde69cf9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiTableRow } from '@elastic/eui';
 
-import { UserRow } from './';
+import { UserRow } from '.';
 
 describe('SourcesTable', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx
index 9b96e1deabe65..aec065266e0ba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlexGroup } from '@elastic/eui';
 
-import { ViewContentHeader } from './';
+import { ViewContentHeader } from '.';
 
 const props = {
   title: 'Header',
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
index 5a06cd0907187..f7a1bf1261406 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -173,9 +173,18 @@ export const SOURCE_NAMES = {
     'xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.jiraServer',
     { defaultMessage: 'Jira (Server)' }
   ),
+  NETWORK_DRVE: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.networkDrive',
+    {
+      defaultMessage: 'Network Drive',
+    }
+  ),
   ONEDRIVE: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.oneDrive', {
     defaultMessage: 'OneDrive',
   }),
+  OUTLOOK: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.outlook', {
+    defaultMessage: 'Outlook',
+  }),
   SALESFORCE: i18n.translate(
     'xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.salesforce',
     { defaultMessage: 'Salesforce' }
@@ -199,9 +208,15 @@ export const SOURCE_NAMES = {
   SLACK: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.slack', {
     defaultMessage: 'Slack',
   }),
+  TEAMS: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.teams', {
+    defaultMessage: 'Teams',
+  }),
   ZENDESK: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zendesk', {
     defaultMessage: 'Zendesk',
   }),
+  ZOOM: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zoom', {
+    defaultMessage: 'Zoom',
+  }),
   CUSTOM: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.custom', {
     defaultMessage: 'Custom API Source',
   }),
@@ -336,6 +351,39 @@ export const SOURCE_OBJ_TYPES = {
   ),
 };
 
+export const SOURCE_CATEGORIES = {
+  CLOUD: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud', {
+    defaultMessage: 'Cloud',
+  }),
+  COMMUNICATIONS: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.categories.communications',
+    {
+      defaultMessage: 'Communications',
+    }
+  ),
+  FILE_SHARING: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing',
+    {
+      defaultMessage: 'File Sharing',
+    }
+  ),
+  MICROSOFT: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft', {
+    defaultMessage: 'Microsoft',
+  }),
+  OFFICE_365: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.office', {
+    defaultMessage: 'Office 365',
+  }),
+  PRODUCTIVITY: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.categories.productivity',
+    {
+      defaultMessage: 'Productivity',
+    }
+  ),
+  STORAGE: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.storage', {
+    defaultMessage: 'Storage',
+  }),
+};
+
 export const API_KEYS_TITLE = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.sources.apiKeysTitle',
   {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index c4944e36ea188..f68d1cb3b3d0b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -23,7 +23,7 @@ import { ErrorState } from './views/error_state';
 import { Overview } from './views/overview';
 import { SetupGuide } from './views/setup_guide';
 
-import { WorkplaceSearch, WorkplaceSearchUnconfigured, WorkplaceSearchConfigured } from './';
+import { WorkplaceSearch, WorkplaceSearchUnconfigured, WorkplaceSearchConfigured } from '.';
 
 describe('WorkplaceSearch', () => {
   it('renders VersionMismatchPage when there are mismatching versions', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts
index 36df182b99b85..648aeb5fd000d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getAsLocalDateTimeString } from './';
+import { getAsLocalDateTimeString } from '.';
 
 describe('getAsLocalDateTimeString', () => {
   it('returns localized date if string can be parsed as date', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts
index 48b874484a0ce..4aafb729aaa77 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mimeType } from './';
+import { mimeType } from '.';
 
 describe('mimeType', () => {
   it('should return correct mimeType when present', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts
index 2aedbbb798f58..44822b31e4d19 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { readUploadedFileAsBase64 } from './';
+import { readUploadedFileAsBase64 } from '.';
 
 describe('readUploadedFileAsBase64', () => {
   it('reads a file and returns base64 string', async () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx
index c675a57ab18d8..c89a1647af331 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { AccountSettings } from './';
+import { AccountSettings } from '.';
 
 describe('AccountSettings', () => {
   const {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx
index b26650875f3ef..4173dcdca0724 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx
@@ -9,7 +9,8 @@ import React, { useState, useEffect, useMemo } from 'react';
 
 import { useValues } from 'kea';
 
-import type { AuthenticatedUser } from '../../../../../../security/public';
+import type { AuthenticatedUser } from '@kbn/security-plugin/public';
+
 import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
 import { PersonalDashboardLayout } from '../../components/layout';
 import { ACCOUNT_SETTINGS_TITLE } from '../../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx
index de87d82d8712e..9e5e3ac2782ee 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx
@@ -19,11 +19,12 @@ import {
   EuiTitle,
   EuiPanel,
   EuiCallOut,
+  EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { EuiButtonTo, EuiLinkTo } from '../../../../../../shared/react_router_helpers';
+import { EuiButtonTo } from '../../../../../../shared/react_router_helpers';
 import { AppLogic } from '../../../../../app_logic';
 import { SOURCES_PATH, getSourcesPath } from '../../../../../routes';
 
@@ -104,13 +105,13 @@ export const SaveCustom: React.FC = () => {
                 heading="h3"
                 size="s"
                 title={
-                  <EuiLinkTo target="_blank" to={'https://www.elastic.co/kibana/feedback'}>
+                  <EuiLink href="https://www.elastic.co/kibana/feedback" external>
                     <FormattedMessage
                       id="xpack.enterpriseSearch.workplaceSearch.sources.feedbackLinkLabel"
                       defaultMessage="Have feedback about deploying a {name} connector? Let us know."
                       values={{ name }}
                     />
-                  </EuiLinkTo>
+                  </EuiLink>
                 }
                 iconType="email"
               />
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx
index 97225144a3324..5a2558f141ea0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx
@@ -31,9 +31,10 @@ import { SourceDataItem } from '../../../../../types';
 
 import { staticExternalSourceData } from '../../../source_data';
 
-import { AddSourceHeader } from './../add_source_header';
-import { ConfigDocsLinks } from './../config_docs_links';
-import { OAUTH_SAVE_CONFIG_BUTTON, OAUTH_BACK_BUTTON } from './../constants';
+import { AddSourceHeader } from '../add_source_header';
+import { ConfigDocsLinks } from '../config_docs_links';
+import { OAUTH_SAVE_CONFIG_BUTTON, OAUTH_BACK_BUTTON } from '../constants';
+
 import { ExternalConnectorDocumentation } from './external_connector_documentation';
 import { ExternalConnectorFormFields } from './external_connector_form_fields';
 import { ExternalConnectorLogic } from './external_connector_logic';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx
index fbcb8685f7ff9..06815ab3330f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx
@@ -26,7 +26,7 @@ describe('AvailableSourcesList', () => {
     const wrapper = shallow(<AvailableSourcesList sources={mergedAvailableSources} />);
 
     expect(wrapper.find(EuiTitle)).toHaveLength(1);
-    expect(wrapper.find('[data-test-subj="AvailableSourceListItem"]')).toHaveLength(20);
+    expect(wrapper.find('[data-test-subj="AvailableSourceListItem"]')).toHaveLength(24);
     expect(wrapper.find('[data-test-subj="CustomAPISourceLink"]')).toHaveLength(1);
   });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx
index f0e81748a6561..5b23368289f1a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx
@@ -24,12 +24,12 @@ describe('ConfiguredSourcesList', () => {
   it('renders', () => {
     const wrapper = shallow(<ConfiguredSourcesList {...props} />);
 
-    expect(wrapper.find('[data-test-subj="UnConnectedTooltip"]')).toHaveLength(16);
+    expect(wrapper.find('[data-test-subj="UnConnectedTooltip"]')).toHaveLength(20);
     expect(wrapper.find('[data-test-subj="AccountOnlyTooltip"]')).toHaveLength(2);
-    expect(wrapper.find('[data-test-subj="ConfiguredSourcesListItem"]')).toHaveLength(19);
+    expect(wrapper.find('[data-test-subj="ConfiguredSourcesListItem"]')).toHaveLength(23);
   });
 
-  it('does not show connect button for a connected external source', () => {
+  it('does show connect button for a connected external source', () => {
     const wrapper = shallow(
       <ConfiguredSourcesList
         {...{
@@ -38,7 +38,7 @@ describe('ConfiguredSourcesList', () => {
         }}
       />
     );
-    expect(wrapper.find(EuiButtonEmptyTo)).toHaveLength(0);
+    expect(wrapper.find(EuiButtonEmptyTo)).toHaveLength(1);
   });
 
   it('does show connect button for an unconnected external source', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
index 6e4e4dcec2ba0..bbec096ae07d8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
@@ -124,39 +124,32 @@ export const ConfiguredSourcesList: React.FC<ConfiguredSourcesProps> = ({
                     </EuiFlexGroup>
                   </EuiSplitPanel.Inner>
                   <EuiSplitPanel.Inner color="subdued" paddingSize="none">
-                    {
-                      // TODO: Remove this once external connectors are multi-tenant
-                      // This prevents connecting more than one external content source
-                      (serviceType !== 'external' || !connected) &&
-                        (((!isOrganization || (isOrganization && !accountContextOnly)) && (
-                          <EuiButtonEmptyTo
-                            className="eui-fullWidth"
-                            to={`${getSourcesPath(getAddPath(serviceType), isOrganization)}/${
-                              hasMultipleConnectorOptions(sourceData) && isOrganization
-                                ? ''
-                                : 'connect'
-                            }`}
-                          >
-                            {!connected
-                              ? i18n.translate(
-                                  'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton',
-                                  {
-                                    defaultMessage: 'Connect',
-                                  }
-                                )
-                              : i18n.translate(
-                                  'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton',
-                                  {
-                                    defaultMessage: 'Connect another',
-                                  }
-                                )}
-                          </EuiButtonEmptyTo>
-                        )) || (
-                          <EuiButtonEmpty className="eui-fullWidth" isDisabled>
-                            {ADD_SOURCE_ORG_SOURCES_TITLE}
-                          </EuiButtonEmpty>
-                        ))
-                    }
+                    {((!isOrganization || (isOrganization && !accountContextOnly)) && (
+                      <EuiButtonEmptyTo
+                        className="eui-fullWidth"
+                        to={`${getSourcesPath(getAddPath(serviceType), isOrganization)}/${
+                          hasMultipleConnectorOptions(sourceData) && isOrganization ? '' : 'connect'
+                        }`}
+                      >
+                        {!connected
+                          ? i18n.translate(
+                              'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton',
+                              {
+                                defaultMessage: 'Connect',
+                              }
+                            )
+                          : i18n.translate(
+                              'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton',
+                              {
+                                defaultMessage: 'Connect another',
+                              }
+                            )}
+                      </EuiButtonEmptyTo>
+                    )) || (
+                      <EuiButtonEmpty className="eui-fullWidth" isDisabled>
+                        {ADD_SOURCE_ORG_SOURCES_TITLE}
+                      </EuiButtonEmpty>
+                    )}
                   </EuiSplitPanel.Inner>
                 </EuiSplitPanel.Outer>
               </EuiCard>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
index 0ae176dbef019..3e850277c0b72 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
@@ -40,9 +40,9 @@ describe('ConnectInstance', () => {
     redirectFormCreated();
   });
 
-  const credentialsSourceData = staticSourceData[13];
-  const oauthSourceData = staticSourceData[0];
-  const subdomainSourceData = staticSourceData[18];
+  const credentialsSourceData = staticSourceData[15]; // salesforce_sandbox
+  const oauthSourceData = staticSourceData[0]; // box
+  const subdomainSourceData = staticSourceData[21]; // zendesk
 
   const props = {
     ...credentialsSourceData,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx
index c2c53bc33a64a..d660b4499e210 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx
@@ -43,7 +43,7 @@ import {
 } from '../../../constants';
 import { getEditPath } from '../../../routes';
 import { handlePrivateKeyUpload } from '../../../utils';
-import { AddSourceLogic } from '../components/add_source/add_source_logic';
+
 import {
   SOURCE_SETTINGS_HEADING,
   SOURCE_SETTINGS_TITLE,
@@ -59,6 +59,8 @@ import {
 } from '../constants';
 import { SourceLogic } from '../source_logic';
 
+import { AddSourceLogic } from './add_source/add_source_logic';
+
 import { DownloadDiagnosticsButton } from './download_diagnostics_button';
 
 import { SourceLayout } from './source_layout';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
index 258fa97da6e7e..282de2590df7f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
@@ -9,7 +9,12 @@ import { i18n } from '@kbn/i18n';
 
 import { docLinks } from '../../../shared/doc_links';
 
-import { SOURCE_NAMES, SOURCE_OBJ_TYPES, GITHUB_LINK_TITLE } from '../../constants';
+import {
+  SOURCE_CATEGORIES,
+  SOURCE_NAMES,
+  SOURCE_OBJ_TYPES,
+  GITHUB_LINK_TITLE,
+} from '../../constants';
 import { FeatureIds, SourceDataItem } from '../../types';
 
 export const staticExternalSourceData: SourceDataItem = {
@@ -23,7 +28,7 @@ export const staticExternalSourceData: SourceDataItem = {
     documentationUrl: docLinks.workplaceSearchExternalSharePointOnline,
     applicationPortalUrl: 'https://portal.azure.com/',
   },
-  objTypes: [SOURCE_OBJ_TYPES.FOLDERS, SOURCE_OBJ_TYPES.SITES, SOURCE_OBJ_TYPES.ALL_FILES],
+  objTypes: [SOURCE_OBJ_TYPES.ALL_STORED_FILES],
   features: {
     basicOrgContext: [
       FeatureIds.SyncFrequency,
@@ -366,6 +371,23 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
+  {
+    name: SOURCE_NAMES.NETWORK_DRVE,
+    iconName: SOURCE_NAMES.NETWORK_DRVE,
+    categories: [SOURCE_CATEGORIES.STORAGE],
+    serviceType: 'network_drive', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-network-drive-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
   {
     name: SOURCE_NAMES.ONEDRIVE,
     iconName: SOURCE_NAMES.ONEDRIVE,
@@ -395,6 +417,27 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
+  {
+    name: SOURCE_NAMES.OUTLOOK,
+    iconName: SOURCE_NAMES.OUTLOOK,
+    categories: [
+      SOURCE_CATEGORIES.COMMUNICATIONS,
+      SOURCE_CATEGORIES.PRODUCTIVITY,
+      SOURCE_CATEGORIES.MICROSOFT,
+    ],
+    serviceType: 'outlook', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-outlook-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
   {
     name: SOURCE_NAMES.SALESFORCE,
     iconName: SOURCE_NAMES.SALESFORCE,
@@ -431,7 +474,6 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
-
   {
     name: SOURCE_NAMES.SALESFORCE_SANDBOX,
     iconName: SOURCE_NAMES.SALESFORCE_SANDBOX,
@@ -527,7 +569,6 @@ export const staticSourceData: SourceDataItem[] = [
         FeatureIds.SyncedItems,
       ],
     },
-
     accountContextOnly: false,
     internalConnectorAvailable: true,
     externalConnectorAvailable: true,
@@ -537,21 +578,11 @@ export const staticSourceData: SourceDataItem[] = [
     name: SOURCE_NAMES.SHAREPOINT_SERVER,
     iconName: SOURCE_NAMES.SHAREPOINT_SERVER,
     categories: [
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing', {
-        defaultMessage: 'File Sharing',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.storage', {
-        defaultMessage: 'Storage',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud', {
-        defaultMessage: 'Cloud',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft', {
-        defaultMessage: 'Microsoft',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.office', {
-        defaultMessage: 'Office 365',
-      }),
+      SOURCE_CATEGORIES.FILE_SHARING,
+      SOURCE_CATEGORIES.STORAGE,
+      SOURCE_CATEGORIES.CLOUD,
+      SOURCE_CATEGORIES.MICROSOFT,
+      SOURCE_CATEGORIES.OFFICE_365,
     ],
     serviceType: 'share_point_server', // this doesn't exist on the BE
     configuration: {
@@ -588,7 +619,27 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: true,
     internalConnectorAvailable: true,
   },
-
+  {
+    name: SOURCE_NAMES.TEAMS,
+    iconName: SOURCE_NAMES.TEAMS,
+    categories: [
+      SOURCE_CATEGORIES.COMMUNICATIONS,
+      SOURCE_CATEGORIES.PRODUCTIVITY,
+      SOURCE_CATEGORIES.MICROSOFT,
+    ],
+    serviceType: 'teams', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-teams-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
   {
     name: SOURCE_NAMES.ZENDESK,
     iconName: SOURCE_NAMES.ZENDESK,
@@ -618,6 +669,23 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
+  {
+    name: SOURCE_NAMES.ZOOM,
+    iconName: SOURCE_NAMES.ZOOM,
+    categories: [SOURCE_CATEGORIES.COMMUNICATIONS, SOURCE_CATEGORIES.PRODUCTIVITY],
+    serviceType: 'zoom', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-zoom-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
 ];
 
 export const staticCustomSourceData: SourceDataItem = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
index 6cb9ea6bc681b..ed65b83e6cf25 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
@@ -25,7 +25,7 @@ import {
   getContentSourcePath as sourcePath,
   getSourcesPath,
 } from '../../routes';
-import { NotFound } from '../../views/not_found';
+import { NotFound } from '../not_found';
 
 import { DisplaySettingsRouter } from './components/display_settings';
 import { Overview } from './components/overview';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts
index 37c79d26d9fce..0f113ad402f28 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts
@@ -322,7 +322,7 @@ describe('SourcesLogic', () => {
     it('availableSources & configuredSources have correct length', () => {
       SourcesLogic.actions.onInitializeSources(serverResponse);
 
-      expect(SourcesLogic.values.availableSources).toHaveLength(14);
+      expect(SourcesLogic.values.availableSources).toHaveLength(18);
       expect(SourcesLogic.values.configuredSources).toHaveLength(5);
     });
     it('externalConfigured is set to true if external is configured', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx
index c380c18b8c51b..0fa263beab539 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx
@@ -34,7 +34,7 @@ describe('SourcesRouter', () => {
   });
 
   it('renders sources routes', () => {
-    const TOTAL_ROUTES = 87;
+    const TOTAL_ROUTES = 103;
     const wrapper = shallow(<SourcesRouter />);
 
     expect(wrapper.find(Switch)).toHaveLength(1);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
index f3060db430071..2c3b49230e394 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorState } from './';
+import { ErrorState } from '.';
 
 describe('ErrorState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
index 83ac3a26c44e5..92fd7ac9650b3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { ErrorStatePrompt } from '../../../shared/error_state';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
index 0e388a73f0e18..b974e770dd906 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
@@ -13,7 +13,7 @@ import { NotFoundPrompt } from '../../../shared/not_found';
 import { SendWorkplaceSearchTelemetry } from '../../../shared/telemetry';
 import { WorkplaceSearchPageTemplate, PersonalDashboardLayout } from '../../components/layout';
 
-import { NotFound } from './';
+import { NotFound } from '.';
 
 describe('NotFound', () => {
   it('renders the shared not found prompt', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
index b3246171ee5a7..d14a2adea82b8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
@@ -118,13 +118,6 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
-    it('setRoleMappings', () => {
-      RoleMappingsLogic.actions.setRoleMappings({ roleMappings: [wsRoleMapping] });
-
-      expect(RoleMappingsLogic.values.roleMappings).toEqual([wsRoleMapping]);
-      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
-    });
-
     describe('setElasticsearchUser', () => {
       it('sets user', () => {
         RoleMappingsLogic.actions.setElasticsearchUser(elasticsearchUsers[0]);
@@ -283,7 +276,10 @@ describe('RoleMappingsLogic', () => {
   describe('listeners', () => {
     describe('enableRoleBasedAccess', () => {
       it('calls API and sets values', async () => {
-        const setRoleMappingsSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappings');
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
         RoleMappingsLogic.actions.enableRoleBasedAccess();
 
@@ -293,7 +289,7 @@ describe('RoleMappingsLogic', () => {
           '/internal/workplace_search/org/role_mappings/enable_role_based_access'
         );
         await nextTick();
-        expect(setRoleMappingsSpy).toHaveBeenCalledWith(mappingsServerProps);
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
       itShowsServerErrorAsFlashMessage(http.post, () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
index ea01d0049992f..010ae01ab1a71 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
@@ -46,9 +46,6 @@ interface RoleMappingsActions extends RoleMappingsBaseActions {
   setDefaultGroup(availableGroups: RoleGroup[]): { availableGroups: RoleGroup[] };
   setRoleMapping(roleMapping: WSRoleMapping): { roleMapping: WSRoleMapping };
   setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
-  setRoleMappings({ roleMappings }: { roleMappings: WSRoleMapping[] }): {
-    roleMappings: WSRoleMapping[];
-  };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
   handleAllGroupsSelectionChange(selected: boolean): { selected: boolean };
   handleGroupSelectionChange(groupIds: string[]): { groupIds: string[] };
@@ -322,10 +319,8 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const route = '/internal/workplace_search/org/role_mappings/enable_role_based_access';
 
       try {
-        const response = await http.post<{
-          roleMappings: WSRoleMapping[];
-        }>(route);
-        actions.setRoleMappings(response);
+        await http.post<{ roleMappings: WSRoleMapping[] }>(route);
+        actions.initializeRoleMappings();
       } catch (e) {
         flashAPIErrors(e);
       }
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
index 6b03e86080402..2d0c7e9e420b3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
@@ -12,7 +12,7 @@ import { shallow } from 'enzyme';
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SetupGuideLayout } from '../../../shared/setup_guide';
 
-import { SetupGuide } from './';
+import { SetupGuide } from '.';
 
 describe('SetupGuide', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/network_drive.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/network_drive.svg
new file mode 100644
index 0000000000000..cc07fbbc50877
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/network_drive.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#a)"><path d="m50.8142 23.5717h-4.2c4.143 8.1938 6.3015 17.2469 6.3015 26.4286 0 9.1816-2.1585 18.2347-6.3015 26.4285h4.5714c7.0093 0 13.7316-2.7844 18.6879-7.7407s7.7407-11.6785 7.7407-18.6878-2.7844-13.7315-7.7407-18.6879c-4.9563-4.9563-11.6786-7.7407-18.6879-7.7407zm-.8142-23.5857279c-6.6174-.0042253-13.1691 1.3119779-19.2715 3.8714579 5.3516 4.32083 9.9142 9.53597 13.4857 15.41427h8.0714l.0715.0857c7.7784.5043 15.0733 3.9498 20.4037 9.637s8.2968 13.1897 8.2968 20.9844-2.9664 15.2973-8.2968 20.9845-12.6253 9.1327-20.4037 9.6369l-.0715.1001h-8.0714c-3.5715 5.8782-8.1341 11.0935-13.4857 15.4143 6.8282 2.8556 14.2051 4.1594 21.5985 3.8181 7.3933-.3415 14.6186-2.3201 21.1544-5.7929 6.5358-3.4729 12.2191-8.3534 16.6398-14.2894 4.4206-5.936 7.4683-12.7794 8.9231-20.0362 1.4547-7.2568 1.2807-14.7461-.5104-21.9274-1.791-7.1813-5.1539-13.8753-9.846-19.5991s-10.5964-10.33458-17.2868-13.49953c-6.6903-3.16494-13.9999-4.8051405-21.4011-4.8021979zm-10.8714 19.2857279c-3.4579-5.1394-7.7617-9.65573-12.7287-13.35712-7.308 3.93332-13.5268 9.61712-18.09986 16.54282 4.21966-2.0886 8.86316-3.1785 13.57146-3.1857zm0 61.4286h-17.2571c-4.7102-.005-9.3553-1.1002-13.57146-3.2 4.57606 6.9408 10.80566 12.6353 18.12846 16.5714 4.9508-3.7106 9.2437-8.2257 12.7001-13.3571zm2.6428-4.2858c4.4971-8.0826 6.8574-17.1791 6.8574-26.4285 0-9.2495-2.3603-18.346-6.8574-26.4286h-19.8999c-6.6584-.0024-13.07027 2.5194-17.94297 7.0571-.04357.1274-.09606.2515-.15712.3715 1.44454-1.374 3.03486-2.586 4.74278-3.6143-1.70792 1.0283-3.29824 2.2403-4.74278 3.6143-5.02806 12.1627-5.02806 25.823 0 37.9857.06106.12.11355.244.15712.3714 4.87578 4.5328 11.28557 7.0539 17.94297 7.0571z" fill="#0060d5"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/outlook.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/outlook.svg
new file mode 100644
index 0000000000000..932a3756a522b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/outlook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="62" height="62" viewBox="19 19 62 62" fill="none"><g clip-path="url(#C)"><path d="M83.65 51.55a1.49 1.49 0 0 0-.71-1.279h-.008l-.028-.016-23.095-13.671a3.15 3.15 0 0 0-.31-.184 3.1 3.1 0 0 0-2.843 0 3.15 3.15 0 0 0-.31.184L33.252 50.256l-.028.016c-.706.439-.922 1.367-.483 2.073.129.208.308.381.519.505L56.355 66.52a3.48 3.48 0 0 0 .31.184 3.1 3.1 0 0 0 2.843 0 3.48 3.48 0 0 0 .31-.184l23.095-13.671c.461-.269.743-.765.738-1.299z" fill="#0a2767"/><path d="M35.944 42.422H51.1v13.893H35.944V42.422zM80.55 28.3v-6.355A2.88 2.88 0 0 0 77.74 19H38.41a2.88 2.88 0 0 0-2.81 2.945V28.3l23.25 6.2 21.7-6.2z" fill="#0364b8"/><path d="M35.6 28.3h15.5v13.95H35.6V28.3z" fill="#0078d4"/><path d="M66.6 28.3H51.1v13.95L66.6 56.2h13.95V42.25L66.6 28.3z" fill="#28a8ea"/><path d="M51.1 42.25h15.5V56.2H51.1V42.25z" fill="#0078d4"/><path d="M51.1 56.2h15.5v13.95H51.1V56.2z" fill="#0364b8"/><path d="M35.944 56.315H51.1v12.629H35.944V56.315z" fill="#14447d"/><path d="M66.6 56.2h13.95v13.95H66.6V56.2z" fill="#0078d4"/><path d="M82.94 52.764l-.029.016-23.095 12.989-.31.174a3.22 3.22 0 0 1-1.252.31l-1.262-.738c-.107-.053-.21-.113-.31-.178L33.277 51.978h-.011l-.766-.428v26.294A3.18 3.18 0 0 0 35.698 81h44.804c.026 0 .05-.012.078-.012a3.92 3.92 0 0 0 1.085-.226 3.13 3.13 0 0 0 .436-.226c.104-.059.282-.187.282-.187a3.13 3.13 0 0 0 1.268-2.503V51.55c-.001.503-.272.967-.71 1.214z" fill="url(#A)"/><path opacity=".5" d="M82.41 51.446v1.612L58.261 69.685 33.26 51.989c0-.009-.007-.016-.016-.016l-2.294-1.379v-1.163l.945-.015 2 1.147.046.016.17.109 23.56 13.438.899.527a4.29 4.29 0 0 1 .248-.093c.047-.031 23.328-13.128 23.328-13.128l.264.016z" fill="#0a2767"/><path d="M82.94 52.764l-.029.017L59.816 65.77l-.31.174a3.24 3.24 0 0 1-2.843 0 3.52 3.52 0 0 1-.31-.174L33.258 52.781l-.028-.017c-.446-.242-.725-.706-.73-1.214v26.294c.011 1.754 1.442 3.167 3.196 3.156h44.758c1.754.011 3.185-1.402 3.196-3.156V51.55c-.001.503-.272.967-.71 1.214z" fill="#1490df"/><g fill="#000"><path opacity=".1" d="M60.152 65.578l-.346.194a3.35 3.35 0 0 1-.31.175 3.21 3.21 0 0 1-1.218.322l8.787 10.391 15.328 3.694a3.16 3.16 0 0 0 .972-1.214L60.152 65.578z"/><path opacity=".05" d="M61.717 64.697l-1.911 1.074c-.1.064-.204.122-.31.175a3.21 3.21 0 0 1-1.218.322l4.117 11.351 20.003 2.73c.788-.592 1.252-1.519 1.252-2.505v-.339L61.717 64.697z"/></g><path d="M35.74 81h44.71c.688.004 1.359-.214 1.914-.62L56.99 65.517c-.107-.054-.21-.113-.31-.178L33.275 51.981h-.011l-.764-.431v26.204c-.002 1.791 1.449 3.244 3.239 3.246z" fill="#28a8ea"/><g fill="#000"><path opacity=".1" d="M54.2 34.241v33.061a2.85 2.85 0 0 1-1.783 2.635 2.67 2.67 0 0 1-1.054.217H32.5V32.95h3.1V31.4h15.764a2.85 2.85 0 0 1 2.837 2.841z"/><path opacity=".2" d="M52.65 35.791v33.061c.004.374-.075.745-.233 1.085-.43 1.061-1.459 1.757-2.604 1.762H32.5V32.95h17.313a2.6 2.6 0 0 1 1.287.326 2.82 2.82 0 0 1 1.55 2.516z"/><path opacity=".2" d="M52.65 35.791v29.962a2.86 2.86 0 0 1-2.837 2.847H32.5V32.95h17.313a2.6 2.6 0 0 1 1.287.326 2.82 2.82 0 0 1 1.55 2.516z"/><path opacity=".2" d="M51.1 35.791v29.961a2.85 2.85 0 0 1-2.837 2.847H32.5V32.95h15.764a2.84 2.84 0 0 1 2.837 2.84z"/></g><path d="M19.841 32.95h28.418a2.84 2.84 0 0 1 2.841 2.841v28.418a2.84 2.84 0 0 1-2.841 2.841H19.841A2.84 2.84 0 0 1 17 64.209V35.791a2.84 2.84 0 0 1 2.841-2.841z" fill="url(#B)"/><path d="M25.88 44.866c.7-1.492 1.831-2.741 3.246-3.585 1.567-.897 3.352-1.345 5.157-1.293 1.673-.036 3.324.388 4.773 1.226a8.19 8.19 0 0 1 3.157 3.425c.761 1.568 1.14 3.294 1.107 5.038a11.67 11.67 0 0 1-1.139 5.27c-.715 1.474-1.847 2.707-3.255 3.545-1.504.864-3.216 1.299-4.951 1.259a9.33 9.33 0 0 1-4.878-1.24c-1.374-.813-2.484-2.005-3.199-3.432-.765-1.546-1.149-3.252-1.119-4.977-.032-1.806.345-3.596 1.102-5.236zm3.46 8.417c.373.943 1.006 1.761 1.826 2.359a4.77 4.77 0 0 0 2.852.859c1.084.043 2.153-.268 3.044-.887a5.14 5.14 0 0 0 1.773-2.359 9.16 9.16 0 0 0 .566-3.291 10.02 10.02 0 0 0-.533-3.332 5.27 5.27 0 0 0-1.717-2.458c-.869-.648-1.935-.976-3.018-.93a4.92 4.92 0 0 0-2.919.867 5.41 5.41 0 0 0-1.86 2.379c-.846 2.186-.851 4.608-.012 6.797l-.002-.003z" fill="#fff"/><path d="M66.6 28.3h13.95v13.95H66.6V28.3z" fill="#50d9ff"/></g><defs><linearGradient id="A" x1="58.075" y1="51.55" x2="58.075" y2="81" gradientUnits="userSpaceOnUse"><stop stop-color="#35b8f1"/><stop offset="1" stop-color="#28a8ea"/></linearGradient><linearGradient id="B" x1="22.924" y1="30.73" x2="45.176" y2="69.27" gradientUnits="userSpaceOnUse"><stop stop-color="#1784d9"/><stop offset=".5" stop-color="#107ad5"/><stop offset="1" stop-color="#0a63c9"/></linearGradient><clipPath id="C"><path fill="#fff" transform="translate(17 19)" d="M0 0h66.65v62H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/teams.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/teams.svg
new file mode 100644
index 0000000000000..bf3aef9277eb6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/teams.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62" height="62" viewBox="19 19 62 62" fill="none"><g clip-path="url(#B)"><g fill="#5059c9"><path d="M62.246 42.628h16.015a2.74 2.74 0 0 1 2.74 2.74v14.587a10.07 10.07 0 0 1-10.068 10.069h-.048a10.07 10.07 0 0 1-10.07-10.067V44.06a1.43 1.43 0 0 1 1.432-1.432zm10.824-2.884a6.49 6.49 0 0 0 6.488-6.488 6.49 6.49 0 0 0-6.488-6.488 6.49 6.49 0 0 0-6.488 6.488 6.49 6.49 0 0 0 6.488 6.488z"/></g><g fill="#7b83eb"><path d="M52.884 39.744c5.176 0 9.372-4.196 9.372-9.372S58.06 21 52.884 21s-9.372 4.196-9.372 9.372 4.196 9.372 9.372 9.372zm12.496 2.884H38.945a2.71 2.71 0 0 0-2.643 2.773v16.638c-.209 8.972 6.889 16.417 15.86 16.636 8.971-.22 16.069-7.665 15.861-16.636V45.401a2.71 2.71 0 0 0-2.643-2.773z"/></g><g fill="#000"><path opacity=".1" d="M53.605 42.628v23.315c-.007 1.069-.655 2.03-1.644 2.437-.315.133-.653.202-.995.202H37.571l-.505-1.442c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h14.664z"/><path opacity=".2" d="M52.163 42.628v24.757c0 .342-.069.68-.202.995-.407.989-1.368 1.636-2.437 1.644H38.249l-.678-1.442a14.29 14.29 0 0 1-.505-1.442c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h13.222z"/><path opacity=".2" d="M52.163 42.628v21.873a2.66 2.66 0 0 1-2.639 2.639H37.067c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h13.222z"/><path opacity=".2" d="M50.721 42.628v21.873a2.66 2.66 0 0 1-2.639 2.639H37.067c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h11.78z"/><path opacity=".1" d="M53.605 35.174v4.542l-.721.029c-.245 0-.476-.014-.721-.029a7.91 7.91 0 0 1-1.442-.231 9.37 9.37 0 0 1-6.488-5.508c-.199-.465-.353-.948-.462-1.442h7.195a2.65 2.65 0 0 1 2.639 2.638z"/><use xlink:href="#C" opacity=".2"/><use xlink:href="#C" opacity=".2"/><path opacity=".2" d="M50.721 36.615v2.869a9.37 9.37 0 0 1-6.488-5.508h3.85a2.65 2.65 0 0 1 2.639 2.639z"/></g><path d="M21.643 33.977h26.435c1.46 0 2.643 1.183 2.643 2.643v26.435c0 1.46-1.183 2.643-2.643 2.643H21.643c-1.46 0-2.643-1.183-2.643-2.643V36.62c0-1.46 1.183-2.643 2.643-2.643z" fill="url(#A)"/><path d="M41.816 44.038h-5.284v14.39h-3.367v-14.39h-5.26v-2.791h13.911v2.791z" fill="#fff"/></g><defs><linearGradient id="A" x1="24.511" y1="31.911" x2="45.21" y2="67.763" gradientUnits="userSpaceOnUse"><stop stop-color="#5a62c3"/><stop offset=".5" stop-color="#4d55bd"/><stop offset="1" stop-color="#3940ab"/></linearGradient><clipPath id="B"><path fill="#fff" transform="translate(19 21)" d="M0 0h62v57.674H0z"/></clipPath><path id="C" d="M52.163 36.615v3.1a7.91 7.91 0 0 1-1.442-.231 9.37 9.37 0 0 1-6.489-5.508h5.292a2.65 2.65 0 0 1 2.639 2.639z"/></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/zoom.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/zoom.svg
new file mode 100644
index 0000000000000..d7498817bc62d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/zoom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="62" height="62" viewBox="19 19 62 62" fill="none"><path d="M19 39.46C19 28.16 28.16 19 39.46 19h21.08C71.84 19 81 28.16 81 39.46v21.08C81 71.84 71.84 81 60.54 81H39.46C28.16 81 19 71.84 19 60.54V39.46z" fill="url(#A)"/><path d="M32.764 42.56a2.23 2.23 0 0 1 2.232-2.232h16.678c3.287 0 5.952 2.665 5.952 5.952v11.16a2.23 2.23 0 0 1-2.232 2.232H38.716c-3.287 0-5.952-2.665-5.952-5.952V42.56zm26.164 4.981a3.75 3.75 0 0 1 1.348-2.876l4.163-3.454c1.581-1.312 2.859-.706 2.859 1.348v14.88c0 2.054-1.278 2.66-2.859 1.348l-4.163-3.454a3.75 3.75 0 0 1-1.348-2.876v-4.918z" fill="#fff"/><defs><linearGradient id="A" x1="50" y1="-49.26" x2="50" y2="148.862" gradientUnits="userSpaceOnUse"><stop stop-color="#57a2ff"/><stop offset="1" stop-color="#3c82fb"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/index.ts b/x-pack/plugins/enterprise_search/public/index.ts
index b7131e70fec07..b24616fc4b3d8 100644
--- a/x-pack/plugins/enterprise_search/public/index.ts
+++ b/x-pack/plugins/enterprise_search/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { EnterpriseSearchPlugin } from './plugin';
 
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 5331a7ed81e11..68bf6ca6f23b1 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { CloudSetup, CloudStart } from '@kbn/cloud-plugin/public';
 import {
   AppMountParameters,
   CoreStart,
@@ -13,16 +15,11 @@ import {
   Plugin,
   PluginInitializerContext,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/public';
-import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { CloudSetup, CloudStart } from '../../cloud/public';
-import { LicensingPluginStart } from '../../licensing/public';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/public';
+} from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/public';
 
 import {
   APP_SEARCH_PLUGIN,
@@ -37,6 +34,7 @@ import { docLinks } from './applications/shared/doc_links';
 export interface ClientConfigType {
   host?: string;
 }
+
 export interface ClientData extends InitialAppData {
   publicUrl?: string;
   errorConnectingMessage?: string;
@@ -47,6 +45,7 @@ interface PluginsSetup {
   home?: HomePublicPluginSetup;
   security: SecurityPluginSetup;
 }
+
 export interface PluginsStart {
   cloud?: CloudSetup & CloudStart;
   licensing: LicensingPluginStart;
@@ -174,7 +173,7 @@ export class EnterpriseSearchPlugin implements Plugin {
         icon: 'appSearchApp',
         description: APP_SEARCH_PLUGIN.DESCRIPTION,
         path: APP_SEARCH_PLUGIN.URL,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         showOnHomePage: false,
       });
 
@@ -184,7 +183,7 @@ export class EnterpriseSearchPlugin implements Plugin {
         icon: 'workplaceSearchApp',
         description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION,
         path: WORKPLACE_SEARCH_PLUGIN.URL,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         showOnHomePage: false,
       });
     }
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
index 43a08aa90ce6f..b7048256790cb 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
@@ -10,8 +10,8 @@ import {
   KibanaRequest,
   RequestHandlerContext,
   RouteValidatorConfig,
-} from 'src/core/server';
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 /**
  * Test helper that mocks Kibana's router and DRYs out various helper (callRoute, schema validation)
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
index 1bd47c94a84b7..af11762f117d1 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 export const mockLogger = loggingSystemMock.createLogger().get();
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
index 4dca6ed58e0c5..cbec4ea374c7e 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
@@ -7,8 +7,8 @@
 
 import { get } from 'lodash';
 
-import { SavedObjectsServiceStart, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceStart, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { getSavedObjectAttributesFromRepo } from '../lib/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts
index f71c8a5444c9c..0e4140b90eaf7 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts
@@ -7,8 +7,8 @@
 
 import { get } from 'lodash';
 
-import { SavedObjectsServiceStart, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceStart, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { getSavedObjectAttributesFromRepo } from '../lib/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
index 5e12a5a13ba00..0914e84404365 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
@@ -7,12 +7,12 @@
 
 import { mockLogger } from '../../__mocks__';
 
-jest.mock('../../../../../../src/core/server', () => ({
+jest.mock('@kbn/core/server', () => ({
   SavedObjectsErrorHelpers: {
     isNotFoundError: jest.fn(),
   },
 }));
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 import { getSavedObjectAttributesFromRepo, incrementUICounter } from './telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts
index cc850017a4e5e..37c2c2a5c7154 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts
@@ -10,10 +10,10 @@ import {
   SavedObjectsServiceStart,
   SavedObjectAttributes,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 // This throws `Error: Cannot find module 'src/core/server'` if I import it via alias ¯\_(ツ)_/¯
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 /**
  * Fetches saved objects attributes - used by collectors
diff --git a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
index e36ce94066789..1d28f895d8489 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
@@ -7,8 +7,8 @@
 
 import { get } from 'lodash';
 
-import { SavedObjectsServiceStart, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceStart, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { getSavedObjectAttributesFromRepo } from '../lib/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/index.ts b/x-pack/plugins/enterprise_search/server/index.ts
index f332f425ecdcf..1a1951348f106 100644
--- a/x-pack/plugins/enterprise_search/server/index.ts
+++ b/x-pack/plugins/enterprise_search/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 
 import { EnterpriseSearchPlugin } from './plugin';
 
diff --git a/x-pack/plugins/enterprise_search/server/integrations.ts b/x-pack/plugins/enterprise_search/server/integrations.ts
index ebe98d4e805ac..d2d3b5d4d6829 100644
--- a/x-pack/plugins/enterprise_search/server/integrations.ts
+++ b/x-pack/plugins/enterprise_search/server/integrations.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { i18n } from '@kbn/i18n';
-import type { HttpServiceSetup } from 'src/core/server';
+import type { HttpServiceSetup } from '@kbn/core/server';
 
-import type { IntegrationCategory } from '../../../../src/plugins/custom_integrations/common';
-import type { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
+import type { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { i18n } from '@kbn/i18n';
 
 interface WorkplaceSearchIntegration {
   id: string;
@@ -162,6 +162,21 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
     ),
     categories: ['productivity'],
   },
+  {
+    id: 'network_drive',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.networkDriveName', {
+      defaultMessage: 'Network Drive',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.networkDriveDescription',
+      {
+        defaultMessage:
+          'Search over your files and folders stored on network drives with Enterprise Search.',
+      }
+    ),
+    categories: ['enterprise_search', 'file_storage'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/network_drive',
+  },
   {
     id: 'onedrive',
     title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.onedriveName', {
@@ -176,6 +191,20 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
     categories: ['file_storage'],
     uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/one_drive',
   },
+  {
+    id: 'outlook',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.outlookName', {
+      defaultMessage: 'Outlook',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.outlookDescription',
+      {
+        defaultMessage: 'Search over your email and calendars with Enterprise Search.',
+      }
+    ),
+    categories: ['enterprise_search', 'microsoft_365', 'communications', 'productivity'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/outlook',
+  },
   {
     id: 'salesforce',
     title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName', {
@@ -266,6 +295,21 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
     ),
     categories: ['communications'],
   },
+  {
+    id: 'teams',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.teamsName', {
+      defaultMessage: 'Teams',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.teamsDescription',
+      {
+        defaultMessage:
+          'Search over meeting recordings, chats and other communications with Enterprise Search.',
+      }
+    ),
+    categories: ['enterprise_search', 'microsoft_365', 'communications', 'productivity'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/teams',
+  },
   {
     id: 'zendesk',
     title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.zendeskName', {
@@ -279,6 +323,21 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
     ),
     categories: ['communications'],
   },
+  {
+    id: 'zoom',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.zoomName', {
+      defaultMessage: 'Zoom',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.zoomDescription',
+      {
+        defaultMessage:
+          'Search over meeting recordings, chats and other communications with Enterprise Search.',
+      }
+    ),
+    categories: ['enterprise_search', 'communications', 'productivity'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/zoom',
+  },
   {
     id: 'custom_api_source',
     title: i18n.translate(
diff --git a/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts b/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts
index 9d62c0794651e..28d9fe363ff0f 100644
--- a/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { spacesMock } from '../../../spaces/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
 import { checkAccess } from './check_access';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/check_access.ts b/x-pack/plugins/enterprise_search/server/lib/check_access.ts
index d933b9ac41412..a77415f2c2f12 100644
--- a/x-pack/plugins/enterprise_search/server/lib/check_access.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/check_access.ts
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'src/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 
-import { SecurityPluginSetup } from '../../../security/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+
+import { ConfigType } from '..';
 import { ProductAccess } from '../../common/types';
-import { ConfigType } from '../index';
 
 import { callEnterpriseSearchConfigAPI } from './enterprise_search_config_api';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
index f6e3280a8abb2..5f8b261f82f16 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../common/__mocks__';
-import '../__mocks__/http_agent.mock.ts';
+import '../__mocks__/http_agent.mock';
 
 jest.mock('node-fetch');
 import fetch from 'node-fetch';
@@ -17,7 +17,7 @@ jest.mock('@kbn/utils', () => ({
   kibanaPackageJson: { version: '1.0.0' },
 }));
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import {
   callEnterpriseSearchConfigAPI,
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
index a427beb6769c9..7e27480426525 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
@@ -8,14 +8,13 @@
 import AbortController from 'abort-controller';
 import fetch from 'node-fetch';
 
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import { kibanaPackageJson } from '@kbn/utils';
 
-import { KibanaRequest, Logger } from 'src/core/server';
-
+import { ConfigType } from '..';
 import { isVersionMismatch } from '../../common/is_version_mismatch';
 import { stripTrailingSlash } from '../../common/strip_slashes';
 import { InitialAppData } from '../../common/types';
-import { ConfigType } from '../index';
 
 import { entSearchHttpAgent } from './enterprise_search_http_agent';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
index f4bdfd8d2cb0f..c8a7ba93c456c 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
@@ -11,7 +11,7 @@ import { readFileSync } from 'fs';
 import http from 'http';
 import https from 'https';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 import { entSearchHttpAgent } from './enterprise_search_http_agent';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
index b117918311120..68c605e24c3a6 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
@@ -10,7 +10,7 @@ import http from 'http';
 import https from 'https';
 import { PeerCertificate } from 'tls';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 export type HttpAgent = http.Agent | https.Agent;
 interface AgentOptions {
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
index 8b3b7d04115ec..0f2c33519ca9f 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
@@ -14,9 +14,9 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 import {
   ENTERPRISE_SEARCH_KIBANA_COOKIE,
diff --git a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts
index 6bf95487a0022..6365e89fb9184 100644
--- a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-
 import { ByteSizeValue } from '@kbn/config-schema';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { fetchIndices } from './fetch_indices';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts
index b355df2c56843..ac811ba9ed4f7 100644
--- a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-
 import { ByteSizeValue } from '@kbn/config-schema';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { ElasticsearchIndex } from '../../common/types';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts b/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
index 554fe127b4353..8f602d163c297 100644
--- a/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
+import { schema } from '@kbn/config-schema';
 import {
   DestructiveRouteMethod,
   RouteConfig,
   RouteConfigOptions,
   RouteMethod,
   RouteValidatorFullConfig,
-} from 'kibana/server';
-
-import { schema } from '@kbn/config-schema';
+} from '@kbn/core/server';
 
 type Config<Method extends DestructiveRouteMethod> = RouteConfig<unknown, unknown, unknown, Method>;
 
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index ef75cc680d2f6..0389faa25f4f8 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -14,13 +14,13 @@ import {
   IRouter,
   KibanaRequest,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { InfraPluginSetup } from '../../infra/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/core/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { InfraPluginSetup } from '@kbn/infra-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import {
   ENTERPRISE_SEARCH_OVERVIEW_PLUGIN,
@@ -53,7 +53,7 @@ import { appSearchTelemetryType } from './saved_objects/app_search/telemetry';
 import { enterpriseSearchTelemetryType } from './saved_objects/enterprise_search/telemetry';
 import { workplaceSearchTelemetryType } from './saved_objects/workplace_search/telemetry';
 
-import { ConfigType } from './';
+import { ConfigType } from '.';
 
 interface PluginsSetup {
   usageCollection?: UsageCollectionSetup;
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts
index 18e4366ce496e..61249f79ff44b 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts
@@ -7,7 +7,7 @@
 
 import { mockDependencies, MockRouter } from '../../__mocks__';
 
-import { registerAppSearchRoutes } from './';
+import { registerAppSearchRoutes } from '.';
 
 describe('registerAppSearchRoutes', () => {
   it('runs without errors', () => {
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/indices.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/indices.ts
index 28359bc90052f..65868e4d17935 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/indices.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/indices.ts
@@ -12,7 +12,7 @@ export function registerListRoute({ router }: RouteDependencies) {
   router.get(
     { path: '/internal/enterprise_search/indices', validate: false },
     async (context, _, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       try {
         const indices = await fetchIndices(client);
         return response.ok({
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
index d8c38204f75a9..01cf70cdd3945 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
@@ -7,7 +7,7 @@
 
 import { MockRouter, mockLogger, mockDependencies } from '../../__mocks__';
 
-import { savedObjectsServiceMock } from 'src/core/server/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../collectors/lib/telemetry', () => ({
   incrementUICounter: jest.fn(),
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts
index 833cc805093f2..65cacd69b29a7 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts
@@ -7,7 +7,7 @@
 
 import { mockDependencies, MockRouter } from '../../__mocks__';
 
-import { registerWorkplaceSearchRoutes } from './';
+import { registerWorkplaceSearchRoutes } from '.';
 
 describe('registerWorkplaceSearchRoutes', () => {
   it('runs without errors', () => {
diff --git a/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts
index ab873b6678885..63b90ceb9520b 100644
--- a/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts
@@ -7,7 +7,7 @@
 
 /* istanbul ignore file */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { AS_TELEMETRY_NAME } from '../../collectors/app_search/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts
index e2edff1b6a213..cd7ce03738a71 100644
--- a/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts
@@ -7,7 +7,7 @@
 
 /* istanbul ignore file */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { ES_TELEMETRY_NAME } from '../../collectors/enterprise_search/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts
index af4d5908dec67..3020b85493264 100644
--- a/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts
@@ -7,7 +7,7 @@
 
 /* istanbul ignore file */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { WS_TELEMETRY_NAME } from '../../collectors/workplace_search/telemetry';
 
diff --git a/x-pack/plugins/event_log/generated/mappings.json b/x-pack/plugins/event_log/generated/mappings.json
index f030f0d50b5e7..982699274e1e3 100644
--- a/x-pack/plugins/event_log/generated/mappings.json
+++ b/x-pack/plugins/event_log/generated/mappings.json
@@ -296,7 +296,7 @@
                                                 "number_of_triggered_actions": {
                                                     "type": "long"
                                                 },
-                                                "number_of_scheduled_actions": {
+                                                "number_of_generated_actions": {
                                                     "type": "long"
                                                 },
                                                 "number_of_searches": {
@@ -364,4 +364,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/event_log/generated/schemas.ts b/x-pack/plugins/event_log/generated/schemas.ts
index 817c545b45c56..e030a0ce1e99c 100644
--- a/x-pack/plugins/event_log/generated/schemas.ts
+++ b/x-pack/plugins/event_log/generated/schemas.ts
@@ -130,7 +130,7 @@ export const EventSchema = schema.maybe(
                     metrics: schema.maybe(
                       schema.object({
                         number_of_triggered_actions: ecsNumber(),
-                        number_of_scheduled_actions: ecsNumber(),
+                        number_of_generated_actions: ecsNumber(),
                         number_of_searches: ecsNumber(),
                         total_indexing_duration_ms: ecsNumber(),
                         es_search_duration_ms: ecsNumber(),
diff --git a/x-pack/plugins/event_log/scripts/mappings.js b/x-pack/plugins/event_log/scripts/mappings.js
index bf3f9c6b88009..b4bb17eba42a1 100644
--- a/x-pack/plugins/event_log/scripts/mappings.js
+++ b/x-pack/plugins/event_log/scripts/mappings.js
@@ -78,7 +78,7 @@ exports.EcsCustomPropertyMappings = {
                       number_of_triggered_actions: {
                         type: 'long',
                       },
-                      number_of_scheduled_actions: {
+                      number_of_generated_actions: {
                         type: 'long',
                       },
                       number_of_searches: {
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index 56a708ef51b67..ed740a27b81e4 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   ClusterClientAdapter,
   IClusterClientAdapter,
@@ -44,7 +44,7 @@ describe('indexDocument', () => {
     });
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
-      body: [{ create: { _index: 'event-log' } }, { message: 'foo' }],
+      body: [{ create: { _index: 'event-log', require_alias: true } }, { message: 'foo' }],
     });
   });
 
@@ -55,7 +55,7 @@ describe('indexDocument', () => {
       return logger.error.mock.calls.length !== 0;
     });
 
-    const expectedMessage = `error writing bulk events: "expected failure"; docs: [{"create":{"_index":"event-log"}},{"message":"foo"}]`;
+    const expectedMessage = `error writing bulk events: "expected failure"; docs: [{"create":{"_index":"event-log","require_alias":true}},{"message":"foo"}]`;
     expect(logger.error).toHaveBeenCalledWith(expectedMessage);
   });
 });
@@ -92,7 +92,10 @@ describe('buffering documents', () => {
 
     const expectedBody = [];
     for (let i = 0; i < EVENT_BUFFER_LENGTH - 1; i++) {
-      expectedBody.push({ create: { _index: 'event-log' } }, { message: `foo ${i}` });
+      expectedBody.push(
+        { create: { _index: 'event-log', require_alias: true } },
+        { message: `foo ${i}` }
+      );
     }
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
@@ -112,7 +115,10 @@ describe('buffering documents', () => {
 
     const expectedBody = [];
     for (let i = 0; i < EVENT_BUFFER_LENGTH; i++) {
-      expectedBody.push({ create: { _index: 'event-log' } }, { message: `foo ${i}` });
+      expectedBody.push(
+        { create: { _index: 'event-log', require_alias: true } },
+        { message: `foo ${i}` }
+      );
     }
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(1, {
@@ -120,7 +126,7 @@ describe('buffering documents', () => {
     });
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(2, {
-      body: [{ create: { _index: 'event-log' } }, { message: `foo 100` }],
+      body: [{ create: { _index: 'event-log', require_alias: true } }, { message: `foo 100` }],
     });
   });
 
@@ -146,7 +152,7 @@ describe('buffering documents', () => {
       const expectedBody = [];
       for (let j = 0; j < EVENT_BUFFER_LENGTH; j++) {
         expectedBody.push(
-          { create: { _index: 'event-log' } },
+          { create: { _index: 'event-log', require_alias: true } },
           { message: `foo ${i * EVENT_BUFFER_LENGTH + j}` }
         );
       }
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 502e48795f0cc..a3ea88cfb526b 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -9,7 +9,7 @@ import { Subject } from 'rxjs';
 import { bufferTime, filter as rxFilter, switchMap } from 'rxjs/operators';
 import { reject, isUndefined, isNumber, pick } from 'lodash';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { Logger, ElasticsearchClient } from 'src/core/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 import util from 'util';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
@@ -123,7 +123,7 @@ export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string }
     for (const doc of docs) {
       if (doc.body === undefined) continue;
 
-      bulkBody.push({ create: { _index: doc.index } });
+      bulkBody.push({ create: { _index: doc.index, require_alias: true } });
       bulkBody.push(doc.body);
     }
 
diff --git a/x-pack/plugins/event_log/server/es/context.mock.ts b/x-pack/plugins/event_log/server/es/context.mock.ts
index ababa4f9a75f7..e0c3e34f84431 100644
--- a/x-pack/plugins/event_log/server/es/context.mock.ts
+++ b/x-pack/plugins/event_log/server/es/context.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { EsContext } from './context';
 import { namesMock } from './names.mock';
diff --git a/x-pack/plugins/event_log/server/es/context.test.ts b/x-pack/plugins/event_log/server/es/context.test.ts
index f6b4178ce7f11..dd985ec80b3fc 100644
--- a/x-pack/plugins/event_log/server/es/context.test.ts
+++ b/x-pack/plugins/event_log/server/es/context.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { createEsContext } from './context';
-import { Logger } from '../../../../../src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../lib/../../../../package.json', () => ({ version: '1.2.3' }));
 jest.mock('./init');
diff --git a/x-pack/plugins/event_log/server/es/context.ts b/x-pack/plugins/event_log/server/es/context.ts
index f6ae0a2002dd4..2cb7a89a0c429 100644
--- a/x-pack/plugins/event_log/server/es/context.ts
+++ b/x-pack/plugins/event_log/server/es/context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, ElasticsearchClient } from 'src/core/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 
 import { EsNames, getEsNames } from './names';
 import { initializeEs } from './init';
diff --git a/x-pack/plugins/event_log/server/event_log_client.test.ts b/x-pack/plugins/event_log/server/event_log_client.test.ts
index 9ee75dd97ed19..a0d086ceaece4 100644
--- a/x-pack/plugins/event_log/server/event_log_client.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { EventLogClient } from './event_log_client';
 import { EsContext } from './es';
 import { contextMock } from './es/context.mock';
diff --git a/x-pack/plugins/event_log/server/event_log_client.ts b/x-pack/plugins/event_log/server/event_log_client.ts
index c832ab9056be1..9e4d579c54fc1 100644
--- a/x-pack/plugins/event_log/server/event_log_client.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.ts
@@ -8,9 +8,9 @@
 import { omit } from 'lodash';
 import { Observable } from 'rxjs';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { IClusterClient, KibanaRequest } from 'src/core/server';
+import { IClusterClient, KibanaRequest } from '@kbn/core/server';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { SpacesServiceStart } from '../../spaces/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 import { EsContext } from './es';
 import { IEventLogClient } from './types';
diff --git a/x-pack/plugins/event_log/server/event_log_service.test.ts b/x-pack/plugins/event_log/server/event_log_service.test.ts
index aad51a03b2f06..4f6b53c6cca0e 100644
--- a/x-pack/plugins/event_log/server/event_log_service.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.test.ts
@@ -8,7 +8,7 @@
 import { IEventLogConfig } from './types';
 import { EventLogService } from './event_log_service';
 import { contextMock } from './es/context.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { savedObjectProviderRegistryMock } from './saved_object_provider_registry.mock';
 
 const loggingService = loggingSystemMock.create();
diff --git a/x-pack/plugins/event_log/server/event_log_service.ts b/x-pack/plugins/event_log/server/event_log_service.ts
index 5611a70563358..0a9319db9cd50 100644
--- a/x-pack/plugins/event_log/server/event_log_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { IClusterClient, PluginInitializerContext } from 'src/core/server';
+import { IClusterClient, PluginInitializerContext } from '@kbn/core/server';
 
 import { Plugin } from './plugin';
 import { EsContext } from './es';
diff --git a/x-pack/plugins/event_log/server/event_log_start_service.test.ts b/x-pack/plugins/event_log/server/event_log_start_service.test.ts
index 1534623100f5d..6d647af4e9450 100644
--- a/x-pack/plugins/event_log/server/event_log_start_service.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_start_service.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { EventLogClientService } from './event_log_start_service';
 import { contextMock } from './es/context.mock';
diff --git a/x-pack/plugins/event_log/server/event_log_start_service.ts b/x-pack/plugins/event_log/server/event_log_start_service.ts
index 65e01b85b2883..94962c59f4dfc 100644
--- a/x-pack/plugins/event_log/server/event_log_start_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_start_service.ts
@@ -6,8 +6,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { IClusterClient, KibanaRequest } from 'src/core/server';
-import { SpacesServiceStart } from '../../spaces/server';
+import { IClusterClient, KibanaRequest } from '@kbn/core/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 import { EsContext } from './es';
 import { IEventLogClientService } from './types';
diff --git a/x-pack/plugins/event_log/server/event_logger.test.ts b/x-pack/plugins/event_log/server/event_logger.test.ts
index 43d791a18b5fc..636e377ed6636 100644
--- a/x-pack/plugins/event_log/server/event_logger.test.ts
+++ b/x-pack/plugins/event_log/server/event_logger.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IEvent, IEventLogger, IEventLogService } from './index';
+import { IEvent, IEventLogger, IEventLogService } from '.';
 import { ECS_VERSION } from './types';
 import { EventLogService } from './event_log_service';
 import { EsContext } from './es/context';
 import { contextMock } from './es/context.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { delay } from './lib/delay';
 import { EVENT_LOGGED_PREFIX } from './event_logger';
 import { savedObjectProviderRegistryMock } from './saved_object_provider_registry.mock';
diff --git a/x-pack/plugins/event_log/server/event_logger.ts b/x-pack/plugins/event_log/server/event_logger.ts
index 97335f9cda8d1..89d0cbc9ab94d 100644
--- a/x-pack/plugins/event_log/server/event_logger.ts
+++ b/x-pack/plugins/event_log/server/event_logger.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { merge } from 'lodash';
 
 import { coerce } from 'semver';
diff --git a/x-pack/plugins/event_log/server/index.ts b/x-pack/plugins/event_log/server/index.ts
index 42fc2e9792014..c69d7780a6204 100644
--- a/x-pack/plugins/event_log/server/index.ts
+++ b/x-pack/plugins/event_log/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { ConfigSchema, IEventLogConfig } from './types';
 import { Plugin } from './plugin';
 
diff --git a/x-pack/plugins/event_log/server/plugin.test.ts b/x-pack/plugins/event_log/server/plugin.test.ts
index fa66d4b0b02b3..fcfd921557645 100644
--- a/x-pack/plugins/event_log/server/plugin.test.ts
+++ b/x-pack/plugins/event_log/server/plugin.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { IEventLogService } from './index';
+import { CoreSetup, CoreStart } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { IEventLogService } from '.';
 import { Plugin } from './plugin';
-import { spacesMock } from '../../spaces/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
 describe('event_log plugin', () => {
   it('can setup and start', () => {
diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
index 83bd8582636dd..98ddd770ac962 100644
--- a/x-pack/plugins/event_log/server/plugin.ts
+++ b/x-pack/plugins/event_log/server/plugin.ts
@@ -13,8 +13,8 @@ import {
   PluginInitializerContext,
   IClusterClient,
   IContextProvider,
-} from 'src/core/server';
-import { SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/core/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 import type {
   EventLogRequestHandlerContext,
diff --git a/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
index 3cd8e5eaae2ba..78c0917929c7a 100644
--- a/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
@@ -6,10 +6,10 @@
  */
 
 import { identity, merge } from 'lodash';
-import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from 'src/core/server';
+import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import type { MethodKeysOf } from '@kbn/utility-types';
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { IEventLogClient } from '../types';
 
 export function mockHandlerArguments(
diff --git a/x-pack/plugins/event_log/server/routes/find.test.ts b/x-pack/plugins/event_log/server/routes/find.test.ts
index c51c8f3adf1e5..ee7985d34d249 100644
--- a/x-pack/plugins/event_log/server/routes/find.test.ts
+++ b/x-pack/plugins/event_log/server/routes/find.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { findRoute } from './find';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { mockHandlerArguments, fakeEvent } from './_mock_handler_arguments';
 import { eventLogClientMock } from '../event_log_client.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 const eventLogClient = eventLogClientMock.create();
 const systemLogger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/event_log/server/routes/find.ts b/x-pack/plugins/event_log/server/routes/find.ts
index fdb699b70e26c..4c9ab70bbe3a5 100644
--- a/x-pack/plugins/event_log/server/routes/find.ts
+++ b/x-pack/plugins/event_log/server/routes/find.ts
@@ -11,7 +11,7 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { EventLogRouter, EventLogRequestHandlerContext } from '../types';
 import { BASE_EVENT_LOG_API_PATH } from '../../common';
 import { queryOptionsSchema, FindOptionsType } from '../event_log_client';
@@ -38,7 +38,7 @@ export const findRoute = (router: EventLogRouter, systemLogger: Logger) => {
       if (!context.eventLog) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for eventLog' });
       }
-      const eventLogClient = context.eventLog.getEventLogClient();
+      const eventLogClient = (await context.eventLog).getEventLogClient();
       const {
         params: { id, type },
         query,
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
index 065174abcd9fd..81172f2119410 100644
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
+++ b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { mockHandlerArguments, fakeEvent } from './_mock_handler_arguments';
 import { eventLogClientMock } from '../event_log_client.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { findByIdsRoute } from './find_by_ids';
 
 const eventLogClient = eventLogClientMock.create();
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
index 324dbc7f568ba..a33a03c8242c4 100644
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.ts
+++ b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
@@ -11,7 +11,7 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { EventLogRouter, EventLogRequestHandlerContext } from '../types';
 
 import { BASE_EVENT_LOG_API_PATH } from '../../common';
@@ -44,7 +44,7 @@ export const findByIdsRoute = (router: EventLogRouter, systemLogger: Logger) =>
       if (!context.eventLog) {
         return res.badRequest({ body: 'RouteHandlerContext is not registered for eventLog' });
       }
-      const eventLogClient = context.eventLog.getEventLogClient();
+      const eventLogClient = (await context.eventLog).getEventLogClient();
       const {
         params: { type },
         body: { ids, legacyIds },
diff --git a/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts b/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts
index d3b4ec4648b9f..7ae2c5e577811 100644
--- a/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts
+++ b/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts
@@ -7,8 +7,8 @@
 
 import { SavedObjectProviderRegistry } from './saved_object_provider_registry';
 import uuid from 'uuid';
-import { KibanaRequest } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 describe('SavedObjectProviderRegistry', () => {
   beforeEach(() => jest.resetAllMocks());
diff --git a/x-pack/plugins/event_log/server/saved_object_provider_registry.ts b/x-pack/plugins/event_log/server/saved_object_provider_registry.ts
index 916757859e6df..8ad1079e95941 100644
--- a/x-pack/plugins/event_log/server/saved_object_provider_registry.ts
+++ b/x-pack/plugins/event_log/server/saved_object_provider_registry.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, SavedObjectsClientContract } from 'src/core/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { fromNullable, getOrElse } from 'fp-ts/lib/Option';
 import { pipe } from 'fp-ts/lib/pipeable';
diff --git a/x-pack/plugins/event_log/server/types.ts b/x-pack/plugins/event_log/server/types.ts
index 34aa67f313ee3..1336245741bd6 100644
--- a/x-pack/plugins/event_log/server/types.ts
+++ b/x-pack/plugins/event_log/server/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import type { IRouter, KibanaRequest, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, KibanaRequest, CustomRequestHandlerContext } from '@kbn/core/server';
 
 export type { IEvent, IValidatedEvent } from '../generated/schemas';
 export { EventSchema, ECS_VERSION } from '../generated/schemas';
@@ -16,6 +16,7 @@ import {
   AggregateEventsBySavedObjectResult,
   QueryEventsBySavedObjectResult,
 } from './es/cluster_client_adapter';
+
 export type {
   QueryEventsBySavedObjectResult,
   AggregateEventsBySavedObjectResult,
@@ -79,9 +80,9 @@ export interface EventLogApiRequestHandlerContext {
 /**
  * @internal
  */
-export interface EventLogRequestHandlerContext extends RequestHandlerContext {
+export type EventLogRequestHandlerContext = CustomRequestHandlerContext<{
   eventLog: EventLogApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/features/common/kibana_feature.ts b/x-pack/plugins/features/common/kibana_feature.ts
index 089389c7bc7fa..2989872d024c9 100644
--- a/x-pack/plugins/features/common/kibana_feature.ts
+++ b/x-pack/plugins/features/common/kibana_feature.ts
@@ -6,8 +6,8 @@
  */
 
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { AppCategory } from 'src/core/types';
-import { LicenseType } from '../../licensing/common/types';
+import { AppCategory } from '@kbn/core/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { FeatureKibanaPrivileges } from './feature_kibana_privileges';
 import { SubFeatureConfig, SubFeature as KibanaSubFeature } from './sub_feature';
 import { ReservedKibanaPrivilege } from './reserved_kibana_privilege';
diff --git a/x-pack/plugins/features/common/sub_feature.ts b/x-pack/plugins/features/common/sub_feature.ts
index eb1c2531c84b6..2795e50bce473 100644
--- a/x-pack/plugins/features/common/sub_feature.ts
+++ b/x-pack/plugins/features/common/sub_feature.ts
@@ -6,7 +6,7 @@
  */
 
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { FeatureKibanaPrivileges } from './feature_kibana_privileges';
 
 /**
diff --git a/x-pack/plugins/features/public/features_api_client.test.ts b/x-pack/plugins/features/public/features_api_client.test.ts
index 0a9488c11d496..e40cb75baed4f 100644
--- a/x-pack/plugins/features/public/features_api_client.test.ts
+++ b/x-pack/plugins/features/public/features_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { FeaturesAPIClient } from './features_api_client';
 
 describe('Features API Client', () => {
diff --git a/x-pack/plugins/features/public/features_api_client.ts b/x-pack/plugins/features/public/features_api_client.ts
index 161d88c51dfab..59616588db869 100644
--- a/x-pack/plugins/features/public/features_api_client.ts
+++ b/x-pack/plugins/features/public/features_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { KibanaFeatureConfig, KibanaFeature } from '.';
 
 export class FeaturesAPIClient {
diff --git a/x-pack/plugins/features/public/index.ts b/x-pack/plugins/features/public/index.ts
index 2895d83ed114e..c5100722795bc 100644
--- a/x-pack/plugins/features/public/index.ts
+++ b/x-pack/plugins/features/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { FeaturesPlugin, FeaturesPluginSetup, FeaturesPluginStart } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/features/public/plugin.test.ts b/x-pack/plugins/features/public/plugin.test.ts
index 7a6f9d02e7a41..7087e483f0ec1 100644
--- a/x-pack/plugins/features/public/plugin.test.ts
+++ b/x-pack/plugins/features/public/plugin.test.ts
@@ -7,7 +7,7 @@
 
 import { FeaturesPlugin } from './plugin';
 
-import { coreMock, httpServiceMock } from 'src/core/public/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('./features_api_client', () => {
   const instance = {
diff --git a/x-pack/plugins/features/public/plugin.ts b/x-pack/plugins/features/public/plugin.ts
index 136e73b9dafd2..81c3f566bea18 100644
--- a/x-pack/plugins/features/public/plugin.ts
+++ b/x-pack/plugins/features/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'src/core/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 import { FeaturesAPIClient } from './features_api_client';
 
 export class FeaturesPlugin implements Plugin<FeaturesPluginSetup, FeaturesPluginStart> {
diff --git a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts
index d7ba5f05e691b..c77df4b5b0f74 100644
--- a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts
+++ b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { LicenseType } from '../../../licensing/common/types';
-import { LICENSE_TYPE } from '../../../licensing/server';
-import { KibanaFeature } from '../';
+import type { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/server';
+import { KibanaFeature } from '..';
 import { SubFeaturePrivilegeConfig } from '../../common';
 import type { FeaturePrivilegeIteratorOptions } from './feature_privilege_iterator';
 import { featurePrivilegeIterator } from './feature_privilege_iterator';
diff --git a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts
index 86a232ca68d2f..533e526f53b37 100644
--- a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts
+++ b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts
@@ -7,8 +7,8 @@
 
 import _ from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../';
-import type { LicenseType } from '../../../licensing/server';
+import type { LicenseType } from '@kbn/licensing-plugin/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '..';
 import { subFeaturePrivilegeIterator } from './sub_feature_privilege_iterator';
 
 /**
diff --git a/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts b/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts
index 8dffd553bfe14..8bebd64bf58bd 100644
--- a/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts
+++ b/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { LicenseType } from '@kbn/licensing-plugin/server';
 import type { KibanaFeature, SubFeaturePrivilegeConfig } from '../../common';
-import type { LicenseType } from '../../../licensing/server';
 
 /**
  * Utility for iterating through all sub-feature privileges belonging to a specific feature.
diff --git a/x-pack/plugins/features/server/feature_registry.test.ts b/x-pack/plugins/features/server/feature_registry.test.ts
index 984d76a17d159..b8f96ad517882 100644
--- a/x-pack/plugins/features/server/feature_registry.test.ts
+++ b/x-pack/plugins/features/server/feature_registry.test.ts
@@ -7,7 +7,7 @@
 
 import { FeatureRegistry } from './feature_registry';
 import { ElasticsearchFeatureConfig, KibanaFeatureConfig } from '../common';
-import { licensingMock } from '../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 describe('FeatureRegistry', () => {
   describe('Kibana Features', () => {
diff --git a/x-pack/plugins/features/server/feature_registry.ts b/x-pack/plugins/features/server/feature_registry.ts
index 3a532a4aaa1e7..46c422b931822 100644
--- a/x-pack/plugins/features/server/feature_registry.ts
+++ b/x-pack/plugins/features/server/feature_registry.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneDeep, uniq } from 'lodash';
-import { ILicense } from '../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import {
   KibanaFeatureConfig,
   KibanaFeature,
diff --git a/x-pack/plugins/features/server/feature_schema.ts b/x-pack/plugins/features/server/feature_schema.ts
index 8738e8691572a..f701a3a45b685 100644
--- a/x-pack/plugins/features/server/feature_schema.ts
+++ b/x-pack/plugins/features/server/feature_schema.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { difference } from 'lodash';
-import { Capabilities as UICapabilities } from '../../../../src/core/server';
+import { Capabilities as UICapabilities } from '@kbn/core/server';
 import { KibanaFeatureConfig } from '../common';
 import { FeatureKibanaPrivileges, ElasticsearchFeatureConfig } from '.';
 
diff --git a/x-pack/plugins/features/server/index.ts b/x-pack/plugins/features/server/index.ts
index 934fcd9d556f6..5882d0a4e339a 100644
--- a/x-pack/plugins/features/server/index.ts
+++ b/x-pack/plugins/features/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FeaturesPlugin } from './plugin';
 
 // These exports are part of public Features plugin contract, any change in signature of exported
diff --git a/x-pack/plugins/features/server/oss_features.test.ts b/x-pack/plugins/features/server/oss_features.test.ts
index 7a1c5951192ec..f7e5b7644c596 100644
--- a/x-pack/plugins/features/server/oss_features.test.ts
+++ b/x-pack/plugins/features/server/oss_features.test.ts
@@ -8,7 +8,7 @@
 import { buildOSSFeatures } from './oss_features';
 import { featurePrivilegeIterator } from './feature_privilege_iterator';
 import { KibanaFeature } from '.';
-import { LicenseType, LICENSE_TYPE } from '../../licensing/server';
+import { LicenseType, LICENSE_TYPE } from '@kbn/licensing-plugin/server';
 
 describe('buildOSSFeatures', () => {
   it('returns features including reporting subfeatures', () => {
diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts
index daab87b1063d2..a18cbdb62d59c 100644
--- a/x-pack/plugins/features/server/oss_features.ts
+++ b/x-pack/plugins/features/server/oss_features.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import type { KibanaFeatureConfig, SubFeatureConfig } from '../common';
 
 export interface BuildOSSFeaturesParams {
diff --git a/x-pack/plugins/features/server/plugin.test.ts b/x-pack/plugins/features/server/plugin.test.ts
index e5940bc73ae97..89e04de8ffa91 100644
--- a/x-pack/plugins/features/server/plugin.test.ts
+++ b/x-pack/plugins/features/server/plugin.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, savedObjectsServiceMock } from 'src/core/server/mocks';
+import { coreMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import { FeaturesPlugin } from './plugin';
 
 describe('Features Plugin', () => {
diff --git a/x-pack/plugins/features/server/plugin.ts b/x-pack/plugins/features/server/plugin.ts
index efca9f19230b0..3a394e2524027 100644
--- a/x-pack/plugins/features/server/plugin.ts
+++ b/x-pack/plugins/features/server/plugin.ts
@@ -14,8 +14,8 @@ import {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from '../../../../src/core/server';
-import { Capabilities as UICapabilities } from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { Capabilities as UICapabilities } from '@kbn/core/server';
 import { FeatureRegistry } from './feature_registry';
 import { uiCapabilitiesForFeatures } from './ui_capabilities_for_features';
 import { buildOSSFeatures } from './oss_features';
diff --git a/x-pack/plugins/features/server/routes/index.test.ts b/x-pack/plugins/features/server/routes/index.test.ts
index 04a3d6486c5af..31cb1358f63fa 100644
--- a/x-pack/plugins/features/server/routes/index.test.ts
+++ b/x-pack/plugins/features/server/routes/index.test.ts
@@ -6,19 +6,18 @@
  */
 
 import { FeatureRegistry } from '../feature_registry';
-import { defineRoutes } from './index';
+import { defineRoutes } from '.';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../src/core/server/mocks';
-import { LicenseType } from '../../../licensing/server/';
-import { licensingMock } from '../../../licensing/server/mocks';
-import { RequestHandler } from '../../../../../src/core/server';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
+import { LicenseType } from '@kbn/licensing-plugin/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { RequestHandler } from '@kbn/core/server';
 import { FeatureKibanaPrivileges, KibanaFeatureConfig, SubFeatureConfig } from '../../common';
 
 function createContextMock(licenseType: LicenseType = 'platinum') {
-  return {
-    core: coreMock.createRequestHandlerContext(),
+  return coreMock.createCustomRequestHandlerContext({
     licensing: licensingMock.createRequestHandlerContext({ license: { type: licenseType } }),
-  };
+  });
 }
 
 function createPrivilege(partial: Partial<FeatureKibanaPrivileges> = {}): FeatureKibanaPrivileges {
@@ -138,7 +137,7 @@ describe('GET /api/features', () => {
 
   it('returns a list of available features, sorted by their configured order', async () => {
     const mockResponse = httpServerMock.createResponseFactory();
-    routeHandler(createContextMock(), { query: {} } as any, mockResponse);
+    await routeHandler(createContextMock(), { query: {} } as any, mockResponse);
 
     expect(mockResponse.ok).toHaveBeenCalledTimes(1);
     const [call] = mockResponse.ok.mock.calls;
@@ -173,7 +172,7 @@ describe('GET /api/features', () => {
 
   it(`by default does not return features that arent allowed by current license`, async () => {
     const mockResponse = httpServerMock.createResponseFactory();
-    routeHandler(createContextMock('basic'), { query: {} } as any, mockResponse);
+    await routeHandler(createContextMock('basic'), { query: {} } as any, mockResponse);
 
     expect(mockResponse.ok).toHaveBeenCalledTimes(1);
     const [call] = mockResponse.ok.mock.calls;
@@ -204,7 +203,7 @@ describe('GET /api/features', () => {
 
   it(`ignoreValidLicenses=false does not return features that arent allowed by current license`, async () => {
     const mockResponse = httpServerMock.createResponseFactory();
-    routeHandler(
+    await routeHandler(
       createContextMock('basic'),
       { query: { ignoreValidLicenses: false } } as any,
       mockResponse
@@ -239,7 +238,7 @@ describe('GET /api/features', () => {
 
   it(`ignoreValidLicenses=true returns features that arent allowed by current license`, async () => {
     const mockResponse = httpServerMock.createResponseFactory();
-    routeHandler(
+    await routeHandler(
       createContextMock('basic'),
       { query: { ignoreValidLicenses: true } } as any,
       mockResponse
diff --git a/x-pack/plugins/features/server/routes/index.ts b/x-pack/plugins/features/server/routes/index.ts
index 1f2b833663f1a..bb78f07bc56cc 100644
--- a/x-pack/plugins/features/server/routes/index.ts
+++ b/x-pack/plugins/features/server/routes/index.ts
@@ -26,8 +26,8 @@ export function defineRoutes({ router, featureRegistry }: RouteDefinitionParams)
         query: schema.object({ ignoreValidLicenses: schema.boolean({ defaultValue: false }) }),
       },
     },
-    (context, request, response) => {
-      const currentLicense = context.licensing!.license;
+    async (context, request, response) => {
+      const { license: currentLicense } = await context.licensing;
 
       const allFeatures = featureRegistry.getAllKibanaFeatures(
         currentLicense,
diff --git a/x-pack/plugins/features/server/types.ts b/x-pack/plugins/features/server/types.ts
index 209d7ef13aa31..99a6c96e43322 100644
--- a/x-pack/plugins/features/server/types.ts
+++ b/x-pack/plugins/features/server/types.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import type { RequestHandlerContext, IRouter } from 'src/core/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { CustomRequestHandlerContext, IRouter } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 /**
  * @internal
  */
-export interface FeaturesRequestHandlerContext extends RequestHandlerContext {
+export type FeaturesRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/features/server/ui_capabilities_for_features.ts b/x-pack/plugins/features/server/ui_capabilities_for_features.ts
index 4225f52081c75..84cd78a3fa548 100644
--- a/x-pack/plugins/features/server/ui_capabilities_for_features.ts
+++ b/x-pack/plugins/features/server/ui_capabilities_for_features.ts
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import type { RecursiveReadonly, Writable } from '@kbn/utility-types';
-import { Capabilities as UICapabilities } from '../../../../src/core/server';
+import { Capabilities as UICapabilities } from '@kbn/core/server';
 import { ElasticsearchFeature, KibanaFeature } from '../common';
 
 const ELIGIBLE_FLAT_MERGE_KEYS = ['catalogue'] as const;
diff --git a/x-pack/plugins/file_upload/common/types.ts b/x-pack/plugins/file_upload/common/types.ts
index 5a4ec4a3872ad..46c3153e702ce 100644
--- a/x-pack/plugins/file_upload/common/types.ts
+++ b/x-pack/plugins/file_upload/common/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ES_FIELD_TYPES } from 'src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 export interface InputOverrides {
   [key: string]: string | undefined;
diff --git a/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx b/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx
index 382e2eedebe24..ff915c493b93d 100644
--- a/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx
+++ b/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiLoadingContent } from '@elastic/eui';
 import { lazyLoadModules } from '../lazy_load_bundle';
-import { IndexNameFormProps } from '../index';
+import { IndexNameFormProps } from '..';
 
 interface State {
   IndexNameForm: React.ComponentType<IndexNameFormProps> | null;
diff --git a/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx b/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
index 16306673b246c..43dde2580b66d 100644
--- a/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
+++ b/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
@@ -8,8 +8,8 @@
 import React, { ChangeEvent, Component } from 'react';
 import { EuiForm, EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { GeoFilePicker, OnFileSelectParameters } from './geo_file_picker';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 import { IndexNameForm } from './index_name_form';
 import { validateIndexName } from '../../validate_index_name';
 
diff --git a/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx b/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx
index 24fcbdd7e1ed0..adbce777a4942 100644
--- a/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx
+++ b/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx
@@ -8,10 +8,10 @@
 import React, { Component, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiProgress, EuiText } from '@elastic/eui';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getDataViewsService } from '../kibana_services';
 import { GeoUploadForm, OnFileSelectParameters } from './geo_upload_form';
 import { ImportCompleteView } from './import_complete_view';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/public';
 import type { FileUploadComponentProps, FileUploadGeoResults } from '../lazy_load_bundle';
 import { ImportResults } from '../importer';
 import { GeoFileImporter } from '../importer/geo';
diff --git a/x-pack/plugins/file_upload/public/components/import_complete_view.tsx b/x-pack/plugins/file_upload/public/components/import_complete_view.tsx
index 5a7483328112e..5ec4e6f0ddf37 100644
--- a/x-pack/plugins/file_upload/public/components/import_complete_view.tsx
+++ b/x-pack/plugins/file_upload/public/components/import_complete_view.tsx
@@ -19,7 +19,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { CodeEditor, KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { CodeEditor, KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { getDocLinks, getHttp, getUiSettings } from '../kibana_services';
 import { ImportResults } from '../importer';
 
diff --git a/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx b/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx
index 59262984fd0e2..31132e0d9698d 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx
+++ b/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx
@@ -8,10 +8,10 @@
 import { ReactNode } from 'react';
 import { Feature } from 'geojson';
 import { i18n } from '@kbn/i18n';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { GeoFileImporter, GeoFilePreview } from './types';
 import { CreateDocsResponse, ImportResults } from '../types';
 import { callImportRoute, Importer, IMPORT_RETRIES, MAX_CHUNK_CHAR_COUNT } from '../importer';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 import { MB } from '../../../common/constants';
 import type { ImportDoc, ImportFailure, ImportResponse } from '../../../common/types';
 // @ts-expect-error
diff --git a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts
index 2f244e0fc93dc..7ba31fbf8364a 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts
+++ b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts
@@ -7,7 +7,7 @@
 
 import { Feature } from 'geojson';
 import { createChunks, toEsDoc } from './create_chunks';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 const FEATURE_COLLECTION = {
   type: 'FeatureCollection',
diff --git a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts
index cac21001e64a5..33188e608587e 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts
+++ b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts
@@ -6,7 +6,7 @@
  */
 
 import { Feature, Point } from 'geojson';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import type { ImportDoc } from '../../../common/types';
 
 export function createChunks(
diff --git a/x-pack/plugins/file_upload/public/importer/geo/types.ts b/x-pack/plugins/file_upload/public/importer/geo/types.ts
index c616324f7e9be..3c9115f1c27ac 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/types.ts
+++ b/x-pack/plugins/file_upload/public/importer/geo/types.ts
@@ -7,8 +7,8 @@
 
 import { Feature } from 'geojson';
 import { ReactNode } from 'react';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { IImporter } from '../types';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 
 export interface GeoFilePreview {
   features: Feature[];
diff --git a/x-pack/plugins/file_upload/public/kibana_services.ts b/x-pack/plugins/file_upload/public/kibana_services.ts
index 76dd6f660da51..c45df38883400 100644
--- a/x-pack/plugins/file_upload/public/kibana_services.ts
+++ b/x-pack/plugins/file_upload/public/kibana_services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { FileUploadStartDependencies } from './plugin';
 
 let coreStart: CoreStart;
diff --git a/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts b/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts
index 97aef4365c508..0066a2efbc5cb 100644
--- a/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts
+++ b/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { FeatureCollection } from 'geojson';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { IImporter, ImportFactoryOptions } from '../importer';
 import { getHttp } from '../kibana_services';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/public';
-import { IndexNameFormProps } from '../';
+import { IndexNameFormProps } from '..';
 
 export interface FileUploadGeoResults {
   indexPatternId: string;
diff --git a/x-pack/plugins/file_upload/public/plugin.ts b/x-pack/plugins/file_upload/public/plugin.ts
index 38f19675028d8..cbf64371fc4c3 100644
--- a/x-pack/plugins/file_upload/public/plugin.ts
+++ b/x-pack/plugins/file_upload/public/plugin.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart, Plugin } from '../../../../src/core/public';
+import { CoreStart, Plugin } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   FileUploadStartApi,
   FileUploadComponent,
@@ -17,7 +18,6 @@ import {
   analyzeFile,
 } from './api';
 import { setStartServices } from './kibana_services';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { getMaxBytes, getMaxBytesFormatted } from './importer/get_max_bytes';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/plugins/file_upload/server/analyze_file.tsx b/x-pack/plugins/file_upload/server/analyze_file.tsx
index ae2b1aeef81bd..13ceea39cb794 100644
--- a/x-pack/plugins/file_upload/server/analyze_file.tsx
+++ b/x-pack/plugins/file_upload/server/analyze_file.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type {
   AnalysisResult,
   FormattedOverrides,
diff --git a/x-pack/plugins/file_upload/server/capabilities.test.ts b/x-pack/plugins/file_upload/server/capabilities.test.ts
index 53f9da26060af..bece0196f5fea 100644
--- a/x-pack/plugins/file_upload/server/capabilities.test.ts
+++ b/x-pack/plugins/file_upload/server/capabilities.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { setupCapabilities } from './capabilities';
-import { coreMock, httpServerMock } from '../../../../src/core/server/mocks';
-import { Capabilities, CoreStart } from 'kibana/server';
-import { securityMock } from '../../security/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { Capabilities, CoreStart } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
 describe('setupCapabilities', () => {
   it('registers a capabilities provider for the file upload feature', () => {
diff --git a/x-pack/plugins/file_upload/server/capabilities.ts b/x-pack/plugins/file_upload/server/capabilities.ts
index 585aca196c66e..5e0f338e4ba6c 100644
--- a/x-pack/plugins/file_upload/server/capabilities.ts
+++ b/x-pack/plugins/file_upload/server/capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { checkFileUploadPrivileges } from './check_privileges';
 import { StartDeps } from './types';
 
diff --git a/x-pack/plugins/file_upload/server/check_privileges.ts b/x-pack/plugins/file_upload/server/check_privileges.ts
index 5f8b521506840..07e137241115d 100644
--- a/x-pack/plugins/file_upload/server/check_privileges.ts
+++ b/x-pack/plugins/file_upload/server/check_privileges.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { AuthorizationServiceSetup, CheckPrivilegesPayload } from '../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { AuthorizationServiceSetup, CheckPrivilegesPayload } from '@kbn/security-plugin/server';
 
 interface Deps {
   request: KibanaRequest;
diff --git a/x-pack/plugins/file_upload/server/error_wrapper.ts b/x-pack/plugins/file_upload/server/error_wrapper.ts
index 64395f601f9ac..212c7a53ca122 100644
--- a/x-pack/plugins/file_upload/server/error_wrapper.ts
+++ b/x-pack/plugins/file_upload/server/error_wrapper.ts
@@ -6,7 +6,7 @@
  */
 
 import { boomify, isBoom } from '@hapi/boom';
-import { ResponseError, CustomHttpResponseOptions } from 'kibana/server';
+import { ResponseError, CustomHttpResponseOptions } from '@kbn/core/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
   const boom = isBoom(error)
diff --git a/x-pack/plugins/file_upload/server/get_time_field_range.ts b/x-pack/plugins/file_upload/server/get_time_field_range.ts
index 9da8e7fb2b7e4..e8b21e6807a8f 100644
--- a/x-pack/plugins/file_upload/server/get_time_field_range.ts
+++ b/x-pack/plugins/file_upload/server/get_time_field_range.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { isPopulatedObject } from '../common/utils';
diff --git a/x-pack/plugins/file_upload/server/import_data.ts b/x-pack/plugins/file_upload/server/import_data.ts
index c093cfcee190c..f8555cbd7f1d3 100644
--- a/x-pack/plugins/file_upload/server/import_data.ts
+++ b/x-pack/plugins/file_upload/server/import_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { INDEX_META_DATA_CREATED_BY } from '../common/constants';
 import {
   ImportResponse,
diff --git a/x-pack/plugins/file_upload/server/index.ts b/x-pack/plugins/file_upload/server/index.ts
index 4d38bff8fa26f..c818e74c0ddc5 100644
--- a/x-pack/plugins/file_upload/server/index.ts
+++ b/x-pack/plugins/file_upload/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FileUploadPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/file_upload/server/plugin.ts b/x-pack/plugins/file_upload/server/plugin.ts
index 9ec234c415e14..1a1a67cd212fe 100644
--- a/x-pack/plugins/file_upload/server/plugin.ts
+++ b/x-pack/plugins/file_upload/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { fileUploadRoutes } from './routes';
 import { initFileUploadTelemetry } from './telemetry';
diff --git a/x-pack/plugins/file_upload/server/routes.ts b/x-pack/plugins/file_upload/server/routes.ts
index 82c66d9c73313..76d6443f47f54 100644
--- a/x-pack/plugins/file_upload/server/routes.ts
+++ b/x-pack/plugins/file_upload/server/routes.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
-import { CoreSetup, Logger } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { MAX_FILE_SIZE_BYTES } from '../common/constants';
 import type { IngestPipelineWrapper, InputData, Mappings, Settings } from '../common/types';
 import { wrapError } from './error_wrapper';
@@ -102,11 +102,8 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
     },
     async (context, request, response) => {
       try {
-        const result = await analyzeFile(
-          context.core.elasticsearch.client,
-          request.body,
-          request.query
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const result = await analyzeFile(esClient, request.body, request.query);
         return response.ok({ body: result });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -142,6 +139,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
       try {
         const { id } = request.query;
         const { index, data, settings, mappings, ingestPipeline } = request.body;
+        const esClient = (await context.core).elasticsearch.client;
 
         // `id` being `undefined` tells us that this is a new import due to create a new index.
         // follow-up import calls to just add additional data will include the `id` of the created
@@ -151,7 +149,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
         }
 
         const result = await importData(
-          context.core.elasticsearch.client,
+          esClient,
           id,
           index,
           settings,
@@ -182,9 +180,8 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
     },
     async (context, request, response) => {
       try {
-        const indexExists = await context.core.elasticsearch.client.asCurrentUser.indices.exists(
-          request.body
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const indexExists = await esClient.asCurrentUser.indices.exists(request.body);
         return response.ok({ body: { exists: indexExists } });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -225,8 +222,9 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
     async (context, request, response) => {
       try {
         const { index, timeFieldName, query, runtimeMappings } = request.body;
+        const esClient = (await context.core).elasticsearch.client;
         const resp = await getTimeFieldRange(
-          context.core.elasticsearch.client,
+          esClient,
           index,
           timeFieldName,
           query,
diff --git a/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts b/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts
index b9c8147fac5f4..9b823a0ffba32 100644
--- a/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsServiceStart, ISavedObjectsRepository } from 'kibana/server';
+import { SavedObjectsServiceStart, ISavedObjectsRepository } from '@kbn/core/server';
 
 let internalRepository: ISavedObjectsRepository | null = null;
 export const setInternalRepository = (
diff --git a/x-pack/plugins/file_upload/server/telemetry/mappings.ts b/x-pack/plugins/file_upload/server/telemetry/mappings.ts
index 04f9f55031111..a01ed92a7bfee 100644
--- a/x-pack/plugins/file_upload/server/telemetry/mappings.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { TELEMETRY_DOC_ID } from './telemetry';
 
 export const telemetryMappingsType: SavedObjectsType = {
diff --git a/x-pack/plugins/file_upload/server/telemetry/telemetry.ts b/x-pack/plugins/file_upload/server/telemetry/telemetry.ts
index deb739f6dcfa8..7b16d72a7bc6b 100644
--- a/x-pack/plugins/file_upload/server/telemetry/telemetry.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash';
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 
 import { getInternalRepository } from './internal_repository';
 
diff --git a/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts b/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts
index 27ee6900d6ed5..20e34fcaf60e2 100644
--- a/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getTelemetry, initTelemetry, Telemetry } from './telemetry';
 import { telemetryMappingsType } from './mappings';
 import { setInternalRepository } from './internal_repository';
diff --git a/x-pack/plugins/file_upload/server/types.ts b/x-pack/plugins/file_upload/server/types.ts
index 241abadaf750f..9a2e229282d4b 100644
--- a/x-pack/plugins/file_upload/server/types.ts
+++ b/x-pack/plugins/file_upload/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SecurityPluginStart } from '../..//security/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 export interface StartDeps {
   security?: SecurityPluginStart;
diff --git a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts
index 7ae8242fc9965..0daf9713d8263 100644
--- a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts
+++ b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+import { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from '../../common/utils';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
diff --git a/x-pack/plugins/fleet/.storybook/context/application.ts b/x-pack/plugins/fleet/.storybook/context/application.ts
index 4cae11dd79c07..dd75d859daa64 100644
--- a/x-pack/plugins/fleet/.storybook/context/application.ts
+++ b/x-pack/plugins/fleet/.storybook/context/application.ts
@@ -8,7 +8,7 @@
 import { of } from 'rxjs';
 import { action } from '@storybook/addon-actions';
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 const applications = new Map();
 
diff --git a/x-pack/plugins/fleet/.storybook/context/chrome.ts b/x-pack/plugins/fleet/.storybook/context/chrome.ts
index 9956f6ae6968a..1eba49cb61f02 100644
--- a/x-pack/plugins/fleet/.storybook/context/chrome.ts
+++ b/x-pack/plugins/fleet/.storybook/context/chrome.ts
@@ -6,7 +6,7 @@
  */
 
 import { action } from '@storybook/addon-actions';
-import type { ChromeStart } from 'kibana/public';
+import type { ChromeStart } from '@kbn/core/public';
 
 export const getChrome = () => {
   const chrome: ChromeStart = {
diff --git a/x-pack/plugins/fleet/.storybook/context/cloud.ts b/x-pack/plugins/fleet/.storybook/context/cloud.ts
index bed72c8ac4db7..1291f94cea788 100644
--- a/x-pack/plugins/fleet/.storybook/context/cloud.ts
+++ b/x-pack/plugins/fleet/.storybook/context/cloud.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CloudSetup } from '../../../cloud/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
 
 export const getCloud = ({ isCloudEnabled }: { isCloudEnabled: boolean }) => {
   const cloud: CloudSetup = {
diff --git a/x-pack/plugins/fleet/.storybook/context/doc_links.ts b/x-pack/plugins/fleet/.storybook/context/doc_links.ts
index bb6d8086d1cd8..e121d1bb77e6b 100644
--- a/x-pack/plugins/fleet/.storybook/context/doc_links.ts
+++ b/x-pack/plugins/fleet/.storybook/context/doc_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 export const getDocLinks = () => {
   const docLinks: DocLinksStart = {
diff --git a/x-pack/plugins/fleet/.storybook/context/execution_context.ts b/x-pack/plugins/fleet/.storybook/context/execution_context.ts
index d3a15e200129b..63c1686fc14bc 100644
--- a/x-pack/plugins/fleet/.storybook/context/execution_context.ts
+++ b/x-pack/plugins/fleet/.storybook/context/execution_context.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ExecutionContextSetup } from 'kibana/public';
+import type { ExecutionContextSetup } from '@kbn/core/public';
 import { of } from 'rxjs';
 
 export const getExecutionContext = () => {
diff --git a/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts b/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts
index db3725ffe664c..c655577bb5ede 100644
--- a/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts
+++ b/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CustomIntegration } from '../../../../../../src/plugins/custom_integrations/common';
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
 
 export const integrations: CustomIntegration[] = [
   {
diff --git a/x-pack/plugins/fleet/.storybook/context/http.ts b/x-pack/plugins/fleet/.storybook/context/http.ts
index 491b62201e532..5167ad5500364 100644
--- a/x-pack/plugins/fleet/.storybook/context/http.ts
+++ b/x-pack/plugins/fleet/.storybook/context/http.ts
@@ -6,7 +6,7 @@
  */
 
 import { action } from '@storybook/addon-actions';
-import type { HttpFetchOptions, HttpHandler, HttpStart } from 'kibana/public';
+import type { HttpFetchOptions, HttpHandler, HttpStart } from '@kbn/core/public';
 
 const BASE_PATH = '';
 
diff --git a/x-pack/plugins/fleet/.storybook/context/index.tsx b/x-pack/plugins/fleet/.storybook/context/index.tsx
index 4f21614a00849..a60ecaf5a1572 100644
--- a/x-pack/plugins/fleet/.storybook/context/index.tsx
+++ b/x-pack/plugins/fleet/.storybook/context/index.tsx
@@ -13,8 +13,9 @@ import { createBrowserHistory } from 'history';
 
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { ScopedHistory } from '../../../../../src/core/public';
-import { getStorybookContextProvider } from '../../../../../src/plugins/custom_integrations/storybook';
+import { ScopedHistory } from '@kbn/core/public';
+import { getStorybookContextProvider } from '@kbn/custom-integrations-plugin/storybook';
+
 import { IntegrationsAppContext } from '../../public/applications/integrations/app';
 import type { FleetConfigType, FleetStartServices } from '../../public/plugin';
 
diff --git a/x-pack/plugins/fleet/.storybook/context/notifications.ts b/x-pack/plugins/fleet/.storybook/context/notifications.ts
index c1e9ef26a41d7..f1a95797cb5ba 100644
--- a/x-pack/plugins/fleet/.storybook/context/notifications.ts
+++ b/x-pack/plugins/fleet/.storybook/context/notifications.ts
@@ -8,7 +8,7 @@
 import uuid from 'uuid';
 import { of } from 'rxjs';
 import { action } from '@storybook/addon-actions';
-import type { NotificationsStart } from 'kibana/public';
+import type { NotificationsStart } from '@kbn/core/public';
 
 const handler = (type: string, ...rest: any[]) => {
   action(`${type} Toast`)(rest);
diff --git a/x-pack/plugins/fleet/.storybook/context/share.ts b/x-pack/plugins/fleet/.storybook/context/share.ts
index b6a8dfbcdcb67..e79713ee80bff 100644
--- a/x-pack/plugins/fleet/.storybook/context/share.ts
+++ b/x-pack/plugins/fleet/.storybook/context/share.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 
 export const getShare = () => {
   const share: SharePluginStart = {
diff --git a/x-pack/plugins/fleet/.storybook/context/stubs.tsx b/x-pack/plugins/fleet/.storybook/context/stubs.tsx
index 0f4f81b58f95d..092ab680b819f 100644
--- a/x-pack/plugins/fleet/.storybook/context/stubs.tsx
+++ b/x-pack/plugins/fleet/.storybook/context/stubs.tsx
@@ -11,6 +11,7 @@ type Stubs =
   | 'licensing'
   | 'storage'
   | 'data'
+  | 'unifiedSearch'
   | 'deprecations'
   | 'fatalErrors'
   | 'navigation'
@@ -23,6 +24,7 @@ export const stubbedStartServices: StubbedStartServices = {
   licensing: {} as FleetStartServices['licensing'],
   storage: {} as FleetStartServices['storage'],
   data: {} as FleetStartServices['data'],
+  unifiedSearch: {} as FleetStartServices['unifiedSearch'],
   deprecations: {} as FleetStartServices['deprecations'],
   fatalErrors: {} as FleetStartServices['fatalErrors'],
   navigation: {} as FleetStartServices['navigation'],
diff --git a/x-pack/plugins/fleet/.storybook/context/ui_settings.ts b/x-pack/plugins/fleet/.storybook/context/ui_settings.ts
index fe2e8d98cd6df..f2ad92b545cf7 100644
--- a/x-pack/plugins/fleet/.storybook/context/ui_settings.ts
+++ b/x-pack/plugins/fleet/.storybook/context/ui_settings.ts
@@ -6,7 +6,7 @@
  */
 
 import { of } from 'rxjs';
-import type { IUiSettingsClient } from 'kibana/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 
 const settings: Record<string, any> = {
   'theme:darkMode': false,
diff --git a/x-pack/plugins/fleet/common/services/license.ts b/x-pack/plugins/fleet/common/services/license.ts
index a5fdfb1e74149..c8e418deede5a 100644
--- a/x-pack/plugins/fleet/common/services/license.ts
+++ b/x-pack/plugins/fleet/common/services/license.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { ILicense, LicenseType } from '../../../licensing/common/types';
+import type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 
 // Generic license service class that works with the license observable
 // Both server and client plugins instancates a singleton version of this class
diff --git a/x-pack/plugins/fleet/common/services/package_to_package_policy.ts b/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
index 0d40adb4bf7dc..3b8a384ede0b6 100644
--- a/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
+++ b/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
@@ -17,7 +17,7 @@ import type {
   PackagePolicyConfigRecordEntry,
 } from '../types';
 
-import { doesPackageHaveIntegrations } from './';
+import { doesPackageHaveIntegrations } from '.';
 
 export const getStreamsForInputType = (
   inputType: string,
diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
index 2a8c187d71629..4d54fda6e5df5 100644
--- a/x-pack/plugins/fleet/common/services/validate_package_policy.ts
+++ b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
@@ -19,7 +19,7 @@ import type {
   RegistryVarsEntry,
 } from '../types';
 
-import { isValidNamespace, doesPackageHaveIntegrations } from './';
+import { isValidNamespace, doesPackageHaveIntegrations } from '.';
 
 type Errors = string[] | null;
 
diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
index 4d87d10385617..c289ebf32fd16 100644
--- a/x-pack/plugins/fleet/common/types/models/agent_policy.ts
+++ b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -6,7 +6,7 @@
  */
 
 import type { agentPolicyStatuses } from '../../constants';
-import type { MonitoringType, ValueOf } from '../../types';
+import type { MonitoringType, ValueOf } from '..';
 
 import type { PackagePolicy, PackagePolicyPackage } from './package_policy';
 import type { Output } from './output';
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index 060606251a6a5..41564fdb10b3b 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -8,7 +8,9 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // Follow pattern from https://github.com/elastic/kibana/pull/52447
 // TODO: Update when https://github.com/elastic/kibana/issues/53021 is closed
-import type { SavedObject, SavedObjectAttributes, SavedObjectReference } from 'src/core/public';
+import type { SavedObject, SavedObjectAttributes, SavedObjectReference } from '@kbn/core/public';
+
+import type { CustomIntegrationIcon } from '@kbn/custom-integrations-plugin/common';
 
 import type {
   ASSETS_SAVED_OBJECT_TYPE,
@@ -17,9 +19,7 @@ import type {
   monitoringTypes,
   installationStatuses,
 } from '../../constants';
-import type { ValueOf } from '../../types';
-
-import type { CustomIntegrationIcon } from '../../../../../../src/plugins/custom_integrations/common';
+import type { ValueOf } from '..';
 
 import type {
   PackageSpecManifest,
diff --git a/x-pack/plugins/fleet/common/types/models/output.ts b/x-pack/plugins/fleet/common/types/models/output.ts
index dbdde9cf34e5b..49115ffbeeed1 100644
--- a/x-pack/plugins/fleet/common/types/models/output.ts
+++ b/x-pack/plugins/fleet/common/types/models/output.ts
@@ -6,7 +6,7 @@
  */
 
 import type { outputType } from '../../constants';
-import type { ValueOf } from '../index';
+import type { ValueOf } from '..';
 
 export type OutputType = typeof outputType;
 
diff --git a/x-pack/plugins/fleet/common/types/models/settings.ts b/x-pack/plugins/fleet/common/types/models/settings.ts
index 15d7492868797..1b8eeac9356fd 100644
--- a/x-pack/plugins/fleet/common/types/models/settings.ts
+++ b/x-pack/plugins/fleet/common/types/models/settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectAttributes } from 'src/core/public';
+import type { SavedObjectAttributes } from '@kbn/core/public';
 
 export interface BaseSettings {
   has_seen_add_data_notice?: boolean;
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/common.ts b/x-pack/plugins/fleet/common/types/rest_spec/common.ts
index 15a280a62450a..7a0390d830de3 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/common.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpFetchQuery } from 'src/core/public';
+import type { HttpFetchQuery } from '@kbn/core/public';
 
 export interface ListWithKuery extends HttpFetchQuery {
   page?: number;
diff --git a/x-pack/plugins/fleet/kibana.json b/x-pack/plugins/fleet/kibana.json
index 67ee2daf63725..0a45b03803fc3 100644
--- a/x-pack/plugins/fleet/kibana.json
+++ b/x-pack/plugins/fleet/kibana.json
@@ -8,8 +8,8 @@
   "server": true,
   "ui": true,
   "configPath": ["xpack", "fleet"],
-  "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations", "share", "spaces", "security"],
+  "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations", "share", "spaces", "security", "unifiedSearch"],
   "optionalPlugins": ["features", "cloud", "usageCollection", "home", "globalSearch", "telemetry"],
   "extraPublicDirs": ["common"],
-  "requiredBundles": ["kibanaReact", "cloud", "esUiShared", "home", "infra", "kibanaUtils", "usageCollection", "unifiedSearch"]
+  "requiredBundles": ["kibanaReact", "cloud", "esUiShared", "infra", "kibanaUtils", "usageCollection", "unifiedSearch"]
 }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index cd4ba97019766..b871f6d4e690b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -7,7 +7,7 @@
 
 import type { FunctionComponent } from 'react';
 import React, { memo, useEffect, useState } from 'react';
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel } from '@elastic/eui';
 import type { History } from 'history';
 import { Router, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
@@ -16,16 +16,14 @@ import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import useObservable from 'react-use/lib/useObservable';
 
-import type { TopNavMenuData } from 'src/plugins/navigation/public';
+import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import type { FleetConfigType, FleetStartServices } from '../../plugin';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
 
 import { PackageInstallProvider } from '../integrations/hooks';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
index 40e0fc5aca40d..fb1a1c9965780 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
@@ -9,9 +9,10 @@ import React, { useState, useEffect, useMemo } from 'react';
 
 import { fromKueryExpression } from '@kbn/es-query';
 
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+
 import { useStartServices } from '../hooks';
 import { INDEX_NAME, AGENTS_PREFIX } from '../constants';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx
index 2d83be3875089..70b0f366404e7 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ChromeBreadcrumb } from 'src/core/public';
+import type { ChromeBreadcrumb } from '@kbn/core/public';
 
 import type { Page, DynamicPagePathValues } from '../constants';
 import { FLEET_BASE_PATH, INTEGRATIONS_BASE_PATH, pagePathGetters } from '../constants';
 
-import { useStartServices } from './';
+import { useStartServices } from '.';
 
 interface AdditionalBreadcrumbOptions {
   useIntegrationsBasePath: boolean;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/index.tsx
index 8946e6af0ce75..a2a91b1055684 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import type { RouteProps } from 'react-router-dom';
 import { Redirect, Route } from 'react-router-dom';
-import type { CoreStart, AppMountParameters } from 'src/core/public';
+import type { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 import type { FleetConfigType, FleetStartServices } from '../../plugin';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
index b4fbd874ebf13..2e06887cb8015 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
@@ -23,12 +23,13 @@ import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 
 import { dataTypes } from '../../../../../../common';
-import { agentPolicyFormValidation } from '../components';
 
 import type { AgentPolicy, NewAgentPolicy } from '../../../types';
 
 import { sendCreateAgentPolicy } from '../../../hooks';
 
+import { agentPolicyFormValidation } from '.';
+
 import { AgentPolicyAdvancedOptionsContent } from './agent_policy_advanced_fields';
 import { AgentPolicyFormSystemMonitoringCheckbox } from './agent_policy_system_monitoring_field';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
index 3d4d3d59bcbb2..10878a3c0af91 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
@@ -19,8 +19,9 @@ import {
 } from '@elastic/eui';
 import styled from 'styled-components';
 
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+
 import type { RegistryVarsEntry } from '../../../../types';
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
 
 import { MultiTextInput } from './multi_text_input';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx
index 23429cc40c388..0f719f6a61585 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx
@@ -23,7 +23,7 @@ import {
   useGetPackageInfoByKey,
 } from '../../../hooks';
 
-import { CreatePackagePolicyPage } from './index';
+import { CreatePackagePolicyPage } from '.';
 
 jest.mock('../../../hooks', () => {
   return {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
index e41b98c05e41c..2d339013f5033 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
@@ -9,7 +9,7 @@ import { safeLoad } from 'js-yaml';
 
 import type { PackagePolicyConfigRecord, RegistryVarsEntry } from '../../../../types';
 
-import { validatePackagePolicyConfig } from './';
+import { validatePackagePolicyConfig } from '.';
 
 export const hasInvalidButRequiredVar = (
   registryVars?: RegistryVarsEntry[],
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts
index f6db6aaf73cc1..cfedc62c30d3e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts
@@ -8,7 +8,7 @@ import { parse } from 'query-string';
 
 import type { PackagePolicy, OnSaveQueryParamKeys } from '../../../../types';
 
-import { appendOnSaveQueryParamsToPath } from './';
+import { appendOnSaveQueryParamsToPath } from '.';
 
 const mockPolicy: PackagePolicy = { policy_id: '1234' } as PackagePolicy;
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
index c0685f72d9e5c..14fc3eb1d24c3 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
@@ -27,10 +27,11 @@ import { fromKueryExpression } from '@kbn/es-query';
 import semverGte from 'semver/functions/gte';
 import semverCoerce from 'semver/functions/coerce';
 
-import { createStateContainerReactHelpers } from '../../../../../../../../../../../src/plugins/kibana_utils/public';
-import { RedirectAppLinks } from '../../../../../../../../../../../src/plugins/kibana_react/public';
-import type { TimeRange } from '../../../../../../../../../../../src/plugins/data/public';
-import { LogStream } from '../../../../../../../../../infra/public';
+import { createStateContainerReactHelpers } from '@kbn/kibana-utils-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import type { TimeRange } from '@kbn/data-plugin/public';
+import { LogStream } from '@kbn/infra-plugin/public';
+
 import type { Agent, AgentPolicy } from '../../../../../types';
 import { useLink, useStartServices } from '../../../../../hooks';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx
index 865c360a47bd9..f49d4910ab9f9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx
@@ -17,7 +17,7 @@ export const DatasetFilter: React.FunctionComponent<{
   selectedDatasets: string[];
   onToggleDataset: (dataset: string) => void;
 }> = memo(({ selectedDatasets, onToggleDataset }) => {
-  const { data } = useStartServices();
+  const { unifiedSearch } = useStartServices();
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [datasetValues, setDatasetValues] = useState<string[]>([AGENT_DATASET]);
@@ -29,7 +29,7 @@ export const DatasetFilter: React.FunctionComponent<{
     const fetchValues = async () => {
       setIsLoading(true);
       try {
-        const values = await data.autocomplete.getValueSuggestions({
+        const values = await unifiedSearch.autocomplete.getValueSuggestions({
           indexPattern: {
             title: AGENT_LOG_INDEX_PATTERN,
             fields: [DATASET_FIELD],
@@ -44,7 +44,7 @@ export const DatasetFilter: React.FunctionComponent<{
       setIsLoading(false);
     };
     fetchValues();
-  }, [data.autocomplete]);
+  }, [unifiedSearch.autocomplete]);
 
   return (
     <EuiPopover
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx
index 805d2fab45240..3a25c939872f4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx
@@ -28,7 +28,7 @@ export const LogLevelFilter: React.FunctionComponent<{
   selectedLevels: string[];
   onToggleLevel: (level: string) => void;
 }> = memo(({ selectedLevels, onToggleLevel }) => {
-  const { data } = useStartServices();
+  const { unifiedSearch } = useStartServices();
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [levelValues, setLevelValues] = useState<string[]>([]);
@@ -40,7 +40,7 @@ export const LogLevelFilter: React.FunctionComponent<{
     const fetchValues = async () => {
       setIsLoading(true);
       try {
-        const values: string[] = await data.autocomplete.getValueSuggestions({
+        const values: string[] = await unifiedSearch.autocomplete.getValueSuggestions({
           indexPattern: {
             title: AGENT_LOG_INDEX_PATTERN,
             fields: [LOG_LEVEL_FIELD],
@@ -55,7 +55,7 @@ export const LogLevelFilter: React.FunctionComponent<{
       setIsLoading(false);
     };
     fetchValues();
-  }, [data.autocomplete]);
+  }, [unifiedSearch.autocomplete]);
 
   const noLogsFound = (
     <div className="euiFilterSelect__note">
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx
index 76a7f0514a8a2..abb4f46c90c85 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx
@@ -7,16 +7,13 @@
 
 import React, { memo, useEffect, useState, useMemo } from 'react';
 
-import type {
-  INullableBaseStateContainer,
-  PureTransition,
-} from '../../../../../../../../../../../src/plugins/kibana_utils/public';
+import type { INullableBaseStateContainer, PureTransition } from '@kbn/kibana-utils-plugin/public';
 import {
   createStateContainer,
   syncState,
   createKbnUrlStateStorage,
   getStateFromKbnUrl,
-} from '../../../../../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
 import { DEFAULT_LOGS_STATE, STATE_STORAGE_KEY } from './constants';
 import type { AgentLogsProps, AgentLogsState } from './agent_logs';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
index 6fa49491b2c62..149540b152b7f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
@@ -8,9 +8,10 @@
 import React, { memo, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { FieldSpec } from '../../../../../../../../../../../src/plugins/data/common';
-import { QueryStringInput } from '../../../../../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../../../../../src/plugins/data_views/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+
 import { useStartServices } from '../../../../../hooks';
 
 import {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx
index beff83dd4d814..bee7fbfd85371 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx
@@ -11,7 +11,7 @@ import styled from 'styled-components';
 
 import { useStartServices, sendGetPermissionsCheck } from '../../../hooks';
 
-import { FleetServerMissingPrivileges } from '../../agents/components/fleet_server_callouts';
+import { FleetServerMissingPrivileges } from '../components/fleet_server_callouts';
 
 import { Loading } from '../../../components';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx
index bd486f3c95641..0d71fa8459f47 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx
@@ -14,7 +14,7 @@ import { useFleetStatus } from '../../../../../../hooks/use_fleet_status';
 import { EditOutputFlyout } from '.';
 
 // mock yaml code editor
-jest.mock('../../../../../../../../../../src/plugins/kibana_react/public/code_editor', () => ({
+jest.mock('@kbn/kibana-react-plugin/public/code_editor', () => ({
   CodeEditor: () => <>CODE EDITOR</>,
 }));
 jest.mock('../../../../../../hooks/use_fleet_status', () => ({
@@ -53,7 +53,7 @@ describe('EditOutputFlyout', () => {
     // Does not show logstash SSL inputs
     expect(utils.queryByLabelText('Client SSL certificate key')).toBeNull();
     expect(utils.queryByLabelText('Client SSL certificate')).toBeNull();
-    expect(utils.queryByLabelText('Server SSL certificate authorities')).toBeNull();
+    expect(utils.queryByLabelText('Server SSL certificate authorities (optional)')).toBeNull();
   });
 
   it('should render the flyout if the output provided is a logstash output', async () => {
@@ -68,7 +68,7 @@ describe('EditOutputFlyout', () => {
     // Show logstash SSL inputs
     expect(utils.queryByLabelText('Client SSL certificate key')).not.toBeNull();
     expect(utils.queryByLabelText('Client SSL certificate')).not.toBeNull();
-    expect(utils.queryByLabelText('Server SSL certificate authorities')).not.toBeNull();
+    expect(utils.queryByLabelText('Server SSL certificate authorities (optional)')).not.toBeNull();
   });
 
   it('should show a callout in the flyout if the selected output is logstash and no encrypted key is set', async () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
index c0b8f158f43de..09bd7d2280756 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
@@ -260,7 +260,7 @@ export const EditOutputFlyout: React.FunctionComponent<EditOutputFlyoutProps> =
               label={i18n.translate(
                 'xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputLabel',
                 {
-                  defaultMessage: 'Server SSL certificate authorities',
+                  defaultMessage: 'Server SSL certificate authorities (optional)',
                 }
               )}
               multiline={true}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx
index 21581677e093a..8cec82b11c990 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx
@@ -11,8 +11,8 @@ import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import { EuiCodeBlock, EuiTextColor } from '@elastic/eui';
 
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
-import type { CodeEditorProps } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import type { CodeEditorProps } from '@kbn/kibana-react-plugin/public';
 
 const CodeEditorContainer = styled.div`
   min-height: 0;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
index afe96713f065d..ac196576ba889 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
@@ -77,7 +77,14 @@ function validateFleetServerHosts(value: string[]) {
   const res: Array<{ message: string; index: number }> = [];
   const hostIndexes: { [key: string]: number[] } = {};
   value.forEach((val, idx) => {
-    if (!val.match(URL_REGEX)) {
+    if (!val) {
+      res.push({
+        message: i18n.translate('xpack.fleet.settings.fleetServerHostsRequiredError', {
+          defaultMessage: 'Host URL is required',
+        }),
+        index: idx,
+      });
+    } else if (!val.match(URL_REGEX)) {
       res.push({
         message: i18n.translate('xpack.fleet.settings.fleetServerHostsError', {
           defaultMessage: 'Invalid URL',
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx
index 1239233b4e12d..9fbeb6eb120c8 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx
@@ -6,7 +6,7 @@
  */
 
 export const LOGSTASH_CONFIG_PIPELINES = `- pipeline.id: elastic-agent-pipeline
-  path.config: "/etc/path/to/elastic-agent-pipeline.config"
+  path.config: "/etc/path/to/elastic-agent-pipeline.conf"
 `;
 
 export function getLogstashPipeline(apiKey?: string) {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx
index 1fdffd1c8a30b..752038e953b1c 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx
@@ -12,6 +12,7 @@ import {
   EuiButton,
   EuiSpacer,
   EuiLink,
+  EuiCode,
   EuiCodeBlock,
   EuiCopy,
   EuiButtonIcon,
@@ -110,10 +111,11 @@ const LogstashInstructionSteps = () => {
               <EuiCodeBlock paddingSize="m">
                 <h5>API Key</h5>
                 {logstashApiKey.apiKey}
-                <EuiCopy textToCopy={logstashApiKey.apiKey}>
-                  {(copy) => (
-                    <div className="euiCodeBlock__controls">
-                      <div className="euiCodeBlock__copyButton">
+
+                <div className="euiCodeBlock__controls">
+                  <div className="euiCodeBlock__copyButton">
+                    <EuiCopy textToCopy={logstashApiKey.apiKey}>
+                      {(copy) => (
                         <EuiButtonIcon
                           onClick={copy}
                           iconType="copyClipboard"
@@ -125,10 +127,10 @@ const LogstashInstructionSteps = () => {
                             }
                           )}
                         />
-                      </div>
-                    </div>
-                  )}
-                </EuiCopy>
+                      )}
+                    </EuiCopy>
+                  </div>
+                </div>
               </EuiCodeBlock>
             ) : (
               <EuiButton
@@ -150,7 +152,10 @@ const LogstashInstructionSteps = () => {
           <>
             <FormattedMessage
               id="xpack.fleet.settings.logstashInstructions.addPipelineStepDescription"
-              defaultMessage="In your Logstash configuration directory, open the pipelines.yml file and add the following configuration. Replace the path to your file."
+              defaultMessage="In your Logstash configuration directory, open the {pipelineFile} file and add the following configuration. Replace the path to your file."
+              values={{
+                pipelineFile: <EuiCode>pipelines.yml</EuiCode>,
+              }}
             />
             <EuiSpacer size="m" />
             <EuiCodeBlock paddingSize="m" language="yaml" isCopyable>
@@ -164,7 +169,10 @@ const LogstashInstructionSteps = () => {
           <>
             <FormattedMessage
               id="xpack.fleet.settings.logstashInstructions.editPipelineStepDescription"
-              defaultMessage="Next, open the elastic-agent-pipeline.config file and insert the following content:"
+              defaultMessage="Next, open the {pipelineConfFile} file and insert the following content:"
+              values={{
+                pipelineConfFile: <EuiCode>elastic-agent-pipeline.conf</EuiCode>,
+              }}
             />
             <EuiSpacer size="m" />
             <EuiCodeBlock paddingSize="m" language="yaml" isCopyable>
@@ -181,7 +189,7 @@ const LogstashInstructionSteps = () => {
               defaultMessage="Replace the parts between the brackets with your generated SSL certificate file paths. View {documentationLink} to generate the certificates."
               values={{
                 documentationLink: (
-                  <EuiLink external={true} href={docLinks.links.fleet.guide}>
+                  <EuiLink external={true} href={docLinks.links.fleet.secureLogstash}>
                     <FormattedMessage
                       id="xpack.fleet.settings.logstashInstructions.ourDocumentationLink"
                       defaultMessage="our documentation"
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx
index 1497d2a422ce4..8bb0a565be040 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx
@@ -28,7 +28,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import type { EuiTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 export interface MultiRowInputProps {
   id: string;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index 2c5b3b98c3e9a..717e528443a3f 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -6,24 +6,21 @@
  */
 
 import React, { memo } from 'react';
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 import { EuiErrorBoundary } from '@elastic/eui';
 import type { History } from 'history';
 import { Router, Redirect, Route, Switch } from 'react-router-dom';
 import useObservable from 'react-use/lib/useObservable';
 
-import { ConfigContext, FleetStatusProvider, KibanaVersionContext } from '../../hooks';
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { Chat } from '@kbn/cloud-plugin/public';
 
-import type { FleetConfigType, FleetStartServices } from '../../plugin';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
-import { Chat } from '../../../../cloud/public';
+import type { FleetConfigType, FleetStartServices } from '../../plugin';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { ConfigContext, FleetStatusProvider, KibanaVersionContext } from '../../hooks';
 
 import { AgentPolicyContextProvider } from './hooks';
 import { INTEGRATIONS_ROUTING_PATHS, pagePathGetters } from './constants';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
index b594171a7bae0..782d06d319d99 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiHeaderSectionItem, EuiHeaderSection, EuiHeaderLinks } from '@elastic/eui';
 
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 
 import { HeaderPortal } from './header_portal';
 import { DeploymentDetails } from './deployment_details';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
index ed6a94ff077dc..190a6e1ba49c7 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 import type { FC } from 'react';
 import React, { useEffect, useMemo } from 'react';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
 
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export interface Props {
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
index fd1dd8157c5c3..28f41fcabfcba 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
@@ -7,12 +7,12 @@
 
 import { useRef } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { ChromeBreadcrumb } from 'src/core/public';
+import type { ChromeBreadcrumb } from '@kbn/core/public';
 
 import type { Page, DynamicPagePathValues } from '../constants';
 import { INTEGRATIONS_BASE_PATH, pagePathGetters } from '../constants';
 
-import { useStartServices } from './index';
+import { useStartServices } from '.';
 
 const BASE_BREADCRUMB: ChromeBreadcrumb = {
   href: pagePathGetters.integrations()[1],
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts
index f69132d9a6452..05e460e056c49 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import type { PackageListItem } from '../../../../common/types/models';
-import type { CustomIntegration } from '../../../../../../../src/plugins/custom_integrations/common';
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
 
-import type { IntegrationCategory } from '../../../../../../../src/plugins/custom_integrations/common';
+import type { PackageListItem } from '../../../../common/types/models';
 
 import { useMergeEprPackagesWithReplacements } from './use_merge_epr_with_replacements';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts
index ff1b51ef19a81..89163e0438a2d 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+import { filterCustomIntegrations } from '@kbn/custom-integrations-plugin/public';
+
 import type { PackageListItem } from '../../../../common/types/models';
-import type { CustomIntegration } from '../../../../../../../src/plugins/custom_integrations/common';
-import { filterCustomIntegrations } from '../../../../../../../src/plugins/custom_integrations/public';
 import { FLEET_APM_PACKAGE } from '../../../../common/constants';
 
 // Export this as a utility to find replacements for a package (e.g. in the overview-page for an EPR package)
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
index 832397cbc93fd..cf60b3d783f3e 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
@@ -9,11 +9,12 @@ import createContainer from 'constate';
 import React, { useCallback, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { NotificationsStart } from 'src/core/public';
+import type { NotificationsStart } from '@kbn/core/public';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
 import type { PackageInfo } from '../../../types';
 import { sendInstallPackage, sendRemovePackage, useLink } from '../../../hooks';
 import { InstallStatus } from '../../../types';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
index 1edf5775e3df3..adf57e23dbcf1 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
@@ -9,7 +9,7 @@ import ReactDOM from 'react-dom';
 import { Redirect, Route } from 'react-router-dom';
 import type { RouteProps } from 'react-router-dom';
 
-import type { CoreStart, AppMountParameters } from 'src/core/public';
+import type { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 import type { FleetConfigType, FleetStartServices } from '../../plugin';
 import { licenseService } from '../../hooks';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
index 920cdeb2d8faa..2554a8b730938 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { useLink } from '../../../hooks';
 import type { Section } from '../sections';
 
-import { WithHeaderLayout } from './';
+import { WithHeaderLayout } from '.';
 
 interface Props {
   section?: Section;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
index 499b5f2512e7c..ff98fb988d04b 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import type { SavedObject } from 'src/core/public';
+import type { SavedObject } from '@kbn/core/public';
 
 import type { Installation } from '../../../../../../common';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
index 7181241776dda..a97a9ec8c1c24 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { EuiCard, EuiFlexItem, EuiBadge, EuiToolTip, EuiSpacer } from '@elastic/eui';
 
-import { TrackApplicationView } from '../../../../../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 
 import { CardIcon } from '../../../../../components/package_icon';
 import type { IntegrationCardItem } from '../../../../../../common/types/models/epm';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
index b0e1189f131ba..c65749178ddee 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { groupBy } from 'lodash';
 
-import type { ResolvedSimpleSavedObject } from 'src/core/public';
+import type { ResolvedSimpleSavedObject } from '@kbn/core/public';
 
 import { Loading, Error, ExtensionWrapper } from '../../../../../components';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts
index 26a6729be3623..59ae6636aa8ff 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SimpleSavedObject } from 'src/core/public';
+import type { SimpleSavedObject } from '@kbn/core/public';
 
 import type { KibanaAssetType } from '../../../../../types';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
index 9448294109819..e4341af45cf41 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
@@ -32,7 +32,7 @@ import {
 import type { MockedFleetStartServices, TestRenderer } from '../../../../../../mock';
 import { createIntegrationsTestRendererMock } from '../../../../../../mock';
 
-import { Detail } from './index';
+import { Detail } from '.';
 
 describe('when on integration detail', () => {
   const pkgkey = 'nginx-0.3.7';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
index 0d7ae2d9053aa..83631c674f754 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
@@ -18,7 +18,9 @@ import {
 } from '@elastic/eui';
 import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+
+import { withSuspense, LazyReplacementCard } from '@kbn/custom-integrations-plugin/public';
 
 import type {
   PackageInfo,
@@ -30,11 +32,6 @@ import { entries } from '../../../../../types';
 import { useGetCategories } from '../../../../../hooks';
 import { AssetTitleMap, DisplayedAssets, ServiceTitleMap } from '../../../constants';
 
-import {
-  withSuspense,
-  LazyReplacementCard,
-} from '../../../../../../../../../../../src/plugins/custom_integrations/public';
-
 import { NoticeModal } from './notice_modal';
 
 const ReplacementCard = withSuspense(LazyReplacementCard);
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
index 09db4208f40fc..9202d89d7c93b 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
@@ -23,7 +23,7 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 import type { PackageInfo, UpgradePackagePolicyDryRunResponse } from '../../../../../types';
 import { InstallStatus } from '../../../../../types';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx
index bea7b80015cc8..b409e6b09fa5f 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx
@@ -19,7 +19,9 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import type {
   GetAgentPoliciesResponse,
@@ -38,7 +40,6 @@ import {
   useAuthz,
   useLink,
 } from '../../../../../hooks';
-import { toMountPoint } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 
 interface UpdateButtonProps extends Pick<PackageInfo, 'name' | 'title' | 'version'> {
   dryRunData?: UpgradePackagePolicyDryRunResponse | null;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
index 7547e06201171..88343528afa0c 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
@@ -22,8 +22,11 @@ import {
   EuiLink,
 } from '@elastic/eui';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
+
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+
 import { useStartServices } from '../../../../hooks';
-import { TrackApplicationView } from '../../../../../../../../../../src/plugins/usage_collection/public';
 
 import { pagePathGetters } from '../../../../constants';
 import {
@@ -38,8 +41,6 @@ import { doesPackageHaveIntegrations } from '../../../../services';
 import type { PackageList } from '../../../../types';
 import { PackageListGrid } from '../../components/package_list_grid';
 
-import type { CustomIntegration } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-
 import type { PackageListItem } from '../../../../types';
 
 import type { IntegrationCardItem } from '../../../../../../../common/types/models';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
index e3fc5e15488e6..944cb8f94cfb2 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
@@ -8,13 +8,14 @@
 import React, { memo } from 'react';
 import { Switch, Route } from 'react-router-dom';
 
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
+
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+
 import type { DynamicPage, DynamicPagePathValues, StaticPage } from '../../../../constants';
 import { INTEGRATIONS_ROUTING_PATHS, INTEGRATIONS_SEARCH_QUERYPARAM } from '../../../../constants';
 import { DefaultLayout } from '../../../../layouts';
 
-import type { IntegrationCategory } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-import type { CustomIntegration } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-
 import type { PackageListItem } from '../../../../types';
 
 import type { IntegrationCardItem } from '../../../../../../../common/types/models';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts
index 70902b2bc1897..b46381886e762 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IntegrationCategory } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-import { INTEGRATION_CATEGORY_DISPLAY } from '../../../../../../../../../../src/plugins/custom_integrations/common';
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
+import { INTEGRATION_CATEGORY_DISPLAY } from '@kbn/custom-integrations-plugin/common';
 
 import type { IntegrationCardItem } from '../../../../../../../common/types/models';
 
diff --git a/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx b/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
index fd502f768656f..ad4e13a35f244 100644
--- a/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
+++ b/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
@@ -13,7 +13,7 @@ import type { NoArgCallback } from '@elastic/eui';
 import { EuiTourStep, EuiLink, EuiText } from '@elastic/eui';
 import { useTheme } from 'styled-components';
 
-import type { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 import { useStartServices } from '../hooks';
 
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
index 7a4d1ed44c406..b2680129dd7d5 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
@@ -11,9 +11,9 @@ import React from 'react';
 import { registerTestBed } from '@kbn/test-jest-helpers';
 import { act } from '@testing-library/react';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import type { AgentPolicy } from '../../../common';
 import { useGetSettings, sendGetOneAgentPolicy, useGetAgents } from '../../hooks/use_request';
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
index 63737adb5caea..768decc54ee40 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -119,6 +119,7 @@ export const AgentPolicySelection: React.FC<Props> = (props) => {
           />
         )}
       </EuiText>
+      <EuiSpacer size="m" />
       <AgentPolicyFormRow
         fullWidth={true}
         label={
@@ -165,14 +166,14 @@ export const AgentPolicySelection: React.FC<Props> = (props) => {
           />
         </>
       )}
-      {props.withKeySelection && props.onKeyChange && (
+      {props.withKeySelection && props.onKeyChange && selectedPolicy?.id && (
         <>
-          <EuiSpacer />
+          <EuiSpacer size="m" />
           <AdvancedAgentAuthenticationSettings
             selectedApiKeyId={props.selectedApiKeyId}
             onKeyChange={props.onKeyChange}
             initialAuthenticationSettingsOpen={!props.selectedApiKeyId}
-            agentPolicyId={selectedPolicy?.id}
+            agentPolicyId={selectedPolicy.id}
           />
         </>
       )}
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
index b74129e443e45..021acfbb17644 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
@@ -6,7 +6,8 @@
  */
 
 import React from 'react';
-import { EuiCallOut, EuiText, EuiSpacer, EuiButton } from '@elastic/eui';
+import { EuiCallOut, EuiText, EuiSpacer, EuiButton, EuiLink } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
 import type { InstalledIntegrationPolicy } from './use_get_agent_incoming_data';
@@ -17,6 +18,7 @@ interface Props {
   installedPolicy?: InstalledIntegrationPolicy;
   agentDataConfirmed: boolean;
   setAgentDataConfirmed: (v: boolean) => void;
+  troubleshootLink: string;
 }
 
 export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
@@ -24,6 +26,7 @@ export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
   installedPolicy,
   agentDataConfirmed,
   setAgentDataConfirmed,
+  troubleshootLink,
 }) => {
   const { incomingData, isLoading } = usePollingIncomingData(agentIds);
 
@@ -37,11 +40,21 @@ export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
   }
   if (!agentDataConfirmed) {
     return (
-      <EuiText size="s">
-        {i18n.translate('xpack.fleet.confirmIncomingData.loading', {
-          defaultMessage:
-            'It may take a few minutes for data to arrive in Elasticsearch. If the system is not generating data, it may help to generate some to ensure data is being collected correctly. If you’re having trouble, see our troubleshooting guide. You may close this dialog and check later by viewing our integration assets.',
-        })}
+      <EuiText>
+        <FormattedMessage
+          id="xpack.fleet.confirmIncomingData.loading"
+          defaultMessage="It may take a few minutes for data to arrive in Elasticsearch. If the system is not generating data, it may help to generate some to ensure data is being collected correctly. If you’re having trouble, see our {link}. You may close this dialog and check later by viewing your integration assets."
+          values={{
+            link: (
+              <EuiLink target="_blank" external href={troubleshootLink}>
+                <FormattedMessage
+                  id="xpack.fleet.enrollmentInstructions.troubleshootingLink"
+                  defaultMessage="troubleshooting guide"
+                />
+              </EuiLink>
+            ),
+          }}
+        />
       </EuiText>
     );
   }
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx
new file mode 100644
index 0000000000000..5134c6ff03060
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx
@@ -0,0 +1,187 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useMemo, useState } from 'react';
+import {
+  EuiText,
+  EuiButton,
+  EuiSpacer,
+  EuiCode,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiCopy,
+  EuiCodeBlock,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import semverMajor from 'semver/functions/major';
+import semverMinor from 'semver/functions/minor';
+import semverPatch from 'semver/functions/patch';
+
+import { useGetSettings, useKibanaVersion, useStartServices } from '../../hooks';
+
+import { agentPolicyRouteService } from '../../../common';
+
+import { sendGetK8sManifest } from '../../hooks/use_request/k8s';
+
+interface Props {
+  hasFleetServer: boolean;
+  isK8s?: string;
+  enrollmentAPIKey?: string;
+}
+
+export const DownloadInstructions: React.FunctionComponent<Props> = ({
+  hasFleetServer,
+  isK8s,
+  enrollmentAPIKey,
+}) => {
+  const kibanaVersion = useKibanaVersion();
+  const core = useStartServices();
+  const settings = useGetSettings();
+  const kibanaVersionURLString = useMemo(
+    () =>
+      `${semverMajor(kibanaVersion)}-${semverMinor(kibanaVersion)}-${semverPatch(kibanaVersion)}`,
+    [kibanaVersion]
+  );
+  const { notifications } = core;
+
+  const [yaml, setYaml] = useState<string>('');
+  const [fleetServer, setFleetServer] = useState<string | ''>();
+
+  useEffect(() => {
+    async function fetchK8sManifest() {
+      try {
+        if (isK8s !== 'IS_KUBERNETES') {
+          return;
+        }
+        const fleetServerHosts = settings.data?.item.fleet_server_hosts;
+        let host = '';
+        if (fleetServerHosts !== undefined && fleetServerHosts.length !== 0) {
+          setFleetServer(fleetServerHosts[0]);
+          host = fleetServerHosts[0];
+        }
+        const query = { fleetServer: host, enrolToken: enrollmentAPIKey };
+        const res = await sendGetK8sManifest(query);
+        if (res.error) {
+          throw res.error;
+        }
+
+        if (!res.data) {
+          throw new Error('No data while fetching agent manifest');
+        }
+
+        setYaml(res.data.item);
+      } catch (error) {
+        notifications.toasts.addError(error, {
+          title: i18n.translate('xpack.fleet.agentEnrollment.loadk8sManifestErrorTitle', {
+            defaultMessage: 'Error while fetching agent manifest',
+          }),
+        });
+      }
+    }
+    fetchK8sManifest();
+  }, [isK8s, notifications.toasts, enrollmentAPIKey, settings.data?.item.fleet_server_hosts]);
+
+  const downloadDescription = hasFleetServer ? (
+    <FormattedMessage
+      id="xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer"
+      defaultMessage="Fleet Server runs on an Elastic Agent. Install this agent on a centralized host so that other hosts you wish to monitor can connect to it. In production, we recommend using one or more dedicated hosts. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
+    />
+  ) : isK8s === 'IS_KUBERNETES' ? (
+    <FormattedMessage
+      id="xpack.fleet.agentEnrollment.downloadDescriptionForK8s"
+      defaultMessage="Copy or download the Kubernetes manifest inside the Kubernetes cluster. Check {FleetUrlVariable} and {FleetTokenVariable} in the Daemonset environment variables and apply the manifest."
+      values={{
+        FleetUrlVariable: <EuiCode>FLEET_URL</EuiCode>,
+        FleetTokenVariable: <EuiCode>FLEET_ENROLLMENT_TOKEN</EuiCode>,
+      }}
+    />
+  ) : (
+    <FormattedMessage
+      id="xpack.fleet.agentEnrollment.downloadDescription"
+      defaultMessage="Install the Elastic Agent on the hosts you wish to monitor. Do not install this agent policy on a host containing Fleet Server. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
+    />
+  );
+
+  const linuxUsers =
+    isK8s !== 'IS_KUBERNETES' ? (
+      <FormattedMessage
+        id="xpack.fleet.agentEnrollment.downloadUseLinuxInstaller"
+        defaultMessage="Linux users: We recommend the installer (TAR) over system packages (RPM/DEB) because it lets you upgrade your agent in Fleet."
+      />
+    ) : (
+      ''
+    );
+
+  const k8sCopyYaml =
+    isK8s === 'IS_KUBERNETES' ? (
+      <EuiCopy textToCopy={yaml}>
+        {(copy) => (
+          <EuiButton onClick={copy} iconType="copyClipboard">
+            <FormattedMessage
+              id="xpack.fleet.agentEnrollment.copyPolicyButton"
+              defaultMessage="Copy to clipboard"
+            />
+          </EuiButton>
+        )}
+      </EuiCopy>
+    ) : (
+      ''
+    );
+
+  const k8sYaml =
+    isK8s === 'IS_KUBERNETES' ? (
+      <EuiCodeBlock language="yaml" style={{ maxHeight: 300 }} fontSize="m">
+        {yaml}
+      </EuiCodeBlock>
+    ) : (
+      ''
+    );
+
+  const downloadLink =
+    isK8s === 'IS_KUBERNETES'
+      ? core.http.basePath.prepend(
+          `${agentPolicyRouteService.getK8sFullDownloadPath()}?fleetServer=${fleetServer}&enrolToken=${enrollmentAPIKey}`
+        )
+      : `https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`;
+
+  const downloadMsg =
+    isK8s === 'IS_KUBERNETES' ? (
+      <FormattedMessage
+        id="xpack.fleet.agentEnrollment.downloadManifestButtonk8s"
+        defaultMessage="Download Manifest"
+      />
+    ) : (
+      <FormattedMessage
+        id="xpack.fleet.agentEnrollment.downloadLink"
+        defaultMessage="Go to download page"
+      />
+    );
+
+  return (
+    <>
+      <EuiText>{downloadDescription}</EuiText>
+      <EuiSpacer size="s" />
+      <EuiText size="s">
+        <>{linuxUsers}</>
+      </EuiText>
+      <EuiSpacer size="m" />
+      <EuiFlexGroup gutterSize="m">
+        <EuiFlexItem grow={false}>
+          <EuiButton href={downloadLink} target="_blank" iconSide="right" iconType="popout">
+            <>{downloadMsg}</>
+          </EuiButton>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <>{k8sCopyYaml}</>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="m" />
+      <>{k8sYaml}</>
+    </>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
index 0adcfb26aa9c2..cde975fed45dd 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
@@ -59,7 +59,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<FlyOutProps> = ({
   const [isFleetServerPolicySelected, setIsFleetServerPolicySelected] = useState<boolean>(false);
   const [selectedApiKeyId, setSelectedAPIKeyId] = useState<string | undefined>();
   const [mode, setMode] = useState<FlyoutMode>(defaultMode);
-  const [selectionType, setSelectionType] = useState<SelectionType>('tabs');
+  const [selectionType, setSelectionType] = useState<SelectionType>();
 
   const {
     agentPolicies,
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx
index 6bb178921c2a9..81404df2eeabd 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { useMemo } from 'react';
-import { EuiText, EuiLink } from '@elastic/eui';
+import { EuiText, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import semverMajor from 'semver/functions/major';
@@ -14,7 +14,13 @@ import semverPatch from 'semver/functions/patch';
 
 import { useKibanaVersion } from '../../hooks';
 
-export const InstallationMessage: React.FunctionComponent = () => {
+import type { K8sMode } from './types';
+
+interface Props {
+  isK8s?: K8sMode;
+}
+
+export const InstallationMessage: React.FunctionComponent<Props> = ({ isK8s }) => {
   const kibanaVersion = useKibanaVersion();
   const kibanaVersionURLString = useMemo(
     () =>
@@ -23,37 +29,47 @@ export const InstallationMessage: React.FunctionComponent = () => {
   );
 
   return (
-    <EuiText>
-      <FormattedMessage
-        id="xpack.fleet.enrollmentInstructions.installationMessage"
-        defaultMessage="Select the appropriate platform and run commands to install, enroll, and start Elastic Agent. Reuse commands to set up agents on more than one host. For aarch64, see our {downloadLink}. For additional guidance, see our {installationLink}."
-        values={{
-          downloadLink: (
-            <EuiLink
-              target="_blank"
-              external
-              href={`https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`}
-            >
-              <FormattedMessage
-                id="xpack.fleet.enrollmentInstructions.downloadLink"
-                defaultMessage="downloads page"
-              />
-            </EuiLink>
-          ),
-          installationLink: (
-            <EuiLink
-              target="_blank"
-              external
-              href="https://www.elastic.co/guide/en/fleet/current/elastic-agent-installation.html"
-            >
-              <FormattedMessage
-                id="xpack.fleet.enrollmentInstructions.installationMessage.link"
-                defaultMessage="installation docs"
-              />
-            </EuiLink>
-          ),
-        }}
-      />
-    </EuiText>
+    <>
+      <EuiText>
+        {isK8s === 'IS_KUBERNETES' ? (
+          <FormattedMessage
+            id="xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s"
+            defaultMessage="From the directory where the Kubernetes manifest is downloaded, run the apply command."
+          />
+        ) : (
+          <FormattedMessage
+            id="xpack.fleet.enrollmentInstructions.installationMessage"
+            defaultMessage="Select the appropriate platform and run commands to install, enroll, and start Elastic Agent. Reuse commands to set up agents on more than one host. For aarch64, see our {downloadLink}. For additional guidance, see our {installationLink}."
+            values={{
+              downloadLink: (
+                <EuiLink
+                  target="_blank"
+                  external
+                  href={`https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`}
+                >
+                  <FormattedMessage
+                    id="xpack.fleet.enrollmentInstructions.downloadLink"
+                    defaultMessage="downloads page"
+                  />
+                </EuiLink>
+              ),
+              installationLink: (
+                <EuiLink
+                  target="_blank"
+                  external
+                  href="https://www.elastic.co/guide/en/fleet/current/elastic-agent-installation.html"
+                >
+                  <FormattedMessage
+                    id="xpack.fleet.enrollmentInstructions.installationMessage.link"
+                    defaultMessage="installation docs"
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        )}
+      </EuiText>
+      <EuiSpacer size="l" />
+    </>
   );
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
index 32ac217c353e8..5e6ea53261cd8 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
@@ -32,6 +32,7 @@ export const Instructions = (props: InstructionProps) => {
     isFleetServerPolicySelected,
     settings,
     isLoadingAgentPolicies,
+    selectionType,
     setSelectionType,
     mode,
     isIntegrationFlow,
@@ -89,13 +90,17 @@ export const Instructions = (props: InstructionProps) => {
     } else if (showAgentEnrollment) {
       return (
         <>
-          <EuiText>
-            <FormattedMessage
-              id="xpack.fleet.agentEnrollment.managedDescription"
-              defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
-            />
-          </EuiText>
-          <EuiSpacer size="l" />
+          {selectionType === 'tabs' && (
+            <>
+              <EuiText>
+                <FormattedMessage
+                  id="xpack.fleet.agentEnrollment.managedDescription"
+                  defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
+                />
+              </EuiText>
+              <EuiSpacer size="l" />
+            </>
+          )}
           {isFleetServerPolicySelected ? (
             <FleetServerSteps {...props} />
           ) : (
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx
index 743bf1a7fa578..13fb858739e7d 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx
@@ -26,7 +26,7 @@ export const AgentEnrollmentConfirmationStep = ({
 }): EuiContainedStepProps => {
   return {
     title: i18n.translate('xpack.fleet.agentEnrollment.stepAgentEnrollmentConfirmation', {
-      defaultMessage: 'Confirm agent Enrollment',
+      defaultMessage: 'Confirm agent enrollment',
     }),
     children: (
       <ConfirmAgentEnrollment
@@ -36,6 +36,6 @@ export const AgentEnrollmentConfirmationStep = ({
         agentCount={agentCount}
       />
     ),
-    status: !agentCount ? 'incomplete' : 'complete',
+    status: !agentCount ? undefined : 'complete',
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
index cae508299f259..46224e9e836ae 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
@@ -16,7 +16,7 @@ import type { FullAgentPolicy } from '../../../../common/types/models/agent_poli
 
 import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../services';
 
-import { StandaloneInstructions } from '../../enrollment_instructions/standalone';
+import { StandaloneInstructions, ManualInstructions } from '../../enrollment_instructions';
 
 import {
   useGetOneEnrollmentAPIKey,
@@ -45,6 +45,7 @@ import {
   AgentEnrollmentConfirmationStep,
   InstallManagedAgentStep,
   IncomingDataConfirmationStep,
+  DownloadStep,
 } from '.';
 
 export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
@@ -145,7 +146,9 @@ export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
       : [];
 
     if (selectionType === 'radio') {
-      steps.push(InstallationModeSelectionStep({ mode, setMode }));
+      steps.push(
+        InstallationModeSelectionStep({ selectedPolicyId: selectedPolicy?.id, mode, setMode })
+      );
     }
 
     steps.push(
@@ -161,7 +164,6 @@ export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
       InstallStandaloneAgentStep({
         installCommand: standaloneInstallCommands,
         isK8s,
-        selectedPolicyId: selectedPolicy?.id,
       })
     );
 
@@ -201,7 +203,9 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
   onClickViewAgents,
   isK8s,
   installedPackagePolicy,
+  isFleetServerPolicySelected,
 }) => {
+  const kibanaVersion = useKibanaVersion();
   const core = useStartServices();
   const { docLinks } = core;
   const link = docLinks.links.fleet.troubleshooting;
@@ -209,11 +213,14 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
 
   const apiKey = useGetOneEnrollmentAPIKey(selectedApiKeyId);
   const apiKeyData = apiKey?.data;
+  const enrollToken = apiKey.data ? apiKey.data.item.api_key : '';
+
   const enrolledAgentIds = usePollingAgentCount(selectedPolicy?.id || '');
 
   const fleetServerHosts = useMemo(() => {
     return settings?.fleet_server_hosts || [];
   }, [settings]);
+  const installManagedCommands = ManualInstructions(enrollToken, fleetServerHosts, kibanaVersion);
 
   const instructionsSteps = useMemo(() => {
     const steps: EuiContainedStepProps[] = !agentPolicy
@@ -236,14 +243,22 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
         ];
 
     if (selectionType === 'radio') {
-      steps.push(InstallationModeSelectionStep({ mode, setMode }));
+      steps.push(
+        InstallationModeSelectionStep({ selectedPolicyId: selectedPolicy?.id, mode, setMode })
+      );
+    }
+
+    if (isK8s === 'IS_KUBERNETES') {
+      steps.push(
+        DownloadStep(isFleetServerPolicySelected || false, isK8s || '', enrollToken || '')
+      );
     }
 
     steps.push(
       InstallManagedAgentStep({
+        installCommand: installManagedCommands,
         apiKeyData,
         selectedApiKeyId,
-        fleetServerHosts,
         isK8s,
       })
     );
@@ -257,13 +272,14 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
         })
       );
     }
-    if (selectedPolicy && enrolledAgentIds.length) {
+    if (selectedPolicy) {
       steps.push(
         IncomingDataConfirmationStep({
           agentIds: enrolledAgentIds,
           agentDataConfirmed,
           setAgentDataConfirmed,
           installedPolicy: installedPackagePolicy,
+          troubleshootLink: link,
         })
       );
     }
@@ -278,14 +294,16 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
     setSelectedPolicyId,
     refreshAgentPolicies,
     selectionType,
-    apiKeyData,
-    fleetServerHosts,
     isK8s,
+    installManagedCommands,
+    apiKeyData,
+    enrolledAgentIds,
     mode,
     setMode,
+    isFleetServerPolicySelected,
+    enrollToken,
     onClickViewAgents,
     link,
-    enrolledAgentIds,
     agentDataConfirmed,
     installedPackagePolicy,
   ]);
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx
index c0b64a88e19cc..39a7943ac0e32 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx
@@ -111,6 +111,6 @@ export const ConfigureStandaloneAgentStep = ({
         )}
       </>
     ),
-    status: !yaml ? 'loading' : 'incomplete',
+    status: !yaml ? 'loading' : undefined,
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx
index 5004fc0a6444e..2b0815fb64cde 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx
@@ -5,83 +5,18 @@
  * 2.0.
  */
 
-import React, { useEffect, useMemo, useState } from 'react';
-import {
-  EuiText,
-  EuiButton,
-  EuiSpacer,
-  EuiCode,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiCopy,
-  EuiCodeBlock,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
 import { i18n } from '@kbn/i18n';
-import semverMajor from 'semver/functions/major';
-import semverMinor from 'semver/functions/minor';
-import semverPatch from 'semver/functions/patch';
 
 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 
-import { useGetSettings, useKibanaVersion, useStartServices } from '../../../hooks';
-
-import { agentPolicyRouteService } from '../../../../common';
-
-import { sendGetK8sManifest } from '../../../hooks/use_request/k8s';
+import { DownloadInstructions } from '../download_instructions';
 
 export const DownloadStep = (
   hasFleetServer: boolean,
   isK8s?: string,
   enrollmentAPIKey?: string
 ): EuiContainedStepProps => {
-  const kibanaVersion = useKibanaVersion();
-  const core = useStartServices();
-  const settings = useGetSettings();
-  const kibanaVersionURLString = useMemo(
-    () =>
-      `${semverMajor(kibanaVersion)}-${semverMinor(kibanaVersion)}-${semverPatch(kibanaVersion)}`,
-    [kibanaVersion]
-  );
-  const { notifications } = core;
-
-  const [yaml, setYaml] = useState<any | undefined>();
-  const [fleetServer, setFleetServer] = useState<string | ''>();
-
-  useEffect(() => {
-    async function fetchK8sManifest() {
-      try {
-        if (isK8s !== 'IS_KUBERNETES') {
-          return;
-        }
-        const fleetServerHosts = settings.data?.item.fleet_server_hosts;
-        let host = '';
-        if (fleetServerHosts !== undefined && fleetServerHosts.length !== 0) {
-          setFleetServer(fleetServerHosts[0]);
-          host = fleetServerHosts[0];
-        }
-        const query = { fleetServer: host, enrolToken: enrollmentAPIKey };
-        const res = await sendGetK8sManifest(query);
-        if (res.error) {
-          throw res.error;
-        }
-
-        if (!res.data) {
-          throw new Error('No data while fetching agent manifest');
-        }
-
-        setYaml(res.data.item);
-      } catch (error) {
-        notifications.toasts.addError(error, {
-          title: i18n.translate('xpack.fleet.agentEnrollment.loadk8sManifestErrorTitle', {
-            defaultMessage: 'Error while fetching agent manifest',
-          }),
-        });
-      }
-    }
-    fetchK8sManifest();
-  }, [isK8s, notifications.toasts, enrollmentAPIKey, settings.data?.item.fleet_server_hosts]);
-
   const altTitle =
     isK8s === 'IS_KUBERNETES'
       ? i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentForK8sTitle', {
@@ -90,116 +25,21 @@ export const DownloadStep = (
       : i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentTitle', {
           defaultMessage: 'Download the Elastic Agent to your host',
         });
+
   const title = hasFleetServer
     ? i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle', {
         defaultMessage: 'Download the Fleet Server to a centralized host',
       })
     : altTitle;
 
-  const altDownloadDescription =
-    isK8s === 'IS_KUBERNETES' ? (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadDescriptionForK8s"
-        defaultMessage="Copy or download the Kubernetes manifest inside the Kubernetes cluster. Check {FleetUrlVariable} and {FleetTokenVariable} in the Daemonset environment variables and apply the manifest."
-        values={{
-          FleetUrlVariable: <EuiCode>FLEET_URL</EuiCode>,
-          FleetTokenVariable: <EuiCode>FLEET_ENROLLMENT_TOKEN</EuiCode>,
-        }}
-      />
-    ) : (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadDescription"
-        defaultMessage="Install the Elastic Agent on the hosts you wish to monitor. Do not install this agent policy on a host containing Fleet Server. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
-      />
-    );
-
-  const downloadDescription = hasFleetServer ? (
-    <FormattedMessage
-      id="xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer"
-      defaultMessage="Fleet Server runs on an Elastic Agent. Install this agent on a centralized host so that other hosts you wish to monitor can connect to it. In production, we recommend using one or more dedicated hosts. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
-    />
-  ) : (
-    altDownloadDescription
-  );
-
-  const linuxUsers =
-    isK8s !== 'IS_KUBERNETES' ? (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadUseLinuxInstaller"
-        defaultMessage="Linux users: We recommend the installer (TAR) over system packages (RPM/DEB) because it lets you upgrade your agent in Fleet."
-      />
-    ) : (
-      ''
-    );
-
-  const k8sCopyYaml =
-    isK8s === 'IS_KUBERNETES' ? (
-      <EuiCopy textToCopy={yaml}>
-        {(copy) => (
-          <EuiButton onClick={copy} iconType="copyClipboard">
-            <FormattedMessage
-              id="xpack.fleet.agentEnrollment.copyPolicyButton"
-              defaultMessage="Copy to clipboard"
-            />
-          </EuiButton>
-        )}
-      </EuiCopy>
-    ) : (
-      ''
-    );
-
-  const k8sYaml =
-    isK8s === 'IS_KUBERNETES' ? (
-      <EuiCodeBlock language="yaml" style={{ maxHeight: 300 }} fontSize="m">
-        {yaml}
-      </EuiCodeBlock>
-    ) : (
-      ''
-    );
-
-  const downloadLink =
-    isK8s === 'IS_KUBERNETES'
-      ? core.http.basePath.prepend(
-          `${agentPolicyRouteService.getK8sFullDownloadPath()}?fleetServer=${fleetServer}&enrolToken=${enrollmentAPIKey}`
-        )
-      : `https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`;
-
-  const downloadMsg =
-    isK8s === 'IS_KUBERNETES' ? (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadManifestButtonk8s"
-        defaultMessage="Download Manifest"
-      />
-    ) : (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadLink"
-        defaultMessage="Go to download page"
-      />
-    );
-
   return {
     title,
     children: (
-      <>
-        <EuiText>{downloadDescription}</EuiText>
-        <EuiSpacer size="s" />
-        <EuiText size="s">
-          <>{linuxUsers}</>
-        </EuiText>
-        <EuiSpacer size="m" />
-        <EuiFlexGroup gutterSize="m">
-          <EuiFlexItem grow={false}>
-            <EuiButton href={downloadLink} target="_blank" iconSide="right" iconType="popout">
-              <>{downloadMsg}</>
-            </EuiButton>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <>{k8sCopyYaml}</>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer size="m" />
-        <>{k8sYaml}</>
-      </>
+      <DownloadInstructions
+        hasFleetServer={hasFleetServer}
+        isK8s={isK8s}
+        enrollmentAPIKey={enrollmentAPIKey}
+      />
     ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
index 76cd1c07f4630..a35a318f40c5a 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
@@ -20,11 +20,13 @@ export const IncomingDataConfirmationStep = ({
   installedPolicy,
   agentDataConfirmed,
   setAgentDataConfirmed,
+  troubleshootLink,
 }: {
   agentIds: string[];
   installedPolicy?: InstalledIntegrationPolicy;
   agentDataConfirmed: boolean;
   setAgentDataConfirmed: (v: boolean) => void;
+  troubleshootLink: string;
 }): EuiContainedStepProps => {
   return {
     title: !agentDataConfirmed
@@ -34,14 +36,16 @@ export const IncomingDataConfirmationStep = ({
       : i18n.translate('xpack.fleet.agentEnrollment.stepConfirmIncomingData.completed', {
           defaultMessage: 'Incoming data confirmed',
         }),
-    children: (
-      <ConfirmIncomingData
-        agentIds={agentIds}
-        installedPolicy={installedPolicy}
-        agentDataConfirmed={agentDataConfirmed}
-        setAgentDataConfirmed={setAgentDataConfirmed}
-      />
-    ),
-    status: !agentDataConfirmed ? 'loading' : 'complete',
+    children:
+      agentIds.length > 0 ? (
+        <ConfirmIncomingData
+          agentIds={agentIds}
+          installedPolicy={installedPolicy}
+          agentDataConfirmed={agentDataConfirmed}
+          setAgentDataConfirmed={setAgentDataConfirmed}
+          troubleshootLink={troubleshootLink}
+        />
+      ) : null,
+    status: agentIds.length > 0 ? (!agentDataConfirmed ? 'loading' : 'complete') : 'disabled',
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
index 03e8c305a6fcb..59f6fdeafe727 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
@@ -13,29 +13,29 @@ import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/st
 
 import type { GetOneEnrollmentAPIKeyResponse } from '../../../../common/types/rest_spec/enrollment_api_key';
 
-import { ManualInstructions } from '../../enrollment_instructions';
+import { InstallSection } from '../../enrollment_instructions/install_section';
+import type { CommandsByPlatform } from '../../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
+
+import type { K8sMode } from '../types';
 
 export const InstallManagedAgentStep = ({
+  installCommand,
   selectedApiKeyId,
   apiKeyData,
-  fleetServerHosts,
   isK8s,
 }: {
-  fleetServerHosts: string[];
   selectedApiKeyId?: string;
   apiKeyData?: GetOneEnrollmentAPIKeyResponse | null;
-  isK8s?: string;
+  isK8s?: K8sMode;
+  installCommand: CommandsByPlatform;
 }): EuiContainedStepProps => {
   return {
+    status: selectedApiKeyId ? undefined : 'disabled',
     title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
       defaultMessage: 'Install Elastic Agent on your host',
     }),
     children: selectedApiKeyId && apiKeyData && (
-      <ManualInstructions
-        apiKey={apiKeyData.item}
-        fleetServerHosts={fleetServerHosts}
-        isK8s={isK8s}
-      />
+      <InstallSection installCommand={installCommand} isK8s={isK8s} />
     ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx
index f1c6ce88233db..fb6ddfd393dcc 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx
@@ -11,37 +11,21 @@ import { i18n } from '@kbn/i18n';
 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 
 import type { CommandsByPlatform } from '../../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
-import { PlatformSelector } from '../../enrollment_instructions/manual/platform_selector';
-
-import { InstallationMessage } from '../installation_message';
+import { InstallSection } from '../../enrollment_instructions/install_section';
 
 import type { K8sMode } from '../types';
 
 export const InstallStandaloneAgentStep = ({
   installCommand,
   isK8s,
-  selectedPolicyId,
 }: {
   installCommand: CommandsByPlatform;
   isK8s?: K8sMode;
-  selectedPolicyId?: string;
 }): EuiContainedStepProps => {
   return {
     title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
       defaultMessage: 'Install Elastic Agent on your host',
     }),
-    children: (
-      <>
-        <InstallationMessage />
-        <PlatformSelector
-          linuxCommand={installCommand.linux}
-          macCommand={installCommand.mac}
-          windowsCommand={installCommand.windows}
-          linuxDebCommand={installCommand.deb}
-          linuxRpmCommand={installCommand.rpm}
-          isK8s={isK8s === 'IS_KUBERNETES'}
-        />
-      </>
-    ),
+    children: <InstallSection installCommand={installCommand} isK8s={isK8s} />,
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
index 3864599fb6a94..c5213f061bceb 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
@@ -15,9 +15,11 @@ import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/st
 import type { FlyoutMode } from '../types';
 
 export const InstallationModeSelectionStep = ({
+  selectedPolicyId,
   mode,
   setMode,
 }: {
+  selectedPolicyId: string | undefined;
   mode: FlyoutMode;
   setMode: (v: FlyoutMode) => void;
 }): EuiContainedStepProps => {
@@ -32,10 +34,11 @@ export const InstallationModeSelectionStep = ({
   };
 
   return {
+    status: selectedPolicyId ? undefined : 'disabled',
     title: i18n.translate('xpack.fleet.agentEnrollment.stepInstallType', {
       defaultMessage: 'Enroll in Fleet?',
     }),
-    children: (
+    children: selectedPolicyId ? (
       <EuiRadioGroup
         options={[
           {
@@ -83,6 +86,6 @@ export const InstallationModeSelectionStep = ({
         onChange={onChangeCallback}
         name={`radio group ${radioSuffix}`}
       />
-    ),
+    ) : null,
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts
index 0c2d9361aa3d6..7c501df0b3f3b 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts
@@ -11,7 +11,7 @@ import type { InstalledIntegrationPolicy } from './use_get_agent_incoming_data';
 
 export type K8sMode = 'IS_LOADING' | 'IS_KUBERNETES' | 'IS_NOT_KUBERNETES';
 export type FlyoutMode = 'managed' | 'standalone';
-export type SelectionType = 'tabs' | 'radio';
+export type SelectionType = 'tabs' | 'radio' | undefined;
 
 export interface BaseProps {
   /**
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx
index 4922a7d10c78c..6422d1bc40acc 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import type { IncomingDataList } from '../../../common/types/rest_spec/agent';
 
-import { sendGetAgentIncomingData, useLink } from '../../hooks/index';
+import { sendGetAgentIncomingData, useLink } from '../../hooks';
 
 export interface InstalledIntegrationPolicy {
   name: string;
diff --git a/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx b/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx
index 01cd86064e6e6..09e7a30fa5f83 100644
--- a/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx
@@ -8,9 +8,10 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
 
-import { PackageIcon } from '../components';
 import { FLEET_SERVER_PACKAGE } from '../../common/constants';
 
+import { PackageIcon } from '.';
+
 interface Props {
   excludeFleetServer?: boolean;
   pkgName: string;
diff --git a/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx b/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx
index f4dd3a7deaaab..1194cd496c1dc 100644
--- a/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx
+++ b/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx
@@ -19,9 +19,10 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+
 import { AssetTitleMap } from '../applications/integrations/sections/epm/constants';
 import { useStartServices } from '../hooks';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
 
 export interface CustomAssetsAccordionProps {
   views: Array<{
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx
index 49b12112d1e7c..a6c799410e670 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx
@@ -6,3 +6,4 @@
  */
 
 export { ManualInstructions } from './manual';
+export { StandaloneInstructions } from './standalone';
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/install_section.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/install_section.tsx
new file mode 100644
index 0000000000000..0cf43902db7e2
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/install_section.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { InstallationMessage } from '../agent_enrollment_flyout/installation_message';
+
+import type { K8sMode } from '../agent_enrollment_flyout/types';
+
+import type { CommandsByPlatform } from '../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
+
+import { PlatformSelector } from './manual/platform_selector';
+
+interface Props {
+  installCommand: CommandsByPlatform;
+  isK8s: K8sMode | undefined;
+}
+
+export const InstallSection: React.FunctionComponent<Props> = ({ installCommand, isK8s }) => {
+  return (
+    <>
+      <InstallationMessage isK8s={isK8s} />
+      <PlatformSelector
+        linuxCommand={installCommand.linux}
+        macCommand={installCommand.mac}
+        windowsCommand={installCommand.windows}
+        linuxDebCommand={installCommand.deb}
+        linuxRpmCommand={installCommand.rpm}
+        isK8s={isK8s === 'IS_KUBERNETES'}
+      />
+    </>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx
index 077f9db0b05a2..5b777803552fb 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx
@@ -5,32 +5,16 @@
  * 2.0.
  */
 
-import React from 'react';
-
-import { useKibanaVersion } from '../../../hooks';
-import type { EnrollmentAPIKey } from '../../../types';
-
-import { InstallationMessage } from '../../agent_enrollment_flyout/installation_message';
-
-import { PlatformSelector } from './platform_selector';
-
-interface Props {
-  fleetServerHosts: string[];
-  apiKey: EnrollmentAPIKey;
-  isK8s: string | undefined;
-}
-
-function getfleetServerHostsEnrollArgs(apiKey: EnrollmentAPIKey, fleetServerHosts: string[]) {
-  return `--url=${fleetServerHosts[0]} --enrollment-token=${apiKey.api_key}`;
+function getfleetServerHostsEnrollArgs(apiKey: string, fleetServerHosts: string[]) {
+  return `--url=${fleetServerHosts[0]} --enrollment-token=${apiKey}`;
 }
 
-export const ManualInstructions: React.FunctionComponent<Props> = ({
-  apiKey,
-  fleetServerHosts,
-  isK8s,
-}) => {
+export const ManualInstructions = (
+  apiKey: string,
+  fleetServerHosts: string[],
+  kibanaVersion: string
+) => {
   const enrollArgs = getfleetServerHostsEnrollArgs(apiKey, fleetServerHosts);
-  const kibanaVersion = useKibanaVersion();
 
   const linuxCommand = `curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-${kibanaVersion}-linux-x86_64.tar.gz
 tar xzvf elastic-agent-${kibanaVersion}-linux-x86_64.tar.gz
@@ -55,17 +39,11 @@ sudo elastic-agent enroll ${enrollArgs} \nsudo systemctl enable elastic-agent \n
 sudo rpm -vi elastic-agent-${kibanaVersion}-x86_64.rpm
 sudo elastic-agent enroll ${enrollArgs} \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
 
-  return (
-    <>
-      <InstallationMessage />
-      <PlatformSelector
-        linuxCommand={linuxCommand}
-        macCommand={macCommand}
-        windowsCommand={windowsCommand}
-        linuxDebCommand={linuxDebCommand}
-        linuxRpmCommand={linuxRpmCommand}
-        isK8s={isK8s === 'IS_KUBERNETES'}
-      />
-    </>
-  );
+  return {
+    linux: linuxCommand,
+    mac: macCommand,
+    windows: windowsCommand,
+    deb: linuxDebCommand,
+    rpm: linuxRpmCommand,
+  };
 };
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx
index 9551d9a7eae87..e03e43907f829 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { EuiText, EuiSpacer, EuiCodeBlock, EuiButtonGroup, EuiCallOut } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiSpacer, EuiCodeBlock, EuiButtonGroup, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import type { PLATFORM_TYPE } from '../../../hooks';
@@ -53,21 +52,6 @@ export const PlatformSelector: React.FunctionComponent<Props> = ({
 
   return (
     <>
-      <EuiText>
-        {isK8s ? (
-          <FormattedMessage
-            id="xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s"
-            defaultMessage="From the directory where the Kubernetes manifest is downloaded, run the apply command."
-          />
-        ) : (
-          <FormattedMessage
-            id="xpack.fleet.agentEnrollment.stepRunAgentDescription"
-            defaultMessage="From the agent directory, run this command to install, enroll and start an Elastic Agent. You can reuse this command to set up agents on more than one host. Requires administrator privileges."
-          />
-        )}
-      </EuiText>
-      <EuiSpacer size="l" />
-
       {isK8s ? (
         <EuiCodeBlock fontSize="m" isCopyable={true} paddingSize="m">
           <CommandCode>{K8S_COMMAND}</CommandCode>
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx
index db36c16934e4b..89c1dfe3cac37 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { CommandsByPlatform } from '../../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
-import type { K8sMode } from '../../../components/agent_enrollment_flyout/types';
+import type { K8sMode } from '../../agent_enrollment_flyout/types';
 
 export const StandaloneInstructions = (
   kibanaVersion: string,
@@ -29,10 +29,10 @@ cd elastic-agent-${kibanaVersion}-windows-x86_64
 .\\elastic-agent.exe install`;
 
   const linuxDebCommand = `curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-${kibanaVersion}-amd64.deb
-  sudo dpkg -i elastic-agent-${kibanaVersion}-amd64.deb \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
+sudo dpkg -i elastic-agent-${kibanaVersion}-amd64.deb \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
 
   const linuxRpmCommand = `curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-${kibanaVersion}-x86_64.rpm
-  sudo rpm -vi elastic-agent-${kibanaVersion}-x86_64.rpm \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
+sudo rpm -vi elastic-agent-${kibanaVersion}-x86_64.rpm \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
 
   const linuxCommand =
     isK8s === 'IS_KUBERNETES' ? KUBERNETES_RUN_INSTRUCTIONS : STANDALONE_RUN_INSTRUCTIONS_LINUX;
diff --git a/x-pack/plugins/fleet/public/components/home_integration/index.tsx b/x-pack/plugins/fleet/public/components/home_integration/index.tsx
index 56123e5f32dee..c5f5b552caaf9 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/index.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import type {
   TutorialDirectoryHeaderLinkComponent,
   TutorialModuleNoticeComponent,
-} from 'src/plugins/home/public';
+} from '@kbn/home-plugin/public';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 const TutorialDirectoryHeaderLinkLazy = React.lazy(
diff --git a/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
index f72cb809f4c64..772a0fa905873 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
@@ -8,9 +8,10 @@
 import React, { memo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButtonEmpty } from '@elastic/eui';
-import type { TutorialDirectoryHeaderLinkComponent } from 'src/plugins/home/public';
+import type { TutorialDirectoryHeaderLinkComponent } from '@kbn/home-plugin/public';
+
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
-import { RedirectAppLinks } from '../../../../../../src/plugins/kibana_react/public';
 import { useLink, useStartServices } from '../../hooks';
 
 const TutorialDirectoryHeaderLink: TutorialDirectoryHeaderLinkComponent = memo(() => {
diff --git a/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
index ec608fe27549f..905f2c82e85c7 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
@@ -9,7 +9,7 @@ import React, { memo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiText, EuiLink, EuiSpacer, EuiIcon } from '@elastic/eui';
-import type { TutorialModuleNoticeComponent } from 'src/plugins/home/public';
+import type { TutorialModuleNoticeComponent } from '@kbn/home-plugin/public';
 
 import { useGetPackages, useLink, useStartServices } from '../../hooks';
 import { pkgKeyFromPackageInfo } from '../../services';
diff --git a/x-pack/plugins/fleet/public/hooks/use_core.ts b/x-pack/plugins/fleet/public/hooks/use_core.ts
index 2c817bfc938f8..0e65686ac38a7 100644
--- a/x-pack/plugins/fleet/public/hooks/use_core.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_core.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+
 import type { FleetStartServices } from '../plugin';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 
 export function useStartServices(): FleetStartServices {
   const { services } = useKibana<FleetStartServices>();
diff --git a/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts b/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
index 3ad01620b9780..7ab1b17b77caa 100644
--- a/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import { KibanaAssetType } from '../types';
 
-import { useStartServices } from './';
+import { useStartServices } from '.';
 
 const KIBANA_BASE_PATH = '/app/kibana';
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_link.ts b/x-pack/plugins/fleet/public/hooks/use_link.ts
index b04f51ef790fe..83dcc42c8b945 100644
--- a/x-pack/plugins/fleet/public/hooks/use_link.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_link.ts
@@ -8,7 +8,7 @@
 import { pagePathGetters, PLUGIN_ID } from '../constants';
 import type { StaticPage, DynamicPage, DynamicPagePathValues } from '../constants';
 
-import { useStartServices } from './';
+import { useStartServices } from '.';
 
 const getSeparatePaths = (
   page: StaticPage | DynamicPage,
diff --git a/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts b/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
index 733aaef8b9267..9c93117196e6f 100644
--- a/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
@@ -14,7 +14,7 @@ import type { PackageInfo, PackageListItem } from '../types';
 // Import the specific hook to avoid a circular dependency in Babel
 import { useLinks as useEPMLinks } from '../applications/integrations/hooks/use_links';
 
-import { sendGetPackageInfoByKey } from './index';
+import { sendGetPackageInfoByKey } from '.';
 
 type Package = PackageInfo | PackageListItem;
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts b/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
index 138c291a7226e..79afb6e2238da 100644
--- a/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
@@ -6,21 +6,21 @@
  */
 
 import { useState, useEffect } from 'react';
-import type { HttpSetup } from 'src/core/public';
+import type { HttpSetup } from '@kbn/core/public';
 
 import {
   sendRequest as _sendRequest,
   useRequest as _useRequest,
-} from '../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 import type {
   SendRequestConfig,
   SendRequestResponse,
   UseRequestConfig,
-} from '../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 let httpClient: HttpSetup;
 
-export type { UseRequestConfig } from '../../../../../../src/plugins/es_ui_shared/public';
+export type { UseRequestConfig } from '@kbn/es-ui-shared-plugin/public';
 
 /**
  * @internal
diff --git a/x-pack/plugins/fleet/public/index.ts b/x-pack/plugins/fleet/public/index.ts
index ee4fe526fb0e4..25714ead50a30 100644
--- a/x-pack/plugins/fleet/public/index.ts
+++ b/x-pack/plugins/fleet/public/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110901
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 import { FleetPlugin } from './plugin';
 
diff --git a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
index 5952fbebcf272..53e18896ca1f2 100644
--- a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
+++ b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
@@ -13,10 +13,11 @@ import { render as reactRender, act } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import type { RenderHookResult } from '@testing-library/react-hooks';
 
-import { themeServiceMock } from 'src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { ScopedHistory } from '@kbn/core/public';
 
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { ScopedHistory } from '../../../../../src/core/public';
 import { FleetAppContext } from '../applications/fleet/app';
 import { IntegrationsAppContext } from '../applications/integrations/app';
 import type { FleetConfigType } from '../plugin';
diff --git a/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx b/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
index edc9ac8b8fb3a..86188d15b5191 100644
--- a/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
+++ b/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
@@ -9,9 +9,10 @@ import React from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { MockedKeys } from '@kbn/utility-types/jest';
 
-import { coreMock } from '../../../../../src/core/public/mocks';
-import type { IStorage } from '../../../../../src/plugins/kibana_utils/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import type { IStorage } from '@kbn/kibana-utils-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+
 import { setHttpClient } from '../hooks/use_request';
 
 import type { FleetAuthz } from '../../common';
diff --git a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
index 842b690eb978f..3f5ce4a53d1f8 100644
--- a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
+++ b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
@@ -5,13 +5,14 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { licensingMock } from '../../../licensing/public/mocks';
-import { cloudMock } from '../../../cloud/public/mocks';
-import { homePluginMock } from '../../../../../src/plugins/home/public/mocks';
-import { navigationPluginMock } from '../../../../../src/plugins/navigation/public/mocks';
-import { customIntegrationsMock } from '../../../../../src/plugins/custom_integrations/public/mocks';
-import { sharePluginMock } from '../../../../../src/plugins/share/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { cloudMock } from '@kbn/cloud-plugin/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { navigationPluginMock } from '@kbn/navigation-plugin/public/mocks';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 export const createSetupDepsMock = () => {
   const cloud = cloudMock.createSetup();
@@ -27,6 +28,7 @@ export const createStartDepsMock = () => {
   return {
     licensing: licensingMock.createStart(),
     data: dataPluginMock.createStartContract(),
+    unifiedSearch: unifiedSearchPluginMock.createStartContract(),
     navigation: navigationPluginMock.createStartContract(),
     customIntegrations: customIntegrationsMock.createStart(),
     share: sharePluginMock.createStartContract(),
diff --git a/x-pack/plugins/fleet/public/plugin.ts b/x-pack/plugins/fleet/public/plugin.ts
index 4848b05084676..c94f2ce139ab6 100644
--- a/x-pack/plugins/fleet/public/plugin.ts
+++ b/x-pack/plugins/fleet/public/plugin.ts
@@ -12,38 +12,37 @@ import type {
   Plugin,
   PluginInitializerContext,
   CoreStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
-import type { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import type {
   CustomIntegrationsStart,
   CustomIntegrationsSetup,
-} from 'src/plugins/custom_integrations/public';
+} from '@kbn/custom-integrations-plugin/public';
 
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 
 import { once } from 'lodash';
 
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
-import type { CloudStart } from '../../cloud/public';
+import type { CloudStart } from '@kbn/cloud-plugin/public';
 
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
-import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../src/core/public';
+import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '@kbn/core/public';
+
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
+import type { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/public';
+
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { LicensingPluginStart } from '../../licensing/public';
-import type { CloudSetup } from '../../cloud/public';
-import type { GlobalSearchPluginSetup } from '../../global_search/public';
 import {
   PLUGIN_ID,
   INTEGRATIONS_PLUGIN_ID,
@@ -95,6 +94,7 @@ export interface FleetSetupDeps {
 export interface FleetStartDeps {
   licensing: LicensingPluginStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   navigation: NavigationPublicPluginStart;
   customIntegrations: CustomIntegrationsStart;
   share: SharePluginStart;
@@ -238,7 +238,7 @@ export class FleetPlugin implements Plugin<FleetSetup, FleetStart, FleetSetupDep
         icon: 'indexManagementApp',
         showOnHomePage: true,
         path: INTEGRATIONS_BASE_PATH,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         order: 510,
       });
     }
diff --git a/x-pack/plugins/fleet/public/search_provider.test.ts b/x-pack/plugins/fleet/public/search_provider.test.ts
index 43e6d93c8031c..9a053d1c859a5 100644
--- a/x-pack/plugins/fleet/public/search_provider.test.ts
+++ b/x-pack/plugins/fleet/public/search_provider.test.ts
@@ -8,7 +8,7 @@
 import { TestScheduler } from 'rxjs/testing';
 import { NEVER } from 'rxjs';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { createPackageSearchProvider, toSearchResult } from './search_provider';
 import type { GetPackagesResponse } from './types';
diff --git a/x-pack/plugins/fleet/public/search_provider.ts b/x-pack/plugins/fleet/public/search_provider.ts
index fe7cca92cf48d..9ce1ebc14c5e9 100644
--- a/x-pack/plugins/fleet/public/search_provider.ts
+++ b/x-pack/plugins/fleet/public/search_provider.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { CoreSetup, CoreStart, ApplicationStart, IBasePath } from 'src/core/public';
+import type { CoreSetup, CoreStart, ApplicationStart, IBasePath } from '@kbn/core/public';
 
 import type { Observable } from 'rxjs';
 import { from, of, combineLatest } from 'rxjs';
@@ -15,7 +15,7 @@ import { ICON_TYPES } from '@elastic/eui';
 import type {
   GlobalSearchResultProvider,
   GlobalSearchProviderResult,
-} from '../../global_search/public';
+} from '@kbn/global-search-plugin/public';
 
 import { epmRouteService, INTEGRATIONS_PLUGIN_ID } from '../common';
 
diff --git a/x-pack/plugins/fleet/public/services/custom_integrations.ts b/x-pack/plugins/fleet/public/services/custom_integrations.ts
index 6f6ee744005f2..14da59c416da7 100644
--- a/x-pack/plugins/fleet/public/services/custom_integrations.ts
+++ b/x-pack/plugins/fleet/public/services/custom_integrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CustomIntegrationsSetup } from '../../../../../src/plugins/custom_integrations/public';
+import type { CustomIntegrationsSetup } from '@kbn/custom-integrations-plugin/public';
 
 let customIntegrations: CustomIntegrationsSetup;
 
diff --git a/x-pack/plugins/fleet/public/types/intra_app_route_state.ts b/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
index 0ea40e6fe5695..a36a72ee3516c 100644
--- a/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
+++ b/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 /**
  * Supported query parameters for CreatePackagePolicyRouteState
diff --git a/x-pack/plugins/fleet/public/types/ui_extensions.ts b/x-pack/plugins/fleet/public/types/ui_extensions.ts
index 6c959bec1d785..233d9cf5385d6 100644
--- a/x-pack/plugins/fleet/public/types/ui_extensions.ts
+++ b/x-pack/plugins/fleet/public/types/ui_extensions.ts
@@ -8,7 +8,7 @@
 import type { EuiStepProps } from '@elastic/eui';
 import type { ComponentType, LazyExoticComponent } from 'react';
 
-import type { NewPackagePolicy, PackageInfo, PackagePolicy } from './index';
+import type { NewPackagePolicy, PackageInfo, PackagePolicy } from '.';
 
 /** Register a Fleet UI extension */
 export type UIExtensionRegistrationCallback = (extensionPoint: UIExtensionPoint) => void;
diff --git a/x-pack/plugins/fleet/scripts/install_all_packages/install_all_packages.ts b/x-pack/plugins/fleet/scripts/install_all_packages/install_all_packages.ts
index 7ff848f79185d..d9998d235a46e 100644
--- a/x-pack/plugins/fleet/scripts/install_all_packages/install_all_packages.ts
+++ b/x-pack/plugins/fleet/scripts/install_all_packages/install_all_packages.ts
@@ -6,7 +6,7 @@
  */
 
 import fetch from 'node-fetch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import ReadPackage from 'read-pkg';
 
 const REGISTRY_URL = 'https://epr-snapshot.elastic.co';
diff --git a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
index 9b7d48328467d..4828967462116 100644
--- a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
+++ b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClient, ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClient, ElasticsearchClient } from '@kbn/core/server';
 
 import type { FleetConfigType } from '../../common/types';
 import * as AgentService from '../services/agents';
diff --git a/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts b/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
index 9a1aca9486c60..f89b471a8d083 100644
--- a/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
+++ b/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
@@ -6,7 +6,7 @@
  */
 
 import { isBoom } from '@hapi/boom';
-import type { SavedObjectsClient, ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClient, ElasticsearchClient } from '@kbn/core/server';
 
 import { packagePolicyService, settingsService } from '../services';
 import { getAgentStatusForAgentPolicy } from '../services/agents';
diff --git a/x-pack/plugins/fleet/server/collectors/helpers.ts b/x-pack/plugins/fleet/server/collectors/helpers.ts
index 83970b0aa0d54..654d5936d7698 100644
--- a/x-pack/plugins/fleet/server/collectors/helpers.ts
+++ b/x-pack/plugins/fleet/server/collectors/helpers.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/server';
+import type { CoreSetup } from '@kbn/core/server';
 
-import { SavedObjectsClient } from '../../../../../src/core/server';
-import type { ElasticsearchClient } from '../../../../../src/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 export async function getInternalClients(
   core: CoreSetup
diff --git a/x-pack/plugins/fleet/server/collectors/package_collectors.ts b/x-pack/plugins/fleet/server/collectors/package_collectors.ts
index 01d1c2d966c78..228507d73993f 100644
--- a/x-pack/plugins/fleet/server/collectors/package_collectors.ts
+++ b/x-pack/plugins/fleet/server/collectors/package_collectors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClient } from 'kibana/server';
+import type { SavedObjectsClient } from '@kbn/core/server';
 import _ from 'lodash';
 
 import { getPackageSavedObjects } from '../services/epm/packages/get';
diff --git a/x-pack/plugins/fleet/server/collectors/register.ts b/x-pack/plugins/fleet/server/collectors/register.ts
index a097d423e7dd2..a0a373d0f435f 100644
--- a/x-pack/plugins/fleet/server/collectors/register.ts
+++ b/x-pack/plugins/fleet/server/collectors/register.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import type { CoreSetup } from 'kibana/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { CoreSetup } from '@kbn/core/server';
 
 import type { FleetConfigType } from '..';
 
diff --git a/x-pack/plugins/fleet/server/errors/handlers.test.ts b/x-pack/plugins/fleet/server/errors/handlers.test.ts
index 2d3fddeb951f4..95850829e9f97 100644
--- a/x-pack/plugins/fleet/server/errors/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/errors/handlers.test.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { createAppContextStartContractMock } from '../mocks';
 import { appContextService } from '../services';
@@ -17,7 +17,7 @@ import {
   PackageNotFoundError,
   PackageUnsupportedMediaTypeError,
   defaultIngestErrorHandler,
-} from './index';
+} from '.';
 
 describe('defaultIngestErrorHandler', () => {
   let mockContract: ReturnType<typeof createAppContextStartContractMock>;
diff --git a/x-pack/plugins/fleet/server/errors/handlers.ts b/x-pack/plugins/fleet/server/errors/handlers.ts
index e171a5bafba90..b42d2d4e0e5a4 100644
--- a/x-pack/plugins/fleet/server/errors/handlers.ts
+++ b/x-pack/plugins/fleet/server/errors/handlers.ts
@@ -12,8 +12,8 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   RequestHandlerContext,
-} from 'src/core/server';
-import type { KibanaRequest } from 'src/core/server';
+} from '@kbn/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { appContextService } from '../services';
 
@@ -27,7 +27,7 @@ import {
   RegistryConnectionError,
   RegistryError,
   RegistryResponseError,
-} from './index';
+} from '.';
 
 type IngestErrorHandler = (
   params: IngestErrorHandlerParams
diff --git a/x-pack/plugins/fleet/server/errors/index.ts b/x-pack/plugins/fleet/server/errors/index.ts
index ca3209a58b2a5..cb1de48ad1958 100644
--- a/x-pack/plugins/fleet/server/errors/index.ts
+++ b/x-pack/plugins/fleet/server/errors/index.ts
@@ -6,7 +6,7 @@
  */
 
 /* eslint-disable max-classes-per-file */
-import type { ElasticsearchErrorDetails } from 'src/core/server';
+import type { ElasticsearchErrorDetails } from '@kbn/core/server';
 
 import { isESClientError } from './utils';
 
diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
index efeac499bf953..3228c03959322 100644
--- a/x-pack/plugins/fleet/server/index.ts
+++ b/x-pack/plugins/fleet/server/index.ts
@@ -9,7 +9,7 @@ import path from 'path';
 
 import { schema } from '@kbn/config-schema';
 import type { TypeOf } from '@kbn/config-schema';
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import {
   PreconfiguredPackagesSchema,
@@ -39,6 +39,7 @@ export type {
   PostPackagePolicyDeleteCallback,
   PostPackagePolicyCreateCallback,
   FleetRequestHandlerContext,
+  PostPackagePolicyPostCreateCallback,
 } from './types';
 export { AgentNotFoundError, FleetUnauthorizedError } from './errors';
 
diff --git a/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap b/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap
index 40a8ceadbfdc8..4a93afd73b130 100644
--- a/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap
+++ b/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Fleet preconfiguration reset Preconfigred cloud policy Create correct .fleet-policies 1`] = `
+exports[`Fleet preconfiguration reset Preconfigured cloud policy With a full preconfigured cloud policy Create correct .fleet-policies 1`] = `
 Object {
   "agent": Object {
     "monitoring": Object {
@@ -19,7 +19,6 @@ Object {
       "meta": Object {
         "package": Object {
           "name": "fleet_server",
-          "version": "1.1.1",
         },
       },
       "name": "Fleet Server",
@@ -115,7 +114,6 @@ Object {
       "meta": Object {
         "package": Object {
           "name": "apm",
-          "version": "8.3.0-dev1",
         },
       },
       "name": "Elastic APM",
diff --git a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
index f3a4e045d042d..0442a48e22def 100644
--- a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
@@ -7,14 +7,18 @@
 
 import Path from 'path';
 
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import { AGENT_POLICY_INDEX } from '../../common';
 import type { PackagePolicySOAttributes } from '../../common';
 import type { AgentPolicySOAttributes } from '../types';
 
 import { useDockerRegistry, waitForFleetSetup } from './helpers';
-import { CLOUD_KIBANA_CONFIG } from './fixtures/cloud_kibana_config';
+import {
+  CLOUD_KIBANA_CONFIG,
+  CLOUD_KIBANA_CONFIG_WITHOUT_APM,
+  CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG,
+} from './fixtures';
 
 const logFilePath = Path.join(__dirname, 'logs.log');
 
@@ -24,7 +28,7 @@ describe('Fleet preconfiguration reset', () => {
 
   const registryUrl = useDockerRegistry();
 
-  const startServers = async () => {
+  const startServers = async (defaultKbnConfig: any = CLOUD_KIBANA_CONFIG) => {
     const { startES } = kbnTestServer.createTestServers({
       adjustTimeout: (t) => jest.setTimeout(t),
       settings: {
@@ -36,13 +40,17 @@ describe('Fleet preconfiguration reset', () => {
     });
 
     esServer = await startES();
-    const startKibana = async () => {
+    const startOrRestartKibana = async (kbnConfig: any = defaultKbnConfig) => {
+      if (kbnServer) {
+        await kbnServer.stop();
+      }
+
       const root = kbnTestServer.createRootWithCorePlugins(
         {
           xpack: {
-            ...CLOUD_KIBANA_CONFIG.xpack,
+            ...kbnConfig.xpack,
             fleet: {
-              ...CLOUD_KIBANA_CONFIG.xpack.fleet,
+              ...kbnConfig.xpack.fleet,
               registryUrl,
             },
           },
@@ -75,15 +83,19 @@ describe('Fleet preconfiguration reset', () => {
       const coreSetup = await root.setup();
       const coreStart = await root.start();
 
-      return {
+      kbnServer = {
         root,
         coreSetup,
         coreStart,
         stop: async () => await root.shutdown(),
       };
+      await waitForFleetSetup(kbnServer.root);
+    };
+    await startOrRestartKibana();
+
+    return {
+      startOrRestartKibana,
     };
-    kbnServer = await startKibana();
-    await waitForFleetSetup(kbnServer.root);
   };
 
   const stopServers = async () => {
@@ -98,63 +110,72 @@ describe('Fleet preconfiguration reset', () => {
     await new Promise((res) => setTimeout(res, 10000));
   };
 
-  // Share the same servers for all the test to make test a lot faster (but test are not isolated anymore)
-  beforeAll(async () => {
-    await startServers();
-  });
+  describe('Preconfigured cloud policy', () => {
+    describe('With a full preconfigured cloud policy', () => {
+      beforeAll(async () => {
+        await startServers();
+      });
 
-  afterAll(async () => {
-    await stopServers();
-  });
+      afterAll(async () => {
+        await stopServers();
+      });
+
+      it('Works and preconfigure correctly agent policies', async () => {
+        const agentPolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<AgentPolicySOAttributes>({
+            type: 'ingest-agent-policies',
+            perPage: 10000,
+          });
 
-  describe('Preconfigred cloud policy', () => {
-    it('Works and preconfigure correctly agent policies', async () => {
-      const agentPolicies = await kbnServer.coreStart.savedObjects
-        .createInternalRepository()
-        .find<AgentPolicySOAttributes>({
-          type: 'ingest-agent-policies',
-          perPage: 10000,
+        expect(agentPolicies.total).toBe(2);
+        expect(
+          agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
+        ).toBeDefined();
+        expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
+      });
+
+      it('Create correct .fleet-policies', async () => {
+        const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
+          index: AGENT_POLICY_INDEX,
+          q: `policy_id:policy-elastic-agent-on-cloud`,
+          sort: 'revision_idx:desc',
         });
 
-      expect(agentPolicies.total).toBe(2);
-      expect(
-        agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
-      ).toBeDefined();
-      expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
-    });
+        const data = (res.hits.hits[0]._source as any)!.data;
 
-    it('Create correct .fleet-policies', async () => {
-      const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
-        index: AGENT_POLICY_INDEX,
-        q: `policy_id:policy-elastic-agent-on-cloud`,
-        sort: 'revision_idx:desc',
+        // Remove package version to avoid upgrading this test for each new package dev version
+        data.inputs.forEach((input: any) => {
+          delete input.meta.package.version;
+        });
+
+        expect(data).toMatchSnapshot();
       });
 
-      expect((res.hits.hits[0]._source as any)!.data).toMatchSnapshot();
-    });
+      it('Create correct package policies', async () => {
+        const packagePolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<PackagePolicySOAttributes>({
+            type: 'ingest-package-policies',
+            perPage: 10000,
+          });
 
-    it('Create correct package policies', async () => {
-      const packagePolicies = await kbnServer.coreStart.savedObjects
-        .createInternalRepository()
-        .find<PackagePolicySOAttributes>({
-          type: 'ingest-package-policies',
-          perPage: 10000,
-        });
+        expect(packagePolicies.total).toBe(3);
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-fleet-server')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-apm')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'default-system')
+        ).toBeDefined();
 
-      expect(packagePolicies.total).toBe(3);
-      expect(
-        packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-fleet-server')
-      ).toBeDefined();
-      expect(
-        packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-apm')
-      ).toBeDefined();
-      expect(packagePolicies.saved_objects.find((so) => so.id === 'default-system')).toBeDefined();
-
-      const fleetServerPackagePolicy = packagePolicies.saved_objects.find(
-        (so) => so.id === 'elastic-cloud-fleet-server'
-      );
-      expect(fleetServerPackagePolicy?.attributes.vars).toMatchInlineSnapshot(`undefined`);
-      expect(fleetServerPackagePolicy?.attributes.inputs).toMatchInlineSnapshot(`
+        const fleetServerPackagePolicy = packagePolicies.saved_objects.find(
+          (so) => so.id === 'elastic-cloud-fleet-server'
+        );
+        expect(fleetServerPackagePolicy?.attributes.vars).toMatchInlineSnapshot(`undefined`);
+        expect(fleetServerPackagePolicy?.attributes.inputs).toMatchInlineSnapshot(`
         Array [
           Object {
             "compiled_input": Object {
@@ -195,6 +216,117 @@ describe('Fleet preconfiguration reset', () => {
           },
         ]
       `);
+      });
+    });
+    describe('Adding APM to a preconfigured agent policy after first setup', () => {
+      beforeAll(async () => {
+        // 1. Start with a preconfigured policy withtout APM
+        const { startOrRestartKibana } = await startServers(CLOUD_KIBANA_CONFIG_WITHOUT_APM);
+
+        // 2. Add APM to the preconfigured policy
+        await startOrRestartKibana(CLOUD_KIBANA_CONFIG);
+      });
+
+      afterAll(async () => {
+        await stopServers();
+      });
+
+      it('Works and preconfigure correctly agent policies', async () => {
+        const agentPolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<AgentPolicySOAttributes>({
+            type: 'ingest-agent-policies',
+            perPage: 10000,
+          });
+
+        expect(agentPolicies.total).toBe(2);
+        expect(
+          agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
+        ).toBeDefined();
+        expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
+      });
+
+      it('Create a .fleet-policies document with the APM package policy', async () => {
+        const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
+          index: AGENT_POLICY_INDEX,
+          q: `policy_id:policy-elastic-agent-on-cloud`,
+          sort: 'revision_idx:desc',
+        });
+
+        expect(
+          (res.hits.hits[0]._source as any)!.data.inputs.find(
+            (input: any) => input.meta.package.name === 'apm'
+          )
+        ).toBeDefined();
+      });
+
+      it('Create correct package policies', async () => {
+        const packagePolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<PackagePolicySOAttributes>({
+            type: 'ingest-package-policies',
+            perPage: 10000,
+          });
+
+        expect(packagePolicies.total).toBe(3);
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-fleet-server')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-apm')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'default-system')
+        ).toBeDefined();
+      });
+    });
+
+    describe('Adding package policy id to a preconfigured package policy after first setup', () => {
+      beforeAll(async () => {
+        // 1. Start with a preconfigured policy withtout APM
+        const { startOrRestartKibana } = await startServers(
+          CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG
+        );
+
+        // 2. Add pacakge policy ids to the preconfigured policy
+        await startOrRestartKibana(CLOUD_KIBANA_CONFIG);
+      });
+
+      afterAll(async () => {
+        await stopServers();
+      });
+
+      it('Works and preconfigure correctly agent policies', async () => {
+        const agentPolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<AgentPolicySOAttributes>({
+            type: 'ingest-agent-policies',
+            perPage: 10000,
+          });
+
+        expect(agentPolicies.total).toBe(2);
+        expect(
+          agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
+        ).toBeDefined();
+        expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
+      });
+
+      it('Create correct package policies and use the name of package policies instead of id', async () => {
+        const packagePolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<PackagePolicySOAttributes>({
+            type: 'ingest-package-policies',
+            perPage: 10000,
+          });
+
+        expect(packagePolicies.total).toBe(3);
+        expect(
+          packagePolicies.saved_objects.find((so) => so.attributes.name === 'Fleet Server')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.attributes.name === 'Elastic APM')
+        ).toBeDefined();
+      });
     });
   });
 });
diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_apm.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_apm.ts
new file mode 100644
index 0000000000000..07699a7880d62
--- /dev/null
+++ b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_apm.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const CLOUD_KIBANA_CONFIG_WITHOUT_APM = {
+  xpack: {
+    fleet: {
+      packages: [
+        {
+          name: 'fleet_server',
+          version: 'latest',
+        },
+        {
+          name: 'system',
+          version: 'latest',
+        },
+      ],
+      outputs: [
+        {
+          name: 'Elastic Cloud internal output',
+          type: 'elasticsearch',
+          id: 'es-containerhost',
+          hosts: ['https://cloudinternales:9200'],
+        },
+      ],
+      agentPolicies: [
+        {
+          name: 'Elastic Cloud agent policy',
+          description: 'Default agent policy for agents hosted on Elastic Cloud',
+          id: 'policy-elastic-agent-on-cloud',
+          data_output_id: 'es-containerhost',
+          monitoring_output_id: 'es-containerhost',
+          is_default: false,
+          is_managed: true,
+          is_default_fleet_server: false,
+          namespace: 'default',
+          monitoring_enabled: [],
+          unenroll_timeout: 86400,
+          package_policies: [
+            {
+              name: 'Fleet Server',
+              id: 'elastic-cloud-fleet-server',
+              package: {
+                name: 'fleet_server',
+              },
+              inputs: [
+                {
+                  type: 'fleet-server',
+                  keep_enabled: true,
+                  vars: [
+                    {
+                      name: 'host',
+                      value: '0.0.0.0',
+                      frozen: true,
+                    },
+                    {
+                      name: 'port',
+                      value: 8220,
+                      frozen: true,
+                    },
+                    {
+                      name: 'custom',
+                      value:
+                        'server.runtime:\n  gc_percent: 20          # Force the GC to execute more frequently: see https://golang.org/pkg/runtime/debug/#SetGCPercent\n',
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          name: 'Default policy',
+          id: 'default-policy',
+          description: 'Default agent policy created by Kibana',
+          is_default: true,
+          is_managed: false,
+          namespace: 'default',
+          monitoring_enabled: ['logs', 'metrics'],
+          package_policies: [
+            {
+              name: 'system-1',
+              id: 'default-system',
+              package: {
+                name: 'system',
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+};
diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_policy_id.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_policy_id.ts
new file mode 100644
index 0000000000000..8cc9b340ce50d
--- /dev/null
+++ b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_policy_id.ts
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG = {
+  xpack: {
+    fleet: {
+      packages: [
+        {
+          name: 'apm',
+          version: 'latest',
+        },
+        {
+          name: 'fleet_server',
+          version: 'latest',
+        },
+        {
+          name: 'system',
+          version: 'latest',
+        },
+      ],
+      outputs: [
+        {
+          name: 'Elastic Cloud internal output',
+          type: 'elasticsearch',
+          id: 'es-containerhost',
+          hosts: ['https://cloudinternales:9200'],
+        },
+      ],
+      agentPolicies: [
+        {
+          name: 'Elastic Cloud agent policy',
+          description: 'Default agent policy for agents hosted on Elastic Cloud',
+          id: 'policy-elastic-agent-on-cloud',
+          data_output_id: 'es-containerhost',
+          monitoring_output_id: 'es-containerhost',
+          is_default: false,
+          is_managed: true,
+          is_default_fleet_server: false,
+          namespace: 'default',
+          monitoring_enabled: [],
+          unenroll_timeout: 86400,
+          package_policies: [
+            {
+              name: 'Fleet Server',
+              package: {
+                name: 'fleet_server',
+              },
+              inputs: [
+                {
+                  type: 'fleet-server',
+                  keep_enabled: true,
+                  vars: [
+                    {
+                      name: 'host',
+                      value: '0.0.0.0',
+                      frozen: true,
+                    },
+                    {
+                      name: 'port',
+                      value: 8220,
+                      frozen: true,
+                    },
+                    {
+                      name: 'custom',
+                      value:
+                        'server.runtime:\n  gc_percent: 20          # Force the GC to execute more frequently: see https://golang.org/pkg/runtime/debug/#SetGCPercent\n',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              name: 'Elastic APM',
+              package: {
+                name: 'apm',
+              },
+              inputs: [
+                {
+                  type: 'apm',
+                  keep_enabled: true,
+                  vars: [
+                    {
+                      name: 'api_key_enabled',
+                      value: true,
+                    },
+                    {
+                      name: 'host',
+                      value: '0.0.0.0:8200',
+                      frozen: true,
+                    },
+                    {
+                      name: 'secret_token',
+                      value: 'CLOUD_SECRET_TOKEN',
+                    },
+                    {
+                      name: 'tls_enabled',
+                      value: true,
+                      frozen: true,
+                    },
+                    {
+                      name: 'tls_certificate',
+                      value: '/app/config/certs/node.crt',
+                      frozen: true,
+                    },
+                    {
+                      name: 'tls_key',
+                      value: '/app/config/certs/node.key',
+                      frozen: true,
+                    },
+                    {
+                      name: 'url',
+                      value: 'CLOUD_APM_URL',
+                      frozen: true,
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          name: 'Default policy',
+          id: 'default-policy',
+          description: 'Default agent policy created by Kibana',
+          is_default: true,
+          is_managed: false,
+          namespace: 'default',
+          monitoring_enabled: ['logs', 'metrics'],
+          package_policies: [
+            {
+              name: 'system-1',
+              id: 'default-system',
+              package: {
+                name: 'system',
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+};
diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/index.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/index.ts
new file mode 100644
index 0000000000000..90a83fab0360e
--- /dev/null
+++ b/x-pack/plugins/fleet/server/integration_tests/fixtures/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { CLOUD_KIBANA_CONFIG_WITHOUT_APM } from './cloud_kibana_config_without_apm';
+export { CLOUD_KIBANA_CONFIG } from './cloud_kibana_config';
+export { CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG } from './cloud_kibana_config_without_policy_id';
diff --git a/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts b/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
index 2a3a35072b0b3..b1c795ca93b38 100644
--- a/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
@@ -9,8 +9,8 @@ import Path from 'path';
 
 import { range } from 'lodash';
 
-import type { ISavedObjectsRepository } from 'src/core/server';
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import type {
   AgentPolicySOAttributes,
diff --git a/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts b/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts
index b413211fe9ae7..ff0cc32ab996d 100644
--- a/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts
@@ -7,8 +7,8 @@
 
 import { adminTestUser } from '@kbn/test';
 
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
-import type { HttpMethod } from 'src/core/test_helpers/kbn_server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
+import type { HttpMethod } from '@kbn/core/test_helpers/kbn_server';
 
 type Root = ReturnType<typeof kbnTestServer.createRoot>;
 
diff --git a/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
index 1c387dc628cbb..30bdf452cde12 100644
--- a/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
@@ -7,7 +7,7 @@
 
 import Path from 'path';
 
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import type { AgentPolicySOAttributes } from '../types';
 import { PRECONFIGURATION_DELETION_RECORD_SAVED_OBJECT_TYPE } from '../../common';
diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
index b229677a4ded9..01fe5b48f9e31 100644
--- a/x-pack/plugins/fleet/server/mocks/index.ts
+++ b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -12,11 +12,12 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
-import { licensingMock } from '../../../../plugins/licensing/server/mocks';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
+} from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+
 import type { PackagePolicyServiceInterface } from '../services/package_policy';
 import type { AgentPolicyServiceInterface } from '../services';
 import type { FleetAppContext } from '../plugin';
@@ -74,7 +75,7 @@ export const createAppContextStartContractMock = (
 };
 
 export const createFleetRequestHandlerContextMock = (): jest.Mocked<
-  FleetRequestHandlerContext['fleet']
+  Awaited<FleetRequestHandlerContext['fleet']>
 > => {
   return {
     authz: createFleetAuthzMock(),
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index b94c80be75c4b..c9e3b9388087d 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -23,28 +23,27 @@ import type {
   ServiceStatus,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
-import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
+import type { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server';
 
-import {
-  DEFAULT_APP_CATEGORIES,
-  SavedObjectsClient,
-  ServiceStatusLevels,
-} from '../../../../src/core/server';
-import type { PluginStart as DataPluginStart } from '../../../../src/plugins/data/server';
-import type { LicensingPluginStart } from '../../licensing/server';
+import { DEFAULT_APP_CATEGORIES, SavedObjectsClient, ServiceStatusLevels } from '@kbn/core/server';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type {
   EncryptedSavedObjectsPluginStart,
   EncryptedSavedObjectsPluginSetup,
-} from '../../encrypted_saved_objects/server';
-import type { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
+
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+
 import type { FleetConfigType, FleetAuthz } from '../common';
 import { INTEGRATIONS_PLUGIN_ID } from '../common';
-import type { CloudSetup } from '../../cloud/server';
-import type { SpacesPluginStart } from '../../spaces/server';
 
 import {
   PLUGIN_ID,
@@ -320,12 +319,11 @@ export class FleetPlugin
       PLUGIN_ID,
       async (context, request) => {
         const plugin = this;
+        const esClient = (await context.core).elasticsearch.client;
 
         return {
           get agentClient() {
-            const agentService = plugin.setupAgentService(
-              context.core.elasticsearch.client.asInternalUser
-            );
+            const agentService = plugin.setupAgentService(esClient.asInternalUser);
 
             return {
               asCurrentUser: agentService.asScoped(request),
@@ -383,6 +381,7 @@ export class FleetPlugin
 
     this.telemetryEventsSender.setup(deps.telemetry);
   }
+
   public start(core: CoreStart, plugins: FleetStartDeps): FleetStartContract {
     appContextService.start({
       elasticsearch: core.elasticsearch,
diff --git a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts
index b31cda7cbf61d..85f7ea672ecb4 100644
--- a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts
@@ -10,12 +10,12 @@ import type {
   KibanaResponseFactory,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   httpServerMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { NewAgentActionSchema } from '../../types/models';
 import type { ActionsService } from '../../services/agents';
diff --git a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts
index 42769d4caf6cb..4f3cad9edab26 100644
--- a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts
@@ -7,7 +7,7 @@
 
 // handlers that handle agent actions request
 
-import type { RequestHandler } from 'kibana/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type { PostNewAgentActionRequestSchema } from '../../types/rest_spec';
@@ -24,7 +24,7 @@ export const postNewAgentActionHandlerBuilder = function (
 > {
   return async (context, request, response) => {
     try {
-      const esClient = context.core.elasticsearch.client.asInternalUser;
+      const esClient = (await context.core).elasticsearch.client.asInternalUser;
 
       const agent = await actionsService.getAgent(esClient, request.params.agentId);
 
diff --git a/x-pack/plugins/fleet/server/routes/agent/handlers.ts b/x-pack/plugins/fleet/server/routes/agent/handlers.ts
index eb2fde7b5894b..b9e82e844e81b 100644
--- a/x-pack/plugins/fleet/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/handlers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
@@ -32,8 +32,9 @@ import * as AgentService from '../../services/agents';
 export const getAgentHandler: RequestHandler<
   TypeOf<typeof GetOneAgentRequestSchema.params>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   try {
     const body: GetOneAgentResponse = {
@@ -55,7 +56,8 @@ export const getAgentHandler: RequestHandler<
 export const deleteAgentHandler: RequestHandler<
   TypeOf<typeof DeleteAgentRequestSchema.params>
 > = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   try {
     await AgentService.deleteAgent(esClient, request.params.agentId);
@@ -82,7 +84,8 @@ export const updateAgentHandler: RequestHandler<
   undefined,
   TypeOf<typeof UpdateAgentRequestSchema.body>
 > = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   try {
     await AgentService.updateAgent(esClient, request.params.agentId, {
@@ -108,7 +111,8 @@ export const getAgentsHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetAgentsRequestSchema.query>
 > = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   try {
     const { agents, total, page, perPage } = await AgentService.getAgentsByKuery(esClient, {
@@ -143,8 +147,9 @@ export const putAgentsReassignHandler: RequestHandler<
   undefined,
   TypeOf<typeof PutAgentReassignRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     await AgentService.reassignAgent(
       soClient,
@@ -172,8 +177,9 @@ export const postBulkAgentsReassignHandler: RequestHandler<
     });
   }
 
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const agentOptions = Array.isArray(request.body.agents)
     ? { agentIds: request.body.agents }
     : { kuery: request.body.agents };
@@ -204,7 +210,8 @@ export const getAgentStatusForAgentPolicyHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetAgentStatusRequestSchema.query>
 > = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     const results = await AgentService.getAgentStatusForAgentPolicy(
       esClient,
@@ -224,7 +231,8 @@ export const getAgentDataHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetAgentDataRequestSchema.query>
 > = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asCurrentUser;
+  const coreContext = await context.core;
+  const esClient = coreContext.elasticsearch.client.asCurrentUser;
   try {
     let items;
 
diff --git a/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts b/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts
index 40dbc2fc49e66..f9d27ff71ed9d 100644
--- a/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
@@ -25,8 +25,9 @@ export const postAgentUnenrollHandler: RequestHandler<
   undefined,
   TypeOf<typeof PostAgentUnenrollRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     await AgentService.unenrollAgent(soClient, esClient, request.params.agentId, {
       force: request.body?.force,
@@ -52,8 +53,9 @@ export const postBulkAgentsUnenrollHandler: RequestHandler<
     });
   }
 
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const agentOptions = Array.isArray(request.body.agents)
     ? { agentIds: request.body.agents }
     : { kuery: request.body.agents };
diff --git a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
index 472f7378028bc..13df9222c9524 100644
--- a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 import semverCoerce from 'semver/functions/coerce';
 
@@ -22,8 +22,9 @@ export const postAgentUpgradeHandler: RequestHandler<
   undefined,
   TypeOf<typeof PostAgentUpgradeRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const { version, source_uri: sourceUri, force } = request.body;
   const kibanaVersion = appContextService.getKibanaVersion();
   try {
@@ -77,8 +78,9 @@ export const postBulkAgentsUpgradeHandler: RequestHandler<
   undefined,
   TypeOf<typeof PostBulkAgentUpgradeRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const { version, source_uri: sourceUri, agents, force } = request.body;
   const kibanaVersion = appContextService.getKibanaVersion();
   try {
diff --git a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
index f0ed469ad8443..7b6c2dce0ef04 100644
--- a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
@@ -6,7 +6,7 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { RequestHandler, ResponseHeaders } from 'src/core/server';
+import type { RequestHandler, ResponseHeaders } from '@kbn/core/server';
 import pMap from 'p-map';
 import { safeDump } from 'js-yaml';
 
@@ -45,8 +45,10 @@ export const getAgentPoliciesHandler: FleetRequestHandler<
   undefined,
   TypeOf<typeof GetAgentPoliciesRequestSchema.query>
 > = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const soClient = fleetContext.epm.internalSoClient;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const { full: withPackagePolicies = false, ...restOfQuery } = request.query;
   try {
     const { items, total, page, perPage } = await agentPolicyService.list(soClient, {
@@ -81,7 +83,8 @@ export const getAgentPoliciesHandler: FleetRequestHandler<
 export const getOneAgentPolicyHandler: RequestHandler<
   TypeOf<typeof GetOneAgentPolicyRequestSchema.params>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
   try {
     const agentPolicy = await agentPolicyService.get(soClient, request.params.agentPolicyId);
     if (agentPolicy) {
@@ -107,13 +110,15 @@ export const createAgentPolicyHandler: FleetRequestHandler<
   TypeOf<typeof CreateAgentPolicyRequestSchema.query>,
   TypeOf<typeof CreateAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const soClient = fleetContext.epm.internalSoClient;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   const withSysMonitoring = request.query.sys_monitoring ?? false;
   const monitoringEnabled = request.body.monitoring_enabled;
   const { has_fleet_server: hasFleetServer, ...newPolicy } = request.body;
-  const spaceId = context.fleet.spaceId;
+  const spaceId = fleetContext.spaceId;
   try {
     const body: CreateAgentPolicyResponse = {
       item: await createAgentPolicyWithPackages({
@@ -141,8 +146,9 @@ export const updateAgentPolicyHandler: RequestHandler<
   unknown,
   TypeOf<typeof UpdateAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   const { force, ...data } = request.body;
   try {
@@ -170,8 +176,9 @@ export const copyAgentPolicyHandler: RequestHandler<
   unknown,
   TypeOf<typeof CopyAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   try {
     const agentPolicy = await agentPolicyService.copy(
@@ -198,8 +205,9 @@ export const deleteAgentPoliciesHandler: RequestHandler<
   unknown,
   TypeOf<typeof DeleteAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     const body: DeleteAgentPolicyResponse = await agentPolicyService.delete(
       soClient,
@@ -218,7 +226,8 @@ export const getFullAgentPolicy: FleetRequestHandler<
   TypeOf<typeof GetFullAgentPolicyRequestSchema.params>,
   TypeOf<typeof GetFullAgentPolicyRequestSchema.query>
 > = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
+  const fleetContext = await context.fleet;
+  const soClient = fleetContext.epm.internalSoClient;
 
   if (request.query.kubernetes === true) {
     try {
@@ -273,7 +282,8 @@ export const downloadFullAgentPolicy: FleetRequestHandler<
   TypeOf<typeof GetFullAgentPolicyRequestSchema.params>,
   TypeOf<typeof GetFullAgentPolicyRequestSchema.query>
 > = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
+  const fleetContext = await context.fleet;
+  const soClient = fleetContext.epm.internalSoClient;
   const {
     params: { agentPolicyId },
   } = request;
diff --git a/x-pack/plugins/fleet/server/routes/app/index.ts b/x-pack/plugins/fleet/server/routes/app/index.ts
index 079850dc07478..9afa422d2511e 100644
--- a/x-pack/plugins/fleet/server/routes/app/index.ts
+++ b/x-pack/plugins/fleet/server/routes/app/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import { APP_API_ROUTES } from '../../constants';
@@ -28,7 +28,8 @@ export const getCheckPermissionsHandler: FleetRequestHandler<
   if (!appContextService.getSecurityLicense().isEnabled()) {
     return response.ok({ body: missingSecurityBody });
   } else {
-    if (!context.fleet.authz.fleet.all) {
+    const fleetContext = await context.fleet;
+    if (!fleetContext.authz.fleet.all) {
       return response.ok({
         body: {
           success: false,
@@ -38,7 +39,7 @@ export const getCheckPermissionsHandler: FleetRequestHandler<
     }
     // check the manage_service_account cluster privilege
     else if (request.query.fleetServerSetup) {
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
+      const esClient = (await context.core).elasticsearch.client.asCurrentUser;
       const { has_all_requested: hasAllPrivileges } = await esClient.security.hasPrivileges({
         body: { cluster: ['manage_service_account'] },
       });
@@ -59,7 +60,7 @@ export const getCheckPermissionsHandler: FleetRequestHandler<
 
 export const generateServiceTokenHandler: RequestHandler = async (context, request, response) => {
   // Generate the fleet server service token as the current user as the internal user do not have the correct permissions
-  const esClient = context.core.elasticsearch.client.asCurrentUser;
+  const esClient = (await context.core).elasticsearch.client.asCurrentUser;
   try {
     const tokenResponse = await esClient.transport.request<{
       created?: boolean;
diff --git a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
index 437806abf4e9e..2d01344a930aa 100644
--- a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
@@ -6,7 +6,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { keyBy, keys, merge } from 'lodash';
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 
 import type { DataStream } from '../../types';
 import { KibanaSavedObjectType } from '../../../common';
@@ -39,7 +39,8 @@ interface ESDataStreamInfo {
 
 export const getListHandler: RequestHandler = async (context, request, response) => {
   // Query datastreams as the current user as the Kibana internal user may not have all the required permission
-  const esClient = context.core.elasticsearch.client.asCurrentUser;
+  const { savedObjects, elasticsearch } = await context.core;
+  const esClient = elasticsearch.client.asCurrentUser;
 
   const body: GetDataStreamsResponse = {
     data_streams: [],
@@ -54,7 +55,7 @@ export const getListHandler: RequestHandler = async (context, request, response)
     ] = await Promise.all([
       esClient.indices.getDataStream({ name: DATA_STREAM_INDEX_PATTERN }),
       esClient.indices.dataStreamsStats({ name: DATA_STREAM_INDEX_PATTERN, human: true }),
-      getPackageSavedObjects(context.core.savedObjects.client),
+      getPackageSavedObjects(savedObjects.client),
     ]);
 
     const dataStreamsInfoByName = keyBy<ESDataStreamInfo>(dataStreamsInfo, 'name');
@@ -81,7 +82,7 @@ export const getListHandler: RequestHandler = async (context, request, response)
       allDashboards[pkgSavedObject.id] = dashboards;
       return allDashboards;
     }, {});
-    const allDashboardSavedObjectsResponse = await context.core.savedObjects.client.bulkGet<{
+    const allDashboardSavedObjectsResponse = await savedObjects.client.bulkGet<{
       title?: string;
     }>(
       Object.values(dashboardIdsByPackageName).flatMap((dashboardIds) =>
diff --git a/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
index 862da50abf71b..613bf1ad99be9 100644
--- a/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
@@ -29,7 +29,7 @@ export const getEnrollmentApiKeysHandler: RequestHandler<
   TypeOf<typeof GetEnrollmentAPIKeysRequestSchema.query>
 > = async (context, request, response) => {
   // Use kibana_system and depend on authz checks on HTTP layer to prevent abuse
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const esClient = (await context.core).elasticsearch.client.asInternalUser;
 
   try {
     const { items, total, page, perPage } = await APIKeyService.listEnrollmentApiKeys(esClient, {
@@ -55,8 +55,9 @@ export const postEnrollmentApiKeyHandler: RequestHandler<
   undefined,
   TypeOf<typeof PostEnrollmentAPIKeyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const { elasticsearch, savedObjects } = await context.core;
+  const soClient = savedObjects.client;
+  const esClient = elasticsearch.client.asInternalUser;
   try {
     // validate policy id
     await agentPolicyService.get(soClient, request.body.policy_id).catch((err) => {
@@ -84,7 +85,7 @@ export const postEnrollmentApiKeyHandler: RequestHandler<
 export const deleteEnrollmentApiKeyHandler: RequestHandler<
   TypeOf<typeof DeleteEnrollmentAPIKeyRequestSchema.params>
 > = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const esClient = (await context.core).elasticsearch.client.asInternalUser;
   try {
     await APIKeyService.deleteEnrollmentApiKey(esClient, request.params.keyId);
 
@@ -105,7 +106,7 @@ export const getOneEnrollmentApiKeyHandler: RequestHandler<
   TypeOf<typeof GetOneEnrollmentAPIKeyRequestSchema.params>
 > = async (context, request, response) => {
   // Use kibana_system and depend on authz checks on HTTP layer to prevent abuse
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const esClient = (await context.core).elasticsearch.client.asInternalUser;
   try {
     const apiKey = await APIKeyService.getEnrollmentAPIKey(esClient, request.params.keyId);
     const body: GetOneEnrollmentAPIKeyResponse = { item: apiKey };
diff --git a/x-pack/plugins/fleet/server/routes/epm/handlers.ts b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
index 7ba2d3f194eeb..c5ac0a6c8202e 100644
--- a/x-pack/plugins/fleet/server/routes/epm/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
@@ -10,7 +10,7 @@ import path from 'path';
 import type { TypeOf } from '@kbn/config-schema';
 import mime from 'mime-types';
 import semverValid from 'semver/functions/valid';
-import type { ResponseHeaders, KnownHeaders } from 'src/core/server';
+import type { ResponseHeaders, KnownHeaders } from '@kbn/core/server';
 
 import type {
   GetInfoResponse,
@@ -43,7 +43,7 @@ import {
   getCategories,
   getPackages,
   getFile,
-  getPackageInfoFromRegistry,
+  getPackageInfo,
   isBulkInstallError,
   installPackage,
   removeInstallation,
@@ -83,7 +83,7 @@ export const getListHandler: FleetRequestHandler<
   TypeOf<typeof GetPackagesRequestSchema.query>
 > = async (context, request, response) => {
   try {
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
+    const savedObjectsClient = (await context.fleet).epm.internalSoClient;
     const res = await getPackages({
       savedObjectsClient,
       ...request.query,
@@ -102,7 +102,7 @@ export const getListHandler: FleetRequestHandler<
 
 export const getLimitedListHandler: FleetRequestHandler = async (context, request, response) => {
   try {
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
+    const savedObjectsClient = (await context.fleet).epm.internalSoClient;
     const res = await getLimitedPackages({ savedObjectsClient });
     const body: GetLimitedPackagesResponse = {
       items: res,
@@ -121,7 +121,7 @@ export const getFileHandler: FleetRequestHandler<
 > = async (context, request, response) => {
   try {
     const { pkgName, pkgVersion, filePath } = request.params;
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
+    const savedObjectsClient = (await context.fleet).epm.internalSoClient;
     const installation = await getInstallation({ savedObjectsClient, pkgName });
     const useLocalFile = pkgVersion === installation?.version;
 
@@ -194,15 +194,16 @@ export const getInfoHandler: FleetRequestHandler<
   TypeOf<typeof GetInfoRequestSchema.params>
 > = async (context, request, response) => {
   try {
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
+    const savedObjectsClient = (await context.fleet).epm.internalSoClient;
     const { pkgName, pkgVersion } = request.params;
     if (pkgVersion && !semverValid(pkgVersion)) {
       throw new IngestManagerError('Package version is not a valid semver');
     }
-    const res = await getPackageInfoFromRegistry({
+    const res = await getPackageInfo({
       savedObjectsClient,
       pkgName,
       pkgVersion: pkgVersion || '',
+      skipArchive: true,
     });
     const body: GetInfoResponse = {
       item: res,
@@ -219,7 +220,7 @@ export const updatePackageHandler: FleetRequestHandler<
   TypeOf<typeof UpdatePackageRequestSchema.body>
 > = async (context, request, response) => {
   try {
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
+    const savedObjectsClient = (await context.fleet).epm.internalSoClient;
     const { pkgName } = request.params;
 
     const res = await updatePackage({ savedObjectsClient, pkgName, ...request.body });
@@ -238,7 +239,7 @@ export const getStatsHandler: FleetRequestHandler<
 > = async (context, request, response) => {
   try {
     const { pkgName } = request.params;
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
+    const savedObjectsClient = (await context.fleet).epm.internalSoClient;
     const body: GetStatsResponse = {
       response: await getPackageUsageStats({ savedObjectsClient, pkgName }),
     };
@@ -253,11 +254,13 @@ export const installPackageFromRegistryHandler: FleetRequestHandler<
   undefined,
   TypeOf<typeof InstallPackageFromRegistryRequestSchema.body>
 > = async (context, request, response) => {
-  const savedObjectsClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const savedObjectsClient = fleetContext.epm.internalSoClient;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const { pkgName, pkgVersion } = request.params;
 
-  const spaceId = context.fleet.spaceId;
+  const spaceId = fleetContext.spaceId;
   const res = await installPackage({
     installSource: 'registry',
     savedObjectsClient,
@@ -301,9 +304,11 @@ export const bulkInstallPackagesFromRegistryHandler: FleetRequestHandler<
   undefined,
   TypeOf<typeof BulkUpgradePackagesFromRegistryRequestSchema.body>
 > = async (context, request, response) => {
-  const savedObjectsClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
-  const spaceId = context.fleet.spaceId;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const savedObjectsClient = fleetContext.epm.internalSoClient;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
+  const spaceId = fleetContext.spaceId;
   const bulkInstalledResponses = await bulkInstallPackages({
     savedObjectsClient,
     esClient,
@@ -329,11 +334,13 @@ export const installPackageByUploadHandler: FleetRequestHandler<
       body: { message: 'Requires Enterprise license' },
     });
   }
-  const savedObjectsClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const savedObjectsClient = fleetContext.epm.internalSoClient;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const contentType = request.headers['content-type'] as string; // from types it could also be string[] or undefined but this is checked later
   const archiveBuffer = Buffer.from(request.body);
-  const spaceId = context.fleet.spaceId;
+  const spaceId = fleetContext.spaceId;
   const res = await installPackage({
     installSource: 'upload',
     savedObjectsClient,
@@ -363,8 +370,10 @@ export const deletePackageHandler: FleetRequestHandler<
 > = async (context, request, response) => {
   try {
     const { pkgName, pkgVersion } = request.params;
-    const savedObjectsClient = context.fleet.epm.internalSoClient;
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const coreContext = await context.core;
+    const fleetContext = await context.fleet;
+    const savedObjectsClient = fleetContext.epm.internalSoClient;
+    const esClient = coreContext.elasticsearch.client.asInternalUser;
     const res = await removeInstallation({
       savedObjectsClient,
       pkgName,
diff --git a/x-pack/plugins/fleet/server/routes/epm/index.ts b/x-pack/plugins/fleet/server/routes/epm/index.ts
index 544ab8b288cb4..2fe8727066e7d 100644
--- a/x-pack/plugins/fleet/server/routes/epm/index.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IKibanaResponse } from 'src/core/server';
+import type { IKibanaResponse } from '@kbn/core/server';
 
 import type {
   DeletePackageResponse,
diff --git a/x-pack/plugins/fleet/server/routes/output/handler.ts b/x-pack/plugins/fleet/server/routes/output/handler.ts
index d4372c22f32de..a995a3eeb41dc 100644
--- a/x-pack/plugins/fleet/server/routes/output/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/output/handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
@@ -26,7 +26,7 @@ import { agentPolicyService } from '../../services';
 import { generateLogstashApiKey, canCreateLogstashApiKey } from '../../services/api_keys';
 
 export const getOutputsHandler: RequestHandler = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const soClient = (await context.core).savedObjects.client;
   try {
     const outputs = await outputService.list(soClient);
 
@@ -46,7 +46,7 @@ export const getOutputsHandler: RequestHandler = async (context, request, respon
 export const getOneOuputHandler: RequestHandler<
   TypeOf<typeof GetOneOutputRequestSchema.params>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const soClient = (await context.core).savedObjects.client;
   try {
     const output = await outputService.get(soClient, request.params.outputId);
 
@@ -71,8 +71,9 @@ export const putOuputHandler: RequestHandler<
   undefined,
   TypeOf<typeof PutOutputRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     await outputService.update(soClient, request.params.outputId, request.body);
     const output = await outputService.get(soClient, request.params.outputId);
@@ -103,8 +104,9 @@ export const postOuputHandler: RequestHandler<
   undefined,
   TypeOf<typeof PostOutputRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   try {
     const { id, ...data } = request.body;
     const output = await outputService.create(soClient, data, { id });
@@ -125,7 +127,7 @@ export const postOuputHandler: RequestHandler<
 export const deleteOutputHandler: RequestHandler<
   TypeOf<typeof DeleteOutputRequestSchema.params>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const soClient = (await context.core).savedObjects.client;
   try {
     await outputService.delete(soClient, request.params.outputId);
 
@@ -146,7 +148,7 @@ export const deleteOutputHandler: RequestHandler<
 };
 
 export const postLogstashApiKeyHandler: RequestHandler = async (context, request, response) => {
-  const esClient = context.core.elasticsearch.client.asCurrentUser;
+  const esClient = (await context.core).elasticsearch.client.asCurrentUser;
   try {
     const hasCreatePrivileges = await canCreateLogstashApiKey(esClient);
     if (!hasCreatePrivileges) {
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
index 25d0f5c577667..222408c6e0524 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
-import type { KibanaRequest } from 'kibana/server';
-import type { RouteConfig } from 'kibana/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { RouteConfig } from '@kbn/core/server';
 
 import { PACKAGE_POLICY_API_ROUTES } from '../../../common/constants';
 import { appContextService, packagePolicyService } from '../../services';
@@ -26,7 +26,7 @@ import type { FleetAuthzRouter } from '../security';
 import type { FleetRequestHandler } from '../../types';
 import type { PackagePolicy } from '../../types';
 
-import { registerRoutes } from './index';
+import { registerRoutes } from '.';
 
 const packagePolicyServiceMock = packagePolicyService as jest.Mocked<PackagePolicyServiceInterface>;
 
@@ -85,7 +85,7 @@ jest.mock(
 jest.mock('../../services/epm/packages', () => {
   return {
     ensureInstalledPackage: jest.fn(() => Promise.resolve()),
-    getPackageInfoFromRegistry: jest.fn(() => Promise.resolve()),
+    getPackageInfo: jest.fn(() => Promise.resolve()),
   };
 });
 
@@ -93,7 +93,7 @@ describe('When calling package policy', () => {
   let routerMock: jest.Mocked<FleetAuthzRouter>;
   let routeHandler: FleetRequestHandler<any, any, any>;
   let routeConfig: RouteConfig<any, any, any, any>;
-  let context: jest.Mocked<FleetRequestHandlerContext>;
+  let context: FleetRequestHandlerContext;
   let response: ReturnType<typeof httpServerMock.createResponseFactory>;
 
   beforeEach(() => {
@@ -263,6 +263,38 @@ describe('When calling package policy', () => {
         });
       });
     });
+
+    describe('postCreate callback registration', () => {
+      it('should call to packagePolicyCreate and packagePolicyPostCreate call backs', async () => {
+        const request = getCreateKibanaRequest();
+        await routeHandler(context, request, response);
+
+        expect(response.ok).toHaveBeenCalled();
+        expect(packagePolicyService.runExternalCallbacks).toBeCalledTimes(2);
+
+        const firstCB = packagePolicyServiceMock.runExternalCallbacks.mock.calls[0][0];
+        const secondCB = packagePolicyServiceMock.runExternalCallbacks.mock.calls[1][0];
+
+        expect(firstCB).toEqual('packagePolicyCreate');
+        expect(secondCB).toEqual('packagePolicyPostCreate');
+      });
+
+      it('should not call packagePolicyPostCreate call back in case of packagePolicy create failed', async () => {
+        const request = getCreateKibanaRequest();
+
+        packagePolicyServiceMock.create.mockImplementationOnce(
+          async (soClient, esClient, newData) => {
+            throw new Error('foo');
+          }
+        );
+
+        await routeHandler(context, request, response);
+        const firstCB = packagePolicyServiceMock.runExternalCallbacks.mock.calls[0][0];
+
+        expect(firstCB).toEqual('packagePolicyCreate');
+        expect(packagePolicyService.runExternalCallbacks).toBeCalledTimes(1);
+      });
+    });
   });
 
   describe('update api handler', () => {
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
index de2045ff3e47c..ad46f25ff91de 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
@@ -8,8 +8,9 @@
 import type { TypeOf } from '@kbn/config-schema';
 import Boom from '@hapi/boom';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import type { RequestHandler } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import type { RequestHandler } from '@kbn/core/server';
+
 import { appContextService, packagePolicyService } from '../../services';
 import type {
   GetPackagePoliciesRequestSchema,
@@ -34,7 +35,7 @@ export const getPackagePoliciesHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetPackagePoliciesRequestSchema.query>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const soClient = (await context.core).savedObjects.client;
   try {
     const { items, total, page, perPage } = await packagePolicyService.list(
       soClient,
@@ -56,7 +57,7 @@ export const getPackagePoliciesHandler: RequestHandler<
 export const getOnePackagePolicyHandler: RequestHandler<
   TypeOf<typeof GetOnePackagePolicyRequestSchema.params>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const soClient = (await context.core).savedObjects.client;
   const { packagePolicyId } = request.params;
   const notFoundResponse = () =>
     response.notFound({ body: { message: `Package policy ${packagePolicyId} not found` } });
@@ -86,11 +87,13 @@ export const createPackagePolicyHandler: FleetRequestHandler<
   undefined,
   TypeOf<typeof CreatePackagePolicyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const soClient = fleetContext.epm.internalSoClient;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined;
   const { force, ...newPolicy } = request.body;
-  const spaceId = context.fleet.spaceId;
+  const spaceId = fleetContext.spaceId;
   try {
     const newPackagePolicy = await packagePolicyService.enrichPolicyWithDefaultsFromPackage(
       soClient,
@@ -110,7 +113,16 @@ export const createPackagePolicyHandler: FleetRequestHandler<
       force,
       spaceId,
     });
-    const body: CreatePackagePolicyResponse = { item: packagePolicy };
+
+    const enrichedPackagePolicy = await packagePolicyService.runExternalCallbacks(
+      'packagePolicyPostCreate',
+      packagePolicy,
+      context,
+      request
+    );
+
+    const body: CreatePackagePolicyResponse = { item: enrichedPackagePolicy };
+
     return response.ok({
       body,
     });
@@ -130,8 +142,9 @@ export const updatePackagePolicyHandler: RequestHandler<
   unknown,
   TypeOf<typeof UpdatePackagePolicyRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined;
   const packagePolicy = await packagePolicyService.get(soClient, request.params.packagePolicyId);
 
@@ -196,8 +209,9 @@ export const deletePackagePolicyHandler: RequestHandler<
   unknown,
   TypeOf<typeof DeletePackagePoliciesRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined;
   try {
     const body: DeletePackagePoliciesResponse = await packagePolicyService.delete(
@@ -231,8 +245,9 @@ export const upgradePackagePolicyHandler: RequestHandler<
   unknown,
   TypeOf<typeof UpgradePackagePoliciesRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined;
   try {
     const body: UpgradePackagePolicyResponse = await packagePolicyService.upgrade(
@@ -263,7 +278,7 @@ export const dryRunUpgradePackagePolicyHandler: RequestHandler<
   unknown,
   TypeOf<typeof DryRunPackagePoliciesRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+  const soClient = (await context.core).savedObjects.client;
   try {
     const body: UpgradePackagePolicyDryRunResponse = [];
     const { packagePolicyIds } = request.body;
diff --git a/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts b/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts
index 79fbfc7f9a686..bd0ed690ec6fe 100644
--- a/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts
@@ -16,17 +16,19 @@ import type {
 } from '../../types';
 import { defaultIngestErrorHandler } from '../../errors';
 import { ensurePreconfiguredPackagesAndPolicies, outputService } from '../../services';
-import { resetPreconfiguredAgentPolicies } from '../../services/preconfiguration/index';
+import { resetPreconfiguredAgentPolicies } from '../../services/preconfiguration/reset_agent_policies';
 
 export const updatePreconfigurationHandler: FleetRequestHandler<
   undefined,
   undefined,
   TypeOf<typeof PutPreconfigurationSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const fleetContext = await context.fleet;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
   const defaultOutput = await outputService.ensureDefaultOutput(soClient);
-  const spaceId = context.fleet.spaceId;
+  const spaceId = fleetContext.spaceId;
   const { agentPolicies, packages } = request.body;
 
   try {
@@ -49,8 +51,9 @@ export const resetOnePreconfigurationHandler: FleetRequestHandler<
   undefined,
   undefined
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   try {
     await resetPreconfiguredAgentPolicies(soClient, esClient, request.params.agentPolicyId);
@@ -65,8 +68,9 @@ export const resetPreconfigurationHandler: FleetRequestHandler<
   undefined,
   undefined
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const coreContext = await context.core;
+  const soClient = coreContext.savedObjects.client;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   try {
     await resetPreconfiguredAgentPolicies(soClient, esClient);
diff --git a/x-pack/plugins/fleet/server/routes/security.test.ts b/x-pack/plugins/fleet/server/routes/security.test.ts
index 67ffb074c705d..fac6252cc1e16 100644
--- a/x-pack/plugins/fleet/server/routes/security.test.ts
+++ b/x-pack/plugins/fleet/server/routes/security.test.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandler, RouteConfig } from '../../../../../src/core/server';
-import { coreMock } from '../../../../../src/core/server/mocks';
-import type { AuthenticatedUser, CheckPrivilegesPayload } from '../../../security/server';
-import type { CheckPrivilegesResponse } from '../../../security/server/authorization/types';
-import type { CheckPrivilegesDynamically } from '../../../security/server/authorization/check_privileges_dynamically';
+import type { IRouter, RequestHandler, RouteConfig } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import type { AuthenticatedUser, CheckPrivilegesPayload } from '@kbn/security-plugin/server';
+import type { CheckPrivilegesResponse } from '@kbn/security-plugin/server/authorization/types';
+import type { CheckPrivilegesDynamically } from '@kbn/security-plugin/server/authorization/check_privileges_dynamically';
+
 import { createAppContextStartContractMock } from '../mocks';
 import { appContextService } from '../services';
 import type { FleetRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/fleet/server/routes/security.ts b/x-pack/plugins/fleet/server/routes/security.ts
index cdf997a4d0ead..7b860af6e1170 100644
--- a/x-pack/plugins/fleet/server/routes/security.ts
+++ b/x-pack/plugins/fleet/server/routes/security.ts
@@ -13,7 +13,7 @@ import type {
   RequestHandler,
   RequestHandlerContext,
   OnPostAuthHandler,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { FleetAuthz } from '../../common';
 import { calculateAuthz, INTEGRATIONS_PLUGIN_ID } from '../../common';
diff --git a/x-pack/plugins/fleet/server/routes/settings/index.ts b/x-pack/plugins/fleet/server/routes/settings/index.ts
index a6203de097c7b..07bd3342ade1d 100644
--- a/x-pack/plugins/fleet/server/routes/settings/index.ts
+++ b/x-pack/plugins/fleet/server/routes/settings/index.ts
@@ -15,7 +15,7 @@ import { settingsService, agentPolicyService, appContextService } from '../../se
 import type { FleetAuthzRouter } from '../security';
 
 export const getSettingsHandler: FleetRequestHandler = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
+  const soClient = (await context.fleet).epm.internalSoClient;
 
   try {
     const settings = await settingsService.getSettings(soClient);
@@ -39,8 +39,8 @@ export const putSettingsHandler: FleetRequestHandler<
   undefined,
   TypeOf<typeof PutSettingsRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.fleet.epm.internalSoClient;
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const soClient = (await context.fleet).epm.internalSoClient;
+  const esClient = (await context.core).elasticsearch.client.asInternalUser;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
 
   try {
diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
index bacbff982daec..400c18e85415b 100644
--- a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { httpServerMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import type { AwaitedProperties } from '@kbn/utility-types';
+import { httpServerMock, savedObjectsClientMock, coreMock } from '@kbn/core/server/mocks';
 
 import type { PostFleetSetupResponse } from '../../../common';
 import { RegistryError } from '../../errors';
@@ -29,7 +30,7 @@ jest.mock('../../services/setup', () => {
 const mockSetupFleet = setupFleet as jest.MockedFunction<typeof setupFleet>;
 
 describe('FleetSetupHandler', () => {
-  let context: FleetRequestHandlerContext;
+  let context: AwaitedProperties<Omit<FleetRequestHandlerContext, 'resolve'>>;
   let response: ReturnType<typeof httpServerMock.createResponseFactory>;
   let request: ReturnType<typeof httpServerMock.createKibanaRequest>;
 
@@ -69,7 +70,7 @@ describe('FleetSetupHandler', () => {
         nonFatalErrors: [],
       })
     );
-    await fleetSetupHandler(context, request, response);
+    await fleetSetupHandler(coreMock.createCustomRequestHandlerContext(context), request, response);
 
     const expectedBody: PostFleetSetupResponse = {
       isInitialized: true,
@@ -81,7 +82,7 @@ describe('FleetSetupHandler', () => {
 
   it('POST /setup fails w/500 on custom error', async () => {
     mockSetupFleet.mockImplementation(() => Promise.reject(new Error('SO method mocked to throw')));
-    await fleetSetupHandler(context, request, response);
+    await fleetSetupHandler(coreMock.createCustomRequestHandlerContext(context), request, response);
 
     expect(response.customError).toHaveBeenCalledTimes(1);
     expect(response.customError).toHaveBeenCalledWith({
@@ -97,7 +98,7 @@ describe('FleetSetupHandler', () => {
       Promise.reject(new RegistryError('Registry method mocked to throw'))
     );
 
-    await fleetSetupHandler(context, request, response);
+    await fleetSetupHandler(coreMock.createCustomRequestHandlerContext(context), request, response);
     expect(response.customError).toHaveBeenCalledTimes(1);
     expect(response.customError).toHaveBeenCalledWith({
       statusCode: 502,
diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.ts
index dac5828329a22..59a3516aac83a 100644
--- a/x-pack/plugins/fleet/server/routes/setup/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/handlers.ts
@@ -17,8 +17,9 @@ export const getFleetStatusHandler: FleetRequestHandler = async (context, reques
     const isApiKeysEnabled = await appContextService
       .getSecurity()
       .authc.apiKeys.areAPIKeysEnabled();
+    const coreContext = await context.core;
     const isFleetServerSetup = await hasFleetServers(
-      context.core.elasticsearch.client.asInternalUser
+      coreContext.elasticsearch.client.asInternalUser
     );
 
     const missingRequirements: GetFleetStatusResponse['missing_requirements'] = [];
@@ -52,8 +53,8 @@ export const getFleetStatusHandler: FleetRequestHandler = async (context, reques
 
 export const fleetSetupHandler: FleetRequestHandler = async (context, request, response) => {
   try {
-    const soClient = context.fleet.epm.internalSoClient;
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const soClient = (await context.fleet).epm.internalSoClient;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     const setupStatus = await setupFleet(soClient, esClient);
     const body: PostFleetSetupResponse = {
       ...setupStatus,
diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts
index 915d841dd287e..2a8f14f795f7c 100644
--- a/x-pack/plugins/fleet/server/saved_objects/index.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/index.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-import type { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
+import type { SavedObjectsServiceSetup, SavedObjectsType } from '@kbn/core/server';
+
+import type { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 
-import type { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import {
   OUTPUT_SAVED_OBJECT_TYPE,
   AGENT_POLICY_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts
index 13a4b185e5ea8..4461cf288dc9d 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts
index c17a167184b4b..3dfb9b649b6fc 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts
index d64fb55ba65a2..ef26ab759999e 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts
index 4fc8c15044e82..67ba8c1073c7f 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts
index 75e2922bd5149..be6888f802400 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeepWith, cloneDeep } from 'lodash';
 
-import type { PackagePolicy } from '../../../../common';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
-import { migrationMocks } from '../../../../../../../src/core/server/mocks';
+import type { PackagePolicy } from '../../../../common';
 
 import { migrateEndpointPackagePolicyToV7130 } from './to_v7_13_0';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts
index 655ce37b4faaf..0953eb92fcb4c 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 import { relativeDownloadUrlFromArtifact } from '../../../services/artifacts/mappings';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts
index 1d3f3782d482a..3340d4af0085b 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts
index a56ef13375149..0c711ed4b935d 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts
index 6064bcaf99e37..38866e7f971dd 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts
index 7f96cda589462..350ac4f60275b 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts
index 5311d9c8cd7ee..a062f3f4097f6 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts
index ca565ca086756..240ba86b9b1af 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts
index dabd76dd48635..c6e853569b594 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts
index d6610915c0031..b20a2b87944c6 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts
index bb54c55ac75a6..7c5c3c6fb4cf1 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { AgentPolicy, PackagePolicy, Settings } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts
index fde71388cbbde..ab62c741a32a9 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { AgentPolicy } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts
index eede38aca78e9..a2cbebd74de70 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { Settings } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts
index 90c9ac5f8e89b..fea88312d9542 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy, Installation } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts
index 27758296d8d95..36788d2af9d09 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts
index 66331dab47cc8..0091aec0de5f2 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { Installation, PackagePolicy } from '../../../common';
 import {
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts
index 61db35fd9faf5..b4474b46013d2 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { Installation, Output } from '../../../common';
 import { AUTO_UPGRADE_POLICIES_PACKAGES } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts
index e75bafb9e24c0..a880e2c85f12a 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts
index ba9252dd09a8f..f283581466664 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { AgentPolicy, Output } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
index 3114ac3c0a8ed..a4b618d0323a1 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { safeLoad } from 'js-yaml';
 
 import type {
@@ -27,7 +27,7 @@ import { getSettings } from '../settings';
 import { DEFAULT_OUTPUT } from '../../constants';
 
 import { getMonitoringPermissions } from './monitoring_permissions';
-import { storedPackagePoliciesToAgentInputs } from './';
+import { storedPackagePoliciesToAgentInputs } from '.';
 
 export async function getFullAgentPolicy(
   soClient: SavedObjectsClientContract,
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
index 097cbd551fad5..f336fd093c3af 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { Installation, PackageInfo } from '../../types';
 import { getPackageInfo, getInstallation } from '../epm/packages';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
index 7e897d62c8be9..11e6a486d69c3 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { getPackageInfo, getInstallation } from '../epm/packages';
 import { getDataStreamPrivileges } from '../package_policies_to_agent_permissions';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts
index 4bbcdaabe9b50..ebc596cb59ac6 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { appContextService } from '..';
 import { outputService } from '../output';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts b/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts
index 42a48f66de919..a3e0c295933af 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { AgentPolicySOAttributes } from '../../types';
 import { LICENCE_FOR_PER_POLICY_OUTPUT, outputType } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts
index 0812e3f593c66..a3c4f7754f5fa 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PackagePolicy, PackagePolicyInput } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
index f2c11c2067ee7..9189d99bed488 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { merge } from 'lodash';
 
 import { isPackageLimited } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
index 214237868dd83..a71180f235288 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 import type {
   AgentPolicy,
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
index 37af4e646658b..d3ce069ed5cc6 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -14,9 +14,10 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   SavedObjectsBulkUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
+
+import type { AuthenticatedUser } from '@kbn/security-plugin/server';
 
-import type { AuthenticatedUser } from '../../../security/server';
 import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   AGENTS_PREFIX,
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts b/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts
index 6be992b7f7a8b..c477d08395552 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { AgentPolicy, PackagePolicy } from '../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_create.ts b/x-pack/plugins/fleet/server/services/agent_policy_create.ts
index 7ec6662192a05..888dd3eb34df2 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_create.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_create.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
-import type { AuthenticatedUser } from '../../../security/common/model';
+import type { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
 import {
   FLEET_ELASTIC_AGENT_PACKAGE,
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_update.ts b/x-pack/plugins/fleet/server/services/agent_policy_update.ts
index 30472c242ba45..7ff4383afd337 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_update.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_update.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForAgentPolicyId } from './api_keys';
 import { unenrollForAgentPolicyId } from './agents';
diff --git a/x-pack/plugins/fleet/server/services/agents/actions.ts b/x-pack/plugins/fleet/server/services/agents/actions.ts
index dbd7105fd5607..3ea8060e8e492 100644
--- a/x-pack/plugins/fleet/server/services/agents/actions.ts
+++ b/x-pack/plugins/fleet/server/services/agents/actions.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { Agent, AgentAction, FleetServerAgentAction } from '../../../common/types/models';
 import { AGENT_ACTIONS_INDEX } from '../../../common/constants';
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts b/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
index 7ccc37c9d9867..3a49fb99dfb0e 100644
--- a/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
@@ -9,8 +9,9 @@ jest.mock('../../routes/security');
 jest.mock('./crud');
 jest.mock('./status');
 
-import type { ElasticsearchClient } from '../../../../../../src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from '../../../../../../src/core/server/mocks';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+
 import { FleetUnauthorizedError } from '../../errors';
 
 import { getAuthzFromRequest } from '../../routes/security';
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_service.ts b/x-pack/plugins/fleet/server/services/agents/agent_service.ts
index d23f3b0c88ad9..bf0ee1f92871f 100644
--- a/x-pack/plugins/fleet/server/services/agents/agent_service.ts
+++ b/x-pack/plugins/fleet/server/services/agents/agent_service.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable max-classes-per-file */
 
-import type { ElasticsearchClient, KibanaRequest } from 'kibana/server';
+import type { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
 
 import type { AgentStatus, ListWithKuery } from '../../types';
 import type { Agent, GetAgentStatusResponse } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.test.ts b/x-pack/plugins/fleet/server/services/agents/crud.test.ts
index f6988c1c7d280..5a1b47a7b359a 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { Agent } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts
index 03b71ceb496f2..258f0bf7d4898 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.ts
@@ -7,13 +7,13 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 
 import type { KueryNode } from '@kbn/es-query';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 
 import type { AgentSOAttributes, Agent, BulkActionResult, ListWithKuery } from '../../types';
-import { appContextService, agentPolicyService } from '../../services';
+import { appContextService, agentPolicyService } from '..';
 import type { FleetServerAgent } from '../../../common';
 import { isAgentUpgradeable, SO_SEARCH_LIMIT } from '../../../common';
 import { AGENTS_PREFIX, AGENTS_INDEX } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/services/agents/helpers.ts b/x-pack/plugins/fleet/server/services/agents/helpers.ts
index 2b18336f298d2..08c0c7ba964dc 100644
--- a/x-pack/plugins/fleet/server/services/agents/helpers.ts
+++ b/x-pack/plugins/fleet/server/services/agents/helpers.ts
@@ -7,7 +7,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { SearchHit } from '../../../../../../src/core/types/elasticsearch';
+import type { SearchHit } from '@kbn/core/types/elasticsearch';
+
 import type { Agent, AgentSOAttributes, FleetServerAgent } from '../../types';
 import { getAgentStatus } from '../../../common/services/agent_status';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
index 3a25efc6d49d1..59267ab6de6db 100644
--- a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObject } from 'kibana/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import type { AgentPolicy } from '../../types';
 import { HostedAgentPolicyRestrictionRelatedError } from '../../errors';
diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.ts b/x-pack/plugins/fleet/server/services/agents/reassign.ts
index ee64504292874..d342e8d54bb84 100644
--- a/x-pack/plugins/fleet/server/services/agents/reassign.ts
+++ b/x-pack/plugins/fleet/server/services/agents/reassign.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 
 import type { Agent, BulkActionResult } from '../../types';
@@ -19,7 +19,7 @@ import {
   updateAgent,
   bulkUpdateAgents,
 } from './crud';
-import type { GetAgentsOptions } from './index';
+import type { GetAgentsOptions } from '.';
 import { createAgentAction, bulkCreateAgentActions } from './actions';
 import { searchHitToAgent } from './helpers';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/saved_objects.ts b/x-pack/plugins/fleet/server/services/agents/saved_objects.ts
index eec9c9c7c16ff..a26194ef6ddeb 100644
--- a/x-pack/plugins/fleet/server/services/agents/saved_objects.ts
+++ b/x-pack/plugins/fleet/server/services/agents/saved_objects.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import type {
   Agent,
diff --git a/x-pack/plugins/fleet/server/services/agents/setup.ts b/x-pack/plugins/fleet/server/services/agents/setup.ts
index ffbfb589b10f2..75ab47ae90375 100644
--- a/x-pack/plugins/fleet/server/services/agents/setup.ts
+++ b/x-pack/plugins/fleet/server/services/agents/setup.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { SO_SEARCH_LIMIT } from '../../constants';
 import { agentPolicyService } from '../agent_policy';
diff --git a/x-pack/plugins/fleet/server/services/agents/status.test.ts b/x-pack/plugins/fleet/server/services/agents/status.test.ts
index a6fd604ea0e30..d1993200c7ce5 100644
--- a/x-pack/plugins/fleet/server/services/agents/status.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/status.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { getAgentStatusById } from './status';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/status.ts b/x-pack/plugins/fleet/server/services/agents/status.ts
index 90113d1d177ef..15a43c6ac3999 100644
--- a/x-pack/plugins/fleet/server/services/agents/status.ts
+++ b/x-pack/plugins/fleet/server/services/agents/status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import pMap from 'p-map';
 
 import type { KueryNode } from '@kbn/es-query';
diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
index 181b517159c6f..e6327c16c3ccc 100644
--- a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
-import type { SavedObject } from 'kibana/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import type { SavedObject } from '@kbn/core/server';
 
 import type { AgentPolicy } from '../../types';
 import { HostedAgentPolicyRestrictionRelatedError } from '../../errors';
diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.ts
index 4d062e8bd5368..461caff1ada6c 100644
--- a/x-pack/plugins/fleet/server/services/agents/unenroll.ts
+++ b/x-pack/plugins/fleet/server/services/agents/unenroll.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { Agent, BulkActionResult } from '../../types';
 import * as APIKeyService from '../api_keys';
diff --git a/x-pack/plugins/fleet/server/services/agents/update.ts b/x-pack/plugins/fleet/server/services/agents/update.ts
index cbe7853425fa6..913796f6e7489 100644
--- a/x-pack/plugins/fleet/server/services/agents/update.ts
+++ b/x-pack/plugins/fleet/server/services/agents/update.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { AGENTS_PREFIX } from '../../constants';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/upgrade.ts b/x-pack/plugins/fleet/server/services/agents/upgrade.ts
index 5f0218480788f..36568ca6e0004 100644
--- a/x-pack/plugins/fleet/server/services/agents/upgrade.ts
+++ b/x-pack/plugins/fleet/server/services/agents/upgrade.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { Agent, BulkActionResult } from '../../types';
-import { agentPolicyService } from '../../services';
+import { agentPolicyService } from '..';
 import {
   AgentReassignmentError,
   HostedAgentPolicyRestrictionRelatedError,
diff --git a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
index ee5d982811e31..0f49cbe6c9fe2 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
@@ -9,11 +9,12 @@ import uuid from 'uuid';
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
 import { errors } from '@elastic/elasticsearch';
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 
 import { toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
 
-import type { ESSearchResponse as SearchResponse } from '../../../../../../src/core/types/elasticsearch';
+import type { ESSearchResponse as SearchResponse } from '@kbn/core/types/elasticsearch';
+
 import type { EnrollmentAPIKey, FleetServerEnrollmentAPIKey } from '../../types';
 import { IngestManagerError } from '../../errors';
 import { ENROLLMENT_API_KEYS_INDEX } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
index d55aa37fd5150..8d1b0b24743ac 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Check if an esClient has enought permission to create a valid API key for logstash
diff --git a/x-pack/plugins/fleet/server/services/app_context.ts b/x-pack/plugins/fleet/server/services/app_context.ts
index 3adace700f796..71409f8d115c6 100644
--- a/x-pack/plugins/fleet/server/services/app_context.ts
+++ b/x-pack/plugins/fleet/server/services/app_context.ts
@@ -8,31 +8,34 @@
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 import { kibanaPackageJson } from '@kbn/utils';
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import type {
   ElasticsearchClient,
   SavedObjectsServiceStart,
   HttpServiceSetup,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import type { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import type {
   EncryptedSavedObjectsClient,
   EncryptedSavedObjectsPluginSetup,
-} from '../../../encrypted_saved_objects/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+
+import type { SecurityPluginStart, SecurityPluginSetup } from '@kbn/security-plugin/server';
+
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
 
-import type { SecurityPluginStart, SecurityPluginSetup } from '../../../security/server';
 import type { FleetConfigType } from '../../common';
 import type {
   ExternalCallback,
   ExternalCallbacksStorage,
   PostPackagePolicyCreateCallback,
   PostPackagePolicyDeleteCallback,
+  PostPackagePolicyPostCreateCallback,
   PutPackagePolicyUpdateCallback,
 } from '../types';
 import type { FleetAppContext } from '../plugin';
-import type { CloudSetup } from '../../../cloud/server';
 import type { TelemetryEventsSender } from '../telemetry/sender';
 
 class AppContextService {
@@ -183,6 +186,8 @@ class AppContextService {
           ? PostPackagePolicyCreateCallback
           : T extends 'postPackagePolicyDelete'
           ? PostPackagePolicyDeleteCallback
+          : T extends 'packagePolicyPostCreate'
+          ? PostPackagePolicyPostCreateCallback
           : PutPackagePolicyUpdateCallback
       >
     | undefined {
@@ -192,6 +197,8 @@ class AppContextService {
           ? PostPackagePolicyCreateCallback
           : T extends 'postPackagePolicyDelete'
           ? PostPackagePolicyDeleteCallback
+          : T extends 'packagePolicyPostCreate'
+          ? PostPackagePolicyPostCreateCallback
           : PutPackagePolicyUpdateCallback
       >;
     }
diff --git a/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts b/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts
index 3f0c5af247eb5..2c9d93ee47f32 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { errors } from '@elastic/elasticsearch';
 
diff --git a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
index c6e77301bed25..6948cf55e0eb8 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
@@ -11,7 +11,7 @@ import { promisify } from 'util';
 import type { BinaryLike } from 'crypto';
 import { createHash } from 'crypto';
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { ListResult } from '../../../common';
 import { FLEET_SERVER_ARTIFACTS_INDEX } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/artifacts/client.test.ts b/x-pack/plugins/fleet/server/services/artifacts/client.test.ts
index d5aa2765908c1..f2acdc59e10de 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/client.test.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { ArtifactsClientAccessDeniedError, ArtifactsClientError } from '../../errors';
 
diff --git a/x-pack/plugins/fleet/server/services/artifacts/client.ts b/x-pack/plugins/fleet/server/services/artifacts/client.ts
index 42355aee8e4fb..36d1c9eb96aca 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/client.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/client.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { ListResult } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/services/artifacts/mappings.ts b/x-pack/plugins/fleet/server/services/artifacts/mappings.ts
index 10dab0400d5aa..993e3d90d4640 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/mappings.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SearchHit } from '../../../../../../src/core/types/elasticsearch';
+import type { SearchHit } from '@kbn/core/types/elasticsearch';
 
 import type { Artifact, ArtifactElasticsearchProperties, NewArtifact } from './types';
 import { ARTIFACT_DOWNLOAD_RELATIVE_PATH } from './constants';
diff --git a/x-pack/plugins/fleet/server/services/artifacts/mocks.ts b/x-pack/plugins/fleet/server/services/artifacts/mocks.ts
index 9eee24afe08b2..74be6eff7db5a 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/mocks.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/mocks.ts
@@ -9,8 +9,8 @@ import { URL } from 'url';
 import type { TransportResult } from '@elastic/elasticsearch';
 import { errors } from '@elastic/elasticsearch';
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
-import type { SearchHit, ESSearchResponse } from '../../../../../../src/core/types/elasticsearch';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { SearchHit, ESSearchResponse } from '@kbn/core/types/elasticsearch';
 
 import type {
   Artifact,
diff --git a/x-pack/plugins/fleet/server/services/config.ts b/x-pack/plugins/fleet/server/services/config.ts
index f26099ad9c4db..e44c23cbdbd95 100644
--- a/x-pack/plugins/fleet/server/services/config.ts
+++ b/x-pack/plugins/fleet/server/services/config.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { FleetConfigType } from '../';
+import type { FleetConfigType } from '..';
 
 /**
  * Kibana config observable service, *NOT* agent policy
diff --git a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
index 4ce39483f09a3..77fe33df4ca48 100644
--- a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
+++ b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
@@ -222,8 +222,7 @@ metadata:
 ---
 `;
 
-export const elasticAgentManagedManifest = `
-apiVersion: apps/v1
+export const elasticAgentManagedManifest = `apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: elastic-agent
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/cache.ts b/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
index 676c3aa571a0f..ea94823287735 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
@@ -6,9 +6,9 @@
  */
 
 import type { ArchivePackage, RegistryPackage } from '../../../../common';
-import { appContextService } from '../../';
+import { appContextService } from '../..';
 
-import type { ArchiveEntry } from './index';
+import type { ArchiveEntry } from '.';
 
 const archiveEntryCache: Map<ArchiveEntry['path'], ArchiveEntry['buffer']> = new Map();
 export const getArchiveEntry = (key: string) => archiveEntryCache.get(key);
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/extract.ts b/x-pack/plugins/fleet/server/services/epm/archive/extract.ts
index 0bdb07df26814..03caf8901f40b 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/extract.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/extract.ts
@@ -10,7 +10,7 @@ import yauzl from 'yauzl';
 
 import { bufferToStream, streamToBuffer } from '../streams';
 
-import type { ArchiveEntry } from './index';
+import type { ArchiveEntry } from '.';
 
 export async function untarBuffer(
   buffer: Buffer,
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/parse.ts b/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
index 828a31b3ab03e..14b1eb8c305b8 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
@@ -28,7 +28,7 @@ import {
 import { PackageInvalidArchiveError } from '../../../errors';
 import { pkgToPkgKey } from '../registry';
 
-import { unpackBufferEntries } from './index';
+import { unpackBufferEntries } from '.';
 
 const MANIFESTS: Record<string, Buffer> = {};
 const MANIFEST_NAME = 'manifest.yml';
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
index d2a96921bf033..cb9f5650550e8 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
@@ -12,7 +12,7 @@ import { safeLoad } from 'js-yaml';
 import { isBinaryFile } from 'isbinaryfile';
 import mime from 'mime-types';
 import uuidv5 from 'uuid/v5';
-import type { SavedObjectsClientContract, SavedObjectsBulkCreateObject } from 'src/core/server';
+import type { SavedObjectsClientContract, SavedObjectsBulkCreateObject } from '@kbn/core/server';
 
 import { ASSETS_SAVED_OBJECT_TYPE } from '../../../../common';
 import type {
@@ -25,8 +25,8 @@ import { pkgToPkgKey } from '../registry';
 
 import { appContextService } from '../../app_context';
 
-import { getArchiveEntry, setArchiveEntry, setArchiveFilelist, setPackageInfo } from './index';
-import type { ArchiveEntry } from './index';
+import { getArchiveEntry, setArchiveEntry, setArchiveFilelist, setPackageInfo } from '.';
+import type { ArchiveEntry } from '.';
 import { parseAndVerifyPolicyTemplates, parseAndVerifyStreams } from './parse';
 
 const ONE_BYTE = 1024 * 1024;
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
index a1075b15a6462..4f18966a61307 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../../common/types/models';
 import type {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
index e45e2f59efe26..1d98a9339c907 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type { EsAssetReference } from '../../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts
index b77a787090ed6..9b64ec89507dc 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import type { InstallablePackage } from '../../../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
index e4fae7ca0ca41..fb89c117ae16b 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
@@ -7,7 +7,7 @@
 
 import type { RegistryDataStream } from '../../../types';
 
-import { getRegistryDataStreamAssetBaseName } from './index';
+import { getRegistryDataStreamAssetBaseName } from '.';
 
 test('getBaseName', () => {
   const dataStream: RegistryDataStream = {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
index 7f7e7b2ec10e9..c6830d5bb9a03 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
@@ -6,7 +6,7 @@
  */
 
 import type { TransportRequestOptions } from '@elastic/elasticsearch';
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type { EsAssetReference, RegistryDataStream, InstallablePackage } from '../../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
index b7de8fd8ff5ed..e9d693bdbfaa8 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
-import { appContextService } from '../../../';
+import { appContextService } from '../../..';
 import { ElasticsearchAssetType } from '../../../../types';
 import { IngestManagerError } from '../../../../errors';
 import { getInstallation } from '../../packages/get';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
index 52951377c6e2e..13b3de989e620 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
 
 import { saveInstalledEsRefs } from '../../packages/install';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts
index 7fd70302d2acf..3abd19bd8035e 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { appContextService } from '../../../app_context';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts
index ea2d0868c6d17..1ade871b27ef6 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { loggerMock } from '@kbn/logging-mocks';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 import { appContextService } from '../../../app_context';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
index 84dbe324891bc..48f070434530a 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { loggerMock } from '@kbn/logging-mocks';
 
 import { createAppContextStartContractMock } from '../../../../mocks';
-import { appContextService } from '../../../../services';
+import { appContextService } from '../../..';
 
 import type { RegistryDataStream } from '../../../../types';
 import type { Field } from '../../fields/field';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
index a77f843aef2d3..6d953835dfe6c 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
@@ -7,7 +7,7 @@
 
 import { merge } from 'lodash';
 import Boom from '@hapi/boom';
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/remove_legacy.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/remove_legacy.test.ts
new file mode 100644
index 0000000000000..4877d28cbead0
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/remove_legacy.test.ts
@@ -0,0 +1,262 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  ClusterComponentTemplate,
+  IndicesGetIndexTemplateIndexTemplateItem,
+} from '@elastic/elasticsearch/lib/api/types';
+
+import type { Logger } from '@kbn/core/server';
+
+import uuid from 'uuid';
+
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+
+import type { InstallablePackage, RegistryDataStream } from '../../../../types';
+
+import {
+  _getLegacyComponentTemplatesForPackage,
+  _getIndexTemplatesToUsedByMap,
+  _filterComponentTemplatesInUse,
+} from './remove_legacy';
+
+const mockLogger: Logger = loggingSystemMock.create().get();
+
+const pickRandom = (arr: any[]) => arr[Math.floor(Math.random() * arr.length)];
+const pickRandomType = pickRandom.bind(null, ['logs', 'metrics']);
+const createMockDataStream = ({
+  packageName,
+  type,
+  dataset,
+}: {
+  packageName: string;
+  type?: string;
+  dataset?: string;
+}) => {
+  return {
+    type: type || pickRandomType(),
+    dataset: dataset || uuid.v4(),
+    title: packageName,
+    package: packageName,
+    path: 'some_path',
+    release: 'ga',
+  } as RegistryDataStream;
+};
+const createMockComponentTemplate = ({
+  name = 'templateName',
+  packageName,
+}: {
+  name?: string;
+  packageName: string;
+}) => {
+  return {
+    name,
+    component_template: {
+      _meta: {
+        package: { name: packageName },
+      },
+      template: {
+        settings: {},
+      },
+    },
+  } as ClusterComponentTemplate;
+};
+
+const createMockTemplate = ({ name, composedOf = [] }: { name: string; composedOf?: string[] }) =>
+  ({
+    name,
+    index_template: {
+      composed_of: composedOf,
+    },
+  } as IndicesGetIndexTemplateIndexTemplateItem);
+
+const makeArrayOf = (arraySize: number, fn = (i: any) => i) => {
+  return [...Array(arraySize)].map(fn);
+};
+describe('_getLegacyComponentTemplatesForPackage', () => {
+  it('should handle empty templates array', () => {
+    const templates = [] as ClusterComponentTemplate[];
+    const pkg = { name: 'testPkg', data_streams: [] as RegistryDataStream[] } as InstallablePackage;
+
+    const result = _getLegacyComponentTemplatesForPackage(templates, pkg);
+    expect(result).toEqual([]);
+  });
+  it('should return empty array if no legacy templates', () => {
+    const packageName = 'testPkg';
+    const templates = makeArrayOf(1000, () => createMockComponentTemplate({ packageName }));
+    const pkg = {
+      name: packageName,
+      data_streams: makeArrayOf(100, () => createMockDataStream({ packageName })),
+    } as InstallablePackage;
+
+    const result = _getLegacyComponentTemplatesForPackage(templates, pkg);
+    expect(result).toEqual([]);
+  });
+
+  it('should find legacy templates', () => {
+    const packageName = 'testPkg';
+    const legacyTemplates = [
+      'logs-testPkg.dataset@settings',
+      'logs-testPkg.dataset@mappings',
+      'metrics-testPkg.dataset2@mappings',
+      'metrics-testPkg.dataset2@settings',
+    ];
+    const templates = [
+      ...makeArrayOf(100, () => createMockComponentTemplate({ packageName })),
+      ...legacyTemplates.map((name) => createMockComponentTemplate({ name, packageName })),
+    ];
+    const pkg = {
+      name: packageName,
+      data_streams: [
+        ...makeArrayOf(20, () => createMockDataStream({ packageName })),
+        createMockDataStream({ type: 'logs', packageName, dataset: 'testPkg.dataset' }),
+        createMockDataStream({ type: 'metrics', packageName, dataset: 'testPkg.dataset2' }),
+      ],
+    } as InstallablePackage;
+
+    const result = _getLegacyComponentTemplatesForPackage(templates, pkg);
+    expect(result).toEqual(legacyTemplates);
+  });
+
+  it('should only return templates if package name matches as well', () => {
+    const packageName = 'testPkg';
+    const legacyTemplates = [
+      'logs-testPkg.dataset@settings',
+      'logs-testPkg.dataset@mappings',
+      'metrics-testPkg.dataset2@mappings',
+      'metrics-testPkg.dataset2@settings',
+    ];
+    const templates = [
+      ...makeArrayOf(20, () => createMockComponentTemplate({ packageName })),
+      ...legacyTemplates.map((name) =>
+        createMockComponentTemplate({ name, packageName: 'someOtherPkg' })
+      ),
+    ];
+    const pkg = {
+      name: packageName,
+      data_streams: [
+        ...makeArrayOf(20, () => createMockDataStream({ packageName })),
+        createMockDataStream({ type: 'logs', packageName, dataset: 'testPkg.dataset' }),
+        createMockDataStream({ type: 'metrics', packageName, dataset: 'testPkg.dataset2' }),
+      ],
+    } as InstallablePackage;
+
+    const result = _getLegacyComponentTemplatesForPackage(templates, pkg);
+    expect(result).toEqual([]);
+  });
+});
+
+describe('_getIndexTemplatesToUsedByMap', () => {
+  it('should return empty map if no index templates provided', () => {
+    const indexTemplates = [] as IndicesGetIndexTemplateIndexTemplateItem[];
+
+    const result = _getIndexTemplatesToUsedByMap(indexTemplates);
+
+    expect(result.size).toEqual(0);
+  });
+
+  it('should return empty map if no index templates have no component templates', () => {
+    const indexTemplates = [createMockTemplate({ name: 'tmpl1' })];
+
+    const result = _getIndexTemplatesToUsedByMap(indexTemplates);
+
+    expect(result.size).toEqual(0);
+  });
+
+  it('should return correct map if templates have composedOf', () => {
+    const indexTemplates = [
+      createMockTemplate({ name: 'tmpl1' }),
+      createMockTemplate({ name: 'tmpl2', composedOf: ['ctmp1'] }),
+      createMockTemplate({ name: 'tmpl3', composedOf: ['ctmp1', 'ctmp2'] }),
+      createMockTemplate({ name: 'tmpl4', composedOf: ['ctmp3'] }),
+    ];
+
+    const expectedMap = {
+      ctmp1: ['tmpl2', 'tmpl3'],
+      ctmp2: ['tmpl3'],
+      ctmp3: ['tmpl4'],
+    };
+
+    const result = _getIndexTemplatesToUsedByMap(indexTemplates);
+
+    expect(Object.fromEntries(result)).toEqual(expectedMap);
+  });
+});
+
+describe('_filterComponentTemplatesInUse', () => {
+  it('should return empty array if provided with empty component templates', () => {
+    const componentTemplateNames = [] as string[];
+    const indexTemplates = [] as IndicesGetIndexTemplateIndexTemplateItem[];
+
+    const result = _filterComponentTemplatesInUse({
+      componentTemplateNames,
+      indexTemplates,
+      logger: mockLogger,
+    });
+
+    expect(result).toHaveLength(0);
+  });
+
+  it('should remove component template used by index template ', () => {
+    const componentTemplateNames = ['ctmp1', 'ctmp2'] as string[];
+    const indexTemplates = [
+      createMockTemplate({ name: 'tmpl1', composedOf: ['ctmp1'] }),
+    ] as IndicesGetIndexTemplateIndexTemplateItem[];
+
+    const result = _filterComponentTemplatesInUse({
+      componentTemplateNames,
+      indexTemplates,
+      logger: mockLogger,
+    });
+
+    expect(result).toEqual(['ctmp2']);
+  });
+  it('should remove component templates used by one index template ', () => {
+    const componentTemplateNames = ['ctmp1', 'ctmp2', 'ctmp3'] as string[];
+    const indexTemplates = [
+      createMockTemplate({ name: 'tmpl1', composedOf: ['ctmp1', 'ctmp2'] }),
+    ] as IndicesGetIndexTemplateIndexTemplateItem[];
+
+    const result = _filterComponentTemplatesInUse({
+      componentTemplateNames,
+      indexTemplates,
+      logger: mockLogger,
+    });
+
+    expect(result).toEqual(['ctmp3']);
+  });
+  it('should remove component templates used by different index templates ', () => {
+    const componentTemplateNames = ['ctmp1', 'ctmp2', 'ctmp3'] as string[];
+    const indexTemplates = [
+      createMockTemplate({ name: 'tmpl1', composedOf: ['ctmp1'] }),
+      createMockTemplate({ name: 'tmpl2', composedOf: ['ctmp2'] }),
+    ] as IndicesGetIndexTemplateIndexTemplateItem[];
+
+    const result = _filterComponentTemplatesInUse({
+      componentTemplateNames,
+      indexTemplates,
+      logger: mockLogger,
+    });
+
+    expect(result).toEqual(['ctmp3']);
+  });
+  it('should remove component templates used by multiple index templates ', () => {
+    const componentTemplateNames = ['ctmp1', 'ctmp2', 'ctmp3'] as string[];
+    const indexTemplates = [
+      createMockTemplate({ name: 'tmpl1', composedOf: ['ctmp1', 'ctmp2'] }),
+      createMockTemplate({ name: 'tmpl2', composedOf: ['ctmp2', 'ctmp1'] }),
+    ] as IndicesGetIndexTemplateIndexTemplateItem[];
+
+    const result = _filterComponentTemplatesInUse({
+      componentTemplateNames,
+      indexTemplates,
+      logger: mockLogger,
+    });
+
+    expect(result).toEqual(['ctmp3']);
+  });
+});
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/remove_legacy.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/remove_legacy.ts
new file mode 100644
index 0000000000000..44b9756edc448
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/remove_legacy.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  ClusterComponentTemplate,
+  IndicesGetIndexTemplateIndexTemplateItem,
+} from '@elastic/elasticsearch/lib/api/types';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
+
+import type { InstallablePackage, RegistryDataStream } from '../../../../types';
+import { getRegistryDataStreamAssetBaseName } from '..';
+const LEGACY_TEMPLATE_SUFFIXES = ['@mappings', '@settings'];
+
+const getComponentTemplateWithSuffix = (dataStream: RegistryDataStream, suffix: string) => {
+  const baseName = getRegistryDataStreamAssetBaseName(dataStream);
+
+  return baseName + suffix;
+};
+
+export const _getLegacyComponentTemplatesForPackage = (
+  componentTemplates: ClusterComponentTemplate[],
+  installablePackage: InstallablePackage
+): string[] => {
+  const legacyNamesLookup: Set<string> = new Set();
+
+  // fill a map with all possible @mappings and @settings component
+  // template names for fast lookup below.
+  installablePackage.data_streams?.forEach((ds) => {
+    LEGACY_TEMPLATE_SUFFIXES.forEach((suffix) => {
+      legacyNamesLookup.add(getComponentTemplateWithSuffix(ds, suffix));
+    });
+  });
+
+  return componentTemplates.reduce<string[]>((legacyTemplates, componentTemplate) => {
+    if (!legacyNamesLookup.has(componentTemplate.name)) return legacyTemplates;
+
+    if (componentTemplate.component_template._meta?.package?.name !== installablePackage.name) {
+      return legacyTemplates;
+    }
+
+    return legacyTemplates.concat(componentTemplate.name);
+  }, []);
+};
+
+const _deleteComponentTemplates = async (params: {
+  templateNames: string[];
+  esClient: ElasticsearchClient;
+  logger: Logger;
+}): Promise<void> => {
+  const { templateNames, esClient, logger } = params;
+  const deleteResults = await Promise.allSettled(
+    templateNames.map((name) => esClient.cluster.deleteComponentTemplate({ name }))
+  );
+
+  const errors = deleteResults.filter((r) => r.status === 'rejected') as PromiseRejectedResult[];
+
+  if (errors.length) {
+    const prettyErrors = errors.map((e) => `"${e.reason}"`).join(', ');
+    logger.debug(
+      `Encountered ${errors.length} errors deleting legacy component templates: ${prettyErrors}`
+    );
+  }
+};
+
+export const _getIndexTemplatesToUsedByMap = (
+  indexTemplates: IndicesGetIndexTemplateIndexTemplateItem[]
+) => {
+  const lookupMap: Map<string, string[]> = new Map();
+
+  indexTemplates.forEach(({ name: indexTemplateName, index_template: indexTemplate }) => {
+    const composedOf = indexTemplate?.composed_of;
+
+    if (!composedOf) return;
+
+    composedOf.forEach((componentTemplateName) => {
+      const existingEntry = lookupMap.get(componentTemplateName) || [];
+
+      lookupMap.set(componentTemplateName, existingEntry.concat(indexTemplateName));
+    });
+  });
+  return lookupMap;
+};
+
+const _getAllComponentTemplates = async (esClient: ElasticsearchClient) => {
+  const { component_templates: componentTemplates } = await esClient.cluster.getComponentTemplate();
+
+  return componentTemplates;
+};
+
+const _getAllIndexTemplatesWithComposedOf = async (esClient: ElasticsearchClient) => {
+  const { index_templates: indexTemplates } = await esClient.indices.getIndexTemplate();
+  return indexTemplates.filter((tmpl) => tmpl.index_template.composed_of?.length);
+};
+
+export const _filterComponentTemplatesInUse = ({
+  componentTemplateNames,
+  indexTemplates,
+  logger,
+}: {
+  componentTemplateNames: string[];
+  indexTemplates: IndicesGetIndexTemplateIndexTemplateItem[];
+  logger: Logger;
+}): string[] => {
+  const usedByLookup = _getIndexTemplatesToUsedByMap(indexTemplates);
+
+  return componentTemplateNames.filter((componentTemplateName) => {
+    const indexTemplatesUsingComponentTemplate = usedByLookup.get(componentTemplateName);
+
+    if (indexTemplatesUsingComponentTemplate?.length) {
+      const prettyTemplates = indexTemplatesUsingComponentTemplate.join(', ');
+      logger.debug(
+        `Not deleting legacy template ${componentTemplateName} as it is in use by index templates: ${prettyTemplates}`
+      );
+      return false;
+    }
+
+    return true;
+  });
+};
+
+export const removeLegacyTemplates = async (params: {
+  packageInfo: InstallablePackage;
+  esClient: ElasticsearchClient;
+  logger: Logger;
+}): Promise<void> => {
+  const { packageInfo, esClient, logger } = params;
+
+  const allComponentTemplates = await _getAllComponentTemplates(esClient);
+
+  const legacyComponentTemplateNames = _getLegacyComponentTemplatesForPackage(
+    allComponentTemplates,
+    packageInfo
+  );
+
+  if (!legacyComponentTemplateNames.length) return;
+
+  // all index templates that are composed of at least one component template
+  const allIndexTemplatesWithComposedOf = await _getAllIndexTemplatesWithComposedOf(esClient);
+
+  let templatesToDelete = legacyComponentTemplateNames;
+  if (allIndexTemplatesWithComposedOf.length) {
+    // get the component templates not in use by any index templates
+    templatesToDelete = _filterComponentTemplatesInUse({
+      componentTemplateNames: legacyComponentTemplateNames,
+      indexTemplates: allIndexTemplatesWithComposedOf,
+      logger,
+    });
+  }
+
+  if (!templatesToDelete.length) return;
+
+  await _deleteComponentTemplates({
+    templateNames: templatesToDelete,
+    esClient,
+    logger,
+  });
+};
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
index 77ce3779f2319..d565a22347b39 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -10,10 +10,10 @@ import path from 'path';
 
 import { safeLoad } from 'js-yaml';
 import { loggerMock } from '@kbn/logging-mocks';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { createAppContextStartContractMock } from '../../../../mocks';
-import { appContextService } from '../../../../services';
+import { appContextService } from '../../..';
 import type { RegistryDataStream } from '../../../../types';
 import { processFields } from '../../fields/field';
 import type { Field } from '../../fields/field';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index 909b593649fcd..c87df0921e745 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import type { IndicesIndexSettings } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import type { Field, Fields } from '../../fields/field';
@@ -15,8 +15,8 @@ import type {
   IndexTemplate,
   IndexTemplateMappings,
 } from '../../../../types';
-import { appContextService } from '../../../';
-import { getRegistryDataStreamAssetBaseName } from '../index';
+import { appContextService } from '../../..';
+import { getRegistryDataStreamAssetBaseName } from '..';
 import {
   FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
   FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
index 144f994646fe9..fea12f4b139c6 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
 
 import { saveInstalledEsRefs } from '../../packages/install';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts
index 5f1d8db121a41..cd544eef82150 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/saved_objects/service/saved_objects_client.mock';
+import { savedObjectsClientMock } from '@kbn/core/server/saved_objects/service/saved_objects_client.mock';
 
 import type { EsAssetReference } from '../../../../../common/types/models';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
index 07748c1635b3a..f10eddd3d5e65 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type { EsAssetReference } from '../../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
index 4a1909cc813e7..16384b8bfba19 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
@@ -19,16 +19,17 @@ jest.mock('./common', () => {
 });
 
 import { errors } from '@elastic/elasticsearch';
-import type { SavedObject, SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import { loggerMock } from '@kbn/logging-mocks';
 
-import { ElasticsearchAssetType } from '../../../../types';
-import type { Installation, RegistryPackage } from '../../../../types';
-import { getInstallation, getInstallationObject } from '../../packages';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/saved_objects/service/saved_objects_client.mock';
+import { savedObjectsClientMock } from '@kbn/core/server/saved_objects/service/saved_objects_client.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+
+import { getInstallation, getInstallationObject } from '../../packages';
+import type { Installation, RegistryPackage } from '../../../../types';
+import { ElasticsearchAssetType } from '../../../../types';
 import { appContextService } from '../../../app_context';
 
 import { getESAssetMetadata } from '../meta';
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
index 51aee45c83cf3..0d12a501f86b1 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
@@ -9,9 +9,9 @@ import type {
   SavedObjectsImportFailure,
   SavedObjectsImportSuccess,
   SavedObjectsImportResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { ArchiveAsset } from './install';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
index b8ef796f8817c..ce8d7e7be2bb9 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
@@ -13,8 +13,8 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsImporter,
   Logger,
-} from 'src/core/server';
-import type { SavedObjectsImportSuccess, SavedObjectsImportFailure } from 'src/core/server/types';
+} from '@kbn/core/server';
+import type { SavedObjectsImportSuccess, SavedObjectsImportFailure } from '@kbn/core/server/types';
 import { createListStream } from '@kbn/utils';
 import { partition } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
index c42029f2c453d..1637bf19d8df4 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { dataTypes, installationStatuses } from '../../../../../common/constants';
-import { appContextService } from '../../../../services';
+import { appContextService } from '../../..';
 import { getPackageSavedObjects } from '../../packages/get';
 const INDEX_PATTERN_SAVED_OBJECT_TYPE = 'index-pattern';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.test.ts b/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
index 5c48ddb050ff2..31bf9e47a4ae0 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
@@ -9,16 +9,13 @@ jest.mock('../../routes/security');
 
 import type { MockedLogger } from '@kbn/logging-mocks';
 
-import type {
-  ElasticsearchClient,
-  SavedObjectsClientContract,
-} from '../../../../../../src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { FleetUnauthorizedError } from '../../errors';
 import type { InstallablePackage } from '../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.ts b/x-pack/plugins/fleet/server/services/epm/package_service.ts
index cac69fe4bd3b8..573ca3508e947 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.ts
@@ -12,7 +12,7 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   Logger,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type {
   EsAssetReference,
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts
index 5bbfb4f9d15ab..c0e4404345902 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
-import { savedObjectsClientMock, elasticsearchServiceMock } from 'src/core/server/mocks';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
+import { savedObjectsClientMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { loggerMock } from '@kbn/logging-mocks';
 
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import { appContextService } from '../../app_context';
 import { createAppContextStartContractMock } from '../../../mocks';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
index 05ed45a0e0c7a..34ada19685f83 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
@@ -11,7 +11,7 @@ import type {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsImporter,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import {
   MAX_TIME_COMPLETE_INSTALL,
@@ -23,17 +23,18 @@ import type { InstallablePackage, InstallSource, PackageAssetReference } from '.
 import { PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
 import type { AssetReference, Installation, InstallType } from '../../../types';
 import { installTemplates } from '../elasticsearch/template/install';
+import { removeLegacyTemplates } from '../elasticsearch/template/remove_legacy';
 import {
   installPipelines,
   isTopLevelPipeline,
   deletePreviousPipelines,
-} from '../elasticsearch/ingest_pipeline/';
+} from '../elasticsearch/ingest_pipeline';
 import { getAllTemplateRefs } from '../elasticsearch/template/install';
 import { installILMPolicy } from '../elasticsearch/ilm/install';
 import { installKibanaAssets, getKibanaAssets } from '../kibana/assets/install';
 import { updateCurrentWriteIndices } from '../elasticsearch/template/template';
 import { installTransform } from '../elasticsearch/transform/install';
-import { installMlModel } from '../elasticsearch/ml_model/';
+import { installMlModel } from '../elasticsearch/ml_model';
 import { installIlmForDataStream } from '../elasticsearch/datastream_ilm/install';
 import { saveArchiveEntries } from '../archive/storage';
 import { ConcurrentInstallOperationError } from '../../../errors';
@@ -161,6 +162,12 @@ export async function _installPackage({
       savedObjectsClient
     );
 
+    try {
+      await removeLegacyTemplates({ packageInfo, esClient, logger });
+    } catch (e) {
+      logger.warn(`Error removing legacy templates: ${e.message}`);
+    }
+
     // update current backing indices of each data stream
     await updateCurrentWriteIndices(esClient, logger, installedTemplates);
 
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts b/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts
index d68b2f67e3295..a9d027ce51c8a 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { appContextService } from '../../app_context';
 import * as Registry from '../registry';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts
index 07fd2d400b8d5..94d6bf8c165b1 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PackagePolicyServiceInterface } from '../../package_policy';
 import * as storage from '../archive/storage';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts
index 87eaa82aa85f0..2ee5e6fe79feb 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { removeArchiveEntries } from '../archive/storage';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts
index b15c61cebd778..6c426c4efdf4f 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts
@@ -7,10 +7,11 @@
 
 jest.mock('../registry');
 
-import type { SavedObjectsClientContract, SavedObjectsFindResult } from 'kibana/server';
+import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
+
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
 import { PACKAGES_SAVED_OBJECT_TYPE, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../common';
 import type { PackagePolicySOAttributes, RegistryPackage } from '../../../../common';
 
@@ -186,6 +187,7 @@ describe('When using EPM `get` services', () => {
     beforeEach(() => {
       const mockContract = createAppContextStartContractMock();
       appContextService.start(mockContract);
+      jest.clearAllMocks();
       MockRegistry.fetchFindLatestPackageOrUndefined.mockResolvedValue({
         name: 'my-package',
         version: '1.0.0',
@@ -320,6 +322,56 @@ describe('When using EPM `get` services', () => {
           status: 'installed',
         });
       });
+
+      it('sets the latestVersion to installed version when an installed package is newer than package in registry', async () => {
+        const soClient = savedObjectsClientMock.create();
+        soClient.get.mockResolvedValue({
+          id: 'my-package',
+          type: PACKAGES_SAVED_OBJECT_TYPE,
+          references: [],
+          attributes: {
+            version: '2.0.0',
+            install_status: 'installed',
+          },
+        });
+
+        await expect(
+          getPackageInfo({
+            savedObjectsClient: soClient,
+            pkgName: 'my-package',
+            pkgVersion: '1.0.0',
+          })
+        ).resolves.toMatchObject({
+          latestVersion: '1.0.0',
+          status: 'installed',
+        });
+      });
+    });
+
+    describe('skipArchive', () => {
+      it('avoids loading archive when skipArchive = true', async () => {
+        const soClient = savedObjectsClientMock.create();
+        soClient.get.mockRejectedValue(SavedObjectsErrorHelpers.createGenericNotFoundError());
+        MockRegistry.fetchInfo.mockResolvedValue({
+          name: 'my-package',
+          version: '1.0.0',
+          assets: [],
+        } as unknown as RegistryPackage);
+
+        await expect(
+          getPackageInfo({
+            savedObjectsClient: soClient,
+            pkgName: 'my-package',
+            pkgVersion: '1.0.0',
+            skipArchive: true,
+          })
+        ).resolves.toMatchObject({
+          latestVersion: '1.0.0',
+          status: 'not_installed',
+        });
+
+        expect(MockRegistry.getRegistryPackage).not.toHaveBeenCalled();
+      });
     });
   });
 });
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
index fd24b3f438319..0ba42585c1601 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract, SavedObjectsFindOptions } from 'src/core/server';
+import type { SavedObjectsClientContract, SavedObjectsFindOptions } from '@kbn/core/server';
+import semverGte from 'semver/functions/gte';
 
 import {
   isPackageLimited,
@@ -22,13 +23,13 @@ import type {
 } from '../../../../common/types';
 import type { Installation, PackageInfo } from '../../../types';
 import { IngestManagerError, PackageNotFoundError } from '../../../errors';
-import { appContextService } from '../../';
+import { appContextService } from '../..';
 import * as Registry from '../registry';
 import { getEsPackage } from '../archive/storage';
 import { getArchivePackage } from '../archive';
 import { normalizeKuery } from '../../saved_object';
 
-import { createInstallableFrom } from './index';
+import { createInstallableFrom } from '.';
 
 export type { SearchParams } from '../registry';
 export { getFile } from '../registry';
@@ -98,52 +99,18 @@ export async function getPackageSavedObjects(
 
 export const getInstallations = getPackageSavedObjects;
 
-export async function getPackageInfoFromRegistry(options: {
-  savedObjectsClient: SavedObjectsClientContract;
-  pkgName: string;
-  pkgVersion: string;
-}): Promise<PackageInfo> {
-  const { savedObjectsClient, pkgName, pkgVersion } = options;
-  const [savedObject, latestPackage] = await Promise.all([
-    getInstallationObject({ savedObjectsClient, pkgName }),
-    Registry.fetchFindLatestPackageOrThrow(pkgName),
-  ]);
-
-  // If no package version is provided, use the installed version in the response
-  let responsePkgVersion = pkgVersion || savedObject?.attributes.install_version;
-  // If no installed version of the given package exists, default to the latest version of the package
-  if (!responsePkgVersion) {
-    responsePkgVersion = latestPackage.version;
-  }
-  const packageInfo = await Registry.fetchInfo(pkgName, responsePkgVersion);
-
-  // Fix the paths
-  const paths =
-    packageInfo?.assets?.map((path) =>
-      path.replace(`/package/${pkgName}/${pkgVersion}`, `${pkgName}-${pkgVersion}`)
-    ) ?? [];
-
-  // add properties that aren't (or aren't yet) on the package
-  const additions: EpmPackageAdditions = {
-    latestVersion: latestPackage.version,
-    title: packageInfo.title || nameAsTitle(packageInfo.name),
-    assets: Registry.groupPathsByService(paths || []),
-    removable: true,
-    notice: Registry.getNoticePath(paths || []),
-    keepPoliciesUpToDate: savedObject?.attributes.keep_policies_up_to_date ?? false,
-  };
-  const updated = { ...packageInfo, ...additions };
-
-  return createInstallableFrom(updated, savedObject);
-}
-
-export async function getPackageInfo(options: {
+export async function getPackageInfo({
+  savedObjectsClient,
+  pkgName,
+  pkgVersion,
+  skipArchive = false,
+}: {
   savedObjectsClient: SavedObjectsClientContract;
   pkgName: string;
   pkgVersion: string;
+  /** Avoid loading the registry archive into the cache (only use for performance reasons). Defaults to `false` */
+  skipArchive?: boolean;
 }): Promise<PackageInfo> {
-  const { savedObjectsClient, pkgName, pkgVersion } = options;
-
   const [savedObject, latestPackage] = await Promise.all([
     getInstallationObject({ savedObjectsClient, pkgName }),
     Registry.fetchFindLatestPackageOrUndefined(pkgName),
@@ -154,20 +121,39 @@ export async function getPackageInfo(options: {
   }
 
   // If no package version is provided, use the installed version in the response, fallback to package from registry
-  const responsePkgVersion =
-    pkgVersion ?? savedObject?.attributes.install_version ?? latestPackage!.version;
-
-  const getPackageRes = await getPackageFromSource({
-    pkgName,
-    pkgVersion: responsePkgVersion,
-    savedObjectsClient,
-    installedPkg: savedObject?.attributes,
-  });
-  const { paths, packageInfo } = getPackageRes;
+  const resolvedPkgVersion =
+    pkgVersion !== ''
+      ? pkgVersion
+      : savedObject?.attributes.install_version ?? latestPackage!.version;
+
+  // If same version is available in registry and skipArchive is true, use the info from the registry (faster),
+  // otherwise build it from the archive
+  let paths: string[];
+  let packageInfo: RegistryPackage | ArchivePackage | undefined = skipArchive
+    ? await Registry.fetchInfo(pkgName, pkgVersion).catch(() => undefined)
+    : undefined;
+
+  if (packageInfo) {
+    // Fix the paths
+    paths =
+      packageInfo.assets?.map((path) =>
+        path.replace(`/package/${pkgName}/${pkgVersion}`, `${pkgName}-${pkgVersion}`)
+      ) ?? [];
+  } else {
+    ({ paths, packageInfo } = await getPackageFromSource({
+      pkgName,
+      pkgVersion: resolvedPkgVersion,
+      savedObjectsClient,
+      installedPkg: savedObject?.attributes,
+    }));
+  }
 
   // add properties that aren't (or aren't yet) on the package
   const additions: EpmPackageAdditions = {
-    latestVersion: latestPackage?.version ?? responsePkgVersion,
+    latestVersion:
+      latestPackage?.version && semverGte(latestPackage.version, resolvedPkgVersion)
+        ? latestPackage.version
+        : resolvedPkgVersion,
     title: packageInfo.title || nameAsTitle(packageInfo.name),
     assets: Registry.groupPathsByService(paths || []),
     removable: true,
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts
index 341cc90dab9ea..e67f59aaba55b 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import { ElasticsearchAssetType, KibanaSavedObjectType } from '../../../types';
 import type { Installation } from '../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/index.ts b/x-pack/plugins/fleet/server/services/epm/packages/index.ts
index d742103dccf12..bfb09abcfaa28 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import { installationStatuses, KibanaSavedObjectType } from '../../../../common';
 import { KibanaAssetType } from '../../../types';
@@ -20,7 +20,6 @@ export {
   getInstallation,
   getInstallations,
   getPackageInfo,
-  getPackageInfoFromRegistry,
   getPackages,
   getLimitedPackages,
 } from './get';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts
index 973e2624af5d9..76cf09b0cad06 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import * as Registry from '../registry';
 
@@ -19,7 +19,7 @@ import { licenseService } from '../../license';
 
 import { installPackage } from './install';
 import * as install from './_install_package';
-import * as obj from './index';
+import * as obj from '.';
 import { getBundledPackages } from './bundled_packages';
 
 jest.mock('../../app_context', () => {
@@ -35,7 +35,7 @@ jest.mock('../../app_context', () => {
     },
   };
 });
-jest.mock('./index');
+jest.mock('.');
 jest.mock('../registry');
 jest.mock('../../upgrade_sender');
 jest.mock('../../license');
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/install.ts b/x-pack/plugins/fleet/server/services/epm/packages/install.ts
index 8a4271c20be65..3ecec951dde7e 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/install.ts
@@ -8,10 +8,15 @@
 import { i18n } from '@kbn/i18n';
 import semverLt from 'semver/functions/lt';
 import type Boom from '@hapi/boom';
-import type { ElasticsearchClient, SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import type {
+  ElasticsearchClient,
+  SavedObject,
+  SavedObjectsClientContract,
+} from '@kbn/core/server';
+
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import { generateESIndexPatterns } from '../elasticsearch/template/template';
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
 import type {
   BulkInstallPackageInfo,
   EpmPackageInstallStatus,
@@ -22,7 +27,7 @@ import { AUTO_UPGRADE_POLICIES_PACKAGES } from '../../../../common';
 import { IngestManagerError, PackageOutdatedError } from '../../../errors';
 import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '../../../constants';
 import type { KibanaAssetType } from '../../../types';
-import { licenseService } from '../../';
+import { licenseService } from '../..';
 import type {
   Installation,
   AssetType,
@@ -43,7 +48,7 @@ import type { ArchiveAsset } from '../kibana/assets/install';
 import type { PackageUpdateEvent } from '../../upgrade_sender';
 import { sendTelemetryEvents, UpdateEventType } from '../../upgrade_sender';
 
-import { getInstallation, getInstallationObject } from './index';
+import { getInstallation, getInstallationObject } from '.';
 import { removeInstallation } from './remove';
 import { getPackageSavedObjects } from './get';
 import { _installPackage } from './_install_package';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
index b3b99bfd05e03..7edf5b6020be8 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
@@ -5,16 +5,19 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import Boom from '@hapi/boom';
 
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
-import { SavedObjectsClient } from '../../../../../../../src/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE, PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
 import { ElasticsearchAssetType } from '../../../types';
 import type {
   AssetReference,
@@ -23,7 +26,7 @@ import type {
   KibanaAssetReference,
   Installation,
 } from '../../../types';
-import { deletePipeline } from '../elasticsearch/ingest_pipeline/';
+import { deletePipeline } from '../elasticsearch/ingest_pipeline';
 import { removeUnusedIndexPatterns } from '../kibana/index_pattern/install';
 import { deleteTransforms } from '../elasticsearch/transform/remove';
 import { deleteMlModel } from '../elasticsearch/ml_model';
@@ -31,9 +34,8 @@ import { packagePolicyService, appContextService } from '../..';
 import { deletePackageCache } from '../archive';
 import { deleteIlms } from '../elasticsearch/datastream_ilm/remove';
 import { removeArchiveEntries } from '../archive/storage';
-import { SavedObjectsUtils } from '../../../../../../../src/core/server';
 
-import { getInstallation, kibanaSavedObjectTypes } from './index';
+import { getInstallation, kibanaSavedObjectTypes } from '.';
 
 export async function removeInstallation(options: {
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/update.ts b/x-pack/plugins/fleet/server/services/epm/packages/update.ts
index 84c756983fa07..4ab47954f51ca 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/update.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/update.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import { PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts b/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts
index 1eeea399ff8a4..62ea278734795 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts
@@ -8,7 +8,7 @@
 import type { AssetParts } from '../../../types';
 import { getBufferExtractor, getPathParts, untarBuffer, unzipBuffer } from '../archive';
 
-import { splitPkgKey } from './index';
+import { splitPkgKey } from '.';
 
 const testPaths = [
   {
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts b/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts
index ec0a8458ee5f7..8b1529de93b3c 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts
@@ -12,7 +12,7 @@ import type {
   HttpsProxyAgent as IHttpsProxyAgent,
 } from 'https-proxy-agent';
 
-import { appContextService } from '../../index';
+import { appContextService } from '../..';
 
 export interface RegistryProxySettings {
   proxyUrl: string;
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
index bcaf5ac1f0634..407a61ad7a912 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { appContextService } from '../../';
+import { appContextService } from '../..';
 
 // from https://github.com/elastic/package-registry#docker (maybe from OpenAPI one day)
 // the unused variables cause a TS warning about unused values
diff --git a/x-pack/plugins/fleet/server/services/es_index_pattern.ts b/x-pack/plugins/fleet/server/services/es_index_pattern.ts
index 993a8bebe42c7..acf537303a97e 100644
--- a/x-pack/plugins/fleet/server/services/es_index_pattern.ts
+++ b/x-pack/plugins/fleet/server/services/es_index_pattern.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
-import type { ESIndexPatternService } from '../../server';
+import type { ESIndexPatternService } from '..';
 
 import { getInstallation } from './epm/packages';
 
diff --git a/x-pack/plugins/fleet/server/services/fleet_server/index.ts b/x-pack/plugins/fleet/server/services/fleet_server/index.ts
index 43403bf3c9460..6ba6dfcc24910 100644
--- a/x-pack/plugins/fleet/server/services/fleet_server/index.ts
+++ b/x-pack/plugins/fleet/server/services/fleet_server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { FLEET_SERVER_SERVERS_INDEX } from '../../constants';
 
diff --git a/x-pack/plugins/fleet/server/services/index.ts b/x-pack/plugins/fleet/server/services/index.ts
index 55769928548e3..226d40cfd640a 100644
--- a/x-pack/plugins/fleet/server/services/index.ts
+++ b/x-pack/plugins/fleet/server/services/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { agentPolicyService } from './agent_policy';
 import * as settingsService from './settings';
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
index 6cbb21a37a196..5a1d86574f07b 100644
--- a/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
+++ b/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { upgradeManagedPackagePolicies } from './managed_package_policies';
 import { packagePolicyService } from './package_policy';
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
index e17ca5ebcd1de..706fa89a9e6fb 100644
--- a/x-pack/plugins/fleet/server/services/managed_package_policies.ts
+++ b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import semverLt from 'semver/functions/lt';
 
 import type { UpgradePackagePolicyDryRunResponseItem } from '../../common';
diff --git a/x-pack/plugins/fleet/server/services/output.test.ts b/x-pack/plugins/fleet/server/services/output.test.ts
index 0a7d5393a63e1..893c77578f0e5 100644
--- a/x-pack/plugins/fleet/server/services/output.test.ts
+++ b/x-pack/plugins/fleet/server/services/output.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+
 import type { OutputSOAttributes } from '../types';
 
 import { outputService, outputIdToUuid } from './output';
diff --git a/x-pack/plugins/fleet/server/services/output.ts b/x-pack/plugins/fleet/server/services/output.ts
index 4aecbd6e03349..8d7aeecb97a4c 100644
--- a/x-pack/plugins/fleet/server/services/output.ts
+++ b/x-pack/plugins/fleet/server/services/output.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest, SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import type { KibanaRequest, SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid/v5';
 import { omit } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts
index bd4223fbe7019..0a9030fa746e4 100644
--- a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { packagePolicyService } from '../package_policy';
 
diff --git a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts
index b7ebec3415453..63631fb785754 100644
--- a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { SO_SEARCH_LIMIT, getMaxPackageName } from '../../../common';
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
index fbf0dbe22c51a..120520db780a5 100644
--- a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
@@ -6,9 +6,10 @@
  */
 
 jest.mock('./epm/packages');
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 import type { PackagePolicy, RegistryDataStream } from '../types';
 
 import { getPackageInfo } from './epm/packages';
diff --git a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
index d361c583c8f6c..968282e2e587a 100644
--- a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
@@ -4,13 +4,15 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { FullAgentPolicyOutputPermissions, RegistryDataStreamPrivileges } from '../../common';
 import { PACKAGE_POLICY_DEFAULT_INDEX_PRIVILEGES } from '../constants';
-import { getPackageInfo } from '../../server/services/epm/packages';
+
 import type { PackagePolicy } from '../types';
 
+import { getPackageInfo } from './epm/packages';
+
 export const DEFAULT_CLUSTER_PERMISSIONS = ['monitor'];
 
 export async function storedPackagePoliciesToAgentPermissions(
diff --git a/x-pack/plugins/fleet/server/services/package_policy.test.ts b/x-pack/plugins/fleet/server/services/package_policy.test.ts
index 2fde004048a36..c84701bf5d5e9 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.test.ts
@@ -9,14 +9,15 @@ import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   httpServerMock,
-} from 'src/core/server/mocks';
+  coreMock,
+} from '@kbn/core/server/mocks';
 import { produce } from 'immer';
 import type {
   SavedObjectsClient,
   SavedObjectsClientContract,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
-import type { KibanaRequest } from 'kibana/server';
+} from '@kbn/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type {
   PackageInfo,
@@ -26,6 +27,7 @@ import type {
   RegistryDataStream,
   PackagePolicyInputStream,
   PackagePolicy,
+  PostPackagePolicyPostCreateCallback,
 } from '../types';
 import { createPackagePolicyMock } from '../../common/mocks';
 
@@ -1269,7 +1271,7 @@ describe('Package policy service', () => {
       await packagePolicyService.runExternalCallbacks(
         'packagePolicyCreate',
         newPackagePolicy,
-        context,
+        coreMock.createCustomRequestHandlerContext(context),
         request
       );
       expect(callbackCallingOrder).toEqual(['a', 'b']);
@@ -1282,7 +1284,7 @@ describe('Package policy service', () => {
       await packagePolicyService.runExternalCallbacks(
         'packagePolicyCreate',
         newPackagePolicy,
-        context,
+        coreMock.createCustomRequestHandlerContext(context),
         request
       );
 
@@ -1329,7 +1331,7 @@ describe('Package policy service', () => {
           await packagePolicyService.runExternalCallbacks(
             'packagePolicyCreate',
             newPackagePolicy,
-            context,
+            coreMock.createCustomRequestHandlerContext(context),
             request
           );
         } catch (e) {
@@ -1348,7 +1350,7 @@ describe('Package policy service', () => {
           packagePolicyService.runExternalCallbacks(
             'packagePolicyCreate',
             newPackagePolicy,
-            context,
+            coreMock.createCustomRequestHandlerContext(context),
             request
           )
         ).rejects.toThrow('callbackThree threw error on purpose');
@@ -1356,6 +1358,101 @@ describe('Package policy service', () => {
     });
   });
 
+  describe('runPostPackagePolicyPostCreateCallback', () => {
+    let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+    let request: KibanaRequest;
+    const packagePolicy = {
+      id: '93ac25fe-0467-4fcc-a3c5-57a26a8496e2',
+      version: 'WzYyMzcsMV0=',
+      name: 'my-cis_kubernetes_benchmark',
+      namespace: 'default',
+      description: '',
+      package: {
+        name: 'cis_kubernetes_benchmark',
+        title: 'CIS Kubernetes Benchmark',
+        version: '0.0.3',
+      },
+      enabled: true,
+      policy_id: '1e6d0690-b995-11ec-a355-d35391e25881',
+      output_id: '',
+      inputs: [
+        {
+          type: 'cloudbeat',
+          policy_template: 'findings',
+          enabled: true,
+          streams: [
+            {
+              enabled: true,
+              data_stream: {
+                type: 'logs',
+                dataset: 'cis_kubernetes_benchmark.findings',
+              },
+              id: 'cloudbeat-cis_kubernetes_benchmark.findings-66b402b3-f24a-4018-b3d0-b88582a836ab',
+              compiled_stream: {
+                processors: [
+                  {
+                    add_cluster_id: null,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+      vars: {
+        dataYaml: {
+          type: 'yaml',
+        },
+      },
+      elasticsearch: undefined,
+      revision: 1,
+      created_at: '2022-04-11T12:44:43.385Z',
+      created_by: 'elastic',
+      updated_at: '2022-04-11T12:44:43.385Z',
+      updated_by: 'elastic',
+    };
+    const callbackCallingOrder: string[] = [];
+
+    beforeEach(() => {
+      context = xpackMocks.createRequestHandlerContext();
+      request = httpServerMock.createKibanaRequest();
+      appContextService.start(createAppContextStartContractMock());
+    });
+
+    afterEach(() => {
+      appContextService.stop();
+      jest.clearAllMocks();
+      callbackCallingOrder.length = 0;
+    });
+
+    it('should execute PostPackagePolicyPostCreateCallback external callbacks', async () => {
+      const callbackA: PostPackagePolicyPostCreateCallback = jest.fn(async (ds) => {
+        callbackCallingOrder.push('a');
+        return ds;
+      });
+
+      const callbackB: PostPackagePolicyPostCreateCallback = jest.fn(async (ds) => {
+        callbackCallingOrder.push('b');
+        return ds;
+      });
+
+      appContextService.addExternalCallback('packagePolicyPostCreate', callbackA);
+      appContextService.addExternalCallback('packagePolicyPostCreate', callbackB);
+
+      const requestContext = coreMock.createCustomRequestHandlerContext(context);
+      await packagePolicyService.runExternalCallbacks(
+        'packagePolicyPostCreate',
+        packagePolicy,
+        requestContext,
+        request
+      );
+
+      expect(callbackA).toHaveBeenCalledWith(packagePolicy, requestContext, request);
+      expect(callbackB).toHaveBeenCalledWith(packagePolicy, requestContext, request);
+      expect(callbackCallingOrder).toEqual(['a', 'b']);
+    });
+  });
+
   describe('preconfigurePackageInputs', () => {
     describe('when variable is already defined', () => {
       it('override original variable value', () => {
@@ -3231,6 +3328,7 @@ describe('Package policy service', () => {
     beforeEach(() => {
       savedObjectsClient = savedObjectsClientMock.create();
     });
+
     function mockPackage(pkgName: string) {
       const mockPackagePolicy = createPackagePolicyMock();
 
@@ -3251,6 +3349,7 @@ describe('Package policy service', () => {
         attributes,
       });
     }
+
     it('should return success if package and policy versions match', async () => {
       mockPackage('apache');
 
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index a6c67ff529a85..04abb2f54228e 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -9,18 +9,19 @@ import { omit, partition, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import semverLt from 'semver/functions/lt';
 import { getFlattenedObject } from '@kbn/std';
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import type {
   ElasticsearchClient,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import uuid from 'uuid';
 import { safeLoad } from 'js-yaml';
 
-import { DEFAULT_SPACE_ID } from '../../../spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+
+import type { AuthenticatedUser } from '@kbn/security-plugin/server';
 
-import type { AuthenticatedUser } from '../../../security/server';
 import {
   packageToPackagePolicy,
   packageToPackagePolicyInputs,
@@ -53,13 +54,15 @@ import {
   PackagePolicyIneligibleForUpgradeError,
   PackagePolicyValidationError,
 } from '../errors';
-import { NewPackagePolicySchema, UpdatePackagePolicySchema } from '../types';
+import { NewPackagePolicySchema, PackagePolicySchema, UpdatePackagePolicySchema } from '../types';
 import type {
   NewPackagePolicy,
   UpdatePackagePolicy,
   PackagePolicy,
   PackagePolicySOAttributes,
   DryRunPackagePolicy,
+  PostPackagePolicyCreateCallback,
+  PostPackagePolicyPostCreateCallback,
 } from '../types';
 import type { ExternalCallback } from '..';
 
@@ -869,16 +872,24 @@ class PackagePolicyService implements PackagePolicyServiceInterface {
     externalCallbackType: A,
     packagePolicy: A extends 'postPackagePolicyDelete'
       ? DeletePackagePoliciesResponse
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
       : NewPackagePolicy,
     context: RequestHandlerContext,
     request: KibanaRequest
-  ): Promise<A extends 'postPackagePolicyDelete' ? void : NewPackagePolicy>;
+  ): Promise<
+    A extends 'postPackagePolicyDelete'
+      ? void
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
+      : NewPackagePolicy
+  >;
   public async runExternalCallbacks(
     externalCallbackType: ExternalCallback[0],
-    packagePolicy: NewPackagePolicy | DeletePackagePoliciesResponse,
+    packagePolicy: PackagePolicy | NewPackagePolicy | DeletePackagePoliciesResponse,
     context: RequestHandlerContext,
     request: KibanaRequest
-  ): Promise<NewPackagePolicy | void> {
+  ): Promise<PackagePolicy | NewPackagePolicy | void> {
     if (externalCallbackType === 'postPackagePolicyDelete') {
       return await this.runDeleteExternalCallbacks(packagePolicy as DeletePackagePoliciesResponse);
     } else {
@@ -888,7 +899,21 @@ class PackagePolicyService implements PackagePolicyServiceInterface {
         if (externalCallbacks && externalCallbacks.size > 0) {
           let updatedNewData = newData;
           for (const callback of externalCallbacks) {
-            const result = await callback(updatedNewData, context, request);
+            let result;
+            if (externalCallbackType === 'packagePolicyPostCreate') {
+              result = await (callback as PostPackagePolicyPostCreateCallback)(
+                updatedNewData as PackagePolicy,
+                context,
+                request
+              );
+              updatedNewData = PackagePolicySchema.validate(result);
+            } else {
+              result = await (callback as PostPackagePolicyCreateCallback)(
+                updatedNewData as NewPackagePolicy,
+                context,
+                request
+              );
+            }
             if (externalCallbackType === 'packagePolicyCreate') {
               updatedNewData = NewPackagePolicySchema.validate(result);
             } else if (externalCallbackType === 'packagePolicyUpdate') {
@@ -1276,10 +1301,18 @@ export interface PackagePolicyServiceInterface {
     externalCallbackType: A,
     packagePolicy: A extends 'postPackagePolicyDelete'
       ? DeletePackagePoliciesResponse
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
       : NewPackagePolicy,
     context: RequestHandlerContext,
     request: KibanaRequest
-  ): Promise<A extends 'postPackagePolicyDelete' ? void : NewPackagePolicy>;
+  ): Promise<
+    A extends 'postPackagePolicyDelete'
+      ? void
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
+      : NewPackagePolicy
+  >;
 
   runDeleteExternalCallbacks(deletedPackagePolicies: DeletePackagePoliciesResponse): Promise<void>;
 
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.test.ts b/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
index 862b589896793..1664215613cb3 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
@@ -7,10 +7,10 @@
 
 import uuid from 'uuid';
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
-import { DEFAULT_SPACE_ID } from '../../../spaces/common/constants';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import type {
   InstallResult,
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
index c11925fa8f2f3..b425cc4ca4035 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { groupBy, omit, pick, isEqual } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts
index b461bc5463d68..122a01153791c 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PreconfiguredOutput } from '../../../common/types';
 import type { Output } from '../../types';
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts
index 83ceb6237b67e..53e2b110f7ed8 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { isEqual } from 'lodash';
 import { safeDump } from 'js-yaml';
 
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts b/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts
index 513d061d3cf0d..30484f93c0157 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts
@@ -6,7 +6,7 @@
  */
 
 import pMap from 'p-map';
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
 
 import { appContextService } from '../app_context';
 import { setupFleet } from '../setup';
diff --git a/x-pack/plugins/fleet/server/services/saved_object.ts b/x-pack/plugins/fleet/server/services/saved_object.ts
index 244de5f88ba1b..6a45061d89334 100644
--- a/x-pack/plugins/fleet/server/services/saved_object.ts
+++ b/x-pack/plugins/fleet/server/services/saved_object.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract, SavedObjectsFindResponse } from 'src/core/server';
+import type { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
 
 import { SO_SEARCH_LIMIT } from '../constants';
 import type { ListWithKuery } from '../types';
diff --git a/x-pack/plugins/fleet/server/services/settings.test.ts b/x-pack/plugins/fleet/server/services/settings.test.ts
index 75712c471f20c..df4f103ef6b50 100644
--- a/x-pack/plugins/fleet/server/services/settings.test.ts
+++ b/x-pack/plugins/fleet/server/services/settings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { appContextService } from './app_context';
 import { getCloudFleetServersHosts, settingsSetup } from './settings';
diff --git a/x-pack/plugins/fleet/server/services/settings.ts b/x-pack/plugins/fleet/server/services/settings.ts
index 0e7b7c5e7a093..d0c09e1891215 100644
--- a/x-pack/plugins/fleet/server/services/settings.ts
+++ b/x-pack/plugins/fleet/server/services/settings.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import {
   decodeCloudId,
diff --git a/x-pack/plugins/fleet/server/services/setup.test.ts b/x-pack/plugins/fleet/server/services/setup.test.ts
index cd760adf7c8cb..c9dc4227ae48d 100644
--- a/x-pack/plugins/fleet/server/services/setup.test.ts
+++ b/x-pack/plugins/fleet/server/services/setup.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
-import type { ElasticsearchClientMock } from 'src/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import type { ElasticsearchClientMock } from '@kbn/core/server/mocks';
 
 import { createAppContextStartContractMock, xpackMocks } from '../mocks';
 
@@ -18,7 +18,7 @@ import { upgradeManagedPackagePolicies } from './managed_package_policies';
 import { setupFleet } from './setup';
 
 jest.mock('./preconfiguration');
-jest.mock('./preconfiguration/index');
+jest.mock('./preconfiguration/outputs');
 jest.mock('./settings');
 jest.mock('./output');
 jest.mock('./epm/packages');
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
index 6e3aed538fb07..50819d7a2640d 100644
--- a/x-pack/plugins/fleet/server/services/setup.ts
+++ b/x-pack/plugins/fleet/server/services/setup.ts
@@ -7,7 +7,9 @@
 
 import { compact } from 'lodash';
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import { AUTO_UPDATE_PACKAGES } from '../../common';
 import type {
@@ -18,12 +20,11 @@ import type {
 } from '../../common';
 
 import { SO_SEARCH_LIMIT } from '../constants';
-import { DEFAULT_SPACE_ID } from '../../../spaces/common/constants';
 
 import { appContextService } from './app_context';
 import { agentPolicyService } from './agent_policy';
 import { ensurePreconfiguredPackagesAndPolicies } from './preconfiguration';
-import { ensurePreconfiguredOutputs } from './preconfiguration/index';
+import { ensurePreconfiguredOutputs } from './preconfiguration/outputs';
 import { outputService } from './output';
 
 import { generateEnrollmentAPIKey, hasEnrollementAPIKeysForPolicy } from './api_keys';
diff --git a/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts b/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts
index c8a64a7172b39..41efa8e5bc811 100644
--- a/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts
+++ b/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import type { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { TelemetryEventsSender } from '../telemetry/sender';
 import { createMockTelemetryEventsSender } from '../telemetry/__mocks__';
diff --git a/x-pack/plugins/fleet/server/services/upgrade_sender.ts b/x-pack/plugins/fleet/server/services/upgrade_sender.ts
index 9069ab68b55a3..c125bf145d0f3 100644
--- a/x-pack/plugins/fleet/server/services/upgrade_sender.ts
+++ b/x-pack/plugins/fleet/server/services/upgrade_sender.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 import type { TelemetryEventsSender } from '../telemetry/sender';
 import type { InstallType } from '../types';
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.test.ts b/x-pack/plugins/fleet/server/telemetry/sender.test.ts
index 1ed77d43b06ad..cc9949ea5f9b8 100644
--- a/x-pack/plugins/fleet/server/telemetry/sender.test.ts
+++ b/x-pack/plugins/fleet/server/telemetry/sender.test.ts
@@ -13,7 +13,7 @@ import axios from 'axios';
 
 import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { UpdateEventType } from '../services/upgrade_sender';
 
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.ts b/x-pack/plugins/fleet/server/telemetry/sender.ts
index 47f8a90f6cd68..a2f9bcafbcbb8 100644
--- a/x-pack/plugins/fleet/server/telemetry/sender.ts
+++ b/x-pack/plugins/fleet/server/telemetry/sender.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreStart, ElasticsearchClient, Logger } from 'src/core/server';
-import type { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
+import type { CoreStart, ElasticsearchClient, Logger } from '@kbn/core/server';
+import type { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 
 import { cloneDeep } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/types/extensions.ts b/x-pack/plugins/fleet/server/types/extensions.ts
index a7f4a422cc2ae..7cb14f80e78fc 100644
--- a/x-pack/plugins/fleet/server/types/extensions.ts
+++ b/x-pack/plugins/fleet/server/types/extensions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest, RequestHandlerContext } from 'kibana/server';
+import type { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 
 import type { DeepReadonly } from 'utility-types';
 
@@ -13,6 +13,7 @@ import type {
   DeletePackagePoliciesResponse,
   NewPackagePolicy,
   UpdatePackagePolicy,
+  PackagePolicy,
 } from '../../common';
 
 export type PostPackagePolicyDeleteCallback = (
@@ -25,6 +26,12 @@ export type PostPackagePolicyCreateCallback = (
   request: KibanaRequest
 ) => Promise<NewPackagePolicy>;
 
+export type PostPackagePolicyPostCreateCallback = (
+  packagePolicy: PackagePolicy,
+  context: RequestHandlerContext,
+  request: KibanaRequest
+) => Promise<PackagePolicy>;
+
 export type PutPackagePolicyUpdateCallback = (
   updatePackagePolicy: UpdatePackagePolicy,
   context: RequestHandlerContext,
@@ -32,6 +39,10 @@ export type PutPackagePolicyUpdateCallback = (
 ) => Promise<UpdatePackagePolicy>;
 
 export type ExternalCallbackCreate = ['packagePolicyCreate', PostPackagePolicyCreateCallback];
+export type ExternalCallbackPostCreate = [
+  'packagePolicyPostCreate',
+  PostPackagePolicyPostCreateCallback
+];
 export type ExternalCallbackDelete = ['postPackagePolicyDelete', PostPackagePolicyDeleteCallback];
 export type ExternalCallbackUpdate = ['packagePolicyUpdate', PutPackagePolicyUpdateCallback];
 
@@ -40,6 +51,7 @@ export type ExternalCallbackUpdate = ['packagePolicyUpdate', PutPackagePolicyUpd
  */
 export type ExternalCallback =
   | ExternalCallbackCreate
+  | ExternalCallbackPostCreate
   | ExternalCallbackDelete
   | ExternalCallbackUpdate;
 
diff --git a/x-pack/plugins/fleet/server/types/models/package_policy.ts b/x-pack/plugins/fleet/server/types/models/package_policy.ts
index 1d4dc1c1b3b65..c4f8ab2c1437e 100644
--- a/x-pack/plugins/fleet/server/types/models/package_policy.ts
+++ b/x-pack/plugins/fleet/server/types/models/package_policy.ts
@@ -55,6 +55,7 @@ const PackagePolicyStreamsSchema = {
       })
     )
   ),
+  compiled_stream: schema.maybe(schema.any()),
 };
 
 const PackagePolicyInputsSchema = {
@@ -150,4 +151,24 @@ export const PackagePolicySchema = schema.object({
   ...PackagePolicyBaseSchema,
   id: schema.string(),
   version: schema.maybe(schema.string()),
+  revision: schema.number(),
+  updated_at: schema.string(),
+  updated_by: schema.string(),
+  created_at: schema.string(),
+  created_by: schema.string(),
+  elasticsearch: schema.maybe(
+    schema.object({
+      privileges: schema.maybe(
+        schema.object({
+          cluster: schema.maybe(schema.arrayOf(schema.string())),
+        })
+      ),
+    })
+  ),
+  inputs: schema.arrayOf(
+    schema.object({
+      ...PackagePolicyInputsSchema,
+      compiled_input: schema.maybe(schema.any()),
+    })
+  ),
 });
diff --git a/x-pack/plugins/fleet/server/types/request_context.ts b/x-pack/plugins/fleet/server/types/request_context.ts
index 0f570f1877627..f9972c6262348 100644
--- a/x-pack/plugins/fleet/server/types/request_context.ts
+++ b/x-pack/plugins/fleet/server/types/request_context.ts
@@ -8,16 +8,17 @@
 import type {
   KibanaResponseFactory,
   RequestHandler,
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   RouteMethod,
   SavedObjectsClientContract,
   IRouter,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+
 import type { FleetAuthz } from '../../common/authz';
 import type { AgentClient } from '../services';
 
 /** @internal */
-export interface FleetRequestHandlerContext extends RequestHandlerContext {
+export type FleetRequestHandlerContext = CustomRequestHandlerContext<{
   fleet: {
     /** {@link FleetAuthz} */
     authz: FleetAuthz;
@@ -35,7 +36,7 @@ export interface FleetRequestHandlerContext extends RequestHandlerContext {
     };
     spaceId: string;
   };
-}
+}>;
 
 /**
  * Convenience type for request handlers in Fleet that includes the FleetRequestHandlerContext type
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts b/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts
index 257cc90d453c8..1f793445bf630 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 
 import { NewAgentPolicySchema } from '../models';
 
-import { ListWithKuerySchema } from './index';
+import { ListWithKuerySchema } from '.';
 
 export const GetAgentPoliciesRequestSchema = {
   query: ListWithKuerySchema.extends({
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts b/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts
index 010cd10492bf0..7f54b9c742d08 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts
@@ -12,7 +12,7 @@ import {
   UpdatePackagePolicyRequestBodySchema,
 } from '../models';
 
-import { ListWithKuerySchema } from './index';
+import { ListWithKuerySchema } from '.';
 
 export const GetPackagePoliciesRequestSchema = {
   query: ListWithKuerySchema,
diff --git a/x-pack/plugins/global_search/common/license_checker.test.ts b/x-pack/plugins/global_search/common/license_checker.test.ts
index e3e7364481236..45c086a0727d5 100644
--- a/x-pack/plugins/global_search/common/license_checker.test.ts
+++ b/x-pack/plugins/global_search/common/license_checker.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Observable, of, BehaviorSubject } from 'rxjs';
-import { licenseMock } from '../../licensing/common/licensing.mock';
-import { ILicense, LicenseCheck } from '../../licensing/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { ILicense, LicenseCheck } from '@kbn/licensing-plugin/common/types';
 import { LicenseChecker } from './license_checker';
 
 describe('LicenseChecker', () => {
diff --git a/x-pack/plugins/global_search/common/license_checker.ts b/x-pack/plugins/global_search/common/license_checker.ts
index 3bfa7e4a218ac..2a4341d988c90 100644
--- a/x-pack/plugins/global_search/common/license_checker.ts
+++ b/x-pack/plugins/global_search/common/license_checker.ts
@@ -7,7 +7,7 @@
 
 import { Observable, Subscription } from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { ILicense } from '../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 export type LicenseState = { valid: false; message: string } | { valid: true };
 
diff --git a/x-pack/plugins/global_search/public/index.ts b/x-pack/plugins/global_search/public/index.ts
index 55a16407eb603..588b290a61a58 100644
--- a/x-pack/plugins/global_search/public/index.ts
+++ b/x-pack/plugins/global_search/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   GlobalSearchPlugin,
   GlobalSearchPluginSetupDeps,
diff --git a/x-pack/plugins/global_search/public/plugin.ts b/x-pack/plugins/global_search/public/plugin.ts
index 00f320d23b606..4678b043e3f92 100644
--- a/x-pack/plugins/global_search/public/plugin.ts
+++ b/x-pack/plugins/global_search/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import { LicensingPluginStart } from '../../licensing/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { LicenseChecker, ILicenseChecker } from '../common/license_checker';
 import { GlobalSearchPluginSetup, GlobalSearchPluginStart } from './types';
 import { GlobalSearchClientConfigType } from './config';
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts b/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
index 8f07e8d097725..6d3c12a2de66f 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
@@ -7,7 +7,7 @@
 
 import { lastValueFrom } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { GlobalSearchResult } from '../../common/types';
 import { fetchServerResults } from './fetch_server_results';
 
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_results.ts b/x-pack/plugins/global_search/public/services/fetch_server_results.ts
index 4f4069ac90ad2..26d174621fabc 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_results.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_results.ts
@@ -7,7 +7,7 @@
 
 import { Observable, from, EMPTY } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { GlobalSearchResult, GlobalSearchProviderFindParams } from '../../common/types';
 import { GlobalSearchFindOptions } from './types';
 
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts
index a3b791eb29d17..7f87b21f46bd3 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { fetchServerSearchableTypes } from './fetch_server_searchable_types';
 
 describe('fetchServerSearchableTypes', () => {
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts
index b3b4b60f9ede7..62fad1542159b 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 interface ServerSearchableTypesResponse {
   types: string[];
diff --git a/x-pack/plugins/global_search/public/services/search_service.test.ts b/x-pack/plugins/global_search/public/services/search_service.test.ts
index 56f3b77bbaafb..bf12f7a6d77da 100644
--- a/x-pack/plugins/global_search/public/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.test.ts
@@ -14,7 +14,7 @@ import {
 import { firstValueFrom, Observable, of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { duration } from 'moment';
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { licenseCheckerMock } from '../../common/license_checker.mock';
 import { GlobalSearchProviderResult, GlobalSearchResult } from '../../common/types';
 import { GlobalSearchFindError } from '../../common/errors';
diff --git a/x-pack/plugins/global_search/public/services/search_service.ts b/x-pack/plugins/global_search/public/services/search_service.ts
index 85f4d4143a609..975dc4a253f4d 100644
--- a/x-pack/plugins/global_search/public/services/search_service.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.ts
@@ -10,7 +10,7 @@ import { map, takeUntil, catchError } from 'rxjs/operators';
 import { uniq } from 'lodash';
 import { duration } from 'moment';
 import { i18n } from '@kbn/i18n';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   GlobalSearchFindParams,
   GlobalSearchProviderResult,
diff --git a/x-pack/plugins/global_search/server/config.ts b/x-pack/plugins/global_search/server/config.ts
index c71637b8b49ed..798c59408dbe4 100644
--- a/x-pack/plugins/global_search/server/config.ts
+++ b/x-pack/plugins/global_search/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   search_timeout: schema.duration({ defaultValue: '30s' }),
diff --git a/x-pack/plugins/global_search/server/index.ts b/x-pack/plugins/global_search/server/index.ts
index d98e10f404306..107486c857f94 100644
--- a/x-pack/plugins/global_search/server/index.ts
+++ b/x-pack/plugins/global_search/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import {
   GlobalSearchPlugin,
   GlobalSearchPluginSetupDeps,
diff --git a/x-pack/plugins/global_search/server/mocks.ts b/x-pack/plugins/global_search/server/mocks.ts
index 2dfcbad0b964f..948ea49b95fa9 100644
--- a/x-pack/plugins/global_search/server/mocks.ts
+++ b/x-pack/plugins/global_search/server/mocks.ts
@@ -6,6 +6,7 @@
  */
 
 import { of } from 'rxjs';
+import { coreMock } from '@kbn/core/server/mocks';
 import {
   GlobalSearchPluginSetup,
   GlobalSearchPluginStart,
@@ -14,7 +15,6 @@ import {
 } from './types';
 import { searchServiceMock } from './services/search_service.mock';
 import { contextMock } from './services/context.mock';
-import { coreMock } from '../../../../src/core/server/mocks';
 
 const createSetupMock = (): jest.Mocked<GlobalSearchPluginSetup> => {
   const searchMock = searchServiceMock.createSetupContract();
@@ -52,7 +52,10 @@ const createRequestHandlerContextMock = (): jest.Mocked<GlobalSearchRequestHandl
 
   handlerContextMock.find.mockReturnValue(of([]));
 
-  return { core: coreMock.createRequestHandlerContext(), globalSearch: handlerContextMock };
+  return coreMock.createCustomRequestHandlerContext({
+    core: coreMock.createRequestHandlerContext(),
+    globalSearch: handlerContextMock,
+  });
 };
 
 export const globalSearchPluginMock = {
diff --git a/x-pack/plugins/global_search/server/plugin.test.ts b/x-pack/plugins/global_search/server/plugin.test.ts
index 9323f38240d8e..457e83100e4d9 100644
--- a/x-pack/plugins/global_search/server/plugin.test.ts
+++ b/x-pack/plugins/global_search/server/plugin.test.ts
@@ -7,7 +7,7 @@
 
 import { registerRoutesMock } from './plugin.test.mocks';
 
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { GlobalSearchPlugin } from './plugin';
 
 describe('GlobalSearchPlugin', () => {
diff --git a/x-pack/plugins/global_search/server/plugin.ts b/x-pack/plugins/global_search/server/plugin.ts
index 688691d8941e2..cee90ef66beee 100644
--- a/x-pack/plugins/global_search/server/plugin.ts
+++ b/x-pack/plugins/global_search/server/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server';
-import { LicensingPluginStart } from '../../licensing/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { LicenseChecker, ILicenseChecker } from '../common/license_checker';
 import { SearchService, SearchServiceStart } from './services';
 import { registerRoutes } from './routes';
diff --git a/x-pack/plugins/global_search/server/routes/find.ts b/x-pack/plugins/global_search/server/routes/find.ts
index 7ac4445f35864..ec491454f7a88 100644
--- a/x-pack/plugins/global_search/server/routes/find.ts
+++ b/x-pack/plugins/global_search/server/routes/find.ts
@@ -32,8 +32,9 @@ export const registerInternalFindRoute = (router: GlobalSearchRouter) => {
     async (ctx, req, res) => {
       const { params, options } = req.body;
       try {
-        const allResults = await ctx
-          .globalSearch!.find(params, { ...options, aborted$: req.events.aborted$ })
+        const globalSearch = await ctx.globalSearch;
+        const allResults = await globalSearch
+          .find(params, { ...options, aborted$: req.events.aborted$ })
           .pipe(
             map((batch) => batch.results),
             reduce((acc, results) => [...acc, ...results])
diff --git a/x-pack/plugins/global_search/server/routes/get_searchable_types.ts b/x-pack/plugins/global_search/server/routes/get_searchable_types.ts
index 3db7a4ee75174..f456c0e665f19 100644
--- a/x-pack/plugins/global_search/server/routes/get_searchable_types.ts
+++ b/x-pack/plugins/global_search/server/routes/get_searchable_types.ts
@@ -14,7 +14,8 @@ export const registerInternalSearchableTypesRoute = (router: GlobalSearchRouter)
       validate: false,
     },
     async (ctx, req, res) => {
-      const types = await ctx.globalSearch!.getSearchableTypes();
+      const globalSearch = await ctx.globalSearch;
+      const types = await globalSearch.getSearchableTypes();
       return res.ok({
         body: {
           types,
diff --git a/x-pack/plugins/global_search/server/routes/index.test.ts b/x-pack/plugins/global_search/server/routes/index.test.ts
index fccfa9344b53d..da0da89052e32 100644
--- a/x-pack/plugins/global_search/server/routes/index.test.ts
+++ b/x-pack/plugins/global_search/server/routes/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../src/core/server/mocks';
-import { registerRoutes } from './index';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { registerRoutes } from '.';
 
 describe('registerRoutes', () => {
   it('foo', () => {
diff --git a/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts b/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts
index 1fe6e73969e3b..56cd4edaef253 100644
--- a/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts
+++ b/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts
@@ -7,7 +7,7 @@
 
 import { of, throwError } from 'rxjs';
 import supertest from 'supertest';
-import { setupServer } from '../../../../../../src/core/server/test_utils';
+import { setupServer } from '@kbn/core/server/test_utils';
 import { GlobalSearchResult, GlobalSearchBatchedResults } from '../../../common/types';
 import { GlobalSearchFindError } from '../../../common/errors';
 import { globalSearchPluginMock } from '../../mocks';
diff --git a/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts b/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts
index f6ddf0c1ac1df..a72cb9975db19 100644
--- a/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts
+++ b/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts
@@ -6,7 +6,7 @@
  */
 
 import supertest from 'supertest';
-import { setupServer } from '../../../../../../src/core/server/test_utils';
+import { setupServer } from '@kbn/core/server/test_utils';
 import { globalSearchPluginMock } from '../../mocks';
 import { registerInternalSearchableTypesRoute } from '../get_searchable_types';
 
diff --git a/x-pack/plugins/global_search/server/services/context.mock.ts b/x-pack/plugins/global_search/server/services/context.mock.ts
index c7f43ad5b8ff0..7e56a2c29aa29 100644
--- a/x-pack/plugins/global_search/server/services/context.mock.ts
+++ b/x-pack/plugins/global_search/server/services/context.mock.ts
@@ -6,13 +6,13 @@
  */
 
 import { of } from 'rxjs';
-import { Capabilities } from 'src/core/server';
+import { Capabilities } from '@kbn/core/server';
 import {
   savedObjectsTypeRegistryMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
   capabilitiesServiceMock,
-} from '../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 const createContextMock = (capabilities: Partial<Capabilities> = {}) => {
   return {
diff --git a/x-pack/plugins/global_search/server/services/context.test.ts b/x-pack/plugins/global_search/server/services/context.test.ts
index 580083efbb303..f90c0bc0f6c84 100644
--- a/x-pack/plugins/global_search/server/services/context.test.ts
+++ b/x-pack/plugins/global_search/server/services/context.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock, coreMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getContextFactory } from './context';
 
 describe('getContextFactory', () => {
diff --git a/x-pack/plugins/global_search/server/services/context.ts b/x-pack/plugins/global_search/server/services/context.ts
index b0669f35b99b9..02d86c909ab72 100644
--- a/x-pack/plugins/global_search/server/services/context.ts
+++ b/x-pack/plugins/global_search/server/services/context.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { CoreStart, KibanaRequest } from 'src/core/server';
+import { CoreStart, KibanaRequest } from '@kbn/core/server';
 import { GlobalSearchProviderContext } from '../types';
 
 export type GlobalSearchContextFactory = (request: KibanaRequest) => GlobalSearchProviderContext;
diff --git a/x-pack/plugins/global_search/server/services/search_service.test.ts b/x-pack/plugins/global_search/server/services/search_service.test.ts
index f7a94bbbeb0e7..2ac13dc117dc0 100644
--- a/x-pack/plugins/global_search/server/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.test.ts
@@ -8,7 +8,7 @@
 import { firstValueFrom, Observable, of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { duration } from 'moment';
-import { httpServiceMock, httpServerMock, coreMock } from '../../../../../src/core/server/mocks';
+import { httpServiceMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { licenseCheckerMock } from '../../common/license_checker.mock';
 import { GlobalSearchProviderResult } from '../../common/types';
 import { GlobalSearchFindError } from '../../common/errors';
diff --git a/x-pack/plugins/global_search/server/services/search_service.ts b/x-pack/plugins/global_search/server/services/search_service.ts
index 22bac036544ab..8aedd2426c136 100644
--- a/x-pack/plugins/global_search/server/services/search_service.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.ts
@@ -9,7 +9,7 @@ import { Observable, timer, merge, throwError, EMPTY } from 'rxjs';
 import { map, takeUntil, catchError } from 'rxjs/operators';
 import { uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, CoreStart, IBasePath } from 'src/core/server';
+import { KibanaRequest, CoreStart, IBasePath } from '@kbn/core/server';
 import {
   GlobalSearchProviderResult,
   GlobalSearchBatchedResults,
diff --git a/x-pack/plugins/global_search/server/services/utils.test.ts b/x-pack/plugins/global_search/server/services/utils.test.ts
index 8ff33761d57d4..20e484b378019 100644
--- a/x-pack/plugins/global_search/server/services/utils.test.ts
+++ b/x-pack/plugins/global_search/server/services/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getRequestBasePath } from './utils';
 
 describe('getRequestBasePath', () => {
diff --git a/x-pack/plugins/global_search/server/services/utils.ts b/x-pack/plugins/global_search/server/services/utils.ts
index 08a3dc62981a3..a4d37110153fa 100644
--- a/x-pack/plugins/global_search/server/services/utils.ts
+++ b/x-pack/plugins/global_search/server/services/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IBasePath, KibanaRequest } from 'src/core/server';
+import type { IBasePath, KibanaRequest } from '@kbn/core/server';
 import type { IBasePath as BasePathAccessor } from '../../common/utils';
 
 export const getRequestBasePath = (
diff --git a/x-pack/plugins/global_search/server/types.ts b/x-pack/plugins/global_search/server/types.ts
index 363f837f4bd2e..10a7bafe850dd 100644
--- a/x-pack/plugins/global_search/server/types.ts
+++ b/x-pack/plugins/global_search/server/types.ts
@@ -12,8 +12,8 @@ import type {
   SavedObjectsClientContract,
   Capabilities,
   IRouter,
-  RequestHandlerContext,
-} from 'src/core/server';
+  CustomRequestHandlerContext,
+} from '@kbn/core/server';
 import {
   GlobalSearchBatchedResults,
   GlobalSearchProviderFindOptions,
@@ -29,9 +29,9 @@ export type GlobalSearchPluginStart = Pick<SearchServiceStart, 'find' | 'getSear
 /**
  * @internal
  */
-export interface GlobalSearchRequestHandlerContext extends RequestHandlerContext {
+export type GlobalSearchRequestHandlerContext = CustomRequestHandlerContext<{
   globalSearch: RouteHandlerGlobalSearchContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/global_search_bar/kibana.json b/x-pack/plugins/global_search_bar/kibana.json
index 538b003a29ef0..cea5b8209739b 100644
--- a/x-pack/plugins/global_search_bar/kibana.json
+++ b/x-pack/plugins/global_search_bar/kibana.json
@@ -8,6 +8,7 @@
   "kibanaVersion": "kibana",
   "server": false,
   "ui": true,
+  "requiredBundles": ["kibanaReact"],
   "requiredPlugins": ["globalSearch"],
   "optionalPlugins": ["usageCollection", "savedObjectsTagging"],
   "configPath": ["xpack", "global_search_bar"]
diff --git a/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx b/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx
index 4cc75d207e287..d1a875e56c95f 100644
--- a/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBadge } from '@elastic/eui';
-import type { Tag } from '../../../saved_objects_tagging/public';
+import type { Tag } from '@kbn/saved-objects-tagging-plugin/public';
 
 const MAX_TAGS_TO_SHOW = 3;
 
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
index df9096fa1d0fa..78f38087b9ad1 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { act, render, screen, fireEvent } from '@testing-library/react';
 import { of, BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { applicationServiceMock } from '../../../../../src/core/public/mocks';
-import { globalSearchPluginMock } from '../../../global_search/public/mocks';
-import { GlobalSearchBatchedResults, GlobalSearchResult } from '../../../global_search/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/public/mocks';
+import { GlobalSearchBatchedResults, GlobalSearchResult } from '@kbn/global-search-plugin/public';
 import { SearchBar } from './search_bar';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
index ab7bea265c626..cc90a6858823f 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -21,13 +21,13 @@ import {
 } from '@elastic/eui';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import type {
   GlobalSearchPluginStart,
   GlobalSearchResult,
   GlobalSearchFindParams,
-} from '../../../global_search/public';
-import type { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+} from '@kbn/global-search-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 import { parseSearchParams } from '../search_syntax';
 import { getSuggestions, SearchSuggestion } from '../suggestions';
 import { resultToOption, suggestionToOption } from '../lib';
diff --git a/x-pack/plugins/global_search_bar/public/index.ts b/x-pack/plugins/global_search_bar/public/index.ts
index fc696d8e7f337..f6676587f83a4 100644
--- a/x-pack/plugins/global_search_bar/public/index.ts
+++ b/x-pack/plugins/global_search_bar/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { GlobalSearchBarPlugin } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, {}, {}> = () => new GlobalSearchBarPlugin();
diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
index ab935522ab921..c1ae52b5a2167 100644
--- a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
+++ b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { GlobalSearchResult } from '../../../global_search/common/types';
+import type { GlobalSearchResult } from '@kbn/global-search-plugin/common/types';
 import { resultToOption } from './result_to_option';
 
 const createSearchResult = (parts: Partial<GlobalSearchResult> = {}): GlobalSearchResult => ({
diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
index 85bf99f5e5a6d..f09b45c6e19a5 100644
--- a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
+++ b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import type { EuiSelectableTemplateSitewideOption } from '@elastic/eui';
-import type { GlobalSearchResult } from '../../../global_search/common/types';
-import type { SavedObjectTaggingPluginStart, Tag } from '../../../saved_objects_tagging/public';
+import type { GlobalSearchResult } from '@kbn/global-search-plugin/common/types';
+import type { SavedObjectTaggingPluginStart, Tag } from '@kbn/saved-objects-tagging-plugin/public';
 import { ResultTagList } from '../components/result_tag_list';
 
 const cleanMeta = (str: string) => (str.charAt(0).toUpperCase() + str.slice(1)).replace(/-/g, ' ');
diff --git a/x-pack/plugins/global_search_bar/public/plugin.tsx b/x-pack/plugins/global_search_bar/public/plugin.tsx
index f2917e27bb556..576b01e38f2c8 100644
--- a/x-pack/plugins/global_search_bar/public/plugin.tsx
+++ b/x-pack/plugins/global_search_bar/public/plugin.tsx
@@ -7,13 +7,14 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { Observable } from 'rxjs';
 import { UiCounterMetricType } from '@kbn/analytics';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
-import { CoreStart, Plugin } from 'src/core/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { GlobalSearchPluginStart } from '../../global_search/public';
-import { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
+import { ApplicationStart, CoreTheme, CoreStart, Plugin } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { GlobalSearchPluginStart } from '@kbn/global-search-plugin/public';
+import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 import { SearchBar } from './components/search_bar';
 
 export interface GlobalSearchBarPluginStartDeps {
@@ -45,6 +46,7 @@ export class GlobalSearchBarPlugin implements Plugin<{}, {}> {
           navigateToUrl: core.application.navigateToUrl,
           basePathUrl: core.http.basePath.prepend('/plugins/globalSearchBar/assets/'),
           darkMode: core.uiSettings.get('theme:darkMode'),
+          theme$: core.theme.theme$,
           trackUiMetric,
         }),
     });
@@ -58,6 +60,7 @@ export class GlobalSearchBarPlugin implements Plugin<{}, {}> {
     navigateToUrl,
     basePathUrl,
     darkMode,
+    theme$,
     trackUiMetric,
   }: {
     container: HTMLElement;
@@ -66,19 +69,22 @@ export class GlobalSearchBarPlugin implements Plugin<{}, {}> {
     navigateToUrl: ApplicationStart['navigateToUrl'];
     basePathUrl: string;
     darkMode: boolean;
+    theme$: Observable<CoreTheme>;
     trackUiMetric: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
   }) {
     ReactDOM.render(
-      <I18nProvider>
-        <SearchBar
-          globalSearch={globalSearch}
-          navigateToUrl={navigateToUrl}
-          taggingApi={savedObjectsTagging}
-          basePathUrl={basePathUrl}
-          darkMode={darkMode}
-          trackUiMetric={trackUiMetric}
-        />
-      </I18nProvider>,
+      <KibanaThemeProvider theme$={theme$}>
+        <I18nProvider>
+          <SearchBar
+            globalSearch={globalSearch}
+            navigateToUrl={navigateToUrl}
+            taggingApi={savedObjectsTagging}
+            basePathUrl={basePathUrl}
+            darkMode={darkMode}
+            trackUiMetric={trackUiMetric}
+          />
+        </I18nProvider>
+      </KibanaThemeProvider>,
       container
     );
 
diff --git a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts
index 75571d63d352d..b729ef9c8e23b 100644
--- a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts
+++ b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { taggingApiMock } from '../../../saved_objects_tagging/public/mocks';
-import { Tag } from '../../../../../src/plugins/saved_objects_tagging_oss/common';
+import { taggingApiMock } from '@kbn/saved-objects-tagging-plugin/public/mocks';
+import { Tag } from '@kbn/saved-objects-tagging-oss-plugin/common';
 import { getSuggestions } from './get_suggestions';
 
 const createTag = (parts: Partial<Tag> = {}): Tag => ({
diff --git a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts
index 6c1625ae18fe6..893e103a42347 100644
--- a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts
+++ b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ITagsCache } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 interface GetSuggestionOptions {
   searchTerm: string;
diff --git a/x-pack/plugins/global_search_providers/public/index.ts b/x-pack/plugins/global_search_providers/public/index.ts
index fdb0cabb6623e..dcbc55e308ff5 100644
--- a/x-pack/plugins/global_search_providers/public/index.ts
+++ b/x-pack/plugins/global_search_providers/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { GlobalSearchProvidersPlugin, GlobalSearchProvidersPluginSetupDeps } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> = () =>
diff --git a/x-pack/plugins/global_search_providers/public/plugin.test.ts b/x-pack/plugins/global_search_providers/public/plugin.test.ts
index d1e9256f9466a..b33f31287c439 100644
--- a/x-pack/plugins/global_search_providers/public/plugin.test.ts
+++ b/x-pack/plugins/global_search_providers/public/plugin.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../src/core/public/mocks';
-import { globalSearchPluginMock } from '../../global_search/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/public/mocks';
 import { GlobalSearchProvidersPlugin } from './plugin';
 
 describe('GlobalSearchProvidersPlugin', () => {
diff --git a/x-pack/plugins/global_search_providers/public/plugin.ts b/x-pack/plugins/global_search_providers/public/plugin.ts
index 89e8e9f57a3de..49440b921394a 100644
--- a/x-pack/plugins/global_search_providers/public/plugin.ts
+++ b/x-pack/plugins/global_search_providers/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/public';
-import { GlobalSearchPluginSetup } from '../../global_search/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/public';
 import { createApplicationResultProvider } from './providers';
 
 export interface GlobalSearchProvidersPluginSetupDeps {
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.test.ts b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
index aa54f3a0e5ff2..353c7829dbc97 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.test.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
@@ -9,12 +9,12 @@ import { getAppResultsMock } from './application.test.mocks';
 
 import { EMPTY, of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { ApplicationStart, AppNavLinkStatus, AppStatus, PublicAppInfo } from 'src/core/public';
+import { ApplicationStart, AppNavLinkStatus, AppStatus, PublicAppInfo } from '@kbn/core/public';
 import {
   GlobalSearchProviderFindOptions,
   GlobalSearchProviderResult,
-} from '../../../global_search/public';
-import { applicationServiceMock } from 'src/core/public/mocks';
+} from '@kbn/global-search-plugin/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { createApplicationResultProvider } from './application';
 
 const getTestScheduler = () =>
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.ts b/x-pack/plugins/global_search_providers/public/providers/application.ts
index ba5dfbb603da0..dd4219d2b08bd 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.ts
@@ -7,8 +7,8 @@
 
 import { from, of } from 'rxjs';
 import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs/operators';
-import { ApplicationStart } from 'src/core/public';
-import { GlobalSearchResultProvider } from '../../../global_search/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/public';
 import { getAppResults } from './get_app_results';
 
 const applicationType = 'application';
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
index db64e2972e932..0b0bb0012102a 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
@@ -10,7 +10,7 @@ import {
   AppStatus,
   PublicAppInfo,
   DEFAULT_APP_CATEGORIES,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import {
   AppLink,
   appToResult,
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
index ece173777f3e1..00c4a9959f8a2 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
@@ -6,8 +6,8 @@
  */
 
 import levenshtein from 'js-levenshtein';
-import { PublicAppInfo, PublicAppDeepLinkInfo } from 'src/core/public';
-import { GlobalSearchProviderResult } from '../../../global_search/public';
+import { PublicAppInfo, PublicAppDeepLinkInfo } from '@kbn/core/public';
+import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/public';
 
 /** Type used internally to represent an application unrolled into its separate deepLinks */
 export interface AppLink {
diff --git a/x-pack/plugins/global_search_providers/server/index.ts b/x-pack/plugins/global_search_providers/server/index.ts
index bd6610429ced8..92b3a4347492e 100644
--- a/x-pack/plugins/global_search_providers/server/index.ts
+++ b/x-pack/plugins/global_search_providers/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { GlobalSearchProvidersPlugin, GlobalSearchProvidersPluginSetupDeps } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> = () =>
diff --git a/x-pack/plugins/global_search_providers/server/plugin.test.ts b/x-pack/plugins/global_search_providers/server/plugin.test.ts
index e582f514d8d43..eae5e8633daaf 100644
--- a/x-pack/plugins/global_search_providers/server/plugin.test.ts
+++ b/x-pack/plugins/global_search_providers/server/plugin.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../src/core/server/mocks';
-import { globalSearchPluginMock } from '../../global_search/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/server/mocks';
 import { GlobalSearchProvidersPlugin } from './plugin';
 
 describe('GlobalSearchProvidersPlugin', () => {
diff --git a/x-pack/plugins/global_search_providers/server/plugin.ts b/x-pack/plugins/global_search_providers/server/plugin.ts
index dae346144bce3..c7b0da5c8d10d 100644
--- a/x-pack/plugins/global_search_providers/server/plugin.ts
+++ b/x-pack/plugins/global_search_providers/server/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/server';
-import { GlobalSearchPluginSetup } from '../../global_search/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/server';
 import { createSavedObjectsResultProvider } from './providers';
 
 export interface GlobalSearchProvidersPluginSetupDeps {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts
index 3a8494cb7d0e8..f21251ca5fc83 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectTypeRegistry } from '../../../../../../src/core/server';
+import { SavedObjectTypeRegistry } from '@kbn/core/server';
 import { getSearchableTypes } from './get_searchable_types';
 
 describe('getSearchableTypes', () => {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts
index fa8153dc161ca..eda2f7762f439 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISavedObjectTypeRegistry, SavedObjectsType } from 'src/core/server';
+import type { ISavedObjectTypeRegistry, SavedObjectsType } from '@kbn/core/server';
 
 export const getSearchableTypes = (typeRegistry: ISavedObjectTypeRegistry, types?: string[]) => {
   const typeFilter = types
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
index 3b6011aeab7fc..7f5a894a32e53 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
@@ -10,9 +10,9 @@ import {
   SavedObjectsType,
   SavedObjectTypeRegistry,
   Capabilities,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { mapToResult, mapToResults } from './map_object_to_result';
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 
 const createType = (props: Partial<SavedObjectsType>): SavedObjectsType => {
   return {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
index 871710abee11b..676c92fba0b4c 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
@@ -11,8 +11,8 @@ import {
   ISavedObjectTypeRegistry,
   SavedObjectsFindResult,
   Capabilities,
-} from 'src/core/server';
-import { GlobalSearchProviderResult } from '../../../../global_search/server';
+} from '@kbn/core/server';
+import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/server';
 
 export const mapToResults = (
   objects: Array<SavedObjectsFindResult<unknown>>,
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
index f332747f1ccfc..1943e08df2119 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
@@ -13,12 +13,12 @@ import {
   SavedObjectsFindResult,
   SavedObjectsType,
   SavedObjectTypeRegistry,
-} from 'src/core/server';
-import { globalSearchPluginMock } from '../../../../global_search/server/mocks';
+} from '@kbn/core/server';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/server/mocks';
 import {
   GlobalSearchResultProvider,
   GlobalSearchProviderFindOptions,
-} from '../../../../global_search/server';
+} from '@kbn/global-search-plugin/server';
 import { createSavedObjectsResultProvider } from './provider';
 
 const getTestScheduler = () =>
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
index ae1f6da10bc6e..5eba3d940ccb1 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
@@ -7,8 +7,8 @@
 
 import { from, combineLatest, of } from 'rxjs';
 import { map, takeUntil, first } from 'rxjs/operators';
-import { SavedObjectsFindOptionsReference } from 'src/core/server';
-import { GlobalSearchResultProvider } from '../../../../global_search/server';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/server';
+import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/server';
 import { mapToResults } from './map_object_to_result';
 import { getSearchableTypes } from './get_searchable_types';
 
diff --git a/x-pack/plugins/graph/common/check_license.ts b/x-pack/plugins/graph/common/check_license.ts
index 8357efbbba643..2b4ac145fb785 100644
--- a/x-pack/plugins/graph/common/check_license.ts
+++ b/x-pack/plugins/graph/common/check_license.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ILicense } from '../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 // Can be used in switch statements to ensure we perform exhaustive checks, see
 // https://www.typescriptlang.org/docs/handbook/advanced-types.html#exhaustiveness-checking
diff --git a/x-pack/plugins/graph/kibana.json b/x-pack/plugins/graph/kibana.json
index 86ff0cf5d6c4f..3ea4d3cdca356 100644
--- a/x-pack/plugins/graph/kibana.json
+++ b/x-pack/plugins/graph/kibana.json
@@ -22,8 +22,7 @@
   "requiredBundles": [
     "unifiedSearch",
     "kibanaUtils",
-    "kibanaReact",
-    "home"
+    "kibanaReact"
   ],
   "owner": {
     "name": "Data Discovery",
diff --git a/x-pack/plugins/graph/public/application.tsx b/x-pack/plugins/graph/public/application.tsx
index adc396965f6a7..bc0ee0b3ee55b 100644
--- a/x-pack/plugins/graph/public/application.tsx
+++ b/x-pack/plugins/graph/public/application.tsx
@@ -18,22 +18,22 @@ import {
   IUiSettingsClient,
   Capabilities,
   ScopedHistory,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { DataPlugin, DataViewsContract } from '../../../../src/plugins/data/public';
-import { LicensingPluginStart } from '../../licensing/public';
-import { checkLicense } from '../common/check_license';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
+import { DataPlugin, DataViewsContract } from '@kbn/data-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import './index.scss';
 import('./font_awesome');
-import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
+import { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { GraphSavePolicy } from './types';
 import { graphRouter } from './router';
-import { SpacesApi } from '../../spaces/public';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+import { checkLicense } from '../common/check_license';
 
 /**
  * These are dependencies of the Graph app besides the base dependencies
diff --git a/x-pack/plugins/graph/public/apps/listing_route.tsx b/x-pack/plugins/graph/public/apps/listing_route.tsx
index 1683388841729..cf9a5ea88d2a8 100644
--- a/x-pack/plugins/graph/public/apps/listing_route.tsx
+++ b/x-pack/plugins/graph/public/apps/listing_route.tsx
@@ -9,9 +9,9 @@ import React, { Fragment, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiLink, EuiButton } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { useHistory, useLocation } from 'react-router-dom';
-import { TableListView } from '../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '@kbn/kibana-react-plugin/public';
 import { deleteSavedWorkspace, findSavedWorkspace } from '../helpers/saved_workspace_utils';
 import { getEditPath, getEditUrl, getNewPath, setBreadcrumbs } from '../services/url';
 import { GraphWorkspaceSavedObject } from '../types';
diff --git a/x-pack/plugins/graph/public/apps/workspace_route.tsx b/x-pack/plugins/graph/public/apps/workspace_route.tsx
index 2961d0eea08ec..e8850e4817d50 100644
--- a/x-pack/plugins/graph/public/apps/workspace_route.tsx
+++ b/x-pack/plugins/graph/public/apps/workspace_route.tsx
@@ -9,8 +9,8 @@ import React, { useMemo, useRef, useState } from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Provider } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { showSaveModal } from '../../../../../src/plugins/saved_objects/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { showSaveModal } from '@kbn/saved-objects-plugin/public';
 import { Workspace } from '../types';
 import { createGraphStore } from '../state_management';
 import { createWorkspace } from '../services/workspace/graph_client_workspace';
diff --git a/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx b/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
index 3dd863ac1a124..e6cf2eacc0d87 100644
--- a/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
+++ b/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
@@ -20,7 +20,8 @@ import { i18n } from '@kbn/i18n';
 import classNames from 'classnames';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { connect } from 'react-redux';
-import { IDataPluginServices } from 'src/plugins/data/public';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   GraphState,
   hasDatasourceSelector,
@@ -31,8 +32,6 @@ import {
 import { IndexPatternSavedObject } from '../../types';
 import { openSourceModal } from '../../services/source_modal';
 
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-
 export interface GuidancePanelProps {
   onFillWorkspace: () => void;
   onOpenFieldPicker: () => void;
diff --git a/x-pack/plugins/graph/public/components/inspect_panel.tsx b/x-pack/plugins/graph/public/components/inspect_panel.tsx
index 6881a750f76ed..e6197bac16ba7 100644
--- a/x-pack/plugins/graph/public/components/inspect_panel.tsx
+++ b/x-pack/plugins/graph/public/components/inspect_panel.tsx
@@ -9,8 +9,8 @@ import React, { useMemo, useState } from 'react';
 import { EuiTab, EuiTabs, EuiText } from '@elastic/eui';
 import { monaco, XJsonLang } from '@kbn/monaco';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CodeEditor } from '../../../../../src/plugins/kibana_react/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 interface InspectPanelProps {
   showInspect: boolean;
diff --git a/x-pack/plugins/graph/public/components/save_modal.tsx b/x-pack/plugins/graph/public/components/save_modal.tsx
index 1048d329faee1..557ce2de114ec 100644
--- a/x-pack/plugins/graph/public/components/save_modal.tsx
+++ b/x-pack/plugins/graph/public/components/save_modal.tsx
@@ -8,7 +8,7 @@
 import React, { useState } from 'react';
 import { EuiFormRow, EuiTextArea, EuiCallOut, EuiSpacer, EuiSwitch } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectSaveModal, OnSaveProps } from '../../../../../src/plugins/saved_objects/public';
+import { SavedObjectSaveModal, OnSaveProps } from '@kbn/saved-objects-plugin/public';
 
 import { GraphSavePolicy } from '../types/config';
 
diff --git a/x-pack/plugins/graph/public/components/search_bar.test.tsx b/x-pack/plugins/graph/public/components/search_bar.test.tsx
index 9a5b464e01e8f..c05da957599c9 100644
--- a/x-pack/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.test.tsx
@@ -15,12 +15,13 @@ import {
   NotificationsStart,
   OverlayStart,
   SavedObjectsStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { act } from 'react-dom/test-utils';
-import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
-
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { setAutocomplete } from '@kbn/unified-search-plugin/public/services';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider, InjectedIntl } from '@kbn/i18n-react';
 
 import { openSourceModal } from '../services/source_modal';
@@ -59,6 +60,8 @@ function getServiceMocks() {
       query: {
         savedQueries: {},
       },
+    },
+    unifiedSearch: {
       autocomplete: {
         hasQuerySuggestions: () => false,
       },
@@ -101,6 +104,11 @@ describe('search_bar', () => {
     },
   };
 
+  beforeEach(() => {
+    const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+    setAutocomplete(autocompleteStart.autocomplete);
+  });
+
   beforeEach(() => {
     store = createMockGraphStore({
       sagas: [submitSearchSaga],
diff --git a/x-pack/plugins/graph/public/components/search_bar.tsx b/x-pack/plugins/graph/public/components/search_bar.tsx
index f28f9245db23d..762a2e87d2a5a 100644
--- a/x-pack/plugins/graph/public/components/search_bar.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.tsx
@@ -11,6 +11,10 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { connect } from 'react-redux';
 import { toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IDataPluginServices, Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { IndexPatternSavedObject, IndexPatternProvider, WorkspaceField } from '../types';
 import { openSourceModal } from '../services/source_modal';
 import {
@@ -22,11 +26,7 @@ import {
   selectedFieldsSelector,
 } from '../state_management';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { IDataPluginServices, Query } from '../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
 import { TooltipWrapper } from './tooltip_wrapper';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface SearchBarProps {
   isLoading: boolean;
diff --git a/x-pack/plugins/graph/public/components/source_picker.tsx b/x-pack/plugins/graph/public/components/source_picker.tsx
index 1fddd9401db25..85f1e325ba748 100644
--- a/x-pack/plugins/graph/public/components/source_picker.tsx
+++ b/x-pack/plugins/graph/public/components/source_picker.tsx
@@ -8,8 +8,8 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 
-import { CoreStart } from 'src/core/public';
-import { SavedObjectFinderUi } from '../../../../../src/plugins/saved_objects/public';
+import { CoreStart } from '@kbn/core/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { IndexPatternSavedObject } from '../types';
 
 export interface SourcePickerProps {
diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx
index c535c9e32d335..57b4ff613c88b 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { WorkspaceLayoutComponent } from '.';
-import { coreMock } from 'src/core/public/mocks';
-import { spacesPluginMock } from '../../../../spaces/public/mocks';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../src/plugins/navigation/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
 import { GraphSavePolicy, GraphWorkspaceSavedObject, IndexPatternProvider } from '../../types';
-import { OverlayStart, Capabilities } from 'kibana/public';
+import { OverlayStart, Capabilities } from '@kbn/core/public';
 import { SharingSavedObjectProps } from '../../helpers/use_workspace_loader';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
index 3e7ff634eef0e..ecbe8f676f50a 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
 import { connect } from 'react-redux';
 import { useLocation } from 'react-router-dom';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SearchBar } from '../search_bar';
 import {
   GraphState,
@@ -17,7 +18,6 @@ import {
   workspaceInitializedSelector,
 } from '../../state_management';
 import { FieldManager } from '../field_manager';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
 import {
   ControlType,
   IndexPatternProvider,
diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx
index f3bebfa68ca4a..2fcae33d6cf7e 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Provider, useStore } from 'react-redux';
-import { AppMountParameters, Capabilities, CoreStart } from 'kibana/public';
+import { AppMountParameters, Capabilities, CoreStart } from '@kbn/core/public';
 import { useHistory, useLocation } from 'react-router-dom';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../src/plugins/navigation/public';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { datasourceSelector, hasFieldsSelector } from '../../state_management';
 import { GraphSavePolicy, GraphWorkspaceSavedObject, Workspace } from '../../types';
 import { AsObservable, Settings, SettingsWorkspaceProps } from '../settings';
diff --git a/x-pack/plugins/graph/public/helpers/format_http_error.ts b/x-pack/plugins/graph/public/helpers/format_http_error.ts
index 13ab8c02848bf..e3d1919209ca0 100644
--- a/x-pack/plugins/graph/public/helpers/format_http_error.ts
+++ b/x-pack/plugins/graph/public/helpers/format_http_error.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 export function formatHttpError(
   error: IHttpFetchError<ResponseErrorBody & { status: number; statusText: string }>
diff --git a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
index 03091fd1fdc0d..72cca61832ca0 100644
--- a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
+++ b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
@@ -12,19 +12,19 @@ import {
   OverlayStart,
   SavedObjectsClientContract,
   SavedObjectAttributes,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 import {
   SavedObjectSaveOpts,
   checkForDuplicateTitle,
   saveWithConfirmation,
   isErrorNonFatal,
-} from '../../../../../src/plugins/saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import {
   injectReferences,
   extractReferences,
 } from '../services/persistence/saved_workspace_references';
-import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/public';
 import { GraphWorkspaceSavedObject } from '../types';
 
 const savedWorkspaceType = 'graph-workspace';
diff --git a/x-pack/plugins/graph/public/helpers/use_graph_loader.ts b/x-pack/plugins/graph/public/helpers/use_graph_loader.ts
index c895d4156fa7b..470cac2d0863c 100644
--- a/x-pack/plugins/graph/public/helpers/use_graph_loader.ts
+++ b/x-pack/plugins/graph/public/helpers/use_graph_loader.ts
@@ -6,8 +6,8 @@
  */
 
 import { useCallback, useState } from 'react';
-import { ToastsStart } from 'kibana/public';
-import { IHttpFetchError, ResponseErrorBody, CoreStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
+import { IHttpFetchError, ResponseErrorBody, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ExploreRequest, GraphExploreCallback, GraphSearchCallback, SearchRequest } from '../types';
 import { formatHttpError } from './format_http_error';
diff --git a/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx b/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx
index db23a59f8e902..0c05fce5a4558 100644
--- a/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx
+++ b/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 import { useWorkspaceLoader, UseWorkspaceLoaderProps } from './use_workspace_loader';
-import { coreMock } from 'src/core/public/mocks';
-import { spacesPluginMock } from '../../../spaces/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { createMockGraphStore } from '../state_management/mocks';
 import { Workspace } from '../types';
-import { SavedObjectsClientCommon } from 'src/plugins/data/common';
+import { SavedObjectsClientCommon } from '@kbn/data-plugin/common';
 import { renderHook, act, RenderHookOptions } from '@testing-library/react-hooks';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts b/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts
index 07fc58c9ffbdd..75b4cf9584f31 100644
--- a/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts
+++ b/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
-import type { SavedObjectsResolveResponse } from 'src/core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
 import { useEffect, useState } from 'react';
 import { useHistory, useLocation, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import { GraphStore } from '../state_management';
 import { GraphWorkspaceSavedObject, IndexPatternSavedObject, Workspace } from '../types';
 import { getEmptyWorkspace, getSavedWorkspace } from './saved_workspace_utils';
 import { getEditUrl } from '../services/url';
-import { SpacesApi } from '../../../spaces/public';
 export interface UseWorkspaceLoaderProps {
   store: GraphStore;
   workspaceRef: React.MutableRefObject<Workspace | undefined>;
diff --git a/x-pack/plugins/graph/public/index.ts b/x-pack/plugins/graph/public/index.ts
index af57d3f005382..63e68eae586b0 100644
--- a/x-pack/plugins/graph/public/index.ts
+++ b/x-pack/plugins/graph/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { GraphPlugin } from './plugin';
 import { ConfigSchema } from '../config';
 
diff --git a/x-pack/plugins/graph/public/plugin.ts b/x-pack/plugins/graph/public/plugin.ts
index 1782f8202c415..0d9fac79600ad 100644
--- a/x-pack/plugins/graph/public/plugin.ts
+++ b/x-pack/plugins/graph/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
-import { SpacesApi } from '../../spaces/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import {
   AppNavLinkStatus,
   AppUpdater,
@@ -17,21 +17,17 @@ import {
   Plugin,
   PluginInitializerContext,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-import { LicensingPluginStart } from '../../licensing/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
 import { checkLicense } from '../common/check_license';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-  HomePublicPluginStart,
-} from '../../../../src/plugins/home/public';
 import { ConfigSchema } from '../config';
-import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
 
 export interface GraphPluginSetupDependencies {
   home?: HomePublicPluginSetup;
@@ -67,7 +63,7 @@ export class GraphPlugin
         icon: 'graphApp',
         path: '/app/graph',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         solutionId: 'kibana',
         order: 600,
       });
diff --git a/x-pack/plugins/graph/public/services/fetch_top_nodes.ts b/x-pack/plugins/graph/public/services/fetch_top_nodes.ts
index 1b1e91ac7277b..b0c6e09bbd9ff 100644
--- a/x-pack/plugins/graph/public/services/fetch_top_nodes.ts
+++ b/x-pack/plugins/graph/public/services/fetch_top_nodes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { WorkspaceField, ServerResultNode } from '../types';
 
 const DEFAULT_SHARD_SIZE = 5000;
diff --git a/x-pack/plugins/graph/public/services/index_pattern_cache.ts b/x-pack/plugins/graph/public/services/index_pattern_cache.ts
index d6156bc9d0626..1f3824e8629b6 100644
--- a/x-pack/plugins/graph/public/services/index_pattern_cache.ts
+++ b/x-pack/plugins/graph/public/services/index_pattern_cache.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { IndexPatternProvider } from '../types';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export function createCachedIndexPatternProvider(
   indexPatternGetter: (id: string) => Promise<DataView>
diff --git a/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts b/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts
index cc180065d3aca..38efc43e502dc 100644
--- a/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts
+++ b/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts
@@ -7,9 +7,9 @@
 
 import { GraphWorkspaceSavedObject, IndexPatternSavedObject, Workspace } from '../../types';
 import { migrateLegacyIndexPatternRef, savedWorkspaceToAppState, mapFields } from './deserialize';
-import { createWorkspace } from '../../services/workspace/graph_client_workspace';
+import { createWorkspace } from '../workspace/graph_client_workspace';
 import { outlinkEncoders } from '../../helpers/outlink_encoders';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 describe('deserialize', () => {
   let savedWorkspace: GraphWorkspaceSavedObject;
diff --git a/x-pack/plugins/graph/public/services/persistence/deserialize.ts b/x-pack/plugins/graph/public/services/persistence/deserialize.ts
index 1223c03b6f6c1..0a30907f7e1aa 100644
--- a/x-pack/plugins/graph/public/services/persistence/deserialize.ts
+++ b/x-pack/plugins/graph/public/services/persistence/deserialize.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { indexPatterns as indexPatternsUtils } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   SerializedNode,
   UrlTemplate,
@@ -25,8 +27,6 @@ import {
   colorChoices,
   iconChoicesByClass,
 } from '../../helpers/style_choices';
-import { indexPatterns as indexPatternsUtils } from '../../../../../../src/plugins/data/public';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
 
 const defaultAdvancedSettings: AdvancedSettings = {
   useSignificance: true,
diff --git a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
index cf315b0a8c8ce..95036f4b324ec 100644
--- a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
+++ b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectAttributes, SavedObjectReference } from 'kibana/public';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/public';
 
 export function extractReferences({
   attributes,
diff --git a/x-pack/plugins/graph/public/services/save_modal.tsx b/x-pack/plugins/graph/public/services/save_modal.tsx
index f1603ed790d3a..9e95a53c12f9a 100644
--- a/x-pack/plugins/graph/public/services/save_modal.tsx
+++ b/x-pack/plugins/graph/public/services/save_modal.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { ReactElement } from 'react';
-import { I18nStart, OverlayStart, SavedObjectsClientContract } from 'src/core/public';
-import { SaveResult } from 'src/plugins/saved_objects/public';
+import { I18nStart, OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import { SaveResult } from '@kbn/saved-objects-plugin/public';
 import { GraphWorkspaceSavedObject, GraphSavePolicy } from '../types';
 import { SaveModal, OnSaveGraphProps } from '../components/save_modal';
 
diff --git a/x-pack/plugins/graph/public/services/source_modal.tsx b/x-pack/plugins/graph/public/services/source_modal.tsx
index fc91762b537b1..cf20e01733139 100644
--- a/x-pack/plugins/graph/public/services/source_modal.tsx
+++ b/x-pack/plugins/graph/public/services/source_modal.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
-import { KibanaReactOverlays } from 'src/plugins/kibana_react/public';
+import { KibanaReactOverlays } from '@kbn/kibana-react-plugin/public';
 import { SourceModal } from '../components/source_modal';
 import { IndexPatternSavedObject } from '../types';
 
diff --git a/x-pack/plugins/graph/public/services/url.ts b/x-pack/plugins/graph/public/services/url.ts
index b33fdc82d8642..65607a9b3cd96 100644
--- a/x-pack/plugins/graph/public/services/url.ts
+++ b/x-pack/plugins/graph/public/services/url.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
 import { GraphWorkspaceSavedObject } from '../types';
 import { MetaDataState } from '../state_management';
 
diff --git a/x-pack/plugins/graph/public/state_management/datasource.sagas.ts b/x-pack/plugins/graph/public/state_management/datasource.sagas.ts
index bbab3cd13b7a9..9f03ecc1993e1 100644
--- a/x-pack/plugins/graph/public/state_management/datasource.sagas.ts
+++ b/x-pack/plugins/graph/public/state_management/datasource.sagas.ts
@@ -8,6 +8,7 @@
 import { takeLatest, put, call, select } from 'redux-saga/effects';
 import { i18n } from '@kbn/i18n';
 import { Action } from 'typescript-fsa';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { GraphStoreDependencies } from './store';
 import { loadFields } from './fields';
 import { mapFields } from '../services/persistence';
@@ -18,7 +19,6 @@ import {
   setDatasource,
   requestDatasource,
 } from './datasource';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 /**
  * Saga loading field information when the datasource is switched. This will overwrite current settings
diff --git a/x-pack/plugins/graph/public/state_management/datasource.test.ts b/x-pack/plugins/graph/public/state_management/datasource.test.ts
index ab37ed76ac08b..527f0fe66249c 100644
--- a/x-pack/plugins/graph/public/state_management/datasource.test.ts
+++ b/x-pack/plugins/graph/public/state_management/datasource.test.ts
@@ -11,7 +11,7 @@ import { datasourceSelector, requestDatasource } from './datasource';
 import { datasourceSaga } from './datasource.sagas';
 import { fieldsSelector } from './fields';
 import { updateSettings } from './advanced_settings';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 const waitForPromise = () => new Promise((r) => setTimeout(r));
 
diff --git a/x-pack/plugins/graph/public/state_management/mocks.ts b/x-pack/plugins/graph/public/state_management/mocks.ts
index 06f9fe52f936a..00619f118a1d0 100644
--- a/x-pack/plugins/graph/public/state_management/mocks.ts
+++ b/x-pack/plugins/graph/public/state_management/mocks.ts
@@ -10,13 +10,13 @@ import {
   HttpStart,
   OverlayStart,
   SavedObjectsClientContract,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import createSagaMiddleware from 'redux-saga';
 import { createStore, applyMiddleware, AnyAction } from 'redux';
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { GraphStoreDependencies, createRootReducer, GraphStore, GraphState } from './store';
 import { Workspace } from '../types';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface MockedGraphEnvironment {
   store: GraphStore;
diff --git a/x-pack/plugins/graph/public/state_management/persistence.ts b/x-pack/plugins/graph/public/state_management/persistence.ts
index d043df2510ed6..2df2c98a10d77 100644
--- a/x-pack/plugins/graph/public/state_management/persistence.ts
+++ b/x-pack/plugins/graph/public/state_management/persistence.ts
@@ -8,6 +8,7 @@
 import actionCreatorFactory, { Action } from 'typescript-fsa';
 import { i18n } from '@kbn/i18n';
 import { takeLatest, call, put, select, cps } from 'redux-saga/effects';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { GraphWorkspaceSavedObject, IndexPatternSavedObject, Workspace } from '../types';
 import { GraphStoreDependencies, GraphState, submitSearch } from '.';
 import { datasourceSelector } from './datasource';
@@ -25,7 +26,6 @@ import { updateMetaData, metaDataSelector } from './meta_data';
 import { openSaveModal, SaveWorkspaceHandler } from '../services/save_modal';
 import { getEditPath } from '../services/url';
 import { saveSavedWorkspace } from '../helpers/saved_workspace_utils';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface LoadSavedWorkspacePayload {
   indexPatterns: IndexPatternSavedObject[];
diff --git a/x-pack/plugins/graph/public/state_management/store.ts b/x-pack/plugins/graph/public/state_management/store.ts
index b2b685f51573b..657f3021e24e5 100644
--- a/x-pack/plugins/graph/public/state_management/store.ts
+++ b/x-pack/plugins/graph/public/state_management/store.ts
@@ -7,8 +7,8 @@
 
 import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
 import { combineReducers, createStore, Store, AnyAction, Dispatch, applyMiddleware } from 'redux';
-import { ChromeStart, I18nStart, OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import { CoreStart } from 'src/core/public';
+import { ChromeStart, I18nStart, OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { ReactElement } from 'react';
 import {
   fieldsReducer,
diff --git a/x-pack/plugins/graph/public/types/app_state.ts b/x-pack/plugins/graph/public/types/app_state.ts
index 0d707cef9543b..2dbbad2a4a1a5 100644
--- a/x-pack/plugins/graph/public/types/app_state.ts
+++ b/x-pack/plugins/graph/public/types/app_state.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SimpleSavedObject } from 'src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { FontawesomeIcon } from '../helpers/style_choices';
 import { OutlinkEncoder } from '../helpers/outlink_encoders';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface UrlTemplate {
   url: string;
diff --git a/x-pack/plugins/graph/server/index.ts b/x-pack/plugins/graph/server/index.ts
index 10ddca631a898..886c8e4267cb6 100644
--- a/x-pack/plugins/graph/server/index.ts
+++ b/x-pack/plugins/graph/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 import { GraphPlugin } from './plugin';
diff --git a/x-pack/plugins/graph/server/lib/license_state.ts b/x-pack/plugins/graph/server/lib/license_state.ts
index d23a4f330d9f3..c962666b14d33 100644
--- a/x-pack/plugins/graph/server/lib/license_state.ts
+++ b/x-pack/plugins/graph/server/lib/license_state.ts
@@ -8,8 +8,8 @@
 import Boom from '@hapi/boom';
 import { map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
-import { LicensingPluginStart } from '../../../licensing/server';
-import { ILicense } from '../../../licensing/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { checkLicense, GraphLicenseInformation } from '../../common/check_license';
 
 export class LicenseState {
diff --git a/x-pack/plugins/graph/server/plugin.ts b/x-pack/plugins/graph/server/plugin.ts
index 32dac5fba86f9..3043ab7e5aae1 100644
--- a/x-pack/plugins/graph/server/plugin.ts
+++ b/x-pack/plugins/graph/server/plugin.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup, CoreStart } from 'src/core/server';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicenseState } from './lib/license_state';
 import { registerSearchRoute } from './routes/search';
 import { registerExploreRoute } from './routes/explore';
-import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
 import { registerSampleData } from './sample_data';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import { graphWorkspace } from './saved_objects';
 
 export class GraphPlugin implements Plugin {
diff --git a/x-pack/plugins/graph/server/routes/explore.ts b/x-pack/plugins/graph/server/routes/explore.ts
index 6318d8574c397..6a6072e17274c 100644
--- a/x-pack/plugins/graph/server/routes/explore.ts
+++ b/x-pack/plugins/graph/server/routes/explore.ts
@@ -6,7 +6,7 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import Boom from '@hapi/boom';
 import { LicenseState, verifyApiAccess } from '../lib/license_state';
@@ -34,50 +34,44 @@ export function registerExploreRoute({
         }),
       },
     },
-    router.handleLegacyErrors(
-      async (
-        {
-          core: {
-            elasticsearch: { client: esClient },
+    router.handleLegacyErrors(async ({ core }, request, response) => {
+      verifyApiAccess(licenseState);
+      licenseState.notifyUsage('Graph');
+
+      const {
+        elasticsearch: { client: esClient },
+      } = await core;
+      try {
+        return response.ok({
+          body: {
+            resp: await esClient.asCurrentUser.transport.request({
+              path: '/' + encodeURIComponent(request.body.index) + '/_graph/explore',
+              body: request.body.query,
+              method: 'POST',
+            }),
           },
-        },
-        request,
-        response
-      ) => {
-        verifyApiAccess(licenseState);
-        licenseState.notifyUsage('Graph');
-        try {
-          return response.ok({
-            body: {
-              resp: await esClient.asCurrentUser.transport.request({
-                path: '/' + encodeURIComponent(request.body.index) + '/_graph/explore',
-                body: request.body.query,
-                method: 'POST',
-              }),
-            },
+        });
+      } catch (error) {
+        if (error instanceof errors.ResponseError) {
+          const errorBody: ErrorResponse = error.body;
+          const relevantCause = (errorBody.error?.root_cause ?? []).find((cause) => {
+            return (
+              cause.reason.includes('Fielddata is disabled on text fields') ||
+              cause.reason.includes('No support for examining floating point') ||
+              cause.reason.includes('Sample diversifying key must be a single valued-field') ||
+              cause.reason.includes('Failed to parse query') ||
+              cause.reason.includes('Text fields are not optimised for operations') ||
+              cause.type === 'parsing_exception'
+            );
           });
-        } catch (error) {
-          if (error instanceof errors.ResponseError) {
-            const errorBody: ErrorResponse = error.body;
-            const relevantCause = (errorBody.error?.root_cause ?? []).find((cause) => {
-              return (
-                cause.reason.includes('Fielddata is disabled on text fields') ||
-                cause.reason.includes('No support for examining floating point') ||
-                cause.reason.includes('Sample diversifying key must be a single valued-field') ||
-                cause.reason.includes('Failed to parse query') ||
-                cause.reason.includes('Text fields are not optimised for operations') ||
-                cause.type === 'parsing_exception'
-              );
-            });
 
-            if (relevantCause) {
-              throw Boom.badRequest(relevantCause.reason);
-            }
+          if (relevantCause) {
+            throw Boom.badRequest(relevantCause.reason);
           }
-
-          throw error;
         }
+
+        throw error;
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/graph/server/routes/search.ts b/x-pack/plugins/graph/server/routes/search.ts
index ba169bf291751..2bdb956196ed4 100644
--- a/x-pack/plugins/graph/server/routes/search.ts
+++ b/x-pack/plugins/graph/server/routes/search.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 import { LicenseState, verifyApiAccess } from '../lib/license_state';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/server';
 
 export function registerSearchRoute({
   router,
@@ -27,40 +27,33 @@ export function registerSearchRoute({
         }),
       },
     },
-    router.handleLegacyErrors(
-      async (
-        {
-          core: {
-            uiSettings: { client: uiSettings },
-            elasticsearch: { client: esClient },
+    router.handleLegacyErrors(async ({ core }, request, response) => {
+      verifyApiAccess(licenseState);
+      licenseState.notifyUsage('Graph');
+      const {
+        uiSettings: { client: uiSettings },
+        elasticsearch: { client: esClient },
+      } = await core;
+      const includeFrozen = await uiSettings.get<boolean>(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
+      try {
+        return response.ok({
+          body: {
+            resp: await esClient.asCurrentUser.search({
+              index: request.body.index,
+              body: request.body.body,
+              track_total_hits: true,
+              ...(includeFrozen ? { ignore_throttled: false } : {}),
+            }),
           },
-        },
-        request,
-        response
-      ) => {
-        verifyApiAccess(licenseState);
-        licenseState.notifyUsage('Graph');
-        const includeFrozen = await uiSettings.get<boolean>(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
-        try {
-          return response.ok({
-            body: {
-              resp: await esClient.asCurrentUser.search({
-                index: request.body.index,
-                body: request.body.body,
-                track_total_hits: true,
-                ...(includeFrozen ? { ignore_throttled: false } : {}),
-              }),
-            },
-          });
-        } catch (error) {
-          return response.customError({
-            statusCode: error.statusCode || 500,
-            body: {
-              message: error.message,
-            },
-          });
-        }
+        });
+      } catch (error) {
+        return response.customError({
+          statusCode: error.statusCode || 500,
+          body: {
+            message: error.message,
+          },
+        });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/graph/server/sample_data/ecommerce.ts b/x-pack/plugins/graph/server/sample_data/ecommerce.ts
index fe2f319acef88..1a2677e6ed67c 100644
--- a/x-pack/plugins/graph/server/sample_data/ecommerce.ts
+++ b/x-pack/plugins/graph/server/sample_data/ecommerce.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { APP_ICON, createWorkspacePath } from '../../common/constants';
 
 const datasetId = 'ecommerce';
diff --git a/x-pack/plugins/graph/server/sample_data/flights.ts b/x-pack/plugins/graph/server/sample_data/flights.ts
index f378c916e4b87..5f61ae150d579 100644
--- a/x-pack/plugins/graph/server/sample_data/flights.ts
+++ b/x-pack/plugins/graph/server/sample_data/flights.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { APP_ICON, createWorkspacePath } from '../../common/constants';
 
 const datasetId = 'flights';
diff --git a/x-pack/plugins/graph/server/sample_data/logs.ts b/x-pack/plugins/graph/server/sample_data/logs.ts
index af1132f5d37bc..0d5ec41cfbdb4 100644
--- a/x-pack/plugins/graph/server/sample_data/logs.ts
+++ b/x-pack/plugins/graph/server/sample_data/logs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { APP_ICON, createWorkspacePath } from '../../common/constants';
 
 const datasetId = 'logs';
diff --git a/x-pack/plugins/graph/server/sample_data/register_sample_data.ts b/x-pack/plugins/graph/server/sample_data/register_sample_data.ts
index 44930365e6f10..0833f8d0065f2 100644
--- a/x-pack/plugins/graph/server/sample_data/register_sample_data.ts
+++ b/x-pack/plugins/graph/server/sample_data/register_sample_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { registerLogsSampleData, registerLogsSampleDataLink } from './logs';
 import { registerEcommerceSampleData, registerEcommerceSampleDataLink } from './ecommerce';
 import { registerFlightsSampleData, registerFlightsSampleDataLink } from './flights';
diff --git a/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts b/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts
index beb7dbf921e20..4a53bba847543 100644
--- a/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts
+++ b/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { graphMigrations } from './migrations';
 
 export const graphWorkspace: SavedObjectsType = {
diff --git a/x-pack/plugins/graph/server/saved_objects/migrations.test.ts b/x-pack/plugins/graph/server/saved_objects/migrations.test.ts
index c141a33f653b1..7f033869f4859 100644
--- a/x-pack/plugins/graph/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/graph/server/saved_objects/migrations.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { graphMigrations } from './migrations';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 describe('graph-workspace', () => {
   describe('7.0.0', () => {
diff --git a/x-pack/plugins/graph/server/saved_objects/migrations.ts b/x-pack/plugins/graph/server/saved_objects/migrations.ts
index 0957866f7cf60..cbf5384487460 100644
--- a/x-pack/plugins/graph/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/graph/server/saved_objects/migrations.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 export const graphMigrations = {
   '7.0.0': (doc: SavedObjectUnsanitizedDoc<any>) => {
diff --git a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
index 348c23c63937a..d73b69df6eaac 100644
--- a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
+++ b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
@@ -26,7 +26,7 @@ import { PatternInput } from '../pattern_input';
 import { CustomPatternsInput } from '../custom_patterns_input';
 import { EventOutput } from '../event_output';
 import { GrokdebuggerRequest } from '../../models/grokdebugger_request';
-import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 const i18nTexts = {
diff --git a/x-pack/plugins/grokdebugger/public/register_feature.ts b/x-pack/plugins/grokdebugger/public/register_feature.ts
index 2f80ac6561ad7..d23d2fb603ec6 100644
--- a/x-pack/plugins/grokdebugger/public/register_feature.ts
+++ b/x-pack/plugins/grokdebugger/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export const registerFeature = (homePlugin: HomePublicPluginSetup) => {
   homePlugin.featureCatalogue.register({
@@ -23,6 +20,6 @@ export const registerFeature = (homePlugin: HomePublicPluginSetup) => {
     icon: 'grokApp',
     path: '/app/dev_tools#/grokdebugger',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
   });
 };
diff --git a/x-pack/plugins/grokdebugger/public/shared_imports.ts b/x-pack/plugins/grokdebugger/public/shared_imports.ts
index 2779673d665b9..b2e82bce637f1 100644
--- a/x-pack/plugins/grokdebugger/public/shared_imports.ts
+++ b/x-pack/plugins/grokdebugger/public/shared_imports.ts
@@ -5,9 +5,6 @@
  * 2.0.
  */
 
-export { EuiCodeEditor } from '../../../../src/plugins/es_ui_shared/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts b/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts
index 7e302c24fc5ba..1862533feb67a 100644
--- a/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts
+++ b/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup, IRouter, RouteMethod, RouteConfig, RequestHandler } from 'src/core/server';
+import { CoreSetup, IRouter, RouteMethod, RouteConfig, RequestHandler } from '@kbn/core/server';
 
-import { ILicense } from '../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 type GrokDebuggerRouteConfig<Params, Query, Body, Method extends RouteMethod> = {
   method: RouteMethod;
diff --git a/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.ts b/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.ts
index fb20812f3307e..3154a1880f4a9 100644
--- a/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.ts
+++ b/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.ts
@@ -34,11 +34,11 @@ export function registerGrokSimulateRoute(framework: KibanaFramework) {
     },
     async (requestContext, request, response) => {
       try {
+        const esClient = (await requestContext.core).elasticsearch.client;
         const grokdebuggerRequest = GrokdebuggerRequest.fromDownstreamJSON(request.body);
-        const simulateResponseFromES =
-          await requestContext.core.elasticsearch.client.asCurrentUser.ingest.simulate({
-            body: grokdebuggerRequest.upstreamJSON,
-          });
+        const simulateResponseFromES = await esClient.asCurrentUser.ingest.simulate({
+          body: grokdebuggerRequest.upstreamJSON,
+        });
         const grokdebuggerResponse = GrokdebuggerResponse.fromUpstreamJSON(simulateResponseFromES);
         return response.ok({
           body: grokdebuggerResponse,
diff --git a/x-pack/plugins/grokdebugger/server/shared_imports.ts b/x-pack/plugins/grokdebugger/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/grokdebugger/server/shared_imports.ts
+++ b/x-pack/plugins/grokdebugger/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.ts
similarity index 59%
rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx
rename to x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.ts
index 7c6d891042493..df64fbce3fa1d 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.ts
@@ -5,31 +5,11 @@
  * 2.0.
  */
 
-import React from 'react';
 import { act } from 'react-dom/test-utils';
+import { HttpSetup } from '@kbn/core/public';
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test-jest-helpers';
-import { docLinksServiceMock, executionContextServiceMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { createBreadcrumbsMock } from '../../../public/application/services/breadcrumbs.mock';
-import { licensingMock } from '../../../../licensing/public/mocks';
 import { App } from '../../../public/application/app';
-
-const breadcrumbService = createBreadcrumbsMock();
-
-const AppWithContext = (props: any) => {
-  return (
-    <KibanaContextProvider
-      services={{
-        breadcrumbService,
-        license: licensingMock.createLicense(),
-        docLinks: docLinksServiceMock.createStartContract(),
-        executionContext: executionContextServiceMock.createStartContract(),
-      }}
-    >
-      <App {...props} />
-    </KibanaContextProvider>
-  );
-};
+import { WithAppDependencies } from '../helpers';
 
 const getTestBedConfig = (initialEntries: string[]): TestBedConfig => ({
   memoryRouter: {
@@ -40,9 +20,6 @@ const getTestBedConfig = (initialEntries: string[]): TestBedConfig => ({
   },
 });
 
-const initTestBed = (initialEntries: string[]) =>
-  registerTestBed(AppWithContext, getTestBedConfig(initialEntries))();
-
 export interface AppTestBed extends TestBed {
   actions: {
     clickPolicyNameLink: () => void;
@@ -50,8 +27,15 @@ export interface AppTestBed extends TestBed {
   };
 }
 
-export const setup = async (initialEntries: string[]): Promise<AppTestBed> => {
-  const testBed = await initTestBed(initialEntries);
+export const setup = async (
+  httpSetup: HttpSetup,
+  initialEntries: string[]
+): Promise<AppTestBed> => {
+  const initTestBed = registerTestBed(
+    WithAppDependencies(App, httpSetup),
+    getTestBedConfig(initialEntries)
+  );
+  const testBed = await initTestBed();
 
   const clickPolicyNameLink = async () => {
     const { component, find } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
index e2c8a82af7d8f..1aaec089724b6 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
@@ -40,16 +40,13 @@ jest.mock('@elastic/eui', () => {
 
 describe('<App />', () => {
   let testBed: AppTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   describe('new policy creation', () => {
     test('when there are no policies', async () => {
       httpRequestsMockHelpers.setLoadPolicies([]);
       await act(async () => {
-        testBed = await setup(['/']);
+        testBed = await setup(httpSetup, ['/']);
       });
 
       const { component, actions } = testBed;
@@ -65,7 +62,7 @@ describe('<App />', () => {
     test('when there are policies', async () => {
       httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy()]);
       await act(async () => {
-        testBed = await setup(['/']);
+        testBed = await setup(httpSetup, ['/']);
       });
 
       const { component, actions } = testBed;
@@ -86,7 +83,7 @@ describe('<App />', () => {
 
     test('clicking policy name in the table works', async () => {
       await act(async () => {
-        testBed = await setup(['/']);
+        testBed = await setup(httpSetup, ['/']);
       });
 
       const { component, actions } = testBed;
@@ -100,7 +97,7 @@ describe('<App />', () => {
 
     test('loading edit policy page url works', async () => {
       await act(async () => {
-        testBed = await setup([getEncodedPolicyEditPath(SPECIAL_CHARS_NAME)]);
+        testBed = await setup(httpSetup, [getEncodedPolicyEditPath(SPECIAL_CHARS_NAME)]);
       });
 
       const { component } = testBed;
@@ -113,7 +110,7 @@ describe('<App />', () => {
     // when those links are open in a new tab, address bar contains double encoded url
     test('loading edit policy page url with double encoding works', async () => {
       await act(async () => {
-        testBed = await setup([getDoubleEncodedPolicyEditPath(SPECIAL_CHARS_NAME)]);
+        testBed = await setup(httpSetup, [getDoubleEncodedPolicyEditPath(SPECIAL_CHARS_NAME)]);
       });
 
       const { component } = testBed;
@@ -130,7 +127,7 @@ describe('<App />', () => {
 
     test('loading edit policy page url works', async () => {
       await act(async () => {
-        testBed = await setup([getEncodedPolicyEditPath(PERCENT_SIGN_NAME)]);
+        testBed = await setup(httpSetup, [getEncodedPolicyEditPath(PERCENT_SIGN_NAME)]);
       });
 
       const { component } = testBed;
@@ -141,7 +138,7 @@ describe('<App />', () => {
 
     test('loading edit policy page url with double encoding works', async () => {
       await act(async () => {
-        testBed = await setup([getDoubleEncodedPolicyEditPath(PERCENT_SIGN_NAME)]);
+        testBed = await setup(httpSetup, [getDoubleEncodedPolicyEditPath(PERCENT_SIGN_NAME)]);
       });
 
       const { component } = testBed;
@@ -160,7 +157,7 @@ describe('<App />', () => {
 
     test('clicking policy name in the table works', async () => {
       await act(async () => {
-        testBed = await setup(['/']);
+        testBed = await setup(httpSetup, ['/']);
       });
 
       const { component, actions } = testBed;
@@ -176,7 +173,9 @@ describe('<App />', () => {
 
     test("loading edit policy page url doesn't work", async () => {
       await act(async () => {
-        testBed = await setup([getEncodedPolicyEditPath(PERCENT_SIGN_WITH_OTHER_CHARS_NAME)]);
+        testBed = await setup(httpSetup, [
+          getEncodedPolicyEditPath(PERCENT_SIGN_WITH_OTHER_CHARS_NAME),
+        ]);
       });
 
       const { component } = testBed;
@@ -192,7 +191,9 @@ describe('<App />', () => {
     // when those links are open in a new tab, address bar contains double encoded url
     test('loading edit policy page url with double encoding works', async () => {
       await act(async () => {
-        testBed = await setup([getDoubleEncodedPolicyEditPath(PERCENT_SIGN_WITH_OTHER_CHARS_NAME)]);
+        testBed = await setup(httpSetup, [
+          getDoubleEncodedPolicyEditPath(PERCENT_SIGN_WITH_OTHER_CHARS_NAME),
+        ]);
       });
 
       const { component } = testBed;
@@ -211,7 +212,7 @@ describe('<App />', () => {
 
     test('clicking policy name in the table works correctly', async () => {
       await act(async () => {
-        testBed = await setup(['/']);
+        testBed = await setup(httpSetup, ['/']);
       });
 
       const { component, actions } = testBed;
@@ -227,7 +228,7 @@ describe('<App />', () => {
 
     test("loading edit policy page url doesn't work", async () => {
       await act(async () => {
-        testBed = await setup([getEncodedPolicyEditPath(PERCENT_SIGN_25_SEQUENCE)]);
+        testBed = await setup(httpSetup, [getEncodedPolicyEditPath(PERCENT_SIGN_25_SEQUENCE)]);
       });
 
       const { component } = testBed;
@@ -243,7 +244,9 @@ describe('<App />', () => {
     // when those links are open in a new tab, address bar contains double encoded url
     test('loading edit policy page url with double encoding works', async () => {
       await act(async () => {
-        testBed = await setup([getDoubleEncodedPolicyEditPath(PERCENT_SIGN_25_SEQUENCE)]);
+        testBed = await setup(httpSetup, [
+          getDoubleEncodedPolicyEditPath(PERCENT_SIGN_25_SEQUENCE),
+        ]);
       });
 
       const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts
index 1914a056528e1..12237a05e7359 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import {
   createMinAgeActions,
   createSavePolicyAction,
@@ -17,8 +18,8 @@ type SetupReturn = ReturnType<typeof setupDeleteTestBed>;
 
 export type DeleteTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupDeleteTestBed = async () => {
-  const testBed = await initTestBed();
+export const setupDeleteTestBed = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
   const { exists } = testBed;
 
   return {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts
index f8c74ea91890e..d877f05d06ae1 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/delete_phase.test.ts
@@ -18,11 +18,7 @@ import { DeleteTestBed, setupDeleteTestBed } from './delete_phase.helpers';
 
 describe('<EditPolicy /> delete phase', () => {
   let testBed: DeleteTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setLoadPolicies([DELETE_PHASE_POLICY]);
@@ -32,7 +28,7 @@ describe('<EditPolicy /> delete phase', () => {
     ]);
 
     await act(async () => {
-      testBed = await setupDeleteTestBed();
+      testBed = await setupDeleteTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -43,7 +39,7 @@ describe('<EditPolicy /> delete phase', () => {
     httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy()]);
 
     await act(async () => {
-      testBed = await setupDeleteTestBed();
+      testBed = await setupDeleteTestBed(httpSetup);
     });
 
     const { component, actions } = testBed;
@@ -72,7 +68,6 @@ describe('<EditPolicy /> delete phase', () => {
       await actions.savePolicy();
 
       const expected = {
-        name: DELETE_PHASE_POLICY.name,
         phases: {
           ...DELETE_PHASE_POLICY.policy.phases,
           delete: {
@@ -85,12 +80,13 @@ describe('<EditPolicy /> delete phase', () => {
             },
           },
         },
+        name: DELETE_PHASE_POLICY.name,
       };
 
-      const latestRequest = server.requests[server.requests.length - 1];
-      expect(latestRequest.url).toBe(`${API_BASE_PATH}/policies`);
-      expect(latestRequest.method).toBe('POST');
-      expect(JSON.parse(JSON.parse(latestRequest.requestBody).body)).toEqual(expected);
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({ body: JSON.stringify(expected) })
+      );
     });
 
     test('shows a callout when the input is not an existing policy', async () => {
@@ -109,7 +105,6 @@ describe('<EditPolicy /> delete phase', () => {
       await actions.savePolicy();
 
       const expected = {
-        name: DELETE_PHASE_POLICY.name,
         phases: {
           ...DELETE_PHASE_POLICY.policy.phases,
           delete: {
@@ -119,19 +114,22 @@ describe('<EditPolicy /> delete phase', () => {
             },
           },
         },
+        name: DELETE_PHASE_POLICY.name,
       };
 
       delete expected.phases.delete.actions.wait_for_snapshot;
 
-      const latestRequest = server.requests[server.requests.length - 1];
-      expect(JSON.parse(JSON.parse(latestRequest.requestBody).body)).toEqual(expected);
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({ body: JSON.stringify(expected) })
+      );
     });
 
     test('shows a callout when there are no snapshot policies', async () => {
       // need to call setup on testBed again for it to use a newly defined snapshot policies response
       httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
       await act(async () => {
-        testBed = await setupDeleteTestBed();
+        testBed = await setupDeleteTestBed(httpSetup);
       });
 
       const { component, actions } = testBed;
@@ -144,9 +142,10 @@ describe('<EditPolicy /> delete phase', () => {
 
     test('shows a callout when there is an error loading snapshot policies', async () => {
       // need to call setup on testBed again for it to use a newly defined snapshot policies response
-      httpRequestsMockHelpers.setLoadSnapshotPolicies([], { status: 500, body: 'error' });
+      httpRequestsMockHelpers.setLoadSnapshotPolicies([], { statusCode: 500, message: 'error' });
+
       await act(async () => {
-        testBed = await setupDeleteTestBed();
+        testBed = await setupDeleteTestBed(httpSetup);
       });
 
       const { component, actions } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/edit_warning.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/edit_warning.test.ts
index 83b3a9fc53398..0cf57f4140aa4 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/edit_warning.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/edit_warning.test.ts
@@ -13,7 +13,7 @@ import { getDefaultHotPhasePolicy, POLICY_NAME } from '../constants';
 
 describe('<EditPolicy /> edit warning', () => {
   let testBed: TestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -21,14 +21,13 @@ describe('<EditPolicy /> edit warning', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -38,7 +37,7 @@ describe('<EditPolicy /> edit warning', () => {
   test('no edit warning for a new policy', async () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { exists, component } = testBed;
     component.update();
@@ -48,7 +47,7 @@ describe('<EditPolicy /> edit warning', () => {
   test('an edit warning is shown for an existing policy', async () => {
     httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy(POLICY_NAME)]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { exists, component } = testBed;
     component.update();
@@ -60,7 +59,7 @@ describe('<EditPolicy /> edit warning', () => {
       { ...getDefaultHotPhasePolicy(POLICY_NAME), indices: [] },
     ]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { exists, component } = testBed;
     component.update();
@@ -72,7 +71,7 @@ describe('<EditPolicy /> edit warning', () => {
       { ...getDefaultHotPhasePolicy(POLICY_NAME), indexTemplates: [] },
     ]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { exists, component } = testBed;
     component.update();
@@ -87,7 +86,7 @@ describe('<EditPolicy /> edit warning', () => {
       },
     ]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { component, find } = testBed;
     component.update();
@@ -102,7 +101,7 @@ describe('<EditPolicy /> edit warning', () => {
       },
     ]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { component, find } = testBed;
     component.update();
@@ -117,7 +116,7 @@ describe('<EditPolicy /> edit warning', () => {
       },
     ]);
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
     const { component, find, exists } = testBed;
     component.update();
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
index 57a70237be6e1..ffe11133be7fd 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
@@ -8,13 +8,13 @@
 import { act } from 'react-dom/test-utils';
 import { TestBed } from '@kbn/test-jest-helpers';
 
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { setupEnvironment } from '../../helpers';
 import { initTestBed } from '../init_test_bed';
 
 describe('<EditPolicy /> frozen phase', () => {
   let testBed: TestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -22,14 +22,13 @@ describe('<EditPolicy /> frozen phase', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await initTestBed();
+      testBed = await initTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -41,7 +40,7 @@ describe('<EditPolicy /> frozen phase', () => {
       httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
-        testBed = await initTestBed({
+        testBed = await initTestBed(httpSetup, {
           appServicesContext: {
             license: licensingMock.createLicense({ license: { type: 'basic' } }),
           },
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts
index a0a1c80c90bbe..7092d52289de9 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { TestBedConfig } from '@kbn/test-jest-helpers';
 
 import { AppServicesContext } from '../../../../../public/types';
@@ -15,11 +16,14 @@ type SetupReturn = ReturnType<typeof setupCloudNodeAllocation>;
 
 export type CloudNodeAllocationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupCloudNodeAllocation = async (arg?: {
-  appServicesContext?: Partial<AppServicesContext>;
-  testBedConfig?: Partial<TestBedConfig>;
-}) => {
-  const testBed = await initTestBed(arg);
+export const setupCloudNodeAllocation = async (
+  httpSetup: HttpSetup,
+  arg?: {
+    appServicesContext?: Partial<AppServicesContext>;
+    testBedConfig?: Partial<TestBedConfig>;
+  }
+) => {
+  const testBed = await initTestBed(httpSetup, arg);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts
index 136865329eb50..820f8a4f9100a 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cloud_aware_behavior.test.ts
@@ -14,7 +14,7 @@ import {
 
 describe('<EditPolicy /> node allocation cloud-aware behavior', () => {
   let testBed: CloudNodeAllocationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -22,23 +22,21 @@ describe('<EditPolicy /> node allocation cloud-aware behavior', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   const setup = async (isOnCloud?: boolean) => {
     await act(async () => {
       if (Boolean(isOnCloud)) {
-        testBed = await setupCloudNodeAllocation({
+        testBed = await setupCloudNodeAllocation(httpSetup, {
           appServicesContext: { cloud: { isCloudEnabled: true } },
         });
       } else {
-        testBed = await setupCloudNodeAllocation();
+        testBed = await setupCloudNodeAllocation(httpSetup);
       }
     });
   };
 
   beforeEach(async () => {
-    server.respondImmediately = true;
     httpRequestsMockHelpers.setLoadPolicies([]);
     httpRequestsMockHelpers.setListNodes({
       nodesByRoles: { data: ['node1'] },
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.helpers.ts
index 9848915f8feb9..16a545f882587 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { createNodeAllocationActions, createTogglePhaseAction } from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
@@ -12,8 +13,8 @@ type SetupReturn = ReturnType<typeof setupColdPhaseNodeAllocation>;
 
 export type NodeAllocationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupColdPhaseNodeAllocation = async () => {
-  const testBed = await initTestBed();
+export const setupColdPhaseNodeAllocation = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.test.ts
index e2093e04b7779..63382de45f414 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/cold_phase.test.ts
@@ -11,7 +11,7 @@ import { NodeAllocationTestBed, setupColdPhaseNodeAllocation } from './cold_phas
 
 describe('<EditPolicy /> node allocation in the cold phase', () => {
   let testBed: NodeAllocationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, setDelayResponse, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -19,17 +19,15 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   const setup = async () => {
     await act(async () => {
-      testBed = await setupColdPhaseNodeAllocation();
+      testBed = await setupColdPhaseNodeAllocation(httpSetup);
     });
   };
 
   beforeEach(async () => {
-    server.respondImmediately = true;
     httpRequestsMockHelpers.setLoadPolicies([]);
     httpRequestsMockHelpers.setListNodes({
       nodesByRoles: { data: ['node1'] },
@@ -64,7 +62,8 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
 
   describe('when using node attributes', () => {
     test('shows spinner for node attributes input when loading', async () => {
-      server.respondImmediately = false;
+      // We don't want the request to resolve immediately.
+      setDelayResponse(true);
 
       const { actions } = testBed;
       await actions.toggleColdPhase();
@@ -78,6 +77,9 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
       expect(actions.hasWillUseFallbackTierUsingNodeAttributesNotice()).toBeFalsy();
       expect(actions.hasDefaultToDataNodesNotice()).toBeFalsy();
       expect(actions.hasNoTiersAvailableUsingNodeAttributesNotice()).toBeFalsy();
+
+      // Reset delayed response status
+      setDelayResponse(false);
     });
 
     describe('and some are defined', () => {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts
index 384478bcf4c66..ac7dbb61518c7 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import {
   createNodeAllocationActions,
   createReplicasAction,
@@ -16,8 +17,8 @@ type SetupReturn = ReturnType<typeof setupGeneralNodeAllocation>;
 
 export type GeneralNodeAllocationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupGeneralNodeAllocation = async () => {
-  const testBed = await initTestBed();
+export const setupGeneralNodeAllocation = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts
index cac6c174b769e..1eecd5207664f 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/general_behavior.test.ts
@@ -6,6 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { setupEnvironment } from '../../../helpers';
 import {
   GeneralNodeAllocationTestBed,
@@ -16,10 +17,11 @@ import {
   POLICY_WITH_NODE_ATTR_AND_OFF_ALLOCATION,
   POLICY_WITH_NODE_ROLE_ALLOCATION,
 } from '../../constants';
+import { API_BASE_PATH } from '../../../../../common/constants';
 
 describe('<EditPolicy /> node allocation general behavior', () => {
   let testBed: GeneralNodeAllocationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -27,12 +29,11 @@ describe('<EditPolicy /> node allocation general behavior', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   const setup = async () => {
     await act(async () => {
-      testBed = await setupGeneralNodeAllocation();
+      testBed = await setupGeneralNodeAllocation(httpSetup);
     });
   };
 
@@ -53,10 +54,13 @@ describe('<EditPolicy /> node allocation general behavior', () => {
 
       await actions.setDataAllocation('node_attrs');
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const warmPhase = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm;
 
-      expect(warmPhase.actions.migrate).toEqual({ enabled: false });
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.warm.actions.migrate).toEqual({ enabled: false });
     });
 
     describe('node roles', () => {
@@ -84,12 +88,16 @@ describe('<EditPolicy /> node allocation general behavior', () => {
 
       test('setting replicas serialization', async () => {
         const { actions } = testBed;
+
         await actions.setReplicas('123');
         await actions.savePolicy();
-        const latestRequest = server.requests[server.requests.length - 1];
-        const warmPhaseActions = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm
-          .actions;
-        expect(warmPhaseActions).toMatchInlineSnapshot(`
+
+        const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+        const [requestUrl, requestBody] = lastReq;
+        const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+        expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+        expect(parsedReqBody.phases.warm.actions).toMatchInlineSnapshot(`
           Object {
             "allocate": Object {
               "number_of_replicas": 123,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.helpers.ts
index 5c576ebf74ccb..375b3a633297e 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { createNodeAllocationActions, createTogglePhaseAction } from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
@@ -12,8 +13,8 @@ type SetupReturn = ReturnType<typeof setupWarmPhaseNodeAllocation>;
 
 export type NodeAllocationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupWarmPhaseNodeAllocation = async () => {
-  const testBed = await initTestBed();
+export const setupWarmPhaseNodeAllocation = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.test.ts
index 8d4d0afcf052d..6f96aaf07da1b 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/node_allocation/warm_phase.test.ts
@@ -11,7 +11,7 @@ import { NodeAllocationTestBed, setupWarmPhaseNodeAllocation } from './warm_phas
 
 describe('<EditPolicy /> node allocation in the warm phase', () => {
   let testBed: NodeAllocationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, setDelayResponse, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -19,17 +19,15 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   const setup = async () => {
     await act(async () => {
-      testBed = await setupWarmPhaseNodeAllocation();
+      testBed = await setupWarmPhaseNodeAllocation(httpSetup);
     });
   };
 
   beforeEach(async () => {
-    server.respondImmediately = true;
     httpRequestsMockHelpers.setLoadPolicies([]);
     httpRequestsMockHelpers.setListNodes({
       nodesByRoles: { data: ['node1'] },
@@ -64,7 +62,8 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
 
   describe('when using node attributes', () => {
     test('shows spinner for node attributes input when loading', async () => {
-      server.respondImmediately = false;
+      // We don't want the request to resolve immediately.
+      setDelayResponse(true);
 
       const { actions } = testBed;
       await actions.togglePhase();
@@ -78,6 +77,9 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
       expect(actions.hasWillUseFallbackTierUsingNodeAttributesNotice()).toBeFalsy();
       expect(actions.hasDefaultToDataNodesNotice()).toBeFalsy();
       expect(actions.hasNoTiersAvailableUsingNodeAttributesNotice()).toBeFalsy();
+
+      // Reset delayed response status
+      setDelayResponse(false);
     });
 
     describe('and some are defined', () => {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.helpers.ts
index d74e2877c9fcd..540324d171971 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import {
   createFormSetValueAction,
   createMinAgeActions,
@@ -18,10 +19,12 @@ type SetupReturn = ReturnType<typeof setupRequestFlyoutTestBed>;
 
 export type RequestFlyoutTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupRequestFlyoutTestBed = async (isNewPolicy?: boolean) => {
+export const setupRequestFlyoutTestBed = async (httpSetup: HttpSetup, isNewPolicy?: boolean) => {
   const testBed = isNewPolicy
-    ? await initTestBed({ testBedConfig: { memoryRouter: { initialEntries: ['/policies/edit'] } } })
-    : await initTestBed();
+    ? await initTestBed(httpSetup, {
+        testBedConfig: { memoryRouter: { initialEntries: ['/policies/edit'] } },
+      })
+    : await initTestBed(httpSetup);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts
index e49a1c5c94f90..61dda6fa65efb 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/request_flyout.test.ts
@@ -12,7 +12,7 @@ import { getDefaultHotPhasePolicy } from '../constants';
 
 describe('<EditPolicy /> request flyout', () => {
   let testBed: RequestFlyoutTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -20,14 +20,13 @@ describe('<EditPolicy /> request flyout', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupRequestFlyoutTestBed();
+      testBed = await setupRequestFlyoutTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -93,7 +92,7 @@ describe('<EditPolicy /> request flyout', () => {
 
   test('renders the correct json and name for a new policy', async () => {
     await act(async () => {
-      testBed = await setupRequestFlyoutTestBed(true);
+      testBed = await setupRequestFlyoutTestBed(httpSetup, true);
     });
 
     const { component, actions } = testBed;
@@ -154,7 +153,7 @@ describe('<EditPolicy /> request flyout', () => {
     httpRequestsMockHelpers.setLoadPolicies([policyWithMetaField]);
 
     await act(async () => {
-      testBed = await setupRequestFlyoutTestBed();
+      testBed = await setupRequestFlyoutTestBed(httpSetup);
     });
 
     const { component, actions } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts
index b15e956c84b4c..707240c459161 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import {
   createForceMergeActions,
   createMinAgeActions,
@@ -20,8 +21,8 @@ type SetupReturn = ReturnType<typeof setupRolloverTestBed>;
 
 export type RolloverTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupRolloverTestBed = async () => {
-  const testBed = await initTestBed();
+export const setupRolloverTestBed = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts
index 432b07efca038..1544390229595 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/rollover.test.ts
@@ -11,17 +11,13 @@ import { RolloverTestBed, setupRolloverTestBed } from './rollover.helpers';
 
 describe('<EditPolicy /> rollover', () => {
   let testBed: RolloverTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupRolloverTestBed();
+      testBed = await setupRolloverTestBed(httpSetup);
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts
index 23b64c3dade19..f4b41cedd70f1 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import {
   createForceMergeActions,
   createMinAgeActions,
@@ -22,10 +23,13 @@ type SetupReturn = ReturnType<typeof setupSearchableSnapshotsTestBed>;
 
 export type SearchableSnapshotsTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupSearchableSnapshotsTestBed = async (args?: {
-  appServicesContext?: Partial<AppServicesContext>;
-}) => {
-  const testBed = await initTestBed(args);
+export const setupSearchableSnapshotsTestBed = async (
+  httpSetup: HttpSetup,
+  args?: {
+    appServicesContext?: Partial<AppServicesContext>;
+  }
+) => {
+  const testBed = await initTestBed(httpSetup, args);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
index a620f6e1268be..09bb8b85082b6 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
@@ -6,9 +6,11 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { setupEnvironment } from '../../helpers';
 import { getDefaultHotPhasePolicy } from '../constants';
+import { API_BASE_PATH } from '../../../../common/constants';
 import {
   SearchableSnapshotsTestBed,
   setupSearchableSnapshotsTestBed,
@@ -16,17 +18,13 @@ import {
 
 describe('<EditPolicy /> searchable snapshots', () => {
   let testBed: SearchableSnapshotsTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupSearchableSnapshotsTestBed();
+      testBed = await setupSearchableSnapshotsTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -78,14 +76,21 @@ describe('<EditPolicy /> searchable snapshots', () => {
     await actions.frozen.setMinAgeValue('15');
 
     await actions.savePolicy();
-    const latestRequest = server.requests[server.requests.length - 1];
-    expect(latestRequest.method).toBe('POST');
-    expect(latestRequest.url).toBe('/api/index_lifecycle_management/policies');
-    const reqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-
-    expect(reqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe(repository);
-    expect(reqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toBe(repository);
-    expect(reqBody.phases.frozen.actions.searchable_snapshot.snapshot_repository).toBe(repository);
+
+    const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+    const [requestUrl, requestBody] = lastReq;
+    const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+    expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+    expect(parsedReqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe(
+      repository
+    );
+    expect(parsedReqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toBe(
+      repository
+    );
+    expect(parsedReqBody.phases.frozen.actions.searchable_snapshot.snapshot_repository).toBe(
+      repository
+    );
   });
 
   test('should update the repository in all searchable snapshot actions', async () => {
@@ -101,13 +106,22 @@ describe('<EditPolicy /> searchable snapshots', () => {
     // We update the repository in one phase
     await actions.frozen.setSearchableSnapshot('changed');
     await actions.savePolicy();
-    const latestRequest = server.requests[server.requests.length - 1];
-    const reqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body);
 
+    const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+    const [requestUrl, requestBody] = lastReq;
+    const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+    expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
     // And all phases should be updated
-    expect(reqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe('changed');
-    expect(reqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toBe('changed');
-    expect(reqBody.phases.frozen.actions.searchable_snapshot.snapshot_repository).toBe('changed');
+    expect(parsedReqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe(
+      'changed'
+    );
+    expect(parsedReqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toBe(
+      'changed'
+    );
+    expect(parsedReqBody.phases.frozen.actions.searchable_snapshot.snapshot_repository).toBe(
+      'changed'
+    );
   });
 
   describe('on cloud', () => {
@@ -123,7 +137,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
         httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['found-snapshots'] });
 
         await act(async () => {
-          testBed = await setupSearchableSnapshotsTestBed({
+          testBed = await setupSearchableSnapshotsTestBed(httpSetup, {
             appServicesContext: { cloud: { isCloudEnabled: true } },
           });
         });
@@ -152,7 +166,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
         httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['found-snapshots'] });
 
         await act(async () => {
-          testBed = await setupSearchableSnapshotsTestBed({
+          testBed = await setupSearchableSnapshotsTestBed(httpSetup, {
             appServicesContext: { cloud: { isCloudEnabled: true } },
           });
         });
@@ -166,12 +180,15 @@ describe('<EditPolicy /> searchable snapshots', () => {
         await actions.togglePhase('cold');
         await actions.cold.setMinAgeValue('10');
         await actions.cold.toggleSearchableSnapshot();
+
         await actions.savePolicy();
-        const latestRequest = server.requests[server.requests.length - 1];
-        expect(latestRequest.method).toBe('POST');
-        expect(latestRequest.url).toBe('/api/index_lifecycle_management/policies');
-        const reqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-        expect(reqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toEqual(
+
+        const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+        const [requestUrl, requestBody] = lastReq;
+        const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+        expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+        expect(parsedReqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toEqual(
           'found-snapshots'
         );
       });
@@ -189,7 +206,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
       httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['my-repo'] });
 
       await act(async () => {
-        testBed = await setupSearchableSnapshotsTestBed({
+        testBed = await setupSearchableSnapshotsTestBed(httpSetup, {
           appServicesContext: {
             license: licensingMock.createLicense({ license: { type: 'basic' } }),
           },
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts
index 8303fdbac4837..496b27330c931 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { createTogglePhaseAction } from '../../helpers';
 import { initTestBed } from '../init_test_bed';
 import { Phase } from '../../../../common/types';
@@ -13,8 +14,8 @@ type SetupReturn = ReturnType<typeof setupTimelineTestBed>;
 
 export type TimelineTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupTimelineTestBed = async () => {
-  const testBed = await initTestBed();
+export const setupTimelineTestBed = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
   const { exists } = testBed;
 
   return {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts
index 33aeb80b38cae..760ede62606cb 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timeline.test.ts
@@ -11,17 +11,13 @@ import { setupTimelineTestBed, TimelineTestBed } from './timeline.helpers';
 
 describe('<EditPolicy /> timeline', () => {
   let testBed: TimelineTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupTimelineTestBed();
+      testBed = await setupTimelineTestBed(httpSetup);
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts
index 57d6f53a21c78..dc70d2dd5ef61 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { createMinAgeActions, createTogglePhaseAction } from '../../helpers';
 import { initTestBed } from '../init_test_bed';
 
@@ -12,8 +13,8 @@ type SetupReturn = ReturnType<typeof setupTimingTestBed>;
 
 export type TimingTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupTimingTestBed = async () => {
-  const testBed = await initTestBed();
+export const setupTimingTestBed = async (httpSetup: HttpSetup) => {
+  const testBed = await initTestBed(httpSetup);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts
index 985ee807ed827..0aee8eb5f0be1 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/timing.test.ts
@@ -12,17 +12,13 @@ import { PhaseWithTiming } from '../../../../common/types';
 
 describe('<EditPolicy /> timing', () => {
   let testBed: TimingTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupTimingTestBed();
+      testBed = await setupTimingTestBed(httpSetup);
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts
index 4725631e6f894..98891ea72928f 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/cold_phase_validation.test.ts
@@ -12,7 +12,7 @@ import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'
 
 describe('<EditPolicy /> cold phase validation', () => {
   let testBed: ValidationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -20,7 +20,6 @@ describe('<EditPolicy /> cold phase validation', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
@@ -35,7 +34,7 @@ describe('<EditPolicy /> cold phase validation', () => {
     ]);
 
     await act(async () => {
-      testBed = await setupValidationTestBed();
+      testBed = await setupValidationTestBed(httpSetup);
     });
 
     const { component, actions } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts
index 1464f683ef766..bd4a2caec0be5 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/error_indicators.test.ts
@@ -11,7 +11,7 @@ import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'
 
 describe('<EditPolicy /> error indicators', () => {
   let testBed: ValidationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -19,14 +19,13 @@ describe('<EditPolicy /> error indicators', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupValidationTestBed();
+      testBed = await setupValidationTestBed(httpSetup);
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts
index 6dca2b7b23fb7..b0f0857bd0501 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/hot_phase_validation.test.ts
@@ -13,7 +13,7 @@ import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'
 describe('<EditPolicy /> hot phase validation', () => {
   let testBed: ValidationTestBed;
   let actions: ValidationTestBed['actions'];
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -21,13 +21,12 @@ describe('<EditPolicy /> hot phase validation', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
     await act(async () => {
-      testBed = await setupValidationTestBed();
+      testBed = await setupValidationTestBed(httpSetup);
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts
index 799fbf89d47df..9c14584bb2fcf 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/policy_name_validation.test.ts
@@ -14,7 +14,7 @@ import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'
 describe('<EditPolicy /> policy name validation', () => {
   let testBed: ValidationTestBed;
   let actions: ValidationTestBed['actions'];
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -22,14 +22,13 @@ describe('<EditPolicy /> policy name validation', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setLoadPolicies(getGeneratedPolicies());
 
     await act(async () => {
-      testBed = await setupValidationTestBed();
+      testBed = await setupValidationTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -56,7 +55,7 @@ describe('<EditPolicy /> policy name validation', () => {
 
   test(`doesn't allow to save as new policy but using the same name`, async () => {
     await act(async () => {
-      testBed = await setupValidationTestBed({
+      testBed = await setupValidationTestBed(httpSetup, {
         testBedConfig: {
           memoryRouter: {
             initialEntries: [`/policies/edit/testy0`],
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts
index be4f99103b319..3e29bc5d76580 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/timing.test.ts
@@ -15,7 +15,7 @@ import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'
 describe('<EditPolicy /> timing validation', () => {
   let testBed: ValidationTestBed;
   let actions: ValidationTestBed['actions'];
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -23,7 +23,6 @@ describe('<EditPolicy /> timing validation', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
@@ -31,7 +30,7 @@ describe('<EditPolicy /> timing validation', () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
 
     await act(async () => {
-      testBed = await setupValidationTestBed();
+      testBed = await setupValidationTestBed(httpSetup);
     });
 
     const { component } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts
index 5b5d3819c3463..592f081929b50 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/validation.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { TestBedConfig } from '@kbn/test-jest-helpers';
 import {
   createColdPhaseActions,
@@ -25,8 +26,11 @@ type SetupReturn = ReturnType<typeof setupValidationTestBed>;
 
 export type ValidationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupValidationTestBed = async (arg?: { testBedConfig?: Partial<TestBedConfig> }) => {
-  const testBed = await initTestBed(arg);
+export const setupValidationTestBed = async (
+  httpSetup: HttpSetup,
+  arg?: { testBedConfig?: Partial<TestBedConfig> }
+) => {
+  const testBed = await initTestBed(httpSetup, arg);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts
index 741611f2d2c3b..9d326e9978519 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/form_validation/warm_phase_validation.test.ts
@@ -12,7 +12,7 @@ import { setupValidationTestBed, ValidationTestBed } from './validation.helpers'
 
 describe('<EditPolicy /> warm phase validation', () => {
   let testBed: ValidationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -20,7 +20,6 @@ describe('<EditPolicy /> warm phase validation', () => {
 
   afterAll(() => {
     jest.useRealTimers();
-    server.restore();
   });
 
   beforeEach(async () => {
@@ -28,7 +27,7 @@ describe('<EditPolicy /> warm phase validation', () => {
     httpRequestsMockHelpers.setLoadPolicies([]);
 
     await act(async () => {
-      testBed = await setupValidationTestBed();
+      testBed = await setupValidationTestBed(httpSetup);
     });
 
     const { component, actions } = testBed;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.ts
new file mode 100644
index 0000000000000..875bf9db36264
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { registerTestBed, TestBedConfig } from '@kbn/test-jest-helpers';
+
+import { HttpSetup } from '@kbn/core/public';
+import { WithAppDependencies } from '../helpers';
+import { EditPolicy } from '../../../public/application/sections/edit_policy';
+import { AppServicesContext } from '../../../public/types';
+import { POLICY_NAME } from './constants';
+
+const getTestBedConfig = (testBedConfig?: Partial<TestBedConfig>): TestBedConfig => {
+  return {
+    memoryRouter: {
+      initialEntries: [`/policies/edit/${POLICY_NAME}`],
+      componentRoutePath: `/policies/edit/:policyName`,
+    },
+    ...testBedConfig,
+  };
+};
+
+export const initTestBed = async (
+  httpSetup: HttpSetup,
+  arg?: {
+    appServicesContext?: Partial<AppServicesContext>;
+    testBedConfig?: Partial<TestBedConfig>;
+  }
+) => {
+  const { testBedConfig, appServicesContext } = arg || {};
+
+  const createTestBed = registerTestBed(
+    WithAppDependencies(EditPolicy, httpSetup, appServicesContext),
+    getTestBedConfig(testBedConfig)
+  );
+
+  return await createTestBed();
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.tsx
deleted file mode 100644
index 64d5cd65cda68..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { registerTestBed, TestBedConfig } from '@kbn/test-jest-helpers';
-import { docLinksServiceMock } from 'src/core/public/mocks';
-
-import '../helpers/global_mocks';
-
-import { licensingMock } from '../../../../licensing/public/mocks';
-import { EditPolicy } from '../../../public/application/sections/edit_policy';
-import { KibanaContextProvider } from '../../../public/shared_imports';
-import { AppServicesContext } from '../../../public/types';
-import { createBreadcrumbsMock } from '../../../public/application/services/breadcrumbs.mock';
-import { POLICY_NAME } from './constants';
-
-const getTestBedConfig = (testBedConfigArgs?: Partial<TestBedConfig>): TestBedConfig => {
-  return {
-    memoryRouter: {
-      initialEntries: [`/policies/edit/${POLICY_NAME}`],
-      componentRoutePath: `/policies/edit/:policyName`,
-    },
-    ...testBedConfigArgs,
-  };
-};
-
-const breadcrumbService = createBreadcrumbsMock();
-
-const EditPolicyContainer = ({ appServicesContext, ...rest }: any) => {
-  return (
-    <KibanaContextProvider
-      services={{
-        breadcrumbService,
-        license: licensingMock.createLicense({ license: { type: 'enterprise' } }),
-        docLinks: docLinksServiceMock.createStartContract(),
-        getUrlForApp: () => {},
-        ...appServicesContext,
-      }}
-    >
-      <EditPolicy {...rest} />
-    </KibanaContextProvider>
-  );
-};
-
-export const initTestBed = (arg?: {
-  appServicesContext?: Partial<AppServicesContext>;
-  testBedConfig?: Partial<TestBedConfig>;
-}) => {
-  const { testBedConfig: testBedConfigArgs, ...rest } = arg || {};
-  return registerTestBed(EditPolicyContainer, getTestBedConfig(testBedConfigArgs))(rest);
-};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts
index 52d4debca9315..417f53c63a20c 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.helpers.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpSetup } from '@kbn/core/public';
 import { AppServicesContext } from '../../../../public/types';
 import {
   createColdPhaseActions,
@@ -23,10 +24,13 @@ type SetupReturn = ReturnType<typeof setupSerializationTestBed>;
 
 export type SerializationTestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
 
-export const setupSerializationTestBed = async (arg?: {
-  appServicesContext?: Partial<AppServicesContext>;
-}) => {
-  const testBed = await initTestBed(arg);
+export const setupSerializationTestBed = async (
+  httpSetup: HttpSetup,
+  arg?: {
+    appServicesContext?: Partial<AppServicesContext>;
+  }
+) => {
+  const testBed = await initTestBed(httpSetup, arg);
 
   return {
     ...testBed,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
index be196a377edb4..d539d7a6e48ce 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
@@ -6,8 +6,10 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { setupEnvironment } from '../../helpers';
+import { API_BASE_PATH } from '../../../../common/constants';
 import {
   getDefaultHotPhasePolicy,
   POLICY_WITH_INCLUDE_EXCLUDE,
@@ -17,17 +19,13 @@ import { SerializationTestBed, setupSerializationTestBed } from './policy_serial
 
 describe('<EditPolicy /> serialization', () => {
   let testBed: SerializationTestBed;
-  const { server, httpRequestsMockHelpers } = setupEnvironment();
-
-  afterAll(() => {
-    server.restore();
-  });
+  const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeEach(async () => {
     httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
-      testBed = await setupSerializationTestBed();
+      testBed = await setupSerializationTestBed(httpSetup);
     });
 
     const { component } = testBed;
@@ -35,6 +33,16 @@ describe('<EditPolicy /> serialization', () => {
   });
 
   describe('top level form', () => {
+    afterAll(async () => {
+      await act(async () => {
+        testBed = await setupSerializationTestBed(httpSetup, {
+          appServicesContext: {
+            license: licensingMock.createLicense({ license: { type: 'enterprise' } }),
+          },
+        });
+      });
+    });
+
     /**
      * We assume that policies that populate this form are loaded directly from ES and so
      * are valid according to ES. There may be settings in the policy created through the ILM
@@ -44,7 +52,7 @@ describe('<EditPolicy /> serialization', () => {
     it('preserves policy settings it did not configure', async () => {
       httpRequestsMockHelpers.setLoadPolicies([POLICY_WITH_KNOWN_AND_UNKNOWN_FIELDS]);
       await act(async () => {
-        testBed = await setupSerializationTestBed();
+        testBed = await setupSerializationTestBed(httpSetup);
       });
 
       const { component, actions } = testBed;
@@ -56,42 +64,44 @@ describe('<EditPolicy /> serialization', () => {
       await actions.togglePhase('delete');
       await actions.savePolicy();
 
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-
-      expect(entirePolicy).toEqual({
-        foo: 'bar', // Made up value
-        name: 'my_policy',
-        phases: {
-          hot: {
-            actions: {
-              rollover: {
-                max_docs: 1000,
-                max_size: '50gb',
-                unknown_setting: 123, // Made up setting that should stay preserved
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            foo: 'bar', // Made up value
+            phases: {
+              hot: {
+                min_age: '0ms',
+                actions: {
+                  rollover: {
+                    unknown_setting: 123, // Made up setting that should stay preserved
+                    max_size: '50gb',
+                    max_docs: 1000,
+                  },
+                },
               },
-            },
-            min_age: '0ms',
-          },
-          warm: {
-            actions: {
-              my_unfollow_action: {}, // Made up action
-              set_priority: {
-                priority: 22,
-                unknown_setting: true,
+              warm: {
+                min_age: '10d',
+                actions: {
+                  my_unfollow_action: {}, // Made up action
+                  set_priority: {
+                    priority: 22,
+                    unknown_setting: true,
+                  },
+                },
               },
             },
-            min_age: '10d',
-          },
-        },
-      });
+            name: 'my_policy',
+          }),
+        })
+      );
     });
 
     it('default policy (only policy name input) on enterprise license', async () => {
       httpRequestsMockHelpers.setLoadPolicies([]);
 
       await act(async () => {
-        testBed = await setupSerializationTestBed();
+        testBed = await setupSerializationTestBed(httpSetup);
       });
 
       const { component, actions } = testBed;
@@ -99,33 +109,35 @@ describe('<EditPolicy /> serialization', () => {
       await actions.setPolicyName('test_policy');
       await actions.savePolicy();
 
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-
-      expect(entirePolicy).toEqual({
-        name: 'test_policy',
-        phases: {
-          hot: {
-            actions: {
-              rollover: {
-                max_age: '30d',
-                max_primary_shard_size: '50gb',
-              },
-              set_priority: {
-                priority: 100,
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: 'test_policy',
+            phases: {
+              hot: {
+                actions: {
+                  rollover: {
+                    max_age: '30d',
+                    max_primary_shard_size: '50gb',
+                  },
+                  set_priority: {
+                    priority: 100,
+                  },
+                },
+                min_age: '0ms',
               },
             },
-            min_age: '0ms',
-          },
-        },
-      });
+          }),
+        })
+      );
     });
 
     it('default policy (only policy name input) on basic license', async () => {
       httpRequestsMockHelpers.setLoadPolicies([]);
 
       await act(async () => {
-        testBed = await setupSerializationTestBed({
+        testBed = await setupSerializationTestBed(httpSetup, {
           appServicesContext: {
             license: licensingMock.createLicense({ license: { type: 'basic' } }),
           },
@@ -137,30 +149,44 @@ describe('<EditPolicy /> serialization', () => {
       await actions.setPolicyName('test_policy');
       await actions.savePolicy();
 
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-
-      expect(entirePolicy).toEqual({
-        name: 'test_policy',
-        phases: {
-          hot: {
-            actions: {
-              rollover: {
-                max_age: '30d',
-                max_primary_shard_size: '50gb',
-              },
-              set_priority: {
-                priority: 100,
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: 'test_policy',
+            phases: {
+              hot: {
+                actions: {
+                  rollover: {
+                    max_age: '30d',
+                    max_primary_shard_size: '50gb',
+                  },
+                  set_priority: {
+                    priority: 100,
+                  },
+                },
+                min_age: '0ms',
               },
             },
-            min_age: '0ms',
-          },
-        },
-      });
+          }),
+        })
+      );
     });
   });
 
   describe('hot phase', () => {
+    beforeEach(async () => {
+      httpRequestsMockHelpers.setDefaultResponses();
+
+      await act(async () => {
+        testBed = await setupSerializationTestBed(httpSetup);
+      });
+
+      const { component } = testBed;
+
+      component.update();
+    });
+
     test('setting all values', async () => {
       const { actions } = testBed;
 
@@ -176,61 +202,72 @@ describe('<EditPolicy /> serialization', () => {
       await actions.hot.setIndexPriority('123');
 
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      expect(entirePolicy).toMatchInlineSnapshot(`
-        Object {
-          "name": "my_policy",
-          "phases": Object {
-            "hot": Object {
-              "actions": Object {
-                "forcemerge": Object {
-                  "index_codec": "best_compression",
-                  "max_num_segments": 123,
-                },
-                "readonly": Object {},
-                "rollover": Object {
-                  "max_age": "123h",
-                  "max_docs": 123,
-                  "max_primary_shard_size": "50gb",
-                  "max_size": "123mb",
-                },
-                "set_priority": Object {
-                  "priority": 123,
-                },
-                "shrink": Object {
-                  "number_of_shards": 2,
+
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: 'my_policy',
+            phases: {
+              hot: {
+                min_age: '0ms',
+                actions: {
+                  rollover: {
+                    max_age: '123h',
+                    max_primary_shard_size: '50gb',
+                    max_docs: 123,
+                    max_size: '123mb',
+                  },
+                  forcemerge: {
+                    max_num_segments: 123,
+                    index_codec: 'best_compression',
+                  },
+                  shrink: {
+                    number_of_shards: 2,
+                  },
+                  set_priority: {
+                    priority: 123,
+                  },
+                  readonly: {},
                 },
               },
-              "min_age": "0ms",
             },
-          },
-        }
-      `);
+          }),
+        })
+      );
     });
 
     test('setting searchable snapshot', async () => {
       const { actions } = testBed;
 
-      await actions.hot.setSearchableSnapshot('my-repo');
+      await actions.hot.setSearchableSnapshot('abc');
 
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      expect(entirePolicy.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe(
-        'my-repo'
-      );
+
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.hot.actions.searchable_snapshot.snapshot_repository).toBe('abc');
     });
 
     test('disabling rollover', async () => {
       const { actions } = testBed;
+
       await actions.rollover.toggleDefault();
       await actions.rollover.toggle();
+
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const policy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      const hotActions = policy.phases.hot.actions;
+
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      const hotActions = parsedReqBody.phases.hot.actions;
       const rolloverAction = hotActions.rollover;
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
       expect(rolloverAction).toBe(undefined);
       expect(hotActions).toMatchInlineSnapshot(`Object {}`);
     });
@@ -241,7 +278,7 @@ describe('<EditPolicy /> serialization', () => {
       httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
-        testBed = await setupSerializationTestBed();
+        testBed = await setupSerializationTestBed(httpSetup);
       });
 
       const { component } = testBed;
@@ -253,9 +290,13 @@ describe('<EditPolicy /> serialization', () => {
       await actions.togglePhase('warm');
       await actions.warm.setMinAgeValue('11');
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const warmPhase = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm;
-      expect(warmPhase).toMatchInlineSnapshot(`
+
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.warm).toMatchInlineSnapshot(`
           Object {
             "actions": Object {
               "set_priority": Object {
@@ -281,47 +322,48 @@ describe('<EditPolicy /> serialization', () => {
       await actions.warm.toggleReadonly();
       await actions.warm.setIndexPriority('123');
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      // Check shape of entire policy
-      expect(entirePolicy).toMatchInlineSnapshot(`
-        Object {
-          "name": "my_policy",
-          "phases": Object {
-            "hot": Object {
-              "actions": Object {
-                "rollover": Object {
-                  "max_age": "30d",
-                  "max_primary_shard_size": "50gb",
+
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: 'my_policy',
+            phases: {
+              hot: {
+                min_age: '0ms',
+                actions: {
+                  rollover: {
+                    max_age: '30d',
+                    max_primary_shard_size: '50gb',
+                  },
                 },
               },
-              "min_age": "0ms",
-            },
-            "warm": Object {
-              "actions": Object {
-                "allocate": Object {
-                  "number_of_replicas": 123,
-                  "require": Object {
-                    "test": "123",
+              warm: {
+                min_age: '11d',
+                actions: {
+                  set_priority: {
+                    priority: 123,
                   },
-                },
-                "forcemerge": Object {
-                  "index_codec": "best_compression",
-                  "max_num_segments": 123,
-                },
-                "readonly": Object {},
-                "set_priority": Object {
-                  "priority": 123,
-                },
-                "shrink": Object {
-                  "number_of_shards": 123,
+                  shrink: {
+                    number_of_shards: 123,
+                  },
+                  forcemerge: {
+                    max_num_segments: 123,
+                    index_codec: 'best_compression',
+                  },
+                  allocate: {
+                    require: {
+                      test: '123',
+                    },
+                    number_of_replicas: 123,
+                  },
+                  readonly: {},
                 },
               },
-              "min_age": "11d",
             },
-          },
-        }
-      `);
+          }),
+        })
+      );
     });
 
     describe('policy with include and exclude', () => {
@@ -335,7 +377,7 @@ describe('<EditPolicy /> serialization', () => {
         httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
 
         await act(async () => {
-          testBed = await setupSerializationTestBed();
+          testBed = await setupSerializationTestBed(httpSetup);
         });
 
         const { component } = testBed;
@@ -347,9 +389,14 @@ describe('<EditPolicy /> serialization', () => {
         await actions.warm.setDataAllocation('node_attrs');
         await actions.warm.setSelectedNodeAttribute('test:123');
         await actions.savePolicy();
-        const latestRequest = server.requests[server.requests.length - 1];
-        const warmPhaseAllocate = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm
-          .actions.allocate;
+
+        const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+        const [requestUrl, requestBody] = lastReq;
+        const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+        const warmPhaseAllocate = parsedReqBody.phases.warm.actions.allocate;
+
+        expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
         expect(warmPhaseAllocate).toMatchInlineSnapshot(`
           Object {
             "exclude": Object {
@@ -372,7 +419,7 @@ describe('<EditPolicy /> serialization', () => {
       httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
-        testBed = await setupSerializationTestBed();
+        testBed = await setupSerializationTestBed(httpSetup);
       });
 
       const { component } = testBed;
@@ -385,9 +432,13 @@ describe('<EditPolicy /> serialization', () => {
       await actions.togglePhase('cold');
       await actions.cold.setMinAgeValue('11');
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      expect(entirePolicy.phases.cold).toMatchInlineSnapshot(`
+
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.cold).toMatchInlineSnapshot(`
           Object {
             "actions": Object {
               "set_priority": Object {
@@ -412,40 +463,41 @@ describe('<EditPolicy /> serialization', () => {
       await actions.cold.setIndexPriority('123');
 
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-
-      expect(entirePolicy).toMatchInlineSnapshot(`
-        Object {
-          "name": "my_policy",
-          "phases": Object {
-            "cold": Object {
-              "actions": Object {
-                "allocate": Object {
-                  "number_of_replicas": 123,
-                  "require": Object {
-                    "test": "123",
+
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: 'my_policy',
+            phases: {
+              hot: {
+                min_age: '0ms',
+                actions: {
+                  rollover: {
+                    max_age: '30d',
+                    max_primary_shard_size: '50gb',
                   },
                 },
-                "readonly": Object {},
-                "set_priority": Object {
-                  "priority": 123,
-                },
               },
-              "min_age": "123s",
-            },
-            "hot": Object {
-              "actions": Object {
-                "rollover": Object {
-                  "max_age": "30d",
-                  "max_primary_shard_size": "50gb",
+              cold: {
+                min_age: '123s',
+                actions: {
+                  set_priority: {
+                    priority: 123,
+                  },
+                  allocate: {
+                    require: {
+                      test: '123',
+                    },
+                    number_of_replicas: 123,
+                  },
+                  readonly: {},
                 },
               },
-              "min_age": "0ms",
             },
-          },
-        }
-      `);
+          }),
+        })
+      );
     });
 
     // Setting searchable snapshot field disables setting replicas so we test this separately
@@ -455,15 +507,30 @@ describe('<EditPolicy /> serialization', () => {
       await actions.cold.setMinAgeValue('10');
       await actions.cold.setSearchableSnapshot('my-repo');
       await actions.savePolicy();
-      const latestRequest2 = server.requests[server.requests.length - 1];
-      const entirePolicy2 = JSON.parse(JSON.parse(latestRequest2.requestBody).body);
-      expect(entirePolicy2.phases.cold.actions.searchable_snapshot.snapshot_repository).toEqual(
+
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.cold.actions.searchable_snapshot.snapshot_repository).toEqual(
         'my-repo'
       );
     });
   });
 
   describe('frozen phase', () => {
+    beforeEach(async () => {
+      httpRequestsMockHelpers.setDefaultResponses();
+
+      await act(async () => {
+        testBed = await setupSerializationTestBed(httpSetup);
+      });
+
+      const { component } = testBed;
+      component.update();
+    });
+
     test('default value', async () => {
       const { actions } = testBed;
       await actions.togglePhase('frozen');
@@ -472,9 +539,12 @@ describe('<EditPolicy /> serialization', () => {
 
       await actions.savePolicy();
 
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      expect(entirePolicy.phases.frozen).toEqual({
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.frozen).toEqual({
         min_age: '13d',
         actions: {
           searchable_snapshot: { snapshot_repository: 'myRepo' },
@@ -499,7 +569,7 @@ describe('<EditPolicy /> serialization', () => {
         });
 
         await act(async () => {
-          testBed = await setupSerializationTestBed();
+          testBed = await setupSerializationTestBed(httpSetup);
         });
 
         const { component } = testBed;
@@ -511,9 +581,12 @@ describe('<EditPolicy /> serialization', () => {
 
         await actions.savePolicy();
 
-        const latestRequest = server.requests[server.requests.length - 1];
-        const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-        expect(entirePolicy.phases.frozen).toEqual({
+        const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+        const [requestUrl, requestBody] = lastReq;
+        const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+        expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+        expect(parsedReqBody.phases.frozen).toEqual({
           min_age: '1234m',
           actions: {
             searchable_snapshot: {
@@ -531,9 +604,13 @@ describe('<EditPolicy /> serialization', () => {
       await actions.togglePhase('delete');
       await actions.delete.setSnapshotPolicy('test');
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      expect(entirePolicy.phases.delete).toEqual({
+
+      const lastReq: HttpFetchOptionsWithPath[] = httpSetup.post.mock.calls.pop() || [];
+      const [requestUrl, requestBody] = lastReq;
+      const parsedReqBody = JSON.parse((requestBody as Record<string, any>).body);
+
+      expect(requestUrl).toBe(`${API_BASE_PATH}/policies`);
+      expect(parsedReqBody.phases.delete).toEqual({
         min_age: '365d',
         actions: {
           delete: {},
@@ -555,38 +632,40 @@ describe('<EditPolicy /> serialization', () => {
       await actions.warm.setShrinkSize('100');
 
       await actions.savePolicy();
-      const latestRequest = server.requests[server.requests.length - 1];
-      const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
-      expect(entirePolicy).toMatchInlineSnapshot(`
-        Object {
-          "name": "my_policy",
-          "phases": Object {
-            "hot": Object {
-              "actions": Object {
-                "rollover": Object {
-                  "max_age": "30d",
-                  "max_primary_shard_size": "50gb",
-                },
-                "shrink": Object {
-                  "max_primary_shard_size": "50gb",
+
+      expect(httpSetup.post).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/policies`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: 'my_policy',
+            phases: {
+              hot: {
+                min_age: '0ms',
+                actions: {
+                  rollover: {
+                    max_age: '30d',
+                    max_primary_shard_size: '50gb',
+                  },
+                  shrink: {
+                    max_primary_shard_size: '50gb',
+                  },
                 },
               },
-              "min_age": "0ms",
-            },
-            "warm": Object {
-              "actions": Object {
-                "set_priority": Object {
-                  "priority": 50,
-                },
-                "shrink": Object {
-                  "max_primary_shard_size": "100gb",
+              warm: {
+                min_age: '11d',
+                actions: {
+                  set_priority: {
+                    priority: 50,
+                  },
+                  shrink: {
+                    max_primary_shard_size: '100gb',
+                  },
                 },
               },
-              "min_age": "11d",
             },
-          },
-        }
-      `);
+          }),
+        })
+      );
     });
   });
 });
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
index 4bc223943c6c7..d317b09d4d305 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
@@ -16,7 +16,7 @@ import {
   createNodeAllocationActions,
   createReplicasAction,
   createSnapshotPolicyActions,
-} from './';
+} from '.';
 
 export const createHotPhaseActions = (testBed: TestBed) => {
   return {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts
index 7f37d4c6ccbf0..7ddcd5358404f 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { fakeServer, SinonFakeServer } from 'sinon';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 import {
   ListNodesRouteResponse,
@@ -14,61 +14,92 @@ import {
 } from '../../../common/types';
 import { getDefaultHotPhasePolicy } from '../edit_policy/constants';
 
+type HttpMethod = 'GET' | 'PUT' | 'DELETE' | 'POST';
+export interface ResponseError {
+  statusCode: number;
+  message: string | Error;
+}
+
 export const init = () => {
-  const server = fakeServer.create();
-  server.respondImmediately = true;
-  server.respondWith([200, {}, 'DefaultServerResponse']);
+  let isResponseDelayed = false;
+  const getDelayResponse = () => isResponseDelayed;
+  const setDelayResponse = (shouldDelayResponse: boolean) => {
+    isResponseDelayed = shouldDelayResponse;
+  };
+
+  const httpSetup = httpServiceMock.createSetupContract();
+  const httpRequestsMockHelpers = registerHttpRequestMockHelpers(httpSetup, getDelayResponse);
 
   return {
-    server,
-    httpRequestsMockHelpers: registerHttpRequestMockHelpers(server),
+    httpSetup,
+    setDelayResponse,
+    httpRequestsMockHelpers,
   };
 };
 
-const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
-  const setLoadPolicies = (response: any = []) => {
-    server.respondWith('GET', `${API_BASE_PATH}/policies`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(response),
-    ]);
-  };
+const registerHttpRequestMockHelpers = (
+  httpSetup: ReturnType<typeof httpServiceMock.createStartContract>,
+  shouldDelayResponse: () => boolean
+) => {
+  const mockResponses = new Map<HttpMethod, Map<string, Promise<unknown>>>(
+    ['GET', 'PUT', 'DELETE', 'POST'].map(
+      (method) => [method, new Map()] as [HttpMethod, Map<string, Promise<unknown>>]
+    )
+  );
 
-  const setLoadSnapshotPolicies = (response: any = [], error?: { status: number; body: any }) => {
-    const status = error ? error.status : 200;
-    const body = error ? error.body : response;
+  const mockMethodImplementation = (method: HttpMethod, path: string) => {
+    const responsePromise = mockResponses.get(method)?.get(path) ?? Promise.resolve({});
+    if (shouldDelayResponse()) {
+      return new Promise((resolve) => {
+        setTimeout(() => resolve(responsePromise), 1000);
+      });
+    }
 
-    server.respondWith('GET', `${API_BASE_PATH}/snapshot_policies`, [
-      status,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(body),
-    ]);
+    return responsePromise;
   };
 
-  const setListNodes = (body: ListNodesRouteResponse) => {
-    server.respondWith('GET', `${API_BASE_PATH}/nodes/list`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(body),
-    ]);
-  };
+  httpSetup.get.mockImplementation((path) =>
+    mockMethodImplementation('GET', path as unknown as string)
+  );
+  httpSetup.delete.mockImplementation((path) =>
+    mockMethodImplementation('DELETE', path as unknown as string)
+  );
+  httpSetup.post.mockImplementation((path) =>
+    mockMethodImplementation('POST', path as unknown as string)
+  );
+  httpSetup.put.mockImplementation((path) =>
+    mockMethodImplementation('PUT', path as unknown as string)
+  );
 
-  const setNodesDetails = (nodeAttributes: string, body: NodesDetailsResponse) => {
-    server.respondWith('GET', `${API_BASE_PATH}/nodes/${nodeAttributes}/details`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(body),
-    ]);
-  };
+  const mockResponse = (method: HttpMethod, path: string, response?: unknown, error?: unknown) => {
+    const defuse = (promise: Promise<unknown>) => {
+      promise.catch(() => {});
+      return promise;
+    };
 
-  const setListSnapshotRepos = (body: ListSnapshotReposResponse) => {
-    server.respondWith('GET', `${API_BASE_PATH}/snapshot_repositories`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(body),
-    ]);
+    return mockResponses
+      .get(method)!
+      .set(path, error ? defuse(Promise.reject({ body: error })) : Promise.resolve(response));
   };
 
+  const setLoadPolicies = (response: any = [], error?: ResponseError) =>
+    mockResponse('GET', `${API_BASE_PATH}/policies`, response, error);
+
+  const setLoadSnapshotPolicies = (response: any = [], error?: ResponseError) =>
+    mockResponse('GET', `${API_BASE_PATH}/snapshot_policies`, response, error);
+
+  const setListNodes = (response: ListNodesRouteResponse, error?: ResponseError) =>
+    mockResponse('GET', `${API_BASE_PATH}/nodes/list`, response, error);
+
+  const setNodesDetails = (
+    nodeAttributes: string,
+    response: NodesDetailsResponse,
+    error?: ResponseError
+  ) => mockResponse('GET', `${API_BASE_PATH}/nodes/${nodeAttributes}/details`, response, error);
+
+  const setListSnapshotRepos = (response: ListSnapshotReposResponse, error?: ResponseError) =>
+    mockResponse('GET', `${API_BASE_PATH}/snapshot_repositories`, response, error);
+
   const setDefaultResponses = () => {
     setLoadPolicies([getDefaultHotPhasePolicy()]);
     setLoadSnapshotPolicies([]);
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/index.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/index.ts
index f9cd1f27b72be..6794509f6c84f 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/index.ts
@@ -7,4 +7,4 @@
 
 export * from './actions';
 
-export { setupEnvironment } from './setup_environment';
+export { setupEnvironment, WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts
deleted file mode 100644
index 3926a90f85a14..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
-
-import { init as initHttp } from '../../../public/application/services/http';
-import { init as initHttpRequests } from './http_requests';
-import { init as initUiMetric } from '../../../public/application/services/ui_metric';
-import { init as initNotification } from '../../../public/application/services/notification';
-
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
-
-import {
-  notificationServiceMock,
-  fatalErrorsServiceMock,
-} from '../../../../../../src/core/public/mocks';
-
-const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
-
-export const setupEnvironment = () => {
-  initUiMetric(usageCollectionPluginMock.createSetupContract());
-  initNotification(
-    notificationServiceMock.createSetupContract().toasts,
-    fatalErrorsServiceMock.createSetupContract()
-  );
-
-  mockHttpClient.interceptors.response.use(({ data }) => data);
-  // This expects HttpSetup but we're giving it AxiosInstance.
-  // @ts-ignore
-  initHttp(mockHttpClient);
-  const { server, httpRequestsMockHelpers } = initHttpRequests();
-
-  return {
-    server,
-    httpRequestsMockHelpers,
-  };
-};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.tsx
new file mode 100644
index 0000000000000..dde9368f81294
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { merge } from 'lodash';
+
+import './global_mocks';
+
+import { HttpSetup } from '@kbn/core/public';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { notificationServiceMock, fatalErrorsServiceMock } from '@kbn/core/public/mocks';
+import { executionContextServiceMock } from '@kbn/core/public/execution_context/execution_context_service.mock';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { init as initHttp } from '../../../public/application/services/http';
+import { init as initHttpRequests } from './http_requests';
+import { init as initUiMetric } from '../../../public/application/services/ui_metric';
+import { init as initNotification } from '../../../public/application/services/notification';
+import { KibanaContextProvider } from '../../../public/shared_imports';
+import { createBreadcrumbsMock } from '../../../public/application/services/breadcrumbs.mock';
+
+const breadcrumbService = createBreadcrumbsMock();
+const appContextMock = {
+  breadcrumbService,
+  license: licensingMock.createLicense({ license: { type: 'enterprise' } }),
+  docLinks: docLinksServiceMock.createStartContract(),
+  getUrlForApp: () => {},
+  executionContext: executionContextServiceMock.createSetupContract(),
+};
+
+export const WithAppDependencies =
+  (Comp: any, httpSetup: HttpSetup, overrides: Record<string, unknown> = {}) =>
+  (props: Record<string, unknown>) => {
+    initHttp(httpSetup);
+    breadcrumbService.setup(() => '');
+
+    return (
+      <KibanaContextProvider services={merge(appContextMock, overrides)}>
+        <Comp {...props} />
+      </KibanaContextProvider>
+    );
+  };
+
+export const setupEnvironment = () => {
+  initUiMetric(usageCollectionPluginMock.createSetupContract());
+  initNotification(
+    notificationServiceMock.createSetupContract().toasts,
+    fatalErrorsServiceMock.createSetupContract()
+  );
+
+  return initHttpRequests();
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
index 544aad4c52088..07ae90e8bc861 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
@@ -6,11 +6,10 @@
  */
 
 import moment from 'moment-timezone';
-import axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
+import { init } from './client_integration/helpers/http_requests';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 import { Index } from '../common/types';
 import {
   retryLifecycleActionExtension,
@@ -23,16 +22,13 @@ import {
 import { init as initHttp } from '../public/application/services/http';
 import { init as initUiMetric } from '../public/application/services/ui_metric';
 
-// We need to init the http with a mock for any tests that depend upon the http service.
-// For example, add_lifecycle_confirm_modal makes an API request in its componentDidMount
-// lifecycle method. If we don't mock this, CI will fail with "Call retries were exceeded".
-// This expects HttpSetup but we're giving it AxiosInstance.
-// @ts-ignore
-initHttp(axios.create({ adapter: axiosXhrAdapter }));
+const { httpSetup } = init();
+
+initHttp(httpSetup);
 initUiMetric(usageCollectionPluginMock.createSetupContract());
 
-jest.mock('../../../plugins/index_management/public', async () => {
-  const { indexManagementMock } = await import('../../../plugins/index_management/public/mocks');
+jest.mock('@kbn/index-management-plugin/public', async () => {
+  const { indexManagementMock } = await import('@kbn/index-management-plugin/public/mocks');
   return indexManagementMock.createSetup();
 });
 
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx
index 89f7d4795429a..771cf70e3daea 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx
@@ -15,9 +15,9 @@ import {
   fatalErrorsServiceMock,
   injectedMetadataServiceMock,
   docLinksServiceMock,
-} from '../../../../src/core/public/mocks';
-import { HttpService } from '../../../../src/core/public/http';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/public/mocks';
+} from '@kbn/core/public/mocks';
+import { HttpService } from '@kbn/core/public/http';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import { PolicyFromES } from '../common/types';
 import { PolicyList } from '../public/application/sections/policy_list/policy_list';
@@ -25,7 +25,7 @@ import { init as initHttp } from '../public/application/services/http';
 import { init as initUiMetric } from '../public/application/services/ui_metric';
 import { KibanaContextProvider } from '../public/shared_imports';
 import { PolicyListContextProvider } from '../public/application/sections/policy_list/policy_list_context';
-import { executionContextServiceMock } from 'src/core/public/execution_context/execution_context_service.mock';
+import { executionContextServiceMock } from '@kbn/core/public/execution_context/execution_context_service.mock';
 
 initHttp(
   new HttpService().setup({
diff --git a/x-pack/plugins/index_lifecycle_management/common/constants/license.ts b/x-pack/plugins/index_lifecycle_management/common/constants/license.ts
index 2d09d3516be9d..bb0872bae1ac1 100644
--- a/x-pack/plugins/index_lifecycle_management/common/constants/license.ts
+++ b/x-pack/plugins/index_lifecycle_management/common/constants/license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export const MIN_PLUGIN_LICENSE: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/index_lifecycle_management/common/types/policies.ts b/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
index ad1b1b2b28880..018938e4c0e62 100644
--- a/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
+++ b/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Index as IndexInterface } from '../../../index_management/common/types';
+import { Index as IndexInterface } from '@kbn/index-management-plugin/common/types';
 
 export type Phase = keyof Phases;
 
diff --git a/x-pack/plugins/index_lifecycle_management/kibana.json b/x-pack/plugins/index_lifecycle_management/kibana.json
index bccb3cd78e78d..a9e8eff953633 100644
--- a/x-pack/plugins/index_lifecycle_management/kibana.json
+++ b/x-pack/plugins/index_lifecycle_management/kibana.json
@@ -10,5 +10,5 @@
   "requiredPlugins": ["licensing", "management", "features", "share"],
   "optionalPlugins": ["cloud", "usageCollection", "indexManagement", "home"],
   "configPath": ["xpack", "ilm"],
-  "requiredBundles": ["indexManagement", "kibanaReact", "esUiShared", "home"]
+  "requiredBundles": ["indexManagement", "kibanaReact", "esUiShared"]
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/app.tsx b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
index 0e41b2043e8e0..dea2dcb185327 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
@@ -7,7 +7,7 @@
 
 import React, { useEffect } from 'react';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 
 import { useKibana, useExecutionContext } from '../shared_imports';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx b/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx
index 5015e724ee75d..e78679776f59e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx
@@ -18,8 +18,8 @@ import {
   EuiLink,
   EuiTitle,
 } from '@elastic/eui';
+import { getTemplateDetailsLink } from '@kbn/index-management-plugin/public';
 import { useKibana } from '../../shared_imports';
-import { getTemplateDetailsLink } from '../../../../index_management/public/';
 
 interface Props {
   policyName: string;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
index b9323a56529a3..c604679c4c7d8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
@@ -14,8 +14,8 @@ import {
   ApplicationStart,
   UnmountCallback,
   CoreTheme,
-} from 'src/core/public';
-import { DocLinksStart, ExecutionContextStart } from 'kibana/public';
+} from '@kbn/core/public';
+import { DocLinksStart, ExecutionContextStart } from '@kbn/core/public';
 
 import {
   CloudSetup,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
index 8905200779d23..75b32fa074870 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
@@ -21,7 +21,7 @@ import { useEditPolicyContext } from '../../../edit_policy_context';
 
 import { ROLLOVER_FORM_PATHS, isUsingDefaultRolloverPath } from '../../../constants';
 
-import { LearnMoreLink, DescribedFormRow } from '../../';
+import { LearnMoreLink, DescribedFormRow } from '../..';
 
 import {
   ForcemergeField,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx
index 01f10cf2d98ce..45cff38a60e17 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 export interface Props {
   docLinks: DocLinksStart;
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
index 04a57fd2d9ace..356eff73150b7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
@@ -17,7 +17,7 @@ import { useEditPolicyContext } from '../../../edit_policy_context';
 
 import { UseField } from '../../../form';
 
-import { LearnMoreLink, DescribedFormRow } from '../../';
+import { LearnMoreLink, DescribedFormRow } from '../..';
 
 interface Props {
   phase: 'hot' | 'warm';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
index ac15441a49590..fbf5dc5c5af4b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
@@ -14,7 +14,7 @@ import { EuiTextColor, EuiSpacer, EuiCallOut, EuiLink } from '@elastic/eui';
 import { useKibana, useFormData } from '../../../../../../../shared_imports';
 import { useEditPolicyContext } from '../../../../edit_policy_context';
 import { useConfiguration, UseField, globalFields } from '../../../../form';
-import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../../';
+import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../..';
 import { SearchableSnapshotDataProvider } from './searchable_snapshot_data_provider';
 import { RepositoryComboBoxField } from './repository_combobox_field';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
index adcc33fdc8697..e26b300d2c663 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
@@ -16,7 +16,7 @@ import { useEditPolicyContext } from '../../../edit_policy_context';
 import { UseField, useGlobalFields } from '../../../form';
 import { i18nTexts } from '../../../i18n_texts';
 
-import { LearnMoreLink, DescribedFormRow } from '../../';
+import { LearnMoreLink, DescribedFormRow } from '../..';
 import { byteSizeUnits } from '../../../constants';
 import { UnitField } from './unit_field';
 import { useKibana } from '../../../../../../shared_imports';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
index 791a70ae6212d..62f322e4f48f3 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
@@ -23,7 +23,7 @@ import { useLoadSnapshotPolicies } from '../../../../../services/api';
 
 import { UseField } from '../../../form';
 
-import { FieldLoadingError, LearnMoreLink, OptionalLabel } from '../../';
+import { FieldLoadingError, LearnMoreLink, OptionalLabel } from '../..';
 
 const waitForSnapshotFormField = 'phases.delete.actions.wait_for_snapshot.policy';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
index 0e760af8f1c1e..7ec02cbe3137c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useRef, useMemo, useCallback } from 'react';
 
 // We wrap this component for edit policy so we do not export it from the "shared_imports" dir to avoid
 // accidentally using the non-enhanced version.
-import { UseField } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+import { UseField } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 import { Phases } from '../../../../../../common/types';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx
index 0cbee8832c55b..12078f9c3f549 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx
@@ -8,7 +8,7 @@
 import React, { createContext, FunctionComponent, useContext } from 'react';
 import { useFormData } from '../../../../shared_imports';
 import { FormInternal } from '../types';
-import { useGlobalFields } from './index';
+import { useGlobalFields } from '.';
 
 export interface PhaseTimingConfiguration {
   /**
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx
index 61ce87860d897..8a89759a4225e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx
@@ -14,7 +14,7 @@ import moment from 'moment';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { useHistory } from 'react-router-dom';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { PolicyFromES } from '../../../../../common/types';
 import { useKibana } from '../../../../shared_imports';
 import { getIndicesListPath, getPolicyEditPath } from '../../../services/navigation';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx
index 30d882e760297..386050adc65c8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiButton, EuiEmptyPrompt, EuiSpacer, EuiPageHeader, EuiPageContent } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { PolicyFromES } from '../../../../common/types';
 import { PolicyTable } from './components/policy_table';
 import { getPolicyCreatePath } from '../../services/navigation';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
index a87138c46ccba..640460e9d9814 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
@@ -7,7 +7,7 @@
 
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { IndexSettings } from '../../../../index_management/common';
+import { IndexSettings } from '@kbn/index-management-plugin/common';
 
 import {
   PolicyFromES,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts
index 5fcc0054cdeb0..4e4303017dd9a 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { fatalErrors, toasts } from './notification';
 
 interface CommonErrorBody extends ResponseErrorBody {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts
index 62c8abc86f123..22f197bb9d855 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'kibana/public';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
index c828097fd94c9..9b82a6c071309 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
@@ -11,11 +11,8 @@
  * in future. The pattern in this file is legacy and should be updated to conform to the plugin lifecycle.
  */
 
-import { HttpSetup } from 'src/core/public';
-import {
-  UseRequestConfig,
-  useRequest as _useRequest,
-} from '../../../../../../src/plugins/es_ui_shared/public';
+import { HttpSetup } from '@kbn/core/public';
+import { UseRequestConfig, useRequest as _useRequest } from '@kbn/es-ui-shared-plugin/public';
 
 interface GenericObject {
   [key: string]: any;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
index 53b27161f9c57..f967f503a79a7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { getIndexListUri } from '../../../../index_management/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { getIndexListUri } from '@kbn/index-management-plugin/public';
 
 export const ROUTES = {
   list: '/policies',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
index 8ec008915a5b5..be0c5a77b4f04 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
@@ -11,7 +11,7 @@
  * in future. The pattern in this file is legacy and should be updated to conform to the plugin lifecycle.
  */
 
-import { IToasts, FatalErrorsSetup } from 'src/core/public';
+import { IToasts, FatalErrorsSetup } from '@kbn/core/public';
 
 export let toasts: IToasts;
 export let fatalErrors: FatalErrorsSetup;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
index 891109fd22027..e096be3fe3a95 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
@@ -10,7 +10,7 @@ import {
   UIM_CONFIG_WARM_PHASE,
   UIM_CONFIG_SET_PRIORITY,
   defaultIndexPriority,
-} from '../constants/';
+} from '../constants';
 
 import { getUiMetricsForPhases } from './ui_metric';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
index fa9a8d44e9774..45c15ea88b6fe 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -11,7 +11,7 @@
  * in future. The pattern in this file is legacy and should be updated to conform to the plugin lifecycle.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { UiCounterMetricType } from '@kbn/analytics';
 
 import {
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx
index 94071271eac2d..015c1576de5db 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx
@@ -9,7 +9,7 @@ import React, { Component, Fragment } from 'react';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 import {
   EuiLink,
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx
index fa148a5ba960b..af3f16216813b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx
@@ -24,7 +24,7 @@ import {
   EuiPopoverTitle,
 } from '@elastic/eui';
 
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { getPolicyEditPath } from '../../application/services/navigation';
 import { Index, IndexLifecyclePolicy } from '../../../common/types';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx
index d3214b5851bf6..57434c71f1045 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { get, every, some } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiSearchBar } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
-import { IndexManagementPluginSetup } from '../../../index_management/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
 
 import { retryLifecycleForIndex } from '../application/services/api';
 import { IndexLifecycleSummary } from './components/index_lifecycle_summary';
diff --git a/x-pack/plugins/index_lifecycle_management/public/index.ts b/x-pack/plugins/index_lifecycle_management/public/index.ts
index 2b8573902781b..40f0a4fb6ebf7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { IndexLifecycleManagementPlugin } from './plugin';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/locator.ts b/x-pack/plugins/index_lifecycle_management/public/locator.ts
index 4df7cf85ddebb..24599b6a6b47e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/locator.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 import {
   getPoliciesListPath,
   getPolicyCreatePath,
diff --git a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
index 860bb4971cfc6..a1496a06fe8a8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
@@ -7,8 +7,7 @@
 
 import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, PluginInitializerContext, Plugin } from 'src/core/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import { CoreSetup, PluginInitializerContext, Plugin } from '@kbn/core/public';
 import { PLUGIN } from '../common/constants';
 import { init as initHttp } from './application/services/http';
 import { init as initUiMetric } from './application/services/ui_metric';
@@ -99,7 +98,7 @@ export class IndexLifecycleManagementPlugin
           icon: 'indexRollupApp',
           path: '/app/management/data/index_lifecycle_management',
           showOnHomePage: true,
-          category: FeatureCatalogueCategory.ADMIN,
+          category: 'admin',
           order: 640,
         });
       }
@@ -117,5 +116,6 @@ export class IndexLifecycleManagementPlugin
   }
 
   public start() {}
+
   public stop() {}
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
index f5a4356b9323e..30481afc2c24c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { useKibana as _useKibana } from '@kbn/kibana-react-plugin/public';
 import { AppServicesContext } from './types';
-import { useKibana as _useKibana } from '../../../../src/plugins/kibana_react/public';
 
 export type {
   FormHook,
@@ -19,7 +19,7 @@ export type {
   FormSchema,
   ValidationConfig,
   ValidationError,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   useForm,
@@ -28,9 +28,9 @@ export {
   getFieldValidityAndErrorMessage,
   useFormContext,
   UseMultiFields,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   ToggleField,
@@ -40,21 +40,21 @@ export {
   ComboBoxField,
   TextField,
   CheckBoxField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { attemptToURIDecode } from '../../../../src/plugins/es_ui_shared/public';
+export { attemptToURIDecode } from '@kbn/es-ui-shared-plugin/public';
 
 export {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export const useKibana = () => _useKibana<AppServicesContext>();
 
-export type { CloudSetup } from '../../cloud/public';
+export type { CloudSetup } from '@kbn/cloud-plugin/public';
 
-export type { ILicense } from '../../licensing/public';
+export type { ILicense } from '@kbn/licensing-plugin/public';
diff --git a/x-pack/plugins/index_lifecycle_management/public/types.ts b/x-pack/plugins/index_lifecycle_management/public/types.ts
index 6c8239fd44da3..40772dbe12884 100644
--- a/x-pack/plugins/index_lifecycle_management/public/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/types.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { DocLinksStart } from 'src/core/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { IndexManagementPluginSetup } from '../../index_management/public';
-import { SharePluginSetup } from '../../../../src/plugins/share/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { DocLinksStart } from '@kbn/core/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 
-import { CloudSetup } from '../../cloud/public';
-import { LicensingPluginStart, ILicense } from '../../licensing/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
+import { LicensingPluginStart, ILicense } from '@kbn/licensing-plugin/public';
 
 import { BreadcrumbService } from './application/services/breadcrumbs';
 
diff --git a/x-pack/plugins/index_lifecycle_management/server/config.ts b/x-pack/plugins/index_lifecycle_management/server/config.ts
index 691cc06708bb5..737cc6a472c7a 100644
--- a/x-pack/plugins/index_lifecycle_management/server/config.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/index_lifecycle_management/server/index.ts b/x-pack/plugins/index_lifecycle_management/server/index.ts
index 6a74b4c80b2d3..2f4c3a4706534 100644
--- a/x-pack/plugins/index_lifecycle_management/server/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IndexLifecycleManagementServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
index e8f675ea7e674..011825ed9bf77 100644
--- a/x-pack/plugins/index_lifecycle_management/server/plugin.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
-import { IScopedClusterClient } from 'kibana/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
-import { Index as IndexWithoutIlm } from '../../index_management/common/types';
+import { Index as IndexWithoutIlm } from '@kbn/index-management-plugin/common/types';
 import { PLUGIN } from '../common/constants';
 import { Index } from '../common/types';
 import { Dependencies } from './types';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
index a18459d5d21b9..1d4821e10211c 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -45,12 +45,8 @@ export function registerAddPolicyRoute({
       const { indexName, policyName, alias = '' } = body;
 
       try {
-        await addLifecyclePolicy(
-          context.core.elasticsearch.client.asCurrentUser,
-          indexName,
-          policyName,
-          alias
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        await addLifecyclePolicy(esClient.asCurrentUser, indexName, policyName, alias);
         return response.ok();
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
index ef9fc66b359ba..cec5da7aad90c 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -39,7 +39,8 @@ export function registerRemoveRoute({
       const { indexNames } = body;
 
       try {
-        await removeLifecycle(context.core.elasticsearch.client.asCurrentUser, indexNames);
+        const esClient = (await context.core).elasticsearch.client;
+        await removeLifecycle(esClient.asCurrentUser, indexNames);
         return response.ok();
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
index a7857eae46c1a..42bcffcbd8122 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -36,7 +36,8 @@ export function registerRetryRoute({ router, license, lib: { handleEsError } }:
       const { indexNames } = body;
 
       try {
-        await retryLifecycle(context.core.elasticsearch.client.asCurrentUser, indexNames);
+        const esClient = (await context.core).elasticsearch.client;
+        await retryLifecycle(esClient.asCurrentUser, indexNames);
         return response.ok();
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
index 3cf26ca96595a..13393182d0528 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
@@ -42,7 +42,8 @@ export function registerDetailsRoute({
       const { nodeAttrs } = params;
 
       try {
-        const statsResponse = await context.core.elasticsearch.client.asCurrentUser.nodes.stats();
+        const esClient = (await context.core).elasticsearch.client;
+        const statsResponse = await esClient.asCurrentUser.nodes.stats();
         const okResponse = { body: findMatchingNodes(statsResponse, nodeAttrs) };
         return response.ok(okResponse);
       } catch (error) {
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
index cf892ddff67bf..a9b17c25110b0 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
@@ -88,14 +88,14 @@ export function registerListRoute({
     { path: addBasePath('/nodes/list'), validate: false },
     license.guardApiRoute(async (context, request, response) => {
       try {
-        const settingsResponse =
-          await context.core.elasticsearch.client.asCurrentUser.transport.request({
-            method: 'GET',
-            path: '/_nodes/settings',
-            querystring: {
-              format: 'json',
-            },
-          });
+        const esClient = (await context.core).elasticsearch.client;
+        const settingsResponse = await esClient.asCurrentUser.transport.request({
+          method: 'GET',
+          path: '/_nodes/settings',
+          querystring: {
+            format: 'json',
+          },
+        });
         const body: ListNodesRouteResponse = convertSettingsIntoLists(
           settingsResponse as Settings,
           disallowedNodeAttributes
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
index 5ac37f4eeb215..65c37120e552f 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -55,7 +55,8 @@ export function registerCreateRoute({
       const { name, ...rest } = body;
 
       try {
-        await createPolicy(context.core.elasticsearch.client.asCurrentUser, name, rest);
+        const esClient = (await context.core).elasticsearch.client;
+        await createPolicy(esClient.asCurrentUser, name, rest);
         return response.ok();
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
index eed36962a78e5..d113e646f0b38 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -36,7 +36,8 @@ export function registerDeleteRoute({
       const { policyNames } = params;
 
       try {
-        await deletePolicies(context.core.elasticsearch.client.asCurrentUser, policyNames);
+        const esClient = (await context.core).elasticsearch.client;
+        await deletePolicies(esClient.asCurrentUser, policyNames);
         return response.ok();
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
index ed292579e12cc..9526aca51d33f 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { TransportResult } from '@elastic/elasticsearch';
 
 import { PolicyFromES, SerializedPolicy } from '../../../../common/types';
@@ -62,7 +62,7 @@ export function registerFetchRoute({ router, license, lib: { handleEsError } }:
   router.get(
     { path: addBasePath('/policies'), validate: false },
     license.guardApiRoute(async (context, request, response) => {
-      const { asCurrentUser } = context.core.elasticsearch.client;
+      const { asCurrentUser } = (await context.core).elasticsearch.client;
 
       try {
         const policiesResponse = await fetchPolicies(asCurrentUser);
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts
index ebe8a2388a025..5a01908287896 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts
@@ -13,8 +13,8 @@ export function registerFetchRoute({ router, license, lib: { handleEsError } }:
     { path: addBasePath('/snapshot_policies'), validate: false },
     license.guardApiRoute(async (context, request, response) => {
       try {
-        const policiesByName =
-          await context.core.elasticsearch.client.asCurrentUser.slm.getLifecycle();
+        const esClient = (await context.core).elasticsearch.client;
+        const policiesByName = await esClient.asCurrentUser.slm.getLifecycle();
         return response.ok({ body: Object.keys(policiesByName) });
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts
index a4bdbd5fc7afc..45a55cfce5da1 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts
@@ -28,7 +28,8 @@ export const registerFetchRoute = ({ router, license }: RouteDependencies) => {
       }
 
       try {
-        const esResult = await ctx.core.elasticsearch.client.asCurrentUser.snapshot.getRepository({
+        const esClient = (await ctx.core).elasticsearch.client;
+        const esResult = await esClient.asCurrentUser.snapshot.getRepository({
           name: '*',
         });
         const repos: ListSnapshotReposResponse = {
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
index 4b28ee885ec7c..3f6b4ce843e89 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
@@ -7,11 +7,11 @@
 
 import { merge } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 
-import { TemplateFromEs, TemplateSerialized } from '../../../../../index_management/common/types';
-import { LegacyTemplateSerialized } from '../../../../../index_management/server';
+import { TemplateFromEs, TemplateSerialized } from '@kbn/index-management-plugin/common/types';
+import { LegacyTemplateSerialized } from '@kbn/index-management-plugin/server';
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
@@ -106,8 +106,9 @@ export function registerAddPolicyRoute({
       const { templateName, policyName, aliasName } = body;
       const isLegacy = (request.query as TypeOf<typeof querySchema>).legacy === 'true';
       try {
+        const esClient = (await context.core).elasticsearch.client;
         const updatedTemplate = await updateIndexTemplate(
-          context.core.elasticsearch.client.asCurrentUser,
+          esClient.asCurrentUser,
           isLegacy,
           templateName,
           policyName,
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
index b14dd17d3c11c..e70f2ed2bdac0 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
 import {
   IndexSettings,
   LegacyTemplateSerialized,
   TemplateFromEs,
-} from '../../../../../index_management/common/types';
+} from '@kbn/index-management-plugin/common/types';
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
@@ -88,10 +88,8 @@ export function registerFetchRoute({ router, license, lib: { handleEsError } }:
     license.guardApiRoute(async (context, request, response) => {
       const isLegacy = (request.query as TypeOf<typeof querySchema>).legacy === 'true';
       try {
-        const templates = await fetchTemplates(
-          context.core.elasticsearch.client.asCurrentUser,
-          isLegacy
-        );
+        const esClient = (await context.core).elasticsearch.client;
+        const templates = await fetchTemplates(esClient.asCurrentUser, isLegacy);
         const okResponse = { body: filterTemplates(templates, isLegacy) };
         return response.ok(okResponse);
       } catch (error) {
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/index.ts b/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
index 8af612ebfa23e..82a7d350eb54d 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
@@ -7,7 +7,7 @@
 
 import { RouteDependencies } from '../types';
 
-import { registerIndexRoutes } from './api/index';
+import { registerIndexRoutes } from './api/index/index';
 import { registerNodesRoutes } from './api/nodes';
 import { registerPoliciesRoutes } from './api/policies';
 import { registerTemplatesRoutes } from './api/templates';
diff --git a/x-pack/plugins/index_lifecycle_management/server/services/license.ts b/x-pack/plugins/index_lifecycle_management/server/services/license.ts
index 4dd33f96b7874..e51ecac56327e 100644
--- a/x-pack/plugins/index_lifecycle_management/server/services/license.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/services/license.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { LicenseType, ILicense } from '../shared_imports';
 
 export interface LicenseStatus {
diff --git a/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts
index 4598814d63c02..d5c4585231800 100644
--- a/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export type { ILicense, LicenseType } from '../../licensing/common/types';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
diff --git a/x-pack/plugins/index_lifecycle_management/server/types.ts b/x-pack/plugins/index_lifecycle_management/server/types.ts
index c003c7604596f..dcffbaded6b5c 100644
--- a/x-pack/plugins/index_lifecycle_management/server/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { IndexManagementPluginSetup } from '../../index_management/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
 import { License } from './services';
 import { IndexLifecycleManagementConfig } from './config';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts
index 2be3d9c9460cf..c49d3ccaba890 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 
 type HttpResponse = Record<string, any> | any[];
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
index b469b0293123d..b9f20307a67a9 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,15 +9,15 @@ import React from 'react';
 import { merge } from 'lodash';
 import SemVer from 'semver/classes/semver';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   uiSettingsServiceMock,
   executionContextServiceMock,
-} from '../../../../../../src/core/public/mocks';
-import { GlobalFlyout } from '../../../../../../src/plugins/es_ui_shared/public';
-import { createKibanaReactContext } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public/mocks';
+import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 
 import { MAJOR_VERSION } from '../../../common';
 import { AppContextProvider } from '../../../public/application/app_context';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
index 9eeab1d3ca78b..e38359a6d9f37 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
@@ -15,7 +15,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { DataStream } from '../../../common';
 import { IndexManagementHome } from '../../../public/application/sections/home';
 import { indexManagementStore } from '../../../public/application/store';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts
index b73985dc8372b..25b1f985d441b 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { IndexManagementHome } from '../../../public/application/sections/home';
 import { indexManagementStore } from '../../../public/application/store';
 import { WithAppDependencies, services, TestSubjects } from '../helpers';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts
index a16ba0768e675..e992ff4e3b589 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts
@@ -13,7 +13,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateList } from '../../../public/application/sections/home/template_list';
 import { TemplateDeserialized } from '../../../common';
 import { WithAppDependencies, TestSubjects } from '../helpers';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
index 5feb7840f259c..008dcf9b25b80 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
@@ -14,7 +14,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { IndexManagementHome } from '../../../public/application/sections/home';
 import { indexManagementStore } from '../../../public/application/store';
 import { WithAppDependencies, services, TestSubjects } from '../helpers';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
index 541f2b587b69f..cbf2bc4df7dd2 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
@@ -18,7 +18,7 @@ import { createDataStreamPayload, createNonDataStreamIndex } from './data_stream
 // mocking the returned instance of the editor to always have the same values.
 const mockGetAceEditorValue = jest.fn().mockReturnValue(`{}`);
 
-jest.mock('../../../public/application/lib/ace.js', () => {
+jest.mock('../../../public/application/lib/ace', () => {
   const createAceEditor = () => {
     return {
       getValue: mockGetAceEditorValue,
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts
index 2ee82c2b4c418..d6d1b51e4621a 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateClone } from '../../../public/application/sections/template_clone';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts
index e57e89a6762c2..c495d458205d1 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateCreate } from '../../../public/application/sections/template_create';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts
index 97166970568d3..04e963ec271ed 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateEdit } from '../../../public/application/sections/template_edit';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
index bf5ab6541bad8..740e19bc62671 100644
--- a/x-pack/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -8,10 +8,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
-import axios from 'axios';
-import sinon from 'sinon';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
 /**
  * The below import is required to avoid a console error warn from brace package
@@ -20,8 +17,9 @@ import axiosXhrAdapter from 'axios/lib/adapters/xhr';
           at createWorker (/<path-to-repo>/node_modules/brace/index.js:17992:5)
  */
 import { mountWithIntl, stubWebWorker } from '@kbn/test-jest-helpers'; // eslint-disable-line no-unused-vars
+import { init as initHttpRequests } from '../client_integration/helpers/http_requests';
 
-import { BASE_PATH, API_BASE_PATH } from '../../common/constants';
+import { BASE_PATH } from '../../common/constants';
 import { AppWithoutRouter } from '../../public/application/app';
 import { AppContextProvider } from '../../public/application/app_context';
 import { loadIndicesSuccess } from '../../public/application/store/actions';
@@ -35,14 +33,8 @@ import { setExtensionsService } from '../../public/application/store/selectors/e
 import { ExtensionsService } from '../../public/services';
 import { kibanaVersion } from '../client_integration/helpers';
 
-import {
-  notificationServiceMock,
-  executionContextServiceMock,
-} from '../../../../../src/core/public/mocks';
+import { notificationServiceMock, executionContextServiceMock } from '@kbn/core/public/mocks';
 
-const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
-
-let server = null;
 let store = null;
 const indices = [];
 
@@ -149,6 +141,8 @@ const getActionMenuButtons = (rendered) => {
     .map((span) => span.text());
 };
 describe('index table', () => {
+  const { httpSetup, httpRequestsMockHelpers } = initHttpRequests();
+
   beforeEach(() => {
     // Mock initialization of services
     const services = {
@@ -159,8 +153,7 @@ describe('index table', () => {
     setExtensionsService(services.extensionsService);
     setUiMetricService(services.uiMetricService);
 
-    // @ts-ignore
-    httpService.setup(mockHttpClient);
+    httpService.setup(httpSetup);
     breadcrumbService.setup(() => undefined);
     notificationService.setup(notificationServiceMock.createStartContract());
 
@@ -186,33 +179,9 @@ describe('index table', () => {
     );
 
     store.dispatch(loadIndicesSuccess({ indices }));
-    server = sinon.fakeServer.create();
-
-    server.respondWith(`${API_BASE_PATH}/indices`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(indices),
-    ]);
-
-    server.respondWith([
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify({ acknowledged: true }),
-    ]);
-
-    server.respondWith(`${API_BASE_PATH}/indices/reload`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(indices),
-    ]);
-
-    server.respondImmediately = true;
-  });
-  afterEach(() => {
-    if (!server) {
-      return;
-    }
-    server.restore();
+
+    httpRequestsMockHelpers.setLoadIndicesResponse(indices);
+    httpRequestsMockHelpers.setReloadIndicesResponse(indices);
   });
 
   test('should change pages when a pagination link is clicked on', async () => {
@@ -476,22 +445,17 @@ describe('index table', () => {
   });
 
   test('close index button works from context menu', async () => {
-    const rendered = mountWithIntl(component);
-    await runAllPromises();
-    rendered.update();
-
     const modifiedIndices = indices.map((index) => {
       return {
         ...index,
         status: index.name === 'testy0' ? 'close' : index.status,
       };
     });
+    httpRequestsMockHelpers.setReloadIndicesResponse(modifiedIndices);
 
-    server.respondWith(`${API_BASE_PATH}/indices/reload`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(modifiedIndices),
-    ]);
+    const rendered = mountWithIntl(component);
+    await runAllPromises();
+    rendered.update();
 
     testAction(rendered, 'closeIndexMenuButton');
   });
@@ -503,16 +467,12 @@ describe('index table', () => {
         status: index.name === 'testy1' ? 'closed' : index.status,
       };
     });
-
-    server.respondWith(`${API_BASE_PATH}/indices`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(modifiedIndices),
-    ]);
+    httpRequestsMockHelpers.setLoadIndicesResponse(modifiedIndices);
 
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
+
     testAction(rendered, 'openIndexMenuButton', 'testy1');
   });
 
diff --git a/x-pack/plugins/index_management/common/constants/plugin.ts b/x-pack/plugins/index_management/common/constants/plugin.ts
index 64619afcfb11b..ddbe0f0c2403c 100644
--- a/x-pack/plugins/index_management/common/constants/plugin.ts
+++ b/x-pack/plugins/index_management/common/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/index_management/public/application/app.tsx b/x-pack/plugins/index_management/public/application/app.tsx
index f52479f41708b..52aad9756f855 100644
--- a/x-pack/plugins/index_management/public/application/app.tsx
+++ b/x-pack/plugins/index_management/public/application/app.tsx
@@ -9,7 +9,7 @@ import React, { useEffect } from 'react';
 
 import { METRIC_TYPE } from '@kbn/analytics';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { UIM_APP_LOAD } from '../../common/constants';
 import { useExecutionContext } from '../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/app_context.tsx b/x-pack/plugins/index_management/public/application/app_context.tsx
index e5120fff11627..76a91dd82819d 100644
--- a/x-pack/plugins/index_management/public/application/app_context.tsx
+++ b/x-pack/plugins/index_management/public/application/app_context.tsx
@@ -8,8 +8,8 @@
 import React, { createContext, useContext } from 'react';
 import { Observable } from 'rxjs';
 import SemVer from 'semver/classes/semver';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import {
   ApplicationStart,
   CoreTheme,
@@ -18,8 +18,8 @@ import {
   DocLinksStart,
   IUiSettingsClient,
   ExecutionContextStart,
-} from 'src/core/public';
-import { SharePluginStart } from 'src/plugins/share/public';
+} from '@kbn/core/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
 import { ExtensionsService } from '../services';
 import { UiMetricService, NotificationService, HttpService } from './services';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
index 81f43a1b46073..01a82696d9aea 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 
-import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 import '../../../../../../test/global_mocks';
 import { setupEnvironment } from './helpers';
 import { API_BASE_PATH } from './helpers/constants';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts
index 846c921e776c3..2cdc974dde0ed 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_PATH } from '../../../../../../../common';
 import { ComponentTemplateCreate } from '../../../component_template_wizard';
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
index 18fe2b59f21c6..e2f41bbe246f2 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { WithAppDependencies } from './setup_environment';
 import { ComponentTemplateDetailsFlyoutContent } from '../../../component_template_details';
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts
index dfc73e0ccafb0..e9afc7e5efb20 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_PATH } from '../../../../../../../common';
 import { ComponentTemplateEdit } from '../../../component_template_wizard';
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts
index 3005eae0d6bf1..9fec92812fd1a 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   registerTestBed,
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts
index 025f34066908c..f3019e12eea9c 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from './constants';
 
 type HttpResponse = Record<string, any> | any[];
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
index b3da9622ce984..8fcae47fc494e 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
@@ -7,15 +7,15 @@
 
 import React from 'react';
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   applicationServiceMock,
   executionContextServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 
-import { GlobalFlyout } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
+import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
 import { AppContextProvider } from '../../../../../app_context';
 import { MappingsEditorProvider } from '../../../../mappings_editor';
 import { ComponentTemplatesProvider } from '../../../component_templates_context';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx
index c314dd1ce0b99..548c6ba114ab8 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx
@@ -10,7 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 
 import {
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx
index 32b093a9caf07..5b59523ff2548 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx
@@ -18,7 +18,7 @@ import {
   EuiLink,
   EuiBadge,
 } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { ComponentTemplateListItem, reactRouterNavigate } from '../shared_imports';
 import { UIM_COMPONENT_TEMPLATE_DETAILS } from '../constants';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx
index d652cca47e1d1..e67d5fe122a34 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx
@@ -14,8 +14,8 @@ import {
   NotificationsSetup,
   CoreStart,
   ExecutionContextStart,
-} from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+} from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { getApi, getUseRequest, getSendRequest, getDocumentation, getBreadcrumbs } from './lib';
 
 const ComponentTemplatesContext = createContext<Context | undefined>(undefined);
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts b/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts
index 3357ede3e62c5..7b162487f1475 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 export const getBreadcrumbs = (setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']) => {
   const baseBreadcrumbs = [
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts b/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts
index 185e521e4a5b8..83118271a5cde 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const getDocumentation = ({ links }: DocLinksStart) => {
   const esDocsBase = links.elasticsearch.docsBase;
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts b/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts
index 92847bbe5dc05..7bb4b90da2fed 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   UseRequestConfig,
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts b/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts
index d205a7436d00e..64ee7a16ef2fb 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts
@@ -11,7 +11,7 @@ export type {
   SendRequestConfig,
   SendRequestResponse,
   Error,
-} from '../../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 export {
   sendRequest,
   useRequest,
@@ -26,33 +26,30 @@ export {
   Forms,
   GlobalFlyout,
   attemptToURIDecode,
-} from '../../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   serializers,
   fieldValidators,
   fieldFormatters,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
+} from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export type {
-  FormSchema,
-  FieldConfig,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+export type { FormSchema, FieldConfig } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   FIELD_TYPES,
   VALIDATION_TYPES,
   useForm,
   Form,
   getUseField,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   getFormRow,
   Field,
   JsonEditorField,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { isJSON } from '../../../../../../../src/plugins/es_ui_shared/static/validators/string';
+export { isJSON } from '@kbn/es-ui-shared-plugin/static/validators/string';
 
 export type { CommonWizardSteps } from '../shared';
 export {
@@ -72,7 +69,4 @@ export type {
 
 export { serializeComponentTemplate } from '../../../../common/lib';
 
-export {
-  reactRouterNavigate,
-  useExecutionContext,
-} from '../../../../../../../src/plugins/kibana_react/public';
+export { reactRouterNavigate, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx b/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx
index 165288fa5946a..ac3beaa7b0b52 100644
--- a/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { reactRouterNavigate } from '../../../shared_imports';
 import { documentationService } from '../../services/documentation';
 
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts b/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts
index 3cc3c8997a83c..85bd92461b001 100644
--- a/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts
@@ -10,6 +10,6 @@ export {
   Form,
   getUseField,
   FormDataProvider,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { CheckBoxField } from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
+export { CheckBoxField } from '@kbn/es-ui-shared-plugin/static/forms/components';
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
index 49922b45f2fde..76bc66b2f1df8 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,12 +9,9 @@ import React, { ComponentType, MemoExoticComponent } from 'react';
 import SemVer from 'semver/classes/semver';
 
 /* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
-import '../../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
-import { GlobalFlyout } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
-import {
-  docLinksServiceMock,
-  uiSettingsServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
+import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
+import { docLinksServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { MAJOR_VERSION } from '../../../../../../../common';
 import { MappingsEditorProvider } from '../../../mappings_editor_context';
 import { createKibanaReactContext } from '../../../shared_imports';
@@ -52,10 +49,8 @@ jest.mock('@elastic/eui', () => {
   };
 });
 
-jest.mock('../../../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual(
-    '../../../../../../../../../../src/plugins/kibana_react/public'
-  );
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   const CodeEditorMock = (props: any) => (
     <input
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx
index 8ef59302f6a01..41419d127e16b 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 
 import { PathParameter } from '../../../field_parameters';
-import { ComponentProps } from './index';
+import { ComponentProps } from '.';
 
 export const AliasTypeRequiredParameters = ({ allFields }: ComponentProps) => {
   return <PathParameter allFields={allFields} />;
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx
index 2db0d2b6c544b..83a6ceeab88f4 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx
@@ -7,7 +7,7 @@
 
 import React, { useEffect, useMemo } from 'react';
 
-import { useKibana } from '../../../../../../index';
+import { useKibana } from '../../../../../..';
 import { useForm } from '../../../../shared_imports';
 import { useDispatch, useMappingsState } from '../../../../mappings_state_context';
 import { Field } from '../../../../types';
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
index c2502f14facfb..2965fd1cec670 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 
 jest.mock('lodash', () => {
   const original = jest.requireActual('lodash');
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts
index 61c9a8dfe4f1c..418a90f27220f 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts
@@ -7,7 +7,7 @@
 
 import { searchFields } from './search_fields';
 import { NormalizedField } from '../types';
-import { getUniqueId } from '../lib';
+import { getUniqueId } from '.';
 
 const irrelevantProps = {
   canHaveChildFields: false,
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts
index de9c1985239f5..fb152a41db568 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts
@@ -15,7 +15,7 @@ export type {
   ArrayItem,
   ValidationFunc,
   ValidationFuncArg,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   FIELD_TYPES,
   Form,
@@ -27,7 +27,7 @@ export {
   useFormContext,
   UseMultiFields,
   VALIDATION_TYPES,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   CheckBoxField,
@@ -42,24 +42,21 @@ export {
   ComboBoxField,
   ToggleField,
   JsonEditorField,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export {
-  fieldFormatters,
-  fieldValidators,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldFormatters, fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export type { OnJsonEditorUpdateHandler } from '../../../../../../../src/plugins/es_ui_shared/public';
-export { JsonEditor, GlobalFlyout } from '../../../../../../../src/plugins/es_ui_shared/public';
+export type { OnJsonEditorUpdateHandler } from '@kbn/es-ui-shared-plugin/public';
+export { JsonEditor, GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
 
 export { documentationService } from '../../services/documentation';
 
 export type {
   RuntimeField,
   RuntimeFieldEditorFlyoutContentProps,
-} from '../../../../../runtime_fields/public';
-export { RuntimeFieldEditorFlyoutContent } from '../../../../../runtime_fields/public';
+} from '@kbn/runtime-fields-plugin/public';
+export { RuntimeFieldEditorFlyoutContent } from '@kbn/runtime-fields-plugin/public';
 
-export { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+export { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 
-export type { DocLinksStart } from '../../../../../../../src/core/public';
+export type { DocLinksStart } from '@kbn/core/public';
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
index 03b3452642c96..725d770c4bdb7 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
@@ -9,7 +9,7 @@ import React, { useState, useCallback, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSpacer, EuiButton, EuiPageHeader } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateDeserialized } from '../../../../common';
 import { serializers, Forms, GlobalFlyout } from '../../../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/index.tsx b/x-pack/plugins/index_management/public/application/index.tsx
index 5477e7702ef6f..5067e47fc4a81 100644
--- a/x-pack/plugins/index_management/public/application/index.tsx
+++ b/x-pack/plugins/index_management/public/application/index.tsx
@@ -10,7 +10,7 @@ import { Provider } from 'react-redux';
 import { render, unmountComponentAtNode } from 'react-dom';
 import SemVer from 'semver/classes/semver';
 
-import { CoreStart, CoreSetup } from '../../../../../src/core/public';
+import { CoreStart, CoreSetup } from '@kbn/core/public';
 
 import { API_BASE_PATH } from '../../common';
 import {
diff --git a/x-pack/plugins/index_management/public/application/mount_management_section.ts b/x-pack/plugins/index_management/public/application/mount_management_section.ts
index 7562f5e410750..a0df94324ccde 100644
--- a/x-pack/plugins/index_management/public/application/mount_management_section.ts
+++ b/x-pack/plugins/index_management/public/application/mount_management_section.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import SemVer from 'semver/classes/semver';
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 import { UIM_APP_NAME } from '../../common/constants';
 import { PLUGIN } from '../../common/constants/plugin';
diff --git a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
index a9e21c4d28bbb..9ff009c9d6101 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
@@ -20,7 +20,7 @@ import {
   EuiEmptyPrompt,
   EuiLink,
 } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import {
   PageLoading,
diff --git a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
index 44ffe4741e471..8e070ae7fe125 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
@@ -9,7 +9,7 @@ import React, { useState, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiInMemoryTable, EuiBasicTableColumn, EuiButton, EuiLink } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { DataStream } from '../../../../../../common/types';
 import { UseRequestResponse, reactRouterNavigate } from '../../../../../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx
index cd7615ddfb1b9..136fa6a63fa41 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiInMemoryTable, EuiButton, EuiLink, EuiBasicTableColumn } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { UseRequestResponse, reactRouterNavigate } from '../../../../../../shared_imports';
 import { TemplateListItem } from '../../../../../../../common';
 import { UIM_TEMPLATE_SHOW_DETAILS_CLICK } from '../../../../../../../common/constants';
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx
index c29fbfde16f5d..111ff83a14edd 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx
@@ -10,7 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import {
   EuiEmptyPrompt,
   EuiSpacer,
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
index 08b00b8376520..8a6ed8ac079a2 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiInMemoryTable, EuiBasicTableColumn, EuiButton, EuiLink, EuiIcon } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateListItem } from '../../../../../../common';
 import { UIM_TEMPLATE_SHOW_DETAILS_CLICK } from '../../../../../../common/constants';
diff --git a/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx b/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx
index 5c871a8f8cef5..97b4c48c19b01 100644
--- a/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContentBody } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { PageLoading, PageError, Error } from '../../../shared_imports';
 import { TemplateDeserialized } from '../../../../common';
diff --git a/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx b/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx
index 31646164a6623..691af04ec8d11 100644
--- a/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContentBody } from '@elastic/eui';
 import { useLocation } from 'react-router-dom';
 import { parse } from 'query-string';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateDeserialized } from '../../../../common';
 import { TemplateForm } from '../../components';
diff --git a/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx b/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx
index e15e25d88df2e..e585bd2bbd056 100644
--- a/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx
@@ -10,7 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContentBody, EuiSpacer, EuiCallOut } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateDeserialized } from '../../../../common';
 import { PageError, PageLoading, attemptToURIDecode, Error } from '../../../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts b/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts
index 96aece6bd64d8..75ad96d276b90 100644
--- a/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts
+++ b/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/index_management/public/application/services/documentation.ts b/x-pack/plugins/index_management/public/application/services/documentation.ts
index 1bb8faa5e51ba..20280695c775a 100644
--- a/x-pack/plugins/index_management/public/application/services/documentation.ts
+++ b/x-pack/plugins/index_management/public/application/services/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from '../../../../../../src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { DataType } from '../components/mappings_editor/types';
 import { TYPE_DEFINITION } from '../components/mappings_editor/constants';
 
diff --git a/x-pack/plugins/index_management/public/application/services/http.ts b/x-pack/plugins/index_management/public/application/services/http.ts
index 19800d3b5a8c5..c4fe4ba6ac6b6 100644
--- a/x-pack/plugins/index_management/public/application/services/http.ts
+++ b/x-pack/plugins/index_management/public/application/services/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 export class HttpService {
   private client: any;
diff --git a/x-pack/plugins/index_management/public/application/services/notification.ts b/x-pack/plugins/index_management/public/application/services/notification.ts
index 866989d207e27..dcce95e0db38b 100644
--- a/x-pack/plugins/index_management/public/application/services/notification.ts
+++ b/x-pack/plugins/index_management/public/application/services/notification.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { NotificationsStart } from '../../../../../../src/core/public';
+import { NotificationsStart } from '@kbn/core/public';
 
 export class NotificationService {
   private _toasts: any;
diff --git a/x-pack/plugins/index_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_management/public/application/services/ui_metric.ts
index 16e8f7a4cf1a4..5b9e145ed9286 100644
--- a/x-pack/plugins/index_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_management/public/application/services/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 let uiMetricService: UiMetricService;
 
diff --git a/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts b/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts
index d60cd1cf8aabf..88c2c4424684e 100644
--- a/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts
+++ b/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useLocatorUrl } from '../../../../../../src/plugins/share/public';
+import { useLocatorUrl } from '@kbn/share-plugin/public';
 import { useAppContext } from '../app_context';
 import { ILM_LOCATOR_ID } from '../constants';
 
diff --git a/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js b/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js
index 179aa73b4f0a8..3a64adb7f576d 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { clearCacheIndices as request } from '../../services';
 import { notificationService } from '../../services/notification';
 
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 
 export const clearCacheIndicesStart = createAction('INDEX_MANAGEMENT_CLEAR_CACHE_INDICES_START');
 export const clearCacheIndices =
diff --git a/x-pack/plugins/index_management/public/application/store/actions/close_indices.js b/x-pack/plugins/index_management/public/application/store/actions/close_indices.js
index 1669d6b1b022f..ed88e3ec7f433 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/close_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/close_indices.js
@@ -9,7 +9,7 @@ import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { closeIndices as request } from '../../services';
 import { notificationService } from '../../services/notification';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 
 export const closeIndicesStart = createAction('INDEX_MANAGEMENT_CLOSE_INDICES_START');
 export const closeIndices =
diff --git a/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js b/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js
index 307c359b0fe21..235fa84f7f545 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js
@@ -9,7 +9,7 @@ import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { deleteIndices as request } from '../../services';
 import { notificationService } from '../../services/notification';
-import { clearRowStatus } from '../actions';
+import { clearRowStatus } from '.';
 
 export const deleteIndicesSuccess = createAction('INDEX_MANAGEMENT_DELETE_INDICES_SUCCESS');
 export const deleteIndices =
diff --git a/x-pack/plugins/index_management/public/application/store/actions/extension_action.js b/x-pack/plugins/index_management/public/application/store/actions/extension_action.js
index eda9d32d75fba..0fb49eea24b4d 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/extension_action.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/extension_action.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { reloadIndices } from '../actions';
+import { reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 import { httpService } from '../../services/http';
 
diff --git a/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js b/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js
index 364b87e9f2bb7..0de326f4b1b72 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { flushIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const flushIndicesStart = createAction('INDEX_MANAGEMENT_FLUSH_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js b/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js
index 60f5da7d4925d..1bbbc976d55c4 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { forcemergeIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const forcemergeIndicesStart = createAction('INDEX_MANAGEMENT_FORCEMERGE_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/open_indices.js b/x-pack/plugins/index_management/public/application/store/actions/open_indices.js
index 73a4a3350b841..63d0bb6d984eb 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/open_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/open_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { openIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const openIndicesStart = createAction('INDEX_MANAGEMENT_OPEN_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js b/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js
index 77944344c47c7..ec95389ceb198 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js
@@ -9,7 +9,7 @@ import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 
 import { refreshIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const refreshIndicesStart = createAction('INDEX_MANAGEMENT_REFRESH_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js b/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js
index 96d38c48f240d..24b3a2a498245 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { unfreezeIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const unfreezeIndicesStart = createAction('INDEX_MANAGEMENT_UNFREEZE_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/store.js b/x-pack/plugins/index_management/public/application/store/store.js
index bdacc170418b9..012574c934ff4 100644
--- a/x-pack/plugins/index_management/public/application/store/store.js
+++ b/x-pack/plugins/index_management/public/application/store/store.js
@@ -9,7 +9,7 @@ import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
 import { defaultTableState } from './reducers/table_state';
 
-import { getReducer } from './reducers/';
+import { getReducer } from './reducers';
 
 export function indexManagementStore(services) {
   const toggleNameToVisibleMap = {};
diff --git a/x-pack/plugins/index_management/public/index.ts b/x-pack/plugins/index_management/public/index.ts
index 01635ed2a9b8f..b8cde1fdf36e7 100644
--- a/x-pack/plugins/index_management/public/index.ts
+++ b/x-pack/plugins/index_management/public/index.ts
@@ -6,7 +6,7 @@
  */
 
 import './index.scss';
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { IndexMgmtUIPlugin } from './plugin';
 
 /** @public */
diff --git a/x-pack/plugins/index_management/public/plugin.ts b/x-pack/plugins/index_management/public/plugin.ts
index 2394167ca61b2..a63ee693aa19f 100644
--- a/x-pack/plugins/index_management/public/plugin.ts
+++ b/x-pack/plugins/index_management/public/plugin.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import SemVer from 'semver/classes/semver';
 
-import { CoreSetup, PluginInitializerContext } from '../../../../src/core/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 import { setExtensionsService } from './application/store/selectors/extension_service';
 
 import { ExtensionsService } from './services';
diff --git a/x-pack/plugins/index_management/public/shared_imports.ts b/x-pack/plugins/index_management/public/shared_imports.ts
index 210eb30cc82da..8be95e6e7cef9 100644
--- a/x-pack/plugins/index_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/shared_imports.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export type {
   SendRequestConfig,
@@ -13,7 +13,7 @@ export type {
   UseRequestConfig,
   UseRequestResponse,
   Error,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   sendRequest,
@@ -26,12 +26,9 @@ export {
   PageError,
   SectionLoading,
   EuiCodeEditor,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export type {
-  FormSchema,
-  FieldConfig,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+export type { FormSchema, FieldConfig } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   FIELD_TYPES,
@@ -42,22 +39,22 @@ export {
   getUseField,
   UseField,
   FormDataProvider,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   fieldFormatters,
   fieldValidators,
   serializers,
-} from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+} from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   getFormRow,
   Field,
   ToggleField,
   JsonEditorField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { isJSON } from '../../../../src/plugins/es_ui_shared/static/validators/string';
+export { isJSON } from '@kbn/es-ui-shared-plugin/static/validators/string';
 
 export {
   createKibanaReactContext,
@@ -65,4 +62,4 @@ export {
   useKibana,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/index_management/public/types.ts b/x-pack/plugins/index_management/public/types.ts
index e0af6b160cf11..57c7e11b6262b 100644
--- a/x-pack/plugins/index_management/public/types.ts
+++ b/x-pack/plugins/index_management/public/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { ExtensionsSetup } from './services';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { SharePluginStart } from '../../../../src/plugins/share/public';
 
 export interface IndexManagementPluginSetup {
   extensionsService: ExtensionsSetup;
diff --git a/x-pack/plugins/index_management/server/config.ts b/x-pack/plugins/index_management/server/config.ts
index 88a714db5edca..157d6d3da8737 100644
--- a/x-pack/plugins/index_management/server/config.ts
+++ b/x-pack/plugins/index_management/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/index_management/server/index.ts b/x-pack/plugins/index_management/server/index.ts
index 8eb882d29de2d..ab6b0741274ff 100644
--- a/x-pack/plugins/index_management/server/index.ts
+++ b/x-pack/plugins/index_management/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { IndexMgmtServerPlugin } from './plugin';
 
diff --git a/x-pack/plugins/index_management/server/lib/fetch_indices.ts b/x-pack/plugins/index_management/server/lib/fetch_indices.ts
index 78d74fe630055..8635b9fd4f196 100644
--- a/x-pack/plugins/index_management/server/lib/fetch_indices.ts
+++ b/x-pack/plugins/index_management/server/lib/fetch_indices.ts
@@ -6,9 +6,9 @@
  */
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { IndexDataEnricher } from '../services';
-import { Index } from '../index';
+import { Index } from '..';
 
 async function fetchIndicesCall(
   client: IScopedClusterClient,
diff --git a/x-pack/plugins/index_management/server/lib/get_managed_templates.ts b/x-pack/plugins/index_management/server/lib/get_managed_templates.ts
index c224799a8c35c..7ed38224dcac8 100644
--- a/x-pack/plugins/index_management/server/lib/get_managed_templates.ts
+++ b/x-pack/plugins/index_management/server/lib/get_managed_templates.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 // Cloud has its own system for managing templates and we want to make
 // this clear in the UI when a template is used in a Cloud deployment.
diff --git a/x-pack/plugins/index_management/server/plugin.ts b/x-pack/plugins/index_management/server/plugin.ts
index a339349c0a5a9..a36101ad2911e 100644
--- a/x-pack/plugins/index_management/server/plugin.ts
+++ b/x-pack/plugins/index_management/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN } from '../common/constants/plugin';
 import { Dependencies } from './types';
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts
index 296dcd726e52a..adfa0d61859f1 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import { serializeComponentTemplate } from '../../../../common/lib';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { componentTemplateSchema } from './schema_validation';
 
 export const registerCreateRoute = ({
@@ -24,7 +24,7 @@ export const registerCreateRoute = ({
       },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       const serializedComponentTemplate = serializeComponentTemplate(request.body);
 
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts
index 67991ec708946..c06f90821b337 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   names: schema.string(),
@@ -26,7 +26,7 @@ export const registerDeleteRoute = ({
       },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { names } = request.params;
       const componentNames = names.split(',');
 
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts
index 9e54e80c71484..73224c0356ad5 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts
@@ -13,7 +13,7 @@ import {
 } from '../../../../common/lib';
 import { ComponentTemplateFromEs } from '../../../../common';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   name: schema.string(),
@@ -24,7 +24,7 @@ export function registerGetAllRoute({ router, lib: { handleEsError } }: RouteDep
   router.get(
     { path: addBasePath('/component_templates'), validate: false },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const { component_templates: componentTemplates } =
@@ -58,7 +58,7 @@ export function registerGetAllRoute({ router, lib: { handleEsError } }: RouteDep
       },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { name } = request.params;
 
       try {
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts
index dd37ad56ea4b4..dc4214ae43f73 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
 
 import { IndexDataEnricher } from '../../../services/index_data_enricher';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts
index 63bd4a1ca14d8..a8b488fb54c9a 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts
@@ -6,9 +6,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Privileges } from 'src/plugins/es_ui_shared/public';
+import { Privileges } from '@kbn/es-ui-shared-plugin/public';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const extractMissingPrivileges = (privilegesObject: { [key: string]: boolean } = {}): string[] =>
   Object.keys(privilegesObject).reduce((privileges: string[], privilegeName: string): string[] => {
@@ -41,7 +41,7 @@ export const registerPrivilegesRoute = ({
         return response.ok({ body: privilegesResult });
       }
 
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const { has_all_requested: hasAllPrivileges, cluster } =
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts
index 97d7c52dde044..1a9e642cd9342 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { componentTemplateSchema } from './schema_validation';
 
 const paramsSchema = schema.object({
@@ -29,7 +29,7 @@ export const registerUpdateRoute = ({
       },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { name } = request.params;
       const { template, version, _meta } = request.body;
 
diff --git a/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts
index 9e7b57079cc3c..dcdb4056cb681 100644
--- a/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   dataStreams: schema.arrayOf(schema.string()),
@@ -21,7 +21,7 @@ export function registerDeleteRoute({ router, lib: { handleEsError } }: RouteDep
       validate: { body: bodySchema },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { dataStreams } = request.body as TypeOf<typeof bodySchema>;
 
       const responseBody: { dataStreamsDeleted: string[]; errors: any[] } = {
diff --git a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
index 4c44d1a8212f9..a562cc5f4cc52 100644
--- a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
@@ -7,11 +7,11 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { deserializeDataStream, deserializeDataStreamList } from '../../../../common/lib';
 import { DataStreamFromEs } from '../../../../common/types';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 interface PrivilegesFromEs {
   username: string;
@@ -103,7 +103,7 @@ export function registerGetAllRoute({ router, lib: { handleEsError }, config }:
   router.get(
     { path: addBasePath('/data_streams'), validate: { query: querySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       const includeStats = (request.query as TypeOf<typeof querySchema>).includeStats === 'true';
 
@@ -152,7 +152,7 @@ export function registerGetOneRoute({ router, lib: { handleEsError }, config }:
     },
     async (context, request, response) => {
       const { name } = request.params as TypeOf<typeof paramsSchema>;
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       try {
         const [{ data_streams: dataStreams }, { data_streams: dataStreamsStats }] =
           await Promise.all([getDataStreams(client, name), getDataStreamsStats(client, name)]);
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts
index e704ad1fb3cd5..a46a23b8fe479 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerClearCacheRoute({ router, lib: { handleEsError } }: Rout
   router.post(
     { path: addBasePath('/indices/clear_cache'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       const params = {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts
index 6d4488634a2aa..69d33b7fc7999 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerCloseRoute({ router, lib: { handleEsError } }: RouteDepe
   router.post(
     { path: addBasePath('/indices/close'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       const params = {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts
index 5afebf4b21c96..b72a2059beb1d 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerDeleteRoute({ router, lib: { handleEsError } }: RouteDep
   router.post(
     { path: addBasePath('/indices/delete'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       const params = {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts
index 5e84bac60bd1e..cc07b92e70907 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerFlushRoute({ router, lib: { handleEsError } }: RouteDepe
   router.post(
     { path: addBasePath('/indices/flush'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       const params = {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts
index d0dda14d944c7..af07a7371cf65 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -24,7 +24,7 @@ export function registerForcemergeRoute({ router, lib: { handleEsError } }: Rout
       },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { maxNumSegments, indices = [] } = request.body as typeof bodySchema.type;
       const params = {
         expand_wildcards: 'none' as const,
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts
index d8a7fcb29bb35..48c1800aba95e 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts
@@ -7,7 +7,7 @@
 
 import { fetchIndices } from '../../../lib/fetch_indices';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerListRoute({
   router,
@@ -17,7 +17,7 @@ export function registerListRoute({
   router.get(
     { path: addBasePath('/indices'), validate: false },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       try {
         const indices = await fetchIndices(client, indexDataEnricher);
         return response.ok({ body: indices });
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts
index fc64afd86b9bf..dde9e72af39d7 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerOpenRoute({ router, lib: { handleEsError } }: RouteDepen
   router.post(
     { path: addBasePath('/indices/open'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       const params = {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts
index bb47d1f3a2319..2483cd534b80e 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerRefreshRoute({ router, lib: { handleEsError } }: RouteDe
   router.post(
     { path: addBasePath('/indices/refresh'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       const params = {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts
index 4c5bd1fb030e8..42b78fe246ba8 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
 import { fetchIndices } from '../../../lib/fetch_indices';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.maybe(
   schema.object({
@@ -25,7 +25,7 @@ export function registerReloadRoute({
   router.post(
     { path: addBasePath('/indices/reload'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indexNames = [] } = (request.body as typeof bodySchema.type) ?? {};
 
       try {
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts
index 71a7c27ad2cba..3636a0707df8c 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
@@ -18,7 +18,7 @@ export function registerUnfreezeRoute({ router, lib: { handleEsError } }: RouteD
   router.post(
     { path: addBasePath('/indices/unfreeze'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indices = [] } = request.body as typeof bodySchema.type;
 
       try {
diff --git a/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts b/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts
index cef20539f9403..641ad26417f67 100644
--- a/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   indexName: schema.string(),
@@ -25,7 +25,7 @@ export function registerMappingRoute({ router, lib: { handleEsError } }: RouteDe
   router.get(
     { path: addBasePath('/mapping/{indexName}'), validate: { params: paramsSchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indexName } = request.params as typeof paramsSchema.type;
       const params = {
         expand_wildcards: 'none' as const,
diff --git a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts
index fb104b3dc868f..9fe4a57f7a055 100644
--- a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts
+++ b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { registerNodesRoute } from './register_nodes_route';
 import { RouterMock, routeDependencies, RequestMock } from '../../../test/helpers';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts
index 5c9751c8506cf..08a0684f69c97 100644
--- a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts
@@ -6,14 +6,14 @@
  */
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerNodesRoute({ router, lib: { handleEsError } }: RouteDependencies) {
   // Retrieve the es plugins installed on the cluster nodes
   router.get(
     { path: addBasePath('/nodes/plugins'), validate: {} },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const body = await client.asCurrentUser.nodes.info();
diff --git a/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts b/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts
index ceb59916811d8..bcdf29af65856 100644
--- a/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   indexName: schema.string(),
@@ -25,7 +25,7 @@ export function registerLoadRoute({ router, lib: { handleEsError } }: RouteDepen
   router.get(
     { path: addBasePath('/settings/{indexName}'), validate: { params: paramsSchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indexName } = request.params as typeof paramsSchema.type;
       const params = {
         expand_wildcards: 'none' as const,
diff --git a/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts b/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts
index b7a38cb04782e..cfb0be50e0484 100644
--- a/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.any();
 
@@ -23,7 +23,7 @@ export function registerUpdateRoute({ router, lib: { handleEsError } }: RouteDep
       validate: { body: bodySchema, params: paramsSchema },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indexName } = request.params as typeof paramsSchema.type;
       const params = {
         ignore_unavailable: true,
diff --git a/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts b/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts
index f178cc8ace6bc..8e361d8488ba3 100644
--- a/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   indexName: schema.string(),
@@ -33,7 +33,7 @@ export function registerStatsRoute({ router, lib: { handleEsError } }: RouteDepe
   router.get(
     { path: addBasePath('/stats/{indexName}'), validate: { params: paramsSchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { indexName } = request.params as typeof paramsSchema.type;
       const params = {
         expand_wildcards: 'none' as const,
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/lib.ts b/x-pack/plugins/index_management/server/routes/api/templates/lib.ts
index 413e73ff93d5f..f900e76ac17f5 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/lib.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/lib.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { serializeTemplate, serializeLegacyTemplate } from '../../../../common/lib';
 import { TemplateDeserialized, LegacyTemplateSerialized } from '../../../../common';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts
index 20a3e1e97dd6c..0b903d4356ec4 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import { TemplateDeserialized } from '../../../../common';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { templateSchema } from './validate_schemas';
 import { saveTemplate, doesTemplateExist } from './lib';
 
@@ -19,7 +19,7 @@ export function registerCreateRoute({ router, lib: { handleEsError } }: RouteDep
   router.post(
     { path: addBasePath('/index_templates'), validate: { body: bodySchema } },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const template = request.body as TemplateDeserialized;
 
       try {
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts
index fbfcab3a8f5ed..b6c289f3a72a8 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { TemplateDeserialized } from '../../../../common';
 
@@ -28,7 +28,7 @@ export function registerDeleteRoute({ router, lib: { handleEsError } }: RouteDep
       validate: { body: bodySchema },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { templates } = request.body as TypeOf<typeof bodySchema>;
       const responseBody: {
         templatesDeleted: Array<TemplateDeserialized['name']>;
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts
index 93d65e162da71..32661bb308876 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts
@@ -15,13 +15,13 @@ import {
 } from '../../../../common/lib';
 import { getCloudManagedTemplatePrefix } from '../../../lib/get_managed_templates';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerGetAllRoute({ router, lib: { handleEsError } }: RouteDependencies) {
   router.get(
     { path: addBasePath('/index_templates'), validate: false },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
 
       try {
         const cloudManagedTemplatePrefix = await getCloudManagedTemplatePrefix(client);
@@ -66,7 +66,7 @@ export function registerGetOneRoute({ router, lib: { handleEsError } }: RouteDep
       validate: { params: paramsSchema, query: querySchema },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { name } = request.params as TypeOf<typeof paramsSchema>;
       const isLegacy = (request.query as TypeOf<typeof querySchema>).legacy === 'true';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts
index ab937fc366d4c..3dc6201f0831c 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts
@@ -8,7 +8,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({}, { unknowns: 'allow' });
 
@@ -19,7 +19,7 @@ export function registerSimulateRoute({ router, lib: { handleEsError } }: RouteD
       validate: { body: bodySchema },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const template = request.body as TypeOf<typeof bodySchema>;
 
       try {
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts
index f700497e924b4..30b93f2e59ec0 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 
 import { TemplateDeserialized } from '../../../../common';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { templateSchema } from './validate_schemas';
 import { saveTemplate, doesTemplateExist } from './lib';
 
@@ -25,7 +25,7 @@ export function registerUpdateRoute({ router, lib: { handleEsError } }: RouteDep
       validate: { body: bodySchema, params: paramsSchema },
     },
     async (context, request, response) => {
-      const { client } = context.core.elasticsearch;
+      const { client } = (await context.core).elasticsearch;
       const { name } = request.params as typeof paramsSchema.type;
       const template = request.body as TemplateDeserialized;
 
diff --git a/x-pack/plugins/index_management/server/services/index_data_enricher.ts b/x-pack/plugins/index_management/server/services/index_data_enricher.ts
index 532485201b99e..bf49d8cc5ae37 100644
--- a/x-pack/plugins/index_management/server/services/index_data_enricher.ts
+++ b/x-pack/plugins/index_management/server/services/index_data_enricher.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { Index } from '../index';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { Index } from '..';
 
 export type Enricher = (indices: Index[], client: IScopedClusterClient) => Promise<Index[]>;
 
diff --git a/x-pack/plugins/index_management/server/shared_imports.ts b/x-pack/plugins/index_management/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/index_management/server/shared_imports.ts
+++ b/x-pack/plugins/index_management/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/index_management/server/test/helpers/router_mock.ts b/x-pack/plugins/index_management/server/test/helpers/router_mock.ts
index 92aef94570fc8..65536f34d6290 100644
--- a/x-pack/plugins/index_management/server/test/helpers/router_mock.ts
+++ b/x-pack/plugins/index_management/server/test/helpers/router_mock.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { IRouter } from 'src/core/server';
+import type { IRouter } from '@kbn/core/server';
 import { get } from 'lodash';
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type RequestHandler = (...params: any[]) => any;
 
diff --git a/x-pack/plugins/index_management/server/types.ts b/x-pack/plugins/index_management/server/types.ts
index ba40d22f2eafc..fc245fb664f9c 100644
--- a/x-pack/plugins/index_management/server/types.ts
+++ b/x-pack/plugins/index_management/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { IndexDataEnricher } from './services';
 import { handleEsError } from './shared_imports';
 
diff --git a/x-pack/plugins/index_management/test/global_mocks.tsx b/x-pack/plugins/index_management/test/global_mocks.tsx
index 342d74bce853e..5fe9f3c28c301 100644
--- a/x-pack/plugins/index_management/test/global_mocks.tsx
+++ b/x-pack/plugins/index_management/test/global_mocks.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 // is imported. Typically this means just importing above your other imports.
 // See https://jestjs.io/docs/manual-mocks for more info.
 
-jest.mock('../../../../src/plugins/es_ui_shared/public', () => {
-  const original = jest.requireActual('../../../../src/plugins/es_ui_shared/public');
+jest.mock('@kbn/es-ui-shared-plugin/public', () => {
+  const original = jest.requireActual('@kbn/es-ui-shared-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts b/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts
index b6d09e1004a70..9fbb5fa9e4e98 100644
--- a/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts
+++ b/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts
@@ -8,7 +8,7 @@
 import { ALERT_RULE_PARAMETERS, TIMESTAMP } from '@kbn/rule-data-utils';
 import { encode } from 'rison-node';
 import { stringify } from 'query-string';
-import { ParsedTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
 
 export const getInventoryViewInAppUrl = (
   fields: ParsedTechnicalFields & Record<string, any>
diff --git a/x-pack/plugins/infra/common/alerting/metrics/types.ts b/x-pack/plugins/infra/common/alerting/metrics/types.ts
index 6a29d5c16e65c..60c01beacd158 100644
--- a/x-pack/plugins/infra/common/alerting/metrics/types.ts
+++ b/x-pack/plugins/infra/common/alerting/metrics/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import * as rt from 'io-ts';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import { SnapshotCustomMetricInput } from '../../http_api';
 import { ANOMALY_THRESHOLD } from '../../infra_ml';
 import { InventoryItemType, SnapshotMetricType } from '../../inventory_models/types';
-import { TimeUnitChar } from '../../../../observability/common/utils/formatters/duration';
 
 export const METRIC_THRESHOLD_ALERT_TYPE_ID = 'metrics.alert.threshold';
 export const METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID = 'metrics.alert.inventory.threshold';
diff --git a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
index cb0fd2a3047d7..80c0f324e793f 100644
--- a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
+++ b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
@@ -8,8 +8,8 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { firstValueFrom, from, of } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/common';
-import { fieldList, FieldSpec } from '../../../../../src/plugins/data/common';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/common';
+import { fieldList, FieldSpec } from '@kbn/data-plugin/common';
 
 type IndexPatternMock = Pick<
   DataView,
diff --git a/x-pack/plugins/infra/common/http_api/metadata_api.ts b/x-pack/plugins/infra/common/http_api/metadata_api.ts
index 0f847f19f75d3..66d1d01f8175d 100644
--- a/x-pack/plugins/infra/common/http_api/metadata_api.ts
+++ b/x-pack/plugins/infra/common/http_api/metadata_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { ItemTypeRT } from '../../common/inventory_models/types';
+import { ItemTypeRT } from '../inventory_models/types';
 
 export const InfraMetadataRequestRT = rt.type({
   nodeId: rt.string,
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
index 1125c725f9e9a..4d676dfce8ecb 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../public/pages/metrics/metric_detail/componen
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
index ba533592003d3..96d82343f593c 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../public/pages/metrics/metric_detail/components/
 import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
index 1568665093d3c..d068748f134a5 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../public/pages/metrics/metric_detail/components/
 import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
index 7e9eae66eb136..a06e5b0bb1add 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../public/pages/metrics/metric_detail/components/
 import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/container/layout.tsx b/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
index be85804342cbd..11a84abe1bf67 100644
--- a/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../public/pages/metrics/metric_detail/componen
 import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
diff --git a/x-pack/plugins/infra/common/inventory_models/host/layout.tsx b/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
index c28a29f9c0751..0f634048a5a8b 100644
--- a/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
diff --git a/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx b/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
index 7eae83cd1cb66..88c5a25d17b9d 100644
--- a/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../public/pages/metrics/metric_detail/componen
 import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 import * as Nginx from '../shared/layouts/nginx';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
diff --git a/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx b/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx
index 5223e287d07e2..8a8964f121f03 100644
--- a/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../../public/pages/metrics/metric_detail/compo
 import { GaugesSectionVis } from '../../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../../src/plugins/kibana_react/common';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
diff --git a/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx b/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx
index d3f69fac6df32..d679a596d51e3 100644
--- a/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../../public/pages/metrics/metric_detail/componen
 import { SubSection } from '../../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../../src/plugins/kibana_react/common';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
diff --git a/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts b/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts
index a951f88f0c2a5..268b2f692f62a 100644
--- a/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts
+++ b/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DataViewsContract, fieldList } from 'src/plugins/data_views/common';
-import { createStubDataView } from 'src/plugins/data_views/common/stubs';
+import { DataViewsContract, fieldList } from '@kbn/data-views-plugin/common';
+import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
 import { defaultLogViewsStaticConfig } from './defaults';
 import { ResolvedLogView, resolveLogView } from './resolved_log_view';
 import { LogViewAttributes } from './types';
diff --git a/x-pack/plugins/infra/common/log_views/resolved_log_view.ts b/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
index 19369a022a923..d7e155172a57e 100644
--- a/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
+++ b/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
@@ -6,11 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import {
-  DataView,
-  DataViewsContract,
-  FieldSpec,
-} from '../../../../../src/plugins/data_views/common';
+import { DataView, DataViewsContract, FieldSpec } from '@kbn/data-views-plugin/common';
 import { TIEBREAKER_FIELD, TIMESTAMP_FIELD } from '../constants';
 import { ResolveLogViewError } from './errors';
 import { LogViewAttributes, LogViewColumnConfiguration, LogViewsStaticConfig } from './types';
diff --git a/x-pack/plugins/infra/common/runtime_types.ts b/x-pack/plugins/infra/common/runtime_types.ts
index 223a22ca0ed05..d77caa52c3c98 100644
--- a/x-pack/plugins/infra/common/runtime_types.ts
+++ b/x-pack/plugins/infra/common/runtime_types.ts
@@ -10,7 +10,7 @@ import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Context, Errors, IntersectionType, Type, UnionType, ValidationError } from 'io-ts';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { RouteValidationFunction } from 'kibana/server';
+import type { RouteValidationFunction } from '@kbn/core/server';
 
 type ErrorFactory = (message: string) => Error;
 
diff --git a/x-pack/plugins/infra/common/saved_objects/inventory_view.ts b/x-pack/plugins/infra/common/saved_objects/inventory_view.ts
index 9f7984f9c40e4..4921f38853d12 100644
--- a/x-pack/plugins/infra/common/saved_objects/inventory_view.ts
+++ b/x-pack/plugins/infra/common/saved_objects/inventory_view.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const inventoryViewSavedObjectName = 'inventory-view';
 
diff --git a/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts b/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
index b77f9643b3c91..71b7887263989 100644
--- a/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
+++ b/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const metricsExplorerViewSavedObjectName = 'metrics-explorer-view';
 
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index c2a04c7a0ff39..2eec94187900f 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -27,7 +27,6 @@
     "licenseManagement",
     "kibanaUtils",
     "kibanaReact",
-    "home",
     "ml",
     "embeddable"
   ],
diff --git a/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
index 07249d15eccee..f429a743250c8 100644
--- a/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
@@ -14,7 +14,7 @@ import {
   EuiContextMenuPanelDescriptor,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PrefilledInventoryAlertFlyout } from '../../inventory/components/alert_flyout';
 import { PrefilledThresholdAlertFlyout } from '../../metric_threshold/components/alert_flyout';
 import { InfraClientStartDeps } from '../../../types';
diff --git a/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx b/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
index 5a162ef1d6941..a7ed12eda1ed7 100644
--- a/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
@@ -14,7 +14,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo, useState } from 'react';
-import { FieldSpec } from 'src/plugins/data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 import { GroupBySelector } from './selector';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx b/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
index 4e5a574d67e9b..dc7e02f7d782f 100644
--- a/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
@@ -7,7 +7,7 @@
 
 import { EuiComboBox } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
-import { FieldSpec } from 'src/plugins/data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 
 interface Props {
   selectedGroups?: string[];
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
index c0a475ea8029b..9f30a7c9980db 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
@@ -11,7 +11,7 @@ import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { InfraWaffleMapOptions } from '../../../lib/lib';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
-import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
+import { useAlertPrefillContext } from '../../use_alert_prefill';
 
 interface Props {
   visible?: boolean;
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
index d34f6b369b2df..591014472d81a 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
@@ -9,10 +9,11 @@ import { mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import { Comparator, InventoryMetricConditions } from '../../../../common/alerting/metrics';
 import { SnapshotCustomMetricInput } from '../../../../common/http_api/snapshot_api';
 import { AlertContextMeta, defaultExpression, ExpressionRow, Expressions } from './expression';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('../../../containers/metrics_source/use_source_via_http', () => ({
   useSourceViaHttp: () => ({
@@ -34,6 +35,8 @@ const exampleCustomMetric = {
   type: 'custom',
 } as SnapshotCustomMetricInput;
 
+const dataViewMock = dataViewPluginMocks.createStartContract();
+
 describe('Expression', () => {
   async function setup(currentOptions: AlertContextMeta) {
     const ruleParams = {
@@ -51,6 +54,7 @@ describe('Expression', () => {
         setRuleParams={(key, value) => Reflect.set(ruleParams, key, value)}
         setRuleProperty={() => {}}
         metadata={currentOptions}
+        dataViews={dataViewMock}
       />
     );
 
@@ -116,6 +120,7 @@ describe('Expression', () => {
         setRuleParams={(key, value) => Reflect.set(ruleParams, key, value)}
         setRuleProperty={() => {}}
         metadata={{}}
+        dataViews={dataViewMock}
       />
     );
 
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
index 05396f780aefe..6db6587f2b475 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -22,13 +22,14 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce, omit } from 'lodash';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   ForLastExpression,
   IErrorObject,
   RuleTypeParamsExpressionProps,
   ThresholdExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import {
   Comparator,
   FilterQuery,
@@ -62,7 +63,6 @@ import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
 import { ExpressionChart } from './expression_chart';
 import { MetricExpression } from './metric';
 import { NodeTypeExpression } from './node_type';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
index c35335afe493f..dccd03414f3d5 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
@@ -8,7 +8,7 @@
 import { EuiContextMenuItem } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { InfraClientStartDeps } from '../../../types';
 
 export const ManageAlertsContextMenuItem = () => {
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
index ba5316cbcfebd..d5796ec45d107 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import { IErrorObject } from '../../../../../triggers_actions_ui/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label';
 import {
   SnapshotCustomAggregation,
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
index e093ea789cf79..5a3415be429ca 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ValidationResult } from '../../../../../triggers_actions_ui/public';
+import type { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   FilterQuery,
diff --git a/x-pack/plugins/infra/public/alerting/inventory/index.ts b/x-pack/plugins/infra/public/alerting/inventory/index.ts
index 300832d8a47ed..c9b825340496a 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/index.ts
+++ b/x-pack/plugins/infra/public/alerting/inventory/index.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { RuleTypeParams } from '../../../../alerting/common';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import {
   InventoryMetricConditions,
   METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
diff --git a/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts
index a419bef9f6c76..001e96d9961fd 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts
+++ b/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import { ObservabilityRuleTypeFormatter } from '@kbn/observability-plugin/public';
 import { getInventoryViewInAppUrl } from '../../../common/alerting/metrics/alert_link';
 
 export const formatReason: ObservabilityRuleTypeFormatter = ({ fields }) => {
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
index 2c279f6413353..34551ca1fae0b 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
@@ -21,7 +21,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { isFinite, isNumber } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import type { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import type { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   ComparatorToi18nMap,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
index 2188454c80b13..5ffefdd57119e 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/charts';
 import { EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   ChartContainer,
   LoadingState,
@@ -44,7 +44,7 @@ import { Color, colorTransformer } from '../../../../../common/color_palette';
 import {
   GetLogAlertsChartPreviewDataAlertParamsSubset,
   getLogAlertsChartPreviewDataAlertParamsSubsetRT,
-} from '../../../../../common/http_api/log_alerts/';
+} from '../../../../../common/http_api/log_alerts';
 import { useChartPreviewData } from './hooks/use_chart_preview_data';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import { useKibanaTimeZoneSetting } from '../../../../hooks/use_kibana_time_zone_setting';
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
index 920c3cbf1e873..a5affb24cd843 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
@@ -9,11 +9,11 @@ import { EuiButton, EuiCallOut, EuiLoadingSpinner, EuiSpacer } from '@elastic/eu
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useMemo, useState } from 'react';
 import useMount from 'react-use/lib/useMount';
-import { ResolvedLogViewField } from '../../../../../common/log_views';
 import {
   ForLastExpression,
   RuleTypeParamsExpressionProps,
-} from '../../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { ResolvedLogViewField } from '../../../../../common/log_views';
 import {
   Comparator,
   isOptimizableGroupedThreshold,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
index 1568b5f0b7898..9b9dc501e1591 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
@@ -6,8 +6,8 @@
  */
 
 import { useState, useMemo } from 'react';
-import { HttpHandler } from 'kibana/public';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { HttpHandler } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useTrackedPromise } from '../../../../../utils/use_tracked_promise';
 import {
   GetLogAlertsChartPreviewDataSuccessResponsePayload,
@@ -16,7 +16,7 @@ import {
   LOG_ALERTS_CHART_PREVIEW_DATA_PATH,
 } from '../../../../../../common/http_api';
 import { decodeOrThrow } from '../../../../../../common/runtime_types';
-import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../common/http_api/log_alerts/';
+import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../common/http_api/log_alerts';
 
 interface Options {
   sourceId: string;
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
index 6b3023123cd8c..40eb6f2a2076a 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
@@ -18,7 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { isFinite, isNumber } from 'lodash';
 import React, { useState } from 'react';
-import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   ComparatorToi18nMap,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx
index 7d89dac681743..fa32b92806dcd 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import {
   LOG_DOCUMENT_COUNT_RULE_TYPE_ID,
   PartialRuleParams,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
index 888646856e119..3fc9f6752da1a 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_REASON, ALERT_START } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import { ObservabilityRuleTypeFormatter } from '@kbn/observability-plugin/public';
 import { getLogsAppAlertUrl } from '../../../common/formatters/alert_link';
 
 export const formatRuleData: ObservabilityRuleTypeFormatter = ({ fields }) => {
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
index 740805006785b..59cae9c53c7ff 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import * as rt from 'io-ts';
 import { isNumber, isFinite } from 'lodash';
-import { IErrorObject, ValidationResult } from '../../../../triggers_actions_ui/public';
+import { IErrorObject, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   PartialCountCriteria,
   isRatioRule,
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
index e0e9946b1c789..705ab03d5a500 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
@@ -11,7 +11,7 @@ import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { InfraWaffleMapOptions } from '../../../lib/lib';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
-import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
+import { useAlertPrefillContext } from '../../use_alert_prefill';
 
 interface Props {
   visible?: boolean;
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx
index e40c72171f72b..f18f3752b2745 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx
@@ -7,10 +7,11 @@
 
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import React from 'react';
 import { Expression, AlertContextMeta } from './expression';
 import { act } from 'react-dom/test-utils';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('../../../containers/metrics_source/use_source_via_http', () => ({
   useSourceViaHttp: () => ({
@@ -38,6 +39,8 @@ jest.mock('../../../containers/ml/infra_ml_capabilities', () => ({
   }),
 }));
 
+const dataViewMock = dataViewPluginMocks.createStartContract();
+
 describe('Expression', () => {
   async function setup(currentOptions: AlertContextMeta) {
     const ruleParams = {
@@ -55,6 +58,7 @@ describe('Expression', () => {
         setRuleParams={(key, value) => Reflect.set(ruleParams, key, value)}
         setRuleProperty={() => {}}
         metadata={currentOptions}
+        dataViews={dataViewMock}
       />
     );
 
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
index bd4f0de2bfec2..74affe264027b 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
@@ -9,12 +9,12 @@ import { EuiFlexGroup, EuiLoadingContent, EuiSpacer, EuiText } from '@elastic/eu
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { euiStyled, EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   RuleTypeParams,
   RuleTypeParamsExpressionProps,
   WhenExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { MetricAnomalyParams } from '../../../../common/alerting/metrics';
 import { ANOMALY_THRESHOLD } from '../../../../common/infra_ml';
 import { findInventoryModel } from '../../../../common/inventory_models';
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx
index a4eda632b2fdd..fa278674d55e8 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ValidationResult } from '../../../../../triggers_actions_ui/public';
+import type { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 
 export function validateMetricAnomaly({
   hasInfraMLCapabilities,
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts b/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts
index 7591f2e35d59e..2dfee3891b86b 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../common/alerting/metrics';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
-import { RuleTypeParams } from '../../../../alerting/common';
 import { validateMetricAnomaly } from './components/validation';
 
 interface MetricAnomalyRuleTypeParams extends RuleTypeParams {
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
index 642b7dbf079c0..3fb06d38e3088 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
@@ -10,7 +10,7 @@ import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { METRIC_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { MetricsExplorerSeries } from '../../../../common/http_api/metrics_explorer';
 import { MetricsExplorerOptions } from '../../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
-import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
+import { useAlertPrefillContext } from '../../use_alert_prefill';
 
 interface Props {
   visible?: boolean;
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
index 309808bf48352..02f8f59c174e1 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
@@ -9,10 +9,11 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import { Comparator } from '../../../../common/alerting/metrics';
 import { MetricsExplorerMetric } from '../../../../common/http_api/metrics_explorer';
 import { Expressions } from './expression';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('../../../containers/metrics_source/use_source_via_http', () => ({
   useSourceViaHttp: () => ({
@@ -27,6 +28,8 @@ jest.mock('../../../hooks/use_kibana', () => ({
   }),
 }));
 
+const dataViewMock = dataViewPluginMocks.createStartContract();
+
 describe('Expression', () => {
   async function setup(currentOptions: {
     metrics?: MetricsExplorerMetric[];
@@ -51,6 +54,7 @@ describe('Expression', () => {
         metadata={{
           currentOptions,
         }}
+        dataViews={dataViewMock}
       />
     );
 
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
index c7cb031b75516..7b332a2a4ce8a 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -26,7 +26,8 @@ import {
   IErrorObject,
   RuleTypeParams,
   RuleTypeParamsExpressionProps,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import { Aggregators, Comparator, QUERY_INVALID } from '../../../../common/alerting/metrics';
 import { useSourceViaHttp } from '../../../containers/metrics_source/use_source_via_http';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
@@ -37,7 +38,6 @@ import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
 import { AlertContextMeta, AlertParams, MetricExpression } from '../types';
 import { ExpressionChart } from './expression_chart';
 import { ExpressionRow } from './expression_row';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
 type Props = Omit<
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
index e5c6e1a4d8984..d9db49192d5c4 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
@@ -10,7 +10,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import { Aggregators, Comparator } from '../../../../common/alerting/metrics';
 import { MetricsSourceConfiguration } from '../../../../common/metrics_sources';
 import { MetricExpression } from '../types';
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
index 6f1d1ed6e12c0..2209e1810a788 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
@@ -18,14 +18,14 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { omit } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   builtInComparators,
   IErrorObject,
   OfExpression,
   ThresholdExpression,
   WhenExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { Comparator } from '../../../../common/alerting/metrics';
 import { decimalToPct, pctToDecimal } from '../../../../common/utils/corrected_percent_convert';
 import { DerivedIndexPattern } from '../../../containers/metrics_source';
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
index 8634c3686087f..bc75b2512fbc1 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ValidationResult } from '../../../../../triggers_actions_ui/public';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   FilterQuery,
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts
index 39b632b82fd97..c707d98f36227 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { RuleTypeParams } from '../../../../alerting/common';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import {
   MetricExpressionParams,
   METRIC_THRESHOLD_ALERT_TYPE_ID,
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts
index 268d0d2113381..a377396b5eb89 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import { ObservabilityRuleTypeFormatter } from '@kbn/observability-plugin/public';
 import { LINK_TO_METRICS_EXPLORER } from '../../../common/alerting/metrics';
 export const formatReason: ObservabilityRuleTypeFormatter = ({ fields }) => {
   const reason = fields[ALERT_REASON] ?? '-';
diff --git a/x-pack/plugins/infra/public/apps/common_providers.tsx b/x-pack/plugins/infra/public/apps/common_providers.tsx
index 2463485137ba3..a1d1b1b7c4dd2 100644
--- a/x-pack/plugins/infra/public/apps/common_providers.tsx
+++ b/x-pack/plugins/infra/public/apps/common_providers.tsx
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import { NavigationWarningPromptProvider } from '../../../observability/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
+} from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { NavigationWarningPromptProvider } from '@kbn/observability-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { useKibanaContextForPluginProvider } from '../hooks/use_kibana';
 import { InfraClientStartDeps, InfraClientStartExports } from '../types';
 import { HeaderActionMenuProvider } from '../utils/header_action_menu_provider';
diff --git a/x-pack/plugins/infra/public/apps/common_styles.ts b/x-pack/plugins/infra/public/apps/common_styles.ts
index 68c820d538ca9..acc5156121292 100644
--- a/x-pack/plugins/infra/public/apps/common_styles.ts
+++ b/x-pack/plugins/infra/public/apps/common_styles.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export const CONTAINER_CLASSNAME = 'infra-container-element';
 
diff --git a/x-pack/plugins/infra/public/apps/legacy_app.tsx b/x-pack/plugins/infra/public/apps/legacy_app.tsx
index 8aeb99c426651..d444225a4070d 100644
--- a/x-pack/plugins/infra/public/apps/legacy_app.tsx
+++ b/x-pack/plugins/infra/public/apps/legacy_app.tsx
@@ -7,7 +7,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import { createBrowserHistory, History } from 'history';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, RouteProps, Router, Switch } from 'react-router-dom';
diff --git a/x-pack/plugins/infra/public/apps/logs_app.tsx b/x-pack/plugins/infra/public/apps/logs_app.tsx
index fd507ef822893..0b345150daf8d 100644
--- a/x-pack/plugins/infra/public/apps/logs_app.tsx
+++ b/x-pack/plugins/infra/public/apps/logs_app.tsx
@@ -6,12 +6,12 @@
  */
 
 import { History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import { AppMountParameters } from '../../../../../src/core/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import '../index.scss';
 import { NotFoundPage } from '../pages/404';
 import { LinkToLogsPage } from '../pages/link_to/link_to_logs';
diff --git a/x-pack/plugins/infra/public/apps/metrics_app.tsx b/x-pack/plugins/infra/public/apps/metrics_app.tsx
index 7aeb56369cd00..2fe724e0cfb15 100644
--- a/x-pack/plugins/infra/public/apps/metrics_app.tsx
+++ b/x-pack/plugins/infra/public/apps/metrics_app.tsx
@@ -6,12 +6,12 @@
  */
 
 import { History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import { AppMountParameters } from '../../../../../src/core/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import '../index.scss';
 import { NotFoundPage } from '../pages/404';
 import { LinkToMetricsPage } from '../pages/link_to/link_to_metrics';
diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx b/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
index 4aa0edb406856..d54b12511a05c 100644
--- a/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
+++ b/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
@@ -7,8 +7,8 @@
 
 import { EuiFieldSearch, EuiOutsideClickDetector, EuiPanel } from '@elastic/eui';
 import React from 'react';
-import { QuerySuggestion } from '../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { QuerySuggestion } from '@kbn/unified-search-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { composeStateUpdaters } from '../../utils/typed_react';
 import { SuggestionItem } from './suggestion_item';
 
diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
index 3681bf26987cc..a317ad3ecff5e 100644
--- a/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
+++ b/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import React from 'react';
 import { EuiIcon } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/unified-search-plugin/public';
 import { transparentize } from 'polished';
-import React from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../../../../src/plugins/data/public';
 
 interface Props {
   isSelected?: boolean;
diff --git a/x-pack/plugins/infra/public/components/centered_flyout_body.tsx b/x-pack/plugins/infra/public/components/centered_flyout_body.tsx
index 981f9319bf5a1..57bda793eeafb 100644
--- a/x-pack/plugins/infra/public/components/centered_flyout_body.tsx
+++ b/x-pack/plugins/infra/public/components/centered_flyout_body.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiFlyoutBody } from '@elastic/eui';
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const CenteredEuiFlyoutBody = euiStyled(EuiFlyoutBody)`
   & .euiFlyoutBody__overflow {
diff --git a/x-pack/plugins/infra/public/components/empty_states/no_data.tsx b/x-pack/plugins/infra/public/components/empty_states/no_data.tsx
index a743ad9fbf273..cdcb86c86074b 100644
--- a/x-pack/plugins/infra/public/components/empty_states/no_data.tsx
+++ b/x-pack/plugins/infra/public/components/empty_states/no_data.tsx
@@ -8,7 +8,7 @@
 import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface NoDataProps {
   titleText: string;
diff --git a/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx b/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx
index f1a793d11166c..95f45562c6241 100644
--- a/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx
+++ b/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx
@@ -8,7 +8,7 @@
 import { EuiPanel } from '@elastic/eui';
 import { FunctionComponent } from 'react';
 import { StyledComponent } from 'styled-components';
-import { euiStyled, EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 // The return type of this component needs to be specified because the inferred
 // return type depends on types that are not exported from EUI. You get a TS4023
diff --git a/x-pack/plugins/infra/public/components/fixed_datepicker.tsx b/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
index dfaf0a490225a..2d11fd155aa28 100644
--- a/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
+++ b/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
@@ -8,7 +8,7 @@
 import { EuiDatePicker, EuiDatePickerProps } from '@elastic/eui';
 import React, { FunctionComponent } from 'react';
 import { StyledComponent } from 'styled-components';
-import { euiStyled, EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled, EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 // The return type of this component needs to be specified because the inferred
 // return type depends on types that are not exported from EUI. You get a TS4023
diff --git a/x-pack/plugins/infra/public/components/help_center_content.tsx b/x-pack/plugins/infra/public/components/help_center_content.tsx
index 8d1b489e7e542..76b8475dc7d42 100644
--- a/x-pack/plugins/infra/public/components/help_center_content.tsx
+++ b/x-pack/plugins/infra/public/components/help_center_content.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useEffect } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface HelpCenterContentProps {
   feedbackLink: string;
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx
index 44bfa1be3e331..9b4d3938e7d4c 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCard } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Meta } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { decorateWithGlobalStorybookThemeProviders } from '../../../test_utils/use_global_storybook_theme';
 import { ContainerMetricsTable } from './container_metrics_table';
 import type { ContainerMetricsTableProps } from './container_metrics_table';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx
index baec88e65c854..6da64bdb58805 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx
@@ -7,7 +7,7 @@
 
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import type { HttpFetchOptions } from '../../../../../../../src/core/public';
+import type { HttpFetchOptions } from '@kbn/core/public';
 import type {
   DataResponseMock,
   NodeMetricsTableFetchMock,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx
index 5c80223e31e1c..862d55a45c094 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCard } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Meta } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { decorateWithGlobalStorybookThemeProviders } from '../../../test_utils/use_global_storybook_theme';
 import { HostMetricsTable } from './host_metrics_table';
 import type { HostMetricsTableProps } from './host_metrics_table';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx
index 63b6b87202776..5648c077a527a 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx
@@ -7,7 +7,7 @@
 
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import type { HttpFetchOptions } from '../../../../../../../src/core/public';
+import type { HttpFetchOptions } from '@kbn/core/public';
 import type {
   DataResponseMock,
   NodeMetricsTableFetchMock,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx
index 50a9a95f8b73e..44e7779a0f680 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCard } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Meta } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { decorateWithGlobalStorybookThemeProviders } from '../../../test_utils/use_global_storybook_theme';
 import { PodMetricsTable } from './pod_metrics_table';
 import type { PodMetricsTableProps } from './pod_metrics_table';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx
index 21d26bd42827c..a27b3d59eefb2 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx
@@ -7,7 +7,7 @@
 
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import type { HttpFetchOptions } from '../../../../../../../src/core/public';
+import type { HttpFetchOptions } from '@kbn/core/public';
 import type {
   DataResponseMock,
   NodeMetricsTableFetchMock,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx
index cb83afbc10e3f..93c591d3e5ec8 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx
@@ -8,7 +8,7 @@
 import { parse } from '@kbn/datemath';
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
-import { useLinkProps } from '../../../../../../observability/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import type { InventoryItemType } from '../../../../../common/inventory_models/types';
 import { getNodeDetailUrl } from '../../../../pages/link_to';
 import type { MetricsExplorerTimeOptions } from '../../../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx
index 71305061ccb55..41a4013ef08ca 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPagination } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface CursorPaginationProps {
   ariaLabel: string;
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts
index f3daa1b429aca..e165ee4d6ac48 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts
@@ -8,7 +8,7 @@
 import { parse } from '@kbn/datemath';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { useEffect, useMemo, useState } from 'react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type {
   MetricsExplorerResponse,
   MetricsExplorerSeries,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts
index 5509e59266ec4..b4c5639b00711 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts
@@ -6,8 +6,8 @@
  */
 
 import { DeepPartial } from 'utility-types';
-import type { HttpFetchOptions } from '../../../../../../src/core/public';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import type { HttpFetchOptions } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { MetricsExplorerResponse } from '../../../common/http_api/metrics_explorer';
 import type { MetricsSourceConfigurationResponse } from '../../../common/metrics_sources';
 import type { CoreProvidersProps } from '../../apps/common_providers';
diff --git a/x-pack/plugins/infra/public/components/loading/index.tsx b/x-pack/plugins/infra/public/components/loading/index.tsx
index aba4df1c472ab..b4d8a4867c71e 100644
--- a/x-pack/plugins/infra/public/components/loading/index.tsx
+++ b/x-pack/plugins/infra/public/components/loading/index.tsx
@@ -8,7 +8,7 @@
 import { EuiLoadingChart, EuiPanel, EuiText } from '@elastic/eui';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface InfraLoadingProps {
   text: string | JSX.Element;
diff --git a/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx b/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx
index 9c84ac4ba8da3..fb5776c7ecc07 100644
--- a/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx
+++ b/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx
@@ -9,7 +9,7 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import { transparentize } from 'polished';
 import React from 'react';
 
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const LoadingOverlayWrapper: React.FC<
   React.HTMLAttributes<HTMLDivElement> & {
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx
index d8c9b0ac4fac0..083c8401dd6fa 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx
@@ -13,14 +13,14 @@ import {
   ENHANCED_ES_SEARCH_STRATEGY,
   ES_SEARCH_STRATEGY,
   FieldSpec,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import {
   IEsSearchResponse,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
   ISearchOptions,
-} from '../../../../../../src/plugins/data/public';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { getLogViewResponsePayloadRT } from '../../../common/http_api/log_views';
 import { defaultLogViewAttributes } from '../../../common/log_views';
 import {
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
index 9561e7b684657..109451697aca8 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
@@ -9,9 +9,9 @@ import { buildEsQuery, Filter, Query } from '@kbn/es-query';
 import { JsonValue } from '@kbn/utility-types';
 import { noop } from 'lodash';
 import React, { useCallback, useEffect, useMemo } from 'react';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { LogEntryCursor } from '../../../common/log_entry';
 import { defaultLogViewsStaticConfig } from '../../../common/log_views';
 import { BuiltEsQuery, useLogStream } from '../../containers/logs/log_stream';
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
index a834bc0af02a8..2cdc7c803b93d 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
@@ -6,17 +6,13 @@
  */
 
 import { Query, Filter } from '@kbn/es-query';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
-import { TimeRange } from '../../../../../../src/plugins/data/public';
-import {
-  Embeddable,
-  EmbeddableInput,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { Embeddable, EmbeddableInput, IContainer } from '@kbn/embeddable-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { CoreProviders } from '../../apps/common_providers';
 import { InfraClientStartDeps, InfraClientStartExports } from '../../types';
 import { datemathToEpochMillis } from '../../utils/datemath';
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts
index 10ca4c942cce3..3d472654c0860 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { InfraClientStartServicesAccessor } from '../../types';
 import {
   LogStreamEmbeddable,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx
index 170764f917abb..cc218953e33f9 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx
@@ -17,7 +17,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { groupBy } from 'lodash';
 import React, { Fragment, useState } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   CategoryQualityWarning,
   CategoryQualityWarningReason,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
index 1e6556065ae44..a0ec73133839b 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
@@ -8,8 +8,8 @@
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
+import { shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-import { shouldHandleLinkEvent } from '../../../../../observability/public';
 
 export const AnalyzeInMlButton: React.FunctionComponent<{
   href?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
index 20fe816d1dab2..87ab4eaa4d627 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
@@ -7,7 +7,7 @@
 
 import { EuiHealth } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { getFormattedSeverityScore } from '../../../../../ml/public';
+import { getFormattedSeverityScore } from '@kbn/ml-plugin/public';
 import { getSeverityCategoryForScore, ML_SEVERITY_COLORS } from '../../../../common/log_analysis';
 
 export const AnomalySeverityIndicator: React.FunctionComponent<{
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
index b07a22b9eeb35..849b8cdaa4546 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { memo } from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const RegularExpressionRepresentation: React.FunctionComponent<{
   maximumSegmentCount?: number;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx
index d1514301ebde8..97eeeabe8721b 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx
@@ -7,7 +7,7 @@
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   missingMlPrivilegesTitle,
   missingMlResultsPrivilegesDescription,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx
index 709dbf0bdc111..f959c5035d1a4 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx
@@ -7,7 +7,7 @@
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   missingMlPrivilegesTitle,
   missingMlSetupPrivilegesDescription,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
index 1d013b65c5b22..c772d5d268865 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const MlUnavailablePrompt: React.FunctionComponent<{}> = () => (
   <EmptyPrompt
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx
index 0731801094703..0a455b80dbe5e 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useEffect, useState } from 'react';
 import { SetupStatus } from '../../../../../common/log_analysis';
 import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
-import { CreateJobButton, RecreateJobButton } from '../../log_analysis_setup/create_job_button';
+import { CreateJobButton, RecreateJobButton } from '../create_job_button';
 
 export const LogAnalysisModuleListCard: React.FC<{
   jobId: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
index bf11c22bde995..f9430570004ba 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface Props {
   retry: () => void;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
index 206db81193967..14d69ac6c9fd1 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
@@ -8,7 +8,7 @@
 import { EuiButton, EuiButtonProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { useLinkProps } from '../../../../../observability/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 
 export const UserManagementLink: React.FunctionComponent<EuiButtonProps> = (props) => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx
index 3820327030bba..bae2ab06b7dca 100644
--- a/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx
@@ -9,7 +9,7 @@ import { EuiButtonEmpty, EuiPopover } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface LogCustomizationMenuState {
   isShown: boolean;
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx
index 506c09bcfc6b9..ed2546d9b8d67 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryExampleMessagesEmptyIndicator } from './log_entry_examples_empty_indicator';
 import { LogEntryExampleMessagesFailureIndicator } from './log_entry_examples_failure_indicator';
 import { LogEntryExampleMessagesLoadingIndicator } from './log_entry_examples_loading_indicator';
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
index de3a7bb0f323a..8bc4e5f16cf81 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
@@ -11,8 +11,8 @@ import { act } from 'react-dom/test-utils';
 
 import { mount } from 'enzyme';
 import { LogEntryActionsMenu } from './log_entry_actions_menu';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const coreStartMock = coreMock.createStart();
 coreStartMock.application.getUrlForApp.mockImplementation((app, options) => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
index e1b3a39fd65e9..a72b74d267115 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
@@ -8,9 +8,9 @@
 import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useMemo } from 'react';
+import { getApmTraceUrl } from '@kbn/observability-plugin/public';
+import { useLinkProps, LinkDescriptor } from '@kbn/observability-plugin/public';
 import { useVisibilityState } from '../../../utils/use_visibility_state';
-import { getApmTraceUrl } from '../../../../../observability/public';
-import { useLinkProps, LinkDescriptor } from '../../../../../observability/public';
 import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';
 
 const UPTIME_FIELDS = ['container.id', 'host.ip', 'kubernetes.pod.uid'];
diff --git a/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
index 79425a6ec913f..2fc287d405d6a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
@@ -19,7 +19,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useVisibilityState } from '../../utils/use_visibility_state';
 
 interface LogHighlightsMenuProps {
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
index d85459d3dae8d..0d2133e0bd6fc 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
@@ -10,7 +10,7 @@ import { area, curveMonotoneY } from 'd3-shape';
 import { max } from 'lodash';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntriesSummaryBucket } from '../../../../common/http_api';
 
 interface DensityChartProps {
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx
index ab289f17df38f..f08d7a8ab579b 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface HighlightedIntervalProps {
   className?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
index b0ee59d5d3bea..a43da182f656f 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
@@ -8,7 +8,7 @@
 import { scaleLinear } from 'd3-scale';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryTime } from '../../../../common/log_entry';
 import { DensityChart } from './density_chart';
 import { HighlightedInterval } from './highlighted_interval';
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx
index 9006aa1d1b6d8..9687cc302e1ef 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx
@@ -8,7 +8,7 @@
 import { FormattedMessage } from '@kbn/i18n-react';
 import * as React from 'react';
 
-import { euiStyled, keyframes } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, keyframes } from '@kbn/kibana-react-plugin/common';
 import { LogEntryTime } from '../../../../common/log_entry';
 import { SearchMarkerTooltip } from './search_marker_tooltip';
 import { LogEntriesSummaryHighlightsBucket } from '../../../../common/http_api';
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
index 6588d87982cf4..11be87ce295a1 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
@@ -8,7 +8,7 @@
 import { scaleTime } from 'd3-scale';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { getTimeLabelFormat } from './time_label_formatter';
 
 interface TimeRulerProps {
diff --git a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx
index 28a5aa0152cb1..471b6c75a652a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import classNames from 'classnames';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface LogSearchInputProps {
   className?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx b/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
index ab4d763ab1f95..dafa60696abd0 100644
--- a/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
@@ -8,8 +8,8 @@
 import { EuiButton, EuiButtonEmpty, EuiCallOut, EuiEmptyPrompt, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/common';
-import { useLinkProps } from '../../../../observability/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import {
   FetchLogViewStatusError,
   FetchLogViewError,
diff --git a/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx b/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx
index e78c6970653c7..45020d9aaca14 100644
--- a/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const LogStatusbar = euiStyled(EuiFlexGroup).attrs(() => ({
   alignItems: 'center',
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
index 477fbb31bf81f..d8c1fe071fe92 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { transparentize } from 'polished';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   LogEntryColumn,
   LogEntryColumnContent,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx
index e52d302a9193f..91b5406ebb6bc 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx
@@ -8,7 +8,7 @@
 import stringify from 'json-stable-stringify';
 import React from 'react';
 import { JsonArray, JsonValue } from '@kbn/utility-types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ActiveHighlightMarker, highlightFieldValue, HighlightMarker } from './highlighting';
 
 export const FieldValue: React.FC<{
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx
index 13f8b3be05747..7868a9cc5fc24 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { chooseLightOrDarkColor, tintOrShade } from '../../../utils/styles';
 
 export const ActiveHighlightMarker = euiStyled.mark`
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx
index 9371bc9a8a216..3d6eca7688af0 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx
@@ -9,7 +9,7 @@ import { EuiButtonEmpty, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface LogTextStreamJumpToTailProps {
   onClickJump?: () => void;
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
index f6e3ff27f2467..23a2201d609ec 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
@@ -17,7 +17,7 @@ import { FormattedMessage, FormattedTime, FormattedRelative } from '@kbn/i18n-re
 import * as React from 'react';
 import { Unit } from '@kbn/datemath';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogTextSeparator } from './log_text_separator';
 import { extendDatemath } from '../../../utils/datemath';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx
index a37886876618c..9f84592d0768a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TextScale } from '../../../../common/log_text_scale';
 import {
   LogColumnRenderConfiguration,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx
index c3c10165919ab..e8bb7b5dcb09a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx
@@ -15,7 +15,7 @@ import {
   EuiContextMenuItem,
 } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryColumnContent } from './log_entry_column';
 
 interface LogEntryContextMenuItem {
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
index a715286ef4f33..ac80e7e9bb205 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { LogFieldColumn } from '../../../../common/log_entry';
 import { LogEntryFieldColumn } from './log_entry_field_column';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
index d8021aa0279d5..47b6f1acfe844 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { JsonValue } from '@kbn/utility-types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogColumn } from '../../../../common/log_entry';
 import { isFieldColumn, isHighlightFieldColumn } from '../../../utils/log_entry';
 import { FieldValue } from './field_value';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
index 801fede1e36fc..56b2e761bae6a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { LogMessageColumn } from '../../../../common/log_entry';
 import { LogEntryMessageColumn } from './log_entry_message_column';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
index b95b57890b48e..b7f9bd58070ae 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogColumn, LogMessagePart } from '../../../../common/log_entry';
 import {
   isConstantSegment,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
index c871011d0f01a..6d7358af73381 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
@@ -8,8 +8,8 @@
 import React, { memo, useState, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { isTimestampColumn } from '../../../utils/log_entry';
 import { TextScale } from '../../../../common/log_text_scale';
 import { LogEntryColumn, LogEntryColumnWidths, iconColumnId } from './log_entry_column';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx
index 6082f1eb77176..d864fa4c35fbf 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx
@@ -7,7 +7,7 @@
 
 import React, { memo } from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TimeFormat, useFormattedTime } from '../../formatted_time';
 import { LogEntryColumnContent } from './log_entry_column';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index 32d8497632021..3cfce6589154d 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
 import moment from 'moment';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TextScale } from '../../../../common/log_text_scale';
 import { TimeKey, UniqueTimeKey } from '../../../../common/time';
 import { callWithoutRepeats } from '../../../utils/handlers';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx
index d1330bdb44b33..d15da6ccf76d5 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo, useState, useCallback } from 'react';
 
-import { euiStyled, css } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, css } from '@kbn/kibana-react-plugin/common';
 import { TextScale } from '../../../../common/log_text_scale';
 
 export type WrapMode = 'none' | 'pre-wrapped' | 'long';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
index 7e13f8b4131fe..81d77aa66c1a5 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
@@ -9,7 +9,7 @@ import { bisector } from 'd3-array';
 import { sortBy, throttle } from 'lodash';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Rect } from './measurable_item_view';
 
 interface VerticalScrollPanelProps<Child> {
diff --git a/x-pack/plugins/infra/public/components/page.tsx b/x-pack/plugins/infra/public/components/page.tsx
index 7ba744ca25c85..ae961c899a5d1 100644
--- a/x-pack/plugins/infra/public/components/page.tsx
+++ b/x-pack/plugins/infra/public/components/page.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPage } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const ColumnarPage = euiStyled.div`
   display: flex;
diff --git a/x-pack/plugins/infra/public/components/page_template.tsx b/x-pack/plugins/infra/public/components/page_template.tsx
index 1a10a6cd831b9..0c5afd09b75f3 100644
--- a/x-pack/plugins/infra/public/components/page_template.tsx
+++ b/x-pack/plugins/infra/public/components/page_template.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../hooks/use_kibana';
-import type { LazyObservabilityPageTemplateProps } from '../../../observability/public';
 
 export const PageTemplate: React.FC<LazyObservabilityPageTemplateProps> = (pageTemplateProps) => {
   const {
diff --git a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
index 7b7c256d5ad59..58c0a60a8827c 100644
--- a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
@@ -8,10 +8,10 @@
 import React, { useCallback, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiPopover, EuiListGroup, EuiListGroupItem } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { SavedViewCreateModal } from './create_modal';
 import { SavedViewUpdateModal } from './update_modal';
 import { SavedViewManageViewsFlyout } from './manage_views_flyout';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useSavedViewContext } from '../../containers/saved_view/saved_view';
 import { SavedViewListModal } from './view_list_modal';
 
diff --git a/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx b/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
index f7c1a5763ba07..10ddd8ca1d359 100644
--- a/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
+++ b/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
-import { useLinkProps } from '../../../../observability/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 
 interface ViewSourceConfigurationButtonProps {
   'data-test-subj'?: string;
diff --git a/x-pack/plugins/infra/public/components/subscription_splash_content.tsx b/x-pack/plugins/infra/public/components/subscription_splash_content.tsx
index 947a5ed395315..5a4776938ff68 100644
--- a/x-pack/plugins/infra/public/components/subscription_splash_content.tsx
+++ b/x-pack/plugins/infra/public/components/subscription_splash_content.tsx
@@ -9,12 +9,12 @@ import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiText, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { HttpStart } from '../../../../../src/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { HttpStart } from '@kbn/core/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { useTrialStatus } from '../hooks/use_trial_status';
-import { LoadingPrompt } from '../components/loading_page';
+import { LoadingPrompt } from './loading_page';
 import { PageTemplate } from './page_template';
-import type { LazyObservabilityPageTemplateProps } from '../../../observability/public';
 
 const loadingMessage = i18n.translate('xpack.infra.ml.splash.loadingMessage', {
   defaultMessage: 'Checking license...',
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts
index d715fb9f45194..f1d9553806290 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   CategorizerStatus,
   getLatestLogEntryCategoryDatasetsStatsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
index 40b58c2cfdf55..17377e1484e26 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getDatafeedId, getJobId } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
index 2a5f68b3c32e2..142304269687e 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobId, jobCustomSettingsRT } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
@@ -47,6 +47,7 @@ const datafeedStateRT = rt.keyof({
   '': null,
 });
 
+// this is the union of the ML API's job state and block reasons
 const jobStateRT = rt.keyof({
   closed: null,
   closing: null,
@@ -54,6 +55,8 @@ const jobStateRT = rt.keyof({
   failed: null,
   opened: null,
   opening: null,
+  resetting: null,
+  reverting: null,
 });
 
 const jobAnalysisConfigRT = rt.partial({
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
index 49fdd55c0e12d..11a423c9ba438 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { jobCustomSettingsRT } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
index 7e3c2cc10d7da..39c8668c535b2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobIdPrefix, jobCustomSettingsRT } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
index 94bb3d8e66cbf..2e626b03755d2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   LOG_ANALYSIS_VALIDATE_DATASETS_PATH,
   validateLogEntryDatasetsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
index 8a9f960b54afa..d748647935356 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx
index 3aaf41fad2cd8..cab64a4069c3c 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { getJobId } from '../../../../common/log_analysis';
 import { callDeleteJobs, callGetJobDeletionTasks, callStopDatafeeds } from './api/ml_cleanup';
 
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx
index d844b7439710c..29e5508b24d38 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx
@@ -6,12 +6,12 @@
  */
 
 import { useCallback, useMemo } from 'react';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { DatasetFilter } from '../../../../common/log_analysis';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 import { useTrackedPromise } from '../../../utils/use_tracked_promise';
 import { useModuleStatus } from './log_analysis_module_status';
 import { ModuleDescriptor, ModuleSourceConfiguration } from './log_analysis_module_types';
-import { useUiTracker } from '../../../../../observability/public';
 
 export const useLogAnalysisModule = <JobType extends string>({
   sourceConfiguration,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx
index 9b0946c87dd10..5c4623075dec2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx
@@ -225,8 +225,9 @@ const getJobStatus =
         ) {
           return 'stopped';
         } else if (
-          jobSummary.jobState === 'opening' &&
-          jobSummary.awaitingNodeAssignment === false
+          (jobSummary.jobState === 'opening' && jobSummary.awaitingNodeAssignment === false) ||
+          jobSummary.jobState === 'resetting' ||
+          jobSummary.jobState === 'reverting'
         ) {
           return 'initializing';
         } else if (
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
index c8ce9a7b0127b..b26916a22f7b0 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   ValidateLogEntryDatasetsResponsePayload,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
index 9ef41042302a1..02e977dfadd32 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   bucketSpan,
   categoriesMessageField,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
index 214faaf9a3012..8acf7ce9d9a5b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   bucketSpan,
   DatasetFilter,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts
index 8f383fbf62936..87d70cbfd8e18 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
index aeb8a5e6b93e6..3686f4e0fdefe 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 
 import {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
index b4bdd72b3c5ee..1e9e1dd48a47b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
@@ -9,7 +9,7 @@ import { JsonObject } from '@kbn/utility-types';
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
 import { exhaustMap } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { LogEntryAfterCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration } from '../../../../common/log_views';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
index b9acb0bb38692..6e72fce5a1d2b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
@@ -9,7 +9,7 @@ import { JsonObject } from '@kbn/utility-types';
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
 import { exhaustMap } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { LogEntryBeforeCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration } from '../../../../common/log_views';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts b/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
index 4e0d1671e7de5..552dea6612bec 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 
 import {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx b/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
index c17c0ffbe5443..138d9c3d174cf 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
@@ -7,7 +7,7 @@
 
 import { renderHook } from '@testing-library/react-hooks';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 
 import { useLogSummary } from './log_summary';
 
diff --git a/x-pack/plugins/infra/public/containers/metrics_source/source.tsx b/x-pack/plugins/infra/public/containers/metrics_source/source.tsx
index 474f0994da02f..1b90106d69ed2 100644
--- a/x-pack/plugins/infra/public/containers/metrics_source/source.tsx
+++ b/x-pack/plugins/infra/public/containers/metrics_source/source.tsx
@@ -8,6 +8,7 @@
 import createContainer from 'constate';
 import { useEffect, useMemo, useState } from 'react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   MetricsSourceConfigurationResponse,
   MetricsSourceConfiguration,
@@ -15,7 +16,6 @@ import {
 } from '../../../common/metrics_sources';
 
 import { useTrackedPromise } from '../../utils/use_tracked_promise';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 export const pickIndexPattern = (
   source: MetricsSourceConfiguration | undefined,
diff --git a/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts b/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts
index c7da5afd8dcd6..13a6c6b6abdce 100644
--- a/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts
+++ b/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts
@@ -10,8 +10,8 @@ import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import createContainer from 'constate';
-import { HttpHandler } from 'src/core/public';
-import { ToastInput } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+import { ToastInput } from '@kbn/core/public';
 import {
   metricsSourceConfigurationResponseRT,
   MetricsSourceConfigurationResponse,
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts
index 2f98f954a5997..915240c6c6cec 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { getDatafeedId, getJobId } from '../../../../common/infra_ml';
 import { decodeOrThrow } from '../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts
index c7dc1d509cf11..58baccbcedbb9 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobId, jobCustomSettingsRT } from '../../../../common/infra_ml';
 import { decodeOrThrow } from '../../../../common/runtime_types';
@@ -47,6 +47,7 @@ const datafeedStateRT = rt.keyof({
   '': null,
 });
 
+// this is the union of the ML API's job state and block reasons
 const jobStateRT = rt.keyof({
   closed: null,
   closing: null,
@@ -54,6 +55,8 @@ const jobStateRT = rt.keyof({
   failed: null,
   opened: null,
   opening: null,
+  resetting: null,
+  reverting: null,
 });
 
 const jobCategorizationStatusRT = rt.keyof({
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts
index 063f6254385d2..9d24693c720ca 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { jobCustomSettingsRT } from '../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts
index af98d598fa063..e9392062c3118 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobIdPrefix, jobCustomSettingsRT } from '../../../../common/infra_ml';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx b/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx
index 6a80c5200e678..9190122f30b46 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import { getJobId } from '../../../common/infra_ml';
 import { callDeleteJobs, callGetJobDeletionTasks, callStopDatafeeds } from './api/ml_cleanup';
 
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx
index bc1f4b00c4cbe..fc41e67c2bd2c 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx
@@ -225,8 +225,9 @@ const getJobStatus =
           ) {
             return 'stopped';
           } else if (
-            jobSummary.jobState === 'opening' &&
-            jobSummary.awaitingNodeAssignment === false
+            (jobSummary.jobState === 'opening' && jobSummary.awaitingNodeAssignment === false) ||
+            jobSummary.jobState === 'resetting' ||
+            jobSummary.jobState === 'reverting'
           ) {
             return 'initializing';
           } else if (
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
index 9b172a7c82a98..0115d321164ee 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   ValidateLogEntryDatasetsResponsePayload,
   ValidationIndicesResponsePayload,
diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
index f87cd78f4ff34..69c21dd1cfc7d 100644
--- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
@@ -6,7 +6,19 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_out.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_out.json';
 import { ModuleDescriptor, SetUpModuleArgs } from '../../infra_ml_module_types';
 import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup';
 import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api';
@@ -19,18 +31,6 @@ import {
   bucketSpan,
 } from '../../../../../common/infra_ml';
 import { TIMESTAMP_FIELD } from '../../../../../common/constants';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_out.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_out.json';
 
 type JobType = 'hosts_memory_usage' | 'hosts_network_in' | 'hosts_network_out';
 const moduleId = 'metrics_ui_hosts';
diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
index 388a7dd0a5656..e1290833dc934 100644
--- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
@@ -6,7 +6,19 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_out.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_out.json';
 import { ModuleDescriptor, SetUpModuleArgs } from '../../infra_ml_module_types';
 import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup';
 import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api';
@@ -19,18 +31,6 @@ import {
   bucketSpan,
 } from '../../../../../common/infra_ml';
 import { TIMESTAMP_FIELD } from '../../../../../common/constants';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_out.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_out.json';
 
 type JobType = 'k8s_memory_usage' | 'k8s_network_in' | 'k8s_network_out';
 export const DEFAULT_K8S_PARTITION_FIELD = 'kubernetes.namespace';
diff --git a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
index 44792019a5f9c..e2bb50e0dc2da 100644
--- a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
+++ b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
@@ -12,7 +12,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { constant, identity } from 'fp-ts/lib/function';
 import { useCallback, useMemo, useState, useEffect, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
-import { SimpleSavedObject, SavedObjectAttributes } from 'kibana/public';
+import { SimpleSavedObject, SavedObjectAttributes } from '@kbn/core/public';
 import { useUrlState } from '../../utils/use_url_state';
 import { useFindSavedObject } from '../../hooks/use_find_saved_object';
 import { useCreateSavedObject } from '../../hooks/use_create_saved_object';
diff --git a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
index 2b0aaf5175b88..96410973f8c0e 100644
--- a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
+++ b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
@@ -7,16 +7,18 @@
 
 import React from 'react';
 import { DataViewBase } from '@kbn/es-query';
-import { QuerySuggestion, DataPublicPluginStart } from 'src/plugins/data/public';
 import {
   withKibana,
   KibanaReactContextValue,
   KibanaServices,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { QuerySuggestion, UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { RendererFunction } from '../utils/typed_react';
 
 interface WithKueryAutocompletionLifecycleProps {
-  kibana: KibanaReactContextValue<{ data: DataPublicPluginStart } & KibanaServices>;
+  kibana: KibanaReactContextValue<
+    { unifiedSearch: UnifiedSearchPublicPluginStart } & KibanaServices
+  >;
   children: RendererFunction<{
     isLoadingSuggestions: boolean;
     loadSuggestions: (expression: string, cursorPosition: number, maxSuggestions?: number) => void;
@@ -63,7 +65,7 @@ class WithKueryAutocompletionComponent extends React.Component<
     const { indexPattern } = this.props;
     const language = 'kuery';
     const hasQuerySuggestions =
-      this.props.kibana.services.data?.autocomplete.hasQuerySuggestions(language);
+      this.props.kibana.services.unifiedSearch?.autocomplete.hasQuerySuggestions(language);
 
     if (!hasQuerySuggestions) {
       return;
@@ -78,7 +80,7 @@ class WithKueryAutocompletionComponent extends React.Component<
     });
 
     const suggestions =
-      (await this.props.kibana.services.data.autocomplete.getQuerySuggestions({
+      (await this.props.kibana.services.unifiedSearch.autocomplete.getQuerySuggestions({
         language,
         query: expression,
         selectionStart: cursorPosition,
diff --git a/x-pack/plugins/infra/public/containers/with_source/with_source.tsx b/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
index 10eaefba57df8..148b679018c7d 100644
--- a/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
+++ b/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
@@ -13,7 +13,7 @@ import {
 } from '../../../common/metrics_sources';
 import { RendererFunction } from '../../utils/typed_react';
 import { Source } from '../metrics_source';
-import { CreateDerivedIndexPattern } from '../../containers/metrics_source';
+import { CreateDerivedIndexPattern } from '../metrics_source';
 
 interface WithSourceProps {
   children: RendererFunction<{
diff --git a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
index 92a3b581d0bca..37801c16bcf1f 100644
--- a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useEffect } from 'react';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { observabilityTitle } from '../translations';
 import { useKibanaContextForPlugin } from './use_kibana';
-import { useLinkProps } from '../../../observability/public';
 
 type AppId = 'logs' | 'metrics';
 
diff --git a/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx
index bcfff06d2cd69..e7c77096b7978 100644
--- a/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx
@@ -6,8 +6,8 @@
  */
 
 import { useState, useCallback } from 'react';
-import { SavedObjectsBatchResponse } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectsBatchResponse } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useBulkGetSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx
index f27b91891efd5..e034b2bc66f18 100644
--- a/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx
@@ -10,8 +10,8 @@ import {
   SavedObjectAttributes,
   SavedObjectsCreateOptions,
   SimpleSavedObject,
-} from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useCreateSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx
index 032533e32757a..1bacf1efa487a 100644
--- a/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useCallback } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useDeleteSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
index df6cef5df7bea..60754961e05ab 100644
--- a/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useState, useCallback } from 'react';
-import { SavedObjectAttributes, SavedObjectsBatchResponse } from 'src/core/public';
-import { useUiTracker } from '../../../observability/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectAttributes, SavedObjectsBatchResponse } from '@kbn/core/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useFindSavedObject = <SavedObjectType extends SavedObjectAttributes>(type: string) => {
   const trackMetric = useUiTracker({ app: 'infra_metrics' });
diff --git a/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
index 1d82ac5294737..0dad4a8d2cb56 100644
--- a/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
@@ -6,8 +6,8 @@
  */
 
 import { useState, useCallback } from 'react';
-import { SavedObjectAttributes, SimpleSavedObject } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectAttributes, SimpleSavedObject } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useGetSavedObject = <SavedObjectType extends SavedObjectAttributes>(type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_http_request.tsx b/x-pack/plugins/infra/public/hooks/use_http_request.tsx
index 1d5c1ef4abfbb..b83c22abf9588 100644
--- a/x-pack/plugins/infra/public/hooks/use_http_request.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_http_request.tsx
@@ -7,10 +7,10 @@
 
 import React, { useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { HttpHandler } from 'src/core/public';
-import { ToastInput } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+import { ToastInput } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useTrackedPromise, CanceledPromiseError } from '../utils/use_tracked_promise';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { InfraHttpError } from '../types';
 
 export function useHTTPRequest<Response>(
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana.tsx b/x-pack/plugins/infra/public/hooks/use_kibana.tsx
index e7f9295a09bae..0055d01a23bec 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana.tsx
@@ -7,12 +7,12 @@
 
 import type { PropsOf } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { CoreStart } from '../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import {
   createKibanaReactContext,
   KibanaReactContextValue,
   useKibana,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { InfraClientCoreSetup, InfraClientStartDeps, InfraClientStartExports } from '../types';
 
 export type PluginKibanaContextValue = CoreStart & InfraClientStartDeps & InfraClientStartExports;
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
index b5b831312d184..2a72a2d3b3d68 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
@@ -8,11 +8,11 @@
 import React, { useMemo } from 'react';
 import { firstValueFrom, from, of } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { CoreStart } from '../../../../../src/core/public';
-import { FieldSpec } from '../../../../../src/plugins/data/common';
-import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/public';
-import { DataViewField } from '../../../../../src/plugins/data_views/common';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { FieldSpec } from '@kbn/data-plugin/common';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { Pick2 } from '../../common/utility_types';
 
 type MockIndexPattern = Pick<
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_space.ts b/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
index 3c20642d32eb2..5a90327ff0581 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
@@ -6,8 +6,8 @@
  */
 
 import useAsync from 'react-use/lib/useAsync';
-import { useKibanaContextForPlugin } from '../hooks/use_kibana';
-import type { Space } from '../../../spaces/public';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { useKibanaContextForPlugin } from './use_kibana';
 
 export type ActiveSpace =
   | { isLoading: true; error: undefined; space: undefined }
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts b/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts
index 7f3e11e9429e0..411b6013154cd 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 
 export function useKibanaTimeZoneSetting() {
   const [kibanaTimeZone] = useUiSetting$<string>(UI_SETTINGS.DATEFORMAT_TZ);
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
index 15eb525dca734..4128c2b17f624 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
@@ -9,8 +9,8 @@ import { useCallback, useEffect } from 'react';
 
 import useUpdateEffect from 'react-use/lib/useUpdateEffect';
 import useMount from 'react-use/lib/useMount';
+import { TimeRange, TimefilterContract } from '@kbn/data-plugin/public';
 import { useKibanaContextForPlugin } from './use_kibana';
-import { TimeRange, TimefilterContract } from '../../../../../src/plugins/data/public';
 
 export const useKibanaTimefilterTime = ({
   from: fromDefault,
diff --git a/x-pack/plugins/infra/public/hooks/use_log_view.ts b/x-pack/plugins/infra/public/hooks/use_log_view.ts
index 95363d12a9135..b1b8bb6e33cc9 100644
--- a/x-pack/plugins/infra/public/hooks/use_log_view.ts
+++ b/x-pack/plugins/infra/public/hooks/use_log_view.ts
@@ -7,7 +7,7 @@
 
 import createContainer from 'constate';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { LogView, LogViewAttributes, LogViewStatus, ResolvedLogView } from '../../common/log_views';
 import type { ILogViewsClient } from '../services/log_views';
 import { isRejectedPromiseState, useTrackedPromise } from '../utils/use_tracked_promise';
diff --git a/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx b/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx
index e00e5b4818ba6..d2fc556caa57b 100644
--- a/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useBreadcrumbs } from './use_breadcrumbs';
 import { LOGS_APP } from '../../common/constants';
 import { logsTitle } from '../translations';
diff --git a/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx b/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx
index e55f65a97b63e..4679d4fe67f7e 100644
--- a/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useBreadcrumbs } from './use_breadcrumbs';
 import { METRICS_APP } from '../../common/constants';
 import { metricsTitle } from '../translations';
diff --git a/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx b/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx
index a0b0558e0393d..293a5de99ceb5 100644
--- a/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx
@@ -7,7 +7,7 @@
 
 import { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useReadOnlyBadge = (isReadOnly = false) => {
   const chrome = useKibana().services.chrome;
diff --git a/x-pack/plugins/infra/public/hooks/use_trial_status.tsx b/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
index 41faa9b97ccbb..48576498e47da 100644
--- a/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
@@ -8,10 +8,10 @@
 import { boolean } from 'io-ts';
 import { i18n } from '@kbn/i18n';
 import { useState } from 'react';
-import { HttpStart, NotificationsStart } from 'src/core/public';
+import { HttpStart, NotificationsStart } from '@kbn/core/public';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { API_BASE_PATH as LICENSE_MANAGEMENT_API_BASE_PATH } from '../../../license_management/common/constants';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { API_BASE_PATH as LICENSE_MANAGEMENT_API_BASE_PATH } from '@kbn/license-management-plugin/common/constants';
 import { useTrackedPromise } from '../utils/use_tracked_promise';
 import { decodeOrThrow } from '../../common/runtime_types';
 
diff --git a/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
index 563e0e43cc3b8..0f0d38648169e 100644
--- a/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
@@ -10,8 +10,8 @@ import {
   SavedObjectAttributes,
   SavedObjectsCreateOptions,
   SimpleSavedObject,
-} from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useUpdateSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/index.ts b/x-pack/plugins/infra/public/index.ts
index 929a430286b93..0ab52ad7ad623 100644
--- a/x-pack/plugins/infra/public/index.ts
+++ b/x-pack/plugins/infra/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import { Plugin } from './plugin';
 import {
   InfraClientSetupExports,
diff --git a/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts b/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
index 2f09fde24cada..e4704c69b446b 100644
--- a/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
+++ b/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createMetricsFetchData, createMetricsHasData } from './metrics_overview_fetchers';
 import { createInfraPluginStartMock } from './mocks';
 import { FAKE_OVERVIEW_RESPONSE } from './test_utils';
diff --git a/x-pack/plugins/infra/public/metrics_overview_fetchers.ts b/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
index 831d05fee58a2..9a78d72ad2413 100644
--- a/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
+++ b/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
@@ -13,7 +13,7 @@
  * 2.0.
  */
 
-import { FetchDataParams, MetricsFetchDataResponse } from '../../observability/public';
+import { FetchDataParams, MetricsFetchDataResponse } from '@kbn/observability-plugin/public';
 import { TopNodesRequest, TopNodesResponse } from '../common/http_api/overview_api';
 import { InfraStaticSourceConfiguration } from '../common/source_configuration/source_configuration';
 import { InfraClientStartServicesAccessor } from './types';
diff --git a/x-pack/plugins/infra/public/pages/error.tsx b/x-pack/plugins/infra/public/pages/error.tsx
index f133bd70c230a..e102b2bac29a0 100644
--- a/x-pack/plugins/infra/public/pages/error.tsx
+++ b/x-pack/plugins/infra/public/pages/error.tsx
@@ -17,7 +17,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ColumnarPage, PageContent } from '../components/page';
 
 const DetailPageContent = euiStyled(PageContent)`
diff --git a/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx b/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx
index ae564622c1ba2..841ecbff9ddfb 100644
--- a/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx
@@ -9,8 +9,8 @@ import { render, waitFor } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
-import { httpServiceMock } from 'src/core/public/mocks';
-import { KibanaContextProvider, KibanaPageTemplate } from 'src/plugins/kibana_react/public';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { useLogView } from '../../hooks/use_log_view';
 import {
   createLoadedUseLogViewMock,
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
index e3d17f17af586..c31f54bd2f72e 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 
+import { LinkDescriptor } from '@kbn/observability-plugin/public';
 import { replaceMetricTimeInQueryString } from '../metrics/metric_detail/hooks/use_metrics_time';
 import { getFromFromLocation, getToFromLocation } from './query_params';
 import { InventoryItemType } from '../../../common/inventory_models/types';
-import { LinkDescriptor } from '../../../../observability/public';
 
 type RedirectToNodeDetailProps = RouteComponentProps<{
   nodeId: string;
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index c8bd111402d46..737e4b35fe15e 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -10,7 +10,7 @@ import { flowRight } from 'lodash';
 import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 import useMount from 'react-use/lib/useMount';
-import { LinkDescriptor } from '../../../../observability/public';
+import { LinkDescriptor } from '@kbn/observability-plugin/public';
 import { findInventoryFields } from '../../../common/inventory_models';
 import { InventoryItemType } from '../../../common/inventory_models/types';
 import { LoadingPage } from '../../components/loading_page';
diff --git a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts
index 0e6edac7a4644..150416a204b05 100644
--- a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts
+++ b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts
@@ -15,7 +15,7 @@ const renderUseHostIpToNameHook = () =>
 
 const mockedFetch = jest.fn();
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
+jest.mock('@kbn/kibana-react-plugin/public', () => {
   return {
     useKibana: () => {
       return {
diff --git a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts
index e2c25ba6fcfe2..29b9dd20d61ce 100644
--- a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts
+++ b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts
@@ -6,8 +6,8 @@
  */
 
 import { useState, useEffect } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IpToHostResponse } from '../../../common/http_api/ip_to_hostname';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 export const useHostIpToName = (ipAddress: string | null, indexPattern: string | null) => {
   const fetch = useKibana().services.http?.fetch;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
index 252d4ff737c15..6c5151dd2587d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect } from 'react';
-import type { LazyObservabilityPageTemplateProps } from '../../../../../observability/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { LoadingPage } from '../../../components/loading_page';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
index 34faac3aefa0c..13dd004a1a5ce 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
@@ -11,10 +11,10 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import useInterval from 'react-use/lib/useInterval';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { MLJobsAwaitingNodeWarning, ML_PAGES, useMlHref } from '../../../../../ml/public';
-import { useTrackPageview } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MLJobsAwaitingNodeWarning, ML_PAGES, useMlHref } from '@kbn/ml-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { TimeRange } from '../../../../common/time/time_range';
 import { CategoryJobNoticesSection } from '../../../components/logging/log_analysis_job_status';
 import { AnalyzeInMlButton } from '../../../components/logging/log_analysis_results';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
index ead8590ca3398..24b0985b15aac 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 interface LogEntryCategoriesSetupContentProps {
   onOpenSetup: () => void;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
index 1b172135cfc6c..4d17b6ed9e8c5 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
@@ -9,11 +9,11 @@ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
+import { shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import { TimeRange } from '../../../../../../common/time/time_range';
-import { useMlHref, ML_PAGES } from '../../../../../../../ml/public';
 import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
-import { shouldHandleLinkEvent } from '../../../../../../../observability/public';
 
 export const AnalyzeCategoryDatasetInMlAction: React.FunctionComponent<{
   categorizationJobId: string;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
index f18d8b4d3e04d..be5806d2b3064 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { encode } from 'rison-node';
 import moment from 'moment';
 
+import { useUiTracker, useLinkProps } from '@kbn/observability-plugin/public';
 import { LogEntry, LogEntryContext } from '../../../../../../common/log_entry';
 import { TimeRange } from '../../../../../../common/time';
 import {
@@ -26,7 +27,6 @@ import {
 } from '../../../../../components/logging/log_text_stream';
 import { LogColumnConfiguration } from '../../../../../utils/source_configuration';
 import { LogEntryContextMenu } from '../../../../../components/logging/log_text_stream/log_entry_context_menu';
-import { useUiTracker, useLinkProps } from '../../../../../../../observability/public';
 
 export const exampleMessageScale = 'medium' as const;
 export const exampleTimestampFormat = 'dateTime' as const;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
index b01b89ca6a738..271eac8bf641d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryCategoryDataset } from '../../../../../../common/log_analysis';
 import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
 
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx
index fe9297b9409c7..40cf29c8e6eb6 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx
@@ -10,7 +10,7 @@ import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const SingleMetricComparison: React.FunctionComponent<{
   currentValue: number;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
index 1c9e1c335ebf7..805670da93806 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import React, { useMemo, useCallback } from 'react';
 import useSet from 'react-use/lib/useSet';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   LogEntryCategory,
   LogEntryCategoryDataset,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts
index e3c191d42dace..51d4a69ada295 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryCategoryDatasetsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts
index 5d1beadab29cd..90727fd6f0853 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryCategoryExamplesRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
index 9a3ae61d6db62..9472991e15c66 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryCategoriesRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
index ece7a6b7358eb..ace38262e8a14 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { memo, useCallback, useEffect } from 'react';
 import useInterval from 'react-use/lib/useInterval';
-import type { LazyObservabilityPageTemplateProps } from '../../../../../observability/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { LoadingPage } from '../../../components/loading_page';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
index cf7a4789a687d..fc87ba8cd3cb9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
@@ -11,9 +11,9 @@ import moment from 'moment';
 import { stringify } from 'query-string';
 import React, { useCallback, useMemo } from 'react';
 import { encode, RisonValue } from 'rison-node';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { MLJobsAwaitingNodeWarning } from '../../../../../ml/public';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { TimeKey } from '../../../../common/time';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
index b94eb1ebd8748..6418142eaec0b 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 interface LogEntryRateSetupContentProps {
   onOpenSetup: () => void;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx
index b0e85a4648d6e..bd4e90faa6c19 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx
@@ -7,13 +7,13 @@
 
 import React, { useMemo } from 'react';
 import moment from 'moment';
-import { AutoRefresh } from '../../use_log_entry_rate_results_url_state';
-import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import {
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
   AnomalySwimlaneEmbeddableInput,
-} from '../../../../../../../ml/public';
-import { EmbeddableRenderer } from '../../../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/ml-plugin/public';
+import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
+import { AutoRefresh } from '../../use_log_entry_rate_results_url_state';
+import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import { partitionField } from '../../../../../../common/infra_ml';
 import { MissingEmbeddableFactoryCallout } from '../../../../../components/missing_embeddable_factory_callout';
 import { TimeRange } from '../../../../../../common/time/time_range';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
index 85f96884fbae5..ef5db53ebdc31 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
@@ -10,7 +10,7 @@ import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import useMount from 'react-use/lib/useMount';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { isCategoryAnomaly, LogEntryAnomaly } from '../../../../../../common/log_analysis';
 import { TimeRange } from '../../../../../../common/time/time_range';
 import { LogEntryExampleMessages } from '../../../../../components/logging/log_entry_examples/log_entry_examples';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
index be20e44a1434e..0e15a51f02d35 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
@@ -9,9 +9,10 @@ import React, { useMemo, useCallback, useState } from 'react';
 import moment from 'moment';
 import { encode } from 'rison-node';
 import { i18n } from '@kbn/i18n';
-import { useMlHref, ML_PAGES } from '../../../../../../../ml/public';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps, shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
 import {
   LogEntryColumn,
@@ -27,7 +28,6 @@ import {
   LogColumnHeadersWrapper,
   LogColumnHeader,
 } from '../../../../../components/logging/log_text_stream/column_headers';
-import { useLinkProps, shouldHandleLinkEvent } from '../../../../../../../observability/public';
 import { TimeRange } from '../../../../../../common/time/time_range';
 import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
 import { LogEntryExample, isCategoryAnomaly } from '../../../../../../common/log_analysis';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
index 2a329ffd76499..5f0f95a3e7976 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   getLogEntryAnomaliesRequestPayloadRT,
   getLogEntryAnomaliesSuccessReponsePayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts
index 8b7d85645c0a8..9b560845186f7 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import {
   getLogEntryAnomaliesDatasetsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts
index 7f12d6ed713c7..5844e00ebfe4e 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryExamplesRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
index 3231a21ac1978..5bcf6455310b9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
@@ -7,8 +7,8 @@
 
 import { Filter } from '@kbn/es-query';
 import { useEffect, useReducer, useCallback } from 'react';
+import { CONTROLLED_BY_SWIM_LANE_FILTER } from '@kbn/ml-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-import { CONTROLLED_BY_SWIM_LANE_FILTER } from '../../../../../ml/public';
 
 interface ReducerState {
   selectedDatasets: string[];
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx
index 73d0046ce9643..eb130a2e38c5d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx
@@ -10,7 +10,7 @@ import useInterval from 'react-use/lib/useInterval';
 import datemath from '@kbn/datemath';
 import moment from 'moment';
 import * as rt from 'io-ts';
-import { TimeRange as KibanaTimeRange } from '../../../../../../../src/plugins/data/public';
+import { TimeRange as KibanaTimeRange } from '@kbn/data-plugin/public';
 import { TimeRange } from '../../../../common/time/time_range';
 import { useUrlState } from '../../../utils/use_url_state';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
index 785a1d5f691da..e42cfc2d7c54a 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -9,8 +9,8 @@ import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { HeaderMenuPortal, useLinkProps } from '../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-plugin/public';
 import { AlertDropdown } from '../../alerting/log_threshold';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
diff --git a/x-pack/plugins/infra/public/pages/logs/page_template.tsx b/x-pack/plugins/infra/public/pages/logs/page_template.tsx
index 6de13b495f0ba..be7a03256cfdf 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_template.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_template.tsx
@@ -7,12 +7,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import { KibanaPageTemplateProps, useKibana } from '@kbn/kibana-react-plugin/public';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
-import type { LazyObservabilityPageTemplateProps } from '../../../../observability/public';
-import {
-  KibanaPageTemplateProps,
-  useKibana,
-} from '../../../../../../src/plugins/kibana_react/public';
 
 interface LogsPageTemplateProps extends LazyObservabilityPageTemplateProps {
   hasData?: boolean;
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx b/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
index c076b2063825e..175b30de4e0b5 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
@@ -16,7 +16,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
 import { v4 as uuidv4 } from 'uuid';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogColumnConfiguration } from '../../../utils/source_configuration';
 import { useVisibilityState } from '../../../utils/use_visibility_state';
 
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx
index 20b40f5599976..2b26afda19041 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx
@@ -8,7 +8,7 @@
 import { EuiCode, EuiDescribedFormGroup, EuiFieldText, EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { LogIndexNameReference } from '../../../../common/log_views';
 import { FormElement } from './form_elements';
 import { getFormRowProps, getInputFieldProps } from './form_field_props';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
index 0b9f9ceae99cf..91936df960f22 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
@@ -8,9 +8,9 @@
 import { EuiDescribedFormGroup, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { LogDataViewReference } from '../../../../common/log_views';
-import { useLinkProps } from '../../../../../observability/public';
 import { FormElement } from './form_elements';
 import { getFormRowProps } from './form_field_props';
 import { IndexPatternSelector } from './index_pattern_selector';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
index 8ebf2bed2b8df..d581c5feb3d6b 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
@@ -6,13 +6,13 @@
  */
 
 import { useMemo } from 'react';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import {
   LogDataViewReference,
   LogIndexNameReference,
   logIndexNameReferenceRT,
 } from '../../../../common/log_views';
-import { SavedObjectNotFound } from '../../../../../../../src/plugins/kibana_utils/common';
-import { useUiTracker } from '../../../../../observability/public';
 import { useKibanaIndexPatternService } from '../../../hooks/use_kibana_index_patterns';
 import { useFormElement } from './form_elements';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
index 2edc00f44aea9..563057fb5de97 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCodeBlock, EuiPage, EuiPageBody, EuiPageContent, PropsOf } from '@el
 import { I18nProvider } from '@kbn/i18n-react';
 import { Meta, Story } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import {
   MockIndexPatternsKibanaContextProvider,
   MockIndexPatternSpec,
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
index 4127299d8db3b..70499975b77b2 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
@@ -8,7 +8,7 @@
 import { EuiCheckableCard, EuiFormFieldset, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
-import { useUiTracker } from '../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import {
   logIndexNameReferenceRT,
   LogDataViewReference,
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
index de435500d3b32..2b59464d7c0ab 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
@@ -22,7 +22,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
-import { DragHandleProps, DropResult } from '../../../../../observability/public';
+import { DragHandleProps, DropResult } from '@kbn/observability-plugin/public';
 import {
   FieldLogColumnConfiguration,
   getLogColumnConfigurationId,
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
index afb8e1346bed6..3909070178cd6 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
@@ -16,8 +16,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { Prompt, useTrackPageview } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { Prompt, useTrackPageview } from '@kbn/observability-plugin/public';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs';
 import { useLogViewContext } from '../../../hooks/use_log_view';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts b/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts
index 896fecc8d70dd..f8e4862817bae 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts
+++ b/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 export interface GenericValidationError {
   type: 'generic';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
index 2ac307570cc97..bb8e4307fe3b9 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
@@ -7,7 +7,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs';
 import { StreamPageContent } from './page_content';
 import { StreamPageHeader } from './page_header';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
index 3b59e097e7f97..fd1e4058e6745 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogSourceErrorPage } from '../../../components/logging/log_source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogViewContext } from '../../../hooks/use_log_view';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index a1b3f6d33324a..2cb7b2c6f5a7b 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -9,7 +9,7 @@ import { EuiSpacer } from '@elastic/eui';
 import type { Query } from '@kbn/es-query';
 import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import usePrevious from 'react-use/lib/usePrevious';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntry } from '../../../../common/log_entry';
 import { TimeKey } from '../../../../common/time';
 import { AutoSizer } from '../../../components/auto_sizer';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
index 7475ca331aadd..a579d519c5038 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
@@ -9,10 +9,10 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { NoIndices } from '../../../components/empty_states/no_indices';
 import { ViewSourceConfigurationButton } from '../../../components/source_configuration/view_source_configuration_button';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { useLinkProps } from '../../../../../observability/public';
 
 export const LogsPageNoIndicesContent = () => {
   const {
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
index b699a585ab4c7..e3b2f01b6712e 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -9,9 +9,9 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { Query } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogCustomizationMenu } from '../../../components/logging/log_customization_menu';
 import { LogDatepicker } from '../../../components/logging/log_datepicker';
 import { LogHighlightsMenu } from '../../../components/logging/log_highlights_menu';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
index 954384b50ffa1..c2f08256bd130 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
@@ -16,10 +16,10 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import React, { useCallback, useContext, useMemo } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntry } from '../../../../common/log_entry';
 import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
 import { useViewportDimensions } from '../../../utils/use_viewport_dimensions';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { LogStream } from '../../../components/log_stream';
 
 const MODAL_MARGIN = 25;
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index ffa799d93a20a..f4d42b5994eb5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -11,6 +11,9 @@ import React, { useContext } from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
@@ -27,7 +30,6 @@ import { SnapshotPage } from './inventory_view';
 import { MetricDetail } from './metric_detail';
 import { MetricsSettingsPage } from './settings';
 import { SourceLoadingPage } from '../../components/source_loading_page';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WaffleOptionsProvider } from './inventory_view/hooks/use_waffle_options';
 import { WaffleTimeProvider } from './inventory_view/hooks/use_waffle_time';
 import { WaffleFiltersProvider } from './inventory_view/hooks/use_waffle_filters';
@@ -37,9 +39,7 @@ import { SavedViewProvider } from '../../containers/saved_view/saved_view';
 import { AlertPrefillProvider } from '../../alerting/use_alert_prefill';
 import { InfraMLCapabilitiesProvider } from '../../containers/ml/infra_ml_capabilities';
 import { AnomalyDetectionFlyout } from './inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout';
-import { HeaderMenuPortal } from '../../../../observability/public';
 import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';
-import { useLinkProps } from '../../../../observability/public';
 import { CreateDerivedIndexPattern } from '../../containers/metrics_source';
 
 const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
index ad548a632573f..9e81d1310e1f9 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useWaffleOptionsContext } from '../hooks/use_waffle_options';
 import { InfraFormatter } from '../../../../lib/lib';
 import { Timeline } from './timeline/timeline';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
index 3a1d52cc5664f..89bc192606944 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import React, { ReactNode } from 'react';
-import { withTheme, EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 interface Props {
   'data-test-subj'?: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
index 7f3de57b610a4..c05f07fb5e933 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import useInterval from 'react-use/lib/useInterval';
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SnapshotNode } from '../../../../../common/http_api';
 import { SavedView } from '../../../../containers/saved_view/saved_view';
 import { AutoSizer } from '../../../../components/auto_sizer';
@@ -23,7 +24,6 @@ import {
   WaffleLegendOptions,
 } from '../hooks/use_waffle_options';
 import { InfraFormatterType, InfraWaffleMapBounds } from '../../../../lib/lib';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { Toolbar } from './toolbars/toolbar';
 import { ViewSwitcher } from './waffle/view_switcher';
 import { createInventoryMetricFormatter } from '../lib/create_inventory_metric_formatter';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
index 41dde2ee02582..d86e0f9993d1e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
@@ -27,10 +27,11 @@ import {
   OnTimeChangeProps,
 } from '@elastic/eui';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n-react';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { datemathToEpochMillis } from '../../../../../../../utils/datemath';
 import { SnapshotMetricType } from '../../../../../../../../common/inventory_models/types';
-import { withTheme } from '../../../../../../../../../../../src/plugins/kibana_react/common';
-import { useLinkProps } from '../../../../../../../../../observability/public';
 import { useSorting } from '../../../../../../../hooks/use_sorting';
 import { useMetricsK8sAnomaliesResults } from '../../../../hooks/use_metrics_k8s_anomalies';
 import { useMetricsHostsAnomaliesResults } from '../../../../hooks/use_metrics_hosts_anomalies';
@@ -45,7 +46,6 @@ import { AnomalySeverityIndicator } from '../../../../../../../components/loggin
 import { useSourceContext } from '../../../../../../../containers/metrics_source';
 import { createResultsUrl } from '../flyout_home';
 import { useWaffleViewState, WaffleViewState } from '../../../../hooks/use_waffle_view_state';
-import { useUiTracker } from '../../../../../../../../../observability/public';
 type JobType = 'k8s' | 'hosts';
 type SortField = 'anomalyScore' | 'startTime';
 interface JobOption {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
index 1918d17b5e53a..eff62e8a7e6ee 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
@@ -16,7 +16,8 @@ import { EuiButtonEmpty } from '@elastic/eui';
 import moment from 'moment';
 import { EuiTabs } from '@elastic/eui';
 import { EuiTab } from '@elastic/eui';
-import { MLJobsAwaitingNodeWarning } from '../../../../../../../../ml/public';
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { SubscriptionSplashPrompt } from '../../../../../../components/subscription_splash_content';
 import { useInfraMLCapabilitiesContext } from '../../../../../../containers/ml/infra_ml_capabilities';
 import {
@@ -26,7 +27,6 @@ import {
 import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module';
 import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module';
 import { LoadingPrompt } from '../../../../../../components/loading_page';
-import { useLinkProps } from '../../../../../../../../observability/public';
 import { AnomaliesTable } from './anomalies_table/anomalies_table';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
index da439d71b6b89..ddc537201181f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
@@ -17,6 +17,7 @@ import moment, { Moment } from 'moment';
 import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useSourceViaHttp } from '../../../../../../containers/metrics_source/use_source_via_http';
 import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module';
 import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module';
@@ -24,7 +25,6 @@ import { FixedDatePicker } from '../../../../../../components/fixed_datepicker';
 import { DEFAULT_K8S_PARTITION_FIELD } from '../../../../../../containers/ml/modules/metrics_k8s/module_descriptor';
 import { MetricsExplorerKueryBar } from '../../../../metrics_explorer/components/kuery_bar';
 import { convertKueryToElasticSearchQuery } from '../../../../../../utils/kuery';
-import { useUiTracker } from '../../../../../../../../observability/public';
 
 interface Props {
   jobType: 'hosts' | 'kubernetes';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
index 5c416b8a10333..d4e0b351fbe44 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
@@ -11,18 +11,18 @@ import React, { useMemo, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { EuiOutsideClickDetector } from '@elastic/eui';
 import { EuiIcon, EuiButtonIcon } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
 import { InventoryItemType } from '../../../../../../common/inventory_models/types';
 import { MetricsTab } from './tabs/metrics/metrics';
 import { LogsTab } from './tabs/logs';
 import { ProcessesTab } from './tabs/processes';
-import { PropertiesTab } from './tabs/properties/index';
+import { PropertiesTab } from './tabs/properties';
 import { AnomaliesTab } from './tabs/anomalies/anomalies';
 import { OsqueryTab } from './tabs/osquery';
 import { OVERLAY_Y_START, OVERLAY_BOTTOM_MARGIN } from './tabs/shared';
-import { useLinkProps } from '../../../../../../../observability/public';
 import { getNodeDetailUrl } from '../../../../link_to';
 import { findInventoryModel } from '../../../../../../common/inventory_models';
 import { navigateToUptime } from '../../lib/navigate_to_uptime';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
index 058928d1c8591..896b7157057e8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
@@ -13,11 +13,11 @@ import { EuiFieldSearch } from '@elastic/eui';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiFlexItem } from '@elastic/eui';
 import { EuiButtonEmpty } from '@elastic/eui';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { TabContent, TabProps } from './shared';
 import { LogStream } from '../../../../../../components/log_stream';
 import { useWaffleOptionsContext } from '../../../hooks/use_waffle_options';
 import { findInventoryFields } from '../../../../../../../common/inventory_models';
-import { useLinkProps } from '../../../../../../../../observability/public';
 import { getNodeLogsUrl } from '../../../../../link_to';
 
 const TabComponent = (props: TabProps) => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx
index 9c9e91b814fad..2c371691f4587 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx
@@ -10,9 +10,9 @@ import { EuiFlexItem } from '@elastic/eui';
 import React from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { colorTransformer } from '../../../../../../../../common/color_palette';
 import { MetricsExplorerOptionsMetric } from '../../../../../metrics_explorer/hooks/use_metrics_explorer_options';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   title: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx
index c8f924042b195..6c6992c118ca5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/charts';
 import React from 'react';
 import moment from 'moment';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { MetricsExplorerSeries } from '../../../../../../../../common/http_api';
 import { MetricExplorerSeriesChart } from '../../../../../metrics_explorer/components/series_chart';
 import {
@@ -25,7 +26,6 @@ import {
 } from '../../../../../metrics_explorer/hooks/use_metrics_explorer_options';
 import { ChartHeader } from './chart_header';
 import { getTimelineChartTheme } from '../../../../../metrics_explorer/components/helpers/get_chart_theme';
-import { useUiSetting } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 
 const CHART_SIZE: ChartSizeArray = ['100%', 160];
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx
index 98944dd3f30c9..b9d314459477e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { Chart, niceTimeFormatter, PointerEvent } from '@elastic/charts';
 import { EuiLoadingChart, EuiSpacer, EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
 import { first, last } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TabContent, TabProps } from '../shared';
 import { useSnapshot } from '../../../../hooks/use_snaphot';
 import { useWaffleOptionsContext } from '../../../../hooks/use_waffle_options';
@@ -28,7 +29,6 @@ import {
 } from '../../../../../../../../common/http_api';
 import { createInventoryMetricFormatter } from '../../../../lib/create_inventory_metric_formatter';
 import { calculateDomain } from '../../../../../metrics_explorer/components/helpers/calculate_domain';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { ChartSection } from './chart_section';
 import {
   SYSTEM_METRIC_NAME,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx
index 2b772378ba590..d05c49c724579 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx
@@ -21,8 +21,8 @@ import {
   EuiButton,
   EuiSpacer,
 } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { AutoSizer } from '../../../../../../../components/auto_sizer';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { Process } from './types';
 import { ProcessRowCharts } from './process_row_charts';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx
index a847b4a808a73..2270b1e827e1b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx
@@ -18,15 +18,15 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { Axis, Chart, Settings, Position, TooltipValue, niceTimeFormatter } from '@elastic/charts';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { createFormatter } from '../../../../../../../../common/formatters';
-import { useUiSetting } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 import { getChartTheme } from '../../../../../metrics_explorer/components/helpers/get_chart_theme';
 import { calculateDomain } from '../../../../../metrics_explorer/components/helpers/calculate_domain';
 import { MetricsExplorerChartType } from '../../../../../metrics_explorer/hooks/use_metrics_explorer_options';
 import { MetricExplorerSeriesChart } from '../../../../../metrics_explorer/components/series_chart';
 import { MetricsExplorerAggregation } from '../../../../../../../../common/http_api';
 import { Color } from '../../../../../../../../common/color_palette';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { useProcessListRowChart } from '../../../../hooks/use_process_list_row_chart';
 import { Process } from './types';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx
index 1f6bed056f238..113daaa84461f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx
@@ -24,9 +24,9 @@ import {
   LEFT_ALIGNMENT,
   RIGHT_ALIGNMENT,
 } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ProcessListAPIResponse } from '../../../../../../../../common/http_api';
 import { FORMATTERS } from '../../../../../../../../common/formatters';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { SortBy } from '../../../../hooks/use_process_list';
 import { Process } from './types';
 import { ProcessRow } from './process_row';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx
index e1b3d1d616837..7df1e49bd46f0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx
@@ -17,7 +17,7 @@ import {
   EuiDescriptionListDescription,
   EuiHorizontalRule,
 } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ProcessListAPIResponse } from '../../../../../../../../common/http_api';
 import { STATE_NAMES } from './states';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx
index 010a1a9941335..22c2af5496a60 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx
@@ -8,6 +8,7 @@
 import React, { useCallback, useContext, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingChart } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TabContent, TabProps } from '../shared';
 import { Source } from '../../../../../../../containers/metrics_source';
 import { findInventoryModel } from '../../../../../../../../common/inventory_models';
@@ -16,7 +17,6 @@ import { useMetadata } from '../../../../../metric_detail/hooks/use_metadata';
 import { getFields } from './build_fields';
 import { useWaffleTimeContext } from '../../../../hooks/use_waffle_time';
 import { Table } from './table';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { useWaffleFiltersContext } from '../../../../hooks/use_waffle_filters';
 
 const TabComponent = (props: TabProps) => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx
index f011f91a2e9df..41449e195ade8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InventoryItemType } from '../../../../../../../common/inventory_models/types';
 import { InfraWaffleMapOptions, InfraWaffleMapNode } from '../../../../../../lib/lib';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 export interface TabProps {
   options: InfraWaffleMapOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
index cec595e4be3d6..ab0a75e1cd9f5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
@@ -9,8 +9,8 @@ import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
 import { getBreakpoint } from '@elastic/eui';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { InfraWaffleMapBounds, InfraWaffleMapOptions, InfraFormatter } from '../../../../lib/lib';
 import { NoData } from '../../../../components/empty_states';
 import { InfraLoadingPanel } from '../../../../components/loading';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx
index 70e613d536ef3..0477998bb41b2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx
@@ -26,7 +26,8 @@ import {
 import { EuiFlexItem } from '@elastic/eui';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
-import { useUiSetting } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { toMetricOpt } from '../../../../../../common/snapshot_metric_i18n';
 import { MetricsExplorerAggregation } from '../../../../../../common/http_api';
 import { colorTransformer, Color } from '../../../../../../common/color_palette';
@@ -40,7 +41,6 @@ import { MetricsExplorerChartType } from '../../../metrics_explorer/hooks/use_me
 import { getTimelineChartTheme } from '../../../metrics_explorer/components/helpers/get_chart_theme';
 import { calculateDomain } from '../../../metrics_explorer/components/helpers/calculate_domain';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { InfraFormatter } from '../../../../../lib/lib';
 import { useMetricsHostsAnomaliesResults } from '../../hooks/use_metrics_hosts_anomalies';
 import { useMetricsK8sAnomaliesResults } from '../../hooks/use_metrics_k8s_anomalies';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
index d8b578769a1cb..0f517b1f12aee 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ConditionalToolTip } from './conditional_tooltip';
 import { InfraWaffleMapNode } from '../../../../../lib/lib';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx
index a47512906abd1..fdc4ff0124cf6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { first } from 'lodash';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { getCustomMetricLabel } from '../../../../../../common/formatters/get_custom_metric_label';
 import { SnapshotCustomMetricInput } from '../../../../../../common/http_api';
-import { withTheme, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { useSourceContext } from '../../../../../containers/metrics_source';
 import { findInventoryModel } from '../../../../../../common/inventory_models';
 import {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx
index 062349fa3ec6c..99d5cadde8a8e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraFormatter,
   InfraWaffleMapBounds,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
index 6e1c75ad22bb0..6de97efef44ad 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
@@ -8,7 +8,7 @@
 import { EuiLink, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InfraWaffleMapGroup, InfraWaffleMapOptions } from '../../../../../lib/lib';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
index 755512e0f6d40..634d98f28d8b5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapGroupOfGroups,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
index c6291d4ec4050..043586b682693 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { isEqual } from 'lodash';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapGroupOfNodes,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx
index 853aa98bf6244..0679926470ff2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraFormatter,
   InfraWaffleMapBounds,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
index 8c5fe72c4f48a..e0d03284d63fc 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { nodesToWaffleMap } from '../../lib/nodes_to_wafflemap';
 import { isWaffleMapGroupWithGroups, isWaffleMapGroupWithNodes } from '../../lib/type_guards';
 import { InfraWaffleMapBounds, InfraWaffleMapOptions } from '../../../../../lib/lib';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
index b1dd72b572a89..c55bdba5179b6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
@@ -22,13 +22,13 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import {
   SnapshotCustomAggregation,
   SnapshotCustomMetricInput,
   SNAPSHOT_CUSTOM_AGGREGATIONS,
   SnapshotCustomAggregationRT,
 } from '../../../../../../../common/http_api/snapshot_api';
-import { EuiTheme, withTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
 import { DerivedIndexPattern } from '../../../../../../containers/metrics_source';
 
 interface SelectedOption {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
index 58088f0b208f8..8ea98859b2c16 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import { getCustomMetricLabel } from '../../../../../../../common/formatters/get_custom_metric_label';
 import { SnapshotCustomMetricInput } from '../../../../../../../common/http_api/snapshot_api';
-import { EuiTheme, withTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   theme: EuiTheme | undefined;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
index 8c2cb77d339e2..a27e21e7f511a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
@@ -9,9 +9,9 @@ import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiButton } from '@elastic/e
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import { CustomMetricMode } from './types';
 import { SnapshotCustomMetricInput } from '../../../../../../../common/http_api/snapshot_api';
-import { EuiTheme, withTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   theme: EuiTheme | undefined;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
index 7c626e7a74736..0eda4c4b72cd1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 
 import { first } from 'lodash';
 import { EuiPopover, EuiToolTip } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapNode,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
index 88b7bfeeec4d7..88fbb10b62ead 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
@@ -10,13 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import React, { useMemo, useState } from 'react';
-import { AlertFlyout } from '../../../../../alerting/inventory/components/alert_flyout';
-import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
-import { getNodeDetailUrl, getNodeLogsUrl } from '../../../../link_to';
-import { findInventoryModel, findInventoryFields } from '../../../../../../common/inventory_models';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
-import { InventoryItemType } from '../../../../../../common/inventory_models/types';
-import { withTheme, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import {
   Section,
   SectionLinkProps,
@@ -25,8 +20,13 @@ import {
   SectionLinks,
   SectionLink,
   ActionMenuDivider,
-} from '../../../../../../../observability/public';
-import { useLinkProps } from '../../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
+import { AlertFlyout } from '../../../../../alerting/inventory/components/alert_flyout';
+import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
+import { getNodeDetailUrl, getNodeLogsUrl } from '../../../../link_to';
+import { findInventoryModel, findInventoryFields } from '../../../../../../common/inventory_models';
+import { InventoryItemType } from '../../../../../../common/inventory_models/types';
 import { navigateToUptime } from '../../lib/navigate_to_uptime';
 import { InfraClientCoreStart, InfraClientStartDeps } from '../../../../../types';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx
index 4c00b9afa225a..132982eae69b9 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InventoryColorPalette } from '../../../../../lib/lib';
 import { getColorPalette } from '../../lib/get_color_palette';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
index 339426b126b9e..9185a6398f162 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiText } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraFormatter,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx
index e3c3fde300677..9d39f8a7f4a1a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx
@@ -8,7 +8,7 @@
 import { darken } from 'polished';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraFormatter,
   InfraWaffleMapRuleOperator,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx
index 1e24da81ab379..419e41ae04557 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx
@@ -15,9 +15,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InfraGroupByOptions } from '../../../../../lib/lib';
 import { CustomFieldPanel } from './custom_field_panel';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { InventoryItemType } from '../../../../../../common/inventory_models/types';
 import { SnapshotGroupBy } from '../../../../../../common/http_api/snapshot_api';
 import { DropdownButton } from '../dropdown_button';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
index dd5b1857e1e64..f4515ac3be7d0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useMemo, useState, ReactNode } from 'react';
 import { EuiSwitch, EuiContextMenuPanelDescriptor, EuiPopover, EuiContextMenu } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { EuiTheme, withTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import { WaffleSortOption } from '../../hooks/use_waffle_options';
 import { DropdownButton } from '../dropdown_button';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
index eda92f8dfb0ea..64c0f36a9cf92 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
@@ -9,8 +9,8 @@ import { EuiButton, EuiDatePicker, EuiFlexGroup, EuiFlexItem, EuiToolTip } from
 import { FormattedMessage } from '@kbn/i18n-react';
 import moment, { Moment } from 'moment';
 import React, { useCallback } from 'react';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { convertIntervalToString } from '../../../../../utils/convert_interval_to_string';
-import { withTheme, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { useWaffleTimeContext } from '../../hooks/use_waffle_time';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts
index b28a0ff0b4788..ce2c05c103811 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts
@@ -6,7 +6,7 @@
  */
 
 import { useMemo, useState, useCallback, useEffect, useReducer } from 'react';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   INFA_ML_GET_METRICS_HOSTS_ANOMALIES_PATH,
   Metric,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts
index 986c4dfa2f8e8..0545c98656652 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts
@@ -6,7 +6,7 @@
  */
 
 import { useMemo, useState, useCallback, useEffect, useReducer } from 'react';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   Sort,
   Pagination,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
index 87765088d6343..47e8d739d73e8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
@@ -8,6 +8,9 @@
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { FilterBar } from './components/filter_bar';
 
 import { DocumentTitle } from '../../../components/document_title';
@@ -15,15 +18,12 @@ import { DocumentTitle } from '../../../components/document_title';
 import { SourceErrorPage } from '../../../components/source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { Source } from '../../../containers/metrics_source';
-import { useTrackPageview } from '../../../../../observability/public';
 import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
 import { LayoutView } from './components/layout_view';
 import { SavedViewProvider } from '../../../containers/saved_view/saved_view';
 import { DEFAULT_WAFFLE_VIEW_STATE } from './hooks/use_waffle_view_state';
 import { useWaffleOptionsContext } from './hooks/use_waffle_options';
 import { MetricsPageTemplate } from '../page_template';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
 import { inventoryTitle } from '../../../translations';
 import { SavedViews } from './components/saved_views';
 import { SnapshotContainer } from './components/snapshot_container';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts
index 1ad00e82a6ac3..74ce3dc55e999 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { uptimeOverviewLocatorID } from '@kbn/observability-plugin/public';
+import { LocatorClient } from '@kbn/share-plugin/common/url_service/locators';
 import { InfraWaffleMapNode } from '../../../../lib/lib';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
-import { uptimeOverviewLocatorID } from '../../../../../../observability/public';
-import { LocatorClient } from '../../../../../../../../src/plugins/share/common/url_service/locators';
 
 export const navigateToUptime = (
   locators: LocatorClient,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
index 0affa883ed134..38db16c314a70 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
@@ -18,6 +18,7 @@ import {
   BrushEndListener,
 } from '@elastic/charts';
 import { EuiPageContentBody } from '@elastic/eui';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { getChartTheme } from '../../metrics_explorer/components/helpers/get_chart_theme';
 import { SeriesChart } from './series_chart';
 import {
@@ -30,7 +31,6 @@ 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 = ({
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
index 709357719763b..9afa35e0acc9f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
@@ -17,7 +17,7 @@ import {
 import { get, last, max } from 'lodash';
 import React, { ReactText } from 'react';
 
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { createFormatter } from '../../../../../common/formatters';
 import { InventoryFormatterType } from '../../../../../common/inventory_models/types';
 import { SeriesOverrides, VisSectionProps } from '../types';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
index 14cc8d4d3eb1b..2d7820af4bd4a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
@@ -8,9 +8,9 @@
 import { EuiButton, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { ViewSourceConfigurationButton } from '../../../../components/source_configuration/view_source_configuration_button';
-import { useLinkProps } from '../../../../../../observability/public';
 
 interface InvalidNodeErrorProps {
   nodeName: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
index 37fe0d523073c..cea4c92e1d113 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiPageContent } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const LayoutContent = euiStyled(EuiPageContent)`
   position: relative;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx
index fa1ff9d60505b..924e82fc4a4df 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx
@@ -9,8 +9,8 @@ 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 { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InfraMetadata } from '../../../../../common/http_api';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { MetadataContext } from '../containers/metadata_context';
 
 interface FieldDef {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx
index b141bcd0d6283..ddc418c50ce8a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx
@@ -7,8 +7,8 @@
 
 import { EuiSuperDatePicker, OnRefreshChangeProps, OnTimeChangeProps } from '@elastic/eui';
 import React, { useCallback } from 'react';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { MetricsTimeInput } from '../hooks/use_metrics_time';
 import { useKibanaUiSetting } from '../../../../utils/use_kibana_ui_setting';
 import { mapKibanaQuickRangesToDatePickerRanges } from '../../../../utils/map_timepicker_quickranges_to_datepicker_ranges';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx
index 5260cd4d680f6..c3c37b4146a7a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx
@@ -9,7 +9,7 @@ import { createMemoryHistory } from 'history';
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { mountHook } from '@kbn/test-jest-helpers';
-import { ScopedHistory } from '../../../../../../../../src/core/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { useMetricsTime } from './use_metrics_time';
 
 describe('useMetricsTime hook', () => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
index 7d5c9b78b0095..e6843b98cf701 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
@@ -7,7 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useContext, useState } from 'react';
-import { EuiTheme, withTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { DocumentTitle } from '../../../components/document_title';
 import { withMetricPageProviders } from './page_providers';
 import { useMetadata } from './hooks/use_metadata';
@@ -19,7 +20,6 @@ import { NavItem } from './lib/side_nav_context';
 import { NodeDetailsPage } from './components/node_details_page';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
 import { useMetricsTimeContext } from './hooks/use_metrics_time';
-import { useLinkProps } from '../../../../../observability/public';
 import { MetricsPageTemplate } from '../page_template';
 import { inventoryTitle } from '../../../translations';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts b/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts
index 2b67e3af02c2f..31399b5f8696c 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts
@@ -6,7 +6,7 @@
  */
 
 import rt from 'io-ts';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { InventoryFormatterTypeRT } from '../../../../common/inventory_models/types';
 import { MetricsTimeInput } from './hooks/use_metrics_time';
 import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
index c178532c13b92..92297b1e47b22 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
@@ -19,6 +19,8 @@ import {
 } from '@elastic/charts';
 import { first, last } from 'lodash';
 import moment from 'moment';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
 import {
@@ -27,7 +29,6 @@ import {
   MetricsExplorerYAxisMode,
   MetricsExplorerChartOptions,
 } from '../hooks/use_metrics_explorer_options';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { createFormatterForMetric } from './helpers/create_formatter_for_metric';
 import { MetricExplorerSeriesChart } from './series_chart';
 import { MetricsExplorerChartContextMenu } from './chart_context_menu';
@@ -36,7 +37,6 @@ 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';
 import { ChartTitle } from './chart_title';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx
index 49568bdd8404c..8f9106ed04539 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx
@@ -14,9 +14,9 @@ import {
   timeRange,
   chartOptions,
 } from '../../../../utils/fixtures/metrics_explorer';
-import { Capabilities } from 'src/core/public';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { Capabilities } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const coreStartMock = coreMock.createStart();
 const series = { id: 'exmaple-01', rows: [], columns: [] };
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
index 9a2b8366f920f..65770d4b97889 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
@@ -15,7 +15,8 @@ import {
   EuiPopover,
 } from '@elastic/eui';
 import DateMath from '@kbn/datemath';
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import { AlertFlyout } from '../../../../alerting/metric_threshold/components/alert_flyout';
 import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
@@ -28,7 +29,6 @@ import { createTSVBLink } from './helpers/create_tsvb_link';
 import { getNodeDetailUrl } from '../../../link_to/redirect_to_node_detail';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
 import { HOST_FIELD, POD_FIELD, CONTAINER_FIELD } from '../../../../../common/constants';
-import { useLinkProps } from '../../../../../../observability/public';
 
 export interface Props {
   options: MetricsExplorerOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
index 7c6e77876ac67..7db25ae6898f1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
@@ -8,6 +8,7 @@
 import { encode } from 'rison-node';
 import uuid from 'uuid';
 import { set } from '@elastic/safer-lodash-set';
+import { LinkDescriptor } from '@kbn/observability-plugin/public';
 import { TIMESTAMP_FIELD } from '../../../../../../common/constants';
 import { MetricsSourceConfigurationProperties } from '../../../../../../common/metrics_sources';
 import { colorTransformer, Color } from '../../../../../../common/color_palette';
@@ -23,7 +24,6 @@ import {
 import { metricToFormat } from './metric_to_format';
 import { InfraFormatterType } from '../../../../../lib/lib';
 import { createMetricLabel } from './create_metric_label';
-import { LinkDescriptor } from '../../../../../../../observability/public';
 
 /*
  We've recently changed the default index pattern in Metrics UI from `metricbeat-*` to
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
index 710f547d003ca..0e7d4e6d41e1b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
@@ -9,9 +9,9 @@ import { i18n } from '@kbn/i18n';
 import { fromKueryExpression } from '@kbn/es-query';
 import React, { useEffect, useState } from 'react';
 import { DataViewBase } from '@kbn/es-query';
+import { QuerySuggestion } from '@kbn/unified-search-plugin/public';
 import { WithKueryAutocompletion } from '../../../../containers/with_kuery_autocompletion';
 import { AutocompleteField } from '../../../../components/autocomplete_field';
-import { QuerySuggestion } from '../../../../../../../../src/plugins/data/public';
 
 type LoadSuggestionsFn = (
   e: string,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
index 92d196c68f59f..747b90367e4b0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiSuperDatePicker, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import {
   MetricsExplorerMetric,
   MetricsExplorerAggregation,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
index 0f903e4c4553a..1813b2a81c101 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { useMetricsExplorerData } from './use_metrics_explorer_data';
 
 import { renderHook } from '@testing-library/react-hooks';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import {
   options,
@@ -21,7 +21,7 @@ import {
 } from '../../../../utils/fixtures/metrics_explorer';
 import { MetricsExplorerOptions, MetricsExplorerTimeOptions } from './use_metrics_explorer_options';
 import { DataViewBase } from '@kbn/es-query';
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 
 const mockedFetch = jest.fn();
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
index ab4bf11dadb35..2c1be3d17f6f8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
@@ -10,6 +10,7 @@ import { useEffect, useState } from 'react';
 import { DataViewBase } from '@kbn/es-query';
 import { isEqual } from 'lodash';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import {
   MetricsExplorerResponse,
@@ -17,7 +18,6 @@ import {
 } from '../../../../../common/http_api/metrics_explorer';
 import { convertKueryToElasticSearchQuery } from '../../../../utils/kuery';
 import { MetricsExplorerOptions, MetricsExplorerTimeOptions } from './use_metrics_explorer_options';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import { useTrackedPromise } from '../../../../utils/use_tracked_promise';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
index 7f331d54b9839..a475ae1c88c9a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
@@ -8,8 +8,8 @@
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useContext } from 'react';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../common/metrics_sources';
-import { useTrackPageview } from '../../../../../observability/public';
 import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
 import { DocumentTitle } from '../../../components/document_title';
 import { NoData } from '../../../components/empty_states';
diff --git a/x-pack/plugins/infra/public/pages/metrics/page_template.tsx b/x-pack/plugins/infra/public/pages/metrics/page_template.tsx
index 4da671283644d..3d6e8e6743947 100644
--- a/x-pack/plugins/infra/public/pages/metrics/page_template.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/page_template.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
-import type { LazyObservabilityPageTemplateProps } from '../../../../observability/public';
-import { KibanaPageTemplateProps } from '../../../../../../src/plugins/kibana_react/public';
 
 interface MetricsPageTemplateProps extends LazyObservabilityPageTemplateProps {
   hasData?: boolean;
diff --git a/x-pack/plugins/infra/public/pages/metrics/settings.tsx b/x-pack/plugins/infra/public/pages/metrics/settings.tsx
index c54725ab39754..62d23ef4f8470 100644
--- a/x-pack/plugins/infra/public/pages/metrics/settings.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/settings.tsx
@@ -7,7 +7,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { SourceConfigurationSettings } from './settings/source_configuration_settings';
 
 export const MetricsSettingsPage = () => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
index 076110a7a79c2..eab8a82bc2d1e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
@@ -16,10 +16,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useContext, useMemo } from 'react';
+import { Prompt } from '@kbn/observability-plugin/public';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { Source } from '../../../containers/metrics_source';
 import { useInfraMLCapabilitiesContext } from '../../../containers/ml/infra_ml_capabilities';
-import { Prompt } from '../../../../../observability/public';
 import { IndicesConfigurationPanel } from './indices_configuration_panel';
 import { MLConfigurationPanel } from './ml_configuration_panel';
 import { NameConfigurationPanel } from './name_configuration_panel';
diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
index 623fab62f6286..f591acbde9d92 100644
--- a/x-pack/plugins/infra/public/plugin.ts
+++ b/x-pack/plugins/infra/public/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AppMountParameters, PluginInitializerContext } from 'kibana/public';
+import { AppMountParameters, PluginInitializerContext } from '@kbn/core/public';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 import { defaultLogViewsStaticConfig } from '../common/log_views';
 import { InfraPublicConfig } from '../common/plugin_config_types';
 import { createInventoryMetricRuleType } from './alerting/inventory';
diff --git a/x-pack/plugins/infra/public/register_feature.ts b/x-pack/plugins/infra/public/register_feature.ts
index 116308b95f6f9..968dc72f217e6 100644
--- a/x-pack/plugins/infra/public/register_feature.ts
+++ b/x-pack/plugins/infra/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  HomePublicPluginSetup,
-  FeatureCatalogueCategory,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
   homePlugin.featureCatalogue.register({
@@ -24,7 +21,7 @@ export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
     icon: 'metricsApp',
     path: `/app/metrics`,
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
   });
 
   homePlugin.featureCatalogue.register({
@@ -39,6 +36,6 @@ export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
     icon: 'logsApp',
     path: `/app/logs`,
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
   });
 };
diff --git a/x-pack/plugins/infra/public/services/log_views/log_views_client.ts b/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
index f6214a6164f4a..0de44f87d719e 100644
--- a/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
+++ b/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
@@ -6,9 +6,9 @@
  */
 
 import * as rt from 'io-ts';
-import { HttpStart } from 'src/core/public';
-import { ISearchGeneric } from 'src/plugins/data/public';
-import { DataViewsContract } from 'src/plugins/data_views/public';
+import { HttpStart } from '@kbn/core/public';
+import { ISearchGeneric } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { lastValueFrom } from 'rxjs';
 import {
   getLogViewResponsePayloadRT,
diff --git a/x-pack/plugins/infra/public/services/log_views/types.ts b/x-pack/plugins/infra/public/services/log_views/types.ts
index 12dac93af6fa9..20e176db4cab4 100644
--- a/x-pack/plugins/infra/public/services/log_views/types.ts
+++ b/x-pack/plugins/infra/public/services/log_views/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { HttpStart } from 'src/core/public';
-import { ISearchStart } from 'src/plugins/data/public';
-import { DataViewsContract } from 'src/plugins/data_views/public';
+import { HttpStart } from '@kbn/core/public';
+import { ISearchStart } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import {
   LogView,
   LogViewAttributes,
diff --git a/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx b/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx
index 9330f83cd968a..7d32cb6360fdf 100644
--- a/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx
+++ b/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx
@@ -8,9 +8,9 @@
 import type { StoryContext } from '@storybook/addons';
 import React, { useEffect, useMemo, useState } from 'react';
 import { BehaviorSubject } from 'rxjs';
-import type { CoreTheme } from '../../../../../src/core/public';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import type { CoreTheme } from '@kbn/core/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
 export const useGlobalStorybookTheme = ({ globals: { euiTheme } }: StoryContext) => {
   const theme = useMemo(() => euiThemeFromId(euiTheme), [euiTheme]);
diff --git a/x-pack/plugins/infra/public/types.ts b/x-pack/plugins/infra/public/types.ts
index b4410b87d9b79..ab7df75592712 100644
--- a/x-pack/plugins/infra/public/types.ts
+++ b/x-pack/plugins/infra/public/types.ts
@@ -5,29 +5,29 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Plugin as PluginClass } from 'kibana/public';
-import { IHttpFetchError } from 'src/core/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
-import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
+import type { CoreSetup, CoreStart, Plugin as PluginClass } from '@kbn/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
 import type {
   UsageCollectionSetup,
   UsageCollectionStart,
-} from '../../../../src/plugins/usage_collection/public';
+} from '@kbn/usage-collection-plugin/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../plugins/triggers_actions_ui/public';
-import type { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public';
-import { MlPluginSetup, MlPluginStart } from '../../ml/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { DataEnhancedSetup, DataEnhancedStart } from '@kbn/data-enhanced-plugin/public';
+import { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
 import type {
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../observability/public';
+} from '@kbn/observability-plugin/public';
 // import type { OsqueryPluginStart } from '../../osquery/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { UnwrapPromise } from '../common/utility_types';
 import type {
   SourceProviderProps,
diff --git a/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts b/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts
index 9f04cae475c00..52f08f39bc2d4 100644
--- a/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts
@@ -6,7 +6,7 @@
  */
 
 import { map } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { ParsedDataSearchRequestDescriptor } from './types';
 
 export const flattenDataSearchResponseDescriptor = <
diff --git a/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts b/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts
index 71975af168f9f..0056b7466759a 100644
--- a/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts
@@ -7,8 +7,8 @@
 
 import { Observable, of } from 'rxjs';
 import { catchError, map, startWith } from 'rxjs/operators';
-import { IKibanaSearchResponse } from '../../../../../../src/plugins/data/public';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/public';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/public';
 import { SearchStrategyError } from '../../../common/search_strategies/common/errors';
 import { ParsedKibanaSearchResponse } from './types';
 
diff --git a/x-pack/plugins/infra/public/utils/data_search/types.ts b/x-pack/plugins/infra/public/utils/data_search/types.ts
index 5d68bddc23be0..3e2c6a15487b8 100644
--- a/x-pack/plugins/infra/public/utils/data_search/types.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/types.ts
@@ -10,7 +10,7 @@ import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
   ISearchOptions,
-} from '../../../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { SearchStrategyError } from '../../../common/search_strategies/common/errors';
 
 export interface DataSearchRequestDescriptor<Request extends IKibanaSearchRequest, RawResponse> {
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
index 79fe53f0a81b3..06f8ca1b82eb7 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
@@ -13,9 +13,9 @@ import {
   IKibanaSearchResponse,
   ISearchGeneric,
   ISearchStart,
-} from '../../../../../../src/plugins/data/public';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { createKibanaReactContext } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { PluginKibanaContextValue } from '../../hooks/use_kibana';
 import { normalizeDataSearchResponses } from './normalize_data_search_responses';
 import { useDataSearch } from './use_data_search_request';
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts
index f2dd5b9e87c93..230c2d87e0654 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts
@@ -12,7 +12,7 @@ import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
   ISearchOptions,
-} from '../../../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
 import { tapUnsubscribe, useObservable } from '../use_observable';
 import { ParsedDataSearchRequestDescriptor, ParsedKibanaSearchResponse } from './types';
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts b/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts
index 4c98649a0168a..c8ec672beb842 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts
@@ -7,7 +7,7 @@
 
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { useObservableState } from '../use_observable';
 import { ParsedDataSearchResponseDescriptor } from './types';
 
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
index 71c49ef75023e..a48cf2c7ccdc4 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
+++ b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { ParsedDataSearchRequestDescriptor, ParsedKibanaSearchResponse } from './types';
 import { useLatestPartialDataSearchResponse } from './use_latest_partial_data_search_response';
 
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
index 2cafceaad3cb5..48ff61eb676b9 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
@@ -7,7 +7,7 @@
 
 import { Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { useOperator } from '../use_observable';
 import { flattenDataSearchResponseDescriptor } from './flatten_data_search_response';
 import { ParsedDataSearchRequestDescriptor, ParsedDataSearchResponseDescriptor } from './types';
diff --git a/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx b/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
index bd54af25987eb..4e6381c9e6719 100644
--- a/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
+++ b/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 interface ContextProps {
   setHeaderActionMenu?: AppMountParameters['setHeaderActionMenu'];
diff --git a/x-pack/plugins/infra/public/utils/history_context.ts b/x-pack/plugins/infra/public/utils/history_context.ts
index ee9e595306280..07efcab8d0f6d 100644
--- a/x-pack/plugins/infra/public/utils/history_context.ts
+++ b/x-pack/plugins/infra/public/utils/history_context.ts
@@ -6,7 +6,7 @@
  */
 
 import { createContext, useContext } from 'react';
-import { ScopedHistory } from 'src/core/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 export const HistoryContext = createContext<ScopedHistory | undefined>(undefined);
 
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
index ffcffa29949e8..3ca7540e52bc1 100644
--- a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
+++ b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
@@ -7,7 +7,11 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { encode } from 'rison-node';
-import { FetchData, FetchDataParams, LogsFetchDataResponse } from '../../../observability/public';
+import {
+  FetchData,
+  FetchDataParams,
+  LogsFetchDataResponse,
+} from '@kbn/observability-plugin/public';
 import { DEFAULT_SOURCE_ID, TIMESTAMP_FIELD } from '../../common/constants';
 import { InfraClientStartDeps, InfraClientStartServicesAccessor } from '../types';
 
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
index 81077f82d048d..dad3dedc4bb46 100644
--- a/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
+++ b/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { of } from 'rxjs';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createResolvedLogViewMock } from '../../common/log_views/resolved_log_view.mock';
 import { createInfraPluginStartMock } from '../mocks';
 import { InfraClientStartDeps, InfraClientStartExports } from '../types';
diff --git a/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx b/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
index c4e633b1727d2..ff8b4b89a19fd 100644
--- a/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
+++ b/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import * as React from 'react';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 
 interface ContextProps {
   triggersActionsUI: TriggersAndActionsUIPublicPluginStart | null;
diff --git a/x-pack/plugins/infra/public/utils/url_state.tsx b/x-pack/plugins/infra/public/utils/url_state.tsx
index 8148463ab3fe3..77f04292cbde2 100644
--- a/x-pack/plugins/infra/public/utils/url_state.tsx
+++ b/x-pack/plugins/infra/public/utils/url_state.tsx
@@ -11,7 +11,7 @@ import { throttle } from 'lodash';
 import React from 'react';
 import { Route, RouteProps } from 'react-router-dom';
 import { decode, encode, RisonValue } from 'rison-node';
-import { url } from '../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 interface UrlStateContainerProps<UrlState> {
   urlState: UrlState | undefined;
diff --git a/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts b/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts
index 5c75e67f62306..521cd0142303b 100644
--- a/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts
+++ b/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts
@@ -8,8 +8,8 @@
 import type { EsQueryConfig } from '@kbn/es-query';
 import { SerializableRecord } from '@kbn/utility-types';
 import { useMemo } from 'react';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 
 export const useKibanaQuerySettings = (): EsQueryConfig => {
   const [allowLeadingWildcards] = useUiSetting$<boolean>(UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS);
diff --git a/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts b/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts
index c361beb91a6df..588ad0507dcd4 100644
--- a/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts
+++ b/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts
@@ -6,7 +6,7 @@
  */
 
 import { useMemo } from 'react';
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 
 /**
  * This hook behaves like a `useState` hook in that it provides a requested
diff --git a/x-pack/plugins/infra/public/utils/use_url_state.ts b/x-pack/plugins/infra/public/utils/use_url_state.ts
index eef82438ff017..309bdd3106f89 100644
--- a/x-pack/plugins/infra/public/utils/use_url_state.ts
+++ b/x-pack/plugins/infra/public/utils/use_url_state.ts
@@ -10,7 +10,7 @@ import { Location } from 'history';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { decode, encode, RisonValue } from 'rison-node';
 import { useHistory } from 'react-router-dom';
-import { url } from '../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 export const useUrlState = <State>({
   defaultState,
diff --git a/x-pack/plugins/infra/server/deprecations.ts b/x-pack/plugins/infra/server/deprecations.ts
index 5e016bc094826..51616f4c1a528 100644
--- a/x-pack/plugins/infra/server/deprecations.ts
+++ b/x-pack/plugins/infra/server/deprecations.ts
@@ -12,7 +12,7 @@ import {
   ConfigDeprecation,
   DeprecationsDetails,
   GetDeprecationsContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   TIMESTAMP_FIELD,
   TIEBREAKER_FIELD,
diff --git a/x-pack/plugins/infra/server/features.ts b/x-pack/plugins/infra/server/features.ts
index 4c9b4ba531d80..a1b1a7b729193 100644
--- a/x-pack/plugins/infra/server/features.ts
+++ b/x-pack/plugins/infra/server/features.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import { LOG_DOCUMENT_COUNT_RULE_TYPE_ID } from '../common/alerting/logs/log_threshold/types';
 import {
   METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
@@ -33,7 +33,7 @@ export const METRICS_FEATURE = {
     all: {
       app: ['infra', 'metrics', 'kibana'],
       catalogue: ['infraops', 'metrics'],
-      api: ['infra'],
+      api: ['infra', 'rac'],
       savedObject: {
         all: ['infrastructure-ui-source'],
         read: ['index-pattern'],
@@ -54,7 +54,7 @@ export const METRICS_FEATURE = {
     read: {
       app: ['infra', 'metrics', 'kibana'],
       catalogue: ['infraops', 'metrics'],
-      api: ['infra'],
+      api: ['infra', 'rac'],
       savedObject: {
         all: [],
         read: ['infrastructure-ui-source', 'index-pattern'],
@@ -92,7 +92,7 @@ export const LOGS_FEATURE = {
     all: {
       app: ['infra', 'logs', 'kibana'],
       catalogue: ['infralogging', 'logs'],
-      api: ['infra'],
+      api: ['infra', 'rac'],
       savedObject: {
         all: [infraSourceConfigurationSavedObjectName, logViewSavedObjectName],
         read: [],
@@ -113,7 +113,7 @@ export const LOGS_FEATURE = {
     read: {
       app: ['infra', 'logs', 'kibana'],
       catalogue: ['infralogging', 'logs'],
-      api: ['infra'],
+      api: ['infra', 'rac'],
       alerting: {
         rule: {
           read: [LOG_DOCUMENT_COUNT_RULE_TYPE_ID],
diff --git a/x-pack/plugins/infra/server/index.ts b/x-pack/plugins/infra/server/index.ts
index dcaa3df2db23c..2bfd868831ecc 100644
--- a/x-pack/plugins/infra/server/index.ts
+++ b/x-pack/plugins/infra/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { config, InfraConfig, InfraServerPlugin } from './plugin';
 
 export type { InfraPluginSetup, InfraPluginStart, InfraRequestHandlerContext } from './types';
diff --git a/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
index 268afccd4c2bc..59f6781cda4aa 100644
--- a/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FieldSpec } from 'src/plugins/data/common';
+import { FieldSpec } from '@kbn/data-plugin/common';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
 import { KibanaFramework } from '../framework/kibana_framework_adapter';
 import { FieldsAdapter, IndexFieldDescriptor } from './adapter_types';
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
index 7a0f44883f036..64d389a1c0bf7 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
@@ -7,21 +7,21 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Lifecycle } from '@hapi/hapi';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { JsonArray, JsonValue } from '@kbn/utility-types';
-import { RouteConfig, RouteMethod } from '../../../../../../../src/core/server';
+import { RouteConfig, RouteMethod } from '@kbn/core/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../../../../src/plugins/data/server';
-import { PluginStart as DataViewsPluginStart } from '../../../../../../../src/plugins/data_views/server';
-import { HomeServerPluginSetup } from '../../../../../../../src/plugins/home/server';
-import { VisTypeTimeseriesSetup } from '../../../../../../../src/plugins/vis_types/timeseries/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../plugins/features/server';
-import { SpacesPluginSetup } from '../../../../../../plugins/spaces/server';
-import { PluginSetupContract as AlertingPluginContract } from '../../../../../alerting/server';
-import { MlPluginSetup } from '../../../../../ml/server';
-import { RuleRegistryPluginSetupContract } from '../../../../../rule_registry/server';
+} from '@kbn/data-plugin/server';
+import { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import { PluginSetupContract as AlertingPluginContract } from '@kbn/alerting-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
+import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 
 export interface InfraServerPluginSetupDeps {
   data: DataPluginSetup;
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index d5c33945b8a5e..7aa4b433c477c 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -7,16 +7,10 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TransportRequestParams } from '@elastic/elasticsearch';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import {
-  CoreSetup,
-  IRouter,
-  KibanaRequest,
-  RequestHandler,
-  RouteMethod,
-} from '../../../../../../../src/core/server';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/server';
-import { TimeseriesVisData } from '../../../../../../../src/plugins/vis_types/timeseries/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { CoreSetup, IRouter, KibanaRequest, RequestHandler, RouteMethod } from '@kbn/core/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
+import { TimeseriesVisData } from '@kbn/vis-type-timeseries-plugin/server';
 import { TSVBMetricModel } from '../../../../common/inventory_models/types';
 import { InfraConfig } from '../../../plugin';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
@@ -130,7 +124,7 @@ export class KibanaFramework {
     endpoint: string,
     params: CallWithRequestParams
   ) {
-    const { elasticsearch, uiSettings } = requestContext.core;
+    const { elasticsearch, uiSettings } = await requestContext.core;
 
     const includeFrozen = await uiSettings.client.get<boolean>(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
     if (endpoint === 'msearch') {
@@ -206,9 +200,10 @@ export class KibanaFramework {
   public async getIndexPatternsServiceWithRequestContext(
     requestContext: InfraPluginRequestHandlerContext
   ) {
+    const { savedObjects, elasticsearch } = await requestContext.core;
     return await this.createIndexPatternsService(
-      requestContext.core.savedObjects.client,
-      requestContext.core.elasticsearch.client.asCurrentUser
+      savedObjects.client,
+      elasticsearch.client.asCurrentUser
     );
   }
 
diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
index e0c7600250bc9..9e8b243433f66 100644
--- a/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
 import {
   NodeDetailsRequest,
diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
index 3e1be0196231a..9708761daad61 100644
--- a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
@@ -6,8 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { flatten, get } from 'lodash';
+import { isVisSeriesData } from '@kbn/vis-type-timeseries-plugin/server';
 import { TIMESTAMP_FIELD } from '../../../../common/constants';
 import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
 import { KibanaFramework } from '../framework/kibana_framework_adapter';
@@ -22,7 +23,6 @@ import {
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
 import { CallWithRequestParams, InfraDatabaseSearchResponse } from '../framework';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
-import { isVisSeriesData } from '../../../../../../../src/plugins/vis_types/timeseries/server';
 
 export class KibanaMetricsAdapter implements InfraMetricsAdapter {
   private framework: KibanaFramework;
diff --git a/x-pack/plugins/infra/server/lib/alerting/common/messages.ts b/x-pack/plugins/infra/server/lib/alerting/common/messages.ts
index d61d4dd95b05e..3ca8160d2dda8 100644
--- a/x-pack/plugins/infra/server/lib/alerting/common/messages.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/common/messages.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AlertStates, Comparator } from '../../../../common/alerting/metrics';
 import {
   formatDurationFromTimeUnitChar,
   TimeUnitChar,
-} from '../../../../../observability/common/utils/formatters/duration';
+} from '@kbn/observability-plugin/common/utils/formatters/duration';
+import { AlertStates, Comparator } from '../../../../common/alerting/metrics';
 import { UNGROUPED_FACTORY_KEY } from './utils';
 
 export const DOCUMENT_COUNT_I18N = i18n.translate(
diff --git a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts
index e5e93ae4aa360..2618af72168cd 100644
--- a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts
@@ -8,10 +8,10 @@
 import { isEmpty, isError } from 'lodash';
 import { schema } from '@kbn/config-schema';
 import { Logger, LogMeta } from '@kbn/logging';
-import type { IBasePath } from 'kibana/server';
+import type { IBasePath } from '@kbn/core/server';
 import { ALERT_RULE_PARAMETERS, TIMESTAMP } from '@kbn/rule-data-utils';
+import { parseTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
 import { getInventoryViewInAppUrl } from '../../../../common/alerting/metrics/alert_link';
-import { parseTechnicalFields } from '../../../../../rule_registry/common/parse_technical_fields';
 import {
   AlertExecutionDetails,
   InventoryMetricConditions,
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
index 7aaee25304a08..d059e7a6a09ce 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { mapValues } from 'lodash';
 import { Logger } from '@kbn/logging';
 import { InventoryMetricConditions } from '../../../../common/alerting/metrics';
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
index f7d07c4e0e118..972f40bcb16ef 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
@@ -14,8 +14,8 @@ import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
   RecoveredActionGroup,
-} from '../../../../../alerting/common';
-import { Alert, RuleTypeState } from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { Alert, RuleTypeState } from '@kbn/alerting-plugin/server';
 import { AlertStates, InventoryMetricThresholdParams } from '../../../../common/alerting/metrics';
 import { createFormatter } from '../../../../common/formatters';
 import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label';
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts
index 91f298f2bf082..2dda6fd98ce8e 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ESSearchRequest } from 'src/core/types/elasticsearch';
+import { ESSearchRequest } from '@kbn/core/types/elasticsearch';
 import { findInventoryFields } from '../../../../../common/inventory_models';
 import { InfraTimerangeInput, SnapshotCustomMetricInput } from '../../../../../common/http_api';
 import {
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts
index c29c802f9391d..09ac4b47f2c9a 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Logger } from '@kbn/logging';
 import { InventoryMetricConditions } from '../../../../../common/alerting/metrics';
 import { InfraTimerangeInput, SnapshotCustomMetricInput } from '../../../../../common/http_api';
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts
index f7d1e80346d71..78898e9b5da56 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts
@@ -7,7 +7,8 @@
 
 import { schema, Type } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { PluginSetupContract } from '../../../../../alerting/server';
+import { PluginSetupContract } from '@kbn/alerting-plugin/server';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import {
   Comparator,
   METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
@@ -39,7 +40,6 @@ import {
   FIRED_ACTIONS_ID,
   WARNING_ACTIONS,
 } from './inventory_metric_threshold_executor';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 
 const condition = schema.object({
   threshold: schema.arrayOf(schema.number()),
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
index 12b523d126f80..042489a383766 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
@@ -12,7 +12,7 @@ import {
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   ActionGroup,
   ActionGroupIdsOf,
@@ -20,7 +20,7 @@ import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
   RuleTypeState,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 
 import {
   RuleParams,
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
index 5f43ac01485ed..38dc96fe4ce69 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
@@ -6,14 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { formatDurationFromTimeUnitChar, TimeUnitChar } from '@kbn/observability-plugin/common';
 import {
   Comparator,
   ComparatorToi18nSymbolsMap,
   TimeUnit,
 } from '../../../../common/alerting/logs/log_threshold/types';
 
-import { formatDurationFromTimeUnitChar, TimeUnitChar } from '../../../../../observability/common';
-
 export const getReasonMessageForUngroupedCountAlert = (
   actualCount: number,
   expectedCount: number,
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
index d7b73ce187396..50cc7b80603d9 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { PluginSetupContract } from '../../../../../alerting/server';
+import { PluginSetupContract } from '@kbn/alerting-plugin/server';
 import { createLogThresholdExecutor, FIRED_ACTIONS } from './log_threshold_executor';
 import {
   LOG_DOCUMENT_COUNT_RULE_TYPE_ID,
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts
index 78ed4cb4b7bbd..d625361be1472 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts
@@ -6,16 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { first } from 'lodash';
 import moment from 'moment';
 import {
   ActionGroup,
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
-} from '../../../../../alerting/common';
-import { RuleExecutorOptions } from '../../../../../alerting/server';
-import { MlPluginSetup } from '../../../../../ml/server';
+} from '@kbn/alerting-plugin/common';
+import { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { AlertStates, MetricAnomalyParams } from '../../../../common/alerting/metrics';
 import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
 import { MappedAnomalyHit } from '../../infra_ml';
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts
index 02e6028765bee..b27ae6889fd28 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts
@@ -7,12 +7,13 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { MlPluginSetup } from '../../../../../ml/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import {
   RuleType,
   AlertInstanceState as AlertState,
   AlertInstanceContext as AlertContext,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { RecoveredActionGroupId } from '@kbn/alerting-plugin/common';
 import {
   createMetricAnomalyExecutor,
   FIRED_ACTIONS,
@@ -22,7 +23,6 @@ import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../../common/alerting/metric
 import { InfraBackendLibs } from '../../infra_types';
 import { oneOfLiterals, validateIsStringElasticsearchJSONFilter } from '../common/utils';
 import { alertStateActionVariableDescription } from '../common/messages';
-import { RecoveredActionGroupId } from '../../../../../alerting/common';
 
 export type MetricAnomalyAllowedActionGroups = typeof FIRED_ACTIONS_ID;
 
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
index 81c714b30cb0d..05168edcac45c 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import moment from 'moment';
 import { difference, first, has, isNaN, isNumber, isObject, last, mapValues } from 'lodash';
 import {
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
index 95b10842d9b35..c215470a6d74e 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
@@ -8,16 +8,16 @@
 import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 // import { RecoveredActionGroup } from '../../../../../alerting/common';
 import {
   AlertInstanceMock,
   RuleExecutorServicesMock,
   alertsMock,
-} from '../../../../../alerting/server/mocks';
-import { LifecycleAlertServices } from '../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../rule_registry/server/mocks';
-import { createLifecycleRuleExecutorMock } from '../../../../../rule_registry/server/utils/create_lifecycle_rule_executor_mock';
+} from '@kbn/alerting-plugin/server/mocks';
+import { LifecycleAlertServices } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { createLifecycleRuleExecutorMock } from '@kbn/rule-registry-plugin/server/utils/create_lifecycle_rule_executor_mock';
 import {
   Aggregators,
   Comparator,
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
index 0b089c5eb5a86..c69595ee65207 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -13,8 +13,9 @@ import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
   RecoveredActionGroup,
-} from '../../../../../alerting/common';
-import { Alert, RuleTypeState } from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { Alert, RuleTypeState } from '@kbn/alerting-plugin/server';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import { AlertStates, Comparator } from '../../../../common/alerting/metrics';
 import { createFormatter } from '../../../../common/formatters';
 import { InfraBackendLibs } from '../../infra_types';
@@ -30,7 +31,6 @@ import { UNGROUPED_FACTORY_KEY, getViewInAppUrl } from '../common/utils';
 import { LINK_TO_METRICS_EXPLORER } from '../../../../common/alerting/metrics';
 
 import { EvaluatedRuleParams, evaluateRule } from './lib/evaluate_rule';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 
 export type MetricThresholdRuleParams = Record<string, any>;
 export type MetricThresholdRuleTypeState = RuleTypeState & {
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts
index a4ec6e4c4930e..e414214c60104 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { ActionGroupIdsOf } from '../../../../../alerting/common';
-import { PluginSetupContract, RuleType } from '../../../../../alerting/server';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { PluginSetupContract, RuleType } from '@kbn/alerting-plugin/server';
 import { Comparator, METRIC_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { METRIC_EXPLORER_AGGREGATIONS } from '../../../../common/http_api';
 import { InfraBackendLibs } from '../../infra_types';
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
index ee9a34ef9233a..37e59700b0488 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import * as utils from '../../alerting/common/utils';
+import * as utils from '../common/utils';
 jest
   .spyOn(utils, 'getViewInAppUrl')
   .mockReturnValue('http://localhost:5601/eyg/app/metrics/explorer');
diff --git a/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts b/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts
index a60de8b9c0ff9..e27c5b7fd4809 100644
--- a/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { PluginSetupContract } from '../../../../alerting/server';
+import { PluginSetupContract } from '@kbn/alerting-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { registerMetricThresholdRuleType } from './metric_threshold/register_metric_threshold_rule_type';
 import { registerMetricInventoryThresholdRuleType } from './inventory_metric_threshold/register_inventory_metric_threshold_rule_type';
 import { registerMetricAnomalyRuleType } from './metric_anomaly/register_metric_anomaly_rule_type';
 import { registerLogThresholdRuleType } from './log_threshold/register_log_threshold_rule_type';
 import { InfraBackendLibs } from '../infra_types';
-import { MlPluginSetup } from '../../../../ml/server';
 
 const registerRuleTypes = (
   alertingPlugin: PluginSetupContract,
diff --git a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
index 0997d9517fa8d..b80fa9d796021 100644
--- a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
@@ -20,10 +20,8 @@ export class InfraFieldsDomain {
     sourceId: string,
     indexType: 'METRICS'
   ): Promise<InfraSourceIndexField[]> {
-    const { configuration } = await this.libs.sources.getSourceConfiguration(
-      requestContext.core.savedObjects.client,
-      sourceId
-    );
+    const soClient = (await requestContext.core).savedObjects.client;
+    const { configuration } = await this.libs.sources.getSourceConfiguration(soClient, sourceId);
 
     const fields = await this.adapter.getIndexFields(requestContext, configuration.metricAlias);
 
diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
index ef6b7122aa4de..1e0daad376a1a 100644
--- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
@@ -42,6 +42,7 @@ export interface LogEntriesParams {
   cursor?: { before: LogEntryCursor | 'last' } | { after: LogEntryCursor | 'first' };
   highlightTerm?: string;
 }
+
 export interface LogEntriesAroundParams {
   startTimestamp: number;
   endTimestamp: number;
@@ -130,11 +131,9 @@ export class InfraLogEntriesDomain {
     columnOverrides?: LogViewColumnConfiguration[]
   ): Promise<{ entries: LogEntry[]; hasMoreBefore?: boolean; hasMoreAfter?: boolean }> {
     const [, , { logViews }] = await this.libs.getStartServices();
+    const { savedObjects, elasticsearch } = await requestContext.core;
     const resolvedLogView = await logViews
-      .getClient(
-        requestContext.core.savedObjects.client,
-        requestContext.core.elasticsearch.client.asCurrentUser
-      )
+      .getClient(savedObjects.client, elasticsearch.client.asCurrentUser)
       .getResolvedLogView(sourceId);
     const columnDefinitions = columnOverrides ?? resolvedLogView.columns;
 
@@ -192,11 +191,9 @@ export class InfraLogEntriesDomain {
     filterQuery?: LogEntryQuery
   ): Promise<LogEntriesSummaryBucket[]> {
     const [, , { logViews }] = await this.libs.getStartServices();
+    const { savedObjects, elasticsearch } = await requestContext.core;
     const resolvedLogView = await logViews
-      .getClient(
-        requestContext.core.savedObjects.client,
-        requestContext.core.elasticsearch.client.asCurrentUser
-      )
+      .getClient(savedObjects.client, elasticsearch.client.asCurrentUser)
       .getResolvedLogView(sourceId);
     const dateRangeBuckets = await this.adapter.getContainedLogSummaryBuckets(
       requestContext,
@@ -219,11 +216,9 @@ export class InfraLogEntriesDomain {
     filterQuery?: LogEntryQuery
   ): Promise<LogEntriesSummaryHighlightsBucket[][]> {
     const [, , { logViews }] = await this.libs.getStartServices();
+    const { savedObjects, elasticsearch } = await requestContext.core;
     const resolvedLogView = await logViews
-      .getClient(
-        requestContext.core.savedObjects.client,
-        requestContext.core.elasticsearch.client.asCurrentUser
-      )
+      .getClient(savedObjects.client, elasticsearch.client.asCurrentUser)
       .getResolvedLogView(sourceId);
     const messageFormattingRules = compileFormattingRules(
       getBuiltinRules(resolvedLogView.messageField)
diff --git a/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts b/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts
index 1e948bce490f4..44c1d850c5724 100644
--- a/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import type { InfraPluginRequestHandlerContext } from '../../types';
 import { InfraMetricsAdapter, InfraMetricsRequestOptions } from '../adapters/metrics/adapter_types';
 import { NodeDetailsMetricData } from '../../../common/http_api/node_details_api';
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/errors.ts b/x-pack/plugins/infra/server/lib/infra_ml/errors.ts
index 2ec11aa1da5e4..02762940ae9ea 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/errors.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/errors.ts
@@ -11,7 +11,7 @@ import {
   UnknownMLCapabilitiesError,
   InsufficientMLCapabilities,
   MLPrivilegesUninitialized,
-} from '../../../../ml/server';
+} from '@kbn/ml-plugin/server';
 
 export class NoLogAnalysisMlJobError extends Error {
   constructor(message?: string) {
diff --git a/x-pack/plugins/infra/server/lib/infra_types.ts b/x-pack/plugins/infra/server/lib/infra_types.ts
index 0a627e9de9c35..a4636daa7986e 100644
--- a/x-pack/plugins/infra/server/lib/infra_types.ts
+++ b/x-pack/plugins/infra/server/lib/infra_types.ts
@@ -6,8 +6,8 @@
  */
 
 import { Logger } from '@kbn/logging';
-import type { IBasePath } from 'kibana/server';
-import { handleEsError } from '../../../../../src/plugins/es_ui_shared/server';
+import type { IBasePath } from '@kbn/core/server';
+import { handleEsError } from '@kbn/es-ui-shared-plugin/server';
 import { RulesServiceSetup } from '../services/rules';
 import { InfraConfig, InfraPluginStartServicesAccessor } from '../types';
 import { KibanaFramework } from './adapters/framework/kibana_framework_adapter';
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/errors.ts b/x-pack/plugins/infra/server/lib/log_analysis/errors.ts
index 2ec11aa1da5e4..02762940ae9ea 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/errors.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/errors.ts
@@ -11,7 +11,7 @@ import {
   UnknownMLCapabilitiesError,
   InsufficientMLCapabilities,
   MLPrivilegesUninitialized,
-} from '../../../../ml/server';
+} from '@kbn/ml-plugin/server';
 
 export class NoLogAnalysisMlJobError extends Error {
   constructor(message?: string) {
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
index feb0f6b5b9998..22bf5466ee3b4 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
@@ -96,7 +96,9 @@ async function getCompatibleAnomaliesJobIds(
 }
 
 export async function getLogEntryAnomalies(
-  context: InfraPluginRequestHandlerContext & { infra: Required<InfraRequestHandlerContext> },
+  context: InfraPluginRequestHandlerContext & {
+    infra: Promise<Required<InfraRequestHandlerContext>>;
+  },
   sourceId: string,
   startTime: number,
   endTime: number,
@@ -106,13 +108,14 @@ export async function getLogEntryAnomalies(
 ) {
   const finalizeLogEntryAnomaliesSpan = startTracingSpan('get log entry anomalies');
 
+  const infraContext = await context.infra;
   const {
     jobIds,
     timing: { spans: jobSpans },
   } = await getCompatibleAnomaliesJobIds(
-    context.infra.spaceId,
+    infraContext.spaceId,
     sourceId,
-    context.infra.mlAnomalyDetectors
+    infraContext.mlAnomalyDetectors
   );
 
   if (jobIds.length === 0) {
@@ -127,7 +130,7 @@ export async function getLogEntryAnomalies(
     hasMoreEntries,
     timing: { spans: fetchLogEntryAnomaliesSpans },
   } = await fetchLogEntryAnomalies(
-    context.infra.mlSystem,
+    infraContext.mlSystem,
     jobIds,
     startTime,
     endTime,
@@ -151,13 +154,13 @@ export async function getLogEntryAnomalies(
   }, []);
 
   const logEntryCategoriesCountJobId = getJobId(
-    context.infra.spaceId,
+    infraContext.spaceId,
     sourceId,
     logEntryCategoriesJobTypes[0]
   );
 
   const { logEntryCategoriesById } = await fetchLogEntryCategories(
-    context,
+    { infra: infraContext },
     logEntryCategoriesCountJobId,
     categoryIds
   );
@@ -325,7 +328,9 @@ async function fetchLogEntryAnomalies(
 }
 
 export async function getLogEntryExamples(
-  context: InfraPluginRequestHandlerContext & { infra: Required<InfraRequestHandlerContext> },
+  context: InfraPluginRequestHandlerContext & {
+    infra: Promise<Required<InfraRequestHandlerContext>>;
+  },
   sourceId: string,
   startTime: number,
   endTime: number,
@@ -336,9 +341,10 @@ export async function getLogEntryExamples(
   categoryId?: string
 ) {
   const finalizeLogEntryExamplesSpan = startTracingSpan('get log entry rate example log entries');
+  const infraContext = await context.infra;
 
   const jobId = getJobId(
-    context.infra.spaceId,
+    infraContext.spaceId,
     sourceId,
     categoryId != null ? logEntryCategoriesJobTypes[0] : logEntryRateJobTypes[0]
   );
@@ -346,7 +352,7 @@ export async function getLogEntryExamples(
   const {
     mlJob,
     timing: { spans: fetchMlJobSpans },
-  } = await fetchMlJob(context.infra.mlAnomalyDetectors, jobId);
+  } = await fetchMlJob(infraContext.mlAnomalyDetectors, jobId);
 
   const customSettings = decodeOrThrow(jobCustomSettingsRT)(mlJob.custom_settings);
   const indices = customSettings?.logs_source_config?.indexPattern;
@@ -388,7 +394,9 @@ export async function getLogEntryExamples(
 }
 
 export async function fetchLogEntryExamples(
-  context: InfraPluginRequestHandlerContext & { infra: Required<InfraRequestHandlerContext> },
+  context: InfraPluginRequestHandlerContext & {
+    infra: Promise<Required<InfraRequestHandlerContext>>;
+  },
   sourceId: string,
   indices: string,
   runtimeMappings: estypes.MappingRuntimeFields,
@@ -403,6 +411,7 @@ export async function fetchLogEntryExamples(
 ) {
   const finalizeEsSearchSpan = startTracingSpan('Fetch log rate examples from ES');
 
+  const infraContext = await context.infra;
   let categoryQuery: string | undefined;
 
   // Examples should be further scoped to a specific ML category
@@ -410,13 +419,13 @@ export async function fetchLogEntryExamples(
     const parsedCategoryId = parseInt(categoryId, 10);
 
     const logEntryCategoriesCountJobId = getJobId(
-      context.infra.spaceId,
+      infraContext.spaceId,
       sourceId,
       logEntryCategoriesJobTypes[0]
     );
 
     const { logEntryCategoriesById } = await fetchLogEntryCategories(
-      context,
+      { infra: infraContext },
       logEntryCategoriesCountJobId,
       [parsedCategoryId]
     );
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
index d4679c7919535..9152945002e2a 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import {
   CategoriesSort,
   compareDatasetsByMaximumAnomalyScore,
diff --git a/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts b/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts
index 1538f40095c0e..65a87e1662c40 100644
--- a/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts
+++ b/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { calculateBucketSize } from './';
+import { calculateBucketSize } from '.';
 import moment from 'moment';
 
 const timerange = {
diff --git a/x-pack/plugins/infra/server/lib/source_status.ts b/x-pack/plugins/infra/server/lib/source_status.ts
index 8c6d7d1ad451f..9e492e448ab92 100644
--- a/x-pack/plugins/infra/server/lib/source_status.ts
+++ b/x-pack/plugins/infra/server/lib/source_status.ts
@@ -18,38 +18,34 @@ export class InfraSourceStatus {
     requestContext: InfraPluginRequestHandlerContext,
     sourceId: string
   ): Promise<string[]> {
-    const sourceConfiguration = await this.libs.sources.getSourceConfiguration(
-      requestContext.core.savedObjects.client,
-      sourceId
-    );
+    const soClient = (await requestContext.core).savedObjects.client;
+    const sourceConfiguration = await this.libs.sources.getSourceConfiguration(soClient, sourceId);
     const indexNames = await this.adapter.getIndexNames(
       requestContext,
       sourceConfiguration.configuration.metricAlias
     );
     return indexNames;
   }
+
   public async hasMetricAlias(
     requestContext: InfraPluginRequestHandlerContext,
     sourceId: string
   ): Promise<boolean> {
-    const sourceConfiguration = await this.libs.sources.getSourceConfiguration(
-      requestContext.core.savedObjects.client,
-      sourceId
-    );
+    const soClient = (await requestContext.core).savedObjects.client;
+    const sourceConfiguration = await this.libs.sources.getSourceConfiguration(soClient, sourceId);
     const hasAlias = await this.adapter.hasAlias(
       requestContext,
       sourceConfiguration.configuration.metricAlias
     );
     return hasAlias;
   }
+
   public async hasMetricIndices(
     requestContext: InfraPluginRequestHandlerContext,
     sourceId: string
   ): Promise<boolean> {
-    const sourceConfiguration = await this.libs.sources.getSourceConfiguration(
-      requestContext.core.savedObjects.client,
-      sourceId
-    );
+    const soClient = (await requestContext.core).savedObjects.client;
+    const sourceConfiguration = await this.libs.sources.getSourceConfiguration(soClient, sourceId);
     const indexStatus = await this.adapter.getIndexStatus(
       requestContext,
       sourceConfiguration.configuration.metricAlias
@@ -65,7 +61,9 @@ export interface InfraSourceStatusAdapter {
     requestContext: InfraPluginRequestHandlerContext,
     aliasName: string
   ): Promise<string[]>;
+
   hasAlias(requestContext: InfraPluginRequestHandlerContext, aliasName: string): Promise<boolean>;
+
   getIndexStatus(
     requestContext: InfraPluginRequestHandlerContext,
     indexNames: string
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts
index 7dde0c590a968..0ee09ba4129bc 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { convertLogAliasToLogIndices } from './7_13_0_convert_log_alias_to_log_indices';
 import { infraSourceConfigurationSavedObjectName } from '../saved_object_type';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts
index 599f2de191172..a996c9a2a51a7 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { LOGS_INDEX_PATTERN } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts
index 465545618c8d7..7efb0b5370c47 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
-import { SavedObjectReference } from '../../../../../../../src/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   inventoryDefaultViewReferenceName,
   logIndexPatternReferenceName,
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts
index 745359270cc4c..bc2f7b11b574e 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { extractInventorySavedViewReferences } from '../saved_object_references';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts
index 6a97193211034..9c007607c0954 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
-import { SavedObjectReference } from '../../../../../../../src/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   logIndexPatternReferenceName,
   metricsExplorerDefaultViewReferenceName,
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts
index 4ef9024ccb9ce..81b1d4bde03ec 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { extractMetricsExplorerSavedViewReferences } from '../saved_object_references';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts
index 21b7643ca6a7f..82ab55cf5f3e7 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { addNewIndexingStrategyIndexNames } from './7_9_0_add_new_indexing_strategy_index_names';
 import { infraSourceConfigurationSavedObjectName } from '../saved_object_type';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts
index 8c9a3ca1d5a06..fd8be33877248 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 
 type SevenNineZeroSourceConfig = Omit<InfraSourceConfiguration, 'logIndices'> & {
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts
index f7612fbe1dbcb..5cec2e3c94452 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectUnsanitizedDoc } from '../../../../../../../src/core/server';
-import { migrationMocks } from '../../../../../../../src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { composeMigrations } from './compose_migrations';
 
 type TestDocument = SavedObjectUnsanitizedDoc<{
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts
index 561685eb47127..e1d9e338d4630 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from '../../../../../../../src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 
 type InputAttributesOf<MigrationFn> = MigrationFn extends SavedObjectMigrationFn<
   infer InputAttributes,
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts b/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts
index daf8f60885811..bdef0bf02390a 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  SavedObjectReference,
-  SavedObjectUnsanitizedDoc,
-} from '../../../../../../../src/core/server';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { infraSourceConfigurationSavedObjectName } from '../saved_object_type';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts b/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts
index ee65bd2d5ebeb..594a2408ecf62 100644
--- a/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts
+++ b/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   InfraSavedSourceConfiguration,
   InfraSourceConfiguration,
diff --git a/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts b/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
index c150a51d78c9c..ed9f5b9f1da5f 100644
--- a/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
+++ b/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { addNewIndexingStrategyIndexNames } from './migrations/7_9_0_add_new_indexing_strategy_index_names';
 import { convertLogAliasToLogIndices } from './migrations/7_13_0_convert_log_alias_to_log_indices';
 import { composeMigrations } from './migrations/compose_migrations';
diff --git a/x-pack/plugins/infra/server/lib/sources/sources.test.ts b/x-pack/plugins/infra/server/lib/sources/sources.test.ts
index 983b9d2142b5c..22e6d4912a402 100644
--- a/x-pack/plugins/infra/server/lib/sources/sources.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/sources.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from '../../../../../../src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { infraSourceConfigurationSavedObjectName } from './saved_object_type';
 import { InfraSources } from './sources';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/sources.ts b/x-pack/plugins/infra/server/lib/sources/sources.ts
index 7448b7cb8d7e0..e24c6ddc46de8 100644
--- a/x-pack/plugins/infra/server/lib/sources/sources.ts
+++ b/x-pack/plugins/infra/server/lib/sources/sources.ts
@@ -10,7 +10,7 @@ import { constant, identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { failure } from 'io-ts/lib/PathReporter';
 import { inRange } from 'lodash';
-import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   InfraSavedSourceConfiguration,
   InfraSource,
@@ -20,7 +20,7 @@ import {
   sourceConfigurationConfigFilePropertiesRT,
   SourceConfigurationSavedObjectRuntimeType,
 } from '../../../common/source_configuration/source_configuration';
-import { InfraConfig } from '../../../server';
+import { InfraConfig } from '../..';
 import { defaultSourceConfiguration } from './defaults';
 import { AnomalyThresholdRangeError, NotFoundError } from './errors';
 import {
diff --git a/x-pack/plugins/infra/server/plugin.ts b/x-pack/plugins/infra/server/plugin.ts
index e77f94dfe38f1..8eb2bac57dc56 100644
--- a/x-pack/plugins/infra/server/plugin.ts
+++ b/x-pack/plugins/infra/server/plugin.ts
@@ -14,8 +14,8 @@ import {
   Plugin,
   PluginConfigDescriptor,
   PluginInitializerContext,
-} from 'src/core/server';
-import { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+} from '@kbn/core/server';
+import { handleEsError } from '@kbn/es-ui-shared-plugin/server';
 import { LOGS_FEATURE_ID, METRICS_FEATURE_ID } from '../common/constants';
 import { defaultLogViewsStaticConfig } from '../common/log_views';
 import { publicConfigKeys } from '../common/plugin_config_types';
@@ -190,12 +190,10 @@ export class InfraServerPlugin
 
     core.http.registerRouteHandlerContext<InfraPluginRequestHandlerContext, 'infra'>(
       'infra',
-      (context, request) => {
-        const mlSystem = plugins.ml?.mlSystemProvider(request, context.core.savedObjects.client);
-        const mlAnomalyDetectors = plugins.ml?.anomalyDetectorsProvider(
-          request,
-          context.core.savedObjects.client
-        );
+      async (context, request) => {
+        const soClient = (await context.core).savedObjects.client;
+        const mlSystem = plugins.ml?.mlSystemProvider(request, soClient);
+        const mlAnomalyDetectors = plugins.ml?.anomalyDetectorsProvider(request, soClient);
         const spaceId = plugins.spaces?.spacesService.getSpaceId(request) || 'default';
 
         return {
@@ -240,5 +238,6 @@ export class InfraServerPlugin
       logViews,
     };
   }
+
   stop() {}
 }
diff --git a/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_hosts_anomalies.ts b/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_hosts_anomalies.ts
index 1b5ed62a006be..a83854817866f 100644
--- a/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_hosts_anomalies.ts
+++ b/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_hosts_anomalies.ts
@@ -47,7 +47,7 @@ export const initGetHostsAnomaliesRoute = ({ framework }: InfraBackendLibs) => {
       const { sort, pagination } = getSortAndPagination(sortParam, paginationParam);
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const {
           data: anomalies,
@@ -55,7 +55,7 @@ export const initGetHostsAnomaliesRoute = ({ framework }: InfraBackendLibs) => {
           hasMoreEntries,
           timing,
         } = await getMetricsHostsAnomalies({
-          context: requestContext.infra,
+          context: await infraMlContext.infra,
           sourceId,
           anomalyThreshold,
           startTime,
diff --git a/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_k8s_anomalies.ts b/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_k8s_anomalies.ts
index 667760d1d409e..55cc6c4098325 100644
--- a/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_k8s_anomalies.ts
+++ b/x-pack/plugins/infra/server/routes/infra_ml/results/metrics_k8s_anomalies.ts
@@ -45,7 +45,7 @@ export const initGetK8sAnomaliesRoute = ({ framework }: InfraBackendLibs) => {
       const { sort, pagination } = getSortAndPagination(sortParam, paginationParam);
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const {
           data: anomalies,
@@ -53,7 +53,7 @@ export const initGetK8sAnomaliesRoute = ({ framework }: InfraBackendLibs) => {
           hasMoreEntries,
           timing,
         } = await getMetricK8sAnomalies({
-          context: requestContext.infra,
+          context: await infraMlContext.infra,
           sourceId,
           anomalyThreshold,
           startTime,
diff --git a/x-pack/plugins/infra/server/routes/inventory_metadata/index.ts b/x-pack/plugins/infra/server/routes/inventory_metadata/index.ts
index 70d29773f76c5..c6ed81ccd8256 100644
--- a/x-pack/plugins/infra/server/routes/inventory_metadata/index.ts
+++ b/x-pack/plugins/infra/server/routes/inventory_metadata/index.ts
@@ -38,10 +38,8 @@ export const initInventoryMetaRoute = (libs: InfraBackendLibs) => {
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const { configuration } = await libs.sources.getSourceConfiguration(
-        requestContext.core.savedObjects.client,
-        sourceId
-      );
+      const soClient = (await requestContext.core).savedObjects.client;
+      const { configuration } = await libs.sources.getSourceConfiguration(soClient, sourceId);
 
       const awsMetadata = await getCloudMetadata(
         framework,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts
index d0a18727b6813..dd6254cf560e2 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts
@@ -42,7 +42,7 @@ export const initGetLogEntryAnomaliesRoute = ({ framework }: InfraBackendLibs) =
       const { sort, pagination } = getSortAndPagination(sortParam, paginationParam);
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const {
           data: logEntryAnomalies,
@@ -50,7 +50,7 @@ export const initGetLogEntryAnomaliesRoute = ({ framework }: InfraBackendLibs) =
           hasMoreEntries,
           timing,
         } = await getLogEntryAnomalies(
-          requestContext,
+          infraMlContext,
           sourceId,
           startTime,
           endTime,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies_datasets.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies_datasets.ts
index 9d3b9f22a839e..1d1f620063b2e 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies_datasets.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies_datasets.ts
@@ -35,10 +35,10 @@ export const initGetLogEntryAnomaliesDatasetsRoute = ({ framework }: InfraBacken
       } = request.body;
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const { datasets, timing } = await getLogEntryAnomaliesDatasets(
-          requestContext,
+          { infra: await infraMlContext.infra },
           sourceId,
           startTime,
           endTime
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_categories.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_categories.ts
index d3660aa16c1f8..6e2e8e8a6c2ad 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_categories.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_categories.ts
@@ -39,10 +39,10 @@ export const initGetLogEntryCategoriesRoute = ({ framework }: InfraBackendLibs)
       } = request.body;
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const { data: topLogEntryCategories, timing } = await getTopLogEntryCategories(
-          requestContext,
+          { infra: await infraMlContext.infra },
           sourceId,
           startTime,
           endTime,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets.ts
index 76103c936dd6d..de5ac9dac4b07 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets.ts
@@ -35,10 +35,10 @@ export const initGetLogEntryCategoryDatasetsRoute = ({ framework }: InfraBackend
       } = request.body;
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const { data: logEntryCategoryDatasets, timing } = await getLogEntryCategoryDatasets(
-          requestContext,
+          { infra: await infraMlContext.infra },
           sourceId,
           startTime,
           endTime
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets_stats.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets_stats.ts
index 01a98ce43833b..5844405ec062d 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets_stats.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_datasets_stats.ts
@@ -36,10 +36,10 @@ export const initGetLogEntryCategoryDatasetsStatsRoute = ({ framework }: InfraBa
       } = request.body;
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const { data: datasetStats, timing } = await getLatestLogEntriesCategoriesDatasetsStats(
-          requestContext,
+          { infra: await infraMlContext.infra },
           jobIds,
           startTime,
           endTime,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts
index 14787406319db..b51aed45b7e11 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts
@@ -43,10 +43,10 @@ export const initGetLogEntryCategoryExamplesRoute = ({
       const resolvedLogView = await logViews.getScopedClient(request).getResolvedLogView(sourceId);
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const { data: logEntryCategoryExamples, timing } = await getLogEntryCategoryExamples(
-          requestContext,
+          { infra: await infraMlContext.infra, core: await infraMlContext.core },
           sourceId,
           startTime,
           endTime,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts
index f11e9e46bf4c6..fb82a2cd90df5 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts
@@ -44,10 +44,10 @@ export const initGetLogEntryExamplesRoute = ({
       const resolvedLogView = await logViews.getScopedClient(request).getResolvedLogView(sourceId);
 
       try {
-        assertHasInfraMlPlugins(requestContext);
+        const infraMlContext = await assertHasInfraMlPlugins(requestContext);
 
         const { data: logEntryExamples, timing } = await getLogEntryExamples(
-          requestContext,
+          infraMlContext,
           sourceId,
           startTime,
           endTime,
diff --git a/x-pack/plugins/infra/server/routes/metadata/index.ts b/x-pack/plugins/infra/server/routes/metadata/index.ts
index 39021ba51c9d9..18ee48ed5ad09 100644
--- a/x-pack/plugins/infra/server/routes/metadata/index.ts
+++ b/x-pack/plugins/infra/server/routes/metadata/index.ts
@@ -42,10 +42,8 @@ export const initMetadataRoute = (libs: InfraBackendLibs) => {
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const { configuration } = await libs.sources.getSourceConfiguration(
-        requestContext.core.savedObjects.client,
-        sourceId
-      );
+      const soClient = (await requestContext.core).savedObjects.client;
+      const { configuration } = await libs.sources.getSourceConfiguration(soClient, sourceId);
       const metricsMetadata = await getMetricMetadata(
         framework,
         requestContext,
diff --git a/x-pack/plugins/infra/server/routes/metrics_sources/index.ts b/x-pack/plugins/infra/server/routes/metrics_sources/index.ts
index cba520e6d53c0..a0cd0afbca50c 100644
--- a/x-pack/plugins/infra/server/routes/metrics_sources/index.ts
+++ b/x-pack/plugins/infra/server/routes/metrics_sources/index.ts
@@ -33,9 +33,10 @@ export const initMetricsSourceConfigurationRoutes = (libs: InfraBackendLibs) =>
     },
     async (requestContext, request, response) => {
       const { sourceId } = request.params;
+      const soClient = (await requestContext.core).savedObjects.client;
 
       const [source, metricIndicesExist, indexFields] = await Promise.all([
-        libs.sources.getSourceConfiguration(requestContext.core.savedObjects.client, sourceId),
+        libs.sources.getSourceConfiguration(soClient, sourceId),
         libs.sourceStatus.hasMetricIndices(requestContext, sourceId),
         libs.fields.getFields(requestContext, sourceId, 'METRICS'),
       ]);
@@ -72,10 +73,8 @@ export const initMetricsSourceConfigurationRoutes = (libs: InfraBackendLibs) =>
       const patchedSourceConfigurationProperties = request.body;
 
       try {
-        const sourceConfiguration = await sources.getSourceConfiguration(
-          requestContext.core.savedObjects.client,
-          sourceId
-        );
+        const soClient = (await requestContext.core).savedObjects.client;
+        const sourceConfiguration = await sources.getSourceConfiguration(soClient, sourceId);
 
         if (sourceConfiguration.origin === 'internal') {
           response.conflict({
@@ -86,13 +85,13 @@ export const initMetricsSourceConfigurationRoutes = (libs: InfraBackendLibs) =>
         const sourceConfigurationExists = sourceConfiguration.origin === 'stored';
         const patchedSourceConfiguration = await (sourceConfigurationExists
           ? sources.updateSourceConfiguration(
-              requestContext.core.savedObjects.client,
+              soClient,
               sourceId,
               // @ts-ignore
               patchedSourceConfigurationProperties
             )
           : sources.createSourceConfiguration(
-              requestContext.core.savedObjects.client,
+              soClient,
               sourceId,
               // @ts-ignore
               patchedSourceConfigurationProperties
@@ -151,10 +150,8 @@ export const initMetricsSourceConfigurationRoutes = (libs: InfraBackendLibs) =>
       const { sourceId } = request.params;
 
       const client = createSearchClient(requestContext, framework);
-      const source = await libs.sources.getSourceConfiguration(
-        requestContext.core.savedObjects.client,
-        sourceId
-      );
+      const soClient = (await requestContext.core).savedObjects.client;
+      const source = await libs.sources.getSourceConfiguration(soClient, sourceId);
 
       const results = await hasData(source.configuration.metricAlias, client);
 
diff --git a/x-pack/plugins/infra/server/routes/node_details/index.ts b/x-pack/plugins/infra/server/routes/node_details/index.ts
index 8e305226112bd..cd92c902a110e 100644
--- a/x-pack/plugins/infra/server/routes/node_details/index.ts
+++ b/x-pack/plugins/infra/server/routes/node_details/index.ts
@@ -38,10 +38,8 @@ export const initNodeDetailsRoute = (libs: InfraBackendLibs) => {
         NodeDetailsRequestRT.decode(request.body),
         fold(throwErrors(Boom.badRequest), identity)
       );
-      const source = await libs.sources.getSourceConfiguration(
-        requestContext.core.savedObjects.client,
-        sourceId
-      );
+      const soClient = (await requestContext.core).savedObjects.client;
+      const source = await libs.sources.getSourceConfiguration(soClient, sourceId);
 
       UsageCollector.countNode(nodeType);
 
diff --git a/x-pack/plugins/infra/server/routes/overview/index.ts b/x-pack/plugins/infra/server/routes/overview/index.ts
index fa0e0f4d09aff..9736fd0d7c22e 100644
--- a/x-pack/plugins/infra/server/routes/overview/index.ts
+++ b/x-pack/plugins/infra/server/routes/overview/index.ts
@@ -24,10 +24,8 @@ export const initOverviewRoute = (libs: InfraBackendLibs) => {
     async (requestContext, request, response) => {
       const options = request.body;
       const client = createSearchClient(requestContext, framework);
-      const source = await libs.sources.getSourceConfiguration(
-        requestContext.core.savedObjects.client,
-        options.sourceId
-      );
+      const soClient = (await requestContext.core).savedObjects.client;
+      const source = await libs.sources.getSourceConfiguration(soClient, options.sourceId);
 
       const topNResponse = await queryTopNodes(options, client, source);
 
diff --git a/x-pack/plugins/infra/server/routes/snapshot/index.ts b/x-pack/plugins/infra/server/routes/snapshot/index.ts
index 06b2104e0e17e..99cde598b19e4 100644
--- a/x-pack/plugins/infra/server/routes/snapshot/index.ts
+++ b/x-pack/plugins/infra/server/routes/snapshot/index.ts
@@ -37,10 +37,8 @@ export const initSnapshotRoute = (libs: InfraBackendLibs) => {
         fold(throwErrors(Boom.badRequest), identity)
       );
 
-      const source = await libs.sources.getSourceConfiguration(
-        requestContext.core.savedObjects.client,
-        snapshotRequest.sourceId
-      );
+      const soClient = (await requestContext.core).savedObjects.client;
+      const source = await libs.sources.getSourceConfiguration(soClient, snapshotRequest.sourceId);
       const compositeSize = libs.configuration.inventory.compositeSize;
       const [, , { logViews }] = await libs.getStartServices();
       const logQueryFields: LogQueryFields | undefined = await logViews
diff --git a/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts b/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts
index 09b1098af6a61..9202227867dca 100644
--- a/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts
+++ b/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts
@@ -7,7 +7,7 @@
 
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
-import { SavedObject, SavedObjectsType } from 'src/core/server';
+import { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import { logViewSavedObjectRT } from './types';
 
 export const logViewSavedObjectName = 'infrastructure-monitoring-log-view';
diff --git a/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts b/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts
index 461bbccb6e414..ea45be30bc0b7 100644
--- a/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts
+++ b/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/server';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../../../../src/plugins/data_views/common';
+import { SavedObjectReference } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { LogViewAttributes } from '../../../../common/log_views';
 import {
   SavedObjectAttributesWithReferences,
diff --git a/x-pack/plugins/infra/server/saved_objects/references.test.ts b/x-pack/plugins/infra/server/saved_objects/references.test.ts
index 13675c03564a1..674aabbd9d058 100644
--- a/x-pack/plugins/infra/server/saved_objects/references.test.ts
+++ b/x-pack/plugins/infra/server/saved_objects/references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   extractSavedObjectReferences,
   resolveSavedObjectReferences,
diff --git a/x-pack/plugins/infra/server/saved_objects/references.ts b/x-pack/plugins/infra/server/saved_objects/references.ts
index 3a2347faeb9db..13b64ab6e6e73 100644
--- a/x-pack/plugins/infra/server/saved_objects/references.ts
+++ b/x-pack/plugins/infra/server/saved_objects/references.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { SavedObject, SavedObjectReference } from 'src/core/server';
+import { SavedObject, SavedObjectReference } from '@kbn/core/server';
 
 export type SavedObjectAttributesWithReferences<SavedObjectAttributes> = Pick<
   SavedObject<SavedObjectAttributes>,
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
index 594e79f8d2e1c..99579c5a588c6 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
@@ -12,14 +12,14 @@ import {
   httpServerMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   IEsSearchRequest,
   IEsSearchResponse,
   ISearchStrategy,
   SearchStrategyDependencies,
-} from 'src/plugins/data/server';
-import { createSearchSessionsClientMock } from '../../../../../../src/plugins/data/server/search/mocks';
+} from '@kbn/data-plugin/server';
+import { createSearchSessionsClientMock } from '@kbn/data-plugin/server/search/mocks';
 import { createResolvedLogViewMock } from '../../../common/log_views/resolved_log_view.mock';
 import { createLogViewsClientMock } from '../log_views/log_views_client.mock';
 import { createLogViewsServiceStartMock } from '../log_views/log_views_service.mock';
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
index 15f53d0236594..81ef319828be1 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
@@ -13,11 +13,8 @@ import type {
   IEsSearchRequest,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
-} from '../../../../../../src/plugins/data/common';
-import type {
-  ISearchStrategy,
-  PluginStart as DataPluginStart,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/common';
+import type { ISearchStrategy, PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import {
   getLogEntryCursorFromHit,
   LogColumn,
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts
index 0c5e32a9514f3..b9270f5ab38ae 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { LOG_ENTRY_SEARCH_STRATEGY } from '../../../common/search_strategies/log_entries/log_entry';
 import { LOG_ENTRIES_SEARCH_STRATEGY } from '../../../common/search_strategies/log_entries/log_entries';
 import { logEntriesSearchStrategyProvider } from './log_entries_search_strategy';
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
index e705791b06bcd..4d2d3115d19f1 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
@@ -12,14 +12,14 @@ import {
   httpServerMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   IEsSearchRequest,
   IEsSearchResponse,
   ISearchStrategy,
   SearchStrategyDependencies,
-} from 'src/plugins/data/server';
-import { createSearchSessionsClientMock } from '../../../../../../src/plugins/data/server/search/mocks';
+} from '@kbn/data-plugin/server';
+import { createSearchSessionsClientMock } from '@kbn/data-plugin/server/search/mocks';
 import { createResolvedLogViewMock } from '../../../common/log_views/resolved_log_view.mock';
 import { createLogViewsClientMock } from '../log_views/log_views_client.mock';
 import { createLogViewsServiceStartMock } from '../log_views/log_views_service.mock';
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts
index 6cd6e87810553..714e0b792c612 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts
@@ -12,11 +12,8 @@ import type {
   IEsSearchRequest,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
-} from '../../../../../../src/plugins/data/common';
-import type {
-  ISearchStrategy,
-  PluginStart as DataPluginStart,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/common';
+import type { ISearchStrategy, PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import { getLogEntryCursorFromHit } from '../../../common/log_entry';
 import { decodeOrThrow } from '../../../common/runtime_types';
 import {
diff --git a/x-pack/plugins/infra/server/services/log_entries/types.ts b/x-pack/plugins/infra/server/services/log_entries/types.ts
index e3ebe0eeece56..191e77f069142 100644
--- a/x-pack/plugins/infra/server/services/log_entries/types.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/types.ts
@@ -8,7 +8,7 @@
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 import type { LogViewsServiceStart } from '../log_views/types';
 
 export interface LogEntriesServiceSetupDeps {
diff --git a/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts b/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts
index c99930c7c47a5..7b1debf981f8c 100644
--- a/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts
+++ b/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { loggerMock } from '@kbn/logging-mocks';
-import { SavedObject, SavedObjectsUtils } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { createStubDataView } from 'src/plugins/data_views/common/stubs';
-import { dataViewsService as dataViewsServiceMock } from 'src/plugins/data_views/server/mocks';
+import { SavedObject, SavedObjectsUtils } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
+import { dataViewsService as dataViewsServiceMock } from '@kbn/data-views-plugin/server/mocks';
 import {
   defaultLogViewId,
   LogView,
diff --git a/x-pack/plugins/infra/server/services/log_views/log_views_client.ts b/x-pack/plugins/infra/server/services/log_views/log_views_client.ts
index a4c64288d0ac0..ef12bcefa233a 100644
--- a/x-pack/plugins/infra/server/services/log_views/log_views_client.ts
+++ b/x-pack/plugins/infra/server/services/log_views/log_views_client.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+import type { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import {
   Logger,
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsUtils,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   defaultLogViewAttributes,
   defaultLogViewId,
diff --git a/x-pack/plugins/infra/server/services/log_views/log_views_service.ts b/x-pack/plugins/infra/server/services/log_views/log_views_service.ts
index f5385b9d2873c..169092d997570 100644
--- a/x-pack/plugins/infra/server/services/log_views/log_views_service.ts
+++ b/x-pack/plugins/infra/server/services/log_views/log_views_service.ts
@@ -10,7 +10,7 @@ import {
   KibanaRequest,
   Logger,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { LogView, LogViewAttributes } from '../../../common/log_views';
 import { LogViewsClient } from './log_views_client';
 import { LogViewsServiceSetup, LogViewsServiceStart, LogViewsServiceStartDeps } from './types';
diff --git a/x-pack/plugins/infra/server/services/log_views/types.ts b/x-pack/plugins/infra/server/services/log_views/types.ts
index 0052db19ee4de..4146b6e2fd7e3 100644
--- a/x-pack/plugins/infra/server/services/log_views/types.ts
+++ b/x-pack/plugins/infra/server/services/log_views/types.ts
@@ -11,8 +11,8 @@ import {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'src/core/server';
-import { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+} from '@kbn/core/server';
+import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import {
   LogView,
   LogViewAttributes,
diff --git a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
index 3156a0dacad61..4fcbaf2084362 100644
--- a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
+++ b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
-import { mappingFromFieldMap } from '../../../../rule_registry/common/mapping_from_field_map';
-import { experimentalRuleFieldMap } from '../../../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
 
-import { Dataset, RuleRegistryPluginSetupContract } from '../../../../rule_registry/server';
+import { Dataset, RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import type { InfraFeatureId } from '../../../common/constants';
 import { RuleRegistrationContext, RulesServiceStartDeps } from './types';
 
diff --git a/x-pack/plugins/infra/server/services/rules/rules_service.ts b/x-pack/plugins/infra/server/services/rules/rules_service.ts
index 9341fc59d75b8..85d3d8548fbe6 100644
--- a/x-pack/plugins/infra/server/services/rules/rules_service.ts
+++ b/x-pack/plugins/infra/server/services/rules/rules_service.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
-import { createLifecycleExecutor } from '../../../../rule_registry/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { createLifecycleExecutor } from '@kbn/rule-registry-plugin/server';
 import { InfraFeatureId } from '../../../common/constants';
 import { createRuleDataClient } from './rule_data_client';
 import {
diff --git a/x-pack/plugins/infra/server/services/rules/types.ts b/x-pack/plugins/infra/server/services/rules/types.ts
index daa44381650e0..55d799b85c001 100644
--- a/x-pack/plugins/infra/server/services/rules/types.ts
+++ b/x-pack/plugins/infra/server/services/rules/types.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../alerting/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
 import {
   createLifecycleExecutor,
   IRuleDataClient,
   RuleRegistryPluginSetupContract,
-} from '../../../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
 
 type LifecycleRuleExecutorCreator = ReturnType<typeof createLifecycleExecutor>;
 
diff --git a/x-pack/plugins/infra/server/types.ts b/x-pack/plugins/infra/server/types.ts
index 42c27085380f7..e3792c8977cfe 100644
--- a/x-pack/plugins/infra/server/types.ts
+++ b/x-pack/plugins/infra/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import type { SearchRequestHandlerContext } from '../../../../src/plugins/data/server';
-import type { MlPluginSetup } from '../../ml/server';
+import type { CoreSetup, CustomRequestHandlerContext } from '@kbn/core/server';
+import type { SearchRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { InfraStaticSourceConfiguration } from '../common/source_configuration/source_configuration';
 import { InfraServerPluginStartDeps } from './lib/adapters/framework';
 import { LogViewsServiceSetup, LogViewsServiceStart } from './services/log_views/types';
@@ -47,7 +47,7 @@ export type InfraRequestHandlerContext = InfraMlRequestHandlerContext &
 /**
  * @internal
  */
-export interface InfraPluginRequestHandlerContext extends RequestHandlerContext {
+export type InfraPluginRequestHandlerContext = CustomRequestHandlerContext<{
   infra: InfraRequestHandlerContext;
   search: SearchRequestHandlerContext;
-}
+}>;
diff --git a/x-pack/plugins/infra/server/usage/usage_collector.ts b/x-pack/plugins/infra/server/usage/usage_collector.ts
index 4b5e128148888..6e181c09512a8 100644
--- a/x-pack/plugins/infra/server/usage/usage_collector.ts
+++ b/x-pack/plugins/infra/server/usage/usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { InventoryItemType } from '../../common/inventory_models/types';
 
 interface InfraopsSum {
diff --git a/x-pack/plugins/infra/server/utils/request_context.ts b/x-pack/plugins/infra/server/utils/request_context.ts
index 8924a03549adc..f0546c8843990 100644
--- a/x-pack/plugins/infra/server/utils/request_context.ts
+++ b/x-pack/plugins/infra/server/utils/request_context.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { InfraMlRequestHandlerContext, InfraRequestHandlerContext } from '../types';
+import { InfraRequestHandlerContext } from '../types';
 
 export class MissingContextValuesError extends Error {
   constructor(message?: string) {
@@ -23,22 +23,31 @@ export class NoMlPluginError extends Error {
   }
 }
 
-export function assertHasInfraPlugins<Context extends { infra?: InfraRequestHandlerContext }>(
-  context: Context
-): asserts context is Context & { infra: Context['infra'] } {
+export function assertHasInfraPlugins<
+  Context extends { infra?: Promise<InfraRequestHandlerContext> }
+>(context: Context): asserts context is Context & { infra: Context['infra'] } {
   if (context.infra == null) {
     throw new MissingContextValuesError('Failed to access "infra" context values.');
   }
 }
 
-export function assertHasInfraMlPlugins<Context extends { infra?: InfraRequestHandlerContext }>(
+export async function assertHasInfraMlPlugins<
+  Context extends { infra?: Promise<InfraRequestHandlerContext> }
+>(
   context: Context
-): asserts context is Context & {
-  infra: Context['infra'] & Required<InfraMlRequestHandlerContext>;
-} {
+): Promise<
+  Context & {
+    infra: Promise<Required<InfraRequestHandlerContext>>;
+  }
+> {
   assertHasInfraPlugins(context);
 
-  if (context.infra?.mlAnomalyDetectors == null || context.infra?.mlSystem == null) {
+  const infraContext = await context.infra;
+  if (infraContext?.mlAnomalyDetectors == null || infraContext?.mlSystem == null) {
     throw new NoMlPluginError('Failed to access ML plugin.');
   }
+
+  return context as Context & {
+    infra: Promise<Required<InfraRequestHandlerContext>>;
+  };
 }
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts
index 7029e47b29229..d7c833ef85403 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 
 type HttpMethod = 'GET' | 'PUT' | 'DELETE' | 'POST';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts
index 6091dd0ef9587..03b3bb605e120 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PipelinesClone } from '../../../public/application/sections/pipelines_clone';
 import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts
index 7394552494f3c..108e4d908d801 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PipelinesCreate } from '../../../public/application/sections/pipelines_create';
 import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts
index 3f68b174f3c4f..674855abd6d02 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
 
 import { PipelinesCreateFromCsv } from '../../../public/application/sections/pipelines_create_from_csv';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts
index 1902e5c1f2aed..02a2c0f890182 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PipelinesEdit } from '../../../public/application/sections/pipelines_edit';
 import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts
index 33d3fb31ef81f..19de9b8253101 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   registerTestBed,
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx
index 7b7a467d59a91..01efbc3063870 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx
@@ -7,21 +7,21 @@
 
 import React from 'react';
 import { LocationDescriptorObject } from 'history';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
-import { ApplicationStart } from 'src/core/public';
-import { MockUrlService } from 'src/plugins/share/common/mocks';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { sharePluginMock } from '../../../../../../src/plugins/share/public/mocks';
+import { ApplicationStart } from '@kbn/core/public';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   scopedHistoryMock,
   uiSettingsServiceMock,
   applicationServiceMock,
-} from '../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import {
   breadcrumbService,
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
index 4ac864e1ca36f..8440def61cac5 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
@@ -31,8 +31,8 @@ jest.mock('@elastic/eui', () => {
   };
 });
 
-jest.mock('../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/ingest_pipelines/common/constants.ts b/x-pack/plugins/ingest_pipelines/common/constants.ts
index 231440a88676a..741eda0664b94 100644
--- a/x-pack/plugins/ingest_pipelines/common/constants.ts
+++ b/x-pack/plugins/ingest_pipelines/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts
index 516e104b37b3f..7888bcfde2570 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../../../common/constants';
 
 type HttpResponse = Record<string, any> | any[];
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx
index 3874fd84932ee..625ccd1f62a3f 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx
@@ -9,7 +9,7 @@ import { act } from 'react-dom/test-utils';
 import React from 'react';
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
-import { Props } from '../';
+import { Props } from '..';
 import { ProcessorsEditorWithDeps } from './processors_editor';
 
 jest.mock('@elastic/eui', () => {
@@ -31,8 +31,8 @@ jest.mock('@elastic/eui', () => {
   };
 });
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx
index af3651525d6a3..f35e05b800f14 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const APPEND_TYPE = 'append';
 
@@ -14,6 +14,8 @@ describe('Processor: Append', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
 
+  const { httpSetup } = setupEnvironment();
+
   beforeAll(() => {
     jest.useFakeTimers();
   });
@@ -26,7 +28,7 @@ describe('Processor: Append', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx
index 51117c3b517f9..d4ac176d6aaf5 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const BYTES_TYPE = 'bytes';
 
 describe('Processor: Bytes', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Bytes', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
index b8c8f6c58f711..00153471ea65e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const CIRCLE_TYPE = 'circle';
 
 describe('Processor: Circle', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Circle', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx
index af5c8c50abf7b..ebffd5adf78c1 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const BYTES_TYPE = 'bytes';
 
 describe('Processor: Common Fields For All Processors', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Common Fields For All Processors', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx
index 0338cb8e04348..e571474576ff2 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const COMMUNITY_ID_TYPE = 'community_id';
 
 describe('Processor: Community id', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Community id', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx
index 5a58a7b595c90..3090e59b32e0b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the `convert processor` when saved
 const defaultConvertParameters = {
@@ -23,6 +23,7 @@ const CONVERT_TYPE = 'convert';
 describe('Processor: Convert', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -36,7 +37,7 @@ describe('Processor: Convert', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx
index b40b46967dae5..6414976b56f9a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the CSV processor when saved
 const defaultCSVParameters = {
@@ -26,6 +26,7 @@ const CSV_TYPE = 'csv';
 describe('Processor: CSV', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -39,7 +40,7 @@ describe('Processor: CSV', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx
index 390f8e0191ce9..22666ebbe2a98 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const DATE_TYPE = 'date';
 
 describe('Processor: Date', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Date', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx
index 264db2c5b65c0..b9e990f36c15b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const DATE_INDEX_TYPE = 'date_index_name';
 
 describe('Processor: Date Index Name', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Date Index Name', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx
index eb93f4ea86449..7ebad2de01a92 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const DOT_EXPANDER_TYPE = 'dot_expander';
 
 describe('Processor: Dot Expander', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Dot Expander', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx
index db5840379536a..9b8148bd0dffd 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx
@@ -6,12 +6,13 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const FAIL_TYPE = 'fail';
 describe('Processor: Fail', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -25,7 +26,7 @@ describe('Processor: Fail', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx
index 7c2ca012a0460..49d7937fab002 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the registered domain processor when saved
 const defaultFingerprintParameters = {
@@ -25,6 +25,7 @@ const FINGERPRINT_TYPE = 'fingerprint';
 describe('Processor: Fingerprint', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -38,7 +39,7 @@ describe('Processor: Fingerprint', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/grok.test.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/grok.test.ts
new file mode 100644
index 0000000000000..b488e69ed84da
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/grok.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { act } from 'react-dom/test-utils';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
+
+const GROK_TYPE = 'grok';
+
+describe('Processor: Grok', () => {
+  let onUpdate: jest.Mock;
+  let testBed: SetupResult;
+  let clickAddPattern: () => Promise<void>;
+  const { httpSetup } = setupEnvironment();
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+    // disable all react-beautiful-dnd development warnings
+    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = true;
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+    // enable all react-beautiful-dnd development warnings
+    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = false;
+  });
+
+  beforeEach(async () => {
+    onUpdate = jest.fn();
+
+    await act(async () => {
+      testBed = await setup(httpSetup, {
+        value: {
+          processors: [],
+        },
+        onFlyoutOpen: jest.fn(),
+        onUpdate,
+      });
+    });
+
+    const { find, component, actions } = testBed;
+
+    clickAddPattern = async () => {
+      await act(async () => {
+        find('droppableList.addButton').simulate('click');
+      });
+      component.update();
+    };
+
+    component.update();
+
+    // Open flyout to add new processor
+    actions.addProcessor();
+    // Add type (the other fields are not visible until a type is selected)
+    await actions.addProcessorType(GROK_TYPE);
+  });
+
+  test('prevents form submission if required fields are not provided', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+      exists,
+    } = testBed;
+
+    // Click submit button with only the type defined
+    await saveNewProcessor();
+
+    // Expect form error as "field" is a required parameter
+    expect(form.getErrorsMessages()).toEqual(['A field value is required.']);
+    // Patterns field is also required; it uses EuiDraggable and only shows an error icon when invalid
+    expect(exists('droppableList.errorIcon')).toBe(true);
+  });
+
+  test('saves with default parameter values', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Add "field" value
+    form.setInputValue('fieldNameField.input', 'test_grok_processor');
+
+    // Add pattern 1
+    form.setInputValue('droppableList.input-0', 'pattern1');
+
+    // Add pattern 2
+    await clickAddPattern();
+    form.setInputValue('droppableList.input-1', 'pattern2');
+
+    // Add pattern 3
+    await clickAddPattern();
+    form.setInputValue('droppableList.input-2', 'pattern3');
+
+    // Save the field
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, GROK_TYPE);
+
+    expect(processors[0][GROK_TYPE]).toEqual({
+      field: 'test_grok_processor',
+      patterns: ['pattern1', 'pattern2', 'pattern3'],
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
index 7a4c55d6f5e02..4f92aec06efd3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the network direction processor when saved
 const defaultNetworkDirectionParameters = {
@@ -27,6 +27,7 @@ const NETWORK_DIRECTION_TYPE = 'network_direction';
 describe('Processor: Network Direction', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -40,7 +41,7 @@ describe('Processor: Network Direction', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
index ec68c3b3bfdf6..ade7077e3fd10 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
@@ -7,22 +7,21 @@
 
 import { act } from 'react-dom/test-utils';
 import React from 'react';
-import axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { stubWebWorker } from '@kbn/test-jest-helpers';
 import { uiMetricService, apiService } from '../../../../services';
-import { Props } from '../../';
+import { Props } from '../..';
 import { initHttpRequests } from '../http_requests.helpers';
 import { ProcessorsEditorWithDeps } from '../processors_editor';
 
 stubWebWorker();
 
-jest.mock('../../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
@@ -102,7 +101,9 @@ const createActions = (testBed: TestBed<TestSubject>) => {
   };
 };
 
-export const setup = async (props: Props): Promise<SetupResult> => {
+export const setup = async (httpSetup: HttpSetup, props: Props): Promise<SetupResult> => {
+  apiService.setup(httpSetup, uiMetricService);
+
   const testBed = testBedSetup(props);
   return {
     ...testBed,
@@ -110,19 +111,11 @@ export const setup = async (props: Props): Promise<SetupResult> => {
   };
 };
 
-const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
-
 export const setupEnvironment = () => {
   // Initialize mock services
   uiMetricService.setup(usageCollectionPluginMock.createSetupContract());
-  // @ts-ignore
-  apiService.setup(mockHttpClient, uiMetricService);
-
-  const { httpRequestsMockHelpers } = initHttpRequests();
 
-  return {
-    httpRequestsMockHelpers,
-  };
+  return initHttpRequests();
 };
 
 export const getProcessorValue = (onUpdate: jest.Mock, type: string) => {
@@ -187,4 +180,9 @@ type TestSubject =
   | 'transportField.input'
   | 'seedField.input'
   | 'copyFromInput'
-  | 'trimSwitch.input';
+  | 'trimSwitch.input'
+  | 'droppableList.addButton'
+  | 'droppableList.errorIcon'
+  | 'droppableList.input-0'
+  | 'droppableList.input-1'
+  | 'droppableList.input-2';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx
index de0061dcb0407..b2e2fb81f2c86 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx
@@ -6,11 +6,12 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult } from './processor.helpers';
+import { setup, SetupResult, setupEnvironment } from './processor.helpers';
 
 describe('Processor: Bytes', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -24,7 +25,7 @@ describe('Processor: Bytes', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx
index 962e099f5b667..dcf332912a94b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the registered domain processor when saved
 const defaultRegisteredDomainParameters = {
@@ -21,6 +21,7 @@ const REGISTERED_DOMAIN_TYPE = 'registered_domain';
 describe('Processor: Registered Domain', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -34,7 +35,7 @@ describe('Processor: Registered Domain', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx
index 544b8aeb51c05..ebfa678648904 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const SET_TYPE = 'set';
 
 describe('Processor: Set', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Set', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx
index 442788a7f75aa..9062fcc02f7f8 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the URI parts processor when saved
 const defaultUriPartsParameters = {
@@ -19,6 +19,7 @@ const URI_PARTS_TYPE = 'uri_parts';
 describe('Processor: URI parts', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -32,7 +33,7 @@ describe('Processor: URI parts', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
index fa1c24c9dfb39..ed778aa1cc1f3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the user agent processor when saved
 const defaultUserAgentParameters = {
@@ -24,6 +24,7 @@ const USER_AGENT_TYPE = 'user_agent';
 describe('Processor: User Agent', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -37,7 +38,7 @@ describe('Processor: User Agent', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx
index 109d53eff895b..896017d72a242 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 
-import { notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
+import { notificationServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 
 import { LocationDescriptorObject } from 'history';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { ProcessorsEditorContextProvider, Props, PipelineEditor } from '../';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { ProcessorsEditorContextProvider, Props, PipelineEditor } from '..';
 
 import {
   breadcrumbService,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
index 0ec9ee1c1e1ac..2da97306eee1c 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
@@ -8,23 +8,23 @@
 import { act } from 'react-dom/test-utils';
 import React from 'react';
 
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
-import { HttpSetup } from 'src/core/public';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { stubWebWorker } from '@kbn/test-jest-helpers';
 
 /* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
-import '../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 import { uiMetricService, apiService } from '../../../services';
-import { Props } from '../';
+import { Props } from '..';
 import { initHttpRequests } from './http_requests.helpers';
 import { ProcessorsEditorWithDeps } from './processors_editor';
 
 stubWebWorker();
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
index 9392fe2398e2f..2cf8dc3ee1a25 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 import { ModalProvider, OnDoneLoadJsonHandler } from './modal_provider';
 
 jest.mock('lodash', () => {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
index 7a0ea533b0d68..d574479b03e7b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
@@ -87,7 +87,12 @@ function DragAndDropTextListComponent({
     [onMove]
   );
   return (
-    <EuiFormRow isInvalid={typeof error === 'string'} error={error} fullWidth>
+    <EuiFormRow
+      isInvalid={typeof error === 'string'}
+      error={error}
+      fullWidth
+      data-test-subj="droppableList"
+    >
       <>
         {/* Label and help text. Also wire up the htmlFor so the label points to the first text field. */}
         <EuiFlexGroup
@@ -158,6 +163,7 @@ function DragAndDropTextListComponent({
                                   <EuiFlexGroup gutterSize="none" alignItems="center">
                                     <EuiFlexItem>
                                       <EuiFieldText
+                                        data-test-subj={`input-${idx}`}
                                         id={idx === 0 ? firstItemId : undefined}
                                         isInvalid={isInvalid}
                                         value={field.value}
@@ -168,7 +174,10 @@ function DragAndDropTextListComponent({
                                     </EuiFlexItem>
                                     {typeof errorMessage === 'string' && (
                                       <EuiFlexItem grow={false}>
-                                        <div className="pipelineProcessorsEditor__form__dragAndDropList__errorIcon">
+                                        <div
+                                          className="pipelineProcessorsEditor__form__dragAndDropList__errorIcon"
+                                          data-test-subj="errorIcon"
+                                        >
                                           <EuiIconTip
                                             aria-label={errorMessage}
                                             content={errorMessage}
@@ -208,7 +217,7 @@ function DragAndDropTextListComponent({
               })}
             </EuiDroppable>
           </EuiDragDropContext>
-          <EuiButtonEmpty iconType="plusInCircle" onClick={onAdd}>
+          <EuiButtonEmpty iconType="plusInCircle" onClick={onAdd} data-test-subj="addButton">
             {addLabel}
           </EuiButtonEmpty>
         </div>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx
index 1160038b52af8..756368d3b76ee 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx
@@ -11,6 +11,10 @@ import React, { FunctionComponent, ReactNode } from 'react';
 import { flow } from 'fp-ts/lib/function';
 import { map } from 'fp-ts/lib/Array';
 
+import {
+  FieldValidateResponse,
+  VALIDATION_TYPES,
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import {
   FIELD_TYPES,
   FieldConfig,
@@ -20,10 +24,6 @@ import {
 } from '../../../../../../../shared_imports';
 
 import { getProcessorDescriptor, mapProcessorTypeToDescriptor } from '../../../shared';
-import {
-  FieldValidateResponse,
-  VALIDATION_TYPES,
-} from '../../../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 
 const extractProcessorTypesAndLabels = flow(
   Object.entries,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/grok.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/grok.test.tsx
deleted file mode 100644
index 7d556cc41d109..0000000000000
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/grok.test.tsx
+++ /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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mount } from 'enzyme';
-
-import {
-  uiSettingsServiceMock,
-  i18nServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
-
-import { Form, useForm, KibanaContextProvider } from '../../../../../../shared_imports';
-import { Grok } from './grok';
-
-// @ts-ignore
-window.Worker = function () {
-  this.postMessage = () => {};
-  (this as any).terminate = () => {};
-};
-
-describe('<Grok/>', () => {
-  const setup = (props?: { defaultValue: Record<string, any> }) => {
-    function MyComponent() {
-      const { form } = useForm({ defaultValue: props?.defaultValue });
-      const i18n = i18nServiceMock.createStartContract();
-      return (
-        <KibanaContextProvider
-          services={{ uiSettings: uiSettingsServiceMock.createSetupContract() }}
-        >
-          <i18n.Context>
-            <Form form={form}>
-              <Grok />
-            </Form>
-          </i18n.Context>
-        </KibanaContextProvider>
-      );
-    }
-    return mount(<MyComponent />);
-  };
-
-  beforeAll(() => {
-    // disable all react-beautiful-dnd development warnings
-    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = true;
-  });
-
-  afterAll(() => {
-    // enable all react-beautiful-dnd development warnings
-    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = false;
-  });
-  test('smoke', () => {
-    setup({ defaultValue: { type: 'grok', fields: { patterns: ['test'] } } });
-  });
-});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx
index bb973f000574c..ceda66bfc35a7 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { useKibana } from '../../../../shared_imports';
 
-import { LoadFromJsonButton, OnDoneLoadJsonHandler, TestPipelineActions } from './';
+import { LoadFromJsonButton, OnDoneLoadJsonHandler, TestPipelineActions } from '.';
 
 export interface Props {
   onLoadJson: OnDoneLoadJsonHandler;
diff --git a/x-pack/plugins/ingest_pipelines/public/application/index.tsx b/x-pack/plugins/ingest_pipelines/public/application/index.tsx
index 91c7665503a66..56ae3e8da6d95 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/index.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/index.tsx
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import React, { ReactNode } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
 
-import { ApplicationStart } from 'src/core/public';
-import { NotificationsSetup, IUiSettingsClient, CoreTheme } from 'kibana/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { FileUploadPluginStart } from '../../../file_upload/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { NotificationsSetup, IUiSettingsClient, CoreTheme } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
 import { KibanaContextProvider, KibanaThemeProvider } from '../shared_imports';
 
 import { API_BASE_PATH } from '../../common/constants';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts b/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts
index a032b3a66347b..bc6077cc77d7b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 import { StartDependencies } from '../types';
 import {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx
index 02ea88bee3673..b7efea0bab8cc 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx
@@ -21,7 +21,7 @@ import {
 import { XJsonLang } from '@kbn/monaco';
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditorField } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   processors: object[];
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
index 29ee4d24ae7e2..c622dc13f2657 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
@@ -17,8 +17,8 @@ import {
   EuiContextMenu,
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { ScopedHistory } from '@kbn/core/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../../../shared_imports';
 import { getCreateFromCsvPath, getCreatePath } from '../../services/navigation';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
index 0bb65bb647019..c094799524893 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
@@ -17,7 +17,7 @@ import {
   EuiPopover,
   EuiContextMenu,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { Pipeline } from '../../../../common/types';
 import { useKibana } from '../../../shared_imports';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/api.ts b/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
index e1a9bdbd4e026..f687c80351075 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { FieldCopyAction, Pipeline } from '../../../common/types';
 import { API_BASE_PATH } from '../../../common/constants';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts b/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts
index f1b2d22e776b9..f09b1325f7982 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts b/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts
index a9f39b2fcc956..cc558fce051f3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export class DocumentationService {
   private esDocBasePath: string = '';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts b/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
index b982f8f4a7314..2c3b1db301b96 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 import { UIM_APP_NAME } from '../constants';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/locator.test.ts b/x-pack/plugins/ingest_pipelines/public/locator.test.ts
index 31558363513d9..b553de9b83036 100644
--- a/x-pack/plugins/ingest_pipelines/public/locator.test.ts
+++ b/x-pack/plugins/ingest_pipelines/public/locator.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { ManagementAppLocatorDefinition } from 'src/plugins/management/common/locator';
+import { ManagementAppLocatorDefinition } from '@kbn/management-plugin/common/locator';
 import { IngestPipelinesLocatorDefinition, INGEST_PIPELINES_PAGES } from './locator';
-import { sharePluginMock } from '../../../../src/plugins/share/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 describe('Ingest pipeline locator', () => {
   const setup = () => {
diff --git a/x-pack/plugins/ingest_pipelines/public/locator.ts b/x-pack/plugins/ingest_pipelines/public/locator.ts
index e4d6bf3539492..03316ff33e662 100644
--- a/x-pack/plugins/ingest_pipelines/public/locator.ts
+++ b/x-pack/plugins/ingest_pipelines/public/locator.ts
@@ -6,12 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import {
-  LocatorPublic,
-  LocatorDefinition,
-  KibanaLocation,
-} from '../../../../src/plugins/share/public';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorPublic, LocatorDefinition, KibanaLocation } from '@kbn/share-plugin/public';
 import {
   getClonePath,
   getCreatePath,
diff --git a/x-pack/plugins/ingest_pipelines/public/plugin.ts b/x-pack/plugins/ingest_pipelines/public/plugin.ts
index 68dc2c1801e0c..674c549e0f34c 100644
--- a/x-pack/plugins/ingest_pipelines/public/plugin.ts
+++ b/x-pack/plugins/ingest_pipelines/public/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin } from 'src/core/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 
 import { PLUGIN_ID } from '../common/constants';
 import { uiMetricService, apiService } from './application/services';
diff --git a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
index 1fde3a1930ba9..f7b451058ade1 100644
--- a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
+++ b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useKibana as _useKibana, CodeEditor } from '../../../../src/plugins/kibana_react/public';
+import { useKibana as _useKibana, CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { AppServices } from './application';
 
 export { CodeEditor };
@@ -16,7 +16,7 @@ export type {
   SendRequestResponse,
   UseRequestConfig,
   OnJsonEditorUpdateHandler,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   AuthorizationProvider,
@@ -31,7 +31,7 @@ export {
   JsonEditor,
   attemptToURIDecode,
   ViewApiRequestFlyout,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export type {
   FormSchema,
@@ -47,7 +47,7 @@ export type {
   ValidationConfig,
   FormOptions,
   SerializerFunc,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   FIELD_TYPES,
@@ -61,12 +61,9 @@ export {
   FormDataProvider,
   getFieldValidityAndErrorMessage,
   useFormData,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export {
-  fieldFormatters,
-  fieldValidators,
-} from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldFormatters, fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   getFormRow,
@@ -80,17 +77,14 @@ export {
   SelectField,
   CheckBoxField,
   TextField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export {
-  isJSON,
-  isEmptyString,
-} from '../../../../src/plugins/es_ui_shared/static/validators/string';
+export { isJSON, isEmptyString } from '@kbn/es-ui-shared-plugin/static/validators/string';
 
 export {
   KibanaContextProvider,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
 export const useKibana = () => _useKibana<AppServices>();
diff --git a/x-pack/plugins/ingest_pipelines/public/types.ts b/x-pack/plugins/ingest_pipelines/public/types.ts
index e135f8fed58a7..e937051e656df 100644
--- a/x-pack/plugins/ingest_pipelines/public/types.ts
+++ b/x-pack/plugins/ingest_pipelines/public/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ManagementSetup } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { SharePluginStart, SharePluginSetup } from 'src/plugins/share/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
 
 export interface SetupDependencies {
   management: ManagementSetup;
diff --git a/x-pack/plugins/ingest_pipelines/server/plugin.ts b/x-pack/plugins/ingest_pipelines/server/plugin.ts
index f67243478fe90..ea1d9fc01c42a 100644
--- a/x-pack/plugins/ingest_pipelines/server/plugin.ts
+++ b/x-pack/plugins/ingest_pipelines/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 
 import { ApiRoutes } from './routes';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts
index 90893b2841cc0..1e59151f73885 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts
@@ -30,7 +30,7 @@ export const registerCreateRoute = ({
       },
     },
     async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const pipeline = req.body as Pipeline;
 
       // eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/delete.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/delete.ts
index 1ffa5adabd83b..1b2fdd1444400 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/delete.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/delete.ts
@@ -23,7 +23,7 @@ export const registerDeleteRoute = ({ router }: RouteDependencies): void => {
       },
     },
     async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { names } = req.params;
       const pipelineNames = names.split(',');
 
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/documents.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/documents.ts
index d9f27ed84f899..b5aff114e44d2 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/documents.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/documents.ts
@@ -27,7 +27,7 @@ export const registerDocumentsRoute = ({
       },
     },
     async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { index, id } = req.params;
 
       try {
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/get.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/get.ts
index 7da2cf3e6a13a..c053c80e65713 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/get.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/get.ts
@@ -18,7 +18,7 @@ const paramsSchema = schema.object({
 export const registerGetRoutes = ({ router, lib: { handleEsError } }: RouteDependencies): void => {
   // Get all pipelines
   router.get({ path: API_BASE_PATH, validate: false }, async (ctx, req, res) => {
-    const { client: clusterClient } = ctx.core.elasticsearch;
+    const { client: clusterClient } = (await ctx.core).elasticsearch;
 
     try {
       const pipelines = await clusterClient.asCurrentUser.ingest.getPipeline();
@@ -44,7 +44,7 @@ export const registerGetRoutes = ({ router, lib: { handleEsError } }: RouteDepen
       },
     },
     async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params;
 
       try {
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
index c1d79eabceb04..175ef4eb37179 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Privileges } from '@kbn/es-ui-shared-plugin/common';
 import { RouteDependencies } from '../../types';
 import { API_BASE_PATH, APP_CLUSTER_REQUIRED_PRIVILEGES } from '../../../common/constants';
-import { Privileges } from '../../../../../../src/plugins/es_ui_shared/common';
 
 const extractMissingPrivileges = (privilegesObject: { [key: string]: boolean } = {}): string[] =>
   Object.keys(privilegesObject).reduce((privileges: string[], privilegeName: string): string[] => {
@@ -36,7 +36,7 @@ export const registerPrivilegesRoute = ({ router, config }: RouteDependencies) =
         return res.ok({ body: privilegesResult });
       }
 
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const { has_all_requested: hasAllPrivileges, cluster } =
         await clusterClient.asCurrentUser.security.hasPrivileges({
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
index 9e4e894e2c7cb..a313afbc2a2c5 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
@@ -29,7 +29,7 @@ export const registerSimulateRoute = ({
       },
     },
     async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const { pipeline, documents, verbose } = req.body;
 
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/update.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/update.ts
index 51983f12e6a60..5b1b032c8aedb 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/update.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/update.ts
@@ -30,7 +30,7 @@ export const registerUpdateRoute = ({
       },
     },
     async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params;
       // eslint-disable-next-line @typescript-eslint/naming-convention
       const { description, processors, version, on_failure } = req.body;
diff --git a/x-pack/plugins/ingest_pipelines/server/shared_imports.ts b/x-pack/plugins/ingest_pipelines/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/ingest_pipelines/server/shared_imports.ts
+++ b/x-pack/plugins/ingest_pipelines/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/ingest_pipelines/server/types.ts b/x-pack/plugins/ingest_pipelines/server/types.ts
index efc0679708a5d..ea94ea5204e1e 100644
--- a/x-pack/plugins/ingest_pipelines/server/types.ts
+++ b/x-pack/plugins/ingest_pipelines/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import { IRouter } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { handleEsError } from './shared_imports';
 
 export interface Dependencies {
diff --git a/x-pack/plugins/lens/common/constants.ts b/x-pack/plugins/lens/common/constants.ts
index d0bfecbd386be..65cd5cdc73a9a 100644
--- a/x-pack/plugins/lens/common/constants.ts
+++ b/x-pack/plugins/lens/common/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import rison from 'rison-node';
-import type { TimeRange } from '../../../../src/plugins/data/common/query';
+import type { TimeRange } from '@kbn/data-plugin/common/query';
 
 export const PLUGIN_ID = 'lens';
 export const APP_ID = 'lens';
diff --git a/x-pack/plugins/lens/common/embeddable_factory/index.ts b/x-pack/plugins/lens/common/embeddable_factory/index.ts
index b93aa97c1e2a0..c4b03ae280778 100644
--- a/x-pack/plugins/lens/common/embeddable_factory/index.ts
+++ b/x-pack/plugins/lens/common/embeddable_factory/index.ts
@@ -6,10 +6,10 @@
  */
 
 import { SerializableRecord, Serializable } from '@kbn/utility-types';
-import { SavedObjectReference } from 'src/core/types';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 
 export type LensEmbeddablePersistableState = EmbeddableStateWithType & {
   attributes: SerializableRecord;
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
index 1fb2e2d4dd55d..32a37e0cf949e 100644
--- a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
+++ b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { counterRate, CounterRateArgs } from './index';
+import { counterRate, CounterRateArgs } from '.';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Datatable } from 'src/plugins/expressions/public';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 
 describe('lens_counter_rate', () => {
   const fn = functionWrapper(counterRate);
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts
index 6412b508b9649..e4dbef592143a 100644
--- a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  buildResultColumns,
-  getBucketIdentifier,
-} from '../../../../../../src/plugins/expressions/common';
+import { buildResultColumns, getBucketIdentifier } from '@kbn/expressions-plugin/common';
 import type { CounterRateExpressionFunction } from './types';
 
 export const counterRateFn: CounterRateExpressionFunction['fn'] = (
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/types.ts b/x-pack/plugins/lens/common/expressions/counter_rate/types.ts
index f9e1cbbb43de3..0bcb23a112238 100644
--- a/x-pack/plugins/lens/common/expressions/counter_rate/types.ts
+++ b/x-pack/plugins/lens/common/expressions/counter_rate/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Datatable, ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions';
-import { CounterRateArgs } from './index';
+import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { CounterRateArgs } from '.';
 
 export type CounterRateExpressionFunction = ExpressionFunctionDefinition<
   'lens_counter_rate',
diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
index 6c84e2d7a9532..84aba75239ed0 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExecutionContext } from '../../../../../../src/plugins/expressions/common';
+import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import type { FormatFactory } from '../../types';
 import type { ColumnConfigArg } from './datatable_column';
 import type { DatatableExpressionFunction } from './types';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts
index 55bef8c29a3af..46e483f263b9b 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts
@@ -7,12 +7,9 @@
 
 import type { Direction } from '@elastic/eui';
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
+import type { CustomPaletteState } from '@kbn/charts-plugin/common';
+import type { ExpressionFunctionDefinition, DatatableColumn } from '@kbn/expressions-plugin/common';
 import { SortingHint } from '../..';
-import type { CustomPaletteState } from '../../../../../../src/plugins/charts/common';
-import type {
-  ExpressionFunctionDefinition,
-  DatatableColumn,
-} from '../../../../../../src/plugins/expressions/common';
 
 export type LensGridDirection = 'none' | Direction;
 
diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts
index 9c4d81cf087e0..713f929d74420 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts
@@ -7,15 +7,12 @@
 
 import { cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils';
+import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
+import type { DatatableColumnMeta, ExecutionContext } from '@kbn/expressions-plugin';
 import { FormatFactory, LensMultiTable } from '../../types';
 import { transposeTable } from './transpose_helpers';
 import { computeSummaryRowForColumn } from './summary';
 import { getSortingCriteria } from './sorting';
-import type {
-  DatatableColumnMeta,
-  ExecutionContext,
-} from '../../../../../../src/plugins/expressions';
 import type { DatatableExpressionFunction } from './types';
 
 function isRange(meta: { params?: { id?: string } } | undefined) {
diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx
index 24dca87c7f138..99f41c6785ae2 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx
+++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { getSortingCriteria } from './sorting';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
-import { DatatableColumnType } from 'src/plugins/expressions';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { DatatableColumnType } from '@kbn/expressions-plugin';
 
 function getMockFormatter() {
   return { convert: (v: unknown) => `${v as string}` } as FieldFormat;
diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx
index d4a3ba0ea6908..bfae4544c597c 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx
+++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx
@@ -9,7 +9,7 @@ import versionCompare from 'compare-versions';
 import valid from 'semver/functions/valid';
 import ipaddr from 'ipaddr.js';
 import type { IPv4, IPv6 } from 'ipaddr.js';
-import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 function isIPv6Address(ip: IPv4 | IPv6): ip is IPv6 {
   return ip.kind() === 'ipv6';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts
index 61e74e0ef3bc7..3307007e7f0fc 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IFieldFormat } from 'src/plugins/field_formats/common';
-import { Datatable } from 'src/plugins/expressions';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin';
 import { computeSummaryRowForColumn, getFinalSummaryConfiguration } from './summary';
 
 describe('Summary row helpers', () => {
diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.ts
index 76c607ca4c4ee..fe45a91b9a86f 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/summary.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/summary.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common';
-import type { Datatable } from '../../../../../../src/plugins/expressions/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { ColumnConfigArg } from './datatable_column';
 import { getOriginalId } from './transpose_helpers';
 import { isNumericFieldForDatatable } from './utils';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts
index ae6e20d976b5e..e99de0186222b 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { FieldFormat } from 'src/plugins/field_formats/common';
-import type { Datatable } from 'src/plugins/expressions';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { DatatableArgs } from './datatable';
 
 import { transposeTable } from './transpose_helpers';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts
index e2d928fda24ed..076ebdf08a7b2 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import type {
-  Datatable,
-  DatatableColumn,
-  DatatableRow,
-} from '../../../../../../src/plugins/expressions';
-import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common';
+import type { Datatable, DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { DatatableArgs } from './datatable';
 import type { ColumnConfig, ColumnConfigArg } from './datatable_column';
 
diff --git a/x-pack/plugins/lens/common/expressions/datatable/types.ts b/x-pack/plugins/lens/common/expressions/datatable/types.ts
index 340f3eb0576b0..9e6315bb856d0 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/types.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import type { LensMultiTable } from '../../types';
 import type { DatatableArgs } from './datatable';
 
diff --git a/x-pack/plugins/lens/common/expressions/datatable/utils.ts b/x-pack/plugins/lens/common/expressions/datatable/utils.ts
index e8d683a478c79..933d78500815e 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/utils.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Datatable } from '../../../../../../src/plugins/expressions/common';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { getOriginalId } from './transpose_helpers';
 
 function isValidNumber(value: unknown): boolean {
diff --git a/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts b/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts
index 8817f9315e182..2e1ce28534a27 100644
--- a/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts
+++ b/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionTypeDefinition } from '../../../../../../src/plugins/expressions/common';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common';
 import { LensMultiTable } from '../../types';
 
 const name = 'lens_multitable';
diff --git a/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts b/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
index 29948c63dc004..63e32ffbf1df6 100644
--- a/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
+++ b/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
@@ -6,9 +6,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Datatable, DatatableColumn } from 'src/plugins/expressions/public';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
-import { formatColumn } from './index';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { formatColumn } from '.';
 
 describe('format_column', () => {
   const fn = functionWrapper(formatColumn);
diff --git a/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts b/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
index 183ec74ac301d..bca56b2dbddbe 100644
--- a/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 import { supportedFormats } from './supported_formats';
-import type { DatatableColumn } from '../../../../../../src/plugins/expressions';
-import type { FormatColumnArgs } from './index';
+import type { FormatColumnArgs } from '.';
 import type { FormatColumnExpressionFunction } from './types';
 
 function isNestedFormat(params: DatatableColumn['meta']['params']) {
diff --git a/x-pack/plugins/lens/common/expressions/format_column/types.ts b/x-pack/plugins/lens/common/expressions/format_column/types.ts
index 589422b253b93..c91dcfd5a8f6e 100644
--- a/x-pack/plugins/lens/common/expressions/format_column/types.ts
+++ b/x-pack/plugins/lens/common/expressions/format_column/types.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import type {
-  Datatable,
-  ExpressionFunctionDefinition,
-} from '../../../../../../src/plugins/expressions';
-import type { FormatColumnArgs } from './index';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { FormatColumnArgs } from '.';
 
 export type FormatColumnExpressionFunction = ExpressionFunctionDefinition<
   'lens_format_column',
diff --git a/x-pack/plugins/lens/common/expressions/merge_tables/index.ts b/x-pack/plugins/lens/common/expressions/merge_tables/index.ts
index 2bf955d9e3ed3..2e0dbc4b44264 100644
--- a/x-pack/plugins/lens/common/expressions/merge_tables/index.ts
+++ b/x-pack/plugins/lens/common/expressions/merge_tables/index.ts
@@ -10,12 +10,12 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExecutionContext,
-} from '../../../../../../src/plugins/expressions/common';
-import { toAbsoluteDates } from '../../../../../../src/plugins/data/common';
-import type { ExpressionValueSearchContext } from '../../../../../../src/plugins/data/common';
+} from '@kbn/expressions-plugin/common';
+import { toAbsoluteDates } from '@kbn/data-plugin/common';
+import type { ExpressionValueSearchContext } from '@kbn/data-plugin/common';
 
+import type { Adapters } from '@kbn/inspector-plugin/common';
 import type { LensMultiTable } from '../../types';
-import type { Adapters } from '../../../../../../src/plugins/inspector/common';
 
 interface MergeTables {
   layerIds: string[];
diff --git a/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts b/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
index 39156c82a2fc0..4c8a3bf9aa310 100644
--- a/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
+++ b/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
@@ -6,15 +6,15 @@
  */
 
 import moment from 'moment';
-import { mergeTables } from './index';
+import { mergeTables } from '.';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionValueSearchContext } from 'src/plugins/data/public';
+import { ExpressionValueSearchContext } from '@kbn/data-plugin/public';
 import {
   Datatable,
   ExecutionContext,
   DefaultInspectorAdapters,
   TablesAdapter,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 
 describe('lens_merge_tables', () => {
   const sampleTable1: Datatable = {
diff --git a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts
index 3bfed88625c89..2047e4647cb4c 100644
--- a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts
+++ b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { renameColumns } from './rename_columns';
-import { Datatable } from '../../../../../../src/plugins/expressions/common';
-import { createMockExecutionContext } from '../../../../../../src/plugins/expressions/common/mocks';
+import { Datatable } from '@kbn/expressions-plugin/common';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('rename_columns', () => {
   it('should rename columns of a given datatable', async () => {
diff --git a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts
index c201c5f8f07e1..3cf4293ffa9f2 100644
--- a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DatatableColumn } from '../../../../../../src/plugins/expressions/common';
+import type { DatatableColumn } from '@kbn/expressions-plugin/common';
 import type { OriginalColumn, RenameColumnsExpressionFunction } from './types';
 
 function getColumnName(originalColumn: OriginalColumn, newColumn: DatatableColumn) {
diff --git a/x-pack/plugins/lens/common/expressions/rename_columns/types.ts b/x-pack/plugins/lens/common/expressions/rename_columns/types.ts
index 685ccfb89e4ca..6edfda41cc62f 100644
--- a/x-pack/plugins/lens/common/expressions/rename_columns/types.ts
+++ b/x-pack/plugins/lens/common/expressions/rename_columns/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datatable, ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions';
+import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export type OriginalColumn = { id: string; label: string } & (
   | { operationType: 'date_histogram'; sourceField: string }
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
index bebf67da13546..dd3e18c720c0a 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
@@ -7,14 +7,14 @@
 
 import moment from 'moment';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { TimeRange } from 'src/plugins/data/public';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
+import type { TimeRange } from '@kbn/data-plugin/public';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 
 // mock the specific inner variable:
 // there are intra dependencies in the data plugin we might break trying to mock the whole thing
-jest.mock('../../../../../../src/plugins/data/common/query/timefilter/get_time', () => {
+jest.mock('@kbn/data-plugin/common/query/timefilter/get_time', () => {
   const localMoment = jest.requireActual('moment');
   return {
     calculateBounds: jest.fn(({ from, to }) => ({
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts
index 21bef6de980ac..2cef5bf5b441f 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ExecutionContext } from '../../../../../../src/plugins/expressions/common';
+import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import type { TimeScaleExpressionFunction } from './types';
 
 export const getTimeScale = (
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts
index 5217d6a7db167..6f971b9193307 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts
@@ -7,16 +7,12 @@
 
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
-import {
-  buildResultColumns,
-  Datatable,
-  ExecutionContext,
-} from '../../../../../../src/plugins/expressions/common';
+import { buildResultColumns, Datatable, ExecutionContext } from '@kbn/expressions-plugin/common';
 import {
   calculateBounds,
   getDateHistogramMetaDataByDatatableColumn,
   parseInterval,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import type { TimeScaleExpressionFunction, TimeScaleUnit, TimeScaleArgs } from './types';
 
 const unitInMs: Record<TimeScaleUnit, number> = {
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/types.ts b/x-pack/plugins/lens/common/expressions/time_scale/types.ts
index 58c5e5723a7c1..407a8c101e177 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/types.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import type {
-  Datatable,
-  ExpressionFunctionDefinition,
-} from '../../../../../../src/plugins/expressions';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export type TimeScaleUnit = 's' | 'm' | 'h' | 'd';
 
diff --git a/x-pack/plugins/lens/common/suffix_formatter/index.ts b/x-pack/plugins/lens/common/suffix_formatter/index.ts
index d2af0df25f132..9c88c24157e4c 100644
--- a/x-pack/plugins/lens/common/suffix_formatter/index.ts
+++ b/x-pack/plugins/lens/common/suffix_formatter/index.ts
@@ -7,10 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
-import {
-  FieldFormat,
-  FieldFormatInstanceType,
-} from '../../../../../src/plugins/field_formats/common';
+import { FieldFormat, FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
 import type { FormatFactory } from '../types';
 import type { TimeScaleUnit } from '../expressions/time_scale';
 
diff --git a/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts b/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts
index dea0957c4215a..a8a39ad738801 100644
--- a/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts
+++ b/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { FormatFactory } from '../types';
-import { getSuffixFormatter } from './index';
+import { getSuffixFormatter } from '.';
 
 describe('suffix formatter', () => {
   it('should call nested formatter and apply suffix', () => {
diff --git a/x-pack/plugins/lens/common/types.ts b/x-pack/plugins/lens/common/types.ts
index 6922deaebd681..f4111d51e2918 100644
--- a/x-pack/plugins/lens/common/types.ts
+++ b/x-pack/plugins/lens/common/types.ts
@@ -9,12 +9,9 @@ import type { Filter, FilterMeta } from '@kbn/es-query';
 import { Position } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import type { CustomPaletteParams, PaletteOutput } from '@kbn/coloring';
-import type {
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../src/plugins/field_formats/common';
-import type { Datatable } from '../../../../src/plugins/expressions/common';
-import type { ColorMode } from '../../../../src/plugins/charts/common';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/common';
+import type { ColorMode } from '@kbn/charts-plugin/common';
 import {
   CategoryDisplay,
   layerTypes,
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
index 237a25ce78a9a..8ed33fb304525 100644
--- a/x-pack/plugins/lens/kibana.json
+++ b/x-pack/plugins/lens/kibana.json
@@ -22,7 +22,8 @@
     "dataViewFieldEditor",
     "expressionGauge",
     "expressionHeatmap",
-    "eventAnnotation"
+    "eventAnnotation",
+    "unifiedSearch"
   ],
   "optionalPlugins": [
     "expressionXY",
diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index f5da098e028f9..bfad8dcd3f0ee 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -21,22 +21,22 @@ import {
   mockStoreDeps,
 } from '../mocks';
 import { I18nProvider } from '@kbn/i18n-react';
-import { SavedObjectSaveModal } from '../../../../../src/plugins/saved_objects/public';
+import { SavedObjectSaveModal } from '@kbn/saved-objects-plugin/public';
 import { checkForDuplicateTitle } from '../persistence';
 import { createMemoryHistory } from 'history';
-import { FilterManager, Query } from '../../../../../src/plugins/data/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import { FilterManager, Query } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { buildExistsFilter, FilterStateStore } from '@kbn/es-query';
-import type { FieldSpec } from '../../../../../src/plugins/data/common';
-import { TopNavMenuData } from '../../../../../src/plugins/navigation/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import { LensByValueInput } from '../embeddable/embeddable';
-import { SavedObjectReference } from '../../../../../src/core/types';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import moment from 'moment';
 
-import { setState, LensAppState } from '../state_management/index';
+import { setState, LensAppState } from '../state_management';
 jest.mock('../editor_frame_service/editor_frame/expression_helpers');
-jest.mock('src/core/public');
+jest.mock('@kbn/core/public');
 jest.mock('../persistence/saved_objects_utils/check_for_duplicate_title', () => ({
   checkForDuplicateTitle: jest.fn(),
 }));
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
index 19b213815145a..937323518e74a 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -9,13 +9,10 @@ import './app.scss';
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBreadcrumb, EuiConfirmModal } from '@elastic/eui';
-import {
-  createKbnUrlStateStorage,
-  withNotifyOnErrors,
-} from '../../../../../src/plugins/kibana_utils/public';
-import { useExecutionContext, useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { OnSaveProps } from '../../../../../src/plugins/saved_objects/public';
-import { syncQueryStateWithUrl } from '../../../../../src/plugins/data/public';
+import { createKbnUrlStateStorage, withNotifyOnErrors } from '@kbn/kibana-utils-plugin/public';
+import { useExecutionContext, useKibana } from '@kbn/kibana-react-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import { syncQueryStateWithUrl } from '@kbn/data-plugin/public';
 import { LensAppProps, LensAppServices } from './types';
 import { LensTopNavMenu } from './lens_top_nav';
 import { LensByReferenceInput } from '../embeddable';
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts b/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts
index 59a8aadbe62ec..879713dbd7b3c 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts
+++ b/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEqual, intersection, union } from 'lodash';
-import { FilterManager } from 'src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { Document } from '../persistence/saved_object_store';
 import { DatasourceMap } from '../types';
 import { removePinnedFilters } from './save_modal_container';
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
index d3ac59e87a23e..e532c82b7b3be 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -9,19 +9,19 @@ import { isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useStore } from 'react-redux';
-import { TopNavMenuData } from '../../../../../src/plugins/navigation/public';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
+import { downloadMultipleAs } from '@kbn/share-plugin/public';
+import { tableHasFormulas } from '@kbn/data-plugin/common';
+import { exporters } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { trackUiEvent } from '../lens_ui_telemetry';
 import {
   LensAppServices,
   LensTopNavActions,
   LensTopNavMenuProps,
   LensTopNavTooltips,
 } from './types';
-import { downloadMultipleAs } from '../../../../../src/plugins/share/public';
-import { trackUiEvent } from '../lens_ui_telemetry';
-import { tableHasFormulas } from '../../../../../src/plugins/data/common';
-import { exporters } from '../../../../../src/plugins/data/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { toggleSettingsMenuOpen } from './settings_menu';
 import {
   setState,
@@ -31,11 +31,7 @@ import {
   DispatchSetState,
 } from '../state_management';
 import { getIndexPatternsObjects, getIndexPatternsIds, getResolvedDateRange } from '../utils';
-import {
-  combineQueryAndFilters,
-  getLayerMetaInfo,
-  getShowUnderlyingDataLabel,
-} from './show_underlying_data';
+import { combineQueryAndFilters, getLayerMetaInfo } from './show_underlying_data';
 
 function getLensTopNavConfig(options: {
   showSaveAndReturn: boolean;
@@ -103,11 +99,15 @@ function getLensTopNavConfig(options: {
   }
 
   if (showOpenInDiscover) {
+    const exploreDataInDiscoverLabel = i18n.translate('xpack.lens.app.exploreDataInDiscover', {
+      defaultMessage: 'Explore data in Discover',
+    });
+
     topNavMenu.push({
-      label: getShowUnderlyingDataLabel(),
+      label: exploreDataInDiscoverLabel,
       run: () => {},
       testId: 'lnsApp_openInDiscover',
-      description: getShowUnderlyingDataLabel(),
+      description: exploreDataInDiscoverLabel,
       disableButton: Boolean(tooltips.showUnderlyingDataWarning()),
       tooltip: tooltips.showUnderlyingDataWarning,
       target: '_blank',
diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
index e1419c8fe96f2..f7d865e92853e 100644
--- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -7,15 +7,18 @@
 
 import React, { FC, useCallback } from 'react';
 import { PreloadedState } from '@reduxjs/toolkit';
-import { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreSetup, CoreStart } from '@kbn/core/public';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { HashRouter, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import { History } from 'history';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { Provider } from 'react-redux';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
+import { ACTION_VISUALIZE_LENS_FIELD } from '@kbn/ui-actions-plugin/public';
+import { ACTION_CONVERT_TO_LENS } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { LensReportManager, setReportManager, trackUiEvent } from '../lens_ui_telemetry';
 
 import { App } from './app';
@@ -28,14 +31,8 @@ import {
   LensByReferenceInput,
   LensByValueInput,
 } from '../embeddable/embeddable';
-import { ACTION_VISUALIZE_LENS_FIELD } from '../../../../../src/plugins/ui_actions/public';
-import { ACTION_CONVERT_TO_LENS } from '../../../../../src/plugins/visualizations/public';
 import { LensAttributeService } from '../lens_attribute_service';
 import { LensAppServices, RedirectToOriginProps, HistoryLocationState } from './types';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
 import {
   makeConfigureStore,
   navigateAway,
diff --git a/x-pack/plugins/lens/public/app_plugin/save_modal.tsx b/x-pack/plugins/lens/public/app_plugin/save_modal.tsx
index 124702e0dd90e..1a4d7c5bfb028 100644
--- a/x-pack/plugins/lens/public/app_plugin/save_modal.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/save_modal.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import type { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 
 import {
   TagEnhancedSavedObjectSaveModalOrigin,
diff --git a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
index 7fc03fd2a6551..9107141f655de 100644
--- a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { isFilterPinned } from '@kbn/es-query';
 
-import type { SavedObjectReference } from 'kibana/public';
+import type { SavedObjectReference } from '@kbn/core/public';
 import { SaveModal } from './save_modal';
 import type { LensAppProps, LensAppServices } from './types';
 import type { SaveProps } from './app';
diff --git a/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx b/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx
index 1adebcf123df9..cf5d00585090b 100644
--- a/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx
@@ -7,15 +7,15 @@
 
 import React, { useCallback } from 'react';
 import ReactDOM from 'react-dom';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { EuiPopoverTitle, EuiSwitch, EuiWrappingPopover } from '@elastic/eui';
 import { Observable } from 'rxjs';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { Store } from 'redux';
 import { Provider } from 'react-redux';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   disableAutoApply,
   enableAutoApply,
diff --git a/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx b/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx
index e1df6ca60dd6e..24eeffd283f5f 100644
--- a/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx
@@ -8,7 +8,7 @@
 import React, { Suspense, useEffect, useState } from 'react';
 
 import { EuiLoadingSpinner, EuiOverlayMask } from '@elastic/eui';
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import type { SaveModalContainerProps } from '../save_modal_container';
 import type { LensPluginStartDependencies } from '../../plugin';
 import type { LensAppServices } from '../types';
diff --git a/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts b/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts
index fd7a9911c32f9..e673108585524 100644
--- a/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts
+++ b/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts
@@ -15,16 +15,11 @@ import {
 } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { Capabilities } from 'kibana/public';
+import { Capabilities } from '@kbn/core/public';
 import { partition } from 'lodash';
 import { TableInspectorAdapter } from '../editor_frame_service/types';
 import { Datasource } from '../types';
 
-export const getShowUnderlyingDataLabel = () =>
-  i18n.translate('xpack.lens.app.exploreRawData', {
-    defaultMessage: 'Explore data in Discover',
-  });
-
 /**
  * Joins a series of queries.
  *
diff --git a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx
index 96139799ca210..761f46cbbd2c9 100644
--- a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx
@@ -6,13 +6,13 @@
  */
 
 import React, { FC, useState, useMemo, useCallback } from 'react';
-import { OnSaveProps } from '../../../../../src/plugins/saved_objects/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import {
   SaveModalDashboardProps,
   LazySavedObjectSaveModalDashboard,
   withSuspense,
-} from '../../../../../src/plugins/presentation_util/public';
-import { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+} from '@kbn/presentation-util-plugin/public';
+import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 
 export type DashboardSaveProps = OnSaveProps & {
   returnToOrigin: boolean;
diff --git a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx
index 4e1bb05ee8515..e689ab2b49ce1 100644
--- a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx
@@ -11,8 +11,8 @@ import {
   SavedObjectSaveModalOrigin,
   OnSaveProps,
   SaveModalState,
-} from '../../../../../src/plugins/saved_objects/public';
-import { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+} from '@kbn/saved-objects-plugin/public';
+import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 
 export type OriginSaveProps = OnSaveProps & { returnToOrigin: boolean; newTags?: string[] };
 
diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts
index 1812e7dd8cdb0..94507754b893f 100644
--- a/x-pack/plugins/lens/public/app_plugin/types.ts
+++ b/x-pack/plugins/lens/public/app_plugin/types.ts
@@ -6,10 +6,10 @@
  */
 
 import type { History } from 'history';
-import type { OnSaveProps } from 'src/plugins/saved_objects/public';
-import { DiscoverStart } from 'src/plugins/discover/public';
+import type { OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
 import { Observable } from 'rxjs';
-import { SpacesApi } from '../../../spaces/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import type {
   ApplicationStart,
   AppMountParameters,
@@ -21,26 +21,20 @@ import type {
   NotificationsStart,
   OverlayStart,
   SavedObjectsStart,
-} from '../../../../../src/core/public';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
-import type { UsageCollectionStart } from '../../../../../src/plugins/usage_collection/public';
-import type { DashboardStart } from '../../../../../src/plugins/dashboard/public';
-import type { LensEmbeddableInput } from '../embeddable/embeddable';
-import type { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
-import type { LensAttributeService } from '../lens_attribute_service';
-import type { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
-import type { DashboardFeatureFlagConfig } from '../../../../../src/plugins/dashboard/public';
-import type { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
-import {
-  VisualizeFieldContext,
-  ACTION_VISUALIZE_LENS_FIELD,
-} from '../../../../../src/plugins/ui_actions/public';
-import { ACTION_CONVERT_TO_LENS } from '../../../../../src/plugins/visualizations/public';
-import type {
-  EmbeddableEditorState,
-  EmbeddableStateTransfer,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DashboardFeatureFlagConfig } from '@kbn/dashboard-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
+import { VisualizeFieldContext, ACTION_VISUALIZE_LENS_FIELD } from '@kbn/ui-actions-plugin/public';
+import { ACTION_CONVERT_TO_LENS } from '@kbn/visualizations-plugin/public';
+import type { EmbeddableEditorState, EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type {
   DatasourceMap,
   EditorFrameInstance,
@@ -48,8 +42,8 @@ import type {
   LensTopNavMenuEntryGenerator,
   VisualizationMap,
 } from '../types';
-import type { PresentationUtilPluginStart } from '../../../../../src/plugins/presentation_util/public';
-import type { FieldFormatsStart } from '../../../../../src/plugins/field_formats/public';
+import type { LensAttributeService } from '../lens_attribute_service';
+import type { LensEmbeddableInput } from '../embeddable/embeddable';
 import type { LensInspector } from '../lens_inspector_service';
 
 export interface RedirectToOriginProps {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
index f383c13e275aa..54321d5005f47 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
@@ -9,14 +9,14 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { DataContext } from './table_basic';
 import { createGridCell } from './cell_value';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
-import { Datatable } from 'src/plugins/expressions/public';
-import { IUiSettingsClient } from 'kibana/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { act } from 'react-dom/test-utils';
 import { ReactWrapper } from 'enzyme';
 import { DatatableArgs, ColumnConfigArg } from '../../../common/expressions';
 import { DataContextType } from './types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 describe('datatable cell renderer', () => {
   const table: Datatable = {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
index 9ecd7579aa17f..a7c3e8d832a12 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
@@ -7,7 +7,7 @@
 
 import React, { useContext, useEffect } from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import classNames from 'classnames';
 import type { FormatFactory } from '../../../common';
 import { getOriginalId } from '../../../common/expressions';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
index 47a26bc594723..84395ac7dfdfc 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
@@ -13,7 +13,7 @@ import {
   EuiDataGridColumnCellActionProps,
   EuiListGroupItemProps,
 } from '@elastic/eui';
-import type { Datatable, DatatableColumn, DatatableColumnMeta } from 'src/plugins/expressions';
+import type { Datatable, DatatableColumn, DatatableColumnMeta } from '@kbn/expressions-plugin';
 import type { FormatFactory } from '../../../common';
 import type { ColumnConfig } from '../../../common/expressions';
 
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx
index 4004164a9427d..64517c92dc77e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx
@@ -17,7 +17,7 @@ import { DatatableVisualizationState } from '../visualization';
 import { createMockDatasource, createMockFramePublicAPI } from '../../mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TableDimensionEditor } from './dimension_editor';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { act } from 'react-dom/test-utils';
 import { PalettePanelContainer } from '../../shared_components';
 import { layerTypes } from '../../../common';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx
index 62eacd23f7143..11fc3fc1e8a6c 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx
@@ -29,7 +29,7 @@ import {
   useDebouncedValue,
   PalettePanelContainer,
   findMinMaxByColumnId,
-} from '../../shared_components/';
+} from '../../shared_components';
 import type { ColumnState } from '../../../common/expressions';
 import {
   isNumericFieldForDatatable,
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts
index 515f5a40fd58a..118abdcb77c8a 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts
@@ -8,7 +8,7 @@
 import React from 'react';
 
 import { EuiDataGridSorting } from '@elastic/eui';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 
 import {
   createGridFilterHandler,
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
index c37ab22002c1c..817b1d10fd82e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
@@ -6,7 +6,7 @@
  */
 
 import type { EuiDataGridSorting } from '@elastic/eui';
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin';
 import type { LensFilterEvent } from '../../types';
 import type { LensMultiTable } from '../../../common';
 import type { LensResizeAction, LensSortAction, LensToggleAction } from './types';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
index 2ad20bf0a43e2..96ffbf371525e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
@@ -10,21 +10,21 @@ import { ReactWrapper, shallow, mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { EuiDataGrid } from '@elastic/eui';
-import { IAggType } from 'src/plugins/data/public';
+import { IAggType } from '@kbn/data-plugin/public';
 import {
   FieldFormatParams,
   IFieldFormat,
   SerializedFieldFormat,
-} from 'src/plugins/field_formats/common';
+} from '@kbn/field-formats-plugin/common';
 import { VisualizationContainer } from '../../visualization_container';
-import { EmptyPlaceholder } from '../../../../../../src/plugins/charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import { LensIconChartDatatable } from '../../assets/chart_datatable';
 import { DataContext, DatatableComponent } from './table_basic';
 import { LensMultiTable } from '../../../common';
 import { DatatableProps } from '../../../common/expressions';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { IUiSettingsClient } from 'kibana/public';
-import { RenderMode } from 'src/plugins/expressions';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { RenderMode } from '@kbn/expressions-plugin';
 
 import { LENS_EDIT_PAGESIZE_ACTION } from './constants';
 
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
index ebf68d5c2b226..76d677f74fe91 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
@@ -19,7 +19,7 @@ import {
   EuiDataGridSorting,
   EuiDataGridStyle,
 } from '@elastic/eui';
-import { EmptyPlaceholder } from '../../../../../../src/plugins/charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import type { LensFilterEvent, LensTableRowContextMenuEvent } from '../../types';
 import type { FormatFactory } from '../../../common';
 import type { LensGridDirection } from '../../../common/expressions';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx
index 974b26211e729..6c69b855dd65a 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx
@@ -10,7 +10,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DataTableToolbar } from './toolbar';
 import { DatatableVisualizationState } from '../visualization';
 import { FramePublicAPI, VisualizationToolbarProps } from '../../types';
-import { ToolbarButton } from 'src/plugins/kibana_react/public';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import { ReactWrapper } from 'enzyme';
 import { PagingState } from '../../../common/expressions';
 import { EuiButtonGroup, EuiRange } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
index a2801424701b3..656f8efcc09ee 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
@@ -49,7 +49,7 @@ export function DataTableToolbar(props: VisualizationToolbarProps<DatatableVisua
   }, [setState, state]);
 
   return (
-    <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
       <ToolbarPopover
         title={i18n.translate('xpack.lens.table.valuesVisualOptions', {
           defaultMessage: 'Visual options',
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts
index 139a070e3476b..40477b98bec23 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { CustomPaletteState } from 'src/plugins/charts/public';
-import type { IAggType } from 'src/plugins/data/public';
-import type { Datatable, RenderMode } from 'src/plugins/expressions';
+import { CustomPaletteState } from '@kbn/charts-plugin/public';
+import type { IAggType } from '@kbn/data-plugin/public';
+import type { Datatable, RenderMode } from '@kbn/expressions-plugin';
 import type { ILensInterpreterRenderHandlers, LensEditEvent } from '../../types';
 import {
   LENS_EDIT_SORT_ACTION,
diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
index 74c33a2b02a5b..8a899780515b2 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
@@ -7,7 +7,7 @@
 
 import type { DatatableProps } from '../../common/expressions';
 import type { LensMultiTable } from '../../common';
-import { createMockExecutionContext } from '../../../../../src/plugins/expressions/common/mocks';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import type { FormatFactory } from '../../common';
 import { getDatatable } from '../../common/expressions';
 
diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
index 9c00aa3c71308..1053eadce1363 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
@@ -10,10 +10,10 @@ import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { IAggType } from 'src/plugins/data/public';
-import { IUiSettingsClient, ThemeServiceStart } from 'kibana/public';
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import type { IAggType } from '@kbn/data-plugin/public';
+import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { DatatableComponent } from './components/table_basic';
 
 import type { ILensInterpreterRenderHandlers } from '../types';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/index.ts b/x-pack/plugins/lens/public/datatable_visualization/index.ts
index 5ab970e84d043..f19c731517c2d 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/index.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import type { ChartsPluginSetup } from 'src/plugins/charts/public';
-import type { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
 import type { FormatFactory } from '../../common';
 
 interface DatatableVisualizationPluginStartPlugins {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx
index 93421117f59dc..5e86aa9becc66 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { Ast } from '@kbn/interpreter';
-import { buildExpression } from '../../../../../src/plugins/expressions/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 import { createMockDatasource, createMockFramePublicAPI, DatasourceMock } from '../mocks';
 import { DatatableVisualizationState, getDatatableVisualization } from './visualization';
 import {
@@ -16,9 +16,9 @@ import {
   TableSuggestionColumn,
   VisualizationDimensionGroupConfig,
 } from '../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { layerTypes } from '../../common';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 function mockFrame(): FramePublicAPI {
   return {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
index a5e2e4e0f2675..8087f43b90e72 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
@@ -11,19 +11,19 @@ import { Ast } from '@kbn/interpreter';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { PaletteRegistry, CUSTOM_PALETTE } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 import type {
   SuggestionRequest,
   Visualization,
   VisualizationSuggestion,
-  DatasourcePublicAPI,
+  DatasourceLayers,
 } from '../types';
 import { LensIconChartDatatable } from '../assets/chart_datatable';
 import { TableDimensionEditor } from './components/dimension_editor';
 import { LayerType, layerTypes } from '../../common';
 import { getDefaultSummaryLabel, PagingState } from '../../common/expressions';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
 import type { ColumnState, SortingState } from '../../common/expressions';
 import { DataTableToolbar } from './components/toolbar';
 
@@ -492,7 +492,7 @@ export const getDatatableVisualization = ({
 
 function getDataSourceAndSortedColumns(
   state: DatatableVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   layerId: string
 ) {
   const datasource = datasourceLayers[state.layerId];
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
index dbbc6932220dc..c38a9a3493708 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
@@ -64,7 +64,6 @@ export function AddLayerButton({
         position="bottom"
       >
         <EuiButton
-          className="lnsConfigPanel__addLayerBtn"
           fullWidth
           data-test-subj="lnsLayerAddButton"
           aria-label={i18n.translate('xpack.lens.configPanel.addLayerButton', {
@@ -88,7 +87,6 @@ export function AddLayerButton({
       data-test-subj="lnsConfigPanel__addLayerPopover"
       button={
         <EuiButton
-          className="lnsConfigPanel__addLayerBtn"
           fullWidth
           data-test-subj="lnsLayerAddButton"
           aria-label={i18n.translate('xpack.lens.configPanel.addLayerButton', {
@@ -116,6 +114,7 @@ export function AddLayerButton({
             title: i18n.translate('xpack.lens.configPanel.selectLayerType', {
               defaultMessage: 'Select layer type',
             }),
+            width: 300,
             items: supportedLayers.map(({ type, label, icon, disabled, toolTipContent }) => {
               return {
                 toolTipContent,
@@ -143,7 +142,6 @@ export function AddLayerButton({
                     <span className="lnsLayerAddButtonLabel">{label}</span>
                   ),
                 className: 'lnsLayerAddButton',
-                width: 300,
                 icon: icon && <EuiIcon size="m" type={icon} />,
                 ['data-test-subj']: `lnsLayerAddButton-${type}`,
                 onClick: () => {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx
index b234b18f5262f..fd43fdf6e1a0f 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx
@@ -17,7 +17,7 @@ import {
 import { Visualization } from '../../../types';
 import { LayerPanels } from './config_panel';
 import { LayerPanel } from './layer_panel';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { generateId } from '../../../id_generator';
 import { mountWithProvider } from '../../../mocks';
 import { LayerType, layerTypes } from '../../../../common';
@@ -422,6 +422,7 @@ describe('ConfigPanel', () => {
           datasourceLayers: {
             a: expect.anything(),
           },
+          dateRange: expect.anything(),
         },
         groupId: 'a',
         layerId: 'newId',
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
index 343cd746ba2ac..69e2ee99460bc 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
@@ -148,4 +148,4 @@
     @include passDownFocusRing('.lnsLayerPanel__triggerTextLabel');
     background-color: transparent;
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
index 0f28e54df17d9..2955c6a8cd935 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
@@ -11,7 +11,7 @@ import { EuiFormRow } from '@elastic/eui';
 import { FramePublicAPI, Visualization } from '../../../types';
 import { LayerPanel } from './layer_panel';
 import { ChildDragDropProvider, DragDrop } from '../../../drag_drop';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { generateId } from '../../../id_generator';
 import {
   createMockVisualization,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx
index 64656a2eedf63..cd7d325d5830d 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { DataPanelWrapper } from './data_panel_wrapper';
 import { Datasource, DatasourceDataPanelProps } from '../../types';
 import { DragDropIdentifier } from '../../drag_drop';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { mockStoreDeps, mountWithProvider } from '../../mocks';
 import { disableAutoApply } from '../../state_management/lens_slice';
 import { selectTriggerApplyChanges } from '../../state_management';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx
index 17f3d385123c2..a12578c66b0c9 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx
@@ -10,10 +10,10 @@ import './data_panel_wrapper.scss';
 import React, { useMemo, memo, useContext, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiPopover, EuiButtonIcon, EuiContextMenuPanel, EuiContextMenuItem } from '@elastic/eui';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { NativeRenderer } from '../../native_renderer';
 import { DragContext, DragDropIdentifier } from '../../drag_drop';
 import { StateSetter, DatasourceDataPanelProps, DatasourceMap } from '../../types';
-import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
 import {
   switchDatasource,
   useLensDispatch,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
index faf36a3b519c5..91ca494866f30 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
@@ -31,7 +31,7 @@ import { EuiPanel, EuiToolTip } from '@elastic/eui';
 import { EditorFrame, EditorFrameProps } from './editor_frame';
 import { DatasourcePublicAPI, DatasourceSuggestion, Visualization } from '../../types';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { fromExpression } from '@kbn/interpreter';
 import {
   createMockVisualization,
@@ -40,12 +40,12 @@ import {
   createExpressionRendererMock,
   mockStoreDeps,
 } from '../../mocks';
-import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
-import { ReactExpressionRendererType } from 'src/plugins/expressions/public';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
 import { DragDrop } from '../../drag_drop';
-import { uiActionsPluginMock } from '../../../../../../src/plugins/ui_actions/public/mocks';
-import { chartPluginMock } from '../../../../../../src/plugins/charts/public/mocks';
-import { expressionsPluginMock } from '../../../../../../src/plugins/expressions/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { mockDataPlugin, mountWithProvider } from '../../mocks';
 import { setState } from '../../state_management';
 import { getLensInspectorService } from '../../lens_inspector_service';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx
index 7f1c673d0d1dd..16a3a6f96827a 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { useCallback, useRef } from 'react';
-import { CoreStart } from 'kibana/public';
-import { ReactExpressionRendererType } from '../../../../../../src/plugins/expressions/public';
+import { CoreStart } from '@kbn/core/public';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
 import { DatasourceMap, FramePublicAPI, VisualizationMap, Suggestion } from '../../types';
 import { DataPanelWrapper } from './data_panel_wrapper';
 import { ConfigPanelWrapper } from './config_panel';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
index 600341931f575..cecf75cd58676 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
@@ -7,7 +7,7 @@
 
 import { Ast, AstFunction, fromExpression } from '@kbn/interpreter';
 import { DatasourceStates } from '../../state_management';
-import { Visualization, DatasourcePublicAPI, DatasourceMap } from '../../types';
+import { Visualization, DatasourceMap, DatasourceLayers } from '../../types';
 
 export function prependDatasourceExpression(
   visualizationExpression: Ast | string | null,
@@ -74,7 +74,7 @@ export function buildExpression({
   visualizationState: unknown;
   datasourceMap: DatasourceMap;
   datasourceStates: DatasourceStates;
-  datasourceLayers: Record<string, DatasourcePublicAPI>;
+  datasourceLayers: DatasourceLayers;
 }): Ast | null {
   if (visualization === null) {
     return null;
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts
index 95626b7657e59..1790a18ad1248 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts
@@ -5,13 +5,14 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { Ast } from '@kbn/interpreter';
 import memoizeOne from 'memoize-one';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import {
   Datasource,
+  DatasourceLayers,
   DatasourceMap,
-  DatasourcePublicAPI,
   FramePublicAPI,
   InitializationOptions,
   Visualization,
@@ -20,7 +21,6 @@ import {
 } from '../../types';
 import { buildExpression } from './expression_helpers';
 import { Document } from '../../persistence/saved_object_store';
-import { VisualizeFieldContext } from '../../../../../../src/plugins/ui_actions/public';
 import { getActiveDatasourceIdFromDoc } from '../../utils';
 import { ErrorMessage } from '../types';
 import {
@@ -62,7 +62,7 @@ export const getDatasourceLayers = memoizeOne(function getDatasourceLayers(
   datasourceStates: DatasourceStates,
   datasourceMap: DatasourceMap
 ) {
-  const datasourceLayers: Record<string, DatasourcePublicAPI> = {};
+  const datasourceLayers: DatasourceLayers = {};
   Object.keys(datasourceMap)
     .filter((id) => datasourceStates[id] && !datasourceStates[id].isLoading)
     .forEach((id) => {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts
index f24158d2db501..d21940d4ed561 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import type { PaletteOutput } from '@kbn/coloring';
-import { VisualizeFieldContext } from '../../../../../../src/plugins/ui_actions/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import {
   Visualization,
   Datasource,
   TableSuggestion,
   DatasourceSuggestion,
-  DatasourcePublicAPI,
   DatasourceMap,
   VisualizationMap,
   VisualizeEditorContext,
   Suggestion,
+  DatasourceLayers,
 } from '../../types';
 import { DragDropIdentifier } from '../../drag_drop';
 import { LayerType, layerTypes } from '../../../common';
@@ -261,7 +261,7 @@ export function switchToSuggestion(
 }
 
 export function getTopSuggestionForField(
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   visualization: VisualizationState,
   datasourceStates: DatasourceStates,
   visualizationMap: Record<string, Visualization<unknown>>,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
index 2c9c837c45298..cda496aa693e8 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
@@ -15,7 +15,7 @@ import {
   createMockFramePublicAPI,
 } from '../../mocks';
 import { act } from 'react-dom/test-utils';
-import { ReactExpressionRendererType } from '../../../../../../src/plugins/expressions/public';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
 import { SuggestionPanel, SuggestionPanelProps, SuggestionPanelWrapper } from './suggestion_panel';
 import { getSuggestions } from './suggestion_helpers';
 import { EuiIcon, EuiPanel, EuiToolTip, EuiAccordion } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
index 69de606a77ca7..770d25be5388f 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
@@ -25,20 +25,20 @@ import { IconType } from '@elastic/eui/src/components/icon/icon';
 import { Ast, toExpression } from '@kbn/interpreter';
 import { i18n } from '@kbn/i18n';
 import classNames from 'classnames';
-import { ExecutionContextSearch } from 'src/plugins/data/public';
+import { ExecutionContextSearch } from '@kbn/data-plugin/public';
+import {
+  ReactExpressionRendererProps,
+  ReactExpressionRendererType,
+} from '@kbn/expressions-plugin/public';
 import {
   Datasource,
   Visualization,
   FramePublicAPI,
-  DatasourcePublicAPI,
   DatasourceMap,
   VisualizationMap,
+  DatasourceLayers,
 } from '../../types';
 import { getSuggestions, switchToSuggestion } from './suggestion_helpers';
-import {
-  ReactExpressionRendererProps,
-  ReactExpressionRendererType,
-} from '../../../../../../src/plugins/expressions/public';
 import { prependDatasourceExpression } from './expression_helpers';
 import { trackUiEvent, trackSuggestionEvent } from '../../lens_ui_telemetry';
 import {
@@ -491,7 +491,9 @@ function getPreviewExpression(
     return null;
   }
 
-  const suggestionFrameApi: FramePublicAPI = { datasourceLayers: { ...frame.datasourceLayers } };
+  const suggestionFrameApi: Pick<FramePublicAPI, 'datasourceLayers' | 'activeData'> = {
+    datasourceLayers: { ...frame.datasourceLayers },
+  };
 
   // use current frame api and patch apis for changed datasource layers
   if (
@@ -501,7 +503,7 @@ function getPreviewExpression(
   ) {
     const datasource = datasources[visualizableState.datasourceId];
     const datasourceState = visualizableState.datasourceState;
-    const updatedLayerApis: Record<string, DatasourcePublicAPI> = pick(
+    const updatedLayerApis: DatasourceLayers = pick(
       frame.datasourceLayers,
       visualizableState.keptLayerIds
     );
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss
index a4e22b4ef558c..9cd11cf1396db 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss
@@ -6,9 +6,18 @@
 }
 
 .lnsChartSwitch__summaryIcon {
-  margin-right: $euiSizeS;
   transform: translateY(-1px);
   color: $euiTextSubduedColor;
+
+  @include euiBreakpoint('xl') {
+    margin-right: $euiSizeS;
+  }
+}
+
+.lnsChartSwitch__summaryText {
+  @include euiBreakpoint('xs', 's', 'm', 'l') {
+    @include euiScreenReaderOnly;
+  }
 }
 
 .lnsChartSwitch__append {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx
index d90fcddec46ce..a611d6d43638d 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx
@@ -20,6 +20,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import {
   Visualization,
   FramePublicAPI,
@@ -30,7 +31,6 @@ import {
 } from '../../../types';
 import { getSuggestions, switchToSuggestion } from '../suggestion_helpers';
 import { trackUiEvent } from '../../../lens_ui_telemetry';
-import { ToolbarButton } from '../../../../../../../src/plugins/kibana_react/public';
 import {
   insertLayer,
   removeLayers,
@@ -92,7 +92,7 @@ function VisualizationSummary({
       {description.icon && (
         <EuiIcon size="l" className="lnsChartSwitch__summaryIcon" type={description.icon} />
       )}
-      {description.label}
+      <span className="lnsChartSwitch__summaryText">{description.label}</span>
     </>
   );
 }
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx
index 44d6a7118aca9..3b5724b6d72f6 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx
@@ -9,10 +9,7 @@ import React from 'react';
 import { EuiPageContentBody, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import {
-  UiActionsStart,
-  VISUALIZE_GEO_FIELD_TRIGGER,
-} from '../../../../../../../src/plugins/ui_actions/public';
+import { UiActionsStart, VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
 import { getVisualizeGeoFieldMessage } from '../../../utils';
 import { DragDrop } from '../../../drag_drop';
 import { GlobeIllustration } from '../../../assets/globe_illustration';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss
index 19f815dfb7114..ca1d4b2e2caff 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss
@@ -1,5 +1,7 @@
-.lnsWorkspaceWarning__button {
-  color: $euiColorWarningText;
+.lnsWorkspaceWarning__buttonText {
+  @include euiBreakpoint('xs', 's', 'm', 'l') {
+    @include euiScreenReaderOnly;
+  }
 }
 
 .lnsWorkspaceWarningList {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx
index 51df2d83d1832..6f90bd340c1eb 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx
@@ -31,16 +31,21 @@ export const WarningsPopover = ({
       panelPaddingSize="none"
       button={
         <EuiButtonEmpty
+          color="warning"
           onClick={onButtonClick}
           iconType="alert"
           className="lnsWorkspaceWarning__button"
         >
-          {i18n.translate('xpack.lens.chartWarnings.number', {
-            defaultMessage: `{warningsCount} {warningsCount, plural, one {warning} other {warnings}}`,
-            values: {
-              warningsCount,
-            },
-          })}
+          {warningsCount}
+          <span className="lnsWorkspaceWarning__buttonText">
+            {' '}
+            {i18n.translate('xpack.lens.chartWarnings.number', {
+              defaultMessage: `{warningsCount, plural, one {warning} other {warnings}}`,
+              values: {
+                warningsCount,
+              },
+            })}
+          </span>
         </EuiButtonEmpty>
       }
       isOpen={isPopoverOpen}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
index 70ed86c2eef37..6e546459a7011 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { ReactExpressionRendererProps } from '../../../../../../../src/plugins/expressions/public';
+import { ReactExpressionRendererProps } from '@kbn/expressions-plugin/public';
 import { FramePublicAPI, Visualization } from '../../../types';
 import {
   createMockVisualization,
@@ -28,13 +28,13 @@ import { ReactWrapper } from 'enzyme';
 import { DragDrop, ChildDragDropProvider } from '../../../drag_drop';
 import { fromExpression } from '@kbn/interpreter';
 import { buildExistsFilter } from '@kbn/es-query';
-import { coreMock } from 'src/core/public/mocks';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
-import { UiActionsStart } from '../../../../../../../src/plugins/ui_actions/public';
-import { uiActionsPluginMock } from '../../../../../../../src/plugins/ui_actions/public/mocks';
-import { TriggerContract } from '../../../../../../../src/plugins/ui_actions/public/triggers';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../../../src/plugins/visualizations/public/embeddable';
+import { coreMock } from '@kbn/core/public/mocks';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { TriggerContract } from '@kbn/ui-actions-plugin/public/triggers';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public/embeddable';
 import {
   applyChanges,
   setState,
@@ -42,7 +42,7 @@ import {
   updateVisualizationState,
 } from '../../../state_management';
 import { getLensInspectorService } from '../../../lens_inspector_service';
-import { inspectorPluginMock } from '../../../../../../../src/plugins/inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { disableAutoApply, enableAutoApply } from '../../../state_management/lens_slice';
 
 const defaultPermissions: Record<string, Record<string, boolean | Record<string, boolean>>> = {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
index d349428902c82..9fbe03bc8561e 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
@@ -22,14 +22,18 @@ import {
   EuiSpacer,
   EuiTextColor,
 } from '@elastic/eui';
-import type { CoreStart, ApplicationStart } from 'kibana/public';
-import type { DataPublicPluginStart, ExecutionContextSearch } from 'src/plugins/data/public';
-import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
+import type { CoreStart, ApplicationStart } from '@kbn/core/public';
+import type { DataPublicPluginStart, ExecutionContextSearch } from '@kbn/data-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import type {
   ExpressionRendererEvent,
   ExpressionRenderError,
   ReactExpressionRendererType,
-} from '../../../../../../../src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import type { DefaultInspectorAdapters } from '@kbn/expressions-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import {
   FramePublicAPI,
   isLensBrushEvent,
@@ -44,8 +48,6 @@ import { DragDrop, DragContext, DragDropIdentifier } from '../../../drag_drop';
 import { switchToSuggestion } from '../suggestion_helpers';
 import { buildExpression } from '../expression_helpers';
 import { trackUiEvent } from '../../../lens_ui_telemetry';
-import { UiActionsStart } from '../../../../../../../src/plugins/ui_actions/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../../../src/plugins/visualizations/public';
 import { WorkspacePanelWrapper } from './workspace_panel_wrapper';
 import { DropIllustration } from '../../../assets/drop_illustration';
 import applyChangesIllustrationDark from '../../../assets/render_dark@2x.png';
@@ -55,7 +57,6 @@ import {
   getUnknownVisualizationTypeError,
 } from '../../error_helper';
 import { getMissingIndexPattern, validateDatasourceAndVisualization } from '../state_helpers';
-import type { DefaultInspectorAdapters } from '../../../../../../../src/plugins/expressions/common';
 import {
   onActiveDataChange,
   useLensDispatch,
@@ -78,7 +79,6 @@ import {
 import type { LensInspector } from '../../../lens_inspector_service';
 import { inferTimeField } from '../../../utils';
 import { setChangesApplied } from '../../../state_management/lens_slice';
-import type { Datatable } from '../../../../../../../src/plugins/expressions/public';
 import { DONT_CLOSE_DIMENSION_CONTAINER_ON_CLICK_CLASS } from '../config_panel/dimension_container';
 
 export interface WorkspacePanelProps {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
index a3287179f13cd..4d07441287cbd 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
@@ -87,15 +87,19 @@
 }
 
 .lnsWorkspacePanelWrapper__toolbar {
-  margin-bottom: 0;
+  margin-bottom: $euiSizeXS;
+}
 
-  &.lnsWorkspacePanelWrapper__toolbar--fullscreen {
-    padding: $euiSizeS $euiSizeS 0 $euiSizeS;
-    background-color: #FFF;
-  }
+.lnsWorkspacePanelWrapper__toolbar--fullscreen {
+  background-color: $euiColorEmptyShade;
+  justify-content: flex-end;
+  margin-bottom: 0;
+  padding: $euiSizeS $euiSizeS 0;
+}
 
-  & > .euiFlexItem {
-    min-height: $euiButtonHeightSmall;
+.lnsWorkspacePanelWrapper__applyButton .euiButton__text {
+  @include euiBreakpoint('xs', 's', 'm', 'l') {
+    @include euiScreenReaderOnly;
   }
 }
 
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
index bb85ed4019412..d476a8689f06b 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
@@ -103,80 +103,76 @@ export function WorkspacePanelWrapper({
   return (
     <>
       {!(isFullscreen && (autoApplyEnabled || warningMessages?.length)) && (
-        <div>
-          <EuiFlexGroup
-            alignItems="center"
-            gutterSize="m"
-            direction="row"
-            responsive={false}
-            wrap={true}
-            justifyContent="spaceBetween"
-            className={classNames('lnsWorkspacePanelWrapper__toolbar', {
-              'lnsWorkspacePanelWrapper__toolbar--fullscreen': isFullscreen,
-            })}
-          >
-            {!isFullscreen && (
-              <EuiFlexItem grow={false}>
-                <EuiFlexGroup gutterSize="m" justifyContent="flexStart">
-                  <EuiFlexItem grow={false}>
-                    <ChartSwitch
-                      data-test-subj="lnsChartSwitcher"
-                      visualizationMap={visualizationMap}
-                      datasourceMap={datasourceMap}
-                      framePublicAPI={framePublicAPI}
-                    />
-                  </EuiFlexItem>
-                  {activeVisualization && activeVisualization.renderToolbar && (
-                    <EuiFlexItem grow={false}>
-                      <NativeRenderer
-                        render={activeVisualization.renderToolbar}
-                        nativeProps={{
-                          frame: framePublicAPI,
-                          state: visualizationState,
-                          setState: setVisualizationState,
-                        }}
-                      />
-                    </EuiFlexItem>
-                  )}
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            )}
+        <EuiFlexGroup
+          alignItems="flexEnd"
+          gutterSize="s"
+          direction="row"
+          className={classNames('lnsWorkspacePanelWrapper__toolbar', {
+            'lnsWorkspacePanelWrapper__toolbar--fullscreen': isFullscreen,
+          })}
+          responsive={false}
+        >
+          {!isFullscreen && (
             <EuiFlexItem>
-              <EuiFlexGroup
-                alignItems="center"
-                justifyContent="flexEnd"
-                gutterSize="s"
-                responsive={false}
-              >
+              <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false} wrap={true}>
                 <EuiFlexItem grow={false}>
-                  {warningMessages?.length ? (
-                    <WarningsPopover>{warningMessages}</WarningsPopover>
-                  ) : null}
+                  <ChartSwitch
+                    data-test-subj="lnsChartSwitcher"
+                    visualizationMap={visualizationMap}
+                    datasourceMap={datasourceMap}
+                    framePublicAPI={framePublicAPI}
+                  />
                 </EuiFlexItem>
-                {!autoApplyEnabled && (
+
+                {activeVisualization && activeVisualization.renderToolbar && (
                   <EuiFlexItem grow={false}>
-                    <div>
-                      <EuiButton
-                        disabled={autoApplyEnabled || changesApplied}
-                        fill
-                        className={DONT_CLOSE_DIMENSION_CONTAINER_ON_CLICK_CLASS}
-                        iconType="checkInCircleFilled"
-                        onClick={() => dispatchLens(applyChanges())}
-                        size="m"
-                        data-test-subj="lnsApplyChanges__toolbar"
-                      >
-                        <FormattedMessage
-                          id="xpack.lens.editorFrame.applyChangesLabel"
-                          defaultMessage="Apply changes"
-                        />
-                      </EuiButton>
-                    </div>
+                    <NativeRenderer
+                      render={activeVisualization.renderToolbar}
+                      nativeProps={{
+                        frame: framePublicAPI,
+                        state: visualizationState,
+                        setState: setVisualizationState,
+                      }}
+                    />
                   </EuiFlexItem>
                 )}
               </EuiFlexGroup>
             </EuiFlexItem>
-          </EuiFlexGroup>
-        </div>
+          )}
+
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+              {warningMessages?.length ? (
+                <EuiFlexItem grow={false}>
+                  <WarningsPopover>{warningMessages}</WarningsPopover>
+                </EuiFlexItem>
+              ) : null}
+
+              {!autoApplyEnabled && (
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    disabled={autoApplyEnabled || changesApplied}
+                    fill
+                    className={
+                      'lnsWorkspacePanelWrapper__applyButton ' +
+                      DONT_CLOSE_DIMENSION_CONTAINER_ON_CLICK_CLASS
+                    }
+                    iconType="checkInCircleFilled"
+                    onClick={() => dispatchLens(applyChanges())}
+                    size="m"
+                    data-test-subj="lnsApplyChanges__toolbar"
+                    minWidth="auto"
+                  >
+                    <FormattedMessage
+                      id="xpack.lens.editorFrame.applyChangesLabel"
+                      defaultMessage="Apply changes"
+                    />
+                  </EuiButton>
+                </EuiFlexItem>
+              )}
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
       )}
 
       <EuiPageContent
diff --git a/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts b/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
index 7d237cb783c5e..f9a2c2efcdc22 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { isEqual, uniqWith } from 'lodash';
-import { ExpressionRenderError } from '../../../../../src/plugins/expressions/public';
-import { isEsError } from '../../../../../src/plugins/data/public';
-import type { IEsError, Reason } from '../../../../../src/plugins/data/public';
+import { ExpressionRenderError } from '@kbn/expressions-plugin/public';
+import { isEsError } from '@kbn/data-plugin/public';
+import type { IEsError, Reason } from '@kbn/data-plugin/public';
 
 type ErrorCause = Required<IEsError>['attributes'];
 
diff --git a/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx b/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx
index db8cd2aeabf6b..edccc071a57d1 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx
@@ -6,12 +6,12 @@
  */
 
 import type { PaletteDefinition } from '@kbn/coloring';
-import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/expressions/public';
-import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
-import { expressionsPluginMock } from '../../../../../src/plugins/expressions/public/mocks';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EditorFrameSetupPlugins, EditorFrameStartPlugins } from './service';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
 
 export function createMockPaletteDefinition(): jest.Mocked<PaletteDefinition> {
   return {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/service.tsx b/x-pack/plugins/lens/public/editor_frame_service/service.tsx
index ff05f7e5f0bb9..3eb0b14ae49fb 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/service.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/service.tsx
@@ -6,14 +6,15 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'kibana/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/expressions/public';
-import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
-import {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../../src/plugins/data/public';
+import { CoreStart } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { Document } from '../persistence/saved_object_store';
 import {
   Datasource,
   Visualization,
@@ -21,10 +22,6 @@ import {
   EditorFrameInstance,
   EditorFrameStart,
 } from '../types';
-import { Document } from '../persistence/saved_object_store';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
-import { DashboardStart } from '../../../../../src/plugins/dashboard/public';
 
 export interface EditorFrameSetupPlugins {
   data: DataPublicPluginSetup;
diff --git a/x-pack/plugins/lens/public/editor_frame_service/types.ts b/x-pack/plugins/lens/public/editor_frame_service/types.ts
index 9435faf374420..2d50e96ec280e 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/types.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 
 export type TableInspectorAdapter = Record<string, Datatable>;
 
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx
index f37b0dfe4ad1e..7423d30331414 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx
@@ -14,24 +14,24 @@ import {
   LensSavedObjectAttributes,
   LensUnwrapResult,
 } from './embeddable';
-import { ReactExpressionRendererProps } from 'src/plugins/expressions/public';
-import { spacesPluginMock } from '../../../spaces/public/mocks';
+import { ReactExpressionRendererProps } from '@kbn/expressions-plugin/public';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { Filter } from '@kbn/es-query';
-import { Query, TimeRange, FilterManager } from 'src/plugins/data/public';
-import type { DataViewsContract } from 'src/plugins/data_views/public';
+import { Query, TimeRange, FilterManager } from '@kbn/data-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { Document } from '../persistence';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public/embeddable';
-import { coreMock, httpServiceMock, themeServiceMock } from '../../../../../src/core/public/mocks';
-import { IBasePath } from '../../../../../src/core/public';
-import { AttributeService, ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public/embeddable';
+import { coreMock, httpServiceMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { IBasePath } from '@kbn/core/public';
+import { AttributeService, ViewMode } from '@kbn/embeddable-plugin/public';
 import { LensAttributeService } from '../lens_attribute_service';
-import { OnSaveProps } from '../../../../../src/plugins/saved_objects/public/save_modal';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public/save_modal';
 import { act } from 'react-dom/test-utils';
-import { inspectorPluginMock } from '../../../../../src/plugins/inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { Visualization } from '../types';
 
-jest.mock('../../../../../src/plugins/inspector/public/', () => ({
+jest.mock('@kbn/inspector-plugin/public', () => ({
   isAvailable: false,
   open: false,
 }));
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
index 9c4e04a0c5795..fe26e635542aa 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
@@ -17,22 +17,22 @@ import {
   TimefilterContract,
   TimeRange,
   FilterManager,
-} from 'src/plugins/data/public';
-import type { Start as InspectorStart } from 'src/plugins/inspector/public';
+} from '@kbn/data-plugin/public';
+import type { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 
 import { Subscription } from 'rxjs';
 import { toExpression, Ast } from '@kbn/interpreter';
-import { RenderMode } from 'src/plugins/expressions';
+import { RenderMode } from '@kbn/expressions-plugin';
 import { map, distinctUntilChanged, skip } from 'rxjs/operators';
 import fastIsEqual from 'fast-deep-equal';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   ExpressionRendererEvent,
   ReactExpressionRendererType,
-} from '../../../../../src/plugins/expressions/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
+} from '@kbn/expressions-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
 import {
   Embeddable as AbstractEmbeddable,
@@ -41,10 +41,18 @@ import {
   IContainer,
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
+import type {
+  Capabilities,
+  IBasePath,
+  KibanaExecutionContext,
+  ThemeServiceStart,
+} from '@kbn/core/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { Document } from '../persistence';
 import { ExpressionWrapper, ExpressionWrapperProps } from './expression_wrapper';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import {
   isLensBrushEvent,
   isLensFilterEvent,
@@ -59,19 +67,11 @@ import {
   Datasource,
 } from '../types';
 
-import type { DataViewsContract, DataView } from '../../../../../src/plugins/data_views/public';
 import { getEditPath, DOC_TYPE, PLUGIN_ID } from '../../common';
-import type {
-  Capabilities,
-  IBasePath,
-  KibanaExecutionContext,
-  ThemeServiceStart,
-} from '../../../../../src/core/public';
 import { LensAttributeService } from '../lens_attribute_service';
 import type { ErrorMessage, TableInspectorAdapter } from '../editor_frame_service/types';
 import { getLensInspectorService, LensInspector } from '../lens_inspector_service';
 import { SharingSavedObjectProps } from '../types';
-import type { SpacesPluginStart } from '../../../spaces/public';
 import { getActiveDatasourceIdFromDoc, getIndexPatternsObjects, inferTimeField } from '../utils';
 import { getLayerMetaInfo, combineQueryAndFilters } from '../app_plugin/show_underlying_data';
 
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx b/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
index 802e1f2b38213..6797ca674a06b 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { FC, useEffect } from 'react';
-import type { CoreStart, ThemeServiceStart } from 'kibana/public';
-import type { Action, UiActionsStart } from 'src/plugins/ui_actions/public';
-import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import type { CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import type { Action, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 import { EuiLoadingChart } from '@elastic/eui';
 import {
   EmbeddableFactory,
@@ -19,7 +19,7 @@ import {
   EmbeddableStart,
   IEmbeddable,
   useEmbeddableFactory,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import type { LensByReferenceInput, LensByValueInput } from './embeddable';
 import type { Document } from '../persistence';
 import type { IndexPatternPersistedState } from '../indexpattern_datasource/types';
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts b/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts
index 77a4acfa7d433..1e3f6836f1a7b 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts
+++ b/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts
@@ -5,27 +5,24 @@
  * 2.0.
  */
 
-import type { Capabilities, HttpSetup, ThemeServiceStart } from 'kibana/public';
+import type { Capabilities, HttpSetup, ThemeServiceStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { Ast } from '@kbn/interpreter';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { FilterManager, TimefilterContract } from '../../../../../src/plugins/data/public';
-import type { DataViewsContract } from '../../../../../src/plugins/data_views/public';
-import { ReactExpressionRendererType } from '../../../../../src/plugins/expressions/public';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../src/plugins/embeddable/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { FilterManager, TimefilterContract } from '@kbn/data-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { LensByReferenceInput, LensEmbeddableInput } from './embeddable';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
 import { Document } from '../persistence/saved_object_store';
 import { LensAttributeService } from '../lens_attribute_service';
 import { DOC_TYPE } from '../../common/constants';
 import { ErrorMessage } from '../editor_frame_service/types';
 import { extract, inject } from '../../common/embeddable_factory';
-import type { SpacesPluginStart } from '../../../spaces/public';
 import { DatasourceMap, VisualizationMap } from '../types';
 
 export interface LensEmbeddableStartServices {
diff --git a/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx b/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx
index b93f2a3280ebc..c2b9d1d2dbb31 100644
--- a/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx
+++ b/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx
@@ -13,10 +13,10 @@ import {
   ExpressionRendererEvent,
   ReactExpressionRendererType,
   ReactExpressionRendererProps,
-} from 'src/plugins/expressions/public';
-import type { KibanaExecutionContext } from 'src/core/public';
-import { ExecutionContextSearch } from 'src/plugins/data/public';
-import { DefaultInspectorAdapters, RenderMode } from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { ExecutionContextSearch } from '@kbn/data-plugin/public';
+import { DefaultInspectorAdapters, RenderMode } from '@kbn/expressions-plugin';
 import classNames from 'classnames';
 import { getOriginalRequestErrorMessages } from '../editor_frame_service/error_helper';
 import { ErrorMessage } from '../editor_frame_service/types';
diff --git a/x-pack/plugins/lens/public/expressions.ts b/x-pack/plugins/lens/public/expressions.ts
index 40fee07f5d95a..ba8c07078a208 100644
--- a/x-pack/plugins/lens/public/expressions.ts
+++ b/x-pack/plugins/lens/public/expressions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ExpressionsSetup } from 'src/plugins/expressions/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { getDatatable } from '../common/expressions/datatable/datatable';
 import { datatableColumn } from '../common/expressions/datatable/datatable_column';
 import { mergeTables } from '../common/expressions/merge_tables';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/constants.ts b/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
index 449261dbc69fe..270d45ce3cec5 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HeatmapIcon } from '../../../../../src/plugins/chart_expressions/expression_heatmap/public';
+import { HeatmapIcon } from '@kbn/expression-heatmap-plugin/public';
 
 export const LENS_HEATMAP_RENDERER = 'lens_heatmap_renderer';
 
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx b/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx
index 489f181d72761..ae7f01a7cebd3 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { CustomizablePalette, FIXED_PROGRESSION, PaletteRegistry } from '@kbn/coloring';
 import type { VisualizationDimensionEditorProps } from '../types';
-import { PalettePanelContainer } from '../shared_components/';
+import { PalettePanelContainer } from '../shared_components';
 import './dimension_editor.scss';
 import type { HeatmapVisualizationState } from './types';
 import { getSafePaletteParams } from './utils';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/index.ts b/x-pack/plugins/lens/public/heatmap_visualization/index.ts
index fbf8f5e0510ac..e6bebd087c5b3 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/index.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 
 export interface HeatmapVisualizationPluginSetupPlugins {
   editorFrame: EditorFrameSetup;
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
index ae8f9c32d4358..cb6e6e030eaac 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
@@ -50,9 +50,9 @@ export const HeatmapToolbar = memo(
       frame.datasourceLayers
     ).truncateText;
     return (
-      <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
-        <EuiFlexItem>
-          <EuiFlexGroup gutterSize="none" responsive={false}>
+      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
             <ToolbarPopover
               title={i18n.translate('xpack.lens.shared.curveLabel', {
                 defaultMessage: 'Visual options',
@@ -71,6 +71,7 @@ export const HeatmapToolbar = memo(
                 }}
               />
             </ToolbarPopover>
+
             <LegendSettingsPopover
               groupPosition={'right'}
               legendOptions={legendOptions}
@@ -124,8 +125,9 @@ export const HeatmapToolbar = memo(
             />
           </EuiFlexGroup>
         </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFlexGroup gutterSize="none" responsive={false}>
+
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
             <TooltipWrapper
               tooltipContent={i18n.translate('xpack.lens.heatmap.verticalAxisDisabledHelpText', {
                 defaultMessage: 'This setting only applies when vertical axis is enabled.',
@@ -161,6 +163,7 @@ export const HeatmapToolbar = memo(
                 />
               </ToolbarPopover>
             </TooltipWrapper>
+
             <TooltipWrapper
               tooltipContent={i18n.translate('xpack.lens.heatmap.horizontalAxisDisabledHelpText', {
                 defaultMessage: 'This setting only applies when horizontal axis is enabled.',
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/types.ts b/x-pack/plugins/lens/public/heatmap_visualization/types.ts
index 68ef18939e0e6..1b92dca12ac25 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/types.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
-import type { HeatmapArguments } from '../../../../../src/plugins/chart_expressions/expression_heatmap/common';
+import type { HeatmapArguments } from '@kbn/expression-heatmap-plugin/common';
 import type { LayerType } from '../../common';
 export type ChartShapes = 'heatmap';
 
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/utils.ts b/x-pack/plugins/lens/public/heatmap_visualization/utils.ts
index e94fcac18e7af..92030fd7b1369 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/utils.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { applyPaletteParams, findMinMaxByColumnId } from '../shared_components';
 import { DEFAULT_PALETTE_NAME } from './constants';
 import type { HeatmapVisualizationState, Palette } from './types';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
index f181167cd8d9c..afec1743d47f5 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
@@ -20,10 +20,10 @@ import {
 } from './constants';
 import { Position } from '@elastic/charts';
 import type { HeatmapVisualizationState } from './types';
-import type { DatasourcePublicAPI, OperationDescriptor } from '../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import type { DatasourceLayers, OperationDescriptor } from '../types';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { layerTypes } from '../../common';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 function exampleState(): HeatmapVisualizationState {
   return {
@@ -355,7 +355,7 @@ describe('heatmap', () => {
   });
 
   describe('#toExpression', () => {
-    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+    let datasourceLayers: DatasourceLayers;
 
     beforeEach(() => {
       const mockDatasource = createMockDatasource('testDatasource');
@@ -476,7 +476,7 @@ describe('heatmap', () => {
   });
 
   describe('#toPreviewExpression', () => {
-    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+    let datasourceLayers: DatasourceLayers;
 
     beforeEach(() => {
       const mockDatasource = createMockDatasource('testDatasource');
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
index 08256c75db22c..23b484f4cfd13 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
@@ -12,9 +12,9 @@ import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { Ast } from '@kbn/interpreter';
 import { Position } from '@elastic/charts';
 import { CUSTOM_PALETTE, PaletteRegistry, CustomPaletteParams } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { HeatmapIcon } from '../../../../../src/plugins/chart_expressions/expression_heatmap/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { HeatmapIcon } from '@kbn/expression-heatmap-plugin/public';
 import type { OperationMetadata, Visualization } from '../types';
 import type { HeatmapVisualizationState } from './types';
 import { getSuggestions } from './suggestions';
diff --git a/x-pack/plugins/lens/public/help_menu_util.tsx b/x-pack/plugins/lens/public/help_menu_util.tsx
index 38b81b514defc..82f5247fcc6d3 100644
--- a/x-pack/plugins/lens/public/help_menu_util.tsx
+++ b/x-pack/plugins/lens/public/help_menu_util.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { ChromeStart, DocLinksStart } from '@kbn/core/public';
 
 export function addHelpMenuToAppChrome(chrome: ChromeStart, docLinks: DocLinksStart) {
   chrome.setHelpExtension({
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
index 4cdbe464bd302..942df72957fc7 100644
--- a/x-pack/plugins/lens/public/index.ts
+++ b/x-pack/plugins/lens/public/index.ts
@@ -103,7 +103,7 @@ export type {
   LabelsOrientationConfigResult,
   ReferenceLineLayerConfigResult,
   AxisTitlesVisibilityConfigResult,
-} from '../../../../src/plugins/chart_expressions/expression_xy/common';
+} from '@kbn/expression-xy-plugin/common';
 export type { LensEmbeddableInput } from './embeddable';
 export { layerTypes } from '../common';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
index d5fabb9d7ef80..1baad07b2198c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { EuiPopover, EuiPopoverTitle, EuiSelectable, EuiSelectableProps } from '@elastic/eui';
+import { ToolbarButton, ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternRef } from './types';
 import { trackUiEvent } from '../lens_ui_telemetry';
-import { ToolbarButton, ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
 
 export type ChangeIndexPatternTriggerProps = ToolbarButtonProps & {
   label: string;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
index 93000db126e65..512ef627c9116 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
@@ -9,24 +9,24 @@ import React from 'react';
 import { waitFor } from '@testing-library/react';
 import ReactDOM from 'react-dom';
 import { createMockedDragDropContext } from './mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../src/plugins/data_views/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { InnerIndexPatternDataPanel, IndexPatternDataPanel, MemoizedDataPanel } from './datapanel';
 import { FieldList } from './field_list';
 import { FieldItem } from './field_item';
 import { NoFieldsCallout } from './no_fields_callout';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { IndexPatternPrivateState } from './types';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import { ChangeIndexPattern } from './change_indexpattern';
 import { EuiProgress, EuiLoadingSpinner } from '@elastic/eui';
 import { documentField } from './document_field';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { indexPatternFieldEditorPluginMock } from '../../../../../src/plugins/data_view_field_editor/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
 import { getFieldByNameFactory } from './pure_helpers';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 import { TermsIndexPatternColumn } from './operations';
 import { DOCUMENT_FIELD_NAME } from '../../common';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
index 70aacb2978955..ab437b9328e7e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
@@ -25,11 +25,16 @@ import {
 import { i18n } from '@kbn/i18n';
 import type { EsQueryConfig, Query, Filter } from '@kbn/es-query';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { CoreStart } from 'kibana/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { htmlIdGenerator } from '@elastic/eui';
 import { buildEsQuery } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { DatasourceDataPanelProps, DataType, StateSetter } from '../types';
 import { ChildDragDropProvider, DragContextState } from '../drag_drop';
 import type {
@@ -42,10 +47,6 @@ import { trackUiEvent } from '../lens_ui_telemetry';
 import { loadIndexPatterns, syncExistingFields } from './loader';
 import { fieldExists } from './pure_helpers';
 import { Loader } from '../loader';
-import { getEsQueryConfig } from '../../../../../src/plugins/data/public';
-import { IndexPatternFieldEditorStart } from '../../../../../src/plugins/data_view_field_editor/public';
-import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../../src/plugins/ui_actions/public';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
 
 export type Props = Omit<DatasourceDataPanelProps<IndexPatternPrivateState>, 'core'> & {
   data: DataPublicPluginStart;
@@ -62,7 +63,6 @@ export type Props = Omit<DatasourceDataPanelProps<IndexPatternPrivateState>, 'co
 };
 import { LensFieldIcon } from './lens_field_icon';
 import { ChangeIndexPattern } from './change_indexpattern';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import { FieldGroups, FieldList } from './field_list';
 
 function sortFields(fieldA: IndexPatternField, fieldB: IndexPatternField) {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
index a9e37e2d53d70..2c03ad902ce81 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -93,6 +93,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
     savedObjectsClient: props.savedObjectsClient,
     http: props.http,
     storage: props.storage,
+    unifiedSearch: props.unifiedSearch,
   };
   const { fieldByOperation, operationWithoutField } = operationSupportMatrix;
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
index 356ad5ac9543e..3ab3633725678 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -16,14 +16,20 @@ import {
   EuiSelect,
   EuiButtonIcon,
 } from '@elastic/eui';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   IndexPatternDimensionEditorComponent,
   IndexPatternDimensionEditorProps,
 } from './dimension_panel';
 import { mountWithIntl as mount, shallowWithIntl as shallow } from '@kbn/test-jest-helpers';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreSetup,
+} from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { generateId } from '../../id_generator';
 import { IndexPatternPrivateState } from '../types';
 import {
@@ -203,6 +209,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
       uiSettings: {} as IUiSettingsClient,
       savedObjectsClient: {} as SavedObjectsClientContract,
       http: {} as HttpSetup,
+      unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       data: {
         fieldFormats: {
           getType: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
index 84e84c3a79a9a..4f20db3004e8b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
@@ -6,10 +6,11 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { DatasourceDimensionTriggerProps, DatasourceDimensionEditorProps } from '../../types';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
 import { GenericIndexPatternColumn } from '../indexpattern';
 import { isColumnInvalid } from '../utils';
 import { IndexPatternPrivateState } from '../types';
@@ -31,6 +32,7 @@ export type IndexPatternDimensionEditorProps =
     layerId: string;
     http: HttpSetup;
     data: DataPublicPluginStart;
+    unifiedSearch: UnifiedSearchPublicPluginStart;
     uniqueLabel: string;
     dateRange: DateRange;
   };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts
index 778b589d283e1..412f8211844b2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts
@@ -5,12 +5,18 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { IndexPatternDimensionEditorProps } from '../dimension_panel';
 import { onDrop } from './on_drop_handler';
 import { getDropProps } from './get_drop_props';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreSetup,
+} from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { IndexPatternLayer, IndexPatternPrivateState } from '../../types';
 import { documentField } from '../../document_field';
 import { OperationMetadata, DropType } from '../../../types';
@@ -317,6 +323,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
           }),
         } as unknown as DataPublicPluginStart['fieldFormats'],
       } as unknown as DataPublicPluginStart,
+      unifiedSearch: {} as UnifiedSearchPublicPluginStart,
       core: {} as CoreSetup,
       dimensionGroups: [],
       isFullscreen: false,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx
index ffa2dd7b7d2f1..d026df5fff4f2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx
@@ -18,7 +18,7 @@ import {
   EuiPopoverProps,
   EuiIconTip,
 } from '@elastic/eui';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import { GenericIndexPatternColumn, operationDefinitionMap } from '../operations';
 import { validateQuery } from '../operations/definitions/filters';
 import { QueryInput } from '../query_input';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
index 5131a1224341e..804cbde3d170f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
@@ -10,9 +10,10 @@ import { ReactWrapper, ShallowWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiComboBox } from '@elastic/eui';
 import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { OperationMetadata } from '../../types';
 import { createMockedIndexPattern, createMockedIndexPatternWithoutType } from '../mocks';
 import { ReferenceEditor, ReferenceEditorProps } from './reference_editor';
@@ -54,6 +55,7 @@ describe('reference editor', () => {
       savedObjectsClient: {} as SavedObjectsClientContract,
       http: {} as HttpSetup,
       data: {} as DataPublicPluginStart,
+      unifiedSearch: {} as UnifiedSearchPublicPluginStart,
       dimensionGroups: [],
       isFullscreen: false,
       toggleFullscreen: jest.fn(),
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx
index a59229ad093b6..3c16d271401ad 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx
@@ -15,9 +15,10 @@ import {
   EuiComboBox,
   EuiComboBoxOptionOption,
 } from '@elastic/eui';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { DateRange } from '../../../common';
 import type { OperationSupportMatrix } from './operation_support';
 import type { OperationType } from '../indexpattern';
@@ -65,6 +66,7 @@ export interface ReferenceEditorProps {
   savedObjectsClient: SavedObjectsClientContract;
   http: HttpSetup;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   paramEditorCustomProps?: ParamEditorCustomProps;
 }
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
index b7563f28aac5c..5199227fe83f5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
@@ -10,8 +10,8 @@ import { EuiFormRow, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useRef, useState } from 'react';
-import { Query } from 'src/plugins/data/public';
-import { parseTimeShift } from '../../../../../../src/plugins/data/common';
+import { Query } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import {
   adjustTimeScaleLabelSuffix,
   GenericIndexPatternColumn,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
index c20f1c37c6c67..625eed9cf5604 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
@@ -10,14 +10,14 @@ import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiLoadingSpinner, EuiPopover } from '@elastic/eui';
 import { InnerFieldItem, FieldItemProps } from './field_item';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { IndexPattern } from './types';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { documentField } from './document_field';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
-import { FieldFormatsStart } from '../../../../../src/plugins/field_formats/public';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DOCUMENT_FIELD_NAME } from '../../common';
 
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
index d657a22ca8d26..318441daa045d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
@@ -37,23 +37,18 @@ import {
 } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import { FieldButton } from '@kbn/react-field';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { EuiHighlight } from '@elastic/eui';
 import { Filter, buildEsQuery } from '@kbn/es-query';
-import {
-  Query,
-  KBN_FIELD_TYPES,
-  ES_FIELD_TYPES,
-  getEsQueryConfig,
-} from '../../../../../src/plugins/data/public';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import { Query, KBN_FIELD_TYPES, ES_FIELD_TYPES, getEsQueryConfig } from '@kbn/data-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { DragDrop, DragDropIdentifier } from '../drag_drop';
 import { DatasourceDataPanelProps, DataType } from '../types';
 import { BucketedAggregation, FieldStatsResponse } from '../../common';
 import { IndexPattern, IndexPatternField, DraggedField } from './types';
 import { LensFieldIcon } from './lens_field_icon';
 import { trackUiEvent } from '../lens_ui_telemetry';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import { VisualizeGeoFieldButton } from './visualize_geo_field_button';
 import { getVisualizeGeoFieldMessage } from '../utils';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx
index 13d5d25bc2ea2..efaaf86217f06 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx
@@ -9,12 +9,12 @@ import './field_list.scss';
 import { throttle } from 'lodash';
 import React, { useState, Fragment, useCallback, useMemo, useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { FieldItem } from './field_item';
 import { NoFieldsCallout } from './no_fields_callout';
 import { IndexPatternField } from './types';
 import { FieldItemSharedProps, FieldsAccordion } from './fields_accordion';
 import { DatasourceDataPanelProps } from '../types';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 const PAGINATION_SIZE = 50;
 
 export type FieldGroups = Record<
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
index b886cc5539d40..cc79941d2cdfe 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
@@ -7,14 +7,14 @@
 
 import React from 'react';
 import { EuiLoadingSpinner, EuiNotificationBadge } from '@elastic/eui';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { IndexPattern } from './types';
 import { FieldItem } from './field_item';
 import { FieldsAccordion, FieldsAccordionProps, FieldItemSharedProps } from './fields_accordion';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 
 describe('Fields Accordion', () => {
   let defaultProps: FieldsAccordionProps;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
index d2c5801908f6f..509106f683984 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
@@ -17,15 +17,15 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 import classNames from 'classnames';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { Filter } from '@kbn/es-query';
+import { Query } from '@kbn/data-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { IndexPatternField } from './types';
 import { FieldItem } from './field_item';
-import { Query } from '../../../../../src/plugins/data/public';
 import { DatasourceDataPanelProps } from '../types';
 import { IndexPattern } from './types';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 
 export interface FieldItemSharedProps {
   core: DatasourceDataPanelProps['core'];
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
index b95bc1be0ed58..41f2a4df9bcda 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
@@ -5,22 +5,17 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import { createStartServicesGetter, Storage } from '../../../../../src/plugins/kibana_utils/public';
-import type { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
-import type { IndexPatternFieldEditorStart } from '../../../../../src/plugins/data_view_field_editor/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
+import type { CoreSetup } from '@kbn/core/public';
+import { createStartServicesGetter, Storage } from '@kbn/kibana-utils-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { FieldFormatsStart, FieldFormatsSetup } from '@kbn/field-formats-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import type {
-  FieldFormatsStart,
-  FieldFormatsSetup,
-} from '../../../../../src/plugins/field_formats/public';
 
 export type { PersistedIndexPatternLayer, IndexPattern, FormulaPublicApi } from './types';
 
@@ -34,6 +29,7 @@ export interface IndexPatternDatasourceSetupPlugins {
 
 export interface IndexPatternDatasourceStartPlugins {
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   fieldFormats: FieldFormatsStart;
   dataViewFieldEditor: IndexPatternFieldEditorStart;
   dataViews: DataViewsPublicPluginStart;
@@ -64,14 +60,17 @@ export class IndexPatternDatasource {
         fieldFormatsSetup.register([suffixFormatter]);
       }
 
-      const [coreStart, { dataViewFieldEditor, uiActions, data, fieldFormats, dataViews }] =
-        await core.getStartServices();
+      const [
+        coreStart,
+        { dataViewFieldEditor, uiActions, data, fieldFormats, dataViews, unifiedSearch },
+      ] = await core.getStartServices();
 
       return getIndexPatternDatasource({
         core: coreStart,
         fieldFormats,
         storage: new Storage(localStorage),
         data,
+        unifiedSearch,
         dataViews,
         charts,
         dataViewFieldEditor,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
index 8dc3125dea57d..db10c420b90de 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -5,16 +5,23 @@
  * 2.0.
  */
 
-import React from 'react';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { getIndexPatternDatasource, GenericIndexPatternColumn } from './indexpattern';
-import { DatasourcePublicAPI, Datasource, FramePublicAPI, OperationDescriptor } from '../types';
-import { coreMock } from 'src/core/public/mocks';
+import React, { ReactElement } from 'react';
+import { SavedObjectReference } from '@kbn/core/public';
+import { isFragment } from 'react-is';
+import { coreMock } from '@kbn/core/public/mocks';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { IndexPatternPersistedState, IndexPatternPrivateState } from './types';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../src/plugins/data_views/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { Ast } from '@kbn/interpreter';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { TinymathAST } from '@kbn/tinymath';
+import { getIndexPatternDatasource, GenericIndexPatternColumn } from './indexpattern';
+import { DatasourcePublicAPI, Datasource, FramePublicAPI, OperationDescriptor } from '../types';
 import { getFieldByNameFactory } from './pure_helpers';
 import {
   operationDefinitionMap,
@@ -28,12 +35,8 @@ import {
   FiltersIndexPatternColumn,
 } from './operations';
 import { createMockedFullReference } from './operations/mocks';
-import { indexPatternFieldEditorPluginMock } from 'src/plugins/data_view_field_editor/public/mocks';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { TinymathAST } from '@kbn/tinymath';
-import { SavedObjectReference } from 'kibana/public';
 import { cloneDeep } from 'lodash';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 
 jest.mock('./loader');
 jest.mock('../id_generator');
@@ -184,6 +187,7 @@ describe('IndexPattern Data Source', () => {
 
   beforeEach(() => {
     indexPatternDatasource = getIndexPatternDatasource({
+      unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       storage: {} as IStorageWrapper,
       core: coreMock.createStart(),
       data: dataPluginMock.createStartContract(),
@@ -2246,6 +2250,21 @@ describe('IndexPattern Data Source', () => {
     let framePublicAPI: FramePublicAPI;
 
     beforeEach(() => {
+      const termsColumn: TermsIndexPatternColumn = {
+        operationType: 'terms',
+        dataType: 'number',
+        isBucketed: true,
+        label: '123211',
+        sourceField: 'foo',
+        params: {
+          size: 10,
+          orderBy: {
+            type: 'alphabetical',
+          },
+          orderDirection: 'asc',
+        },
+      };
+
       state = {
         indexPatternRefs: [],
         existingFields: {},
@@ -2305,6 +2324,7 @@ describe('IndexPattern Data Source', () => {
                 isBucketed: false,
                 sourceField: 'records',
               },
+              termsCol: termsColumn,
             },
           },
         },
@@ -2331,16 +2351,34 @@ describe('IndexPattern Data Source', () => {
                   },
                 },
               },
+              {
+                id: 'termsCol',
+                name: 'termsCol',
+                meta: {
+                  type: 'string',
+                  source: 'esaggs',
+                  sourceParams: {
+                    type: 'terms',
+                  },
+                },
+              } as DatatableColumn,
             ],
           },
         },
       } as unknown as FramePublicAPI;
     });
 
+    const extractTranslationIdsFromWarnings = (warnings: React.ReactNode[] | undefined) =>
+      warnings?.map((item) =>
+        isFragment(item)
+          ? (item as ReactElement).props.children[0].props.id
+          : (item as ReactElement).props.id
+      );
+
     it('should return mismatched time shifts', () => {
       const warnings = indexPatternDatasource.getWarningMessages!(state, framePublicAPI, () => {});
 
-      expect(warnings!.map((item) => (item as React.ReactElement).props.id)).toMatchInlineSnapshot(`
+      expect(extractTranslationIdsFromWarnings(warnings)).toMatchInlineSnapshot(`
         Array [
           "xpack.lens.indexPattern.timeShiftSmallWarning",
           "xpack.lens.indexPattern.timeShiftMultipleWarning",
@@ -2349,15 +2387,15 @@ describe('IndexPattern Data Source', () => {
     });
 
     it('should show different types of warning messages', () => {
-      framePublicAPI.activeData!.first.columns[0].meta.sourceParams!.hasPrecisionError = true;
+      framePublicAPI.activeData!.first.columns[1].meta.sourceParams!.hasPrecisionError = true;
 
       const warnings = indexPatternDatasource.getWarningMessages!(state, framePublicAPI, () => {});
 
-      expect(warnings!.map((item) => (item as React.ReactElement).props.id)).toMatchInlineSnapshot(`
+      expect(extractTranslationIdsFromWarnings(warnings)).toMatchInlineSnapshot(`
         Array [
           "xpack.lens.indexPattern.timeShiftSmallWarning",
           "xpack.lens.indexPattern.timeShiftMultipleWarning",
-          "xpack.lens.indexPattern.precisionErrorWarning",
+          "xpack.lens.indexPattern.precisionErrorWarning.accuracyDisabled",
         ]
       `);
     });
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
index 1911fe764a086..b72519c2191be 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -8,13 +8,19 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { CoreStart, SavedObjectReference } from 'kibana/public';
+import type { CoreStart, SavedObjectReference } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { isEqual } from 'lodash';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
-import type { IndexPatternFieldEditorStart } from '../../../../../src/plugins/data_view_field_editor/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { DataPublicPluginStart, ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type {
   DatasourceDimensionEditorProps,
   DatasourceDimensionTriggerProps,
@@ -64,17 +70,9 @@ import {
   IndexPatternPersistedState,
   IndexPattern,
 } from './types';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
-import { DataPublicPluginStart, ES_FIELD_TYPES } from '../../../../../src/plugins/data/public';
-import { VisualizeFieldContext } from '../../../../../src/plugins/ui_actions/public';
 import { mergeLayer } from './state_helpers';
 import { Datasource, StateSetter, VisualizeEditorContext } from '../types';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import { deleteColumn, isReferenced } from './operations';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import { GeoFieldWorkspacePanel } from '../editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel';
 import { DraggingIdentifier } from '../drag_drop';
 import { getStateTimeShiftWarningMessages } from './time_shift_utils';
@@ -118,6 +116,7 @@ export function getIndexPatternDatasource({
   core,
   storage,
   data,
+  unifiedSearch,
   dataViews,
   fieldFormats,
   charts,
@@ -127,6 +126,7 @@ export function getIndexPatternDatasource({
   core: CoreStart;
   storage: IStorageWrapper;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   dataViews: DataViewsPublicPluginStart;
   fieldFormats: FieldFormatsStart;
   charts: ChartsPluginSetup;
@@ -373,6 +373,7 @@ export function getIndexPatternDatasource({
                 savedObjectsClient={core.savedObjects.client}
                 http={core.http}
                 data={data}
+                unifiedSearch={unifiedSearch}
                 uniqueLabel={columnLabelMap[props.columnId]}
                 {...props}
               />
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index cca739c949d4f..2101172a1bf0c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { VisualizeEditorLayersContext } from '../../../../../src/plugins/visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import { DatasourceSuggestion } from '../types';
 import { generateId } from '../id_generator';
 import type { IndexPatternPrivateState } from './types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
index 8b1c2a3b799e8..720c917dcbc53 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -7,7 +7,7 @@
 
 import { flatten, minBy, pick, mapValues, partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import type { VisualizeEditorLayersContext } from '../../../../../src/plugins/visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import { generateId } from '../id_generator';
 import type { DatasourceSuggestion, TableChangeType } from '../types';
 import { columnToOperation } from './indexpattern';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
index 15391aaf95c80..2a2b2a1ecebc4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { last } from 'lodash';
 import {
   loadInitialState,
@@ -16,8 +16,8 @@ import {
   extractReferences,
   injectReferences,
 } from './loader';
-import { DataViewsContract } from '../../../../../src/plugins/data_views/public';
-import { HttpFetchError } from '../../../../../src/core/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   IndexPatternPersistedState,
   IndexPatternPrivateState,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
index a8ad1885b3350..5ccfc1ebefc15 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
@@ -6,8 +6,11 @@
  */
 
 import { uniq, mapValues, difference } from 'lodash';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { HttpSetup, SavedObjectReference } from 'kibana/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { HttpSetup, SavedObjectReference } from '@kbn/core/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
+import { isNestedField } from '@kbn/data-views-plugin/common';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import type {
   DatasourceDataPanelProps,
   InitializationOptions,
@@ -25,9 +28,6 @@ import {
 import { updateLayerIndexPattern, translateToOperationName } from './operations';
 import { DateRange, ExistingFields } from '../../common/types';
 import { BASE_API_URL } from '../../common';
-import type { DataViewsContract, DataView } from '../../../../../src/plugins/data_views/public';
-import { isNestedField } from '../../../../../src/plugins/data_views/common';
-import { VisualizeFieldContext } from '../../../../../src/plugins/ui_actions/public';
 import { documentField } from './document_field';
 import { readFromStorage, writeToStorage } from '../settings_storage';
 import { getFieldByNameFactory } from './pure_helpers';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts
index 5277e09189b0d..178a98074ad8a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts
@@ -12,7 +12,7 @@ import {
   overallMaxOperation,
   overallMinOperation,
   overallSumOperation,
-} from '../index';
+} from '..';
 
 describe('overall_metric', () => {
   const indexPattern = createMockedIndexPattern();
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx
index eabff6f3e7f4b..b8f6aa433c5f7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx
@@ -9,9 +9,9 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { EuiSwitch } from '@elastic/eui';
 import { euiThemeVars } from '@kbn/ui-theme';
-import { AggFunctionsMapping } from '../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition, ParamEditorProps } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition, ParamEditorProps } from '.';
 import { FieldBasedIndexPatternColumn, ValueFormatConfig } from './column_types';
 
 import {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
index 029f2b7bed7de..21ba19d5fb047 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import type { Operation } from '../../../types';
 import type { TimeScaleUnit } from '../../../../common/expressions';
-import type { OperationType } from '../definitions';
+import type { OperationType } from '.';
 
 export interface BaseIndexPatternColumn extends Operation {
   // Private
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx
index 0643e6b2ca365..437ee4bf8b22d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx
@@ -9,9 +9,9 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { EuiSwitch } from '@elastic/eui';
-import { AggFunctionsMapping } from '../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition, ParamEditorProps } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition, ParamEditorProps } from '.';
 import { FieldBasedIndexPatternColumn, ValueFormatConfig } from './column_types';
 import { IndexPatternField } from '../../types';
 import {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
index 886ea04048a58..d4491fbba00cf 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
@@ -7,21 +7,20 @@
 
 import React from 'react';
 import type { DateHistogramIndexPatternColumn } from './date_histogram';
-import { dateHistogramOperation } from './index';
+import { dateHistogramOperation } from '.';
 import { shallow } from 'enzyme';
 import { EuiSwitch } from '@elastic/eui';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
-import {
-  dataPluginMock,
-  getCalculateAutoTimeExpression,
-} from '../../../../../../../src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { dataPluginMock, getCalculateAutoTimeExpression } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
 import type { IndexPatternLayer, IndexPattern } from '../../types';
 import { getFieldByNameFactory } from '../../pure_helpers';
 
 const dataStart = dataPluginMock.createStartContract();
+const unifiedSearchStart = unifiedSearchPluginMock.createStartContract();
 dataStart.search.aggs.calculateAutoTimeExpression = getCalculateAutoTimeExpression(
   (path: string) => {
     if (path === UI_SETTINGS.HISTOGRAM_MAX_BARS) {
@@ -96,6 +95,7 @@ const defaultOptions = {
     toDate: 'now',
   },
   data: dataStart,
+  unifiedSearch: unifiedSearchStart,
   http: {} as HttpSetup,
   indexPattern: indexPattern1,
   operationDefinitionMap: {},
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
index f5bc98cb00900..f96e584326340 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
@@ -23,18 +23,18 @@ import {
   EuiSwitchEvent,
   EuiTextColor,
 } from '@elastic/eui';
-import { updateColumnParam } from '../layer_helpers';
-import { OperationDefinition, ParamEditorProps } from './index';
-import { FieldBasedIndexPatternColumn } from './column_types';
 import {
   AggFunctionsMapping,
   DataPublicPluginStart,
   IndexPatternAggRestrictions,
   search,
   UI_SETTINGS,
-} from '../../../../../../../src/plugins/data/public';
-import { extendedBoundsToAst } from '../../../../../../../src/plugins/data/common';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
+} from '@kbn/data-plugin/public';
+import { extendedBoundsToAst } from '@kbn/data-plugin/common';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { updateColumnParam } from '../layer_helpers';
+import { OperationDefinition, ParamEditorProps } from '.';
+import { FieldBasedIndexPatternColumn } from './column_types';
 import { getInvalidFieldMessage, getSafeName } from './helpers';
 import { HelpPopover, HelpPopoverButton } from '../../help_popover';
 import { IndexPatternLayer } from '../../types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
index 109a3a4c80249..0fc67aca36747 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
@@ -13,14 +13,14 @@ import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
 import { LabelInput } from '../shared_components';
 import { QueryInput } from '../../../query_input';
-import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 
 jest.mock('.', () => ({
   isQueryValid: () => true,
   defaultLabel: 'label',
 }));
 
-jest.mock('../../../../../../../../src/plugins/unified_search/public', () => ({
+jest.mock('@kbn/unified-search-plugin/public', () => ({
   QueryStringInput: () => {
     return 'QueryStringInput';
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
index b0e0c6c1dfa41..46d69a550adfa 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
@@ -9,9 +9,9 @@ import './filter_popover.scss';
 
 import React from 'react';
 import { EuiPopover, EuiSpacer } from '@elastic/eui';
+import { Query } from '@kbn/data-plugin/public';
 import { FilterValue, defaultLabel, isQueryValid } from '.';
 import { IndexPattern } from '../../../types';
-import { Query } from '../../../../../../../../src/plugins/data/public';
 import { LabelInput } from '../shared_components';
 import { QueryInput } from '../../../query_input';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
index 7be85ddc997f2..7208965ec080c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
@@ -8,11 +8,12 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import type { FiltersIndexPatternColumn } from '.';
-import { filtersOperation } from '../index';
+import { filtersOperation } from '..';
 import type { IndexPatternLayer } from '../../../types';
 import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
@@ -25,6 +26,7 @@ const defaultProps = {
   savedObjectsClient: {} as SavedObjectsClientContract,
   dateRange: { fromDate: 'now-1d', toDate: 'now' },
   data: dataPluginMock.createStartContract(),
+  unifiedSearch: unifiedSearchPluginMock.createStartContract(),
   http: {} as HttpSetup,
   indexPattern: createMockedIndexPattern(),
   operationDefinitionMap: {},
@@ -288,7 +290,7 @@ describe('filters', () => {
   describe('popover param editor', () => {
     // @ts-expect-error
     window['__react-beautiful-dnd-disable-dev-warnings'] = true; // issue with enzyme & react-beautiful-dnd throwing errors: https://github.com/atlassian/react-beautiful-dnd/issues/1593
-    jest.mock('../../../../../../../../src/plugins/unified_search/public', () => ({
+    jest.mock('@kbn/unified-search-plugin/public', () => ({
       QueryStringInput: () => {
         return 'QueryStringInput';
       },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
index 8df49e03da4d0..8b5f8e0c3dcc7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
@@ -11,14 +11,14 @@ import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@k
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiLink, htmlIdGenerator } from '@elastic/eui';
+import type { AggFunctionsMapping, Query } from '@kbn/data-plugin/public';
+import { queryFilterToAst } from '@kbn/data-plugin/common';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { updateColumnParam } from '../../layer_helpers';
-import type { OperationDefinition } from '../index';
+import type { OperationDefinition } from '..';
 import type { BaseIndexPatternColumn } from '../column_types';
 import { FilterPopover } from './filter_popover';
 import type { IndexPattern } from '../../../types';
-import type { AggFunctionsMapping, Query } from '../../../../../../../../src/plugins/data/public';
-import { queryFilterToAst } from '../../../../../../../../src/plugins/data/common';
-import { buildExpressionFunction } from '../../../../../../../../src/plugins/expressions/public';
 import { NewBucketButton, DragDropBuckets, DraggableBucketContainer } from '../shared_components';
 
 const generateId = htmlIdGenerator();
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
index 62a681ac3d604..ecc46babcfe71 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
@@ -22,10 +22,10 @@ import {
 import useUnmount from 'react-use/lib/useUnmount';
 import { monaco } from '@kbn/monaco';
 import classNames from 'classnames';
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
-import type { CodeEditorProps } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import type { CodeEditorProps } from '@kbn/kibana-react-plugin/public';
 import { TooltipWrapper, useDebounceWithOptions } from '../../../../../shared_components';
-import { ParamEditorProps } from '../../index';
+import { ParamEditorProps } from '../..';
 import { getManagedColumnsFrom } from '../../../layer_helpers';
 import { ErrorWrapper, runASTValidation, tryToParse } from '../validation';
 import {
@@ -89,7 +89,7 @@ export function FormulaEditor({
   columnId,
   indexPattern,
   operationDefinitionMap,
-  data,
+  unifiedSearch,
   toggleFullscreen,
   isFullscreen,
   setIsCloseable,
@@ -416,7 +416,7 @@ export function FormulaEditor({
             context,
             indexPattern,
             operationDefinitionMap: visibleOperationsMap,
-            data,
+            unifiedSearch,
             dateHistogramInterval: baseIntervalRef.current,
           });
         }
@@ -427,7 +427,7 @@ export function FormulaEditor({
           context,
           indexPattern,
           operationDefinitionMap: visibleOperationsMap,
-          data,
+          unifiedSearch,
           dateHistogramInterval: baseIntervalRef.current,
         });
       }
@@ -444,7 +444,7 @@ export function FormulaEditor({
         ),
       };
     },
-    [indexPattern, visibleOperationsMap, data, baseIntervalRef]
+    [indexPattern, visibleOperationsMap, unifiedSearch, baseIntervalRef]
   );
 
   const provideSignatureHelp = useCallback(
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
index 203774c6b1561..3059318bd562d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
@@ -20,7 +20,7 @@ import {
   EuiHighlight,
   EuiSpacer,
 } from '@elastic/eui';
-import { Markdown } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { IndexPattern } from '../../../../types';
 import { tinymathFunctions } from '../util';
 import { getPossibleFunctions } from './math_completion';
@@ -31,7 +31,7 @@ import type {
   GenericIndexPatternColumn,
   OperationDefinition,
   ParamEditorProps,
-} from '../../index';
+} from '../..';
 import type { FormulaIndexPatternColumn } from '../formula';
 
 function FormulaHelp({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
index 612ae892146fc..0039f486933b9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
@@ -7,11 +7,11 @@
 
 import { parse } from '@kbn/tinymath';
 import { monaco } from '@kbn/monaco';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../../../mocks';
-import { GenericOperationDefinition } from '../../index';
+import { GenericOperationDefinition } from '../..';
 import type { IndexPatternField } from '../../../../types';
 import type { OperationMetadata } from '../../../../../types';
-import { dataPluginMock } from '../../../../../../../../../src/plugins/data/public/mocks';
 import { tinymathFunctions } from '../util';
 import {
   getSignatureHelp,
@@ -217,7 +217,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toHaveLength(4 + Object.keys(tinymathFunctions).length);
       ['sum', 'moving_average', 'cumulative_sum', 'last_value'].forEach((key) => {
@@ -238,7 +238,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toHaveLength(2);
       ['sum', 'last_value'].forEach((key) => {
@@ -256,7 +256,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toEqual(['window']);
     });
@@ -271,7 +271,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toEqual([]);
     });
@@ -286,7 +286,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toHaveLength(4 + Object.keys(tinymathFunctions).length);
       ['sum', 'moving_average', 'cumulative_sum', 'last_value'].forEach((key) => {
@@ -307,7 +307,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toHaveLength(4 + Object.keys(tinymathFunctions).length);
       ['sum', 'moving_average', 'cumulative_sum', 'last_value'].forEach((key) => {
@@ -328,7 +328,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toHaveLength(0);
     });
@@ -343,7 +343,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toEqual(['bytes', 'memory']);
     });
@@ -358,7 +358,7 @@ describe('math completion', () => {
         },
         indexPattern: createMockedIndexPattern(),
         operationDefinitionMap,
-        data: dataPluginMock.createStartContract(),
+        unifiedSearch: unifiedSearchPluginMock.createStartContract(),
       });
       expect(results.list).toEqual(['bytes', 'memory']);
     });
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
index ece41a95130bf..a1b629be9c134 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
@@ -17,9 +17,10 @@ import {
   TinymathNamedArgument,
 } from '@kbn/tinymath';
 import type {
-  DataPublicPluginStart,
+  UnifiedSearchPublicPluginStart,
   QuerySuggestion,
-} from '../../../../../../../../../src/plugins/data/public';
+} from '@kbn/unified-search-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import { IndexPattern } from '../../../../types';
 import { memoizedGetAvailableOperationsByMetadata } from '../../../operations';
 import { tinymathFunctions, groupArgsByType, unquotedStringRegex } from '../util';
@@ -27,7 +28,6 @@ import type { GenericOperationDefinition } from '../..';
 import { getFunctionSignatureLabel, getHelpTextContent } from './formula_help';
 import { hasFunctionFieldArgument } from '../validation';
 import { timeShiftOptions, timeShiftOptionOrder } from '../../../../time_shift_utils';
-import { parseTimeShift } from '../../../../../../../../../src/plugins/data/common';
 
 export enum SUGGESTION_TYPE {
   FIELD = 'field',
@@ -120,7 +120,7 @@ export async function suggest({
   context,
   indexPattern,
   operationDefinitionMap,
-  data,
+  unifiedSearch,
   dateHistogramInterval,
 }: {
   expression: string;
@@ -128,7 +128,7 @@ export async function suggest({
   context: monaco.languages.CompletionContext;
   indexPattern: IndexPattern;
   operationDefinitionMap: Record<string, GenericOperationDefinition>;
-  data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   dateHistogramInterval?: number;
 }): Promise<LensMathSuggestions> {
   const text =
@@ -148,7 +148,7 @@ export async function suggest({
     if (tokenInfo?.parent && (context.triggerCharacter === '=' || isNamedArgument)) {
       return await getNamedArgumentSuggestions({
         ast: tokenAst as TinymathNamedArgument,
-        data,
+        unifiedSearch,
         indexPattern,
         dateHistogramInterval,
       });
@@ -331,13 +331,13 @@ function getArgumentSuggestions(
 
 export async function getNamedArgumentSuggestions({
   ast,
-  data,
+  unifiedSearch,
   indexPattern,
   dateHistogramInterval,
 }: {
   ast: TinymathNamedArgument;
   indexPattern: IndexPattern;
-  data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   dateHistogramInterval?: number;
 }) {
   if (ast.name === 'shift') {
@@ -359,14 +359,14 @@ export async function getNamedArgumentSuggestions({
   if (ast.name !== 'kql' && ast.name !== 'lucene') {
     return { list: [], type: SUGGESTION_TYPE.KQL };
   }
-  if (!data.autocomplete.hasQuerySuggestions(ast.name === 'kql' ? 'kuery' : 'lucene')) {
+  if (!unifiedSearch.autocomplete.hasQuerySuggestions(ast.name === 'kql' ? 'kuery' : 'lucene')) {
     return { list: [], type: SUGGESTION_TYPE.KQL };
   }
 
   const query = ast.value.split(MARKER)[0];
   const position = ast.value.indexOf(MARKER) + 1;
 
-  const suggestions = await data.autocomplete.getQuerySuggestions({
+  const suggestions = await unifiedSearch.autocomplete.getQuerySuggestions({
     language: ast.name === 'kql' ? 'kuery' : 'lucene',
     query,
     selectionStart: position,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
index 51e7d363ac39d..f4b17bded5f07 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { createMockedIndexPattern } from '../../../mocks';
-import { formulaOperation, GenericOperationDefinition, GenericIndexPatternColumn } from '../index';
+import { formulaOperation, GenericOperationDefinition, GenericIndexPatternColumn } from '..';
 import { FormulaIndexPatternColumn } from './formula';
 import { insertOrReplaceFormulaColumn } from './parse';
 import type { IndexPattern, IndexPatternField, IndexPatternLayer } from '../../../types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
index 1f0fbceff3d5b..1d08873a160e9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { BaseIndexPatternColumn, OperationDefinition } from '../index';
+import type { BaseIndexPatternColumn, OperationDefinition } from '..';
 import type { ReferenceBasedIndexPatternColumn } from '../column_types';
 import type { IndexPattern } from '../../../types';
 import { runASTValidation, tryToParse } from './validation';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts
index 640915ed96ed7..d1ee2023e1d1c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts
@@ -9,7 +9,7 @@ import { convertDataViewIntoLensIndexPattern } from '../../../loader';
 import { insertOrReplaceFormulaColumn } from './parse';
 import { createFormulaPublicApi, FormulaPublicApi } from './formula_public_api';
 
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DateHistogramIndexPatternColumn, PersistedIndexPatternLayer } from '../../../types';
 
 jest.mock('./parse', () => ({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts
index 63255ad2bf9dc..8069bf66053d0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { IndexPattern, PersistedIndexPatternLayer } from '../../../types';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
 
 import { insertOrReplaceFormulaColumn } from './parse';
 import { convertDataViewIntoLensIndexPattern } from '../../../loader';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
index a36f24ef7d048..42f211cad2eb5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
@@ -10,7 +10,7 @@ import {
   FieldBasedIndexPatternColumn,
   GenericOperationDefinition,
   GenericIndexPatternColumn,
-} from '../index';
+} from '..';
 import { BaseIndexPatternColumn, ReferenceBasedIndexPatternColumn } from '../column_types';
 import { IndexPatternLayer } from '../../../types';
 import { unquotedStringRegex } from './util';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx
index 4797ac348c71f..10e319404c9bb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx
@@ -6,7 +6,7 @@
  */
 
 import type { TinymathAST } from '@kbn/tinymath';
-import { OperationDefinition } from '../index';
+import { OperationDefinition } from '..';
 import { ValueFormatConfig, ReferenceBasedIndexPatternColumn } from '../column_types';
 import { IndexPattern } from '../../../types';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
index 81a6943e600d0..371c7e268388b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
@@ -13,7 +13,7 @@ import {
   GenericOperationDefinition,
   GenericIndexPatternColumn,
   operationDefinitionMap,
-} from '../index';
+} from '..';
 import type { IndexPattern, IndexPatternLayer } from '../../../types';
 import { mathOperation } from './math';
 import { documentField } from '../../../document_field';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
index 9e313d43972d6..75d72190cab3d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
@@ -13,12 +13,12 @@ import type {
   TinymathNamedArgument,
   TinymathVariable,
 } from '@kbn/tinymath';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import type {
   OperationDefinition,
   GenericIndexPatternColumn,
   GenericOperationDefinition,
-} from '../index';
+} from '..';
 import type { GroupedNodes } from './types';
 
 export const unquotedStringRegex = /[^0-9A-Za-z._@\[\]/]/;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
index c7743619b43bb..742072ffe5c73 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
@@ -10,7 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { parse, TinymathLocation, TinymathVariable } from '@kbn/tinymath';
 import type { TinymathAST, TinymathFunction, TinymathNamedArgument } from '@kbn/tinymath';
 import { luceneStringToDsl, toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import {
   findMathNodes,
   findVariables,
@@ -25,10 +26,9 @@ import type {
   OperationDefinition,
   GenericIndexPatternColumn,
   GenericOperationDefinition,
-} from '../index';
+} from '..';
 import type { IndexPattern, IndexPatternLayer } from '../../../types';
 import type { TinymathNodeTypes } from './types';
-import { parseTimeShift } from '../../../../../../../../src/plugins/data/common';
 
 interface ValidationErrors {
   missingField: { message: string; type: { variablesLength: number; variablesList: string } };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
index 5e7a79dc3a127..e62bab6bd808b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
@@ -5,8 +5,16 @@
  * 2.0.
  */
 
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreStart } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreStart,
+} from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { ExpressionAstFunction } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { termsOperation } from './terms';
 import { filtersOperation } from './filters';
 import { cardinalityOperation } from './cardinality';
@@ -43,8 +51,6 @@ import type {
 } from './column_types';
 import { IndexPattern, IndexPatternField, IndexPatternLayer } from '../../types';
 import { DateRange, LayerType } from '../../../../common';
-import { ExpressionAstFunction } from '../../../../../../../src/plugins/expressions/public';
-import { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
 import { rangeOperation } from './ranges';
 import { IndexPatternDimensionEditorProps, OperationSupportMatrix } from '../../dimension_panel';
 
@@ -158,6 +164,7 @@ export interface ParamEditorProps<C> {
   http: HttpSetup;
   dateRange: DateRange;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   activeData?: IndexPatternDimensionEditorProps['activeData'];
   operationDefinitionMap: Record<string, GenericOperationDefinition>;
   paramEditorCustomProps?: ParamEditorCustomProps;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx
index 8e5773ad6868e..5e3f1f0043664 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx
@@ -8,12 +8,13 @@
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { EuiComboBox, EuiFormRow } from '@elastic/eui';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
 import { LastValueIndexPatternColumn } from './last_value';
-import { lastValueOperation } from './index';
+import { lastValueOperation } from '.';
 import type { IndexPattern, IndexPatternLayer } from '../../types';
 import { TermsIndexPatternColumn } from './terms';
 import { EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
@@ -25,6 +26,7 @@ const defaultProps = {
   uiSettings: uiSettingsMock,
   savedObjectsClient: {} as SavedObjectsClientContract,
   dateRange: { fromDate: 'now-1d', toDate: 'now' },
+  unifiedSearch: unifiedSearchPluginMock.createStartContract(),
   data: dataPluginMock.createStartContract(),
   http: {} as HttpSetup,
   indexPattern: {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx
index b8fe5a1584d35..40b4d53154ba7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx
@@ -15,9 +15,9 @@ import {
   EuiSwitch,
   EuiToolTip,
 } from '@elastic/eui';
-import { AggFunctionsMapping } from '../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition } from '.';
 import { FieldBasedIndexPatternColumn, ValueFormatConfig } from './column_types';
 import { IndexPatternField, IndexPattern } from '../../types';
 import { adjustColumnReferencesForChangedColumn, updateColumnParam } from '../layer_helpers';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
index 438902962fbcf..55df2b8e0ff1a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
@@ -9,8 +9,8 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { EuiSwitch } from '@elastic/eui';
 import { euiThemeVars } from '@kbn/ui-theme';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition, ParamEditorProps } from './index';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition, ParamEditorProps } from '.';
 import {
   getFormatFromPreviousColumn,
   getInvalidFieldMessage,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx
index f5e21c5d8aeeb..831bb03c89abd 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx
@@ -6,17 +6,18 @@
  */
 
 import React, { ChangeEvent } from 'react';
+import { act } from 'react-dom/test-utils';
+import { EuiRange } from '@elastic/eui';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { EuiFormRow } from '@elastic/eui';
 import { shallow, mount } from 'enzyme';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
-import { percentileOperation } from './index';
+import { percentileOperation } from '.';
 import { IndexPattern, IndexPatternLayer } from '../../types';
 import { PercentileIndexPatternColumn } from './percentile';
-import { EuiRange } from '@elastic/eui';
-import { act } from 'react-dom/test-utils';
-import { EuiFormRow } from '@elastic/eui';
 import { TermsIndexPatternColumn } from './terms';
 
 jest.mock('lodash', () => {
@@ -36,6 +37,7 @@ const defaultProps = {
   savedObjectsClient: {} as SavedObjectsClientContract,
   dateRange: { fromDate: 'now-1d', toDate: 'now' },
   data: dataPluginMock.createStartContract(),
+  unifiedSearch: unifiedSearchPluginMock.createStartContract(),
   http: {} as HttpSetup,
   indexPattern: {
     ...createMockedIndexPattern(),
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx
index 73536ae4893a6..0699ad5f88405 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx
@@ -8,9 +8,9 @@
 import { EuiFormRow, EuiRange, EuiRangeProps } from '@elastic/eui';
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
-import { AggFunctionsMapping } from 'src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition } from '.';
 import {
   getFormatFromPreviousColumn,
   getInvalidFieldMessage,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
index 7591a5d545c3c..f0611f5ec194e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
@@ -22,8 +22,8 @@ import {
   htmlIdGenerator,
   keys,
 } from '@elastic/eui';
+import { IFieldFormat } from '@kbn/field-formats-plugin/common';
 import { useDebounceWithOptions } from '../../../../shared_components';
-import { IFieldFormat } from '../../../../../../../../src/plugins/field_formats/common';
 import { RangeTypeLens, isValidRange } from './ranges';
 import { FROM_PLACEHOLDER, TO_PLACEHOLDER, TYPING_DEBOUNCE_TIME } from './constants';
 import {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx
index 2f0802a4827f0..e7cf46e1e3e81 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx
@@ -20,8 +20,8 @@ import {
   EuiSwitch,
   EuiSpacer,
 } from '@elastic/eui';
-import type { IFieldFormat } from 'src/plugins/field_formats/common';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { RangeColumnParams, UpdateParamsFnType, MODES_TYPES } from './ranges';
 import { AdvancedRangeEditor } from './advanced_editor';
 import { TYPING_DEBOUNCE_TIME, MODES, MIN_HISTOGRAM_BARS } from './constants';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
index 77d849ac7af17..5f882a3ec2112 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
@@ -9,11 +9,12 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiFieldNumber, EuiRange, EuiButtonEmpty, EuiLink, EuiText } from '@elastic/eui';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 import type { IndexPatternLayer, IndexPattern } from '../../../types';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { rangeOperation } from '../index';
+import { rangeOperation } from '..';
 import { RangeIndexPatternColumn } from './ranges';
 import {
   MODES,
@@ -51,6 +52,7 @@ jest.mock('lodash', () => {
 });
 
 const dataPluginMockValue = dataPluginMock.createStartContract();
+const unifiedSearchPluginMockValue = unifiedSearchPluginMock.createStartContract();
 // need to overwrite the formatter field first
 dataPluginMockValue.fieldFormats.deserialize = jest.fn().mockImplementation(({ id, params }) => {
   return {
@@ -84,6 +86,7 @@ const defaultOptions = {
     toDate: 'now',
   },
   data: dataPluginMockValue,
+  unifiedSearch: unifiedSearchPluginMockValue,
   http: {} as HttpSetup,
   indexPattern: {
     id: '1',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
index 36505120d75df..11754e1f90005 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
@@ -8,17 +8,11 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { AggFunctionsMapping, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
-import {
-  extendedBoundsToAst,
-  numericalRangeToAst,
-} from '../../../../../../../../src/plugins/data/common';
-import {
-  buildExpressionFunction,
-  Range,
-} from '../../../../../../../../src/plugins/expressions/public';
+import { AggFunctionsMapping, UI_SETTINGS } from '@kbn/data-plugin/public';
+import { extendedBoundsToAst, numericalRangeToAst } from '@kbn/data-plugin/common';
+import { buildExpressionFunction, Range } from '@kbn/expressions-plugin/public';
 import { RangeEditor } from './range_editor';
-import { OperationDefinition } from '../index';
+import { OperationDefinition } from '..';
 import { FieldBasedIndexPatternColumn } from '../column_types';
 import { updateColumnParam } from '../../layer_helpers';
 import { supportedFormats } from '../../../../../common/expressions/format_column/supported_formats';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx
index 4339fa3e7ae51..101eca3ab1785 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiIcon } from '@elastic/eui';
-import { DragDropBuckets, DraggableBucketContainer } from '../shared_components';
+import { DragDropBuckets, DraggableBucketContainer } from '.';
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx
index 6d9a39887b940..60a871efd85cf 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx
@@ -6,16 +6,17 @@
  */
 
 import React from 'react';
+import { act } from 'react-dom/test-utils';
+import { EuiFieldNumber } from '@elastic/eui';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { shallow, mount } from 'enzyme';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
-import { staticValueOperation } from './index';
+import { staticValueOperation } from '.';
 import { IndexPattern, IndexPatternLayer } from '../../types';
 import { StaticValueIndexPatternColumn } from './static_value';
-import { EuiFieldNumber } from '@elastic/eui';
-import { act } from 'react-dom/test-utils';
 import { TermsIndexPatternColumn } from './terms';
 
 jest.mock('lodash', () => {
@@ -35,6 +36,7 @@ const defaultProps = {
   savedObjectsClient: {} as SavedObjectsClientContract,
   dateRange: { fromDate: 'now-1d', toDate: 'now' },
   data: dataPluginMock.createStartContract(),
+  unifiedSearch: unifiedSearchPluginMock.createStartContract(),
   http: {} as HttpSetup,
   indexPattern: {
     ...createMockedIndexPattern(),
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx
index 39122808c9c0b..555360a2f7f6c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx
@@ -7,7 +7,7 @@
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormLabel, EuiSpacer } from '@elastic/eui';
-import { OperationDefinition } from './index';
+import { OperationDefinition } from '.';
 import {
   ReferenceBasedIndexPatternColumn,
   GenericIndexPatternColumn,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts
index 9f907c5584802..438af2bfc7ab2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import type { FrameDatasourceAPI } from '../../../../types';
-import type { CountIndexPatternColumn } from '../index';
+import type { CountIndexPatternColumn } from '..';
 import type { TermsIndexPatternColumn } from './types';
 import type { GenericIndexPatternColumn } from '../../../indexpattern';
 import { createMockedIndexPattern } from '../../../mocks';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts
index 95fffca1212b3..3f4bd781e8ff8 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts
@@ -7,16 +7,16 @@
 
 import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import { buildEsQuery } from '@kbn/es-query';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/public';
-import { GenericIndexPatternColumn, operationDefinitionMap } from '../index';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { GenericIndexPatternColumn, operationDefinitionMap } from '..';
 import { defaultLabel } from '../filters';
 import { isReferenced } from '../../layer_helpers';
 
 import type { FieldStatsResponse } from '../../../../../common';
 import type { FrameDatasourceAPI } from '../../../../types';
-import type { FiltersIndexPatternColumn } from '../index';
+import type { FiltersIndexPatternColumn } from '..';
 import type { TermsIndexPatternColumn } from './types';
 import { LastValueIndexPatternColumn } from '../last_value';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
index c881bc898e8ad..2021f6132c7f9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
@@ -19,11 +19,11 @@ import {
   EuiButtonGroup,
 } from '@elastic/eui';
 import { uniq } from 'lodash';
-import { AggFunctionsMapping } from '../../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../../src/plugins/expressions/public';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { insertOrReplaceColumn, updateColumnParam, updateDefaultLabels } from '../../layer_helpers';
 import type { DataType } from '../../../../types';
-import { OperationDefinition } from '../index';
+import { OperationDefinition } from '..';
 import { FieldBasedIndexPatternColumn } from '../column_types';
 import { ValuesInput } from './values_input';
 import { getInvalidFieldMessage } from '../helpers';
@@ -235,6 +235,14 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
         max_doc_count: column.params.orderBy.maxDocCount,
       }).toAst();
     }
+
+    // To get more accurate results, we set shard_size to a minimum of 1000
+    // The other calculation matches the current Elasticsearch shard_size default,
+    // but they may diverge in the future
+    const shardSize = column.params.accuracyMode
+      ? Math.max(1000, column.params.size * 1.5 + 10)
+      : undefined;
+
     if (column.params?.secondaryFields?.length) {
       return buildExpressionFunction<AggFunctionsMapping['aggMultiTerms']>('aggMultiTerms', {
         id: columnId,
@@ -247,6 +255,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
             : String(orderedColumnIds.indexOf(column.params.orderBy.columnId)),
         order: column.params.orderDirection,
         size: column.params.size,
+        shardSize,
         otherBucket: Boolean(column.params.otherBucket),
         otherBucketLabel: i18n.translate('xpack.lens.indexPattern.terms.otherLabel', {
           defaultMessage: 'Other',
@@ -264,6 +273,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
           : String(orderedColumnIds.indexOf(column.params.orderBy.columnId)),
       order: column.params.orderDirection,
       size: column.params.size,
+      shardSize,
       otherBucket: Boolean(column.params.otherBucket),
       otherBucketLabel: i18n.translate('xpack.lens.indexPattern.terms.otherLabel', {
         defaultMessage: 'Other',
@@ -625,6 +635,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
                 }),
                 indexPattern
               );
+
               updateLayer(
                 updateColumnParam({
                   layer: updatedLayer,
@@ -747,6 +758,44 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
                   )
                 }
               />
+              <EuiSpacer size="m" />
+              <EuiSwitch
+                label={
+                  <>
+                    {i18n.translate('xpack.lens.indexPattern.terms.accuracyModeDescription', {
+                      defaultMessage: 'Enable accuracy mode',
+                    })}{' '}
+                    <EuiIconTip
+                      color="subdued"
+                      content={i18n.translate('xpack.lens.indexPattern.terms.accuracyModeHelp', {
+                        defaultMessage: `Improves results for high-cardinality data, but increases the load on the Elasticsearch cluster.`,
+                      })}
+                      iconProps={{
+                        className: 'eui-alignTop',
+                      }}
+                      position="top"
+                      size="s"
+                      type="questionInCircle"
+                    />
+                  </>
+                }
+                compressed
+                disabled={currentColumn.params.orderBy.type === 'rare'}
+                data-test-subj="indexPattern-accuracy-mode"
+                checked={Boolean(
+                  currentColumn.params.accuracyMode && currentColumn.params.orderBy.type !== 'rare'
+                )}
+                onChange={(e: EuiSwitchEvent) =>
+                  updateLayer(
+                    updateColumnParam({
+                      layer,
+                      columnId,
+                      paramName: 'accuracyMode',
+                      value: e.target.checked,
+                    })
+                  )
+                }
+              />
             </EuiAccordion>
           </>
         )}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
index a72250c2265c4..8cfeb1b68e5b9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
@@ -14,13 +14,14 @@ import type {
   SavedObjectsClientContract,
   HttpSetup,
   CoreStart,
-} from 'kibana/public';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
+} from '@kbn/core/public';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../../mocks';
 import { ValuesInput } from './values_input';
 import type { TermsIndexPatternColumn } from '.';
-import { GenericOperationDefinition, termsOperation, LastValueIndexPatternColumn } from '../index';
+import { GenericOperationDefinition, termsOperation, LastValueIndexPatternColumn } from '..';
 import { IndexPattern, IndexPatternLayer, IndexPatternPrivateState } from '../../../types';
 import { FrameDatasourceAPI } from '../../../../types';
 import { DateHistogramIndexPatternColumn } from '../date_histogram';
@@ -58,6 +59,7 @@ const defaultProps = {
   savedObjectsClient: {} as SavedObjectsClientContract,
   dateRange: { fromDate: 'now-1d', toDate: 'now' },
   data: dataPluginMock.createStartContract(),
+  unifiedSearch: unifiedSearchPluginMock.createStartContract(),
   http: {} as HttpSetup,
   indexPattern: createMockedIndexPattern(),
   // need to provide the terms operation as some helpers use operation specific features
@@ -146,6 +148,61 @@ describe('terms', () => {
       );
     });
 
+    it('should add shard size if accuracy mode enabled', () => {
+      const termsColumn = layer.columns.col1 as TermsIndexPatternColumn;
+      const getEsAggsFnArgs = (accuracyMode: boolean, size: number, multiTerms: boolean) =>
+        termsOperation.toEsAggsFn(
+          {
+            ...termsColumn,
+            params: {
+              ...termsColumn.params,
+              accuracyMode,
+              size,
+              secondaryFields: multiTerms ? ['secondary_field'] : [],
+            },
+          },
+          'col1',
+          {} as IndexPattern,
+          layer,
+          uiSettingsMock,
+          []
+        ).arguments;
+
+      const smallSize = 5;
+      const bigSize = 900;
+
+      // terms agg
+      expect(getEsAggsFnArgs(true, smallSize, false).shardSize?.[0]).toEqual(1000);
+      expect(getEsAggsFnArgs(true, bigSize, false).shardSize?.[0]).toEqual(1360);
+      expect(getEsAggsFnArgs(false, smallSize, false).shardSize).not.toBeDefined();
+
+      // multi-terms agg
+      expect(getEsAggsFnArgs(true, smallSize, true).shardSize?.[0]).toEqual(1000);
+      expect(getEsAggsFnArgs(true, bigSize, true).shardSize?.[0]).toEqual(1360);
+      expect(getEsAggsFnArgs(false, smallSize, true).shardSize).not.toBeDefined();
+    });
+
+    it('should never add shard size if using rare terms', () => {
+      const termsColumn = layer.columns.col1 as TermsIndexPatternColumn;
+      const args = termsOperation.toEsAggsFn(
+        {
+          ...termsColumn,
+          params: {
+            ...termsColumn.params,
+            accuracyMode: true,
+            orderBy: { type: 'rare', maxDocCount: 1 },
+          },
+        },
+        'col1',
+        {} as IndexPattern,
+        layer,
+        uiSettingsMock,
+        []
+      ).arguments;
+
+      expect(args.shardSize).not.toBeDefined();
+    });
+
     it('should reflect rare terms params correctly', () => {
       const termsColumn = layer.columns.col1 as TermsIndexPatternColumn;
       const esAggsFn = termsOperation.toEsAggsFn(
@@ -1822,6 +1879,55 @@ describe('terms', () => {
       expect(select2.prop('disabled')).toEqual(true);
     });
 
+    describe('accuracy mode', () => {
+      const renderWithAccuracy = (accuracy: boolean, rareTerms: boolean) =>
+        shallow(
+          <InlineOptions
+            {...defaultProps}
+            layer={layer}
+            updateLayer={() => {}}
+            columnId="col1"
+            currentColumn={
+              {
+                ...layer.columns.col1,
+                params: {
+                  ...(layer.columns.col1 as TermsIndexPatternColumn).params,
+                  accuracyMode: accuracy,
+                  orderBy: rareTerms ? { type: 'rare', maxDocCount: 3 } : { type: 'alphabetical' },
+                },
+              } as TermsIndexPatternColumn
+            }
+          />
+        );
+
+      const getSwitchComponent = (accuracy: boolean, rareTerms: boolean) =>
+        renderWithAccuracy(accuracy, rareTerms)
+          .find('[data-test-subj="indexPattern-accuracy-mode"]')
+          .find(EuiSwitch);
+
+      it('should be checked when enabled and not rare terms', () => {
+        const switchComponent = getSwitchComponent(true, false);
+        expect(switchComponent.prop('checked')).toEqual(true);
+        expect(switchComponent.prop('disabled')).toEqual(false);
+      });
+
+      it('should NOT be checked when NOT enabled and not rare terms', () => {
+        const switchComponent = getSwitchComponent(false, false);
+        expect(switchComponent.prop('checked')).toEqual(false);
+        expect(switchComponent.prop('disabled')).toEqual(false);
+      });
+
+      it('should always be unchecked and disabled when rare terms', () => {
+        const switchWithAccuracyEnabled = getSwitchComponent(true, true);
+        expect(switchWithAccuracyEnabled.prop('disabled')).toEqual(true);
+        expect(switchWithAccuracyEnabled.prop('checked')).toEqual(false);
+
+        const switchWithAccuracyDisabled = getSwitchComponent(false, true);
+        expect(switchWithAccuracyDisabled.prop('disabled')).toEqual(true);
+        expect(switchWithAccuracyDisabled.prop('checked')).toEqual(false);
+      });
+    });
+
     it('should disable size input and show max doc count input', () => {
       const updateLayerSpy = jest.fn();
       const instance = shallow(
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/types.ts
index eb4425987cc31..a292faabec742 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/types.ts
@@ -11,6 +11,8 @@ export interface TermsIndexPatternColumn extends FieldBasedIndexPatternColumn {
   operationType: 'terms';
   params: {
     size: number;
+    // accuracy mode is accomplished by increasing shard_size
+    accuracyMode?: boolean;
     // if order is alphabetical, the `fallback` flag indicates whether it became alphabetical because there wasn't
     // another option or whether the user explicitly chose to make it alphabetical.
     orderBy:
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
index ab9916ad05df1..02eaf87518b11 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
@@ -19,7 +19,7 @@ import {
   isReferenced,
   getReferenceRoot,
 } from './layer_helpers';
-import { operationDefinitionMap, OperationType } from '../operations';
+import { operationDefinitionMap, OperationType } from '.';
 import { TermsIndexPatternColumn } from './definitions/terms';
 import { DateHistogramIndexPatternColumn } from './definitions/date_histogram';
 import { AvgIndexPatternColumn } from './definitions/metrics';
@@ -37,9 +37,9 @@ import {
   OperationDefinition,
 } from './definitions';
 import { TinymathAST } from '@kbn/tinymath';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
-jest.mock('../operations');
+jest.mock('.');
 jest.mock('../../id_generator');
 
 const indexPatternFields = [
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
index 29df2914214ef..d1297fc476772 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
@@ -6,10 +6,10 @@
  */
 
 import { partition, mapValues, pickBy, isArray } from 'lodash';
-import { CoreStart } from 'kibana/public';
-import { Query } from 'src/plugins/data/common';
+import { CoreStart } from '@kbn/core/public';
+import { Query } from '@kbn/data-plugin/common';
 import memoizeOne from 'memoize-one';
-import type { VisualizeEditorLayersContext } from '../../../../../../src/plugins/visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import type {
   DatasourceFixAction,
   FrameDatasourceAPI,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
index 94bb7c50adad7..aff48326fb92e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getOperationTypesForField, getAvailableOperationsByMetadata } from './index';
+import { getOperationTypesForField, getAvailableOperationsByMetadata } from '.';
 import { getFieldByNameFactory } from '../pure_helpers';
 
 jest.mock('../loader');
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
index abb0712cd04d2..850f9d096d232 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
-import { Query } from '../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { useDebouncedValue } from '../shared_components';
 
 export const QueryInput = ({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
index 90353ac087436..9c95a7f6293a4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
@@ -9,15 +9,15 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { uniq } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { Datatable } from '@kbn/expressions-plugin';
+import { search } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import {
   IndexPattern,
   GenericIndexPatternColumn,
   IndexPatternLayer,
   IndexPatternPrivateState,
 } from './types';
-import { Datatable } from '../../../../../src/plugins/expressions';
-import { search } from '../../../../../src/plugins/data/public';
-import { parseTimeShift } from '../../../../../src/plugins/data/common';
 import { FramePublicAPI } from '../types';
 
 export const timeShiftOptions = [
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
index f229407ce23ff..aee1abd34e7cb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
@@ -5,21 +5,21 @@
  * 2.0.
  */
 
-import type { IUiSettingsClient } from 'kibana/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 import { partition } from 'lodash';
 import {
   AggFunctionsMapping,
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../../../src/plugins/data/public';
-import { queryToAst } from '../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/public';
+import { queryToAst } from '@kbn/data-plugin/common';
 import {
   buildExpression,
   buildExpressionFunction,
   ExpressionAstExpression,
   ExpressionAstExpressionBuilder,
   ExpressionAstFunction,
-} from '../../../../../src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
 import { GenericIndexPatternColumn } from './indexpattern';
 import { operationDefinitionMap } from './operations';
 import { IndexPattern, IndexPatternPrivateState, IndexPatternLayer } from './types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
index 5d518b4048ed0..6800a3a3ecb27 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { IncompleteColumn, GenericIndexPatternColumn } from './operations';
-import type { IndexPatternAggRestrictions } from '../../../../../src/plugins/data/public';
-import type { FieldSpec } from '../../../../../src/plugins/data/common';
+import type { IndexPatternAggRestrictions } from '@kbn/data-plugin/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import type { FieldFormatParams } from '@kbn/field-formats-plugin/common';
 import type { DragDropIdentifier } from '../drag_drop/providers';
-import type { FieldFormatParams } from '../../../../../src/plugins/field_formats/common';
+import type { IncompleteColumn, GenericIndexPatternColumn } from './operations';
 
 export type {
   GenericIndexPatternColumn,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx
index ede2a38605d3f..e03631923d461 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx
@@ -10,8 +10,11 @@ import { shallow } from 'enzyme';
 import { getPrecisionErrorWarningMessages } from './utils';
 import type { IndexPatternPrivateState, GenericIndexPatternColumn } from './types';
 import type { FramePublicAPI } from '../types';
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 import { EuiButton } from '@elastic/eui';
+import { TermsIndexPatternColumn } from './operations';
+import { mountWithIntl } from '@kbn/test-jest-helpers';
+import { FormattedMessage } from '@kbn/i18n-react';
 
 describe('indexpattern_datasource utils', () => {
   describe('getPrecisionErrorWarningMessages', () => {
@@ -32,7 +35,7 @@ describe('indexpattern_datasource utils', () => {
                     type: 'alphabetical',
                   },
                 },
-              },
+              } as TermsIndexPatternColumn,
             },
           },
         },
@@ -81,12 +84,57 @@ describe('indexpattern_datasource utils', () => {
       ).toHaveLength(0);
     });
 
-    test('should show precisionError if hasPrecisionError is true', () => {
-      framePublicAPI.activeData!.id.columns[0].meta.sourceParams!.hasPrecisionError = true;
+    describe('precision error warning with accuracy mode', () => {
+      const enableAccuracyButtonSelector =
+        'button[data-test-subj="lnsPrecisionWarningEnableAccuracy"]';
 
-      expect(
-        getPrecisionErrorWarningMessages(state, framePublicAPI, docLinks, () => {})
-      ).toHaveLength(1);
+      test('should show accuracy mode prompt if currently disabled', async () => {
+        framePublicAPI.activeData!.id.columns[0].meta.sourceParams!.hasPrecisionError = true;
+        (state.layers.id.columns.col1 as TermsIndexPatternColumn).params.accuracyMode = false;
+
+        const setStateMock = jest.fn();
+
+        const warningMessages = getPrecisionErrorWarningMessages(
+          state,
+          framePublicAPI,
+          docLinks,
+          setStateMock
+        );
+
+        expect(warningMessages).toHaveLength(1);
+
+        const instance = mountWithIntl(<div>{warningMessages[0]!}</div>);
+
+        const enableAccuracyButton = instance.find(enableAccuracyButtonSelector);
+
+        expect(enableAccuracyButton.exists()).toBeTruthy();
+
+        enableAccuracyButton.simulate('click');
+
+        expect(setStateMock).toHaveBeenCalledTimes(1);
+      });
+
+      test('should other suggestions if accuracy mode already enabled', async () => {
+        framePublicAPI.activeData!.id.columns[0].meta.sourceParams!.hasPrecisionError = true;
+        (state.layers.id.columns.col1 as TermsIndexPatternColumn).params.accuracyMode = true;
+
+        const warningMessages = getPrecisionErrorWarningMessages(
+          state,
+          framePublicAPI,
+          docLinks,
+          () => {}
+        );
+
+        expect(warningMessages).toHaveLength(1);
+
+        const instance = shallow(<div>{warningMessages[0]!}</div>);
+
+        expect(instance.exists(enableAccuracyButtonSelector)).toBeFalsy();
+
+        expect(instance.find(FormattedMessage).props().id).toBe(
+          'xpack.lens.indexPattern.precisionErrorWarning.accuracyEnabled'
+        );
+      });
     });
 
     test('if has precision error and sorting is by count ascending, show fix action and switch to rare terms', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx
index 4062f2b2613fe..b22369dfb2dd2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx
@@ -8,11 +8,12 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 import { EuiLink, EuiTextColor, EuiButton, EuiSpacer } from '@elastic/eui';
 
-import { DatatableColumn } from 'src/plugins/expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { groupBy, escape } from 'lodash';
+import { checkColumnForPrecisionError, Query } from '@kbn/data-plugin/common';
 import type { FramePublicAPI, StateSetter } from '../types';
 import type { IndexPattern, IndexPatternLayer, IndexPatternPrivateState } from './types';
 import type { ReferenceBasedIndexPatternColumn } from './operations/definitions/column_types';
@@ -30,7 +31,6 @@ import {
 
 import { getInvalidFieldMessage, isColumnOfType } from './operations/definitions/helpers';
 import { FiltersIndexPatternColumn, isQueryValid } from './operations/definitions/filters';
-import { checkColumnForPrecisionError, Query } from '../../../../../src/plugins/data/common';
 import { hasField } from './pure_utils';
 import { mergeLayer } from './state_helpers';
 import { supportsRarityRanking } from './operations/definitions/terms';
@@ -92,6 +92,70 @@ export function fieldIsInvalid(
   return !!getInvalidFieldMessage(column, indexPattern)?.length;
 }
 
+const accuracyModeDisabledWarning = (
+  columnName: string,
+  docLink: string,
+  enableAccuracyMode: () => void
+) => (
+  <>
+    <FormattedMessage
+      id="xpack.lens.indexPattern.precisionErrorWarning.accuracyDisabled"
+      defaultMessage="{name} might be an approximation. You can enable accuracy mode for more precise results, but note that it increases the load on the Elasticsearch cluster. {learnMoreLink}"
+      values={{
+        name: <EuiTextColor color="accent">{columnName}</EuiTextColor>,
+        learnMoreLink: (
+          <EuiLink href={docLink} color="text" target="_blank" external={true}>
+            <FormattedMessage
+              defaultMessage="Learn more."
+              id="xpack.lens.indexPattern.precisionErrorWarning.link"
+            />
+          </EuiLink>
+        ),
+      }}
+    />
+    <EuiSpacer size="s" />
+    <EuiButton data-test-subj="lnsPrecisionWarningEnableAccuracy" onClick={enableAccuracyMode}>
+      {i18n.translate('xpack.lens.indexPattern.enableAccuracyMode', {
+        defaultMessage: 'Enable accuracy mode',
+      })}
+    </EuiButton>
+  </>
+);
+
+const accuracyModeEnabledWarning = (columnName: string, docLink: string) => (
+  <FormattedMessage
+    id="xpack.lens.indexPattern.precisionErrorWarning.accuracyEnabled"
+    defaultMessage="{name} might be an approximation. For more precise results, try increasing the number of {topValues} or using {filters} instead. {learnMoreLink}"
+    values={{
+      name: <EuiTextColor color="accent">{columnName}</EuiTextColor>,
+      topValues: (
+        <EuiTextColor color="subdued">
+          <FormattedMessage
+            id="xpack.lens.indexPattern.precisionErrorWarning.topValues"
+            defaultMessage="top values"
+          />
+        </EuiTextColor>
+      ),
+      filters: (
+        <EuiTextColor color="subdued">
+          <FormattedMessage
+            id="xpack.lens.indexPattern.precisionErrorWarning.filters"
+            defaultMessage="filters"
+          />
+        </EuiTextColor>
+      ),
+      learnMoreLink: (
+        <EuiLink href={docLink} color="text" target="_blank" external={true}>
+          <FormattedMessage
+            defaultMessage="Learn more."
+            id="xpack.lens.indexPattern.precisionErrorWarning.link"
+          />
+        </EuiLink>
+      ),
+    }}
+  />
+);
+
 export function getPrecisionErrorWarningMessages(
   state: IndexPatternPrivateState,
   { activeData }: FramePublicAPI,
@@ -114,8 +178,14 @@ export function getPrecisionErrorWarningMessages(
         const currentColumn = currentLayer?.columns[column.id];
         if (currentLayer && currentColumn && checkColumnForPrecisionError(column)) {
           const indexPattern = state.indexPatterns[currentLayer.indexPatternId];
+          // currentColumnIsTerms is mostly a type guard. If there's a precision error,
+          // we already know that we're dealing with a terms-based operation (at least for now).
+          const currentColumnIsTerms = isColumnOfType<TermsIndexPatternColumn>(
+            'terms',
+            currentColumn
+          );
           const isAscendingCountSorting =
-            isColumnOfType<TermsIndexPatternColumn>('terms', currentColumn) &&
+            currentColumnIsTerms &&
             currentColumn.params.orderBy.type === 'column' &&
             currentColumn.params.orderDirection === 'asc' &&
             isColumnOfType<CountIndexPatternColumn>(
@@ -123,49 +193,39 @@ export function getPrecisionErrorWarningMessages(
               currentLayer.columns[currentColumn.params.orderBy.columnId]
             );
           const usesFloatingPointField =
-            isColumnOfType<TermsIndexPatternColumn>('terms', currentColumn) &&
+            currentColumnIsTerms &&
             !supportsRarityRanking(indexPattern.getFieldByName(currentColumn.sourceField));
           const usesMultipleFields =
-            isColumnOfType<TermsIndexPatternColumn>('terms', currentColumn) &&
-            (currentColumn.params.secondaryFields || []).length > 0;
-          if (!isAscendingCountSorting || usesFloatingPointField || usesMultipleFields) {
+            currentColumnIsTerms && (currentColumn.params.secondaryFields || []).length > 0;
+
+          if (
+            currentColumnIsTerms &&
+            (!isAscendingCountSorting || usesFloatingPointField || usesMultipleFields)
+          ) {
             warningMessages.push(
-              <FormattedMessage
-                id="xpack.lens.indexPattern.precisionErrorWarning"
-                defaultMessage="{name} for this visualization may be approximate due to how the data is indexed. Try increasing the number of {topValues} or use {filters} instead of {topValues} for precise results. To learn more about this limit, {link}."
-                values={{
-                  name: <EuiTextColor color="accent">{column.name}</EuiTextColor>,
-                  topValues: (
-                    <EuiTextColor color="subdued">
-                      <FormattedMessage
-                        id="xpack.lens.indexPattern.precisionErrorWarning.topValues"
-                        defaultMessage="Top values"
-                      />
-                    </EuiTextColor>
-                  ),
-                  filters: (
-                    <EuiTextColor color="subdued">
-                      <FormattedMessage
-                        id="xpack.lens.indexPattern.precisionErrorWarning.filters"
-                        defaultMessage="Filters"
-                      />
-                    </EuiTextColor>
-                  ),
-                  link: (
-                    <EuiLink
-                      href={docLinks.links.aggs.terms_doc_count_error}
-                      color="text"
-                      target="_blank"
-                      external={true}
-                    >
-                      <FormattedMessage
-                        defaultMessage="visit the documentation"
-                        id="xpack.lens.indexPattern.precisionErrorWarning.link"
-                      />
-                    </EuiLink>
-                  ),
-                }}
-              />
+              currentColumn.params.accuracyMode
+                ? accuracyModeEnabledWarning(column.name, docLinks.links.aggs.terms_doc_count_error)
+                : accuracyModeDisabledWarning(
+                    column.name,
+                    docLinks.links.aggs.terms_doc_count_error,
+                    () => {
+                      setState((prevState) =>
+                        mergeLayer({
+                          state: prevState,
+                          layerId,
+                          newLayer: updateDefaultLabels(
+                            updateColumnParam({
+                              layer: currentLayer,
+                              columnId: column.id,
+                              paramName: 'accuracyMode',
+                              value: true,
+                            }),
+                            indexPattern
+                          ),
+                        })
+                      );
+                    }
+                  )
             );
           } else {
             warningMessages.push(
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx
index 6a23539f2650f..81e31ab4c64a3 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx
@@ -12,7 +12,7 @@ import {
   visualizeGeoFieldTrigger,
   VISUALIZE_GEO_FIELD_TRIGGER,
   UiActionsStart,
-} from '../../../../../src/plugins/ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
 import { APP_ID } from '../../common/constants';
 
 interface Props {
diff --git a/x-pack/plugins/lens/public/lens_attribute_service.ts b/x-pack/plugins/lens/public/lens_attribute_service.ts
index 93e7a5886ac32..6181fbf22ab26 100644
--- a/x-pack/plugins/lens/public/lens_attribute_service.ts
+++ b/x-pack/plugins/lens/public/lens_attribute_service.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-import type { CoreStart } from '../../../../src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { AttributeService } from '@kbn/embeddable-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import type { LensPluginStartDependencies } from './plugin';
-import type { AttributeService } from '../../../../src/plugins/embeddable/public';
 import type {
   LensSavedObjectAttributes,
   LensByValueInput,
@@ -16,7 +17,6 @@ import type {
   LensByReferenceInput,
 } from './embeddable/embeddable';
 import { SavedObjectIndexStore, checkForDuplicateTitle } from './persistence';
-import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 import { DOC_TYPE } from '../common/constants';
 
 export type LensAttributeService = AttributeService<
diff --git a/x-pack/plugins/lens/public/lens_inspector_service.ts b/x-pack/plugins/lens/public/lens_inspector_service.ts
index 6cac381871d73..4de0a8ec1340f 100644
--- a/x-pack/plugins/lens/public/lens_inspector_service.ts
+++ b/x-pack/plugins/lens/public/lens_inspector_service.ts
@@ -10,9 +10,9 @@ import type {
   InspectorOptions,
   InspectorSession,
   Start as InspectorStartContract,
-} from '../../../../src/plugins/inspector/public';
+} from '@kbn/inspector-plugin/public';
 
-import { createDefaultInspectorAdapters } from '../../../../src/plugins/expressions/public';
+import { createDefaultInspectorAdapters } from '@kbn/expressions-plugin/public';
 
 export const getLensInspectorService = (inspector: InspectorStartContract) => {
   const adapters: Adapters = createDefaultInspectorAdapters();
diff --git a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts
index f332eeeea4c8e..080e2cf5d495f 100644
--- a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts
+++ b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts
@@ -12,9 +12,9 @@ import {
   trackUiEvent,
   trackSuggestionEvent,
 } from './factory';
-import { coreMock } from 'src/core/public/mocks';
-import { HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 jest.useFakeTimers();
 
diff --git a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts
index f010c0b8114b5..bad1bad481e8b 100644
--- a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts
+++ b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts
@@ -6,9 +6,9 @@
  */
 
 import moment from 'moment';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { BASE_API_URL } from '../../common';
 
 const STORAGE_KEY = 'lens-ui-telemetry';
diff --git a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx
index 6165659012281..c83e83aad7b1b 100644
--- a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx
@@ -11,8 +11,8 @@ import { FramePublicAPI, VisualizationDimensionEditorProps } from '../types';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { MetricDimensionEditor } from './dimension_editor';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { ColorMode } from 'src/plugins/charts/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { ColorMode } from '@kbn/charts-plugin/public';
 import {
   CustomizablePalette,
   PaletteOutput,
diff --git a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx
index 161418c000b4c..dfa25c4b62fc7 100644
--- a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx
@@ -21,7 +21,7 @@ import {
 } from '@kbn/coloring';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useState } from 'react';
-import { ColorMode } from '../../../../../src/plugins/charts/common';
+import { ColorMode } from '@kbn/charts-plugin/common';
 import type { MetricState } from '../../common/types';
 import { isNumericFieldForDatatable } from '../../common/expressions';
 import { applyPaletteParams, PalettePanelContainer } from '../shared_components';
diff --git a/x-pack/plugins/lens/public/metric_visualization/index.ts b/x-pack/plugins/lens/public/metric_visualization/index.ts
index c96bb59151c20..8728975916a65 100644
--- a/x-pack/plugins/lens/public/metric_visualization/index.ts
+++ b/x-pack/plugins/lens/public/metric_visualization/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../types';
 
 export interface MetricVisualizationPluginSetupPlugins {
diff --git a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx
index f2b97454df9df..a400e42ac08f5 100644
--- a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx
@@ -15,6 +15,8 @@ export interface TitlePositionProps {
   setState: (newState: MetricState) => void;
 }
 
+export const DEFAULT_TEXT_ALIGNMENT = 'left';
+
 const alignButtonIcons = [
   {
     id: `left`,
@@ -46,7 +48,7 @@ export const AlignOptions: React.FC<TitlePositionProps> = ({ state, setState })
         defaultMessage: 'Align',
       })}
       options={alignButtonIcons}
-      idSelected={state.textAlign ?? 'center'}
+      idSelected={state.textAlign ?? DEFAULT_TEXT_ALIGNMENT}
       onChange={(id) => {
         setState({ ...state, textAlign: id as MetricState['textAlign'] });
       }}
diff --git a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx
index 17142ab77ab35..5a4ca7f644956 100644
--- a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx
@@ -15,6 +15,8 @@ export interface TitlePositionProps {
   setState: (newState: MetricState) => void;
 }
 
+export const DEFAULT_TITLE_SIZE = 'm';
+
 const titleSizes = [
   {
     id: 'xs',
@@ -55,7 +57,9 @@ const titleSizes = [
 ];
 
 export const SizeOptions: React.FC<TitlePositionProps> = ({ state, setState }) => {
-  const currSizeIndex = titleSizes.findIndex((size) => size.id === (state.size || 'xl'));
+  const currSizeIndex = titleSizes.findIndex(
+    (size) => size.id === (state.size || DEFAULT_TITLE_SIZE)
+  );
 
   const changeSize = (change: number) => {
     setState({ ...state, size: titleSizes[currSizeIndex + change].id });
@@ -86,7 +90,7 @@ export const SizeOptions: React.FC<TitlePositionProps> = ({ state, setState }) =
           inputDisplay: position.label,
         };
       })}
-      valueOfSelected={state.size ?? 'xl'}
+      valueOfSelected={state.size ?? DEFAULT_TITLE_SIZE}
       onChange={(value) => {
         setState({ ...state, size: value });
       }}
diff --git a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx
index acaa11f477226..c58854647c1e7 100644
--- a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx
@@ -15,9 +15,19 @@ export interface TitlePositionProps {
   setState: (newState: MetricState) => void;
 }
 
+export const DEFAULT_TITLE_POSITION = 'top';
+
 const titlePositions = [
-  { id: 'top', label: 'Top' },
-  { id: 'bottom', label: 'Bottom' },
+  {
+    id: 'top',
+    label: i18n.translate('xpack.lens.metricChart.titlePositions.top', { defaultMessage: 'Top' }),
+  },
+  {
+    id: 'bottom',
+    label: i18n.translate('xpack.lens.metricChart.titlePositions.bottom', {
+      defaultMessage: 'Bottom',
+    }),
+  },
 ];
 
 export const TitlePositionOptions: React.FC<TitlePositionProps> = ({ state, setState }) => {
@@ -38,7 +48,7 @@ export const TitlePositionOptions: React.FC<TitlePositionProps> = ({ state, setS
         data-test-subj="lnsMissingValuesSelect"
         legend="This is a basic group"
         options={titlePositions}
-        idSelected={state.titlePosition ?? 'bottom'}
+        idSelected={state.titlePosition ?? DEFAULT_TITLE_POSITION}
         onChange={(value) => {
           setState({ ...state, titlePosition: value as MetricState['titlePosition'] });
         }}
diff --git a/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx b/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx
index fa4a7343f53d6..b44e94d84e0a9 100644
--- a/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx
@@ -6,7 +6,7 @@
  */
 
 import { RequiredPaletteParamTypes } from '@kbn/coloring';
-import { defaultPaletteParams as sharedDefaultParams } from '../shared_components/';
+import { defaultPaletteParams as sharedDefaultParams } from '../shared_components';
 
 export const DEFAULT_PALETTE_NAME = 'status';
 export const DEFAULT_COLOR_STEPS = 3;
diff --git a/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts b/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts
index c7e01b0c6a137..85f14fee1b4e6 100644
--- a/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts
@@ -11,9 +11,9 @@ import { layerTypes } from '../../common';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { generateId } from '../id_generator';
 import { DatasourcePublicAPI, FramePublicAPI } from '../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { ColorMode } from 'src/plugins/charts/common';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { ColorMode } from '@kbn/charts-plugin/common';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../id_generator');
 
@@ -301,13 +301,13 @@ describe('metric_visualization', () => {
                       Object {
                         "arguments": Object {
                           "align": Array [
-                            "center",
+                            "left",
                           ],
                           "lHeight": Array [
-                            127.5,
+                            82.5,
                           ],
                           "size": Array [
-                            85,
+                            55,
                           ],
                           "sizeUnit": Array [
                             "px",
@@ -329,13 +329,13 @@ describe('metric_visualization', () => {
                       Object {
                         "arguments": Object {
                           "align": Array [
-                            "center",
+                            "left",
                           ],
                           "lHeight": Array [
-                            40.5,
+                            24,
                           ],
                           "size": Array [
-                            27,
+                            16,
                           ],
                           "sizeUnit": Array [
                             "px",
@@ -349,7 +349,7 @@ describe('metric_visualization', () => {
                   },
                 ],
                 "labelPosition": Array [
-                  "bottom",
+                  "top",
                 ],
                 "metric": Array [
                   Object {
diff --git a/x-pack/plugins/lens/public/metric_visualization/visualization.tsx b/x-pack/plugins/lens/public/metric_visualization/visualization.tsx
index 87414e20f5abd..62c607f69265e 100644
--- a/x-pack/plugins/lens/public/metric_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/visualization.tsx
@@ -12,16 +12,19 @@ import { euiThemeVars } from '@kbn/ui-theme';
 import { render } from 'react-dom';
 import { Ast } from '@kbn/interpreter';
 import { PaletteOutput, PaletteRegistry, CUSTOM_PALETTE, shiftPalette } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { ColorMode, CustomPaletteState } from '../../../../../src/plugins/charts/common';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getSuggestions } from './metric_suggestions';
 import { LensIconChartMetric } from '../assets/chart_metric';
-import { Visualization, OperationMetadata, DatasourcePublicAPI } from '../types';
+import { Visualization, OperationMetadata, DatasourceLayers } from '../types';
 import type { MetricState } from '../../common/types';
 import { layerTypes } from '../../common';
 import { MetricDimensionEditor } from './dimension_editor';
 import { MetricToolbar } from './metric_config_panel';
+import { DEFAULT_TITLE_POSITION } from './metric_config_panel/title_position_option';
+import { DEFAULT_TITLE_SIZE } from './metric_config_panel/size_options';
+import { DEFAULT_TEXT_ALIGNMENT } from './metric_config_panel/align_options';
 
 interface MetricConfig extends Omit<MetricState, 'palette' | 'colorMode'> {
   title: string;
@@ -45,7 +48,7 @@ const getFontSizeAndUnit = (fontSize: string) => {
 const toExpression = (
   paletteService: PaletteRegistry,
   state: MetricState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   attributes?: Partial<Omit<MetricConfig, keyof MetricState>>
 ): Ast | null => {
   if (!state.accessor) {
@@ -82,7 +85,7 @@ const toExpression = (
     xxl: getFontSizeAndUnit(euiThemeVars.euiFontSizeXXL),
   };
 
-  const labelFont = fontSizes[state?.size || 'xl'];
+  const labelFont = fontSizes[state?.size || DEFAULT_TITLE_SIZE];
   const labelToMetricFontSizeMap: Record<string, number> = {
     xs: fontSizes.xs.size * 2,
     s: fontSizes.m.size * 2.5,
@@ -91,7 +94,7 @@ const toExpression = (
     xl: fontSizes.xxl.size * 2.5,
     xxl: fontSizes.xxl.size * 3,
   };
-  const metricFontSize = labelToMetricFontSizeMap[state?.size || 'xl'];
+  const metricFontSize = labelToMetricFontSizeMap[state?.size || DEFAULT_TITLE_SIZE];
 
   return {
     type: 'expression',
@@ -100,7 +103,7 @@ const toExpression = (
         type: 'function',
         function: 'metricVis',
         arguments: {
-          labelPosition: [state?.titlePosition || 'bottom'],
+          labelPosition: [state?.titlePosition || DEFAULT_TITLE_POSITION],
           font: [
             {
               type: 'expression',
@@ -109,7 +112,7 @@ const toExpression = (
                   type: 'function',
                   function: 'font',
                   arguments: {
-                    align: [state?.textAlign || 'center'],
+                    align: [state?.textAlign || DEFAULT_TEXT_ALIGNMENT],
                     size: [metricFontSize],
                     weight: ['600'],
                     lHeight: [metricFontSize * 1.5],
@@ -127,7 +130,7 @@ const toExpression = (
                   type: 'function',
                   function: 'font',
                   arguments: {
-                    align: [state?.textAlign || 'center'],
+                    align: [state?.textAlign || DEFAULT_TEXT_ALIGNMENT],
                     size: [labelFont.size],
                     lHeight: [labelFont.size * 1.5],
                     sizeUnit: [labelFont.sizeUnit],
diff --git a/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts b/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts
index 881b8fa887c66..157c910440fb6 100644
--- a/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts
+++ b/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts
@@ -9,7 +9,7 @@ import { isEqual } from 'lodash';
 import { Observable, Subject } from 'rxjs';
 import moment from 'moment';
 import { isFilterPinned, Filter } from '@kbn/es-query';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 function createMockTimefilter() {
   const unsubscribe = jest.fn();
diff --git a/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx b/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
index 644021e8a69c2..141ec881359d8 100644
--- a/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { ReactExpressionRendererProps } from 'src/plugins/expressions/public';
+import { ReactExpressionRendererProps } from '@kbn/expressions-plugin/public';
 
 export function createExpressionRendererMock(): jest.Mock<
   React.ReactElement,
diff --git a/x-pack/plugins/lens/public/mocks/index.ts b/x-pack/plugins/lens/public/mocks/index.ts
index 4c97fea960eac..ab6f2066e8804 100644
--- a/x-pack/plugins/lens/public/mocks/index.ts
+++ b/x-pack/plugins/lens/public/mocks/index.ts
@@ -31,6 +31,7 @@ export type FrameMock = jest.Mocked<FramePublicAPI>;
 
 export const createMockFramePublicAPI = (): FrameMock => ({
   datasourceLayers: {},
+  dateRange: { fromDate: 'now-7d', toDate: 'now' },
 });
 
 export type FrameDatasourceMock = jest.Mocked<FrameDatasourceAPI>;
diff --git a/x-pack/plugins/lens/public/mocks/services_mock.tsx b/x-pack/plugins/lens/public/mocks/services_mock.tsx
index 28a05d0e58ae2..f5e94d374481a 100644
--- a/x-pack/plugins/lens/public/mocks/services_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/services_mock.tsx
@@ -7,32 +7,32 @@
 
 import React from 'react';
 import { Subject } from 'rxjs';
-import { coreMock } from 'src/core/public/mocks';
-import { navigationPluginMock } from '../../../../../src/plugins/navigation/public/mocks';
-import { LensAppServices } from '../app_plugin/types';
-import { DOC_TYPE } from '../../common';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { inspectorPluginMock } from '../../../../../src/plugins/inspector/public/mocks';
-import { spacesPluginMock } from '../../../spaces/public/mocks';
-import { dashboardPluginMock } from '../../../../../src/plugins/dashboard/public/mocks';
-import { dataViewPluginMocks } from '../../../../../src/plugins/data_views/public/mocks';
-import { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { navigationPluginMock } from '@kbn/navigation-plugin/public/mocks';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { dashboardPluginMock } from '@kbn/dashboard-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
+import {
+  mockAttributeService,
+  createEmbeddableStateTransferMock,
+} from '@kbn/embeddable-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+
+import { presentationUtilPluginMock } from '@kbn/presentation-util-plugin/public/mocks';
+import type { LensAttributeService } from '../lens_attribute_service';
 import type {
   LensByValueInput,
   LensByReferenceInput,
   LensSavedObjectAttributes,
   LensUnwrapMetaInfo,
 } from '../embeddable/embeddable';
-import {
-  mockAttributeService,
-  createEmbeddableStateTransferMock,
-} from '../../../../../src/plugins/embeddable/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import type { LensAttributeService } from '../lens_attribute_service';
-import type { EmbeddableStateTransfer } from '../../../../../src/plugins/embeddable/public';
-
-import { presentationUtilPluginMock } from '../../../../../src/plugins/presentation_util/public/mocks';
+import { DOC_TYPE } from '../../common';
+import { LensAppServices } from '../app_plugin/types';
 import { mockDataPlugin } from './data_plugin_mock';
 import { getLensInspectorService } from '../lens_inspector_service';
 
diff --git a/x-pack/plugins/lens/public/mocks/store_mocks.tsx b/x-pack/plugins/lens/public/mocks/store_mocks.tsx
index a4067bc955368..2e6bc86a9d33e 100644
--- a/x-pack/plugins/lens/public/mocks/store_mocks.tsx
+++ b/x-pack/plugins/lens/public/mocks/store_mocks.tsx
@@ -15,12 +15,7 @@ import { act } from 'react-dom/test-utils';
 import { PreloadedState } from '@reduxjs/toolkit';
 import { LensAppServices } from '../app_plugin/types';
 
-import {
-  makeConfigureStore,
-  LensAppState,
-  LensState,
-  LensStoreDeps,
-} from '../state_management/index';
+import { makeConfigureStore, LensAppState, LensState, LensStoreDeps } from '../state_management';
 import { getResolvedDateRange } from '../utils';
 import { DatasourceMap, VisualizationMap } from '../types';
 import { mockVisualizationMap } from './visualization_mock';
diff --git a/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts b/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
index 9d6b120653d79..2a080c8923356 100644
--- a/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { SavedObjectIndexStore } from './saved_object_store';
 
 describe('LensStore', () => {
diff --git a/x-pack/plugins/lens/public/persistence/saved_object_store.ts b/x-pack/plugins/lens/public/persistence/saved_object_store.ts
index 769f50f901243..fe0601c525016 100644
--- a/x-pack/plugins/lens/public/persistence/saved_object_store.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_object_store.ts
@@ -11,8 +11,8 @@ import {
   SavedObjectsClientContract,
   SavedObjectReference,
   ResolvedSimpleSavedObject,
-} from 'kibana/public';
-import { Query } from '../../../../../src/plugins/data/public';
+} from '@kbn/core/public';
+import { Query } from '@kbn/data-plugin/public';
 import { DOC_TYPE } from '../../common';
 import { LensSavedObjectAttributes } from '../async_services';
 
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts
index d9d29a6fdb2d7..8d6ca5c3b7640 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import type { SavedObject } from 'src/plugins/saved_objects/public';
+import type { OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { findObjectByTitle } from './find_object_by_title';
 import { displayDuplicateTitleConfirmModal } from './display_duplicate_title_confirm_modal';
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx b/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx
index 120be6b66b339..c788660eea647 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import type { OverlayStart } from 'kibana/public';
+import type { OverlayStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export function confirmModalPromise(
   message = '',
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts
index f40224e42923c..6c5a94c8c3216 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { OverlayStart } from 'kibana/public';
-import type { SavedObject } from 'src/plugins/saved_objects/public';
+import type { OverlayStart } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts
index 72d8dcafcf348..a07a20ee1f284 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { findObjectByTitle } from './find_object_by_title';
-import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from 'src/core/public';
+import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from '@kbn/core/public';
 
 describe('findObjectByTitle', () => {
   const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts
index 93c86eeb5f3b0..b556f960d6e24 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts
@@ -9,7 +9,7 @@ import type {
   SavedObjectsClientContract,
   SimpleSavedObject,
   SavedObjectAttributes,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 /** Returns an object matching a given title */
 export async function findObjectByTitle<T extends SavedObjectAttributes>(
diff --git a/x-pack/plugins/lens/public/pie_visualization/index.ts b/x-pack/plugins/lens/public/pie_visualization/index.ts
index b86c2fc90e4fa..6b7a9d68115d6 100644
--- a/x-pack/plugins/lens/public/pie_visualization/index.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 
 export interface PieVisualizationPluginSetupPlugins {
   editorFrame: EditorFrameSetup;
diff --git a/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts b/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts
index d77a09ae10689..44aa3b3a92b12 100644
--- a/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import type { EuiIconProps } from '@elastic/eui';
 
-import type { DatatableColumn } from '../../../../../src/plugins/expressions';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 import { LensIconChartDonut } from '../assets/chart_donut';
 import { LensIconChartPie } from '../assets/chart_pie';
 import { LensIconChartTreemap } from '../assets/chart_treemap';
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts b/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts
index bf09b3f2706e5..6fe4d9b60420e 100644
--- a/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
 import { checkTableForContainsSmallValues, shouldShowValuesInLegend } from './render_helpers';
 import { PieLayerState, PieChartTypes } from '../../common';
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts b/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts
index 1f6d40abc32ec..b34385d55b44f 100644
--- a/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { PieChartType, PieLayerState } from '../../common/types';
 import { PartitionChartsMeta } from './partition_charts_meta';
 
diff --git a/x-pack/plugins/lens/public/pie_visualization/to_expression.ts b/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
index bacbc8f0720a3..9f506c7beb878 100644
--- a/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
@@ -9,11 +9,8 @@ import type { Ast } from '@kbn/interpreter';
 import { Position } from '@elastic/charts';
 import type { PaletteOutput, PaletteRegistry } from '@kbn/coloring';
 
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../src/plugins/expressions/public';
-import type { Operation, DatasourcePublicAPI } from '../types';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import type { Operation, DatasourcePublicAPI, DatasourceLayers } from '../types';
 import { DEFAULT_PERCENT_DECIMALS } from './constants';
 import { shouldShowValuesInLegend } from './render_helpers';
 import {
@@ -43,7 +40,7 @@ type GenerateExpressionAstFunction = (
   attributes: Attributes,
   operations: OperationColumnId[],
   layer: PieLayerState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry
 ) => Ast | null;
 
@@ -52,7 +49,7 @@ type GenerateExpressionAstArguments = (
   attributes: Attributes,
   operations: OperationColumnId[],
   layer: PieLayerState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry
 ) => Ast['chain'][number]['arguments'];
 
@@ -246,7 +243,7 @@ const generateExprAst: GenerateExpressionAstFunction = (state, ...restArgs) =>
 
 function expressionHelper(
   state: PieVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Attributes = { isPreview: false }
 ): Ast | null {
@@ -270,7 +267,7 @@ function expressionHelper(
 
 export function toExpression(
   state: PieVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Partial<{ title: string; description: string }> = {}
 ) {
@@ -282,7 +279,7 @@ export function toExpression(
 
 export function toPreviewExpression(
   state: PieVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry
 ) {
   return expressionHelper(state, datasourceLayers, paletteService, { isPreview: true });
diff --git a/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx b/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
index dac889fc99df6..67659d91ecefe 100644
--- a/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
@@ -156,7 +156,7 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
   ).truncateText;
 
   return (
-    <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
       <ToolbarPopover
         title={i18n.translate('xpack.lens.pieChart.valuesLabel', {
           defaultMessage: 'Labels',
@@ -183,7 +183,7 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
           </EuiFormRow>
         ) : null}
 
-        {numberOptions.length ? (
+        {numberOptions.length && layer.categoryDisplay !== 'hide' ? (
           <EuiFormRow
             label={i18n.translate('xpack.lens.pieChart.numberLabels', {
               defaultMessage: 'Values',
@@ -193,8 +193,7 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
           >
             <EuiSuperSelect
               compressed
-              disabled={layer.categoryDisplay === 'hide'}
-              valueOfSelected={layer.categoryDisplay === 'hide' ? 'hidden' : layer.numberDisplay}
+              valueOfSelected={layer.numberDisplay}
               options={numberOptions}
               onChange={onNumberDisplayChange}
             />
diff --git a/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts b/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts
index c178613657947..a911b5f0e1ba3 100644
--- a/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts
@@ -14,10 +14,10 @@ import {
   LegendDisplay,
 } from '../../common';
 import { layerTypes } from '../../common';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { FramePublicAPI } from '../types';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../id_generator');
 
diff --git a/x-pack/plugins/lens/public/pie_visualization/visualization.tsx b/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
index 621570e3086b8..665fd5522c36f 100644
--- a/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
@@ -10,9 +10,9 @@ import { render } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 import type {
   Visualization,
   OperationMetadata,
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index dbecf1e7d779f..b39c14cd82454 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -5,43 +5,45 @@
  * 2.0.
  */
 
-import type { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
-import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
-import type { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { AppMountParameters, CoreSetup, CoreStart } from '@kbn/core/public';
+import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
+import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type {
   UsageCollectionSetup,
   UsageCollectionStart,
-} from 'src/plugins/usage_collection/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import {
-  CONTEXT_MENU_TRIGGER,
-  EmbeddableSetup,
-  EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
-import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
-import type { DashboardStart } from '../../../../src/plugins/dashboard/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+} from '@kbn/usage-collection-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type {
   ExpressionsServiceSetup,
   ExpressionsSetup,
   ExpressionsStart,
-} from '../../../../src/plugins/expressions/public';
-import type {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../src/plugins/visualizations/public';
-import type { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-import type { UrlForwardingSetup } from '../../../../src/plugins/url_forwarding/public';
-import type { GlobalSearchPluginSetup } from '../../global_search/public';
-import type { ChartsPluginSetup, ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import type { EventAnnotationPluginSetup } from '../../../../src/plugins/event_annotation/public';
-import type { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public';
-import { EmbeddableStateTransfer } from '../../../../src/plugins/embeddable/public';
+} from '@kbn/expressions-plugin/public';
+import type { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import type { UrlForwardingSetup } from '@kbn/url-forwarding-plugin/public';
+import type { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/public';
+import type { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+import {
+  UiActionsStart,
+  ACTION_VISUALIZE_FIELD,
+  VISUALIZE_FIELD_TRIGGER,
+} from '@kbn/ui-actions-plugin/public';
+import { VISUALIZE_EDITOR_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import type { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { EditorFrameService as EditorFrameServiceType } from './editor_frame_service';
-import { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
 import type {
   IndexPatternDatasource as IndexPatternDatasourceType,
   IndexPatternDatasourceSetupPlugins,
@@ -65,16 +67,7 @@ import type {
 } from './pie_visualization';
 import type { HeatmapVisualization as HeatmapVisualizationType } from './heatmap_visualization';
 import type { GaugeVisualization as GaugeVisualizationType } from './visualizations/gauge';
-import type { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
-
-import { AppNavLinkStatus } from '../../../../src/core/public';
 
-import {
-  UiActionsStart,
-  ACTION_VISUALIZE_FIELD,
-  VISUALIZE_FIELD_TRIGGER,
-} from '../../../../src/plugins/ui_actions/public';
-import { VISUALIZE_EDITOR_TRIGGER } from '../../../../src/plugins/visualizations/public';
 import { APP_ID, getEditPath, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../common/constants';
 import type { FormatFactory } from '../common/types';
 import type {
@@ -97,10 +90,8 @@ import {
 import { getSaveModalComponent } from './app_plugin/shared/saved_modal_lazy';
 import type { SaveModalContainerProps } from './app_plugin/save_modal_container';
 
-import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';
 import { setupExpressions } from './expressions';
 import { getSearchProvider } from './search_provider';
-import type { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
 
 export interface LensPluginSetupDependencies {
   urlForwarding: UrlForwardingSetup;
@@ -118,6 +109,7 @@ export interface LensPluginSetupDependencies {
 
 export interface LensPluginStartDependencies {
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   dataViews: DataViewsPublicPluginStart;
   fieldFormats: FieldFormatsStart;
   expressions: ExpressionsStart;
diff --git a/x-pack/plugins/lens/public/search_provider.ts b/x-pack/plugins/lens/public/search_provider.ts
index a0d41da2d9740..8156d10e3a729 100644
--- a/x-pack/plugins/lens/public/search_provider.ts
+++ b/x-pack/plugins/lens/public/search_provider.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import { from, of } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { GlobalSearchResultProvider } from '@kbn/global-search-plugin/public';
 import { getFullPath } from '../common/constants';
 
-import type { GlobalSearchResultProvider } from '../../global_search/public';
-
 /**
  * Global search provider adding a Lens entry.
  * This is necessary because Lens does not show up in the nav bar and is filtered out by the
diff --git a/x-pack/plugins/lens/public/settings_storage.tsx b/x-pack/plugins/lens/public/settings_storage.tsx
index ebe812915242e..bf896f222ceaa 100644
--- a/x-pack/plugins/lens/public/settings_storage.tsx
+++ b/x-pack/plugins/lens/public/settings_storage.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const STORAGE_KEY = 'lens-settings';
 
diff --git a/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx b/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx
index ff7b058873bbc..8e0c98ad61e8a 100644
--- a/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback, useState } from 'react';
 import { EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { AxesSettingsConfig } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { LabelMode, useDebouncedValue, VisLabel } from './';
+import { AxesSettingsConfig } from '@kbn/expression-xy-plugin/common';
+import { LabelMode, useDebouncedValue, VisLabel } from '.';
 
 type AxesSettingsConfigKeys = keyof AxesSettingsConfig;
 
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts b/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts
index 5c7944d2aab58..834f3f5b1bf3c 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts
+++ b/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { applyPaletteParams, getContrastColor } from './utils';
 
 describe('applyPaletteParams', () => {
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
index b1ab5193c8cc4..abe22d82ceb93 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
+++ b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
@@ -19,7 +19,7 @@ import {
   getPaletteStops,
   CUSTOM_PALETTE,
 } from '@kbn/coloring';
-import { Datatable } from '../../../../../../src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 
 export function getContrastColor(
   color: string,
diff --git a/x-pack/plugins/lens/public/shared_components/columns_number_setting.test.tsx b/x-pack/plugins/lens/public/shared_components/columns_number_setting.test.tsx
deleted file mode 100644
index 50f2dc2fb93dc..0000000000000
--- a/x-pack/plugins/lens/public/shared_components/columns_number_setting.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
-import { ColumnsNumberSetting } from './columns_number_setting';
-
-describe('Columns Number Setting', () => {
-  it('should have default the columns input to 1 when no value is given', () => {
-    const component = mount(<ColumnsNumberSetting isDisabled={false} isLegendOutside={false} />);
-    expect(
-      component.find('[data-test-subj="lens-legend-location-columns-input"]').at(0).prop('value')
-    ).toEqual(1);
-  });
-});
diff --git a/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx b/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx
index 6a1d1ec6d0306..3cfd03d53c51d 100644
--- a/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx
+++ b/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
 import { useDebouncedValue } from './debounced_value';
-import { TooltipWrapper } from './tooltip_wrapper';
 
 export const DEFAULT_FLOATING_COLUMNS = 1;
 
@@ -22,10 +21,6 @@ interface ColumnsNumberSettingProps {
    * Callback on horizontal alignment option change
    */
   onFloatingColumnsChange?: (value: number) => void;
-  /**
-   * Flag to disable the location settings
-   */
-  isDisabled: boolean;
   /**
    * Indicates if legend is located outside
    */
@@ -35,7 +30,6 @@ interface ColumnsNumberSettingProps {
 export const ColumnsNumberSetting = ({
   floatingColumns,
   onFloatingColumnsChange = () => {},
-  isDisabled,
   isLegendOutside,
 }: ColumnsNumberSettingProps) => {
   const { inputValue, handleInputChange } = useDebouncedValue({
@@ -43,6 +37,8 @@ export const ColumnsNumberSetting = ({
     onChange: onFloatingColumnsChange,
   });
 
+  if (isLegendOutside) return null;
+
   return (
     <EuiFormRow
       label={i18n.translate('xpack.lens.shared.legendInsideColumnsLabel', {
@@ -51,34 +47,17 @@ export const ColumnsNumberSetting = ({
       fullWidth
       display="columnCompressed"
     >
-      <TooltipWrapper
-        tooltipContent={
-          isDisabled
-            ? i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
-              })
-            : i18n.translate('xpack.lens.shared.legendInsideTooltip', {
-                defaultMessage: 'Requires legend to be located inside visualization',
-              })
-        }
-        condition={isDisabled || isLegendOutside}
-        position="top"
-        delay="regular"
-        display="block"
-      >
-        <EuiFieldNumber
-          data-test-subj="lens-legend-location-columns-input"
-          value={inputValue}
-          min={1}
-          max={5}
-          compressed
-          disabled={isDisabled || isLegendOutside}
-          onChange={(e) => {
-            handleInputChange(Number(e.target.value));
-          }}
-          step={1}
-        />
-      </TooltipWrapper>
+      <EuiFieldNumber
+        data-test-subj="lens-legend-location-columns-input"
+        value={inputValue}
+        min={1}
+        max={5}
+        compressed
+        onChange={(e) => {
+          handleInputChange(Number(e.target.value));
+        }}
+        step={1}
+      />
     </EuiFormRow>
   );
 };
diff --git a/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts b/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts
index 250c5614fe093..a0b6f767b287b 100644
--- a/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts
+++ b/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DatasourcePublicAPI } from '../types';
+import { DatasourceLayers } from '../types';
 
 type VisState = { layers: Array<{ layerId: string }> } | { layerId: string };
 
@@ -28,7 +28,7 @@ function mergeValues(memo: MappedVisualValue, values: Partial<MappedVisualValue>
 
 export function getDefaultVisualValuesForLayer(
   state: VisState | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>
+  datasourceLayers: DatasourceLayers
 ): MappedVisualValue {
   const defaultValues = { truncateText: true };
   if (!state) {
diff --git a/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx b/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx
index f4b5ced490663..d318a19014928 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx
@@ -32,11 +32,9 @@ describe('Legend Location Settings', () => {
     expect(props.onPositionChange).toHaveBeenCalled();
   });
 
-  it('should disable the position group if isDisabled prop is true', () => {
+  it('should hide the position group if isDisabled prop is true', () => {
     const component = shallow(<LegendLocationSettings {...props} isDisabled />);
-    expect(
-      component.find('[data-test-subj="lens-legend-position-btn"]').prop('isDisabled')
-    ).toEqual(true);
+    expect(component.exists('[data-test-subj="lens-legend-position-btn"]')).toEqual(false);
   });
 
   it('should hide the position button group if location inside is given', () => {
@@ -104,18 +102,14 @@ describe('Legend Location Settings', () => {
     expect(newProps.onAlignmentChange).toHaveBeenCalled();
   });
 
-  it('should disable the components when is Disabled is true', () => {
+  it('should hide the components when is Disabled is true', () => {
     const newProps = {
       ...props,
       location: 'inside',
       isDisabled: true,
     } as LegendLocationSettingsProps;
     const component = shallow(<LegendLocationSettings {...newProps} />);
-    expect(
-      component.find('[data-test-subj="lens-legend-location-btn"]').prop('isDisabled')
-    ).toEqual(true);
-    expect(
-      component.find('[data-test-subj="lens-legend-inside-alignment-btn"]').prop('isDisabled')
-    ).toEqual(true);
+    expect(component.exists('[data-test-subj="lens-legend-location-btn"]')).toEqual(false);
+    expect(component.exists('[data-test-subj="lens-legend-inside-alignment-btn"]')).toEqual(false);
   });
 });
diff --git a/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx b/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx
index f3ac54ab00a05..7372b727268bd 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiButtonGroup } from '@elastic/eui';
 import { VerticalAlignment, HorizontalAlignment, Position } from '@elastic/charts';
-import { TooltipWrapper } from './tooltip_wrapper';
 
 export interface LegendLocationSettingsProps {
   /**
@@ -151,6 +150,7 @@ export const LegendLocationSettings: React.FunctionComponent<LegendLocationSetti
   const alignment = `${verticalAlignment || VerticalAlignment.Top}_${
     horizontalAlignment || HorizontalAlignment.Right
   }`;
+  if (isDisabled) return null;
   return (
     <>
       {location && (
@@ -160,32 +160,22 @@ export const LegendLocationSettings: React.FunctionComponent<LegendLocationSetti
             defaultMessage: 'Location',
           })}
         >
-          <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-              defaultMessage: 'Requires legend to be shown',
+          <EuiButtonGroup
+            isFullWidth
+            legend={i18n.translate('xpack.lens.shared.legendLocationLabel', {
+              defaultMessage: 'Location',
             })}
-            condition={isDisabled}
-            position="top"
-            delay="regular"
-            display="block"
-          >
-            <EuiButtonGroup
-              isFullWidth
-              legend={i18n.translate('xpack.lens.shared.legendLocationLabel', {
-                defaultMessage: 'Location',
-              })}
-              data-test-subj="lens-legend-location-btn"
-              name="legendLocation"
-              buttonSize="compressed"
-              options={locationOptions}
-              isDisabled={isDisabled}
-              idSelected={locationOptions.find(({ value }) => value === location)!.id}
-              onChange={(optionId) => {
-                const newLocation = locationOptions.find(({ id }) => id === optionId)!.value;
-                onLocationChange(newLocation);
-              }}
-            />
-          </TooltipWrapper>
+            data-test-subj="lens-legend-location-btn"
+            name="legendLocation"
+            buttonSize="compressed"
+            options={locationOptions}
+            isDisabled={isDisabled}
+            idSelected={locationOptions.find(({ value }) => value === location)!.id}
+            onChange={(optionId) => {
+              const newLocation = locationOptions.find(({ id }) => id === optionId)!.value;
+              onLocationChange(newLocation);
+            }}
+          />
         </EuiFormRow>
       )}
       <EuiFormRow
@@ -196,62 +186,42 @@ export const LegendLocationSettings: React.FunctionComponent<LegendLocationSetti
       >
         <>
           {(!location || location === 'outside') && (
-            <TooltipWrapper
-              tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
+            <EuiButtonGroup
+              legend={i18n.translate('xpack.lens.shared.legendAlignmentLabel', {
+                defaultMessage: 'Alignment',
               })}
-              condition={isDisabled}
-              position="top"
-              delay="regular"
-              display="block"
-            >
-              <EuiButtonGroup
-                legend={i18n.translate('xpack.lens.shared.legendAlignmentLabel', {
-                  defaultMessage: 'Alignment',
-                })}
-                isDisabled={isDisabled}
-                data-test-subj="lens-legend-position-btn"
-                name="legendPosition"
-                buttonSize="compressed"
-                options={toggleButtonsIcons}
-                idSelected={position || Position.Right}
-                onChange={onPositionChange}
-                isIconOnly
-              />
-            </TooltipWrapper>
+              isDisabled={isDisabled}
+              data-test-subj="lens-legend-position-btn"
+              name="legendPosition"
+              buttonSize="compressed"
+              options={toggleButtonsIcons}
+              idSelected={position || Position.Right}
+              onChange={onPositionChange}
+              isIconOnly
+            />
           )}
           {location === 'inside' && (
-            <TooltipWrapper
-              tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
+            <EuiButtonGroup
+              legend={i18n.translate('xpack.lens.shared.legendInsideLocationAlignmentLabel', {
+                defaultMessage: 'Alignment',
               })}
-              condition={isDisabled}
-              position="top"
-              delay="regular"
-              display="block"
-            >
-              <EuiButtonGroup
-                legend={i18n.translate('xpack.lens.shared.legendInsideLocationAlignmentLabel', {
-                  defaultMessage: 'Alignment',
-                })}
-                type="single"
-                data-test-subj="lens-legend-inside-alignment-btn"
-                name="legendInsideAlignment"
-                buttonSize="compressed"
-                isDisabled={isDisabled}
-                options={locationAlignmentButtonsIcons}
-                idSelected={
-                  locationAlignmentButtonsIcons.find(({ value }) => value === alignment)!.id
-                }
-                onChange={(optionId) => {
-                  const newAlignment = locationAlignmentButtonsIcons.find(
-                    ({ id }) => id === optionId
-                  )!.value;
-                  onAlignmentChange(newAlignment);
-                }}
-                isIconOnly
-              />
-            </TooltipWrapper>
+              type="single"
+              data-test-subj="lens-legend-inside-alignment-btn"
+              name="legendInsideAlignment"
+              buttonSize="compressed"
+              isDisabled={isDisabled}
+              options={locationAlignmentButtonsIcons}
+              idSelected={
+                locationAlignmentButtonsIcons.find(({ value }) => value === alignment)!.id
+              }
+              onChange={(optionId) => {
+                const newAlignment = locationAlignmentButtonsIcons.find(
+                  ({ id }) => id === optionId
+                )!.value;
+                onAlignmentChange(newAlignment);
+              }}
+              isIconOnly
+            />
           )}
         </>
       </EuiFormRow>
diff --git a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx
index e76426515548f..9bf9a1885e6ac 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx
@@ -56,7 +56,7 @@ describe('Legend Settings', () => {
   });
 
   it('should have default the max lines input to 1 when no value is given', () => {
-    const component = shallow(<LegendSettingsPopover {...props} />);
+    const component = shallow(<LegendSettingsPopover {...props} shouldTruncate />);
     expect(component.find(MaxLinesInput).prop('value')).toEqual(1);
   });
 
@@ -74,9 +74,9 @@ describe('Legend Settings', () => {
     ).toEqual(false);
   });
 
-  it('should have disabled the max lines input when truncate is set to false', () => {
+  it('should hide the max lines input when truncate is set to false', () => {
     const component = shallow(<LegendSettingsPopover {...props} shouldTruncate={false} />);
-    expect(component.find(MaxLinesInput).prop('isDisabled')).toEqual(true);
+    expect(component.exists(MaxLinesInput)).toEqual(false);
   });
 
   it('should have called the onTruncateLegendChange function on truncate switch change', () => {
@@ -115,12 +115,10 @@ describe('Legend Settings', () => {
     expect(nestedProps.onNestedLegendChange).toHaveBeenCalled();
   });
 
-  it('should disable switch group on hide mode', () => {
+  it('should hide switch group on hide mode', () => {
     const component = shallow(
       <LegendSettingsPopover {...props} mode="hide" renderNestedLegendSwitch />
     );
-    expect(component.find('[data-test-subj="lens-legend-nested-switch"]').prop('disabled')).toEqual(
-      true
-    );
+    expect(component.exists('[data-test-subj="lens-legend-nested-switch"]')).toEqual(false);
   });
 });
diff --git a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx
index 481c38815d43d..560a695eaa089 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx
@@ -15,12 +15,11 @@ import {
   EuiFieldNumber,
 } from '@elastic/eui';
 import { Position, VerticalAlignment, HorizontalAlignment } from '@elastic/charts';
-import { ToolbarPopover } from '../shared_components';
+import { ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
+import { ToolbarPopover } from '.';
 import { LegendLocationSettings } from './legend_location_settings';
 import { ColumnsNumberSetting } from './columns_number_setting';
 import { LegendSizeSettings } from './legend_size_settings';
-import { ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
-import { TooltipWrapper } from './tooltip_wrapper';
 import { useDebouncedValue } from './debounced_value';
 
 export interface LegendSettingsPopoverProps {
@@ -137,11 +136,9 @@ const MIN_TRUNCATE_LINES = 1;
 export const MaxLinesInput = ({
   value,
   setValue,
-  isDisabled,
 }: {
   value: number;
   setValue: (value: number) => void;
-  isDisabled: boolean;
 }) => {
   const { inputValue, handleInputChange } = useDebouncedValue({ value, onChange: setValue });
   return (
@@ -152,7 +149,6 @@ export const MaxLinesInput = ({
       max={MAX_TRUNCATE_LINES}
       step={1}
       compressed
-      disabled={isDisabled}
       onChange={(e) => {
         const val = Number(e.target.value);
         // we want to automatically change the values to the limits
@@ -218,146 +214,101 @@ export const LegendSettingsPopover: React.FunctionComponent<LegendSettingsPopove
           onChange={onDisplayChange}
         />
       </EuiFormRow>
-      <LegendLocationSettings
-        location={location}
-        onLocationChange={onLocationChange}
-        verticalAlignment={verticalAlignment}
-        horizontalAlignment={horizontalAlignment}
-        onAlignmentChange={onAlignmentChange}
-        isDisabled={mode === 'hide'}
-        position={position}
-        onPositionChange={onPositionChange}
-      />
-      <LegendSizeSettings
-        legendSize={legendSize}
-        onLegendSizeChange={onLegendSizeChange}
-        isVerticalLegend={!position || position === Position.Left || position === Position.Right}
-        isDisabled={mode === 'hide'}
-      />
-      {location && (
-        <ColumnsNumberSetting
-          floatingColumns={floatingColumns}
-          onFloatingColumnsChange={onFloatingColumnsChange}
-          isDisabled={mode === 'hide'}
-          isLegendOutside={location === 'outside'}
-        />
-      )}
-      <EuiFormRow
-        display="columnCompressedSwitch"
-        label={i18n.translate('xpack.lens.shared.truncateLegend', {
-          defaultMessage: 'Truncate text',
-        })}
-      >
-        <TooltipWrapper
-          tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-            defaultMessage: 'Requires legend to be shown',
-          })}
-          condition={mode === 'hide'}
-          position="top"
-          delay="regular"
-          display="block"
-        >
-          <EuiSwitch
-            compressed
-            label={i18n.translate('xpack.lens.shared.truncateLegend', {
-              defaultMessage: 'Truncate text',
-            })}
-            data-test-subj="lens-legend-truncate-switch"
-            showLabel={false}
-            disabled={mode === 'hide'}
-            checked={shouldTruncate ?? true}
-            onChange={onTruncateLegendChange}
+      {mode !== 'hide' && (
+        <>
+          <LegendLocationSettings
+            location={location}
+            onLocationChange={onLocationChange}
+            verticalAlignment={verticalAlignment}
+            horizontalAlignment={horizontalAlignment}
+            onAlignmentChange={onAlignmentChange}
+            position={position}
+            onPositionChange={onPositionChange}
           />
-        </TooltipWrapper>
-      </EuiFormRow>
-      <EuiFormRow
-        label={i18n.translate('xpack.lens.shared.maxLinesLabel', {
-          defaultMessage: 'Maximum lines',
-        })}
-        fullWidth
-        display="columnCompressed"
-      >
-        <TooltipWrapper
-          tooltipContent={
-            mode === 'hide'
-              ? i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                  defaultMessage: 'Requires legend to be shown',
-                })
-              : i18n.translate('xpack.lens.shared.legendIsTruncated', {
-                  defaultMessage: 'Requires text to be truncated',
-                })
-          }
-          condition={mode === 'hide' || !shouldTruncate}
-          position="top"
-          delay="regular"
-          display="block"
-        >
-          <MaxLinesInput
-            value={maxLines ?? DEFAULT_TRUNCATE_LINES}
-            setValue={onMaxLinesChange}
-            isDisabled={mode === 'hide' || !shouldTruncate}
+          <LegendSizeSettings
+            legendSize={legendSize}
+            onLegendSizeChange={onLegendSizeChange}
+            isVerticalLegend={
+              !position || position === Position.Left || position === Position.Right
+            }
           />
-        </TooltipWrapper>
-      </EuiFormRow>
-      {renderNestedLegendSwitch && (
-        <EuiFormRow
-          display="columnCompressedSwitch"
-          label={i18n.translate('xpack.lens.shared.nestedLegendLabel', {
-            defaultMessage: 'Nested',
-          })}
-        >
-          <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-              defaultMessage: 'Requires legend to be shown',
+          {location && (
+            <ColumnsNumberSetting
+              floatingColumns={floatingColumns}
+              onFloatingColumnsChange={onFloatingColumnsChange}
+              isLegendOutside={location === 'outside'}
+            />
+          )}
+          <EuiFormRow
+            display="columnCompressedSwitch"
+            label={i18n.translate('xpack.lens.shared.truncateLegend', {
+              defaultMessage: 'Truncate text',
             })}
-            condition={mode === 'hide'}
-            position="top"
-            delay="regular"
-            display="block"
           >
             <EuiSwitch
               compressed
-              label={i18n.translate('xpack.lens.pieChart.nestedLegendLabel', {
-                defaultMessage: 'Nested',
+              label={i18n.translate('xpack.lens.shared.truncateLegend', {
+                defaultMessage: 'Truncate text',
               })}
-              data-test-subj="lens-legend-nested-switch"
+              data-test-subj="lens-legend-truncate-switch"
               showLabel={false}
-              disabled={mode === 'hide'}
-              checked={!!nestedLegend}
-              onChange={onNestedLegendChange}
+              checked={shouldTruncate ?? true}
+              onChange={onTruncateLegendChange}
             />
-          </TooltipWrapper>
-        </EuiFormRow>
-      )}
-      {renderValueInLegendSwitch && (
-        <EuiFormRow
-          display="columnCompressedSwitch"
-          label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
-            defaultMessage: 'Show value',
-          })}
-        >
-          <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-              defaultMessage: 'Requires legend to be shown',
-            })}
-            condition={mode === 'hide'}
-            position="top"
-            delay="regular"
-            display="block"
-          >
-            <EuiSwitch
-              compressed
+          </EuiFormRow>
+          {shouldTruncate && (
+            <EuiFormRow
+              label={i18n.translate('xpack.lens.shared.maxLinesLabel', {
+                defaultMessage: 'Maximum lines',
+              })}
+              fullWidth
+              display="columnCompressed"
+            >
+              <MaxLinesInput
+                value={maxLines ?? DEFAULT_TRUNCATE_LINES}
+                setValue={onMaxLinesChange}
+              />
+            </EuiFormRow>
+          )}
+          {renderNestedLegendSwitch && (
+            <EuiFormRow
+              display="columnCompressedSwitch"
+              label={i18n.translate('xpack.lens.shared.nestedLegendLabel', {
+                defaultMessage: 'Nested',
+              })}
+            >
+              <EuiSwitch
+                compressed
+                label={i18n.translate('xpack.lens.pieChart.nestedLegendLabel', {
+                  defaultMessage: 'Nested',
+                })}
+                data-test-subj="lens-legend-nested-switch"
+                showLabel={false}
+                checked={!!nestedLegend}
+                onChange={onNestedLegendChange}
+              />
+            </EuiFormRow>
+          )}
+          {renderValueInLegendSwitch && (
+            <EuiFormRow
+              display="columnCompressedSwitch"
               label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
                 defaultMessage: 'Show value',
               })}
-              data-test-subj="lens-legend-show-value"
-              showLabel={false}
-              disabled={mode === 'hide'}
-              checked={!!valueInLegend}
-              onChange={onValueInLegendChange}
-            />
-          </TooltipWrapper>
-        </EuiFormRow>
+            >
+              <EuiSwitch
+                compressed
+                label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
+                  defaultMessage: 'Show value',
+                })}
+                data-test-subj="lens-legend-show-value"
+                showLabel={false}
+                checked={!!valueInLegend}
+                onChange={onValueInLegendChange}
+              />
+            </EuiFormRow>
+          )}
+        </>
       )}
     </ToolbarPopover>
   );
diff --git a/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx b/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx
index a596bb7189571..53da283de0b68 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx
@@ -8,7 +8,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiSuperSelect } from '@elastic/eui';
-import { TooltipWrapper } from './tooltip_wrapper';
 
 export enum LegendSizes {
   AUTO = '0',
@@ -22,7 +21,6 @@ interface LegendSizeSettingsProps {
   legendSize: number | undefined;
   onLegendSizeChange: (size?: number) => void;
   isVerticalLegend: boolean;
-  isDisabled: boolean;
 }
 
 const legendSizeOptions: Array<{ value: LegendSizes; inputDisplay: string }> = [
@@ -65,7 +63,6 @@ export const LegendSizeSettings = ({
   legendSize,
   onLegendSizeChange,
   isVerticalLegend,
-  isDisabled,
 }: LegendSizeSettingsProps) => {
   useEffect(() => {
     if (legendSize && !isVerticalLegend) {
@@ -78,6 +75,8 @@ export const LegendSizeSettings = ({
     [onLegendSizeChange]
   );
 
+  if (!isVerticalLegend) return null;
+
   return (
     <EuiFormRow
       display="columnCompressed"
@@ -86,29 +85,12 @@ export const LegendSizeSettings = ({
       })}
       fullWidth
     >
-      <TooltipWrapper
-        tooltipContent={
-          isDisabled
-            ? i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
-              })
-            : i18n.translate('xpack.lens.legendSizeSetting.legendVertical', {
-                defaultMessage: 'Requires legend to be right or left aligned',
-              })
-        }
-        condition={isDisabled || !isVerticalLegend}
-        position="top"
-        delay="regular"
-        display="block"
-      >
-        <EuiSuperSelect
-          compressed
-          valueOfSelected={legendSize?.toString() ?? LegendSizes.AUTO}
-          options={legendSizeOptions}
-          onChange={onLegendSizeOptionChange}
-          disabled={isDisabled || !isVerticalLegend}
-        />
-      </TooltipWrapper>
+      <EuiSuperSelect
+        compressed
+        valueOfSelected={legendSize?.toString() ?? LegendSizes.AUTO}
+        options={legendSizeOptions}
+        onChange={onLegendSizeOptionChange}
+      />
     </EuiFormRow>
   );
 };
diff --git a/x-pack/plugins/lens/public/shared_components/name_input.tsx b/x-pack/plugins/lens/public/shared_components/name_input.tsx
index b59946ec42aa9..0b65b26021628 100644
--- a/x-pack/plugins/lens/public/shared_components/name_input.tsx
+++ b/x-pack/plugins/lens/public/shared_components/name_input.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { useDebouncedValue } from '../shared_components';
+import { useDebouncedValue } from '.';
 
 export const NameInput = ({
   value,
diff --git a/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx b/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx
index e6bb2fcdc0825..9d806b79f8311 100644
--- a/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx
@@ -8,8 +8,8 @@
 import './toolbar_popover.scss';
 import React, { useState } from 'react';
 import { EuiFlexItem, EuiPopover, EuiIcon, EuiPopoverTitle, IconType } from '@elastic/eui';
+import { ToolbarButton, ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { EuiIconLegend } from '../assets/legend';
-import { ToolbarButton, ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
 
 const typeToIconMap: { [type: string]: string | IconType } = {
   legend: EuiIconLegend as IconType,
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts b/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts
index e958650d8b5c6..19e40577acad6 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts
@@ -9,7 +9,7 @@ import { PayloadAction } from '@reduxjs/toolkit';
 import moment from 'moment';
 
 import { contextMiddleware } from '.';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { applyChanges, initialState } from '../lens_slice';
 import { LensAppState } from '../types';
 import { mockDataPlugin, mockStoreDeps } from '../../mocks';
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/index.ts b/x-pack/plugins/lens/public/state_management/context_middleware/index.ts
index ada5bc3c1c39e..65507a6767166 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/index.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/index.ts
@@ -7,7 +7,7 @@
 
 import { Dispatch, MiddlewareAPI, PayloadAction } from '@reduxjs/toolkit';
 import moment from 'moment';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   setState,
   LensDispatch,
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts b/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
index 6bee355b10659..60a4f5670070e 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
@@ -7,11 +7,8 @@
 
 import { delay, finalize, switchMap, tap } from 'rxjs/operators';
 import { debounce, isEqual } from 'lodash';
+import { waitUntilNextSessionCompletes$, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { trackUiEvent } from '../../lens_ui_telemetry';
-import {
-  waitUntilNextSessionCompletes$,
-  DataPublicPluginStart,
-} from '../../../../../../src/plugins/data/public';
 import { setState, LensGetState, LensDispatch } from '..';
 import { getResolvedDateRange } from '../../utils';
 
diff --git a/x-pack/plugins/lens/public/state_management/init_middleware/index.ts b/x-pack/plugins/lens/public/state_management/init_middleware/index.ts
index 164941d5d5f89..0858d9d8af783 100644
--- a/x-pack/plugins/lens/public/state_management/init_middleware/index.ts
+++ b/x-pack/plugins/lens/public/state_management/init_middleware/index.ts
@@ -6,11 +6,11 @@
  */
 
 import { Dispatch, MiddlewareAPI, PayloadAction } from '@reduxjs/toolkit';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { LensStoreDeps } from '..';
 import { loadInitial as loadInitialAction } from '..';
 import { loadInitial } from './load_initial';
 import { readFromStorage } from '../../settings_storage';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { AUTO_APPLY_DISABLED_STORAGE_KEY } from '../../editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper';
 
 const autoApplyDisabled = () => {
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.test.ts b/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
index 4a183c11d896b..1896db481dbed 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { EnhancedStore } from '@reduxjs/toolkit';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import {
   switchDatasource,
   switchVisualization,
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.ts b/x-pack/plugins/lens/public/state_management/lens_slice.ts
index 959db8ca006fe..df728e2bf8501 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.ts
@@ -6,7 +6,7 @@
  */
 
 import { createAction, createReducer, current, PayloadAction } from '@reduxjs/toolkit';
-import { VisualizeFieldContext } from 'src/plugins/ui_actions/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import { mapValues } from 'lodash';
 import { History } from 'history';
 import { LensEmbeddableInput } from '..';
@@ -632,6 +632,7 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
           ? (current(state.activeData) as TableInspectorAdapter)
           : undefined,
         datasourceLayers: getDatasourceLayers(state.datasourceStates, datasourceMap),
+        dateRange: current(state.resolvedDateRange),
       };
 
       const activeDatasource = datasourceMap[state.activeDatasourceId];
@@ -690,6 +691,7 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
             ? (current(state.activeData) as TableInspectorAdapter)
             : undefined,
           datasourceLayers: getDatasourceLayers(state.datasourceStates, datasourceMap),
+          dateRange: current(state.resolvedDateRange),
         },
         activeVisualization,
         activeDatasource,
diff --git a/x-pack/plugins/lens/public/state_management/selectors.ts b/x-pack/plugins/lens/public/state_management/selectors.ts
index 351496ca3e37b..57cb43452232a 100644
--- a/x-pack/plugins/lens/public/state_management/selectors.ts
+++ b/x-pack/plugins/lens/public/state_management/selectors.ts
@@ -6,8 +6,8 @@
  */
 
 import { createSelector } from '@reduxjs/toolkit';
-import { FilterManager } from 'src/plugins/data/public';
-import { SavedObjectReference } from 'kibana/public';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { LensState } from './types';
 import { Datasource, DatasourceMap, VisualizationMap } from '../types';
 import { getDatasourceLayers } from '../editor_frame_service/editor_frame';
@@ -162,11 +162,13 @@ export const selectFramePublicAPI = createSelector(
     selectCurrentDatasourceStates,
     selectActiveData,
     selectInjectedDependencies as SelectInjectedDependenciesFunction<DatasourceMap>,
+    selectResolvedDateRange,
   ],
-  (datasourceStates, activeData, datasourceMap) => {
+  (datasourceStates, activeData, datasourceMap, dateRange) => {
     return {
       datasourceLayers: getDatasourceLayers(datasourceStates, datasourceMap),
       activeData,
+      dateRange,
     };
   }
 );
diff --git a/x-pack/plugins/lens/public/state_management/types.ts b/x-pack/plugins/lens/public/state_management/types.ts
index 0c902f944072d..efba6312e8ba6 100644
--- a/x-pack/plugins/lens/public/state_management/types.ts
+++ b/x-pack/plugins/lens/public/state_management/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { VisualizeFieldContext } from 'src/plugins/ui_actions/public';
-import { EmbeddableEditorState } from 'src/plugins/embeddable/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableEditorState } from '@kbn/embeddable-plugin/public';
 import { Filter } from '@kbn/es-query';
-import { Query, SavedQuery } from '../../../../../src/plugins/data/public';
+import { Query, SavedQuery } from '@kbn/data-plugin/public';
 import { Document } from '../persistence';
 
 import { TableInspectorAdapter } from '../editor_frame_service/types';
diff --git a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
index 321f87d42fc39..084bd65b70d31 100644
--- a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { DiscoverStart } from '../../../../../src/plugins/discover/public';
-import type { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { DOC_TYPE } from '../../common';
 import { Embeddable } from '../embeddable';
 import { createOpenInDiscoverAction } from './open_in_discover_action';
diff --git a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts
index d2b4c787f1304..bd666f52bf0bc 100644
--- a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { IEmbeddable } from 'src/plugins/embeddable/public';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { Embeddable } from '../embeddable';
-import type { DiscoverStart } from '../../../../../src/plugins/discover/public';
 import { DOC_TYPE } from '../../common';
-import { getShowUnderlyingDataLabel } from '../app_plugin/show_underlying_data';
 
 const ACTION_OPEN_IN_DISCOVER = 'ACTION_OPEN_IN_DISCOVER';
 
@@ -20,7 +20,10 @@ export const createOpenInDiscoverAction = (discover: DiscoverStart, hasDiscoverA
     id: ACTION_OPEN_IN_DISCOVER,
     order: 19, // right after Inspect which is 20
     getIconType: () => 'popout',
-    getDisplayName: () => getShowUnderlyingDataLabel(),
+    getDisplayName: () =>
+      i18n.translate('xpack.lens.app.exploreDataInDiscover', {
+        defaultMessage: 'Explore data in Discover',
+      }),
     isCompatible: async (context: { embeddable: IEmbeddable }) => {
       if (!hasDiscoverAccess) return false;
       return (
diff --git a/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts b/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts
index 4e105ed9db499..4f5c9aaad7c42 100644
--- a/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts
@@ -10,8 +10,8 @@ import {
   createAction,
   ACTION_VISUALIZE_LENS_FIELD,
   VisualizeFieldContext,
-} from '../../../../../src/plugins/ui_actions/public';
-import type { ApplicationStart } from '../../../../../src/core/public';
+} from '@kbn/ui-actions-plugin/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 export const visualizeFieldAction = (application: ApplicationStart) =>
   createAction<VisualizeFieldContext>({
diff --git a/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts b/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts
index 6694efac7bec7..535bfa14ba5c8 100644
--- a/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { ACTION_CONVERT_TO_LENS } from '../../../../../src/plugins/visualizations/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { ACTION_CONVERT_TO_LENS } from '@kbn/visualizations-plugin/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import type { VisualizeEditorContext } from '../types';
-import type { ApplicationStart } from '../../../../../src/core/public';
 
 export const visualizeTSVBAction = (application: ApplicationStart) =>
   createAction<{ [key: string]: VisualizeEditorContext }>({
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 2143cb1704bf5..22d794e803df1 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -6,9 +6,13 @@
  */
 import { Ast } from '@kbn/interpreter';
 import type { IconType } from '@elastic/eui/src/components/icon/icon';
-import type { CoreSetup, SavedObjectReference, SavedObjectsResolveResponse } from 'kibana/public';
+import type {
+  CoreSetup,
+  SavedObjectReference,
+  SavedObjectsResolveResponse,
+} from '@kbn/core/public';
 import type { PaletteOutput } from '@kbn/coloring';
-import type { TopNavMenuData } from 'src/plugins/navigation/public';
+import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import type { MutableRefObject } from 'react';
 import { Filter } from '@kbn/es-query';
 import type {
@@ -16,26 +20,23 @@ import type {
   ExpressionRendererEvent,
   IInterpreterRenderHandlers,
   Datatable,
-} from '../../../../src/plugins/expressions/public';
-import type { VisualizeEditorLayersContext } from '../../../../src/plugins/visualizations/public';
+} from '@kbn/expressions-plugin/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
+import type { Query } from '@kbn/data-plugin/public';
+import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import type {
+  UiActionsStart,
+  RowClickContext,
+  VisualizeFieldContext,
+} from '@kbn/ui-actions-plugin/public';
 import { DraggingIdentifier, DragDropIdentifier, DragContextState } from './drag_drop';
 import type { DateRange, LayerType, SortingHint } from '../common';
-import type { Query } from '../../../../src/plugins/data/public';
-import type {
-  RangeSelectContext,
-  ValueClickContext,
-} from '../../../../src/plugins/embeddable/public';
 import type {
   LensSortActionData,
   LensResizeActionData,
   LensToggleActionData,
   LensPagesizeActionData,
 } from './datatable_visualization/components/types';
-import type {
-  UiActionsStart,
-  RowClickContext,
-  VisualizeFieldContext,
-} from '../../../../src/plugins/ui_actions/public';
 
 import {
   LENS_EDIT_SORT_ACTION,
@@ -591,7 +592,7 @@ interface VisualizationDimensionChangeProps<T> {
   layerId: string;
   columnId: string;
   prevState: T;
-  frame: Pick<FramePublicAPI, 'datasourceLayers' | 'activeData'>;
+  frame: FramePublicAPI;
 }
 export interface Suggestion {
   visualizationId: string;
@@ -683,9 +684,11 @@ export interface VisualizationSuggestion<T = unknown> {
   previewIcon: IconType;
 }
 
+export type DatasourceLayers = Record<string, DatasourcePublicAPI>;
+
 export interface FramePublicAPI {
-  datasourceLayers: Record<string, DatasourcePublicAPI>;
-  appliedDatasourceLayers?: Record<string, DatasourcePublicAPI>; // this is only set when auto-apply is turned off
+  datasourceLayers: DatasourceLayers;
+  dateRange: DateRange;
   /**
    * Data of the chart currently rendered in the preview.
    * This data might be not available (e.g. if the chart can't be rendered) or outdated and belonging to another chart.
@@ -694,7 +697,6 @@ export interface FramePublicAPI {
   activeData?: Record<string, Datatable>;
 }
 export interface FrameDatasourceAPI extends FramePublicAPI {
-  dateRange: DateRange;
   query: Query;
   filters: Filter[];
 }
@@ -884,7 +886,7 @@ export interface Visualization<T = unknown> {
 
   toExpression: (
     state: T,
-    datasourceLayers: Record<string, DatasourcePublicAPI>,
+    datasourceLayers: DatasourceLayers,
     attributes?: Partial<{ title: string; description: string }>
   ) => ExpressionAstExpression | string | null;
   /**
@@ -893,7 +895,7 @@ export interface Visualization<T = unknown> {
    */
   toPreviewExpression?: (
     state: T,
-    datasourceLayers: Record<string, DatasourcePublicAPI>
+    datasourceLayers: DatasourceLayers
   ) => ExpressionAstExpression | string | null;
   /**
    * The frame will call this function on all visualizations at few stages (pre-build/build error) in order
@@ -901,7 +903,7 @@ export interface Visualization<T = unknown> {
    */
   getErrorMessages: (
     state: T,
-    datasourceLayers?: Record<string, DatasourcePublicAPI>
+    datasourceLayers?: DatasourceLayers
   ) =>
     | Array<{
         shortMessage: string;
diff --git a/x-pack/plugins/lens/public/utils.test.ts b/x-pack/plugins/lens/public/utils.test.ts
index 857f30e692305..1d39c830c5b10 100644
--- a/x-pack/plugins/lens/public/utils.test.ts
+++ b/x-pack/plugins/lens/public/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datatable } from 'src/plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { inferTimeField } from './utils';
 
 const table: Datatable = {
diff --git a/x-pack/plugins/lens/public/utils.ts b/x-pack/plugins/lens/public/utils.ts
index 09fed81d34602..b5ada350b2aaa 100644
--- a/x-pack/plugins/lens/public/utils.ts
+++ b/x-pack/plugins/lens/public/utils.ts
@@ -8,9 +8,10 @@ import { uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
 
-import type { TimefilterContract } from 'src/plugins/data/public';
-import type { IUiSettingsClient, SavedObjectReference } from 'kibana/public';
-import type { DataView, DataViewsContract } from '../../../../src/plugins/data_views/public';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient, SavedObjectReference } from '@kbn/core/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { search } from '@kbn/data-plugin/public';
 import type { Document } from './persistence/saved_object_store';
 import type {
   Datasource,
@@ -19,7 +20,6 @@ import type {
   LensFilterEvent,
   Visualization,
 } from './types';
-import { search } from '../../../../src/plugins/data/public';
 import type { DatasourceStates, VisualizationState } from './state_management';
 
 export function getVisualizeGeoFieldMessage(fieldType: string) {
diff --git a/x-pack/plugins/lens/public/vis_type_alias.ts b/x-pack/plugins/lens/public/vis_type_alias.ts
index 96332e07069b0..be8a5620ce614 100644
--- a/x-pack/plugins/lens/public/vis_type_alias.ts
+++ b/x-pack/plugins/lens/public/vis_type_alias.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { VisTypeAlias } from 'src/plugins/visualizations/public';
+import type { VisTypeAlias } from '@kbn/visualizations-plugin/public';
 import { getBasePath, getEditPath } from '../common/constants';
 
 export const getLensAliasConfig = (): VisTypeAlias => ({
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/constants.ts b/x-pack/plugins/lens/public/visualizations/gauge/constants.ts
index 134b3bee70c8c..3c6ab9f8471b8 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/constants.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/constants.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { GaugeState as GaugeStateOriginal } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
-import { LayerType } from '../../../common/';
+import { GaugeState as GaugeStateOriginal } from '@kbn/expression-gauge-plugin/common';
+import { LayerType } from '../../../common';
 
 export const LENS_GAUGE_ID = 'lnsGauge';
 
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
index 3f7454f33c755..056b96619949d 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
@@ -23,20 +23,10 @@ import {
   CUSTOM_PALETTE,
   FIXED_PROGRESSION,
 } from '@kbn/coloring';
-import {
-  GaugeTicksPositions,
-  GaugeColorModes,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
-import {
-  getMaxValue,
-  getMinValue,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/public';
+import { GaugeTicksPositions, GaugeColorModes } from '@kbn/expression-gauge-plugin/common';
+import { getMaxValue, getMinValue } from '@kbn/expression-gauge-plugin/public';
 import { isNumericFieldForDatatable } from '../../../common/expressions';
-import {
-  applyPaletteParams,
-  PalettePanelContainer,
-  TooltipWrapper,
-} from '../../shared_components/';
+import { applyPaletteParams, PalettePanelContainer, TooltipWrapper } from '../../shared_components';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import './dimension_editor.scss';
 import { GaugeVisualizationState } from './constants';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/index.ts b/x-pack/plugins/lens/public/visualizations/gauge/index.ts
index f683ef54b4857..26973009c4f6a 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/index.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../../types';
-import type { ChartsPluginSetup } from '../../../../../../src/plugins/charts/public';
 import { transparentizePalettes } from './palette_config';
 
 export interface GaugeVisualizationPluginSetupPlugins {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts
index fe468dd82e3cf..f144a2f9f87f4 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { transparentizePalettes } from './palette_config';
-import { chartPluginMock } from '../../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 const paletteServiceMock = chartPluginMock.createPaletteRegistry();
 
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx
index 877e7b0bdcf41..9588262a6b992 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx
@@ -14,7 +14,7 @@ import {
 } from '@kbn/coloring';
 
 import Color from 'color';
-import { defaultPaletteParams as sharedDefaultParams } from '../../shared_components/';
+import { defaultPaletteParams as sharedDefaultParams } from '../../shared_components';
 
 export const DEFAULT_PALETTE_NAME = 'gray';
 export const DEFAULT_COLOR_STEPS = 3;
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts
index 630978f69a1dd..0b974cd3de8f3 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts
@@ -7,7 +7,7 @@
 
 import { getSuggestions } from './suggestions';
 import { layerTypes } from '../../../common';
-import { GaugeShapes } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import { GaugeShapes } from '@kbn/expression-gauge-plugin/common';
 import { GaugeVisualizationState } from './constants';
 
 const metricColumn = {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts
index d99d585b4c447..46688d3021fe6 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { GaugeShape } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { GaugeShape } from '@kbn/expression-gauge-plugin/common';
 import {
   GaugeShapes,
   GaugeTicksPositions,
   GaugeLabelMajorModes,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+} from '@kbn/expression-gauge-plugin/common';
 import type { TableSuggestion, Visualization } from '../../types';
 import { layerTypes } from '../../../common';
 import { GaugeVisualizationState } from './constants';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx
index 1c3a5fdea5593..d203cc86f5de8 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx
@@ -7,7 +7,7 @@
 
 import React, { FormEvent } from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { ToolbarButton } from 'src/plugins/kibana_react/public';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { FramePublicAPI, VisualizationToolbarProps } from '../../../types';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
index efa6e49a2bdbd..81f4c8f6d1170 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
@@ -8,7 +8,7 @@
 import React, { memo, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { GaugeLabelMajorMode } from '../../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { GaugeLabelMajorMode } from '@kbn/expression-gauge-plugin/common';
 import type { VisualizationToolbarProps } from '../../../types';
 import { ToolbarPopover, useDebouncedValue, VisLabel } from '../../../shared_components';
 import './gauge_config_panel.scss';
@@ -30,9 +30,9 @@ export const GaugeToolbar = memo((props: VisualizationToolbarProps<GaugeVisualiz
   });
 
   return (
-    <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
           <ToolbarPopover
             handleClose={() => {
               setSubtitleMode(inputValue.labelMinor ? 'custom' : 'none');
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/utils.ts b/x-pack/plugins/lens/public/visualizations/gauge/utils.ts
index 353db3bf7a43b..5c95e1205568c 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/utils.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/utils.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Accessors } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { Accessors } from '@kbn/expression-gauge-plugin/common';
 import { GaugeVisualizationState } from './constants';
 
 export const getAccessorsFromState = (state?: GaugeVisualizationState): Accessors | undefined => {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts
index 58637b95fce67..25b9aa0fc65b9 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts
@@ -9,8 +9,8 @@ import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
 import { getGaugeVisualization, isNumericDynamicMetric, isNumericMetric } from './visualization';
 import { createMockDatasource, createMockFramePublicAPI } from '../../mocks';
 import { GROUP_ID } from './constants';
-import type { DatasourcePublicAPI, OperationDescriptor } from '../../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import type { DatasourceLayers, OperationDescriptor } from '../../types';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { layerTypes } from '../../../common';
 import type { GaugeVisualizationState } from './constants';
 
@@ -455,7 +455,7 @@ describe('gauge', () => {
   });
 
   describe('#toExpression', () => {
-    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+    let datasourceLayers: DatasourceLayers;
     beforeEach(() => {
       const mockDatasource = createMockDatasource('testDatasource');
       mockDatasource.publicAPIMock.getOperationForColumnId.mockReturnValue({
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx
index 72d0db1c851b1..74f7d518e1166 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx
@@ -10,13 +10,10 @@ import { render } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { Ast } from '@kbn/interpreter';
-import { DatatableRow } from 'src/plugins/expressions';
+import { DatatableRow } from '@kbn/expressions-plugin';
 import { PaletteRegistry, CustomPaletteParams, CUSTOM_PALETTE } from '@kbn/coloring';
-import type { GaugeArguments } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
-import {
-  GaugeShapes,
-  EXPRESSION_GAUGE_NAME,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { GaugeArguments } from '@kbn/expression-gauge-plugin/common';
+import { GaugeShapes, EXPRESSION_GAUGE_NAME } from '@kbn/expression-gauge-plugin/common';
 import {
   getGoalValue,
   getMaxValue,
@@ -24,8 +21,8 @@ import {
   getValueFromAccessor,
   VerticalBulletIcon,
   HorizontalBulletIcon,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/public';
-import type { DatasourcePublicAPI, OperationMetadata, Visualization } from '../../types';
+} from '@kbn/expression-gauge-plugin/public';
+import type { DatasourceLayers, OperationMetadata, Visualization } from '../../types';
 import { getSuggestions } from './suggestions';
 import {
   GROUP_ID,
@@ -115,7 +112,7 @@ const checkInvalidConfiguration = (row?: DatatableRow, state?: GaugeVisualizatio
 const toExpression = (
   paletteService: PaletteRegistry,
   state: GaugeVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   attributes?: Partial<Omit<GaugeArguments, keyof GaugeExpressionState | 'ariaLabel'>>
 ): Ast | null => {
   const datasource = datasourceLayers[state.layerId];
diff --git a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts
index fbf13db7fa7a5..1e02f929e90ce 100644
--- a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts
@@ -8,13 +8,17 @@
 import { FramePublicAPI } from '../../types';
 import { getStaticDate } from './helpers';
 
+const frame = {
+  datasourceLayers: {},
+  dateRange: { fromDate: '2022-02-01T00:00:00.000Z', toDate: '2022-04-20T00:00:00.000Z' },
+};
+
 describe('annotations helpers', () => {
   describe('getStaticDate', () => {
-    it('should return `now` value on when nothing is configured', () => {
-      jest.spyOn(Date, 'now').mockReturnValue(new Date('2022-04-08T11:01:58.135Z').valueOf());
-      expect(getStaticDate([], undefined)).toBe('2022-04-08T11:01:58.135Z');
+    it('should return the middle of the date range on when nothing is configured', () => {
+      expect(getStaticDate([], frame)).toBe('2022-03-12T00:00:00.000Z');
     });
-    it('should return `now` value on when there is no active data', () => {
+    it('should return the middle of the date range value on when there is no active data', () => {
       expect(
         getStaticDate(
           [
@@ -26,9 +30,9 @@ describe('annotations helpers', () => {
               xAccessor: 'a',
             },
           ],
-          undefined
+          frame
         )
-      ).toBe('2022-04-08T11:01:58.135Z');
+      ).toBe('2022-03-12T00:00:00.000Z');
     });
 
     it('should return timestamp value for single active data point', () => {
@@ -66,11 +70,57 @@ describe('annotations helpers', () => {
               xAccessor: 'a',
             },
           ],
-          activeData as FramePublicAPI['activeData']
+          {
+            ...frame,
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
         )
       ).toBe('2022-02-27T23:00:00.000Z');
     });
 
+    it('should return the middle of the date range value on when there the active data lies outside of the timerange (auto apply off case)', () => {
+      const activeData = {
+        layerId: {
+          type: 'datatable',
+          rows: [
+            {
+              a: 1642673600000, // smaller than dateRange.fromDate
+              b: 1050,
+            },
+          ],
+          columns: [
+            {
+              id: 'a',
+              name: 'order_date per week',
+              meta: { type: 'date' },
+            },
+            {
+              id: 'b',
+              name: 'Count of records',
+              meta: { type: 'number', params: { id: 'number' } },
+            },
+          ],
+        },
+      };
+      expect(
+        getStaticDate(
+          [
+            {
+              layerId: 'layerId',
+              accessors: ['b'],
+              seriesType: 'bar_stacked',
+              layerType: 'data',
+              xAccessor: 'a',
+            },
+          ],
+          {
+            ...frame,
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
+        )
+      ).toBe('2022-03-12T00:00:00.000Z');
+    });
+
     it('should correctly calculate middle value for active data', () => {
       const activeData = {
         layerId: {
@@ -118,7 +168,10 @@ describe('annotations helpers', () => {
               xAccessor: 'a',
             },
           ],
-          activeData as FramePublicAPI['activeData']
+          {
+            ...frame,
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
         )
       ).toBe('2022-03-26T05:00:00.000Z');
     });
@@ -202,7 +255,11 @@ describe('annotations helpers', () => {
               xAccessor: 'd',
             },
           ],
-          activeData as FramePublicAPI['activeData']
+          {
+            ...frame,
+            dateRange: { fromDate: '2020-02-01T00:00:00.000Z', toDate: '2022-09-20T00:00:00.000Z' },
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
         )
       ).toBe('2020-08-24T12:06:40.000Z');
     });
diff --git a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx
index c7370c17c6fec..fe120dc71b17a 100644
--- a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx
@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
+import { defaultAnnotationColor } from '@kbn/event-annotation-plugin/public';
 import { layerTypes } from '../../../common';
 import type { FramePublicAPI, Visualization } from '../../types';
 import { isHorizontalChart } from '../state_helpers';
@@ -20,7 +21,6 @@ import {
 } from '../visualization_helpers';
 import { LensIconChartBarAnnotations } from '../../assets/chart_bar_annotations';
 import { generateId } from '../../id_generator';
-import { defaultAnnotationColor } from '../../../../../../src/plugins/event_annotation/public';
 
 const MAX_DATE = 8640000000000000;
 const MIN_DATE = -8640000000000000;
@@ -29,13 +29,14 @@ export const defaultAnnotationLabel = i18n.translate('xpack.lens.xyChart.default
   defaultMessage: 'Event',
 });
 
-export function getStaticDate(
-  dataLayers: XYDataLayerConfig[],
-  activeData: FramePublicAPI['activeData']
-) {
-  const fallbackValue = moment().toISOString();
-
+export function getStaticDate(dataLayers: XYDataLayerConfig[], frame: FramePublicAPI) {
   const dataLayersId = dataLayers.map(({ layerId }) => layerId);
+  const { activeData, dateRange } = frame;
+
+  const dateRangeMinValue = moment(dateRange.fromDate).valueOf();
+  const dateRangeMaxValue = moment(dateRange.toDate).valueOf();
+  const fallbackValue = moment((dateRangeMinValue + dateRangeMaxValue) / 2).toISOString();
+
   if (
     !activeData ||
     Object.entries(activeData)
@@ -57,7 +58,11 @@ export function getStaticDate(
     return lastTimestamp && lastTimestamp > acc ? lastTimestamp : acc;
   }, MIN_DATE);
   const middleDate = (minDate + maxDate) / 2;
-  return moment(middleDate).toISOString();
+
+  if (dateRangeMinValue < middleDate && dateRangeMaxValue > middleDate) {
+    return moment(middleDate).toISOString();
+  }
+  return fallbackValue;
 }
 
 export const getAnnotationsSupportedLayer = (
@@ -124,7 +129,7 @@ export const setAnnotationsDimension: Visualization<XYState>['setDimension'] = (
       label: defaultAnnotationLabel,
       key: {
         type: 'point_in_time',
-        timestamp: getStaticDate(getDataLayers(prevState.layers), frame?.activeData),
+        timestamp: getStaticDate(getDataLayers(prevState.layers), frame),
       },
       icon: 'triangle',
       ...previousConfig,
@@ -167,7 +172,7 @@ export const getAnnotationsConfiguration = ({
   layer,
 }: {
   state: XYState;
-  frame: FramePublicAPI;
+  frame: Pick<FramePublicAPI, 'datasourceLayers'>;
   layer: XYAnnotationLayerConfig;
 }) => {
   const dataLayers = getDataLayers(state.layers);
diff --git a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts
index a733f83b46338..db8ae7122c538 100644
--- a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { DataLayerConfigResult } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { DataLayerConfigResult } from '@kbn/expression-xy-plugin/common';
 import { layerTypes } from '../../common';
-import { Datatable } from '../../../../../src/plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { getAxesConfiguration } from './axes_configuration';
 
 describe('axes_configuration', () => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts
index b9b2c2ae86e42..786c184e20dfa 100644
--- a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts
@@ -5,13 +5,10 @@
  * 2.0.
  */
 
+import { AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { FormatFactory } from '../../common';
-import { AxisExtentConfig } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { Datatable } from '../../../../../src/plugins/expressions/public';
-import type {
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../src/plugins/field_formats/common';
 import { XYDataLayerConfig } from './types';
 
 interface FormattedMetric {
diff --git a/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts b/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
index 462551e168aa6..e927266a8385c 100644
--- a/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
@@ -7,7 +7,7 @@
 
 import { uniq, mapValues } from 'lodash';
 import type { PaletteOutput, PaletteRegistry } from '@kbn/coloring';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { euiLightVars } from '@kbn/ui-theme';
 import type { AccessorConfig, FramePublicAPI } from '../types';
 import { getColumnToLabelMap } from './state_helpers';
diff --git a/x-pack/plugins/lens/public/xy_visualization/index.ts b/x-pack/plugins/lens/public/xy_visualization/index.ts
index daae9a5ef56ff..f9f1558468cfc 100644
--- a/x-pack/plugins/lens/public/xy_visualization/index.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/index.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import { EventAnnotationPluginSetup } from '../../../../../src/plugins/event_annotation/public';
-import type { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
+import type { CoreSetup } from '@kbn/core/public';
+import { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import type { EditorFrameSetup } from '../types';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import type { LensPluginStartDependencies } from '../plugin';
 import type { FormatFactory } from '../../common';
-import { LEGACY_TIME_AXIS } from '../../../../../src/plugins/charts/common';
 
 export interface XyVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
diff --git a/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx
index af679d1354792..c7e615bb29e12 100644
--- a/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx
@@ -7,13 +7,10 @@
 
 import { groupBy, partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import type { YAxisMode, YConfig } from '@kbn/expression-xy-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { layerTypes } from '../../common';
-import type {
-  YAxisMode,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { Datatable } from '../../../../../src/plugins/expressions/public';
-import type { DatasourcePublicAPI, FramePublicAPI, Visualization } from '../types';
+import type { DatasourceLayers, FramePublicAPI, Visualization } from '../types';
 import { groupAxesByType } from './axes_configuration';
 import { isHorizontalChart, isPercentageSeries, isStackedChart } from './state_helpers';
 import type { XYState, XYDataLayerConfig, XYReferenceLineLayerConfig } from './types';
@@ -40,7 +37,7 @@ export interface ReferenceLineBase {
 export function getGroupsToShow<T extends ReferenceLineBase & { config?: YConfig[] }>(
   referenceLayers: T[],
   state: XYState | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   tables: Record<string, Datatable> | undefined
 ): Array<T & { valid: boolean }> {
   if (!state) {
@@ -60,7 +57,7 @@ export function getGroupsToShow<T extends ReferenceLineBase & { config?: YConfig
 export function getGroupsRelatedToData<T extends ReferenceLineBase>(
   referenceLayers: T[],
   state: XYState | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   tables: Record<string, Datatable> | undefined
 ): T[] {
   if (!state) {
@@ -75,7 +72,7 @@ export function getGroupsRelatedToData<T extends ReferenceLineBase>(
  */
 export function getGroupsAvailableInData(
   dataLayers: XYDataLayerConfig[],
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   tables: Record<string, Datatable> | undefined
 ) {
   const hasNumberHistogram = dataLayers.some(
@@ -384,7 +381,7 @@ export const getReferenceConfiguration = ({
   sortedAccessors,
 }: {
   state: XYState;
-  frame: FramePublicAPI;
+  frame: Pick<FramePublicAPI, 'activeData' | 'datasourceLayers'>;
   layer: XYReferenceLineLayerConfig;
   sortedAccessors: string[];
 }) => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts b/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
index d3c8efae33836..06ea897afa1e7 100644
--- a/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
@@ -6,12 +6,8 @@
  */
 
 import { EuiIconType } from '@elastic/eui/src/components/icon/icon';
+import type { SeriesType, YConfig, ValidLayer } from '@kbn/expression-xy-plugin/common';
 import type { FramePublicAPI, DatasourcePublicAPI } from '../types';
-import type {
-  SeriesType,
-  YConfig,
-  ValidLayer,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import {
   visualizationTypes,
   XYLayerConfig,
diff --git a/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts b/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts
index c04781198c78f..7cd9a43540c0a 100644
--- a/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts
@@ -7,15 +7,15 @@
 
 import { Ast } from '@kbn/interpreter';
 import { Position } from '@elastic/charts';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { getXyVisualization } from './xy_visualization';
 import { OperationDescriptor } from '../types';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { layerTypes } from '../../common';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { eventAnnotationServiceMock } from '../../../../../src/plugins/event_annotation/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
 import { defaultReferenceLineColor } from './color_assignment';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 describe('#toExpression', () => {
   const xyVisualization = getXyVisualization({
diff --git a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
index 7f1bd96b50044..eeb56bd7ee115 100644
--- a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
@@ -9,19 +9,16 @@ import { Ast } from '@kbn/interpreter';
 import { ScaleType } from '@elastic/charts';
 import type { PaletteRegistry } from '@kbn/coloring';
 
-import { EventAnnotationServiceType } from 'src/plugins/event_annotation/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import type { ValidLayer, YConfig } from '@kbn/expression-xy-plugin/common';
 import {
   State,
   XYDataLayerConfig,
   XYReferenceLineLayerConfig,
   XYAnnotationLayerConfig,
 } from './types';
-import { OperationMetadata, DatasourcePublicAPI } from '../types';
+import { OperationMetadata, DatasourcePublicAPI, DatasourceLayers } from '../types';
 import { getColumnToLabelMap } from './state_helpers';
-import type {
-  ValidLayer,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { hasIcon } from './xy_config_panel/shared/icon_select';
 import { defaultReferenceLineColor } from './color_assignment';
 import { getDefaultVisualValuesForLayer } from '../shared_components/datasource_default_values';
@@ -50,7 +47,7 @@ export const getSortedAccessors = (
 
 export const toExpression = (
   state: State,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Partial<{ title: string; description: string }> = {},
   eventAnnotationService: EventAnnotationServiceType
@@ -107,7 +104,7 @@ const simplifiedLayerExpression = {
 
 export function toPreviewExpression(
   state: State,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   eventAnnotationService: EventAnnotationServiceType
 ) {
@@ -158,7 +155,7 @@ export function getScaleType(metadata: OperationMetadata | null, defaultScale: S
 export const buildExpression = (
   state: State,
   metadata: Record<string, Record<string, OperationMetadata | null>>,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Partial<{ title: string; description: string }> = {},
   eventAnnotationService: EventAnnotationServiceType
diff --git a/x-pack/plugins/lens/public/xy_visualization/types.ts b/x-pack/plugins/lens/public/xy_visualization/types.ts
index 5c8e9c73a66bc..276e338807a35 100644
--- a/x-pack/plugins/lens/public/xy_visualization/types.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/types.ts
@@ -7,6 +7,18 @@
 
 import { i18n } from '@kbn/i18n';
 import type { PaletteOutput } from '@kbn/coloring';
+import type {
+  SeriesType,
+  LegendConfig,
+  AxisExtentConfig,
+  XYCurveType,
+  AxesSettingsConfig,
+  FittingFunction,
+  LabelsOrientationConfig,
+  EndValue,
+  YConfig,
+} from '@kbn/expression-xy-plugin/common';
+import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common';
 import { LensIconChartArea } from '../assets/chart_area';
 import { LensIconChartAreaStacked } from '../assets/chart_area_stacked';
 import { LensIconChartAreaPercentage } from '../assets/chart_area_percentage';
@@ -19,18 +31,6 @@ import { LensIconChartBarHorizontalPercentage } from '../assets/chart_bar_horizo
 import { LensIconChartLine } from '../assets/chart_line';
 
 import type { VisualizationType, Suggestion } from '../types';
-import type {
-  SeriesType,
-  LegendConfig,
-  AxisExtentConfig,
-  XYCurveType,
-  AxesSettingsConfig,
-  FittingFunction,
-  LabelsOrientationConfig,
-  EndValue,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { EventAnnotationConfig } from '../../../../../src/plugins/event_annotation/common';
 import type { ValueLabelConfig } from '../../common/types';
 
 export interface XYDataLayerConfig {
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
index 18cd16c17b365..e1c63e4bb54d9 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
@@ -16,17 +16,17 @@ import type {
   XYDataLayerConfig,
   XYReferenceLineLayerConfig,
 } from './types';
-import type { SeriesType } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { SeriesType } from '@kbn/expression-xy-plugin/common';
 import { layerTypes } from '../../common';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { LensIconChartBar } from '../assets/chart_bar';
-import type { VisualizeEditorLayersContext } from '../../../../../src/plugins/visualizations/public';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { Datatable } from 'src/plugins/expressions';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
-import { eventAnnotationServiceMock } from 'src/plugins/event_annotation/public/mocks';
-import { EventAnnotationConfig } from 'src/plugins/event_annotation/common';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { Datatable } from '@kbn/expressions-plugin';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
+import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common';
 
 const exampleAnnotation: EventAnnotationConfig = {
   id: 'an1',
@@ -332,16 +332,18 @@ describe('xy_visualization', () => {
         { columnId: 'c', fields: [] },
       ]);
 
-      frame.datasourceLayers = {
-        first: mockDatasource.publicAPIMock,
-      };
-
-      frame.activeData = {
-        first: {
-          type: 'datatable',
-          rows: [],
-          columns: [],
+      frame = {
+        datasourceLayers: {
+          first: mockDatasource.publicAPIMock,
+        },
+        activeData: {
+          first: {
+            type: 'datatable',
+            rows: [],
+            columns: [],
+          },
         },
+        dateRange: { fromDate: '2022-04-10T00:00:00.000Z', toDate: '2022-04-20T00:00:00.000Z' },
       };
     });
 
@@ -436,7 +438,6 @@ describe('xy_visualization', () => {
 
     describe('annotations', () => {
       it('should add a dimension to a annotation layer', () => {
-        jest.spyOn(Date, 'now').mockReturnValue(new Date('2022-04-18T11:01:58.135Z').valueOf());
         expect(
           xyVisualization.setDimension({
             frame,
@@ -463,7 +464,7 @@ describe('xy_visualization', () => {
               icon: 'triangle',
               id: 'newCol',
               key: {
-                timestamp: '2022-04-18T11:01:58.135Z',
+                timestamp: '2022-04-15T00:00:00.000Z',
                 type: 'point_in_time',
               },
               label: 'Event',
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
index d8fae2657db23..d67adb3b860e3 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
@@ -11,22 +11,17 @@ import { Position } from '@elastic/charts';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { ThemeServiceStart } from 'kibana/public';
-import { EventAnnotationServiceType } from '../../../../../src/plugins/event_annotation/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { FillStyle, SeriesType, YAxisMode, YConfig } from '@kbn/expression-xy-plugin/common';
 import { getSuggestions } from './xy_suggestions';
 import { XyToolbar } from './xy_config_panel';
 import { DimensionEditor } from './xy_config_panel/dimension_editor';
 import { LayerHeader } from './xy_config_panel/layer_header';
 import type { Visualization, AccessorConfig, FramePublicAPI } from '../types';
-import {
-  FillStyle,
-  SeriesType,
-  YAxisMode,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { State, visualizationTypes, XYSuggestion, XYLayerConfig, XYDataLayerConfig } from './types';
 import { layerTypes } from '../../common';
 import { isHorizontalChart } from './state_helpers';
@@ -663,7 +658,7 @@ const getMappedAccessors = ({
   layer,
 }: {
   accessors: string[];
-  frame: FramePublicAPI;
+  frame: Pick<FramePublicAPI, 'activeData' | 'datasourceLayers'>;
   paletteService: PaletteRegistry;
   fieldFormats: FieldFormatsStart;
   state: XYState;
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx
index d680494ef8315..d390d081258a5 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx
@@ -7,7 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
-import { DatasourcePublicAPI, OperationMetadata, VisualizationType } from '../types';
+import { SeriesType } from '@kbn/expression-xy-plugin/common';
+import { DatasourceLayers, OperationMetadata, VisualizationType } from '../types';
 import {
   State,
   visualizationTypes,
@@ -18,7 +19,6 @@ import {
   XYReferenceLineLayerConfig,
 } from './types';
 import { isHorizontalChart } from './state_helpers';
-import { SeriesType } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { layerTypes } from '..';
 import { LensIconChartBarHorizontal } from '../assets/chart_bar_horizontal';
 import { LensIconChartMixedXy } from '../assets/chart_mixed_xy';
@@ -63,10 +63,7 @@ export function getAxisName(
 // * 2 or more layers
 // * at least one with date histogram
 // * at least one with interval function
-export function checkXAccessorCompatibility(
-  state: XYState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>
-) {
+export function checkXAccessorCompatibility(state: XYState, datasourceLayers: DatasourceLayers) {
   const dataLayers = getDataLayers(state.layers);
   const errors = [];
   const hasDateHistogramSet = dataLayers.some(
@@ -116,7 +113,7 @@ export function checkXAccessorCompatibility(
 export function checkScaleOperation(
   scaleType: 'ordinal' | 'interval' | 'ratio',
   dataType: 'date' | 'number' | 'string' | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>
+  datasourceLayers: DatasourceLayers
 ) {
   return (layer: XYDataLayerConfig) => {
     const datasourceAPI = datasourceLayers[layer.layerId];
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx
index 647626b9e6282..6435f4c7ba2b8 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiDatePicker, EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
 import moment from 'moment';
-import { EventAnnotationConfig } from 'src/plugins/event_annotation/common/types';
+import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common/types';
 import type { VisualizationDimensionEditorProps } from '../../../types';
 import { State, XYState, XYAnnotationLayerConfig } from '../../types';
 import { FormatFactory } from '../../../../common';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx
index 87ccf41e91143..b5c45cd517432 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx
@@ -89,11 +89,9 @@ describe('Axes Settings', () => {
     expect(props.setOrientation).toHaveBeenCalled();
   });
 
-  it('should disable the orientation group if the tickLabels are set to not visible', () => {
+  it('should hide the orientation group if the tickLabels are set to not visible', () => {
     const component = shallow(<AxisSettingsPopover {...props} areTickLabelsVisible={false} />);
-    expect(
-      component.find('[data-test-subj="lnsXY_axisOrientation_groups"]').prop('isDisabled')
-    ).toEqual(true);
+    expect(component.exists('[data-test-subj="lnsXY_axisOrientation_groups"]')).toEqual(false);
   });
 
   it('hides the endzone visibility flag if no setter is passed in', () => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx
index 340a9211fcdee..28faaf6a9e0b4 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx
@@ -17,23 +17,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
-import {
-  AxesSettingsConfig,
-  AxisExtentConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { AxesSettingsConfig, AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
+import { ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { XYLayerConfig } from '../types';
-import {
-  ToolbarPopover,
-  useDebouncedValue,
-  TooltipWrapper,
-  AxisTitleSettings,
-} from '../../shared_components';
+import { ToolbarPopover, useDebouncedValue, AxisTitleSettings } from '../../shared_components';
 import { isHorizontalChart } from '../state_helpers';
 import { EuiIconAxisBottom } from '../../assets/axis_bottom';
 import { EuiIconAxisLeft } from '../../assets/axis_left';
 import { EuiIconAxisRight } from '../../assets/axis_right';
 import { EuiIconAxisTop } from '../../assets/axis_top';
-import { ToolbarButtonProps } from '../../../../../../src/plugins/kibana_react/public';
 import { validateExtent } from '../axes_configuration';
 
 import './axis_settings_popover.scss';
@@ -312,20 +304,13 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
           showLabel={false}
         />
       </EuiFormRow>
-      <EuiFormRow
-        display="columnCompressed"
-        fullWidth
-        isDisabled={useMultilayerTimeAxis}
-        label={i18n.translate('xpack.lens.xyChart.axisOrientation.label', {
-          defaultMessage: 'Orientation',
-        })}
-      >
-        <TooltipWrapper
-          tooltipContent={i18n.translate('xpack.lens.xyChart.axisOrientationMultilayer.disabled', {
-            defaultMessage: 'These options can be configured only with non-time-based axes',
+      {!useMultilayerTimeAxis && areTickLabelsVisible && (
+        <EuiFormRow
+          display="columnCompressed"
+          fullWidth
+          label={i18n.translate('xpack.lens.xyChart.axisOrientation.label', {
+            defaultMessage: 'Orientation',
           })}
-          condition={Boolean(useMultilayerTimeAxis)}
-          display="block"
         >
           <EuiButtonGroup
             isFullWidth
@@ -334,7 +319,6 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
             })}
             data-test-subj="lnsXY_axisOrientation_groups"
             name="axisOrientation"
-            isDisabled={!areTickLabelsVisible || Boolean(useMultilayerTimeAxis)}
             buttonSize="compressed"
             options={axisOrientationOptions}
             idSelected={axisOrientationOptions.find(({ value }) => value === orientation)!.id}
@@ -345,8 +329,8 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
               setOrientation(axis, newOrientation);
             }}
           />
-        </TooltipWrapper>
-      </EuiFormRow>
+        </EuiFormRow>
+      )}
       {setEndzoneVisibility && (
         <EuiFormRow
           display="columnCompressedSwitch"
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx
index 2c4d060e55a07..37ee50f527d43 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx
@@ -9,7 +9,7 @@ import React, { useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiColorPicker, EuiColorPickerProps, EuiToolTip, EuiIcon } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { defaultAnnotationColor } from '../../../../../../src/plugins/event_annotation/public';
+import { defaultAnnotationColor } from '@kbn/event-annotation-plugin/public';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { State, XYDataLayerConfig } from '../types';
 import { FormatFactory } from '../../../common';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx
index 4bb90882c5859..39d08e4c710bd 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx
@@ -9,13 +9,10 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow, htmlIdGenerator } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
+import { YAxisMode, YConfig } from '@kbn/expression-xy-plugin/common';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { State, XYState, XYDataLayerConfig } from '../types';
 import { FormatFactory } from '../../../common';
-import {
-  YAxisMode,
-  YConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { isHorizontalChart } from '../state_helpers';
 import { ColorPicker } from './color_picker';
 import { PalettePicker, useDebouncedValue } from '../../shared_components';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx
index 42cf49c04fbd8..b61f4694f8a91 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx
@@ -9,12 +9,9 @@ import React, { memo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Position, ScaleType, VerticalAlignment, HorizontalAlignment } from '@elastic/charts';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { AxesSettingsConfig, AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
 import type { VisualizationToolbarProps, FramePublicAPI } from '../../types';
 import { State, XYState } from '../types';
-import {
-  AxesSettingsConfig,
-  AxisExtentConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { isHorizontalChart } from '../state_helpers';
 import { LegendSettingsPopover } from '../../shared_components';
 import { AxisSettingsPopover } from './axis_settings_popover';
@@ -297,14 +294,15 @@ export const XyToolbar = memo(function XyToolbar(
   ).truncateText;
 
   return (
-    <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
           <VisualOptionsPopover
             state={state}
             setState={setState}
             datasourceLayers={frame.datasourceLayers}
           />
+
           <LegendSettingsPopover
             legendOptions={legendOptions}
             mode={legendMode}
@@ -410,8 +408,9 @@ export const XyToolbar = memo(function XyToolbar(
           />
         </EuiFlexGroup>
       </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
           <TooltipWrapper
             tooltipContent={
               shouldRotate
@@ -449,6 +448,7 @@ export const XyToolbar = memo(function XyToolbar(
               hasPercentageAxis={hasPercentageAxis(axisGroups, 'left', state)}
             />
           </TooltipWrapper>
+
           <AxisSettingsPopover
             axis="x"
             layers={state?.layers}
@@ -470,6 +470,7 @@ export const XyToolbar = memo(function XyToolbar(
               isTimeHistogramModeEnabled && !useLegacyTimeAxis && !shouldRotate
             }
           />
+
           <TooltipWrapper
             tooltipContent={
               shouldRotate
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx
index 2aabf255c5993..367785da2d6b1 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx
@@ -8,13 +8,13 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiIcon, EuiPopover, EuiSelectable, EuiText, EuiPopoverTitle } from '@elastic/eui';
+import { SeriesType } from '@kbn/expression-xy-plugin/common';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import type { VisualizationLayerWidgetProps, VisualizationType } from '../../types';
 import { State, visualizationTypes, XYDataLayerConfig } from '../types';
-import { SeriesType } from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { isHorizontalChart, isHorizontalSeries } from '../state_helpers';
 import { trackUiEvent } from '../../lens_ui_telemetry';
 import { StaticHeader } from '../../shared_components';
-import { ToolbarButton } from '../../../../../../src/plugins/kibana_react/public';
 import { LensIconChartBarReferenceLine } from '../../assets/chart_bar_reference_line';
 import { LensIconChartBarAnnotations } from '../../assets/chart_bar_annotations';
 import { updateLayer } from '.';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx
index 2e320cc3da0a1..d5a3e8ffd7a46 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx
@@ -9,13 +9,10 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
+import { FillStyle, YConfig } from '@kbn/expression-xy-plugin/common';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { State, XYState, XYReferenceLineLayerConfig } from '../types';
 import { FormatFactory } from '../../../common';
-import {
-  FillStyle,
-  YConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 
 import { ColorPicker } from './color_picker';
 import { updateLayer } from '.';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx
index 8ae86c2fd5b46..af3c5a2a297cf 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx
@@ -14,7 +14,7 @@ import {
   EuiFlexItem,
   EuiFormRow,
 } from '@elastic/eui';
-import { LineStyle } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { LineStyle } from '@kbn/expression-xy-plugin/common';
 
 import { idPrefix } from '../dimension_editor';
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
index 26723abc55fad..b780737877388 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
@@ -8,10 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
-import {
-  IconPosition,
-  YAxisMode,
-} from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { IconPosition, YAxisMode } from '@kbn/expression-xy-plugin/common';
 
 import { TooltipWrapper } from '../../../shared_components';
 import { hasIcon, IconSelect, IconSet } from './icon_select';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts
index 1ecd260b04a30..38168ddad08a5 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { EndValue } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { EndValue } from '@kbn/expression-xy-plugin/common';
 
 export const endValueDefinitions: Array<{ id: EndValue } & Record<string, string>> = [
   {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts
index a357f7c2f92ca..c2286a942baca 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { FittingFunction } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { FittingFunction } from '@kbn/expression-xy-plugin/common';
 
 export const fittingFunctionDefinitions: Array<{ id: FittingFunction } & Record<string, string>> = [
   {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
index 00903e1107c91..d4edb960e70f7 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
@@ -7,13 +7,13 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { ValidLayer } from '@kbn/expression-xy-plugin/common';
 import { ToolbarPopover, TooltipWrapper, ValueLabelsSettings } from '../../../shared_components';
 import { MissingValuesOptions } from './missing_values_option';
 import { LineCurveOption } from './line_curve_option';
 import { FillOpacityOption } from './fill_opacity_option';
 import { XYState } from '../../types';
 import { hasHistogramSeries } from '../../state_helpers';
-import { ValidLayer } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import type { FramePublicAPI } from '../../../types';
 import { getDataLayers } from '../../visualization_helpers';
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx
index 9e69c427d99fe..127444f1496bc 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiSwitch } from '@elastic/eui';
-import type { XYCurveType } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { XYCurveType } from '@kbn/expression-xy-plugin/common';
 
 export interface LineCurveOptionProps {
   /**
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
index 645b740fc9dad..d5861229be5fc 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
@@ -8,12 +8,9 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiIconTip, EuiSuperSelect, EuiSwitch, EuiText } from '@elastic/eui';
+import type { FittingFunction, EndValue } from '@kbn/expression-xy-plugin/common';
 import { fittingFunctionDefinitions } from './fitting_function_definitions';
 import { endValueDefinitions } from './end_value_definitions';
-import type {
-  FittingFunction,
-  EndValue,
-} from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
 
 export interface MissingValuesOptionProps {
   fittingFunction?: FittingFunction;
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx
index 953828db48a72..ad643aa34ac50 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx
@@ -15,7 +15,7 @@ import { FramePublicAPI } from '../../types';
 import { State, XYState, XYDataLayerConfig } from '../types';
 import { Position } from '@elastic/charts';
 import { createMockFramePublicAPI, createMockDatasource } from '../../mocks';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EuiColorPicker } from '@elastic/eui';
 import { layerTypes } from '../../../common';
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
index 03e9830b32b31..f309164b7fc4e 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
@@ -16,12 +16,12 @@ import {
 } from './types';
 import { generateId } from '../id_generator';
 import { getXyVisualization } from './xy_visualization';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { eventAnnotationServiceMock } from '../../../../../src/plugins/event_annotation/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
 import type { PaletteOutput } from '@kbn/coloring';
 import { layerTypes } from '../../common';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../id_generator');
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
index 671e225ef894b..912d5adf53c8f 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { partition } from 'lodash';
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
+import type { SeriesType } from '@kbn/expression-xy-plugin/common';
 import {
   SuggestionRequest,
   VisualizationSuggestion,
@@ -17,7 +18,6 @@ import {
   TableChangeType,
 } from '../types';
 import { State, XYState, visualizationTypes, XYLayerConfig, XYDataLayerConfig } from './types';
-import type { SeriesType } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { layerTypes } from '../../common';
 import { getIconForSeries } from './state_helpers';
 import { getDataLayers, isDataLayer } from './visualization_helpers';
diff --git a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts
index 655291ec357f4..3bd45dfe873f3 100644
--- a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts
+++ b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts
@@ -9,7 +9,7 @@ import semverGte from 'semver/functions/gte';
 import { makeLensEmbeddableFactory } from './make_lens_embeddable_factory';
 import { getAllMigrations } from '../migrations/saved_object_migrations';
 import { Filter } from '@kbn/es-query';
-import { GetMigrationFunctionObjectFn } from 'src/plugins/kibana_utils/common';
+import { GetMigrationFunctionObjectFn } from '@kbn/kibana-utils-plugin/common';
 
 describe('embeddable migrations', () => {
   test('should have all saved object migrations versions (>7.13.0)', () => {
diff --git a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
index 7b17dc9977e6d..0f996e428ed2c 100644
--- a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
+++ b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
@@ -5,15 +5,16 @@
  * 2.0.
  */
 
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import type { SerializableRecord } from '@kbn/utility-types';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
-} from '../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import { DOC_TYPE } from '../../common';
 import {
   commonEnhanceTableRowHeight,
+  commonLockOldMetricVisSettings,
   commonMakeReversePaletteAsCustom,
   commonRemoveTimezoneDateHistogramParam,
   commonRenameFilterReferences,
@@ -103,6 +104,14 @@ export const makeLensEmbeddableFactory =
                 attributes: migratedLensState,
               } as unknown as SerializableRecord;
             },
+            '8.3.0': (state) => {
+              const lensState = state as unknown as { attributes: LensDocShape810<VisState810> };
+              const migratedLensState = commonLockOldMetricVisSettings(lensState.attributes);
+              return {
+                ...lensState,
+                attributes: migratedLensState,
+              } as unknown as SerializableRecord;
+            },
           }),
           getLensCustomVisualizationMigrations(customVisualizationMigrations)
         ),
diff --git a/x-pack/plugins/lens/server/expressions/expressions.ts b/x-pack/plugins/lens/server/expressions/expressions.ts
index 9b23c1741556a..b124a9cbaf33b 100644
--- a/x-pack/plugins/lens/server/expressions/expressions.ts
+++ b/x-pack/plugins/lens/server/expressions/expressions.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/server';
+import type { CoreSetup } from '@kbn/core/server';
+import type { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import {
   counterRate,
   formatColumn,
@@ -17,7 +18,6 @@ import {
 import { getFormatFactory, getTimeZoneFactory } from './utils';
 
 import type { PluginStartContract } from '../plugin';
-import type { ExpressionsServerSetup } from '../../../../../src/plugins/expressions/server';
 
 export const setupExpressions = (
   core: CoreSetup<PluginStartContract>,
diff --git a/x-pack/plugins/lens/server/expressions/utils.ts b/x-pack/plugins/lens/server/expressions/utils.ts
index 40bee0386cc95..c7683ffa90fbb 100644
--- a/x-pack/plugins/lens/server/expressions/utils.ts
+++ b/x-pack/plugins/lens/server/expressions/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/server';
-import { ExecutionContext } from '../../../../../src/plugins/expressions';
+import { CoreSetup, CoreStart } from '@kbn/core/server';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 import { PluginStartContract } from '../plugin';
 
 const getUiSettings = (coreStart: CoreStart, context: ExecutionContext) => {
diff --git a/x-pack/plugins/lens/server/index.ts b/x-pack/plugins/lens/server/index.ts
index a87cd3b2d5fad..d05a7b303a566 100644
--- a/x-pack/plugins/lens/server/index.ts
+++ b/x-pack/plugins/lens/server/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { LensServerPlugin } from './plugin';
 
 export type { LensServerPluginSetup } from './plugin';
diff --git a/x-pack/plugins/lens/server/migrations/common_migrations.ts b/x-pack/plugins/lens/server/migrations/common_migrations.ts
index 0a76b0a5e6b45..df0ce94abca84 100644
--- a/x-pack/plugins/lens/server/migrations/common_migrations.ts
+++ b/x-pack/plugins/lens/server/migrations/common_migrations.ts
@@ -12,7 +12,7 @@ import {
   mergeMigrationFunctionMaps,
   MigrateFunction,
   MigrateFunctionsObject,
-} from '../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import {
   LensDocShapePre712,
   OperationTypePre712,
@@ -28,7 +28,7 @@ import {
   CustomVisualizationMigrations,
   LensDocShape810,
 } from './types';
-import { DOCUMENT_FIELD_NAME, layerTypes } from '../../common';
+import { DOCUMENT_FIELD_NAME, layerTypes, MetricState } from '../../common';
 import { LensDocShape } from './saved_object_migrations';
 
 export const commonRenameOperationsForFormula = (
@@ -239,6 +239,21 @@ export const commonSetIncludeEmptyRowsDateHistogram = (
   return newAttributes;
 };
 
+export const commonLockOldMetricVisSettings = (
+  attributes: LensDocShape810
+): LensDocShape810<VisState820> => {
+  const newAttributes = cloneDeep(attributes);
+  if (newAttributes.visualizationType !== 'lnsMetric') {
+    return newAttributes;
+  }
+
+  const visState = newAttributes.state.visualization as MetricState;
+  visState.textAlign = visState.textAlign ?? 'center';
+  visState.titlePosition = visState.titlePosition ?? 'bottom';
+  visState.size = visState.size ?? 'xl';
+  return newAttributes;
+};
+
 const getApplyCustomVisualizationMigrationToLens = (id: string, migration: MigrateFunction) => {
   return (savedObject: { attributes: LensDocShape }) => {
     if (savedObject.attributes.visualizationType !== id) return savedObject;
diff --git a/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts b/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts
index 5d93e648124b1..7fb9c350a0fa5 100644
--- a/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts
+++ b/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectUnsanitizedDoc,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   LensDocShape715,
   LensDocShape810,
@@ -22,7 +22,7 @@ import {
   VisState810,
   VisState820,
 } from './types';
-import { layerTypes } from '../../common';
+import { layerTypes, MetricState } from '../../common';
 import { Filter } from '@kbn/es-query';
 
 describe('Lens migrations', () => {
@@ -2064,4 +2064,53 @@ describe('Lens migrations', () => {
       expect(layer2Columns['4'].params).toHaveProperty('includeEmptyRows', true);
     });
   });
+  describe('8.3.0 old metric visualization defaults', () => {
+    const context = { log: { warning: () => {} } } as unknown as SavedObjectMigrationContext;
+    const example = {
+      type: 'lens',
+      id: 'mocked-saved-object-id',
+      attributes: {
+        savedObjectId: '1',
+        title: 'MyRenamedOps',
+        description: '',
+        visualizationType: 'lnsMetric',
+        state: {
+          visualization: {},
+        },
+      },
+    } as unknown as SavedObjectUnsanitizedDoc<LensDocShape810>;
+
+    it('preserves current config for existing visualizations that are using the DEFAULTS', () => {
+      const result = migrations['8.3.0'](example, context) as ReturnType<
+        SavedObjectMigrationFn<LensDocShape, LensDocShape>
+      >;
+      const visState = result.attributes.state.visualization as MetricState;
+      expect(visState.textAlign).toBe('center');
+      expect(visState.titlePosition).toBe('bottom');
+      expect(visState.size).toBe('xl');
+    });
+
+    it('preserves current config for existing visualizations that are using CUSTOM settings', () => {
+      const result = migrations['8.3.0'](
+        {
+          ...example,
+          attributes: {
+            ...example.attributes,
+            state: {
+              visualization: {
+                textAlign: 'right',
+                titlePosition: 'top',
+                size: 's',
+              },
+            },
+          },
+        },
+        context
+      ) as ReturnType<SavedObjectMigrationFn<LensDocShape, LensDocShape>>;
+      const visState = result.attributes.state.visualization as MetricState;
+      expect(visState.textAlign).toBe('right');
+      expect(visState.titlePosition).toBe('top');
+      expect(visState.size).toBe('s');
+    });
+  });
 });
diff --git a/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts b/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
index 6fb8044baf8ea..f5fa4b27447ac 100644
--- a/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
+++ b/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
@@ -12,12 +12,12 @@ import {
   SavedObjectMigrationFn,
   SavedObjectReference,
   SavedObjectUnsanitizedDoc,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { Filter } from '@kbn/es-query';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
-import { mergeSavedObjectMigrationMaps } from '../../../../../src/core/server';
-import { MigrateFunctionsObject } from '../../../../../src/plugins/kibana_utils/common';
+import { Query } from '@kbn/data-plugin/public';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { PersistableFilter } from '../../common';
 import {
   LensDocShapePost712,
@@ -44,6 +44,7 @@ import {
   commonSetLastValueShowArrayValues,
   commonEnhanceTableRowHeight,
   commonSetIncludeEmptyRowsDateHistogram,
+  commonLockOldMetricVisSettings,
 } from './common_migrations';
 
 interface LensDocShapePre710<VisualizationState = unknown> {
@@ -485,6 +486,10 @@ const setIncludeEmptyRowsDateHistogram: SavedObjectMigrationFn<LensDocShape810,
   return { ...doc, attributes: commonSetIncludeEmptyRowsDateHistogram(doc.attributes) };
 };
 
+const lockOldMetricVisSettings: SavedObjectMigrationFn<LensDocShape810, LensDocShape810> = (
+  doc
+) => ({ ...doc, attributes: commonLockOldMetricVisSettings(doc.attributes) });
+
 const lensMigrations: SavedObjectMigrationMap = {
   '7.7.0': removeInvalidAccessors,
   // The order of these migrations matter, since the timefield migration relies on the aggConfigs
@@ -504,6 +509,7 @@ const lensMigrations: SavedObjectMigrationMap = {
     setIncludeEmptyRowsDateHistogram,
     enhanceTableRowHeight
   ),
+  '8.3.0': lockOldMetricVisSettings,
 };
 
 export const getAllMigrations = (
diff --git a/x-pack/plugins/lens/server/migrations/types.ts b/x-pack/plugins/lens/server/migrations/types.ts
index de4143e3d00c5..9b66f7023cdeb 100644
--- a/x-pack/plugins/lens/server/migrations/types.ts
+++ b/x-pack/plugins/lens/server/migrations/types.ts
@@ -8,8 +8,8 @@
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
 import { Filter } from '@kbn/es-query';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
-import type { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { Query } from '@kbn/data-plugin/public';
+import type { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import type { LayerType, PersistableFilter } from '../../common';
 
 export type CustomVisualizationMigrations = Record<string, () => MigrateFunctionsObject>;
diff --git a/x-pack/plugins/lens/server/plugin.tsx b/x-pack/plugins/lens/server/plugin.tsx
index b63ea52f115f8..f7b39832eca03 100644
--- a/x-pack/plugins/lens/server/plugin.tsx
+++ b/x-pack/plugins/lens/server/plugin.tsx
@@ -5,18 +5,22 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import {
   PluginStart as DataPluginStart,
   PluginSetup as DataPluginSetup,
-} from 'src/plugins/data/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import type { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+} from '@kbn/data-plugin/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import { setupRoutes } from './routes';
 import { getUiSettings } from './ui_settings';
 import {
@@ -25,7 +29,6 @@ import {
   scheduleLensTelemetry,
 } from './usage';
 import { setupSavedObjects } from './saved_objects';
-import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
 import { setupExpressions } from './expressions';
 import { makeLensEmbeddableFactory } from './embeddable/make_lens_embeddable_factory';
 import type { CustomVisualizationMigrations } from './migrations/types';
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.test.ts b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
index ad5f9559f6562..7c0257c7808ba 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.test.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { legacyExistingFields, existingFields, Field, buildFieldList } from './existing_fields';
 
 describe('existingFields', () => {
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
index bb235774da3bf..61df3bb458912 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -9,12 +9,12 @@ import Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema } from '@kbn/config-schema';
-import { RequestHandlerContext, ElasticsearchClient } from 'src/core/server';
-import { CoreSetup, Logger } from 'src/core/server';
-import { RuntimeField } from 'src/plugins/data/common';
-import { DataViewsService, DataView, FieldSpec } from 'src/plugins/data_views/common';
+import { RequestHandlerContext, ElasticsearchClient } from '@kbn/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { RuntimeField } from '@kbn/data-plugin/common';
+import { DataViewsService, DataView, FieldSpec } from '@kbn/data-views-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 import { BASE_API_URL } from '../../common';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/server';
 import { FIELD_EXISTENCE_SETTING } from '../ui_settings';
 import { PluginStartContract } from '../plugin';
 
@@ -136,7 +136,8 @@ async function fetchFieldExistence({
     });
   }
 
-  const metaFields: string[] = await context.core.uiSettings.client.get(UI_SETTINGS.META_FIELDS);
+  const uiSettingsClient = (await context.core).uiSettings.client;
+  const metaFields: string[] = await uiSettingsClient.get(UI_SETTINGS.META_FIELDS);
   const dataView = await dataViewsService.get(indexPatternId);
   const allFields = buildFieldList(dataView, metaFields);
   const existingFieldList = await dataViewsService.getFieldsForIndexPattern(dataView, {
@@ -169,7 +170,8 @@ async function legacyFetchFieldExistenceSampling({
   timeFieldName?: string;
   includeFrozen: boolean;
 }) {
-  const metaFields: string[] = await context.core.uiSettings.client.get(UI_SETTINGS.META_FIELDS);
+  const coreContext = await context.core;
+  const metaFields: string[] = await coreContext.uiSettings.client.get(UI_SETTINGS.META_FIELDS);
   const indexPattern = await dataViewsService.get(indexPatternId);
 
   const fields = buildFieldList(indexPattern, metaFields);
@@ -179,7 +181,7 @@ async function legacyFetchFieldExistenceSampling({
     fromDate,
     toDate,
     dslQuery,
-    client: context.core.elasticsearch.client.asCurrentUser,
+    client: coreContext.elasticsearch.client.asCurrentUser,
     index: indexPattern.title,
     timeFieldName: timeFieldName || indexPattern.timeFieldName,
     fields,
diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
index 2a719957cd851..35a15ea44be67 100644
--- a/x-pack/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/plugins/lens/server/routes/field_stats.ts
@@ -8,10 +8,10 @@ import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import DateMath from '@kbn/datemath';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup } from 'src/core/server';
-import type { DataViewField } from 'src/plugins/data_views/common';
-import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/common';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
+import { CoreSetup } from '@kbn/core/server';
+import type { DataViewField } from '@kbn/data-views-plugin/common';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
 import { FieldStatsResponse, BASE_API_URL } from '../../common';
 import { PluginStartContract } from '../plugin';
 
@@ -39,7 +39,7 @@ export async function initFieldsRoute(setup: CoreSetup<PluginStartContract>) {
       },
     },
     async (context, req, res) => {
-      const requestClient = context.core.elasticsearch.client.asCurrentUser;
+      const requestClient = (await context.core).elasticsearch.client.asCurrentUser;
       const { fromDate, toDate, fieldName, dslQuery, size } = req.body;
 
       const [{ savedObjects, elasticsearch }, { dataViews }] = await setup.getStartServices();
diff --git a/x-pack/plugins/lens/server/routes/index.ts b/x-pack/plugins/lens/server/routes/index.ts
index ec1ca81ca41a4..d040812c27264 100644
--- a/x-pack/plugins/lens/server/routes/index.ts
+++ b/x-pack/plugins/lens/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { PluginStartContract } from '../plugin';
 import { existingFieldsRoute } from './existing_fields';
 import { initFieldsRoute } from './field_stats';
diff --git a/x-pack/plugins/lens/server/routes/telemetry.ts b/x-pack/plugins/lens/server/routes/telemetry.ts
index efcde9d14ebbe..01c843cf5489d 100644
--- a/x-pack/plugins/lens/server/routes/telemetry.ts
+++ b/x-pack/plugins/lens/server/routes/telemetry.ts
@@ -6,9 +6,9 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { BASE_API_URL } from '../../common';
 import { PluginStartContract } from '../plugin';
 
@@ -33,7 +33,7 @@ export async function initLensUsageRoute(setup: CoreSetup<PluginStartContract>)
       const { events, suggestionEvents } = req.body;
 
       try {
-        const client = context.core.savedObjects.client;
+        const client = (await context.core).savedObjects.client;
 
         const allEvents: Array<{
           type: 'lens-ui-telemetry';
diff --git a/x-pack/plugins/lens/server/saved_objects.ts b/x-pack/plugins/lens/server/saved_objects.ts
index e36421d26e3c2..fdae8df746db8 100644
--- a/x-pack/plugins/lens/server/saved_objects.ts
+++ b/x-pack/plugins/lens/server/saved_objects.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
-import { MigrateFunctionsObject } from '../../../../src/plugins/kibana_utils/common';
+import { CoreSetup } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { getEditPath } from '../common';
 import { getAllMigrations } from './migrations/saved_object_migrations';
 import { CustomVisualizationMigrations } from './migrations/types';
diff --git a/x-pack/plugins/lens/server/ui_settings.ts b/x-pack/plugins/lens/server/ui_settings.ts
index 63f16f3aeebb7..ddeca9e4917ef 100644
--- a/x-pack/plugins/lens/server/ui_settings.ts
+++ b/x-pack/plugins/lens/server/ui_settings.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 
 export const FIELD_EXISTENCE_SETTING = 'lens:useFieldExistenceSampling';
 
diff --git a/x-pack/plugins/lens/server/usage/collectors.ts b/x-pack/plugins/lens/server/usage/collectors.ts
index 87567a1281d0a..b857b31129398 100644
--- a/x-pack/plugins/lens/server/usage/collectors.ts
+++ b/x-pack/plugins/lens/server/usage/collectors.ts
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import { get } from 'lodash';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 import { LensUsage, LensTelemetryState } from './types';
 import { lensUsageSchema } from './schema';
diff --git a/x-pack/plugins/lens/server/usage/multiterms_count.ts b/x-pack/plugins/lens/server/usage/multiterms_count.ts
index a245bb1bb4322..26ebbb8393892 100644
--- a/x-pack/plugins/lens/server/usage/multiterms_count.ts
+++ b/x-pack/plugins/lens/server/usage/multiterms_count.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { createMetricQuery } from './saved_objects_metric_factory';
 import { LensMultitermsUsage } from './types';
 
diff --git a/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts b/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts
index 568b79ca47780..890c2ec29decc 100644
--- a/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts
+++ b/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts
@@ -9,7 +9,7 @@ import {
   AggregationsAggregationContainer,
   MappingRuntimeFields,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { GenericSavedUsage } from './types';
 
 export function createMetricQuery(
diff --git a/x-pack/plugins/lens/server/usage/schema.ts b/x-pack/plugins/lens/server/usage/schema.ts
index 6d580ba8f6c27..08264de0be416 100644
--- a/x-pack/plugins/lens/server/usage/schema.ts
+++ b/x-pack/plugins/lens/server/usage/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { LensUsage } from './types';
 
 const eventsSchema: MakeSchemaFrom<LensUsage['events_30_days']> = {
diff --git a/x-pack/plugins/lens/server/usage/task.ts b/x-pack/plugins/lens/server/usage/task.ts
index 53af2e5551b6a..f4a805bef7401 100644
--- a/x-pack/plugins/lens/server/usage/task.ts
+++ b/x-pack/plugins/lens/server/usage/task.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger, ElasticsearchClient } from 'kibana/server';
+import { CoreSetup, Logger, ElasticsearchClient } from '@kbn/core/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
 import { getVisualizationCounts } from './visualization_counts';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
 import { getMultitermsCounts } from './multiterms_count';
 
 // This task is responsible for running daily and aggregating all the Lens click event objects
diff --git a/x-pack/plugins/lens/server/usage/visualization_counts.ts b/x-pack/plugins/lens/server/usage/visualization_counts.ts
index d5d75fe68110d..34d9c2c4ee49e 100644
--- a/x-pack/plugins/lens/server/usage/visualization_counts.ts
+++ b/x-pack/plugins/lens/server/usage/visualization_counts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { createMetricQuery } from './saved_objects_metric_factory';
 import { LensVisualizationUsage } from './types';
 
diff --git a/x-pack/plugins/license_api_guard/server/license.test.ts b/x-pack/plugins/license_api_guard/server/license.test.ts
index 400af7261ff87..9f20a3e20e995 100644
--- a/x-pack/plugins/license_api_guard/server/license.test.ts
+++ b/x-pack/plugins/license_api_guard/server/license.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { of } from 'rxjs';
-import type { Logger, KibanaRequest, RequestHandlerContext } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { Logger, KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { License } from './license';
 import { LicenseCheckState, licensingMock, LicenseType } from './shared_imports';
 
diff --git a/x-pack/plugins/license_api_guard/server/license.ts b/x-pack/plugins/license_api_guard/server/license.ts
index 66e47f02b6e28..feceb0097ef21 100644
--- a/x-pack/plugins/license_api_guard/server/license.ts
+++ b/x-pack/plugins/license_api_guard/server/license.ts
@@ -12,7 +12,7 @@ import {
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { ILicense, LicenseType, LicenseCheckState, LicensingPluginStart } from './shared_imports';
 
diff --git a/x-pack/plugins/license_api_guard/server/shared_imports.ts b/x-pack/plugins/license_api_guard/server/shared_imports.ts
index 1318706df11c9..f3f1faf0d9f56 100644
--- a/x-pack/plugins/license_api_guard/server/shared_imports.ts
+++ b/x-pack/plugins/license_api_guard/server/shared_imports.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-export type { ILicense, LicenseType, LicenseCheckState } from '../../licensing/common/types';
+export type { ILicense, LicenseType, LicenseCheckState } from '@kbn/licensing-plugin/common/types';
 
-export type { LicensingPluginStart } from '../../licensing/server';
+export type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
-export { licensingMock } from '../../licensing/server/mocks';
+export { licensingMock } from '@kbn/licensing-plugin/server/mocks';
diff --git a/x-pack/plugins/license_management/__jest__/upload_license.test.tsx b/x-pack/plugins/license_management/__jest__/upload_license.test.tsx
index 62b7dbf6c1a78..eb38aab4470d8 100644
--- a/x-pack/plugins/license_management/__jest__/upload_license.test.tsx
+++ b/x-pack/plugins/license_management/__jest__/upload_license.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { LocationDescriptorObject } from 'history';
-import { httpServiceMock, scopedHistoryMock } from '../../../../src/core/public/mocks';
+import { httpServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 // @ts-ignore
diff --git a/x-pack/plugins/license_management/__jest__/util/util.js b/x-pack/plugins/license_management/__jest__/util/util.js
index 25ef77612ca2c..7e6ffdd60431c 100644
--- a/x-pack/plugins/license_management/__jest__/util/util.js
+++ b/x-pack/plugins/license_management/__jest__/util/util.js
@@ -11,7 +11,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { httpServiceMock, scopedHistoryMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { licenseManagementStore } from '../../public/application/store/store';
 import { AppContextProvider } from '../../public/application/app_context';
 
diff --git a/x-pack/plugins/license_management/public/application/app_context.tsx b/x-pack/plugins/license_management/public/application/app_context.tsx
index 4500965b15c37..3be069bc818e7 100644
--- a/x-pack/plugins/license_management/public/application/app_context.tsx
+++ b/x-pack/plugins/license_management/public/application/app_context.tsx
@@ -8,9 +8,9 @@
 import React, { createContext, useContext } from 'react';
 import { Observable } from 'rxjs';
 
-import { CoreStart, ScopedHistory, CoreTheme } from '../../../../../src/core/public';
-import { LicensingPluginSetup, ILicense } from '../../../licensing/public';
-import { TelemetryPluginStart } from '../../../../../src/plugins/telemetry/public';
+import { CoreStart, ScopedHistory, CoreTheme } from '@kbn/core/public';
+import { LicensingPluginSetup, ILicense } from '@kbn/licensing-plugin/public';
+import { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
 import { ClientConfigType } from '../types';
 import { BreadcrumbService } from './breadcrumbs';
 
diff --git a/x-pack/plugins/license_management/public/application/breadcrumbs.ts b/x-pack/plugins/license_management/public/application/breadcrumbs.ts
index ec25699f51704..d546f4c23dd99 100644
--- a/x-pack/plugins/license_management/public/application/breadcrumbs.ts
+++ b/x-pack/plugins/license_management/public/application/breadcrumbs.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx b/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx
index 7fea09e82a9e1..fb28221fb160a 100644
--- a/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx
+++ b/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { OptInExampleFlyout } from '../../../../../../../src/plugins/telemetry_management_section/public';
+import { OptInExampleFlyout } from '@kbn/telemetry-management-section-plugin/public';
 
 // required for lazy loading
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/plugins/license_management/public/application/lib/es.ts b/x-pack/plugins/license_management/public/application/lib/es.ts
index fa104cc6ffe8a..ac14b5342cead 100644
--- a/x-pack/plugins/license_management/public/application/lib/es.ts
+++ b/x-pack/plugins/license_management/public/application/lib/es.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../common/constants';
 
 export function putLicense(http: HttpSetup, license: string, acknowledge: boolean) {
diff --git a/x-pack/plugins/license_management/public/application/lib/telemetry.ts b/x-pack/plugins/license_management/public/application/lib/telemetry.ts
index 45a6adad16341..b930036055051 100644
--- a/x-pack/plugins/license_management/public/application/lib/telemetry.ts
+++ b/x-pack/plugins/license_management/public/application/lib/telemetry.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { TelemetryPluginStart } from '../../../../../../src/plugins/telemetry/public';
+import type { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
 
-export type { TelemetryPluginStart } from '../../../../../../src/plugins/telemetry/public';
+export type { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
 export { shouldShowTelemetryOptIn };
 
 function shouldShowTelemetryOptIn(
diff --git a/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js b/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js
index c0abdda244140..3cfa42866d617 100644
--- a/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js
+++ b/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js
@@ -11,7 +11,7 @@ import { EuiCard, EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useAppContext } from '../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 export const AddLicense = ({ uploadPath = `/upload_license` }) => {
   const { services } = useAppContext();
diff --git a/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js b/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
index 02a448655cbab..e36f2961c2d3d 100644
--- a/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
+++ b/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
@@ -24,7 +24,7 @@ import { TelemetryOptIn } from '../../components/telemetry_opt_in';
 import { shouldShowTelemetryOptIn } from '../../lib/telemetry';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 export class UploadLicense extends React.PureComponent {
   state = {
diff --git a/x-pack/plugins/license_management/public/index.ts b/x-pack/plugins/license_management/public/index.ts
index c63cab6f4ad09..6c23d2f22d230 100644
--- a/x-pack/plugins/license_management/public/index.ts
+++ b/x-pack/plugins/license_management/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { LicenseManagementUIPlugin } from './plugin';
 import './application/index.scss';
 
diff --git a/x-pack/plugins/license_management/public/plugin.ts b/x-pack/plugins/license_management/public/plugin.ts
index 804e04245e99a..204fa3511ad3f 100644
--- a/x-pack/plugins/license_management/public/plugin.ts
+++ b/x-pack/plugins/license_management/public/plugin.ts
@@ -6,11 +6,11 @@
  */
 
 import { firstValueFrom } from 'rxjs';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
-import { TelemetryPluginStart } from '../../../../src/plugins/telemetry/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { LicensingPluginSetup } from '../../../plugins/licensing/public';
+import { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import { PLUGIN } from '../common/constants';
 import { ClientConfigType } from './types';
 import { AppDependencies } from './application';
diff --git a/x-pack/plugins/license_management/public/shared_imports.ts b/x-pack/plugins/license_management/public/shared_imports.ts
index ad4d91b1473f6..5651102fbcfc5 100644
--- a/x-pack/plugins/license_management/public/shared_imports.ts
+++ b/x-pack/plugins/license_management/public/shared_imports.ts
@@ -5,9 +5,6 @@
  * 2.0.
  */
 
-export { SectionLoading } from '../../../../src/plugins/es_ui_shared/public/';
+export { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/license_management/server/config.ts b/x-pack/plugins/license_management/server/config.ts
index e378a10191684..42beba0ea5c09 100644
--- a/x-pack/plugins/license_management/server/config.ts
+++ b/x-pack/plugins/license_management/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/license_management/server/index.ts b/x-pack/plugins/license_management/server/index.ts
index 7aa6bfb06d54d..1a8eba1e2610e 100644
--- a/x-pack/plugins/license_management/server/index.ts
+++ b/x-pack/plugins/license_management/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { LicenseManagementServerPlugin } from './plugin';
 
diff --git a/x-pack/plugins/license_management/server/lib/license.ts b/x-pack/plugins/license_management/server/lib/license.ts
index 915d3a8b50a3d..228c8eff01a21 100644
--- a/x-pack/plugins/license_management/server/lib/license.ts
+++ b/x-pack/plugins/license_management/server/lib/license.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { LicensingPluginStart } from '../../../licensing/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 interface PutLicenseArg {
   acknowledge: boolean;
diff --git a/x-pack/plugins/license_management/server/lib/permissions.ts b/x-pack/plugins/license_management/server/lib/permissions.ts
index 64ccabcd5ee68..f362a331c2aef 100644
--- a/x-pack/plugins/license_management/server/lib/permissions.ts
+++ b/x-pack/plugins/license_management/server/lib/permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 interface GetPermissionsArg {
   isSecurityEnabled: boolean;
diff --git a/x-pack/plugins/license_management/server/lib/start_basic.ts b/x-pack/plugins/license_management/server/lib/start_basic.ts
index 8c077332f0709..f7ccc2686c6ae 100644
--- a/x-pack/plugins/license_management/server/lib/start_basic.ts
+++ b/x-pack/plugins/license_management/server/lib/start_basic.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
-import { LicensingPluginStart } from '../../../licensing/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 interface StartBasicArg {
   acknowledge: boolean;
diff --git a/x-pack/plugins/license_management/server/lib/start_trial.ts b/x-pack/plugins/license_management/server/lib/start_trial.ts
index dfacee52c5c75..8abfc28629a54 100644
--- a/x-pack/plugins/license_management/server/lib/start_trial.ts
+++ b/x-pack/plugins/license_management/server/lib/start_trial.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
-import { LicensingPluginStart } from '../../../licensing/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 export async function canStartTrial(client: IScopedClusterClient) {
   try {
diff --git a/x-pack/plugins/license_management/server/plugin.ts b/x-pack/plugins/license_management/server/plugin.ts
index daf872148de0a..6368d973a10eb 100644
--- a/x-pack/plugins/license_management/server/plugin.ts
+++ b/x-pack/plugins/license_management/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 import { ApiRoutes } from './routes';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_license_route.ts b/x-pack/plugins/license_management/server/routes/api/license/register_license_route.ts
index 03e57b1a12cd9..0a9bbacaff4d5 100644
--- a/x-pack/plugins/license_management/server/routes/api/license/register_license_route.ts
+++ b/x-pack/plugins/license_management/server/routes/api/license/register_license_route.ts
@@ -26,7 +26,7 @@ export function registerLicenseRoute({
       },
     },
     async (ctx, req, res) => {
-      const { client } = ctx.core.elasticsearch;
+      const { client } = (await ctx.core).elasticsearch;
       try {
         return res.ok({
           body: await putLicense({
diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_permissions_route.ts b/x-pack/plugins/license_management/server/routes/api/license/register_permissions_route.ts
index 01aae5cd6d441..8372273726911 100644
--- a/x-pack/plugins/license_management/server/routes/api/license/register_permissions_route.ts
+++ b/x-pack/plugins/license_management/server/routes/api/license/register_permissions_route.ts
@@ -15,7 +15,7 @@ export function registerPermissionsRoute({
   config: { isSecurityEnabled },
 }: RouteDependencies) {
   router.post({ path: addBasePath('/permissions'), validate: false }, async (ctx, req, res) => {
-    const { client } = ctx.core.elasticsearch;
+    const { client } = (await ctx.core).elasticsearch;
 
     try {
       return res.ok({
diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.ts b/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.ts
index 60e72d297b2ed..fa9f13ade07a1 100644
--- a/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.ts
+++ b/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.ts
@@ -21,7 +21,7 @@ export function registerStartBasicRoute({
       validate: { query: schema.object({ acknowledge: schema.string() }) },
     },
     async (ctx, req, res) => {
-      const { client } = ctx.core.elasticsearch;
+      const { client } = (await ctx.core).elasticsearch;
       try {
         return res.ok({
           body: await startBasic({
diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.ts b/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.ts
index 43ab7c5eafdb5..5ff25f4d21308 100644
--- a/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.ts
+++ b/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.ts
@@ -15,7 +15,7 @@ export function registerStartTrialRoutes({
   plugins: { licensing },
 }: RouteDependencies) {
   router.get({ path: addBasePath('/start_trial'), validate: false }, async (ctx, req, res) => {
-    const { client } = ctx.core.elasticsearch;
+    const { client } = (await ctx.core).elasticsearch;
     try {
       return res.ok({ body: await canStartTrial(client) });
     } catch (error) {
@@ -24,7 +24,7 @@ export function registerStartTrialRoutes({
   });
 
   router.post({ path: addBasePath('/start_trial'), validate: false }, async (ctx, req, res) => {
-    const { client } = ctx.core.elasticsearch;
+    const { client } = (await ctx.core).elasticsearch;
     try {
       return res.ok({
         body: await startTrial({ client, licensing }),
diff --git a/x-pack/plugins/license_management/server/shared_imports.ts b/x-pack/plugins/license_management/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/license_management/server/shared_imports.ts
+++ b/x-pack/plugins/license_management/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/license_management/server/types.ts b/x-pack/plugins/license_management/server/types.ts
index 68219380c6e83..c888bb30c2265 100644
--- a/x-pack/plugins/license_management/server/types.ts
+++ b/x-pack/plugins/license_management/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, IRouter } from 'kibana/server';
+import { IScopedClusterClient, IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginStart } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/licensing/public/expired_banner.tsx b/x-pack/plugins/licensing/public/expired_banner.tsx
index 9a0d7473dc8d9..e9e6af537a4a2 100644
--- a/x-pack/plugins/licensing/public/expired_banner.tsx
+++ b/x-pack/plugins/licensing/public/expired_banner.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EuiCallOut } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   type: string;
diff --git a/x-pack/plugins/licensing/public/index.ts b/x-pack/plugins/licensing/public/index.ts
index ec1c0aa1538cd..eb0b229ca119e 100644
--- a/x-pack/plugins/licensing/public/index.ts
+++ b/x-pack/plugins/licensing/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 import { LicensingPlugin } from './plugin';
 
diff --git a/x-pack/plugins/licensing/public/plugin.test.ts b/x-pack/plugins/licensing/public/plugin.test.ts
index 6b0cf2333aa69..5c571d0c6a40b 100644
--- a/x-pack/plugins/licensing/public/plugin.test.ts
+++ b/x-pack/plugins/licensing/public/plugin.test.ts
@@ -14,8 +14,8 @@ import { LicensingPlugin, licensingSessionStorageKey } from './plugin';
 
 import { License } from '../common/license';
 import { licenseMock } from '../common/licensing.mock';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { HttpInterceptor } from 'src/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { HttpInterceptor } from '@kbn/core/public';
 
 const coreStart = coreMock.createStart();
 describe('licensing plugin', () => {
diff --git a/x-pack/plugins/licensing/public/plugin.ts b/x-pack/plugins/licensing/public/plugin.ts
index 85d10f43d55a2..9ef27e22657af 100644
--- a/x-pack/plugins/licensing/public/plugin.ts
+++ b/x-pack/plugins/licensing/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import { Observable, Subject, Subscription } from 'rxjs';
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import { ILicense } from '../common/types';
 import { LicensingPluginSetup, LicensingPluginStart } from './types';
 import { createLicenseUpdate } from '../common/license_update';
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
index 1a39a9677a04d..1c29cb97c2758 100644
--- a/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { FeatureUsageService } from './feature_usage_service';
 
 describe('FeatureUsageService', () => {
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.ts
index de9dbd59baa4f..5f50f2891aca4 100644
--- a/x-pack/plugins/licensing/public/services/feature_usage_service.ts
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { isDate } from 'lodash';
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 import { LicenseType } from '../../common/types';
 
 /** @public */
diff --git a/x-pack/plugins/licensing/server/index.ts b/x-pack/plugins/licensing/server/index.ts
index a95842308e4eb..4cfa04089d8c5 100644
--- a/x-pack/plugins/licensing/server/index.ts
+++ b/x-pack/plugins/licensing/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { LicensingPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) => new LicensingPlugin(context);
diff --git a/x-pack/plugins/licensing/server/licensing_config.ts b/x-pack/plugins/licensing/server/licensing_config.ts
index 85de9f84a703f..459c69b650dbb 100644
--- a/x-pack/plugins/licensing/server/licensing_config.ts
+++ b/x-pack/plugins/licensing/server/licensing_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   api_polling_frequency: schema.duration({ defaultValue: '30s' }),
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 a35e5be97219b..cf06cbd829f4c 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,7 +11,7 @@ import { licenseMock } from '../common/licensing.mock';
 import { createRouteHandlerContext } from './licensing_route_handler_context';
 import { featureUsageMock } from './services/feature_usage_service.mock';
 import { FeatureUsageServiceStart } from './services';
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { LicensingPluginStart } from './types';
 
 const createStartServices = (
diff --git a/x-pack/plugins/licensing/server/licensing_route_handler_context.ts b/x-pack/plugins/licensing/server/licensing_route_handler_context.ts
index d9ab87c4e23fc..fcf2fd6878f49 100644
--- a/x-pack/plugins/licensing/server/licensing_route_handler_context.ts
+++ b/x-pack/plugins/licensing/server/licensing_route_handler_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IContextProvider, StartServicesAccessor } from 'src/core/server';
+import type { IContextProvider, StartServicesAccessor } from '@kbn/core/server';
 import { firstValueFrom, Observable } from 'rxjs';
 
 import type { ILicense } from '../common/types';
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 f7b5f887eeaa2..d5a3de7ee8770 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
@@ -7,7 +7,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { createOnPreResponseHandler } from './on_pre_response_handler';
-import { httpServiceMock, httpServerMock } from '../../../../src/core/server/mocks';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 import { licenseMock } from '../common/licensing.mock';
 
 describe('createOnPreResponseHandler', () => {
diff --git a/x-pack/plugins/licensing/server/on_pre_response_handler.ts b/x-pack/plugins/licensing/server/on_pre_response_handler.ts
index 7bf57ef101c48..6cab0819ca6f7 100644
--- a/x-pack/plugins/licensing/server/on_pre_response_handler.ts
+++ b/x-pack/plugins/licensing/server/on_pre_response_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import { firstValueFrom, Observable } from 'rxjs';
-import { OnPreResponseHandler } from '../../../../src/core/server';
+import { OnPreResponseHandler } from '@kbn/core/server';
 import { ILicense } from '../common/types';
 
 export function createOnPreResponseHandler(
diff --git a/x-pack/plugins/licensing/server/plugin.test.ts b/x-pack/plugins/licensing/server/plugin.test.ts
index f944a78c3395d..b087b6f3f03fa 100644
--- a/x-pack/plugins/licensing/server/plugin.test.ts
+++ b/x-pack/plugins/licensing/server/plugin.test.ts
@@ -11,12 +11,8 @@ import moment from 'moment';
 import { LicenseType } from '../common/types';
 import { ElasticsearchError } from './types';
 import { LicensingPlugin } from './plugin';
-import {
-  coreMock,
-  elasticsearchServiceMock,
-  loggingSystemMock,
-} from '../../../../src/core/server/mocks';
-import { IClusterClient } from '../../../../src/core/server';
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { IClusterClient } from '@kbn/core/server';
 import { firstValueFrom } from 'rxjs';
 
 function buildRawLicense(
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index 490bf0be3b5a8..98dd1e7cbbb93 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -19,7 +19,7 @@ import {
   Plugin,
   PluginInitializerContext,
   IClusterClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import {
   ILicense,
diff --git a/x-pack/plugins/licensing/server/plugin_status.test.ts b/x-pack/plugins/licensing/server/plugin_status.test.ts
index e099360668827..713392901adaf 100644
--- a/x-pack/plugins/licensing/server/plugin_status.test.ts
+++ b/x-pack/plugins/licensing/server/plugin_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { TestScheduler } from 'rxjs/testing';
-import { ServiceStatusLevels } from '../../../../src/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { licenseMock } from '../common/licensing.mock';
 import { getPluginStatus$ } from './plugin_status';
 import { ILicense } from '../common/types';
diff --git a/x-pack/plugins/licensing/server/plugin_status.ts b/x-pack/plugins/licensing/server/plugin_status.ts
index f830bd966b71b..b1afd9ea21af2 100644
--- a/x-pack/plugins/licensing/server/plugin_status.ts
+++ b/x-pack/plugins/licensing/server/plugin_status.ts
@@ -7,7 +7,7 @@
 
 import { Observable } from 'rxjs';
 import { takeUntil, startWith, map } from 'rxjs/operators';
-import { ServiceStatus, ServiceStatusLevels } from '../../../../src/core/server';
+import { ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import { ILicense } from '../common/types';
 
 export const getPluginStatus$ = (
diff --git a/x-pack/plugins/licensing/server/routes/feature_usage.ts b/x-pack/plugins/licensing/server/routes/feature_usage.ts
index 00c1d807a5e1e..33317ab09cb9d 100644
--- a/x-pack/plugins/licensing/server/routes/feature_usage.ts
+++ b/x-pack/plugins/licensing/server/routes/feature_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { LicensingPluginStart } from '../types';
 import { LicensingRouter } from '../types';
 
diff --git a/x-pack/plugins/licensing/server/routes/index.ts b/x-pack/plugins/licensing/server/routes/index.ts
index 3c17cefdcdfb6..2536f36e313f9 100644
--- a/x-pack/plugins/licensing/server/routes/index.ts
+++ b/x-pack/plugins/licensing/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { LicensingPluginStart } from '../types';
 import { FeatureUsageServiceSetup } from '../services';
 import { registerInfoRoute } from './info';
diff --git a/x-pack/plugins/licensing/server/routes/info.ts b/x-pack/plugins/licensing/server/routes/info.ts
index 9db7a1c8ca1ba..1cbc7b6398966 100644
--- a/x-pack/plugins/licensing/server/routes/info.ts
+++ b/x-pack/plugins/licensing/server/routes/info.ts
@@ -8,9 +8,12 @@
 import { LicensingRouter } from '../types';
 
 export function registerInfoRoute(router: LicensingRouter) {
-  router.get({ path: '/api/licensing/info', validate: false }, (context, request, response) => {
-    return response.ok({
-      body: context.licensing.license,
-    });
-  });
+  router.get(
+    { path: '/api/licensing/info', validate: false },
+    async (context, request, response) => {
+      return response.ok({
+        body: (await context.licensing).license,
+      });
+    }
+  );
 }
diff --git a/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts b/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts
index 2cc4a64b63a3f..a33cf4284245d 100644
--- a/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts
+++ b/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts
@@ -22,7 +22,7 @@ export function registerNotifyFeatureUsageRoute(router: LicensingRouter) {
     async (context, request, response) => {
       const { featureName, lastUsed } = request.body;
 
-      context.licensing.featureUsage.notifyUsage(featureName, lastUsed);
+      (await context.licensing).featureUsage.notifyUsage(featureName, lastUsed);
 
       return response.ok({
         body: {
diff --git a/x-pack/plugins/licensing/server/types.ts b/x-pack/plugins/licensing/server/types.ts
index 5eba838b956db..83b39cb663715 100644
--- a/x-pack/plugins/licensing/server/types.ts
+++ b/x-pack/plugins/licensing/server/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import type { IClusterClient, IRouter, RequestHandlerContext } from 'src/core/server';
+import type { IClusterClient, IRouter, CustomRequestHandlerContext } from '@kbn/core/server';
 import { ILicense } from '../common/types';
 import { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './services';
 
@@ -35,9 +35,9 @@ export interface LicensingApiRequestHandlerContext {
 /**
  * @internal
  */
-export interface LicensingRequestHandlerContext extends RequestHandlerContext {
+export type LicensingRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts b/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts
index 804783116cd49..f1e93dc9a7b11 100644
--- a/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts
+++ b/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { wrapRouteWithLicenseCheck, CheckLicense } from './wrap_route_with_license_check';
 
diff --git a/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts b/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts
index 9d60737e65656..0adcf3f3b6120 100644
--- a/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts
+++ b/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts
@@ -5,7 +5,12 @@
  * 2.0.
  */
 
-import { RequestHandler, KibanaRequest, RouteMethod, KibanaResponseFactory } from 'src/core/server';
+import {
+  RequestHandler,
+  KibanaRequest,
+  RouteMethod,
+  KibanaResponseFactory,
+} from '@kbn/core/server';
 
 import { ILicense } from '../common/types';
 import type { LicensingRequestHandlerContext } from './types';
@@ -23,7 +28,8 @@ export function wrapRouteWithLicenseCheck<P, Q, B, Context extends LicensingRequ
     request: KibanaRequest<P, Q, B, RouteMethod>,
     response: KibanaResponseFactory
   ) => {
-    const licenseCheckResult = checkLicense(context.licensing.license);
+    const { license } = await context.licensing;
+    const licenseCheckResult = checkLicense(license);
 
     if (licenseCheckResult.valid) {
       return handler(context, request, response);
diff --git a/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts
index 908ee9feafcc2..38bb32169beb5 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts
@@ -17,7 +17,7 @@ import {
   TYPE,
   USER,
   VALUE,
-} from '../../../common/constants.mock';
+} from '../../constants.mock';
 
 export const getListItemResponseMock = (): ListItemSchema => ({
   _version: undefined,
diff --git a/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts
index 64afb1e73beaa..adfe72d5e9125 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts
@@ -19,7 +19,7 @@ import {
   TYPE,
   USER,
   VERSION,
-} from '../../../common/constants.mock';
+} from '../../constants.mock';
 
 export const getListResponseMock = (): ListSchema => ({
   _version: undefined,
diff --git a/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts
index d51f454eb3d40..03d71ccaa59b9 100644
--- a/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts
@@ -7,7 +7,7 @@
 
 import type { SearchListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { VALUE } from '../../../common/constants.mock';
+import { VALUE } from '../../constants.mock';
 
 import { getListItemResponseMock } from './list_item_schema.mock';
 
diff --git a/x-pack/plugins/lists/public/exceptions/api.test.ts b/x-pack/plugins/lists/public/exceptions/api.test.ts
index 923f4db19f62e..a7d55139b7f5a 100644
--- a/x-pack/plugins/lists/public/exceptions/api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.test.ts
@@ -19,8 +19,8 @@ import {
   updateExceptionList,
   updateExceptionListItem,
 } from '@kbn/securitysolution-list-api';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../src/core/public/mocks';
 import { getExceptionListSchemaMock } from '../../common/schemas/response/exception_list_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../common/schemas/response/exception_list_item_schema.mock';
 import { getCreateExceptionListSchemaMock } from '../../common/schemas/request/create_exception_list_schema.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx
index 74ec0759b057e..b0242ef38b95a 100644
--- a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx
@@ -8,8 +8,7 @@
 import { Story } from '@storybook/react';
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { AndOrBadge, AndOrBadgeProps } from '.';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx
index 26aa41549e61b..457f04d55c4b5 100644
--- a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx
@@ -7,10 +7,9 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-
-import { AndOrBadge } from './';
+import { AndOrBadge } from '.';
 
 describe('AndOrBadge', () => {
   test('it renders top and bottom antenna bars when "includeAntennas" is true', () => {
diff --git a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx
index dd5ed999dadcd..8b58d4767244b 100644
--- a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { RoundedBadgeAntenna } from './rounded_badge_antenna';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx
index 4a1471d9a3e5d..aee4b7e298654 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { BuilderAndBadgeComponent } from './and_badge';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx
index 0f842bb53b99e..bb345f481112a 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx
@@ -7,11 +7,11 @@
 
 import { Story, addDecorator } from '@storybook/react';
 import React from 'react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
+import type { AutocompleteStart } from '@kbn/unified-search-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
 import { getEntryMatchMock } from '../../../../common/schemas/types/entry_match.mock';
 import { getEntryExistsMock } from '../../../../common/schemas/types/entry_exists.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx
index 77e255f9ed2ae..2fbc89e719eb1 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx
@@ -8,15 +8,14 @@
 import { Story } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import React from 'react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   ListOperatorEnum as OperatorEnum,
   ListOperatorTypeEnum as OperatorTypeEnum,
 } from '@kbn/securitysolution-io-ts-list-types';
-
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import type { AutocompleteStart } from '@kbn/unified-search-plugin/public';
+import { fields } from '@kbn/data-plugin/common/mocks';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { BuilderEntryItem, EntryItemProps } from './entry_renderer';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx
index aa7071a9074a9..d0d931387f0e4 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { ReactWrapper, mount } from 'enzyme';
 import React from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
-import { waitFor } from '@testing-library/dom';
+import { coreMock } from '@kbn/core/public/mocks';
 import {
   doesNotExistOperator,
   existsOperator,
@@ -22,11 +21,12 @@ import {
 } from '@kbn/securitysolution-list-utils';
 import { validateFilePathInput } from '@kbn/securitysolution-utils';
 import { useFindLists } from '@kbn/securitysolution-list-hooks';
-import type { FieldSpec } from 'src/plugins/data/common';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { waitFor } from '@testing-library/dom';
+import { ReactWrapper, mount } from 'enzyme';
 
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { getFoundListSchemaMock } from '../../../../common/schemas/response/found_list_schema.mock';
 
 import { BuilderEntryItem } from './entry_renderer';
@@ -35,7 +35,7 @@ jest.mock('@kbn/securitysolution-list-hooks');
 jest.mock('@kbn/securitysolution-utils');
 
 const mockKibanaHttpService = coreMock.createStart().http;
-const { autocomplete: autocompleteStartMock } = dataPluginMock.createStartContract();
+const { autocomplete: autocompleteStartMock } = unifiedSearchPluginMock.createStartContract();
 
 describe('BuilderEntryItem', () => {
   let wrapper: ReactWrapper;
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
index 3832803a54971..a28686595053b 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
@@ -44,9 +44,9 @@ import {
   validateFilePathInput,
 } from '@kbn/securitysolution-utils';
 import { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import type { AutocompleteStart } from '@kbn/unified-search-plugin/public';
+import { HttpStart } from '@kbn/core/public';
 
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
-import { HttpStart } from '../../../../../../../src/core/public';
 import { getEmptyValue } from '../../../common/empty_value';
 
 import * as i18n from './translations';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx
index fed24ba428e6c..4041c8516ee27 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx
@@ -7,19 +7,19 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { fields } from '@kbn/data-plugin/common/mocks';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
 import { getExceptionListItemSchemaMock } from '../../../../common/schemas/response/exception_list_item_schema.mock';
 import { getEntryMatchMock } from '../../../../common/schemas/types/entry_match.mock';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
 
 import { BuilderExceptionListItemComponent } from './exception_item_renderer';
 
 const mockKibanaHttpService = coreMock.createStart().http;
-const { autocomplete: autocompleteStartMock } = dataPluginMock.createStartContract();
+const { autocomplete: autocompleteStartMock } = unifiedSearchPluginMock.createStartContract();
 
 describe('BuilderExceptionListItemComponent', () => {
   const getValueSuggestionsMock = jest.fn().mockResolvedValue(['value 1', 'value 2']);
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx
index febfa54a482b2..d55289d016883 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback, useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import styled from 'styled-components';
-import { HttpStart } from 'kibana/public';
-import type { AutocompleteStart } from 'src/plugins/data/public';
+import type { AutocompleteStart } from '@kbn/unified-search-plugin/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExceptionListType, OsTypeArray } from '@kbn/securitysolution-io-ts-list-types';
 import {
   BuilderEntry,
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx
index d9dfbfeee299d..e30c5e5cd5519 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { ReactWrapper, mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
 import { getExceptionListItemSchemaMock } from '../../../../common/schemas/response/exception_list_item_schema.mock';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
 import { getEmptyValue } from '../../../common/empty_value';
@@ -20,7 +20,7 @@ import { getEmptyValue } from '../../../common/empty_value';
 import { ExceptionBuilderComponent } from './exception_items_renderer';
 
 const mockKibanaHttpService = coreMock.createStart().http;
-const { autocomplete: autocompleteStartMock } = dataPluginMock.createStartContract();
+const { autocomplete: autocompleteStartMock } = unifiedSearchPluginMock.createStartContract();
 
 describe('ExceptionBuilderComponent', () => {
   let wrapper: ReactWrapper;
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx
index c7da32cc1669d..69467d7ecea8b 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useEffect, useReducer } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import styled from 'styled-components';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { addIdToItem } from '@kbn/securitysolution-utils';
 import {
   CreateExceptionListItemSchema,
@@ -32,8 +32,8 @@ import {
   getNewExceptionItem,
 } from '@kbn/securitysolution-list-utils';
 import { DataViewBase } from '@kbn/es-query';
+import type { AutocompleteStart } from '@kbn/unified-search-plugin/public';
 
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
 import { AndOrBadge } from '../and_or_badge';
 
 import { BuilderExceptionListItemComponent } from './exception_item_renderer';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts b/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts
index 4a0c1ee1533d9..8e1c7e444ab4e 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts
@@ -53,12 +53,12 @@ import {
   isOperator,
 } from '@kbn/securitysolution-list-utils';
 import { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
+import type { FieldSpec } from '@kbn/data-plugin/common';
 
 import { ENTRIES_WITH_IDS } from '../../../../common/constants.mock';
 import { getEntryExistsMock } from '../../../../common/schemas/types/entry_exists.mock';
 import { getExceptionListItemSchemaMock } from '../../../../common/schemas/response/exception_list_item_schema.mock';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
 import { getEntryNestedMock } from '../../../../common/schemas/types/entry_nested.mock';
 import { getEntryMatchMock } from '../../../../common/schemas/types/entry_match.mock';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
index 6488da2e32523..7cb2311c5e10a 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
@@ -12,9 +12,9 @@ import {
   ReturnPersistExceptionItem,
   usePersistExceptionItem,
 } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { ENTRIES_WITH_IDS } from '../../../common/constants.mock';
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getCreateExceptionListItemSchemaMock } from '../../../common/schemas/request/create_exception_list_item_schema.mock';
 import { getUpdateExceptionListItemSchemaMock } from '../../../common/schemas/request/update_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
index df0160b6e0b5d..09257c489a895 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
@@ -12,8 +12,8 @@ import {
   ReturnPersistExceptionList,
   usePersistExceptionList,
 } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getCreateExceptionListSchemaMock } from '../../../common/schemas/request/create_exception_list_schema.mock';
 import { getUpdateExceptionListSchemaMock } from '../../../common/schemas/request/update_exception_list_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
index 21e08924856c8..0bd97dffb34f8 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
@@ -14,15 +14,15 @@ import type {
   ApiCallByListIdProps,
   UpdateExceptionListItemProps,
 } from '@kbn/securitysolution-io-ts-list-types';
+import { coreMock } from '@kbn/core/public/mocks';
+import { HttpStart } from '@kbn/core/public';
 
 import { ENTRIES_WITH_IDS } from '../../../common/constants.mock';
 import { getUpdateExceptionListItemSchemaMock } from '../../../common/schemas/request/update_exception_list_item_schema.mock';
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import { getCreateExceptionListItemSchemaMock } from '../../../common/schemas/request/create_exception_list_item_schema.mock';
-import { HttpStart } from '../../../../../../src/core/public';
 
 jest.mock('@kbn/securitysolution-list-api');
 
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts
index ef05b5f4750a3..d8ae72d4d6205 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts
@@ -17,8 +17,8 @@ import {
   transformInput,
   useExceptionListItems,
 } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 
 jest.mock('uuid', () => ({
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts
index 69b157835e882..1f360a671aaae 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts
@@ -12,8 +12,8 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import * as api from '@kbn/securitysolution-list-api';
 import { ReturnExceptionLists, useExceptionLists } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getFoundExceptionListSchemaMock } from '../../../common/schemas/response/found_exception_list_schema.mock';
 
 const mockKibanaHttpService = coreMock.createStart().http;
diff --git a/x-pack/plugins/lists/public/index.ts b/x-pack/plugins/lists/public/index.ts
index f35de2328714b..0dae8ba93696f 100644
--- a/x-pack/plugins/lists/public/index.ts
+++ b/x-pack/plugins/lists/public/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-export { getExceptionBuilderComponentLazy } from './exceptions/components/builder/index';
-export type { OnChangeProps } from './exceptions/components/builder/index';
+export { getExceptionBuilderComponentLazy } from './exceptions/components/builder';
+export type { OnChangeProps } from './exceptions/components/builder';
 
-import type { PluginInitializerContext } from '../../../../src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 import { Plugin } from './plugin';
 import type { PluginSetup, PluginStart } from './types';
diff --git a/x-pack/plugins/lists/public/lists/api.test.ts b/x-pack/plugins/lists/public/lists/api.test.ts
index 8002092235a81..92595193c9957 100644
--- a/x-pack/plugins/lists/public/lists/api.test.ts
+++ b/x-pack/plugins/lists/public/lists/api.test.ts
@@ -13,9 +13,9 @@ import {
   importList,
   readListIndex,
 } from '@kbn/securitysolution-list-api';
+import { HttpFetchOptions } from '@kbn/core/public';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { HttpFetchOptions } from '../../../../../src/core/public';
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
 import { getAcknowledgeSchemaResponseMock } from '../../common/schemas/response/acknowledge_schema.mock';
 import { getListResponseMock } from '../../common/schemas/response/list_schema.mock';
 import { getListItemIndexExistSchemaResponseMock } from '../../common/schemas/response/list_item_index_exist_schema.mock';
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts
index 3a8a334fec319..44b7e57f11cb1 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useCreateListIndex } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getAcknowledgeSchemaResponseMock } from '../../../common/schemas/response/acknowledge_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
index 37f09915075f8..aac604a89bc8a 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useDeleteList } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
index 6ffe5c93bcb04..4977d585fe43b 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
@@ -8,8 +8,7 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useExportList } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
-
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('@kbn/securitysolution-list-api');
 
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
index a766187c50c50..c32ff10509d7a 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useFindLists } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getFoundListSchemaMock } from '../../../common/schemas/response/found_list_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts
index 209ff113aeaca..4a1557e94fe79 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useImportList } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts
index 7043812aaa650..d8740b63fac58 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useReadListIndex } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getAcknowledgeSchemaResponseMock } from '../../../common/schemas/response/acknowledge_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/types.ts b/x-pack/plugins/lists/public/lists/types.ts
index 575ccde1ea286..d8b2756240c8a 100644
--- a/x-pack/plugins/lists/public/lists/types.ts
+++ b/x-pack/plugins/lists/public/lists/types.ts
@@ -6,8 +6,7 @@
  */
 
 import type { Type } from '@kbn/securitysolution-io-ts-list-types';
-
-import { HttpStart } from '../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 export interface ApiParams {
   http: HttpStart;
diff --git a/x-pack/plugins/lists/public/plugin.ts b/x-pack/plugins/lists/public/plugin.ts
index 5070c32df9ec8..8c86d42616d63 100644
--- a/x-pack/plugins/lists/public/plugin.ts
+++ b/x-pack/plugins/lists/public/plugin.ts
@@ -10,7 +10,7 @@ import {
   CoreStart,
   Plugin as IPlugin,
   PluginInitializerContext,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 
 import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types';
 
diff --git a/x-pack/plugins/lists/public/shared_exports.ts b/x-pack/plugins/lists/public/shared_exports.ts
index bb75fea9fbe3e..efaec0cb89a8b 100644
--- a/x-pack/plugins/lists/public/shared_exports.ts
+++ b/x-pack/plugins/lists/public/shared_exports.ts
@@ -7,4 +7,4 @@
 
 /** DEPRECATED, TRY NOT TO ADD ANYTHING HERE. INSTEAD TRY TO USE AND/OR CREATE kibana packages @kbn/... */
 
-export * as ExceptionBuilder from './exceptions/components/builder/index';
+export * as ExceptionBuilder from './exceptions/components/builder';
diff --git a/x-pack/plugins/lists/server/get_space_id.test.ts b/x-pack/plugins/lists/server/get_space_id.test.ts
index 840e0eaaf9ad9..ff20282fb41dc 100644
--- a/x-pack/plugins/lists/server/get_space_id.test.ts
+++ b/x-pack/plugins/lists/server/get_space_id.test.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
-import { KibanaRequest } from 'src/core/server';
-
-import { spacesServiceMock } from '../../spaces/server/spaces_service/spaces_service.mock';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { spacesServiceMock } from '@kbn/spaces-plugin/server/spaces_service/spaces_service.mock';
 
 import { getSpaceId } from './get_space_id';
 
diff --git a/x-pack/plugins/lists/server/get_space_id.ts b/x-pack/plugins/lists/server/get_space_id.ts
index 05bfb99e101ce..31c3aff9bac8a 100644
--- a/x-pack/plugins/lists/server/get_space_id.ts
+++ b/x-pack/plugins/lists/server/get_space_id.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-
-import { SpacesServiceStart } from '../../spaces/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 export const getSpaceId = ({
   spaces,
diff --git a/x-pack/plugins/lists/server/get_user.test.ts b/x-pack/plugins/lists/server/get_user.test.ts
index 0d63329bf9040..a05976e7d82f2 100644
--- a/x-pack/plugins/lists/server/get_user.test.ts
+++ b/x-pack/plugins/lists/server/get_user.test.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
-import { KibanaRequest } from 'src/core/server';
-
-import { securityMock } from '../../security/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
 import { getUser } from './get_user';
 
diff --git a/x-pack/plugins/lists/server/get_user.ts b/x-pack/plugins/lists/server/get_user.ts
index f0ee3862a0003..a3adb05ae5ef6 100644
--- a/x-pack/plugins/lists/server/get_user.ts
+++ b/x-pack/plugins/lists/server/get_user.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-
-import { SecurityPluginStart } from '../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface GetUserOptions {
   security: SecurityPluginStart | null | undefined;
diff --git a/x-pack/plugins/lists/server/index.ts b/x-pack/plugins/lists/server/index.ts
index de54dfb3d8494..ef63343d8f5ea 100644
--- a/x-pack/plugins/lists/server/index.ts
+++ b/x-pack/plugins/lists/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { ListPlugin } from './plugin';
diff --git a/x-pack/plugins/lists/server/plugin.ts b/x-pack/plugins/lists/server/plugin.ts
index c824c6889c362..688469ea063bd 100644
--- a/x-pack/plugins/lists/server/plugin.ts
+++ b/x-pack/plugins/lists/server/plugin.ts
@@ -5,11 +5,15 @@
  * 2.0.
  */
 
-import { Logger, Plugin, PluginInitializerContext } from 'kibana/server';
-import type { CoreSetup, CoreStart } from 'src/core/server';
-
-import type { SecurityPluginStart } from '../../security/server';
-import type { SpacesServiceStart } from '../../spaces/server';
+import type {
+  CoreSetup,
+  CoreStart,
+  Logger,
+  Plugin,
+  PluginInitializerContext,
+} from '@kbn/core/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 import { ConfigType } from './config';
 import { initRoutes } from './routes/init_routes';
@@ -99,13 +103,11 @@ export class ListPlugin implements Plugin<ListPluginSetup, ListsPluginStart, {},
     return async (context, request): ContextProviderReturn => {
       const { spaces, config, security, extensionPoints } = this;
       const {
-        core: {
-          savedObjects: { client: savedObjectsClient },
-          elasticsearch: {
-            client: { asCurrentUser: esClient },
-          },
+        savedObjects: { client: savedObjectsClient },
+        elasticsearch: {
+          client: { asCurrentUser: esClient },
         },
-      } = context;
+      } = await context.core;
       if (config == null) {
         throw new TypeError('Configuration is required for this plugin to operate');
       } else {
diff --git a/x-pack/plugins/lists/server/routes/create_endpoint_list_item_route.ts b/x-pack/plugins/lists/server/routes/create_endpoint_list_item_route.ts
index 46c139d1f3732..d6272626618ec 100644
--- a/x-pack/plugins/lists/server/routes/create_endpoint_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_endpoint_list_item_route.ts
@@ -47,7 +47,7 @@ export const createEndpointListItemRoute = (router: ListsPluginRouter): void =>
           os_types: osTypes,
           type,
         } = request.body;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const exceptionListItem = await exceptionLists.getEndpointListItem({
           id: undefined,
           itemId,
diff --git a/x-pack/plugins/lists/server/routes/create_endpoint_list_route.ts b/x-pack/plugins/lists/server/routes/create_endpoint_list_route.ts
index 134682d3a4283..1868a47952a6d 100644
--- a/x-pack/plugins/lists/server/routes/create_endpoint_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_endpoint_list_route.ts
@@ -36,7 +36,7 @@ export const createEndpointListRoute = (router: ListsPluginRouter): void => {
     async (context, _, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const createdList = await exceptionLists.createEndpointList();
         // We always return ok on a create  endpoint list route but with an empty body as
         // an additional fetch of the full list would be slower and the UI has everything hard coded
diff --git a/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts
index 968f341b9decf..1659fc2645f16 100644
--- a/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts
@@ -51,7 +51,7 @@ export const createExceptionListItemRoute = (router: ListsPluginRouter): void =>
           os_types: osTypes,
           type,
         } = request.body;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const exceptionList = await exceptionLists.getExceptionList({
           id: undefined,
           listId,
diff --git a/x-pack/plugins/lists/server/routes/create_exception_list_route.ts b/x-pack/plugins/lists/server/routes/create_exception_list_route.ts
index 22be6432a70c1..8d59d8492c822 100644
--- a/x-pack/plugins/lists/server/routes/create_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_exception_list_route.ts
@@ -46,7 +46,7 @@ export const createExceptionListRoute = (router: ListsPluginRouter): void => {
           type,
           version,
         } = request.body;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const exceptionList = await exceptionLists.getExceptionList({
           id: undefined,
           listId,
diff --git a/x-pack/plugins/lists/server/routes/create_list_index_route.ts b/x-pack/plugins/lists/server/routes/create_list_index_route.ts
index cebd6140c36aa..ee6a3003a0f0f 100644
--- a/x-pack/plugins/lists/server/routes/create_list_index_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_list_index_route.ts
@@ -29,7 +29,7 @@ export const createListIndexRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listIndexExists = await lists.getListIndexExists();
         const listItemIndexExists = await lists.getListItemIndexExists();
 
diff --git a/x-pack/plugins/lists/server/routes/create_list_item_route.ts b/x-pack/plugins/lists/server/routes/create_list_item_route.ts
index bbdc507ebdb69..de798aea97fd6 100644
--- a/x-pack/plugins/lists/server/routes/create_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_list_item_route.ts
@@ -31,7 +31,7 @@ export const createListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, list_id: listId, value, meta } = request.body;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const list = await lists.getList({ id: listId });
         if (list == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/create_list_route.ts b/x-pack/plugins/lists/server/routes/create_list_route.ts
index b259fe31b931d..5e2ddea4aa4b2 100644
--- a/x-pack/plugins/lists/server/routes/create_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_list_route.ts
@@ -38,7 +38,7 @@ export const createListRoute = (router: ListsPluginRouter): void => {
       try {
         const { name, description, deserializer, id, serializer, type, meta, version } =
           request.body;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listExists = await lists.getListIndexExists();
         if (!listExists) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/delete_endpoint_list_item_route.ts b/x-pack/plugins/lists/server/routes/delete_endpoint_list_item_route.ts
index 650d2d11b0d1f..94456cea0c328 100644
--- a/x-pack/plugins/lists/server/routes/delete_endpoint_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_endpoint_list_item_route.ts
@@ -40,7 +40,7 @@ export const deleteEndpointListItemRoute = (router: ListsPluginRouter): void =>
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const { item_id: itemId, id } = request.query;
         if (itemId == null && id == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts
index 7ec220bfb3a60..5aea87e5e9efb 100644
--- a/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts
@@ -40,7 +40,7 @@ export const deleteExceptionListItemRoute = (router: ListsPluginRouter): void =>
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const { item_id: itemId, id, namespace_type: namespaceType } = request.query;
         if (itemId == null && id == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts b/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts
index b4928d0262528..26c45c8055a96 100644
--- a/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts
@@ -40,7 +40,7 @@ export const deleteExceptionListRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const { list_id: listId, id, namespace_type: namespaceType } = request.query;
         if (listId == null && id == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/delete_list_index_route.ts b/x-pack/plugins/lists/server/routes/delete_list_index_route.ts
index 448c6c7692164..85c6cf96c85ab 100644
--- a/x-pack/plugins/lists/server/routes/delete_list_index_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_list_index_route.ts
@@ -45,7 +45,7 @@ export const deleteListIndexRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listIndexExists = await lists.getListIndexExists();
         const listItemIndexExists = await lists.getListItemIndexExists();
 
diff --git a/x-pack/plugins/lists/server/routes/delete_list_item_route.ts b/x-pack/plugins/lists/server/routes/delete_list_item_route.ts
index cd6c0ee038b4d..bf03f083bd742 100644
--- a/x-pack/plugins/lists/server/routes/delete_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_list_item_route.ts
@@ -35,7 +35,7 @@ export const deleteListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, list_id: listId, value } = request.query;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         if (id != null) {
           const deleted = await lists.deleteListItem({ id });
           if (deleted == null) {
diff --git a/x-pack/plugins/lists/server/routes/delete_list_route.ts b/x-pack/plugins/lists/server/routes/delete_list_route.ts
index 6ddcce94d82e8..57923699c25eb 100644
--- a/x-pack/plugins/lists/server/routes/delete_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_list_route.ts
@@ -42,8 +42,8 @@ export const deleteListRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const lists = getListClient(context);
-        const exceptionLists = getExceptionListClient(context);
+        const lists = await getListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const { id, deleteReferences, ignoreReferences } = request.query;
         let deleteExceptionItemResponses;
 
diff --git a/x-pack/plugins/lists/server/routes/export_exception_list_route.ts b/x-pack/plugins/lists/server/routes/export_exception_list_route.ts
index f13e84c6e58dd..03c7b416ab54f 100644
--- a/x-pack/plugins/lists/server/routes/export_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/export_exception_list_route.ts
@@ -29,7 +29,7 @@ export const exportExceptionsRoute = (router: ListsPluginRouter): void => {
 
       try {
         const { id, list_id: listId, namespace_type: namespaceType } = request.query;
-        const exceptionListsClient = getExceptionListClient(context);
+        const exceptionListsClient = await getExceptionListClient(context);
 
         const exportContent = await exceptionListsClient.exportExceptionListAndItems({
           id,
diff --git a/x-pack/plugins/lists/server/routes/export_list_item_route.ts b/x-pack/plugins/lists/server/routes/export_list_item_route.ts
index 413c911560e10..f542909327f1c 100644
--- a/x-pack/plugins/lists/server/routes/export_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/export_list_item_route.ts
@@ -32,7 +32,7 @@ export const exportListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { list_id: listId } = request.query;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const list = await lists.getList({ id: listId });
         if (list == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/find_endpoint_list_item_route.ts b/x-pack/plugins/lists/server/routes/find_endpoint_list_item_route.ts
index 6516e88877384..c91a7d882355b 100644
--- a/x-pack/plugins/lists/server/routes/find_endpoint_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_endpoint_list_item_route.ts
@@ -35,7 +35,7 @@ export const findEndpointListItemRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const {
           filter,
           page,
diff --git a/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts
index 67450ca02bb20..b28ebf26b012c 100644
--- a/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts
@@ -35,7 +35,7 @@ export const findExceptionListItemRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const {
           filter,
           list_id: listId,
diff --git a/x-pack/plugins/lists/server/routes/find_exception_list_route.ts b/x-pack/plugins/lists/server/routes/find_exception_list_route.ts
index e49b9c39d2f04..9365c07e876a2 100644
--- a/x-pack/plugins/lists/server/routes/find_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_exception_list_route.ts
@@ -34,7 +34,7 @@ export const findExceptionListRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const {
           filter,
           page,
diff --git a/x-pack/plugins/lists/server/routes/find_list_item_route.ts b/x-pack/plugins/lists/server/routes/find_list_item_route.ts
index b0a4a386e21e8..37e3ede6582be 100644
--- a/x-pack/plugins/lists/server/routes/find_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_list_item_route.ts
@@ -35,7 +35,7 @@ export const findListItemRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const {
           cursor,
           filter: filterOrUndefined,
diff --git a/x-pack/plugins/lists/server/routes/find_list_route.ts b/x-pack/plugins/lists/server/routes/find_list_route.ts
index 98697cc79030c..89ed27941d8ad 100644
--- a/x-pack/plugins/lists/server/routes/find_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_list_route.ts
@@ -29,7 +29,7 @@ export const findListRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const {
           cursor,
           filter: filterOrUndefined,
diff --git a/x-pack/plugins/lists/server/routes/import_exceptions_route.ts b/x-pack/plugins/lists/server/routes/import_exceptions_route.ts
index 9db8c27c5397d..78e0d571b2dc2 100644
--- a/x-pack/plugins/lists/server/routes/import_exceptions_route.ts
+++ b/x-pack/plugins/lists/server/routes/import_exceptions_route.ts
@@ -43,7 +43,7 @@ export const importExceptionsRoute = (router: ListsPluginRouter, config: ConfigT
       },
     },
     async (context, request, response) => {
-      const exceptionListsClient = getExceptionListClient(context);
+      const exceptionListsClient = await getExceptionListClient(context);
       const siemResponse = buildSiemResponse(response);
 
       try {
diff --git a/x-pack/plugins/lists/server/routes/import_list_item_route.ts b/x-pack/plugins/lists/server/routes/import_list_item_route.ts
index a911a6bc26eb0..0af6035e40b5d 100644
--- a/x-pack/plugins/lists/server/routes/import_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/import_list_item_route.ts
@@ -44,7 +44,7 @@ export const importListItemRoute = (router: ListsPluginRouter, config: ConfigTyp
       try {
         const stream = createStreamFromBuffer(request.body);
         const { deserializer, list_id: listId, serializer, type } = request.query;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listExists = await lists.getListIndexExists();
         if (!listExists) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/patch_list_item_route.ts b/x-pack/plugins/lists/server/routes/patch_list_item_route.ts
index 7bbcab1b1dd62..45d02f5c9d3ac 100644
--- a/x-pack/plugins/lists/server/routes/patch_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/patch_list_item_route.ts
@@ -31,7 +31,7 @@ export const patchListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { value, id, meta, _version } = request.body;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listItem = await lists.updateListItem({
           _version,
           id,
diff --git a/x-pack/plugins/lists/server/routes/patch_list_route.ts b/x-pack/plugins/lists/server/routes/patch_list_route.ts
index da2ea0b65e413..6b23fb1da8978 100644
--- a/x-pack/plugins/lists/server/routes/patch_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/patch_list_route.ts
@@ -31,7 +31,7 @@ export const patchListRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { name, description, id, meta, _version, version } = request.body;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const list = await lists.updateList({ _version, description, id, meta, name, version });
         if (list == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/read_endpoint_list_item_route.ts b/x-pack/plugins/lists/server/routes/read_endpoint_list_item_route.ts
index aed51fbb4a5d0..053e74dee48c8 100644
--- a/x-pack/plugins/lists/server/routes/read_endpoint_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_endpoint_list_item_route.ts
@@ -41,7 +41,7 @@ export const readEndpointListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, item_id: itemId } = request.query;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         if (id != null || itemId != null) {
           const exceptionListItem = await exceptionLists.getEndpointListItem({
             id,
diff --git a/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts
index d1afb35d41a30..7ea8c02be96db 100644
--- a/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts
@@ -41,7 +41,7 @@ export const readExceptionListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, item_id: itemId, namespace_type: namespaceType } = request.query;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         if (id != null || itemId != null) {
           const exceptionListItem = await exceptionLists.getExceptionListItem({
             id,
diff --git a/x-pack/plugins/lists/server/routes/read_exception_list_route.ts b/x-pack/plugins/lists/server/routes/read_exception_list_route.ts
index 3b652db6fab63..22ef6e636720f 100644
--- a/x-pack/plugins/lists/server/routes/read_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_exception_list_route.ts
@@ -40,7 +40,7 @@ export const readExceptionListRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, list_id: listId, namespace_type: namespaceType } = request.query;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         if (id != null || listId != null) {
           const exceptionList = await exceptionLists.getExceptionList({
             id,
diff --git a/x-pack/plugins/lists/server/routes/read_list_index_route.ts b/x-pack/plugins/lists/server/routes/read_list_index_route.ts
index 6fd15e628edb0..061c8486db358 100644
--- a/x-pack/plugins/lists/server/routes/read_list_index_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_list_index_route.ts
@@ -29,7 +29,7 @@ export const readListIndexRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listIndexExists = await lists.getListIndexExists();
         const listItemIndexExists = await lists.getListItemIndexExists();
 
diff --git a/x-pack/plugins/lists/server/routes/read_list_item_route.ts b/x-pack/plugins/lists/server/routes/read_list_item_route.ts
index 2cb2c4e042884..a663cfe9b8d08 100644
--- a/x-pack/plugins/lists/server/routes/read_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_list_item_route.ts
@@ -35,7 +35,7 @@ export const readListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, list_id: listId, value } = request.query;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         if (id != null) {
           const listItem = await lists.getListItem({ id });
           if (listItem == null) {
diff --git a/x-pack/plugins/lists/server/routes/read_list_route.ts b/x-pack/plugins/lists/server/routes/read_list_route.ts
index e4806f274d511..86761b5c98835 100644
--- a/x-pack/plugins/lists/server/routes/read_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_list_route.ts
@@ -31,7 +31,7 @@ export const readListRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id } = request.query;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const list = await lists.getList({ id });
         if (list == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/read_privileges_route.ts b/x-pack/plugins/lists/server/routes/read_privileges_route.ts
index 0fc72e6cc4341..51ffaa9713b62 100644
--- a/x-pack/plugins/lists/server/routes/read_privileges_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_privileges_route.ts
@@ -25,8 +25,8 @@ export const readPrivilegesRoute = (router: ListsPluginRouter): void => {
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
-        const lists = getListClient(context);
+        const esClient = (await context.core).elasticsearch.client.asCurrentUser;
+        const lists = await getListClient(context);
         const clusterPrivilegesLists = await readPrivileges(esClient, lists.getListIndex());
         const clusterPrivilegesListItems = await readPrivileges(esClient, lists.getListItemIndex());
         const privileges = merge(
diff --git a/x-pack/plugins/lists/server/routes/summary_exception_list_route.ts b/x-pack/plugins/lists/server/routes/summary_exception_list_route.ts
index 932681eb30d2f..f44161a25d372 100644
--- a/x-pack/plugins/lists/server/routes/summary_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/summary_exception_list_route.ts
@@ -41,7 +41,7 @@ export const summaryExceptionListRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { id, list_id: listId, namespace_type: namespaceType, filter } = request.query;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         if (id != null || listId != null) {
           const exceptionListSummary = await exceptionLists.getExceptionListSummary({
             filter,
diff --git a/x-pack/plugins/lists/server/routes/update_endpoint_list_item_route.ts b/x-pack/plugins/lists/server/routes/update_endpoint_list_item_route.ts
index 2c960736460dd..e1e117f6c5604 100644
--- a/x-pack/plugins/lists/server/routes/update_endpoint_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_endpoint_list_item_route.ts
@@ -50,7 +50,7 @@ export const updateEndpointListItemRoute = (router: ListsPluginRouter): void =>
           item_id: itemId,
           tags,
         } = request.body;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         const exceptionListItem = await exceptionLists.updateEndpointListItem({
           _version,
           comments,
diff --git a/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts
index 910d78e68061e..a997ac132e7cf 100644
--- a/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts
@@ -63,7 +63,7 @@ export const updateExceptionListItemRoute = (router: ListsPluginRouter): void =>
             statusCode: 404,
           });
         } else {
-          const exceptionLists = getExceptionListClient(context);
+          const exceptionLists = await getExceptionListClient(context);
           const exceptionListItem = await exceptionLists.updateExceptionListItem({
             _version,
             comments,
diff --git a/x-pack/plugins/lists/server/routes/update_exception_list_route.ts b/x-pack/plugins/lists/server/routes/update_exception_list_route.ts
index 43279e1f1045d..b41a43a0f7c6d 100644
--- a/x-pack/plugins/lists/server/routes/update_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_exception_list_route.ts
@@ -53,7 +53,7 @@ export const updateExceptionListRoute = (router: ListsPluginRouter): void => {
           type,
           version,
         } = request.body;
-        const exceptionLists = getExceptionListClient(context);
+        const exceptionLists = await getExceptionListClient(context);
         if (id == null && listId == null) {
           return siemResponse.error({
             body: 'either id or list_id need to be defined',
diff --git a/x-pack/plugins/lists/server/routes/update_list_item_route.ts b/x-pack/plugins/lists/server/routes/update_list_item_route.ts
index 07ba8539ae624..37c9848f9ddcd 100644
--- a/x-pack/plugins/lists/server/routes/update_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_list_item_route.ts
@@ -31,7 +31,7 @@ export const updateListItemRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { value, id, meta, _version } = request.body;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const listItem = await lists.updateListItem({
           _version,
           id,
diff --git a/x-pack/plugins/lists/server/routes/update_list_route.ts b/x-pack/plugins/lists/server/routes/update_list_route.ts
index 47ab77b444196..bbf49df7e689a 100644
--- a/x-pack/plugins/lists/server/routes/update_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_list_route.ts
@@ -31,7 +31,7 @@ export const updateListRoute = (router: ListsPluginRouter): void => {
       const siemResponse = buildSiemResponse(response);
       try {
         const { name, description, id, meta, _version, version } = request.body;
-        const lists = getListClient(context);
+        const lists = await getListClient(context);
         const list = await lists.updateList({ _version, description, id, meta, name, version });
         if (list == null) {
           return siemResponse.error({
diff --git a/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts b/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts
index fe76de24aa7b9..4a5ed5cc4b0e0 100644
--- a/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts
+++ b/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CustomHttpResponseOptions, KibanaResponseFactory } from 'src/core/server';
+import { CustomHttpResponseOptions, KibanaResponseFactory } from '@kbn/core/server';
 
 /**
  * Copied from x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
diff --git a/x-pack/plugins/lists/server/routes/utils/get_exception_list_client.ts b/x-pack/plugins/lists/server/routes/utils/get_exception_list_client.ts
index 46a02180d7319..e4c948a11ddae 100644
--- a/x-pack/plugins/lists/server/routes/utils/get_exception_list_client.ts
+++ b/x-pack/plugins/lists/server/routes/utils/get_exception_list_client.ts
@@ -9,10 +9,10 @@ import type { ListsRequestHandlerContext } from '../../types';
 import { ErrorWithStatusCode } from '../../error_with_status_code';
 import { ExceptionListClient } from '../../services/exception_lists/exception_list_client';
 
-export const getExceptionListClient = (
+export const getExceptionListClient = async (
   context: ListsRequestHandlerContext
-): ExceptionListClient => {
-  const exceptionLists = context.lists?.getExceptionListClient();
+): Promise<ExceptionListClient> => {
+  const exceptionLists = (await context.lists)?.getExceptionListClient();
   if (exceptionLists == null) {
     throw new ErrorWithStatusCode('Exception lists is not found as a plugin', 404);
   } else {
diff --git a/x-pack/plugins/lists/server/routes/utils/get_list_client.ts b/x-pack/plugins/lists/server/routes/utils/get_list_client.ts
index 1c6e995f3fac6..9880148681809 100644
--- a/x-pack/plugins/lists/server/routes/utils/get_list_client.ts
+++ b/x-pack/plugins/lists/server/routes/utils/get_list_client.ts
@@ -9,8 +9,8 @@ import { ListClient } from '../../services/lists/list_client';
 import { ErrorWithStatusCode } from '../../error_with_status_code';
 import type { ListsRequestHandlerContext } from '../../types';
 
-export const getListClient = (context: ListsRequestHandlerContext): ListClient => {
-  const lists = context.lists?.getListClient();
+export const getListClient = async (context: ListsRequestHandlerContext): Promise<ListClient> => {
+  const lists = (await context.lists)?.getListClient();
   if (lists == null) {
     throw new ErrorWithStatusCode('Lists is not found as a plugin', 404);
   } else {
diff --git a/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts b/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts
index 9e6064d192d40..aeb5447285939 100644
--- a/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts
+++ b/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { RouteValidationResultFactory } from 'src/core/server';
+import { RouteValidationResultFactory } from '@kbn/core/server';
 
 import { buildRouteValidation } from './route_validation';
 
diff --git a/x-pack/plugins/lists/server/routes/utils/route_validation.ts b/x-pack/plugins/lists/server/routes/utils/route_validation.ts
index 680b67949bde5..ceeb63c002653 100644
--- a/x-pack/plugins/lists/server/routes/utils/route_validation.ts
+++ b/x-pack/plugins/lists/server/routes/utils/route_validation.ts
@@ -15,12 +15,11 @@ import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import * as rt from 'io-ts';
 import { exactCheck, formatErrors } from '@kbn/securitysolution-io-ts-utils';
-
 import {
   RouteValidationError,
   RouteValidationFunction,
   RouteValidationResultFactory,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 type RequestValidationResult<T> =
   | {
diff --git a/x-pack/plugins/lists/server/saved_objects/exception_list.ts b/x-pack/plugins/lists/server/saved_objects/exception_list.ts
index 3d31bdd561140..be0a9982e2913 100644
--- a/x-pack/plugins/lists/server/saved_objects/exception_list.ts
+++ b/x-pack/plugins/lists/server/saved_objects/exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   exceptionListAgnosticSavedObjectType,
   exceptionListSavedObjectType,
diff --git a/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts b/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts
index a83ab3cc7d13a..3b621a12ad4ef 100644
--- a/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts
+++ b/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
 import { exceptionListAgnosticType, exceptionListType } from './exception_list';
 
diff --git a/x-pack/plugins/lists/server/saved_objects/migrations.test.ts b/x-pack/plugins/lists/server/saved_objects/migrations.test.ts
index 7fea07f479cc8..81e290effafb8 100644
--- a/x-pack/plugins/lists/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/lists/server/saved_objects/migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import uuid from 'uuid';
 import {
   ENDPOINT_LIST_ID,
diff --git a/x-pack/plugins/lists/server/saved_objects/migrations.ts b/x-pack/plugins/lists/server/saved_objects/migrations.ts
index ec6617f6b4730..dfa1615f195a6 100644
--- a/x-pack/plugins/lists/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/lists/server/saved_objects/migrations.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { SavedObjectSanitizedDoc, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectSanitizedDoc, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import {
   EntriesArray,
   NonEmptyNestedEntriesArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts b/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts
index 0fbcd08316166..af112a8998212 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts
@@ -8,7 +8,7 @@
 import type {
   SavedObjectsClientContract,
   SavedObjectsClosePointInTimeResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type { PitId } from '@kbn/securitysolution-io-ts-list-types';
 
 interface ClosePointInTimeOptions {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts
index a677e260d0848..d197aed76a8b6 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import { Version } from '@kbn/securitysolution-io-ts-types';
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts
index 4275e23032a76..00b955cda8126 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import type { Version } from '@kbn/securitysolution-io-ts-types';
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts
index 60a53af4deb75..65f06b052565b 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import type {
   Description,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts
index 9771c7d485e50..6c72f546e6694 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import type {
   CreateCommentsArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts
index be71f4c79577a..2d7332739e43c 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   ExceptionListSchema,
   IdOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts
index 89ea0baf22caf..380aad63dfc9d 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   ExceptionListItemSchema,
   Id,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts
index c23c8967fef68..6a47052143069 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts
@@ -12,7 +12,7 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import { asyncForEach } from '@kbn/std';
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { findExceptionListItemPointInTimeFinder } from './find_exception_list_item_point_in_time_finder';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
index eaa4651b384f7..218ccf585dec4 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
@@ -7,7 +7,7 @@
 
 import { Readable } from 'stream';
 
-import { loggingSystemMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import {
   EXCEPTION_LIST_NAMESPACE,
@@ -17,7 +17,8 @@ import type {
   SavedObjectsBulkUpdateObject,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
+import type { SavedObject } from '@kbn/core/types';
 
 import { getFoundExceptionListSchemaMock } from '../../../common/schemas/response/found_exception_list_schema.mock';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
@@ -30,7 +31,6 @@ import {
 import { ExtensionPointStorage, ExtensionPointStorageClientInterface } from '../extension_points';
 import type { ExceptionListSoSchema } from '../../schemas/saved_objects';
 import { DATE_NOW, ID, _VERSION } from '../../../common/constants.mock';
-import type { SavedObject } from '../../../../../../src/core/types';
 
 import { ExceptionListClient } from './exception_list_client';
 import type {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts
index 1a444c403d3c2..89516d5a9caf2 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { httpServerMock } from '@kbn/core/server/mocks';
+
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
 import {
@@ -12,7 +14,6 @@ import {
   createExtensionPointStorageMock,
 } from '../extension_points/extension_point_storage.mock';
 import type { ExtensionPointCallbackDataArgument } from '../extension_points';
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
 
 import {
   getCreateExceptionListItemOptionsMock,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts
index 85dbd76e7b7c4..c586a9d764147 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsClosePointInTimeResponse,
   SavedObjectsOpenPointInTimeResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   ExceptionListItemSchema,
   ExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts
index 1f440415fef40..2b3a800ac5a5a 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts
@@ -11,7 +11,7 @@ import type {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectsOpenPointInTimeOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type {
   CreateCommentsArray,
   Description,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts
index 0f8e4bf7bbf45..06e764bd1658b 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts
index b2cd7d38d8d56..fecbb91837b6f 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts
@@ -14,7 +14,7 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { findExceptionListItemPointInTimeFinder } from './find_exception_list_item_point_in_time_finder';
 import { getExceptionList } from './get_exception_list';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts
index 46d292e93a2d1..4f93527dbec93 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts
index 5c23475573bb6..c08057d77ebbe 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts
index 8b90315c80ada..a43bee154e8da 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts
index 5b4601dfadc22..f0e1fa07749f8 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   NamespaceTypeArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts
index d9020ee42b6ec..8bd79eaa7f3a2 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   MaxSizeOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts
index 356735e773a01..77869f2f847fa 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts
index 711c8f9c253d1..88812995f4aa0 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   Id,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts
index e854bd6128746..bc34bb18162f7 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   Id,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts
index b0b66ffb70d77..4d63859669b71 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts
@@ -12,11 +12,8 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
 import { ExceptionListSoSchema } from '../../schemas/saved_objects';
 
 import { transformSavedObjectToExceptionList } from './utils';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts
index 12580af8a1d07..481394e247f70 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts
@@ -12,11 +12,8 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
 import { ExceptionListSoSchema } from '../../schemas/saved_objects';
 
 import { transformSavedObjectToExceptionListItem } from './utils';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts
index 7f871d9f78ebf..f56410e3a56b5 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts
@@ -7,9 +7,8 @@
 
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { ExceptionListSummarySchema } from '@kbn/securitysolution-io-ts-list-types';
-
-import type { SavedObjectsClientContract } from '../../../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { getExceptionListSummary } from './get_exception_list_summary';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts
index 67aaddee502de..081bb1787eff8 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts
@@ -13,11 +13,8 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
 import { ExceptionListSoSchema } from '../../schemas/saved_objects';
 
 interface GetExceptionListSummaryOptions {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts
index 63f9bd27b888f..375e211cabe46 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts
@@ -8,7 +8,7 @@
 import {
   getImportExceptionsListItemSchemaMock,
   getImportExceptionsListSchemaMock,
-} from '../../../../lists/common/schemas/request/import_exceptions_schema.mock';
+} from '../../../common/schemas/request/import_exceptions_schema.mock';
 import { createExtensionPointStorageMock } from '../extension_points/extension_point_storage.mock';
 
 import { importExceptionLists } from './utils/import/import_exception_lists';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts
index 0657c3586dd13..deef7b7b21917 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts
@@ -16,7 +16,7 @@ import {
   ImportExceptionsResponseSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { createPromiseFromStreams } from '@kbn/utils';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { chunk } from 'lodash/fp';
 
 import { importExceptionLists } from './utils/import/import_exception_lists';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts b/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts
index 271676527dd2f..c959a91aad5bb 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts
@@ -9,7 +9,7 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsOpenPointInTimeOptions,
   SavedObjectsOpenPointInTimeResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type { NamespaceType } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectTypes } from '@kbn/securitysolution-list-utils';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts
index 7efe64fb96070..aab2718b2d84c 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   DescriptionOrUndefined,
   ExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts
index d0505a9513385..81e58709528c7 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   DescriptionOrUndefined,
   EntriesArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts
index 4427b706cf268..a3dbc4cdfa9eb 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { ENTRIES } from '../../../../../common/constants.mock';
 
 import { bulkCreateImportedItems } from './bulk_create_imported_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts
index 3cb45bf035170..55ac181f5e266 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts
index caf3651935610..9001f225e7364 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 
 import { bulkCreateImportedLists } from './bulk_create_imported_lists';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts
index 5b18315b4cd43..eae8a92d79b2b 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts
index 5f2fb3f11ef98..d52e07740910e 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { ENTRIES } from '../../../../../common/constants.mock';
 
 import { bulkUpdateImportedItems } from './bulk_update_imported_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts
index 049f93ffe700b..beba05e7fe2aa 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts
index 16659e2c547cb..39ff7cc7bbf40 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 
 import { bulkUpdateImportedLists } from './bulk_update_imported_lists';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts
index 003ce9d2b029b..61ac39a22406d 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts
index cc7914d219550..17b0ce12913fb 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { NamespaceType } from '@kbn/securitysolution-io-ts-list-types';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { deleteExceptionListItemByList } from '../../delete_exception_list_items_by_list';
 
 import { deleteListItemsToBeOverwritten } from './delete_list_items_to_overwrite';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts
index f2b3afabcac42..3d0cc609bde51 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts
@@ -6,7 +6,7 @@
  */
 
 import { NamespaceType } from '@kbn/securitysolution-io-ts-list-types';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { deleteExceptionListItemByList } from '../../delete_exception_list_items_by_list';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts
index 445031e6c105a..60d63c00b0114 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
-import type { SavedObjectsClientContract } from '../../../../../../../../src/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+
 import { getImportExceptionsListItemSchemaDecodedMock } from '../../../../../common/schemas/request/import_exceptions_schema.mock';
 
 import {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts
index 3884d12b4bb6f..14d12ceb950a3 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts
@@ -11,7 +11,7 @@ import {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectTypes } from '@kbn/securitysolution-list-utils';
-import { SavedObjectsClientContract, SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects';
 import { getExceptionListsItemFilter } from '../get_exception_lists_item_filter';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts
index f0e35afe8561d..292455db7a177 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
-import type { SavedObjectsClientContract } from '../../../../../../../../src/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+
 import { findExceptionList } from '../../find_exception_list';
 
 import { findAllListTypes, getAllListTypes, getListFilter } from './find_all_exception_list_types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts
index 51538faa66942..870acc6cc4462 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts
@@ -11,7 +11,7 @@ import {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectTypes } from '@kbn/securitysolution-list-utils';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { findExceptionList } from '../../find_exception_list';
 import { CHUNK_PARSED_OBJECT_SIZE } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts
index c19a2bf850d37..acb516993fe60 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts
@@ -9,7 +9,7 @@ import {
   ImportExceptionListItemSchemaDecoded,
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ImportDataResponse, ImportResponse } from '../../import_exception_list_and_items';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts
index 04e629695ef1a..13141a7a16400 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts
@@ -6,8 +6,8 @@
  */
 
 import { ImportExceptionListSchemaDecoded } from '@kbn/securitysolution-io-ts-list-types';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
-import { SavedObjectsClientContract } from '../../../../../../../../src/core/server/';
 import { ImportDataResponse, ImportResponse } from '../../import_exception_list_and_items';
 
 import { getAllListTypes } from './find_all_exception_list_types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts
index da4884506ef45..9bfc1a333969e 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from '@kbn/core/server';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import {
   BulkErrorSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts
index c27b76004b7f0..3c7e6217559e5 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from '@kbn/core/server';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import {
   BulkErrorSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts
index b0b0151e5f537..e61ce820af854 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts
@@ -6,7 +6,11 @@
  */
 
 import uuid from 'uuid';
-import { SavedObject, SavedObjectsFindResponse, SavedObjectsUpdateResponse } from 'kibana/server';
+import {
+  SavedObject,
+  SavedObjectsFindResponse,
+  SavedObjectsUpdateResponse,
+} from '@kbn/core/server';
 import {
   CommentsArray,
   CreateComment,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts
index 10dd4f386d1b3..3317722fb72bc 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts
@@ -15,7 +15,7 @@ import { getCreateExceptionListItemOptionsMock } from '../exception_list_client.
 import { validateData } from './validate_data';
 import { DataValidationError } from './errors';
 
-import { transformCreateExceptionListItemOptionsToCreateExceptionListItemSchema } from './index';
+import { transformCreateExceptionListItemOptionsToCreateExceptionListItemSchema } from '.';
 
 describe('when using `validateData()` utility', () => {
   let data: CreateExceptionListItemSchema;
diff --git a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts
index 80c89e14dc2cf..d8c0596ba3501 100644
--- a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts
@@ -6,8 +6,8 @@
  */
 
 import { MockedLogger, loggerMock } from '@kbn/logging-mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import { ExceptionListClient } from '../exception_lists/exception_list_client';
 
 import { ExtensionPointStorage } from './extension_point_storage';
diff --git a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts
index 4e76794f1db1a..03a7d9a7ccc63 100644
--- a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 
 import {
   ExtensionPoint,
diff --git a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts
index 453d5deccc8c8..f2d2035459b54 100644
--- a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import type {
   ExtensionPoint,
diff --git a/x-pack/plugins/lists/server/services/extension_points/types.ts b/x-pack/plugins/lists/server/services/extension_points/types.ts
index dd94612a60295..61aa7c451362d 100644
--- a/x-pack/plugins/lists/server/services/extension_points/types.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { UnionToIntersection } from '@kbn/utility-types';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 
 import {
   CreateExceptionListItemOptions,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts
index 31befdc2122d3..302b5919fbbdf 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { CreateListItemOptions } from '../items';
 import {
   DATE_NOW,
   LIST_ID,
@@ -20,6 +19,8 @@ import {
   USER,
 } from '../../../common/constants.mock';
 
+import { CreateListItemOptions } from '.';
+
 export const getCreateListItemOptionsMock = (): CreateListItemOptions => ({
   dateNow: DATE_NOW,
   deserializer: undefined,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.test.ts b/x-pack/plugins/lists/server/services/items/create_list_item.test.ts
index 305aa98f0e9ed..ccbfac5819c91 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getListItemResponseMock } from '../../../common/schemas/response/list_item_schema.mock';
 import { LIST_ITEM_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.ts b/x-pack/plugins/lists/server/services/items/create_list_item.ts
index 18a9f3ebe7726..966b8b63d5b68 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   DeserializerOrUndefined,
   IdOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts
index d2ceb32b91951..68c01610df988 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { CreateListItemsBulkOptions } from '../items';
 import {
   DATE_NOW,
   LIST_ID,
@@ -21,6 +20,8 @@ import {
   VALUE_2,
 } from '../../../common/constants.mock';
 
+import { CreateListItemsBulkOptions } from '.';
+
 export const getCreateListItemBulkOptionsMock = (): CreateListItemsBulkOptions => ({
   dateNow: DATE_NOW,
   deserializer: undefined,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
index d9b3bc322cd7a..83ff9c5bdc95f 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   DeserializerOrUndefined,
   MetaOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts
index 89331d02dc3ff..4b2807fdb5d7f 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { DeleteListItemOptions } from '../items';
 import { LIST_ITEM_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 
+import { DeleteListItemOptions } from '.';
+
 export const getDeleteListItemOptionsMock = (): DeleteListItemOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   id: LIST_ITEM_ID,
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item.ts b/x-pack/plugins/lists/server/services/items/delete_list_item.ts
index c43f2faf8c52d..8fbdae3420acf 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListItem } from '.';
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts
index 54bfe3bae0811..74d7016653c15 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { DeleteListItemByValueOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE } from '../../../common/constants.mock';
 
+import { DeleteListItemByValueOptions } from '.';
+
 export const getDeleteListItemByValueOptionsMock = (): DeleteListItemByValueOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
index cc3dc92f8f152..133beae0e6b62 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getQueryFilterFromTypeValue } from '../utils';
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts
index 99c2f18877032..7e0c18ebbe487 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { LIST_ID, LIST_INDEX, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 import { getShardMock } from '../../schemas/common/get_shard.mock';
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.test.ts b/x-pack/plugins/lists/server/services/items/find_list_item.test.ts
index 48625a74b9ae1..7eee57887f227 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getFoundListItemSchemaMock } from '../../../common/schemas/response/found_list_item_schema.mock';
 import { getShardMock } from '../../schemas/common/get_shard.mock';
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.ts b/x-pack/plugins/lists/server/services/items/find_list_item.ts
index 459cadfe0abcf..f390929d820eb 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   FoundListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item.test.ts b/x-pack/plugins/lists/server/services/items/get_list_item.test.ts
index 7b867db9868d4..361b8a8b36327 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getListItemResponseMock } from '../../../common/schemas/response/list_item_schema.mock';
 import {
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item.ts b/x-pack/plugins/lists/server/services/items/get_list_item.ts
index 6a59a7f051fe1..f08900522b722 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { transformElasticToListItem } from '../utils';
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts
index 3cd329fca3708..7847b39c9b6bd 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { GetListItemByValueOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE } from '../../../common/constants.mock';
 
+import { GetListItemByValueOptions } from '.';
+
 export const getListItemByValueOptionsMocks = (): GetListItemByValueOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
index d631720d11cd3..f44a5e2577411 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListItemByValues } from '.';
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts
index 169934b2ee256..4efa627b90cdf 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { GetListItemByValuesOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE, VALUE_2 } from '../../../common/constants.mock';
 
+import { GetListItemByValuesOptions } from '.';
+
 export const getListItemByValuesOptionsMocks = (): GetListItemByValuesOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts
index d57fe0e2ead92..5d6bef3db9fe7 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import {
   DATE_NOW,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
index b0cdc77724ac7..867d721d8440c 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import {
diff --git a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts
index 656b569502fbb..4b085a990627d 100644
--- a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { SearchListItemByValuesOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE, VALUE_2 } from '../../../common/constants.mock';
 
+import { SearchListItemByValuesOptions } from '.';
+
 export const searchListItemByValuesOptionsMocks = (): SearchListItemByValuesOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts
index 2511db01d1901..5b75860297ae6 100644
--- a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts
+++ b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { SearchListItemArraySchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE, VALUE_2 } from '../../../common/constants.mock';
diff --git a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts
index 2a39f863311b9..365c5a57c724b 100644
--- a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts
+++ b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { SearchListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import {
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts
index 705e207853543..c68b278e6b735 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { UpdateListItemOptions } from '../items';
 import {
   DATE_NOW,
   LIST_ITEM_ID,
@@ -18,6 +17,8 @@ import {
   VALUE,
 } from '../../../common/constants.mock';
 
+import { UpdateListItemOptions } from '.';
+
 export const getUpdateListItemOptionsMock = (): UpdateListItemOptions => ({
   _version: undefined,
   dateNow: DATE_NOW,
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.test.ts b/x-pack/plugins/lists/server/services/items/update_list_item.test.ts
index a42253d3c1ae9..c3ff32d4e5074 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListItemResponseMock } from '../../../common/schemas/response/list_item_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.ts b/x-pack/plugins/lists/server/services/items/update_list_item.ts
index 17e706228fb46..71f6f9eba4290 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Id,
   ListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts
index 949b7a5c1a691..ff0baba16576d 100644
--- a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { ImportListItemsToStreamOptions, WriteBufferToItemsOptions } from '../items';
 import {
   LIST_ID,
   LIST_INDEX,
@@ -22,6 +21,8 @@ import { getConfigMockDecoded } from '../../config.mock';
 
 import { TestReadable } from './test_readable.mock';
 
+import { ImportListItemsToStreamOptions, WriteBufferToItemsOptions } from '.';
+
 export const getImportListItemsToStreamOptionsMock = (): ImportListItemsToStreamOptions => ({
   config: getConfigMockDecoded(),
   deserializer: undefined,
diff --git a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
index edd78e350054d..9e9b15284cc67 100644
--- a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
+++ b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
@@ -7,7 +7,7 @@
 
 import { Readable } from 'stream';
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   DeserializerOrUndefined,
   ListIdOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts
index 1bc0b708bdc0a..0a5395d022b63 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { LIST_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 import { getSearchListItemMock } from '../../schemas/elastic_response/search_es_list_item_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
index 1e9db1ef062f0..d41dc61828563 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
@@ -8,7 +8,7 @@
 import { PassThrough } from 'stream';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { ErrorWithStatusCode } from '../../error_with_status_code';
 import { findSourceValue } from '../utils/find_source_value';
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts
index 8961d7527ad0b..b725ed7856e91 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts
@@ -8,16 +8,17 @@
 import { Stream } from 'stream';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+
+import { LIST_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
+import { getSearchListItemMock } from '../../schemas/elastic_response/search_es_list_item_schema.mock';
 
 import {
   ExportListItemsToStreamOptions,
   GetResponseOptions,
   WriteNextResponseOptions,
   WriteResponseHitsToStreamOptions,
-} from '../items';
-import { LIST_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
-import { getSearchListItemMock } from '../../schemas/elastic_response/search_es_list_item_schema.mock';
+} from '.';
 
 export const getExportListItemsToStreamOptionsMock = (): ExportListItemsToStreamOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.mock.ts b/x-pack/plugins/lists/server/services/lists/create_list.mock.ts
index 5e9c8e38c3f5e..3b5522ea4f5a8 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { CreateListOptions } from '../lists';
 import {
   DATE_NOW,
   DESCRIPTION,
@@ -23,6 +22,8 @@ import {
   VERSION,
 } from '../../../common/constants.mock';
 
+import { CreateListOptions } from '.';
+
 export const getCreateListOptionsMock = (): CreateListOptions => ({
   dateNow: DATE_NOW,
   description: DESCRIPTION,
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.test.ts b/x-pack/plugins/lists/server/services/lists/create_list.test.ts
index b2ccbd0d84fa0..1a9a6977ac907 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.test.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.ts b/x-pack/plugins/lists/server/services/lists/create_list.ts
index eefcd0f41e448..a9f7bd48df5d0 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Description,
   DeserializerOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts b/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts
index f97fbd2d88cc0..cfc5c242f5cc5 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Description,
   DeserializerOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts b/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts
index 569083aad40db..fc8bdc797465c 100644
--- a/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { DeleteListOptions } from '../lists';
 import { LIST_ID, LIST_INDEX, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 
+import { DeleteListOptions } from '.';
+
 export const getDeleteListOptionsMock = (): DeleteListOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   id: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/lists/delete_list.ts b/x-pack/plugins/lists/server/services/lists/delete_list.ts
index 517723fc227de..f82845e339ed7 100644
--- a/x-pack/plugins/lists/server/services/lists/delete_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/delete_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getList } from './get_list';
diff --git a/x-pack/plugins/lists/server/services/lists/find_list.ts b/x-pack/plugins/lists/server/services/lists/find_list.ts
index 63f636370a144..7d08302f0bc25 100644
--- a/x-pack/plugins/lists/server/services/lists/find_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/find_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   FoundListSchema,
diff --git a/x-pack/plugins/lists/server/services/lists/get_list.test.ts b/x-pack/plugins/lists/server/services/lists/get_list.test.ts
index f9e64fe70eeca..aa04539c687c9 100644
--- a/x-pack/plugins/lists/server/services/lists/get_list.test.ts
+++ b/x-pack/plugins/lists/server/services/lists/get_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
 import { LIST_ID, LIST_INDEX } from '../../../common/constants.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/get_list.ts b/x-pack/plugins/lists/server/services/lists/get_list.ts
index a1e34bdce6319..32c9efaab8c2a 100644
--- a/x-pack/plugins/lists/server/services/lists/get_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/get_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { transformElasticToList } from '../utils/transform_elastic_to_list';
diff --git a/x-pack/plugins/lists/server/services/lists/list_client.mock.ts b/x-pack/plugins/lists/server/services/lists/list_client.mock.ts
index 5ea6f7a8853d8..6ad3985ccddbf 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client.mock.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getFoundListItemSchemaMock } from '../../../common/schemas/response/found_list_item_schema.mock';
 import { getFoundListSchemaMock } from '../../../common/schemas/response/found_list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/list_client.ts b/x-pack/plugins/lists/server/services/lists/list_client.ts
index 602c1c796a0e0..71eb799fa6859 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import {
   createBootstrapIndex,
   deleteAllIndex,
@@ -27,15 +27,6 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 
 import type { ConfigType } from '../../config';
-import {
-  createList,
-  deleteList,
-  findList,
-  getList,
-  getListIndex,
-  getListTemplate,
-  updateList,
-} from '../../services/lists';
 import {
   createListItem,
   deleteListItem,
@@ -50,7 +41,7 @@ import {
   importListItemsToStream,
   searchListItemByValues,
   updateListItem,
-} from '../../services/items';
+} from '../items';
 import listsItemsPolicy from '../items/list_item_policy.json';
 
 import listPolicy from './list_policy.json';
@@ -76,6 +67,16 @@ import type {
 } from './list_client_types';
 import { createListIfItDoesNotExist } from './create_list_if_it_does_not_exist';
 
+import {
+  createList,
+  deleteList,
+  findList,
+  getList,
+  getListIndex,
+  getListTemplate,
+  updateList,
+} from '.';
+
 /**
  * Class for use for value lists are are associated with exception lists.
  * See {@link https://www.elastic.co/guide/en/security/current/lists-api-create-container.html}
diff --git a/x-pack/plugins/lists/server/services/lists/list_client_types.ts b/x-pack/plugins/lists/server/services/lists/list_client_types.ts
index 794d7f2d6da80..af8f1368b823a 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client_types.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client_types.ts
@@ -7,7 +7,7 @@
 
 import type { PassThrough, Readable } from 'stream';
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Description,
   DescriptionOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.mock.ts b/x-pack/plugins/lists/server/services/lists/update_list.mock.ts
index 5648a8df7dde8..5b8742b8bf5b3 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { UpdateListOptions } from '../lists';
 import {
   DATE_NOW,
   DESCRIPTION,
@@ -20,6 +19,8 @@ import {
   VERSION,
 } from '../../../common/constants.mock';
 
+import { UpdateListOptions } from '.';
+
 export const getUpdateListOptionsMock = (): UpdateListOptions => ({
   _version: undefined,
   dateNow: DATE_NOW,
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.test.ts b/x-pack/plugins/lists/server/services/lists/update_list.test.ts
index 2b9bdd21a40d1..9d0f9a9d775a3 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.test.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.ts b/x-pack/plugins/lists/server/services/lists/update_list.ts
index aed0b409b5bbe..300e4a20946c2 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   DescriptionOrUndefined,
   Id,
diff --git a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
index 6e50d7414cf11..ccc2d05d92ae0 100644
--- a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   SortFieldOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts b/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
index 8ca0d574fd6e6..8f6f2e2d51e79 100644
--- a/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
+++ b/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   SortFieldOrUndefined,
diff --git a/x-pack/plugins/lists/server/types.ts b/x-pack/plugins/lists/server/types.ts
index 0c395c438750d..78fdd0e8534a6 100644
--- a/x-pack/plugins/lists/server/types.ts
+++ b/x-pack/plugins/lists/server/types.ts
@@ -6,15 +6,14 @@
  */
 
 import {
+  CustomRequestHandlerContext,
   ElasticsearchClient,
   IContextProvider,
   IRouter,
-  RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'kibana/server';
-
-import type { SecurityPluginStart } from '../../security/server';
-import type { SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/core/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 import { ListClient } from './services/lists/list_client';
 import { ExceptionListClient } from './services/exception_lists/exception_list_client';
@@ -25,6 +24,7 @@ import type {
 
 export type ContextProvider = IContextProvider<ListsRequestHandlerContext, 'lists'>;
 export type ListsPluginStart = void;
+
 export interface PluginsStart {
   security: SecurityPluginStart | undefined | null;
   spaces: SpacesPluginStart | undefined | null;
@@ -61,9 +61,9 @@ export interface ListsApiRequestHandlerContext {
 /**
  * @internal
  */
-export interface ListsRequestHandlerContext extends RequestHandlerContext {
+export type ListsRequestHandlerContext = CustomRequestHandlerContext<{
   lists?: ListsApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/lists/tsconfig.json b/x-pack/plugins/lists/tsconfig.json
index 691c5243d9db8..6cfffbbaa7421 100644
--- a/x-pack/plugins/lists/tsconfig.json
+++ b/x-pack/plugins/lists/tsconfig.json
@@ -18,5 +18,6 @@
     { "path": "../../../src/core/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
     { "path": "../security/tsconfig.json"},
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/logstash/kibana.json b/x-pack/plugins/logstash/kibana.json
index a051800d1f5a1..b43f0e0009343 100644
--- a/x-pack/plugins/logstash/kibana.json
+++ b/x-pack/plugins/logstash/kibana.json
@@ -11,5 +11,5 @@
   "optionalPlugins": ["home", "monitoring", "security"],
   "server": true,
   "ui": true,
-  "requiredBundles": ["esUiShared", "home", "kibanaReact"]
+  "requiredBundles": ["esUiShared", "kibanaReact"]
 }
diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js b/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
index 47692a5f94767..7fac577ec688c 100644
--- a/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
+++ b/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
@@ -15,7 +15,7 @@ import 'brace/theme/github';
 
 import { isEmpty } from 'lodash';
 import { TOOLTIPS } from '../../../../common/constants/tooltips';
-import { EuiCodeEditor } from '../../../../../../../src/plugins/es_ui_shared/public';
+import { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
 import {
   EuiButton,
   EuiButtonEmpty,
diff --git a/x-pack/plugins/logstash/public/application/index.tsx b/x-pack/plugins/logstash/public/application/index.tsx
index 8b9aac2b3c341..d4b4a39b6df9f 100644
--- a/x-pack/plugins/logstash/public/application/index.tsx
+++ b/x-pack/plugins/logstash/public/application/index.tsx
@@ -11,9 +11,9 @@ import { Router, Route, Switch, Redirect } from 'react-router-dom';
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
 
-import { CoreStart } from 'src/core/public';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   ClusterService,
   MonitoringService,
diff --git a/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx b/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx
index 3575e46294866..ef75f0e758a3a 100644
--- a/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx
+++ b/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx
@@ -10,14 +10,14 @@ import usePromise from 'react-use/lib/usePromise';
 import { History } from 'history';
 
 import { i18n } from '@kbn/i18n';
-import { ToastsStart } from 'src/core/public';
+import { ToastsStart } from '@kbn/core/public';
 
-// @ts-ignore
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+// @ts-expect-error
 import { PipelineEditor } from './components/pipeline_editor';
-// @ts-ignore
+// @ts-expect-error
 import { Pipeline } from '../models/pipeline';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
-// @ts-ignore
+// @ts-expect-error
 import * as Breadcrumbs from './breadcrumbs';
 
 const usePipeline = (
diff --git a/x-pack/plugins/logstash/public/plugin.ts b/x-pack/plugins/logstash/public/plugin.ts
index cfca262ec09c1..a937006898bb1 100644
--- a/x-pack/plugins/logstash/public/plugin.ts
+++ b/x-pack/plugins/logstash/public/plugin.ts
@@ -10,13 +10,10 @@ import { Subscription, Subject, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { once } from 'lodash';
 
-import { Capabilities, CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import {
-  HomePublicPluginSetup,
-  FeatureCatalogueCategory,
-} from '../../../../src/plugins/home/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { Capabilities, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 // @ts-ignore
 import { LogstashLicenseService } from './services';
@@ -78,7 +75,7 @@ export class LogstashPlugin implements Plugin<void, void, SetupDeps> {
               icon: 'pipelineApp',
               path: '/app/management/ingest/pipelines',
               showOnHomePage: false,
-              category: FeatureCatalogueCategory.ADMIN,
+              category: 'admin',
             });
           });
         }
diff --git a/x-pack/plugins/logstash/server/index.ts b/x-pack/plugins/logstash/server/index.ts
index 2d2ad27bb2fd1..3e89eeb9b5795 100644
--- a/x-pack/plugins/logstash/server/index.ts
+++ b/x-pack/plugins/logstash/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { LogstashPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) => new LogstashPlugin(context);
diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts b/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts
index 8556104bf1dde..7e80555e38db1 100755
--- a/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts
+++ b/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { licensingMock } from '../../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { checkLicense } from './check_license';
 
 describe('check_license', function () {
diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.ts b/x-pack/plugins/logstash/server/lib/check_license/check_license.ts
index e7fd630756bed..da90a30830988 100644
--- a/x-pack/plugins/logstash/server/lib/check_license/check_license.ts
+++ b/x-pack/plugins/logstash/server/lib/check_license/check_license.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { CheckLicense } from '../../../../licensing/server';
+import { CheckLicense } from '@kbn/licensing-plugin/server';
 
 export const checkLicense: CheckLicense = (license) => {
   if (!license.isAvailable) {
diff --git a/x-pack/plugins/logstash/server/plugin.ts b/x-pack/plugins/logstash/server/plugin.ts
index f40e500671fc3..13cd3ba3fc472 100644
--- a/x-pack/plugins/logstash/server/plugin.ts
+++ b/x-pack/plugins/logstash/server/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { registerRoutes } from './routes';
 
 interface SetupDeps {
diff --git a/x-pack/plugins/logstash/server/routes/cluster/load.ts b/x-pack/plugins/logstash/server/routes/cluster/load.ts
index 1c84dd038abf2..d0967ee123763 100644
--- a/x-pack/plugins/logstash/server/routes/cluster/load.ts
+++ b/x-pack/plugins/logstash/server/routes/cluster/load.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import { Cluster } from '../../models/cluster';
 import { checkLicense } from '../../lib/check_license';
 import type { LogstashPluginRouter } from '../../types';
@@ -18,7 +18,7 @@ export function registerClusterLoadRoute(router: LogstashPluginRouter) {
     },
     wrapRouteWithLicenseCheck(checkLicense, async (context, request, response) => {
       try {
-        const { client } = context.core.elasticsearch;
+        const { client } = (await context.core).elasticsearch;
         const info = await client.asCurrentUser.info();
         return response.ok({
           body: {
diff --git a/x-pack/plugins/logstash/server/routes/index.ts b/x-pack/plugins/logstash/server/routes/index.ts
index f69660b43720d..63b2febd3eda7 100644
--- a/x-pack/plugins/logstash/server/routes/index.ts
+++ b/x-pack/plugins/logstash/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type { LogstashPluginRouter } from '../types';
 import { registerClusterLoadRoute } from './cluster';
 import {
diff --git a/x-pack/plugins/logstash/server/routes/pipeline/delete.ts b/x-pack/plugins/logstash/server/routes/pipeline/delete.ts
index 59aaaef63786e..ba9ea73850cc4 100644
--- a/x-pack/plugins/logstash/server/routes/pipeline/delete.ts
+++ b/x-pack/plugins/logstash/server/routes/pipeline/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import type { LogstashPluginRouter } from '../../types';
 import { checkLicense } from '../../lib/check_license';
 
@@ -24,7 +24,7 @@ export function registerPipelineDeleteRoute(router: LogstashPluginRouter) {
       checkLicense,
       router.handleLegacyErrors(async (context, request, response) => {
         const { id } = request.params;
-        const { client } = context.core.elasticsearch;
+        const { client } = (await context.core).elasticsearch;
 
         try {
           await client.asCurrentUser.logstash.deletePipeline({ id });
diff --git a/x-pack/plugins/logstash/server/routes/pipeline/load.ts b/x-pack/plugins/logstash/server/routes/pipeline/load.ts
index 615e3998dbd24..8a657207414d9 100644
--- a/x-pack/plugins/logstash/server/routes/pipeline/load.ts
+++ b/x-pack/plugins/logstash/server/routes/pipeline/load.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import type { LogstashPluginRouter } from '../../types';
 
 import { Pipeline } from '../../models/pipeline';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
 import { checkLicense } from '../../lib/check_license';
 
 export function registerPipelineLoadRoute(router: LogstashPluginRouter) {
@@ -26,7 +26,7 @@ export function registerPipelineLoadRoute(router: LogstashPluginRouter) {
       checkLicense,
       router.handleLegacyErrors(async (context, request, response) => {
         const { id } = request.params;
-        const { client } = context.core.elasticsearch;
+        const { client } = (await context.core).elasticsearch;
 
         const result = await client.asCurrentUser.logstash.getPipeline({ id }, { ignore: [404] });
 
diff --git a/x-pack/plugins/logstash/server/routes/pipeline/save.ts b/x-pack/plugins/logstash/server/routes/pipeline/save.ts
index 83f6ee9b00ba9..5c50dac7e050c 100644
--- a/x-pack/plugins/logstash/server/routes/pipeline/save.ts
+++ b/x-pack/plugins/logstash/server/routes/pipeline/save.ts
@@ -8,9 +8,9 @@
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
 
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { Pipeline } from '../../models/pipeline';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
-import { SecurityPluginSetup } from '../../../../security/server';
 import { checkLicense } from '../../lib/check_license';
 import type { LogstashPluginRouter } from '../../types';
 
@@ -42,7 +42,7 @@ export function registerPipelineSaveRoute(
             username = user?.username;
           }
 
-          const { client } = context.core.elasticsearch;
+          const { client } = (await context.core).elasticsearch;
           const pipeline = Pipeline.fromDownstreamJSON(request.body, request.params.id, username);
 
           await client.asCurrentUser.logstash.putPipeline({
diff --git a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts b/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
index a532dc6fc4997..777b86ea65284 100644
--- a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
+++ b/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'src/core/server';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 
 import { checkLicense } from '../../lib/check_license';
 import type { LogstashPluginRouter } from '../../types';
@@ -45,7 +45,7 @@ export function registerPipelinesDeleteRoute(router: LogstashPluginRouter) {
     wrapRouteWithLicenseCheck(
       checkLicense,
       router.handleLegacyErrors(async (context, request, response) => {
-        const client = context.core.elasticsearch.client.asCurrentUser;
+        const client = (await context.core).elasticsearch.client.asCurrentUser;
         const results = await deletePipelines(client, request.body.pipelineIds);
 
         return response.ok({ body: { results } });
diff --git a/x-pack/plugins/logstash/server/routes/pipelines/list.ts b/x-pack/plugins/logstash/server/routes/pipelines/list.ts
index a2072a78902ee..cb1a14cbbd423 100644
--- a/x-pack/plugins/logstash/server/routes/pipelines/list.ts
+++ b/x-pack/plugins/logstash/server/routes/pipelines/list.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import type { LogstashPluginRouter } from '../../types';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
 
 import { PipelineListItem } from '../../models/pipeline_list_item';
 import { checkLicense } from '../../lib/check_license';
@@ -33,7 +33,7 @@ export function registerPipelinesListRoute(router: LogstashPluginRouter) {
       checkLicense,
       router.handleLegacyErrors(async (context, request, response) => {
         try {
-          const { client } = context.core.elasticsearch;
+          const { client } = (await context.core).elasticsearch;
           const pipelinesRecord = (await fetchPipelines(client.asCurrentUser)) as Record<
             string,
             any
diff --git a/x-pack/plugins/logstash/server/types.ts b/x-pack/plugins/logstash/server/types.ts
index 2177ae9f17f39..d9a9f90101f40 100644
--- a/x-pack/plugins/logstash/server/types.ts
+++ b/x-pack/plugins/logstash/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, CustomRequestHandlerContext } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export interface PipelineListItemOptions {
   id: string;
@@ -18,9 +18,9 @@ export interface PipelineListItemOptions {
 /**
  * @internal
  */
-export interface LogstashRequestHandlerContext extends RequestHandlerContext {
+export type LogstashRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
index 248ac6e91f3a1..f3132d145c7a2 100644
--- a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
@@ -7,10 +7,10 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import type { Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { MapExtent } from './map_descriptor';
-import { TimeRange } from '../../../../../src/plugins/data/common';
 
 export type Timeslice = {
   from: number;
@@ -28,6 +28,7 @@ export type DataFilters = {
   timeslice?: Timeslice;
   zoom: number;
   isReadOnly: boolean;
+  joinKeyFilter?: Filter;
 };
 
 export type VectorSourceRequestMeta = DataFilters & {
@@ -77,7 +78,10 @@ export type VectorTileLayerMeta = {
 };
 
 // Partial because objects are justified downstream in constructors
-export type DataRequestMeta = Partial<
+export type DataRequestMeta = {
+  // request stop time in milliseconds since epoch
+  requestStopTime?: number;
+} & Partial<
   VectorSourceRequestMeta &
     VectorJoinSourceRequestMeta &
     VectorStyleRequestMeta &
diff --git a/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
index eb7e0a5059c22..1cd8b254f9e14 100644
--- a/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { Feature } from 'geojson';
 import {
   HeatmapStyleDescriptor,
diff --git a/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
index e35acb50838cf..06dde68b8ff00 100644
--- a/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
@@ -9,8 +9,8 @@
 
 import { FeatureCollection } from 'geojson';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
-import { SortDirection } from 'src/plugins/data/common/search';
+import { Query } from '@kbn/data-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/common/search';
 import {
   AGG_TYPE,
   GRID_RESOLUTION,
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
index 3daca585d4991..76dafc6a6c68e 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import type { DataView, DataViewField } from 'src/plugins/data/common';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
 import { AGG_TYPE, JOIN_FIELD_NAME_PREFIX, TOP_TERM_PERCENTAGE_SUFFIX } from '../constants';
 
 export type BucketProperties = Record<string | number, unknown>;
diff --git a/x-pack/plugins/maps/common/embeddable/extract.ts b/x-pack/plugins/maps/common/embeddable/extract.ts
index 7ae4cba738189..e73b1566c0289 100644
--- a/x-pack/plugins/maps/common/embeddable/extract.ts
+++ b/x-pack/plugins/maps/common/embeddable/extract.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { MapEmbeddablePersistableState } from './types';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { extractReferences } from '../migrations/references';
diff --git a/x-pack/plugins/maps/common/embeddable/inject.ts b/x-pack/plugins/maps/common/embeddable/inject.ts
index b51f169630c04..2e1892b95a0f1 100644
--- a/x-pack/plugins/maps/common/embeddable/inject.ts
+++ b/x-pack/plugins/maps/common/embeddable/inject.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { MapEmbeddablePersistableState } from './types';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { extractReferences, injectReferences } from '../migrations/references';
diff --git a/x-pack/plugins/maps/common/embeddable/types.ts b/x-pack/plugins/maps/common/embeddable/types.ts
index 5684ea83e0d54..f1a9cf98b4b42 100644
--- a/x-pack/plugins/maps/common/embeddable/types.ts
+++ b/x-pack/plugins/maps/common/embeddable/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 
 export type MapEmbeddablePersistableState = EmbeddableStateWithType & {
   attributes: SerializableRecord;
diff --git a/x-pack/plugins/maps/common/map_saved_object_type.ts b/x-pack/plugins/maps/common/map_saved_object_type.ts
index 63415ddd6540a..b37c1af5949c1 100644
--- a/x-pack/plugins/maps/common/map_saved_object_type.ts
+++ b/x-pack/plugins/maps/common/map_saved_object_type.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { SavedObject } from '../../../../src/core/types/saved_objects';
+import { SavedObject } from '@kbn/core/types/saved_objects';
 
 export type MapSavedObjectAttributes = {
   title: string;
diff --git a/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts b/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts
index 7a933663a60f2..0de5c1718910e 100644
--- a/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts
+++ b/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts
@@ -6,8 +6,8 @@
  */
 
 import { Filter } from '@kbn/es-query';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
-import { MigrateFunction } from '../../../../../src/plugins/kibana_utils/common';
 
 export function migrateDataPersistedState(
   {
diff --git a/x-pack/plugins/maps/common/migrations/references.ts b/x-pack/plugins/maps/common/migrations/references.ts
index 1ced7e06c59cc..944789445fa06 100644
--- a/x-pack/plugins/maps/common/migrations/references.ts
+++ b/x-pack/plugins/maps/common/migrations/references.ts
@@ -7,7 +7,7 @@
 
 // Can not use public Layer classes to extract references since this logic must run in both client and server.
 
-import { SavedObjectReference } from '../../../../../src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { LayerDescriptor, VectorLayerDescriptor } from '../descriptor_types';
 
diff --git a/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js b/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js
index fa5b5111ff797..35612f7950c2f 100644
--- a/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js
+++ b/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import { SOURCE_TYPES } from '../constants';
-import { SortDirection } from '../../../../../src/plugins/data/common/search';
+import { SortDirection } from '@kbn/data-plugin/common/search';
 
 function isEsDocumentSource(layerDescriptor) {
   const sourceType = _.get(layerDescriptor, 'sourceDescriptor.type');
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index a19f160127eb3..4c4ca64f7ac07 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -25,8 +25,7 @@
     "mapsEms",
     "savedObjects",
     "share",
-    "presentationUtil",
-    "sharedUX"
+    "presentationUtil"
   ],
   "optionalPlugins": [
     "cloud",
@@ -47,7 +46,6 @@
     "kibanaReact",
     "kibanaUtils",
     "usageCollection",
-    "home",
     "unifiedSearch"
   ]
 }
diff --git a/x-pack/plugins/maps/public/_mapbox_hacks.scss b/x-pack/plugins/maps/public/_mapbox_hacks.scss
index 480232007995d..118e0b1862066 100644
--- a/x-pack/plugins/maps/public/_mapbox_hacks.scss
+++ b/x-pack/plugins/maps/public/_mapbox_hacks.scss
@@ -3,12 +3,12 @@
 .mapContainer {
   flex-grow: 1;
 
-  .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
+  .maplibregl-ctrl-top-left .maplibregl-ctrl {
     margin-left: $euiSizeM;
     margin-top: $euiSizeM;
   }
 
-  .mapboxgl-ctrl-group:not(:empty) {
+  .maplibregl-ctrl-group:not(:empty) {
     @include euiBottomShadowLarge;
     @include mapToolbarButtonGroupBorderRadius;
     background-color: $euiColorEmptyShade;
@@ -27,7 +27,7 @@
     }
   }
 
-  .mapboxgl-ctrl button:not(:disabled) {
+  .maplibregl-ctrl button:not(:disabled) {
     transition: background $euiAnimSpeedNormal ease-in-out;
 
     &:hover {
@@ -35,14 +35,14 @@
     }
   }
 
-  .mapboxgl-ctrl-group button:focus:focus-visible {
+  .maplibregl-ctrl-group button:focus:focus-visible {
     box-shadow: none;
   }
 }
 
 // Custom SVG as background for zoom controls based off of EUI glyphs plusInCircleFilled and minusInCircleFilled
 // Also fixes dark mode
-.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon {
+.maplibregl-ctrl-zoom-in .maplibregl-ctrl-icon {
   // sass-lint:disable-block no-important
   background-repeat: no-repeat !important;
   // sass-lint:disable-block quotes
@@ -50,7 +50,7 @@
   background-position: center !important;
 }
 
-.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon {
+.maplibregl-ctrl-zoom-out .maplibregl-ctrl-icon {
   // sass-lint:disable-block no-important
   background-repeat: no-repeat !important;
   // sass-lint:disable-block quotes
diff --git a/x-pack/plugins/maps/public/actions/data_request_actions.ts b/x-pack/plugins/maps/public/actions/data_request_actions.ts
index 730135424a4dd..5788c9360fdf2 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -220,7 +220,7 @@ export function syncDataForLayerId(layerId: string | null, isForceRefresh: boole
   };
 }
 
-function setLayerDataLoadErrorStatus(layerId: string, errorMessage: string | null) {
+export function setLayerDataLoadErrorStatus(layerId: string, errorMessage: string | null) {
   return {
     type: SET_LAYER_ERROR_STATUS,
     isInErrorState: errorMessage !== null,
diff --git a/x-pack/plugins/maps/public/actions/index.ts b/x-pack/plugins/maps/public/actions/index.ts
index f4d6997333c6c..2568a787b3941 100644
--- a/x-pack/plugins/maps/public/actions/index.ts
+++ b/x-pack/plugins/maps/public/actions/index.ts
@@ -15,6 +15,7 @@ export {
   cancelAllInFlightRequests,
   fitToLayerExtent,
   fitToDataBounds,
+  setLayerDataLoadErrorStatus,
 } from './data_request_actions';
 export {
   closeOnClickTooltip,
diff --git a/x-pack/plugins/maps/public/actions/layer_actions.ts b/x-pack/plugins/maps/public/actions/layer_actions.ts
index d66c2d97f55ef..25ba0ac862db8 100644
--- a/x-pack/plugins/maps/public/actions/layer_actions.ts
+++ b/x-pack/plugins/maps/public/actions/layer_actions.ts
@@ -7,12 +7,13 @@
 
 import { AnyAction, Dispatch } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { MapStoreState } from '../reducers/store';
 import {
   createLayerInstance,
   getEditState,
   getLayerById,
+  getLayerDescriptor,
   getLayerList,
   getLayerListRaw,
   getMapColors,
@@ -55,11 +56,12 @@ import {
   LayerDescriptor,
   StyleDescriptor,
   TileMetaFeature,
+  VectorLayerDescriptor,
 } from '../../common/descriptor_types';
 import { ILayer } from '../classes/layers/layer';
 import { IVectorLayer } from '../classes/layers/vector_layer';
 import { OnSourceChangeArgs } from '../classes/sources/source';
-import { DRAW_MODE, LAYER_STYLE_TYPE, LAYER_TYPE } from '../../common/constants';
+import { DRAW_MODE, LAYER_STYLE_TYPE, LAYER_TYPE, SCALING_TYPES } from '../../common/constants';
 import { IVectorStyle } from '../classes/styles/vector/vector_style';
 import { notifyLicensedFeatureUsage } from '../licensed_features';
 import { IESAggField } from '../classes/fields/agg';
@@ -362,13 +364,17 @@ function updateSourcePropWithoutSync(
   value: unknown,
   newLayerType?: LAYER_TYPE
 ) {
-  return async (dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) => {
+  return async (
+    dispatch: ThunkDispatch<MapStoreState, void, AnyAction>,
+    getState: () => MapStoreState
+  ) => {
     if (propName === 'metrics') {
       if (newLayerType) {
         throw new Error('May not change layer-type when modifying metrics source-property');
       }
       return await dispatch(updateMetricsProp(layerId, value));
     }
+
     dispatch({
       type: UPDATE_SOURCE_PROP,
       layerId,
@@ -378,6 +384,37 @@ function updateSourcePropWithoutSync(
     if (newLayerType) {
       dispatch(updateLayerType(layerId, newLayerType));
     }
+
+    if (propName === 'scalingType') {
+      // get joins from layer descriptor instead of layer.getJoins()
+      // 1) IVectorLayer implementations may return empty array when descriptor has joins
+      // 2) getJoins returns instances and descriptors are needed.
+      const layerDescriptor = getLayerDescriptor(getState(), layerId) as VectorLayerDescriptor;
+      const joins = layerDescriptor.joins ? layerDescriptor.joins : [];
+      if (value === SCALING_TYPES.CLUSTERS && joins.length) {
+        // Blended scaling type does not support joins
+        // It is not possible to display join metrics when showing clusters
+        dispatch({
+          type: SET_JOINS,
+          layerId,
+          joins: [],
+        });
+        await dispatch(updateStyleProperties(layerId));
+      } else if (value === SCALING_TYPES.MVT) {
+        if (joins.length > 1) {
+          // Maplibre feature-state join uses promoteId and there is a limit to one promoteId
+          // Therefore, Vector tile scaling supports only one join
+          dispatch({
+            type: SET_JOINS,
+            layerId,
+            joins: [joins[0]],
+          });
+        }
+        // update style props regardless of updating joins
+        // Allow style to clean-up data driven style properties with join fields that do not support feature-state.
+        await dispatch(updateStyleProperties(layerId));
+      }
+    }
   };
 }
 
@@ -562,7 +599,7 @@ function removeLayerFromLayerList(layerId: string) {
   };
 }
 
-function updateStyleProperties(layerId: string, previousFields: IField[]) {
+function updateStyleProperties(layerId: string, previousFields?: IField[]) {
   return async (
     dispatch: ThunkDispatch<MapStoreState, void, AnyAction>,
     getState: () => MapStoreState
@@ -584,7 +621,7 @@ function updateStyleProperties(layerId: string, previousFields: IField[]) {
     const nextFields = await (targetLayer as IVectorLayer).getFields(); // take into account all fields, since labels can be driven by any field (source or join)
     const { hasChanges, nextStyleDescriptor } = await (
       style as IVectorStyle
-    ).getDescriptorWithUpdatedStyleProps(nextFields, previousFields, getMapColors(getState()));
+    ).getDescriptorWithUpdatedStyleProps(nextFields, getMapColors(getState()), previousFields);
     if (hasChanges && nextStyleDescriptor) {
       dispatch(updateLayerStyle(layerId, nextStyleDescriptor));
     }
@@ -626,9 +663,9 @@ export function updateLayerStyleForSelectedLayer(styleDescriptor: StyleDescripto
 export function setJoinsForLayer(layer: ILayer, joins: JoinDescriptor[]) {
   return async (dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) => {
     const previousFields = await (layer as IVectorLayer).getFields();
-    await dispatch({
+    dispatch({
       type: SET_JOINS,
-      layer,
+      layerId: layer.getId(),
       joins,
     });
     await dispatch(updateStyleProperties(layer.getId(), previousFields));
diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index 1e55bd6bbb1e5..8a16d036393ad 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -12,7 +12,7 @@ import { ThunkDispatch } from 'redux-thunk';
 import turfBboxPolygon from '@turf/bbox-polygon';
 import turfBooleanContains from '@turf/boolean-contains';
 import { Filter } from '@kbn/es-query';
-import { Query, TimeRange } from 'src/plugins/data/public';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
 import { Geometry, Position } from 'geojson';
 import { asyncForEach, asyncMap } from '@kbn/std';
 import { DRAW_MODE, DRAW_SHAPE, LAYER_STYLE_TYPE } from '../../common/constants';
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
index 5b54cc3666278..13b40962c5461 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { AGG_TYPE } from '../../../../common/constants';
 import { TileMetaFeature } from '../../../../common/descriptor_types';
 import { CountAggField } from './count_agg_field';
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
index ae30e339f88ba..d881accb1e42f 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { DataView } from '@kbn/data-plugin/common';
 import { IField } from '../field';
-import { DataView } from '../../../../../../../src/plugins/data/common';
 import { IESAggSource } from '../../sources/es_agg_source';
 import { FIELD_ORIGIN } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
index d35a61c232adc..03c0d3f0791a5 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { IESAggSource } from '../../sources/es_agg_source';
 import { IVectorSource } from '../../sources/vector_source';
 import { AGG_TYPE, FIELD_ORIGIN } from '../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts
index e0bd7935835b1..9761f1dcdb193 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts
@@ -7,7 +7,7 @@
 
 import { AGG_TYPE, FIELD_ORIGIN } from '../../../../common/constants';
 import { IESAggSource } from '../../sources/es_agg_source';
-import { IndexPattern } from 'src/plugins/data/public';
+import { IndexPattern } from '@kbn/data-plugin/public';
 import { PercentileAggField } from './percentile_agg_field';
 import { ESDocField } from '../es_doc_field';
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
index b2b5f01c31bed..bc542bf891517 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { AGG_TYPE } from '../../../../common/constants';
 import { IESAggField, CountAggFieldParams } from './agg_field_types';
diff --git a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
index b3f68da99d529..1709da825aa3b 100644
--- a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { FIELD_ORIGIN } from '../../../common/constants';
 import { ESTooltipProperty } from '../tooltips/es_tooltip_property';
 import { ITooltipProperty, TooltipProperty } from '../tooltips/tooltip_property';
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
 import { IField, AbstractField } from './field';
 import { IESSource } from '../sources/es_source';
 import { IVectorSource } from '../sources/vector_source';
diff --git a/x-pack/plugins/maps/public/classes/joins/inner_join.ts b/x-pack/plugins/maps/public/classes/joins/inner_join.ts
index 9f6fec576e9e2..4ccd5bd289e40 100644
--- a/x-pack/plugins/maps/public/classes/joins/inner_join.ts
+++ b/x-pack/plugins/maps/public/classes/joins/inner_join.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { Feature, GeoJsonProperties } from 'geojson';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { ESTermSource } from '../sources/es_term_source';
 import { getComputedFieldNamePrefix } from '../styles/vector/style_util';
 import {
@@ -25,7 +26,6 @@ import { IField } from '../fields/field';
 import { PropertiesMap } from '../../../common/elasticsearch_util';
 import { ITermJoinSource } from '../sources/term_join_source';
 import { TableSource } from '../sources/table_source';
-import { Adapters } from '../../../../../../src/plugins/inspector/common/adapters';
 
 function createJoinTermSource(
   descriptor: Partial<TermJoinSourceDescriptor> | undefined,
diff --git a/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts b/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts
index 4d52dacc63782..52dd93033020d 100644
--- a/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts
+++ b/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { DataFilters, VectorSourceRequestMeta } from '../../../common/descriptor_types';
 import { IVectorSource } from '../sources/vector_source';
 import { ITermJoinSource } from '../sources/term_join_source';
diff --git a/x-pack/plugins/maps/public/classes/layers/ems_vector_tile_layer/ems_vector_tile_layer.tsx b/x-pack/plugins/maps/public/classes/layers/ems_vector_tile_layer/ems_vector_tile_layer.tsx
index c6d594617c448..428156165c4c3 100644
--- a/x-pack/plugins/maps/public/classes/layers/ems_vector_tile_layer/ems_vector_tile_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/ems_vector_tile_layer/ems_vector_tile_layer.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Map as MbMap, Layer as MbLayer, Style as MbStyle } from '@kbn/mapbox-gl';
+import type { Map as MbMap, LayerSpecification, StyleSpecification } from '@kbn/mapbox-gl';
 import _ from 'lodash';
 // @ts-expect-error
 import { RGBAImage } from './image_utils';
@@ -38,7 +38,7 @@ export interface EmsSpriteSheet {
 
 interface SourceRequestData {
   spriteSheetImageData?: ImageData;
-  vectorStyleSheet?: MbStyle;
+  vectorStyleSheet?: StyleSpecification;
   spriteMeta?: {
     png: string;
     json: EmsSpriteSheet;
@@ -141,7 +141,7 @@ export class EmsVectorTileLayer extends AbstractLayer {
     return `${this._generateMbSourceIdPrefix()}${name}`;
   }
 
-  _getVectorStyle() {
+  _getVectorStyle(): StyleSpecification | null | undefined {
     const sourceDataRequest = this.getSourceDataRequest();
     if (!sourceDataRequest) {
       return null;
@@ -317,8 +317,8 @@ export class EmsVectorTileLayer extends AbstractLayer {
         const newLayerObject = {
           ...layer,
           source: this._generateMbSourceId(
-            typeof (layer as MbLayer).source === 'string'
-              ? ((layer as MbLayer).source as string)
+            'source' in layer && typeof layer.source === 'string'
+              ? (layer.source as string)
               : undefined
           ),
           id: mbLayerId,
@@ -375,7 +375,7 @@ export class EmsVectorTileLayer extends AbstractLayer {
     return [];
   }
 
-  _setOpacityForType(mbMap: MbMap, mbLayer: MbLayer, mbLayerId: string) {
+  _setOpacityForType(mbMap: MbMap, mbLayer: LayerSpecification, mbLayerId: string) {
     this._getOpacityProps(mbLayer.type).forEach((opacityProp) => {
       const mbPaint = mbLayer.paint as { [key: string]: unknown } | undefined;
       if (mbPaint && typeof mbPaint[opacityProp] === 'number') {
@@ -387,7 +387,7 @@ export class EmsVectorTileLayer extends AbstractLayer {
     });
   }
 
-  _setLayerZoomRange(mbMap: MbMap, mbLayer: MbLayer, mbLayerId: string) {
+  _setLayerZoomRange(mbMap: MbMap, mbLayer: LayerSpecification, mbLayerId: string) {
     let minZoom = this.getMinZoom();
     if (typeof mbLayer.minzoom === 'number') {
       minZoom = Math.max(minZoom, mbLayer.minzoom);
diff --git a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.ts b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.ts
index a977ed10fdade..66aef6d38803f 100644
--- a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.ts
+++ b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Map as MbMap, VectorSource as MbVectorSource } from '@kbn/mapbox-gl';
+import type { Map as MbMap, VectorTileSource } from '@kbn/mapbox-gl';
 import { AbstractLayer } from '../layer';
 import { HeatmapStyle } from '../../styles/heatmap/heatmap_style';
 import { LAYER_TYPE } from '../../../../common/constants';
@@ -97,7 +97,7 @@ export class HeatmapLayer extends AbstractLayer {
   }
 
   _requiresPrevSourceCleanup(mbMap: MbMap): boolean {
-    const mbSource = mbMap.getSource(this.getMbSourceId()) as MbVectorSource;
+    const mbSource = mbMap.getSource(this.getMbSourceId()) as VectorTileSource;
     if (!mbSource) {
       return false;
     }
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index 458a8a159a25d..5cc53d44df8ef 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import type { Map as MbMap } from '@kbn/mapbox-gl';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import _ from 'lodash';
 import React, { ReactElement } from 'react';
 import { EuiIcon } from '@elastic/eui';
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts
index 34edf8cd09607..29ecf1635d626 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { SOURCE_BOUNDS_DATA_REQUEST_ID } from '../../../../common/constants';
 import { MapExtent } from '../../../../common/descriptor_types';
 import { DataRequestContext } from '../../../actions';
@@ -34,6 +34,7 @@ export async function syncBoundsData({
     timeFilters: dataFilters.timeFilters,
     timeslice: dataFilters.timeslice,
     filters: dataFilters.filters,
+    joinKeyFilter: dataFilters.joinKeyFilter,
     applyGlobalQuery: source.getApplyGlobalQuery(),
     applyGlobalTime: source.getApplyGlobalTime(),
   };
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx
index 42303bc0b4c31..c6f9a282d0fa4 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx
@@ -5,43 +5,39 @@
  * 2.0.
  */
 
+import _ from 'lodash';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiIcon } from '@elastic/eui';
 import { Feature, FeatureCollection } from 'geojson';
-import type { Map as MbMap, GeoJSONSource as MbGeoJSONSource } from '@kbn/mapbox-gl';
+import type { FilterSpecification, Map as MbMap, GeoJSONSource } from '@kbn/mapbox-gl';
 import {
   EMPTY_FEATURE_COLLECTION,
   FEATURE_VISIBLE_PROPERTY_NAME,
-  FIELD_ORIGIN,
   LAYER_TYPE,
 } from '../../../../../common/constants';
 import {
   StyleMetaDescriptor,
   Timeslice,
-  VectorJoinSourceRequestMeta,
   VectorLayerDescriptor,
 } from '../../../../../common/descriptor_types';
-import { PropertiesMap } from '../../../../../common/elasticsearch_util';
 import { TimesliceMaskConfig } from '../../../util/mb_filter_expressions';
 import { DataRequestContext } from '../../../../actions';
 import { IVectorStyle, VectorStyle } from '../../../styles/vector/vector_style';
 import { ISource } from '../../../sources/source';
 import { IVectorSource } from '../../../sources/vector_source';
 import { AbstractLayer, LayerIcon } from '../../layer';
-import { InnerJoin } from '../../../joins/inner_join';
 import {
   AbstractVectorLayer,
   noResultsIcon,
   NO_RESULTS_ICON_AND_TOOLTIPCONTENT,
 } from '../vector_layer';
 import { DataRequestAbortError } from '../../../util/data_request';
-import { canSkipSourceUpdate } from '../../../util/can_skip_fetch';
 import { getFeatureCollectionBounds } from '../../../util/get_feature_collection_bounds';
 import { GEOJSON_FEATURE_ID_PROPERTY_NAME } from './assign_feature_ids';
 import { syncGeojsonSourceData } from './geojson_source_data';
-import { JoinState, performInnerJoins } from './perform_inner_joins';
-import { buildVectorRequestMeta } from '../../build_vector_request_meta';
+import { performInnerJoins } from './perform_inner_joins';
+import { pluckStyleMetaFromFeatures } from './pluck_style_meta_from_features';
 
 export class GeoJsonVectorLayer extends AbstractVectorLayer {
   static createDescriptor(
@@ -127,7 +123,12 @@ export class GeoJsonVectorLayer extends AbstractVectorLayer {
     if (!style || !sourceDataRequest) {
       return null;
     }
-    return await style.pluckStyleMetaFromSourceDataRequest(sourceDataRequest);
+
+    return await pluckStyleMetaFromFeatures(
+      _.get(sourceDataRequest.getData(), 'features', []),
+      await this.getSource().getSupportedShapeTypes(),
+      this.getCurrentStyle().getDynamicPropertiesArray()
+    );
   }
 
   _requiresPrevSourceCleanup(mbMap: MbMap) {
@@ -159,8 +160,15 @@ export class GeoJsonVectorLayer extends AbstractVectorLayer {
     this._setMbLinePolygonProperties(mbMap, undefined, timesliceMaskConfig);
   }
 
+  _getJoinFilterExpression(): FilterSpecification | undefined {
+    return this.hasJoins()
+      ? // Remove unjoined source features by filtering out features without GeoJSON feature.property[FEATURE_VISIBLE_PROPERTY_NAME] is true
+        ['==', ['get', FEATURE_VISIBLE_PROPERTY_NAME], true]
+      : undefined;
+  }
+
   _syncFeatureCollectionWithMb(mbMap: MbMap) {
-    const mbGeoJSONSource = mbMap.getSource(this.getId()) as MbGeoJSONSource;
+    const mbGeoJSONSource = mbMap.getSource(this.getId()) as GeoJSONSource;
     const featureCollection = this._getSourceFeatureCollection();
     const featureCollectionOnMap = AbstractLayer.getBoundDataForSource(mbMap, this.getId());
 
@@ -260,118 +268,6 @@ export class GeoJsonVectorLayer extends AbstractVectorLayer {
     }
   }
 
-  async _syncJoin({
-    join,
-    startLoading,
-    stopLoading,
-    onLoadError,
-    registerCancelCallback,
-    dataFilters,
-    isForceRefresh,
-  }: { join: InnerJoin } & DataRequestContext): Promise<JoinState> {
-    const joinSource = join.getRightJoinSource();
-    const sourceDataId = join.getSourceDataRequestId();
-    const requestToken = Symbol(`layer-join-refresh:${this.getId()} - ${sourceDataId}`);
-
-    const joinRequestMeta: VectorJoinSourceRequestMeta = buildVectorRequestMeta(
-      joinSource,
-      joinSource.getFieldNames(),
-      dataFilters,
-      joinSource.getWhereQuery(),
-      isForceRefresh
-    ) as VectorJoinSourceRequestMeta;
-
-    const prevDataRequest = this.getDataRequest(sourceDataId);
-    const canSkipFetch = await canSkipSourceUpdate({
-      source: joinSource,
-      prevDataRequest,
-      nextRequestMeta: joinRequestMeta,
-      extentAware: false, // join-sources are term-aggs that are spatially unaware (e.g. ESTermSource/TableSource).
-      getUpdateDueToTimeslice: () => {
-        return true;
-      },
-    });
-
-    if (canSkipFetch) {
-      return {
-        dataHasChanged: false,
-        join,
-        propertiesMap: prevDataRequest?.getData() as PropertiesMap,
-      };
-    }
-
-    try {
-      startLoading(sourceDataId, requestToken, joinRequestMeta);
-      const leftSourceName = await this._source.getDisplayName();
-      const propertiesMap = await joinSource.getPropertiesMap(
-        joinRequestMeta,
-        leftSourceName,
-        join.getLeftField().getName(),
-        registerCancelCallback.bind(null, requestToken)
-      );
-      stopLoading(sourceDataId, requestToken, propertiesMap);
-      return {
-        dataHasChanged: true,
-        join,
-        propertiesMap,
-      };
-    } catch (error) {
-      if (!(error instanceof DataRequestAbortError)) {
-        onLoadError(sourceDataId, requestToken, `Join error: ${error.message}`);
-      }
-      throw error;
-    }
-  }
-
-  async _syncJoins(syncContext: DataRequestContext, style: IVectorStyle) {
-    const joinSyncs = this.getValidJoins().map(async (join) => {
-      await this._syncJoinStyleMeta(syncContext, join, style);
-      await this._syncJoinFormatters(syncContext, join, style);
-      return this._syncJoin({ join, ...syncContext });
-    });
-
-    return await Promise.all(joinSyncs);
-  }
-
-  async _syncJoinStyleMeta(syncContext: DataRequestContext, join: InnerJoin, style: IVectorStyle) {
-    const joinSource = join.getRightJoinSource();
-    return this._syncStyleMeta({
-      source: joinSource,
-      style,
-      sourceQuery: joinSource.getWhereQuery(),
-      dataRequestId: join.getSourceMetaDataRequestId(),
-      dynamicStyleProps: this.getCurrentStyle()
-        .getDynamicPropertiesArray()
-        .filter((dynamicStyleProp) => {
-          const matchingField = joinSource.getFieldByName(dynamicStyleProp.getFieldName());
-          return (
-            dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN &&
-            !!matchingField &&
-            dynamicStyleProp.isFieldMetaEnabled()
-          );
-        }),
-      ...syncContext,
-    });
-  }
-
-  async _syncJoinFormatters(syncContext: DataRequestContext, join: InnerJoin, style: IVectorStyle) {
-    const joinSource = join.getRightJoinSource();
-    return this._syncFormatters({
-      source: joinSource,
-      dataRequestId: join.getSourceFormattersDataRequestId(),
-      fields: style
-        .getDynamicPropertiesArray()
-        .filter((dynamicStyleProp) => {
-          const matchingField = joinSource.getFieldByName(dynamicStyleProp.getFieldName());
-          return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN && !!matchingField;
-        })
-        .map((dynamicStyleProp) => {
-          return dynamicStyleProp.getField()!;
-        }),
-      ...syncContext,
-    });
-  }
-
   _getSourceFeatureCollection() {
     const sourceDataRequest = this.getSourceDataRequest();
     return sourceDataRequest ? (sourceDataRequest.getData() as FeatureCollection) : null;
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/perform_inner_joins.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/perform_inner_joins.ts
index d02f1c1a99bb7..5fd7dc4b94397 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/perform_inner_joins.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/perform_inner_joins.ts
@@ -9,20 +9,13 @@ import { FeatureCollection } from 'geojson';
 import { i18n } from '@kbn/i18n';
 import { FEATURE_VISIBLE_PROPERTY_NAME } from '../../../../../common/constants';
 import { DataRequestContext } from '../../../../actions';
-import { InnerJoin } from '../../../joins/inner_join';
-import { PropertiesMap } from '../../../../../common/elasticsearch_util';
+import { JoinState } from '../types';
 
 interface SourceResult {
   refreshed: boolean;
   featureCollection: FeatureCollection;
 }
 
-export interface JoinState {
-  dataHasChanged: boolean;
-  join: InnerJoin;
-  propertiesMap?: PropertiesMap;
-}
-
 export async function performInnerJoins(
   sourceResult: SourceResult,
   joinStates: JoinState[],
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/pluck_style_meta_from_features.test.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/pluck_style_meta_from_features.test.ts
new file mode 100644
index 0000000000000..5c609f66e3f53
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/pluck_style_meta_from_features.test.ts
@@ -0,0 +1,417 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Feature } from 'geojson';
+import {
+  COLOR_MAP_TYPE,
+  FIELD_ORIGIN,
+  VECTOR_SHAPE_TYPE,
+  VECTOR_STYLES,
+} from '../../../../../common/constants';
+import { ColorDynamicOptions } from '../../../../../common/descriptor_types';
+import { IVectorLayer } from '../vector_layer';
+import { IVectorSource } from '../../../sources/vector_source';
+import { DynamicColorProperty } from '../../../styles/vector/properties/dynamic_color_property';
+import { InlineField } from '../../../fields/inline_field';
+import {
+  isOnlySingleFeatureType,
+  pluckCategoricalStyleMetaFromFeatures,
+  pluckStyleMetaFromFeatures,
+} from './pluck_style_meta_from_features';
+
+describe('pluckStyleMetaFromFeatures', () => {
+  test('Should identify when feature collection only contains points', async () => {
+    const features = [
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [0, 0],
+        },
+        properties: {},
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'MultiPoint',
+          coordinates: [
+            [10.0, 40.0],
+            [40.0, 30.0],
+            [20.0, 20.0],
+            [30.0, 10.0],
+          ],
+        },
+        properties: {},
+      },
+    ] as Feature[];
+
+    const styleMeta = await pluckStyleMetaFromFeatures(
+      features,
+      Object.values(VECTOR_SHAPE_TYPE),
+      []
+    );
+    expect(styleMeta).toEqual({
+      fieldMeta: {},
+      geometryTypes: {
+        isLinesOnly: false,
+        isPointsOnly: true,
+        isPolygonsOnly: false,
+      },
+    });
+  });
+
+  test('Should identify when feature collection only contains lines', async () => {
+    const features = [
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'LineString',
+          coordinates: [
+            [30.0, 10.0],
+            [10.0, 30.0],
+            [40.0, 40.0],
+          ],
+        },
+        properties: {},
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'MultiLineString',
+          coordinates: [
+            [
+              [10.0, 10.0],
+              [20.0, 20.0],
+              [10.0, 40.0],
+            ],
+            [
+              [40.0, 40.0],
+              [30.0, 30.0],
+              [40.0, 20.0],
+              [30.0, 10.0],
+            ],
+          ],
+        },
+        properties: {},
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [0, 0],
+        },
+        properties: {
+          __kbn_is_centroid_feature__: true,
+        },
+      },
+    ] as Feature[];
+
+    const styleMeta = await pluckStyleMetaFromFeatures(
+      features,
+      Object.values(VECTOR_SHAPE_TYPE),
+      []
+    );
+    expect(styleMeta).toEqual({
+      fieldMeta: {},
+      geometryTypes: {
+        isLinesOnly: true,
+        isPointsOnly: false,
+        isPolygonsOnly: false,
+      },
+    });
+  });
+
+  test('Should not extract scaled field range when scaled field has no values', async () => {
+    const features = [
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [0, 0],
+        },
+        properties: {
+          myDynamicField: 1,
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [0, 0],
+        },
+        properties: {
+          myDynamicField: 10,
+        },
+      },
+    ] as Feature[];
+    const dynamicColorOptions = {
+      type: COLOR_MAP_TYPE.ORDINAL,
+      field: {
+        origin: FIELD_ORIGIN.SOURCE,
+        name: 'myDynamicFieldWithNoValues',
+      },
+    } as ColorDynamicOptions;
+    const field = new InlineField({
+      fieldName: dynamicColorOptions.field!.name,
+      source: {} as unknown as IVectorSource,
+      origin: dynamicColorOptions.field!.origin,
+      dataType: 'number',
+    });
+    const dynamicColorProperty = new DynamicColorProperty(
+      dynamicColorOptions,
+      VECTOR_STYLES.FILL_COLOR,
+      field,
+      {} as unknown as IVectorLayer,
+      () => {
+        return null;
+      } // getFieldFormatter
+    );
+
+    const styleMeta = await pluckStyleMetaFromFeatures(features, Object.values(VECTOR_SHAPE_TYPE), [
+      dynamicColorProperty,
+    ]);
+    expect(styleMeta).toEqual({
+      fieldMeta: {
+        myDynamicFieldWithNoValues: {
+          categories: [],
+        },
+      },
+      geometryTypes: {
+        isLinesOnly: false,
+        isPointsOnly: true,
+        isPolygonsOnly: false,
+      },
+    });
+  });
+
+  test('Should extract scaled field range', async () => {
+    const features = [
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [0, 0],
+        },
+        properties: {
+          myDynamicField: 1,
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [0, 0],
+        },
+        properties: {
+          myDynamicField: 10,
+        },
+      },
+    ] as Feature[];
+    const dynamicColorOptions = {
+      type: COLOR_MAP_TYPE.ORDINAL,
+      field: {
+        origin: FIELD_ORIGIN.SOURCE,
+        name: 'myDynamicField',
+      },
+    } as ColorDynamicOptions;
+    const field = new InlineField({
+      fieldName: dynamicColorOptions.field!.name,
+      source: {} as unknown as IVectorSource,
+      origin: dynamicColorOptions.field!.origin,
+      dataType: 'number',
+    });
+    const dynamicColorProperty = new DynamicColorProperty(
+      dynamicColorOptions,
+      VECTOR_STYLES.FILL_COLOR,
+      field,
+      {} as unknown as IVectorLayer,
+      () => {
+        return null;
+      } // getFieldFormatter
+    );
+
+    const styleMeta = await pluckStyleMetaFromFeatures(features, Object.values(VECTOR_SHAPE_TYPE), [
+      dynamicColorProperty,
+    ]);
+    expect(styleMeta).toEqual({
+      fieldMeta: {
+        myDynamicField: {
+          categories: [],
+          range: {
+            delta: 9,
+            max: 10,
+            min: 1,
+          },
+        },
+      },
+      geometryTypes: {
+        isLinesOnly: false,
+        isPointsOnly: true,
+        isPolygonsOnly: false,
+      },
+    });
+  });
+});
+
+describe('pluckCategoricalStyleMetaFromFeatures', () => {
+  test('Should pluck the categorical style-meta', async () => {
+    const field = new InlineField({
+      fieldName: 'foobar',
+      source: {} as unknown as IVectorSource,
+      origin: FIELD_ORIGIN.SOURCE,
+      dataType: 'number',
+    });
+    const dynamicColorProperty = new DynamicColorProperty(
+      {
+        type: COLOR_MAP_TYPE.CATEGORICAL,
+        colorCategory: 'palette_0',
+        fieldMetaOptions: { isEnabled: true },
+      },
+      VECTOR_STYLES.LINE_COLOR,
+      field,
+      {} as unknown as IVectorLayer,
+      () => {
+        return null;
+      } // getFieldFormatter
+    );
+
+    const features = [
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-10, 0],
+        },
+        properties: {
+          foobar: 'CN',
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-10, 0],
+        },
+        properties: {
+          foobar: 'CN',
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-10, 0],
+        },
+        properties: {
+          foobar: 'US',
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-10, 0],
+        },
+        properties: {
+          foobar: 'CN',
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-10, 0],
+        },
+        properties: {
+          foobar: 'US',
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-10, 0],
+        },
+        properties: {
+          foobar: 'IN',
+        },
+      },
+    ] as Feature[];
+
+    const categories = pluckCategoricalStyleMetaFromFeatures(dynamicColorProperty, features);
+
+    expect(categories).toEqual([
+      { key: 'CN', count: 3 },
+      { key: 'US', count: 2 },
+      { key: 'IN', count: 1 },
+    ]);
+  });
+});
+
+describe('isOnlySingleFeatureType', () => {
+  describe('source supports single feature type', () => {
+    const supportedFeatures = [VECTOR_SHAPE_TYPE.POINT];
+    const hasFeatureType = {
+      [VECTOR_SHAPE_TYPE.POINT]: false,
+      [VECTOR_SHAPE_TYPE.LINE]: false,
+      [VECTOR_SHAPE_TYPE.POLYGON]: false,
+    };
+
+    test('Is only single feature type when only supported feature type is target feature type', () => {
+      expect(
+        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.POINT, supportedFeatures, hasFeatureType)
+      ).toBe(true);
+    });
+
+    test('Is not single feature type when only supported feature type is not target feature type', () => {
+      expect(
+        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.LINE, supportedFeatures, hasFeatureType)
+      ).toBe(false);
+    });
+  });
+
+  describe('source supports multiple feature types', () => {
+    const supportedFeatures = [
+      VECTOR_SHAPE_TYPE.POINT,
+      VECTOR_SHAPE_TYPE.LINE,
+      VECTOR_SHAPE_TYPE.POLYGON,
+    ];
+
+    test('Is only single feature type when data only has target feature type', () => {
+      const hasFeatureType = {
+        [VECTOR_SHAPE_TYPE.POINT]: true,
+        [VECTOR_SHAPE_TYPE.LINE]: false,
+        [VECTOR_SHAPE_TYPE.POLYGON]: false,
+      };
+      expect(
+        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.POINT, supportedFeatures, hasFeatureType)
+      ).toBe(true);
+    });
+
+    test('Is not single feature type when data has multiple feature types', () => {
+      const hasFeatureType = {
+        [VECTOR_SHAPE_TYPE.POINT]: true,
+        [VECTOR_SHAPE_TYPE.LINE]: true,
+        [VECTOR_SHAPE_TYPE.POLYGON]: true,
+      };
+      expect(
+        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.LINE, supportedFeatures, hasFeatureType)
+      ).toBe(false);
+    });
+
+    test('Is not single feature type when data does not have target feature types', () => {
+      const hasFeatureType = {
+        [VECTOR_SHAPE_TYPE.POINT]: false,
+        [VECTOR_SHAPE_TYPE.LINE]: true,
+        [VECTOR_SHAPE_TYPE.POLYGON]: false,
+      };
+      expect(
+        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.POINT, supportedFeatures, hasFeatureType)
+      ).toBe(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/pluck_style_meta_from_features.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/pluck_style_meta_from_features.ts
new file mode 100644
index 0000000000000..2ea0fef1bf648
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/pluck_style_meta_from_features.ts
@@ -0,0 +1,190 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Feature } from 'geojson';
+import {
+  GEO_JSON_TYPE,
+  KBN_IS_CENTROID_FEATURE,
+  VECTOR_SHAPE_TYPE,
+} from '../../../../../common/constants';
+import {
+  Category,
+  DynamicStylePropertyOptions,
+  RangeFieldMeta,
+  StyleMetaDescriptor,
+} from '../../../../../common/descriptor_types';
+import { IDynamicStyleProperty } from '../../../styles/vector/properties/dynamic_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];
+const POLYGONS = [GEO_JSON_TYPE.POLYGON, GEO_JSON_TYPE.MULTI_POLYGON];
+
+export async function pluckStyleMetaFromFeatures(
+  features: Feature[],
+  supportedShapeTypes: VECTOR_SHAPE_TYPE[],
+  dynamicProperties: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>
+): Promise<StyleMetaDescriptor> {
+  const hasFeatureType = {
+    [VECTOR_SHAPE_TYPE.POINT]: false,
+    [VECTOR_SHAPE_TYPE.LINE]: false,
+    [VECTOR_SHAPE_TYPE.POLYGON]: false,
+  };
+  if (supportedShapeTypes.length > 1) {
+    for (let i = 0; i < features.length; i++) {
+      const feature = features[i];
+
+      // ignore centroid features as they are added for styling and not part of the real data set
+      if (feature.properties?.[KBN_IS_CENTROID_FEATURE]) {
+        continue;
+      }
+
+      if (
+        !hasFeatureType[VECTOR_SHAPE_TYPE.POINT] &&
+        POINTS.includes(feature.geometry.type as GEO_JSON_TYPE)
+      ) {
+        hasFeatureType[VECTOR_SHAPE_TYPE.POINT] = true;
+      }
+      if (
+        !hasFeatureType[VECTOR_SHAPE_TYPE.LINE] &&
+        LINES.includes(feature.geometry.type as GEO_JSON_TYPE)
+      ) {
+        hasFeatureType[VECTOR_SHAPE_TYPE.LINE] = true;
+      }
+      if (
+        !hasFeatureType[VECTOR_SHAPE_TYPE.POLYGON] &&
+        POLYGONS.includes(feature.geometry.type as GEO_JSON_TYPE)
+      ) {
+        hasFeatureType[VECTOR_SHAPE_TYPE.POLYGON] = true;
+      }
+    }
+  }
+
+  const styleMeta = {
+    geometryTypes: {
+      isPointsOnly: isOnlySingleFeatureType(
+        VECTOR_SHAPE_TYPE.POINT,
+        supportedShapeTypes,
+        hasFeatureType
+      ),
+      isLinesOnly: isOnlySingleFeatureType(
+        VECTOR_SHAPE_TYPE.LINE,
+        supportedShapeTypes,
+        hasFeatureType
+      ),
+      isPolygonsOnly: isOnlySingleFeatureType(
+        VECTOR_SHAPE_TYPE.POLYGON,
+        supportedShapeTypes,
+        hasFeatureType
+      ),
+    },
+    fieldMeta: {},
+  } as StyleMetaDescriptor;
+
+  if (dynamicProperties.length === 0 || features.length === 0) {
+    // no additional meta data to pull from source data request.
+    return styleMeta;
+  }
+
+  dynamicProperties.forEach(
+    (dynamicProperty: IDynamicStyleProperty<DynamicStylePropertyOptions>) => {
+      const name = dynamicProperty.getFieldName();
+      if (!styleMeta.fieldMeta[name]) {
+        styleMeta.fieldMeta[name] = { categories: [] };
+      }
+      const categories = pluckCategoricalStyleMetaFromFeatures(dynamicProperty, features);
+      if (categories.length) {
+        styleMeta.fieldMeta[name].categories = categories;
+      }
+      const ordinalStyleMeta = pluckOrdinalStyleMetaFromFeatures(dynamicProperty, features);
+      if (ordinalStyleMeta) {
+        styleMeta.fieldMeta[name].range = ordinalStyleMeta;
+      }
+    }
+  );
+
+  return styleMeta;
+}
+
+function pluckOrdinalStyleMetaFromFeatures(
+  property: IDynamicStyleProperty<DynamicStylePropertyOptions>,
+  features: Feature[]
+): RangeFieldMeta | null {
+  if (!property.isOrdinal()) {
+    return null;
+  }
+
+  const name = property.getFieldName();
+  let min = Infinity;
+  let max = -Infinity;
+  for (let i = 0; i < features.length; i++) {
+    const feature = features[i];
+    const newValue = feature.properties ? parseFloat(feature.properties[name]) : NaN;
+    if (!isNaN(newValue)) {
+      min = Math.min(min, newValue);
+      max = Math.max(max, newValue);
+    }
+  }
+
+  return min === Infinity || max === -Infinity
+    ? null
+    : {
+        min,
+        max,
+        delta: max - min,
+      };
+}
+
+export function pluckCategoricalStyleMetaFromFeatures(
+  property: IDynamicStyleProperty<DynamicStylePropertyOptions>,
+  features: Feature[]
+): Category[] {
+  const size = property.getNumberOfCategories();
+  if (!property.isCategorical() || size <= 0) {
+    return [];
+  }
+
+  const counts = new Map();
+  for (let i = 0; i < features.length; i++) {
+    const feature = features[i];
+    const term = feature.properties ? feature.properties[property.getFieldName()] : undefined;
+    // properties object may be sparse, so need to check if the field is effectively present
+    if (typeof term !== undefined) {
+      if (counts.has(term)) {
+        counts.set(term, counts.get(term) + 1);
+      } else {
+        counts.set(term, 1);
+      }
+    }
+  }
+
+  const ordered: Category[] = [];
+  for (const [key, value] of counts) {
+    ordered.push({ key, count: value });
+  }
+
+  ordered.sort((a, b) => {
+    return b.count - a.count;
+  });
+  return ordered.slice(0, size);
+}
+
+export function isOnlySingleFeatureType(
+  featureType: VECTOR_SHAPE_TYPE,
+  supportedShapeTypes: VECTOR_SHAPE_TYPE[],
+  hasFeatureType: { [key in keyof typeof VECTOR_SHAPE_TYPE]: boolean }
+): boolean {
+  if (supportedShapeTypes.length === 1) {
+    return supportedShapeTypes[0] === featureType;
+  }
+
+  const featureTypes = Object.keys(hasFeatureType);
+  // @ts-expect-error
+  return featureTypes.reduce((accumulator: boolean, featureTypeKey: VECTOR_SHAPE_TYPE) => {
+    const hasFeature = hasFeatureType[featureTypeKey];
+    return featureTypeKey === featureType ? accumulator && hasFeature : accumulator && !hasFeature;
+  }, true);
+}
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx
index 325e302c0941a..a7a190c1c5b56 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx
@@ -5,15 +5,19 @@
  * 2.0.
  */
 
+import _ from 'lodash';
 import type {
+  FeatureIdentifier,
+  FilterSpecification,
   Map as MbMap,
-  AnyLayer as MbLayer,
-  GeoJSONSource as MbGeoJSONSource,
-  VectorSource as MbVectorSource,
+  LayerSpecification,
+  VectorTileSource,
 } from '@kbn/mapbox-gl';
 import { Feature } from 'geojson';
 import { i18n } from '@kbn/i18n';
+import { buildPhrasesFilter } from '@kbn/es-query';
 import { VectorStyle } from '../../../styles/vector/vector_style';
+import { getField } from '../../../../../common/elasticsearch_util';
 import { LAYER_TYPE, SOURCE_TYPES } from '../../../../../common/constants';
 import {
   NO_RESULTS_ICON_AND_TOOLTIPCONTENT,
@@ -23,13 +27,18 @@ import {
 import { IMvtVectorSource } from '../../../sources/vector_source';
 import { DataRequestContext } from '../../../../actions';
 import {
+  DataRequestMeta,
   StyleMetaDescriptor,
   TileMetaFeature,
   VectorLayerDescriptor,
 } from '../../../../../common/descriptor_types';
 import { ESSearchSource } from '../../../sources/es_search_source';
+import { IESSource } from '../../../sources/es_source';
+import { InnerJoin } from '../../../joins/inner_join';
 import { LayerIcon } from '../../layer';
 import { MvtSourceData, syncMvtSourceData } from './mvt_source_data';
+import { PropertiesMap } from '../../../../../common/elasticsearch_util';
+import { pluckStyleMeta } from './pluck_style_meta';
 
 export const ES_MVT_META_LAYER_NAME = 'meta';
 const ES_MVT_HITS_TOTAL_RELATION = 'hits.total.relation';
@@ -54,9 +63,34 @@ export class MvtVectorLayer extends AbstractVectorLayer {
 
   readonly _source: IMvtVectorSource;
 
-  constructor({ layerDescriptor, source, customIcons }: VectorLayerArguments) {
-    super({ layerDescriptor, source, customIcons });
-    this._source = source as IMvtVectorSource;
+  constructor(args: VectorLayerArguments) {
+    super(args);
+    this._source = args.source as IMvtVectorSource;
+  }
+
+  async getBounds(syncContext: DataRequestContext) {
+    // Add filter to narrow bounds to features with matching join keys
+    let joinKeyFilter;
+    if (this.getSource().isESSource()) {
+      const { join, joinPropertiesMap } = this._getJoinResults();
+      if (join && joinPropertiesMap) {
+        const indexPattern = await (this.getSource() as IESSource).getIndexPattern();
+        const joinField = getField(indexPattern, join.getLeftField().getName());
+        joinKeyFilter = buildPhrasesFilter(
+          joinField,
+          Array.from(joinPropertiesMap.keys()),
+          indexPattern
+        );
+      }
+    }
+
+    return super.getBounds({
+      ...syncContext,
+      dataFilters: {
+        ...syncContext.dataFilters,
+        joinKeyFilter,
+      },
+    });
   }
 
   getFeatureId(feature: Feature): string | number | undefined {
@@ -203,6 +237,10 @@ export class MvtVectorLayer extends AbstractVectorLayer {
       source: this.getSource() as IMvtVectorSource,
       syncContext,
     });
+
+    if (this.hasJoins()) {
+      await this._syncJoins(syncContext, this.getCurrentStyle());
+    }
   }
 
   _syncSourceBindingWithMb(mbMap: MbMap) {
@@ -229,6 +267,7 @@ export class MvtVectorLayer extends AbstractVectorLayer {
       tiles: [sourceData.tileUrl],
       minzoom: sourceData.tileMinZoom,
       maxzoom: sourceData.tileMaxZoom,
+      promoteId: this._getSourcePromoteId(),
     });
   }
 
@@ -240,10 +279,99 @@ export class MvtVectorLayer extends AbstractVectorLayer {
     return this.getMbSourceId() === mbSourceId;
   }
 
+  _getJoinResults(): {
+    join?: InnerJoin;
+    joinPropertiesMap?: PropertiesMap;
+    joinRequestMeta?: DataRequestMeta;
+  } {
+    const joins = this.getValidJoins();
+    if (!joins || !joins.length) {
+      return {};
+    }
+
+    const join = joins[0];
+    const joinDataRequest = this.getDataRequest(join.getSourceDataRequestId());
+    return {
+      join,
+      joinPropertiesMap: joinDataRequest?.getData() as PropertiesMap | undefined,
+      joinRequestMeta: joinDataRequest?.getMeta(),
+    };
+  }
+
   _getMbTooManyFeaturesLayerId() {
     return this.makeMbLayerId('toomanyfeatures');
   }
 
+  _getJoinFilterExpression(): FilterSpecification | undefined {
+    const { join, joinPropertiesMap } = this._getJoinResults();
+    if (!join) {
+      return undefined;
+    }
+
+    // When there are no join results, return a filter that hides all features
+    // work around for 'match' with empty array not filtering out features
+    // This filter always returns false because features will never have `__kbn_never_prop__` property
+    const hideAllFilter = ['has', '__kbn_never_prop__'];
+
+    if (!joinPropertiesMap) {
+      return hideAllFilter;
+    }
+
+    const joinKeys = Array.from(joinPropertiesMap.keys());
+    return joinKeys.length
+      ? // Unable to check FEATURE_VISIBLE_PROPERTY_NAME flag since filter expressions do not support feature-state
+        // Instead, remove unjoined source features by filtering out features without matching join keys
+        ([
+          'match',
+          ['get', join.getLeftField().getName()],
+          joinKeys,
+          true, // match value
+          false, // fallback - value with no match
+        ] as FilterSpecification)
+      : hideAllFilter;
+  }
+
+  _syncFeatureState(mbMap: MbMap) {
+    const { joinPropertiesMap, joinRequestMeta } = this._getJoinResults();
+    if (!joinPropertiesMap) {
+      return;
+    }
+
+    const [firstKey] = joinPropertiesMap.keys();
+    const firstKeyFeatureState = mbMap.getFeatureState({
+      source: this.getMbSourceId(),
+      sourceLayer: this._source.getTileSourceLayer(),
+      id: firstKey,
+    });
+    const joinRequestStopTime = joinRequestMeta?.requestStopTime;
+    if (firstKeyFeatureState?.requestStopTime === joinRequestStopTime) {
+      // Do not update feature state when it already contains current join results
+      return;
+    }
+
+    // Clear existing feature state
+    mbMap.removeFeatureState({
+      source: this.getMbSourceId(),
+      sourceLayer: this._source.getTileSourceLayer(),
+      // by omitting 'id' argument, all feature state is cleared for source
+    });
+
+    // Set feature state for join results
+    // reusing featureIdentifier to avoid creating new object in tight loops
+    const featureIdentifier: FeatureIdentifier = {
+      source: this.getMbSourceId(),
+      sourceLayer: this._source.getTileSourceLayer(),
+      id: undefined,
+    };
+    joinPropertiesMap.forEach((value: object, key: string) => {
+      featureIdentifier.id = key;
+      mbMap.setFeatureState(featureIdentifier, {
+        ...value,
+        requestStopTime: joinRequestStopTime,
+      });
+    });
+  }
+
   _syncStylePropertiesWithMb(mbMap: MbMap) {
     // @ts-ignore
     const mbSource = mbMap.getSource(this.getMbSourceId());
@@ -280,7 +408,7 @@ export class MvtVectorLayer extends AbstractVectorLayer {
     const tooManyFeaturesLayerId = this._getMbTooManyFeaturesLayerId();
 
     if (!mbMap.getLayer(tooManyFeaturesLayerId)) {
-      const mbTooManyFeaturesLayer: MbLayer = {
+      const mbTooManyFeaturesLayer: LayerSpecification = {
         id: tooManyFeaturesLayerId,
         type: 'line',
         source: this.getId(),
@@ -307,8 +435,20 @@ export class MvtVectorLayer extends AbstractVectorLayer {
     mbMap.setLayerZoomRange(tooManyFeaturesLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
+  _getSourcePromoteId() {
+    const { join } = this._getJoinResults();
+    return join
+      ? {
+          [this._source.getTileSourceLayer()]: join.getLeftField().getName(),
+        }
+      : undefined;
+  }
+
+  // Maplibre does not expose API for updating source attributes.
+  // Must remove/add vector source to update source attributes.
+  // _requiresPrevSourceCleanup returns true when vector source needs to be removed so it can be re-added with updated attributes
   _requiresPrevSourceCleanup(mbMap: MbMap): boolean {
-    const mbSource = mbMap.getSource(this.getMbSourceId()) as MbVectorSource | MbGeoJSONSource;
+    const mbSource = mbMap.getSource(this.getMbSourceId());
     if (!mbSource) {
       return false;
     }
@@ -316,7 +456,7 @@ export class MvtVectorLayer extends AbstractVectorLayer {
       // Expected source is not compatible, so remove.
       return true;
     }
-    const mbTileSource = mbSource as MbVectorSource;
+    const mbTileSource = mbSource as VectorTileSource;
 
     const sourceDataRequest = this.getSourceDataRequest();
     if (!sourceDataRequest) {
@@ -330,7 +470,8 @@ export class MvtVectorLayer extends AbstractVectorLayer {
     const isSourceDifferent =
       mbTileSource.tiles?.[0] !== sourceData.tileUrl ||
       mbTileSource.minzoom !== sourceData.tileMinZoom ||
-      mbTileSource.maxzoom !== sourceData.tileMaxZoom;
+      mbTileSource.maxzoom !== sourceData.tileMaxZoom ||
+      !_.isEqual(mbTileSource.promoteId, this._getSourcePromoteId());
 
     if (isSourceDifferent) {
       return true;
@@ -343,9 +484,7 @@ export class MvtVectorLayer extends AbstractVectorLayer {
       // but the programmable JS-object uses camelcase `sourceLayer`
       if (
         mbLayer &&
-        // @ts-expect-error
         mbLayer.sourceLayer !== sourceData.tileSourceLayer &&
-        // @ts-expect-error
         mbLayer.sourceLayer !== ES_MVT_META_LAYER_NAME
       ) {
         // If the source-pointer of one of the layers is stale, they will all be stale.
@@ -360,13 +499,10 @@ export class MvtVectorLayer extends AbstractVectorLayer {
   syncLayerWithMB(mbMap: MbMap) {
     this._removeStaleMbSourcesAndLayers(mbMap);
     this._syncSourceBindingWithMb(mbMap);
+    this._syncFeatureState(mbMap);
     this._syncStylePropertiesWithMb(mbMap);
   }
 
-  getJoins() {
-    return [];
-  }
-
   getMinZoom() {
     // higher resolution vector tiles cannot be displayed at lower-res
     return Math.max(this._source.getMinZoom(), super.getMinZoom());
@@ -377,6 +513,12 @@ export class MvtVectorLayer extends AbstractVectorLayer {
   }
 
   async getStyleMetaDescriptorFromLocalFeatures(): Promise<StyleMetaDescriptor | null> {
-    return await this.getCurrentStyle().pluckStyleMetaFromTileMeta(this._getMetaFromTiles());
+    const { joinPropertiesMap } = this._getJoinResults();
+    return await pluckStyleMeta(
+      this._getMetaFromTiles(),
+      joinPropertiesMap,
+      await this.getSource().getSupportedShapeTypes(),
+      this.getCurrentStyle().getDynamicPropertiesArray()
+    );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/pluck_style_meta.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/pluck_style_meta.tsx
new file mode 100644
index 0000000000000..1f9784fb65dc0
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/pluck_style_meta.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FIELD_ORIGIN, VECTOR_SHAPE_TYPE } from '../../../../../common/constants';
+import {
+  Category,
+  DynamicStylePropertyOptions,
+  RangeFieldMeta,
+  StyleMetaDescriptor,
+  TileMetaFeature,
+} from '../../../../../common/descriptor_types';
+import { PropertiesMap } from '../../../../../common/elasticsearch_util';
+import { IDynamicStyleProperty } from '../../../styles/vector/properties/dynamic_style_property';
+
+export async function pluckStyleMeta(
+  metaFeatures: TileMetaFeature[],
+  joinPropertiesMap: PropertiesMap | undefined,
+  supportedShapeTypes: VECTOR_SHAPE_TYPE[],
+  dynamicProperties: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>
+): Promise<StyleMetaDescriptor> {
+  const styleMeta: StyleMetaDescriptor = {
+    geometryTypes: {
+      isPointsOnly:
+        supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.POINT),
+      isLinesOnly:
+        supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.LINE),
+      isPolygonsOnly:
+        supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.POLYGON),
+    },
+    fieldMeta: {},
+  };
+
+  if (dynamicProperties.length === 0 || !metaFeatures) {
+    // no additional meta data to pull from source data request.
+    return styleMeta;
+  }
+
+  dynamicProperties.forEach((dynamicProperty) => {
+    const name = dynamicProperty.getFieldName();
+    if (!styleMeta.fieldMeta[name]) {
+      styleMeta.fieldMeta[name] = { categories: [] };
+    }
+
+    const categories = pluckCategoricalStyleMeta(dynamicProperty, metaFeatures, joinPropertiesMap);
+    if (categories.length) {
+      styleMeta.fieldMeta[name].categories = categories;
+    }
+    const ordinalStyleMeta = pluckOrdinalStyleMeta(
+      dynamicProperty,
+      metaFeatures,
+      joinPropertiesMap
+    );
+    if (ordinalStyleMeta) {
+      styleMeta.fieldMeta[name].range = ordinalStyleMeta;
+    }
+  });
+
+  return styleMeta;
+}
+
+function pluckCategoricalStyleMeta(
+  property: IDynamicStyleProperty<DynamicStylePropertyOptions>,
+  metaFeatures: TileMetaFeature[],
+  joinPropertiesMap: PropertiesMap | undefined
+): Category[] {
+  return [];
+}
+
+function pluckOrdinalStyleMeta(
+  property: IDynamicStyleProperty<DynamicStylePropertyOptions>,
+  metaFeatures: TileMetaFeature[],
+  joinPropertiesMap: PropertiesMap | undefined
+): RangeFieldMeta | null {
+  const field = property.getField();
+  if (!field || !property.isOrdinal()) {
+    return null;
+  }
+
+  let min = Infinity;
+  let max = -Infinity;
+  if (property.getFieldOrigin() === FIELD_ORIGIN.SOURCE) {
+    for (let i = 0; i < metaFeatures.length; i++) {
+      const range = field.pluckRangeFromTileMetaFeature(metaFeatures[i]);
+      if (range) {
+        min = Math.min(range.min, min);
+        max = Math.max(range.max, max);
+      }
+    }
+  } else if (property.getFieldOrigin() === FIELD_ORIGIN.JOIN && joinPropertiesMap) {
+    joinPropertiesMap.forEach((value: { [key: string]: unknown }) => {
+      const propertyValue = value[field.getName()];
+      if (typeof propertyValue === 'number') {
+        min = Math.min(propertyValue as number, min);
+        max = Math.max(propertyValue as number, max);
+      }
+    });
+  }
+
+  return min === Infinity || max === -Infinity
+    ? null
+    : {
+        min,
+        max,
+        delta: max - min,
+      };
+}
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/types.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/types.ts
new file mode 100644
index 0000000000000..0c368de63fe16
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/types.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { InnerJoin } from '../../joins/inner_join';
+import { PropertiesMap } from '../../../../common/elasticsearch_util';
+
+export interface JoinState {
+  dataHasChanged: boolean;
+  join: InnerJoin;
+  propertiesMap?: PropertiesMap;
+}
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index 17408a2a22df0..1b178d204f6e2 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import uuid from 'uuid/v4';
-import type { Map as MbMap, AnyLayer as MbLayer } from '@kbn/mapbox-gl';
-import type { Query } from 'src/plugins/data/common';
+import type { FilterSpecification, Map as MbMap, LayerSpecification } from '@kbn/mapbox-gl';
+import type { Query } from '@kbn/data-plugin/common';
 import { Feature, GeoJsonProperties, Geometry, Position } from 'geojson';
 import _ from 'lodash';
 import { EuiIcon } from '@elastic/eui';
@@ -44,6 +44,7 @@ import {
   ESTermSourceDescriptor,
   JoinDescriptor,
   StyleMetaDescriptor,
+  VectorJoinSourceRequestMeta,
   VectorLayerDescriptor,
   VectorSourceRequestMeta,
   VectorStyleRequestMeta,
@@ -60,6 +61,9 @@ import { ITermJoinSource } from '../../sources/term_join_source';
 import { buildVectorRequestMeta } from '../build_vector_request_meta';
 import { getJoinAggKey } from '../../../../common/get_agg_key';
 import { syncBoundsData } from './bounds_data';
+import { JoinState } from './types';
+import { canSkipSourceUpdate } from '../../util/can_skip_fetch';
+import { PropertiesMap } from '../../../../common/elasticsearch_util';
 
 const SUPPORTS_FEATURE_EDITING_REQUEST_ID = 'SUPPORTS_FEATURE_EDITING_REQUEST_ID';
 
@@ -530,6 +534,118 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
     }
   }
 
+  async _syncJoin({
+    join,
+    startLoading,
+    stopLoading,
+    onLoadError,
+    registerCancelCallback,
+    dataFilters,
+    isForceRefresh,
+  }: { join: InnerJoin } & DataRequestContext): Promise<JoinState> {
+    const joinSource = join.getRightJoinSource();
+    const sourceDataId = join.getSourceDataRequestId();
+    const requestToken = Symbol(`layer-join-refresh:${this.getId()} - ${sourceDataId}`);
+
+    const joinRequestMeta: VectorJoinSourceRequestMeta = buildVectorRequestMeta(
+      joinSource,
+      joinSource.getFieldNames(),
+      dataFilters,
+      joinSource.getWhereQuery(),
+      isForceRefresh
+    ) as VectorJoinSourceRequestMeta;
+
+    const prevDataRequest = this.getDataRequest(sourceDataId);
+    const canSkipFetch = await canSkipSourceUpdate({
+      source: joinSource,
+      prevDataRequest,
+      nextRequestMeta: joinRequestMeta,
+      extentAware: false, // join-sources are term-aggs that are spatially unaware (e.g. ESTermSource/TableSource).
+      getUpdateDueToTimeslice: () => {
+        return true;
+      },
+    });
+
+    if (canSkipFetch) {
+      return {
+        dataHasChanged: false,
+        join,
+        propertiesMap: prevDataRequest?.getData() as PropertiesMap,
+      };
+    }
+
+    try {
+      startLoading(sourceDataId, requestToken, joinRequestMeta);
+      const leftSourceName = await this._source.getDisplayName();
+      const propertiesMap = await joinSource.getPropertiesMap(
+        joinRequestMeta,
+        leftSourceName,
+        join.getLeftField().getName(),
+        registerCancelCallback.bind(null, requestToken)
+      );
+      stopLoading(sourceDataId, requestToken, propertiesMap);
+      return {
+        dataHasChanged: true,
+        join,
+        propertiesMap,
+      };
+    } catch (error) {
+      if (!(error instanceof DataRequestAbortError)) {
+        onLoadError(sourceDataId, requestToken, `Join error: ${error.message}`);
+      }
+      throw error;
+    }
+  }
+
+  async _syncJoins(syncContext: DataRequestContext, style: IVectorStyle) {
+    const joinSyncs = this.getValidJoins().map(async (join) => {
+      await this._syncJoinStyleMeta(syncContext, join, style);
+      await this._syncJoinFormatters(syncContext, join, style);
+      return this._syncJoin({ join, ...syncContext });
+    });
+
+    return await Promise.all(joinSyncs);
+  }
+
+  async _syncJoinStyleMeta(syncContext: DataRequestContext, join: InnerJoin, style: IVectorStyle) {
+    const joinSource = join.getRightJoinSource();
+    return this._syncStyleMeta({
+      source: joinSource,
+      style,
+      sourceQuery: joinSource.getWhereQuery(),
+      dataRequestId: join.getSourceMetaDataRequestId(),
+      dynamicStyleProps: this.getCurrentStyle()
+        .getDynamicPropertiesArray()
+        .filter((dynamicStyleProp) => {
+          const matchingField = joinSource.getFieldByName(dynamicStyleProp.getFieldName());
+          return (
+            dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN &&
+            !!matchingField &&
+            dynamicStyleProp.isFieldMetaEnabled()
+          );
+        }),
+      ...syncContext,
+    });
+  }
+
+  async _syncJoinFormatters(syncContext: DataRequestContext, join: InnerJoin, style: IVectorStyle) {
+    const joinSource = join.getRightJoinSource();
+    return this._syncFormatters({
+      source: joinSource,
+      dataRequestId: join.getSourceFormattersDataRequestId(),
+      fields: style
+        .getDynamicPropertiesArray()
+        .filter((dynamicStyleProp) => {
+          const matchingField = joinSource.getFieldByName(dynamicStyleProp.getFieldName());
+          return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN && !!matchingField;
+        })
+        .map((dynamicStyleProp) => {
+          return dynamicStyleProp.getField()!;
+        }),
+      ...syncContext,
+    });
+  }
+
   async _syncSupportsFeatureEditing({
     syncContext,
     source,
@@ -557,6 +673,10 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
     }
   }
 
+  _getJoinFilterExpression(): FilterSpecification | undefined {
+    return undefined;
+  }
+
   _setMbPointsProperties(
     mbMap: MbMap,
     mvtSourceLayer?: string,
@@ -578,7 +698,7 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
     if (this.getCurrentStyle().arePointsSymbolizedAsCircles()) {
       markerLayerId = pointLayerId;
       if (!pointLayer) {
-        const mbLayer: MbLayer = {
+        const mbLayer: LayerSpecification = {
           id: pointLayerId,
           type: 'circle',
           source: sourceId,
@@ -596,7 +716,7 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
     } else {
       markerLayerId = symbolLayerId;
       if (!symbolLayer) {
-        const mbLayer: MbLayer = {
+        const mbLayer: LayerSpecification = {
           id: symbolLayerId,
           type: 'symbol',
           source: sourceId,
@@ -611,7 +731,10 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
       }
     }
 
-    const filterExpr = getPointFilterExpression(this.hasJoins(), timesliceMaskConfig);
+    const filterExpr = getPointFilterExpression(
+      this._getJoinFilterExpression(),
+      timesliceMaskConfig
+    );
     if (!_.isEqual(filterExpr, mbMap.getFilter(markerLayerId))) {
       mbMap.setFilter(markerLayerId, filterExpr);
     }
@@ -644,9 +767,8 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
     const fillLayerId = this._getMbPolygonLayerId();
     const lineLayerId = this._getMbLineLayerId();
 
-    const hasJoins = this.hasJoins();
     if (!mbMap.getLayer(fillLayerId)) {
-      const mbLayer: MbLayer = {
+      const mbLayer: LayerSpecification = {
         id: fillLayerId,
         type: 'fill',
         source: sourceId,
@@ -658,7 +780,7 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
       mbMap.addLayer(mbLayer, labelLayerId);
     }
     if (!mbMap.getLayer(lineLayerId)) {
-      const mbLayer: MbLayer = {
+      const mbLayer: LayerSpecification = {
         id: lineLayerId,
         type: 'line',
         source: sourceId,
@@ -677,16 +799,18 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
       lineLayerId,
     });
 
+    const joinFilter = this._getJoinFilterExpression();
+
     this.syncVisibilityWithMb(mbMap, fillLayerId);
     mbMap.setLayerZoomRange(fillLayerId, this.getMinZoom(), this.getMaxZoom());
-    const fillFilterExpr = getFillFilterExpression(hasJoins, timesliceMaskConfig);
+    const fillFilterExpr = getFillFilterExpression(joinFilter, timesliceMaskConfig);
     if (!_.isEqual(fillFilterExpr, mbMap.getFilter(fillLayerId))) {
       mbMap.setFilter(fillLayerId, fillFilterExpr);
     }
 
     this.syncVisibilityWithMb(mbMap, lineLayerId);
     mbMap.setLayerZoomRange(lineLayerId, this.getMinZoom(), this.getMaxZoom());
-    const lineFilterExpr = getLineFilterExpression(hasJoins, timesliceMaskConfig);
+    const lineFilterExpr = getLineFilterExpression(joinFilter, timesliceMaskConfig);
     if (!_.isEqual(lineFilterExpr, mbMap.getFilter(lineLayerId))) {
       mbMap.setFilter(lineLayerId, lineFilterExpr);
     }
@@ -700,7 +824,7 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
     const labelLayerId = this._getMbLabelLayerId();
     const labelLayer = mbMap.getLayer(labelLayerId);
     if (!labelLayer) {
-      const mbLayer: MbLayer = {
+      const mbLayer: LayerSpecification = {
         id: labelLayerId,
         type: 'symbol',
         source: this.getId(),
@@ -713,8 +837,8 @@ export class AbstractVectorLayer extends AbstractLayer implements IVectorLayer {
 
     const isSourceGeoJson = !this.getSource().isMvt();
     const filterExpr = getLabelFilterExpression(
-      this.hasJoins(),
       isSourceGeoJson,
+      this._getJoinFilterExpression(),
       timesliceMaskConfig
     );
     if (!_.isEqual(filterExpr, mbMap.getFilter(labelLayerId))) {
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
index dc647089b3516..92045f5911176 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
@@ -21,6 +21,7 @@ import {
   CountAggDescriptor,
   EMSFileSourceDescriptor,
   ESSearchSourceDescriptor,
+  VectorStylePropertiesDescriptor,
 } from '../../../../../common/descriptor_types';
 import { VectorStyle } from '../../../styles/vector/vector_style';
 import { GeoJsonVectorLayer } from '../../vector_layer';
@@ -37,12 +38,14 @@ function createChoroplethLayerDescriptor({
   rightIndexPatternId,
   rightIndexPatternTitle,
   rightTermField,
+  setLabelStyle,
 }: {
   sourceDescriptor: EMSFileSourceDescriptor | ESSearchSourceDescriptor;
   leftField: string;
   rightIndexPatternId: string;
   rightIndexPatternTitle: string;
   rightTermField: string;
+  setLabelStyle: boolean;
 }) {
   const metricsDescriptor: CountAggDescriptor = { type: AGG_TYPE.COUNT };
   const joinId = uuid();
@@ -51,6 +54,40 @@ function createChoroplethLayerDescriptor({
     aggFieldName: '',
     rightSourceId: joinId,
   });
+
+  const styleProperties: Partial<VectorStylePropertiesDescriptor> = {
+    [VECTOR_STYLES.FILL_COLOR]: {
+      type: STYLE_TYPE.DYNAMIC,
+      options: {
+        ...(defaultDynamicProperties[VECTOR_STYLES.FILL_COLOR].options as ColorDynamicOptions),
+        field: {
+          name: joinKey,
+          origin: FIELD_ORIGIN.JOIN,
+        },
+        color: 'Yellow to Red',
+        type: COLOR_MAP_TYPE.ORDINAL,
+      },
+    },
+    [VECTOR_STYLES.LINE_COLOR]: {
+      type: STYLE_TYPE.STATIC,
+      options: {
+        color: '#3d3d3d',
+      },
+    },
+  };
+  if (setLabelStyle) {
+    styleProperties[VECTOR_STYLES.LABEL_TEXT] = {
+      type: STYLE_TYPE.DYNAMIC,
+      options: {
+        ...defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT].options,
+        field: {
+          name: joinKey,
+          origin: FIELD_ORIGIN.JOIN,
+        },
+      },
+    };
+  }
+
   return GeoJsonVectorLayer.createDescriptor({
     joins: [
       {
@@ -69,36 +106,7 @@ function createChoroplethLayerDescriptor({
       },
     ],
     sourceDescriptor,
-    style: VectorStyle.createDescriptor({
-      [VECTOR_STYLES.FILL_COLOR]: {
-        type: STYLE_TYPE.DYNAMIC,
-        options: {
-          ...(defaultDynamicProperties[VECTOR_STYLES.FILL_COLOR].options as ColorDynamicOptions),
-          field: {
-            name: joinKey,
-            origin: FIELD_ORIGIN.JOIN,
-          },
-          color: 'Yellow to Red',
-          type: COLOR_MAP_TYPE.ORDINAL,
-        },
-      },
-      [VECTOR_STYLES.LINE_COLOR]: {
-        type: STYLE_TYPE.STATIC,
-        options: {
-          color: '#3d3d3d',
-        },
-      },
-      [VECTOR_STYLES.LABEL_TEXT]: {
-        type: STYLE_TYPE.DYNAMIC,
-        options: {
-          ...defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT].options,
-          field: {
-            name: joinKey,
-            origin: FIELD_ORIGIN.JOIN,
-          },
-        },
-      },
-    }),
+    style: VectorStyle.createDescriptor(styleProperties),
   });
 }
 
@@ -124,6 +132,7 @@ export function createEmsChoroplethLayerDescriptor({
     rightIndexPatternId,
     rightIndexPatternTitle,
     rightTermField,
+    setLabelStyle: true,
   });
 }
 
@@ -146,7 +155,7 @@ export function createEsChoroplethLayerDescriptor({
     sourceDescriptor: ESSearchSource.createDescriptor({
       indexPatternId: leftIndexPatternId,
       geoField: leftGeoField,
-      scalingType: SCALING_TYPES.LIMIT,
+      scalingType: SCALING_TYPES.MVT,
       tooltipProperties: [leftJoinField],
       applyGlobalQuery: false,
       applyGlobalTime: false,
@@ -156,5 +165,6 @@ export function createEsChoroplethLayerDescriptor({
     rightIndexPatternId,
     rightIndexPatternTitle,
     rightTermField,
+    setLabelStyle: false, // Styling label by join metric with MVT is not supported
   });
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx
index c935bf0b182c7..7e40f37dce26f 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx
@@ -18,7 +18,7 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { DataViewField, DataView } from 'src/plugins/data/common';
+import { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { getDataViewLabel, getDataViewSelectPlaceholder } from '../../../../../common/i18n_getters';
 import { RenderWizardArguments } from '../layer_wizard_registry';
 import { EMSFileSelect } from '../../../../components/ems_file_select';
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx
index ee98781835314..75192de78caf6 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx
@@ -10,12 +10,12 @@ import { i18n } from '@kbn/i18n';
 import React, { Component } from 'react';
 import { FeatureCollection } from 'geojson';
 import { EuiPanel } from '@elastic/eui';
+import { FileUploadGeoResults } from '@kbn/file-upload-plugin/public';
 import { SCALING_TYPES } from '../../../../../common/constants';
 import { GeoJsonFileSource } from '../../../sources/geojson_file_source';
 import { GeoJsonVectorLayer } from '../../vector_layer';
 import { createDefaultLayerDescriptor } from '../../../sources/es_search_source';
 import { RenderWizardArguments } from '../layer_wizard_registry';
-import { FileUploadGeoResults } from '../../../../../../file_upload/public';
 import { getFileUploadComponent } from '../../../../kibana_services';
 
 export enum UPLOAD_STEPS {
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
index 4f47a1f0e0fd3..413f23d1aeef3 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
@@ -8,7 +8,7 @@
 import React, { ReactElement } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Feature } from 'geojson';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { FileLayer } from '@elastic/ems-client';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { AbstractVectorSource, GeoJsonWithMeta, IVectorSource } from '../vector_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
index da36b9bf0b7e6..014a34566b59a 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { AbstractSource, SourceEditorArgs } from '../source';
 import { ITMSSource } from '../tms_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
index 7db3652011e9a..ca889e8e07499 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbstractESAggSource } from '../es_agg_source';
+import { AbstractESAggSource } from '.';
 import { IField } from '../../fields/field';
 import { IESAggField } from '../../fields/agg';
 import _ from 'lodash';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
index 610655f0daee5..8def3347c5602 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { GeoJsonProperties } from 'geojson';
+import { DataView } from '@kbn/data-plugin/common';
 import { IESSource } from '../es_source';
 import { AbstractESSource } from '../es_source';
 import { esAggFieldsFactory, IESAggField } from '../../fields/agg';
 import { AGG_TYPE, COUNT_PROP_LABEL, FIELD_ORIGIN } from '../../../../common/constants';
 import { getSourceAggKey } from '../../../../common/get_agg_key';
 import { AbstractESAggSourceDescriptor, AggDescriptor } from '../../../../common/descriptor_types';
-import { DataView } from '../../../../../../../src/plugins/data/common';
 import { IField } from '../../fields/field';
 import { ITooltipProperty } from '../../tooltips/tooltip_property';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
index cd93ccff99a4c..bcbc50c7e0090 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { MapExtent, VectorSourceRequestMeta } from '../../../../common/descriptor_types';
 import {
   getExecutionContext,
@@ -20,7 +20,7 @@ import {
   RENDER_AS,
   SOURCE_TYPES,
 } from '../../../../common/constants';
-import { SearchSource } from 'src/plugins/data/public';
+import { SearchSource } from '@kbn/data-plugin/public';
 import { LICENSED_FEATURES } from '../../../licensed_features';
 
 jest.mock('../../../kibana_services');
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
index 67529edf15b4c..bf69c04ff69bb 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
@@ -10,6 +10,9 @@ import React, { ReactElement } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Feature } from 'geojson';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ISearchSource } from '@kbn/data-plugin/common/search/search_source';
+import { DataView } from '@kbn/data-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { makeESBbox } from '../../../../common/elasticsearch_util';
 import { convertCompositeRespToGeoJson, convertRegularRespToGeoJson } from './convert_to_geojson';
 import { UpdateSourceEditor } from './update_source_editor';
@@ -40,9 +43,6 @@ import {
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
-import { ISearchSource } from '../../../../../../../src/plugins/data/common/search/search_source';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { makePublicExecutionContext } from '../../../util';
 import { isMvt } from './is_mvt';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
index 1ef695e9dcfac..1769c224c37b3 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
@@ -10,6 +10,7 @@ import React, { Fragment, Component } from 'react';
 import uuid from 'uuid/v4';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiSpacer, EuiComboBoxOptionOption, EuiTitle } from '@elastic/eui';
+import { IndexPatternField, indexPatterns } from '@kbn/data-plugin/public';
 import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters';
 import {
   AGG_TYPE,
@@ -22,7 +23,6 @@ import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { ResolutionEditor } from './resolution_editor';
 import { isMetricCountable } from '../../util/is_metric_countable';
-import { IndexPatternField, indexPatterns } from '../../../../../../../src/plugins/data/public';
 import { RenderAsSelect } from './render_as_select';
 import { AggDescriptor } from '../../../../common/descriptor_types';
 import { OnSourceChangeArgs } from '../source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
index dff515a5192dc..8e9b879290c9e 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react';
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiPanel } from '@elastic/eui';
 import { SingleFieldSelect } from '../../../components/single_field_select';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
index 4409271260499..86c343af0d113 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
@@ -11,6 +11,7 @@ import React from 'react';
 import { GeoJsonProperties } from 'geojson';
 import { i18n } from '@kbn/i18n';
 import { type Filter, buildPhraseFilter } from '@kbn/es-query';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import {
   EMPTY_FEATURE_COLLECTION,
   FIELD_ORIGIN,
@@ -33,7 +34,6 @@ import { UpdateSourceEditor } from './update_source_editor';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { GeoJsonWithMeta } from '../vector_source';
 import { isValidStringConfig } from '../../util/valid_string_config';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { IField } from '../../fields/field';
 import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
 import { getIsGoldPlus } from '../../../licensed_features';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx
index 129301a96e3b3..e079d25a4c628 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { getTermsFields } from '../../../index_pattern_util';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 
 interface Props {
   indexPattern: DataView;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx
index e5af92ccec7ef..d61d5a56a55de 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx
@@ -9,8 +9,8 @@ import React, { Fragment, Component } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
-import type { DataViewField, DataView } from 'src/plugins/data/common';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
+import type { DataViewField, DataView } from '@kbn/data-plugin/common';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { GeoLineForm } from './geo_line_form';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js
index 3f3c9c4e3a108..856504c51865e 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js
@@ -12,7 +12,7 @@ import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 export class UpdateSourceEditor extends Component {
   state = {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
index 0ff94163f9230..60d7be79d35e3 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
@@ -95,6 +95,7 @@ exports[`should enable sort order select when sort field provided 1`] = `
       clusteringDisabledReason={null}
       filterByMapBounds={true}
       indexPatternId="indexPattern1"
+      numberOfJoins={0}
       onChange={[Function]}
       scalingType="LIMIT"
       supportsClustering={false}
@@ -200,6 +201,7 @@ exports[`should render update source editor 1`] = `
       clusteringDisabledReason={null}
       filterByMapBounds={true}
       indexPatternId="indexPattern1"
+      numberOfJoins={0}
       onChange={[Function]}
       scalingType="LIMIT"
       supportsClustering={false}
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts
index 5553e925258e9..81e80c7cf739f 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { LayerDescriptor } from '../../../../common/descriptor_types';
 import { ES_GEO_FIELD_TYPE, SCALING_TYPES } from '../../../../common/constants';
 import { ESSearchSource } from './es_search_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
index cbf79b7a8b367..54071848f9a40 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
@@ -11,7 +11,7 @@ jest.mock('../../../kibana_services');
 jest.mock('./util/load_index_settings');
 
 import { getIndexPatternService, getSearchService, getHttp } from '../../../kibana_services';
-import { SearchSource } from 'src/plugins/data/public';
+import { SearchSource } from '@kbn/data-plugin/public';
 
 import { loadIndexSettings } from './util/load_index_settings';
 
@@ -146,14 +146,21 @@ describe('ESSearchSource', () => {
       });
       expect(esSearchSource.getJoinsDisabledReason()).toBe(null);
     });
-    it('mvt', () => {
+    it('blended layer', () => {
       const esSearchSource = new ESSearchSource({
         ...mockDescriptor,
-        scalingType: SCALING_TYPES.MVT,
+        scalingType: SCALING_TYPES.CLUSTERS,
       });
       expect(esSearchSource.getJoinsDisabledReason()).toBe(
-        'Joins are not supported when scaling by vector tiles'
+        'Joins are not supported when scaling by clusters'
       );
     });
+    it('mvt', () => {
+      const esSearchSource = new ESSearchSource({
+        ...mockDescriptor,
+        scalingType: SCALING_TYPES.MVT,
+      });
+      expect(esSearchSource.getJoinsDisabledReason()).toBe(null);
+    });
   });
 });
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
index 434d823fabcef..f021772e59756 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
@@ -10,8 +10,10 @@ import React, { ReactElement } from 'react';
 import { i18n } from '@kbn/i18n';
 import { GeoJsonProperties, Geometry, Position } from 'geojson';
 import { type Filter, buildPhraseFilter } from '@kbn/es-query';
-import type { DataViewField, DataView } from 'src/plugins/data/common';
+import type { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { lastValueFrom } from 'rxjs';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
+import { SortDirection, SortDirectionNumeric, TimeRange } from '@kbn/data-plugin/common';
 import { AbstractESSource } from '../es_source';
 import {
   getHttp,
@@ -52,12 +54,6 @@ import {
   Timeslice,
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
-import {
-  SortDirection,
-  SortDirectionNumeric,
-  TimeRange,
-} from '../../../../../../../src/plugins/data/common';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { IField } from '../../fields/field';
 import { GeoJsonWithMeta, IMvtVectorSource, SourceStatus } from '../vector_source';
@@ -185,8 +181,7 @@ export class ESSearchSource extends AbstractESSource implements IMvtVectorSource
         sortOrder={this._descriptor.sortOrder}
         scalingType={this._descriptor.scalingType}
         filterByMapBounds={this.isFilterByMapBounds()}
-        hasJoins={sourceEditorArgs.hasJoins}
-        clearJoins={sourceEditorArgs.clearJoins}
+        numberOfJoins={sourceEditorArgs.numberOfJoins}
       />
     );
   }
@@ -763,10 +758,6 @@ export class ESSearchSource extends AbstractESSource implements IMvtVectorSource
       reason = i18n.translate('xpack.maps.source.esSearch.joinsDisabledReason', {
         defaultMessage: 'Joins are not supported when scaling by clusters',
       });
-    } else if (this._descriptor.scalingType === SCALING_TYPES.MVT) {
-      reason = i18n.translate('xpack.maps.source.esSearch.joinsDisabledReasonMvt', {
-        defaultMessage: 'Joins are not supported when scaling by vector tiles',
-      });
     } else {
       reason = null;
     }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx
index 95836d76a2c60..577b5f8b42360 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx
@@ -8,13 +8,13 @@
 import React, { Component } from 'react';
 import { EuiPanel } from '@elastic/eui';
 
-import type { DataView, DataViewField } from 'src/plugins/data/common';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { SCALING_TYPES } from '../../../../../common/constants';
 import { GeoFieldSelect } from '../../../../components/geo_field_select';
 import { GeoIndexPatternSelect } from '../../../../components/geo_index_pattern_select';
 import { getGeoFields, getTermsFields, getSortFields } from '../../../../index_pattern_util';
 import { ESSearchSourceDescriptor } from '../../../../../common/descriptor_types';
-import { SortDirection } from '../../../../../../../../src/plugins/data/public';
 import { TopHitsForm } from './top_hits_form';
 import { OnSourceChangeArgs } from '../../source';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx
index 072c399544182..8b39310ae13a8 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx
@@ -8,7 +8,8 @@
 import React, { ChangeEvent, Component, Fragment } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { SingleFieldSelect } from '../../../../components/single_field_select';
 import { getIndexPatternService } from '../../../../kibana_services';
 // @ts-expect-error
@@ -16,7 +17,6 @@ import { ValidatedRange } from '../../../../components/validated_range';
 import { DEFAULT_MAX_INNER_RESULT_WINDOW } from '../../../../../common/constants';
 import { loadIndexSettings } from '../util/load_index_settings';
 import { OnSourceChangeArgs } from '../../source';
-import { SortDirection } from '../../../../../../../../src/plugins/data/public';
 
 interface Props {
   indexPatternId: string;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx
index 788c700d3961c..356dbfe7d03a1 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx
@@ -9,14 +9,14 @@ import React, { Component, Fragment } from 'react';
 import { EuiFormRow, EuiTitle, EuiPanel, EuiSpacer, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { getDataViewNotFoundMessage } from '../../../../../common/i18n_getters';
 import { FIELD_ORIGIN } from '../../../../../common/constants';
 import { TooltipSelector } from '../../../../components/tooltip_selector';
 
 import { getIndexPatternService } from '../../../../kibana_services';
 import { getTermsFields, getSortFields, getSourceFields } from '../../../../index_pattern_util';
-import { SortDirection } from '../../../../../../../../src/plugins/data/public';
 import { ESDocField } from '../../../fields/es_doc_field';
 import { OnSourceChangeArgs } from '../../source';
 import { TopHitsForm } from './top_hits_form';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
index cde7c8afa7eeb..7addffc286bd0 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
@@ -20,7 +20,7 @@ import {
   getSourceFields,
   supportsGeoTileAgg,
 } from '../../../index_pattern_util';
-import { SortDirection, indexPatterns } from '../../../../../../../src/plugins/data/public';
+import { SortDirection, indexPatterns } from '@kbn/data-plugin/public';
 import { ESDocField } from '../../fields/es_doc_field';
 import { FormattedMessage } from '@kbn/i18n-react';
 
@@ -35,8 +35,7 @@ export class UpdateSourceEditor extends Component {
     sortOrder: PropTypes.string.isRequired,
     scalingType: PropTypes.string.isRequired,
     source: PropTypes.object,
-    hasJoins: PropTypes.bool.isRequired,
-    clearJoins: PropTypes.func.isRequired,
+    numberOfJoins: PropTypes.number.isRequired,
   };
 
   state = {
@@ -207,8 +206,7 @@ export class UpdateSourceEditor extends Component {
           scalingType={this.props.scalingType}
           supportsClustering={this.state.supportsClustering}
           clusteringDisabledReason={this.state.clusteringDisabledReason}
-          hasJoins={this.props.hasJoins}
-          clearJoins={this.props.clearJoins}
+          numberOfJoins={this.props.numberOfJoins}
         />
       </EuiPanel>
     );
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.test.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.test.js
index cfc2090f537f2..264bb0d95c2a9 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.test.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.test.js
@@ -26,6 +26,7 @@ const defaultProps = {
   tooltipFields: [],
   sortOrder: 'DESC',
   scalingType: SCALING_TYPES.LIMIT,
+  numberOfJoins: 0,
 };
 
 test('should render update source editor', async () => {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts
index 5e27f613abdd4..90e674c5da288 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getDocValueAndSourceFields } from './get_docvalue_source_fields';
-import type { IndexPatternField, IndexPattern } from 'src/plugins/data/public';
+import type { IndexPatternField, IndexPattern } from '@kbn/data-plugin/public';
 
 function createMockIndexPattern(fields: IndexPatternField[]): IndexPattern {
   const indexPattern = {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts
index c0ce7488d01ed..100ae961830c0 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../../src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { getField } from '../../../../../common/elasticsearch_util';
 
 export interface ScriptField {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_documenation_popover.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_documenation_popover.tsx
index 1733856a4734d..3da6099f71bf7 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_documenation_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_documenation_popover.tsx
@@ -43,19 +43,19 @@ export class ScalingDocumenationPopover extends Component<Props, State> {
       <div>
         <EuiText grow={false}>
           <dl>
-            <dt>{this.props.mvtOptionLabel}</dt>
+            <dt>{this.props.mvtOptionLabel} (Default)</dt>
             <dd>
               <p>
                 <FormattedMessage
                   id="xpack.maps.scalingDocs.mvtDetails"
-                  defaultMessage="Partition your map into tiles, with each tile displaying features from the first {maxResultWindow} documents. Results exceeding {maxResultWindow} are not displayed in a tile. A bounding box indicates the area where data is incomplete."
+                  defaultMessage="Vector tiles partition your map into tiles, with each tile displaying features from the first {maxResultWindow} documents. Results exceeding {maxResultWindow} are not displayed in a tile. A bounding box indicates the area where data is incomplete."
                   values={{ maxResultWindow: this.props.maxResultWindow }}
                 />
               </p>
               <p>
                 <FormattedMessage
                   id="xpack.maps.scalingDocs.mvtUseCase"
-                  defaultMessage="Use this option to display large data sets with the fastest loading times. Does not support term joins, formatted labels, and data driven styling from scripted fields."
+                  defaultMessage="Use this option to display large data sets with the fastest loading times."
                 />
               </p>
             </dd>
@@ -88,9 +88,35 @@ export class ScalingDocumenationPopover extends Component<Props, State> {
               </p>
               <p>
                 <FormattedMessage
-                  id="xpack.maps.scalingDocs.limitUseCase"
-                  defaultMessage="Use this option to create choropleth maps that compare statistics across boundaries."
+                  id="xpack.maps.scalingDocs.limitUseCases"
+                  defaultMessage="Use this option when you can not use vector tiles for the following reasons:"
                 />
+                <ul>
+                  <li>
+                    <FormattedMessage
+                      id="xpack.maps.scalingDocs.limitUseCase.formatLabels"
+                      defaultMessage="Formatted labels"
+                    />
+                  </li>
+                  <li>
+                    <FormattedMessage
+                      id="xpack.maps.scalingDocs.limitUseCase.multipleJoins"
+                      defaultMessage="Multiple term joins"
+                    />
+                  </li>
+                  <li>
+                    <FormattedMessage
+                      id="xpack.maps.scalingDocs.limitUseCase.joinFieldsWithLayoutStyles"
+                      defaultMessage="Data driven styling from term join metrics with 'Label', 'Label size', icon 'Symbol size', and 'Symbol orientation' style properties"
+                    />
+                  </li>
+                  <li>
+                    <FormattedMessage
+                      id="xpack.maps.scalingDocs.limitUseCase.scriptedFields"
+                      defaultMessage="Data driven styling from scripted fields"
+                    />
+                  </li>
+                </ul>
               </p>
             </dd>
           </dl>
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx
index aa3c7b51df5bb..38137ffcd72df 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx
@@ -26,8 +26,7 @@ const defaultProps = {
   scalingType: SCALING_TYPES.LIMIT,
   supportsClustering: true,
   termFields: [],
-  hasJoins: false,
-  clearJoins: () => {},
+  numberOfJoins: 0,
 };
 
 describe('scaling form', () => {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx
index fcf915618a0b7..a76c1e8c7b609 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx
@@ -35,19 +35,20 @@ interface Props {
   scalingType: SCALING_TYPES;
   supportsClustering: boolean;
   clusteringDisabledReason?: string | null;
-  hasJoins: boolean;
-  clearJoins: () => void;
+  numberOfJoins: number;
 }
 
 interface State {
   nextScalingType?: SCALING_TYPES;
   maxResultWindow: string;
   showModal: boolean;
+  modalMsg: string | null;
 }
 
 export class ScalingForm extends Component<Props, State> {
   state: State = {
     maxResultWindow: DEFAULT_MAX_RESULT_WINDOW.toLocaleString(),
+    modalMsg: null,
     showModal: false,
   };
   _isMounted = false;
@@ -74,8 +75,23 @@ export class ScalingForm extends Component<Props, State> {
   }
 
   _onScalingTypeSelect = (optionId: SCALING_TYPES): void => {
-    if (this.props.hasJoins && optionId !== SCALING_TYPES.LIMIT) {
-      this._openModal(optionId);
+    if (this.props.numberOfJoins > 0 && optionId === SCALING_TYPES.CLUSTERS) {
+      this._openModal(
+        optionId,
+        i18n.translate('xpack.maps.source.esSearch.clusterScalingJoinMsg', {
+          defaultMessage: `Scaling with clusters does not support term joins. Switching to clusters will remove all term joins from your layer configuration.`,
+        })
+      );
+    } else if (this.props.numberOfJoins > 1 && optionId === SCALING_TYPES.MVT) {
+      this._openModal(
+        optionId,
+        i18n.translate('xpack.maps.source.esSearch.mvtScalingJoinMsg', {
+          defaultMessage: `Vector tiles support one term join. Your layer has {numberOfJoins} term joins. Switching to vector tiles will keep the first term join and remove all other term joins from your layer configuration.`,
+          values: {
+            numberOfJoins: this.props.numberOfJoins,
+          },
+        })
+      );
     } else {
       this._onScalingTypeChange(optionId);
     }
@@ -98,8 +114,9 @@ export class ScalingForm extends Component<Props, State> {
     this.props.onChange({ propName: 'filterByMapBounds', value: event.target.checked });
   };
 
-  _openModal = (optionId: SCALING_TYPES) => {
+  _openModal = (optionId: SCALING_TYPES, modalMsg: string) => {
     this.setState({
+      modalMsg,
       nextScalingType: optionId,
       showModal: true,
     });
@@ -107,14 +124,16 @@ export class ScalingForm extends Component<Props, State> {
 
   _closeModal = () => {
     this.setState({
+      modalMsg: null,
       nextScalingType: undefined,
       showModal: false,
     });
   };
 
   _acceptModal = () => {
-    this.props.clearJoins();
-    this._onScalingTypeChange(this.state.nextScalingType!);
+    if (this.state.nextScalingType) {
+      this._onScalingTypeChange(this.state.nextScalingType);
+    }
     this._closeModal();
   };
 
@@ -139,22 +158,14 @@ export class ScalingForm extends Component<Props, State> {
   }
 
   _renderModal() {
-    if (!this.state.showModal || this.state.nextScalingType === undefined) {
+    if (!this.state.showModal || !this.state.modalMsg || this.state.nextScalingType === undefined) {
       return null;
     }
 
-    const scalingOptionLabel =
-      this.state.nextScalingType === SCALING_TYPES.CLUSTERS
-        ? i18n.translate('xpack.maps.source.esSearch.scalingModal.clusters', {
-            defaultMessage: `clusters`,
-          })
-        : i18n.translate('xpack.maps.source.esSearch.scalingModal.vectorTiles', {
-            defaultMessage: `vector tiles`,
-          });
     return (
       <EuiConfirmModal
         title={i18n.translate('xpack.maps.source.esSearch.scalingModal.title', {
-          defaultMessage: `Term joins not supported`,
+          defaultMessage: `Remove unsupported configurations?`,
         })}
         onCancel={this._closeModal}
         onConfirm={this._acceptModal}
@@ -170,13 +181,7 @@ export class ScalingForm extends Component<Props, State> {
         buttonColor="danger"
         defaultFocusedButton="cancel"
       >
-        <p>
-          <FormattedMessage
-            id="xpack.maps.source.esSearch.scalingModal.message"
-            defaultMessage="Scaling option {scalingOptionLabel} does not support term joins. Switching to {scalingOptionLabel} will remove all term joins from your layer configuration."
-            values={{ scalingOptionLabel }}
-          />
-        </p>
+        <p>{this.state.modalMsg}</p>
       </EuiConfirmModal>
     );
   }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
index 4981144827a76..c0eef8ba1ca22 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
@@ -8,10 +8,12 @@
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { Filter } from '@kbn/es-query';
-import { DataViewField, DataView, ISearchSource } from 'src/plugins/data/common';
-import type { Query } from 'src/plugins/data/common';
-import type { KibanaExecutionContext } from 'kibana/public';
+import { DataViewField, DataView, ISearchSource } from '@kbn/data-plugin/common';
+import type { Query } from '@kbn/data-plugin/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { lastValueFrom } from 'rxjs';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { AbstractVectorSource, BoundsRequestMeta } from '../vector_source';
 import {
   getAutocompleteService,
@@ -25,7 +27,6 @@ import { copyPersistentState } from '../../../reducers/copy_persistent_state';
 import { DataRequestAbortError } from '../../util/data_request';
 import { expandToTileBoundaries } from '../../util/geo_tile_utils';
 import { IVectorSource } from '../vector_source';
-import { TimeRange } from '../../../../../../../src/plugins/data/common';
 import {
   AbstractESSourceDescriptor,
   AbstractSourceDescriptor,
@@ -38,7 +39,6 @@ import { IVectorStyle } from '../../styles/vector/vector_style';
 import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
 import { IField } from '../../fields/field';
 import { FieldFormatter } from '../../../../common/constants';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { makePublicExecutionContext } from '../../../util';
 
@@ -214,6 +214,9 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource
     const indexPattern = await this.getIndexPattern();
     const globalFilters: Filter[] = searchFilters.applyGlobalQuery ? searchFilters.filters : [];
     const allFilters: Filter[] = [...globalFilters];
+    if (searchFilters.joinKeyFilter) {
+      allFilters.push(searchFilters.joinKeyFilter);
+    }
     if (this.isFilterByMapBounds() && 'buffer' in searchFilters && searchFilters.buffer) {
       // buffer can be empty
       const geoField = await this._getGeoField();
diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
index b583dc7b281d0..7acf37409df94 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
@@ -7,7 +7,8 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ISearchSource, Query } from 'src/plugins/data/public';
+import { ISearchSource, Query } from '@kbn/data-plugin/public';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import {
   AGG_TYPE,
   DEFAULT_MAX_BUCKETS_LIMIT,
@@ -27,7 +28,6 @@ import {
   ESTermSourceDescriptor,
   VectorJoinSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { PropertiesMap } from '../../../../common/elasticsearch_util';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { ITermJoinSource } from '../term_join_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts b/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts
index 1f9455e01afa0..9cfddb2fae884 100644
--- a/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts
@@ -6,6 +6,7 @@
  */
 
 import { Feature, FeatureCollection } from 'geojson';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { AbstractVectorSource, BoundsRequestMeta, GeoJsonWithMeta } from '../vector_source';
 import { EMPTY_FEATURE_COLLECTION, FIELD_ORIGIN, SOURCE_TYPES } from '../../../../common/constants';
 import {
@@ -16,7 +17,6 @@ import {
 import { registerSource } from '../source_registry';
 import { IField } from '../../fields/field';
 import { getFeatureCollectionBounds } from '../../util/get_feature_collection_bounds';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { InlineField } from '../../fields/inline_field';
 
 function getFeatureCollection(
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
index ef5c05d2df2f5..c0e6e845bec0d 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
@@ -11,8 +11,8 @@ import React, { Fragment, Component, ChangeEvent } from 'react';
 import { EuiFieldText, EuiFormRow, EuiToolTip, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
+import { ValidatedDualRange, Value } from '@kbn/kibana-react-plugin/public';
 import { MAX_ZOOM, MIN_ZOOM } from '../../../../common/constants';
-import { ValidatedDualRange, Value } from '../../../../../../../src/plugins/kibana_react/public';
 import { MVTFieldConfigEditor } from './mvt_field_config_editor';
 import { MVTFieldDescriptor } from '../../../../common/descriptor_types';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
index b3ded0620b256..47c69e89c3c3a 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import React from 'react';
 import { GeoJsonProperties, Geometry, Position } from 'geojson';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { AbstractSource, ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { BoundsRequestMeta, GeoJsonWithMeta, IMvtVectorSource } from '../vector_source';
 import {
@@ -28,7 +29,6 @@ import {
 import { MVTField } from '../../fields/mvt_field';
 import { UpdateSourceEditor } from './update_source_editor';
 import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 
 export const sourceTitle = i18n.translate(
   'xpack.maps.source.MVTSingleLayerVectorSource.sourceTitle',
diff --git a/x-pack/plugins/maps/public/classes/sources/source.ts b/x-pack/plugins/maps/public/classes/sources/source.ts
index 0ecca16fde07b..0e5e7174707d1 100644
--- a/x-pack/plugins/maps/public/classes/sources/source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/source.ts
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import { ReactElement } from 'react';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { GeoJsonProperties } from 'geojson';
 import { copyPersistentState } from '../../reducers/copy_persistent_state';
 import { IField } from '../fields/field';
@@ -29,9 +29,8 @@ export type OnSourceChangeArgs = {
 };
 
 export type SourceEditorArgs = {
-  clearJoins: () => void;
   currentLayerType: string;
-  hasJoins: boolean;
+  numberOfJoins: number;
   onChange: (...args: OnSourceChangeArgs[]) => Promise<void>;
 };
 
diff --git a/x-pack/plugins/maps/public/classes/sources/source_registry.ts b/x-pack/plugins/maps/public/classes/sources/source_registry.ts
index 7be7343889d48..f1dd02148cd19 100644
--- a/x-pack/plugins/maps/public/classes/sources/source_registry.ts
+++ b/x-pack/plugins/maps/public/classes/sources/source_registry.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import type { ISource } from './source';
-import { Adapters } from '../../../../../../src/plugins/inspector/common/adapters';
 
 export type SourceRegistryEntry = {
   ConstructorFunction: new (
diff --git a/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts b/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts
index 768c7cacffab3..d2d6e12036f4c 100644
--- a/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts
@@ -7,7 +7,8 @@
 
 import uuid from 'uuid';
 import { GeoJsonProperties } from 'geojson';
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { FIELD_ORIGIN, SOURCE_TYPES, VECTOR_SHAPE_TYPE } from '../../../../common/constants';
 import {
   MapExtent,
@@ -15,7 +16,6 @@ import {
   VectorJoinSourceRequestMeta,
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { ITermJoinSource } from '../term_join_source';
 import { BucketProperties, PropertiesMap } from '../../../../common/elasticsearch_util';
 import { IField } from '../../fields/field';
diff --git a/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts b/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts
index 8cf1a631bf223..5ac7ca822fc93 100644
--- a/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts
@@ -6,8 +6,8 @@
  */
 
 import { GeoJsonProperties } from 'geojson';
+import { Query } from '@kbn/data-plugin/common/query';
 import { IField } from '../../fields/field';
-import { Query } from '../../../../../../../src/plugins/data/common/query';
 import { VectorJoinSourceRequestMeta } from '../../../../common/descriptor_types';
 import { PropertiesMap } from '../../../../common/elasticsearch_util';
 import { ITooltipProperty } from '../../tooltips/tooltip_property';
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts
index 8d2c9cfede561..fca72af193ca3 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts
@@ -6,7 +6,7 @@
  */
 
 import { VectorSourceRequestMeta } from '../../../../common/descriptor_types';
-import { IVectorSource } from '../vector_source';
+import { IVectorSource } from '.';
 
 export interface IMvtVectorSource extends IVectorSource {
   /*
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
index 49506379898a2..79830068628e5 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { FeatureCollection, GeoJsonProperties, Geometry, Position } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { VECTOR_SHAPE_TYPE } from '../../../../common/constants';
 import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
 import { AbstractSource, ISource } from '../source';
@@ -42,6 +42,7 @@ export interface BoundsRequestMeta {
   sourceQuery?: Query;
   timeFilters: TimeRange;
   timeslice?: Timeslice;
+  joinKeyFilter?: Filter;
 }
 
 export interface IVectorSource extends ISource {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
index be8c9b0750b94..a95c8194ffdb3 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`should render 1`] = `
     fields={
       Array [
         Object {
+          "isUnsupported": false,
           "label": "field0",
           "name": "field0",
           "origin": "source",
@@ -82,6 +83,7 @@ exports[`should render 1`] = `
     fields={
       Array [
         Object {
+          "isUnsupported": false,
           "label": "field0",
           "name": "field0",
           "origin": "source",
@@ -168,6 +170,7 @@ exports[`should render 1`] = `
     fields={
       Array [
         Object {
+          "isUnsupported": false,
           "label": "field0",
           "name": "field0",
           "origin": "source",
@@ -212,6 +215,7 @@ exports[`should render 1`] = `
     fields={
       Array [
         Object {
+          "isUnsupported": false,
           "label": "field0",
           "name": "field0",
           "origin": "source",
@@ -306,6 +310,7 @@ exports[`should render 1`] = `
     fields={
       Array [
         Object {
+          "isUnsupported": false,
           "label": "field0",
           "name": "field0",
           "origin": "source",
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/field_select.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_select.tsx
index 8f61bfd35be85..3de0292292b41 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/field_select.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/field_select.tsx
@@ -51,7 +51,12 @@ function groupFieldsByOrigin(fields: StyleField[]) {
   function fieldsListToOptions(fieldsList: StyleField[]) {
     return fieldsList
       .map((field) => {
-        return { value: field, label: field.label };
+        return {
+          value: field,
+          label: field.label,
+          disabled: field.isUnsupported,
+          title: field.unsupportedMsg,
+        };
       })
       .sort((a, b) => {
         return a.label.toLowerCase().localeCompare(b.label.toLowerCase());
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js b/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js
index 83ea2e0b3d43c..b47e22fcd318c 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ValidatedDualRange } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { MIN_SIZE, MAX_SIZE } from '../../vector_style_defaults';
 import { i18n } from '@kbn/i18n';
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx
index f1a5653da612b..d93be52dcc4d4 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx
@@ -16,9 +16,9 @@ import {
   EuiTitle,
   EuiToolTip,
 } from '@elastic/eui';
-import { mapboxgl, Map as MapboxMap } from '@kbn/mapbox-gl';
+import { maplibregl, Map as MapboxMap } from '@kbn/mapbox-gl';
 import { i18n } from '@kbn/i18n';
-import { ResizeChecker } from '.././../../../../../../../../src/plugins/kibana_utils/public';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 import {
   CUSTOM_ICON_PIXEL_RATIO,
   createSdfIcon,
@@ -94,7 +94,6 @@ export class IconPreview extends Component<Props, State> {
       }
       const imageData = await createSdfIcon({ svg, cutoff, radius });
       if (map.hasImage(IconPreview.iconId)) {
-        // @ts-expect-error
         map.updateImage(IconPreview.iconId, imageData);
       } else {
         map.addImage(IconPreview.iconId, imageData, {
@@ -128,7 +127,7 @@ export class IconPreview extends Component<Props, State> {
   }
 
   _createMapInstance(): MapboxMap {
-    const map = new mapboxgl.Map({
+    const map = new maplibregl.Map({
       container: this._containerRef!,
       interactive: false,
       center: [0, 0],
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
index 8edb67703a4d1..8d5df5fbad54d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
@@ -49,6 +49,9 @@ function createLayerMock(numFields: number, supportedShapeTypes: VECTOR_SHAPE_TY
         getSupportedShapeTypes: async () => {
           return supportedShapeTypes;
         },
+        isMvt: () => {
+          return false;
+        },
       } as unknown as IVectorSource;
     },
   } as unknown as IVectorLayer;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
index 4431cead9b0d1..daf307e85ffc1 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
@@ -179,7 +179,14 @@ export class VectorStyleEditor extends Component<Props, State> {
     return labelBorderSize.getOptions().size !== LABEL_BORDER_SIZES.NONE;
   }
 
+  _isLayerSourceMvt() {
+    return this.props.layer.getSource().isMvt();
+  }
+
   _renderFillColor(isPointFillColor = false) {
+    const styleProperty = this.props.styleProperties[VECTOR_STYLES.FILL_COLOR] as IStyleProperty<
+      ColorDynamicOptions | ColorStaticOptions
+    >;
     return (
       <VectorStyleColorEditor
         disabled={isPointFillColor && !this._hasMarkerOrIcon()}
@@ -187,12 +194,11 @@ export class VectorStyleEditor extends Component<Props, State> {
         swatches={DEFAULT_FILL_COLORS}
         onStaticStyleChange={this._onStaticStyleChange}
         onDynamicStyleChange={this._onDynamicStyleChange}
-        styleProperty={
-          this.props.styleProperties[VECTOR_STYLES.FILL_COLOR] as IStyleProperty<
-            ColorDynamicOptions | ColorStaticOptions
-          >
-        }
-        fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.FILL_COLOR)}
+        styleProperty={styleProperty}
+        fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+          styleProperty,
+          this._isLayerSourceMvt()
+        )}
         defaultStaticStyleOptions={
           this.state.defaultStaticProperties[VECTOR_STYLES.FILL_COLOR].options as ColorStaticOptions
         }
@@ -206,6 +212,9 @@ export class VectorStyleEditor extends Component<Props, State> {
 
   _renderLineColor(isPointBorderColor = false) {
     const disabledByIconSize = isPointBorderColor && !this._hasMarkerOrIcon();
+    const styleProperty = this.props.styleProperties[VECTOR_STYLES.LINE_COLOR] as IStyleProperty<
+      ColorDynamicOptions | ColorStaticOptions
+    >;
     return (
       <VectorStyleColorEditor
         disabled={disabledByIconSize || !this.props.hasBorder}
@@ -213,12 +222,11 @@ export class VectorStyleEditor extends Component<Props, State> {
         swatches={DEFAULT_LINE_COLORS}
         onStaticStyleChange={this._onStaticStyleChange}
         onDynamicStyleChange={this._onDynamicStyleChange}
-        styleProperty={
-          this.props.styleProperties[VECTOR_STYLES.LINE_COLOR] as IStyleProperty<
-            ColorDynamicOptions | ColorStaticOptions
-          >
-        }
-        fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.LINE_COLOR)}
+        styleProperty={styleProperty}
+        fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+          styleProperty,
+          this._isLayerSourceMvt()
+        )}
         defaultStaticStyleOptions={
           this.state.defaultStaticProperties[VECTOR_STYLES.LINE_COLOR].options as ColorStaticOptions
         }
@@ -231,18 +239,20 @@ export class VectorStyleEditor extends Component<Props, State> {
   }
 
   _renderLineWidth(isPointBorderWidth = false) {
+    const styleProperty = this.props.styleProperties[VECTOR_STYLES.LINE_WIDTH] as IStyleProperty<
+      SizeDynamicOptions | SizeStaticOptions
+    >;
     return (
       <VectorStyleSizeEditor
         disabled={isPointBorderWidth && !this._hasMarkerOrIcon()}
         disabledBy={VECTOR_STYLES.ICON_SIZE}
         onStaticStyleChange={this._onStaticStyleChange}
         onDynamicStyleChange={this._onDynamicStyleChange}
-        styleProperty={
-          this.props.styleProperties[VECTOR_STYLES.LINE_WIDTH] as IStyleProperty<
-            SizeDynamicOptions | SizeStaticOptions
-          >
-        }
-        fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.LINE_WIDTH)}
+        styleProperty={styleProperty}
+        fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+          styleProperty,
+          this._isLayerSourceMvt()
+        )}
         defaultStaticStyleOptions={
           this.state.defaultStaticProperties[VECTOR_STYLES.LINE_WIDTH].options as SizeStaticOptions
         }
@@ -261,17 +271,28 @@ export class VectorStyleEditor extends Component<Props, State> {
         | DynamicTextProperty
     );
     const hasLabelBorder = this._hasLabelBorder();
+    const labelStyleProperty = this.props.styleProperties[
+      VECTOR_STYLES.LABEL_TEXT
+    ] as IStyleProperty<LabelDynamicOptions | LabelStaticOptions>;
+    const labelColorStyleProperty = this.props.styleProperties[
+      VECTOR_STYLES.LABEL_COLOR
+    ] as IStyleProperty<ColorDynamicOptions | ColorStaticOptions>;
+    const labelSizeStyleProperty = this.props.styleProperties[
+      VECTOR_STYLES.LABEL_SIZE
+    ] as IStyleProperty<SizeDynamicOptions | SizeStaticOptions>;
+    const labelBorderColorProperty = this.props.styleProperties[
+      VECTOR_STYLES.LABEL_BORDER_COLOR
+    ] as IStyleProperty<ColorDynamicOptions | ColorStaticOptions>;
     return (
       <Fragment>
         <VectorStyleLabelEditor
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
-          styleProperty={
-            this.props.styleProperties[VECTOR_STYLES.LABEL_TEXT] as IStyleProperty<
-              LabelDynamicOptions | LabelStaticOptions
-            >
-          }
-          fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.LABEL_TEXT)}
+          styleProperty={labelStyleProperty}
+          fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+            labelStyleProperty,
+            this._isLayerSourceMvt()
+          )}
           defaultStaticStyleOptions={
             this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_TEXT]
               .options as LabelStaticOptions
@@ -289,12 +310,11 @@ export class VectorStyleEditor extends Component<Props, State> {
           swatches={DEFAULT_LINE_COLORS}
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
-          styleProperty={
-            this.props.styleProperties[VECTOR_STYLES.LABEL_COLOR] as IStyleProperty<
-              ColorDynamicOptions | ColorStaticOptions
-            >
-          }
-          fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.LABEL_COLOR)}
+          styleProperty={labelColorStyleProperty}
+          fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+            labelColorStyleProperty,
+            this._isLayerSourceMvt()
+          )}
           defaultStaticStyleOptions={
             this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_COLOR]
               .options as ColorStaticOptions
@@ -311,12 +331,11 @@ export class VectorStyleEditor extends Component<Props, State> {
           disabledBy={VECTOR_STYLES.LABEL_TEXT}
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
-          styleProperty={
-            this.props.styleProperties[VECTOR_STYLES.LABEL_SIZE] as IStyleProperty<
-              SizeDynamicOptions | SizeStaticOptions
-            >
-          }
-          fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.LABEL_SIZE)}
+          styleProperty={labelSizeStyleProperty}
+          fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+            labelSizeStyleProperty,
+            this._isLayerSourceMvt()
+          )}
           defaultStaticStyleOptions={
             this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_SIZE]
               .options as SizeStaticOptions
@@ -334,12 +353,11 @@ export class VectorStyleEditor extends Component<Props, State> {
           swatches={DEFAULT_LINE_COLORS}
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
-          styleProperty={
-            this.props.styleProperties[VECTOR_STYLES.LABEL_BORDER_COLOR] as IStyleProperty<
-              ColorDynamicOptions | ColorStaticOptions
-            >
-          }
-          fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.LABEL_BORDER_COLOR)}
+          styleProperty={labelBorderColorProperty}
+          fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+            labelBorderColorProperty,
+            this._isLayerSourceMvt()
+          )}
           defaultStaticStyleOptions={
             this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_BORDER_COLOR]
               .options as ColorStaticOptions
@@ -371,6 +389,10 @@ export class VectorStyleEditor extends Component<Props, State> {
         this.props.styleProperties[VECTOR_STYLES.SYMBOLIZE_AS] as SymbolizeAsProperty
       ).isSymbolizedAsIcon()
     ) {
+      const orientationStyleProperty = this.props.styleProperties[VECTOR_STYLES.ICON_ORIENTATION];
+      const iconStyleProperty = this.props.styleProperties[VECTOR_STYLES.ICON] as IStyleProperty<
+        IconDynamicOptions | IconStaticOptions
+      >;
       iconOrientationEditor = (
         <Fragment>
           <OrientationEditor
@@ -378,8 +400,11 @@ export class VectorStyleEditor extends Component<Props, State> {
             disabledBy={VECTOR_STYLES.ICON_SIZE}
             onStaticStyleChange={this._onStaticStyleChange}
             onDynamicStyleChange={this._onDynamicStyleChange}
-            styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_ORIENTATION]}
-            fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.ICON_ORIENTATION)}
+            styleProperty={orientationStyleProperty}
+            fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+              orientationStyleProperty,
+              this._isLayerSourceMvt()
+            )}
             defaultStaticStyleOptions={
               this.state.defaultStaticProperties[VECTOR_STYLES.ICON_ORIENTATION].options
             }
@@ -399,12 +424,11 @@ export class VectorStyleEditor extends Component<Props, State> {
             onStaticStyleChange={this._onStaticStyleChange}
             onDynamicStyleChange={this._onDynamicStyleChange}
             onCustomIconsChange={this.props.onCustomIconsChange}
-            styleProperty={
-              this.props.styleProperties[VECTOR_STYLES.ICON] as IStyleProperty<
-                IconDynamicOptions | IconStaticOptions
-              >
-            }
-            fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.ICON)}
+            styleProperty={iconStyleProperty}
+            fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+              iconStyleProperty,
+              this._isLayerSourceMvt()
+            )}
             defaultStaticStyleOptions={
               this.state.defaultStaticProperties[VECTOR_STYLES.ICON].options as IconStaticOptions
             }
@@ -417,6 +441,9 @@ export class VectorStyleEditor extends Component<Props, State> {
       );
     }
 
+    const iconSizeStyleProperty = this.props.styleProperties[
+      VECTOR_STYLES.ICON_SIZE
+    ] as IStyleProperty<SizeDynamicOptions | SizeStaticOptions>;
     return (
       <Fragment>
         <VectorStyleSymbolizeAsEditor
@@ -443,12 +470,11 @@ export class VectorStyleEditor extends Component<Props, State> {
         <VectorStyleSizeEditor
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
-          styleProperty={
-            this.props.styleProperties[VECTOR_STYLES.ICON_SIZE] as IStyleProperty<
-              SizeDynamicOptions | SizeStaticOptions
-            >
-          }
-          fields={this.state.styleFieldsHelper!.getFieldsForStyle(VECTOR_STYLES.ICON_SIZE)}
+          styleProperty={iconSizeStyleProperty}
+          fields={this.state.styleFieldsHelper!.getFieldsForStyle(
+            iconSizeStyleProperty,
+            this._isLayerSourceMvt()
+          )}
           defaultStaticStyleOptions={
             this.state.defaultStaticProperties[VECTOR_STYLES.ICON_SIZE].options as SizeStaticOptions
           }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
index 710824d0e1414..3dd8628339803 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
@@ -13,7 +13,6 @@ jest.mock('../components/vector_style_editor', () => ({
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Feature, Point } from 'geojson';
 
 import { DynamicColorProperty } from './dynamic_color_property';
 import {
@@ -208,38 +207,6 @@ describe('renderLegendDetailRow', () => {
   });
 });
 
-function makeFeatures(foobarPropValues: string[]) {
-  return foobarPropValues.map((value: string) => {
-    return {
-      type: 'Feature',
-      geometry: {
-        type: 'Point',
-        coordinates: [-10, 0],
-      } as Point,
-      properties: {
-        foobar: value,
-      },
-    } as Feature;
-  });
-}
-
-test('Should pluck the categorical style-meta', async () => {
-  const colorStyle = makeProperty({
-    type: COLOR_MAP_TYPE.CATEGORICAL,
-    colorCategory: 'palette_0',
-    fieldMetaOptions,
-  });
-
-  const features = makeFeatures(['CN', 'CN', 'US', 'CN', 'US', 'IN']);
-  const meta = colorStyle.pluckCategoricalStyleMetaFromFeatures(features);
-
-  expect(meta).toEqual([
-    { key: 'CN', count: 3 },
-    { key: 'US', count: 2 },
-    { key: 'IN', count: 1 },
-  ]);
-});
-
 test('Should pluck the categorical style-meta from fieldmeta', async () => {
   const colorStyle = makeProperty({
     type: COLOR_MAP_TYPE.CATEGORICAL,
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts
index afa034b4d395c..1759af0c0f0e9 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts
@@ -6,9 +6,8 @@
  */
 
 import type { Map as MbMap } from '@kbn/mapbox-gl';
-import { DynamicStyleProperty, getNumericalMbFeatureStateValue } from './dynamic_style_property';
+import { DynamicStyleProperty } from './dynamic_style_property';
 import { OrientationDynamicOptions } from '../../../../../common/descriptor_types';
-import { RawValue } from '../../../../../common/constants';
 
 export class DynamicOrientationProperty extends DynamicStyleProperty<OrientationDynamicOptions> {
   syncIconRotationWithMb(symbolLayerId: string, mbMap: MbMap) {
@@ -28,11 +27,7 @@ export class DynamicOrientationProperty extends DynamicStyleProperty<Orientation
     return false;
   }
 
-  supportsMbFeatureState(): boolean {
+  supportsFeatureState(): boolean {
     return false;
   }
-
-  getMbPropertyValue(rawValue: RawValue): RawValue {
-    return getNumericalMbFeatureStateValue(rawValue);
-  }
 }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx
index 89f138ff7744b..ed6e30947779b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx
@@ -35,7 +35,7 @@ export class DynamicSizeProperty extends DynamicStyleProperty<SizeDynamicOptions
     this._isSymbolizedAsIcon = isSymbolizedAsIcon;
   }
 
-  supportsMbFeatureState() {
+  supportsFeatureState() {
     // mb style "icon-size" does not support feature state
     if (this.getStyleName() === VECTOR_STYLES.ICON_SIZE && this._isSymbolizedAsIcon) {
       return false;
@@ -46,7 +46,7 @@ export class DynamicSizeProperty extends DynamicStyleProperty<SizeDynamicOptions
       return false;
     }
 
-    return super.supportsMbFeatureState();
+    return true;
   }
 
   syncHaloWidthWithMb(mbLayerId: string, mbMap: MbMap) {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
index 517bb68a0025d..3a62178de80b6 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import React from 'react';
-import { Feature, FeatureCollection } from 'geojson';
+import { FeatureCollection } from 'geojson';
 import type { FeatureIdentifier, Map as MbMap } from '@kbn/mapbox-gl';
 import { AbstractStyleProperty, IStyleProperty } from './style_property';
 import { DEFAULT_SIGMA } from '../vector_style_defaults';
@@ -32,7 +32,6 @@ import {
   PercentilesFieldMeta,
   RangeFieldMeta,
   StyleMetaData,
-  TileMetaFeature,
 } from '../../../../../common/descriptor_types';
 import { IField } from '../../../fields/field';
 import { IVectorLayer } from '../../../layers/vector_layer';
@@ -48,18 +47,48 @@ export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
   getFieldOrigin(): FIELD_ORIGIN | null;
   getRangeFieldMeta(): RangeFieldMeta | null;
   getCategoryFieldMeta(): Category[];
+
   /*
    * Returns hash that signals style meta needs to be re-fetched when value changes
    */
   getStyleMetaHash(): string;
   isFieldMetaEnabled(): boolean;
+  isCategorical(): boolean;
   isOrdinal(): boolean;
+  getNumberOfCategories(): number;
   supportsFieldMeta(): boolean;
+
+  /*
+   * Maplibre layers have two sub-properties that determine how data is rendered: layout and paint.
+   *
+   * Layout properties are applied early in the rendering process and define how data for that layer is passed to the GPU.
+   * Changes to a layout property require an asynchronous "layout" step.
+   *
+   * Paint properties are applied later in the rendering process. Changes to a paint property are cheap and happen synchronously.
+   *
+   * Paint properties support feature-state. Layout properties do not support feature-state
+   *
+   * Returns true when the style only sets paints properties. Returns false when the style sets any layout properties.
+   */
+  supportsFeatureState(): boolean;
+
+  /*
+   * Maplibre stores vector properties in 2 locations: feature.properties and feature-state
+   *
+   * Feature-state is a set of runtime defined attributes that can be dynamically assigned to a feature and used to style features.
+   * Feature-state is paired to a feature by feature id or feature.properties[promoteId] (when 'source.promoteId' is set).
+   *
+   * Feature-state provides a significant boost in performance allowing for the update of individual styles
+   * without the map rendering engine having to re-parse the underlying geometry and feature properties.
+   *
+   * 'paint' properties may retrieve style data from feature-state or feature.properties.
+   * 'layout' properties may only retrieve style from feature.properties.
+   *
+   * Returns true when style data is stored in feature-state.  Returns false when style data is stored in feature.properties.
+   */
+  usesFeatureState(): boolean;
+
   getFieldMetaRequest(): Promise<unknown | null>;
-  pluckOrdinalStyleMetaFromFeatures(features: Feature[]): RangeFieldMeta | null;
-  pluckCategoricalStyleMetaFromFeatures(features: Feature[]): Category[];
-  pluckOrdinalStyleMetaFromTileMetaFeatures(metaFeatures: TileMetaFeature[]): RangeFieldMeta | null;
-  pluckCategoricalStyleMetaFromTileMetaFeatures(features: TileMetaFeature[]): Category[];
   getValueSuggestions(query: string): Promise<string[]>;
   enrichGeoJsonAndMbFeatureState(
     featureCollection: FeatureCollection,
@@ -284,14 +313,20 @@ export class DynamicStyleProperty<T>
     return null;
   }
 
-  supportsMbFeatureState() {
-    return !!this._field && !this._field.getSource().isMvt();
+  supportsFeatureState() {
+    return true;
+  }
+
+  usesFeatureState() {
+    if (!this._field) {
+      return false;
+    }
+
+    return this._field.getSource().isMvt() ? false : this.supportsFeatureState();
   }
 
   getMbLookupFunction(): MB_LOOKUP_FUNCTION {
-    return this.supportsMbFeatureState()
-      ? MB_LOOKUP_FUNCTION.FEATURE_STATE
-      : MB_LOOKUP_FUNCTION.GET;
+    return this.usesFeatureState() ? MB_LOOKUP_FUNCTION.FEATURE_STATE : MB_LOOKUP_FUNCTION.GET;
   }
 
   getFieldMetaOptions() {
@@ -317,93 +352,6 @@ export class DynamicStyleProperty<T>
       : DATA_MAPPING_FUNCTION.INTERPOLATE;
   }
 
-  pluckOrdinalStyleMetaFromTileMetaFeatures(
-    metaFeatures: TileMetaFeature[]
-  ): RangeFieldMeta | null {
-    if (!this._field || !this.isOrdinal()) {
-      return null;
-    }
-
-    let min = Infinity;
-    let max = -Infinity;
-    for (let i = 0; i < metaFeatures.length; i++) {
-      const range = this._field.pluckRangeFromTileMetaFeature(metaFeatures[i]);
-      if (range) {
-        min = Math.min(range.min, min);
-        max = Math.max(range.max, max);
-      }
-    }
-
-    return min === Infinity || max === -Infinity
-      ? null
-      : {
-          min,
-          max,
-          delta: max - min,
-        };
-  }
-
-  pluckCategoricalStyleMetaFromTileMetaFeatures(metaFeatures: TileMetaFeature[]): Category[] {
-    return [];
-  }
-
-  pluckOrdinalStyleMetaFromFeatures(features: Feature[]): RangeFieldMeta | null {
-    if (!this.isOrdinal()) {
-      return null;
-    }
-
-    const name = this.getFieldName();
-    let min = Infinity;
-    let max = -Infinity;
-    for (let i = 0; i < features.length; i++) {
-      const feature = features[i];
-      const newValue = feature.properties ? parseFloat(feature.properties[name]) : NaN;
-      if (!isNaN(newValue)) {
-        min = Math.min(min, newValue);
-        max = Math.max(max, newValue);
-      }
-    }
-
-    return min === Infinity || max === -Infinity
-      ? null
-      : {
-          min,
-          max,
-          delta: max - min,
-        };
-  }
-
-  pluckCategoricalStyleMetaFromFeatures(features: Feature[]): Category[] {
-    const size = this.getNumberOfCategories();
-    if (!this.isCategorical() || size <= 0) {
-      return [];
-    }
-
-    const counts = new Map();
-    for (let i = 0; i < features.length; i++) {
-      const feature = features[i];
-      const term = feature.properties ? feature.properties[this.getFieldName()] : undefined;
-      // properties object may be sparse, so need to check if the field is effectively present
-      if (typeof term !== undefined) {
-        if (counts.has(term)) {
-          counts.set(term, counts.get(term) + 1);
-        } else {
-          counts.set(term, 1);
-        }
-      }
-    }
-
-    const ordered: Category[] = [];
-    for (const [key, value] of counts) {
-      ordered.push({ key, count: value });
-    }
-
-    ordered.sort((a, b) => {
-      return b.count - a.count;
-    });
-    return ordered.slice(0, size);
-  }
-
   _pluckOrdinalStyleMetaFromFieldMetaData(styleMetaData: StyleMetaData): RangeFieldMeta | null {
     if (!this.isOrdinal() || !this._field) {
       return null;
@@ -494,7 +442,7 @@ export class DynamicStyleProperty<T>
     }
 
     let targetName;
-    if (this.supportsMbFeatureState()) {
+    if (this.usesFeatureState()) {
       // Base case for any properties that can support feature-state (e.g. color, size, ...)
       // They just re-use the original property-name
       targetName = this._field.getName();
@@ -512,10 +460,7 @@ export class DynamicStyleProperty<T>
   }
 
   getMbPropertyValue(rawValue: RawValue): RawValue {
-    // Maps only uses feature-state for numerical values.
-    // `supportsMbFeatureState` will only return true when the mb-style rule does a feature-state lookup on a numerical value
-    // Calling `isOrdinal` would be equivalent.
-    return this.supportsMbFeatureState() ? getNumericalMbFeatureStateValue(rawValue) : rawValue;
+    return this.isOrdinal() ? getNumericalMbFeatureStateValue(rawValue) : rawValue;
   }
 
   enrichGeoJsonAndMbFeatureState(
@@ -523,7 +468,7 @@ export class DynamicStyleProperty<T>
     mbMap: MbMap,
     mbSourceId: string
   ): boolean {
-    const supportsFeatureState = this.supportsMbFeatureState();
+    const usesFeatureState = this.usesFeatureState();
     const featureIdentifier: FeatureIdentifier = {
       source: mbSourceId,
       id: undefined,
@@ -534,7 +479,7 @@ export class DynamicStyleProperty<T>
       const feature = featureCollection.features[i];
       const rawValue = feature.properties ? feature.properties[this.getFieldName()] : undefined;
       const targetMbValue = this.getMbPropertyValue(rawValue);
-      if (supportsFeatureState) {
+      if (usesFeatureState) {
         featureState[targetMbName] = targetMbValue; // the same value will be potentially overridden multiple times, if the name remains identical
         featureIdentifier.id = feature.id;
         mbMap.setFeatureState(featureIdentifier, featureState);
@@ -544,7 +489,7 @@ export class DynamicStyleProperty<T>
         }
       }
     }
-    return supportsFeatureState;
+    return usesFeatureState;
   }
 }
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.ts
index daf9fa67d9ee7..55957c6e9721a 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.ts
@@ -44,7 +44,7 @@ export class DynamicTextProperty extends DynamicStyleProperty<LabelDynamicOption
     return false;
   }
 
-  supportsMbFeatureState() {
+  supportsFeatureState() {
     return false;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts b/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts
index 9a1cb67c7bfd9..62479d463dd5b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { i18n } from '@kbn/i18n';
 import {
   CATEGORICAL_DATA_TYPES,
   FIELD_ORIGIN,
@@ -12,6 +13,9 @@ import {
   VECTOR_STYLES,
 } from '../../../../common/constants';
 import { IField } from '../../fields/field';
+import { getVectorStyleLabel } from './components/get_vector_style_label';
+import { IStyleProperty } from './properties/style_property';
+import { IDynamicStyleProperty } from './properties/dynamic_style_property';
 
 export interface StyleField {
   label: string;
@@ -19,6 +23,8 @@ export interface StyleField {
   origin: FIELD_ORIGIN;
   type: string;
   supportsAutoDomain: boolean;
+  isUnsupported: boolean;
+  unsupportedMsg?: string;
 }
 
 export async function createStyleFieldsHelper(fields: IField[]): Promise<StyleFieldsHelper> {
@@ -29,6 +35,7 @@ export async function createStyleFieldsHelper(fields: IField[]): Promise<StyleFi
       origin: field.getOrigin(),
       type: await field.getDataType(),
       supportsAutoDomain: field.supportsFieldMetaFromLocalData() || field.supportsFieldMetaFromEs(),
+      isUnsupported: false,
     };
   });
   const styleFields = await Promise.all(promises);
@@ -71,11 +78,11 @@ export class StyleFieldsHelper {
   }
 
   hasFieldForStyle(field: IField, styleName: VECTOR_STYLES): boolean {
-    const fieldList = this.getFieldsForStyle(styleName);
+    const fieldList = this._getFieldsForStyle(styleName);
     return fieldList.some((styleField) => field.getName() === styleField.name);
   }
 
-  getFieldsForStyle(styleName: VECTOR_STYLES): StyleField[] {
+  _getFieldsForStyle(styleName: VECTOR_STYLES): StyleField[] {
     switch (styleName) {
       case VECTOR_STYLES.ICON_ORIENTATION:
         return this._numberFields;
@@ -96,6 +103,37 @@ export class StyleFieldsHelper {
     }
   }
 
+  getFieldsForStyle(
+    styleProperty: IStyleProperty<unknown>,
+    isLayerSourceMvt: boolean
+  ): StyleField[] {
+    const styleFields = this._getFieldsForStyle(styleProperty.getStyleName());
+    return styleProperty.isDynamic() &&
+      !(styleProperty as IDynamicStyleProperty<unknown>).supportsFeatureState()
+      ? styleFields.map((styleField) => {
+          // It is not possible to fallback to feature.properties for maplibre 'vector' source
+          // Join fields that do not support feature-state can not be supported.
+          if (isLayerSourceMvt && styleField.origin === FIELD_ORIGIN.JOIN) {
+            return {
+              ...styleField,
+              isUnsupported: true,
+              unsupportedMsg: i18n.translate(
+                'xpack.maps.style.field.unsupportedWithVectorTileMsg',
+                {
+                  defaultMessage: `'{styleLabel}' does not support this field with vector tiles. To style '{styleLabel}' with this field, select 'Limit results' in 'Scaling'.`,
+                  values: {
+                    styleLabel: getVectorStyleLabel(styleProperty.getStyleName()),
+                  },
+                }
+              ),
+            };
+          }
+
+          return styleField;
+        })
+      : styleFields;
+  }
+
   getStyleFields(): StyleField[] {
     return this._styleFields;
   }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/style_util.test.ts b/x-pack/plugins/maps/public/classes/styles/vector/style_util.test.ts
index fc57f1b92f5af..a0de940b3dfd9 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/style_util.test.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/style_util.test.ts
@@ -5,72 +5,7 @@
  * 2.0.
  */
 
-import { isOnlySingleFeatureType, assignCategoriesToPalette, dynamicRound } from './style_util';
-import { VECTOR_SHAPE_TYPE } from '../../../../common/constants';
-
-describe('isOnlySingleFeatureType', () => {
-  describe('source supports single feature type', () => {
-    const supportedFeatures = [VECTOR_SHAPE_TYPE.POINT];
-    const hasFeatureType = {
-      [VECTOR_SHAPE_TYPE.POINT]: false,
-      [VECTOR_SHAPE_TYPE.LINE]: false,
-      [VECTOR_SHAPE_TYPE.POLYGON]: false,
-    };
-
-    test('Is only single feature type when only supported feature type is target feature type', () => {
-      expect(
-        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.POINT, supportedFeatures, hasFeatureType)
-      ).toBe(true);
-    });
-
-    test('Is not single feature type when only supported feature type is not target feature type', () => {
-      expect(
-        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.LINE, supportedFeatures, hasFeatureType)
-      ).toBe(false);
-    });
-  });
-
-  describe('source supports multiple feature types', () => {
-    const supportedFeatures = [
-      VECTOR_SHAPE_TYPE.POINT,
-      VECTOR_SHAPE_TYPE.LINE,
-      VECTOR_SHAPE_TYPE.POLYGON,
-    ];
-
-    test('Is only single feature type when data only has target feature type', () => {
-      const hasFeatureType = {
-        [VECTOR_SHAPE_TYPE.POINT]: true,
-        [VECTOR_SHAPE_TYPE.LINE]: false,
-        [VECTOR_SHAPE_TYPE.POLYGON]: false,
-      };
-      expect(
-        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.POINT, supportedFeatures, hasFeatureType)
-      ).toBe(true);
-    });
-
-    test('Is not single feature type when data has multiple feature types', () => {
-      const hasFeatureType = {
-        [VECTOR_SHAPE_TYPE.POINT]: true,
-        [VECTOR_SHAPE_TYPE.LINE]: true,
-        [VECTOR_SHAPE_TYPE.POLYGON]: true,
-      };
-      expect(
-        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.LINE, supportedFeatures, hasFeatureType)
-      ).toBe(false);
-    });
-
-    test('Is not single feature type when data does not have target feature types', () => {
-      const hasFeatureType = {
-        [VECTOR_SHAPE_TYPE.POINT]: false,
-        [VECTOR_SHAPE_TYPE.LINE]: true,
-        [VECTOR_SHAPE_TYPE.POLYGON]: false,
-      };
-      expect(
-        isOnlySingleFeatureType(VECTOR_SHAPE_TYPE.POINT, supportedFeatures, hasFeatureType)
-      ).toBe(false);
-    });
-  });
-});
+import { assignCategoriesToPalette, dynamicRound } from './style_util';
 
 describe('assignCategoriesToPalette', () => {
   test('Categories and icons have same length', () => {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/style_util.ts b/x-pack/plugins/maps/public/classes/styles/vector/style_util.ts
index 11f564f436dd5..ec2ecadf70fe3 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/style_util.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/style_util.ts
@@ -6,12 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  ICON_SOURCE,
-  MB_LOOKUP_FUNCTION,
-  VECTOR_SHAPE_TYPE,
-  VECTOR_STYLES,
-} from '../../../../common/constants';
+import { ICON_SOURCE, MB_LOOKUP_FUNCTION, VECTOR_STYLES } from '../../../../common/constants';
 import { Category } from '../../../../common/descriptor_types';
 import { StaticTextProperty } from './properties/static_text_property';
 import { DynamicTextProperty } from './properties/dynamic_text_property';
@@ -30,23 +25,6 @@ export function getComputedFieldNamePrefix(fieldName: string) {
   return `__kbn__dynamic__${fieldName}`;
 }
 
-export function isOnlySingleFeatureType(
-  featureType: VECTOR_SHAPE_TYPE,
-  supportedFeatures: VECTOR_SHAPE_TYPE[],
-  hasFeatureType: { [key in keyof typeof VECTOR_SHAPE_TYPE]: boolean }
-): boolean {
-  if (supportedFeatures.length === 1) {
-    return supportedFeatures[0] === featureType;
-  }
-
-  const featureTypes = Object.keys(hasFeatureType);
-  // @ts-expect-error
-  return featureTypes.reduce((accumulator: boolean, featureTypeKey: VECTOR_SHAPE_TYPE) => {
-    const hasFeature = hasFeatureType[featureTypeKey];
-    return featureTypeKey === featureType ? accumulator && hasFeature : accumulator && !hasFeature;
-  }, true);
-}
-
 export function dynamicRound(value: number | string) {
   if (typeof value !== 'number') {
     return value;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
index c1aa8e395d8c0..caf0e13ce5a2f 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
@@ -6,7 +6,6 @@
  */
 
 import { VectorStyle } from './vector_style';
-import { DataRequest } from '../../util/data_request';
 import {
   FIELD_ORIGIN,
   STYLE_TYPE,
@@ -35,7 +34,15 @@ class MockSource {
 describe('getDescriptorWithUpdatedStyleProps', () => {
   const previousFieldName = 'doIStillExist';
   const mapColors = [];
-  const layer = {};
+  const layer = {
+    getSource: () => {
+      return {
+        isMvt: () => {
+          return false;
+        },
+      };
+    },
+  };
   const customIcons = [];
   const properties = {
     fillColor: {
@@ -76,8 +83,8 @@ describe('getDescriptorWithUpdatedStyleProps', () => {
       const nextFields = [new MockField({ fieldName: previousFieldName, dataType: 'number' })];
       const { hasChanges } = await vectorStyle.getDescriptorWithUpdatedStyleProps(
         nextFields,
-        previousFields,
-        mapColors
+        mapColors,
+        previousFields
       );
       expect(hasChanges).toBe(false);
     });
@@ -89,7 +96,7 @@ describe('getDescriptorWithUpdatedStyleProps', () => {
 
       const nextFields = [];
       const { hasChanges, nextStyleDescriptor } =
-        await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, previousFields, mapColors);
+        await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, mapColors, previousFields);
       expect(hasChanges).toBe(true);
       expect(nextStyleDescriptor.properties[VECTOR_STYLES.LINE_COLOR]).toEqual({
         options: {
@@ -132,7 +139,7 @@ describe('getDescriptorWithUpdatedStyleProps', () => {
         },
       ];
       const { hasChanges, nextStyleDescriptor } =
-        await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, previousFields, mapColors);
+        await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, mapColors, previousFields);
       expect(hasChanges).toBe(true);
       expect(nextStyleDescriptor.properties[VECTOR_STYLES.ICON_SIZE]).toEqual({
         options: {
@@ -149,7 +156,7 @@ describe('getDescriptorWithUpdatedStyleProps', () => {
 
       const nextFields = [new MockField({ fieldName: 'someOtherField', dataType: 'number' })];
       const { hasChanges, nextStyleDescriptor } =
-        await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, previousFields, mapColors);
+        await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, mapColors, previousFields);
       expect(hasChanges).toBe(true);
       expect(nextStyleDescriptor.properties[VECTOR_STYLES.LINE_COLOR]).toEqual({
         options: {
@@ -174,153 +181,3 @@ describe('getDescriptorWithUpdatedStyleProps', () => {
     });
   });
 });
-
-describe('pluckStyleMetaFromSourceDataRequest', () => {
-  const layer = {};
-  const customIcons = [];
-  describe('has features', () => {
-    it('Should identify when feature collection only contains points', async () => {
-      const sourceDataRequest = new DataRequest({
-        data: {
-          type: 'FeatureCollection',
-          features: [
-            {
-              geometry: {
-                type: 'Point',
-              },
-              properties: {},
-            },
-            {
-              geometry: {
-                type: 'MultiPoint',
-              },
-              properties: {},
-            },
-          ],
-        },
-      });
-      const vectorStyle = new VectorStyle({}, new MockSource(), layer, customIcons);
-
-      const featuresMeta = await vectorStyle.pluckStyleMetaFromSourceDataRequest(sourceDataRequest);
-      expect(featuresMeta.geometryTypes.isPointsOnly).toBe(true);
-      expect(featuresMeta.geometryTypes.isLinesOnly).toBe(false);
-      expect(featuresMeta.geometryTypes.isPolygonsOnly).toBe(false);
-    });
-
-    it('Should identify when feature collection only contains lines', async () => {
-      const sourceDataRequest = new DataRequest({
-        data: {
-          type: 'FeatureCollection',
-          features: [
-            {
-              geometry: {
-                type: 'LineString',
-              },
-              properties: {},
-            },
-            {
-              geometry: {
-                type: 'MultiLineString',
-              },
-              properties: {},
-            },
-            {
-              geometry: {
-                type: 'Point',
-              },
-              properties: {
-                __kbn_is_centroid_feature__: true,
-              },
-            },
-          ],
-        },
-      });
-      const vectorStyle = new VectorStyle({}, new MockSource(), layer, customIcons);
-
-      const featuresMeta = await vectorStyle.pluckStyleMetaFromSourceDataRequest(sourceDataRequest);
-      expect(featuresMeta.geometryTypes.isPointsOnly).toBe(false);
-      expect(featuresMeta.geometryTypes.isLinesOnly).toBe(true);
-      expect(featuresMeta.geometryTypes.isPolygonsOnly).toBe(false);
-    });
-  });
-
-  describe('scaled field range', () => {
-    const sourceDataRequest = new DataRequest({
-      data: {
-        type: 'FeatureCollection',
-        features: [
-          {
-            geometry: {
-              type: 'Point',
-            },
-            properties: {
-              myDynamicField: 1,
-            },
-          },
-          {
-            geometry: {
-              type: 'Point',
-            },
-            properties: {
-              myDynamicField: 10,
-            },
-          },
-        ],
-      },
-    });
-
-    it('Should not extract scaled field range when scaled field has no values', async () => {
-      const vectorStyle = new VectorStyle(
-        {
-          properties: {
-            fillColor: {
-              type: STYLE_TYPE.DYNAMIC,
-              options: {
-                field: {
-                  origin: FIELD_ORIGIN.SOURCE,
-                  name: 'myDynamicFieldWithNoValues',
-                },
-              },
-            },
-          },
-        },
-        new MockSource(),
-        layer,
-        customIcons
-      );
-
-      const featuresMeta = await vectorStyle.pluckStyleMetaFromSourceDataRequest(sourceDataRequest);
-      expect(featuresMeta.geometryTypes.isPointsOnly).toBe(true);
-      expect(featuresMeta.geometryTypes.isLinesOnly).toBe(false);
-      expect(featuresMeta.geometryTypes.isPolygonsOnly).toBe(false);
-    });
-
-    it('Should extract scaled field range', async () => {
-      const vectorStyle = new VectorStyle(
-        {
-          properties: {
-            fillColor: {
-              type: STYLE_TYPE.DYNAMIC,
-              options: {
-                field: {
-                  origin: FIELD_ORIGIN.SOURCE,
-                  name: 'myDynamicField',
-                },
-              },
-            },
-          },
-        },
-        new MockSource(),
-        layer,
-        customIcons
-      );
-
-      const styleMeta = await vectorStyle.pluckStyleMetaFromSourceDataRequest(sourceDataRequest);
-      expect(styleMeta.fieldMeta.myDynamicField.range).toEqual({
-        delta: 9,
-        max: 10,
-        min: 1,
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
index 52209563e9807..395f8b6391cad 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
@@ -19,13 +19,10 @@ import {
 import {
   DEFAULT_ICON,
   FIELD_ORIGIN,
-  GEO_JSON_TYPE,
   ICON_SOURCE,
-  KBN_IS_CENTROID_FEATURE,
   LAYER_STYLE_TYPE,
   SOURCE_FORMATTERS_DATA_REQUEST_ID,
   STYLE_TYPE,
-  VECTOR_SHAPE_TYPE,
   VECTOR_STYLES,
 } from '../../../../common/constants';
 import { StyleMeta } from './style_meta';
@@ -33,7 +30,7 @@ import { StyleMeta } from './style_meta';
 import { getMakiSymbol, PREFERRED_ICONS } from './symbol_utils';
 import { VectorIcon } from './components/legend/vector_icon';
 import { VectorStyleLegend } from './components/legend/vector_style_legend';
-import { isOnlySingleFeatureType, getHasLabel } from './style_util';
+import { getHasLabel } from './style_util';
 import { StaticStyleProperty } from './properties/static_style_property';
 import { DynamicStyleProperty, IDynamicStyleProperty } from './properties/dynamic_style_property';
 import { DynamicSizeProperty } from './properties/dynamic_size_property';
@@ -69,14 +66,11 @@ import {
   SizeStaticOptions,
   SizeStylePropertyDescriptor,
   StyleDescriptor,
-  StyleMetaDescriptor,
   StylePropertyField,
   StylePropertyOptions,
-  TileMetaFeature,
   VectorStyleDescriptor,
   VectorStylePropertiesDescriptor,
 } from '../../../../common/descriptor_types';
-import { DataRequest } from '../../util/data_request';
 import { IStyle } from '../style';
 import { IStyleProperty } from './properties/style_property';
 import { IField } from '../../fields/field';
@@ -85,20 +79,29 @@ import { IVectorSource } from '../../sources/vector_source';
 import { createStyleFieldsHelper, StyleFieldsHelper } from './style_fields_helper';
 import { IESAggField } from '../../fields/agg';
 
-const POINTS = [GEO_JSON_TYPE.POINT, GEO_JSON_TYPE.MULTI_POINT];
-const LINES = [GEO_JSON_TYPE.LINE_STRING, GEO_JSON_TYPE.MULTI_LINE_STRING];
-const POLYGONS = [GEO_JSON_TYPE.POLYGON, GEO_JSON_TYPE.MULTI_POLYGON];
-
 export interface IVectorStyle extends IStyle {
   getAllStyleProperties(): Array<IStyleProperty<StylePropertyOptions>>;
   getDynamicPropertiesArray(): Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>;
   getSourceFieldNames(): string[];
   getStyleMeta(): StyleMeta;
+
+  /*
+   * Changes to source descriptor and join descriptor will impact style properties.
+   * For instance, a style property may be dynamically tied to the value of an ordinal field defined
+   * by a join or a metric aggregation. The metric aggregation or join may be edited or removed.
+   * When this happens, the style will be linked to a no-longer-existing field.
+   * This method provides a way for a style to clean itself and return a descriptor that unsets any dynamic
+   * properties that are tied to missing fields
+   *
+   * This method does not update its descriptor. It just returns a new descriptor that the caller
+   * can then use to update store state via dispatch.
+   */
   getDescriptorWithUpdatedStyleProps(
     nextFields: IField[],
-    previousFields: IField[],
-    mapColors: string[]
+    mapColors: string[],
+    previousFields?: IField[]
   ): Promise<{ hasChanges: boolean; nextStyleDescriptor?: VectorStyleDescriptor }>;
+
   getIsPointsOnly(): boolean;
   isTimeAware(): boolean;
   getPrimaryColor(): string;
@@ -319,7 +322,6 @@ export class VectorStyle implements IVectorStyle {
     });
 
     return this._deleteFieldsFromDescriptorAndUpdateStyling(
-      nextFields,
       updatedProperties,
       hasChanges,
       styleFieldsHelper,
@@ -328,13 +330,11 @@ export class VectorStyle implements IVectorStyle {
   }
 
   async _deleteFieldsFromDescriptorAndUpdateStyling(
-    nextFields: IField[],
     originalProperties: VectorStylePropertiesDescriptor,
     hasChanges: boolean,
     styleFieldsHelper: StyleFieldsHelper,
     mapColors: string[]
   ) {
-    // const originalProperties = this.getRawProperties();
     const updatedProperties = {} as VectorStylePropertiesDescriptor;
 
     const dynamicProperties = (Object.keys(originalProperties) as VECTOR_STYLES[]).filter((key) => {
@@ -343,9 +343,21 @@ export class VectorStyle implements IVectorStyle {
     });
 
     dynamicProperties.forEach((key: VECTOR_STYLES) => {
+      // TODO instead of looking up instance by key, update argument originalProperties to be instances instead of descriptors
+      const styleProperty = this.getAllStyleProperties().find((property) => {
+        return property.getStyleName() === key;
+      });
+      if (!styleProperty) {
+        return;
+      }
+      const nextStyleFields = styleFieldsHelper
+        .getFieldsForStyle(styleProperty, this._layer.getSource().isMvt())
+        .filter((styleField) => {
+          return !styleField.isUnsupported;
+        });
+
       // Convert dynamic styling to static stying when there are no style fields
-      const styleFields = styleFieldsHelper.getFieldsForStyle(key);
-      if (styleFields.length === 0) {
+      if (nextStyleFields.length === 0) {
         const staticProperties = getDefaultStaticProperties(mapColors);
         updatedProperties[key] = staticProperties[key] as any;
         return;
@@ -355,16 +367,16 @@ export class VectorStyle implements IVectorStyle {
       if (!dynamicProperty || !dynamicProperty.options) {
         return;
       }
-      const fieldName = (dynamicProperty.options as DynamicStylePropertyOptions).field!.name;
+      const fieldName = (dynamicProperty.options as DynamicStylePropertyOptions).field?.name;
       if (!fieldName) {
         return;
       }
 
-      const matchingOrdinalField = nextFields.find((ordinalField) => {
-        return fieldName === ordinalField.getName();
+      const fieldStillExists = nextStyleFields.some((nextStyleField) => {
+        return fieldName === nextStyleField.name;
       });
 
-      if (matchingOrdinalField) {
+      if (fieldStillExists) {
         return;
       }
 
@@ -404,25 +416,14 @@ export class VectorStyle implements IVectorStyle {
     }
   }
 
-  /*
-   * Changes to source descriptor and join descriptor will impact style properties.
-   * For instance, a style property may be dynamically tied to the value of an ordinal field defined
-   * by a join or a metric aggregation. The metric aggregation or join may be edited or removed.
-   * When this happens, the style will be linked to a no-longer-existing ordinal field.
-   * This method provides a way for a style to clean itself and return a descriptor that unsets any dynamic
-   * properties that are tied to missing oridinal fields
-   *
-   * This method does not update its descriptor. It just returns a new descriptor that the caller
-   * can then use to update store state via dispatch.
-   */
   async getDescriptorWithUpdatedStyleProps(
     nextFields: IField[],
-    previousFields: IField[],
-    mapColors: string[]
+    mapColors: string[],
+    previousFields?: IField[]
   ) {
     const styleFieldsHelper = await createStyleFieldsHelper(nextFields);
 
-    return previousFields.length === nextFields.length
+    return previousFields && previousFields.length === nextFields.length
       ? // Field-config changed
         await this._updateFieldsInDescriptor(
           nextFields,
@@ -432,7 +433,6 @@ export class VectorStyle implements IVectorStyle {
         )
       : // Deletions or additions
         await this._deleteFieldsFromDescriptorAndUpdateStyling(
-          nextFields,
           this.getRawProperties(),
           false,
           styleFieldsHelper,
@@ -509,128 +509,6 @@ export class VectorStyle implements IVectorStyle {
     );
   }
 
-  async pluckStyleMetaFromTileMeta(metaFeatures: TileMetaFeature[]): Promise<StyleMetaDescriptor> {
-    const supportedShapeTypes = await this._source.getSupportedShapeTypes();
-    const styleMeta: StyleMetaDescriptor = {
-      geometryTypes: {
-        isPointsOnly:
-          supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.POINT),
-        isLinesOnly:
-          supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.LINE),
-        isPolygonsOnly:
-          supportedShapeTypes.length === 1 &&
-          supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.POLYGON),
-      },
-      fieldMeta: {},
-    };
-
-    const dynamicProperties = this.getDynamicPropertiesArray();
-    if (dynamicProperties.length === 0 || !metaFeatures) {
-      // no additional meta data to pull from source data request.
-      return styleMeta;
-    }
-
-    dynamicProperties.forEach((dynamicProperty) => {
-      const name = dynamicProperty.getFieldName();
-      if (!styleMeta.fieldMeta[name]) {
-        styleMeta.fieldMeta[name] = { categories: [] };
-      }
-      const categories =
-        dynamicProperty.pluckCategoricalStyleMetaFromTileMetaFeatures(metaFeatures);
-      if (categories.length) {
-        styleMeta.fieldMeta[name].categories = categories;
-      }
-      const ordinalStyleMeta =
-        dynamicProperty.pluckOrdinalStyleMetaFromTileMetaFeatures(metaFeatures);
-      if (ordinalStyleMeta) {
-        styleMeta.fieldMeta[name].range = ordinalStyleMeta;
-      }
-    });
-
-    return styleMeta;
-  }
-
-  async pluckStyleMetaFromSourceDataRequest(
-    sourceDataRequest: DataRequest
-  ): Promise<StyleMetaDescriptor> {
-    const features = _.get(sourceDataRequest.getData(), 'features', []);
-    const supportedFeatures = await this._source.getSupportedShapeTypes();
-    const hasFeatureType = {
-      [VECTOR_SHAPE_TYPE.POINT]: false,
-      [VECTOR_SHAPE_TYPE.LINE]: false,
-      [VECTOR_SHAPE_TYPE.POLYGON]: false,
-    };
-    if (supportedFeatures.length > 1) {
-      for (let i = 0; i < features.length; i++) {
-        const feature = features[i];
-
-        // ignore centroid features as they are added for styling and not part of the real data set
-        if (feature.properties[KBN_IS_CENTROID_FEATURE]) {
-          continue;
-        }
-
-        if (!hasFeatureType[VECTOR_SHAPE_TYPE.POINT] && POINTS.includes(feature.geometry.type)) {
-          hasFeatureType[VECTOR_SHAPE_TYPE.POINT] = true;
-        }
-        if (!hasFeatureType[VECTOR_SHAPE_TYPE.LINE] && LINES.includes(feature.geometry.type)) {
-          hasFeatureType[VECTOR_SHAPE_TYPE.LINE] = true;
-        }
-        if (
-          !hasFeatureType[VECTOR_SHAPE_TYPE.POLYGON] &&
-          POLYGONS.includes(feature.geometry.type)
-        ) {
-          hasFeatureType[VECTOR_SHAPE_TYPE.POLYGON] = true;
-        }
-      }
-    }
-
-    const styleMeta = {
-      geometryTypes: {
-        isPointsOnly: isOnlySingleFeatureType(
-          VECTOR_SHAPE_TYPE.POINT,
-          supportedFeatures,
-          hasFeatureType
-        ),
-        isLinesOnly: isOnlySingleFeatureType(
-          VECTOR_SHAPE_TYPE.LINE,
-          supportedFeatures,
-          hasFeatureType
-        ),
-        isPolygonsOnly: isOnlySingleFeatureType(
-          VECTOR_SHAPE_TYPE.POLYGON,
-          supportedFeatures,
-          hasFeatureType
-        ),
-      },
-      fieldMeta: {},
-    } as StyleMetaDescriptor;
-
-    const dynamicProperties = this.getDynamicPropertiesArray();
-    if (dynamicProperties.length === 0 || features.length === 0) {
-      // no additional meta data to pull from source data request.
-      return styleMeta;
-    }
-
-    dynamicProperties.forEach(
-      (dynamicProperty: IDynamicStyleProperty<DynamicStylePropertyOptions>) => {
-        const name = dynamicProperty.getFieldName();
-        if (!styleMeta.fieldMeta[name]) {
-          styleMeta.fieldMeta[name] = { categories: [] };
-        }
-        const categories = dynamicProperty.pluckCategoricalStyleMetaFromFeatures(features);
-        if (categories.length) {
-          styleMeta.fieldMeta[name].categories = categories;
-        }
-        const ordinalStyleMeta = dynamicProperty.pluckOrdinalStyleMetaFromFeatures(features);
-        if (ordinalStyleMeta) {
-          styleMeta.fieldMeta[name].range = ordinalStyleMeta;
-        }
-      }
-    );
-
-    return styleMeta;
-  }
-
   getSourceFieldNames() {
     const fieldNames: string[] = [];
     this.getDynamicPropertiesArray().forEach((styleProperty) => {
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts
index 24c250c55d708..d7231d917180f 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts
@@ -6,11 +6,11 @@
  */
 
 import { ReactNode } from 'react';
+import { DataView } from '@kbn/data-plugin/common';
 import { ESTooltipProperty } from './es_tooltip_property';
 import { AGG_TYPE } from '../../../common/constants';
 import { ITooltipProperty } from './tooltip_property';
 import { IESAggField } from '../fields/agg';
-import { DataView } from '../../../../../../src/plugins/data/common';
 
 export class ESAggTooltipProperty extends ESTooltipProperty {
   private readonly _aggType: AGG_TYPE;
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts
index e2d93a6937675..385d4254d804d 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IndexPatternField, IndexPattern } from 'src/plugins/data/public';
+import type { IndexPatternField, IndexPattern } from '@kbn/data-plugin/public';
 import { ESTooltipProperty } from './es_tooltip_property';
 import { TooltipProperty } from './tooltip_property';
 import { AbstractField } from '../fields/field';
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx
index de6421895c654..2ede3c565d14a 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx
@@ -8,9 +8,9 @@
 import React, { ReactNode } from 'react';
 import _ from 'lodash';
 import { type Filter, buildExistsFilter, buildPhraseFilter } from '@kbn/es-query';
+import { DataView, DataViewField } from '@kbn/data-plugin/common';
 import { ITooltipProperty } from './tooltip_property';
 import { IField } from '../fields/field';
-import { DataView, DataViewField } from '../../../../../../src/plugins/data/common';
 
 export class ESTooltipProperty implements ITooltipProperty {
   private readonly _tooltipProperty: ITooltipProperty;
diff --git a/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts
index 0a4ca8af5dd79..3c103089eff84 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts
@@ -9,9 +9,9 @@ import _ from 'lodash';
 import { ReactNode } from 'react';
 import { GeoJsonProperties, Geometry } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
-import { RawValue } from '../../../../../plugins/maps/common/constants';
-import type { TooltipFeature } from '../../../../../plugins/maps/common/descriptor_types';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
+import { RawValue } from '../../../common/constants';
+import type { TooltipFeature } from '../../../common/descriptor_types';
 
 export interface ITooltipProperty {
   getPropertyKey(): string;
diff --git a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
index f391d3bfd3307..656ded611a115 100644
--- a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
+++ b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
@@ -5,7 +5,12 @@
  * 2.0.
  */
 
-import { parseTileKey, getTileBoundingBox, expandToTileBoundaries } from './geo_tile_utils';
+import {
+  getTileKey,
+  parseTileKey,
+  getTileBoundingBox,
+  expandToTileBoundaries,
+} from './geo_tile_utils';
 
 it('Should parse tile key', () => {
   expect(parseTileKey('15/23423/1867')).toEqual({
@@ -16,6 +21,10 @@ it('Should parse tile key', () => {
   });
 });
 
+it('Should get tile key', () => {
+  expect(getTileKey(45, 120, 10)).toEqual('10/853/368');
+});
+
 it('Should convert tile key to geojson Polygon', () => {
   const geometry = getTileBoundingBox('15/23423/1867');
   expect(geometry).toEqual({
diff --git a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
index 36c7d9d6c4a11..f3fe55b5e47c6 100644
--- a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
+++ b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
@@ -60,6 +60,14 @@ export function parseTileKey(tileKey: string): {
   return { x, y, zoom, tileCount };
 }
 
+export function getTileKey(lat: number, lon: number, zoom: number): string {
+  const tileCount = getTileCount(zoom);
+
+  const x = longitudeToTile(lon, tileCount);
+  const y = latitudeToTile(lat, tileCount);
+  return `${zoom}/${x}/${y}`;
+}
+
 function sinh(x: number): number {
   return (Math.exp(x) - Math.exp(-x)) / 2;
 }
diff --git a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
index ed6c01ac32dfa..2f25dc84fe224 100644
--- a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
+++ b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  GEO_JSON_TYPE,
-  FEATURE_VISIBLE_PROPERTY_NAME,
-  KBN_IS_CENTROID_FEATURE,
-} from '../../../common/constants';
+import type { FilterSpecification } from '@kbn/mapbox-gl';
+import { GEO_JSON_TYPE, KBN_IS_CENTROID_FEATURE } from '../../../common/constants';
 
 import { Timeslice } from '../../../common/descriptor_types';
 
@@ -18,17 +15,21 @@ export interface TimesliceMaskConfig {
   timeslice: Timeslice;
 }
 
-export const EXCLUDE_CENTROID_FEATURES = ['!=', ['get', KBN_IS_CENTROID_FEATURE], true];
+export const EXCLUDE_CENTROID_FEATURES = [
+  '!=',
+  ['get', KBN_IS_CENTROID_FEATURE],
+  true,
+] as FilterSpecification;
 
 function getFilterExpression(
-  filters: unknown[],
-  hasJoins: boolean,
+  filters: FilterSpecification[],
+  joinFilter?: FilterSpecification,
   timesliceMaskConfig?: TimesliceMaskConfig
-) {
-  const allFilters: unknown[] = [...filters];
+): FilterSpecification {
+  const allFilters: FilterSpecification[] = [...filters];
 
-  if (hasJoins) {
-    allFilters.push(['==', ['get', FEATURE_VISIBLE_PROPERTY_NAME], true]);
+  if (joinFilter) {
+    allFilters.push(joinFilter);
   }
 
   if (timesliceMaskConfig) {
@@ -49,9 +50,9 @@ function getFilterExpression(
 }
 
 export function getFillFilterExpression(
-  hasJoins: boolean,
+  joinFilter?: FilterSpecification,
   timesliceMaskConfig?: TimesliceMaskConfig
-): unknown[] {
+): FilterSpecification {
   return getFilterExpression(
     [
       // explicit EXCLUDE_CENTROID_FEATURES filter not needed. Centroids are points and are filtered out by geometry narrowing
@@ -61,15 +62,15 @@ export function getFillFilterExpression(
         ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POLYGON],
       ],
     ],
-    hasJoins,
+    joinFilter,
     timesliceMaskConfig
   );
 }
 
 export function getLineFilterExpression(
-  hasJoins: boolean,
+  joinFilter?: FilterSpecification,
   timesliceMaskConfig?: TimesliceMaskConfig
-): unknown[] {
+): FilterSpecification {
   return getFilterExpression(
     [
       // explicit EXCLUDE_CENTROID_FEATURES filter not needed. Centroids are points and are filtered out by geometry narrowing
@@ -81,7 +82,7 @@ export function getLineFilterExpression(
         ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_LINE_STRING],
       ],
     ],
-    hasJoins,
+    joinFilter,
     timesliceMaskConfig
   );
 }
@@ -93,22 +94,22 @@ const IS_POINT_FEATURE = [
 ];
 
 export function getPointFilterExpression(
-  hasJoins: boolean,
+  joinFilter?: FilterSpecification,
   timesliceMaskConfig?: TimesliceMaskConfig
-): unknown[] {
+): FilterSpecification {
   return getFilterExpression(
     [EXCLUDE_CENTROID_FEATURES, IS_POINT_FEATURE],
-    hasJoins,
+    joinFilter,
     timesliceMaskConfig
   );
 }
 
 export function getLabelFilterExpression(
-  hasJoins: boolean,
   isSourceGeoJson: boolean,
+  joinFilter?: FilterSpecification,
   timesliceMaskConfig?: TimesliceMaskConfig
-): unknown[] {
-  const filters: unknown[] = [];
+): FilterSpecification {
+  const filters: FilterSpecification[] = [];
 
   if (isSourceGeoJson) {
     // Centroid feature added to GeoJSON feature collection for LINE_STRING, MULTI_LINE_STRING, POLYGON, MULTI_POLYGON, and GEOMETRY_COLLECTION geometries
@@ -117,5 +118,5 @@ export function getLabelFilterExpression(
     filters.push(IS_POINT_FEATURE);
   }
 
-  return getFilterExpression(filters, hasJoins, timesliceMaskConfig);
+  return getFilterExpression(filters, joinFilter, timesliceMaskConfig);
 }
diff --git a/x-pack/plugins/maps/public/components/action_select.tsx b/x-pack/plugins/maps/public/components/action_select.tsx
index 156dbd934b2af..7c04686251ec5 100644
--- a/x-pack/plugins/maps/public/components/action_select.tsx
+++ b/x-pack/plugins/maps/public/components/action_select.tsx
@@ -8,7 +8,7 @@
 import React, { Component } from 'react';
 import { EuiFormRow, EuiSuperSelect, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { isUrlDrilldown } from '../trigger_actions/trigger_utils';
 
 interface Props {
diff --git a/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx b/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
index 8089a2e3e50c8..726ce99e33dfe 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
@@ -15,9 +15,9 @@ import {
   EuiTextAlign,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { ActionSelect } from '../action_select';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../src/plugins/unified_search/public';
 
 interface Props {
   className?: string;
diff --git a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
index 24c9082e7c4bb..a0ac0de9121a1 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
@@ -17,11 +17,11 @@ import {
   EuiFormErrorText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { ES_SPATIAL_RELATIONS } from '../../../../common/constants';
 import { getEsSpatialRelationLabel } from '../../../../common/i18n_getters';
 import { ActionSelect } from '../../action_select';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../src/plugins/unified_search/public';
-import { Action, ActionExecutionContext } from '../../../../../../../src/plugins/ui_actions/public';
 
 interface Props {
   buttonLabel: string;
diff --git a/x-pack/plugins/maps/public/components/geo_field_select.tsx b/x-pack/plugins/maps/public/components/geo_field_select.tsx
index 5ee81866784bc..a54f3b69f2eb5 100644
--- a/x-pack/plugins/maps/public/components/geo_field_select.tsx
+++ b/x-pack/plugins/maps/public/components/geo_field_select.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow } from '@elastic/eui';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 import { SingleFieldSelect } from './single_field_select';
 
 interface Props {
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
index 57f1eee3acf49..61a3ceb2d2f44 100644
--- a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
+++ b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
@@ -9,7 +9,7 @@ import React, { Component } from 'react';
 import { EuiCallOut, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import {
   getIndexPatternSelectComponent,
   getIndexPatternService,
diff --git a/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx b/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx
index a28e4e8df6c3b..65cea345d3d29 100644
--- a/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx
+++ b/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiComboBoxOptionOption, EuiFieldText, EuiFormRow } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 import { MetricSelect } from './metric_select';
 import { SingleFieldSelect } from '../single_field_select';
 import { AggDescriptor } from '../../../common/descriptor_types';
diff --git a/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx b/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx
index bcc77eb972183..2ecc61f9c3e82 100644
--- a/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx
+++ b/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx
@@ -8,7 +8,7 @@
 import React, { Component, Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButtonEmpty, EuiComboBoxOptionOption, EuiSpacer, EuiTextAlign } from '@elastic/eui';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 import { MetricEditor } from './metric_editor';
 import { DEFAULT_METRIC } from '../../classes/sources/es_agg_source';
 import { AggDescriptor, FieldedAggDescriptor } from '../../../common/descriptor_types';
diff --git a/x-pack/plugins/maps/public/components/single_field_select.tsx b/x-pack/plugins/maps/public/components/single_field_select.tsx
index 8585ed46d3044..835fc99d931f3 100644
--- a/x-pack/plugins/maps/public/components/single_field_select.tsx
+++ b/x-pack/plugins/maps/public/components/single_field_select.tsx
@@ -18,7 +18,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import { FieldIcon } from '@kbn/react-field';
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 
 function fieldsToOptions(
   fields?: IndexPatternField[],
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
index 03e8b4a90c0ca..224bc52f7ffaa 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
@@ -96,6 +96,7 @@ exports[`EditLayerPanel is rendered 1`] = `
           layer={
             Object {
               "canShowTooltip": [Function],
+              "getDescriptor": [Function],
               "getDisplayName": [Function],
               "getId": [Function],
               "getImmutableSourceProperties": [Function],
@@ -119,6 +120,7 @@ exports[`EditLayerPanel is rendered 1`] = `
             layer={
               Object {
                 "canShowTooltip": [Function],
+                "getDescriptor": [Function],
                 "getDisplayName": [Function],
                 "getId": [Function],
                 "getImmutableSourceProperties": [Function],
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
index ebe0cc6a4178d..c073eb8ec4675 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
@@ -89,13 +89,15 @@ const mockLayer = {
   supportsFitToBounds: () => {
     return true;
   },
+  getDescriptor: () => {
+    return {};
+  },
 } as unknown as ILayer;
 
 const defaultProps = {
   selectedLayer: mockLayer,
   fitToBounds: () => {},
   updateSourceProps: async () => {},
-  clearJoins: () => {},
 };
 
 describe('EditLayerPanel', () => {
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
index 7ba2f74ddc7d9..a0f8539190a1a 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
@@ -22,14 +22,14 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { FilterEditor } from './filter_editor';
 import { JoinEditor, JoinField } from './join_editor';
 import { FlyoutFooter } from './flyout_footer';
 import { LayerSettings } from './layer_settings';
 import { StyleSettings } from './style_settings';
-
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { VectorLayerDescriptor } from '../../../common/descriptor_types';
 import { getData, getCore } from '../../kibana_services';
 import { ILayer } from '../../classes/layers/layer';
 import { isVectorLayer, IVectorLayer } from '../../classes/layers/vector_layer';
@@ -39,7 +39,6 @@ import { IField } from '../../classes/fields/field';
 const localStorage = new Storage(window.localStorage);
 
 export interface Props {
-  clearJoins: (layer: ILayer) => void;
   selectedLayer?: ILayer;
   updateSourceProps: (layerId: string, sourcePropChanges: OnSourceChangeArgs[]) => Promise<void>;
 }
@@ -139,12 +138,6 @@ export class EditLayerPanel extends Component<Props, State> {
     return this.props.updateSourceProps(this.props.selectedLayer!.getId(), args);
   };
 
-  _clearJoins = () => {
-    if (this.props.selectedLayer) {
-      this.props.clearJoins(this.props.selectedLayer);
-    }
-  };
-
   _renderLayerErrors() {
     if (!this.props.selectedLayer || !this.props.selectedLayer.hasErrors()) {
       return null;
@@ -230,6 +223,9 @@ export class EditLayerPanel extends Component<Props, State> {
       return null;
     }
 
+    const descriptor = this.props.selectedLayer.getDescriptor() as VectorLayerDescriptor;
+    const numberOfJoins = descriptor.joins ? descriptor.joins.length : 0;
+
     return (
       <KibanaContextProvider
         services={{
@@ -277,11 +273,8 @@ export class EditLayerPanel extends Component<Props, State> {
               />
 
               {this.props.selectedLayer.renderSourceSettingsEditor({
-                clearJoins: this._clearJoins,
                 currentLayerType: this.props.selectedLayer.getType(),
-                hasJoins: isVectorLayer(this.props.selectedLayer)
-                  ? (this.props.selectedLayer as IVectorLayer).hasJoins()
-                  : false,
+                numberOfJoins,
                 onChange: this._onSourceChange,
               })}
 
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
index 79e3ce4467227..afb18aa582a3c 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
@@ -23,7 +23,7 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { DataView, Query } from 'src/plugins/data/common';
+import type { DataView, Query } from '@kbn/data-plugin/common';
 import { APP_ID } from '../../../../common/constants';
 import { getIndexPatternService, getData, getSearchBar } from '../../../kibana_services';
 import { GlobalFilterCheckbox } from '../../../components/global_filter_checkbox';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts
index 2277cba3e4744..7c3db15f10236 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts
@@ -8,7 +8,7 @@
 import { AnyAction } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
 import { connect } from 'react-redux';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import { FilterEditor } from './filter_editor';
 import { getSelectedLayer } from '../../../selectors/map_selectors';
 import { setLayerQuery, updateSourceProp } from '../../../actions';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts
index 5f9a920d38494..5773d93221508 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts
@@ -10,9 +10,8 @@ import { ThunkDispatch } from 'redux-thunk';
 import { connect } from 'react-redux';
 import { EditLayerPanel } from './edit_layer_panel';
 import { getSelectedLayer } from '../../selectors/map_selectors';
-import { setJoinsForLayer, updateSourceProps } from '../../actions';
+import { updateSourceProps } from '../../actions';
 import { MapStoreState } from '../../reducers/store';
-import { ILayer } from '../../classes/layers/layer';
 import { isVectorLayer, IVectorLayer } from '../../classes/layers/vector_layer';
 import { OnSourceChangeArgs } from '../../classes/sources/source';
 
@@ -32,9 +31,6 @@ function mapStateToProps(state: MapStoreState) {
 
 function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) {
   return {
-    clearJoins: (layer: ILayer) => {
-      dispatch(setJoinsForLayer(layer, []));
-    },
     updateSourceProps: async (id: string, sourcePropChanges: OnSourceChangeArgs[]) =>
       await dispatch(updateSourceProps(id, sourcePropChanges)),
   };
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/add_join_button.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/add_join_button.test.tsx.snap
new file mode 100644
index 0000000000000..6da0a04523c16
--- /dev/null
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/add_join_button.test.tsx.snap
@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Should disable add button when layer source is MVT and there is one join 1`] = `
+<EuiToolTip
+  content="Vector tiles support one term join. To add multiple joins, select 'Limit results' in 'Scaling'."
+  delay="regular"
+  display="inlineBlock"
+  position="top"
+>
+  <EuiButtonEmpty
+    aria-label="Add join"
+    iconType="plusInCircleFilled"
+    isDisabled={true}
+    onClick={[Function]}
+    size="xs"
+  >
+    Add join
+  </EuiButtonEmpty>
+</EuiToolTip>
+`;
+
+exports[`Should enable add button when layer source is MVT and there is no join 1`] = `
+<EuiButtonEmpty
+  aria-label="Add join"
+  iconType="plusInCircleFilled"
+  isDisabled={false}
+  onClick={[Function]}
+  size="xs"
+>
+  Add join
+</EuiButtonEmpty>
+`;
+
+exports[`Should render add join button 1`] = `
+<EuiButtonEmpty
+  aria-label="Add join"
+  iconType="plusInCircleFilled"
+  isDisabled={false}
+  onClick={[Function]}
+  size="xs"
+>
+  Add join
+</EuiButtonEmpty>
+`;
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/join_editor.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/join_editor.test.tsx.snap
index 0a79b21175d1e..7daacae707ecb 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/join_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/__snapshots__/join_editor.test.tsx.snap
@@ -85,18 +85,11 @@ exports[`Should render join editor 1`] = `
   <EuiTextAlign
     textAlign="center"
   >
-    <EuiButtonEmpty
-      aria-label="Add join"
-      iconType="plusInCircleFilled"
-      onClick={[Function]}
-      size="xs"
-    >
-      <FormattedMessage
-        defaultMessage="Add join"
-        id="xpack.maps.layerPanel.joinEditor.addJoinButtonLabel"
-        values={Object {}}
-      />
-    </EuiButtonEmpty>
+    <AddJoinButton
+      addJoin={[Function]}
+      isLayerSourceMvt={false}
+      numJoins={1}
+    />
   </EuiTextAlign>
 </div>
 `;
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/add_join_button.test.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/add_join_button.test.tsx
new file mode 100644
index 0000000000000..2a017b8dd183f
--- /dev/null
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/add_join_button.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { AddJoinButton } from './add_join_button';
+
+test('Should render add join button', () => {
+  const component = shallow(
+    <AddJoinButton addJoin={() => {}} isLayerSourceMvt={false} numJoins={0} />
+  );
+  expect(component).toMatchSnapshot();
+});
+
+test('Should enable add button when layer source is MVT and there is no join', () => {
+  const component = shallow(
+    <AddJoinButton addJoin={() => {}} isLayerSourceMvt={true} numJoins={0} />
+  );
+  expect(component).toMatchSnapshot();
+});
+
+test('Should disable add button when layer source is MVT and there is one join', () => {
+  const component = shallow(
+    <AddJoinButton addJoin={() => {}} isLayerSourceMvt={true} numJoins={1} />
+  );
+  expect(component).toMatchSnapshot();
+});
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/add_join_button.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/add_join_button.tsx
new file mode 100644
index 0000000000000..2aee26fbbaeac
--- /dev/null
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/add_join_button.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+
+const BUTTON_LABEL = i18n.translate('xpack.maps.layerPanel.joinEditor.addJoinButton.label', {
+  defaultMessage: 'Add join',
+});
+
+export interface Props {
+  addJoin: () => void;
+  isLayerSourceMvt: boolean;
+  numJoins: number;
+}
+
+export function AddJoinButton({ addJoin, isLayerSourceMvt, numJoins }: Props) {
+  const isDisabled = isLayerSourceMvt && numJoins >= 1;
+  const button = (
+    <EuiButtonEmpty
+      onClick={addJoin}
+      size="xs"
+      iconType="plusInCircleFilled"
+      aria-label={BUTTON_LABEL}
+      isDisabled={isDisabled}
+    >
+      {BUTTON_LABEL}
+    </EuiButtonEmpty>
+  );
+
+  return isDisabled ? (
+    <EuiToolTip
+      content={i18n.translate('xpack.maps.layerPanel.joinEditor.addJoinButton.mvtSingleJoinMsg', {
+        defaultMessage: `Vector tiles support one term join. To add multiple joins, select 'Limit results' in 'Scaling'.`,
+      })}
+    >
+      {button}
+    </EuiToolTip>
+  ) : (
+    button
+  );
+}
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.test.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.test.tsx
index 6da05ef0b4092..cb007110f7d35 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.test.tsx
@@ -21,6 +21,14 @@ class MockLayer {
   getJoinsDisabledReason() {
     return this._disableReason;
   }
+
+  getSource() {
+    return {
+      isMvt: () => {
+        return false;
+      },
+    };
+  }
 }
 
 const defaultProps = {
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx
index 3483b0011b127..cfa46ecf32b32 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx
@@ -8,14 +8,7 @@
 import React, { Fragment } from 'react';
 import uuid from 'uuid/v4';
 
-import {
-  EuiButtonEmpty,
-  EuiTitle,
-  EuiSpacer,
-  EuiToolTip,
-  EuiTextAlign,
-  EuiCallOut,
-} from '@elastic/eui';
+import { EuiTitle, EuiSpacer, EuiToolTip, EuiTextAlign, EuiCallOut } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
@@ -23,6 +16,7 @@ import { Join } from './resources/join';
 import { IVectorLayer } from '../../../classes/layers/vector_layer';
 import { JoinDescriptor } from '../../../../common/descriptor_types';
 import { SOURCE_TYPES } from '../../../../common/constants';
+import { AddJoinButton } from './add_join_button';
 
 export interface JoinField {
   label: string;
@@ -83,7 +77,7 @@ export function JoinEditor({ joins, layer, onChange, leftJoinFields, layerDispla
     ]);
   };
 
-  const renderContent = () => {
+  function renderContent() {
     const disabledReason = layer.getJoinsDisabledReason();
     return disabledReason ? (
       <EuiCallOut color="warning">{disabledReason}</EuiCallOut>
@@ -92,23 +86,15 @@ export function JoinEditor({ joins, layer, onChange, leftJoinFields, layerDispla
         {renderJoins()}
         <EuiSpacer size="s" />
         <EuiTextAlign textAlign="center">
-          <EuiButtonEmpty
-            onClick={addJoin}
-            size="xs"
-            iconType="plusInCircleFilled"
-            aria-label={i18n.translate('xpack.maps.layerPanel.joinEditor.addJoinAriaLabel', {
-              defaultMessage: 'Add join',
-            })}
-          >
-            <FormattedMessage
-              id="xpack.maps.layerPanel.joinEditor.addJoinButtonLabel"
-              defaultMessage="Add join"
-            />
-          </EuiButtonEmpty>
+          <AddJoinButton
+            addJoin={addJoin}
+            isLayerSourceMvt={layer.getSource().isMvt()}
+            numJoins={joins.length}
+          />
         </EuiTextAlign>
       </Fragment>
     );
-  };
+  }
 
   return (
     <div>
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx
index bb6df355e3ee7..bbfc9bbb0f302 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx
@@ -9,7 +9,8 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { DataViewField, DataView, Query } from 'src/plugins/data/common';
+import type { DataViewField, DataView, Query } from '@kbn/data-plugin/common';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { JoinExpression } from './join_expression';
 import { MetricsExpression } from './metrics_expression';
 import { WhereExpression } from './where_expression';
@@ -22,8 +23,6 @@ import {
 } from '../../../../../common/descriptor_types';
 import { ILayer } from '../../../../classes/layers/layer';
 
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
-
 import { getIndexPatternService } from '../../../../kibana_services';
 import { getDataViewNotFoundMessage } from '../../../../../common/i18n_getters';
 import { AGG_TYPE, SOURCE_TYPES } from '../../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx
index 169dceaccc471..8a0cc5de6f373 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { getDataViewSelectPlaceholder } from '../../../../../common/i18n_getters';
 import { DEFAULT_MAX_BUCKETS_LIMIT } from '../../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx
index 1eaa9a5691fb3..01475054da145 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx
@@ -15,7 +15,7 @@ import {
   EuiFormHelpText,
 } from '@elastic/eui';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { MetricsEditor } from '../../../../components/metrics_editor';
 import { AGG_TYPE } from '../../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
index 79effb98f2c96..8ee0728aa8220 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
@@ -9,7 +9,7 @@ import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiPopover, EuiExpression, EuiFormHelpText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView, Query } from 'src/plugins/data/common';
+import { DataView, Query } from '@kbn/data-plugin/common';
 import { APP_ID } from '../../../../../common/constants';
 import { getData, getSearchBar } from '../../../../kibana_services';
 
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
index 818f4e3dc7f4d..e975834f2cf50 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
@@ -18,10 +18,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { Attribution } from '../../../../common/descriptor_types';
 import { MAX_ZOOM } from '../../../../common/constants';
 import { AlphaSlider } from '../../../components/alpha_slider';
-import { ValidatedDualRange } from '../../../../../../../src/plugins/kibana_react/public';
 import { ILayer } from '../../../classes/layers/layer';
 import { AttributionFormRow } from './attribution_form_row';
 
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index 6a4162f65a7fb..9d3e875ad0084 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -12,10 +12,10 @@ import { EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { Observable } from 'rxjs';
 import moment from 'moment';
-import { ExitFullScreenButton } from '@kbn/shared-ux-components';
+import { ExitFullScreenButton } from '@kbn/shared-ux-button-exit-full-screen';
 import { MBMap } from '../mb_map';
 import { RightSideControls } from '../right_side_controls';
 import { Timeslider } from '../timeslider';
diff --git a/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx b/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx
index e0a9e9258237c..38d5231ac7b2c 100644
--- a/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx
@@ -21,8 +21,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ValidatedDualRange, Value } from '@kbn/kibana-react-plugin/public';
 import { MapSettings } from '../../reducers/map';
-import { ValidatedDualRange, Value } from '../../../../../../src/plugins/kibana_react/public';
 import { INITIAL_LOCATION, MAX_ZOOM, MIN_ZOOM } from '../../../common/constants';
 import { MapCenter } from '../../../common/descriptor_types';
 // @ts-ignore
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
index b6ffacc491030..df70d4b7cfd9b 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
@@ -6,14 +6,13 @@
  */
 
 import React, { Component } from 'react';
-import { Map as MbMap, Point as MbPoint } from '@kbn/mapbox-gl';
 // @ts-expect-error
 import MapboxDraw from '@mapbox/mapbox-gl-draw';
 import { Feature, Geometry, Position } from 'geojson';
 import { i18n } from '@kbn/i18n';
 // @ts-expect-error
 import * as jsts from 'jsts';
-import { MapMouseEvent } from '@kbn/mapbox-gl';
+import type { Map as MbMap, MapMouseEvent, PointLike } from '@kbn/mapbox-gl';
 import { getToasts } from '../../../../kibana_services';
 import { DrawControl } from '../draw_control';
 import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common/constants';
@@ -84,7 +83,7 @@ export class DrawFeatureControl extends Component<Props, {}> {
   };
 
   _onClick = async (event: MapMouseEvent, drawControl?: MapboxDraw) => {
-    const mbLngLatPoint: MbPoint = event.point;
+    const mbLngLatPoint: PointLike = event.point;
     // Currently feature deletion is the only onClick handling
     if (!this.props.editLayer || this.props.drawShape !== DRAW_SHAPE.DELETE) {
       return;
@@ -103,7 +102,7 @@ export class DrawFeatureControl extends Component<Props, {}> {
         x: mbLngLatPoint.x + PADDING,
         y: mbLngLatPoint.y + PADDING,
       },
-    ] as [MbPoint, MbPoint];
+    ] as [PointLike, PointLike];
     const selectedFeatures = this.props.mbMap.queryRenderedFeatures(mbBbox, {
       layers: mbEditLayerIds,
       filter: ['all', EXCLUDE_CENTROID_FEATURES],
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/index.ts
index df03f755d6d2b..3c9244a74914d 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/index.ts
@@ -16,6 +16,7 @@ import {
   mapExtentChanged,
   mapReady,
   setAreTilesLoaded,
+  setLayerDataLoadErrorStatus,
   setMapInitError,
   setMouseCoordinates,
   updateMetaFromTiles,
@@ -86,6 +87,12 @@ function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyActi
     updateMetaFromTiles(layerId: string, features: TileMetaFeature[]) {
       dispatch(updateMetaFromTiles(layerId, features));
     },
+    clearTileLoadError(layerId: string) {
+      dispatch(setLayerDataLoadErrorStatus(layerId, null));
+    },
+    setTileLoadError(layerId: string, errorMessage: string) {
+      dispatch(setLayerDataLoadErrorStatus(layerId, errorMessage));
+    },
   };
 }
 
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
index 64a66f5eee29c..7dda17442e5e1 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
@@ -7,12 +7,12 @@
 
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { Filter } from '@kbn/es-query';
-import { Action, ActionExecutionContext } from 'src/plugins/ui_actions/public';
-
-import { mapboxgl } from '@kbn/mapbox-gl';
-import type { Map as MapboxMap, MapboxOptions, MapMouseEvent } from '@kbn/mapbox-gl';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { maplibregl } from '@kbn/mapbox-gl';
+import type { Map as MapboxMap, MapOptions, MapMouseEvent } from '@kbn/mapbox-gl';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 import { DrawFilterControl } from './draw_control/draw_filter_control';
 import { ScaleControl } from './scale_control';
 import { TooltipControl } from './tooltip_control';
@@ -40,7 +40,6 @@ import { getGlyphUrl } from '../../util';
 import { syncLayerOrder } from './sort_layers';
 
 import { getTileMetaFeatures, removeOrphanedSourcesAndLayers } from './utils';
-import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
 import { RenderToolTipContent } from '../../classes/tooltips/tooltip_property';
 import { TileStatusTracker } from './tile_status_tracker';
 import { DrawFeatureControl } from './draw_control/draw_feature_control';
@@ -76,6 +75,8 @@ export interface Props {
   updateMetaFromTiles: (layerId: string, features: TileMetaFeature[]) => void;
   featureModeActive: boolean;
   filterModeActive: boolean;
+  setTileLoadError(layerId: string, errorMessage: string): void;
+  clearTileLoadError(layerId: string): void;
 }
 
 interface State {
@@ -90,7 +91,7 @@ export class MbMap extends Component<Props, State> {
   private _prevDisableInteractive?: boolean;
   private _prevLayerList?: ILayer[];
   private _prevTimeslice?: Timeslice;
-  private _navigationControl = new mapboxgl.NavigationControl({ showCompass: false });
+  private _navigationControl = new maplibregl.NavigationControl({ showCompass: false });
   private _tileStatusTracker?: TileStatusTracker;
 
   state: State = {
@@ -174,13 +175,13 @@ export class MbMap extends Component<Props, State> {
   async _createMbMapInstance(initialView: MapCenterAndZoom | null): Promise<MapboxMap> {
     return new Promise((resolve) => {
       const mbStyle = {
-        version: 8,
+        version: 8 as 8,
         sources: {},
         layers: [],
         glyphs: getGlyphUrl(),
       };
 
-      const options: MapboxOptions = {
+      const options: MapOptions = {
         attributionControl: false,
         container: this._containerRef!,
         style: mbStyle,
@@ -198,15 +199,22 @@ export class MbMap extends Component<Props, State> {
       } else {
         options.bounds = [-170, -60, 170, 75];
       }
-      const mbMap = new mapboxgl.Map(options);
+      const mbMap = new maplibregl.Map(options);
       mbMap.dragRotate.disable();
       mbMap.touchZoomRotate.disableRotation();
 
       this._tileStatusTracker = new TileStatusTracker({
         mbMap,
         getCurrentLayerList: () => this.props.layerList,
-        updateTileStatus: (layer: ILayer, areTilesLoaded: boolean) => {
+        updateTileStatus: (layer: ILayer, areTilesLoaded: boolean, errorMessage?: string) => {
           this.props.setAreTilesLoaded(layer.getId(), areTilesLoaded);
+
+          if (errorMessage) {
+            this.props.setTileLoadError(layer.getId(), errorMessage);
+          } else {
+            this.props.clearTileLoadError(layer.getId());
+          }
+
           this._queryForMeta(layer);
         },
       });
@@ -320,12 +328,12 @@ export class MbMap extends Component<Props, State> {
 
     if (goto.bounds) {
       // clamping ot -89/89 latitudes since Mapboxgl does not seem to handle bounds that contain the poles (logs errors to the console when using -90/90)
-      const lnLatBounds = new mapboxgl.LngLatBounds(
-        new mapboxgl.LngLat(
+      const lnLatBounds = new maplibregl.LngLatBounds(
+        new maplibregl.LngLat(
           clampToLonBounds(goto.bounds.minLon),
           clampToLatBounds(goto.bounds.minLat)
         ),
-        new mapboxgl.LngLat(
+        new maplibregl.LngLat(
           clampToLonBounds(goto.bounds.maxLon),
           clampToLatBounds(goto.bounds.maxLat)
         )
@@ -409,7 +417,6 @@ export class MbMap extends Component<Props, State> {
       for (const { symbolId, svg, cutoff, radius } of this.props.customIcons) {
         createSdfIcon({ svg, renderSize: CUSTOM_ICON_SIZE, cutoff, radius }).then(
           (imageData: ImageData) => {
-            // @ts-expect-error MapboxMap type is missing updateImage method
             if (mbMap.hasImage(symbolId)) mbMap.updateImage(symbolId, imageData);
             else
               mbMap.addImage(symbolId, imageData, {
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts
index 74a57bd76ab8f..77ce71472df95 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts
@@ -8,7 +8,7 @@
 /* eslint-disable max-classes-per-file */
 
 import _ from 'lodash';
-import type { Map as MbMap, AnyLayer as MbLayer, Style as MbStyle } from '@kbn/mapbox-gl';
+import type { Map as MbMap, LayerSpecification, StyleSpecification } from '@kbn/mapbox-gl';
 import { getIsTextLayer, syncLayerOrder } from './sort_layers';
 import { SPATIAL_FILTERS_LAYER_ID } from '../../../common/constants';
 import { ILayer } from '../../classes/layers/layer';
@@ -16,9 +16,9 @@ import { ILayer } from '../../classes/layers/layer';
 let moveCounter = 0;
 
 class MockMbMap {
-  private _style: MbStyle;
+  private _style: StyleSpecification;
 
-  constructor(style: MbStyle) {
+  constructor(style: StyleSpecification) {
     this._style = _.cloneDeep(style);
   }
 
@@ -88,24 +88,24 @@ test('getIsTextLayer', () => {
     id: `mylayer_text`,
     type: 'symbol',
     paint: { 'text-color': 'red' },
-  } as MbLayer;
+  } as LayerSpecification;
   expect(getIsTextLayer(paintLabelMbLayer)).toBe(true);
 
   const layoutLabelMbLayer = {
     id: `mylayer_text`,
     type: 'symbol',
     layout: { 'text-size': 'red' },
-  } as MbLayer;
+  } as unknown as LayerSpecification;
   expect(getIsTextLayer(layoutLabelMbLayer)).toBe(true);
 
   const iconMbLayer = {
     id: `mylayer_text`,
     type: 'symbol',
     paint: { 'icon-color': 'house' },
-  } as MbLayer;
+  } as LayerSpecification;
   expect(getIsTextLayer(iconMbLayer)).toBe(false);
 
-  const circleMbLayer = { id: `mylayer_text`, type: 'circle' } as MbLayer;
+  const circleMbLayer = { id: `mylayer_text`, type: 'circle' } as LayerSpecification;
   expect(getIsTextLayer(circleMbLayer)).toBe(false);
 });
 
@@ -128,22 +128,23 @@ describe('sortLayer', () => {
   // Initial order that styles are added to mapbox is non-deterministic and depends on the order of data fetches.
   test('Should sort initial layer load order to expected order', () => {
     const initialMbStyle = {
-      version: 0,
+      version: 8 as 8,
       layers: [
-        { id: `${BRAVO_LAYER_ID}_text`, type: 'symbol' } as MbLayer,
-        { id: `${BRAVO_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
-        { id: `${SPATIAL_FILTERS_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${SPATIAL_FILTERS_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
-        { id: `gl-draw-polygon-fill-active.cold`, type: 'fill' } as MbLayer,
+        { id: `${BRAVO_LAYER_ID}_text`, type: 'symbol' } as LayerSpecification,
+        { id: `${BRAVO_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
+        { id: `${SPATIAL_FILTERS_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${SPATIAL_FILTERS_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
+        { id: `gl-draw-polygon-fill-active.cold`, type: 'fill' } as LayerSpecification,
         {
           id: `${CHARLIE_LAYER_ID}_text`,
           type: 'symbol',
           paint: { 'text-color': 'red' },
-        } as MbLayer,
-        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_text`, type: 'symbol' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+        } as LayerSpecification,
+        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_text`, type: 'symbol' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
       ],
+      sources: {},
     };
     const mbMap = new MockMbMap(initialMbStyle);
     syncLayerOrder(mbMap as unknown as MbMap, spatialFilterLayer, mapLayers);
@@ -167,21 +168,22 @@ describe('sortLayer', () => {
   // Test case testing when layer is moved in Table of Contents
   test('Should sort single layer single move to expected order', () => {
     const initialMbStyle = {
-      version: 0,
+      version: 8 as 8,
       layers: [
-        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_text`, type: 'symbol' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
-        { id: `${BRAVO_LAYER_ID}_text`, type: 'symbol' } as MbLayer,
-        { id: `${BRAVO_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_text`, type: 'symbol' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
+        { id: `${BRAVO_LAYER_ID}_text`, type: 'symbol' } as LayerSpecification,
+        { id: `${BRAVO_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
         {
           id: `${CHARLIE_LAYER_ID}_text`,
           type: 'symbol',
           paint: { 'text-color': 'red' },
-        } as MbLayer,
-        { id: `${SPATIAL_FILTERS_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${SPATIAL_FILTERS_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+        } as LayerSpecification,
+        { id: `${SPATIAL_FILTERS_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${SPATIAL_FILTERS_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
       ],
+      sources: {},
     };
     const mbMap = new MockMbMap(initialMbStyle);
     syncLayerOrder(mbMap as unknown as MbMap, spatialFilterLayer, mapLayers);
@@ -205,11 +207,12 @@ describe('sortLayer', () => {
   test('Should sort with missing mblayers to expected order', () => {
     // Notice there are no bravo mbLayers in initial style.
     const initialMbStyle = {
-      version: 0,
+      version: 8 as 8,
       layers: [
-        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
       ],
+      sources: {},
     };
     const mbMap = new MockMbMap(initialMbStyle);
     syncLayerOrder(mbMap as unknown as MbMap, spatialFilterLayer, mapLayers);
@@ -222,21 +225,22 @@ describe('sortLayer', () => {
 
   test('Should not call move layers when layers are in expected order', () => {
     const initialMbStyle = {
-      version: 0,
+      version: 8 as 8,
       layers: [
-        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${BRAVO_LAYER_ID}_text`, type: 'symbol' } as MbLayer,
-        { id: `${BRAVO_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_text`, type: 'symbol' } as MbLayer,
-        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${BRAVO_LAYER_ID}_text`, type: 'symbol' } as LayerSpecification,
+        { id: `${BRAVO_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_text`, type: 'symbol' } as LayerSpecification,
+        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
         {
           id: `${CHARLIE_LAYER_ID}_text`,
           type: 'symbol',
           paint: { 'text-color': 'red' },
-        } as MbLayer,
-        { id: `${SPATIAL_FILTERS_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
-        { id: `${SPATIAL_FILTERS_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+        } as LayerSpecification,
+        { id: `${SPATIAL_FILTERS_LAYER_ID}_fill`, type: 'fill' } as LayerSpecification,
+        { id: `${SPATIAL_FILTERS_LAYER_ID}_circle`, type: 'circle' } as LayerSpecification,
       ],
+      sources: {},
     };
     const mbMap = new MockMbMap(initialMbStyle);
     syncLayerOrder(mbMap as unknown as MbMap, spatialFilterLayer, mapLayers);
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts
index ef248380af36a..b7f27755ad9cf 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { Map as MbMap, Layer as MbLayer } from '@kbn/mapbox-gl';
+import type { Map as MbMap, LayerSpecification } from '@kbn/mapbox-gl';
 import { ILayer } from '../../classes/layers/layer';
 
 // "Layer" is overloaded and can mean the following
 // 1) Map layer (ILayer): A single map layer consists of one to many mapbox layers.
-// 2) Mapbox layer (MbLayer): Individual unit of rendering such as text, circles, polygons, or lines.
+// 2) Mapbox layer (LayerSpecification): Individual unit of rendering such as text, circles, polygons, or lines.
 
-export function getIsTextLayer(mbLayer: MbLayer) {
+export function getIsTextLayer(mbLayer: LayerSpecification) {
   if (mbLayer.type !== 'symbol') {
     return false;
   }
@@ -35,7 +35,7 @@ export function isGlDrawLayer(mbLayerId: string) {
 
 function doesMbLayerBelongToMapLayerAndClass(
   mapLayer: ILayer,
-  mbLayer: MbLayer,
+  mbLayer: LayerSpecification,
   layerClass: LAYER_CLASS
 ) {
   if (!mapLayer.ownsMbLayerId(mbLayer.id)) {
@@ -58,7 +58,7 @@ enum LAYER_CLASS {
 
 function moveMapLayer(
   mbMap: MbMap,
-  mbLayers: MbLayer[],
+  mbLayers: LayerSpecification[],
   mapLayer: ILayer,
   layerClass: LAYER_CLASS,
   beneathMbLayerId?: string
@@ -72,7 +72,11 @@ function moveMapLayer(
     });
 }
 
-function getBottomMbLayerId(mbLayers: MbLayer[], mapLayer: ILayer, layerClass: LAYER_CLASS) {
+function getBottomMbLayerId(
+  mbLayers: LayerSpecification[],
+  mapLayer: ILayer,
+  layerClass: LAYER_CLASS
+) {
   const bottomMbLayer = mbLayers.find((mbLayer) => {
     return doesMbLayerBelongToMapLayerAndClass(mapLayer, mbLayer, layerClass);
   });
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts
index 76052f4590aba..ffc6459262c8b 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts
@@ -61,6 +61,11 @@ function createMockMbDataEvent(mbSourceId: string, tileKey: string): unknown {
     dataType: 'source',
     tile: {
       tileID: {
+        canonical: {
+          x: 80,
+          y: 10,
+          z: 5,
+        },
         key: tileKey,
       },
     },
@@ -133,7 +138,7 @@ describe('TileStatusTracker', () => {
       },
     });
 
-    expect(mockMbMap.listeners.length).toBe(3);
+    expect(mockMbMap.listeners.length).toBe(4);
     tileStatusTracker.destroy();
     expect(mockMbMap.listeners.length).toBe(0);
   });
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts
index 72d692a147ff2..94a4344bac009 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts
@@ -7,14 +7,21 @@
 
 import type { Map as MapboxMap, MapSourceDataEvent } from '@kbn/mapbox-gl';
 import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
 import { ILayer } from '../../classes/layers/layer';
 import { SPATIAL_FILTERS_LAYER_ID } from '../../../common/constants';
+import { getTileKey } from '../../classes/util/geo_tile_utils';
 
 interface MbTile {
   // references internal object from mapbox
   aborted?: boolean;
 }
 
+type TileError = Error & {
+  status: number;
+  tileZXYKey: string; // format zoom/x/y
+};
+
 interface Tile {
   mbKey: string;
   mbSourceId: string;
@@ -23,9 +30,16 @@ interface Tile {
 
 export class TileStatusTracker {
   private _tileCache: Tile[];
+  private _tileErrorCache: Record<string, TileError[]>;
+  private _prevCenterTileKey?: string;
   private readonly _mbMap: MapboxMap;
-  private readonly _updateTileStatus: (layer: ILayer, areTilesLoaded: boolean) => void;
+  private readonly _updateTileStatus: (
+    layer: ILayer,
+    areTilesLoaded: boolean,
+    errorMessage?: string
+  ) => void;
   private readonly _getCurrentLayerList: () => ILayer[];
+
   private readonly _onSourceDataLoading = (e: MapSourceDataEvent) => {
     if (
       e.sourceId &&
@@ -51,16 +65,29 @@ export class TileStatusTracker {
     }
   };
 
-  private readonly _onError = (e: MapSourceDataEvent) => {
+  private readonly _onError = (e: MapSourceDataEvent & { error: Error & { status: number } }) => {
     if (
       e.sourceId &&
       e.sourceId !== SPATIAL_FILTERS_LAYER_ID &&
       e.tile &&
       (e.source.type === 'vector' || e.source.type === 'raster')
     ) {
+      const targetLayer = this._getCurrentLayerList().find((layer) => {
+        return layer.ownsMbSourceId(e.sourceId);
+      });
+      const layerId = targetLayer ? targetLayer.getId() : undefined;
+      if (layerId) {
+        const layerErrors = this._tileErrorCache[layerId] ? this._tileErrorCache[layerId] : [];
+        layerErrors.push({
+          ...e.error,
+          tileZXYKey: `${e.tile.tileID.canonical.z}/${e.tile.tileID.canonical.x}/${e.tile.tileID.canonical.y}`,
+        } as TileError);
+        this._tileErrorCache[layerId] = layerErrors;
+      }
       this._removeTileFromCache(e.sourceId, e.tile.tileID.key as unknown as string);
     }
   };
+
   private readonly _onSourceData = (e: MapSourceDataEvent) => {
     if (
       e.sourceId &&
@@ -73,16 +100,35 @@ export class TileStatusTracker {
     }
   };
 
+  /*
+   * Clear errors when center tile changes.
+   * Tracking center tile provides the cleanest way to know when a new data fetching cycle is beginning
+   */
+  private readonly _onMove = () => {
+    const center = this._mbMap.getCenter();
+    // Maplibre rounds zoom when 'source.roundZoom' is true and floors zoom when 'source.roundZoom' is false
+    // 'source.roundZoom' is true for raster and video layers
+    // 'source.roundZoom' is false for vector layers
+    // Always floor zoom to keep logic as simple as possible and not have to track center tile by source.
+    // We are mainly concerned with showing errors from Elasticsearch vector tile requests (which are vector sources)
+    const centerTileKey = getTileKey(center.lat, center.lng, Math.floor(this._mbMap.getZoom()));
+    if (this._prevCenterTileKey !== centerTileKey) {
+      this._prevCenterTileKey = centerTileKey;
+      this._tileErrorCache = {};
+    }
+  };
+
   constructor({
     mbMap,
     updateTileStatus,
     getCurrentLayerList,
   }: {
     mbMap: MapboxMap;
-    updateTileStatus: (layer: ILayer, areTilesLoaded: boolean) => void;
+    updateTileStatus: (layer: ILayer, areTilesLoaded: boolean, errorMessage?: string) => void;
     getCurrentLayerList: () => ILayer[];
   }) {
     this._tileCache = [];
+    this._tileErrorCache = {};
     this._updateTileStatus = updateTileStatus;
     this._getCurrentLayerList = getCurrentLayerList;
 
@@ -90,6 +136,7 @@ export class TileStatusTracker {
     this._mbMap.on('sourcedataloading', this._onSourceDataLoading);
     this._mbMap.on('error', this._onError);
     this._mbMap.on('sourcedata', this._onSourceData);
+    this._mbMap.on('move', this._onMove);
   }
 
   _updateTileStatusForAllLayers = _.debounce(() => {
@@ -107,7 +154,31 @@ export class TileStatusTracker {
           break;
         }
       }
-      this._updateTileStatus(layer, !atLeastOnePendingTile);
+      const tileErrorMessages = this._tileErrorCache[layer.getId()]
+        ? this._tileErrorCache[layer.getId()].map((tileError) => {
+            return i18n.translate('xpack.maps.tileStatusTracker.tileErrorMsg', {
+              defaultMessage: `tile '{tileZXYKey}' failed to load: '{status} {message}'`,
+              values: {
+                tileZXYKey: tileError.tileZXYKey,
+                status: tileError.status,
+                message: tileError.message,
+              },
+            });
+          })
+        : [];
+      this._updateTileStatus(
+        layer,
+        !atLeastOnePendingTile,
+        tileErrorMessages.length
+          ? i18n.translate('xpack.maps.tileStatusTracker.layerErrorMsg', {
+              defaultMessage: `Unable to load {count} tiles: {tileErrors}`,
+              values: {
+                count: tileErrorMessages.length,
+                tileErrors: tileErrorMessages.join(', '),
+              },
+            })
+          : undefined
+      );
     }
   }, 100);
 
@@ -126,6 +197,7 @@ export class TileStatusTracker {
     this._mbMap.off('error', this._onError);
     this._mbMap.off('sourcedata', this._onSourceData);
     this._mbMap.off('sourcedataloading', this._onSourceDataLoading);
+    this._mbMap.off('move', this._onMove);
     this._tileCache.length = 0;
   }
 }
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
index 97186854a44d6..1d6c897fcf0d1 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
@@ -9,11 +9,11 @@ import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { Geometry, Polygon } from 'geojson';
 import rison, { RisonObject } from 'rison-node';
-import { URL_MAX_LENGTH } from '../../../../../../../../src/core/public';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
+import { URL_MAX_LENGTH } from '@kbn/core/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import {
   createSpatialFilterWithGeometry,
   PreIndexedShape,
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
index ab505bc023275..1e3bdf8503420 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { FeatureProperties } from './feature_properties';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { ITooltipProperty } from '../../../../classes/tooltips/tooltip_property';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 
 class MockTooltipProperty {
   private _key: string;
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
index edd2802a7eea8..8607f1ce0503a 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
@@ -16,10 +16,10 @@ import {
   EuiContextMenu,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { GeoJsonProperties } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { isUrlDrilldown } from '../../../../trigger_actions/trigger_utils';
 import { RawValue } from '../../../../../common/constants';
 import { ITooltipProperty } from '../../../../classes/tooltips/tooltip_property';
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx
index 235de31f7557d..8032c80af4c2f 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx
@@ -8,7 +8,7 @@
 import React, { Component, Fragment, ReactNode } from 'react';
 import { EuiIcon, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { GeoJsonProperties } from 'geojson';
 import { Filter } from '@kbn/es-query';
 import { FeatureProperties } from './feature_properties';
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx
index a018fe0a4a200..eafa2c66b6d50 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx
@@ -15,12 +15,12 @@ import sinon from 'sinon';
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { Feature } from 'geojson';
-import type { Map as MbMap, MapMouseEvent, MapboxGeoJSONFeature } from '@kbn/mapbox-gl';
+import type { Map as MbMap, MapMouseEvent, MapGeoJSONFeature } from '@kbn/mapbox-gl';
 import { TooltipControl } from './tooltip_control';
 import { IVectorLayer } from '../../../classes/layers/vector_layer';
 
 // mutable map state
-let featuresAtLocation: MapboxGeoJSONFeature[] = [];
+let featuresAtLocation: MapGeoJSONFeature[] = [];
 
 const layerId = 'tfi3f';
 const mbLayerId = 'tfi3f_circle';
@@ -254,7 +254,7 @@ describe('TooltipControl', () => {
         properties: {
           __kbn__feature_id__: 1,
         },
-      } as unknown as MapboxGeoJSONFeature;
+      } as unknown as MapGeoJSONFeature;
       featuresAtLocation = [feature, feature];
       mount(
         <TooltipControl
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
index f8a720a8fcde0..31626dd5c94a9 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
@@ -11,14 +11,15 @@ import { i18n } from '@kbn/i18n';
 import {
   LngLat,
   Map as MbMap,
-  MapboxGeoJSONFeature,
+  MapGeoJSONFeature,
   MapMouseEvent,
-  Point as MbPoint,
+  Point2D,
+  PointLike,
 } from '@kbn/mapbox-gl';
 import uuid from 'uuid/v4';
 import { Geometry } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { GEO_JSON_TYPE, LON_INDEX, RawValue } from '../../../../common/constants';
 import {
   GEOMETRY_FILTER_ACTION,
@@ -34,7 +35,7 @@ import { RenderToolTipContent } from '../../../classes/tooltips/tooltip_property
 
 function justifyAnchorLocation(
   mbLngLat: LngLat,
-  targetFeature: MapboxGeoJSONFeature
+  targetFeature: MapGeoJSONFeature
 ): [number, number] {
   let popupAnchorLocation: [number, number] = [mbLngLat.lng, mbLngLat.lat]; // default popup location to mouse location
   if (targetFeature.geometry.type === 'Point') {
@@ -197,7 +198,7 @@ export class TooltipControl extends Component<Props, {}> {
   }
 
   _getTooltipFeatures(
-    mbFeatures: MapboxGeoJSONFeature[],
+    mbFeatures: MapGeoJSONFeature[],
     isLocked: boolean,
     tooltipId: string
   ): TooltipFeature[] {
@@ -223,13 +224,10 @@ export class TooltipControl extends Component<Props, {}> {
         }
       }
       if (!match) {
-        // "tags" (aka properties) are optional in .mvt tiles.
-        // It's not entirely clear how mapbox-gl handles those.
-        // - As null value (as defined in https://tools.ietf.org/html/rfc7946#section-3.2)
-        // - As undefined value
-        // - As empty object literal
-        // To avoid ambiguity, normalize properties to empty object literal.
-        const mbProperties = mbFeature.properties ? mbFeature.properties : {};
+        const mbProperties = {
+          ...(mbFeature.properties ? mbFeature.properties : {}),
+          ...(mbFeature.state ? mbFeature.state : {}),
+        };
         const actions: TooltipFeatureAction[] = isLocked
           ? this._getFeatureActions({ layerId, featureId, tooltipId })
           : [];
@@ -343,7 +341,7 @@ export class TooltipControl extends Component<Props, {}> {
     });
   }
 
-  _getMbFeaturesUnderPointer(mbLngLatPoint: MbPoint) {
+  _getMbFeaturesUnderPointer(mbLngLatPoint: Point2D) {
     if (!this.props.mbMap) {
       return [];
     }
@@ -359,7 +357,7 @@ export class TooltipControl extends Component<Props, {}> {
         x: mbLngLatPoint.x + PADDING,
         y: mbLngLatPoint.y + PADDING,
       },
-    ] as [MbPoint, MbPoint];
+    ] as [PointLike, PointLike];
     return this.props.mbMap.queryRenderedFeatures(mbBbox, {
       layers: mbLayerIds,
     });
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx
index cc5a862b911be..99b98943b94a9 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx
@@ -10,7 +10,7 @@ import { EuiPopover, EuiText } from '@elastic/eui';
 import type { Map as MbMap } from '@kbn/mapbox-gl';
 import { GeoJsonProperties, Geometry } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { FeaturesTooltip } from './features_tooltip';
 import { LAT_INDEX, LON_INDEX, RawValue } from '../../../../common/constants';
 import { IVectorLayer } from '../../../classes/layers/vector_layer';
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/utils.ts b/x-pack/plugins/maps/public/connected_components/mb_map/utils.ts
index a79c1a1f71b76..5fc9fd62b20c2 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/utils.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/utils.ts
@@ -66,6 +66,7 @@ export function getTileMetaFeatures(mbMap: MbMap, mbSourceId: string): TileMetaF
   // Tile meta will never have duplicated features since by there nature, tile meta is a feature contained within a single tile
   const mbFeatures = mbMap.querySourceFeatures(mbSourceId, {
     sourceLayer: ES_MVT_META_LAYER_NAME,
+    filter: [],
   });
 
   return mbFeatures
diff --git a/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts b/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts
index 7195851aafe2c..01f79114b13d0 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts
@@ -7,7 +7,7 @@
 
 import moment from 'moment-timezone';
 import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks';
-import { calcAutoIntervalNear } from '../../../../../../src/plugins/data/common';
+import { calcAutoIntervalNear } from '@kbn/data-plugin/common';
 import { getUiSettings } from '../../kibana_services';
 
 function getTimezone() {
diff --git a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
index eaa2aa158e55a..ee5a534f7c6f0 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
@@ -12,8 +12,8 @@ import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks
 import { i18n } from '@kbn/i18n';
 import { Observable, Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { epochToKbnDateFormat, getInterval, getTicks } from './time_utils';
-import { TimeRange } from '../../../../../../src/plugins/data/common';
 import { getTimeFilter } from '../../kibana_services';
 import { Timeslice } from '../../../common/descriptor_types';
 
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
index 1179f3557c62c..a762b7ceaac3c 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiButtonIcon, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { TrackApplicationView } from '../../../../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { DRAW_SHAPE } from '../../../../../common/constants';
 import { VectorCircleIcon } from '../../icons/vector_circle_icon';
 import { VectorLineIcon } from '../../icons/vector_line_icon';
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx
index 82835f449aeaa..771f10dd15677 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { SetViewControl } from './set_view_control';
 import { ToolsControl } from './tools_control';
 import { FeatureEditTools } from './feature_draw_controls/feature_edit_tools';
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
index b140c7ae60bcf..0f5a3a59e762c 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { DRAW_SHAPE, ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../../../../common/constants';
 import { GeometryFilterForm } from '../../../components/draw_forms/geometry_filter_form/geometry_filter_form';
 import { DistanceFilterForm } from '../../../components/draw_forms/distance_filter_form';
diff --git a/x-pack/plugins/maps/public/embeddable/map_component.tsx b/x-pack/plugins/maps/public/embeddable/map_component.tsx
index 6399cb327c14d..f9bc8423f44e0 100644
--- a/x-pack/plugins/maps/public/embeddable/map_component.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_component.tsx
@@ -9,7 +9,7 @@ import React, { Component, RefObject } from 'react';
 import uuid from 'uuid/v4';
 import { EuiLoadingChart } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../src/plugins/data/common';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
 import type { LayerDescriptor, MapCenterAndZoom } from '../../common/descriptor_types';
 import type { MapEmbeddableType } from './types';
 import type { LazyLoadedMapModules } from '../lazy_load_bundle';
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index d572734e816a9..d733c52299993 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -15,7 +15,7 @@ import { Subscription } from 'rxjs';
 import { Unsubscribe } from 'redux';
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { type Filter, compareFilters } from '@kbn/es-query';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   Embeddable,
   IContainer,
@@ -23,10 +23,10 @@ import {
   genericEmbeddableInputIsEqual,
   VALUE_CLICK_TRIGGER,
   omitGenericEmbeddableInput,
-} from '../../../../../src/plugins/embeddable/public';
-import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
-import { APPLY_FILTER_TRIGGER, TimeRange, Query } from '../../../../../src/plugins/data/public';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/unified_search/public';
+} from '@kbn/embeddable-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER, TimeRange, Query } from '@kbn/data-plugin/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { createExtentFilter } from '../../common/elasticsearch_util';
 import {
   replaceLayerList,
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
index 4a2048fc40e63..6f823f218ca23 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/constants';
 import { getMapEmbeddableDisplayName } from '../../common/i18n_getters';
 import { extract, inject } from '../../common/embeddable';
diff --git a/x-pack/plugins/maps/public/embeddable/types.ts b/x-pack/plugins/maps/public/embeddable/types.ts
index b401f50c00b07..3b51756dba260 100644
--- a/x-pack/plugins/maps/public/embeddable/types.ts
+++ b/x-pack/plugins/maps/public/embeddable/types.ts
@@ -6,14 +6,14 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import type { DataView } from '../../../../../src/plugins/data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 import {
   Embeddable,
   EmbeddableInput,
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
-} from '../../../../../src/plugins/embeddable/public';
-import { Query, TimeRange } from '../../../../../src/plugins/data/common';
+} from '@kbn/embeddable-plugin/public';
+import { Query, TimeRange } from '@kbn/data-plugin/common';
 import { MapCenterAndZoom, MapExtent } from '../../common/descriptor_types';
 import { MapSavedObjectAttributes } from '../../common/map_saved_object_type';
 import { MapSettings } from '../reducers/map';
diff --git a/x-pack/plugins/maps/public/feature_catalogue_entry.ts b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
index 1902e59b523e1..80d37aa0288e7 100644
--- a/x-pack/plugins/maps/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 import { APP_ID, APP_ICON } from '../common/constants';
 import { getAppTitle } from '../common/i18n_getters';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 
 export const featureCatalogueEntry = {
   id: APP_ID,
@@ -22,7 +22,7 @@ export const featureCatalogueEntry = {
   icon: APP_ICON,
   path: '/app/maps',
   showOnHomePage: false,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data' as FeatureCatalogueCategory,
   solutionId: 'kibana',
   order: 400,
 };
diff --git a/x-pack/plugins/maps/public/index.ts b/x-pack/plugins/maps/public/index.ts
index 6b8767abe9c11..cda7c7876c8b6 100644
--- a/x-pack/plugins/maps/public/index.ts
+++ b/x-pack/plugins/maps/public/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/public';
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MapsPlugin, MapsPluginSetup, MapsPluginStart } from './plugin';
 import { MapsXPackConfig } from '../config';
 
diff --git a/x-pack/plugins/maps/public/index_pattern_util.test.ts b/x-pack/plugins/maps/public/index_pattern_util.test.ts
index 71cb11effea64..52c91e05e6132 100644
--- a/x-pack/plugins/maps/public/index_pattern_util.test.ts
+++ b/x-pack/plugins/maps/public/index_pattern_util.test.ts
@@ -14,7 +14,7 @@ import {
   supportsGeoTileAgg,
 } from './index_pattern_util';
 import { ES_GEO_FIELD_TYPE } from '../common/constants';
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 
 describe('getSourceFields', () => {
   test('Should remove multi fields from field list', () => {
diff --git a/x-pack/plugins/maps/public/index_pattern_util.ts b/x-pack/plugins/maps/public/index_pattern_util.ts
index f0762f743184d..fc31b62f79a7b 100644
--- a/x-pack/plugins/maps/public/index_pattern_util.ts
+++ b/x-pack/plugins/maps/public/index_pattern_util.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { DataViewField, DataView } from 'src/plugins/data/common';
+import type { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { asyncMap } from '@kbn/std';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { getIndexPatternService } from './kibana_services';
-import { indexPatterns } from '../../../../src/plugins/data/public';
 import { ES_GEO_FIELD_TYPE, ES_GEO_FIELD_TYPES } from '../common/constants';
 import { getIsGoldPlus } from './licensed_features';
 
diff --git a/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx b/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx
index 77809b81b9077..7f65a630b72bd 100644
--- a/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx
+++ b/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { lazy } from 'react';
-import type { Adapters } from 'src/plugins/inspector/public';
+import type { Adapters } from '@kbn/inspector-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { LazyWrapper } from '../lazy_wrapper';
 
diff --git a/x-pack/plugins/maps/public/inspector/map_view_component.tsx b/x-pack/plugins/maps/public/inspector/map_view_component.tsx
index 364f4d4d2d435..a5f25c858cc1a 100644
--- a/x-pack/plugins/maps/public/inspector/map_view_component.tsx
+++ b/x-pack/plugins/maps/public/inspector/map_view_component.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { Component } from 'react';
-import type { Adapters } from 'src/plugins/inspector/public';
+import type { Adapters } from '@kbn/inspector-plugin/public';
 import { MapDetails } from './map_details';
 import { Stats } from './types';
 
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index 8b51fb5fbebc6..22857c623c18a 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { PaletteRegistry } from '@kbn/coloring';
+import type { EMSSettings } from '@kbn/maps-ems-plugin/common/ems_settings';
+import { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 import type { MapsConfigType } from '../config';
 import type { MapsPluginStartDependencies } from './plugin';
-import type { EMSSettings } from '../../../../src/plugins/maps_ems/common/ems_settings';
-import type { PaletteRegistry } from '../../../../src/plugins/charts/public';
-import { MapsEmsPluginPublicStart } from '../../../../src/plugins/maps_ems/public';
 
 let coreStart: CoreStart;
 let pluginsStart: MapsPluginStartDependencies;
@@ -32,7 +32,7 @@ export const getIsCloud = () => isCloudEnabled;
 export const getIndexNameFormComponent = () => pluginsStart.fileUpload.IndexNameFormComponent;
 export const getFileUploadComponent = () => pluginsStart.fileUpload.FileUploadComponent;
 export const getIndexPatternService = () => pluginsStart.data.indexPatterns;
-export const getAutocompleteService = () => pluginsStart.data.autocomplete;
+export const getAutocompleteService = () => pluginsStart.unifiedSearch.autocomplete;
 export const getInspector = () => pluginsStart.inspector;
 export const getFileUpload = () => pluginsStart.fileUpload;
 export const getUiSettings = () => coreStart.uiSettings;
@@ -64,7 +64,6 @@ export const getSecurityService = () => pluginsStart.security;
 export const getSpacesApi = () => pluginsStart.spaces;
 export const getTheme = () => coreStart.theme;
 export const getUsageCollection = () => pluginsStart.usageCollection;
-export const getSharedUXPluginContext = () => pluginsStart.sharedUX;
 export const getApplication = () => coreStart.application;
 
 // xpack.maps.* kibana.yml settings from this plugin
diff --git a/x-pack/plugins/maps/public/lazy_load_bundle/index.ts b/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
index 8fdae1ae6d197..e65e4599d52c3 100644
--- a/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
+++ b/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IndexPatternsContract } from 'src/plugins/data/public';
-import { AppMountParameters } from 'kibana/public';
-import { IContainer } from '../../../../../src/plugins/embeddable/public';
+import { IndexPatternsContract } from '@kbn/data-plugin/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { IContainer } from '@kbn/embeddable-plugin/public';
 import { LayerDescriptor } from '../../common/descriptor_types';
 import type {
   MapEmbeddableConfig,
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx
index c9e422001da3e..9a79d4f10fd2f 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { getData, getShareService } from '../../kibana_services';
 import { ViewInMaps } from '../view_in_maps';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts
index 8a6c3fcc5c3c3..acbbf25c8a49f 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts
@@ -7,12 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
-import type { ExpressionValueSearchContext } from '../../../../../../src/plugins/data/common/search/expressions/kibana_context_type';
-import type {
-  ExpressionFunctionDefinition,
-  Render,
-} from '../../../../../../src/plugins/expressions/public';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
+import type { ExpressionValueSearchContext } from '@kbn/data-plugin/common/search/expressions/kibana_context_type';
+import type { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 import { REGION_MAP_RENDER, REGION_MAP_VIS_TYPE, RegionMapVisConfig } from './types';
 
 interface Arguments {
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx
index 19066a618ee79..532353cea02d8 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx
@@ -7,7 +7,7 @@
 
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import type { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import type { RegionMapVisRenderValue } from './region_map_fn';
 import { LazyWrapper } from '../../lazy_wrapper';
 import { REGION_MAP_RENDER } from './types';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx
index 473f83a270871..b51c4a3b5a23f 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx
@@ -7,8 +7,8 @@
 
 import React, { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { VisTypeDefinition } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { REGION_MAP_VIS_TYPE, RegionMapVisParams } from './types';
 import { LazyWrapper } from '../../lazy_wrapper';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
index efbf93931cbad..8c51e5c38a197 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
 import { RegionMapVisConfig } from './types';
 import type { LazyLoadedMapModules } from '../../lazy_load_bundle';
 import { MapComponent } from '../../embeddable/map_component';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts b/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts
index 49f431980b950..097ce68fc4aca 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../../src/plugins/expressions/public';
-import { VisToExpressionAst } from '../../../../../../src/plugins/visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { RegionMapExpressionFunctionDefinition } from './region_map_fn';
 import { RegionMapVisParams } from './types';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts b/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts
index a641bbb5a7c39..7116718aa09bd 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { RegionMapVisParams } from './types';
 import { title } from './region_map_vis_type';
 
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx
index 81f440eef233e..59aa745a29c16 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { getData, getShareService } from '../../kibana_services';
 import { ViewInMaps } from '../view_in_maps';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts
index e71efccf68d3b..8239a017bf0fa 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts
@@ -7,12 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
-import type { ExpressionValueSearchContext } from '../../../../../../src/plugins/data/common/search/expressions/kibana_context_type';
-import type {
-  ExpressionFunctionDefinition,
-  Render,
-} from '../../../../../../src/plugins/expressions/public';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
+import type { ExpressionValueSearchContext } from '@kbn/data-plugin/common/search/expressions/kibana_context_type';
+import type { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 import { TILE_MAP_RENDER, TILE_MAP_VIS_TYPE, TileMapVisConfig } from './types';
 
 interface Arguments {
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx
index 75569da5020c7..90b0d0a66fa9d 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx
@@ -7,7 +7,7 @@
 
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import type { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import type { TileMapVisRenderValue } from './tile_map_fn';
 import { LazyWrapper } from '../../lazy_wrapper';
 import { TILE_MAP_RENDER } from './types';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx
index 3ecf8c24e200a..c0a5fe55259f4 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx
@@ -7,8 +7,8 @@
 
 import React, { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { VisTypeDefinition } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { MapTypes, TileMapVisParams, TILE_MAP_VIS_TYPE } from './types';
 import { LazyWrapper } from '../../lazy_wrapper';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
index 3213e4053cb5b..abe5c571c1c39 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
 import { TileMapVisConfig } from './types';
 import type { LazyLoadedMapModules } from '../../lazy_load_bundle';
 import { MapComponent } from '../../embeddable/map_component';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts
index 5417dabfee8d4..4d12770d90cc9 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../../src/plugins/expressions/public';
-import { VisToExpressionAst } from '../../../../../../src/plugins/visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { TileMapExpressionFunctionDefinition } from './tile_map_fn';
 import { TileMapVisParams } from './types';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts
index 3fcb3d8915701..114c44b1c057d 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { TileMapVisParams } from './types';
 import { title } from './tile_map_vis_type';
 
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
index 4fd6dc8994b8c..5089a8cc6c8d5 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import type { FileLayer } from '@elastic/ems-client';
-import { IUiSettingsClient } from 'kibana/public';
-import type { EmbeddableFactory } from 'src/plugins/embeddable/public';
-import type { Datatable } from 'src/plugins/expressions/public';
-import type { FormatFactory } from 'src/plugins/field_formats/common';
+import { IUiSettingsClient } from '@kbn/core/public';
+import type { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
+import type { FormatFactory } from '@kbn/field-formats-plugin/common';
 import {
   FIELD_ORIGIN,
   LAYER_TYPE,
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
index 403f0ed9bfb40..7ed1ddfbd4381 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
-import type { LensMultiTable } from '../../../../lens/common';
+import type { LensMultiTable } from '@kbn/lens-plugin/common';
+import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import type { ChoroplethChartConfig, ChoroplethChartProps } from './types';
 import { RENDERER_ID } from './expression_renderer';
-import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils';
 
 interface ChoroplethChartRender {
   type: 'render';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx
index 0f1649d911c10..4fc96d7625504 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { IInterpreterRenderHandlers } from 'src/plugins/expressions/public';
-import type { EmbeddableFactory } from 'src/plugins/embeddable/public';
-import type { CoreSetup, CoreStart } from 'src/core/public';
+import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
+import type { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import type { CoreSetup, CoreStart } from '@kbn/core/public';
 import type { MapsPluginStartDependencies } from '../../plugin';
 import type { ChoroplethChartProps } from './types';
 import type { MapEmbeddableInput, MapEmbeddableOutput } from '../../embeddable';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts
index 6d8ee4148271e..67836a27c0bfe 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts
@@ -6,7 +6,7 @@
  */
 
 import type { FileLayer } from '@elastic/ems-client';
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { emsAutoSuggest } from '../../ems_autosuggest';
 
 export function getEmsSuggestion(
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts
index 69d575c6f9a8f..626030e72a576 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ExpressionsSetup } from 'src/plugins/expressions/public';
-import type { CoreSetup, CoreStart } from 'src/core/public';
-import type { LensPublicSetup } from '../../../../lens/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { CoreSetup, CoreStart } from '@kbn/core/public';
+import type { LensPublicSetup } from '@kbn/lens-plugin/public';
 import type { MapsPluginStartDependencies } from '../../plugin';
 import { getExpressionFunction } from './expression_function';
 import { getExpressionRenderer } from './expression_renderer';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts
index 501cc44567bac..a7caa72c6c5df 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts
@@ -8,7 +8,7 @@
 import { partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import type { FileLayer } from '@elastic/ems-client';
-import type { SuggestionRequest, VisualizationSuggestion } from '../../../../lens/public';
+import type { SuggestionRequest, VisualizationSuggestion } from '@kbn/lens-plugin/public';
 import type { ChoroplethChartState } from './types';
 import { Icon } from './icon';
 import { getEmsSuggestion } from './get_ems_suggestion';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
index b9b7f3912f0cc..79c05a93ef2d4 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LensMultiTable } from '../../../../lens/common';
+import type { LensMultiTable } from '@kbn/lens-plugin/common';
 
 export interface ChoroplethChartState {
   layerId: string;
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx
index 93c3bec52471e..cbac26f220163 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx
@@ -10,12 +10,12 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { render } from 'react-dom';
 import type { FileLayer } from '@elastic/ems-client';
-import { ThemeServiceStart } from 'kibana/public';
-import type { PaletteRegistry } from 'src/plugins/charts/public';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import type { PaletteRegistry } from '@kbn/coloring';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { layerTypes } from '@kbn/lens-plugin/public';
+import type { OperationMetadata, SuggestionRequest, Visualization } from '@kbn/lens-plugin/public';
 import { getSuggestions } from './suggestions';
-import { layerTypes } from '../../../../lens/public';
-import type { OperationMetadata, SuggestionRequest, Visualization } from '../../../../lens/public';
 import type { ChoroplethChartState } from './types';
 import { Icon } from './icon';
 import { RegionKeyEditor } from './region_key_editor';
diff --git a/x-pack/plugins/maps/public/lens/passive_map.tsx b/x-pack/plugins/maps/public/lens/passive_map.tsx
index 3db464405b3a5..1117ad1d6db28 100644
--- a/x-pack/plugins/maps/public/lens/passive_map.tsx
+++ b/x-pack/plugins/maps/public/lens/passive_map.tsx
@@ -8,7 +8,7 @@
 import React, { Component, RefObject } from 'react';
 import uuid from 'uuid/v4';
 import { EuiLoadingChart } from '@elastic/eui';
-import { EmbeddableFactory, ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactory, ViewMode } from '@kbn/embeddable-plugin/public';
 import type { LayerDescriptor } from '../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../common';
 import { MapEmbeddable, MapEmbeddableInput, MapEmbeddableOutput } from '../embeddable';
diff --git a/x-pack/plugins/maps/public/licensed_features.ts b/x-pack/plugins/maps/public/licensed_features.ts
index c615d08cfcca4..9c95a389684b9 100644
--- a/x-pack/plugins/maps/public/licensed_features.ts
+++ b/x-pack/plugins/maps/public/licensed_features.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ILicense, LicenseType } from '../../licensing/common/types';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { APP_ID } from '../common/constants';
 
 export enum LICENSED_FEATURES {
diff --git a/x-pack/plugins/maps/public/locators.ts b/x-pack/plugins/maps/public/locators.ts
index cebd9289c44b9..6c5d5a730edf7 100644
--- a/x-pack/plugins/maps/public/locators.ts
+++ b/x-pack/plugins/maps/public/locators.ts
@@ -10,14 +10,9 @@
 import rison from 'rison-node';
 import type { SerializableRecord } from '@kbn/utility-types';
 import { type Filter, isFilterPinned } from '@kbn/es-query';
-import type {
-  TimeRange,
-  Query,
-  QueryState,
-  RefreshInterval,
-} from '../../../../src/plugins/data/public';
-import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
-import type { LocatorDefinition, LocatorPublic } from '../../../../src/plugins/share/public';
+import type { TimeRange, Query, QueryState, RefreshInterval } from '@kbn/data-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 import type { LayerDescriptor } from '../common/descriptor_types';
 import { INITIAL_LAYERS_KEY, APP_ID } from '../common/constants';
 import { lazyLoadMapModules } from './lazy_load_bundle';
diff --git a/x-pack/plugins/maps/public/map_attribute_service.ts b/x-pack/plugins/maps/public/map_attribute_service.ts
index 4abf85fc5eaf1..8ede3e8911461 100644
--- a/x-pack/plugins/maps/public/map_attribute_service.ts
+++ b/x-pack/plugins/maps/public/map_attribute_service.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/types';
-import type { SavedObjectsResolveResponse } from 'src/core/public';
-import { AttributeService } from '../../../../src/plugins/embeddable/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
+import { AttributeService } from '@kbn/embeddable-plugin/public';
+import { checkForDuplicateTitle, OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import { MapSavedObjectAttributes } from '../common/map_saved_object_type';
 import { MAP_SAVED_OBJECT_TYPE } from '../common/constants';
 import { getMapEmbeddableDisplayName } from '../common/i18n_getters';
-import { checkForDuplicateTitle, OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 import { getCoreOverlays, getEmbeddableService, getSavedObjectsClient } from './kibana_services';
 import { extractReferences, injectReferences } from '../common/migrations/references';
 import { MapByValueInput, MapByReferenceInput } from './embeddable/types';
diff --git a/x-pack/plugins/maps/public/maps_vis_type_alias.ts b/x-pack/plugins/maps/public/maps_vis_type_alias.ts
index 9bab4992d1582..e6dad590b037a 100644
--- a/x-pack/plugins/maps/public/maps_vis_type_alias.ts
+++ b/x-pack/plugins/maps/public/maps_vis_type_alias.ts
@@ -6,11 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type {
-  VisualizationsSetup,
-  VisualizationStage,
-} from '../../../../src/plugins/visualizations/public';
-import type { SavedObject } from '../../../../src/core/types/saved_objects';
+import type { VisualizationsSetup, VisualizationStage } from '@kbn/visualizations-plugin/public';
+import type { SavedObject } from '@kbn/core/types/saved_objects';
 import type { MapSavedObject } from '../common/map_saved_object_type';
 import {
   APP_ID,
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 2ab91462cfe7e..5e9662c543641 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -6,65 +6,41 @@
  */
 
 import React from 'react';
-import type { Setup as InspectorSetupContract } from 'src/plugins/inspector/public';
-import type { UiActionsStart } from 'src/plugins/ui_actions/public';
-import type { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
-import type { DashboardStart } from 'src/plugins/dashboard/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { Setup as InspectorSetupContract } from '@kbn/inspector-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type {
   AppMountParameters,
   CoreSetup,
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from '../../../../src/core/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import { MapInspectorView } from './inspector/map_inspector_view';
-import { setIsCloudEnabled, setMapAppConfig, setStartServices } from './kibana_services';
-import { featureCatalogueEntry } from './feature_catalogue_entry';
-import { getMapsVisTypeAlias } from './maps_vis_type_alias';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../src/plugins/visualizations/public';
-import type { Plugin as ExpressionsPublicPlugin } from '../../../../src/plugins/expressions/public';
-import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
-import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../src/plugins/ui_actions/public';
-import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
-import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent_action';
-import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
-import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { CONTEXT_MENU_TRIGGER } from '../../../../src/plugins/embeddable/public';
-import { MapsXPackConfig, MapsConfigType } from '../config';
-import { getAppTitle } from '../common/i18n_getters';
-import { lazyLoadMapModules } from './lazy_load_bundle';
-import {
-  createLayerDescriptors,
-  MapsSetupApi,
-  MapsStartApi,
-  suggestEMSTermJoinConfig,
-} from './api';
-import { registerLayerWizardExternal } from './classes/layers';
-import { registerSource } from './classes/sources/source_registry';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
-import type { MapsEmsPluginPublicStart } from '../../../../src/plugins/maps_ems/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
-import type { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
-import type { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public';
-import { registerLicensedFeatures, setLicensingPluginStart } from './licensed_features';
-import type { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
-import type { ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import {
-  MapsAppLocatorDefinition,
-  MapsAppRegionMapLocatorDefinition,
-  MapsAppTileMapLocatorDefinition,
-} from './locators';
+} from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import type { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
+import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { SecurityPluginStart } from '@kbn/security-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
+import type { LensPublicSetup } from '@kbn/lens-plugin/public';
 import {
   createRegionMapFn,
   regionMapRenderer,
@@ -73,13 +49,33 @@ import {
   tileMapRenderer,
   tileMapVisType,
 } from './legacy_visualizations';
-import type { SecurityPluginStart } from '../../security/public';
-import type { SpacesPluginStart } from '../../spaces/public';
-import type { CloudSetup } from '../../cloud/public';
-import type { LensPublicSetup } from '../../lens/public';
+import {
+  MapsAppLocatorDefinition,
+  MapsAppRegionMapLocatorDefinition,
+  MapsAppTileMapLocatorDefinition,
+} from './locators';
+import { registerLicensedFeatures, setLicensingPluginStart } from './licensed_features';
+import { registerSource } from './classes/sources/source_registry';
+import { registerLayerWizardExternal } from './classes/layers';
+import {
+  createLayerDescriptors,
+  MapsSetupApi,
+  MapsStartApi,
+  suggestEMSTermJoinConfig,
+} from './api';
+import { lazyLoadMapModules } from './lazy_load_bundle';
+import { getAppTitle } from '../common/i18n_getters';
+import { MapsXPackConfig, MapsConfigType } from '../config';
+import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
+import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent_action';
+import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
+import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+import { getMapsVisTypeAlias } from './maps_vis_type_alias';
+import { featureCatalogueEntry } from './feature_catalogue_entry';
+import { setIsCloudEnabled, setMapAppConfig, setStartServices } from './kibana_services';
+import { MapInspectorView } from './inspector/map_inspector_view';
 
 import { setupLensChoroplethChart } from './lens';
-import { SharedUXPluginStart } from '../../../../src/plugins/shared_ux/public';
 
 export interface MapsPluginSetupDependencies {
   cloud?: CloudSetup;
@@ -115,7 +111,6 @@ export interface MapsPluginStartDependencies {
   spaces?: SpacesPluginStart;
   mapsEms: MapsEmsPluginPublicStart;
   usageCollection?: UsageCollectionSetup;
-  sharedUX: SharedUXPluginStart;
 }
 
 /**
diff --git a/x-pack/plugins/maps/public/reducers/map/data_request_utils.test.ts b/x-pack/plugins/maps/public/reducers/map/data_request_utils.test.ts
index f878b8be0d84b..745a02ed72259 100644
--- a/x-pack/plugins/maps/public/reducers/map/data_request_utils.test.ts
+++ b/x-pack/plugins/maps/public/reducers/map/data_request_utils.test.ts
@@ -280,7 +280,10 @@ describe('stopDataRequest', () => {
     const stateClone = _.cloneDeep(state);
     const reponseMeta = { responseProp1: 'response' } as DataRequestMeta;
     const data = { prop1: 'new data' };
-    expect(stopDataRequest(state, 'layer1', 'source', REQUEST_TOKEN, reponseMeta, data)).toEqual({
+    const newState = stopDataRequest(state, 'layer1', 'source', REQUEST_TOKEN, reponseMeta, data);
+    // remove timestamp since it changes every run
+    delete newState.layerList[0].__dataRequests![0].dataRequestMeta!.requestStopTime;
+    expect(newState).toEqual({
       layerList: [
         {
           id: 'layer1',
diff --git a/x-pack/plugins/maps/public/reducers/map/data_request_utils.ts b/x-pack/plugins/maps/public/reducers/map/data_request_utils.ts
index ec97203deb520..9e32cd469ecc4 100644
--- a/x-pack/plugins/maps/public/reducers/map/data_request_utils.ts
+++ b/x-pack/plugins/maps/public/reducers/map/data_request_utils.ts
@@ -60,9 +60,10 @@ export function stopDataRequest(
         dataRequestMeta: {
           ...(dataRequest.dataRequestMetaAtStart ? dataRequest.dataRequestMetaAtStart : {}),
           ...(responseMeta ? responseMeta : {}),
+          requestStopTime: Date.now(),
         },
         dataRequestMetaAtStart: undefined,
-        dataRequestToken: undefined,
+        dataRequestToken: undefined, // active data request
       })
     : state;
 }
diff --git a/x-pack/plugins/maps/public/reducers/map/map.ts b/x-pack/plugins/maps/public/reducers/map/map.ts
index c747f45f5f17a..6bd57fda01803 100644
--- a/x-pack/plugins/maps/public/reducers/map/map.ts
+++ b/x-pack/plugins/maps/public/reducers/map/map.ts
@@ -251,13 +251,11 @@ export function map(state: MapState = DEFAULT_MAP_STATE, action: Record<string,
       return updateLayerSourceDescriptorProp(state, action.layerId, action.propName, action.value);
     case SET_JOINS:
       const layerDescriptor = state.layerList.find(
-        (descriptor) => descriptor.id === action.layer.getId()
+        (descriptor) => descriptor.id === action.layerId
       );
       if (layerDescriptor) {
         const newLayerDescriptor = { ...layerDescriptor, joins: action.joins.slice() };
-        const index = state.layerList.findIndex(
-          (descriptor) => descriptor.id === action.layer.getId()
-        );
+        const index = state.layerList.findIndex((descriptor) => descriptor.id === action.layerId);
         const newLayerList = state.layerList.slice();
         newLayerList[index] = newLayerDescriptor;
         return { ...state, layerList: newLayerList };
diff --git a/x-pack/plugins/maps/public/reducers/map/types.ts b/x-pack/plugins/maps/public/reducers/map/types.ts
index 9f70c7e67271a..c2ed508992500 100644
--- a/x-pack/plugins/maps/public/reducers/map/types.ts
+++ b/x-pack/plugins/maps/public/reducers/map/types.ts
@@ -7,8 +7,9 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/public';
 import {
   CustomIcon,
   DrawState,
@@ -21,7 +22,6 @@ import {
   TooltipState,
 } from '../../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../../common/constants';
-import { TimeRange } from '../../../../../../src/plugins/data/public';
 
 export interface MapExtentState {
   zoom: number;
diff --git a/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts b/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
index 9808a5e09b8ab..955927ba0c5b4 100644
--- a/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
+++ b/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { AnyAction } from 'redux';
 import { MapStoreState } from './store';
 
diff --git a/x-pack/plugins/maps/public/reducers/non_serializable_instances.js b/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
index 9524d25a9a476..7f43fe6f70398 100644
--- a/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
+++ b/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestAdapter } from '../../../../../src/plugins/inspector/common/adapters/request';
+import { RequestAdapter } from '@kbn/inspector-plugin/common/adapters/request';
 import { MapAdapter } from '../inspector/map_adapter';
 import { getShowMapsInspectorAdapter } from '../kibana_services';
 
diff --git a/x-pack/plugins/maps/public/render_app.tsx b/x-pack/plugins/maps/public/render_app.tsx
index 8a3ea87905512..3deea0f82b272 100644
--- a/x-pack/plugins/maps/public/render_app.tsx
+++ b/x-pack/plugins/maps/public/render_app.tsx
@@ -9,9 +9,14 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Switch, Route, Redirect, RouteComponentProps } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import type { AppMountParameters } from 'kibana/public';
-import { SharedUxServicesProvider } from '@kbn/shared-ux-services';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import { ExitFullScreenButtonKibanaProvider } from '@kbn/shared-ux-button-exit-full-screen';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import {
+  createKbnUrlStateStorage,
+  withNotifyOnErrors,
+  IKbnUrlStateStorage,
+} from '@kbn/kibana-utils-plugin/public';
 import {
   getCoreChrome,
   getCoreI18n,
@@ -19,13 +24,8 @@ import {
   getToasts,
   getEmbeddableService,
   getDocLinks,
-  getSharedUXPluginContext,
+  getCore,
 } from './kibana_services';
-import {
-  createKbnUrlStateStorage,
-  withNotifyOnErrors,
-  IKbnUrlStateStorage,
-} from '../../../../src/plugins/kibana_utils/public';
 import { ListPage, MapPage } from './routes';
 import { MapByValueInput, MapByReferenceInput } from './embeddable/types';
 import { APP_ID } from '../common/constants';
@@ -96,7 +96,7 @@ export async function renderApp(
     }
 
     return (
-      <SharedUxServicesProvider {...getSharedUXPluginContext().getContextServices()}>
+      <ExitFullScreenButtonKibanaProvider coreStart={getCore()}>
         <MapPage
           mapEmbeddableInput={mapEmbeddableInput}
           embeddableId={embeddableId}
@@ -108,7 +108,7 @@ export async function renderApp(
           history={history}
           key={routeProps.match.params.savedMapId ? routeProps.match.params.savedMapId : 'new'}
         />
-      </SharedUxServicesProvider>
+      </ExitFullScreenButtonKibanaProvider>
     );
   }
 
diff --git a/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx b/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx
index feafb34f6a715..bc81924a1f1cd 100644
--- a/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx
+++ b/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Redirect } from 'react-router-dom';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 import { getSavedObjectsClient, getToasts } from '../../kibana_services';
 import { MapsListView } from './maps_list_view';
 import { APP_ID, MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
-import { EmbeddableStateTransfer } from '../../../../../../src/plugins/embeddable/public';
 
 export class LoadListAndRender extends React.Component<{ stateTransfer: EmbeddableStateTransfer }> {
   _isMounted: boolean = false;
diff --git a/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx b/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
index f81d88da80b09..5aa8e7877628a 100644
--- a/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
+++ b/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { MouseEvent } from 'react';
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { i18n } from '@kbn/i18n';
 import { EuiLink } from '@elastic/eui';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
-import { TableListView } from '../../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '@kbn/kibana-react-plugin/public';
 import { goToSpecifiedPath } from '../../render_app';
 import { APP_ID, getEditPath, MAP_PATH, MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
 import {
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts b/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts
index 032b496728f53..f99d7cee0869f 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 import { AnyAction } from 'redux';
 import { Filter } from '@kbn/es-query';
-import { Query, TimeRange } from 'src/plugins/data/public';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
 import { MapApp } from './map_app';
 import { getFlyoutDisplay, getIsFullScreen } from '../../../selectors/ui_selectors';
 import {
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
index a354cc5c399dc..0f95c5530e466 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
@@ -9,11 +9,12 @@ import React from 'react';
 import _ from 'lodash';
 import { finalize, switchMap, tap } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { AppLeaveAction, AppMountParameters } from 'kibana/public';
-import { Adapters } from 'src/plugins/embeddable/public';
+import { AppLeaveAction, AppMountParameters } from '@kbn/core/public';
+import { Adapters } from '@kbn/embeddable-plugin/public';
 import { Subscription } from 'rxjs';
 import { type Filter, FilterStateStore } from '@kbn/es-query';
-import type { Query, TimeRange, DataView } from 'src/plugins/data/common';
+import type { Query, TimeRange, DataView } from '@kbn/data-plugin/common';
+import { SavedQuery, QueryStateChange, QueryState } from '@kbn/data-plugin/public';
 import {
   getData,
   getExecutionContext,
@@ -32,11 +33,6 @@ import {
   startGlobalStateSyncing,
   MapsGlobalState,
 } from '../url_state';
-import {
-  SavedQuery,
-  QueryStateChange,
-  QueryState,
-} from '../../../../../../../src/plugins/data/public';
 import { MapContainer } from '../../../connected_components/map_container';
 import { getIndexPatternsFromIds } from '../../../index_pattern_util';
 import { getTopNavConfig } from '../top_nav_config';
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_page.tsx b/x-pack/plugins/maps/public/routes/map_page/map_page.tsx
index dc7030a805ce1..703e60638649e 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_page.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_page.tsx
@@ -7,8 +7,8 @@
 
 import React, { Component } from 'react';
 import { Provider } from 'react-redux';
-import type { AppMountParameters } from 'kibana/public';
-import type { EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import type { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 import { MapApp } from './map_app';
 import {
   SavedMap,
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts
index ad5a56dcd4c26..8e816c6930fdb 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { QueryState } from 'src/plugins/data/public';
+import { QueryState } from '@kbn/data-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { getUiSettings } from '../../../kibana_services';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
 import { SerializedMapState } from './types';
 
 export function getInitialRefreshConfig({
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts
index 9cb67cefde547..da293d5c52d29 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryState } from 'src/plugins/data/public';
+import { QueryState } from '@kbn/data-plugin/public';
 import { getUiSettings } from '../../../kibana_services';
 import { SerializedMapState } from './types';
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
index 7db8606110d01..f8cde28d383ab 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
@@ -7,7 +7,8 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import { MapSavedObjectAttributes } from '../../../../common/map_saved_object_type';
 import { APP_ID, MAP_PATH, MAP_SAVED_OBJECT_TYPE } from '../../../../common/constants';
 import { createMapStore, MapStore, MapStoreState } from '../../../reducers/store';
@@ -32,7 +33,6 @@ import {
 } from '../../../actions';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../../selectors/ui_selectors';
 import { getMapAttributeService, SharingSavedObjectProps } from '../../../map_attribute_service';
-import { OnSaveProps } from '../../../../../../../src/plugins/saved_objects/public';
 import { MapByReferenceInput, MapEmbeddableInput } from '../../../embeddable/types';
 import {
   getCoreChrome,
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts
index 97c839090de61..64a4b19675873 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { Filter } from '@kbn/es-query';
-import { TimeRange } from '../../../../../../../src/plugins/data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { MapCenter } from '../../../../common/descriptor_types';
 import { MapSettings } from '../../../reducers/map';
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
index 6a49dd7ba7efe..9ff80168b96ef 100644
--- a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
@@ -7,7 +7,17 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
+import {
+  checkForDuplicateTitle,
+  SavedObjectSaveModalOrigin,
+  OnSaveProps,
+  showSaveModal,
+} from '@kbn/saved-objects-plugin/public';
+import {
+  LazySavedObjectSaveModalDashboard,
+  withSuspense,
+} from '@kbn/presentation-util-plugin/public';
 import {
   getMapsCapabilities,
   getIsAllowByValueEmbeddables,
@@ -18,19 +28,9 @@ import {
   getSavedObjectsTagging,
   getPresentationUtilContext,
 } from '../../kibana_services';
-import {
-  checkForDuplicateTitle,
-  SavedObjectSaveModalOrigin,
-  OnSaveProps,
-  showSaveModal,
-} from '../../../../../../src/plugins/saved_objects/public';
 import { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
 import { SavedMap } from './saved_map';
 import { getMapEmbeddableDisplayName } from '../../../common/i18n_getters';
-import {
-  LazySavedObjectSaveModalDashboard,
-  withSuspense,
-} from '../../../../../../src/plugins/presentation_util/public';
 
 const SavedObjectSaveModalDashboard = withSuspense(LazySavedObjectSaveModalDashboard);
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts
index d28ef823970e7..b9cd9ddc78a3c 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts
@@ -7,7 +7,7 @@
 
 import { Subject } from 'rxjs';
 import { Filter } from '@kbn/es-query';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 export interface MapsAppState {
   query?: Query | null;
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
index a0e7399bae492..63461315b0ac1 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
@@ -7,11 +7,8 @@
 
 import { map } from 'rxjs/operators';
 import { FilterStateStore } from '@kbn/es-query';
-import { connectToQueryState } from '../../../../../../../src/plugins/data/public';
-import {
-  syncState,
-  BaseStateContainer,
-} from '../../../../../../../src/plugins/kibana_utils/public';
+import { connectToQueryState } from '@kbn/data-plugin/public';
+import { syncState, BaseStateContainer } from '@kbn/kibana-utils-plugin/public';
 import { getData } from '../../../kibana_services';
 import { kbnUrlStateStorage } from '../../../render_app';
 import { AppStateManager } from './app_state_manager';
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts
index d41be63d0a811..a2070e594424a 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts
@@ -6,8 +6,8 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { TimeRange, RefreshInterval } from 'src/plugins/data/public';
-import { syncQueryStateWithUrl } from '../../../../../../../src/plugins/data/public';
+import { TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
+import { syncQueryStateWithUrl } from '@kbn/data-plugin/public';
 import { getData } from '../../../kibana_services';
 import { kbnUrlStateStorage } from '../../../render_app';
 
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.ts b/x-pack/plugins/maps/public/selectors/map_selectors.ts
index 8e99a625cbaa2..2c964f6ef0843 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.ts
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.ts
@@ -8,9 +8,10 @@
 import { createSelector } from 'reselect';
 import { FeatureCollection } from 'geojson';
 import _ from 'lodash';
-import { Adapters } from 'src/plugins/inspector/public';
-import type { Query } from 'src/plugins/data/common';
+import { Adapters } from '@kbn/inspector-plugin/public';
+import type { Query } from '@kbn/data-plugin/common';
 import { Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { RasterTileLayer } from '../classes/layers/raster_tile_layer/raster_tile_layer';
 import { EmsVectorTileLayer } from '../classes/layers/ems_vector_tile_layer/ems_vector_tile_layer';
 import {
@@ -55,7 +56,6 @@ import {
   VectorLayerDescriptor,
 } from '../../common/descriptor_types';
 import { MapSettings } from '../reducers/map';
-import { TimeRange } from '../../../../../src/plugins/data/public';
 import { ISource } from '../classes/sources/source';
 import { ITMSSource } from '../classes/sources/tms_source';
 import { IVectorSource } from '../classes/sources/vector_source';
@@ -64,6 +64,14 @@ import { EMSTMSSource } from '../classes/sources/ems_tms_source';
 import { ILayer } from '../classes/layers/layer';
 import { getIsReadOnly } from './ui_selectors';
 
+function createJoinInstances(vectorLayerDescriptor: VectorLayerDescriptor, source: IVectorSource) {
+  return vectorLayerDescriptor.joins
+    ? vectorLayerDescriptor.joins.map((joinDescriptor) => {
+        return new InnerJoin(joinDescriptor, source);
+      })
+    : [];
+}
+
 export function createLayerInstance(
   layerDescriptor: LayerDescriptor,
   customIcons: CustomIcon[],
@@ -75,22 +83,6 @@ export function createLayerInstance(
   switch (layerDescriptor.type) {
     case LAYER_TYPE.RASTER_TILE:
       return new RasterTileLayer({ layerDescriptor, source: source as ITMSSource });
-    case LAYER_TYPE.GEOJSON_VECTOR:
-      const joins: InnerJoin[] = [];
-      const vectorLayerDescriptor = layerDescriptor as VectorLayerDescriptor;
-      if (vectorLayerDescriptor.joins) {
-        vectorLayerDescriptor.joins.forEach((joinDescriptor) => {
-          const join = new InnerJoin(joinDescriptor, source as IVectorSource);
-          joins.push(join);
-        });
-      }
-      return new GeoJsonVectorLayer({
-        layerDescriptor: vectorLayerDescriptor,
-        source: source as IVectorSource,
-        joins,
-        customIcons,
-        chartsPaletteServiceGetColor,
-      });
     case LAYER_TYPE.EMS_VECTOR_TILE:
       return new EmsVectorTileLayer({ layerDescriptor, source: source as EMSTMSSource });
     case LAYER_TYPE.HEATMAP:
@@ -98,6 +90,17 @@ export function createLayerInstance(
         layerDescriptor: layerDescriptor as HeatmapLayerDescriptor,
         source: source as ESGeoGridSource,
       });
+    case LAYER_TYPE.GEOJSON_VECTOR:
+      return new GeoJsonVectorLayer({
+        layerDescriptor: layerDescriptor as VectorLayerDescriptor,
+        source: source as IVectorSource,
+        joins: createJoinInstances(
+          layerDescriptor as VectorLayerDescriptor,
+          source as IVectorSource
+        ),
+        customIcons,
+        chartsPaletteServiceGetColor,
+      });
     case LAYER_TYPE.BLENDED_VECTOR:
       return new BlendedVectorLayer({
         layerDescriptor: layerDescriptor as VectorLayerDescriptor,
@@ -109,6 +112,10 @@ export function createLayerInstance(
       return new MvtVectorLayer({
         layerDescriptor: layerDescriptor as VectorLayerDescriptor,
         source: source as IVectorSource,
+        joins: createJoinInstances(
+          layerDescriptor as VectorLayerDescriptor,
+          source as IVectorSource
+        ),
         customIcons,
       });
     default:
@@ -215,7 +222,7 @@ export const getDrawState = ({ map }: MapStoreState): DrawState | undefined =>
 export const getEditState = ({ map }: MapStoreState): EditState | undefined =>
   map.mapState.editState;
 
-function getLayerDescriptor(state: MapStoreState, layerId: string) {
+export function getLayerDescriptor(state: MapStoreState, layerId: string) {
   const layerListRaw = getLayerListRaw(state);
   return layerListRaw.find((layer) => layer.id === layerId);
 }
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts
index 7706704cdd63d..1a9a1e8bf92fe 100644
--- a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts
@@ -6,13 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  Embeddable,
-  EmbeddableInput,
-  ViewMode,
-} from '../../../../../src/plugins/embeddable/public';
+import { Embeddable, EmbeddableInput, ViewMode } from '@kbn/embeddable-plugin/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
 
 export const FILTER_BY_MAP_EXTENT = 'FILTER_BY_MAP_EXTENT';
 
diff --git a/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts b/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts
index 154eeaf754524..97d66ae5a6aa6 100644
--- a/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { DatatableColumnType } from '@kbn/expressions-plugin';
 import { RawValue } from '../../common/constants';
-import { DatatableColumnType } from '../../../../../src/plugins/expressions';
 
 export function isUrlDrilldown(action: Action) {
   return action.type === 'URL_DRILLDOWN';
diff --git a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
index c148770b913ea..cfd140434e022 100644
--- a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
@@ -8,14 +8,14 @@
 import uuid from 'uuid/v4';
 import { i18n } from '@kbn/i18n';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { getUsageCollection } from '../kibana_services';
-import { APP_ID } from '../../common/constants';
-
 import {
   createAction,
   ACTION_VISUALIZE_GEO_FIELD,
   VisualizeFieldContext,
-} from '../../../../../src/plugins/ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
+import { getUsageCollection } from '../kibana_services';
+import { APP_ID } from '../../common/constants';
+
 import {
   getVisualizeCapabilities,
   getIndexPatternService,
diff --git a/x-pack/plugins/maps/public/util.ts b/x-pack/plugins/maps/public/util.ts
index 66244ea5f6768..d63072b163599 100644
--- a/x-pack/plugins/maps/public/util.ts
+++ b/x-pack/plugins/maps/public/util.ts
@@ -6,7 +6,7 @@
  */
 
 import { EMSClient, FileLayer, TMSService } from '@elastic/ems-client';
-import type { KibanaExecutionContext } from 'kibana/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { FONTS_API_PATH } from '../common/constants';
 import {
   getHttp,
diff --git a/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts b/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
index 0e595848bd12d..542e61f8af9a6 100644
--- a/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
+++ b/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, IScopedClusterClient } from 'kibana/server';
+import { ElasticsearchClient, IScopedClusterClient } from '@kbn/core/server';
+import { IndexPatternsCommonService } from '@kbn/data-plugin/server';
 import { CreateDocSourceResp, IndexSourceMappings, BodySettings } from '../../common/types';
 import { MAPS_NEW_VECTOR_LAYER_META_CREATED_BY } from '../../common/constants';
-import { IndexPatternsCommonService } from '../../../../../src/plugins/data/server';
 
 const DEFAULT_SETTINGS = { number_of_shards: 1 };
 const DEFAULT_META = {
diff --git a/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts b/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts
index 0760d7a079a3b..da61a88ceb963 100644
--- a/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts
+++ b/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, KibanaResponseFactory, Logger } from 'kibana/server';
+import { IScopedClusterClient, KibanaResponseFactory, Logger } from '@kbn/core/server';
 
 export async function getMatchingIndexes(
   indexPattern: string,
diff --git a/x-pack/plugins/maps/server/data_indexing/index_data.ts b/x-pack/plugins/maps/server/data_indexing/index_data.ts
index 7b26c94e07782..59c90bb279565 100644
--- a/x-pack/plugins/maps/server/data_indexing/index_data.ts
+++ b/x-pack/plugins/maps/server/data_indexing/index_data.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { WriteSettings } from '../../common/types';
 
 export async function writeDataToIndex(
diff --git a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
index 4a7c90439beed..7f2eacc257fc5 100644
--- a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
+++ b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
@@ -6,9 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
-import { IRouter } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { Logger } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   INDEX_SOURCE_API_PATH,
   MAX_DRAWING_SIZE_BYTES,
@@ -19,9 +21,7 @@ import {
 } from '../../common/constants';
 import { createDocSource } from './create_doc_source';
 import { writeDataToIndex } from './index_data';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 import { getMatchingIndexes } from './get_indexes_matching_pattern';
-import { SecurityPluginStart } from '../../../security/server';
 
 export function initIndexingRoutes({
   router,
@@ -49,16 +49,17 @@ export function initIndexingRoutes({
       },
     },
     async (context, request, response) => {
+      const coreContext = await context.core;
       const { index, mappings } = request.body;
       const indexPatternsService = await dataPlugin.indexPatterns.indexPatternsServiceFactory(
-        context.core.savedObjects.client,
-        context.core.elasticsearch.client.asCurrentUser,
+        coreContext.savedObjects.client,
+        coreContext.elasticsearch.client.asCurrentUser,
         request
       );
       const result = await createDocSource(
         index,
         mappings,
-        context.core.elasticsearch.client,
+        coreContext.elasticsearch.client,
         indexPatternsService
       );
       if (result.success) {
@@ -92,10 +93,11 @@ export function initIndexingRoutes({
       },
     },
     async (context, request, response) => {
+      const coreContext = await context.core;
       const result = await writeDataToIndex(
         request.body.index,
         request.body.data,
-        context.core.elasticsearch.client.asCurrentUser
+        coreContext.elasticsearch.client.asCurrentUser
       );
       if (result.success) {
         return response.ok({ body: result });
@@ -123,7 +125,8 @@ export function initIndexingRoutes({
     },
     async (context, request, response) => {
       try {
-        const resp = await context.core.elasticsearch.client.asCurrentUser.delete({
+        const coreContext = await context.core;
+        const resp = await coreContext.elasticsearch.client.asCurrentUser.delete({
           index: request.body.index,
           id: request.params.featureId,
           refresh: true,
@@ -173,9 +176,10 @@ export function initIndexingRoutes({
       },
     },
     async (context, request, response) => {
+      const coreContext = await context.core;
       return await getMatchingIndexes(
         request.query.indexPattern,
-        context.core.elasticsearch.client,
+        coreContext.elasticsearch.client,
         response,
         logger
       );
@@ -194,8 +198,9 @@ export function initIndexingRoutes({
     async (context, request, response) => {
       const { index } = request.query;
       try {
+        const coreContext = await context.core;
         const mappingsResp =
-          await context.core.elasticsearch.client.asCurrentUser.indices.getMapping({
+          await coreContext.elasticsearch.client.asCurrentUser.indices.getMapping({
             index: request.query.index,
           });
         const isDrawingIndex =
diff --git a/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts b/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts
index 9411869c5ad11..68ecc70df0e9e 100644
--- a/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts
+++ b/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { EmbeddableSetup } from '../../../../../src/plugins/embeddable/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
-} from '../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
 import { extract, inject } from '../../common/embeddable';
 import { embeddableMigrations } from './embeddable_migrations';
diff --git a/x-pack/plugins/maps/server/index.ts b/x-pack/plugins/maps/server/index.ts
index 55eaadcd28063..be2f235a51f4c 100644
--- a/x-pack/plugins/maps/server/index.ts
+++ b/x-pack/plugins/maps/server/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { MapsPlugin } from './plugin';
 import { configSchema, MapsXPackConfig } from '../config';
 
diff --git a/x-pack/plugins/maps/server/kibana_server_services.ts b/x-pack/plugins/maps/server/kibana_server_services.ts
index 6cf208606a4cf..b1dab885ed627 100644
--- a/x-pack/plugins/maps/server/kibana_server_services.ts
+++ b/x-pack/plugins/maps/server/kibana_server_services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from '../../../../src/core/server';
+import { CoreStart } from '@kbn/core/server';
 import { StartDeps } from './types';
 
 let coreStart: CoreStart;
diff --git a/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts b/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts
index 471e0bd77e84b..d044264237b5b 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getMapsTelemetry, MapsUsage } from '../maps_telemetry';
 
 export function registerMapsUsageCollector(usageCollection?: UsageCollectionSetup): void {
diff --git a/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts b/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts
index e4938f4217841..85677ef13bf6b 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 // @ts-ignore
 import mapSavedObjects from './test_resources/sample_map_saved_objects.json';
 import { findMaps } from './find_maps';
diff --git a/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts b/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts
index 0175b9b3fda5a..cab4b98ffd784 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts
@@ -6,7 +6,7 @@
  */
 
 import { asyncForEach } from '@kbn/std';
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
 import { MapSavedObject, MapSavedObjectAttributes } from '../../common/map_saved_object_type';
 
diff --git a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts
index 7c76248445edb..02dd0718b3da7 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts
@@ -8,7 +8,7 @@
 import { asyncForEach } from '@kbn/std';
 // @ts-ignore
 import mapSavedObjects from '../test_resources/sample_map_saved_objects.json';
-import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { IndexPatternStatsCollector } from './index_pattern_stats_collector';
 
 test('returns zeroed telemetry data when there are no saved objects', async () => {
diff --git a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts
index f8fbf907bca94..ad1c0239963b4 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts
@@ -7,7 +7,7 @@
 
 import { asyncForEach } from '@kbn/std';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
-import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { LAYER_TYPE, SCALING_TYPES, SOURCE_TYPES } from '../../../common/constants';
 import { injectReferences } from '../../../common/migrations/references';
 import {
diff --git a/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts b/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts
index f57c3afa7e0b5..9eeafaec54e22 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts
@@ -6,6 +6,11 @@
  */
 
 import _ from 'lodash';
+import {
+  DEFAULT_EMS_DARKMAP_ID,
+  DEFAULT_EMS_ROADMAP_DESATURATED_ID,
+  DEFAULT_EMS_ROADMAP_ID,
+} from '@kbn/maps-ems-plugin/common';
 import {
   GRID_RESOLUTION,
   LAYER_TYPE,
@@ -22,11 +27,6 @@ import {
   VectorLayerDescriptor,
 } from '../../../common/descriptor_types';
 import { MapSavedObjectAttributes } from '../../../common/map_saved_object_type';
-import {
-  DEFAULT_EMS_DARKMAP_ID,
-  DEFAULT_EMS_ROADMAP_DESATURATED_ID,
-  DEFAULT_EMS_ROADMAP_ID,
-} from '../../../../../../src/plugins/maps_ems/common/';
 import {
   ClusterCountStats,
   EMS_BASEMAP_KEYS,
diff --git a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts
index dee7bf200ca6e..b7497c010f15f 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { SavedObjectsClient } from '@kbn/core/server';
 import {
   getElasticsearch,
   getIndexPatternsServiceFactory,
   getSavedObjectClient,
 } from '../kibana_server_services';
-import { SavedObjectsClient } from '../../../../../src/core/server';
 import { MapStats, MapStatsCollector } from './map_stats';
 import { IndexPatternStats, IndexPatternStatsCollector } from './index_pattern_stats';
 import { findMaps } from './find_maps';
diff --git a/x-pack/plugins/maps/server/mvt/get_grid_tile.ts b/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
index 754fdb9c1f4d2..eb0ddc9e13143 100644
--- a/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart, Logger } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { CoreStart, Logger } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import { IncomingHttpHeaders } from 'http';
 import { Stream } from 'stream';
 import { RENDER_AS } from '../../common/constants';
 import { isAbortError } from './util';
@@ -40,7 +41,7 @@ export async function getEsGridTile({
   renderAs: RENDER_AS;
   gridPrecision: number;
   abortController: AbortController;
-}): Promise<Stream | null> {
+}): Promise<{ stream: Stream | null; headers: IncomingHttpHeaders; statusCode: number }> {
   try {
     const path = `/${encodeURIComponent(index)}/_mvt/${geometryFieldName}/${z}/${x}/${y}`;
     const body = {
@@ -56,13 +57,14 @@ export async function getEsGridTile({
       runtime_mappings: requestBody.runtime_mappings,
     };
 
+    const esClient = (await context.core).elasticsearch.client;
     const tile = await core.executionContext.withContext(
       makeExecutionContext({
         description: 'mvt:get_grid_tile',
         url,
       }),
       async () => {
-        return await context.core.elasticsearch.client.asCurrentUser.transport.request(
+        return await esClient.asCurrentUser.transport.request(
           {
             method: 'GET',
             path,
@@ -80,13 +82,15 @@ export async function getEsGridTile({
       }
     );
 
-    return tile.body as Stream;
+    return { stream: tile.body as Stream, headers: tile.headers, statusCode: tile.statusCode };
   } catch (e) {
-    if (!isAbortError(e)) {
-      // These are often circuit breaking exceptions
-      // Should return a tile with some error message
-      logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    if (isAbortError(e)) {
+      return { stream: null, headers: {}, statusCode: 200 };
     }
-    return null;
+
+    // These are often circuit breaking exceptions
+    // Should return a tile with some error message
+    logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    return { stream: null, headers: {}, statusCode: 500 };
   }
 }
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.ts b/x-pack/plugins/maps/server/mvt/get_tile.ts
index 7e9bc01c5c317..340a71128b43a 100644
--- a/x-pack/plugins/maps/server/mvt/get_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_tile.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart, Logger } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { CoreStart, Logger } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import { IncomingHttpHeaders } from 'http';
 import { Stream } from 'stream';
 import { isAbortError } from './util';
 import { makeExecutionContext } from '../../common/execution_context';
@@ -36,7 +37,7 @@ export async function getEsTile({
   logger: Logger;
   requestBody: any;
   abortController: AbortController;
-}): Promise<Stream | null> {
+}): Promise<{ stream: Stream | null; headers: IncomingHttpHeaders; statusCode: number }> {
   try {
     const path = `/${encodeURIComponent(index)}/_mvt/${geometryFieldName}/${z}/${x}/${y}`;
 
@@ -56,13 +57,14 @@ export async function getEsTile({
       track_total_hits: requestBody.size + 1,
     };
 
+    const esClient = (await context.core).elasticsearch.client;
     const tile = await core.executionContext.withContext(
       makeExecutionContext({
         description: 'mvt:get_tile',
         url,
       }),
       async () => {
-        return await context.core.elasticsearch.client.asCurrentUser.transport.request(
+        return await esClient.asCurrentUser.transport.request(
           {
             method: 'GET',
             path,
@@ -80,13 +82,15 @@ export async function getEsTile({
       }
     );
 
-    return tile.body as Stream;
+    return { stream: tile.body as Stream, headers: tile.headers, statusCode: tile.statusCode };
   } catch (e) {
-    if (!isAbortError(e)) {
-      // These are often circuit breaking exceptions
-      // Should return a tile with some error message
-      logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    if (isAbortError(e)) {
+      return { stream: null, headers: {}, statusCode: 200 };
     }
-    return null;
+
+    // These are often circuit breaking exceptions
+    // Should return a tile with some error message
+    logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    return { stream: null, headers: {}, statusCode: 500 };
   }
 }
diff --git a/x-pack/plugins/maps/server/mvt/mvt_routes.test.ts b/x-pack/plugins/maps/server/mvt/mvt_routes.test.ts
new file mode 100644
index 0000000000000..9d9ef24ef4795
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/mvt_routes.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Readable } from 'stream';
+import sinon from 'sinon';
+import { KibanaResponseFactory } from '@kbn/core/server';
+import { sendResponse } from './mvt_routes';
+
+const mockStream = Readable.from(['{}']);
+
+test('should send error response when status code is above 400', () => {
+  const responseMock = {
+    customError: sinon.spy(),
+    ok: sinon.spy(),
+  };
+  sendResponse(responseMock as unknown as KibanaResponseFactory, mockStream, {}, 400);
+  expect(responseMock.ok.notCalled);
+  expect(responseMock.customError.calledOnce);
+  const firstCallArgs = responseMock.customError.getCall(0).args[0];
+  expect(firstCallArgs.statusCode).toBe(400);
+});
+
+test('should forward content-length and content-encoding elasticsearch headers', () => {
+  const responseMock = {
+    customError: sinon.spy(),
+    ok: sinon.spy(),
+  };
+  sendResponse(
+    responseMock as unknown as KibanaResponseFactory,
+    mockStream,
+    { 'content-encoding': 'gzip', 'content-length': '19326' },
+    200
+  );
+  expect(responseMock.ok.calledOnce);
+  expect(responseMock.customError.notCalled);
+  const firstCallArgs = responseMock.ok.getCall(0).args[0];
+  const headers = { ...firstCallArgs.headers };
+
+  // remove lastModified from comparision check since its a timestamp that changes every run
+  expect(headers).toHaveProperty('Last-Modified');
+  delete headers['Last-Modified'];
+  expect(headers).toEqual({
+    'Cache-Control': 'public, max-age=3600',
+    'Content-Type': 'application/x-protobuf',
+    'content-disposition': 'inline',
+    'content-encoding': 'gzip',
+    'content-length': '19326',
+  });
+});
+
+test('should not set content-encoding when elasticsearch does not provide value', () => {
+  const responseMock = {
+    customError: sinon.spy(),
+    ok: sinon.spy(),
+  };
+  sendResponse(
+    responseMock as unknown as KibanaResponseFactory,
+    mockStream,
+    { 'content-length': '19326' },
+    200
+  );
+  expect(responseMock.ok.calledOnce);
+  expect(responseMock.customError.notCalled);
+  const firstCallArgs = responseMock.ok.getCall(0).args[0];
+  const headers = { ...firstCallArgs.headers };
+
+  // remove lastModified from comparision check since its a timestamp that changes every run
+  expect(headers).toHaveProperty('Last-Modified');
+  delete headers['Last-Modified'];
+  expect(headers).toEqual({
+    'Cache-Control': 'public, max-age=3600',
+    'Content-Type': 'application/x-protobuf',
+    'content-disposition': 'inline',
+    'content-length': '19326',
+  });
+});
diff --git a/x-pack/plugins/maps/server/mvt/mvt_routes.ts b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
index dde68bd0d1335..b7c6a59ba54d4 100644
--- a/x-pack/plugins/maps/server/mvt/mvt_routes.ts
+++ b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
@@ -6,10 +6,11 @@
  */
 
 import { Stream } from 'stream';
+import { IncomingHttpHeaders } from 'http';
 import { schema } from '@kbn/config-schema';
-import { CoreStart, KibanaRequest, KibanaResponseFactory, Logger } from 'src/core/server';
-import { IRouter } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { CoreStart, KibanaRequest, KibanaResponseFactory, Logger } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 import {
   MVT_GETTILE_API_PATH,
   API_ROOT_PATH,
@@ -57,7 +58,7 @@ export function initMVTRoutes({
 
       const abortController = makeAbortController(request);
 
-      const gzippedTile = await getEsTile({
+      const { stream, headers, statusCode } = await getEsTile({
         url: `${API_ROOT_PATH}/${MVT_GETTILE_API_PATH}/{z}/{x}/{y}.pbf`,
         core,
         logger,
@@ -71,7 +72,7 @@ export function initMVTRoutes({
         abortController,
       });
 
-      return sendResponse(response, gzippedTile);
+      return sendResponse(response, stream, headers, statusCode);
     }
   );
 
@@ -103,7 +104,7 @@ export function initMVTRoutes({
 
       const abortController = makeAbortController(request);
 
-      const gzipTileStream = await getEsGridTile({
+      const { stream, headers, statusCode } = await getEsGridTile({
         url: `${API_ROOT_PATH}/${MVT_GETGRIDTILE_API_PATH}/{z}/{x}/{y}.pbf`,
         core,
         logger,
@@ -119,20 +120,35 @@ export function initMVTRoutes({
         abortController,
       });
 
-      return sendResponse(response, gzipTileStream);
+      return sendResponse(response, stream, headers, statusCode);
     }
   );
 }
 
-function sendResponse(response: KibanaResponseFactory, gzipTileStream: Stream | null) {
+export function sendResponse(
+  response: KibanaResponseFactory,
+  tileStream: Stream | null,
+  headers: IncomingHttpHeaders,
+  statusCode: number
+) {
+  if (statusCode >= 400) {
+    return response.customError({
+      statusCode,
+      body: tileStream ? tileStream : statusCode.toString(),
+    });
+  }
+
   const cacheControl = `public, max-age=${CACHE_TIMEOUT_SECONDS}`;
   const lastModified = `${new Date().toUTCString()}`;
-  if (gzipTileStream) {
+  if (tileStream) {
+    // use the content-encoding and content-length headers from elasticsearch if they exist
+    const { 'content-length': contentLength, 'content-encoding': contentEncoding } = headers;
     return response.ok({
-      body: gzipTileStream,
+      body: tileStream,
       headers: {
         'content-disposition': 'inline',
-        'content-encoding': 'gzip',
+        ...(contentLength && { 'content-length': contentLength }),
+        ...(contentEncoding && { 'content-encoding': contentEncoding }),
         'Content-Type': 'application/x-protobuf',
         'Cache-Control': cacheControl,
         'Last-Modified': lastModified,
diff --git a/x-pack/plugins/maps/server/plugin.ts b/x-pack/plugins/maps/server/plugin.ts
index 05051a861d595..8101018c6db6f 100644
--- a/x-pack/plugins/maps/server/plugin.ts
+++ b/x-pack/plugins/maps/server/plugin.ts
@@ -13,21 +13,21 @@ import {
   Plugin,
   PluginInitializerContext,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
-// @ts-ignore
+} from '@kbn/core/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { EMSSettings } from '@kbn/maps-ems-plugin/server';
+// @ts-expect-error
 import { getEcommerceSavedObjects } from './sample_data/ecommerce_saved_objects';
-// @ts-ignore
-import { getFlightsSavedObjects } from './sample_data/flights_saved_objects.js';
-// @ts-ignore
-import { getWebLogsSavedObjects } from './sample_data/web_logs_saved_objects.js';
+// @ts-expect-error
+import { getFlightsSavedObjects } from './sample_data/flights_saved_objects';
+// @ts-expect-error
+import { getWebLogsSavedObjects } from './sample_data/web_logs_saved_objects';
 import { registerMapsUsageCollector } from './maps_telemetry/collectors/register';
 import { APP_ID, APP_ICON, MAP_SAVED_OBJECT_TYPE, getFullPath } from '../common/constants';
 import { MapsXPackConfig } from '../config';
 import { setStartServices } from './kibana_server_services';
 import { emsBoundariesSpecProvider } from './tutorials/ems';
 import { initRoutes } from './routes';
-import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
-import type { EMSSettings } from '../../../../src/plugins/maps_ems/server';
 import { setupEmbeddable } from './embeddable';
 import { setupSavedObjects } from './saved_objects';
 import { registerIntegrations } from './register_integrations';
@@ -70,7 +70,7 @@ export class MapsPlugin implements Plugin {
       dashboardId: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
       oldEmbeddableId: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
       embeddableId: '2c9c1f60-1909-11e9-919b-ffe5949a18d2',
-      // @ts-ignore
+      // @ts-expect-error
       embeddableType: MAP_SAVED_OBJECT_TYPE,
       embeddableConfig: {
         isLayerTOCOpen: false,
@@ -99,7 +99,7 @@ export class MapsPlugin implements Plugin {
       dashboardId: '7adfa750-4c81-11e8-b3d7-01146121b73d',
       oldEmbeddableId: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
       embeddableId: '5dd88580-1906-11e9-919b-ffe5949a18d2',
-      // @ts-ignore
+      // @ts-expect-error
       embeddableType: MAP_SAVED_OBJECT_TYPE,
       embeddableConfig: {
         isLayerTOCOpen: true,
@@ -126,7 +126,7 @@ export class MapsPlugin implements Plugin {
       dashboardId: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
       oldEmbeddableId: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
       embeddableId: 'de71f4f0-1902-11e9-919b-ffe5949a18d2',
-      // @ts-ignore
+      // @ts-expect-error
       embeddableType: MAP_SAVED_OBJECT_TYPE,
       embeddableConfig: {
         isLayerTOCOpen: false,
diff --git a/x-pack/plugins/maps/server/register_integrations.ts b/x-pack/plugins/maps/server/register_integrations.ts
index 3740ae6242790..63543cb413b87 100644
--- a/x-pack/plugins/maps/server/register_integrations.ts
+++ b/x-pack/plugins/maps/server/register_integrations.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'kibana/server';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import { CoreSetup } from '@kbn/core/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { APP_ID, OPEN_LAYER_WIZARD, getFullPath, WIZARD_ID } from '../common/constants';
 
 export function registerIntegrations(
diff --git a/x-pack/plugins/maps/server/routes.ts b/x-pack/plugins/maps/server/routes.ts
index 21720afdc7edc..427f403927d5d 100644
--- a/x-pack/plugins/maps/server/routes.ts
+++ b/x-pack/plugins/maps/server/routes.ts
@@ -8,13 +8,13 @@
 import { schema } from '@kbn/config-schema';
 import fs from 'fs';
 import path from 'path';
-import { CoreSetup, CoreStart, IRouter, Logger } from 'kibana/server';
+import { CoreSetup, CoreStart, IRouter, Logger } from '@kbn/core/server';
+import { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 import { INDEX_SETTINGS_API_PATH, FONTS_API_PATH } from '../common/constants';
 import { getIndexPatternSettings } from './lib/get_index_pattern_settings';
 import { initMVTRoutes } from './mvt/mvt_routes';
 import { initIndexingRoutes } from './data_indexing/indexing_routes';
 import { StartDeps } from './types';
-import { DataRequestHandlerContext } from '../../../../src/plugins/data/server';
 
 export async function initRoutes(coreSetup: CoreSetup, logger: Logger): Promise<void> {
   const router: IRouter<DataRequestHandlerContext> = coreSetup.http.createRouter();
@@ -73,7 +73,8 @@ export async function initRoutes(coreSetup: CoreSetup, logger: Logger): Promise<
       }
 
       try {
-        const resp = await context.core.elasticsearch.client.asCurrentUser.indices.getSettings({
+        const coreContext = await context.core;
+        const resp = await coreContext.elasticsearch.client.asCurrentUser.indices.getSettings({
           index: query.indexPatternTitle,
         });
         const indexPatternSettings = getIndexPatternSettings(
diff --git a/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts b/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts
index f8cd06cf60bfc..e63e214e2572d 100644
--- a/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts
+++ b/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { extractReferences } from '../../common/migrations/references';
 // @ts-expect-error
 import { emsRasterTileToEmsVectorTile } from '../../common/migrations/ems_raster_tile_to_ems_vector_tile';
diff --git a/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts b/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts
index d5c0c0fa6dcf3..7bc209b4b1a9f 100644
--- a/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts
+++ b/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts
@@ -6,10 +6,10 @@
  */
 
 import { mapValues } from 'lodash';
-import type { CoreSetup, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import type { SavedObjectMigrationMap } from 'src/core/server';
-import { MigrateFunctionsObject } from '../../../../../src/plugins/kibana_utils/common';
-import { mergeSavedObjectMigrationMaps } from '../../../../../src/core/server';
+import type { CoreSetup, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import type { SavedObjectMigrationMap } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
 import { APP_ICON, getFullPath } from '../../common/constants';
 import { migrateDataPersistedState } from '../../common/migrations/migrate_data_persisted_state';
 import type { MapSavedObjectAttributes } from '../../common/map_saved_object_type';
diff --git a/x-pack/plugins/maps/server/tutorials/ems/index.ts b/x-pack/plugins/maps/server/tutorials/ems/index.ts
index 2285371444fc7..a180d37698085 100644
--- a/x-pack/plugins/maps/server/tutorials/ems/index.ts
+++ b/x-pack/plugins/maps/server/tutorials/ems/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { TutorialsCategory } from '../../../../../../src/plugins/home/server';
+import { TutorialsCategory } from '@kbn/home-plugin/server';
 import { getNewMapPath, APP_ID } from '../../../common/constants';
 
 export function emsBoundariesSpecProvider({
diff --git a/x-pack/plugins/maps/server/types.ts b/x-pack/plugins/maps/server/types.ts
index 597b826eee56d..912e9edb72e7d 100644
--- a/x-pack/plugins/maps/server/types.ts
+++ b/x-pack/plugins/maps/server/types.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { MapsEmsPluginServerSetup } from '../../../../src/plugins/maps_ems/server';
-import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { MapsEmsPluginServerSetup } from '@kbn/maps-ems-plugin/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+} from '@kbn/data-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 
 export interface SetupDeps {
   data: DataPluginSetup;
diff --git a/x-pack/plugins/apm/ftr_e2e/services.ts b/x-pack/plugins/ml/common/constants/cloud.ts
similarity index 83%
rename from x-pack/plugins/apm/ftr_e2e/services.ts
rename to x-pack/plugins/ml/common/constants/cloud.ts
index 5e063134081ad..0fc6c0234c467 100644
--- a/x-pack/plugins/apm/ftr_e2e/services.ts
+++ b/x-pack/plugins/ml/common/constants/cloud.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from '../../../test/common/services';
+export const TRIAL_MAX_RAM_FOR_ML_NODES = '2GB';
diff --git a/x-pack/plugins/ml/common/constants/messages.test.ts b/x-pack/plugins/ml/common/constants/messages.test.ts
index e77de53b5cb70..b0df17111bc0d 100644
--- a/x-pack/plugins/ml/common/constants/messages.test.ts
+++ b/x-pack/plugins/ml/common/constants/messages.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { docLinksServiceMock } from 'src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 import { parseMessages } from './messages';
 
diff --git a/x-pack/plugins/ml/common/constants/messages.ts b/x-pack/plugins/ml/common/constants/messages.ts
index fd3b9aa9d19b9..b372f172d5e13 100644
--- a/x-pack/plugins/ml/common/constants/messages.ts
+++ b/x-pack/plugins/ml/common/constants/messages.ts
@@ -8,7 +8,7 @@
 import { once } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 import { JOB_ID_MAX_LENGTH, VALIDATION_STATUS } from './validation';
 
diff --git a/x-pack/plugins/ml/common/license/ml_license.ts b/x-pack/plugins/ml/common/license/ml_license.ts
index e2e50f390fc58..a698b8801ef69 100644
--- a/x-pack/plugins/ml/common/license/ml_license.ts
+++ b/x-pack/plugins/ml/common/license/ml_license.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subscription } from 'rxjs';
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { PLUGIN_ID } from '../constants/app';
 
 export const MINIMUM_LICENSE = 'basic';
diff --git a/x-pack/plugins/ml/common/types/alerts.ts b/x-pack/plugins/ml/common/types/alerts.ts
index 8d5c6831c1ccf..0a6e7813db347 100644
--- a/x-pack/plugins/ml/common/types/alerts.ts
+++ b/x-pack/plugins/ml/common/types/alerts.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { RuleTypeParams, Rule } from '@kbn/alerting-plugin/common';
 import { AnomalyResultType } from './anomalies';
 import { ANOMALY_RESULT_TYPE } from '../constants/anomalies';
-import type { RuleTypeParams, Rule } from '../../../alerting/common';
 
 export type PreviewResultsKeys = 'record_results' | 'bucket_results' | 'influencer_results';
 export type TopHitsResultsKeys = 'top_record_hits' | 'top_bucket_hits' | 'top_influencer_hits';
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts
index 62ed241a733ea..eb7d5ae9bc0b3 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts
@@ -6,7 +6,7 @@
  */
 
 // @ts-ignore importing JSON file
-import jobConfigFarequote from '../__mocks__/job_config_farequote';
+import jobConfigFarequote from '../__mocks__/job_config_farequote.json';
 import { isCombinedJobWithStats } from './combined_job';
 
 describe('Types: Jobs', () => {
diff --git a/x-pack/plugins/ml/common/types/capabilities.ts b/x-pack/plugins/ml/common/types/capabilities.ts
index 8ea74e4a64673..9ea5c510deaf9 100644
--- a/x-pack/plugins/ml/common/types/capabilities.ts
+++ b/x-pack/plugins/ml/common/types/capabilities.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { PLUGIN_ID } from '../constants/app';
 import {
   ML_JOB_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ml/common/types/fields.ts b/x-pack/plugins/ml/common/types/fields.ts
index bf7876570f485..b63efd4a6a891 100644
--- a/x-pack/plugins/ml/common/types/fields.ts
+++ b/x-pack/plugins/ml/common/types/fields.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 import {
   ML_JOB_AGGREGATION,
   KIBANA_AGGREGATION,
diff --git a/x-pack/plugins/ml/common/types/kibana.ts b/x-pack/plugins/ml/common/types/kibana.ts
index cc7b68b40149f..53325224fce93 100644
--- a/x-pack/plugins/ml/common/types/kibana.ts
+++ b/x-pack/plugins/ml/common/types/kibana.ts
@@ -7,8 +7,8 @@
 
 // custom edits or fixes for default kibana types which are incomplete
 
-import type { SimpleSavedObject } from 'kibana/public';
-import type { FieldFormatsRegistry } from '../../../../../src/plugins/field_formats/common';
+import type { SimpleSavedObject } from '@kbn/core/public';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 
 export type IndexPatternTitle = string;
 
diff --git a/x-pack/plugins/ml/common/types/locator.ts b/x-pack/plugins/ml/common/types/locator.ts
index 56cf3a112f537..933862085b3c6 100644
--- a/x-pack/plugins/ml/common/types/locator.ts
+++ b/x-pack/plugins/ml/common/types/locator.ts
@@ -7,8 +7,8 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { LocatorPublic } from 'src/plugins/share/public';
-import type { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query';
+import type { LocatorPublic } from '@kbn/share-plugin/public';
+import type { RefreshInterval, TimeRange } from '@kbn/data-plugin/common/query';
 import type { JobId } from './anomaly_detection_jobs/job';
 import type { DataFrameAnalysisConfigType } from './data_frame_analytics';
 import type { SearchQueryLanguage } from '../constants/search';
diff --git a/x-pack/plugins/ml/common/types/modules.ts b/x-pack/plugins/ml/common/types/modules.ts
index 617000d017025..6b6fc72c091c2 100644
--- a/x-pack/plugins/ml/common/types/modules.ts
+++ b/x-pack/plugins/ml/common/types/modules.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import { Datafeed, Job } from './anomaly_detection_jobs';
 import { ErrorType } from '../util/errors';
 
diff --git a/x-pack/plugins/ml/common/types/storage.ts b/x-pack/plugins/ml/common/types/storage.ts
index 22374a5533fab..d1708ae17776b 100644
--- a/x-pack/plugins/ml/common/types/storage.ts
+++ b/x-pack/plugins/ml/common/types/storage.ts
@@ -15,6 +15,8 @@ export const ML_GETTING_STARTED_CALLOUT_DISMISSED = 'ml.gettingStarted.isDismiss
 
 export const ML_FROZEN_TIER_PREFERENCE = 'ml.frozenDataTierPreference';
 
+export const ML_ANOMALY_EXPLORER_PANELS = 'ml.anomalyExplorerPanels';
+
 export type PartitionFieldConfig =
   | {
       /**
@@ -42,11 +44,22 @@ export type PartitionFieldsConfig =
 
 export type ApplyTimeRangeConfig = boolean | undefined;
 
+export interface PanelState {
+  size: number;
+  isCollapsed: boolean;
+}
+
+export interface AnomalyExplorerPanelsState {
+  topInfluencers: PanelState;
+  mainPage: { size: number };
+}
+
 export type MlStorage = Partial<{
   [ML_ENTITY_FIELDS_CONFIG]: PartitionFieldsConfig;
   [ML_APPLY_TIME_RANGE_CONFIG]: ApplyTimeRangeConfig;
   [ML_GETTING_STARTED_CALLOUT_DISMISSED]: boolean | undefined;
   [ML_FROZEN_TIER_PREFERENCE]: 'exclude_frozen' | 'include_frozen';
+  [ML_ANOMALY_EXPLORER_PANELS]: AnomalyExplorerPanelsState | undefined;
 }> | null;
 
 export type MlStorageKey = keyof Exclude<MlStorage, null>;
diff --git a/x-pack/plugins/ml/common/util/date_utils.ts b/x-pack/plugins/ml/common/util/date_utils.ts
index c668eda03a7be..c5f5fdaabf388 100644
--- a/x-pack/plugins/ml/common/util/date_utils.ts
+++ b/x-pack/plugins/ml/common/util/date_utils.ts
@@ -9,7 +9,7 @@
 
 import dateMath from '@kbn/datemath';
 import { formatDate } from '@elastic/eui';
-import { TimeRange } from '../../../../../src/plugins/data/common';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { TIME_FORMAT } from '../constants/time_format';
 
 export function formatHumanReadableDate(ts: number) {
diff --git a/x-pack/plugins/ml/common/util/errors/errors.test.ts b/x-pack/plugins/ml/common/util/errors/errors.test.ts
index 1a933be2243d1..625374857c7ce 100644
--- a/x-pack/plugins/ml/common/util/errors/errors.test.ts
+++ b/x-pack/plugins/ml/common/util/errors/errors.test.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import { extractErrorMessage, MLHttpFetchError, MLResponseError, EsErrorBody } from './index';
+import { extractErrorMessage, MLHttpFetchError, MLResponseError, EsErrorBody } from '.';
 
 describe('ML - error message utils', () => {
   describe('extractErrorMessage', () => {
diff --git a/x-pack/plugins/ml/common/util/errors/types.ts b/x-pack/plugins/ml/common/util/errors/types.ts
index 23d46ad4a8589..d1f0d3216f42e 100644
--- a/x-pack/plugins/ml/common/util/errors/types.ts
+++ b/x-pack/plugins/ml/common/util/errors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import Boom from '@hapi/boom';
 
 export interface EsErrorRootCause {
diff --git a/x-pack/plugins/ml/common/util/fields_utils.ts b/x-pack/plugins/ml/common/util/fields_utils.ts
index 98b0fcd6efd80..9f605899ccd7c 100644
--- a/x-pack/plugins/ml/common/util/fields_utils.ts
+++ b/x-pack/plugins/ml/common/util/fields_utils.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 import {
   Field,
   Aggregation,
@@ -13,7 +14,6 @@ import {
   RollupFields,
   EVENT_RATE_FIELD_ID,
 } from '../types/fields';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/common';
 import { ML_JOB_AGGREGATION } from '../constants/aggregation_types';
 
 // cross reference fields and aggs.
diff --git a/x-pack/plugins/ml/common/util/runtime_field_utils.ts b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
index a9ec27c7b1577..6b2cb78d73274 100644
--- a/x-pack/plugins/ml/common/util/runtime_field_utils.ts
+++ b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from './object_utils';
-import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
 
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index ffba908dcfe89..eb00ca117f01a 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -19,7 +19,8 @@
     "share",
     "taskManager",
     "triggersActionsUi",
-    "uiActions"
+    "uiActions",
+    "unifiedSearch"
   ],
   "optionalPlugins": [
     "alerting",
@@ -40,7 +41,6 @@
     "dashboard",
     "esUiShared",
     "fieldFormats",
-    "home",
     "kibanaReact",
     "kibanaUtils",
     "maps",
diff --git a/x-pack/plugins/ml/public/__mocks__/core_start.ts b/x-pack/plugins/ml/public/__mocks__/core_start.ts
index 1fd988c887dda..df48a2d6197eb 100644
--- a/x-pack/plugins/ml/public/__mocks__/core_start.ts
+++ b/x-pack/plugins/ml/public/__mocks__/core_start.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from '../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createMlStartDepsMock } from './ml_start_deps';
 
 export const createCoreStartMock = () =>
diff --git a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
index 42cbb4bf3485b..45bfacc2e458f 100644
--- a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
+++ b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { sharePluginMock } from '../../../../../src/plugins/share/public/mocks';
-import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
-import { triggersActionsUiMock } from '../../../triggers_actions_ui/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 
 export const createMlStartDepsMock = () => ({
   data: dataPluginMock.createStartContract(),
diff --git a/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx b/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx
index cadd471a1afab..dcbf580461e0f 100644
--- a/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx
+++ b/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx
@@ -10,7 +10,7 @@ import { EuiComboBoxOptionOption, EuiForm, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useDebounce from 'react-use/lib/useDebounce';
-import { RuleTypeParamsExpressionProps } from '../../../../triggers_actions_ui/public';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../../common/types/alerts';
 import { JobSelectorControl } from '../job_selector';
 import { jobsApiProvider } from '../../application/services/ml_api_service/jobs';
diff --git a/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts b/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts
index 006e765edd07c..b0321604aab19 100644
--- a/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts
+++ b/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts
@@ -7,8 +7,8 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../../triggers_actions_ui/public';
-import { PluginSetupContract as AlertingSetup } from '../../../../alerting/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../../common/types/alerts';
 import { getResultJobsHealthRuleConfig } from '../../../common/util/alerts';
diff --git a/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx b/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
index d06cbbc02f6ed..52707437d3bf9 100644
--- a/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
+++ b/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
@@ -8,7 +8,7 @@
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 
-import { Rule } from '../../../triggers_actions_ui/public';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { JobId } from '../../common/types/anomaly_detection_jobs';
 import { useMlKibana } from '../application/contexts/kibana';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
diff --git a/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx b/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
index 609baf17a4c58..f025a2d4bd86d 100644
--- a/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
+++ b/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
@@ -9,6 +9,7 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { EuiSpacer, EuiForm } from '@elastic/eui';
 import useMount from 'react-use/lib/useMount';
 import { i18n } from '@kbn/i18n';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { JobSelectorControl } from './job_selector';
 import { useMlKibana } from '../application/contexts/kibana';
 import { jobsApiProvider } from '../application/services/ml_api_service/jobs';
@@ -29,7 +30,6 @@ import { CombinedJobWithStats } from '../../common/types/anomaly_detection_jobs'
 import { AdvancedSettings } from './advanced_settings';
 import { getLookbackInterval, getTopNBuckets } from '../../common/util/alerts';
 import { isDefined } from '../../common/types/guards';
-import { RuleTypeParamsExpressionProps } from '../../../triggers_actions_ui/public';
 import { parseInterval } from '../../common/util/parse_interval';
 import { BetaBadge } from './beta_badge';
 
diff --git a/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts b/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts
index 82925bd1c3175..b3a4c5420ca46 100644
--- a/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts
+++ b/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts
@@ -7,10 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import { lazy } from 'react';
+import type { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
 import type { MlAnomalyDetectionAlertParams } from '../../common/types/alerts';
-import type { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
-import type { PluginSetupContract as AlertingSetup } from '../../../alerting/public';
 import { PLUGIN_ID } from '../../common/constants/app';
 import { formatExplorerUrl } from '../locator/formatters/anomaly_detection';
 import { validateLookbackInterval, validateTopNBucket } from './validators';
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index 2b00d53e35e54..833a4fade128b 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -9,15 +9,12 @@ import React, { FC } from 'react';
 import './_index.scss';
 import ReactDOM from 'react-dom';
 
-import { AppMountParameters, CoreStart, HttpStart } from 'kibana/public';
+import { AppMountParameters, CoreStart, HttpStart } from '@kbn/core/public';
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { setDependencyCache, clearCache } from './util/dependency_cache';
 import { setLicenseCache } from './license';
 import type { MlSetupDependencies, MlStartDependencies } from '../plugin';
@@ -122,7 +119,7 @@ export const renderApp = (
   setDependencyCache({
     timefilter: deps.data.query.timefilter,
     fieldFormats: deps.fieldFormats,
-    autocomplete: deps.data.autocomplete,
+    autocomplete: deps.unifiedSearch.autocomplete,
     config: coreStart.uiSettings!,
     chrome: coreStart.chrome!,
     docLinks: coreStart.docLinks!,
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx b/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx
index bb9fa3a8ec4d6..8c4b35d300576 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx
@@ -11,7 +11,7 @@ import moment from 'moment-timezone';
 import React from 'react';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 
-import { AnnotationDescriptionList } from './index';
+import { AnnotationDescriptionList } from '.';
 
 describe('AnnotationDescriptionList', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
index 9184ac4b10128..440592c817c98 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
@@ -14,7 +14,7 @@ import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { Annotation } from '../../../../../common/types/annotations';
 import { AnnotationUpdatesService } from '../../../services/annotations_service';
 
-import { AnnotationFlyout } from './index';
+import { AnnotationFlyout } from '.';
 import { MlAnnotationUpdatesContext } from '../../../contexts/ml/ml_annotation_updates_context';
 
 jest.mock('../../../util/dependency_cache', () => ({
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js
index e580aabdf9fc6..f91d6594c1b33 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js
@@ -46,7 +46,7 @@ import {
   ANNOTATION_EVENT_USER,
   ANNOTATION_EVENT_DELAYED_DATA,
 } from '../../../../../common/constants/annotations';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { ML_APP_LOCATOR, ML_PAGES } from '../../../../../common/constants/locator';
 import { timeFormatter } from '../../../../../common/util/date_utils';
 import { MlAnnotationUpdatesContext } from '../../../contexts/ml/ml_annotation_updates_context';
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js
index 1681d151cd31f..2a567231d3aca 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import jobConfig from '../../../../../common/types/__mocks__/job_config_farequote';
+import jobConfig from '../../../../../common/types/__mocks__/job_config_farequote.json';
 import mockAnnotations from './__mocks__/mock_annotations.json';
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
diff --git a/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx b/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx
index 9224f28071c2f..dc8305f3c240b 100644
--- a/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx
@@ -12,13 +12,13 @@ import { createBrowserHistory } from 'history';
 
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { AnomalyResultsViewSelector } from './index';
+import { AnomalyResultsViewSelector } from '.';
 
 jest.mock('../../contexts/kibana', () => {
   return {
     useMlLocator: () =>
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      require('../../../../../../../src/plugins/share/public/mocks').sharePluginMock.createLocator(),
+      require('@kbn/share-plugin/public/mocks').sharePluginMock.createLocator(),
     useNavigateToPath: () => jest.fn(),
   };
 });
diff --git a/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts b/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts
index 337a49ada6f31..97bdbb7e75f91 100644
--- a/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts
+++ b/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts
@@ -6,9 +6,9 @@
  */
 
 import { useMemo } from 'react';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { useUiSettings } from '../../contexts/kibana';
 import { TimeBuckets } from '../../util/time_buckets';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
 
 export const useTimeBuckets = () => {
   const uiSettings = useUiSettings();
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/common.ts b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
index 1a35e8fa34308..4de8caa978e6f 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/common.ts
+++ b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
@@ -13,11 +13,11 @@ import { EuiDataGridCellValueElementProps, EuiDataGridStyle } from '@elastic/eui
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
-import type { DataView, DataViewField } from '../../../../../../../src/plugins/data_views/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
 
 import { DEFAULT_RESULTS_FIELD } from '../../../../common/constants/data_frame_analytics';
 import { extractErrorMessage } from '../../../../common/util/errors';
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
index b6abf321c7c6e..82ae725038387 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
@@ -26,7 +26,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../common/constants/field_histograms';
 
 import { ANALYSIS_CONFIG_TYPE, INDEX_STATUS } from '../../data_frame_analytics/common';
@@ -169,6 +169,8 @@ export const DataGrid: FC<Props> = memo(
             );
           } else if (schema === 'featureInfluence') {
             return <EuiCodeBlock isCopyable={true}>{cellContentsElement.textContent}</EuiCodeBlock>;
+          } else {
+            return <DefaultCellPopover {...popoverProps} />;
           }
         } else {
           return <DefaultCellPopover {...popoverProps} />;
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx
index 631c214dd751c..d3c848fd5cb1e 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx
@@ -10,7 +10,7 @@ import { render } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import '@testing-library/jest-dom/extend-expect';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx
index 4764a1674df2f..c81d6516184d9 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx
@@ -15,7 +15,7 @@ import { euiPaletteColorBlind, EuiDataGridColumn } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
index fb9648f5ef4af..a2ce2dcea2273 100644
--- a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
+++ b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
@@ -6,8 +6,8 @@
  */
 
 import { FC } from 'react';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 declare const DataRecognizer: FC<{
   indexPattern: DataView;
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
index ea444193db0b1..5e4d87901c979 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { FullTimeRangeSelector } from './index';
-import type { Query } from 'src/plugins/data/public';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import { FullTimeRangeSelector } from '.';
+import type { Query } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/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/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
index 44f6fc5e604cb..a3ed913a714b3 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { i18n } from '@kbn/i18n';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { setFullTimeRange } from './full_time_range_selector_service';
 import { useStorage } from '../../contexts/ml/use_storage';
 import { ML_FROZEN_TIER_PREFERENCE } from '../../../../common/types/storage';
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
index b4fecef196ef0..c83836164221d 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -10,9 +10,9 @@ import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import dateMath from '@kbn/datemath';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getTimefilter, getToastNotifications } from '../../util/dependency_cache';
 import { ml, GetTimeFieldRangeResponse } from '../../services/ml_api_service';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { isPopulatedObject } from '../../../../common/util/object_utils';
 import type { RuntimeMappings } from '../../../../common/types/fields';
 import { addExcludeFrozenToQuery } from '../../../../common/util/query_utils';
diff --git a/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx b/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx
index 4510ddf487d27..858fb0c63a4dd 100644
--- a/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx
+++ b/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx
@@ -7,10 +7,7 @@
 
 import React, { FC, ReactNode, useContext, useEffect, useMemo } from 'react';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
-import {
-  KibanaContextProvider,
-  toMountPoint,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { useMlKibana } from '../../contexts/kibana';
 import { MlPageControlsContext } from '../ml_page';
 
diff --git a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
index f09c20eda0389..51dfe193f7ab0 100644
--- a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
@@ -21,7 +21,7 @@ import './_index.scss';
 import { Dictionary } from '../../../../common/types/common';
 import { useUrlState } from '../../util/url_state';
 // @ts-ignore
-import { IdBadges } from './id_badges/index';
+import { IdBadges } from './id_badges';
 import {
   BADGE_LIMIT,
   JobSelectorFlyoutContent,
diff --git a/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx b/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
index 697885304ea18..866878d477e89 100644
--- a/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
+++ b/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
@@ -10,7 +10,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { EuiCallOut, EuiSpacer, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { JOB_STATE } from '../../../../../common/constants/states';
 import { mlApiServicesProvider } from '../../../services/ml_api_service';
 import { HttpService } from '../../../services/http_service';
diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
index 02c295e42f225..8d399e9234639 100644
--- a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
@@ -8,24 +8,20 @@
 import React, { useEffect, useRef, useState } from 'react';
 
 import { htmlIdGenerator } from '@elastic/eui';
-import {
-  INITIAL_LOCATION,
-  LayerDescriptor,
-  MAP_SAVED_OBJECT_TYPE,
-} from '../../../../../maps/common';
+import { INITIAL_LOCATION, LayerDescriptor, MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/common';
 import type {
   MapEmbeddable,
   MapEmbeddableInput,
   MapEmbeddableOutput,
   RenderTooltipContentParams,
-} from '../../../../../maps/public';
+} from '@kbn/maps-plugin/public';
 
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   isErrorEmbeddable,
   ViewMode,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { useMlKibana } from '../../contexts/kibana';
 
 export function MlEmbeddedMapComponent({
diff --git a/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx b/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
index 328dee63365d4..301939fb6fdbc 100644
--- a/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
@@ -9,7 +9,8 @@ import React, { createContext, FC, useCallback, useMemo, useReducer } from 'reac
 import { EuiLoadingContent, EuiPageContentBody } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Route } from 'react-router-dom';
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import { KibanaPageTemplate, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { useSideNavItems } from './side_nav';
 import * as routes from '../../routing/routes';
 import { MlPageWrapper } from '../../routing/ml_page_wrapper';
@@ -17,10 +18,6 @@ import { useMlKibana, useNavigateToPath } from '../../contexts/kibana';
 import { MlRoute, PageDependencies } from '../../routing/router';
 import { DatePickerWrapper } from '../navigation_menu/date_picker_wrapper';
 import { useActiveRoute } from '../../routing/use_active_route';
-import {
-  KibanaPageTemplate,
-  RedirectAppLinks,
-} from '../../../../../../../src/plugins/kibana_react/public';
 import { useDocTitle } from '../../routing/use_doc_title';
 
 export const MlPageControlsContext = createContext<{
diff --git a/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx b/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx
index 20f487da0002e..1d795398d7d71 100644
--- a/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx
@@ -9,12 +9,12 @@ import React, { FC, useCallback, useState } from 'react';
 
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { SpacesPluginStart, ShareToSpaceFlyoutProps } from '@kbn/spaces-plugin/public';
 import {
   ML_JOB_SAVED_OBJECT_TYPE,
   SavedObjectResult,
   MlSavedObjectType,
 } from '../../../../common/types/saved_objects';
-import type { SpacesPluginStart, ShareToSpaceFlyoutProps } from '../../../../../spaces/public';
 import { useMlApiContext } from '../../contexts/kibana';
 import { useToastNotificationService } from '../../services/toast_notification_service';
 
diff --git a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx
index cd2239c4c8f4f..69e1bfe8a062a 100644
--- a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx
+++ b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx
@@ -23,7 +23,7 @@ import {
 
 import { EventRateChart } from '../../../jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart';
 import { Anomaly } from '../../../jobs/new_job/common/results_loader/results_loader';
-import { useCurrentEuiTheme } from '../../../components/color_range_legend';
+import { useCurrentEuiTheme } from '../../color_range_legend';
 import { LineChartPoint } from '../../../jobs/new_job/common/chart_loader/chart_loader';
 
 export interface CalendarEvent {
diff --git a/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx
index 45ba8f5aa4e0f..6f87de917a0cb 100644
--- a/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx
+++ b/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx
@@ -19,9 +19,10 @@ import {
   OnRefreshProps,
   OnTimeChangeProps,
 } from '@elastic/eui';
-import { TimeHistoryContract, TimeRange } from 'src/plugins/data/public';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
+import { TimeHistoryContract, TimeRange } from '@kbn/data-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
+import { wrapWithTheme, toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { mlTimefilterRefresh$ } from '../../../services/timefilter_refresh_service';
 import { useUrlState } from '../../../util/url_state';
 import { useMlKibana } from '../../../contexts/kibana';
@@ -30,10 +31,6 @@ import {
   useTimeRangeUpdates,
 } from '../../../contexts/kibana/use_timefilter';
 import { useToastNotificationService } from '../../../services/toast_notification_service';
-import {
-  wrapWithTheme,
-  toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
 
 interface TimePickerQuickRange {
   from: string;
diff --git a/x-pack/plugins/ml/public/application/components/node_available_warning/node_available_warning.tsx b/x-pack/plugins/ml/public/application/components/node_available_warning/node_available_warning.tsx
index 3ebe6e15dc2e0..5aa3d8aad83c5 100644
--- a/x-pack/plugins/ml/public/application/components/node_available_warning/node_available_warning.tsx
+++ b/x-pack/plugins/ml/public/application/components/node_available_warning/node_available_warning.tsx
@@ -11,6 +11,7 @@ import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { mlNodesAvailable, permissionToViewMlNodeCount } from '../../ml_nodes_check';
 import { getCloudDeploymentId, isCloud } from '../../services/ml_server_info';
+import { TRIAL_MAX_RAM_FOR_ML_NODES } from '../../../../common/constants/cloud';
 
 export const NodeAvailableWarning: FC = () => {
   if (mlNodesAvailable() === true || permissionToViewMlNodeCount() === false) {
@@ -46,7 +47,7 @@ export const NodeAvailableWarning: FC = () => {
           <div>
             <FormattedMessage
               id="xpack.ml.jobsList.nodeAvailableWarning.linkToCloudDescription"
-              defaultMessage="Please edit your {link}. You may enable a free 1GB machine learning node or expand your existing ML configuration."
+              defaultMessage="Please edit your {link}. You may enable a free {maxRamForMLNodes} machine learning node or expand your existing ML configuration."
               values={{
                 link: (
                   <EuiLink href={`https://cloud.elastic.co/deployments?q=${id}`}>
@@ -56,6 +57,7 @@ export const NodeAvailableWarning: FC = () => {
                     />
                   </EuiLink>
                 ),
+                maxRamForMLNodes: TRIAL_MAX_RAM_FOR_ML_NODES,
               }}
             />
           </div>
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
index 2fbf69c67f26a..087a23b2fce90 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
index 69a71dda38cb4..07e6282451b2b 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
index 5e22b4339a3a9..ed5be09e03b42 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
@@ -51,7 +51,7 @@ import {
   CONDITIONS_NOT_SUPPORTED_FUNCTIONS,
 } from '../../../../common/constants/detector_rule';
 import { getPartitioningFieldNames } from '../../../../common/util/job_utils';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { mlJobService } from '../../services/job_service';
 import { ml } from '../../services/ml_api_service';
 import { extractErrorMessage } from '../../../../common/util/errors';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
index 2553baa11da33..290d815271dcc 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
@@ -50,7 +50,7 @@ jest.mock('../../capabilities/check_capabilities', () => ({
   checkPermission: () => true,
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
index c030dcfa1f0a4..68ce65ea2c847 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
index 86a777f65a338..145f3d5d53256 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 // Create a mock for the canGetFilters privilege check.
 // The mock is hoisted to the top, so need to prefix the mock function
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
index 9ae947c404c2e..d8f8f4d5d8f51 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-jest.mock('../../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
index 7df277ae0b6ab..6f019d973cc8d 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-jest.mock('../../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../../services/job_service', () => 'mlJobService');
 
 // Mock the call for loading a filter.
 // The mock is hoisted to the top, so need to prefix the filter variable
diff --git a/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx b/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
index 9e5123fa275f2..47d94c03e9ccb 100644
--- a/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
+++ b/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
@@ -10,7 +10,7 @@ import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { MlSavedObjectType } from '../../../../common/types/saved_objects';
 import { useMlApiContext } from '../../contexts/kibana';
-import { JobSpacesSyncFlyout } from '../../components/job_spaces_sync';
+import { JobSpacesSyncFlyout } from '../job_spaces_sync';
 import { checkPermission } from '../../capabilities/check_capabilities';
 
 interface Props {
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
index ecaf3515e1634..b93ba79830f98 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
@@ -24,13 +24,13 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { extractErrorMessage } from '../../../../common';
 import { isRuntimeMappings } from '../../../../common/util/runtime_field_utils';
 import { stringHash } from '../../../../common/util/string_utils';
 import { RuntimeMappings } from '../../../../common/types/fields';
 import type { ResultsSearchQuery } from '../../data_frame_analytics/common/analytics';
-import { getCombinedRuntimeMappings } from '../../components/data_grid';
+import { getCombinedRuntimeMappings } from '../data_grid';
 
 import { useMlApiContext } from '../../contexts/kibana';
 
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
index 543ab0a0c0982..fe1a649cdeb06 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { ML__INCREMENTAL_ID } from '../../data_frame_analytics/common/fields';
 
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
index f3431f6052069..af1fb980448be 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
+++ b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
@@ -33,7 +33,7 @@ import { VALIDATION_STATUS } from '../../../../common/constants/validation';
 import { Callout, statusToEuiIconType } from '../callout';
 import { getMostSevereMessageStatus } from '../../../../common/util/validation_utils';
 import { toastNotificationServiceProvider } from '../../services/toast_notification_service';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 const defaultIconType = 'questionInCircle';
 const getDefaultState = () => ({
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
index b1755660960ad..497e7124623f0 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
+++ b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
@@ -20,7 +20,7 @@ jest.mock('../../util/dependency_cache', () => ({
   }),
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts
index 33694824a5514..fb9b48f218b7c 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { BehaviorSubject } from 'rxjs';
 
 export const chartsServiceMock = {
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts
index d384e17b2e8fc..b53137aec1838 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { TimefilterContract } from '../../../../../../../../src/plugins/data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 
 export const timefilterMock = dataPluginMock.createStartContract().query.timefilter
   .timefilter as jest.Mocked<TimefilterContract>;
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 0d00095b7f7c5..bfb27e6d4dbbc 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -5,26 +5,23 @@
  * 2.0.
  */
 
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { CoreStart } from 'kibana/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import {
-  useKibana,
-  KibanaReactContextValue,
-} from '../../../../../../../src/plugins/kibana_react/public';
-import type { SecurityPluginSetup } from '../../../../../security/public';
-import type { LicenseManagementUIPluginSetup } from '../../../../../license_management/public';
-import type { SharePluginStart } from '../../../../../../../src/plugins/share/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { useKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { LicenseManagementUIPluginSetup } from '@kbn/license-management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { DataVisualizerPluginStart } from '@kbn/data-visualizer-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
+import type { DashboardSetup } from '@kbn/dashboard-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import type { MlServicesContext } from '../../app';
-import type { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
-import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public';
-import type { MapsStartApi } from '../../../../../maps/public';
-import type { DataVisualizerPluginStart } from '../../../../../data_visualizer/public';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public';
-import type { FieldFormatsRegistry } from '../../../../../../../src/plugins/field_formats/common';
-import type { DashboardSetup } from '../../../../../../../src/plugins/dashboard/public';
-import type { SpacesPluginStart } from '../../../../../spaces/public';
-import type { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
 
 interface StartPlugins {
   data: DataPublicPluginStart;
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts b/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
index c8810545a57d5..2f0165fffd293 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
@@ -6,11 +6,11 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
+import { LocatorGetUrlParams } from '@kbn/share-plugin/common/url_service';
 import { useMlKibana } from './kibana_context';
 import { ML_APP_LOCATOR } from '../../../../common/constants/locator';
 import { MlLocatorParams } from '../../../../common/types/locator';
 import { useUrlState } from '../../util/url_state';
-import { LocatorGetUrlParams } from '../../../../../../../src/plugins/share/common/url_service';
 
 export const useMlLocator = () => {
   const {
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts b/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts
index d089a43b3fb39..113d77d7b16da 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { useMlKibana } from './kibana_context';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 /**
  * Set of reasonable defaults for formatters for the ML app.
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
index 0d3c0993c880b..fadf9a6830266 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export const dataViewMock = {
   id: 'the-index-pattern-id',
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
index 61a466b6496ef..46308a9d19cd5 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataViewsContract } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export const dataViewsContractMock = new (class {
   fieldFormats = [];
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
index d707f56b10a34..2a8806bf3ff38 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
 import { MlServicesContext } from '../../app';
 
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx b/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx
index bc8057938701a..103e8c594d1f7 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx
@@ -7,11 +7,8 @@
 
 import React, { useCallback, useEffect, useRef } from 'react';
 import moment from 'moment';
+import { KibanaContextProvider, KibanaReactOverlays } from '@kbn/kibana-react-plugin/public';
 import { useMlKibana } from '../kibana';
-import {
-  KibanaContextProvider,
-  KibanaReactOverlays,
-} from '../../../../../../../src/plugins/kibana_react/public';
 import { JobSelectorFlyout } from '../../../embeddables/common/components/job_selector_flyout';
 import { getInitialGroupsMap } from '../../components/job_selector/job_selector';
 import type { JobSelectionResult } from '../../components/job_selector/job_selector_flyout';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
index d5e0e736b768e..89c05643f0dc8 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getNumTopClasses, getNumTopFeatureImportanceValues } from './analytics';
 import { Field } from '../../../../common/types/fields';
 import {
@@ -15,7 +16,6 @@ import {
   isOutlierAnalysis,
   isRegressionAnalysis,
 } from '../../../../common/util/analytics_utils';
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 
 import { FEATURE_IMPORTANCE, FEATURE_INFLUENCE, OUTLIER_SCORE, TOP_CLASSES } from './constants';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
index 195a7d9b762cf..ff81dc9932e9f 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
@@ -11,7 +11,7 @@ import { extractErrorMessage } from '../../../../common/util/errors';
 import { EsSorting, UseDataGridReturnType, getProcessedFields } from '../../components/data_grid';
 import { ml } from '../../services/ml_api_service';
 
-import { isKeywordAndTextType } from '../common/fields';
+import { isKeywordAndTextType } from './fields';
 import { SavedSearchQuery } from '../../contexts/ml';
 
 import { INDEX_STATUS } from './analytics';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts
index 58146474815c4..50f3fa6aeb659 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 
-import { getDefaultFieldsFromJobCaps, DataFrameAnalyticsConfig } from '../common';
+import { getDefaultFieldsFromJobCaps, DataFrameAnalyticsConfig } from '.';
 
 export interface FieldTypes {
   [key: string]: ES_FIELD_TYPES;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
index 43dff4142023d..df740df7fca3c 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { extractErrorMessage } from '../../../../common/util/errors';
 
@@ -18,7 +18,7 @@ import { ml } from '../../services/ml_api_service';
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { useMlContext } from '../../contexts/ml';
 
-import { DataFrameAnalyticsConfig } from '../common';
+import { DataFrameAnalyticsConfig } from '.';
 
 import { isGetDataFrameAnalyticsStatsResponseOk } from '../pages/analytics_management/services/analytics_service/get_analytics';
 import { DataFrameTaskStateType } from '../pages/analytics_management/components/analytics_list/common';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
index 158410c690a66..b4f55bcae0947 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
@@ -19,6 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { debounce, cloneDeep } from 'lodash';
 
+import { Query } from '@kbn/data-plugin/common/query';
 import { newJobCapsServiceAnalytics } from '../../../../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { useMlContext } from '../../../../../contexts/ml';
 import { getCombinedRuntimeMappings } from '../../../../../components/data_grid/common';
@@ -56,7 +57,6 @@ import { ExplorationQueryBar } from '../../../analytics_exploration/components/e
 import { useSavedSearch, SavedSearchQuery } from './use_saved_search';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../../../common/constants/search';
 import { ExplorationQueryBarProps } from '../../../analytics_exploration/components/exploration_query_bar/exploration_query_bar';
-import { Query } from '../../../../../../../../../../src/plugins/data/common/query';
 
 import { ScatterplotMatrix } from '../../../../../components/scatterplot_matrix';
 import { RuntimeMappings } from '../runtime_mappings';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
index 1fe649ee9519a..881b533efba09 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
 import { AnalyticsJobType } from '../../../analytics_management/hooks/use_create_analytics_form/state';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
index 1efb442425b69..666f990aa4aa1 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
@@ -9,13 +9,13 @@ import React, { FC, Fragment, useState, useEffect } from 'react';
 import { EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { AnalyticsJobType } from '../../../analytics_management/hooks/use_create_analytics_form/state';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
 import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
 import { OMIT_FIELDS } from '../../../../../../../common/constants/field_types';
 import { BASIC_NUMERICAL_TYPES, EXTENDED_NUMERICAL_TYPES } from '../../../../common/fields';
 import { CATEGORICAL_TYPES } from './form_options_validation';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
 import { newJobCapsServiceAnalytics } from '../../../../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
index 28e63d0e002aa..8a74237a28144 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
@@ -11,7 +11,7 @@ import { EuiCallOut, EuiFieldText, EuiForm, EuiFormRow, EuiSpacer } from '@elast
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { useNotifications } from '../../../../../contexts/kibana';
 import { ml } from '../../../../../services/ml_api_service';
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts
index a2d9ba393646f..9f2b2db2f8527 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-export { ConfigurationStep } from './configuration_step/index';
-export { AdvancedStep } from './advanced_step/index';
-export { DetailsStep } from './details_step/index';
-export { CreateStep } from './create_step/index';
-export { ValidationStepWrapper } from './validation_step/index';
+export { ConfigurationStep } from './configuration_step';
+export { AdvancedStep } from './advanced_step';
+export { DetailsStep } from './details_step';
+export { CreateStep } from './create_step';
+export { ValidationStepWrapper } from './validation_step';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
index 13c3e71cd122a..9de32fdd5bd3e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
@@ -20,9 +20,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { XJsonMode } from '@kbn/ace';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import { useMlContext } from '../../../../../contexts/ml';
 import { CreateAnalyticsFormProps } from '../../../analytics_management/hooks/use_create_analytics_form';
-import { XJson } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
 import { getCombinedRuntimeMappings } from '../../../../../components/data_grid/common';
 import { isPopulatedObject } from '../../../../../../../common/util/object_utils';
 import { RuntimeMappingsEditor } from './runtime_mappings_editor';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx
index e499d9625eeab..bb8d098fcf21e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx
@@ -9,7 +9,7 @@ import { isEqual } from 'lodash';
 import React, { memo, FC } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { isRuntimeMappings } from '../../../../../../../common/util/runtime_field_utils';
 import { XJsonModeType } from './runtime_mappings';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
index b8b8db4c916ae..a865417ff123d 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
@@ -9,9 +9,9 @@ import { useEffect, useMemo, useState } from 'react';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { EuiDataGridColumn } from '@elastic/eui';
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { isRuntimeMappings } from '../../../../../../common/util/runtime_field_utils';
 import { RuntimeMappings } from '../../../../../../common/types/fields';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../../common/constants/field_histograms';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
index 1041fcb7af8ab..f9f218ccd3d6e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiDataGridColumn, EuiSpacer, EuiText } from '@elastic/eui';
 
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import {
   isClassificationAnalysis,
@@ -37,11 +37,7 @@ import {
   getAnalysisType,
 } from '../../../../common';
 
-import {
-  ExpandableSection,
-  ExpandableSectionProps,
-  HEADER_ITEMS_LOADING,
-} from '../expandable_section';
+import { ExpandableSection, ExpandableSectionProps, HEADER_ITEMS_LOADING } from '.';
 import { IndexPatternPrompt } from '../index_pattern_prompt';
 
 const showingDocs = i18n.translate(
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
index 5d8ffd2229d0e..141be7cb00ebf 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
@@ -12,10 +12,10 @@ import { i18n } from '@kbn/i18n';
 import { debounce } from 'lodash';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { Dictionary } from '../../../../../../../common/types/common';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
-import { Query } from '../../../../../../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../../../../../../src/plugins/unified_search/public';
 
 import {
   SEARCH_QUERY_LANGUAGE,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
index 41c434c7160cf..1931fa9100e20 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { getToastNotifications } from '../../../../../util/dependency_cache';
 import { useMlKibana } from '../../../../../contexts/kibana';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
index 6e0d513a35b9a..c0590fd80a5d5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
@@ -9,11 +9,11 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { EuiDataGridColumn } from '@elastic/eui';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { i18n } from '@kbn/i18n';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { MlApiServices } from '../../../../../services/ml_api_service';
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
index d0f048ac02606..45653209cdb8a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
@@ -9,7 +9,7 @@ import { useEffect, useMemo } from 'react';
 
 import { EuiDataGridColumn } from '@elastic/eui';
 
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
index 38cc37aec646c..c35ad5bacf371 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
@@ -18,7 +18,11 @@ import { DataFrameAnalysisConfigType } from '../../../../../common/types/data_fr
 import { HelpMenu } from '../../../components/help_menu';
 import { useMlKibana, useMlApiContext } from '../../../contexts/kibana';
 import { MlPageHeader } from '../../../components/page_header';
-import { AnalyticsIdSelector, AnalyticsSelectorIds } from '../components/analytics_selector';
+import {
+  AnalyticsIdSelector,
+  AnalyticsSelectorIds,
+  AnalyticsIdSelectorControls,
+} from '../components/analytics_selector';
 import { AnalyticsEmptyPrompt } from '../analytics_management/components/empty_prompt';
 import { useUrlState } from '../../../util/url_state';
 
@@ -27,6 +31,7 @@ export const Page: FC<{
   analysisType: DataFrameAnalysisConfigType;
 }> = ({ jobId, analysisType }) => {
   const [analyticsId, setAnalyticsId] = useState<AnalyticsSelectorIds | undefined>();
+  const [isIdSelectorFlyoutVisible, setIsIdSelectorFlyoutVisible] = useState<boolean>(!jobId);
   const [jobsExist, setJobsExist] = useState(true);
   const {
     services: { docLinks },
@@ -74,7 +79,6 @@ export const Page: FC<{
     }
     return (
       <>
-        <AnalyticsIdSelector setAnalyticsId={setAnalyticsId} />
         <EuiEmptyPrompt
           iconType="alert"
           title={
@@ -93,6 +97,16 @@ export const Page: FC<{
 
   return (
     <>
+      <AnalyticsIdSelectorControls
+        setIsIdSelectorFlyoutVisible={setIsIdSelectorFlyoutVisible}
+        selectedId={jobIdToUse}
+      />
+      {isIdSelectorFlyoutVisible ? (
+        <AnalyticsIdSelector
+          setAnalyticsId={setAnalyticsId}
+          setIsIdSelectorFlyoutVisible={setIsIdSelectorFlyoutVisible}
+        />
+      ) : null}
       {jobIdToUse !== undefined && (
         <MlPageHeader>
           <FormattedMessage
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
index 804fe77cf9430..d9a888b9e3147 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
@@ -10,10 +10,7 @@ import { fireEvent, render } from '@testing-library/react';
 import * as CheckPrivilige from '../../../../../capabilities/check_capabilities';
 import mockAnalyticsListItem from '../analytics_list/__mocks__/analytics_list_item.json';
 import { I18nProvider } from '@kbn/i18n-react';
-import {
-  coreMock as mockCoreServices,
-  i18nServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
+import { coreMock as mockCoreServices, i18nServiceMock } from '@kbn/core/public/mocks';
 
 import { DeleteActionName } from './delete_action_name';
 import { DeleteActionModal } from './delete_action_modal';
@@ -24,7 +21,7 @@ jest.mock('../../../../../capabilities/check_capabilities', () => ({
   createPermissionFailureMessage: jest.fn(),
 }));
 
-jest.mock('../../../../../../application/util/dependency_cache', () => ({
+jest.mock('../../../../../util/dependency_cache', () => ({
   getToastNotifications: () => ({ addSuccess: jest.fn(), addDanger: jest.fn() }),
 }));
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
index 3dfeef18e5102..9ab5e40d1ef21 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
@@ -16,6 +16,7 @@ import {
   EuiSearchBarProps,
   EuiSpacer,
 } from '@elastic/eui';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../../../../common/constants/data_frame_analytics';
 import { DataFrameAnalyticsId, useRefreshAnalyticsList } from '../../../../common';
 import { checkPermission } from '../../../../../capabilities/check_capabilities';
@@ -31,7 +32,6 @@ import {
 import { getAnalyticsFactory } from '../../services/analytics_service';
 import { getTaskStateBadge, getJobTypeBadge, useColumns } from './use_columns';
 import { ExpandedRow } from './expanded_row';
-import type { SpacesPluginStart } from '../../../../../../../../spaces/public';
 import { AnalyticStatsBarStats, StatsBar } from '../../../../../components/stats_bar';
 import { CreateAnalyticsButton } from '../create_analytics_button';
 import { filterAnalytics } from '../../../../common/search_bar_filters';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
index 329120e26be2d..3077f0fb38726 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
@@ -20,6 +20,7 @@ import {
   EuiLink,
   RIGHT_ALIGNMENT,
 } from '@elastic/eui';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { getAnalysisType, DataFrameAnalyticsId } from '../../../../common';
 import {
   getDataFrameAnalyticsProgressPhase,
@@ -33,7 +34,6 @@ import {
 import { useActions } from './use_actions';
 import { useMlLink } from '../../../../../contexts/kibana';
 import { ML_PAGES } from '../../../../../../../common/constants/locator';
-import type { SpacesPluginStart } from '../../../../../../../../spaces/public';
 import { MLSavedObjectsSpacesList } from '../../../../../components/ml_saved_objects_spaces_list';
 
 enum TASK_STATE_COLOR {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
index 436bd060db34f..18b93e35a3f36 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
@@ -14,7 +14,7 @@ import { getDataViewAndSavedSearch, DataViewAndSavedSearch } from '../../../../.
 
 import { SourceSelection } from './source_selection';
 
-jest.mock('../../../../../../../../../../src/plugins/saved_objects/public', () => {
+jest.mock('@kbn/saved-objects-plugin/public', () => {
   const SavedObjectFinderUi = ({
     onChoose,
   }: {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
index 45211c5ef7e24..dd491c85de635 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
@@ -10,9 +10,9 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiCallOut, EuiSpacer, EuiPageBody, EuiPageContent } from '@elastic/eui';
 
-import type { SimpleSavedObject } from 'src/core/public';
+import type { SimpleSavedObject } from '@kbn/core/public';
 
-import { SavedObjectFinderUi } from '../../../../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useMlKibana, useNavigateToPath } from '../../../../../contexts/kibana';
 
 import { useToastNotificationService } from '../../../../../services/toast_notification_service';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index c49653c5a75c5..5559e7db2d631 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { memoize, isEqual } from 'lodash';
 // @ts-ignore
 import numeral from '@elastic/numeral';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { isValidIndexName } from '../../../../../../../common/util/es_utils';
 
 import { collapseLiteralStrings } from '../../../../../../../shared_imports';
@@ -45,7 +46,6 @@ import {
   TRAINING_PERCENT_MIN,
   TRAINING_PERCENT_MAX,
 } from '../../../../common/analytics';
-import { indexPatterns } from '../../../../../../../../../../src/plugins/data/public';
 import { isAdvancedConfig } from '../../components/action_clone/clone_action_name';
 
 const mmlAllowedUnitsStr = `${ALLOWED_DATA_UNITS.slice(0, ALLOWED_DATA_UNITS.length - 1).join(
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 94a12f9ad5235..41a8ae4eeba92 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -9,11 +9,11 @@ import { useReducer } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
+import { DuplicateDataViewError } from '@kbn/data-plugin/public';
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
 import { DeepReadonly } from '../../../../../../../common/types/common';
 import { ml } from '../../../../../services/ml_api_service';
 import { useMlContext } from '../../../../../contexts/ml';
-import { DuplicateDataViewError } from '../../../../../../../../../../src/plugins/data/public';
 
 import { useRefreshAnalyticsList, DataFrameAnalyticsConfig } from '../../../../common';
 import { extractCloningConfig, isAdvancedConfig } from '../../components/action_clone';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx
index 622da34f85545..52dce43a29870 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx
@@ -109,15 +109,19 @@ const modelColumns = [
 interface Props {
   setAnalyticsId: React.Dispatch<React.SetStateAction<AnalyticsSelectorIds | undefined>>;
   jobsOnly?: boolean;
+  setIsIdSelectorFlyoutVisible: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
-export function AnalyticsIdSelector({ setAnalyticsId, jobsOnly = false }: Props) {
+export function AnalyticsIdSelector({
+  setAnalyticsId,
+  jobsOnly = false,
+  setIsIdSelectorFlyoutVisible,
+}: Props) {
   const [selected, setSelected] = useState<
     { model_id?: string; job_id?: string; analysis_type?: string } | undefined
   >();
   const [analyticsJobs, setAnalyticsJobs] = useState<DataFrameAnalyticsConfig[]>([]);
   const [trainedModels, setTrainedModels] = useState<TrainedModelConfigResponse[]>([]);
-  const [isFlyoutVisible, setIsFlyoutVisible] = useState<boolean>(true);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const { displayErrorToast } = useToastNotificationService();
   const trainedModelsApiService = useTrainedModelsApiService();
@@ -165,7 +169,7 @@ export function AnalyticsIdSelector({ setAnalyticsId, jobsOnly = false }: Props)
   }
 
   function closeFlyout() {
-    setIsFlyoutVisible(false);
+    setIsIdSelectorFlyoutVisible(false);
   }
 
   // Fetch analytics jobs and models on flyout open
@@ -258,7 +262,7 @@ export function AnalyticsIdSelector({ setAnalyticsId, jobsOnly = false }: Props)
     });
   }
 
-  return isFlyoutVisible ? (
+  return (
     <EuiFlyout
       onClose={closeFlyout}
       data-test-subj="mlFlyoutJobSelector"
@@ -303,5 +307,5 @@ export function AnalyticsIdSelector({ setAnalyticsId, jobsOnly = false }: Props)
         </EuiFlexGroup>
       </EuiFlyoutFooter>
     </EuiFlyout>
-  ) : null;
+  );
 }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector_controls.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector_controls.tsx
new file mode 100644
index 0000000000000..1df676da58aec
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector_controls.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import {
+  EuiBadge,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiText,
+} from '@elastic/eui';
+
+interface Props {
+  setIsIdSelectorFlyoutVisible: React.Dispatch<React.SetStateAction<boolean>>;
+  selectedId?: string;
+}
+
+export const AnalyticsIdSelectorControls: FC<Props> = ({
+  setIsIdSelectorFlyoutVisible,
+  selectedId,
+}) => (
+  <>
+    <EuiFlexGroup gutterSize="xs" alignItems="center">
+      <EuiFlexItem grow={false}>
+        {selectedId ? (
+          <EuiBadge
+            key={`${selectedId}-id`}
+            data-test-subj={`mlAnalyticsIdSelectionBadge ${selectedId}`}
+            color="hollow"
+          >
+            {selectedId}
+          </EuiBadge>
+        ) : null}
+        {!selectedId ? (
+          <EuiText size={'xs'}>
+            <FormattedMessage
+              id="xpack.ml.dataframe.analytics.noIdsSelectedLabel"
+              defaultMessage="No Analytics ID selected"
+            />
+          </EuiText>
+        ) : null}
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty
+          size="xs"
+          iconType="pencil"
+          onClick={setIsIdSelectorFlyoutVisible.bind(null, true)}
+          data-test-subj="mlButtonEditAnalyticsIdSelection"
+        >
+          <FormattedMessage
+            id="xpack.ml.dataframe.analytics.editSelection"
+            defaultMessage="Edit selection"
+          />
+        </EuiButtonEmpty>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiHorizontalRule />
+  </>
+);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/index.ts
index dcd547d84b8f0..8daca8b921480 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/components/analytics_selector/index.ts
@@ -7,3 +7,4 @@
 
 export { AnalyticsIdSelector } from './analytics_id_selector';
 export type { AnalyticsSelectorIds } from './analytics_id_selector';
+export { AnalyticsIdSelectorControls } from './analytics_id_selector_controls';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
index 0ae82d72cecf2..47d10b6c08d6e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
@@ -13,21 +13,29 @@ import { useUrlState } from '../../../util/url_state';
 import { NodeAvailableWarning } from '../../../components/node_available_warning';
 import { SavedObjectsWarning } from '../../../components/saved_objects_warning';
 import { UpgradeWarning } from '../../../components/upgrade';
-import { JobMap } from '../job_map';
+import { JobMap } from '.';
 import { HelpMenu } from '../../../components/help_menu';
 import { useMlKibana, useMlApiContext } from '../../../contexts/kibana';
 import { useRefreshAnalyticsList } from '../../common';
 import { MlPageHeader } from '../../../components/page_header';
-import { AnalyticsIdSelector, AnalyticsSelectorIds } from '../components/analytics_selector';
+import {
+  AnalyticsIdSelector,
+  AnalyticsSelectorIds,
+  AnalyticsIdSelectorControls,
+} from '../components/analytics_selector';
 import { AnalyticsEmptyPrompt } from '../analytics_management/components/empty_prompt';
 
 export const Page: FC = () => {
   const [globalState, setGlobalState] = useUrlState('_g');
+  const mapJobId = globalState?.ml?.jobId;
+  const mapModelId = globalState?.ml?.modelId;
+
   const [isLoading, setIsLoading] = useState(false);
+  const [isIdSelectorFlyoutVisible, setIsIdSelectorFlyoutVisible] = useState<boolean>(
+    !mapJobId && !mapModelId
+  );
   const [jobsExist, setJobsExist] = useState(true);
   const { refresh } = useRefreshAnalyticsList({ isLoading: setIsLoading });
-  const mapJobId = globalState?.ml?.jobId;
-  const mapModelId = globalState?.ml?.modelId;
   const [analyticsId, setAnalyticsId] = useState<AnalyticsSelectorIds>();
   const {
     services: { docLinks },
@@ -71,7 +79,6 @@ export const Page: FC = () => {
     }
     return (
       <>
-        <AnalyticsIdSelector setAnalyticsId={setAnalyticsId} />
         <EuiEmptyPrompt
           iconType="alert"
           title={
@@ -93,6 +100,16 @@ export const Page: FC = () => {
 
   return (
     <>
+      <AnalyticsIdSelectorControls
+        setIsIdSelectorFlyoutVisible={setIsIdSelectorFlyoutVisible}
+        selectedId={jobId || modelId}
+      />
+      {isIdSelectorFlyoutVisible ? (
+        <AnalyticsIdSelector
+          setAnalyticsId={setAnalyticsId}
+          setIsIdSelectorFlyoutVisible={setIsIdSelectorFlyoutVisible}
+        />
+      ) : null}
       {jobId === undefined && modelId === undefined ? (
         <MlPageHeader>
           <FormattedMessage
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx
index b90e5813f0092..4c1d8b478f971 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx
@@ -8,6 +8,7 @@
 import React, { FC, Fragment, useState, useEffect, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { ResultLink, FileDataVisualizerSpec } from '@kbn/data-visualizer-plugin/public';
 import { useTimefilter } from '../../contexts/kibana';
 import { HelpMenu } from '../../components/help_menu';
 import { useMlKibana, useMlLocator } from '../../contexts/kibana';
@@ -16,7 +17,6 @@ import { ML_PAGES } from '../../../../common/constants/locator';
 import { isFullLicense } from '../../license';
 import { mlNodesAvailable, getMlNodeCount } from '../../ml_nodes_check/check_ml_nodes';
 import { checkPermission } from '../../capabilities/check_capabilities';
-import type { ResultLink, FileDataVisualizerSpec } from '../../../../../data_visualizer/public';
 import { MlPageHeader } from '../../components/page_header';
 
 interface GetUrlParams {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts
index 40a8c3a7d8b1b..8fa8d34ad1b6f 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { MlJobFieldType } from '../../../../../common/types/field_types';
 
 export interface FieldRequestConfig {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
index 37045cc3cd7c3..c84e8d9dea760 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { SavedSearchQuery } from '../../../contexts/ml';
 import { OMIT_FIELDS } from '../../../../../common/constants/field_types';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
index 12672f304be80..5a041df220df9 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
@@ -8,6 +8,7 @@
 import React, { FC, Fragment, useEffect, useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { ResultLink, IndexDataVisualizerSpec } from '@kbn/data-visualizer-plugin/public';
 import { useMlKibana, useTimefilter, useMlLocator } from '../../contexts/kibana';
 import { HelpMenu } from '../../components/help_menu';
 import { ML_PAGES } from '../../../../common/constants/locator';
@@ -15,7 +16,6 @@ import { isFullLicense } from '../../license';
 import { mlNodesAvailable, getMlNodeCount } from '../../ml_nodes_check/check_ml_nodes';
 import { checkPermission } from '../../capabilities/check_capabilities';
 
-import type { ResultLink, IndexDataVisualizerSpec } from '../../../../../data_visualizer/public';
 import { MlPageHeader } from '../../components/page_header';
 
 interface GetUrlParams {
diff --git a/x-pack/plugins/ml/public/application/explorer/_explorer.scss b/x-pack/plugins/ml/public/application/explorer/_explorer.scss
index 04f9d6d2e8c44..4d04a0747e3a9 100644
--- a/x-pack/plugins/ml/public/application/explorer/_explorer.scss
+++ b/x-pack/plugins/ml/public/application/explorer/_explorer.scss
@@ -1,18 +1,7 @@
 $borderRadius: $euiBorderRadius / 2;
 
 .ml-explorer {
-  width: 100%;
-  display: inline-block;
-  color: $euiColorDarkShade;
-
   .results-container {
-    padding: 0 0 $euiSize 0;
-
-    // SASSTODO: Overwrite of bootstrap
-    .col-xs-12 {
-      width: calc(100% - #{$euiSizeXL});
-      padding-left: $euiSize;
-    }
 
     .no-influencers-warning {
       float: left;
diff --git a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
index 217a13490771e..b65daf40f6761 100644
--- a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
+++ b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
@@ -13,6 +13,7 @@ import { forkJoin, of, Observable, Subject } from 'rxjs';
 import { switchMap, map } from 'rxjs/operators';
 
 import { useCallback, useMemo } from 'react';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 import {
   getDateFormatTz,
   getSelectionInfluencers,
@@ -29,7 +30,6 @@ import {
 import { ExplorerState } from '../reducers';
 import { useMlKibana, useTimefilter } from '../../contexts/kibana';
 import { MlResultsService, mlResultsServiceProvider } from '../../services/results_service';
-import { TimefilterContract } from '../../../../../../../src/plugins/data/public';
 import { AnomalyExplorerChartsService } from '../../services/anomaly_explorer_charts_service';
 import type { InfluencersFilterQuery } from '../../../../common/types/es_client';
 import type { TimeBucketsInterval, TimeRangeBounds } from '../../util/time_buckets';
diff --git a/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx b/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
index 48c00ade00bc6..f2d739d2f5852 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
@@ -23,11 +23,11 @@ import {
   STYLE_TYPE,
   COLOR_MAP_TYPE,
   VectorLayerDescriptor,
-} from '../../../../maps/common';
+} from '@kbn/maps-plugin/common';
+import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import { useMlKibana } from '../contexts/kibana';
 import { isDefined } from '../../../common/types/guards';
 import { MlEmbeddedMapComponent } from '../components/ml_embedded_map';
-import { EMSTermJoinConfig } from '../../../../maps/public';
 import { AnomaliesTableRecord } from '../../../common/types/anomalies';
 
 const MAX_ENTITY_VALUES = 3;
diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
index 818001fb75cdc..31c401b99ae51 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
@@ -16,6 +16,8 @@ import {
   debounceTime,
 } from 'rxjs/operators';
 import { isEqual, sortBy, uniq } from 'lodash';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import type { TimeRangeBounds } from '@kbn/data-plugin/common';
 import { AnomalyTimelineService } from '../services/anomaly_timeline_service';
 import type {
   AppStateSelectedCells,
@@ -25,8 +27,6 @@ import type {
 } from './explorer_utils';
 import type { AnomalyExplorerCommonStateService } from './anomaly_explorer_common_state';
 import type { AnomalyExplorerSwimLaneUrlState } from '../../../common/types/locator';
-import type { TimefilterContract } from '../../../../../../src/plugins/data/public';
-import type { TimeRangeBounds } from '../../../../../../src/plugins/data/common';
 import {
   ANOMALY_SWIM_LANE_HARD_LIMIT,
   SWIMLANE_TYPE,
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
index 14ddcc7b92ddb..7b66b38ca6bff 100644
--- a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -9,9 +9,9 @@ import React, { FC, useState, useEffect } from 'react';
 import { EuiCode, EuiInputPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
-import { Query } from '../../../../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { SEARCH_QUERY_LANGUAGE, ErrorMessage } from '../../../../../common/constants/search';
 import { InfluencersFilterQuery } from '../../../../../common/types/es_client';
 import { useAnomalyExplorerContext } from '../../anomaly_explorer_context';
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx
index be154a3726ae6..2caf5ee97780f 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx
@@ -7,11 +7,11 @@
 import React, { FC, useCallback, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFieldNumber, EuiFormRow, formatDate, htmlIdGenerator } from '@elastic/eui';
+import { TimeRange } from '@kbn/data-plugin/common/query';
 import { useDashboardTable } from './use_dashboards_table';
 import { AddToDashboardControl } from './add_to_dashboard_controls';
 import { useAddToDashboardActions } from './use_add_to_dashboard_actions';
 import { AppStateSelectedCells, getSelectionTimeRange } from '../explorer_utils';
-import { TimeRange } from '../../../../../../../src/plugins/data/common/query';
 import { DEFAULT_MAX_SERIES_TO_PLOT } from '../../services/anomaly_explorer_charts_service';
 import { JobId } from '../../../../common/types/anomaly_detection_jobs';
 import { ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE } from '../../../embeddables';
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx
index 519bbede14029..2e5db456a3153 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx
@@ -15,7 +15,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { DashboardSavedObject } from '../../../../../../../src/plugins/dashboard/public';
+import { DashboardSavedObject } from '@kbn/dashboard-plugin/public';
 import { getDefaultSwimlanePanelTitle } from '../../../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
 import { SWIMLANE_TYPE, SwimlaneType } from '../explorer_constants';
 import { JobId } from '../../../../common/types/anomaly_detection_jobs';
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx
index 21d3a320ee591..1dbc5ac051b95 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx
@@ -6,10 +6,10 @@
  */
 
 import { useCallback } from 'react';
+import { DashboardConstants } from '@kbn/dashboard-plugin/public';
 import { DashboardItem } from './use_dashboards_table';
 import { useMlKibana } from '../../contexts/kibana';
 import { useDashboardService } from '../../services/dashboard_service';
-import { DashboardConstants } from '../../../../../../../src/plugins/dashboard/public';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx
index b114797bbc550..b79f4d93d10d6 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx
@@ -8,7 +8,7 @@
 import type { EuiInMemoryTableProps } from '@elastic/eui';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { debounce } from 'lodash';
-import type { DashboardSavedObject } from '../../../../../../../src/plugins/dashboard/public';
+import type { DashboardSavedObject } from '@kbn/dashboard-plugin/public';
 import { useDashboardService } from '../../services/dashboard_service';
 import { useMlKibana } from '../../contexts/kibana';
 
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.tsx b/x-pack/plugins/ml/public/application/explorer/explorer.tsx
index 9ee9aed31c7af..5352eea1ab505 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { FC, useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import {
@@ -23,8 +23,12 @@ import {
   EuiPanel,
   EuiAccordion,
   EuiBadge,
+  EuiResizableContainer,
+  useIsWithinBreakpoints,
 } from '@elastic/eui';
 import useObservable from 'react-use/lib/useObservable';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
 import { AnnotationFlyout } from '../components/annotations/annotation_flyout';
 // @ts-ignore
 import { AnnotationsTable } from '../components/annotations/annotations_table';
@@ -61,14 +65,17 @@ import { AnomaliesMap } from './anomalies_map';
 import { ANOMALY_DETECTION_DEFAULT_TIME_RANGE } from '../../../common/constants/settings';
 import { AnomalyContextMenu } from './anomaly_context_menu';
 import { isDefined } from '../../../common/types/guards';
-import type { DataView } from '../../../../../../src/plugins/data_views/common';
 import type { JobSelectorProps } from '../components/job_selector/job_selector';
 import type { ExplorerState } from './reducers';
-import type { TimefilterContract } from '../../../../../../src/plugins/data/public';
 import type { TimeBuckets } from '../util/time_buckets';
 import { useToastNotificationService } from '../services/toast_notification_service';
 import { useMlKibana, useMlLocator } from '../contexts/kibana';
 import { useAnomalyExplorerContext } from './anomaly_explorer_context';
+import {
+  AnomalyExplorerPanelsState,
+  ML_ANOMALY_EXPLORER_PANELS,
+} from '../../../common/types/storage';
+import { useStorage } from '../contexts/ml/use_storage';
 
 interface ExplorerPageProps {
   jobSelectorProps: JobSelectorProps;
@@ -135,6 +142,19 @@ interface ExplorerUIProps {
   swimLaneSeverity?: number;
 }
 
+export function getDefaultPanelsState() {
+  return {
+    topInfluencers: {
+      isCollapsed: false,
+      size: 20,
+    },
+    mainPage: {
+      isCollapsed: false,
+      size: 80,
+    },
+  };
+}
+
 export const Explorer: FC<ExplorerUIProps> = ({
   invalidTimeRangeError,
   showCharts,
@@ -148,6 +168,93 @@ export const Explorer: FC<ExplorerUIProps> = ({
   explorerState,
   overallSwimlaneData,
 }) => {
+  const isMobile = useIsWithinBreakpoints(['xs', 's']);
+
+  const [anomalyExplorerPanelState, setAnomalyExplorerPanelState] =
+    useStorage<AnomalyExplorerPanelsState>(ML_ANOMALY_EXPLORER_PANELS, {
+      topInfluencers: {
+        isCollapsed: false,
+        size: 20,
+      },
+      mainPage: {
+        size: 80,
+      },
+    });
+
+  const topInfluencersPanelRef = useRef<HTMLDivElement | null>(null);
+
+  const collapseFn = useRef<() => void | undefined>();
+  const panelsInitialized = useRef<boolean>(false);
+
+  useEffect(
+    /**
+     * Preserve collapsible panel state on page load.
+     * TODO Remove when https://github.com/elastic/eui/issues/4736 is resolved.
+     */
+    function initTopInfluencersPanelCollapse() {
+      if (panelsInitialized.current || !collapseFn.current || !topInfluencersPanelRef.current)
+        return;
+
+      panelsInitialized.current = true;
+
+      if (anomalyExplorerPanelState.topInfluencers.isCollapsed) {
+        setTimeout(() => {
+          if (collapseFn.current) {
+            collapseFn.current();
+          }
+        }, 0);
+      }
+    },
+    [
+      collapseFn.current,
+      panelsInitialized,
+      topInfluencersPanelRef.current,
+      anomalyExplorerPanelState,
+    ]
+  );
+
+  const onPanelWidthChange = useCallback(
+    (newSizes) => {
+      setAnomalyExplorerPanelState({
+        mainPage: {
+          size: newSizes.mainPage,
+        },
+        topInfluencers: {
+          ...anomalyExplorerPanelState.topInfluencers,
+          size: newSizes.topInfluencers,
+        },
+      });
+    },
+    [anomalyExplorerPanelState]
+  );
+
+  const onToggleCollapsed = useCallback(() => {
+    panelsInitialized.current = true;
+
+    const isCurrentlyCollapsed = anomalyExplorerPanelState.topInfluencers.isCollapsed;
+
+    if (isCurrentlyCollapsed) {
+      setAnomalyExplorerPanelState({
+        mainPage: {
+          size: 80,
+        },
+        topInfluencers: {
+          size: 20,
+          isCollapsed: !isCurrentlyCollapsed,
+        },
+      });
+      return;
+    }
+
+    setAnomalyExplorerPanelState({
+      mainPage: anomalyExplorerPanelState.mainPage,
+      topInfluencers: {
+        ...anomalyExplorerPanelState.topInfluencers,
+        isCollapsed: !isCurrentlyCollapsed,
+      },
+    });
+  }, [anomalyExplorerPanelState]);
+
   const { displayWarningToast, displayDangerToast } = useToastNotificationService();
   const { anomalyTimelineStateService, anomalyExplorerCommonStateService, chartsStateService } =
     useAnomalyExplorerContext();
@@ -327,225 +434,264 @@ export const Explorer: FC<ExplorerUIProps> = ({
       </ExplorerPage>
     );
   }
-  const mainColumnWidthClassName = noInfluencersConfigured === true ? 'col-xs-12' : 'col-xs-10';
-  const mainColumnClasses = `column ${mainColumnWidthClassName}`;
 
   const bounds = timefilter.getActiveBounds();
   const selectedJobIds = Array.isArray(selectedJobs) ? selectedJobs.map((job) => job.id) : [];
 
-  return (
-    <ExplorerPage
-      jobSelectorProps={jobSelectorProps}
-      noInfluencersConfigured={noInfluencersConfigured}
-      influencers={influencers}
-      filterActive={filterActive}
-      filterPlaceHolder={filterPlaceHolder}
-      indexPattern={indexPattern as DataView}
-      queryString={queryString}
-      updateLanguage={updateLanguage}
-    >
-      <div className="results-container">
-        {noInfluencersConfigured && (
-          <div className="no-influencers-warning">
-            <EuiIconTip
-              content={i18n.translate('xpack.ml.explorer.noConfiguredInfluencersTooltip', {
-                defaultMessage:
-                  'The Top Influencers list is hidden because no influencers have been configured for the selected jobs.',
-              })}
-              position="right"
-              type="iInCircle"
+  const mainPanelContent = (
+    <div>
+      {stoppedPartitions && (
+        <EuiCallOut
+          size={'s'}
+          title={
+            <FormattedMessage
+              id="xpack.ml.explorer.stoppedPartitionsExistCallout"
+              defaultMessage="There may be fewer results than there could have been because stop_on_warn is turned on. Both categorization and subsequent anomaly detection have stopped for some partitions in {jobsWithStoppedPartitions, plural, one {job} other {jobs}} [{stoppedPartitions}] where the categorization status has changed to warn."
+              values={{
+                jobsWithStoppedPartitions: stoppedPartitions.length,
+                stoppedPartitions: stoppedPartitions.join(', '),
+              }}
             />
-          </div>
-        )}
-
-        {noInfluencersConfigured === false && (
-          <div className="column col-xs-2" data-test-subj="mlAnomalyExplorerInfluencerList">
-            <EuiSpacer size={'s'} />
-            <EuiTitle className="panel-title">
-              <h2>
-                <FormattedMessage
-                  id="xpack.ml.explorer.topInfuencersTitle"
-                  defaultMessage="Top influencers"
-                />
-                <EuiIconTip
-                  content={
+          }
+        />
+      )}
+
+      <AnomalyTimeline explorerState={explorerState} />
+
+      <EuiSpacer size="m" />
+
+      {annotationsError !== undefined && (
+        <>
+          <EuiTitle
+            className="panel-title"
+            data-test-subj="mlAnomalyExplorerAnnotationsPanel error"
+          >
+            <h2>
+              <FormattedMessage
+                id="xpack.ml.explorer.annotationsErrorTitle"
+                defaultMessage="Annotations"
+              />
+            </h2>
+          </EuiTitle>
+          <EuiPanel>
+            <EuiCallOut
+              title={i18n.translate('xpack.ml.explorer.annotationsErrorCallOutTitle', {
+                defaultMessage: 'An error occurred loading annotations:',
+              })}
+              color="danger"
+              iconType="alert"
+            >
+              <p>{annotationsError}</p>
+            </EuiCallOut>
+          </EuiPanel>
+          <EuiSpacer size="m" />
+        </>
+      )}
+      {loading === false && tableData.anomalies?.length ? (
+        <AnomaliesMap anomalies={tableData.anomalies} jobIds={selectedJobIds} />
+      ) : null}
+      {annotationsCnt > 0 && (
+        <>
+          <EuiPanel
+            data-test-subj="mlAnomalyExplorerAnnotationsPanel loaded"
+            hasBorder
+            hasShadow={false}
+          >
+            <EuiAccordion
+              id={htmlIdGen()}
+              buttonContent={
+                <EuiTitle
+                  className="panel-title"
+                  data-test-subj="mlAnomalyExplorerAnnotationsPanelButton"
+                >
+                  <h2>
                     <FormattedMessage
-                      id="xpack.ml.explorer.topInfluencersTooltip"
-                      defaultMessage="View the relative impact of the top influencers in the selected time period and add them as filters on the results. Each influencer has a maximum anomaly score between 0-100 and a total anomaly score for that period."
+                      id="xpack.ml.explorer.annotationsTitle"
+                      defaultMessage="Annotations {badge}"
+                      values={{
+                        badge,
+                      }}
                     />
-                  }
-                  position="right"
-                />
-              </h2>
-            </EuiTitle>
-            {loading ? (
-              <EuiLoadingContent lines={10} />
-            ) : (
-              <InfluencersList influencers={influencers} influencerFilter={applyFilter} />
-            )}
-          </div>
-        )}
-
-        <div className={mainColumnClasses}>
-          <EuiSpacer size="m" />
-          {stoppedPartitions && (
-            <EuiCallOut
-              size={'s'}
-              title={
-                <FormattedMessage
-                  id="xpack.ml.explorer.stoppedPartitionsExistCallout"
-                  defaultMessage="There may be fewer results than there could have been because stop_on_warn is turned on. Both categorization and subsequent anomaly detection have stopped for some partitions in {jobsWithStoppedPartitions, plural, one {job} other {jobs}} [{stoppedPartitions}] where the categorization status has changed to warn."
-                  values={{
-                    jobsWithStoppedPartitions: stoppedPartitions.length,
-                    stoppedPartitions: stoppedPartitions.join(', '),
-                  }}
-                />
+                  </h2>
+                </EuiTitle>
               }
-            />
-          )}
-
-          <AnomalyTimeline explorerState={explorerState} />
-
+            >
+              <>
+                <AnnotationsTable
+                  jobIds={selectedJobIds}
+                  annotations={annotationsData}
+                  drillDown={true}
+                  numberBadge={false}
+                />
+              </>
+            </EuiAccordion>
+          </EuiPanel>
+          <AnnotationFlyout />
           <EuiSpacer size="m" />
-
-          {annotationsError !== undefined && (
-            <>
-              <EuiTitle
-                className="panel-title"
-                data-test-subj="mlAnomalyExplorerAnnotationsPanel error"
-              >
+        </>
+      )}
+      {loading === false && (
+        <EuiPanel hasBorder hasShadow={false}>
+          <EuiFlexGroup direction="row" gutterSize="m" responsive={false} alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiTitle className="panel-title">
                 <h2>
                   <FormattedMessage
-                    id="xpack.ml.explorer.annotationsErrorTitle"
-                    defaultMessage="Annotations"
+                    id="xpack.ml.explorer.anomaliesTitle"
+                    defaultMessage="Anomalies"
                   />
                 </h2>
               </EuiTitle>
-              <EuiPanel>
-                <EuiCallOut
-                  title={i18n.translate('xpack.ml.explorer.annotationsErrorCallOutTitle', {
-                    defaultMessage: 'An error occurred loading annotations:',
-                  })}
-                  color="danger"
-                  iconType="alert"
-                >
-                  <p>{annotationsError}</p>
-                </EuiCallOut>
-              </EuiPanel>
-              <EuiSpacer size="m" />
-            </>
-          )}
-          {loading === false && tableData.anomalies?.length ? (
-            <AnomaliesMap anomalies={tableData.anomalies} jobIds={selectedJobIds} />
-          ) : null}
-          {annotationsCnt > 0 && (
-            <>
-              <EuiPanel
-                data-test-subj="mlAnomalyExplorerAnnotationsPanel loaded"
-                hasBorder
-                hasShadow={false}
-              >
-                <EuiAccordion
-                  id={htmlIdGen()}
-                  buttonContent={
-                    <EuiTitle
-                      className="panel-title"
-                      data-test-subj="mlAnomalyExplorerAnnotationsPanelButton"
-                    >
-                      <h2>
-                        <FormattedMessage
-                          id="xpack.ml.explorer.annotationsTitle"
-                          defaultMessage="Annotations {badge}"
-                          values={{
-                            badge,
-                          }}
-                        />
-                      </h2>
-                    </EuiTitle>
-                  }
-                >
-                  <>
-                    <AnnotationsTable
-                      jobIds={selectedJobIds}
-                      annotations={annotationsData}
-                      drillDown={true}
-                      numberBadge={false}
-                    />
-                  </>
-                </EuiAccordion>
-              </EuiPanel>
-              <AnnotationFlyout />
-              <EuiSpacer size="m" />
-            </>
-          )}
-          {loading === false && (
-            <EuiPanel hasBorder hasShadow={false}>
-              <EuiFlexGroup direction="row" gutterSize="m" responsive={false} alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <EuiTitle className="panel-title">
-                    <h2>
-                      <FormattedMessage
-                        id="xpack.ml.explorer.anomaliesTitle"
-                        defaultMessage="Anomalies"
-                      />
-                    </h2>
-                  </EuiTitle>
-                </EuiFlexItem>
-
-                <EuiFlexItem grow={false} style={{ marginLeft: 'auto', alignSelf: 'baseline' }}>
-                  <AnomalyContextMenu
-                    selectedJobs={selectedJobs!}
-                    selectedCells={selectedCells}
-                    bounds={bounds}
-                    interval={
-                      swimLaneBucketInterval ? swimLaneBucketInterval.asSeconds() : undefined
-                    }
-                    chartsCount={chartsData.seriesToPlot.length}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-
-              <EuiFlexGroup direction="row" gutterSize="l" responsive={true} alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <SelectSeverity />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <SelectInterval />
-                </EuiFlexItem>
-                {chartsData.seriesToPlot.length > 0 && selectedCells !== undefined && (
-                  <EuiFlexItem grow={false}>
-                    <CheckboxShowCharts />
-                  </EuiFlexItem>
-                )}
-              </EuiFlexGroup>
-
-              <EuiSpacer size="m" />
-
-              <div className="euiText explorer-charts">
-                {showCharts ? (
-                  <ExplorerChartsContainer
-                    {...{
-                      ...chartsData,
-                      severity,
-                      timefilter,
-                      mlLocator,
-                      timeBuckets,
-                      onSelectEntity: applyFilter,
-                      chartsService,
-                    }}
-                  />
-                ) : null}
-              </div>
+            </EuiFlexItem>
 
-              <AnomaliesTable
+            <EuiFlexItem grow={false} style={{ marginLeft: 'auto', alignSelf: 'baseline' }}>
+              <AnomalyContextMenu
+                selectedJobs={selectedJobs!}
+                selectedCells={selectedCells}
                 bounds={bounds}
-                tableData={tableData}
-                influencerFilter={applyFilter}
+                interval={swimLaneBucketInterval ? swimLaneBucketInterval.asSeconds() : undefined}
+                chartsCount={chartsData.seriesToPlot.length}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiFlexGroup direction="row" gutterSize="l" responsive={true} alignItems="center">
+            <EuiFlexItem grow={false}>
+              <SelectSeverity />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <SelectInterval />
+            </EuiFlexItem>
+            {chartsData.seriesToPlot.length > 0 && selectedCells !== undefined && (
+              <EuiFlexItem grow={false}>
+                <CheckboxShowCharts />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
+
+          <EuiSpacer size="m" />
+
+          <div className="euiText explorer-charts">
+            {showCharts ? (
+              <ExplorerChartsContainer
+                {...{
+                  ...chartsData,
+                  severity,
+                  timefilter,
+                  mlLocator,
+                  timeBuckets,
+                  onSelectEntity: applyFilter,
+                  chartsService,
+                }}
+              />
+            ) : null}
+          </div>
+
+          <AnomaliesTable bounds={bounds} tableData={tableData} influencerFilter={applyFilter} />
+        </EuiPanel>
+      )}
+    </div>
+  );
+
+  return (
+    <ExplorerPage
+      jobSelectorProps={jobSelectorProps}
+      noInfluencersConfigured={noInfluencersConfigured}
+      influencers={influencers}
+      filterActive={filterActive}
+      filterPlaceHolder={filterPlaceHolder}
+      indexPattern={indexPattern as DataView}
+      queryString={queryString}
+      updateLanguage={updateLanguage}
+    >
+      {noInfluencersConfigured ? (
+        <EuiFlexGroup gutterSize={'s'}>
+          <EuiFlexItem grow={false}>
+            <div className="no-influencers-warning">
+              <EuiIconTip
+                content={i18n.translate('xpack.ml.explorer.noConfiguredInfluencersTooltip', {
+                  defaultMessage:
+                    'The Top Influencers list is hidden because no influencers have been configured for the selected jobs.',
+                })}
+                position="right"
+                type="iInCircle"
               />
-            </EuiPanel>
-          )}
+            </div>
+          </EuiFlexItem>
+          <EuiFlexItem>{mainPanelContent}</EuiFlexItem>
+        </EuiFlexGroup>
+      ) : (
+        <div>
+          <EuiSpacer size={'s'} />
+          <EuiResizableContainer
+            direction={isMobile ? 'vertical' : 'horizontal'}
+            onPanelWidthChange={onPanelWidthChange}
+          >
+            {(EuiResizablePanel, EuiResizableButton, actions) => {
+              collapseFn.current = () =>
+                actions.togglePanel!('topInfluencers', { direction: 'left' });
+
+              return (
+                <>
+                  <EuiResizablePanel
+                    panelRef={topInfluencersPanelRef}
+                    id={'topInfluencers'}
+                    mode={[
+                      'collapsible',
+                      {
+                        'data-test-subj': 'mlTopInfluencersToggle',
+                        position: 'top',
+                      },
+                    ]}
+                    minSize={'200px'}
+                    initialSize={20}
+                    paddingSize={'s'}
+                    onToggleCollapsed={onToggleCollapsed}
+                  >
+                    <div data-test-subj="mlAnomalyExplorerInfluencerList">
+                      <EuiSpacer size={'s'} />
+                      <EuiTitle className="panel-title">
+                        <h2>
+                          <FormattedMessage
+                            id="xpack.ml.explorer.topInfuencersTitle"
+                            defaultMessage="Top influencers"
+                          />
+                          <EuiIconTip
+                            content={
+                              <FormattedMessage
+                                id="xpack.ml.explorer.topInfluencersTooltip"
+                                defaultMessage="View the relative impact of the top influencers in the selected time period and add them as filters on the results. Each influencer has a maximum anomaly score between 0-100 and a total anomaly score for that period."
+                              />
+                            }
+                            position="right"
+                          />
+                        </h2>
+                      </EuiTitle>
+                      {loading ? (
+                        <EuiLoadingContent lines={10} />
+                      ) : (
+                        <InfluencersList influencers={influencers} influencerFilter={applyFilter} />
+                      )}
+                    </div>
+                  </EuiResizablePanel>
+
+                  <EuiResizableButton />
+
+                  <EuiResizablePanel
+                    id="mainPage"
+                    mode="main"
+                    minSize={'70%'}
+                    initialSize={80}
+                    paddingSize={'s'}
+                  >
+                    {mainPanelContent}
+                  </EuiResizablePanel>
+                </>
+              );
+            }}
+          </EuiResizableContainer>
         </div>
-      </div>
+      )}
     </ExplorerPage>
   );
 };
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
index aaad9c35d740f..c5d0600b9e577 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
@@ -9,18 +9,18 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-// @ts-ignore
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+// @ts-expect-error
 import { ExplorerChartsContainer } from './explorer_charts_container';
 import {
   SelectSeverityUI,
   TableSeverity,
 } from '../../components/controls/select_severity/select_severity';
 import type { TimeBuckets } from '../../util/time_buckets';
-import type { TimefilterContract } from '../../../../../../../src/plugins/data/public';
 import type { EntityFieldOperation } from '../../../../common/util/anomaly_utils';
 import type { ExplorerChartsData } from './explorer_charts_container_service';
 import type { MlLocator } from '../../../../common/types/locator';
-import { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
 
 interface ExplorerAnomaliesContainerProps {
   id: string;
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx
index e644a8b91e254..eac522e9e4f99 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { useState, useEffect } from 'react';
+import { LayerDescriptor } from '@kbn/maps-plugin/common';
 import { Dictionary } from '../../../../common/types/common';
-import { LayerDescriptor } from '../../../../../maps/common';
 import { getMLAnomaliesActualLayer, getMLAnomaliesTypicalLayer } from './map_config';
 import { MlEmbeddedMapComponent } from '../../components/ml_embedded_map';
 interface Props {
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
index 13800536f2fae..ddaaa55e7a3a4 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
@@ -33,17 +33,17 @@ import { SEARCH_QUERY_LANGUAGE } from '../../../../common/constants/search';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { MlTooltipComponent } from '../../components/chart_tooltip';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { useMlKibana } from '../../contexts/kibana';
 import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
 import { AnomalySource } from '../../../maps/anomaly_source';
 import { CUSTOM_COLOR_RAMP } from '../../../maps/anomaly_layer_wizard_factory';
-import { LAYER_TYPE, APP_ID as MAPS_APP_ID } from '../../../../../maps/common';
-import { MAPS_APP_LOCATOR } from '../../../../../maps/public';
+import { LAYER_TYPE, APP_ID as MAPS_APP_ID } from '@kbn/maps-plugin/common';
+import { MAPS_APP_LOCATOR } from '@kbn/maps-plugin/public';
 import { ExplorerChartsErrorCallOuts } from './explorer_charts_error_callouts';
 import { addItemToRecentlyAccessed } from '../../util/recently_accessed';
 import { EmbeddedMapComponentWrapper } from './explorer_chart_embedded_map';
-import { useActiveCursor } from '../../../../../../../src/plugins/charts/public';
+import { useActiveCursor } from '@kbn/charts-plugin/public';
 import { ML_ANOMALY_LAYERS } from '../../../maps/util';
 import { Chart, Settings } from '@elastic/charts';
 import useObservable from 'react-use/lib/useObservable';
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
index 0d324a83e27ad..382e41d233458 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
@@ -31,7 +31,7 @@ jest.mock('../../services/job_service', () => ({
   },
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts b/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
index 51b9732aebdd0..e544f65c09188 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '../../../../../maps/common';
+import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '@kbn/maps-plugin/common';
 import { SEVERITY_COLOR_RAMP } from '../../../../common';
 import { AnomaliesTableData } from '../explorer_utils';
 
diff --git a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
index c9a09ad5e310d..ee773cdfa24bd 100644
--- a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
+++ b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../../../common/constants/index_patterns';
 import {
   getDefaultChartsData,
@@ -12,7 +13,6 @@ import {
 } from '../../explorer_charts/explorer_charts_container_service';
 import { AnomaliesTableData, ExplorerJob } from '../../explorer_utils';
 import { AnnotationsTable } from '../../../../../common/types/annotations';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import type { InfluencerValueData } from '../../../components/influencers_list/influencers_list';
 
 export interface ExplorerState {
diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx
index c8ab280d465e0..91cfac98513e0 100644
--- a/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx
@@ -68,7 +68,7 @@ export const SwimlaneAnnotationContainer: FC<SwimlaneAnnotationContainerProps> =
         )
         .attr('x', Y_AXIS_LABEL_WIDTH - Y_AXIS_LABEL_PADDING)
         .attr('y', ANNOTATION_CONTAINER_HEIGHT / 2)
-        .attr('alignment-baseline', 'middle')
+        .attr('dominant-baseline', 'middle')
         .style('fill', euiTheme.euiTextSubduedColor)
         .style('font-size', euiTheme.euiFontSizeXS);
 
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
index 8fb4c43d77207..18ab8305a1d61 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
@@ -9,14 +9,14 @@
 import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { shallow } from 'enzyme';
 
-jest.mock('../../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../../services/job_service', () => 'mlJobService');
 
 import React from 'react';
 
 import { CustomUrlEditor } from './editor';
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { CustomUrlSettings } from './utils';
-import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 
 function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: UrlConfig) => void) {
   const savedCustomUrls = [
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
index cfe82a9f01880..28e44965c34ba 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
@@ -24,12 +24,12 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { isValidCustomUrlSettingsTimeRange } from './utils';
 import { isValidLabel } from '../../../util/custom_url_utils';
 
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
-import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
 
 function getLinkToOptions() {
   return [
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
index 1c7978a54b2b0..c0005b795070c 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { Job } from '../../../../../common/types/anomaly_detection_jobs';
 import { TimeRangeType } from './constants';
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
index 3ede5cf813f44..4fa5cdcb7c9f7 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
@@ -31,7 +31,7 @@ import { loadFullJob } from '../utils';
 import { validateModelMemoryLimit, validateGroupNames, isValidCustomUrls } from '../validate_job';
 import { toastNotificationServiceProvider } from '../../../../services/toast_notification_service';
 import { ml } from '../../../../services/ml_api_service';
-import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { collapseLiteralStrings } from '../../../../../../shared_imports';
 import { DATAFEED_STATE, JOB_STATE } from '../../../../../../common/constants/states';
 import { isManagedJob } from '../../../jobs_utils';
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
index 9e9f112cee25d..fff406bbf726d 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataViewListItem } from 'src/plugins/data_views/common';
+import type { DataViewListItem } from '@kbn/data-views-plugin/common';
 
 export function loadSavedDashboards(maxNumber: number): Promise<any[]>;
 export function loadDataViewListItems(): Promise<DataViewListItem[]>;
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
index 2c17251e15d8d..ff290a482ca23 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
@@ -23,6 +23,8 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { i18n } from '@kbn/i18n';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { CustomUrlEditor, CustomUrlList } from '../../../../components/custom_url_editor';
 import {
   getNewCustomUrlDefaults,
@@ -32,12 +34,10 @@ import {
   getTestUrl,
   CustomUrlSettings,
 } from '../../../../components/custom_url_editor/utils';
-import { withKibana } from '../../../../../../../../../../src/plugins/kibana_react/public';
 import { loadSavedDashboards, loadDataViewListItems } from '../edit_utils';
 import { openCustomUrlWindow } from '../../../../../util/custom_url_utils';
 import { Job } from '../../../../../../../common/types/anomaly_detection_jobs';
 import { UrlConfig } from '../../../../../../../common/types/custom_urls';
-import { DataViewListItem } from '../../../../../../../../../../src/plugins/data_views/common';
 import { MlKibanaReactContextValue } from '../../../../../contexts/kibana';
 
 const MAX_NUMBER_DASHBOARDS = 1000;
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js
index dd26d29fc0a82..593a09d377057 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js
@@ -28,7 +28,7 @@ import {
   getLatestDataOrBucketTimestamp,
   isTimeSeriesViewJob,
 } from '../../../../../../../common/util/job_utils';
-import { withKibana } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { ML_APP_LOCATOR, ML_PAGES } from '../../../../../../../common/constants/locator';
 import { timeFormatter } from '../../../../../../../common/util/date_utils';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
index 114b1944dfa23..ac29cf3b0a1bf 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
@@ -21,7 +21,7 @@ import { ModelSnapshotTable } from '../../../../components/model_snapshots';
 import { ForecastsTable } from './forecasts_table';
 import { JobDetailsPane } from './job_details_pane';
 import { JobMessagesPane } from './job_messages_pane';
-import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 export class JobDetailsUI extends Component {
   constructor(props) {
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
index 0ef0f69b7736e..1f42028af22db 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 // @ts-ignore
-import { JobsListView } from './components/jobs_list_view/index';
+import { JobsListView } from './components/jobs_list_view';
 import { usePageUrlState } from '../../util/url_state';
 import { ML_PAGES } from '../../../../common/constants/locator';
 import { ListingPageUrlState } from '../../../../common/types/common';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
index 38313b89f1640..3214a9c91bda9 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
@@ -7,6 +7,7 @@
 
 import memoizeOne from 'memoize-one';
 import { isEqual } from 'lodash';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import { IndicesOptions } from '../../../../../../common/types/anomaly_detection_jobs';
 import {
@@ -19,7 +20,6 @@ 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 type { DataView } from '../../../../../../../../../src/plugins/data_views/common';
 
 type DetectorIndex = number;
 export interface LineChartPoint {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
index 9667465eb210d..57ff9527a6682 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 
 export type IndexPatternContextValue = DataView | null;
 export const IndexPatternContext = React.createContext<IndexPatternContextValue>(null);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
index fd1df5395ff84..ebf3a43626c99 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
@@ -6,6 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 
 import { JobCreator } from './job_creator';
@@ -21,7 +22,6 @@ 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 type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 
 export interface RichDetector {
   agg: Aggregation | null;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
index 0f896fb1606cb..8a8db92dcc45f 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEqual } from 'lodash';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, mlCategory } from '../../../../../../common/types/fields';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
index 8c5a45137a8a1..750669a794bd8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
@@ -7,6 +7,8 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { cloneDeep } from 'lodash';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { UrlConfig } from '../../../../../../common/types/custom_urls';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
@@ -15,7 +17,6 @@ import {
   aggregations,
   mlOnlyAggregations,
 } from '../../../../../../common/constants/aggregation_types';
-import { ES_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/public';
 import {
   Job,
   Datafeed,
@@ -40,7 +41,6 @@ import { filterRuntimeMappings } from './util/filter_runtime_mappings';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { Calendar } from '../../../../../../common/types/calendars';
 import { mlCalendarService } from '../../../../services/calendar_service';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { getDatafeedAggregations } from '../../../../../../common/util/datafeed_utils';
 import { getFirstKeyInObject } from '../../../../../../common/util/object_utils';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
index 6af3df888514c..cf4b0be8711f3 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 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 type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { CategorizationJobCreator } from './categorization_job_creator';
 import { RareJobCreator } from './rare_job_creator';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
index 12543f34003d5..1868a43fafef4 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import {
@@ -17,7 +18,6 @@ import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 
 export class MultiMetricJobCreator extends JobCreator {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
index 7f001ce334462..4090303187539 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import {
@@ -17,7 +18,6 @@ import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/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/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
index 8973aa655b83d..9edc3ecdf4fff 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import { Field, SplitField, Aggregation } from '../../../../../../common/types/fields';
 import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_detection_jobs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 import { ML_JOB_AGGREGATION } from '../../../../../../common/constants/aggregation_types';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
index 78b23f6c5d057..ec11b59ff6add 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { JobCreator } from './job_creator';
@@ -22,7 +23,6 @@ import {
 } from '../../../../../../common/constants/aggregation_types';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 
 export class SingleMetricJobCreator extends JobCreator {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
index 46315ac3b02d8..8f7b66b35ec4f 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { Job, Datafeed, Detector } from '../../../../../../../common/types/anomaly_detection_jobs';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities/new_job_capabilities_service';
 import { NavigateToPath } from '../../../../../contexts/kibana';
@@ -19,7 +20,6 @@ import {
   DOC_COUNT,
   _DOC_COUNT,
 } from '../../../../../../../common/constants/field_types';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
 import {
   EVENT_RATE_FIELD_ID,
   Field,
@@ -27,7 +27,7 @@ import {
   mlCategory,
 } from '../../../../../../../common/types/fields';
 import { mlJobService } from '../../../../../services/job_service';
-import { JobCreatorType } from '../index';
+import { JobCreatorType } from '..';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../../common/constants/new_job';
 
 const getFieldByIdFactory = (additionalFields: Field[]) => (id: string) => {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
index 6e65bde879379..7ea7d60706f84 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import { CategorizationJobCreator } from '../job_creator';
 import { ml } from '../../../../services/ml_api_service';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
index a217ea0e06088..44f7eaa19193c 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
@@ -23,6 +23,7 @@ import {
   EuiModalBody,
 } from '@elastic/eui';
 
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { JobCreatorContext } from '../../../job_creator_context';
 import { AdvancedJobCreator } from '../../../../../common/job_creator';
 import { resetAdvancedJob } from '../../../../../common/job_creator/util/general';
@@ -33,7 +34,6 @@ import {
 import { extractErrorMessage } from '../../../../../../../../../common/util/errors';
 import type { DatafeedValidationResponse } from '../../../../../../../../../common/types/job_validation';
 
-import { SavedObjectFinderUi } from '../../../../../../../../../../../../src/plugins/saved_objects/public';
 import {
   useMlKibana,
   useMlApiContext,
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
index 189a4d471024a..b4c25e177fb63 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
@@ -9,7 +9,7 @@ import React, { FC } from 'react';
 import { EuiPageBody, EuiPageContent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedObjectFinderUi } from '../../../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useMlKibana, useNavigateToPath } from '../../../../contexts/kibana';
 import { MlPageHeader } from '../../../../components/page_header';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
index d607fd2edf4ba..1b9a3cacc4102 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
-import type { DataViewsContract } from '../../../../../../../../../src/plugins/data_views/public';
+import type { ApplicationStart } from '@kbn/core/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { mlJobService } from '../../../../services/job_service';
 import { Datafeed } from '../../../../../../common/types/anomaly_detection_jobs';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../common/constants/new_job';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
index 84679a7d4cef4..9767ea8a945f8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
 import { createSearchItems } from './new_job_utils';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
index be4d8f16658e1..69bdfc666b06a 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
@@ -14,8 +14,8 @@ import {
   buildQueryFromFilters,
   DataViewBase,
 } from '@kbn/es-query';
-import { IUiSettingsClient } from 'kibana/public';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../common/constants/search';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
 import { getQueryFromSavedSearchObject } from '../../../util/index_utils';
diff --git a/x-pack/plugins/ml/public/application/license/check_license.tsx b/x-pack/plugins/ml/public/application/license/check_license.tsx
index 4574265736303..5427db87cfc65 100644
--- a/x-pack/plugins/ml/public/application/license/check_license.tsx
+++ b/x-pack/plugins/ml/public/application/license/check_license.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicensingPluginSetup } from '../../../../licensing/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import { MlLicense } from '../../../common/license';
 import { MlClientLicense } from './ml_client_license';
 
diff --git a/x-pack/plugins/ml/public/application/license/expired_warning.tsx b/x-pack/plugins/ml/public/application/license/expired_warning.tsx
index 87b69fc54fc28..5d3a8255a6fba 100644
--- a/x-pack/plugins/ml/public/application/license/expired_warning.tsx
+++ b/x-pack/plugins/ml/public/application/license/expired_warning.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiCallOut } from '@elastic/eui';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { getOverlays, getTheme } from '../util/dependency_cache';
 
 let expiredLicenseBannerId: string;
diff --git a/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts b/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts
index 07a948ed9a28c..02a38f152a3ea 100644
--- a/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts
+++ b/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subject } from 'rxjs';
-import { ILicense } from '../../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 import { MlClientLicense } from './ml_client_license';
 
diff --git a/x-pack/plugins/ml/public/application/management/breadcrumbs.ts b/x-pack/plugins/ml/public/application/management/breadcrumbs.ts
index 1043a9a008734..514941fda2c45 100644
--- a/x-pack/plugins/ml/public/application/management/breadcrumbs.ts
+++ b/x-pack/plugins/ml/public/application/management/breadcrumbs.ts
@@ -11,8 +11,8 @@ import { JOBS_LIST_PATH } from './management_urls';
 export function getJobsListBreadcrumbs() {
   return [
     {
-      text: i18n.translate('xpack.ml.jobsList.breadcrumb', {
-        defaultMessage: 'Jobs',
+      text: i18n.translate('xpack.ml.management.breadcrumb', {
+        defaultMessage: 'Machine Learning',
       }),
       href: `#${JOBS_LIST_PATH}`,
     },
diff --git a/x-pack/plugins/ml/public/application/management/index.ts b/x-pack/plugins/ml/public/application/management/index.ts
index 9dd71f915e03e..86f7fa0ff92ab 100644
--- a/x-pack/plugins/ml/public/application/management/index.ts
+++ b/x-pack/plugins/ml/public/application/management/index.ts
@@ -7,13 +7,12 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { CoreSetup } from 'kibana/public';
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import type { MlStartDependencies } from '../../plugin';
 
-import type { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
-
 export function registerManagementSection(
   management: ManagementSetup,
   core: CoreSetup<MlStartDependencies>,
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
index fb12ca42a1ec7..54018c6f2023a 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import { EuiEmptyPrompt, EuiLink, EuiPageContent } from '@elastic/eui';
 
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index e107e5bfcdfe6..15ea5852ca4b5 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState, Fragment, FC, useMemo, useCallback } from '
 import { Router } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import {
   EuiButtonEmpty,
@@ -22,21 +22,23 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import { PLUGIN_ID } from '../../../../../../common/constants/app';
-import type { ManagementAppMountParams } from '../../../../../../../../../src/plugins/management/public';
-
-import { checkGetManagementMlJobsResolver } from '../../../../capabilities/check_capabilities';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart, SpacesContextProps } from '@kbn/spaces-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { PLUGIN_ID } from '../../../../../../common/constants/app';
+
+import { checkGetManagementMlJobsResolver } from '../../../../capabilities/check_capabilities';
 
-import { getDocLinks } from '../../../../util/dependency_cache';
 // @ts-ignore undeclared module
-import { JobsListView } from '../../../../jobs/jobs_list/components/jobs_list_view/index';
+import { JobsListView } from '../../../../jobs/jobs_list/components/jobs_list_view';
 import { DataFrameAnalyticsList } from '../../../../data_frame_analytics/pages/analytics_management/components/analytics_list';
 import {
   ModelsList,
@@ -44,8 +46,6 @@ import {
 } from '../../../../trained_models/models_management/models_list';
 import { AccessDeniedPage } from '../access_denied_page';
 import { InsufficientLicensePage } from '../insufficient_license_page';
-import type { SharePluginStart } from '../../../../../../../../../src/plugins/share/public';
-import type { SpacesPluginStart, SpacesContextProps } from '../../../../../../../spaces/public';
 import { JobSpacesSyncFlyout } from '../../../../components/job_spaces_sync';
 import { getDefaultAnomalyDetectionJobsListState } from '../../../../jobs/jobs_list/jobs';
 import { getMlGlobalServices } from '../../../../app';
@@ -53,7 +53,7 @@ import { ListingPageUrlState } from '../../../../../../common/types/common';
 import { getDefaultDFAListState } from '../../../../data_frame_analytics/pages/analytics_management/page';
 import { ExportJobsFlyout, ImportJobsFlyout } from '../../../../components/import_export_jobs';
 import type { JobType, MlSavedObjectType } from '../../../../../../common/types/saved_objects';
-import type { FieldFormatsStart } from '../../../../../../../../../src/plugins/field_formats/public';
+import { useMlKibana } from '../../../../contexts/kibana';
 
 interface Tab extends EuiTabbedContentTab {
   'data-test-subj': string;
@@ -201,30 +201,6 @@ export const JobsListPage: FC<{
     return null;
   }
 
-  const anomalyDetectionJobsUrl = getDocLinks().links.ml.anomalyDetectionJobs;
-  const dataFrameAnalyticsUrl = getDocLinks().links.ml.dataFrameAnalytics;
-
-  const anomalyDetectionDocsLabel = i18n.translate(
-    'xpack.ml.management.jobsList.anomalyDetectionDocsLabel',
-    {
-      defaultMessage: 'Anomaly detection jobs docs',
-    }
-  );
-  const analyticsDocsLabel = i18n.translate('xpack.ml.management.jobsList.analyticsDocsLabel', {
-    defaultMessage: 'Analytics jobs docs',
-  });
-
-  const docsLink = (
-    <EuiButtonEmpty
-      href={currentTabId === 'anomaly-detector' ? anomalyDetectionJobsUrl : dataFrameAnalyticsUrl}
-      target="_blank"
-      iconType="help"
-      data-test-subj="documentationLink"
-    >
-      {currentTabId === 'anomaly-detector' ? anomalyDetectionDocsLabel : analyticsDocsLabel}
-    </EuiButtonEmpty>
-  );
-
   function renderTabs() {
     return (
       <EuiTabbedContent
@@ -280,7 +256,7 @@ export const JobsListPage: FC<{
                       defaultMessage="View, export, and import machine learning analytics and anomaly detection items."
                     />
                   }
-                  rightSideItems={[docsLink]}
+                  rightSideItems={[<DocsLink currentTabId={currentTabId} />]}
                   bottomBorder
                 />
 
@@ -329,3 +305,35 @@ export const JobsListPage: FC<{
     </RedirectAppLinks>
   );
 };
+
+const DocsLink: FC<{ currentTabId: MlSavedObjectType }> = ({ currentTabId }) => {
+  const {
+    services: {
+      docLinks: {
+        links: { ml },
+      },
+    },
+  } = useMlKibana();
+
+  let href = ml.anomalyDetectionJobs;
+  let linkLabel = i18n.translate('xpack.ml.management.jobsList.anomalyDetectionDocsLabel', {
+    defaultMessage: 'Anomaly detection jobs docs',
+  });
+
+  if (currentTabId === 'data-frame-analytics') {
+    href = ml.dataFrameAnalytics;
+    linkLabel = i18n.translate('xpack.ml.management.jobsList.analyticsDocsLabel', {
+      defaultMessage: 'Analytics jobs docs',
+    });
+  } else if (currentTabId === 'trained-model') {
+    href = ml.trainedModels;
+    linkLabel = i18n.translate('xpack.ml.management.jobsList.trainedModelsDocsLabel', {
+      defaultMessage: 'Trained models docs',
+    });
+  }
+  return (
+    <EuiButtonEmpty href={href} target="_blank" iconType="help" data-test-subj="documentationLink">
+      {linkLabel}
+    </EuiButtonEmpty>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
index 547f8c8b622ad..abac7e1c3187c 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
@@ -7,18 +7,18 @@
 
 import ReactDOM, { unmountComponentAtNode } from 'react-dom';
 import React from 'react';
-import type { CoreSetup, CoreStart } from 'kibana/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { ManagementAppMountParams } from '../../../../../../../src/plugins/management/public/';
+import type { CoreSetup, CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type { MlStartDependencies } from '../../../plugin';
 import { JobsListPage } from './components';
 import { getJobsListBreadcrumbs } from '../breadcrumbs';
 import { setDependencyCache, clearCache } from '../../util/dependency_cache';
 import './_index.scss';
-import type { SharePluginStart } from '../../../../../../../src/plugins/share/public';
-import type { SpacesPluginStart } from '../../../../../spaces/public';
-import type { FieldFormatsStart } from '../../../../../../../src/plugins/field_formats/public';
 
 const renderApp = (
   element: HTMLElement,
diff --git a/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts b/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts
index d47f144c1df0b..e563831d16376 100644
--- a/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts
+++ b/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts
@@ -9,7 +9,7 @@ import { EuiBreadcrumb } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
 import { NavigateToPath } from '../contexts/kibana';
 
diff --git a/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx b/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx
index e97ab0fb830a5..f1674a12b77c6 100644
--- a/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx
+++ b/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { FC } from 'react';
-import { TrackApplicationView } from '../../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 
 export const MlPageWrapper: FC<{ path: string }> = ({ path, children }) => {
   return <TrackApplicationView viewId={path}>{children}</TrackApplicationView>;
diff --git a/x-pack/plugins/ml/public/application/routing/resolvers.ts b/x-pack/plugins/ml/public/application/routing/resolvers.ts
index d95dfc9d2784f..e5a00437bfe66 100644
--- a/x-pack/plugins/ml/public/application/routing/resolvers.ts
+++ b/x-pack/plugins/ml/public/application/routing/resolvers.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { cacheDataViewsContract, loadSavedSearches } from '../util/index_utils';
 import { checkFullLicense } from '../license';
 import { checkGetJobsCapabilitiesResolver } from '../capabilities/check_capabilities';
 import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
 import { loadMlServerInfo } from '../services/ml_server_info';
 
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
-
 export interface Resolvers {
   [name: string]: () => Promise<any>;
 }
diff --git a/x-pack/plugins/ml/public/application/routing/router.tsx b/x-pack/plugins/ml/public/application/routing/router.tsx
index 08ea9ae5768c6..e4e7daa9ee0e1 100644
--- a/x-pack/plugins/ml/public/application/routing/router.tsx
+++ b/x-pack/plugins/ml/public/application/routing/router.tsx
@@ -14,8 +14,8 @@ import type {
   IUiSettingsClient,
   ChromeStart,
   ChromeBreadcrumb,
-} from 'kibana/public';
-import type { DataViewsContract } from 'src/plugins/data_views/public';
+} from '@kbn/core/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 import { EuiLoadingContent } from '@elastic/eui';
 import { MlContext, MlContextValue } from '../contexts/ml';
diff --git a/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts b/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
index 98deb8df7b60d..2ff7d4b024800 100644
--- a/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
@@ -7,11 +7,11 @@
 
 import { renderHook, act } from '@testing-library/react-hooks';
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 import { useCreateAndNavigateToMlLink } from '../contexts/kibana/use_create_url';
 import { useNotifications } from '../contexts/kibana';
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 import { useResolver } from './use_resolver';
 
diff --git a/x-pack/plugins/ml/public/application/routing/use_resolver.ts b/x-pack/plugins/ml/public/application/routing/use_resolver.ts
index 59d64f412cc80..26ecb494ab00d 100644
--- a/x-pack/plugins/ml/public/application/routing/use_resolver.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_resolver.ts
@@ -6,8 +6,9 @@
  */
 
 import { useEffect, useState } from 'react';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import {
   getDataViewById,
   getDataViewAndSavedSearch,
@@ -19,7 +20,6 @@ import { MlContextValue } from '../contexts/ml';
 import { useNotifications } from '../contexts/kibana';
 import { useCreateAndNavigateToMlLink } from '../contexts/kibana/use_create_url';
 import { ML_PAGES } from '../../../common/constants/locator';
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 
 /**
  * Hook to resolve route specific requirements
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
index ff89d29ca4dbb..25b1b6b0f14a7 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
@@ -7,12 +7,12 @@
 
 import { Observable, of } from 'rxjs';
 import { map as mapObservable } from 'rxjs/operators';
+import type { TimefilterContract, TimeRange } from '@kbn/data-plugin/public';
 import type { RecordForInfluencer } from './results_service/results_service';
 import type { EntityField } from '../../../common/util/anomaly_utils';
 import type { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import type { MlApiServices } from './ml_api_service';
 import type { MlResultsService } from './results_service';
-import type { TimefilterContract, TimeRange } from '../../../../../../src/plugins/data/public';
 import { isPopulatedObject } from '../../../common/util/object_utils';
 import { ExplorerChartsData } from '../explorer/explorer_charts/explorer_charts_container_service';
 import type { TimeRangeBounds } from '../util/time_buckets';
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
index e22f5680532ba..76000e93ef4eb 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
-import {
-  TimefilterContract,
-  TimeRange,
-  UI_SETTINGS,
-} from '../../../../../../src/plugins/data/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { TimefilterContract, TimeRange, UI_SETTINGS } from '@kbn/data-plugin/public';
 import {
   getBoundsRoundedToInterval,
   TimeBuckets,
diff --git a/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts b/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts
index 4cc8361be08cc..0fbe372dc24e1 100644
--- a/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts
+++ b/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { dashboardServiceProvider } from './dashboard_service';
-import { savedObjectsServiceMock } from '../../../../../../src/core/public/mocks';
-import type { DashboardAppLocator } from '../../../../../../src/plugins/dashboard/public';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import type { DashboardAppLocator } from '@kbn/dashboard-plugin/public';
 
 describe('DashboardService', () => {
   const mockSavedObjectClient = savedObjectsServiceMock.createStartContract().client;
diff --git a/x-pack/plugins/ml/public/application/services/dashboard_service.ts b/x-pack/plugins/ml/public/application/services/dashboard_service.ts
index f8eb23eae9f4c..ff7b696551f41 100644
--- a/x-pack/plugins/ml/public/application/services/dashboard_service.ts
+++ b/x-pack/plugins/ml/public/application/services/dashboard_service.ts
@@ -5,14 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { useMemo } from 'react';
-import {
-  DashboardSavedObject,
-  DashboardAppLocator,
-} from '../../../../../../src/plugins/dashboard/public';
+import { DashboardSavedObject, DashboardAppLocator } from '@kbn/dashboard-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { useMlKibana } from '../contexts/kibana';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
 
 export type DashboardService = ReturnType<typeof dashboardServiceProvider>;
 
diff --git a/x-pack/plugins/ml/public/application/services/field_format_service.ts b/x-pack/plugins/ml/public/application/services/field_format_service.ts
index ddcb447430a45..6ebd68f6fa8a0 100644
--- a/x-pack/plugins/ml/public/application/services/field_format_service.ts
+++ b/x-pack/plugins/ml/public/application/services/field_format_service.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { mlFunctionToESAggregation } from '../../../common/util/job_utils';
 import { getDataViewById, getDataViewIdFromName } from '../util/index_utils';
 import { mlJobService } from './job_service';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
 
 type FormatsByJobId = Record<string, any>;
 type IndexPatternIdsByJob = Record<string, any>;
diff --git a/x-pack/plugins/ml/public/application/services/http_service.ts b/x-pack/plugins/ml/public/application/services/http_service.ts
index 50e8bdfb5f485..839daf8b35f4e 100644
--- a/x-pack/plugins/ml/public/application/services/http_service.ts
+++ b/x-pack/plugins/ml/public/application/services/http_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { HttpFetchOptionsWithPath, HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptionsWithPath, HttpFetchOptions, HttpStart } from '@kbn/core/public';
 import { getHttp } from '../util/dependency_cache';
 
 function getResultHeaders(headers: HeadersInit) {
diff --git a/x-pack/plugins/ml/public/application/services/job_service.d.ts b/x-pack/plugins/ml/public/application/services/job_service.d.ts
index 3d49d03c1cde6..ad1cef009edba 100644
--- a/x-pack/plugins/ml/public/application/services/job_service.d.ts
+++ b/x-pack/plugins/ml/public/application/services/job_service.d.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { TimeRange } from 'src/plugins/data/common/query/timefilter/types';
+import { TimeRange } from '@kbn/data-plugin/common/query/timefilter/types';
 import { CombinedJob, Datafeed, Job } from '../../../common/types/anomaly_detection_jobs';
 import { Calendar } from '../../../common/types/calendars';
 
diff --git a/x-pack/plugins/ml/public/application/services/job_service.js b/x-pack/plugins/ml/public/application/services/job_service.js
index 4a6f7dbbcc3ff..ebb89b84dd638 100644
--- a/x-pack/plugins/ml/public/application/services/job_service.js
+++ b/x-pack/plugins/ml/public/application/services/job_service.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 
 import { ml } from './ml_api_service';
 
-import { getToastNotificationService } from '../services/toast_notification_service';
+import { getToastNotificationService } from './toast_notification_service';
 import { isWebUrl } from '../util/url_utils';
 import { TIME_FORMAT } from '../../../common/constants/time_format';
 import { parseInterval } from '../../../common/util/parse_interval';
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts
index 248b72344dc6b..9e0b1be60460b 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts
@@ -7,7 +7,7 @@
 
 import type { Annotation, GetAnnotationsResponse } from '../../../../common/types/annotations';
 import { http, http$ } from '../http_service';
-import { basePath } from './index';
+import { basePath } from '.';
 
 export const annotations = {
   getAnnotations$(obj: {
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
index 9c98716eab069..e4deb90d81073 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
@@ -7,7 +7,7 @@
 
 import { http } from '../http_service';
 
-import { basePath } from './index';
+import { basePath } from '.';
 import type { DataFrameAnalyticsStats } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/common';
 import type { ValidateAnalyticsJobResponse } from '../../../../common/constants/validation';
 import type {
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts
index cf49031c665e7..e1884b0125858 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts
@@ -10,7 +10,7 @@
 
 import { http } from '../http_service';
 
-import { basePath } from './index';
+import { basePath } from '.';
 import type { Filter, FilterStats } from '../../../../common/types/filters';
 
 export const filters = {
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
index 87f1a8eec2478..96001423e7ce7 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Observable } from 'rxjs';
-import type { HttpStart } from 'kibana/public';
+import type { HttpStart } from '@kbn/core/public';
 import { HttpService } from '../http_service';
 
 import { annotations } from './annotations';
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
index ea84fcf72f2da..85f5917e2430b 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
@@ -6,8 +6,9 @@
  */
 
 // Service for obtaining data for the ML Results dashboards.
+import type { ESSearchRequest, ESSearchResponse } from '@kbn/core/types/elasticsearch';
 import { HttpService } from '../http_service';
-import { basePath } from './index';
+import { basePath } from '.';
 import { JOB_ID, PARTITION_FIELD_VALUE } from '../../../../common/constants/anomalies';
 import type {
   GetStoppedPartitionResult,
@@ -16,10 +17,6 @@ import type {
 import type { JobId } from '../../../../common/types/anomaly_detection_jobs';
 import type { PartitionFieldsDefinition } from '../results_service/result_service_rx';
 import type { PartitionFieldsConfig } from '../../../../common/types/storage';
-import type {
-  ESSearchRequest,
-  ESSearchResponse,
-} from '../../../../../../../src/core/types/elasticsearch';
 import type { MLAnomalyDoc } from '../../../../common/types/anomalies';
 import type { EntityField } from '../../../../common/util/anomaly_utils';
 import type { InfluencersFilterQuery } from '../../../../common/types/es_client';
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts
index 131244e7122cc..943de0b2df52e 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts
@@ -12,7 +12,7 @@ import { useMlKibana } from '../../contexts/kibana';
 
 import { HttpService } from '../http_service';
 
-import { basePath } from './index';
+import { basePath } from '.';
 import type {
   JobType,
   MlSavedObjectType,
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
index 738f5e1ace74a..aefdf0ce6e431 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
@@ -8,9 +8,9 @@
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { useMemo } from 'react';
-import { HttpFetchQuery } from 'kibana/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { HttpService } from '../http_service';
-import { basePath } from './index';
+import { basePath } from '.';
 import { useMlKibana } from '../../contexts/kibana';
 import type {
   TrainedModelConfigResponse,
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
index 8c05d5a418219..c42735388def2 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import { getDataViewAndSavedSearch } from '../../util/index_utils';
 import { JobType } from '../../../../common/types/saved_objects';
-import { newJobCapsServiceAnalytics } from '../new_job_capabilities/new_job_capabilities_service_analytics';
-import { newJobCapsService } from '../new_job_capabilities/new_job_capabilities_service';
+import { newJobCapsServiceAnalytics } from './new_job_capabilities_service_analytics';
+import { newJobCapsService } from './new_job_capabilities_service';
 
 export const ANOMALY_DETECTOR = 'anomaly-detector';
 export const DATA_FRAME_ANALYTICS = 'data-frame-analytics';
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
index 373de76d59457..3671b7a4ec585 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { newJobCapsService } from './new_job_capabilities_service';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/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/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts
index bbb9b141c7349..3d79672bcfed9 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { Aggregation, Field, NewJobCaps } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 
 // create two lists, one removing text fields if there are keyword equivalents and vice versa
 export function processTextAndKeywordFields(fields: Field[]) {
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
index 210c409e8e281..7592a13bdcb76 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
@@ -4,6 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import {
   Field,
   Aggregation,
@@ -11,8 +13,6 @@ import {
   FieldId,
   EVENT_RATE_FIELD_ID,
 } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { ml } from '../ml_api_service';
 import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';
 
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
index 2786c14127ecd..d3b74dea3669d 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { Field, NewJobCapsResponse } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';
 import { ml } from '../ml_api_service';
 
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
index ec2a2a1077a7f..accd8dc9e8cd0 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { removeNestedFieldChildren } from './new_job_capabilities_service_analytics';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/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/plugins/ml/public/application/services/results_service/result_service_rx.ts b/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
index 22b47f9c28dd9..54dece80f22cf 100644
--- a/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
+++ b/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
@@ -19,7 +19,7 @@ import { Dictionary } from '../../../../common/types/common';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 import { Datafeed, JobId } from '../../../../common/types/anomaly_detection_jobs';
 import { MlApiServices } from '../ml_api_service';
-import { CriteriaField } from './index';
+import { CriteriaField } from '.';
 import { findAggField } from '../../../../common/util/validation_utils';
 import { getDatafeedAggregations } from '../../../../common/util/datafeed_utils';
 import { aggregationTypeTransform, EntityField } from '../../../../common/util/anomaly_utils';
diff --git a/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts b/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts
index 6b8646fec02b7..e967f3547b475 100644
--- a/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts
+++ b/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ToastInput, ToastOptions, ToastsStart } from 'kibana/public';
+import { ToastInput, ToastOptions, ToastsStart } from '@kbn/core/public';
 import { useMemo } from 'react';
 import { getToastNotifications } from '../../util/dependency_cache';
 import { useNotifications } from '../../contexts/kibana';
diff --git a/x-pack/plugins/ml/public/application/services/usage_collection.test.ts b/x-pack/plugins/ml/public/application/services/usage_collection.test.ts
index 2c16b028bd277..965d25f6d8322 100644
--- a/x-pack/plugins/ml/public/application/services/usage_collection.test.ts
+++ b/x-pack/plugins/ml/public/application/services/usage_collection.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 import { mlUsageCollectionProvider } from './usage_collection';
 
diff --git a/x-pack/plugins/ml/public/application/services/usage_collection.ts b/x-pack/plugins/ml/public/application/services/usage_collection.ts
index 3ec70b1995c0f..bc90a47a0d71e 100644
--- a/x-pack/plugins/ml/public/application/services/usage_collection.ts
+++ b/x-pack/plugins/ml/public/application/services/usage_collection.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { PLUGIN_ID } from '../../../common/constants/app';
 import { MlUsageEvent } from '../../../common/constants/usage_collection';
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js
index 842ee0e5e55f5..ce1dfe7cd970f 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js
@@ -17,7 +17,7 @@ import { CalendarForm } from './calendar_form';
 import { NewEventModal } from './new_event_modal';
 import { ImportModal } from './import_modal';
 import { ml } from '../../../services/ml_api_service';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GLOBAL_CALENDAR } from '../../../../../common/constants/calendars';
 import { ML_PAGES } from '../../../../../common/constants/locator';
 import { getDocLinks } from '../../../util/dependency_cache';
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
index 73391f3cba87f..7a5cde3b36187 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
@@ -61,7 +61,7 @@ jest.mock('./utils', () => ({
       })
   ),
 }));
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js
index 60bdd4bd98e70..9864078aff698 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js
@@ -17,7 +17,7 @@ import { mlNodesAvailable } from '../../../ml_nodes_check/check_ml_nodes';
 import { deleteCalendars } from './delete_calendars';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { getDocLinks } from '../../../util/dependency_cache';
 import { HelpMenu } from '../../../components/help_menu';
 
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
index ee1879a8a3c7a..bbfdf7ef6b0e4 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
@@ -50,7 +50,7 @@ jest.mock('react', () => {
   return { ...r, memo: (x) => x };
 });
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (node) => {
     return node;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/header.js b/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
index e8feeaaf65ac0..08f345b2de5a2 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
@@ -23,7 +23,7 @@ import {
   EuiButtonEmpty,
 } from '@elastic/eui';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { MlPageHeader } from '../../../components/page_header';
 
 function CalendarsListHeaderUI({ totalCount, refreshCalendars, kibana }) {
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js b/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
index da470441caa98..ba4d49a31135c 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { CalendarsListHeader } from './header';
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js
index 89d4daa07298a..1c6dc162f505f 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js
@@ -25,7 +25,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { EditFilterListHeader } from './header';
 import { EditFilterListToolbar } from './toolbar';
 import { ItemsGrid } from '../../../components/items_grid';
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js
index c20b8485b7cd1..45c43e04daa68 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js
@@ -45,7 +45,7 @@ jest.mock('../../../services/ml_api_service', () => ({
   },
 }));
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (node) => {
     return node;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js
index 4d20ddd0f18b0..352856c6fcf51 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js
@@ -14,7 +14,7 @@ import { PropTypes } from 'prop-types';
 
 import { i18n } from '@kbn/i18n';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 import { FilterListsHeader } from './header';
 import { FilterListsTable } from './table';
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js
index e6a69e971a864..5d0306564e312 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js
@@ -26,7 +26,7 @@ jest.mock('../../../capabilities/check_capabilities', () => ({
   checkPermission: () => true,
 }));
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (node) => {
     return node;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
index 0da6128b33ed3..63523a3670541 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
@@ -23,7 +23,7 @@ import {
   EuiButtonEmpty,
 } from '@elastic/eui';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { MlPageHeader } from '../../../components/page_header';
 
 function FilterListsHeaderUI({ totalCount, refreshFilterLists, kibana }) {
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js
index f5d39bea56e72..72120de653b16 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js
@@ -27,7 +27,7 @@ import { mlJobService } from '../../../services/job_service';
 import { mlForecastService } from '../../../services/forecast_service';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 export const FORECAST_DURATION_MAX_DAYS = 3650; // Max forecast duration allowed by analytics.
 
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 7f7750b904d02..f6fa86c85cccb 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -32,7 +32,7 @@ import {
   EuiAccordion,
   EuiBadge,
 } from '@elastic/eui';
-import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 import { TimeSeriesExplorerHelpPopover } from './timeseriesexplorer_help_popover';
 
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts
index 1195e085de795..24d44dc157032 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts
@@ -9,7 +9,7 @@ import { difference, without } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 
-import { ToastsStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
 import { MlJobWithTimeRange } from '../../../../common/types/anomaly_detection_jobs';
 
 import { mlJobService } from '../../services/job_service';
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx
index a50844bdac26f..8b868a088499d 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx
@@ -22,6 +22,7 @@ import {
 } from '@elastic/eui';
 import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import type { ModelItemFull } from './models_list';
 import { isDefined } from '../../../../common/types/guards';
 import { isPopulatedObject } from '../../../../common';
@@ -29,7 +30,6 @@ import { ModelPipelines } from './pipelines';
 import { AllocatedModels } from '../nodes_overview/allocated_models';
 import type { AllocatedModel } from '../../../../common/types/trained_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface ExpandedRowProps {
   item: ModelItemFull;
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx
index 30e110317148b..6a97131723229 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx
@@ -8,9 +8,9 @@
 import React, { FC } from 'react';
 import { EuiConfirmModal } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { OverlayStart, ThemeServiceStart } from 'kibana/public';
+import type { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import type { ModelItem } from './models_list';
-import { toMountPoint, wrapWithTheme } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface ForceStopModelConfirmDialogProps {
   model: ModelItem;
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx
index 0d3b071d5063e..063235e9db9fd 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx
@@ -25,8 +25,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
 import { EuiTableSelectionType } from '@elastic/eui/src/components/basic_table/table_types';
 import { Action } from '@elastic/eui/src/components/basic_table/action_types';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { getAnalysisType } from '../../data_frame_analytics/common';
-import { ModelsTableToConfigMapping } from './index';
+import { ModelsTableToConfigMapping } from '.';
 import { ModelsBarStats, StatsBar } from '../../components/stats_bar';
 import { useMlKibana, useMlLocator, useNavigateToPath, useTimefilter } from '../../contexts/kibana';
 import { useTrainedModelsApiService } from '../../services/ml_api_service/trained_models';
@@ -47,7 +48,6 @@ import { isPopulatedObject } from '../../../../common';
 import { useTableSettings } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings';
 import { useToastNotificationService } from '../../services/toast_notification_service';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 import { useRefresh } from '../../routing/use_refresh';
 import { DEPLOYMENT_STATE, TRAINED_MODEL_TYPE } from '../../../../common/constants/trained_models';
 import { getUserConfirmationProvider } from './force_stop_dialog';
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx
index e4d18a7f1b0c4..86284bd23796b 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx
@@ -11,8 +11,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
 import { i18n } from '@kbn/i18n';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { useFieldFormatter } from '../../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../../src/plugins/field_formats/common';
 import { IngestStatsResponse } from './pipelines';
 import { HelpIcon } from '../../../components/help_icon';
 
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
index 79c2cbc1e4a42..e053a2a50819f 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
@@ -8,12 +8,12 @@ import React, { FC } from 'react';
 import { EuiBadge, EuiInMemoryTable, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import type {
   AllocatedModel,
   NodeDeploymentStatsResponse,
 } from '../../../../common/types/trained_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface AllocatedModelsProps {
   models: NodeDeploymentStatsResponse['allocated_models'];
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx
index b8920acde568e..4c96904862786 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx
@@ -16,11 +16,11 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { cloneDeep } from 'lodash';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { NodeItem } from './nodes_list';
 import { useListItemsFormatter } from '../models_management/expanded_row';
 import { AllocatedModels } from './allocated_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface ExpandedRowProps {
   item: NodeItem;
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx
index e355bc26f7fa7..a9b37d5be1a6c 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx
@@ -19,10 +19,10 @@ import {
   AnnotationDomainType,
 } from '@elastic/charts';
 import { EuiIcon, euiPaletteGray } from '@elastic/eui';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { NodeDeploymentStatsResponse } from '../../../../common/types/trained_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
 import { useCurrentEuiTheme } from '../../components/color_range_legend';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface MemoryPreviewChartProps {
   memoryOverview: NodeDeploymentStatsResponse['memory_overview'];
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
index 170d05a16b974..4455e9e2709a1 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
@@ -16,6 +16,7 @@ import {
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
 import { i18n } from '@kbn/i18n';
 import { cloneDeep } from 'lodash';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { ModelsBarStats, StatsBar } from '../../components/stats_bar';
 import { NodeDeploymentStatsResponse } from '../../../../common/types/trained_models';
 import { usePageUrlState } from '../../util/url_state';
@@ -27,7 +28,6 @@ import { MemoryPreviewChart } from './memory_preview_chart';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
 import { ListingPageUrlState } from '../../../../common/types/common';
 import { useToastNotificationService } from '../../services/toast_notification_service';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 import { useRefresh } from '../../routing/use_refresh';
 
 export type NodeItem = NodeDeploymentStatsResponse;
diff --git a/x-pack/plugins/ml/public/application/util/chart_utils.test.js b/x-pack/plugins/ml/public/application/util/chart_utils.test.js
index 2c457b079542a..83c7b58afbefd 100644
--- a/x-pack/plugins/ml/public/application/util/chart_utils.test.js
+++ b/x-pack/plugins/ml/public/application/util/chart_utils.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import seriesConfig from '../explorer/explorer_charts/__mocks__/mock_series_config_filebeat';
+import seriesConfig from '../explorer/explorer_charts/__mocks__/mock_series_config_filebeat.json';
 
 jest.mock('./dependency_cache', () => {
   const dateMath = require('@kbn/datemath');
diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
index bba71a23f98c3..3680f8b63b0c9 100644
--- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataPublicPluginSetup } from 'src/plugins/data/public';
+import type { DataPublicPluginSetup } from '@kbn/data-plugin/public';
 import type {
   IUiSettingsClient,
   ChromeStart,
@@ -19,14 +19,14 @@ import type {
   ThemeServiceStart,
   ChromeRecentlyAccessed,
   IBasePath,
-} from 'kibana/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { DashboardStart } from 'src/plugins/dashboard/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
-import type { SecurityPluginSetup } from '../../../../security/public';
-import type { MapsStartApi } from '../../../../maps/public';
-import type { DataVisualizerPluginStart } from '../../../../data_visualizer/public';
+} from '@kbn/core/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { DataVisualizerPluginStart } from '@kbn/data-visualizer-plugin/public';
 
 export interface DependencyCache {
   timefilter: DataPublicPluginSetup['query']['timefilter'] | null;
@@ -38,7 +38,7 @@ export interface DependencyCache {
   theme: ThemeServiceStart | null;
   recentlyAccessed: ChromeRecentlyAccessed | null;
   fieldFormats: FieldFormatsStart | null;
-  autocomplete: DataPublicPluginStart['autocomplete'] | null;
+  autocomplete: UnifiedSearchPublicPluginStart['autocomplete'] | null;
   basePath: IBasePath | null;
   savedObjectsClient: SavedObjectsClientContract | null;
   application: ApplicationStart | null;
diff --git a/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts b/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
index 0c50dc9efa343..655f78c681c93 100644
--- a/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
-import { DataViewField } from '../../../../../../src/plugins/data_views/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import {
   kbnTypeToMLJobType,
diff --git a/x-pack/plugins/ml/public/application/util/field_types_utils.ts b/x-pack/plugins/ml/public/application/util/field_types_utils.ts
index c02a1cbec56ec..e996f03ae3982 100644
--- a/x-pack/plugins/ml/public/application/util/field_types_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/field_types_utils.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
-import { DataViewField } from '../../../../../../src/plugins/data_views/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 
 // convert kibana types to ML Job types
 // this is needed because kibana types only have string and not text and keyword.
diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts
index 503c20dfc5bdb..89b35624f11a9 100644
--- a/x-pack/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/index_utils.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Query } from '../../../../../../src/plugins/data/public';
-import type { DataView, DataViewsContract } from '../../../../../../src/plugins/data_views/public';
+import type { Query } from '@kbn/data-plugin/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import type { SavedSearchSavedObject } from '../../../common/types/kibana';
 import { getToastNotifications, getSavedObjectsClient } from './dependency_cache';
 
diff --git a/x-pack/plugins/ml/public/application/util/recently_accessed.ts b/x-pack/plugins/ml/public/application/util/recently_accessed.ts
index 4ab3b3d9a7327..ff995be1c4b82 100644
--- a/x-pack/plugins/ml/public/application/util/recently_accessed.ts
+++ b/x-pack/plugins/ml/public/application/util/recently_accessed.ts
@@ -9,7 +9,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { ChromeRecentlyAccessed } from 'kibana/public';
+import type { ChromeRecentlyAccessed } from '@kbn/core/public';
 import { getRecentlyAccessed } from './dependency_cache';
 
 export function addItemToRecentlyAccessed(
diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.d.ts b/x-pack/plugins/ml/public/application/util/time_buckets.d.ts
index 3ff9ae0d36e26..8d8618aa7c97b 100644
--- a/x-pack/plugins/ml/public/application/util/time_buckets.d.ts
+++ b/x-pack/plugins/ml/public/application/util/time_buckets.d.ts
@@ -6,7 +6,7 @@
  */
 
 import { Moment } from 'moment';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 
 export interface TimeRangeBounds {
   min?: Moment;
diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.js b/x-pack/plugins/ml/public/application/util/time_buckets.js
index 21a991ce0a190..432a97c08189f 100644
--- a/x-pack/plugins/ml/public/application/util/time_buckets.js
+++ b/x-pack/plugins/ml/public/application/util/time_buckets.js
@@ -12,8 +12,8 @@ import dateMath from '@kbn/datemath';
 import { timeBucketsCalcAutoIntervalProvider } from './calc_auto_interval';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { getFieldFormats, getUiSettings } from './dependency_cache';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
-import { FIELD_FORMAT_IDS } from '../../../../../../src/plugins/field_formats/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 
 const unitsDesc = dateMath.unitsDesc;
 
diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.test.js b/x-pack/plugins/ml/public/application/util/time_buckets.test.js
index 7977e5a0286f5..edb2cf538ae37 100644
--- a/x-pack/plugins/ml/public/application/util/time_buckets.test.js
+++ b/x-pack/plugins/ml/public/application/util/time_buckets.test.js
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { TimeBuckets, getBoundsRoundedToInterval, calcEsInterval } from './time_buckets';
 
 describe('ML - time buckets', () => {
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
index 40d44d94c4519..137b9ec260b92 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
@@ -7,14 +7,12 @@
 
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { Subject } from 'rxjs';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { Embeddable, IContainer } from '../../../../../../src/plugins/embeddable/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { EmbeddableAnomalyChartsContainer } from './embeddable_anomaly_charts_container_lazy';
 import type { JobId } from '../../../common/types/anomaly_detection_jobs';
 import type { MlDependencies } from '../../application/app';
@@ -24,7 +22,6 @@ import {
   AnomalyChartsEmbeddableOutput,
   AnomalyChartsServices,
 } from '..';
-import type { DataView } from '../../../../../../src/plugins/data_views/common';
 import { EmbeddableLoading } from '../common/components/embeddable_loading_fallback';
 export const getDefaultExplorerChartsPanelTitle = (jobIds: JobId[]) =>
   i18n.translate('xpack.ml.anomalyChartsEmbeddable.title', {
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts
index 40d9e54082c35..dd7408287cbf4 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { AnomalyChartsEmbeddableFactory } from './anomaly_charts_embeddable_factory';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { AnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
 import { AnomalyChartsEmbeddableInput } from '..';
 
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts
index b95c2b18128fe..e502d03bcd964 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts
@@ -7,13 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { StartServicesAccessor } from 'kibana/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
+import type { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { PLUGIN_ICON, PLUGIN_ID, ML_APP_NAME } from '../../../common/constants/app';
-import type {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
 import { HttpService } from '../../application/services/http_service';
 import type { MlPluginStart, MlStartDependencies } from '../../plugin';
 import type { MlDependencies } from '../../application/app';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx
index be09b38ff034e..c65d46d88402e 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { lastValueFrom } from 'rxjs';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { VIEW_BY_JOB_LABEL } from '../../application/explorer/explorer_constants';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
 import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
 import { getDefaultExplorerChartsPanelTitle } from './anomaly_charts_embeddable';
 import { HttpService } from '../../application/services/http_service';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx
index 9b38d67847388..5a22cb7809a8c 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx
@@ -14,10 +14,10 @@ import {
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
 import { AnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import { MlDependencies } from '../../application/app';
-import { TriggerContract } from 'src/plugins/ui_actions/public/triggers';
+import { TriggerContract } from '@kbn/ui-actions-plugin/public/triggers';
 import { AnomalyChartsEmbeddableInput, AnomalyChartsServices } from '..';
 import { ExplorerAnomaliesContainer } from '../../application/explorer/explorer_charts/explorer_anomalies_container';
 import { createMlResultsServiceMock } from '../../application/services/ml_results_service';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
index e3f8fb3dcdeff..9f31f5777f9de 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
@@ -10,6 +10,7 @@ import { EuiCallOut, EuiLoadingChart, EuiResizeObserver, EuiText } from '@elasti
 import { Observable } from 'rxjs';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { throttle } from 'lodash';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import type { IAnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
 import type {
@@ -23,7 +24,6 @@ import { ExplorerAnomaliesContainer } from '../../application/explorer/explorer_
 import { ML_APP_LOCATOR } from '../../../common/constants/locator';
 import { optionValueToThreshold } from '../../application/components/controls/select_severity/select_severity';
 import { ANOMALY_THRESHOLD } from '../../../common';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { TimeBuckets } from '../../application/util/time_buckets';
 import { EXPLORER_ENTITY_FIELD_SELECTION_TRIGGER } from '../../ui_actions/triggers';
 import { MlLocatorParams } from '../../../common/types/locator';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts
index 45a0bf5e7dfc9..4231f08b00c45 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts
@@ -9,7 +9,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { AnomalyChartsEmbeddableInput, AnomalyChartsServices } from '../types';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { MlStartDependencies } from '../../plugin';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import { EmbeddableAnomalyChartsContainerProps } from './embeddable_anomaly_charts_container';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
index c6dc3ec41ff9e..9d85f4af01f53 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
@@ -8,7 +8,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import { combineLatest, Observable, of, Subject } from 'rxjs';
 import { catchError, debounceTime, skipWhile, startWith, switchMap, tap } from 'rxjs/operators';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { MlStartDependencies } from '../../plugin';
 import {
   AppStateSelectedCells,
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
index 43dc11f8d2627..bb239868aed77 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
@@ -7,14 +7,11 @@
 
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { Subject } from 'rxjs';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { Embeddable, IContainer } from '../../../../../../src/plugins/embeddable/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import { EmbeddableSwimLaneContainer } from './embeddable_swim_lane_container_lazy';
 import type { JobId } from '../../../common/types/anomaly_detection_jobs';
 import type { MlDependencies } from '../../application/app';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
index f318d61014027..cb759f6783b46 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane_embeddable_factory';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { AnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
 import { AnomalySwimlaneEmbeddableInput } from '..';
 
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
index 1d7e2ddf4d495..806856fbf06ad 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
@@ -7,13 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { StartServicesAccessor } from 'kibana/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
+import type { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { PLUGIN_ID, PLUGIN_ICON, ML_APP_NAME } from '../../../common/constants/app';
-import type {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
 import { HttpService } from '../../application/services/http_service';
 import type { MlPluginStart, MlStartDependencies } from '../../plugin';
 import type { MlDependencies } from '../../application/app';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
index 62754804c1b92..728c89136123b 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { lastValueFrom } from 'rxjs';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { VIEW_BY_JOB_LABEL } from '../../application/explorer/explorer_constants';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
 import { AnomalySwimlaneInitializer } from './anomaly_swimlane_initializer';
 import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
 import { getDefaultSwimlanePanelTitle } from './anomaly_swimlane_embeddable';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
index e9ff81ac07bdc..d64e1c1cd3d1d 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
@@ -14,12 +14,12 @@ import {
 import { BehaviorSubject, Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
 import { AnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { useSwimlaneInputResolver } from './swimlane_input_resolver';
 import { SWIMLANE_TYPE } from '../../application/explorer/explorer_constants';
 import { SwimlaneContainer } from '../../application/explorer/swimlane_container';
 import { MlDependencies } from '../../application/app';
-import { TriggerContract } from 'src/plugins/ui_actions/public/triggers';
+import { TriggerContract } from '@kbn/ui-actions-plugin/public/triggers';
 import { AnomalySwimlaneEmbeddableInput, AnomalySwimlaneServices } from '..';
 import { createCoreStartMock } from '../../__mocks__/core_start';
 import { createMlStartDepsMock } from '../../__mocks__/ml_start_deps';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
index ac9586bfa69ae..06c400481491a 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
@@ -9,7 +9,7 @@ import React, { FC, useCallback, useState, useEffect } from 'react';
 import { EuiCallOut, EuiEmptyPrompt } from '@elastic/eui';
 import { Observable } from 'rxjs';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { IAnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
 import { useSwimlaneInputResolver } from './swimlane_input_resolver';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
index ec2f600aa618d..eace431179dad 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
@@ -9,7 +9,7 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { useSwimlaneInputResolver } from './swimlane_input_resolver';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { SWIMLANE_TYPE } from '../../application/explorer/explorer_constants';
-import { CoreStart, IUiSettingsClient } from 'kibana/public';
+import { CoreStart, IUiSettingsClient } from '@kbn/core/public';
 import { MlStartDependencies } from '../../plugin';
 import { AnomalySwimlaneEmbeddableInput, AnomalySwimlaneServices } from '..';
 
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
index ee3a635071071..9a8a3d2e54b92 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
@@ -19,7 +19,9 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { TimeBuckets } from '../../application/util/time_buckets';
 import { MlStartDependencies } from '../../plugin';
 import {
@@ -28,10 +30,8 @@ import {
   SWIMLANE_TYPE,
   SwimlaneType,
 } from '../../application/explorer/explorer_constants';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
 import { OverallSwimlaneData } from '../../application/explorer/explorer_utils';
 import { isViewBySwimLaneData } from '../../application/explorer/swimlane_container';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
 import {
   AnomalySwimlaneEmbeddableInput,
   AnomalySwimlaneEmbeddableOutput,
diff --git a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
index bf7ea8eac3f50..259eb734f5383 100644
--- a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
+++ b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
@@ -4,19 +4,19 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import { takeUntil } from 'rxjs/operators';
 import { from } from 'rxjs';
 import React from 'react';
-import { getInitialGroupsMap } from '../../application/components/job_selector/job_selector';
 import {
   KibanaContextProvider,
   toMountPoint,
   wrapWithTheme,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { DashboardConstants } from '@kbn/dashboard-plugin/public';
+import { getInitialGroupsMap } from '../../application/components/job_selector/job_selector';
 import { getMlGlobalServices } from '../../application/app';
-import { DashboardConstants } from '../../../../../../src/plugins/dashboard/public';
 import { JobId } from '../../../common/types/anomaly_detection_jobs';
 import { JobSelectorFlyout } from './components/job_selector_flyout';
 
diff --git a/x-pack/plugins/ml/public/embeddables/index.ts b/x-pack/plugins/ml/public/embeddables/index.ts
index 2011d7217094b..f3df542bb94f9 100644
--- a/x-pack/plugins/ml/public/embeddables/index.ts
+++ b/x-pack/plugins/ml/public/embeddables/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { EmbeddableSetup } from '@kbn/embeddable-plugin/public';
 import { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane';
 import type { MlCoreSetup } from '../plugin';
-import type { EmbeddableSetup } from '../../../../../src/plugins/embeddable/public';
 import { AnomalyChartsEmbeddableFactory } from './anomaly_charts';
 
 export * from './constants';
diff --git a/x-pack/plugins/ml/public/embeddables/types.ts b/x-pack/plugins/ml/public/embeddables/types.ts
index bf23f397fe08c..228ce092d4cec 100644
--- a/x-pack/plugins/ml/public/embeddables/types.ts
+++ b/x-pack/plugins/ml/public/embeddables/types.ts
@@ -5,16 +5,13 @@
  * 2.0.
  */
 
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import type { Filter, Query } from '@kbn/es-query';
+import type { RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
+import type { EmbeddableInput, EmbeddableOutput, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import type { JobId } from '../../common/types/anomaly_detection_jobs';
 import type { SwimlaneType } from '../application/explorer/explorer_constants';
-import type { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common';
-import type {
-  EmbeddableInput,
-  EmbeddableOutput,
-  IEmbeddable,
-} from '../../../../../src/plugins/embeddable/public';
 import type { AnomalyDetectorService } from '../application/services/anomaly_detector_service';
 import type { AnomalyTimelineService } from '../application/services/anomaly_timeline_service';
 import type { MlDependencies } from '../application/app';
@@ -27,7 +24,6 @@ import {
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
 } from './constants';
 import { MlResultsService } from '../application/services/results_service';
-import type { DataView } from '../../../../../src/plugins/data_views/common';
 
 export interface AnomalySwimlaneEmbeddableCustomInput {
   jobIds: JobId[];
diff --git a/x-pack/plugins/ml/public/index.ts b/x-pack/plugins/ml/public/index.ts
index 4913969bf5483..110981e2b5009 100755
--- a/x-pack/plugins/ml/public/index.ts
+++ b/x-pack/plugins/ml/public/index.ts
@@ -9,7 +9,7 @@
 // the ML plugin's page load bundle. You should either just export types or
 // use `getMlSharedImports()` to export static code.
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import {
   MlPlugin,
   MlPluginSetup,
diff --git a/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts b/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts
index c8877a1194bf0..9bf8fea14ce87 100644
--- a/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts
@@ -6,6 +6,7 @@
  */
 
 import { isEmpty } from 'lodash';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type {
   AnomalyDetectionUrlState,
   ExplorerAppState,
@@ -19,7 +20,6 @@ import type {
 } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
 import { formatGenericMlUrl } from './common';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 import { getGroupQueryText, getJobQueryText } from '../../../common/util/string_utils';
 import { AppPageState, ListingPageUrlState } from '../../../common/types/common';
 
diff --git a/x-pack/plugins/ml/public/locator/formatters/common.ts b/x-pack/plugins/ml/public/locator/formatters/common.ts
index 15b338152649f..33478266696e3 100644
--- a/x-pack/plugins/ml/public/locator/formatters/common.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/common.ts
@@ -6,8 +6,8 @@
  */
 
 import { isEmpty } from 'lodash';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { MlGenericUrlState } from '../../../common/types/locator';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 
 export function extractParams<UrlState>(urlState: UrlState) {
   // page should be guaranteed to exist here but <UrlState> is unknown
diff --git a/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts b/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts
index 72d3b12e9da57..2ba832e9dafee 100644
--- a/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts
@@ -9,6 +9,7 @@
  * Creates URL to the DataFrameAnalytics page
  */
 import { isEmpty } from 'lodash';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { formatGenericMlUrl } from './common';
 import {
   DataFrameAnalyticsExplorationQueryState,
@@ -19,7 +20,6 @@ import {
   MlCommonGlobalState,
 } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 import { getGroupQueryText, getJobQueryText } from '../../../common/util/string_utils';
 import { AppPageState, ListingPageUrlState } from '../../../common/types/common';
 
diff --git a/x-pack/plugins/ml/public/locator/formatters/settings.tsx b/x-pack/plugins/ml/public/locator/formatters/settings.tsx
index 7855c6b07351e..038085a144447 100644
--- a/x-pack/plugins/ml/public/locator/formatters/settings.tsx
+++ b/x-pack/plugins/ml/public/locator/formatters/settings.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { CalendarEditUrlState, FilterEditUrlState } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 
 export function formatEditCalendarUrl(
   appBasePath: string,
diff --git a/x-pack/plugins/ml/public/locator/formatters/trained_models.ts b/x-pack/plugins/ml/public/locator/formatters/trained_models.ts
index 9e1c5d92ce451..bebd9461339b0 100644
--- a/x-pack/plugins/ml/public/locator/formatters/trained_models.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/trained_models.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type {
   TrainedModelsNodesUrlState,
   TrainedModelsUrlState,
 } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
 import type { AppPageState, ListingPageUrlState } from '../../../common/types/common';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 
 export function formatTrainedModelsManagementUrl(
   appBasePath: string,
diff --git a/x-pack/plugins/ml/public/locator/ml_locator.ts b/x-pack/plugins/ml/public/locator/ml_locator.ts
index c79c93078d04a..dcc31591208cb 100644
--- a/x-pack/plugins/ml/public/locator/ml_locator.ts
+++ b/x-pack/plugins/ml/public/locator/ml_locator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LocatorDefinition, KibanaLocation } from '../../../../../src/plugins/share/public';
+import type { LocatorDefinition, KibanaLocation } from '@kbn/share-plugin/public';
 import {
   DataFrameAnalyticsExplorationUrlState,
   MlLocatorParams,
diff --git a/x-pack/plugins/ml/public/locator/use_ml_href.ts b/x-pack/plugins/ml/public/locator/use_ml_href.ts
index fab668b9464d8..59b34dffa7c13 100644
--- a/x-pack/plugins/ml/public/locator/use_ml_href.ts
+++ b/x-pack/plugins/ml/public/locator/use_ml_href.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlPluginStart } from '../index';
+import { MlPluginStart } from '..';
 import { MlLocatorParams } from '../../common/types/locator';
 
 /**
diff --git a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx
index b45cce35a89ba..46904d5e32c06 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LAYER_WIZARD_CATEGORY } from '../../../maps/common';
-import type { LayerWizard } from '../../../maps/public';
+import { LAYER_WIZARD_CATEGORY } from '@kbn/maps-plugin/common';
+import type { LayerWizard } from '@kbn/maps-plugin/public';
 
 export const anomalyLayerWizard: Partial<LayerWizard> = {
   categories: [LAYER_WIZARD_CATEGORY.SOLUTIONS, LAYER_WIZARD_CATEGORY.ELASTICSEARCH],
diff --git a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx
index e4309247a272a..b40a08fadd128 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx
@@ -7,18 +7,18 @@
 
 import React from 'react';
 import { htmlIdGenerator } from '@elastic/eui';
-import type { StartServicesAccessor } from 'kibana/public';
-import { LocatorPublic } from 'src/plugins/share/common';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import { LocatorPublic } from '@kbn/share-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
-import type { LayerWizard, RenderWizardArguments } from '../../../maps/public';
-import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '../../../maps/common';
-import { SEVERITY_COLOR_RAMP } from '../../common';
-import { ML_APP_LOCATOR, ML_PAGES } from '../../common/constants/locator';
-import { CreateAnomalySourceEditor } from './create_anomaly_source_editor';
+import type { LayerWizard, RenderWizardArguments } from '@kbn/maps-plugin/public';
+import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '@kbn/maps-plugin/common';
 import {
   VectorLayerDescriptor,
   VectorStylePropertiesDescriptor,
-} from '../../../maps/common/descriptor_types';
+} from '@kbn/maps-plugin/common/descriptor_types';
+import { SEVERITY_COLOR_RAMP } from '../../common';
+import { ML_APP_LOCATOR, ML_PAGES } from '../../common/constants/locator';
+import { CreateAnomalySourceEditor } from './create_anomaly_source_editor';
 import { AnomalySource, AnomalySourceDescriptor } from './anomaly_source';
 
 import { HttpService } from '../application/services/http_service';
diff --git a/x-pack/plugins/ml/public/maps/anomaly_source.tsx b/x-pack/plugins/ml/public/maps/anomaly_source.tsx
index 1ae65b49adc69..45dba12121b93 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_source.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_source.tsx
@@ -13,21 +13,25 @@ import {
   MIN_ZOOM,
   VECTOR_SHAPE_TYPE,
   VectorSourceRequestMeta,
-} from '../../../maps/common';
-import { AbstractSourceDescriptor, MapExtent } from '../../../maps/common/descriptor_types';
-import { ITooltipProperty, GEOJSON_FEATURE_ID_PROPERTY_NAME } from '../../../maps/public';
+} from '@kbn/maps-plugin/common';
+import { AbstractSourceDescriptor, MapExtent } from '@kbn/maps-plugin/common/descriptor_types';
+import { ITooltipProperty, GEOJSON_FEATURE_ID_PROPERTY_NAME } from '@kbn/maps-plugin/public';
+import type { Adapters } from '@kbn/inspector-plugin/common/adapters';
+import type { GeoJsonWithMeta } from '@kbn/maps-plugin/public';
+import type { IField } from '@kbn/maps-plugin/public';
+import type {
+  Attribution,
+  ImmutableSourceProperty,
+  PreIndexedShape,
+} from '@kbn/maps-plugin/public';
+import type { SourceEditorArgs } from '@kbn/maps-plugin/public';
+import type { DataRequest } from '@kbn/maps-plugin/public';
+import type { IVectorSource, SourceStatus } from '@kbn/maps-plugin/public';
 import {
   AnomalySourceField,
   AnomalySourceTooltipProperty,
   ANOMALY_SOURCE_FIELDS,
 } from './anomaly_source_field';
-import type { Adapters } from '../../../../../src/plugins/inspector/common/adapters';
-import type { GeoJsonWithMeta } from '../../../maps/public';
-import type { IField } from '../../../maps/public';
-import type { Attribution, ImmutableSourceProperty, PreIndexedShape } from '../../../maps/public';
-import type { SourceEditorArgs } from '../../../maps/public';
-import type { DataRequest } from '../../../maps/public';
-import type { IVectorSource, SourceStatus } from '../../../maps/public';
 import { ML_ANOMALY } from './anomaly_source_factory';
 import { getResultsForJobId, ML_ANOMALY_LAYERS, MlAnomalyLayersType } from './util';
 import { UpdateAnomalySourceEditor } from './update_anomaly_source_editor';
diff --git a/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts b/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts
index 71aefbfd0fdb9..81646d98d0c13 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts
+++ b/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { StartServicesAccessor } from 'kibana/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { HttpService } from '../application/services/http_service';
 import type { MlPluginStart, MlStartDependencies } from '../plugin';
 import type { MlApiServices } from '../application/services/ml_api_service';
diff --git a/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx b/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx
index 70eb0a8d9c408..dca5c8fe5644c 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx
@@ -10,11 +10,11 @@ import React, { ReactNode } from 'react';
 import { escape } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
-import { IField, IVectorSource } from '../../../maps/public';
-import { FIELD_ORIGIN, DECIMAL_DEGREES_PRECISION } from '../../../maps/common';
-import { TileMetaFeature } from '../../../maps/common/descriptor_types';
+import { IField, IVectorSource } from '@kbn/maps-plugin/public';
+import { FIELD_ORIGIN, DECIMAL_DEGREES_PRECISION } from '@kbn/maps-plugin/common';
+import { TileMetaFeature } from '@kbn/maps-plugin/common/descriptor_types';
+import { ITooltipProperty } from '@kbn/maps-plugin/public';
 import { AnomalySource } from './anomaly_source';
-import { ITooltipProperty } from '../../../maps/public';
 
 export const ACTUAL_LABEL = i18n.translate('xpack.ml.maps.anomalyLayerActualLabel', {
   defaultMessage: 'Actual',
diff --git a/x-pack/plugins/ml/public/maps/register_map_extension.ts b/x-pack/plugins/ml/public/maps/register_map_extension.ts
index 9112179a6b977..c4d32d5815903 100644
--- a/x-pack/plugins/ml/public/maps/register_map_extension.ts
+++ b/x-pack/plugins/ml/public/maps/register_map_extension.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MapsSetupApi } from '../../../maps/public';
+import { MapsSetupApi } from '@kbn/maps-plugin/public';
 import type { MlCoreSetup } from '../plugin';
 import { AnomalySourceFactory } from './anomaly_source_factory';
 import { AnomalyLayerWizardFactory } from './anomaly_layer_wizard_factory';
diff --git a/x-pack/plugins/ml/public/maps/util.ts b/x-pack/plugins/ml/public/maps/util.ts
index f2a4719bc4ef8..c1cb3f9efaead 100644
--- a/x-pack/plugins/ml/public/maps/util.ts
+++ b/x-pack/plugins/ml/public/maps/util.ts
@@ -8,11 +8,11 @@
 import { FeatureCollection, Feature, Geometry } from 'geojson';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { VectorSourceRequestMeta } from '@kbn/maps-plugin/common';
 import { formatHumanReadableDateTimeSeconds } from '../../common/util/date_utils';
 import type { MlApiServices } from '../application/services/ml_api_service';
 import { MLAnomalyDoc } from '../../common/types/anomalies';
-import { VectorSourceRequestMeta } from '../../../maps/common';
 import { SEARCH_QUERY_LANGUAGE } from '../../common/constants/search';
 import { getIndexPattern } from '../application/explorer/reducers/explorer_reducer/get_index_pattern';
 
diff --git a/x-pack/plugins/ml/public/mocks.ts b/x-pack/plugins/ml/public/mocks.ts
index 6dc2253c94000..13f8952dbad21 100644
--- a/x-pack/plugins/ml/public/mocks.ts
+++ b/x-pack/plugins/ml/public/mocks.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { MlPluginSetup, MlPluginStart } from './plugin';
-import { sharePluginMock } from '../../../../src/plugins/share/public/mocks';
 
 const createSetupContract = (): jest.Mocked<MlPluginSetup> => {
   return {
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 8185c9d250561..1ef7c73d2189a 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -12,48 +12,46 @@ import type {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { SharePluginSetup, SharePluginStart } from 'src/plugins/share/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { EmbeddableSetup, EmbeddableStart } from 'src/plugins/embeddable/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
-import { AppStatus, AppUpdater, DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import type { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { AppStatus, AppUpdater, DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-import type { LicenseManagementUIPluginSetup } from '../../license_management/public';
-import type { LicensingPluginSetup } from '../../licensing/public';
-import type { SecurityPluginSetup } from '../../security/public';
+import type { LicenseManagementUIPluginSetup } from '@kbn/license-management-plugin/public';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
 
-import { PLUGIN_ICON_SOLUTION, PLUGIN_ID } from '../common/constants/app';
-import { isFullLicense, isMlEnabled } from '../common/license';
-
-import { setDependencyCache } from './application/util/dependency_cache';
-import { registerFeature } from './register_feature';
-import { MlLocatorDefinition, MlLocator } from './locator';
-import type { MapsStartApi, MapsSetupApi } from '../../maps/public';
+import type { MapsStartApi, MapsSetupApi } from '@kbn/maps-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
-import type { DataVisualizerPluginStart } from '../../data_visualizer/public';
-import type { PluginSetupContract as AlertingSetup } from '../../alerting/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { DataVisualizerPluginStart } from '@kbn/data-visualizer-plugin/public';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { DashboardSetup, DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { registerManagementSection } from './application/management';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import type {
-  FieldFormatsSetup,
-  FieldFormatsStart,
-} from '../../../../src/plugins/field_formats/public';
-import type { DashboardSetup, DashboardStart } from '../../../../src/plugins/dashboard/public';
-import type { ChartsPluginStart } from '../../../../src/plugins/charts/public';
+import { MlLocatorDefinition, MlLocator } from './locator';
+import { setDependencyCache } from './application/util/dependency_cache';
+import { registerFeature } from './register_feature';
+import { isFullLicense, isMlEnabled } from '../common/license';
+import { PLUGIN_ICON_SOLUTION, PLUGIN_ID } from '../common/constants/app';
 
 export interface MlStartDependencies {
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   share: SharePluginStart;
   uiActions: UiActionsStart;
   spaces?: SpacesPluginStart;
@@ -113,6 +111,7 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
           {
             charts: pluginsStart.charts,
             data: pluginsStart.data,
+            unifiedSearch: pluginsStart.unifiedSearch,
             dashboard: pluginsStart.dashboard,
             share: pluginsStart.share,
             security: pluginsSetup.security,
diff --git a/x-pack/plugins/ml/public/register_feature.ts b/x-pack/plugins/ml/public/register_feature.ts
index e8d64360df123..bc0f6f751351e 100644
--- a/x-pack/plugins/ml/public/register_feature.ts
+++ b/x-pack/plugins/ml/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { PLUGIN_ID } from '../common/constants/app';
 
 export const registerFeature = (home: HomePublicPluginSetup) => {
@@ -29,7 +26,7 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     icon: 'machineLearningApp',
     path: '/app/ml',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
     solutionId: 'kibana',
     order: 500,
   });
diff --git a/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts b/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts
index dd3ca0bb8fa30..a25d7e24a7274 100644
--- a/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts
+++ b/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
 
-import { AppUpdater } from 'src/core/public';
+import { AppUpdater } from '@kbn/core/public';
 import { getDeepLinks } from './search_deep_links';
 
 export function registerSearchLinks(
diff --git a/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts b/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts
index 29a359d698c33..979027ba30f55 100644
--- a/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts
+++ b/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { AppDeepLink } from 'src/core/public';
+import type { AppDeepLink } from '@kbn/core/public';
 import { ML_PAGES } from '../../../common/constants/locator';
 
 const OVERVIEW_LINK_DEEP_LINK: AppDeepLink = {
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
index f90c621d71fdc..61556df53db2e 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
@@ -7,9 +7,9 @@
 
 import { Filter } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 import { MlCoreSetup } from '../plugin';
-import { FilterStateStore } from '../../../../../src/plugins/data/common';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
   AnomalyChartsFieldSelectionContext,
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
index 16e66a5930862..3b07b1bf06d95 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
@@ -7,10 +7,10 @@
 
 import { Filter } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 import { MlCoreSetup } from '../plugin';
 import { SWIMLANE_TYPE, VIEW_BY_JOB_LABEL } from '../application/explorer/explorer_constants';
-import { FilterStateStore } from '../../../../../src/plugins/data/common';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
 import { CONTROLLED_BY_SWIM_LANE_FILTER } from './constants';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
index 533a05afc5853..b146202e44bd5 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx b/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx
index c3c9d8befb387..60ef80d68768a 100644
--- a/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MlCoreSetup } from '../plugin';
 
 export const CLEAR_SELECTION_ACTION = 'clearSelectionAction';
diff --git a/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx b/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx
index 1895ed3acf981..64c4dd4c4407e 100644
--- a/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
diff --git a/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx b/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
index 173436a1038e1..39ad097c25c4a 100644
--- a/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, EditSwimlanePanelContext } from '../embeddables';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/index.ts b/x-pack/plugins/ml/public/ui_actions/index.ts
index 46e928e5f55eb..a663fa0e2fa01 100644
--- a/x-pack/plugins/ml/public/ui_actions/index.ts
+++ b/x-pack/plugins/ml/public/ui_actions/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
+import { UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { createEditSwimlanePanelAction } from './edit_swimlane_panel_action';
 import { createOpenInExplorerAction } from './open_in_anomaly_explorer_action';
-import { UiActionsSetup } from '../../../../../src/plugins/ui_actions/public';
 import { MlPluginStart, MlStartDependencies } from '../plugin';
-import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
 import { createApplyInfluencerFiltersAction } from './apply_influencer_filters_action';
 import {
   entityFieldSelectionTrigger,
diff --git a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
index f4941649ac7a7..1bdbd1a8efb4a 100644
--- a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { SerializableRecord } from '@kbn/utility-types';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import { ML_APP_LOCATOR } from '../../common/constants/locator';
 import {
diff --git a/x-pack/plugins/ml/public/ui_actions/triggers.ts b/x-pack/plugins/ml/public/ui_actions/triggers.ts
index 05074ce6df271..afed9b246d201 100644
--- a/x-pack/plugins/ml/public/ui_actions/triggers.ts
+++ b/x-pack/plugins/ml/public/ui_actions/triggers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Trigger } from '../../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const SWIM_LANE_SELECTION_TRIGGER = 'SWIM_LANE_SELECTION_TRIGGER';
 
diff --git a/x-pack/plugins/ml/server/client/error_wrapper.ts b/x-pack/plugins/ml/server/client/error_wrapper.ts
index 64395f601f9ac..212c7a53ca122 100644
--- a/x-pack/plugins/ml/server/client/error_wrapper.ts
+++ b/x-pack/plugins/ml/server/client/error_wrapper.ts
@@ -6,7 +6,7 @@
  */
 
 import { boomify, isBoom } from '@hapi/boom';
-import { ResponseError, CustomHttpResponseOptions } from 'kibana/server';
+import { ResponseError, CustomHttpResponseOptions } from '@kbn/core/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
   const boom = isBoom(error)
diff --git a/x-pack/plugins/ml/server/index.ts b/x-pack/plugins/ml/server/index.ts
index ee889198f59d1..786920ef5e46e 100644
--- a/x-pack/plugins/ml/server/index.ts
+++ b/x-pack/plugins/ml/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { MlServerPlugin } from './plugin';
 export type { MlPluginSetup, MlPluginStart } from './plugin';
 export type {
diff --git a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
index 85b69118334fe..bd0d8df872125 100644
--- a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
@@ -10,6 +10,11 @@ import rison from 'rison-node';
 import { Duration } from 'moment/moment';
 import { memoize } from 'lodash';
 import type { MlDatafeed } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import {
+  FIELD_FORMAT_IDS,
+  IFieldFormat,
+  SerializedFieldFormat,
+} from '@kbn/field-formats-plugin/common';
 import { MlClient } from '../ml_client';
 import {
   MlAnomalyDetectionAlertParams,
@@ -32,11 +37,6 @@ import { getTopNBuckets, resolveLookbackInterval } from '../../../common/util/al
 import type { DatafeedsService } from '../../models/job_service/datafeeds';
 import { getEntityFieldName, getEntityFieldValue } from '../../../common/util/anomaly_utils';
 import { FieldFormatsRegistryProvider } from '../../../common/types/kibana';
-import {
-  FIELD_FORMAT_IDS,
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../../src/plugins/field_formats/common';
 import type { AwaitReturnType } from '../../../common/types/common';
 import { getTypicalAndActualValues } from '../../models/results_service/results_service';
 import type { GetDataViewsService } from '../data_views_utils';
diff --git a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts
index b31cd191d3b32..f1ca545da947b 100644
--- a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts
@@ -7,7 +7,7 @@
 
 import { JobsHealthService, jobsHealthServiceProvider } from './jobs_health_service';
 import type { DatafeedsService } from '../../models/job_service/datafeeds';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { MlClient } from '../ml_client';
 import { MlJob, MlJobStats } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { AnnotationService } from '../../models/annotation_service/annotation';
diff --git a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts
index 805b51ce6567b..bd2503c183c6c 100644
--- a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { groupBy, keyBy, memoize } from 'lodash';
-import { KibanaRequest, Logger, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { MlJob } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MlClient } from '../ml_client';
diff --git a/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts b/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts
index e145ab7197bb9..e34f32d603b2a 100644
--- a/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts
@@ -6,7 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
+import {
+  ActionGroup,
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleTypeState,
+} from '@kbn/alerting-plugin/common';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { PLUGIN_ID } from '../../../common/constants/app';
 import { MINIMUM_FULL_LICENSE } from '../../../common/license';
@@ -16,12 +22,6 @@ import {
 } from '../../routes/schemas/alerting_schema';
 import { RegisterAlertParams } from './register_ml_alerts';
 import { InfluencerAnomalyAlertDoc, RecordAnomalyAlertDoc } from '../../../common/types/alerts';
-import {
-  ActionGroup,
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleTypeState,
-} from '../../../../alerting/common';
 
 export type AnomalyDetectionAlertContext = {
   name: string;
diff --git a/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts b/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts
index 9d1e31612b51e..1414262969153 100644
--- a/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts
@@ -6,12 +6,19 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   MlDatafeedState,
   MlJobState,
   MlJobStats,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import {
+  ActionGroup,
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleTypeState,
+} from '@kbn/alerting-plugin/common';
+import type { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { PLUGIN_ID } from '../../../common/constants/app';
 import { MINIMUM_FULL_LICENSE } from '../../../common/license';
@@ -20,13 +27,6 @@ import {
   AnomalyDetectionJobsHealthRuleParams,
 } from '../../routes/schemas/alerting_schema';
 import { RegisterAlertParams } from './register_ml_alerts';
-import {
-  ActionGroup,
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleTypeState,
-} from '../../../../alerting/common';
-import type { RuleExecutorOptions } from '../../../../alerting/server';
 import type { JobMessage } from '../../../common/types/audit_message';
 
 type ModelSizeStats = MlJobStats['model_size_stats'];
diff --git a/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts b/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts
index 6f1e000c9a430..ab1136b5d1edc 100644
--- a/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { AlertingPlugin } from '../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { AlertingPlugin } from '@kbn/alerting-plugin/server';
 import { registerAnomalyDetectionAlertType } from './register_anomaly_detection_alert_type';
 import { SharedServices } from '../../shared_services';
 import { registerJobsMonitoringRuleType } from './register_jobs_monitoring_rule_type';
diff --git a/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts b/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts
index b7d350541110c..a3fa37920e7f9 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts
@@ -7,8 +7,8 @@
 
 import { cloneDeep } from 'lodash';
 import { firstValueFrom, Observable } from 'rxjs';
-import { CapabilitiesSwitcher, CoreSetup, Logger } from 'src/core/server';
-import { ILicense } from '../../../../licensing/common/types';
+import { CapabilitiesSwitcher, CoreSetup, Logger } from '@kbn/core/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { isFullLicense, isMinimumLicense, isMlEnabled } from '../../../common/license';
 import { MlCapabilities, basicLicenseMlCapabilities } from '../../../common/types/capabilities';
 
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
index 654c3db184aa0..b63de7a22e386 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
@@ -9,7 +9,7 @@ import { getAdminCapabilities, getUserCapabilities } from './__mocks__/ml_capabi
 import { capabilitiesProvider } from './check_capabilities';
 import { MlLicense } from '../../../common/license';
 import { getDefaultCapabilities } from '../../../common/types/capabilities';
-import type { MlClient } from '../../lib/ml_client';
+import type { MlClient } from '../ml_client';
 
 const mlLicense = {
   isSecurityEnabled: () => true,
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
index 013460774bd32..6334ca91bc947 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import type { MlClient } from '../../lib/ml_client';
-import { mlLog } from '../../lib/log';
+import { KibanaRequest } from '@kbn/core/server';
+import type { MlClient } from '../ml_client';
+import { mlLog } from '../log';
 import {
   MlCapabilities,
   adminMlCapabilities,
diff --git a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
index e0c604d80ee63..1f60fc78b9327 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { MlClient } from '../../lib/ml_client';
-import { mlLog } from '../../lib/log';
+import type { MlClient } from '../ml_client';
+import { mlLog } from '../log';
 
 export function upgradeCheckProvider(mlClient: MlClient) {
   async function isUpgradeInProgress(): Promise<boolean> {
diff --git a/x-pack/plugins/ml/server/lib/check_annotations/index.ts b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
index 50c237566761e..29a16548a318a 100644
--- a/x-pack/plugins/ml/server/lib/check_annotations/index.ts
+++ b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { mlLog } from '../../lib/log';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { mlLog } from '../log';
 
 import {
   ML_ANNOTATIONS_INDEX_ALIAS_READ,
diff --git a/x-pack/plugins/ml/server/lib/data_views_utils.ts b/x-pack/plugins/ml/server/lib/data_views_utils.ts
index 67fdc0a16de32..f80f4444df4aa 100644
--- a/x-pack/plugins/ml/server/lib/data_views_utils.ts
+++ b/x-pack/plugins/ml/server/lib/data_views_utils.ts
@@ -9,10 +9,10 @@ import type {
   IScopedClusterClient,
   SavedObjectsClientContract,
   KibanaRequest,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 
 export type GetDataViewsService = () => Promise<DataViewsService>;
 
diff --git a/x-pack/plugins/ml/server/lib/log.ts b/x-pack/plugins/ml/server/lib/log.ts
index 3efd651e91d5b..dfb93d84932ca 100644
--- a/x-pack/plugins/ml/server/lib/log.ts
+++ b/x-pack/plugins/ml/server/lib/log.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 export interface LogInitialization {
   log: Logger;
diff --git a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
index 122162777d9a5..f322f09356c90 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MLSavedObjectService } from '../../saved_objects';
 import { getJobDetailsFromTrainedModel } from '../../saved_objects/util';
 import { JobType } from '../../../common/types/saved_objects';
diff --git a/x-pack/plugins/ml/server/lib/ml_client/search.ts b/x-pack/plugins/ml/server/lib/ml_client/search.ts
index 1ead8d0fd4ea1..7607ee860aac0 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/search.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/search.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type {
   TransportResult,
diff --git a/x-pack/plugins/ml/server/lib/ml_client/types.ts b/x-pack/plugins/ml/server/lib/ml_client/types.ts
index 7a2a565e5b04a..38e864f034e04 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/types.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { searchProvider } from './search';
 
 type OrigMlClient = ElasticsearchClient['ml'];
diff --git a/x-pack/plugins/ml/server/lib/node_utils.ts b/x-pack/plugins/ml/server/lib/node_utils.ts
index d5ec53148b402..edf5b14c7cb81 100644
--- a/x-pack/plugins/ml/server/lib/node_utils.ts
+++ b/x-pack/plugins/ml/server/lib/node_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MlNodeCount } from '../../common/types/ml_server_info';
 
 export async function getMlNodeCount(client: IScopedClusterClient): Promise<MlNodeCount> {
diff --git a/x-pack/plugins/ml/server/lib/register_settings.ts b/x-pack/plugins/ml/server/lib/register_settings.ts
index 8f279114344e4..fae6e810b187e 100644
--- a/x-pack/plugins/ml/server/lib/register_settings.ts
+++ b/x-pack/plugins/ml/server/lib/register_settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 import {
diff --git a/x-pack/plugins/ml/server/lib/request_authorization.ts b/x-pack/plugins/ml/server/lib/request_authorization.ts
index 873d8a068ace0..63143d9c7c889 100644
--- a/x-pack/plugins/ml/server/lib/request_authorization.ts
+++ b/x-pack/plugins/ml/server/lib/request_authorization.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 
 export interface AuthorizationHeader {
   headers?: { 'es-secondary-authorization': string | string[] };
diff --git a/x-pack/plugins/ml/server/lib/route_guard.ts b/x-pack/plugins/ml/server/lib/route_guard.ts
index 90de46340d873..fa3fb88a109bb 100644
--- a/x-pack/plugins/ml/server/lib/route_guard.ts
+++ b/x-pack/plugins/ml/server/lib/route_guard.ts
@@ -8,26 +8,26 @@
 import type {
   KibanaRequest,
   KibanaResponseFactory,
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   IScopedClusterClient,
   RequestHandler,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import type { SpacesPluginSetup } from '../../../spaces/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+} from '@kbn/core/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { mlSavedObjectServiceFactory, MLSavedObjectService } from '../saved_objects';
 import type { MlLicense } from '../../common/license';
 
-import { MlClient, getMlClient } from '../lib/ml_client';
-import type { AlertingApiRequestHandlerContext } from '../../../alerting/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+import { MlClient, getMlClient } from './ml_client';
 import { getDataViewsServiceFactory } from './data_views_utils';
 
-type MLRequestHandlerContext = RequestHandlerContext & {
+type MLRequestHandlerContext = CustomRequestHandlerContext<{
   alerting?: AlertingApiRequestHandlerContext;
-};
+}>;
 
 type Handler<P = unknown, Q = unknown, B = unknown> = (handlerParams: {
   client: IScopedClusterClient;
@@ -73,12 +73,13 @@ export class RouteGuard {
   public fullLicenseAPIGuard<P, Q, B>(handler: Handler<P, Q, B>) {
     return this._guard(() => this._mlLicense.isFullLicense(), handler);
   }
+
   public basicLicenseAPIGuard<P, Q, B>(handler: Handler<P, Q, B>) {
     return this._guard(() => this._mlLicense.isMinimumLicense(), handler);
   }
 
   private _guard<P, Q, B>(check: () => boolean, handler: Handler<P, Q, B>) {
-    return (
+    return async (
       context: MLRequestHandlerContext,
       request: KibanaRequest<P, Q, B>,
       response: KibanaResponseFactory
@@ -87,7 +88,8 @@ export class RouteGuard {
         return response.forbidden();
       }
 
-      const client = context.core.elasticsearch.client;
+      const { elasticsearch, savedObjects } = await context.core;
+      const client = elasticsearch.client;
       const mlSavedObjectClient = this._getMlSavedObjectClient(request);
       const internalSavedObjectsClient = this._getInternalSavedObjectClient();
       if (mlSavedObjectClient === null || internalSavedObjectsClient === null) {
@@ -114,7 +116,7 @@ export class RouteGuard {
         mlClient: getMlClient(client, mlSavedObjectService),
         getDataViewsService: getDataViewsServiceFactory(
           this._getDataViews,
-          context.core.savedObjects.client,
+          savedObjects.client,
           client,
           request
         ),
diff --git a/x-pack/plugins/ml/server/lib/spaces_utils.ts b/x-pack/plugins/ml/server/lib/spaces_utils.ts
index 21ef163734883..1db61fb3246e2 100644
--- a/x-pack/plugins/ml/server/lib/spaces_utils.ts
+++ b/x-pack/plugins/ml/server/lib/spaces_utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from '../../../../../src/core/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { PLUGIN_ID } from '../../common/constants/app';
 
 export function spacesUtilsProvider(
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
index e6aa31501a557..6da67e00f90df 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
@@ -12,7 +12,7 @@ import { ANNOTATION_TYPE } from '../../../common/constants/annotations';
 import { Annotation, isAnnotations } from '../../../common/types/annotations';
 
 import { DeleteParams, GetResponse, IndexAnnotationArgs } from './annotation';
-import { annotationServiceProvider } from './index';
+import { annotationServiceProvider } from '.';
 
 const acknowledgedResponseMock = { acknowledged: true };
 
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
index 60d633b16097d..8d860300979c8 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { each, get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ANNOTATION_EVENT_USER, ANNOTATION_TYPE } from '../../../common/constants/annotations';
diff --git a/x-pack/plugins/ml/server/models/annotation_service/index.ts b/x-pack/plugins/ml/server/models/annotation_service/index.ts
index fc147047e8ab6..fef919b629da9 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/index.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { annotationProvider } from './annotation';
 
 export function annotationServiceProvider(client: IScopedClusterClient) {
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
index 75983975f7acd..30d9c76cd9dcb 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 import { RuntimeMappings } from '../../../common/types/fields';
 import { IndicesOptions } from '../../../common/types/anomaly_detection_jobs';
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
index 6ffb74131bf6e..f103592569b7c 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 import { BucketSpanEstimatorData } from '../../../common/types/job_service';
diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
index 206627005e77d..0528e82ba6015 100644
--- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
@@ -6,7 +6,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import numeral from '@elastic/numeral';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MLCATEGORY } from '../../../common/constants/field_types';
 import { AnalysisConfig, Datafeed } from '../../../common/types/anomaly_detection_jobs';
 import { fieldsServiceProvider } from '../fields_service';
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
index c8395e2eb0ed6..2a84e757cd6b7 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { ML_NOTIFICATION_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { JobMessage } from '../../../common/types/audit_message';
 
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
index c6e44fc5b3f4c..894354a0113fc 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   INDEX_CREATED_BY,
   JOB_MAP_NODE_TYPES,
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
index b0135b0295fd8..fc07c69d8dc73 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 
 export class DataViewHandler {
   constructor(private dataViewService: DataViewsService) {}
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts
index bd1b64ba9f37d..cf4ef22b44016 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { MemoryStatsResponse, ModelService, modelsProvider } from './models_provider';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MlClient } from '../../lib/ml_client';
 import mockResponse from './__mocks__/mock_deployment_response.json';
 
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
index 580f7d68736dc..4ee77f06eac1f 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { pick } from 'lodash';
 import {
   MlTrainedModelStats,
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts
index f534c9e91cef4..9cd8b67be2a6d 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { getAnalysisType } from '../../../common/util/analytics_utils';
 import { ANALYSIS_CONFIG_TYPE } from '../../../common/constants/data_frame_analytics';
 import {
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index 7d2f37cefb50b..4770f0c51dbc9 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -9,10 +9,10 @@ import type {
   SavedObjectsClientContract,
   KibanaRequest,
   IScopedClusterClient,
-} from 'kibana/server';
-import type { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+} from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Module } from '../../../common/types/modules';
-import { DataRecognizer } from '../data_recognizer';
+import { DataRecognizer } from '.';
 import type { MlClient } from '../../lib/ml_client';
 import type { MLSavedObjectService } from '../../saved_objects';
 
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 3ef36f4ad3b6b..5dc86d3490420 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -12,11 +12,11 @@ import type {
   KibanaRequest,
   IScopedClusterClient,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import moment from 'moment';
 import { merge } from 'lodash';
-import type { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { AnalysisLimits } from '../../../common/types/anomaly_detection_jobs';
 import { getAuthorizationHeader } from '../../lib/request_authorization';
 import type { MlClient } from '../../lib/ml_client';
diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
index eb9e88b62a09a..cbb1c0cc3710d 100644
--- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get, each, last, find } from 'lodash';
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/server';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/server';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import { getSafeAggregationName } from '../../../common/util/job_utils';
 import { stringHash } from '../../../common/util/string_utils';
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
index c8828ab6c5416..a3d6b74e057e0 100644
--- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { duration } from 'moment';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { initCardinalityFieldsCache } from './fields_aggs_cache';
diff --git a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts
index cab1d42743017..36d09d3e236b2 100644
--- a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts
+++ b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ML_NOTIFICATION_INDEX_PATTERN } from '../../../common/constants/index_patterns';
diff --git a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
index c74b8bad75e79..5690d4d345094 100644
--- a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
+++ b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 import { fillResultsWithTimeouts, isRequestTimeout } from './error_utils';
 import { Datafeed, DatafeedStats } from '../../../common/types/anomaly_detection_jobs';
diff --git a/x-pack/plugins/ml/server/models/job_service/index.ts b/x-pack/plugins/ml/server/models/job_service/index.ts
index 94c25581e8e84..33898d35943e5 100644
--- a/x-pack/plugins/ml/server/models/job_service/index.ts
+++ b/x-pack/plugins/ml/server/models/job_service/index.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 import { datafeedsProvider } from './datafeeds';
 import { jobsProvider } from './jobs';
 import { groupsProvider } from './groups';
@@ -13,7 +14,6 @@ import { newJobCapsProvider } from './new_job_caps';
 import { newJobChartsProvider, topCategoriesProvider } from './new_job';
 import { modelSnapshotProvider } from './model_snapshots';
 import type { MlClient } from '../../lib/ml_client';
-import type { RulesClient } from '../../../../alerting/server';
 
 export function jobServiceProvider(
   client: IScopedClusterClient,
diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
index 2f8e17ce142a7..7eb5a1cf1d722 100644
--- a/x-pack/plugins/ml/server/models/job_service/jobs.ts
+++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -7,7 +7,8 @@
 
 import { uniq } from 'lodash';
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 import {
   getSingleMetricViewerJobErrorMessage,
   parseTimeIntervalForJob,
@@ -47,7 +48,6 @@ import {
 import { groupsProvider } from './groups';
 import type { MlClient } from '../../lib/ml_client';
 import { isPopulatedObject } from '../../../common/util/object_utils';
-import type { RulesClient } from '../../../../alerting/server';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { MlAnomalyDetectionAlertParams } from '../../routes/schemas/alerting_schema';
 import type { AuthorizationHeader } from '../../lib/request_authorization';
diff --git a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
index c40f8b78cb209..a081e14ec86ee 100644
--- a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
+++ b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { ModelSnapshot } from '../../../common/types/anomaly_detection_jobs';
 import { datafeedsProvider } from './datafeeds';
 import { FormCalendar, CalendarManager } from '../calendar';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
index f3ea82b837caa..a5cb9e8507429 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { chunk } from 'lodash';
 import { CATEGORY_EXAMPLES_SAMPLE_SIZE } from '../../../../../common/constants/categorization_job';
 import {
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts b/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
index 892b3ea6684ab..740fd73fb36cc 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { newJobLineChartProvider } from './line_chart';
 import { newJobPopulationChartProvider } from './population_chart';
 
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
index 44bf280fcc86a..4b1efbbd7e014 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   AggFieldNamePair,
   EVENT_RATE_FIELD_ID,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
index 5654f48b39596..8d4a5fec9f497 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   AggFieldNamePair,
   EVENT_RATE_FIELD_ID,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
index f553e3ee8ccc1..f17d0a6702e60 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -7,10 +7,10 @@
 
 import { cloneDeep } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Field, FieldId, NewJobCaps, RollupFields } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
-import type { DataViewsService } from '../../../../../../../src/plugins/data_views/common';
 import { combineFieldsAndAggs } from '../../../../common/util/fields_utils';
 import { rollupServiceProvider } from './rollup';
 import { aggregations, mlOnlyAggregations } from '../../../../common/constants/aggregation_types';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
index 021244afce2cb..b31cbf96ae63a 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { newJobCapsProvider } from './index';
-import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
+import { newJobCapsProvider } from '.';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import farequoteFieldCaps from './__mocks__/responses/farequote_field_caps.json';
 import cloudwatchFieldCaps from './__mocks__/responses/cloudwatch_field_caps.json';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
index bab4fb31aa1a9..37e95c4389f6c 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
-import type { DataViewsService } from '../../../../../../../src/plugins/data_views/common';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Aggregation, Field, NewJobCapsResponse } from '../../../../common/types/fields';
 import { _DOC_COUNT } from '../../../../common/constants/field_types';
 import { fieldServiceProvider } from './field_service';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
index a4eb5b9135c8c..a62535b0c981c 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
@@ -6,11 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient } from 'kibana/server';
-import type {
-  DataViewsService,
-  DataView,
-} from '../../../../../../../src/plugins/data_views/common';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import type { DataViewsService, DataView } from '@kbn/data-views-plugin/common';
 import type { RollupFields } from '../../../../common/types/fields';
 
 export interface RollupJob {
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
index b9ac2831e5bf0..0800d31899fbc 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { validateJob, ValidateJobPayload } from './job_validation';
 import { ES_CLIENT_TOTAL_HITS_RELATION } from '../../../common/types/es_client';
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
index 353e508e30df7..336780a31aec2 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { fieldsServiceProvider } from '../fields_service';
 import { getMessages, MessageId, JobValidationMessage } from '../../../common/constants/messages';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
index bd7889c3f4375..75b1b98213036 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { estimateBucketSpanFactory } from '../../models/bucket_span_estimator';
+import { estimateBucketSpanFactory } from '../bucket_span_estimator';
 import { mlFunctionToESAggregation, parseTimeIntervalForJob } from '../../../common/util/job_utils';
 import { SKIP_BUCKET_SPAN_ESTIMATION } from '../../../common/constants/validation';
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
index 7c64f9201c373..a03a3affded39 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
index 151ae4a9e739a..811f52a271d81 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { DataVisualizer } from '../data_visualizer';
 
 import { validateJobObject } from './validate_job_object';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
index 5c50ac31281f2..8c6fcdea57430 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { CombinedJob, Detector } from '../../../common/types/anomaly_detection_jobs';
 import { ModelMemoryEstimateResponse } from '../calculate_model_memory_limit/calculate_model_memory_limit';
 import { validateModelMemoryLimit } from './validate_model_memory_limit';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
index 7687f3acd313e..13ec4da1b0818 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
@@ -6,7 +6,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { validateJobObject } from './validate_job_object';
 import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
index 0d6840c3574fd..4f6a3f241f0e0 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
index d498114911c23..7578f24d05e02 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/server';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { validateJobObject } from './validate_job_object';
diff --git a/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts b/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
index 84363c12699d5..c5a31106f4ddf 100644
--- a/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
+++ b/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { each, find, get, keyBy, map, reduce, sortBy } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/types';
@@ -48,7 +48,7 @@ import { getDatafeedAggregations } from '../../../common/util/datafeed_utils';
 import { findAggField } from '../../../common/util/validation_utils';
 import { CHART_TYPE, ChartType } from '../../../common/constants/charts';
 import { getChartType } from '../../../common/util/chart_utils';
-import { MlJob } from '../../index';
+import { MlJob } from '../..';
 
 export function chartLimits(data: ChartPoint[] = []) {
   const domain = extent(data, (d) => {
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts
index 9caf41ce97ee3..39fbaeb74b45c 100644
--- a/x-pack/plugins/ml/server/models/results_service/results_service.ts
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts
@@ -8,7 +8,7 @@
 import { sortBy, slice, get, cloneDeep } from 'lodash';
 import moment from 'moment';
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 8c59c0f9d519b..358fd9b24fce7 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -17,12 +17,13 @@ import type {
   IClusterClient,
   SavedObjectsServiceStart,
   UiSettingsServiceStart,
-} from 'kibana/server';
-import type { SecurityPluginSetup } from '../../security/server';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../src/plugins/data_views/server';
+} from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import type { PluginsSetup, PluginsStart, RouteInitialization } from './types';
-import type { SpacesPluginSetup } from '../../spaces/server';
 import { PLUGIN_ID } from '../common/constants/app';
 import type { MlCapabilities } from '../common/types/capabilities';
 
@@ -61,7 +62,6 @@ import { registerMlAlerts } from './lib/alerts/register_ml_alerts';
 import { ML_ALERT_TYPES } from '../common/constants/alerts';
 import { alertingRoutes } from './routes/alerting';
 import { registerCollector } from './usage';
-import { FieldFormatsStart } from '../../../../src/plugins/field_formats/server';
 import { SavedObjectsSyncService } from './saved_objects/sync_task';
 
 export type MlPluginSetup = SharedServices;
diff --git a/x-pack/plugins/ml/server/routes/alerting.ts b/x-pack/plugins/ml/server/routes/alerting.ts
index 1dd11375cdd3c..59091e1c8dfb0 100644
--- a/x-pack/plugins/ml/server/routes/alerting.ts
+++ b/x-pack/plugins/ml/server/routes/alerting.ts
@@ -36,7 +36,7 @@ export function alertingRoutes(
     routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response, client, context }) => {
       try {
         const alertingService = sharedServicesProviders.alertingServiceProvider(
-          context.core.savedObjects.client,
+          (await context.core).savedObjects.client,
           request
         );
 
diff --git a/x-pack/plugins/ml/server/routes/annotations.ts b/x-pack/plugins/ml/server/routes/annotations.ts
index 9c148b7658bdc..eb173688dc244 100644
--- a/x-pack/plugins/ml/server/routes/annotations.ts
+++ b/x-pack/plugins/ml/server/routes/annotations.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
 
-import { SecurityPluginSetup } from '../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { isAnnotationsFeatureAvailable } from '../lib/check_annotations';
 import { annotationServiceProvider } from '../models/annotation_service';
 import { wrapError } from '../client/error_wrapper';
diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index b6cf8dd0c2184..1fd79cbe963e6 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { wrapError } from '../client/error_wrapper';
 import { analyticsAuditMessagesProvider } from '../models/data_frame_analytics/analytics_audit_messages';
 import type { RouteInitialization } from '../types';
@@ -36,7 +37,6 @@ import { fieldServiceProvider } from '../models/job_service/new_job_caps/field_s
 import type { DeleteDataFrameAnalyticsWithIndexStatus } from '../../common/types/data_frame_analytics';
 import { getAuthorizationHeader } from '../lib/request_authorization';
 import type { MlClient } from '../lib/ml_client';
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
 
 function getDataViewId(dataViewsService: DataViewsService, patternName: string) {
   const iph = new DataViewHandler(dataViewsService);
diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts
index fa84779ace71b..88131afd20c08 100644
--- a/x-pack/plugins/ml/server/routes/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { wrapError } from '../client/error_wrapper';
 import { DataVisualizer } from '../models/data_visualizer';
 import { HistogramField } from '../models/data_visualizer/data_visualizer';
diff --git a/x-pack/plugins/ml/server/routes/fields_service.ts b/x-pack/plugins/ml/server/routes/fields_service.ts
index dc43d915e87a2..a0c39d1540cca 100644
--- a/x-pack/plugins/ml/server/routes/fields_service.ts
+++ b/x-pack/plugins/ml/server/routes/fields_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import {
diff --git a/x-pack/plugins/ml/server/routes/job_service.ts b/x-pack/plugins/ml/server/routes/job_service.ts
index e67095d022901..5504682406a00 100644
--- a/x-pack/plugins/ml/server/routes/job_service.ts
+++ b/x-pack/plugins/ml/server/routes/job_service.ts
@@ -268,11 +268,8 @@ export function jobServiceRoutes({ router, routeGuard }: RouteInitialization) {
     },
     routeGuard.fullLicenseAPIGuard(async ({ client, mlClient, request, response, context }) => {
       try {
-        const { jobsSummary } = jobServiceProvider(
-          client,
-          mlClient,
-          context.alerting?.getRulesClient()
-        );
+        const alerting = await context.alerting;
+        const { jobsSummary } = jobServiceProvider(client, mlClient, alerting?.getRulesClient());
         const { jobIds } = request.body;
         const resp = await jobsSummary(jobIds);
 
@@ -304,10 +301,11 @@ export function jobServiceRoutes({ router, routeGuard }: RouteInitialization) {
     },
     routeGuard.fullLicenseAPIGuard(async ({ client, mlClient, response, context }) => {
       try {
+        const alerting = await context.alerting;
         const { getJobIdsWithGeo } = jobServiceProvider(
           client,
           mlClient,
-          context.alerting?.getRulesClient()
+          alerting?.getRulesClient()
         );
 
         const resp = await getJobIdsWithGeo();
@@ -409,10 +407,11 @@ export function jobServiceRoutes({ router, routeGuard }: RouteInitialization) {
     },
     routeGuard.fullLicenseAPIGuard(async ({ client, mlClient, request, response, context }) => {
       try {
+        const alerting = await context.alerting;
         const { createFullJobsList } = jobServiceProvider(
           client,
           mlClient,
-          context.alerting?.getRulesClient()
+          alerting?.getRulesClient()
         );
         const { jobIds } = request.body;
         const resp = await createFullJobsList(jobIds);
diff --git a/x-pack/plugins/ml/server/routes/job_validation.ts b/x-pack/plugins/ml/server/routes/job_validation.ts
index bceb59fa33fc6..e1bc628529672 100644
--- a/x-pack/plugins/ml/server/routes/job_validation.ts
+++ b/x-pack/plugins/ml/server/routes/job_validation.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import type { AnalysisConfig, Datafeed } from '../../common/types/anomaly_detection_jobs';
 import { wrapError } from '../client/error_wrapper';
diff --git a/x-pack/plugins/ml/server/routes/modules.ts b/x-pack/plugins/ml/server/routes/modules.ts
index 2b366cef9a9f4..757012ba14041 100644
--- a/x-pack/plugins/ml/server/routes/modules.ts
+++ b/x-pack/plugins/ml/server/routes/modules.ts
@@ -11,8 +11,8 @@ import type {
   IScopedClusterClient,
   KibanaRequest,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+} from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { DatafeedOverride, JobOverride } from '../../common/types/modules';
 import { wrapError } from '../client/error_wrapper';
 import { dataRecognizerFactory } from '../models/data_recognizer';
@@ -190,11 +190,12 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
       }) => {
         try {
           const { indexPatternTitle } = request.params;
+          const soClient = (await context.core).savedObjects.client;
           const dataViewService = await getDataViewsService();
           const results = await recognize(
             client,
             mlClient,
-            context.core.savedObjects.client,
+            soClient,
             dataViewService,
             mlSavedObjectService,
             request,
@@ -344,11 +345,12 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
             // the moduleId will be an empty string.
             moduleId = undefined;
           }
+          const soClient = (await context.core).savedObjects.client;
           const dataViewService = await getDataViewsService();
           const results = await getModule(
             client,
             mlClient,
-            context.core.savedObjects.client,
+            soClient,
             dataViewService,
             mlSavedObjectService,
             request,
@@ -541,13 +543,13 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
             estimateModelMemory,
             applyToAllSpaces,
           } = request.body as TypeOf<typeof setupModuleBodySchema>;
-
+          const soClient = (await context.core).savedObjects.client;
           const dataViewService = await getDataViewsService();
 
           const result = await setup(
             client,
             mlClient,
-            context.core.savedObjects.client,
+            soClient,
             dataViewService,
             mlSavedObjectService,
             request,
@@ -648,11 +650,12 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
       }) => {
         try {
           const { moduleId } = request.params;
+          const soClient = (await context.core).savedObjects.client;
           const dataViewService = await getDataViewsService();
           const result = await dataRecognizerJobsExist(
             client,
             mlClient,
-            context.core.savedObjects.client,
+            soClient,
             dataViewService,
             mlSavedObjectService,
             request,
diff --git a/x-pack/plugins/ml/server/saved_objects/authorization.ts b/x-pack/plugins/ml/server/saved_objects/authorization.ts
index 73d2490ce3ee3..099409958c0cc 100644
--- a/x-pack/plugins/ml/server/saved_objects/authorization.ts
+++ b/x-pack/plugins/ml/server/saved_objects/authorization.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   ML_JOB_SAVED_OBJECT_TYPE,
   ML_TRAINED_MODEL_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ml/server/saved_objects/checks.ts b/x-pack/plugins/ml/server/saved_objects/checks.ts
index c6abcb79030de..93b68ea3fd990 100644
--- a/x-pack/plugins/ml/server/saved_objects/checks.ts
+++ b/x-pack/plugins/ml/server/saved_objects/checks.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient, KibanaRequest, SavedObjectsFindResult } from 'kibana/server';
+import type { IScopedClusterClient, KibanaRequest, SavedObjectsFindResult } from '@kbn/core/server';
 import type {
   MLSavedObjectService,
   TrainedModelJob,
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts b/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts
index 5e453a613b22d..a6fcad275923c 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, CoreStart, SavedObjectsClientContract } from 'kibana/server';
+import { IScopedClusterClient, CoreStart, SavedObjectsClientContract } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { savedObjectClientsFactory } from '../util';
 import { syncSavedObjectsFactory } from '../sync';
 import { mlSavedObjectServiceFactory, JobObject } from '../service';
 import { mlLog } from '../../lib/log';
 import { ML_JOB_SAVED_OBJECT_TYPE } from '../../../common/types/saved_objects';
 import { createJobSpaceOverrides } from './space_overrides';
-import type { SecurityPluginSetup } from '../../../../security/server';
 
 /**
  * Creates initializeJobs function which is used to check whether
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
index b7e0affb51fa5..bc2dac56881ad 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import RE2 from 're2';
 import { mlLog } from '../../../lib/log';
 
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
index e2b8f587c25e6..3ec187555d4b4 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import RE2 from 're2';
 import { mlLog } from '../../../lib/log';
 
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts
index b5b4e8db2dd58..a57a3c046d09a 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { createJobSpaceOverrides } from './space_overrides';
 
 const jobs = [
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts
index 85c2b738ef29b..cae8948f59ca9 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type { JobSpaceOverrides } from '../../sync';
 import { logJobsSpaces } from './logs';
 import { metricsJobsSpaces } from './metrics';
diff --git a/x-pack/plugins/ml/server/saved_objects/mappings.ts b/x-pack/plugins/ml/server/saved_objects/mappings.ts
index 7560df4b6ab22..de522e3a6347e 100644
--- a/x-pack/plugins/ml/server/saved_objects/mappings.ts
+++ b/x-pack/plugins/ml/server/saved_objects/mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTypeMappingDefinition } from 'kibana/server';
+import { SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
 
 export const mlJob: SavedObjectsTypeMappingDefinition = {
   properties: {
diff --git a/x-pack/plugins/ml/server/saved_objects/migrations.ts b/x-pack/plugins/ml/server/saved_objects/migrations.ts
index b9eec66bdd825..bf5ff05b78517 100644
--- a/x-pack/plugins/ml/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/ml/server/saved_objects/migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap } from '../../../../../src/core/server';
+import { SavedObjectMigrationMap } from '@kbn/core/server';
 
 export const migrations: SavedObjectMigrationMap = {
   '7.9.0': (doc) => doc,
diff --git a/x-pack/plugins/ml/server/saved_objects/saved_objects.ts b/x-pack/plugins/ml/server/saved_objects/saved_objects.ts
index 2fdcd58416e6a..4a939759db097 100644
--- a/x-pack/plugins/ml/server/saved_objects/saved_objects.ts
+++ b/x-pack/plugins/ml/server/saved_objects/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsServiceSetup } from 'kibana/server';
+import { SavedObjectsServiceSetup } from '@kbn/core/server';
 import { mlJob, mlTrainedModel, mlModule } from './mappings';
 
 import { migrations } from './migrations';
diff --git a/x-pack/plugins/ml/server/saved_objects/service.ts b/x-pack/plugins/ml/server/saved_objects/service.ts
index eb3fbee91308d..f473397be9079 100644
--- a/x-pack/plugins/ml/server/saved_objects/service.ts
+++ b/x-pack/plugins/ml/server/saved_objects/service.ts
@@ -12,8 +12,8 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsFindResult,
   IScopedClusterClient,
-} from 'kibana/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+} from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type {
   JobType,
   TrainedModelType,
diff --git a/x-pack/plugins/ml/server/saved_objects/sync.ts b/x-pack/plugins/ml/server/saved_objects/sync.ts
index b4573e8b7c8aa..b7d719d6a2c5b 100644
--- a/x-pack/plugins/ml/server/saved_objects/sync.ts
+++ b/x-pack/plugins/ml/server/saved_objects/sync.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import type { JobObject, MLSavedObjectService, TrainedModelObject } from './service';
 import type {
   JobType,
diff --git a/x-pack/plugins/ml/server/saved_objects/sync_task.ts b/x-pack/plugins/ml/server/saved_objects/sync_task.ts
index ce54cc85abc68..aaca13b99131c 100644
--- a/x-pack/plugins/ml/server/saved_objects/sync_task.ts
+++ b/x-pack/plugins/ml/server/saved_objects/sync_task.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Logger, CoreStart, IScopedClusterClient } from 'kibana/server';
+import { Logger, CoreStart, IScopedClusterClient } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
   TaskInstance,
-} from '../../../task_manager/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+} from '@kbn/task-manager-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { savedObjectClientsFactory } from './util';
 import { mlSavedObjectServiceFactory } from './service';
 import { syncSavedObjectsFactory } from './sync';
diff --git a/x-pack/plugins/ml/server/saved_objects/util.ts b/x-pack/plugins/ml/server/saved_objects/util.ts
index f16f80a20390c..561c09af75c98 100644
--- a/x-pack/plugins/ml/server/saved_objects/util.ts
+++ b/x-pack/plugins/ml/server/saved_objects/util.ts
@@ -6,8 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { SavedObjectsServiceStart, KibanaRequest } from 'kibana/server';
-import { SavedObjectsClient } from '../../../../../src/core/server';
+import { SavedObjectsServiceStart, KibanaRequest } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 import { ML_JOB_SAVED_OBJECT_TYPE } from '../../common/types/saved_objects';
 import type { TrainedModelJob } from './service';
 
diff --git a/x-pack/plugins/ml/server/shared.ts b/x-pack/plugins/ml/server/shared.ts
index 97498fc1a6ce5..8760dfb991ab5 100644
--- a/x-pack/plugins/ml/server/shared.ts
+++ b/x-pack/plugins/ml/server/shared.ts
@@ -9,4 +9,4 @@ export * from '../common/types/anomalies';
 export * from '../common/types/anomaly_detection_jobs';
 export * from './lib/capabilities/errors';
 export type { ModuleSetupPayload } from './shared_services/providers/modules';
-export { getHistogramsForFields } from './models/data_visualizer/';
+export { getHistogramsForFields } from './models/data_visualizer';
diff --git a/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts b/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts
index 9d3691a525339..6be71148a3c3a 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { GetGuards } from '../shared_services';
 import { alertingServiceProvider, MlAlertingService } from '../../lib/alerts/alerting_service';
 import { datafeedsProvider } from '../../models/job_service/datafeeds';
diff --git a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
index f091db10b9763..77a47e44a213c 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   Job,
   JobStats,
diff --git a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
index 43a7daba4c34d..fc26e45bae85a 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { jobServiceProvider } from '../../models/job_service';
 import { GetGuards } from '../shared_services';
 
diff --git a/x-pack/plugins/ml/server/shared_services/providers/modules.ts b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
index 10b07a90880de..282715e5e8c17 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/modules.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import type { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../../src/plugins/data_views/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 import type { GetGuards } from '../shared_services';
 import { DataRecognizer, dataRecognizerFactory } from '../../models/data_recognizer';
 import { moduleIdParamSchema, setupModuleBodySchema } from '../../routes/schemas/modules';
diff --git a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
index 254691a9a92e7..799373c0bdc24 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { resultsServiceProvider } from '../../models/results_service';
 import { GetGuards } from '../shared_services';
 
diff --git a/x-pack/plugins/ml/server/shared_services/providers/system.ts b/x-pack/plugins/ml/server/shared_services/providers/system.ts
index 977288210299a..27cb54b6e2b72 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/system.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/system.ts
@@ -7,11 +7,11 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { MlLicense } from '../../../common/license';
-import { CloudSetup } from '../../../../cloud/server';
 import { spacesUtilsProvider } from '../../lib/spaces_utils';
-import { SpacesPluginStart } from '../../../../spaces/server';
 import { capabilitiesProvider } from '../../lib/capabilities';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import { MlCapabilitiesResponse, ResolveMlCapabilities } from '../../../common/types/capabilities';
diff --git a/x-pack/plugins/ml/server/shared_services/shared_services.ts b/x-pack/plugins/ml/server/shared_services/shared_services.ts
index 39ab8a43e3233..839ccb71d5c4a 100644
--- a/x-pack/plugins/ml/server/shared_services/shared_services.ts
+++ b/x-pack/plugins/ml/server/shared_services/shared_services.ts
@@ -10,14 +10,15 @@ import type {
   IScopedClusterClient,
   SavedObjectsClientContract,
   UiSettingsServiceStart,
-} from 'kibana/server';
-import type { SpacesPluginStart } from '../../../spaces/server';
-import { KibanaRequest } from '../../.././../../src/core/server';
+} from '@kbn/core/server';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { KibanaRequest } from '@kbn/core/server';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { MlLicense } from '../../common/license';
 
-import type { CloudSetup } from '../../../cloud/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
-import type { SecurityPluginSetup } from '../../../security/server';
 import { licenseChecks } from './license_checks';
 import { MlSystemProvider, getMlSystemProvider } from './providers/system';
 import { JobServiceProvider, getJobServiceProvider } from './providers/job_service';
@@ -44,7 +45,6 @@ import {
   getJobsHealthServiceProvider,
   JobsHealthServiceProvider,
 } from '../lib/alerts/jobs_health_service';
-import type { FieldFormatsStart } from '../../../../../src/plugins/field_formats/server';
 import type { FieldFormatsRegistryProvider } from '../../common/types/kibana';
 import { getDataViewsServiceFactory, GetDataViewsService } from '../lib/data_views_utils';
 
diff --git a/x-pack/plugins/ml/server/types.ts b/x-pack/plugins/ml/server/types.ts
index 8120d5c880b6c..b2090ac6bf7a0 100644
--- a/x-pack/plugins/ml/server/types.ts
+++ b/x-pack/plugins/ml/server/types.ts
@@ -5,30 +5,30 @@
  * 2.0.
  */
 
-import type { HomeServerPluginSetup } from 'src/plugins/home/server';
-import type { IRouter } from 'kibana/server';
-import type { CloudSetup } from '../../cloud/server';
-import type { SecurityPluginSetup } from '../../security/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import type { LicensingPluginSetup } from '../../licensing/server';
-import type { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { IRouter } from '@kbn/core/server';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import type { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
-import type { MlLicense } from '../common/license';
-import type { ResolveMlCapabilities } from '../common/types/capabilities';
-import type { RouteGuard } from './lib/route_guard';
-import type { AlertingPlugin } from '../../alerting/server';
-import type { ActionsPlugin } from '../../actions/server';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import type { AlertingPlugin } from '@kbn/alerting-plugin/server';
+import type { ActionsPlugin } from '@kbn/actions-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../src/plugins/data_views/server';
-import type {
-  FieldFormatsSetup,
-  FieldFormatsStart,
-} from '../../../../src/plugins/field_formats/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/data-plugin/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import type { RouteGuard } from './lib/route_guard';
+import type { ResolveMlCapabilities } from '../common/types/capabilities';
+import type { MlLicense } from '../common/license';
 
 export interface LicenseCheckResult {
   isAvailable: boolean;
diff --git a/x-pack/plugins/ml/server/usage/collector.ts b/x-pack/plugins/ml/server/usage/collector.ts
index abfef308951a9..44a403b15a9bd 100644
--- a/x-pack/plugins/ml/server/usage/collector.ts
+++ b/x-pack/plugins/ml/server/usage/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
 import { AnomalyResultType } from '../../common/types/anomalies';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../common/types/alerts';
diff --git a/x-pack/plugins/ml/shared_imports.ts b/x-pack/plugins/ml/shared_imports.ts
index e70410c99a8f4..33a84886aaaec 100644
--- a/x-pack/plugins/ml/shared_imports.ts
+++ b/x-pack/plugins/ml/shared_imports.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-export { EuiCodeEditor } from '../../../src/plugins/es_ui_shared/public';
-export type { EuiCodeEditorProps } from '../../../src/plugins/es_ui_shared/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+export type { EuiCodeEditorProps } from '@kbn/es-ui-shared-plugin/public';
 
-import { XJson } from '../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
 export { XJsonMode } from '@kbn/ace';
diff --git a/x-pack/plugins/monitoring/common/ccs_utils.test.js b/x-pack/plugins/monitoring/common/ccs_utils.test.js
index 45f709584c429..97aaf3ace0d08 100644
--- a/x-pack/plugins/monitoring/common/ccs_utils.test.js
+++ b/x-pack/plugins/monitoring/common/ccs_utils.test.js
@@ -6,12 +6,12 @@
  */
 
 import expect from '@kbn/expect';
-import { parseCrossClusterPrefix, prefixIndexPattern } from './ccs_utils';
+import { parseCrossClusterPrefix, prefixIndexPatternWithCcs } from './ccs_utils';
 
 // TODO: tests were not running and are not updated.
 // They need to be changed to run.
 describe.skip('ccs_utils', () => {
-  describe('prefixIndexPattern', () => {
+  describe('prefixIndexPatternWithCcs', () => {
     const indexPattern = '.monitoring-xyz-1-*,.monitoring-xyz-2-*';
 
     it('returns the index pattern if ccs is not enabled', () => {
@@ -19,8 +19,8 @@ describe.skip('ccs_utils', () => {
       const config = { ui: { css: { enabled: false } } };
 
       // falsy string values should be ignored
-      const allPattern = prefixIndexPattern(config, indexPattern, '*');
-      const onePattern = prefixIndexPattern(config, indexPattern, 'do_not_use_me');
+      const allPattern = prefixIndexPatternWithCcs(config, indexPattern, '*');
+      const onePattern = prefixIndexPatternWithCcs(config, indexPattern, 'do_not_use_me');
 
       expect(allPattern).to.be(indexPattern);
       expect(onePattern).to.be(indexPattern);
@@ -31,9 +31,9 @@ describe.skip('ccs_utils', () => {
       const config = { ui: { css: { enabled: true } } };
 
       // falsy string values should be ignored
-      const undefinedPattern = prefixIndexPattern(config, indexPattern);
-      const nullPattern = prefixIndexPattern(config, indexPattern, null);
-      const blankPattern = prefixIndexPattern(config, indexPattern, '');
+      const undefinedPattern = prefixIndexPatternWithCcs(config, indexPattern);
+      const nullPattern = prefixIndexPatternWithCcs(config, indexPattern, null);
+      const blankPattern = prefixIndexPatternWithCcs(config, indexPattern, '');
 
       expect(undefinedPattern).to.be(indexPattern);
       expect(nullPattern).to.be(indexPattern);
@@ -44,8 +44,8 @@ describe.skip('ccs_utils', () => {
       // TODO apply as MonitoringConfig during typescript conversion
       const config = { ui: { css: { enabled: true } } };
 
-      const abcPattern = prefixIndexPattern(config, indexPattern, 'aBc');
-      const underscorePattern = prefixIndexPattern(config, indexPattern, 'cluster_one');
+      const abcPattern = prefixIndexPatternWithCcs(config, indexPattern, 'aBc');
+      const underscorePattern = prefixIndexPatternWithCcs(config, indexPattern, 'cluster_one');
 
       expect(abcPattern).to.eql(
         'aBc:.monitoring-xyz-1-*,aBc:.monitoring-xyz-2-*,aBc:monitoring-xyz-1-*,aBc:monitoring-xyz-2-*'
@@ -59,7 +59,7 @@ describe.skip('ccs_utils', () => {
       // TODO apply as MonitoringConfig during typescript conversion
       const config = { ui: { css: { enabled: true } } };
 
-      const pattern = prefixIndexPattern(config, indexPattern, '*');
+      const pattern = prefixIndexPatternWithCcs(config, indexPattern, '*');
 
       // it should have BOTH patterns so that it searches all CCS clusters and the local cluster
       expect(pattern).to.eql(
diff --git a/x-pack/plugins/monitoring/common/ccs_utils.ts b/x-pack/plugins/monitoring/common/ccs_utils.ts
index 150e4f709de12..69cc1c25c372a 100644
--- a/x-pack/plugins/monitoring/common/ccs_utils.ts
+++ b/x-pack/plugins/monitoring/common/ccs_utils.ts
@@ -8,10 +8,6 @@
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import type { MonitoringConfig } from '../server/config';
 
-export function getConfigCcs(config: MonitoringConfig): boolean {
-  // TODO: (Mat) this function can probably be removed in favor of direct config access where it's used.
-  return config.ui.ccs.enabled;
-}
 /**
  * Prefix all comma separated index patterns within the original {@code indexPattern}.
  *
@@ -23,8 +19,12 @@ export function getConfigCcs(config: MonitoringConfig): boolean {
  * @param  {String} ccs The optional cluster-prefix to prepend.
  * @return {String} The index pattern with the {@code cluster} prefix appropriately prepended.
  */
-export function prefixIndexPattern(config: MonitoringConfig, indexPattern: string, ccs?: string) {
-  const ccsEnabled = getConfigCcs(config);
+export function prefixIndexPatternWithCcs(
+  config: MonitoringConfig,
+  indexPattern: string,
+  ccs?: string
+) {
+  const ccsEnabled = config.ui.ccs.enabled;
   if (!ccsEnabled || !ccs) {
     return indexPattern;
   }
diff --git a/x-pack/plugins/monitoring/common/constants.ts b/x-pack/plugins/monitoring/common/constants.ts
index 96f66fc3d4177..f9ce0f28d40a7 100644
--- a/x-pack/plugins/monitoring/common/constants.ts
+++ b/x-pack/plugins/monitoring/common/constants.ts
@@ -123,6 +123,7 @@ export const CLUSTER_ALERTS_ADDRESS_CONFIG_KEY = 'cluster_alerts.email_notificat
 
 export const STANDALONE_CLUSTER_CLUSTER_UUID = '__standalone_cluster__';
 
+export const CCS_REMOTE_PATTERN = '*';
 export const INDEX_PATTERN = '.monitoring-*';
 export const INDEX_PATTERN_KIBANA = '.monitoring-kibana-*';
 export const INDEX_PATTERN_LOGSTASH = '.monitoring-logstash-*';
diff --git a/x-pack/plugins/monitoring/common/http_api/apm/index.ts b/x-pack/plugins/monitoring/common/http_api/apm/index.ts
new file mode 100644
index 0000000000000..b2d5888abf9d7
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/http_api/apm/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './post_apm_instance';
+export * from './post_apm_instances';
+export * from './post_apm_overview';
diff --git a/x-pack/plugins/monitoring/common/http_api/apm/post_apm_instance.ts b/x-pack/plugins/monitoring/common/http_api/apm/post_apm_instance.ts
new file mode 100644
index 0000000000000..537b68dabd888
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/http_api/apm/post_apm_instance.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as rt from 'io-ts';
+
+export const postApmInstanceRequestParamsRT = rt.type({
+  clusterUuid: rt.string,
+  apmUuid: rt.string,
+});
+
+export const postApmInstanceRequestPayloadRT = rt.intersection([
+  rt.partial({
+    ccs: rt.string,
+  }),
+  rt.type({
+    timeRange: rt.type({
+      min: rt.string,
+      max: rt.string,
+    }),
+  }),
+]);
+
+export type PostApmInstanceRequestPayload = rt.TypeOf<typeof postApmInstanceRequestPayloadRT>;
+
+export const postApmInstanceResponsePayloadRT = rt.type({
+  data: rt.string,
+});
diff --git a/x-pack/plugins/monitoring/common/http_api/apm/post_apm_instances.ts b/x-pack/plugins/monitoring/common/http_api/apm/post_apm_instances.ts
new file mode 100644
index 0000000000000..9e5510ed7a8f9
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/http_api/apm/post_apm_instances.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as rt from 'io-ts';
+
+export const postApmInstancesRequestParamsRT = rt.type({
+  clusterUuid: rt.string,
+});
+
+export const postApmInstancesRequestPayloadRT = rt.intersection([
+  rt.partial({
+    ccs: rt.string,
+  }),
+  rt.type({
+    timeRange: rt.type({
+      min: rt.string,
+      max: rt.string,
+    }),
+  }),
+]);
+
+export type PostApmInstancesRequestPayload = rt.TypeOf<typeof postApmInstancesRequestPayloadRT>;
+
+export const postApmInstancesResponsePayloadRT = rt.type({
+  data: rt.string,
+});
diff --git a/x-pack/plugins/monitoring/common/http_api/apm/post_apm_overview.ts b/x-pack/plugins/monitoring/common/http_api/apm/post_apm_overview.ts
new file mode 100644
index 0000000000000..e7da157984b1d
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/http_api/apm/post_apm_overview.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as rt from 'io-ts';
+
+export const postApmOverviewRequestParamsRT = rt.type({
+  clusterUuid: rt.string,
+});
+
+export const postApmOverviewRequestPayloadRT = rt.intersection([
+  rt.partial({
+    ccs: rt.string,
+  }),
+  rt.type({
+    timeRange: rt.type({
+      min: rt.string,
+      max: rt.string,
+    }),
+  }),
+]);
+
+export type PostApmOverviewRequestPayload = rt.TypeOf<typeof postApmOverviewRequestPayloadRT>;
+
+export const postApmOverviewResponsePayloadRT = rt.type({
+  data: rt.string,
+});
diff --git a/x-pack/plugins/monitoring/common/runtime_types.ts b/x-pack/plugins/monitoring/common/runtime_types.ts
new file mode 100644
index 0000000000000..3b49cc628be84
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/runtime_types.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Context, IntersectionType, UnionType, ValidationError } from 'io-ts';
+
+const getErrorPath = ([first, ...rest]: Context): string[] => {
+  if (typeof first === 'undefined') {
+    return [];
+  } else if (first.type instanceof IntersectionType) {
+    const [, ...next] = rest;
+    return getErrorPath(next);
+  } else if (first.type instanceof UnionType) {
+    const [, ...next] = rest;
+    return [first.key, ...getErrorPath(next)];
+  }
+
+  return [first.key, ...getErrorPath(rest)];
+};
+
+const getErrorType = ({ context }: ValidationError) =>
+  context[context.length - 1]?.type?.name ?? 'unknown';
+
+const formatError = (error: ValidationError) =>
+  error.message ??
+  `in ${getErrorPath(error.context).join('/')}: ${JSON.stringify(
+    error.value
+  )} does not match expected type ${getErrorType(error)}`;
+
+export const formatErrors = (errors: ValidationError[]) =>
+  `Failed to validate: \n${errors.map((error) => `  ${formatError(error)}`).join('\n')}`;
diff --git a/x-pack/plugins/monitoring/common/types/alerts.ts b/x-pack/plugins/monitoring/common/types/alerts.ts
index f4b3101b3eaa9..597a70bdb8c6e 100644
--- a/x-pack/plugins/monitoring/common/types/alerts.ts
+++ b/x-pack/plugins/monitoring/common/types/alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Rule, RuleTypeParams, SanitizedRule } from '../../../alerting/common';
+import { Rule, RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 import {
   AlertParamType,
   AlertMessageTokenType,
diff --git a/x-pack/plugins/monitoring/dev_docs/reference/indices.md b/x-pack/plugins/monitoring/dev_docs/reference/indices.md
index c1c95d26842a7..41038ba43b845 100644
--- a/x-pack/plugins/monitoring/dev_docs/reference/indices.md
+++ b/x-pack/plugins/monitoring/dev_docs/reference/indices.md
@@ -33,7 +33,17 @@ When updating the templates, it is important to increment the version number [he
 PRs should add the labels ":Data Management/Monitoring" and "Team:Data Management" to involve the right Elasticsearch members.
 [Reference PR](https://github.com/elastic/elasticsearch/pull/85447)
 
-The `metrics-*` and `metricbeat-*` mappings are managed by metricbeat and elastic agent, **code locations TBD**.
+The `metrics-*` and `metricbeat-*` mappings are managed by metricbeat and elastic agent. The mappings are created by metricbeat programmatically by combining the field definitions of all the contained modules.
+
+## Fields
+
+The best place to reference information for each field is in the metricbeat module documentation for each component.
+
+- [Elasticsearch](https://github.com/elastic/beats/blob/main/metricbeat/module/elasticsearch/_meta/README.md)
+- [Kibana](https://github.com/elastic/beats/blob/main/metricbeat/module/kibana/_meta/README.md)
+- [Logstash](https://github.com/elastic/beats/blob/main/metricbeat/module/logstash/_meta/README.md)
+- [Beat](https://github.com/elastic/beats/blob/main/metricbeat/module/beat/_meta/README.md) (\*beat, apm-server, fleet server)
+- [Enterprise Search](https://github.com/elastic/beats/tree/main/x-pack/metricbeat/module/enterprisesearch/_meta/README.md)
 
 ## Aliasing
 
diff --git a/x-pack/plugins/monitoring/kibana.json b/x-pack/plugins/monitoring/kibana.json
index d10d8d674fcaf..bbb6eb374e91d 100644
--- a/x-pack/plugins/monitoring/kibana.json
+++ b/x-pack/plugins/monitoring/kibana.json
@@ -7,7 +7,7 @@
     "githubTeam": "stack-monitoring-ui"
   },
   "configPath": ["monitoring"],
-  "requiredPlugins": ["licensing", "features", "data", "navigation", "observability"],
+  "requiredPlugins": ["licensing", "features", "data", "navigation", "observability", "dataViews", "unifiedSearch"],
   "optionalPlugins": [
     "infra",
     "usageCollection",
@@ -22,7 +22,6 @@
   "ui": true,
   "requiredBundles": [
     "kibanaUtils",
-    "home",
     "alerting",
     "kibanaReact"
   ]
diff --git a/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx b/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
index edabe65f90df3..592a76744bab7 100644
--- a/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
@@ -13,21 +13,21 @@ import React, { Fragment, lazy } from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { ReactWrapper, mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
-import { actionTypeRegistryMock } from '../../../triggers_actions_ui/public/application/action_type_registry.mock';
-import { ruleTypeRegistryMock } from '../../../triggers_actions_ui/public/application/rule_type_registry.mock';
+import { coreMock } from '@kbn/core/public/mocks';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
+import { ruleTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/rule_type_registry.mock';
 import {
   ValidationResult,
   Rule,
   ConnectorValidationResult,
   GenericValidationResult,
   RuleTypeModel,
-} from '../../../triggers_actions_ui/public/types';
-import { RuleForm } from '../../../triggers_actions_ui/public/application/sections/rule_form/rule_form';
-import ActionForm from '../../../triggers_actions_ui/public/application/sections/action_connector_form/action_form';
+} from '@kbn/triggers-actions-ui-plugin/public/types';
+import { RuleForm } from '@kbn/triggers-actions-ui-plugin/public/application/sections/rule_form/rule_form';
+import ActionForm from '@kbn/triggers-actions-ui-plugin/public/application/sections/action_connector_form/action_form';
 import { Legacy } from '../legacy_shims';
 import { I18nProvider } from '@kbn/i18n-react';
-import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 
 interface AlertAction {
   group: string;
@@ -36,12 +36,12 @@ interface AlertAction {
   params: unknown;
 }
 
-jest.mock('../../../triggers_actions_ui/public/application/lib/action_connector_api', () => ({
+jest.mock('@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api', () => ({
   loadAllActions: jest.fn(),
   loadActionTypes: jest.fn(),
 }));
 
-jest.mock('../../../triggers_actions_ui/public/application/lib/rule_api', () => ({
+jest.mock('@kbn/triggers-actions-ui-plugin/public/application/lib/rule_api', () => ({
   loadAlertTypes: jest.fn(),
 }));
 
@@ -182,7 +182,7 @@ describe('alert_form', () => {
       async function setup() {
         initLegacyShims();
         const { loadAllActions } = jest.requireMock(
-          '../../../triggers_actions_ui/public/application/lib/action_connector_api'
+          '@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api'
         );
         loadAllActions.mockResolvedValueOnce([
           {
diff --git a/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx b/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx
index 4a5a03dbebc83..5cfdfdc056f5b 100644
--- a/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx
@@ -14,7 +14,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { MonitoringStartServices } from '../types';
 import { useAlertsModal } from '../application/hooks/use_alerts_modal';
 
diff --git a/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx
index 55e8d4c5bd245..4aae64b10fe6c 100644
--- a/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { RuleTypeParams } from '../../../../alerting/common';
-import type { RuleTypeModel, ValidationResult } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import type { RuleTypeModel, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_CCR_READ_EXCEPTIONS,
   RULE_DETAILS,
diff --git a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx
index f6a673f013668..670b9fe75fc07 100644
--- a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx
@@ -7,7 +7,7 @@
 
 import React, { Fragment, useCallback } from 'react';
 import { EuiForm, EuiFormRow, EuiSpacer } from '@elastic/eui';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { debounce } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { CommonAlertParamDetails } from '../../../../common/types/alerts';
@@ -29,14 +29,14 @@ export interface Props {
   setRuleProperty: (property: string, value: any) => void;
   errors: { [key: string]: string[] };
   paramDetails: CommonAlertParamDetails;
-  data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   config?: MonitoringConfig;
 }
 
 export const Expression: React.FC<Props> = (props) => {
-  const { ruleParams, paramDetails, setRuleParams, errors, config, data } = props;
+  const { ruleParams, paramDetails, setRuleParams, errors, config, dataViews } = props;
 
-  const { derivedIndexPattern } = useDerivedIndexPattern(data, config);
+  const { derivedIndexPattern } = useDerivedIndexPattern(dataViews, config);
 
   const alertParamsUi = Object.keys(paramDetails).map((alertParamName) => {
     const details = paramDetails[alertParamName];
@@ -92,11 +92,12 @@ export const Expression: React.FC<Props> = (props) => {
 
   const onFilterChange = useCallback(
     (filter: string) => {
-      setRuleParams('filterQueryText', filter);
-      setRuleParams(
-        'filterQuery',
-        convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
-      );
+      if (derivedIndexPattern) setRuleParams('filterQueryText', filter);
+      if (derivedIndexPattern)
+        setRuleParams(
+          'filterQuery',
+          convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
+        );
     },
     [setRuleParams, derivedIndexPattern]
   );
@@ -106,6 +107,17 @@ export const Expression: React.FC<Props> = (props) => {
     onFilterChange,
   ]);
 
+  const kueryBar = derivedIndexPattern ? (
+    <KueryBar
+      value={ruleParams.filterQueryText}
+      derivedIndexPattern={derivedIndexPattern}
+      onSubmit={onFilterChange}
+      onChange={debouncedOnFilterChange}
+    />
+  ) : (
+    <></>
+  );
+
   return (
     <Fragment>
       <EuiForm component="form">
@@ -119,12 +131,7 @@ export const Expression: React.FC<Props> = (props) => {
             defaultMessage: 'Use a KQL expression to limit the scope of your alert trigger.',
           })}
         >
-          <KueryBar
-            value={ruleParams.filterQueryText}
-            derivedIndexPattern={derivedIndexPattern}
-            onSubmit={onFilterChange}
-            onChange={debouncedOnFilterChange}
-          />
+          {kueryBar}
         </EuiFormRow>
         <EuiSpacer />
       </EuiForm>
diff --git a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx
index 1f133176a743e..c24543e269cb6 100644
--- a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { DataViewFieldBase } from '@kbn/es-query';
 import { useEffect, useState } from 'react';
-import { DataPublicPluginStart, IIndexPattern } from 'src/plugins/data/public';
-import { prefixIndexPattern } from '../../../../common/ccs_utils';
+import { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
+import { prefixIndexPatternWithCcs } from '../../../../common/ccs_utils';
 import {
+  CCS_REMOTE_PATTERN,
   INDEX_PATTERN_BEATS,
   INDEX_PATTERN_ELASTICSEARCH,
   INDEX_PATTERN_KIBANA,
@@ -20,26 +20,25 @@ import { MonitoringConfig } from '../../../types';
 const INDEX_PATTERNS = `${INDEX_PATTERN_ELASTICSEARCH},${INDEX_PATTERN_KIBANA},${INDEX_PATTERN_LOGSTASH},${INDEX_PATTERN_BEATS}`;
 
 export const useDerivedIndexPattern = (
-  data: DataPublicPluginStart,
+  dataViews: DataViewsPublicPluginStart,
   config?: MonitoringConfig
-): { loading: boolean; derivedIndexPattern: IIndexPattern } => {
-  const indexPattern = prefixIndexPattern(config || ({} as MonitoringConfig), INDEX_PATTERNS, '*');
+): { loading: boolean; derivedIndexPattern?: DataView } => {
+  const indexPattern = prefixIndexPatternWithCcs(
+    config || ({} as MonitoringConfig),
+    INDEX_PATTERNS,
+    CCS_REMOTE_PATTERN
+  );
   const [loading, setLoading] = useState<boolean>(true);
-  const [fields, setFields] = useState<DataViewFieldBase[]>([]);
+  const [dataView, setDataView] = useState<DataView>();
   useEffect(() => {
     (async function fetchData() {
-      const result = await data.indexPatterns.getFieldsForWildcard({
-        pattern: indexPattern,
-      });
-      setFields(result);
+      const result = await dataViews.create({ title: indexPattern });
+      setDataView(result);
       setLoading(false);
     })();
-  }, [indexPattern, data.indexPatterns]);
+  }, [indexPattern, dataViews]);
   return {
     loading,
-    derivedIndexPattern: {
-      title: indexPattern,
-      fields,
-    },
+    derivedIndexPattern: dataView,
   };
 };
diff --git a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx
index c240810786f63..814901e318a3a 100644
--- a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { RuleTypeParams } from '../../../../../alerting/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../../triggers_actions_ui/public/types';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public/types';
 
 export type MonitoringAlertTypeParams = ValidateOptions & RuleTypeParams;
 interface ValidateOptions {
diff --git a/x-pack/plugins/monitoring/public/alerts/configuration.tsx b/x-pack/plugins/monitoring/public/alerts/configuration.tsx
index 6dd62a9a1dae6..0d37b7abc3757 100644
--- a/x-pack/plugins/monitoring/public/alerts/configuration.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/configuration.tsx
@@ -9,10 +9,10 @@ import React, { Fragment, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSwitch } from '@elastic/eui';
+import { BASE_ALERTING_API_PATH } from '@kbn/alerting-plugin/common';
 import { CommonAlert } from '../../common/types/alerts';
 import { Legacy } from '../legacy_shims';
 import { hideBottomBar, showBottomBar } from '../lib/setup_mode';
-import { BASE_ALERTING_API_PATH } from '../../../alerting/common';
 
 interface Props {
   alert: CommonAlert;
diff --git a/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx b/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx
index bc4a494b129bd..fbfc897dd1d6c 100644
--- a/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { RULE_CPU_USAGE, RULE_DETAILS, RULE_REQUIRES_APP_CONTEXT } from '../../../common/constants';
 import type { MonitoringConfig } from '../../types';
 import {
diff --git a/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx
index d9885a363ca89..29a5db3ad45e6 100644
--- a/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_DISK_USAGE,
diff --git a/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx
index 3be2d4477fe10..a97be949e3120 100644
--- a/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { RuleTypeParams } from '../../../../alerting/common';
-import type { RuleTypeModel, ValidationResult } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import type { RuleTypeModel, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_LARGE_SHARD_SIZE,
diff --git a/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx b/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx
index 243db5787228e..475d625195aba 100644
--- a/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx
@@ -15,15 +15,16 @@ import { Props } from '../components/param_details_form/expression';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
-export const Expression = ({ ruleParams, config, setRuleParams, data }: Props) => {
-  const { derivedIndexPattern } = useDerivedIndexPattern(data, config);
+export const Expression = ({ ruleParams, config, setRuleParams, dataViews }: Props) => {
+  const { derivedIndexPattern } = useDerivedIndexPattern(dataViews, config);
   const onFilterChange = useCallback(
     (filter: string) => {
-      setRuleParams('filterQueryText', filter);
-      setRuleParams(
-        'filterQuery',
-        convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
-      );
+      if (derivedIndexPattern) setRuleParams('filterQueryText', filter);
+      if (derivedIndexPattern)
+        setRuleParams(
+          'filterQuery',
+          convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
+        );
     },
     [setRuleParams, derivedIndexPattern]
   );
@@ -32,6 +33,18 @@ export const Expression = ({ ruleParams, config, setRuleParams, data }: Props) =
   const debouncedOnFilterChange = useCallback(debounce(onFilterChange, FILTER_TYPING_DEBOUNCE_MS), [
     onFilterChange,
   ]);
+
+  const kueryBar = derivedIndexPattern ? (
+    <KueryBar
+      value={ruleParams.filterQueryText}
+      derivedIndexPattern={derivedIndexPattern}
+      onSubmit={onFilterChange}
+      onChange={debouncedOnFilterChange}
+    />
+  ) : (
+    <></>
+  );
+
   return (
     <EuiForm component="form">
       <EuiFormRow
@@ -43,12 +56,7 @@ export const Expression = ({ ruleParams, config, setRuleParams, data }: Props) =
           defaultMessage: 'Use a KQL expression to limit the scope of your alert trigger.',
         })}
       >
-        <KueryBar
-          value={ruleParams.filterQueryText}
-          derivedIndexPattern={derivedIndexPattern}
-          onSubmit={onFilterChange}
-          onChange={debouncedOnFilterChange}
-        />
+        {kueryBar}
       </EuiFormRow>
       <EuiSpacer />
     </EuiForm>
diff --git a/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx b/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx
index 505f18a5fdcf3..c41084bf737d9 100644
--- a/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   LEGACY_RULES,
   LEGACY_RULE_DETAILS,
diff --git a/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx b/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx
index 18806162b8b30..8652964e706b5 100644
--- a/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiLink } from '@elastic/eui';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Legacy } from '../../legacy_shims';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
 
 export interface EnableAlertResponse {
   isSufficientlySecure?: boolean;
diff --git a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx
index 86fa82b7515a2..445006ecf715e 100644
--- a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx
@@ -18,7 +18,7 @@ import {
   RULE_DISK_USAGE,
   RULE_MEMORY_USAGE,
 } from '../../../common/constants';
-import { RuleExecutionStatusValues } from '../../../../alerting/common';
+import { RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { AlertState } from '../../../common/types/alerts';
 
 jest.mock('../../legacy_shims', () => ({
diff --git a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx
index 60cd91f76f31e..7e7cd96f75aba 100644
--- a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx
@@ -18,7 +18,7 @@ import {
   RULE_DISK_USAGE,
   RULE_MEMORY_USAGE,
 } from '../../../common/constants';
-import { RuleExecutionStatusValues } from '../../../../alerting/common';
+import { RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { AlertState } from '../../../common/types/alerts';
 
 jest.mock('../../legacy_shims', () => ({
diff --git a/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx
index c4aa9e13b5786..fbf13db2370d7 100644
--- a/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_MEMORY_USAGE,
diff --git a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx
index 975e537d868b8..06da171383319 100644
--- a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_MISSING_MONITORING_DATA,
diff --git a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx
index 674576ce5c1a4..b442a60c8506c 100644
--- a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../triggers_actions_ui/public/types';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public/types';
 
 export function validate(opts: any): ValidationResult {
   const validationResult = { errors: {} };
diff --git a/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
index 4204ea581eeda..5b8030188b456 100644
--- a/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
@@ -8,7 +8,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { RULE_REQUIRES_APP_CONTEXT } from '../../../common/constants';
 import type { CommonAlertParamDetails } from '../../../common/types/alerts';
 import type { MonitoringConfig } from '../../types';
diff --git a/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx b/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx
index bb8195744cc31..6abbc5718ad61 100644
--- a/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx
+++ b/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import React, { createContext } from 'react';
+import { TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
 import { GlobalState } from '../../url_state';
 import { MonitoringStartPluginDependencies, MonitoringStartServices } from '../../types';
-import { TimeRange, RefreshInterval } from '../../../../../../src/plugins/data/public';
 import { Legacy } from '../../legacy_shims';
 import { shouldOverrideRefreshInterval } from './should_override_refresh_interval';
 
diff --git a/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx b/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx
index 031db07327e36..8e0f4361dcbeb 100644
--- a/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx
+++ b/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 interface ContextProps {
   setHeaderActionMenu?: AppMountParameters['setHeaderActionMenu'];
diff --git a/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts b/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts
index 9b6c94929862d..ba95e4402d596 100644
--- a/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts
+++ b/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { MonitoringStartPluginDependencies, MonitoringStartServices } from '../../types';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
 
 export const shouldOverrideRefreshInterval = (
   uiSettings: MonitoringStartServices['uiSettings'],
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts b/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts
index 6cbeffd3cb737..5469d02895bfc 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useRequestErrorHandler } from './use_request_error_handler';
 import { EnableAlertResponse, showAlertsToast } from '../../alerts/lib/alerts_toast';
 
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts b/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts
index 269d91538d7cd..95cae1720fd07 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import createContainer from 'constate';
 import { History } from 'history';
 import { Observable } from 'rxjs';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface Crumb {
   url?: string | null;
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx b/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx
index 25d7f139e5bbe..c37fae742d0ca 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx
@@ -7,8 +7,8 @@
 import moment from 'moment';
 import { useContext, useState, useEffect, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { MonitoringTimeContainer } from '../hooks/use_monitoring_time';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MonitoringTimeContainer } from './use_monitoring_time';
 
 export function useCharts() {
   const { services } = useKibana<{ data: any }>();
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts b/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts
index 1961bd53b909f..473b0b0fd90ab 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useState, useEffect } from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { fetchClusters } from '../../lib/fetch_clusters';
 import { useRequestErrorHandler } from './use_request_error_handler';
 
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts b/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts
index 8f1a5d6f4a9d3..13f40fc89a704 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts
@@ -6,7 +6,7 @@
  */
 import { useCallback, useState, useContext, useEffect } from 'react';
 import createContainer from 'constate';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Legacy } from '../../legacy_shims';
 import { GlobalStateContext } from '../contexts/global_state_context';
 
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx b/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
index ccf58c1f9d47a..ee7a1941bda6e 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
@@ -8,11 +8,11 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useHistory } from 'react-router-dom';
 import { includes } from 'lodash';
-import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 import { formatMsg } from '../../lib/format_msg';
-import { toMountPoint, useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { MonitoringStartPluginDependencies } from '../../types';
 
 export function formatMonitoringError(err: IHttpFetchError<ResponseErrorBody>) {
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_table.ts b/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
index be1983c373c27..f611924372af1 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
@@ -7,8 +7,8 @@
 
 import { useState, useCallback } from 'react';
 import { EuiTableSortingType } from '@elastic/eui';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { euiTableStorageGetter, euiTableStorageSetter } from '../../components/table';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { EUI_SORT_ASCENDING } from '../../../common/constants';
 
 interface Pagination {
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_title.ts b/x-pack/plugins/monitoring/public/application/hooks/use_title.ts
index 25cc2c5b40dff..a4661e71eb399 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_title.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_title.ts
@@ -6,7 +6,7 @@
  */
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 // TODO: verify that works for all pages
 export function useTitle(cluster: string, suffix: string) {
diff --git a/x-pack/plugins/monitoring/public/application/index.tsx b/x-pack/plugins/monitoring/public/application/index.tsx
index 5d5d0c8bdd8a6..3fd12c312d13f 100644
--- a/x-pack/plugins/monitoring/public/application/index.tsx
+++ b/x-pack/plugins/monitoring/public/application/index.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreStart, AppMountParameters, MountPoint, CoreTheme } from 'kibana/public';
+import { CoreStart, AppMountParameters, MountPoint, CoreTheme } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Switch, Redirect, Router } from 'react-router-dom';
 import { Observable } from 'rxjs';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { LoadingPage } from './pages/loading_page';
 import { LicensePage } from './pages/license_page';
 import { ClusterOverview } from './pages/cluster/overview_page';
diff --git a/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx b/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
index da245ecd80d81..80c2839131047 100644
--- a/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
@@ -11,8 +11,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiCallOut, EuiButton } from '@elastic/eui';
 import useInterval from 'react-use/lib/useInterval';
 import { Redirect } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { MonitoringStartPluginDependencies } from '../../../types';
 
 export const AccessDeniedPage: React.FC<ComponentProps> = () => {
diff --git a/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx
index 9f8260b4fa0d9..97f19f3cf9204 100644
--- a/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx
@@ -9,9 +9,9 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useCharts } from '../../hooks/use_charts';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
 import { PageTemplate } from '../page_template';
diff --git a/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx
index fa3420d439eca..29f6a1f9e056e 100644
--- a/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx
@@ -8,9 +8,9 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTable } from '../../hooks/use_table';
 import { ApmTemplate } from './apm_template';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx
index 39144505d9818..1cf264daaeea3 100644
--- a/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { ApmTemplate } from './apm_template';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { useCharts } from '../../hooks/use_charts';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
 // @ts-ignore
 import { ApmOverview } from '../../../components/apm/overview';
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx
index 70dba8d5f0d3c..68345db40caf2 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx
@@ -9,9 +9,9 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useCharts } from '../../hooks/use_charts';
 // @ts-ignore
 import { Beat } from '../../../components/beats/beat';
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
index a677d22cbd3a7..ea4f04151e83a 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
@@ -8,9 +8,9 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTable } from '../../hooks/use_table';
 import { BeatsTemplate } from './beats_template';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
index fad66cd03e444..610fbe7ce2daf 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { BeatsTemplate } from './beats_template';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { useCharts } from '../../hooks/use_charts';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 // @ts-ignore
 import { BeatsOverview } from '../../../components/beats/overview';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
diff --git a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
index 2ffbc3a75ce05..d128beee7ce87 100644
--- a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
@@ -7,9 +7,9 @@
 
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CODE_PATH_ALL } from '../../../../common/constants';
 import { PageTemplate } from '../page_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { TabMenuItem } from '../page_template';
 import { Overview } from '../../../components/cluster/overview';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx
index 2ab18331d1cdb..cc0113acb3b5f 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { Ccr } from '../../../components/elasticsearch/ccr';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx
index db6018795e01b..925baa5edd052 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx
@@ -9,8 +9,8 @@ import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PageTemplate } from '../page_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { CcrShard } from '../../../components/elasticsearch/ccr_shard';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx
index 1982b7de87cae..734d59f310676 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx
@@ -8,7 +8,7 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
 import { useParams } from 'react-router-dom';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 import { SetupModeRenderer, SetupModeProps } from '../../../components/renderers/setup_mode';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx
index 5a3a48bdfe17f..b1029dc0451cc 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx
@@ -8,10 +8,10 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
-import { Index } from '../../../components/elasticsearch/index/index';
+import { Index } from '../../../components/elasticsearch/index/index.js';
 import { ComponentProps } from '../../route_init';
 import { SetupModeRenderer, SetupModeProps } from '../../../components/renderers/setup_mode';
 import { SetupModeContext } from '../../../components/setup_mode/setup_mode_context';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx
index 6618db7eebe66..d14015532167e 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ElasticsearchIndices } from '../../../components/elasticsearch';
 import { ComponentProps } from '../../route_init';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx
index 0f002323c310f..5c7fd227a0a53 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ElasticsearchMLJobs } from '../../../components/elasticsearch';
 import { ComponentProps } from '../../route_init';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
index 820eb2fb20cd8..05394a6d36aec 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
@@ -8,8 +8,8 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ItemTemplate } from './item_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { AdvancedNode } from '../../../components/elasticsearch/node/advanced';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
index e09a1a2343c7b..e41e921985015 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
@@ -8,8 +8,8 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ItemTemplate } from './item_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { Node } from '../../../components/elasticsearch';
 import { ComponentProps } from '../../route_init';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
index 5d5fa4df458e1..156d8463b80be 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ExternalConfigContext } from '../../contexts/external_config_context';
 import { ElasticsearchNodes } from '../../../components/elasticsearch';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx
index 16fa6de24b6b7..c4524bb161040 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { ElasticsearchOverview } from '../../../components/elasticsearch';
diff --git a/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx
index 50266c90aceeb..75d2d2f89fae1 100644
--- a/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { EntSearchTemplate } from './ent_search_template';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { useCharts } from '../../hooks/use_charts';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { EnterpriseSearchOverview } from '../../../components/enterprise_search/overview';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
 
diff --git a/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx b/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx
index a31f2bc317fa6..80c46342294f5 100644
--- a/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { Redirect } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 // @ts-ignore
 import { Listing } from '../../../components/cluster/listing';
 import { EnableAlertsModal } from '../../../alerts/enable_alerts_modal';
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
index 262590b6806af..5332968c1c34a 100644
--- a/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
@@ -18,9 +18,9 @@ import {
   EuiFlexItem,
   EuiPanel,
 } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useCharts } from '../../hooks/use_charts';
 // @ts-ignore
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
index f20099b286808..6f1f822b8488f 100644
--- a/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
@@ -8,9 +8,9 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTable } from '../../hooks/use_table';
 import { KibanaTemplate } from './kibana_template';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
index 4c480bf1fbb33..078559ac30663 100644
--- a/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
@@ -17,8 +17,8 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { KibanaTemplate } from './kibana_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/license_page.tsx b/x-pack/plugins/monitoring/public/application/pages/license_page.tsx
index 05dcb32b75b98..2f0e424d14238 100644
--- a/x-pack/plugins/monitoring/public/application/pages/license_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/license_page.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PageTemplate } from './page_template';
 import { License } from '../../components';
 import { GlobalStateContext } from '../contexts/global_state_context';
 import { CODE_PATH_LICENSE, STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../common/constants';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { MonitoringTimeContainer } from '../hooks/use_monitoring_time';
 
 const CODE_PATHS = [CODE_PATH_LICENSE];
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx
index abff02ef7b3c3..10c2a1f9761de 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx
@@ -17,7 +17,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { useRouteMatch } from 'react-router-dom';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx
index aa722e5c3e245..32e4eb1dd7a7b 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx
@@ -17,7 +17,7 @@ import {
   EuiFlexGrid,
   EuiFlexItem,
 } from '@elastic/eui';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
index 35f4c0ce2ac44..a04d55a249734 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
@@ -7,22 +7,21 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-// @ts-ignore
 import { useRouteMatch } from 'react-router-dom';
-// @ts-ignore
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+// @ts-expect-error
 import { isPipelineMonitoringSupportedInVersion } from '../../../lib/logstash/pipelines';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
-// @ts-ignore
+// @ts-expect-error
 import { Listing } from '../../../components/logstash/listing';
 import { LogstashTemplate } from './logstash_template';
-// @ts-ignore
+// @ts-expect-error
 import { DetailStatus } from '../../../components/logstash/detail_status';
-// @ts-ignore
+// @ts-expect-error
 import { MonitoringTimeseriesContainer } from '../../../components/chart';
 import { useTable } from '../../hooks/use_table';
-// @ts-ignore
+// @ts-expect-error
 import { PipelineListing } from '../../../components/logstash/pipeline_listing/pipeline_listing';
 import { useCharts } from '../../hooks/use_charts';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
index a603106242082..b350f057aae96 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
index 60c9463d39bda..e8b9dda758713 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 import { useCharts } from '../../hooks/use_charts';
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
index 3d78a98170d50..af68390aa4e76 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
 import moment from 'moment';
 import { useRouteMatch } from 'react-router-dom';
-import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
index ace8c23a480ba..a669b06ac8bcf 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 import { useCharts } from '../../hooks/use_charts';
diff --git a/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx b/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx
index e767074aea42b..d0806c1d86c02 100644
--- a/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx
@@ -10,9 +10,9 @@ import { Redirect } from 'react-router-dom';
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { NoData } from '../../../components/no_data';
 import { PageTemplate } from '../page_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { CODE_PATH_LICENSE, STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
 import { Legacy } from '../../../legacy_shims';
 import { Enabler } from './enabler';
diff --git a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
index 06a274d94be10..6e4209aa6bc4c 100644
--- a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
@@ -16,7 +16,8 @@ import {
 } from '@elastic/eui';
 import React, { useContext, useState, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
+import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
 import { useTitle } from '../hooks/use_title';
 import { MonitoringToolbar } from '../../components/shared/toolbar';
 import { MonitoringTimeContainer } from '../hooks/use_monitoring_time';
@@ -31,8 +32,7 @@ import { SetupModeFeature } from '../../../common/enums';
 import { AlertsDropdown } from '../../alerts/alerts_dropdown';
 import { useRequestErrorHandler } from '../hooks/use_request_error_handler';
 import { SetupModeToggleButton } from '../../components/setup_mode/toggle_button';
-import { HeaderMenuPortal } from '../../../../observability/public';
-import { HeaderActionMenuContext } from '../../application/contexts/header_action_menu_context';
+import { HeaderActionMenuContext } from '../contexts/header_action_menu_context';
 
 export interface TabMenuItem {
   id: string;
diff --git a/x-pack/plugins/monitoring/public/components/apm/status_icon.js b/x-pack/plugins/monitoring/public/components/apm/status_icon.js
index 14a51313e4aa7..5ca93d47e1e18 100644
--- a/x-pack/plugins/monitoring/public/components/apm/status_icon.js
+++ b/x-pack/plugins/monitoring/public/components/apm/status_icon.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { StatusIcon, STATUS_ICON_TYPES } from '../../components/status_icon';
+import { StatusIcon, STATUS_ICON_TYPES } from '../status_icon';
 import { i18n } from '@kbn/i18n';
 
 export function ApmStatusIcon({ status, availability = true }) {
diff --git a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
index 4fdda2372dd0d..2a8c9caf19c52 100644
--- a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
@@ -16,7 +16,7 @@ import {
   EuiScreenReaderOnly,
   EuiPanel,
 } from '@elastic/eui';
-import { Stats } from '../../beats';
+import { Stats } from '..';
 import { formatMetric } from '../../../lib/format_number';
 import { EuiMonitoringTable } from '../../table';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/monitoring/public/components/beats/overview/overview.js b/x-pack/plugins/monitoring/public/components/beats/overview/overview.js
index d9762b150974d..e4355aab02a5e 100644
--- a/x-pack/plugins/monitoring/public/components/beats/overview/overview.js
+++ b/x-pack/plugins/monitoring/public/components/beats/overview/overview.js
@@ -9,7 +9,7 @@ import React from 'react';
 import { LatestActive } from './latest_active';
 import { LatestVersions } from './latest_versions';
 import { LatestTypes } from './latest_types';
-import { Stats } from '../';
+import { Stats } from '..';
 import { MonitoringTimeseriesContainer } from '../../chart';
 import {
   EuiCallOut,
diff --git a/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js b/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js
index 2c6200284bdd7..a9590c8d94d2f 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js
@@ -28,7 +28,7 @@ import { AlertsStatus } from '../../../alerts/status';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
 import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link';
 import './listing.scss';
-import { toMountPoint, useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 
 const IsClusterSupported = ({ isSupported, children }) => {
   return isSupported ? children : '-';
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
index 41663bc0e4e72..66329b52231a8 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
@@ -6,7 +6,7 @@
  */
 
 import React, { Fragment } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   EuiPage,
   EuiPageBody,
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js
index b749e31226994..97a03d5206276 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js
@@ -15,7 +15,7 @@ import { FilesProgress, BytesProgress, TranslogProgress } from './progress';
 import { parseProps } from './parse_props';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 const columns = [
   {
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx
index 522256ea49b98..ae7129f561148 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx
@@ -7,8 +7,8 @@
 
 import { EuiFieldSearch, EuiOutsideClickDetector, EuiPanel } from '@elastic/eui';
 import React from 'react';
-import { QuerySuggestion } from '../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { QuerySuggestion } from '@kbn/unified-search-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { composeStateUpdaters } from '../../lib/typed_react';
 import { SuggestionItem } from './suggestion_item';
 
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx
index 6d79266fe3cc6..6810f2b2b73b9 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx
@@ -8,7 +8,8 @@
 import { fromKueryExpression } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
-import { IIndexPattern, QuerySuggestion } from '../../../../../../src/plugins/data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { QuerySuggestion } from '@kbn/unified-search-plugin/public';
 import { AutocompleteField } from './autocomplete_field';
 import { WithKueryAutocompletion } from './with_kuery_autocompletion';
 
@@ -21,7 +22,7 @@ type LoadSuggestionsFn = (
 export type CurryLoadSuggestionsType = (loadSuggestions: LoadSuggestionsFn) => LoadSuggestionsFn;
 
 interface Props {
-  derivedIndexPattern: IIndexPattern;
+  derivedIndexPattern: DataView;
   onSubmit: (query: string) => void;
   onChange?: (query: string) => void;
   value?: string | null;
@@ -64,17 +65,12 @@ export const KueryBar = ({
     }
   };
 
-  const filteredDerivedIndexPattern = {
-    ...derivedIndexPattern,
-    fields: derivedIndexPattern.fields,
-  };
-
   const defaultPlaceholder = i18n.translate('xpack.monitoring.alerts.kqlSearchFieldPlaceholder', {
     defaultMessage: 'Search for monitoring data',
   });
 
   return (
-    <WithKueryAutocompletion indexPattern={filteredDerivedIndexPattern}>
+    <WithKueryAutocompletion indexPattern={derivedIndexPattern}>
       {({ isLoadingSuggestions, loadSuggestions, suggestions }) => (
         <AutocompleteField
           aria-label={placeholder}
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx
index 3681bf26987cc..687ba1ebc5e63 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx
@@ -8,8 +8,8 @@
 import { EuiIcon } from '@elastic/eui';
 import { transparentize } from 'polished';
 import React from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../../../../src/plugins/data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/unified-search-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface Props {
   isSelected?: boolean;
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx
index 8d79bf4039846..bef933d1431a0 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx
@@ -6,22 +6,25 @@
  */
 
 import React from 'react';
-import { QuerySuggestion, IIndexPattern, DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { UnifiedSearchPublicPluginStart, QuerySuggestion } from '@kbn/unified-search-plugin/public';
 import {
   withKibana,
   KibanaReactContextValue,
   KibanaServices,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { RendererFunction } from '../../lib/typed_react';
 
 interface WithKueryAutocompletionLifecycleProps {
-  kibana: KibanaReactContextValue<{ data: DataPublicPluginStart } & KibanaServices>;
+  kibana: KibanaReactContextValue<
+    { unifiedSearch: UnifiedSearchPublicPluginStart } & KibanaServices
+  >;
   children: RendererFunction<{
     isLoadingSuggestions: boolean;
     loadSuggestions: (expression: string, cursorPosition: number, maxSuggestions?: number) => void;
     suggestions: QuerySuggestion[];
   }>;
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
 }
 
 interface WithKueryAutocompletionLifecycleState {
@@ -62,7 +65,7 @@ class WithKueryAutocompletionComponent extends React.Component<
     const { indexPattern } = this.props;
     const language = 'kuery';
     const hasQuerySuggestions =
-      this.props.kibana.services.data?.autocomplete.hasQuerySuggestions(language);
+      this.props.kibana.services.unifiedSearch?.autocomplete.hasQuerySuggestions(language);
 
     if (!hasQuerySuggestions) {
       return;
@@ -77,7 +80,7 @@ class WithKueryAutocompletionComponent extends React.Component<
     });
 
     const suggestions =
-      (await this.props.kibana.services.data.autocomplete.getQuerySuggestions({
+      (await this.props.kibana.services.unifiedSearch.autocomplete.getQuerySuggestions({
         language,
         query: expression,
         selectionStart: cursorPosition,
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
index 4bf4990553837..5b0e9d586771a 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { formatMetric } from '../../../lib/format_number';
 import { ClusterStatus } from '../cluster_status';
-import { Sparkline } from '../../../components/sparkline';
+import { Sparkline } from '../../sparkline';
 import { EuiMonitoringSSPTable } from '../../table';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
index 0247dcf532ceb..0a757f8d88346 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Graph } from './';
+import { Graph } from '.';
 import { Vertex } from './vertex';
 import { PluginVertex } from './plugin_vertex';
 import { Edge } from './edge';
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
index ff1226922a29d..e106b3409781d 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Graph } from './';
+import { Graph } from '.';
 
 describe('Vertex', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js b/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
index 0c99bf6f3e2f0..784f377c2020c 100644
--- a/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
+++ b/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
@@ -27,7 +27,7 @@ import {
   EuiCheckbox,
 } from '@elastic/eui';
 import { getInstructionSteps } from '../instruction_steps';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import {
   STORAGE_KEY,
   ELASTICSEARCH_SYSTEM_ID,
diff --git a/x-pack/plugins/monitoring/public/components/page_loading/index.tsx b/x-pack/plugins/monitoring/public/components/page_loading/index.tsx
index 383266c62c5f6..54289a2128a29 100644
--- a/x-pack/plugins/monitoring/public/components/page_loading/index.tsx
+++ b/x-pack/plugins/monitoring/public/components/page_loading/index.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import './page_loading.scss';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 function PageLoadingUI() {
   return (
diff --git a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
index 3680a00cbe3c7..8119685dc65f6 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
+++ b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
@@ -15,7 +15,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
-import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../application/contexts/global_state_context';
 import { useRequestErrorHandler } from '../../application/hooks/use_request_error_handler';
 import {
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
index 3e931caadcdff..f91641d942815 100644
--- a/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
+++ b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { METRIC_TYPE, useUiTracker } from '../../../../observability/public';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import { TELEMETRY_METRIC_BUTTON_CLICK } from '../../../common/constants';
 import { SetupModeExitButton } from './exit_button';
 
diff --git a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
index 7ae60d1cc102b..200ce9f849433 100644
--- a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
+++ b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
@@ -7,12 +7,12 @@
 
 import { EuiPageHeader, EuiSuperDatePicker, OnRefreshChangeProps } from '@elastic/eui';
 import React, { useContext, useCallback, useMemo } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { MonitoringTimeContainer } from '../../application/hooks/use_monitoring_time';
 import { GlobalStateContext } from '../../application/contexts/global_state_context';
 import { Legacy } from '../../legacy_shims';
 import { MonitoringStartServices } from '../../types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 interface MonitoringToolbarProps {
   pageTitle?: string;
   onRefresh?: () => void;
diff --git a/x-pack/plugins/monitoring/public/components/table/storage.ts b/x-pack/plugins/monitoring/public/components/table/storage.ts
index 411bd09872858..7d4d3129650ae 100644
--- a/x-pack/plugins/monitoring/public/components/table/storage.ts
+++ b/x-pack/plugins/monitoring/public/components/table/storage.ts
@@ -7,8 +7,8 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import { get } from 'lodash';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { STORAGE_KEY } from '../../../common/constants';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 
 interface TableValues {
   filterText: any;
diff --git a/x-pack/plugins/monitoring/public/index.ts b/x-pack/plugins/monitoring/public/index.ts
index 8f26d5eb16b9d..a3ab14249f905 100644
--- a/x-pack/plugins/monitoring/public/index.ts
+++ b/x-pack/plugins/monitoring/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MonitoringPlugin } from './plugin';
 
 export function plugin(ctx: PluginInitializerContext) {
diff --git a/x-pack/plugins/monitoring/public/legacy_shims.ts b/x-pack/plugins/monitoring/public/legacy_shims.ts
index 9fbb4beb4bef3..7477150b10492 100644
--- a/x-pack/plugins/monitoring/public/legacy_shims.ts
+++ b/x-pack/plugins/monitoring/public/legacy_shims.ts
@@ -15,19 +15,19 @@ import {
   DocLinksStart,
   ChromeStart,
   I18nStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { HttpRequestInit } from '../../../../src/core/public';
+import { HttpRequestInit } from '@kbn/core/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { TypeRegistry } from '@kbn/triggers-actions-ui-plugin/public/application/type_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ActionTypeModel, RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public/types';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import {
   MonitoringStartPluginDependencies,
   LegacyMonitoringStartPluginDependencies,
 } from './types';
-import { TriggersAndActionsUIPublicPluginStart } from '../../triggers_actions_ui/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { TypeRegistry } from '../../triggers_actions_ui/public/application/type_registry';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ActionTypeModel, RuleTypeModel } from '../../triggers_actions_ui/public/types';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 
 interface BreadcrumbItem {
   ['data-test-subj']?: string;
diff --git a/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts b/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts
index c0ce7ed260889..ddfa158ad21f8 100644
--- a/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts
+++ b/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { CommonAlertFilter } from '../../common/types/alerts';
 import { AlertsByName } from '../alerts/types';
 
diff --git a/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts b/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts
index 41cb1ab288a17..e5c8adf76ab10 100644
--- a/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts
+++ b/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../common/constants';
 
 interface Params {
diff --git a/x-pack/plugins/monitoring/public/lib/kuery.ts b/x-pack/plugins/monitoring/public/lib/kuery.ts
index 67f58360bc27a..06c0fde9859a8 100644
--- a/x-pack/plugins/monitoring/public/lib/kuery.ts
+++ b/x-pack/plugins/monitoring/public/lib/kuery.ts
@@ -6,11 +6,11 @@
  */
 
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
-import { IIndexPattern } from '../../../../../src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export const convertKueryToElasticSearchQuery = (
   kueryExpression: string,
-  indexPattern: IIndexPattern
+  indexPattern: DataView
 ) => {
   try {
     return kueryExpression
diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
index eca6ba2818503..4f70e8f9e9030 100644
--- a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
+++ b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { HttpStart, IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { HttpStart, IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { Legacy } from '../legacy_shims';
 import { SetupModeFeature } from '../../common/enums';
 import { ISetupModeContext } from '../components/setup_mode/setup_mode_context';
diff --git a/x-pack/plugins/monitoring/public/plugin.ts b/x-pack/plugins/monitoring/public/plugin.ts
index 285ea480027d1..147365697170c 100644
--- a/x-pack/plugins/monitoring/public/plugin.ts
+++ b/x-pack/plugins/monitoring/public/plugin.ts
@@ -13,14 +13,11 @@ import {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../triggers_actions_ui/public';
+} from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_THREAD_POOL_SEARCH_REJECTIONS,
@@ -48,6 +45,7 @@ interface MonitoringSetupPluginDependencies {
   triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
   usageCollection: UsageCollectionSetup;
 }
+
 export class MonitoringPlugin
   implements
     Plugin<void, void, MonitoringSetupPluginDependencies, MonitoringStartPluginDependencies>
@@ -79,7 +77,7 @@ export class MonitoringPlugin
         icon,
         path: '/app/monitoring',
         showOnHomePage: true,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
         description: i18n.translate('xpack.monitoring.featureCatalogueDescription', {
           defaultMessage: 'Track the real-time health and performance of your deployment.',
         }),
@@ -109,6 +107,7 @@ export class MonitoringPlugin
           triggersActionsUi: pluginsStart.triggersActionsUi,
           usageCollection: plugins.usageCollection,
           appMountParameters: params,
+          dataViews: pluginsStart.dataViews,
         };
 
         Legacy.init({
@@ -122,6 +121,7 @@ export class MonitoringPlugin
           triggersActionsUi: deps.triggersActionsUi,
           usageCollection: deps.usageCollection,
           appMountParameters: deps.appMountParameters,
+          dataViews: deps.dataViews,
         });
 
         const config = Object.fromEntries(externalConfig);
diff --git a/x-pack/plugins/monitoring/public/types.ts b/x-pack/plugins/monitoring/public/types.ts
index 35c6b7acf0cf3..554b08f0f6ce2 100644
--- a/x-pack/plugins/monitoring/public/types.ts
+++ b/x-pack/plugins/monitoring/public/types.ts
@@ -5,21 +5,23 @@
  * 2.0.
  */
 
-import { PluginInitializerContext, CoreStart, AppMountParameters } from 'kibana/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../triggers_actions_ui/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
+import { PluginInitializerContext, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 export type { MonitoringConfig } from '../server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 export type { MLJobs } from '../server/lib/elasticsearch/get_ml_jobs';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export interface MonitoringStartPluginDependencies {
   navigation: NavigationStart;
   data: DataPublicPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   usageCollection: UsageCollectionSetup;
+  dataViews: DataViewsPublicPluginStart;
 }
 
 interface LegacyStartDependencies {
diff --git a/x-pack/plugins/monitoring/public/url_state.ts b/x-pack/plugins/monitoring/public/url_state.ts
index ab7d578dbca49..e19758d882124 100644
--- a/x-pack/plugins/monitoring/public/url_state.ts
+++ b/x-pack/plugins/monitoring/public/url_state.ts
@@ -6,15 +6,7 @@
  */
 import { Subscription } from 'rxjs';
 import { History, createHashHistory } from 'history';
-import { MonitoringStartPluginDependencies, MonitoringStartServices } from './types';
-import { Legacy } from './legacy_shims';
-
-import {
-  RefreshInterval,
-  TimeRange,
-  syncQueryStateWithUrl,
-} from '../../../../src/plugins/data/public';
-
+import { RefreshInterval, TimeRange, syncQueryStateWithUrl } from '@kbn/data-plugin/public';
 import {
   createStateContainer,
   createKbnUrlStateStorage,
@@ -24,7 +16,9 @@ import {
   ISyncStateRef,
   syncState,
   withNotifyOnErrors,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
+import { MonitoringStartPluginDependencies, MonitoringStartServices } from './types';
+import { Legacy } from './legacy_shims';
 
 interface RawObject {
   [key: string]: unknown;
diff --git a/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts b/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
index 03727cf1b98bd..9cebe881936a3 100644
--- a/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
+++ b/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
+import { Rule } from '@kbn/alerting-plugin/common';
 import {
   LargeShardSizeRule,
   CCRReadExceptionsRule,
@@ -21,7 +23,7 @@ import {
   KibanaVersionMismatchRule,
   ElasticsearchVersionMismatchRule,
   BaseRule,
-} from './';
+} from '.';
 import {
   RULE_CLUSTER_HEALTH,
   RULE_LICENSE_EXPIRATION,
@@ -38,8 +40,6 @@ import {
   RULE_CCR_READ_EXCEPTIONS,
   RULE_LARGE_SHARD_SIZE,
 } from '../../common/constants';
-import { RulesClient } from '../../../alerting/server';
-import { Rule } from '../../../alerting/common';
 import { CommonAlertParams } from '../../common/types/alerts';
 
 const BY_TYPE = {
diff --git a/x-pack/plugins/monitoring/server/alerts/base_rule.ts b/x-pack/plugins/monitoring/server/alerts/base_rule.ts
index 3769fb8e29912..9c9d993e0a340 100644
--- a/x-pack/plugins/monitoring/server/alerts/base_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/base_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, ElasticsearchClient } from 'kibana/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import {
   RuleType,
@@ -13,9 +13,10 @@ import {
   Alert,
   RulesClient,
   RuleExecutorServices,
-} from '../../../alerting/server';
-import { Rule, RuleTypeParams, RawAlertInstance, SanitizedRule } from '../../../alerting/common';
-import { ActionsClient } from '../../../actions/server';
+} from '@kbn/alerting-plugin/server';
+import { Rule, RuleTypeParams, RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { ActionsClient } from '@kbn/actions-plugin/server';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import {
   AlertState,
   AlertNodeState,
@@ -29,7 +30,6 @@ import {
 } from '../../common/types/alerts';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
 import { AlertSeverity } from '../../common/enums';
-import { parseDuration } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 
 type ExecutedState =
diff --git a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts
index d4f9284b40f8f..6887f3051d727 100644
--- a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts
@@ -9,7 +9,7 @@ import { CCRReadExceptionsRule } from './ccr_read_exceptions_rule';
 import { RULE_CCR_READ_EXCEPTIONS } from '../../common/constants';
 import { fetchCCRReadExceptions } from '../lib/alerts/fetch_ccr_read_exceptions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type ICCRReadExceptionsRuleMock = CCRReadExceptionsRule & {
   defaultParams: {
diff --git a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts
index 1f90eb588d9c7..1c1bfe7bf3018 100644
--- a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts
@@ -6,7 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
+import { SanitizedRule, RawAlertInstance } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -21,12 +24,9 @@ import {
   CommonAlertFilter,
   CCRReadExceptionsStats,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_CCR_READ_EXCEPTIONS, RULE_DETAILS } from '../../common/constants';
 import { fetchCCRReadExceptions } from '../lib/alerts/fetch_ccr_read_exceptions';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { parseDuration } from '../../../alerting/common/parse_duration';
-import { SanitizedRule, RawAlertInstance } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts
index ec4c15afe6731..d67f10613607a 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts
@@ -10,7 +10,7 @@ import { RULE_CLUSTER_HEALTH } from '../../common/constants';
 import { AlertClusterHealthType, AlertSeverity } from '../../common/enums';
 import { fetchClusterHealth } from '../lib/alerts/fetch_cluster_health';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts
index 256de16821e64..370a1581dc1a0 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -18,11 +20,9 @@ import {
   AlertClusterHealth,
   AlertInstanceState,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_CLUSTER_HEALTH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertClusterHealthType, AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { fetchClusterHealth } from '../lib/alerts/fetch_cluster_health';
 
 const RED_STATUS_MESSAGE = i18n.translate('xpack.monitoring.alerts.clusterHealth.redMessage', {
diff --git a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts
index cf2e0f29ddbc3..6c5858d48e94e 100644
--- a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts
@@ -9,7 +9,7 @@ import { CpuUsageRule } from './cpu_usage_rule';
 import { RULE_CPU_USAGE } from '../../common/constants';
 import { fetchCpuUsageNodeStats } from '../lib/alerts/fetch_cpu_usage_node_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts
index a3f849c4736ea..24362f1a9fd8f 100644
--- a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts
@@ -7,7 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -22,14 +25,11 @@ import {
   CommonAlertParams,
   CommonAlertFilter,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_CPU_USAGE, RULE_DETAILS } from '../../common/constants';
 // @ts-ignore
 import { ROUNDED_FLOAT } from '../../common/formatting';
 import { fetchCpuUsageNodeStats } from '../lib/alerts/fetch_cpu_usage_node_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
-import { parseDuration } from '../../../alerting/common/parse_duration';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts
index c08d32c395c1b..c0b9720422e53 100644
--- a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts
@@ -9,7 +9,7 @@ import { DiskUsageRule } from './disk_usage_rule';
 import { RULE_DISK_USAGE } from '../../common/constants';
 import { fetchDiskUsageNodeStats } from '../lib/alerts/fetch_disk_usage_node_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type IDiskUsageAlertMock = DiskUsageRule & {
   defaultParams: {
diff --git a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts
index f2494ed918d1c..cd19ed72e2b0d 100644
--- a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts
@@ -7,7 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -22,13 +24,11 @@ import {
   AlertDiskUsageNodeStats,
   CommonAlertFilter,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_DISK_USAGE, RULE_DETAILS } from '../../common/constants';
 // @ts-ignore
 import { ROUNDED_FLOAT } from '../../common/formatting';
 import { fetchDiskUsageNodeStats } from '../lib/alerts/fetch_disk_usage_node_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts
index 560ab805a236c..6610efd098c9f 100644
--- a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts
@@ -9,7 +9,7 @@ import { ElasticsearchVersionMismatchRule } from './elasticsearch_version_mismat
 import { RULE_ELASTICSEARCH_VERSION_MISMATCH } from '../../common/constants';
 import { fetchElasticsearchVersions } from '../lib/alerts/fetch_elasticsearch_versions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts
index 14bdc70054bb9..77ad2dc5f3aa2 100644
--- a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -17,11 +19,9 @@ import {
   CommonAlertParams,
   AlertVersions,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_ELASTICSEARCH_VERSION_MISMATCH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchElasticsearchVersions } from '../lib/alerts/fetch_elasticsearch_versions';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts
index b136d2c71f065..d7032597881a3 100644
--- a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts
@@ -9,7 +9,7 @@ import { KibanaVersionMismatchRule } from './kibana_version_mismatch_rule';
 import { RULE_KIBANA_VERSION_MISMATCH } from '../../common/constants';
 import { fetchKibanaVersions } from '../lib/alerts/fetch_kibana_versions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts
index bb7522c21dd8c..ff7653dc59e85 100644
--- a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -17,11 +19,9 @@ import {
   CommonAlertParams,
   AlertVersions,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_KIBANA_VERSION_MISMATCH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchKibanaVersions } from '../lib/alerts/fetch_kibana_versions';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
index a82b87cfe8a97..1784ca8c0df71 100644
--- a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
@@ -9,7 +9,7 @@ import { LargeShardSizeRule } from './large_shard_size_rule';
 import { RULE_LARGE_SHARD_SIZE } from '../../common/constants';
 import { fetchIndexShardSize } from '../lib/alerts/fetch_index_shard_size';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type ILargeShardSizeRuleMock = LargeShardSizeRule & {
   defaultParams: {
diff --git a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts
index 6a47af79a45d5..528c757299f9c 100644
--- a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule, RawAlertInstance } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -21,11 +23,9 @@ import {
   CommonAlertFilter,
   IndexShardSizeStats,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_LARGE_SHARD_SIZE, RULE_DETAILS } from '../../common/constants';
 import { fetchIndexShardSize } from '../lib/alerts/fetch_index_shard_size';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { SanitizedRule, RawAlertInstance } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts
index 0a69ee68ffeba..c7bc493cab80a 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts
@@ -10,7 +10,7 @@ import { RULE_LICENSE_EXPIRATION } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { fetchLicenses } from '../lib/alerts/fetch_licenses';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts
index 460c34ac89f5d..6f395c62e42a2 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts
@@ -6,7 +6,9 @@
  */
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { RuleExecutorOptions, Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -20,11 +22,9 @@ import {
   AlertLicense,
   AlertLicenseState,
 } from '../../common/types/alerts';
-import { RuleExecutorOptions, Alert } from '../../../alerting/server';
 import { RULE_LICENSE_EXPIRATION, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchLicenses } from '../lib/alerts/fetch_licenses';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts
index b7790f81caa3e..c021a0733fa27 100644
--- a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts
@@ -9,7 +9,7 @@ import { LogstashVersionMismatchRule } from './logstash_version_mismatch_rule';
 import { RULE_LOGSTASH_VERSION_MISMATCH } from '../../common/constants';
 import { fetchLogstashVersions } from '../lib/alerts/fetch_logstash_versions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts
index e5556c03ccdb9..a21e54c2b3c11 100644
--- a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -17,11 +19,9 @@ import {
   CommonAlertParams,
   AlertVersions,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_LOGSTASH_VERSION_MISMATCH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchLogstashVersions } from '../lib/alerts/fetch_logstash_versions';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts
index 785b1013304cd..ad0cc98c51bb0 100644
--- a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts
@@ -9,7 +9,7 @@ import { MemoryUsageRule } from './memory_usage_rule';
 import { RULE_MEMORY_USAGE } from '../../common/constants';
 import { fetchMemoryUsageNodeStats } from '../lib/alerts/fetch_memory_usage_node_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts
index fe8c2067c8c09..23fc8e9b5c82f 100644
--- a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts
@@ -7,7 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -22,15 +25,12 @@ import {
   AlertMemoryUsageNodeStats,
   CommonAlertFilter,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_MEMORY_USAGE, RULE_DETAILS } from '../../common/constants';
 // @ts-ignore
 import { ROUNDED_FLOAT } from '../../common/formatting';
 import { fetchMemoryUsageNodeStats } from '../lib/alerts/fetch_memory_usage_node_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
-import { parseDuration } from '../../../alerting/common/parse_duration';
 import { Globals } from '../static_globals';
 
 export class MemoryUsageRule extends BaseRule {
diff --git a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts
index b70bfe4bfb375..4ed963f4c9c7e 100644
--- a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts
@@ -9,7 +9,7 @@ import { MissingMonitoringDataRule } from './missing_monitoring_data_rule';
 import { RULE_MISSING_MONITORING_DATA } from '../../common/constants';
 import { fetchMissingMonitoringData } from '../lib/alerts/fetch_missing_monitoring_data';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts
index e22489c1fabcf..0afd06708767a 100644
--- a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts
@@ -7,7 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -19,11 +22,8 @@ import {
   CommonAlertFilter,
   AlertNodeState,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_MISSING_MONITORING_DATA, RULE_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
-import { parseDuration } from '../../../alerting/common/parse_duration';
 import { fetchMissingMonitoringData } from '../lib/alerts/fetch_missing_monitoring_data';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
diff --git a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts
index 3704e909101e9..399b5cfe659bd 100644
--- a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts
@@ -9,7 +9,7 @@ import { NodesChangedRule } from './nodes_changed_rule';
 import { RULE_NODES_CHANGED } from '../../common/constants';
 import { fetchNodesFromClusterStats } from '../lib/alerts/fetch_nodes_from_cluster_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts
index 11617c8247b9c..6c20fe6326630 100644
--- a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -19,10 +21,8 @@ import {
   AlertInstanceState,
   AlertNodesChangedState,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_NODES_CHANGED, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { fetchNodesFromClusterStats } from '../lib/alerts/fetch_nodes_from_cluster_stats';
 import { AlertSeverity } from '../../common/enums';
 interface AlertNodesChangedStates {
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts
index a31d37c7a6bc2..e5b4b7d691a52 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { Rule, RawAlertInstance } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -20,10 +22,8 @@ import {
   AlertState,
   AlertThreadPoolRejectionsStats,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { Rule, RawAlertInstance } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts
index 45f8caacbcd41..89578983a52f5 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts
@@ -9,7 +9,7 @@ import { ThreadPoolSearchRejectionsRule } from './thread_pool_search_rejections_
 import { RULE_THREAD_POOL_SEARCH_REJECTIONS } from '../../common/constants';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts
index 0a13230ff44e5..46356f1b0cc6f 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Rule } from '@kbn/alerting-plugin/common';
 import { ThreadPoolRejectionsRuleBase } from './thread_pool_rejections_rule_base';
 import { RULE_THREAD_POOL_SEARCH_REJECTIONS, RULE_DETAILS } from '../../common/constants';
-import { Rule } from '../../../alerting/common';
 
 export class ThreadPoolSearchRejectionsRule extends ThreadPoolRejectionsRuleBase {
   private static TYPE = RULE_THREAD_POOL_SEARCH_REJECTIONS;
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts
index 47f6704eae70f..19a8b471ed421 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts
@@ -9,7 +9,7 @@ import { ThreadPoolWriteRejectionsRule } from './thread_pool_write_rejections_ru
 import { RULE_THREAD_POOL_WRITE_REJECTIONS } from '../../common/constants';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts
index 1247100d54345..11448e9c6fec3 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Rule } from '@kbn/alerting-plugin/common';
 import { ThreadPoolRejectionsRuleBase } from './thread_pool_rejections_rule_base';
 import { RULE_THREAD_POOL_WRITE_REJECTIONS, RULE_DETAILS } from '../../common/constants';
-import { Rule } from '../../../alerting/common';
 
 export class ThreadPoolWriteRejectionsRule extends ThreadPoolRejectionsRuleBase {
   private static TYPE = RULE_THREAD_POOL_WRITE_REJECTIONS;
diff --git a/x-pack/plugins/monitoring/server/config.ts b/x-pack/plugins/monitoring/server/config.ts
index 7ba2447b98144..cbec05a566ac6 100644
--- a/x-pack/plugins/monitoring/server/config.ts
+++ b/x-pack/plugins/monitoring/server/config.ts
@@ -6,10 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import {
-  config as ElasticsearchBaseConfig,
-  ElasticsearchConfig,
-} from '../../../../src/core/server/';
+import { config as ElasticsearchBaseConfig, ElasticsearchConfig } from '@kbn/core/server';
 import { MonitoringConfigSchema } from './types';
 
 const hostURISchema = schema.uri({ scheme: ['http', 'https'] });
diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
index ddaf5dc82f4bf..7811d21713319 100644
--- a/x-pack/plugins/monitoring/server/deprecations.ts
+++ b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ConfigDeprecationFactory, ConfigDeprecation } from 'kibana/server';
+import { ConfigDeprecationFactory, ConfigDeprecation } from '@kbn/core/server';
 import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY } from '../common/constants';
 
 /**
diff --git a/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
index 605cf463bc7ef..e2b820fcb7911 100644
--- a/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
+++ b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Logger, ICustomClusterClient, ElasticsearchClientConfig } from 'kibana/server';
+import { Logger, ICustomClusterClient, ElasticsearchClientConfig } from '@kbn/core/server';
 import { monitoringBulk } from '../kibana_monitoring/lib/monitoring_bulk';
 import { monitoringEndpointDisableWatches } from './monitoring_endpoint_disable_watches';
 import { MonitoringElasticsearchConfig } from '../config';
diff --git a/x-pack/plugins/monitoring/server/index.ts b/x-pack/plugins/monitoring/server/index.ts
index a8962b07ae419..62db584a3528e 100644
--- a/x-pack/plugins/monitoring/server/index.ts
+++ b/x-pack/plugins/monitoring/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { MonitoringPlugin } from './plugin';
 import { configSchema } from './config';
 import { deprecations } from './deprecations';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts
index c319dd66b1cf9..83f5d2037bd70 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts
@@ -14,8 +14,8 @@ import type {
   OpsMetrics,
   ServiceStatus,
   ServiceStatusLevel,
-} from 'src/core/server';
-import { ServiceStatusLevels } from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { KIBANA_STATS_TYPE_MONITORING, KIBANA_SETTINGS_TYPE } from '../../common/constants';
 
 import { sendBulkPayload } from './lib';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
index 76cc9adeb43ec..d522ad106c1f9 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { Collector, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { Collector, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { KIBANA_SETTINGS_TYPE } from '../../../common/constants';
 import { MonitoringConfig } from '../../config';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
index fa276add71efb..1db4bf6552fe9 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
@@ -7,7 +7,7 @@
 
 import { getMonitoringUsageCollector } from './get_usage_collector';
 import { fetchClusters } from '../../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { MonitoringConfig } from '../../config';
 
 jest.mock('../../lib/alerts/fetch_clusters', () => ({
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
index 0c952949c56b4..6e987f5564244 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { IClusterClient } from 'src/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { IClusterClient } from '@kbn/core/server';
 import { MonitoringConfig } from '../../config';
 import { getStackProductsUsage } from './lib/get_stack_products_usage';
 import { fetchLicenseType } from './lib/fetch_license_type';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
index 9fa7ea8fdaf6a..50d717f032520 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IClusterClient } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { IClusterClient } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getSettingsCollector } from './get_settings_collector';
 import { getMonitoringUsageCollector } from './get_usage_collector';
 import { MonitoringConfig } from '../../config';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts
index eadf6af15bdc8..d7b19d66ee1b9 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchESUsage } from './fetch_es_usage';
 
 describe('fetchESUsage', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
index c6b62563a88f6..d4e0ec040aa15 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { StackProductUsage } from '../types';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts
index 5069f17d8795b..ba099f1e7e7a8 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchLicenseType } from './fetch_license_type';
 
 describe('fetchLicenseType', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
index 1dedf63065884..6601c350d4922 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../common/constants';
 import { getCcsIndexPattern } from '../../../lib/alerts/get_ccs_index_pattern';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts
index bebcdcb80bd34..3daf0c511139f 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchStackProductUsage } from './fetch_stack_product_usage';
 
 describe('fetchStackProductUsage', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
index 2a090f2182931..cbd3044009a0e 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
@@ -6,11 +6,9 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MonitoringConfig } from '../../../config';
-// @ts-ignore
-import { prefixIndexPattern } from '../../../../common/ccs_utils';
 import { StackProductUsage } from '../types';
 
 interface ESResponse {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts
index 81a23c5af6765..0ded2dfed347b 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { getStackProductsUsage } from './get_stack_products_usage';
 
 describe('getStackProductsUsage', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
index abe69a9b637c0..093d9144f2a6f 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
@@ -5,14 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { MonitoringClusterStackProductUsage } from '../types';
 import { fetchESUsage } from './fetch_es_usage';
 import { MonitoringConfig } from '../../../config';
-// @ts-ignore
-import { getIndexPatterns } from '../../../lib/cluster/get_index_patterns';
-// @ts-ignore
-import { prefixIndexPattern } from '../../../../common/ccs_utils';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   INDEX_PATTERN_KIBANA,
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts
index 8be30a29e1f97..1cfdc10616637 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { MONITORING_SYSTEM_API_VERSION, KIBANA_SYSTEM_ID } from '../../../common/constants';
 
 /*
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts b/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts
index cffc5ffbbfda3..5a79cf9fe9184 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { ElasticsearchClient } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 interface DisableWatchesResponse {
   exporters: Array<
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
index 1c128fb61b760..2fbaac7549ce3 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchAvailableCcs } from './fetch_available_ccs';
 
 describe('fetchAvailableCcs', () => {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
index ff8db2e3a4330..8be48d16463d8 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export async function fetchAvailableCcs(esClient: ElasticsearchClient): Promise<string[]> {
   const availableCcs = [];
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts
index dbfebef6bfe42..c6f63b0a8a63c 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchCCRReadExceptions } from './fetch_ccr_read_exceptions';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
index f6071d84f20d2..47c57f279de2f 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { CCRReadExceptionsStats } from '../../../common/types/alerts';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
 
 export async function fetchCCRReadExceptions(
   esClient: ElasticsearchClient,
@@ -24,7 +24,7 @@ export async function fetchCCRReadExceptions(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'ccr',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts
index bb2513112af47..1c369c159595a 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchClusterHealth } from './fetch_cluster_health';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
index 5156a865a80e8..94ead894b8dac 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
@@ -4,13 +4,13 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, AlertClusterHealth } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 
 export async function fetchClusterHealth(
   esClient: ElasticsearchClient,
@@ -21,7 +21,7 @@ export async function fetchClusterHealth(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'cluster_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
index 85a027d9cde1d..0de2e5df531c8 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchClusters } from './fetch_clusters';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
index 81eb6b724834c..75af4906499e0 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster } from '../../../common/types/alerts';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 
 interface RangeFilter {
   [field: string]: {
@@ -28,7 +28,7 @@ export async function fetchClusters(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'cluster_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts
index 028cff224afad..af90f99eb8288 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchCpuUsageNodeStats } from './fetch_cpu_usage_node_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts
index b831db2315e58..090521a9714b5 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import moment from 'moment';
 import { NORMALIZED_DERIVATIVE_UNIT } from '../../../common/constants';
@@ -13,7 +13,7 @@ import { AlertCluster, AlertCpuUsageNodeStats } from '../../../common/types/aler
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 
 interface NodeBucketESResponse {
   key: string;
@@ -43,7 +43,7 @@ export async function fetchCpuUsageNodeStats(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'node_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts
index 5126e2d2c408d..3437298e1957e 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchDiskUsageNodeStats } from './fetch_disk_usage_node_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts
index 26512b88a08a9..ec3dd91283731 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertDiskUsageNodeStats } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 export async function fetchDiskUsageNodeStats(
@@ -25,7 +25,7 @@ export async function fetchDiskUsageNodeStats(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'node_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts
index b29dd722366e0..84bbfa54d0318 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchElasticsearchVersions } from './fetch_elasticsearch_versions';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts
index 9816b6facc43f..1146f0a91ae46 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 export async function fetchElasticsearchVersions(
@@ -22,7 +22,7 @@ export async function fetchElasticsearchVersions(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'cluster_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts
index 41e84be80d2d5..19557dbec944d 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchIndexShardSize } from './fetch_index_shard_size';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
index 5afa9ed007f66..a6bd9d4a270cc 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, IndexShardSizeStats } from '../../../common/types/alerts';
 import { ElasticsearchIndexStats, ElasticsearchResponseHit } from '../../../common/types/es';
 import { ESGlobPatterns, RegExPatterns } from '../../../common/es_glob_patterns';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 type TopHitType = ElasticsearchResponseHit & {
@@ -40,7 +40,7 @@ export async function fetchIndexShardSize(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'index',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts
index 07403388c96f8..014441565a8fb 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { fetchKibanaVersions } from './fetch_kibana_versions';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../static_globals', () => ({
   Globals: {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts
index b5ef5d1ade372..9f9431a3b4bfe 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 interface ESAggResponse {
@@ -26,7 +26,7 @@ export async function fetchKibanaVersions(
     config: Globals.app.config,
     moduleType: 'kibana',
     dataset: 'stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
index 35fc50a6014b6..7434ffdcb79ce 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { fetchLicenses } from './fetch_licenses';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../static_globals', () => ({
   Globals: {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
index 32bbe271da76f..ea57536cd82bc 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertLicense, AlertCluster } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 export async function fetchLicenses(
@@ -21,7 +21,7 @@ export async function fetchLicenses(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'cluster_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts
index cdb7287ccb77c..523a18fc64f49 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { fetchLogstashVersions } from './fetch_logstash_versions';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../static_globals', () => ({
   Globals: {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts
index 2a0a4a283a68d..9b2a4efb6584e 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 interface ESAggResponse {
@@ -26,7 +26,7 @@ export async function fetchLogstashVersions(
     config: Globals.app.config,
     moduleType: 'logstash',
     dataset: 'node_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts
index 64fbe542cd35b..d717edf9feb43 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchMemoryUsageNodeStats } from './fetch_memory_usage_node_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
index 644ef03bd3ec4..a7726e594f07b 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertMemoryUsageNodeStats } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 export async function fetchMemoryUsageNodeStats(
@@ -26,7 +26,7 @@ export async function fetchMemoryUsageNodeStats(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'node_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
index 9b1f3f71e2a96..90cfbc96617cb 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchMissingMonitoringData } from './fetch_missing_monitoring_data';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
index 60a5352b8e38f..68a547580df08 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertMissingData } from '../../../common/types/alerts';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { createDatasetFilter } from './create_dataset_query_filter';
 
@@ -59,7 +59,7 @@ export async function fetchMissingMonitoringData(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'node_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts
index 328f8b12836f7..12c49f89aa487 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchNodesFromClusterStats } from './fetch_nodes_from_cluster_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts
index 0c367558732b5..e84cf87cd3fbf 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, AlertClusterStatsNodes } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 function formatNode(
@@ -36,7 +36,7 @@ export async function fetchNodesFromClusterStats(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'cluster_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
index 257f0cec48600..9a0830ab5a1a7 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { AlertInstanceState } from '../../../common/types/alerts';
-import { RulesClient } from '../../../../alerting/server';
 import { AlertsFactory } from '../../alerts';
 import { CommonAlertState, CommonAlertFilter, RulesByType } from '../../../common/types/alerts';
 import { RULES } from '../../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts
index 8226f0dd012fd..aee6502e0aaac 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertThreadPoolRejectionsStats } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getConfigCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 
 const invalidNumberValue = (value: number) => {
@@ -52,7 +52,7 @@ export async function fetchThreadPoolRejectionStats(
     config: Globals.app.config,
     moduleType: 'elasticsearch',
     dataset: 'node_stats',
-    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+    ccs: CCS_REMOTE_PATTERN,
   });
   const params = {
     index: indexPatterns,
diff --git a/x-pack/plugins/monitoring/server/lib/apm/_get_time_of_last_event.ts b/x-pack/plugins/monitoring/server/lib/apm/_get_time_of_last_event.ts
index 0ad1ff7370a9a..d4580ab1e0a90 100644
--- a/x-pack/plugins/monitoring/server/lib/apm/_get_time_of_last_event.ts
+++ b/x-pack/plugins/monitoring/server/lib/apm/_get_time_of_last_event.ts
@@ -21,8 +21,8 @@ export async function getTimeOfLastEvent({
   req: LegacyRequest;
   callWithRequest: (_req: any, endpoint: string, params: any) => Promise<ElasticsearchResponse>;
   apmIndexPattern: string;
-  start: number;
-  end: number;
+  start?: number;
+  end?: number;
   clusterUuid: string;
 }) {
   const params = {
diff --git a/x-pack/plugins/monitoring/server/lib/apm/get_apm_info.ts b/x-pack/plugins/monitoring/server/lib/apm/get_apm_info.ts
index d12d69f9a18da..92f5b19165916 100644
--- a/x-pack/plugins/monitoring/server/lib/apm/get_apm_info.ts
+++ b/x-pack/plugins/monitoring/server/lib/apm/get_apm_info.ts
@@ -85,8 +85,8 @@ export async function getApmInfo(
   }: {
     clusterUuid: string;
     apmUuid: string;
-    start: number;
-    end: number;
+    start?: number;
+    end?: number;
   }
 ) {
   checkParam(apmIndexPattern, 'apmIndexPattern in beats/getBeatSummary');
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.ts b/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.ts
index 4c23ff858f471..189f94976a035 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.ts
+++ b/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.ts
@@ -8,14 +8,14 @@
 // @ts-ignore
 import { checkParam } from '../error_missing_required';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../common/constants';
-import { ElasticsearchResponse, ElasticsearchModifiedSource } from '../../../common/types/es';
-import { LegacyRequest } from '../../types';
+import { ElasticsearchResponse } from '../../../common/types/es';
+import { LegacyRequest, Cluster } from '../../types';
 import { getNewIndexPatterns } from './get_index_patterns';
 import { Globals } from '../../static_globals';
 
 async function findSupportedBasicLicenseCluster(
   req: LegacyRequest,
-  clusters: ElasticsearchModifiedSource[],
+  clusters: Cluster[],
   ccs: string,
   kibanaUuid: string,
   serverLog: (message: string) => void
@@ -90,7 +90,7 @@ async function findSupportedBasicLicenseCluster(
  */
 export function flagSupportedClusters(req: LegacyRequest, ccs: string) {
   const serverLog = (message: string) => req.getLogger('supported-clusters').debug(message);
-  const flagAllSupported = (clusters: ElasticsearchModifiedSource[]) => {
+  const flagAllSupported = (clusters: Cluster[]) => {
     clusters.forEach((cluster) => {
       if (cluster.license || cluster.elasticsearch?.cluster?.stats?.license) {
         cluster.isSupported = true;
@@ -99,7 +99,7 @@ export function flagSupportedClusters(req: LegacyRequest, ccs: string) {
     return clusters;
   };
 
-  return async function (clusters: ElasticsearchModifiedSource[]) {
+  return async function (clusters: Cluster[]) {
     // Standalone clusters are automatically supported in the UI so ignore those for
     // our calculations here
     let linkedClusterCount = 0;
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.ts b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.ts
index ced05dd5ea020..86de6f6c79623 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.ts
+++ b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.ts
@@ -28,6 +28,7 @@ import {
   CODE_PATH_BEATS,
   CODE_PATH_APM,
   CODE_PATH_ENTERPRISE_SEARCH,
+  CCS_REMOTE_PATTERN,
 } from '../../../common/constants';
 
 import { getApmsForClusters } from '../apm/get_apms_for_clusters';
@@ -62,11 +63,11 @@ export async function getClustersFromRequest(
     clusters.push(getStandaloneClusterDefinition());
   } else {
     // get clusters with stats and cluster state
-    clusters = await getClustersStats(req, clusterUuid, '*');
+    clusters = await getClustersStats(req, clusterUuid, CCS_REMOTE_PATTERN);
   }
 
   if (!clusterUuid && !isStandaloneCluster) {
-    if (await hasStandaloneClusters(req, '*')) {
+    if (await hasStandaloneClusters(req, CCS_REMOTE_PATTERN)) {
       clusters.push(getStandaloneClusterDefinition());
     }
   }
@@ -90,7 +91,7 @@ export async function getClustersFromRequest(
 
     // add ml jobs and alerts data
     const mlJobs = isInCodePath(codePaths, [CODE_PATH_ML])
-      ? await getMlJobsForCluster(req, cluster, '*')
+      ? await getMlJobsForCluster(req, cluster, CCS_REMOTE_PATTERN)
       : null;
     if (mlJobs !== null) {
       cluster.ml = { jobs: mlJobs };
@@ -113,7 +114,7 @@ export async function getClustersFromRequest(
     }
 
     // update clusters with license check results
-    const getSupportedClusters = flagSupportedClusters(req, '*');
+    const getSupportedClusters = flagSupportedClusters(req, CCS_REMOTE_PATTERN);
     clusters = await getSupportedClusters(clusters);
 
     // add alerts data
@@ -169,7 +170,7 @@ export async function getClustersFromRequest(
   // add kibana data
   const kibanas =
     isInCodePath(codePaths, [CODE_PATH_KIBANA]) && !isStandaloneCluster
-      ? await getKibanasForClusters(req, clusters, '*')
+      ? await getKibanasForClusters(req, clusters, CCS_REMOTE_PATTERN)
       : [];
   // add the kibana data to each cluster
   kibanas.forEach((kibana) => {
@@ -182,8 +183,13 @@ export async function getClustersFromRequest(
 
   // add logstash data
   if (isInCodePath(codePaths, [CODE_PATH_LOGSTASH])) {
-    const logstashes = await getLogstashForClusters(req, clusters, '*');
-    const pipelines = await getLogstashPipelineIds({ req, clusterUuid, size: 1, ccs: '*' });
+    const logstashes = await getLogstashForClusters(req, clusters, CCS_REMOTE_PATTERN);
+    const pipelines = await getLogstashPipelineIds({
+      req,
+      clusterUuid,
+      size: 1,
+      ccs: CCS_REMOTE_PATTERN,
+    });
     logstashes.forEach((logstash) => {
       const clusterIndex = clusters.findIndex(
         (cluster) =>
@@ -199,7 +205,7 @@ export async function getClustersFromRequest(
 
   // add beats data
   const beatsByCluster = isInCodePath(codePaths, [CODE_PATH_BEATS])
-    ? await getBeatsForClusters(req, clusters, '*')
+    ? await getBeatsForClusters(req, clusters, CCS_REMOTE_PATTERN)
     : [];
   beatsByCluster.forEach((beats) => {
     const clusterIndex = clusters.findIndex(
@@ -211,7 +217,7 @@ export async function getClustersFromRequest(
 
   // add apm data
   const apmsByCluster = isInCodePath(codePaths, [CODE_PATH_APM])
-    ? await getApmsForClusters(req, clusters, '*')
+    ? await getApmsForClusters(req, clusters, CCS_REMOTE_PATTERN)
     : [];
   apmsByCluster.forEach((apm) => {
     const clusterIndex = clusters.findIndex(
@@ -229,7 +235,7 @@ export async function getClustersFromRequest(
 
   // add Enterprise Search data
   const enterpriseSearchByCluster = isInCodePath(codePaths, [CODE_PATH_ENTERPRISE_SEARCH])
-    ? await getEnterpriseSearchForClusters(req, clusters, '*')
+    ? await getEnterpriseSearchForClusters(req, clusters, CCS_REMOTE_PATTERN)
     : [];
   enterpriseSearchByCluster.forEach((entSearch) => {
     const clusterIndex = clusters.findIndex(
@@ -244,7 +250,7 @@ export async function getClustersFromRequest(
   });
 
   // check ccr configuration
-  const isCcrEnabled = await checkCcrEnabled(req, '*');
+  const isCcrEnabled = await checkCcrEnabled(req, CCS_REMOTE_PATTERN);
 
   const kibanaUuid = req.server.instanceUuid;
 
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js
index 0ddb87104ec71..bab2703d2cdc6 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js
+++ b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import clusters from './__fixtures__/clusters';
+import clusters from './__fixtures__/clusters.json';
 import { getClustersSummary } from './get_clusters_summary';
 
 const mockLog = jest.fn();
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.ts b/x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.ts
index e40745790dc82..7d470857dfe5a 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.ts
+++ b/x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.ts
@@ -6,7 +6,7 @@
  */
 
 import { LegacyServer } from '../../types';
-import { prefixIndexPattern } from '../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../common/ccs_utils';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   INDEX_PATTERN_ELASTICSEARCH_ECS,
@@ -18,22 +18,23 @@ import {
   DS_INDEX_PATTERN_METRICS,
   INDEX_PATTERN_TYPES,
   INDEX_PATTERN_ENTERPRISE_SEARCH,
+  CCS_REMOTE_PATTERN,
 } from '../../../common/constants';
 import { MonitoringConfig } from '../..';
 
 export function getIndexPatterns(
   server: LegacyServer,
   additionalPatterns: Record<string, string> = {},
-  ccs: string = '*'
+  ccs: string = CCS_REMOTE_PATTERN
 ) {
   const config = server.config;
-  const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
-  const kbnIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_KIBANA, ccs);
-  const lsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_LOGSTASH, ccs);
-  const beatsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
-  const apmIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
-  const alertsIndex = prefixIndexPattern(config, INDEX_ALERTS, ccs);
-  const enterpriseSearchIndexPattern = prefixIndexPattern(
+  const esIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
+  const kbnIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_KIBANA, ccs);
+  const lsIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_LOGSTASH, ccs);
+  const beatsIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
+  const apmIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
+  const alertsIndex = prefixIndexPatternWithCcs(config, INDEX_ALERTS, ccs);
+  const enterpriseSearchIndexPattern = prefixIndexPatternWithCcs(
     config,
     INDEX_PATTERN_ENTERPRISE_SEARCH,
     ccs
@@ -49,7 +50,7 @@ export function getIndexPatterns(
     ...Object.keys(additionalPatterns).reduce((accum, varName) => {
       return {
         ...accum,
-        [varName]: prefixIndexPattern(config, additionalPatterns[varName], ccs),
+        [varName]: prefixIndexPatternWithCcs(config, additionalPatterns[varName], ccs),
       };
     }, {}),
   };
@@ -88,7 +89,7 @@ export function getLegacyIndexPattern({
     default:
       throw new Error(`invalid module type to create index pattern: ${moduleType}`);
   }
-  return prefixIndexPattern(config, indexPattern, ccs);
+  return prefixIndexPatternWithCcs(config, indexPattern, ccs);
 }
 
 export function getDsIndexPattern({
@@ -112,7 +113,7 @@ export function getDsIndexPattern({
   } else {
     datasetsPattern = `${moduleType}.*`;
   }
-  return prefixIndexPattern(config, `${type}-${datasetsPattern}-${namespace}`, ccs);
+  return prefixIndexPatternWithCcs(config, `${type}-${datasetsPattern}-${namespace}`, ccs);
 }
 
 export function getNewIndexPatterns({
diff --git a/x-pack/plugins/monitoring/server/lib/create_route_validation_function.ts b/x-pack/plugins/monitoring/server/lib/create_route_validation_function.ts
new file mode 100644
index 0000000000000..4ed1276d039b1
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/lib/create_route_validation_function.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RouteValidationFunction } from '@kbn/core/server';
+import { fold } from 'fp-ts/lib/Either';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { Errors, Type } from 'io-ts';
+import { formatErrors } from '../../common/runtime_types';
+
+type ValdidationResult<Value> = ReturnType<RouteValidationFunction<Value>>;
+
+export const createValidationFunction =
+  <DecodedValue, EncodedValue, InputValue>(
+    runtimeType: Type<DecodedValue, EncodedValue, InputValue>
+  ): RouteValidationFunction<DecodedValue> =>
+  (inputValue, { badRequest, ok }) =>
+    pipe(
+      runtimeType.decode(inputValue),
+      fold<Errors, DecodedValue, ValdidationResult<DecodedValue>>(
+        (errors: Errors) => badRequest(formatErrors(errors)),
+        (result: DecodedValue) => ok(result)
+      )
+    );
diff --git a/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js b/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js
index 3f643cf0be27a..e3f5782680710 100644
--- a/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js
+++ b/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js
@@ -8,9 +8,9 @@
 import { getMetrics } from './get_metrics';
 import sinon from 'sinon';
 
-import nonDerivMetricsBuckets from './__fixtures__/non_deriv_metrics_buckets';
-import derivMetricsBuckets from './__fixtures__/deriv_metrics_buckets';
-import aggMetricsBuckets from './__fixtures__/agg_metrics_buckets';
+import nonDerivMetricsBuckets from './__fixtures__/non_deriv_metrics_buckets.json';
+import derivMetricsBuckets from './__fixtures__/deriv_metrics_buckets.json';
+import aggMetricsBuckets from './__fixtures__/agg_metrics_buckets.json';
 
 // max / min window that accepts the above buckets/results
 const min = 1498968000000; // 2017-07-02T04:00:00.000Z
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.ts b/x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.ts
index 881643c8b33df..0a2143a185c16 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.ts
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.ts
@@ -13,8 +13,8 @@ import { createQuery } from '../create_query';
 // @ts-ignore
 import { ElasticsearchMetric } from '../metrics';
 import { ML_SUPPORTED_LICENSES } from '../../../common/constants';
-import { ElasticsearchResponse, ElasticsearchSource } from '../../../common/types/es';
-import { LegacyRequest } from '../../types';
+import { ElasticsearchResponse } from '../../../common/types/es';
+import { LegacyRequest, Cluster } from '../../types';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { Globals } from '../../static_globals';
 
@@ -100,7 +100,7 @@ export function getMlJobs(req: LegacyRequest) {
  * cardinality isn't guaranteed to be accurate is the issue
  * but it will be as long as the precision threshold is >= the actual value
  */
-export function getMlJobsForCluster(req: LegacyRequest, cluster: ElasticsearchSource, ccs: string) {
+export function getMlJobsForCluster(req: LegacyRequest, cluster: Cluster, ccs: string) {
   const license = cluster.license ?? cluster.elasticsearch?.cluster?.stats?.license ?? {};
 
   if (license.status === 'active' && includes(ML_SUPPORTED_LICENSES, license.type)) {
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js
index e357f12651830..75d10dd284980 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import clusterDataFixture from './__fixtures__/cluster_data';
+import clusterDataFixture from './__fixtures__/cluster_data.json';
 import { handleResponse } from './handle_response';
 
 const { nodeStats, clusterStats, shardStats, timeOptions } = clusterDataFixture;
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js
index c02f1d95ee402..ac1dde9d402db 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import shardStatsFixture from './shard_stats';
-import clusterFixture from './cluster';
+import shardStatsFixture from './shard_stats.json';
+import clusterFixture from './cluster.json';
 
 export { shardStatsFixture, clusterFixture };
diff --git a/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts b/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
index 72a794db76183..e599508269850 100644
--- a/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
+++ b/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
@@ -6,14 +6,18 @@
  */
 
 // @ts-ignore
-import { prefixIndexPattern } from '../../../common/ccs_utils';
-import { INFRA_SOURCE_ID } from '../../../common/constants';
+import { InfraPluginSetup } from '@kbn/infra-plugin/server';
+import { prefixIndexPatternWithCcs } from '../../../common/ccs_utils';
+import { CCS_REMOTE_PATTERN, INFRA_SOURCE_ID } from '../../../common/constants';
 import { MonitoringConfig } from '../../config';
-import { InfraPluginSetup } from '../../../../infra/server';
 
 export const initInfraSource = (config: MonitoringConfig, infraPlugin: InfraPluginSetup) => {
   if (infraPlugin) {
-    const filebeatIndexPattern = prefixIndexPattern(config, config.ui.logs.index, '*');
+    const filebeatIndexPattern = prefixIndexPatternWithCcs(
+      config,
+      config.ui.logs.index,
+      CCS_REMOTE_PATTERN
+    );
     infraPlugin.defineInternalSourceConfiguration(INFRA_SOURCE_ID, {
       name: 'Elastic Stack Logs',
       logIndices: {
diff --git a/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts
index 3f306b3596f6a..b06b74fd255f4 100644
--- a/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts
+++ b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, uniq } from 'lodash';
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import {
   METRICBEAT_INDEX_NAME_UNIQUE_TOKEN,
   ELASTICSEARCH_SYSTEM_ID,
diff --git a/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts b/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts
index 1859c66e9e713..5abdb5a9a4ca0 100644
--- a/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts
+++ b/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts
@@ -8,7 +8,7 @@
 import moment from 'moment';
 import { get } from 'lodash';
 import { LegacyRequest } from '../../types';
-import { standaloneClusterFilter } from './';
+import { standaloneClusterFilter } from '.';
 import { Globals } from '../../static_globals';
 import { getLegacyIndexPattern, getNewIndexPatterns } from '../cluster/get_index_patterns';
 
diff --git a/x-pack/plugins/monitoring/server/license_service.ts b/x-pack/plugins/monitoring/server/license_service.ts
index 0ac1c9d3498b1..e647a71560352 100644
--- a/x-pack/plugins/monitoring/server/license_service.ts
+++ b/x-pack/plugins/monitoring/server/license_service.ts
@@ -6,11 +6,11 @@
  */
 
 import { Subscription } from 'rxjs';
-import { ICustomClusterClient } from 'kibana/server';
-import { ILicense, LicenseFeature } from '../../licensing/common/types';
-import { LicensingPluginStart } from '../../licensing/server';
+import { ICustomClusterClient } from '@kbn/core/server';
+import { ILicense, LicenseFeature } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { Logger } from '@kbn/core/server';
 import { MonitoringConfig } from './config';
-import { Logger } from '../../../../src/core/server';
 import { MonitoringLicenseService } from './types';
 
 interface SetupDeps {
diff --git a/x-pack/plugins/monitoring/server/plugin.test.ts b/x-pack/plugins/monitoring/server/plugin.test.ts
index 68453a849a15b..188f1415e69fb 100644
--- a/x-pack/plugins/monitoring/server/plugin.test.ts
+++ b/x-pack/plugins/monitoring/server/plugin.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { MonitoringPlugin } from './plugin';
 import { AlertsFactory } from './alerts';
 
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index ea3df28b1965d..433a3358558da 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -19,9 +19,10 @@ import {
   Plugin,
   PluginInitializerContext,
   ResponseError,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { get } from 'lodash';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { RouteMethod } from '@kbn/core/server';
 import {
   KIBANA_MONITORING_LOGGING_TAG,
   KIBANA_STATS_TYPE_MONITORING,
@@ -50,6 +51,7 @@ import {
   PluginsSetup,
   PluginsStart,
   RequestHandlerContextMonitoringPlugin,
+  MonitoringRouteConfig,
 } from './types';
 
 // This is used to test the version of kibana
@@ -314,7 +316,9 @@ export class MonitoringPlugin
     return {
       config,
       log: this.log,
-      route: (options: any) => {
+      route: <Params = any, Query = any, Body = any, Method extends RouteMethod = any>(
+        options: MonitoringRouteConfig<Params, Query, Body, Method>
+      ) => {
         const method = options.method;
         const handler = async (
           context: RequestHandlerContextMonitoringPlugin,
@@ -322,14 +326,16 @@ export class MonitoringPlugin
           res: KibanaResponseFactory
         ) => {
           const plugins = (await getCoreServices())[1];
+          const coreContext = await context.core;
+          const actionContext = await context.actions;
           const legacyRequest: LegacyRequest = {
             ...req,
             logger: this.log,
             getLogger: this.getLogger,
             payload: req.body,
             getKibanaStatsCollector: () => this.legacyShimDependencies.kibanaStatsCollector,
-            getUiSettingsService: () => context.core.uiSettings.client,
-            getActionTypeRegistry: () => context.actions?.listTypes(),
+            getUiSettingsService: () => coreContext.uiSettings.client,
+            getActionTypeRegistry: () => actionContext?.listTypes(),
             getRulesClient: () => {
               try {
                 return plugins.alerting.getRulesClientWithRequest(req);
@@ -368,7 +374,7 @@ export class MonitoringPlugin
                       const client =
                         name === 'monitoring'
                           ? cluster.asScoped(req).asCurrentUser
-                          : context.core.elasticsearch.client.asCurrentUser;
+                          : coreContext.elasticsearch.client.asCurrentUser;
                       return await Globals.app.getLegacyClusterShim(client, endpoint, params);
                     },
                   }),
@@ -389,18 +395,23 @@ export class MonitoringPlugin
           }
         };
 
-        const validate: any = get(options, 'config.validate', false);
-        if (validate && validate.payload) {
-          validate.body = validate.payload;
-        }
+        const validate: MonitoringRouteConfig<Params, Query, Body, Method>['validate'] =
+          // NOTE / TODO: "config.validate" is a legacy convention and should be converted over during the TS conversion work
+          get(options, 'validate', false) || get(options, 'config.validate', false);
+
         options.validate = validate;
 
-        if (method === 'POST') {
-          router.post(options, handler);
-        } else if (method === 'GET') {
-          router.get(options, handler);
-        } else if (method === 'PUT') {
-          router.put(options, handler);
+        const routeConfig = {
+          path: options.path,
+          validate: options.validate,
+        };
+
+        if (method.toLowerCase() === 'post') {
+          router.post(routeConfig, handler);
+        } else if (method.toLowerCase() === 'get') {
+          router.get(routeConfig, handler);
+        } else if (method.toLowerCase() === 'put') {
+          router.put(routeConfig, handler);
         } else {
           throw new Error('Unsupported API method: ' + method);
         }
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts
index 1f4d4e9408428..9188215137565 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts
@@ -6,13 +6,13 @@
  */
 
 // @ts-ignore
+import { ActionResult } from '@kbn/actions-plugin/common';
+import { RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { handleError } from '../../../../lib/errors';
 import { AlertsFactory } from '../../../../alerts';
 import { LegacyServer, RouteDependencies } from '../../../../types';
 import { ALERT_ACTION_TYPE_LOG } from '../../../../../common/constants';
-import { ActionResult } from '../../../../../../actions/common';
 import { disableWatcherClusterAlerts } from '../../../../lib/alerts/disable_watcher_cluster_alerts';
-import { RuleTypeParams, SanitizedRule } from '../../../../../../alerting/common';
 
 const DEFAULT_SERVER_LOG_NAME = 'Monitoring: Write to Kibana log';
 
@@ -24,6 +24,10 @@ export function enableAlertsRoute(server: LegacyServer, npRoute: RouteDependenci
     },
     async (context, request, response) => {
       try {
+        const alertingContext = await context.alerting;
+        const infraContext = await context.infra;
+        const actionContext = await context.actions;
+
         const alerts = AlertsFactory.getAll();
         if (alerts.length) {
           const { isSufficientlySecure, hasPermanentEncryptionKey } = npRoute.alerting
@@ -33,7 +37,7 @@ export function enableAlertsRoute(server: LegacyServer, npRoute: RouteDependenci
 
           if (!isSufficientlySecure || !hasPermanentEncryptionKey) {
             server.log.info(
-              `Skipping rule creation for "${context.infra.spaceId}" space; Stack Monitoring rules require API keys to be enabled and an encryption key to be configured.`
+              `Skipping rule creation for "${infraContext.spaceId}" space; Stack Monitoring rules require API keys to be enabled and an encryption key to be configured.`
             );
             return response.ok({
               body: {
@@ -44,9 +48,9 @@ export function enableAlertsRoute(server: LegacyServer, npRoute: RouteDependenci
           }
         }
 
-        const rulesClient = context.alerting?.getRulesClient();
-        const actionsClient = context.actions?.getActionsClient();
-        const types = context.actions?.listTypes();
+        const rulesClient = alertingContext?.getRulesClient();
+        const actionsClient = actionContext?.getActionsClient();
+        const types = actionContext?.listTypes();
         if (!rulesClient || !actionsClient || !types) {
           return response.ok({ body: undefined });
         }
@@ -92,7 +96,7 @@ export function enableAlertsRoute(server: LegacyServer, npRoute: RouteDependenci
         }
 
         server.log.info(
-          `Created ${createdAlerts.length} alerts for "${context.infra.spaceId}" space`
+          `Created ${createdAlerts.length} alerts for "${infraContext.spaceId}" space`
         );
 
         return response.ok({ body: { createdAlerts, disabledWatcherClusterAlerts } });
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts
index 27b21c342f037..a145d92921634 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts
@@ -34,7 +34,7 @@ export function alertStatusRoute(server: any, npRoute: RouteDependencies) {
       try {
         const { clusterUuid } = request.params;
         const { alertTypeIds, filters } = request.body;
-        const rulesClient = context.alerting?.getRulesClient();
+        const rulesClient = (await context.alerting)?.getRulesClient();
         if (!rulesClient) {
           return response.ok({ body: undefined });
         }
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.ts
similarity index 75%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.ts
index bd0198ffcc3b2..50ae3b574deb9 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.ts
@@ -6,8 +6,16 @@
  */
 
 import { getApmsForClusters } from '../../../../lib/apm/get_apms_for_clusters';
+import { LegacyRequest } from '../../../../types';
 
-export const getApmClusterStatus = (req, { clusterUuid }) => {
+export const getApmClusterStatus = (
+  req: LegacyRequest,
+  {
+    clusterUuid,
+  }: {
+    clusterUuid: string;
+  }
+) => {
   const clusters = [{ cluster_uuid: clusterUuid }];
   return getApmsForClusters(req, clusters).then((apms) => {
     const [{ stats, config }] = apms;
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/index.ts
similarity index 100%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/index.ts
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.ts
similarity index 65%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.ts
index 6c590682b4030..69b226ef3eaed 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.ts
@@ -5,44 +5,40 @@
  * 2.0.
  */
 
-import { schema } from '@kbn/config-schema';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
+import { INDEX_PATTERN_BEATS } from '../../../../../common/constants';
+import {
+  postApmInstanceRequestParamsRT,
+  postApmInstanceRequestPayloadRT,
+} from '../../../../../common/http_api/apm';
+import { getApmInfo } from '../../../../lib/apm';
+import { createValidationFunction } from '../../../../lib/create_route_validation_function';
 import { getMetrics } from '../../../../lib/details/get_metrics';
-import { metricSet } from './metric_set_instance';
 import { handleError } from '../../../../lib/errors';
-import { getApmInfo } from '../../../../lib/apm';
-import { INDEX_PATTERN_BEATS } from '../../../../../common/constants';
+import { MonitoringCore } from '../../../../types';
+import { metricSet } from './metric_set_instance';
 
-export function apmInstanceRoute(server) {
+export function apmInstanceRoute(server: MonitoringCore) {
   server.route({
-    method: 'POST',
+    method: 'post',
     path: '/api/monitoring/v1/clusters/{clusterUuid}/apm/{apmUuid}',
-    config: {
-      validate: {
-        params: schema.object({
-          clusterUuid: schema.string(),
-          apmUuid: schema.string(),
-        }),
-        payload: schema.object({
-          ccs: schema.maybe(schema.string()),
-          timeRange: schema.object({
-            min: schema.string(),
-            max: schema.string(),
-          }),
-        }),
-      },
+    validate: {
+      params: createValidationFunction(postApmInstanceRequestParamsRT),
+      body: createValidationFunction(postApmInstanceRequestPayloadRT),
     },
     async handler(req) {
       const apmUuid = req.params.apmUuid;
       const config = server.config;
       const clusterUuid = req.params.clusterUuid;
       const ccs = req.payload.ccs;
-      const apmIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
+      const apmIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
 
       const showCgroupMetrics = config.ui.container.apm.enabled;
       if (showCgroupMetrics) {
         const metricCpu = metricSet.find((m) => m.name === 'apm_cpu');
-        metricCpu.keys = ['apm_cgroup_cpu'];
+        if (metricCpu) {
+          metricCpu.keys = ['apm_cgroup_cpu'];
+        }
       }
 
       try {
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.ts
similarity index 57%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.ts
index 1d6a22fdf0c93..960a8dc3627b0 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.ts
@@ -5,35 +5,30 @@
  * 2.0.
  */
 
-import { schema } from '@kbn/config-schema';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
-import { getStats, getApms } from '../../../../lib/apm';
-import { handleError } from '../../../../lib/errors';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { INDEX_PATTERN_BEATS } from '../../../../../common/constants';
+import {
+  postApmInstancesRequestParamsRT,
+  postApmInstancesRequestPayloadRT,
+} from '../../../../../common/http_api/apm';
+import { getApms, getStats } from '../../../../lib/apm';
+import { createValidationFunction } from '../../../../lib/create_route_validation_function';
+import { handleError } from '../../../../lib/errors';
+import { MonitoringCore } from '../../../../types';
 
-export function apmInstancesRoute(server) {
+export function apmInstancesRoute(server: MonitoringCore) {
   server.route({
-    method: 'POST',
+    method: 'post',
     path: '/api/monitoring/v1/clusters/{clusterUuid}/apm/instances',
-    config: {
-      validate: {
-        params: schema.object({
-          clusterUuid: schema.string(),
-        }),
-        payload: schema.object({
-          ccs: schema.maybe(schema.string()),
-          timeRange: schema.object({
-            min: schema.string(),
-            max: schema.string(),
-          }),
-        }),
-      },
+    validate: {
+      params: createValidationFunction(postApmInstancesRequestParamsRT),
+      body: createValidationFunction(postApmInstancesRequestPayloadRT),
     },
     async handler(req) {
       const config = server.config;
       const ccs = req.payload.ccs;
       const clusterUuid = req.params.clusterUuid;
-      const apmIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
+      const apmIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
 
       try {
         const [stats, apms] = await Promise.all([
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.ts
similarity index 100%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.ts
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.ts
similarity index 100%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.ts
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.ts
similarity index 66%
rename from x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.ts
index 1e5e125d7e6c9..532b5fa4dc4c8 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.ts
@@ -5,29 +5,24 @@
  * 2.0.
  */
 
-import { schema } from '@kbn/config-schema';
+import {
+  postApmOverviewRequestParamsRT,
+  postApmOverviewRequestPayloadRT,
+} from '../../../../../common/http_api/apm';
+import { createValidationFunction } from '../../../../lib/create_route_validation_function';
 import { getMetrics } from '../../../../lib/details/get_metrics';
-import { metricSet } from './metric_set_overview';
 import { handleError } from '../../../../lib/errors';
+import { MonitoringCore } from '../../../../types';
+import { metricSet } from './metric_set_overview';
 import { getApmClusterStatus } from './_get_apm_cluster_status';
 
-export function apmOverviewRoute(server) {
+export function apmOverviewRoute(server: MonitoringCore) {
   server.route({
-    method: 'POST',
+    method: 'post',
     path: '/api/monitoring/v1/clusters/{clusterUuid}/apm',
-    config: {
-      validate: {
-        params: schema.object({
-          clusterUuid: schema.string(),
-        }),
-        payload: schema.object({
-          ccs: schema.maybe(schema.string()),
-          timeRange: schema.object({
-            min: schema.string(),
-            max: schema.string(),
-          }),
-        }),
-      },
+    validate: {
+      params: createValidationFunction(postApmOverviewRequestParamsRT),
+      body: createValidationFunction(postApmOverviewRequestPayloadRT),
     },
     async handler(req) {
       const config = server.config;
@@ -36,7 +31,9 @@ export function apmOverviewRoute(server) {
       const showCgroupMetrics = config.ui.container.apm.enabled;
       if (showCgroupMetrics) {
         const metricCpu = metricSet.find((m) => m.name === 'apm_cpu');
-        metricCpu.keys = ['apm_cgroup_cpu'];
+        if (metricCpu) {
+          metricCpu.keys = ['apm_cgroup_cpu'];
+        }
       }
 
       try {
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
index cdab320f7930d..8c28dd420675a 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { getBeatSummary } from '../../../../lib/beats';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { handleError } from '../../../../lib/errors';
@@ -23,7 +23,7 @@ export function beatsDetailRoute(server) {
           clusterUuid: schema.string(),
           beatUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
@@ -37,7 +37,7 @@ export function beatsDetailRoute(server) {
       const beatUuid = req.params.beatUuid;
       const config = server.config;
       const ccs = req.payload.ccs;
-      const beatsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
+      const beatsIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
 
       const summaryOptions = {
         clusterUuid,
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js
index f63f8e4d8cecd..83403eaa355bd 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { getStats, getBeats } from '../../../../lib/beats';
 import { handleError } from '../../../../lib/errors';
 import { INDEX_PATTERN_BEATS } from '../../../../../common/constants';
@@ -20,7 +20,7 @@ export function beatsListingRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
@@ -33,7 +33,7 @@ export function beatsListingRoute(server) {
       const config = server.config;
       const ccs = req.payload.ccs;
       const clusterUuid = req.params.clusterUuid;
-      const beatsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
+      const beatsIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
 
       try {
         const [stats, listing] = await Promise.all([
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js
index e6df588bc5a9a..9cd9bcd9787e2 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { getLatestStats, getStats } from '../../../../lib/beats';
 import { handleError } from '../../../../lib/errors';
@@ -22,7 +22,7 @@ export function beatsOverviewRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
@@ -35,7 +35,7 @@ export function beatsOverviewRoute(server) {
       const config = server.config;
       const ccs = req.payload.ccs;
       const clusterUuid = req.params.clusterUuid;
-      const beatsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_BEATS, ccs);
+      const beatsIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_BEATS, ccs);
 
       try {
         const [latest, stats, metrics] = await Promise.all([
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.ts b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.ts
index ecfb62c7d2c4b..30749f2e95c9f 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.ts
@@ -24,7 +24,7 @@ export function clusterRoute(server: LegacyServer) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.ts b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.ts
index 7ffbdf98eba41..3dd4feb3db805 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.ts
@@ -11,7 +11,7 @@ import { get, groupBy } from 'lodash';
 // @ts-ignore
 import { handleError } from '../../../../lib/errors/handle_error';
 // @ts-ignore
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
 import {
   ElasticsearchResponse,
@@ -204,7 +204,7 @@ export function ccrRoute(server: { route: (p: any) => void; config: MonitoringCo
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
@@ -216,7 +216,7 @@ export function ccrRoute(server: { route: (p: any) => void; config: MonitoringCo
     async handler(req: LegacyRequest) {
       const config = server.config;
       const ccs = req.payload.ccs;
-      const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
+      const esIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
 
       try {
         const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('monitoring');
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.ts b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.ts
index a1d76fe5ccd0d..44a1eb1807595 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.ts
@@ -10,7 +10,7 @@ import { schema } from '@kbn/config-schema';
 // @ts-ignore
 import { handleError } from '../../../../lib/errors/handle_error';
 // @ts-ignore
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 // @ts-ignore
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { ElasticsearchResponse } from '../../../../../common/types/es';
@@ -89,7 +89,7 @@ export function ccrShardRoute(server: { route: (p: any) => void; config: () => {
           index: schema.string(),
           shardId: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
index e8cdc1f6e30cd..b4f317c9a435d 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
@@ -12,9 +12,10 @@ import { getIndexSummary } from '../../../../lib/elasticsearch/indices';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { getShardAllocation, getShardStats } from '../../../../lib/elasticsearch/shards';
 import { handleError } from '../../../../lib/errors/handle_error';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { metricSet } from './metric_set_index_detail';
 import { getLogs } from '../../../../lib/logs/get_logs';
+import { CCS_REMOTE_PATTERN } from '../../../../../common/constants';
 
 const { advanced: metricSetAdvanced, overview: metricSetOverview } = metricSet;
 
@@ -28,7 +29,7 @@ export function esIndexRoute(server) {
           clusterUuid: schema.string(),
           id: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
@@ -45,7 +46,11 @@ export function esIndexRoute(server) {
         const indexUuid = req.params.id;
         const start = req.payload.timeRange.min;
         const end = req.payload.timeRange.max;
-        const filebeatIndexPattern = prefixIndexPattern(config, config.ui.logs.index, '*');
+        const filebeatIndexPattern = prefixIndexPatternWithCcs(
+          config,
+          config.ui.logs.index,
+          CCS_REMOTE_PATTERN
+        );
         const isAdvanced = req.payload.is_advanced;
         const metricSet = isAdvanced ? metricSetAdvanced : metricSetOverview;
 
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
index ea490a1547116..de41137791108 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
@@ -24,7 +24,7 @@ export function esIndicesRoute(server) {
         query: schema.object({
           show_system_indices: schema.boolean(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
index d27ec8ce3cc83..f2f0698bae18c 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
@@ -21,7 +21,7 @@ export function mlJobRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
index 28a6ee2decca6..1504bb076101e 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
@@ -12,9 +12,10 @@ import { getNodeSummary } from '../../../../lib/elasticsearch/nodes';
 import { getShardStats, getShardAllocation } from '../../../../lib/elasticsearch/shards';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { handleError } from '../../../../lib/errors/handle_error';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { metricSets } from './metric_set_node_detail';
 import { getLogs } from '../../../../lib/logs/get_logs';
+import { CCS_REMOTE_PATTERN } from '../../../../../common/constants';
 
 const { advanced: metricSetAdvanced, overview: metricSetOverview } = metricSets;
 
@@ -28,7 +29,7 @@ export function esNodeRoute(server) {
           clusterUuid: schema.string(),
           nodeUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           showSystemIndices: schema.boolean({ defaultValue: false }), // show/hide system indices in shard allocation table
           timeRange: schema.object({
@@ -47,7 +48,11 @@ export function esNodeRoute(server) {
       const nodeUuid = req.params.nodeUuid;
       const start = req.payload.timeRange.min;
       const end = req.payload.timeRange.max;
-      const filebeatIndexPattern = prefixIndexPattern(config, config.ui.logs.index, '*');
+      const filebeatIndexPattern = prefixIndexPatternWithCcs(
+        config,
+        config.ui.logs.index,
+        CCS_REMOTE_PATTERN
+      );
       const isAdvanced = req.payload.is_advanced;
 
       let metricSet;
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
index d6cff7ecd9ae9..fa0329f957f54 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
@@ -24,7 +24,7 @@ export function esNodesRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
index 341193f173439..35066bb33784d 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
@@ -11,10 +11,11 @@ import { getClusterStatus } from '../../../../lib/cluster/get_cluster_status';
 import { getLastRecovery } from '../../../../lib/elasticsearch/get_last_recovery';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { handleError } from '../../../../lib/errors/handle_error';
-import { prefixIndexPattern } from '../../../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from '../../../../../common/ccs_utils';
 import { metricSet } from './metric_set_overview';
 import { getLogs } from '../../../../lib/logs';
 import { getIndicesUnassignedShardStats } from '../../../../lib/elasticsearch/shards/get_indices_unassigned_shard_stats';
+import { CCS_REMOTE_PATTERN } from '../../../../../common/constants';
 
 export function esOverviewRoute(server) {
   server.route({
@@ -25,7 +26,7 @@ export function esOverviewRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
@@ -37,7 +38,11 @@ export function esOverviewRoute(server) {
     async handler(req) {
       const config = server.config;
       const clusterUuid = req.params.clusterUuid;
-      const filebeatIndexPattern = prefixIndexPattern(config, config.ui.logs.index, '*');
+      const filebeatIndexPattern = prefixIndexPatternWithCcs(
+        config,
+        config.ui.logs.index,
+        CCS_REMOTE_PATTERN
+      );
 
       const start = req.payload.timeRange.min;
       const end = req.payload.timeRange.max;
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
index 2482517bf4f4a..8bee3f273e107 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
@@ -6,16 +6,14 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   INDEX_PATTERN_KIBANA,
   INDEX_PATTERN_LOGSTASH,
 } from '../../../../../../common/constants';
-// @ts-ignore
-import { prefixIndexPattern } from '../../../../../../common/ccs_utils';
-// @ts-ignore
+import { prefixIndexPatternWithCcs } from '../../../../../../common/ccs_utils';
 import { handleError } from '../../../../../lib/errors';
 import { RouteDependencies, LegacyServer } from '../../../../../types';
 
@@ -45,7 +43,7 @@ const queryBody = {
 };
 
 const checkLatestMonitoringIsLegacy = async (context: RequestHandlerContext, index: string) => {
-  const client = context.core.elasticsearch.client.asCurrentUser;
+  const client = (await context.core).elasticsearch.client.asCurrentUser;
   const result = await client.search<estypes.SearchResponse<unknown>>({
     index,
     body: queryBody,
@@ -89,9 +87,9 @@ export function internalMonitoringCheckRoute(server: LegacyServer, npRoute: Rout
 
         const config = server.config;
         const { ccs } = request.body;
-        const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
-        const kbnIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_KIBANA, ccs);
-        const lsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_LOGSTASH, ccs);
+        const esIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
+        const kbnIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_KIBANA, ccs);
+        const lsIndexPattern = prefixIndexPatternWithCcs(config, INDEX_PATTERN_LOGSTASH, ccs);
         const indexCounts = await Promise.all([
           checkLatestMonitoringIsLegacy(context, esIndexPattern),
           checkLatestMonitoringIsLegacy(context, kbnIndexPattern),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/enterprise_search/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/enterprise_search/overview.js
index 97ab818a82992..e3e269d8b3148 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/enterprise_search/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/enterprise_search/overview.js
@@ -20,7 +20,7 @@ export function entSearchOverviewRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.ts b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.ts
index dfbd8e82bb29b..b899697cbc7b3 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.ts
@@ -31,7 +31,7 @@ export function kibanaInstanceRoute(server: LegacyServer) {
           clusterUuid: schema.string(),
           kibanaUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js
index f1e872d6436f2..a406d2a2896e6 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js
@@ -22,7 +22,7 @@ export function kibanaInstancesRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
index 8f77dea99868a..ff34c2735bd57 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
@@ -23,7 +23,7 @@ export function kibanaOverviewRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
index be7ce5ad0d3c2..cf1551d260e17 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
@@ -36,7 +36,7 @@ export function logstashNodeRoute(server) {
           clusterUuid: schema.string(),
           logstashUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
index dd27dcec80605..c483a4ac905dd 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
@@ -32,7 +32,7 @@ export function logstashNodesRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
index 81d64e8fcdc2b..797365da6e308 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
@@ -33,7 +33,7 @@ export function logstashOverviewRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
index a9c3906dad675..128df1b147cc6 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
@@ -38,7 +38,7 @@ export function logstashPipelineRoute(server) {
           pipelineId: schema.string(),
           pipelineHash: schema.maybe(schema.string()),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           detailVertexId: schema.maybe(schema.string()),
         }),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
index bd9de876f8903..ebe3f1a308ff3 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
@@ -21,7 +21,7 @@ export function logstashClusterPipelineIdsRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
index ace5661b9bf98..38ba810ca5a23 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
@@ -22,7 +22,7 @@ export function logstashClusterPipelinesRoute(server) {
         params: schema.object({
           clusterUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
index c232da925e74c..d47f1e6e88ec8 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
@@ -23,7 +23,7 @@ export function logstashNodePipelinesRoute(server) {
           clusterUuid: schema.string(),
           logstashUuid: schema.string(),
         }),
-        payload: schema.object({
+        body: schema.object({
           ccs: schema.maybe(schema.string()),
           timeRange: schema.object({
             min: schema.string(),
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
index 7608d3527f235..bc8b722d22214 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
@@ -35,7 +35,7 @@ export function clusterSetupStatusRoute(server) {
           // in our testing environment.
           skipLiveData: schema.boolean({ defaultValue: false }),
         }),
-        payload: schema.nullable(
+        body: schema.nullable(
           schema.object({
             ccs: schema.maybe(schema.string()),
             timeRange: schema.object({
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
index 42e77eb2b8b11..1f93e92843ea8 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
@@ -35,7 +35,7 @@ export function nodeSetupStatusRoute(server) {
           // in our testing environment.
           skipLiveData: schema.boolean({ defaultValue: false }),
         }),
-        payload: schema.nullable(
+        body: schema.nullable(
           schema.object({
             ccs: schema.maybe(schema.string()),
             timeRange: schema.maybe(
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/ui.js b/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
index 9cc28d82d7dbb..618d12afedef7 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
@@ -7,7 +7,7 @@
 
 // all routes for the app
 export { checkAccessRoute } from './check_access';
-export * from './alerts/';
+export * from './alerts';
 export { beatsDetailRoute, beatsListingRoute, beatsOverviewRoute } from './beats';
 export { clusterRoute, clustersRoute } from './cluster';
 export {
diff --git a/x-pack/plugins/monitoring/server/static_globals.ts b/x-pack/plugins/monitoring/server/static_globals.ts
index 089d47f4d45d4..e601dd0c55155 100644
--- a/x-pack/plugins/monitoring/server/static_globals.ts
+++ b/x-pack/plugins/monitoring/server/static_globals.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, ElasticsearchClient, Logger, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, ElasticsearchClient, Logger, PluginInitializerContext } from '@kbn/core/server';
 import url from 'url';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MonitoringConfig } from './config';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
index 81bee3ab09197..90bf2e06ebc26 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import { getStackStats, getAllStats, handleAllStats } from './get_all_stats';
 import { ESClusterStats } from './get_es_stats';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
index 256086e3812a4..f1c36f848ca98 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
@@ -9,7 +9,7 @@ import { set } from '@elastic/safer-lodash-set';
 import { get, merge } from 'lodash';
 
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   LOGSTASH_SYSTEM_ID,
   KIBANA_SYSTEM_ID,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
index 9621df5ca04cd..879b5fcd3d6bb 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
@@ -7,9 +7,9 @@
 
 import { fetchBeatsStats, processResults } from './get_beats_stats';
 import sinon from 'sinon';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const beatsStatsResultSet = require('./__mocks__/fixtures/beats_stats_results');
+const beatsStatsResultSet = require('./__mocks__/fixtures/beats_stats_results.json');
 
 const getBaseOptions = () => ({
   clusters: {},
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
index b98daa9dc304c..6b23c04fe9ed6 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import { INDEX_PATTERN_BEATS } from '../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
index b6c9dcd51aa81..991500c650f55 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import {
   getClusterUuids,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
index 4fe0cdd37c341..d7dc3549cd7d3 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import {
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
index 20393be9c8788..96ba9e2005f59 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import {
   fetchElasticsearchStats,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
index 7b2784d9256ee..c8dd75a4c1ab1 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import moment from 'moment';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
index ab394f9ebb058..31366d0febb9c 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import {
   fetchHighLevelStats,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
index 3991df4b83347..4de2c029e0ed1 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import {
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
index df8354716a0c8..cc6a23a0646e1 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
@@ -8,7 +8,7 @@
 import moment from 'moment';
 import { isEmpty } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { KIBANA_SYSTEM_ID, TELEMETRY_COLLECTION_INTERVAL } from '../../common/constants';
 import {
   fetchHighLevelStats,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
index 8c46c7c5cc237..66ba15f0e71a6 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import { getLicenses, handleLicenses, fetchLicenses } from './get_licenses';
 
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
index 19ee1f06bd972..19eedb561ae9b 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ESLicense } from '../../../telemetry_collection_xpack/server';
+import { ESLicense } from '@kbn/telemetry-collection-xpack-plugin/server';
 import { INDEX_PATTERN_ELASTICSEARCH, USAGE_FETCH_INTERVAL } from '../../common/constants';
 
 /**
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts
index c477ffe552630..b961170c2cd4b 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts
@@ -12,10 +12,10 @@ import {
   processLogstashStateResults,
 } from './get_logstash_stats';
 import sinon from 'sinon';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const logstashStatsResultSet = require('./__mocks__/fixtures/logstash_stats_results');
+const logstashStatsResultSet = require('./__mocks__/fixtures/logstash_stats_results.json');
 
 const resultsMap = new Map();
 
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
index a9f1bbc9ffe0b..faaedbabfb20c 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import { mapToList } from './get_high_level_stats';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
index 475da7be32b9b..15bf4b641b5de 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { IClusterClient } from 'kibana/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import type { UsageStatsPayload } from '../../../../../src/plugins/telemetry_collection_manager/server';
+import type { IClusterClient } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { UsageStatsPayload } from '@kbn/telemetry-collection-manager-plugin/server';
 import type { LogstashBaseStats } from './get_logstash_stats';
 import type { BeatsBaseStats } from './get_beats_stats';
 import { getAllStats } from './get_all_stats';
diff --git a/x-pack/plugins/monitoring/server/types.ts b/x-pack/plugins/monitoring/server/types.ts
index d3809117b90f2..bcd40fe38e415 100644
--- a/x-pack/plugins/monitoring/server/types.ts
+++ b/x-pack/plugins/monitoring/server/types.ts
@@ -10,30 +10,31 @@ import type {
   IRouter,
   Logger,
   ICustomClusterClient,
-  RequestHandlerContext,
+  CustomRequestHandlerContext,
   ElasticsearchClient,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { TypeOf } from '@kbn/config-schema';
-import { LicenseFeature, ILicense } from '../../licensing/server';
+import { LicenseFeature, ILicense } from '@kbn/licensing-plugin/server';
 import type {
   PluginStartContract as ActionsPluginsStartContact,
   ActionsApiRequestHandlerContext,
-} from '../../actions/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { RacApiRequestHandlerContext } from '../../rule_registry/server';
+} from '@kbn/actions-plugin/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { RacApiRequestHandlerContext } from '@kbn/rule-registry-plugin/server';
 import {
   PluginStartContract as AlertingPluginStartContract,
   PluginSetupContract as AlertingPluginSetupContract,
-} from '../../alerting/server';
-import { InfraPluginSetup, InfraRequestHandlerContext } from '../../infra/server';
-import { PluginSetupContract as AlertingPluginSetup } from '../../alerting/server';
-import { LicensingPluginStart } from '../../licensing/server';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
-import { CloudSetup } from '../../cloud/server';
+} from '@kbn/alerting-plugin/server';
+import { InfraPluginSetup, InfraRequestHandlerContext } from '@kbn/infra-plugin/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { RouteConfig, RouteMethod } from '@kbn/core/server';
 import { ElasticsearchModifiedSource } from '../common/types/es';
 import { RulesByType } from '../common/types/alerts';
 import { configSchema, MonitoringConfig } from './config';
@@ -57,12 +58,12 @@ export interface PluginsSetup {
   cloud?: CloudSetup;
 }
 
-export interface RequestHandlerContextMonitoringPlugin extends RequestHandlerContext {
+export type RequestHandlerContextMonitoringPlugin = CustomRequestHandlerContext<{
   actions?: ActionsApiRequestHandlerContext;
   alerting?: AlertingApiRequestHandlerContext;
   infra: InfraRequestHandlerContext;
   ruleRegistry?: RacApiRequestHandlerContext;
-}
+}>;
 
 export interface PluginsStart {
   alerting: AlertingPluginStartContract;
@@ -79,10 +80,18 @@ export interface RouteDependencies {
   logger: Logger;
 }
 
+export type MonitoringRouteConfig<Params, Query, Body, Method extends RouteMethod> = {
+  method: RouteMethod;
+} & RouteConfig<Params, Query, Body, Method> & {
+    handler: (request: LegacyRequest) => any;
+  };
+
 export interface MonitoringCore {
   config: MonitoringConfig;
   log: Logger;
-  route: (options: any) => void;
+  route: <Params = any, Query = any, Body = any, Method extends RouteMethod = any>(
+    options: MonitoringRouteConfig<Params, Query, Body, Method>
+  ) => void;
 }
 
 export interface LegacyShimDependencies {
@@ -144,7 +153,8 @@ export interface LegacyServer {
   };
 }
 
-export type Cluster = ElasticsearchModifiedSource & {
+export type Cluster = Omit<ElasticsearchModifiedSource, 'timestamp'> & {
+  timestamp?: string;
   ml?: { jobs: any };
   logs?: any;
   alerts?: AlertsOnCluster;
@@ -167,6 +177,7 @@ export interface Bucket {
 export interface Aggregation {
   buckets: Bucket[];
 }
+
 export interface ClusterSettingsReasonResponse {
   found: boolean;
   reason?: {
@@ -217,10 +228,12 @@ export interface PipelineResponse {
     throughput?: PipelineMetricsProcessed;
   };
 }
+
 export interface PipelinesResponse {
   pipelines: PipelineResponse[];
   totalPipelineCount: number;
 }
+
 export interface PipelineMetrics {
   bucket_size: string;
   timeRange: {
@@ -238,6 +251,7 @@ export interface PipelineMetrics {
     isDerivative: boolean;
   };
 }
+
 export type PipelineMetricsRes = PipelineMetrics & {
   data: Array<[number, { [key: string]: number }]>;
 };
diff --git a/x-pack/plugins/monitoring_collection/server/index.ts b/x-pack/plugins/monitoring_collection/server/index.ts
index 1f2d68d6336bf..e6f15bd297dc8 100644
--- a/x-pack/plugins/monitoring_collection/server/index.ts
+++ b/x-pack/plugins/monitoring_collection/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { MonitoringCollectionPlugin } from './plugin';
 import { configSchema } from './config';
 
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts
index 536ecdc076e55..1e60b49181dec 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getESClusterUuid } from '.';
 
 describe('getESClusterUuid', () => {
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts
index cca82537cd9e4..7497846590aee 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from '../../../../../src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 export async function getESClusterUuid(client: IScopedClusterClient) {
   const response = await client.asCurrentUser.info({
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts
index ce0b99afd14eb..ce8f882dfc7ea 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ServiceStatusLevels } from '../../../../../src/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { getKibanaStats } from '.';
 
 describe('getKibanaStats', () => {
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts
index 2b2d72305c2c7..9fa26b4592c21 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
-import { ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server';
+import { ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 
 const SNAPSHOT_REGEX = /-snapshot/i;
 
diff --git a/x-pack/plugins/monitoring_collection/server/plugin.test.ts b/x-pack/plugins/monitoring_collection/server/plugin.test.ts
index b9553b68daf24..15b9934525b9e 100644
--- a/x-pack/plugins/monitoring_collection/server/plugin.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/plugin.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { MonitoringCollectionPlugin } from './plugin';
 
 describe('monitoring_collection plugin', () => {
diff --git a/x-pack/plugins/monitoring_collection/server/plugin.ts b/x-pack/plugins/monitoring_collection/server/plugin.ts
index a86a7c51b4850..e1c3a5064a579 100644
--- a/x-pack/plugins/monitoring_collection/server/plugin.ts
+++ b/x-pack/plugins/monitoring_collection/server/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { JsonObject } from '@kbn/utility-types';
-import { CoreSetup, Plugin, PluginInitializerContext, Logger } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext, Logger } from '@kbn/core/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { ServiceStatus } from '@kbn/core/server';
 import { registerDynamicRoute } from './routes';
-import { MakeSchemaFrom } from '../../../../src/plugins/usage_collection/server';
-import { ServiceStatus } from '../../../../src/core/server';
 import { TYPE_ALLOWLIST } from './constants';
 
 export interface MonitoringCollectionSetup {
diff --git a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts
index 88f0f5b7dc8f0..deacfb3fdd992 100644
--- a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts
@@ -6,14 +6,10 @@
  */
 
 import { registerDynamicRoute } from './dynamic_route';
-import {
-  KibanaRequest,
-  KibanaResponseFactory,
-  ServiceStatusLevels,
-} from '../../../../../src/core/server';
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
+import { KibanaRequest, KibanaResponseFactory, ServiceStatusLevels } from '@kbn/core/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 beforeEach(() => {
   jest.resetAllMocks();
diff --git a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts
index 817b65fa95d8f..944037dd17a7b 100644
--- a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts
+++ b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts
@@ -6,7 +6,7 @@
  */
 import { JsonObject } from '@kbn/utility-types';
 import { schema } from '@kbn/config-schema';
-import { IRouter, ServiceStatus } from '../../../../../src/core/server';
+import { IRouter, ServiceStatus } from '@kbn/core/server';
 import { getESClusterUuid, getKibanaStats } from '../lib';
 import { MetricResult } from '../plugin';
 
@@ -47,9 +47,10 @@ export function registerDynamicRoute({
     },
     async (context, req, res) => {
       const type = req.params.type;
+      const esClient = (await context.core).elasticsearch.client;
       const [data, clusterUuid, kibana] = await Promise.all([
         getMetric(type),
-        getESClusterUuid(context.core.elasticsearch.client),
+        getESClusterUuid(esClient),
         getKibanaStats({ config, getStatus }),
       ]);
 
diff --git a/x-pack/plugins/observability/.storybook/preview.js b/x-pack/plugins/observability/.storybook/preview.js
index 18343c15a6465..3200746243d47 100644
--- a/x-pack/plugins/observability/.storybook/preview.js
+++ b/x-pack/plugins/observability/.storybook/preview.js
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { EuiThemeProviderDecorator } from '../../../../src/plugins/kibana_react/common';
+import { EuiThemeProviderDecorator } from '@kbn/kibana-react-plugin/common';
 
 export const decorators = [EuiThemeProviderDecorator];
diff --git a/x-pack/plugins/observability/README.md b/x-pack/plugins/observability/README.md
index f0f66f01def53..aef8cdc59d110 100644
--- a/x-pack/plugins/observability/README.md
+++ b/x-pack/plugins/observability/README.md
@@ -36,6 +36,9 @@ When both of the these are set to `true`, your alerts should show on the alerts
 
 The Observability plugin maintains a navigation registry for Observability solutions, and exposes a shared page template component. Please refer to the docs in [the component directory](public/components/shared/page_template) for more information on registering your solution's navigation structure, and rendering the navigation via the shared component.
 
+## Exploratory view component
+A shared component for visualizing observability data types via lens embeddable. [For further details.](./public/components/shared/exploratory_view/README.md)
+
 ## Unit testing
 
 Note: Run the following commands from `kibana/x-pack/plugins/observability`.
diff --git a/x-pack/plugins/observability/common/index.ts b/x-pack/plugins/observability/common/index.ts
index 8a2ee7c0f1718..e01b9ba3f9922 100644
--- a/x-pack/plugins/observability/common/index.ts
+++ b/x-pack/plugins/observability/common/index.ts
@@ -16,8 +16,14 @@ export {
   enableInfrastructureView,
   defaultApmServiceEnvironment,
   apmServiceInventoryOptimizedSorting,
+  apmProgressiveLoading,
 } from './ui_settings_keys';
 
+export {
+  ProgressiveLoadingQuality,
+  getProbabilityFromProgressiveLoadingQuality,
+} from './progressive_loading';
+
 export const casesFeatureId = 'observabilityCases';
 
 // The ID of the observability app. Should more appropriately be called
diff --git a/x-pack/plugins/observability/common/progressive_loading.ts b/x-pack/plugins/observability/common/progressive_loading.ts
new file mode 100644
index 0000000000000..04063c8a9cf79
--- /dev/null
+++ b/x-pack/plugins/observability/common/progressive_loading.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const enum ProgressiveLoadingQuality {
+  low = 'low',
+  medium = 'medium',
+  high = 'high',
+  off = 'off',
+}
+
+export function getProbabilityFromProgressiveLoadingQuality(
+  quality: ProgressiveLoadingQuality
+): number {
+  switch (quality) {
+    case ProgressiveLoadingQuality.high:
+      return 0.1;
+
+    case ProgressiveLoadingQuality.medium:
+      return 0.01;
+
+    case ProgressiveLoadingQuality.low:
+      return 0.001;
+
+    case ProgressiveLoadingQuality.off:
+      return 1;
+  }
+}
diff --git a/x-pack/plugins/observability/common/ui_settings_keys.ts b/x-pack/plugins/observability/common/ui_settings_keys.ts
index 54eaa9046d874..4c1b1dc729fea 100644
--- a/x-pack/plugins/observability/common/ui_settings_keys.ts
+++ b/x-pack/plugins/observability/common/ui_settings_keys.ts
@@ -10,6 +10,7 @@ export const maxSuggestions = 'observability:maxSuggestions';
 export const enableComparisonByDefault = 'observability:enableComparisonByDefault';
 export const enableInfrastructureView = 'observability:enableInfrastructureView';
 export const defaultApmServiceEnvironment = 'observability:apmDefaultServiceEnvironment';
+export const apmProgressiveLoading = 'observability:apmProgressiveLoading';
 export const enableServiceGroups = 'observability:enableServiceGroups';
 export const apmServiceInventoryOptimizedSorting =
   'observability:apmServiceInventoryOptimizedSorting';
diff --git a/x-pack/plugins/observability/common/utils/get_inspect_response.ts b/x-pack/plugins/observability/common/utils/get_inspect_response.ts
index 3383a912e596b..eaf467cf4c95e 100644
--- a/x-pack/plugins/observability/common/utils/get_inspect_response.ts
+++ b/x-pack/plugins/observability/common/utils/get_inspect_response.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'kibana/server';
-import type { RequestStatistics, RequestStatus } from '../../../../../src/plugins/inspector';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { RequestStatistics, RequestStatus } from '@kbn/inspector-plugin';
 import { InspectResponse } from '../../typings/common';
 import { WrappedElasticsearchClientError } from './unwrap_es_response';
 
diff --git a/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts b/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts
index 93be59df9c0ca..5938d952cb42f 100644
--- a/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts
+++ b/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { joinByKey } from './';
+import { joinByKey } from '.';
 
 describe('joinByKey', () => {
   it('joins by a string key', () => {
diff --git a/x-pack/plugins/observability/public/application/application.test.tsx b/x-pack/plugins/observability/public/application/application.test.tsx
index cd96b1018cdca..a3160d713d1b7 100644
--- a/x-pack/plugins/observability/public/application/application.test.tsx
+++ b/x-pack/plugins/observability/public/application/application.test.tsx
@@ -9,12 +9,12 @@ import { createMemoryHistory } from 'history';
 import { noop } from 'lodash';
 import React from 'react';
 import { Observable } from 'rxjs';
-import { AppMountParameters, CoreStart } from 'src/core/public';
-import { themeServiceMock } from 'src/core/public/mocks';
-import { KibanaPageTemplate } from 'src/plugins/kibana_react/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../plugin';
 import { createObservabilityRuleTypeRegistryMock } from '../rules/observability_rule_type_registry_mock';
-import { renderApp } from './';
+import { renderApp } from '.';
 
 describe('renderApp', () => {
   const originalConsole = global.console;
diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx
index 6f8f99a6197ae..bab6c03b5cf54 100644
--- a/x-pack/plugins/observability/public/application/index.tsx
+++ b/x-pack/plugins/observability/public/application/index.tsx
@@ -9,16 +9,16 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import { KibanaFeature } from '../../../features/common';
-import { ConfigSchema } from '..';
-import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '../../../../../src/core/public';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { ConfigSchema } from '..';
 import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template';
 import { DatePickerContextProvider } from '../context/date_picker_context';
 import { HasDataContextProvider } from '../context/has_data_context';
diff --git a/x-pack/plugins/observability/public/application/types.ts b/x-pack/plugins/observability/public/application/types.ts
index 54719622576c8..9e92c74c9bfab 100644
--- a/x-pack/plugins/observability/public/application/types.ts
+++ b/x-pack/plugins/observability/public/application/types.ts
@@ -15,16 +15,16 @@ import type {
   OverlayStart,
   SavedObjectsStart,
   ThemeServiceStart,
-} from 'kibana/public';
-import { EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
-import { LensPublicStart } from '../../../lens/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
-import { CasesUiStart } from '../../../cases/public';
-import { TimelinesUIStart } from '../../../timelines/public';
+} from '@kbn/core/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { CasesUiStart } from '@kbn/cases-plugin/public';
+import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
 
 export interface ObservabilityAppServices {
   application: ApplicationStart;
diff --git a/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx b/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx
index 404553d80d92e..46bbc71a19a0f 100644
--- a/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { ChartContainer } from './';
+import { ChartContainer } from '.';
 
 describe('chart container', () => {
   it('shows loading indicator', () => {
diff --git a/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx b/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx
index 7225b9f4d2c70..b2f0e9d1cb2b1 100644
--- a/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGrid, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React, { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
 import { useHasData } from '../../../hooks/use_has_data';
diff --git a/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx b/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx
index bd2474a623737..09fea69fa2775 100644
--- a/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx
@@ -8,7 +8,7 @@
 import { EuiCard, EuiLink, EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 
 export function FleetPanel() {
diff --git a/x-pack/plugins/observability/public/components/app/header/header_menu.tsx b/x-pack/plugins/observability/public/components/app/header/header_menu.tsx
index 06062c9fbff97..0d1b08adf9d20 100644
--- a/x-pack/plugins/observability/public/components/app/header/header_menu.tsx
+++ b/x-pack/plugins/observability/public/components/app/header/header_menu.tsx
@@ -8,7 +8,7 @@
 import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 import { usePluginContext } from '../../../hooks/use_plugin_context';
 import HeaderMenuPortal from '../../shared/header_menu_portal';
diff --git a/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx b/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx
index f6e641082e557..065822aba0a05 100644
--- a/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { NewsItem } from '../../../services/get_news_feed';
 import { render } from '../../../utils/test_helper';
-import { NewsFeed } from './';
+import { NewsFeed } from '.';
 
 const newsFeedItems = [
   {
diff --git a/x-pack/plugins/observability/public/components/app/observability_status/content.ts b/x-pack/plugins/observability/public/components/app/observability_status/content.ts
index ea264a4387a85..6ab022ef81bba 100644
--- a/x-pack/plugins/observability/public/components/app/observability_status/content.ts
+++ b/x-pack/plugins/observability/public/components/app/observability_status/content.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
-import { HttpSetup, DocLinksStart } from 'kibana/public';
+import { HttpSetup, DocLinksStart } from '@kbn/core/public';
 import { ObservabilityFetchDataPlugins } from '../../../typings/fetch_overview_data';
 
 export interface ObservabilityStatusContent {
diff --git a/x-pack/plugins/observability/public/components/app/observability_status/index.tsx b/x-pack/plugins/observability/public/components/app/observability_status/index.tsx
index 08e8b58d19253..f985eac84d72f 100644
--- a/x-pack/plugins/observability/public/components/app/observability_status/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/observability_status/index.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useHasData } from '../../../hooks/use_has_data';
 import { ObservabilityStatusBoxes } from './observability_status_boxes';
 import { getContent } from './content';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../../application/types';
 
 export function ObservabilityStatus() {
diff --git a/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx b/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx
index 3509aa009b753..8aff895651187 100644
--- a/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { ObservabilityStatusBox } from './observability_status_box';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { applicationServiceMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const application = applicationServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/observability/public/components/app/resources/index.test.tsx b/x-pack/plugins/observability/public/components/app/resources/index.test.tsx
index e5a8bd3d097fc..8d51814ecd074 100644
--- a/x-pack/plugins/observability/public/components/app/resources/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/resources/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { Resources } from './';
+import { Resources } from '.';
 
 describe('Resources', () => {
   it('renders resources with all elements', () => {
diff --git a/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx b/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
index 5e212fad04d2b..9c65df16d9060 100644
--- a/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
@@ -24,11 +24,11 @@ import moment from 'moment';
 import React, { useState, useMemo } from 'react';
 import { EuiSelect } from '@elastic/eui';
 import { uniqBy } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { usePluginContext } from '../../../../hooks/use_plugin_context';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { getObservabilityAlerts } from '../../../../services/get_observability_alerts';
 import { paths } from '../../../../config';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../../../application/types';
 
 const ALL_TYPES = 'ALL_TYPES';
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
index 24538cb4eb25c..a8f49f7d9cbb4 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
@@ -8,14 +8,14 @@
 import React from 'react';
 import * as fetcherHook from '../../../../hooks/use_fetcher';
 import { render, data as dataMock } from '../../../../utils/test_helper';
-import { APMSection } from './';
+import { APMSection } from '.';
 import { response } from './mock_data/apm.mock';
 import * as hasDataHook from '../../../../hooks/use_has_data';
 import * as pluginContext from '../../../../hooks/use_plugin_context';
 import { HasDataContextValue } from '../../../../context/has_data_context';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 jest.mock('react-router-dom', () => ({
   useLocation: () => ({
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
index 9057a08fae361..860e134442ccb 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
@@ -22,7 +22,7 @@ import React, { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import { ThemeContext } from 'styled-components';
 import { useDatePickerContext } from '../../../../hooks/use_date_picker_context';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { useChartTheme } from '../../../../hooks/use_chart_theme';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/observability/public/components/app/section/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/index.test.tsx
index 095cc30972190..7217dd78b677f 100644
--- a/x-pack/plugins/observability/public/components/app/section/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { render } from '../../../utils/test_helper';
-import { SectionContainer } from './';
+import { SectionContainer } from '.';
 
 describe('SectionContainer', () => {
   it('renders section without app link', () => {
diff --git a/x-pack/plugins/observability/public/components/app/section/index.tsx b/x-pack/plugins/observability/public/components/app/section/index.tsx
index c0f765083d8e5..83c105fb3fb8a 100644
--- a/x-pack/plugins/observability/public/components/app/section/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/index.tsx
@@ -15,7 +15,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 import { ErrorPanel } from './error_panel';
 import { ExperimentalBadge } from '../../shared/experimental_badge';
diff --git a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
index 80a14a3824e00..b047d5f7f8925 100644
--- a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
@@ -21,7 +21,7 @@ import { isEmpty } from 'lodash';
 import moment from 'moment';
 import React, { Fragment } from 'react';
 import { useHistory } from 'react-router-dom';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { useChartTheme } from '../../../../hooks/use_chart_theme';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
index 39757d79bab96..ee82b80c3ace4 100644
--- a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
@@ -21,7 +21,7 @@ import {
   NumberOrNull,
   StringOrNull,
 } from '../../../..';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { useHasData } from '../../../../hooks/use_has_data';
diff --git a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
index 84779e5270e46..7e5b713c6a238 100644
--- a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
@@ -22,7 +22,7 @@ import moment from 'moment';
 import React, { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import { ThemeContext } from 'styled-components';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { useChartTheme } from '../../../../hooks/use_chart_theme';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
index 59ea8c49f7f7e..c8f508a366bea 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
@@ -10,7 +10,7 @@ import { HasDataContextValue } from '../../../../context/has_data_context';
 import * as fetcherHook from '../../../../hooks/use_fetcher';
 import * as hasDataHook from '../../../../hooks/use_has_data';
 import { render, data as dataMock } from '../../../../utils/test_helper';
-import { UXSection } from './';
+import { UXSection } from '.';
 import { response } from './mock_data/ux.mock';
 
 jest.mock('react-router-dom', () => ({
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
index 4d1ff07c85a08..430285a0941cf 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { useHasData } from '../../../../hooks/use_has_data';
diff --git a/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx b/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
index 1858a047087fb..91d2f03101bf2 100644
--- a/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
+++ b/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
@@ -8,8 +8,8 @@
 import React, { ComponentType } from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { Observable } from 'rxjs';
-import { CoreStart } from 'src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { CoreVitalItem } from '../core_vital_item';
 import { LCP_HELP_LABEL, LCP_LABEL } from '../translations';
 
diff --git a/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx b/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx
index 98305dbfdd840..11b3473b42264 100644
--- a/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx
+++ b/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx
@@ -17,8 +17,8 @@ import {
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { euiLightVars, euiDarkVars } from '@kbn/ui-theme';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { getCoreVitalTooltipMessage, Thresholds } from './core_vital_item';
-import { useUiSetting$ } from '../../../../../../../src/plugins/kibana_react/public';
 import {
   LEGEND_NEEDS_IMPROVEMENT_LABEL,
   LEGEND_GOOD_LABEL,
diff --git a/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx b/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx
index 713063e42eda6..138018e104c8a 100644
--- a/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx
@@ -12,8 +12,8 @@ import { createMemoryHistory, MemoryHistory } from 'history';
 import React from 'react';
 import { Router, useLocation } from 'react-router-dom';
 import qs from 'query-string';
-import { DatePicker } from './';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { DatePicker } from '.';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { of } from 'rxjs';
 import { DatePickerContextProvider } from '../../../context/date_picker_context';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/README.md b/x-pack/plugins/observability/public/components/shared/exploratory_view/README.md
new file mode 100644
index 0000000000000..6aea217a1aaa8
--- /dev/null
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/README.md
@@ -0,0 +1,161 @@
+# Exploratory view component
+
+This component is used in observability plugin to show lens embeddable based observability visualizations. 
+The view is populated using configs stored as json within the view for each data type.
+
+This readme file contains few of the concepts being used in the component.
+
+Basic workflow for how exploratory view works, it looks like this
+
+
+![Exploratory view workflow](https://i.imgur.com/Kgyfd29.png)
+
+
+## Report Type
+
+The exploratory view report type controls how the data is visualized in the lens embeddable. The report type defines a set of constraints over the x and y axis. For example, the `kpi-over-time` report type is a time series chart type that plots key performance indicators over time, while the `data-distribution` chart plots the percentage of documents over key performance indicators. Current available data types can be found at `exploratory_view/configurations/constants`.
+
+Each report type has one or more available visualizations to plot data from one or more data types. 
+
+## Data Types
+
+Each available visualization is backed by a data type. A data type consists of a set of configuration for displaying domain-specific visualizations for observability data. Some example data types include apm, metrics, and logs.
+
+For each respective data type, we fetch index pattern string from the app plugin contract, leveraging existing hasData API we have to return the index pattern string as well as a `hasData` boolean from each plugin.
+
+In most cases, there will be a 1-1 relation between apps and data types.
+
+### Observability `dataViews`
+
+Once we have index pattern string for each data type, a respective `dataView` is created. If there is an existing dataView for an index pattern, we will fetch and reuse it.
+
+After the dataView is created we also set field formats to promote human-readability. For example, we set format for monitor duration field, which is monitor.duration.us, from microseconds to seconds for browser monitors.
+
+### Visualization Configuration
+
+Each data type may have one or more visualization configurations. The data type to visualization configuration can be found in [`exploratory_view/obs_exploratory_view`](https://github.com/elastic/kibana/blob/main/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx#L86)
+
+Each visualization configuration is mapped to a single report type.
+
+Visualization configurations are used to define the UI we display for each report type and data type combination in the series builder. 
+Visualization configuration define UI options and display, including available `metrics`, available `filters`, available `breakdown` options, definitions for human-readable `labels`, and more.
+The configuration also defines any custom base filters, which usually get pushed to a query, but are not displayed on the UI. You can also set more custom options on the configuration like colors which get used while rendering the chart.
+
+Visualization configuration can be found at [`exploratory_view/configurations`](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations), where each data type typically has a folder that holds one or more visualization configurations. 
+
+The configuration defined ultimately influences the lens embeddable attributes which get pushed to lens embeddable, rendering the chart.
+
+Some options in configuration are:
+
+#### Definition fields
+They are also filters, but usually main filters, around which usually app UI is based.
+For apm, it could be service name and for uptime, monitor name.
+
+#### Filters
+You can define base filters in kql form or data plugin filter format, filters are strongly typed.
+
+#### Breakdown fields
+List of fields from an index pattern, UI will use this to populate breakdown option select.
+
+#### Labels
+You can set key/value map for your field labels. UI will use these to set labels for data view fields.
+
+Sample config
+```
+{
+    reportType: ReportTypes.KPI,
+    defaultSeriesType: 'bar_stacked',
+    xAxisColumn: {
+      sourceField: '@timestamp',
+    },
+    yAxisColumns: [
+      {
+        sourceField: REPORT_METRIC_FIELD,
+        operationType: 'median',
+      },
+    ],
+    hasOperationType: false,
+    filterFields: ['observer.geo.name', 'monitor.type', 'tags'], // these fields get's resolved from relevant dataView
+    breakdownFields: [
+      'observer.geo.name',
+      'monitor.type',
+      'monitor.name',
+      PERCENTILE,
+    ], // these fields get's resolved from relevant dataView
+    baseFilters: [],
+    palette: { type: 'palette', name: 'status' },
+    definitionFields: [
+      { field: 'monitor.name', nested: SYNTHETICS_STEP_NAME, singleSelection: true },
+      { field: 'url.full', filters: buildExistsFilter('summary.up', dataView) },
+    ],
+    metricOptions: [
+      {
+        label: MONITORS_DURATION_LABEL,
+        field: 'monitor.duration.us',
+        columnType: OPERATION_COLUMN,
+      }
+    ],
+    labels: { ...FieldLabels, [SUMMARY_UP]: UP_LABEL, [SUMMARY_DOWN]: DOWN_LABEL },
+  }
+```
+
+
+
+## Lens Embeddable
+
+Lens embeddable is what actually renders the chart in exploratory view.
+
+Exploratory view generates the lens embeddable attributes as json and pass it to the component.
+
+Based on configuration, exploratory view generates layers and columns.
+
+Add a link to lens embeddable readme
+
+#### Example
+A simple usage of lens embeddable example and playground options
+[embedded_lens_example](../../../../../../examples/embedded_lens_example)
+
+## Exploratory view Embeddable
+
+The primary purpose of the exploratory view is to embed it in observability solutions like uptime to replace
+existing static visualizations,
+
+For that purpose, all the configuration options we define in the exploratory view can be used as an embeddable
+via a component that is exposed using observability plugin contract,
+usage looks like this
+
+`const ExploratoryViewComponent = props.plugins.observability.ExploratoryViewEmbeddable;
+`
+
+```            
+            <ExploratoryViewComponent
+              attributes={[
+                {
+                  name: 'Monitors response duration',
+                  time: {
+                    from: 'now-5d',
+                    to: 'now',
+                  },
+                  reportDefinitions: {
+                    'monitor.id': ['test-id'],
+                  },
+                  breakdown: 'monitor.type',
+                  operationType: 'average',
+                  dataType: 'synthetics',
+                  seriesType: 'line',
+                  selectedMetricField: 'monitor.duration.us',
+                },
+              ]}
+              reportType="kpi-over-time"
+              title={'Monitor response duration'}
+              withActions={['save', 'explore']}
+            />
+```
+
+there is an example in kibana example which you can view using
+`yarn start --run-examples` and view the code at [Exploratory view embeddable](../../../../../../examples/exploratory_view_example)
+
+#### Example
+A simple usage of lens embeddable example and playground options, run kibana with
+`yarn start --run-example` to see this example in action
+source code is defined at [embedded_lens_example](../../../../../../examples/embedded_lens_example)
\ No newline at end of file
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx
index 2b59628c3e8d3..0c2063ba8b1b0 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx
@@ -10,7 +10,7 @@ import { fireEvent, screen } from '@testing-library/dom';
 import React from 'react';
 import { sampleAttribute } from '../../configurations/test_data/sample_attribute';
 import * as pluginHook from '../../../../../hooks/use_plugin_context';
-import { TypedLensByValueInput } from '../../../../../../../lens/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { ExpViewActionMenuContent } from './action_menu';
 
 jest.spyOn(pluginHook, 'usePluginContext').mockReturnValue({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx
index 98b0a413fb842..a433a199142b7 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx
@@ -8,9 +8,9 @@
 import React, { useState } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { LensEmbeddableInput, TypedLensByValueInput } from '../../../../../../../lens/public';
+import { LensEmbeddableInput, TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../../../application/types';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { AddToCaseAction } from '../../header/add_to_case_action';
 
 export function ExpViewActionMenuContent({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx
index dfb4ddcaea49c..63ce9162adefc 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { ExpViewActionMenuContent } from './action_menu';
 import HeaderMenuPortal from '../../../header_menu_portal';
-import { TypedLensByValueInput } from '../../../../../../../lens/public';
 import { useExploratoryView } from '../../contexts/exploratory_view_config';
 
 interface Props {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
index 200c332d7aa1d..eab64136bf979 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
@@ -10,8 +10,8 @@ import { EuiDatePicker, EuiDatePickerRange } from '@elastic/eui';
 import { Moment } from 'moment';
 import DateMath from '@kbn/datemath';
 import { i18n } from '@kbn/i18n';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { useSeriesStorage } from '../hooks/use_series_storage';
-import { useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { SeriesUrl } from '../types';
 import { ReportTypes } from '../configurations/constants';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx
index 077e9be4d634a..cb258ccf46f9f 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { useSeriesFilters } from '../hooks/use_series_filters';
 import { FilterValueLabel } from '../../filter_value_label/filter_value_label';
 import { SeriesUrl } from '../types';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx
index 4fed57b1f280b..4e6a02c3ddefb 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockUseHasData, render } from '../../rtl_helpers';
 import { fireEvent, waitFor } from '@testing-library/react';
-import { SeriesDatePicker } from './index';
+import { SeriesDatePicker } from '.';
 
 describe('SeriesDatePicker', function () {
   it('should render properly', function () {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts
index faddc5ab9596c..9425937442e9e 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts
@@ -4,7 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { OperationType } from '../../../../../../../lens/public';
+import { OperationType } from '@kbn/lens-plugin/public';
+import { DOCUMENT_FIELD_NAME } from '@kbn/lens-plugin/common/constants';
 import { ReportViewType } from '../../types';
 import {
   CLS_FIELD,
@@ -67,7 +68,6 @@ import {
   SYNTHETICS_STEP_DURATION,
   SYNTHETICS_STEP_NAME,
 } from './field_names/synthetics';
-import { DOCUMENT_FIELD_NAME } from '../../../../../../../lens/common/constants';
 
 export const DEFAULT_TIME = { from: 'now-1h', to: 'now' };
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts
index 3c3a634af010e..8027a9965f860 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { AppDataType, ReportViewType, SeriesConfig } from '../types';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { ReportConfigMap } from '../contexts/exploratory_view_config';
 
 interface Props {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts
index 9a41fec6fc391..6ff6e8ed3f586 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts
@@ -28,9 +28,10 @@ import {
   SumIndexPatternColumn,
   TermsIndexPatternColumn,
   CardinalityIndexPatternColumn,
-} from '../../../../../../lens/public';
+} from '@kbn/lens-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import { urlFiltersToKueryString } from '../utils/stringify_kueries';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import {
   FILTER_RECORDS,
   USE_BREAK_DOWN_COLUMN,
@@ -43,7 +44,6 @@ import {
   ReportTypes,
 } from './constants';
 import { ColumnFilter, SeriesConfig, UrlFilter, URLReportDefinition } from '../types';
-import { PersistableFilter } from '../../../../../../lens/common';
 import { parseRelativeDate } from '../components/date_range_picker';
 import { getDistributionInPercentageColumn } from './lens_columns/overall_column';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx
index 35121f6df94b3..a3f55385d60fa 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx
@@ -11,7 +11,7 @@ import {
   MathIndexPatternColumn,
   FormulaIndexPatternColumn,
   OverallSumIndexPatternColumn,
-} from '../../../../../../../lens/public';
+} from '@kbn/lens-plugin/public';
 import { RECORDS_FIELD } from '../constants';
 
 export function getDistributionInPercentageColumn({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
index e2cd05087188f..cdc5690622380 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
@@ -13,11 +13,11 @@ import {
   buildPhrasesFilter as esBuildPhrasesFilter,
   buildExistsFilter as esBuildExistsFilter,
 } from '@kbn/es-query';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import type { ReportViewType, SeriesUrl, UrlFilter } from '../types';
 import type { AllSeries, AllShortSeries } from '../hooks/use_series_storage';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { URL_KEYS } from './constants/url_constants';
-import { PersistableFilter } from '../../../../../../lens/common';
 
 export function convertToShortUrl(series: SeriesUrl) {
   const {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx
index c464e4a536851..e4bf316763a6c 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import React, { createContext, useContext } from 'react';
-import { AppMountParameters } from 'kibana/public';
+import React, { createContext, useContext, useState } from 'react';
+import { AppMountParameters } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import type { AppDataType, ConfigProps, ReportViewType, SeriesConfig } from '../types';
 
@@ -22,6 +22,8 @@ interface ExploratoryViewContextValue {
   reportConfigMap: ReportConfigMap;
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
   theme$: AppMountParameters['theme$'];
+  isEditMode?: boolean;
+  setIsEditMode?: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
 export const ExploratoryViewContext = createContext<ExploratoryViewContextValue>({
@@ -37,6 +39,8 @@ export function ExploratoryViewContextProvider({
   setHeaderActionMenu,
   theme$,
 }: { children: JSX.Element } & ExploratoryViewContextValue) {
+  const [isEditMode, setIsEditMode] = useState(false);
+
   const value = {
     reportTypes,
     dataTypes,
@@ -44,6 +48,8 @@ export function ExploratoryViewContextProvider({
     reportConfigMap,
     setHeaderActionMenu,
     theme$,
+    isEditMode,
+    setIsEditMode,
   };
 
   return (
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx
index fbaed83c30549..fecb9e7172cc6 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import Embeddable from './embeddable';
-import { LensPublicStart } from '../../../../../../lens/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
 import { DataViewState } from '../hooks/use_app_data_view';
 import { render } from '../rtl_helpers';
 import { AddToCaseAction } from '../header/add_to_case_action';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx
index 84ce40f0fe6c4..51768bcde3891 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx
@@ -8,18 +8,18 @@
 import React, { useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle } from '@elastic/eui';
 import styled from 'styled-components';
+import { LensEmbeddableInput, LensPublicStart, XYState } from '@kbn/lens-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/common';
 import { AllSeries, useTheme } from '../../../..';
 import { LayerConfig, LensAttributes } from '../configurations/lens_attributes';
 import { AppDataType, ReportViewType } from '../types';
 import { getLayerConfigs } from '../hooks/use_lens_attributes';
-import { LensEmbeddableInput, LensPublicStart, XYState } from '../../../../../../lens/public';
 import { OperationTypeComponent } from '../series_editor/columns/operation_type_select';
 import { DataViewState } from '../hooks/use_app_data_view';
 import { ReportConfigMap } from '../contexts/exploratory_view_config';
 import { obsvReportConfigMap } from '../obsv_exploratory_view';
 import { ActionTypes, useActions } from './use_actions';
 import { AddToCaseAction } from '../header/add_to_case_action';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/common';
 import { observabilityFeatureId } from '../../../../../common';
 import { SingleMetric, SingleMetricOptions } from './single_metric';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
index 6e9a2c26580de..449dc297bcf6b 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
@@ -7,12 +7,12 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import type { ExploratoryEmbeddableProps, ExploratoryEmbeddableComponentProps } from './embeddable';
 import { ObservabilityDataViews } from '../../../../utils/observability_data_views';
 import { ObservabilityPublicPluginsStart } from '../../../../plugin';
 import type { DataViewState } from '../hooks/use_app_data_view';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
 import type { AppDataType } from '../types';
 
 const Embeddable = React.lazy(() => import('./embeddable'));
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts
index 26190637d84ce..019aa4ac8f29d 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts
@@ -7,14 +7,11 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { createExploratoryViewRoutePath, createExploratoryViewUrl } from '../configurations/utils';
 import { ReportViewType } from '../types';
 import { AllSeries } from '../hooks/use_series_storage';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import {
-  Action,
-  ActionExecutionContext,
-} from '../../../../../../../../src/plugins/ui_actions/public';
 import { ObservabilityAppServices } from '../../../../application/types';
 
 export type ActionTypes = 'explore' | 'save' | 'addToCase' | 'openInLens';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx
index 5273cc3643cba..f6a41fb6bef67 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx
@@ -11,7 +11,7 @@ import { render, mockAppDataView } from './rtl_helpers';
 import { ExploratoryView } from './exploratory_view';
 import * as obsvDataViews from '../../../utils/observability_data_views/observability_data_views';
 import * as pluginHook from '../../../hooks/use_plugin_context';
-import { createStubIndexPattern } from '../../../../../../../src/plugins/data/common/stubs';
+import { createStubIndexPattern } from '@kbn/data-plugin/common/stubs';
 
 jest.spyOn(pluginHook, 'usePluginContext').mockReturnValue({
   appMountParameters: {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
index 4c48ab292b217..905f6f20a2e6b 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
@@ -17,11 +17,11 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { PanelDirection } from '@elastic/eui/src/components/resizable_container/types';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
 import { useSeriesStorage } from './hooks/use_series_storage';
 import { useLensAttributes } from './hooks/use_lens_attributes';
-import { TypedLensByValueInput } from '../../../../../lens/public';
 import { useAppDataViewContext } from './hooks/use_app_data_view';
 import { SeriesViews } from './views/series_views';
 import { LensEmbeddable } from './lens_embeddable';
@@ -29,6 +29,7 @@ import { EmptyView } from './components/empty_view';
 import { ChartTimeRange, LastUpdated } from './header/last_updated';
 import { useExpViewTimeRange } from './hooks/use_time_range';
 import { ExpViewActionMenu } from './components/action_menu';
+import { useExploratoryView } from './contexts/exploratory_view_config';
 
 export type PanelId = 'seriesPanel' | 'chartPanel';
 
@@ -46,6 +47,8 @@ export function ExploratoryView({
 
   const [height, setHeight] = useState<string>('100vh');
 
+  const { isEditMode } = useExploratoryView();
+
   const [chartTimeRangeContext, setChartTimeRangeContext] = useState<ChartTimeRange | undefined>();
 
   const [lensAttributes, setLensAttributes] = useState<TypedLensByValueInput['attributes'] | null>(
@@ -112,9 +115,10 @@ export function ExploratoryView({
 
             return (
               <>
-                <EuiFlexGroup alignItems="center">
+                <EuiFlexGroup alignItems="center" gutterSize="s">
                   <EuiFlexItem grow={false}>
                     <EuiButtonEmpty
+                      size="xs"
                       {...(hiddenPanel === 'chartPanel'
                         ? { iconType: 'arrowRight' }
                         : { iconType: 'arrowDown' })}
@@ -129,7 +133,11 @@ export function ExploratoryView({
                         <LastUpdated chartTimeRange={chartTimeRangeContext} />
                       </EuiFlexItem>
                       <EuiFlexItem grow={false}>
-                        <EuiButton iconType="refresh" onClick={() => setLastRefresh(Date.now())}>
+                        <EuiButton
+                          iconType="refresh"
+                          onClick={() => setLastRefresh(Date.now())}
+                          size="s"
+                        >
                           {REFRESH_LABEL}
                         </EuiButton>
                       </EuiFlexItem>
@@ -138,10 +146,11 @@ export function ExploratoryView({
                 </EuiFlexGroup>
 
                 <EuiResizablePanel
-                  initialSize={40}
+                  initialSize={isEditMode ? 40 : 60}
                   minSize={'30%'}
                   mode={'collapsible'}
                   id="chartPanel"
+                  paddingSize="s"
                 >
                   {lensAttributes ? (
                     <LensEmbeddable
@@ -154,7 +163,7 @@ export function ExploratoryView({
                 </EuiResizablePanel>
 
                 <EuiResizablePanel
-                  initialSize={60}
+                  initialSize={isEditMode ? 60 : 40}
                   minSize="10%"
                   mode={'main'}
                   id="seriesPanel"
@@ -197,6 +206,11 @@ const ResizableContainer = styled(EuiResizableContainer)`
   &&& .paddingTopSmall {
     padding-top: 8px;
   }
+  #chartPanel {
+    > .euiPanel {
+      padding-bottom: 0;
+    }
+  }
 `;
 
 const ShowPreview = styled(EuiButtonEmpty)`
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx
index 3cde63c227b3a..17cde17d8b7f9 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx
@@ -8,14 +8,14 @@
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect } from 'react';
-import { toMountPoint, useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { ObservabilityAppServices } from '../../../../application/types';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   CasesDeepLinkId,
   generateCaseViewPath,
   GetAllCasesSelectorModalProps,
-} from '../../../../../../cases/public';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
+} from '@kbn/cases-plugin/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { ObservabilityAppServices } from '../../../../application/types';
 import { useAddToCase } from '../hooks/use_add_to_case';
 import { observabilityFeatureId, observabilityAppId } from '../../../../../common';
 import { parseRelativeDate } from '../components/date_range_picker';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
index 793e5d39653df..9534f66a38cfd 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
@@ -7,13 +7,13 @@
 
 import { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { HttpSetup, MountPoint } from 'kibana/public';
+import { HttpSetup, MountPoint } from '@kbn/core/public';
+import { Case } from '@kbn/cases-plugin/common';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { CasesDeepLinkId, DRAFT_COMMENT_STORAGE_ID } from '@kbn/cases-plugin/public';
 import { useKibana } from '../../../../utils/kibana_react';
-import { Case } from '../../../../../../cases/common';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
 import { AddToCaseProps } from '../header/add_to_case_action';
 import { observabilityFeatureId } from '../../../../../common';
-import { CasesDeepLinkId, DRAFT_COMMENT_STORAGE_ID } from '../../../../../../cases/public';
 
 async function addToCase(
   http: HttpSetup,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx
index ecc6ac3c63eda..670ddb8187c01 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx
@@ -6,15 +6,15 @@
  */
 
 import React, { createContext, useContext, Context, useState, useCallback, useMemo } from 'react';
-import { HttpFetchError } from 'kibana/public';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { HttpFetchError } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { DataViewInsufficientAccessError } from '@kbn/data-views-plugin/common';
 import { AppDataType } from '../types';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityPublicPluginsStart } from '../../../../plugin';
 import { ObservabilityDataViews } from '../../../../utils/observability_data_views';
 import { getDataHandler } from '../../../../data_handler';
 import { useExploratoryView } from '../contexts/exploratory_view_config';
-import { DataViewInsufficientAccessError } from '../../../../../../../../src/plugins/data_views/common';
 import { getApmDataViewTitle } from '../utils/utils';
 
 export interface DataViewContext {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx
index d50e2134546c4..a3f270a3a10a4 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx
@@ -12,14 +12,14 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useLensAttributes } from './use_lens_attributes';
 import { ReportTypes } from '../configurations/constants';
 import { mockDataView } from '../rtl_helpers';
-import { createKbnUrlStateStorage } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { TRANSACTION_DURATION } from '../configurations/constants/elasticsearch_fieldnames';
 import * as lensAttributes from '../configurations/lens_attributes';
 import * as useAppDataViewHook from './use_app_data_view';
 import * as theme from '../../../../hooks/use_theme';
 import { dataTypes, obsvReportConfigMap, reportTypesList } from '../obsv_exploratory_view';
 import { ExploratoryViewContextProvider } from '../contexts/exploratory_view_config';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 const mockSingleSeries = [
   {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
index 748d2e8fd6d0c..8d47d42e2007e 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
@@ -7,7 +7,8 @@
 
 import { useMemo } from 'react';
 import { isEmpty } from 'lodash';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { LayerConfig, LensAttributes } from '../configurations/lens_attributes';
 import {
   AllSeries,
@@ -22,7 +23,6 @@ import { ReportViewType, SeriesUrl, UrlFilter } from '../types';
 import { DataViewState, useAppDataViewContext } from './use_app_data_view';
 import { ALL_VALUES_SELECTED } from '../../field_value_suggestions/field_value_combobox';
 import { useTheme } from '../../../../hooks/use_theme';
-import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
 import { LABEL_FIELDS_BREAKDOWN } from '../configurations/constants';
 import { ReportConfigMap, useExploratoryView } from '../contexts/exploratory_view_config';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
index 3fca13f7978d6..24d5fc1d20615 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
@@ -6,10 +6,8 @@
  */
 
 import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
-import {
-  IKbnUrlStateStorage,
-  ISessionStorageStateStorage,
-} from '../../../../../../../../src/plugins/kibana_utils/public';
+import { IKbnUrlStateStorage, ISessionStorageStateStorage } from '@kbn/kibana-utils-plugin/public';
+import { OperationType, SeriesType } from '@kbn/lens-plugin/public';
 import { useUiTracker } from '../../../../hooks/use_track_metric';
 import type {
   AppDataType,
@@ -19,7 +17,6 @@ import type {
   URLReportDefinition,
 } from '../types';
 import { convertToShortUrl } from '../configurations/utils';
-import { OperationType, SeriesType } from '../../../../../../lens/public';
 import { URL_KEYS } from '../configurations/constants/url_constants';
 import { trackTelemetryOnApply } from '../utils/telemetry';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx
index edac44cf22e38..b97e3cc3c6923 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx
@@ -11,7 +11,7 @@ import { allSeriesKey, reportTypeKey, UrlStorageContextProvider } from './use_se
 import { renderHook } from '@testing-library/react-hooks';
 import { useExpViewTimeRange } from './use_time_range';
 import { ReportTypes } from '../configurations/constants';
-import { createKbnUrlStateStorage } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import {
   TRANSACTION_DURATION,
   METRIC_SYSTEM_MEMORY_USAGE,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx
index 94954ff5522dc..f9a58a8ff7433 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx
@@ -8,19 +8,19 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { useHistory } from 'react-router-dom';
-import { ExploratoryView } from './exploratory_view';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ObservabilityPublicPluginsStart } from '../../../plugin';
-import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
-import { DataViewContextProvider } from './hooks/use_app_data_view';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   createKbnUrlStateStorage,
   withNotifyOnErrors,
   createSessionStorageStateStorage,
-} from '../../../../../../../src/plugins/kibana_utils/public/';
+} from '@kbn/kibana-utils-plugin/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { ExploratoryView } from './exploratory_view';
+import { ObservabilityPublicPluginsStart } from '../../../plugin';
+import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
+import { DataViewContextProvider } from './hooks/use_app_data_view';
 import { UrlStorageContextProvider } from './hooks/use_series_storage';
 import { useTrackPageview } from '../../..';
-import { TypedLensByValueInput } from '../../../../../lens/public';
 import { usePluginContext } from '../../../hooks/use_plugin_context';
 
 const PAGE_TITLE = i18n.translate('xpack.observability.expView.heading.label', {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
index d5cd5379daca0..cd1fd4cc014bc 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
@@ -8,11 +8,11 @@
 import { i18n } from '@kbn/i18n';
 import React, { Dispatch, SetStateAction, useCallback, useState } from 'react';
 import styled from 'styled-components';
-import { LensEmbeddableInput, TypedLensByValueInput } from '../../../../../lens/public';
+import { LensEmbeddableInput, TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useUiTracker } from '../../../hooks/use_track_metric';
 import { useSeriesStorage } from './hooks/use_series_storage';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useExpViewTimeRange } from './hooks/use_time_range';
 import { parseRelativeDate } from './components/date_range_picker';
 import { trackTelemetryOnLoad } from './utils/telemetry';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
index c6760aec6814a..18c6020ff8b26 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiErrorBoundary } from '@elastic/eui';
-import { ExploratoryViewPage } from './index';
+import { ExploratoryViewPage } from '.';
 import { ExploratoryViewContextProvider } from './contexts/exploratory_view_config';
 import { AppDataType, ReportViewType } from './types';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
index 360f7cd064cb7..23c635be3ba81 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
@@ -16,16 +16,20 @@ import {
 } from '@testing-library/react';
 import { Route, Router } from 'react-router-dom';
 import { createMemoryHistory, History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
-import {
-  KibanaContextProvider,
-  KibanaServices,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider, KibanaServices } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { lensPluginMock } from '@kbn/lens-plugin/public/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { setIndexPatterns } from '@kbn/unified-search-plugin/public/services';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { casesPluginMock } from '@kbn/cases-plugin/public/mocks';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { lensPluginMock } from '../../../../../lens/public/mocks';
 import * as useAppDataViewHook from './hooks/use_app_data_view';
 import { DataViewContext, DataViewContextProvider } from './hooks/use_app_data_view';
 import {
@@ -41,20 +45,10 @@ import * as useHasDataHook from '../../../hooks/use_has_data';
 import * as useValuesListHook from '../../../hooks/use_values_list';
 
 import dataViewData from './configurations/test_data/test_data_view.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setIndexPatterns } from '../../../../../../../src/plugins/unified_search/public/services';
-import type {
-  DataView,
-  DataViewsContract,
-} from '../../../../../../../src/plugins/data_views/public';
 
 import { AppDataType, SeriesUrl, UrlFilter } from './types';
-import { createStubDataView } from '../../../../../../../src/plugins/data_views/common/stubs';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../../../src/plugins/data_views/public/mocks';
 import { ListItem } from '../../../hooks/use_values_list';
 import { TRANSACTION_DURATION } from './configurations/constants/elasticsearch_fieldnames';
-import { casesPluginMock } from '../../../../../cases/public/mocks';
 import { dataTypes, obsvReportConfigMap, reportTypesList } from './obsv_exploratory_view';
 import { ExploratoryViewContextProvider } from './contexts/exploratory_view_config';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
index 6f88de5cc2afc..cacf043d65d68 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
@@ -8,9 +8,9 @@
 import React, { useState } from 'react';
 import { EuiPopover, EuiToolTip, EuiButtonEmpty, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../../../../../plugin';
-import { SeriesUrl, useFetcher } from '../../../../../index';
+import { SeriesUrl, useFetcher } from '../../../../..';
 import { SeriesConfig } from '../../types';
 import { SeriesChartTypesSelect } from './chart_types';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
index 27d846502dbe6..b75a3adcc8ae0 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiIcon, EuiSuperSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { SeriesType } from '@kbn/lens-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../../../../../plugin';
 import { SeriesUrl, useFetcher } from '../../../../..';
 import { useSeriesStorage } from '../../hooks/use_series_storage';
-import { SeriesType } from '../../../../../../../lens/public';
 
 const CHART_TYPE_LABEL = i18n.translate('xpack.observability.expView.chartTypes.label', {
   defaultMessage: 'Chart type',
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx
index 234b19fefb02c..5ad043a6b3b96 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx
@@ -8,9 +8,9 @@ import { i18n } from '@kbn/i18n';
 
 import React, { useMemo } from 'react';
 import { EuiFilterButton, hexToRgb } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useAppDataViewContext } from '../../hooks/use_app_data_view';
 import { useSeriesFilters } from '../../hooks/use_series_filters';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import FieldValueSuggestions from '../../../field_value_suggestions';
 import { SeriesUrl } from '../../types';
 import { NestedFilterOpen } from './filter_expanded';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
index 3d005e04e9928..53669084de8ad 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSuperSelect } from '@elastic/eui';
 
+import { OperationType } from '@kbn/lens-plugin/public';
 import { useSeriesStorage } from '../../hooks/use_series_storage';
-import { OperationType } from '../../../../../../../lens/public';
 import { SeriesUrl } from '../../types';
 
 export function OperationTypeSelect({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx
index b518993a51940..d47b602492000 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx
@@ -8,10 +8,10 @@
 import React, { useMemo } from 'react';
 import { isEmpty } from 'lodash';
 import { ExistsFilter, PhraseFilter } from '@kbn/es-query';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import FieldValueSuggestions from '../../../field_value_suggestions';
 import { useAppDataViewContext } from '../../hooks/use_app_data_view';
-import { ESFilter } from '../../../../../../../../../src/core/types/elasticsearch';
-import { PersistableFilter } from '../../../../../../../lens/common';
 import { buildPhrasesFilter } from '../../configurations/utils';
 import { SeriesConfig, SeriesUrl } from '../../types';
 import { ALL_VALUES_SELECTED } from '../../../field_value_suggestions/field_value_combobox';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx
index a6942418c609b..13aee75979145 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx
@@ -11,8 +11,8 @@ import { rgba } from 'polished';
 import styled from 'styled-components';
 import { map } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FilterValueButton } from '../columns/filter_value_btn';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { FilterProps, NestedFilterOpen } from '../columns/filter_expanded';
 import { UrlFilter } from '../../types';
 import { ListItem } from '../../../../../hooks/use_values_list';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series.tsx
index 5678bd61e1d47..33fc5ef541b68 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series.tsx
@@ -56,7 +56,7 @@ export function Series({ item, isExpanded, toggleExpanded }: Props) {
   }, [isExpanded]);
 
   return (
-    <EuiPanel hasBorder={true} data-test-subj={`exploratoryViewSeriesPanel${0}`}>
+    <EuiPanel hasBorder={true} data-test-subj={`exploratoryViewSeriesPanel${0}`} paddingSize="s">
       <StyledAccordion
         id={`exploratoryViewSeriesAccordion${id}`}
         forceState={isExpanded ? 'open' : 'closed'}
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx
index 7819c8bae7688..6295b106b2a6f 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiFormRow, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { rgba } from 'polished';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { AppDataType, ReportViewType, BuilderItem } from '../types';
 import { SeriesContextValue, useSeriesStorage } from '../hooks/use_series_storage';
 import { DataViewState, useAppDataViewContext } from '../hooks/use_app_data_view';
@@ -63,7 +63,7 @@ export const SeriesEditor = React.memo(function () {
 
   const { loading, dataViews } = useAppDataViewContext();
 
-  const { reportConfigMap } = useExploratoryView();
+  const { reportConfigMap, setIsEditMode } = useExploratoryView();
 
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<Record<string, true>>({});
 
@@ -74,6 +74,10 @@ export const SeriesEditor = React.memo(function () {
     curCount: allSeries.length,
   });
 
+  useEffect(() => {
+    setIsEditMode?.(Object.keys(itemIdToExpandedRowMap).length > 0);
+  }, [itemIdToExpandedRowMap, setIsEditMode]);
+
   useEffect(() => {
     setSeriesCount((oldParams) => ({ prevCount: oldParams.curCount, curCount: allSeries.length }));
     if (typeof prevCount !== 'undefined' && !isNaN(prevCount) && prevCount < curCount) {
@@ -141,14 +145,14 @@ export const SeriesEditor = React.memo(function () {
       </StickyFlexGroup>
 
       <EditorRowsWrapper>
-        {editorItems.map((item) => (
+        {editorItems.map((item, index) => (
           <div key={item.id}>
             <Series
               item={item}
               toggleExpanded={() => toggleDetails(item)}
               isExpanded={itemIdToExpandedRowMap[item.id]}
             />
-            <EuiSpacer size="s" />
+            {index + 1 !== editorItems.length && <EuiSpacer size="s" />}
           </div>
         ))}
       </EditorRowsWrapper>
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts
index 848bd6b44ea16..e131425da8add 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts
@@ -6,11 +6,11 @@
  */
 import { ExistsFilter, isExistsFilter } from '@kbn/es-query';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import { useValuesList } from '../../../../hooks/use_values_list';
 import { FilterProps } from './columns/filter_expanded';
 import { useAppDataViewContext } from '../hooks/use_app_data_view';
-import { ESFilter } from '../../../../../../../../src/core/types/elasticsearch';
-import { PersistableFilter } from '../../../../../../lens/common';
 
 export function useFilterValues(
   { field, series, baseFilters, label }: FilterProps,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts
index 775c989df2aec..072f6e42d1cd8 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { PaletteOutput } from 'src/plugins/charts/public';
-import { ExistsFilter, PhraseFilter } from '@kbn/es-query';
-import {
+import type { PaletteOutput } from '@kbn/coloring';
+import type { ExistsFilter, PhraseFilter } from '@kbn/es-query';
+import type {
   LastValueIndexPatternColumn,
   DateHistogramIndexPatternColumn,
   FieldBasedIndexPatternColumn,
   SeriesType,
   OperationType,
   YConfig,
-} from '../../../../../lens/public';
+} from '@kbn/lens-plugin/public';
 
-import { PersistableFilter } from '../../../../../lens/common';
-import type { DataView } from '../../../../../../../src/plugins/data_views/common';
+import type { PersistableFilter } from '@kbn/lens-plugin/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 
 export const ReportViewTypes = {
   dist: 'data-distribution',
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
index e15e5709bc341..0916cc4673129 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
@@ -8,9 +8,9 @@
 import React, { ComponentType, useEffect, useState } from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { Observable } from 'rxjs';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { text } from '@storybook/addon-knobs';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { FieldValueSelectionProps } from '../types';
 import { FieldValueSelection } from '../field_value_selection';
 
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx
index 3b9f6264c773a..42f08adadec43 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount, render } from 'enzyme';
 import { FieldValueSelection } from './field_value_selection';
 import { EuiButton, EuiSelectableList } from '@elastic/eui';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 const values = [
   { label: 'elastic co frontend', count: 1 },
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx
index dfcd917cf534b..b258c4f4700e0 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx
@@ -20,8 +20,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import { isEqual, map } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FieldValueSelectionProps, ListItem } from './types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 
 const Counter = euiStyled.div`
   border-radius: ${({ theme }) => theme.eui.euiBorderRadius};
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx
index 6671c43dd8c7b..249913e91b4e4 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { FieldValueSuggestions } from './index';
+import { FieldValueSuggestions } from '.';
 import { render, screen, fireEvent, waitForElementToBeRemoved } from '@testing-library/react';
 import * as searchHook from '../../../hooks/use_es_search';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 jest.setTimeout(30000);
 
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts
index 1ee477e05fbc0..745f19f49225b 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts
@@ -7,8 +7,8 @@
 
 import { PopoverAnchorPosition } from '@elastic/eui';
 import { Dispatch, SetStateAction } from 'react';
-import { ESFilter } from 'src/core/types/elasticsearch';
-import { IInspectorInfo } from '../../../../../../../src/plugins/data/common';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { IInspectorInfo } from '@kbn/data-plugin/common';
 
 interface CommonProps {
   selectedValue?: string[];
diff --git a/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx b/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
index d65c64fab3e59..5d6577dad8c9c 100644
--- a/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
+++ b/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { injectI18n } from '@kbn/i18n-react';
 import { Filter, buildPhrasesFilter, buildPhraseFilter } from '@kbn/es-query';
-import { FilterItem } from '../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../src/plugins/data_views/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { FilterItem } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export function buildFilterLabel({
   field,
diff --git a/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx b/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx
index a3254b6d98b7a..055c974dcf6db 100644
--- a/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx
@@ -8,7 +8,7 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 import HeaderMenuPortal from './header_menu_portal';
-import { themeServiceMock } from '../../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 describe('HeaderMenuPortal', () => {
   describe('when unmounted', () => {
diff --git a/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx b/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx
index 5b645605f7f1b..02d16c13ce4e8 100644
--- a/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx
+++ b/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx
@@ -7,7 +7,7 @@
 
 import React, { useEffect, useMemo } from 'react';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { HeaderMenuPortalProps } from './types';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/plugins/observability/public/components/shared/index.tsx b/x-pack/plugins/observability/public/components/shared/index.tsx
index cdbc6ec8a9513..2b70a5a4a7bd3 100644
--- a/x-pack/plugins/observability/public/components/shared/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/index.tsx
@@ -9,14 +9,14 @@ import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import type { CoreVitalProps, HeaderMenuPortalProps } from './types';
 import type { FieldValueSuggestionsProps } from './field_value_suggestions/types';
-import type { DatePickerProps } from './date_picker/index';
+import type { DatePickerProps } from './date_picker';
 import type { FilterValueLabelProps } from './filter_value_label/filter_value_label';
 import type { SelectableUrlListProps } from './exploratory_view/components/url_search/selectable_url_list';
-import type { ExploratoryViewPageProps } from './exploratory_view/index';
+import type { ExploratoryViewPageProps } from './exploratory_view';
 export { createLazyObservabilityPageTemplate } from './page_template';
 export type { LazyObservabilityPageTemplateProps } from './page_template';
 
-const CoreVitalsLazy = lazy(() => import('./core_web_vitals/index'));
+const CoreVitalsLazy = lazy(() => import('./core_web_vitals'));
 
 export function getCoreVitalsComponent(props: CoreVitalProps) {
   return (
@@ -36,7 +36,7 @@ export function HeaderMenuPortal(props: HeaderMenuPortalProps) {
   );
 }
 
-const FieldValueSuggestionsLazy = lazy(() => import('./field_value_suggestions/index'));
+const FieldValueSuggestionsLazy = lazy(() => import('./field_value_suggestions'));
 
 export function FieldValueSuggestions(props: FieldValueSuggestionsProps) {
   return (
@@ -68,7 +68,7 @@ export function SelectableUrlList(props: SelectableUrlListProps) {
   );
 }
 
-const ExploratoryViewLazy = lazy(() => import('./exploratory_view/index'));
+const ExploratoryViewLazy = lazy(() => import('./exploratory_view'));
 
 export function ExploratoryView(props: ExploratoryViewPageProps) {
   return (
@@ -78,7 +78,7 @@ export function ExploratoryView(props: ExploratoryViewPageProps) {
   );
 }
 
-const DatePickerLazy = lazy(() => import('./date_picker/index'));
+const DatePickerLazy = lazy(() => import('./date_picker'));
 
 export function DatePicker(props: DatePickerProps) {
   return (
diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
index ce27bba1445e0..9e0460c64777f 100644
--- a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
+++ b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
@@ -11,11 +11,8 @@ import React, { useMemo } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
-import type { ApplicationStart } from '../../../../../../../src/core/public';
-import {
-  KibanaPageTemplate,
-  KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import type { ApplicationStart } from '@kbn/core/public';
+import { KibanaPageTemplate, KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import type { NavigationSection } from '../../../services/navigation_registry';
 import { NavNameWithBadge, hideBadge } from './nav_name_with_badge';
 
diff --git a/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx b/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx
index 9dbe7cf9fdf90..ce7fc4f53f799 100644
--- a/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import moment from 'moment-timezone';
-import { TimestampTooltip } from './index';
+import { TimestampTooltip } from '.';
 
 function mockNow(date: string | number | Date) {
   const fakeNow = new Date(date).getTime();
diff --git a/x-pack/plugins/observability/public/components/shared/types.ts b/x-pack/plugins/observability/public/components/shared/types.ts
index e08d2f19e5706..856a534a107f1 100644
--- a/x-pack/plugins/observability/public/components/shared/types.ts
+++ b/x-pack/plugins/observability/public/components/shared/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { ReactNode } from 'react';
-import { AppMountParameters } from '../../../../../../src/core/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { UXMetrics } from './core_web_vitals';
 
 export interface HeaderMenuPortalProps {
diff --git a/x-pack/plugins/observability/public/context/date_picker_context.tsx b/x-pack/plugins/observability/public/context/date_picker_context.tsx
index 711d0adc0e522..f37aba3cc7c6c 100644
--- a/x-pack/plugins/observability/public/context/date_picker_context.tsx
+++ b/x-pack/plugins/observability/public/context/date_picker_context.tsx
@@ -9,8 +9,8 @@ import React, { createContext, useState, useMemo, useCallback } from 'react';
 import useMount from 'react-use/lib/useMount';
 import { useLocation, useHistory } from 'react-router-dom';
 import { parse } from 'query-string';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { fromQuery, ObservabilityPublicPluginsStart, toQuery } from '..';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { getAbsoluteTime } from '../utils/date';
 
 export interface DatePickerContextValue {
diff --git a/x-pack/plugins/observability/public/context/has_data_context.test.tsx b/x-pack/plugins/observability/public/context/has_data_context.test.tsx
index 5c03c802c5e7e..1cac519680272 100644
--- a/x-pack/plugins/observability/public/context/has_data_context.test.tsx
+++ b/x-pack/plugins/observability/public/context/has_data_context.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { registerDataHandler, unregisterDataHandler } from '../data_handler';
 import { useHasData } from '../hooks/use_has_data';
 import { HasData, ObservabilityFetchDataPlugins } from '../typings/fetch_overview_data';
diff --git a/x-pack/plugins/observability/public/context/has_data_context.tsx b/x-pack/plugins/observability/public/context/has_data_context.tsx
index cbdbe0c679156..e5e281979ef2f 100644
--- a/x-pack/plugins/observability/public/context/has_data_context.tsx
+++ b/x-pack/plugins/observability/public/context/has_data_context.tsx
@@ -9,13 +9,13 @@ import { isEmpty, uniqueId } from 'lodash';
 import React, { createContext, useEffect, useState } from 'react';
 import { useRouteMatch } from 'react-router-dom';
 import { asyncForEach } from '@kbn/std';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { getDataHandler } from '../data_handler';
 import { FETCH_STATUS } from '../hooks/use_fetcher';
 import { useDatePickerContext } from '../hooks/use_date_picker_context';
 import { getObservabilityAlerts } from '../services/get_observability_alerts';
 import { ObservabilityFetchDataPlugins } from '../typings/fetch_overview_data';
 import { ApmIndicesConfig } from '../../common/typings';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../application/types';
 
 type DataContextApps = ObservabilityFetchDataPlugins | 'alert';
diff --git a/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx b/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx
index 56498fcaecd5c..b5bc254dd6308 100644
--- a/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx
+++ b/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx
@@ -7,7 +7,7 @@
 
 import React, { createContext, ReactNode, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { RequestAdapter } from '../../../../../../src/plugins/inspector/common';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { FetcherResult } from '../../hooks/use_fetcher';
 import { InspectResponse } from '../../../typings/common';
 
diff --git a/x-pack/plugins/observability/public/context/plugin_context.tsx b/x-pack/plugins/observability/public/context/plugin_context.tsx
index e4e1ddb420340..37dffe4daa178 100644
--- a/x-pack/plugins/observability/public/context/plugin_context.tsx
+++ b/x-pack/plugins/observability/public/context/plugin_context.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { createContext } from 'react';
-import { KibanaFeature } from '../../../features/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
 import { ConfigSchema } from '..';
 import { ObservabilityRuleTypeRegistry } from '../rules/create_observability_rule_type_registry';
 import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template';
diff --git a/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts b/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts
index 3df79bec1a8f2..f3111328edbea 100644
--- a/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts
+++ b/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getAlertsPermissions, useGetUserAlertsPermissions } from './use_alert_permission';
-import { applicationServiceMock } from 'src/core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { renderHook } from '@testing-library/react-hooks';
 
 describe('getAlertsPermissions', () => {
diff --git a/x-pack/plugins/observability/public/hooks/use_alert_permission.ts b/x-pack/plugins/observability/public/hooks/use_alert_permission.ts
index 2b7eddd5c7182..8669f187dc975 100644
--- a/x-pack/plugins/observability/public/hooks/use_alert_permission.ts
+++ b/x-pack/plugins/observability/public/hooks/use_alert_permission.ts
@@ -7,7 +7,7 @@
 
 import { useEffect, useState } from 'react';
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { Capabilities } from 'src/core/types';
+import { Capabilities } from '@kbn/core/types';
 
 export interface UseGetUserAlertsPermissionsProps {
   crud: boolean;
diff --git a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx
index e5efca1d67a25..08778d8bc3a4d 100644
--- a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx
@@ -8,8 +8,8 @@
 import { renderHook } from '@testing-library/react-hooks';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { useBreadcrumbs } from './use_breadcrumbs';
 
 const setBreadcrumbs = jest.fn();
diff --git a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts
index 899308e6d73bf..fe828ca663abd 100644
--- a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { MouseEvent, useEffect } from 'react';
 import { useKibana } from '../utils/kibana_react';
 import { useQueryParams } from './use_query_params';
diff --git a/x-pack/plugins/observability/public/hooks/use_es_search.ts b/x-pack/plugins/observability/public/hooks/use_es_search.ts
index 94126d6c1540e..2215d31c838fb 100644
--- a/x-pack/plugins/observability/public/hooks/use_es_search.ts
+++ b/x-pack/plugins/observability/public/hooks/use_es_search.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { IInspectorInfo, isCompleteResponse } from '../../../../../src/plugins/data/common';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IInspectorInfo, isCompleteResponse } from '@kbn/data-plugin/common';
 import { FETCH_STATUS, useFetcher } from './use_fetcher';
 import { useInspectorContext } from '../context/inspector/use_inspector_context';
 import { getInspectResponse } from '../../common/utils/get_inspect_response';
diff --git a/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts b/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts
index e3a1ab9c0137c..00cb58e504bdc 100644
--- a/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts
+++ b/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts
@@ -7,19 +7,12 @@
 
 import { useEffect, useState, useCallback } from 'react';
 import { isEmpty } from 'lodash';
-import { loadRules, Rule } from '../../../triggers_actions_ui/public';
+import { loadRules } from '@kbn/triggers-actions-ui-plugin/public';
 import { RULES_LOAD_ERROR } from '../pages/rules/translations';
-import { FetchRulesProps } from '../pages/rules/types';
+import { FetchRulesProps, RuleState } from '../pages/rules/types';
 import { OBSERVABILITY_RULE_TYPES } from '../pages/rules/config';
 import { useKibana } from '../utils/kibana_react';
 
-interface RuleState {
-  isLoading: boolean;
-  data: Rule[];
-  error: string | null;
-  totalItemCount: number;
-}
-
 export function useFetchRules({
   searchText,
   ruleLastResponseFilter,
diff --git a/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts b/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts
index 6bb8b476b4d01..3f23aec4a6058 100644
--- a/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts
+++ b/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { applicationServiceMock } from 'src/core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { casesFeatureId } from '../../common';
 import { useGetUserCasesPermissions } from './use_get_user_cases_permissions';
 import { kibanaStartMock } from '../utils/kibana_react.mock';
diff --git a/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx b/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx
index d16fbf6f7cd14..f448e07125d8b 100644
--- a/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export { UI_SETTINGS };
 
diff --git a/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx b/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
index 5741b20e693a2..e4fb3b6bd9ddb 100644
--- a/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
@@ -10,9 +10,9 @@ import { createMemoryHistory } from 'history';
 import React, { PropsWithChildren } from 'react';
 import { Router } from 'react-router-dom';
 import { encode } from 'rison-node';
-import { coreMock } from 'src/core/public/mocks';
-import { ScopedHistory } from '../../../../../src/core/public';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ScopedHistory } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { LinkDescriptor, useLinkProps } from './use_link_props';
 
 const PREFIX = '/test-basepath/s/test-space/app/';
diff --git a/x-pack/plugins/observability/public/hooks/use_link_props.ts b/x-pack/plugins/observability/public/hooks/use_link_props.ts
index 8777d2a944ddf..55746add79ccc 100644
--- a/x-pack/plugins/observability/public/hooks/use_link_props.ts
+++ b/x-pack/plugins/observability/public/hooks/use_link_props.ts
@@ -7,9 +7,9 @@
 
 import { useMemo } from 'react';
 import { stringify } from 'query-string';
-import { url as urlUtils } from '../../../../../src/plugins/kibana_utils/public';
+import { url as urlUtils } from '@kbn/kibana-utils-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { usePrefixPathWithBasepath } from './use_prefix_path_with_basepath';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { useNavigationWarningPrompt } from '../utils/navigation_warning_prompt';
 
 type Search = Record<string, string | string[]>;
diff --git a/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx b/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
index 7c5496faaf4a3..05fde570878da 100644
--- a/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useMemo } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const usePrefixPathWithBasepath = () => {
   const getUrlForApp = useKibana().services.application?.getUrlForApp;
diff --git a/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx b/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx
index 198b4092b0ed6..a6b4e78d86b89 100644
--- a/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { useUiSetting } from '../../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { TimePickerQuickRange } from '../components/shared/exploratory_view/components/series_date_picker';
 
 export function useQuickTimeRanges() {
diff --git a/x-pack/plugins/observability/public/hooks/use_theme.tsx b/x-pack/plugins/observability/public/hooks/use_theme.tsx
index 4e8aded2b8037..f0957c15ae1d6 100644
--- a/x-pack/plugins/observability/public/hooks/use_theme.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_theme.tsx
@@ -7,7 +7,7 @@
 
 import { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
-import { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 export function useTheme() {
   const theme: EuiTheme = useContext(ThemeContext);
diff --git a/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts b/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts
index b82a35ce1f462..24f0c4f93a9e8 100644
--- a/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts
+++ b/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { ObservabilityPublicPluginsStart } from '../';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ObservabilityPublicPluginsStart } from '..';
 
 export function useTimefilterService() {
   const { services } = useKibana<ObservabilityPublicPluginsStart>();
diff --git a/x-pack/plugins/observability/public/hooks/use_track_metric.tsx b/x-pack/plugins/observability/public/hooks/use_track_metric.tsx
index b2327b590156a..6a3f0c3e8965d 100644
--- a/x-pack/plugins/observability/public/hooks/use_track_metric.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_track_metric.tsx
@@ -7,8 +7,8 @@
 
 import { useEffect, useMemo } from 'react';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityApp } from '../../typings/common';
 
 /**
diff --git a/x-pack/plugins/observability/public/hooks/use_values_list.ts b/x-pack/plugins/observability/public/hooks/use_values_list.ts
index 5ab9b41ca6f9a..f6c75c6abbaf0 100644
--- a/x-pack/plugins/observability/public/hooks/use_values_list.ts
+++ b/x-pack/plugins/observability/public/hooks/use_values_list.ts
@@ -8,9 +8,9 @@
 import { capitalize, uniqBy } from 'lodash';
 import { useEffect, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
-import { ESFilter } from '../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { IInspectorInfo } from '@kbn/data-plugin/common';
 import { createEsParams, useEsSearch } from './use_es_search';
-import { IInspectorInfo } from '../../../../../src/plugins/data/common';
 import { TRANSACTION_URL } from '../components/shared/exploratory_view/configurations/constants/elasticsearch_fieldnames';
 
 export interface Props {
diff --git a/x-pack/plugins/observability/public/index.ts b/x-pack/plugins/observability/public/index.ts
index 73290929088c9..cfabbaaec4afa 100644
--- a/x-pack/plugins/observability/public/index.ts
+++ b/x-pack/plugins/observability/public/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110905
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext, PluginInitializer } from 'kibana/public';
+import { PluginInitializerContext, PluginInitializer } from '@kbn/core/public';
 import { lazy } from 'react';
 import {
   Plugin,
@@ -49,9 +49,9 @@ export const plugin: PluginInitializer<
   return new Plugin(context);
 };
 
-export * from './components/shared/action_menu/';
+export * from './components/shared/action_menu';
 
-export type { UXMetrics } from './components/shared/core_web_vitals/';
+export type { UXMetrics } from './components/shared/core_web_vitals';
 export { DatePickerContextProvider } from './context/date_picker_context';
 export {
   getCoreVitalsComponent,
@@ -61,7 +61,7 @@ export {
   SelectableUrlList,
   ExploratoryView,
   DatePicker,
-} from './components/shared/';
+} from './components/shared';
 
 export type { LazyObservabilityPageTemplateProps } from './components/shared';
 
diff --git a/x-pack/plugins/observability/public/observability_public_plugins_start.mock.ts b/x-pack/plugins/observability/public/observability_public_plugins_start.mock.ts
index 4d6d312bcf199..62edefc1b737d 100644
--- a/x-pack/plugins/observability/public/observability_public_plugins_start.mock.ts
+++ b/x-pack/plugins/observability/public/observability_public_plugins_start.mock.ts
@@ -32,12 +32,26 @@ const embeddableStartMock = {
   },
 };
 
+const triggersActionsUiStartMock = {
+  createStart() {
+    return {
+      getAddAlertFlyout: jest.fn(),
+      ruleTypeRegistry: {
+        has: jest.fn(),
+        register: jest.fn(),
+        get: jest.fn(),
+        list: jest.fn(),
+      },
+    };
+  },
+};
+
 export const observabilityPublicPluginsStartMock = {
   createStart() {
     return {
       cases: casesUiStartMock.createStart(),
       embeddable: embeddableStartMock.createStart(),
-      triggersActionsUi: null,
+      triggersActionsUi: triggersActionsUiStartMock.createStart(),
       data: null,
       lens: null,
       discover: null,
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx
index 31c8f69757c9d..498ba57fcd2b4 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx
@@ -7,7 +7,7 @@
 
 import { ALERT_UUID } from '@kbn/rule-data-utils';
 import React, { ComponentType } from 'react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { PluginContext, PluginContextValue } from '../../../../context/plugin_context';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
 import { apmAlertResponseExample } from './example_data';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx
index 13fb5d805fb81..23f000235aeca 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import * as useUiSettingHook from '../../../../../../../../src/plugins/kibana_react/public/ui_settings/use_ui_setting';
+import * as useUiSettingHook from '@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
 import { render } from '../../../../utils/test_helper';
 import type { TopAlert } from '../../containers/alerts_page';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx
index 893fdf7e8d7e0..d0957f0224b53 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx
@@ -33,8 +33,8 @@ import {
 } from '@kbn/rule-data-utils';
 import moment from 'moment-timezone';
 import React, { useMemo } from 'react';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import type { TopAlert } from '../../containers';
-import { useKibana, useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { asDuration } from '../../../../../common/utils/formatters';
 import type { ObservabilityRuleTypeRegistry } from '../../../../rules/create_observability_rule_type_registry';
 import { parseAlert } from '../parse_alert';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
index 28b9b3c0758e8..0798e3afded80 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
@@ -7,10 +7,10 @@
 
 import { DataViewBase } from '@kbn/es-query';
 import React, { useMemo, useState } from 'react';
-import { TimeHistory } from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { TimeHistory } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { translations } from '../../../config';
 
 type QueryLanguageType = 'lucene' | 'kuery';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx b/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx
index 5126647161fa5..115fa703459b9 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { getMappedNonEcsValue } from './render_cell_value';
+import { TimelineNonEcsData } from '@kbn/timelines-plugin/common/search_strategy';
+import { TGridCellAction } from '@kbn/timelines-plugin/common/types/timeline';
+import { getPageRowIndex } from '@kbn/timelines-plugin/public';
 import FilterForValueButton from './filter_for_value';
-import { TimelineNonEcsData } from '../../../../../timelines/common/search_strategy';
-import { TGridCellAction } from '../../../../../timelines/common/types/timeline';
-import { getPageRowIndex } from '../../../../../timelines/public';
+import { getMappedNonEcsValue } from './render_cell_value';
 
 export const FILTER_FOR_VALUE = i18n.translate('xpack.observability.hoverActions.filterForValue', {
   defaultMessage: 'Filter for value',
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts b/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts
index 6577e022a2a6d..c8838e197981b 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts
@@ -13,10 +13,10 @@ import {
   ALERT_RULE_NAME,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import type { TopAlert } from '../';
-import { experimentalRuleFieldMap } from '../../../../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
-import { parseTechnicalFields } from '../../../../../rule_registry/common/parse_technical_fields';
-import { parseExperimentalFields } from '../../../../../rule_registry/common/parse_experimental_fields';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
+import { parseTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
+import { parseExperimentalFields } from '@kbn/rule-registry-plugin/common/parse_experimental_fields';
+import type { TopAlert } from '..';
 import { asDuration, asPercent } from '../../../../common/utils/formatters';
 import { ObservabilityRuleTypeRegistry } from '../../../rules/create_observability_rule_type_registry';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
index babb60d4a80f0..1c680f0e1618f 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_STATUS, ALERT_STATUS_ACTIVE, ALERT_STATUS_RECOVERED } from '@kbn/rule-data-utils';
-import type { CellValueElementProps } from '../../../../../../timelines/common';
+import type { CellValueElementProps } from '@kbn/timelines-plugin/common';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
 import * as PluginHook from '../../../../hooks/use_plugin_context';
 import { render } from '../../../../utils/test_helper';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx
index 27b88fa60d282..2c707503af44a 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx
@@ -15,12 +15,12 @@ import {
   ALERT_REASON,
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
-import type { CellValueElementProps, TimelineNonEcsData } from '../../../../../../timelines/common';
+import type { CellValueElementProps, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
 import { AlertStatusIndicator } from '../../../../components/shared/alert_status_indicator';
 import { TimestampTooltip } from '../../../../components/shared/timestamp_tooltip';
 import { asDuration } from '../../../../../common/utils/formatters';
 import { SeverityBadge } from '../severity_badge';
-import { TopAlert } from '../../';
+import { TopAlert } from '../..';
 import { parseAlert } from '../parse_alert';
 import { usePluginContext } from '../../../../hooks/use_plugin_context';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
index dbe095c311c0f..e9256993c5857 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
@@ -13,14 +13,14 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { ALERT_STATUS, AlertStatus } from '@kbn/rule-data-utils';
 
-import { observabilityFeatureId } from '../../../../../common';
-import { useGetUserCasesPermissions } from '../../../../hooks/use_get_user_cases_permissions';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { loadRuleAggregations } from '../../../../../../../plugins/triggers_actions_ui/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { loadRuleAggregations } from '@kbn/triggers-actions-ui-plugin/public';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
+import { ParsedExperimentalFields } from '@kbn/rule-registry-plugin/common/parse_experimental_fields';
 import { AlertStatusFilterButton } from '../../../../../common/typings';
-import { ParsedTechnicalFields } from '../../../../../../rule_registry/common/parse_technical_fields';
-import { ParsedExperimentalFields } from '../../../../../../rule_registry/common/parse_experimental_fields';
+import { useGetUserCasesPermissions } from '../../../../hooks/use_get_user_cases_permissions';
+import { observabilityFeatureId } from '../../../../../common';
 import { ExperimentalBadge } from '../../../../components/shared/experimental_badge';
 import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs';
 import { useAlertIndexNames } from '../../../../hooks/use_alert_index_names';
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts
index d22daeba10ecb..ef36911a93530 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts
@@ -6,8 +6,8 @@
  */
 import { ALERT_DURATION, ALERT_REASON, ALERT_STATUS, TIMESTAMP } from '@kbn/rule-data-utils';
 import { EuiDataGridColumn } from '@elastic/eui';
+import type { ColumnHeaderOptions } from '@kbn/timelines-plugin/common';
 import { translations } from '../../../../config';
-import type { ColumnHeaderOptions } from '../../../../../../timelines/common';
 
 export const addDisplayNames = (
   column: Pick<EuiDataGridColumn, 'display' | 'displayAsText' | 'id' | 'initialWidth'> &
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx
index 9e76a1809d309..a151cfabf280b 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx
@@ -38,22 +38,24 @@ import styled from 'styled-components';
 import React, { Suspense, useMemo, useState, useCallback, useEffect } from 'react';
 
 import { pick } from 'lodash';
-import { getAlertsPermissions } from '../../../../hooks/use_alert_permission';
 import type {
   TGridType,
   TGridState,
   TGridModel,
   SortDirection,
-} from '../../../../../../timelines/public';
-
-import type { TopAlert } from '../alerts_page/alerts_page';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/timelines-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type {
   ActionProps,
   ColumnHeaderOptions,
   ControlColumnProps,
   RowRenderer,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
+import { CaseAttachments } from '@kbn/cases-plugin/public';
+import { CommentType } from '@kbn/cases-plugin/common';
+import { getAlertsPermissions } from '../../../../hooks/use_alert_permission';
+
+import type { TopAlert } from '../alerts_page/alerts_page';
 
 import { getRenderCellValue } from '../../components/render_cell_value';
 import { observabilityAppId, observabilityFeatureId } from '../../../../../common';
@@ -63,8 +65,6 @@ import { LazyAlertsFlyout } from '../../../..';
 import { parseAlert } from '../../components/parse_alert';
 import { translations, paths } from '../../../../config';
 import { addDisplayNames } from './add_display_names';
-import { CaseAttachments } from '../../../../../../cases/public';
-import { CommentType } from '../../../../../../cases/common';
 import { ADD_TO_EXISTING_CASE, ADD_TO_NEW_CASE } from './translations';
 import { ObservabilityAppServices } from '../../../../application/types';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx
index 02311833325f3..392340fc80b2d 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx
@@ -8,7 +8,7 @@
 import {
   createStateContainer,
   createStateContainerReactHelpers,
-} from '../../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
 interface AlertsPageContainerState {
   rangeFrom: string;
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx
index 0e6c6c7c7a20b..0b9fb864b098e 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx
@@ -8,13 +8,13 @@
 import { useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 
-import { TimefilterContract } from '../../../../../../../../src/plugins/data/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 import {
   createKbnUrlStateStorage,
   syncState,
   IKbnUrlStateStorage,
   useContainerSelector,
-} from '../../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { useTimefilterService } from '../../../../hooks/use_timefilter_service';
 
 import {
diff --git a/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx b/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx
index 9cb41a99404a5..8f5297c264f80 100644
--- a/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx
@@ -7,15 +7,12 @@
 
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { AppMountParameters } from 'kibana/public';
-import { CoreStart } from '../../../../../../src/core/public';
-import {
-  createKibanaReactContext,
-  KibanaPageTemplate,
-} from '../../../../../../src/plugins/kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { casesFeatureId } from '../../../common';
 import { PluginContext, PluginContextValue } from '../../context/plugin_context';
-import { CasesPage } from './';
+import { CasesPage } from '.';
 
 export default {
   title: 'app/Cases',
diff --git a/x-pack/plugins/observability/public/pages/cases/index.tsx b/x-pack/plugins/observability/public/pages/cases/index.tsx
index e50d8469c84bb..6567725de636b 100644
--- a/x-pack/plugins/observability/public/pages/cases/index.tsx
+++ b/x-pack/plugins/observability/public/pages/cases/index.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Cases } from './cases';
 
 import { CaseFeatureNoPermissions } from './feature_no_permissions';
@@ -15,7 +16,6 @@ import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useHasData } from '../../hooks/use_has_data';
 import { LoadingObservability } from '../overview/loading_observability';
 import { getNoDataConfig } from '../../utils/no_data_config';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../application/types';
 
 export const CasesPage = React.memo(() => {
diff --git a/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts b/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts
index 2ee585b4f81ad..ab917ac3af322 100644
--- a/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts
+++ b/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts
@@ -7,7 +7,7 @@
 
 import { useState, useMemo, useEffect } from 'react';
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useKibana } from '../../utils/kibana_react';
 
 type DataFetcher<T, R> = (params: T, ctrl: AbortController, http: HttpSetup) => Promise<R>;
diff --git a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts
index 1e47094be866c..ce1a5ed10a8e0 100644
--- a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts
+++ b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts
@@ -9,8 +9,8 @@ import { useCallback, useMemo } from 'react';
 import { isEmpty } from 'lodash';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { HttpSetup } from 'kibana/public';
-import { BASE_RAC_ALERTS_API_PATH } from '../../../../rule_registry/common/constants';
+import { HttpSetup } from '@kbn/core/public';
+import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/constants';
 import { useDataFetcher } from './use_data_fetcher';
 
 export const useFetchAlertData = (alertIds: string[]): [boolean, Record<string, unknown>] => {
diff --git a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts
index 4fe66a754056b..3bb13e063b18c 100644
--- a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts
+++ b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts
@@ -7,10 +7,10 @@
 import { useCallback, useMemo } from 'react';
 import { isEmpty } from 'lodash';
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/constants';
 import { usePluginContext } from '../../hooks/use_plugin_context';
-import { TopAlert, parseAlert } from '../../pages/alerts/';
-import { BASE_RAC_ALERTS_API_PATH } from '../../../../rule_registry/common/constants';
+import { TopAlert, parseAlert } from '../alerts';
 import { ObservabilityRuleTypeRegistry } from '../..';
 import { useDataFetcher } from './use_data_fetcher';
 
diff --git a/x-pack/plugins/observability/public/pages/home/index.test.tsx b/x-pack/plugins/observability/public/pages/home/index.test.tsx
index 60b3e809e7de9..acd8ad7faa97b 100644
--- a/x-pack/plugins/observability/public/pages/home/index.test.tsx
+++ b/x-pack/plugins/observability/public/pages/home/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { HasDataContextValue } from '../../context/has_data_context';
 import * as hasData from '../../hooks/use_has_data';
 import { render } from '../../utils/test_helper';
-import { HomePage } from './';
+import { HomePage } from '.';
 
 const mockHistoryPush = jest.fn();
 jest.mock('react-router-dom', () => ({
diff --git a/x-pack/plugins/observability/public/pages/landing/index.tsx b/x-pack/plugins/observability/public/pages/landing/index.tsx
index 3b00985e1a29a..2deb22010e7f9 100644
--- a/x-pack/plugins/observability/public/pages/landing/index.tsx
+++ b/x-pack/plugins/observability/public/pages/landing/index.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../application/types';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { usePluginContext } from '../../hooks/use_plugin_context';
diff --git a/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx b/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx
index 5078416a7d369..57a6310601190 100644
--- a/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx
@@ -8,10 +8,10 @@
 import { EuiPageTemplate } from '@elastic/eui';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { PluginContext, PluginContextValue } from '../../context/plugin_context';
-import { LandingPage } from './';
+import { LandingPage } from '.';
 
 export default {
   title: 'app/Landing',
diff --git a/x-pack/plugins/observability/public/pages/overview/empty_section.ts b/x-pack/plugins/observability/public/pages/overview/empty_section.ts
index d2050f159fc25..9e74ec482f50d 100644
--- a/x-pack/plugins/observability/public/pages/overview/empty_section.ts
+++ b/x-pack/plugins/observability/public/pages/overview/empty_section.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ISection } from '../../typings/section';
 
 export const getEmptySections = ({ http }: { http: HttpSetup }): ISection[] => {
diff --git a/x-pack/plugins/observability/public/pages/overview/index.test.tsx b/x-pack/plugins/observability/public/pages/overview/index.test.tsx
index 682f979f44ec5..45206e4440205 100644
--- a/x-pack/plugins/observability/public/pages/overview/index.test.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/index.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import * as PluginContext from '../../hooks/use_plugin_context';
 import { PluginContextValue } from '../../context/plugin_context';
-import { OverviewPage } from './';
+import { OverviewPage } from '.';
 import { OverviewPage as OldOverviewPage } from './old_overview_page';
 import { OverviewPage as NewOverviewPage } from './overview_page';
 
diff --git a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
index f396f594e0779..4afe1fe7dedb1 100644
--- a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
@@ -19,9 +19,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import React, { useMemo, useRef, useCallback, useState } from 'react';
+import React, { useMemo, useRef, useCallback, useState, useEffect } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { observabilityFeatureId } from '../../../common';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useTrackPageview, useUiTracker } from '../..';
 import { EmptySections } from '../../components/app/empty_sections';
 import { ObservabilityHeaderMenu } from '../../components/app/header';
@@ -52,6 +52,9 @@ interface Props {
   routeParams: RouteParams<'/overview'>;
 }
 export type BucketSize = ReturnType<typeof calculateBucketSize>;
+
+const CAPABILITIES_KEYS = ['logs', 'infrastructure', 'apm', 'uptime'];
+
 function calculateBucketSize({ start, end }: { start?: number; end?: number }) {
   if (start && end) {
     return getBucketSize({ start, end, minInterval: '60s' });
@@ -72,9 +75,14 @@ export function OverviewPage({ routeParams }: Props) {
   const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
 
   const indexNames = useAlertIndexNames();
-  const { cases, docLinks, http } = useKibana<ObservabilityAppServices>().services;
-  const { ObservabilityPageTemplate, config } = usePluginContext();
+  const {
+    cases,
+    docLinks,
+    http,
+    application: { capabilities },
+  } = useKibana<ObservabilityAppServices>().services;
 
+  const { ObservabilityPageTemplate, config } = usePluginContext();
   const { relativeStart, relativeEnd, absoluteStart, absoluteEnd } = useDatePickerContext();
 
   const { data: newsFeed } = useFetcher(() => getNewsFeed({ http }), [http]);
@@ -112,6 +120,20 @@ export function OverviewPage({ routeParams }: Props) {
   const CasesContext = cases.ui.getCasesContext();
   const userPermissions = useGetUserCasesPermissions();
 
+  useEffect(() => {
+    if (hasAnyData !== true) {
+      return;
+    }
+
+    CAPABILITIES_KEYS.forEach((feature) => {
+      if (capabilities[feature].show === false) {
+        trackMetric({
+          metric: `oblt_disabled_feature_${feature === 'infrastructure' ? 'metrics' : feature}`,
+        });
+      }
+    });
+  }, [capabilities, hasAnyData, trackMetric]);
+
   if (hasAnyData === undefined) {
     return <LoadingObservability />;
   }
diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
index 956dc76a8e2fe..b975e45ac06df 100644
--- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
@@ -7,14 +7,15 @@
 
 import { makeDecorator } from '@storybook/addons';
 import { storiesOf } from '@storybook/react';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { createKibanaReactContext, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { HasDataContextProvider } from '../../context/has_data_context';
 import { PluginContext } from '../../context/plugin_context';
 import { registerDataHandler, unregisterDataHandler } from '../../data_handler';
-import { OverviewPage } from './';
+import { OverviewPage } from '.';
 import { alertsFetchData } from './mock/alerts.mock';
 import { emptyResponse as emptyAPMResponse, fetchApmData } from './mock/apm.mock';
 import { emptyResponse as emptyLogsResponse, fetchLogsData } from './mock/logs.mock';
@@ -22,10 +23,6 @@ import { emptyResponse as emptyMetricsResponse, fetchMetricsData } from './mock/
 import { newsFeedFetchData } from './mock/news_feed.mock';
 import { emptyResponse as emptyUptimeResponse, fetchUptimeData } from './mock/uptime.mock';
 import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock';
-import {
-  createKibanaReactContext,
-  KibanaPageTemplate,
-} from '../../../../../../src/plugins/kibana_react/public';
 import { ApmIndicesConfig } from '../../../common/typings';
 
 function unregisterAll() {
diff --git a/x-pack/plugins/observability/public/pages/overview/overview_page.tsx b/x-pack/plugins/observability/public/pages/overview/overview_page.tsx
index 4d5622f99e8a8..7f81f71cf6683 100644
--- a/x-pack/plugins/observability/public/pages/overview/overview_page.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/overview_page.tsx
@@ -7,6 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { EuiButton, EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useTrackPageview } from '../..';
 import { DatePicker } from '../../components/shared/date_picker';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
@@ -17,7 +18,6 @@ import { RouteParams } from '../../routes';
 import { getNoDataConfig } from '../../utils/no_data_config';
 import { LoadingObservability } from './loading_observability';
 import { ObservabilityStatus } from '../../components/app/observability_status';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../application/types';
 
 interface Props {
diff --git a/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx b/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx
index b09d31ba59c78..61eec8b8c3ea8 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx
@@ -7,7 +7,7 @@
 
 import { EuiConfirmModal } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useKibana } from '../../../utils/kibana_react';
 import {
   confirmModalText,
diff --git a/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx b/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx
index 6bb1e0865fccc..81dfe9ebd1606 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiHealth, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { RuleExecutionStatusErrorReasons } from '../../../../../alerting/common';
+import { RuleExecutionStatusErrorReasons } from '@kbn/alerting-plugin/common';
 import { getHealthColor, rulesStatusesTranslationsMapping } from '../config';
 import { RULE_STATUS_LICENSE_ERROR } from '../translations';
 import { ExecutionStatusProps } from '../types';
diff --git a/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx b/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx
index 1ed2b681bfe2c..d7154c47fecf7 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx
@@ -16,7 +16,7 @@ import {
   EuiFilterSelectItem,
   EuiHealth,
 } from '@elastic/eui';
-import { RuleExecutionStatuses, RuleExecutionStatusValues } from '../../../../../alerting/common';
+import { RuleExecutionStatuses, RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { getHealthColor, rulesStatusesTranslationsMapping } from '../config';
 import { StatusFilterProps } from '../types';
 
diff --git a/x-pack/plugins/observability/public/pages/rules/components/prompts/no_data_prompt.tsx b/x-pack/plugins/observability/public/pages/rules/components/prompts/no_data_prompt.tsx
index b9c0e24160004..bacc311357fd7 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/prompts/no_data_prompt.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/prompts/no_data_prompt.tsx
@@ -58,7 +58,7 @@ export function NoDataPrompt({
             />
           </EuiButton>,
           <EuiButtonEmpty color="primary">
-            <EuiLink href={documentationLink} target="_blank">
+            <EuiLink data-test-subj="documentationLink" href={documentationLink} target="_blank">
               Documentation
             </EuiLink>
           </EuiButtonEmpty>,
diff --git a/x-pack/plugins/observability/public/pages/rules/components/prompts/no_permission_prompt.tsx b/x-pack/plugins/observability/public/pages/rules/components/prompts/no_permission_prompt.tsx
index edfe1c6840d8b..7201e0cc45d16 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/prompts/no_permission_prompt.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/prompts/no_permission_prompt.tsx
@@ -19,6 +19,7 @@ export function NoPermissionPrompt() {
       }}
     >
       <EuiEmptyPrompt
+        data-test-subj="noPermissionPrompt"
         color="plain"
         hasBorder={true}
         iconType="securityApp"
diff --git a/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx b/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx
index db1febf8d3edd..2909121aa8cd4 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx
@@ -6,8 +6,8 @@
  */
 import React, { useCallback } from 'react';
 import { EuiBasicTable, EuiSpacer, EuiTableSortingType } from '@elastic/eui';
+import { RuleTableItem } from '@kbn/triggers-actions-ui-plugin/public';
 import { RulesTableProps } from '../types';
-import { RuleTableItem } from '../../../../../triggers_actions_ui/public';
 
 export interface Pagination {
   index: number;
diff --git a/x-pack/plugins/observability/public/pages/rules/config.ts b/x-pack/plugins/observability/public/pages/rules/config.ts
index bd4e95638a072..9da846c2c1cc4 100644
--- a/x-pack/plugins/observability/public/pages/rules/config.ts
+++ b/x-pack/plugins/observability/public/pages/rules/config.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { RuleExecutionStatuses } from '@kbn/alerting-plugin/common';
+import { Rule, RuleTypeIndex, RuleType } from '@kbn/triggers-actions-ui-plugin/public';
 import { Status, RuleStatus } from './types';
 import {
   RULE_STATUS_OK,
@@ -17,8 +19,6 @@ import {
   RULE_STATUS_DISABLED,
   RULE_STATUS_SNOOZED_INDEFINITELY,
 } from './translations';
-import { RuleExecutionStatuses } from '../../../../alerting/common';
-import { Rule, RuleTypeIndex, RuleType } from '../../../../triggers_actions_ui/public';
 
 export const statusMap: Status = {
   [RuleStatus.enabled]: {
diff --git a/x-pack/plugins/observability/public/pages/rules/index.test.tsx b/x-pack/plugins/observability/public/pages/rules/index.test.tsx
new file mode 100644
index 0000000000000..ac31587d74702
--- /dev/null
+++ b/x-pack/plugins/observability/public/pages/rules/index.test.tsx
@@ -0,0 +1,559 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
+import { act } from 'react-dom/test-utils';
+import { ReactWrapper } from 'enzyme';
+import { RulesPage } from '.';
+import { RulesTable } from './components/rules_table';
+import { kibanaStartMock } from '../../utils/kibana_react.mock';
+import * as pluginContext from '../../hooks/use_plugin_context';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock';
+import { AppMountParameters } from '@kbn/core/public';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
+import { RuleState } from './types';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
+
+const mockUseKibanaReturnValue = kibanaStartMock.startContract();
+
+jest.mock('../../utils/kibana_react', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => mockUseKibanaReturnValue),
+}));
+
+jest.mock('../../hooks/use_breadcrumbs', () => ({
+  useBreadcrumbs: jest.fn(),
+}));
+
+jest.mock('../../hooks/use_fetch_rules', () => ({
+  useFetchRules: jest.fn(),
+}));
+
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => ({
+  useLoadRuleTypes: jest.fn(),
+}));
+
+jest.spyOn(pluginContext, 'usePluginContext').mockImplementation(() => ({
+  appMountParameters: {} as AppMountParameters,
+  config: {
+    unsafe: {
+      alertingExperience: { enabled: true },
+      cases: { enabled: true },
+      overviewNext: { enabled: false },
+      rules: { enabled: true },
+    },
+  },
+  observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(),
+  ObservabilityPageTemplate: KibanaPageTemplate,
+  kibanaFeatures: [],
+}));
+
+const { useFetchRules } = jest.requireMock('../../hooks/use_fetch_rules');
+const { useLoadRuleTypes } = jest.requireMock('@kbn/triggers-actions-ui-plugin/public');
+
+describe('empty RulesPage', () => {
+  let wrapper: ReactWrapper<any>;
+  async function setup() {
+    const rulesState: RuleState = {
+      isLoading: false,
+      data: [],
+      error: null,
+      totalItemCount: 0,
+    };
+
+    useLoadRuleTypes.mockReturnValue({
+      ruleTypes: [
+        {
+          id: 'test_rule_type',
+          name: 'some rule type',
+          actionGroups: [{ id: 'default', name: 'Default' }],
+          recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
+          actionVariables: { context: [], state: [] },
+          defaultActionGroupId: 'default',
+          producer: ALERTS_FEATURE_ID,
+          minimumLicenseRequired: 'basic',
+          enabledInLicense: true,
+          authorizedConsumers: {
+            [ALERTS_FEATURE_ID]: { read: true, all: true },
+          },
+          ruleTaskTimeout: '1m',
+        },
+      ],
+    });
+    useFetchRules.mockReturnValue({ rulesState, noData: true });
+    wrapper = mountWithIntl(<RulesPage />);
+  }
+  it('renders empty screen', async () => {
+    await setup();
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+    expect(wrapper.find(RulesTable).exists()).toBe(false);
+    expect(wrapper.find('[data-test-subj="createFirstRuleEmptyPrompt"]').exists()).toBeTruthy();
+  });
+  it('renders Create rule button', async () => {
+    await setup();
+    expect(wrapper.find('EuiButton[data-test-subj="createFirstRuleButton"]')).toHaveLength(1);
+  });
+  it('renders Documentation link', async () => {
+    await setup();
+    expect(wrapper.find('EuiLink[data-test-subj="documentationLink"]')).toHaveLength(1);
+    expect(
+      wrapper.find('EuiLink[data-test-subj="documentationLink"]').getElement().props.href
+    ).toContain('create-alerts.html');
+  });
+});
+
+describe('empty RulesPage with show only capability', () => {
+  let wrapper: ReactWrapper<any>;
+  async function setup() {
+    const rulesState: RuleState = {
+      isLoading: false,
+      data: [],
+      error: null,
+      totalItemCount: 0,
+    };
+    const ruleTypes = [
+      {
+        id: 'test_rule_type',
+        name: 'some rule type',
+        actionGroups: [{ id: 'default', name: 'Default' }],
+        recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
+        actionVariables: { context: [], state: [] },
+        defaultActionGroupId: 'default',
+        producer: ALERTS_FEATURE_ID,
+        minimumLicenseRequired: 'basic',
+        enabledInLicense: true,
+        authorizedConsumers: {
+          [ALERTS_FEATURE_ID]: { read: true, all: false },
+        },
+        ruleTaskTimeout: '1m',
+      },
+    ];
+    useFetchRules.mockReturnValue({ rulesState, noData: true });
+    useLoadRuleTypes.mockReturnValue({ ruleTypes });
+
+    wrapper = mountWithIntl(<RulesPage />);
+  }
+
+  it('renders no permission screen', async () => {
+    await setup();
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="noPermissionPrompt"]').exists()).toBeTruthy();
+  });
+
+  it('does not render no data screen', async () => {
+    await setup();
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+    expect(wrapper.find('[data-test-subj="createFirstRuleEmptyPrompt"]').exists()).toBeFalsy();
+  });
+});
+
+describe('RulesPage with items', () => {
+  let wrapper: ReactWrapper<any>;
+  async function setup() {
+    const mockedRulesData: Rule[] = [
+      {
+        id: '1',
+        name: 'test rule',
+        tags: ['tag1'],
+        enabled: true,
+        ruleTypeId: 'test_rule_type',
+        schedule: { interval: '1s' },
+        actions: [],
+        params: { name: 'test rule type name' },
+        createdBy: null,
+        updatedBy: null,
+        apiKeyOwner: null,
+        throttle: '1m',
+        muteAll: false,
+        mutedInstanceIds: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        consumer: 'alerts',
+        notifyWhen: 'onActiveAlert',
+        executionStatus: {
+          status: 'active',
+          lastDuration: 500,
+          lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+        },
+        monitoring: {
+          execution: {
+            history: [
+              {
+                success: true,
+                duration: 1000000,
+                timestamp: 1234567,
+              },
+              {
+                success: true,
+                duration: 200000,
+                timestamp: 1234567,
+              },
+              {
+                success: false,
+                duration: 300000,
+                timestamp: 1234567,
+              },
+            ],
+            calculated_metrics: {
+              success_ratio: 0.66,
+              p50: 200000,
+              p95: 300000,
+              p99: 300000,
+            },
+          },
+        },
+      },
+      {
+        id: '2',
+        name: 'test rule ok',
+        tags: ['tag1'],
+        enabled: true,
+        ruleTypeId: 'test_rule_type',
+        schedule: { interval: '5d' },
+        actions: [],
+        params: { name: 'test rule type name' },
+        createdBy: null,
+        updatedBy: null,
+        apiKeyOwner: null,
+        throttle: '1m',
+        muteAll: false,
+        mutedInstanceIds: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        consumer: 'alerts',
+        notifyWhen: 'onActiveAlert',
+        executionStatus: {
+          status: 'ok',
+          lastDuration: 61000,
+          lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+          error: undefined,
+        },
+        monitoring: {
+          execution: {
+            history: [
+              {
+                success: true,
+                duration: 100000,
+                timestamp: 1234567,
+              },
+              {
+                success: true,
+                duration: 500000,
+                timestamp: 1234567,
+              },
+            ],
+            calculated_metrics: {
+              success_ratio: 1,
+              p50: 0,
+              p95: 100000,
+              p99: 500000,
+            },
+          },
+        },
+      },
+      {
+        id: '3',
+        name: 'test rule pending',
+        tags: ['tag1'],
+        enabled: true,
+        ruleTypeId: 'test_rule_type',
+        schedule: { interval: '5d' },
+        actions: [],
+        params: { name: 'test rule type name' },
+        createdBy: null,
+        updatedBy: null,
+        apiKeyOwner: null,
+        throttle: '1m',
+        muteAll: false,
+        mutedInstanceIds: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        consumer: 'alerts',
+        notifyWhen: 'onActiveAlert',
+        executionStatus: {
+          status: 'pending',
+          lastDuration: 30234,
+          lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+        },
+        monitoring: {
+          execution: {
+            history: [{ success: false, duration: 100, timestamp: 1234567 }],
+            calculated_metrics: {
+              success_ratio: 0,
+            },
+          },
+        },
+      },
+    ];
+
+    const rulesState: RuleState = {
+      isLoading: false,
+      data: mockedRulesData,
+      error: null,
+      totalItemCount: 3,
+    };
+
+    const mockedRuleTypeIndex = new Map(
+      Object.entries({
+        '1': {
+          enabledInLicense: true,
+          id: '1',
+          name: 'test rule',
+        },
+        '2': {
+          enabledInLicense: true,
+          id: '2',
+          name: 'test rule ok',
+        },
+        '3': {
+          enabledInLicense: true,
+          id: '3',
+          name: 'test rule pending',
+        },
+      })
+    );
+    const ruleTypes = [
+      {
+        id: 'test_rule_type',
+        name: 'some rule type',
+        actionGroups: [{ id: 'default', name: 'Default' }],
+        recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
+        actionVariables: { context: [], state: [] },
+        defaultActionGroupId: 'default',
+        producer: ALERTS_FEATURE_ID,
+        minimumLicenseRequired: 'basic',
+        enabledInLicense: true,
+        authorizedConsumers: {
+          [ALERTS_FEATURE_ID]: { read: true, all: false },
+        },
+        ruleTaskTimeout: '1m',
+      },
+    ];
+    useLoadRuleTypes.mockReturnValue({
+      ruleTypes,
+      ruleTypeIndex: mockedRuleTypeIndex,
+    });
+    useFetchRules.mockReturnValue({ rulesState });
+    wrapper = mountWithIntl(<RulesPage />);
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+  }
+
+  it('renders table of rules', async () => {
+    await setup();
+    expect(wrapper.find(RulesTable).exists()).toBe(true);
+  });
+});
+
+describe('RulesPage with items and show only capability', () => {
+  let wrapper: ReactWrapper<any>;
+  async function setup() {
+    const mockedRulesData: Rule[] = [
+      {
+        id: '1',
+        name: 'test rule',
+        tags: ['tag1'],
+        enabled: true,
+        ruleTypeId: 'test_rule_type',
+        schedule: { interval: '1s' },
+        actions: [],
+        params: { name: 'test rule type name' },
+        createdBy: null,
+        updatedBy: null,
+        apiKeyOwner: null,
+        throttle: '1m',
+        muteAll: false,
+        mutedInstanceIds: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        consumer: 'alerts',
+        notifyWhen: 'onActiveAlert',
+        executionStatus: {
+          status: 'active',
+          lastDuration: 500,
+          lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+        },
+        monitoring: {
+          execution: {
+            history: [
+              {
+                success: true,
+                duration: 1000000,
+                timestamp: 1234567,
+              },
+              {
+                success: true,
+                duration: 200000,
+                timestamp: 1234567,
+              },
+              {
+                success: false,
+                duration: 300000,
+                timestamp: 1234567,
+              },
+            ],
+            calculated_metrics: {
+              success_ratio: 0.66,
+              p50: 200000,
+              p95: 300000,
+              p99: 300000,
+            },
+          },
+        },
+      },
+      {
+        id: '2',
+        name: 'test rule ok',
+        tags: ['tag1'],
+        enabled: true,
+        ruleTypeId: 'test_rule_type',
+        schedule: { interval: '5d' },
+        actions: [],
+        params: { name: 'test rule type name' },
+        createdBy: null,
+        updatedBy: null,
+        apiKeyOwner: null,
+        throttle: '1m',
+        muteAll: false,
+        mutedInstanceIds: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        consumer: 'alerts',
+        notifyWhen: 'onActiveAlert',
+        executionStatus: {
+          status: 'ok',
+          lastDuration: 61000,
+          lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+        },
+        monitoring: {
+          execution: {
+            history: [
+              {
+                success: true,
+                duration: 100000,
+                timestamp: 1234567,
+              },
+              {
+                success: true,
+                duration: 500000,
+                timestamp: 1234567,
+              },
+            ],
+            calculated_metrics: {
+              success_ratio: 1,
+              p50: 0,
+              p95: 100000,
+              p99: 500000,
+            },
+          },
+        },
+      },
+      {
+        id: '3',
+        name: 'test rule pending',
+        tags: ['tag1'],
+        enabled: true,
+        ruleTypeId: 'test_rule_type',
+        schedule: { interval: '5d' },
+        actions: [],
+        params: { name: 'test rule type name' },
+        createdBy: null,
+        updatedBy: null,
+        apiKeyOwner: null,
+        throttle: '1m',
+        muteAll: false,
+        mutedInstanceIds: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        consumer: 'alerts',
+        notifyWhen: 'onActiveAlert',
+        executionStatus: {
+          status: 'pending',
+          lastDuration: 30234,
+          lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+        },
+        monitoring: {
+          execution: {
+            history: [{ success: false, duration: 100, timestamp: 1234567 }],
+            calculated_metrics: {
+              success_ratio: 0,
+            },
+          },
+        },
+      },
+    ];
+    const rulesState: RuleState = {
+      isLoading: false,
+      data: mockedRulesData,
+      error: null,
+      totalItemCount: 3,
+    };
+    useFetchRules.mockReturnValue({ rulesState });
+
+    const mockedRuleTypeIndex = new Map(
+      Object.entries({
+        '1': {
+          enabledInLicense: true,
+          id: '1',
+          name: 'test rule',
+        },
+        '2': {
+          enabledInLicense: true,
+          id: '2',
+          name: 'test rule ok',
+        },
+        '3': {
+          enabledInLicense: true,
+          id: '3',
+          name: 'test rule pending',
+        },
+      })
+    );
+    const ruleTypes = [
+      {
+        id: 'test_rule_type',
+        name: 'some rule type',
+        actionGroups: [{ id: 'default', name: 'Default' }],
+        recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
+        actionVariables: { context: [], state: [] },
+        defaultActionGroupId: 'default',
+        producer: ALERTS_FEATURE_ID,
+        minimumLicenseRequired: 'basic',
+        enabledInLicense: true,
+        authorizedConsumers: {
+          [ALERTS_FEATURE_ID]: { read: true, all: false },
+        },
+        ruleTaskTimeout: '1m',
+      },
+    ];
+    useLoadRuleTypes.mockReturnValue({ ruleTypes, ruleTypeIndex: mockedRuleTypeIndex });
+
+    wrapper = mountWithIntl(<RulesPage />);
+  }
+
+  it('does not render create rule button', async () => {
+    await setup();
+    expect(wrapper.find('[data-test-subj="createRuleButton"]')).toHaveLength(0);
+  });
+});
diff --git a/x-pack/plugins/observability/public/pages/rules/index.tsx b/x-pack/plugins/observability/public/pages/rules/index.tsx
index 02137f13e3ebd..b161625379fd8 100644
--- a/x-pack/plugins/observability/public/pages/rules/index.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState, useMemo, useEffect } from 'react';
+import React, { useState, useMemo } from 'react';
 import { capitalize, sortBy } from 'lodash';
 import {
   EuiButton,
@@ -15,13 +15,21 @@ import {
   EuiButtonEmpty,
   EuiText,
   EuiHorizontalRule,
-  EuiAutoRefreshButton,
   EuiTableSortingType,
   EuiFieldSearch,
-  OnRefreshChangeProps,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import {
+  deleteRules,
+  RuleTableItem,
+  enableRule,
+  disableRule,
+  muteRule,
+  useLoadRuleTypes,
+  unmuteRule,
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleExecutionStatus, ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { useKibana } from '../../utils/kibana_react';
@@ -38,16 +46,6 @@ import { DeleteModalConfirmation } from './components/delete_modal_confirmation'
 import { NoDataPrompt } from './components/prompts/no_data_prompt';
 import { NoPermissionPrompt } from './components/prompts/no_permission_prompt';
 import { CenterJustifiedSpinner } from './components/center_justified_spinner';
-import {
-  deleteRules,
-  RuleTableItem,
-  enableRule,
-  disableRule,
-  muteRule,
-  useLoadRuleTypes,
-  unmuteRule,
-} from '../../../../triggers_actions_ui/public';
-import { RuleExecutionStatus, ALERTS_FEATURE_ID } from '../../../../alerting/common';
 import { Pagination } from './types';
 import {
   DEFAULT_SEARCH_PAGE_SIZE,
@@ -83,7 +81,7 @@ export function RulesPage() {
     application: { capabilities },
     notifications: { toasts },
   } = useKibana().services;
-  const documentationLink = docLinks.links.alerting.guide;
+  const documentationLink = docLinks.links.observability.createAlerts;
   const ruleTypeRegistry = triggersActionsUi.ruleTypeRegistry;
   const canExecuteActions = hasExecuteActionsCapability(capabilities);
   const [page, setPage] = useState<Pagination>({ index: 0, size: DEFAULT_SEARCH_PAGE_SIZE });
@@ -93,8 +91,6 @@ export function RulesPage() {
   });
   const [inputText, setInputText] = useState<string | undefined>();
   const [searchText, setSearchText] = useState<string | undefined>();
-  const [refreshInterval, setRefreshInterval] = useState(60000);
-  const [isPaused, setIsPaused] = useState(false);
   const [ruleLastResponseFilter, setRuleLastResponseFilter] = useState<string[]>([]);
   const [typesFilter, setTypesFilter] = useState<string[]>([]);
   const [currentRuleToEdit, setCurrentRuleToEdit] = useState<RuleTableItem | null>(null);
@@ -108,14 +104,6 @@ export function RulesPage() {
     setCurrentRuleToEdit(ruleItem);
   };
 
-  const onRefreshChange = ({
-    isPaused: isPausedChanged,
-    refreshInterval: refreshIntervalChanged,
-  }: OnRefreshChangeProps) => {
-    setIsPaused(isPausedChanged);
-    setRefreshInterval(refreshIntervalChanged);
-  };
-
   const { rulesState, setRulesState, reload, noData, initialLoad } = useFetchRules({
     searchText,
     ruleLastResponseFilter,
@@ -160,15 +148,6 @@ export function RulesPage() {
     (ruleType) => ruleType.authorizedConsumers[ALERTS_FEATURE_ID]?.all
   );
 
-  useEffect(() => {
-    const interval = setInterval(() => {
-      if (!isPaused) {
-        reload();
-      }
-    }, refreshInterval);
-    return () => clearInterval(interval);
-  }, [refreshInterval, reload, isPaused]);
-
   useBreadcrumbs([
     {
       text: i18n.translate('xpack.observability.breadcrumbs.alertsLinkText', {
@@ -368,14 +347,6 @@ export function RulesPage() {
               />
             </EuiText>
           </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiAutoRefreshButton
-              isPaused={isPaused}
-              refreshInterval={refreshInterval}
-              onRefreshChange={onRefreshChange}
-              shortHand
-            />
-          </EuiFlexItem>
         </EuiFlexGroup>
         <EuiHorizontalRule margin="xs" />
         <EuiFlexGroup direction="column" gutterSize="s">
diff --git a/x-pack/plugins/observability/public/pages/rules/types.ts b/x-pack/plugins/observability/public/pages/rules/types.ts
index 1854713e6f913..cbcd97919cddc 100644
--- a/x-pack/plugins/observability/public/pages/rules/types.ts
+++ b/x-pack/plugins/observability/public/pages/rules/types.ts
@@ -6,8 +6,8 @@
  */
 import { Dispatch, SetStateAction } from 'react';
 import { EuiTableSortingType, EuiBasicTableColumn } from '@elastic/eui';
-import { RuleExecutionStatus } from '../../../../alerting/common';
-import { RuleTableItem, Rule } from '../../../../triggers_actions_ui/public';
+import { RuleExecutionStatus } from '@kbn/alerting-plugin/common';
+import { RuleTableItem, Rule } from '@kbn/triggers-actions-ui-plugin/public';
 export interface StatusProps {
   type: RuleStatus;
   disabled: boolean;
@@ -85,3 +85,10 @@ export interface RulesTableProps {
   onSortChange: (changedSort: EuiTableSortingType<RuleTableItem>['sort']) => void;
   isLoading: boolean;
 }
+
+export interface RuleState {
+  isLoading: boolean;
+  data: Rule[];
+  error: string | null;
+  totalItemCount: number;
+}
diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts
index 2fe097cf8eb10..a19c5dfa0c3ce 100644
--- a/x-pack/plugins/observability/public/plugin.ts
+++ b/x-pack/plugins/observability/public/plugin.ts
@@ -8,7 +8,6 @@
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject, from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ConfigSchema } from '.';
 import {
   AppDeepLink,
   AppMountParameters,
@@ -19,25 +18,21 @@ import {
   DEFAULT_APP_CATEGORIES,
   Plugin as PluginClass,
   PluginInitializerContext,
-} from '../../../../src/core/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
-import type { DiscoverStart } from '../../../../src/plugins/discover/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { FeaturesPluginStart } from '../../features/public';
-import type {
-  HomePublicPluginSetup,
-  HomePublicPluginStart,
-} from '../../../../src/plugins/home/public';
-import { CasesDeepLinkId, CasesUiStart, getCasesDeepLinks } from '../../cases/public';
-import type { LensPublicStart } from '../../lens/public';
+} from '@kbn/core/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { CasesDeepLinkId, CasesUiStart, getCasesDeepLinks } from '@kbn/cases-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { ConfigSchema } from '.';
 import { observabilityAppId, observabilityFeatureId, casesPath } from '../common';
 import { createLazyObservabilityPageTemplate } from './components/shared';
 import { registerDataHandler } from './data_handler';
@@ -49,7 +44,6 @@ import { getExploratoryViewEmbeddable } from './components/shared/exploratory_vi
 import { createExploratoryViewUrl } from './components/shared/exploratory_view/configurations/utils';
 import { createUseRulesLink } from './hooks/create_use_rules_link';
 import getAppDataView from './utils/observability_data_views/get_app_data_view';
-import { KibanaFeature } from '../../features/common';
 
 export type ObservabilityPublicSetup = ReturnType<Plugin['setup']>;
 
diff --git a/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts b/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts
index 07d18eb8083d0..5612601ebd803 100644
--- a/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts
+++ b/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts
@@ -9,8 +9,8 @@ import {
   RuleTypeModel,
   RuleTypeParams,
   RuleTypeRegistryContract,
-} from '../../../triggers_actions_ui/public';
-import { ParsedTechnicalFields } from '../../../rule_registry/common/parse_technical_fields';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
 import { AsDuration, AsPercent } from '../../common/utils/formatters';
 
 export type ObservabilityRuleTypeFormatter = (options: {
diff --git a/x-pack/plugins/observability/public/services/call_observability_api/index.ts b/x-pack/plugins/observability/public/services/call_observability_api/index.ts
index 9cb17373bfe48..881ea80a4de47 100644
--- a/x-pack/plugins/observability/public/services/call_observability_api/index.ts
+++ b/x-pack/plugins/observability/public/services/call_observability_api/index.ts
@@ -8,7 +8,7 @@
 // @ts-expect-error
 import { formatRequest } from '@kbn/server-route-repository/target_node/format_request';
 import type { formatRequest as formatRequestType } from '@kbn/server-route-repository/target_types/format_request';
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 import type { AbstractObservabilityClient, ObservabilityClient } from './types';
 
 export let callObservabilityApi: ObservabilityClient = () => {
diff --git a/x-pack/plugins/observability/public/services/call_observability_api/types.ts b/x-pack/plugins/observability/public/services/call_observability_api/types.ts
index f517772821f42..014688826ada7 100644
--- a/x-pack/plugins/observability/public/services/call_observability_api/types.ts
+++ b/x-pack/plugins/observability/public/services/call_observability_api/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { RouteRepositoryClient } from '@kbn/server-route-repository';
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 import type {
   AbstractObservabilityServerRouteRepository,
   ObservabilityServerRouteRepository,
diff --git a/x-pack/plugins/observability/public/services/get_news_feed.test.ts b/x-pack/plugins/observability/public/services/get_news_feed.test.ts
index f7b3b90b09a4b..3a35e87166720 100644
--- a/x-pack/plugins/observability/public/services/get_news_feed.test.ts
+++ b/x-pack/plugins/observability/public/services/get_news_feed.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getNewsFeed } from './get_news_feed';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 describe('getNewsFeed', () => {
   const originalConsole = global.console;
diff --git a/x-pack/plugins/observability/public/services/get_news_feed.ts b/x-pack/plugins/observability/public/services/get_news_feed.ts
index 58a9d0e3048c5..31c7c6cd30ea8 100644
--- a/x-pack/plugins/observability/public/services/get_news_feed.ts
+++ b/x-pack/plugins/observability/public/services/get_news_feed.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 
 export interface NewsItem {
   title: { en: string };
diff --git a/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts b/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts
index 466f802913cb7..f7e550f4a3c5f 100644
--- a/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts
+++ b/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 import { getObservabilityAlerts } from './get_observability_alerts';
 
 const basePath = { prepend: (path: string) => path };
diff --git a/x-pack/plugins/observability/public/services/get_observability_alerts.ts b/x-pack/plugins/observability/public/services/get_observability_alerts.ts
index bb9f2080b9dad..57cc6cec10c83 100644
--- a/x-pack/plugins/observability/public/services/get_observability_alerts.ts
+++ b/x-pack/plugins/observability/public/services/get_observability_alerts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'kibana/public';
-import { Rule } from '../../../alerting/common';
+import type { HttpSetup } from '@kbn/core/public';
+import { Rule } from '@kbn/alerting-plugin/common';
 
 const allowedConsumers = ['apm', 'uptime', 'logs', 'infrastructure', 'alerts'];
 
diff --git a/x-pack/plugins/observability/public/update_global_navigation.test.tsx b/x-pack/plugins/observability/public/update_global_navigation.test.tsx
index f575771e1bafe..abbfc7e0e8ba2 100644
--- a/x-pack/plugins/observability/public/update_global_navigation.test.tsx
+++ b/x-pack/plugins/observability/public/update_global_navigation.test.tsx
@@ -7,13 +7,7 @@
 
 import { Subject } from 'rxjs';
 import { ConfigSchema } from '.';
-import {
-  App,
-  AppDeepLink,
-  ApplicationStart,
-  AppNavLinkStatus,
-  AppUpdater,
-} from '../../../../src/core/public';
+import { App, AppDeepLink, ApplicationStart, AppNavLinkStatus, AppUpdater } from '@kbn/core/public';
 import { casesFeatureId } from '../common';
 import { updateGlobalNavigation } from './update_global_navigation';
 
diff --git a/x-pack/plugins/observability/public/update_global_navigation.tsx b/x-pack/plugins/observability/public/update_global_navigation.tsx
index 3e720ac170e8b..ce4ba47065ea4 100644
--- a/x-pack/plugins/observability/public/update_global_navigation.tsx
+++ b/x-pack/plugins/observability/public/update_global_navigation.tsx
@@ -6,14 +6,9 @@
  */
 
 import { Subject } from 'rxjs';
+import { AppNavLinkStatus, AppUpdater, ApplicationStart, AppDeepLink } from '@kbn/core/public';
+import { CasesDeepLinkId } from '@kbn/cases-plugin/public';
 import { ConfigSchema } from '.';
-import {
-  AppNavLinkStatus,
-  AppUpdater,
-  ApplicationStart,
-  AppDeepLink,
-} from '../../../../src/core/public';
-import { CasesDeepLinkId } from '../../cases/public';
 import { casesFeatureId } from '../common';
 
 export function updateGlobalNavigation({
diff --git a/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts b/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts
index 461afab6233f2..e91b6b44dee7f 100644
--- a/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts
+++ b/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getBucketSize } from './index';
+import { getBucketSize } from '.';
 import moment from 'moment';
 
 describe('getBuckets', () => {
diff --git a/x-pack/plugins/observability/public/utils/kibana_react.mock.ts b/x-pack/plugins/observability/public/utils/kibana_react.mock.ts
index 5cb00169abfb9..54de7f25f12d7 100644
--- a/x-pack/plugins/observability/public/utils/kibana_react.mock.ts
+++ b/x-pack/plugins/observability/public/utils/kibana_react.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, notificationServiceMock, overlayServiceMock } from 'src/core/public/mocks';
+import { coreMock, notificationServiceMock, overlayServiceMock } from '@kbn/core/public/mocks';
 import { observabilityPublicPluginsStartMock } from '../observability_public_plugins_start.mock';
 
 export const kibanaStartMock = {
diff --git a/x-pack/plugins/observability/public/utils/kibana_react.ts b/x-pack/plugins/observability/public/utils/kibana_react.ts
index 532003e30a160..baf0f7d674015 100644
--- a/x-pack/plugins/observability/public/utils/kibana_react.ts
+++ b/x-pack/plugins/observability/public/utils/kibana_react.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../plugin';
 
 export type StartServices = CoreStart &
diff --git a/x-pack/plugins/observability/public/utils/no_data_config.ts b/x-pack/plugins/observability/public/utils/no_data_config.ts
index fdd70401e7097..dd22a0055ee6c 100644
--- a/x-pack/plugins/observability/public/utils/no_data_config.ts
+++ b/x-pack/plugins/observability/public/utils/no_data_config.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IBasePath } from '../../../../../src/core/public';
-import { KibanaPageTemplateProps } from '../../../../../src/plugins/kibana_react/public';
+import { IBasePath } from '@kbn/core/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 
 export function getNoDataConfig({
   docsLink,
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts b/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts
index 4b4b03412c0c7..4b3af576f6d0d 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { AppDataType } from '../../components/shared/exploratory_view/types';
-import type { DataViewsPublicPluginStart } from '../../../../../../src/plugins/data_views/public';
 
 const getAppDataView = (data: DataViewsPublicPluginStart) => {
   return async (appId: AppDataType, indexPattern?: string) => {
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
index eb7df98da599b..e1d930d539842 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
@@ -7,7 +7,7 @@
 
 import { dataViewList, ObservabilityDataViews } from './observability_data_views';
 import { mockCore, mockDataView } from '../../components/shared/exploratory_view/rtl_helpers';
-import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 
 const fieldFormats = {
   'transaction.duration.us': {
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
index 4d4a4fc2cc353..bc88769db43bf 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { FieldFormat as IFieldFormat } from 'src/plugins/field_formats/common';
-import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/public';
+import type { FieldFormat as IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import type {
   DataViewsPublicPluginStart,
   DataView,
   DataViewSpec,
-} from '../../../../../../src/plugins/data_views/public';
+} from '@kbn/data-views-plugin/public';
 import { rumFieldFormats } from '../../components/shared/exploratory_view/configurations/rum/field_formats';
 import { syntheticsFieldFormats } from '../../components/shared/exploratory_view/configurations/synthetics/field_formats';
 import {
diff --git a/x-pack/plugins/observability/public/utils/test_helper.tsx b/x-pack/plugins/observability/public/utils/test_helper.tsx
index b8d16f481c499..d5607b5ee8b48 100644
--- a/x-pack/plugins/observability/public/utils/test_helper.tsx
+++ b/x-pack/plugins/observability/public/utils/test_helper.tsx
@@ -6,18 +6,15 @@
  */
 
 import { render as testLibRender } from '@testing-library/react';
-import { AppMountParameters } from 'kibana/public';
-import { coreMock } from 'src/core/public/mocks';
+import { AppMountParameters } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import React from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import {
-  KibanaContextProvider,
-  KibanaPageTemplate,
-} from '../../../../../src/plugins/kibana_react/public';
-import translations from '../../../translations/translations/ja-JP.json';
+import { KibanaContextProvider, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import translations from '@kbn/translations-plugin/translations/ja-JP.json';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { PluginContext } from '../context/plugin_context';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
 import { createObservabilityRuleTypeRegistryMock } from '../rules/observability_rule_type_registry_mock';
 
 const appMountParameters = { setHeaderActionMenu: () => {} } as unknown as AppMountParameters;
diff --git a/x-pack/plugins/observability/public/utils/url.ts b/x-pack/plugins/observability/public/utils/url.ts
index c6507ab762244..5dda5ce95c6e5 100644
--- a/x-pack/plugins/observability/public/utils/url.ts
+++ b/x-pack/plugins/observability/public/utils/url.ts
@@ -6,7 +6,7 @@
  */
 
 import { parse, stringify } from 'query-string';
-import { url } from '../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 export function toQuery(search?: string) {
   return search ? parse(search.slice(1), { sort: false }) : {};
diff --git a/x-pack/plugins/observability/server/index.ts b/x-pack/plugins/observability/server/index.ts
index a26bafbf89acc..39537a67a8cbf 100644
--- a/x-pack/plugins/observability/server/index.ts
+++ b/x-pack/plugins/observability/server/index.ts
@@ -9,7 +9,7 @@
 /* eslint-disable @kbn/eslint/no_export_all */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { ObservabilityPlugin, ObservabilityPluginSetup } from './plugin';
 import { createOrUpdateIndex, Mappings } from './utils/create_or_update_index';
 import { ScopedAnnotationsClient } from './lib/annotations/bootstrap_annotations';
diff --git a/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts b/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
index 83f324c05e45e..cb3f350cb24f8 100644
--- a/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
@@ -10,8 +10,8 @@ import {
   PluginInitializerContext,
   KibanaRequest,
   RequestHandlerContext,
-} from 'kibana/server';
-import { LicensingApiRequestHandlerContext } from '../../../../licensing/server';
+} from '@kbn/core/server';
+import { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 import { createAnnotationsClient } from './create_annotations_client';
 import { registerAnnotationAPIs } from './register_annotation_apis';
 
@@ -25,7 +25,7 @@ export type ScopedAnnotationsClientFactory = Awaited<
   ReturnType<typeof bootstrapAnnotations>
 >['getScopedAnnotationsClient'];
 
-export type ScopedAnnotationsClient = ReturnType<ScopedAnnotationsClientFactory>;
+export type ScopedAnnotationsClient = Awaited<ReturnType<ScopedAnnotationsClientFactory>>;
 export type AnnotationsAPI = Awaited<ReturnType<typeof bootstrapAnnotations>>;
 
 export async function bootstrapAnnotations({ index, core, context }: Params) {
@@ -38,15 +38,19 @@ export async function bootstrapAnnotations({ index, core, context }: Params) {
   });
 
   return {
-    getScopedAnnotationsClient: (
-      requestContext: RequestHandlerContext & { licensing: LicensingApiRequestHandlerContext },
+    getScopedAnnotationsClient: async (
+      requestContext: RequestHandlerContext & {
+        licensing: Promise<LicensingApiRequestHandlerContext>;
+      },
       request: KibanaRequest
     ) => {
+      const esClient = (await requestContext.core).elasticsearch.client;
+      const { license } = await requestContext.licensing;
       return createAnnotationsClient({
         index,
-        esClient: requestContext.core.elasticsearch.client.asCurrentUser,
+        esClient: esClient.asCurrentUser,
         logger,
-        license: requestContext.licensing?.license,
+        license,
       });
     },
   };
diff --git a/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts b/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
index 3fa81e77165d4..fc74ffa880fc2 100644
--- a/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import * as t from 'io-ts';
 import Boom from '@hapi/boom';
-import { ILicense } from '../../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import {
   createAnnotationRt,
   deleteAnnotationRt,
diff --git a/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts b/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
index 797516830e4b1..6eb0ba6d6e96c 100644
--- a/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
@@ -7,7 +7,7 @@
 
 import * as t from 'io-ts';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, RequestHandler, Logger } from 'kibana/server';
+import { CoreSetup, RequestHandler, Logger } from '@kbn/core/server';
 import { PathReporter } from 'io-ts/lib/PathReporter';
 import { isLeft } from 'fp-ts/lib/Either';
 import {
@@ -57,13 +57,14 @@ export function registerAnnotationAPIs({
         });
       }
 
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
+      const esClient = (await context.core).elasticsearch.client.asCurrentUser;
+      const license = (await context.licensing)?.license;
 
       const client = createAnnotationsClient({
         index,
         esClient,
         logger,
-        license: context.licensing?.license,
+        license,
       });
 
       try {
diff --git a/x-pack/plugins/observability/server/plugin.ts b/x-pack/plugins/observability/server/plugin.ts
index cb4f85a44d12c..3dd5ca74a16d1 100644
--- a/x-pack/plugins/observability/server/plugin.ts
+++ b/x-pack/plugins/observability/server/plugin.ts
@@ -11,15 +11,15 @@ import {
   Plugin,
   CoreSetup,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
+import { PluginSetupContract as FeaturesSetup } from '@kbn/features-plugin/server';
 import { ObservabilityConfig } from '.';
 import {
   bootstrapAnnotations,
   ScopedAnnotationsClientFactory,
   AnnotationsAPI,
 } from './lib/annotations/bootstrap_annotations';
-import { RuleRegistryPluginSetupContract } from '../../rule_registry/server';
-import { PluginSetupContract as FeaturesSetup } from '../../features/server';
 import { uiSettings } from './ui_settings';
 import { registerRoutes } from './routes/register_routes';
 import { getGlobalObservabilityServerRouteRepository } from './routes/get_global_observability_server_route_repository';
diff --git a/x-pack/plugins/observability/server/routes/register_routes.ts b/x-pack/plugins/observability/server/routes/register_routes.ts
index 15651e9e73986..a352fb0024d3a 100644
--- a/x-pack/plugins/observability/server/routes/register_routes.ts
+++ b/x-pack/plugins/observability/server/routes/register_routes.ts
@@ -10,10 +10,10 @@ import {
   parseEndpoint,
   routeValidationObject,
 } from '@kbn/server-route-repository';
-import { CoreSetup, CoreStart, Logger, RouteRegistrar } from 'kibana/server';
+import { CoreSetup, CoreStart, Logger, RouteRegistrar } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
-import { RuleDataPluginService } from '../../../rule_registry/server';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import { ObservabilityRequestHandlerContext } from '../types';
 import { AbstractObservabilityServerRouteRepository } from './types';
 
diff --git a/x-pack/plugins/observability/server/routes/rules.ts b/x-pack/plugins/observability/server/routes/rules.ts
index 845ac00a70eec..b6163347d47c6 100644
--- a/x-pack/plugins/observability/server/routes/rules.ts
+++ b/x-pack/plugins/observability/server/routes/rules.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { Dataset } from '../../../rule_registry/server';
+import { Dataset } from '@kbn/rule-registry-plugin/server';
 import { createObservabilityServerRoute } from './create_observability_server_route';
 
 const alertsDynamicIndexPatternRoute = createObservabilityServerRoute({
diff --git a/x-pack/plugins/observability/server/routes/types.ts b/x-pack/plugins/observability/server/routes/types.ts
index adb29bcd4f8cb..768b94b0b7335 100644
--- a/x-pack/plugins/observability/server/routes/types.ts
+++ b/x-pack/plugins/observability/server/routes/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type { EndpointOf, ReturnOf, ServerRouteRepository } from '@kbn/server-route-repository';
-import { CoreSetup, CoreStart, KibanaRequest, Logger } from 'kibana/server';
-import { RuleDataPluginService } from '../../../rule_registry/server';
+import { CoreSetup, CoreStart, KibanaRequest, Logger } from '@kbn/core/server';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 
 import { ObservabilityServerRouteRepository } from './get_global_observability_server_route_repository';
 import { ObservabilityRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/observability/server/types.ts b/x-pack/plugins/observability/server/types.ts
index da13e60804a60..75f67d933f681 100644
--- a/x-pack/plugins/observability/server/types.ts
+++ b/x-pack/plugins/observability/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, CustomRequestHandlerContext } from '@kbn/core/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export type {
   ObservabilityRouteCreateOptions,
@@ -20,10 +20,10 @@ export type {
 /**
  * @internal
  */
-export interface ObservabilityRequestHandlerContext extends RequestHandlerContext {
+export type ObservabilityRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
   alerting: AlertingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/observability/server/ui_settings.ts b/x-pack/plugins/observability/server/ui_settings.ts
index 60dcc1384aa22..02c519b10d19c 100644
--- a/x-pack/plugins/observability/server/ui_settings.ts
+++ b/x-pack/plugins/observability/server/ui_settings.ts
@@ -7,14 +7,15 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { UiSettingsParams } from '../../../../src/core/types';
-import { observabilityFeatureId } from '../common';
+import { UiSettingsParams } from '@kbn/core/types';
+import { observabilityFeatureId, ProgressiveLoadingQuality } from '../common';
 import {
   enableComparisonByDefault,
   enableInspectEsQueries,
   maxSuggestions,
   enableInfrastructureView,
   defaultApmServiceEnvironment,
+  apmProgressiveLoading,
   enableServiceGroups,
   apmServiceInventoryOptimizedSorting,
 } from '../common/ui_settings_keys';
@@ -86,6 +87,58 @@ export const uiSettings: Record<string, UiSettingsParams<boolean | number | stri
     value: '',
     schema: schema.string(),
   },
+  [apmProgressiveLoading]: {
+    category: [observabilityFeatureId],
+    name: i18n.translate('xpack.observability.apmProgressiveLoading', {
+      defaultMessage: 'Use progressive loading of selected APM views',
+    }),
+    description: i18n.translate('xpack.observability.apmProgressiveLoadingDescription', {
+      defaultMessage:
+        '{technicalPreviewLabel} Whether to load data progressively for APM views. Data may be requested with a lower sampling rate first, with lower accuracy but faster response times, while the unsampled data loads in the background',
+      values: { technicalPreviewLabel: `<em>[${technicalPreviewLabel}]</em>` },
+    }),
+    value: ProgressiveLoadingQuality.off,
+    schema: schema.oneOf([
+      schema.literal(ProgressiveLoadingQuality.off),
+      schema.literal(ProgressiveLoadingQuality.low),
+      schema.literal(ProgressiveLoadingQuality.medium),
+      schema.literal(ProgressiveLoadingQuality.high),
+    ]),
+    requiresPageReload: false,
+    type: 'select',
+    options: [
+      ProgressiveLoadingQuality.off,
+      ProgressiveLoadingQuality.low,
+      ProgressiveLoadingQuality.medium,
+      ProgressiveLoadingQuality.high,
+    ],
+    optionLabels: {
+      [ProgressiveLoadingQuality.off]: i18n.translate(
+        'xpack.observability.apmProgressiveLoadingQualityOff',
+        {
+          defaultMessage: 'Off',
+        }
+      ),
+      [ProgressiveLoadingQuality.low]: i18n.translate(
+        'xpack.observability.apmProgressiveLoadingQualityLow',
+        {
+          defaultMessage: 'Low sampling rate (fastest, least accurate)',
+        }
+      ),
+      [ProgressiveLoadingQuality.medium]: i18n.translate(
+        'xpack.observability.apmProgressiveLoadingQualityMedium',
+        {
+          defaultMessage: 'Medium sampling rate',
+        }
+      ),
+      [ProgressiveLoadingQuality.high]: i18n.translate(
+        'xpack.observability.apmProgressiveLoadingQualityHigh',
+        {
+          defaultMessage: 'High sampling rate (slower, most accurate)',
+        }
+      ),
+    },
+  },
   [enableServiceGroups]: {
     category: [observabilityFeatureId],
     name: i18n.translate('xpack.observability.enableServiceGroups', {
diff --git a/x-pack/plugins/observability/server/utils/create_or_update_index.ts b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
index af7dc670b0be8..eaea86c18b19f 100644
--- a/x-pack/plugins/observability/server/utils/create_or_update_index.ts
+++ b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
@@ -6,7 +6,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import pRetry from 'p-retry';
-import { Logger, ElasticsearchClient } from 'src/core/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 
 export type Mappings = Required<estypes.IndicesCreateRequest>['body']['mappings'] &
   Required<estypes.IndicesPutMappingRequest>['body'];
diff --git a/x-pack/plugins/observability/typings/common.ts b/x-pack/plugins/observability/typings/common.ts
index 0afcb3a2eeef4..1904728896d82 100644
--- a/x-pack/plugins/observability/typings/common.ts
+++ b/x-pack/plugins/observability/typings/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Request } from '../../../../src/plugins/inspector';
+import { Request } from '@kbn/inspector-plugin';
 
 export type ObservabilityApp =
   | 'infra_metrics'
@@ -19,6 +19,6 @@ export type ObservabilityApp =
   | 'ux'
   | 'fleet';
 
-export type { Coordinates } from '../public/typings/fetch_overview_data/';
+export type { Coordinates } from '../public/typings/fetch_overview_data';
 
 export type InspectResponse = Request[];
diff --git a/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts b/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts
index 184e6b4f32566..af8c3ded4a1d1 100644
--- a/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts
+++ b/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts
@@ -11,5 +11,6 @@ export const extendMap = (
 ): Readonly<Record<string, string>> =>
   Object.entries(map).reduce<Record<string, string>>((accum, [key, value]) => {
     accum[`${path}.${key}`] = `${path}.${value}`;
+
     return accum;
   }, {});
diff --git a/x-pack/plugins/osquery/common/search_strategy/common/index.ts b/x-pack/plugins/osquery/common/search_strategy/common/index.ts
index 05c47605b4951..0fbb0cf22ecf3 100644
--- a/x-pack/plugins/osquery/common/search_strategy/common/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/common/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 export type Maybe<T> = T | null;
 
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts
index 22edbf25cc412..3e7c574dae963 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated } from '../../common';
 import { RequestOptions, RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts
index 57c7a42f2a481..3e7422adc91a2 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated } from '../../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
index d0d67c8546b61..9367449a1c5bb 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   ActionsStrategyResponse,
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts
index f08d9f88e705d..d60b972ea6441 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated, SortField } from '../../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/osquery/common/shared_imports.ts b/x-pack/plugins/osquery/common/shared_imports.ts
index 298cf92c4eeb2..2123d29301754 100644
--- a/x-pack/plugins/osquery/common/shared_imports.ts
+++ b/x-pack/plugins/osquery/common/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export type { Agent } from '../../fleet/common';
+export type { Agent } from '@kbn/fleet-plugin/common';
diff --git a/x-pack/plugins/osquery/common/types.ts b/x-pack/plugins/osquery/common/types.ts
index 2d3fc6e972c7c..6704761fe558f 100644
--- a/x-pack/plugins/osquery/common/types.ts
+++ b/x-pack/plugins/osquery/common/types.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { PackagePolicy, PackagePolicyInput, PackagePolicyInputStream } from '../../fleet/common';
+import {
+  PackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+} from '@kbn/fleet-plugin/common';
 
 export const savedQuerySavedObjectType = 'osquery-saved-query';
 export const packSavedObjectType = 'osquery-pack';
diff --git a/x-pack/plugins/osquery/common/utils/build_query/filters.ts b/x-pack/plugins/osquery/common/utils/build_query/filters.ts
index a1d1590bae1ce..d37fb0cf39fd4 100644
--- a/x-pack/plugins/osquery/common/utils/build_query/filters.ts
+++ b/x-pack/plugins/osquery/common/utils/build_query/filters.ts
@@ -7,7 +7,7 @@
 
 import { isEmpty, isString } from 'lodash/fp';
 
-import { ESQuery } from '../../../common/typed_json';
+import { ESQuery } from '../../typed_json';
 
 export const createQueryFilterClauses = (filterQuery: ESQuery | string | undefined) =>
   !isEmpty(filterQuery) ? [isString(filterQuery) ? JSON.parse(filterQuery) : filterQuery] : [];
diff --git a/x-pack/plugins/osquery/cypress/plugins/index.ts b/x-pack/plugins/osquery/cypress/plugins/index.ts
index 5c0aa5e4c4cfd..7e135eb15c56e 100644
--- a/x-pack/plugins/osquery/cypress/plugins/index.ts
+++ b/x-pack/plugins/osquery/cypress/plugins/index.ts
@@ -25,6 +25,7 @@
 module.exports = (on: any, config: any) => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-extraneous-dependencies
   require('@cypress/code-coverage/task')(on, config);
+
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
   return config;
diff --git a/x-pack/plugins/osquery/cypress/tasks/login.ts b/x-pack/plugins/osquery/cypress/tasks/login.ts
index 9dbdc40a35605..77d53ab470830 100644
--- a/x-pack/plugins/osquery/cypress/tasks/login.ts
+++ b/x-pack/plugins/osquery/cypress/tasks/login.ts
@@ -64,6 +64,7 @@ export const getUrlWithRoute = (role: ROLES, route: string) => {
     port: kibana.port,
   } as UrlObject)}${route.startsWith('/') ? '' : '/'}${route}`;
   cy.log(`origin: ${theUrl}`);
+
   return theUrl;
 };
 
@@ -92,6 +93,7 @@ export const constructUrlWithUser = (user: User, route: string) => {
   const builtUrl = new URL(strUrl);
 
   cy.log(`origin: ${builtUrl.href}`);
+
   return builtUrl.href;
 };
 
diff --git a/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx b/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx
index def52bf511215..9a826457cf8cd 100644
--- a/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx
+++ b/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx
@@ -27,15 +27,18 @@ export const AgentStatusBar: React.FC<{
 }> = ({ agentStatus }) => {
   const palette = useMemo(() => {
     let stop = 0;
+
     return AGENT_STATUSES.reduce((acc, status) => {
       stop += agentStatus[status] || 0;
       acc.push({
         stop,
         color: getColorForAgentStatus(status),
       });
+
       return acc;
     }, [] as Array<{ stop: number; color: string }>);
   }, [agentStatus]);
+
   return (
     <StyledEuiColorPaletteDisplay
       className="osquery-action-agent-status-bar"
diff --git a/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx b/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx
index fe84b856e4977..2899b38aa26b7 100644
--- a/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx
+++ b/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx
@@ -9,8 +9,8 @@ import { EuiLink } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useKibana, isModifiedEvent, isLeftClickEvent } from '../common/lib/kibana';
 import { useAgentPolicy } from './use_agent_policy';
 
diff --git a/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts b/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
index ea5e5a768f0af..d405593910763 100644
--- a/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
+++ b/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
@@ -9,8 +9,8 @@ import { mapKeys } from 'lodash';
 import { useQuery } from 'react-query';
 
 import { i18n } from '@kbn/i18n';
+import { GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
-import { GetAgentPoliciesResponseItem } from '../../../fleet/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useAgentPolicies = () => {
diff --git a/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts b/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts
index 13c073c3bf8be..423b608f6092a 100644
--- a/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts
+++ b/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts
@@ -40,6 +40,7 @@ export function genAgent(policyId: string, hostname: string, id: string): Groupe
     },
   };
 }
+
 export const groupData: GroupData = {
   [AGENT_GROUP_KEY.Platform]: new Array(3).fill('test platform ').map((el, i) => genGroup(el + i)),
   [AGENT_GROUP_KEY.Policy]: new Array(3).fill('test policy ').map((el, i) => genGroup(el + i)),
@@ -109,6 +110,7 @@ describe('AgentGrouper', () => {
         });
       };
     }
+
     it('should generate policy options', genGroupTest(AGENT_GROUP_KEY.Policy, 'policy'));
     it('should generate platform options', genGroupTest(AGENT_GROUP_KEY.Platform, 'platform'));
   });
diff --git a/x-pack/plugins/osquery/public/agents/agent_grouper.ts b/x-pack/plugins/osquery/public/agents/agent_grouper.ts
index 8d234ec8cf905..f0bf423672269 100644
--- a/x-pack/plugins/osquery/public/agents/agent_grouper.ts
+++ b/x-pack/plugins/osquery/public/agents/agent_grouper.ts
@@ -78,12 +78,14 @@ export class AgentGrouper {
     if (!data?.length || key === AGENT_GROUP_KEY.All) {
       return;
     }
+
     const group = this.groups[key];
     if (append) {
       group.data.push(...data);
     } else {
       group.data = data;
     }
+
     group.size = data.length;
   }
 
@@ -91,6 +93,7 @@ export class AgentGrouper {
     if (total < 0) {
       return;
     }
+
     this.groups[AGENT_GROUP_KEY.All].size = total;
   }
 
@@ -124,6 +127,7 @@ export class AgentGrouper {
           break;
       }
     }
+
     return opts;
   }
 }
diff --git a/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx b/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx
index f45affa803673..fa8bfa6e6dca9 100644
--- a/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx
+++ b/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx
@@ -8,9 +8,9 @@
 import { EuiLink, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useAgentDetails } from './use_agent_details';
-import { PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
 import { useKibana } from '../common/lib/kibana';
 
 interface AgentIdToNameProps {
diff --git a/x-pack/plugins/osquery/public/agents/agents_table.tsx b/x-pack/plugins/osquery/public/agents/agents_table.tsx
index fac74086670c2..55e63456fe916 100644
--- a/x-pack/plugins/osquery/public/agents/agents_table.tsx
+++ b/x-pack/plugins/osquery/public/agents/agents_table.tsx
@@ -108,6 +108,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
             getNumOverlapped(selectedGroups, groups.overlap)
         );
       }
+
       onChange(newAgentSelection);
       setSelectedOptions(selection);
     },
@@ -131,6 +132,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
         }
       }
     };
+
     if (agentSelection && !defaultValueInitialized.current && options.length) {
       if (agentSelection.allAgentsSelected) {
         const allAgentsOptions = find(['label', ALL_AGENTS_LABEL], options);
@@ -175,6 +177,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
 
   const renderOption = useCallback((option, searchVal, contentClassName) => {
     const { label, value } = option;
+
     return value?.groupType === AGENT_GROUP_KEY.Agent ? (
       <EuiHealth color={value?.status === 'online' ? 'success' : 'danger'}>
         <span className={contentClassName}>
diff --git a/x-pack/plugins/osquery/public/agents/helpers.ts b/x-pack/plugins/osquery/public/agents/helpers.ts
index 71a67ef1f623a..1c23eac3ca201 100644
--- a/x-pack/plugins/osquery/public/agents/helpers.ts
+++ b/x-pack/plugins/osquery/public/agents/helpers.ts
@@ -30,8 +30,10 @@ export const getNumOverlapped = (
       sum += policies[pol] ?? 0;
     });
   });
+
   return sum;
 };
+
 interface Aggs extends estypes.AggregationsTermsAggregateBase {
   buckets: AggregationDataPoint[];
 }
@@ -51,6 +53,7 @@ export const processAggregations = (aggs: Record<string, estypes.AggregationsAgg
       if (platformPolicies?.buckets && policies.length > 0) {
         overlap[key] = platformPolicies.buckets.reduce((acc: { [key: string]: number }, pol) => {
           acc[pol.key] = pol.doc_count;
+
           return acc;
         }, {} as { [key: string]: number });
       }
@@ -63,13 +66,16 @@ export const processAggregations = (aggs: Record<string, estypes.AggregationsAgg
     policies,
   };
 };
+
 export const generateColorPicker = () => {
   const visColorsBehindText = euiPaletteColorBlindBehindText();
   const typeColors = new Map<AGENT_GROUP_KEY, string>();
+
   return (type: AGENT_GROUP_KEY) => {
     if (!typeColors.has(type)) {
       typeColors.set(type, visColorsBehindText[typeColors.size]);
     }
+
     return typeColors.get(type);
   };
 };
@@ -80,6 +86,7 @@ export const getNumAgentsInGrouping = (selectedGroups: SelectedGroups) => {
     const group = selectedGroups[g];
     sum += Object.keys(group).reduce((acc, k) => acc + group[k], 0);
   });
+
   return sum;
 };
 
@@ -90,6 +97,7 @@ export const generateAgentCheck =
       .map((group) => {
         const selectedGroup = selectedGroups[group];
         const agentGroup = groups[group];
+
         // check if the agent platform/policy is selected
         return selectedGroup[agentGroup];
       })
@@ -124,6 +132,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to calculate diffs when all agents are selected
           selectedGroups.platform[key] = value.size;
         }
+
         newAgentSelection.platformsSelected.push(key);
         break;
       case AGENT_GROUP_KEY.Policy:
@@ -132,6 +141,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to calculate diffs when all agents are selected
           selectedGroups.policy[key] = value.size;
         }
+
         newAgentSelection.policiesSelected.push(key);
         break;
       case AGENT_GROUP_KEY.Agent:
@@ -140,6 +150,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to count how many agents are selected if they are all selected
           selectedAgents.push(value);
         }
+
         newAgentSelection.agents.push(key);
         break;
       default:
@@ -148,5 +159,6 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
         console.error(`unknown group type ${groupType}`);
     }
   }
+
   return { newAgentSelection, selectedGroups, selectedAgents };
 };
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_details.ts b/x-pack/plugins/osquery/public/agents/use_agent_details.ts
index e639701b5dd2f..b343d75262905 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_details.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_details.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { GetOneAgentResponse } from '../../../fleet/common';
+import { GetOneAgentResponse } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
@@ -21,6 +21,7 @@ interface UseAgentDetails {
 export const useAgentDetails = ({ agentId, silent, skip }: UseAgentDetails) => {
   const { http } = useKibana().services;
   const setErrorToast = useErrorToast();
+
   return useQuery<GetOneAgentResponse, unknown, GetOneAgentResponse['item']>(
     ['agentDetails', agentId],
     () => http.get(`/internal/osquery/fleet_wrapper/agents/${agentId}`),
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_groups.ts b/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
index 4cea34906776f..2dba1c471a786 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
@@ -88,6 +88,7 @@ export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseA
         setPolicies(
           newPolicies.map((p) => {
             const name = agentPolicyById[p.id]?.name ?? p.name;
+
             return {
               ...p,
               name,
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_policies.ts b/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
index cdccd3aa21af8..0d96c88771858 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
@@ -8,8 +8,8 @@
 import { mapKeys } from 'lodash';
 import { useQueries, UseQueryResult } from 'react-query';
 import { i18n } from '@kbn/i18n';
+import { GetOneAgentPolicyResponse } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
-import { GetOneAgentPolicyResponse } from '../../../fleet/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useAgentPolicies = (policyIds: string[] = []) => {
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts b/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts
index 77ca08e284182..1359ec6706ea5 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts
@@ -9,7 +9,7 @@ import { map } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { AGENTS_PREFIX, Agent } from '../../../fleet/common';
+import { AGENTS_PREFIX, Agent } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_status.ts b/x-pack/plugins/osquery/public/agents/use_agent_status.ts
index a94bb5631343d..8da32307f9188 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_status.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_status.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { GetAgentStatusResponse } from '../../../fleet/common';
+import { GetAgentStatusResponse } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
diff --git a/x-pack/plugins/osquery/public/agents/use_all_agents.ts b/x-pack/plugins/osquery/public/agents/use_all_agents.ts
index 03660a970aeef..9ffcaae16bc6d 100644
--- a/x-pack/plugins/osquery/public/agents/use_all_agents.ts
+++ b/x-pack/plugins/osquery/public/agents/use_all_agents.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { GetAgentsResponse } from '../../../fleet/common';
+import { GetAgentsResponse } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
diff --git a/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts b/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
index 759e9f22c71b8..679aeef1bd23b 100644
--- a/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
+++ b/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
@@ -33,6 +33,7 @@ export const useOsqueryPolicies = () => {
         }),
     }
   );
+
   return useMemo(
     () => ({ osqueryPoliciesLoading, osqueryPolicies }),
     [osqueryPoliciesLoading, osqueryPolicies]
diff --git a/x-pack/plugins/osquery/public/application.tsx b/x-pack/plugins/osquery/public/application.tsx
index 754d924529b19..4cc7afc54203f 100644
--- a/x-pack/plugins/osquery/public/application.tsx
+++ b/x-pack/plugins/osquery/public/application.tsx
@@ -15,9 +15,9 @@ import { ThemeProvider } from 'styled-components';
 import { QueryClientProvider } from 'react-query';
 import { ReactQueryDevtools } from 'react-query/devtools';
 
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { useUiSetting$, KibanaThemeProvider } from './shared_imports';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
 import { AppPluginStartDependencies } from './types';
 import { OsqueryApp } from './components/app';
 import { DEFAULT_DARK_MODE, PLUGIN_NAME } from '../common';
diff --git a/x-pack/plugins/osquery/public/assets/use_assets_status.ts b/x-pack/plugins/osquery/public/assets/use_assets_status.ts
index 41307952b222c..fd6a2fecb2793 100644
--- a/x-pack/plugins/osquery/public/assets/use_assets_status.ts
+++ b/x-pack/plugins/osquery/public/assets/use_assets_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { useQuery } from 'react-query';
 import { useKibana } from '../common/lib/kibana';
 import { INTEGRATION_ASSETS_STATUS_ID } from './constants';
diff --git a/x-pack/plugins/osquery/public/common/helpers.ts b/x-pack/plugins/osquery/public/common/helpers.ts
index 4f9efbe839ffd..5f83330fe9ee1 100644
--- a/x-pack/plugins/osquery/public/common/helpers.ts
+++ b/x-pack/plugins/osquery/public/common/helpers.ts
@@ -26,6 +26,7 @@ export const generateTablePaginationOptions = (
   limit: number
 ): PaginationInputPaginated => {
   const cursorStart = activePage * limit;
+
   return {
     activePage,
     cursorStart,
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx b/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx
index 6bef0ee38c24e..5891fd4ae9d78 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ChromeBreadcrumb } from 'src/core/public';
+import type { ChromeBreadcrumb } from '@kbn/core/public';
 
 import { BASE_PATH } from '../../../common/constants';
 import type { Page, DynamicPagePathValues } from '../page_paths';
@@ -163,6 +163,7 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
       const href = breadcrumb.href
         ? http.basePath.prepend(`${BASE_PATH}${breadcrumb.href}`)
         : undefined;
+
       return {
         ...breadcrumb,
         href,
@@ -171,6 +172,7 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
               if (ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
                 return;
               }
+
               ev.preventDefault();
               application.navigateToUrl(href);
             }
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx b/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx
index d930d867c7a8b..ca294c044d05b 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx
@@ -7,7 +7,7 @@
 
 import { useCallback, useEffect, useState } from 'react';
 
-import { FilterStateStore } from '../../../../../../src/plugins/data/common';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 import { useKibana, isModifiedEvent, isLeftClickEvent } from '../lib/kibana';
 
 interface UseDiscoverLink {
@@ -43,6 +43,7 @@ export const useDiscoverLink = ({ filters }: UseDiscoverLink) => {
       });
       setDiscoverUrl(newUrl);
     };
+
     getDiscoverUrl();
   }, [filters, locator]);
 
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx b/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
index 0289c53e72017..42a8b23143a53 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
@@ -5,19 +5,21 @@
  * 2.0.
  */
 
-import { ErrorToastOptions, Toast } from 'kibana/public';
+import { ErrorToastOptions, Toast } from '@kbn/core/public';
 import { useState } from 'react';
-import { useKibana } from '../../common/lib/kibana';
+import { useKibana } from '../lib/kibana';
 
 export const useErrorToast = () => {
   const [errorToast, setErrorToast] = useState<Toast>();
   const {
     notifications: { toasts },
   } = useKibana().services;
+
   return (error?: unknown, opts?: ErrorToastOptions) => {
     if (errorToast) {
       toasts.remove(errorToast);
     }
+
     if (error) {
       setErrorToast(
         // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts
index bd72d4eb91353..f58467cc9a5dc 100644
--- a/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts
@@ -16,7 +16,7 @@ import {
   useUiSetting$,
   withKibana,
   reactRouterNavigate,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
 
 export type KibanaContext = KibanaReactContextValue<StartServices>;
@@ -36,6 +36,7 @@ const useRouterNavigate = (
   onClickCallback?: Parameters<typeof reactRouterNavigate>[2]
 ) => {
   const history = useHistory();
+
   return reactRouterNavigate(history, to, onClickCallback);
 };
 
diff --git a/x-pack/plugins/osquery/public/components/empty_state.tsx b/x-pack/plugins/osquery/public/components/empty_state.tsx
index 1ca16dae28deb..d789aa28204eb 100644
--- a/x-pack/plugins/osquery/public/components/empty_state.tsx
+++ b/x-pack/plugins/osquery/public/components/empty_state.tsx
@@ -9,9 +9,9 @@ import React, { useCallback, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton } from '@elastic/eui';
 
-import { KibanaPageTemplate } from '../../../../../src/plugins/kibana_react/public';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { isModifiedEvent, isLeftClickEvent, useKibana } from '../common/lib/kibana';
 import { OsqueryIcon } from './osquery_icon';
 import { useBreadcrumbs } from '../common/hooks/use_breadcrumbs';
@@ -38,6 +38,7 @@ const OsqueryAppEmptyStateComponent = () => {
     (event) => {
       if (!isModifiedEvent(event) && isLeftClickEvent(event)) {
         event.preventDefault();
+
         return navigateToApp(INTEGRATIONS_PLUGIN_ID, {
           path: pagePathGetters.integration_details_overview({
             pkgkey: OSQUERY_INTEGRATION_NAME,
diff --git a/x-pack/plugins/osquery/public/components/main_navigation.tsx b/x-pack/plugins/osquery/public/components/main_navigation.tsx
index 73b6435fd8f33..db016575db866 100644
--- a/x-pack/plugins/osquery/public/components/main_navigation.tsx
+++ b/x-pack/plugins/osquery/public/components/main_navigation.tsx
@@ -22,6 +22,7 @@ enum Section {
 export const MainNavigation = () => {
   const location = useLocation();
   const section = useMemo(() => location.pathname.split('/')[1] ?? 'overview', [location.pathname]);
+
   return (
     <Nav>
       <EuiFlexGroup gutterSize="l" alignItems="center">
diff --git a/x-pack/plugins/osquery/public/components/manage_integration_link.tsx b/x-pack/plugins/osquery/public/components/manage_integration_link.tsx
index 4eedf58466383..44ae6421a6c25 100644
--- a/x-pack/plugins/osquery/public/components/manage_integration_link.tsx
+++ b/x-pack/plugins/osquery/public/components/manage_integration_link.tsx
@@ -9,8 +9,8 @@ import React, { useCallback, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButtonEmpty, EuiFlexItem } from '@elastic/eui';
 
-import { INTEGRATIONS_PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useKibana, isModifiedEvent, isLeftClickEvent } from '../common/lib/kibana';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 
@@ -33,6 +33,7 @@ const ManageIntegrationLinkComponent = () => {
     (event) => {
       if (!isModifiedEvent(event) && isLeftClickEvent(event)) {
         event.preventDefault();
+
         return navigateToApp(INTEGRATIONS_PLUGIN_ID, {
           path: pagePathGetters.integration_details_policies({
             pkgkey: OSQUERY_INTEGRATION_NAME,
diff --git a/x-pack/plugins/osquery/public/editor/index.tsx b/x-pack/plugins/osquery/public/editor/index.tsx
index 761daa1523a9b..191fe1e7ea548 100644
--- a/x-pack/plugins/osquery/public/editor/index.tsx
+++ b/x-pack/plugins/osquery/public/editor/index.tsx
@@ -11,7 +11,7 @@ import 'brace/theme/tomorrow';
 
 import { EuiCodeEditor, EuiCodeEditorProps } from '../shared_imports';
 
-import './osquery_mode.ts';
+import './osquery_mode';
 
 const EDITOR_SET_OPTIONS = {
   enableBasicAutocompletion: true,
@@ -40,6 +40,7 @@ const OsqueryEditorComponent: React.FC<OsqueryEditorProps> = ({
   ]);
 
   useEffect(() => setEditorValue(defaultValue), [defaultValue]);
+
   return (
     <EuiCodeEditor
       value={editorValue}
diff --git a/x-pack/plugins/osquery/public/editor/osquery_tables.ts b/x-pack/plugins/osquery/public/editor/osquery_tables.ts
index 7437ffbb72595..752e8af9edc7a 100644
--- a/x-pack/plugins/osquery/public/editor/osquery_tables.ts
+++ b/x-pack/plugins/osquery/public/editor/osquery_tables.ts
@@ -13,11 +13,14 @@ type TablesJSON = Array<{
 export const normalizeTables = (tablesJSON: TablesJSON) => sortBy(tablesJSON, 'name');
 
 let osqueryTables: TablesJSON | null = null;
+
 export const getOsqueryTables = () => {
   if (!osqueryTables) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     osqueryTables = normalizeTables(require('../common/schemas/osquery/v5.2.2.json'));
   }
+
   return osqueryTables;
 };
+
 export const getOsqueryTableNames = () => flatMap(getOsqueryTables(), 'name');
diff --git a/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx b/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx
index 5f07a3a5740cd..b93c475f1e04e 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx
@@ -48,6 +48,7 @@ const ConfigUploaderComponent: React.FC<ConfigUploaderProps> = ({ onChange }) =>
           // remove any multiple spaces from the query
           return value.replaceAll(/\s(?=\s)/gm, '');
         }
+
         return value;
       });
 
@@ -95,6 +96,7 @@ const ConfigUploaderComponent: React.FC<ConfigUploaderProps> = ({ onChange }) =>
         );
         // @ts-expect-error update types
         filePickerRef.current?.removeFiles(new Event('fake'));
+
         return;
       }
 
diff --git a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx
index e547686c0166b..6d1ae8f63cf1f 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx
@@ -6,13 +6,14 @@
  */
 
 import { lazy } from 'react';
-import { PackageCustomExtensionComponent } from '../../../fleet/public';
+import { PackageCustomExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyOsqueryManagedCustomButtonExtension = lazy<PackageCustomExtensionComponent>(
   async () => {
     const { OsqueryManagedCustomButtonExtension } = await import(
       './osquery_managed_custom_button_extension'
     );
+
     return {
       default: OsqueryManagedCustomButtonExtension,
     };
diff --git a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx
index a32f0b862250e..7783f4a4b6dd7 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx
@@ -6,13 +6,14 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyOsqueryManagedPolicyCreateImportExtension =
   lazy<PackagePolicyCreateExtensionComponent>(async () => {
     const { OsqueryManagedPolicyCreateImportExtension } = await import(
       './osquery_managed_policy_create_import_extension'
     );
+
     return {
       default: OsqueryManagedPolicyCreateImportExtension,
     };
diff --git a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx
index 787a39f3a34b7..ac4f50e6a97b3 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx
@@ -6,13 +6,14 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyOsqueryManagedPolicyEditExtension = lazy<PackagePolicyEditExtensionComponent>(
   async () => {
     const { OsqueryManagedPolicyCreateImportExtension } = await import(
       './osquery_managed_policy_create_import_extension'
     );
+
     return {
       default: OsqueryManagedPolicyCreateImportExtension,
     };
diff --git a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx
index 0f5caca5d19bd..393c3a00991b2 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx
@@ -8,7 +8,7 @@
 import { EuiLoadingContent } from '@elastic/eui';
 import React from 'react';
 
-import { PackageCustomExtensionComponentProps } from '../../../fleet/public';
+import { PackageCustomExtensionComponentProps } from '@kbn/fleet-plugin/public';
 import { NavigationButtons } from './navigation_buttons';
 import { DisabledCallout } from './disabled_callout';
 import { MissingPrivileges } from '../routes/components/missing_privileges';
diff --git a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
index aaedec1e0dbe1..2cc6a3230d0ea 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
@@ -26,12 +26,12 @@ import {
   agentPolicyRouteService,
   AgentPolicy,
   PLUGIN_ID,
-} from '../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import {
   pagePathGetters,
   PackagePolicyCreateExtensionComponentProps,
   PackagePolicyEditExtensionComponentProps,
-} from '../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 import { useKibana } from '../common/lib/kibana';
 import { NavigationButtons } from './navigation_buttons';
 import { DisabledCallout } from './disabled_callout';
@@ -245,6 +245,7 @@ export const OsqueryManagedPolicyCreateImportExtension = React.memo<
         } else {
           set(draft, 'inputs[0].config.osquery.value', parsedConfig);
         }
+
         return draft;
       });
 
@@ -322,6 +323,7 @@ export const OsqueryManagedPolicyCreateImportExtension = React.memo<
               policy_template: 'osquery_manager',
             });
           }
+
           return draft;
         });
 
diff --git a/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx b/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx
index 3f86675f8be41..051897eca1259 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx
@@ -29,6 +29,7 @@ export const useFetchStatus = () => {
           }
         });
     };
+
     fetchStatus();
   }, [http]);
 
diff --git a/x-pack/plugins/osquery/public/index.ts b/x-pack/plugins/osquery/public/index.ts
index fadd61cce85ef..fe8eba699f030 100644
--- a/x-pack/plugins/osquery/public/index.ts
+++ b/x-pack/plugins/osquery/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { OsqueryPlugin } from './plugin';
 
 // This exports static code and TypeScript types,
@@ -13,4 +13,5 @@ import { OsqueryPlugin } from './plugin';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new OsqueryPlugin(initializerContext);
 }
+
 export type { OsqueryPluginSetup, OsqueryPluginStart } from './types';
diff --git a/x-pack/plugins/osquery/public/live_queries/form/index.tsx b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
index 2d244a14a386f..f082ca0baeebe 100644
--- a/x-pack/plugins/osquery/public/live_queries/form/index.tsx
+++ b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
@@ -444,13 +444,16 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
     if (defaultValue?.agentSelection) {
       setFieldValue('agentSelection', defaultValue?.agentSelection);
     }
+
     if (defaultValue?.query) {
       setFieldValue('query', defaultValue?.query);
     }
+
     // TODO: Set query and ECS mapping from savedQueryId object
     if (defaultValue?.savedQueryId) {
       setFieldValue('savedQueryId', defaultValue?.savedQueryId);
     }
+
     if (!isEmpty(defaultValue?.ecs_mapping)) {
       setFieldValue('ecs_mapping', defaultValue?.ecs_mapping);
     }
diff --git a/x-pack/plugins/osquery/public/packs/active_state_switch.tsx b/x-pack/plugins/osquery/public/packs/active_state_switch.tsx
index 1dbb145430a3e..4223409166956 100644
--- a/x-pack/plugins/osquery/public/packs/active_state_switch.tsx
+++ b/x-pack/plugins/osquery/public/packs/active_state_switch.tsx
@@ -11,7 +11,7 @@ import { useQueryClient } from 'react-query';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 
-import { PackagePolicy } from '../../../fleet/common';
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
 import { useAgentPolicies } from '../agent_policies/use_agent_policies';
 import { ConfirmDeployAgentPolicyModal } from './form/confirmation_modal';
diff --git a/x-pack/plugins/osquery/public/packs/form/index.tsx b/x-pack/plugins/osquery/public/packs/form/index.tsx
index 41f51181aa304..262b57f7d2ec8 100644
--- a/x-pack/plugins/osquery/public/packs/form/index.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/index.tsx
@@ -162,6 +162,7 @@ const PackFormComponent: React.FC<PackFormProps> = ({
         policyIds,
         (acc, policyId) => {
           const agentPolicy = agentPoliciesById && agentPoliciesById[policyId];
+
           return acc + (agentPolicy?.agents ?? 0);
         },
         0
@@ -177,6 +178,7 @@ const PackFormComponent: React.FC<PackFormProps> = ({
   const handleSaveClick = useCallback(() => {
     if (agentCount) {
       setShowConfirmationModal(true);
+
       return;
     }
 
diff --git a/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx b/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx
index 1687213f1a67e..8955b8dac88c1 100644
--- a/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx
@@ -47,10 +47,12 @@ const OsqueryPackUploaderComponent: React.FC<OsqueryPackUploaderProps> = ({ onCh
           // remove any multiple spaces from the query
           return value.replaceAll(/\s(?=\s)/gm, '');
         }
+
         if (key === 'interval') {
           // convert interval int to string
           return `${value}`;
         }
+
         return value;
       });
 
@@ -82,6 +84,7 @@ const OsqueryPackUploaderComponent: React.FC<OsqueryPackUploaderProps> = ({ onCh
     (inputFiles) => {
       if (!inputFiles.length) {
         packName.current = '';
+
         return;
       }
 
@@ -103,6 +106,7 @@ const OsqueryPackUploaderComponent: React.FC<OsqueryPackUploaderProps> = ({ onCh
         );
         // @ts-expect-error update types
         filePickerRef.current?.removeFiles(new Event('fake'));
+
         return;
       }
 
diff --git a/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx b/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx
index fa579b43b3159..4b4420ec8bfd5 100644
--- a/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx
@@ -11,7 +11,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiTextColor, EuiComboBoxOptionOption } from
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { GetAgentPoliciesResponseItem } from '../../../../fleet/common';
+import { GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 import { ComboBoxField, FieldHook } from '../../shared_imports';
 
 // Custom styling for drop down list items due to:
@@ -106,6 +106,7 @@ const PolicyIdComboBoxFieldComponent: React.FC<PolicyIdComboBoxFieldProps> = ({
       value,
       (acc, policyId) => {
         const agentPolicy = agentPoliciesById && agentPoliciesById[policyId];
+
         return acc + (agentPolicy?.agents ?? 0);
       },
       0
diff --git a/x-pack/plugins/osquery/public/packs/form/queries_field.tsx b/x-pack/plugins/osquery/public/packs/form/queries_field.tsx
index 8e049e3fc5fc1..ecb05884a5182 100644
--- a/x-pack/plugins/osquery/public/packs/form/queries_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/queries_field.tsx
@@ -113,6 +113,7 @@ const QueriesFieldComponent: React.FC<QueriesFieldProps> = ({
         setValue(
           produce((draft) => {
             draft.push(newQuery);
+
             return draft;
           })
         );
diff --git a/x-pack/plugins/osquery/public/packs/form/utils.ts b/x-pack/plugins/osquery/public/packs/form/utils.ts
index 5a4ff8ec13bb1..446172c1cd5ce 100644
--- a/x-pack/plugins/osquery/public/packs/form/utils.ts
+++ b/x-pack/plugins/osquery/public/packs/form/utils.ts
@@ -17,6 +17,7 @@ export const convertPackQueriesToSO = (queries) =>
         id: key,
         ...pick(value, ['query', 'interval', 'platform', 'version', 'ecs_mapping']),
       });
+
       return acc;
     },
     []
@@ -28,6 +29,7 @@ export const convertSOQueriesToPack = (queries) =>
     queries,
     (acc, { id: queryId, ...query }) => {
       acc[queryId] = query;
+
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx b/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx
index c99662804b1e2..70282ab0819fd 100644
--- a/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx
+++ b/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx
@@ -29,9 +29,9 @@ import type {
   PersistedIndexPatternLayer,
   PieVisualizationState,
   TermsIndexPatternColumn,
-} from '../../../lens/public';
-import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '../../../lens/common/constants';
-import { FilterStateStore, DataView } from '../../../../../src/plugins/data/common';
+} from '@kbn/lens-plugin/public';
+import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '@kbn/lens-plugin/common/constants';
+import { FilterStateStore, DataView } from '@kbn/data-plugin/common';
 import { useKibana } from '../common/lib/kibana';
 import { OsqueryManagerPackagePolicyInputStream } from '../../common/types';
 import { ScheduledQueryErrorsTable } from './scheduled_query_errors_table';
@@ -234,6 +234,7 @@ const ViewResultsInLensActionComponent: React.FC<ViewResultsInDiscoverActionProp
   if (!isLensAvailable) {
     return null;
   }
+
   if (buttonType === ViewResultsActionButtonType.button) {
     return (
       <EuiButtonEmpty size="xs" iconType="lensApp" onClick={handleClick} disabled={false}>
@@ -335,12 +336,14 @@ const ViewResultsInDiscoverActionComponent: React.FC<ViewResultsInDiscoverAction
       });
       setDiscoverUrl(newUrl);
     };
+
     getDiscoverUrl();
   }, [actionId, agentIds, endDate, startDate, locator]);
 
   if (!discoverPermissions.show) {
     return null;
   }
+
   if (buttonType === ViewResultsActionButtonType.button) {
     return (
       <EuiButtonEmpty size="xs" iconType="discoverApp" href={discoverUrl} target="_blank">
@@ -618,6 +621,7 @@ const PackQueriesStatusTableComponent: React.FC<PackQueriesStatusTableProps> = (
 
       setLogsDataView(dataView[0]);
     };
+
     fetchLogsDataView();
   }, [dataViews]);
 
@@ -644,6 +648,7 @@ const PackQueriesStatusTableComponent: React.FC<PackQueriesStatusTableProps> = (
           />
         );
       }
+
       setItemIdToExpandedRowMap(itemIdToExpandedRowMapValues);
     },
     [agentIds, itemIdToExpandedRowMap, packName]
diff --git a/x-pack/plugins/osquery/public/packs/packs_table.tsx b/x-pack/plugins/osquery/public/packs/packs_table.tsx
index f8599cc1fc51e..b64d999b4ecf6 100644
--- a/x-pack/plugins/osquery/public/packs/packs_table.tsx
+++ b/x-pack/plugins/osquery/public/packs/packs_table.tsx
@@ -104,6 +104,7 @@ const PacksTableComponent = () => {
       item.attributes.updated_by !== item.attributes.created_by
         ? ` @ ${item.attributes.updated_by}`
         : '';
+
     return updatedAt ? (
       <EuiToolTip content={`${moment(updatedAt).fromNow()}${updatedBy}`}>
         <UpdatedBy>{`${moment(updatedAt).fromNow()}${updatedBy}`}</UpdatedBy>
diff --git a/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx b/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx
index b5bfe1a234d91..bca3036d19f4c 100644
--- a/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx
@@ -404,6 +404,7 @@ const OsqueryColumnFieldComponent: React.FC<OsqueryColumnFieldProps> = ({
         } else {
           setValue([trimmedNewOption]);
         }
+
         inputRef.current?.blur();
       } else {
         setValue(trimmedNewOption);
@@ -675,9 +676,11 @@ export const ECSMappingEditorForm = forwardRef<ECSMappingEditorFormRef, ECSMappi
         if (onAdd) {
           onAdd(serializedData);
         }
+
         if (onChange) {
           onChange(serializedData);
         }
+
         reset();
       }
     }, [validate, validateFields, submit, onAdd, onChange, reset]);
@@ -840,6 +843,7 @@ export const ECSMappingEditorField = React.memo(
           const validations = await Promise.all(
             Object.values(formRefs.current).map(async (formRef) => {
               const { data, isValid } = await formRef.validate();
+
               return [data, isValid];
             })
           );
@@ -945,6 +949,7 @@ export const ECSMappingEditorField = React.memo(
                           },
                         }))
                       );
+
                       return acc;
                     },
                     [] as OsquerySchemaOption[]
@@ -961,6 +966,7 @@ export const ECSMappingEditorField = React.memo(
 
                 if (column === '*' && astOsqueryTables[table]) {
                   const { columns: osqueryColumns, order: tableOrder } = astOsqueryTables[table];
+
                   return osqueryColumns.map((osqueryColumn) => ({
                     label: osqueryColumn.name,
                     value: {
@@ -1050,6 +1056,7 @@ export const ECSMappingEditorField = React.memo(
           setValue(
             produce((draft) => {
               draft[newRow.key] = newRow.value;
+
               return draft;
             })
           );
@@ -1085,6 +1092,7 @@ export const ECSMappingEditorField = React.memo(
               if (draft[key]) {
                 delete draft[key];
               }
+
               return draft;
             })
           );
diff --git a/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx b/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx
index 843fa41cfb0f6..c9e29abb34fea 100644
--- a/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx
@@ -91,6 +91,7 @@ export const PlatformCheckBoxGroupField = ({
     () =>
       (options as EuiCheckboxGroupOption[]).reduce((acc, option) => {
         acc[option.id] = isEmpty(field.value) ? true : field.value?.includes(option.id) ?? false;
+
         return acc;
       }, {} as Record<string, boolean>)
   );
@@ -116,6 +117,7 @@ export const PlatformCheckBoxGroupField = ({
     setCheckboxIdToSelectedMap(() =>
       (options as EuiCheckboxGroupOption[]).reduce((acc, option) => {
         acc[option.id] = isEmpty(field.value) ? true : field.value?.includes(option.id) ?? false;
+
         return acc;
       }, {} as Record<string, boolean>)
     );
diff --git a/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx b/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx
index 362fa5c67e6f9..b669b10d78b00 100644
--- a/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx
@@ -43,12 +43,14 @@ export const getSupportedPlatforms = (payload: string) => {
           acc.push(PlatformType.darwin);
           acc.push(PlatformType.linux);
         }
+
         if (nextPlatform === 'ubuntu') {
           acc.push(PlatformType.linux);
         }
       } else {
         acc.push(nextPlatform);
       }
+
       return acc;
     }, [] as string[])
   ).join(',');
diff --git a/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx b/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx
index b8af2790c6f36..aa72bf291eba7 100644
--- a/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx
@@ -27,6 +27,7 @@ const PlatformIconsComponent: React.FC<PlatformIconsProps> = ({ platform }) => {
         } catch (e) {
           return prevValue;
         }
+
         return platformArray;
       } else {
         return SUPPORTED_PLATFORMS;
diff --git a/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx b/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx
index 8ddd2d14bf145..8590968b58fb0 100644
--- a/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx
@@ -65,6 +65,7 @@ const QueryFlyoutComponent: React.FC<QueryFlyoutProps> = ({
           });
           onClose();
         }
+
         resolve();
       });
     },
diff --git a/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx b/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx
index a6cb38e248774..b46230a65267e 100644
--- a/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx
@@ -84,10 +84,12 @@ export const usePackQueryForm = ({
         if (isArray(draft.platform)) {
           draft.platform.join(',');
         }
+
         if (draft.platform?.split(',').length === 3) {
           // if all platforms are checked then use undefined
           delete draft.platform;
         }
+
         if (isArray(draft.version)) {
           if (!draft.version.length) {
             delete draft.version;
@@ -95,9 +97,11 @@ export const usePackQueryForm = ({
             draft.version = draft.version[0];
           }
         }
+
         if (isEmpty(draft.ecs_mapping)) {
           delete draft.ecs_mapping;
         }
+
         return draft;
       }),
     // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/packs/queries/validations.ts b/x-pack/plugins/osquery/public/packs/queries/validations.ts
index 1c568337524c7..765207a21cbec 100644
--- a/x-pack/plugins/osquery/public/packs/queries/validations.ts
+++ b/x-pack/plugins/osquery/public/packs/queries/validations.ts
@@ -34,6 +34,7 @@ const createUniqueIdValidation = (ids: Set<string>) => {
       };
     }
   };
+
   return uniqueIdCheck;
 };
 
diff --git a/x-pack/plugins/osquery/public/packs/types.ts b/x-pack/plugins/osquery/public/packs/types.ts
index 07f4149cab1ef..7b8b23a36629b 100644
--- a/x-pack/plugins/osquery/public/packs/types.ts
+++ b/x-pack/plugins/osquery/public/packs/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 
 export interface IQueryPayload {
   attributes?: {
diff --git a/x-pack/plugins/osquery/public/packs/use_create_pack.ts b/x-pack/plugins/osquery/public/packs/use_create_pack.ts
index 61287730b54c4..a926730ca9f23 100644
--- a/x-pack/plugins/osquery/public/packs/use_create_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_create_pack.ts
@@ -43,6 +43,7 @@ export const useCreatePack = ({ withRedirect }: UseCreatePackProps) => {
         if (withRedirect) {
           navigateToApp(PLUGIN_ID, { path: pagePathGetters.packs() });
         }
+
         toasts.addSuccess(
           i18n.translate('xpack.osquery.newPack.successToastMessageText', {
             defaultMessage: 'Successfully created "{packName}" pack',
diff --git a/x-pack/plugins/osquery/public/packs/use_delete_pack.ts b/x-pack/plugins/osquery/public/packs/use_delete_pack.ts
index 1e5b55b90600f..505a941753a8a 100644
--- a/x-pack/plugins/osquery/public/packs/use_delete_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_delete_pack.ts
@@ -40,6 +40,7 @@ export const useDeletePack = ({ packId, withRedirect }: UseDeletePackProps) => {
       if (withRedirect) {
         navigateToApp(PLUGIN_ID, { path: pagePathGetters.packs() });
       }
+
       toasts.addSuccess(
         i18n.translate('xpack.osquery.deletePack.successToastMessageText', {
           defaultMessage: 'Successfully deleted pack',
diff --git a/x-pack/plugins/osquery/public/packs/use_pack.ts b/x-pack/plugins/osquery/public/packs/use_pack.ts
index 6aadedab206c4..fb9d92dec81b2 100644
--- a/x-pack/plugins/osquery/public/packs/use_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_pack.ts
@@ -7,8 +7,8 @@
 
 import { useQuery } from 'react-query';
 
+import { GetOnePackagePolicyResponse } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
-import { GetOnePackagePolicyResponse } from '../../../fleet/common';
 import { OsqueryManagerPackagePolicy } from '../../common/types';
 
 interface UsePack {
diff --git a/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts b/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts
index cd30f1798ab4c..fbb16d011fe62 100644
--- a/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts
+++ b/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts
@@ -7,7 +7,7 @@
 
 import { useQuery } from 'react-query';
 import { lastValueFrom } from 'rxjs';
-import { DataView, SortDirection } from '../../../../../src/plugins/data/common';
+import { DataView, SortDirection } from '@kbn/data-plugin/common';
 
 import { useKibana } from '../common/lib/kibana';
 
@@ -70,6 +70,7 @@ export const usePackQueryErrors = ({
       });
 
       searchSource.setField('index', logsDataView);
+
       return lastValueFrom(searchSource.fetch$());
     },
     {
diff --git a/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts b/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts
index 1a50c5b1ca200..a68f361d850fb 100644
--- a/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts
+++ b/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts
@@ -8,7 +8,7 @@
 import { useQuery } from 'react-query';
 import moment from 'moment-timezone';
 import { lastValueFrom } from 'rxjs';
-import { DataView, SortDirection } from '../../../../../src/plugins/data/common';
+import { DataView, SortDirection } from '@kbn/data-plugin/common';
 import { useKibana } from '../common/lib/kibana';
 
 interface UsePackQueryLastResultsProps {
diff --git a/x-pack/plugins/osquery/public/packs/use_update_pack.ts b/x-pack/plugins/osquery/public/packs/use_update_pack.ts
index cc88279802d03..829db7b081aca 100644
--- a/x-pack/plugins/osquery/public/packs/use_update_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_update_pack.ts
@@ -46,6 +46,7 @@ export const useUpdatePack = ({ withRedirect, options }: UseUpdatePackProps) =>
         if (withRedirect) {
           navigateToApp(PLUGIN_ID, { path: pagePathGetters.packs() });
         }
+
         toasts.addSuccess(
           i18n.translate('xpack.osquery.updatePack.successToastMessageText', {
             defaultMessage: 'Successfully updated "{packName}" pack',
diff --git a/x-pack/plugins/osquery/public/plugin.ts b/x-pack/plugins/osquery/public/plugin.ts
index 8a0b61d7aaba6..e88a866cc545f 100644
--- a/x-pack/plugins/osquery/public/plugin.ts
+++ b/x-pack/plugins/osquery/public/plugin.ts
@@ -12,8 +12,8 @@ import {
   PluginInitializerContext,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import {
   OsqueryPluginSetup,
   OsqueryPluginStart,
@@ -50,6 +50,7 @@ export class OsqueryPlugin implements Plugin<OsqueryPluginSetup, OsqueryPluginSt
         const [coreStart, depsStart] = await core.getStartServices();
         // Load application bundle
         const { renderApp } = await import('./application');
+
         // Render the application
         return renderApp(
           coreStart,
diff --git a/x-pack/plugins/osquery/public/results/results_table.tsx b/x-pack/plugins/osquery/public/results/results_table.tsx
index d01886113b31a..dec1d08a0d012 100644
--- a/x-pack/plugins/osquery/public/results/results_table.tsx
+++ b/x-pack/plugins/osquery/public/results/results_table.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { createContext, useEffect, useState, useCallback, useContext, useMemo } from 'react';
 
-import { pagePathGetters } from '../../../fleet/public';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useAllResults } from './use_all_results';
 import { Direction, ResultEdges } from '../../common/search_strategy';
 import { useKibana } from '../common/lib/kibana';
@@ -195,6 +195,7 @@ const ResultsTableComponent: React.FC<ResultsTableComponentProps> = ({
           // @ts-expect-error update types
           acc[value?.field] = [...(acc[value?.field] ?? []), key];
         }
+
         return acc;
       },
       {},
@@ -274,6 +275,7 @@ const ResultsTableComponent: React.FC<ResultsTableComponentProps> = ({
             });
             seen.add(fieldName);
           }
+
           return acc;
         }
 
@@ -291,6 +293,7 @@ const ResultsTableComponent: React.FC<ResultsTableComponentProps> = ({
             });
             seen.add(displayAsText);
           }
+
           return acc;
         }
 
diff --git a/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx b/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx
index d019b831d96f5..e742958b989f0 100644
--- a/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx
+++ b/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useHistory } from 'react-router-dom';
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { ECSMapping } from '../../../../common/schemas/common';
 import { WithHeaderLayout } from '../../../components/layouts';
 import { useBreadcrumbs } from '../../../common/hooks/use_breadcrumbs';
@@ -141,6 +141,7 @@ const SavedQueriesPageComponent = () => {
       item.attributes.updated_by !== item.attributes.created_by
         ? ` @ ${item.attributes.updated_by}`
         : '';
+
     return updatedAt ? `${moment(updatedAt).fromNow()}${updatedBy}` : '-';
   }, []);
 
diff --git a/x-pack/plugins/osquery/public/saved_queries/form/index.tsx b/x-pack/plugins/osquery/public/saved_queries/form/index.tsx
index 33bb7672618e4..cc0aa8ee08ca4 100644
--- a/x-pack/plugins/osquery/public/saved_queries/form/index.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/form/index.tsx
@@ -73,6 +73,7 @@ const SavedQueryFormComponent = forwardRef<SavedQueryFormRefObject, SavedQueryFo
           if (ecsFieldRef.current) {
             return ecsFieldRef.current.validate();
           }
+
           return Promise.resolve(false);
         },
       }),
diff --git a/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx b/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx
index 39e2f6ca51cbc..bf4123fd86128 100644
--- a/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx
@@ -38,12 +38,14 @@ export const useSavedQueryForm = ({
     const res = new Set<string>(ids);
     // @ts-expect-error update types
     if (defaultValue && defaultValue.id) res.delete(defaultValue.id);
+
     return res;
   }, [ids, defaultValue]);
   const formSchema = useMemo<ReturnType<typeof createFormSchema>>(
     () => createFormSchema(idSet),
     [idSet]
   );
+
   return useForm({
     id: SAVED_QUERY_FORM_ID + uuid.v4(),
     schema: formSchema,
@@ -70,6 +72,7 @@ export const useSavedQueryForm = ({
           // @ts-expect-error update types
           delete draft.platform;
         }
+
         if (isArray(draft.version)) {
           if (!draft.version.length) {
             // @ts-expect-error update types
@@ -78,12 +81,15 @@ export const useSavedQueryForm = ({
             draft.version = draft.version[0];
           }
         }
+
         if (isEmpty(draft.ecs_mapping)) {
           // @ts-expect-error update types
           delete draft.ecs_mapping;
         }
+
         // @ts-expect-error update types
         draft.interval = draft.interval + '';
+
         return draft;
       }),
     // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx b/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx
index 32812b9331811..4d352b7fd2516 100644
--- a/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx
@@ -8,7 +8,7 @@
 import { find } from 'lodash/fp';
 import { EuiCodeBlock, EuiFormRow, EuiComboBox, EuiTextColor } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { SimpleSavedObject } from 'kibana/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import styled from 'styled-components';
@@ -75,6 +75,7 @@ const SavedQueriesDropdownComponent: React.FC<SavedQueriesDropdownProps> = ({
       if (!newSelectedOptions.length) {
         onChange(null);
         setSelectedOptions(newSelectedOptions);
+
         return;
       }
 
diff --git a/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts b/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts
index 3ecab8a6d2c4d..ecbaf8d08f71a 100644
--- a/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts
+++ b/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts
@@ -45,6 +45,7 @@ export const useCreateSavedQuery = ({ withRedirect }: UseCreateSavedQueryProps)
         if (withRedirect) {
           navigateToApp(PLUGIN_ID, { path: pagePathGetters.saved_queries() });
         }
+
         toasts.addSuccess(
           i18n.translate('xpack.osquery.newSavedQuery.successToastMessageText', {
             defaultMessage: 'Successfully saved "{savedQueryId}" query',
diff --git a/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx b/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx
index 57f96c1f9bc03..5e158c51c02d1 100644
--- a/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx
+++ b/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx
@@ -11,6 +11,7 @@ import React, { lazy, Suspense } from 'react';
 // eslint-disable-next-line react/display-name
 export const getLazyOsqueryAction = (services) => (props) => {
   const OsqueryAction = lazy(() => import('./osquery_action'));
+
   return (
     <Suspense fallback={null}>
       <OsqueryAction services={services} {...props} />
diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts
index 595296e4d7b60..5cd84739cd7d1 100644
--- a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts
+++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts
@@ -39,6 +39,7 @@ export const useIsOsqueryAvailable = (agentId?: string) => {
       'package.name',
       OSQUERY_INTEGRATION_NAME,
     ]);
+
     return osqueryPackageInstalled?.enabled;
   }, [agentPolicyData?.package_policies, policyError]);
 
diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts
index c293e4c75a910..77c91957b10dc 100644
--- a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts
+++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts
@@ -7,9 +7,9 @@
 import { useKibana } from '../../common/lib/kibana';
 import { useIsOsqueryAvailableSimple } from './use_is_osquery_available_simple';
 import { renderHook } from '@testing-library/react-hooks';
-import { createStartServicesMock } from '../../../../triggers_actions_ui/public/common/lib/kibana/kibana_react.mock';
+import { createStartServicesMock } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana/kibana_react.mock';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../common/lib/kibana');
 
diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx
index efe34b51ea0a3..e871e185b830f 100644
--- a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx
+++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx
@@ -8,9 +8,9 @@
 import { useEffect, useState } from 'react';
 
 import { find } from 'lodash';
+import { AgentPolicy, FleetServerAgent, NewPackagePolicy } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../../common/lib/kibana';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { AgentPolicy, FleetServerAgent, NewPackagePolicy } from '../../../../fleet/common';
 
 interface IProps {
   agentId: string;
diff --git a/x-pack/plugins/osquery/public/shared_imports.ts b/x-pack/plugins/osquery/public/shared_imports.ts
index c8f163b5bccfc..4e08bcd46d9ee 100644
--- a/x-pack/plugins/osquery/public/shared_imports.ts
+++ b/x-pack/plugins/osquery/public/shared_imports.ts
@@ -15,7 +15,7 @@ export type {
   ValidationError,
   ValidationFunc,
   ValidationFuncArg,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   getUseField,
   getFieldValidityAndErrorMessage,
@@ -29,7 +29,7 @@ export {
   useFormContext,
   useFormData,
   VALIDATION_TYPES,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   Field,
@@ -37,10 +37,10 @@ export {
   ToggleField,
   SelectField,
   JsonEditorField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
-export type { ERROR_CODE } from '../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
+export type { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
 
-export { EuiCodeEditor } from '../../../../src/plugins/es_ui_shared/public';
-export type { EuiCodeEditorProps } from '../../../../src/plugins/es_ui_shared/public';
-export { useUiSetting$, KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+export type { EuiCodeEditorProps } from '@kbn/es-ui-shared-plugin/public';
+export { useUiSetting$, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/osquery/public/types.ts b/x-pack/plugins/osquery/public/types.ts
index 91095b6f169c1..8679f4fa9373f 100644
--- a/x-pack/plugins/osquery/public/types.ts
+++ b/x-pack/plugins/osquery/public/types.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { DiscoverStart } from '../../../../src/plugins/discover/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { FleetStart } from '../../fleet/public';
-import { LensPublicStart } from '../../lens/public';
-import { SecurityPluginStart } from '../../security/public';
-import { CoreStart } from '../../../../src/core/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FleetStart } from '@kbn/fleet-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { SecurityPluginStart } from '@kbn/security-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { getLazyOsqueryAction } from './shared_components';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/plugins/osquery/server/common/types.ts b/x-pack/plugins/osquery/server/common/types.ts
index 3021cadb6cae3..30e504e10996e 100644
--- a/x-pack/plugins/osquery/server/common/types.ts
+++ b/x-pack/plugins/osquery/server/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export interface IQueryPayload {
   attributes?: {
diff --git a/x-pack/plugins/osquery/server/create_config.ts b/x-pack/plugins/osquery/server/create_config.ts
index 6e4a4e7742f7a..cf07e739ded29 100644
--- a/x-pack/plugins/osquery/server/create_config.ts
+++ b/x-pack/plugins/osquery/server/create_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigType } from './config';
 
diff --git a/x-pack/plugins/osquery/server/index.ts b/x-pack/plugins/osquery/server/index.ts
index 03da89d72d7b9..7b47aec4c6caa 100644
--- a/x-pack/plugins/osquery/server/index.ts
+++ b/x-pack/plugins/osquery/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { OsqueryPlugin } from './plugin';
 import { ConfigSchema, ConfigType } from './config';
 
diff --git a/x-pack/plugins/osquery/server/lib/fleet_integration.ts b/x-pack/plugins/osquery/server/lib/fleet_integration.ts
index 87d48c95648bb..b0cfcbd32a029 100644
--- a/x-pack/plugins/osquery/server/lib/fleet_integration.ts
+++ b/x-pack/plugins/osquery/server/lib/fleet_integration.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectReference, SavedObjectsClient } from 'kibana/server';
+import { SavedObjectReference, SavedObjectsClient } from '@kbn/core/server';
 import { filter, map } from 'lodash';
+import { PostPackagePolicyDeleteCallback } from '@kbn/fleet-plugin/server';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { packSavedObjectType } from '../../common/types';
-import { PostPackagePolicyDeleteCallback } from '../../../fleet/server';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 
 export const getPackagePolicyDeleteCallback =
diff --git a/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts b/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts
index 2816231cd094e..a7191712f8dc7 100644
--- a/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts
+++ b/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger, LoggerFactory } from '../../../../../src/core/server';
-import { SecurityPluginStart } from '../../../security/server';
+import { CoreSetup, Logger, LoggerFactory } from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   AgentService,
   FleetStartContract,
   PackageService,
   AgentPolicyServiceInterface,
   PackagePolicyServiceInterface,
-} from '../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import { ConfigType } from '../config';
 import { TelemetryEventsSender } from './telemetry/sender';
 
diff --git a/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts b/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
index d4d92d968e49d..b586ef309b202 100644
--- a/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
+++ b/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
@@ -6,8 +6,8 @@
  */
 
 import { uniq } from 'lodash';
-import type { SavedObjectsClientContract } from 'src/core/server';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 import { OsqueryAppContext } from './osquery_app_context_services';
 
@@ -30,6 +30,7 @@ const aggregateResults = async (
     const { results: additionalResults } = await generator(currPage++, PER_PAGE);
     results.push(...additionalResults);
   }
+
   return uniq<string>(results);
 };
 
@@ -52,6 +53,7 @@ export const parseAgentSelection = async (
         perPage,
         page,
       });
+
       return { results: items.map((it) => it.policy_id), total };
     });
     kueryFragments.push(`policy_id:(${uniq(osqueryPolicies).join(' or ')})`);
@@ -64,6 +66,7 @@ export const parseAgentSelection = async (
           kuery,
           showInactive: false,
         });
+
         return { results: res.agents.map((agent) => agent.id), total: res.total };
       });
       fetchedAgents.forEach(addAgent);
@@ -73,9 +76,11 @@ export const parseAgentSelection = async (
         if (platformsSelected.length) {
           groupFragments.push(`local_metadata.os.platform:(${platformsSelected.join(' or ')})`);
         }
+
         if (policiesSelected.length) {
           groupFragments.push(`policy_id:(${policiesSelected.join(' or ')})`);
         }
+
         kueryFragments.push(`(${groupFragments.join(' or ')})`);
         const kuery = kueryFragments.join(' and ');
         const fetchedAgents = await aggregateResults(async (page, perPage) => {
@@ -85,6 +90,7 @@ export const parseAgentSelection = async (
             kuery,
             showInactive: false,
           });
+
           return { results: res.agents.map((agent) => agent.id), total: res.total };
         });
         fetchedAgents.forEach(addAgent);
diff --git a/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts b/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts
index db9b3f05ecd45..cbf94bb2e5250 100644
--- a/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts
+++ b/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts
@@ -6,7 +6,7 @@
  */
 
 import { produce } from 'immer';
-import { SavedObjectsType } from '../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   savedQuerySavedObjectType,
   packSavedObjectType,
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts b/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts
index 4b1186299be53..e5814e6db55ee 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ConcreteTaskInstance, TaskStatus } from '../../../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TelemetryEventsSender } from '../sender';
 import { TelemetryReceiver } from '../receiver';
 import { OsqueryTelemetryTaskConfig } from '../task';
-import { PackagePolicy } from '../../../../../fleet/common/types/models/package_policy';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
 
 export const createMockTelemetryEventsSender = (
   enableTelemetry?: boolean
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/filters.ts b/x-pack/plugins/osquery/server/lib/telemetry/filters.ts
index 9ef572e6879e2..513242ffb583d 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/filters.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/filters.ts
@@ -49,18 +49,21 @@ export function copyAllowlistedFields(
         return { ...newEvent, [allowKey]: eventValue };
       } else if (typeof allowValue === 'object' && Array.isArray(eventValue)) {
         const subValues = eventValue.filter((v) => typeof v === 'object');
+
         return {
           ...newEvent,
           [allowKey]: subValues.map((v) => copyAllowlistedFields(allowValue, v as TelemetryEvent)),
         };
       } else if (typeof allowValue === 'object' && typeof eventValue === 'object') {
         const values = copyAllowlistedFields(allowValue, eventValue as TelemetryEvent);
+
         return {
           ...newEvent,
           ...(Object.keys(values).length > 0 ? { [allowKey]: values } : {}),
         };
       }
     }
+
     return newEvent;
   }, {});
 }
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts b/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts
index 061f3b9905f8b..3e4f957b29cef 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { copyAllowlistedFields, packEventFields, savedQueryEventFields } from './filters';
 import type { ESClusterInfo, ESLicense, ListTemplate, TelemetryEvent } from './types';
 
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts b/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts
index 59280ab342a97..393f6b502c2a9 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts
@@ -10,10 +10,10 @@ import {
   CoreStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
+import { AgentClient, AgentPolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { packSavedObjectType, savedQuerySavedObjectType } from '../../../common/types';
-import { AgentClient, AgentPolicyServiceInterface } from '../../../../fleet/server';
 import type { ESLicense, ESClusterInfo } from './types';
 import { OsqueryAppContextService } from '../osquery_app_context_services';
 
@@ -111,6 +111,7 @@ export class TelemetryReceiver {
       return (await ret).license;
     } catch (err) {
       this.logger.debug(`failed retrieving license: ${err}`);
+
       return undefined;
     }
   }
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts b/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts
index c4e30f97fffcc..7a572a1849f11 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable dot-notation */
 import { TelemetryEventsSender } from './sender';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { URL } from 'url';
 
 describe('TelemetryEventsSender', () => {
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/sender.ts b/x-pack/plugins/osquery/server/lib/telemetry/sender.ts
index 84fd4d3004c92..ab5af7d60f466 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/sender.ts
@@ -9,13 +9,13 @@ import axios from 'axios';
 import { URL } from 'url';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { TelemetryReceiver } from './receiver';
 import { createTelemetryTaskConfigs } from './tasks';
 import { createUsageCounterLabel } from './helpers';
@@ -59,6 +59,7 @@ export class TelemetryEventsSender {
         (config: OsqueryTelemetryTaskConfig) => {
           const task = new OsqueryTelemetryTask(config, this.logger, this, telemetryReceiver);
           task.register(taskManager);
+
           return task;
         }
       );
@@ -128,6 +129,7 @@ export class TelemetryEventsSender {
 
   public async isTelemetryOptedIn() {
     this.isOptedIn = await this.telemetryStart?.getIsOptedIn();
+
     return this.isOptedIn === true;
   }
 
@@ -148,6 +150,7 @@ export class TelemetryEventsSender {
         this.logger.debug(`Telemetry is not opted-in.`);
         this.queue = [];
         this.isSending = false;
+
         return;
       }
 
@@ -183,6 +186,7 @@ export class TelemetryEventsSender {
     } catch (err) {
       this.queue = [];
     }
+
     this.isSending = false;
   }
 
@@ -229,6 +233,7 @@ export class TelemetryEventsSender {
     if (!telemetryUrl) {
       throw Error("Couldn't get telemetry URL");
     }
+
     return this.getV3UrlFromV2(telemetryUrl.toString(), channel);
   }
 
@@ -242,6 +247,7 @@ export class TelemetryEventsSender {
     } else {
       url.pathname = `/v3-dev/send/${channel}`;
     }
+
     return url.toString();
   }
 
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts b/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts
index eaa0aa4f20464..9af355a2fd00a 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { SuccessfulRunResult } from '../../../../task_manager/server/task';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { SuccessfulRunResult } from '@kbn/task-manager-plugin/server/task';
 import { OsqueryTelemetryTask } from './task';
 import {
   createMockTaskInstance,
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/task.ts b/x-pack/plugins/osquery/server/lib/telemetry/task.ts
index aff75ef28a41b..30ce7c8ce925a 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/task.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/task.ts
@@ -6,12 +6,12 @@
  */
 
 import moment from 'moment';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { TelemetryReceiver } from './receiver';
 import { TelemetryEventsSender } from './sender';
 
@@ -131,16 +131,19 @@ export class OsqueryTelemetryTask {
     this.logger.debug(`[task ${taskId}]: attempting to run`);
     if (taskId !== this.getTaskId()) {
       this.logger.debug(`[task ${taskId}]: outdated task`);
+
       return 0;
     }
 
     const isOptedIn = await this.sender.isTelemetryOptedIn();
     if (!isOptedIn) {
       this.logger.debug(`[task ${taskId}]: telemetry is not opted-in`);
+
       return 0;
     }
 
     this.logger.debug(`[task ${taskId}]: running task`);
+
     return this.config.runTask(taskId, this.logger, this.receiver, this.sender, executionPeriod);
   };
 }
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts b/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts
index e863481a725f1..fdc4ce088b288 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TELEMETRY_CHANNEL_PACKS } from '../constants';
 import { templatePacks } from '../helpers';
 import { TelemetryEventsSender } from '../sender';
@@ -43,6 +43,7 @@ export function createTelemetryPacksTaskConfig() {
 
       if (!packsResponse?.total) {
         logger.debug('no packs found');
+
         return 0;
       }
 
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts b/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts
index 962e0d2379696..86218710ca67a 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TELEMETRY_CHANNEL_SAVED_QUERIES } from '../constants';
 import { templateSavedQueries } from '../helpers';
 import { TelemetryEventsSender } from '../sender';
@@ -43,6 +43,7 @@ export function createTelemetrySavedQueriesTaskConfig() {
 
       if (!savedQueriesResponse?.total) {
         logger.debug('no saved queries found');
+
         return 0;
       }
 
diff --git a/x-pack/plugins/osquery/server/plugin.ts b/x-pack/plugins/osquery/server/plugin.ts
index 0533b770e8895..6f0cf824684e7 100644
--- a/x-pack/plugins/osquery/server/plugin.ts
+++ b/x-pack/plugins/osquery/server/plugin.ts
@@ -14,8 +14,8 @@ import {
   Logger,
   SavedObjectsClient,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
-import { UsageCounter } from '../../../../src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 import { createConfig } from './create_config';
 import { OsqueryPluginSetup, OsqueryPluginStart, SetupPlugins, StartPlugins } from './types';
diff --git a/x-pack/plugins/osquery/server/routes/action/create_action_route.ts b/x-pack/plugins/osquery/server/routes/action/create_action_route.ts
index b37e6032331dd..a67b6ee95b9d3 100644
--- a/x-pack/plugins/osquery/server/routes/action/create_action_route.ts
+++ b/x-pack/plugins/osquery/server/routes/action/create_action_route.ts
@@ -9,7 +9,7 @@ import { pickBy, isEmpty } from 'lodash';
 import uuid from 'uuid';
 import moment from 'moment-timezone';
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 import { parseAgentSelection, AgentSelection } from '../../lib/parse_agent_groups';
@@ -35,8 +35,9 @@ export const createActionRoute = (router: IRouter, osqueryContext: OsqueryAppCon
       },
     },
     async (context, request, response) => {
-      const esClient = context.core.elasticsearch.client.asInternalUser;
-      const soClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const esClient = coreContext.elasticsearch.client.asInternalUser;
+      const soClient = coreContext.savedObjects.client;
       const internalSavedObjectsClient = await getInternalSavedObjectsClient(
         osqueryContext.getStartServices
       );
@@ -75,6 +76,7 @@ export const createActionRoute = (router: IRouter, osqueryContext: OsqueryAppCon
       incrementCount(internalSavedObjectsClient, 'live_query');
       if (!selectedAgents.length) {
         incrementCount(internalSavedObjectsClient, 'live_query', 'errors');
+
         return response.badRequest({ body: new Error('No agents found for selection') });
       }
 
@@ -111,6 +113,7 @@ export const createActionRoute = (router: IRouter, osqueryContext: OsqueryAppCon
         });
       } catch (error) {
         incrementCount(internalSavedObjectsClient, 'live_query', 'errors');
+
         return response.customError({
           statusCode: 500,
           body: new Error(`Error occurred while processing ${error}`),
diff --git a/x-pack/plugins/osquery/server/routes/action/index.ts b/x-pack/plugins/osquery/server/routes/action/index.ts
index fcf89d79dd0ee..92793aeff44f1 100644
--- a/x-pack/plugins/osquery/server/routes/action/index.ts
+++ b/x-pack/plugins/osquery/server/routes/action/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { createActionRoute } from './create_action_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
diff --git a/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts b/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts
index 539f7083f0f2e..2b8c8b0de23d5 100644
--- a/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts
@@ -8,12 +8,12 @@
 import { filter } from 'lodash/fp';
 import { schema } from '@kbn/config-schema';
 import { asyncForEach } from '@kbn/std';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 
+import { KibanaAssetReference } from '@kbn/fleet-plugin/common';
 import { packAssetSavedObjectType, packSavedObjectType } from '../../../common/types';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
-import { KibanaAssetReference } from '../../../../fleet/common';
 
 export const getAssetsStatusRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
   router.get(
@@ -25,7 +25,7 @@ export const getAssetsStatusRoute = (router: IRouter, osqueryContext: OsqueryApp
       options: { tags: [`access:${PLUGIN_ID}-writePacks`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const savedObjectsClient = (await context.core).savedObjects.client;
 
       let installation;
 
diff --git a/x-pack/plugins/osquery/server/routes/asset/index.ts b/x-pack/plugins/osquery/server/routes/asset/index.ts
index d232d499f9bd0..72294d8cf4b5b 100644
--- a/x-pack/plugins/osquery/server/routes/asset/index.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { getAssetsStatusRoute } from './get_assets_status_route';
 import { updateAssetsRoute } from './update_assets_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
diff --git a/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts b/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
index f3c2261389718..9990c8dbc7b82 100644
--- a/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
@@ -11,13 +11,13 @@ import { schema } from '@kbn/config-schema';
 import { asyncForEach } from '@kbn/std';
 import deepmerge from 'deepmerge';
 
+import { IRouter } from '@kbn/core/server';
+import { KibanaAssetReference } from '@kbn/fleet-plugin/common';
 import { packAssetSavedObjectType, packSavedObjectType } from '../../../common/types';
 import { combineMerge } from './utils';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertSOQueriesToPack, convertPackQueriesToSO } from '../pack/utils';
-import { KibanaAssetReference } from '../../../../fleet/common';
 import { PackSavedObjectAttributes } from '../../common/types';
 
 export const updateAssetsRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
@@ -30,7 +30,7 @@ export const updateAssetsRoute = (router: IRouter, osqueryContext: OsqueryAppCon
       options: { tags: [`access:${PLUGIN_ID}-writePacks`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const savedObjectsClient = (await context.core).savedObjects.client;
       const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
 
       let installation;
diff --git a/x-pack/plugins/osquery/server/routes/asset/utils.ts b/x-pack/plugins/osquery/server/routes/asset/utils.ts
index 4ad80c924920d..c1910bd09078e 100644
--- a/x-pack/plugins/osquery/server/routes/asset/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/utils.ts
@@ -22,5 +22,6 @@ export const combineMerge = (target, source, options) => {
       destination.push(item);
     }
   });
+
   return destination;
 };
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts
index e2b11b21429e3..38642bc0bb770 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const getAgentDetailsRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts
index f190f9abfaf78..4dcaf33200dda 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts
@@ -13,9 +13,9 @@ import {
   GetAgentPoliciesResponseItem,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PackagePolicy,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { OSQUERY_INTEGRATION_NAME, PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
 
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts
index 9f2e523941bc2..3532f8352cd76 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
 
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts
index 18fc42d725c10..52c35cfe669e1 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { GetAgentStatusResponse } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { GetAgentStatusResponse } from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const getAgentStatusForAgentPolicyRoute = (
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts
index 7f5c80cf48d61..c742e6abdde84 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const getAgentsRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts
index 36d22abc1fd05..255b532558d69 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
 
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts
index 1821e19da975e..394ca5bbcad72 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getAgentPoliciesRoute } from './get_agent_policies';
 import { getAgentPolicyRoute } from './get_agent_policy';
diff --git a/x-pack/plugins/osquery/server/routes/index.ts b/x-pack/plugins/osquery/server/routes/index.ts
index 5eb35f2a444a8..f723fe9dbd9ae 100644
--- a/x-pack/plugins/osquery/server/routes/index.ts
+++ b/x-pack/plugins/osquery/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { initActionRoutes } from './action';
 import { OsqueryAppContext } from '../lib/osquery_app_context_services';
 import { initSavedQueryRoutes } from './saved_query';
diff --git a/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
index 69384619596a2..bf34152078582 100644
--- a/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
@@ -13,8 +13,8 @@ import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PackagePolicy,
-} from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { PLUGIN_ID } from '../../../common';
@@ -60,8 +60,9 @@ export const createPackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
       options: { tags: [`access:${PLUGIN_ID}-writePacks`] },
     },
     async (context, request, response) => {
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const esClient = coreContext.elasticsearch.client.asCurrentUser;
+      const savedObjectsClient = coreContext.savedObjects.client;
       const internalSavedObjectsClient = await getInternalSavedObjectsClient(
         osqueryContext.getStartServices
       );
@@ -135,9 +136,11 @@ export const createPackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                   if (!has(draft, 'inputs[0].streams')) {
                     set(draft, 'inputs[0].streams', []);
                   }
+
                   set(draft, `inputs[0].config.osquery.value.packs.${packSO.attributes.name}`, {
                     queries,
                   });
+
                   return draft;
                 })
               );
diff --git a/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts
index aa4496035f774..9fc8713348c14 100644
--- a/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts
@@ -8,11 +8,11 @@
 import { has, filter, unset } from 'lodash';
 import { produce } from 'immer';
 import { schema } from '@kbn/config-schema';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { PLUGIN_ID } from '../../../common';
 
-import { IRouter } from '../../../../../../src/core/server';
 import { packSavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
@@ -28,8 +28,9 @@ export const deletePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
       options: { tags: [`access:${PLUGIN_ID}-writePacks`] },
     },
     async (context, request, response) => {
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const esClient = coreContext.elasticsearch.client.asCurrentUser;
+      const savedObjectsClient = coreContext.savedObjects.client;
       const packagePolicyService = osqueryContext.service.getPackagePolicyService();
 
       const currentPackSO = await savedObjectsClient.get<{ name: string }>(
@@ -62,6 +63,7 @@ export const deletePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                 draft,
                 `inputs[0].config.osquery.value.packs.${[currentPackSO.attributes.name]}`
               );
+
               return draft;
             })
           )
diff --git a/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts
index 4f09ad1dcffbe..b9e2326d941b9 100644
--- a/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts
@@ -8,8 +8,8 @@
 import { filter, map } from 'lodash';
 import { schema } from '@kbn/config-schema';
 
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { packSavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { PLUGIN_ID } from '../../../common';
@@ -34,7 +34,8 @@ export const findPackRoute = (router: IRouter, osqueryContext: OsqueryAppContext
       options: { tags: [`access:${PLUGIN_ID}-readPacks`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
 
       const soClientResponse = await savedObjectsClient.find<PackSavedObjectAttributes>({
         type: packSavedObjectType,
@@ -53,6 +54,7 @@ export const findPackRoute = (router: IRouter, osqueryContext: OsqueryAppContext
 
         // @ts-expect-error update types
         pack.policy_ids = policyIds;
+
         return pack;
       });
 
diff --git a/x-pack/plugins/osquery/server/routes/pack/index.ts b/x-pack/plugins/osquery/server/routes/pack/index.ts
index 7e7d338de2358..0af02dd9694f5 100644
--- a/x-pack/plugins/osquery/server/routes/pack/index.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 import { createPackRoute } from './create_pack_route';
diff --git a/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts
index a181b4c52a730..bd9f27a569af8 100644
--- a/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts
@@ -7,11 +7,11 @@
 
 import { filter, map } from 'lodash';
 import { schema } from '@kbn/config-schema';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { PackSavedObjectAttributes } from '../../common/types';
 import { PLUGIN_ID } from '../../../common';
 
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
 import { packSavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertSOQueriesToPack } from './utils';
@@ -29,7 +29,8 @@ export const readPackRoute = (router: IRouter, osqueryContext: OsqueryAppContext
       options: { tags: [`access:${PLUGIN_ID}-readPacks`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
 
       const { attributes, references, ...rest } =
         await savedObjectsClient.get<PackSavedObjectAttributes>(
diff --git a/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
index f04a0a37d0c5d..82d880c70fbd6 100644
--- a/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
@@ -13,8 +13,8 @@ import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PackagePolicy,
-} from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { packSavedObjectType } from '../../../common/types';
@@ -70,8 +70,9 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
       options: { tags: [`access:${PLUGIN_ID}-writePacks`] },
     },
     async (context, request, response) => {
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const esClient = coreContext.elasticsearch.client.asCurrentUser;
+      const savedObjectsClient = coreContext.savedObjects.client;
       const internalSavedObjectsClient = await getInternalSavedObjectsClient(
         osqueryContext.getStartServices
       );
@@ -192,6 +193,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                     if (!has(draft, 'inputs[0].streams')) {
                       set(draft, 'inputs[0].streams', []);
                     }
+
                     set(
                       draft,
                       `inputs[0].config.osquery.value.packs.${updatedPackSO.attributes.name}`,
@@ -199,6 +201,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                         queries: updatedPackSO.attributes.queries,
                       }
                     );
+
                     return draft;
                   })
                 );
@@ -221,6 +224,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                     draft,
                     `inputs[0].config.osquery.value.packs.${currentPackSO.attributes.name}`
                   );
+
                   return draft;
                 })
               );
@@ -248,6 +252,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                     draft,
                     `inputs[0].config.osquery.value.packs.${currentPackSO.attributes.name}`
                   );
+
                   return draft;
                 })
               );
@@ -280,6 +285,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                       queries: updatedPackSO.attributes.queries,
                     }
                   );
+
                   return draft;
                 })
               );
@@ -301,6 +307,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                   if (!(draft.inputs.length && draft.inputs[0].streams.length)) {
                     set(draft, 'inputs[0].streams', []);
                   }
+
                   set(
                     draft,
                     `inputs[0].config.osquery.value.packs.${updatedPackSO.attributes.name}`,
@@ -308,6 +315,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                       queries: updatedPackSO.attributes.queries,
                     }
                   );
+
                   return draft;
                 })
               );
diff --git a/x-pack/plugins/osquery/server/routes/pack/utils.ts b/x-pack/plugins/osquery/server/routes/pack/utils.ts
index 004ba7c6d2700..9edb750263209 100644
--- a/x-pack/plugins/osquery/server/routes/pack/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/utils.ts
@@ -19,6 +19,7 @@ export const convertPackQueriesToSO = (queries) =>
         ...pick(value, ['query', 'interval', 'platform', 'version']),
         ...(ecsMapping ? { ecs_mapping: ecsMapping } : {}),
       });
+
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -35,6 +36,7 @@ export const convertSOQueriesToPack = (queries) =>
         ...query,
         ecs_mapping: convertECSMappingToObject(ecs_mapping),
       };
+
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/plugins/osquery/server/routes/privileges_check/index.ts b/x-pack/plugins/osquery/server/routes/privileges_check/index.ts
index 8932b23b85f5a..d05b914ade03f 100644
--- a/x-pack/plugins/osquery/server/routes/privileges_check/index.ts
+++ b/x-pack/plugins/osquery/server/routes/privileges_check/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { privilegesCheckRoute } from './privileges_check_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
diff --git a/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts b/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts
index bbfdfc0ab044a..376f131f09b8e 100644
--- a/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts
+++ b/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { IRouter } from '@kbn/core/server';
 import { OSQUERY_INTEGRATION_NAME, PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const privilegesCheckRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
index 66c114012fd78..e8bcb9d6bb3b2 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty, pickBy } from 'lodash';
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
 import {
   createSavedQueryRequestSchema,
@@ -30,7 +30,8 @@ export const createSavedQueryRoute = (router: IRouter, osqueryContext: OsqueryAp
       options: { tags: [`access:${PLUGIN_ID}-writeSavedQueries`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
 
       // eslint-disable-next-line @typescript-eslint/naming-convention
       const { id, description, platform, query, version, interval, ecs_mapping } = request.body;
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts
index 6c36d965d2314..c2a2ad7fa8619 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 
 export const deleteSavedQueryRoute = (router: IRouter) => {
@@ -22,7 +22,8 @@ export const deleteSavedQueryRoute = (router: IRouter) => {
       options: { tags: [`access:${PLUGIN_ID}-writeSavedQueries`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
 
       await savedObjectsClient.delete(savedQuerySavedObjectType, request.params.id, {
         refresh: 'wait_for',
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts
index e6ce8b0f768cc..a2b85dbf539d9 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 import { convertECSMappingToObject } from '../utils';
 
@@ -29,7 +29,8 @@ export const findSavedQueryRoute = (router: IRouter) => {
       options: { tags: [`access:${PLUGIN_ID}-readSavedQueries`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
 
       const savedQueries = await savedObjectsClient.find<{
         ecs_mapping: Array<{ field: string; value: string }>;
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/index.ts b/x-pack/plugins/osquery/server/routes/saved_query/index.ts
index 1a8c43599b261..e0bf4f622c42c 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/index.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 import { createSavedQueryRoute } from './create_saved_query_route';
 import { deleteSavedQueryRoute } from './delete_saved_query_route';
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts
index a84ec5a262a64..1c206464d1f65 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 import { convertECSMappingToObject } from '../utils';
 
@@ -23,7 +23,8 @@ export const readSavedQueryRoute = (router: IRouter) => {
       options: { tags: [`access:${PLUGIN_ID}-readSavedQueries`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
 
       const savedQuery = await savedObjectsClient.get<{
         ecs_mapping: Array<{ key: string; value: Record<string, object> }>;
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
index 7431050996deb..1d2bf153afd7f 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
@@ -8,8 +8,8 @@
 import { filter } from 'lodash';
 import { schema } from '@kbn/config-schema';
 
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertECSMappingToArray, convertECSMappingToObject } from '../utils';
@@ -48,7 +48,8 @@ export const updateSavedQueryRoute = (router: IRouter, osqueryContext: OsqueryAp
       options: { tags: [`access:${PLUGIN_ID}-writeSavedQueries`] },
     },
     async (context, request, response) => {
-      const savedObjectsClient = context.core.savedObjects.client;
+      const coreContext = await context.core;
+      const savedObjectsClient = coreContext.savedObjects.client;
       const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
 
       const {
diff --git a/x-pack/plugins/osquery/server/routes/status/create_status_route.ts b/x-pack/plugins/osquery/server/routes/status/create_status_route.ts
index 871e112abc6c2..019582addabb5 100644
--- a/x-pack/plugins/osquery/server/routes/status/create_status_route.ts
+++ b/x-pack/plugins/osquery/server/routes/status/create_status_route.ts
@@ -8,13 +8,13 @@
 import { produce } from 'immer';
 import { satisfies } from 'semver';
 import { filter, reduce, mapKeys, each, set, unset, uniq, map, has } from 'lodash';
-import { packSavedObjectType } from '../../../common/types';
 import {
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   AGENT_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
+import { packSavedObjectType } from '../../../common/types';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertPackQueriesToSO } from '../pack/utils';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
@@ -27,7 +27,8 @@ export const createStatusRoute = (router: IRouter, osqueryContext: OsqueryAppCon
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
     async (context, request, response) => {
-      const esClient = context.core.elasticsearch.client.asInternalUser;
+      const coreContext = await context.core;
+      const esClient = coreContext.elasticsearch.client.asInternalUser;
       const internalSavedObjectsClient = await getInternalSavedObjectsClient(
         osqueryContext.getStartServices
       );
@@ -78,6 +79,7 @@ export const createStatusRoute = (router: IRouter, osqueryContext: OsqueryAppCon
                           const { id: queryId, ...query } = stream.compiled_stream;
                           queries[queryId] = query;
                         }
+
                         return queries;
                       },
                       {} as Record<string, unknown>
diff --git a/x-pack/plugins/osquery/server/routes/status/index.ts b/x-pack/plugins/osquery/server/routes/status/index.ts
index 9e85613165b16..4844547d369fe 100644
--- a/x-pack/plugins/osquery/server/routes/status/index.ts
+++ b/x-pack/plugins/osquery/server/routes/status/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { createStatusRoute } from './create_status_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
diff --git a/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts b/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts
index ae93f08d76bd5..97109a7211d9d 100644
--- a/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts
+++ b/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { usageMetricSavedObjectType } from '../../../common/types';
 
@@ -82,6 +82,7 @@ describe('Usage metric recorder', () => {
           count: 0,
           errors: 0,
         };
+
         return acc;
       }, {} as { [key: string]: CounterValue });
       get.mockClear();
diff --git a/x-pack/plugins/osquery/server/routes/usage/recorder.ts b/x-pack/plugins/osquery/server/routes/usage/recorder.ts
index cd374b9020979..78e2fdf96c1d7 100644
--- a/x-pack/plugins/osquery/server/routes/usage/recorder.ts
+++ b/x-pack/plugins/osquery/server/routes/usage/recorder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { usageMetricSavedObjectType } from '../../../common/types';
 import { LiveQuerySessionUsage } from '../../usage/types';
 
diff --git a/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts b/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts
index 603bcad87cf80..b149fa6d3e69f 100644
--- a/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts
+++ b/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { usageMetricSavedObjectType } from '../../../common/types';
 
diff --git a/x-pack/plugins/osquery/server/routes/utils.ts b/x-pack/plugins/osquery/server/routes/utils.ts
index 62464ec5d6336..c454cf9882d22 100644
--- a/x-pack/plugins/osquery/server/routes/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/utils.ts
@@ -22,6 +22,7 @@ export const convertECSMappingToObject = (
     ecsMapping,
     (acc, value) => {
       acc[value.key] = value.value;
+
       return acc;
     },
     {} as Record<string, { field?: string; value?: string }>
diff --git a/x-pack/plugins/osquery/server/saved_objects.ts b/x-pack/plugins/osquery/server/saved_objects.ts
index 3080c728a4d3c..4281d02c84339 100644
--- a/x-pack/plugins/osquery/server/saved_objects.ts
+++ b/x-pack/plugins/osquery/server/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 
 import { savedQueryType, packType, packAssetType } from './lib/saved_query/saved_object_mappings';
 import { usageMetricType } from './routes/usage/saved_object_mappings';
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts
index e05bd15bcc722..d66d71413b07d 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
   ActionsStrategyResponse,
@@ -21,6 +21,7 @@ export const allActions: OsqueryFactory<OsqueryQueries.actions> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildActionsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts
index 5162475529792..1f920d00a13b0 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { AgentsRequestOptions } from '../../../../../../common/search_strategy';
 // import { createQueryFilterClauses } from '../../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts
index 057af159a5e3e..bdef6fb3bf868 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   ActionDetailsStrategyResponse,
   ActionDetailsRequestOptions,
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts
index 41f2875b1d4c8..3551493baca9c 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { ActionDetailsRequestOptions } from '../../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts
index 50fcf938bdd79..b7de47f60e5dd 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
   ActionResultsStrategyResponse,
@@ -22,6 +22,7 @@ export const actionResults: OsqueryFactory<OsqueryQueries.actionResults> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildActionResultsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
index 96d5ad60cd54c..47f4f814c45a3 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { ActionResultsRequestOptions } from '../../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts
index 7e0532dfec1af..194d9eac5d697 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../common/constants';
 import {
   AgentsStrategyResponse,
@@ -23,6 +23,7 @@ export const allAgents: OsqueryFactory<OsqueryQueries.agents> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildAgentsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts
index 314de574f0a70..45e03f6f5da65 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISearchRequestParams } from '../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { AgentsRequestOptions } from '../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts
index 93cba882e39ed..fa0bdd2899288 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../common/constants';
 import {
   ResultsStrategyResponse,
@@ -21,6 +21,7 @@ export const allResults: OsqueryFactory<OsqueryQueries.results> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildResultsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
index 59326d6c50155..c269789fd56a3 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../../../../common';
-import { ISearchRequestParams } from '../../../../../../../../src/plugins/data/common';
 import { ResultsRequestOptions } from '../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts
index ea03692bf7b01..2c241583e4aa8 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  IEsSearchResponse,
-  ISearchRequestParams,
-} from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse, ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   FactoryQueryTypes,
   StrategyRequestType,
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
index 6242d91b7b94b..1b96296659092 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
@@ -6,12 +6,8 @@
  */
 
 import { map, mergeMap } from 'rxjs/operators';
-import {
-  ISearchStrategy,
-  PluginStart,
-  shimHitsTotal,
-} from '../../../../../../src/plugins/data/server';
-import { ENHANCED_ES_SEARCH_STRATEGY } from '../../../../../../src/plugins/data/common';
+import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 import {
   FactoryQueryTypes,
   StrategyResponseType,
@@ -30,6 +26,7 @@ export const osquerySearchStrategyProvider = <T extends FactoryQueryTypes>(
       if (request.factoryQueryType == null) {
         throw new Error('factoryQueryType is required');
       }
+
       const queryFactory: OsqueryFactory<T> = osqueryFactory[request.factoryQueryType];
       const dsl = queryFactory.buildDsl(request);
 
diff --git a/x-pack/plugins/osquery/server/types.ts b/x-pack/plugins/osquery/server/types.ts
index b07958eaa0d6a..05679cb19c56e 100644
--- a/x-pack/plugins/osquery/server/types.ts
+++ b/x-pack/plugins/osquery/server/types.ts
@@ -5,20 +5,20 @@
  * 2.0.
  */
 
-import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
-import type { ActionsPlugin } from '../../actions/server';
+import type { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server';
+import type { ActionsPlugin } from '@kbn/actions-plugin/server';
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import type { FleetStartContract } from '../../fleet/server';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import type { PluginSetupContract } from '../../features/server';
-import type { SecurityPluginStart } from '../../security/server';
+} from '@kbn/data-plugin/server';
+import type { FleetStartContract } from '@kbn/fleet-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { PluginSetupContract } from '@kbn/features-plugin/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   TaskManagerSetupContract as TaskManagerPluginSetup,
   TaskManagerStartContract as TaskManagerPluginStart,
-} from '../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface OsqueryPluginSetup {}
diff --git a/x-pack/plugins/osquery/server/usage/collector.ts b/x-pack/plugins/osquery/server/usage/collector.ts
index b04fc34e52453..c08776b2d7601 100644
--- a/x-pack/plugins/osquery/server/usage/collector.ts
+++ b/x-pack/plugins/osquery/server/usage/collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, SavedObjectsClient } from '../../../../../src/core/server';
-import { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
+import { CoreSetup, SavedObjectsClient } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import { getBeatUsage, getLiveQueryUsage, getPolicyLevelUsage } from './fetchers';
 import { CollectorDependencies, usageSchema, UsageData } from './types';
 
@@ -15,6 +15,7 @@ export const getInternalSavedObjectsClient = async (
   getStartServices: CoreSetup['getStartServices']
 ) => {
   const [coreStart] = await getStartServices();
+
   return new SavedObjectsClient(coreStart.savedObjects.createInternalRepository());
 };
 
@@ -22,6 +23,7 @@ export const registerCollector: RegisterCollector = ({ core, osqueryContext, usa
   if (!usageCollection) {
     return;
   }
+
   const collector = usageCollection.makeUsageCollector<UsageData>({
     type: 'osquery',
     schema: usageSchema,
diff --git a/x-pack/plugins/osquery/server/usage/fetchers.ts b/x-pack/plugins/osquery/server/usage/fetchers.ts
index 8565d6ccf4289..737c0160166db 100644
--- a/x-pack/plugins/osquery/server/usage/fetchers.ts
+++ b/x-pack/plugins/osquery/server/usage/fetchers.ts
@@ -11,10 +11,14 @@ import {
   AggregationsRateAggregate,
   SearchResponse,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { PackagePolicyServiceInterface } from '../../../fleet/server';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import {
+  ListResult,
+  PackagePolicy,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+} from '@kbn/fleet-plugin/common';
 import { getRouteMetric } from '../routes/usage';
-import { ElasticsearchClient, SavedObjectsClientContract } from '../../../../../src/core/server';
-import { ListResult, PackagePolicy, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 import { METRICS_INDICES } from './constants';
 import { AgentInfo, BeatMetricsUsage, LiveQueryUsage } from './types';
@@ -32,6 +36,7 @@ export async function getPolicyLevelUsage(
   if (!packagePolicyService) {
     return {};
   }
+
   const packagePolicies = await packagePolicyService.list(soClient, {
     kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name:${OSQUERY_INTEGRATION_NAME}`,
     perPage: 10_000,
@@ -74,6 +79,7 @@ export async function getPolicyLevelUsage(
       enrolled: policied.doc_count,
     };
   }
+
   return result;
 }
 
@@ -82,6 +88,7 @@ export function getPackageVersions(packagePolicies: ListResult<PackagePolicy>) {
     if (item.package) {
       acc[item.package.version] = (acc[item.package.version] ?? 0) + 1;
     }
+
     return acc;
   }, {} as { [version: string]: number });
 }
@@ -101,6 +108,7 @@ export function getScheduledQueryUsage(packagePolicies: ListResult<PackagePolicy
       if (policyAgents === 0) {
         ++acc.queryGroups.empty;
       }
+
       return acc;
     },
     {
@@ -202,6 +210,7 @@ export function extractBeatUsageMetrics(
       }
     }
   }
+
   return result;
 }
 
diff --git a/x-pack/plugins/osquery/server/usage/types.ts b/x-pack/plugins/osquery/server/usage/types.ts
index 6ad7295438a1f..9da333599e785 100644
--- a/x-pack/plugins/osquery/server/usage/types.ts
+++ b/x-pack/plugins/osquery/server/usage/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { OsqueryAppContext } from '../lib/osquery_app_context_services';
-import { MakeSchemaFrom } from '../../../../../src/plugins/usage_collection/server';
 import { SetupPlugins } from '../types';
 
 export type CollectorDependencies = {
diff --git a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts
index 0d5b7ecfa94f0..6d1dceb482332 100644
--- a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts
+++ b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { RouteValidationResultFactory } from 'src/core/server';
+import { RouteValidationResultFactory } from '@kbn/core/server';
 
 import { buildRouteValidation, buildRouteValidationWithExcess } from './route_validation';
 
diff --git a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts
index a0c797193a0c3..7590bb7bbde05 100644
--- a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts
+++ b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts
@@ -13,7 +13,7 @@ import {
   RouteValidationFunction,
   RouteValidationResultFactory,
   RouteValidationError,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import { excess, GenericIntersectionC } from '../runtime_types';
 
 type RequestValidationResult<T> =
diff --git a/x-pack/plugins/osquery/server/utils/runtime_types.ts b/x-pack/plugins/osquery/server/utils/runtime_types.ts
index 492cbf07cdeb6..8bc781bfe3b14 100644
--- a/x-pack/plugins/osquery/server/utils/runtime_types.ts
+++ b/x-pack/plugins/osquery/server/utils/runtime_types.ts
@@ -45,14 +45,18 @@ const getProps = (
   if (codec == null) {
     return null;
   }
+
   switch (codec._tag) {
     case 'DictionaryType': {
       if (codec.codomain.props != null) {
         return codec.codomain.props;
       }
+
       const dTypes: rt.HasProps[] = codec.codomain.types;
+
       return dTypes.reduce<rt.Props>((props, type) => Object.assign(props, getProps(type)), {});
     }
+
     case 'RefinementType':
     case 'ReadonlyType':
       return getProps(codec.type);
@@ -62,11 +66,13 @@ const getProps = (
       return codec.props;
     case 'IntersectionType': {
       const iTypes = codec.types as rt.HasProps[];
+
       return iTypes.reduce<rt.Props>(
         (props, type) => Object.assign(props, getProps(type) as rt.Props),
         {} as rt.Props
       ) as rt.Props;
     }
+
     default:
       return null;
   }
@@ -84,6 +90,7 @@ const getExcessProps = (
     const childrenObject = r[k] as Record<string, unknown>;
     if (codecChildren != null && childrenProps != null && codecChildren._tag === 'DictionaryType') {
       const keys = Object.keys(childrenObject);
+
       return [
         ...acc,
         ...keys.reduce<string[]>(
@@ -92,11 +99,13 @@ const getExcessProps = (
         ),
       ];
     }
+
     if (codecChildren != null && childrenProps != null) {
       return [...acc, ...getExcessProps(childrenProps, childrenObject)];
     } else if (codecChildren == null) {
       return [...acc, k];
     }
+
     return acc;
   }, []);
 
@@ -115,6 +124,7 @@ export const excess = <
         if (codecProps == null) {
           return rt.failure(i, c, 'unknown codec');
         }
+
         const ex = getExcessProps(codecProps, s);
 
         return ex.length > 0
@@ -128,5 +138,6 @@ export const excess = <
     codec.encode,
     codecProps
   );
+
   return r as C;
 };
diff --git a/x-pack/plugins/painless_lab/common/constants.ts b/x-pack/plugins/painless_lab/common/constants.ts
index 932e7cde94ac9..b28cf4aa023de 100644
--- a/x-pack/plugins/painless_lab/common/constants.ts
+++ b/x-pack/plugins/painless_lab/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/painless_lab/public/application/components/editor.tsx b/x-pack/plugins/painless_lab/public/application/components/editor.tsx
index 6c4bd5da47911..06cf1a9fb46f9 100644
--- a/x-pack/plugins/painless_lab/public/application/components/editor.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/editor.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { PainlessLang, PainlessContext } from '@kbn/monaco';
 
-import { CodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   code: string;
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
index a2f72ae0f8108..03384b6ae50c4 100644
--- a/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
@@ -20,7 +20,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { PainlessContext } from '@kbn/monaco';
 
-import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { painlessContextOptions } from '../../constants';
 import { useAppContext } from '../../context';
 
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
index c0233947ff064..ba6bc83367956 100644
--- a/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
@@ -10,7 +10,7 @@ import { EuiFormRow, EuiSpacer, EuiIcon, EuiToolTip, EuiLink, EuiText } from '@e
 import { FormattedMessage } from '@kbn/i18n-react';
 import { monaco } from '@kbn/monaco';
 import { i18n } from '@kbn/i18n';
-import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { useAppContext } from '../../context';
 
diff --git a/x-pack/plugins/painless_lab/public/application/context/context.tsx b/x-pack/plugins/painless_lab/public/application/context/context.tsx
index a2e64f1d845f1..896d5ebda15f7 100644
--- a/x-pack/plugins/painless_lab/public/application/context/context.tsx
+++ b/x-pack/plugins/painless_lab/public/application/context/context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, ReactNode, useState, useContext } from 'react';
-import { HttpSetup, ChromeStart } from 'src/core/public';
+import { HttpSetup, ChromeStart } from '@kbn/core/public';
 
 import { Links } from '../../links';
 import { Store, Payload, Validation } from '../types';
diff --git a/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts b/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
index 11cde8ad03d57..733aa0f86035f 100644
--- a/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
+++ b/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
@@ -6,7 +6,7 @@
  */
 
 import { useRef, useCallback, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { debounce } from 'lodash';
 
 import { API_BASE_PATH } from '../../../common/constants';
diff --git a/x-pack/plugins/painless_lab/public/application/index.tsx b/x-pack/plugins/painless_lab/public/application/index.tsx
index 81696c6f568bb..470982244c257 100644
--- a/x-pack/plugins/painless_lab/public/application/index.tsx
+++ b/x-pack/plugins/painless_lab/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreSetup, CoreStart, HttpSetup, ChromeStart, CoreTheme } from 'src/core/public';
+import { CoreSetup, CoreStart, HttpSetup, ChromeStart, CoreTheme } from '@kbn/core/public';
 
 import { createKibanaReactContext, KibanaThemeProvider } from '../shared_imports';
 
diff --git a/x-pack/plugins/painless_lab/public/links.ts b/x-pack/plugins/painless_lab/public/links.ts
index f8c4b55e521ec..254ac28594bac 100644
--- a/x-pack/plugins/painless_lab/public/links.ts
+++ b/x-pack/plugins/painless_lab/public/links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export type Links = ReturnType<typeof getLinks>;
 
diff --git a/x-pack/plugins/painless_lab/public/plugin.tsx b/x-pack/plugins/painless_lab/public/plugin.tsx
index f43ec785b7eaa..bf013bc1661f3 100644
--- a/x-pack/plugins/painless_lab/public/plugin.tsx
+++ b/x-pack/plugins/painless_lab/public/plugin.tsx
@@ -7,15 +7,13 @@
 
 import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup } from 'src/core/public';
-
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { PLUGIN } from '../common/constants';
 
 import { PluginDependencies } from './types';
 import { getLinks } from './links';
-import { ILicense } from '../../licensing/common/types';
 
 const checkLicenseStatus = (license: ILicense) => {
   const { state, message } = license.check(PLUGIN.id, PLUGIN.minimumLicenseType);
@@ -38,7 +36,7 @@ export class PainlessLabUIPlugin implements Plugin<void, void, PluginDependencie
       icon: 'empty',
       path: '/app/dev_tools#/painless_lab',
       showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
     });
 
     const devTool = devTools.register({
diff --git a/x-pack/plugins/painless_lab/public/shared_imports.ts b/x-pack/plugins/painless_lab/public/shared_imports.ts
index 92e3b31f921ba..20a5ade3ca7c2 100644
--- a/x-pack/plugins/painless_lab/public/shared_imports.ts
+++ b/x-pack/plugins/painless_lab/public/shared_imports.ts
@@ -5,7 +5,4 @@
  * 2.0.
  */
 
-export {
-  createKibanaReactContext,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
+export { createKibanaReactContext, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/painless_lab/public/types.ts b/x-pack/plugins/painless_lab/public/types.ts
index c05093e64ec8a..afdc1e8c11b3d 100644
--- a/x-pack/plugins/painless_lab/public/types.ts
+++ b/x-pack/plugins/painless_lab/public/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { DevToolsSetup } from '../../../../src/plugins/dev_tools/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { DevToolsSetup } from '@kbn/dev-tools-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface PluginDependencies {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/painless_lab/server/index.ts b/x-pack/plugins/painless_lab/server/index.ts
index 3093ce7f04154..b94cccf8480cf 100644
--- a/x-pack/plugins/painless_lab/server/index.ts
+++ b/x-pack/plugins/painless_lab/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { PainlessLabServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => {
diff --git a/x-pack/plugins/painless_lab/server/plugin.ts b/x-pack/plugins/painless_lab/server/plugin.ts
index 996adfdc13f64..1d20ab1d13896 100644
--- a/x-pack/plugins/painless_lab/server/plugin.ts
+++ b/x-pack/plugins/painless_lab/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN } from '../common/constants';
 import { License } from './services';
diff --git a/x-pack/plugins/painless_lab/server/routes/api/execute.ts b/x-pack/plugins/painless_lab/server/routes/api/execute.ts
index 58cb9f4328d29..88f2156a5fb4c 100644
--- a/x-pack/plugins/painless_lab/server/routes/api/execute.ts
+++ b/x-pack/plugins/painless_lab/server/routes/api/execute.ts
@@ -25,7 +25,7 @@ export function registerExecuteRoute({ router, license }: RouteDependencies) {
       const body = req.body;
 
       try {
-        const client = ctx.core.elasticsearch.client.asCurrentUser;
+        const client = (await ctx.core).elasticsearch.client.asCurrentUser;
         const response = await client.scriptsPainlessExecute(
           {
             // @ts-expect-error `ExecutePainlessScriptRequest.body` does not allow `string`
diff --git a/x-pack/plugins/painless_lab/server/services/license.ts b/x-pack/plugins/painless_lab/server/services/license.ts
index 05878b170ff1d..5abedb2870fe4 100644
--- a/x-pack/plugins/painless_lab/server/services/license.ts
+++ b/x-pack/plugins/painless_lab/server/services/license.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
-import { LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/painless_lab/server/shared_imports.ts b/x-pack/plugins/painless_lab/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/painless_lab/server/shared_imports.ts
+++ b/x-pack/plugins/painless_lab/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/painless_lab/server/types.ts b/x-pack/plugins/painless_lab/server/types.ts
index b0e40c9f05257..bd4c7d94da0ae 100644
--- a/x-pack/plugins/painless_lab/server/types.ts
+++ b/x-pack/plugins/painless_lab/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { IRouter } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { License } from './services';
 
 export interface RouteDependencies {
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx b/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx
index 385815f3133db..2721cf0082493 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { RemoteClusterAdd } from '../../../public/application/sections';
 import { createRemoteClustersStore } from '../../../public/application/store';
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx b/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx
index 87561ccd79c4d..798e26cd413d2 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { RemoteClusterEdit } from '../../../public/application/sections';
 import { createRemoteClustersStore } from '../../../public/application/store';
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts
index 92b5e4ccbb1ce..c20cdf3f14660 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 import { Cluster } from '../../../common/lib';
 
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx
index 31eec97c83ff7..7502e14186bf3 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx
@@ -6,16 +6,16 @@
  */
 
 import React from 'react';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   notificationServiceMock,
   fatalErrorsServiceMock,
   docLinksServiceMock,
   executionContextServiceMock,
-} from '../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 import { AppContextProvider } from '../../../public/application/app_context';
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
 
 import { init as initBreadcrumb } from '../../../public/application/services/breadcrumb';
 import { init as initHttp } from '../../../public/application/services/http';
diff --git a/x-pack/plugins/remote_clusters/common/constants.ts b/x-pack/plugins/remote_clusters/common/constants.ts
index fca751da37b90..c07d060fb4842 100644
--- a/x-pack/plugins/remote_clusters/common/constants.ts
+++ b/x-pack/plugins/remote_clusters/common/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/app_context.tsx b/x-pack/plugins/remote_clusters/public/application/app_context.tsx
index 5f3bae6133dfd..49679657139aa 100644
--- a/x-pack/plugins/remote_clusters/public/application/app_context.tsx
+++ b/x-pack/plugins/remote_clusters/public/application/app_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { ExecutionContextStart } from 'kibana/public';
+import { ExecutionContextStart } from '@kbn/core/public';
 
 export interface Context {
   isCloudEnabled: boolean;
diff --git a/x-pack/plugins/remote_clusters/public/application/index.d.ts b/x-pack/plugins/remote_clusters/public/application/index.d.ts
index 9f8f80d46a507..26c0721e81b60 100644
--- a/x-pack/plugins/remote_clusters/public/application/index.d.ts
+++ b/x-pack/plugins/remote_clusters/public/application/index.d.ts
@@ -6,7 +6,7 @@
  */
 import { Observable } from 'rxjs';
 
-import { ScopedHistory, CoreTheme, ExecutionContextStart } from 'kibana/public';
+import { ScopedHistory, CoreTheme, ExecutionContextStart } from '@kbn/core/public';
 import { RegisterManagementAppArgs, I18nStart } from '../types';
 
 export declare const renderApp: (
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
index 60a837dce53fe..4e540d18f7fb8 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiButton, EuiCallOut, EuiEmptyPrompt, EuiPageContent, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, SectionLoading } from '../../../shared_imports';
 import { getRouter, redirect } from '../../services';
 import { setBreadcrumbs } from '../../services/breadcrumb';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
index 85cbf119c5302..e31df9c9fccee 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
@@ -31,7 +31,7 @@ import {
   EuiTextColor,
   EuiTitle,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { PROXY_MODE } from '../../../../../common/constants';
 import { ConfiguredByNodeWarning } from '../../components';
 import { ConnectionStatus, RemoveClusterButtonProvider } from '../components';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
index b4af79416c49e..96cdfc81abc6e 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 
 import { remoteClustersUrl } from '../../services/documentation';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, SectionLoading } from '../../../shared_imports';
 import { setBreadcrumbs } from '../../services/breadcrumb';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
index b53c735ef9fbb..35c51268f71e8 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
@@ -20,7 +20,7 @@ import {
   EuiLink,
   EuiToolTip,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { UIM_SHOW_DETAILS_CLICK } from '../../../constants';
 import { PROXY_MODE } from '../../../../../common/constants';
 import { trackUiMetric, METRIC_TYPE, getRouter } from '../../../services';
diff --git a/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts b/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts
index 1f10478bf3543..75df621bc7fcd 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError } from 'kibana/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { toasts, fatalError } from './notification';
 
 interface CommonErrorBody {
diff --git a/x-pack/plugins/remote_clusters/public/application/services/documentation.ts b/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
index e17c3b2563b74..df6f570c14cca 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export let skippingDisconnectedClustersUrl: string;
 export let remoteClustersUrl: string;
diff --git a/x-pack/plugins/remote_clusters/public/application/services/http.ts b/x-pack/plugins/remote_clusters/public/application/services/http.ts
index c2273e827289e..21897029703c0 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/http.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup, HttpResponse } from 'kibana/public';
+import { HttpSetup, HttpResponse } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../common/constants';
 import { Cluster } from '../../../common/lib';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/services/notification.ts b/x-pack/plugins/remote_clusters/public/application/services/notification.ts
index 7ba0e22464c99..7038b365901ee 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/notification.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/notification.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { NotificationsSetup, FatalErrorsSetup } from 'src/core/public';
+import { NotificationsSetup, FatalErrorsSetup } from '@kbn/core/public';
 
 export let toasts: NotificationsSetup['toasts'];
 export let fatalError: FatalErrorsSetup;
diff --git a/x-pack/plugins/remote_clusters/public/application/services/redirect.ts b/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
index e339ebb2abaab..079eb1160528a 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 let navigateToApp: CoreStart['application']['navigateToApp'];
 
diff --git a/x-pack/plugins/remote_clusters/public/application/services/routing.ts b/x-pack/plugins/remote_clusters/public/application/services/routing.ts
index 636fe2616f8d3..25136cd3f73bc 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/routing.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/routing.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 /**
  * This file based on guidance from https://github.com/elastic/eui/blob/master/wiki/react-router.md
diff --git a/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
index 0d75613dec024..ac60c8bc3645d 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { UIM_APP_NAME } from '../constants';
 
 export { METRIC_TYPE };
diff --git a/x-pack/plugins/remote_clusters/public/index.ts b/x-pack/plugins/remote_clusters/public/index.ts
index f2f50a8825e11..2ad0901c4b9b1 100644
--- a/x-pack/plugins/remote_clusters/public/index.ts
+++ b/x-pack/plugins/remote_clusters/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { RemoteClustersUIPlugin } from './plugin';
 
 export type { RemoteClustersPluginSetup } from './plugin';
diff --git a/x-pack/plugins/remote_clusters/public/locator.ts b/x-pack/plugins/remote_clusters/public/locator.ts
index c6ea66f4c4328..636cc619f06e1 100644
--- a/x-pack/plugins/remote_clusters/public/locator.ts
+++ b/x-pack/plugins/remote_clusters/public/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 
 export const REMOTE_CLUSTERS_LOCATOR_ID = 'REMOTE_CLUSTERS_LOCATOR';
 
diff --git a/x-pack/plugins/remote_clusters/public/plugin.ts b/x-pack/plugins/remote_clusters/public/plugin.ts
index c3d00bb0b2f48..aad03252191e2 100644
--- a/x-pack/plugins/remote_clusters/public/plugin.ts
+++ b/x-pack/plugins/remote_clusters/public/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, CoreStart, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, Plugin, CoreStart, PluginInitializerContext } from '@kbn/core/public';
 
 import { PLUGIN } from '../common/constants';
 import { init as initBreadcrumbs } from './application/services/breadcrumb';
diff --git a/x-pack/plugins/remote_clusters/public/shared_imports.ts b/x-pack/plugins/remote_clusters/public/shared_imports.ts
index 2cf69938d5464..130415a327bab 100644
--- a/x-pack/plugins/remote_clusters/public/shared_imports.ts
+++ b/x-pack/plugins/remote_clusters/public/shared_imports.ts
@@ -5,13 +5,6 @@
  * 2.0.
  */
 
-export {
-  extractQueryParams,
-  indices,
-  SectionLoading,
-} from '../../../../src/plugins/es_ui_shared/public';
+export { extractQueryParams, indices, SectionLoading } from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/remote_clusters/public/types.ts b/x-pack/plugins/remote_clusters/public/types.ts
index ad26e388c9fcd..30fe29e41ff64 100644
--- a/x-pack/plugins/remote_clusters/public/types.ts
+++ b/x-pack/plugins/remote_clusters/public/types.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ManagementSetup } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { RegisterManagementAppArgs } from 'src/plugins/management/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import { I18nStart } from 'kibana/public';
-import { CloudSetup } from '../../cloud/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { I18nStart } from '@kbn/core/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
 
 export interface Dependencies {
   management: ManagementSetup;
diff --git a/x-pack/plugins/remote_clusters/server/config.ts b/x-pack/plugins/remote_clusters/server/config.ts
index 5b4972f0a5259..32db006e8171a 100644
--- a/x-pack/plugins/remote_clusters/server/config.ts
+++ b/x-pack/plugins/remote_clusters/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/remote_clusters/server/index.ts b/x-pack/plugins/remote_clusters/server/index.ts
index 9447f9d9209e3..8325b869b150d 100644
--- a/x-pack/plugins/remote_clusters/server/index.ts
+++ b/x-pack/plugins/remote_clusters/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { RemoteClustersServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts b/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts
index 2723d3bf6badd..4655ed78a1f1d 100644
--- a/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts
+++ b/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 export async function doesClusterExist(
   clusterClient: IScopedClusterClient,
diff --git a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts
index 4cd49771f052e..602b9ae075d8b 100644
--- a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts
+++ b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
-import { licensePreRoutingFactory } from '../license_pre_routing_factory';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { licensePreRoutingFactory } from '.';
 import { LicenseStatus } from '../../types';
 
 describe('licensePreRoutingFactory()', () => {
diff --git a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
index 994805762f664..30b6aaf0901e0 100644
--- a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
+++ b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
@@ -10,7 +10,7 @@ import {
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { RouteDependencies } from '../../types';
 
 export const licensePreRoutingFactory = (
diff --git a/x-pack/plugins/remote_clusters/server/plugin.ts b/x-pack/plugins/remote_clusters/server/plugin.ts
index fde71677b8448..1e34a650cfd2b 100644
--- a/x-pack/plugins/remote_clusters/server/plugin.ts
+++ b/x-pack/plugins/remote_clusters/server/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN } from '../common/constants';
 import { Dependencies, LicenseStatus, RouteDependencies } from './types';
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
index fffddbd8e56c1..a1f256802fb57 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 
@@ -104,7 +104,11 @@ describe('ADD remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({ acknowledged: true });
@@ -161,7 +165,11 @@ describe('ADD remote clusters', () => {
         serverName: 'foobar',
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({ acknowledged: true });
@@ -205,7 +213,11 @@ describe('ADD remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(409);
       expect(response.payload).toEqual({
@@ -222,7 +234,11 @@ describe('ADD remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(400);
       expect(response.payload).toEqual({
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
index 915af70f7ffd5..50fb15ef32829 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
 import { serializeCluster, Cluster } from '../../../common/lib';
 import { doesClusterExist } from '../../lib/does_cluster_exist';
@@ -41,7 +41,7 @@ export const register = (deps: RouteDependencies): void => {
     response
   ) => {
     try {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const { name } = request.body;
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
index 7b9b6fae0f66e..ed92c78f9d09d 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory, RequestHandler } from '../../../../../../src/core/server';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 import { register } from './delete_route';
 import { API_BASE_PATH } from '../../../common/constants';
 
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
 import { handleEsError } from '../../shared_imports';
 
@@ -117,7 +117,11 @@ describe('DELETE remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({
@@ -163,7 +167,11 @@ describe('DELETE remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({
@@ -240,7 +248,11 @@ describe('DELETE remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
index bb2bd4a073245..8e11a0cbe2461 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../types';
 import { serializeCluster } from '../../../common/lib';
@@ -34,7 +34,7 @@ export const register = (deps: RouteDependencies): void => {
     response
   ) => {
     try {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const { nameOrNames } = request.params;
       const names = nameOrNames.split(',');
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
index 8fbbb33415fda..c3628af8c2efc 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
@@ -7,12 +7,12 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 
@@ -101,7 +101,11 @@ describe('GET remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual([
@@ -128,7 +132,11 @@ describe('GET remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual([]);
@@ -152,7 +160,11 @@ describe('GET remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(406);
       expect(response.payload).toEqual({
@@ -191,7 +203,11 @@ describe('GET remote clusters', () => {
         headers: { authorization: 'foo' },
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(406);
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
index 3e0d5846387b1..8923e9be7d9fd 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 import { deserializeCluster } from '../../../common/lib';
 import { API_BASE_PATH } from '../../../common/constants';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
@@ -21,7 +21,7 @@ export const register = (deps: RouteDependencies): void => {
 
   const allHandler: RequestHandler<unknown, unknown, unknown> = async (ctx, request, response) => {
     try {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const clusterSettings = await clusterClient.asCurrentUser.cluster.getSettings();
 
       const transientClusterNames = Object.keys(
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/types.ts b/x-pack/plugins/remote_clusters/server/routes/api/types.ts
index 5a2fd20ba4d35..95778390bfc8d 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/types.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 export type ScopedClusterClientMock = ReturnType<
   typeof elasticsearchServiceMock.createScopedClusterClient
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
index 89ab33da0ad94..951d8c5d806e4 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { RequestHandler } from 'src/core/server';
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
+import { RequestHandler } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 
@@ -110,7 +110,11 @@ describe('UPDATE remote clusters', () => {
 
       const mockRequest = createMockRequest();
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({
@@ -187,7 +191,11 @@ describe('UPDATE remote clusters', () => {
         proxySocketConnections: 18,
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(200);
       expect(response.payload).toEqual({
@@ -234,7 +242,11 @@ describe('UPDATE remote clusters', () => {
         mode: 'sniff',
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(404);
       expect(response.payload).toEqual({
@@ -265,7 +277,11 @@ describe('UPDATE remote clusters', () => {
         mode: 'sniff',
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
 
       expect(response.status).toBe(400);
       expect(response.payload).toEqual({
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
index d4547b135ed1d..e186262ade21c 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
 import { API_BASE_PATH, SNIFF_MODE, PROXY_MODE } from '../../../common/constants';
 import { serializeCluster, deserializeCluster, Cluster, ClusterInfoEs } from '../../../common/lib';
@@ -47,7 +47,7 @@ export const register = (deps: RouteDependencies): void => {
     response
   ) => {
     try {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const { name } = request.params;
 
diff --git a/x-pack/plugins/remote_clusters/server/shared_imports.ts b/x-pack/plugins/remote_clusters/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/remote_clusters/server/shared_imports.ts
+++ b/x-pack/plugins/remote_clusters/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/remote_clusters/server/types.ts b/x-pack/plugins/remote_clusters/server/types.ts
index 89d1ebfb5cf4e..8c1711e189c34 100644
--- a/x-pack/plugins/remote_clusters/server/types.ts
+++ b/x-pack/plugins/remote_clusters/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { CloudSetup } from '../../cloud/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 
 import { handleEsError } from './shared_imports';
 
diff --git a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts
index 5f2082d413778..f846bb2c7bb91 100644
--- a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts
+++ b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { mapToReportingError } from './map_to_reporting_error';
-import { errors } from '../../../screenshotting/common';
+import { errors } from '@kbn/screenshotting-plugin/common';
 import {
   UnknownError,
   BrowserCouldNotLaunchError,
diff --git a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts
index 0e38890817140..eafd4ed683627 100644
--- a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts
+++ b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { errors } from '../../../screenshotting/common';
+import { errors } from '@kbn/screenshotting-plugin/common';
 import {
   UnknownError,
   ReportingError,
diff --git a/x-pack/plugins/reporting/common/test/fixtures.ts b/x-pack/plugins/reporting/common/test/fixtures.ts
index 5cc6cf274c340..f3ad13e7eb5a8 100644
--- a/x-pack/plugins/reporting/common/test/fixtures.ts
+++ b/x-pack/plugins/reporting/common/test/fixtures.ts
@@ -84,7 +84,7 @@ export const mockJobs: ReportApiJSON[] = [
       content_type: 'application/pdf',
       size: 49468,
       warnings: [
-        'An error occurred when trying to read the page for visualization panel info. You may need to increase \'xpack.reporting.capture.timeouts.waitForElements\'. TimeoutError: waiting for selector "[data-shared-item],[data-shared-items-count]" failed: timeout 30000ms exceeded',
+        'An error occurred when trying to read the page for visualization panel info. You may need to increase \'xpack.screenshotting.capture.timeouts.waitForElements\'. TimeoutError: waiting for selector "[data-shared-item],[data-shared-items-count]" failed: timeout 30000ms exceeded',
       ],
     },
     payload: {
diff --git a/x-pack/plugins/reporting/common/types/base.ts b/x-pack/plugins/reporting/common/types/base.ts
index 6d5e6c1479da0..5f5a6f360c2a4 100644
--- a/x-pack/plugins/reporting/common/types/base.ts
+++ b/x-pack/plugins/reporting/common/types/base.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Ensure, SerializableRecord } from '@kbn/utility-types';
-import type { LayoutParams } from '../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import { LocatorParams } from './url';
 
 export type JobId = string;
diff --git a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts
index 7138958316a6a..9943deb642e88 100644
--- a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsCSV {
diff --git a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts
index 3d89051fd82e4..b7954f3b936d8 100644
--- a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface FakeRequest {
   headers: Record<string, string>;
diff --git a/x-pack/plugins/reporting/common/types/export_types/png.ts b/x-pack/plugins/reporting/common/types/export_types/png.ts
index 635de9823c8b3..4a5367c754f4c 100644
--- a/x-pack/plugins/reporting/common/types/export_types/png.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/png.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LayoutParams } from '../../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsPNG {
diff --git a/x-pack/plugins/reporting/common/types/export_types/png_v2.ts b/x-pack/plugins/reporting/common/types/export_types/png_v2.ts
index 1469437fe6199..ff3ff5a692edb 100644
--- a/x-pack/plugins/reporting/common/types/export_types/png_v2.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/png_v2.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { LocatorParams } from '../url';
-import type { LayoutParams } from '../../../../screenshotting/common';
 import type { BaseParams, BasePayload } from '../base';
 
 // Job params: structure of incoming user request data
diff --git a/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts b/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts
index e22b45f021b9e..240cc778b269d 100644
--- a/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LayoutParams } from '../../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsPDF {
diff --git a/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts b/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts
index b3fbbc1653dfb..58462b84c5eec 100644
--- a/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { LocatorParams } from '../url';
-import type { LayoutParams } from '../../../../screenshotting/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsPDFV2 {
diff --git a/x-pack/plugins/reporting/common/types/index.ts b/x-pack/plugins/reporting/common/types/index.ts
index 88496a0182929..8b95fdb54b1e0 100644
--- a/x-pack/plugins/reporting/common/types/index.ts
+++ b/x-pack/plugins/reporting/common/types/index.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { PdfScreenshotResult, PngScreenshotResult } from '../../../screenshotting/server';
+import type { PdfScreenshotResult, PngScreenshotResult } from '@kbn/screenshotting-plugin/server';
 import type { BaseParams, BaseParamsV2, BasePayload, BasePayloadV2, JobId } from './base';
 
 export type { JobParamsPNGDeprecated } from './export_types/png';
diff --git a/x-pack/plugins/reporting/public/index.ts b/x-pack/plugins/reporting/public/index.ts
index 1026a718b95ea..87938f646e7ce 100644
--- a/x-pack/plugins/reporting/public/index.ts
+++ b/x-pack/plugins/reporting/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import { ReportingPublicPlugin } from './plugin';
 import type { ReportingPublicComponents } from './shared/get_shared_components';
 
diff --git a/x-pack/plugins/reporting/public/lib/license_check.ts b/x-pack/plugins/reporting/public/lib/license_check.ts
index 2b844eac2c1b7..80ecaefe8a853 100644
--- a/x-pack/plugins/reporting/public/lib/license_check.ts
+++ b/x-pack/plugins/reporting/public/lib/license_check.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseCheck } from '../../../licensing/public';
+import { LicenseCheck } from '@kbn/licensing-plugin/public';
 import { LicenseCheckResults } from '../../common/types';
 
 export const checkLicense = (checkResults: LicenseCheck): LicenseCheckResults => {
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx b/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx
index d53c69ae22e7f..326c89d97d366 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'src/core/public';
+import type { HttpSetup } from '@kbn/core/public';
 import type { FunctionComponent } from 'react';
 import React, { createContext, useContext } from 'react';
 
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts
index e477f00f307d9..3a0086e642f56 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts
@@ -8,8 +8,8 @@
 jest.mock('moment', () => ({ tz: { guess: jest.fn() } }));
 
 import { tz } from 'moment';
-import { HttpSetup, IUiSettingsClient } from 'src/core/public';
-import { httpServiceMock, uiSettingsServiceMock } from 'src/core/public/mocks';
+import { HttpSetup, IUiSettingsClient } from '@kbn/core/public';
+import { httpServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { Job } from '../job';
 import { ReportingAPIClient } from './reporting_api_client';
 
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
index d76f06e00586f..b217332856c21 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
@@ -8,8 +8,8 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { stringify } from 'query-string';
 import rison from 'rison-node';
-import type { HttpFetchQuery } from 'src/core/public';
-import { HttpSetup, IUiSettingsClient } from 'src/core/public';
+import type { HttpFetchQuery } from '@kbn/core/public';
+import { HttpSetup, IUiSettingsClient } from '@kbn/core/public';
 import { buildKibanaPath } from '../../../common/build_kibana_path';
 import {
   API_BASE_GENERATE,
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 4863a9f7e1e36..895266bdd568b 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
@@ -6,8 +6,8 @@
  */
 
 import sinon, { stub } from 'sinon';
-import { NotificationsStart } from 'src/core/public';
-import { coreMock, themeServiceMock } from '../../../../../src/core/public/mocks';
+import { NotificationsStart } from '@kbn/core/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { JobSummary, ReportApiJSON } from '../../common/types';
 import { Job } from './job';
 import { ReportingAPIClient } from './reporting_api_client';
diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.ts b/x-pack/plugins/reporting/public/lib/stream_handler.ts
index 80932f8ddeeee..2ff8b8bd4ebda 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import * as Rx from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
-import { NotificationsSetup, ThemeServiceStart } from 'src/core/public';
+import { NotificationsSetup, ThemeServiceStart } from '@kbn/core/public';
 import { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY, JOB_STATUSES } from '../../common/constants';
 import { JobId, JobSummary, JobSummarySet } from '../../common/types';
 import {
diff --git a/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx b/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
index 3200a3305ebcd..94828369d5148 100644
--- a/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
+++ b/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
@@ -11,16 +11,16 @@ import { act } from 'react-dom/test-utils';
 import { Observable } from 'rxjs';
 import { SerializableRecord } from '@kbn/utility-types';
 
-import type { NotificationsSetup } from '../../../../../../src/core/public';
+import type { NotificationsSetup } from '@kbn/core/public';
 import {
   applicationServiceMock,
   httpServiceMock,
   notificationServiceMock,
   coreMock,
-} from '../../../../../../src/core/public/mocks';
-import type { LocatorPublic, SharePluginSetup } from '../../../../../../src/plugins/share/public';
+} from '@kbn/core/public/mocks';
+import type { LocatorPublic, SharePluginSetup } from '@kbn/share-plugin/public';
 
-import type { ILicense } from '../../../../licensing/public';
+import type { ILicense } from '@kbn/licensing-plugin/public';
 
 import { mockJobs } from '../../../common/test';
 
@@ -30,7 +30,7 @@ import { IlmPolicyStatusContextProvider } from '../../lib/ilm_policy_status_cont
 import { InternalApiClientProvider, ReportingAPIClient } from '../../lib/reporting_api_client';
 import { Job } from '../../lib/job';
 
-import { ListingProps as Props, ReportListing } from '../';
+import { ListingProps as Props, ReportListing } from '..';
 
 export interface TestDependencies {
   http: ReturnType<typeof httpServiceMock.createSetupContract>;
diff --git a/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx b/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx
index 3fdc83c341ed9..092f33d06215c 100644
--- a/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx
+++ b/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx
@@ -9,7 +9,7 @@ import type { FunctionComponent } from 'react';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty } from '@elastic/eui';
-import type { ApplicationStart } from 'src/core/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 import { ILM_POLICY_NAME } from '../../../common/constants';
 import { LocatorPublic, SerializableRecord } from '../../shared_imports';
diff --git a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx
index 9e41a47de8b58..a1b0dbcd24c30 100644
--- a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx
+++ b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx
@@ -12,7 +12,7 @@ import React, { useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import { EuiCallOut, EuiButton, EuiCode } from '@elastic/eui';
 
-import type { NotificationsSetup } from 'src/core/public';
+import type { NotificationsSetup } from '@kbn/core/public';
 
 import { ILM_POLICY_NAME } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx
index 0c2359acdb679..43c617b2ba972 100644
--- a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx
+++ b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx
@@ -9,7 +9,7 @@ import type { FunctionComponent } from 'react';
 import React from 'react';
 import { EuiSpacer, EuiFlexItem } from '@elastic/eui';
 
-import { NotificationsSetup } from 'src/core/public';
+import { NotificationsSetup } from '@kbn/core/public';
 
 import { useIlmPolicyStatus } from '../../../lib/ilm_policy_status_context';
 
diff --git a/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx b/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx
index d91560ddd86f5..2ba476982ce5e 100644
--- a/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx
+++ b/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx
@@ -9,7 +9,7 @@ import { EuiButton, EuiConfirmModal } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment, PureComponent } from 'react';
 import { Job } from '../../lib/job';
-import { ListingProps } from '../';
+import { ListingProps } from '..';
 
 type DeleteFn = () => Promise<void>;
 type Props = { jobsToDelete: Job[]; performDelete: DeleteFn } & ListingProps;
diff --git a/x-pack/plugins/reporting/public/management/index.ts b/x-pack/plugins/reporting/public/management/index.ts
index 491e2df445d32..fa9f1fd00cbce 100644
--- a/x-pack/plugins/reporting/public/management/index.ts
+++ b/x-pack/plugins/reporting/public/management/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ApplicationStart, ToastsSetup } from 'src/core/public';
-import { LicensingPluginStart } from '../../../licensing/public';
+import { ApplicationStart, ToastsSetup } from '@kbn/core/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { UseIlmPolicyStatusReturn } from '../lib/ilm_policy_status_context';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
 import { ClientConfigType } from '../plugin';
diff --git a/x-pack/plugins/reporting/public/management/mount_management_section.tsx b/x-pack/plugins/reporting/public/management/mount_management_section.tsx
index 6d888c6071a78..9e709f317b7f0 100644
--- a/x-pack/plugins/reporting/public/management/mount_management_section.tsx
+++ b/x-pack/plugins/reporting/public/management/mount_management_section.tsx
@@ -9,8 +9,8 @@ import { I18nProvider } from '@kbn/i18n-react';
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreSetup, CoreStart } from 'src/core/public';
-import { ILicense } from '../../../licensing/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { ReportingAPIClient, InternalApiClientProvider } from '../lib/reporting_api_client';
 import { IlmPolicyStatusContextProvider } from '../lib/ilm_policy_status_context';
 import { ClientConfigType } from '../plugin';
diff --git a/x-pack/plugins/reporting/public/management/report_listing.test.ts b/x-pack/plugins/reporting/public/management/report_listing.test.ts
index ee15e881db62a..2a43ae4fdb0c9 100644
--- a/x-pack/plugins/reporting/public/management/report_listing.test.ts
+++ b/x-pack/plugins/reporting/public/management/report_listing.test.ts
@@ -8,7 +8,7 @@
 import type { Observable } from 'rxjs';
 import { act } from 'react-dom/test-utils';
 
-import type { ILicense } from '../../../licensing/public';
+import type { ILicense } from '@kbn/licensing-plugin/public';
 import type { IlmPolicyMigrationStatus } from '../../common/types';
 
 import { ListingProps as Props } from '.';
diff --git a/x-pack/plugins/reporting/public/management/report_listing.tsx b/x-pack/plugins/reporting/public/management/report_listing.tsx
index b289f0894a9ff..338fe6fdc37ba 100644
--- a/x-pack/plugins/reporting/public/management/report_listing.tsx
+++ b/x-pack/plugins/reporting/public/management/report_listing.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Component, default as React, Fragment } from 'react';
 import { Subscription } from 'rxjs';
-import { ILicense } from '../../../licensing/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { REPORT_TABLE_ID, REPORT_TABLE_ROW_ID } from '../../common/constants';
 import { prettyPrintJobType } from '../../common/job_utils';
 import { Poller } from '../../common/poller';
@@ -30,7 +30,7 @@ import { Job } from '../lib/job';
 import { checkLicense } from '../lib/license_check';
 import { useInternalApiClient } from '../lib/reporting_api_client';
 import { useKibana } from '../shared_imports';
-import { ListingProps as Props } from './';
+import { ListingProps as Props } from '.';
 import {
   IlmPolicyLink,
   MigrateIlmPolicyCallOut,
diff --git a/x-pack/plugins/reporting/public/mocks.ts b/x-pack/plugins/reporting/public/mocks.ts
index 83806455cbfd4..894fb68a86c69 100644
--- a/x-pack/plugins/reporting/public/mocks.ts
+++ b/x-pack/plugins/reporting/public/mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ReportingAPIClient } from './lib/reporting_api_client';
 import { ReportingSetup } from '.';
 import { getSharedComponents } from './shared';
diff --git a/x-pack/plugins/reporting/public/notifier/general_error.tsx b/x-pack/plugins/reporting/public/notifier/general_error.tsx
index 4a66be603300f..35907886abcc2 100644
--- a/x-pack/plugins/reporting/public/notifier/general_error.tsx
+++ b/x-pack/plugins/reporting/public/notifier/general_error.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export const getGeneralErrorToast = (
   errorText: string,
diff --git a/x-pack/plugins/reporting/public/notifier/job_failure.tsx b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
index fff496a90cf64..e653c974861ab 100644
--- a/x-pack/plugins/reporting/public/notifier/job_failure.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
@@ -9,8 +9,8 @@ import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import type { JobSummary, ManagementLinkFn } from '../../common/types';
 
 export const getFailureToast = (
diff --git a/x-pack/plugins/reporting/public/notifier/job_success.tsx b/x-pack/plugins/reporting/public/notifier/job_success.tsx
index b5ff57b1c21cc..44389e164472a 100644
--- a/x-pack/plugins/reporting/public/notifier/job_success.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_success.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/notifier/job_warning.tsx b/x-pack/plugins/reporting/public/notifier/job_warning.tsx
index 463bbd964273f..9df5bbbc913e2 100644
--- a/x-pack/plugins/reporting/public/notifier/job_warning.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_warning.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx b/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
index 8fcf0144006dc..314610b9b9f29 100644
--- a/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx b/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
index ccc133249505a..41d97ae4d7f3e 100644
--- a/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
index 1ca76de5439f9..5829481b6033f 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
@@ -7,13 +7,13 @@
 
 import * as Rx from 'rxjs';
 import { first } from 'rxjs/operators';
-import { CoreStart } from 'src/core/public';
-import type { SearchSource } from 'src/plugins/data/common';
-import type { SavedSearch } from 'src/plugins/discover/public';
-import { LicenseCheckState } from '../../../licensing/public';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import type { SearchSource } from '@kbn/data-plugin/common';
+import type { SavedSearch } from '@kbn/discover-plugin/public';
+import { LicenseCheckState } from '@kbn/licensing-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
 import type { ReportingPublicPluginStartDendencies } from '../plugin';
 import type { ActionContext } from './get_csv_panel_action';
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
index 4e931925ad29d..7685b3d0924b7 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
@@ -7,17 +7,14 @@
 
 import { i18n } from '@kbn/i18n';
 import * as Rx from 'rxjs';
-import type { CoreSetup, NotificationsSetup } from 'src/core/public';
-import { CoreStart } from 'src/core/public';
-import type { ISearchEmbeddable, SavedSearch } from '../../../../../src/plugins/discover/public';
-import {
-  loadSharingDataHelpers,
-  SEARCH_EMBEDDABLE_TYPE,
-} from '../../../../../src/plugins/discover/public';
-import type { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
-import type { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
-import { IncompatibleActionError } from '../../../../../src/plugins/ui_actions/public';
+import type { CoreSetup, NotificationsSetup } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
+import type { ISearchEmbeddable, SavedSearch } from '@kbn/discover-plugin/public';
+import { loadSharingDataHelpers, SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-plugin/public';
+import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import type { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
 import { CSV_REPORTING_ACTION } from '../../common/constants';
 import { checkLicense } from '../lib/license_check';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
diff --git a/x-pack/plugins/reporting/public/plugin.ts b/x-pack/plugins/reporting/public/plugin.ts
index 4367bb542f240..252745c0cec1f 100644
--- a/x-pack/plugins/reporting/public/plugin.ts
+++ b/x-pack/plugins/reporting/public/plugin.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import * as Rx from 'rxjs';
 import { catchError, filter, map, mergeMap, takeUntil } from 'rxjs/operators';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   CoreSetup,
   CoreStart,
@@ -18,19 +18,15 @@ import {
   Plugin,
   PluginInitializerContext,
   ThemeServiceStart,
-} from 'src/core/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
-import { CONTEXT_MENU_TRIGGER } from '../../../../src/plugins/embeddable/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-  HomePublicPluginStart,
-} from '../../../../src/plugins/home/public';
-import { ManagementSetup, ManagementStart } from '../../../../src/plugins/management/public';
-import { LicensingPluginStart } from '../../licensing/public';
+} from '@kbn/core/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { durationToNumber } from '../common/schema_utils';
 import { JobId, JobSummarySet } from '../common/types';
-import { ReportingSetup, ReportingStart } from './';
+import { ReportingSetup, ReportingStart } from '.';
 import { ReportingAPIClient } from './lib/reporting_api_client';
 import { ReportingNotifierStreamHandler as StreamHandler } from './lib/stream_handler';
 import { getGeneralErrorToast } from './notifier';
@@ -170,7 +166,7 @@ export class ReportingPublicPlugin
       icon: 'reportingApp',
       path: '/app/management/insightsAndAlerting/reporting',
       showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
     });
 
     management.sections.section.insightsAndAlerting.registerApp({
diff --git a/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx b/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx
index 20a6ee4eebac0..5ddbff5af0b93 100644
--- a/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx
+++ b/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx
@@ -9,8 +9,8 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import React from 'react';
 import { EuiErrorBoundary } from '@elastic/eui';
 
-import type { AppMountParameters } from 'kibana/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 import type { SharePluginSetup } from '../shared_imports';
 import type { ReportingAPIClient } from '../lib/reporting_api_client';
 
diff --git a/x-pack/plugins/reporting/public/redirect/redirect_app.tsx b/x-pack/plugins/reporting/public/redirect/redirect_app.tsx
index 31b5f2fa454de..c7ce0b8d5b24f 100644
--- a/x-pack/plugins/reporting/public/redirect/redirect_app.tsx
+++ b/x-pack/plugins/reporting/public/redirect/redirect_app.tsx
@@ -11,8 +11,8 @@ import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
 import { EuiCallOut, EuiCodeBlock } from '@elastic/eui';
 
-import type { ScopedHistory } from 'src/core/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScopedHistory } from '@kbn/core/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
 import { REPORTING_REDIRECT_LOCATOR_STORE_KEY } from '../../common/constants';
 import { LocatorParams } from '../../common/types';
diff --git a/x-pack/plugins/reporting/public/share_context_menu/index.ts b/x-pack/plugins/reporting/public/share_context_menu/index.ts
index 1a16804411c44..1d3760edd2625 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/index.ts
+++ b/x-pack/plugins/reporting/public/share_context_menu/index.ts
@@ -10,9 +10,9 @@ import type {
   IUiSettingsClient,
   ThemeServiceSetup,
   ToastsSetup,
-} from 'src/core/public';
-import { ILicense } from '../../../licensing/public';
-import type { LayoutParams } from '../../../screenshotting/common';
+} from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { ReportingAPIClient } from '../lib/reporting_api_client';
 
 export interface ExportPanelShareOpts {
diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
index 23ecb01eddcf9..eada57161e3a3 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
@@ -7,11 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { SearchSourceFields } from 'src/plugins/data/common';
-import { ShareContext, ShareMenuProvider } from 'src/plugins/share/public';
+import type { SearchSourceFields } from '@kbn/data-plugin/common';
+import { ShareContext, ShareMenuProvider } from '@kbn/share-plugin/public';
 import { CSV_JOB_TYPE } from '../../common/constants';
 import { checkLicense } from '../lib/license_check';
-import { ExportPanelShareOpts } from './';
+import { ExportPanelShareOpts } from '.';
 import { ReportingPanelContent } from './reporting_panel_content_lazy';
 
 export const reportingCsvShareProvider = ({
diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
index b898a93c28880..8ea26a6964be6 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
@@ -7,11 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { ShareContext, ShareMenuProvider } from 'src/plugins/share/public';
+import { ShareContext, ShareMenuProvider } from '@kbn/share-plugin/public';
 import { isJobV2Params } from '../../common/job_utils';
 import { checkLicense } from '../lib/license_check';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
-import { ExportPanelShareOpts, JobParamsProviderOptions, ReportingSharingData } from './';
+import { ExportPanelShareOpts, JobParamsProviderOptions, ReportingSharingData } from '.';
 import { ScreenCapturePanelContent } from './screen_capture_panel_content_lazy';
 
 const getJobParams =
diff --git a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx
index 82dfe8e167dfa..6859d48c3c86d 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx
@@ -12,7 +12,7 @@ import {
   notificationServiceMock,
   themeServiceMock,
   uiSettingsServiceMock,
-} from 'src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { ReportingAPIClient } from '../../lib/reporting_api_client';
 import { ReportingPanelContent, ReportingPanelProps as Props } from '.';
 import { ErrorUnsavedWorkPanel } from './components';
diff --git a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
index d5f5a44837158..55e5f74caa9a5 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
@@ -18,9 +18,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import React, { Component, ReactElement } from 'react';
-import { IUiSettingsClient, ThemeServiceSetup, ToastsSetup } from 'src/core/public';
+import { IUiSettingsClient, ThemeServiceSetup, ToastsSetup } from '@kbn/core/public';
 import url from 'url';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   CSV_REPORT_TYPE,
   PDF_REPORT_TYPE,
diff --git a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
index ebf741c79bd86..49accae696876 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
@@ -8,7 +8,7 @@
 import { mount } from 'enzyme';
 import React from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
 import { ScreenCapturePanelContent } from './screen_capture_panel_content';
 
diff --git a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
index f9e2908c0f733..59d6e696af6fb 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
@@ -8,7 +8,7 @@
 import { EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Component } from 'react';
-import type { LayoutParams } from '../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import { ReportingPanelContent, ReportingPanelProps } from './reporting_panel_content';
 
 export interface Props extends ReportingPanelProps {
diff --git a/x-pack/plugins/reporting/public/shared/get_shared_components.tsx b/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
index 3a0374a957832..ba6b1c6d1a929 100644
--- a/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
+++ b/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import React from 'react';
 import { PDF_REPORT_TYPE, PDF_REPORT_TYPE_V2, PNG_REPORT_TYPE_V2 } from '../../common/constants';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
diff --git a/x-pack/plugins/reporting/public/shared_imports.ts b/x-pack/plugins/reporting/public/shared_imports.ts
index 037dc5e374d25..976cb4bc349d0 100644
--- a/x-pack/plugins/reporting/public/shared_imports.ts
+++ b/x-pack/plugins/reporting/public/shared_imports.ts
@@ -5,23 +5,23 @@
  * 2.0.
  */
 
-export type { SharePluginSetup, SharePluginStart, LocatorPublic } from 'src/plugins/share/public';
+export type { SharePluginSetup, SharePluginStart, LocatorPublic } from '@kbn/share-plugin/public';
 
-export { AppNavLinkStatus } from '../../../../src/core/public';
+export { AppNavLinkStatus } from '@kbn/core/public';
 
-export type { UseRequestResponse } from '../../../../src/plugins/es_ui_shared/public';
-export { useRequest } from '../../../../src/plugins/es_ui_shared/public';
+export type { UseRequestResponse } from '@kbn/es-ui-shared-plugin/public';
+export { useRequest } from '@kbn/es-ui-shared-plugin/public';
 
-export { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
+export { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana as _useKibana } from '../../../../src/plugins/kibana_react/public';
+import { useKibana as _useKibana } from '@kbn/kibana-react-plugin/public';
 import type { KibanaContext } from './types';
 export const useKibana = () => _useKibana<KibanaContext>();
 
 export type { SerializableRecord } from '@kbn/utility-types';
 
-export type { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
+export type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-export type { ManagementAppMountParams } from 'src/plugins/management/public';
+export type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
-export type { LicenseCheck } from '../../licensing/public';
+export type { LicenseCheck } from '@kbn/licensing-plugin/public';
diff --git a/x-pack/plugins/reporting/public/types.ts b/x-pack/plugins/reporting/public/types.ts
index 25b7738ff1981..8a745a237ee57 100644
--- a/x-pack/plugins/reporting/public/types.ts
+++ b/x-pack/plugins/reporting/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup, ApplicationStart, CoreSetup } from 'src/core/public';
+import type { HttpSetup, ApplicationStart, CoreSetup } from '@kbn/core/public';
 
 export interface KibanaContext {
   http: HttpSetup;
diff --git a/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap b/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap
index 65f3c45fb2255..690259a1c240e 100644
--- a/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap
+++ b/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap
@@ -3,14 +3,7 @@
 exports[`Reporting Config Schema context {"dev":false,"dist":false} produces correct config 1`] = `
 Object {
   "capture": Object {
-    "loadDelay": "PT3S",
     "maxAttempts": 1,
-    "timeouts": Object {
-      "openUrl": "PT1M",
-      "renderComplete": "PT30S",
-      "waitForElements": "PT30S",
-    },
-    "zoom": 2,
   },
   "csv": Object {
     "checkForFormulas": true,
@@ -57,14 +50,7 @@ Object {
 exports[`Reporting Config Schema context {"dev":false,"dist":true} produces correct config 1`] = `
 Object {
   "capture": Object {
-    "loadDelay": "PT3S",
     "maxAttempts": 3,
-    "timeouts": Object {
-      "openUrl": "PT1M",
-      "renderComplete": "PT30S",
-      "waitForElements": "PT30S",
-    },
-    "zoom": 2,
   },
   "csv": Object {
     "checkForFormulas": true,
diff --git a/x-pack/plugins/reporting/server/config/config.ts b/x-pack/plugins/reporting/server/config/config.ts
index 269a66503a741..9bfca505e4b1f 100644
--- a/x-pack/plugins/reporting/server/config/config.ts
+++ b/x-pack/plugins/reporting/server/config/config.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { first } from 'rxjs/operators';
-import type { CoreSetup, Logger, PluginInitializerContext } from 'kibana/server';
+import type { CoreSetup, Logger, PluginInitializerContext } from '@kbn/core/server';
 import { createConfig$ } from './create_config';
 import { ReportingConfigType } from './schema';
 
diff --git a/x-pack/plugins/reporting/server/config/create_config.test.ts b/x-pack/plugins/reporting/server/config/create_config.test.ts
index e24c1976360b2..d2fd645fcc26d 100644
--- a/x-pack/plugins/reporting/server/config/create_config.test.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.test.ts
@@ -6,10 +6,10 @@
  */
 
 import * as Rx from 'rxjs';
-import type { CoreSetup, HttpServerInfo, Logger, PluginInitializerContext } from 'kibana/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { CoreSetup, HttpServerInfo, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { createMockConfigSchema } from '../test_helpers';
-import type { ReportingConfigType } from './';
+import type { ReportingConfigType } from '.';
 import { createConfig$ } from './create_config';
 
 const createMockConfig = (
@@ -77,14 +77,7 @@ describe('Reporting server createConfig$', () => {
     expect(result).toMatchInlineSnapshot(`
       Object {
         "capture": Object {
-          "loadDelay": 1,
           "maxAttempts": 1,
-          "timeouts": Object {
-            "openUrl": 100,
-            "renderComplete": 100,
-            "waitForElements": 100,
-          },
-          "zoom": 1,
         },
         "csv": Object {},
         "encryptionKey": "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
diff --git a/x-pack/plugins/reporting/server/config/create_config.ts b/x-pack/plugins/reporting/server/config/create_config.ts
index ff8d00c30d4f8..453a349c7ff4d 100644
--- a/x-pack/plugins/reporting/server/config/create_config.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.ts
@@ -7,7 +7,7 @@
 
 import crypto from 'crypto';
 import ipaddr from 'ipaddr.js';
-import type { CoreSetup, Logger } from 'kibana/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 import { sum } from 'lodash';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts
index 7c428a29ca741..22b1f2f043802 100644
--- a/x-pack/plugins/reporting/server/config/index.test.ts
+++ b/x-pack/plugins/reporting/server/config/index.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../../../src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.reporting';
 
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index c068b30f43266..ca044e5a9cfeb 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { get } from 'lodash';
 import { ConfigSchema, ReportingConfigType } from './schema';
 export { buildConfig } from './config';
@@ -64,11 +64,7 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
     },
   ],
   exposeToUsage: {
-    capture: {
-      maxAttempts: true,
-      timeouts: { openUrl: true, renderComplete: true, waitForElements: true },
-      zoom: true,
-    },
+    capture: { maxAttempts: true },
     csv: { maxSizeBytes: true, scroll: { size: true, duration: true } },
     kibanaServer: false, // show as [redacted]
     queue: { indexInterval: true, pollEnabled: true, timeout: true },
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
index 3af7a4e5cfe4c..6e6cd3ab07578 100644
--- a/x-pack/plugins/reporting/server/config/schema.test.ts
+++ b/x-pack/plugins/reporting/server/config/schema.test.ts
@@ -16,28 +16,6 @@ describe('Reporting Config Schema', () => {
     expect(ConfigSchema.validate({}, { dev: false, dist: true })).toMatchSnapshot();
   });
 
-  it('allows Duration values for certain keys', () => {
-    expect(ConfigSchema.validate({ queue: { timeout: '2m' } }).queue.timeout).toMatchInlineSnapshot(
-      `"PT2M"`
-    );
-
-    expect(
-      ConfigSchema.validate({ capture: { loadDelay: '3s' } }).capture.loadDelay
-    ).toMatchInlineSnapshot(`"PT3S"`);
-
-    expect(
-      ConfigSchema.validate({
-        capture: { timeouts: { openUrl: '1m', waitForElements: '30s', renderComplete: '10s' } },
-      }).capture.timeouts
-    ).toMatchInlineSnapshot(`
-      Object {
-        "openUrl": "PT1M",
-        "renderComplete": "PT10S",
-        "waitForElements": "PT30S",
-      }
-    `);
-  });
-
   it('allows ByteSizeValue values for certain keys', () => {
     expect(ConfigSchema.validate({ csv: { maxSizeBytes: '12mb' } }).csv.maxSizeBytes)
       .toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
index c031ed4f94f9d..c5ec1a7c22c8d 100644
--- a/x-pack/plugins/reporting/server/config/schema.ts
+++ b/x-pack/plugins/reporting/server/config/schema.ts
@@ -47,21 +47,6 @@ const QueueSchema = schema.object({
 });
 
 const CaptureSchema = schema.object({
-  timeouts: schema.object({
-    openUrl: schema.oneOf([schema.number(), schema.duration()], {
-      defaultValue: moment.duration({ minutes: 1 }),
-    }),
-    waitForElements: schema.oneOf([schema.number(), schema.duration()], {
-      defaultValue: moment.duration({ seconds: 30 }),
-    }),
-    renderComplete: schema.oneOf([schema.number(), schema.duration()], {
-      defaultValue: moment.duration({ seconds: 30 }),
-    }),
-  }),
-  zoom: schema.number({ defaultValue: 2 }),
-  loadDelay: schema.oneOf([schema.number(), schema.duration()], {
-    defaultValue: moment.duration({ seconds: 3 }),
-  }),
   maxAttempts: schema.conditional(
     schema.contextRef('dist'),
     true,
diff --git a/x-pack/plugins/reporting/server/config/ui_settings.ts b/x-pack/plugins/reporting/server/config/ui_settings.ts
index bd13dcb8320ff..09b6b0237f534 100644
--- a/x-pack/plugins/reporting/server/config/ui_settings.ts
+++ b/x-pack/plugins/reporting/server/config/ui_settings.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, UiSettingsParams } from '@kbn/core/server';
 import { PLUGIN_ID, UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../common/constants';
 
 const kbToBase64Length = (kb: number) => Math.floor((kb * 1024 * 8) / 6);
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index 50d643a24d6ba..bb24630d70a19 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -6,8 +6,6 @@
  */
 
 import Hapi from '@hapi/hapi';
-import * as Rx from 'rxjs';
-import { filter, first, map, switchMap, take } from 'rxjs/operators';
 import type {
   BasePath,
   IClusterClient,
@@ -18,31 +16,35 @@ import type {
   SavedObjectsServiceStart,
   StatusServiceSetup,
   UiSettingsServiceStart,
-} from 'src/core/server';
-import type { PluginStart as DataPluginStart } from 'src/plugins/data/server';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import { KibanaRequest, ServiceStatusLevels } from '../../../../src/core/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import type { LicensingPluginStart } from '../../licensing/server';
+} from '@kbn/core/server';
+import { KibanaRequest, ServiceStatusLevels } from '@kbn/core/server';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import {
   PdfScreenshotResult,
   PngScreenshotResult,
   ScreenshotOptions,
   ScreenshottingStart,
-} from '../../screenshotting/server';
-import type { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { DEFAULT_SPACE_ID } from '../../spaces/common/constants';
-import type { SpacesPluginSetup } from '../../spaces/server';
-import type { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/screenshotting-plugin/server';
+import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import type {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import * as Rx from 'rxjs';
+import { filter, first, map, switchMap, take } from 'rxjs/operators';
+import type { ReportingConfig, ReportingSetup } from '.';
 import { REPORTING_REDIRECT_LOCATOR_STORE_KEY } from '../common/constants';
-import { durationToNumber } from '../common/schema_utils';
-import type { ReportingConfig, ReportingSetup } from './';
 import { ReportingConfigType } from './config';
 import { checkLicense, getExportTypesRegistry } from './lib';
 import { reportingEventLoggerFactory } from './lib/event_logger/logger';
 import type { IReport, ReportingStore } from './lib/store';
 import { ExecuteReportTask, MonitorReportsTask, ReportTaskParams } from './lib/tasks';
-import type { ReportingPluginRouter, PngScreenshotOptions, PdfScreenshotOptions } from './types';
+import type { PdfScreenshotOptions, PngScreenshotOptions, ReportingPluginRouter } from './types';
 
 export interface ReportingInternalSetup {
   basePath: Pick<BasePath, 'set'>;
@@ -366,21 +368,8 @@ export class ReportingCore {
   ): Rx.Observable<PngScreenshotResult | PdfScreenshotResult> {
     return Rx.defer(() => this.getPluginStartDeps()).pipe(
       switchMap(({ screenshotting }) => {
-        const config = this.getConfig();
         return screenshotting.getScreenshots({
           ...options,
-          timeouts: {
-            loadDelay: durationToNumber(config.get('capture', 'loadDelay')),
-            openUrl: durationToNumber(config.get('capture', 'timeouts', 'openUrl')),
-            waitForElements: durationToNumber(config.get('capture', 'timeouts', 'waitForElements')),
-            renderComplete: durationToNumber(config.get('capture', 'timeouts', 'renderComplete')),
-          },
-
-          layout: {
-            zoom: config.get('capture', 'zoom'),
-            ...options.layout,
-          },
-
           urls: options.urls.map((url) =>
             typeof url === 'string'
               ? url
diff --git a/x-pack/plugins/reporting/server/deprecations/index.ts b/x-pack/plugins/reporting/server/deprecations/index.ts
index 9ecb3b7ab88ad..651defbb5d688 100644
--- a/x-pack/plugins/reporting/server/deprecations/index.ts
+++ b/x-pack/plugins/reporting/server/deprecations/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { ReportingCore } from '../core';
 
 import { getDeprecationsInfo as getIlmPolicyDeprecationsInfo } from './migrate_existing_indices_ilm_policy';
diff --git a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts
index ca838c2d09914..551bf76465642 100644
--- a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts
+++ b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { GetDeprecationsContext } from 'src/core/server';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import type { GetDeprecationsContext } from '@kbn/core/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ReportingCore } from '../core';
 import { createMockConfigSchema, createMockReportingCore } from '../test_helpers';
diff --git a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
index 9e3304e78e000..7ce888b57727f 100644
--- a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
+++ b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DeprecationsDetails, GetDeprecationsContext } from 'src/core/server';
+import { DeprecationsDetails, GetDeprecationsContext } from '@kbn/core/server';
 import { API_MIGRATE_ILM_POLICY_URL, ILM_POLICY_NAME } from '../../common/constants';
 import { ReportingCore } from '../core';
 import { deprecations } from '../lib/deprecations';
diff --git a/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts b/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts
index 03765801b2629..81d0c8bcc24f1 100644
--- a/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts
+++ b/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { GetDeprecationsContext, IScopedClusterClient } from 'kibana/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { GetDeprecationsContext, IScopedClusterClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '..';
 import {
   createMockConfigSchema,
diff --git a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
index 453620bccc01d..0d9361f859c82 100644
--- a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
+++ b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
@@ -14,8 +14,8 @@ import type {
   DeprecationsDetails,
   ElasticsearchClient,
   GetDeprecationsContext,
-} from 'src/core/server';
-import { ReportingCore } from '../';
+} from '@kbn/core/server';
+import { ReportingCore } from '..';
 import { deprecations } from '../lib/deprecations';
 
 const REPORTING_USER_ROLE_NAME = 'reporting_user';
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
index 56a1c39e75aa4..a65be580adca3 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { cryptoFactory } from '../../lib';
-import { decryptJobHeaders } from './';
+import { decryptJobHeaders } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
index 3dfcfe362abd4..13b8b4804e6fb 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { cryptoFactory } from '../../lib';
 
 export const decryptJobHeaders = async (
diff --git a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
index aa62b2355d652..aa7cad00a8faf 100644
--- a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
@@ -6,11 +6,11 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import * as Rx from 'rxjs';
 import { finalize, map, tap } from 'rxjs/operators';
-import type { ReportingCore } from '../../';
-import { LayoutTypes } from '../../../../screenshotting/common';
+import { LayoutTypes } from '@kbn/screenshotting-plugin/common';
+import type { ReportingCore } from '../..';
 import { REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
 import type { PngMetrics } from '../../../common/types';
 import type { PngScreenshotOptions } from '../../types';
@@ -27,7 +27,7 @@ export function generatePngObservable(
   options: Omit<PngScreenshotOptions, 'format'>
 ): Rx.Observable<PngResult> {
   const apmTrans = apm.startTransaction('generate-png', REPORTING_TRANSACTION_TYPE);
-  if (!options.layout.dimensions) {
+  if (!options.layout?.dimensions) {
     throw new Error(`LayoutParams.Dimensions is undefined.`);
   }
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
index 850d0ae507e12..99fa554b4f400 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { ReportingCore } from '../../';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { ReportingCore } from '../..';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
 import { getCustomLogo } from './get_custom_logo';
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
index 1087315503988..d327ebde912e5 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { Headers, Logger } from 'kibana/server';
-import { ReportingCore } from '../../';
+import type { Headers, Logger } from '@kbn/core/server';
+import { ReportingCore } from '../..';
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
 
 export const getCustomLogo = async (
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
index a69de1034f5a4..aae2a06a130eb 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReportingConfig } from '../../';
+import { ReportingConfig } from '../..';
 import { createMockConfig } from '../../test_helpers';
 import { TaskPayloadPNG } from '../png/types';
 import { TaskPayloadPDF } from '../printable_pdf/types';
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
index 5ae4092a466fa..069c882794ebd 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
@@ -11,7 +11,7 @@ import {
   UrlWithParsedQuery,
   UrlWithStringQuery,
 } from 'url';
-import { ReportingConfig } from '../../';
+import { ReportingConfig } from '../..';
 import { TaskPayloadPNG } from '../png/types';
 import { TaskPayloadPDF } from '../printable_pdf/types';
 import { getAbsoluteUrlFactory } from './get_absolute_url';
diff --git a/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts b/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts
index aaffd6254cceb..9c329db64fa1a 100644
--- a/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts
@@ -6,7 +6,7 @@
  */
 
 import { format } from 'url';
-import { ReportingConfig } from '../../../';
+import { ReportingConfig } from '../../..';
 import { getRedirectAppPath } from '../../../../common/constants';
 import { buildKibanaPath } from '../../../../common/build_kibana_path';
 
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
index 5a8c4f1fd760c..e0966cffd3ba9 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
@@ -17,9 +17,9 @@ jest.mock('./generate_csv/generate_csv', () => ({
 }));
 
 import nodeCrypto from '@elastic/node-crypto';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
 import { runTaskFnFactory } from './execute_job';
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
index 5c52a6b74e67d..ecdbd99e4770a 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { errors as esErrors } from '@elastic/elasticsearch';
-import type { IScopedClusterClient, IUiSettingsClient, SearchResponse } from 'kibana/server';
+import type { IScopedClusterClient, IUiSettingsClient, SearchResponse } from '@kbn/core/server';
 import { identity, range } from 'lodash';
 import * as Rx from 'rxjs';
 import {
@@ -14,14 +14,14 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
-import { ISearchStartSearchSource } from 'src/plugins/data/common';
-import { searchSourceInstanceMock } from 'src/plugins/data/common/search/search_source/mocks';
-import { IScopedSearchClient } from 'src/plugins/data/server';
-import { dataPluginMock } from 'src/plugins/data/server/mocks';
-import { FieldFormatsRegistry } from 'src/plugins/field_formats/common';
+} from '@kbn/core/server/mocks';
+import { ISearchStartSearchSource } from '@kbn/data-plugin/common';
+import { searchSourceInstanceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
+import { IScopedSearchClient } from '@kbn/data-plugin/server';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import { Writable } from 'stream';
-import { ReportingConfig } from '../../../';
+import { ReportingConfig } from '../../..';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import {
   UI_SETTINGS_CSV_QUOTE_VALUES,
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
index 8727a3805dfbb..3b219db0bc71c 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
@@ -7,27 +7,19 @@
 
 import { errors as esErrors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient, IUiSettingsClient, Logger } from 'kibana/server';
-import type { IScopedSearchClient } from 'src/plugins/data/server';
-import type { Datatable } from 'src/plugins/expressions/server';
+import type { IScopedClusterClient, IUiSettingsClient, Logger } from '@kbn/core/server';
+import type { IScopedSearchClient } from '@kbn/data-plugin/server';
+import type { Datatable } from '@kbn/expressions-plugin/server';
 import type { Writable } from 'stream';
 import { lastValueFrom } from 'rxjs';
-import type { ReportingConfig } from '../../..';
-import type {
-  DataView,
-  ISearchSource,
-  ISearchStartSearchSource,
-} from '../../../../../../../src/plugins/data/common';
-import {
-  cellHasFormulas,
-  ES_SEARCH_STRATEGY,
-  tabifyDocs,
-} from '../../../../../../../src/plugins/data/common';
+import type { DataView, ISearchSource, ISearchStartSearchSource } from '@kbn/data-plugin/common';
+import { cellHasFormulas, ES_SEARCH_STRATEGY, tabifyDocs } from '@kbn/data-plugin/common';
 import type {
   FieldFormat,
   FieldFormatConfig,
   IFieldFormatsRegistry,
-} from '../../../../../../../src/plugins/field_formats/common';
+} from '@kbn/field-formats-plugin/common';
+import type { ReportingConfig } from '../../..';
 import type { CancellationToken } from '../../../../common/cancellation_token';
 import { CONTENT_TYPE_CSV } from '../../../../common/constants';
 import { AuthenticationExpiredError, ReportingError } from '../../../../common/errors';
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
index ef0f0062bf19b..863425822d7dd 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
@@ -11,12 +11,12 @@ import {
   UI_SETTINGS_CSV_SEPARATOR,
   UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
 } from '../../../../common/constants';
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import {
   loggingSystemMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { createMockConfig, createMockConfigSchema } from '../../../test_helpers';
 import { getExportSettings } from './get_export_settings';
 
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
index 6a07e3184eb48..dff80970dff74 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
@@ -6,9 +6,9 @@
  */
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import type { IUiSettingsClient, Logger } from 'kibana/server';
-import { createEscapeValue } from '../../../../../../../src/plugins/data/common';
-import { ReportingConfig } from '../../../';
+import type { IUiSettingsClient, Logger } from '@kbn/core/server';
+import { createEscapeValue } from '@kbn/data-plugin/common';
+import { ReportingConfig } from '../../..';
 import {
   CSV_BOM_CHARS,
   UI_SETTINGS_CSV_QUOTE_VALUES,
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
index 50ae2ab10f6e7..31924d0d89cf5 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { Writable } from 'stream';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { TaskRunResult } from '../../lib/tasks';
@@ -39,7 +39,7 @@ export const runTaskFnFactory: RunTaskFnFactory<ImmediateExecuteFn> = function e
       ...immediateJobParams,
     };
 
-    const savedObjectsClient = context.core.savedObjects.client;
+    const savedObjectsClient = (await context.core).savedObjects.client;
     const uiSettings = await reporting.getUiSettingsServiceFactory(savedObjectsClient);
     const dataPluginStart = await reporting.getDataService();
     const fieldFormatsRegistry = await getFieldFormats().fieldFormatServiceFactory(uiSettings);
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
index bc37978372ba6..75496330a54d9 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
@@ -6,9 +6,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { cryptoFactory } from '../../../lib';
 import {
@@ -18,7 +18,7 @@ import {
 } from '../../../test_helpers';
 import { generatePngObservable } from '../../common';
 import { TaskPayloadPNG } from '../types';
-import { runTaskFnFactory } from './';
+import { runTaskFnFactory } from '.';
 
 jest.mock('../../common/generate_png');
 
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
index 66d480c20c791..53497e2eeaea3 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
@@ -41,8 +41,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPNG>> =
               ...job.layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: job.layout?.id as PngScreenshotOptions['layout']['id'],
-            },
+              id: job.layout?.id,
+            } as PngScreenshotOptions['layout'],
           });
         }),
         tap(({ buffer }) => stream.write(buffer)),
diff --git a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
index 1403873e8da4b..1160347c95273 100644
--- a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
@@ -6,9 +6,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { LocatorParams } from '../../../common/types';
 import { cryptoFactory } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
index bfc89ad66afb5..bd32bdad4e605 100644
--- a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
@@ -42,8 +42,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPNGV2>> =
               ...job.layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: job.layout?.id as PngScreenshotOptions['layout']['id'],
-            },
+              id: job.layout?.id,
+            } as PngScreenshotOptions['layout'],
             urls: [[url, locatorParams]],
           });
         }),
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
index 6741b6928e33a..4be1446c18e25 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
@@ -6,15 +6,15 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { cryptoFactory } from '../../../lib';
 import { createMockConfigSchema, createMockReportingCore } from '../../../test_helpers';
 import { generatePdfObservable } from '../lib/generate_pdf';
 import { TaskPayloadPDF } from '../types';
-import { runTaskFnFactory } from './';
+import { runTaskFnFactory } from '.';
 
 jest.mock('../lib/generate_pdf');
 
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
index 568f7ff662a4c..6341d0a253e50 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
@@ -47,8 +47,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPDF>> =
               ...layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: layout?.id as PdfScreenshotOptions['layout']['id'],
-            },
+              id: layout?.id,
+            } as PdfScreenshotOptions['layout'],
           });
         }),
         tap(({ buffer }) => {
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
index e6cdcf8c07d7c..0a77762011d4b 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
@@ -7,7 +7,7 @@
 
 import * as Rx from 'rxjs';
 import { mergeMap, tap } from 'rxjs/operators';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { PdfScreenshotOptions } from '../../../types';
 import type { PdfMetrics } from '../../../../common/types';
 import { getTracker } from '../../common/pdf_tracker';
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
index 205c55ab4e996..99250c522e2cf 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
@@ -8,9 +8,9 @@
 jest.mock('./lib/generate_pdf');
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { LocatorParams } from '../../../common/types';
 import { cryptoFactory } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
index 9f6f770fe0b31..b7e6a25f1848f 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
@@ -45,8 +45,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPDFV2>> =
               ...layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: layout?.id as PdfScreenshotOptions['layout']['id'],
-            },
+              id: layout?.id,
+            } as PdfScreenshotOptions['layout'],
           });
         }),
         tap(({ buffer }) => {
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
index a8d0e15d45ba2..b29b3f90861e6 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
@@ -7,7 +7,7 @@
 
 import * as Rx from 'rxjs';
 import { mergeMap, tap } from 'rxjs/operators';
-import type { ReportingCore } from '../../../';
+import type { ReportingCore } from '../../..';
 import type { LocatorParams, PdfMetrics, UrlOrUrlLocatorTuple } from '../../../../common/types';
 import type { PdfScreenshotOptions } from '../../../types';
 import { getFullRedirectAppUrl } from '../../common/v2/get_full_redirect_app_url';
diff --git a/x-pack/plugins/reporting/server/index.ts b/x-pack/plugins/reporting/server/index.ts
index fd967b08e383c..8c715ee9df271 100644
--- a/x-pack/plugins/reporting/server/index.ts
+++ b/x-pack/plugins/reporting/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ReportingConfigType } from './config';
 import { ReportingPlugin } from './plugin';
 
diff --git a/x-pack/plugins/reporting/server/lib/check_license.test.ts b/x-pack/plugins/reporting/server/lib/check_license.test.ts
index 5265c04eeada6..d95babcd72c69 100644
--- a/x-pack/plugins/reporting/server/lib/check_license.test.ts
+++ b/x-pack/plugins/reporting/server/lib/check_license.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { checkLicense } from './check_license';
-import { ILicense } from '../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { ExportTypesRegistry } from './export_types_registry';
 
 describe('check_license', () => {
diff --git a/x-pack/plugins/reporting/server/lib/check_license.ts b/x-pack/plugins/reporting/server/lib/check_license.ts
index 008c6c1c37fbc..107b683cd621b 100644
--- a/x-pack/plugins/reporting/server/lib/check_license.ts
+++ b/x-pack/plugins/reporting/server/lib/check_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { ExportTypeDefinition } from '../types';
 import { ExportTypesRegistry } from './export_types_registry';
 
diff --git a/x-pack/plugins/reporting/server/lib/check_params_version.ts b/x-pack/plugins/reporting/server/lib/check_params_version.ts
index 79237ba56677a..b154c839f7fd7 100644
--- a/x-pack/plugins/reporting/server/lib/check_params_version.ts
+++ b/x-pack/plugins/reporting/server/lib/check_params_version.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { UNVERSIONED_VERSION } from '../../common/constants';
 import type { BaseParams } from '../../common/types';
 
diff --git a/x-pack/plugins/reporting/server/lib/content_stream.test.ts b/x-pack/plugins/reporting/server/lib/content_stream.test.ts
index 069ac22258ad1..aa0d5c85acedf 100644
--- a/x-pack/plugins/reporting/server/lib/content_stream.test.ts
+++ b/x-pack/plugins/reporting/server/lib/content_stream.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { set } from 'lodash';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { ContentStream } from './content_stream';
 
 describe('ContentStream', () => {
diff --git a/x-pack/plugins/reporting/server/lib/content_stream.ts b/x-pack/plugins/reporting/server/lib/content_stream.ts
index b09e446ff576c..0228132200e62 100644
--- a/x-pack/plugins/reporting/server/lib/content_stream.ts
+++ b/x-pack/plugins/reporting/server/lib/content_stream.ts
@@ -6,11 +6,11 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ByteSizeValue } from '@kbn/config-schema';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { defaults, get } from 'lodash';
 import Puid from 'puid';
 import { Duplex } from 'stream';
-import type { ReportingCore } from '../';
+import type { ReportingCore } from '..';
 import type { ReportSource } from '../../common/types';
 
 /**
diff --git a/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts b/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts
index c3aea64171444..da23ea8d2c5e1 100644
--- a/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts
+++ b/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts
@@ -7,7 +7,7 @@
 
 import { ILM_POLICY_NAME } from '../../../common/constants';
 import { IlmPolicyMigrationStatus } from '../../../common/types';
-import { IlmPolicyManager } from '../../lib/store/ilm_policy_manager';
+import { IlmPolicyManager } from '../store/ilm_policy_manager';
 import type { DeprecationsDependencies } from './types';
 
 export const checkIlmMigrationStatus = async ({
diff --git a/x-pack/plugins/reporting/server/lib/deprecations/index.ts b/x-pack/plugins/reporting/server/lib/deprecations/index.ts
index 5d8a95695a129..205c1c3199bab 100644
--- a/x-pack/plugins/reporting/server/lib/deprecations/index.ts
+++ b/x-pack/plugins/reporting/server/lib/deprecations/index.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import { DeprecationsDetails } from 'kibana/server';
+import { DeprecationsDetails } from '@kbn/core/server';
 import { checkIlmMigrationStatus } from './check_ilm_migration_status';
 
 function deprecationError(title: string, error: Error): DeprecationsDetails[] {
diff --git a/x-pack/plugins/reporting/server/lib/deprecations/types.ts b/x-pack/plugins/reporting/server/lib/deprecations/types.ts
index c6e9e3b7ad920..6df429d2b2ed9 100644
--- a/x-pack/plugins/reporting/server/lib/deprecations/types.ts
+++ b/x-pack/plugins/reporting/server/lib/deprecations/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type { ReportingCore } from '../../core';
 
 export interface DeprecationsDependencies {
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts b/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
index 90c546b198a08..b22b6db9c8d4c 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { LogMeta } from 'kibana/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { LogMeta } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { EcsLogAdapter } from './adapter';
 
 describe('EcsLogAdapter', () => {
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts b/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
index 71116d8f334b5..e41c6306c7ad7 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
@@ -6,7 +6,7 @@
  */
 
 import deepMerge from 'deepmerge';
-import type { Logger, LogMeta } from 'kibana/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 import type { IReportingEventLogger } from './logger';
 
 /** @internal */
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
index 13c932c0efe1a..cbff4ed0c1d83 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { ConcreteTaskInstance } from '../../../../task_manager/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { BasePayload } from '../../types';
 import { Report } from '../store';
 import { ReportingEventLogger, reportingEventLoggerFactory } from './logger';
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
index 6a3df43136c4f..b7bd05e67ff5e 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
@@ -6,11 +6,11 @@
  */
 
 import deepMerge from 'deepmerge';
-import type { Logger, LogMeta } from 'kibana/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common/constants';
 import type { TaskRunMetrics } from '../../../common/types';
 import { IReport } from '../store';
-import { ActionType } from './';
+import { ActionType } from '.';
 import { EcsLogAdapter } from './adapter';
 import {
   ClaimedTask,
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/types.ts b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
index 950c3d89a184b..f56ed90890065 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/types.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { LogMeta } from 'src/core/server';
+import { LogMeta } from '@kbn/core/server';
 import type { TaskRunMetrics } from '../../../common/types';
-import { ActionType } from './';
+import { ActionType } from '.';
 
 export interface ReportingAction<A extends ActionType> extends LogMeta {
   event: {
diff --git a/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts b/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts
index e0569883fbbe2..48a45be80f716 100644
--- a/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts
+++ b/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ILM_POLICY_NAME } from '../../../../common/constants';
 
 import { reportingIlmPolicy } from './constants';
diff --git a/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts b/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts
index c8b2abda88c79..dd58bcacf0b96 100644
--- a/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedReport } from './';
+import { SavedReport } from '.';
 
 test('SavedReport should succeed if report has ES document fields present', () => {
   const createInstance = () => {
diff --git a/x-pack/plugins/reporting/server/lib/store/saved_report.ts b/x-pack/plugins/reporting/server/lib/store/saved_report.ts
index 0c3621d995d7f..c4d46c167a312 100644
--- a/x-pack/plugins/reporting/server/lib/store/saved_report.ts
+++ b/x-pack/plugins/reporting/server/lib/store/saved_report.ts
@@ -6,7 +6,7 @@
  */
 
 import { ReportDocumentHead, ReportSource } from '../../../common/types';
-import { Report } from './';
+import { Report } from '.';
 
 /*
  * Class for a report document that is saved in Elasticsearch
diff --git a/x-pack/plugins/reporting/server/lib/store/store.test.ts b/x-pack/plugins/reporting/server/lib/store/store.test.ts
index 7ceafef261dd4..2a54ea49e455b 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { ReportingCore } from '../../';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { ReportingCore } from '../..';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
-import { Report, ReportDocument, ReportingStore, SavedReport } from './';
+import { Report, ReportDocument, ReportingStore, SavedReport } from '.';
 
 describe('ReportingStore', () => {
   const mockLogger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/reporting/server/lib/store/store.ts b/x-pack/plugins/reporting/server/lib/store/store.ts
index ffb4ba96bfd3c..883cd3d404590 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.ts
@@ -7,14 +7,14 @@
 
 import moment from 'moment';
 import { IndexResponse, UpdateResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
-import { statuses } from '../';
-import type { ReportingCore } from '../../';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { statuses } from '..';
+import type { ReportingCore } from '../..';
 import { ILM_POLICY_NAME, REPORTING_SYSTEM_INDEX } from '../../../common/constants';
 import type { JobStatus, ReportOutput, ReportSource } from '../../../common/types';
 import type { ReportTaskParams } from '../tasks';
-import type { IReport, Report, ReportDocument } from './';
-import { SavedReport } from './';
+import type { IReport, Report, ReportDocument } from '.';
+import { SavedReport } from '.';
 import { IlmPolicyManager } from './ilm_policy_manager';
 import { indexTimestamp } from './index_timestamp';
 import { mapping } from './mapping';
diff --git a/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts b/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts
index 302088e6a6eb1..86fb3655ad6af 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { errorLogger } from './error_logger';
 
 const logger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts b/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts
index a67e3caeb2c78..2e72cc2c14550 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 
 const MAX_PARTIAL_ERROR_LENGTH = 1000; // 1000 of beginning, 1000 of end
 const ERROR_PARTIAL_SEPARATOR = '...';
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
index 9f016a6a54a10..47bb4458cb10c 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '../..';
-import { RunContext } from '../../../../task_manager/server';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { KibanaShuttingDownError } from '../../../common/errors';
 import type { SavedReport } from '../store';
 import { ReportingConfigType } from '../../config';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
-import { ExecuteReportTask } from './';
+import { ExecuteReportTask } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
index 0e53e20b5dc11..73dc29801ac0d 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
@@ -6,19 +6,19 @@
  */
 
 import { UpdateResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import moment from 'moment';
 import * as Rx from 'rxjs';
 import { timeout } from 'rxjs/operators';
 import { finished, Writable } from 'stream';
 import { promisify } from 'util';
-import { getContentStream } from '../';
-import type { ReportingCore } from '../../';
 import type {
   RunContext,
   TaskManagerStartContract,
   TaskRunCreatorFunction,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+import { getContentStream } from '..';
+import type { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { mapToReportingError } from '../../../common/errors/map_to_reporting_error';
 import { ReportingError, QueueTimeoutError, KibanaShuttingDownError } from '../../../common/errors';
@@ -35,7 +35,7 @@ import {
   REPORTING_EXECUTE_TYPE,
   ReportTaskParams,
   TaskRunResult,
-} from './';
+} from '.';
 import { errorLogger } from './error_logger';
 
 type CompletedReportOutput = Omit<ReportOutput, 'content'>;
diff --git a/x-pack/plugins/reporting/server/lib/tasks/index.ts b/x-pack/plugins/reporting/server/lib/tasks/index.ts
index 6be8299d1d26a..522c092f5e32d 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/index.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TaskRunCreatorFunction } from '../../../../task_manager/server';
+import { TaskRunCreatorFunction } from '@kbn/task-manager-plugin/server';
 import { ReportSource, TaskRunResult } from '../../../common/types';
 import { BasePayload } from '../../types';
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts b/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts
index b7e75de247535..7bf6dd7e50678 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '../..';
-import { RunContext } from '../../../../task_manager/server';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ReportingConfigType } from '../../config';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
-import { MonitorReportsTask } from './';
+import { MonitorReportsTask } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts b/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
index 56e12d7d5512b..fa599d225b77d 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import moment from 'moment';
-import { ReportingStore } from '../';
-import { ReportingCore } from '../../';
-import { TaskManagerStartContract, TaskRunCreatorFunction } from '../../../../task_manager/server';
+import { TaskManagerStartContract, TaskRunCreatorFunction } from '@kbn/task-manager-plugin/server';
+import { ReportingStore } from '..';
+import { ReportingCore } from '../..';
 import { numberToDuration } from '../../../common/schema_utils';
 import { ReportingConfigType } from '../../config';
 import { statuses } from '../statuses';
 import { SavedReport } from '../store';
-import { ReportingTask, ReportingTaskStatus, REPORTING_MONITOR_TYPE, ReportTaskParams } from './';
+import { ReportingTask, ReportingTaskStatus, REPORTING_MONITOR_TYPE, ReportTaskParams } from '.';
 
 /*
  * Task for finding the ReportingRecords left in the ReportingStore (.reporting index) and stuck in
diff --git a/x-pack/plugins/reporting/server/plugin.test.ts b/x-pack/plugins/reporting/server/plugin.test.ts
index 98f02668323b1..e12c1b238daa6 100644
--- a/x-pack/plugins/reporting/server/plugin.test.ts
+++ b/x-pack/plugins/reporting/server/plugin.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Logger } from 'kibana/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { CoreSetup, CoreStart, Logger } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import type { ReportingCore, ReportingInternalStart } from './core';
 import { ReportingPlugin } from './plugin';
 import {
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
index 52a72e7139020..81094a7649a0d 100644
--- a/x-pack/plugins/reporting/server/plugin.ts
+++ b/x-pack/plugins/reporting/server/plugin.ts
@@ -5,9 +5,15 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import type {
+  CoreSetup,
+  CoreStart,
+  Logger,
+  Plugin,
+  PluginInitializerContext,
+} from '@kbn/core/server';
 import { PLUGIN_ID } from '../common/constants';
-import { ReportingCore } from './';
+import { ReportingCore } from '.';
 import { buildConfig, registerUiSettings, ReportingConfigType } from './config';
 import { registerDeprecations } from './deprecations';
 import { ReportingStore } from './lib';
diff --git a/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts b/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts
index 89d55ff04ab8f..dd04cd20ddac2 100644
--- a/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts
+++ b/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts
@@ -6,7 +6,7 @@
  */
 import { errors } from '@elastic/elasticsearch';
 import type { SecurityHasPrivilegesIndexPrivilegesCheck } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { Logger, RequestHandler } from 'kibana/server';
+import type { Logger, RequestHandler } from '@kbn/core/server';
 import {
   API_GET_ILM_POLICY_STATUS,
   API_MIGRATE_ILM_POLICY_URL,
@@ -27,9 +27,7 @@ export const registerDeprecationsRoutes = (reporting: ReportingCore, logger: Log
         return handler(ctx, req, res);
       }
 
-      const {
-        core: { elasticsearch },
-      } = ctx;
+      const { elasticsearch } = await ctx.core;
 
       const store = await reporting.getStore();
 
@@ -63,47 +61,40 @@ export const registerDeprecationsRoutes = (reporting: ReportingCore, logger: Log
       path: API_GET_ILM_POLICY_STATUS,
       validate: false,
     },
-    authzWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client: scopedClient },
-          },
-        },
-        _req,
-        res
-      ) => {
-        const checkIlmMigrationStatus = () => {
-          return deprecations.checkIlmMigrationStatus({
-            reportingCore: reporting,
-            // We want to make the current status visible to all reporting users
-            elasticsearchClient: scopedClient.asInternalUser,
-          });
-        };
+    authzWrapper(async ({ core }, _req, res) => {
+      const {
+        elasticsearch: { client: scopedClient },
+      } = await core;
+      const checkIlmMigrationStatus = () => {
+        return deprecations.checkIlmMigrationStatus({
+          reportingCore: reporting,
+          // We want to make the current status visible to all reporting users
+          elasticsearchClient: scopedClient.asInternalUser,
+        });
+      };
 
-        try {
-          const response: IlmPolicyStatusResponse = {
-            status: await checkIlmMigrationStatus(),
-          };
-          return res.ok({ body: response });
-        } catch (e) {
-          logger.error(e);
-          return res.customError({
-            statusCode: e?.statusCode ?? 500,
-            body: { message: e.message },
-          });
-        }
+      try {
+        const response: IlmPolicyStatusResponse = {
+          status: await checkIlmMigrationStatus(),
+        };
+        return res.ok({ body: response });
+      } catch (e) {
+        logger.error(e);
+        return res.customError({
+          statusCode: e?.statusCode ?? 500,
+          body: { message: e.message },
+        });
       }
-    )
+    })
   );
 
   router.put(
     { path: API_MIGRATE_ILM_POLICY_URL, validate: false },
-    authzWrapper(async ({ core: { elasticsearch } }, _req, res) => {
+    authzWrapper(async ({ core }, _req, res) => {
       const store = await reporting.getStore();
       const {
         client: { asCurrentUser: client },
-      } = elasticsearch;
+      } = (await core).elasticsearch;
 
       const scopedIlmPolicyManager = IlmPolicyManager.create({
         client,
diff --git a/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts b/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts
index 9c76aade058f0..1a13a3d1efa67 100644
--- a/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts
+++ b/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { licensingMock } from '../../../../../licensing/server/mocks';
-import { securityMock } from '../../../../../security/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { API_GET_ILM_POLICY_STATUS } from '../../../../common/constants';
 import {
   createMockConfigSchema,
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts b/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts
index b1b690c30a0af..5e57c212b45ab 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { lastValueFrom } from 'rxjs';
 import type { ReportingCore } from '../..';
 import { API_DIAGNOSE_URL } from '../../../common/constants';
 import { authorizedUserPreRouting } from '../lib/authorized_user_pre_routing';
-import type { DiagnosticResponse } from './';
+import type { DiagnosticResponse } from '.';
 
 const logsToHelpMap = {
   'error while loading shared libraries': i18n.translate(
@@ -35,7 +35,7 @@ const logsToHelpMap = {
   ),
 
   'No usable sandbox': i18n.translate('xpack.reporting.diagnostic.noUsableSandbox', {
-    defaultMessage: `Unable to use Chromium sandbox. This can be disabled at your own risk with 'xpack.reporting.capture.browser.chromium.disableSandbox'. Please see {url}`,
+    defaultMessage: `Unable to use Chromium sandbox. This can be disabled at your own risk with 'xpack.screenshotting.browser.chromium.disableSandbox'. Please see {url}`,
     values: {
       url: 'https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting.html#reporting-troubleshooting-sandbox-dependency',
     },
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/index.ts b/x-pack/plugins/reporting/server/routes/diagnostic/index.ts
index b5e2a8585afb3..952163a260806 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/index.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import type { ReportingCore } from '../../core';
 import { registerDiagnoseBrowser } from './browser';
 import { registerDiagnoseScreenshot } from './screenshot';
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts
index dc8fdb7e6d0c8..80be0f8f3a54c 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts
@@ -6,11 +6,11 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
-import type { ScreenshottingStart } from '../../../../../screenshotting/server';
+import { ReportingCore } from '../../..';
+import type { ScreenshottingStart } from '@kbn/screenshotting-plugin/server';
 import {
   createMockConfigSchema,
   createMockPluginSetup,
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts
index bccbad060979e..fd514302ecae5 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { generatePngObservable } from '../../../export_types/common';
 import {
   createMockConfigSchema,
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts b/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts
index 07bfbb48f29b3..7874686c05f24 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { lastValueFrom } from 'rxjs';
+import { APP_WRAPPER_CLASS } from '@kbn/core/server';
 import { ReportingCore } from '../..';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/server';
 import { API_DIAGNOSE_URL } from '../../../common/constants';
 import { generatePngObservable } from '../../export_types/common';
 import { getAbsoluteUrlFactory } from '../../export_types/common/get_absolute_url';
 import { authorizedUserPreRouting } from '../lib/authorized_user_pre_routing';
-import { DiagnosticResponse } from './';
+import { DiagnosticResponse } from '.';
 
 export const registerDiagnoseScreenshot = (reporting: ReportingCore, logger: Logger) => {
   const setupDeps = reporting.getPluginSetupDeps();
diff --git a/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts b/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts
index 19687b9d3ec9b..4218d500dae66 100644
--- a/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts
+++ b/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { KibanaRequest, Logger } from 'kibana/server';
-import type { ReportingCore } from '../../';
+import type { KibanaRequest, Logger } from '@kbn/core/server';
+import type { ReportingCore } from '../..';
 import { CSV_SEARCHSOURCE_IMMEDIATE_TYPE } from '../../../common/constants';
 import { runTaskFnFactory } from '../../export_types/csv_searchsource_immediate/execute_job';
 import type { JobParamsDownloadCSV } from '../../export_types/csv_searchsource_immediate/types';
diff --git a/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts b/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts
index c5e7bb2197d72..fc4c17201d796 100644
--- a/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts
+++ b/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import rison from 'rison-node';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import type { ReportingCore } from '../..';
 import { API_BASE_URL } from '../../../common/constants';
 import type { BaseParams } from '../../types';
diff --git a/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts b/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts
index f0db06485cf44..48823aca67ee4 100644
--- a/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts
+++ b/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts
@@ -7,11 +7,11 @@
 
 import rison from 'rison-node';
 import { BehaviorSubject } from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
-import { licensingMock } from '../../../../../licensing/server/mocks';
+import { ReportingCore } from '../../..';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { ReportingStore } from '../../../lib';
 import { ExportTypesRegistry } from '../../../lib/export_types_registry';
 import { Report } from '../../../lib/store';
diff --git a/x-pack/plugins/reporting/server/routes/index.ts b/x-pack/plugins/reporting/server/routes/index.ts
index 0cc0d1bdc6796..570d74f3e02ab 100644
--- a/x-pack/plugins/reporting/server/routes/index.ts
+++ b/x-pack/plugins/reporting/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { ReportingCore } from '..';
 import { registerDeprecationsRoutes } from './deprecations/deprecations';
 import { registerDiagnosticRoutes } from './diagnostic';
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
index 51e0994b59109..dba962f481b78 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
-import { ReportingCore } from '../../';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { ReportingCore } from '../..';
 import { ReportingInternalSetup, ReportingInternalStart } from '../../core';
 import {
   createMockConfigSchema,
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
index 7cf7e0b365f26..9b35b6fdbef10 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RequestHandler, RouteMethod } from 'src/core/server';
-import { AuthenticatedUser } from '../../../../security/server';
+import { RequestHandler, RouteMethod } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
 import { ReportingCore } from '../../core';
 import { getUser } from './get_user';
 import type { ReportingRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts b/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts
index 89e6fcf7df21d..02f1eb5dee12e 100644
--- a/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts
@@ -10,7 +10,7 @@ import { Stream } from 'stream';
 import contentDisposition from 'content-disposition';
 import { CSV_JOB_TYPE, CSV_JOB_TYPE_DEPRECATED } from '../../../common/constants';
 import { ReportApiJSON } from '../../../common/types';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { getContentStream, statuses } from '../../lib';
 import { ExportTypeDefinition } from '../../types';
 import { jobsQueryFactory } from './jobs_query';
diff --git a/x-pack/plugins/reporting/server/routes/lib/get_user.ts b/x-pack/plugins/reporting/server/routes/lib/get_user.ts
index 837acf74ba885..589643781db19 100644
--- a/x-pack/plugins/reporting/server/routes/lib/get_user.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/get_user.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { SecurityPluginStart } from '../../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export function getUser(request: KibanaRequest, security?: SecurityPluginStart) {
   return security?.authc.getCurrentUser(request) ?? false;
diff --git a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts
index 88e55e54be539..5bf87885dc431 100644
--- a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Readable, Writable } from 'stream';
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { CSV_JOB_TYPE, PDF_JOB_TYPE } from '../../../common/constants';
 import { ReportingCore } from '../..';
 import { ContentStream, getContentStream } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts
index 4033b317bef62..379454de7a0a8 100644
--- a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts
@@ -6,8 +6,8 @@
  */
 
 import { promisify } from 'util';
-import { kibanaResponseFactory } from 'kibana/server';
-import { ReportingCore } from '../../';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { ReportingCore } from '../..';
 import { ALLOWED_JOB_CONTENT_TYPES } from '../../../common/constants';
 import { getContentStream } from '../../lib';
 import { ReportingUser } from '../../types';
diff --git a/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts b/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts
index cc0df8c80fabc..0f72863ee03dd 100644
--- a/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { set } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { statuses } from '../../lib';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
 
diff --git a/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts b/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
index af679b403cbaf..ed5df4e2db8ae 100644
--- a/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
@@ -14,8 +14,8 @@ import {
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { errors } from '@elastic/elasticsearch';
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'src/core/server';
-import { ReportingCore } from '../../';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { ReportingCore } from '../..';
 import { REPORTING_SYSTEM_INDEX } from '../../../common/constants';
 import { ReportApiJSON, ReportSource } from '../../../common/types';
 import { statuses } from '../../lib/statuses';
diff --git a/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts b/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts
index c97ec3285839d..f3e771555c5a3 100644
--- a/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'kibana/server';
-import { coreMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '../..';
 import { JobParamsPDFDeprecated, TaskPayloadPDF } from '../../export_types/printable_pdf/types';
 import { Report, ReportingStore } from '../../lib/store';
@@ -76,7 +76,7 @@ describe('Handle request to generate', () => {
     (mockResponseFactory.badRequest as jest.Mock) = jest.fn((args: unknown) => args);
 
     mockContext = getMockContext();
-    mockContext.reporting = {} as ReportingSetup;
+    mockContext.reporting = Promise.resolve({} as ReportingSetup);
 
     requestHandler = new RequestHandler(
       reportingCore,
diff --git a/x-pack/plugins/reporting/server/routes/lib/request_handler.ts b/x-pack/plugins/reporting/server/routes/lib/request_handler.ts
index b8a3a4c69802c..8528afa709362 100644
--- a/x-pack/plugins/reporting/server/routes/lib/request_handler.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/request_handler.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import type { KibanaRequest, KibanaResponseFactory, Logger } from 'kibana/server';
+import type { KibanaRequest, KibanaResponseFactory, Logger } from '@kbn/core/server';
 import type { ReportingCore } from '../..';
 import { API_BASE_URL } from '../../../common/constants';
 import { checkParamsVersion, cryptoFactory } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts b/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts
index 41165894464f1..ed7edf1ff6895 100644
--- a/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts
+++ b/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts
@@ -8,13 +8,13 @@
 jest.mock('../../../lib/content_stream', () => ({
   getContentStream: jest.fn(),
 }));
-import type { ElasticsearchClientMock } from '../../../../../../../src/core/server/mocks';
+import type { ElasticsearchClientMock } from '@kbn/core/server/mocks';
 import { BehaviorSubject } from 'rxjs';
-import { setupServer } from 'src/core/server/test_utils';
+import { setupServer } from '@kbn/core/server/test_utils';
 import { Readable } from 'stream';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
-import { licensingMock } from '../../../../../licensing/server/mocks';
+import { ReportingCore } from '../../..';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { ReportingInternalSetup, ReportingInternalStart } from '../../../core';
 import { ContentStream, ExportTypesRegistry, getContentStream } from '../../../lib';
 import {
diff --git a/x-pack/plugins/reporting/server/routes/management/jobs.ts b/x-pack/plugins/reporting/server/routes/management/jobs.ts
index 54fc13ffbb613..0e017ece629e0 100644
--- a/x-pack/plugins/reporting/server/routes/management/jobs.ts
+++ b/x-pack/plugins/reporting/server/routes/management/jobs.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { ReportingCore } from '../../';
-import { ROUTE_TAG_CAN_REDIRECT } from '../../../../security/server';
+import { ROUTE_TAG_CAN_REDIRECT } from '@kbn/security-plugin/server';
+import { ReportingCore } from '../..';
 import { API_BASE_URL } from '../../../common/constants';
 import { authorizedUserPreRouting } from '../lib/authorized_user_pre_routing';
 import { jobsQueryFactory } from '../lib/jobs_query';
diff --git a/x-pack/plugins/reporting/server/services.ts b/x-pack/plugins/reporting/server/services.ts
index 55f32e21e4784..a09442ec32793 100644
--- a/x-pack/plugins/reporting/server/services.ts
+++ b/x-pack/plugins/reporting/server/services.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import { createGetterSetter } from '../../../../src/plugins/kibana_utils/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/server';
 
 export const [getFieldFormats, setFieldFormats] =
   createGetterSetter<FieldFormatsStart>('FieldFormats');
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
index 5b92c1f7d5983..4ec1cab671000 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
@@ -15,18 +15,18 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
   statusServiceMock,
-} from 'src/core/server/mocks';
-import { dataPluginMock } from 'src/plugins/data/server/mocks';
-import { FieldFormatsRegistry } from 'src/plugins/field_formats/common';
-import { fieldFormatsMock } from 'src/plugins/field_formats/common/mocks';
+} from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { DeepPartial } from 'utility-types';
-import { ReportingConfig, ReportingCore } from '../';
-import { featuresPluginMock } from '../../../features/server/mocks';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createMockScreenshottingStart } from '../../../screenshotting/server/mock';
-import { securityMock } from '../../../security/server/mocks';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { createMockScreenshottingStart } from '@kbn/screenshotting-plugin/server/mock';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { ReportingConfig, ReportingCore } from '..';
 import { buildConfig, ReportingConfigType } from '../config';
 import { ReportingInternalSetup, ReportingInternalStart } from '../core';
 import { ReportingStore } from '../lib';
@@ -118,16 +118,7 @@ export const createMockConfigSchema = (
       enabled: false,
       ...overrides.roles,
     },
-    capture: {
-      maxAttempts: 1,
-      loadDelay: 1,
-      timeouts: {
-        openUrl: 100,
-        renderComplete: 100,
-        waitForElements: 100,
-      },
-      zoom: 1,
-    },
+    capture: { maxAttempts: 1 },
   } as ReportingConfigType;
 };
 
diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
index 5ff13a72ea83d..f660690c6a755 100644
--- a/x-pack/plugins/reporting/server/types.ts
+++ b/x-pack/plugins/reporting/server/types.ts
@@ -5,27 +5,30 @@
  * 2.0.
  */
 
-import type { IRouter, Logger, RequestHandlerContext } from 'kibana/server';
+import type { IRouter, Logger, CustomRequestHandlerContext } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DataPluginStart } from 'src/plugins/data/server/plugin';
-import { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { DataPluginStart } from '@kbn/data-plugin/server/plugin';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type { Writable } from 'stream';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import type { LicensingPluginStart } from '../../licensing/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type {
   PngScreenshotOptions as BasePngScreenshotOptions,
   PdfScreenshotOptions as BasePdfScreenshotOptions,
   ScreenshottingStart,
-} from '../../screenshotting/server';
+} from '@kbn/screenshotting-plugin/server';
 import type {
   AuthenticatedUser,
   SecurityPluginSetup,
   SecurityPluginStart,
-} from '../../security/server';
-import type { SpacesPluginSetup } from '../../spaces/server';
-import type { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/security-plugin/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import type {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
 import type { CancellationToken } from '../common/cancellation_token';
 import type { BaseParams, BasePayload, TaskRunResult, UrlOrUrlLocatorTuple } from '../common/types';
 import type { ReportingConfigType } from './config';
@@ -48,7 +51,6 @@ export interface ReportingSetup {
 export type ReportingStart = ReportingSetup;
 export type ReportingUser = { username: AuthenticatedUser['username'] } | false;
 
-export type CaptureConfig = ReportingConfigType['capture'];
 export type ScrollConfig = ReportingConfigType['csv']['scroll'];
 
 /**
@@ -111,10 +113,9 @@ export interface ReportingStartDeps {
   taskManager: TaskManagerStartContract;
 }
 
-export interface ReportingRequestHandlerContext {
+export type ReportingRequestHandlerContext = CustomRequestHandlerContext<{
   reporting: ReportingStart | null;
-  core: RequestHandlerContext['core'];
-}
+}>;
 
 export type ReportingPluginRouter = IRouter<ReportingRequestHandlerContext>;
 
diff --git a/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts b/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts
index 6eda1bc5abfa9..0737e522c6347 100644
--- a/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts
+++ b/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import { ExportTypesRegistry } from '../lib/export_types_registry';
-import { FeaturesAvailability } from './';
+import { FeaturesAvailability } from '.';
 import { JobTypes } from './types';
 
 /*
diff --git a/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts b/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts
index a4d0ca9c66a0c..36f3bce78f624 100644
--- a/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts
+++ b/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { REPORTING_SYSTEM_INDEX } from '../../common/constants';
 import type { ExportTypesRegistry } from '../lib/export_types_registry';
-import type { GetLicense } from './';
+import type { GetLicense } from '.';
 import { getExportStats } from './get_export_stats';
 import { getExportTypesHandler } from './get_export_type_handler';
 import type {
diff --git a/x-pack/plugins/reporting/server/usage/index.ts b/x-pack/plugins/reporting/server/usage/index.ts
index 041c4982b7757..d15846227f920 100644
--- a/x-pack/plugins/reporting/server/usage/index.ts
+++ b/x-pack/plugins/reporting/server/usage/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 
 export interface FeaturesAvailability {
   isAvailable: () => boolean;
diff --git a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
index 1dcf0d680fdb4..730f2ec5282df 100644
--- a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
+++ b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { loggerMock } from '@kbn/logging-mocks';
-import type { ElasticsearchClientMock } from '../../../../../src/core/server/mocks';
+import type { ElasticsearchClientMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
   usageCollectionPluginMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { getExportTypesRegistry } from '../lib/export_types_registry';
 import { createMockConfigSchema, createMockReportingCore } from '../test_helpers';
-import { FeaturesAvailability } from './';
+import { FeaturesAvailability } from '.';
 import {
   getReportingUsageCollector,
   registerReportingUsageCollector,
diff --git a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
index b77cee853845b..6af917247725e 100644
--- a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
+++ b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
@@ -7,10 +7,10 @@
 
 import { firstValueFrom } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { ReportingCore } from '../';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { ReportingCore } from '..';
 import { ExportTypesRegistry } from '../lib/export_types_registry';
-import { GetLicense } from './';
+import { GetLicense } from '.';
 import { getReportingUsage } from './get_reporting_usage';
 import { ReportingUsageType } from './types';
 import { reportingSchema } from './schema';
diff --git a/x-pack/plugins/reporting/server/usage/schema.ts b/x-pack/plugins/reporting/server/usage/schema.ts
index dde4b5647fd9e..a4cd8a3e51bfa 100644
--- a/x-pack/plugins/reporting/server/usage/schema.ts
+++ b/x-pack/plugins/reporting/server/usage/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import {
   AppCounts,
   AvailableTotal,
diff --git a/x-pack/plugins/rollup/common/index.ts b/x-pack/plugins/rollup/common/index.ts
index c912a905d061d..56197d59fd546 100644
--- a/x-pack/plugins/rollup/common/index.ts
+++ b/x-pack/plugins/rollup/common/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/rollup/kibana.json b/x-pack/plugins/rollup/kibana.json
index 20f284686f3b5..c5b2511ccec63 100644
--- a/x-pack/plugins/rollup/kibana.json
+++ b/x-pack/plugins/rollup/kibana.json
@@ -11,5 +11,5 @@
   "requiredPlugins": ["management", "licensing", "features"],
   "optionalPlugins": ["home", "indexManagement", "usageCollection", "visTypeTimeseries"],
   "configPath": ["xpack", "rollup"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "home", "esUiShared", "data"]
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "esUiShared", "data"]
 }
diff --git a/x-pack/plugins/rollup/public/application.tsx b/x-pack/plugins/rollup/public/application.tsx
index 6e216f87ce6dc..38a7bb16af828 100644
--- a/x-pack/plugins/rollup/public/application.tsx
+++ b/x-pack/plugins/rollup/public/application.tsx
@@ -9,7 +9,8 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Provider } from 'react-redux';
 
-import { CoreSetup, ExecutionContextStart } from 'kibana/public';
+import { CoreSetup, ExecutionContextStart } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { KibanaContextProvider, KibanaThemeProvider, useExecutionContext } from './shared_imports';
 // @ts-ignore
 import { rollupJobsStore } from './crud_app/store';
@@ -18,8 +19,6 @@ import { App } from './crud_app/app';
 
 import './index.scss';
 
-import { ManagementAppMountParams } from '../../../../src/plugins/management/public';
-
 const AppWithExecutionContext = ({
   history,
   executionContext,
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
index 97602238dc5ee..22bc32a1498ce 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
@@ -12,7 +12,7 @@ import { cloneDeep, debounce, first, mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 import {
   EuiCallOut,
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
index eea02c941261a..7acb96fb7827a 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
@@ -25,7 +25,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { search } from '../../../../../../../../src/plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 const { parseEsInterval } = search.aggs;
 
 import { documentationLinks } from '../../../services/documentation_links';
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
index 2e54176a71e88..a3c594f439c37 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
@@ -25,8 +25,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { CronEditor } from '../../../../../../../../src/plugins/es_ui_shared/public';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { CronEditor } from '@kbn/es-ui-shared-plugin/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 import { indices } from '../../../../shared_imports';
 import { documentationLinks } from '../../../services/documentation_links';
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js
index e79416b2ef277..eb7767c52f368 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { search } from '../../../../../../../../src/plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 const { InvalidEsIntervalFormatError, InvalidEsCalendarIntervalError, parseEsInterval } =
   search.aggs;
 
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
index 6ccda42b9007f..e11714ebf1eba 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 export function validateIndexPattern(indexPattern, rollupIndex) {
   if (!indexPattern || !indexPattern.trim()) {
     return [
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js
index 454e0a25c9fee..2a38ed7c2da88 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { search } from '../../../../../../../../src/plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 const { InvalidEsIntervalFormatError, InvalidEsCalendarIntervalError, parseEsInterval } =
   search.aggs;
 
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
index 81df23b853008..e5c04dc6fffef 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
@@ -19,7 +19,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 import { extractQueryParams, SectionLoading } from '../../../shared_imports';
 import { getRouterLinkProps, listBreadcrumb } from '../../services';
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
index ba82e3b9b9f5e..d15376323c0d3 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
@@ -10,8 +10,8 @@ import { registerTestBed } from '@kbn/test-jest-helpers';
 import { rollupJobsStore } from '../../store';
 import { JobList } from './job_list';
 
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 jest.mock('../../services', () => {
@@ -23,7 +23,7 @@ jest.mock('../../services', () => {
 });
 
 jest.mock('../../services/documentation_links', () => {
-  const coreMocks = jest.requireActual('../../../../../../../src/core/public/mocks');
+  const coreMocks = jest.requireActual('@kbn/core/public/mocks');
 
   return {
     init: jest.fn(),
diff --git a/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts b/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts
index a2adfd7a38529..84e38ac9c3cb1 100644
--- a/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts
+++ b/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { getNotifications, getFatalErrors } from '../../kibana_services';
 
 function createToastConfig(
diff --git a/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts b/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts
index 65bbfd919f94d..267f71b58bbdb 100644
--- a/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts
+++ b/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DocLinksStart } from 'src/core/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 export let documentationLinks: DocLinksStart['links'];
 
diff --git a/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts b/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts
index 0ca5991c5b1e1..d450ccbe2d11e 100644
--- a/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts
+++ b/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 
 let _http: HttpStart | null = null;
 
diff --git a/x-pack/plugins/rollup/public/index.ts b/x-pack/plugins/rollup/public/index.ts
index f740971b4bcb0..47b9b5648247e 100644
--- a/x-pack/plugins/rollup/public/index.ts
+++ b/x-pack/plugins/rollup/public/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { RollupPlugin } from './plugin';
 
diff --git a/x-pack/plugins/rollup/public/kibana_services.ts b/x-pack/plugins/rollup/public/kibana_services.ts
index 0bfce1e041f20..04927c9e8faf9 100644
--- a/x-pack/plugins/rollup/public/kibana_services.ts
+++ b/x-pack/plugins/rollup/public/kibana_services.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { NotificationsStart, FatalErrorsSetup } from 'kibana/public';
+import { NotificationsStart, FatalErrorsSetup } from '@kbn/core/public';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { createGetterSetter } from '../../../../src/plugins/kibana_utils/common';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/common';
 
 let notifications: NotificationsStart | null = null;
 let fatalErrors: FatalErrorsSetup | null = null;
diff --git a/x-pack/plugins/rollup/public/plugin.ts b/x-pack/plugins/rollup/public/plugin.ts
index 6d0273e3750f0..27e8ad8b59d34 100644
--- a/x-pack/plugins/rollup/public/plugin.ts
+++ b/x-pack/plugins/rollup/public/plugin.ts
@@ -6,19 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_management';
 import { UIM_APP_NAME } from '../common';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { IndexManagementPluginSetup } from '../../index_management/public';
 // @ts-ignore
-import { setHttp, init as initDocumentation } from './crud_app/services/index';
+import { setHttp, init as initDocumentation } from './crud_app/services';
 import { setNotifications, setFatalErrors, setUiStatsReporter } from './kibana_services';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { ClientConfigType } from './types';
 
 export interface RollupPluginSetupDependencies {
@@ -60,7 +57,7 @@ export class RollupPlugin implements Plugin {
         icon: 'indexRollupApp',
         path: `/app/management/data/rollup_jobs/job_list`,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/x-pack/plugins/rollup/public/shared_imports.ts b/x-pack/plugins/rollup/public/shared_imports.ts
index 83182f2e05fe7..cee1fe39bc16a 100644
--- a/x-pack/plugins/rollup/public/shared_imports.ts
+++ b/x-pack/plugins/rollup/public/shared_imports.ts
@@ -10,10 +10,10 @@ export {
   indices,
   SectionLoading,
   EuiCodeEditor,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   KibanaContextProvider,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx b/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx
index 5e5c8bb1f071d..6b763fec07a66 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx
+++ b/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx
@@ -11,7 +11,7 @@ jest.mock('lodash', () => ({
 }));
 
 jest.mock('../../../crud_app/services/documentation_links', () => {
-  const coreMocks = jest.requireActual('../../../../../../../src/core/public/mocks');
+  const coreMocks = jest.requireActual('@kbn/core/public/mocks');
 
   return {
     init: jest.fn(),
diff --git a/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx b/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx
index c5e5ed1bdd2e3..ca8c80cea87b6 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx
+++ b/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx
@@ -7,8 +7,8 @@
 
 import React, { FunctionComponent } from 'react';
 
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 const services = {
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js
index 0b314d9174d0d..7a4eae8d0841f 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js
@@ -10,7 +10,7 @@ import { mockHttpRequest, pageHelpers } from './helpers';
 import { act } from 'react-dom/test-utils';
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
 import { JOB_TO_CLONE, JOB_CLONE_INDEX_PATTERN_CHECK } from './helpers/constants';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobClone;
 const {
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js
index dda79395dd4a7..565badc85403e 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js
@@ -9,7 +9,7 @@ import { mockHttpRequest, pageHelpers } from './helpers';
 
 import moment from 'moment-timezone';
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { docLinksServiceMock, coreMock } from '../../../../../../src/core/public/mocks';
+import { docLinksServiceMock, coreMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js
index 50615ed00a680..1166462a833de 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js
@@ -8,7 +8,7 @@
 import { mockHttpRequest, pageHelpers } from './helpers';
 
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js
index 667e3b569518a..540b9b7bb0dbc 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js
@@ -8,8 +8,8 @@
 import { mockHttpRequest, pageHelpers } from './helpers';
 
 import { act } from 'react-dom/test-utils';
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { indexPatterns } from '@kbn/data-plugin/public';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
 
 const { setup } = pageHelpers.jobCreate;
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js
index 659bcbce1c8eb..9f8b108049e23 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js
@@ -8,7 +8,7 @@
 import { mockHttpRequest, pageHelpers } from './helpers';
 
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js
index bbd2e72c6eee1..4927233b958b9 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js
@@ -9,7 +9,7 @@ import { pageHelpers, mockHttpRequest } from './helpers';
 
 import { act } from 'react-dom/test-utils';
 import { first } from 'lodash';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { setHttp } from '../../crud_app/services';
 import { JOBS } from './helpers/constants';
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js
index b84aad9bf9aa4..e4998d7e41ca7 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js
@@ -8,7 +8,7 @@
 import { pageHelpers, mockHttpRequest } from './helpers';
 
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
index 18ffce77b9656..ccb177c17a14b 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
@@ -10,7 +10,7 @@ import { mockHttpRequest, pageHelpers } from './helpers';
 import { act } from 'react-dom/test-utils';
 import { getRouter, setHttp, init as initDocumentation } from '../../crud_app/services';
 import { JOBS } from './helpers/constants';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../crud_app/services', () => {
   const services = jest.requireActual('../../crud_app/services');
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js
index 1e24a4f92666c..03833cb3a02e8 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { JOB_TO_CLONE, JOB_CLONE_INDEX_PATTERN_CHECK } from './helpers/constants';
 import { getRouter } from '../../crud_app/services/routing';
 import { setHttp } from '../../crud_app/services';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../kibana_services', () => {
   const services = jest.requireActual('../../kibana_services');
diff --git a/x-pack/plugins/rollup/server/collectors/helpers.test.ts b/x-pack/plugins/rollup/server/collectors/helpers.test.ts
index 68fd1c24ea91b..d1ecfe1aa5980 100644
--- a/x-pack/plugins/rollup/server/collectors/helpers.test.ts
+++ b/x-pack/plugins/rollup/server/collectors/helpers.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   fetchRollupIndexPatterns,
   fetchRollupSavedSearches,
diff --git a/x-pack/plugins/rollup/server/collectors/helpers.ts b/x-pack/plugins/rollup/server/collectors/helpers.ts
index a00ad10237ee9..c7ff8a2c42f34 100644
--- a/x-pack/plugins/rollup/server/collectors/helpers.ts
+++ b/x-pack/plugins/rollup/server/collectors/helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 // elasticsearch index.max_result_window default value
 const ES_MAX_RESULT_WINDOW_DEFAULT_VALUE = 1000;
diff --git a/x-pack/plugins/rollup/server/collectors/register.test.ts b/x-pack/plugins/rollup/server/collectors/register.test.ts
index 30aae2cd14b57..5180c54c9d41a 100644
--- a/x-pack/plugins/rollup/server/collectors/register.test.ts
+++ b/x-pack/plugins/rollup/server/collectors/register.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createUsageCollectionSetupMock } from 'src/plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { registerRollupUsageCollector } from './register';
 
 describe('registerRollupUsageCollector', () => {
diff --git a/x-pack/plugins/rollup/server/collectors/register.ts b/x-pack/plugins/rollup/server/collectors/register.ts
index 83b20d0708fbc..6fe44ee0309f9 100644
--- a/x-pack/plugins/rollup/server/collectors/register.ts
+++ b/x-pack/plugins/rollup/server/collectors/register.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup, CollectorFetchContext } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup, CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import {
   fetchRollupIndexPatterns,
   fetchRollupSavedSearches,
diff --git a/x-pack/plugins/rollup/server/config.ts b/x-pack/plugins/rollup/server/config.ts
index c0cca4bbb4d33..235202a23db24 100644
--- a/x-pack/plugins/rollup/server/config.ts
+++ b/x-pack/plugins/rollup/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common';
 
diff --git a/x-pack/plugins/rollup/server/index.ts b/x-pack/plugins/rollup/server/index.ts
index 6ae1d9f24b8b9..8f41f7f9cf6fe 100644
--- a/x-pack/plugins/rollup/server/index.ts
+++ b/x-pack/plugins/rollup/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { RollupPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/rollup/server/plugin.ts b/x-pack/plugins/rollup/server/plugin.ts
index 93b216f05d37e..91538ae9a375d 100644
--- a/x-pack/plugins/rollup/server/plugin.ts
+++ b/x-pack/plugins/rollup/server/plugin.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
+import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
 import { PLUGIN, CONFIG_ROLLUPS } from '../common';
 import { Dependencies } from './types';
 import { registerApiRoutes } from './routes';
@@ -18,7 +19,6 @@ import { rollupDataEnricher } from './rollup_data_enricher';
 import { IndexPatternsFetcher } from './shared_imports';
 import { handleEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
-import { getCapabilitiesForRollupIndices } from '../../../../src/plugins/data/server';
 
 export class RollupPlugin implements Plugin<void, void, any, any> {
   private readonly logger: Logger;
diff --git a/x-pack/plugins/rollup/server/rollup_data_enricher.ts b/x-pack/plugins/rollup/server/rollup_data_enricher.ts
index 599a53734605f..b1da5526c8f58 100644
--- a/x-pack/plugins/rollup/server/rollup_data_enricher.ts
+++ b/x-pack/plugins/rollup/server/rollup_data_enricher.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { Index } from '../../../plugins/index_management/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { Index } from '@kbn/index-management-plugin/server';
 
 export const rollupDataEnricher = async (indicesList: Index[], client: IScopedClusterClient) => {
   if (!indicesList || !indicesList.length) {
diff --git a/x-pack/plugins/rollup/server/routes/api/indices/register_get_route.ts b/x-pack/plugins/rollup/server/routes/api/indices/register_get_route.ts
index 485c1301b4d9b..99312936adba4 100644
--- a/x-pack/plugins/rollup/server/routes/api/indices/register_get_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/indices/register_get_route.ts
@@ -23,7 +23,7 @@ export const registerGetRoute = ({
     },
     license.guardApiRoute(async (context, request, response) => {
       try {
-        const { client: clusterClient } = context.core.elasticsearch;
+        const { client: clusterClient } = (await context.core).elasticsearch;
         const data = await clusterClient.asCurrentUser.rollup.getRollupIndexCaps({
           index: '_all',
         });
diff --git a/x-pack/plugins/rollup/server/routes/api/indices/register_validate_index_pattern_route.ts b/x-pack/plugins/rollup/server/routes/api/indices/register_validate_index_pattern_route.ts
index dec51870f2f57..8eaea73e42b37 100644
--- a/x-pack/plugins/rollup/server/routes/api/indices/register_validate_index_pattern_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/indices/register_validate_index_pattern_route.ts
@@ -67,7 +67,7 @@ export const registerValidateIndexPatternRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const { indexPattern } = request.params;
         const [fieldCapabilities, rollupIndexCapabilities] = await Promise.all([
diff --git a/x-pack/plugins/rollup/server/routes/api/jobs/register_create_route.ts b/x-pack/plugins/rollup/server/routes/api/jobs/register_create_route.ts
index ca067d0833981..21c0681f8458c 100644
--- a/x-pack/plugins/rollup/server/routes/api/jobs/register_create_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/jobs/register_create_route.ts
@@ -29,7 +29,7 @@ export const registerCreateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const { id, ...rest } = request.body.job;
         // Create job.
diff --git a/x-pack/plugins/rollup/server/routes/api/jobs/register_delete_route.ts b/x-pack/plugins/rollup/server/routes/api/jobs/register_delete_route.ts
index 7e22b5c4ead10..f6b530ef2fc0e 100644
--- a/x-pack/plugins/rollup/server/routes/api/jobs/register_delete_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/jobs/register_delete_route.ts
@@ -24,7 +24,7 @@ export const registerDeleteRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const { jobIds } = request.body;
         const data = await Promise.all(
diff --git a/x-pack/plugins/rollup/server/routes/api/jobs/register_get_route.ts b/x-pack/plugins/rollup/server/routes/api/jobs/register_get_route.ts
index cc0b138aeb835..d74a2907254d7 100644
--- a/x-pack/plugins/rollup/server/routes/api/jobs/register_get_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/jobs/register_get_route.ts
@@ -19,7 +19,7 @@ export const registerGetRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const data = await clusterClient.asCurrentUser.rollup.getJobs({ id: '_all' });
         return response.ok({ body: data });
diff --git a/x-pack/plugins/rollup/server/routes/api/jobs/register_start_route.ts b/x-pack/plugins/rollup/server/routes/api/jobs/register_start_route.ts
index 133c0cb34c9f5..85e2a508f04a9 100644
--- a/x-pack/plugins/rollup/server/routes/api/jobs/register_start_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/jobs/register_start_route.ts
@@ -29,7 +29,7 @@ export const registerStartRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const { jobIds } = request.body;
 
diff --git a/x-pack/plugins/rollup/server/routes/api/jobs/register_stop_route.ts b/x-pack/plugins/rollup/server/routes/api/jobs/register_stop_route.ts
index 164273f604b43..617023413eea3 100644
--- a/x-pack/plugins/rollup/server/routes/api/jobs/register_stop_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/jobs/register_stop_route.ts
@@ -27,7 +27,7 @@ export const registerStopRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const { jobIds } = request.body;
         // For our API integration tests we need to wait for the jobs to be stopped
diff --git a/x-pack/plugins/rollup/server/routes/api/search/register_search_route.ts b/x-pack/plugins/rollup/server/routes/api/search/register_search_route.ts
index ab144c1f42440..98116e8288866 100644
--- a/x-pack/plugins/rollup/server/routes/api/search/register_search_route.ts
+++ b/x-pack/plugins/rollup/server/routes/api/search/register_search_route.ts
@@ -27,7 +27,7 @@ export const registerSearchRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
       try {
         const requests = request.body.map(({ index, query }: { index: string; query?: any }) =>
           clusterClient.asCurrentUser.rollup.rollupSearch({
diff --git a/x-pack/plugins/rollup/server/services/license.ts b/x-pack/plugins/rollup/server/services/license.ts
index 1b88a4020afa6..3a10e9a4b9ce2 100644
--- a/x-pack/plugins/rollup/server/services/license.ts
+++ b/x-pack/plugins/rollup/server/services/license.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Logger, RequestHandlerContext } from 'src/core/server';
-import { KibanaRequest, KibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { Logger, RequestHandlerContext } from '@kbn/core/server';
+import { KibanaRequest, KibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
-import { LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/rollup/server/shared_imports.ts b/x-pack/plugins/rollup/server/shared_imports.ts
index fe157644c6b3d..8cc3879d70c91 100644
--- a/x-pack/plugins/rollup/server/shared_imports.ts
+++ b/x-pack/plugins/rollup/server/shared_imports.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-export { IndexPatternsFetcher } from '../../../../src/plugins/data/server';
+export { IndexPatternsFetcher } from '@kbn/data-plugin/server';
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/rollup/server/types.ts b/x-pack/plugins/rollup/server/types.ts
index a3e826fefa0bf..177efe0915fcf 100644
--- a/x-pack/plugins/rollup/server/types.ts
+++ b/x-pack/plugins/rollup/server/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { VisTypeTimeseriesSetup } from 'src/plugins/vis_types/timeseries/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
 
-import { getCapabilitiesForRollupIndices } from 'src/plugins/data/server';
-import { IndexManagementPluginSetup } from '../../index_management/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { License } from './services';
 import { IndexPatternsFetcher } from './shared_imports';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts b/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts
index e93254c3c5a66..8c661ed1e4f4f 100644
--- a/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts
+++ b/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { pickWithPatterns } from './';
+import { pickWithPatterns } from '.';
 
 describe('pickWithPatterns', () => {
   const fieldMap = {
diff --git a/x-pack/plugins/rule_registry/common/search_strategy/index.ts b/x-pack/plugins/rule_registry/common/search_strategy/index.ts
index b0f41129b8149..1f3b415e53926 100644
--- a/x-pack/plugins/rule_registry/common/search_strategy/index.ts
+++ b/x-pack/plugins/rule_registry/common/search_strategy/index.ts
@@ -6,9 +6,9 @@
  */
 import { ValidFeatureId } from '@kbn/rule-data-utils';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Ecs } from 'kibana/server';
+import { Ecs } from '@kbn/core/server';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchRequest, IEsSearchResponse } from 'src/plugins/data/common';
+import { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
 
 export type RuleRegistrySearchRequest = IEsSearchRequest & {
   featureIds: ValidFeatureId[];
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
index a0b3d2154d688..b5df5dc830d48 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -21,16 +21,16 @@ import {
   InlineScript,
   QueryDslQueryContainer,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RuleTypeParams } from '../../../alerting/server';
+import { RuleTypeParams } from '@kbn/alerting-plugin/server';
 import {
   ReadOperations,
   AlertingAuthorization,
   WriteOperations,
   AlertingAuthorizationEntity,
-} from '../../../alerting/server';
-import { Logger, ElasticsearchClient, EcsEventOutcome } from '../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { Logger, ElasticsearchClient, EcsEventOutcome } from '@kbn/core/server';
+import { AuditLogger } from '@kbn/security-plugin/server';
 import { alertAuditEvent, operationAlertAuditActionMap } from './audit_events';
-import { AuditLogger } from '../../../security/server';
 import {
   ALERT_WORKFLOW_STATUS,
   ALERT_RULE_CONSUMER,
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
index c8660fc69c224..35e80fb271f34 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
@@ -8,11 +8,11 @@
 import { Request } from '@hapi/hapi';
 
 import { AlertsClientFactory, AlertsClientFactoryProps } from './alerts_client_factory';
-import { ElasticsearchClient, KibanaRequest } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
+import { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
 import { ruleDataServiceMock } from '../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 jest.mock('./alerts_client');
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
index 8225394c2dba7..dd924ba0b8144 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
@@ -6,9 +6,9 @@
  */
 
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { ElasticsearchClient, KibanaRequest, Logger } from 'src/core/server';
-import { AlertingAuthorization } from '../../../alerting/server';
-import { SecurityPluginSetup } from '../../../security/server';
+import { ElasticsearchClient, KibanaRequest, Logger } from '@kbn/core/server';
+import { AlertingAuthorization } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { IRuleDataService } from '../rule_data_plugin_service';
 import { AlertsClient } from './alerts_client';
 
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts b/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts
index 4b983e986f859..36a6a497203e7 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { EcsEventOutcome, EcsEventType } from 'src/core/server';
-import { AuditEvent } from '../../../security/server';
-import { ReadOperations, WriteOperations } from '../../../alerting/server';
+import { EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { AuditEvent } from '@kbn/security-plugin/server';
+import { ReadOperations, WriteOperations } from '@kbn/alerting-plugin/server';
 
 export enum AlertAuditAction {
   GET = 'alert_get',
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
index 3c57d8269f42b..3f9143ac7922b 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
@@ -13,12 +13,12 @@ import {
   ALERT_RULE_TYPE_ID,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
index 7c4085cb5837f..b818ff183f3e0 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
@@ -12,12 +12,12 @@ import {
   ALERT_WORKFLOW_STATUS,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
index e3f186ce8c0c8..a9bfe02443f73 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
@@ -13,12 +13,12 @@ import {
   ALERT_RULE_TYPE_ID,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
index 8c540fc19f537..785926656b825 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
@@ -12,12 +12,12 @@ import {
   ALERT_RULE_TYPE_ID,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/config.ts b/x-pack/plugins/rule_registry/server/config.ts
index c0b9739910982..d3b297db070ad 100644
--- a/x-pack/plugins/rule_registry/server/config.ts
+++ b/x-pack/plugins/rule_registry/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 export const config: PluginConfigDescriptor = {
   deprecations: ({ unused }) => [unused('unsafe.indexUpgrade.enabled', { level: 'warning' })],
diff --git a/x-pack/plugins/rule_registry/server/index.ts b/x-pack/plugins/rule_registry/server/index.ts
index d52cd0ebf608c..c39aeb158be74 100644
--- a/x-pack/plugins/rule_registry/server/index.ts
+++ b/x-pack/plugins/rule_registry/server/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110907
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { RuleRegistryPlugin } from './plugin';
 
 export type { RuleRegistryPluginSetupContract, RuleRegistryPluginStartContract } from './plugin';
diff --git a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts
index 3b79c7a5bad8a..026a63bc86b11 100644
--- a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts
+++ b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { ReadOperations } from '../../../alerting/server';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { ReadOperations } from '@kbn/alerting-plugin/server';
 import { getAuthzFilter } from './get_authz_filter';
 
 describe('getAuthzFilter()', () => {
diff --git a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts
index 88b8feb2ca97c..35bab55c7c4e3 100644
--- a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts
+++ b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts
@@ -11,7 +11,7 @@ import {
   AlertingAuthorization,
   AlertingAuthorizationEntity,
   AlertingAuthorizationFilterType,
-} from '../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import {
   ALERT_RULE_CONSUMER,
   ALERT_RULE_TYPE_ID,
diff --git a/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts b/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts
index c0961b84c7c28..5ff07750d8f87 100644
--- a/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts
+++ b/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Headers } from 'kibana/server';
+import type { Headers } from '@kbn/core/server';
 
 /**
  * Taken from
diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
index df32abcc80865..955d606dda507 100644
--- a/x-pack/plugins/rule_registry/server/plugin.ts
+++ b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -13,15 +13,15 @@ import {
   KibanaRequest,
   CoreStart,
   IContextProvider,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import { PluginStartContract as AlertingStart } from '../../alerting/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { SpacesPluginStart } from '../../spaces/server';
+import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   PluginStart as DataPluginStart,
   PluginSetup as DataPluginSetup,
-} from '../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
 import { RuleRegistryPluginConfig } from './config';
 import { IRuleDataService, RuleDataService } from './rule_data_plugin_service';
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts
index 4521ba770d806..317379aba8405 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { coreMock, elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { alertsClientMock } from '../../alert_data_client/alerts_client.mock';
 import { RacRequestHandlerContext } from '../../types';
 
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts
index 7952b33dcf9b1..6afba9e232c5e 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 const responseMock = {
   create: httpServerMock.createResponseFactory,
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts
index ade72435c57d9..963cea0e1e937 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RequestHandler, RouteConfig, KibanaRequest } from 'src/core/server';
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
+import { RequestHandler, RouteConfig, KibanaRequest } from '@kbn/core/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
 import { RacRequestHandlerContext } from '../../types';
 import { requestContextMock } from './request_context';
 import { responseAdapter } from './response_adapters';
diff --git a/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts b/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts
index afeddee5ff876..a1a316200e5ee 100644
--- a/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts
+++ b/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
@@ -52,7 +52,8 @@ export const bulkUpdateAlertsRoute = (router: IRouter<RacRequestHandlerContext>)
     },
     async (context, req, response) => {
       try {
-        const alertsClient = await context.rac.getAlertsClient();
+        const racContext = await context.rac;
+        const alertsClient = await racContext.getAlertsClient();
         const { status, ids, index, query } = req.body;
 
         if (ids != null && ids.length > 1000) {
diff --git a/x-pack/plugins/rule_registry/server/routes/find.ts b/x-pack/plugins/rule_registry/server/routes/find.ts
index 8fb3c116e171c..eca0a6c2a0551 100644
--- a/x-pack/plugins/rule_registry/server/routes/find.ts
+++ b/x-pack/plugins/rule_registry/server/routes/find.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
@@ -43,7 +43,8 @@ export const findAlertsByQueryRoute = (router: IRouter<RacRequestHandlerContext>
         // eslint-disable-next-line @typescript-eslint/naming-convention
         const { query, aggs, _source, track_total_hits, size, index } = request.body;
 
-        const alertsClient = await context.rac.getAlertsClient();
+        const racContext = await context.rac;
+        const alertsClient = await racContext.getAlertsClient();
 
         const alerts = await alertsClient.find({
           query,
diff --git a/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts b/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts
index 9ddec56055a5a..2dc2d1ec2db7d 100644
--- a/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts
+++ b/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
@@ -40,7 +40,8 @@ export const getAlertByIdRoute = (router: IRouter<RacRequestHandlerContext>) =>
     },
     async (context, request, response) => {
       try {
-        const alertsClient = await context.rac.getAlertsClient();
+        const racContext = await context.rac;
+        const alertsClient = await racContext.getAlertsClient();
         const { id, index } = request.query;
         const alert = await alertsClient.get({ id, index });
         if (alert == null) {
diff --git a/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts b/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts
index 758057c21c43e..3da040de66963 100644
--- a/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts
+++ b/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
@@ -34,7 +34,8 @@ export const getAlertsIndexRoute = (router: IRouter<RacRequestHandlerContext>) =
     },
     async (context, request, response) => {
       try {
-        const alertsClient = await context.rac.getAlertsClient();
+        const racContext = await context.rac;
+        const alertsClient = await racContext.getAlertsClient();
         const { features } = request.query;
         const indexName = await alertsClient.getAuthorizedAlertsIndices(
           features?.split(',') ?? validFeatureIds
diff --git a/x-pack/plugins/rule_registry/server/routes/index.ts b/x-pack/plugins/rule_registry/server/routes/index.ts
index 4de121c7b9b5e..625869ecbe1a8 100644
--- a/x-pack/plugins/rule_registry/server/routes/index.ts
+++ b/x-pack/plugins/rule_registry/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { RacRequestHandlerContext } from '../types';
 import { getAlertByIdRoute } from './get_alert_by_id';
 import { updateAlertByIdRoute } from './update_alert_by_id';
diff --git a/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts b/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts
index a77688a514e77..69f6b338bfda8 100644
--- a/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts
+++ b/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
@@ -42,7 +42,8 @@ export const updateAlertByIdRoute = (router: IRouter<RacRequestHandlerContext>)
     },
     async (context, req, response) => {
       try {
-        const alertsClient = await context.rac.getAlertsClient();
+        const racContext = await context.rac;
+        const alertsClient = await racContext.getAlertsClient();
         const { status, ids, index, _version } = req.body;
 
         const updatedAlert = await alertsClient.update({
diff --git a/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts b/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts
index 680b67949bde5..910d712a75d75 100644
--- a/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts
+++ b/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts
@@ -20,7 +20,7 @@ import {
   RouteValidationError,
   RouteValidationFunction,
   RouteValidationResultFactory,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 type RequestValidationResult<T> =
   | {
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts
index 0a700cab50ee6..2fa05e0cf27ca 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts
@@ -10,9 +10,9 @@ import { RuleDataClient, RuleDataClientConstructorOptions, WaitResult } from './
 import { IndexInfo } from '../rule_data_plugin_service/index_info';
 import { Dataset, RuleDataWriterInitializationError } from '..';
 import { resourceInstallerMock } from '../rule_data_plugin_service/resource_installer.mock';
-import { loggingSystemMock, elasticsearchServiceMock } from 'src/core/server/mocks';
-import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
-import { createNoMatchingIndicesError } from '../../../../../src/plugins/data_views/server/fetcher/lib/errors';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { IndexPatternsFetcher } from '@kbn/data-plugin/server';
+import { createNoMatchingIndicesError } from '@kbn/data-views-plugin/server/fetcher/lib/errors';
 
 const mockLogger = loggingSystemMock.create().get();
 const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient().asInternalUser;
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
index 6fe9d43ddbee0..e8c57c7c4ee4a 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
@@ -9,9 +9,9 @@ import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Either, isLeft } from 'fp-ts/lib/Either';
 
-import { ElasticsearchClient } from 'kibana/server';
-import { Logger } from 'kibana/server';
-import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
+import { IndexPatternsFetcher } from '@kbn/data-plugin/server';
 
 import {
   RuleDataWriteDisabledError,
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/types.ts b/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
index 55a03fda14624..7b59a64047d04 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
@@ -8,8 +8,8 @@
 import type { TransportResult } from '@elastic/elasticsearch';
 import { BulkRequest, BulkResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ESSearchRequest, ESSearchResponse } from 'src/core/types/elasticsearch';
-import { FieldDescriptor } from 'src/plugins/data/server';
+import { ESSearchRequest, ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { FieldDescriptor } from '@kbn/data-plugin/server';
 import { ParsedExperimentalFields } from '../../common/parse_experimental_fields';
 import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
 
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts
index 0685fcc5bab93..f908224bb7a7b 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts
@@ -11,7 +11,7 @@ import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { Dataset } from './index_options';
 import { IndexInfo } from './index_info';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   DEFAULT_ILM_POLICY_ID,
   ECS_COMPONENT_TEMPLATE_NAME,
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
index ab7bc28af8c13..264df190b4839 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
@@ -8,7 +8,7 @@
 import { get, isEmpty } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import { PublicMethodsOf } from '@kbn/utility-types';
 import {
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts
index befc42278196d..916ab9d7b7940 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts
@@ -7,7 +7,7 @@
 
 import { loggerMock } from '@kbn/logging-mocks';
 import { RuleDataService } from './rule_data_plugin_service';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 import { Dataset } from './index_options';
 import { RuleDataClient } from '../rule_data_client/rule_data_client';
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
index b916091510319..a940201841e6f 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
@@ -8,7 +8,7 @@
 import { Either, isLeft, left, right } from 'fp-ts/lib/Either';
 import { ValidFeatureId } from '@kbn/rule-data-utils';
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import { INDEX_PREFIX } from '../config';
 import { IRuleDataClient, RuleDataClient, WaitResult } from '../rule_data_client';
diff --git a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts
index f5f7d8d164b48..79b9a8cd75c58 100644
--- a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts
+++ b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts
@@ -14,11 +14,11 @@ import {
   RULE_SEARCH_STRATEGY_NAME,
 } from './search_strategy';
 import { ruleDataServiceMock } from '../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
-import { SearchStrategyDependencies } from '../../../../../src/plugins/data/server';
-import { alertsMock } from '../../../alerting/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { spacesMock } from '../../../spaces/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { SearchStrategyDependencies } from '@kbn/data-plugin/server';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 import { RuleRegistrySearchRequest } from '../../common/search_strategy';
 import { IndexInfo } from '../rule_data_plugin_service/index_info';
 import * as getAuthzFilterImport from '../lib/get_authz_filter';
diff --git a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
index da32d68a85f86..851ffbdc098da 100644
--- a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
+++ b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
@@ -7,22 +7,22 @@
 import { map, mergeMap, catchError } from 'rxjs/operators';
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { from, of } from 'rxjs';
 import { isValidFeatureId, AlertConsumers } from '@kbn/rule-data-utils';
-import { ENHANCED_ES_SEARCH_STRATEGY } from '../../../../../src/plugins/data/common';
-import { ISearchStrategy, PluginStart } from '../../../../../src/plugins/data/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
+import { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
+import { ReadOperations, PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   RuleRegistrySearchRequest,
   RuleRegistrySearchResponse,
 } from '../../common/search_strategy';
-import { ReadOperations, PluginStartContract as AlertingStart } from '../../../alerting/server';
-import { SecurityPluginSetup } from '../../../security/server';
-import { SpacesPluginStart } from '../../../spaces/server';
 import { IRuleDataService } from '..';
 import { Dataset } from '../rule_data_plugin_service/index_options';
 import { MAX_ALERT_SEARCH_SIZE } from '../../common/constants';
-import { AlertAuditAction, alertAuditEvent } from '../';
+import { AlertAuditAction, alertAuditEvent } from '..';
 import { getSpacesFilter, getAuthzFilter } from '../lib';
 import { getIsKibanaRequest } from '../lib/get_is_kibana_request';
 
diff --git a/x-pack/plugins/rule_registry/server/types.ts b/x-pack/plugins/rule_registry/server/types.ts
index 752a573630af7..6a7d5b849c771 100644
--- a/x-pack/plugins/rule_registry/server/types.ts
+++ b/x-pack/plugins/rule_registry/server/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { RequestHandlerContext } from 'kibana/server';
+import { CustomRequestHandlerContext } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../alerting/common';
-import { RuleExecutorOptions, RuleExecutorServices, RuleType } from '../../alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { RuleExecutorOptions, RuleExecutorServices, RuleType } from '@kbn/alerting-plugin/server';
 import { AlertsClient } from './alert_data_client/alerts_client';
 
 type SimpleAlertType<
@@ -68,6 +68,6 @@ export interface RacApiRequestHandlerContext {
 /**
  * @internal
  */
-export interface RacRequestHandlerContext extends RequestHandlerContext {
+export type RacRequestHandlerContext = CustomRequestHandlerContext<{
   rac: RacApiRequestHandlerContext;
-}
+}>;
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
index c31c4f15039cd..f38e73ca3a9a2 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
@@ -18,7 +18,7 @@ import {
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { ParsedExperimentalFields } from '../../common/parse_experimental_fields';
 import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
 import {
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts
index 0833a1c08d452..bf0d98d5156af 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts
@@ -10,7 +10,7 @@ import {
   RuleTypeState,
   AlertInstanceState,
   AlertInstanceContext,
-} from '../../../../plugins/alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { AlertExecutorOptionsWithExtraServices } from '../types';
 
 import { LifecycleAlertServices, LifecycleRuleExecutor } from './create_lifecycle_executor';
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
index 79ab866c62802..7894478aedf22 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
@@ -18,7 +18,7 @@ import { castArray, omit } from 'lodash';
 import { RuleDataClient } from '../rule_data_client';
 import { createRuleDataClientMock } from '../rule_data_client/rule_data_client.mock';
 import { createLifecycleRuleTypeFactory } from './create_lifecycle_rule_type_factory';
-import { ISearchStartSearchSource } from '../../../../../src/plugins/data/common';
+import { ISearchStartSearchSource } from '@kbn/data-plugin/common';
 
 type RuleTestHelpers = ReturnType<typeof createRule>;
 
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts
index 68f6340dfb513..bde184013df9b 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 import { Logger } from '@kbn/logging';
-import { IRuleDataClient } from '../rule_data_client';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { IRuleDataClient } from '../rule_data_client';
 import { AlertTypeWithExecutor } from '../types';
 import { LifecycleAlertService, createLifecycleExecutor } from './create_lifecycle_executor';
 
diff --git a/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts b/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts
index 256843a2646da..1aec64a408060 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { alertsMock } from '../../../alerting/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { PersistenceServices } from './persistence_types';
 
 export const createPersistenceServicesMock = (): jest.Mocked<PersistenceServices> => {
diff --git a/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts b/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts
index a033890746f48..be611d8e959b2 100644
--- a/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts
+++ b/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts
@@ -18,7 +18,7 @@ import {
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
 
-import { RuleExecutorOptions } from '../../../alerting/server';
+import { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
 import { CommonAlertFieldsLatest } from '../../common/schemas';
 
 export const getCommonAlertFields = (
diff --git a/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts b/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts
index f1660628b4080..5465e7a7922c5 100644
--- a/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts
+++ b/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { AlertInstanceContext, AlertInstanceState } from '../../../alerting/server';
-import { alertsMock } from '../../../alerting/server/mocks';
+import { AlertInstanceContext, AlertInstanceState } from '@kbn/alerting-plugin/server';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { LifecycleAlertServices } from './create_lifecycle_executor';
 
 /**
diff --git a/x-pack/plugins/rule_registry/server/utils/persistence_types.ts b/x-pack/plugins/rule_registry/server/utils/persistence_types.ts
index 8bc511e83ac21..5390b275f73b7 100644
--- a/x-pack/plugins/rule_registry/server/utils/persistence_types.ts
+++ b/x-pack/plugins/rule_registry/server/utils/persistence_types.ts
@@ -13,8 +13,8 @@ import {
   RuleType,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/server';
-import { WithoutReservedActionGroups } from '../../../alerting/common';
+} from '@kbn/alerting-plugin/server';
+import { WithoutReservedActionGroups } from '@kbn/alerting-plugin/common';
 import { IRuleDataClient } from '../rule_data_client';
 import { BulkResponseErrorAggregation } from './utils';
 import { AlertWithCommonFieldsLatest } from '../../common/schemas';
diff --git a/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts b/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts
index c9b7138348c3d..05c069d80ed3e 100644
--- a/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts
+++ b/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts
@@ -9,16 +9,16 @@ import {
   savedObjectsClientMock,
   httpServerMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   RuleExecutorOptions,
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/server';
-import { alertsMock } from '../../../alerting/server/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+} from '@kbn/alerting-plugin/server';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 
 export const createDefaultAlertExecutorOptions = <
   Params extends RuleTypeParams = never,
diff --git a/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts b/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts
index 91bd168257aaa..3863267373c15 100644
--- a/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts
+++ b/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AlertInstanceContext, RuleTypeParams, RuleTypeState } from '../../../alerting/common';
+import { AlertInstanceContext, RuleTypeParams, RuleTypeState } from '@kbn/alerting-plugin/common';
 import { IRuleDataClient } from '../rule_data_client';
 import { AlertTypeWithExecutor } from '../types';
 
diff --git a/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx b/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx
index 336fb52f4cd00..770a718e7da97 100644
--- a/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx
+++ b/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
-jest.mock('../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   const CodeEditorMock = (props: any) => (
     <input
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx
index 421be063dc508..4a7f8d07db7e1 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import '../../__jest__/setup_environment';
 import { registerTestBed, TestBed } from '../../test_utils';
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx
index ed08a2362416a..34b4ee50c84a2 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import { RuntimeField } from '../../types';
 import { getLinks } from '../../lib';
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx
index abcff4a79a475..64f5c6468ce1b 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import '../../__jest__/setup_environment';
 import { registerTestBed, TestBed } from '../../test_utils';
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx
index 9d13b1b5004ae..33a77d46f774a 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx
@@ -19,7 +19,7 @@ import {
   EuiSpacer,
   EuiCallOut,
 } from '@elastic/eui';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import { RuntimeField } from '../../types';
 import { FormState } from '../runtime_field_form';
diff --git a/x-pack/plugins/runtime_fields/public/lib/documentation.ts b/x-pack/plugins/runtime_fields/public/lib/documentation.ts
index dfdd50b07d769..9e7829a6a548d 100644
--- a/x-pack/plugins/runtime_fields/public/lib/documentation.ts
+++ b/x-pack/plugins/runtime_fields/public/lib/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const getLinks = ({ links }: DocLinksStart) => {
   const runtimePainless = `${links.runtimeFields.mapping}`;
diff --git a/x-pack/plugins/runtime_fields/public/load_editor.tsx b/x-pack/plugins/runtime_fields/public/load_editor.tsx
index 6aec33b90466f..8b5a188ecd4fb 100644
--- a/x-pack/plugins/runtime_fields/public/load_editor.tsx
+++ b/x-pack/plugins/runtime_fields/public/load_editor.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { CoreSetup, OverlayRef } from 'src/core/public';
+import { CoreSetup, OverlayRef } from '@kbn/core/public';
 
 import { toMountPoint, createKibanaReactContext } from './shared_imports';
 import { LoadEditorResponse, RuntimeField } from './types';
diff --git a/x-pack/plugins/runtime_fields/public/plugin.test.ts b/x-pack/plugins/runtime_fields/public/plugin.test.ts
index fc36eecc12f0a..38a37839145d6 100644
--- a/x-pack/plugins/runtime_fields/public/plugin.test.ts
+++ b/x-pack/plugins/runtime_fields/public/plugin.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { CoreSetup } from '@kbn/core/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
-jest.mock('../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/runtime_fields/public/plugin.ts b/x-pack/plugins/runtime_fields/public/plugin.ts
index 32b3981e90caa..84661c6ee5956 100644
--- a/x-pack/plugins/runtime_fields/public/plugin.ts
+++ b/x-pack/plugins/runtime_fields/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types';
 import { getRuntimeFieldEditorLoader } from './load_editor';
diff --git a/x-pack/plugins/runtime_fields/public/shared_imports.ts b/x-pack/plugins/runtime_fields/public/shared_imports.ts
index 61b517a4e1117..6fa74f6676a2c 100644
--- a/x-pack/plugins/runtime_fields/public/shared_imports.ts
+++ b/x-pack/plugins/runtime_fields/public/shared_imports.ts
@@ -10,20 +10,20 @@ export type {
   FormHook,
   ValidationFunc,
   FieldConfig,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   useForm,
   useFormData,
   Form,
   UseField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export { TextField } from '../../../../src/plugins/es_ui_shared/static/forms/components';
+export { TextField } from '@kbn/es-ui-shared-plugin/static/forms/components';
 
 export {
   CodeEditor,
   toMountPoint,
   createKibanaReactContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/runtime_fields/public/types.ts b/x-pack/plugins/runtime_fields/public/types.ts
index bc23547103ef7..3cd8506c01b10 100644
--- a/x-pack/plugins/runtime_fields/public/types.ts
+++ b/x-pack/plugins/runtime_fields/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 import { RUNTIME_FIELD_TYPES } from './constants';
 import { OpenRuntimeFieldEditorProps } from './load_editor';
diff --git a/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts b/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts
index d12f5b5af458e..bc7864c7d6546 100644
--- a/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'src/core/types';
+import { Capabilities } from '@kbn/core/types';
 import { getTagsCapabilities } from './capabilities';
 import { tagFeatureId } from './constants';
 
diff --git a/x-pack/plugins/saved_objects_tagging/common/capabilities.ts b/x-pack/plugins/saved_objects_tagging/common/capabilities.ts
index c0054608a97f4..f25652960da41 100644
--- a/x-pack/plugins/saved_objects_tagging/common/capabilities.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'src/core/types';
+import { Capabilities } from '@kbn/core/types';
 import { tagFeatureId } from './constants';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/common/references.test.ts b/x-pack/plugins/saved_objects_tagging/common/references.test.ts
index 87dea5f13aa1d..cc8093a5cebb2 100644
--- a/x-pack/plugins/saved_objects_tagging/common/references.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { tagIdToReference, replaceTagReferences, updateTagReferences } from './references';
 
 const ref = (type: string, id: string): SavedObjectReference => ({
diff --git a/x-pack/plugins/saved_objects_tagging/common/references.ts b/x-pack/plugins/saved_objects_tagging/common/references.ts
index 8c60e16d7a573..4328f006307a7 100644
--- a/x-pack/plugins/saved_objects_tagging/common/references.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/references.ts
@@ -6,7 +6,7 @@
  */
 
 import { uniq, intersection } from 'lodash';
-import { SavedObjectReference } from '../../../../src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { tagSavedObjectTypeName } from './constants';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts b/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts
index a7420a54d9563..401c28c1b5c68 100644
--- a/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/types';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
 import { Tag, TagAttributes } from '../types';
 import { TagsCapabilities } from '../capabilities';
 import { AssignableObject } from '../assignments';
diff --git a/x-pack/plugins/saved_objects_tagging/common/types.ts b/x-pack/plugins/saved_objects_tagging/common/types.ts
index c0b92a71a3d1b..9d5e4bb0377ea 100644
--- a/x-pack/plugins/saved_objects_tagging/common/types.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject } from 'src/core/types';
-import type { Tag, TagAttributes } from '../../../../src/plugins/saved_objects_tagging_oss/common';
+import { SavedObject } from '@kbn/core/types';
+import type { Tag, TagAttributes } from '@kbn/saved-objects-tagging-oss-plugin/common';
 
 export type TagSavedObject = SavedObject<TagAttributes>;
 
@@ -23,4 +23,4 @@ export type {
   TagAttributes,
   GetAllTagsOptions,
   ITagsClient,
-} from '../../../../src/plugins/saved_objects_tagging_oss/common';
+} from '@kbn/saved-objects-tagging-oss-plugin/common';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx
index b0c18a8ca5fad..2187f3d20a04c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx
@@ -8,7 +8,7 @@
 import React, { FC, useState, useEffect, useCallback } from 'react';
 import { EuiFlyoutFooter, EuiFlyoutHeader, EuiFlexItem, Query } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'src/core/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { AssignableObject } from '../../../common/assignments';
 import { ITagAssignmentService, ITagsCache } from '../../services';
 import { parseQuery, computeRequiredChanges } from './lib';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx
index 641bf7e22165b..175c20322607c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui';
-import { NotificationsStart, OverlayStart, ThemeServiceStart, OverlayRef } from 'src/core/public';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart, OverlayRef } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { ITagAssignmentService, ITagsCache } from '../../services';
 
 export interface GetAssignFlyoutOpenerOptions {
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx
index 3eb31100a2a01..240318ffd9cbb 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx
@@ -9,7 +9,7 @@ import React, { FC, useCallback, useState } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedObjectSaveModalTagSelectorComponentProps } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectSaveModalTagSelectorComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../../common';
 import { TagSelector } from '../base';
 import { ITagsCache } from '../../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx
index fcd36e3749221..cd41ffc21ec6d 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
-import { SavedObject } from 'src/core/types';
-import { TagListComponentProps } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObject } from '@kbn/core/types';
+import { TagListComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { Tag } from '../../../common/types';
 import { getObjectTags } from '../../utils';
 import { TagList } from '../base';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx
index 942a7ee4f0a8f..f5d8ea56cf0ac 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 import useObservable from 'react-use/lib/useObservable';
-import { TagSelectorComponentProps } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { TagSelectorComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../../common';
 import { TagSelector } from '../base';
 import { ITagsCache } from '../../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx
index 8dc9f6d04d5de..da0338da3dca1 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx
@@ -34,7 +34,7 @@ import {
   tagNameMaxLength,
   tagDescriptionMaxLength,
 } from '../../../common';
-import { TagBadge } from '../../components';
+import { TagBadge } from '..';
 import { getRandomColor, useIfMounted } from './utils';
 
 interface CreateOrEditModalProps {
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx
index a4085f75d6ce5..66ec3139a89f9 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui';
-import { OverlayStart, OverlayRef, ThemeServiceStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { OverlayStart, OverlayRef, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Tag, TagAttributes } from '../../../common/types';
 import { ITagInternalClient } from '../../services';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/index.ts b/x-pack/plugins/saved_objects_tagging/public/index.ts
index 1da147f4f168a..aecd9405af01a 100644
--- a/x-pack/plugins/saved_objects_tagging/public/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { SavedObjectTaggingPlugin } from './plugin';
 
 export type { SavedObjectTaggingPluginStart } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
index c4e4706353045..80a784612d8cd 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
@@ -8,7 +8,7 @@
 import { Observable, from } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart, OverlayStart, ThemeServiceStart } from 'kibana/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
 import { ITagsCache } from '../../services/tags';
 import { getAssignFlyoutOpener } from '../../components/assign_flyout';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts
index f3e4bb75236b1..87dec36680db3 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart, OverlayStart } from 'kibana/public';
+import { NotificationsStart, OverlayStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
 import { ITagInternalClient } from '../../services/tags';
 import { TagAction } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts
index f970a15806972..57955c05a2ac4 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart, OverlayStart, ThemeServiceStart } from 'kibana/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
 import { ITagInternalClient } from '../../services/tags';
 import { getEditModalOpener } from '../../components/edition_modal';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts
index bdb998d89010b..8aa7b160b0c21 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { getTableActions } from './index';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { getTableActions } from '.';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createTagCapabilities } from '../../../common/test_utils';
 import { TagsCapabilities } from '../../../common/capabilities';
 import { tagClientMock } from '../../services/tags/tags_client.mock';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts
index f4eb3b2ab6fc0..2d143faa8fa78 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { TagsCapabilities } from '../../../common';
 import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../../services';
 import { TagAction } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
index 8bb81fe017237..f09051678b06c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
@@ -7,7 +7,7 @@
 
 import { from } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { OverlayStart, NotificationsStart, ThemeServiceStart } from 'src/core/public';
+import { OverlayStart, NotificationsStart, ThemeServiceStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ITagsCache, ITagAssignmentService } from '../../services';
 import { TagBulkAction } from '../types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts
index 0de647f13b0e5..843b953168c4c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts
@@ -6,10 +6,7 @@
  */
 
 import { Subject } from 'rxjs';
-import {
-  overlayServiceMock,
-  notificationServiceMock,
-} from '../../../../../../src/core/public/mocks';
+import { overlayServiceMock, notificationServiceMock } from '@kbn/core/public/mocks';
 import { tagClientMock } from '../../services/tags/tags_client.mock';
 import { TagBulkAction } from '../types';
 import { getBulkDeleteAction } from './bulk_delete';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts
index b555c245d2115..9f1b443586f49 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { OverlayStart, NotificationsStart } from 'src/core/public';
+import { OverlayStart, NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ITagInternalClient } from '../../services';
 import { TagBulkAction } from '../types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts
index de25a09660fc9..43935c9ab441f 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createTagCapabilities } from '../../../common/test_utils';
 import { TagsCapabilities } from '../../../common/capabilities';
 import { tagClientMock } from '../../services/tags/tags_client.mock';
@@ -13,7 +13,7 @@ import { tagsCacheMock } from '../../services/tags/tags_cache.mock';
 import { assignmentServiceMock } from '../../services/assignments/assignment_service.mock';
 import { TagBulkAction } from '../types';
 
-import { getBulkActions } from './index';
+import { getBulkActions } from '.';
 
 describe('getBulkActions', () => {
   let core: ReturnType<typeof coreMock.createStart>;
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts
index be580239cbf99..c7fba98247919 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { TagsCapabilities } from '../../../common';
 import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../../services';
 import { TagBulkAction } from '../types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx b/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx
index 8c9fad8c31726..72ac1863075f7 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx
@@ -8,9 +8,9 @@
 import React, { FC } from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import { CoreSetup, ApplicationStart } from 'src/core/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
+import { CoreSetup, ApplicationStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { getTagsCapabilities } from '../../common';
 import { SavedObjectTaggingPluginStart } from '../types';
 import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
index 9fdcbb81907c2..3bad8d82b664c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs';
 import useMount from 'react-use/lib/useMount';
 import { Query } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb, CoreStart } from 'src/core/public';
+import { ChromeBreadcrumb, CoreStart } from '@kbn/core/public';
 import { EuiSpacer } from '@elastic/eui';
 import { TagWithRelations, TagsCapabilities } from '../../common';
 import { getCreateModalOpener } from '../components/edition_modal';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts
index a8637f086cc9b..81f91bdeefcb1 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getTagConnectionsUrl } from './get_tag_connections_url';
 import { TagWithRelations } from '../../../common/types';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts
index 566da19b3ccad..0afa8d6781732 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IBasePath } from 'src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common/types';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/public/mocks.ts b/x-pack/plugins/saved_objects_tagging/public/mocks.ts
index 0580a9802c8d8..92efe9d4220a5 100644
--- a/x-pack/plugins/saved_objects_tagging/public/mocks.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/mocks.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { taggingApiMock } from '../../../../src/plugins/saved_objects_tagging_oss/public/mocks';
+export { taggingApiMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
diff --git a/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts b/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts
index 0afd875b52832..e38d0ccfceb61 100644
--- a/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts
@@ -7,9 +7,9 @@
 
 import moment from 'moment';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { managementPluginMock } from '../../../../src/plugins/management/public/mocks';
-import { savedObjectTaggingOssPluginMock } from '../../../../src/plugins/saved_objects_tagging_oss/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { savedObjectTaggingOssPluginMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
 import { SavedObjectTaggingPlugin } from './plugin';
 import { SavedObjectsTaggingClientConfigRawType } from './config';
 import { TagsCache } from './services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/plugin.ts b/x-pack/plugins/saved_objects_tagging/public/plugin.ts
index db314e0597803..c8a1ff1554ce2 100644
--- a/x-pack/plugins/saved_objects_tagging/public/plugin.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/plugin.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from 'src/core/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { SavedObjectTaggingOssPluginSetup } from '../../../../src/plugins/saved_objects_tagging_oss/public';
+import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from '@kbn/core/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SavedObjectTaggingOssPluginSetup } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { tagManagementSectionId } from '../common/constants';
 import { getTagsCapabilities } from '../common/capabilities';
 import { SavedObjectTaggingPluginStart } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts
index 70b911c498c84..65c8a2074b7b3 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { createAssignableObject } from '../../../common/test_utils';
 import { TagAssignmentService } from './assignment_service';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts
index 2e90ec3036af7..f923724c93b4e 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   UpdateTagAssignmentsOptions,
   FindAssignableObjectsOptions,
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
index 49c9f1c13cf22..478218c3f3597 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
@@ -8,7 +8,7 @@
 import { Duration } from 'moment';
 import { Observable, BehaviorSubject, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { ITagsCache } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { Tag, TagAttributes } from '../../../common/types';
 
 export type { ITagsCache };
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts
index 24409e8596265..8b99336bfa1be 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { Tag } from '../../../common/types';
 import { createTag, createTagAttributes } from '../../../common/test_utils';
 import { tagsCacheMock } from './tags_cache.mock';
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts
index ef484f0a550b1..1ac2cd55d96b2 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   Tag,
   TagAttributes,
diff --git a/x-pack/plugins/saved_objects_tagging/public/types.ts b/x-pack/plugins/saved_objects_tagging/public/types.ts
index 7e8000e835840..9ceaa6c72b9fc 100644
--- a/x-pack/plugins/saved_objects_tagging/public/types.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/types.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import type { SavedObjectsTaggingApi } from '../../../../src/plugins/saved_objects_tagging_oss/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 export type SavedObjectTaggingPluginStart = SavedObjectsTaggingApi;
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts
index 042ce8495e012..36f4f61f4d582 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { SavedObjectsTaggingApiUiComponent } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { SavedObjectsTaggingApiUiComponent } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../common';
 import { ITagInternalClient, ITagsCache } from '../services';
 import {
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts
index aac9dc9bfcacf..034005791d757 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 import { convertTagNameToId } from '../utils';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts
index 3f46e70f50183..96a498580c2e4 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { tagsCacheMock } from '../services/tags/tags_cache.mock';
 import { Tag } from '../../common/types';
 import { createTag } from '../../common/test_utils';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx
index 5e42b396b900d..5ce3a8fd8b731 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import {
   SavedObjectsTaggingApiUi,
   GetSearchBarFilterOptions,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 import { TagSearchBarOption } from '../components';
 import { byNameTagSorter } from '../utils';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts
index 8114be0080f7e..d51e0e8bd03b1 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
-import { taggingApiMock } from '../../../../../src/plugins/saved_objects_tagging_oss/public/mocks';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { taggingApiMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
 import { tagsCacheMock } from '../services/tags/tags_cache.mock';
 import { createTagReference, createSavedObject, createTag } from '../../common/test_utils';
 import { buildGetTableColumnDefinition } from './get_table_column_definition';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx
index ba1ee4e80dd2a..ffde6e2e5e825 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectReference } from 'src/core/public';
+import { SavedObject, SavedObjectReference } from '@kbn/core/public';
 import {
   SavedObjectsTaggingApiUi,
   SavedObjectsTaggingApiUiComponent,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 import { getTagsFromReferences, byNameTagSorter } from '../utils';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts
index bd27e8558b635..6dccf97f0a672 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts
@@ -8,7 +8,7 @@
 import {
   SavedObjectsTaggingApiUi,
   TagDecoratedSavedObject,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 export const hasTagDecoration: SavedObjectsTaggingApiUi['hasTagDecoration'] = (
   object
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts
index cc2838a1e5bd8..6b4eddf357478 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../common';
 import { ITagsCache, ITagInternalClient } from '../services';
 import {
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts
index 478032651855b..02de2673885e3 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { tagsCacheMock } from '../services/tags/tags_cache.mock';
 import { createTag } from '../../common/test_utils';
 import { buildParseSearchQuery } from './parse_search_query';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
index 8d8a73db1d120..a5ac82f8c9821 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
@@ -6,11 +6,11 @@
  */
 
 import { Query } from '@elastic/eui';
-import { SavedObjectsFindOptionsReference } from 'src/core/public';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
 import {
   ParseSearchQueryOptions,
   SavedObjectsTaggingApiUi,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 
 export interface BuildParseSearchQueryOptions {
diff --git a/x-pack/plugins/saved_objects_tagging/public/utils.test.ts b/x-pack/plugins/saved_objects_tagging/public/utils.test.ts
index 779340fc86822..4bcbe5877dfcd 100644
--- a/x-pack/plugins/saved_objects_tagging/public/utils.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/types';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
 import {
   getObjectTags,
   convertTagNameToId,
diff --git a/x-pack/plugins/saved_objects_tagging/public/utils.ts b/x-pack/plugins/saved_objects_tagging/public/utils.ts
index a355ee33e2f66..f0235416f75d5 100644
--- a/x-pack/plugins/saved_objects_tagging/public/utils.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/types';
-import { SavedObjectsFindOptionsReference } from 'src/core/public';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
 import { Tag, tagSavedObjectTypeName } from '../common';
 
 type SavedObjectReferenceLike = SavedObjectReference | SavedObjectsFindOptionsReference;
diff --git a/x-pack/plugins/saved_objects_tagging/server/config.ts b/x-pack/plugins/saved_objects_tagging/server/config.ts
index 9d676576a03c3..4ae3075b12dcc 100644
--- a/x-pack/plugins/saved_objects_tagging/server/config.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   cache_refresh_interval: schema.duration({ defaultValue: '15m' }),
diff --git a/x-pack/plugins/saved_objects_tagging/server/features.ts b/x-pack/plugins/saved_objects_tagging/server/features.ts
index b31b94a31df13..aaaf030f2c27e 100644
--- a/x-pack/plugins/saved_objects_tagging/server/features.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/features.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { KibanaFeatureConfig } from '../../features/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/server';
 import { tagSavedObjectTypeName, tagManagementSectionId, tagFeatureId } from '../common/constants';
 
 export const savedObjectsTaggingFeature: KibanaFeatureConfig = {
diff --git a/x-pack/plugins/saved_objects_tagging/server/index.ts b/x-pack/plugins/saved_objects_tagging/server/index.ts
index e45ddbe5d07c8..5f731c77caac7 100644
--- a/x-pack/plugins/saved_objects_tagging/server/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SavedObjectTaggingPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts b/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts
index 5b514ff4bdd5b..a62952937bc21 100644
--- a/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts
@@ -7,9 +7,9 @@
 
 import { registerRoutesMock, createTagUsageCollectorMock } from './plugin.test.mocks';
 
-import { coreMock } from '../../../../src/core/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { SavedObjectTaggingPlugin } from './plugin';
 import { savedObjectsTaggingFeature } from './features';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/plugin.ts b/x-pack/plugins/saved_objects_tagging/server/plugin.ts
index 6c5cd66595f7c..05a2bb31514f1 100644
--- a/x-pack/plugins/saved_objects_tagging/server/plugin.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { savedObjectsTaggingFeature } from './features';
 import { tagType } from './saved_objects';
 import type { TagsHandlerContext } from './types';
@@ -35,7 +35,7 @@ export class SavedObjectTaggingPlugin implements Plugin<{}, {}, SetupDeps, {}> {
     http.registerRouteHandlerContext<TagsHandlerContext, 'tags'>(
       'tags',
       async (context, req, res) => {
-        return new TagsRequestHandlerContext(req, context.core, security);
+        return new TagsRequestHandlerContext(req, await context.core, security);
       }
     );
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts b/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts
index 35268f6d436ee..00f0de038851c 100644
--- a/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { RequestHandlerContext, KibanaRequest } from 'src/core/server';
-import { SecurityPluginSetup } from '../../security/server';
+import type { CoreRequestHandlerContext, KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { ITagsClient } from '../common/types';
 import { ITagsRequestHandlerContext } from './types';
 import { TagsClient, IAssignmentService, AssignmentService } from './services';
@@ -17,7 +17,7 @@ export class TagsRequestHandlerContext implements ITagsRequestHandlerContext {
 
   constructor(
     private readonly request: KibanaRequest,
-    private readonly coreContext: RequestHandlerContext['core'],
+    private readonly coreContext: CoreRequestHandlerContext,
     private readonly security?: SecurityPluginSetup
   ) {}
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/assignments/find_assignable_objects.ts b/x-pack/plugins/saved_objects_tagging/server/routes/assignments/find_assignable_objects.ts
index 8bda50940cc21..2fd6dfe56b33e 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/assignments/find_assignable_objects.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/assignments/find_assignable_objects.ts
@@ -22,7 +22,7 @@ export const registerFindAssignableObjectsRoute = (router: TagsPluginRouter) =>
       },
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
-      const { assignmentService } = ctx.tags!;
+      const { assignmentService } = await ctx.tags;
       const { query } = req;
 
       const results = await assignmentService.findAssignableObjects({
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/assignments/get_assignable_types.ts b/x-pack/plugins/saved_objects_tagging/server/routes/assignments/get_assignable_types.ts
index 385de4eb9fb64..bd82e7d31bc7f 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/assignments/get_assignable_types.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/assignments/get_assignable_types.ts
@@ -15,7 +15,7 @@ export const registerGetAssignableTypesRoute = (router: TagsPluginRouter) => {
       validate: {},
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
-      const { assignmentService } = ctx.tags!;
+      const { assignmentService } = await ctx.tags;
       const types = await assignmentService.getAssignableTypes();
 
       return res.ok({
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/assignments/update_tags_assignments.ts b/x-pack/plugins/saved_objects_tagging/server/routes/assignments/update_tags_assignments.ts
index c6c98ebd7b686..5bc1f844c4d36 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/assignments/update_tags_assignments.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/assignments/update_tags_assignments.ts
@@ -37,7 +37,7 @@ export const registerUpdateTagsAssignmentsRoute = (router: TagsPluginRouter) =>
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       try {
-        const { assignmentService } = ctx.tags!;
+        const { assignmentService } = await ctx.tags;
         const { tags, assign, unassign } = req.body;
 
         await assignmentService.updateTagAssignments({
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/internal/bulk_delete.ts b/x-pack/plugins/saved_objects_tagging/server/routes/internal/bulk_delete.ts
index e708193466810..ea4471f7d1243 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/internal/bulk_delete.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/internal/bulk_delete.ts
@@ -20,7 +20,7 @@ export const registerInternalBulkDeleteRoute = (router: TagsPluginRouter) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const { ids: tagIds } = req.body;
-      const client = ctx.tags!.tagsClient;
+      const client = (await ctx.tags).tagsClient;
 
       for (const tagId of tagIds) {
         await client.delete(tagId);
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts b/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts
index 0506b9051e467..32318f39b5a0c 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts
@@ -26,7 +26,7 @@ export const registerInternalFindTagsRoute = (router: TagsPluginRouter) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const { query } = req;
-      const { client, typeRegistry } = ctx.core.savedObjects;
+      const { client, typeRegistry } = (await ctx.core).savedObjects;
 
       const findResponse = await client.find<TagAttributes>({
         page: query.page,
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
index aa2e87a71fcbb..e0fe44d65c015 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindOptionsReference,
   SavedObject,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { tagSavedObjectTypeName } from '../../../common/constants';
 import { Tag, TagAttributes, TagWithRelations } from '../../../common/types';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/tags/create_tag.ts b/x-pack/plugins/saved_objects_tagging/server/routes/tags/create_tag.ts
index 0001ff422a2bc..7b9e6a32d3aea 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/tags/create_tag.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/tags/create_tag.ts
@@ -23,7 +23,8 @@ export const registerCreateTagRoute = (router: TagsPluginRouter) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       try {
-        const tag = await ctx.tags!.tagsClient.create(req.body);
+        const { tagsClient } = await ctx.tags;
+        const tag = await tagsClient.create(req.body);
         return res.ok({
           body: {
             tag,
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/tags/delete_tag.ts b/x-pack/plugins/saved_objects_tagging/server/routes/tags/delete_tag.ts
index 42077eb05d13e..505ecfd4974a0 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/tags/delete_tag.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/tags/delete_tag.ts
@@ -20,7 +20,8 @@ export const registerDeleteTagRoute = (router: TagsPluginRouter) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const { id } = req.params;
-      await ctx.tags!.tagsClient.delete(id);
+      const { tagsClient } = await ctx.tags;
+      await tagsClient.delete(id);
       return res.ok();
     })
   );
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_all_tags.ts b/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_all_tags.ts
index af3b39f26f2a9..011d764983faf 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_all_tags.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_all_tags.ts
@@ -14,7 +14,8 @@ export const registerGetAllTagsRoute = (router: TagsPluginRouter) => {
       validate: {},
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
-      const tags = await ctx.tags!.tagsClient.getAll();
+      const { tagsClient } = await ctx.tags;
+      const tags = await tagsClient.getAll();
       return res.ok({
         body: {
           tags,
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_tag.ts b/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_tag.ts
index 8080b6ea22a6f..4488d4dae6e2b 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_tag.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/tags/get_tag.ts
@@ -20,7 +20,8 @@ export const registerGetTagRoute = (router: TagsPluginRouter) => {
     },
     router.handleLegacyErrors(async (ctx, req, res) => {
       const { id } = req.params;
-      const tag = await ctx.tags!.tagsClient.get(id);
+      const { tagsClient } = await ctx.tags;
+      const tag = await tagsClient.get(id);
       return res.ok({
         body: {
           tag,
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/tags/update_tag.ts b/x-pack/plugins/saved_objects_tagging/server/routes/tags/update_tag.ts
index d357c42d1924f..67b7d7a6acbda 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/tags/update_tag.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/tags/update_tag.ts
@@ -27,7 +27,8 @@ export const registerUpdateTagRoute = (router: TagsPluginRouter) => {
     router.handleLegacyErrors(async (ctx, req, res) => {
       const { id } = req.params;
       try {
-        const tag = await ctx.tags!.tagsClient.update(id, req.body);
+        const { tagsClient } = await ctx.tags;
+        const tag = await tagsClient.update(id, req.body);
         return res.ok({
           body: {
             tag,
diff --git a/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts b/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts
index c6dacbd81a0e9..d9e51dddea553 100644
--- a/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsType } from 'src/core/server';
+import { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import { tagSavedObjectTypeName, TagAttributes } from '../../common';
 
 export const tagType: SavedObjectsType = {
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts
index 3d9a7c7ef2c36..3cc4c00da5b30 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts
@@ -10,8 +10,8 @@ import {
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsTypeRegistryMock,
-} from '../../../../../../src/core/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+} from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { createSavedObject, createReference } from '../../../common/test_utils';
 import { taggableTypes } from '../../../common/constants';
 import { AssignmentService } from './assignment_service';
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts
index 222de82b35f6f..d6d14f68357be 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts
@@ -12,8 +12,8 @@ import {
   ISavedObjectTypeRegistry,
   KibanaRequest,
   SavedObjectsBulkGetObject,
-} from 'src/core/server';
-import { SecurityPluginSetup } from '../../../../security/server';
+} from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   AssignableObject,
   UpdateTagAssignmentsOptions,
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts
index 1e4d5f960b2e9..51bcae2b0c515 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { SecurityPluginSetup } from '../../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 export const getUpdatableSavedObjectTypes = async ({
   request,
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts
index 544f0d9a33722..ef7b037c58af2 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsType } from 'kibana/server';
+import type { SavedObjectsType } from '@kbn/core/server';
 import { createSavedObject, createReference } from '../../../common/test_utils';
 import { toAssignableObject } from './utils';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts
index b77944d5da39c..e2a9866cf4cfb 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObject, SavedObjectsType } from 'kibana/server';
+import type { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import { AssignableObject } from '../../../common/assignments';
 import { tagSavedObjectTypeName } from '../../../common';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
index eb6f7eec3075f..6d3b6011cac99 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
@@ -7,7 +7,7 @@
 
 import { validateTagMock } from './tags_client.test.mocks';
 
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { TagAttributes, TagSavedObject } from '../../../common/types';
 import { TagValidation } from '../../../common/validation';
 import { TagsClient } from './tags_client';
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
index 32bb5d6e4e3eb..5535e334c06fb 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { TagSavedObject, TagAttributes, ITagsClient } from '../../../common/types';
 import { tagSavedObjectTypeName } from '../../../common/constants';
 import { TagValidationError } from './errors';
diff --git a/x-pack/plugins/saved_objects_tagging/server/types.ts b/x-pack/plugins/saved_objects_tagging/server/types.ts
index 8082109e842be..366f2779b6a81 100644
--- a/x-pack/plugins/saved_objects_tagging/server/types.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, CustomRequestHandlerContext } from '@kbn/core/server';
 import { ITagsClient } from '../common/types';
 import { IAssignmentService } from './services';
 
@@ -17,9 +17,9 @@ export interface ITagsRequestHandlerContext {
 /**
  * @internal
  */
-export interface TagsHandlerContext extends RequestHandlerContext {
+export type TagsHandlerContext = CustomRequestHandlerContext<{
   tags: ITagsRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts b/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts
index a234fd20f529c..8e10bfd5ad1f5 100644
--- a/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { TaggingUsageData, ByTypeTaggingUsageData } from './types';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts b/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
index 70cc799a1df8b..a05efd957e695 100644
--- a/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from '../../../../../src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { TaggingUsageData, ByTypeTaggingUsageData } from './types';
 
 const perTypeSchema: MakeSchemaFrom<ByTypeTaggingUsageData> = {
diff --git a/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts b/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts
index 3362965044bfd..6e4494f225fe7 100644
--- a/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { TaggingUsageData } from './types';
 import { fetchTagUsageData } from './fetch_tag_usage_data';
 import { tagUsageCollectorSchema } from './schema';
diff --git a/x-pack/plugins/screenshotting/README.md b/x-pack/plugins/screenshotting/README.md
index d72ec8eed3781..aefa4cc90762b 100644
--- a/x-pack/plugins/screenshotting/README.md
+++ b/x-pack/plugins/screenshotting/README.md
@@ -3,18 +3,154 @@
 This plugin provides functionality to take screenshots of the Kibana pages.
 It uses Chromium and Puppeteer underneath to run the browser in headless mode.
 
-## API
+## Capabilities
+- Canvas workpads screenshots.
+- Dashboards screenshots.
+- Expressions screenshots.
+- PDF generation.
+- Batch screenshotting.
 
-The plugin exposes most of the functionality in the start contract.
-The Chromium download and setup is happening during the setup stage.
+## Usage
 
-To learn more about the public API, please use automatically generated API reference or generated TypeDoc comments.
+### Getting started
+After listing the `screenshotting` plugin in your dependencies, the plugin will be intitalized on the setup stage.
+The intitalization process downloads (if it is not already present) and verifies the Chromium build.
 
-## Testing Chromium downloads
+The start contract exposes a public API to interact with the plugin.
+Apart from the actual screenshotting functionality, it also provides a way for self-diagnostics.
 
-To download all Chromium browsers for all platforms and architectures:
+Here is an example of how you can take a screenshot of a Kibana URL.
+
+```typescript
+import { lastValueFrom } from 'rxjs';
+import type { CoreSetup, Plugin } from 'src/core/server';
+import type { ScreenshottingStart } from 'x-pack/plugins/screenshotting/server';
+
+
+interface StartDeps {
+  screenshotting: ScreenshottingStart;
+}
+
+class ExamplePlugin implements Plugin<void, void, void, StartDeps> {
+  setup({ http, getStartServices }: CoreSetup<StartDeps>) {
+    const router = http.createRouter();
+
+    router.get(
+      {
+        path: '/api/capture',
+        validate: {
+          query: schema.object({
+            id: schema.string(),
+          }),
+        },
+      },
+      async (context, request, response) => {
+        const [, { screenshotting }] = await getStartServices();
+        const { metrics, results } = await lastValueFrom(
+          screenshotting.getScreenshots({
+            request,
+            urls: [`http://localhost/app/canvas#/workpad/workpad-${request.query.id}`],
+          })
+        );
+
+        return response.ok({
+          body: JSON.stringify({
+            metrics,
+            image: results[0]?.screenshots[0]?.data.toString('base64'),
+            errors: results[0]?.renderErrors,
+          } as ScreenshottingExpressionResponse),
+        });
+      }
+    );
+  }
+
+  start() {}
+}
+
+export function plugin() {
+  return new ExamplePlugin();
+}
+```
+
+### API
+Please use automatically generated API reference or generated TypeDoc comments to find the complete documentation.
+
+#### `getScreenshots(options): Observable`
+Takes screenshots of multiple pages or an expression and returns an observable with the screenshotting results.
 
+The `options` parameter is an object with parameters of the screenshotting session.
+Option | Required | Default | Description
+--- | :---: | --- | ---
+`browserTimezone` | no | _none_ | The browser timezone that will be emulated in the browser instance. This option should be used to keep timezone on server and client in sync.
+`expression` | no | _none_ | An expression to capture screenshot of. Mutually exclusive with the `urls` parameter.
+`format` | no | `'png'` | An output format. It can either be PDF or PNG. In case of capturing multiple URLs, all the screenshots will be combined into one document for PDF format. For PNG format, an array of screenshots will be returned.
+`headers` | no | _none_ | Custom headers to be sent with each request. The headers will be used for authorization.
+`input` | no | `undefined` | The expression input.
+`layout` | no | `{}` | Page layout parameters describing characteristics of the capturing screenshot (e.g., dimensions, zoom, etc.).
+`request` | no | _none_ | Kibana Request reference to extract headers from.
+`timeouts` | no | _none_ | Timeouts for each phase of the screenshot.
+`timeouts.loadDelay` | no | `3000` | The amount of time in milliseconds before taking a screenshot when visualizations are not evented. All visualizations that ship with Kibana are evented, so this setting should not have much effect. If you are seeing empty images instead of visualizations, try increasing this value.
+`timeouts.openUrl` | no | `60000` | The timeout in milliseconds to allow the Chromium browser to wait for the "Loading…" screen to dismiss and find the initial data for the page. If the time is exceeded, a screenshot is captured showing the current page, and the result structure contains an error message.
+`timeouts.renderComplete` | no | `30000` | The timeout in milliseconds to allow the Chromium browser to wait for all visualizations to fetch and render the data. If the time is exceeded, a screenshot is captured showing the current page, and the result structure contains an error message.
+`timeouts.waitForElements` | no | `30000` | The timeout in milliseconds to allow the Chromium browser to wait for all visualization panels to load on the page. If the time is exceeded, a screenshot is captured showing the current page, and the result structure contains an error message.
+`urls` | no | `[]` | The list or URL to take screenshots of. Every item can either be a string or a tuple containing a URL and a context. The contextual data can be gathered using the screenshot mode plugin. Mutually exclusive with the `expression` parameter.
+
+#### `diagnose(flags?: string[]): Observable`
+Runs browser diagnostics.
+The diagnostic implementation launches Chromium and emits the output in the resulting observable.
+
+There is a way to override some Chromium command line arguments using the `flags` parameter.
+
+### Configuration
+Option | Default | Description
+--- | --- | ---
+`xpack.screenshotting.networkPolicy.enabled` | `true` | Capturing a screenshot from a Kibana page involves sending out requests for all the linked web assets. For example, a Markdown visualization can show an image from a remote server. 
+`xpack.screenshotting.networkPolicy.rules` | Allow http, https, ws, wss, and data. | A policy is specified as an array of objects that describe what to allow or deny based on a host or protocol. If a host or protocol is not specified, the rule matches any host or protocol.
+`xpack.screenshotting.browser.autoDownload` | Depends on the `dist` parameter. | Flag to automatically download chromium distribution.
+`xpack.screenshotting.browser.chromium.inspect` | Depends on the `dist` parameter. | Connects to the browser over a pipe instead of a WebSocket. See [puppeteer](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#puppeteerlaunchoptions) documentation.
+`xpack.screenshotting.browser.chromium.disableSandbox` | Defaults to `false` for all operating systems except Debian and Red Hat Linux, which use `true`. | It is recommended that you research the feasibility of enabling unprivileged user namespaces. An exception is if you are running Kibana in Docker because the container runs in a user namespace with the built-in seccomp/bpf filters. For more information, refer to [Chromium sandbox](https://chromium.googlesource.com/chromium/src/+/HEAD/docs/linux/sandboxing.md).
+`xpack.screenshotting.browser.chromium.proxy.enabled` | `false` | Enables the proxy for Chromium to use. 
+`xpack.screenshotting.browser.chromium.proxy.server` | _none_ | The uri for the proxy server. Providing the username and password for the proxy server via the uri is not supported.
+`xpack.screenshotting.browser.chromium.proxy.bypass` | `[]` | An array of hosts that should not go through the proxy server and should use a direct connection instead. Examples of valid entries are "elastic.co", "*.elastic.co", ".elastic.co", ".elastic.co:5601".
+
+## How It Works
+```mermaid
+sequenceDiagram
+  participant User
+  participant Screenshotting
+  participant Browser
+
+  User ->> Screenshotting: API call
+  Screenshotting ->> Browser: Launch browser
+  activate Browser
+  Screenshotting ->> Browser: Create page
+  Screenshotting ->> Browser: Set parameters
+  Note over Screenshotting,Browser: timezone
+
+  Screenshotting ->> Browser: Open URL
+  Screenshotting ->> Browser: Set contextual data
+  Note over Screenshotting,Browser: custom context, screenshot mode flag
+  Browser ->> Screenshotting: Rendering
+
+  Screenshotting ->> Browser: Wait for visualizations
+  Note over Screenshotting,Browser: poll for a number of DOM nodes to match <br> the number of dashboard elements
+  Screenshotting ->> Browser: Wait for render completion
+  Note over Screenshotting,Browser: poll for selectors indicating rendering completion
+  Browser ->> Screenshotting: Page is ready
+
+  Screenshotting ->> Browser: Take screenshot
+  Browser ->> Screenshotting: Return PNG buffer
+  Screenshotting ->> User: Return screenshot
 ```
+
+## Testing
+### Integration
+There is an example plugin that demonstrates integration with the screenshotting plugin. That plugin utilizes expression capturing.
+
+### Chromium Downloads
+To download all Chromium browsers for all platforms and architectures:
+
+```bash
 cd x-pack
 npx gulp downloadChromium
 ```
diff --git a/x-pack/plugins/screenshotting/public/app/app.tsx b/x-pack/plugins/screenshotting/public/app/app.tsx
index 95bc3388cfb59..9dcfce5c16c28 100644
--- a/x-pack/plugins/screenshotting/public/app/app.tsx
+++ b/x-pack/plugins/screenshotting/public/app/app.tsx
@@ -15,8 +15,8 @@ import {
   EuiPageContent,
   EuiPageContentBody,
 } from '@elastic/eui';
-import type { ExpressionRendererParams } from 'src/plugins/expressions/public';
-import { useExpressionRenderer } from '../../../../../src/plugins/expressions/public';
+import type { ExpressionRendererParams } from '@kbn/expressions-plugin/public';
+import { useExpressionRenderer } from '@kbn/expressions-plugin/public';
 import { SCREENSHOTTING_EXPRESSION, SCREENSHOTTING_EXPRESSION_INPUT } from '../../common';
 import { ScreenshotModeContext } from './screenshot_mode_context';
 
diff --git a/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts b/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts
index 24b3ca9d99178..1bba86912d722 100644
--- a/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts
+++ b/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts
@@ -6,7 +6,7 @@
  */
 
 import { createContext } from 'react';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
 export const ScreenshotModeContext = createContext<ScreenshotModePluginSetup | undefined>(
   undefined
diff --git a/x-pack/plugins/screenshotting/public/plugin.tsx b/x-pack/plugins/screenshotting/public/plugin.tsx
index 33b854f022648..68707cc16ed72 100755
--- a/x-pack/plugins/screenshotting/public/plugin.tsx
+++ b/x-pack/plugins/screenshotting/public/plugin.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { AppMountParameters, CoreSetup, Plugin } from 'src/core/public';
-import type { ExpressionsSetup } from 'src/plugins/expressions/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
-import { AppNavLinkStatus } from '../../../../src/core/public';
+import type { AppMountParameters, CoreSetup, Plugin } from '@kbn/core/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { SCREENSHOTTING_APP_ID } from '../common';
 import { App, ScreenshotModeContext } from './app';
 
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
index f9bf31ad35f6f..fd09396d6c86d 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
@@ -9,11 +9,11 @@ import { truncate } from 'lodash';
 import open from 'opn';
 import puppeteer, { ElementHandle, EvaluateFn, Page, SerializableOrJSHandle } from 'puppeteer';
 import { parse as parseUrl } from 'url';
-import { Headers, Logger } from 'src/core/server';
+import { Headers, Logger } from '@kbn/core/server';
 import {
   KBN_SCREENSHOT_MODE_HEADER,
   ScreenshotModePluginSetup,
-} from '../../../../../../src/plugins/screenshot_mode/server';
+} from '@kbn/screenshot-mode-plugin/server';
 import { ConfigType } from '../../config';
 import { allowRequest } from '../network_policy';
 import { stripUnsafeHeaders } from './strip_unsafe_headers';
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
index 5c9136b272831..a0ddfccf592bd 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
@@ -8,8 +8,8 @@
 import puppeteer from 'puppeteer';
 import * as Rx from 'rxjs';
 import { mergeMap, take } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+import type { Logger } from '@kbn/core/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { ConfigType } from '../../../config';
 import { HeadlessChromiumDriverFactory, DEFAULT_VIEWPORT } from '.';
 
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
index 14166d4157ed1..7d31cdc0c6b8c 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
@@ -25,11 +25,11 @@ import {
   takeUntil,
   tap,
 } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+import type { Logger } from '@kbn/core/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { ConfigType } from '../../../config';
 import { errors } from '../../../../common';
-import { getChromiumDisconnectedError } from '../';
+import { getChromiumDisconnectedError } from '..';
 import { safeChildProcess } from '../../safe_child_process';
 import { HeadlessChromiumDriver } from '../driver';
 import { args } from './args';
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts
index 7e3f46775ea4e..e718570b9b2e2 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts
@@ -6,7 +6,7 @@
  */
 
 import { omitBy } from 'lodash';
-import type { Headers } from 'src/core/server';
+import type { Headers } from '@kbn/core/server';
 
 // @see https://github.com/chromium/chromium/blob/3611052c055897e5ebbc5b73ea295092e0c20141/services/network/public/cpp/header_util_unittest.cc#L50
 // For a list of headers that chromium doesn't like
diff --git a/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts b/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts
index aa52f7a4491c4..ba3e083816937 100644
--- a/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts
@@ -11,7 +11,7 @@ import { closeSync, mkdirSync, openSync, writeSync } from 'fs';
 import { dirname } from 'path';
 import { finished, Readable } from 'stream';
 import { promisify } from 'util';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 /**
  * Download a url and calculate it's checksum
diff --git a/x-pack/plugins/screenshotting/server/browsers/download/index.ts b/x-pack/plugins/screenshotting/server/browsers/download/index.ts
index 47d9c867cdd60..b488d1bfe32fd 100644
--- a/x-pack/plugins/screenshotting/server/browsers/download/index.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/download/index.ts
@@ -7,7 +7,7 @@
 
 import { existsSync } from 'fs';
 import del from 'del';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { ChromiumArchivePaths, PackageInfo } from '../chromium';
 import { md5 } from './checksum';
 import { fetch } from './fetch';
diff --git a/x-pack/plugins/screenshotting/server/browsers/install.ts b/x-pack/plugins/screenshotting/server/browsers/install.ts
index 30cb101c7be72..42a7999cab18c 100644
--- a/x-pack/plugins/screenshotting/server/browsers/install.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/install.ts
@@ -7,7 +7,7 @@
 
 import del from 'del';
 import path from 'path';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { ChromiumArchivePaths, PackageInfo } from './chromium';
 import { download } from './download';
 import { md5 } from './download/checksum';
diff --git a/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts b/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
index 8447e56324a25..f0675b7fdf16d 100644
--- a/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
@@ -7,7 +7,7 @@
 
 import { fromEvent, merge, Observable } from 'rxjs';
 import { take, share, mapTo, delay, tap } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 interface IChild {
   kill(signal: string): Promise<unknown>;
diff --git a/x-pack/plugins/screenshotting/server/config/create_config.test.ts b/x-pack/plugins/screenshotting/server/config/create_config.test.ts
index 18ac6ceb6874d..4bc5ff65727d0 100644
--- a/x-pack/plugins/screenshotting/server/config/create_config.test.ts
+++ b/x-pack/plugins/screenshotting/server/config/create_config.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createConfig } from './create_config';
 import { ConfigType } from './schema';
 
diff --git a/x-pack/plugins/screenshotting/server/config/create_config.ts b/x-pack/plugins/screenshotting/server/config/create_config.ts
index d56dd2489f4b8..f12f2205d3a57 100644
--- a/x-pack/plugins/screenshotting/server/config/create_config.ts
+++ b/x-pack/plugins/screenshotting/server/config/create_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneDeep, set, upperFirst } from 'lodash';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { getDefaultChromiumSandboxDisabled } from './default_chromium_sandbox_disabled';
 import { ConfigType } from './schema';
 
diff --git a/x-pack/plugins/screenshotting/server/config/index.ts b/x-pack/plugins/screenshotting/server/config/index.ts
index 225c0cb957c62..468f092780112 100644
--- a/x-pack/plugins/screenshotting/server/config/index.ts
+++ b/x-pack/plugins/screenshotting/server/config/index.ts
@@ -5,9 +5,19 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor } from 'src/core/server';
+import type { PluginConfigDescriptor } from '@kbn/core/server';
 import { ConfigSchema, ConfigType } from './schema';
 
+/**
+ * Helper function
+ */
+export const durationToNumber = (value: number | moment.Duration): number => {
+  if (typeof value === 'number') {
+    return value;
+  }
+  return value.asMilliseconds();
+};
+
 /**
  * Screenshotting plugin configuration schema.
  */
@@ -47,9 +57,35 @@ export const config: PluginConfigDescriptor<ConfigType> = {
       'xpack.screenshotting.browser.chromium.proxy.bypass',
       { level: 'warning' }
     ),
+    renameFromRoot(
+      'xpack.reporting.capture.timeouts.openUrl',
+      'xpack.screenshotting.capture.timeouts.openUrl',
+      { level: 'warning' }
+    ),
+    renameFromRoot(
+      'xpack.reporting.capture.timeouts.renderComplete',
+      'xpack.screenshotting.capture.timeouts.renderComplete',
+      { level: 'warning' }
+    ),
+    renameFromRoot(
+      'xpack.reporting.capture.timeouts.waitForElements',
+      'xpack.screenshotting.capture.timeouts.waitForElements',
+      { level: 'warning' }
+    ),
+    renameFromRoot('xpack.reporting.capture.zoom', 'xpack.screenshotting.capture.zoom', {
+      level: 'warning',
+    }),
+    renameFromRoot('xpack.reporting.capture.loadDelay', 'xpack.screenshotting.capture.loadDelay', {
+      level: 'warning',
+    }),
   ],
   exposeToUsage: {
     networkPolicy: false, // show as [redacted]
+    capture: {
+      timeouts: { openUrl: true, renderComplete: true, waitForElements: true },
+      loadDelay: true,
+      zoom: true,
+    },
   },
 };
 
diff --git a/x-pack/plugins/screenshotting/server/config/schema.test.ts b/x-pack/plugins/screenshotting/server/config/schema.test.ts
index e25791b0ebad9..58fb4b5ab559e 100644
--- a/x-pack/plugins/screenshotting/server/config/schema.test.ts
+++ b/x-pack/plugins/screenshotting/server/config/schema.test.ts
@@ -19,6 +19,15 @@ describe('ConfigSchema', () => {
             },
           },
         },
+        "capture": Object {
+          "loadDelay": "PT3S",
+          "timeouts": Object {
+            "openUrl": "PT1M",
+            "renderComplete": "PT30S",
+            "waitForElements": "PT30S",
+          },
+          "zoom": 2,
+        },
         "networkPolicy": Object {
           "enabled": true,
           "rules": Array [
@@ -71,6 +80,15 @@ describe('ConfigSchema', () => {
             },
           },
         },
+        "capture": Object {
+          "loadDelay": "PT3S",
+          "timeouts": Object {
+            "openUrl": "PT1M",
+            "renderComplete": "PT30S",
+            "waitForElements": "PT30S",
+          },
+          "zoom": 2,
+        },
         "networkPolicy": Object {
           "enabled": true,
           "rules": Array [
@@ -145,4 +163,28 @@ describe('ConfigSchema', () => {
       }
     `);
   });
+
+  it('allows Duration values for certain keys', () => {
+    expect(
+      ConfigSchema.validate({ capture: { loadDelay: '3s' } }).capture.loadDelay
+    ).toMatchInlineSnapshot(`"PT3S"`);
+
+    expect(
+      ConfigSchema.validate({
+        capture: {
+          timeouts: {
+            openUrl: '1m',
+            waitForElements: '30s',
+            renderComplete: '10s',
+          },
+        },
+      }).capture.timeouts
+    ).toMatchInlineSnapshot(`
+      Object {
+        "openUrl": "PT1M",
+        "renderComplete": "PT10S",
+        "waitForElements": "PT30S",
+      }
+    `);
+  });
 });
diff --git a/x-pack/plugins/screenshotting/server/config/schema.ts b/x-pack/plugins/screenshotting/server/config/schema.ts
index 7711ffe1ea8e8..1e103a6b6e4d0 100644
--- a/x-pack/plugins/screenshotting/server/config/schema.ts
+++ b/x-pack/plugins/screenshotting/server/config/schema.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import moment from 'moment';
 
 const RulesSchema = schema.object({
   allow: schema.boolean(),
@@ -67,6 +68,23 @@ export const ConfigSchema = schema.object({
       }),
     }),
   }),
+  capture: schema.object({
+    timeouts: schema.object({
+      openUrl: schema.oneOf([schema.number(), schema.duration()], {
+        defaultValue: moment.duration({ minutes: 1 }),
+      }),
+      waitForElements: schema.oneOf([schema.number(), schema.duration()], {
+        defaultValue: moment.duration({ seconds: 30 }),
+      }),
+      renderComplete: schema.oneOf([schema.number(), schema.duration()], {
+        defaultValue: moment.duration({ seconds: 30 }),
+      }),
+    }),
+    zoom: schema.number({ defaultValue: 2 }),
+    loadDelay: schema.oneOf([schema.number(), schema.duration()], {
+      defaultValue: moment.duration({ seconds: 3 }),
+    }),
+  }),
   poolSize: schema.number({ defaultValue: 1, min: 1 }),
 });
 
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/index.ts b/x-pack/plugins/screenshotting/server/formats/pdf/index.ts
index b7718155c5424..7a2453b2a426b 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/index.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/index.ts
@@ -7,7 +7,7 @@
 
 import { groupBy } from 'lodash';
 import type { Values } from '@kbn/utility-types';
-import type { Logger, PackageInfo } from 'src/core/server';
+import type { Logger, PackageInfo } from '@kbn/core/server';
 import type { LayoutParams } from '../../../common';
 import { LayoutTypes } from '../../../common';
 import type { Layout } from '../../layouts';
@@ -46,7 +46,7 @@ export interface PdfScreenshotOptions extends CaptureOptions {
   /**
    * We default to the "print" layout if no ID is specified for the layout
    */
-  layout: PdfLayoutParams;
+  layout?: PdfLayoutParams;
 }
 
 export interface PdfScreenshotMetrics extends Partial<CaptureMetrics> {
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts
index 2c5439267ffc4..be69ec4c5e141 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger, PackageInfo } from 'src/core/server';
+import type { Logger, PackageInfo } from '@kbn/core/server';
 import { PdfMaker } from './pdfmaker';
 import type { Layout } from '../../../layouts';
 import { getTracker } from './tracker';
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts
index e08cf808abbc5..663863bec9757 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts
@@ -7,9 +7,9 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { PackageInfo } from 'kibana/server';
+import { PackageInfo } from '@kbn/core/server';
 import path from 'path';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { isUint8Array } from 'util/types';
 import { errors } from '../../../../../common';
 import { createMockLayout } from '../../../../layouts/mock';
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts
index a10f259e5c9e5..afd9e294e9ae0 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger, PackageInfo } from 'src/core/server';
+import type { Logger, PackageInfo } from '@kbn/core/server';
 import { SerializableRecord } from '@kbn/utility-types';
 import path from 'path';
 import { Content, ContentImage, ContentText } from 'pdfmake/interfaces';
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js
index e180c130bc4af..0b6dde0a3eeb0 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js
@@ -11,4 +11,5 @@
  */
 
 require('../../../../../../../src/setup_node_env');
+// eslint-disable-next-line @kbn/imports/uniform_imports
 require('./worker.ts');
diff --git a/x-pack/plugins/screenshotting/server/formats/png.ts b/x-pack/plugins/screenshotting/server/formats/png.ts
index 1f2244255e9ae..c3338f5a9194f 100644
--- a/x-pack/plugins/screenshotting/server/formats/png.ts
+++ b/x-pack/plugins/screenshotting/server/formats/png.ts
@@ -24,7 +24,7 @@ export interface PngScreenshotOptions extends CaptureOptions {
    */
   format?: 'png';
 
-  layout: PngLayoutParams;
+  layout?: PngLayoutParams;
 }
 
 /**
diff --git a/x-pack/plugins/screenshotting/server/layouts/index.ts b/x-pack/plugins/screenshotting/server/layouts/index.ts
index d21b06e6a688a..bf34fdf68719f 100644
--- a/x-pack/plugins/screenshotting/server/layouts/index.ts
+++ b/x-pack/plugins/screenshotting/server/layouts/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { LayoutSelectorDictionary, Size } from '../../common/layout';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { BaseLayout } from './base_layout';
diff --git a/x-pack/plugins/screenshotting/server/plugin.test.ts b/x-pack/plugins/screenshotting/server/plugin.test.ts
index 22cd2c2f75ac5..7624d9adceeba 100644
--- a/x-pack/plugins/screenshotting/server/plugin.test.ts
+++ b/x-pack/plugins/screenshotting/server/plugin.test.ts
@@ -7,9 +7,9 @@
 
 jest.mock('./browsers/install');
 
-import type { CoreSetup, CoreStart, PluginInitializerContext } from 'kibana/server';
-import { coreMock } from 'src/core/server/mocks';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+import type { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { install } from './browsers/install';
 import { ScreenshottingPlugin } from './plugin';
 
diff --git a/x-pack/plugins/screenshotting/server/plugin.ts b/x-pack/plugins/screenshotting/server/plugin.ts
index 2f675335d4393..23f688206d394 100755
--- a/x-pack/plugins/screenshotting/server/plugin.ts
+++ b/x-pack/plugins/screenshotting/server/plugin.ts
@@ -14,8 +14,8 @@ import type {
   PackageInfo,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+} from '@kbn/core/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { ChromiumArchivePaths, HeadlessChromiumDriverFactory, install } from './browsers';
 import { ConfigType, createConfig } from './config';
 import { Screenshots } from './screenshots';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/__snapshots__/index.test.ts.snap b/x-pack/plugins/screenshotting/server/screenshots/__snapshots__/index.test.ts.snap
new file mode 100644
index 0000000000000..c0971c9b95763
--- /dev/null
+++ b/x-pack/plugins/screenshotting/server/screenshots/__snapshots__/index.test.ts.snap
@@ -0,0 +1,300 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Screenshot Observable Pipeline error handling recovers if waitForSelector fails 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {},
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 100,
+            "left": 0,
+            "top": 0,
+            "width": 100,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": undefined,
+        "title": undefined,
+      },
+    ],
+    "timeRange": null,
+  },
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {},
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 100,
+            "left": 0,
+            "top": 0,
+            "width": 100,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": undefined,
+        "title": undefined,
+      },
+    ],
+    "timeRange": null,
+  },
+]
+`;
+
+exports[`Screenshot Observable Pipeline error handling uses defaults for element positions and size when Kibana page is not ready 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {},
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 1200,
+            "left": 0,
+            "top": 0,
+            "width": 1950,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": undefined,
+        "title": undefined,
+      },
+    ],
+    "timeRange": undefined,
+  },
+]
+`;
+
+exports[`Screenshot Observable Pipeline pipelines a single url into screenshot and timeRange 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {
+          "description": "Default ",
+          "title": "Default Mock Title",
+        },
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 600,
+            "left": 0,
+            "top": 0,
+            "width": 800,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": "Default ",
+        "title": "Default Mock Title",
+      },
+    ],
+    "timeRange": "Default GetTimeRange Result",
+  },
+]
+`;
+
+exports[`Screenshot Observable Pipeline pipelines multiple urls into 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {
+          "description": "Default ",
+          "title": "Default Mock Title",
+        },
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 600,
+            "left": 0,
+            "top": 0,
+            "width": 800,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            111,
+            109,
+            101,
+            32,
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+            115,
+          ],
+          "type": "Buffer",
+        },
+        "description": "Default ",
+        "title": "Default Mock Title",
+      },
+    ],
+    "timeRange": "Default GetTimeRange Result",
+  },
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {
+          "description": "Default ",
+          "title": "Default Mock Title",
+        },
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 600,
+            "left": 0,
+            "top": 0,
+            "width": 800,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            111,
+            109,
+            101,
+            32,
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+            115,
+          ],
+          "type": "Buffer",
+        },
+        "description": "Default ",
+        "title": "Default Mock Title",
+      },
+    ],
+    "timeRange": "Default GetTimeRange Result",
+  },
+]
+`;
diff --git a/x-pack/plugins/screenshotting/server/screenshots/constants.ts b/x-pack/plugins/screenshotting/server/screenshots/constants.ts
index b1064ec147745..de7278d60840a 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/constants.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/server';
+import { APP_WRAPPER_CLASS } from '@kbn/core/server';
 export const DEFAULT_PAGELOAD_SELECTOR = `.${APP_WRAPPER_CLASS}`;
 
 export const CONTEXT_GETNUMBEROFITEMS = 'GetNumberOfItems';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts
index 7d5791f0dfeb1..915b036acf22e 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getElementPositionAndAttributes } from './get_element_position_data';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts
index 0e2106a98d8b0..e3235c6d23253 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_ELEMENTATTRIBUTES } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts
index e5e70f617339d..34b8291eb03da 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getNumberOfItems } from './get_number_of_items';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts
index 39976d2a6d656..9dab001e4730d 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_GETNUMBEROFITEMS, CONTEXT_READMETADATA } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts
index 75576d7221f5e..a475e3c614c15 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getRenderErrors } from './get_render_errors';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts
index 007b3eb48d1c9..e8beb18911210 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { Layout } from '../layouts';
 import { CONTEXT_GETRENDERERRORS } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts
index 2bb00413c8231..1f104b9bf2d80 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { getScreenshots } from './get_screenshots';
 
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts
index 26ef272e7f18e..53829b098ee8c 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { ElementsPositionAndAttribute } from './get_element_position_data';
 
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts
index d277690a08282..8484412f5fd94 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getTimeRange } from './get_time_range';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts
index 6734a35932b59..41d902436d36b 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_GETTIMERANGE } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
index 666e59e0617c5..3833cfcc45932 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
@@ -5,22 +5,22 @@
  * 2.0.
  */
 
+import type { Logger, PackageInfo } from '@kbn/core/server';
+import { httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { lastValueFrom, of, throwError } from 'rxjs';
-import type { Logger, PackageInfo } from 'src/core/server';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { ScreenshotOptions, Screenshots } from '.';
 import {
   SCREENSHOTTING_APP_ID,
   SCREENSHOTTING_EXPRESSION,
   SCREENSHOTTING_EXPRESSION_INPUT,
 } from '../../common';
-import type { ConfigType } from '../config';
-import { createMockBrowserDriver, createMockBrowserDriverFactory } from '../browsers/mock';
 import type { HeadlessChromiumDriverFactory } from '../browsers';
+import { createMockBrowserDriver, createMockBrowserDriverFactory } from '../browsers/mock';
+import type { ConfigType } from '../config';
+import type { PngScreenshotOptions } from '../formats';
 import * as Layouts from '../layouts/create_layout';
 import { createMockLayout } from '../layouts/mock';
-import type { PngScreenshotOptions } from '../formats';
 import { CONTEXT_ELEMENTATTRIBUTES } from './constants';
-import { Screenshots, ScreenshotOptions } from '.';
 
 /*
  * Tests
@@ -34,17 +34,15 @@ describe('Screenshot Observable Pipeline', () => {
   let packageInfo: Readonly<PackageInfo>;
   let options: ScreenshotOptions;
   let screenshots: Screenshots;
+  let config: ConfigType;
 
   beforeEach(async () => {
     driver = createMockBrowserDriver();
     driverFactory = createMockBrowserDriverFactory(driver);
     http = httpServiceMock.createSetupContract();
     layout = createMockLayout();
-    logger = {
-      debug: jest.fn(),
-      error: jest.fn(),
-      info: jest.fn(),
-    } as unknown as jest.Mocked<Logger>;
+    logger = loggingSystemMock.createLogger();
+
     packageInfo = {
       branch: 'screenshot-test',
       buildNum: 567891011,
@@ -56,17 +54,24 @@ describe('Screenshot Observable Pipeline', () => {
       browserTimezone: 'UTC',
       headers: {},
       layout: {},
-      timeouts: {
-        loadDelay: 2000,
-        openUrl: 120000,
-        waitForElements: 20000,
-        renderComplete: 10000,
-      },
       urls: ['/welcome/home/start/index.htm'],
-    } as unknown as typeof options;
-    screenshots = new Screenshots(driverFactory, logger, packageInfo, http, {
+    };
+    config = {
       poolSize: 1,
-    } as ConfigType);
+      capture: {
+        timeouts: {
+          openUrl: 30000,
+          waitForElements: 30000,
+          renderComplete: 30000,
+        },
+        loadDelay: 5000000000,
+        zoom: 2,
+      },
+      networkPolicy: { enabled: false, rules: [] },
+      browser: {} as ConfigType['browser'],
+    };
+
+    screenshots = new Screenshots(driverFactory, logger, packageInfo, http, config);
 
     jest.spyOn(Layouts, 'createLayout').mockReturnValue(layout);
 
@@ -81,56 +86,7 @@ describe('Screenshot Observable Pipeline', () => {
     const result = await lastValueFrom(screenshots.getScreenshots(options as PngScreenshotOptions));
 
     expect(result).toHaveProperty('results');
-    expect(result.results).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "elementsPositionAndAttributes": Array [
-            Object {
-              "attributes": Object {
-                "description": "Default ",
-                "title": "Default Mock Title",
-              },
-              "position": Object {
-                "boundingClientRect": Object {
-                  "height": 600,
-                  "left": 0,
-                  "top": 0,
-                  "width": 800,
-                },
-                "scroll": Object {
-                  "x": 0,
-                  "y": 0,
-                },
-              },
-            },
-          ],
-          "error": undefined,
-          "renderErrors": undefined,
-          "screenshots": Array [
-            Object {
-              "data": Object {
-                "data": Array [
-                  115,
-                  99,
-                  114,
-                  101,
-                  101,
-                  110,
-                  115,
-                  104,
-                  111,
-                  116,
-                ],
-                "type": "Buffer",
-              },
-              "description": "Default ",
-              "title": "Default Mock Title",
-            },
-          ],
-          "timeRange": "Default GetTimeRange Result",
-        },
-      ]
-    `);
+    expect(result.results).toMatchSnapshot();
   });
 
   it('pipelines multiple urls into', async () => {
@@ -143,114 +99,7 @@ describe('Screenshot Observable Pipeline', () => {
     );
 
     expect(result).toHaveProperty('results');
-    expect(result.results).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "elementsPositionAndAttributes": Array [
-            Object {
-              "attributes": Object {
-                "description": "Default ",
-                "title": "Default Mock Title",
-              },
-              "position": Object {
-                "boundingClientRect": Object {
-                  "height": 600,
-                  "left": 0,
-                  "top": 0,
-                  "width": 800,
-                },
-                "scroll": Object {
-                  "x": 0,
-                  "y": 0,
-                },
-              },
-            },
-          ],
-          "error": undefined,
-          "renderErrors": undefined,
-          "screenshots": Array [
-            Object {
-              "data": Object {
-                "data": Array [
-                  115,
-                  111,
-                  109,
-                  101,
-                  32,
-                  115,
-                  99,
-                  114,
-                  101,
-                  101,
-                  110,
-                  115,
-                  104,
-                  111,
-                  116,
-                  115,
-                ],
-                "type": "Buffer",
-              },
-              "description": "Default ",
-              "title": "Default Mock Title",
-            },
-          ],
-          "timeRange": "Default GetTimeRange Result",
-        },
-        Object {
-          "elementsPositionAndAttributes": Array [
-            Object {
-              "attributes": Object {
-                "description": "Default ",
-                "title": "Default Mock Title",
-              },
-              "position": Object {
-                "boundingClientRect": Object {
-                  "height": 600,
-                  "left": 0,
-                  "top": 0,
-                  "width": 800,
-                },
-                "scroll": Object {
-                  "x": 0,
-                  "y": 0,
-                },
-              },
-            },
-          ],
-          "error": undefined,
-          "renderErrors": undefined,
-          "screenshots": Array [
-            Object {
-              "data": Object {
-                "data": Array [
-                  115,
-                  111,
-                  109,
-                  101,
-                  32,
-                  115,
-                  99,
-                  114,
-                  101,
-                  101,
-                  110,
-                  115,
-                  104,
-                  111,
-                  116,
-                  115,
-                ],
-                "type": "Buffer",
-              },
-              "description": "Default ",
-              "title": "Default Mock Title",
-            },
-          ],
-          "timeRange": "Default GetTimeRange Result",
-        },
-      ]
-    `);
+    expect(result.results).toMatchSnapshot();
 
     expect(driver.open).toHaveBeenCalledTimes(2);
     expect(driver.open).nthCalledWith(
@@ -305,96 +154,7 @@ describe('Screenshot Observable Pipeline', () => {
       );
 
       expect(result).toHaveProperty('results');
-      expect(result.results).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "elementsPositionAndAttributes": Array [
-              Object {
-                "attributes": Object {},
-                "position": Object {
-                  "boundingClientRect": Object {
-                    "height": 100,
-                    "left": 0,
-                    "top": 0,
-                    "width": 100,
-                  },
-                  "scroll": Object {
-                    "x": 0,
-                    "y": 0,
-                  },
-                },
-              },
-            ],
-            "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
-            "renderErrors": undefined,
-            "screenshots": Array [
-              Object {
-                "data": Object {
-                  "data": Array [
-                    115,
-                    99,
-                    114,
-                    101,
-                    101,
-                    110,
-                    115,
-                    104,
-                    111,
-                    116,
-                  ],
-                  "type": "Buffer",
-                },
-                "description": undefined,
-                "title": undefined,
-              },
-            ],
-            "timeRange": null,
-          },
-          Object {
-            "elementsPositionAndAttributes": Array [
-              Object {
-                "attributes": Object {},
-                "position": Object {
-                  "boundingClientRect": Object {
-                    "height": 100,
-                    "left": 0,
-                    "top": 0,
-                    "width": 100,
-                  },
-                  "scroll": Object {
-                    "x": 0,
-                    "y": 0,
-                  },
-                },
-              },
-            ],
-            "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
-            "renderErrors": undefined,
-            "screenshots": Array [
-              Object {
-                "data": Object {
-                  "data": Array [
-                    115,
-                    99,
-                    114,
-                    101,
-                    101,
-                    110,
-                    115,
-                    104,
-                    111,
-                    116,
-                  ],
-                  "type": "Buffer",
-                },
-                "description": undefined,
-                "title": undefined,
-              },
-            ],
-            "timeRange": null,
-          },
-        ]
-      `);
+      expect(result.results).toMatchSnapshot();
     });
 
     it('observes page exit', async () => {
@@ -422,53 +182,7 @@ describe('Screenshot Observable Pipeline', () => {
       );
 
       expect(result).toHaveProperty('results');
-      expect(result.results).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "elementsPositionAndAttributes": Array [
-              Object {
-                "attributes": Object {},
-                "position": Object {
-                  "boundingClientRect": Object {
-                    "height": 1200,
-                    "left": 0,
-                    "top": 0,
-                    "width": 1950,
-                  },
-                  "scroll": Object {
-                    "x": 0,
-                    "y": 0,
-                  },
-                },
-              },
-            ],
-            "error": undefined,
-            "renderErrors": undefined,
-            "screenshots": Array [
-              Object {
-                "data": Object {
-                  "data": Array [
-                    115,
-                    99,
-                    114,
-                    101,
-                    101,
-                    110,
-                    115,
-                    104,
-                    111,
-                    116,
-                  ],
-                  "type": "Buffer",
-                },
-                "description": undefined,
-                "title": undefined,
-              },
-            ],
-            "timeRange": undefined,
-          },
-        ]
-      `);
+      expect(result.results).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.ts b/x-pack/plugins/screenshotting/server/screenshots/index.ts
index cfd5c76093d3b..3fa0f1d222c3d 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.ts
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
-import ipaddr from 'ipaddr.js';
-import { sum } from 'lodash';
-import apm from 'elastic-apm-node';
-import type { Transaction } from 'elastic-apm-node';
-import { from, of, Observable } from 'rxjs';
+import type { HttpServiceSetup, KibanaRequest, Logger, PackageInfo } from '@kbn/core/server';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 import type { Optional } from '@kbn/utility-types';
+import type { Transaction } from 'elastic-apm-node';
+import apm from 'elastic-apm-node';
+import ipaddr from 'ipaddr.js';
+import { defaultsDeep, sum } from 'lodash';
+import { from, Observable, of } from 'rxjs';
 import {
   catchError,
   concatMap,
@@ -22,18 +24,15 @@ import {
   tap,
   toArray,
 } from 'rxjs/operators';
-import type { HttpServiceSetup, KibanaRequest, Logger, PackageInfo } from 'src/core/server';
-import type { ExpressionAstExpression } from 'src/plugins/expressions/common';
 import {
   LayoutParams,
   SCREENSHOTTING_APP_ID,
   SCREENSHOTTING_EXPRESSION,
   SCREENSHOTTING_EXPRESSION_INPUT,
 } from '../../common';
-import type { ConfigType } from '../config';
 import type { HeadlessChromiumDriverFactory, PerformanceMetrics } from '../browsers';
-import { createLayout } from '../layouts';
-import type { Layout } from '../layouts';
+import type { ConfigType } from '../config';
+import { durationToNumber } from '../config';
 import {
   PdfScreenshotOptions,
   PdfScreenshotResult,
@@ -42,12 +41,13 @@ import {
   toPdf,
   toPng,
 } from '../formats';
-import { ScreenshotObservableHandler, UrlOrUrlWithContext } from './observable';
+import type { Layout } from '../layouts';
+import { createLayout } from '../layouts';
 import type { ScreenshotObservableOptions, ScreenshotObservableResult } from './observable';
+import { ScreenshotObservableHandler, UrlOrUrlWithContext } from './observable';
 import { Semaphore } from './semaphore';
 
-export type { UrlOrUrlWithContext } from './observable';
-export type { ScreenshotObservableResult } from './observable';
+export type { ScreenshotObservableResult, UrlOrUrlWithContext } from './observable';
 
 export interface CaptureOptions extends Optional<ScreenshotObservableOptions, 'urls'> {
   /**
@@ -63,7 +63,7 @@ export interface CaptureOptions extends Optional<ScreenshotObservableOptions, 'u
   /**
    * Layout parameters.
    */
-  layout: LayoutParams;
+  layout?: LayoutParams;
 
   /**
    * Source Kibana request object from where the headers will be extracted.
@@ -101,14 +101,14 @@ export class Screenshots {
     private readonly logger: Logger,
     private readonly packageInfo: PackageInfo,
     private readonly http: HttpServiceSetup,
-    { poolSize }: ConfigType
+    private readonly config: ConfigType
   ) {
-    this.semaphore = new Semaphore(poolSize);
+    this.semaphore = new Semaphore(config.poolSize);
   }
 
   private createLayout(transaction: Transaction | null, options: CaptureOptions): Layout {
     const apmCreateLayout = transaction?.startSpan('create-layout', 'setup');
-    const layout = createLayout(options.layout);
+    const layout = createLayout(options.layout ?? {});
     this.logger.debug(`Layout: width=${layout.width} height=${layout.height}`);
     apmCreateLayout?.end();
 
@@ -121,16 +121,13 @@ export class Screenshots {
     options: ScreenshotObservableOptions
   ): Observable<CaptureResult> {
     const apmCreatePage = transaction?.startSpan('create-page', 'wait');
-    const {
-      browserTimezone,
-      timeouts: { openUrl: openUrlTimeout },
-    } = options;
+    const { browserTimezone } = options;
 
     return this.browserDriverFactory
       .createPage(
         {
           browserTimezone,
-          openUrlTimeout,
+          openUrlTimeout: durationToNumber(this.config.capture.timeouts.openUrl),
           defaultViewport: { height: layout.height, width: layout.width },
         },
         this.logger
@@ -141,7 +138,13 @@ export class Screenshots {
           apmCreatePage?.end();
           unexpectedExit$.subscribe({ error: () => transaction?.end() });
 
-          const screen = new ScreenshotObservableHandler(driver, this.logger, layout, options);
+          const screen = new ScreenshotObservableHandler(
+            driver,
+            this.config,
+            this.logger,
+            layout,
+            options
+          );
 
           return from(options.urls).pipe(
             concatMap((url, index) =>
@@ -188,30 +191,52 @@ export class Screenshots {
     return `${protocol}://${hostname}:${port}${this.http.basePath.serverBasePath}/app/${SCREENSHOTTING_APP_ID}`;
   }
 
-  getScreenshots(options: PngScreenshotOptions): Observable<PngScreenshotResult>;
-  getScreenshots(options: PdfScreenshotOptions): Observable<PdfScreenshotResult>;
-  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult>;
-  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult> {
-    const transaction = apm.startTransaction('screenshot-pipeline', 'screenshotting');
-    const layout = this.createLayout(transaction, options);
-    const headers = { ...(options.request?.headers ?? {}), ...(options.headers ?? {}) };
-    const urls = options.expression
+  private getCaptureOptions({
+    expression,
+    input,
+    request,
+    ...options
+  }: ScreenshotOptions): ScreenshotObservableOptions {
+    const headers = { ...(request?.headers ?? {}), ...(options.headers ?? {}) };
+    const urls = expression
       ? [
           [
             this.getScreenshottingAppUrl(),
             {
-              [SCREENSHOTTING_EXPRESSION]: options.expression,
-              [SCREENSHOTTING_EXPRESSION_INPUT]: options.input,
+              [SCREENSHOTTING_EXPRESSION]: expression,
+              [SCREENSHOTTING_EXPRESSION_INPUT]: input,
             },
           ] as UrlOrUrlWithContext,
         ]
-      : options.urls ?? [];
+      : options.urls;
+
+    return defaultsDeep(
+      {
+        ...options,
+        headers,
+        urls,
+      },
+      {
+        timeouts: {
+          openUrl: 60000,
+          waitForElements: 30000,
+          renderComplete: 30000,
+          loadDelay: 3000,
+        },
+        urls: [],
+      }
+    );
+  }
+
+  getScreenshots(options: PngScreenshotOptions): Observable<PngScreenshotResult>;
+  getScreenshots(options: PdfScreenshotOptions): Observable<PdfScreenshotResult>;
+  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult>;
+  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult> {
+    const transaction = apm.startTransaction('screenshot-pipeline', 'screenshotting');
+    const layout = this.createLayout(transaction, options);
+    const captureOptions = this.getCaptureOptions(options);
 
-    return this.captureScreenshots(layout, transaction, {
-      ...options,
-      headers,
-      urls,
-    }).pipe(
+    return this.captureScreenshots(layout, transaction, captureOptions).pipe(
       mergeMap((result) => {
         switch (options.format) {
           case 'pdf':
diff --git a/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts b/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts
index 30b7867a0e9b2..a77cfa8c9e8e6 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts
@@ -8,7 +8,7 @@
 import fs from 'fs';
 import { promisify } from 'util';
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_INJECTCSS } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
index 83800a168ddbe..d3acc96411dc6 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
@@ -5,31 +5,38 @@
  * 2.0.
  */
 
-import { interval, throwError, of } from 'rxjs';
+import { interval, of, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
+import type { ConfigType } from '../config';
 import { createMockLayout } from '../layouts/mock';
 import { ScreenshotObservableHandler, ScreenshotObservableOptions } from './observable';
 
 describe('ScreenshotObservableHandler', () => {
   let browser: ReturnType<typeof createMockBrowserDriver>;
+  let config: ConfigType;
   let layout: ReturnType<typeof createMockLayout>;
   let logger: jest.Mocked<Logger>;
   let options: ScreenshotObservableOptions;
 
   beforeEach(async () => {
     browser = createMockBrowserDriver();
+    config = {
+      capture: {
+        timeouts: {
+          openUrl: 30000,
+          waitForElements: 30000,
+          renderComplete: 30000,
+        },
+        loadDelay: 5000,
+        zoom: 13,
+      },
+    } as ConfigType;
     layout = createMockLayout();
     logger = { error: jest.fn() } as unknown as jest.Mocked<Logger>;
     options = {
       headers: { testHeader: 'testHeadValue' },
-      timeouts: {
-        loadDelay: 5000,
-        openUrl: 30000,
-        waitForElements: 30000,
-        renderComplete: 30000,
-      },
       urls: [],
     };
 
@@ -37,8 +44,12 @@ describe('ScreenshotObservableHandler', () => {
   });
 
   describe('waitUntil', () => {
+    let screenshots: ScreenshotObservableHandler;
+    beforeEach(() => {
+      screenshots = new ScreenshotObservableHandler(browser, config, logger, layout, options);
+    });
+
     it('catches TimeoutError and references the timeout config in a custom message', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = interval(1000).pipe(screenshots.waitUntil(200, 'Test Config'));
 
       const testPipeline = () => test$.toPromise();
@@ -48,7 +59,6 @@ describe('ScreenshotObservableHandler', () => {
     });
 
     it('catches other Errors and explains where they were thrown', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = throwError(new Error(`Test Error to Throw`)).pipe(
         screenshots.waitUntil(200, 'Test Config')
       );
@@ -60,7 +70,6 @@ describe('ScreenshotObservableHandler', () => {
     });
 
     it('is a pass-through if there is no Error', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = of('nice to see you').pipe(screenshots.waitUntil(20, 'xxxxxxxxxxx'));
 
       await expect(test$.toPromise()).resolves.toBe(`nice to see you`);
@@ -68,9 +77,13 @@ describe('ScreenshotObservableHandler', () => {
   });
 
   describe('checkPageIsOpen', () => {
+    let screenshots: ScreenshotObservableHandler;
+    beforeEach(() => {
+      screenshots = new ScreenshotObservableHandler(browser, config, logger, layout, options);
+    });
+
     it('throws a decorated Error when page is not open', async () => {
       browser.isPageOpen.mockReturnValue(false);
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = of(234455).pipe(
         map((input) => {
           screenshots.checkPageIsOpen();
@@ -84,7 +97,6 @@ describe('ScreenshotObservableHandler', () => {
     });
 
     it('is a pass-through when the page is open', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = of(234455).pipe(
         map((input) => {
           screenshots.checkPageIsOpen();
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
index fbc147102e0af..b19f3f254b2a2 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
@@ -6,45 +6,29 @@
  */
 
 import type { Transaction } from 'elastic-apm-node';
-import { defer, forkJoin, throwError, Observable } from 'rxjs';
+import { defer, forkJoin, Observable, throwError } from 'rxjs';
 import { catchError, mergeMap, switchMapTo, timeoutWith } from 'rxjs/operators';
-import type { Headers, Logger } from 'src/core/server';
+import type { Headers, Logger } from '@kbn/core/server';
 import { errors } from '../../common';
 import type { Context, HeadlessChromiumDriver } from '../browsers';
-import { getChromiumDisconnectedError, DEFAULT_VIEWPORT } from '../browsers';
+import { DEFAULT_VIEWPORT, getChromiumDisconnectedError } from '../browsers';
+import { durationToNumber as toNumber, ConfigType } from '../config';
 import type { Layout } from '../layouts';
 import type { ElementsPositionAndAttribute } from './get_element_position_data';
 import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getNumberOfItems } from './get_number_of_items';
 import { getRenderErrors } from './get_render_errors';
-import { getScreenshots } from './get_screenshots';
 import type { Screenshot } from './get_screenshots';
+import { getScreenshots } from './get_screenshots';
 import { getTimeRange } from './get_time_range';
 import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { waitForRenderComplete } from './wait_for_render';
 import { waitForVisualizations } from './wait_for_visualizations';
 
-export interface PhaseTimeouts {
-  /**
-   * Open URL phase timeout.
-   */
-  openUrl: number;
-
-  /**
-   * Timeout of the page readiness phase.
-   */
-  waitForElements: number;
-
-  /**
-   * Timeout of the page render phase.
-   */
-  renderComplete: number;
-
-  /**
-   * An additional delay to wait until the visualizations are ready.
-   */
-  loadDelay: number;
+type CaptureTimeouts = ConfigType['capture']['timeouts'];
+export interface PhaseTimeouts extends CaptureTimeouts {
+  loadDelay: ConfigType['capture']['loadDelay'];
 }
 
 type Url = string;
@@ -63,11 +47,6 @@ export interface ScreenshotObservableOptions {
    */
   headers?: Headers;
 
-  /**
-   * Timeouts for each phase of the screenshot.
-   */
-  timeouts: PhaseTimeouts;
-
   /**
    * The list or URL to take screenshots of.
    * Every item can either be a string or a tuple containing a URL and a context.
@@ -138,6 +117,7 @@ const getDefaultViewPort = () => ({
 export class ScreenshotObservableHandler {
   constructor(
     private readonly driver: HeadlessChromiumDriver,
+    private readonly config: ConfigType,
     private readonly logger: Logger,
     private readonly layout: Layout,
     private options: ScreenshotObservableOptions
@@ -175,18 +155,18 @@ export class ScreenshotObservableHandler {
       return openUrl(
         this.driver,
         this.logger,
-        this.options.timeouts.openUrl,
+        toNumber(this.config.capture.timeouts.openUrl),
         index,
         url,
         { ...(context ?? {}), layout: this.layout.id },
         this.options.headers ?? {}
       );
-    }).pipe(this.waitUntil(this.options.timeouts.openUrl, 'open URL'));
+    }).pipe(this.waitUntil(toNumber(this.config.capture.timeouts.openUrl), 'open URL'));
   }
 
   private waitForElements() {
     const driver = this.driver;
-    const waitTimeout = this.options.timeouts.waitForElements;
+    const waitTimeout = toNumber(this.config.capture.timeouts.waitForElements);
 
     return defer(() => getNumberOfItems(driver, this.logger, waitTimeout, this.layout)).pipe(
       mergeMap(async (itemsCount) => {
@@ -217,7 +197,7 @@ export class ScreenshotObservableHandler {
       await layout.positionElements?.(driver, logger);
       apmPositionElements?.end();
 
-      await waitForRenderComplete(driver, logger, this.options.timeouts.loadDelay, layout);
+      await waitForRenderComplete(driver, logger, toNumber(this.config.capture.loadDelay), layout);
     }).pipe(
       mergeMap(() =>
         forkJoin({
@@ -226,7 +206,7 @@ export class ScreenshotObservableHandler {
           renderErrors: getRenderErrors(driver, logger, layout),
         })
       ),
-      this.waitUntil(this.options.timeouts.renderComplete, 'render complete')
+      this.waitUntil(toNumber(this.config.capture.timeouts.renderComplete), 'render complete')
     );
   }
 
diff --git a/x-pack/plugins/screenshotting/server/screenshots/open_url.ts b/x-pack/plugins/screenshotting/server/screenshots/open_url.ts
index 8b26f35961db4..c557374ff9876 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/open_url.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/open_url.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Headers, Logger } from 'src/core/server';
+import type { Headers, Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { Context } from '../browsers';
 import { DEFAULT_PAGELOAD_SELECTOR } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts b/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts
index 16f0d5a6da774..cee23616faeac 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_WAITFORRENDER } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts b/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts
index 0c439f765163c..a7485545cdef0 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_WAITFORELEMENTSTOBEINDOM } from './constants';
diff --git a/x-pack/plugins/searchprofiler/common/constants.ts b/x-pack/plugins/searchprofiler/common/constants.ts
index 930336fbf2065..a50ed281c2bd0 100644
--- a/x-pack/plugins/searchprofiler/common/constants.ts
+++ b/x-pack/plugins/searchprofiler/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx b/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx
index 90756b93cf1d7..dab6c9573cb1f 100644
--- a/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx
@@ -8,7 +8,7 @@
 import React, { useContext, createContext, useCallback } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 
-import { HttpSetup, ToastsSetup } from 'kibana/public';
+import { HttpSetup, ToastsSetup } from '@kbn/core/public';
 import { LicenseStatus } from '../../../common';
 
 export interface ContextArgs {
diff --git a/x-pack/plugins/searchprofiler/public/application/index.tsx b/x-pack/plugins/searchprofiler/public/application/index.tsx
index 419455c119fc2..644a2764e85c7 100644
--- a/x-pack/plugins/searchprofiler/public/application/index.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { HttpStart as Http, ToastsSetup, CoreTheme } from 'kibana/public';
+import { HttpStart as Http, ToastsSetup, CoreTheme } from '@kbn/core/public';
 import { RouteComponentProps } from 'react-router-dom';
 
 import { LicenseStatus } from '../../common';
diff --git a/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts b/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts
index e3a7d7e3db361..f1288431f0b3b 100644
--- a/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts
+++ b/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { XJson } from '../../../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 const { collapseLiteralStrings } = XJson;
 
diff --git a/x-pack/plugins/searchprofiler/public/locator.ts b/x-pack/plugins/searchprofiler/public/locator.ts
index 40d79d0e5fc27..b6680686bb50d 100644
--- a/x-pack/plugins/searchprofiler/public/locator.ts
+++ b/x-pack/plugins/searchprofiler/public/locator.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 
 export const SEARCH_PROFILER_LOCATOR_ID = 'SEARCH_PROFILER_LOCATOR';
 
diff --git a/x-pack/plugins/searchprofiler/public/plugin.ts b/x-pack/plugins/searchprofiler/public/plugin.ts
index 4530f2046d6f7..a039de9fa0f66 100644
--- a/x-pack/plugins/searchprofiler/public/plugin.ts
+++ b/x-pack/plugins/searchprofiler/public/plugin.ts
@@ -7,10 +7,8 @@
 
 import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup } from 'src/core/public';
-
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import { ILicense } from '../../licensing/common/types';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 import { PLUGIN } from '../common';
 import { AppPublicPluginDependencies } from './types';
@@ -37,7 +35,7 @@ export class SearchProfilerUIPlugin implements Plugin<void, void, AppPublicPlugi
       icon: 'searchProfilerApp',
       path: '/app/dev_tools#/searchprofiler',
       showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
     });
 
     const devTool = devTools.register({
diff --git a/x-pack/plugins/searchprofiler/public/shared_imports.ts b/x-pack/plugins/searchprofiler/public/shared_imports.ts
index f90a782e6a8ed..cdb8bffe65b50 100644
--- a/x-pack/plugins/searchprofiler/public/shared_imports.ts
+++ b/x-pack/plugins/searchprofiler/public/shared_imports.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-export { ace } from '../../../../src/plugins/es_ui_shared/public';
+export { ace } from '@kbn/es-ui-shared-plugin/public';
 
-export { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/searchprofiler/public/types.ts b/x-pack/plugins/searchprofiler/public/types.ts
index 219ba28fb1a81..50c72993352ad 100644
--- a/x-pack/plugins/searchprofiler/public/types.ts
+++ b/x-pack/plugins/searchprofiler/public/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { DevToolsSetup } from '../../../../src/plugins/dev_tools/public';
-import { SharePluginSetup } from '../../../../src/plugins/share/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { DevToolsSetup } from '@kbn/dev-tools-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface AppPublicPluginDependencies {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/searchprofiler/server/index.ts b/x-pack/plugins/searchprofiler/server/index.ts
index e76a79b44c9ac..95f5b28435738 100644
--- a/x-pack/plugins/searchprofiler/server/index.ts
+++ b/x-pack/plugins/searchprofiler/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SearchProfilerServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => {
diff --git a/x-pack/plugins/searchprofiler/server/plugin.ts b/x-pack/plugins/searchprofiler/server/plugin.ts
index ed85febac9a45..cf37c97b85000 100644
--- a/x-pack/plugins/searchprofiler/server/plugin.ts
+++ b/x-pack/plugins/searchprofiler/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { LicenseStatus, PLUGIN } from '../common';
 import { AppServerPluginDependencies } from './types';
diff --git a/x-pack/plugins/searchprofiler/server/routes/profile.ts b/x-pack/plugins/searchprofiler/server/routes/profile.ts
index 22c97e240a3b9..9e76bf0df96a1 100644
--- a/x-pack/plugins/searchprofiler/server/routes/profile.ts
+++ b/x-pack/plugins/searchprofiler/server/routes/profile.ts
@@ -43,7 +43,7 @@ export const register = ({ router, getLicenseStatus, log }: RouteDependencies) =
       };
 
       try {
-        const client = ctx.core.elasticsearch.client.asCurrentUser;
+        const client = (await ctx.core).elasticsearch.client.asCurrentUser;
         const resp = await client.search(body);
 
         return response.ok({
diff --git a/x-pack/plugins/searchprofiler/server/types.ts b/x-pack/plugins/searchprofiler/server/types.ts
index 589cd627ef2ba..edba476428a12 100644
--- a/x-pack/plugins/searchprofiler/server/types.ts
+++ b/x-pack/plugins/searchprofiler/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter, Logger } from 'kibana/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { IRouter, Logger } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { LicenseStatus } from '../common';
 
 export interface AppServerPluginDependencies {
diff --git a/x-pack/plugins/security/common/licensing/index.mock.ts b/x-pack/plugins/security/common/licensing/index.mock.ts
index f9e6a0b756d00..8a9320b97c4ed 100644
--- a/x-pack/plugins/security/common/licensing/index.mock.ts
+++ b/x-pack/plugins/security/common/licensing/index.mock.ts
@@ -7,8 +7,9 @@
 
 import { of } from 'rxjs';
 
-import type { LicenseType } from '../../../licensing/common/types';
-import { LICENSE_TYPE } from '../../../licensing/common/types';
+import type { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/common/types';
+
 import type { SecurityLicenseFeatures } from './license_features';
 import type { SecurityLicense } from './license_service';
 
diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
index ca38a623bba37..09598fc22c042 100644
--- a/x-pack/plugins/security/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -7,7 +7,8 @@
 
 import { BehaviorSubject, of } from 'rxjs';
 
-import { licenseMock } from '../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+
 import { SecurityLicenseService } from './license_service';
 
 describe('license features', function () {
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
index fdc99c3923983..dc1dcda89e4af 100644
--- a/x-pack/plugins/security/common/licensing/license_service.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -8,7 +8,8 @@
 import type { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import type { ILicense, LicenseType } from '../../../licensing/common/types';
+import type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
+
 import type { SecurityLicenseFeatures } from './license_features';
 
 export interface SecurityLicense {
diff --git a/x-pack/plugins/security/common/model/deprecations.ts b/x-pack/plugins/security/common/model/deprecations.ts
index e990f370c5173..66dd7d7dabac5 100644
--- a/x-pack/plugins/security/common/model/deprecations.ts
+++ b/x-pack/plugins/security/common/model/deprecations.ts
@@ -6,7 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationsDetails, GetDeprecationsContext } from '../../../../../src/core/server';
+import type { DeprecationsDetails, GetDeprecationsContext } from '@kbn/core/server';
+
 import type { Role } from './role';
 
 export interface PrivilegeDeprecationsRolesByFeatureIdResponse {
diff --git a/x-pack/plugins/security/common/model/role.test.ts b/x-pack/plugins/security/common/model/role.test.ts
index 0d08c60ff7115..0aa34fefc73e5 100644
--- a/x-pack/plugins/security/common/model/role.test.ts
+++ b/x-pack/plugins/security/common/model/role.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Role } from '../../common/model';
+import type { Role } from '.';
 import {
   copyRole,
   getExtendedRoleDeprecationNotice,
@@ -14,7 +14,7 @@ import {
   isRoleReadOnly,
   isRoleReserved,
   prepareRoleClone,
-} from '../../common/model';
+} from '.';
 
 describe('role', () => {
   describe('isRoleEnabled', () => {
diff --git a/x-pack/plugins/security/kibana.json b/x-pack/plugins/security/kibana.json
index e6956aad64d00..881f67dcf22cb 100644
--- a/x-pack/plugins/security/kibana.json
+++ b/x-pack/plugins/security/kibana.json
@@ -14,7 +14,6 @@
   "ui": true,
   "enabledOnAnonymousPages": true,
   "requiredBundles": [
-    "home",
     "kibanaReact",
     "spaces",
     "esUiShared"
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.test.ts b/x-pack/plugins/security/public/account_management/account_management_app.test.ts
index 11b188a1d1370..3ebeefd9c945b 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.test.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.test.ts
@@ -7,9 +7,9 @@
 
 jest.mock('./account_management_page');
 
-import type { AppMount } from 'src/core/public';
-import { AppNavLinkStatus } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { UserAPIClient } from '../management';
 import { securityMock } from '../mocks';
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.ts b/x-pack/plugins/security/public/account_management/account_management_app.ts
index d95b86194f54f..98d810805a16c 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
-import { AppNavLinkStatus } from '../../../../../src/core/public';
 import type { AuthenticationServiceSetup } from '../authentication';
 
 interface CreateDeps {
diff --git a/x-pack/plugins/security/public/account_management/account_management_page.test.tsx b/x-pack/plugins/security/public/account_management/account_management_page.test.tsx
index fb73322655399..976f437beaa6b 100644
--- a/x-pack/plugins/security/public/account_management/account_management_page.test.tsx
+++ b/x-pack/plugins/security/public/account_management/account_management_page.test.tsx
@@ -8,8 +8,8 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { AuthenticatedUser } from '../../common/model';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
diff --git a/x-pack/plugins/security/public/account_management/account_management_page.tsx b/x-pack/plugins/security/public/account_management/account_management_page.tsx
index bc5229ba6bc9f..5eb396204b6e8 100644
--- a/x-pack/plugins/security/public/account_management/account_management_page.tsx
+++ b/x-pack/plugins/security/public/account_management/account_management_page.tsx
@@ -9,11 +9,11 @@ import { EuiPage, EuiPageBody, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui
 import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart, NotificationsStart } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { AppMountParameters, CoreStart, NotificationsStart } from 'src/core/public';
 
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 import type { AuthenticatedUser } from '../../common/model';
 import { getUserDisplayName } from '../../common/model';
 import type { AuthenticationServiceSetup } from '../authentication';
diff --git a/x-pack/plugins/security/public/account_management/change_password/change_password.tsx b/x-pack/plugins/security/public/account_management/change_password/change_password.tsx
index 8c85b47675c54..c78929cd3ba83 100644
--- a/x-pack/plugins/security/public/account_management/change_password/change_password.tsx
+++ b/x-pack/plugins/security/public/account_management/change_password/change_password.tsx
@@ -8,9 +8,9 @@
 import { EuiDescribedFormGroup } from '@elastic/eui';
 import React, { Component } from 'react';
 
+import type { NotificationsSetup } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsSetup } from 'src/core/public';
 
 import type { AuthenticatedUser } from '../../../common/model';
 import { canUserChangePassword } from '../../../common/model';
diff --git a/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx b/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx
index a4ad769146e59..92dbb572df045 100644
--- a/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx
+++ b/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import { UserAPIClient } from '../../management/users';
 import type { ChangePasswordProps } from './change_password';
diff --git a/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts b/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts
index 7f72fe9eaa0f1..1cd7247a1319d 100644
--- a/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts
+++ b/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import type { Capabilities, HttpStart } from 'src/core/public';
-
+import type { Capabilities, HttpStart } from '@kbn/core/public';
 import type {
   AnonymousAccessServiceContract,
   AnonymousAccessState,
-} from '../../../../../src/plugins/share/common';
-import type { SharePluginSetup } from '../../../../../src/plugins/share/public';
+} from '@kbn/share-plugin/common';
+import type { SharePluginSetup } from '@kbn/share-plugin/public';
 
 const DEFAULT_ANONYMOUS_ACCESS_STATE = Object.freeze<AnonymousAccessState>({
   isEnabled: false,
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
index e76a4ca20b59c..40f667996e590 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./access_agreement_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { accessAgreementApp } from './access_agreement_app';
 
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
index 44fd5048cc60b..b32056094cd7f 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
 interface CreateDeps {
   application: ApplicationSetup;
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
index a7a43077fbc46..a8d5c22e6a5f8 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
@@ -10,8 +10,8 @@ import { act } from '@testing-library/react';
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { AccessAgreementPage } from './access_agreement_page';
 
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
index 978880d797189..6e53d3b76fcc6 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
@@ -21,17 +21,17 @@ import React, { useCallback, useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 import ReactMarkdown from 'react-markdown';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import type {
   AppMountParameters,
   CoreStart,
   FatalErrorsStart,
   HttpStart,
   NotificationsStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { parseNext } from '../../../common/parse_next';
 import { AuthenticationStatePage } from '../components';
 
diff --git a/x-pack/plugins/security/public/authentication/authentication_service.ts b/x-pack/plugins/security/public/authentication/authentication_service.ts
index 202fc1b98452c..5cbf5007be218 100644
--- a/x-pack/plugins/security/public/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/public/authentication/authentication_service.ts
@@ -10,7 +10,7 @@ import type {
   FatalErrorsSetup,
   HttpSetup,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import type { AuthenticatedUser } from '../../common/model';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
index 0283df88fdb87..df32f2962f71c 100644
--- a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { captureURLApp } from './capture_url_app';
 
diff --git a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts
index 97bbd0848e9c4..f27d5ea7b5466 100644
--- a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts
+++ b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationSetup, FatalErrorsSetup, HttpSetup } from 'src/core/public';
+import type { ApplicationSetup, FatalErrorsSetup, HttpSetup } from '@kbn/core/public';
 
 import { AUTH_URL_HASH_QUERY_STRING_PARAMETER } from '../../../common/constants';
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
index fff6c9e69c5c0..b36330bb9f1b1 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./logged_out_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { loggedOutApp } from './logged_out_app';
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
index b84bf9b21f2fc..7abad1d6388fc 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type {
   ApplicationSetup,
   AppMountParameters,
   HttpSetup,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
 
 interface CreateDeps {
   application: ApplicationSetup;
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx
index d21cf1bb5677c..db23c3231c6ae 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx
@@ -8,8 +8,8 @@
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { LoggedOutPage } from './logged_out_page';
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx
index 93ab443693e73..ac0efab5d58a4 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx
@@ -9,10 +9,10 @@ import { EuiButton } from '@elastic/eui';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart, IBasePath } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { AppMountParameters, CoreStart, IBasePath } from 'src/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { parseNext } from '../../../common/parse_next';
 import { AuthenticationStatePage } from '../components';
 
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
index 9de62907261c1..595a9442caef1 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
@@ -11,8 +11,8 @@ import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { LoginForm, MessageType, PageMode } from './login_form';
 
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
index e1c51e612ff11..0d4aec220c493 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
@@ -29,9 +29,9 @@ import type { ChangeEvent, FormEvent, MouseEvent } from 'react';
 import React, { Component, Fragment } from 'react';
 import ReactMarkdown from 'react-markdown';
 
+import type { HttpStart, IHttpFetchError, NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { HttpStart, IHttpFetchError, NotificationsStart } from 'src/core/public';
 
 import type { LoginSelector, LoginSelectorProvider } from '../../../../../common/login_state';
 import { LoginValidator } from './validate_login';
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.test.ts b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
index 31cc86f540456..ed27b118024d3 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./login_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { loginApp } from './login_app';
 
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.ts b/x-pack/plugins/security/public/authentication/login/login_app.ts
index e09f8d931844a..41fa37a4072af 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type {
   ApplicationSetup,
   AppMountParameters,
   HttpSetup,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
 
 import type { ConfigType } from '../../config';
 
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
index 6507355221259..faf13036ae81e 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
@@ -10,8 +10,8 @@ import { act } from '@testing-library/react';
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER } from '../../../common/constants';
 import type { LoginState } from '../../../common/login_state';
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.tsx b/x-pack/plugins/security/public/authentication/login/login_page.tsx
index fa5050cf90ea8..16b2d32cd1c66 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.tsx
@@ -21,17 +21,17 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import { BehaviorSubject } from 'rxjs';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import type {
   AppMountParameters,
   CoreStart,
   FatalErrorsStart,
   HttpStart,
   NotificationsStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
   LOGOUT_REASON_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
index f60dcfb3e7abe..8c1e78ccb68ea 100644
--- a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { logoutApp } from './logout_app';
 
diff --git a/x-pack/plugins/security/public/authentication/logout/logout_app.ts b/x-pack/plugins/security/public/authentication/logout/logout_app.ts
index 84fc510e96ced..c670727769805 100644
--- a/x-pack/plugins/security/public/authentication/logout/logout_app.ts
+++ b/x-pack/plugins/security/public/authentication/logout/logout_app.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { CoreSetup, HttpSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { CoreSetup, HttpSetup } from 'src/core/public';
 
 interface CreateDeps {
   application: CoreSetup['application'];
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
index 6fb40181e1b77..ac7238f8db7a8 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./overwritten_session_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { securityMock } from '../../mocks';
 import { overwrittenSessionApp } from './overwritten_session_app';
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
index d03f300f67608..ccd8377cbdd43 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
 import type { AuthenticationServiceSetup } from '../authentication_service';
 
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx
index 66b2408338391..d33d9432279a4 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx
@@ -9,8 +9,8 @@ import { EuiButton } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { AuthenticationStatePage } from '../components/authentication_state_page';
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx
index 810d094490dca..4720a829674ee 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx
@@ -9,10 +9,10 @@ import { EuiButton } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart, IBasePath } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { AppMountParameters, CoreStart, IBasePath } from 'src/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { parseNext } from '../../../common/parse_next';
 import type { AuthenticationServiceSetup } from '../authentication_service';
 import { AuthenticationStatePage } from '../components';
diff --git a/x-pack/plugins/security/public/components/breadcrumb.test.tsx b/x-pack/plugins/security/public/components/breadcrumb.test.tsx
index 00cd4be90a780..a0714c7d1fe4c 100644
--- a/x-pack/plugins/security/public/components/breadcrumb.test.tsx
+++ b/x-pack/plugins/security/public/components/breadcrumb.test.tsx
@@ -7,7 +7,7 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { Breadcrumb, BreadcrumbsProvider, createBreadcrumbsChangeHandler } from './breadcrumb';
 
diff --git a/x-pack/plugins/security/public/components/breadcrumb.tsx b/x-pack/plugins/security/public/components/breadcrumb.tsx
index 4706f60712ad5..8027147cf22da 100644
--- a/x-pack/plugins/security/public/components/breadcrumb.tsx
+++ b/x-pack/plugins/security/public/components/breadcrumb.tsx
@@ -9,9 +9,8 @@ import type { EuiBreadcrumb } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React, { createContext, useContext, useEffect, useRef } from 'react';
 
-import type { ChromeStart } from 'src/core/public';
-
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import type { ChromeStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface BreadcrumbsContext {
   parents: BreadcrumbProps[];
diff --git a/x-pack/plugins/security/public/components/doc_link.tsx b/x-pack/plugins/security/public/components/doc_link.tsx
index c3565818090ee..c23a8f31d4b58 100644
--- a/x-pack/plugins/security/public/components/doc_link.tsx
+++ b/x-pack/plugins/security/public/components/doc_link.tsx
@@ -9,9 +9,8 @@ import { EuiLink } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React, { useCallback } from 'react';
 
-import type { DocLinksStart } from 'kibana/public';
-
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import type { DocLinksStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export type DocLinks = DocLinksStart['links'];
 export type GetDocLinkFunction = (app: string, doc: string) => string;
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
index 552442c0b8611..158af4f2de8d2 100644
--- a/x-pack/plugins/security/public/index.ts
+++ b/x-pack/plugins/security/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializer, PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 
 import type {
   PluginSetupDependencies,
@@ -18,7 +18,7 @@ import { SecurityPlugin } from './plugin';
 export type { SecurityPluginSetup, SecurityPluginStart };
 export type { AuthenticatedUser } from '../common/model';
 export type { SecurityLicense, SecurityLicenseFeatures } from '../common/licensing';
-export type { UserMenuLink, SecurityNavControlServiceStart } from '../public/nav_control';
+export type { UserMenuLink, SecurityNavControlServiceStart } from './nav_control';
 export type { UiApi } from './ui_api';
 export type { PersonalInfoProps, ChangePasswordProps } from './account_management';
 
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts
index 03c256942ea5d..ea30710e2fac9 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import { APIKeysAPIClient } from './api_keys_api_client';
 
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts
index 96f4506e09b71..fd6c856425cd4 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { ApiKey, ApiKeyRoleDescriptors, ApiKeyToInvalidate } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
index 1e944e1f31353..276e4585dea0c 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
@@ -9,7 +9,8 @@ import { render } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+
 import { mockAuthenticatedUser } from '../../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../../mocks';
 import { Providers } from '../api_keys_management_app';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
index dabcce11d319f..031f84f38ec32 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
@@ -28,14 +28,14 @@ import moment from 'moment-timezone';
 import React, { Component } from 'react';
 import { Route } from 'react-router-dom';
 
+import type { NotificationsStart } from '@kbn/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
-import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
-import { SectionLoading } from '../../../../../../../src/plugins/es_ui_shared/public';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { ApiKey, ApiKeyToInvalidate } from '../../../../common/model';
 import { Breadcrumb } from '../../../components/breadcrumb';
 import { SelectableTokenField } from '../../../components/token_field';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx
index 0ba56570b9983..7a36d9b3e0194 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx
@@ -26,8 +26,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { CodeEditorField, useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { CodeEditorField, useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import type { ApiKeyRoleDescriptors } from '../../../../common/model';
 import { DocLink } from '../../../components/doc_link';
 import type { FormFlyoutProps } from '../../../components/form_flyout';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx
index 26d1e1f72d31f..8dcf9b42d1fb6 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx
@@ -8,9 +8,9 @@
 import { EuiConfirmModal } from '@elastic/eui';
 import React, { Fragment, useRef, useState } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { ApiKeyToInvalidate } from '../../../../../common/model';
 import type { APIKeysAPIClient } from '../../api_keys_api_client';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx
index 9edd8debe2783..2f6db19d26f16 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx
@@ -9,8 +9,7 @@ import { EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const NotEnabled: React.FunctionComponent = () => {
   const docLinks = useKibana().services.docLinks!;
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx
index 83fe807f9a3c6..514e9aa5e306c 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx
@@ -11,8 +11,8 @@ jest.mock('./api_keys_grid', () => ({
 
 import { act } from '@testing-library/react';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
 import { securityMock } from '../../mocks';
 import { apiKeysManagementApp } from './api_keys_management_app';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
index 2532c72d34e83..8145a31f3f6f4 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
@@ -12,19 +12,12 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Router } from 'react-router-dom';
 import type { Observable } from 'rxjs';
 
+import type { CoreStart, CoreTheme, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import type {
-  CoreStart,
-  CoreTheme,
-  StartServicesAccessor,
-} from '../../../../../../src/core/public';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
-import type { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
 import type { AuthenticationServiceSetup } from '../../authentication';
 import type { BreadcrumbsChangeHandler } from '../../components/breadcrumb';
 import {
diff --git a/x-pack/plugins/security/public/management/management_service.test.ts b/x-pack/plugins/security/public/management/management_service.test.ts
index b0f35e76b6dfa..49fdd6864ec3d 100644
--- a/x-pack/plugins/security/public/management/management_service.test.ts
+++ b/x-pack/plugins/security/public/management/management_service.test.ts
@@ -7,13 +7,13 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import type {
   DefinedSections,
   ManagementApp,
   ManagementSetup,
-} from 'src/plugins/management/public';
-import { createManagementSectionMock } from 'src/plugins/management/public/mocks';
+} from '@kbn/management-plugin/public';
+import { createManagementSectionMock } from '@kbn/management-plugin/public/mocks';
 
 import { licenseMock } from '../../common/licensing/index.mock';
 import type { SecurityLicenseFeatures } from '../../common/licensing/license_features';
diff --git a/x-pack/plugins/security/public/management/management_service.ts b/x-pack/plugins/security/public/management/management_service.ts
index af1b05e64e37c..c6d760ef87d80 100644
--- a/x-pack/plugins/security/public/management/management_service.ts
+++ b/x-pack/plugins/security/public/management/management_service.ts
@@ -7,12 +7,12 @@
 
 import type { Subscription } from 'rxjs';
 
-import type { Capabilities, FatalErrorsSetup, StartServicesAccessor } from 'src/core/public';
+import type { Capabilities, FatalErrorsSetup, StartServicesAccessor } from '@kbn/core/public';
 import type {
   ManagementApp,
   ManagementSection,
   ManagementSetup,
-} from 'src/plugins/management/public';
+} from '@kbn/management-plugin/public';
 
 import type { SecurityLicense } from '../../common/licensing';
 import type { AuthenticationServiceSetup } from '../authentication';
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx
index 55b6cbee4783a..171f592988ba9 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx
@@ -9,8 +9,8 @@ import { EuiConfirmModal } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { RoleMapping } from '../../../../../common/model';
 import { roleMappingsAPIClientMock } from '../../index.mock';
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx
index 9130a6ba1830c..c957ad82e63dc 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx
@@ -9,9 +9,9 @@ import { EuiConfirmModal } from '@elastic/eui';
 import type { ReactElement } from 'react';
 import React, { Fragment, useRef, useState } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../../common/model';
 import type { RoleMappingsAPIClient } from '../../role_mappings_api_client';
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx b/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
index ed264a2adb53d..e85e336bf77b0 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
@@ -9,8 +9,7 @@ import { EuiCallOut, EuiLink } from '@elastic/eui';
 import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const NoCompatibleRealms: React.FunctionComponent = () => {
   const docLinks = useKibana().services.docLinks!;
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
index 083b742a21fe7..30f63b16c0e0d 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
@@ -12,10 +12,10 @@ import '@kbn/test-jest-helpers/target_node/stub_web_worker';
 
 import React from 'react';
 
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 
 import type { Role } from '../../../../common/model';
 import { RoleComboBox } from '../../role_combo_box';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx
index 89fb13c05f729..73678e46ead98 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx
@@ -18,10 +18,10 @@ import {
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
+import type { DocLinksStart, NotificationsStart, ScopedHistory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart, NotificationsStart, ScopedHistory } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../common/model';
 import type { RolesAPIClient } from '../../roles';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx
index dd3bd25a745ca..577c7111092be 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Role, RoleMapping } from '../../../../../common/model';
 import type { RolesAPIClient } from '../../../roles';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx
index 88dc0155c939e..b691c3accd83a 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx
@@ -20,10 +20,10 @@ import {
 import type { ChangeEvent } from 'react';
 import React, { Component, Fragment } from 'react';
 
+import type { DocLinksStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../../common/model';
 import type { RolesAPIClient } from '../../../roles';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
index 06437675a8270..e3394bbdf37e8 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
@@ -15,15 +15,15 @@ import '@kbn/test-jest-helpers/target_node//stub_web_worker';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import type { monaco } from '@kbn/monaco';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { CodeEditorField } from 'src/plugins/kibana_react/public';
 
 import { AllRule, AnyRule, ExceptAllRule, ExceptAnyRule, FieldRule } from '../../model';
 import { JSONRuleEditor } from './json_rule_editor';
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
-  ...jest.requireActual('../../../../../../../../src/plugins/kibana_react/public'),
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
+  ...jest.requireActual('@kbn/kibana-react-plugin/public'),
   useKibana: jest.fn().mockReturnValue({
     services: { docLinks: { links: { apis: { createRoleMapping: 'createRoleMappingLink' } } } },
   }),
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx
index 23901e8cd3696..a36e9420c7cf9 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx
@@ -14,12 +14,9 @@ import React, { Fragment, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { CodeEditorField, useKibana } from '@kbn/kibana-react-plugin/public';
 import { XJsonLang } from '@kbn/monaco';
 
-import {
-  CodeEditorField,
-  useKibana,
-} from '../../../../../../../../src/plugins/kibana_react/public';
 import type { Rule } from '../../model';
 import { generateRulesFromRaw, RuleBuilderError } from '../../model';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
index 36b1390072408..df9fd8848e403 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
@@ -13,9 +13,9 @@ import '@kbn/test-jest-helpers/target_node/stub_web_worker';
 import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 
 import { AllRule, FieldRule } from '../../model';
 import { JSONRuleEditor } from './json_rule_editor';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx
index 89eb8118733fa..7d2d55b18d460 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx
@@ -21,9 +21,9 @@ import {
 } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { DocLinksStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DocLinksStart } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../../common/model';
 import type { Rule } from '../../model';
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts b/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
index f8474b91f26f4..79e2335919b1a 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { RoleMapping } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx
index 7e04b45e7fd8e..4aa55840cc7f8 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx
@@ -8,10 +8,10 @@
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
 
+import type { ScopedHistory } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ScopedHistory } from 'src/core/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
 import { EDIT_ROLE_MAPPING_PATH } from '../../../management_urls';
 
 interface CreateRoleMappingButtonProps {
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx
index 9a65792bcb943..9db5b1c5db091 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx
@@ -8,8 +8,8 @@
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React, { Fragment } from 'react';
 
+import type { ScopedHistory } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ScopedHistory } from 'src/core/public';
 
 import { CreateRoleMappingButton } from '../create_role_mapping_button';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
index 3ac54cb7863fd..79d97346de8dd 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
@@ -9,10 +9,10 @@ import { EuiLink } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import type { CoreStart } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { CoreStart } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 
 import { rolesAPIClientMock } from '../../roles/index.mock';
 import { NoCompatibleRealms, PermissionDenied, SectionLoading } from '../components';
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx
index 0a25b69dad4be..81fc3b91ae274 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx
@@ -19,17 +19,17 @@ import {
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ApplicationStart,
   DocLinksStart,
   NotificationsStart,
   ScopedHistory,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Role, RoleMapping } from '../../../../common/model';
 import { DisabledBadge, EnabledBadge } from '../../badges';
 import {
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx
index 3b7e96ffabd1e..04db6c58c27d1 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx
@@ -8,8 +8,8 @@
 import { act } from '@testing-library/react';
 import { noop } from 'lodash';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
 import { roleMappingsManagementApp } from './role_mappings_management_app';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
index 9367e7cd447f2..981638ccaca28 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
@@ -9,14 +9,11 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Route, Router, useParams } from 'react-router-dom';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
 import {
   Breadcrumb,
   BreadcrumbsProvider,
diff --git a/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx b/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx
index ac3ba0bd20118..454b8d9461c49 100644
--- a/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx
+++ b/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx
@@ -8,7 +8,7 @@
 import { EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
-import type { ApplicationStart } from 'src/core/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 import type { Role } from '../../../common/model';
 import { getExtendedRoleDeprecationNotice, isRoleDeprecated } from '../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
index 5132757e84613..282bf7beb68be 100644
--- a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../../features/public';
-import { KibanaFeature } from '../../../../../features/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
+import { KibanaFeature } from '@kbn/features-plugin/public';
 
 export const createFeature = (
   config: Pick<
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
index cd72085c9a16d..ac466d2d72540 100644
--- a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../../../features/public';
+import type { KibanaFeature } from '@kbn/features-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { featuresPluginMock } from '../../../../../features/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { LicenseType } from '../../../../../licensing/server';
+import type { LicenseType } from '@kbn/licensing-plugin/server';
+
 import type { SecurityLicenseFeatures } from '../../../../common/licensing';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { Actions } from '../../../../server/authorization';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
index e7c3490d2ce13..ae64ad4655ba5 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
@@ -9,13 +9,13 @@ import { act } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import type { Capabilities } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/public';
+import type { Space } from '@kbn/spaces-plugin/public';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { Capabilities } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
 
-import { KibanaFeature } from '../../../../../features/public';
-import type { Space } from '../../../../../spaces/public';
 import { licenseMock } from '../../../../common/licensing/index.mock';
 import type { Role } from '../../../../common/model';
 import { userAPIClientMock } from '../../users/index.mock';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
index f868fabdaf76b..1cda335ace204 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
@@ -22,9 +22,6 @@ import {
 import type { ChangeEvent, FunctionComponent, HTMLProps } from 'react';
 import React, { Fragment, useCallback, useEffect, useRef, useState } from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   Capabilities,
   DocLinksStart,
@@ -33,13 +30,16 @@ import type {
   IHttpFetchError,
   NotificationsStart,
   ScopedHistory,
-} from 'src/core/public';
-import type { DataViewsContract } from 'src/plugins/data/public';
+} from '@kbn/core/public';
+import type { DataViewsContract } from '@kbn/data-plugin/public';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
-import type { KibanaFeature } from '../../../../../features/common';
-import type { FeaturesPluginStart } from '../../../../../features/public';
-import type { Space, SpacesApiUi } from '../../../../../spaces/public';
 import type { SecurityLicense } from '../../../../common/licensing';
 import type {
   BuiltinESPrivileges,
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
index 9585db6efda25..717700cc82278 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { licenseMock } from '../../../../../../common/licensing/index.mock';
 import { indicesAPIClientMock } from '../../../index.mock';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
index cc62824ecd9b2..55b89d8832c75 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
@@ -18,10 +18,10 @@ import {
 } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { DocLinksStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart } from 'src/core/public';
 
 import type { SecurityLicense } from '../../../../../../common/licensing';
 import type { BuiltinESPrivileges, Role } from '../../../../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
index d61fd1e17e33b..af5ef0a0ccb00 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
@@ -8,13 +8,10 @@
 import { EuiButtonIcon, EuiComboBox, EuiTextArea } from '@elastic/eui';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { CodeEditorField, KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import {
-  CodeEditorField,
-  KibanaContextProvider,
-} from '../../../../../../../../../src/plugins/kibana_react/public';
 import { indicesAPIClientMock } from '../../../index.mock';
 import { RoleValidator } from '../../validate_role';
 import { IndexPrivilegeForm } from './index_privilege_form';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
index 024dba981b23b..fbc440c0ed984 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
@@ -21,10 +21,10 @@ import React, { Component, Fragment } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import type { monaco } from '@kbn/monaco';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import { CodeEditorField } from '../../../../../../../../../src/plugins/kibana_react/public';
 import type { RoleIndexPrivilege } from '../../../../../../common/model';
 import type { IndicesAPIClient } from '../../../indices_api_client';
 import type { RoleValidator } from '../../validate_role';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
index 440d5132baa33..cdc8ac71fd38d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { licenseMock } from '../../../../../../common/licensing/index.mock';
 import { indicesAPIClientMock } from '../../../index.mock';
 import { RoleValidator } from '../../validate_role';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
index 4014a2a265abd..ffe5417616dd9 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
@@ -8,9 +8,9 @@
 import { EuiAccordion } from '@elastic/eui';
 import React from 'react';
 
+import type { KibanaFeature, SubFeatureConfig } from '@kbn/features-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import type { KibanaFeature, SubFeatureConfig } from '../../../../../../../../features/public';
 import type { Role } from '../../../../../../../common/model';
 import { createFeature, kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
index e14c28db3e740..43d23fa7a584d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
@@ -24,9 +24,9 @@ import {
 import type { ReactElement } from 'react';
 import React, { Component } from 'react';
 
+import type { AppCategory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { AppCategory } from 'src/core/public';
 
 import type { Role } from '../../../../../../../common/model';
 import type { KibanaPrivileges, SecuredFeature } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
index c73dbb2616d2d..12a9a8a79944b 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
@@ -9,9 +9,9 @@ import { EuiButtonGroup, EuiCheckbox } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { KibanaFeature } from '@kbn/features-plugin/public';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { KibanaFeature } from '../../../../../../../../features/public';
 import type { Role } from '../../../../../../../common/model';
 import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
index 0aba384ede90e..612bcf05aab56 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
@@ -7,9 +7,9 @@
 
 import React, { Component } from 'react';
 
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../spaces/public';
 import type { Role } from '../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../model';
 import { CollapsiblePanel } from '../../collapsible_panel';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
index 928a9f5d28fea..2a33d01c6e38c 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
@@ -8,11 +8,11 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { spacesManagerMock } from '../../../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../../../spaces/public/ui_api';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
index aafa431bee2b3..2aaec1ae95d87 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
@@ -17,8 +17,8 @@ import {
 import React, { Fragment, useState } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import type { Role } from '../../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../../model';
 import { PrivilegeSummaryTable } from './privilege_summary_table';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
index 0a3620aaa4114..d54866c88f7ef 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
@@ -8,11 +8,11 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { spacesManagerMock } from '../../../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../../../spaces/public/ui_api';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
index 8e5954f50a943..f8e5867443b3f 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
@@ -20,8 +20,8 @@ import {
 import React, { Fragment, useMemo, useState } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import { ALL_SPACES_ID } from '../../../../../../../common/constants';
 import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
 import type { KibanaPrivileges, PrimaryFeaturePrivilege, SecuredFeature } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
index e3746e7fb1051..015dd8a5548cd 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
@@ -8,12 +8,12 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { SpaceAvatarInternal } from '@kbn/spaces-plugin/public/space_avatar/space_avatar_internal';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { SpaceAvatarInternal } from '../../../../../../../../spaces/public/space_avatar/space_avatar_internal';
-import { spacesManagerMock } from '../../../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../../../spaces/public/ui_api';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { SpacesPopoverList } from '../../../spaces_popover_list';
 import { SpaceColumnHeader } from './space_column_header';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
index 2460c5e9f5f32..99a4cb0020aed 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
@@ -9,8 +9,8 @@ import React, { Fragment, useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
 import { SpacesPopoverList } from '../../../spaces_popover_list';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
index 8eaae663e7e80..8f10acb2403aa 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
@@ -8,9 +8,9 @@
 import { EuiButtonGroup } from '@elastic/eui';
 import React from 'react';
 
+import type { Space } from '@kbn/spaces-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import type { Space } from '../../../../../../../../spaces/public';
 import type { Role } from '../../../../../../../common/model';
 import { createFeature, kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
index 54c5c8770a981..52b8025b2b668 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
@@ -28,8 +28,8 @@ import React, { Component, Fragment } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space } from '@kbn/spaces-plugin/public';
 
-import type { Space } from '../../../../../../../../spaces/public';
 import { ALL_SPACES_ID } from '../../../../../../../common/constants';
 import type { FeaturesPrivileges, Role } from '../../../../../../../common/model';
 import { copyRole } from '../../../../../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
index 9b86ad54c4d35..36755875848dc 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
@@ -9,9 +9,9 @@ import { EuiBadge, EuiInMemoryTable } from '@elastic/eui';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { KibanaFeature } from '@kbn/features-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { KibanaFeature } from '../../../../../../../../features/public';
 import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
 import { PrivilegeFormCalculator } from '../privilege_form_calculator';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 1c256846a6c91..b7ce0ac2d3b1e 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -22,9 +22,9 @@ import React, { Component } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { getSpaceColor } from '@kbn/spaces-plugin/public';
 
-import type { Space } from '../../../../../../../../spaces/public';
-import { getSpaceColor } from '../../../../../../../../spaces/public';
 import type { FeaturesPrivileges, Role } from '../../../../../../../common/model';
 import { copyRole } from '../../../../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
index d6032e9149364..84ba0c7020efb 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
@@ -17,11 +17,11 @@ import {
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
 
+import type { Capabilities } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { Capabilities } from 'src/core/public';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import type { Role } from '../../../../../../../common/model';
 import { isRoleReserved } from '../../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index 3e84e02a00008..99e9edb48d556 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -10,9 +10,8 @@ import { EuiComboBox, EuiHealth, EuiHighlight } from '@elastic/eui';
 import React, { Component } from 'react';
 
 import { i18n } from '@kbn/i18n';
-
-import type { Space } from '../../../../../../../../spaces/public';
-import { getSpaceColor } from '../../../../../../../../spaces/public';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { getSpaceColor } from '@kbn/spaces-plugin/public';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
index 572822db3ca2a..cecf01c66d241 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
@@ -15,13 +15,13 @@ import {
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { SpaceAvatarInternal } from '@kbn/spaces-plugin/public/space_avatar/space_avatar_internal';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import type { Space } from '../../../../../../spaces/public';
-import { SpaceAvatarInternal } from '../../../../../../spaces/public/space_avatar/space_avatar_internal';
-import { spacesManagerMock } from '../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../spaces/public/ui_api';
 import { SpacesPopoverList } from './spaces_popover_list';
 
 const mockSpaces = [
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
index 457d74edf79ff..20c2d3f4c4bc8 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
@@ -19,9 +19,8 @@ import React, { Component, memo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../spaces/common';
-import type { Space, SpacesApiUi } from '../../../../../../spaces/public';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '@kbn/spaces-plugin/common';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts b/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts
index feb0c73aa5bb2..c2af251e72139 100644
--- a/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { IndicesAPIClient } from './indices_api_client';
 
diff --git a/x-pack/plugins/security/public/management/roles/indices_api_client.ts b/x-pack/plugins/security/public/management/roles/indices_api_client.ts
index 5d2ead1961fc6..4305444b6447b 100644
--- a/x-pack/plugins/security/public/management/roles/indices_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/indices_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 export class IndicesAPIClient {
   private readonly fieldCache = new Map<string, string[]>();
diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
index 67e000348f016..b48fc18527cd6 100644
--- a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
+++ b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../../../features/common';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
+
 import type { RawKibanaPrivileges, RoleKibanaPrivilege } from '../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../edit_role/privilege_utils';
 import { KibanaPrivilege } from './kibana_privilege';
diff --git a/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts b/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
index cda4d203305b4..f9513c8ebb4d3 100644
--- a/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
+++ b/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/public';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/public';
+
 import { KibanaPrivilege } from './kibana_privilege';
 
 export class PrimaryFeaturePrivilege extends KibanaPrivilege {
diff --git a/x-pack/plugins/security/public/management/roles/model/secured_feature.ts b/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
index d5fb7ef628657..d11b45129e6f9 100644
--- a/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
+++ b/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../../features/common';
-import { KibanaFeature } from '../../../../../features/common';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+
 import { PrimaryFeaturePrivilege } from './primary_feature_privilege';
 import { SecuredSubFeature } from './secured_sub_feature';
 import type { SubFeaturePrivilege } from './sub_feature_privilege';
diff --git a/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts b/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
index d143d7f217547..1f76b17a39e59 100644
--- a/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
+++ b/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { SubFeatureConfig } from '../../../../../features/common';
-import { SubFeature } from '../../../../../features/common';
+import type { SubFeatureConfig } from '@kbn/features-plugin/common';
+import { SubFeature } from '@kbn/features-plugin/common';
+
 import { SubFeaturePrivilege } from './sub_feature_privilege';
 import { SubFeaturePrivilegeGroup } from './sub_feature_privilege_group';
 
diff --git a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
index a10c38cb3f818..45a51a45533c1 100644
--- a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
+++ b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { SubFeaturePrivilegeConfig } from '../../../../../features/public';
+import type { SubFeaturePrivilegeConfig } from '@kbn/features-plugin/public';
+
 import { KibanaPrivilege } from './kibana_privilege';
 
 export class SubFeaturePrivilege extends KibanaPrivilege {
diff --git a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
index ca18ef28e0a73..e3325a2f3a63b 100644
--- a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
+++ b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { SubFeaturePrivilegeGroupConfig } from '../../../../../features/common';
+import type { SubFeaturePrivilegeGroupConfig } from '@kbn/features-plugin/common';
+
 import { SubFeaturePrivilege } from './sub_feature_privilege';
 
 export class SubFeaturePrivilegeGroup {
diff --git a/x-pack/plugins/security/public/management/roles/privileges_api_client.ts b/x-pack/plugins/security/public/management/roles/privileges_api_client.ts
index 0bb89eebb6b11..b4b372faec710 100644
--- a/x-pack/plugins/security/public/management/roles/privileges_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/privileges_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { BuiltinESPrivileges, RawKibanaPrivileges } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
index 5d510da8a331b..917843666378e 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import type { Role } from '../../../common/model';
 import { RolesAPIClient } from './roles_api_client';
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
index 5de8827207ced..20c26cc7a02ae 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { Role, RoleIndexPrivilege } from '../../../common/model';
 import { copyRole } from '../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx
index 55b7a17f3e26f..186f9bc4a4cb5 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx
@@ -17,10 +17,10 @@ import {
 } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { RolesAPIClient } from '../../roles_api_client';
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
index 7041a61a850d0..881b0a2ee3203 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
@@ -9,9 +9,9 @@ import { EuiBasicTable, EuiIcon } from '@elastic/eui';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
 
 import { DisabledBadge, ReservedBadge } from '../../badges';
 import { rolesAPIClientMock } from '../index.mock';
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
index 76bc17f9115e4..e5212c9071570 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
@@ -22,12 +22,12 @@ import {
 import _ from 'lodash';
 import React, { Component } from 'react';
 
+import type { NotificationsStart, ScopedHistory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart, ScopedHistory } from 'src/core/public';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Role } from '../../../../common/model';
 import {
   getExtendedRoleDeprecationNotice,
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
index 1f52d0140a270..327499c64bb76 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
@@ -8,10 +8,10 @@
 import { act } from '@testing-library/react';
 import { noop } from 'lodash';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
-import { featuresPluginMock } from '../../../../features/public/mocks';
 import { licenseMock } from '../../../common/licensing/index.mock';
 import { rolesManagementApp } from './roles_management_app';
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
index 18a0ad37b88fc..e0939d5cbf48b 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
@@ -9,14 +9,11 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Route, Router, useParams } from 'react-router-dom';
 
+import type { FatalErrorsSetup, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { FatalErrorsSetup, StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
 import type { SecurityLicense } from '../../../common/licensing';
 import {
   Breadcrumb,
diff --git a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx
index cf1959f8a389f..a5f459dfc1124 100644
--- a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx
+++ b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx
@@ -9,8 +9,8 @@ import { EuiFieldPassword } from '@elastic/eui';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { User } from '../../../../../common/model';
 import { userAPIClientMock } from '../../index.mock';
diff --git a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx
index 787aa9627b5a8..d30eabc7f35e4 100644
--- a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx
+++ b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx
@@ -18,10 +18,10 @@ import _ from 'lodash';
 import type { ChangeEvent } from 'react';
 import React, { Component } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { User } from '../../../../../common/model';
 import type { UserAPIClient } from '../../user_api_client';
diff --git a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx
index 2668050645f33..30335fd7cbb60 100644
--- a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx
+++ b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { userAPIClientMock } from '../../index.mock';
 import { ConfirmDeleteUsers } from './confirm_delete_users';
diff --git a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx
index dad1b6de72291..e6e5f682f7b31 100644
--- a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx
+++ b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx
@@ -8,11 +8,11 @@
 import { EuiConfirmModal } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { asyncForEach } from '@kbn/std';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { UserAPIClient } from '../../user_api_client';
 
diff --git a/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx b/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx
index 2ad27a77c07b8..53c298e270112 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx
@@ -22,8 +22,8 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { FormFlyout } from '../../../components/form_flyout';
 import { useCurrentUser } from '../../../components/use_current_user';
 import type { ValidationErrors } from '../../../components/use_form';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx b/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx
index 560898229d0d2..b90a28364ee77 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx
@@ -12,9 +12,9 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import { UserAPIClient } from '..';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export interface ConfirmDeleteUsersProps {
   usernames: string[];
diff --git a/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx b/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx
index fb90d7cf9eec9..49628d88a8a25 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx
@@ -12,9 +12,9 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import { UserAPIClient } from '..';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export interface ConfirmDisableUsersProps {
   usernames: string[];
diff --git a/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx b/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx
index 88b8e4e5065e4..d0210b2a6f5c1 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx
@@ -12,9 +12,9 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import { UserAPIClient } from '..';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export interface ConfirmEnableUsersProps {
   usernames: string[];
diff --git a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx
index 5ae0a3c85cd0a..525df66251057 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx
@@ -9,7 +9,7 @@ import { fireEvent, render, waitFor, within } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { securityMock } from '../../../mocks';
 import { Providers } from '../users_management_app';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
index 3e0970b66563b..2d024c7826a6f 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
@@ -9,7 +9,7 @@ import { fireEvent, render } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { securityMock } from '../../../mocks';
 import { Providers } from '../users_management_app';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
index 19a2f964a357c..a64ca3aca99eb 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
@@ -27,8 +27,8 @@ import { useHistory } from 'react-router-dom';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { getUserDisplayName } from '../../../../common/model';
 import { UserAPIClient } from '../user_api_client';
 import { isUserDeprecated, isUserReserved } from '../user_utils';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx b/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
index 722f9a3f17f6d..d1134d0959a16 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
@@ -25,8 +25,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { MAX_NAME_LENGTH, NAME_REGEX } from '../../../../common/constants';
 import type { Role, User } from '../../../../common/model';
 import { isRoleDeprecated } from '../../../../common/model';
diff --git a/x-pack/plugins/security/public/management/users/user_api_client.ts b/x-pack/plugins/security/public/management/users/user_api_client.ts
index 9197634383504..071aa9e95171b 100644
--- a/x-pack/plugins/security/public/management/users/user_api_client.ts
+++ b/x-pack/plugins/security/public/management/users/user_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { EditUser, User } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx
index 898fec5709c56..99de5391c0416 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx
@@ -10,9 +10,9 @@ import type { ReactWrapper } from 'enzyme';
 import type { LocationDescriptorObject } from 'history';
 import React from 'react';
 
+import type { CoreStart, ScopedHistory } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { CoreStart, ScopedHistory } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
 
 import type { User } from '../../../../common/model';
 import { rolesAPIClientMock } from '../../roles/index.mock';
diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
index 1c3bd98d834aa..3952bd019ec74 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
@@ -20,12 +20,12 @@ import {
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
+import type { ApplicationStart, NotificationsStart, ScopedHistory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { ApplicationStart, NotificationsStart, ScopedHistory } from 'src/core/public';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Role, User } from '../../../../common/model';
 import { DeprecatedBadge, DisabledBadge, ReservedBadge } from '../../badges';
 import { RoleTableDisplay } from '../../role_table_display';
diff --git a/x-pack/plugins/security/public/management/users/users_management_app.test.tsx b/x-pack/plugins/security/public/management/users/users_management_app.test.tsx
index 84a6e82bf12ae..ec7b1d19226ba 100644
--- a/x-pack/plugins/security/public/management/users/users_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/users/users_management_app.test.tsx
@@ -8,8 +8,8 @@
 import { act } from '@testing-library/react';
 import { noop } from 'lodash';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
 import { securityMock } from '../../mocks';
 import { usersManagementApp } from './users_management_app';
diff --git a/x-pack/plugins/security/public/management/users/users_management_app.tsx b/x-pack/plugins/security/public/management/users/users_management_app.tsx
index 88fad7b1a3a3f..de7a4110a3f3f 100644
--- a/x-pack/plugins/security/public/management/users/users_management_app.tsx
+++ b/x-pack/plugins/security/public/management/users/users_management_app.tsx
@@ -13,15 +13,12 @@ import type { RouteComponentProps } from 'react-router-dom';
 import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import type { Observable } from 'rxjs';
 
+import type { CoreStart, CoreTheme, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { CoreStart, CoreTheme, StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
 import type { AuthenticationServiceSetup } from '../../authentication';
 import type { BreadcrumbsChangeHandler } from '../../components/breadcrumb';
 import {
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
index bbbee1d710c07..3e871c4979804 100644
--- 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
@@ -7,10 +7,10 @@
 
 import { BehaviorSubject } from 'rxjs';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import type { ILicense } from '@kbn/licensing-plugin/public';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import type { ILicense } from '../../../licensing/public';
 import { SecurityLicenseService } from '../../common/licensing';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { securityMock } from '../mocks';
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
index ef1cbdf5ef1ca..63e753f8646cd 100644
--- a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
+++ b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
@@ -12,9 +12,9 @@ import type { Observable, Subscription } from 'rxjs';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 import type { SecurityLicense } from '../../common/licensing';
 import type { AuthenticationServiceSetup } from '../authentication';
 import type { UserMenuLink } from './nav_control_component';
diff --git a/x-pack/plugins/security/public/plugin.test.tsx b/x-pack/plugins/security/public/plugin.test.tsx
index 98d0ea0ab25a2..5a7cbd659ca7e 100644
--- a/x-pack/plugins/security/public/plugin.test.tsx
+++ b/x-pack/plugins/security/public/plugin.test.tsx
@@ -8,13 +8,13 @@
 import { enforceOptions } from 'broadcast-channel';
 import { Observable } from 'rxjs';
 
-import type { CoreSetup } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import { managementPluginMock } from 'src/plugins/management/public/mocks';
+import type { CoreSetup } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
 
-import type { FeaturesPluginStart } from '../../features/public';
-import { licensingMock } from '../../licensing/public/mocks';
 import { ManagementService } from './management';
 import type { PluginStartDependencies } from './plugin';
 import { SecurityPlugin } from './plugin';
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index cd34e8eac8c6b..7ca2e2f353efa 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -5,23 +5,22 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type {
   CoreSetup,
   CoreStart,
   HttpSetup,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/public';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { ManagementSetup, ManagementStart } from 'src/plugins/management/public';
-
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
-import type { FeaturesPluginStart } from '../../features/public';
-import type { LicensingPluginSetup } from '../../licensing/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+} from '@kbn/core/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { i18n } from '@kbn/i18n';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+
 import { SecurityLicenseService } from '../common/licensing';
 import type { SecurityLicense } from '../common/licensing';
 import { accountManagementApp } from './account_management';
@@ -126,7 +125,7 @@ export class SecurityPlugin
         icon: 'securityApp',
         path: '/app/management/security/roles',
         showOnHomePage: true,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
         order: 600,
       });
     }
diff --git a/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx b/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx
index 4279b9f31f7b7..34710ba650f54 100644
--- a/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx
+++ b/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx
@@ -16,9 +16,9 @@ import {
 import React, { useState } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
+import type { DocLinksStart, MountPoint } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
-import type { DocLinksStart, MountPoint } from 'src/core/public';
 
 export const insecureClusterAlertTitle = i18n.translate(
   'xpack.security.checkup.insecureClusterTitle',
diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts b/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts
index b71d42fb08adc..438e498deb41b 100644
--- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts
+++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { DocLinksStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import type { DocLinksStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { ConfigType } from '../config';
 import { SecurityCheckupService } from './security_checkup_service';
diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
index 4d2e92d2a5079..e90adf7a004a2 100644
--- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
+++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
@@ -14,7 +14,7 @@ import type {
   HttpStart,
   NotificationsStart,
   Toast,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import type { SecurityCheckupState } from '../../common/types';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/public/session/session_expiration_toast.tsx b/x-pack/plugins/security/public/session/session_expiration_toast.tsx
index 5dd0bcc4fd6f5..9bdee832e9b66 100644
--- a/x-pack/plugins/security/public/session/session_expiration_toast.tsx
+++ b/x-pack/plugins/security/public/session/session_expiration_toast.tsx
@@ -12,11 +12,11 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
 
+import type { ToastInput } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n-react';
-import type { ToastInput } from 'src/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
 import { SESSION_GRACE_PERIOD_MS } from '../../common/constants';
 import type { SessionState } from './session_timeout';
 
diff --git a/x-pack/plugins/security/public/session/session_expired.test.ts b/x-pack/plugins/security/public/session/session_expired.test.ts
index 6901e2cdefa76..02a41f1b80b80 100644
--- a/x-pack/plugins/security/public/session/session_expired.test.ts
+++ b/x-pack/plugins/security/public/session/session_expired.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { applicationServiceMock } from 'src/core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 
 import { LogoutReason } from '../../common/types';
 import { SessionExpired } from './session_expired';
diff --git a/x-pack/plugins/security/public/session/session_expired.ts b/x-pack/plugins/security/public/session/session_expired.ts
index 44b1d47b7d66a..9f0d42e769aae 100644
--- a/x-pack/plugins/security/public/session/session_expired.ts
+++ b/x-pack/plugins/security/public/session/session_expired.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'src/core/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 import {
   LOGOUT_PROVIDER_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/public/session/session_timeout.test.ts b/x-pack/plugins/security/public/session/session_timeout.test.ts
index dc046824dc9a8..09b67082b1a97 100644
--- a/x-pack/plugins/security/public/session/session_timeout.test.ts
+++ b/x-pack/plugins/security/public/session/session_timeout.test.ts
@@ -7,8 +7,8 @@
 
 import type { BroadcastChannel } from 'broadcast-channel';
 
-import type { ToastInputFields } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
+import type { ToastInputFields } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import {
   SESSION_CHECK_MS,
diff --git a/x-pack/plugins/security/public/session/session_timeout.ts b/x-pack/plugins/security/public/session/session_timeout.ts
index f3f58b63c0e7f..be7fc4dba883c 100644
--- a/x-pack/plugins/security/public/session/session_timeout.ts
+++ b/x-pack/plugins/security/public/session/session_timeout.ts
@@ -15,7 +15,7 @@ import type {
   HttpSetup,
   NotificationsSetup,
   Toast,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import {
   SESSION_CHECK_MS,
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
index c3b29dd5abfa6..d82a041a4fe28 100644
--- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
@@ -8,8 +8,8 @@
 // @ts-ignore
 import fetchMock from 'fetch-mock/es5/client';
 
-import { applicationServiceMock } from 'src/core/public/mocks';
-import { setup } from 'src/core/test_helpers/http_test_setup';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
+import { setup } from '@kbn/core/test_helpers/http_test_setup';
 
 import { SessionExpired } from './session_expired';
 import { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor';
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
index 92c5c4485bcad..4d0327da2e48d 100644
--- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
@@ -10,7 +10,7 @@ import type {
   HttpInterceptorResponseError,
   IAnonymousPaths,
   IHttpInterceptController,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import { LogoutReason } from '../../common/types';
 import type { SessionExpired } from './session_expired';
diff --git a/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx b/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx
index 313401ff45bd9..6046f52b4d063 100644
--- a/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx
+++ b/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx
@@ -9,8 +9,8 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import type { PropsWithChildren } from 'react';
 import React, { Component, Suspense } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { NotificationsStart } from 'src/core/public';
 
 interface Props {
   notifications: NotificationsStart;
diff --git a/x-pack/plugins/security/public/ui_api/components.tsx b/x-pack/plugins/security/public/ui_api/components.tsx
index a488bc359b538..5c899ab8c5ab5 100644
--- a/x-pack/plugins/security/public/ui_api/components.tsx
+++ b/x-pack/plugins/security/public/ui_api/components.tsx
@@ -8,7 +8,7 @@
 import type { FC, PropsWithChildren, PropsWithRef } from 'react';
 import React from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 /**
  * We're importing specific files here instead of passing them
diff --git a/x-pack/plugins/security/public/ui_api/index.mock.ts b/x-pack/plugins/security/public/ui_api/index.mock.ts
index c35f9342be6ca..165a1e4cb76c5 100644
--- a/x-pack/plugins/security/public/ui_api/index.mock.ts
+++ b/x-pack/plugins/security/public/ui_api/index.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UiApi } from './';
+import type { UiApi } from '.';
 
 export const getUiApiMock = {
   createStart: (): jest.Mocked<UiApi> => ({
diff --git a/x-pack/plugins/security/public/ui_api/index.ts b/x-pack/plugins/security/public/ui_api/index.ts
index e53564074940a..ba2e1bfb5f36b 100644
--- a/x-pack/plugins/security/public/ui_api/index.ts
+++ b/x-pack/plugins/security/public/ui_api/index.ts
@@ -7,7 +7,7 @@
 
 import type { ReactElement } from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import type { ChangePasswordProps, PersonalInfoProps } from '../account_management';
 import { getComponents } from './components';
diff --git a/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx b/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx
index 6a37b35df7327..3ac1901511b20 100644
--- a/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx
+++ b/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx
@@ -8,7 +8,7 @@
 import type { FC, PropsWithChildren, PropsWithRef, ReactElement } from 'react';
 import React, { lazy, useMemo } from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import { SuspenseErrorBoundary } from '../suspense_error_boundary';
 
diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts
index b305685f9a233..3f0a0924d67ae 100644
--- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts
+++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { capabilitiesServiceMock } from 'src/core/server/mocks';
+import { capabilitiesServiceMock } from '@kbn/core/server/mocks';
 
 import type { AnonymousAccessServiceStart } from './anonymous_access_service';
 
diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts
index 5bbf6b317e3c5..63486b4dad703 100644
--- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts
+++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts
@@ -7,15 +7,15 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import {
   coreMock,
   elasticsearchServiceMock,
   httpServerMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
-import { spacesMock } from '../../../spaces/server/mocks';
 import { ConfigSchema, createConfig } from '../config';
 import { securityMock } from '../mocks';
 import { AnonymousAccessService } from './anonymous_access_service';
diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts
index 3d8601ab4734a..6507f579841c3 100644
--- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts
+++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts
@@ -13,11 +13,11 @@ import type {
   IBasePath,
   IClusterClient,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { addSpaceIdToPath } from '@kbn/spaces-plugin/common';
+import type { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
-import { KibanaRequest } from '../../../../../src/core/server';
-import { addSpaceIdToPath } from '../../../spaces/common';
-import type { SpacesServiceStart } from '../../../spaces/server';
 import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER } from '../../common/constants';
 import type { HTTPAuthorizationHeader } from '../authentication';
 import { AnonymousAuthenticationProvider } from '../authentication';
diff --git a/x-pack/plugins/security/server/audit/audit_events.test.ts b/x-pack/plugins/security/server/audit/audit_events.test.ts
index 7ebc07a37b5c9..73523b4a3e009 100644
--- a/x-pack/plugins/security/server/audit/audit_events.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_events.test.ts
@@ -7,7 +7,7 @@
 
 import { URL } from 'url';
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { AuthenticationResult } from '../authentication';
diff --git a/x-pack/plugins/security/server/audit/audit_events.ts b/x-pack/plugins/security/server/audit/audit_events.ts
index c896b6cea9947..dd767df83b692 100644
--- a/x-pack/plugins/security/server/audit/audit_events.ts
+++ b/x-pack/plugins/security/server/audit/audit_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EcsEventOutcome, EcsEventType, KibanaRequest, LogMeta } from 'src/core/server';
+import type { EcsEventOutcome, EcsEventType, KibanaRequest, LogMeta } from '@kbn/core/server';
 
 import type { AuthenticationProvider } from '../../common/model';
 import type { AuthenticationResult } from '../authentication/authentication_result';
diff --git a/x-pack/plugins/security/server/audit/audit_service.test.ts b/x-pack/plugins/security/server/audit/audit_service.test.ts
index 2a42855057e3a..d750fa2fc36b9 100644
--- a/x-pack/plugins/security/server/audit/audit_service.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_service.test.ts
@@ -12,7 +12,7 @@ import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { licenseMock } from '../../common/licensing/index.mock';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/server/audit/audit_service.ts b/x-pack/plugins/security/server/audit/audit_service.ts
index 6f81164be5a89..89b288d07e9fe 100644
--- a/x-pack/plugins/security/server/audit/audit_service.ts
+++ b/x-pack/plugins/security/server/audit/audit_service.ts
@@ -13,9 +13,9 @@ import type {
   Logger,
   LoggerContextConfigInput,
   LoggingServiceSetup,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 
-import type { SpacesPluginSetup } from '../../../spaces/server';
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../common/licensing';
 import type { ConfigType } from '../config';
 import type { SecurityPluginSetup } from '../plugin';
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
index 8b29d5ed17c1c..b5332a7296062 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import {
+  elasticsearchServiceMock,
+  httpServerMock,
+  loggingSystemMock,
+} from '@kbn/core/server/mocks';
 
 import type { SecurityLicense } from '../../../common/licensing';
 import { licenseMock } from '../../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
index 6ad05dcf67b77..82b27212182d6 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IClusterClient, KibanaRequest, Logger } from 'src/core/server';
+import type { IClusterClient, KibanaRequest, Logger } from '@kbn/core/server';
 
 import type { SecurityLicense } from '../../../common/licensing';
 import {
diff --git a/x-pack/plugins/security/server/authentication/authentication_result.ts b/x-pack/plugins/security/server/authentication/authentication_result.ts
index a5b1e11754d97..842689b99a446 100644
--- a/x-pack/plugins/security/server/authentication/authentication_result.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_result.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { AuthHeaders } from 'src/core/server';
+import type { AuthHeaders } from '@kbn/core/server';
 
 import type { AuthenticatedUser } from '../../common/model';
 
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.test.ts b/x-pack/plugins/security/server/authentication/authentication_service.test.ts
index b740a2a2db085..585dd54dd8d5a 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.test.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.test.ts
@@ -12,7 +12,6 @@ import { mockCanRedirectRequest } from './authentication_service.test.mocks';
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   AuthenticationHandler,
   AuthToolkit,
@@ -26,14 +25,15 @@ import type {
   UnauthorizedError,
   UnauthorizedErrorHandler,
   UnauthorizedErrorHandlerToolkit,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { AuthenticatedUser, SecurityLicense } from '../../common';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts
index 96dcf23af4fd0..ed461b0148a89 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ElasticsearchServiceSetup,
   HttpServiceSetup,
@@ -14,7 +13,8 @@ import type {
   KibanaRequest,
   Logger,
   LoggerFactory,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { AuthenticatedUser, SecurityLicense } from '../../common';
 import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../common/constants';
diff --git a/x-pack/plugins/security/server/authentication/authenticator.test.ts b/x-pack/plugins/security/server/authentication/authenticator.test.ts
index 1559a6fa4a5d7..3bbb1e5a48be2 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.test.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.test.ts
@@ -12,13 +12,13 @@ jest.mock('./providers/http');
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts
index 3cddcd48dda7e..7164b5e98b2f6 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import type { IBasePath, IClusterClient, LoggerFactory } from '@kbn/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import type { Logger } from '@kbn/logging';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { IBasePath, IClusterClient, LoggerFactory } from 'src/core/server';
 
-import { KibanaRequest } from '../../../../../src/core/server';
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
   AUTH_URL_HASH_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts b/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts
index 805d647757ca5..f3e82d45d2e21 100644
--- a/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts
+++ b/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { ROUTE_TAG_API, ROUTE_TAG_CAN_REDIRECT } from '../routes/tags';
 import { canRedirectRequest } from './can_redirect_request';
diff --git a/x-pack/plugins/security/server/authentication/can_redirect_request.ts b/x-pack/plugins/security/server/authentication/can_redirect_request.ts
index 5a3a09f17eb86..37e6d6b7061f7 100644
--- a/x-pack/plugins/security/server/authentication/can_redirect_request.ts
+++ b/x-pack/plugins/security/server/authentication/can_redirect_request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { ROUTE_TAG_API, ROUTE_TAG_CAN_REDIRECT } from '../routes/tags';
 
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
index 008afcf2a9389..5e79623b2febf 100644
--- a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
+++ b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { HTTPAuthorizationHeader } from './http_authorization_header';
 
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
index 97d1f0c9b9c00..78008de3ef359 100644
--- a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
+++ b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 export class HTTPAuthorizationHeader {
   /**
diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts
index 0ed18b1cf5b0a..b6c1eb4e12b0a 100644
--- a/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts
@@ -7,8 +7,8 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
index fdb58f52f9f2e..fb48a2ddcd0f6 100644
--- a/x-pack/plugins/security/server/authentication/providers/anonymous.ts
+++ b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { getErrorStatusCode } from '../../errors';
 import { AuthenticationResult } from '../authentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/base.mock.ts b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
index 6554b525fc9e0..2abe3cf6277a5 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.mock.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
@@ -9,7 +9,7 @@ import {
   elasticsearchServiceMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 export type MockAuthenticationProviderOptions = ReturnType<
   typeof mockAuthenticationProviderOptions
diff --git a/x-pack/plugins/security/server/authentication/providers/base.ts b/x-pack/plugins/security/server/authentication/providers/base.ts
index a6e5e19939c13..a344243ba97a7 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { deepFreeze } from '@kbn/std';
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   Headers,
   HttpServiceSetup,
   IClusterClient,
   KibanaRequest,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { deepFreeze } from '@kbn/std';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { AuthenticatedUser } from '../../../common/model';
 import type { AuthenticationInfo } from '../../elasticsearch';
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.test.ts b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
index 1a4998bf27cbf..3fbaa82f15cdc 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
@@ -7,8 +7,8 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.ts b/x-pack/plugins/security/server/authentication/providers/basic.ts
index d0a3a90cae908..02094d680fb07 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../../common/constants';
 import { AuthenticationResult } from '../authentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/http.test.ts b/x-pack/plugins/security/server/authentication/providers/http.test.ts
index c67ca0cb31160..6e257c7f6b7ab 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.test.ts
@@ -7,8 +7,8 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/http.ts b/x-pack/plugins/security/server/authentication/providers/http.ts
index 2d5b4c5e82772..958b125a75c17 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
index 91475a845d8b0..2db1d149962b1 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
@@ -8,8 +8,8 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest, ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { KibanaRequest, ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
index 5cb1b01dddf9a..9b793e886b74c 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { AuthenticationInfo } from '../../elasticsearch';
 import { getDetailedErrorMessage, getErrorStatusCode } from '../../errors';
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 c21327fe0674a..097491d61d4ca 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
@@ -8,8 +8,8 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { KibanaRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.ts b/x-pack/plugins/security/server/authentication/providers/oidc.ts
index cad10be6b4aa2..44aa56bd2a298 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import type from 'type-detect';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.test.ts b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
index 04d7013e496b7..b099ad87460de 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
@@ -14,8 +14,8 @@ import { Socket } from 'net';
 import type { PeerCertificate } from 'tls';
 import { TLSSocket } from 'tls';
 
-import type { KibanaRequest, ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { KibanaRequest, ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.ts b/x-pack/plugins/security/server/authentication/providers/pki.ts
index 1bb02671b97be..adba9efd3e81e 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import type { DetailedPeerCertificate } from 'tls';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { AuthenticationInfo } from '../../elasticsearch';
 import { AuthenticationResult } from '../authentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
index 046ae16c7e318..07cc8a9d1bb07 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index fc9704747cf95..0adb2fb565996 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/token.test.ts b/x-pack/plugins/security/server/authentication/providers/token.test.ts
index 989fc717d003d..30ca1c2561123 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.test.ts
@@ -8,8 +8,8 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/token.ts b/x-pack/plugins/security/server/authentication/providers/token.ts
index c66ab7e80332d..1bbf6605ff135 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../../common/constants';
 import type { AuthenticationInfo } from '../../elasticsearch';
diff --git a/x-pack/plugins/security/server/authentication/tokens.test.ts b/x-pack/plugins/security/server/authentication/tokens.test.ts
index e86b441826e54..a5ebc432454a7 100644
--- a/x-pack/plugins/security/server/authentication/tokens.test.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.test.ts
@@ -7,7 +7,7 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { securityMock } from '../mocks';
diff --git a/x-pack/plugins/security/server/authentication/tokens.ts b/x-pack/plugins/security/server/authentication/tokens.ts
index 2629807e8d3ab..55572087f4d3b 100644
--- a/x-pack/plugins/security/server/authentication/tokens.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import type { AuthenticationInfo } from '../elasticsearch';
 import { getDetailedErrorMessage, getErrorStatusCode } from '../errors';
diff --git a/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx b/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx
index 5cb6c899d7560..708ca11ca8f78 100644
--- a/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx
+++ b/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-import { coreMock } from '../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+
 import { UnauthenticatedPage } from './unauthenticated_page';
 
-jest.mock('src/core/server/rendering/views/fonts', () => ({
+jest.mock('@kbn/core/server/rendering/views/fonts', () => ({
   Fonts: () => <>MockedFonts</>,
 }));
 
diff --git a/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx b/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx
index 79aab20d5f33b..2fb8776fd27b2 100644
--- a/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx
+++ b/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx
@@ -10,9 +10,9 @@ import { EuiButton } from '@elastic/eui/lib/components/button';
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
+import type { IBasePath } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IBasePath } from 'src/core/server';
 
 import { PromptPage } from '../prompt_page';
 
diff --git a/x-pack/plugins/security/server/authorization/actions/ui.ts b/x-pack/plugins/security/server/authorization/actions/ui.ts
index 42513708def2a..c6ce36dd903a8 100644
--- a/x-pack/plugins/security/server/authorization/actions/ui.ts
+++ b/x-pack/plugins/security/server/authorization/actions/ui.ts
@@ -7,9 +7,8 @@
 
 import { isString } from 'lodash';
 
-import type { Capabilities as UICapabilities } from 'src/core/server';
-
-import { uiCapabilitiesRegex } from '../../../../features/server';
+import type { Capabilities as UICapabilities } from '@kbn/core/server';
+import { uiCapabilitiesRegex } from '@kbn/features-plugin/server';
 
 export class UIActions {
   private readonly prefix: string;
diff --git a/x-pack/plugins/security/server/authorization/api_authorization.test.ts b/x-pack/plugins/security/server/authorization/api_authorization.test.ts
index e34fc2cc2cdb2..762a9a617498a 100644
--- a/x-pack/plugins/security/server/authorization/api_authorization.test.ts
+++ b/x-pack/plugins/security/server/authorization/api_authorization.test.ts
@@ -10,7 +10,7 @@ import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { initAPIAuthorization } from './api_authorization';
 import { authorizationMock } from './index.mock';
diff --git a/x-pack/plugins/security/server/authorization/api_authorization.ts b/x-pack/plugins/security/server/authorization/api_authorization.ts
index dbf99bbfdf5f2..2c1bc6a5523f3 100644
--- a/x-pack/plugins/security/server/authorization/api_authorization.ts
+++ b/x-pack/plugins/security/server/authorization/api_authorization.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpServiceSetup, Logger } from 'src/core/server';
+import type { HttpServiceSetup, Logger } from '@kbn/core/server';
 
 import type { AuthorizationServiceSetup } from './authorization_service';
 
diff --git a/x-pack/plugins/security/server/authorization/app_authorization.test.ts b/x-pack/plugins/security/server/authorization/app_authorization.test.ts
index 0e4d902105efa..d745cf2f60769 100644
--- a/x-pack/plugins/security/server/authorization/app_authorization.test.ts
+++ b/x-pack/plugins/security/server/authorization/app_authorization.test.ts
@@ -10,10 +10,10 @@ import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import type { PluginSetupContract as FeaturesSetupContract } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 
-import type { PluginSetupContract as FeaturesSetupContract } from '../../../features/server';
-import { featuresPluginMock } from '../../../features/server/mocks';
 import { initAppAuthorization } from './app_authorization';
 import { authorizationMock } from './index.mock';
 
diff --git a/x-pack/plugins/security/server/authorization/app_authorization.ts b/x-pack/plugins/security/server/authorization/app_authorization.ts
index b57523581bc5c..0d6d1ef01d381 100644
--- a/x-pack/plugins/security/server/authorization/app_authorization.ts
+++ b/x-pack/plugins/security/server/authorization/app_authorization.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { HttpServiceSetup, Logger } from 'src/core/server';
+import type { HttpServiceSetup, Logger } from '@kbn/core/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../../features/server';
 import type { AuthorizationServiceSetup } from './authorization_service';
 
 class ProtectedApplications {
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.test.ts b/x-pack/plugins/security/server/authorization/authorization_service.test.ts
index 61ca8423fc626..65a8905c21b9a 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.test.ts
+++ b/x-pack/plugins/security/server/authorization/authorization_service.test.ts
@@ -7,8 +7,9 @@
 
 import { Subject } from 'rxjs';
 
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
 
 // Note: this import must be before other relative imports for the mocks to work as intended.
 // eslint-disable-next-line import/order
@@ -21,7 +22,6 @@ import {
   mockRegisterPrivilegesWithCluster,
 } from './service.test.mocks';
 
-import { featuresPluginMock } from '../../../features/server/mocks';
 import { licenseMock } from '../../common/licensing/index.mock';
 import type { OnlineStatusRetryScheduler } from '../elasticsearch';
 import { AuthorizationService } from './authorization_service';
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.tsx b/x-pack/plugins/security/server/authorization/authorization_service.tsx
index 96bb1c6289b4a..4fae3be180ddb 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.tsx
+++ b/x-pack/plugins/security/server/authorization/authorization_service.tsx
@@ -17,13 +17,13 @@ import type {
   KibanaRequest,
   Logger,
   LoggerFactory,
-} from 'src/core/server';
-import type { Capabilities as UICapabilities } from 'src/core/types';
-
+} from '@kbn/core/server';
+import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../../features/server';
+} from '@kbn/features-plugin/server';
+
 import { APPLICATION_PREFIX } from '../../common/constants';
 import type { SecurityLicense } from '../../common/licensing';
 import type { AuthenticatedUser } from '../../common/model';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
index 79ae84562cd8e..617c2fcd3a545 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
@@ -7,7 +7,7 @@
 
 import { uniq } from 'lodash';
 
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { GLOBAL_RESOURCE } from '../../common/constants';
 import { checkPrivilegesWithRequestFactory } from './check_privileges';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.ts b/x-pack/plugins/security/server/authorization/check_privileges.ts
index 0459d8ccde293..2b282f9dae676 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.ts
@@ -8,7 +8,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { pick, transform, uniq } from 'lodash';
 
-import type { IClusterClient, KibanaRequest } from 'src/core/server';
+import type { IClusterClient, KibanaRequest } from '@kbn/core/server';
 
 import { GLOBAL_RESOURCE } from '../../common/constants';
 import { ResourceSerializer } from './resource_serializer';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts
index 9fd14c6d29806..2d506a70610d3 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { checkPrivilegesDynamicallyWithRequestFactory } from './check_privileges_dynamically';
 import type { CheckPrivilegesOptions } from './types';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
index d4e335ba04058..b5ff420b420e9 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { SpacesService } from '../plugin';
 import type {
diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
index 8436295b74989..e2e988e7f5317 100644
--- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SpacesService } from '../plugin';
 import { checkSavedObjectsPrivilegesWithRequestFactory } from './check_saved_objects_privileges';
diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
index f640848c9b08e..ca14802903c6d 100644
--- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { ALL_SPACES_ID } from '../../common/constants';
 import type { SpacesService } from '../plugin';
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
index 15fb7ab39a044..dd07324835303 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { ElasticsearchFeature, KibanaFeature } from '@kbn/features-plugin/server';
 
-import { ElasticsearchFeature, KibanaFeature } from '../../../features/server';
 import type { AuthenticatedUser } from '../../common/model';
 import { Actions } from './actions';
 import { disableUICapabilitiesFactory } from './disable_ui_capabilities';
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
index 76f270f297820..161366cb7309c 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
@@ -7,15 +7,15 @@
 
 import { flatten, isObject, mapValues } from 'lodash';
 
-import type { RecursiveReadonly, RecursiveReadonlyArray } from '@kbn/utility-types';
-import type { KibanaRequest, Logger } from 'src/core/server';
-import type { Capabilities as UICapabilities } from 'src/core/types';
-
+import type { KibanaRequest, Logger } from '@kbn/core/server';
+import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import type {
   ElasticsearchFeature,
   FeatureElasticsearchPrivileges,
   KibanaFeature,
-} from '../../../features/server';
+} from '@kbn/features-plugin/server';
+import type { RecursiveReadonly, RecursiveReadonlyArray } from '@kbn/utility-types';
+
 import type { AuthenticatedUser } from '../../common/model';
 import type { AuthorizationServiceSetup } from './authorization_service';
 import type { CheckPrivilegesResponse } from './types';
diff --git a/x-pack/plugins/security/server/authorization/mode.test.ts b/x-pack/plugins/security/server/authorization/mode.test.ts
index f0f01d500fede..b0c73b1eda51d 100644
--- a/x-pack/plugins/security/server/authorization/mode.test.ts
+++ b/x-pack/plugins/security/server/authorization/mode.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityLicense } from '../../common/licensing';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/authorization/mode.ts b/x-pack/plugins/security/server/authorization/mode.ts
index c2f6fcb0ac5cd..d40d7fba3ca88 100644
--- a/x-pack/plugins/security/server/authorization/mode.ts
+++ b/x-pack/plugins/security/server/authorization/mode.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { SecurityLicense } from '../../common/licensing';
 
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts
index dc574251029e2..8596f80d09d46 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
-import { KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { Actions } from '../../actions';
 import { FeaturePrivilegeAlertingBuilder } from './alerting';
 
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts
index 800e8297d7fb1..c23a989951f52 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts
@@ -7,7 +7,8 @@
 
 import { get, uniq } from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 enum AlertingEntity {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
index 5fe6b55f1c709..ede2d0e964a37 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeApiBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
index f88d315fa1ef1..7d3caefd6e752 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeAppBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
index b7550a0717a28..2ac5ecd695a65 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
-import { KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { Actions } from '../../actions';
 import { FeaturePrivilegeCasesBuilder } from './cases';
 
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
index a5a3c76c30c77..86a4cffc7d1ea 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
@@ -7,7 +7,8 @@
 
 import { uniq } from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export type CasesSupportedOperations = typeof allOperations[number];
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
index 0cfc31975cc2f..15ee7cefd2ac2 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeCatalogueBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts
index b62e5094ba09b..90dc182b6e76c 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import type { Actions } from '../../actions';
 
 export interface FeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
index 795246eedb121..f6a80929dfd90 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
@@ -7,7 +7,8 @@
 
 import { flatten } from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import type { Actions } from '../../actions';
 import { FeaturePrivilegeAlertingBuilder } from './alerting';
 import { FeaturePrivilegeApiBuilder } from './api';
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
index dd6a916618492..72cc28f5570b5 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeManagementBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
index b1d9c06b4cef9..1d027bcbcdd10 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeNavlinkBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
index ea373b72aec24..330eebc1602b4 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
@@ -7,7 +7,8 @@
 
 import { flatten, uniq } from 'lodash';
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 const readOperations: string[] = [
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts
index e1d76d3d92022..a89b0912bd445 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeUIBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
index 9581db9410832..d9c82403a582a 100644
--- a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../../features/server';
-import { featuresPluginMock } from '../../../../features/server/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+
 import { licenseMock } from '../../../common/licensing/index.mock';
 import { Actions } from '../actions';
 import { privilegesFactory } from './privileges';
diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.ts
index 16a53411d9c3d..3684014fd5b1d 100644
--- a/x-pack/plugins/security/server/authorization/privileges/privileges.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/privileges.ts
@@ -10,7 +10,8 @@ import { uniq } from 'lodash';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   KibanaFeature,
-} from '../../../../features/server';
+} from '@kbn/features-plugin/server';
+
 import type { SecurityLicense } from '../../../common/licensing';
 import type { RawKibanaPrivileges } from '../../../common/model';
 import type { Actions } from '../actions';
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 17ed6b11630e3..4216500da2bd1 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
@@ -7,8 +7,8 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import type { Logger } from 'src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { Logger } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { RawKibanaPrivileges } from '../../common/model';
 import { registerPrivilegesWithCluster } from './register_privileges_with_cluster';
diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
index 2fcdc0b8dbcc9..b8fb5f83aadcf 100644
--- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
+++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
@@ -7,7 +7,7 @@
 
 import { difference, isEqual, isEqualWith } from 'lodash';
 
-import type { IClusterClient, Logger } from 'src/core/server';
+import type { IClusterClient, Logger } from '@kbn/core/server';
 
 import type { PrivilegesService } from './privileges';
 import { serializePrivileges } from './privileges_serializer';
diff --git a/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx b/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx
index d5e27c9d39ffd..d5bce1e146eb1 100644
--- a/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx
+++ b/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-import { coreMock } from '../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+
 import { ResetSessionPage } from './reset_session_page';
 
-jest.mock('src/core/server/rendering/views/fonts', () => ({
+jest.mock('@kbn/core/server/rendering/views/fonts', () => ({
   Fonts: () => <>MockedFonts</>,
 }));
 
diff --git a/x-pack/plugins/security/server/authorization/reset_session_page.tsx b/x-pack/plugins/security/server/authorization/reset_session_page.tsx
index 49555da9cd320..cd6f49eef755e 100644
--- a/x-pack/plugins/security/server/authorization/reset_session_page.tsx
+++ b/x-pack/plugins/security/server/authorization/reset_session_page.tsx
@@ -9,9 +9,9 @@
 import { EuiButton, EuiButtonEmpty } from '@elastic/eui/lib/components/button';
 import React from 'react';
 
+import type { IBasePath } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IBasePath } from 'src/core/server';
 
 import { PromptPage } from '../prompt_page';
 
diff --git a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts
index ba7f453aded75..bfb26bdef7c67 100644
--- a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts
+++ b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts
@@ -6,7 +6,8 @@
  */
 import { omit, pick } from 'lodash';
 
-import { KibanaFeature } from '../../../../features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { transformElasticsearchRoleToRole } from './elasticsearch_role';
 import type { ElasticsearchRole } from './elasticsearch_role';
 
diff --git a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
index ec1f6e026b143..8d7553507f85f 100644
--- a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
+++ b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../../features/common';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
+
 import {
   GLOBAL_RESOURCE,
   RESERVED_PRIVILEGES_APPLICATION_WILDCARD,
diff --git a/x-pack/plugins/security/server/authorization/types.ts b/x-pack/plugins/security/server/authorization/types.ts
index aee059fb8becb..d7f0f70b229c6 100644
--- a/x-pack/plugins/security/server/authorization/types.ts
+++ b/x-pack/plugins/security/server/authorization/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 export interface HasPrivilegesResponseApplication {
   [resource: string]: {
diff --git a/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts b/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
index d17fce5d26552..b92a9e1f4b2e8 100644
--- a/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { validateFeaturePrivileges } from './validate_feature_privileges';
 
 it('allows features to be defined without privileges', () => {
diff --git a/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts b/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
index 8bb53b076d46c..5693cb1bb5108 100644
--- a/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../features/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 
 export function validateFeaturePrivileges(features: KibanaFeature[]) {
   for (const feature of features) {
diff --git a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts
index 41746b4827c96..06051ecbbfcb5 100644
--- a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { validateReservedPrivileges } from './validate_reserved_privileges';
 
 it('allows features to be defined without privileges', () => {
diff --git a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts
index 7dd6ec21bdf30..bbd58e19753ab 100644
--- a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../features/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 
 export function validateReservedPrivileges(features: KibanaFeature[]) {
   const seenPrivilegeIds = new Set<string>();
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 9ebdcb5e4d05f..17fddf3c0ace9 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -14,7 +14,7 @@ jest.mock('@kbn/utils', () => ({
   getLogsPath: () => '/mock/kibana/logs/path',
 }));
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { ConfigSchema, createConfig } from './config';
 
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index f993707bd8d9e..8d31e8ec95bfd 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -11,11 +11,11 @@ import path from 'path';
 
 import type { Type, TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
+import type { AppenderConfigType, Logger } from '@kbn/core/server';
+import { config as coreConfig } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { getLogsPath } from '@kbn/utils';
-import type { AppenderConfigType, Logger } from 'src/core/server';
 
-import { config as coreConfig } from '../../../../src/core/server';
 import type { AuthenticationProvider } from '../common/model';
 
 export type ConfigType = ReturnType<typeof createConfig>;
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
index 150e878f4297f..5bd4bf0fa3f52 100644
--- a/x-pack/plugins/security/server/config_deprecations.test.ts
+++ b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -8,8 +8,8 @@
 import { cloneDeep } from 'lodash';
 
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
-import { configDeprecationsMock } from '../../../../src/core/server/mocks';
 import { securityConfigDeprecationProvider } from './config_deprecations';
 
 const deprecationContext = configDeprecationsMock.createContext();
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index 8b778950036b5..b4625c521e036 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ConfigDeprecationProvider } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { ConfigDeprecationProvider } from 'src/core/server';
 
 export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   rename,
diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts
index 6f9a8e8763528..338e278e50768 100644
--- a/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts
+++ b/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts
@@ -8,13 +8,13 @@
 import { errors } from '@elastic/elasticsearch';
 import type { SecurityRoleMapping, SecurityUser } from '@elastic/elasticsearch/lib/api/types';
 
-import type { PackageInfo, RegisterDeprecationsConfig } from 'src/core/server';
+import type { PackageInfo, RegisterDeprecationsConfig } from '@kbn/core/server';
 import {
   deprecationsServiceMock,
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { licenseMock } from '../../common/licensing/index.mock';
 import { securityMock } from '../mocks';
diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
index 12961f223c243..f6c3cc4113ed7 100644
--- a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
+++ b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
@@ -10,14 +10,14 @@ import type {
   SecurityGetUserResponse,
 } from '@elastic/elasticsearch/lib/api/types';
 
-import { i18n } from '@kbn/i18n';
 import type {
   DeprecationsDetails,
   DeprecationsServiceSetup,
   ElasticsearchClient,
   Logger,
   PackageInfo,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { i18n } from '@kbn/i18n';
 
 import type { SecurityLicense } from '../../common';
 import { getDetailedErrorMessage, getErrorStatusCode } from '../errors';
diff --git a/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts b/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
index cf0ab329b7686..a3836c4773595 100644
--- a/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
+++ b/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { GetDeprecationsContext } from 'src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { GetDeprecationsContext } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { getPrivilegeDeprecationsService } from '.';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts b/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts
index 05a81936bfdff..e735f01ed6c8c 100644
--- a/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts
+++ b/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { Logger } from '@kbn/core/server';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'src/core/server';
 
-import type { KibanaFeature } from '../../../features/common';
 import type { SecurityLicense } from '../../common/licensing';
 import type {
   PrivilegeDeprecationsRolesByFeatureIdRequest,
diff --git a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts
index 0cbf04aac4f58..219158bdda472 100644
--- a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts
+++ b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts
@@ -7,10 +7,10 @@
 
 import { BehaviorSubject } from 'rxjs';
 
+import type { CoreStatus } from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import type { CoreStatus } from 'src/core/server';
-import { ServiceStatusLevels } from 'src/core/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../common/licensing';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
index 873ed32d4b8a2..88fe5caf2cac3 100644
--- a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
+++ b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
@@ -9,9 +9,9 @@ import type { Observable } from 'rxjs';
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { distinctUntilChanged, filter, map, shareReplay, tap } from 'rxjs/operators';
 
-import type { Logger, StatusServiceSetup } from 'src/core/server';
+import type { Logger, StatusServiceSetup } from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 
-import { ServiceStatusLevels } from '../../../../../src/core/server';
 import type { SecurityLicense } from '../../common/licensing';
 
 export interface ElasticsearchServiceSetupParams {
diff --git a/x-pack/plugins/security/server/errors.ts b/x-pack/plugins/security/server/errors.ts
index 2f2573b171ae2..5de4af5fe6709 100644
--- a/x-pack/plugins/security/server/errors.ts
+++ b/x-pack/plugins/security/server/errors.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { CustomHttpResponseOptions, ResponseError } from 'src/core/server';
+import type { CustomHttpResponseOptions, ResponseError } from '@kbn/core/server';
 
 export function wrapError(error: any) {
   return Boom.boomify(error, { statusCode: getErrorStatusCode(error) });
diff --git a/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts b/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts
index d8385867e93d6..575a120546810 100644
--- a/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts
+++ b/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
-import type { FeatureUsageServiceSetup, FeatureUsageServiceStart } from '../../../licensing/server';
+import type {
+  FeatureUsageServiceSetup,
+  FeatureUsageServiceStart,
+} from '@kbn/licensing-plugin/server';
 
 interface SetupDeps {
   featureUsage: FeatureUsageServiceSetup;
diff --git a/x-pack/plugins/security/server/features/security_features.ts b/x-pack/plugins/security/server/features/security_features.ts
index 4477ca2409faa..b741d8091518d 100644
--- a/x-pack/plugins/security/server/features/security_features.ts
+++ b/x-pack/plugins/security/server/features/security_features.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchFeatureConfig } from '../../../features/server';
+import type { ElasticsearchFeatureConfig } from '@kbn/features-plugin/server';
 
 const userManagementFeature: ElasticsearchFeatureConfig = {
   id: 'users',
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index bc23a094634ff..f05cc66c882c3 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -6,12 +6,12 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { RecursiveReadonly } from '@kbn/utility-types';
 import type {
   PluginConfigDescriptor,
   PluginInitializer,
   PluginInitializerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { RecursiveReadonly } from '@kbn/utility-types';
 
 import { ConfigSchema } from './config';
 import { securityConfigDeprecationProvider } from './config_deprecations';
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 3fe5d9592efa9..c1fddb1751189 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -8,11 +8,11 @@
 import { of } from 'rxjs';
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 
-import { featuresPluginMock } from '../../features/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
 import { ConfigSchema } from './config';
 import type { PluginSetupDependencies, PluginStartDependencies } from './plugin';
 import { SecurityPlugin } from './plugin';
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index b02f852551948..6e3b67b3eedba 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -16,16 +16,19 @@ import type {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-
+} from '@kbn/core/server';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../features/server';
-import type { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
-import type { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
-import type { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/features-plugin/server';
+import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import type { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import type {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+
 import type { AuthenticatedUser, PrivilegeDeprecationsService, SecurityLicense } from '../common';
 import { SecurityLicenseService } from '../common/licensing';
 import type { AnonymousAccessServiceStart } from './anonymous_access';
diff --git a/x-pack/plugins/security/server/prompt_page.test.tsx b/x-pack/plugins/security/server/prompt_page.test.tsx
index 01c4488576f57..11b45f62f05d6 100644
--- a/x-pack/plugins/security/server/prompt_page.test.tsx
+++ b/x-pack/plugins/security/server/prompt_page.test.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+
 import { PromptPage } from './prompt_page';
 
-jest.mock('src/core/server/rendering/views/fonts', () => ({
+jest.mock('@kbn/core/server/rendering/views/fonts', () => ({
   Fonts: () => <>MockedFonts</>,
 }));
 
diff --git a/x-pack/plugins/security/server/prompt_page.tsx b/x-pack/plugins/security/server/prompt_page.tsx
index a803b39bd2463..ad53013156463 100644
--- a/x-pack/plugins/security/server/prompt_page.tsx
+++ b/x-pack/plugins/security/server/prompt_page.tsx
@@ -13,14 +13,13 @@ import { appendIconComponentCache } from '@elastic/eui/lib/components/icon/icon'
 import type { ReactNode } from 'react';
 import React from 'react';
 
+import type { IBasePath } from '@kbn/core/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Fonts } from '@kbn/core/server/rendering/views/fonts';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import UiSharedDepsNpm from '@kbn/ui-shared-deps-npm';
 import * as UiSharedDepsSrc from '@kbn/ui-shared-deps-src';
-import type { IBasePath } from 'src/core/server';
-
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Fonts } from '../../../../src/core/server/rendering/views/fonts';
 
 // Preload the alert icon used by `EuiEmptyPrompt` to ensure that it's loaded
 // in advance the first time this page is rendered server-side. If not, the
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts
index d840351ea7dc6..3a794c9ac5f36 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock';
 import { defineAnonymousAccessGetCapabilitiesRoutes } from './get_capabilities';
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts
index 2a2f495cf062f..220fb1515df46 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines route that returns capabilities of the anonymous service account.
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts
index 80dbf5cada9ee..85cc04cf63e70 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { AnonymousAccessServiceStart } from '../../anonymous_access';
 import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock';
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts
index f817ade1a10fd..28745c80a5f44 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import type { AnonymousAccessState } from '@kbn/share-plugin/common';
+
 import type { RouteDefinitionParams } from '..';
-import type { AnonymousAccessState } from '../../../../../../src/plugins/share/common';
 
 /**
  * Defines route that returns the state of anonymous access -- whether anonymous access is enabled, and what additional parameters should be
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/index.ts b/x-pack/plugins/security/server/routes/anonymous_access/index.ts
index 53ed33e8741db..c634d721c3354 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/index.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineAnonymousAccessGetCapabilitiesRoutes } from './get_capabilities';
 import { defineAnonymousAccessGetStateRoutes } from './get_state';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/create.test.ts b/x-pack/plugins/security/server/routes/api_keys/create.test.ts
index 67c0571b2b075..dbf4c93639e47 100644
--- a/x-pack/plugins/security/server/routes/api_keys/create.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/create.test.ts
@@ -7,14 +7,13 @@
 
 import Boom from '@hapi/boom';
 
+import type { RequestHandler } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { InternalAuthenticationServiceStart } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
-import type { SecurityRequestHandlerContext } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineCreateApiKeyRoutes } from './create';
 
@@ -22,9 +21,9 @@ describe('Create API Key route', () => {
   function getMockContext(
     licenseCheckResult: { state: string; message?: string } = { state: 'valid' }
   ) {
-    return {
+    return coreMock.createCustomRequestHandlerContext({
       licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } },
-    } as unknown as SecurityRequestHandlerContext;
+    });
   }
 
   let routeHandler: RequestHandler<any, any, any, any>;
@@ -53,7 +52,7 @@ describe('Create API Key route', () => {
 
       expect(response.status).toBe(403);
       expect(response.payload).toEqual({ message: 'test forbidden message' });
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect((await mockContext.licensing).license.check).toHaveBeenCalledWith('security', 'basic');
     });
 
     test('returns error from cluster client', async () => {
diff --git a/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts b/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts
index b46cdb80c966f..7beef71256c46 100644
--- a/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts
@@ -7,14 +7,13 @@
 
 import Boom from '@hapi/boom';
 
+import type { RequestHandler } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { InternalAuthenticationServiceStart } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
-import type { SecurityRequestHandlerContext } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineEnabledApiKeysRoutes } from './enabled';
 
@@ -22,9 +21,9 @@ describe('API keys enabled', () => {
   function getMockContext(
     licenseCheckResult: { state: string; message?: string } = { state: 'valid' }
   ) {
-    return {
+    return coreMock.createCustomRequestHandlerContext({
       licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } },
-    } as unknown as SecurityRequestHandlerContext;
+    });
   }
 
   let routeHandler: RequestHandler<any, any, any, any>;
@@ -53,7 +52,7 @@ describe('API keys enabled', () => {
 
       expect(response.status).toBe(403);
       expect(response.payload).toEqual({ message: 'test forbidden message' });
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect((await mockContext.licensing).license.check).toHaveBeenCalledWith('security', 'basic');
     });
 
     test('returns error from cluster client', async () => {
diff --git a/x-pack/plugins/security/server/routes/api_keys/enabled.ts b/x-pack/plugins/security/server/routes/api_keys/enabled.ts
index e788f3e6ff950..c94c8af61e24f 100644
--- a/x-pack/plugins/security/server/routes/api_keys/enabled.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/enabled.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/get.test.ts b/x-pack/plugins/security/server/routes/api_keys/get.test.ts
index cba705eccfcae..c34a67ff1bfcb 100644
--- a/x-pack/plugins/security/server/routes/api_keys/get.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/get.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineGetApiKeysRoutes } from './get';
 
@@ -28,13 +28,17 @@ describe('Get API keys', () => {
   ) => {
     test(description, async () => {
       const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
       };
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext as any,
+      });
 
       if (apiResponse) {
-        mockContext.core.elasticsearch.client.asCurrentUser.security.getApiKey.mockResponse(
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.getApiKey.mockResponse(
           // @ts-expect-error unknown type
           apiResponse()
         );
@@ -57,10 +61,10 @@ describe('Get API keys', () => {
 
       if (apiResponse) {
         expect(
-          mockContext.core.elasticsearch.client.asCurrentUser.security.getApiKey
+          mockCoreContext.elasticsearch.client.asCurrentUser.security.getApiKey
         ).toHaveBeenCalledWith({ owner: !isAdmin });
       }
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/get.ts b/x-pack/plugins/security/server/routes/api_keys/get.ts
index 1b06dd00fc384..db0d02a20c687 100644
--- a/x-pack/plugins/security/server/routes/api_keys/get.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/get.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
@@ -29,10 +29,10 @@ export function defineGetApiKeysRoutes({ router }: RouteDefinitionParams) {
     createLicensedRouteHandler(async (context, request, response) => {
       try {
         const isAdmin = request.query.isAdmin === 'true';
-        const apiResponse =
-          await context.core.elasticsearch.client.asCurrentUser.security.getApiKey({
-            owner: !isAdmin,
-          });
+        const esClient = (await context.core).elasticsearch.client;
+        const apiResponse = await esClient.asCurrentUser.security.getApiKey({
+          owner: !isAdmin,
+        });
 
         const validKeys = apiResponse.api_keys.filter(({ invalidated }) => !invalidated);
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/index.ts b/x-pack/plugins/security/server/routes/api_keys/index.ts
index aa1e3b858ea58..ba97b451d6452 100644
--- a/x-pack/plugins/security/server/routes/api_keys/index.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineCreateApiKeyRoutes } from './create';
 import { defineEnabledApiKeysRoutes } from './enabled';
 import { defineGetApiKeysRoutes } from './get';
diff --git a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts
index 7ec7eabf32c25..c6f4594e8fb3c 100644
--- a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts
@@ -8,10 +8,10 @@
 import Boom from '@hapi/boom';
 
 import type { Type } from '@kbn/config-schema';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineInvalidateApiKeysRoutes } from './invalidate';
 
@@ -29,13 +29,17 @@ describe('Invalidate API keys', () => {
   ) => {
     test(description, async () => {
       const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-      };
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
       for (const apiResponse of apiResponses) {
-        mockContext.core.elasticsearch.client.asCurrentUser.security.invalidateApiKey.mockImplementationOnce(
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.invalidateApiKey.mockImplementationOnce(
           (async () => ({ body: await apiResponse() })) as any
         );
       }
@@ -58,11 +62,11 @@ describe('Invalidate API keys', () => {
       if (Array.isArray(asserts.apiArguments)) {
         for (const apiArguments of asserts.apiArguments) {
           expect(
-            mockContext.core.elasticsearch.client.asCurrentUser.security.invalidateApiKey
+            mockCoreContext.elasticsearch.client.asCurrentUser.security.invalidateApiKey
           ).toHaveBeenCalledWith(apiArguments);
         }
       }
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/invalidate.ts b/x-pack/plugins/security/server/routes/api_keys/invalidate.ts
index fe4884250e83d..58f25bbf80b4f 100644
--- a/x-pack/plugins/security/server/routes/api_keys/invalidate.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/invalidate.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import type { ApiKey } from '../../../common/model';
 import { wrapError, wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
@@ -35,13 +35,14 @@ export function defineInvalidateApiKeysRoutes({ router }: RouteDefinitionParams)
           await Promise.all(
             request.body.apiKeys.map(async (key) => {
               try {
+                const esClient = (await context.core).elasticsearch.client;
                 const body: { ids: string[]; owner?: boolean } = { ids: [key.id] };
                 if (!request.body.isAdmin) {
                   body.owner = true;
                 }
 
                 // Send the request to invalidate the API key and return an error if it could not be deleted.
-                await context.core.elasticsearch.client.asCurrentUser.security.invalidateApiKey({
+                await esClient.asCurrentUser.security.invalidateApiKey({
                   body,
                 });
                 return { key, error: undefined };
diff --git a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts
index dc8b7f4d9fc1e..52d1d59a486da 100644
--- a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineCheckPrivilegesRoutes } from './privileges';
@@ -34,17 +34,21 @@ describe('Check API keys privileges', () => {
   ) => {
     test(description, async () => {
       const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-      };
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
       const authc = authenticationServiceMock.createStart();
       authc.apiKeys.areAPIKeysEnabled.mockResolvedValue(areAPIKeysEnabled);
       mockRouteDefinitionParams.getAuthenticationService.mockReturnValue(authc);
 
       if (apiResponse) {
-        mockContext.core.elasticsearch.client.asCurrentUser.security.hasPrivileges.mockResponseImplementation(
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.hasPrivileges.mockResponseImplementation(
           // @ts-expect-error unknown return
           () => {
             return {
@@ -70,11 +74,11 @@ describe('Check API keys privileges', () => {
 
       if (asserts.apiArguments) {
         expect(
-          mockContext.core.elasticsearch.client.asCurrentUser.security.hasPrivileges
+          mockCoreContext.elasticsearch.client.asCurrentUser.security.hasPrivileges
         ).toHaveBeenCalledWith(asserts.apiArguments);
       }
 
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/privileges.ts b/x-pack/plugins/security/server/routes/api_keys/privileges.ts
index ffd7e9e805754..09210e1d00d37 100644
--- a/x-pack/plugins/security/server/routes/api_keys/privileges.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
@@ -20,6 +20,7 @@ export function defineCheckPrivilegesRoutes({
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
+        const esClient = (await context.core).elasticsearch.client;
         const [
           {
             cluster: {
@@ -30,7 +31,7 @@ export function defineCheckPrivilegesRoutes({
           },
           areApiKeysEnabled,
         ] = await Promise.all([
-          context.core.elasticsearch.client.asCurrentUser.security.hasPrivileges({
+          esClient.asCurrentUser.security.hasPrivileges({
             body: { cluster: ['manage_security', 'manage_api_key', 'manage_own_api_key'] },
           }),
           getAuthenticationService().apiKeys.areAPIKeysEnabled(),
diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts
index 6a318c953bcf5..6903cc23b02f5 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { Type } from '@kbn/config-schema';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
diff --git a/x-pack/plugins/security/server/routes/authentication/common.ts b/x-pack/plugins/security/server/routes/authentication/common.ts
index b16aac9743676..696c3f625425d 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.ts
@@ -8,7 +8,7 @@
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { parseNext } from '../../../common/parse_next';
 import {
   BasicAuthenticationProvider,
diff --git a/x-pack/plugins/security/server/routes/authentication/index.test.ts b/x-pack/plugins/security/server/routes/authentication/index.test.ts
index d1648797d45bf..b077e6155cf62 100644
--- a/x-pack/plugins/security/server/routes/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { defineAuthenticationRoutes } from '.';
 import { routeDefinitionParamsMock } from '../index.mock';
-import { defineAuthenticationRoutes } from './';
 
 describe('Authentication routes', () => {
   it('does not register any SAML related routes if SAML auth provider is not enabled', () => {
diff --git a/x-pack/plugins/security/server/routes/authentication/index.ts b/x-pack/plugins/security/server/routes/authentication/index.ts
index 3b879eadf240b..e7051f9ad67bd 100644
--- a/x-pack/plugins/security/server/routes/authentication/index.ts
+++ b/x-pack/plugins/security/server/routes/authentication/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineCommonRoutes } from './common';
 import { defineOIDCRoutes } from './oidc';
 import { defineSAMLRoutes } from './saml';
diff --git a/x-pack/plugins/security/server/routes/authentication/oidc.ts b/x-pack/plugins/security/server/routes/authentication/oidc.ts
index 0216001449d36..2c4ab9de1491b 100644
--- a/x-pack/plugins/security/server/routes/authentication/oidc.ts
+++ b/x-pack/plugins/security/server/routes/authentication/oidc.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import type { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { KibanaRequest, KibanaResponseFactory } from 'src/core/server';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { OIDCAuthenticationProvider, OIDCLogin } from '../../authentication';
 import type { ProviderLoginAttempt } from '../../authentication/providers/oidc';
 import { wrapIntoCustomErrorResponse } from '../../errors';
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.test.ts b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
index 2ed6727492768..a38b53933132e 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { Type } from '@kbn/config-schema';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import type { InternalAuthenticationServiceStart } from '../../authentication';
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.ts b/x-pack/plugins/security/server/routes/authentication/saml.ts
index 11baa10c342e1..c1fa0cfc8e4ef 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { SAMLAuthenticationProvider, SAMLLogin } from '../../authentication';
 import { ROUTE_TAG_AUTH_FLOW, ROUTE_TAG_CAN_REDIRECT } from '../tags';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/index.ts b/x-pack/plugins/security/server/routes/authorization/index.ts
index 1fecd45f795a3..c2d2b3cdf8eaf 100644
--- a/x-pack/plugins/security/server/routes/authorization/index.ts
+++ b/x-pack/plugins/security/server/routes/authorization/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { definePrivilegesRoutes } from './privileges';
 import { resetSessionPageRoutes } from './reset_session_page';
 import { defineRolesRoutes } from './roles';
diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts
index 2bf3eea2ebda5..fca0a0e4388f4 100644
--- a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import type { RawKibanaPrivileges } from '../../../../common/model';
 import type { SecurityRequestHandlerContext } from '../../../types';
 import { routeDefinitionParamsMock } from '../../index.mock';
@@ -66,15 +66,18 @@ describe('GET privileges', () => {
         query: includeActions ? { includeActions: 'true' } : undefined,
         headers,
       });
-      const mockContext = {
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } },
-      } as unknown as SecurityRequestHandlerContext;
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+      };
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        licensing: mockLicensingContext,
+      }) as unknown as SecurityRequestHandlerContext;
 
       const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
       expect(response.status).toBe(asserts.statusCode);
       expect(response.payload).toEqual(asserts.result);
 
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts b/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts
index 40b67aa08b073..e51e8e1d5ae51 100644
--- a/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts
+++ b/x-pack/plugins/security/server/routes/authorization/privileges/get_builtin.ts
@@ -11,8 +11,8 @@ export function defineGetBuiltinPrivilegesRoutes({ router }: RouteDefinitionPara
   router.get(
     { path: '/internal/security/esPrivileges/builtin', validate: false },
     async (context, request, response) => {
-      const privileges =
-        await context.core.elasticsearch.client.asCurrentUser.security.getBuiltinPrivileges();
+      const esClient = (await context.core).elasticsearch.client;
+      const privileges = await esClient.asCurrentUser.security.getBuiltinPrivileges();
 
       // Exclude the `none` privilege, as it doesn't make sense as an option within the Kibana UI
       privileges.cluster = privileges.cluster.filter((privilege) => privilege !== 'none');
diff --git a/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts b/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts
index 05fe1a7d01175..67254735b9a16 100644
--- a/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts
+++ b/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 export function resetSessionPageRoutes({ httpResources }: RouteDefinitionParams) {
   httpResources.register(
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts
index e2ecd92b9a942..dfe2af12a23e4 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../../index.mock';
 import { defineDeleteRolesRoutes } from './delete';
 
@@ -28,13 +28,17 @@ describe('DELETE role', () => {
   ) => {
     test(description, async () => {
       const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-      };
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
       if (apiResponse) {
-        mockContext.core.elasticsearch.client.asCurrentUser.security.deleteRole.mockImplementation(
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.deleteRole.mockImplementation(
           (async () => ({ body: await apiResponse() })) as any
         );
       }
@@ -56,10 +60,10 @@ describe('DELETE role', () => {
 
       if (apiResponse) {
         expect(
-          mockContext.core.elasticsearch.client.asCurrentUser.security.deleteRole
+          mockCoreContext.elasticsearch.client.asCurrentUser.security.deleteRole
         ).toHaveBeenCalledWith({ name });
       }
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
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 aa2fc0e417e4d..b484fd0151841 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '../..';
 import { wrapIntoCustomErrorResponse } from '../../../errors';
-import type { RouteDefinitionParams } from '../../index';
 import { createLicensedRouteHandler } from '../../licensed_route_handler';
 
 export function defineDeleteRolesRoutes({ router }: RouteDefinitionParams) {
@@ -21,7 +21,8 @@ export function defineDeleteRolesRoutes({ router }: RouteDefinitionParams) {
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        await context.core.elasticsearch.client.asCurrentUser.security.deleteRole({
+        const esClient = (await context.core).elasticsearch.client;
+        await esClient.asCurrentUser.security.deleteRole({
           name: request.params.name,
         });
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts
index 1311897f5a564..90457c71b90a7 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../../index.mock';
 import { defineGetRolesRoutes } from './get';
 
@@ -34,13 +34,17 @@ describe('GET role', () => {
       mockRouteDefinitionParams.authz.applicationName = application;
       mockRouteDefinitionParams.getFeatures = jest.fn().mockResolvedValue([]);
 
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-      };
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
       if (apiResponse) {
-        mockContext.core.elasticsearch.client.asCurrentUser.security.getRole.mockResponseImplementation(
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.getRole.mockResponseImplementation(
           (() => ({ body: apiResponse() })) as any
         );
       }
@@ -62,11 +66,11 @@ describe('GET role', () => {
 
       if (apiResponse) {
         expect(
-          mockContext.core.elasticsearch.client.asCurrentUser.security.getRole
+          mockCoreContext.elasticsearch.client.asCurrentUser.security.getRole
         ).toHaveBeenCalledWith({ name });
       }
 
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
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 125966d887e04..9ae385b1ab3fb 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get.ts
@@ -22,9 +22,10 @@ export function defineGetRolesRoutes({ router, authz, getFeatures }: RouteDefini
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
+        const esClient = (await context.core).elasticsearch.client;
         const [features, elasticsearchRoles] = await Promise.all([
           getFeatures(),
-          await context.core.elasticsearch.client.asCurrentUser.security.getRole({
+          await esClient.asCurrentUser.security.getRole({
             name: request.params.name,
           }),
         ]);
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts
index 39ea6fd715a8b..a7833f803afa1 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../../index.mock';
 import { defineGetAllRolesRoutes } from './get_all';
 
@@ -34,13 +34,17 @@ describe('GET all roles', () => {
       mockRouteDefinitionParams.authz.applicationName = application;
       mockRouteDefinitionParams.getFeatures = jest.fn().mockResolvedValue([]);
 
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-      };
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
       if (apiResponse) {
-        mockContext.core.elasticsearch.client.asCurrentUser.security.getRole.mockResponseImplementation(
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.getRole.mockResponseImplementation(
           (() => ({ body: apiResponse() })) as any
         );
       }
@@ -61,10 +65,10 @@ describe('GET all roles', () => {
 
       if (apiResponse) {
         expect(
-          mockContext.core.elasticsearch.client.asCurrentUser.security.getRole
+          mockCoreContext.elasticsearch.client.asCurrentUser.security.getRole
         ).toHaveBeenCalled();
       }
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get_all.ts b/x-pack/plugins/security/server/routes/authorization/roles/get_all.ts
index f34b6a0893660..20f967db598f3 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get_all.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get_all.ts
@@ -15,9 +15,10 @@ export function defineGetAllRolesRoutes({ router, authz, getFeatures }: RouteDef
     { path: '/api/security/role', validate: false },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
+        const esClient = (await context.core).elasticsearch.client;
         const [features, elasticsearchRoles] = await Promise.all([
           getFeatures(),
-          await context.core.elasticsearch.client.asCurrentUser.security.getRole(),
+          await esClient.asCurrentUser.security.getRole(),
         ]);
 
         // Transform elasticsearch roles into Kibana roles and return in a list sorted by the role name.
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
index 377729dc5b095..7600c99a1caf7 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../../../../features/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+
 import { ALL_SPACES_ID } from '../../../../../common/constants';
 import { getPutPayloadSchema, validateKibanaPrivileges } from './put_payload';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
index 015891b7d7ffa..62e4a499e2e1c 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
@@ -9,9 +9,9 @@ import _ from 'lodash';
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 
 import type { ElasticsearchRole } from '.';
-import type { KibanaFeature } from '../../../../../../features/common';
 import { ALL_SPACES_ID, GLOBAL_RESOURCE } from '../../../../../common/constants';
 import { PrivilegeSerializer } from '../../../../authorization/privilege_serializer';
 import { ResourceSerializer } from '../../../../authorization/resource_serializer';
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
index fac13a655892a..9abef4a5e85c5 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
@@ -6,11 +6,11 @@
  */
 
 import type { Type } from '@kbn/config-schema';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import { KibanaFeature } from '../../../../../features/server';
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { GLOBAL_RESOURCE } from '../../../../common/constants';
 import { securityFeatureUsageServiceMock } from '../../../feature_usage/index.mock';
 import { routeDefinitionParamsMock } from '../../index.mock';
@@ -75,19 +75,23 @@ const putRoleTest = (
     mockRouteDefinitionParams.authz.applicationName = application;
     mockRouteDefinitionParams.authz.privileges.get.mockReturnValue(privilegeMap);
 
-    const mockContext = {
-      core: coreMock.createRequestHandlerContext(),
-      licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-    };
+    const mockCoreContext = coreMock.createRequestHandlerContext();
+    const mockLicensingContext = {
+      license: { check: jest.fn().mockReturnValue(licenseCheckResult) },
+    } as any;
+    const mockContext = coreMock.createCustomRequestHandlerContext({
+      core: mockCoreContext,
+      licensing: mockLicensingContext,
+    });
 
     if (apiResponses?.get) {
-      mockContext.core.elasticsearch.client.asCurrentUser.security.getRole.mockResponseImplementationOnce(
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.getRole.mockResponseImplementationOnce(
         (() => ({ body: apiResponses?.get() })) as any
       );
     }
 
     if (apiResponses?.put) {
-      mockContext.core.elasticsearch.client.asCurrentUser.security.putRole.mockResponseImplementationOnce(
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.putRole.mockResponseImplementationOnce(
         (() => ({ body: apiResponses?.put() })) as any
       );
     }
@@ -154,15 +158,15 @@ const putRoleTest = (
 
     if (asserts.apiArguments?.get) {
       expect(
-        mockContext.core.elasticsearch.client.asCurrentUser.security.getRole
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.getRole
       ).toHaveBeenCalledWith(...asserts.apiArguments?.get);
     }
     if (asserts.apiArguments?.put) {
       expect(
-        mockContext.core.elasticsearch.client.asCurrentUser.security.putRole
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.putRole
       ).toHaveBeenCalledWith(...asserts.apiArguments?.put);
     }
-    expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+    expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
 
     if (asserts.recordSubFeaturePrivilegeUsage) {
       expect(
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
index 06e731dc2d543..03fbdf30dc767 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
@@ -7,10 +7,10 @@
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 
-import type { KibanaFeature } from '../../../../../features/common';
+import type { RouteDefinitionParams } from '../..';
 import { wrapIntoCustomErrorResponse } from '../../../errors';
-import type { RouteDefinitionParams } from '../../index';
 import { createLicensedRouteHandler } from '../../licensed_route_handler';
 import {
   getPutPayloadSchema,
@@ -66,12 +66,10 @@ export function definePutRolesRoutes({
       const { name } = request.params;
 
       try {
+        const esClient = (await context.core).elasticsearch.client;
         const [features, rawRoles] = await Promise.all([
           getFeatures(),
-          context.core.elasticsearch.client.asCurrentUser.security.getRole(
-            { name: request.params.name },
-            { ignore: [404] }
-          ),
+          esClient.asCurrentUser.security.getRole({ name: request.params.name }, { ignore: [404] }),
         ]);
 
         const { validationErrors } = validateKibanaPrivileges(features, request.body.kibana);
@@ -91,7 +89,7 @@ export function definePutRolesRoutes({
           rawRoles[name] ? rawRoles[name].applications : []
         );
 
-        await context.core.elasticsearch.client.asCurrentUser.security.putRole({
+        await esClient.asCurrentUser.security.putRole({
           name: request.params.name,
           // @ts-expect-error RoleIndexPrivilege is not compatible. grant is required in IndicesPrivileges.field_security
           body,
diff --git a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
index 43865a0a6b66b..e8ab87a504458 100644
--- a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { RouteDefinitionParams } from '../..';
 import type { CheckPrivileges } from '../../../authorization/types';
diff --git a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts
index 07e4ac087f591..574be3ce37a01 100644
--- a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts
+++ b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '../..';
 import { wrapIntoCustomErrorResponse } from '../../../errors';
-import type { RouteDefinitionParams } from '../../index';
 import { createLicensedRouteHandler } from '../../licensed_route_handler';
 
 export function defineShareSavedObjectPermissionRoutes({ router, authz }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/deprecations/index.ts b/x-pack/plugins/security/server/routes/deprecations/index.ts
index cbc186ed2e925..46c681052efb0 100644
--- a/x-pack/plugins/security/server/routes/deprecations/index.ts
+++ b/x-pack/plugins/security/server/routes/deprecations/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineKibanaUserRoleDeprecationRoutes } from './kibana_user_role';
 
 export function defineDeprecationsRoutes(params: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts
index 8b8a10e917f1a..9dc0c34ef8818 100644
--- a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts
+++ b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts
@@ -8,10 +8,10 @@
 import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
 
 import { securityMock } from '../../mocks';
 import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
diff --git a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
index bb07ece2c75b9..036d1f141f997 100644
--- a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
+++ b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
@@ -27,8 +27,9 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
     },
     createLicensedRouteHandler(async (context, request, response) => {
       let users: estypes.SecurityGetUserResponse;
+      const esClient = (await context.core).elasticsearch.client;
       try {
-        users = await context.core.elasticsearch.client.asCurrentUser.security.getUser();
+        users = await esClient.asCurrentUser.security.getUser();
       } catch (err) {
         if (getErrorStatusCode(err) === 403) {
           logger.warn(
@@ -65,7 +66,7 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
         }
 
         try {
-          await context.core.elasticsearch.client.asCurrentUser.security.putUser({
+          await esClient.asCurrentUser.security.putUser({
             username: userToUpdate.username,
             body: { ...userToUpdate, roles },
           });
@@ -89,10 +90,10 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
       validate: false,
     },
     createLicensedRouteHandler(async (context, request, response) => {
+      const esClient = (await context.core).elasticsearch.client;
       let roleMappings: estypes.SecurityGetRoleMappingResponse;
       try {
-        roleMappings =
-          await context.core.elasticsearch.client.asCurrentUser.security.getRoleMapping();
+        roleMappings = await esClient.asCurrentUser.security.getRoleMapping();
       } catch (err) {
         logger.error(`Failed to retrieve role mappings: ${getDetailedErrorMessage(err)}.`);
         return response.customError(wrapIntoCustomErrorResponse(err));
@@ -119,7 +120,7 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
         }
 
         try {
-          await context.core.elasticsearch.client.asCurrentUser.security.putRoleMapping({
+          await esClient.asCurrentUser.security.putRoleMapping({
             name: mappingNameToUpdate,
             body: { ...mappingToUpdate, roles },
           });
diff --git a/x-pack/plugins/security/server/routes/index.mock.ts b/x-pack/plugins/security/server/routes/index.mock.ts
index 9b6e7948838c8..3cda2a0ec9bc5 100644
--- a/x-pack/plugins/security/server/routes/index.mock.ts
+++ b/x-pack/plugins/security/server/routes/index.mock.ts
@@ -7,22 +7,22 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import {
   coreMock,
   httpResourcesMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 
-import { licensingMock } from '../../../licensing/server/mocks';
+import type { RouteDefinitionParams } from '.';
 import { licenseMock } from '../../common/licensing/index.mock';
 import { authenticationServiceMock } from '../authentication/authentication_service.mock';
 import { authorizationMock } from '../authorization/index.mock';
 import { ConfigSchema, createConfig } from '../config';
 import { sessionMock } from '../session_management/session.mock';
 import type { SecurityRequestHandlerContext } from '../types';
-import type { RouteDefinitionParams } from './';
 
 export const routeDefinitionParamsMock = {
   create: (rawConfig: Record<string, unknown> = {}) => {
@@ -51,8 +51,9 @@ export const routeDefinitionParamsMock = {
 };
 
 export const securityRequestHandlerContextMock = {
-  create: (): SecurityRequestHandlerContext => ({
-    core: coreMock.createRequestHandlerContext(),
-    licensing: licensingMock.createRequestHandlerContext(),
-  }),
+  create: (): SecurityRequestHandlerContext =>
+    coreMock.createCustomRequestHandlerContext({
+      core: coreMock.createRequestHandlerContext(),
+      licensing: licensingMock.createRequestHandlerContext(),
+    }),
 };
diff --git a/x-pack/plugins/security/server/routes/index.ts b/x-pack/plugins/security/server/routes/index.ts
index 6785fe57c6b32..afb799cf73150 100644
--- a/x-pack/plugins/security/server/routes/index.ts
+++ b/x-pack/plugins/security/server/routes/index.ts
@@ -7,10 +7,10 @@
 
 import type { Observable } from 'rxjs';
 
+import type { HttpResources, IBasePath, Logger } from '@kbn/core/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { HttpResources, IBasePath, Logger } from 'src/core/server';
 
-import type { KibanaFeature } from '../../../features/server';
 import type { SecurityLicense } from '../../common';
 import type { AnonymousAccessServiceStart } from '../anonymous_access';
 import type { InternalAuthenticationServiceStart } from '../authentication';
diff --git a/x-pack/plugins/security/server/routes/indices/get_fields.test.ts b/x-pack/plugins/security/server/routes/indices/get_fields.test.ts
index 386d528080ab5..5396a16763f8d 100644
--- a/x-pack/plugins/security/server/routes/indices/get_fields.test.ts
+++ b/x-pack/plugins/security/server/routes/indices/get_fields.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineGetFieldsRoutes } from './get_fields';
diff --git a/x-pack/plugins/security/server/routes/indices/get_fields.ts b/x-pack/plugins/security/server/routes/indices/get_fields.ts
index 873ed0e1b4b92..b0ec51339e080 100644
--- a/x-pack/plugins/security/server/routes/indices/get_fields.ts
+++ b/x-pack/plugins/security/server/routes/indices/get_fields.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 
 export function defineGetFieldsRoutes({ router }: RouteDefinitionParams) {
   router.get(
@@ -18,14 +18,14 @@ export function defineGetFieldsRoutes({ router }: RouteDefinitionParams) {
     },
     async (context, request, response) => {
       try {
-        const indexMappings =
-          await context.core.elasticsearch.client.asCurrentUser.indices.getFieldMapping({
-            index: request.params.query,
-            fields: '*',
-            allow_no_indices: false,
-            include_defaults: true,
-            filter_path: '*.mappings.*.mapping.*.type',
-          });
+        const esClient = (await context.core).elasticsearch.client;
+        const indexMappings = await esClient.asCurrentUser.indices.getFieldMapping({
+          index: request.params.query,
+          fields: '*',
+          allow_no_indices: false,
+          include_defaults: true,
+          filter_path: '*.mappings.*.mapping.*.type',
+        });
 
         // The flow is the following (see response format at https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html):
         // 1. Iterate over all matched indices.
diff --git a/x-pack/plugins/security/server/routes/indices/index.ts b/x-pack/plugins/security/server/routes/indices/index.ts
index bfc1d341b9f2f..4e8475b1c3b12 100644
--- a/x-pack/plugins/security/server/routes/indices/index.ts
+++ b/x-pack/plugins/security/server/routes/indices/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineGetFieldsRoutes } from './get_fields';
 
 export function defineIndicesRoutes(params: RouteDefinitionParams) {
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 b4e6871c7a963..59cb6150cd4cf 100644
--- a/x-pack/plugins/security/server/routes/licensed_route_handler.ts
+++ b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaResponseFactory, RequestHandler, RouteMethod } from 'src/core/server';
+import type { KibanaResponseFactory, RequestHandler, RouteMethod } from '@kbn/core/server';
 
 import type { SecurityRequestHandlerContext } from '../types';
 
@@ -19,12 +19,12 @@ export const createLicensedRouteHandler = <
 >(
   handler: RequestHandler<P, Q, B, Context, M, R>
 ) => {
-  const licensedRouteHandler: RequestHandler<P, Q, B, Context, M, R> = (
+  const licensedRouteHandler: RequestHandler<P, Q, B, Context, M, R> = async (
     context,
     request,
     responseToolkit
   ) => {
-    const { license } = context.licensing;
+    const { license } = await context.licensing;
     const licenseCheck = license.check('security', 'basic');
     if (licenseCheck.state === 'unavailable' || licenseCheck.state === 'invalid') {
       return responseToolkit.forbidden({ body: { message: licenseCheck.message! } });
diff --git a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts
index f652d370f3601..63e0d602cf122 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingDeleteRoutes } from './delete';
@@ -14,11 +14,16 @@ import { defineRoleMappingDeleteRoutes } from './delete';
 describe('DELETE role mappings', () => {
   it('allows a role mapping to be deleted', async () => {
     const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-    const mockContext = {
-      core: coreMock.createRequestHandlerContext(),
-      licensing: { license: { check: jest.fn().mockReturnValue({ state: 'valid' }) } } as any,
-    };
-    mockContext.core.elasticsearch.client.asCurrentUser.security.deleteRoleMapping.mockResponse({
+    const mockCoreContext = coreMock.createRequestHandlerContext();
+    const mockLicensingContext = {
+      license: { check: jest.fn().mockReturnValue({ state: 'valid' }) },
+    } as any;
+    const mockContext = coreMock.createCustomRequestHandlerContext({
+      core: mockCoreContext,
+      licensing: mockLicensingContext,
+    });
+
+    mockCoreContext.elasticsearch.client.asCurrentUser.security.deleteRoleMapping.mockResponse({
       acknowledged: true,
     } as any);
 
@@ -39,24 +44,27 @@ describe('DELETE role mappings', () => {
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ acknowledged: true });
     expect(
-      mockContext.core.elasticsearch.client.asCurrentUser.security.deleteRoleMapping
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.deleteRoleMapping
     ).toHaveBeenCalledWith({ name });
   });
 
   describe('failure', () => {
     it('returns result of license check', async () => {
       const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: {
-          license: {
-            check: jest.fn().mockReturnValue({
-              state: 'invalid',
-              message: 'test forbidden message',
-            }),
-          },
-        } as any,
-      };
+
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: {
+          check: jest.fn().mockReturnValue({
+            state: 'invalid',
+            message: 'test forbidden message',
+          }),
+        },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
       defineRoleMappingDeleteRoutes(mockRouteDefinitionParams);
 
@@ -75,7 +83,7 @@ describe('DELETE role mappings', () => {
       expect(response.status).toBe(403);
       expect(response.payload).toEqual({ message: 'test forbidden message' });
       expect(
-        mockContext.core.elasticsearch.client.asCurrentUser.security.deleteRoleMapping
+        mockCoreContext.elasticsearch.client.asCurrentUser.security.deleteRoleMapping
       ).not.toHaveBeenCalled();
     });
   });
diff --git a/x-pack/plugins/security/server/routes/role_mapping/delete.ts b/x-pack/plugins/security/server/routes/role_mapping/delete.ts
index bf6353d5abd55..e305de6e4fcb4 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/delete.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/delete.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapError } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
@@ -23,10 +23,10 @@ export function defineRoleMappingDeleteRoutes({ router }: RouteDefinitionParams)
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        const deleteResponse =
-          await context.core.elasticsearch.client.asCurrentUser.security.deleteRoleMapping({
-            name: request.params.name,
-          });
+        const esClient = (await context.core).elasticsearch.client;
+        const deleteResponse = await esClient.asCurrentUser.security.deleteRoleMapping({
+          name: request.params.name,
+        });
         return response.ok({ body: deleteResponse });
       } catch (error) {
         const wrappedError = wrapError(error);
diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
index 06c6f02fad4fe..0efe93d21c1b2 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingFeatureCheckRoute } from './feature_check';
 
@@ -48,18 +48,23 @@ describe('GET role mappings feature check', () => {
   ) => {
     test(description, async () => {
       const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
-      const mockContext = {
-        core: coreMock.createRequestHandlerContext(),
-        licensing: { license: { check: jest.fn().mockReturnValue(licenseCheckResult) } } as any,
-      };
+      const mockCoreContext = coreMock.createRequestHandlerContext();
+      const mockLicensingContext = {
+        license: {
+          check: jest.fn().mockReturnValue(licenseCheckResult),
+        },
+      } as any;
+      const mockContext = coreMock.createCustomRequestHandlerContext({
+        core: mockCoreContext,
+        licensing: mockLicensingContext,
+      });
 
-      mockContext.core.elasticsearch.client.asInternalUser.nodes.info.mockImplementation(
-        (async () => nodeSettingsResponse()) as any
-      );
-      mockContext.core.elasticsearch.client.asInternalUser.transport.request.mockImplementation(
+      mockCoreContext.elasticsearch.client.asInternalUser.nodes.info.mockImplementation((async () =>
+        nodeSettingsResponse()) as any);
+      mockCoreContext.elasticsearch.client.asInternalUser.transport.request.mockImplementation(
         (async () => xpackUsageResponse()) as any
       );
-      mockContext.core.elasticsearch.client.asCurrentUser.security.hasPrivileges.mockResolvedValue({
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.hasPrivileges.mockResolvedValue({
         has_all_requested: canManageRoleMappings,
       } as any);
 
@@ -77,7 +82,7 @@ describe('GET role mappings feature check', () => {
       expect(response.status).toBe(asserts.statusCode);
       expect(response.payload).toEqual(asserts.result);
 
-      expect(mockContext.licensing.license.check).toHaveBeenCalledWith('security', 'basic');
+      expect(mockLicensingContext.license.check).toHaveBeenCalledWith('security', 'basic');
     });
   };
 
diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
index 4976b7411008f..9715f92cb5a37 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 interface NodeSettingsResponse {
@@ -43,8 +43,9 @@ export function defineRoleMappingFeatureCheckRoute({ router, logger }: RouteDefi
       validate: false,
     },
     createLicensedRouteHandler(async (context, request, response) => {
+      const esClient = (await context.core).elasticsearch.client;
       const { has_all_requested: canManageRoleMappings } =
-        await context.core.elasticsearch.client.asCurrentUser.security.hasPrivileges({
+        await esClient.asCurrentUser.security.hasPrivileges({
           body: { cluster: ['manage_security'] },
         });
 
@@ -56,10 +57,7 @@ export function defineRoleMappingFeatureCheckRoute({ router, logger }: RouteDefi
         });
       }
 
-      const enabledFeatures = await getEnabledRoleMappingsFeatures(
-        context.core.elasticsearch.client.asInternalUser,
-        logger
-      );
+      const enabledFeatures = await getEnabledRoleMappingsFeatures(esClient.asInternalUser, logger);
 
       return response.ok({
         body: {
diff --git a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts
index 8aa9d60f8271e..564f93d302353 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts
@@ -7,8 +7,8 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingGetRoutes } from './get';
@@ -80,7 +80,11 @@ describe('GET role mappings', () => {
       headers,
     });
 
-    const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+    const response = await handler(
+      coreMock.createCustomRequestHandlerContext(mockContext),
+      mockRequest,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
     expect(response.payload).toEqual([
       {
@@ -159,7 +163,11 @@ describe('GET role mappings', () => {
       headers,
     });
 
-    const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+    const response = await handler(
+      coreMock.createCustomRequestHandlerContext(mockContext),
+      mockRequest,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({
       name: 'mapping1',
@@ -194,7 +202,11 @@ describe('GET role mappings', () => {
         headers,
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
       expect(response.status).toBe(403);
       expect(response.payload).toEqual({ message: 'test forbidden message' });
       expect(
@@ -223,7 +235,11 @@ describe('GET role mappings', () => {
         headers,
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
       expect(response.status).toBe(404);
       expect(
         mockContext.core.elasticsearch.client.asCurrentUser.security.getRoleMapping
diff --git a/x-pack/plugins/security/server/routes/role_mapping/get.ts b/x-pack/plugins/security/server/routes/role_mapping/get.ts
index dbe99fd804e25..ac6e7efaa8b0a 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/get.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/get.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import type { RoleMapping } from '../../../common/model';
 import { wrapError } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
@@ -28,10 +28,10 @@ export function defineRoleMappingGetRoutes(params: RouteDefinitionParams) {
       const expectSingleEntity = typeof request.params.name === 'string';
 
       try {
-        const roleMappingsResponse =
-          await context.core.elasticsearch.client.asCurrentUser.security.getRoleMapping({
-            name: request.params.name,
-          });
+        const esClient = (await context.core).elasticsearch.client;
+        const roleMappingsResponse = await esClient.asCurrentUser.security.getRoleMapping({
+          name: request.params.name,
+        });
 
         const mappings = Object.entries(roleMappingsResponse).map(([name, mapping]) => {
           return {
diff --git a/x-pack/plugins/security/server/routes/role_mapping/index.ts b/x-pack/plugins/security/server/routes/role_mapping/index.ts
index acb14a072ef3f..3b9eca33a66f4 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/index.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineRoleMappingDeleteRoutes } from './delete';
 import { defineRoleMappingFeatureCheckRoute } from './feature_check';
 import { defineRoleMappingGetRoutes } from './get';
diff --git a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts
index e06d57b76098f..a6acc866b2d07 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingPostRoutes } from './post';
@@ -45,7 +45,11 @@ describe('POST role mappings', () => {
       headers,
     });
 
-    const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+    const response = await handler(
+      coreMock.createCustomRequestHandlerContext(mockContext),
+      mockRequest,
+      kibanaResponseFactory
+    );
     expect(response.status).toBe(200);
     expect(response.payload).toEqual({ created: true });
 
@@ -91,7 +95,11 @@ describe('POST role mappings', () => {
         headers,
       });
 
-      const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
+      const response = await handler(
+        coreMock.createCustomRequestHandlerContext(mockContext),
+        mockRequest,
+        kibanaResponseFactory
+      );
       expect(response.status).toBe(403);
       expect(response.payload).toEqual({ message: 'test forbidden message' });
 
diff --git a/x-pack/plugins/security/server/routes/role_mapping/post.ts b/x-pack/plugins/security/server/routes/role_mapping/post.ts
index e7d55d93e541a..79bd8b3d3f2c0 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/post.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/post.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapError } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
@@ -44,11 +44,11 @@ export function defineRoleMappingPostRoutes({ router }: RouteDefinitionParams) {
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        const saveResponse =
-          await context.core.elasticsearch.client.asCurrentUser.security.putRoleMapping({
-            name: request.params.name,
-            body: request.body,
-          });
+        const esClient = (await context.core).elasticsearch.client;
+        const saveResponse = await esClient.asCurrentUser.security.putRoleMapping({
+          name: request.params.name,
+          body: request.body,
+        });
         return response.ok({ body: saveResponse });
       } catch (error) {
         const wrappedError = wrapError(error);
diff --git a/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts b/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts
index 9986c1e979b8b..152c06b83dd1f 100644
--- a/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts
+++ b/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts
@@ -11,8 +11,8 @@ import { mockCreateClusterDataCheck } from './get_state.test.mock';
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityLicenseFeatures } from '../../../common/licensing';
 import { licenseMock } from '../../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/routes/security_checkup/get_state.ts b/x-pack/plugins/security/server/routes/security_checkup/get_state.ts
index 8c4e69cb87c81..2946c3fa5dee3 100644
--- a/x-pack/plugins/security/server/routes/security_checkup/get_state.ts
+++ b/x-pack/plugins/security/server/routes/security_checkup/get_state.ts
@@ -31,12 +31,10 @@ export function defineSecurityCheckupGetStateRoutes({
   router.get(
     { path: '/internal/security/security_checkup/state', validate: false },
     async (context, _request, response) => {
+      const esClient = (await context.core).elasticsearch.client;
       let displayAlert = false;
       if (showInsecureClusterWarning) {
-        displayAlert = await doesClusterHaveUserData(
-          context.core.elasticsearch.client.asInternalUser,
-          logger
-        );
+        displayAlert = await doesClusterHaveUserData(esClient.asInternalUser, logger);
       }
 
       const state: SecurityCheckupState = {
diff --git a/x-pack/plugins/security/server/routes/session_management/extend.test.ts b/x-pack/plugins/security/server/routes/session_management/extend.test.ts
index 5af59a6386754..428621316ec18 100644
--- a/x-pack/plugins/security/server/routes/session_management/extend.test.ts
+++ b/x-pack/plugins/security/server/routes/session_management/extend.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
diff --git a/x-pack/plugins/security/server/routes/session_management/extend.ts b/x-pack/plugins/security/server/routes/session_management/extend.ts
index 0e89d6cb67981..b1626ba4660b3 100644
--- a/x-pack/plugins/security/server/routes/session_management/extend.ts
+++ b/x-pack/plugins/security/server/routes/session_management/extend.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the session extension.
diff --git a/x-pack/plugins/security/server/routes/session_management/index.ts b/x-pack/plugins/security/server/routes/session_management/index.ts
index 16cda7b7b409d..0ac63704ea3b3 100644
--- a/x-pack/plugins/security/server/routes/session_management/index.ts
+++ b/x-pack/plugins/security/server/routes/session_management/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineSessionExtendRoutes } from './extend';
 import { defineSessionInfoRoutes } from './info';
 import { defineInvalidateSessionsRoutes } from './invalidate';
diff --git a/x-pack/plugins/security/server/routes/session_management/info.test.ts b/x-pack/plugins/security/server/routes/session_management/info.test.ts
index f133a5ab31961..4f88147be0190 100644
--- a/x-pack/plugins/security/server/routes/session_management/info.test.ts
+++ b/x-pack/plugins/security/server/routes/session_management/info.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import { SESSION_EXPIRATION_WARNING_MS } from '../../../common/constants';
 import type { Session } from '../../session_management';
diff --git a/x-pack/plugins/security/server/routes/session_management/info.ts b/x-pack/plugins/security/server/routes/session_management/info.ts
index b141f42c4b072..bba5e38567213 100644
--- a/x-pack/plugins/security/server/routes/session_management/info.ts
+++ b/x-pack/plugins/security/server/routes/session_management/info.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { SESSION_EXPIRATION_WARNING_MS } from '../../../common/constants';
 import type { SessionInfo } from '../../../common/types';
 
diff --git a/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts b/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts
index ebe795788329c..c0bb04fc3bad9 100644
--- a/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts
+++ b/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts
@@ -6,11 +6,11 @@
  */
 
 import type { ObjectType } from '@kbn/config-schema';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { RequestHandler, RouteConfig } from '../../../../../../src/core/server';
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import type { Session } from '../../session_management';
 import { sessionMock } from '../../session_management/session.mock';
 import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts
index 35972e103855e..19f84ce461627 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.test.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts
@@ -8,11 +8,11 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
+import type { Headers, RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { Headers, RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { AuthenticationResult } from '../../authentication';
@@ -32,13 +32,14 @@ describe('Change password', () => {
   let routeHandler: RequestHandler<any, any, any, SecurityRequestHandlerContext>;
   let routeConfig: RouteConfig<any, any, any, any>;
   let mockContext: DeeplyMockedKeys<SecurityRequestHandlerContext>;
+  let mockCoreContext: ReturnType<typeof coreMock.createRequestHandlerContext>;
 
   function checkPasswordChangeAPICall(username: string, headers?: Headers) {
     expect(
-      mockContext.core.elasticsearch.client.asCurrentUser.security.changePassword
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.changePassword
     ).toHaveBeenCalledTimes(1);
     expect(
-      mockContext.core.elasticsearch.client.asCurrentUser.security.changePassword
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.changePassword
     ).toHaveBeenCalledWith(
       { username, body: { password: 'new-password' } },
       headers && { headers }
@@ -59,10 +60,11 @@ describe('Change password', () => {
     authc.login.mockResolvedValue(AuthenticationResult.succeeded(mockAuthenticatedUser()));
     session.get.mockResolvedValue(sessionMock.createValue());
 
-    mockContext = {
-      core: coreMock.createRequestHandlerContext(),
+    mockCoreContext = coreMock.createRequestHandlerContext();
+    mockContext = coreMock.createCustomRequestHandlerContext({
+      core: mockCoreContext,
       licensing: { license: { check: jest.fn().mockReturnValue({ state: 'valid' }) } },
-    } as any;
+    }) as any;
 
     defineChangeUserPasswordRoutes(routeParamsMock);
 
@@ -113,7 +115,7 @@ describe('Change password', () => {
       const changePasswordFailure = new errors.ResponseError(
         securityMock.createApiResponse({ statusCode: 401, body: {} })
       );
-      mockContext.core.elasticsearch.client.asCurrentUser.security.changePassword.mockRejectedValue(
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.changePassword.mockRejectedValue(
         changePasswordFailure
       );
 
@@ -150,7 +152,7 @@ describe('Change password', () => {
 
     it('returns 500 if password update request fails with non-401 error.', async () => {
       const failureReason = new Error('Request failed.');
-      mockContext.core.elasticsearch.client.asCurrentUser.security.changePassword.mockRejectedValue(
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.changePassword.mockRejectedValue(
         failureReason
       );
 
@@ -232,7 +234,7 @@ describe('Change password', () => {
 
     it('returns 500 if password update request fails.', async () => {
       const failureReason = new Error('Request failed.');
-      mockContext.core.elasticsearch.client.asCurrentUser.security.changePassword.mockRejectedValue(
+      mockCoreContext.elasticsearch.client.asCurrentUser.security.changePassword.mockRejectedValue(
         failureReason
       );
 
diff --git a/x-pack/plugins/security/server/routes/users/change_password.ts b/x-pack/plugins/security/server/routes/users/change_password.ts
index d9863b5061391..51df3e906a606 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { canUserChangePassword } from '../../../common/model';
 import {
   BasicHTTPAuthorizationHeaderCredentials,
@@ -59,7 +59,8 @@ export function defineChangeUserPasswordRoutes({
         : undefined;
 
       try {
-        await context.core.elasticsearch.client.asCurrentUser.security.changePassword(
+        const esClient = (await context.core).elasticsearch.client;
+        await esClient.asCurrentUser.security.changePassword(
           { username, body: { password: newPassword } },
           options
         );
diff --git a/x-pack/plugins/security/server/routes/users/create_or_update.ts b/x-pack/plugins/security/server/routes/users/create_or_update.ts
index 6527d9afc9842..de6adad78b4e8 100644
--- a/x-pack/plugins/security/server/routes/users/create_or_update.ts
+++ b/x-pack/plugins/security/server/routes/users/create_or_update.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
@@ -30,7 +30,8 @@ export function defineCreateOrUpdateUserRoutes({ router }: RouteDefinitionParams
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        await context.core.elasticsearch.client.asCurrentUser.security.putUser({
+        const esClient = (await context.core).elasticsearch.client;
+        await esClient.asCurrentUser.security.putUser({
           username: request.params.username,
           body: request.body,
         });
diff --git a/x-pack/plugins/security/server/routes/users/delete.ts b/x-pack/plugins/security/server/routes/users/delete.ts
index 767cda4b566a5..429adb368574a 100644
--- a/x-pack/plugins/security/server/routes/users/delete.ts
+++ b/x-pack/plugins/security/server/routes/users/delete.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineDeleteUserRoutes({ router }: RouteDefinitionParams) {
@@ -21,7 +21,8 @@ export function defineDeleteUserRoutes({ router }: RouteDefinitionParams) {
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        await context.core.elasticsearch.client.asCurrentUser.security.deleteUser({
+        const esClient = (await context.core).elasticsearch.client;
+        await esClient.asCurrentUser.security.deleteUser({
           username: request.params.username,
         });
 
diff --git a/x-pack/plugins/security/server/routes/users/disable.ts b/x-pack/plugins/security/server/routes/users/disable.ts
index 0a5c4c03f4fb0..87f61daca8c95 100644
--- a/x-pack/plugins/security/server/routes/users/disable.ts
+++ b/x-pack/plugins/security/server/routes/users/disable.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineDisableUserRoutes({ router }: RouteDefinitionParams) {
@@ -21,7 +21,8 @@ export function defineDisableUserRoutes({ router }: RouteDefinitionParams) {
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        await context.core.elasticsearch.client.asCurrentUser.security.disableUser({
+        const esClient = (await context.core).elasticsearch.client;
+        await esClient.asCurrentUser.security.disableUser({
           username: request.params.username,
         });
 
diff --git a/x-pack/plugins/security/server/routes/users/enable.ts b/x-pack/plugins/security/server/routes/users/enable.ts
index 8f8d91cf42aca..a8a9d62bee938 100644
--- a/x-pack/plugins/security/server/routes/users/enable.ts
+++ b/x-pack/plugins/security/server/routes/users/enable.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineEnableUserRoutes({ router }: RouteDefinitionParams) {
@@ -21,7 +21,8 @@ export function defineEnableUserRoutes({ router }: RouteDefinitionParams) {
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
-        await context.core.elasticsearch.client.asCurrentUser.security.enableUser({
+        const esClient = (await context.core).elasticsearch.client;
+        await esClient.asCurrentUser.security.enableUser({
           username: request.params.username,
         });
 
diff --git a/x-pack/plugins/security/server/routes/users/get.ts b/x-pack/plugins/security/server/routes/users/get.ts
index 8844ed0da4ea7..ed18c8437627d 100644
--- a/x-pack/plugins/security/server/routes/users/get.ts
+++ b/x-pack/plugins/security/server/routes/users/get.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
@@ -21,8 +21,9 @@ export function defineGetUserRoutes({ router }: RouteDefinitionParams) {
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
+        const esClient = (await context.core).elasticsearch.client;
         const username = request.params.username;
-        const users = await context.core.elasticsearch.client.asCurrentUser.security.getUser({
+        const users = await esClient.asCurrentUser.security.getUser({
           username,
         });
 
diff --git a/x-pack/plugins/security/server/routes/users/get_all.ts b/x-pack/plugins/security/server/routes/users/get_all.ts
index 4572d3929fed3..eae0664189340 100644
--- a/x-pack/plugins/security/server/routes/users/get_all.ts
+++ b/x-pack/plugins/security/server/routes/users/get_all.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineGetAllUsersRoutes({ router }: RouteDefinitionParams) {
@@ -14,11 +14,10 @@ export function defineGetAllUsersRoutes({ router }: RouteDefinitionParams) {
     { path: '/internal/security/users', validate: false },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
+        const esClient = (await context.core).elasticsearch.client;
         return response.ok({
           // Return only values since keys (user names) are already duplicated there.
-          body: Object.values(
-            await context.core.elasticsearch.client.asCurrentUser.security.getUser()
-          ),
+          body: Object.values(await esClient.asCurrentUser.security.getUser()),
         });
       } catch (error) {
         return response.customError(wrapIntoCustomErrorResponse(error));
diff --git a/x-pack/plugins/security/server/routes/users/index.ts b/x-pack/plugins/security/server/routes/users/index.ts
index b6bb694b5efe6..410bedb5b7fb9 100644
--- a/x-pack/plugins/security/server/routes/users/index.ts
+++ b/x-pack/plugins/security/server/routes/users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../index';
+import type { RouteDefinitionParams } from '..';
 import { defineChangeUserPasswordRoutes } from './change_password';
 import { defineCreateOrUpdateUserRoutes } from './create_or_update';
 import { defineDeleteUserRoutes } from './delete';
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
index 9d88526a85116..9b4bdb4d4329d 100644
--- a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
+++ b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   HttpResources,
   HttpResourcesRequestHandler,
   RequestHandler,
   RouteConfig,
-} from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
 import type { AuthenticationProvider } from '../../../common/model';
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.ts b/x-pack/plugins/security/server/routes/views/access_agreement.ts
index 292c484690ec8..83e640f43dee9 100644
--- a/x-pack/plugins/security/server/routes/views/access_agreement.ts
+++ b/x-pack/plugins/security/server/routes/views/access_agreement.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import type { ConfigType } from '../../config';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/views/account_management.ts b/x-pack/plugins/security/server/routes/views/account_management.ts
index bab0faedcd9cc..af49f325a25d2 100644
--- a/x-pack/plugins/security/server/routes/views/account_management.ts
+++ b/x-pack/plugins/security/server/routes/views/account_management.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Account Management view.
diff --git a/x-pack/plugins/security/server/routes/views/capture_url.test.ts b/x-pack/plugins/security/server/routes/views/capture_url.test.ts
index 6fdb01ad13a8c..13f07b528996c 100644
--- a/x-pack/plugins/security/server/routes/views/capture_url.test.ts
+++ b/x-pack/plugins/security/server/routes/views/capture_url.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Type } from '@kbn/config-schema';
-import type { HttpResources, HttpResourcesRequestHandler, RouteConfig } from 'src/core/server';
-import { httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
+import type { HttpResources, HttpResourcesRequestHandler, RouteConfig } from '@kbn/core/server';
+import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityRequestHandlerContext } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
diff --git a/x-pack/plugins/security/server/routes/views/capture_url.ts b/x-pack/plugins/security/server/routes/views/capture_url.ts
index d345639b58cb2..8eff92d78999d 100644
--- a/x-pack/plugins/security/server/routes/views/capture_url.ts
+++ b/x-pack/plugins/security/server/routes/views/capture_url.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Capture URL view.
diff --git a/x-pack/plugins/security/server/routes/views/index.test.ts b/x-pack/plugins/security/server/routes/views/index.test.ts
index be85498f0bb1e..755a5a1202c73 100644
--- a/x-pack/plugins/security/server/routes/views/index.test.ts
+++ b/x-pack/plugins/security/server/routes/views/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { defineViewRoutes } from '.';
 import { routeDefinitionParamsMock } from '../index.mock';
-import { defineViewRoutes } from './';
 
 describe('View routes', () => {
   it('does not register Login routes if both `basic` and `token` providers are disabled', () => {
diff --git a/x-pack/plugins/security/server/routes/views/index.ts b/x-pack/plugins/security/server/routes/views/index.ts
index 5993808d0cfb0..ad2585cb0b771 100644
--- a/x-pack/plugins/security/server/routes/views/index.ts
+++ b/x-pack/plugins/security/server/routes/views/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineAccessAgreementRoutes } from './access_agreement';
 import { defineAccountManagementRoutes } from './account_management';
 import { defineCaptureURLRoutes } from './capture_url';
diff --git a/x-pack/plugins/security/server/routes/views/logged_out.test.ts b/x-pack/plugins/security/server/routes/views/logged_out.test.ts
index 9b0eea0c74634..0795b2a9a8e15 100644
--- a/x-pack/plugins/security/server/routes/views/logged_out.test.ts
+++ b/x-pack/plugins/security/server/routes/views/logged_out.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { HttpResourcesRequestHandler, RouteConfig } from '@kbn/core/server';
+import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { HttpResourcesRequestHandler, RouteConfig } from 'src/core/server';
-import { httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
 
 import type { Session } from '../../session_management';
 import { sessionMock } from '../../session_management/session.mock';
diff --git a/x-pack/plugins/security/server/routes/views/logged_out.ts b/x-pack/plugins/security/server/routes/views/logged_out.ts
index 8d22e4efc3ddc..6eb4d10bf6bbd 100644
--- a/x-pack/plugins/security/server/routes/views/logged_out.ts
+++ b/x-pack/plugins/security/server/routes/views/logged_out.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Logged Out view.
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index ee728c29bdc92..00ddd746adaa8 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -13,9 +13,9 @@ import type {
   HttpResourcesRequestHandler,
   RequestHandler,
   RouteConfig,
-} from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityLicense } from '../../../common/licensing';
 import type { LoginSelectorProvider } from '../../../common/login_state';
diff --git a/x-pack/plugins/security/server/routes/views/login.ts b/x-pack/plugins/security/server/routes/views/login.ts
index 990ac4075efe0..9a7145b0e09df 100644
--- a/x-pack/plugins/security/server/routes/views/login.ts
+++ b/x-pack/plugins/security/server/routes/views/login.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import {
   LOGOUT_REASON_QUERY_STRING_PARAMETER,
   NEXT_URL_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/routes/views/logout.ts b/x-pack/plugins/security/server/routes/views/logout.ts
index 5e5d5c0bb6f01..3fb905ee10d37 100644
--- a/x-pack/plugins/security/server/routes/views/logout.ts
+++ b/x-pack/plugins/security/server/routes/views/logout.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Logout out view.
diff --git a/x-pack/plugins/security/server/routes/views/overwritten_session.ts b/x-pack/plugins/security/server/routes/views/overwritten_session.ts
index 7ed5cffbc56f8..115f7ea0a093f 100644
--- a/x-pack/plugins/security/server/routes/views/overwritten_session.ts
+++ b/x-pack/plugins/security/server/routes/views/overwritten_session.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Overwritten Session view.
diff --git a/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts b/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts
index 0f6ae5e282609..a5a6529d9d850 100644
--- a/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts
+++ b/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { CheckSavedObjectsPrivileges } from '../authorization';
 import { Actions } from '../authorization';
diff --git a/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts b/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts
index c3457e75f9644..f7005c1d4f86e 100644
--- a/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts
+++ b/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { Actions, CheckSavedObjectsPrivileges } from '../authorization';
 import type { CheckPrivilegesResponse } from '../authorization/types';
diff --git a/x-pack/plugins/security/server/saved_objects/index.ts b/x-pack/plugins/security/server/saved_objects/index.ts
index 07bfe97f9de7d..71a945e951771 100644
--- a/x-pack/plugins/security/server/saved_objects/index.ts
+++ b/x-pack/plugins/security/server/saved_objects/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/server';
+import type { CoreSetup } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 
-import { SavedObjectsClient } from '../../../../../src/core/server';
 import type { AuditServiceSetup } from '../audit';
 import type { AuthorizationServiceSetupInternal } from '../authorization';
 import type { SpacesService } from '../plugin';
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
index 7e45946c7452d..0f96beb4b5eaf 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
@@ -14,8 +14,8 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsResolveResponse,
   SavedObjectsUpdateObjectsSpacesResponseObject,
-} from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { AuditEvent } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
@@ -23,9 +23,9 @@ import { Actions } from '../authorization';
 import type { SavedObjectActions } from '../authorization/actions/saved_object';
 import { SecureSavedObjectsClientWrapper } from './secure_saved_objects_client_wrapper';
 
-jest.mock('src/core/server/saved_objects/service/lib/utils', () => {
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => {
   const { SavedObjectsUtils } = jest.requireActual(
-    'src/core/server/saved_objects/service/lib/utils'
+    '@kbn/core/server/saved_objects/service/lib/utils'
   );
   return {
     SavedObjectsUtils: {
@@ -1457,6 +1457,8 @@ describe('#collectMultiNamespaceReferences', () => {
     const reqObj1 = { type: 'a', id: '1' };
     const reqObj2 = { type: 'b', id: '2' };
     const spaces = [spaceX, spaceY, spaceZ];
+    const spacesWithMatchingAliases = [spaceX, spaceY, spaceZ];
+    const spacesWithMatchingOrigins = [spaceX, spaceY, spaceZ];
 
     // Actual object graph:
     //   ─► obj1 (a:1) ─┬─► obj3 (c:3) ───► obj5 (c:5) ─► obj8 (c:8) ─┐
@@ -1471,9 +1473,24 @@ describe('#collectMultiNamespaceReferences', () => {
     //                  │                       └───────────────────────────────────┘
     //                  └─► obj4 (d:4)
     //   ─► obj2 (b:2)
-    const obj1 = { ...reqObj1, spaces, inboundReferences: [] };
+    const obj1 = {
+      ...reqObj1,
+      spaces,
+      inboundReferences: [],
+      // We include spacesWithMatchingAliases and spacesWithMatchingOrigins on this object of type 'a' (which the user is authorized to access globally) to assert that they are not redacted
+      spacesWithMatchingAliases,
+      spacesWithMatchingOrigins,
+    };
     const obj2 = { ...reqObj2, spaces: [], inboundReferences: [] }; // non-multi-namespace types and hidden types will be returned with an empty spaces array
-    const obj3 = { type: 'c', id: '3', spaces, ...getInboundRefsFrom(obj1) };
+    const obj3 = {
+      type: 'c',
+      id: '3',
+      spaces,
+      ...getInboundRefsFrom(obj1),
+      // We include spacesWithMatchingAliases and spacesWithMatchingOrigins on this object of type 'c' (which the user is partially authorized for) to assert that they are redacted
+      spacesWithMatchingAliases,
+      spacesWithMatchingOrigins,
+    };
     const obj4 = { type: 'd', id: '4', spaces, ...getInboundRefsFrom(obj1) };
     const obj5 = {
       type: 'c',
@@ -1510,9 +1527,14 @@ describe('#collectMultiNamespaceReferences', () => {
       const result = await client.collectMultiNamespaceReferences([reqObj1, reqObj2], options);
       expect(result).toEqual({
         objects: [
-          obj1, // obj1's spaces array is not redacted because the user is globally authorized to access it
+          obj1, // obj1's spaces, spacesWithMatchingAliases, and spacesWithMatchingOrigins arrays are not redacted because the user is globally authorized to access it
           obj2, // obj2 has an empty spaces array (see above)
-          { ...obj3, spaces: [spaceX, '?', '?'] },
+          {
+            ...obj3,
+            spaces: [spaceX, '?', '?'],
+            spacesWithMatchingAliases: [spaceX, '?', '?'],
+            spacesWithMatchingOrigins: [spaceX, '?', '?'],
+          },
           { ...obj4, spaces: [], isMissing: true }, // obj4 is marked as Missing because the user was not authorized to access it
           obj5, // obj5's spaces array is not redacted, because it exists in All Spaces
           // obj7 is not included at all because the user was not authorized to access its inbound reference (obj4)
@@ -1567,9 +1589,14 @@ describe('#collectMultiNamespaceReferences', () => {
       const result = await client.collectMultiNamespaceReferences([reqObj1, reqObj2], options);
       expect(result).toEqual({
         objects: [
-          obj1, // obj1's spaces array is not redacted because the user is globally authorized to access it
+          obj1, // obj1's spaces, spacesWithMatchingAliases, and spacesWithMatchingOrigins arrays are not redacted because the user is globally authorized to access it
           obj2, // obj2 has an empty spaces array (see above)
-          { ...obj3, spaces: [spaceX, spaceY, '?'] },
+          {
+            ...obj3,
+            spaces: [spaceX, spaceY, '?'],
+            spacesWithMatchingAliases: [spaceX, spaceY, '?'],
+            spacesWithMatchingOrigins: [spaceX, spaceY, '?'],
+          },
           { ...obj4, spaces: [], isMissing: true }, // obj4 is marked as Missing because the user was not authorized to access it
           obj5, // obj5's spaces array is not redacted, because it exists in All Spaces
           // obj7 is not included at all because the user was not authorized to access its inbound reference (obj4)
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
index 6c6220cb4ab75..6b4c3bf4e799c 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
@@ -27,9 +27,9 @@ import type {
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
   SavedObjectsUpdateOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '../../../../../src/core/server';
 import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../common/constants';
 import type { AuditLogger } from '../audit';
 import { SavedObjectAction, savedObjectEvent } from '../audit';
@@ -655,8 +655,12 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
     const uniqueTypes = this.getUniqueObjectTypes(response.objects);
     const uniqueSpaces = this.getUniqueSpaces(
       currentSpaceId,
-      ...response.objects.flatMap(({ spaces, spacesWithMatchingAliases = [] }) =>
-        spaces.concat(spacesWithMatchingAliases)
+      ...response.objects.flatMap(
+        ({ spaces, spacesWithMatchingAliases = [], spacesWithMatchingOrigins = [] }) => [
+          ...spaces,
+          ...spacesWithMatchingAliases,
+          ...spacesWithMatchingOrigins,
+        ]
       )
     );
 
@@ -770,7 +774,14 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
     }
 
     const filteredAndRedactedObjects = [...filteredObjectsMap.values()].map((obj) => {
-      const { type, id, spaces, spacesWithMatchingAliases, inboundReferences } = obj;
+      const {
+        type,
+        id,
+        spaces,
+        spacesWithMatchingAliases,
+        spacesWithMatchingOrigins,
+        inboundReferences,
+      } = obj;
       // Redact the inbound references so we don't leak any info about other objects that the user is not authorized to access
       const redactedInboundReferences = inboundReferences.filter((inbound) => {
         if (inbound.type === type && inbound.id === id) {
@@ -783,12 +794,18 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
       const redactedSpacesWithMatchingAliases =
         spacesWithMatchingAliases &&
         getRedactedSpaces(type, 'bulk_get', typeActionMap, spacesWithMatchingAliases);
+      const redactedSpacesWithMatchingOrigins =
+        spacesWithMatchingOrigins &&
+        getRedactedSpaces(type, 'bulk_get', typeActionMap, spacesWithMatchingOrigins);
       return {
         ...obj,
         spaces: redactedSpaces,
         ...(redactedSpacesWithMatchingAliases && {
           spacesWithMatchingAliases: redactedSpacesWithMatchingAliases,
         }),
+        ...(redactedSpacesWithMatchingOrigins && {
+          spacesWithMatchingOrigins: redactedSpacesWithMatchingOrigins,
+        }),
         inboundReferences: redactedInboundReferences,
       };
     });
diff --git a/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts b/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts
index 95ad22c79c1fb..2ddbebe1672db 100644
--- a/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts
+++ b/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { createClusterDataCheck } from './check_cluster_data';
 
diff --git a/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts b/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts
index 03d2d89e70034..f996c079ea865 100644
--- a/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts
+++ b/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 export const createClusterDataCheck = () => {
   let clusterHasUserData = false;
diff --git a/x-pack/plugins/security/server/session_management/session.test.ts b/x-pack/plugins/security/server/session_management/session.test.ts
index e1c67dca667f7..11fbd168780d1 100644
--- a/x-pack/plugins/security/server/session_management/session.test.ts
+++ b/x-pack/plugins/security/server/session_management/session.test.ts
@@ -8,8 +8,8 @@
 import nodeCrypto from '@elastic/node-crypto';
 import crypto from 'crypto';
 
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { ConfigSchema, createConfig } from '../config';
diff --git a/x-pack/plugins/security/server/session_management/session.ts b/x-pack/plugins/security/server/session_management/session.ts
index 8d2b56b4d2b7a..febeb6db55f76 100644
--- a/x-pack/plugins/security/server/session_management/session.ts
+++ b/x-pack/plugins/security/server/session_management/session.ts
@@ -10,8 +10,8 @@ import nodeCrypto from '@elastic/node-crypto';
 import { createHash, randomBytes } from 'crypto';
 import { promisify } from 'util';
 
+import type { KibanaRequest, Logger } from '@kbn/core/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { KibanaRequest, Logger } from 'src/core/server';
 
 import type { AuthenticationProvider } from '../../common/model';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/server/session_management/session_cookie.test.ts b/x-pack/plugins/security/server/session_management/session_cookie.test.ts
index 40b5fe3821200..35f59b2a5a892 100644
--- a/x-pack/plugins/security/server/session_management/session_cookie.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_cookie.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { SessionStorage } from 'src/core/server';
+import type { SessionStorage } from '@kbn/core/server';
 import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   sessionStorageMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import type { SessionCookieOptions } from './session_cookie';
 import { SessionCookie } from './session_cookie';
diff --git a/x-pack/plugins/security/server/session_management/session_cookie.ts b/x-pack/plugins/security/server/session_management/session_cookie.ts
index e747b15e78e89..4f5289490678c 100644
--- a/x-pack/plugins/security/server/session_management/session_cookie.ts
+++ b/x-pack/plugins/security/server/session_management/session_cookie.ts
@@ -10,7 +10,7 @@ import type {
   KibanaRequest,
   Logger,
   SessionStorageFactory,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { ConfigType } from '../config';
 
diff --git a/x-pack/plugins/security/server/session_management/session_index.test.ts b/x-pack/plugins/security/server/session_management/session_index.test.ts
index b19f580f2d8dd..f6405bf56bda7 100644
--- a/x-pack/plugins/security/server/session_management/session_index.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_index.test.ts
@@ -13,7 +13,7 @@ import type {
   SearchResponse,
 } from '@elastic/elasticsearch/lib/api/types';
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { AuditLogger } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
diff --git a/x-pack/plugins/security/server/session_management/session_index.ts b/x-pack/plugins/security/server/session_management/session_index.ts
index 2a677f6ecf561..1103b9bb9c833 100644
--- a/x-pack/plugins/security/server/session_management/session_index.ts
+++ b/x-pack/plugins/security/server/session_management/session_index.ts
@@ -10,7 +10,7 @@ import type {
   SortResults,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import type { AuthenticationProvider } from '../../common/model';
 import type { AuditLogger } from '../audit';
diff --git a/x-pack/plugins/security/server/session_management/session_management_service.test.ts b/x-pack/plugins/security/server/session_management/session_management_service.test.ts
index 6c7df0540d1f9..000d9151d9fdc 100644
--- a/x-pack/plugins/security/server/session_management/session_management_service.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_management_service.test.ts
@@ -7,14 +7,14 @@
 
 import { Subject } from 'rxjs';
 
-import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import type {
   TaskManagerStartContract,
   TaskRunCreatorFunction,
-} from '../../../task_manager/server';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+} from '@kbn/task-manager-plugin/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { nextTick } from '@kbn/test-jest-helpers';
+
 import type { AuditLogger } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
 import { ConfigSchema, createConfig } from '../config';
diff --git a/x-pack/plugins/security/server/session_management/session_management_service.ts b/x-pack/plugins/security/server/session_management/session_management_service.ts
index 03a5d6130c3c1..ee79e2eb0f1d3 100644
--- a/x-pack/plugins/security/server/session_management/session_management_service.ts
+++ b/x-pack/plugins/security/server/session_management/session_management_service.ts
@@ -7,13 +7,13 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { ElasticsearchClient, HttpServiceSetup, Logger } from 'src/core/server';
-
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import type { ElasticsearchClient, HttpServiceSetup, Logger } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import type {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+
 import type { AuditLogger } from '../audit';
 import type { ConfigType } from '../config';
 import type { OnlineStatusRetryScheduler } from '../elasticsearch';
diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
index 607ea032078ee..e0e0a925c8b27 100644
--- a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
+++ b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
@@ -7,17 +7,17 @@
 
 import { mockEnsureAuthorized } from './secure_spaces_client_wrapper.test.mocks';
 
-import { deepFreeze } from '@kbn/std';
 import type {
   EcsEventOutcome,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import type { GetAllSpacesPurpose, LegacyUrlAliasTarget, Space } from '@kbn/spaces-plugin/server';
+import { spacesClientMock } from '@kbn/spaces-plugin/server/mocks';
+import { deepFreeze } from '@kbn/std';
 
-import type { GetAllSpacesPurpose, LegacyUrlAliasTarget, Space } from '../../../spaces/server';
-import { spacesClientMock } from '../../../spaces/server/mocks';
 import type { AuditEvent, AuditLogger } from '../audit';
 import { SavedObjectAction, SpaceAuditAction } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
index c43216643205f..37de2293785a3 100644
--- a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
+++ b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
@@ -7,8 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest, SavedObjectsClientContract } from 'src/core/server';
-
+import type { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   GetAllSpacesOptions,
   GetAllSpacesPurpose,
@@ -16,7 +15,8 @@ import type {
   ISpacesClient,
   LegacyUrlAliasTarget,
   Space,
-} from '../../../spaces/server';
+} from '@kbn/spaces-plugin/server';
+
 import { ALL_SPACES_ID } from '../../common/constants';
 import type { AuditLogger } from '../audit';
 import { SavedObjectAction, savedObjectEvent, SpaceAuditAction, spaceAuditEvent } from '../audit';
diff --git a/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts b/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts
index e151b943e2b04..179f6cfa1cf0a 100644
--- a/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts
+++ b/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
-import { spacesMock } from '../../../spaces/server/mocks';
 import { auditServiceMock } from '../audit/mocks';
 import { authorizationMock } from '../authorization/index.mock';
 import { setupSpacesClient } from './setup_spaces_client';
diff --git a/x-pack/plugins/security/server/spaces/setup_spaces_client.ts b/x-pack/plugins/security/server/spaces/setup_spaces_client.ts
index 0d2f90290425f..a13c7f6434365 100644
--- a/x-pack/plugins/security/server/spaces/setup_spaces_client.ts
+++ b/x-pack/plugins/security/server/spaces/setup_spaces_client.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsClient } from '../../../../../src/core/server';
-import type { SpacesPluginSetup } from '../../../spaces/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+
 import type { AuditServiceSetup } from '../audit';
 import type { AuthorizationServiceSetup } from '../authorization';
 import { SecureSpacesClientWrapper } from './secure_spaces_client_wrapper';
diff --git a/x-pack/plugins/security/server/types.ts b/x-pack/plugins/security/server/types.ts
index 1ce8a19d46180..6227696a9fbc7 100644
--- a/x-pack/plugins/security/server/types.ts
+++ b/x-pack/plugins/security/server/types.ts
@@ -5,16 +5,15 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { CustomRequestHandlerContext, IRouter } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 /**
  * @internal
  */
-export interface SecurityRequestHandlerContext extends RequestHandlerContext {
+export type SecurityRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts
index 72ef6bc5817b2..3b6e28765f69f 100644
--- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts
+++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts
@@ -6,11 +6,11 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   createCollectorFetchContextMock,
   usageCollectionPluginMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import type { SecurityLicenseFeatures } from '../../common/licensing';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts
index 9b3826372bce2..0b1ef3a3d1f39 100644
--- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts
+++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import type { SecurityLicense } from '../../common/licensing';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts b/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts
index 09208f6a7fe3d..f81c9fef7e1e2 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts
@@ -7,7 +7,7 @@
 
 import { getQueryFilter, getAllFilters } from './get_query_filter';
 import type { Filter } from '@kbn/es-query';
-import { getExceptionListItemSchemaMock } from '../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('get_filter', () => {
   describe('getQueryFilter', () => {
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts
index f695aad1eb125..40f6144b5ac17 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts
@@ -49,6 +49,7 @@ import {
   Threats,
   Type,
 } from '@kbn/securitysolution-io-ts-alerting-types';
+import { AlertWithCommonFields800 } from '@kbn/rule-registry-plugin/common/schemas/8.0.0';
 import {
   ALERT_ANCESTORS,
   ALERT_DEPTH,
@@ -70,7 +71,6 @@ import {
 } from '../../../../field_maps/field_names';
 // TODO: Create and import 8.0.0 versioned RuleAlertAction type
 import { RuleAlertAction, SearchTypes } from '../../../types';
-import { AlertWithCommonFields800 } from '../../../../../../rule_registry/common/schemas/8.0.0';
 
 /* DO NOT MODIFY THIS SCHEMA TO ADD NEW FIELDS. These types represent the alerts that shipped in 8.0.0.
 Any changes to these types should be bug fixes so the types more accurately represent the alerts from 8.0.0.
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts
index a47d57c299117..b16b29c533d77 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts
@@ -9,7 +9,7 @@ import { ExportRulesDetails } from './export_rules_details_schema';
 import {
   ExportExceptionDetailsMock,
   getExceptionExportDetailsMock,
-} from '../../../../../lists/common/schemas/response/exception_export_details_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/response/exception_export_details_schema.mock';
 
 interface RuleDetailsMock {
   totalCount?: number;
diff --git a/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts b/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts
index acc58a96981a0..33bcd0e82972f 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleAction } from '../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 import { RuleAlertAction } from './types';
 
 export const transformRuleToAlertAction = ({
diff --git a/x-pack/plugins/security_solution/common/detection_engine/types.ts b/x-pack/plugins/security_solution/common/detection_engine/types.ts
index d563d1333cd04..b8994266707a4 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleAction } from '../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 export type RuleAlertAction = Omit<RuleAction, 'actionTypeId'> & {
   action_type_id: string;
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
index 8f69df325fe42..599072a1b90e9 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
@@ -8,8 +8,8 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { DeepPartial } from 'utility-types';
 import { merge } from 'lodash';
+import { Agent, AGENTS_INDEX, AgentStatus, FleetServerAgent } from '@kbn/fleet-plugin/common';
 import { BaseDataGenerator } from './base_data_generator';
-import { Agent, AGENTS_INDEX, AgentStatus, FleetServerAgent } from '../../../../fleet/common';
 
 const agentStatusList: readonly AgentStatus[] = [
   'offline',
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts
index e19a814ab07e4..cdc27c9da57e5 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { agentPolicyStatuses, GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 import { BaseDataGenerator } from './base_data_generator';
-import { agentPolicyStatuses, GetAgentPoliciesResponseItem } from '../../../../fleet/common';
 
 export class FleetAgentPolicyGenerator extends BaseDataGenerator<GetAgentPoliciesResponseItem> {
   generate(overrides: Partial<GetAgentPoliciesResponseItem> = {}): GetAgentPoliciesResponseItem {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts
index e9d609585841a..4fe7d06868355 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
 import { BaseDataGenerator } from './base_data_generator';
-import { PackagePolicy } from '../../../../fleet/common';
 import { policyFactory } from '../models/policy_config';
 import { PolicyData } from '../types';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts
index ecffe5c41dcab..a54f3b6a21aa0 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts
@@ -7,8 +7,8 @@
 
 import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { BaseDataGenerator } from './base_data_generator';
-import { getCreateExceptionListItemSchemaMock } from '../../../../lists/common/schemas/request/create_exception_list_item_schema.mock';
 
 const EFFECT_SCOPE_TYPES = ['policy:', 'policy:all'];
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts
index dc0f2b29ec94b..369b1fff5fe39 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts
@@ -7,6 +7,7 @@
 
 import { Client } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
 import {
   EndpointAction,
   EndpointActionResponse,
@@ -15,7 +16,6 @@ import {
   LogsEndpointActionResponse,
 } from '../types';
 import { ENDPOINT_ACTIONS_INDEX, ENDPOINT_ACTION_RESPONSES_INDEX } from '../constants';
-import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '../../../../fleet/common';
 import { FleetActionGenerator } from '../data_generators/fleet_action_generator';
 import { wrapErrorAndRejectPromise } from './utils';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
index d2c42a1b40094..7d9d08021fe54 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
@@ -12,7 +12,7 @@ import uuid from 'uuid';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { KbnClient } from '@kbn/test';
 import { DeleteByQueryResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Agent, CreatePackagePolicyResponse, GetPackagesResponse } from '../../../../fleet/common';
+import { Agent, CreatePackagePolicyResponse, GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import { EndpointDocGenerator } from '../generate_data';
 import { HostMetadata, HostPolicyResponse } from '../types';
 import {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
index 263b6bc175688..70b1e1c52a77b 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
@@ -10,13 +10,13 @@ import { AxiosResponse } from 'axios';
 import { DeleteByQueryResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { KbnClient } from '@kbn/test';
-import { HostMetadata } from '../types';
 import {
   Agent,
   AGENT_API_ROUTES,
   FleetServerAgent,
   GetOneAgentResponse,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { HostMetadata } from '../types';
 import { FleetAgentGenerator } from '../data_generators/fleet_agent_generator';
 import { wrapErrorAndRejectPromise } from './utils';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts
index bc8c7a0525b24..37c0e37a4fbf8 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts
@@ -18,7 +18,7 @@ import {
   DeleteAgentPolicyResponse,
   DeletePackagePoliciesResponse,
   PACKAGE_POLICY_API_ROUTES,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { PolicyData } from '../types';
 import { policyFactory as policyConfigFactory } from '../models/policy_config';
 import { wrapErrorAndRejectPromise } from './utils';
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts
index 11f262156d0a8..c11c2025ee88e 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { FLEET_SERVER_SERVERS_INDEX } from '../../../../fleet/common';
+import { FLEET_SERVER_SERVERS_INDEX } from '@kbn/fleet-plugin/common';
 import { wrapErrorAndRejectPromise } from './utils';
 
 /**
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts
index a236b56737e03..762fd556dc698 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts
@@ -16,7 +16,7 @@ import {
   IBulkInstallPackageHTTPError,
   PostFleetSetupResponse,
   SETUP_API_ROUTE,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { EndpointDataLoadingError, wrapErrorAndRejectPromise } from './utils';
 
 export interface SetupFleetForEndpointResponse {
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index 443b27802c538..a571c7848bdf3 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -8,6 +8,13 @@
 import seedrandom from 'seedrandom';
 import semverLte from 'semver/functions/lte';
 import { assertNever } from '@kbn/std';
+import {
+  GetAgentPoliciesResponseItem,
+  GetPackagesResponse,
+  EsAssetReference,
+  KibanaAssetReference,
+  agentPolicyStatuses,
+} from '@kbn/fleet-plugin/common';
 import {
   AlertEvent,
   DataStream,
@@ -28,13 +35,6 @@ import {
   processNameSafeVersion,
   timestampSafeVersion,
 } from './models/event';
-import {
-  GetAgentPoliciesResponseItem,
-  GetPackagesResponse,
-  EsAssetReference,
-  KibanaAssetReference,
-  agentPolicyStatuses,
-} from '../../../fleet/common';
 import { firstNonNullValue } from './models/ecs_safety_helpers';
 import { EventOptions } from './types/generator';
 import { BaseDataGenerator } from './data_generators/base_data_generator';
diff --git a/x-pack/plugins/security_solution/common/endpoint/index_data.ts b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
index 57c20ffa242ea..a783c523f07b0 100644
--- a/x-pack/plugins/security_solution/common/endpoint/index_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
@@ -11,12 +11,12 @@ import seedrandom from 'seedrandom';
 import { KbnClient } from '@kbn/test';
 import { AxiosResponse } from 'axios';
 import { merge } from 'lodash';
-import { EndpointDocGenerator, TreeOptions } from './generate_data';
 import {
   CreatePackagePolicyResponse,
   EPM_API_ROUTES,
   GetPackagesResponse,
-} from '../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { EndpointDocGenerator, TreeOptions } from './generate_data';
 import {
   deleteIndexedEndpointHosts,
   DeleteIndexedEndpointHostsResponse,
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
index a5476159a03ac..317ee194ccc20 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
 import { TrustedAppConditionEntry } from '../types';
-import { getDuplicateFields, isValidHash } from '../service/trusted_apps/validations';
+import { getDuplicateFields, isValidHash } from '../service/artifacts/validations';
 
 export const DeleteTrustedAppsRequestSchema = {
   params: schema.object({
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/trusted_apps/validations.ts b/x-pack/plugins/security_solution/common/endpoint/service/artifacts/validations.ts
similarity index 100%
rename from x-pack/plugins/security_solution/common/endpoint/service/trusted_apps/validations.ts
rename to x-pack/plugins/security_solution/common/endpoint/service/artifacts/validations.ts
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts
index 3d64bd98b758e..545473405ea46 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { calculateEndpointAuthz, getEndpointAuthzInitialState } from './authz';
-import { createFleetAuthzMock, FleetAuthz } from '../../../../../fleet/common';
+import { createFleetAuthzMock, FleetAuthz } from '@kbn/fleet-plugin/common';
 import { createLicenseServiceMock } from '../../../license/mocks';
 import { EndpointAuthzKeyList } from '../../types/authz';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts
index f2e59a57c20a1..782ff51ccb532 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { FleetAuthz } from '@kbn/fleet-plugin/common';
 import { LicenseService } from '../../../license';
-import { FleetAuthz } from '../../../../../fleet/common';
 import { EndpointAuthz } from '../../types/authz';
 import { MaybeImmutable } from '../../types';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/generator.ts b/x-pack/plugins/security_solution/common/endpoint/types/generator.ts
index b512697fb5d01..edfdbee854f67 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/generator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataStream } from './index';
+import { DataStream } from '.';
 
 /**
  * The configuration options for generating an event.
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
index 5aa38617f0331..72a1b3e2a4bee 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { Agent, PackagePolicy, UpdatePackagePolicy } from '../../../../fleet/common';
+import { ApplicationStart } from '@kbn/core/public';
+import { Agent, PackagePolicy, UpdatePackagePolicy } from '@kbn/fleet-plugin/common';
 import { ManifestSchema } from '../schema/manifest';
 
 export * from './actions';
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index 026cfd273905e..63a626055c7cb 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -16,7 +16,7 @@ export const allowedExperimentalValues = Object.freeze({
   tGridEnabled: true,
   tGridEventRenderedViewEnabled: true,
   excludePoliciesInFilterEnabled: false,
-  usersEnabled: false,
+  usersEnabled: true,
   detectionResponseEnabled: false,
   disableIsolationUIPendingStatuses: false,
   riskyHostsEnabled: false,
diff --git a/x-pack/plugins/security_solution/common/license/license.ts b/x-pack/plugins/security_solution/common/license/license.ts
index 1b4cce0762edf..4761d40c440de 100644
--- a/x-pack/plugins/security_solution/common/license/license.ts
+++ b/x-pack/plugins/security_solution/common/license/license.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subscription } from 'rxjs';
-import { ILicense, LicenseType } from '../../../licensing/common/types';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 
 // Generic license service class that works with the license observable
 // Both server and client plugins instancates a singleton version of this class
diff --git a/x-pack/plugins/security_solution/common/license/policy_config.test.ts b/x-pack/plugins/security_solution/common/license/policy_config.test.ts
index e08a096be82ef..e62b063fd3dfe 100644
--- a/x-pack/plugins/security_solution/common/license/policy_config.test.ts
+++ b/x-pack/plugins/security_solution/common/license/policy_config.test.ts
@@ -16,7 +16,7 @@ import {
   policyFactoryWithSupportedFeatures,
   policyFactoryWithoutPaidFeatures,
 } from '../endpoint/models/policy_config';
-import { licenseMock } from '../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 import { ProtectionModes } from '../endpoint/types';
 
 describe('policy_config and licenses', () => {
diff --git a/x-pack/plugins/security_solution/common/license/policy_config.ts b/x-pack/plugins/security_solution/common/license/policy_config.ts
index 7342968a380b1..7827722c410b3 100644
--- a/x-pack/plugins/security_solution/common/license/policy_config.ts
+++ b/x-pack/plugins/security_solution/common/license/policy_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { isAtLeast } from './license';
 import { PolicyConfig } from '../endpoint/types';
 import {
diff --git a/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts b/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts
index 79a0084f91923..68a29dd3c55b9 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
-import { getDefaultMlCapabilities } from '../../../ml/common';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
+import { getDefaultMlCapabilities } from '@kbn/ml-plugin/common';
 
 export const emptyMlCapabilities: MlCapabilitiesResponse = {
   capabilities: getDefaultMlCapabilities(),
diff --git a/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts b/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts
index 76799249c70be..6c27f1b7603d8 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 
 export const hasMlAdminPermissions = (capabilities: MlCapabilitiesResponse): boolean =>
   getDataFeedPermissions(capabilities) &&
diff --git a/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts b/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts
index 1aef515f85c0e..600670af1b588 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 
 export const hasMlLicense = (capabilities: MlCapabilitiesResponse): boolean =>
   capabilities.isPlatinumOrTrialLicense;
diff --git a/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts b/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts
index ba61afba74745..bfc9c302193fc 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 
 export const hasMlUserPermissions = (capabilities: MlCapabilitiesResponse): boolean =>
   capabilities.capabilities.canGetJobs &&
diff --git a/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts
index 1a6fbbf6cfcb6..a3e0c078449ab 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlSummaryJob } from '../../../ml/common/types/anomaly_detection_jobs';
+import { MlSummaryJob } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { isSecurityJob } from './is_security_job';
 
 describe('isSecurityJob', () => {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
index f1a2977b27e19..1cbe165e9f0d9 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { IEsSearchResponse } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 export type {
   Inspect,
   SortField,
@@ -13,8 +13,8 @@ export type {
   DocValueFields,
   CursorType,
   TotalValue,
-} from '../../../../timelines/common';
-export { Direction } from '../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
+export { Direction } from '@kbn/timelines-plugin/common';
 
 export type Maybe<T> = T | null;
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
index 86bc11f7a596d..9750fbde2db47 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
@@ -13,9 +13,9 @@ export type {
   IndexFieldsStrategyResponse,
   BrowserField,
   BrowserFields,
-} from '../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
 export {
   EMPTY_BROWSER_FIELDS,
   EMPTY_DOCVALUE_FIELD,
   EMPTY_INDEX_FIELDS,
-} from '../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
index 24b65377af5f0..40fc2b7e0830e 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { IEsSearchResponse } from 'src/plugins/data/public';
+import type { IEsSearchResponse } from '@kbn/data-plugin/public';
 
 import {
   CtiEnrichment,
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts
index 6877ceec5ea57..f4ac81a6e9d34 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { IEsSearchResponse, IEsSearchRequest } from 'src/plugins/data/public';
+import { IEsSearchResponse, IEsSearchRequest } from '@kbn/data-plugin/public';
 import { FactoryQueryTypes } from '../..';
 import { EVENT_ENRICHMENT_INDICATOR_FIELD_MAP } from '../../../cti/constants';
 import { Inspect, Maybe, TimerangeInput } from '../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
index feb2f6e19e491..124388b84c3c8 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { HostItem, HostsFields } from '../common';
 import { CursorType, Direction, Inspect, Maybe, PageInfoPaginated } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
index e17703ff57a2a..2271f18ad326a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, TimerangeInput } from '../../../common';
 import { HostItem, HostsFields } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
index 70a7af9356d1a..3281fabe30829 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, Direction } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 import { HostsFields } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts
index b120161210745..4a9a1383e228f 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { HostsKpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts
index ca03a9a7252b2..535a5f57cf724 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { HostsKpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts
index a51b08ad77f56..b0c3edde0dda7 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { HostsKpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
index dcf10173ccfd9..791da07d26cd9 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, SearchHit } from '../../../common';
 import { RequestBasicOptions } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts
index 0b987f4bf3f42..c4bb787ba8198 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { HostEcs } from '../../../../ecs/host';
 import { UserEcs } from '../../../../ecs/user';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
index f2d9e0e36bd0e..57a511d934879 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   HostDetailsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts
index d1d9a8f5d9d3e..ecd00cefd5f88 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts
@@ -6,9 +6,9 @@
  */
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, TimerangeInput } from '../../common';
-import { AuthenticationHit, RequestBasicOptions } from '../';
+import { AuthenticationHit, RequestBasicOptions } from '..';
 import { AlertsGroupData } from './alerts';
 import { AnomaliesActionGroupData, AnomalyHit } from './anomalies';
 import { DnsHistogramGroupData } from './dns';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts
index 0495ad24a6b16..3235c0871fd3c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { HostEcs } from '../../../../ecs/host';
 import { GeoEcs } from '../../../../ecs/geo';
 import { Inspect, Maybe, TotalValue, Hit, ShardsResponse } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts
index bd79532e4885a..ba298fab2771c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated, SortField } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
index 0b19f475c452b..26eab7b3877db 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Maybe, CursorType, Inspect, PageInfoPaginated, GenericBuckets } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts
index 8e631ffcdb746..70328ffaad991 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts
index 5a404c2c0c0a1..75889617fb050 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts
index c772d5d0c6ceb..88259a74df110 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts
index 9f72eac8afad0..4a71c01ba7c03 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts
index f1b06c68e3786..fb5fc0596435f 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts
index 22325dff8e148..7fff355e54c1b 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, SearchHit } from '../../../common';
 import { RequestBasicOptions } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
index c4c3ece61005a..d512f12bcbb6b 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 import { FlowTargetSourceDest } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts
index 7de0bbbb53f50..3a94d92a6c844 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 import {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts
index 676daa1086921..7f663d76accd0 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   GeoItem,
   FlowTargetSourceDest,
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts
index 029ae4aa62335..a58dbe7fd6e22 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated, SortField } from '../../../common';
 import { FlowTarget } from '../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts
index 4c65f9db1b14a..0ee560090090c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
+import type { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FactoryQueryTypes } from '../..';
-import type {
-  IEsSearchRequest,
-  IEsSearchResponse,
-} from '../../../../../../../../src/plugins/data/common';
 
 import { ESQuery } from '../../../../typed_json';
 import { Inspect, Maybe, SortField, TimerangeInput } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts
index c1943059e1536..fad454918ce5a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getHostRiskIndex, getUserRiskIndex } from './';
+import { getHostRiskIndex, getUserRiskIndex } from '.';
 
 describe('hosts risk search_strategy getHostRiskIndex', () => {
   it('should properly return host index if space is specified', () => {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts
index 895a3d15476f1..6f1dd9ec0e991 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
+import type { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FactoryQueryTypes, RiskScoreAggByFields, RiskSeverity } from '../..';
-import type {
-  IEsSearchRequest,
-  IEsSearchResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { ESQuery } from '../../../../typed_json';
 
 import { Inspect, Maybe } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts
index 3e50bbe68b5f8..67b65fa098c2a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts
index f4b6cdcbe6e55..c412c96204138 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { UserEcs } from '../../../../ecs/user';
 import { SourceEcs } from '../../../../ecs/source';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
index 2b74a1c251385..3fc5d86b61a24 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, TimerangeInput } from '../../../common';
 import { UserItem } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts
index 9069393102a5b..6aac185f71238 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { KpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
index 4e5f8af41a2ef..e85679e6c5dd8 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
@@ -11,4 +11,4 @@ export type {
   TimelineNonEcsData,
   TimelineEventsAllStrategyResponse,
   TimelineEventsAllRequestOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts
index e4d2ea52ffdff..8a5154f56f4c0 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts
@@ -5,8 +5,4 @@
  * 2.0.
  */
 
-export type {
-  TimelineEdges,
-  TimelineItem,
-  TimelineNonEcsData,
-} from '../../../../../../timelines/common';
+export type { TimelineEdges, TimelineItem, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts
index 3fd13e56cc7e7..b8994774a1887 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts
@@ -9,4 +9,4 @@ export type {
   TimelineEventsDetailsItem,
   TimelineEventsDetailsStrategyResponse,
   TimelineEventsDetailsRequestOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts
index 10e9bbd7670cd..38ebb27e0416a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts
@@ -11,4 +11,4 @@ export type {
   EqlOptionsData,
   EqlOptionsSelected,
   FieldsEqlOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts
index d6735b59c229d..924fff0230a14 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export { LastEventIndexKey } from '../../../../../../timelines/common';
+export { LastEventIndexKey } from '@kbn/timelines-plugin/common';
 
 export type {
   LastTimeDetails,
@@ -13,4 +13,4 @@ export type {
   TimelineKpiStrategyRequest,
   TimelineKpiStrategyResponse,
   TimelineEventsLastEventTimeRequestOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
index a66a10110f5b2..b293ad9660988 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   TimelineEventsQueries,
diff --git a/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts b/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts
index 782af107417c2..c3778b43bcae9 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts
@@ -11,4 +11,4 @@ export type {
   HeaderCellRender,
   RowCellRender,
   ControlColumnProps,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts b/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts
index 83b0ced332a62..22c230db559f1 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export type { CellValueElementProps } from '../../../../../timelines/common';
+export type { CellValueElementProps } from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts b/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts
index ee4d621e35d6c..f58558be948de 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts
@@ -10,4 +10,4 @@ export type {
   ColumnId,
   ColumnHeaderOptions,
   ColumnRenderer,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts b/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts
index f363176ac0a88..cfc33d5aa960f 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-export { IS_OPERATOR, EXISTS_OPERATOR } from '../../../../../timelines/common';
+export { IS_OPERATOR, EXISTS_OPERATOR } from '@kbn/timelines-plugin/common';
 
 export type {
   QueryOperator,
@@ -12,4 +12,4 @@ export type {
   QueryMatch,
   DataProvider,
   DataProvidersAnd,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts b/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts
index ae2d19a5e2ca8..ea92167769108 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts
@@ -4,4 +4,4 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-export type { RowRenderer } from '../../../../../timelines/common';
+export type { RowRenderer } from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
index 92bd07b8a24ba..4f62fb199272f 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
@@ -26,12 +26,12 @@ import {
   SHOWING_RULES_TEXT,
 } from '../../screens/alerts_detection_rules';
 import {
-  ABOUT_CONTINUE_BTN,
-  ABOUT_EDIT_BUTTON,
+  // ABOUT_CONTINUE_BTN,
+  // ABOUT_EDIT_BUTTON,
   ACTIONS_THROTTLE_INPUT,
   CUSTOM_QUERY_INPUT,
-  DEFINE_CONTINUE_BUTTON,
-  DEFINE_EDIT_BUTTON,
+  // DEFINE_CONTINUE_BUTTON,
+  // DEFINE_EDIT_BUTTON,
   DEFINE_INDEX_INPUT,
   DEFAULT_RISK_SCORE_INPUT,
   RULE_DESCRIPTION_INPUT,
@@ -134,6 +134,7 @@ describe('Custom query rules', () => {
       fillAboutRuleAndContinue(this.rule);
       fillScheduleRuleAndContinue(this.rule);
 
+      /* Commenting this piece of code due to the following issue: https://github.com/elastic/kibana/issues/130767
       // expect define step to repopulate
       cy.get(DEFINE_EDIT_BUTTON).click();
       cy.get(CUSTOM_QUERY_INPUT).should('have.value', this.rule.customQuery);
@@ -144,7 +145,7 @@ describe('Custom query rules', () => {
       cy.get(ABOUT_EDIT_BUTTON).click();
       cy.get(RULE_NAME_INPUT).invoke('val').should('eql', this.rule.name);
       cy.get(ABOUT_CONTINUE_BTN).should('exist').click({ force: true });
-      cy.get(ABOUT_CONTINUE_BTN).should('not.exist');
+      cy.get(ABOUT_CONTINUE_BTN).should('not.exist');  */
 
       createAndEnableRule();
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts
index 49991c8546845..1d25e2eb0c508 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts
@@ -177,11 +177,14 @@ describe('indicator match', () => {
           visitWithoutDateRange(RULE_CREATION);
           selectIndicatorMatchType();
         });
-        it('Has a default set of *:*', () => {
+
+        // Unskip once https://github.com/elastic/kibana/issues/130770 is fixed
+        it.skip('Has a default set of *:*', () => {
           getCustomQueryInput().should('have.text', '*:*');
         });
 
-        it('Shows invalidation text if text is removed', () => {
+        // Unskip once https://github.com/elastic/kibana/issues/1307707 is fixed
+        it.skip('Shows invalidation text if text is removed', () => {
           getCustomQueryInput().type('{selectall}{del}');
           getCustomQueryInvalidationText().should('exist');
         });
@@ -398,7 +401,8 @@ describe('indicator match', () => {
       });
 
       describe('Schedule', () => {
-        it('IM rule has 1h time interval and lookback by default', () => {
+        // Unskip once https://github.com/elastic/kibana/issues/1307707 is fixed
+        it.skip('IM rule has 1h time interval and lookback by default', () => {
           visitWithoutDateRange(RULE_CREATION);
           selectIndicatorMatchType();
           fillDefineIndicatorMatchRuleAndContinue(getNewThreatIndicatorRule());
@@ -417,7 +421,8 @@ describe('indicator match', () => {
         deleteAlertsAndRules();
       });
 
-      it('Creates and enables a new Indicator Match rule', () => {
+      // Unskip once https://github.com/elastic/kibana/issues/1307707 is fixed
+      it.skip('Creates and enables a new Indicator Match rule', () => {
         visitWithoutDateRange(RULE_CREATION);
         selectIndicatorMatchType();
         fillDefineIndicatorMatchRuleAndContinue(getNewThreatIndicatorRule());
diff --git a/x-pack/plugins/security_solution/cypress/integration/exceptions/from_alert.spec.ts b/x-pack/plugins/security_solution/cypress/integration/exceptions/from_alert.spec.ts
index 5f6837e3e38d8..9ab4c1559c4cd 100644
--- a/x-pack/plugins/security_solution/cypress/integration/exceptions/from_alert.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/exceptions/from_alert.spec.ts
@@ -17,7 +17,6 @@ import { waitForAlertsToPopulate } from '../../tasks/create_new_rule';
 import { esArchiverLoad, esArchiverUnload } from '../../tasks/es_archiver';
 import { login, visitWithoutDateRange } from '../../tasks/login';
 import {
-  enablesRule,
   addsException,
   goToAlertsTab,
   goToExceptionsTab,
@@ -28,20 +27,25 @@ import {
 import { DETECTIONS_RULE_MANAGEMENT_URL } from '../../urls/navigation';
 import { cleanKibana, deleteAlertsAndRules } from '../../tasks/common';
 
-describe.skip('From alert', () => {
+describe('From alert', () => {
   const NUMBER_OF_AUDITBEAT_EXCEPTIONS_ALERTS = '1 alert';
 
   before(() => {
     cleanKibana();
     login();
   });
+
   beforeEach(() => {
-    esArchiverLoad('auditbeat_for_exceptions');
+    esArchiverLoad('exceptions');
     deleteAlertsAndRules();
-    createCustomRule({ ...getNewRule(), index: ['exceptions-*'] }, 'rule_testing');
+    createCustomRule(
+      { ...getNewRule(), customQuery: 'agent.name:*', index: ['exceptions*'] },
+      'rule_testing',
+      '5s',
+      true
+    );
     visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
     goToRuleDetails();
-    enablesRule();
     waitForTheRuleToBeExecuted();
     waitForAlertsToPopulate();
 
@@ -50,31 +54,32 @@ describe.skip('From alert', () => {
   });
 
   afterEach(() => {
-    esArchiverUnload('auditbeat_for_exceptions');
-    esArchiverUnload('auditbeat_for_exceptions2');
+    esArchiverUnload('exceptions');
+    esArchiverUnload('exceptions_2');
   });
 
   it('Creates an exception and deletes it', () => {
+    // Create an exception from the alerts actions menu that matches
+    // the existing alert
     addExceptionFromFirstAlert();
     addsException(getException());
-    esArchiverLoad('auditbeat_for_exceptions2');
 
+    // Alerts table should now be empty from having added exception and closed
+    // matching alert
     cy.get(EMPTY_ALERT_TABLE).should('exist');
 
+    // Closed alert should appear in table
     goToClosedAlerts();
-
     cy.get(ALERTS_COUNT).should('exist');
     cy.get(NUMBER_OF_ALERTS).should('have.text', `${NUMBER_OF_AUDITBEAT_EXCEPTIONS_ALERTS}`);
 
-    goToOpenedAlerts();
-    waitForTheRuleToBeExecuted();
-
-    cy.get(EMPTY_ALERT_TABLE).should('exist');
-
+    // Remove the exception and load an event that would have matched that exception
+    // to show that said exception now starts to show up again
     goToExceptionsTab();
     removeException();
-    esArchiverLoad('auditbeat_for_exceptions2');
+    esArchiverLoad('exceptions_2');
     goToAlertsTab();
+    goToOpenedAlerts();
     waitForTheRuleToBeExecuted();
     waitForAlertsToPopulate();
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/exceptions/from_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/exceptions/from_rule.spec.ts
index 144e276735620..5e8c542b369a6 100644
--- a/x-pack/plugins/security_solution/cypress/integration/exceptions/from_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/exceptions/from_rule.spec.ts
@@ -17,7 +17,6 @@ import { waitForAlertsToPopulate } from '../../tasks/create_new_rule';
 import { esArchiverLoad, esArchiverUnload } from '../../tasks/es_archiver';
 import { login, visitWithoutDateRange } from '../../tasks/login';
 import {
-  enablesRule,
   addsExceptionFromRuleSettings,
   goToAlertsTab,
   goToExceptionsTab,
@@ -28,7 +27,7 @@ import {
 import { DETECTIONS_RULE_MANAGEMENT_URL } from '../../urls/navigation';
 import { cleanKibana, deleteAlertsAndRules } from '../../tasks/common';
 
-describe.skip('From rule', () => {
+describe('From rule', () => {
   const NUMBER_OF_AUDITBEAT_EXCEPTIONS_ALERTS = '1';
   before(() => {
     cleanKibana();
@@ -36,12 +35,16 @@ describe.skip('From rule', () => {
   });
 
   beforeEach(() => {
-    esArchiverLoad('auditbeat_for_exceptions');
+    esArchiverLoad('exceptions');
     deleteAlertsAndRules();
-    createCustomRule({ ...getNewRule(), index: ['exceptions-*'] }, 'rule_testing');
+    createCustomRule(
+      { ...getNewRule(), customQuery: 'agent.name:*', index: ['exceptions*'] },
+      'rule_testing',
+      '5s',
+      true
+    );
     visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
     goToRuleDetails();
-    enablesRule();
     waitForTheRuleToBeExecuted();
     waitForAlertsToPopulate();
 
@@ -50,33 +53,33 @@ describe.skip('From rule', () => {
   });
 
   afterEach(() => {
-    esArchiverUnload('auditbeat_for_exceptions');
-    esArchiverUnload('auditbeat_for_exceptions2');
+    esArchiverUnload('exceptions');
+    esArchiverUnload('exceptions_2');
   });
 
   it('Creates an exception and deletes it', () => {
+    // Create an exception from the exception tab that matches
+    // the existing alert
     goToExceptionsTab();
     addsExceptionFromRuleSettings(getException());
-    esArchiverLoad('auditbeat_for_exceptions2');
-    waitForTheRuleToBeExecuted();
-    goToAlertsTab();
 
+    // Alerts table should now be empty from having added exception and closed
+    // matching alert
+    goToAlertsTab();
     cy.get(EMPTY_ALERT_TABLE).should('exist');
 
+    // Closed alert should appear in table
     goToClosedAlerts();
-
     cy.get(ALERTS_COUNT).should('exist');
     cy.get(NUMBER_OF_ALERTS).should('have.text', `${NUMBER_OF_AUDITBEAT_EXCEPTIONS_ALERTS} alert`);
 
-    goToOpenedAlerts();
-    waitForTheRuleToBeExecuted();
-
-    cy.get(EMPTY_ALERT_TABLE).should('exist');
-
+    // Remove the exception and load an event that would have matched that exception
+    // to show that said exception now starts to show up again
     goToExceptionsTab();
     removeException();
-    esArchiverLoad('auditbeat_for_exceptions2');
+    esArchiverLoad('exceptions_2');
     goToAlertsTab();
+    goToOpenedAlerts();
     waitForTheRuleToBeExecuted();
     waitForAlertsToPopulate();
 
diff --git a/x-pack/plugins/security_solution/cypress/objects/exception.ts b/x-pack/plugins/security_solution/cypress/objects/exception.ts
index 637adc9fc0134..8427d828b6eea 100644
--- a/x-pack/plugins/security_solution/cypress/objects/exception.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/exception.ts
@@ -43,9 +43,9 @@ export const getExceptionList = (): ExceptionList => ({
 });
 
 export const getException = (): Exception => ({
-  field: 'host.name',
+  field: 'agent.name',
   operator: 'is',
-  values: ['suricata-iowa'],
+  values: ['foo'],
 });
 
 export const expectedExportedExceptionList = (
diff --git a/x-pack/plugins/security_solution/cypress/objects/rule.ts b/x-pack/plugins/security_solution/cypress/objects/rule.ts
index 4c257ed5bbd6b..bc86c03732741 100644
--- a/x-pack/plugins/security_solution/cypress/objects/rule.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/rule.ts
@@ -7,7 +7,7 @@
 
 import type { RulesSchema } from '../../common/detection_engine/schemas/response';
 /* eslint-disable @kbn/eslint/no-restricted-paths */
-import { rawRules } from '../../server/lib/detection_engine/rules/prepackaged_rules/index';
+import { rawRules } from '../../server/lib/detection_engine/rules/prepackaged_rules';
 import { getMockThreatData } from '../../public/detections/mitre/mitre_tactics_techniques';
 import { getTimeline, CompleteTimeline, getIndicatorMatchTimelineTemplate } from './timeline';
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts b/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts
index 405c118140395..ab58d60044a21 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/api_calls/rules.ts
@@ -7,7 +7,12 @@
 
 import { CustomRule, ThreatIndicatorRule } from '../../objects/rule';
 
-export const createCustomRule = (rule: CustomRule, ruleId = 'rule_testing', interval = '100m') =>
+export const createCustomRule = (
+  rule: CustomRule,
+  ruleId = 'rule_testing',
+  interval = '100m',
+  enabled = false
+) =>
   cy.request({
     method: 'POST',
     url: 'api/detection_engine/rules',
@@ -23,7 +28,7 @@ export const createCustomRule = (rule: CustomRule, ruleId = 'rule_testing', inte
       index: rule.index,
       query: rule.customQuery,
       language: 'kuery',
-      enabled: false,
+      enabled,
       exceptions_list: rule.exceptionLists ?? [],
     },
     headers: { 'kbn-xsrf': 'cypress-creds' },
diff --git a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
index 35def6967485c..267988462cfb8 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
@@ -70,12 +70,7 @@ export const openExceptionFlyoutFromRuleSettings = () => {
 };
 
 export const addsExceptionFromRuleSettings = (exception: Exception) => {
-  cy.get(ADD_EXCEPTIONS_BTN).click();
-  cy.get(LOADING_SPINNER).should('exist');
-  cy.get(LOADING_SPINNER).should('not.exist');
-  cy.get(LOADING_SPINNER).should('exist');
-  cy.get(LOADING_SPINNER).should('not.exist');
-  cy.get(FIELD_INPUT).should('be.visible');
+  openExceptionFlyoutFromRuleSettings();
   cy.get(FIELD_INPUT).type(`${exception.field}{enter}`);
   cy.get(OPERATOR_INPUT).type(`${exception.operator}{enter}`);
   exception.values.forEach((value) => {
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index 20baf7e8bbc29..9916dfbc6abdf 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -73,7 +73,7 @@ import {
 } from '../screens/timeline';
 import { REFRESH_BUTTON, TIMELINE } from '../screens/timelines';
 
-import { closeFieldsBrowser, filterFieldsBrowser } from '../tasks/fields_browser';
+import { closeFieldsBrowser, filterFieldsBrowser } from './fields_browser';
 
 export const hostExistsQuery = 'host.name: *';
 
diff --git a/x-pack/plugins/security_solution/kibana.json b/x-pack/plugins/security_solution/kibana.json
index faece05732b7e..af0bd12303119 100644
--- a/x-pack/plugins/security_solution/kibana.json
+++ b/x-pack/plugins/security_solution/kibana.json
@@ -54,6 +54,7 @@
     "kibanaReact",
     "usageCollection",
     "lists",
-    "ml"
+    "ml",
+    "unifiedSearch"
   ]
 }
diff --git a/x-pack/plugins/security_solution/public/app/app.tsx b/x-pack/plugins/security_solution/public/app/app.tsx
index 25ac8ee7f1317..244d59a2e76cb 100644
--- a/x-pack/plugins/security_solution/public/app/app.tsx
+++ b/x-pack/plugins/security_solution/public/app/app.tsx
@@ -11,9 +11,10 @@ import { Store, Action } from 'redux';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { EuiErrorBoundary } from '@elastic/eui';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { AppLeaveHandler, AppMountParameters } from '../../../../../src/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { AppLeaveHandler, AppMountParameters } from '@kbn/core/public';
 
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ManageUserInfo } from '../detections/components/user_info';
 import { DEFAULT_DARK_MODE, APP_NAME, APP_ID } from '../../common/constants';
 import { ErrorToastDispatcher } from '../common/components/error_toast_dispatcher';
@@ -29,7 +30,6 @@ import { State } from '../common/store';
 
 import { StartServices } from '../types';
 import { PageRouter } from './routes';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
 import { UserPrivilegesProvider } from '../common/components/user_privileges/user_privileges_context';
 import { ReactQueryClientProvider } from '../common/containers/query_client/query_client_provider';
 
diff --git a/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts b/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts
index 0676c516ede64..1a0e9bd1cdd70 100644
--- a/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts
+++ b/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { getDeepLinks } from '.';
-import { AppDeepLink, Capabilities } from '../../../../../../src/core/public';
+import { AppDeepLink, Capabilities } from '@kbn/core/public';
 import { SecurityPageName } from '../types';
 import { mockGlobalState } from '../../common/mock';
 import { CASES_FEATURE_ID, SERVER_APP_ID } from '../../../common/constants';
@@ -142,7 +142,11 @@ describe('deepLinks', () => {
 
   describe('experimental flags', () => {
     it('should return NO users link when enableExperimental.usersEnabled === false', () => {
-      const deepLinks = getDeepLinks(mockGlobalState.app.enableExperimental);
+      const deepLinks = getDeepLinks({
+        ...mockGlobalState.app.enableExperimental,
+        usersEnabled: false,
+      });
+
       expect(findDeepLink(SecurityPageName.users, deepLinks)).toBeFalsy();
     });
 
diff --git a/x-pack/plugins/security_solution/public/app/deep_links/index.ts b/x-pack/plugins/security_solution/public/app/deep_links/index.ts
index c80f2ca282f47..2a006c51bc7a4 100644
--- a/x-pack/plugins/security_solution/public/app/deep_links/index.ts
+++ b/x-pack/plugins/security_solution/public/app/deep_links/index.ts
@@ -8,10 +8,10 @@
 import { i18n } from '@kbn/i18n';
 
 import { get } from 'lodash';
-import { LicenseType } from '../../../../licensing/common/types';
-import { getCasesDeepLinks } from '../../../../cases/public';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { getCasesDeepLinks } from '@kbn/cases-plugin/public';
+import { AppDeepLink, AppNavLinkStatus, Capabilities } from '@kbn/core/public';
 import { SecurityPageName } from '../types';
-import { AppDeepLink, AppNavLinkStatus, Capabilities } from '../../../../../../src/core/public';
 import {
   OVERVIEW,
   DETECTION_RESPONSE,
diff --git a/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx b/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx
index 54e57dc5595ce..ff082a27e575e 100644
--- a/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx
@@ -18,7 +18,7 @@ import {
 } from '../../../common/mock';
 import { TimelineId } from '../../../../common/types/timeline';
 import { createStore } from '../../../common/store';
-import { kibanaObservable } from '../../../../../timelines/public/mock';
+import { kibanaObservable } from '@kbn/timelines-plugin/public/mock';
 import { sourcererPaths } from '../../../common/containers/sourcerer';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx b/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx
index 1abda9ca59354..768f05a36527c 100644
--- a/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx
@@ -15,12 +15,12 @@ import { useLocation } from 'react-router-dom';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
 import { i18n } from '@kbn/i18n';
 
-import { AppMountParameters } from '../../../../../../../src/core/public';
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { MlPopover } from '../../../common/components/ml_popover/ml_popover';
 import { useKibana } from '../../../common/lib/kibana';
 import { ADD_DATA_PATH } from '../../../../common/constants';
-import { isDetectionsPath } from '../../../../public/helpers';
+import { isDetectionsPath } from '../../../helpers';
 import { Sourcerer } from '../../../common/components/sourcerer';
 import { TimelineId } from '../../../../common/types/timeline';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
diff --git a/x-pack/plugins/security_solution/public/app/home/index.tsx b/x-pack/plugins/security_solution/public/app/home/index.tsx
index 19d4e5cc57b3b..602e2709f2a2a 100644
--- a/x-pack/plugins/security_solution/public/app/home/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/index.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 
+import { AppLeaveHandler, AppMountParameters } from '@kbn/core/public';
 import { DragDropContextWrapper } from '../../common/components/drag_and_drop/drag_drop_context_wrapper';
-import { AppLeaveHandler, AppMountParameters } from '../../../../../../src/core/public';
 import { SecuritySolutionAppWrapper } from '../../common/components/page';
 import { HelpMenu } from '../../common/components/help_menu';
 import { UseUrlState } from '../../common/components/url_state';
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx
index 6d09f369be044..9b74a2410a7e8 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx
@@ -8,8 +8,8 @@
 /* eslint-disable react/display-name */
 
 import React from 'react';
-import { KibanaPageTemplateProps } from '../../../../../../../../src/plugins/kibana_react/public';
-import { AppLeaveHandler } from '../../../../../../../../src/core/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
+import { AppLeaveHandler } from '@kbn/core/public';
 import { useShowTimeline } from '../../../../common/utils/timeline/use_show_timeline';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { TimelineId } from '../../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
index e81684200913a..0403071391d0d 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
@@ -9,7 +9,7 @@ import { render } from '@testing-library/react';
 import React from 'react';
 
 import { TestProviders } from '../../../common/mock';
-import { SecuritySolutionTemplateWrapper } from './';
+import { SecuritySolutionTemplateWrapper } from '.';
 
 jest.mock('./bottom_bar', () => ({
   ...jest.requireActual('./bottom_bar'),
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
index b9f18e7335a4d..dbeea0f4d9fe7 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
@@ -9,11 +9,8 @@ import React, { useMemo } from 'react';
 import styled from 'styled-components';
 import { EuiPanel } from '@elastic/eui';
 import { IS_DRAGGING_CLASS_NAME } from '@kbn/securitysolution-t-grid';
-import { AppLeaveHandler } from '../../../../../../../src/core/public';
-import {
-  KibanaPageTemplate,
-  NO_DATA_PAGE_TEMPLATE_PROPS,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { AppLeaveHandler } from '@kbn/core/public';
+import { KibanaPageTemplate, NO_DATA_PAGE_TEMPLATE_PROPS } from '@kbn/kibana-react-plugin/public';
 import { useSecuritySolutionNavigation } from '../../../common/components/navigation/use_security_solution_navigation';
 import { TimelineId } from '../../../../common/types/timeline';
 import { getTimelineShowStatusByIdSelector } from '../../../timelines/components/flyout/selectors';
@@ -80,7 +77,11 @@ export const SecuritySolutionTemplateWrapper: React.FC<SecuritySolutionPageWrapp
     const userHasSecuritySolutionVisible = useKibana().services.application.capabilities.siem.show;
     const showEmptyState = useShowPagesWithEmptyView();
     const emptyStateProps = showEmptyState
-      ? { ...NO_DATA_PAGE_TEMPLATE_PROPS, template: 'centeredContent' }
+      ? {
+          ...NO_DATA_PAGE_TEMPLATE_PROPS,
+          template: 'centeredContent',
+          pageContentProps: { verticalPosition: 'top' },
+        }
       : {};
 
     /*
diff --git a/x-pack/plugins/security_solution/public/app/routes.tsx b/x-pack/plugins/security_solution/public/app/routes.tsx
index a9a94a6998286..587c4dd230191 100644
--- a/x-pack/plugins/security_solution/public/app/routes.tsx
+++ b/x-pack/plugins/security_solution/public/app/routes.tsx
@@ -10,7 +10,7 @@ import React, { FC, memo, useEffect } from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
-import { AppLeaveHandler, AppMountParameters } from '../../../../../src/core/public';
+import { AppLeaveHandler, AppMountParameters } from '@kbn/core/public';
 import { ManageRoutesSpy } from '../common/utils/route/manage_spy_routes';
 import { RouteCapture } from '../common/components/endpoint/route_capture';
 import { AppAction } from '../common/store/actions';
diff --git a/x-pack/plugins/security_solution/public/app/types.ts b/x-pack/plugins/security_solution/public/app/types.ts
index 15365e3420f9d..455420472e5af 100644
--- a/x-pack/plugins/security_solution/public/app/types.ts
+++ b/x-pack/plugins/security_solution/public/app/types.ts
@@ -16,8 +16,8 @@ import {
   CombinedState,
 } from 'redux';
 import { RouteProps } from 'react-router-dom';
-import { AppMountParameters } from '../../../../../src/core/public';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { StartServices } from '../types';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/cases/pages/index.tsx b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
index 5b5e455563412..a3bfdab9f9114 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useRef } from 'react';
 import { useDispatch } from 'react-redux';
-import { CaseViewRefreshPropInterface } from '../../../../cases/common';
+import { CaseViewRefreshPropInterface } from '@kbn/cases-plugin/common';
 import { TimelineId } from '../../../common/types/timeline';
 
 import { getRuleDetailsUrl, useFormatUrl } from '../../common/components/link_to';
diff --git a/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts b/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts
index d39549a5bbac8..73a41cfdddbab 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts
+++ b/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts
@@ -6,10 +6,10 @@
  */
 
 import { useMemo } from 'react';
+import { Ecs } from '@kbn/cases-plugin/common';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../common/store/sourcerer/model';
 import { useQueryAlerts } from '../../detections/containers/detection_engine/alerts/use_query';
-import { Ecs } from '../../../../cases/common';
 import { buildAlertsQuery, formatAlertToEcsSignal, SignalHit } from '../../common/utils/alerts';
 
 export const useFetchAlertData = (alertIds: string[]): [boolean, Record<string, unknown>] => {
diff --git a/x-pack/plugins/security_solution/public/cases/routes.tsx b/x-pack/plugins/security_solution/public/cases/routes.tsx
index 19421940e338d..8774b3e11a556 100644
--- a/x-pack/plugins/security_solution/public/cases/routes.tsx
+++ b/x-pack/plugins/security_solution/public/cases/routes.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { SecuritySubPluginRoutes } from '../app/types';
 import { CASES_PATH } from '../../common/constants';
 import { Cases } from './pages';
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
index 7e71174c85a14..75b3965736d25 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
@@ -8,6 +8,7 @@
 import React, { useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import type { Filter } from '@kbn/es-query';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineActions } from '../../../timelines/store/timeline';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 import { StatefulEventsViewer } from '../events_viewer';
@@ -20,7 +21,6 @@ import { useKibana } from '../../lib/kibana';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_features';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants';
-import type { EntityType } from '../../../../../timelines/common';
 import { getDefaultControlColumn } from '../../../timelines/components/timeline/body/control_columns';
 
 export interface OwnProps {
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts
index 010c8b4e0e8e5..6c9e5dc704ecb 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import type { EntityType } from '../../../../../timelines/common';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 import { HostsComponentsQueryProps } from '../../../hosts/pages/navigation/types';
 import { NetworkComponentQueryProps } from '../../../network/pages/navigation/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx
index e36123ac817ec..98f69640db555 100644
--- a/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
-import { AndOrBadge } from './';
+import { AndOrBadge } from '.';
 import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({ eui: { euiColorLightShade: '#ece' } });
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap
index b0a55bb72acb8..ff496768397c1 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap
@@ -19,6 +19,14 @@ exports[`Authentication Host Table Component rendering it renders the host authe
   user-select: text;
 }
 
+.c1.toggle-expand .header-section-content {
+  height: 48px;
+}
+
+.c1.toggle-expand .header-section-titles {
+  margin-top: 16px;
+}
+
 .c0 {
   position: relative;
 }
@@ -52,7 +60,7 @@ exports[`Authentication Host Table Component rendering it renders the host authe
   data-test-subj="authentications-host-table-loading-false"
 >
   <header
-    class="c1 siemHeaderSection"
+    class="c1 toggle-expand siemHeaderSection"
     data-test-subj="header-section"
   >
     <div
@@ -62,13 +70,13 @@ exports[`Authentication Host Table Component rendering it renders the host authe
         class="euiFlexItem"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow header-section-content"
         >
           <div
             class="euiFlexItem"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive header-section-titles"
             >
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap
index 0796eebbe95fc..54df3a11f27b9 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap
@@ -19,6 +19,14 @@ exports[`Authentication User Table Component rendering it renders the user authe
   user-select: text;
 }
 
+.c1.toggle-expand .header-section-content {
+  height: 48px;
+}
+
+.c1.toggle-expand .header-section-titles {
+  margin-top: 16px;
+}
+
 .c0 {
   position: relative;
 }
@@ -52,7 +60,7 @@ exports[`Authentication User Table Component rendering it renders the user authe
   data-test-subj="table-users-authentications-loading-false"
 >
   <header
-    class="c1 siemHeaderSection"
+    class="c1 toggle-expand siemHeaderSection"
     data-test-subj="header-section"
   >
     <div
@@ -62,13 +70,13 @@ exports[`Authentication User Table Component rendering it renders the user authe
         class="euiFlexItem"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow header-section-content"
         >
           <div
             class="euiFlexItem"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive header-section-titles"
             >
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx
index 9138e35252597..422ec6b384531 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx
@@ -12,11 +12,11 @@ import '../../mock/match_media';
 import * as i18n from './translations';
 import { AuthenticationsHostTable } from './authentications_host_table';
 import { hostsModel } from '../../../hosts/store';
-import { TestProviders } from '../../../common/mock';
-import { useAuthentications } from '../../../common/containers/authentications';
-import { useQueryToggle } from '../../../common/containers/query_toggle';
+import { TestProviders } from '../../mock';
+import { useAuthentications } from '../../containers/authentications';
+import { useQueryToggle } from '../../containers/query_toggle';
 
-jest.mock('../../../common/containers/query_toggle', () => ({
+jest.mock('../../containers/query_toggle', () => ({
   useQueryToggle: jest.fn().mockReturnValue({ toggleStatus: true, setToggleStatus: jest.fn() }),
 }));
 jest.mock('../../containers/authentications', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx
index 45aa387ca1bcc..6936c147ae928 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx
@@ -9,14 +9,14 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import '../../mock/match_media';
 
-import { TestProviders } from '../../../common/mock';
-import { useAuthentications } from '../../../common/containers/authentications';
-import { useQueryToggle } from '../../../common/containers/query_toggle';
+import { TestProviders } from '../../mock';
+import { useAuthentications } from '../../containers/authentications';
+import { useQueryToggle } from '../../containers/query_toggle';
 import { AuthenticationsUserTable } from './authentications_user_table';
 import { usersModel } from '../../../users/store';
 import { AuthStackByField } from '../../../../common/search_strategy';
 
-jest.mock('../../../common/containers/query_toggle', () => ({
+jest.mock('../../containers/query_toggle', () => ({
   useQueryToggle: jest.fn().mockReturnValue({ toggleStatus: true, setToggleStatus: jest.fn() }),
 }));
 jest.mock('../../containers/authentications', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx b/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx
index 8547f0d13a9a7..e7085b7ee22aa 100644
--- a/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { globalNode } from '../../../common/mock';
+import { globalNode } from '../../mock';
 import { AutoDownload } from './auto_download';
 
 describe('AutoDownload', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
index deee4f9733108..55a4cc5840259 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
@@ -19,7 +19,7 @@ import { useTimeZone } from '../../lib/kibana';
 import { defaultLegendColors } from '../matrix_histogram/utils';
 import { useThrottledResizeObserver } from '../utils';
 import { hasValueToDisplay } from '../../utils/validators';
-import { EMPTY_VALUE_LABEL } from '../charts/translation';
+import { EMPTY_VALUE_LABEL } from './translation';
 
 import { ChartPlaceHolder } from './chart_place_holder';
 import {
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/donutchart.test.tsx b/x-pack/plugins/security_solution/public/common/components/charts/donutchart.test.tsx
new file mode 100644
index 0000000000000..82e51f0b4a06f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/charts/donutchart.test.tsx
@@ -0,0 +1,186 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { Partition, Settings } from '@elastic/charts';
+import { parsedMockAlertsData } from '../../../overview/components/detection_response/alerts_by_status/mock_data';
+import { render } from '@testing-library/react';
+import { DonutChart, DonutChartProps } from './donutchart';
+import { DraggableLegend } from './draggable_legend';
+import { ChartLabel } from '../../../overview/components/detection_response/alerts_by_status/chart_label';
+import { escapeDataProviderId } from '../drag_and_drop/helpers';
+import uuid from 'uuid';
+
+jest.mock('@elastic/charts', () => {
+  const actual = jest.requireActual('@elastic/charts');
+  return {
+    ...actual,
+    Chart: jest.fn(({ children, ...props }) => (
+      <div data-test-subj="es-chart" {...props}>
+        {children}
+      </div>
+    )),
+    Partition: jest.fn((props) => <div data-test-subj="es-chart-partition" {...props} />),
+    Settings: jest.fn((props) => <div data-test-subj="es-chart-settings" {...props} />),
+  };
+});
+
+jest.mock('uuid', () => {
+  const actual = jest.requireActual('uuid');
+
+  return {
+    ...actual,
+    v4: jest.fn().mockReturnValue('test-uuid'),
+  };
+});
+
+jest.mock('../../../overview/components/detection_response/alerts_by_status/chart_label', () => {
+  return {
+    ChartLabel: jest.fn((props) => <span data-test-subj="chart-label" {...props} />),
+  };
+});
+
+jest.mock('./draggable_legend', () => {
+  return {
+    DraggableLegend: jest.fn((props) => <span data-test-subj="draggable-legend" {...props} />),
+  };
+});
+
+jest.mock('./common', () => {
+  return {
+    useTheme: jest.fn(() => ({
+      eui: {
+        euiScrollBar: 0,
+        euiColorDarkShade: '#fff',
+        euiScrollBarCorner: '#ccc',
+      },
+    })),
+  };
+});
+
+const testColors = {
+  critical: '#EF6550',
+  high: '#EE9266',
+  medium: '#F3B689',
+  low: '#F8D9B2',
+};
+
+describe('DonutChart', () => {
+  const props: DonutChartProps = {
+    data: parsedMockAlertsData?.open?.severities,
+    label: 'Open',
+    link: null,
+    title: <ChartLabel count={parsedMockAlertsData?.open?.total} />,
+    fillColor: jest.fn(() => '#ccc'),
+    totalCount: parsedMockAlertsData?.open?.total,
+    legendItems: (['critical', 'high', 'medium', 'low'] as Severity[]).map((d) => ({
+      color: testColors[d],
+      dataProviderId: escapeDataProviderId(`draggable-legend-item-${uuid.v4()}-${d}`),
+      timelineId: undefined,
+      field: 'kibana.alert.severity',
+      value: d,
+    })),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  test('should render Chart', () => {
+    const { container } = render(<DonutChart {...props} />);
+    expect(container.querySelector(`[data-test-subj="es-chart"]`)).toBeInTheDocument();
+  });
+
+  test('should render chart Settings', () => {
+    const { container } = render(<DonutChart {...props} />);
+    expect(container.querySelector(`[data-test-subj="es-chart-settings"]`)).toBeInTheDocument();
+
+    expect((Settings as jest.Mock).mock.calls[0][0]).toEqual({
+      baseTheme: {
+        eui: {
+          euiColorDarkShade: '#fff',
+          euiScrollBar: 0,
+          euiScrollBarCorner: '#ccc',
+        },
+      },
+      theme: {
+        chartMargins: { bottom: 0, left: 0, right: 0, top: 0 },
+        partition: {
+          circlePadding: 4,
+          emptySizeRatio: 0.8,
+          idealFontSizeJump: 1.1,
+          outerSizeRatio: 1,
+        },
+      },
+    });
+  });
+
+  test('should render an empty chart', () => {
+    const testProps = {
+      ...props,
+      data: parsedMockAlertsData?.acknowledged?.severities,
+      label: 'Acknowledged',
+      title: <ChartLabel count={parsedMockAlertsData?.acknowledged?.total} />,
+      totalCount: parsedMockAlertsData?.acknowledged?.total,
+    };
+    const { container } = render(<DonutChart {...testProps} />);
+    expect(container.querySelector(`[data-test-subj="empty-donut"]`)).toBeInTheDocument();
+  });
+
+  test('should render chart Partition', () => {
+    const { container } = render(<DonutChart {...props} />);
+    expect(container.querySelector(`[data-test-subj="es-chart-partition"]`)).toBeInTheDocument();
+    expect((Partition as jest.Mock).mock.calls[0][0].data).toEqual(
+      parsedMockAlertsData?.open?.severities
+    );
+    expect((Partition as jest.Mock).mock.calls[0][0].layout).toEqual('sunburst');
+  });
+
+  test('should render chart legend', () => {
+    const { container } = render(<DonutChart {...props} />);
+    expect(container.querySelector(`[data-test-subj="draggable-legend"]`)).toBeInTheDocument();
+    expect((DraggableLegend as unknown as jest.Mock).mock.calls[0][0].legendItems).toEqual([
+      {
+        color: '#EF6550',
+        dataProviderId: 'draggable-legend-item-test-uuid-critical',
+        field: 'kibana.alert.severity',
+        timelineId: undefined,
+        value: 'critical',
+      },
+      {
+        color: '#EE9266',
+        dataProviderId: 'draggable-legend-item-test-uuid-high',
+        field: 'kibana.alert.severity',
+        timelineId: undefined,
+        value: 'high',
+      },
+      {
+        color: '#F3B689',
+        dataProviderId: 'draggable-legend-item-test-uuid-medium',
+        field: 'kibana.alert.severity',
+        timelineId: undefined,
+        value: 'medium',
+      },
+      {
+        color: '#F8D9B2',
+        dataProviderId: 'draggable-legend-item-test-uuid-low',
+        field: 'kibana.alert.severity',
+        timelineId: undefined,
+        value: 'low',
+      },
+    ]);
+  });
+
+  test('should NOT render chart legend if showLegend is false', () => {
+    const testProps = {
+      ...props,
+      legendItems: null,
+    };
+    const { container } = render(<DonutChart {...testProps} />);
+    expect(container.querySelector(`[data-test-subj="legend"]`)).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/donutchart.tsx b/x-pack/plugins/security_solution/public/common/components/charts/donutchart.tsx
new file mode 100644
index 0000000000000..2708fefc76522
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/charts/donutchart.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiText, useEuiTheme } from '@elastic/eui';
+import React, { useMemo } from 'react';
+
+import {
+  Chart,
+  Datum,
+  Partition,
+  Settings,
+  PartitionLayout,
+  defaultPartitionValueFormatter,
+  NodeColorAccessor,
+  PartialTheme,
+} from '@elastic/charts';
+import styled from 'styled-components';
+import { useTheme } from './common';
+import { DraggableLegend } from './draggable_legend';
+import { LegendItem } from './draggable_legend_item';
+import { DonutChartEmpty } from './donutchart_empty';
+
+export const NO_LEGEND_DATA: LegendItem[] = [];
+
+const donutTheme: PartialTheme = {
+  chartMargins: { top: 0, bottom: 0, left: 0, right: 0 },
+  partition: {
+    idealFontSizeJump: 1.1,
+    outerSizeRatio: 1,
+    emptySizeRatio: 0.8,
+    circlePadding: 4,
+  },
+};
+
+interface DonutChartData {
+  key: string;
+  value: number;
+  group?: string;
+  label?: string;
+}
+
+export type FillColor = string | NodeColorAccessor;
+export interface DonutChartProps {
+  data: DonutChartData[] | null | undefined;
+  fillColor: FillColor;
+  height?: number;
+  label: string;
+  legendItems?: LegendItem[] | null | undefined;
+  link?: string | null;
+  title: React.ReactElement | string | number | null;
+  totalCount: number | null | undefined;
+}
+
+/* Make this position absolute in order to overlap the text onto the donut */
+const DonutTextWrapper = styled(EuiFlexGroup)`
+  top: 34%;
+  width: 100%;
+  max-width: 77px;
+  position: absolute;
+  z-index: 1;
+`;
+
+const StyledEuiFlexItem = styled(EuiFlexItem)`
+  position: relative;
+  align-items: center;
+`;
+
+export const DonutChart = ({
+  data,
+  fillColor,
+  height = 90,
+  label,
+  legendItems,
+  link,
+  title,
+  totalCount,
+}: DonutChartProps) => {
+  const theme = useTheme();
+  const { euiTheme } = useEuiTheme();
+  const emptyLabelStyle = useMemo(
+    () => ({
+      color: euiTheme.colors.disabled,
+    }),
+    [euiTheme.colors.disabled]
+  );
+  return (
+    <EuiFlexGroup
+      alignItems="center"
+      justifyContent="center"
+      responsive={false}
+      gutterSize="l"
+      data-test-subj="donut-chart"
+    >
+      <StyledEuiFlexItem grow={false}>
+        <DonutTextWrapper
+          direction="column"
+          gutterSize="none"
+          alignItems="center"
+          justifyContent="center"
+        >
+          <EuiFlexItem>{title}</EuiFlexItem>
+          <EuiFlexItem className="eui-textTruncate">
+            {data ? (
+              <EuiText className="eui-textTruncate" size="s">
+                {label}
+              </EuiText>
+            ) : (
+              <EuiText className="eui-textTruncate" size="s" style={emptyLabelStyle}>
+                {label}
+              </EuiText>
+            )}
+          </EuiFlexItem>
+        </DonutTextWrapper>
+        {data == null || totalCount == null || totalCount === 0 ? (
+          <DonutChartEmpty size={height} />
+        ) : (
+          <Chart size={height}>
+            <Settings theme={donutTheme} baseTheme={theme} />
+            <Partition
+              id="donut-chart"
+              data={data}
+              layout={PartitionLayout.sunburst}
+              valueAccessor={(d: Datum) => d.value as number}
+              valueFormatter={(d: number) => `${defaultPartitionValueFormatter(d)}`}
+              layers={[
+                {
+                  groupByRollup: (d: Datum) => d.label ?? d.key,
+                  nodeLabel: (d: Datum) => d,
+                  shape: {
+                    fillColor,
+                  },
+                },
+              ]}
+            />
+          </Chart>
+        )}
+      </StyledEuiFlexItem>
+      {legendItems && legendItems?.length > 0 && (
+        <EuiFlexItem>
+          <DraggableLegend legendItems={legendItems} height={height} />
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/donutchart_empty.test.tsx b/x-pack/plugins/security_solution/public/common/components/charts/donutchart_empty.test.tsx
new file mode 100644
index 0000000000000..858347226272f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/charts/donutchart_empty.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render } from '@testing-library/react';
+import React from 'react';
+import { DonutChartEmpty } from './donutchart_empty';
+
+describe('DonutChartEmpty', () => {
+  test('render', () => {
+    const { container } = render(<DonutChartEmpty />);
+    expect(container.querySelector(`[data-test-subj="empty-donut"]`)).toBeInTheDocument();
+    expect(container.querySelector(`[data-test-subj="empty-donut-small"]`)).toBeInTheDocument();
+  });
+
+  test('does Not render', () => {
+    const props = {
+      size: 90,
+      donutWidth: 90,
+    };
+    const { container } = render(<DonutChartEmpty {...props} />);
+    expect(container.querySelector(`[data-test-subj="empty-donut"]`)).not.toBeInTheDocument();
+    expect(container.querySelector(`[data-test-subj="empty-donut-small"]`)).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/donutchart_empty.tsx b/x-pack/plugins/security_solution/public/common/components/charts/donutchart_empty.tsx
new file mode 100644
index 0000000000000..a378f94bfbe1e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/charts/donutchart_empty.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import styled from 'styled-components';
+
+interface DonutChartEmptyProps {
+  size?: number;
+  donutWidth?: number;
+}
+
+export const emptyDonutColor = '#FAFBFD';
+
+const BigRing = styled.div<DonutChartEmptyProps>`
+  border-radius: 50%;
+  ${({ size }) =>
+    `height: ${size}px;
+    width: ${size}px;
+    background-color: ${emptyDonutColor};
+    text-align: center;
+    line-height: ${size}px;`}
+`;
+
+const SmallRing = styled.div<DonutChartEmptyProps>`
+  border-radius: 50%;
+  ${({ size }) => `
+    height: ${size}px;
+    width: ${size}px;
+    background-color: white;
+    display: inline-block;
+    vertical-align: middle;`}
+`;
+
+const EmptyDonutChartComponent: React.FC<DonutChartEmptyProps> = ({ size = 90, donutWidth = 20 }) =>
+  size - donutWidth > 0 ? (
+    <BigRing size={size} data-test-subj="empty-donut">
+      <SmallRing size={size - donutWidth} data-test-subj="empty-donut-small" />
+    </BigRing>
+  ) : null;
+
+export const DonutChartEmpty = React.memo(EmptyDonutChartComponent);
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx
index 6261783a53a68..a712296873b88 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../mock';
 
 import { DraggableLegendItem, LegendItem } from './draggable_legend_item';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/legend.tsx b/x-pack/plugins/security_solution/public/common/components/charts/legend.tsx
new file mode 100644
index 0000000000000..d01d9057c6979
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/charts/legend.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
+import React from 'react';
+
+import { LegendItem } from './legend_item';
+
+const LegendComponent: React.FC<{
+  legendItems: LegendItem[];
+}> = ({ legendItems }) => {
+  if (legendItems.length === 0) {
+    return null;
+  }
+
+  return (
+    <EuiText size="xs" data-test-subj="legend">
+      <EuiFlexGroup direction="column" gutterSize="none">
+        {legendItems.map((item, i) => (
+          <EuiFlexItem key={`legend-item-${i}`} grow={false}>
+            <LegendItem legendItem={item} />
+            <EuiSpacer data-test-subj="legend-spacer" size="s" />
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGroup>
+    </EuiText>
+  );
+};
+
+LegendComponent.displayName = 'LegendComponent';
+
+export const Legend = React.memo(LegendComponent);
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/legend_item.tsx b/x-pack/plugins/security_solution/public/common/components/charts/legend_item.tsx
new file mode 100644
index 0000000000000..867a48294c09b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/charts/legend_item.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiText } from '@elastic/eui';
+import React from 'react';
+import styled from 'styled-components';
+
+import { EMPTY_VALUE_LABEL } from './translation';
+import { hasValueToDisplay } from '../../utils/validators';
+
+export interface LegendItem {
+  color?: string;
+  field: string;
+  value: string | number;
+}
+
+const LegendText = styled.span`
+  font-size: 10.5px;
+`;
+
+/**
+ * Renders the value or a placeholder in case the value is empty
+ */
+const ValueWrapper = React.memo<{ value: LegendItem['value'] }>(({ value }) =>
+  hasValueToDisplay(value) ? (
+    <LegendText>{value}</LegendText>
+  ) : (
+    <LegendText data-test-subj="value-wrapper-empty">{EMPTY_VALUE_LABEL}</LegendText>
+  )
+);
+
+ValueWrapper.displayName = 'ValueWrapper';
+
+const LegendItemComponent: React.FC<{
+  legendItem: LegendItem;
+}> = ({ legendItem }) => {
+  const { color, value } = legendItem;
+
+  return (
+    <EuiText size="xs">
+      <EuiFlexGroup alignItems="center" gutterSize="none">
+        {color != null && (
+          <EuiFlexItem grow={false}>
+            <EuiHealth data-test-subj="legend-color" color={color} />
+          </EuiFlexItem>
+        )}
+        <EuiFlexItem grow={false}>
+          <ValueWrapper value={value} />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiText>
+  );
+};
+
+LegendItemComponent.displayName = 'LegendItemComponent';
+
+export const LegendItem = React.memo(LegendItemComponent);
diff --git a/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx b/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx
index fd200d900147f..11ca7cc1bda3c 100644
--- a/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx
@@ -8,9 +8,9 @@
 import React, { FC, memo, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { licenseService } from '../../hooks/use_license';
 import { AppAction } from '../../store/actions';
-import { ILicense } from '../../../../../licensing/common/types';
 
 export const CurrentLicense: FC = memo(({ children }) => {
   const dispatch = useDispatch<Dispatch<AppAction>>();
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
index da7313e85e631..bb600238da135 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
@@ -13,6 +13,10 @@ import { Dispatch } from 'redux';
 import deepEqual from 'fast-deep-equal';
 import { IS_DRAGGING_CLASS_NAME } from '@kbn/securitysolution-t-grid';
 
+import {
+  addFieldToTimelineColumns,
+  getTimelineIdFromColumnDroppableId,
+} from '@kbn/timelines-plugin/public';
 import { BeforeCapture } from './drag_drop_context';
 import { BrowserFields } from '../../containers/source';
 import { dragAndDropSelectors } from '../../store';
@@ -37,10 +41,6 @@ import {
 import { useDeepEqualSelector } from '../../hooks/use_selector';
 import { useKibana } from '../../lib/kibana';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
-import {
-  addFieldToTimelineColumns,
-  getTimelineIdFromColumnDroppableId,
-} from '../../../../../timelines/public';
 import { alertsHeaders } from '../alerts_viewer/default_headers';
 
 // @ts-expect-error
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts
index 7dfb23c1f84b9..e03c7586ba621 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash/fp';
 import { DropResult } from 'react-beautiful-dnd';
-import { getTimelineIdFromColumnDroppableId } from '../../../../../timelines/public';
+import { getTimelineIdFromColumnDroppableId } from '@kbn/timelines-plugin/public';
 
 import { IdToDataProvider } from '../../store/drag_and_drop/model';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
index 85bb689806b8a..05b8b50bc8896 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { EmptyPage } from './index';
+import { EmptyPage } from '.';
 
 describe('EmptyPage component', () => {
   it('renders actions without descriptions', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap
index 142ed7a0d7175..77edd4e1fe991 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap
@@ -2,6 +2,6 @@
 
 exports[`EmptyValue it renders against snapshot 1`] = `
 <p>
-  (Empty String)
+  (Empty string)
 </p>
 `;
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx b/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx
index c455ed1953c28..c869bb5e6810c 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx
@@ -39,7 +39,7 @@ describe('EmptyValue', () => {
           <p>{getEmptyString()}</p>
         </ThemeProvider>
       );
-      expect(wrapper.text()).toBe('(Empty String)');
+      expect(wrapper.text()).toBe('(Empty string)');
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts b/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts
index d598f4856413e..9eaddfd8650f0 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts
@@ -10,6 +10,6 @@ import { i18n } from '@kbn/i18n';
 export const EMPTY_STRING = i18n.translate(
   'xpack.securitySolution.emptyString.emptyStringDescription',
   {
-    defaultMessage: 'Empty String',
+    defaultMessage: 'Empty string',
   }
 );
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx
index b410a1689b476..a8bbf1833b4db 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { MutableRefObject, useContext } from 'react';
-import { CaseViewRefreshPropInterface } from '../../../../../../cases/common';
+import { CaseViewRefreshPropInterface } from '@kbn/cases-plugin/common';
 
 /**
  * React Context that can hold the `Ref` that is created an passed to `CaseViewProps['refreshRef`]`, enabling
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx
index 466107f75abfc..881cea7c3c276 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx
@@ -10,7 +10,7 @@ import { EuiCallOut, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { GET_ISOLATION_SUCCESS_MESSAGE, GET_UNISOLATION_SUCCESS_MESSAGE } from './translations';
 import { useCasesFromAlerts } from '../../../../detections/containers/detection_engine/alerts/use_cases_from_alerts';
-import { CaseDetailsLink } from '../../../../common/components/links';
+import { CaseDetailsLink } from '../../links';
 
 export interface EndpointIsolateSuccessProps {
   hostName: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx
index e7e03d828d62d..632f77dde9a20 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { LinkToApp } from './link_to_app';
-import { CoreStart } from 'kibana/public';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 type LinkToAppOnClickMock<Return = void> = jest.Mock<
   Return,
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx
index a5e0c90402df4..cbbec4a623e6b 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx
@@ -8,9 +8,9 @@
 import React, { memo, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
+import { TimelineId } from '@kbn/timelines-plugin/common';
 import { AppLocation } from '../../../../common/endpoint/types';
 import { timelineActions } from '../../../timelines/store/timeline';
-import { TimelineId } from '../../../../../timelines/common';
 
 /**
  * This component should be used above all routes, but below the Provider.
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx
index 3986b37656ac0..cfccea2cadf81 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx
@@ -12,11 +12,11 @@ import { TestProviders } from '../../../mock';
 import { render } from '@testing-library/react';
 import { buildEventEnrichmentMock } from '../../../../../common/search_strategy/security_solution/cti/index.mock';
 import { mockAlertDetailsData } from '../__mocks__';
-import { TimelineEventsDetailsItem } from '../../../../../../timelines/common';
+import { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import { mockBrowserFields } from '../../../containers/source/mock';
-import { mockTimelines } from '../../../../common/mock/mock_timelines_plugin';
+import { mockTimelines } from '../../../mock/mock_timelines_plugin';
 
-jest.mock('../../../../common/lib/kibana', () => ({
+jest.mock('../../../lib/kibana', () => ({
   useKibana: () => ({
     services: {
       timelines: { ...mockTimelines },
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx
index f7df157ed4602..12b5bc755d35f 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx
@@ -21,7 +21,7 @@ import { TimelineEventsDetailsItem } from '../../../../common/search_strategy';
 import { TimelineTabs } from '../../../../common/types/timeline';
 import { useInvestigationTimeEnrichment } from '../../containers/cti/event_enrichment';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 jest.mock('../../containers/cti/event_enrichment');
 
 jest.mock('../../../detections/containers/detection_engine/rules/use_rule_with_fallback', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx
index e7547a8259514..4aeb63862a8e0 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx
@@ -17,7 +17,7 @@ import {
   DATA_ROWINDEX_ATTRIBUTE,
   isTab,
   onKeyDownFocusHandler,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 
 import { ADD_TIMELINE_BUTTON_CLASS_NAME } from '../../../timelines/components/flyout/add_timeline_button';
 import { timelineActions, timelineSelectors } from '../../../timelines/store/timeline';
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
index a58ac79ee25ae..a7f9801bc082e 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
@@ -13,7 +13,7 @@ import {
   getTableSkipFocus,
   handleSkipFocus,
   stopPropagationAndPreventDefault,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { BrowserField, BrowserFields } from '../../containers/source';
 import {
   DEFAULT_DATE_COLUMN_MIN_WIDTH,
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx
index 52e038fa07c56..11ffa44a17a3b 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { Overview } from './';
-import { TestProviders } from '../../../../common/mock';
+import { Overview } from '.';
+import { TestProviders } from '../../../mock';
 
 jest.mock('../../../lib/kibana');
 jest.mock('../../utils', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx
index 39fbf36ef5cd8..965766dddf923 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx
@@ -10,8 +10,8 @@ import React, { useMemo } from 'react';
 import { chunk, find } from 'lodash/fp';
 import type { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import type { BrowserFields } from '../../../containers/source';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import type { TimelineEventsDetailsItem } from '../../../../../common/search_strategy/timeline';
 import type { EnrichedFieldInfo, EnrichedFieldInfoWithValues } from '../types';
 import { getEnrichedFieldInfo } from '../helpers';
@@ -26,11 +26,11 @@ import {
   SIGNAL_STATUS_FIELD_NAME,
 } from '../../../../timelines/components/timeline/body/renderers/constants';
 import { FormattedFieldValue } from '../../../../timelines/components/timeline/body/renderers/formatted_field';
-import { OverviewCardWithActions, OverviewCard } from '../overview/overview_card';
-import { StatusPopoverButton } from '../overview/status_popover_button';
-import { SeverityBadge } from '../../../../../public/detections/components/rules/severity_badge';
+import { OverviewCardWithActions, OverviewCard } from './overview_card';
+import { StatusPopoverButton } from './status_popover_button';
+import { SeverityBadge } from '../../../../detections/components/rules/severity_badge';
 import { useThrottledResizeObserver } from '../../utils';
-import { isNotNull } from '../../../../../public/timelines/store/timeline/helpers';
+import { isNotNull } from '../../../../timelines/store/timeline/helpers';
 
 export const NotGrowingFlexGroup = euiStyled(EuiFlexGroup)`
   flex-grow: 0;
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx
index 8ed3dc7e36165..5ae2e6dfb5c29 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { OverviewCardWithActions } from './overview_card';
-import { TestProviders } from '../../../../common/mock';
-import { SeverityBadge } from '../../../../../public/detections/components/rules/severity_badge';
+import { TestProviders } from '../../../mock';
+import { SeverityBadge } from '../../../../detections/components/rules/severity_badge';
 
 const props = {
   title: 'Severity',
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx
index 0d0803f41c34b..7984c23a337de 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx
@@ -8,8 +8,8 @@
 import { EuiFlexGroup, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
 import React, { useState } from 'react';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ActionCell } from '../table/action_cell';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { EnrichedFieldInfo } from '../types';
 
 const ActionWrapper = euiStyled.div`
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx
index 3c3316618a72c..593cf44aa92f3 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { StatusPopoverButton } from './status_popover_button';
-import { TestProviders } from '../../../../common/mock';
+import { TestProviders } from '../../../mock';
 
 const props = {
   eventId: 'testid',
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx
index a223b49b5558c..d8081414cdacf 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { useCallback, useState, useContext } from 'react';
+import { TimelineContext } from '@kbn/timelines-plugin/public';
 import { HoverActions } from '../../hover_actions';
 import { useActionCellDataProvider } from './use_action_cell_data_provider';
 import { EnrichedFieldInfo } from '../types';
 import { ColumnHeaderOptions } from '../../../../../common/types/timeline';
-import { TimelineContext } from '../../../../../../timelines/public';
 
 interface Props extends EnrichedFieldInfo {
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx
index e97971b51cd4c..396ecbc5484ed 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge, EuiText, EuiToolTip } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import { FieldIcon } from '@kbn/react-field';
+import type { DataViewField } from '@kbn/data-views-plugin/common';
 import * as i18n from '../translations';
-import type { DataViewField } from '../../../../../../../../src/plugins/data_views/common';
 import { getExampleText } from '../helpers';
 import { BrowserField } from '../../../containers/source';
 import { EventFieldsData } from '../types';
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
index 6a0e6bf4e6b9d..e7a24fd7c7a31 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
@@ -15,7 +15,7 @@ import { EventFieldsData } from '../types';
 import { TimelineId } from '../../../../../common/types';
 import { AlertSummaryRow } from '../helpers';
 import { useAlertPrevalence } from '../../../containers/alerts/use_alert_prevalence';
-import { getEmptyValue } from '../../../components/empty_value';
+import { getEmptyValue } from '../../empty_value';
 
 jest.mock('../../../lib/kibana');
 jest.mock('../../../containers/alerts/use_alert_prevalence', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
index 46de86d4bff1b..2a11736f52c42 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 import { AlertSummaryRow } from '../helpers';
-import { defaultToEmptyTag } from '../../../components/empty_value';
+import { defaultToEmptyTag } from '../../empty_value';
 import { useAlertPrevalence } from '../../../containers/alerts/use_alert_prevalence';
 
 const PrevalenceCell = React.memo<AlertSummaryRow['description']>(
diff --git a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx
index 7abca14a2e55f..956a4f9da3c99 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx
@@ -12,7 +12,7 @@ import { HostsType } from '../../../hosts/store/model';
 import { TestProviders } from '../../mock';
 import { EventsQueryTabBody, EventsQueryTabBodyComponentProps } from './events_query_tab_body';
 import { useGlobalFullScreen } from '../../containers/use_full_screen';
-import * as tGridActions from '../../../../../timelines/public/store/t_grid/actions';
+import * as tGridActions from '@kbn/timelines-plugin/public/store/t_grid/actions';
 
 jest.mock('../../lib/kibana', () => {
   const original = jest.requireActual('../../lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx
index 30b7bd4f53e60..e98c397d41991 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx
@@ -24,7 +24,7 @@ import { DefaultCellRenderer } from '../../../timelines/components/timeline/cell
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_features';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants';
-import { getEventsHistogramLensAttributes } from '../../../common/components/visualization_actions/lens_attributes/hosts/events';
+import { getEventsHistogramLensAttributes } from '../visualization_actions/lens_attributes/hosts/events';
 import { defaultCellActions } from '../../lib/cell_actions/default_cell_actions';
 import { GlobalTimeArgs } from '../../containers/use_global_time';
 import { MatrixHistogramConfigs, MatrixHistogramOption } from '../matrix_histogram/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx
index 9da27bc470a94..124dc4eefb997 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx
@@ -15,7 +15,7 @@ import { TestProviders } from '../../mock';
 import { mockEventViewerResponse } from './mock';
 import { StatefulEventsViewer } from '.';
 import { eventsDefaultModel } from './default_model';
-import { EntityType } from '../../../../../timelines/common';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { TimelineId } from '../../../../common/types/timeline';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { DefaultCellRenderer } from '../../../timelines/components/timeline/cell_rendering/default_cell_renderer';
@@ -25,13 +25,13 @@ import { defaultRowRenderers } from '../../../timelines/components/timeline/body
 import { defaultCellActions } from '../../lib/cell_actions/default_cell_actions';
 import { UseFieldBrowserOptionsProps } from '../../../timelines/components/fields_browser';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 jest.mock('../../../timelines/containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
 
-jest.mock('../../components/url_state/normalize_time_range.ts');
+jest.mock('../url_state/normalize_time_range');
 
 const mockUseFieldBrowserOptions = jest.fn();
 jest.mock('../../../timelines/components/fields_browser', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
index 88d24e3707453..fa03522f54ef6 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -9,6 +9,8 @@ import React, { useRef, useCallback, useMemo, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import type { Filter } from '@kbn/es-query';
+import type { EntityType } from '@kbn/timelines-plugin/common';
+import { TGridCellAction } from '@kbn/timelines-plugin/common/types';
 import { inputsModel, State } from '../../store';
 import { inputsActions } from '../../store/actions';
 import { ControlColumnProps, RowRenderer, TimelineId } from '../../../../common/types/timeline';
@@ -22,8 +24,6 @@ import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_fe
 import { eventsViewerSelector } from './selectors';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useSourcererDataView } from '../../containers/sourcerer';
-import type { EntityType } from '../../../../../timelines/common';
-import { TGridCellAction } from '../../../../../timelines/common/types';
 import { CellValueElementProps } from '../../../timelines/components/timeline/cell_rendering';
 import { FIELDS_WITHOUT_CELL_ACTIONS } from '../../lib/cell_actions/constants';
 import { useKibana } from '../../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx
index d61501fb08be7..623ab9b282480 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx
@@ -12,16 +12,16 @@ import { waitFor } from '@testing-library/react';
 
 import { AddExceptionFlyout } from '.';
 import { useCurrentUser } from '../../../lib/kibana';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 import { useAsync } from '@kbn/securitysolution-hook-utils';
-import { getExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { useFetchIndex } from '../../../containers/source';
-import { stubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
 import * as helpers from '../helpers';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import type { EntriesArray, ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import {
@@ -44,7 +44,7 @@ const mockTheme = getMockTheme({
 });
 
 jest.mock('../../../../detections/containers/detection_engine/alerts/use_signal_index');
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 jest.mock('../../../containers/source');
 jest.mock('../../../../detections/containers/detection_engine/rules');
 jest.mock('../use_add_exception');
@@ -54,7 +54,7 @@ jest.mock('@kbn/securitysolution-hook-utils', () => ({
   useAsync: jest.fn(),
 }));
 jest.mock('../../../../detections/containers/detection_engine/rules/use_rule_async');
-jest.mock('../../../../../../lists/public');
+jest.mock('@kbn/lists-plugin/public');
 
 const mockGetExceptionBuilderComponentLazy = getExceptionBuilderComponentLazy as jest.Mock<
   ReturnType<typeof getExceptionBuilderComponentLazy>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx
index 464e966f36349..0e063a05bab0c 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx
@@ -34,13 +34,13 @@ import type {
   CreateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { ExceptionsBuilderExceptionItem } from '@kbn/securitysolution-list-utils';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 import {
   hasEqlSequenceQuery,
   isEqlRule,
   isThresholdRule,
 } from '../../../../../common/detection_engine/utils';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
 import * as i18nCommon from '../../../translations';
 import * as i18n from './translations';
 import * as sharedI18n from '../translations';
@@ -135,7 +135,7 @@ export const AddExceptionFlyout = memo(function AddExceptionFlyout({
   onRuleChange,
   alertStatus,
 }: AddExceptionFlyoutProps) {
-  const { http, data } = useKibana().services;
+  const { http, unifiedSearch } = useKibana().services;
   const [errorsExist, setErrorExists] = useState(false);
   const [comment, setComment] = useState('');
   const { rule: maybeRule, loading: isRuleLoading } = useRuleAsync(ruleId);
@@ -167,35 +167,6 @@ export const AddExceptionFlyout = memo(function AddExceptionFlyout({
   }, [jobs, ruleIndices]);
 
   const [isIndexPatternLoading, { indexPatterns }] = useFetchIndex(memoRuleIndices);
-  const onError = useCallback(
-    (error: Error): void => {
-      addError(error, { title: i18n.ADD_EXCEPTION_ERROR });
-      onCancel();
-    },
-    [addError, onCancel]
-  );
-
-  const onSuccess = useCallback(
-    (updated: number, conflicts: number): void => {
-      addSuccess(i18n.ADD_EXCEPTION_SUCCESS);
-      onConfirm(shouldCloseAlert, shouldBulkCloseAlert);
-      if (conflicts > 0) {
-        addWarning({
-          title: i18nCommon.UPDATE_ALERT_STATUS_FAILED(conflicts),
-          text: i18nCommon.UPDATE_ALERT_STATUS_FAILED_DETAILED(updated, conflicts),
-        });
-      }
-    },
-    [addSuccess, addWarning, onConfirm, shouldBulkCloseAlert, shouldCloseAlert]
-  );
-
-  const [{ isLoading: addExceptionIsLoading }, addOrUpdateExceptionItems] = useAddOrUpdateException(
-    {
-      http,
-      onSuccess,
-      onError,
-    }
-  );
 
   const handleBuilderOnChange = useCallback(
     ({
@@ -237,6 +208,37 @@ export const AddExceptionFlyout = memo(function AddExceptionFlyout({
     [addError, onCancel]
   );
 
+  const onError = useCallback(
+    (error: Error): void => {
+      addError(error, { title: i18n.ADD_EXCEPTION_ERROR });
+      onCancel();
+    },
+    [addError, onCancel]
+  );
+
+  const onSuccess = useCallback(
+    (updated: number, conflicts: number): void => {
+      handleRuleChange(true);
+      addSuccess(i18n.ADD_EXCEPTION_SUCCESS);
+      onConfirm(shouldCloseAlert, shouldBulkCloseAlert);
+      if (conflicts > 0) {
+        addWarning({
+          title: i18nCommon.UPDATE_ALERT_STATUS_FAILED(conflicts),
+          text: i18nCommon.UPDATE_ALERT_STATUS_FAILED_DETAILED(updated, conflicts),
+        });
+      }
+    },
+    [addSuccess, addWarning, onConfirm, shouldBulkCloseAlert, shouldCloseAlert, handleRuleChange]
+  );
+
+  const [{ isLoading: addExceptionIsLoading }, addOrUpdateExceptionItems] = useAddOrUpdateException(
+    {
+      http,
+      onSuccess,
+      onError,
+    }
+  );
+
   const handleFetchOrCreateExceptionListError = useCallback(
     (error: Error, statusCode: number | null, message: string | null): void => {
       setFetchOrCreateListError({
@@ -503,7 +505,7 @@ export const AddExceptionFlyout = memo(function AddExceptionFlyout({
                 allowLargeValueLists:
                   !isEqlRule(maybeRule?.type) && !isThresholdRule(maybeRule?.type),
                 httpService: http,
-                autocompleteService: data.autocomplete,
+                autocompleteService: unifiedSearch.autocomplete,
                 exceptionListItems: initialExceptionItems,
                 listType: exceptionListType,
                 osTypes: osTypesSelection,
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx
index daa4efa9f6874..12d322fd03008 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx
@@ -13,10 +13,10 @@ import { mount, ReactWrapper } from 'enzyme';
 import { EditExceptionFlyout } from '.';
 import { useCurrentUser } from '../../../lib/kibana';
 import { useFetchIndex } from '../../../containers/source';
-import { stubIndexPattern, createStubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern, createStubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import type { EntriesArray } from '@kbn/securitysolution-io-ts-list-types';
 import {
   getRulesEqlSchemaMock,
@@ -24,7 +24,7 @@ import {
 } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
 import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import { getMockTheme } from '../../../lib/kibana/kibana_react.mock';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 
 const mockTheme = getMockTheme({
   eui: {
@@ -37,14 +37,14 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 jest.mock('../../../../detections/containers/detection_engine/rules');
 jest.mock('../use_add_exception');
 jest.mock('../../../containers/source');
 jest.mock('../use_fetch_or_create_rule_exception_list');
 jest.mock('../../../../detections/containers/detection_engine/alerts/use_signal_index');
 jest.mock('../../../../detections/containers/detection_engine/rules/use_rule_async');
-jest.mock('../../../../../../lists/public');
+jest.mock('@kbn/lists-plugin/public');
 
 const mockGetExceptionBuilderComponentLazy = getExceptionBuilderComponentLazy as jest.Mock<
   ReturnType<typeof getExceptionBuilderComponentLazy>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx
index 0ed810b4ad263..0097f2d02cb3e 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx
@@ -31,6 +31,7 @@ import type {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 import {
   hasEqlSequenceQuery,
   isEqlRule,
@@ -39,7 +40,6 @@ import {
 import { useFetchIndex } from '../../../containers/source';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
 import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
 
 import * as i18n from './translations';
 import * as sharedI18n from '../translations';
@@ -112,7 +112,7 @@ export const EditExceptionFlyout = memo(function EditExceptionFlyout({
   onConfirm,
   onRuleChange,
 }: EditExceptionFlyoutProps) {
-  const { http, data } = useKibana().services;
+  const { http, unifiedSearch } = useKibana().services;
   const [comment, setComment] = useState('');
   const [errorsExist, setErrorExists] = useState(false);
   const { rule: maybeRule, loading: isRuleLoading } = useRuleAsync(ruleId);
@@ -360,7 +360,7 @@ export const EditExceptionFlyout = memo(function EditExceptionFlyout({
                 allowLargeValueLists:
                   !isEqlRule(maybeRule?.type) && !isThresholdRule(maybeRule?.type),
                 httpService: http,
-                autocompleteService: data.autocomplete,
+                autocompleteService: unifiedSearch.autocomplete,
                 exceptionListItems: [exceptionItem],
                 listType: exceptionListType,
                 listId: exceptionItem.list_id,
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
index 6c3dba5f2e22b..5c9bf4cda17d7 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { getListMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
 import { ErrorCallout } from './error_callout';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
index 67522cfdc8d58..1964e5238371e 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 
 import type { List } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpSetup } from '../../../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { Rule } from '../../../detections/containers/detection_engine/rules/types';
 import * as i18n from './translations';
 import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
index 8f1b31a7e004c..855d855852ddd 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
@@ -37,11 +37,11 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { DataViewBase } from '@kbn/es-query';
 
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntryMatchMock } from '../../../../../lists/common/schemas/types/entry_match.mock';
-import { getCommentsArrayMock } from '../../../../../lists/common/schemas/types/comment.mock';
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
-import { ENTRIES, OLD_DATE_RELATIVE_TO_DATE_NOW } from '../../../../../lists/common/constants.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntryMatchMock } from '@kbn/lists-plugin/common/schemas/types/entry_match.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
+import { fields } from '@kbn/data-plugin/common/mocks';
+import { ENTRIES, OLD_DATE_RELATIVE_TO_DATE_NOW } from '@kbn/lists-plugin/common/constants.mock';
 import { CodeSignature } from '../../../../common/ecs/file';
 import {
   ALERT_ORIGINAL_EVENT_KIND,
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
index 564bb965a8782..f547089077f31 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
@@ -7,16 +7,16 @@
 
 import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaServices } from '../../../common/lib/kibana';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaServices } from '../../lib/kibana';
 
 import * as alertsApi from '../../../detections/containers/detection_engine/alerts/api';
 import * as listsApi from '@kbn/securitysolution-list-api';
 import * as getQueryFilterHelper from '../../../../common/detection_engine/get_query_filter';
 import * as buildFilterHelpers from '../../../detections/components/alerts_table/default_config';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getUpdateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/update_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
 import type {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
@@ -32,7 +32,7 @@ import {
 
 const mockKibanaHttpService = coreMock.createStart().http;
 const mockKibanaServices = KibanaServices.get as jest.Mock;
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 jest.mock('@kbn/securitysolution-list-api');
 
 const fetchMock = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
index 71c49f7c2daad..c740957ab8d77 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
@@ -12,7 +12,7 @@ import type {
   CreateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { useApi } from '@kbn/securitysolution-list-hooks';
-import { HttpStart } from '../../../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 import { updateAlertStatus } from '../../../detections/containers/detection_engine/alerts/api';
 import { getUpdateAlertsQuery } from '../../../detections/components/alerts_table/actions';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
index d96171652d947..9ddc6dbae31de 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
@@ -7,10 +7,10 @@
 
 import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks';
 
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import * as rulesApi from '../../../detections/containers/detection_engine/rules/api';
 import * as listsApi from '@kbn/securitysolution-list-api';
-import { getExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock';
 import type {
   ExceptionListType,
@@ -175,13 +175,13 @@ describe('useFetchOrCreateRuleExceptionList', () => {
         expect(patchRule).toHaveBeenCalledTimes(1);
       });
     });
-    it('invokes onSuccess indicating that the rule changed', async () => {
+    it('invokes onSuccess', async () => {
       await act(async () => {
         const { waitForNextUpdate } = render();
         await waitForNextUpdate();
         await waitForNextUpdate();
         await waitForNextUpdate();
-        expect(onSuccess).toHaveBeenCalledWith(true);
+        expect(onSuccess).toHaveBeenCalledWith(false);
       });
     });
   });
@@ -223,7 +223,7 @@ describe('useFetchOrCreateRuleExceptionList', () => {
         expect(result.current[1]).toEqual(detectionExceptionList);
       });
     });
-    it('invokes onSuccess indicating that the rule did not change', async () => {
+    it('invokes onSuccess indicating', async () => {
       await act(async () => {
         const { waitForNextUpdate } = render();
         await waitForNextUpdate();
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
index 4d6464d09ee60..24d647bdae10b 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
@@ -18,7 +18,7 @@ import {
   addEndpointExceptionList,
 } from '@kbn/securitysolution-list-api';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from '../../../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 import { Rule } from '../../../detections/containers/detection_engine/rules/types';
 import {
@@ -173,7 +173,7 @@ export const useFetchOrCreateRuleExceptionList = ({
           setExceptionList(exceptionListToUse);
           setIsLoading(false);
           if (onSuccess) {
-            onSuccess(matchingList == null);
+            onSuccess(false);
           }
         }
       } catch (error) {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx
index 1d5094021c3d3..20c58985344f8 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx
@@ -11,8 +11,8 @@ import { mount } from 'enzyme';
 import moment from 'moment-timezone';
 
 import { ExceptionDetails } from './exception_details';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCommentsArrayMock } from '../../../../../../../lists/common/schemas/types/comment.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
 import { getMockTheme } from '../../../../lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx
index 24c22f8ef1ded..30ca4428aa008 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx
@@ -11,9 +11,9 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { euiLightVars } from '@kbn/ui-theme';
 
-import { ExceptionItem } from './';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCommentsArrayMock } from '../../../../../../../lists/common/schemas/types/comment.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
+import { ExceptionItem } from '.';
 
 addDecorator((storyFn) => (
   <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>{storyFn()}</ThemeProvider>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx
index 983d837267795..e1afc8f44b354 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
-import { ExceptionItem } from './';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCommentsArrayMock } from '../../../../../../../lists/common/schemas/types/comment.mock';
+import { ExceptionItem } from '.';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
 import { getMockTheme } from '../../../../lib/kibana/kibana_react.mock';
 
 jest.mock('../../../../lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx
index 612fab4395b9f..7b65190de1bd7 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx
@@ -10,7 +10,7 @@ import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
 import * as i18n from '../translations';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { ExceptionsViewerItems } from './exceptions_viewer_items';
 import { getMockTheme } from '../../../lib/kibana/kibana_react.mock';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
index 25e260e67855a..aee9ca3d87611 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
@@ -9,11 +9,11 @@ import moment from 'moment-timezone';
 
 import { getFormattedEntries, formatEntry, getDescriptionListContent } from './helpers';
 import { FormattedEntry } from '../types';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntriesArrayMock } from '../../../../../../lists/common/schemas/types/entries.mock';
-import { getEntryMatchMock } from '../../../../../../lists/common/schemas/types/entry_match.mock';
-import { getEntryMatchAnyMock } from '../../../../../../lists/common/schemas/types/entry_match_any.mock';
-import { getEntryExistsMock } from '../../../../../../lists/common/schemas/types/entry_exists.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntriesArrayMock } from '@kbn/lists-plugin/common/schemas/types/entries.mock';
+import { getEntryMatchMock } from '@kbn/lists-plugin/common/schemas/types/entry_match.mock';
+import { getEntryMatchAnyMock } from '@kbn/lists-plugin/common/schemas/types/entry_match_any.mock';
+import { getEntryExistsMock } from '@kbn/lists-plugin/common/schemas/types/entry_exists.mock';
 
 describe('Exception viewer helpers', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx
index 65a0798037cf1..473d494da38be 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx
@@ -9,13 +9,13 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { ThemeProvider } from 'styled-components';
 
-import { ExceptionsViewer } from './';
-import { useKibana } from '../../../../common/lib/kibana';
+import { ExceptionsViewer } from '.';
+import { useKibana } from '../../../lib/kibana';
 import { useExceptionListItems, useApi } from '@kbn/securitysolution-list-hooks';
 
 import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
-import { getExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_schema.mock';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { getMockTheme } from '../../../lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({
@@ -30,7 +30,7 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 jest.mock('@kbn/securitysolution-list-hooks');
 
 describe('ExceptionsViewer', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
index 61e0aee13e923..21c041df34136 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
@@ -18,10 +18,10 @@ import type {
 import { useApi, useExceptionListItems } from '@kbn/securitysolution-list-hooks';
 import * as i18n from '../translations';
 import { useStateToaster } from '../../toasters';
-import { useUserData } from '../../../../../public/detections/components/user_info';
-import { useKibana } from '../../../../common/lib/kibana';
-import { Panel } from '../../../../common/components/panel';
-import { Loader } from '../../../../common/components/loader';
+import { useUserData } from '../../../../detections/components/user_info';
+import { useKibana } from '../../../lib/kibana';
+import { Panel } from '../../panel';
+import { Loader } from '../../loader';
 import { ExceptionsViewerHeader } from './exceptions_viewer_header';
 import { ExceptionListItemIdentifiers, Filter } from '../types';
 import { allExceptionItemsReducer, State, ViewerFlyoutName } from './reducer';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/submenu.test.tsx b/x-pack/plugins/security_solution/public/common/components/formatted_number/index.test.tsx
similarity index 95%
rename from x-pack/plugins/security_solution/public/resolver/view/submenu.test.tsx
rename to x-pack/plugins/security_solution/public/common/components/formatted_number/index.test.tsx
index 8cfaf3fe71670..bbf53c5a38aaa 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/submenu.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/formatted_number/index.test.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { compactNotationParts } from './submenu';
+import { compactNotationParts } from '.';
 
-describe('The Resolver node pills number presentation', () => {
+describe('compactNotationParts', () => {
   describe('When given a small number under 1000', () => {
     it('does not change the presentation of small numbers', () => {
       expect(compactNotationParts(1)).toEqual([1, '', '']);
diff --git a/x-pack/plugins/security_solution/public/common/components/formatted_number/index.tsx b/x-pack/plugins/security_solution/public/common/components/formatted_number/index.tsx
new file mode 100644
index 0000000000000..ebab730d5a96f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/formatted_number/index.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiI18nNumber } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React, { useMemo } from 'react';
+
+/**
+ * Until browser support accomodates the `notation="compact"` feature of Intl.NumberFormat...
+ * exported for testing
+ * @param num The number to format
+ * @returns [mantissa ("12" in "12k+"), Scalar of compact notation (k,M,B,T), remainder indicator ("+" in "12k+")]
+ */
+export function compactNotationParts(
+  num: number
+): [mantissa: number, compactNotation: string, remainderIndicator: string] {
+  if (!Number.isFinite(num)) {
+    return [num, '', ''];
+  }
+
+  // "scale" here will be a term indicating how many thousands there are in the number
+  // e.g. 1001 will be 1000, 1000002 will be 1000000, etc.
+  const scale = Math.pow(10, 3 * Math.min(Math.floor(Math.floor(Math.log10(num)) / 3), 4));
+
+  const compactPrefixTranslations = {
+    compactThousands: i18n.translate('xpack.securitySolution.formattedNumber.compactThousands', {
+      defaultMessage: 'k',
+    }),
+    compactMillions: i18n.translate('xpack.securitySolution.formattedNumber.compactMillions', {
+      defaultMessage: 'M',
+    }),
+
+    compactBillions: i18n.translate('xpack.securitySolution.formattedNumber.compactBillions', {
+      defaultMessage: 'B',
+    }),
+
+    compactTrillions: i18n.translate('xpack.securitySolution.formattedNumber.compactTrillions', {
+      defaultMessage: 'T',
+    }),
+  };
+  const prefixMap: Map<number, string> = new Map([
+    [1, ''],
+    [1000, compactPrefixTranslations.compactThousands],
+    [1000000, compactPrefixTranslations.compactMillions],
+    [1000000000, compactPrefixTranslations.compactBillions],
+    [1000000000000, compactPrefixTranslations.compactTrillions],
+  ]);
+  const hasRemainder = i18n.translate('xpack.securitySolution.formattedNumber.compactOverflow', {
+    defaultMessage: '+',
+  });
+  const prefix = prefixMap.get(scale) ?? '';
+  return [Math.floor(num / scale), prefix, (num / scale) % 1 > Number.EPSILON ? hasRemainder : ''];
+}
+
+const FormattedCountComponent: React.FC<{ count: number | null }> = ({ count }) => {
+  const [mantissa, scale, hasRemainder] = useMemo(() => compactNotationParts(count || 0), [count]);
+
+  if (count == null) {
+    return null;
+  }
+
+  if (count === 0) {
+    return <>{0}</>;
+  }
+
+  return (
+    <FormattedMessage
+      id="xpack.securitySolution.formattedNumber.countsLabel"
+      description=""
+      defaultMessage="{mantissa}{scale}{hasRemainder}"
+      values={{ mantissa: <EuiI18nNumber value={mantissa} />, scale, hasRemainder }}
+    />
+  );
+};
+
+export const FormattedCount = React.memo(FormattedCountComponent);
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx
index 5968322ac3539..84843e8be90ed 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 
 import '../../mock/match_media';
 import { TestProviders } from '../../mock';
-import { HeaderPage } from './index';
+import { HeaderPage } from '.';
 import { useMountAppended } from '../../utils/use_mount_appended';
 import { SecurityPageName } from '../../../app/types';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap
index 45a6e20cf087d..4447f631c1572 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap
@@ -2,6 +2,8 @@
 
 exports[`HeaderSection it renders 1`] = `
 <Header
+  $hideSubtitle={false}
+  className="toggle-expand siemHeaderSection"
   data-test-subj="header-section"
 >
   <EuiFlexGroup
@@ -14,11 +16,13 @@ exports[`HeaderSection it renders 1`] = `
     >
       <EuiFlexGroup
         alignItems="center"
+        className="header-section-content"
         gutterSize="s"
         responsive={false}
       >
         <EuiFlexItem>
           <EuiFlexGroup
+            className="header-section-titles"
             gutterSize="none"
           >
             <EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
index 2296dc78241f2..d835f4b2b236a 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
@@ -10,7 +10,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { HeaderSection } from './index';
+import { HeaderSection } from '.';
 
 describe('HeaderSection', () => {
   test('it renders', () => {
@@ -231,6 +231,28 @@ describe('HeaderSection', () => {
     expect(wrapper.find('[data-test-subj="header-section-filters"]').first().exists()).toBe(true);
     expect(wrapper.find('[data-test-subj="inspect-icon-button"]').first().exists()).toBe(true);
   });
+
+  test('it appends `toggle-expand` class to Header when toggleStatus = true', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <HeaderSection
+          id="an id"
+          title="Test title"
+          subtitle="subtitle"
+          headerFilters="headerFilters"
+          toggleQuery={jest.fn()}
+          toggleStatus={true}
+        >
+          <p>{'Test children'}</p>
+        </HeaderSection>
+      </TestProviders>
+    );
+
+    expect(wrapper.find('[data-test-subj="header-section"]').first().prop('className')).toBe(
+      'toggle-expand siemHeaderSection'
+    );
+  });
+
   test('it does not render anything but title when toggleStatus = false', () => {
     const wrapper = mount(
       <TestProviders>
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
index 7997dfa83e27b..86cdc45312cf2 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
@@ -16,6 +16,7 @@ import {
 import React, { useCallback } from 'react';
 import styled, { css } from 'styled-components';
 
+import classnames from 'classnames';
 import { InspectButton } from '../inspect';
 
 import { Subtitle } from '../subtitle';
@@ -24,11 +25,23 @@ import * as i18n from '../../containers/query_toggle/translations';
 interface HeaderProps {
   border?: boolean;
   height?: number;
+  className?: string;
+  $hideSubtitle?: boolean;
 }
 
-const Header = styled.header.attrs(() => ({
-  className: 'siemHeaderSection',
-}))<HeaderProps>`
+const Header = styled.header<HeaderProps>`
+  &.toggle-expand {
+    .header-section-content {
+      height: 48px;
+    }
+
+    ${({ $hideSubtitle, theme }) =>
+      !$hideSubtitle &&
+      `.header-section-titles {
+              margin-top:  ${theme.eui.paddingSizes.m};
+        }`}
+  }
+
   ${({ height }) =>
     height &&
     css`
@@ -91,17 +104,33 @@ const HeaderSectionComponent: React.FC<HeaderSectionProps> = ({
       toggleQuery(!toggleStatus);
     }
   }, [toggleQuery, toggleStatus]);
+
+  const classNames = classnames({
+    'toggle-expand': toggleStatus,
+    siemHeaderSection: true,
+  });
   return (
-    <Header data-test-subj="header-section" border={border} height={height}>
+    <Header
+      data-test-subj="header-section"
+      border={border}
+      height={height}
+      className={classNames}
+      $hideSubtitle={hideSubtitle}
+    >
       <EuiFlexGroup
         alignItems={stackHeader ? undefined : 'center'}
         direction={stackHeader ? 'column' : 'row'}
         gutterSize="s"
       >
         <EuiFlexItem grow={growLeftSplit}>
-          <EuiFlexGroup alignItems="center" responsive={false} gutterSize="s">
+          <EuiFlexGroup
+            alignItems="center"
+            responsive={false}
+            gutterSize="s"
+            className="header-section-content"
+          >
             <EuiFlexItem>
-              <EuiFlexGroup gutterSize={'none'}>
+              <EuiFlexGroup gutterSize={'none'} className="header-section-titles">
                 {toggleQuery && (
                   <EuiFlexItem grow={false}>
                     <EuiButtonIcon
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx
index ab5ad74c0bf15..0051ec412eadb 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx
@@ -7,7 +7,7 @@
 import { EuiButtonEmpty, EuiContextMenuItem } from '@elastic/eui';
 import { mount } from 'enzyme';
 import React from 'react';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 import { TestProviders } from '../../../mock';
 import { ShowTopNButton } from './show_top_n';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx
index 02a59b41f2ee9..ca526bf39264f 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx
@@ -11,8 +11,8 @@ import { DraggableId } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 
+import { stopPropagationAndPreventDefault } from '@kbn/timelines-plugin/public';
 import { ColumnHeaderOptions, DataProvider, TimelineId } from '../../../../common/types/timeline';
-import { stopPropagationAndPreventDefault } from '../../../../../timelines/public';
 import { SHOW_TOP_N_KEYBOARD_SHORTCUT } from './keyboard_shortcut_constants';
 import { useHoverActionItems } from './use_hover_action_items';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx
index 528519e913f1e..71989f9673907 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx
@@ -11,6 +11,7 @@ import { DraggableId } from 'react-beautiful-dnd';
 
 import { isEmpty } from 'lodash';
 
+import { FilterManager } from '@kbn/data-plugin/public';
 import { useKibana } from '../../lib/kibana';
 import { getAllFieldsByName } from '../../containers/source';
 import { allowTopN } from '../drag_and_drop/helpers';
@@ -20,7 +21,6 @@ import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useSourcererDataView } from '../../containers/sourcerer';
 import { timelineSelectors } from '../../../timelines/store/timeline';
 import { ShowTopNButton } from './actions/show_top_n';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
 
 export interface UseHoverActionItemsProps {
   dataProvider?: DataProvider | DataProvider[];
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx
index 177faf3ac435c..13ade71212a22 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx
@@ -7,8 +7,8 @@
 
 import React, { useCallback, useMemo, useState, useRef, useContext } from 'react';
 import { DraggableProvided, DraggableStateSnapshot } from 'react-beautiful-dnd';
+import { TimelineContext } from '@kbn/timelines-plugin/public';
 import { HoverActions } from '.';
-import { TimelineContext } from '../../../../../timelines/public';
 
 import { DataProvider } from '../../../../common/types';
 import { ProviderContentWrapper } from '../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
index c4ae10b732ad1..642f5b6dcabaa 100644
--- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { ImportDataModalComponent } from './index';
+import { ImportDataModalComponent } from '.';
 jest.mock('../../lib/kibana');
 
 describe('ImportDataModal', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/landing_cards/index.tsx b/x-pack/plugins/security_solution/public/common/components/landing_cards/index.tsx
index 20ad45da680ec..5089032ec33a2 100644
--- a/x-pack/plugins/security_solution/public/common/components/landing_cards/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/landing_cards/index.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import styled from 'styled-components';
 import * as i18n from './translations';
-import endpointPng from '../../images/endpoint.png';
+import endpointSvg from '../../images/endpoint.svg';
 import siemPng from '../../images/siem.png';
 import videoSvg from '../../images/video.svg';
 import { ADD_DATA_PATH } from '../../../../common/constants';
@@ -27,7 +27,7 @@ import { useKibana } from '../../lib/kibana';
 const imgUrls = {
   siem: siemPng,
   video: videoSvg,
-  endpoint: endpointPng,
+  endpoint: endpointSvg,
 };
 
 const StyledEuiCard = styled(EuiCard)`
diff --git a/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx
index 0e27280cc2c4f..d2cff22a32f89 100644
--- a/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { LandingPageComponent } from './index';
+import { LandingPageComponent } from '.';
 
 describe('LandingPageComponent component', () => {
   it('renders page properly', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx
index dd50c1c772c57..76163bd335a68 100644
--- a/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import '../../../common/mock/formatted_relative';
+import '../../mock/formatted_relative';
 import { getEmptyValue } from '../empty_value';
 import { LastEventIndexKey } from '../../../../common/search_strategy';
 import { mockLastEventTimeQuery } from '../../containers/events/last_event_time/mock';
diff --git a/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx
index d9b36202e703e..12accb94a7454 100644
--- a/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { LinkIcon } from './index';
+import { LinkIcon } from '.';
 
 describe('LinkIcon', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx
index 8b0b2cdef72ed..fcf9b44dd8f87 100644
--- a/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { Loader } from './index';
+import { Loader } from '.';
 
 describe('rendering', () => {
   test('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx
index c4a667ac719a2..a80ad6aa3f0be 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx
@@ -39,7 +39,7 @@ jest.mock('../inspect', () => ({
   InspectButton: jest.fn(() => <div data-test-subj="mock-inspect" />),
 }));
 
-jest.mock('../../components/matrix_histogram/utils', () => ({
+jest.mock('./utils', () => ({
   getBarchartConfigs: jest.fn(),
   getCustomChartData: jest.fn().mockReturnValue(true),
 }));
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
index 4746b61a4183a..83fbf6e61b08e 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
@@ -18,13 +18,15 @@ import { MatrixLoader } from './matrix_loader';
 import { Panel } from '../panel';
 import { getBarchartConfigs, getCustomChartData } from './utils';
 import { useMatrixHistogramCombined } from '../../containers/matrix_histogram';
-import { MatrixHistogramProps, MatrixHistogramOption, MatrixHistogramQueryProps } from './types';
-import { MatrixHistogramType } from '../../../../common/search_strategy/security_solution';
 import {
+  MatrixHistogramProps,
+  MatrixHistogramOption,
+  MatrixHistogramQueryProps,
   MatrixHistogramMappingTypes,
   GetTitle,
   GetSubTitle,
-} from '../../components/matrix_histogram/types';
+} from './types';
+import { MatrixHistogramType } from '../../../../common/search_strategy/security_solution';
 import { GlobalTimeArgs } from '../../containers/use_global_time';
 import { setAbsoluteRangeDatePicker } from '../../store/inputs/actions';
 import { InputsModelId } from '../../store/inputs/constants';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts
index 1c617d36b828f..e35d4cc8293d2 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CombinedJobWithStats } from '../../../../../../ml/common/types/anomaly_detection_jobs';
-import { HttpSetup } from '../../../../../../../../src/core/public';
+import { CombinedJobWithStats } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { HttpSetup } from '@kbn/core/public';
 
 export interface GetJobsArgs {
   http: HttpSetup;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts
index aeaba20a187bc..41d2248f261f5 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../../../src/core/public';
-import { MlSummaryJob } from '../../../../../../ml/public';
+import { HttpSetup } from '@kbn/core/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 
 export interface GetJobsSummaryArgs {
   http: HttpSetup;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts b/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts
index b9cc1ecc731b3..f0a45d1cd6840 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../../../src/core/public';
-import { MlCapabilitiesResponse } from '../../../../../../ml/public';
+import { HttpSetup } from '@kbn/core/public';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/public';
 import { InfluencerInput } from '../types';
 
 export interface Body {
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx
index f92512cec5c72..7dcaa1de58d10 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 
 import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
 
+import { url as urlUtils } from '@kbn/kibana-utils-plugin/public';
 import { addEntitiesToKql } from './add_entities_to_kql';
 import { replaceKQLParts } from './replace_kql_parts';
 import { emptyEntity, multipleEntities, getMultipleEntities } from './entity_helpers';
 import { HostsTableType } from '../../../../hosts/store/model';
-import { url as urlUtils } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { HOSTS_PATH } from '../../../../../common/constants';
 interface QueryStringType {
   '?_g': string;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx
index a144898b4d95c..a8dcf18702b97 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx
@@ -9,11 +9,11 @@ import { parse, stringify } from 'query-string';
 import React from 'react';
 
 import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
+import { url as urlUtils } from '@kbn/kibana-utils-plugin/public';
 import { addEntitiesToKql } from './add_entities_to_kql';
 import { replaceKQLParts } from './replace_kql_parts';
 import { emptyEntity, getMultipleEntities, multipleEntities } from './entity_helpers';
 
-import { url as urlUtils } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { NETWORK_PATH } from '../../../../../common/constants';
 interface QueryStringType {
   '?_g': string;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx
index 587d518bc11f0..5f093db3f69bb 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx
@@ -13,7 +13,7 @@ import { EntityDraggableComponent } from './entity_draggable';
 import { TestProviders } from '../../mock/test_providers';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts
index 73eee942ccd46..4f7c48b101725 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts
@@ -7,8 +7,8 @@
 
 import { useEffect, useState } from 'react';
 import { useAsync, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
+import { CombinedJobWithStats } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { getJobs } from '../api/get_jobs';
-import { CombinedJobWithStats } from '../../../../../../ml/common/types/anomaly_detection_jobs';
 
 import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions';
 import { hasMlLicense } from '../../../../../common/machine_learning/has_ml_license';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
index 7bdad2514c82e..5bec2ce09e22a 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
@@ -7,7 +7,7 @@
 
 import { useEffect, useState } from 'react';
 
-import { MlSummaryJob } from '../../../../../../ml/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions';
 import { hasMlLicense } from '../../../../../common/machine_learning/has_ml_license';
 import { isSecurityJob } from '../../../../../common/machine_learning/is_security_job';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx
index a0eaa79440859..0e622d0d4fa40 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx
@@ -10,9 +10,9 @@ import { render, act } from '@testing-library/react';
 import { mockAnomalies } from '../mock';
 import { cloneDeep } from 'lodash/fp';
 import { ExplorerLink } from './create_explorer_link';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public/context';
-import { MlLocatorDefinition } from '../../../../../../ml/public/locator';
-import { MockUrlService } from '../../../../../../../../src/plugins/share/common/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public/context';
+import { MlLocatorDefinition } from '@kbn/ml-plugin/public/locator';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
 
 describe('create_explorer_link', () => {
   let anomalies = cloneDeep(mockAnomalies);
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx
index b5bffb623581d..4d5845845596b 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { EuiLink } from '@elastic/eui';
+import { useMlHref } from '@kbn/ml-plugin/public';
 import { Anomaly } from '../types';
 import { useKibana } from '../../../lib/kibana';
-import { useMlHref } from '../../../../../../ml/public';
 
 interface ExplorerLinkProps {
   score: Anomaly;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx
index f24a8fafe1be2..a1e27cbb14414 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState, useEffect } from 'react';
 
-import { MlCapabilitiesResponse } from '../../../../../../ml/public';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/public';
 import { emptyMlCapabilities } from '../../../../../common/machine_learning/empty_ml_capabilities';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { useHttp } from '../../../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx
index b760b8b2e04dd..045f96cfe8963 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx
@@ -13,7 +13,7 @@ import { DescriptionList } from '../../../../../common/utility_types';
 import { Anomaly, NarrowDateRange } from '../types';
 import { getScoreString } from './score_health';
 import { PreferenceFormattedDate } from '../../formatted_date';
-import { createInfluencers } from './../influencers/create_influencers';
+import { createInfluencers } from '../influencers/create_influencers';
 import * as i18n from './translations';
 import { ExplorerLink } from '../links/create_explorer_link';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx
index 96917bb8ed739..c1628961a832b 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx
@@ -10,7 +10,7 @@ import { getAnomaliesNetworkTableColumnsCurated } from './get_anomalies_network_
 import { NetworkType } from '../../../../network/store/model';
 import * as i18n from './translations';
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 
 const startDate = new Date(2001).toISOString();
 const endDate = new Date(3000).toISOString();
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx
index 3df8d545d2871..068128544f7e6 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../../mock';
 import { useMountAppended } from '../../../utils/use_mount_appended';
 import { getAnomaliesDefaultTableColumns } from './get_anomalies_table_columns';
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 
 const startDate = new Date(2001).toISOString();
 const endDate = new Date(3000).toISOString();
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/types.ts b/x-pack/plugins/security_solution/public/common/components/ml/types.ts
index c5be26fb57648..01889e6bb5bd8 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Influencer } from '../../../../../ml/public';
+import { Influencer } from '@kbn/ml-plugin/public';
 import { FlowTarget } from '../../../../common/search_strategy';
 
 import { HostsType } from '../../../hosts/store/model';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts b/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts
index 6c960cfeab4cb..12bf4b1e824e3 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlSummaryJob } from '../../../../../ml/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import {
   Group,
   Module,
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx
index 666e6bacc15fc..d2d7e198d47f3 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import {
   AugmentedSecurityJobFields,
   Module,
@@ -13,7 +14,6 @@ import {
   SecurityJob,
 } from '../types';
 import { mlModules } from '../ml_modules';
-import { MlSummaryJob } from '../../../../../../ml/public';
 
 /**
  * Helper function for converting from ModuleJob -> SecurityJob
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
index 2d03c73d0c5dc..842b199e4b7aa 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
@@ -21,11 +21,11 @@ import {
 } from '@elastic/eui';
 
 import styled from 'styled-components';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
 import { useBasePath, useKibana } from '../../../lib/kibana';
 import * as i18n from './translations';
 import { JobSwitch } from './job_switch';
 import { SecurityJob } from '../types';
-import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
 
 const JobNameWrapper = styled.div`
   margin: 5px 0;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx
index f24b1e5e6c010..4d7ec7b484818 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx
@@ -17,6 +17,7 @@ import moment from 'moment';
 import React, { Dispatch, useCallback, useReducer, useState, useMemo } from 'react';
 import styled from 'styled-components';
 
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
 import { useKibana } from '../../lib/kibana';
 import { METRIC_TYPE, TELEMETRY_EVENT, track } from '../../lib/telemetry';
 import { errorToToaster, useStateToaster, ActionToaster } from '../toasters';
@@ -30,7 +31,6 @@ import * as i18n from './translations';
 import { JobsFilters, SecurityJob } from './types';
 import { UpgradeContents } from './upgrade_contents';
 import { useSecurityJobs } from './hooks/use_security_jobs';
-import { MLJobsAwaitingNodeWarning } from '../../../../../ml/public';
 
 const PopoverContentsDiv = styled.div`
   max-width: 684px;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts b/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
index e85419940bbd6..64fe2b7e1fe81 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import { MlError } from '../ml/types';
-import { MlSummaryJob } from '../../../../../ml/public';
 
 export interface Group {
   id: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
index fead76ff1b2eb..5020e910dfaa6 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
@@ -8,7 +8,7 @@
 import { getOr, omit } from 'lodash/fp';
 
 import { useDispatch } from 'react-redux';
-import { ChromeBreadcrumb } from '../../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { APP_NAME, APP_UI_ID } from '../../../../../common/constants';
 import { StartServices } from '../../../../types';
 import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../../hosts/pages/details/utils';
@@ -27,7 +27,7 @@ import {
   UsersRouteSpyState,
 } from '../../../utils/route/types';
 import { getAppLandingUrl } from '../../link_to/redirect_to_landing';
-import { timelineActions } from '../../../../../public/timelines/store/timeline';
+import { timelineActions } from '../../../../timelines/store/timeline';
 import { TimelineId } from '../../../../../common/types/timeline';
 import { TabNavigationProps } from '../tab_navigation/types';
 import { getSearch } from '../helpers';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx
index 393a3d3e0aaba..d14c8a51a66ee 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx
@@ -9,7 +9,7 @@ import { mount } from 'enzyme';
 import React from 'react';
 
 import { CONSTANTS } from '../url_state/constants';
-import { TabNavigationComponent } from './';
+import { TabNavigationComponent } from '.';
 import { navTabs } from '../../../app/home/home_navigations';
 import { HostsTableType } from '../../../hosts/store/model';
 import { RouteSpyState } from '../../utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx
index 45eebab8c093f..b71da7cbdd6ff 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx
@@ -13,12 +13,12 @@ import { navTabsHostDetails } from '../../../../hosts/pages/details/nav_tabs';
 import { HostsTableType } from '../../../../hosts/store/model';
 import { RouteSpyState } from '../../../utils/route/types';
 import { CONSTANTS } from '../../url_state/constants';
-import { TabNavigationComponent } from './';
+import { TabNavigationComponent } from '.';
 import { TabNavigationProps } from './types';
 
 jest.mock('../../link_to');
 jest.mock('../../../lib/kibana/kibana_react', () => {
-  const originalModule = jest.requireActual('../../../../common/lib/kibana/kibana_react');
+  const originalModule = jest.requireActual('../../../lib/kibana/kibana_react');
   return {
     ...originalModule,
     useKibana: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
index c76ba7a43cb30..3f30facd5e41e 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { KibanaPageTemplateProps } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../../../lib/kibana/kibana_react';
 import { useGetUserCasesPermissions } from '../../../lib/kibana';
 import { SecurityPageName } from '../../../../app/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
index c1abcc1177c80..da03e6cf35e21 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
@@ -8,9 +8,9 @@
 import { useEffect, useState, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { PrimaryNavigationProps } from './types';
 import { usePrimaryNavigationItems } from './use_navigation_items';
-import { KibanaPageTemplateProps } from '../../../../../../../../src/plugins/kibana_react/public';
 
 const translatedNavTitle = i18n.translate('xpack.securitySolution.navigation.mainLabel', {
   defaultMessage: 'Security',
diff --git a/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx b/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx
index 606991bc08910..b2d442b963cb0 100644
--- a/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx
@@ -9,7 +9,7 @@ import { EuiFlexItem } from '@elastic/eui';
 import React from 'react';
 
 import { DescriptionList } from '../../../../common/utility_types';
-import { DescriptionListStyled } from '../../../common/components/page';
+import { DescriptionListStyled } from '../page';
 
 export const OverviewDescriptionList = ({
   dataTestSubj,
diff --git a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx
index f6ebf2a90abb4..687370cdc8018 100644
--- a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { SecuritySolutionPageWrapper } from './index';
+import { SecuritySolutionPageWrapper } from '.';
 
 describe('SecuritySolutionPageWrapper', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx
index 82e0ded264b06..94ac38d312d21 100644
--- a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx
@@ -12,7 +12,7 @@ import { CommonProps } from '@elastic/eui';
 
 import { useGlobalFullScreen } from '../../containers/use_full_screen';
 import { gutterTimeline } from '../../lib/helpers';
-import { AppGlobalStyle } from '../page/index';
+import { AppGlobalStyle } from '../page';
 
 const Wrapper = styled.div`
   &.securitySolutionWrapper--fullHeight {
diff --git a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx
index 2d728ffa915fc..5a247fa30d92f 100644
--- a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx
@@ -7,7 +7,7 @@
 
 import { getOrEmptyTagFromValue } from '../empty_value';
 
-import { Columns, ItemsPerRow } from './index';
+import { Columns, ItemsPerRow } from '.';
 
 export const mockData = {
   Hosts: {
diff --git a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx
index 57686126dfb10..2ca85d4a3ccb9 100644
--- a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants';
 
-import { BasicTableProps, PaginatedTable } from './index';
+import { BasicTableProps, PaginatedTable } from '.';
 import { getHostsColumns, mockData, rowItems, sortedHosts } from './index.mock';
 import { ThemeProvider } from 'styled-components';
 import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
diff --git a/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx
index 506cdf5be99a7..61fe1226b7e5d 100644
--- a/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { ProgressInline } from './index';
+import { ProgressInline } from '.';
 
 describe('ProgressInline', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
index 63e90848483c0..2d38f72b338ee 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
@@ -8,12 +8,14 @@
 import { mount } from 'enzyme';
 import React from 'react';
 import { render, waitFor } from '@testing-library/react';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants';
 import { TestProviders, mockIndexPattern } from '../../mock';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
-import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
 import { QueryBar, QueryBarComponentProps } from '.';
+import { setAutocomplete } from '@kbn/unified-search-plugin/public/services';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 
 const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
@@ -267,6 +269,11 @@ describe('QueryBar ', () => {
   });
 
   describe('#onSavedQueryUpdated', () => {
+    beforeEach(() => {
+      const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+      setAutocomplete(autocompleteStart.autocomplete);
+    });
+
     test('is only reference that changed when dataProviders props get updated', async () => {
       const wrapper = await getWrapper(
         <Proxy
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
index 2632930782910..15fd5927b7f75 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
@@ -15,10 +15,10 @@ import {
   TimeRange,
   SavedQuery,
   SavedQueryTimeFilter,
-} from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 export interface QueryBarComponentProps {
   dataTestSubj?: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
index 9d24114688e7d..bcf340427620a 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
@@ -10,8 +10,8 @@ import { render, fireEvent } from '@testing-library/react';
 import { InputsModelId } from '../../store/inputs/constants';
 import { SearchBarComponent } from '.';
 import { TestProviders } from '../../mock';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockFilterManager = new FilterManager(coreMock.createStart().uiSettings);
 jest.mock('../../lib/kibana', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
index d5624421c0006..d1d5c2fcebc12 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
@@ -8,15 +8,15 @@
 import { set } from '@elastic/safer-lodash-set/fp';
 import { getOr } from 'lodash/fp';
 import React, { memo, useEffect, useCallback, useMemo } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
+import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 import { Subscription } from 'rxjs';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import type { FilterManager, TimeRange, SavedQuery } from 'src/plugins/data/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { FilterManager, TimeRange, SavedQuery } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { OnTimeChangeProps } from '@elastic/eui';
 
@@ -35,10 +35,11 @@ import {
   startSelector,
   toStrSelector,
 } from './selectors';
-import { hostsActions } from '../../../hosts/store';
-import { networkActions } from '../../../network/store';
 import { timelineActions } from '../../../timelines/store/timeline';
 import { useKibana } from '../../lib/kibana';
+import { usersActions } from '../../../users/store';
+import { hostsActions } from '../../../hosts/store';
+import { networkActions } from '../../../network/store';
 
 const APP_STATE_STORAGE_KEY = 'securitySolution.searchBar.appState';
 
@@ -91,16 +92,25 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
       },
     } = useKibana().services;
 
+    const dispatch = useDispatch();
+    const setTablesActivePageToZero = useCallback(() => {
+      dispatch(usersActions.setUsersTablesActivePageToZero());
+      dispatch(hostsActions.setHostTablesActivePageToZero());
+      dispatch(networkActions.setNetworkTablesActivePageToZero());
+    }, [dispatch]);
+
     useEffect(() => {
       if (fromStr != null && toStr != null) {
         timefilter.setTime({ from: fromStr, to: toStr });
       } else if (start != null && end != null) {
+        setTablesActivePageToZero();
+
         timefilter.setTime({
           from: new Date(start).toISOString(),
           to: new Date(end).toISOString(),
         });
       }
-    }, [end, fromStr, start, timefilter, toStr]);
+    }, [end, fromStr, start, timefilter, toStr, setTablesActivePageToZero]);
 
     const onQuerySubmit = useCallback(
       (payload: { dateRange: TimeRange; query?: Query }) => {
@@ -119,6 +129,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           isQuickSelection,
           updateTime: false,
           filterManager,
+          setTablesActivePageToZero,
         };
         let isStateUpdated = false;
 
@@ -164,6 +175,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
         filterQuery,
         queries,
         updateSearch,
+        setTablesActivePageToZero,
       ]
     );
 
@@ -178,12 +190,13 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
             isQuickSelection: true,
             updateTime: true,
             filterManager,
+            setTablesActivePageToZero,
           });
         } else {
           queries.forEach((q) => q.refetch && (q.refetch as inputsModel.Refetch)());
         }
       },
-      [updateSearch, id, filterManager, queries]
+      [updateSearch, id, filterManager, queries, setTablesActivePageToZero]
     );
 
     const onSaved = useCallback(
@@ -209,6 +222,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           isQuickSelection,
           updateTime: false,
           filterManager,
+          setTablesActivePageToZero,
         };
 
         if (savedQueryUpdated.attributes.timefilter) {
@@ -226,7 +240,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
 
         updateSearch(updateSearchBar);
       },
-      [id, toStr, end, fromStr, start, filterManager, updateSearch]
+      [id, toStr, end, fromStr, start, filterManager, updateSearch, setTablesActivePageToZero]
     );
 
     const onClearSavedQuery = useCallback(() => {
@@ -246,9 +260,20 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           resetSavedQuery: true,
           savedQuery: undefined,
           filterManager,
+          setTablesActivePageToZero,
         });
       }
-    }, [savedQuery, updateSearch, id, toStr, end, fromStr, start, filterManager]);
+    }, [
+      savedQuery,
+      updateSearch,
+      id,
+      toStr,
+      end,
+      fromStr,
+      start,
+      filterManager,
+      setTablesActivePageToZero,
+    ]);
 
     const saveAppStateToStorage = useCallback(
       (filters: Filter[]) => storage.set(APP_STATE_STORAGE_KEY, filters),
@@ -273,6 +298,8 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
                 id,
                 filters: filterManager.getFilters(),
               });
+
+              setTablesActivePageToZero();
             }
           },
         })
@@ -369,6 +396,7 @@ interface UpdateReduxSearchBar extends OnTimeChangeProps {
   resetSavedQuery?: boolean;
   timelineId?: string;
   updateTime: boolean;
+  setTablesActivePageToZero: () => void;
 }
 
 export const dispatchUpdateSearch =
@@ -385,6 +413,7 @@ export const dispatchUpdateSearch =
     timelineId,
     filterManager,
     updateTime = false,
+    setTablesActivePageToZero,
   }: UpdateReduxSearchBar): void => {
     if (updateTime) {
       const fromDate = formatDate(start);
@@ -446,8 +475,7 @@ export const dispatchUpdateSearch =
       dispatch(inputsActions.setSavedQuery({ id, savedQuery }));
     }
 
-    dispatch(hostsActions.setHostTablesActivePageToZero());
-    dispatch(networkActions.setNetworkTablesActivePageToZero());
+    setTablesActivePageToZero();
   };
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts b/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts
index 3e4f7acd1ee85..c84b319d5609b 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts
@@ -7,8 +7,8 @@
 
 import { createSelector } from 'reselect';
 import type { Query } from '@kbn/es-query';
+import type { SavedQuery } from '@kbn/data-plugin/public';
 import { InputsRange } from '../../store/inputs/model';
-import type { SavedQuery } from '../../../../../../../src/plugins/data/public';
 
 export {
   endSelector,
diff --git a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx
index eb1b75b81a94b..043a2aa378427 100644
--- a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx
@@ -9,13 +9,13 @@ import React, { useEffect } from 'react';
 import { waitFor, render } from '@testing-library/react';
 import { TestProviders } from '../../mock';
 import { TEST_ID, SessionsView, defaultSessionsFilter } from '.';
-import { EntityType, TimelineId } from '../../../../../timelines/common';
+import { EntityType, TimelineId } from '@kbn/timelines-plugin/common';
 import { SessionsComponentsProps } from './types';
 import { TimelineModel } from '../../../timelines/store/timeline/model';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
-jest.mock('../../components/url_state/normalize_time_range.ts');
+jest.mock('../url_state/normalize_time_range');
 
 const startDate = '2022-03-22T22:10:56.794Z';
 const endDate = '2022-03-21T22:10:56.791Z';
@@ -62,8 +62,8 @@ const SessionsViewerTGrid: React.FC<Props> = ({ columns, start, end, id, filters
   );
 };
 
-jest.mock('../../../../../timelines/public/mock/plugin_mock.tsx', () => {
-  const originalModule = jest.requireActual('../../../../../timelines/public/mock/plugin_mock.tsx');
+jest.mock('@kbn/timelines-plugin/public/mock/plugin_mock', () => {
+  const originalModule = jest.requireActual('@kbn/timelines-plugin/public/mock/plugin_mock');
   return {
     ...originalModule,
     createTGridMocks: () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts
index 3c1a73a3292b3..b7ea5fc39a1bc 100644
--- a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { Filter } from '@kbn/es-query';
-import type { EntityType } from '../../../../../timelines/common';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { QueryTabBodyProps } from '../../../hosts/pages/navigation/types';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
index f7a4bd9b9e621..1be29dae13449 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
@@ -10,7 +10,7 @@ import { mount, ReactWrapper } from 'enzyme';
 import { cloneDeep } from 'lodash';
 
 import { initialSourcererState, SourcererScopeName } from '../../store/sourcerer/model';
-import { Sourcerer } from './index';
+import { Sourcerer } from '.';
 import { sourcererActions, sourcererModel } from '../../store/sourcerer';
 import {
   createSecuritySolutionStorageMock,
@@ -43,8 +43,8 @@ jest.mock('react-redux', () => {
   };
 });
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/readme.md b/x-pack/plugins/security_solution/public/common/components/sourcerer/readme.md
new file mode 100644
index 0000000000000..be91c3144c115
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/readme.md
@@ -0,0 +1,53 @@
+# Sourcerer Component
+
+
+### Adding sourcerer to a new page
+- In order for the sourcerer to show up on a page, it needs to be added to the array `sourcererPaths` in `containers/sourcerer/index.tsx`
+- The scope of a sourcerer component will be default unless the path is added to the `detectionsPaths` array, in which case the scope can be detections in `containers/sourcerer/index.tsx`
+
+## Default Sourcerer
+![](../../images/default.png)
+- The data view is shown in the dropdown. All index aliases that have existing indices are selected by default. Index aliases that do NOT have existing indices are shown in the dropdown as deactivated
+
+## Detections Sourcerer
+![](../../images/alerts.png)
+- The detections sourcerer is locked to the signals index, and has an "Alerts" flag
+
+## Timeline Sourcerer
+![](../../images/timeline.png)
+- The timeline sourcerer is almost exactly like the default sourcerer, but it has a checkbox to "Show only detection alerts" which will automatically select the default data view with the alerts index locked in:
+![](../../images/timeline-alerts.png)
+
+## Sourcerer Quirks
+ - Signals index is not always defined yet, so we `pollForSignalIndex` on mount of detections sourcerer and timeline sourcerer
+ - Signals index is hidden in default scope as it is never used on our Explore pages where default scope is used
+ - When `selectedPatterns` changes, we updated the `onUpdateDetectionAlertsChecked` boolean
+ - Reset button sets to the active `patternList` on the default security data view
+ - The "Modified" label gets applied when the data view `selectedPatterns` diverge from the `patternList`. It does not appear when changing data views and using that data views patternList in full. It does not appear until Save is pressed!
+   ![](../../images/timeline_alerts.png)
+
+## Legacy Timeline Sourcerer
+ - "Update available" workflow for pre-8.0 timelines and timelines that have indices that got deleted from the default data view
+
+### Flow 1
+**Note:** i paused the most in this flow so y'all can ready the copy, the rest of the flows go quicker
+Legacy Timeline includes an active index pattern that is not included in the default data view, user decides to update data view. Page refresh is prompted
+![f1](https://user-images.githubusercontent.com/6935300/144764137-d53b2468-db42-4031-81aa-716b4dfbfa89.gif)
+### Flow 2
+Legacy Timeline includes an active index pattern that is not included in the default data view, user decides to update to the new sourcerer with only the indices that already exist in the data view
+![f2](https://user-images.githubusercontent.com/6935300/144764142-f0311e7c-1a01-4258-a607-7e446a6649a9.gif)
+### Flow 3
+Legacy Timeline includes an active index pattern that is not included in the default data view, user decides to reset to the new sourcerer and abandon their index pattern
+![f3](https://user-images.githubusercontent.com/6935300/144764143-48a8d779-c413-4622-9929-54f544057fc4.gif)
+### Flow 4
+Legacy Timeline index patterns are ALL included in the default data view, user updates to the new sourcerer without needing to update the data view
+![f4](https://user-images.githubusercontent.com/6935300/144764144-005933ce-134b-45ec-b437-491b6c9a8bbf.gif)
+### Flow 5
+Legacy Timeline none of the index patterns in the legacy timeline match, don't allow user to upgrade data view. Forces them to reset to new sourcerer or keep a bad index pattern
+![f5](https://user-images.githubusercontent.com/6935300/144764145-7b079933-0847-4090-ab94-eada377e3e9a.gif)
+### Flow 6
+Start with a valid non-legacy timeline. Delete one of the index patterns from advanced settings. Fallsback into temporary timeline and prompts user to re-add the deleted index pattern
+![f6](https://user-images.githubusercontent.com/6935300/144764146-6e0ac904-4a8e-4a4c-bf4f-c43db07e5a79.gif)
+### Flow 7
+Error state, not expected
+![f7](https://user-images.githubusercontent.com/6935300/144874843-ff3e5d1a-3436-41f6-97af-cad3431b83cc.gif)
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_pick_index_patterns.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_pick_index_patterns.tsx
index a9054d42a37cf..44bc5f402695f 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_pick_index_patterns.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_pick_index_patterns.tsx
@@ -9,7 +9,7 @@ import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react'
 import { EuiComboBoxOptionOption, EuiSuperSelectOption } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 
-import { getSourcererDataview } from '../../containers/sourcerer/api';
+import { getSourcererDataView } from '../../containers/sourcerer/api';
 import { getScopePatternListSelection } from '../../store/sourcerer/helpers';
 import { sourcererActions, sourcererModel } from '../../store/sourcerer';
 import { getDataViewSelectOptions, getPatternListWithoutSignals } from './helpers';
@@ -192,7 +192,7 @@ export const usePickIndexPatterns = ({
           setSelectedOptions([]);
           // TODO We will need to figure out how to pass an abortController, but as right now this hook is
           // constantly getting destroy and re-init
-          const pickedDataViewData = await getSourcererDataview(newSelectedDataViewId);
+          const pickedDataViewData = await getSourcererDataView(newSelectedDataViewId);
           if (isHookAlive.current) {
             dispatch(
               sourcererActions.updateSourcererDataViews({
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx
index 384ba0f16427a..4b88b5cca19ab 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx
@@ -29,8 +29,8 @@ jest.mock('../../lib/kibana', () => {
     useKibana: () => mockedUseKibana,
   };
 });
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx
index fdaf733e49d95..867c45e7a8e06 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx
@@ -8,10 +8,10 @@
 import React, { useCallback } from 'react';
 import { EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../../lib/kibana';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import { ensurePatternFormat } from '../../store/sourcerer/helpers';
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
 import * as i18n from './translations';
 import { RefreshButton } from './refresh_button';
 import { useAppToasts } from '../../hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx
index f9030e1862d98..bd136f95257e5 100644
--- a/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { Subtitle } from './index';
+import { Subtitle } from '.';
 
 describe('Subtitle', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx
index bc397292af4ec..36acb0abc219e 100644
--- a/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx
@@ -58,7 +58,7 @@ describe('Table Helpers', () => {
       });
       const wrapper = mount(<TestProviders>{rowItem}</TestProviders>);
       expect(wrapper.find('[data-test-subj="render-content-attrName"]').first().text()).toBe(
-        '(Empty String)'
+        '(Empty string)'
       );
     });
 
@@ -119,7 +119,7 @@ describe('Table Helpers', () => {
       });
       const wrapper = mount(<TestProviders>{rowItems}</TestProviders>);
       expect(wrapper.find('[data-test-subj="render-content-attrName"]').first().text()).toBe(
-        '(Empty String)'
+        '(Empty string)'
       );
     });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx
index f9f2d13bce2d9..a6092ed423d01 100644
--- a/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/eui';
 import styled from 'styled-components';
 
+import { TimelineContext } from '@kbn/timelines-plugin/public';
 import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper';
 import { escapeDataProviderId } from '../drag_and_drop/helpers';
 import { defaultToEmptyTag, getEmptyTagValue } from '../empty_value';
@@ -25,7 +26,6 @@ import { IS_OPERATOR } from '../../../timelines/components/timeline/data_provide
 import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
 import { HoverActions } from '../hover_actions';
 import { DataProvider, QueryOperator } from '../../../../common/types';
-import { TimelineContext } from '../../../../../timelines/public';
 
 const Subtext = styled.div`
   font-size: ${(props) => props.theme.eui.euiFontSizeXS};
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx
index d99d813e1af8f..658f430f219fb 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx
@@ -10,10 +10,10 @@ import React from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
 import { EntryItem } from './entry_item';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 import type { DataViewBase } from '@kbn/es-query';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 describe('EntryItem', () => {
   test('it renders field labels if "showLabel" is "true"', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx
index 272d056eed143..3767f2bac18af 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 import { Entry, EmptyEntry, ThreatMapEntries, FormattedEntry } from './types';
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
+import type { FieldSpec } from '@kbn/data-plugin/common';
 import type { DataViewBase } from '@kbn/es-query';
 import moment from 'moment-timezone';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx
index 2358f4dd5b9c1..db6c7a4261c5e 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx
@@ -11,9 +11,9 @@ import { addIdToItem } from '@kbn/securitysolution-utils';
 import { ThreatMap, threatMap, ThreatMapping } from '@kbn/securitysolution-io-ts-alerting-types';
 
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { ValidationFunc } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+import { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
 import { Entry, FormattedEntry, ThreatMapEntries, EmptyEntry } from './types';
-import { ValidationFunc } from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-import { ERROR_CODE } from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
 
 /**
  * Formats the entry into one that is easily usable for the UI.
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
index 20fd2821ed9be..6b186d3d11dfa 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
@@ -10,11 +10,11 @@ import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
+import { fields } from '@kbn/data-plugin/common/mocks';
 
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 
-import { ThreatMatchComponent } from './';
+import { ThreatMatchComponent } from '.';
 import { ThreatMapEntries } from './types';
 import type { DataViewBase } from '@kbn/es-query';
 import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
@@ -25,7 +25,7 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 const getPayLoad = (): ThreatMapEntries[] => [
   { entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] },
@@ -42,7 +42,7 @@ describe('ThreatMatchComponent', () => {
   beforeEach(() => {
     (useKibana as jest.Mock).mockReturnValue({
       services: {
-        data: {
+        unifiedSearch: {
           autocomplete: {
             getValueSuggestions: getValueSuggestionsMock,
           },
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx
index 0cb1ed830ceca..571207918c44c 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
-import { useKibana } from '../../../common/lib/kibana';
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
+import { useKibana } from '../../lib/kibana';
+import { fields } from '@kbn/data-plugin/common/mocks';
 
 import { ListItemComponent } from './list_item';
 import { ThreatMapEntries } from './types';
@@ -23,7 +23,7 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 const singlePayload = (): ThreatMapEntries => ({
   entries: [
@@ -56,7 +56,7 @@ describe('ListItemComponent', () => {
   beforeAll(() => {
     (useKibana as jest.Mock).mockReturnValue({
       services: {
-        data: {
+        unifiedSearch: {
           autocomplete: {
             getValueSuggestions: getValueSuggestionsMock,
           },
diff --git a/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts b/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts
index 04ceafde7ef74..aa548c5cc5836 100644
--- a/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import { isError } from 'lodash/fp';
 import { isAppError } from '@kbn/securitysolution-t-grid';
 
-import { AppToast, ActionToaster } from './';
+import { AppToast, ActionToaster } from '.';
 import { isToasterError } from './errors';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
index 28f942dfa61cb..9277d3b296874 100644
--- a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
@@ -9,10 +9,10 @@ import React, { useMemo } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useGlobalTime } from '../../containers/use_global_time';
 import { BrowserFields } from '../../containers/source';
 import { useKibana } from '../../lib/kibana';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { inputsModel, inputsSelectors, State } from '../../store';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
 import { timelineSelectors } from '../../../timelines/store/timeline';
diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
index e5ce8e4105cac..4430c8f030122 100644
--- a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
+++ b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
@@ -12,7 +12,7 @@ import * as H from 'history';
 
 import type { Filter, Query } from '@kbn/es-query';
 
-import { url } from '../../../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 import { TimelineId, TimelineTabs } from '../../../../common/types/timeline';
 import { SecurityPageName } from '../../../app/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/types.ts b/x-pack/plugins/security_solution/public/common/components/url_state/types.ts
index d9c91f3371856..f43eaba280d7a 100644
--- a/x-pack/plugins/security_solution/public/common/components/url_state/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/url_state/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import type { FilterManager, SavedQueryService } from 'src/plugins/data/public';
+import type { FilterManager, SavedQueryService } from '@kbn/data-plugin/public';
 import { UrlInputsModel } from '../../store/inputs/model';
 import { TimelineUrl } from '../../../timelines/store/timeline/model';
 import { RouteSpyState } from '../../utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/__mocks__/index.ts b/x-pack/plugins/security_solution/public/common/components/user_privileges/__mocks__/index.ts
index dc77a6b9eea8d..9170d2c3f0aa4 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/__mocks__/index.ts
@@ -8,11 +8,13 @@
 import { initialUserPrivilegesState, UserPrivilegesState } from '../user_privileges_context';
 import { getEndpointPrivilegesInitialStateMock } from '../endpoint/mocks';
 
-export const useUserPrivileges = jest.fn(() => {
+export const getUserPrivilegesMockDefaultValue = () => {
   const mockedPrivileges: UserPrivilegesState = {
     ...initialUserPrivilegesState(),
     endpointPrivileges: getEndpointPrivilegesInitialStateMock(),
   };
 
   return mockedPrivileges;
-});
+};
+
+export const useUserPrivileges = jest.fn(getUserPrivilegesMockDefaultValue);
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts
index c410de5d696f0..75f3175744429 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook, RenderHookResult, RenderResult } from '@testing-library/react-hooks';
 import { useCurrentUser, useKibana } from '../../../lib/kibana';
 import { useEndpointPrivileges } from './use_endpoint_privileges';
-import { securityMock } from '../../../../../../security/public/mocks';
-import { AuthenticatedUser } from '../../../../../../security/common';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/common';
 import { licenseService } from '../../../hooks/use_license';
 import { getEndpointPrivilegesInitialStateMock } from './mocks';
 import { EndpointPrivileges } from '../../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts
index dcd602290d85c..25cfdb11e732b 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts
@@ -6,6 +6,7 @@
  */
 
 import { useEffect, useMemo, useRef, useState } from 'react';
+import { FleetAuthz } from '@kbn/fleet-plugin/common';
 import { useCurrentUser, useKibana } from '../../../lib/kibana';
 import { useLicense } from '../../../hooks/use_license';
 import {
@@ -17,7 +18,6 @@ import {
   calculateEndpointAuthz,
   getEndpointAuthzInitialState,
 } from '../../../../../common/endpoint/service/authz';
-import { FleetAuthz } from '../../../../../../fleet/common';
 import { useSecuritySolutionStartDependencies } from './security_solution_start_dependencies';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx b/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx
index 5c681e5dbbaec..5a3ec5affe4c7 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useEffect, useState } from 'react';
-import { Capabilities } from '../../../../../../../src/core/types';
+import { Capabilities } from '@kbn/core/types';
 import { SERVER_APP_ID } from '../../../../common/constants';
 import { useFetchListPrivileges } from '../../../detections/components/user_privileges/use_fetch_list_privileges';
 import { useFetchDetectionEnginePrivileges } from '../../../detections/components/user_privileges/use_fetch_detection_engine_privileges';
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx
index ac4b2d44204d1..c5fc48562add6 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx
@@ -16,7 +16,7 @@ import {
   UtilityBarGroup,
   UtilityBarSection,
   UtilityBarText,
-} from './index';
+} from '.';
 
 describe('UtilityBar', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx
index e462416fc0091..c43bb321a3586 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarAction } from './index';
+import { UtilityBarAction } from '.';
 
 describe('UtilityBarAction', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx
index 4359f6eb32a03..cd9ce57bb98a8 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarGroup, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarText } from '.';
 
 describe('UtilityBarGroup', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx
index b3decccda5f5c..7d7624d6f0171 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from '.';
 
 describe('UtilityBarSection', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx
index b4297af892988..44b4b68678884 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarText } from './index';
+import { UtilityBarText } from '.';
 
 describe('UtilityBarText', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx
index 00ae0873472e9..b06fde164af76 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx
@@ -20,7 +20,7 @@ import { UpdateQueryParams, upsertQuery } from '../../store/inputs/helpers';
 import { cloneDeep } from 'lodash';
 import { useKibana } from '../../lib/kibana/kibana_react';
 import { CASES_FEATURE_ID } from '../../../../common/constants';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
   return {
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
index 9fc193e71b40d..6bc0a63c57df5 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TypedLensByValueInput } from '../../../../../lens/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { InputsModelId } from '../../store/inputs/constants';
 
 export type LensAttributes = TypedLensByValueInput['attributes'];
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx
index af0b41ad87bca..2b75b149855fc 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import { renderHook } from '@testing-library/react-hooks';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { useKibana } from '../../lib/kibana';
 import { kpiHostMetricLensAttributes } from './lens_attributes/hosts/kpi_host_metric';
 import { useAddToExistingCase } from './use_add_to_existing_case';
 
 jest.mock('../../lib/kibana/kibana_react');
 
-describe('', () => {
+describe('useAddToExistingCase', () => {
   const mockCases = mockCasesContract();
   const mockOnAddToCaseClicked = jest.fn();
   const timeRange = {
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx
index fc2a1893e1ad0..d8946da8a63b4 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useCallback, useMemo } from 'react';
-import { CommentType } from '../../../../../cases/common';
+import { CommentType } from '@kbn/cases-plugin/common';
 
 import { APP_ID } from '../../../../common/constants';
 import { useKibana } from '../../lib/kibana/kibana_react';
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx
index 758f7e664fb03..7b5a8b09e5f5e 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import { renderHook } from '@testing-library/react-hooks';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { useKibana } from '../../lib/kibana';
 import { kpiHostMetricLensAttributes } from './lens_attributes/hosts/kpi_host_metric';
 import { useAddToNewCase } from './use_add_to_new_case';
 
 jest.mock('../../lib/kibana/kibana_react');
 
-describe('', () => {
+describe('useAddToNewCase', () => {
   const mockCases = mockCasesContract();
   const timeRange = {
     from: '2022-03-06T16:00:00.000Z',
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx
index 6958b2cb97892..51ad9a8fdaa79 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx
@@ -6,7 +6,7 @@
  */
 import { useCallback, useMemo } from 'react';
 
-import { CommentType } from '../../../../../cases/common';
+import { CommentType } from '@kbn/cases-plugin/common';
 
 import { APP_ID } from '../../../../common/constants';
 import { useKibana } from '../../lib/kibana/kibana_react';
diff --git a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts
index 97b0f34db9651..c7b46a6394b86 100644
--- a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts
@@ -10,7 +10,7 @@ import { NarrowDateRange } from '../../../components/ml/types';
 import { UpdateDateRange } from '../../../components/charts/common';
 import { GlobalTimeArgs } from '../../use_global_time';
 import { HostsType } from '../../../../hosts/store/model';
-import { NetworkType } from '../../../../network/store//model';
+import { NetworkType } from '../../../../network/store/model';
 import { FlowTarget } from '../../../../../common/search_strategy';
 import { UsersType } from '../../../../users/store/model';
 
diff --git a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts
index 9a9b5b13137e6..2c5940f6662fe 100644
--- a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts
@@ -7,7 +7,7 @@
 
 import deepmerge from 'deepmerge';
 
-import { MlSummaryJob } from '../../../../../../ml/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import { FlowTarget } from '../../../../../common/search_strategy';
 import { ESTermQuery } from '../../../../../common/typed_json';
 import { createFilter } from '../../helpers';
diff --git a/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx b/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx
index cf7953bb8922c..7c61c56f3c3b2 100644
--- a/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx
@@ -7,9 +7,9 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { AuthStackByField } from '../../../../common/search_strategy';
-import { TestProviders } from '../../../common/mock';
+import { TestProviders } from '../../mock';
 import { HostsType } from '../../../hosts/store/model';
-import { useAuthentications } from './index';
+import { useAuthentications } from '.';
 
 describe('authentications', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx b/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx
index 543ebc3e15e9a..408d29f4e972a 100644
--- a/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx
@@ -10,7 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   AuthenticationsEdges,
   AuthStackByField,
@@ -21,15 +21,15 @@ import {
 import { PageInfoPaginated, DocValueFields, SortField } from '../../../../common/search_strategy';
 import { ESTermQuery } from '../../../../common/typed_json';
 
-import { inputsModel } from '../../../common/store';
-import { createFilter } from '../../../common/containers/helpers';
-import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers';
-import { useKibana } from '../../../common/lib/kibana';
+import { inputsModel } from '../../store';
+import { createFilter } from '../helpers';
+import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
+import { useKibana } from '../../lib/kibana';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 
 import * as i18n from './translations';
-import { useAppToasts } from '../../../common/hooks/use_app_toasts';
+import { useAppToasts } from '../../hooks/use_app_toasts';
 
 export interface AuthenticationArgs {
   authentications: AuthenticationsEdges[];
diff --git a/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts b/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
index f668f96cce966..f4d3cde6e811d 100644
--- a/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
@@ -8,11 +8,8 @@
 import { Observable } from 'rxjs';
 import { filter } from 'rxjs/operators';
 
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import {
-  isErrorResponse,
-  isCompleteResponse,
-} from '../../../../../../../../src/plugins/data/common';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { isErrorResponse, isCompleteResponse } from '@kbn/data-plugin/common';
 import {
   CtiEventEnrichmentRequestOptions,
   CtiEventEnrichmentStrategyResponse,
diff --git a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts
index 21791952fec06..1bd188d01cb51 100644
--- a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts
@@ -9,7 +9,7 @@ import { act, renderHook } from '@testing-library/react-hooks';
 import { noop } from 'lodash/fp';
 import { useTimelineLastEventTime, UseTimelineLastEventTimeArgs } from '.';
 import { LastEventIndexKey } from '../../../../../common/search_strategy';
-import { useKibana } from '../../../../common/lib/kibana';
+import { useKibana } from '../../../lib/kibana';
 
 const mockSearchStrategy = jest.fn();
 const mockUseKibana = {
@@ -41,7 +41,7 @@ const mockUseKibana = {
   },
 };
 
-jest.mock('../../../../common/lib/kibana', () => ({
+jest.mock('../../../lib/kibana', () => ({
   useKibana: jest.fn(),
   useToasts: jest.fn().mockReturnValue({
     addError: jest.fn(),
diff --git a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
index c1d45f605c821..953812687b68e 100644
--- a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
@@ -10,8 +10,9 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
-import { inputsModel } from '../../../../common/store';
-import { useKibana } from '../../../../common/lib/kibana';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { inputsModel } from '../../../store';
+import { useKibana } from '../../../lib/kibana';
 import {
   TimelineEventsQueries,
   TimelineEventsLastEventTimeRequestOptions,
@@ -19,10 +20,6 @@ import {
   LastTimeDetails,
   LastEventIndexKey,
 } from '../../../../../common/search_strategy/timeline';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { DocValueFields } from '../../../../../common/search_strategy';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx b/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx
index ab8e7cf97d34c..e3f78cee0faae 100644
--- a/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback } from 'react';
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 
 export interface UseMessagesStorage {
   getMessages: (plugin: string) => string[];
diff --git a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts
index 138fa99ef4074..bb65e5def2792 100644
--- a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 import { useMatrixHistogram, useMatrixHistogramCombined } from '.';
 import { MatrixHistogramType } from '../../../../common/search_strategy';
 import { TestProviders } from '../../mock/test_providers';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 const basicResponse = {
   isPartial: false,
diff --git a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
index e22960e833b9a..a423de8f4436d 100644
--- a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
@@ -10,10 +10,11 @@ import { getOr, isEmpty, noop } from 'lodash/fp';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isErrorResponse, isCompleteResponse } from '@kbn/data-plugin/common';
 import { MatrixHistogramQueryProps } from '../../components/matrix_histogram/types';
-import { inputsModel } from '../../../common/store';
-import { createFilter } from '../../../common/containers/helpers';
-import { useKibana } from '../../../common/lib/kibana';
+import { inputsModel } from '../../store';
+import { createFilter } from '../helpers';
+import { useKibana } from '../../lib/kibana';
 import {
   MatrixHistogramQuery,
   MatrixHistogramRequestOptions,
@@ -21,7 +22,6 @@ import {
   MatrixHistogramData,
   MatrixHistogramTypeToAggName,
 } from '../../../../common/search_strategy/security_solution';
-import { isErrorResponse, isCompleteResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/common/containers/query_client/query_client_provider.tsx b/x-pack/plugins/security_solution/public/common/containers/query_client/query_client_provider.tsx
index c888a89c44cde..9d2f9ca9f48fa 100644
--- a/x-pack/plugins/security_solution/public/common/containers/query_client/query_client_provider.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/query_client/query_client_provider.tsx
@@ -5,13 +5,20 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
+import React, { memo, PropsWithChildren, useMemo } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
-export const queryClient = new QueryClient();
+export type ReactQueryClientProviderProps = PropsWithChildren<{
+  queryClient?: QueryClient;
+}>;
 
-export const ReactQueryClientProvider = memo(({ children }) => {
-  return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;
-});
+export const ReactQueryClientProvider = memo<ReactQueryClientProviderProps>(
+  ({ queryClient, children }) => {
+    const client = useMemo(() => {
+      return queryClient || new QueryClient();
+    }, [queryClient]);
+    return <QueryClientProvider client={client}>{children}</QueryClientProvider>;
+  }
+);
 
 ReactQueryClientProvider.displayName = 'ReactQueryClientProvider';
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/index.tsx b/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
index 7cc37b5f7e6e3..39626f7c14562 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
@@ -11,7 +11,6 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import type { DataViewBase } from '@kbn/es-query';
 import { Subscription } from 'rxjs';
 
-import { useKibana } from '../../lib/kibana';
 import {
   BrowserField,
   BrowserFields,
@@ -19,8 +18,9 @@ import {
   IndexField,
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse,
-} from '../../../../../timelines/common';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
+} from '@kbn/timelines-plugin/common';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { useKibana } from '../../lib/kibana';
 import * as i18n from './translations';
 import { useAppToasts } from '../../hooks/use_app_toasts';
 
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx b/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
index 66087f91ac6c2..3e30d02edbabd 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
@@ -10,9 +10,6 @@ import { Subscription } from 'rxjs';
 import { useDispatch } from 'react-redux';
 import memoizeOne from 'memoize-one';
 import { omit, pick } from 'lodash/fp';
-import { useKibana } from '../../lib/kibana';
-import { useAppToasts } from '../../hooks/use_app_toasts';
-import { sourcererActions } from '../../store/sourcerer';
 import {
   BrowserField,
   DELETED_SECURITY_SOLUTION_DATA_VIEW,
@@ -20,15 +17,14 @@ import {
   IndexField,
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse,
-} from '../../../../../timelines/common';
-import {
-  FieldSpec,
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/timelines-plugin/common';
+import { FieldSpec, isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { useKibana } from '../../lib/kibana';
+import { useAppToasts } from '../../hooks/use_app_toasts';
+import { sourcererActions } from '../../store/sourcerer';
 import * as i18n from './translations';
 import { SourcererScopeName } from '../../store/sourcerer/model';
-import { getSourcererDataview } from '../sourcerer/api';
+import { getSourcererDataView } from '../sourcerer/api';
 
 export type IndexFieldSearch = (param: {
   dataViewId: string;
@@ -125,7 +121,7 @@ export const useDataView = (): {
         };
         setLoading({ id: dataViewId, loading: true });
         if (needToBeInit) {
-          const dataViewToUpdate = await getSourcererDataview(
+          const dataViewToUpdate = await getSourcererDataView(
             dataViewId,
             abortCtrl.current[dataViewId].signal
           );
diff --git a/x-pack/plugins/security_solution/public/common/containers/sourcerer/api.ts b/x-pack/plugins/security_solution/public/common/containers/sourcerer/api.ts
index 5544a836c032f..014b21d3b2c25 100644
--- a/x-pack/plugins/security_solution/public/common/containers/sourcerer/api.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/sourcerer/api.ts
@@ -31,7 +31,7 @@ export const postSourcererDataView = async ({
     signal,
   });
 
-export const getSourcererDataview = async (
+export const getSourcererDataView = async (
   dataViewId: string,
   signal?: AbortSignal
 ): Promise<KibanaDataView> => {
diff --git a/x-pack/plugins/security_solution/public/common/containers/sourcerer/index.tsx b/x-pack/plugins/security_solution/public/common/containers/sourcerer/index.tsx
index 2daaa8c2793eb..8aee6df793ad9 100644
--- a/x-pack/plugins/security_solution/public/common/containers/sourcerer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/sourcerer/index.tsx
@@ -394,11 +394,13 @@ export const useSourcererDataView = (
   );
 };
 
+const detectionsPaths = [ALERTS_PATH, `${RULES_PATH}/id/:id`, `${CASES_PATH}/:detailName`];
+
 export const getScopeFromPath = (
   pathname: string
 ): SourcererScopeName.default | SourcererScopeName.detections =>
   matchPath(pathname, {
-    path: [ALERTS_PATH, `${RULES_PATH}/id/:id`, `${CASES_PATH}/:detailName`],
+    path: detectionsPaths,
     strict: false,
   }) == null
     ? SourcererScopeName.default
diff --git a/x-pack/plugins/security_solution/public/common/containers/sourcerer/readme.md b/x-pack/plugins/security_solution/public/common/containers/sourcerer/readme.md
new file mode 100644
index 0000000000000..d6edb9794dc8b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/containers/sourcerer/readme.md
@@ -0,0 +1,51 @@
+# Sourcerer Container
+
+### `useInitSourcerer`
+ - called at the top of the app in HomePageComponent to initialize the sourcerer state!
+ - Calls `useSourcererDataView` (see below) for the active scope (ex: `SourcererScopeName.default | SourcererScopeName.detections`)
+ - If there is an error with the data view, thrown here
+ - Run index field search for the active data view id, and when the active data view id updates 
+ - we changed the logic to not fetch all the index fields for every data view on the loading of the app  because user can have a lot of them and it can slow down the loading of the app  and maybe blow up the memory of the browser. 
+ - We decided to load the data view patternList and fields on demand, we know that will only have to load this data view on default and timeline scope.  We will use two conditions to see if we need to fetch and initialize the data view selected.  First, we will make sure that we did not already fetch them by using `searchedIds` and then we will init them if `selectedPatterns` and `missingPatterns` are empty.
+ - onSignalIndexUpdated
+   - called when signal index first has data in order to add it to the defaultDataView and refresh the index fields
+
+### `useSourcererDataView` 
+ - returns combined data from SourcererDataView and SourcererScope to create SelectedDataView state
+```typescript
+interface SelectedDataView {
+  browserFields: SourcererDataView['browserFields'];
+  dataViewId: string | null; // null if legacy pre-8.0 timeline
+  docValueFields: SourcererDataView['docValueFields'];
+  /**
+   * DataViewBase with enhanced index fields used in timelines
+   */
+  indexPattern: SecuritySolutionDataViewBase;
+  /** do the selected indices exist  */
+  indicesExist: boolean;
+  /** is an update being made to the data view */
+  loading: boolean;
+  /** all active & inactive patterns from SourcererDataView['title']  */
+  patternList: string[];
+  runtimeMappings: SourcererDataView['runtimeMappings'];
+  /** all selected patterns from SourcererScope['selectedPatterns'] */
+  selectedPatterns: SourcererScope['selectedPatterns'];
+  // active patterns when dataViewId == null
+  activePatterns?: string[];
+}
+```
+
+### `useDataView`
+- called to get `indexFieldSearch`, which gets the fields and formats them in `getDataViewStateFromIndexFields` in `use_data_view.tsx`
+- `indexFieldSearch` calls the `IndexFieldsStrategyRequest` in the `timelines` plugin. This request takes an argument of either `dataViewId` or `indices` to get the fields. 
+  - Our app uses `dataViewId`, getting the fields from a Data View that includes runtime fields. No matter what the sourcerer indices are set to, we will get the same fields always from the Data View. If we only requested `indices`, we would get just the fields for those indices (not all like Data View) and therefore would not get the runtime fields. So even when we are in `SourcererScopeName.detections` narrowed down to just `.alerts-security.alerts-default`, we get all the fields from the entire Security Solution Data View.
+
+### `useSignalHelpers`
+ - called on from detections and timelines scopes
+ - `signalIndexNeedsInit` - when defined, signal index has been initiated but does not exist
+ - `pollForSignalIndex` - when false, signal index has been initiated
+
+
+### Adding sourcerer to a new page
+- In order for the sourcerer to show up on a page, it needs to be added to the array `sourcererPaths`
+- The scope of a sourcerer component will be default unless the path is added to the `detectionsPaths` array, in which case the scope can be detections
\ No newline at end of file
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts
index ecbf7058fded2..fc0455348c4e6 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useSearchStrategy } from './index';
+import { useSearchStrategy } from '.';
 import { act, renderHook } from '@testing-library/react-hooks';
 
 import { useObservable } from '@kbn/securitysolution-hook-utils';
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
index 916ed4aad3e47..2ffbf706ec1a2 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
@@ -11,6 +11,13 @@ import { Observable } from 'rxjs';
 
 import { OptionalSignalArgs, useObservable } from '@kbn/securitysolution-hook-utils';
 
+import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
+import {
+  DataPublicPluginStart,
+  isCompleteResponse,
+  isErrorResponse,
+} from '@kbn/data-plugin/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import * as i18n from './translations';
 
 import {
@@ -19,17 +26,10 @@ import {
   StrategyRequestType,
   StrategyResponseType,
 } from '../../../../common/search_strategy/security_solution';
-import { IKibanaSearchResponse } from '../../../../../../../src/plugins/data/common';
-import {
-  DataPublicPluginStart,
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../src/plugins/data/public';
 import { getInspectResponse } from '../../../helpers';
 import { inputsModel } from '../../store';
 import { useKibana } from '../../lib/kibana';
 import { useAppToasts } from '../../hooks/use_app_toasts';
-import { AbortError } from '../../../../../../../src/plugins/kibana_utils/common';
 
 type UseSearchStrategyRequestArgs = RequestBasicOptions & {
   data: DataPublicPluginStart;
diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
index ed75e3bbbe926..3a1dff65943d7 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import { MouseEventHandler, useCallback } from 'react';
-import { ApplicationStart, NavigateToAppOptions } from 'kibana/public';
+import { ApplicationStart, NavigateToAppOptions } from '@kbn/core/public';
 import { useKibana } from '../../lib/kibana';
 
 type NavigateToAppHandlerOptions<S = unknown> = NavigateToAppOptions & {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts
index 3d59e5a7c7234..e29ebad739960 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts
@@ -6,12 +6,12 @@
  */
 
 import { firstValueFrom } from 'rxjs';
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   EqlSearchStrategyRequest,
   EqlSearchStrategyResponse,
   EQL_SEARCH_STRATEGY,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import {
   getValidationErrors,
   isErrorResponse,
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts
index 278e84f327d08..f17c1f84de000 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { Source } from './types';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
 import type { Connection } from '@elastic/elasticsearch';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts
index abdb3d2d06e9c..5eb3e042cbf2b 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts
@@ -7,10 +7,10 @@
 
 import moment from 'moment';
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { Source } from './types';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
-import { inputsModel } from '../../../common/store';
+import { inputsModel } from '../../store';
 
 import {
   calculateBucketForHour,
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts
index 63c1dd7f2d927..a70617447e4f9 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts
@@ -7,9 +7,9 @@
 
 import moment from 'moment';
 import { Unit } from '@kbn/datemath';
-import { inputsModel } from '../../../common/store';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
+import { inputsModel } from '../../store';
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
 import { InspectResponse } from '../../../types';
 import { EqlPreviewResponse, Source } from './types';
 import { BaseHit, EqlSearchResponse } from '../../../../common/detection_engine/types';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts
index 06fb0e1c72b3e..0e329a47012ac 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts
@@ -9,7 +9,7 @@ import { Unit } from '@kbn/datemath';
 
 import { InspectResponse } from '../../../types';
 import { ChartData } from '../../components/charts/common';
-import { inputsModel } from '../../../common/store';
+import { inputsModel } from '../../store';
 
 export interface EqlPreviewRequest {
   to: string;
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts
index 36246cc602f11..47c084661a5fc 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts
@@ -11,15 +11,15 @@ import { of, throwError } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
 import * as i18n from '../translations';
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { Source } from './types';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 import { useEqlPreview } from '.';
 import { getMockEqlResponse } from './eql_search_response.mock';
 import { useAppToasts } from '../use_app_toasts';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 jest.mock('../use_app_toasts');
 
 describe('useEqlPreview', () => {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts
index 8d3b43b7eadaa..4addd9048a565 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts
@@ -11,22 +11,22 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
-import * as i18n from '../translations';
-import { useKibana } from '../../../common/lib/kibana';
 import {
   isCompleteResponse,
   isErrorResponse,
   isPartialResponse,
   EqlSearchStrategyRequest,
   EqlSearchStrategyResponse,
-} from '../../../../../../../src/plugins/data/common';
-import { AbortError } from '../../../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/data-plugin/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
+import { EQL_SEARCH_STRATEGY } from '@kbn/data-enhanced-plugin/public';
+import * as i18n from '../translations';
+import { useKibana } from '../../lib/kibana';
 import { formatInspect, getEqlAggsData } from './helpers';
 import { EqlPreviewResponse, EqlPreviewRequest, Source } from './types';
 import { hasEqlSequenceQuery } from '../../../../common/detection_engine/utils';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
-import { inputsModel } from '../../../common/store';
-import { EQL_SEARCH_STRATEGY } from '../../../../../data_enhanced/public';
+import { inputsModel } from '../../store';
 import { useAppToasts } from '../use_app_toasts';
 
 export const useEqlPreview = (): [
diff --git a/x-pack/plugins/security_solution/public/common/hooks/types.ts b/x-pack/plugins/security_solution/public/common/hooks/types.ts
index 770e4e75c5269..d24f4a95f4041 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/types.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SimpleSavedObject } from '../../../../../../src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type IndexPatternSavedObjectAttributes = { title: string };
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts
index 786f25d8c6aba..9bea6282e3ad6 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import type { IEsError } from 'src/plugins/data/public';
+import type { IEsError } from '@kbn/data-plugin/public';
 import { KibanaError, SecurityAppError } from '@kbn/securitysolution-t-grid';
 
 import { useToasts } from '../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts
index b0719960ff2c8..4b3b28a54c642 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts
@@ -14,9 +14,9 @@ import {
   isSecurityAppError,
 } from '@kbn/securitysolution-t-grid';
 
-import { IEsError, isEsError } from '../../../../../../src/plugins/data/public';
+import { IEsError, isEsError } from '@kbn/data-plugin/public';
 
-import { ErrorToastOptions, ToastsStart, Toast } from '../../../../../../src/core/public';
+import { ErrorToastOptions, ToastsStart, Toast } from '@kbn/core/public';
 import { useToasts } from '../lib/kibana';
 
 export type UseAppToasts = Pick<ToastsStart, 'addSuccess' | 'addWarning'> & {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts b/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts
index 9a6b8c54f2bc6..3132ae70381a2 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts
@@ -6,7 +6,7 @@
  */
 
 import { useSelector } from 'react-redux';
-import { State } from '../../common/store';
+import { State } from '../store';
 import {
   ExperimentalFeatures,
   getExperimentalAllowedValues,
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx
index bafbe078cdbdb..b7bec2b490300 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx
@@ -21,7 +21,7 @@ jest.mock('react-router-dom', () => {
 });
 jest.mock('../lib/kibana');
 jest.mock('./use_selector');
-jest.mock('../../timelines/store/timeline/', () => ({
+jest.mock('../../timelines/store/timeline', () => ({
   timelineSelectors: {
     getTimelineByIdSelector: () => jest.fn(),
   },
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts
index 1f1e089f9249d..204900f746966 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts
@@ -22,7 +22,7 @@ jest.mock('react-router-dom', () => {
 });
 jest.mock('../lib/kibana');
 jest.mock('./use_selector');
-jest.mock('../../timelines/store/timeline/', () => ({
+jest.mock('../../timelines/store/timeline', () => ({
   timelineSelectors: {
     getTimelineByIdSelector: () => jest.fn(),
   },
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts
index 52b22829e6a61..93f74db0d3c8f 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts
@@ -9,7 +9,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useDeepEqualSelector } from './use_selector';
 import { TimelineId } from '../../../common/types/timeline';
-import { timelineSelectors } from '../../timelines/store/timeline/';
+import { timelineSelectors } from '../../timelines/store/timeline';
 import { timelineDefaults } from '../../timelines/store/timeline/defaults';
 import { decodeRisonUrlState, encodeRisonUrlState } from '../components/url_state/helpers';
 import { useKibana } from '../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx
index 3e6dd399a3094..4131f2345b454 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx
@@ -9,7 +9,7 @@ import React, { memo } from 'react';
 import { useKibana } from '../lib/kibana';
 import { renderHook as _renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import { useUpgradeSecurityPackages } from './use_upgrade_security_packages';
-import { epmRouteService } from '../../../../fleet/common';
+import { epmRouteService } from '@kbn/fleet-plugin/common';
 
 jest.mock('../components/user_privileges', () => {
   return {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
index c09ae2715277a..fd5183bc79fb8 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
@@ -6,9 +6,9 @@
  */
 
 import { useEffect } from 'react';
-import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptions, HttpStart } from '@kbn/core/public';
+import { epmRouteService, BulkInstallPackagesResponse } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../lib/kibana';
-import { epmRouteService, BulkInstallPackagesResponse } from '../../../../fleet/common';
 import { useUserPrivileges } from '../components/user_privileges';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/images/alerts.png b/x-pack/plugins/security_solution/public/common/images/alerts.png
new file mode 100644
index 0000000000000..9b0779ec9d257
Binary files /dev/null and b/x-pack/plugins/security_solution/public/common/images/alerts.png differ
diff --git a/x-pack/plugins/security_solution/public/common/images/default.png b/x-pack/plugins/security_solution/public/common/images/default.png
new file mode 100644
index 0000000000000..e131c9d838bd4
Binary files /dev/null and b/x-pack/plugins/security_solution/public/common/images/default.png differ
diff --git a/x-pack/plugins/security_solution/public/common/images/endpoint.png b/x-pack/plugins/security_solution/public/common/images/endpoint.png
deleted file mode 100644
index 073318f891fcf..0000000000000
Binary files a/x-pack/plugins/security_solution/public/common/images/endpoint.png and /dev/null differ
diff --git a/x-pack/plugins/security_solution/public/common/images/endpoint.svg b/x-pack/plugins/security_solution/public/common/images/endpoint.svg
new file mode 100644
index 0000000000000..17ef00a8b406a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/images/endpoint.svg
@@ -0,0 +1,30 @@
+<svg width="513" height="381" viewBox="0 0 513 381" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="Vector" filter="url(#filter0_ddd_697_138215)">
+<path d="M503 6H10V366H503V6Z" fill="url(#pattern0)"/>
+</g>
+<defs>
+<filter id="filter0_ddd_697_138215" x="0" y="0.5" width="513" height="380" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4.5"/>
+<feGaussianBlur stdDeviation="5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_697_138215"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.9"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_697_138215" result="effect2_dropShadow_697_138215"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.7"/>
+<feGaussianBlur stdDeviation="0.7"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.07 0"/>
+<feBlend mode="normal" in2="effect2_dropShadow_697_138215" result="effect3_dropShadow_697_138215"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect3_dropShadow_697_138215" result="shape"/>
+</filter>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_697_138215" transform="translate(-0.000789762) scale(0.000762237 0.00104384)"/>
+</pattern>
+<image id="image0_697_138215" width="1314" height="958" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABSIAAAO+CAYAAAAQXGslAAABRmlDQ1BJQ0MgUHJvZmlsZQAAeJxjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8bAxCDDwMPAycCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsisqtKiy1KO5zQF5946wZK0dSKmehTAlZJanAyk/wBxWnJBUQkDA2MKkK1cXlIAYncA2SJFQEcB2XNA7HQIewOInQRhHwGrCQlyBrJvANkCyRmJQDMYXwDZOklI4ulIbKi9IMDj464QmlNSlKjg4ULAuaSDktSKEhDtnF9QWZSZnlGi4AgMpVQFz7xkPR0FIwMjIwYGUJhDVH++AQ5LRjEOhFixAQODVS9QsAAhFivCwLAlg4GBLxkhpjaJgUGQm4HhcFRBYlEi3AGM31iK04yNIGzu7QwMrNP+//8czsDArsnA8Pf6//+/t////3cZAwPzLQaGA98Adw1ecN4XPVgAAAAJcEhZcwAAFiUAABYlAUlSJPAAAQAASURBVHhe7P0HgF1Xee4Pv9N7H2nUe7dlS+69F2zAmF4ChBAIEEi4Sbj8U26S++Xe5N6E1BtIoQYChI7BxmDjXmSrWZLVe5dG03uf0fc+S97iaDyj6eXM+S1zkDRn71V+a+29Zz37LWYUCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgcCGBJIBcSOCFF9etfOqppx/YuHHTnUeOHltRXV1V6Eek+icl5jMQtrN+QNdrn27/U//WJ/m1j7irPv1bf/Y3D9F50Z9qN/bv+ndf5+qY6NjYc2J/3rvuvs6JHWf0fe96Bzom+v5i9fdVd3/19mYfe+5A8zKa5w61rYsdP5FjGEnbI2EwUe32d83EjmUy3RfHsy8TOSdDWUu9+znQv2PvWUNpZzDHDmd+xprzUPoUe2z0d/3Z1997Xzv93bcHMx8Xe+b1xX24zIbCone7fZ07UH199XO4fe/97OxrHY9Fe6P5rBrp2Ae6Bke7/v7md6B57+u5EnsN9fV979+Jes/vQL8X9bU+BuI1Wt+PNvfR6hf1QGA0CAzmeh9MO9F10ru+ge4Ng6k79p7Su76Bfs8d7L0lth8Xu+Zjx9d7zNHvE9Gfve97vb/Xv7U3jr2/9bdfHeh3u9597v37Tl9t9/f7x8X6cAGnzMzMrpkzZp689pqrn3jggTf/+Lbbbtk92AnlOAgkGoHRutnGPbddu3dP/8Z/fusz69a99PHq6uq8trY26+jotO5u6YkUCEAAAhCAAAQgAAEIQAACEIAABCDwegLJScmWmppqWZmZVlxS0rxm7eVf+8hvfvgv1665vBxeEIDAhQQQIp3H88+/cMmXv/If/7Zly5abauvqEB+5SiAAAQhAAAIQgAAEIAABCEAAAhAYMoGU5BTLzc21lStXbPnYb3301++99+7tQ66EEyAwhQkkvBC5e/eeor/8q7/+2foN669vbm6ewlPN0CAAAQhAAAIQgAAEIAABCEAAAhAYDwJpaWl2+WWrd3z2s//93ptuvOHUeLRJGxCIBwKxcRjiob+j3sdvfPNbf/jSyy8hQo46WSqEAAQgAAEIQAACEIAABCAAAQgkJoHOzk7btPmVS7/zne/+6c5duxNee0nMVcCo+yKgJCwJW9wle/Fvfey3/6C9rX3UGSQnJVlaerrl5eZZSkqKtXe0W2tLq+lm1HO2Z9Tbo0IIQAACEIDAYAkkvRbHKMVjGaUkec60hPePGCw5joNA/wS6PK54l/+eR3xxVgkEIJDoBLQXzk3OsPSkVOs8220tPR3hz0Qtv3ziqY9fc8013/Lxv5CoDBg3BGIJJLQQ+djjv/x4fUO9slaPasnKyrKS4mKbO6fMli4ss+zsDKuurrMT5XV2urzaKitrrLkFN/BRhU5lEIAABCAwKAIpyamWnpFpWdk5lpmZbRIjk5N5ST8oeBwEgX4InPWXzJ0dHf7Sucla/He8zs52O3uWBNMsGAhAYOoRSHKRMSUl1Xq6u19nYJPiLzqzk9OtLC3XlmeUWnFqjjV0t9nh9ho73lnnf2+37gQ0ymlsbLDNmzZ9YseOnRsuvfSSjqm3KhgRBIZGIGGFyE2bNs/475/9ww8ODdeFR5+7Cad4dqy08MtmV1eXpaWlehyIS+x977rf7r1poWV1bDTrdtExZaYl519hz26uta998xF7Yd1Ga29v45fUkUwA50IAAhCAwJAI6LmVk5tvxaVllurPr6amBmuubxhSHRwMAQi8noDE/NzcAps+c661tjZbxanj7g3TBioIQAACU45AelqGlZbNsOaGhnMvXro6wp42yf/LT8m0G3Pn2++UXutiZN75sdd0tdq3arfaQ3W7raarxc76fxNdZLWZ7H1OSXa3EP+7DyL0qrvnrAus+vvo9nHXrj1vOHnq1Fxv4uBEj532ITDRBBJWiPTENLknTpycPpIJyHCLkksvWWk33HCDtbl797p16+zmW2629943x+YkPWEp+750wQ2sO+khu6HsElvwmfvsv352qX35K1/18/gldSRzwLkQgAAEIDB4Ato8lEybEay2amsqrQOhZPDwOBICAxCoq60+J/SXTHNBco4dP3oAZhCAAASmHIEC9/x713s/HMTHTRtesK2vrLcmt/jLSk6zm1yE/P3pN1qhC5KxpSg1y95bdLkLf8n2n9WvWNvZrgnlkiLX8Yw0W1CQZ4uK8y0/Pc06unusprXdDtc12rH6RmvrGl1X8tNnyovr6+oLJnTgNA6BSUIgYYXIzq6u1NbW1mFPw8yZM+3Be++3d62+2dJeOWU9fqN697uvssJVp61QImTDfn+r0isWpN+sk/0t0MzcdrvpkiW249rr7Jlnnxl2HzgRAhCAAAQgMBQCEiHb2lqtob42iJC4jg6FHsdCYCACZ62lqTFYG5e41XFOTp5bCzVxnQ2Eje8hAIG4IlBbXWU/+M7XbNWla+za62+xdjes2b1zmy3pybNbcxdZgYuQso6MLfpXcUqWXZk9015tm23rm45OyJjT3Hp9QVGe3b1ojt2zcJYVZ6VbRmqyx8tOkkGku42ftXZ3OT9W32KPHTphj+4/YXVucCQLyZEWFyE9PFtL1kjr4XwITAUCCStE+p0mabhJYxQTY+Hc+fae6++2kh/vte6apmDKnX3VCktP3WzWetzvYv285fGfpzQdtpWlGXbPrZeYZ+x2F+3RT5YzFRYnY4AABCAAgdElkJOXb7VVlcSvG12s1AaB8wR6PBlDh/9e1+ExInW9yW3Rf0mEEAQgkOAEsrJybHrZTJs3f1Fwa87NzfW4sp1WX19np04ctdOnTlh9bU1chHTo6ur0/h43xT3M8NwIy1ettqrKM1Zc2WOzPDak3J37KnKFnp6aa/PTC229jb8QOS07y+5cNMveuGSuLSrKtZk5Wf7iqO8Y2fpuTl6WXTt7uj2096i9fLzCmj0Z2UhKd4/H1OzpISj3SCBy7pQhkLhC5AimMCc72+YUlNqsqrPWfLTqfE1JqW6+fdb/3dFy8dq7Oy0/u86Wz0uxObPn2MFDhIkYwXRwKgQgAAEIDJKAEtUoiUa3xzQeTElJTrG09HSPhXzu1wUl4+j0X8SH+yJvMG1yDATinUC3i5FdnV1+3aTH+1DoPwQgMEICCokyZ94CW7J8lc2YOdufqRnBUrrH4xAqLmFxSalNnzHTljc32/Ejh+zA/t2e2LR8hK2OzellM2ZZQWGxlZ88bg2N9aZwFNs2b7DrbrrNMjIyLDll4BwsqUkplumZtMe7zC/Mszctm2tvdhFymbti9ydARv3K9LwPC/24mXnZNiM3y3L8388fK7dad92mQAACIycw/neBkfd5wmtQVuyiwkKztBRLKcu3nka/IfkvnEk5LZaU5sF3e3q5ZPfR4+SeVr+hVdmMGWXDEiKnlZbaDH+bdqaywioqKobNRIkLsl1Yveqqq2z9+g3BZU8lx7OpTp8+3VL9prt/v7uZUyAAAQhAYEoQCG/kB8hYmeEbpbz8fCssLDI980IQdy9Jng1TcaAq/dnT4psm1TXUIlEzL7/AsrOyvb4kd1NqtsaG+pDwbSyL2kp2YbW4uMRqffN0sfai8aelpZ3vUrfHjmpubrI2D+tSUjrNN2Du3u6i7nCK6lX7co3Pycm13Ly8IPDWuLsbZQoQcH1BbnwpU2AoDAECEBg+AYmQS5attDVXXReee7IiLD95wmo8RrNeVshaOrKUnDlnnq1cfbkp/uIrG1+yyorTkyqsQ2Zmli1avNxWXHK57d31qm3ZvD4k5io/fcK2bHrZaqsrrbA70+q6Lx76rLGn3Sq6ZCk+fiXLn7n3LJpt71yxwC0hf5VAZ6AeyHQx2/fC184qDYbttW0dtvlUlbWM0DJyoHb5HgKJQCCRTYP7thkfYNaL/eGweOUllnPJWts4d47tufYSq79+ufVcs8Ss1G+8SYONO3nW0t0UvKBgePFq582fb3fdfactWDB/ROv03Kas2D7y4Q/5ZijnfF3ZOdm2cOECW7Zs2Yjq52QIQAACEIgvAhIIZ86abfMXLApuZJnuTiYBMsnjKumZNcst+ecvWOhJb6aZBLuhlhlu+TFnzlwr81jL0/2F2myvr8zbSfY2xrIoXpX6u2TJMtPm8GIlMzPTFixcbLN9Y1hcXBo+BS7KaiOWmppmy5avCC/xhlM0znke3iXL65I4mu5WJPm+Qc11QZICAQhAAAJTh8Bsv9dfde1NtmzFan+J1WI7t71iu3ZuDS7NehGlsIOVFeUh2cv+vTstL6/QrrzmRj/nxhBjdqyfi0MhXVI63WbMnusv4qbb4mUrbKXHh8z0F5UdHe22b88Of0F5xk61N9je9mpr6+n7xaJ+fqC9xna1Dt+IZih9jo5dXVZk9y+ZY/Pyf7XXHWo9184uDXXMHUEdr7U5LA1iqP3leAhMdgJYRA5hhtL9bcrqK662K97yQaueudY+X9NtJasvs8tKPOPW2TZbW7jdptUOIg5QSpq1ps60uqw1VjT3qFtFzvCHUOXrLEvS09KtsKgwmLqrtDS3uBl8Q7CakGgoa8qM9MzwkJrjomiKbxJVZOrf2NTkMUfqrdtjUmqjow1PkW+i0tJTw4Ov3d3rPHN4eAAuWrTIFi9e5BvDOZbpbdX5eR6/IsQskaVKVLL9YSMLGfVHdej8hoaGMbdiGcIUcSgEIAABCIyAgF5OzZ47z93HZlmzP0cO7Ntj1TXV4VmikpGRadOmTbeFixa7eFZoRw4dsPLy0wNaWMZ2acWqS62+rs5Onjgenh+yvpcweeaM19PVE9rQs0jCp+JntXtSHR0nN3EJgWme2fKsP+fa2tuCq3iyJwbJcPdxFbm8tba0WJf3V3Wk+XM0PPPcclF1pbllgwRUiYiy+NduoM3r6PC6YhP3JLvVZr6LruWnTtmpUydfe7Z67D8/NjU1xQXUstAPPX8lJOq5qGdtlwe4b33NUlRu8BI0Zf0oC9T29g63gOmwPK/3qmuvt1c2b/S4YMetw4P8yxKy25PeRVabCgGT7PGoxV1JADo9HheJhUawsDkVAhCAwDgS0L08MzPbrr7u5mAJ2VBXbem+Z1vs1pFlM2bbLH/OZrn3mTwEzpSfClaSZWWz3Go/2Zp9b3X52mvs5LGjtsctD/UMnAxF/U73Z+yOVzeHpFzX+Ng6XYQ8uH9PEFn1nDvV2WDrmo7ZioxptjzDX+J5puywN/XncGNPh+1rrwzfH+uoGZch6QVkanKSvecS3+u6JeTF3LE73etBMSxT/Pj+yv2LZ9uW8uqQVbvDn/fDLAiRwwTHaVOLQCILkUO+CUgwnHXl7bYr/3Jbv+tX7ljPH+p064pk+6NrL7X7XGDMSnZX5v7cs30j1ZG72Lb23GePlF9pnf5Aev+HC+zrX/qib0R8s/eam5seTBIGH3zrAzbT21XZvXuvPfnUU3bi+IkLVqE2Q5/+3d/xoMfn3vJoo7Rp8yv2xONP2il/uGkjdMUVa+3OO+/wDeQ039B12tGjx4IrdpW3+e53vcM3lPn2gfe/15qamu2Rn/3MTp085WPyuGCvuaUpQc+ay9fYdddfa/PmzQsbqvXrX7annn7G6nxDSYEABCAAgfgnoJdcCxYusmNHjtiRw4detwFqd8HuxIlj/sKqzlasWOWi5Vyrd7dquSwPtqS5RWGDn6OXXW0usunv2twEsdGfNRIl5/hzRs+gqqoqO370iLtS11iW923psuVW6m7RXf5C7vjRo0EkzHLRTl4C2sDJZXrXju3W4puieR6Tq3Raqb+863KxtDzE3lLRBlFCa5F7A+j5eczrOXbksLtZXxjbqluioouaTU0N4byQMFPutv5MjUqaC5Bz5y9wC8d5QRBt9mfojh3brMk3knpxt8Bf9JV4/C89lyU6lp8+bSvdqyLFj12+YmXYxMk9r6CoKCQ1afTNXZH/fdUlq93SJNPra/F5OOghWMrDS0gKBCAAAQhMfgLyIljqMSHnuWfBtlc2hJdNKy65zG678w3+XGkNsRUPHNgdrB6XLVvlmadvDfszHSvryLvf8KBd63EXjxzeH16knXsATVzRi7Vif77qmbVj6ybf+9WGl4VvfPDd9vCPvm2HD+yz1jZ/CejxcV9tOW3/1POSvblghd3tGbT1zG3qbrftbRX2SP1e29pyatwGImFRMR6vmz3NCjNfH7NXxjttCrviLwIrWtot119QFrjRTpZn0c7wl469S1FWhq0oKbSZuRV2tH7wv/eM24BpCAJxRAAhcgiTdd1111rrtKW2p/L1b0A6Onvs5Yp0Wz7tRltdcMx6as9teC4ovsFKLrvO1jXfb1/YXGYbdhy39KwUe+9Nd9iD72y0n/zgv87He1y4cKE9+OBbbO6c2fb1r/9nqOZ3f+dTwZrjkUcevaBabWK+8Y1vBisNlbLpZXbXXXfYsqVL7X//5V/Z2jVr7c//7H/Yv3/xS3bcRcwoLlV9Q2OwtHh123a7+aYb7dVXd/hmr9Zqa+o8LlihXXHlFcFqZN1LL7vFyjT7+7//nP34oZ/YT37y02AJ2eRWHxQIQAACEJg6BFZftiaIf2fcyvFiVhiKE3n8+DGbP2++x4xaYttf3TpoCEcPHz7n9u3PqlNuBVJZccafKXXnREgX9Ga5ELl7xw4XABu97qVB6GvxuIxFRcVuCWm27oXnwuZt0aIlwQKxxUVQxVmUEPji888GkfLaG24MouDmjRtNwqcE0/kusJ729iS2trvoqD7Pdjcz1dvU2Ohi5YWbI70QnO19yX4tbEmbb7IkJMYWxc/s8hdzO1z8lCXk0uUrbbXH+Nq4/iUXGleF+FmbN6wPVpGl08qC9eSmjettrnN7ZdMGf+afcWF1ugux6f6Cz7Mse1vXXn+jHTxwwA57IjuJshIyJUJKjKRAAAIQgMDkJyDxbfHSFeHZsn/vLn+uVgQhb/r0Gfb8M4+HmIqRlXu2Z8++4+432RI/vr6uxs6cPmnrnv2lvf83fzu8pGpubpxw7zMlqZk5a04QVGtqPEaivzjb8NJz7rlXGsTIXzz8w+CerVwD7We7bK+7Xu9vq7R/r1xvWUlp5q/crMWTtXa6UOkO6eM2gRIT71k8x3L7EBXVCQmQvzhWaV/bedyqWzsszcXVy6cV2DuWzrDb55T02c/V04tsmYuRIxAih2wMNW7AaAgC40ggkYXIIWNWLMVTGbnW2scLkMWlKbam7KytT11me9M+ardPK7eSps3WU7XZTRQ9bqREyPnvsB+fvt6+vCnVdh6qCw+gjrZu+/GGCvvLu2+zpx9/9LwQOWf2bLeELLN/+n9fcAvI46GvD/30p7Zk8WKbNWvmBX2XFeXu3bvDGyeVXSm7/WEx0y677NIQy6qsbJpvhtps8+Ytbj3yq42WTOi18Xtp/Xp7//vfZ88995y3XxlcwOa7dYnqC64FvnG668477cV16+whFyFlTamEPDq/x98iUSAAAQhAIL4J6F4v4a3U3a63bX0lbDIGKvVuEdHsiV/yCwoHOvSC7w8c2GtnPAi/4iJOczFyoT/XFJ5k987t/nybHY6d7p4AhR3FHpexMLhhy7K/wsXRbhfkFL9SSXQKCgt8c3cmHK/+VruFvywYc3xTl5mRZYcPHrIGt7pUoh1ZX8oPO8vrkTt3lSd5a/QXanU5tf4cTD6fFTy2o+GJ6v/32qP1/DM29hi5r6fJjdvHUubu2iWlJcH6USfJSrTM42HqOXzaLTePHz8S+pcU3L4UG+xcfLCoyAI0z5PWpPpzWVaQHe6Od+zY4eD+LcGVAgEIQAAC8UEg2e/zc+ctsqNHDvhLsUa32l/kL7bm+78P2vZtmy8Ix9Xiz5FdbkmvOMQzXOxL8xdT1VWV4QE0Y+Ycq670xDZdjRM68Jn+UqzDX5adPHE0JGxTkej4y58/FCw5b7jlztDv3du3+otDD/0lsdG9APN8L7t8+aW2d/er1lxVbmc7x0+EVB/TUpLsqpmllt6HENnuIuT++mb7+s4TdqvHf7xrXol1+e8bPzxQbj8/UmnzPFP24sLXx4JeUJBjs0cWJxIhckJXM41PFgIIkUOYCVlXZHimr2xPoumhpkJxAwxbMyvNbl/YbU837bOdjVW+seiw72UV2V0F99lbFt9l05vXW0vqIvvi7sX2050pdvS0vxfqOLep0AaroaHD8qcvspTXgudrM1hSUmzLPVHM6tWX+J9Lw7GycJzrVh15efkh/lVUtEmZ7cLlqlUrg0uXkgnccMN1vimrCRaPu3bvCQH6P/7xjwXB8tixY7Zv3z47cfJc3Cs9SHpkVeIPFrmzhX7FPCdkablwwQJ3xzsV3LCjzNpDQMehEIAABCAwiQkojpLiL+q3Y1n26YXUQEWbkg4/LiPTYyT6M6bdXbYGKnq+SVRs8o2XPtVuXSFhscyT1sgaUN/ruSWBT4KerAQlHEq0k0WjBMhKFxEVA1muz1HR94q/qM2PYhyrdHvfonAnirWoZ6VerMm6UBunkD08fPz4PrYFXb5JOXOmPFhtqui4Tm8jNkGP+i13cPVRvyNU+YZR4qnK4YMHQmbtHA+bogQ/6tuh/fvdm6DvDWV4+ecbNxX1UWPCHXugFcX3EIAABCYjgSTL9RdLCj2i50Zubl543px0TwKFOIktMuyoKD/pz48zbr2/wMOGlHoG6qrwIk3xJfVcnMiS5Qnsliz1UCI+jurKivMxofWMamlpshefe8Kuu/F2W7HyshDrePeOrec9KvTczCsutHsfeLtbTO50wXVLsKocr6LfbbLSUqyvVHitHpP6aEOrNXZ0WUlWmmfEjmIxex6Ezm470dzWpxCpOJNpF4kjOYixIUQOAhKHTH0CY5uicnLzG/JNYM/evVbscS2WuPWjSkZ6sl05J9VWz2myXzbutY01J626ucE/rfZqbZv9R0WPfeZMgf1bt7s9n73VnjiQY4dP+Mat7VcioiwtMjJTrafVY1C5ubqKNksKsK/NmgLw5+Xlho+sPbZte9U3RucsQFTkzrXQs5d+6Nc/6Ju4bDt9utx27toVrBZVtJmU8Ph//+Zztn379uC+faW7XL/zne+wG911bTDlXMDljLApjDZ4gzmPYyAAAQhAIL4IyNpdAt1gEqNo86Tj5BKd7L+YD1iClX2yLfFsm7NmKuh9enCj1nMlw593qkuxkvV3CZBKiKaSok2YPytLfHOm56M2MRL++iohMY2S2PiGqbikJLy4KywqCW7cMzxLt4qC5g+maHznksckn//IiyC26OWfxE1tNpvcAlLWjFFRUhwJoJW+cWuRpaYnJsjKPhe4XyFSZLWZqreZrxW9YFTA/7PerhL4SPCc5dYxCxYstsKCosF0mWMgAAEIQGCSENCzo8fv63rGKS6wjAS73D25r6KYxN3+XNAxeg7rowefLOr13JzIoizZClFSfuqEi6XlwZtOyepk8alnpOJdvrLhRd+f+h7Zcx+sXL0mJFPVuOs8Sc8rG1+yCk9Gt2zlahc0V4WXnuNVtM/O9r1v5DUY265iQ55p0e8SZ+20i45bKxtsW1WjU3dL1BxPdjcysfFiQ5zYCR0v+LQDgQEITOwrljibnv37D9i8nS/bJWXzLX3BXI920WOLZzTYy63HbLubm8daKervFY31VuVB7g/m5lvBLM9W7Ru13s+SFL85rlqYZ7s2v2zNHnNLpdtv3NqE1bglxZ49+y7IXK3NS41bOsr9SyUjw4XIRQts6dLF7jb9Ezt8+IhnEm23Be5arQQ12pS1uqXj0888baUeZ6qouMgWefzJu+66M8SF3LBxw4Cz0O1Wm3LZltDZexM24MkcAAEIQAACk56ArPVkiSiRTgKhMlRH1oT9dT4kNPNNkiwjB2W553XL+r7DLScl0il7dI8S1HjCmNNuoa9n1cmTx8OGp6S01ArdskKZrWX92OFxGBUcX/EcZ8ya5Yls0oIY2eFCpvqp75WURkXPyWOe4EbJaBZ6/MpQZLkRRL6zIfbkeatJ9Ud1aAMYU7QJVPxltae2VNq9PQmlEgtl/djtm5h6d+9OdV4SJDu9v+pLm4dCUXviE1nBKEZkrWcflxWodNDTp05bsSfSaXaXcgXTb29rD+fpe8WGVGxKWcUoBmWj/24gUZQCAQhAAALxQsCToLjHWaZbE+plWnju+H8S9dLdA65DCWhiiu73emkmC0PFldQLOSUsa/VnhF5oTWSZ7y/DtC+tdIvNVn/+SWTUONZefX0INXLK3bUrPNzKdk9ic+nlV3pSuVXB42/Pzm3h+ONHD/kzus1uuf0NNsPjMp88ftSf9UfHZUjeDatr67DuPl5A6tmbEV6iJtnC/GwrzkyzFCXWcWvITE9WMz3r9clt1OlW/77Nn/cjKEM2hhpBW5wKgUlLACFyCFOjLKFbXnzON2jJdtmNd1nXkkX2YvNR21Zxql8LC23qJEju766zG1amWUl2rp2q7bGWNne56jprRTlJtja7wp5++FFPFFMXenPOgqLKXaFPBhevY27GryLLCW20lGU0tkgc1P21w/3FZb4/LT8vuHbrs3TJEr/ZnwqxtMJGrqbWjvsxjf6Qk2VGcGdz03TF9Zjpsax0M5ZLXIrH1IiKXNgOHDxob37jG4OIqY2kNq3a7Clpjd7iUSAAAQhAIH4JhJjFbkUo0UsxHxtc/JNIdrGS425n2ihJPNPzYDBFQp2ENiWqkbVikm8C5L6shDVy7dbn2LGjQQBUcjZtyOpcwJP4d9KzTusZleninLJSq90GDxciEbTK42nFZu4+7nVIYCzyZ6iem9XVlR5gvzoIp0cPHTpvUdnc3BJESW2yYkubb5rkki2XtKgEK5XXnn0HD+4PfVJsSj3n1Y4sGU+5kJrqAqReKJa7BUhpyTS3HMkL9cvtTnxl3XLQM4wW+8tBWWm0+jO9y60m5XUgUffAgf2eaXVhsLRUHE6xEQcKBCAAAQjEBwE9U0+7BeH0spn+QirfX2JVhsRqCxcvsxNHD3sc4AMhmZms/Av8ebfcrQWn+bFHDu0Pmannufgnq/hKDw8S4g5PQDkXOzrNFi1Z4c/PypBULjevIFjoZ7uFf56P60aPDfn804/7c6rcn1MNHn/5jFtKLrRrrr/F/13vz7o9oednPBncru1bgtgqL4rxKnoW761pCFmz7dw7xfMlJy3ZlnkMyFzPki0/idm5meG7w/Wt5jaUIXt2X6XGXxzW+Z56BAWLyBHA49SpQyCRhchhvY04dPhQyCh6RWO1rfq9T9grZ87FWRyo7HHLyI+saLU7F3qm0dpkO92Y55uobMusa7GDz/7IdmzbckHsxcOeVfSVLVvt7rtu9wfRuTunLCrkln3Iv9Nmpb6+IbiuVVdVB7e41asvtYULFwTxUps8ldtuv81+/ujP7dprr/FjW4JQKfc0bZx2uqu2ks1oM3f8xAm7/vprXQCttFe37wjWMC0treHGrA2mYkomPfAmr+dqm+ZWHDJ1l5Xktm3bfLN6Lq4kBQIQgAAE4pvACQ/lMc2TroQYjS5M9mfpeM4iYpoHgE8PgttQigTDw4f7yPr2WiXasOjTuzT4pqZh9/Y+m2p2K5LYor4fP3bEPxcerufZYU8WEBVlI9Wnd1Ew/iMxx/X+/sD+ved/dMLbOdGrHX2pTZk+vYsES2XA7i8LtixI9u7eORSkHAsBCEAAApOIgCwC9+7a7laA93iM4LnhRVSP/0zZp2+54w2Wvf4FF+9OnxP6PP7isuWXuLiXHV52Fbu14cpLLw8vrnSehMmJKB6YxIrdUrPU+7PL4z42+IuxmbPmBvdrZffe/upme+MD7wpWjwf27ArWn9NnzvKung2WkhprJESq/xJfUzwBW+8YmWM5tk5nvrW8xt6zauHrmsnxl53Li3Lt+plF9vTxajvZ5DkcXLg809JulxTn+c8L++zasYZmO+WfEZRhaRAjaI9TITApCSSyEDnsCVHcxWbfpHQMIWP0DI+Hcbj629bpmbT1lmxe8SJLT7nUfvaTE/bwz372ur6ccEuMhx9+2K6/7jrPfn1Z+F6WF42+OVTMkVOnT9v69Rs8o/ZJO+KWH1/4l3+zy1avDklrJCY+/vjj5y0kZS0pcXLevPnhXFm6PPqzR23nzp3B3UvuYp/73N/Zbbfd6pYwBUGUPHOmwvbu3Rdc9LQR3X/ggH3ub//errziCo9XNT88OOWGNtEBlIc9iZwIAQhAAAKvI3DSLThKPT7hnLnzQmB9xTfUC6vINVjWG7r/z54zx5OnzQvPE1lCUCAAAQhAAAIQOEdAz8w9u161tVdd5+7KVwVjEsX+Lz91MlgE3nP/g2FPFvZ3blRS7slq2ttzPNTWSivIL/LkbIttyysetstflE1UaI4Ud0+W6NjsQmOFx3+UEYxCjym795LlqzxJzZNu9XnSVl8md+xLrFNGMg217r1wzA4d2GvHer3M6+ul31ivlw732lt3/IxVtrS567WHk+kVz7rU3a//+KrF9vTJattZ3eQu3En2tiVldsW0AivI6GVC6Z1tcw+LV8/U2KG6EXkpYBE51hNP/XFBIJGFyGG/jQguaO4GPc3dpgZbLssrsrNuSdnmMUG6/eFU3XLSMlrzPbj9hW7WsfUpQ/XPf/GL8OldlLhGSWii8sILL5g+/ZWvfvVr/X4n97WNmzaFT2w5evRX8Tsknu73bJ/6UCAAAQhAYGoSUEyrbVtf8Rdga2zFqkut4NQpKz99MljOy00r392xl/oGRHGKMzIyQ2iOPHfVUnxHCgQgAAEIQAACChOseMQNtu75J+32u98UXLRfXveMPfPLR0OStpmz51iBkpD5c/XE8SMhDMecufPt5tvvtUsuW+txF4/Z+hefCbGbJ6qk+EvHq6+92T3x9gexNN8FSPXZ7R3d826mvef9H/EYli22Z/ertnPb5iBAasyDDdUyHuMKmb2d94/2HrMPXbbY5ubnvK7ZZLfevHNuafgMVF46WWWbT1VZbeuIrFSHrUEM1D++h0A8EUhkIXLY86QbbHt1raUfPRHiNnYNIkbirLRGO2Mt54PlZqbnWU7yfHfzfnHY/eBECEAAAhCAwGgTkNvUrl073AVrtpWVzbC5nvxMGZ9VJFRWVlTYpo3rQ5zF2e5ytnLVJWEzpayYFAhAAAIQgAAEzhHYt2enpftLu+tvvN0WLFxql6+9xg7u3+2i3dEQU1iKlOIGz1+wJCR/mT1ngX+/xx59+PshBvJASePGirM83uSSXVhcYoWeFfuBt78vxG5W4p3q6ip70QXWY+5qfdo9+JRLQN6C3e4p5ynpxqpLI6r3R7uO2NqyomAVmfNayLOhVnimqdV+sv+o7aupH+qpvY9HiBwpQc6fEgQSWYhU+MNhFb1dKXcrkW2PPWnv+OC77HuH957PwNm7QmXkKvFgvrMzCyy74ErLSsnwoLildrZmgb3w1Bk76ElgKBCAAAQgAIHxIiD3alk36lnWVwkWBG79oIQvZ8pPh41HqscNVlHgd2W9VtK0kFnaX8wpgdnKlS5GelGg+olyIxsvfrQDAQhAAAIQGAyBTo9XvHfnq9bhz8yVq9fYFdfcYGuuvNbjP9aHZ6mC8efk5npSs8IQl3nL5nWefXpzeJZOlAipcaV7HOj5C5d48jW5lGd5rMrTIdlMSErjGcCVrE3Wmu0dE2exORj+0TF13td/3bzXY0CetbsWeAKhPtyuL1ZfU3unfWHzHnvpeKXp7yMsCJEjBMjpU4NAIguRI5rBOjeh377uJXvwstV2nwfAfaHas2G2tl2wAUtzk/blbsZ+c0+6ffWv/8WTztRaXpGLkJ1pduzgbtu2aa+1+I2cAgEIQAACEBgPAhIJUz1Ae7ILi90e66m/ouNk/ajPRX8592zOJzybdYcLkop/RYEABNzCyWO/pchjxq2EKBCAQGITaPHs2IcO7rVatyxUZuyyslmePbrYMvyZqXtEnf9cVpBK0lblQl9dbc2EipCarQ4PJSbLzR9+9+vW6LGgm118lHiqxDQX+91hss50t79g3VdVZ9949YA1uJB498KZNjMve8DuKsakktN8besBe+LwKatsbj3v3Tjgyf0fgBA5AnicOnUIJLIQOWyLyHM36E47deyEPftf37OrHrjfHlix1I7nl1hld4ffoMyKXISc5je6dI9JcXTLNnv6sV+GxC/5+fnBgqS2usbq+8imOXWWFiOBAAQgAIHJRqDVA99nZuZYa3qLbyj6FyIH229ZbCizZ7tbdigYvzJ+UiCQyARkcZyeluExVLM8mVOto+CaSOT1wNghIAIS8FpPHrMKz5R97MgBy/XYyoqzLI8CxVlsaKgLxyhJ3GQoimOp+NDK2q1Y0P15UEyGvg62D+0+ju0VNdbsCWeO1DfZDXOm2/KS/D7jRja0d3hCmiY/vs5eOnHGnj92xi0htccflfs5QuRgJ43jpjSBRBYiRzyxrW4psuWVLdbiQfxvuOEGmzOj1E290+2s/xJa4GJjypkq2+Hfb331Vc+E1h5u4hUeW4sCAQhAAAIQmAgCsrwoLikLm6Aed63udAFxpK7UEiPDJot8NRMxpbQ5iQikJKdaZlaWu1rmBauh1pamKbGBn0SI6QoE4pqABL7amurwiYcymRLPjAavdo9jubuy1k43tdhO/3NlaaHNL8j1DNnplu5ZwnvcdbvNjznT0uoWlPW2060oD1SPOCbkaHSdOiAw5QggRI5wSvWL5q7du8Mn12N8FBYUuDtOqr/ZarBad9+mQAACEIAABCYLgWa3iMx2kSTTk8/IfbTNLTG6u3EfnSzzQz/im0CaW0JKhEz23wNrayri0oUxvmeA3kMAAhAYmECdZ71+6fiZ8ElSFvDcLMv2sDVd3T3W2NFpzf7p9Je1FAhAYOwIJLIQeS7y/iiWJreM1IcCAQhAAAIQmIwE5PZV5a5h+QVFVlBY6lkwp00aV7DJyIs+QWDQBFzYlxt2a3OTh99xN76mhkGfyoEQgAAEIDAxBBRS5oxbSI5j0cOCAoGEJ5DIQmR6ws8+ACAAAQhAIOEIyJK/tqbS6t1NOy0t3dI8fjEFAhAYGQHFUev0BA9TzZVxZFQ4GwIQgAAEehFIZP2FxQCB8wQS+UJIYx1AAAIQgAAEEpWAYkMqM2ZHZ0eiImDcEBhFAm5XMyp5DEaxS1QFAQhAAAKTjUDGZOsQ/YHARBBIWCGyo6unYCKA0yYEIAABCEBgshA4lwkT9WSyzAf9gAAEIAABCEBg6hLo7OrJn7qjY2QQGDyBhI1R0NLasXzwmDgSAhCAAAQgAAEIQAACEIAABCAAAQgMj0B7e+es4Z3JWRCYWgQS1iJy9pw5Jb/xoQ9NrdlkNBCAAAQgAAEIQAACEIAABCAAAQhMOgIrVq7qmnSdokMQmAACCSlEVtY2JXd0dCz+b5/+1AQgp0kIQAACEIAABCAAAQhAAAIQgAAEEolAZ0/K/EQaL2OFQH8EElKIdBhpXgpKi4pYGRCAAAQgAAEIQAACEIAABCAAAQhAYEwJ1Da0LDpT05hWVpzXOaYNUTkEJjmBRI0R2e3zQnT+Sb446R4EIAABCEAAAhCAAAQgAAEIQGCKEMj1caRPkbEwDAgMm0CiCpE9Tqx92NQ4EQIQgAAEIAABCEAAAhCAAAQgAAEIDJ6A9JekwR/OkRCYmgQSUoicVpQrIVIfCgQgAAEIQAACEIAABCAAAQhAAAIQGGsC8spEhxhrytQ/6QkkpBD52qxwA5j0y5MOQgACEIAABCAAAQhAAAIQgAAEpgQBxYYkPuSUmEoGMRICiSxE4po9kpXDuRCAAAQgAAEIQAACEIAABCAAAQgMlkAriWoGi4rjpjKBRBYiW6byxDI2CEAAAhCAAAQgAAEIQAACEIAABCYNgeZJ0xM6AoEJJJDIQmTbBHKnaQhAAAIQgAAEIAABCEAAAhCAAAQShwDGUIkz14z0IgQSWYjsYmVAAAIQgAAEIAABCEAAAhCAAAQgAIFxIIAx1DhAponJTyCRhUhlrKJAAAIQgAAEIAABCEAAAhCAAAQgAIGxJoAx1FgTpv64IJDIQmRcTBCdhAAEIAABCEAAAhCAAAQgAAEIQCDuCfTE/QgYAARGgQBC5ChApAoIQAACEIAABCAAAQhAAAIQgAAEIAABCEDg4gRSExhQUgKPfURDb27tsPbOLstMT7XszPQR1cXJEIAABCAAAQhAAAIQgAAEIAABCEAAAolBIJEtIlMSY4pHf5Td3Wetq7vHunsIszn6dKkRAhCAAAQgAAEIQAACEIAABKYgAYyhpuCkMqShE0CIHDozzoAABCAAAQhAAAIQgAAEIAABCEAAAhCAAASGSCCRhchEdksf4jLhcAhAAAIQgAAEIAABCEAAAhCAAAQgAAEIjIxAIguRuGaPbO1wNgQgAAEIQAACEIAABCAAAQhAAAIQgAAEBk0gkYXIQUPiQAhAAAIQgAAEIAABCEAAAhCAAAQgMAICJFkYATxOnToEEtk9eVxvAj1nvbmxaNHD3SYnEfN26lySjAQCEIAABCAAAQhAAAIQgAAEpiCBsVAEpiAmhjTVCSBEjtMMV9c2Wrdnmh7tkpKabNOK8ke7WuqDAAQgAAEIQAACEIAABCAAAQhAYPQIIESOHktqimMCiSxEjr4qeJGFcPx0pbW2dYz6UsnOykCIHHWqVAgBCEAAAhCAAAQgAAEIQAACEBhVAgiRo4qTyuKVQCILkd3jOWlZ6elj4kKd6fVSIAABCEAAAhCAAAQgAAEIQAACEJjUBMbVGGpSk6BzCU0gkYXIzvGc+dkziq2nZ/RfgCQnk/x7POeRtiAAAQhAAAIQgAAEIAABCEAAAsMgMK7GUMPoH6dAYFwIIESOC2az/LyccWopvpo560l8Oju7rLW1PXQ8Ly/bkpMnJpm7EgpVVdVbZmaa5WRlmeJvjmfp7uqxuoYm6+rqsmKP+5mWNrjLs6W11dpa27zfGZadnX2+yx0dndbQ0Gjp6WmWn583nkOhLQhAAAIQgAAEIAABCEAAAhC4kEAXQCAAAbPBKR1TkxQ3gQme15aWNquoqrWq6nrraO80CYFFhXk2Z/Y0y8sdf0Gyu6vbdu05ZNNKC23B/FmW2p1izS2tluRZydWvsS7tHR22b/9xFxTTg3A9WCFy/74DdvjIUVu1coUtW7bkfDfLy8/Yps1bbM6cWXbN1VeOqPsNjY1WW1vnoma6zZxRNqK6OBkCEIAABCAAAQhAAAIQgEACEsAiMgEnnSG/ngBC5DitCln9jb5jtlmS93+wgtU4DXVQzcgS8tSpStu8ba9b7TXb9NJi63BLwD37jtqa1Uts+dJ5bh15zopUx/Z0n7Wk5CS3ltSILyz9fR+5wseeI6vD5BRZOnqdXm+S/vMq9XfVU1/fbBkuBHa6NWFTR4sdPHzKUv34K69YYSluqanzY/uhc/x/oQ4JliMp7d7moaMn7PJLl4Y2Blu2vbrD1q172cXL/AuEyEOHj9gvn3jarrpy7QVCZHd3t2dw7/Z1k/a6Pms8HS6Iqkh01Jh6enrs8KGjtmHjZisqKrQH3nxf+E5F33W5gKuhp6SkTJg162BZcRwEIAABCEAAAhCAAAQgAIEJIoAQOUHgaXZyEUhkIXJcbwJVtQ3W6eLPaJf01DSbMa1wtKsd8/okXp0sr7Km5la7/dYrbcmiOaHN59e9auUVNVbqVom5bhWp41rd7VjHpaelu+txRhAKJQoGt24XL1tb2oPlYpp/n5ubaRkZLqB5XQ2NTaHOwoJz1ozdLpqdqaq2kqKCIB42NrUEYTM1NcXaPKN5aXGhXXvNKsvMyAiiWk15tZ10sVSu4gsXzLJCt4qsrq4LLtB5OdnBdbvdLTl1ro7Py8saNjeNpb29w6prGqxserGPdfQvTYmPjc6koqLS+9xuxcXFVuBssrPdDd37L1fu2tpaO326PIxj2vRpVlJcFH6+/8BBW79ho5WWFNvKFcts5crlgX1lRZULyQ3h+Ly8PJs2rcT5ZA6bAydCAAIQgAAEIAABCEAAAhCYogTwypyiE8uwhkZg9NWOobU/kUePa8aqY6eqzsdBHM1B52RnxqcQGVnlpaSaxhCVm65fHf4qS7w2F+YOHDxu6zfvsrraxiAuzpxVarfcsNZmTC9xIazTdu89aus37bQmFxU7O7tt9aWL7abrLwtxEdet3x4sHu+75/pguVfjIt93vveEven+myw3J9O/3+HCX73l5GRZiwuZD77pVnvq2c02raTIpk8rsn0HjrtF5ImQ7byzs9Nuu3mtPfnsJitzse3KtcuDu/bRY+W2fdeh4Ep+713XDHtqJQxWVtRahlsp5o9RnMyTp07bN77xX/bDH//Ex1jslqEpdu89d9lb3vJGW7Rwge3ctdv+5nP/YCdOnAjjyMzMtt//b5+yXLdMffGll2z37j1BAN6//6DX8yXbunW7ffFLX/XjTwYL0unTp9uHPvhr9qY3v2HYHDgRAhCAAAQgAAEIQAACEIDAFCUw+pZJUxQUw5raBBJZiBzXtxHFBTnWnpUx6qspMyNt1Oscjwoz3WpxzqwyKz9Taz/52fM2f/5MmzenzGaWlVhBfk6w0JPr9uGjp23WjGn2pntvDOLik89ssr0HjgW34sqqGtt/6LhbK862q911ut4TvTz+5Abbtv2ALVk8J1hMxhb9q+fsOf05cqnOcBfjy1ctsXnzy9wK8RxLd7a2GWXFLlBmBhfpNO/LHbddZWluATl/7gw7dboqiKQqDU3Nwc153tyRxU1sdavK6rqGMP6kYSTrqa6utaeeec6OHDt2fsiHDx+1arcAVamqqbEXXnjJXl6/0f718/9oM2eW2WO/fNKef36dW0UWBMF248ZXrMvF3H//t8/72LPt0Z//0tKc+ZLFi+zuO+8I1qnTSkvtI7/565btyXwefuTnXs8M+7X3vdvKyspcND5oTa0t47F8aAMCEIAABCAAAQhAAAIQgEC8EUCIjLcZo79jQiCRhchxvQnMmVn6OmFsNGY0KWl8MzuPRp9Vhywe586dHsQ+uWJXVtXZnr3HbPPmPZ50ZYEtWzLPXatb3e23xeMS5tlJF/9kmahYhKfdpXv2zOkhyY3EsaWLZvsx+cEq8f57bgh19hVLsq++lxTn2+Ils11Yywyu0VGRu7ZcwDPSUz1GpLtd52a5VeVZj13ploO7D1tdXVNwn672Pkg0ne3zO5Iii8har3OhC7Ipw5jTjs4Oq6ysCHyiUlFZae3+c5WKMxW2/+ChIECuXbs6xHh84M33265de+yYW0CeOn3aurrd1bq62p599gW7/LJL7eqr1nrioFlW4taTubk5luUu17k5OTbLxUeVbj/++PGTtn3HriASL1m82N3KR8ZhJAw5FwIQgAAEIAABCEAAAhCAwCQmMK5emZOYA11LcAKJLESOq0VklscVpFxIQExmzigNQqMsAVua22zrjgN24NDJICwqaYpiP+a663SDWzuqyFIvyy1L09MU07AriITFLiZGSXvmzpkejlNG7sEUWfxJhBxMkbhZ7O7Y6o+sMdUnxYicVloQ4lkOt0jgbGxqs7r6Rps753J3mR58opqozfz8fE+oc4Vd5gJiVLZv32nPv7juNR6tzrfZZs2a6TE0z63FGWXTQ3zI9vb28LMbb7jeznpfTnmMSGXcbvRM2XfffYddf13fLufvfMdbbcP6TUG8fOzxJ1y0zbTVqy+xt7/tgeGi4DwIQAACEIAABCAAAQhAAAIQgAAEpjABhMgpPLmTeWitre1u5VgZEqEoUc2s1ywKT5+psQMel1EJYCTIyQU72y0c5887Z4VXW9vkFojJlu/u20oao9LQ2BIS0sjd+uDhkx5zMsu/O+dm3e5iZZOLfOnpnnzG40H2dtceKiMlqJnr7tn1Lho2N1cFS8E5s6YP2gKzr/ZkDdnUpGQ8qVaYnzes7Nsas1yor7v2qvNNtLW12StbtoV/K5GPPnLVlvAoi8i6unofQ3NIWpOXlxvEyDVrLguJbGpra+wHP/yJu3JvstmzZ/eJKS831666+koXZOvt2LETtu3V7fa4u3vfc/ftIXENBQIQgAAEIAABCEAAAhCAAAQgAAEIxBJAiByn9aCYgiMVwfrqqlycFW8x3kp3d0/ISH3iZEUQC+X6rJ9VelbqAk+OogQ22W75ON0zgnd2njNeTUlOcYGs0eMRFoUM2qVuCVlRWRtcpRWnsbOzx+ND7rcVy+a5S/E0dyXOcHfnatu551BITnPSEwZ1u8XfYEuqt6fYifUNzXb8RIXN9kQ5IYP2vJn28sYaq/a+TJ9WHD4jKRJSG5uaPCN1YcjEPRZFLtNKSPPTHTvtkZ895paRMzwT9iFn32Hz5s0NlpF79uy3LS5c3nTj9ZbnP1NGbXHt8qRAWR4TMjU11Q4dPmIvvPhSsJLcsOkV6/bM2XPmzLYZM8rs8JGjISO3zqFAAAIQgAAEIAABCEAAAhCAwAUEhu76BkAITEECCJHjNKkVHkswEtRGs0m5Fs8bYXzC0ezPYOvKdeFx9qxpnrW6wWNDHglJUZSZWq7Bl6xYdF6Ua2lt88zYx2zXniPBDbuiqta/KwjWkrKirKtvCpmtt+/stA5PtKIi60hZKs52S8V6jzF58NAJF2szgvv0NBf7JNzK0lJJcZQxOyoSdQsLct2aLzvEfczJTvXM2PlW69aP+w8eC5m0MzKSQyIbxWJ0T+1wbF7er+oY7Phjj2tqbglWncONM1lYUOjZxGe5leiFVog52dluzTjTij0LuITCm2+6wcXGvfbwz37uFqZzXQQ+6fE4VwYrSiWsUWbxffsPuKVknWW68CgGV6y9zBPxzLVWt65c6ELmE798yn72s1/YVVeudRbp9vKWrbbLs2mnuUjZ4xapt91ysxUWFg4HA+dAAAIQgAAEIAABCEAAAhCYygTGxupkKhNjbFOSQMIq8hU1jb85rSj3y+M1qxu37Xcx51fJUEar3ZzsDLty9ZLRqm5Q9TQ0tVubi4ZZnrE7z9sfSZGLdkVlnceCPJdtee6cGcEaMko2I/G2obE5JIcJ1ntzZrr1Xsb57zu8H3V1zZ64ptYz4CTbAs9erRiSEhVVZM1Y42JnlieeKfT4jjW1DUHI1PeNLv4lu5u3xEcVWaxWVze4KJoSLATTPGFNu7uO13o2a8WcVIKcNHefVpvK3q34kJdduji4lo+kyKLz4MGTdu01qzzZy9CtKxXPscHjOc5xF2r1Oyo1nim7vqHR8lygLHX3a5VWF3Y3bNzs42l2kbXQli1fasVFReE7uWyfOnXadrtYqbJ2zeVW6lmyNWYVuXLv2bs/uGLfftut4ec7tu+yU+XlQZScO3dOsLqkQAACEIAABCAAAQhAAAIQgMCFBGobWv6yuCDnf8AFAolOIJGFyN9wIfKr47UADh49HZKrjHbJyEi1Re4qPJ5lNIXI8ez3SNuSUFnvCWp27TvqsRf32NrLltmVa5afj1U53PoPHzkVXMyvvfqS4VbBeRCAAAQgAAEIQAACEIAABCAwiQm4EPnXLkT+4STuIl2DwLgQSGTXbPnxKmDguIix82aXeWs9oz6pyW4FSBkfAj3dZ62qst4a65vtuqsuceu/2cEScKRlnltxznI3dQoEIAABCEAAAhCAAAQgAAEITFkCbN6n7NQysKEQSHQhUspgylCADffYtJCEhPvOcPlNhvMUl3K2J8EpKckPAmSGu3tHLuAj6Z9iMepDgQAEIAABCEAAAhCAAAQgAIEpS2DwmVOnLAIGBgGzRBciuRFwFQyagERHxZ/UhwIBCEAAAhCAAAQgAAEIQAACEBgCgXPZVSkQSHACiWyip5vA6PtKJ/iCYvgQgAAEIAABCEAAAhCAAAQgAAEIvI5AO0wgAIHE9hVGhOQKgAAEIAABCEAAAhCAAAQgAAEIQGA8CLSNRyO0AYHJTiCRLSKVpCaRxz/Z1yb9gwAEIAABCEAAAhCAAAQgAAEITBUCWEROlZlkHCMikMhCnITIccmYPaIZ4mQIQAACEIAABCAAAQhAAAIQgAAE4p0AMSLjfQbp/6gQSGQhUq7ZJKsZlWVEJRCAAAQgAAEIQAACEIAABCAAAQhchEAi6y8sDAicJ5DIF0KrU+hgLUAAAhCAAAQgAAEIQAACEIAABCAAgTEmgEXkGAOm+vggkBof3Rz9XnZ09tSdqWmSGJk9+rVP7Rp7unusx21Ju7s6rKWtc2oPltFBAAIQgAAEIAABCEAAAhCAAARGSKC7u6dxhFVwOgSmBIGEFSKTkywjIzU5a0rM4ngPIjWRDWnHGzbtQQACEIAABCAAAQhAAAIQgEC8E2jrOZuw+ku8zx39H10CCXshJKckF+ZkZSJEju56ojYIQAACEIAABCAAAQhAAAIQgAAEehHo7mlFf2BVQMAJJK4QmWTpaWluF0mBAAQgAAEIQAACEIAABCAAAQhAAAJjSCA5OSlh9ZcxxErVcUggkX1sE3nscbhU6TIEIAABCEAAAhCAAAQgAAEIQCBuCaTEbc/pOARGkUAii3GeboUCAQhAAAIQgAAEIAABCEAAAhCAAATGnABC5JgjpoF4IJDIQqTcshEj42GV0kcIQAACEIAABCAAAQhAAAIQgEB8E0CIjO/5o/ejRCCRhUjdBIgROUoLiWogAAEIQAACEIAABCAAAQhAAAIQ6JcAQiSLAwJOINGFSBYBBCAAAQhAAAIQgAAEIAABCEAAAhAYawIYQo01YeqPCwIIkXExTXQSAhCAAAQgAAEIQAACEIAABCAAgTgmgBAZx5NH10ePQCILkYk89tFbQdQEAQhAAAIQgAAEIAABCEAAAhCAwEAEyFExECG+TwgCiSzGEZ8hIZY4g4QABCAAAQhAAAIQgAAEIAABCEw4AYTICZ8COjAZCCSyEJnIY58Ma48+QAACEIAABCAAAQhAAAIQgAAEIAABCCQQgUQW47CITKCFzlAhAAEIQAACEIAABCAAAQhAAAIQgAAEJpYAQuTE8qd1CEAAAhCAAAQgAAEIQAACEIAABCAAAQgkBAGEyISYZgYJAQhAAAIQgAAEIAABCEAAAhCAAAQgAIGJJZDIQmQij31iVx2tQwACEIAABCAAAQhAAAIQgAAEEotAUmINl9FCoG8CiSzGJfLYuR4gAAEIQAACEIAABCAAAQhAAAIQGD8CCJHjx5qWJjGBRBbjuAlM4oVJ1yAAAQhAAAIQgAAEIAABCEAAAlOIABrEFJpMhjJ8AgiRw2fHmRCAAAQgAAEIQAACEIAABCAAAQhAYDAEECIHQ4ljpjyBRBYip/zkMkAIQAACEIAABCAAAQhAAAIQgAAEJgUBhMhJMQ10YqIJJLIQyU1golcf7UMAAhCAAAQgAAEIQAACEIAABBKDABpEYswzoxyAAEIkSwQCEIAABCAAAQhAAAIQgAAEIAABCEAAAhAYcwKJLEQm8tjHfGHRAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEYgkkshiHWTTXAgQgAAEIQAACEIAABCAAAQhAAALjQQANYjwo08akJ5DIQmQij33SL0w6CAEIQAACEIAABCAAAQhAAAIQmEIEECKn0GQylOETSGQxLpHHPvwVw5kQgAAEIAABCEAAAhCAAAQgAAEIQAACEBgGgUQW43gbMYwFwykQgAAEIAABCEAAAhCAAAQgAAEIDJnA2SGfwQkQmIIEElmITOSxT8GlzJAgAAEIQAACEIAABCAAAQhAAAIQgAAEJjOBRBbjsIiczCuTvkEAAhCAAAQgAAEIQAACEIAABKYOASwip85cMpIREECIHAE8ToUABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQGRwAhcnCcOAoCEIAABCAAAQhAAAIQgAAEIAABCAyXABaRwyXHeVOKAELklJpOBgMBCEAAAhCAAAQgAAEIQAACEIAABCAAgclJACFycs4LvYIABCAAAQhAAAIQgAAEIAABCEAAAhCAwJQikMhC5JSaSAYDAQhAAAIQgAAEIAABCEAAAhCAwKQlgGv2pJ0aOjaeBBJZiCRr9niuNNqCAAQgAAEIQAACEIAABCAAAQhAAAIQSGgCiSxEJvTEM3gIQAACEIAABCAAAQhAAAIQgAAExo0AxlDjhpqGJjOBRBYiE3nsk3lN0jcIQAACEIAABCAAAQhAAAIQgMBUI4AQOdVmlPEMi0Aii3HcBIa1ZDgJAhCAAAQgAAEIQAACEIAABCAAAQhAAAJDJ4AQOXRmnAEBCEAAAhCAAAQgAAEIQAACEIAABCAAAQgMkUAiC5FDRMXhEIAABCAAAQhAAAIQgAAEIAABCEBgWATwyhwWNk6aagQQIqfajDIeCEAAAhCAAAQgAAEIQAACEIAABCAAAQhMQgIIkZNwUugSBCAAAQhAAAIQgAAEIAABCEAAAhCAAASmGgGEyKk2o4wHAhCAAAQgAAEIQAACEIAABCAAgclGANfsyTYj9GdCCCBETgh2GoUABCAAAQhAAAIQgAAEIAABCEAggQggRCbQZDPU/gkgRLI6IAABCEAAAhCAAAQgAAEIQAACEIAABCAAgTEnkDrmLUzeBngbMXnnhp5BAAIQgAAEIACBuCZw9qxZfXuXVTZ2WmfPWfP/USAQdwRSkpIsOz3JirLTLD8jZcj9b+s8a7WtXVbnn25dFBQITCCB1OQky0lPtqKsVMsdxnoeha5zEYwCRKqIfwKJLETG/+wxAghAAAIQgAAEIACBSUmgravHvvtKlX3+8eNWU9NqZ1EiJ+U80amLE0hzsWbxvDz7yM2z7H1XTBsyrp3lzfZvL5yyxzdWWGdH95DP5wQIjCaB9MxUu3RxgX3kppn24OqS0ayauiAAgSEQwDV7CLA4FAIQgAAEIAABCEAAAoMh0NLZY1997qTV1bUjQg4GGMdMSgISDw8cbbSvPH9qWP17+WiDPbezxjo7ESGHBZCTRpVAp1upbz9Qb99af2ZU66UyCEBgaAQS2SIS1+yhrRWOhgAEIAABCEAAAhAYJIGu7rNWUd1m3d3d9rsPLrYbF+cP8kwOg8DkIfCDLZX2/adPWF1T57A6VdvSbU0NHWY4pA6LHyeNLgFFB+js8FABLV2jW/Hga0ODGDwrjpzCBBAip/DkMjQIQAACEIAABCAAgYkhIN2l28VICTAryrLs5oUIkRMzE7Q6EgIb3RpSa7inZ3i1dPmJhCUYHjvOGiMCWs8I42MEl2ohMDgCieyazduIwa0RjoIABCAAAQhAAAIQgAAEIAABCEAAAhCAwIgJIESOGCEVQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAgMRSGQhMpHHPtC64HsIQAACFxBQjLOOjg53zRqmb9Yk59nZ2WlnFTiIAgEIQAACEIAABCAAgbEhwC+bY8OVWuOMADEi42zC1F1tmJubm629vd0yMzOtoKCg31Ho2KqqqvB9cXGxpaenW1ISXukRsKamJmtsbLTU1NTAJyUlpV+WEil0fEtLiyUnJ1t+fr5lZGT0e3xdXZ21traGOcrNzbW0tLQ4XG2j12WJWOKnP3NycgKT0VqLuhY0j9F1oXrFXXOkdi42r6M3wqlbk+Zs9+7d1tDQYDNmzLD58+eHe8lEF4mj6lNbW1uY48LCwov2S/dDrZPo3qm1IWF1//79VlNTE8al8V3suh7OmNXPioqKPk/VWlXf1Ret2dG6JobaT93fNM+6b/UlNqtfWVlZoY/9PUdUh84X3+zs7HD8QPc9tRldt+JeVFQ0pK6rLa0B3Vs0v+qn1oF4qj7dq/sqGqP6qvXQ1dllScnnxpeXlxfOpUAAAhCAAAQgAIExIIAQOQZQqTL+CCSyEBm3FpGnTp2yZ555xvbs2WOXXHKJvf/97+935enYv//7vw/ff/zjH7fFixdPCgFhslwqGzZssJ/85CdWVlYW+GgT3J8QoA3v888/Hz7arN5///122WWX9bvRfeihh2zLli22cuVKe9Ob3mRz5swZ9rC1wdfGuavrXIa3eBSUjx87bo89/pgdO3bMbr75ZrvjjjvCxn8kRVw0Lzt27LCnnnrKXn75ZTtx4kQQdpYsWWJ33nmn3XbbbTZr1qwgiEyUyDOSMY7XuRLLtL7ESMJ8rIBz8uRJ+93f/V3bvn27Pfjgg/Ynf/wntnjJ4vHqWr/tSDz82c9+Zlu3bg3X5Id+/UMX7Zfuh7reDx06FO6dui4lRt13331WXl5uH/7wh+3Tn/60rVq1alTHVl9fb3/913/dp8Wl1mVJSYlde+21duWVV4Zx9CeejWqnelWmuT9y5Ih94xvfCKJe7yJRT/eySy+9NFxbegHWu58SFb/zne/Y4cOH7eqrr7abbrrJZs6cedFuHz16NDzPDhw4YMuWLQtzMJjrNLr2JZD/4he/sOeee86qq6vDtf/mN7853GPUV4mSvevTvVTz/d3vftfWrVsX/q7x6fi777473JsmUhQey3mmbghAAAIQgAAEJpQAQuSE4qfxyUIgkYXIuDUL1Gb65z//eRDEtGEaSIj8yle+EtbbvffeO2ksmSbLBbBx40YTn0WLFtl73/vei1rjaJP90ksvnd+oy9L0U5/6VDi3r6I5kkiiDbE25SMRImUxtGvnLnv0548GoeLXf/3XrbS0dLJgHFQ/Tpw8EUSgbdu2BQHjhhtuGLEQKYFMQvsjjzxiZ86cCRZRkZj26quv2sMPP2xLly61j33sY/a2t70tWL1S+ibwxBNPmJhJlNeaXbhw4fkDxVlimkQ7rfvKqspJIUSqg7Jo+4//+I8gHF111VU2Z+6cfi0aJVj+13/9VxDc3ve+99lv/uZvBktIXV8SYisrK4PF82gXsdN9pj/Xb4ln+txzzz322c9+Nghi421xqutGouB//ud/Bia9S2S5qWv3DW94g/3BH/xBEE5ji+6RP/3pT23z5s1BzJRwOZAQefz48XCf1EsE3RN+4zd+Y1BC5OnTp+2f/umfwj1Ff9cLCQmM6ueuXbsC7z/5kz+xt7/97Rd4DWieJajrxdO+ffuCNa1+pvPUB4mTWhcSpKdNmzbaS4H6IAABCEAAAhBIbAJTM8ZRYs8pox8GgUQWIoeBa3KcElnGadMn4eViRcdqk60SWdNNjlFMjl6IifiIpUQCffqzxtF3Oj5yBdSGe/bs2fbbv/3bfQpqsXWPNK6exJEtW7fYl770pbA5fuCBB+JOiIxiDIq12IwkHp/OlQD1h3/4h/bss8+Gvy9YsCAIGRJ8ZWX25JNP2t69e+3gwYNBrJSI9slPfnLE4ufkWLmj3wtZlEnUkVXavHnzLhAiL7/88iDMSIS84oorglA2GYpc7yWGSRyTeCYhafXq1f2+HHj66adNwpes+XTt6ry5c+faF7/4xWC9rBc7Eq5Hu2i96j6jP++66y5bvnx5cF1WkVuxBGC95PjlL38ZXjToBYeYj3fRNar7m/oqsVEsVfTz2tpa27lzZ3iR8NhjjwXhX1ayb3nLWy7opp5J0bNJ5w1UYu8LOm+wRYLyo48+GqwgZU2qFw2yaJfoq+8kNuq6173gAx/4QKhW9cvyUiKq7g0rVqywN77xjWE+tH5eeOGF8FJDIub06dPtXe96V3DVp0AAAhCAAAQgAIFRIoBF5CiBpJr4JpDIQmTcWkTG95KbOr2XC/Djjz8e3Djl2jmWRUKmLIwUZ06WU/EiKmtzL0u1SHQZLUYSFP793//dXnzxxRCHU6LJu9/97iAsRK6tt9xySxAb/vEf/zGIDxIm16xZE4QgyusJSMyV2BTF+Is9Qkzlxqx1N5li6MlqUAL09ddfH0QkrQeJiX1ZKevakaWe1qQslHWOiuIBylpcgqZE/tFeq71Jr1271t761rcGy1MVCX+6l0iElCAqcU1rV9aE420VGdtXWcW+5z3vCT+KxEJZjK5fvz70U9al3/ve94JgF7Ecr+tK90LdexXmQawk3Gr+5F4tnloTv/fffi9YeEqQ1Nyrn3qho/5L+FX4Ad0zZDEpAVOWkXI51/pQ3RKtb731VoTI8ZpU2hk2gR7f0u4802Jd3T22sDjTCrMS+Vf7YWPkRAhAAALjRQAhcrxI086kJpDIv60ktBCpuFgSZpQ05C0PvMUOHjoYYuxJhJDQpaQN2lxqwy4hKSpy21NiB1nr3H777a9zdf1//+//mVzHtTnUJwr6LysZWVxF8bj0b9Urq6TrrrsubPiios2lNoLanMv6StZ/sUXudOq7hBOdq3aiIlFKlkWbNm0K52tzqc2prJ5Ul44djc293A01BlkI/fjHPw5ipJgNtqhfssCSeCI3UdWlfskdVhtquZhG7Das32AP/eQhe+WVV4IgIAsqWfoorpxiIMo6TZtt8VUsxE984hMXWHVqXrWploAkkUZ1R0VxRnVeZOkmQS8qir0mCzP9qXUhyyIJNYqtJxfS2Fh2so7S3EqcUBxStSGrJAkBiqOpeJoXK3KlVKgBHS/B4Ld+67eC5WJf1qkSZSOrJwkMauud73xnECNjY06KheZFYqTi1mmsaqO3EKm1onlQXDutHwkU6oOsK7VeYte/rOl0rNagrg+tX61FWV3qXFnaaZ2pL7FJNzTXalvXlvhJ0BN3cZOVnPqqudTc9yWEKYRA1MdoTcvyUzH4NP7eyVW0TmQppjY1LxJu1I7c+WXlds3V1wTX6shNVa6xakNj0HqURVhkXaiYkOL9/e9/Pwg/irkZu040rxJvZCEsxlqfGp+sFdU3jUtrNTaeoARDuc2rPx/96EfD9a71LSFUvIN16/U32DXXXnPRdaP1oXa0vtR/zYPmSEJ17HWuses6Em/9XIJ1FAdSa1v3NX2nsemeF82d7jG6xhXDUHEExSfieOONNwYXdrU/lKI1ovtRbKgGCWAas+Iz6v6pGJZiob5qXLL6FSu5E8euca1/3e/ETnVIONR1evDAQXvyqSfDvOheLQtXWbtqblU0H1o711xzTb/ux2qvt6CrsYub2tV60NrS/We8hUitL7Wp60YvgXSdRlx0X9LzpKS0xI4cPRIYaP3qmta9Q9eP7rO6X2v+NBcqut9qLDpXorDuB5p/CgQmO4Gu7rP2k+3VVtPcaR+4arqtnTP8ZEttXX6NdLrXoP+GnJWaYhmpA/+q7LcFa+3stlY/Nz8z1dI88VN/pa61y58FXndaykWPG03mtd7m1hNNdqS23Wbmp9v1C/KswPs50WXz8SbrcXiLp2VZMeLxiKdDCcdSU5MtKSXJujvPWnfXwBb5I250EBWkaa3524Iuvz7O6q0BBQK+IoAAAQiYTfyTmFmYEAISRr7+9a9bRnpGEA5kJSLBRn+XKKaNqsQhbeglJERFbmsSEeTOJkGjd8w9WchIjJBAoA29NneqU0LYV7/61WCJIvFDgow2tdo8ahOtv2szKbFCgoBEDbkA6tzeQqTEBm2CZZ2jdiIhUpvMr33ta0HUUN8lGuh7tSehRgKQBBmJcUMVD3pPkoRICQra2EukkAgg19XBZNuVxY7ESwkxEsEikS/K9KyNvmKUaVwSRPbu22uK3ychRJy0qRZPiRTaiKttJWvR2NUviRFK0CCWYqRYlRJa9DO5XMYKkZp3fScu6rsEJnGUCCUhUXOt+YjmLBKpJUbL3TFyb9UxEuSUoEf90XlqV/VK5BT7/thI3PrhD38YPmpH1mIXK1qTWqtiL9FQoqhEib4S32ie3/GOdwRxRiJn7zidEup0HUgUlPCj8Wke9BEbidlKfBHFitMcaFzR8RIqtH4l+mmtirnYqS4l3YhETIlZWrMan4QhxVzUGtX5EkpUv66bD33oQ2F9xopoEkW+/e1vh/5EsfvUT/FUsiW1I1FJ61FF60t1iafWpoRkFY1J9YqBxFjNn8QvWYsq2Yd4SqTRWDQGzYuKXG81NvVfgreYR0JkFFdRa+9HP/pREAEjl3uxkEimsSuJzNx5c8+PS5aJX/7yl4M4pLF/85vfDCKiuOl8/Vxib3ZO9oBu4OKge9Tf/d3fhbUqruIbG+NSdSpRksYhoVzieMRL15NYqT2tE7mm67pTXzTPuj40x9HLE9UhBhqD1oP4jDReq9qVMBaJtWpD16rmQ/MuYVhiotZH7DrX9a0XDWKvlzLRWj90+FAYk8Q0jVXuxbovqk6do7HrGaB4jFrfg7UC1RrS3CguscYvkVT3HnGPLDzH44GmOf/gBz8Y1rrWTywTzbW46T6h9alrMPpef155xZXhZxIgY9eI+i3+8ZgIbDyY08bkJCBdo8aFthf21VmFC22XzcqxRaWZwxba1h9ttA3+6fbr6Nr5+Xb7knPPlYsViZDPHqq3dQcb7MM3zLCFRb96ed37vEd311hjW7fdsKjAVs84F56id9lX0WptLq7OzPOXn7lpAzV/0e+rW7rsmQMermGDfo/psUtdpL10Zo7zGVG1Iz5Zc/bDbVUm4ffta0rtxgX51tLRba+cbLZZLpbOLsgYlAg84o5MoQoKCjPscl9XswvT7XBlq63fUW09vo6ikpaR6i/QXSh3gf1M+bmQVSqpLorr3C4XLhvrO/x34NEVCy/3ayjXheadfl1VVgw+BnWyC6pzZ+VaVX27tfpLhtixTKFpS9ShIEQm6swz7gsIJLIQOfBr3im8WCTSabMbJReQYChrIG3ctCGXOKE4YNqUSRDTRllFwkn06Ss+pYQnCRnaCKpI1JI48Q//8A/BekYWOHJNlCim47TBl1ii+mWBFgkwcqFTO31lb1Xd+k4CQhT/Uv1WwoIvfOELwaJIljzqtzap+rk2zRqPxiyhTGLfSDLTypJU7pwSViXiSLSTwCcR6WJFPNSXf/mXfwlimoRExTdTPzVWiQ4SujQebfj1XeR6KhFIwpjalvAkEVgCn0QQ/V3niLUEhigRjMQdzaeEAnGTQKg5jzJIS7CSAKV+aFOu/kkY/fznPx+EC60LzZf6EAlcGrP6ro283HUl2shCSf2XyKG/qz0x1jzLykhj0Xz1LpqrH/zgB0E00XqQKCJh7WLCiNaGBFyNV23L3Vr976/IQlHik86LBAmdK2FS45S1mQRLWbhJpNM4NUYJPFE8QWXS1TFa81pz6qvmqqG+wZYtXxZ4y0pM58kqVMdIHJUIJNFQzLVmJcpGbvX6XuPU/Eg8E28JROIm0Snqo6yMJfhIZNY1qvnWXKqtSOxV3yLrZYlw4vmv//qvob8SqKKs4WpLwqSETV1rn/nMZ0K9WreqM9aqUy8aJNpEVqnRuHVMVDTnqkscdZxi7en6klAUucXqmhQDJQyKEpdEgqfGqPMlDGlsmiOJ3FqTGpvWzUDxKLWWZeGo2I4SanVP2blj53mRKYonqrWvOdA1pTUTlR7fnKo/Eh7VfmRFoXugEpeoH5oPWYBLLJT4qPWn60zj13UgMXwkRfMkK8golqzWhZjo5/qob5rj3jEX9Z36EN0PIxG4va09/Fz3Pq03vTCQAK6+SjjURyKxrk/NWSyPwYxD9wTVpbWuNnQ/GE8hUtdxrLVm9NzRdaZ1qmtT9xatHwnL0YsEnScr274sbcVW9y2J8JoHralYq+bBcOEYCIw3gSYXr15wEVCWi5lpycHyT0LbVXOHZxX5yI4a+9nmM/7MOmvl15TZTYvyB7RcbOnosaf31dt3nz1ld60ovqgQ+fiuWjtS2WI5GSn9CpGP7qqxmpZOu2t58YiFyCM1bfYztxbdfrjeHrx2hi0oybRMF3gmuoiZrCFlzRosUL1Uudj0z0+fsHsuKbEHV5f4nCbyFm3oM7TQhe1P3jrLVs/Mtk3HmuwVF+fbXfCNSn5eut28qtBKXdz+8qO/EiKzc1LtztXFVt3knlvbXLxs/9U5Q+/F68+465IiWz492/6t3RPiDUGITE1PsY/4eH68pcp2+jUeO5bR6Bd1TCiByWGuO6EIaBwCWESyBpyANrjKOqvNqjb1Etbk+isLN23qJZ4MlPm0P5DaKEs8k9ijoiQBEnUiS8lHHn7EPv+Fz593eRzuhKgdWf9IcJE1p9yTZbWpsWkTL7dEWf/IwunI4SNBLIl1uR1OuxK4JN5J7JNoIWaK66bNr4SXvopEAVmPSQCU6CUrSlkwqi8SSSVGKQGERBOJT9oMy31QIsu3vvWt4GqrzfH/9//9f6GtqGjcEksk4siCTkKBNt0SdCSQSRiS8CphTZttHR/NjTbu6ovGE1lgaQ2oyMJKrrMSKyRAaYP/3//7fw8ChCzk1IfYzLmqUxt6nSerzmhNqS4Je7FFoo/m5Stf/oqdLj8d5ksZgyV6XqxIKNS41I7mui9LyN7nS+CLLOD0ncYs8Vh90ppXX7U+NHeqX+temcnFU8eJrYS+qESC2R//8R8H6zCdJwFX4p9iUkqckbuz5i+2f7qWNL4///M/D9eBisTB//bf/lsQ6vV3WRCqPYkrmnMJRhqnEu3IBV3j0DxJDJNVmKxjJa5JGNJ56rssiiXKSPhXPD/Ng9akxqs+ys1b17euE4moEmF1nUi8kWgrF2AJ7RcrkVD6t3/7t2Htqm9az5GoJXZioQRL//Zv/xbWsUTU6KWG6pZwpn+rT1qTWqNaV8qGLKFPLykia9yBrlGtH7Wpa3Hf/n1BTFJ94iChV2PTv3Xti8dARfOpczUeZdj+yEc+ct6qV1a0//zP/xwsL3VNDkWIjATd6KWL+ilxU5aXmldd3xI8Nef6+UiK2tJ8KqHWe9/73lCV1qbuw7KyFhetu6EKkaoniqcpEVQcJrLoulFsTQnRYhbda5RsRgL3QJbqWodaH3pZpWeVXuzIMnsw62Qix03biUWgo8tFKyWUcrfTDhew2t2a7kRdh33brf3e4S7ZDS66PLm71p50AaYgMyUIk2kpyUGkjNys/X1Rv6XJhZIDHmsyRa7VSWfD38sbOmyuW4vFllYXzupau63JBRu9gJKg1lfRcXKLlgWkjpB1o7/3uWg5Xtduz+2vs0pvtzDLLdSnZ9l0P09d6nZLtYomTzDo4muX/z0rLcmKstMs30XNvkp9W5ftceHnWFWrTSvKsN+6cWaIn1nobNTneu9XnR/T6VxTfByF2anBRVqMKl2U6vQ2xDHHBSEVGcpV+M87nLvGkuV82/3cBq9DbfmPQ5+m5aQ5+5TQ5+j7dp+voqwUO+kWdzpvem66feKmme7S7iFTclOdZbdtL2+xF7ZWBZF2uY977eyc0LbwtrjVqaw7I9FSLvBF3tfIdV59k0VlpQu4bS4iq+0SH4+OSx+Ee328X0kpbuU4y+d4houNR2s7wrop8XVb7kxkSShRb860zCCUz/fjvreu3J+3vi6d20y3IL5nZZGd9Gtpp7vL19b5vL0mYOq8DF8D6T5nOrbd62v3eYi1mpTlYoZzzvB509ppd5G5zeehtwVjml4W+NrI8vpCOANvo93XTbg4YovXofGUlWR5qIUy0zVR5dfDab8eO719hU3Q73OZ2R7ewF3RVdSvDq+r29djf0V9k1Wo+pnifdY10N7W4x9PevraaXJvT/MxZ3ofU72/Pd5cm69N9TNyK9d408/X44lQnW+LX5d6iRvdCpJVj7ejetRWp69zjbfb13E/t4t4X4JD7T9C5FCJcfyUJMDrtik5rYMflEQNbdYkYEQWgnK71OZUopPEJ23yhitESkSI4u5FVnMSWPQQlUDznve+x973a+8bfIf7OVJCnoQOiXASRSRuqA21rb9LfIjKmYozwfJppEKk6pPbuDa/f/qnfxoEI1k6/t7v/V6fljTa7ErYkMWNBAJxj5LcSICQMKFNs0QlbYYjC1JZtA1UJCRKEJSIJQFT45OgIas5iQQSeeSeKbF229ZtQUTQvMr9VpwkjukjKzaJRhLjxFOJHCRCqgS3Rm9D4lsk6krIkFVmVMRUffkf/+N/XHTzr3URWYYqPqk4KC7kQCJkbw6DFSJ7n6d1Idd4cZKbsixMJSaqSLSQwCrh6a//+q+DaPe2t77tApd2WazJYlCuslF4AlmXyQJSFliyOpQg1tuCTdwl+kUipNrT8ZpjWZVFIpV+rr6pj+qrhC6JiupbZG0sVorfqJAHYqnrVkJflNlYFmMSATUf0bUty8fI9Vmx9NSeGPaXKf5i607CpdayhC2JoBJzYwUt9U98ojAKWpfiGmu9Kma///u/H6zpoj7K8lD1SoyXha0sabWWB+qjLJL14kGWw2Kv+0AUjkAila49iXIShwcTmkFzpHiB4i9Wun+JvYRDrRWx1vWja2YoRQKyivqmovuhwlBIPI7czGUVO5B4Npg2tU5VVyRC6hzdy9/0xjeFlyESxjV/wym6n4iLXj5orU5kET8J7roXa350H9I1I3Fc15fWfH/rJwp3obAjn/vc58K979d+7dfCvTiao4kcG21DICJQ4RZzW0822X53XT7T2GFVLoqdcfGksrHd7lte5IJTsq0/1Gg/3uiJuY422Gx3kZaIN9sFmWvn59qC4qyLuvtuONZop9yC8MaVxdYoUfJUsz2xt85+49pzibVUJHi9errZHt1ZY9vc6izDhbdr3K1Y4lysoiLRVMc95BZmrx5vDCLdW6+YZo0xFmp9zew/u1XlgVMt1uoi50+2VgSxRAJijgtBx+rb7OvrK2zP6Var8bHPL82wN68utbuXFwZxr3d56UijPezuz8dfs0L7Xz8/ane44HS/s+pSuI49dUH0rG7wmOUumty0JN/e74Ku4kf+15ZK59phdy0rtlv95ypyQf/qS+V2uqHdPnrjLLukLMv2ucj5uLubv3Sw3gXXHptTkmHvv7rMrpiTE0TAY7VtJgvPozXtdr9bxv3zUydtuVusfuKWmfYjFx3rnYcsP1W++NwpvZ2zrYcb7R/9539w9zy7bn6e1TuLjT43P9labcd9fqQZXbUwz965xi2+XVxLdoWptrXTXnbX3x96v49Xtfu8JNtdq4rsjauKbXFpVhAmp3KZ7hzWuhWwhN5vri+3v33bIrvz0hL7wbqO4NY8qyzbbl9R5NaSmhf30Lhrrj2zpzaIyPf6Glo2Ldvm+fXS7GvtWRfy179a5WJgki11/rf79bB8emZY+y/73Dy+tdJqfR5UJO4V+vV1q1uxXrswPwjRW040289eqfTnq8eUfs3NW0a4s/y4u9eWuuhZ4qEPeuyR7TX2rM9Xp6+rWDFSIt50F0c/fsdsS/UT7/T1Md+TUH3tBb82Dvv+xoXC2W79ef/lHsfZ51ZTq3ijT75abRVubdxfHMoMF/bXLC2wW5YW2nR3/2/2a/xFX7fP+DrsfM0KNMfDIVzhruR3eJsz/Bi9SFjnxzzh/Wx1cVWlyIXc6/waumFxgYvdaUGc/8a6U3bUwwp0ep0SM/PdPf7KJYV227IiK8tPc1f5NvuJX4sH/V4wYsvOaC2Prgf9eF8eCJHjTZz2JiUBhMhJOS3j1ylt2CQ09d6kaRM8GkldJF7JalCiiFwPJdjJ3VEil1xT1fZYuPRJHJCwI2vFyEU0oioLnr7cyodDXfwk7sgSSy60En60AY61novq1QZXG2ZZ7IitrPpkERjLPnLF1DkSegabLEGWOxIwtRmX+Bi5ZoqBijbVEpvVx1889gu78aYbQ19k9SX+EmhUJLRIxFE/JHz1dnmWJauENLmHy9JSIkZsHzUuiTQXE41UtwRMuWTLOlOCjyy2ZJk3XkVzIcFKAopEyFihWn2QgCMLO4UUUB8rqyqDQBEVidsSdHq790uY6R03NXZMqlfC32CK5kJzJAFN/ZQ4rZcDUYlCFOjfsnTVXMqqS3Oi/qkvsS8YovO0FsQ6ihk53BAFEvpktagiCz6tidiiPkisUluyvpNAqjUTu6YUa1EiZqwFsfhEAlCUmGgwLrJa/xIjdX1JZJOQryQ2EjJlWSrBT/ed3nEBLzYXWs8SqnRNyJ1ZnCXsKzan1vBwiqw8JW5H14jql2CtedDcyNpZFs2jUcSxd1zUsL499qbYj6QoPEFsuIOR1DXSc+W+L+tgCZGaH13bsuqWdbCsjSWI9xfuQUKzrFFlhau/68XKX/7lXw5KrB5pvzkfAkMl8GMXDTbsq7UFZTl2hwsr97qwtsJFiQK3fkt1AeD/9+b5drS63Q67ULL+UIN9e1ulZbn10mUfXDFgUz93t2lZLF7l4ov+PFHtlvcubsUKkeUuzv3tE8dtu9e9xC32SjMz7LtukdnsgkXXay7GauipA+4h4KLiziMNttRFuUs8NuO3XjoVrPUy0vtXxSRayIKvqzvZinPS/XMuLFBVc5f9+n/ssXIXNC51wWdmUbpt875tOtBgO68rsz+6+1zSqdhS4BaDpW4hl56eGuL/zSxIt0JnIUFXY9jofZztVmfLXJw65OLu3/70sFuVdttvXj/DTrhw+LQLiGJ6Xoh0S7cfbDxjC93aTvEmt7lQ+w9P+/Ngb60tdRbLZmTa0+7avml/vf3pWxbaG3x+ZHW51UWiZ1wk2uQi0lx3DVcMw0x/AbzxSJMLqh12ibe/yH8+zfuqIos5iUDZzkkWkP+56Yx9+alTwSpv7aI8a3LB8xtPn/I+dtgnbp5pC120+rHX/4VfHrdst7q83gWgisZO++KTJ1wIbbdP3jTLxcgJDoo54Oob2QHzPOHPXBfrdpY32cvOX67ZtywrsIc3VwQhssM5SnRs8ReKmd1JdsrjLja291izs5Q43uHzqe8l8MttXnEjr3N37f/7lkV2wAXFV11km1ecYZ90AflqT3b0R9/aG0S3HJ+zv3rnUhcx0+0VFyBrW3vsfVdPt/dcOd0+4cccdeFNpdTX8Qf85wer2oL4fNWCXI+/6i9i/bvnXaCTNWNs6XIhv9xF1RBaxr/T39u8v7JEvOmyEvusi9Sdvqaf8pAIeS54f9Ktaxe5CP4fz5+2E/6yoq/yvltn2/uumhbWxhZfk7O9z//w9sX2OV+P33vhdLBU/PDtc+wBDwuw50yrv/RodOvRLPvcWxfZR13o3rCrLlhKP+hC+/s9bMMLfg949ZTH3fcXAf/x6yvtY9/y0D8H62y6i7rvd0H37WtKPD6r5yDwdf/g5SV2mx/3536NbdxVfVHLTVmDqvSXbEjWp9IgOwZ4qTGyFTXmZxMjcswR00A8EBjZTiQeRth/H+P7Xcoosu/PjXg0mtBmWxt/WZb91V/9VRDstAmXVZDcMWVVJKsjWRFKTBvI6ulifZJoISFOApcslSTUSPSKrGFk/SnxZLSLLL9kOSihRe6u2sTKXbV3ieIv6k+Jd0owISuc3kWbYX2vTb5EqMEUiU7qhyzuJBBs3LQxCD4SpyRESICRaCrxQdZ64iIxRRZREj0iq0b1LcqwLKux3mK05kcCk0QnCSdRQo2oj/p+IGFL44qsQmVlJvFA8zLYdaj6NV61JWFosGJtb45RrEati97WsRqjxFm1pfWjPkeWiFE9fY0zSnRzsTkbzBqX6ClRMeqjrOUUqzD2XPVL86jxR7EF69ynSAK2BOPY5Cex/YmskQezri52jNZpZE2n9mJdrqPztH4ioVEiZBTTtXd/Yv89GD599SvKSK77i65/hQ9QnFjFi5Q4JZYSK/sS5vqqT9eG3N6VyVqio1irDn001sG6jPeuW1ajulYljOla1fWo8BUSw//X//pfISbmaFhrq93BXI/DXQe6JsRE94ko8/Rw6xrpeWIWxVXVtaPnjKyy9aesYRXaItYKObY9JVhTsiTNhe6DineqMQ13HY50LJwPgf4IlLm10qc8Zty/uI531AWNXN+Q3+tiV6Zv3KNM1XM8yUmZix6yJHzGxZciF7T+/E0Lg+Vc+gCxETd6HLoit6CUYJfl1pWKpSdrxr2e+GO5Cz0q//q8Wz65SPEGt26UpaLcovd7X/7kx4es3l1Io7LNhZva5g57wAWLT948K7iJ73MLtT/+4cEQf7K/8usucrzsSW9k5XmnW/S91UWXTnf9/KWLr0dd6HnfbbNd4JhmYvGUW67JLf0XnpTkHudwZa+4mJd7rMBTS4ts32m3sHTX1U/fOseyM5JDfbKOu9ktw2Qhp0zae9zt9fddcHp+f629063W7vO2d3i8zT3lre7e3WpznMnLbpVY7QLlr3lCnjI/50svnQ4WpO+4bkYQL2WR+r6rZtgn/nOP/eCVimCJKq9o5UuRQPgOF6ce9PHkeB9kLdnjVnFyMZcrvOJ6SsD6xcvltspFzQ/fMNOWl+bYzjPNbnnabGVuhfYn9y3wDNtumefn/K3PzQYX3F5xUTbP52Cvz4nE40/eMcduXVwYkg39bGetJ71JDxaAU7lIuFrrFr9K8vOkW7nKBfhZF5l/95bZVujXgtZlpa/R9b6uLne2C4rP2o/cNbvTrw+Jb8+5FeN1Hgv1hFuvPuLz1uAWsvqd6oSL3n/vMTs3uphW48Jlrov9b71mut2/qsSWeyKnnW5N+4DHHZ3h4vm/uZD3vFsJd/kkPDw3zz50/Uy70dfXcb8OVORi/12P9fij10T7RZ5U6hu/vsLuWFZoG9wyM1aIlEt3TW2rfX/9GfsDFwbX+XX5qJ9b6S8Gin0dXDY7N4Qn+OwPDli5j0tWmcdrZ/o1UGxX+ThO+5rp7aK9xH9+s1v2bvE1/Q236j3kInq+s9lf0eY/L7CfuBW1XLA3+xrf7n3e7tbELc4xz4+5zkXTW72fe443W7GPdY2Pb5dfU//4c99nuSXlQ37u1V5H5WvX/2Uu1F7q4/vPjZX2n8/6717O5Of+AuWv37XErncryiN+PZXHJAuKXZsZ/vLgTW6BrdAGP3FWTc49tuT5en6rX2+1Li4/+nLFpMmMPozrCyFyGNA4ZeoRQIiM4zmNkhj0NwQJFBJqJrpIpJDVoCydouQosjCStZ4EA7luyjpQ1oTDdYWT+KLYi/pIfJOlpZIzyGpNdWpzKoFwuKLVxRhKbNEGVq6pshCTm6yShUhIii1RVmz9KQsvxSCTe29/RZt7ufoOpkgUkwipMcs9XeKGNuFybZU1qtxRJWpGrrsS/2Q5KW7awEfu1xK3zie8cGa9XYvVl8jFXH/ql7Xo+MH0U8dEmWkl3iomm9aBLEPnzpnbZxKJ3vVKwNE4JTxJCJPFosbWnwWvRB7F8dO1IMFCVnKxRf3pS3SItYBU3SO1IBssHx0XWStG5ygEgPreXx+iJDcSU3SM5mWs3WXVTuTi3J/4rHuURECtIx0/kEg9FEZ9HSv3dAm2sobUNSBr6CeefCIIZrKW1DrvbbnZVz0SxvWS4N///d9DOIPohYlcy3Xtat3J4k7X2FCLLEQ1n7JE1nWo/iqkQyRKSpAcTNzTobY7msfrvqJ7tziJx1CsTEezH1Fd4hXLTGx1nUtEliW+wlD0JUR+5zvfCcdoneheqxdiuicjQo7FLFHnSAlIbFzllpASqX7qFnByq5zjVk33uagWFR2zxWMN/sJjRcqt84/fuMCud2Egy4WQ/uwQFcfwaRduzrio9oYrptsid+FW/MG1LrZIOHnB24mEyJ0uYEiQkdWk4hgqtmKqx6G8xK0eT7grtsppj2d30F1E0/wZLZEjssZTjMQSFzJkBdhfkfiZkZ7sdXomY++D+nHUBSJZZio43n0uAkk8VGzEu9w9VBm2f7q50na5sNFbiMz2MedlepxMP7bTreAkGKko9uMtLszIpbTaBY3dzmuvu2+3ueVZc3tqEA5XzsixGS4knnAmEimzvU+POdN0FxGvc/FP94iDLuLo959LZ2UHi0bJq9NduLlkXp4d9voUc3C+z4+KsiZLCJrnQlLvItdquZaXeNxITZL6rRiUmS6QSdCN4nbuOtNkh6rPJYtrcpGozjmedHf1tNQCm+UCTav3/wfOotIt3jQ/d7lFoCxK816LcTnS9TdZzy/zdbjYhXJZf25wi7x2t0J90kXBP3BR9sYVnhjT12OjC1otHR5exSe3w+dfVpJRafbjZTHZ6gJ5S0v3Ofdin4eTvrbq3R252AXOVc5zlltEXjLTX7q64Jzl60Bz9Qa3SFa7O13gq/N1KmFze3u9/V//meqU5azKGV9ru/36kOu0hMYTPicHXFic7mvSfwV9XZGQ2Oh91JpqdgvNRu+H4ivO9XEu8c92vw6PuDAYWQ2u8+v3Fne7Xu7r9jlftzUuUMaWxZ4sRyEHJNTucfdyuWKLwbfd3fsXvnaafM0ocd+rLtaWuIXkXBe8893terav1+lu9alYrBLMG51Pna+9Wzw7+QfcGvdlF0mPe1tP+8uAFrdazvR1vtTbklCvcV2++FxYA52bkpTsVqsZgWd/QqRiYG7xa/1Wv6e9w8X9H7hoGomREiH1M3Hf7had0Qv4ybouB+gXxlBxOnF0e3QJJLIQObokx7E2bfwkPEho0CZf4p7iYPXe5GuTK0se/cIk8aZ3ooiRdDnWLVT16JcxbaQjC67YuiMLNsUX1GZPQqE28trgazMv0U7x4Na9uM7uuPNXWaclXvRlESjLqtjMvWpLAqPi6WnTqUzOig0msUqsZF0kF23xGqpoNlhGstCTi69iiynxj9zPxSO2SIiRlaL6I6tDWUapn/0JaLK6GkqcOLkEqw9yg42ySouTRAJZBImbBFNZYqp/EuYkJOn7yF1YfZMwqWM1P3JrjbUg03xo0y7LNs211pTq6D3Wi3HTWlRMRAm3Gp/mTVZssoidv2D+gK76Ol9rSf2UoK01JKG1L3d49UMipMQGMY8szcRWFoMai9aGrN9i4wZqfSvmp8YoIVvraDzFIa0VXeOaU13HEtDe8pa3XNStW/0TT7lDa63LRVmCkeYoVliR6L9j+w6PM5QWOA43RqRYqi0VzUNfIr/Wi8Q6CYGyAhzui4bBXoeyYtVa1wsBjVOivOZf45d1ZGwsyovVKeayqJRIrpcZf/ZnfxbusVqjEjJVp8TO4RS9MFBduq7ER79MR/XJRVjXqO4NEtq1TiP38L7uhVqfg7WaHk5f+ztHAp7YaO1IuBvPpC66hytkgfhr/LrnKdFWbNE9QiEixE73QF37vYtegH35y18O45DIr5iwd955Z5+WvaPJjrogMBICEuDWzsq1FhdLHnY34BcO1F8gRKruwy5wyN107Tx333bruIGSlbS5i6fcspW8Y4OLjhUu3GS42HLYRZM6//sjLnp+2K2QJGS2uSgi60aJhBIhVWT1V+SCV/ScaXbBROKJcvYVe1y6qEhgK3BBQ0l1hlIklFa4lVqGiz8zXbiJErTMcKvIWS6aSOxRvMzBFiWGUdzGjW715bdfy3OBtMYTkMQm0VDSmkvcolJCpKzEFItvi7uZz3c3+JkuzOjYNh+nRCklwFERDbGWmLr3pCcsca5RUbzBYhdwh1rqvF8SyiSmbnXhKSpKXqMkK9PzMoJ15W0u+J6qn2G73FX25y4K/dLnc7676t7vbrY3egzP9BGG4hhqv8fz+Evn5bpQnh2sDn/DrW+bnJcS/shS+H6P3fiiW85KiBxKSfbFu8LjcN7p8SG13mS5qjnPckE6Klr+811YO3moPbhNR+tH1o0ne7lHy4JR12yUwOasW8PKFVyu/0N58ZXna00WtfsrzyWHiUqNXx+tfs3lKkmVhyLoXQo9M7iUrxoXH6N4kOqLYl1G8S5zXCC81gXAm3wtacyn3R1conxsgqsqP/5H7u7e7H1f4XE35xWn+7pPCkmhfugWinIXz3FG2a8lZLra115UlACqxoXM18Jm9jkd6tMxF99fcC43uRXm2/y+82O3ElYQTf1d5QWfzxNukdlfLMyhzPMEHotF5ATCp+nJQ2DoT8XJ0/eE7YnELG22tamXYCR35M985jNhkx25t2ojrY2aXAu1mZWQoQ1wX+6TQwGpNrW5k4Cjjbo2zbJ41EZPmWQlMsYW/VvHSdTReR/4wAeCAKSPNtvaJCq7sDbTJ0+dDIKFNrcSOfSdrNlkYRhlZpYVjtx6JXzFjqWz41x2bp0vsTPKIqy+SGRSbD2JamNVJLZK8FHCFfVXG+Xe7UlcknCjeZIlouKYKSackkmoaIMtCyO5CUrUUSxGjSU227NEC7GKkmbEis+aG52jTbjqlpCrn8nCSn3TuXLRlvArIVJrRPVrbUQsNZfqk86XmCkRSeKO5kPnS0DWBl5Cl4QlWVvqnKEUrVG1qY+S3mgNK5u5BMUo6cnFBFidr2tAgrMStehcjU9FFmvqj1jKolHzrv5qTsQ5igWp+uWSrrYlgmq9RCKxxikBT+KlOOta03eDdR0fCov+jtW8at7VR107cqOXJZ34RHMVxPefPuzxgE4EMUgWf7p2IsFP14jmWtm/IxFV4rJCF4i11mFfFrlRTMqBxiHhVuerbl17ut9I1I7ESa0vCWyyDJZ4p+td96CxLJF1svqge5TGL0FS14FEpovF74ztl37B1/1H9xNxUmKpqIiPhFeNeaRF/ZWILutgxTPUOtU9W+Kn1pyuZYngEtw03+Kp5Ep68aH7mgRXWX6ORxGLY0eP2bqX1oV7lK4diYCydu8v/uJY9Uv3IWWz1xqX4K751b0ouo+qb7L4FjPNX+y60zjEWNauelGn+8KHf+PDISasuFIgMNkJyFJOopYyOrd6FhhlS37FN++ZLootcXFKmbJDfEQXBwcSIc9lou60F909NNdjMireXLtbcumT7YJGkbt673VrL4mbc906SlaWilmnRBdRUaJeCZ/Ri96cNM/M631QHXUeWy62KBZff1m2++MusSbXxRfFzWt1oUJChpKvKCu34vnJ8koCzWCL3FMf8SQ6Eo5udLFjgQt2NW7NtdetrCKrUXFb43EtX3bxcbMLlkr8U+lu2UpyIuFRAqZcsVXk6h1blCU8XdnKB3CFH0x/Mz1OpGJD5nubN7pb6/nnkHMUlyvcTVai21K3klPcvt3luSExziF3p3/J4we2ObNiF3+vd4u+qViUuEVJapScR9mlZRFc5NeGrEw3eVgBWfLOd5HypLvYD6Wk+Xr7iIuaC3zNP+RCvCx8lR1ayZlm+zVx7llzLot6rvNPj4l7qkzbeS6Sd/m12eRC/miW9teyTmuMsSXTxT+t2Xb/3UXXXe8SXa+6RyiZjEQ8/ZnlAmWur49qjyu73NfSW9eU+v0jyR5zof6IWzpqzB9yV+lIPJTIutNjQ1a5SLlwhme0z88IFs8f9LV33OvY5C8ylCFe1+YRD3Ww6zUrafVnkyfQavIYmuX+84uVLr+fHfZrUXzvdSH97bKCdCFS6/yx7dV2xEM06Jg4L1hExvkE0v3RITD4J/fotEcto0BAmy4lEpF4oo2pRCX9TBtaiTAST2Tl9dRTTwVBSSLNu9/97j4zOQ+1OxJGJFBpc//QQw+FN3na5Mk9Vv/WJj1WIIwSbvzjP/5jsNaSwBJl/5XYI5FSdUjMkEikjbk24RIS9DO51H3hC184706rjbdiMare2HYUI0YijCxEVefCBQtDfZ1dneF4WQGq7rG0HlJ/NAdKmqAkJ+pjrHuvxqn5kYugRAQlH9G/g0BSVOxuNa1BwIwyt0r8U30q6ruEKbUha0S5c0qU1XzIMlBFvHS8LK0kOKltWV5F8du0RiToarMtK1ptGiQk6ZioSFzShvzHP/pxqF/cJMhIFNF4xF/CnvohN1idOxJxW+KZrEIlHGitKqmIBEoxuVgRj/e85z1BuFE2ZllViqmEEa0fzbNECrl+SyBTHyXCRglxxFZCptayWGjtipdEC/2pccqyVHOmvkTJfIZ6vYzkeIl3um4lBkuM1DUhcS8SlWX9+/d///fh2pMArrnXtShxWdeYBNavfOUrYV1oDUiYluWxxqrrV1apsVagWl+6RiXsKKGKBDC9MOgvk7nO1T1IlscSfSRwipf+rT/Vb4lFehkh7hIiY0X1kbC52LmyjpN4LLFVa0DrXGzU/mBF85zcnHBP1csD1fHIw4/YrNmzAkNdF1pXEiJHsvajMWg+dU+QJbVERcUDVV+1FrUGNO+aV728UEZ7XSu612kOI6F3LFjqGtCcqmjcerGia0VWprKmluj85je/+YJs8rH9UP90DfXnvq5rNRKtdZ4EQq09tdmXC7/mQ/cLrSHd8zSXurfr2tfLA61FXddRIirdX/XCREKj1qSKvhNj3Z917Wv+dG/r6OwIc9q76J4xFsnUxmK+qDOxCCjhyhEXB0vc+u57SmDjglmJC4+LXHipdyu6FhcCTtUNbCUowWCXuyaXe1y5e66ZYe/w2I+zXnNhrvV6lFn6B+tOB9ftd3tsxjluAbbpYHtI3nGNuyArRqTcone6BZhcO1XkTl3qQsz2o9223vu1xt22Jd4pUccZF4s6Owfeg0twqXaRR26gauMKt3r7+QZ/aen9yHYxRULsq+6eKlfxQndpXutx8wZb9rn1loSUO13k+NiNM4J4pYzTr3X/fDXnLL4y7THPkvwTzxqc4gKNYjxKAJYOMsddYE+7C64yma/x9vP85wc8ruAhr3+6W2pqPoZSJILq3iehVwlFprkwPLcgM1hYhkzZzju4l/s/1rmo0+4irLKJ6/itLs4oQdEtLlZqnhTX8xM+L+rLcXcZnqpCpDJWyxVYLvrfdMu5wx4rU0VC9SoX1v78jfPtEo9XuMPFZAlb3RITXSSW9Z9cuOXurJ9JHC9yUa7Y66twAVFzfaO74K9TlmwXv3R9lHk7t3rCldjykoty17ub/zJ3ia5wAVgu1XNdoLvB40NKwN41BEvd3mtFc97pi7IoOyXEc2xza8IqT6ZT5df+Uhf/yrzNWrf0lNvzWu+rXjxs8HXcHON2HtW516+TZnfHXuFhBGZ5aIMqXxPZErfdtbzMLXy/4zEuF7uLu2KvPupu7Q+9WO5rMcnm+vHpstp8raI8F2HnOAc9c1/aURt+v9Ixb/UM3sv8etniiWnKXXyVJW+jv6zY6hbbSmKV7dfrMhf2a5QMaBAW0RIaj7gY+TOfm9+8ZZa3fta+4lnlT5xyQVhZxuO/YBEZ/3PICEaBQCILkf2n7RsFsGNdhdxQP/zhDwfxRdY5//N//s8gQGlzJqs6bVq1iZZ7mjZoyho6WGugi/X9vvvuC8KOrNAkdEgIkrClTaQs6SSUxLpNa8OszZwEK1mfKGmNhBKJGLJY0kebQY1HG9PIEk5CirLUauP77W9/O4gKUSw/bdLVTqyoqE2qRBtt0pUwRptfCSgSz8RI5w7VhXi4cyjrqcgisrfVlObkd3/3d8OGWyKCXDG1AVZfZVUqqyhZ3klIkcgYWfKIsaz9Fi9abEePHQ0ZXjXmz372s8HKNHLv1kZcHCVOadMtsUBikoqOkQul1onWjIqsiGKzGOt8iZXvfs+7g8AtUUTilY5RfRJhZJ2lOXzf+97Xr0g1FHYSM2Q1pz5LeNbYNFaJFP3FFNTP1YdPfOITgZd4S2CTda0ENK1BrQVxEyfFi1Ncvsg1WBZc4qY5kOimOZClrXhHyS60LtWGXKL7E+OGMs6hHisRSiKt+qjrTQKNxBXNRQik7kKYmElo0ZxHgonmT5am+l7zrCzMmmddL/qZ/pQA/cEPfPACYU7rTde2BBpZvEmIetvb3ma/8zu/02fXxV1r6Q/+4A9C/FVdq8rKHs2b+Os61bWv/kjMHQ3hbiCOEp3kaitmEhG1HiSEDiUBjNaJuOrakaD2+3/w++F6jA1NoHvVaMQoiix8Fdbhb/7mb8Ja1hxo7en+rRcqt99+e7ivSdjTPULXsq4BXc+6V+ic0S66/nVNqeia13NF142Eba2nT37yk+HaiBWzY/sg8VwvhfqLayprZj1PoqL7n8bx6U9/us+haB1JQJTQLEt8rSk9d3SOrBv1nND1rmtf9xMJlmIjC9IoGZfEVMX+1NqQSKlrTC91JK72VSQO33vvvaONlvogMGICEgklMlXUp3oyk0ab5zEK2zLOuqVfVbASlDul3CMHKnUuxrzkYkuyizNv9SQtt3pMN7m4qnS4qCJx7tFXKu1xt5C6z91U7/SEGAdd9JG7q8oCb1eCywkXgCJXSVlsXuZJQTZ7vU+7i7AsNJe5OLPOk360eFbqVP/+YkUC3j4XOtf7+QtdCLzTrRbvXl5s35pzxr7tMePkhi0RcIOLHgdcILp6kb9k7ZWo5mL1z3IrLrl5H3bLrMc947XK+kONVu8xF3Ozf5VdWoleVrnY83hStR1wK8rLXHDSuRJ+shytXFjF4mmPHakyt9BFSx9vtbvJypJLlmISFAdbZEFZ4uPd78LwQ9urggXYpe4efpmLsGrjiy+eDvEoJUR+b1OFz0+PfcrjIC53YegRd8d+2pPTKInIW1aXepKbJs9k3u3Z1bOCQDVVi+JxSuR+Zl+VveJrsjMm+3S1C7MHrp1ulzmzZ11Ar3ARXFnfb3DR7m63/NN1c+ykJzJSVmqfp7UulL35ymkeX7I6rOftbs1X6uLkFX78IWeoJEKyQD1flBDKLYm19t58WWlwi27w6+l6j5+4Ruvfr4uRFF1P+1xQXuttNrnr9+NuxXvaxfx1Lu6935PkfMhjNL7k14Cu87e4ECjhTwmW2jyeZO9y2N36X/Rjb1tSZB+8aYbHdnQrXxfL3+8vH3acbvLndJJn5vZM4t7/xR6GYLWvbVk/3+BxJ2VtKmE3rHEXKz9wfZlbgaZ6oqjycK+53o9p9v5J8G7y+5L6oKRAd3gMV4Vh0PW61EMavNdfcjzkou5DHne2d5bwvjhJcDzumbuVFMfMrat9/non4RkJ3wk+d+C3MRPcQZqHwHgQSGQhcjz4jlkb2nBpgyTrL2WflvWjNmDaXEXJULTxl9WYBKPeWUAjlz9t0vsSB7RB03cSL2NjGGqDrw1zJP5oY6dNqjaHcg//8z//8yCoSRCNMizrHFnyKIupNtESOFT0vTb8EjD1XWw773//+8N3sujSZlYbfm2AZW0oQUA/l4gZJZ7QsRL4tFlW/DJZRuqjOmVFI9FWcd40Vo09Erh0vgQcna8xXSxWS2TRKCZi019sR83Npz71qfOu4qo7Yqw6JCQpg7is/yQuyXpRG2d9p/7IUk1JE2Ljnul8CSN/+Ed/GIQ6HS+xWSKJhNZITFSf5J6tjbb+rnMii0kxV/1aN1on4qk10ltI0HliJUFJFpESmPSJzle//vf//t/nLVj18yhxSRS/tK+FL+FGLHSM1kc0B+qHRGT1SWEGFLNNLrUSGgayYHvwwQeDYCNBVwlvJLRp/UWWuhI0tV4lePSVLVnZzSU2aC5kYSiWOlcixj333GN/9Ed/FPhFbtmRZarGIW69hVLNk87VGGO/1xijeKV9JUvRz6J1FblRqx+qQ5mUJdpIFNKaloitouMksP3FX/xFmOdIaBMzCa9a1zpXgn5klaZztL7EViJSbNF4JRxK3NEciKUsznTtaZwas+qMnRNdS+94xzvCz/75n/85WLXKGltF30kglVB5/fXXX3C9RNedmPTl8h77/VAT3GiMmnd9NO6S4pLQx/7ch2VNrX5IhNY49G+xVDIp9e3//NX/8QDz515wRJm5xUrjlCVof0JcLFudJ3ayHtDYeo9Za0Yvi5TBWde26tUcSIjU3Oq+qj5JiJQYqvMV81JWyboH6AWB6ojuX+kZ6WG+5Jrc13pTXRqzRPfo+yhBkn4e1RO5WmrdS3zUR/dfXVO6d/S+B0b39OhlgBgMFJdX9wX1PRLS+zte6zDWwlwvfHSOrl+9LJHlre4hkbAry249L3R/iF5wybJTx+hai3XDHqiPY/Ygp2IIDJOABAAJTYtcGPjNG2bZde56K9fMHS5ifdktGF9wgaTWRa2BioQHCQezXChc5RZNkQip81TfPBdwrnRxcpOLiNUuMjxwaXFw//y6Zx3+rie6UGKZeX7e3WunhazBkSv4/auK3ZrL7BsvnrJvPncyuMre7FmzlV1XceqyPCtuf+XNLuLVu4Cx2a0fv+6VKHHMQnef/vx7ltofPXTY/sutt2RlVeJi5P0unn7Mx99fyfD7ueJSxmYMV6ZiiTKPubCzwQW+bP9+yUx/NnqfW0Lcvl/VttK5XOXj3+3C6Ls9q3Vst+/wsbS5ded/OO+vP30yWI1lunj4bs+q/f6rprsw6S7fzkwxKAtDso8LhWG5wXe62BvFvJTl4/tdXPrqUyfsv547HSzM3nX5NPuQi0WKr/kDz6L88Ppzz//FLpr91q2z7TaPAVqam2ofdPdZMfuJf/8TxdTzzsxz8eddnqn7hgW/cukeaD3E2/dX+rqva+v07M8tF4iQGkdIfOJWdbe5dWKJW/3t8UQ2z++t8yQ+hZ7IZq59c1O5fcMtWOU+/dj2miAyv8MFPbkv//NPj9jfPX7cfufOOfaH984Nmco3HmtyF+22kBhIIr0sLF9xgf5fXYD8Tc8g/8f3nHvpL8vUr7lgvuM1kbvB3ZGVFKndheOoyLVfP1NR3X0VZfX+il9nH3eLwKtuy7UzbsX71OYz9oS/bJDL/cd9rbzbk0uFfrhg909PnrRtnkm9ryJR79vPn3a37bP2Xl+b71wz3cXNbnvOXan/4RdHrNEZbHQ2C+Xi75nr7/NrQZaXv/T7yDaPO6r4jgrjsNdfDvw4jHeWff7dy1wTP2v1fs085NfSk+7Crlice5o77Gve99+4aab91QOLwkuRep+jn7tQ/nPP/l3rltyDLRIeq6taBnt4PB2HEBlPs0Vfx4xAXFsFjoRKRU3jl6cV5f7mSOqYDOdqcyYhUBssWaBo4ylXP4kn2sRKIOpro6/jJTioRNY1seOJvo/ExFgxQN+pTW38JIZF4lLk+qw+qV19Yje02kDrHIla+rs2kRJSI5fj3iKg2pEbstqQyCrrpGg86rs2j1FCh6jvUSZxbeJ1jjjIKlACkdrUOdF41V6UEEd/12Z1oKDRql/n9MUlll+UWToScdRmbN36XgwlmklIkLgUucJGImdvASbKUq0+SITVnxILeycbieZOx/c1D7Fj6Gvuo3FE86y2ZHknIUdinua7r/FE9WpO+hJpxaK/eYt4iEnEdrAxGaNztVZkhScxUWsqSvYShQTob24jt1MJS7KgE0+5Mkus0LqJPS/2eutrnNH3sfMunhFL9VV19h5b7Jz0vmaj8Un01zrR9SCxTXMRvUjoS6yL4onqeImREl5k2Xmxc9RP3UN0jkQfMdB9JHY9q3+9X15EcyuGEjB1jNqSxZ6O7d2/ga478YjWwmCuy9734oi3+hUJbP0Jmr3HFnvfitaG+OneFVnqRjFTdW6UBf5izwMdJ+vs2Ptt7/UYxTWN7muxWcajPkooVj80/5obiYjRmlM/IsHtYtfauY1P39ditGb6EubUX33UTiyj3uPWuhmMpWh0XcZeUxdjqHZ7r6XoXImLEnB1r9I9X8+KKNN97LzH3mcG8/yO+jiYYzkGAn0RkKXVNX++PsQ0+5ePXWoPusg2GkWZpE+65d1V7hIsy6XIYkmihGIWvurWXLL+epMLChe/N7nlox+v8ySIxSam0HlRfXJdVQIbfS9BotHHU6u4kP732e4+rM1E92vHqC/aZUtgket3rYudTS5WLHBhVAlu9J3rg+eT3fTun3QZxaardsuuLr9XzVH9qtN/rr4qU3SLCypyz1Z26ZDwo59Bqq4ohmMk+OlQZc6WtaLGoOQfszzpS1QkWkYcor7oTw99+bo+a8xKElLj9SgOX4En5ynxfkmQVZ+i8zXm6GdRO0HM8n8oJl/ETElRNHZZt+W5qKls2hp3l/+fYoEe90zcKsq+Lbdsuc9G7bS50CXhs85ZK0NykQtGSq4SJRUaybr7+2dO2t/+4ID/3p5jW/70qiFX9T9/cdS++MiRIZ830AnJr8XhFKO+kpfoe82lhL8QF9H/keLrWNnP9bN2ZxX9XLEd09xaV67a7T6fOk9xFHN9bZx7hrsbt4vwoT4X2aPnpI6Rxpzhc6+4obKw7PD5i/pzvo/qgzqq4nVo7lSCENmPLKW6lYlabba71aFcycPpykLtbRW4q7SyvQc3c5//i75U03i011HCGxfGleSpwYXD2Paj9iTOK8ZlY0P7+WsvOk7HpHrbGb6+0j2ObJuLjOIobtE41F+91NUxmb4W1Ufx63F+EYKB5nY8vl+5tMie/PRl49HUBW3UNrT8VnFBzpfGvWEahMAkI4AQOckmZCTdkfCmjXMkFAxWyBlum9oEqj21M1irpVirFp0Xu9nuqx+R+KbzBuvWGbuZ7ks0Ge54x+K8SGCIOPYl2vTVbiToDcRvNPo8WPF1NNoaSR2RyCCWWo9aX4O9BiJhZqjzMJL+DvXcWJFzICE8tu7omutLyBnomhvKta26JPZHAuJkv/YGyz8SCDUuCVMXE+EGW+dwj4vuuZrLKFTFcOuaSudpjiLxWvPTn7X6VBozY4kPAmMlREpI80edZ7Du+9d4ZZqWiBdr4TiaxCQmSJyUjZdiLPZXgiDpx0mjUKy5oZSgz+iFc6/zNHZPOhzETFlaDrdIRBRD9xx/XRtDqTMSXSURpeplzfC7dL5ZjT0IYTEdUTuyoFRRFu3ezZxnrTG9xmYUuhLam6xC5FDmKfbYaNlcIIrF8I79uYQ3lSDyXcSOLbxc1KF+3GiKbX329bXBSOTUtTAUq/5IYO1PvB3o+4ijuJwbbv/jDS8w/foaah+HO69DPW8ChciPuhD55aH2l+MhMNUIJLJr9mg9nyfNmohcOserQ9FmeCjt6Zyh9DO8vRyCoKS+qI2hxIMbSv9H+9jIEnOo9Q5WlB1qvX0dr7bGs73h9jkS54bT11hrsuG2P9bnDcbyrq8+jMc1F7UrAWiqiUBaV5PlfjKce+5Yr8vJUH9k9TrV1t5kYEsfJicBiX8XCwEp6z+PZjhmnQ8WT/r9bIAW9It2OG4Yv3EH/acPoTEInwOHvxxw7KFfo7ALCmOUhdqALQ7+gL7ETLVzsSzo51mPwpgG39P4PLJPobAfnbEvS8u+Rj2QUDlcUhcTNXt6ZWwfTBtBgLzIeQN9H7UhLgP5FweRckrklhkM2SEdMxC6IVXGwRCIVwKj8CiP16H368kRtwOi4xCAAAQgAAEIQAACEIAABCAAAQhAAAIQmKwEElmInKxzQr8gAAEIQAACEIAABCAAAQhAAAIQmFoEsIicWvPJaIZJIJGFyGE4igyTMqdBAAIQgAAEIAABCEAAAhCAAAQgkMgEECITefYZ+3kCiSxEsgwgAAEIQAACEIAABCAAAQhAAAIQgMB4EFCeLwoEEp4AQmTCLwEAQAACEIAABCAAAQhAAAIQgAAEIDDGBLCIHGPAVB8fBBJZiOQmEB9rlF5CAAIQgAAEIAABCEAAAhCAAATinQAaRLzPIP0fFQKJLESOCkAqgQAEIAABCEAAAhCAAAQgAAEIQAACEIAABAYmkMhCJG8jBl4fHAEBCEAAAhCAAAQgAAEIQAACEIDAyAmQMHfkDKlhChBInQJjGO4QECKHS47zIAABCEAAAhCAAAQuSkC7zbS0ZOvu7LZ/fuqkff+VSohBIO4IHK5oseSUJMvNThlW39NSki3Fz+/uZus1LICcNOoEUlJ9PWcmsj3WqCOlQggMmQBC5JCRcQIEIAABCEAAAhCAAAQuTiAjLcmuXVlsm/fX2t6Ddba7ByGGNRN/BJKSk6ygMN2uXVIwrM4vnZZpi+bn2ZGTzdbZ3j2sOjgJAqNFQOu5uDjLrlqYP1pVUg8EIDAMAgiRw4DGKRCAAAQgAAEIQAACELgYgezUFPvYzbPssdJMO13fbp1YhLFg4pBAqgs384oz7E2Xlgyr99e6CNl682xbf7jeGtoQIocFkZNGjUCar+elZdl236qiUatziBXxRmqIwDh8ahJI2BgFFTWNX5xWlPvRqTmtjAoCEIAABCAAAQhAAAIQgAAEIACByUKgtqHlg8UFOf85WfpDPyAwUQQIjjBR5GkXAhCAAAQgAAEIQAACEIAABCAAAQhAAAIJRAAhMoEmm6FCAAIQgAAEIAABCEAAAhCAAAQgMCEEcM2eEOw0OtkIIEROthmhPxCAAAQgAAEIQAACEIAABCAAAQhMNQIIkVNtRhnPsAgkshDJTWBYS4aTIAABCEAAAhCAAAQgAAEIQAACEBgiATSIIQLj8KlJIJGFyKk5o4wKAhCAAAQgAAEIQAACEIAABCAAgclGoGeydYj+QGAiCCSyEMnbiIlYcbQJAQhAAAIQgAAEIAABCEAAAhBIPAJoEIk354y4DwIIkSwLCEAAAhCAAAQgAAEIQAACEIAABCAwtgQQIseWL7XHCYFEFiLjZIroJgQgAAEIQAACEIAABCAAAQhAAAJxTgAhMs4nkO6PDgGEyNHhSC0QgAAEIAABCEAAAhCAAAQgAAEIQKA/AgiRrA0IOIFUKMQngbPhFnbW/wt/UCAwfAJJZv4/S0rS/1MgAAEIQAACEIAABCAAAQhAYAwIsHMfA6hUGX8EECLjb86su6vHqmob7FRljbW3d1hXN8m34nAaJ02Xs7MybHpxoU0vKbD0dG4Jk2Zi6AgEIAABCEAAAhCAAAQgAAEIQGCKEUB1iLMJ7ezsstOVtXa6otba2jvt7Nke/8TZIOjupCLQ2N1qHR2d1trWZvNnlyFGTqrZoTMQgAAEIAABCEAAAhCAwBQhgAvaFJlIhjEyAsSIHBm/cT+7tr45WEO2trVbTw8i5LhPwBRssKfnrLW1dVp1XbOdrqqdgiNkSBCAAAQgAAEIQAACEIAABCAAAQhMBgKJLETGpR1hfWOzNTe3YwU5Ga6eKdQHXQztbhVZX980hUbFUCAAAQhAAAIQgAAEIAABCEAAAhCYTAQQIifTbAyiL51d3dbd0z2IIzkEAkMjcNYtbNvd9Z8CAQhAAAIQgAAEIAABCEAAAqNOANfsUUdKhfFIACEyzmYtJTXZkpMTedribMLiqLvKmp2SwtqKoymjqxCAAAQgAAEIQAACEIAABCAAgbgigOoQV9NllpOZaZnp6XHWa7obDwSUMbuoIC8eukofIQABCEAAAhCAAAQgAAEIxBsBLCLjbcbo75gQSOSs2XEZI7KstMBj+XW4C22HdXeTrGZMrooEq1RPw2S3hMzLybJZ04sSbPQMFwIQgAAEIAABCEAAAhCAAAQgAIHxIpDIQmRcvo1IS0u1OTNLLSsz3U6dqbHG5rbxWiu0MwUJJCcnuYVtqpUWF9isGSWWkZ42BUfJkCAAAQhAAAIQgAAEIAABCEw4gbjUICacGh2YcgQSWYiM28lMdzFyWkmhFebnulVkXBp2xi37KddxD86Q8lpsSK0rCgQgAAEIQAACEIAABCAAAQiMCQGEyDHBSqXxRiCRlYe4vQkoqUhaakr4UCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgEA8EEjlZTdwKkfGwsOgjBCAAAQhAAAIQgAAEIAABCEAAAucJoEGwGCDgBBJZiGQBQAACEIAABCAAAQhAAAIQgAAEIACB8SCAEDkelGlj0hNAiJz0U0QHIQABCEAAAhCAAAQgAAEIQAACEIAABCAQ/wQQIuN/DhkBBCAAAQhAAAIQgAAEIAABCEAAApObABaRk3t+6N04EUCIHCfQNAMBCEAAAhCAAAQgAAEIQAACEIAABCAAgUQmgBCZyLPP2CEAAQhAAAIQgAAEIAABCEAAAhAYDwJYRI4HZdqY9AQQIif9FNFBCEAAAhCAAAQgAAEIQAACEIAABOKcAEJknE8g3R8dAoksRJ4dHYTUAgEIQAACEIAABCAAAQhAAAIQgAAELkoAIZIFAgEngBDJMoAABCAAAQhAAAIQgAAEIAABCEAAAmNLACFybPlSe5wQQIiMk4mimxCAAAQgAAEIQAACEIAABCAAAQjELQGEyLidOjo+mgQQIkeTJnVBAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACfRJITWAucRsj8uzZs9bZ1W2dnV3W3XPWzp7tSeBpjP+hJyelWFpaimWkp1pSEi/J4n9GGQEEIAABCEAAAhCAAAQgAIHXEWCzx6KAgBNIZCEybhdAe0enVVQ3WHlFrbW1twcxkhK/BDIz0qy0KN9mlRVbdlami5HxOxZ6DgEIQAACEIAABCAAAQhAAAJ9EmCnx8KAgBNIZNfsuFwAHR1dduJ0lR05ccaaW9sQIeNyFi/sdFt7p52qqLE9B09Ye0fHFBgRQ4AABCAAAQhAAAIQgAAEIACBXgQQIlkSEECIjL81UFVbb7X1zdbdjTt2/M1e/z3ucavWltYOO3y8wnp6mNupNLeMBQIQgAAEIAABCEAAAhCAgBNAiGQZQCDBhci4vAk0NLZaS1s7i3cKEuh2AbKxqcUI+TkFJ5chQQACEIAABCAAAQhAAAKJTiAuNYhEnzTGP/oEcM0efaZjWmOPJ6rx/1GmIAElIero6jLsIafg5DIkCEAAAhCAAAQgAAEIQAACEIAABIgRGW9rQNmVU5LRj+Nt3gbT32TPUpOZns5FORhYHAMBCEAAAhCAAAQgAAEIQCC+CGARGV/zRW/HiEAiK1pxaVeYn5PjmZUzyKw8RhfERFabnp5i06YVWFIKz6eJnAfahgAEIAABCEAAAhCAAAQgAAEIQGBsCKSOTbXUOlYEiotyrb2rIyQ0aW3vIGnNWIEep3olOSYlJ1m6W7oW5ufajNJCk2UkBQIQgAAEIAABCEAAAhCAAAQgAAEITDUCCJFxNqNpqSk2e1qJZWWkW3lFjTW1kLgmzqbwgu4mJyVbmltCFrkIOWtGsWWkpcXzcOg7BCAAAQhAAAIQgAAEIAABCEAAAhDolwBCZBwujpTUZJtWXBA+FAhAAAIQgAAEIAABCEAAAhCAAAQgAAEIxAOBRI4RGQ/zQx8hAAEIQAACEIAABCAAAQhAAAIQgAAEIDAlCCSyEBmXyWqmxKpjEBCAAAQgAAEIQAACEIAABCAAAQhAAAIJRwAhMuGmnAFDAAIQgAAEIAABCEAAAhCAAAQgAAEIQGD8CSSyEDn+tGkRAhCAAAQgAAEIQAACEIAABCAAAQhAAAIJSgAhMkEnnmFDAAIQgAAEIAABCEAAAhCAAAQgAAEIQGA8CSBEjidt2oIABCAAAQhAAAIQgAAEIAABCEAgEQkkJeKgGTMEehNAiGRNQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAmNOIJGFSN5GjPnyogEIQAACEIAABCAAAQhAAAIQgAAEIAABCJwjkMhCJGsAAhCAAAQgAAEIQAACEIAABCAAAQiMBwH0l/GgTBuTngAXwqSfIjoIAQhAAAIQgAAEIAABCEAAAhCAQJwTwCszzieQ7o8OAYTI0eFILRCAAAQgAAEIQAACEIAABCAAAQhAAAIQgMBFCCBEsjwgAAEIQAACEIAABCAAAQhAAAIQgMDYEsAicmz5UnucEECIjJOJopsQgAAEIAABCEAAAhCAAAQgAAEIxC0B9Je4nTo6PpoEuBBGkyZ1QQACEIAABCAAAQhAAAIQgAAEIACB1xPAIpJVAQEnkMhC5FlWAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIDA+BBJZiBwfwrQCAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIJLRFJNMPAQhAAAIQgAAEIAABCEAAAhCAAAQgAAEIjBMBLCLHCTTNQAACEIAABCAAAQhAAAIQgAAEIAABCEAgkQkgRCby7DN2CEAAAhCAAAQgAAEIQAACEIAABMaDAMlqxoMybUx6AgiRk36K6CAEIAABCEAAAhCAAAQgAAEIQAACEIAABOKfQCILkWTNjv/1ywggAAEIQAACEIAABCAAAQhAAAIQgAAE4oRAIguRcTJFdBMCEIAABCAAAQhAAAIQgAAEIAABCEAAAvFPIJGFSOIzxP/6ZQQQgAAEIAABCEAAAhCAAAQgAIF4INATD52kjxAYawKJLESONVvqhwAEIAABCEAAAhCAAAQgAAEIQAACIkB4ONYBBJwAQiTLAAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEBhzAoksRPI2YsyXFw1AAAIQgAAEIAABCEAAAhCAAAQgAAEIQOAcAYRIVgIEIAABCEAAAhCAAAQgAAEIQAACEIAABCAw5gQSWYgcc7g0AAEIQAACEIAABCAAAQhAAAIQgAAEIAABCJwjgBDJSoAABCAAAQhAAAIQgAAEIAABCEAAAhCAAATGnEAiC5HEiBzz5UUDEIAABCAAAQhAAAIQgAAEIAABCDgBNAiWAQScQCoUIAABCExlAt1dPdbR1WVdXd0DPvmTLMlSUpIsLS3N0lIT+T3NwCvi7Nmz1ulM2zu7zHrODsg2JTnJUlNTnGuqJfvfKRCAAAQgAAEIQAACEIAABCCQeAQQIqfQnEsY6HLBpbu720eVZMkpyWHTn5TEpt/RWJsLUmKUmZZio6WD9EiMEW4vGalTm3O0vsQyPT3tgitHa667u8cFvMm33uoam+1EeZXV1Te7Xnbxl5DJycmWm51ps2eU2IxphWN6d+jpcYG0s/N8G1o9yckpQazTNSvera1tluL/TndhdLyvY7Wv/qUmp3ofXi/KdrgAebqizo6frvD7Ts+ArLQ2ppUU2KxpxZaXmzng8RwAAQhAAAIQgAAEIAABCEAAAlOPAELkFJpTiRavbN1ue/YdCKNaumSRXbJqhZUWj62gEg8I69q67Afbqq2ptdPee1WZzci7UEgb7hiO1LTb9lPNlupWdG9cVTzcauLivNraetu5e691dXfZLTde55aDKef7rTV38mS5XXHF5ZNuvVVW11t9Y8uAIqQGI3GwqbnVTpyuGlMhstMFvtPlFfbiSxtCmypp6em2YN5cW7Z0kRUW5FtDY5N9/l++apddtspuvP5qKy4a3+u4tq7eXnx5k61YssTmz5/9OvG5vV1CZPWgREiNr9OFy4qqWsvNSkeIjIsrnk5CAAIQgAAEIAABCEAAAhAYfQKJLEROmfgMsvI64SLQ177+HbegarHc3Jzghrpn7357ef1m+7V3v91mzy4bd4uq0V+uw6uxtbPHXjnRaJ97+JClu2XXNQvzrSQn1dJGwSzyeG27PbWvzutNACFSwtRLG23/gUNWVFBoK1cssYyMjDAp+/Ydsq2v7rTFixYMKES2trXZcy+8bKdOn7E33H2bzZxRNryJHeRZncFKeGCLvag6XU8SW8ey6Po8WV5uP/v5E7Zi+TLLysqwlpY227hxiy1auMDe++4HLcWtM/P8WhafiPNY9ql33XU+3888+4JlufXr7Dlllm4Xivc9Z3usvWNonGQ52e1u3BQIQAACEIAABCAAAQhAAAIQSEwCiSxETpkZ7+zosG9/50fBYummG261ObNnBrfOI8eO2+Yt2+1HD/3MPv5bHzQJQCdPnrZppcU2bVppcOGub2iwY8dP2vKliy0zMzOIlRWVVeFnsmCaP2+2zZo5I7Cqq2+wev8kJaVYdU11cCGdMX2anamodAFqoZ+fEc7XubLOLCkuttLSognnfLK+3Z7YU+eWWKnW3Nplzx+ot3mFGTbXPx1dZ03fH6vrsNWzsmz90aZgObe4JMuPSbfs9BTrdOGkoqnTtpxospb2bptXnGmrZmRbfkaKdbg1W6NbW6a5RWSVH7P+eJNdOiPLZuZlBHFSPyv3T4Z/Pys/3Z45VH8Bjwx3n59fnGFLS7NCu/Ve19P7G9ylPsmWlGTavKIMy/E+VHodB6vbbHZBmu0ob7WS7FRbPj3LCjLH7xLudkFP81pf32jf/9HD9tEP/5rNmzvb3YmTXZDqsOaWlhAaICrHjp+w8oqqIKhpTZb5WglWcZXVtm37bjtx4pS76hbbdddd5eJlUViPNTV1dtTP88gCNm/OHF9DhectL+sbGn39nvJ12GRFhXm2zC31+nIZ7r3gdC30Ll1dnbZ/315LdZfn2bPnWnZ29gWHDODBPeI1rYiKXR2d1tjQZLfdcr2LjdMDm/UbXvHr9oRtdcvma6+90pYsWRgsIVPd+vTIkWOW5Czlpn3cOWhUyxYvsgK3nlTMxUOHj4ZQDLJUPXHqtDNMsqWLFwbrysitu6qmNliutra1BvYSjmPLMW/71JkKy8rM8rnstKam5uCe3RdDxdru6+e6N3S2t1txaan3Nf11rJAhR7x8qAACEIAABCAAAQhAAAIQgEDcEhg/FSNuEU3ujsvF86gLf9t37LJ3v/MtdsWa1VZUVBA6XTqtxJqbW4LV1ZkzVdbm4sAvn3jWrrpqTRAiZZV17NhJ+8kjj9knPvrrwerquedftn1u8SahosetyLbv2G1XXXm5rb18tR05eiIIJU3NzaH+VSuXhph2Dz/6hN11+8225vJLQpKPDZu2WocLU1dfuXZSCJGnG11EPNpot7jr9Om6dnv1RLPdtrTjnBDpY9zs//7GS6fthiUFVtXcZcerW60wO81+7eoyu2Vxvm072WT/sd7Fm46zVpyTZo/urLFblhbaPcsLzy8OheFs6z5rP3yl0o4vzLMHV5cG9++XjzXaiwfrbUVZtt29osi/rzp/Tm1zp4t0Zvf7sbNdpHz1dIt9dd1py0hLdndd5f84a/d6n+9eVmh7K1vtX549ZflZyUE8vW5Rgc3x/heMc6g9ic8lJUUuBtbbs8+9ZPfcfevrLBo7XGB7xQXwF1/e6Oshxc66kCvBb8WypXbVFaut0sXJcrcGbHBhUS7dy1wEz83J9rW2xy14NwUhTWLVc8+97BaTt9vixfODxe+mV7ZZuVtRZmVnWU1tna2+5JjdfOO1lp+fN6SLtNUF0yOHD7nA1m4nT5xwETnNZs6aZRkuxE9EmTtnlgv+c0LTp8rPhBcI5S7ui+O27buChbME/Zf82qt2IXG6X7t6WVBVVWObp79q73nHW8I1v87dqGtqa620pCQcV+2i7oyyafYevy8UOKN9+w+GOnReenqqdbo1o14gvPG+O0Nsz6effdG2uVWrEtBI3BSnjiFaPFacKbc9u3eF+8LavLw+hciJYEybEIAABCAAAQhAAAIQmAQEpnZSgUkAmC7EB4FETgs7JQxzZIFW7hZMXcF6cW4QLaJS4ELAwvnzrNFjzVVVV7vFWpMdPHI0iBQqcq2sd4usvXsPuPjQaSdPnbF1LgTJCmrh/PkeF87P9b8/9stngrBY6+KPYgS2tLS6tdqsYA2nO6liyW3cvNXr6AoC0a49+8LPMjJGJw7jSC6lBrcw3F/RahVu8XjPymK7Y0WxHa1qtVP1HcFFtMvFvpMuTu52wbC1o8etInNsrltDbjnSENy5m9wCsrFNiVjM1s7LtWsW5IXzfrG92nadaTnftWQnIavHHv/usR01wYKyuaPbNhxptF0eQ7IgK82T5CTbmjm54TOjIN1OuYWj2ix268ajtR32gy2VVu79WjMnz9vKs9qWTnvRLSj3uAgpy8odLqYeq2q31bNzbElppmV7feNdZN0oC7sbrrvaduzaa1u27gxzHRVZyDU1NdlPH30sCI2zZ80MYpfW4IZNW+yoC995ebleR4HluPgoES4/PzdY823avC2sR1npLVowz+MJVvm62maVlTW210W03Xv2W2ZWpsc+XegC2/TQbldIzDTE4qpxusdjnDlzdghloE/3a3Eah1jTqBze0toarEklIuoakwCdl5sbrqe9LtRWuCip61uWxodlFemtLl443wXJEn9x8JKLtKeDaHnUrRn1skAWqvpeVqbPuwu8+In/C+s22mlPLBPNiSygn3zmef/ZGb/2T9uz/hKitq7BFsyfa3PdgjUlJdXa3Ip6KEUCZJu/xGhqbHgtadZQzuZYCEAAAhCAAAQgAAEIQAACEJjqBLCIjPMZlgtphyeNkGumrMpk2RQV/T3brcfcfzK4V8oK6mJFFlOVbmm1csUyd6MtdVfRTre8qnQBY0dwyVZSjbMuXl51xWV2+603Blfs027BtWLZEtu6bYe1t7UHEbLFRRX9bFppyYTTPeoC5FZ3qVZYurzMFCtzK8WWVo+f6SLitfPzLCfjnJiXmZFqb7y02K6am+uu2gW2+XB9EP8aXYicU5hp919S4mJiqtW5a3eeu2TvcSvK8oZOm+mu0lHJTk+2+72O//XTI3a6od3nxILIKSvKW5fkW5Gf/7u3zgoC5X9uqrRZ7np9x8oiu8MtHl9wwfEpFzBvXFFg03LTgmu2xMuDLqIqGU6hn5vlfb1haYF98iZPHDKBGbrl/nunW8BK1FJcyFK3kOx6LXW43KvP+Bra4daNn/rEh+06dy/Od+Exw9fKS26xt//gIbv3rtuDiC037yvWXB5ERVnRHnaRXPERFTpAgm5hYaGvp722+tIVblXZE9Z4ltcja721a4rCeswahhVjVlaWLVy82AW+M95GseW7KJoac92M96KVJaOuG4mJcpvWdbN0yeI+uyERWDxkRSrh8amnXwiCrNy6VUrd3Xrt5ZcGsVaxPJ946lmr9+8lburfxS5Ozpsz09Iz0q3dLaT14uHw0WPh742NjUFgvt8tJFNcUFRdL63fOCQcpdOmufXmNKurqxvSeRwMAQhAAAIQgAAEIAABCEAAAolBIJGFyClhFq3Yb9nZGR6jzy3w3A1bQpAsrCTyJCUlB+tGxYrLcAswS7rQCFQiZpSxV8u9uromnCdBUu6bKm0uLioOpBJp6Hi5XsvqUiKkSkF+fsjyq+Qjchfdum1nSGSy0C3astx6baLLoao22+lCZEZakj2z/5zlXlZmsm12i8erZOHoYqRKqotcpS4YKjihXLYz3aVYRdaPDS707q5osQMuXtbIddvrbPGf9S5Zfs69Liz+5cNH7KBbXR71jNpitnJmThAhVSSIPuOu2g9vrbTLXPS8zV28FWuytfOs1bhoudMFzgoXODV39W4RmRkjOKb639U3/2pCi9acBLE3vfEu++73fxosI5XYREWCd3OdXPfPhnWhZCsqeXk5biGbbnWeebuvIss7id1HXBSTVaCK4pcm+bxIgFy2dIlb7ZXbVndVPuF/5uVmeyiA1cFqMNMhRzEQBwOm2xPRVLm15fqX1rkgOt9y3XJYMRgnqsgSVPFddW0tcCvkGz1m5rKlC03xHHuXjPQMv66yg9Wjrq88tyZNVlyA10qmh1fIfu37kODG15tCMrT7eHVvkOXjcy+sD0eLnVy3tUglZubkyAW8+Ly4K8G3d+zMiWJEuxCAAAQgAAEIQAACEIAABCAwNQgkshA5JWZQ4o6snyRKyOKpzIWFox5jbtfufSGRRIdbSskFc87cWUF8kWbR6aKlrB3lbt38WrxHwUjx+H+ylLr80kvssssu8Z+cDcepnpKSQrecer12K4tLtT9r5nSPL7criJjXXn1FSE4y0UVJZk7Wt1mlW0VOL0p3K8eG0KVsF/6OuZh4yN2cr5h78fiCh919+mG3VNxwqM4+ftscu8bFyydd0PyWx5TsXZSEO9+Tx1zq4ua24812yoXF+e5CfcOi/HCoREi5bP/5jw/bZfNz7e1rptkqTzijn6f7yXm56XbN4gK7y2NPprrQ1OJWhkpms8gtJ7e5VeRkK7J6vd4tHuVyvf/AYY87WuKWdKlB0JJQVuduvrNmdgaBramxObgfK2FNVM4lOjknjssCr6Agz+OOLrc1l10axEeJk7KklPVkpq/Lt731jW7d1+Dr8HiIh/jl//i2ffb3ftuzTnvSmiEIic3NTbbj1a127MiRsP7zXEzPzMj0tiZGjPzDz3zqfIzIsZpjWbEqjMMiFzpvufl6j4vpMSJdkJUlpa7ftle2eiKnlhD/VYKlbhR6KaHPUEuaJ6iR6/tQxOGhtsHxEIAABCAAAQhAAAIQgAAEIBCfBBJZiJwSFpESfPJdSLnVM+8++cwLymMbXKu7unrs8SeeCdaLt950vRW4e6zcWiW4KNaeLBZl1bhn38HzK3fJokX2oseRy8zOtAUL5gTrtk0uMikO4JXujt2fsCDLK8X1e+Kp59zFs8Pj+80/Z2k1wWX3mVa3fGyyaZ55+jsfWeWJXc4JTcdr2+1j39pnW443uhD5q5iafXW3IcSIdMsxt0R8lwuHEnI3PHbcGpr7jk2oRfXOK6bZl184bbtc+Fw4zYVaz4itIhHyLx49avWNHXbfpSXubu2ZkGvaQuZruY2XFqbZYY8Hec3d8yzXxdJ/W1dudW4VmeVZsydruenGa0LcwlddhFZRXNDp02cGF+CnfD0We9ZrWdadLq8I1qHKzh4VWdtGFrmzZs3whCtFIZbhooWyps2wH3q2dwlhCjmwf//hEAZAyWkkdJ/t6bZtnlk6ckkeCp/8/EK7/c677bY77gprWtanU100W+gxI4s9i32jW01rDS9euiAw/cVjT4d4lGWe4brLE9Ps23fILnExWPEhX3S37HYXg4caTPfSyy53fbnHrVkn77odynrhWAhAAAIQgAAEIAABCIwSgaH+aj1KzVINBCYXAYTIyTUfw+pNulucvfvtD1iqWz0p8+1DD//CejzzrawZleX4jttvCt/pc73HgHv62Rfsn/7ly56QYlZwsY2K3EFvuuEa2+CJZ5QEQ1kxZNl0o59zsSILuDvvuNmefOp5mztvdrBsmwzCzp4zzZ5spsvWuBVjsbtGy2JRZa4Lk6s84UuFZ9PeVf6rhDN9jXHF9Gw7MbfDPv/4Ubv+/252MTfF40pe/LK5dn6+feFpT8risR6Xl2VZaa4n/XDX613lzfboxjNukdptf/zd/e4OfK5DD3h27s/eNdc+cdtc+9dnjtvd/7A1iHY5niH7wSum24LiTO9rx7DWxlifpBiNt7qFXY1naK72ZCsqSkLzMc/C/v0f/MT+z+f+OQjaSqwiQXztmkuD9eLNN15nr2zdYf/3bz9vv/aet9uaNZeEJDdPPP28/fc//otgUakYp+9465vcXVhZoqs9nuFme+7Fl11Uz7Mmt6685+7bPPHKjCFZQ0Y8lFQlkYrm6V7nJXH4i1/5locc6A7X6Fq3Pp0/f3ZgePutN7nb9jr7s7/4m5CZW9arhYUFITnOUEq49pMSi+9Q+HAsBCAAAQhAAAIQgEDCEhjqr9YJC4qBT20CCXshVNQ0/t20otzfn0rTq+zZiu2ozNUSchQfMlg/ujXUm++/K4gNEoyOnzjl2bCbXCjLc9Ew12PzNbp76+IgOlb7uVUu+ih7bpdn0s51kXHunNkuBhV57L56T0RSGWJGSqCIilw5T3niks/84f+0N993j9199y0XuOBOFONTDR12xj+yLlzqlomxZa8ngZHr8zR3h1ZilCMez/FqFyyzXstEvdGzaCtBzFxPVFPT2mmvumt0pQuXSlgz3RPedHSdtSXT3J03NdnUjjTFVWXZoQm5hL/9izstz4/96I0z7bYlBcH9usYT3aw/es49PLbML8q0lX5uvX+/x/t1xkXHJhcrZ3o7y1wInZGf7vEiPfu3x52UKDkzT26v409V2dLLz1QG193Fi+aHNaaiGIRn/OeycFQWbIUJaPW/H/NkKpW+Hntc9CpxC8nZ7q5f5OsmhAzw8ADKlC337QUL5gahUmvylGdwrq2pt/ZOd6f3pC1z3S1bcSa1ls9UVIW1rcQqcv9d4KJ3qR8Tm6CpLyo79h61qtrG0O5gioS0XLcKvuqyJYM5fFjHyBJUWcXFQO7oUczV2Mok4O51i2WxKS4q9OzY5UEUnDFjeji+3UMr7N9/KIRB0LV89Pjx4OKu8Az6vtWtGXfv3u8WpvNDZnL9u8IZVvr1rTiy2Z60R3Mya2ZZECXP3RtO+3VeG8I5lJWVhuOmewIaWbYqY3psqWtotld3Hw5xVAdbUjzUwOJ5M2z2jIlPZDXYPnMcBCAAAQhAAAIQgAAERoNAbUPL7xQX5Hx+NOqiDgjEM4EJkDMmB66pKERGZCXyqEiwkbAjd+1lnoVXcfdUut1tu+dsdxCS+outJ2vK7u6eIPJcLP6eklxsfuVV27Fzt+3ee8A+9pEP2CWrlp9LjjOFSreLWMp2neFirjJW93XhtLs4ue1Ukz22p84e3VJp7762zN5/1XS3iPxVZu3BIFE9nc4+w0XRtMiMczAnTsJj5KqvonUUCZex3ZSoKdfoaG1KLJS7tX4uMa23ZW23C3gdXqcsfRV7cjDlRHmVlVfUeQzEX7mC93eeBN5Mdy8vc+F94dyywVQfd8dEfPu6tnVv6Or2+0eU4Ooio5PYfPh4hVX7i4xuF/UHkiOVVKeo0F9szJzmCa1y444bHYYABCAAAQhAAAIQgMBICCBEjoQe504lAonsmj2V5vGCsSgDr4r+XO6xIXuXFLfiS7GLp16WyDMYnafLRSPF9evw+HJ333lLiD051URI8UtxESV/AJfsHhfRZPVY7klqbvHs2bcuLRiyCKm2MlzozHChbSoUJVO6WOktckt4PLd++xYZZZU31GzsJYX5lpaaFqw0Zf16sSIhMj091QrzLx47NJ7nRgJkf1ak4d6Q6tm2B1E0T7NnFLvVdFYQjgcyOJXYnOfH5mQPrv5BdIFDIAABCEAAAhCAAAQgEE8EEtYQLJ4mib6OPQGEyLFnPKVbyM3L8SzHl9jSRQttgScZyXGhIVGLYj4u88Q077pyui1zV3DFhqRMPIGszHSP7Tm1LHQnnqoynSd7vM6c8KFAAAIQgAAEIAABCEAAAhCAAAQGQwClZDCUOKZfAkqCsdAFSIrb8LnF16KSzPChQAACEIAABCAAAQhAAAIQgAAEYggMFM0IWBBICAIX989NCAQMEgIQgAAEIAABCEAAAhCAAAQgAAEIQAACEBhrAgiRY02Y+iEAAQhAAAIQgAAEIAABCEAAAhCAAAQgAIEBMpYACAIQgAAEIAABCEAAAhCAAAQgAAEIQAACEIDAKBBIZItIMlaNwgKiCghAAAIQgAAEIAABCEAAAhCAAAQGJIAGMSAiDkgEAiSrifNZ7uk5aw1NrXE+iuF3/1h9p71a3jb8CqbYmVlpSXbHolzjCTfFJpbhQAACEIAABCAAAQhAAAKWkpxsmRnplpaWyDZVLAQIxDcBhMj4nj/r6u62+ubEFSI3HGmyr6+vjvNZHL3uF2Sn2hXTZ5sn8KZAAAIQgAAEIAABCEAAAhCYUgQyUlMtNTXZhcj0KTUuBgOBRCKAEBnns52SlGxZmWlxPorhd39aXoYtLMsZfgVT7Mz8jHPrASFyik0sw4EABCAAAQhAAAIQgAAELC0lxVJSsIZkKUAgngkgRMbz7HnfU/xt0PSi/DgfxfC7/xYf+1vWzBh+BZwJAQhAAAIQgAAEIAABCEAAAhCAAAQgMC4EeJUwLphpBAIQgAAEIAABCEAAAhCAAAQgAAEIQAACiU0AITKx55/RQwACEIAABCAAAQhAAAIQgAAEIDD2BIjkP/aMaSEOCCBExsEk0UUIQAACEIAABCAAAQhAAAIQgAAEIAABCMQ7AYTIeJ9B+g8BCEAAAhCAAAQgAAEIQAACEIAABCAAgTggkMhC5Nk4mB+6CAEIQAACEIAABCAAAQhAAAIQgAAEIACBKUEAIXJKTCODgAAEIAABCEAAAhCAAAQgAAEIQAACEIDA5CaQyELk5J4ZegcBCEAAAhCAAAQgAAEIQAACEIDAVCGAV+ZUmUnGMSICCJEjwsfJEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAwGAIIEQOhhLHQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAiMikMhCZNKIyHEyBCAAAQhAAAIQgAAEIAABCEAAAhAYHAFcswfHiaOmOAGEyCk+wQwPAhCAAAQgAAEIQAACEIAABCAAAQhAAAKTgUAiC5GTgT99gAAEIAABCEAAAhCAAAQgAAEIQAACEIBAQhBAiEyIaWaQEIAABCAAAQhAAAIQgAAEIAABCEwgAcLDTSB8mp48BBAiJ89c0BMIQAACEIAABCAAAQhAAAIQgAAEIAABCExZAgiRU3ZqGRgEIAABCEAAAhCAAAQgAAEIQAACEIAABCYPAYTIyTMX9AQCEIAABCAAAQhAAAIQgAAEIACBqUmArNlTc14Z1RAJIEQOERiHQwACEIAABCAAAQhAAAIQgAAEIAABCEAAAkMnkMhCJIFih75eOAMCEIAABCAAAQhAAAIQgAAEIAABCEAAAsMikMhC5LCAcRIEIAABCEAAAhCAAAQgAAEIQAACEIAABCAwdAIIkUNnxhkQgAAEIAABCEAAAhCAAAQgAAEIQGAoBPDKHAotjp2yBBJZiOQmMGWXNQODAAQgAAEIQAACEIAABCAAAQhMKgJoEJNqOujMRBFIZCFyopjTLgQgAAEIQAACEIAABCAAAQhAAAIQgAAEEo4AQmTCTTkDhgAEIAABCEAAAhCAAAQgAAEIQGCcCWAROc7AaW5yEkCInJzzQq8gAAEIQAACEIAABCAAAQhAAAIQgAAEIDClCCBETqnpZDAQgAAEIAABCEAAAhCAAAQgAAEITEICWEROwkmhS+NPACFy/JnTIgQgAAEIQAACEIAABCAAAQhAAAIQgAAEEo5AIguRZxNuthkwBCAAAQhAAAIQgAAEIAABCEAAAhCAAAQmiEAiC5EThJxmIQABCEAAAhCAAAQgAAEIQAACEIAABCCQeAQQIhNvzhkxBCAAAQhAAAIQgAAEIAABCEAAAuNLgBiR48ub1iYpAYTISToxdAsCEIAABCAAAQhAAAIQgAAEIAABCEAAAlOJAELkVJpNxgIBCEAAAhCAAAQgAAEIQAACEIDAZCSAReRknBX6NO4EECLHHTkNQgACEIAABCAAAQhAAAIQgAAEIAABCEAg8QggRCbenDNiCEAAAhCAAAQgAAEIQAACEIAABMaXABaR48ub1iYpgdRJ2q/x6NbZ8WhkItvo6emxjo4O6+rqsu7ubktLS7PU1NTwZ1LSxe+BbW1t1tjYGI4rKSkZ8PiJHCdtQwACEIAABCAAAQhAAAIQgAAEJjkBhMhJPkF0b3wIJLIQOT6EJ7CVyspKW79+vR0/ftxOnjxpy5Yts9WrV9uSJUusoKDgoj177LHH7Etf+pKlpKTY17/+dSssLJzAkdA0BCAAAQhAAAIQgAAEIAABCEAgrgngkRrX00fnR4sAQuRokZxE9Rw8cNC++a1v2o9+9COrrq629PR0y8jIsIaGhmDZeM0119hHP/pRu++++0Kvq6qq7OMf/7jJgvLP/uzPbM2aNZaXl2dz5swJ1pP5+fnjPrq/+Iu/sOeff97uvfde+8xnPjPu7dMgBCAAAQhAAAIQgAAEIAABCEBgFAlgETmKMKkqfgkgRMbv3PXZ85qaGvvil75ojzzyiM2YMcM++MEP2qWXXhpcstvb24OF5LPPPmv/+q//ak1NTXbPPffY008/bRs2bAhC5KOPPmpZWVnhs2rVqiBIyrX74MGDdujQoWBNWVFRYWpn/vz5tmLFCjt27Jht2rjJpk2fZtdee+154VL167zdu3eHemSNOXPmzCBuqpSXl9uuXbuCEFpWVmaLFi0Kfd6xY4e9/PLLtmXLliCgqs6bb745nLNt27ZQ59mzZ0P76o/qVh06R/XIivPUqVM2ffp0W7lyZej/5s2brba21q677jqbNWtWGPvevXtDnUVFRXb06FGrr68P38f2cYotjyEP57nnngt8xTEzM/N157/00kvBWlZzp7karaK1+Pjjj4e51/wMpmg9vfLKK7Zz587Ql7e85S1hrrXeNA6tw95Fovzy5cstOzu73yYkiKteXRM6XkJ9bNEaVv1ad1dccUW4bnRsVNQfXXd6KbByxUq74cYbrLi4+Pz3Z86csRdeeCEw1rkUCEAAAhCAAAQgAAEIQGBKEkCInJLTyqCGSiCRhcgpGSPyO9/5ThAWFyxYYG9+85uD+PG9730vCCMSkhQrUmLH/v377cc//nEQmb7//e+H4/Tdt775rSDmJScnh3pKS0vtbW97mz3xxBP2wx/+0JYuXRpEPgl/ixcvDkKkBEMJeRJzPvCBD9gDDzwQYlM+9NBDQdhsbm4OYpDq+vSnPx3Emq1bt4b6tm/fHtpqbW0Nff6zP/0z++53vxtEIwmDEoC+9rWv2ZX/f/beAzCOq1z7f7XSrnqXLPdeYjuJ7Thxei+kQiCBhBB6Lr3fe6mXDwIXPj7+3HvpBEguBAgBAoQkhJDee5zikjjuVZZk9S5t0f99jjzOeDy7O7taSVueA5u1dmZO+Z0zszPPvmX1arnrrrvklltuMfVBqEJ7ECivvvpq2b9/v3z729+W5cuXG4ET44ElJ8ZaWlpqxFcIsejvN7/5TYH485vf/Ma4rWO/nTt3SjAYNOLmV77yFXNcKoW1RE/MdNkfYiDm8sorrpQ1J645rFsQo3/961/LihUrjHibSl5Yi3feeafMmzfPkxCJ+YOYhxAEOAbxTX/84x/LRz/6UTOnEAktARyDQAzU+++/36wHrCW3ArEb586OHTtMH7AfzgmsdYic+PvJJ580L4Q6wPifeuopc25hTWI9QahFvyCKz5g+Qza9vkmampvkXe96l1n3Dz74oDl/IFS+973vpRCZLguf/SABEiABEiABEiABEiCB1BPISg0i9ZhYY7YTyGUhMuvmFsIdhA2ILieccIIR7O6++25jPQixDRaNEBkhgsBFGyIfhBsISQ899JARVo4+5mgjCEIohGVifX29EVQgvsAaEWILrMwg/OEYCHkQ/1AgWkFshNC4adMmI+LAHfz88883Foh33HGH2Y7kNxA2ISyifrhfY38IiI37G43ACeEHlpfoLyzQ0AdYQkJgQn/7+/uNBSQsPyE8QQh6/vnnpbOz04wd+6POvXv3Gis2WJuhfxCV3v/+95t6YKkGAQv9RZ3r1q0z4hT2RfvgkOsFgu7mzZtNfFGnEAlWYDZjxgxjdWoJfFgrmDuI3JhLvENoBnMIgBCE8UKdWJvYH8I21ujs2bMPWdRibro6u8w6xLFYdxAV3QrWNvoK68ZTTz3V/BvrE59jjUFAxzsKRE6sC6w/rMVYAiosaWHJizWE47DeHnnkESNEYsz33HOPsW6EJS3WILaBF6yEIT5iTUIIx5rEWv7nP/9p1nHjvkaZPmO6II4rrIAh9mJNs5AACZAACZAACZAACZAACZAACZBANhPIZSEy636NgKUixDyIObB+tKwAYRVWUlwiP/3ZT40ABOEE8R8hskAIgiXWjTfeaIQW7HvWWWcdclt2Ln6Iju985zvlz3/+s7EohJUZLAjh5gz3VAibEKEgwEBwgQAEwQnWcxA/0SdYWEIoglCKvkJgglgFsamsrEyuvfZasx+EKAg4n/rUp4xIA1ELwg2EQowTsS/RFlxjTz755EMi04c+9CEjlP7whz80VpVw773wwgtl69atRrxEX6wCIQqWo+gTLDRhsYm2L774YgqRCglWp7Dcg8ALbpZLMdYRXJaxzizXacwNBGyIf1hXWE/gDyEPQhvWG+YAghzqwXzCWhBCJIRjCOjYfuaZZ5p1gPLKuldMWAEI2paLuDXX9rUJERCCMtqCqzj6BeER/YRgCFEQLxT0E3057bTTDrluR7vIr1yxUs459xwjFpr+qBgPoREFY4Tl7uc+97lDrutY12AFkR9rCMLpqpWrZOasmUbwhOUo1mZvX69Zv7D0xTmC/d1c37P5y4djIwESIAESIAESIAESIAESIAESyD0CuSxEZt1sQyiCoGNZoEEQOeWUU+S6664zY336maeNKzQKRB8UWKolUiAiwQIO4iGEHgh5+AxtQ7CC8AMxBhZusH6DC/Stt95qRBuIjhC2ILgcf/zxRtCBCPXf//3fps+wOsN+ECztBZ9ByIIYhf1hIQeBC6InXM7RplUgSKEuWNdZFnCzZ80244X4hT7aiyWIQfgCK0v0QnssowQgGEJEg/swEhzBchYiMZhC3LOSGVkCNOYXYiEEYlhNgunUhqlGpEQdcN+H6zvWCVz3Ic5BRIR1LWKVTp82XVYdt8q0DYEbYjTmFW7PcGPGOrHWrzVHEPSsAgEU6xExQbE27fEasQ3rBi7WSMwUK3s81uE177rmUL2oE+sCoiTWJM4d1Ach1hIRYfELIRQC5eWXXy5XXnnloeMhtLe1thl+GDPGgPitLCRAAiRAAiRAAiRAAiRAAjlBIOuMoXJi1jjIlBPIZSEy6wLFWuIMhB8IR7C4glACAQ8FQgrEE1gXQhSBaGl3S4W4AivFsYpwBfkFpm2IexCIYHFprOPUzba6ptpYgCE2HxKcwD0a7r333nuv/OQnPzEWlp/4xCcOiZHoI/oK4ev666839cK1HGIQsoLD1XosBeOFhRpEKwhhEInQhlPoGksbmX7sqlWrjIAL13a40WN9QECEyzws+ayCeUX2dUuQhmv7V7/6VcMXQiQEOgiOb3/7280hv/zlL806OPvss43VLOqFSAhLWqtAzIPwiDmBZSOsbrGeoyWwwRqGwIn9IJbD8tduaYh5hpiN47HN6zwjtADES1gdw2IY6xJWuajHHnsSY7SESPu8Y/2D1Z69e2TWrFmHrDMzfW2w/yRAAiRAAiRAAiRAAiRAAp4JuAen93w4dySB7CCQy0JkdsygbRQQXiC6wDINIhAswRDTDu6qEGgg+kFIQXxGWEtiO7ZZBSIlLNggEI6l1NbVGksvJOqAsAQRBpaRP/rRj4wI88EPftAIWU88/oTJIAy3aAiAEIggXkJItcQjCJCIu4fP0Xe405645kTZsnXLYS7WyfYXFnc///nPTUw/9BfWlXDlttx4k603m46DWA3BDkIgRGEUxFdE5nXMib1gnhEbFNaQEAwh4MEtHgXWsHausG4855xzDomKEBsR7xMvCH0omHd8bv0bFoyxhEgIyxD8fve735lkSXZrSNSBcwCu95/85CePsI6NNWeoC27ZsM4877zzzJpGX9Ae/m0V9A3nFuJC2gvOSYjtsCBGJnsWEiABEiABEiABEiABEiCBnCNAITLnppwDdiNAITKL1oXlMr1+3XqTQOaaa64xVltf+9rXjCAD60RYRSKBDSzRIIjAQg0u1Ij7CAs1xH2EoGkXV5JBBJdUxOKDIAThEQWu2bCORDIRCFpwzYaghRfagwAI11+IVRAcIfwg1uT//M//yA033CBXXXWVScZz3b9cZ5KSjNVyE32CZSXELsTIhCUdXIbRdwimLG8QgFUiRNqbbrrJrC3MkSUQWnvBdfrmm2+Wd7zjHfLhD3/YfPwf//EfUTGCu1eLRC9zAREQQjrE9//8z/88IgkN3PkRMgDCKtaiMwRAtDYQCxNWmmBwySWXmN3QbwiREF7toQGwrvH3woULD1UHsRZrGO7YEN1ZSIAESIAESIAESIAESIAEcpIAXbNzcto5aCcBCpFZtCYgjkBQhDgCcQ9C3b/9278Z11GIJrDS2rJli7GOhNUZ3GEhysACEcLRBRdcYKy5IMbh8zPOOMO849iPfuSjJvkGBBZYdV1xxRVGOISYhPoRR/C2224zlowQCfE5Et8gYzbcYWFtifawDfXBxReCFkQaiKOI64jEHnDvRZsQJNEWhFS0h20QVDE+WMtBQIQLMARMCKdwh4XFWWVFpakD5Rvf+IZhAAtPjP3rX/+6fOxjHzMZsp995lmzD1xr4f6LfSBUzZg+Q5YuW8rEIY7zAvwhxsEyEFakiPOIeIj20tvTa6wVER8S84G5i1WQaRqxFFE34nnCahDiM9YvROdECsR0iJCIMYm+wdLXGQ8UojYS6SDjtV0ARagCnANOYRXt43xB9u1jjz1WTj/9dGPVaRXUgfUMq12MAfFGYQmKUAMf//jHjZUvGCAGKs4PWH/ixwIWEiABEiABEiABEiABEiABEiABEshVAhQis2zmIZZAyEH8RAhzcH+FCAcLNliDQcRDjEUki7HcViGoQEjBy8peDBEHf1tlwcIFgpdVEF8PL6tAeETsPHuBezgszyAGol7sY1mhQXjCCy7cEJGsmJbW8egvBEi4A6MvEDutuJIQUvG3U2iC6GkvEI+i/e3LH01aAwEK4hDiFKKPbmJUli2RpIYDgRniL+YFlq6wrnW6H1dVVxlhF1aREOwgxNkzlDsbRnIgS9xETEdYEmItIGt2ogViIdY81j7WDP5GgSs1LHAxrwgTgD7Z1wXOidtvv91YBtsT3uBYrLP/+q//MsIr4oci0zYKhO9LL73UrH9keEe7SMKDpD0QsyFqY+1jPLC0xTYIkhAssW4h4J5y8imy5sQ1iQ6T+5MACZAACZAACZAACZAACWQuAVpEZu7csecpJJDLQmRWXgRglXXZZZeZbMGIebh161YTxw4CDQRBiCgQQiDAuRV74o1UrDOIhRCx7AlD7PWivWhtQiB1uu6mSiiEmyyEMBQIbBBIU1V3KrilSx2wksVaQoGoDHd/CJFWBnII3xDgIErCgvXyt1wurW2tRsTDcbA+hIVtTW2NIOmNFfvR4g7xGkIfBEhYUUKcxn6Y96uvvtq4M1vFspbFfs5SV1tnBExL1La2o59YX1jvEL1Rh92qce/evYIXRG63AstKWPJi/VprEecPhHOsbVh1Nu5rlM6uTvM3GMDSF6I7zje0B3HWvpbR/7LyssOag7UxrJRZSIAESIAESIAESIAESIAEspZAVmoQWTtbHNi4Eci6zNFeSbW093yvvrrsX73un4n7wToLrqiwSrMEmnlz58n0GdOPSOKRieMbS5/BBhZqKLBeg7s4y9gJwOIQwjdc8WHR6iUGJCwH4R6NfSFqTmSBqznWAtzJITgmW3B+wRIToqc9E32y9fE4EiABEiABEiABEiABEiCB7CLQ0d3/6ZrK0h9m16g4GhJInEAuW0QmTivDjoC4BusyliMJgA1iRbKklgCsAhHvEy+vBcLdZIl3iDG69KilY86SHs3i1ysD7kcCJEACJEACJEACJEACJEACJEACuUCAQmQuzDLHSAIk4EoAcUURKzXVIQmImwRIgARIgARIgARIgARIgARIgARI4EgCFCK5KkiABHKWwES7gucsaA6cBEiABEiABEiABEiABEiABEiABJTAaOrg3CwMFJub885RkwAJkAAJkAAJkAAJkAAJkAAJkAAJkAAJTAKBXBYiJwE3myQBEiABEiABEiABEiABEiABEiABEiABEiCB3CSQy0IkLSJzc81z1CRAAiRAAiRAAiRAAiRAAiRAAiQw0QSoQUw0cbaXlgRyWYhMywlhp0iABEiABEiABEiABEiABEiABEiABLKOAIXIrJtSDigZAhQik6HGY0iABEiABEiABEiABEiABEiABEiABEjAO4Gw9125JwlkLwEKkdk7txwZCZAACZAACZAACZAACZAACZAACZBAehCIpEc32AsSmFwCFCInlz9bJwESIAESIAESIAESIAESIAESIAESyH4CFCKzf445Qg8EKER6gMRdSIAESIAESIAESIAESIAESIAESIAESGAMBChEjgEeD80eArksRDJQbPasY46EBEiABEiABEiABEiABEiABEiABNKZAGNEpvPssG8TRiCXhcgJg8yGSIAESIAESIAESIAESIAESIAESIAEcpoALSJzevo5eItALguReVwGJEACJEACJEACJEACJEACJEACJEACJDABBGgROQGQ2UT6E8hlIZKu2em/PtlDEiABEiABEiABEiABEiABEiABEsgGAtQgsmEWOYYxE8hlIXLM8FgBCZAACZAACZAACZAACZAACZAACZAACXggQCHSAyTukv0EclmI5EUg+9c3R0gCJEACJEACJEACJEACJEACJEAC6UCA4eHSYRbYh0knUDDpPWAHSIAESGCCCIyMjEhe3uj3P/4drWAf+/ZE//YyHHudbn1ytmmvM9Y2L20ns89ktJlMP5M5xm1s8ebEvt3LmkK/rHaccx9rLbqNJ13mwhq3/XyKxtIaoxsDi41Vj5d6452T8c7tsTCMNQbnON3O23jzn8rtXs4HN5bx5tSqdywcvfQt3jyOpY50PNbrtch5PXGeO7G+v5xzF209e+XjZQ3E2yfedvt4Y62JeOs2Wjuxvo+d1yOv17h41+5457lX/m7nYrzro5drmBtzr/WO5foQay7irQMv6yhRrvH2n4w24/UpVdu9Xo/s68lq2+1+O975N9ZzwstcxNsn3nYvbOPdw+jjB42hvIDkPllPgBaRWT/FHCAJZCcB60EL786X9TDi/Ny6wbDfIHmh4xSKnMe7CUnWjYj9hsTellWHvU/O7fabebcbm2gPOtbNuvUerQ/O7dgvVn+9sIrVJy/Hx+qD/Xi3fkbre6zxW2vF2Tdr7USbE/t2t33dxmpfs/abdee+FoNE5iLeGL2wT3afWOKbfQ3bWbudM04+9n3czsFocxNrHNZ556wvEX5u8+hcR3Ymzrl2PqA513w8YdrJxdn3WGNzG6f9WuR2PXKrz6onVl/droHxzm/79lhzEo9RrDWQyFx72TeR6068+qKdF/HOF+f3oZdzI9b55rzWJjIX0dZYvPMy3vXHy5wnci2Kxcjt2hPtvI927sf6DrAfY51zzmtlPB5u31nRvlec1yP7WOznnP3aFO27MR63ePcqbtcFZ51Wn+J9D3u9drpdV7LxWgSOk3lvZM1XtOtRtHPY7dxy2zcV90bxriPxtns9L+1r13mOqymE32s93I8EsplALguRNIvO5pXNsWUVAbebm2g3ydFuwpw3ArFuNrzciMTbJ9ZDS7SHhWiT5nYzHu2G0+3hMtoNncUw1kPsWBfSkTdgsWuMNtZYD13RRJFExBKv47Svr2hCS7S6vD4gONd7tLmO9UCYzHjsx8QTTJxrJ9ZDq5c5da7ReOeX1/G57edW93i25+yD27Uo3gNarPHG67ubqOJ2PsWrx37dcu4bS3xyth/rWPta8dofr2vBLm54PcZLH+z7OEUdq53xuBbZrwvRxJ1Y57FzW7R9nedvvGuDF2Zu/BPpa7zzOtb5FK9/E319mMhrX7RrkZdrRKxrfCLfRZNxb+R2XYl3XzWe1yLr3I23FhPh6nZfyXuj2N5Pse7Vol2P4l3/3M4Tl3mmR6rXL2Hul9UEeCJk9fRycCSQuQSsL27nlz4+jyVuRXuIcNYXrX7rJsJqw62taH2KdqPuvBm012mNx3lsrJsdLzfy9jbsY7G3Y2fghY8bW3s/nWPBtkgkcsQv9M4H93gPOM6xOG/O3RhaxzjbGstDn5uAhL5YY7QeXKLd/LuNG8faxYpojO1txFp/dpax1p3zocW53uM9ILnNu5djvOwT64HKeX7a14KXNW9nbW/HEpBiCRhuD4+xHvSiPdy7XXviXe+ijdvtOhHvGunGyflN4bZW3b5NEr0W2Rm6nU+x1qzbunfOv/PaEOs6HuuaG20duPXPvo7s1yJn/c46o11PvHxrO/thvz649Sfa96L9fHBei9yuy9HmzL7mos2T23Xc7RxxO97rdSPe2nee/7HqjTWOaOss2rU81jp0XkutcyTaOoj2Xe12fbLX5Xauxvoujndtca4Ft367fTdHu2Y7+x9tLt365fzOiDevdoZu56xzuxtHt3mLdj1ycuC90eGeyel2b+Tsj30ter0WxbpX0Tpy2RDMy1cc98kRAhQic2SiOUwSyAQC8R6WnDebzjFFu0G3RAb7g5VTqHI+2MW6QXd76HJ7yLTai3fj4vbA53YTbvXR7QEg1vw6H0BiHe/sq5OpWztuD5P2MTlZen0Ad86R/cbO7d/2BxmvaymR88Jtju1sneOKJlK5tellTtweJBM9J+K17cbNbRzR1kk0nvEEIfs43Fg4z4doc+FcM24PFNHON7fP44lf0XhFOye8PtDaGcS7tkQTDJwPxbHWj5O//VjnQ7S1zbquemHgrM9+/jpZRXvAd7sWRVsrzvMi2jXYy9qOdV1x+y6I9T3jxiGRa1C08z3ed0Ksa1E0Ycft3Il1XY21vuL1z76mYn1fRhtHrPPNWbf9WhTvezPa+oh3vxDtemVfw8lcz+OJX9HYJcI03e6NnHPkZGu/piZ6LjnnwMv3sPMcjHb+OL9P3Nao8xzLpXujWGsy2neX21qwc451fYp27Y01f7G+h92+y2PdWzj6TiEy0ZOV+2clAQqRWTmtHBQJZA4B+0NuMr32cuMRbx8vDzH2m0+3m5NogofzxsTtJt/ZP7eHmGg3yG4P51ab0di6tefGPpoAEesG2024iffw6BxDtIe4eKJBrBtbNxZu44sl6tjbd86jF4EhEZ7xBLB450qsBxonC7eHMWuOnWs9Gh8nm3gPDM7zySu/aHNmH4PbOnCbr3iMY103Yq2TWA8jbudxtOuPs32vD6mxjot2jji5Rlursdawc804z+NoayLW59HO21gPn85rcbRrW6w1Gu2aZR9jrOtgvLF7ud46RSe3cyzatTyeYOV2vrnNrXNtxuIS7ZpkP/ecx0e7FsXiHOvaF+370P6daL/2uHGIxs7r9dtZf7zvJewfSwyJdl45GbmtZyd79MV5fkRbQ7HWd6z162wjWnvRrlP2OXTrm9t3UiLXaqt/8a7hbtdxL9ewaNfzRO6NnOvV7d7D3j/eG8W6Khy+Ldb3frTrkfO64ry+u31PuV3DbG0zPJz3KeOeWUwgl4VIXgSyeGFzaJlBwPpyj3WjHutBwetxzgcDtweNaHW5PVDGe8iMtT3ejbW9r/GEBy8Pm7Fu6t0egGLd0Ed7+HCbo2ifjeWhJ9oDjfPBxBqX282jc5vbjaebWOTloSzaGvIyT/HmOtEz2snK7eE4mXHGeqiM9rBktR1NxIh28x9tzF7PIS/r0tknr/MQjUO8dWIfa7T1Ge0BONq5HO86GGu786E52vgTuS5EexC3z0e0tRBPHIg1P7Gu4V7XkvM88fq386EznkgQ7Zxwmw+3PsS6jjrXj5NZtPM+2rqzfx5vrUX7jnBeG5x1xro2xDuP432PRVszsa5/0foTi1Gs724nl2jXsGjrzbm+op1jzn7HOxed9yqpujeKdw2Ltk6cc+02R9HuydyuL17WdLR1EEuwsq85r9edeNfQRK7TsdaTfTzx7o2c6825v3M9JHPPEGsOsuneyHnNt+bT7ZoeGRkZjvadxM9JIJcI5LIQeXiAilyadY6VBDKQQLQb6lgP89GG6bzhQ2wsny+6p4S1vz2GlrW/9Zn9b/zb3oZzn3gPJbEeRrw8lNn3scbmNgbsF2vcsbjYxxRvv1htoA9ejncyjHbT7sYa+9o/T+Qh3sup4nX9uNXlxtG+zqxj7Azjrad468u5Jqz9440jXr1eHnrd2kq0XTeO9vXtZU1HY2CtlXhr1r5uneeW89h4azdV16No1yLn9SDWeR9vDq2HLTfBMN654jwHrTmIdW4610us8955DbY/GFrz5eWaF20f53lptReLmdvadvse8fpdlQjjaN8jsQQPtzG6zZN9XuIxdc6Dl/U+1muc2/ekcy6c39GYz2jXBa/fyfb94o0hVn+i8Y03d16+J2K162VuorF1flel+nrk1u5YzhvnXEc7v6N9b0f7jnD7Tk+0jnjfybHaSOTeyHld5L3R6LNAoudBvGucc+3qLWlvvGs5t5NALhDIZSEyF+aXYySBtCRg/aIdyzLD+cXu/CKPZRnjfHDyAiHaA1i0Y5372/92E5LsN3z2G3bnQ2m0Y+ONwXqIinbD6/a5U0zFPs7P4vUnHutY/bL3KVY78di6teF1DuJxjbbdK6dEx59Iv8eydrzMq9c1E4+Rc7vVttu8euUVa97ijc1tnTvb9VKH2zkd7TPnA1+8+uNtj8bUasft3PZ6vrnxcbYXa57izaHzITpav6IJul6uyV6vJ17qGss+sdZDvG1er01ugki08cebm0TOVee8JVq31+NjzaXXNrFfPE5u1yWvc5Ds9cguCroJd1a9Xq8Hbt/Hid7bxLq2WNeGRM6veN/fbueBc169znO076xEvlejXf+8fufb52ws10kvcx9vzfLeKPEzON65FuvamsA1vTnxnvEIEsg+AhQis29OOSISSFsCsSxHLGEx3i+y1uDC4fARopnbA63br8NWW7GEUNxsuB1riahjgWzVgTHYi/3veCKts31nXdH6Z6/XOsY+Jq/1WPXj2FickqkPdaOfXhmgDa/z4rVOqw/RrAvQppe63MZv1ZmMVVm0eU2Uc7R63Na925qxHx+NfbQ+OZnaOSQyDnu7Xucf/XZrw8u555y3RNp0nuduP8Z4WU9euEcbo9uce5k7t37Fmievc+hca87rkdd67Nci67z1yineddzrj2bOeryuDa9zHms/r9eiaOvCa19jsUL/Ep0vL99hzjXi5OBs08t6dpsr67NY1+R4c2W1nSjPWPcB0Zi7fYdEu6+Ix9leV67eG0VbV7w3cl+Bqbgejde9UbzzNN41P1X3RjHu8/pHIpE9yfaDx5FANhGgEJlNs8mxkEAGEIh2o2sXtJw3EtbDgV3AiPZLs1OccENi/aJpf3Cw74f2sI9b/Bq3/jsfXtzEK+cY7Pu4tRNNALM/aMfax9rP2Y71t5uoEu9B0/lw7yYA2NuztxGvPTtX1BuvHvuDo3NMzrl01uW2ntzGHm192MftdtM7lvqdHOws7PW6teHlBjwWZ+d8us13tDbczjvnurYf67bm460/53q315Ho2KOJBfbrkPNcs9pIZD3FYuBsy229ua0Ha01Em0svbO28onGNdV7Zzz/n+eo2j7HOiWiiSrz1EG29ul13ol1/oq2bWN9Tbtcet+utG1fnZ/GuMfGuNV62ezk3Yn0Xejm3nWvA6zUwGudo3zXRrofO/aN9dzvPnUTWsdu6cn7XuK2DaOeDk6vX+wj7XCW6npzfIc5rmf2cj/bdNhn3Rm73A4leZ2LdF0T7rkvk2uZ2PYq2ZnL53si5Zr3ee3m9N3KbBy/XwGSuRc7rkdvYXK6f3fr7/UCs7zduI4FcIZDLQiRjRObKKuc404JAvBtctxtN+zFu7nz2Y+wiQSIPd24PA3ah0nqwsG443B7O3R7UnA8ksR5Koz3oOcdhf4iIdyOLfe0uJG4iittDnduNt/1Yrw+YbvMZrQ/2vro9WEV7uMO+zjXg5WEg2nxFuyF2rgHnQ65zLuz1R3ugds6l9bfT7cdet31btBteZ1/jrUO3B/Noc+BcG9E42OfAbc1Ge7iL9bBg5+A8F90eMN0e6q15cf4QEeth0z6XzrmJtp5RnxVnyvnQbv1tP7fd1oJ9u32du/F0my8nS+d563beRLtGRxNI7G14uYY524y21t3WsDXHzvPEywOm27XIasNtTrHN+R0Qa03Huq65ra1o1wu3c9rt+uE876J9L9jPE+ccup3L1jqz7+t2zXEbb6xrhn2OnPMVbe3aeUebP7fv1FjXBuc5Fe3aHGv9xfrOjNUft2ulk6O9f27fRfZrtZt7qJd16Lye2deOdby9Hue64b3R4Y+O9nsX5zU21hza17f9O9ptDbkxd34nuJ1Hbtd453kf694l0euRfW05z8NYayrafYXzepSqeyMnF/v3nnPOnOdkrOtcLN6O44b1zjU/2vrg5ySQSwQoRObSbHOsJDBJBGJ9ebvdGDkfVpwxhpwPJtEejOLdSLk9tLgd46Ue541ltL8T3c/5IOj24B3tRiraA5zbMvA6Rjdx0z4mL2KS1/YTnQvnTaPbg168eYl3ijhvjqOtbftNebRxJDKXzvMkVj/tDxfYz5ozN+HIbY14XQtO3l7nNZG+R+tLrD7a5yjeGvIy1mT6YHcpdeNkP2dj9dFtfXkR36Ktl3g87HNj76OX8zpa3Ym0Ge9a4jyvnGs90bainb9uD6TR+hZvDcW6RiRzPYp13tnnLNp5lsy543adiHetdK4lNzHCjU08nvHajXd8vO3OcyeawBTv+hdvbSVzXYm1XuKNKx5rtzlOtE4v1/Z4az4eN+v4ZO+NvNYfr5/OsU7UvVEy68a5VmP9mBBvzmNdV5zX51jfJ7G+o7L83qheRsInb9vVePuCOdMPj88U7+IWY3t/f3+ec3NJSUlCRle2Oo6oS+seSbS+MQyHh+YIAQqROTLRHCYJTBaBRG5q3B6i7Dd39mDzbhYesR4ekxk/2o6VGTHaNi9txarbfryX/Zz7eDnG7SZ6LOPxMuZ4+yTTb/tDSSL9t1vYxutXKranamxjqScV48jkOiaCXbw24m3PFL5er41e90v2ejSePL3U7WWfeHM60deieP1x226NMxXfNcm0H++YVMxDvDa8bI/Xj2gcvdSd6D5e+5Jovdg/2fPaS1vx+p3Id77XumL1KxV1eBn3ePUh0f4nun+6jG2i+x1t3B76UVxZ7vt6aXHohO6evgP5PinSugL6TAMrSR9e+m+/vuPvAv13IV76b7/tc+wHsRBCYwR90ftfHGMJiObzUCgEoRPbrXd7t7GveWmfI3p84GD7+Myq39oH9Y1ofVZ75m+r7YP/Rt3W/ta/7e1Zx6Av1gt9s9cV0r9DOs6gvqsL+8hOfV+r3dsWCAS67JXx39lBwE3xzo6RxRlFS3vPt+qry76cE4PlIElgkgh4ESFjWVrYH9AgPNrFRy9C5CQNm82SAAmQAAmQAAmQAAmQAAmQAAkkSUCfESFWvq7vT2uCo9/oc+FjRUVFCVl6Jtk0D5sAAlC8c7VwEefqzHPcaUEgnnuMXYSEpRtelhhJETItppCdIAESIAESIAESIAESIAESIIGUE9DnPViILtVnwA8UFBTcru+/HB4erk15Q6xwUgjksmv2pABnoyRgEYDQ1tbWJoODg1JRUSGVlZVHwOnq6pLu7m7x+/1SX18v+fmZH9/YzUrS/pndrcEuQHLlkAAJkAAJkAAJkAAJkAAJkAAJ5BYBFSSr9Xn4g/qcOHtoaOidhYWFbblFIPtGm8sWkdk3mxzRpBJQk3FpbGyUAwcOSDCI8BaxS29vr9xzzz1y4403yrPPPuu68/PPPy833HCD/PGPf5Senp54VabVdq9u2W77gSVFyLSaTnaGBEiABEiABEiABEiABEiABCaNgD4fnq+GOT9WQx7EtWTJYAIUIjN48tj19CKwd+9eOe200+TDH/6wbNmyJW7nNDuZ3H///XLrrbfK2rVrXffH59h+5513ZpwQ6XSfhuBoiY72LJRubtb4DNafdMGOu4y4AwmQAAmQAAmQAAmQAAmQAAnkBAF9RrxaXbU/mxODzeJB5rJrdtbFiNy/f7+89NJLoqbKUl5WLi0tLdLZ1SlnnnmmzJw504g6zzzzjBG0ysvLpaOjw+zz3ve+1yzxBx54QF599VWpqqqSNWvWyFFHHXVo6UNAgtXepk2bRIPEynHHHSeLFy8+tB0WbDj+tddek9mzZ8sJJ5wgs2bNMtuxrb29XR588EHp7Ow0n69atUqmT59utsP1GJZ/mzdvloaGBlPvnDlzTB/dCiwJH3/8cdmxY4cZ14knnmjcluHGjD6g/ytWrDDuzOgPrBTnzp0rq1evNm09+uij0tTUJHV1dbLi2BWyYOEC0wzGiO0PP/yw4YI6Uc/8+fMNq8cee8xsP/vss00/t2/fLq+//rpxq0b99913n+zbt8/U9Ze//MVwwrHWvEConD5tuixdulRmzpp5qE2r3aeeekrWr18vixYtMvzLyspMn/Cy4iVa+z700EPG8hJ9XLlypcybN2/cLlMDAwNmfsDkyiuvjNtONEtIrD9swzvGYxcj7ePD5/rlErcd7kACJEACJEACJEACJEACJEACJJBbBPR58T3qon2z6h5NuTXy7BltLj/tZ13GcAhucPOFGAZrMoh+oVBIpk2bJv/5n/8pxx9/vPzhD3+Ql19+2QhBECQhqJ111lny1a9+VdatWyd6QhuBCGLhVVddJR/4wAeMiPiDH/zAuBFDlIqEI1JTWyNvfetb5brrrjNC2/XXXy8bNmww7aJuiG3vfve75YwzzhAIbN/5zndMfyAOapBZI45CAC0pKZH//d//lXvvvVeqq6sFVoIQID/ykY/Im9/8ZiOq2suTTz5p+gLREmPDdoiaX/ril2T6jOnypz/9yYz/X//1X804fv/73xvx6xvf+IYRLr/0pS8ZsRVj8OX75Oijjzb9OOecc8z2r3zlK0ZsHYmMmO0QIt/znvcYHugntkEkhYgJce6WW26RGTNmGBZgj7FB5LzppptkyZIlRrz77W9/K+h3IBAwbIqLiw0vSzwEcwird999t/T19Znt73vf+wx/e4G7N9r/j//4DyOAWn2EEIk+nn/++eNyZdq1a5dhin6NpVgipCVUxnLdpiXkWEjzWBIgARIgARIgARIgARIgARLITgLqor1Mnxc/p6P7fHaOMPtHlctCZNa5pSPpCazudu/eLSeddJJccMEFRhz85z//Kb/61a9kwYIFxjpw48aNxuoO2yGowdIP+0DQg0AIkeuF518wwtiyZcuMsAYxDUIhLOJQP4Q1WDhCcMTfsESExSHqhDsxRM277rpLSktLjYUhLDXf9ra3GUtJCKEoEDj37Nkjt99+u4kHCNFz586dxq0ZVo+wcJwyZcphZyEEvhdeeMG4QMMq87nnnjMiHiwj/8//+T+mfmz/61//akRNjAX7wroQcRZhDfmmN73JCIwQJNFPWC/CChNjfOSRR8w2iLOwTkRfMQaIgmCLvqFeCIqwkkT/IZpNnTrVsIE4CXH3He94hxx77LHGahKCG/oA0RNs0B5csi+99FIzNoi7sAAEH8whBE0InJgPewEvCLYYw1ve8hZTH/qP+bzjjjtMG2MVC90uebAqRdtYG+gfxgRrWcwZCtYU/g0G4ALB+emnnzYiMfbDHEKAhnDc2tpq1iTGDD5ghW1giTmHMA3e+IyFBEiABEiABEiABEiABEiABEiABJwE9PnzLH2mLNfn38xKpMCpNARyWYjMOotIa01DELr44ouNMAYREMLVs888eyjGIEQjiEAf+9jHjGj0s5/9zGRvhoj4rne9y4hvsIDbtm2bEebgjgyruCuuuELe//73G9EIVniwfoQFINy98RlEKAhN+Az1QrSDSAkhDgIWBE1sh6AJK0L0E/vAdRvWfhANUScsCeHebbeGtAQuWFfCahBCFsQxvKMtjPNrX/uavP3tbzeiKsRICFsQX9982ZtNH8ABY0FfIHKiHvQHVoZ4oW5sf+c73ymXX3656Q8E15qamriuwhDUYBX5hS98wYwP/YAIBy6woERf0F/8DT7gYiWfwZghDH/qU58yn0HgBXvsA2tJq2CcEF3Rd2sMEEVhdYn+N+5rPORmnsrrG+pHnzEO8IJV7Ze//GXjeo4C0RHC4YUXXmhEyn/84x+HtmF+Tz/9dCNow4oVAizmFS9Y2MKtfuHChbJzx0555tlnjBAJgTaaW34qx8W6SIAESIAESIAESIAESIAESIAEMo+AahrL9bVGe/5g5vWePc5lITJrZ7+2ttbEIoSABkEPLsEDg+pSrUIhCkQgCGcQliBkQXSEUAfRDtZoiN0IMQ0WgBAPIUKhIN4hhCLEJUQbsHCD8ATXbBSIZrDOg9AJS0kTC1EtFbH/K6+8YkQsiFToB4RMiKEQHSHaQcyCtR/qRJ9x3PLly6WystLUjf5BzMML9Tc3NxsBEy9YDkLUhGUi3J3RHiwFIeqdfPLJph/hUNgIltgfwhqET4wLY4YQBmEPoibaOfaYYw07WEbCJRv1oj2IbXaXYdRlMXVbTGgDbNAXtAnhDkIkxmgvmB/wRptoA3OzdetWMzf2ffFviJAo6A/6izGg/xjjcHB0nlJZ0AbGiXUBcRBrAnNl7xcEW6wpWOFiniFkf+hDHzLrAZawmDPMPSxMIWhDaMT6gSXuE088YY4FH4iWmEfGh0zlDLIuEiABEiABEiABEiABEiABEsguAvpcXqIvuBBSiMzAqc1lITJrLSIh6mzestm4OUMohJiEOJFuAk/AHzDu2ZbYBuERsRIheMHNF4Ig/g2BDiIThD2IdrAetGJJQlSCVR8s3yAKQqSChSWsHiFewhLwPe9+j7S2tRrRE27TeOE4WAEi+QvER1gowkoO4hQKBFHUhT7BvRdJaKwELnATRsxLiHUQubAdfcSY4SqM/SBY4tj1G9abfkHgQz8RDxIiI8aBfmL8EGUhBGJM2L+uvs6IgRDSsB0WfUhKgwI+4AlRzbJqtJ/7qBd9slypkcQGLuMQXOHKDddke8H8oM/oO8RSiIzoB8YAkdIqECkhsmIb4kEuX7Zc+vr7TDsYG3inukB4RB/QbrwC4RFjQeIeiK5YO3PnzJXaulojQsLK04qvibmCa/0vfvEL8xnmCmsA7uXgzUICJEACJEACJEACJEACJEACJEACMQhMJZ3MJEAhMjPnLWavIfbBPRmCFqzTIFzB+hBWbc4Cwe2SSy6Rv//97yYZC8QwiEZw9YXQB5EQLrUQDWHNCEEKLsNwx4Y495nPfMa4dENsgzUkLPuw/cUXXzRtoiB+IazfLrroIhNHEu7FsLKDJRxcv7/5zW8a8Qmu4qeeeqqxuoMIOjw0bOJH3nrrrUbE++xnP2us7lAX+ofxQGjFGPE54ib+5Cc/MWIfxgSRETEkERsSFpioG9Z8EFQhlKEd9BNu0V/84heNMIYYjz//+c+NWzYsGSFGQvSDCzFEVYikiLeJ8aMeZK62CkROjB9WkBBU0T+Iv/gMIhv+tlzR7fMAoRf9+PGPf2zqA++ZM2YaIdayNsX+sA495ZRTzBgQaxJ1QxTF+I855phxSVYD0RSWkJjreAViKOYc8UL/+7//2/CEpeaqklVmLhCTE0IlxmclrsHnTEwTjyy3kwAJkAAJkAAJkAAJkAAJkAAJOAiUk0hmEqAQmZnzFrPXEL1gKfjrX//auO7CGu9zn/vcIUszCD+W+ANxC0IbEsUgEQyEOAhPEPaQTRrCIQS4T3/60yaBCgQmCGAQKa+55hqTwASxECGGQaD729/+ZiwHkS0bLriwcIMlH8SzG264wVg4Yvu1115rEsDAehAiH2IHoj4IVEuPWmpiXELEevqZp43lIQQ5bPv6179uMmJDwETSFwikSCzzyU9+0ohyv/vd74xL99VXX22sH9FfiHYQSj/+8Y8b8RHCJiwyIQxifBBIkazm85//vLFIRAxExJjEdlh5Il4k3J+RmRr1WG7m+AyCqlVgsfnBD37QcLz55puNFSasLyFowvIPGb3xtyXC4TjMAywZIVaiX7BmhbXl//t//89Yn6Lv1nxB6INYizFAXP3zn/9s+mglJhqPuIqwCAVPiLX24pbxGpaTEB9/85vfGI4Qt3/4wx+auUbfIJYiEzpYo9izZ0M4j5VFOwtPUw6JBEiABEiABEiABEiABEiABEggSQL6/MgMp0mym+zDstY9OR7Ylvae79ZXl/17vP0yaTsSq8BqENZ+1113nRELIQhBSLTiD8LiDuIfxEAIZyiIcwirPLzgIoxtsFCESAnLRGyHCzISucDasCC/QKY0TDHu0IgZaSWSsY6HIAXRDNth9Wi5KsNdGXXAqhKxACFOQXzCZ6gfgiPckdE2XjgWMRVDxbqRAAEAAElEQVTRZytuJYQ/WNGhLowN+yCOI4Q8FPQfn1l/o09wGbbculEf9sE7xok+YpwYB/pi347PMQ68o06IurAyRT/xOY6HsAqh1XJvR3uwCAUTuChb8Q/hPg0BF+OGCzrGifFj3LASRB2IpYi+wVUZ9WMewQZ1Wu7RcGFGHyFG4nP0DWNAXzCGVBckAII1JERjFIiwSGgEi08IqJibH/zgB0YQxj6wpsV8IPYnxoVM5hCaIT7CihQM4Y4PPhgDLE8XLVwkGzZuOJThHFafLCRAAiRAAiRAAiRAAiRAAiRAAiQQjYA+W/5On7ffTUKZRyCXLSIzb7Y89hhiFQQqWCoiYYo9+zREK2fB/hDu8LJiScKa0CpWfZboBQs9iGr4HAXvEDrxgmDo3A4xE+IURDgIiRDVrGNxPEQ8CFloG+2ibsti00qMY/UH7xgDjsHYsJ89jiJEPHtxjhd9xDggIKId+zhRl7UddUMctG8HR1ibok7nGKw2wRCiIIQ2axw4BqIdxmyvD8dYmafxbwih4GT/DH21EvZYbcTqo8cl4mk3uGVjPJg3+/hg5frhD3/YWKyivwgFgPmDdSaSAn3nO98x4iXEYnCEqAqLSgiosJL893//d7M/3NQvu+wyKSl9Q0ClVaSnqeFOJEACJEACJEACJEACJEACJJDTBPTZcVSQYMk4AhQiM27KoncYyUEQGxEiGcQvCF92EdLLUOPtP5btEPbwcisQAe0CnLUPPneKd9iWzNisOlGfW51et7v10z4mZ/3oq114jTYP0Ri47R9vDF7mOt4+VqIeiMtWgTAMERKWjBCYITIi/iY+hxC5YuUKCUdGs5lDjIVoC+tIbINrNuYf7ucQHCGUr1yx0liHYhvWL8RoFhIgARIgARIgARIgARIgARIgARKIQ4Cu2Rm6RHLZNfv/qWv25zN03ly7DRdkJJuBoGW5FGfT+DiWiSVw5513GnEQbtUQC50F6w3CoiWy2mM+wm0egjiEa4im1jZYosJVH27bsPTEsdhmvfB3PKF3YimwNRIgARIgARIgARIgARIgARIggXQjoM+jt+uz49vSrV/sT3wCuWwRmXUiLEQfWJ+xkEAqCCDGKGJrRos9abeOtbtUQwi3YnQ6Xa3hrg5LSrzsAmQq+ss6SIAESIAESIAESIAESIAESIAEcoYALSIzdKopRGboxLHbJDDeBOwu2bHaihbX0W4hiePhqm0VS4S0/43tVmzQ8R4b6ycBEiABEiABEiABEiABEiABEshcAowRmblzx+CemTt37DkJZCQBiI0QIik6ZuT0sdMkQAIkQAIkQAIkQAIkQAIkkA4EctmwLh34J92HXBYis841O+lVwANJIMUEnK7aVvWWJaQlQjotI1PcDVZHAiRAAiRAAiRAAiRAAiRAAiSQnQQoRGbovOayEJmhU8Zuk0BmEYDYCLdrp6t2NJfuzBode0sCJEACJEACJEACJEACJEACJDAJBPInoU02mQICFCJTAJFVkAAJHE7A7naNfyMbtv0zpyWkJVRSnORKIgESIAESIAESIAESIAESIAES8ECAXq4eIKXjLhQi03FW2CcSyGACbolorOEwLmQGTyy7TgIkQAIkQAIkQAIkQAIkQAJpQkCfO0fSpCvsRoIEKEQmCIy7kwAJxCdgjwHp3NtKVmN9bnfbjl8z9yABEiABEiABEiABEiABEiABEiABEshUAhQiM3Xm2G8SyCACEBtRnD9a2f/mD1oZNKHsKgmQAAmQAAmQAAmQAAmQAAlMLgFaRE4u/6RbZ5ahpNHxQBIggWgE3LJh25PVOK0iSZIESIAESIAESIAESIAESIAEMp3AwOCw9A8MZfowku5/WWmRFAb8SR+f4IEUIhMEli67U4hMl5lgP0ggQwk4RUXr71hiI60fM3Sy2W0SIAESIAESIAESIAESIIGoBFrau2T7rqacJbR8yWyZUlM5UeMfdbtjyTgCFCIzbsrYYRJIPwJ20dFu+YieWm7Z+DcFyPSbO/aIBEiABEiABEiABEiABEggtQTyNJ+zLy93IuGFD4biSi3FuLVRiIyLKD13oBCZnvPCXpFAxhBIVFy0C5VMVJMx08yOkgAJkAAJkAAJkAAJkAAJeCRQVlIsK5bO9bh3Zu8WiYzIc+u3SCgYnuiBUIicaOIpao9CZIpAshoSIAFvBKK5bEOgtFtPequNe5EACZAACZAACZAACZAACZBAehHAM4/fnxtyC57h1AB0MgpjRE4G9RS0mTu2wimAxSpIgAQSJ+DzHX6ZcbOgTNSqMvFe8AgSIAESIAESIAESIAESIAESIIEsIkCLyAydTAqRGTpx7DYJkAAJkAAJkAAJkAAJkAAJkAAJkAAJ5CgBCpEZOvEUIjN04thtEkgXAnA7cCvRPrf2jbc9XcbHfpAACZAACZAACZAACZAACZAACaQdAbpmp92UeOsQhUhvnLgXCZBAkgTixX2EIElRMkm4PIwESIAESIAESIAESIAESIAEcpMAhcgMnXcKkRk6cew2CaQLAbf4jtES0lh9xjH27NmMEZkus8l+kAAJkAAJkAAJkAAJkAAJkED6E9BnyAlP053+VDKjh7ksRFI9z4w1yl5mIAEIi7FctmkBmYGTyi6TAAmQAAmQAAmQAAmQAAmQQPoQoKaTPnORUE9yWYhMCBR3JgESiE/Ai8BI68f4HLkHCZAACZAACZAACZAACZAACZAACWQjAQqR2TirHBMJTBIBu8gYzWXbEiu9iJaTNAw2SwIkQAIkQAIkQAIkQAIkQAIkkMYE9HmSelYaz0+srnHiMnTi2G0SSFcC8QRGWkSm68yxXyRAAiRAAiRAAiRAAiRAAiRAAiQwvgQKxrf6tK6d8QTSenrYuUwmEC1ZTSaKkFu6R+SVjhHx5Yksr8qTJRX6DxYSIAESIAESIAESIAESIAESIIFJI6DPlpFJa5wNj4kAhcgx4ePBJEAC0QjEy5ydzuTC+jNF8+CIvK4iZNugyEBoRPDZS60i+/pHZH5ZnszVFwsJkAAJkAAJkAAJkAAJkAAJkMDEE9DnzfyJb5UtpoIAhchUUGQdJEAChwjEyphtx5SO1pEQGzuHR2Rnr0ijCo5NKkbOKM6T0xt8MhwWeaV9RLZ0jUj7kEhPSGReaZ6U6FUU1pIsJEACJEACJEACJEACJEACJEACJEACsQnkshDJtUECJJACAk7LR+tvCI2RSHRreWfSmskUJiMqQPapsAgryB09I7JRXbGrCkUun+2T2kDeIaFxlgqP+wdG5OH9eEWkry5PphTlSb2+SilIpmA1sQoSIAESIAESIAESIAESIAES8ESA5iCeMKXfThQi029O2CMSyDgClqgIMdEuKPp8vsPESEuktIuX1jHOYycKgnpdGytIxIF8pW1ECjSF1+VzfFFdr6epheQ75qkgqRaTt+2MGLftNfV5sqImT2oK86SAX4cTNXVshwRIgARIgARIgARIgARynkBErSrC4bBEDj6L6Zvk6TMJnrnwKsj3CZ7LsrAw70eGTiqFyAydOHabBNKFgJslY6z4kNgGS0nncdYX5USPa526W9+3LyIVAZFLZ/lkfnme5McREyE2zlTryE8ty5cWtaL8w7aIrFch87wZPjlWE9qwkAAJkAAJkAAJkAAJkAAJkMB4E8AzVWt7l+xpPCAH2jqlp3dAgqGQ+Av8UlFRIlUVpTKtoUam1deI30/5Z7zng/V7I5DLK5Hqubc1wr1IIGUE7OKjZUWZssoTqAhWkK9prMcHVIAMaIjjkxvy5KjKPKlWN2yvFo2QG7Fvg7plv3eRTzZrYpunmiPy0D6Rs6b7ZGU1BckEpoS7kgAJkAAJkAAJkAAJkAAJeCQQVsOOrq5e2bh5txEih4dDB60iYfAhavgxLG3tQeno7JU9+w5IWWmxHLN0rkypq1aRMjtyvOizpUbxZ8lEArksRGbifLHPJJD2BOJZQ9pdsOEiADcCq4x3nEgko0ESmsea9ZfDoRE5Xl2qp6qrNeI8licZ4xHWk7Xqkn2MWkLWFo7Irt4RealNLSTbRc5VQRJCZTwLy7SfVHaQBEiABEiABEiABEiABEggLQgMB0PSdKBDXnt9t3R296roOCIN9VX6qjaCI4TGYCgsff2D0tPXb4TIjs5ueWXjDlmycFhmTquXwoA/LcYyxk7QuGyMACfr8FwWIrloJ2vVsd2sJhBLTLS2RRMrx9NKEgLh+s4RjQcpRnRcoC7Yy6t8UqbfwamwXUQ9C9VEsk6Fx1pNeNN8MKlNnYqTS9TaclpJnhR6CM0SDkVkcHhYQjaBNqsXTBYOLuD3681dQbbG4snCGeOQSIAESIAESIAESCAzCOBZASLkpi17pEMtIqsrS2XWjClSW10hFWXFUlgY0HtQhMIakaHhoAwNDUttVbnshet2e7ds3tZoBjp7RkPWWEZmxsyxl3YCFCK5HkiABCaFAERHuzXkeHWiTS0f4Ta9u08krEm8pxaJLFW36elqCZkKAdLeb/3OlxqNNVmliWsgeK7V5Dft+v6kumzPLMuTpSpIwvoyWsGvlm3qPoH3MDrLkpEECvz5Uqk3glUVZVJcpAuChQRIgARIgARIgARIgARSQKBF40Bu37FfOlWEnFJXIQvnz9T4j+pufTD+Y2Nzm7pkd0tFeanMmTnF3IuWl5YYS8m8rXsFx+/c06yfF8r0htoU9GhSq6Bx2aTiT77xXBYik6fGI9OSAKzttm/bLi+sfUEWLFggS5YskfLy8sP6OqyWZlu3bpX8/HyZNm2aBvCtSMuxZFOn7Jmz3bJmj8dY8Y00EBLZqpaJLWqZuE/dsUv9ebJaXbEXqiVkoqU/EpYRiUhRXoG6Wcc/3giS6q59/vQ82aIi6Ivqpr1HLTLRp5mlIvM00U2pwxsCLhat7T2yt7nVxHhhyWwCPT1FJiFTUWGNyVbIQgIkQAIkQAIkQAIkQAJjITA0FJR9Ta3S3Noh5fqj98L5M2T29PrDqoTl4+vb9qrF4xQjRKLkF/hk6pQa4649qBaSbR36zKH7wYoyS1y0x4KVx04CAQqRkwCdTY4PATz0P/X0U/L//X//n7z1rW+VKVOmHCZEYntXV5fcdNNN5vO3vOUtsmrVqvHpDGs14ovT4tGKDzlesSAhQA6qhodM1k0qQD6nFomVKvitqfcZV+yAB9do+9QNahDojtCQ7B3qUyFSE9MEimWKv0iKfd4DPC+qyBO8IEg+3RIx4mhfXZ7MVwtJuHFbElX/wKB09/VRhMySc6dvYEhj9vRLfS0CglOIzJJp5TBIgARIgARIgARIYNIIdHT1SJfGhIShB5LOzEjQonH6lFrNrN0lXT390t7Rq68ek1GbhQQmmgCFyIkmPo7tQfSBxR+KlQQkokJKcXGxsQBEGRoa0ngREbMd76FQ6JBYNzAwYI7HtqKiIjXvPtxkC8diOwSmwsLCI7Zbx+M4bLfaRLtoq7+/37wXFBQcth2ilFU3tuGFOtysiNAG9sd2jDcYDEogEDD1Yf/Kyko54YQTZPny5cbaEftijKgf/+7s7JS///3vUldXZ0RICpHxF+Tg4KDgZay7dF1gPdkL5gDzgvmw5gJz7xQb8TfWD/ZHHdZ2a21gjlB/WVlZ/E657BFUT+ZeFSH3qPUjsmF3B0XePtcnC1UE9BKb0V5lWPs6MBKSXYN98mhXk+wf6hefrq9ZReVyXGmNLC4pl2KP1pFWvRAjpxfny7rOiDytyXKaB0QumflGIhu4Yofojp3U3KfjQVjfYbWkjehLr8jp2EX2iQRIgARIgARIgARIIIMIdHT1mRBOiAs5c1rtYc/bXoZhLCPVjRuJazpVjGxSy8pMFiL1+Z832V4mPg33oRCZhpOSbJf27dsnzz33nLoCFkllVaU0NjZKR0eHvOlNb5K5c+caoe7pp582VoFVVVVy4MABaW5ulo9//OOmyQcfeFBeevklqampkdNPP12OPfbYQ13BQ/Uzzzwjr7zyipSUlMjJJ59sxD6rQIT65z//KevWrZN58+bJGWecYdpEwTa0BQGwvb3dfH7iiSfKnDlzzPbu7m554oknZMOGDcZdGvUuXLjQiIrOcv/99xtB8+ijjxaMd/PmzWb/c845x+w6a9Ys03ccD3ES4hZcsR9//HFzocZxEL5YvBMAO8wtWJ555pny9re//bCDwffuu++W3bt3y2mnnSbnn3++WV8odrfsPrX227Rpk3m9853vPCQ0Y02g/ueff96403/hC1/w3jnbnrA4fGB/RDqHRC5WgW9lrc9kq07UFi2ka31/sF/ubtsj+1SADI4cXC9qErm1v1N2DXTLtMISubx2tkxVC0lfAi3AHfsktc486aAHRaJ9SwoMDyIBEiABEiABEiABEiABEsh4Av0qQg4OhaRKXb5KSw43DvE6uBp1x66sKJeW1m7VBTSIfgYX1SgYIzJD549CZIZOnFu3ITzecMMNsmvXLiPyQOCD6Pb9739ffvCDHxiB7re//a288MILxkqwt7dXZs+eLRe+6UL56Mc+Kq+99pqxUsMxU6dOlXe9613yr//6r0ZE/NrXvib33HOPERXxgtUaBKl/+7d/MwLUpz/9aSMKQqSEYLV48WK57rrr5KKLLpIHH3xQvvKVr5jPIQ5CkIJQ+dGPftTU88Mf/lDuvfdemT59urFYhLXcZz7zGSNWwULOXrBvS0uLsZrE+PCqr6+XK6+80vQRbf3qf38lV779SqmtrZUnn3hSvvXtb5kxQBTDuHA83LZZ4hP4zW9+YwRfCMclxSXyyrpX5PrrrzdiIeYGvCFQQ7y++OKLjRCNucaawxzZRV/sh/mDWzzmFmsNc3HjjTeauYGrPCxVEy07NPbiE5oMpnVQk9BU5ckadXtGPMhEvWERBXL/8IC81Nsm63o7ZCASFIiSzhJSYbJRXbVvbt4qR5VWyvFl9dKg7toBjz/IUXxMdIa5PwmQAAmQAAmQAAmQAAmQQL+G/hlW77LCQIEmnylSN+0+eejJlw8DgziSKI1N7XL7PU8etu2U45erS3elerHlqydWyMSLzORCi8jMnT0KkZk7d0f0HAIhhDkIjOedd56cddZZxkLyd7/7nfzyl7+UpUuXSk9PjxGWjjnmGCMUVldXywMPPmDESVgVvvnNbzZWj/fdd5889NBDsnLlSmluapbbb79d5s+fL+9///uNhSEs4J599ll54IEHZM+ePeaYCy64QK644gpj3fjwww+bfeAe/eijj8r+/ftNexAg0Se46MKdF5+jLQhZ//f//l/Zvn27qQvWixAlIRzaC8aH9tBPiJywovzTn/4kd9xxh1x11VVmfJ1dnYYBhFHEjIRVKCz13vve98qdd95pxs/ijQB4Yt7PPvtsIyyWlZfJ//zP/xghGwXWkhCQMRcQlSEyYg7Xrl1rLGotN27MKdYNrGUhXFsFFrkzZ86U2bNmy4qVK4xQ7aVAHmzXbNh/3RUxsRvnarzFNZqIBhmpq5NIUrxHLR839HfI9sEe6QgOSq9+MUcraA8CZVdoWNarYLlb3beXFFfJitJqmaYWksmWAEIaOMIhJFsXj5t8AhDXEULCymA4+T1iD0iABEiABEiABEiABDKZQESfQYwRoBodwfAoogYSvX0a78mlQGjs7Tv8mQaf4TgrSn0W2BPSxiNDF3QuC5FZa8YL92S4x15++eVGyPvb3/4m69evNy7NKHg4hhB5zTXXGNdsCEtw14bYdOGFFxphaOPGjUbwg9AEC0ZYrn34wx82Vm8D/QMmDiMetCE0QcS0BE5YTULoa2trM++wRISLNdpGXXjHcXCnRj8HNUEHrChbW1vl5ptvNmIW+gzBKlpGa4hVq1evNmIkLBthaffqq6+aMVoCGcaJ/sM6FO0jec2ll15qBM9HHnkkQ0/Xie821gTmAVanKHCdt6wcISRj3uBOjTWDAtES1rAQHvGO9QHxGCIkvjQhjsMqFwVfghAxMT+Yd7SDteGl4EuzWS0gkZ16vsZePLoyz2Sphit2IqUtqK77g92yWd2t9wz2qwA5rLmxvV8a+vXLfPSl4QdUwJxfVCYLiyo0qc3hlrxe+lRSVGjiveCXzp4oNxRe6uE+k08AaxuZDKsrykxsURYSIAESIAESIAESIAESGCsBvz9fDXZ86qEYUcvIkHqsFcnJxy87rNrtu5ukuaVdaqoqZMnC0Wc0q1RXlsvQcNAci3qKi5Kw4BjrIFJ7PG+0U8tzwmrLZSEyawMFQtiDuANhB0KdlbjGWlUQImEJ2dDQYGI2QkyCSARhEMfCPRaWbUgqAhHJSoADEQ/HVkytkGMix5jtluiIB2/UiQJ3b7S7aNEiWXrUUlmwYIHZDy+4f8PSsampSWbMmGEEUQicTz31lBEO0R/EF4QwBXELgqSzYDwYG/oKUbK0tNSIYxBM7WEi8DeET/QZbtroI9p0JuGZsLMtAxtatuyNLzZYryKOIxL8wDoS4jX4I0GNVfBvS8i2MmbDOhLCNMRnzJm9YF6wrjBvSIiDY7D24hVIhQP6A9+U4jxZrEJkvVpCei0QGvsiIY332CM71AISFo3toUEZtmJBeq3Itl+XZtbuCwelRV27G4f7ZYGKkUvVbbsoL99zBEkEj66uLNN16pOe3j4JhrL2EpUE4cw5xKdquF8tustKS6Sq4vD1njmjYE9JgARIgARIgARIgATSjUBJcaF6UAVkYHBIvQD7jJv1wrnTD+tme0e3ESLhuu3chh07u3plQF2y/QWIM5m48US6MWF/MpNALguR3s2eMmxuIRjBIg1JYV588UUTmxH/xsXGWWCxhqQxEOlgVQgRCe7OEAohBiLpiyVUwvLw+OOPN+IkrBshQlmWjRAH4fq9Zs0aIwhCdERd5RoIF664ELSQKAZC42233SaPPfbYqFCpx0BUhIUj2kMyGiTUgZCKuiFObdmyxfTDEsXwGRKeQODCO8YLV26IjDt27Dg0RNQLUQvHoz0IpKgb4iQEMBbvBLAe4HIP3ojlCDEX6wrrxx7HE/NgJQmCuAhx+eWXXzYi9YoVK8xcWAXb7dnbYTWJdt72trd571gCe6ojg/SrANk8PCg7hnplQ1+HHFDh0C0OZALVHtoVsSMPBAekU0XJfSpG9mqMSbhq41XiK/CU1KaoMKA3FPpDgVpG4pdOlswjgGtpgf7CXFCgIjStITNvAtljEiABEiABEiABEkhTArBoLC3tUKOFfmlubZe6WvUoS+B+E89fyLzdoxmzCwsLNOlNaZqO1Fu3mKzGG6d03CuXhch0nI+U9AliH4RCywIRwtBJJ50kpWVHXmggyMHdGvEcEWsR8f0gCCHxDeIqIqbjtm3bjJAJIQqCEsSiTa9tkuNWH2cS3SA2JARECE548MZ2uERDlIQr7z/+8Q+T6AYJT2DhCOEKFpNoG8lNfvrTn5rPEF8SYiLagFUm6kI25VtvvVXe8Y53HBIicQFFfEpY5EHkhBAJkRGiJoRGq6AtWFxCsPzLX/5i3MexP+JHsngnAM6I6wl3ffCEWz4K1hVc4e3u8JgbWNDCShXzh3nHesB8w01/7969JjYo1gfcsmFZiYK1CqEbIvd4CJGDkbBaPQ7LbhUgX+3rNJaQh7Jhe0fhaU/U26QxJ/+pIuccddVeUVojswpLpbagSIo8uJ7jZqIwcOSPBp4a504kQAIkQAIkQAIkQAIkQAJZSaCupkI9bkpl555eaT7QIbOm1+vfZZ7H2ts3KI0trdKtQiREzLqaSs/HpuOOTFaTjrPirU+5LERmrUUkXKxhsQZRDtaDSELzkY98xLjAItYfxEG4P6PAYhCCI9yjkdQGwh9EwVNOOUWuvfZaY8WI+j772c8aMQ/CEqzejjvuOJP5eM2Ja2Te/HnygQ98QG655RZjVYnjUecll1xiLCjRFwiOEEcRnxFWdEgsA8EJ/Tv33HPN58jsjQLrRxyL2IMQN+ECjpdV0GeImLB+REIaxCJ83/veZywwMUYIXHiHeArrPcTBxLjQd7CA2Am3dIhlLLEJgDvcsWEJCQtVZEq3Chja3ffhlg1rWMwLRGEIlRCBIVRC4IagDVES83HXXXfJe97zHjMHEIiRfRuWt4hbmsqCk7xfRUgkoXm5t122D3RpNuxwKpuIWheCSe8Y6FELzAGZW1gux5XXagzJcilWMdIKED0hHWEjJEACJEACJEACJEACJEACGU8ArtRT6qqktQMJWvtk87a9smL5Agn4Cw554gTUw6qsVL3W9N0qxlhE40Lu2tskrW1dJj5kTXWFCQuV4cV7fK4MH2i2dT9nJ66lvefr9dVlX8umCX3yySeNYIg4fHiHwIeM0RASvRZYrMGlOVqiGGyHEAkh08qIbK8brrgQHrHd7rKLix9iQ+IFMRRu2PaC2IA7d+yUikr9lUePteI4wv0XL6s/sLKEmPWtb31LrrzySmNdB6u6aP1FG7DQgxUkLPRQN90lva4GMULvn//8ZzNnyHpuFYshxGPwh8AL4RihAD75yU/KjTfeaGKDwgoSrvCYf7wgVCOD+3e/+10jFMM1+1e/+pURIU8//XRjNeslRmRYFcaX20ekcWBEjqvV2J8aK9KtwBLyvs59sk5FyFiZsL0TSX7PYl++rC6vk7MqpkqZS5iE5GvmkSRAAiRAAiRAAiRAAiRAAulAYFfjAdm+q0kqykpk9TELUt6lYU02s3n7Pln/2k4jKC6YO02WLZ5thEe351w8gwXVMAT779BENhAkF8+fKUcfNecwsXIsHUW+hqde3KRGKmFZvkTzRUyQpaVqAXep9vHmsfSdx04OAVpETg73CWkV1mZuYmGsxmEtGStzMbbjAhdNzIM1ott2fGYl0HGrH+Lm7Dmzjchp3w4rO3syFHvfIXTC6i6esGgJozg23r4TMjEZ1Mh3vvMd4zINC9M777zT9BzM//Vf/9Ukrbn0kkvlV7/+lXzxi1801o0QwWEpCxES8warSXwxWUIkBEfMMeKSQsC87777TL0QlyGkw9IWImWqypAKkYgJ2adC92QXiKJdoaBJlFMmdL2e7Plg+yRAAiRAAiRAAiRAAiSQaQTwbDtv9lTzfLXh9V2yRUXJppYOI0jWqOt2pQqgCPMU1sSX3ZoAc29Tq+zc3Sx9A0MyEhkxIuSi+dOzIhSUMmBQ/UxbwAf7m8tCZIZOWfRuz58/X971rncZAQiJYCC6QfRJpMTbfyzbYwmc6KNbNmuncAh3ccQsRKzCWIKofcxe90uEU67sC8ERVqxYU9b84R1rDZ/Nmj3LuOXDUhZu9ojvCQtcbMOXI9aLNYf4G+7d3/jGNw5th/D49a9/3RyL+YdYneoShjWm/m+yC3qAjN2xvi1b+4PS2BWUQf01kSXzCVQUFcjsqoCUBBK7Dmf+yDkCEiABEiABEiABEiCB8SCA3DTFmj17/pxpmoy2QNZv2iFd3b2ycfMuCWiyxPx8TZLpyzPPYkh+OTgUNB6G5WXFKlbOkJnT66S8tIQGOuMxOazTMwEKkZ5Rpf+OiJv41re+1VxUIAhlY8H4EHMQyWxYxp8AhMNYBYIjkgIh7iZc4C0LVnzxuRVYTaJObMc6xTzC2tKymowndI//iI9sYVphicwMlMrwwSQ0HZoVG/9OdXl8W7fcvq5VNuzrVR6prp31TQaB0kKfnLSgUr50nvfwGJPRT7ZJAiRAAiRAAiRAAiSQOQSQ3LJExcg5sxqkuCggB9q7VYzsESSj6e3vM8/LECOL9FmtorxE6tSCsq5Ok9NoXMiiosKEMm2nOZWcDTWY5vMSt3sUIuMiypwdIAIhe3Q2l0TiXWYzh3Qbm5sLPYRGCI6woLSExnTrd7T+IJ1Mab5fZmvW61lFpTLVXywhtWZsCBRLo2bE3jvUJ50qSKayPLWzW+57+YC0tw2mslrWNYkEfPl50jcUlo+cOk2qi/l1O4lTwaZJgARIgARIgARIIKsI4FkLIuTsmVOkuqrMiJCDg0MyOBxSS8iwMfoIqIt2qQqWFeWlGkarKJsEyKyay1wcTC4/GVE9z8UVzzGnnIAlOMaq2G4hae2Pz9JNoIQAWazu5BAcpwZKZFFxhREk8TlKeZFf6vxFUu0vVEGyT/YP98ugftHD5Xqspbl7WPr6Q2OthsenEYGIZlXq0TntHgxRiEyjeWFXSIAESIAESIAESCBbCODZCkIjXiwkkCkEclmIzJQ5Yj9JIO0J2MVIS3S03iE2ZkKB2FhRoK7mReWyrLRKqgsKj+h2vn7R1+jn1brfAt3vxd422TXYqxm5hwWxKFlIgARIgARIgARIgARIgARIgAQmhACNyyYEc+ob8aW+StZIAiSQawScFo/W+C0R0p4wKFr8yMlmVqAiI1yxT61scBUh7f3TvPFSppaSZ1ROlbkqSBb6mIxksueP7ZMACZAACZAACZAACZAACeQUAQqRGTrdtIjM0Iljt0kgXQg4hUX731ambadVZLqKkckwDaiA6dP/sZAACZAACZAACZAACZAACZDAZBKwQl/BEMR6FpvM/rBtEnAjQCGS64IESCDlBCxXbbf4kZZ1ZDaJkSkHyApJgARIgARIgARIgARIgARIIEECTzz9sqx/davMnztDLjr/1ASP5u4kMDEEaMYzMZzZCgnkJAE3sdH5GYRJFhIgARIgARIgARIgARIgARIggbERGBoOSn//gOCdhQTSlQCFyHSdGfaLBLKEQKYkq8kS3BwGCZAACZAACZAACZAACZAACZAACaQtAbpmp+3UsGMkkBkE3Nyv0fNonztHRRft1M1zYUmBzJhSInOnFEtYk5VvaeyT/U19MhIZkZKygFRVBKR/MCSd7YOmUV9+niyaVyF7WwYk4PfJ1JpiqSw5MvHO2k2dMmNqsfQNhKW9Y0jCwfBhnQ4UFcjC2eUytSogw6GI7G4ZlP0H+iU49MZ+06aVyqy6YikuzJeu/qDsau6XjrZByfPlybSppRLRPrZp3cGhkJRpPxtqi2RgMCKN+3sPtVVaHpCZDcVSXeo/9NlQcETWb+mUOTNLpac/LB2do3WgT/U1RVJU6JNtO7tl5dIaKdIxWqVb992rfezW/VlIgARIgARIgARIgARIgARIgAQmhkAuC5H0B52YNcZWcoCAV9ExG1GEZUT/p6rfJJdSFe9WzK+Qo2eWSSDfJ6rrybLpJfLwawWybVeP1FYVypqFFbK7dVCePyRE+uTiY+vk7ldaZXg4IlMqAzJPBcCpWld5Ub6sUyET5SVfl5ylQt5uFQ6f6Q9J/0EhEl71BYECOW91vcytLRbVFCVf/7Nseqm8vKtQXni1zYigs2aWy3lH10hJIN/0K6ACaOPUEnlwXbt0dg7IyYsrpG9oRJ4aapfi4nw5cUm1zKwu1L53HEa1TsdwztJaKVdxcZeKlih9g2FZr+02VBbKaYtL5NFN7bK3sV9mTSuRM7Se15v6Zbvu9/5Tp8tuHXdT97CEtBPN+t7aPSTdkzxvbJ4ESIAESIAESIAESIAESCApAvpkwZKJBHJZiMzE+WKfSSBtCTgT1MSzdEy32JD4FhuIqEVdaEgq8gOSHyd2ZXhkRLrDw9Klr5D+e7LLsWrZePZR1bK/a1ge3NhqLFLfpgLh+0+bJt/tGJbSIp+KjMUyGHxDNMU+C+uLpabML6/v6ZV1O7rkgAp0p6hgWVlcLI9ubDfDCgVDMr+uSK0sR4zlZP/BwfoK8mXxnHK5+vgpcveGdlmrx1cW++W8ZTVy+ao62bKvV3r7QvLuU6cqT5EHX+tUAXBIjlGx9IS5FZKn//vz442mX10DIWlQ8XF+Q4mcNL9SNqoIumffqBBqlVJYOZb7ZVfbwBt9C49IaDgsr+u+l6mo2q31FGhjq+dVap+L5c61B2CeK2tml8qT2zrluW1dMjgUkSEVU/tUVGUhARIgARIgARIgARIgARIgARKYOAK5LETSInLi1hlbyiECECCjZcsGBkugxHu0fScDV3BE3YCHeuWlPJ8sLi6XGn+RFOblq5Uf5LI3CgTIgUhIukMhea2/Q/YN9smQCpiTWaCZnraoSg70BuXPzzRJt1oL4rMft/TL3z67Uuqq/OIviB0SeEAtCwfVZTqkwt7++iKpKvFLk7p1xyqBgE/eeWKDPL61S+55scW0izKk7tlXrJ4ix6qg+NqeHjltXpX821+2yqYd3cate5+6gg+GRuTK4+rlL080Gr6F/nw5Z3mNzFV36pdUFL3r2SYJh47kGo5EpEddvrt6h3UxiXHpRmlTN+t/bGiV1SpwrlZxdEjrf0JFR3wO92+zj/LpUKF1WMXYsG4PqoDJQgIkQAIkQAIkQAIkQAIkQAIkMHEEclmInDjKbIkEcoCA3QLS/m+fT92EVTxys5B0CpbxrCjHG2NfOCSv9rXL1v5OWV5aIwuLK6TaHxC/CpIoERUh28NDsr63w+wD8XLybSHVPVpFvClqKbhbhUBLDISR5pBa/u3tHFa35SKN3Zh60Q0C30yNC3n7SwdkUONHWqVDBb+9HYOyUK0oW7qGZJtaMLZoLEYrtuSAbt+vfZ1eXigQM6FELlDx82QVEX/7fIv8U+sbimKtWFlcIGcurJRSdfOGhWaLCosPPt+s60vkGbXKPH1xlbxpabXcpnU8rsKkvZynFqNz1fV8WMXWbSrSvqwCar/2hYUESIAESIAESIAESIAESCDjCNC4LOOmbLTDuSxEpoN+kKHLht0mgSMJRIsTGS1rtptrdrq4aw+rwLi+r012DPbIUSVVsrikwgx480CXvNrbKX2RoMAyMt1KYUGe5Ku79CFLQu1ijyanieh4xqPA6rJKXbHLVBz0HbQ6tNpBHEYIfmWanKay2HfEduwX1n4Nq1gKlKtmlMqG/X1GvESMyPvVstOtDGosyy7NxNMIYVOH1a5CojUTfhU1KwoLpCiK9WeL7rsPyWy0X9024XQ82LBOEiABEiABEiABEiABEiABEiCBIwnkshDJ9UACJJBCAnZrRktQxGeWRSSaimY1mcJupKwqxH1EDMhXettkqwqQEMv61SUbbtjpYQf5xlBD6u68uXnACHNlahnZ1RE27sgVlX45XuMx/vyRRt0WMclk7JmjISTO0AQ1iKmYTAmpe/NDmztkhbaxbrvGXlTXbpRpGuvxWP3s9882yzaN9VhfVih12k6rJruBVWSlbl+syWS2a/IYS0S859UOufPlVjlxQaW6VpfJ9uYK2aau3M4yoG7fr2qdT6r1I46NqKhoVXLZmqnqth2S3zzXbMaKv//44J5DVcDle+1mtWSFazZiSzqyfyfDgMeQAAmQAAmQAAmQAAmQAAlMCoHkHmImpats1E4gl4XI9DNn4tokgQwlMNku1eOFDa7YAyMhGVQBEiVdLxoQSZ/Y0iUXHlMjHz1vlrywu0djMIblAs0w/di2bmlWN+jB4ZAR6dZoUps2TSDTpaLhGs2yDcFuV8ugWibGT9xylCaS6dQ4jq09wybpzf72IfmrulL/x2Xz5K1rGmTT/n6pLCmQozVr9tYDg/Lqzm5j8XjHugNypcaMfE7dorvU5Xq5bp+qIulvnn7D6rG9LygH1I38vnVt8ubVdXLZqnr5X7VexN3F1adOkz88uV9FbTEu2cgG3tJdaeYE8SjX69hn6mcnzSuX+zXT9ovbu+WkRZVy5pIqeVbjRe5SARLlGG0XivKQ9h0WkXs0fqTlyj5ea4j1kgAJkAAJkAAJkAAJkAAJjAsBCpHjgnX8K81lIXL86bIFEsgBAk4R0nLRtj5PxDU71bgKVGUr8uVLgZr+jSWzdSoESGThLtBEOOjLeJTtmqH6EXVNXjmrTOZrvMVeTeiyo3VAHlcLwC7NVB1Rwe6RTZ1y7KywzFKLxEVTiqVQXZh/8mijtGgMR2NZqCWkIl3jwaQz9n6uVyvEOXrcNI0JWVNaYLJcd6iguWdvj9z+ygH9zC9z1K0a49yg+67f1SOIBQkl8a/PHZDTllZJrWbnrtZjezRJzIbXemW9xmgcUUvN15r6pV9drof0846OAXlqa0D7WSZTNXFNi8aaLFX3boitnVrfVhUP67WexVNLTPf69LiNKjxOqSiUR3Ssa1V4bdF9XlArz0IVLWep+LlLhdn7X+80lp/ztI/Ib9Ok2cXbNL5kt4wm2GEhARIgARIgARIgARIgARLIHAL63Bk7G2fmDCXnekohMuemnAMmgYklECtZTaxtqehlYV6BLCupNFm8kd0artaTUSryAzKjsFSzcVdIab5/XLowpBaO61WI26MZqafWFGocxIg0q8Vil4qKlii8ZWeP7Ff36AbdjqzYB9Sycc++vsNclGHBCHfqva2Dh/XzcbU03KACYP7BWJBDanHZrgInXJwffqlVaqoKpbKsQJPiROSAtturIp8pKvo1N/fJfRqrcoq2i+zdHT1BaVeBMahiKXTZ59SiUfVIGVBxE9msN6tw2KrWkYjD2dcXljtePCD9akk5rKLjQxs7pEKtLq2CceKYPQcGZKNaYA4ohxFVGpuUA9qs0HFCxPydWl8GbLEj+9QCtOegK/m4TAgrJQESIAESIAESIAESIAESGE8C42PhMZ49Zt2GQC4LkakwcuIyIgEScBCA6BUtcQ12xTa7leR4unXD+vC4sjppCJTIRn+nbB/olo7QkCA79ngXfCvCGrPaXygLisvlmJIamaH9gMXgeBXEPGxVa0C83Aq2d7bjdbjIaN8XiW66O4/MsN2kiWTc08eIDKvg19SkrxgD69Hs2Xg5C0TCA5rB2l4G1U27UV9WsWJFhtRicncU8bBR+2cvGGtHG16jY928rWu8sLNeEiABEiABEiABEiABEiABEiABjwQoRHoExd1IgAS8EbCLkBAcYfWI4iZORnPb9taSt70gRs5Ra8Sp/mI5Si0SX+5t1+zX3dKj1pHjkfkaMiNcsMvU8nFOUZmsLKvR9sukWEVJFhIgARIgARIgARIgARIgARIgARLIZQK5LETm8rxz7CQwbgQsC0cIj/aM2fYGraza49YJl4oLVRCdX1Qu0wtL5KjBHrmvY590BodleCSiMQNTYyDt0zEXqgg5TdtYU1Yvx5RWj6sF5ETyY1skQAIkQAIkQAIkQAIkQAIkQAIkMFYCFCLHSpDHk0COE7BExXgu2RYmS6gcT5fsWFNSlJevlpGVsqCoQjb0dcizPS3SNDRgBMmxFFheQuRcpa7gxxRXSUl+gWakHj837LH0lceSAAmQAAmQAAmQAAmQAAmQQCYT0OfJsT3AZfLgM7zvFCIzfALZfRJIBwKJiIuWi/ZYrCLh7F1fKHLP3hHpHBqRM6b6ZE6pd9HPp6mcC1UkXF5SJVP8RbK+v1M2qijZFoweOzEW53p1+z5WXbCXqcBZozEhERvSe2/SYQbZBxIgARIgARIgARIgARIgARIgARIYfwIUIsefMVsggawmEM2yMdbnY7WGhKHhlJI8edtcn+zuHZH790WkoThPTp6SJ3WF3iVACIbTNIFMia9A5mk8x52DvRo/skv2D7kne7FPJFqpLSiSJaUVmoymQqb5S6RC40KOZzKarF5IHBwJkAAJkAAJkAAJkAAJkAAJeCSghi2jyQhYMo4AhciMmzJ2mARIAASK9GtnWWWeVAdEivVKtk+TJt+7b0QaikbkhDqfVOjnXiRJuFTXqhVjVUFApqiwCAvJDX2dKkp2y2AkLM7okaizOD9fhctKY1E5U92xcWyA34NcmCRAAiRAAiRAAiRAAiRAAiQwUQS8PO5NVF/YTgIEKEQmAIu7kgAJpB+BaWoJWeXPkx0qQG7tHpH2YZGHmiIys0Tk6CqfESm9FFgyQpAsLfBLtQqLM1Rg3KVJbZqG+6VfBUlk2C7VuI+IAzlbs2AvVCvI2YHShC0gu7R/u/tHNLO2yFEVeZpN3EvvuA8JkAAJkAAJkAAJkAAJkAAJkIBFgDEiM3cteHxEz9wBxuh5atLkZiUaDooEvBOwYj56P0ItFVV9G6t7tr09iI2wjlxYnie7+0bkURUi24dE+sIRmaEu3NOL8qTU762HRWrZiOzaeG0eKJXXBzpl91Cf9ldkdlGpLFUryHkqRBYkaAHZFxJpGRyRHepK3qye33PKRK0tVYj01i3uRQIkQAIkQAIkQAIkQAIkQAIkQAIZTyCXhciMnzwOgATSkYA9GU0ssXEsyWqijTug7toQI2eX5suzByL6GpFthSOyvGpUpKzS+JGwRPRaFqvV44zCYtmusSMLNdv2rMJSKda4komUoOZyaxkYkX362tIt0hMckaOr8+SUKYeHNCnIV1HSl0DnEukE950UArB2Dfh9Eshn+JpJmQA2SgIkQAIkQAIkQAIkQAIkkHYEKESm3ZSwQySQWQQSTVZjjS6VFpFOYhAkT2/w6UvkPk1k8+h+FSTVbft0za5dq2JksWqJXjW/Up9fjimpTnhSImpBORgWaVIB8vZdEXXtFjmlIU9W1+WrmHlkddM1qGVdVaGodpp4McfEOlAVMWqciXMd4xGFuhDnTymRaQhYykICJEACJEACJEACJEACJEACJCAUIrkISIAExkTAsmy0hEWnwOjz+SQSUbNARxkPi0i3gZw33SfH1Y3Ik80jctPmiEwpFnnbHJ8gtuR4FYiQ7cMj8rfdEdmuAui5M3yyukYT6Kh7eDQB9ONnTJcLl9XIltaBhLs1ooJnKByWCPzHHQX8aW2ZMNKUHFBTUiBHqRDJQgIkQAIkQAIkQAIkQAIkQAIkMEogl4XIZOyOuG5IgARcCEB8TDTu43haRNq7COGvJpAn507Lk1W1ahnZMypIIkbj5bPzpdxj7EivE39A40A+oqLn080RuWimT86f5pN6jVFZFMcK068dnV9XJLOqEreeG1Hlc0h9wMOaVMetQIz0F+RLAWCMn/7qFVHO7JevcUQDicQCyBkyHCgJkAAJkAAJkAAJkAAJjJkAn2zGjHByKqAQOTnc2SoJZA0BN0HRaSU52YOF/lamgmOJikIVmmG7VuNGvtoxIjduDstiTXJzfF2eNKhYOJaCRDQvt48KnWjjPYvyZbYaw1WqCKrhHz2VgHY0EEgsBiUqjqgQWZA3okJk9GN9ul31SLWOzFerTGbr9jQh3IkESIAESIAESIAESIAESCAtCegzZ+IPTmk5ktzrVC4Lkbk32xwxCUwAgUQtIyegS4eagCAJg8NyFQor9Oq3R7NX7+kbjSO5pCJPk8j4VKxMrEdD6nW+ti0iu3pE/PpViEQ0U9Xte5Emx0mnArftEQ1UOaL9Ne7aKspCkGQhARIgARIgARIgARIgARIgARIggYkikOAj90R1a0La4RP4hGBmI9lOwBIe47laO7dPVIxIN/6wUJyrQiFer3aNyFbNZr1TBckDqipOKRJZVumT0hgu24jrMKiC3mtqVdmklpAdQ2pxqVdTWFcuUEFTjSDHvSAc5GhMyBG1iIydqsbqDHYPqxJpRMkRzSCu7tq0jhz3qWIDJEACJEACJEACJEACJEACJEACBwnkshDJRUACJJAiAk4rSOff0URKWOaFNcnKZJZlKh7OKYEgGZFNKkq2DmqiGRUkl1blyQz93OlWPayiX4tmwn5N920bFhlWK8PFKj4uUfGyOvHwjmMaOlyykQhoVFj0HvYW+4a03ziuwJcv+TrIPDUXnQD9dEzj5cEkQAIkQAIkQAIkQAIkQAIkQAKZTYBCZGbP32G9Hxoaku7ubhUV8qW0tFT8fr/09fVJb2+v+busrMyIFfi7p6fHCBjl5eVSXV19qB6IQqgDx6EeHIN9UHAcPi8qKpJgMGiOr6qq0ph2b6gvBw4cMElLCgsLJRQKmf3Rtr0N1IPX8PCw2Q914B2lpaXFuI2iDWzHq6Kiwvzd1dVljqusrDR1on8o6Au29ff3m/3QFsbOMjkE3BLXuMWMtISzdHDlhvXjCXU+WVopsqEzIo83jUi/6qPdQTEWklUHTRy7g2oBqUmtd/SOyLq2EZOMZqkKkMVjvJKCxdBwUNdyRO0bExEUNUGNCoohPRfhcp1sgZt2Qb5Pz10NInmwQJb0+/VcLDxcXYX4Oazn3HBwcgXkRMaKsZSWFOq1hVJrIty4LwmQAAmQAAmQAAmQAAmkKwF9hhrDE1C6jio3+jXGx+fcgJQpo2xsbJQHH3zQiHEnnniiNDQ0yPr16+Xxxx+XE044QU4++WSBUPj888/Lhg0bjMi3dOlSOffcc2Xq1KlGpNy1a5c89thjsn37dikpKZGjlx8tZ5x5hhEj161bJ88995zMnDlT2tvbDZYLLrhA5s6dewjRHXfcYSzcsA/aQj2LFi2St7zlLaYOiKVPPvmkvPTSS9LR0WH6ePrpp8vRRx8txcXFcttttxlhc8aMGYLxoJ3Vq1fLggUL5NFHH5XNmzebvzEW9HlwcFB27Nhh6sR7fX29GQ/aRH0s40/AEh7tgqLdOg+CtVUgGkPohliM/bFWErHkG+/RIKHNSfU+OVa1+UebInLL1rAcU+OT1XUaV1E1LCSj2aqWkIvUivLTy1Xw1ytoKqSt4eGQNDZ3SEdXb1I8jHSZgEWkG0czDlvMSJ8KkxWlRbJgzjQzV1YZGBySptYuaevozpgYk6qdyvLFs6SkKHDYWMZ7PbF+EiABEiABEiABEiABEiCBcSPg3YJj3LrAipMhkMtCZCr0g2SYj9sxEO5+8YtfGGtBiH54QTj8zne+I+9///tl+fLlcv3118vf//53Y3UIwQ9CH0S7e++911gbfuITn5Cnn37abIfFIcTIj3zkI/KFL3xBHnroIVM/xERYOy5ZskSmT5t+mBD54x//WJqamszDPiwUYXk5bdo0I0p+/OMfl4cffli+9KUvybZt20z7EKJqa2vle9/7nhErv//975tjUGBNiVddXZ0sW7bMCKoQrWAh+c1vflOuu+460yeMCSLplClTpLm5WWbNmmXqu/zyy8eNNSt+g4BdpIpn3bhlyxa54YYbzDynkwDpnE8krLlQrR1X1ObJo/tH5KbXw6LGinJig08+tUzPixQJkFa7w3oeRCJhqautkCk1apaZBqWnd0C27Go0QqS99A8Nq/VlWGZPq5PKitI06GnsLsDSdPOORukbGJIitZTOV+tPFhIgARIgARIgARIgARIggYwnwBv7DJ3CXBYiM3TK4nfbLvDg35bVGYRKCEFwt373u98tF110kTzzzDPG8hAC0u9//3vZtGmTXHbZZfLe975XWltb5cYbb5Sbb75ZrrrqKlMPrNvqauvkiiuvMPvNmTPniA7BSvGaa66Rt73tbfLEE0/IT37yE/nDH/5ghEOIjOedd558+tOfNsfCghLbIFBecsklRpzC8R/84AfllFNOkbvuukvuvPNOI66++uqrRnSE1efOnTuN5eY999wjnZ2dRty89l3XylNPP2VESmyD8AqRlSV5Ahs3bjTroK2tzVjaXnzxxcYVHgI3LGsxh7C2hQWrVSBU33///WZdrVy50gjWWHP79u2T++67zxx76623yllnnWVEaIje6VjwrdZQlCeXzcqT06eNxk+sVBEr1SKkfexwjy4qTI+wAhDwohVcL/yaIjxd+hpr/aCvSMrDu5R0PMvYJxIgARIgARIgARIgARJIjoDe56fng2Ryw8mpoyhE5tB019TUGJdYiI1/+tOf5IUXXjDuzWvWrDFWhhD6IBRCYIJlIQRBuFZDeIJgCVdulONPOF4uveRSOfbYY/UB/8glhDbgan3qqaca92vEf4S1JUTGo446yoihTz31lPztb38zfYG4CetJqyC+48KFC417OVzL4WKN+hYvXmyERVhGok979uwxruSIK3n77bfLiy++aPoP4QyfYwwUIse2wG+55RYjIB5//PFmPsEUwjQsYqdPny6vvfaa7N6922yDyzwEYljFwhoX7vQQkeF+D9ER6w8WtlgzEJZH1F82na0iQQ6JauCuXQIrOv3/eH/TQSybzGzi9tUCb2x4ew+p23gg4Deu6YcV3SFd+hpbiBzbOcCjSYAESIAESIAESIAESIAE0pIAbQ3SclridyqXhciciycAi7ZPfepTsmLFCiMG7t+/3wiMEO0g+llCIwSmY445xrhmQ1yCkAhhEKIhCgQlWLJZCWacywwu1xCcICBiH7vFGyzhnn32WRPLEdZ0ECCteJNWPWgXdVgJd3A8hFIrCY4lfqC/sL5DO7B+nD17tqkCAin+njb1cJfS+KcD93ASQDxHcD3nnHPMnEH8ff311+V973ufcYGHpSTc+uEaj7igWCMQn2ENi3WEY//6178aa0pYyUKcRHKi41cfL5VVlWaNRYstmU6zkbs5TtSiGslpVIzMV2vNAmcK8XSaJPaFBEiABEiABEiABEiABEiABEgg7QmMt4FP2gPIpg5C9IOoA6s1uL8+8sgjxkrQKvgcQhIs0uBOC9dn7P/KK6/I1q1bZf78+UbUg0UjxDyIkRADYX2ITNVO6yeIgDj25z//ucCFF67b8coDDzxghE+IWMcdd5yJ65hsQT8himI8qOeMM84w8ShhYQmrSr9acbGMjQAERIjQEHZhvQgLWbhhY/0gSRGEaojSyFoOcRvrCNtgZQuh+bTTTjPrCeIkrCitDOnTZ0w3YrWV+Ry9THfryLGRzNyjIwjvoOdUKBSWYX0hS3cimb0zd+TsOQmQAAmQAAmQAAmQAAmQQBoTyDnjsjSei4S6lssWkQmByoSd4WYNizO4Lt99993Gcg1uy1axXKwhHkJMsiwOIShBwLvwwguNqy0ES8ReRNm7d69xrc33jVqu2QtiMyKT9U033WTqQtvxCuqCaAVBC8ITLOqSLbC2g+iFPq9du9YIpvg3rCwhnrm5jSfbFo8bTR6E9QRLR/tagPUqXO+RkAjvq1atOswKFiI2rFohXDsLRGNLgESdmeDqm6trAYJkJGTFnM1VChw3CZAACZAACZAACZAACZBAOhDQ50hNJ8qSiQQoRGbirEXpM1xjr7zySiPswPIR1mznn3++EeQgEuJ12aWXycDAgBEpIQJBGHzzm98sJ598shGL4Ip72223Gcs2WKvBSvKKK66Q+Qvmy7x584wFnLGcLCk2wh/2gYhZVVllRCS4fUNwgiiKgozXsHy0rN+QJOePf/yjiTsI60skMkFB/EccDxELghfqRL8hNuJ4y+3a+htjQX9gbQfhEe7ecDPHGM4++2yTEAeCGUvqCEBwRNIZZDy3xENYwWLNwNrRigG5Y8cOs7awNrAWIE4iZiTmG4WWj6mbk8moCXEjWUiABEiABEiABEiABEiABEhgkgnwyWSSJyDZ5ilEJksuTY9DbD5kw4YAZMVq/OpXv3qot5dedqngBatECH4QiPCyyuWXXy54wdoR4hKERKu85z3vEbzs5UMf+pDJwI0YjihIZGIvcP9GUhqrIPs2smOjbriSW+KUtR0iqL2gbryscu211wpeVoHYuGzZMiOKIksz+oGX3eU3Tacq47oF0RpCM2JC7tu7T8rKy8w6gts1hGfMA+KOItM51iDmFxa1ECKxHXNdkF9gPm/c1yjlFeVGLKcVZMYtBXaYBEiABEiABEiABEiABEiABEiABJIiQCEyKWzpfRAEH6fA5+wx3GXxilYQy89LMbEY9ZVIgVVdqgv6gJiELKklYHeXBmO49COx0Wc++xkjUkP8Pffcc+Xiiy82cTphWYus6x/96EeN+AjLVwjbsLpFqa6plqVLl8rHPv4xIygjmzbWGq0kUztvrI0ESIAESIAESIAESIAESIAESIAE0pFALguRNONNxxXJPqUVga985SvGstYqSEzzgQ98QN75zndKU1OTsT6FSzaEb4iJECq//OUvS2trq7G4hes8joHlo7X9E5/4hIk1Cff7eIJ5WsFgZ0iABEiABEiABEiABEiABEiABEiABMZEgELkmPDxYBLIbgJOy1jE4LTc+WFRCytJu2s14npCmMQ+iB+Jv+Emj5iRVtxI1InkRthmJatBHbSKzO61xNGRAAmQAAmQAAmQAAmQAAmQQAoJHJ5NN4UVs6rxJZDLQuT4kmXtJJDlBBDr0Sp2ERGiouWy7/wcf1vbKTxm+QLh8EiABEiABEiABEiABEiABEhgnAjoc6VvnKpmteNMIJeFSLpmj/PiYvW5ScASG51CI4XH6OshX8XbsIq0/QND0tHVmxYLp29g0PQj3wdr1cO7FAxGNAnRgPi03+lehoNhCYciwgt+us8U+0cCJEACJEACJEACJEACJJALBHJZiMyF+eUYSWDcCcQTGC3363gdQT3x6opXR6ZuLyjIl+LCgAwMDktnd19aDCMcCUtNZbn4NdN5GK71IyrmqZrnV5d6vz9f+rWvIXW/T6TgR8uJ1i7R76LCAilCGAEVVVlIgARIgARIgARIgARIgAQyn4A+O0YyfxS5OQIKkbk57xw1CYwrgVwWFZMBG/AXSG11ubGIDIfTw3bPl58npcWFKjr6JD+SJ2pYqDE9R6SkpNAIegODQwkPFW75+epAAUvKifSkqCgrkbLSIvFRiEx4zngACZAACZAACZAACZAACaQjAbpmp+OseOtTLguRNI3xtka4FwkkTMBKPgNrSBQroU0si0fsY098k3CjGX5AaXGRCn9FaTkKCHiFPlhGjqiIGJZ8FSMhUiZTMMcFmsCoQIVOCJq8ECdDkceQAAmQAAmQAAmQAAmQAAmQQGYSyOXgnnz+zcw1y15nAAFLcESWbZbsIYB4kYWBAilU9+xkrQuxNoKhkAypiWVIYzeykAAJkAAJkAAJkAAJkAAJkECiBOianSix9Nk/l1UCCpHpsw7ZkywjkMuWjVk2la7DyS/wGUHSr+/JxnyEtSwEycHh0BHJcHKBIcdIAiRAAiRAAiRAAiRAAiQwJgLpEdNqTEPIzYPpmp2b885Rk8C4EoiWOdtqNFeT0sSCjviLSP4you+ZUEZ7if+i35poSJPbWD1H/EefvvLV/dpZImoRGQmPJr9BgZA5NBQ0oiYsaDPyFyLtdIEvXyDQspAACZAACZAACZAACZAACZAACUQnkMtCJNcFCZBACghY8SCdVdnds61YkaPC02gsSIqRbxALq4tyc1undPX0ZyQXk5zI6JKjUiTERn+BX6bWV0tALSetEgyGpKOrV3r7+1VwPFxyzPgYoTr0qVOqpLKslIJkCq4rrIIESIAESIAESIAESIAESCA7CVCIzM555ahIIG0JUIA8cmqGQ0Hp6x80G6oqStJ27rx2rEfHMjAwrJm2QxKQN75mwuqOPTg0bKwlqytLvVaX9vtBeO3ohMA6KCWaxCe/IJD2fWYHSYAESIAESIAESIAESIAESGAyCOSyEJmRHoCTsUjYJgnEIuAUFpOxdsx1cTKk7thwUa4sL5bpDbUZv+DaOnqkKdip7tqHDwWCnU/dtUtLS7JinNboILAi8U5YXc4PGoVm/BxyACRAAiRAAiRAAiRAAiRAAiQwHgQY0Go8qLJOEsghAs7ENFZ8SOtzu1u2E4slQDK5TfYtGMxpQUGeWj/yN5/sm12OiARIgARIgARIgARIgARIgASSI0AhMjluPIoESMBGwB7fz4tFJAXI7F8+0B8L8n0SKNAkLr7RuKAsJEACJEACJEACJEACJEACJEACuU0gl12zc3vmOXoSSBEBp1u1FzdrilIpgp8B1SCTtE8FyWBoRPIpRmbAjLGLJEACJEACJEACJEACJJD+BPSZkpYO6T9Nrj3MZYvI0fSuLCRAAmMiEC/bsc935GXGi9XkmDrFg9OKAG4RAv488WsG7QKX9ZBWnWVnSIAESIAESIAESIAESIAE0p6AGsA4ItKnfZfZwYMEKERyKZAACYyZgBcrSDRi/WhlxZEcc8OsIKMImC8c/m6ZUXPGzpIACZAACZAACZAACZAACZBAKglQiEwlTdZFAjlIwC1rNq3kc3AhcMgkQAIkQAIkQAIkQAIkQAIkMHEE6OU6caxT2hKFyJTiZGUkQAKxrCOtbXjHC27bFC25ZkiABEiABEiABEiABEiABEiABEggNwjkshCZGzPMUZJAmhPw6tad5sNg90iABEiABEiABEiABEiABEiABEiABOIQoBDJJUICJJBSAk4Lx0gkegzhWNtS2ilWRgIkQAIkQAIkQAIkQAIkQAIkkE0EGH0+Q2ezIEP7zW6TAAmkCQFnBmy7+3W0LkZzx6Z1ZJpMKrtBAiRAAiRAAiRAAiRAAiSQEQSCwZAEQ/oKhiUUjog/EBDYgnR190lBQb748fIXZGNILAqRGbFCj+wkhcgMnTh2mwTSiYBdjHQKk279jJY1O5fjRSLSciQyIuFQdAvSdJrzWH3BDZCGANXiMLrP03sF/XxEt2fDOC0GoUjYzB2Gx0ICJEACJEACJEACJEACE0EAz1TDKkK2tnXJnv0H9L1bevqGpLa+XobDIk8+v1EqKkplWn2VTGuolaLCgInRny1Fnx15952hk0khMkMnjt0mgXQhEM2K0U2QtH9X0PrxjRks0BsC/ILZ0dkhbZ096TK1SfdjWMfiL/BJQf7h9wb5eq8AkbK1o0c6e/qSrj/dDlQNUoaGgnqDV603d7wfSrf5YX9IgARIgARIgARIINsI4Ed9PDese22bHFABMqI/jMMQwHrGgoVku27v0NfuPc1SUlIoq45eJNOn1hoLyWwoOlZmzc7QiaQQmaETx26TQLoRiOaibe+nlS3by77pNr7x7E9RoV/mzKyXwcFhFeoy//sUYlxhwC/FxYWHYSvUcc6aVid11eVJjTMcHrU8VHvLpKcjX0VfvFL9AyrGXFFWLAF1e2EhARIgARIgARIgARIggfEiMDQclH1NrbLhtZ3S1z9kmpk1fYrMUJERFpD+/HwJ6n1zT0+/dPb2y45d+6Vf93tpw1YZ0OeNubOmGOvILCi0AMjQSeQTU4ZOHLtNAulOwIuLtjWGRPZN93En0z+Mv6SoUIr8Gs9lJPNdsyUPYl+e+BzeEhhncVFACv3+pMYZ0R89IUQG9Rdg/DuZgj5ANCzIH+1jqu5efBizWoGykAAJkAAJkAAJkAAJkMB4EQiGwrJvf6u8tmWP9Kuo2FBfKfNmT5eqyhIpKS4yP4rjfhf3yhVlJVKv+zfUVMiO3c2yv6VDtmzfq10bkflzpuq+/vHq5oTUq+PkzfeEkE59IxQiU8+UNZJAThKwW8bbhUXEIWF27PhLAszyC/TljKsY/9CM2mOs44T+GCiISEgjcBvryCQEyVF9FP+BeHikYJpRQNlZEiABEiABEiABEiCBnCHQ1NIuW2HhODAk0xtqZMmCGVJXUyn5agVpLzAIgIcSXqVqCFCkRg95+iP8/uZ22bWvRY0DCtUja0qmc0uVTUGmc8i4/lNBzrgpY4dJIL0IJOvimuxx6TV69maiCUBEhOVhwJ9vsgDCqjHRAu0S4nhIXVYQmxMWlknomYk2y/1JgARIgARIgARIgARIIGkCA4NDKiS2SbvGWy/XkEAL501Xi8iaI0RIZwMwDKmtrpD5s6dKlbpud3X1SWNzq3HTZiGBySBAIXIyqLNNEshyAnbrSAg+jCOc5RM+CcODkF2ggqQfgqQmxXG6gXvpEtYlkufAxcW4e6uFZSYIkv0hTY6TBR78XuaI+5AACZAACZAACZAACYwSQOIZJHzE/W/DlGoVIasTQoP9p9RVmczZHZ190tbRndDxabhzcrGa0nAgudalXBYiuWhzbbVzvONCwCkyRhMdKUaOC/6crhS2kEg8g1g4BQUFB5PQJI4EaxOZBYeDISNMwt07Hb8gBlWA3NM3Iq91jcjr+sK/e4OJj5dHkAAJkAAJkAAJkAAJZB6Bzu5+GdCkM5XlpeqWXWvufRMpECAhRNZWlxnX7pbWzkQO574kkDICjBGZMpSsiARIAAQsl2tnzEhssz4zAZTVUpKFBFJBAOsJyaoLkCFQxTqIiclYNoZNzMmwhCOoT6N1pjCZzVjGiUTqvTquHb0jcv8+PW/07z79u1jHfNKUPDm+xmf+nYSX+li6xWNJgARIgARIgARIgAQmkEB//6AMDYWkusovZSVFSbVcXVUuFeVlmrimXbrUujKTiz5b8oEyQyeQQmSGThy7TQLpSgBiY7xkNbSOTNfZy+x+Yd3BOjI/HxaOYSN2JypIYm2GVfmDmzaETb+6fzuSf08opJCKjnvV8vFPOyPSp9aPV8/3ybzyPE3WI7KuIyLPtIzIK+1huXKuT6YVpy4L+IQOko2RAAmQAAmQAAmQAAnEJQArxqHgsCagKZDSJIVIJK9BrPWw/nA/NJjZrjV67594sPi4lLnDRBDIZSEyHT3vJmLO2QYJjCsB+/eBXZAc10ZZOQnYCCCBjU9vsCJhnwQ1IQ0sHRMto/EjQypIaibzg4JkonWMdf/tPSPyeHNEDgyKnFifJ4sr8qS2UK011QunUF+rqn0yt2xEduh+t2yLSLlf5JxpPplTplkSE/PUGWtXeTwJkAAJkAAJkAAJkMA4Ezh0R5si+S3xO+RxHmCC1ev9eqYPIcERZ8/uFCKzZy45EhKYFAKxxEbnd4O1L78zJmWqcqpRrDWfJrEJqChpxMgk3LVxaxPW/4y6a0ckcNBde7xB7huAADkiLfq+SK0fT1H36ylFeVIR0NAHtsbhjl2oYywvyJOawtG4kXfsisiiqjxZU5cn09VCkoUESIAESIAESIAESCA7CBQGkKTRpz+Wh2VoOKiWkfordIJlcGhYjw2Z+OolxYUJHp1eu9MiMr3mI5HeUIhMhBb3JYFxItDc3CwPPfSQvPjii/L5z39eamtrTTYzqwwNDcnePXvlpZdfkhkzZsjKlSuluLh4nHoztmqdIqM9FqQ9RiTFyLFx5tHxCcBZw8SPzNObtjy9aVMxEdaRia49y117WIVJnJcmS/c4BGTsHBZ5qiUi3Rr/MaCn/3G1eUaIbIghKKIbsIRcotaSECrrNVxQ+5DIQ40RmVGaJys1fmS1fs5CAiRAAiRAAiRAAiSQ2QTgjl1UGDAJa5BBe+qUmoQHNDA4JIODwyYeellpcnEmE26UB5CAg0AuC5FcDCSQEgIQEV944QXZuXOnvPWtb5WGhgbjyplI6ezsNCLkU089JW1tbVJVVXWYENnX1ydrX1wrP/3pT+W0006TBQsWpI0QmaioY3FhSI9EVgj3HQsBHxRJtRrMUzfrPI3/GI4gfmTinhywijQZtUcgRI4KkmNdx+gGEs+82hWR7d0iiLjdoPeEiyrzZEZJHrrtqUCQnKGCJV67NanN+k6RfRpbsms4orEjRZZX+aQs8R/NPbXNnUiABEiABEiABEiABMafQHVVhZSUdkhXb7/sP9BhMmDbjVfi9QD3sW3t3SZJTaEKmlWVZfEOSevtTFaT1tMTs3O5LEQm/hSa5vPc398vLS0tRgQLBAKCv4eHh2X69OlSVlZmHpibmprMZ9g+ODgoAwMDsnTpUjOyPXv2GBGssLBQpk6dKtXV1YeNGMd2dHSY+qdMmWLEMqtAjNq9e7e0t7drFq4KaZjaYNpEwTa0hfrRNj6vq6s7tB2fQcxD3aUlpVJdU222oY/OgjpCIc0Upn3D+Lq6usy/0V+rWPV1d3eL3++Xmpoa057VR/TFOh5jwbHYZu/DtOnTpKSkxPQX/ert6ZWKygoJBoNmv2nTphmrRVj7vfbaa3LzzTcbIbGyslLOP/98055djOzt7ZXGxkYzrtLSUjMPmA+IljjGYr5ixYpDiV7Q1v79+6Wnp0ezow0Zfs8//7xpF39PVMGcgjN4oL9ghfHs2LHD8LGEyJrqGpm/YP6hboHbrl27BCJqfX29seTEOLE/xrR9+3bDE3/jhTmZP/+N4ydqfGwndwjAihGu2hr6UYJ5msjGZMlO7KtgNHbkiPgOCpJIaJOsdWSPxgffpWIhktHAirFXM9OcNRVxH9HP5Odlth5fp67cr6mrNty1t/WI9Ktr+lQVKReoheVY6k6+VzySBEiABEiABEiABEhgLARqNON1dUW5dHb2Sktrp7SpVWR9TaXnKru6+2R/c4f09A1IQ12l1NVUeD42TXdM7EY+TQeRi93KZSEy6+Z73759cueddxpxB6IRREkIRieddJKce+65RpB74IEHjCAGt14ITBC0/uM//kPWrVsnDz74oBGXIJStXr1azjjjDJk7d64RmzZv3iz333+/sfqDuHf00UfLKaecIvPmzTMio3U8xDKITieeeKKsWbPGCHKtra3y9NNPyzPPPGOET/QDVn0nnHCCEes2bNhg3JIPHDgg5eXlps3TTz9dFi5ceMQvPH/9618FAiP2gZgH8XPRokVy0UUXmXf05bnnnjOWheBRVFQky5cvlze96U1GwLvjjjvMMbAoBB+IYxdeeKHs3bvXjB91QixE39B/jBV1oU6MFcxeffVVgWAIpuVl5fLSSy+ZMaD/f/zjH41YB+YYi1XQ5v/+7//KzJkzzXYIihAiwQEv/JKFOUPb6DOYv7rxVXngwQeMAAmOGNtElrDGHkG/Ye0JlgsXLJRLL7vUiK8QEf/2t7+Zf1uC8VFHHSULFi4woiLWFbhBpIXoCOEaTMENQjLq/ctf/mL44oVjME8UIidyhnO3rXzNhO1Tq0YIiljno1aOifGARaURMvXlzy/QeJSjbuBeyqAKoe3B0SQzGztHZEAFyQtm+mRRhVpZeqsibjMl+u2+Wl27l1fnyU5t51FNerOlW38UCvmkoUQ0pmSeFHkQO8OanntYz9nIiNpqJsgobie5w4QQyNdYUn5kk7eF+5iQhtkICZAACZAACZBASgkgpmNDfZW0d3brM3G/bN6O591CKdVXrB/GjSHJwKDs2N2k4mW3FBf61ZqyWirLS1PaP1ZGAl4JUIj0SioD9oOwBiEMYiKERgg+ELRgrfc///M/xm0YQiVEQTww4wVxDWLR+9//fiMYQjyDWIj9rrzySrn++utlf+N++cIXvmDEOGs7BKhLL71Uvv71r5v2rrvuOmM5COtCiHX/+Mc/TJ1vf/vb5e9//7t88YtfNMfC6g3tQLj8+Mc/bvr5jW98Q5599lk59thjjTiIuiFkWZacdvS33HLLIctC7AeXZghZr7zyinFbhsD11a9+1Yh3CMALazwIfOjTRz7yEdMXjAOCH7bDehF9uvHGG404OHv2bGPx+Jvf/EY+8YlPGAHziSeekBtuuMGIgWCKvv3hD3+Q97znPUaM3LRpkxHqYKGJOjZu3GjGYhcit2zZIj/84Q+NIAdBFKxgZfjkk08asRgiKoQ9cHjHO95htn3jm98wfcU8wfoU45jIAgERvMHWsmqFEAkGGDPGi1iVsA5FgQCN/SCEQ5gF68svv9yIr3fffbdZUxCQIbTCUhJzBzHbsmbF8SwkMFEETOxIVf3y1b06FAxr/MgkYkdqZxFzMhwJSkEEYk/+6LU1yiBU91Srx1EryBdaI9KlVpDHaVKZMxs8KIJJgoHYeJS6ec8tz5dH90fk9t0RzaqNLNw+maeWk8UqoEYLdzkcDKnrTr/5tR3xhMIYAEtGEcD6Ltd4UrB4qCgrTdp6N6MGzc6SAAmQAAmQQBYTmNZQo8/rQ7Lh9V2yt7FVCvRGbvGCmZp4psjEfbSe84EAP5gH9dltUO/jNm3bI7v3tZoflhctmCEL540+w2Vy0bGO3010JoPJgL7nshCZIruT9JtlWKi9+93vlve9731y1113yZe+9CX52c9+JqefdrrpLASms88+Wz73uc8ZUeif//ynbN261Qhvn/zkJ+Xhhx+Wn/zkJ8aiDeIR3IPvueceufjii+W73/2urF27Vn70ox8ZARNiE0Q4CICf+cxnTB2wOoRwh3ph/QghD1ZHsLyEuHnffffJtm3bTF/QLtqBcIfPX3/9dfMOcRBineXebaeMz6+99lrTFqwsv/Z/vmaOeeXlV6Szq9OIi7DohFXmbbfdJt/61reMyAch0irHHXecERIhjMEy7+WXX5aPfexj8uUvf9mIiZ/+9KeNSAjhEAWi5axZs+TPf/6z/OlPf5If/OAHRqA75+xz5IMf+KDp62OPPSa//vWv5cwzz3SN3wiBDoIoREzUCx6wUAUniK72AmZgtGzZMsN1+rTp8u3/+21jmTpRBevkqquuMmIrWECARIHYCKEXfGHN6RQQIf5+//vfl49+9KNmXiE2Y/7Rd4xpyZIlxgIVIuRZZ511yG3entRmosbIdkgA8SMDAbUW0xs1CG/JxI4ExZC6PkOULNAbQL9aoLkZR7YMjsgt2yLSqxaQpzXkyalzfYLM1xNRIEi+aYZPLpghct8+FSR3RmShJrh50wxk3Hb/Omxp65LdjQf0xxftMEvGEujs6pN+DUo/S583qjM8FlTGTgI7TgIkQAIkQAIpIhBQL4e5sxvgiiMvrd8qW3Y0yt6mNlk8f4bU11ZLVUWJSWgTDIXVarJPdu5tkW07G/U+N6jeEfmydMlss2+hSxi0FHVxwqphjMgJQ53yhiboESjl/U5FhVkrRMJFFiIRRDa4F0MogtvwcFBTsmqBpR72gasshD8IaBCKIM5BAIT77Jw5c4zVGyzy4BKMX1YgRKIuWLlBQEKBIAWREiIb3KYhrMGiEpaNqAvi0jHHHCO/+93v5Ctf+Yr86le/MqIbXKkhsmE7rAFhIYn24Sp98sknm/45xTlr0lHv4sWLjSUeXgsXLTSWhBs2bjAC6/r1641gCCtQCJ1w5XYmVIHr9Kmnnmq2w1oRQiIsR62xQFiF+AhXbRS4q8NdHMIqhE4IjlbJ85g9FxaNcGmHWzisK8EZbt1WLEX7ooZgB0EP44TLMvaHBSrc4yeqgD/mB3NrL/gM7v2Wyz5iXGItQfxFwXaImBjvY48+Jv0D/WbMF1xwgXHFhyUlxGtYfWKewBaWlRgnCwlMFoF8PY+LVJCEu3YI7tpJJLMx8SPhxhz2mbWOZDZIPtM2NCL3qPi3q1fkVBUgYaFY49f2kvgG3j80IBsHOtWFWzNqF1fKjIBmokmg4IvvDLXAXFI5ImvbRuSXmxE7UuRidQ2v17iSVunpH5RutYYcHh79AYIlswkgKD3cuSrUBQtrnYUESIAESIAESCBzCRQG/DJ31hQVE/2y9pXNxuLx1dd3q+fDXg0XpEkV9T7RhB7S+1n8WI7708ryEjlq0WyZMbVWXbOPzMWQuTTY80wkkMRjUCYO07XPWetjBoEIL7gsB/z6a4gKSRB7rPhleIfVJKwhsY+VaQsuw0gmgm0Q4bAf3rEPCoQxiEy4kFmuyBD50Bb2O++884xrM/bHPhAzIYRarsVwWYZLLkRHxBjEcVdffbV873vfk8cff9xYzMHK8NZbbzXi3Ac+8AFZtWrVEZOHulEnHvTRH4io1t+IwwgrUPQDYizG9Oijjx5RB8YOSz30G+OHOIuYmLDgw99gBiEOlosQ/1A/hDW0ab0neiagn0h6gzrACH23Xk6xz57ExRI3JjJBDcaGfuLlFvcO6wRzD9d+jAtWpRCtYQWJ+YG7PqxmITBi7cFKFqIx5hRCNY6HSzr4QpiE5SqsUmGlykICk0XAXPP05g1CDcRIWDgmKkgi1mRY4ynqrZ80D/jkxQ7RhDEiKzVe4wnqho2s1uV6SU1EC0JtXaGgvNDbKlsHuqVDf1RCXzcNdMlRxVVyQnmNlPq8p8SGFebM0jwp1felKopCKH25fUTOn/6GQDU8NCxDB5NJTdZ8sN3UEUCsT1i2BnUd5WeBBUTqyLAmEiABEiABEsg8ArgPhAg5Y2qN/tB4jBxo69Bs2D3S09snvf1Dxh0bsaGL9UdIJLhpqK9Wa8lKI0YG9Divcc0zgAx/Xc2ASXLrYi4LkRk6ZfG7DREIyV8gdkEcgoCFOH0Qf5wF1oWwDoRrMwQ8iEgQhGApCes/WLnBjRZiGNywYb2IGIoQ52AdiUQvEAvhzg0BD8lGYH0Jq0Qcg3bh6gyBEdm5YaWJ/sGiDolvIE7C1RmC12WXXWYEQfQDgiX2QRZvuAXDShIWdSiw0IS4iH3RT1gPQlBEchvEpkT7EBWPP/544woNwTNaQX9giQdLTsQshNswBFFYg4IfEst4LWCHxC6LFi6SsvIy49YOJrDSRIG42NTcZEQ7xEWESzrEXViBQrS1F7ACY1hMwq0c+6O+dChYR3Cxh4iKTNkhTUFsJUGChamVCAkiJKxIrXilsC5Foh9YR1526WXGQhfrD+sT6wexQzHvtIxMh1nO3T7ApdrEj8xTIV6tI5FdG2s9kWQ2rSrsberOk33qil2kiXFOmyqyULNV16oLdOIC5LCKjz2yebBb9gz2SU94WIXO0d/R+vTf3SosNQ2r1XGRWrqXVqogqT+uRI1S+ca8IikOLCBr9GuhO5gnXcOH/zaHNpyW5Lm7KjJ/5Jjd0R/uYKPLQgIkQAIkQAIkkOkERo2LkHSmShOoFsm0KbUypM+9L63bLDt2HZCpDXWyesVi9fgJmO1w184iAdJMH2NEZu4qzmUhMmstIiF+IX4jhD6IiBDT3vzmNwtcaJ0FQhASskCIhHgJEQ7iHy5SEPMgAML9Gv+GuzJiTcISDuIRREe4V6PeRx55xAhr2AeWbhAWITjBGg4WcNgGK0i4GEN8g+v1imNXmH9DTIQFJIRAiJyIC4ntSNACS0lLqIRLNAoEQozLSsyDvqCfcGNGfzas32AEL7gHQ/S0LD7dTlNY5CFWIYQwuGjDPRt1QzSEIGZPOBPtNEc/wQIM4J4OYdESRSHaQdxEgViK+sAajDBHsNxEnEUIevYC3oh/iViRiCmJ+sExHYolOFdUVJh5hlgBZuANS1mMFxaniJWJ+cBawtyCKYRKbJ8+Y7qZXxQcD5ESCW6wfihEpsMssw9Ytz5V6/yRPBVvRpPSxLOOHNb9Nqj14/5BuGTnybRSnyaGyZNlanWYaOnVBDi7h/qNBeTOwV5pUbEx5FBD8Xd7cFB6QsPSou+toSGZU1gqc1SULEUabw9FDUClWr1zqgOH99EPi2hmWfZAMHN2ydP5RGwoFhIgARIgARIggewhgB/RkagGL5SNr22TAfU4g5fP7OlMBpo9M51dI8llITK7ZtI2GljPwXIRwg9EPVgsXnHFFUYwhIUaLBkRnxAFghH+/alPfUruvfdeY0EIcQ7WbLBAhFAG8fCzn/2siSUJizXUg1iHiPOIdrA/MmBDYEPcP+wPa0RrO8QqiJs4FqIh3LVR9znnnmOsFa+55hqTAAciFsQtxEKEcIq6IXDBYhP/tn7BgYUdxCwrkQ1Eu0suucS0C6tKWH1A5LPERAhbEGPRj3POOce4COMzuKDjM4wfiW8efPBB0we4ZEMIxb4YP8YC92G4baMPEFch3qLMmz/PWCvCMhRiKqw4LbdvxMaEGzfcwzF+tAeREnVDcEOfIEIi3ibEOFhOom8YB/ZDQh4cCwboB5LG4B3xGNGHySqYM2TBhtCIsUNgHegfMIwwdvwNl20Ip7AStdzQ4cINERMWrbBchbAMq1vLFR7zZoUBmKyxsV0SsBOANAc3bZ9aR+apdWRErSPDLtaRsDHr0VCqECH39msYB82efXSNZjDUZDCBBHP59UXCcmB4QHYO9ckWdb3eq+9D+lmsElRX8P26X0dwSPYU9soBfZ9TVCr1/mLPgqSz/qIihO8o1POz31xTWTKbABIylap7Ft5ZSIAESIAESIAESCAbCDBZTebOYuJmGpk71sN63tLe8/n66rL/lyXDMcOACzMEQ4hfeIfYBys1K/Ozl7HCrRkiF+pwK9gO8Q77uLl6I0kNhCiIhBDerAKhDVaAeMEKE4KVveBBF1ZxaBdWg2gDBWIiXlZ/IGJiP2TCfsc73mGETbTn7C8EVYhaXiwarX5E64MXbtgHQhsyjENMRP8hxEFkAyfESISwCFEYVpPoL/oXT3iDaGfF+4QAOxkFoi6ER4iKX/ziF43giEzsGAusUDGXcCPH2vj85z9v/oblLMYNi0iIywgRAKH2rW99qxFar7/+eiMwQ7DE/MH6E/wRMxRiKwsJpCMBXMeQgRDWkfi3ZaAYVPv6Ld0i9zT55OQpPjm+zmesDBMpiAOJ2I/bBntkY3+numH3Sn8kuUQxRWr1BqvI5SVVxmW7qkB/dHFL4x2ngy3tXbJPszD2aeKasAqxar+cyJC4bxoQMGEGNJM74kNNra/S2FCT9yNWGuBgF0iABEiABEhg3Ansajwg23c1SUVZiaw+ZsG4t+ds4P6Hn5WX123ScGFz5PJLzpqQ9vEc99SLm/S5PSzLNSv3lJojPTHHoyP6vH2/PlePxm9jySgC/Gk8o6Yrdmch/MFaESIXRCAIV4mKV7CWjFXibY8meuJhCKJgNGEQgp1blmynWIfxQXyE2IUxuomh6D8s7RIt0frgtR6Ij4iJaRU7e/QTrsgQ5dBONKHX2RbG6RRtvfYnVfsh4RG4Q2hFwVj+5V/+RX74wx8ad3TMLdYFkhXhHV9EH/rQh4wo+fTTTxtRFp/DchWWrBCWIZR/+9vfNuEAsD+sQ2EZmsy8pWqcrIcE4hEwsXj8BcZFG4KkSTZ1UJvrV81whVpBHquvRERIxGIcGAlJp8Z6fL5b4+v2dSQtQFr9H1QLytdVzGxSy8rG0n45rrRWavU8LvYYP9Kqp666QgIqYjW3dakls8ampGVkvCWSdtsD+kNPRUWJ1FVVmKzZLCRAAiRAAiRAAiRAAiQw2QQoRE72DKSwfVinwcUYMaBgiZaN5ZOf/KSxyIO7dCYVzMdXv/pVYw3qVYRMl/EtWLhA8LIKhEW45v/iF78wFqCwDIPAarmLQ2iFcHnDDTcYi1xYdEK8hKBqZWJHch5sh9s5PsPxky24pgtv9iP9CfjUXbtQXVwhzAWD+tIEIEkYHJqYj03BAXmhu1Ve7mszLtiptDns0piRz3S1yLqedjm6tFpOr2yQmoJCz9aRPh1UVUWZebGQAAmQAAmQAAmQAAmQQDoRoGt2Os1GYn2hEJkYr7TeG2KOFbswnstvWg8kRufgbg7hy+72nQljQcxHxMKEiBfNijMTxuHsIywZMR/2DGz2TLsQXWEZam239rX2QYxJZubNxJlnn0EAyVx8muQlolmn83waRzHsPdoJ3LDX9XfICz2tAsEQcR5TKULaZ2hAXbxf6WuXPcN9sqasXo5Wl+3yAj8nkQRIgARIgARIgARIgAQymcB43T5nMpOM6HsuC5FZt2gh9mS7VVmmjg8CpJVcJyOuDB47aWUkjyYmWrE+4cJq7WPfF8ePxtpDRuI39vHYPHcjgUknMGrlm68uzCJ5HkI69qvV4yu9bfKquk43Dw9Kn2bHhnv2eBbUDmtLJMF5pEsz1KsAiviRRxVXSY26bLOQAAmQwHgQiOD7XePL+jRzq/0Hy/Foi3WSAAmQAAnkJAHvVgA5iSd9B53LQmT6zgp7RgIZTAAPG8lYOfIhJYMnPce7jjugUVE+vqD4qAqBr/Z1GivIYbWCnMgCV3C02xcOSrfGpET7J5TXamZtWkdO5DywLRLIBQJI6oVYusYTIjKaNAlhLfjEmAuzzzGSAAmQwMQQ0OdHfq1MDOqUt0IhMuVIWSEJ5BYBp+ho/W0Jkpalo3M/fm/k1jrhaEcJ7NSs2Ac0LuRklpAKkOhDs1pIDmgSKgqRkzkbbJsEso8AEnqFVIQMa/zc0aI/0qggCS+JfLWORPxZFhIgARIgARIggdwlQCEyd+eeIyeBtCNAcTLtpoQdSkMChWp9iWzdiCs5loI6ormFdw+GZHvboDT3BsfSBI9NgkC+ijRTKwKyqK5YCgso2CSBkIdMEoFRV2yRkIaCgEWkveDviG4cUetIE1+X7tqTNEtslgRIgASyhwCT1WTuXOayEMm7+8xdt+x5mhOAoAhLSKs4BUYrLmQyLtxpPnR2jwTGjQAEyFJfQOoDRZpxOyJIeIMYk4j/mOqydk+v/OWVA7KpcXKtN1M9rkyoL1+9/BdOKZHPnTNT5tZ6z3KeCWNjH7OTgInzfFCAhDUkBEm3gv2CGjMS2/NH1DpSn0JoHZmda4KjIgESIIEJIhA/LtIEdYTNJEaAQmRivLg3CZDAGAhYAqRdoLSLkRQmxwCXh2YlAfxiBgu5Io3jOFUFyCUllTItUGIe3huH+uX1gW7ZN9Qrg+pincq823dtbJd7XjggA7SInJR1tX5Th5y3tFoayv1SVpg/KX1goyQQjwCe/vC9DTfskAqMXr/DYR0ZjoQkP+KTgD/fJLKht3Y82txOAiRAAiRAAtlDIJeFyOyZRY6EBNKMgAlOn0TSGrpmp9lEsjuTSgAipD/PJ7WBYlldViuzC8sOsx6aW1Qu0wtLZPdQnzzV2WysI41rZAp6PTisrpWhVNSUgs7kaBXNPUEZCEYoRObo/Kf7sI0AqeJjCD+CONywvfY9rJ4Tg8MRk+wr4C/Q65vXI7kfCZAACZAACZBAJhOgEJnJs8e+k0AaEKDgmAaTwC5kJYEaf5EsK62W+So4lvjwkH7kU7o/L1/mFZbL1CnFsn2gVzb2tUunZsaOFvsxK0FxUCRAAhNGAF7XlgA5okLiWH+uQH1IajOkP6QUaGbtAsaOnLC5ZEMkQAIkQAIkMFkEKEROFnm2SwJZTsBy0YKlgz1eJIbtdNHOchQcHgkkTCCglpBwwV5cXKFu2QUSzVDIct0uzfPLouJyaQsOSn9YLemQMYKFBEiABFJEAIJhRAXDkIqPseJAJtscrLmDyLSt4aX9BQWa0Ibmkcmy5HEkQAIkkEME+GWRoZNNITJDJ47dJoF0IeCMCWV3r/YaLypdxsJ+kEC6EMB5FPDlS7GKkF4K7sKwb0CFf4Y48EKM+5AACXglgJiOiANpQj+Yl9cjE9sPdaunt9av8SNViCzIz1e3bT5jJkaRe5MACZAACZBA+hPw9oST/uNIpofjdBuVTFd4DAlkDwGn+Oi0hsyekXIkJEACJEACJJC9BGD5CDfsiKbERhjIifpxEe2aTNzaZr7+uJKv7trMrp2964wjIwESIIExEOCvVWOAN5mHUoicTPpsmwSygEC0GJGJPLBYrtqJHJMF6DgEEiABEiABEkg7ArB8DBsBMqKu0t6zYTsHgrC2loV2ogltrNiRxg08otaRGj8SYiSza6fdcmGHSIAESGDSCOh3jG/SGmfDYyKQy0LkmMDxYBIggdQRoCtp6liyJhLIBgJ56o6phlDGBTSigggLCZDA+BOwrBDhho2M1sm6YMM8xZzDqhoWaIgJpLTRGpOyqrSyc0McRV3GOpLu2uO/GNgCCZAACWQGAVpEZsY8HdFLCpEZOnHsNgmkCwG3GJGxLBtjZdmmIJkus8p+kMDYCJRXBqQw8MYtRmQkIoNDmhm3PyiV1YXS2xeS4GAIcoUUlhRISXG+dHYMGdGxqNQvVeUBKSvJl6HhiHT2BKWvd9iIIsUlfinV/VEskaRf6xkaCEtJab5xIx3sC7oKKBBGCosKpLzMf8TxweGwBArzzXH9PcNme7H2o6DAJ0NDYWOFVVVZaKzErDKg7Q4OBCUcolA6ttXCoyebANb9qOAHARIWiMmvaXyPQyj06y8JvoMZsPP1PEc27DeybauVZYKDRp+CkdCodSRiR+YjHm6ClXB3EiABEiCBrCKg312Jfp1k1fgzeTC5LERy0WbyymXf05ZAPBGSMSPTdurYsbQjMPqwnsizdrrcjn3iwtly3uJqGQpphl3tVOdASO57rUvufKFJfvbupfKzJxrl6Q1txm3zotX18vbjpsiHfvWq9PcG5dI1DXLJ0TVSX1pgLKqe2NEtNz3SKJ3dw3LVaVPl/SdNlUEV/4bVagvlDy+2ygPr2uQDZ06TnW1D8qfHGiWkwqKzBFSEPHtlnXz94tnSORjWDL2anlfLbS+1yjPbuuTcZbUSUsH0pnv2qCAaljefOFUWTimSf6xvl3I99qZrFsmW1gEzHpS/vNKm4zkgbQf6027lsEMk4JUAlnMI2bB1zY9FgER7ECADKhLmq4DvLDjX/QWjImUoFDro8u21l6P74cwLqSAZHglLgf7h13YoRibGkHuTAAmQQDYR0O+WRG6Ts2noGT+WXBYiM37yOAASSAcC1vXfEiAti8dYlo/p0G/2gQTSmUAYFoQqDAyoBVCJx8zZw5pQoh8WQ2miRv75lVa54/kD0toxOOpiDUsrFQ//+FKzvGlptbSp5SE+n1tXLL99rtlYNZ58TJ2KknXynXt2y2u7eoxl5CWr6uXfLpot37x9u9n/wS1d8suH90lr+6CZQlgp1tcWeZrOEe3DhqYB+cpftkm7WmBax+MuFkkxvn/VQnnk1Q5p0W0rZpbKsyqCbtrZLSccVSPrmvrlIzdvki4VRK3jIgfFTE+NcycSSCMCo2EP1EpZz8mxGpTgMdBfUKCWivGFQWTD9vkLjHVkWNuHC3iiBf0NGjEzT8/bfAqSiQLk/iRAAiSQJQRoEZm5E5nLQiQtIjN33bLnaUbA/hCDf9tFSJ8+3FtWkGN92EmzYbM7JDBuBMJ6Hm0f7JaeSFCOKqmSJcWVUdsaVPFx60CPvN7XKR3hIRlSQTIdyrCKdAPDIRk2LthvlAdebpPVsyvkqhMaVEQQaVbX64debjVWVG9ZVSd/UgvHrY19Mqhu3C167N9fPCBrawpNBcYiSsWLQZd6vYwZx8P1dFDdrQ/rlwope5r75XcqiL731GlSqy7gr2gf1m7vVvfr0f6PHnfkeLy0y31IIJ0IIJxAMIwfLcaWCRsWy/lqAVmglo743vdqloJ94aqNeI/hsM+Iisn8fjKaXRuxJyNGjMSPCSwkQAIkQAK5Q4DJajJ3rnNZiMzcWWPPSSCNCLiJixQc02iC2JWMJADBbFAFxaahfulXwWCfvs8vKpMZhSXiz8s3Y4K1ZPPwgOwY7NXtfdITGtZ0EOnzG9ubltXIkoYS6VBBsVXFxn+oK3NjY6/0qEXhP9Ut+9o1U1WIELl3Y4eJHVlSFpDluv+tsI5U12kMBTEjW9sGpaNryIgWsLw6fna5/Pslc6VbRcrm7qA8uaVTunoPFzujTTrcQo+dViJfuGz0+J7BiDyyqUM2vN5h4lDep3288J21sqC2UH711H5pPjAgsKJEWaBWl/9+2TwZCI4KvX9+oUV27u2ToIqaLCSQ7gSsxE8hva4Y6+RklL+Dg8R5BMvGfP0lYTSTtVcJ8g1KJqM2/qfXAJ9afeMHBlhIJtot3G/AKhrvPp8KkogfyWQ26b4c2T8SIAESSBWB9LnxTdWIcqQeCpE5MtEcJgmMFwE3F2y6ZY8XbdabawSCaunTHhyU3nBQOkND0qiC5GwVJBHLsHG4X5pUiOzQ7QNpYgVpn5/GziFZu7tXDqgLdp8Kiz0qNpq7RRVBGjTxS1khRAyfVB9MPmPMqfQVcMR9010OWVzh8FZNRvOyCoCot0etFdtVjIQo4qVA5GjvD8lLe3qlVeNRIhlOa9eoqzVEldqKgFQV+YyoMUX/jQQ2SGSD0qOC40u7e6QLIqmW9m61KFPhhIUE0p0AhEe4QkcgQuraTlTss8YH8RBWhwX6ykP26iQESCcr3C/kHxQzcT0II1ZlEn0ctY4cHZvp48FEOek+N+wfCZAACZBA8gT0us8bseTxTeqRuSxEentqmdTpYeMkQAIkQAK5TgDiHdytG9XqEaJju7pfQ4hsG05PAdKar/Xq2nzfywekQy0a7WXatFJZNatM1u7tlSK/T5ZOL5GnGkqlS4XFDRqH8YS5FbKtsd+4Tuf782X+rFKZP0X3ea3DiAw7tb77Xzkg7a1v1Dt1amnUZYI6YE2JAqFirwqP96kreOfBGJP4HNl9a6qL5DJ1DX9GY1MOq8C4Rvuxo2VANqrwidKiwuUDGvey56BwmevrkuNPfwKjmbDVYlDjMFpCXTK9ht4IkRChViDwjYfFIURN36FkNslZbeL6YKwqjcXnwezasLxMgWCaDDceQwIkQAIkMO4EaBE57ojHpwEKkePDlbWSAAmQAAmQQMoJwPJxp8aDzIQyr7ZYVi+skqZ6FU5VDOlQy8V2TVzz9pMapF3Fvb+qa3OhCpEXH1sn5x9bK39+cr/cvvaAXHl8vZyuyWy2HygyVpOrVBD0q8XjExvbjdHk1IpCWTW/SprrRpPNILEMSkAtGhepa/eKxVUmW3dPH6wlh6W+OiC1mvTmVRUYIUjUl/nluIWV0tJdbI470DFsYk6umFcuC+uL5Vt/3ykDavX4sfNmydIZpbKrZTQrdlVxgazU4zq0XpTWzmFp07aDGjeShQTSiQAESIQ1gACJLNPJhksx7tOwWNTzr0BdnvP0fbx/xUdbeZrMZjSRDQTJxONYwqIyonEwIb4imY3m0UmJ9eZEzzGiQnQMj8gB/c0FJj/zSvNEL0MsJEACJEACJJDxBPh1lvFTyAGQwOQTcLpij7pHRf+BKtq2ZB+WJp8Ae0AC3ggUayy0An2wDyXrG+mtmbh7oQ9+WCCNk6zQqCLdOUtK5N0nTpFBFQS61IX6ya1d8siGkCxR68YbH2+UvWr1CKHj8aICOUPFw3y1hnpmXauU65P2RUfXyHlHVavllch2tXy87fkW40Z9QK0SiwM+eecJ9aI6iyl3r2+TJ15rlzZ1uT55XqXMOGO6cQFfp+7bj2/ulAVTijRWZalJgANXbnhTv2tNgxFoUO7ReJUb1DpzTk2R3KcZs3eq+zUsqu5W68e5Kkw2aGzI7oGgcc2+9sSph9jepxaaD+o+nRQi46437jAxBEwcSMsKUl2ck/1ONVEScH0wYREKPIc+SNUoEWnBpyEaCtSqMajXD7hr611Fwi7lo1agSMrj02Q2Gjsyg6wjNayutA2NyLbeEXm9Uxno3J42xSd1RSK1hSpIamxNGnqmasWxHhIggQwmMN6/j2UwmvTuOoXI9J4f9o4E0p6A9aDjFCMtVyjng5DJrKkvtwckuk+l/XSzg2MksLSkUno1E3bL0IBontgxJYxIpisQHiFC1gWKZLomvikt8CdTTdxj/vjEfvnrs82H9oNVk5XU5Qu3bpEBFQ3DodFYiy+qiLhuS5cRGlDuf7ZJHn7pgInPCGFlWAXAsCaIwUP3/Wox+diGdhNL0irDQxHdJyS/uHe3/FqPsUpQhUtYK762I1/uUZFzSNt8Xq0Z37+j+7Djh7R+WE/9vnXItGUlp3l2fau8XOw31yoIGu/75cbDxo12g2pJyUIC6UAA50pQLYGtGIvJ9sm4YasC6dcXQhZM5vcy2g749X5Bz9+gXgOSse603LURz7VAraYLNFRDKmJbJss33nF6KdLQECLPHIjIy+0jUlMocuZUn7GIvHOXzq9uf9OMPFlc6ZNKvXx7DI8br1luJwESIAESIIEJJZDLQiTjCUzoUmNj2U7ALkhirBEoD7Z3a/zJWmhkOz+OLzcInFBWJ0uKK+W1/k5Z29smezXu40SWhsJiOV77cJT2obogMG4P5IOamObwyJA6yoPfusMQ72zfwHAhHdbM4PYS0ifx0MHs1Na+RpTUuJEQHQ8rB+saUmvHId1+qBz8PKx1B5GPJs7xIQijjjuDIbWEtEqP1Z9DF7OJnDm2RQLuBHBehEKhUZEOrzGAQuxHuGCnW6IXI0gGCiRPhdYQktkctGZOZKjgElQxEpz8auXpV3Ez3QqGtV6tH+/ZE5FyFRnfNENj6FYimc9oTxcuzzcWkrduDcvcihE5b7pP5pWl3zjSjSv7QwIkQAIkkH4EclmITL/ZYI9IIAsIRLOQtIbGjNpZMMkcQtIEYIlToVaIK8tqjVXiK73t8qqKkv0OIS7pBlwOxGNqSb7GNyyvleNKa6WmoFAKYe00Tm7Zpgux1BCvSkm0/ZKp235MMvXGG1MqJ4x1kYBHAmFVroZVIEfS0LFEe4AAORpLcdQCMl2lrQJ110YMSZOA52B2bY+oDu2Ge5SgCrfhyMExG6vPRGtJ7f5qXC07ekbkdrV4hOs1BMiZmn+rMqAhNNQ93iqID7moIk8+oYLkax0jcofur+Fv5bQGnyzRz1lIgARIgARIIFMIUIjMlJliP0kgQwg4XbLh4mVZR5pn+YPxIyfT3StDULKbWUoAAmCxPvTPKSyTqvyALC2p0szMHbJ1sEf6wkF1vfOq1MUHVKmi49LSSllcVCEN/uJxtYKM3xvuQQIkMFYCJg6ksezTTNgHwwYkWycEOOOujEQ0JmxKsjVNzHEmdqUKkYhvm68CIqyYkZAn0Usm7kPCKmaasAsj+eIfp0zg8aho9AjZoRaOL6kLdofGgzylIU9mleTJ1OLRpDRu06H5u2Sabi/SPlcVjsjuvhF5uiUir3XmyRl6fI3Gj2QhARIggRwiYPu5JodGnQVDzWUhMnVPelmwEDgEEkgVAS+u1xQhU0Wb9aQTgdbBERkKe38IDOT5pN5fZCwUq9RNemZhqWwa6JY9KkgiO/ZYSokmxZldVKYiZ6XMVcGzTtvJT3eVYSwD5rEkkAME4JIM12RYQo7+qJfcoGGZDStI/FCYbm7YXkaESxmuZ3mI9xj2GTESP3gmymM0mQ3iwmp9xiVdfybyfgn30tWo++xUAXK9WjV2aVbs2qI8ma8u1ss17mOJumR76UK1WkKWVOdJg1pQ7h0QOaCve/eNSEPJiKyqYfzIMU0ODyYBEsgYAvpMSSEyY2br8I7mshCZoVPGbpNA5hOge3bmzyFH8AYBxO+aqg+DL6ko8HwrxEiR2fpQCcsVLwUP1DMCJUaQrPEXyi7997bBbmke6pchPCEnUAIqLMxQQXNOYbksLC6TWSpCFvIeLQGC3JUE0o8ABDOIj6OC26gImUyxMmHDDRsuzhAjM7lAUM1Td3KfulmrPmsYJRo/0lhHmmzjcHGHIIkEMOMnSDbrD1ZbukekUYVDhJ2dUZonR1flSb2KkYkWfMfg+ClqIdk8MCKvqLDZ1C/ygPp6I3bkwnK1mlTBkoUESIAEsphA4hfPLIaRSUOjEJlJs8W+kkAaErBbN3p9OPK6XxoOl10igSMI4Fl+lj4MLtWHya1dI7KhQ6RV3ewa9MFyun5e5FGQhLs2ksjAgnGaulFvyO+QxuF+6QoNSTCG8IA7MIiZVQVFKjyWyLFlNcbtu0TrYyEBEshcAnC9hsAWUQtpywoymdHAym9UhJw8N+Rk+u3lGHP9g6iap+7liB2p+aUjScTMtGJHRhA7Ui+dqDNV7uqQjfs1j9ZmjQPZqK7ULSpGIv7j8fVqCali4VgL4kjO1O+aqerWvUm/g57TjNtbukS6giMyTz/HtoDH7yGsuWAwNCaL27GOh8cnTwBrNl8te/0F/P5PniKPJAESmAgCuSxEJvdz8kTMCtsggSwgYGIvHcyc7TYcipFZMMkcwmEETp/ik2OqRJ7Wh8C1bSNS7R+RZeoiN6NYZEoC1i5FKhYcW1atrtol6qrdJa8OdKp15KD0hoePyAFToA8dZRpnss4fkGWl1bJKk9FA0EykIFOrJqmWoly+I0gEGPclgXEmYOJA6n9GYyAmbwGJbhphAtmwVZiABeTYZa9xHnyS1WOcyISNscLS0LIcTdR41FhVqnVk2CTwget68taRRoAMirSp+/V+tVh8vEndsAtFzpmm3wsqDqY6cTfqg3Xl0VX5sk6tI5/S2JEQPlfV+jR2pEidxo+MJUgGNSt5b2+/9PQPmhAAY0rBnuQ88rCxEcA5XlQYkPKyIikpKpqwUANj6zWPJgESyEUCfOzIxVnnmElgHAg4hcVR64vDE9WMQ7OskgTSigDc4C7SjKe9+vD5fFtE/r47otaSIm+e5TPJBYqM25+3LsNN+xT/FFmhGbaf6WmR57pbZUCT2YQOPllDhKwLFMtq3b66rE4tLz2avBxsHu6IECC7Q0iUIHJUpceOees+9yIBEkiCwGgcyNFYkGP5wQ5WkHBd9qt5X75mm86VAiGmUGPkgmNwjMlsUAd+qPErP6/XbYszrq9d+j3wWldEXtCQHQNqEfmm6T5ZrnEdvVonWnVZlhOJXKGP1XZml+bLM/rD2F36PQQh8lxtf5r+KOYWhzKsImR3d6+8um2PCuCJhQTJlbWVKePEeV9WWizLl8yWQr+fYmSmTBz7mRQB/Z7kBSspcpN/EIXIyZ8D9oAEso4ARMh41pBMWJN1084B2QiUacKBMxv0obNqRO7fF5EvvxCWM9QK5vwZGgsswaympWrheHbFVFlZUiNPqyC5rrfDuGIvK62SVSpCzlAxMhk7pyZ1D3y8eURe7xyRE9VFkEIklzAJTB4B/L4QQjZsFSATjXNo77UlQI4mXxl1L87FAkEy4FdBUp9Rg8GIia+ZaIEQHAqFNEu5Wi8qS7/W57XsUkvEe/Xa3z4ocoFe949Tq0SImYnOhsrRMhgJiTpLS6UvsYCP+GHsAhUfT50isrEzIr/bFtF4kiLvnp8v5fodZS+9A0OydXczRUivE5zG+8Gaul/nc9/+Vpk7oyGnfohI42lh10iABBwEvH+jEh0JkAAJRCFgt9qwHnqshDRuVpFMVsOllAsE8NBZq6Ljm2fnyznTVZBsjMhNr4/IyQ15slpdtiFWei2wcKjWzNpnV02VE9T6EX+XqNBQlFeQsAgJy5wHmxBDbERmaUKDDyyC216ij8dee879SIAEYhGwBMixJqJBGxDfCmABeVCAzPWzejS7tgqAGo9Rwx4aoTdRV21wNXETYaWqgmAhMnXHMI/crdmw79FrPazN8ePOstl55nsASc0SKcMqoO4c7JX1fR3mHS7niCF8Qnmd+S5Qh3FP1aGr+K5ZWa3u4JpR++kDI/K9DWG5dBZcuH1SfPBJEHFIBwbVNJ4lKwhgzfapi72ueEksWEtWDJ+DIAESyAACFCIzYJLYxTcI/O1vf9P4Nb1yyimnyPz581OGZnh4WPbt2ycPPvigLF68WI499lipqqpKWf3RKtqyZYusX79eYzcVyDnnnCOBQEDuuOMO6ezsPMyisK6uTlavXi1z584d9z6NtQFLlLTeo1lG5qqVxlj58vjMIoCHT1ielPvz5Dy1TNmnVjJbukUTCoRNVtMT63yatMDbmCA+lub5pSSAr+7EbCDh2gcB8nGNGbZDEyagP6dMyZN5mijB7SF59ZwK2dYyILs0BSvd9LzNT6r2gsgxq6FU1swuk0oG7kwV1rSrx8SBVGEsqJZ6IwfjQCYbvHw0QcWoCGms7nLUCjLaJI/Gj4RA6zPXs2TibmK+4AE4pAlgDgm+BwVJuG+3axzI+/ePqAXkiMzXa/tcvbZO1WzWlXr9T9St+8DwkKztb5OtGiO4Xf89oCIhprRPrTN3D/XK0uIqOUZjAlepIOmlQLLEpWSGrpGzpmocSXXbrlZXbXs0D41EOqZQAF76wX0mkgCywZtFO5GNsi0SmHACen3PndgjE053fBvMZSGSV+bxXVvjUvsf/vAHaW1tlerq6pQLkZs3b5af/exncvHFF8vMmTMnRIh89dVX5fe//72UlJTImjVrpLS0VH7729/Knj2I0aOqwcECcbSioiIjhEg3a0eIks5YV/gb1pJhBERnIYEcIDBdH0prVACsCIzI3n4R1fjkjt1hOU7FSCQY8FoSkyBF3frEiI+PNUdMptbFaqUzS7Oroj+lUawyz1tcKbOrA9KiwS4Rry6Rgmg9sDyCS6RVMLo8K/EDPvQ+3ESazop9IXJMUROmxfXFEkh1NousIJTZgziUiOagC/ZY3bAhrhXoc1ieikz4sYLFnYARa/WVp+eUT5VD3HtAkEy0jCbBUX1HxcGIsu/QOJDrOkT2aTKaCr2+r6rNk4UqQsLKPJHTF6JRpyYke7WvU3YN9cleffXo30ZM0oI3/N0/GNS4viFpHB6QhcUVMq+wVL9XVFX0UCCIInHalCK9Rmt9fHr3AI27kAAJpDsBfvGl+wxF6V8uC5EZOmXRu93V1WWs+hAXqEgzpfX09Mjg4KAsXLhQKisrzS/kO3fulKGhISksLJT+/n7p7emVNSeuMZW+/vrr0tTUJMVFxTJn7hxpaGg4rDEci+2w2oNQN2WKBp05WGD1huObm5uNSDhnzpxDQh4Ep76+PrN9YGDAbMfx6BMK+rh7925paWmR8vJyU29NTY3po7Ns377d9AHtbNu6Tdra2qR+Sr3Mmzfv0K4Y365du4xgCWFvxowZAotCq0DkQx3gUVtba7ah/7BCRB+POeYY2bFjh+kPBEJYXpaVlR3RF+yPesAb1pPggzohGqI+jAmWllOnTjXjHb2RHDF9w3Hgi/dt27aZfmJfzNvLL79s3k844QRzLMr06dNl2rRpk7JmwRwibUj9mubNnyfLly8/rB+xgunjuLVr15rxHHfccWYuWEgglwnAKmVJRZ7MVCFwm4qDm9U6ckv3iGzT11EqRs5RS5qiFD0dwgJyd/+IbNW6h1UTLNenYgiesNYpifPtP6e6SPBKpuBBfUivF06Bxcreix8gxpKJNpk+8RgSSAcCViIa3CNAqE/WWGk0GdzYszqnA5OJ7gO4jb709xD8YIKENAkKkrjvaRsW2dYXln39sEb1SYMKfMv1+jpdr+2JuGHDdbYnFJRdg3qfPNglOwZ6pSs8dEiAdPKBMNkaHFAxckha9H1/UZksVpftOfpemIBhkFMk9emxAbW2Hx5+40fwiZ4btpc6AvjB0p+vX/T8cSJ1UFlTWhLQ63Hivyil5Uhyr1MUIrNozhsbG+XWW281ol9xcbER0iA2rly5Ut7xjncYMeuee+4xghnExPb2dmORtuSoJXL//ffLY489JqgDohFck8877zwjHkE8fOqpp+S+++4z2yG8LVq0SM4++2zjLgzB84EHHpDHH39cDhw4YES5448/Xs466yxjwYf2/vGPfxgX5GAwaES3M844w2z3aza3J5980rhEo9+WyHnRRRfJihUrTFtu5bnnnhNYE0J4XbBggVxyySVy8sknm77cfffdgu0QKyEkHn300XLhhReaPuNzMNi7d68ZO4TIVatWmf5YBXX+6U9/Egi76Cv6iePr6+sP6wrcqlFXd3e3YQvBDQ8Hp512mhnnhg0bjBs5GF1++eVGhNu4caP88Y9/NEzwN8RSjBvt4DoKERXHQOy79NJLDT8wgQiJNia6bNq0SV544QXDGf1r3N9oGEMkdc6NmyUk1gTEXYjhEJydJVZCm4keK9sjgYkkUKrfvshqOqc0T61pIvKiZlUdUrGwbWjEuGzXqTWNP0lBEgaMjSpA7lY38H1qddmnpi9wwUbSAgiQk/XTsUn8oJ3zGQtpOZRIg89JE7ny2NZkEEC8thE1/g+pFV0ybsFWn61ENJZrcKxYhZMxzkxqM1/vAWFBimtSOA8JgkZ/LPZaNusPPK92aXZivVav0Wv5UrU0T7T0RoLSNDxoYkC+3t8le9Tt2mtBDMl9ajXZHhyUZhUk20PVMi1QIlM1eVkAFrJeKzq4HxL71FaWS3NbV8xkgwlWy90ngQDuxwMBv1RVlpjYoiwkkM0E6JqdubOby0Kk97uNDJlfCIv33nuvseaDaAYBCyIZhDnEIHzve98rDz/8sBH+INBZrr6vvPKKfPGLXzRuKrDAg6Xf008/bdyDYcm3f/9++eY3vylbt2414hmEKAiXEKm+8pWvmPa+/OUvmxs4WA9CgHv22WeNyHbVO64yYt03vvENmTVrlqkfYmZHR4fpI4TI733ve6YuCH6wEIRYCIEQ4hX66CxwWX7mmWeMxSTE1oceeshYFZ500knG2vDXv/61aRtiLMRI9BWi4r//+78b12swmj17trG+hHgIURAipVXQFxwHC0VYXIJPdVW1XHrZpYd1BZaC//znP834IRiCNeqC+Ib6IUbCKhLHoy9vfetb5ec//7lxxYaoCIEOIiTagBUoLA7b+toMRwjIqBtjxdydeOKJ8s53vtNYk05kgUAMARHiKtbME088ITfddJMRiTEmFKwH8EW/YeVqzRnGBetOiNKXXXaZsSrFPqgPfCEEwxoV42MhgVwlgPiQp0zRH4QqR+Q5TSKwvn1EujRfwLxykXo1SISrXyKCZKsKmQdU89+kiWia1VVwlgqd50/PF/WyTpsy6tqoD/4jlkVX7mb2TZtJYUfGhQC+82BsFwqNZsKGIJlsgWhmBEjEOqS4kCzGw44bjR2pTPVaFNQfbHAf7HWOtvSIxnDNk7fPy5fCBH80GlIRsTM4LNsHe2R9f4fsViEyZAtlkcjgED9yS3+37FGLyrlFFbK6vEam+UtM/MiCBH7lKSr0y7SGahNWY2BoOCFRNpH+ct/xJQDZMV+vERVlxVJfq95w9kCg49s0aycBEiCBhAhQAUgIV2bsDOu6q6++Wt7znvcYS0QIcLfccouxsEOBheOpp54qn//8583fSAADMQ37ffSjHzWWkT/60Y/k+eefNyImrBzx2ZVXXmkESVgi3njjjUZ8gqgJ4Q4Wc//yL/9ixE4If7/73e/k0UcfNUKmZQmJPkGQskRKCKV79+w1VoKwakTdsFR88cUXjUgJkc5NiMTnsNa89tprjZXmd77zHVMnCsRTJLJZunSpEUUh+kH8Q58+97nPmb6j3euuu86IexAJMT4Io1ZBm9/+1rfFp6424IBjnnzqySOESGt/iGnoCyxP3/3ud5sxfOtb3zLiHcZkWYNCaP373/9uDvv2t79tLCUhwqKPKKFwyFipQoS1LDYhREJcRT/hyn3FFVdM6CLEWoJFKdYLCsTHu+6661BcR7BD3yA+o69wa4dlKkTH5559zgixEBwh1MLKFgUCLNYG6sK+cKuHFa6J18R4kRM6v2wsPQjAjQ9xu5DFFBaRD2jCg/s06yqsJY/R3x6maSxHK7OpW48hbcCasleTKDzerMlwVIRcoO7fl83WLKl67ESUUX3lYCwzDw1CoAmrJZJxUY34TCKJPBVXJqa3HjrIXUhgjAQgaEGAhMVdIpZ2zmaNFaSeG3790Q7vPEfGODEuhxsLMv3RJ6wX46Dey1hxIOO1pIckJELCDbtfM2/vHeyXp3oOqDt2t16734ilG6+9WNsHVZB8XUVNWEkeXVIlK8trpd5fZNy1ERszXsG9WmV5qVQuKZXu3gGTmIcl8wggb0dAM7sXFabRr4+Zh5E9ziAC+v3Ki1UGzZe9q7ksRCb/s3SaTzZEOFgHQvyB2AZhC5aDsNBDgUiEfWCptm7dOmPBh5tkCGOwuIO1G2I8QmCCGInjcJMG92dY7i1ZssRY96HAovC2224z+0DQvPPOO83nsJJDu6gX4hSs6GA1iXdYH1511VWybNkyI17hb7QDARGiFNyyjzrqqKgxEWF1hz5C+IMl5LSp02RgcMD0EcIWhFH0CfEJIZBaBdaXqPuXv/ylEV1hnQnX88suvczEdYQVJQrcjucvmG+s9WCVCSEyVkE8yxOOP0Gmz5h+KO4jREPwt4RUjBMiIyw+4QqOMWM75gBiLgqEOTCAuApBDu7YEI3/67/+y4iVyKY90ULk+973vsOGjhtVWJJaBZa0sASFazsEXri0gzmE2bLyMsPDSvwDK0/MM6xSIdhCyP7P//xPedvb3mbWFixlwQdzxEICuUoAGayvmpunsSNVkFQx8hnNcn2OulSfr69opV9Dej3fFpE/bovIiZoJ+90LfUa8nKgS1gfpYBCZaBO/F4SACQscHOvXH3/86h7IQgKZTMBa06GDyWjGMhYIj3CZpQXkWCh6Pxac89WlNazWkcP643CisSNjtQQRsiM0LHe17ZEdagk5pMJhqgsebJDQ5umeFlnX366CpN6fltfJzMKShJqCNR0LCZAACWQCAbpmZ8IsufeRd/yZO3dRew5hCO7VKGH9NR5iFkQ1t3iLcIu1ErFAYLK7yfoL/EZIQ9xCFLho49+wgoMVIywTUTcKRCiIS7BsxL9h5QI3bljBQbyCsAgRynLbhqs23HM//elPG1dqWFxC+ISlHKwtYQX4sY99zAiLXgvEu09+8pOmDgiwsO5EP//6178e6uNnP/tZI2Lic1hR4gXBcn/T/kMJZby2l+x+EOQsyz+4KQ+rCwwsD4PDQSOswi0e4i0KxFwIr9gfvCezYO4gNMKqFXOM8tWvftXML/qIccHlHPFCIUQiCzj+jbnHC27dmOfrr7/+UEIfWL5CgMR8YF3B5Z5C5GTOMttOFwLzNabjuxfkS6O6Vz9/ICJfeSEk71yo8XnV0tFyA+xTAfKV9og80jSiCRJEPndMvkxRIVMTLk9oMbHWNBt3JOyTIf3RJRnvUxwTVEEypDHTILzQ8mtCp5CNpYCAXYDEj7DJnAdWN4wg5svXezKGLUjB1CRcRb5yL9JEH7BmHaugHFYBsi04JC/3tsu6vg6TZCY4AQY8/Xrf+HJfqzSHBmRlaY0cXVolZb4J/nJImDwPIAESIIGECUzcL+8Jd40HxCKQy0Jk1lpEIpYjXIAhGkJoQ6xDWDi6ZaGG0IWkM7DCu/nmm6W9rV3WvrjWiIKwGIQQCFEQN9WwMpw9a7bs3bfXxFmExd7VV11t3HYRexIWf7BShFsxREeIkigQBuFuDVflc88914htcKFGDMFHHnlEbrjhBiN4wtoPghySucBaDsLU7bffbtyqcVw8a0CInxAVIYihbVhXwuITf6P/qA9WmRBqzznnHLn44ouNkIq4jrCGtDJbRzthYOUJN28IqB/84AcTurJABAbro5YcZURPWDfCZR1xIMGzuqZahjVeEPry3e9+1/QFloKw4oTFKt5hnTlZBbEesUbgQg3rRfQHBVacYAyrUXBBoh2sO/DGesO4IVpif8wp1hXEbut4HANrWojg2A5RkoUESEATuehtVbmeZvPUVbBULQVnlo6o4BiRJ5pFjqvNM1mwN6sLNr7ILpiumVrVjRvu3XDznow7MpPFVxsv0gdd6+E9UXdUCDc4BllbUZdfrx9MxsGzId0JYN1GVEQPmjADY3PDHs2ErQKkrn+cUx48atMdT8b2D/wxD5gTuNjDajtRcRkWkBv7O1WAbJcOvcfrCwcFlpETUfDtMKTrsVFjR3Zp25s0Gc7K0lpZWTaxscYnYqxsgwRIgARIIPMIUIjMvDmL22OIeYjNB9EMLtlwAb7mmmtcE53AFRsZoZHwBaIl3JpheQcLNwh1ECIhYr7lLW8xgtP3f/B9I95BgELMw5WrVhp3bVi7QXDEPhA+YYEJMQ0JarAd4iNcdiE4QXyCSzSESYhUEK7WvrDWbEesRiRFgZs4hE6IX0iYAhdfCHOxCizz4FYNIRQJctAmBEa0gRtKiGhwo4aoZrlsQ1yEizgsKC3Lz2htYNwQDlEnrAITKWgfwu4nPvkJE9MSloVgD5HUSvoC4Q5iI6whwRECLVy6MS7MEZLVTEaBuAsXfIiHECGt7OHg8Jvf/MYIB3Bth7s5Yo2Cr1sBA4z5/PPPPxQvC2sFn2ONYMx4ZyEBEniDQEA9sqeX5EmVWhxWFo5Ip8aQ3NqtQqV+PketJuGCPV9FyKI0+DaHaGKSP5j3fGMZn0yGYCvD8Ii6LuarCJsPMYCKDE+LNCSA9R0KqQCpFm4jECGT7KMleuHHO+Shwd8sk08A04D4inkaw9YX0RiSyLCdQAiKbhUed6sQuFfjNnpNgpPqUSO79rBaYcIVvDLfTyEy1YBZHwmQAAmQQFIE0uDRJal+86AYBCDmQJCD8AYLNQhbELLggg2rQsQohPCGApEO4tdnPvMZeeqpp4zVIIRMiHMQIVEXrBWx/YUXXjACJ26UEScSQqIV/886HlaRENTQ5hmnnyGzZs8yrraweoNAaGVgPu3U0+Skk08yQhuS3MCiDtvRH2ScRjIaCKCoDwIhYl7ixhwxC2E5ZyU+QT+v+5frTP0Q7N71rncZoQxiJ8RLCKoXXHCBEUYxfiTMgTiKjNc4BvuCB+rH2DEOiKT4HBzADS7mEEYhkEKAhNv7jOkzjIUjEgKBB+JDghOS9cDa07IGRdvYb+WKlYesPjEetI/90S+IcVVVVWY/9PETn/iEYQ3rSPQRQjJYwtp0ogv4I4s51hGE5+XLlx/qArZhrFYyG8wlGDqtoKwHKowXVqoYD+YW+2HOsR2sMV68s5AACRxOAMIE3K1XVedJXzBPNvlHJJAvMssIlONLq69/UFo7e4zFVyJl1Lpx1EIssSOdY4dFkrp+23QZiJPIBlpkfmQa3R/Xk6GhoDS1do4pMUgiY0zFvhVlJVKu8djgjs6SOQSwrmH5G1FxB1mxE7X+tUZqhC6sb31ZVpCZQyF3empCRWgSECQg9mloRwiSVnKuWBSGdX0MjXjPxD2eRGGJ2auJcqIVCKWdgyF5dlevrN3dK71DyYXZGM8xsO74BIr118vZ1UVy/OxyOXZaYrFB49fOPUiABEggdQRy9ifXlvaeT9RXl/0odSgnvyYkPUEMRAhmeIeIButGWAF6LbBIhIUeREy3gu24YcY+VpxA+34QpyDMoQ+W+631kAiLQisTttNNHJYzsLBDvTjWimcJIQ7xEaP1x62PaAcvHIO63ArETDw4oD03l/VYvFA3xu4WczNVnFGPFecTY3Bj7bWtseyH7OewAoVgevrpp5uq4FqN+I8QVP/whz8YQRUWkVgbcMGHGPnTn/7U8EEsUIi8EJZhoYoYkeC3YP6o2/6WrVtM4iSImQgpgIzaH/7wh8fSZR5LAiSQQgJNBzpl174WgWCWLqW3b1Dmz26QqspSI+KgBNV1srO7V3bubZHS4qKMsCjr12topYqQDfU1Ul7i/p2bLszZj1ECEGusbO8QIr2IUW7sTCZshDNQgasA1na0gMyYJYZ7R8z9zdvCGj5Dk4vNj/4jwpaBbnmiu0WzWXcmNT5c3Yo1VmWVv1B8GnSjSS0rg4n6hx9suUhd/hcUV8i7p4zefznLvi5NpLOxTTa3DEhr97DKlgwNkNSkTfJBBUhwpbFdKtRN4u2r6mXFzFIJ2H/Jm+T+5UrzuxoPyPZdTebeafUx7ufceLK4/+Fn5eV1m2TRwjly+SVnjWdTh+rGs/xTL25SI5qwLF8yW6bUVE5Iu/pc+Zg+K585IY2xkZQS4E/wKcU5uZXBmgzWhBDXYFkHgS1RkQ2us7FKvO3RRE9YvUFQiyYMQtx0c8uFmGkXNL0Qxvgtd+do+8NSMtkSr24v9cbjiDpgJTnZBW7ZsGJFXE0knkHBmoJVIxLQwB0biWYQAgDCL7hibJYVJPazxgrrWQiYf/nLX0ziI1hQ4gWrVhyL+ubPnz/ZQ2b7JEACNgK4sSwq9MvShTPTgguewTdu3q0xdfVHKhUf8+G7rgX9DGpsyXK96V80e5rkw3c9zUtjc5sMaZ8j+mMbS3oTgPgEy8dkYwVao7PCF8Dd1wiQFAjSe+JdemfCT6jQ4/OpVDdO8wcrkSJfgVSoK/X0wlKZrwKiGsHL2rxWE2uyVzNjI+FNsqEAnMPqGw7L2j298reXDsiFR9fKx06bJrOrioygxZJZBDoHQvLYtm757TNN8tPHGuW7l8+TOnWp4Exm1jyytySQCwQoRGbRLMMdGNZkEPVgZcZCAmMlAIvGWAWu/nC9h3UkBGO7azWEAbiqmwc4/TesOrEukTAI1p6IzwlLSxyHffBuZXAfa795PAmQQHYTQJg24xKrw+QDVnbP9WSOzkqgBIvbZOKd2vsOzcq4YBsLSMaBnMx5TUXb43XdgUiN7NZzisplUXGlTAkUmTiVKG+qnik7h3rltf4OOTCs3j/q+h1O0kLSzmBrm2b13tcjq2ZrKKYzZ6QCD+uYJAJVxQVy0bJqmVEZkGt/sUF2d2roKLWOLKSoPEkzwmbHm4A+Q44lAtB4d4/1xyCQy0LkeN1DTNqCQyIYJAJhIYGJJGBZoMJKwIqTZb3Drd5ZsB+sPfHCduybbHytiRwn2yIBEkgfAiFVIofV/Sdf3RYRW4+FBFJNAN9LECDhhjvW7yhYPgb8+YdCCaS6r6wvOwjA/bo+UCwnldfLVH0v0KRf9gIX/vkqUOL1+kCXrOtpk5bgwJgtI/d0DsouFSPftrIuO0Dm+Cj8er2ZWhGQ4xdVyVM7umRmZaE0lGugaRYSyE4CqTIOz046aTwqCpFpPDnsGglkGgG7GIl/w/oD1pBuxf5gZz8u08bM/pIACUwOAeOOHUIc4byo15nJ6RlbzWQCMDBDcqZh/aEMSWnGUkwMSI2XzEQ0Y6GYG8cihuNRJdWyoqxGStQt27KCjDb6BUUVUqOxI1/pbZdNfR1jghQMqeiugnt5YS4/Fo4JIQ8mARIgARJIkAC/cRIExt1JgATcCditIeMJi2O1LuEckAAJkAAIGNFI/wPryOEQvXO4KpInAMkxpGsorAI3BMixfE9BgMxXYalA3SHxfUib3eTnJVeOxCqp8gek2IMICSYFxoW7QIocVpPJ8BoNQaDhAtI/tG4yw+MxJEAC2U2AX7EZOr8UIjN04thtEshkAlYym0weA/tOAiSQHgRM7mKGeEiPycjAXoxaQGomZI23B1F7LFaQowKkvvJ9JhM2v+sycEFMUpfxJK3RQxMWrfkEPkkTxmZJgARIgATGRIBC5Jjw8WASIAEngXjWkCRGAiRAAiRAApNNYNSaVi0gNZRx5KAImWzeD3zvQYAs0HAkeRqzFCIkCwmQAAmQAAmQwLgT4BfuuCMenwYoRI4PV9ZKAiQQh8BY3N4IlwRIgARIgASSJQDLx5DGxRsVIEctapMp0Bt96s/qUwtIxIGkAJkMRR5DAiRAAiRAAiSQawQoRObajHO8JDCBBNwS1dBicgIngE2RAAmQAAkcIgDBcVSERCzI5ONAQoAcTciWJ35NRoN3FhIggTcI9A6FpVtfyDqPEijwSVVRvhT9/+39B5xkx3neC7/TOUxOmxN2gUXOAEESzFGkJFKkkkVbyQrXkhx+ki3d62td+XOUbNn+9Fn2tSwrWLIkUxJFUhRzTiAJIidiASwWm+Pk0Lnne57qOYvewcxOn07Tp/spsDmz0+fUqfrX6epTT70hWglEeX6hgIRQZRebkiWJvw+lIs5C+eJi/gqU/ThvCC86rmcQD/jMfAGhFFZcJujBOLPRVz5/OWwuTGeKNocXy3a8P4DzmPiH7y1ki7ZceDmWcD/O5ftL+ZIt5iqxYfnZjmFjYb0s08s4bi5btni0z0aTWkLrfhcBERCBRghoFm2Ens4VARF4BQEu9LhA80TItZmzPcsTxc7SzSMCIiACItAOApVkHMgMXCw1JkCysc4NG8lCIshsLAGyHcOnawSQwJPnluyRk4uWK6xAqDej6HfD9pTdtWsAYmSfferZGZtdLiBBTiWZ04GxhL16/6DNLBftTx46b8MQ+jyB/5Ydabt7T7+V8Bl+9NSSffXoPITFkt22K22v2j9gOwbj+GyX7fmpnD3w4qwdm8riGdTs1QcG8f6g7YAgeWYuZ98+uWAnZ/IQRSvC5c2o9w7U8RDa+eSZJdcOJpjqj4Xt/muGbN9o3KKrn/EMBMzHzy7bQycW7JrxhL37htEAjoqaLAJdSUA7gQEd1l7Oj1afH05AB1rNFoF2EvDExrUipNcGJZZo52joWiIgAiLQuwQoQlKkyOaLsM6iBVZ9j3/ODRsKZDwStlhUImTv3lGt6TnvStydeL1ssXe1K3nHw663NQ1qsNZvvDhvH31syh47tWgvQRj8i4cu2P/5oaP2zPklZwX5v7993h6GqHdmNmcXF/I2D2tFWimfnM3bH37+lL00nXV/52sa4iQtGR+BCPnPPnrUppbzsJCM2G984oR98JFLdmmxAJFxyX7zsyftf379rGUhfk4tFezffvwl+9ATF+0C3j9yMWOffGraHjq+cLnehSw2JtCWTzw9bR999KI9d37Zjl3K4vdL9pN/9Kydm69YZpLwYxAq/8uXT9tvf+qEffY7M+vSYZgHWl7y+gX+g2PK+Qf/50JAuH+//B455FeP58/VUxokr9NFQAREIBgEetkisjO/uYNx36iVIrAugbVWjhst+OSerRtIBERABESglQQqAmRF3KhsftV/NVpmReCCzTiQsuavn6PO3JhAfqVkjy9MObHqUKLfEqGrL9Fmijk7sjxrL2UXOxbrruGYvee2cXvzdcP29WPz9hcPX7BvQ3y8fVe/nbqYtZ+5f6e97fCws0QMw2ySyaNogJiAu/T/8dqdtnso5voWwQbARQiLRy4s266RhP2Ld+03GjXeurvf4niP1ooPoP5zsHr873/nBtsPS0Z+5v/qiSl7HOLlE2eXnNAZh/v3e28bs7deN3S53hg+0ywHt6XsR+/bbjfDavPF6Zy9+zcesqMQJSfSUbhtl+yLz83aOYiktx0cXJc328C+feTJaTszk7PXXztkP/GqbXYCv3/56BysL1N2E+p+7PSSPXshYz+Na52czdrvfP2cPXdu2a7H+++9ddxZfqqIgAiIQC8QkBDZC6OsPopACwlUi4qepWOtCzXPYrJeC5UWdktVi4AIgACtwLLZnD374unO4AFjocWlZRsd7rcorNKYHIQWJt6cs7CwbM+9dMa5+3V6Wc5kbTCddMlOVJpHgN8njEtXsX58OQZdPVegABkOQYCE6sF7rPPvqnp6qXM6gQDdjudKcB+ev2jPQ2C8vX/MdsdTFu0LX9G8AhIsPZOZs6OZeZspZC2Pe7xTCz8/jAlJsXAJYt5FxIWM4ndn/YjP5+9+9Yz9HiwYJ+A6/X23TzhRkhsGOcRr/BLEu7FU1HXt0Dhcr/GZPg1RLwfB759+9Jg9CzfpfRMJ+8nX7HDxIgsILnloMmnXTyQvu16/55YxezMEwSG4eX8MVo9HIEg+c3rRfuvzfTY2GLNfedseCI9pdw2GW0jBJZvtW4T1dBnXS8aYiApu5M/NOOvIG3amNkT9+edn7QsQK/txznfdNAJL0CWIjGft+yB8noB1J60vn4dV5vMQIW+E6LiQK9ovfPAFe/tNo3b77rR9De7mH31yygYhwl6HPqiIQCMEXnXXTXbzjQctEY83Uk1QztVXc1BGak07JUQGdODUbBHoVALVwmQlmD92uRmsp6p4wiP/LhGyU0dS7RIBs6GBtO3ZOdFRLmP96bgND6YtHo+4OGAlLEDLcJft70+6LMghCEd+C+cqWt20U2lKJWI2iDYn8FOlcQIUMMoQN4q4KZh0ggJ1vcUTIMOrmbApyKuIQKsJUIxcKuUtWy7Yg/NlOwkhcl88bdtiSYPnrp3MLdpJWEBegAC5iOOKDdzjre4L66fw928+sWT/FYIi3Y73IQ7km2CNmIyG7cffuMtZLrI88OKCszjcMRh1FqErOPhBWDgyriRLqG/YRpHIhm7aFPRejzregNdHHp+yr0OwpLBXACB8DVwWIXkeE8p4SWVugTXi375vhyVifS4hzichTH4Y51OkZHkYQuAvXXjBiY/cyHjj3dts11DcuZU/8MKcjfdHIRgOID7l7LrW1Q8j/uQTJxbt1bCYZCKeaVhwHp/K2LsgNN5/cMg+9cy0feqpJduH+JI/du82e/z0sp2AKHl2V87NV7NLSLIDF/Qj5zMSIttxc3b5NQYH+42vXih4ftNubkAHWkJkQAdOzRaBTiGwVkj0ktVcLQ6kZ70ki8hOGUW1QwTWJ5CESBaNDDn31k4pNHakNaTb6GDcPuqHznItYRH+o47ibZrQ9baSIKE9yhNjDSrjch0DtuYULuSLUBcadcOmhS3Hg99NFKYlQDY+NqrBPwEKkhcLGSc2zhSzNpyNu1iG/Bv/zfc7Z0beuH8DiOO4c6RizXgOsSB3DMdtP1yr6cb8xkNDTnBLQ2xcggXkN16cs2fgorxvNGkRiIEU78bgFs1yCJaPtKhMYfNpGILk268fsSH8/gTcnE+j3v1jcSdATi+VXHxGJsNhOYvs2i/NZJ2LN+u6d9+Au2YJmxWMOfmFZ6ddchyWIQiN18PikW352tNT9n9/3zUuy/cHH7lgRyEYcm554syic6OOYI54DJaVNyLZTWzV+n52uYR+lm07rsXvoVth5ch+D6B/N25P2l89imzfsIg8DNF0B6wxn4dIyZIGIzK4BcdTBN0GMVZFBETAF4H2PLD5apIOroVALwuRtfDRMSIgApsQ2Cze41prSAEVAREIDgF+vin6derSiEJRGJvhFJCK/B2LQi4y6zEU4pNsRYSqxAKUQNjZ96mXCZsCAd08GV+unnFnLytCNO+fsLuHNPadPfa90roMLLxPZ5fsbN+yu7dLgZAfXx4dipA/cOeEi7P4F0gGcxIuynNwy6a18ueOzFoeQt0exJFcwN84l6cgyPFnFKIirRy3w2WbJQFTR2avPghB8hjEvAuwOJzLwIIQ1pFRzNWT/TEnID4Oi8S/QHKa118z6JLGfOypKXwfmHP5XoLw+OSZZSSHKdtOiIWLuCbdxikqshzalrSfRNzGDM47hXbSEtJLMnMdBEe6XJ+fg0UmrstNiplMycWQzORLEE8TzqV6EKLiAARSZtvme0yow2t87bl5ZxG6CyIoLTefQx/IhGUA9R4aT7oYmGzL+Orfe+UeVz9FoFECMHzp3PgUjXauy8/vZSFS6nmX39zq3tYRqMXdmsfINXvrxkhXFoFuIuAEUzzRrKyELV+oZCb1m6CEFkYUtcpIGrGyAldtLH4pcMoqrvPuFI4v3Svpiu9ZQdbTSo4t7x0XB1Licz0Idc5VCER4bzVoXc0VdiNhBrZqgPohwo2kI5aMhOwWCHnHEd/xgw+dd1aPjMv4GLJXMwnMTgiRFO3GB2J2B5LYXIIgNwBX7geQddtzzd49ErPDEym7De9/69iCi6WYgoB3FnW+6fphCHkJG0mG7RjEQ2bGnkaWbIqcD8LK8vWHR2wU7TgPq8anzy7aKVhIXodYko+dXLT74EY9iesO4lxuRDCZzXZYJL771jFXzwfgnv09N4/ZMsRGlhcuZdx3AsvhyZR96/g83K+z9tbrQ3YHEufMOXES1pOYn55FBu6b0W/Gw/wm3Mx3Q5y8fW8/rCvh6o1/v/+2Cbt1/4Cz2kzFK+IqrTa1ON2qOzb4183h4SeTQRxVxDgtMlEb7kNurEXCEYshHALDwCTiMSVcC/5Qd00PelmI7JpBVEdEYCsJrBUdr2YhuZn15Fb2Q9cWARFYn4DbNKjX1GwLoEaw8C3C6oUP4U6QXONWHmYsyHVK9bF01mOyE8YIpEjlzqjP63sLCFx5yYqY2h3LWxcHksloio0JkG44yQWLtCgFZ/zsDkJbfrupAVUE0uGojccS1p+LGK0bOSe1u/C+jsBqvB9tGYm0Lx7tjYjJSKu/XXDHptv03RDh8phTX4K14X37Bu0X3rTb/hqC4uMQBG+CYPdmuFsfgFgHvcTecOMoBLr8ZVQUU64bN7sbMRrTbwrZ7yIJDMs7IRK+HULkblyDr3FYRn7iOzP2NSSOoVD5/XdP2psODcNiEn2HuEmryr+BwPjl5+fszn399iN3TrrYk3fuHXCWjbRonOyP2PuQ6fsMrB+z+B6htWKCKbpRKFrSahNBG2wHrDVHEF9yAX3k+++8ftS5Yf81rDC/hpiSTJxDF3IKka+9ZsiuhTUk+/fYGSTMQaKdbTj/377nGvudr52xBxCfki7d9+O4A4ijqSICtRLgjMLvQya/uzQ1Z2fOI9zA3LwtLefc3yMRWOkiKV4/XhPjQ7Z9YsT92wtvU+t1Ovy49k+sHQ4kKM3r2eeuC9MLPzcx0v9fgjJQaqcIdCqBzWJEeq7Z1Qlq2Bf+3bOI9Kwjw+GwDQwMdGpX1S4R6DkCJSzEsthlz+ZeXhQGBwIFK1jOuWRZLz+n9qfTTmCsLhQu2cdSqRIvrLowXiDFS88SJjj9r7Q0lYojQQMsbQIuRlYEyEosyFqs7jcaJ2Kg8BjDAk0u2EG7mzunvX/wfMnSiEX4g/uvvkMxU8zbU8sz9i1kw57D70WGEGhTNyiYxTF/7UDSm7v6J/AaXffKf/XElH34sUv2M6/bYa87MNim1ukyrSRwGkLq//nRF+3eAwP2g7dPOuFTpX0Ejp+5aC8eP4eEdPjs3XKwZRfOF4pOgHz8mRdtemaeJv4uxrF7wuGX3Wo8WXovM5ZyPAbL41uusd07JpDwD9aRTWwZ13QPPPKsFQolu+nwXpscHWpi7RtXtby8/NV0Ov36tlxMF2kqgV62iGzXc0BTB0yViUCnEfAWt9ULw+pENVfLml3dF9YT9IVyp42N2iMCjRKYml+wE6cuWgQua4Es+Kb3vuw5L1FwHBsp2PjIECwFKn2iwDW3sGRnzl20+DoZrC8/qDfzib1NMEsQ7uiKtWMSWWeHg7nJQyOyAtzMmMm2YQGSrrLY8Iqujn2bhkGX6WECw7BCfPXApN2SGnGC5DchSM4Uc22xjtyTSNs9AxN2fWLQknDPVBEBEegeArlcwU6cuWCPPfWi5fN5C+Ezvm/3hO3ZNWGjQwPO2r8Aq8i5+SVYSS7a8y+esiVYTj7yxFFsvBbt4L4dxoSEKiKwVQR6+VtJQuRW3XW6btcRuNri8GrJapQ1u+tuBXWoywiU8BAbhmhz+MCuwPeMlgMXpmZdXMFKbPOKEEnXbdooJRJxO3zNzsD3s7oDs1iALC1nGxLwtgoIBUi6x9OilZYcjYiQtHyMQICkJaw2vLZqRHvzuhXX6D4bgiB5Z/+47Yyl7JHFKTuyPG8LyIrdijIRTdrN/SN2fXLIJqMJSyC8RAD3UVqBRnWKQFcQKOB55vjpC/bMkePuO3L3zkk7fHCXDcACMwYPCCZU8pINxmAFOToy4Nyyj750BuLlRXvu6Cn3HHTdNbthJSlr2a64KQLYCQmRARw0NVkEOonAeovD6liQ1RaR3rH86R2z1pKyk/qmtohArxOgGESX5CREuqCXMNyVGLSdmyN9iJnmFW9XknHIuqGf1eOUyeRtuS8XqKFzcSAhQBaY/XxVgKx359gtxBjnEyKkl5gmUDDU2K4hQCEwBUFwbxwZmENRuy41BDFyzo5mFmwWFpKNFs7TA4gDedfAuO2L90OAjOPfMSeCqoiACHQXgVNnL9oLx067UCW0grz+4B4bGkw7t+zqUknkx1fMCY7R6B739slzl+zkmUuWSiacZWTAiya5gA5gLwuRAR0yNVsEgkGg1qQ16wmSweihWikCIhBEAnxQj8HV3G2ScFOkkhBVZYsJeIloSlhYuezla5IM+WketZdKXE+Kz7KC9MNOx9ZGYDTeZ2cyK/aNi2W7ZRjJYGo0KmLimEkksBmNxmwskoBgmLTnMrN2OrdkWRfP1l+hAMlENBQfDyUH7LrkoLO+XI0S568yHS0CItDxBOjlcP7irM0vLNvo6ACExJ02UkPoFa63BgfSdmDvDltEHRcRW/LshWmEbhlxgmRQC/oV0NhBQSXevHZLiGweS9UkAiKwhkC1yLiZW51iROr2EQERaBcBuuhGED+pxLiDELy0nd4u8utfh8Ijx8IlMWMyjzpNIPk9QjfsivUrXdO2tl+6evcSuHEYVkZY/p5eNpvPl21Xus9uwt9qveUoSO6KJSEaIlNzLG4vZhfwWrTpfBaCJMJH1ICuHxbeO5GI5gBiQB5I9NtuuH2zXr+F1uD4uFi+4F8I9XstHS8CItAYgenZBZtbXEY4mZjtnBy18VF/CabGIF5uGx92sbHn5pYgSM7DqjK4QmRjNHX2VhLoZSGy1meFrRwfXVsEAkfAT/wtL2t24DqpBouACASeAC2JQnBZWlmBaIWFuEr7CdAidQUWqQUIL5Xvg/ra4ATI1WzYjAWpbNj1cdRZtRO4drDPdqf67IXFFXtsqmznYB25VOiz7Um88Pd4jXog3bRvSA7bgfiA7YjO2QvZeTuVRXIJuGsXXCzbV5YkXLyH4HpN8fGm1LDtx7mNuGDHkf07AVV1ZrlQOwAd2fEECghxwe82fb11/FD5aiAtITNIOsN4kJMQIte6Y29WGY+fGB+xi9PzeM05y8h9uyc3O61j34ehi3ZQOnZ0rt6wXhYiAzpkarYIdDaB6jiQbGklHltlkb/2vc7uiVonAiLQCwTCsCCScNXekfbcsItIhsRA+/UKkGw1BWXGgKQLtsaxvePY61dLYhV1C6wg96TC9s0LZfvU6RW7ZmDFbh8L4W+I2Qh3bdyWNRUmlLmzf9SuTQzYE8iu/Z3lWTsH68hMuXA5w3aYbtgQLvdCgLwFyWiuwU/+20+B4bFN5VYglPZZGqdiL8aGExEbQmeOXMhYrrhiMfyxxmb7ubSObROBAizMZ7JFm1kq2baBuIsRqNI9BJaXc5ZD1uuxkaj1r3Gpnp1fhHfBK3U5rsNGkEnb8xIYHko7IfPM+Us2v7gUdDh1bmEGvdvBb7+EyOCPoXogAh1BwHPDXis6rte4ajdsxgNTEQEREAER6A0CtIKkAFmkW3wDCiQXVBQhY9GIBMjeuHU6tpfDMbN37g7hZfbBl8r2YbzuGuuzO8ex+Ie1YSzMe7W25g9EovbawUm7HULjN+cv2aPIsD1fzLt7ncloXje0zW5JjxqtIv0UhlzN4nFrtrBiHz2BbLkDfRBM+2wMsS73jsRtN14feui8veOGETs4nrS4Yqv6wdsxx3JOPbdQsK+8MGuzi3m7/5pBJzSrdA+B5WwOYRQKyI4dQWzHKxMJfu1bT9vM3MIrOhtH5uz3v+t+C0cqptr83oxFGZ6m7ERNFRHYCgKambaCuq4pAl1MYO3CsjprdnW3XSywOgKzdzE6dU0EREAEupYANcdiEdmwsfnUsAAJ17IoYnwytp2KCHQSge/fF7Lz21bsc6fL9jtHVuzaAbN3QKQch+Dnp6Rh6fjGoe12ODlkR+GuzQ3cO1KjlkZcSIqSfsslWEH+zcmyPT29Ym/aVrbbRsI2EquIEjsGYvbW64btmTNL9nf/4Fm77/Cw3bQzbSkIFSrBIjAN9/qHj8/b0bMZ+62/dZ1EyGANn1pbBwElq6kDWoec0stCpMx4O+QmVDO6g4C3sKy2jOTfJDZ2x/iqFyIgAiJQDwEnQMLqorgqQDZgBOmExzAswSJ0Ha1DjKmn/TpHBPwQoCv2tkSffe/esE1D/Hscwt/vPFu2eyb67O07awwcuXpBumLvQEKbUcSDZKEVpF8J8kJ2xb52Ae2YWrG7YaH5i7f0GcJYWrrK/ZofpWvGkvZ/vWOvPXPbuH396JwTJYsNZK73w0zHNo/AQDxir7922H75bXvtxm1puWU3D23H1BSHJWQEGxL0LMjl8haPwyR7tbzh1bci3MkrPc1cHOVVa0gemoFVZTZXwP0Rsf6UEtV0zOD2WEMkRPbYgKu7ItBqAmvjQG5kEdnqdqh+ERABERCBrSPgCZCMAVmGoFGvFaTngh2iALnqLioNcuvGVVfenADFSLpr98Mtm3EYt6fMjsFb8j8+VbLbIQbehRiSQzWGdqQYmerzb5k4lzd74GLZziyv2CisMb97b8j2p80mIJKWV1blzCpVMw5hcs9Q3MZSEYiSCVvOI4GUTDY2H+wOOyIKsWkU8T4nEaA0KovxDhud5jSnP520ZCJqi8tZm5qZt53bxy9XPNCfrOkimWweQmQem3oRS6clRNYETQc1nYCEyKYjVYUiIAIiIAIiIAIi0JsEXCIaWkBCxSgjmSVFyHoLk884K0hmwoZoIivIeknqvK0gwBwhtI4cxC8jsRU7CnHyJLJsT+XKLsnN/jSyVTdxJcZPWhZ5KpjF+8hcJSHNdcjuvRfX2YWXl7NkI9duCvxpBLS8bqI2McNjys88ry3dayvuMl2z1wiMjgxY/4WkzcwvIdnMjG33mTmbnmoXLs26WJLJRMxGhxE/Itil/oeMYPc78K1v4tdf4Fjopg3ckKnBnUjAc8Ve2zbv73LN7sRRU5tEQAREoPkEKDoyCQ1dw5w4UacftnMjcyJk6LIVZPNbqxpFoD0EmF378FCf7UOCmKemaaVo9h0IhaeWVmw3BMJ9ePGYRsoy8k08izpfhNDJkoLqeCPEzkMQIhP+PMJ9N4Ofc37uaWAZVvZ63/x0ggj4ITCK7NfMgD09u2gXp2bt3MUZ27ltrOYqpmYX7NyFGVvO5G0HRMyxsaGaz+3EAzH/KOtpJw5MDW1q8GuvhivoEBEQga4nUC1GbiRMdj0EdVAEupAALWQKhZKdx+550AtjFC5ncqvxkF72SeyD4MUQEkyi0g39rB6nxaWMs0hk/1pVPMGxRAtIWFowHmS95bIbNiwg6YZdT1KOeq+t80SglQQ44yTxMbxnPGR0m34EgiStIy9mzc4jjiMtF3cweKPPkoEAyTiQL0HUPLawYhksyV87GbJDED3hZd2WgsAL+OzTlZtW0LC8DCGhjguj0JbL6yIi0FMEErBi3D45YrPzi3DNXrAXjp2xJOJEDg6m3ebdRoWfz7m5RTt2/KzNQIxkbMjt20ZsIPgxImVcFtBPQJu+ojqSjm7ajhwWNSqoBNYKkPVawgS1/2q3CHQjAQZBjyEw+qmzU13RPS6Ok6m4hfteflin5V0iHoXwFa67n5zvGn2o4Jq9Fa7HY3C7isdqDEjnc5RdQjJYQhVcHMiys4Ksp1Cw8Kwgo3TDlo9nPRh1TkAIDMFF+03bQ05AfPDiij16acUWCwYx0mwSrtwI77epm3MRn7UpJMM5tWT2AgTIi6jreoiZb94R2vTcjTBVMtsXXRILhlWotXCzo4ANCM4FNIuEBGkxZNx2H+MaxEhsOVgULuGJWOwK8bJULFuuULAC2tSJhd8ZyUT8ivmKc2K+QIZQm7u2wFIdsSgT0aiFqxKgdG13O7Bjk+PDSDiTtyXEiTx7fhqftZBds3+7DQ0gQVEUyWwi/Pz1Oa8EJrXJ4p5cWly2F46fsbPnpl2SmgN7t9v+3ds6sHdqUq8Q6GUhslfGWP0UgZYS2EhwvJrLtty1WzokqlwEmkZgdKjf+Or2wof3W69HJoc6Cq0M+KBPS8B6hTheNhwOYfEecQvxGtbudbS0eadUrCBhLYt+MxlNI/1mf50Ltls4tUaMbV7PVZMINI8ARcfv3tPnRMQvnlux//Zsyd65O2Q3j/bZaAxiHvZL1s4F1Po9K8gvnau4ed8y0mc/eSjcsAUkxcep2SU7cfq8sxBvW0Enx0eG7NC+7VdsEs0vLWNz6JLNw7K7E0scQtwNh3ZbusqiLJcvwO111k6i3dz46sZCgSuVjNu+XZM2DCs8lfYToNi4Z9eEmyAef+ZFO37qnJ29OG0H9+2wsZFBGxxIuQ3IIsT8hcUlO3Xukr104oKVSkVsLsfs2mt22zX4vLVqk7LNROrcAm1zK3W5VxCQEKmbQgREoCkEPOFxM0tIvq9M2k1BrkpEQAQ6gAAXZc4CIQyrIDz00wW8nlKCkJkt5yuCJKwVOtWtsRIHksJr/ZmwPT6VvsKCq4Wu4/WMhc4RgXYSYCbr9+zts7vH+uyvT5Xt6xdW7E07kF17NITM2y+3hKttWk7+9cmyiwd5NzJwfy+EzGGIls0wImaSqUw2axOIGbcDrp/tEilOnptyYTM4r1S7ltKqkBmCd+8Y7zjBi8+y33j0yCvme87juWLBDsE6jVZr3RheYn5h2S5Mz1ou35mWqu387G7ltfj53AeLxjRE4Qe+/Yxl8Hl55rnjrknVErin0vGeHR0etJtv3G87Jkaw8dkaT4mtZKJrB4tALwuR3blNFaz7T63tIgKeAFmLIMljW+GC2EU41RUREIEAEXAeiFAC6I4YRZIILtDqSRZNy8KKIFmEsMlELaGOESQrlp9eIhqKkPUPEF2v6dbIOJD6Lqifo87sHgK0ftzb32c/djDsLCS/caFsz8yW7FZYO96JuJIIwWgPIhv25yBUvnpbyH7iUMhl5GaSm2aIkGtJ8nPZrs/m5UAZG8wpXuiGII12H1xl28mwrWy0gm4r7qtdLApPgsmxEXvbG+5G0popJK+ZQxzIJVuAFXEeYQ242defTLjkNrt2jLlNhiT+ze/fLioNPI10EYUAdkVCZAAHTU0WgU4i4Cc5TfWxm1lOdlIf1RYREAERqIVAZcEcqrhErWaPpgWhn1Jxey5bgfEX4fZMl+VwK5SGGhvlZcRlJmw0p+5M2LxcJRM2BEiIte4/LWhrHAUd1u0E+FHAx8JGED8yjV9SEBCeQ+zHp2ZW7IHzJUvDeInWkT8AoXJ3ypwVJI9XEQER6G0CjNM5OJDEc8ekbYOlowsVg7iqfPbguovfuYz1zSQ3lfAvmjh6+47pnN5LiOycsWi4JdPT03b06FG4iEWx25G0mZkZW15etltuucXGx8fdxPPss89aJpNx7y8uLtrs7Ky99a1vddd+7LHH7Pjx45ZOp+3w4cO2Z8+eK9rEc0+ePFmJLXHttbZz587L73Ox9Oijj9qJEydscnLSrrvuOpuYQOwKFL63sLDg6l9aWrLxsXG75uA1rk0sbM+RI0fs9OnTNjw8bLt27bJt27a5Nq5Xjh075tqZy+XctQ4cOGBDQ0OuP7wG28828v3R0VHXzrNnz9rTTz/t/r179247f/68pVIp10f+nJqasieeeMLIcMeOHY4Z26Jils/n7bnnnnP30+te97pNkay1jKw+oVp81Bfhpih1gAiIQEAJUHCLMvZhKWzFvjLiKPp3Y+Z8yQTUKwgyX6J4xyzSbRQkKYjSVbPoEtEwG64/QbV66NjuihUkE2m0z9IqoLePmt3jBGgduTtdyXo9Hu9zSWn40acFJLNrt3Ea6PGRUPdFIDgEmFyQLxURCAoBCZFBGaka2nnmzBn74z/+YycYxeNxu3TpkmUR6+X666+3n/3Zn7WDBw/aRz/6UScqRRB/isdRhLvtttvsT//0T+0b3/iGE+QoZN5www32rne9y97ylrc4ge9v/uZv7FOf+pQT9MIw577mmmvs7W9/u73tbW9z9fzZn/2ZO59CI+u8++677d3vfrcTJL/zne+4+imSUpRk/a9//evd+4lEwj75yU/aZz7zmcs9pAj5/d///fbqV7/aHVtdvvKVr9iHPvQhO3XqFNzXsEMM0fGOO+6wH/7hH3b//s//+T87AZEiJM+lcMY2/OEf/qE9//zzNjAw4P7N82+++WbXhjxiavzlh/7ScfEKz/ve7/1eJ7j2ejl37pwTsDeyYJRlY6/fIeq/CIjAegScJQIt/8p4wTqyDItCCpJ+ihMjKQiuFDEHV2IpRlucpdQJkLDIZKhLtpkipL9Wv9zDijUGBEi0u49Cqiwx/Ay/ju1xAqMQIUfj/Dz2GbNkU6BUEQEREAEREIFuICAhshtGcbUPc3Nz9s1vftNeeukl279/v42NjdmFCxfc3yjO/fzP/7w9/PDD9tWvftW9R8tAWhLyb//xP/7HyyIdhaePfexjiDEx5wRHio98nyLloUOHnPDI9y9evOisF3m93/qt33LXoCUhLRYpFhYQm+K9732vExn/x//4H3brrbe6+l588UV3TYqdXGT9zu/8jrOGpPhIgZCWiRQJefxaq8Rvfetb7v2RkREnpvL3Z555xrWLVpwUKinCUszktWjB+fjjj9tf/uVfOutH1sdjXnjhBSfS8hwKpP/rf/0vZwl5//332yOPPOJEVV5fQqQ5gZZjT8GaY0qBe/v27ZdN+3mfsPBe4nhSjOYYUwjmcRSLuXimUEzLWArmFH9379lt/f39rh5a7nI8eCz/piICIiAC3UKgYh3Z58SEPrhM1WNdSHGQWblDq0KmszB0loXNo0SxcQX1lzyXcuciXp8EyXaxfaFVN2wJkM0bJ9XUewRoAQlP7K4v9c02XY9FHRQBEbgKAawjtUUT0DtEQmRAB+5qzabYRlHvR37kR+zTn/60/dIv/ZJ95CMfcf9moZh0++232y//8i+7GBL/+3//bycA/rN/9s/sp37qp5wIR2GRIh/Pp/D00EMP2Y/+6I/ar/6zX7WjLx61D37wg05cogjI9+jq/OY3v9ne8573uPN5va9//etOEKW7Nt1777rrLmdFSes6XpeiE9/z3Lm/67u+y7mKU9ikgMVz1hYKjG94wxuciEnhim7ddLl+6qmnnKjIQmHrh37oh5y149e+9jX78z//c+fm/Su/8iv2vve9z/7JP/knrr8sFMTm5+edpSZdvL/ne77HCZYUxoYGh7rw7vDfJQrLFBcp9nJ8PvGJT9jf+Tt/x7m/s/A+oZXsfffd5+4VCrm0gqUgvG/vPrvt9tvceFK45r3C8eb4kzeFa7rwU4imOEx3fVrhqoiACIhANxGgMBemMIf4TBQUmR2WIp9fnY/u0Xm4alfcnCOYeyuCX6OFbSlDgCysumE3IkDyO9iJr2hcO13JG2Wg80VABLaOADdBOAdxo0bzxtaNg64sAgEk0PhDUAA73Q1NlhDZDaO4pg8UeGjNR4tHWrHRHZkCEi3SWOg6TTdtHkPBiC8uOigK0aqNrtyMq0iBiQIfhUsuLOhOPTI6Ym858Bbn8sz6+P6f/MmfOGGJlpcUoXgs/00higIgBUgKk3Qbp7BJUYpu3xQVeV26cVOg+umf/mknRL32ta91r8HBwSt6RrGQ51Bc/NKXvuSELb7Yn+pCy0YKrewH20ShkcdQnKR4+prXvMa++MUvulMmt01aAtnD6LLOetlnXoPXDyNBAK/Jc3q1cIwpCHMsOTa8Vyhck6UnRJIb37/pppucCP27v/u79pM/+ZNOzP3kpz7pONKClWNBy1QKxBwjuvvTupb3FcVn/puipITIXr3b1G8R6H4C1AzpWs14jwVYR9L6sJ7Yi1ysF+CuXYbbN7NmMmN3PU/ilcQ4qIttqSOOZfWIObGVruPIHN4McbT77wb1UAREwCNQ2WTBegNzWXw1oYYsJHV/iIAIiED3EuhlIbJrR5WushQeWSgI0nJwcmJyU0GNwl91TEa6PvNvjLfIQpda/k7xj4IjY0dSqGPheT/2Yz/mLBUZ95GFgh6t6ChYMd4jXcIfeOAB+9znPufcpSlC/at/9a+cW/SXv/xlJ2J97K8/5uI50mruH/2jf+SsLFl4HfbpH/7Df+jceylm/eAP/qBzs6bAVV0oOq6NLcmFFrnQWpTWfZ4oy7bSko/CLBPdsA1sy2//9m87QXXfvn2Xk+p07Q1zlY7RtZ/WjoMDV4rC653CYzluTH5Ey1LeP7Repav1k08+aXT5/4Ef+AEXe5PjSSH8n//zf+4SCLHw3qFrvIoIiIAIdDsBfr8we2UpTBGwkt3Sr3Xky9msVyBshp3A6cc4ktfLFxkLsmKdWW9xbtgUIPEKQWBVIrJ6Seo8EehtApyFOBdmcgU8e4Yaik/b2yTVexHoHQJ4fqmIESqBIyAhMnBDtnmDGdPvL/7iL1xcP4p0dF9mlmpPIKyugRZoFPWYiIbu2HTDpXXigw8+6MS5N73pTS6GIhcpf/RHf+TERVqvMcHM3r177Wd+5mdcwhpaGDIZDK0x6a5NKzmKkBSleCxjQn73d3+3+zczZPM6FDUZS/Lf//t/7yzkfu7nfs65a//BH/yBayItGWlFSWvFd77znU6UpIjIa1DYpJhFcetqha7htNQjh7//9/++s87kNRn3kq7cdBNn3ylo0hLvx3/8x53bNsVWFXNu77SSpUi4WfEscP/Tf/pP9u1vf9tZld5z9z126NpDl2OVUkz+7Gc/6+4njh/vFYqPXoZ0LWA3o6z3RUAEuokAE7lU3LVXnLs2F+F+S0WQXLWOhCAZ3iSZDTVHip8uI7dzD/d/Ta+NbL9zwZYA6XfYdLwIiMBVCJQYwgIbJdIYdJuIgAhsQqD+hxih3VICvSxEdu1NS3GRQhqTwFD4ufHGG53bMxPUrC0Umd721rfZ+9//fhfTka63tKJknETGmbz33nudVSCtHSku/uZv/qZz1aZ79Rvf+EZnTcj3aUn4+c9/3h3DQhGTLtd0kaYgSqGSAiNdeGmZSNduCqC0mqMIScHrF3/xF53QyGP4PgVHunTT+pJu1jyOYiTb+eu//utOCKX779UKM2qz72wzxVByYXuZxIZlcnLSiZ8UIn//93/fPvzhD9v09LTrF12GyaeXy6OPPuo4M9P4ZoVCN8f7V3/1V521LAXx//Y7/83e933vc6IjRWGOB5MIeQtfjh/r59ioiIAIiEAvEuAGDF21KerROrGABbhfbZDHl5yoWEJCmzK+W0POTbq6XLagRP3Miu33GtV1VWJUQvSkAMn/6vEL78XBVp9FoIMJhJDzIYbQCmcvzNrCUmZTT6pmdSUHC8hEIoaQDgh6W1U4j83PZG1+MQOL7+lmXa459WDOrSQMu3KepXV4BK9TZy/Zpel5BK5vzuU6qRZuZLGMDg10UrPUlh4loGQ1wR14CZHBHbsNW85YfrRSpPUirQppEUgLQros/+zP/qxzjeXfWOjCvGfvHvvH//gf2zve8Q6XdIbCHLNFU8CkEEdrNbpEM5kMrSHpqkuhkaIT3Wr5Ps9nvEgKfRQSaW1I0YmiKNvCa9O1m8IT4wXyXLaBiy4KkMyyTHGQYhYt62hJNzE54dpEAZJ18Tq0aqQFHfu1Y/sOS6aSllnO2I033ejiWv7Gb/yGu6aXuIZ9pABL0ZRtoOhFN2FafFIEJSsKpgP9A/bskWcrbuwQJyl8sv9rXby78Ha5apfoBs/ixeGkoEuhlkIj/8ZxoMUtx5yCM+8PMqUFJceNlqgzszNOhCRXCs0cdy6Iea94SYO4EJc1ZK/dXeqvCIiAR4BCXmUexEIcC9uSSxrjXyxknDWX9KGwAiHSnCDJdXCZ1kWriWjqiUnptZMCZBiZsClA8vcuXGPrphSBniVAy+bR4QF8viOr80/zbDYwM7k4tOtZfffjWT4RhxCJ61eXNGK4c14sFBA+Av9xxuExTPzVCWVsdBDtjl7RlFgsYhNjwxaPRbv2udZtnkGw7k8nO2EY1AYREIGAEuhlITKgQ7Z5symeMf4ehUMKa9VJX9ZLBMIYjhTj+KKwRFGJL6/wfQqHfPF9fgFRMPREOgqEtCDki+9zN5Dne+9TWGRyE7aFLwpYXqITXoPWjxQXab3J81i3lyDmnnvucSKk1x62kUl1uECjkLhWKKTlZnWh8EX3a1pR0hKP7uCMU8mf/DetLimY0cLzLW99y2VeFFt7vTDeI+M7Mq6mV9KptBMV6cZPsZr3FmND8hiKixSbP/7xjzuxkfcCRW2K1RSuKTxSmKSLP89jlmxaWpK9igiIgAiIQEWMjEaw0EYSGuaXcwt3n9m1vQQ0tI703BordfiPQ+mNCS1/nBWkiwPpLxalxlUERCAYBDj/JBNcA8RshYm0mtbsyvxDEZKbLEzSVS1xUlZkkpq1Sa5iEPMiCF3BzRXv+MvzEDZa3PFrLBKb1uQaKnKhNfCqLrREH4BAR47dWmgD2sfNqA4RhLuVs/pVGwHFiKyNUyceJSGyE0elzjbR0vDmm292loO0AqTYVy341VLt2kzVa89p5H0KjOvFqeQ1+PDD9q8tFATXioLVIulmfeL1PCGNbsaMT0kRk7Ev3/72tzsRkoXCJ7l5sQo3q7cX3qdLPK1LKSR7ZXxi3D7wgQ+4xEMUICkqU/Sm0Mh7gyIlk/6cPn3aWU0yaztjhdJKkvcmrSkpVlKkZDbuXbt2uazutGblPbBe+IBeYK0+ioAIiEA1AWdtCOvIEFbfxTozWnuu2I2Q5bxMD+/LVpBaeDaCU+eKQCAIOIGJGyJNbq2XjIbeUNxkqRYYN7qUa8saS0nWQ/tIipCRDtwYYZOZPExFBArFgp0532FhBVo0LG6zAZsMKiJQK4HOsG2vtbVNPO7C9MLfmxjp/69NrHLLq6Lww2zUXDhQGKJrtoo5K0da99Edm67hdNumeLae8CleLxOg5SJFSM8Ffy0b3m8Ubj3rVe99Cr1MBkSRkhaRtFz1srLyJ89bmF9wrvc810uWwJ8UnWmFqSICIiACIlAhQGvGl8XISoKZVhfPVZwWP4wFudbqp9XXV/0iIALdTaBUXLFCGVbbFCRprV1Hd71QEYyxWwltUUclOkUEWkDg+JmL9uLxqydUbcFlO6bKmw7vtcnR9uRZwNr+C1hvvqVjOq+G1Eygly0iu26rigIOMxWrXEmAVpF0Aa4l4YrYvUyArvYUszdK2OMJhmsXxRQXaeFY/Xcv/iOFRtZHK0gvc7aYi4AIiIAIbEyAFkExuCfSrdHLrt1KMZLzNQVIJq1Q7F7dmSIgAq0gEIbFZWgl7OY0blJzfvMrRrpzykWci5AW3DDpQOvIVrBTnZ1PIIp7sZvd8zcbAYZxURGBzQj0shC5GRu9LwI9TaBR4ZYL2PXExlYuoHt6wNR5ERCBriZA65+Ys1Dss2y+0FDW6/VA0ZrIXQNW7LKA7OpbSZ0TgY4gcDkmLua0AkNQIKmWX4Nvipd08y5BkAyXEaMemzayjOyI4e3pRuzcNmZ8qbSFgGyh24K5+RfpZSFSN23z7yfVKAKbug16AqUsbXSziIAIiIB/AhQJk8jUWoBrYxGWRI1u7jgBkklyZFHkfzB0hgiIQMMEnNV3JGxlxHwsQIxkQpt6CoXMTLmAMD+VDRUJkvVQ1DkiIAIi0B4CvWw369cDoD0joquIQMAIrBUUvX97i+O1MSTZPS8uZMC6quaKgAiIwJYToMUQRUgv9m6jDbpsgYQnQi3cG6Wp80VABOoh4BJjIcFLLBa2RANWjXy+ZFbuXL6IedK/hWU9bdc5IiACW0qgl/WsLQXf6MV72SKyUXY6XwREYB0Ca61zmLymuvB9zypSAEVABERABGojQMGwDIufIuZUl3HWrw/jVS7DhDiFAuK0IU2ul/ihtlbpKBEQARFoDgG6qrnNbMSPjIeY6LAy1zEWpJ/ixEgmwGEWX8yXEVhbMu6tigiIQPcRwJyBJxeVIBKQEBnEUVObRaCDCGy0GPbERlpErhUj5ZbdQQOopoiACHQ0ASdAMnP2akIHv4vyWjrHa1QW7nT1ZvbZ8KogWcvZOkYEREAEmksgjGdHumz3wbqx3Fff5gvnTZeVu4A5FPW5BDky+27uQKk2Edh6Atpl2PoxqKsFEiLrwqaTREAEmkmgmZY9zWyX6hIBERCBrSJAGyCKjmVmlXVWkPXFTfPTfi7cy3D7DoUoSq6KkbAk0lO+H4o6VgREoBkEvGQ2zIpNQbJUrmTX9lMqmyxlt5lTxiZLJBQ22k9JkPRDUceKQOcSwBqy9Q9Hndv9QLesl4VIf99kgR5mNV4E2kdgrdv1etaQ/Fu1+ChX7faNj64kAiLQ+QS4aIYBpIsDWcYzdr1e2M74B087fh94uNj3rCMjtEwKhxQ/svNvG7VQBLqSABN0RZ11JOZE/B/3ZPxuYPP4ohMzVyxCQRLJufq0ydKV94s6JQIiEAwCvSxESj0Pxj2qVgaMgPdwuNFDot+Hx4B1X80VAREQgboJuJhmUA2LxZKLj+ZXQPQuTAHSJX/AC5KisyLyK2ZeuXBfjR2phXvdY6sTRUAE6ifAOS2KZDaRlRAERcTKxRzJua2eec0l+8IqMAYxEgaSlbiUKiIgAkEloA9wQEeul4XIep/vAzrUarYItIfA2qzZLy+MsSD2+8TYnibrKiIgAiKw5QQoFhYoQDaYiIZrasbmjUWxyKYQSXETlkAFWFeybr+F5xeKRZxbsSKiGKAiAiIgAltB4LIgGe7DvETLcVqN+5/X6JmTwyuMeS0aiWDOlJaxFeOpa4qACPQuAQmRvTv26rkINIXAWrdqLys2K/fcsvm3tSKkdqCbgl+ViIAIBJxAReirJKNpZLPGEyCjyBDLRbW3rOZc65I0YOFO10SKinWs251VZQHJbGipGYWrdliCZMDvPDVfBIJLgPNaLNpnJVg0cgOnLqtvdL/irl28vMki48jg3hNqec8S0C5CQIe+l4VIuWYH9KZVszuTwFpB0rkFwipnrSDptb6RBXdnElCrREAERKB2Ap4AyQQMFAYbmRPDEB7DsFaMQGxkMMf1nso5J/P9cCi6annpP/Yk28js2rRACqPNtI6UIVHtY64jRUAEmkugYv0NQZKbObBwXBuXvJarVcJQUMyEhSQ2WSKKiVsLNh0jAiIgAg0RkBDZED6dLAIisFlMyGpC1WKlLCJ174iACPQiAYqOjHFGy0IKevUKkM4C0m34rCZeoAC5iV2AFzsyCrftSClkhdWFu18LSSdIOgtOLNwhBFDg1Jzei3ez+iwCW0uAUx7nnj5afSMJDZN8cX6ta05bnY8pSEZgWc4NHhUREAEREIHWEOhlIdJ/QJHWjIFqFYFAE6gn43W1+3agO6/Gi4AIiECNBLgwLjPJgvtZX1wz71IUHz0rSK6V/YqAFDANC/c+xEeDV6OLHUnXRj+lIkZCSHXnQgzVwt0PPh0rAiLQRAKc0sIuQReyYfeFMKdVrCP9CpJuc4hZuQuIi4tMNhEKnJvt8DSxH6pKBERABHqFgITIXhlp9VMEOoDAZpY/m73fAV1QE0RABETAFwEnQK6Kdo26YVdCXlCEbI4VorOm5MKdcdL6uHD3b6HJvjEZjusnY0fCOlILd1+3iA4WARFoEgHOkVGIh0xCw00WzmkVy/PaL1AJQcF5m/F0MddivmWMXb8bPrVfUUeKgAiIQO8RkBDZe2OuHotASwmstZBcL15PPVaULW20KhcBERCBFhC4LEDWmbHaa9LLbtjNt9Bx7t2XF+5M3FBJ/OC3OAskmBKVy1y4I2EOkkho4e6Xoo4XARFoBgFuskSxycJNEsaOpNW3381uL4xGJSYuY/CuuoHLY7sZQ6Q6REAEepxALwuRPT706r4ItIaA3we96lZo0dqaMVGtIiAC7SXAeRB6HmIwVhIg+LHGuXJOrCx83aIayWj4s1WFdcfwopt1Hm6J1CL9zueX41/i5AjitdFdW9aRrRox1SsCInA1Apw7wwxBAavGviLFSMa19WcdyfqdVSUya5cYgsIlBUN9rZuKNagiIAL+COjT6I9Xxxzdy0KkbtqOuQ3VkCATWG+hWm3xyIyG1VaR3nsSHYM86mq7CIjAegRoR0gxrlAouRhl9QqQrNvFPMP8GaWY10IBcm0/eK1EnJm1Ec/SJaTxv3B/OSO4IaNtRYzUwl2fGREQga0gwOkzFsWzKDZHCgUmCsO8VkdDKEgW4K5Nq+9oNIJ5rY5KdIoIiEBTCWA9GWpqhaqsbQR6WYhsG2RdSAR6hYAnLlaLk2tds/1k2e4VbuqnCIhA8AlwkUrhrujiJdazzH2ZAS1uohFa3Wyd5Q2vz2zYBQRaY1Iauif6LZz/szlkoEU90QgW7lq5+0Wo40VABJpEgBsisVgYyWhCq/MaNot81n3ZXbuUh8U35khsFGlj3SdEHS4CTSSA5y2/H+MmXl1VNUJAQmQj9HSuCIjAFQQqljOv/D7Y6O/CJwIiIAJBJ0CBrohU2PW6/Xn9p8UgF7QV17/OSIxQSfwQQTZaWAI14GbuhEy4NobRNyaS0MI96He92i8CwSRAI8Y+hqGApXYRFufcPKonJi4Sa1uhBKtxbEDFwpgjMa+piIAIiIAI1E5AQmTtrHSkCIhADQQ2SkSz3t89t21tZtUAVoeIgAh0FAHOW7R+dEla6kiEUN2ZMDNhQ6TjT86VneTG7BLlQBiNoX2lUggvxlrjMrz2UnFZx0YVF/1wj6xk/d46a8/aW64jRUAEupFAZdMHcxuyahVd/Ej/luzcd+e8loe7dojxI1Eh53AVERCB9hHAZ1kfuvbhbuqVelmIlBlvU28lVSYCFQJ8KFsvRuTav4uXCIiACASRwGXXvFUBsh6XZa/fdFXmi6JcaAvdsDcbB2etyf8gSLo2IxFPPS7o/B6gdaRL5oOnMFp+sj6tIjYbAb0vAiLQbAIumQ03fqKc02i1XQmt4bfwO2CFQmbBrMRNFlhHKkmXX4o6XgREoNcISIjstRFXf0VgCwlUWz7yAdAFDFdojy0cEV1aBESgVgKcqrjgpJBGN+x63PkuC5CrmbBpFR6mGBeQDX2XQIdt72NcNM8a1H9SnooFKeZ/WBGFIcIGiUGt94uOEwERCAYBzr8hiIdlzEd9fUw0RlHSnyDJ74fSCqzjXYgibC5hbg/J6jsYN4BaGWgCWEf6c9EIdG+7q/ESIrtrPNUbEegIAhIXO2IY1AgREIEmEHBuxViUXhYgV93x6qmaGzD03AvDHZBWM0H1KKrEjoSIiIU7ctlcdmv0s6/krCOdZSRfldiYZBNUJvXcDzpHBESgcwjQOjsaQrxHWLsXMbExAoVfi3cvZAeFzAi+K7jJwpiUsvrunHFWS7qOgITIgA5pLwuRAR0yNVsEgkHAEyPXZs32Wi+xMhjjqFaKQC8TcC7EsIAsNBgH0ktE4xa6iCMWFAvIzcbe9QfWkWEwKoJRfXHWKsl+3MKdcTIRt83Fydzs4npfBERABJpMgPMOY9iG4K7NeakI6/dKwkV/F6KAmS8iQRc2WaLYeGKcXW2y+GOoo0VABLqbQC8LkT6/Urr7RlDvRKAZBLzYkFdLWMPreOKkktU0g7rqEAERaDYBzwqyAKsYJmbxuwitbo9zZ8bCNoosrd0iQF7ZP1hGMibaCjPQlq2AxXc9vChE5pFZO4SEOMxoq9iRzb6rVZ8IiECtBJzVN2NHwuqb3wN8bq1nXqMlPWNPsh5uQimZTa0joONEoDYC+KyGajtSR3UaAQmRnTYiao8IBIyAt8Nb2TGu6PveT+eGiAW4Jzx6x3hCZeXBTnsCARtyNVcEupoAp6RcoVj3wtODc1mApAVkD2RSZX+jEWbDjlq+ANdGxACup/B7IZcvu++OeDTSURnE6+mPzhEBEQguAQqH4VjEWXsXCpWNKb/lcpIu1BGGyTfnyYCEBfbbVR0vAiIgAjUT6GUh0v83Sc1YdaAI9BaB9cTEzVxQNnu/twiqtyIgAltNgK50jAsGoz5skNRn/eL1wVlAMhN2D7rjcW6nRSNjSBaKdNf2z9IlBsJ52XzRZRRndm19Z2z1J0TXF4HeJUBBMhQLY4Ml5BItUpj0W1wimxI3uWAdyTAUECRVREAEGiOgZDWN8dvKs3tZiPT/DbKVI6Vri0CHEqi2fqwWJDeKEelZQ8oSskMHVM0SgR4j4CUXKEGBrGQ8rf/xgJaPMSwwXXICxjns0UCHlZiYdEcHgyIW7nVkGecwUBAuuEzl3sK9R4H22GdS3RWBTiTAOZ2bIhQlCxQj8Z3h9+vCbbIwfuRKyfqw2RKD1XcPGMx34nCqTV1CQK7ZwR3IXhYiZREZ3PtWLe9AAmsX7xvFifSaXu223cjCvwNRqEkiIAIBIMAFIWMa0vKO8Qn9Zket7iIFSGbCZoZUxQB7mQxjYmKdjWQ2sCTqqz+ZDbNr87/wCrKNg3EvuLoH4COkJopAzxHwEo8xSVcImy31bGC5GMT8AkL8yPwK4uLCgl7zWs/dSupw8wjUv3vcvDaopjoI9LIQqZu2jhtGp4hAowQkOjZKUOeLgAg0SoDuwlxA0r2OImS9hUIbRbHKQlJxv9bjyE0nJrPpgztiCKxpHckEDn4Lx2kFi/YykuLQ9Z2ibzcm//HLRceLgAi0n4Cb+5mkC/M/57N6rL7Zan4XVSzxYW3psmvTmlyW3+0fUV0xqASwrvT/QBHUznZZu3tZiJRFZJfdzOpO5xDYzBqSLeX3hpLVdM6YqSUi0O0EKq6+XDAiFiTc6hoVIJmnkVaQil9Y251TEWwhSjILrVX4+7VCdUZEzoqV3x9YuDMRUA+7wNdGXkeJgAi0ioBLZkMxsmhW6CsZoknUMa/xO6kyH1asvm3Lrb65VzSXX7EXF1ZsLNFn2/FK9rJq0KobSPU2TABrTin3DVPcmgp6eUqRer4195yu2gMEqjNor+2uJ1Ku/d642jk9gExdFAERaCEBLvCYxLmE1WI9SQa8pvFxl8IXM5/KIq++AXNxNJGFtugS2VCQXHVT9FGdF9eT4xrRWPggp0NFQARaQYCJZ0KwaqSgyGQ2FStHf1e6bPXNZDarsSPbrbGwycsFs7PZFXsJIuSjUyu2e8DsOrx2pMxGEPdXgqS/cdXRLSfg85PW8vboAjUS6GUhUhaRNd4kOkwE/BDwHpo8i0e6LNLy0Sv8O4+p/hvfqyR20KaWH9Y6VgRE4OoEvMQAlWzYjSWicS7GFNGQEVpzVWN3Hmf6KBbuES7ci7AGqiOZDVvAhXuhTHGZsShhHYnvG32LNDY2OlsERKA+AvxeiMJdm5tUhUJ93zmV0JEQM3MFF+4juvp90455LY9H9YXCij03v2IPXIB1JjD88DUhe35uxT55qmyTSbP7JkJ2cABiJK0229Go+oZCZ/UQAawrsc2sEkQCEiKDOGpqswh0OAFPbFwrQlaLkR3eBTVPBEQg4AQ4D+XrXAxWd537I4xJWBG6tPJq5m3hFu6wsAnRXbuI+I9OLPZ3BR7OGG1liJl0aaTAqT0tfwx1tAiIQPMI0Go+DqvvAjdZYIVfbxgQJlPjBhrDf3hhKJrXylfW9Nh02b5yDsYCeOvtu0J20zDj8JrtTvfZvRNmX79Qtk+tCpLv3h2yCbhrq4hABxDw+dTQAS1WExyBXhYiEc1DRQREoFkE1saF3Cx2sCyKmkVe9YiACFQTYO4ZJ2pBnHIhH+rE49ywnQAJlzsEhJS4VSfIGk6jpWkoGnXujBVLIv9OKxV37Yp1JGN3SpCsAbwOEQERaBmBCKwjI2GEocB3Ub1xiV8OQ1Edk7i5TT4CC8iPnihbDN9592/rs8NDIUtDIfD23Sg3pqNmr9sWshuHV+yZ2RX746Nl2wWB8nU4fhsESWilKiIgAiLgi0AvC5F5X6R0sAiIwLoEql2xeUAtAqTiQepmEgERaDYBWtIVVuMOVuaY+q7gCZBeZmYXNqK+qnSWDwJe/E26vpdKISsgztpm3ydrq/cSEtFTq4ysERQjOY4qIiACItBuAu57AxMbLRq52UIxkhaOfi0kvSRdK7QYd0m6sDnW4LzGZDTnEQfyYxQgYUl+x2if7evvs53JPuuH6Li2sC8pqAZx9IUi5Y5Un1HA/P3nynbPRJ+9ajxkw7F2E9b1REAEgkygl4XIDAaOMQUYAkNFBESgAQLrLRY3ypxdfaznuu13sdlAU3WqCIhAlxGoJKLh4q7ixtbIfELXa8blonhViVvbZbA6vDvE3YcxcNz7wqtjWvYtKldiFNM1H3HOQuW2uDV2OFo1TwREYIsIcD5zYSgwp/UxmQ2ya9cThsIlwKGQiXmNOmQ9Vt8UIM9BgHwMSWiOLa7YPlg17oYAuR8/hyBAbhZ9hJaPo/GKWMnjJxNmszmzj5wo2Q1w5b4J1pTrCZlbhF6XFQER6GACvSxELmJckBdMQmQH359qWgAI+Fn0rydO+jk/ADjURBEQgTYRcIlo6PLGRCerwlO9l6YAWREhEQdyddFYb106r3ECXtKHMpLZhBBIx1kR+bRyfdk6smIdy40vWiYpLEjj46MaREAE/BPg3EN3bcbEZWZthIB8ReLGzWr1ktmUV/NzUOTk5lktm2anM0hEg8QzF7I4B+ftgVXjayb7bAQ+2ZsJkGvbFYMQSgtKvp6HZeRTM2YvzMPKMlO2PfjbYSS0oQWligi0mgA+V3J7aDXkFtXfy1PEHJhiKjbs5aiIgAg0i4AnNlYLjN7va0XHtZmzm9UG1SMCItC9BDyBiVaQjCVYTzxBjw7nKwqQtICsdTHXvWQ7r2dM+tDHJEEQEpn5nFZEFCT9FB7OpA8hJ2Qyoy3F5uBZu7pYcWTgs/9+WOnY1hFwRr4uOVMvL71axzcoNfM+cDFxnXUkhEj8gd9hfj/WnA8YC5nfXzzX22RZT5CcQTCy08uwgFxYsYuwhhyC8HjveJ/tgRVkM8q1g322HS7dj8+U7TjMfI5A7JzJrbj6r4UgWWu5HA8Tm4sqwSNQubfx/VqjMN7EHtZ+kzXxoqqqcQK9/G2IfRuje/Zw4xhVgwiIgEfAExuvlrzGs0ihhQp3hVVEQAREoBYCnhs25w2/FnLV9Xtu11wQtiMbaS190zHrE+BY0R0wBAHHZZF1Y795POK1tTkREy9aITn3e1RKQTIIpVAo2lImZxm8CnUk8glCH7u9jTTZoWg0NJC2ZCLuflfpXQIVq2/OY2EIihWr73piG1dcvDknsr4w5srKfcXtmhzqPQUryJMQIY/CajGBm/C+CSacaf69NwA37fsnQ3bnqNkTECS/DdfvU0sQS8shG4vDnRviZ/Qqdmu5fMEy2TxemOM4SasEkkAsErGBdAJzXKzhOKaBBKBG+yLQs0IkJmiKkAt47fBFTAeLgAj4JlCd0Ia/0xJyI8HSd+U6QQREoOsJODdsZwECd7YGFymMrcVde1qQSAwIzq3D9TVjonHcCsVKhmyutv3ZR1ZcIQtIZFPCAjmGhXsjsUDxTeYAwjGypSCn5pbs5OkLToxUOJOWom555ROjQ7Zvz6T1J+MKE9By2p1/Ac4/MSiSFBSZoKuM7zdutPgpXkzcMuY0fqcVoOMtII7k6WWzj50sWz+yIbx5V8gOw3KRLtV+Sgnfu86CvMaT6I5NsfPawRX76rkV+5/PleyWsRD+ZrYLVpNxtGWtBs/2n780Z2fOTzshUiXYBCbHhm3v7gkbSLXH6RT3j5TrgN4yPqejgPZynWZvGx3IYPfpbPf0SD0Rgc4iUHkwuvK7odpte60g2VmtV2tEQAQ6gYCLh+WSjhQtly82JEJSyArDEi4Ri2LhV1mwqQSPQGXhHrJkPOrGsx6jRi8LbRb3FDOt1yPucYE+W8y7F39vVWHVp89esmWJkK1C3NZ6L07P2bkLFFzgL6siAqsE+H0UhyAZi0VcqBC/JRqOOEvvPB67jyIJzR+9ULY/er5k378vZH/vhrDdAitIvyIkN//O57N1zW9jSGjzXlz71++BJTu+w3/v2ZJ95XzZlrB/tLbkYQ15/uKMREi/g96hx1+YmrXFpWw7w4i07gu4Qxl3S7N61iKSA1gslI6E45E3dMtgqh8i0EkEKrHXKg9TniApK8hOGiG1RQQ6m4BnIcJYkPUIRV7vKFRxLqLbWhBjA3b2KG1d6zxLIrprF2lJ5NeMCE2vxCSDwI1AbTEs5MPM4LBJKcEK8gIW548tTdtTSzNY+Jftjv5Ru3dgwsaj8EFsYmH76LKYLeTbuahrYg9U1XoEshAhixDAVURgLQGKkH1wYy4WQ25uqmWPgyFGGGriecSA/Mq5MuJAwgJyB+IzDoZsEHUxtIWfkoeB2bl8xr42f8GOZRZsIBK1m9MjdmtqxPccx0v/wL6wnd22Yg9AiPyfR0t25xiS5MBqkoVz3PxSBnOwwjT5GaNOP3Zpadmy/UlLwfJbRQQ2ItDTQmSuUPpiPB75Gd0eIiACzSewmXCgzKXNZ64aRaAbCFSC8DOWHyQfn5mSq/vvBEjGF0RyEi7SnAtuNwBSHy4T8DLGwhAIi3ZYz67GDvWDyEt+lFspWhiCpBczdD1Ly6lCzr6TmbOnl2fsYj5ny6WC0T37kcVLdiq/ZNcmh+zG5LBtizXPJc0JEbL38DOkHX+shrTjh2hLG8jvrSg2RSLhKNy18V2IeW2jZ2rOUyczIXvodMlm8pUENG/Z2WeTsEhMI26jn8JNlrO5DOa3WXsuO2fT2HDJ4Ht4uVywxWLBXszO223pMYiSw5ZEsp1aC9uxF9/BA3APX4BF5OCadq24oL+11qbjgkCAXgL8rx1FWbPbQbk11+hxIbL4sfJK7ElM+Le0Bq9qFYHeI1AdD5K99+JBrn2I2kyo7D1y6rEI9DYBL7sxM4hWAvDX9xBbESDpel1xxebv9bjv9vZoBKf3HNs+jHG0bwWWP2G4AdJC0r+1Ge83lzACsdVCa2KITkOAPJpdcK9TuWW4Y+esWBWWahGWS9nsos0WCu79w8lBuwUWREnUoyICIiACfglU5jUIku77LOyepb2ENu7ZGi8mo/nSJYNIuGLjScRlHOqzXSkkP0AsRr/lEua4I9hkeT4z76wh50svW2FTVOK/M5miLWCuO4m57mBq0K5NDFqqxjmObuHb0K4JaY5+hyaQxzNpUhu3fv3f8IGk2n2N7mkhcnK0f2l+Kfs7/cnYb2Kyb972dffdJ+qRCNRMYD3367XiJCuTRWTNSHWgCHQ1ARdPllYfjAdZh0VbNRzG2aq4qdENW/NMV984azrnsmvDiqgP2WO5iK8nC62LHcn7cTUL7QoWzycKy/bs0qy9lF+06ULWchtkrS7ivOliFgv1vPt5CWLlvnja9ifSWKxH6lqUsU+00OQ9rdI9BKLILMukSyoisBkBWkeGMK+VYa3dx+9JWCjO5lbs6bk+u4ifBUxSu9LIhD3SZ9sT/tywudU3i7APL+UW7Rg2WV6CwDi9ZpOlun1M8nUeGy1zEC3PFzIuRMWhRL/tifdbpMbdvldOZbT8xIaNPg6b3QqBep9zHDeCVUTgagR6WogkmMF04r8sZ/O3J2KRn5Iwog+LCLSXAOO2VWfQbu/VdTUREIGtJOBlwmYMyIobdiVeVD2lEpOWImQlq7K+z+uh2B3nVNwasQjCfVXEfcWEC37jR2Zx3vlc1s6Xs3Y0N28ncksQIGuLYcbF+lks1qewSD8BEXKqOAxBst+2x5IWh+Wm38LYpoP9aYQrmFdcQb/wOvD4aDRsw4MpiyIxiYoI1EqA32+0jiwXw9gQKdlTECInYGF4z0TYDsAdO+HjduK3LOe4s3lssizP2Qtwub6E+YqxIWspPPck5sQpiJi0nrw2mbVdsbRNIEZuokYLSe861C+TyZj1p1OY4xY0x9UyAB1+DONCptIJ9z3cplLfg2ObGqfLbEygbXdIJw/CwnLuFxDGoBCPRd6HiX5bJ7dVbROBTidQnRmbbaXYuF58m3oFh07vv9onAiKwOQGKQ06AhAUkLdfqLU6AdMlowrAc4+8yq6iXZTed5zKk835Ygas27zP8x3tuM52bIuIC4j6eLiJOWoZWkAuwOKrv/uSi/jgSPVzAQv1gArEjU8O2K560wXAMi3V/guTObSOu7ZlsrpK0ps42ddMYB64vbq5CnLyBpI0M9SPzu5ZggRvDLW4wv+/KMB3M4POfQJzFDxz0H/qBIuJUMe9EyCcWpxFuYr6urNichxZh/f00knYdQx2HEB+X4Sj2xlLWj9iWdM2ttSQTcdsxOew+H0vL2bo3JGu9no5rFQHMcdgInhwbsoFUwm0Ot6NgPVmbgt6OxugavgjoWxC4to0O5PDj5+Cm/eVELPoBBLW/A/YUuxTX3te9pINFwBGoFhi9bNnVrtmeUMljZQ2pm0YEeouAs4KEMFSgpRpcXOvVU/h42+csICVA9tYd5K+3LsYaBEm6NheQzYaWkU7IW1OYpCGHuJIXSll7Ojtr38GLSRoaLbzSMmKqPbk0ZS8g/hoX63cMjNp+WEhSjET00pouMTzYj+yjCQiRBcsjaYQ28mrC1lEHuSzvyD482J+QxXZHjUzAGsNNFri8JsP+tBeGnMhgLjqGpFoPL0zZi5iParWA3IwQ57gnFqfsAty1KUZeh3luNBJHjNza57ix4UHrxxwHL0Uk6Gl87t2szXq/+QT4bZaCqExhuV0i5Gov/H0Ymt911VgngdqegOqsPKinzS5kDybi4ffCHeZ2CJLj/FzhFcOLwi23sb2tbLcWWn3xb/zde9/7WX2Mx7v6nOrjvfPXnrPev4m3+u/r/bt6CLxjgzosanfzCXCNxMm7+lW9QvMSO/J973fvHLZm9VhnZYKQ2e5PfdiX4hNEHyQG+lriM7MSxqKJBeu/FYbRyuEnItusZFfK5WX8PovF4Xm8HQ2HI68ZGOg/1PyuqkYREIGtJkDDx3yhCCvIxp4ZnbUbFjh0cZQF5FaParCuTyEyD0Gy+h6kCLkAce/B5Sl7BgLkAjLEtrJMRJN2O8TIO9OjNhSJ1SxGtrJNqlsERCAYBJbxtH1kYcWemCrbjx2qzSISz+MIF5G1BxYu2DOwYGzGJsvVaI1AhLy1f9ReNTBu/F1iQzDuraC2cnl5+fPpdPqtQW1/L7dbFpHrjP7wQOIo/vwfNrsxTl9AgI4rxcBaREVWu5GAeTXR0jtv7U9vfue3Ea/v/VzbfO+9akGSv1cLT56YejVx1auXx1RfcyPxdK3pgXfNtaKsV68neFW3fyO/KO/v1f3g39bjWC2krRXbqlfFXruq616vLWvbWd2f6r6sPdcT8rz6PRHQ+7dX71qRubqe9d7biH91W3gtCoZcZfGn96Jw6P3usfDawffWipDVfa+022mRni6JKhAHy1nKr6z0Yd0Xcu9RimQegDLFyDK93WDWUS4c2r/TbX0+e/TkAHbRfhpC5Kafvc0+m3pfBESgcwhQ/CnSBRuWkOtZo/lpaQSWINEIs2ArE7Yfbjq2QoBWGnEI2EUI2RQks3g9lJmypyBAzpVycMNuTCSvhfMUEtl8ZfasPbowbTemh+3VWKxLkKyFnI4RARHwS2C2nLcvz56z55bmXebrYhvmuDm4fj84fxGxdRft3v5Juyk9ZLE64uP67auOFwERCBYBCZENjNeuyaH1RLMGatSpItC7BK4/uGfh2PFTT/UuAfVcBLqLAEXHYtFLRLN5fL6Nek8LSBeoH0k7aAGpRDTddZ+0uze8f7Act2fyc26xPIvF+XIZlrpX7Mu2rlX8XMAtAKJn1h6Bi+QZuEreNzCBOJKDcGWszcKpda1TzSIgAt1AgFaPj8H68RG4TDNxVhZOSo1uBNbKhRaYWcypp7JLyMp9yh5BaIo3D2+zPUhoE5EgWStGHScCXU9AQmTXD7E6KAIBIlAuIvy2igiIQJAJ0PbZJQhBDEhaQzYSz46x/cLhsIvx1+aYQ0EeArV9EwKIC2LHkfX1dGEZsUk2crpoLUaKAksQQY9nijYajtv2aKomIXJrWttaFr1Uu9xUe2m0t66vOSdEYqMD8xzjQ7a78Iq0MJ8p5pDUpmDHEwNunqP1t4oIiIAIkICESN0HIiACHURgZbCDGqOmiIAI+CDAtU4R8R+ZhIYiC0XIeosnPFKErFhB1luTzhOBVxLgwpxWkFslQnot8hbr80j2cDWxIFMo28OnFu1RvKaXWhvDUvdLawiEEA5gKBm2NxwatuvGE5aM+suc3ppWqdZuJcD5ZLZQwHfx1veQgiTnWwaJv1px73ZAe7ee2Na1IIjPWvBy0BPi1t0yDV1ZQmRD+HSyCIhAkwkkm1yfqhMBEWgxAZcJG//HGJCMBdmIBSStHik8RphtE/Eg9XjZ4sFT9XURYLbrONyox2MJJyDOFLKWowDf5FU0RYT5bNH+4vFLduxS1hbwOz9nKsEjwFE7dnHFTkxn7btuHLW79vTbcELLsOCNZG+0mN/DKcxxY9GEZfG9TsvGZmXZribIz8VCrmhfen7eTsxmkdBO89tW3mE37kjZq/YN2EhSc9NWjkOvXFt3Wa+MtPopAgEggE2teACaqSaKgAiAgAuSDKWkxBeT0TRgeuHiQOL/wuGIIRSk4kDqDutIAjS7oAA5EI7Z9ljKrk0OuNiSx7KLdi637BLeUJBsVskVy/bQyQX7s2+es1dfO2w/cs822zeir8lm8W1nPTlYiz99dtn+9MHz9ucPX7RkLGz37R3AvNfOVuhaInB1ApVNlpCNQIDcgTnuIFyq5+BafSy7YBfzGYSTKDRVkORG5vMXMvb/+8Ipe+6leSvmXf5KlS0icCO+Z/7Few7YPZibogGZnLD53bwv3S3i3quXlRDZqyOvfotABxKQeX0HDoqaJALrEKDVYxmWWYUG40BSgKRXDV2xmYxGHja63TqV4tu2TgAAdJFJREFUAJMsJEMRCJAJO5Qcsr1YoEdXTXb3xPvtJSzUv7M8a2fzy5bH56IZ2WkXcyX76BNTdv3OtP34vdvs2gk5DXTq/VFLu/aP4N4ZT9rf+9Mj9sTpJbsN1kdpCJIqIrDVBKiHRzHHpcJR2xVP2w2pYcx1lflm0pK2O55CXN1FeyEzb+dzGWy4IPlNEyzAaVH+5NmMnbmUkQi51TcBrv/M87N2BMLwzZibonHJRB0wJF3dBN1hXT286pwIBI6AtkIDN2RqcK8RYOzHfBEWkLDwaaRULCDDFolU3LFVRKBTCfD+3B5PYnE+YvuwSE9AkFxb9kOY5ML9BJJDPANBkkkiGs1Su1wo2Teem7Vfedc+m+hXLrdOvT9qbRdnuesnk7ZzFO6uGNu5bFlCZK3wdFxLCcQgQu5O9DsBchc2VrxNFu+i3IS5Pjlse/EexchHFy7COrI5YmRLO6bKu56AjFiCO8QSIoM7dmq5CHQdAQRzb0zZ6Doi6pAIdA4BulDlCkjw0WAmbGqOYbh+0QJSmbA7Z3zVko0J3JwetZvSIzYMl+yrieZxLNYPJgZdXLVnlmbt8cVLDWGll3cGVpHbh2IWjyi5SUMwO+jkVDSMeLorToyEHVoHtUxN6VUCdw9O2LWpIUv1Ra46x1GQvAkbMtuiSXsQYuQJWIIrqmOv3jWd0W946MiIpTOGwncrJET6RqYTREAEWkUAQqS+TFoFV/WKQJ0EKDwyCQ2TZNAlu95FhydAVhLRMBO2rCDrHBKd1mYCg5EIrCBDFt7knuUdzWN47ECkcYHJxWHFZ85ljm9zn3W51hHgbVTvPNq6VqnmXiaQhkt2OhTddJ7x5rgkvBn6cY6KCHQAAU2nHTAI9TRBQmQ91HSOCIhASwhAmCi0pGJVKgIi4JsA3UqLRcSCZBxICpA0iayz0PIxhoVL36oAKVGlTpA6bUsIQDrHAr32u5bHyn5xS4ZKFxUBEaiDgL8ZDrGd8d9mGzN1NEOniIAI9BABCZE9NNjqqgh0OgEIkbKI7PRBUvu6ngD1xiLiPzoBEtaQ9ca5ezkRTRixICsJaVREQAREQAREQAREQAREQAR6m4CEyN4ef/VeBDqKAIRIxYjsqBFRY3qJAAXI8koZLthmJWbEhAhZb6EFJF+RMGzJEARfXtj1ktR5vUBgBZ+74qrlsRI39cKIq48iIAIiIALNIIC1oxwQmgFyC+qQELkF0HVJERCB9Qngy6R+5UNQRUAE6iJAAZJu10ye0KgAybiPCI8H60dkw1YcyLrGQyf1HgF+/gpIXFJAmGQlcaqM/5n5vC0gUc++4YRlihVniaEEE2n03v2hHouACGwtAS+xHufqvtVJaAWbtV6sa2/jlu+FVxOLlYpl4zHVJRIL43kLm76Y0xqIdrO1MHR1EWgSAQmRTQKpakRABBongC90LTEax6gaRKAmAl4iDGcBWSpChKx/H4CfXFpyhREHUgJkTfh1kAisIcDNgIpTQAxZlbvh6zBTKNulpYL1x8M2DBFxo294zjwUHc8vFGzHQNQd/9CJRXv+Ysbed/uYPX8h47jcf2DQUljIq4iACIhA2wjg+SaRithAOmYzczlLpyPO22N+sWCpRNgSmJPOnV9ySfhGR5M2PhRzm7tT8wWbnc1ZIV9y742MJG37aMzN85fmija/kLdCrti2bnTrhZQ1O7gjKyEyuGOnlotANxKoXwnpRhrqkwi0iIDbkcfDcGE1DmQjiWgomFCAjEWUCbtFw6Vqt5hACa7TLmET2rHZbhmPgR2MIbjBFre6sctzX6IAK+kCxVF0OgkrH88qqIAkVpw7WKIwgeZnn2UZwiPNfFyWb7yeObdsf/TgBbtnf7+99+Yxi0dDCPlgWMRXsosXcJECrIYiqOOrL87Z73z5jP38m3bZm68dhhgZcoLk2bmCffG5WVf/nbv6rxAiq9tIkTOx2sYc2scSw+KfJY9/Q9t1cWr5O9vOI3jdOOetxlDpbBEIPAHY57k5rpbQEPzs8PhSJ5r04cO80SaOZ5142aKR1o2YOPj8c9niEZPK5W6t1hXCPLFjImE/+bpd9vtfPWPX70zbrpG4ffOFebt2e9Jef2jIfvF/HrGJsYT9wtv32J7hmON4ejZvf/j1M3bkxXmIkHH7zb91CPMoNmuhvhw5l7E/f+iCPf6d6VfcO2yTczZe9VZhe6qtMDlheX2s7hPnQHxVNZRYMIg3soxYgjhqlTZLiAzu2KnlItCNBCREduOoqk8dRYAP3Xm4gdICsmEBEgt7uZJ21PCqMS0g8PjijEWwMjyUHLRk6OqPzkulgh3LwZpvab4FLWlflbRO/MILM/bFI7M2AGvGH7130q6fTDmx4otH5+xLz825OLKvuWbIvv+2Mdew//DFU1aE0DecjNgYrIYuLRXtS09P2XPnFp2YOZmO2sxy0W7akbabt6fssdOL9jdPTtsvvnmX/a9vXbDnTi7a7331rFusz2dLeBWdGLlROQeLoi+8MGtfqmrjDWjjBx+7CJHE7C3XDWHDxezTz87aqyCG3ozrfvLZGfs62r8IS6T7Dg7Z+24Zs35ZWbbvxtKVOpLAd5ZnjdrXnnjaEpvMcXPFnD29NGtHl+ecoN9JJY65Z2QwZulkZd6giLecq2yaXJrKOnFvHIIhNx+mYN24HQLj+QtZu+3aITwTmT17csGWEBaCJY55b9+OlCVjEcsWNrdcfO0NQ/YZzHdPvrSATZew3X/9sN2PTZWjJ5fsffdusweOzttfP4y5CfPm+181afcdGl5XiBwdj9ue8ZRlsUlz4uyS5dD+/btTrk0nziw71+89EECz+PvJU4sWxfy1b3fa0mjn6UvLNovNmyKe8Xql4Dk22Lt+vTJQ6/RTQmQPD766LgKdRgBWVZqTOm1Q1J6uIUDRoAA/bP6kAFmvMQN33cOwEIjQ+kiJaLrm/lBHNiawDHHx2/MX7QQExkPJIduLxfpaQTJbLtqxLATIzJxdymctvxLcheAcBMDPHJm2jzx6yd5+05hdhHv1P/3IMfuX37vfvgM36YeOL9h2LPYnICx+4qkpJxj+8B3j9hUIfmlYMn7XLeN23baUxWeytms8YbtH43YdFtbHpjL2MMTGIYgFFCJPzuQhIs7Yr7x1t90IK6Mnjs3ZrXv7bf9YzL7x0rw9dGze7j84uO7AsI2fhqj48Scu2XvvmLCLEE7Zxn/6rn0QQqMQSmfd366dSNonn7xkf/vuCfv40zP2kccv2vXb0zY5GLVvQpA8gzb8n7i+igj0MoHzuWWbKWRteyxlN6SGbX9i4BU45kt5ewlz3LHsvF3EHJfrwDkuhbnlLdhceD0EwGdhkf1VzAO374+7vnz20aLbhH0tBMIonl8+iw2L77tzEpbRfbYI9+nbd/fb46cHIBZeQriaFXsHwkLcjHnpEYSJ2A9xcCwVveot8okHITLivDAssXeOJa0fQuZspmjFfNH+FBssfObKZgrOOtJZzTMuzppyFyzHX3/dsHtGY7vCt4/b/3rgnC0sl+zX3nON/frHX7LdmFMPYF57AnPpCqzE/96b9xg3ZWgAfu3kTvvtL5yCFSY2irgb0wNFFpHBHWQt+oM7dmq5CHQdAXyZKPhT142qOrTVBPjwS/dHJqJpVICkixJFSLo40lVILo1bPbq6fjsIcNG4DKHxdHbJZgsFOxGjIDloB7BYL+ADdgoCJRfo57CYX8BiPR9wAw3GZnwBguM1k0n7nptGnMv1ISzEdw3F7Q++cd7OwWLoOrxHT2y6P38aVkDvweJ/CVaGb7h+wt55w7CNQBAoYtNjYiBmN0B0PIjF80vTGVgWMSREZYGchwnSMiwfOafchGP6cc71EDC39cdhDVSyZYgDG4WufQ7te/rMkpuLmMsmCaugC4jHdnImZ/fuHXBu4Z97etoeHYjYm24YQTtD9nGIpmwTc02k4xFYRZZdHSoi0OsECpizGIbhVG7JFotFO4m57ECi33Zh08XbZDmeXbBLhZxxY4bHd2LhZ3sY8RzPY4764DfPWwZz0k270q6pTKRHl2ZaeCdgsRjCnNCfCGEzooC5YspOTOfsDmyE7MDGSTIWsnswj/z+18/aqUtZe92NI7ZjsCJoblQy2LCJoe57Md98961jlius2J+iDXwGW4JQyEKLzTdjo4au219Yxy37+7CpcgEbKA+8MGdpxJ+8BeLoPbDc/viD5+3IhWV7w42jdiusHx/AJsp5zHU3or0j6bD96bcqLt6DiUnbD5HyNObwecyHKiLQyQQkRHby6KhtItBjBLSr1WMDru62lABdKLk7X16NA8l/11sYP4nB2SkY0CKyGxJp1MtC5/UuAQqM+WIWC3FkdMZi/Fw+4+KkXShknDVRlmJ/F+CZy0AEhGBIq8fdw5XF93ZYECaxeKdrdeayQAiXQSx6x7NRWO9UOr4b8dH2jSTc74wryfiRg1icp7nwd4HPXlm4oTEEV8oojqUrNuM2blZopTkN128KCnRhZHkV3CtHIUKM90dsG5LeUBjNQaW8FVZNHJfzcMXcgf64OQz/PgAXzX4s9lVEQAQqBHKYwy6WIWJhjpvGXHcWguQSNmHOY66jS3YQNlky+bK9BDfsM2cWnTB4tVLEM9JpCHZnsbFBcZAWkCOw9KaYGUNM2ychCDL79XNn43bvvldaia6tm1aIL2IT5FN4Vjo4mbB7rxm0Z56fcYexLe+4a9L2YH584Ogs3Kyv3ASJQaTk/Mm5ilbkMYSo4EYMY+sWMZd9Ghspv/jWvW6ePAXRtIh27cJ8NoR692Kjh2UZFp+0pIzUMIfqnheBrSYgIXKrR0DXFwERqCaweRAW8RIBEbgqAVo9Mi5aEf9H8ZGu2PUWCpB8OI/ggZiWBhIg6yWp87qJQA6C5FlYDk1BfGTQsfxq8pNu6SNFQVo6npjO2tRyweYhTH4OLo7vhKXPCBboGWS4TmBO2D0SsxdgebNrOIWkNeuLh4yHdhHZZTMQBFOwMprC7yfhsv3E2WV74nRlIU590i22cSyvR0vIjcqDJxZsHEJBP+KhDUBEvIT69qAdtD4agevkZH/UWRSdnM3aCH7fBiumh+DCeP+BIduObLZcxPPnICwiuTfDvqqIgAi8TIAW4BmIj6dg5c0wE0XMd3zV/yTRXrq0tGa8Rxa2OYu4tTvxmY9gTotjTuBmxTLmC/c+fuTowoz/MZs1N5b4DFXC7zwijo2RDAS/UWxu8PyrlVuuH0E27Lydg6h5HlaU8Tsn7AfumrA//AySemG+eQv+fdueAfsGrBmfOraAjNkltykSQrK/8GrSrDzasgB37hm4YkdCZcxrJTuHpDc8cBBC5RL+3R8KO4vNMDaH+XiXxu/LEF/pdk5R9QRE2Azm7F4pypod3JGWEBncsVPLRaDrCEDk6J1vzq4bPXVoqwnwgZoP0EXEHeLivyEBEg+9ToRkLEg87PJhWUUEROBlAlyk0nqoGSWCqCSdFOhg93DCDsLSkXEWP/bUNCwPC/YgYjbeCzfAew8M2iPhRZuGYJiM9bn39uD4PqiJg4jNmISg6BUKhTthsXMEFkLPwq1wJ6wqaa3z5KkliJtluH8v2wBEAWbQ3gEX7rH+mD0DgdJlx4al4wBEwjgW/6nVhDU0fPwcEtPcuJrs5ja4LT6AWGgUN2nBOYs2peGi/RTqmFos2v1IBrEPVo8fe2LKzi7k7C0QCh6GkMnj8qgsC8FzHG6NKiLQjQT4SeRXd70CIs+jINmMslUzHC0UXzi/bK85MGD3HR5xzzV7YW347HluIq3PJgtRbwbW1osIG/Huu7fZd84u2quvGXYxH9eWarZ37mM82xU7dikDAbFirXgclouMGXl4/4D9/Ot32jNoC+fAa2B5eREJvabgXr0HCXGGsYnyGObbJ2AlOYtrU4zkZlB5JQzrx4yLK0m37c99Z8bNfweRlOscRMcXMYcyO3cWouYiXgX0dwbzYR596KFS7y3eQ4g6s6sSIjtzXNQqEehJAhIie3LY1ekmEKgIkBURshEBkhaPFB0j2KGXANmEgVEVHUkggpt8NBqz4UjcmOV6q6x9KMClw1HbEUtCcFvfbXkrAG6HW/PbIdpxc+OrcE3k4vonX7MDSWQStmcU7swQ+74Ed8MjyOh6PRbFd0OgpAv2a5Eggm6HXtkLgfL7bh23//61s25B/g7U+T23jNo3YA1Et+l79w/aAhb7NKY8iLrfe/uEMT7lhYUiEsqkXFzHSQiUNyK5jCcapCB00g18ApZNzIpNK8ovP19p45sgNIxB2GSsuzcj4cMbDg059+3zsFJ6ARZK70VsNrptfgNJcWgxdQ+Eg/vQBhUR6DYCnOO2Y15hDFvGdNwKe0aKoDFsZqZDnGujFtsgNEMz2Rdg/XgWn3fPEaQES+wnIPCdv2nUzS/PQQg8A+HuJKy9C7Ag5LxE4c4lksG/GSdyFuEnTl5ctq89H7fvh/jHmIxMyHUUlo6MaXsJFtdUvhbwtwuIRXnkIrNxl+0LiEn7XiTF+oG7tjmF8ygEyT9/8IKLRXkrNk0u4DqcO9+BuLssX0S7vohNkjswB01gE+ZJbKr81bcu2FtvHbX3w5KS/Lgx88gLs3ZwZ79r4zefm7HHkSzs1ZjfxhE642lk6P7C2Ix94L7tzuqcbX8Cmy3aPG7mXaW6WkVANg6tIqt6RUAEfBOYm5v73sHBwY/gRM1NvunphF4kwAdTul8X8ABKV6J6Cz9wXCOEQxX3I1oNqIhANxOge/XTS7P2rYULdgHxz3KMpVq37ZA/UrAxdgv0YYih9w5M2B3pMYuUkHQFFpZMvhKF2zM3BV6Ei913/9Zj9rs/eaPdBSvBRJW1ob8r6uhOIvAz//t5ZLdN2vtvG7drIMCqiECtBKAz2ZGFFXtiqmw/dmhja14+F8wW8/bNxUv29OKMS6JVZKiWds1xmL8ScCHeG++3Vw1OuMQ3iXXyUTJx1Z88dNH+3d8cs1mIg60sEVhZu5jZPrJJu41ZhIEoIPN1rejisAzn5nAeQmW9hfEk+R2QQ5btzQrbSNdvupEvLUKE9dG/9er+1z96PeamMRe+Igglk8l8PJVKfXcQ2qo2XkkgGHeYRk0ERKBXCDCtHL+5o73SYfVTBOoh4AmQRQqQeJDnQ2+9hQ+xTEITw0O6YkDWS1HnBY1AHMr77f0jtg9ZYR/EYv3xxWks3NuTZZSWmHcNjtmr0uOWikSMwiT+zyIr3gaANgKCdj+pvSLQSQQY23kkGrd3DO+0+/rH7ZGlaTfHXURirVYXWnqPxxJ238Ck3Ytru/jSHWBfUITFo9/CR6sCrLf9lFrEw83q8yNiso08Ps921v8ouFmTOvZ9PP/2YK87djh8NUxCpC9cOlgERKDFBLgKlBDZYsiqPtgE6HpNC0j+5PNXvU9gngBZSURTcclWEYFeIkABcCQSs9cPTdrNqRE7kkESgeUZO4dMsa0oQxAgb0kP222wgByDSJCExVD1x04bAa2grjpFoDcJcG6hKEjL69cMTroQEI9CjDyKeS7TpPi2a8luiybt1oFRuzE5DHfsmLu+SpsI1Psw2Kbm6TIisJaAhEjdEyIgAp1EgBaR/rcsO6kHaosItIgARUfGPyphAeElpqnnUi5LIywgaQXJIOoUIVVEoFcJ8P5P90UtwSzM4YhNwpLnSbgyvtDExToFx5vTo3Y4NWQ7sVAf0gK9V2839VsE2k6AGy4pzEEHEwM2js2QG1PD9p3lWTuahSCJuNLN0K9o5X0zNlmuSw7ZtmjCBhAT0ll6q4hAiwlgA69zAiy3uK/dVr2EyG4bUfVHBAJMAF8mDHJXf6C7APddTReBjQg41yBkeC0jpp1nBVkPLSdA4nmtkgkbFpDwl9IyoR6SOqcbCTjLIQiEcSzYh8MxuybZb88vL9iJ3IItQ/xnzDU/hZ+tOD5ruxEbjdZB+ykCwAqyHQkb/LRTx4qACASHAKYUPAeYvbRo9sjUit000od5prb2M2ZjAlaR3AgZxWtXPOUEyTOwAC/g+cJv4RzHOm9Ij9gBxILcj7luFIKkrCD9ktTxDRLQo2yDALfqdAmRW0Ve1xUBEViPAFd6/lZ74igCXUqAFpAUP+CFjUQ0RWcFWW9h8hkmwQgjG7bcsOulqPN6gQCtF/cibuROLNjpZvhCNglXxnk7j4Q22RrdGVnHdizyKT7uR138yZiUKiIgAiLQCIEoJBcklLfrh/vsqdmync302W0QI7clkeSqximG4uG+RNomYnFsjiTseHbBbbpMFZFJugZB0hMgd2COO5QctOux0TKJTZaI5rhGhlbn1k9AQmT97Lb0TAmRW4pfFxcBEVhDgFuyDcgt4ikCwSfgJaIpIfPhy27Y9fWLoiNFyMtWkHLDrg+kzuo5AlxUXwMBcTtctScjCbgxLmDBvmgzSGiz0WKd1o6MA7kb4uPN/cN2bWKwIQvIMIQFuoxn8khK1chORM+NXmd3OFuoWJ9xc0hFBPwQgDOD7YLo+L27++yr58t2fImxos3GEyu2K9Vnk3ivFgtJ+kOkQ1HExh2uuGxHp+3I8rydzS9fzrC9Xru4ycJENJzj6IZ9PV66i/2MoI5tAQHdgi2A2o4qJUS2g7KuIQIi4IeAhEg/tHRsVxGgBaQTIBG3idmw6y1MesE1Li0gnRu2BMh6Ueq8HieQwmL99v5KfMcnmXl2acYu5LNw1y5cFgfpitgfjkK0TNlhWAgdxuKcyWgaLTF8fg9sS9kTZ5bt8La0pVxm+0Zr1flbRYAz+tm5vE0t5C0eHbD+eHirmqLrBpxAEiv4t+8K2VRuxb5wbsUehpv2aeTYum7IbGfSbCxe+0RBcfFVAxOw3u63pzOz9jwswC/AAnwJnhheiWKTJY05bi/cr2/vH7FDdWyyZFDdEp5vIgyDEQv4AKj5nUSg/oflTupFD7ZFQmQPDrq6LAKdSmBVLNEXSqcOkNrVMgKeFWS+UHRxIOstXHq4bNgQMKIRhIqvfS1S7yV1ngj0BAEu1u/FYp1WkhQjn1yetpkC86uZy0p7JzJh34JYaYyR1qwyANOm77193P7ogXO2bzRhkQODNhCr0f+yWY1QPU0hQBtIWkL+0bcvWAFizP6RhI2ltAxrCtweroSC4w/s67NZTEVfOle2j58sQ4zsszdu77MkLapxi9X6GLCN4SjwuiU1Yt9avGiPLkxZAQEpudGyDZsst2J+ux4bMn7nOD7RLBXMXoT15tH5FZuA9eb9k5rHevi2bWrXEcbIf4DTprZAldVLQN+A9ZLTeSIgAk0nwJh41FGaXrEqFIEOJkDhMdegAOk+OPjkRBDJPuqspvQx6uAhV9MCTIAx1d48vMPu7h+3b2CxznJnatRZQDY7SQMt5v72XRP27Nkl+3efeMlu2Ttgt+7qt7jEyMDdQXSv//ZLC/YUXr/63mvsjdfCdE1FBJpEgBaG79kbslsXVuxzZ8r2Lx8t2ht3hpzVJAVJP2UCc9w7h3fZXelxe2jxku2ACHktNmAGkeCmnieLRYiQf/xiyaazZq/e1md3jfpskJ/G61gREIHAEJAQGZihUkNFoPsJQDyRn1L3D7N6uEqAAmSBLtiwjlkV4etiQ9Ex4lywKUbKCrIuiDpJBHwQ4GJ8IBKx1w9uc2clmI2+ReI/4wj+47fusdv39MNFe8meObfkLOpqKkx4hXmmxqNdlYwdx5wT2syoiXDNB0UxjjdsT9svvHGX3bgtCctWPe7UDE8H1kSA89Le/j77oQNh57L9GQiSv/lEyb5nX8iuH+hz1pG1FsbInYQg+ZbhnW6DJYqXHxGSU9QFtuF02U4iw/fNSKjzzp19tgMxLP20o9b26rjmEeAGGMOCBKj4+YoLULe6v6k+pqTuh6EeioAIbDkBbpP6edbZ8garASLgl4DLhF30EtFUAs3XU6h7MBFNFApkSAJkPQh1jgjUTQCSv6Xgrt2OQhfetx0esbv3DFimWLZaozeswK0yXyxBjPTRSoZ2wORCATTM3Q2VphBgzF662m8biFs84k/UaUoDVElPEMCtZUOwjkwjvfa7dofszPKKPXqpbN+C8fbNyLR920jI+qO1oeA8kKrDPoBu4o/PlO3bF1ecm/jdcB2H9m6DaNNaY27Gi3ztgQF7w02jdvxS1oq1Tm61dUFH+SSwayRuhydTECK1FPOJTofXQUBCZB3QdIoIiEDLCOibr2VoVfFWE6DVYwECZBnhbJyVUp0KZEWAhAUWXhGXEVsfm60eW11fBFpNYBRiJF9+Cjc9cnn/cWc5x9AiMgyhlcmuNMf4oa5jRWDrCVCQ3Jvus3HEkOyPrthZCJIvID7jqeWy3TnWZ4dgIdnsJwcKkE/NIpM3LCCZh+mu8T4nRG5PYC7Z4GKca/YiXurPvHaHzWWxaVLnc9HWE++OFgwjC9I1o3GX7FBFBFpNwN8TTatbo/pFQAR6nYDLtdHrENT/7iLA5+piieJj2WXCrleAJBVaKYUgDoQpDtBVSp+W7rpZ1BsRaCIBSg2cJ1b6/Flec87iPLWyQmGAgiQ2PcIK+9DEoVFVItAWAty7oCXkHoiSR+bKdnrJ7InpFXt+bsVuwN/34e+Nik45WFw/g/pOLq64pDS0yDwAF/FDg30GI+BNCy2E79jdv+lxOkAE1iOATbMa7jKx60QCEiI7cVTUJhEQAREQga4gwAV9Aa6URcSCrFeA9KyTuFiIQIQMSRDointDnRCBVhNwCazoXl00Z2lES2w/hXMWY9hWLLixEaINED/4dKwIdAyBIbhj3zsesgv9K/bYFKwjkdSGAuLF7IqzjhyKbWy1uFEn4OBhL0F8PJuhpSU2L1DfdYNmNwyF4BreMV1XQ7qfgLbkAzrGEiIDOnBqtgiIgAiIQGcT8CwhC0WoAHWWinskXbEjq8lo9LxVJ0qdJgKBJlAoFC2PFzc1/BbORSVYZDM2rZ/UNbSojERClojHsKFCF2/MR6tJDIr4d74A86cOLEzeFYtGLIqXigiIwMsEJuEm/YYdfXZ4aMUegiD50KUVW8Qjyp6U2SQSyQzgI7OZhWQeguNcoSI+PjlVtgWcf/ton900HDJm71YRAREQgVoI6Bu6Fko6RgREQAREQAR8EnDWRL6yRLx8gcsx2rCgjsIKSRlsfcLX4SLQZQRmF5bs/MU5y+by9c8HdLf2wYXzTjwWtQN7t7uzGFqiDHftbDZnU7MLNju31HHxIznvUjjdMTliYyMDPnqrQ0WgNwjQXXofXKeZYZsWkX99smzfmYWrNjJb34CYjiOwjkys4+xKg+pliI7ncM5TMxAxL5btdlhZvh9ZuWUB2Rv3jnopAs0kICGymTRVlwiIQKMEmNvTzzqp0evpfBFoCQHexHRpLCE2pN/CxT8teiKIm8T4bioiIAIisLScs3Qqbju3jVgyEW8LkPnFjL1w/MwV16LQtwwhkkm39u4ct8EBmFJ1UMnnC3bq3LRlINiqiIAIbEyATxe0kPypa8P2GITFz5wq2zfOrdibd/bZqyaQEK/qVD7TzOZX7HN4/ynEmLwJouWv3BqxAblg6xYTARGok4CEyDrB6TQREIHmE8AChz5n/pWb5jdFNYpAQwSYmKZY9udCSc0xDD/sKETIPvhGSYJsaAh0sgh0HYEQrKOjkQgs/tqz+qf15UaFmySRaLhtbal1MJnhW1m+a6Wl40SgQuBGWEIe6A/bMcR8/DYsHb96rmQ/fm3IJiBU0gryy+fL9jTEyl2pPvu7q39HgmUVEegEAjJg6YRRqKMNmkLqgKZTREAEWkMAlmD8MtEXSmvwqtY2EWBSiCIS1NSaGMIJkMxKixeFBrlht2mgdBkRCCABimztmiM2uw43SzY7pt2IXZuUQ7Xd2HW9gBOI4TPD12EmrkFc2OfnV+yDx8oWxd+mc2bXIgP2W3eEbFfabDSOTQjtlAZ8xLun+TBikQFLQIdTQmRAB07NFoEuJSARsksHtpe6xYQQjKXmp1CMlAjph5iOFQEREAEREAERaCYBWjkyduQQks6MwRoyh2cZJrvaDUvIbfh3osnKAZ+U5hH/Nl8s4Tr+npua2W8/dSVjcUslYhaGYFtdcggLsZzJWqGOkDx+rr+Vx9JjZzCdekXft7JNuHYwbpwthtSJl2/ydNKJXVSbREAEgkJg1TVbXyhBGTC18xUEXDIHuGX7eaCuZLTF/0HAZEJaujwqNKRuLhEQAREQAREQgXYTgGOGs3ocQSjafLnPWUq2ygCS3iNnz88gw30YIRU635S5jJA7y+GclQbTNoxXdZmambdMFuEsuLHcpWbZy5mchXeGbSCd6BhreFjld/6N0+4PcUCuJyEyIAOlZopAjxCQa3aPDHS3dpPu2H5ESI9D5bwSRMw+FycyjJWAEtV0612ifomACIiACIhAZxOg+MgM260qfFYqlUo2t7hsu7aPWhLZ7ju9MG7uwmLWliGcrhUiZ+czFoMvezqZwM/uk1i4X37h0pzlCgVLr8Qt3Dk75q3SyTv9dgx8+7rvUxL4IVEHRKB3CWBXS18mvTv8XdHzy4kSELEG0qJzaaq1uIdyvBhjcmUFWbNhHclPhD4WtRLUcSIgAq0gwHnIz1zWijaoThEQge4jUEZ4P266Dg3220Aq0fEdXFrOWjZXcM9p65VkMm6jwwMWj7UnoVg7gfEZ9fjpi+28pK7V5QRauM/R5eTUPREQgaYTqMeSrOmNUIUi0ACBMBJJxLBTHotV3Izqkdb5OSgUi5bLF5H0JjhxkxrAplNFQAQ6mEAEVtraEOngAVLTREAERKBHCShZTXAHXkJkcMdOLReBriOwahEpq8iuG9ne6hAX7MyCHYcgWVnA19d/7rjnET8pC0FSIn19DHWWCIhAYwRorUQ3w3gkgs0Vxa9tjKbOFgEREAEREAERIAG5Zus+EAER6CQCdUo2ndQFtUUEKgQoSEaxeI+EV6xYwgtWjj48tS9jZPzIDFyBaGEZg782xQAVERABEWgngXAEGXPDUcxlcKUMQFKJdrLRtURABERABERABPwRkBDpj5eOFgERaC0BKixSWVrLWLW3kYAX4zFKK8lwxPIFJqTxL0cyHBGzcUOPdFaWESSzkatkGwdSlxKBLSbAkA+XpudtembRzQHtKEXMOdxM8QrnM147EYvY7FzRjp08b6fPTbWjKTVfg9bjbPdQf6rmc3SgCIiACIiACIhAewlIiGwvb11NBETg6gQkROoO6UoCXMCH++iu3QeLopKVIEb6FSQpRq4gsHuBCW2QXTsSChutlFREQAS6n8AIEiBE4CJdxGZGveEe/FOquGVXF167P520HfhlOZNzbxUxn/G/egsCWFwWV5vRtzAsxwdSyXqbo/NEQAREQAREQARaTEBCZIsBq3oREAEREAER8AjQrTraBwGRrtp9ZSdGbpR9cSNqLrv26nlhl127Yh3ZjAW8RkoERKAzCSTjMWxkRN1nv12Fdpd9mF/WFoqT0cE0BMmU2xwpwQKRc1kJ81o9rcPsBYtxxtatvAybNo0UzrOMbakiAiIgAiIgAiLQmQQkRHbmuKhVItCrBGQR2asj30P9dslsYMnYt9JnpSJFxYqFpJ9SsY7Eon+lCCEz5JLjcCGvxbcfijpWBIJFwAlsHRIjthIDl1/ZITcXlbm5EqYoyXnJ33zmjQLPWkF9ESbF4StYw6PWioAIiIAItJ+Aviraz7wpV5QQ2RSMqkQEREAEREAE/BGgaBiCq3YYbtYFJLKBUVEd1pEGK6RVy0q6azOZjawj/Q2EjhYBEWiIgLe5EsLmSqHIjRVulFQ2S/wUZyFefnlzRbFw/dDTsSIQQAJunjAr5AuWDYc7vgP5Ap/VMMFtUJjMK5dDYkJ/U1/H97vSQGwyXaXvAemEmtlBBCREdtBgqCkiIAKOgHa2dCP0FAFaOMVjUSzg6drIRTgtivwhcAkaYJHEcyN4mNcC3h8/HS0CItA4AQqSdNumoOgJkpzMfE5nL2+uIPQEcvTIOrLxoVENItCRBPj8Q2+O2flly2QrMWc7uRQQo7eEOY1eKGtLNBpyfVjB/BeNNBZeohMZeM+lbrNbS7VOHKLAtUlCZOCGTA0WAREQARHoRgJ0c4wgszYFRSa08ZvMhkycAACLolIJbpNYwa/3sNyN7NQnERCBziFQ2VyhIInkWsUy5rONLYg2arXbXHGW4pwXsbmChb12KTtnjNUSEWiUADcuuAm7c9uILS3nbHG50GiVbTl/eCBlI0MDr7jW+MiQzc4tWi6fx6stTWn7RSbGhqw/leiYECFtB6ALNpWAhMim4lRlIiACDRLQOqNBgDo92AS8uGtcyBedi2PZv3UkELhkNvkShMgyLJTCLpmNigiIgAi0k0AIVkMxhJ/oQ/KZIqy9/Vp6s63e5kqxWBE3OyVGZjs56loi0K0E+GyybWLU+Wf7tZzeKiZs83rxuIcHUzYEkTI4PfFPkJaQHTgH6wHX/1B2xBkSIjtiGNQIERCBKgL6QtHt0PMEmDm2DwJiqBSuJLOp06KIgmQ2TzciuDjSokifrp6/twRABNpJwNtciYQZfqKSYdtv7EiXxAZCRS5fdG6ctJDswMVwO7HqWiLQNQScqNcFDyec6yrd0INW19yc6khLCUiIbCleVS4CIiACIiAC9RFwcXgQH40iYgmWRUxo49ei6OXs2nD1Xik7MTIE66QueOavD6rOEgERaDuBis7AcBHIiI2wEQWEnuAmid/i4ucyFi48vWltGUE4i/Usk/zWq+NFQAREQAREQATaS0BCZHt562oiIAJXJ8BtRG0l6i4RgVUC3gK+IhxWYq5xAe/boggL+BIW8DyP7tqyKNItJgIi0G4CTjSEeNjH0BOrYqTfWLjcXClhU4Vz2QqydEcijIWrx4Z2j6WuJwIiIAIiIAKNEJAQ2Qg9nSsCItBsAkwzpxVFs6mqvsAT8Nwby1h4h1zsSMROqyO7Nhf9lQV8xaKIbo6yKAr87aEOiECgCNCtOtoXsT5MZOU+vBjT1qe5t5v/OJ8hv0XZm8skSAbqPlBjRYDPIxcuzcFKuoj4C73Jg89io8MDLgau4nn35j3Qq72WENmrI69+i0BnEpBFZGeOi1rVIQQoGoaiSNiABTiT2dSzgOd6n1lsWQctisKMt7bqOtkh3VQzREAEupwAjSMZKoJzULGI+QyxcL1Nklq77llHOktx1BNFGItQWKEnauWn40RgqwnwOebE2UsuqV4vxn3lMxwZ0EtlfHRAQuRW35C6flsJSIhsK25dTAREYBMCsojULSICNRCgKyIFyTIExTxcHL1YkDWcevkQWhSVIQDQ1buSzKYSx01FBERABNpFoBI7EvMZrLwLbnOlkpjGT+HRDD1RhpgZxT/CdP/mf5rO/GDUsSLQVgL8nDNeLB9grtm3wwZSibZevxMuls3l7eyFGVvKZG2sPABXlU5oldogAu0hICGyPZx1FREQgdoISIisjZOOEgG3yA7DoigBCyBmoy3Ctcnn+t1RdFaV5SJcI0MWQ7y1lzM/CrIIiIAItIdAmO7VsZCVsDlCN816ktlQ2MgjqVeoXMmsHZF1ZHsGT1cRAREQga0joC2nrWPf0JWluzeETyeLgAg0mYCEyCYDVXXdT4CCZAzZaJPxqEXdwru+Z7ISrCuzuYLlCxQl/VkkdT9l9VAERKAdBGjNyFhpdNuudy7j5gqtK3OYy+oRNNvRT11DBERABESgKQTqe+htyqVVSSMEZBHZCD2dKwIi0GwCEiKbTVT19QyBiotjJQFEaTUjrd/OOxdH+EaW8yurFkV0b9Qznl+OOl4ERKB+ApXkXBHEr63ET+Oc5HdvhNaRZbhr5xl6Akm5WJ+msvrHRGeKgAiIQCcSwPeFDOs6cWBqaJOEyBog6RAREIG2EVCymrah1oW6kQAX2nRHZAzJIhbhJcRMo3WQn+LFmyyu8FzEboPLpFwc/RDUsSIgAo0ScKEn8H99TGJRgst2HZsrnPlcAhwXP7IIQVJzWaPjovNFQAREoMMIaLe8wwak1uZIiKyVlI4TARFoBwEJke2grGt0NQEu4J1FEV5hl5G2Posil8wGC/gQF/JY0UdgVdSLWS27+mZR50SgwwmEKEaGIUqGIpXNFQiSfkNHeNm1MZNBkCxbBLFwXb1avnb46Kt5IiACIiAC3UpAQmS3jqz6JQLBJKBlQTDHTa3uQALVFkV9xdWkNKuiop/m0qJyhdaREDWZUELWkX7o6VgREIFGCXgJtLi5wnnNhY9w85I/a2+XmAtiJE8L0ToSluPaXGl0dHS+CIiACIiACPgnICHSPzOdIQIi0DoCsohsHVvV3KMEaPkTQ+xIJm2gdSStiVa4iPfBgwv+knNvfNk6Utm1fQDUoSIgAg0ToAjJJDZhhIzwQk94oST8VO6ETM6DECIr1pEVK3IVERABERABERCB9hCQENkezrqKCIiACIiACGwpAcaNDCHemlvAwy6ovFJfAohCEVm1IQSEw2EXi7KPry3tmS4uAiLQSwRoxRjDi/MQs2MjP5dv60hurnAupCAZDoUhSMJKUmJkL91G6qsIiEAXEMBcjm8AlSASkBAZxFFTm0VABERABESgDgKVbLSwAkK8xwLctYtYwfv0bnRXpXVlickf4KodhYtjCFZKEiPrGBCdIgIiUDcBJ0jC2pvzWLFUhKU3BEmftTl3bcxlxVKfJWLMrK3YkT4R6nARqJtA5bmhz0rY4MzzoaTHSqHApIBlt7GrUjcBv9N+3RfSic0lICGyuTxVmwiIQGMEpGU0xk9ni0BNBLjY5gI+El5xFkVcyNdTPBdHVGMxipH6BNeDUeeIgAjUScBz146EoxAyyi5+pN/Ykbw0z8nkCi4GbpTu2vTXVhEBEWgdAXx4Q7BG5i7ms0fP9ORmJo35OIft3TUJk+zWoe7mmvE8K3IBHWAJkQEdODVbBERABERABBolULEooltiCIIkFvF1CJKV+JFFy8KiiJaWEfg4SpBsdGR0vgiIgB8Clc2VMATFkOVhXcWYtvUUzoEvu2tDKNFkVg9GnSMCmxKg1M/P7I3X7rECrCHr8c7Y9CIdf8CKs8IeSCWdh4mKfwJyzfbPrFPOkBDZKSOhdoiACHgEZIage0EE2kiAD8FhuiNGkQCCGWlX46b5aYJLGIH/4GVkpZWisyhi/MhOKmxjEWLr9NyCzc4v1iW6dlJ/erUtlfACYRvoT9nk2KCSjPTqjbBOv6kZetbepT7EgCyXnKWjH4GD8qVL5rXCxF6YGxk/Ehss0iN1o4lA8wnw85pKxGwlHmt+5QGqURbYDQ1WfbtODV1SJzeDgITIZlBUHSIgAs0i0FnKRbN6pXpEIAAEaPlDgacPC3jGLGIcSL8ujl52ba78S1jAh7GA7xRBsggrqfOXZvGas+VczlbqtJgKwFB2dxPxLRGC++z8UsZZ0wwNpODeJ0uS7h50f73jXNaHWLghLE9p4ci5jLEg/RTOZTzHCZlIikOrcd1nfgjqWBGojYDistbGSUeJQLcRkBDZbSOq/oiACIiACIhAnQS8ZDbMRhtiQpoSM9L6W8Dz0m7hv2pRVIZIREFyPRfHIhb5FwtZO5lbchaV1yeHbCASRaik5u9JMBbm2QsztpTJ+rKQqhOlTmshAYpLCxjPqdl5SyfjFotJiGwh7kBWTQvGMEKHOVESmw6YyZzLtS/rSFp68xz859y1Ec6OMSRlHRnIW0KNFgEREAER6CACEiI7aDDUFBEQAREQARHoBAJ0E6q84OoId2YuwuuxKKKbd8XNEZaRWMV71pFIJ2FzxYKdLSzbc5l5O7I0Z0yXM18q2L5Ev+2IJS0dijRVkCyhD4vL2U7AqzY0gQAFJY4n700VEdiIgLe5wvnM21hxc5IPZDzW21zh7eZtrEiQ9AFRh4qACIhAawj4mc5b0wLVWhcBCZF1YdNJIiACLSTQfFOoFjZWVYtANxNg8PRQNOSyalcsiioWQn6KEzGLsEjCybFwxDJWtKlS3p6HAPns8qydyy8bLSNZPj9zxgmRN6dHbH98wMajcUsyq6aKCKxDoIT7yuftKI49SoCbIGFsbnAeonW053btBwfnvgIT4cBi/HLsSNSrhxY/FHWsCIiACIiACMDDQBBEQAREoIMI6Hm+gwZDTREBEqDVTxTx0ZiwgQt4eGv7tkKjtWMBYuY83LBfKM7btxen7GIxg8Q2rxQ1j2cXja+DyUG7p3/Crk31W7wvYhGZH+mGXEMAnrdyk9Vd4YsABckQYosWIGIXOZk512t/pSJiVpLZRLlZI3dtfwB1tAiIgAiIQM8TkBDZ87eAAIhARxHwux7oqMarMSLQzQS8bLTl8IrlaRXkI9lLYaVsL+UW7MHMlJ2GBST/vVk5CovJM4gduW9p0O4bHHfxIxspjCLIhBPMnK3SHQQYr09FBPwSqMxlTEDjba4gWITPpw8vMRcTe4XLIdQXkSjudyB0vAiIgAg0SADzudxmGmS4VadLiNwq8rquCIiACIiACASQAGOtxaNRK4bgrr1JMhu6XJ8tZOxhCJBHIUTmYUW0nhXkRhiy5ZIdzczZeYiXjyUG7B0jO22ozmQ2EWQE3zE5aqfPTvm26AzgMHV9k3kf7tk5AQEo2vV9VQdbQ4CJbGKYF8oQtAsFZtf2v0lBAZPJk7LlgrMaj1CQbE1zVasIiIAIiMArCWjKDehdISEyoAOnZouACIiACIjAVhGglzSt0ejmSMvIIgTD6mQ2BazOzyARzfO5eVhCLtlsOWcZHOO30EiJ1pNzxbwdWZ6xS3DnvhaWkbekRmwS8SMj9M2tsdBiade2MWTRDdnSMtzC6xAdaryUDmsxgWgkYmMj/TbYn3JJlVREoF4CtI4MM7N2rA+u2iErMX6kT/NIzlMufiSzc68UEcoiXMnWrVuz3mHReSIgAiIgAl1OQEJklw+wuicCASSgR/cADpqa3HsEuMjmIp4/QysRuDzD2hHi3nQhZ9+B9eOx/IJdhDXkUrnoMmI3Uphlm0LmqeySLcAt/GI+aweQ1OY6xJGciCZqqpptTSRisIocsXyh37crZk0X0UFtIRBCXL4kxpLJlFREoBkEKBxGYdFIb3+Gb2BSG7+JuTzrSJ4XQpItWkhys0ZFBERABERABETgSgISInVHiIAIdBIBPbF30mioLSJQAwEKfLAHskVk1X4+O2cnYAH5Um7R5sp5X27YNVzKHTJXpHVlwYmR5/MZCJKDtieechm2NytsKQUsvlREQAREoJoAp7IwLKb7ED8yROtGbKzUk13bS2azgmQ2ZYjlFCQr86SKCIiACIhAMwlg48e/u00zG6C66iYgIbJudDpRBERABERABHqbAF0SlyEKns5l7IXsgj27NGvTxawxNmQrSx4CwfnysrvWScSPvA7u2tcnB2xnPI0M27KSayV71S0C3U6A1pEhJLIJl+muTUtvuyL0RC3995LZ8Ceza0fCYVlH1gJOx4iACIiACPQEAQmRPTHM6qQIBIZAa9WLwGBQQ0UgGASWmUwmu2jfnLtgL0KIbHdh/MizsMCcKWTtHATJVw9O2LWwkGTMNxUREAERaIQA449G+5B8Bkok5EgIipVYkH4KrSPdCxaWMcQ2ZX5XCp0qIiACIiACjROAtbl2nxvHuCU1SIjcEuy6qAiIwAYE/D3hC6MIiMCWEpiCAPjE4syWiJDVHWd27Rcz87DELNm+eL8ludpfp3CCySI77hJeRQgDmnC29Pap6+IwVLNkNITM7SGLKv5eXQx1Uu0EqBlGIxX36kIR7tqwkPSbzIZX4znZAjJrl1GXktnUPgA6UgREQAREoCsJSIjsymFVp0QgsASY00LaQGCHTw0Xgc4mkIeQ8LVjc/bZZ2ftwnzeiZEqwSIw2h+1e/cP2Kv2DdjBsSSsy4LVfrU2mAQY4zGG2JErUMJzhSIEyfrmjiKtK2EhGYaw6WXXDiYRtVoEREAEtp4ArNTrm4y3vuk93wIJkT1/CwiACHQOAXyXFNEaipHrmzN1TlPVEhEQgSYRSCC77AgSzUThXXMCbt6tKucWCvbfvn7GPvytC/bq64fthh1pS8DSSSVYBOayBfv4k1P2e185bf/6fQftjp2wgIV1pIoItIMABcl4NGrFEATFVetIv8tgrpuL2BShyzZjR0aQqlve2u0YPV1DBESg2whgTtZ2ZEAHVUJkQAdOzRaBLiUgi8guHVh1SwTWEohBeNyVSNu1SDQz5jJe99kNqaw9uTTtMmIz/mOzynyuZA+fWrAvPDNtv/hd++yuvf02nIwoVluzALexniISFZ2DNetXj87Zv/74cfu333fQbtiWlJt2G8eg1y/FZS/FwzDMcWkZWURoCIqKfgvPYTiJMu7pCLJrh7Ux4hehjhcBEehxAtjYad7DYo+zbHf3JUS2m7iuJwIisCEBBRzWzSEC3U8gglX8RCxpe2L9tjuesvFYwmKI6chl/GA4YqlQxI4jAc0JJL+ZLeaakoH71GzOvn503m7Z3W/vunHExtJRufQG+FbbMRizoUTEPvroRTt6KWN7R2I2jH+riEC7CFCMpCEOf4ZWwrBwpMt1Gcls/LWAsSNXIGbyZwjnxiBGyr7HH0MdLQIi0NMEfM66Pc2qozqvp7aOGg41RgR6ngD962Ri3/O3gQB0IwEs2W0oErP9iQHbGU/aRDRpaYiOXgZZfvCjECR3xdPWH4ni/bidyi3baYiSFCQbKVPLRTs+lbXvuXXUCViKK9gIza0/l0lqKEZuH47b+fmcLeXKECK3vl1qQe8RoBgZpiCJ2JF9pZCzbizDQMePIMlV9AqsI1dgHZnHuSFYRzI5jjwOe+9+Uo9FQAREoFcISIjslZFWP0VABERABERgCwlgXe1Exlv7R20gHL3qjsNQGBZvyZiNQoxkbutGhcgCrJVyyJQ92R8zeISrdAEBisn98Ygt55EBHeKPighsJYEQbsgoBMnySh+sIxHsGsKi3+zaLnYkrCNDtJKElSXCR7qNGllIbuXI6toiIAIdTkAWkR0+QBs1T0JkQAdOzRaBLiXgDAO6tG/qlgj0NAFaRI5FE5aAtU+tZs+0mByCdaSKCIiACHQ6AQqGtI4MReGqzezYeDF0pN+krk7ELBfxQtxIxKLsVutIWo2WHSNtJHT6vb1u+2gNjO9zivAqIiACIuCXgIRIv8R0vAiIQCsJSIhsJV3VLQIiIAIiIAIi0FICdKmORmjRGIJ1ZAmxI1ddr31elTEnaVVJK8sozCO9mJQ+q+nIw0uwUs/mC7acRRxgmpCqBI5AH9wLYtGIpVNx91OhBAI3hN3SYCnhAR1JCZEBHTg1WwS6lICsIbt0YNUtERABERABEeglAnSrpkBDC8cCBElaSfotzl27uOKsK5mpO0rBx28lPo73HsJaeQ0258LUrJ06N2VLmZxvi1Ef3dGhbSCwc/uY7d0xbslErA1X0yVEQAS6hYAiJXXLSKofItAdBGQR2R3jqF6IgAiIgAiIgAiAAF1XKUhGEWai3niPdGNmZu5sruCEzVaUEi5yNp9xMXn5eysKq82hDyfPSoRsBd+tqPPchRmbnl2wfEGWrVvBv9evCUtc6VkBvQlkERnQgVOzRaBLCdBcoDVPv10KTN0SARHofAJuUuP/VZkZ8VcuytcKE2sOswyS7CzmShAzzEZTVyb5cVrBGtMlP5ZMVzt/naovd2G9SdrPdTt/xNRCEWguAX7Oo8isHYEYSQvHYqnk2xLQy66dyxeduBmh+3cT4vMhx7ddKuTs0cVpe2ppxgbQxlvTI3ZDcggxeptt5bYCMTVvhVLRd/+bOyKqrVkEmCl+cTlrw4NpJ7iriEA7CcBq3L+peTsbqGttSECzhW4OERCBjiGAL5OShMiOGQ41RAREoAkE/uaZafs0XvOZksUgRFA32DUctw/cvc3+/NGLNt4ftXfdOGpjEBmfOrdof/zgBfult+y2HYMx+/aJRXfusams0xu3D8XsXTeN2euvGbSvvTRvH37sks0uFy6LEYcmU/bz9++wjzw15Vr+tutGbNvAK5P9UIB8+vyy/devnLalXNm1i2XfWNLeenjYjuC95y9m7Odet9N2unYs2KOnl2z7QMxu2pGyX//MiSvI8Ly3XT9sr9o70ARiqkIEupMAxUgm7aJWE+5DQhsIOIwD6df4kHEjV2AVuVIwK2GHIuLmlfq2Ai4WsvZsZs6ezyzY+VzG5ko5ZxG5UCzYC/jbdclBO5QYtNFocwRJiql+s4l3593QXb2iGElBW0UEREAEaiUgIbJWUjpOBESgHQRkEdkOyrqGCGwBAS5R5ot5Wy6XXKyzWnJn89j5gCcyOHoxay9eyEDkS9gNO1NOiBhLRy0dC1secd++dWze/fsWvPdxiI4vQgCMQlx44syS/fkjFyBWrNhNO9MQLszOLxTs975+1u7YnbbjM1k7hmNZ78HJhBvRnYMJ1LliT+NcltfsH8T/ryNE4q8XFwv2yLEFu3Vfv92yK+2O39Yfs+FkxPrjEfvCU9N2F4TFu/Fiu07P5Oxv3T0J4bNo33xuxt5087jtG0WSAoggkzhvBOepiIAIbE6AST3C+Nz0lfEqhSBGlny7W1O8LMEQyImSSGYTwpwRjdTuoTiHufhYdsmez87bieyiTRezl92xC6j3YqHioj2Fv5/H74dTQ7YnnrYkBFQVERABEegUAnLN7pSR8N8OPTX6Z6YzREAEWkQAXyZ8wq1vW79FbVK1IiACzSHABfPp3JJFsQjfjQXtWDRhidD6i9rlctGmYKlzHAvls7nl5jRgC2vZBkvGd986Zu++YfSKVnzPLWPOAvIrL8zZS9NZe+z4or3rlnEb64/Ynzx8wS5BLOQx333TqEUgNDx6etH+6JvnLAd3bQoRO4Zj7v23XDd8ud5pCIW1lmQ8ZN9145h9H9rmFYafG09F7DMQKD/znWk7cmHZXoCQet22pN29Z8BZSjKD79tuGLE3HxyydFzCRK28dZwIVBOgezXnwzB8QYp9EBXx4fNrLeiS2WDzIeQEScMmD0XJ9R+juBmUg+PJMQiPJzC3vgAR8gJiQuYghK5XKEhy/qVoeRGu29ck+u0grCPHo3E3d9fzsMZzYtFo3RacuoM6kwA3F8MK1deZg6NWiUCHEpAQ2aEDo2aJQI8S4HZ+Pc+2PYpL3RaB4BCg2xatbBZKeVjZ5GxvYsB2xpI2GI5YZNXKpoiVNAXIczjuWGbeLnKR3AXhf2aWivaNF+ctk4dggBnu0ETSrhtP2J27+u2p3cv20ccu2uMn5m3HSMKJghQnvnN2yVlC3o5jaD3JctvOfvult+6xeLRiTzq1VLCvvjhnM3D7pjHUNrhRH0bdtZY8kl98Ey7e0DFc2T4YtfsPDNpIOmI/94ad9ssfetG+eWTOXnvDsL0TIupgotKOEgSTb6I/c5miJRCnbt9IzPVJVpG1ktdxIlAhQI/qMD68IVg1uuzYtI5cFRX9MHIiJjZwyqgnSpGQguSqu3ZFgCzbNMTE0/lle3DhgnPDztc4ty4jnuNzy7MQLxfsTDJj16YGbW8sbSNw1475FJ9oDZpAduVUMm6FQsm5pqsEm0AsFrF0KuFilqqIQLsJYDNGMQHaDb1J15MQ2SSQqkYERKApBCRCNgWjKhGBziWQxUL7RYiMp2CVsx/xx26Ey99wJO4aPA2B8pHFS26RTGucbiknL2XtyKkF+wRiOtJi6X1wcd72qu2WgKB47WTS+hMRO3Y+Y2+6IWkTiBlJ/SAPUSIOgSJKn+zVEoc7J2M20h2aC/rjF7L21EsL9tcQKhOxkN17zZD9P9+1r2ZsmWzZ/vqh8/bZJysxJe85NOSESAoYB0chLKZjdhSxIScRZ/J6tNMreQgIH37wvH0C12Vb33LzqP2deychRPbXfG0dKAIi8DIBfp6jUSSggZDIzxfF/nrW1yXsKpQxx4bh9k1hCClhbLFcsLPY3HlyYQbxIGcsz7iUdcDn3P3k0pQdhSB5a/+w3ZAadptJqVCkplAb3iWZYGfntooVdiabc/1sUSLwOnqpU2olwE013rfjI9i8GhpQoppawem4ZhOoZzprdhtUXx0EJETWAU2niIAIiIAIiIAINEaA1ji0sjkD179d8RSsIkP2Av7Nv3fbUyXjMH7/nRP2rjWu2QWsvj/z7LSdm8vbDsRb/NzT0/bTr9lp2yFGDqTCdno259yzD4wiBiQWfXPZoj15ZtluRMIYWk3deWDA3n/7RM2u2S7rbhXcIbiA/+qbD1zhms1RZbu+BEvL83NZGxuK27PnMvaF5+fsPTdXxIMkYkj+f953jb0ZwqVnrdnY3aCzRUAESIDCThwWZiVsRBRc7Ej/yWwo7DFWbA7nnilm7OHlKTuyOrc2SpnTxxKs2r8xd8EeR5btuwcm7J7+MRvFZhI3MGrdTZ4YHbShgZQtZ3KWRxZwvy7pjfZD5zdOgPdqCtat/emEu29VREAERMAPAQmRfmjpWBEQAREQAREQgaYS4KL2hQzSv6KUutjDxomAVeS4bPsyYkM+g8Qyd+ztt7cj5uLvP3DO/suXT9uvvnOfvQaWiX/0jXO2E/ElD8LtOQ7LyM89N2v//K+O2l/9/K0QKF6u7GrCbfV78xAyT0L0vBHZtb2yXrsy+ZL9m795yd6MbN5vvHbY/gqu41+DMHmfS35z5XW9+rUMberHQpX1OAEmswmtwKKRyWxKFQtJP4XZsJ/KztpzuXmbQSbsVsytGbhsPzB3HvP3vN3eP2q34TUUemVyrI3aHUP68Kjcef0Ma0ceKxGyI4dFjRKBjicgIbLjh0gNFAEREAEREIHuJcDldSsWyZ1E7FmIjf/i5KL99hdOO6shZs/+kbsn7EOPXkRsxZR94J5J53J96bYx+3efOG5vuX7E3nRo2M5CNPz0k9P2Vw9ftGQ0bMgRYx+4f6ftRZKah04hjiTq/bUTi/abqxmrKVj+H6/f6QTPz8Hd+ltH5xBPMmzbIWa+7cYRxHiM2H/4zAn71++9Btm4yzaH2JW/gev97lfPOFyHd6Tth+6asAcQ/3HXSByWkuN2PZLUnJnL2Zcggv7JQxfsjbCCzMKC6V985Jj954GYIUeBHcQx77tt3N4M0VJFBESgOQQo8DCUA12ZC8VKPMWr7dVwb2KxVLBHMnCfzi06AZJu2KUW2ZhzninCgv0C4k5+ZbZgzyzN2l2wjuTLi0+5GQmJWJsR0vsiIAIi0J0EJER257iqVyIQZAL+tv2D3FO1XQQCTmAoHLVDSDozg9iOzIi9VYUJE7bDvfuW9KhL9NJJ5d3IeM2M08x0TVGBrRtNR20v3K1/9L7tLsELXa8ZC5LiY/K9YRePcRLu2T94B4TA7Sm7sFCwGMSISSSTuQF1JRCb8fXXDOKYSCUBDtN8oQyhrt0QKT9wzzZ77YEhJz/wvTRiUe5BIhwKmX/vjbvs4Fgl3uO/et9BF4vSM0oaSUXxXsL6Uf/rDg66a6Xw+1sPj0CQTFkSv++BqPkbP3ydS6wRQZuYq2IY170G56mIgAg0lwCns0r8yLCFYB1JV+1S6ZXhKzLIhv1CbsGegRXkOVhDLiEuZLs2eJhkbBGW7Vlck4ltXkT837sGxmx3PG0Jn8lsmktPtYmACIiACHQqAQmRnToyapcI9CYBiZC9Oe7qdUAJ9EOIPIyEM6lIBDHI5uxZxCHLwI2wXVEeaXXDRDfXQgw9nB6yndGUhTts4XsI2bH5Wq+M77vSjZGJar4H7tBe2QfxcCdiNDK7NQVMioJe2TMcN77WK8PbI3YLBMy1hd6dOwfiSIJTEWvfBXfw9QpF0OpCa02+vFLdxoDeumq2CASKgIu/iM2KFYj/IcxxRRc/8uVHJs67R7Jz9iLESAqDW1F43YtIijMHS8zRaNzGMDcnIi/PG+u16XJLt6bJW4Gpu65Joby7eqTeBI+AbsHgjZlrsYTIgA6cmi0CIiACIiACW00gjMXxCBacg1hsbosk3OLzZHbJzsJVjy6CrbTIGcX1dsSTtj/RbwcTgy57azeWKISHaJUA2UgfmeXUEyEbqUfnioAItJ+AZx0Z4ge5aFbuKzsxkoleuP0z1+I5t5YeU09kkpyFYt65bW9U5nJFewZJsF64lLGLsPjOYbNFJTgEKIwnIIyPDkSRtGzYJvGT31UqItBuArAYX/UJafeVdb1GCUiIbJSgzhcBEWgmgbV5E5pZt+oSARFoEQEKktsgBPJ1IrFkT8My8lh2wS7ms5YpY8XcxJIMhW0c1zmcHLIbUsO2PQqX4w5zx25id1WVCIiACLyCQDQCN+2VPrhpQ4SENWTt+arXhxlCDXHEcRjCZhIT4yzA1ToHq8tmGyrSWHO5ULKPPzNtT55esvOIgzufKVkB7uYqwSFAIZKhOSK4Dy/M5+1t14/atbD8TyIMiIoIiIAI1EJAQmQtlHSMCIhAuwg0+5m3Xe3WdURABFYJ7EVcsHGIg/z51NKMvYR4YRQjs1jU1ltoZxHBpvdgOGa7E2l7zcAErCFTxtiQKiIgAiLQiwQoBoUQZoHJbMLl+qzRvLm1H3Mr59SbsLnD+fq5zKydz+dsCVaWV7Ns9Ms9D+H0ISTu+sOvnbM79w3YT7xmh926I2VDSKSlEhwC9HaYQrKzryKx2f/7xVM2lynaB+7eZocR31hFBNpJYGXlKqbX7WyIruWbgGZ938h0ggiIQIsJSIxsMWBVLwKtJpCC1SIXtHSZPo6YZd9emLLnYCVZwPOi3w84F9vxvrBzw37bCDJGx/plAdnqAVT9IiACgSFAV+0oMlH1+XSN9awgacl+U3rEDmC+9spkLGHHMkt2BILkxXzGhdnwP3u/EuFivmT/71fP2F37B+zvvnrHhvFzAwO/RxtKLwTGEn7/rWOIYxyzf/fpE/bYjkW7biKJ5Eo9CkXd3ioCfh8rt6qduu4aAhIidUuIgAh0EgF9mXTSaKgtItAggQRc/a5FMptt0aQ9Bmubb81fRByzvItpVkuJYEWzE5aVrxqYREbsYVhFwgJIofFrQadjREAEeoyAX/2HFpA3pkZtbyIFt+yXE2ERWyoUtRuQAGxfMu3i/j6zPGNnc8sNE80WyvbQs7P2Ez9xve0YvDIpVsOVq4ItIXDv3n64aPfZObhoz2aLNpKUvLAlA6GLikDACGimCNiAqbkiIAIiIAIiECQCFA4HI1G7F+7UtJJ8Au7aT2NRy/iRtJDcqOyBC/Zt6VG7LjHkkuE04oYdgSDKmGpn5nPmLimP7iDdQuu2lcO4lC9aIhZCrDINaOAHVB1oKwHOx7SAHI5GscEDa8p1rs65Ow1B8mBywPrDEXusb9qOI/ZvI4WbULlsAVZ0cUtFrxQ/G6lX524dAS9GM/cX4Sa7dQ3RlUVABAJFQE9ugRouNVYEREAEREAEgkeAC1q6a08gduRd/WNwsd5ld+LnSCT+is6MIRv264a22duGd9ltsNaZiMWNlpWNlOFUxLbB+uYLsMQpIKOrSrAJFJBM48xczk5cytqOgbil443dH8GmodaLgH8CA9jcGYIIGd1AhPRqpEAZwzFDOH50nfna/5UpVpnLsCwX3nro6RwREAER6A4CsojsjnFUL0SgWwhoK7VbRlL9EIENCAxjQZuCdc0QE8/A7fpFWNgcQ0IbWsrc2D/sYkAy0Q2Poyt2M8re4Zi9/tCw/X8/d9L+8MHz9o7rR2zPcMJi4ebU34w2qo7aCCzkSvYosu1++PGLtmcsboeQHCEdk2VVbfR0lAhUCDD2rp/Zj5tJjVili7sIiIAIiIAIVBOQEKn7QQREoGMIwKVDQmTHjIYaIgKtI8AF7U4kSJiMxvEzZbsQqyyPj/+tcN0exd+aHQdyGDGrXr1/0J64ccQePbFop2dzFoertq+VeOtwqGYfBErIujufLdn0UsF+5J7ttm8k7qyrVERABERABERABHqLQF8fHihVAklAQmQgh02NFoHuJKAvk+4cV/VKBDYiEMHzI0XInXgxXmQrLW62DUTtH7x+l330ySl7/NSiHbuUs3yxpMEJGIEkrB/3jyXsrbBqpWWrRMiADaCaKwIiIAIiIAIi0PMEJET2/C0gACLQUQS4qyXTlo4aEjVGBFpPoBKHrLWb2jSaG0WsyJ941TYzvlREQAREQAREoEYCjE2bQ9ZvfpekFA6iRmo6TARaSwDOdAr83VrELau9tU/9LWu2KhYBEehSAtQjJER26eCqWyIgAiIgAiIgAiIQRAJTi0V7BNb0T59bbkrzSxA2p5aLlisqKlFTgKqSXiWgD1BAR15CZEAHTs0WgS4lIBGySwdW3RIBERABERABERCBrSKwnlrBv3mv9dpVfc7J2ax9+jvT9pWjc5ues/Zaa68DDdKOz+TsH/zFC/bgyYUNkVytbRudVM85WzUmuq4INEoAYb2Ura5RiFt0vlyztwi8LisCIiACIiACIiACIiACIiAC7SZwZHnW4qsxeqObrOOXygV7KbdoRzJz7W5mw9ejKPf552btqxAPmZ/sXiQte8fhEVfvkQsZ++hTU3Z2Lm937e23d95QiTn72KklO7OQt3P4+7n5vB2cSNobDw058TGPZFkUEP+fT7xkS7myff8d43bbzrSl4ar9FCwlP/OdGTs9l7MhhAH5qVfvsG39ESTWKtrnn59FvYtw6Q7ZvfsG7f4Dg/Ybnz1pj784Z79dKlu5vNvecHDwcn9LSN7Gen7/m+dtLlOy11wzaK+7Zgi/F+3B4wt2/fak3bNnAO2fdm5Ed+7pt0K5bF95Yd6ePLNo2wZj9kNo266huIWRIV1FBERABDqNgITIThsRtUcEREBPTLoHREAEWkYgny/apZl5K5bal6gmGglbfyppA/3JK/pVKBRtfjFjS5lsy/rbSMXJRNyGBlIWi+pxsRGOOlcEOo3A+fyyPVAs2mQsafsT/bYbCcMSoSs/58sQII9nl+yl7IJdKuRssZTvtG5s2p6PPjltX4fYl4j0WSoRsc8+O+PExTdfO2S/9vFjdtOufrsFQuKTp5fs6KWM/cDtExAUl+xDD1+y77ltzPpxzichVpYg8t0F4Y9C4NHzGXv/3RP24qWs/c5Xz9rffc0OS0T77JPPTDvR8fC2pD2F+v4lxMpffvse+xuIhS9NZW3fSNygY8KqcsbuhvB58660PfDsrO0eTdgkBEuv5OGq/cJUxn71r4/ZG64ftr0jCfvSkRmbQt0URGeWC/YfPz9lv/au/fbBhy/Y+9DmWbTrE09Po00Zu3V32k5M5+wX//Ko/fcfOexiI6uIgAiIQKcR0MzUaSOi9oiACIiACIiACLSEAIKa2+z8ks0vLFs0GrZwuD0ePYtLGVvO5iyRiBlFSa9QgJydX7QiFrnxaLQlfW6k0rMXpiyG9kqIbISizhWBziOQw5yTK2eNYuM8BMZpCI37EgO2LZawIq3xchUB8iwEy/li3vIBzQfx+SOwGITl5ztg7Tg5EIM1Y9aSMI38xrF5m10q2c070nbP3gFbypfsSVgsMgZkJr+CzaGC3bNvwAYhRD5xYsGOT+XsusmkS1JzCELj2w+P2vNjGfuXHztmp2C5uJQr2SlYSr7humG7DxaPOwfj9qt/9aJ9AInRXsK5L13M2Fg6CpEyZbshSKbQhleh/j9Lh+12WDPuGY5fvkkyxZI9ey5jxyB4vv66EXw39Nl8tmxHzi/bHRAZb9yRss9DzPy1vzlm6XjEDozF7SjqfxYWmTR+TOG7LRYO2ZPo4xmIrgOJsLP0VBEBERCBTiIgIbKTRkNtEQER0JOS7gEREIGWEcD62jIQBPvCfTY4kLZErD3i39TMgi0sLzurmqi9LETmYJ1JcbQ/GbfB/nTL+l1vxecvzsIVsX2Wo/W2U+eJgAjURyBbLhmtIxeKBZuGILm9kLQCPvNnCst2MZ8xvh/kcm42b9dtT9lN29MQIiN2aDxhy8h8/T+/ec7GB6K2FwLg7qGY+/kchL6TsCSMQSRMxUO2H5aKfG8Mx9FVOltYsWQ0ZLtw7EHUE8H3SBHWi7li2S4uFoxxH2+DheXBsYQNQfxbguUiBcrXw4pxBFaJyxA7Hzu1YAMQDzM4bywVhcgYsgkIlP3xl78XaBF5biFnSdSRRd0LECH3jMZtvD+K64dtNBmxSbhef/aRi/a33rDTnf/t44uuHWM4Jovzh3DMbQeGXIZvpyErK0SQb2O1/eoElKwmoHeIhMiADpyaLQIiIAIiIAIiUB+BWCRi6RSsUuB63I6ylIHFzAbu17TKpAv0WrftdrRrs2uEZEWzGSK9LwKBJ0CRbQEi5OJy3k7BCrIE5YpWkd2wuk9TEIQAeHY+58REWkRSMNw5HLOvPV+0ixALL/EFt+ci/KYp9s1nrxRfKUxGNpkLB5OwOoQweR4WiDsGo3YEForpVNjFjtzWH4LQGLLziDv5JcSr/MKpaXv79SOwZgy7a85lixA5IThCtJzF7zHUQ+tJblINQlDchbbmEUdyHH8bSrCeAo4t2i0Hh+wshNZZtHcY14qjnWG0cxJ9WITAeT1czkchdlIwVREBERCBTiOg/ZFOGxG1RwR6m0A3PPf29giq9yIgAiIgAiIgAm0m0Afrt8YEJz6A0QKy0AQRMoQUKo21pjn47tjd76wSP4PYkB9HDMe/gBXhQ0j28lpYC1KQfPjEon3+yKw9e37JBiD63YckMlHEk0zCatHTHikMJpBkhkIjLRj5b68kISbGcPwdsISkuPkVJKX5HOr70GOX7J5rh+GiHbNvwVrxGbhNj0JIvAVxIbcjgQzDcTBuZRJC5bO0xIR797Nwxf4cYkFSFL0X7uL9aMMKRGFed3oJFqsQTBkn8qmzS5aDcPmr795nFyBuMrblYbiNH0BSHVr9s91FdO4s6uQ1tJ/UnHtJtYiACDSXgITI5vJUbSIgAiIgAiIgAiIgAiIgAiLQNgIRiJDD4RgSzoThhbt1EiAzNKeQ9KY/giAUiM241eWnXr3d7j80bEcgBH4DmbMPwG36J/G3vYjT+A/fstvOIq7jXz8+BdfpqP3QnRNOOGR8x9uRTCbBNNsoBydTLnP2dvydP/eNVpKO0UryTmTh3oW/37l7AJmwkdUa1okfefSie/+fvHWvy1p9J+I6MgP3737lDJLYLNsP3j1pdyPxDeNCvuuWMTs7nXeJb2ixuZwvO9fxHajzH7x1t3372II7j+7aTJZDofECLCJ//k27nVj5Q/dsc1m1Gcvyu28acZaUf/bt8/YIxNb33D6OJDrtiYO81eOs6/cuAVgOM/iASgAJbN03VQBhqckiIAKtJbCwsPDG/v7+T+AqV6aWbe1lVbsIiECPECjDSuTkmYuwhFmxbRPDbXPNPodYi1PI1H1wP7KrVsWlPH9p1pbhts3M1KPDAx03Ct9+/Hnbv3ebTYwMdlzb1CAREIErCeSwHv/K3Hl7aP6Sc7Uut9m5miLkaATi2tgeuwaJb+LrCJEnZ3P26l/7ln3u/77HrocVX7uK526zduFb7YZT/R7/Xssiee1xV6vP6+t6bdjoWhvVtxE3v8c3i/8P/P4z9tprhuxH75107uAqItAuAplM5lOpVOq72nU9Xad5BBQjsnksVZMIiIAIiIAIiIAIiIAIiIAItJ1ADMLf/YOTdjg5aI8tTdkzS3M2W8y1vB0UIMciCbulf9RuS43YcDRm0Q6whqzu+EZCn9+/r4W59vx66rua4FmLGFpLP1t+E+gCIrBFBGARGeyMWlvErRMuKyGyE0ZBbRABEfAIcDNXcSJ1P4iACIiACIiACIiADwIUrZJwzd4VS1k/3KMPJ4fsscVp+87yDGI/tsZ7cSyasBvTI3YjxE9aQw7AJXsrXcN94NKhIiAC3UFA68aAjqOEyIAOnJotAiIgAiIgAiIgAiIgAiIgAtUEnIt0NG6DkZj1h6O2M56yo5kFO46M2Bkko2lGGYLouD/Rb9dCgNwfR3Zm/LvRZDnNaJfqEAER6DkCEiIDOuQSIgM6cGq2CHQpAX2ZdOnAqlsiIAIiIAIiIALtI8AENrSOHIFIuD2WtB0QJI9BjDyVXbQis574LLS4pMv1vmS/XZcYckLkBCwimSBHRQREQAS2gkAf5jmVYBKQEBnMcVOrRaCbCfh/Ou5mGuqbCIhA0wnki0VbWs5Zqdgad8W1Dc7m8i7mxFqLoT5kXS3BQimTzdvCYqbp/Wy0Qib3UREBEQg2gRSEwkMJZHeOpZ0w+RSya58rZGymkLVcDS7bXOZTbByLJWxnNGU3wxV7H0TI9ZLRBJuUWi8CIhBAAnpQCeCgsckSIgM6cGq2CHQpAX2ZdOnAqlsi0BEEsKKOxSK2hEzVc/OLthhujyUPhch4NGyRNdeLR8LIzNpnC8sZyxeKHYGouhFkFQ2HOq5dapAIiIA/AhQTKUjenBq2AxAkn8nM2TPLc3Y6t2RL5YKVNrCQpAXkIITLPYm03QQB8jq4YjciQNJ6KYx5bylfwibMioWxGaMSfAKl0orRMC2k8Qz+YAasB0pWE7ABq2quhMjgjp1aLgIiIAIiIAIi4IMALRJHhwfcGaVSe6whea04YqilE4ihtmaRNtCfhgBgtryc9dGL9h26f/ekpVPJ9l1QVxIBEWg5gTQSytwzMG4HYNX4yNK0Pb04Y/OlvLOOLK/mC2ScSWbhnoBL963IhH3HwKilQ9GG2xbBHDgxFrenzy/b/tG4jaUar7PhRqmChgjMZIpWxBdZApttCYjMKiLQZgLte5hrc8e6/XISIrt9hNU/EQgWAWXNDtZ4qbUiEDgC8VjUdkyOdkS7KUyODvW7l4oIiIAItJPAOOI7vn14p92RHrWHF6fsEbwWinnXhGHElXzV4LjdkhpFjMlY05qVjPbZd902bh995KLdMJG0kT0SIpsGdwsqgjWa/fevn7OJwZhdO4F4oRFZuG7BMOiSIhBIAhIiAzlsarQIdC0BCZFdO7TqmAiIgAiIgAiIQKcRGEOG7fsHJu2axIA9BgtJZtumFST/Hm1yIoj+WNh++jU77Jc+dNT+rw+/aLfvG7DD29IWl4DVabfFpu3JIMbyp56cspMXM/YLb9tjt+3Shtqm0HRA0wkg3IPMcJtOtT0VatuiPZx1FREQgRoILCwsvKa/v/+TOHSwhsN1iAiIgAiIgAiIgAiIQIMEuAucXynbYrFgdMseCEfdz1aUAmJDPg/x6vPPzdrJmZxlEC+Srr0qwSLASCPpeMRee82Q3QtBeXIg0rJ7Jlhk1Np2ElheXv6rdDr9/nZeU9dqDgFZRDaHo2oRARFoDgHG+dDTaHNYqhYREIENCDAbdKlUsg3yM2wZN677o9HNH81KRbR/pdQVs2UUccWYwEJFBERg6wjwE8gkNHFYQba6RKFg3bgtZYOJiF1czNtyoYz5uNVXVf3NJhBCHrPhZMQOINZnys3jzb6C6hOBmgjozqsJU+cdtPnTbue1WS0SARHoXgJyze7esVXPRGDLCTCe1SIyZk9PL8ACp/OyVPdBCEjAwoQxLNcT5yigLiKxzaXpeYio3RGfPYxM4mOjg9afTGghu+WfEDVABNpHYPdQzPhSEQEREIF6CeBZSYFm64W3xedJiNziAdDlRUAEriAga0jdECIgAi0jwAlmYWHJ5hYXjUlroh2W4TMPt8ipmXnbPjGyrhBJK87FpYxNzy7Y0GDKwmuycLcMXAsrpqiaiMcslYjBrQ8mNioiIAIiIAIiIAIiUBsBxYisjVPHHSUhsuOGRA0SgZ4mIIvInh5+dV4EWkwAM0yhULKBdMq2TQxD/Gq9G6KfHs0vZuyJ6WMbnlLZqVmxdCph+3ZNWqwGN24/19+KY5czJ6wM684yDDzD0iG3Ygh0TREQAREQAREIJAF6uqgEk4Ae+YI5bmq1CHQrAcWI7NaRVb9EQAREQAREQAREQAREQAREoHkEpGc1j2Vba9LAtRW3LiYCInA1AtjVYtC27gh8pqEWAREQAREQAREQAREQAREQARFoFQHpWa0i2+J6NXAtBqzqRUAEfBGQCOkLlw4WAREQAREQAREQAREQAREQgd4jgGQ1CjUY0GGXEBnQgVOzRaAbCeDLpK8b+6U+iYAIiIAIiIAIiIAIiIAIiIAINI8AvOkUJLJ5ONtak4TItuLWxURABGogIDGyBkg6RAREQAREQAREQAREQAREQAR6mIDWjQEdfAmRAR04NVsEupHAaoxI7Wx14+CqTyIgAiIgAiIgAiIgAiIgAiIgAj1PQEJkz98CAiACHUWAyWokRHbUkKgxIiACIiACIiACIiACIiACIiACItAcAhIim8NRtYiACDSBAEJEUoSUENkElqpCBERABERABERABERABERABLqYgBKdBnRwlWUooAOnZotAlxIooV/6QunSwVW3RKATCPSF+qyYK1gmk7OVcmfte2SzeYuErr5H3Gdof6lsS8tZK0SD/xhXKpfQIzPtjHfCp0NtEAEREAEREIFAEdC6MVDD9XJjg/8EG1DwarYIiMC6BPL4K8VIFREQARFoOoE+KF7xWMzOXpixsxdnm15/oxVGI2EbGR4wY0PXKeG+kEUgPs4uLNrM3EKjl+uI82PRqIUjEesLK958RwyIGiECIiACIiACwSGgdWNwxuqKlkqIDOjAqdki0KUEKEQWurRv6pYIiMAWE0D4B5scG7RxiH3ljowC0WdhmAaGNhIiIyEbHxmw+24/vMUkm3f5EOwhQxAhOTYqIiACIiACIiACIuCDgIRIH7A66VAJkZ00GmqLCIgARUiKkSoiIAIi0BICFLzCEbxaUnvrK2X7aTmpIgIiIAIiIAIiIAI9TkAGLAG9ARSSJ6ADp2aLQDcSWFlZ4ZdJrhv7pj6JgAiIgAiIgAiIgAiIgAiIgAg0hwA2Z2UR2RyUba9FQmTbkeuCIiACVyFAITIrQiIgAiIgAiIgAiIgAiIgAiIgAiJwFQLypAvo7SEhMqADp2aLQDcSwK4WhchMN/ZNfRIBERABERABERABERABERABEWgaAQmRTUPZ3ookRLaXt64mAiJwFQIDAwNlCZG6RURABERABERABERABERABERABDYhoJBeAb1FJEQGdODUbBHoYgKyiOziwVXXREAEREAEREAEREAEREAERKAJBLRubALErahCQuRWUNc1RUAErkZgQXhEQAREQAREQAREQAREQAREQARE4CoEtG4M6O0hITKgA6dmi0C3EkDm7Evd2jf1SwREQAREQAREQAREQAREQAREoDECWDNaqVR6sbFadPZWEZAQuVXkdV0REIF1CRSLxaNCIwIiIAIiIAIiIAIiIAIiIAIiIALrEcCa8Xy5XP6S6ASTgITIYI6bWi0CXUsAO1tfRedmu7aD6pgIiIAIiIAIiIAIiIAIiIAIiEDdBLBmfGhoaOhY3RXoxC0lICFyS/Hr4iIgAmsJJJPJJ7C79W2REQEREAEREAEREAEREAEREAEREIFqAnTLhkXkx0UluAQkRAZ37NRyEehaAoVC4ffwBbPUtR1Ux0RABERABERABERABERABERABHwTyOfzX8V68Q98n6gTOoaAhMiOGQo1RAREwCOQSCQ+iF2uP+Nul4oIiIAIiIAIiIAIiIAIiIAIiIAIwCV7LpvN/vro6GhWNIJLQEJkcMdOLReBriaQy+V+CS7aH5YY2dXDrM6JgAiIgAiIgAiIgAiIgAiIwKYEsDYsLS8v/9Ph4eFPbHqwDuhoAhIiO3p41DgR6F0CAwMD85lM5gOwjPw3ECNP9C4J9VwEREAEREAEREAEREAEREAEepMADVMgQp5bWlr62cHBwf/amxS6q9d93dUd9UYERKAbCWDn6yDctf9xX1/f/ejfdXjFurGf6pMIiIAIiIAIiIAIiIAIiIAIiECFAETI0/CU+/ji4uK/npiYkHFKl9wYEiK7ZCDVDRHoBQILCwsD0Wj0vkgkck84HD6IPm/DaxCvxKo4GcFP7xXG73zR8rv6J3/n3Me/86f3IsLqf1fPj7Uc0wtDoD6KgAiIgAiIgAgEk4AXeLs6AHf172vXhZv9u1EK3rW1Hm2UpM4Xga0lwM8yX+V1frJl3vve79XHlVbP488iXgW8MrR+RDKaJ5GU5kH8/PTY2NjM1nZRV282AU38zSaq+kRABLaMwIULFygyUogMY/eMP0P4WS1IUnz0Xt7feSzbfPk9WF66c923ZeVNT4hce0wf3uaXKQtO62OdPMf7m8fCm2t5DNu03oO/997l+qpAuvNZ/zp1Xz5stW53Pn9fbT6/2DfK+nO5zavt9o69fL3Vvnso+L6rfk3bammf61/VdTxm5OHVW1VtpQ+r/X1F+1ffW/e8Nf2tvq734OO193J4ktU2XDEuVQwvj2c149XGbsj2is5s8A82bvV+2OiecPfUmrG8vHjbiNFqvVeMvcd/7X2xeqzHpjLAV7Jfb/H6intgtX72Z71xcXVUXcu7R1kPEaz9zFzRx1UANX/Wqj4r1Qtd7353ba+6ty5/Pleb6H2Or9YGj5H3cO3miKvMAbXcDtXXuzy3VH1uqsdobZu9z8rlz9Xq59RjWz2PrZ2P1rJ3c80aRq/4bFZ9ll9xf1Sd7+6FDe5Hr4+X7/11+np58eJ9Htfev6sNu+J+XOdz6rW/epzWu/eueC6uqsfNI2vm7st1bvA59K5VfZ67R9abxzcY5yuuUdV37/5b77Pm+lXLDbf2mKv0w5sXNvqOu3zfrZmzq+ffK9paNb96f3f36GobLs9dVf92t9xqm9ebk6q749Vzxby2hssrPt9eBRt873h98eYP795e+13r3bPVc57XH689l99b/Rxx8X3Fe959vea+8+YY75ruPPyR85lXh7eo9/6+VgBYj+NGt8vaz8Plf68+xqy9z9g+V1fV+/ybx6yaySu+b1fPecXGbxWDteNZfd+t9x3q3beXv2dXWV3tuYjnhHCc9xx4xXPe6nvehrbX1+o5tHpurm5f9Rzk/l41xq6+NfNCNYfq8VlZnU95Te91xRy6wTOFV593XfZx7Xed116vPWuZeuPH93kZ717z5vj17rXq+20tg6sxiazyYHcv/76GGRuxdiyr5xFvXKo/6978e8Xfqj77l+epdebqDefvjT5Aq0Cd4cNGz7qrx1z+XvDGZfVztNFzrvcMVc2A90b1c/bauWi9dlQ/769e8vIzXPX4e3WXV+catquE6/GYIv6Wx08KiEX8rVQ1h3r3zBX3MO+f1Zd3D7MuzlmstzA5Ocn5TEUEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEREAEAkbg/w8vAzHBYVOFwQAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>
diff --git a/x-pack/plugins/security_solution/public/common/images/modified.png b/x-pack/plugins/security_solution/public/common/images/modified.png
new file mode 100644
index 0000000000000..93aa93a79c066
Binary files /dev/null and b/x-pack/plugins/security_solution/public/common/images/modified.png differ
diff --git a/x-pack/plugins/security_solution/public/common/images/timeline.png b/x-pack/plugins/security_solution/public/common/images/timeline.png
new file mode 100644
index 0000000000000..e33d430ebdcf8
Binary files /dev/null and b/x-pack/plugins/security_solution/public/common/images/timeline.png differ
diff --git a/x-pack/plugins/security_solution/public/common/images/timeline_alerts.png b/x-pack/plugins/security_solution/public/common/images/timeline_alerts.png
new file mode 100644
index 0000000000000..2510efc628246
Binary files /dev/null and b/x-pack/plugins/security_solution/public/common/images/timeline_alerts.png differ
diff --git a/x-pack/plugins/security_solution/public/common/images/video.svg b/x-pack/plugins/security_solution/public/common/images/video.svg
index dc368823da04c..7944b47e2d617 100644
--- a/x-pack/plugins/security_solution/public/common/images/video.svg
+++ b/x-pack/plugins/security_solution/public/common/images/video.svg
@@ -1,8 +1,8 @@
-<svg width="542" height="306" viewBox="0 0 542 306" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M542 0H0V306H542V0Z" fill="url(#pattern0)"/>
+<svg width="539" height="306" viewBox="0 0 539 306" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M539 0H0V306H539V0Z" fill="url(#pattern0)"/>
 <defs>
 <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_699_140332" transform="translate(-0.000194212) scale(0.000825403 0.00146199)"/>
+<use xlink:href="#image0_699_140332" transform="translate(-0.00576116) scale(0.000829997 0.00146199)"/>
 </pattern>
 <image id="image0_699_140332" width="1212" height="684" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABLwAAAKsCAYAAADm2aSbAAABR2lDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8bAzCDAIMigy8CVmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsisyR6f7X8LX3zy+PVXZ5kDlb2Y6lEAV0pqcTKQ/gPEackFRSUMDIwpQLZyeUkBiN0BZIsUAR0FZM8BsdMh7A0gdhKEfQSsJiTIGci+AWQLJGckAs1gfAFk6yQhiacjsaH2ggCPj7tCaE5JUaKChwsB55IOSlIrSkC0c35BZVFmekaJgiMwlFIVPPOS9XQUjAyMjBgYQGEOUf35BjgsGcU4EGLFBgwMVsBwZCxAiMWKMDBsyWBg4EtGiKlNYmAQ5GZgOBxVkFiUCHcA4zeW4jRjIwibezsDA+u0//8/hzMwsGsyMPy9/v//7+3///9dxsDAfIuB4cA3AI/NYMsVXd7jAAAAimVYSWZNTQAqAAAACAAEARoABQAAAAEAAAA+ARsABQAAAAEAAABGASgAAwAAAAEAAgAAh2kABAAAAAEAAABOAAAAAAAAAJAAAAABAAAAkAAAAAEAA5KGAAcAAAASAAAAeKACAAQAAAABAAAEvKADAAQAAAABAAACrAAAAABBU0NJSQAAAFNjcmVlbnNob3S1AYaGAAAACXBIWXMAABYlAAAWJQFJUiTwAAAB12lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyI+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj4xMjEyPC9leGlmOlBpeGVsWERpbWVuc2lvbj4KICAgICAgICAgPGV4aWY6VXNlckNvbW1lbnQ+U2NyZWVuc2hvdDwvZXhpZjpVc2VyQ29tbWVudD4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjY4NDwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgr2yW9QAAAAHGlET1QAAAACAAAAAAAAAVYAAAAoAAABVgAAAVYAAb3msjkN9gAAQABJREFUeAHsvYmXHNd1p/lyz9qwESBIcBcXSyRFUrYoStYuarfVHo89Pcc9f6LPmR5PT5+WZFmyjyRbskhLosSdtEgCILESQG25Z87vuy8iKwsEwCoQBaGAX4CZERnLi/e+iNJxfL73RqXb7U0maZKeeOKzyZMJmIAJmIAJmIAJmIAJmIAJmIAJmIAJmIAJ7HYClU6nO9GUnnzqc7t9LO6/CZiACZiACZiACZiACZiACZiACZiACZiACaTK2npnMh5N0p/+2Z8bhwmYgAmYgAmYgAmYgAmYgAmYgAmYgAmYgAnsegKVlZV1BXiN0p99+ou7fjAegAmYgAmYgAmYgAmYgAmYgAmYgAmYgAmYgAlUlpdXJmOlND799JdMwwRMwARMwARMwARMwARMwARMwARMwARMwAR2PYHKhQvLk/F4nD7zzFd2/WA8ABMwARMwARMwARMwARMwARMwARMwARMwAROonD9/IYTXM5/9qmmYgAmYgAmYgAmYgAmYgAmYgAmYgAmYgAmYwK4nUDl37nwIr89+7mu7fjAegAmYgAmYgAmYgAmYgAmYgAmYgAmYgAmYgAlU3n//3GQ0Gqc///yzpmECJmACJmACJmACJmACJmACJmACJmACJmACu55A5ezZ9yW8RunzX/jGrh+MB2ACJmACJmACJmACJmACJmACJmACJmACJmACldOnJbzGo/TFL1p4+XYwARMwARMwARMwARMwARMwARMwARMwARPY/QQqJ0+fmYyV0vilL31z94/GIzABEzABEzABEzABEzABEzABEzABEzABE7jlCVROnjyjCK9x+vKXLbxu+bvBAEzABEzABEzABEzABEzABEzABEzABEzgJiAg4XU6Uhq//OVv3wTD8RBMwARMwARMwARMwARMwARMwARMwARMwARudQKVEydPRUrjl79i4XWr3wwevwmYgAmYgAmYgAmYgAmYgAmYgAmYgAncDARCeI1Uw+srFl43w/X0GEzABEzABEzABEzABEzABEzABEzABEzglidQOXHiVNTwsvC65e8FAzABEzABEzABEzABEzABEzABEzABEzCBm4JACK/heJS++pXv3BQD8iBMwARMwARMwARMwARMwARMwARMwARMwARubQKV9yLCy8Lr1r4NPHoTMAETMAETMAETMAETMAETMAETMAETuHkIVN5779RkOBylrz3rCK+b57J6JCZgAiZgAiZgAiZgAiZgAiZgAiZgAiZw6xIohNdQwuu7ty4Fj9wETMAETMAETMAETMAETMAETMAETMAETOCmISDhdbKI8LLwummuqgdiAiZgAiZgAiZgAiZgAiZgAiZgAiZgArcwAQuvW/jie+gmYAImYAImYAImYAImYAImYAImYAImcDMSsPC6Ga+qx2QCJmACJmACJmACJmACJmACJmACJmACtzCByrtFSuOzruF1C98GHroJmIAJmIAJmIAJmIAJmIAJmIAJmIAJ3DwELLxunmvpkZiACZiACZiACZiACZiACZiACZiACZiACYhA5d13c9H6Z7/uovW+I0zABEzABEzABEzABEzABEzABEzABEzABHY/AQuv3X8NPQITMAETMAETMAETMAETMAETMAETMAETMIEZAhJeJybD4TA9+/W/nFntRRMwARMwARMwARMwARMwARMwARMwARMwARPYnQQsvHbndXOvTcAETMAETMAETMAETMAETMAETMAETMAELkPAwusyYLzaBEzABEzABEzABEzABEzABEzABEzABExgdxII4TVQSuPXndK4O6+ge20CJmACJmACJmACJmACJmACJmACJmACJrCJQOV4UcPLwmsTF/8wARMwARMwARMwARMwARMwARMwARMwARPYpQSy8BoowusbLlq/S6+hu20CJmACJmACJmACJmACJmACJmACJmACJjBDwMJrBoYXTcAETMAETMAETMAETMAETMAETMAETMAEdj+ByvHjJyZDang5wmv3X02PwARMwARMwARMwARMwARMwARMwARMwARMIBXCayDh9T3jMAETMAETMAETMAETMAETMAETMAETMAETMIFdT0DC670iwsvCa9dfTQ/ABEzABEzABExg2wQqFR0SX8zjv1hgNetHioSfsKxpMimWYjbR5mqq1Wts0bbYIfaZ7sdBV5g4/vITbarRom/RH3Uw/+RX7gu7aM9oJvYv+hhtMx4dwL/4L5ZTGnPEKB9z+fN7iwmYgAmYgAmYgAnsXgIWXrv32rnnJmACJmACJmAC14RAqYvCCU0FU9l0tVrJMosVkklIpeyUEF6VVKvV2VAqp419iwayoCp+XDSbjC9aMfszG67ZNXm58FRxRi1van/mx3g003j2XZt3tu/6IFuvMQETMAETMAETuGkIhPAa6P9z+Q2nNN40F9UDMQETMAETMAET2A6BUmCVx2z+nSO4tK0UTWG7ZvYpxFTMJJzKednajIMqV03nWZxNf35wgcY4b0i2SRqP0VyxIkdt8c05tR9zFpgxjacRXDN9LY6ml7F/3tXfJmACJmACJmACJnDTEbDwuukuqQdkAiZgAiZgAiawfQIb4U6xtPFTrmk8lUNZLs2KpUqqhmEqRJNSFIkIY+K7Vm+kWvXyaYuVYt844KKv8XichoOBzi/Rpf5M9Jt1+hVRZLPpi9NDS9u1aRClBCtMWAizcGjTw7xgAiZgAiZgAiZgAjcbgcqxooaXI7xutkvr8ZiACZiACZiACWyFAEIr5JF2nkZJRQTUzNESSYitaq0moaW6XfpU9GG5TkpjuCRtl8CaSrEiiqrUTDOtTRevFGVF9Ff0jagspBeyK6RXjtgaDgdaNwp9xfZSiKHE+I/aY+pM0bWiX8WZN/mwaW+8YAImYAImYAImYAI3DwELr5vnWnokJmACJmACJmACV0GgjJpCDSGwQmSVkVoSRo1GIyRWKbqQXuxT0z6bhRVSqexAuTCbTlhu25iPr1DEKwSbzoOcykJLbRX/tIL/2JLTHCW+SHcc0V4RCdbt9UJ88ZV3zcfwi7Fu7vtGn7xkAiZgAiZgAiZgAjcDAQuvm+EqegwmYAImYAImYAJXT0BuCvlTRnDVJLQoRF+rEs2VUqPZDEFEGBdCC9kVOosfIZ4QSaGUphIKqcQq2uXf5SbSE688lcfm9mf3pX/0KWSYRBeRXUR55d+T1O/3Y3k8GqWRZNh4NFRqZI4Uo50r9Wv2PF42ARMwARMwARMwgd1IIAuvgYrWf/N7u7H/7rMJmIAJmIAJmIAJFAQK6aRfWRNlQRWWKjaVYor1+khmVfRVr9eVllhEbSG5aoreQnppOe93UQ2uUm5xVi2PJJkiikrLpWyaUFw+tinyqtif3S+eriSdEHC5YH7Z32KuRjiOiLM8Us5Fyxvz/EvBXogwpTYO9cbGkYTXSPKLiDbm9K84UEfmqdRr9Jllxq+vvLE8B7/KA/IWf5uACZiACZiACZjADUfAwuuGuyTukAmYgAmYgAmYwPYJZMGUj0PS8J/+zRaFLyQN65BcpCrmeTOEVxw0e+LC8yCFQg5pGyJotuYX4qjb6YT/CdkVoquIskJA8Xu2zW0sI5uQWoiviuRbTf2uIuGKdY1mo5BeuVHGG6OOGfsS/SU3RYpj0e94y6OWqf9FBNgH5Fcht0bDURxfpneyOtqICLJtDMK7moAJmIAJmIAJmMAfiUDl6NH3Jvx//Bzh9Ue6Aj6tCZiACZiACZjANSCgiCSsDHJIHzTTZET01UhtT6KwPFFbdUmuRkOCq066Ih80URZFG2FL/N7QVAO9KRExFNFSElxDoqT4IH+mPdf5Qi4x3xBe1ajzdVGE2PSYKy+EQKMml8aTpRc1w1BauXYYkWiRhkmKZQgxSbE6y7moPkKPPvFFW1l6xQqtzKmQiC/Gx4ci9zGi4pjcu8yCVbmdYi0d8WQCJmACJmACJmACNzABC68b+OK4ayZgAiZgAiZgAlsjMI3kCiGUjwnZo0XczPz8QqQo1hTZhfhCRIXnKnfSfiG0EFuSWVHzKqKZxqnX7YYsQoJNd9cCEmhW+2RBleUSW9k33ubIua5qCs1UHInIm22EH8V2SbsooE/kVxH9xbzVbsfgQ5bp4FK+le3QX0aAoBvq//k56BP11UsDxBdjL6LVEGWci+MjjVINsM2TCZiACZiACZiACdzIBCy8buSr476ZgAmYgAmYgAlsiUCO7trYNaK5qMNVb4TgardaEkaSRPqU3giPE5JKcU0RwVVEbw0V7UQUFxHwY0WJTcVScWS0w6mKhmg2nBDrtJBFUl7HtumOLG5jimM3NU6bqLQ8IbLKKdZFJ1jHL71dskh5RLpVizpluRh/fvMjx5aCjHapRTZEdmns3V5XEV+IvxzNxvZIb1RbTBZegcFfJmACJmACJmACNzABC68b+OK4ayZgAiZgAiZgAlsjgJAhPTFEF3JHb1ZsMNcnormimRwlVcqdXMQ9F3Mfq6j75ggvIpzyOlIDmcInySVNUxa1jHOqSqzlHWKvvKzvLKGmP69iIVqYaWdDptFYRFsV1o0xccaYMWd7RGRpzOKS0zfLCLCiUH+jrr3YBhdEYE6Z1MrUH/Ql/CTASHdU2mMp/+I8GjN7ezIBEzABEzABEzCBG5mAhdeNfHXcNxMwARMwARMwgS0RQHTVJHCQXE2K0etTq9ZDSNEAEVtooIjkUhQTaXvUrSKiKcui4jSFpWK2ESuV5VX8ntkeR+j3TKBV0cjFs48oh3T4pVqgAH05bfQBeZXXlvIrjt7UBkX7Vc9M0W/IOt5QydsgWUZkcTg8aX84zqmOQwmw4AXHmfOW5/fcBEzABEzABEzABG40AoXwGqho/X+50frm/piACZiACZiACZjAhxOQoVla2qNi9AguIpYUqaRopZgreomp2+1Eil6WXBJdFLNXPfiIisqz0gvxS9OGISL6a+ZnnCPvon3knIj4mk6lbSpXbDipcs025jlSixGU6ZgcXJ4i19hihT7Fedg2PWUYLzYysXZjx7I90iKpaxaikKi4Zitk2LRtHYckjBpfCMKQhKOQX9Gsv0zABEzABEzABEzgBiVg4XWDXhh3ywRMwARMwARuNQLTwvPlwMPclGl65UppG1L0lK5Xl+AiZbFek7CRrJmtaUV6Iil5CkeKeUfCixRF6lRFRFchg0L8bCiijZPMLOUIsFIcbQincpccSZV/lTLqUtvKdVufT9WVDtH583/F4RvyihWzfZhRXvm48ohiCNNWiwUYwDSi5CQLmc/Nz0eR/0ibDIumaC/VNBtS10tRcT0Vt2c+IuKrYMkc7pymFGoRMaYVG/3jpEVHin55ZgImYAImYAImYAI7QcDCayeouk0TMAETMAETMIFtE8iSBFmSD0WSIKkQKXzYTuodqXjU1SJ1keikakUpeTUVYtf+kbI4yRFIRCP1BxRhR8zMRGFtu2e32AHiv7CwoKgvcZZIRCpyTSjgP1KKY0guXZeBZFe/p1THPvW+hgEJQRYeTV8h0jiwuJ6xA9eUC+XJBEzABEzABEzABHaYgITXuxP+jxSnNO4waTdvAiZgAiZgAibwIQSy1JoaL+0dAktyBWdCRFej0UytZjs1W7x9USJG67MMq0Z00VAF1klbRMJQp4s3DlKLKmTah5zdmzcIIBAj1VG8S7E4y7B0WER99SS9+nqrI9FfuhobjXB1+C92zrXB2Gj5OIPIiyZgAiZgAiZgAjtGIIQX/8fKN13Da8cgu2ETMAETMAETMIEPJ4AYycE/m6UJ64kyarXbRYF1FaWnwLqiiTgA4dVXih0RR0R1RaqdanTNBhK50PqH85/dYyq3xL4mzkTVNVXfq9lSxJfYl1ISlxX8VdS+2+mmbo/UUa1kAxMXoYjyivRGbSBCzJMJmIAJmIAJmIAJ7DQBC6+dJuz2TcAETMAETMAEtkSAqKKxBMlIkUKUa0e0EMVFZBeypS3hNU2TYz9FfiFPxpJb3a4ijEhf1Do+Mi0hxEixo7ZXjj7aUje8kwhk+QjjLKfqNQkvyS6uA+mkfEg3ZcrikTdhElk3SF3qe0k8ci3LlNTpdVPDlo+BzV8mYAImYAImYAI7TMDCa4cBu3kTMAETMAETMIGtEahGHS4kCbJK9bqqNQkW3hyoiC7qSUUtqRw6NJToGkis9HqK7Aq5Qq2vnAIZNaIILIri9nl/tnnaOgHePAky6GVZpTdfKqCuqmtS0UIzJKSivZTyWL4sIO9fSbwgoExxpGxG1PyatpPjvLbeE+9pAiZgAiZgAiZgAldHwMLr6rj5KBMwARMwARMwgWtMgEiteFOgUuZyFBFCRUXp9Vu6Jc5G5Bc1oIjmIo2xr1Q60hjLCCLm5RQCjPw6LSBqPG2dAMIL3QXOkik84Q9P1hFxNzc3H9eq3If5QJJrqEivAfXUVEttyNscFQ0Wqmvm+my9N97TBEzABEzABEzABLZPwMJr+8x8hAmYgAmYgAmYwA4Q6PW7ihxqSaK0U3tuLtLnptFD4VkmiubqF1FdEimK8irT43h7IBNRYUSKIVeQM2x30frtXyyi43BbpIdGxJx+kLoY0krbSm9Vq1JbLaeb8lbH2CAhRlQX0XezEXi0x5Tby8v+NgETMAETMAETMIGdImDhtVNk3a4JmIAJmIAJmMAmApVaIVEUocUUYkqrEFKkvrVUH6rVnkvz80QN1WMftiGtiBbqdtbTUAKG+lC5dldRQ0r2JUcYqTFP14lAxHpFOiMReLzJsdVSfS9dw5BiXBOJMa5rt9vTpxPRXmVNMCLukJnIL6K/WObFBESVcW09mYAJmIAJmIAJmMBHJWDh9VEJ+ngTMAETMAETMIEtEihCfCQ1ppMWq9TakgAhqquuOWmMZbQQBewHw75SFweRujiWDEGajEcSLuTY6XgEi6frSCCY50gtLgHXj1RU0lBr+rQlvrieXJ/yymRh2dFbHFXQXteUY8o0yDLiq5SW5e/rOCKfygRMwARMwARM4CYkUHnn6LsT/r9v3/zmf7kJh+chmYAJmIAJmIAJ3CgEqNGFnuJtjExEbxHlRWF6PvOqBzWO2lEbEouC9N0eb2AchEBhO5KFL2Yhu7Aq/GaFpx0noGAsWS5FZ0k65muq68DbMHUtaypo39Z1bOpFA0iwut6yWdH6iaL6elFzTddzfT2iusp01GhPTUb6ZDSd748dH4hPYAImYAImYAImcFMTsPC6qS+vB2cCJmACJmACNw6BXAhdckSGIz6SJEQFxZsYiQxSOuOElEVFcQ0pfB6F6Ynu6ocMKaOF0FwxlTPNkScWXtfnWoeg0heRWFyviMjSb9ISEV91UhyV2thWLbam3uKoi13sp/7pWq2trcULByhon9MZVRuMaxjSkoL4Fl7X50r6LCZgAiZgAiZwcxOw8Lq5r69HZwImYAImYAI3DAEkV8RlSWwQ/YMUoe5TrV4LAUY0EBMpiz3qPimya6C3/ZVRRARwhVTBjvCZnUKWzK7w8o4SAL+Y56lIT4zLEhvi5QGIzLpEJrW54mUCFL3XZ6h6bJ1OVx/VZFPkHhaMel/5SNotmvXMBEzABEzABEzABD4CAQuvjwDPh5qACZiACZiACWydQEgNWY2qIniI7Gq325pT76kSEVxEdeFQRsNhTn8jAkjLs7WdovaTpEk5lRFG5T7les93kgDRdERilaILVVU6yLwcUV9aF9FerXaITZaZqO/VH+gNjpKafaU58rbNUp6F67LwCk7+MgETMAETMAET+GgELLw+Gj8fbQImYAImYAImsEUCBGUR2UVUF9FdUeS8kCA0Qaob0ou6XSG/VPcJ94FCySJEkoUooTK6S9JlpH2o61WL9RsijPY87RQB1e4qhRfRWbpA5fXhjFwjJmQk16pe1xsc2zmajyi+OFbbieTrK4KvV0Ty8Ztr7ZRG6HkyARMwARMwARP4qAQsvD4qQR9vAiZgAiZgAiZwEYEcolPKKjaG+Ih6XciunOZGpBfrESC8QGd1dTUiuqjhtSFULpIp2BU+mqjblYvYjyNqKCfFxabr/LUxXk6ce8fC5h5pmBdN5YrpEbG9GF4hkS46JK8tVm4+7uI9d+53rpdW9pPzxEg0QMaY38Ao6aXuRSSYttckuspabQjPUopx3Xt6c2Ov15foVK02XfvcBumP0UC0QWMbv3duZG7ZBEzABEzABEzg5iFg4XXzXEuPxARMwARMwAT+yARKEYKI4Q1+aBC9iVEpbLyZcXFxKdIY6WSZ8qYjUl+yg3pdiI9sTthjF00xXMZejh/XReQThd0ZB1+ZSZ5faWyz+xb70VYs5jY2t3mltm68bUiyQ4cOB4Y8phzpRa020hu7ugcQX/VaQ299zPyIFGMKSVYwvvFG5h6ZgAmYgAmYgAncaAQsvG60K+L+mIAJmIAJmMAuJYDwIeIqajXJbIyGitbRv6jXpaie9tx8pDRSeL6qVEaieShejuyaKJ1toLcy7spJ5iaUVGlwGESImVJeabu2ZVEVG6cKLP8K/6PF3EC5L8Ks9GRwZIo9yvW78c2UGsDi4qLuiabe4NgIKTjUtad4PempIb06Ha3PEV4lC6QXApXosZJTAPGXCZiACZiACZiACVyGgIXXZcB4tQmYgAmYgAmYwPYIIGUQE0R0ZVGRa2619La+ubm5kBy0WEY/9RXJQxojEV6kq5GiuBsnxsqAY1zFAEjJnDFcxdrQVZf3NdPhFwvRsA5FJIorTXKOkD5s0wrW7baprrdyktbY4p5QqmMpSpkT6RVvbyS1UfdDINAXy6PxUC88yG/03G1jdn9NwARMwARMwASuPwELr+vP3Gc0ARMwARMwgZuawERRXpgKCtRTt6ktudHQnJpdrEeKEcnT6XY1p24Txc1BUgih3UZH3Z5GeElAzQqcPKLYIfaJN1XGUC8aK/JK6xE7sUQ7eU1InqpSQomMi320LwJs2vZu46X+ltKryb2hovakK8KN+m0R5aU3OA50jzDOavGiArbn6SJ2u3D87rIJmIAJmIAJmMDOE7Dw2nnGPoMJmIAJmIAJ3BIEQlrpi1RFIpFa7XaaLyO7kDWIMGma4XAQb2TsKp2RY4gIC4HDj103SUtNRUzReY2jlFF528bbJeNtkhI4IXGK3dE4EcEluTPSh2OQgmWzGQstFgpMHNmnVq0H56KZXTTL4iq/sbOtVNe2pFez6H9Oi11fX1ekVydeYsAGeMXNApvSe+2iEburJmACJmACJmAC15+Ahdf1Z+4zmoAJmIAJmMBNSSDEDF8SEsgMRAapjIgZanshuqjrVRYnHw5JUSNFryaJkWXYbgQTgkr9R/LVFa00Nz+XFhYWJfvm0969e8RhTuvrUcss3lSoaLeGflPHjAlBOBCLgaLdiHgbqJ4VbLoSPssrK1HjrCMBxG+2lVIsDt6l8qeMAoRDq9VOOdJLTLgX9A8O/XiRQT/e4Ink8lsa44r7ywRMwARMwARMYIsELLy2CMq7mYAJmIAJmIAJfBiBbF9qSAxJHeo0UZy8TFcjRY0i9T3NI0xHgihS+GQzkEV/vGlr1ih3cXM/6yq8vn///rS4sJD2HziQDh48GPM9S3tC9lGgva1It1x7S4XY1UiucUaKYh4xpcsQQGMVb0eeRbSX5tSzWpfk6qyvpfPLy+n9s2fSmbNn0/nz59O61p0+fToNVP9s87TVCKjN49jcxs7+QmhNzy4evOQgogHn57UsOUp0m7qAIO0p7bWrD6mOsMn3yfTone2oWzcBEzABEzABE9jVBCy8dvXlc+dNwARMwARM4PoSoPYSEUZEJTGVqWb8lo+Q5JLoUkTTXFuRXRIZ1OcajnJkF29jJHIHycWEQOKYCAnbUCCsuObTcDQMmYIw2RAnSZFVgxhLraaaY0XaXI7YUseQU3y0nm7mgvxVRW8tpNtvP5yOHDmS7jxyR7r/gfujJlWzieBrJCQYEqc8Nkuaqx8SvInsyp9+6klyIYDefuuddOrU6XRanzOnT6ULkmIwztciy6EyVZQ+lNcqQ0caFWmCZde4GOGSEJFE3O3MBF/OQ5+iX6rtRo2ySHEUQyLicjcqEQ24uraW+qrpxX2CPOViIAiDq9pg4j4jirCmCDFPJmACJmACJmACJgABCy/fByZgAiZgAiZgAlsmEBKLaCQJBqZchD3X50JGzCtKpynhg/xBsCBciOjq93oSNT2Jmp0TKVcaBOmDRA9xfsQRUUY1hViNJd/GE1Ir89slaxIvVOBCnjBGZBNjJj2R6K2777k73XffA+muu45EZFd7rpXqTUmYi6asYS5auc2ftFFGx9HfkIP6CiGnbYPeWGmO3XThwoWI9jrx3nvp+LvH04n3TigVcjlkUSn3GFOkBOq48E1626EST/mljyZJJ9xRPkeuEZY3XPvvEF5xytynIK57hT42GvU0J6HYqFHIHuHVV4RXJ97kibSMSZ3kvqLDIfG00sIro/G3CZiACZiACZjABgELrw0WXjIBEzABEzABE/hQAkTnZDMSckTCJCJ1JIqaSl9cWlqKFipE7Wi/kcRRpKUpNY+6VPmYDz3JNd+BiCjqa9H3seqIIZCqEir0fTyWAJP0Kif6Tm0pIo2oL/XYY4+mO+88ku6999506NChSFFUQ3ncVb1ZcObYso2L55MZA1Yopot3UYsbU4WdtAIJlKcZ4VWsqVUkhYjS0jSSDFpZWZX4OpXek/g6q/THV199Na2qBtiaIqSGGn9cJzU3GqlxdWg8yUIS6UWaZUS4kWepi1RKqeJU13RWth39Ka4B9wqjJdIL5tR+462eER2ovlPjjPuIe6iMYGN/ZCSIiEgbq9/xJtBr2ls3ZgImYAImYAImsFsJWHjt1ivnfpuACZiACZjAH4HAaEw0VH7LINFRpJYhSxqq2UWtKmpWIR9GqkdFNNVwIFHRL1MZie5CbFz/CeEVMiTEysb5c2ocUVxK8EN+yQUR5XXo0O0SXY+lRx99NN19972RqskY69o2HBYF+CWZOL5ez9Jpk8hCwmycBr/0gd8zm1MIrmIFhC7+PXtwSXCiRhGIOYqLCK2crjlUBFtX0XRvv/1WOnrsaHrzjTfTiRMnJL5WI6IN0Ud013gsIalrxBhog+sYElDby7TT2T5eq+WLhRe3BGIvxq0xUAOufLtnHpPqeSktlgjBUnpxf3EUKYzsA13ux7x8rXrqdkzABEzABEzABHYzAQuv3Xz13HcTMAETMAETuM4EEA9ZePFmRQRDijcQUnScIvVILyQMBce7qrvUU02pSCEkBS0m5MR1nnRKRMhs2ttGeh9jQE2NIqrr8OE70uOPP54++cknFNV1R0SFlal09JzoLybEEOl0FQYrCchEK7PTrOTatMxOF2PQweWqOE/R2Oxy2Xa5X7XeUnSZIswieiv3LQuinPJHH9f1dseTJ0+lN998I73++uvp3ePHotaXDlH/GzEG2i1TOFlmXKWU4ve1nvJ9U4xCs1Bd5c/4rQg7UhuVHttWtBf7cw2Qc93OeqQ5MmYEV1yDQnhxKTyZgAmYgAmYgAmYQEnAwqsk4bkJmIAJmIAJmMCHEsjRQMiVMBNRFysK1Ut0NerNiI6KIuuq28UbBonKIQWtFBN/PCmR0/ToBx/eAziKFMuJUjFr6fbDh9InC9F11113qQZZU0IlRz4hVhAwDaVE9gfUlNKYFBU1pzG3tW40oKD6RcJLeEr/guya3V6uz2s3vovdpuIrzKF2Zn3eJjWkhRwLhaJThFZxOGOqqUYZE+mNXAOOrytaikL6vOnw2PHj6cUXf59eeeWVdPzYu2l1rSMWEnch8cqzFw3G7FLrZrdf++VwV2oWITmnumnz8wvRv/GE0VajKH+flx8oio37KmhYeF37C+EWTcAETMAETOAmIGDhdRNcRA/BBEzABEzABK4XgYiUkuxBBlHzqSnpM68PReqpp0TkzSCkUDeK1Q9VLwttEpFRLFzO9uzgAPAh1IYKgRRdIAJKEV0SQXv27E2f+MSfpCc++Xi66+670sEDB0O2hKhjjBoTMonaUYyN7jNuRBIpgEkiZqJtl5o+6lCJbIpoKDUO95CMM8tDnQCxxbVgG31lXq6jDhn9ZqK/9OfC+fPp1OnT6aWXXk6vvvZGev/9s2lleaW4nnmsnBORlD+a7ejEGDdOwLViYhy87XKuPZ9abd1bYs7EWzUpZN/TZ6j7LI7V8VNWZQOxt79MwARMwARMwARuZQIWXrfy1ffYTcAETMAETGCbBBBHRNZQQ4ki8NRaorg7BetlKaayq1sWqVf7OSKptBqF0djmeT9sdwRJlh6cUGmK5QFayMuK6EIOSdbVFNG0uGcxPXD/A+lR1el67NFPpIO3HQiZQhuII2pDMUaEERFQtbpkkOYcHyma7Kd9qPd1OYs37UPRl4t/Xyz/SkJl16WCYkwMgPHFSGaWcw21vA/1x3gTJRPXBwmWa3KpfzqmTOcMkST5de7chfTa62+kl19+Kb2h+fkL5+XusjgbkSpI1Jfa5B9SCS6IP6ao70V3rsHEGDdN+slQeTslc+6r+YXFSJflvIhKpFePdFlFETJOOlj2MXPa1KJ/mIAJmIAJmIAJ3KIELLxu0QvvYZuACZiACZjA1RIIKaRC7e32XKSdNRWJg50gRXBNNZZGSjfjrXplyiDRXVEzqxATV3veKx2HIBlTTF41xjgXMgoRhbdBYCFK+M3yodsPpSeffDI99dRTsUz0EMIoO5ztmZyx5NooaoBtiBt+0kroIi3EfGNzFjqR5yiBg6mJnuXv4mcUuY8N6hdSiL3K1MhYr1ZrWlHdvDJvuuJ3qZhyJNiZM2dDer3wwgvpuFIee11FTel4BFlVKZLIwYFePEB0W1M12hhLXymcme8VT3RVG5FcTNxjTKRpRm24uVwjTr4x+JFaurq6qppeHe2lXuk4jilrrMXB/jIBEzABEzABE7ilCVh43dKX34M3ARMwARMwge0RQCyUNa0WFHmD9MpRNbmw+OrK6jQyKtdYQlBIeNU4cENkbO+sW9s7gn10khBYirzibZGIrqhTpd/tdjPdeeRIevozT6ennnwqLeiNksNhn06F2NnaWTbvhW+aMDZNoZLCTOkLYaP/skhDExVTIXLK36XYicO0C+tjudiB5VgJ+PjwM2+sjCR4Ygd22uYkKcihI6Wcrq6tpTfeeCP9x3P/kf7w1lsRPUWBeM6D7GJCPOVl1Txrqb6Ztu/ExBAZJ9cOVFWJVaK8WkqZ5bzUUWMiyqsj2UVtsixWMx7oeDIBEzABEzABEzABCFh4+T4wARMwARMwARPYBgGltiGP9Pa8+YWFKO5Oqhlv0RuorhJRN2UNKaQFAoJUuJ0WXnWEDOmHRXTXQCIrItHUVwqe79u3Nz36+GPps888o1pdR+KNjA0JFKzKUBFpVy2Owq/wVUROSdJk8ZVlFDIwPhAOOaWtMWcFp9/4EbIHYaP/yrVsjyAu2im2xSlZZq9yx2ht619VpWjWlNrIteI6UYj/2NFj6beK9Hr9Nd7meCL6GeePqCq95RJhWQjFrZ9pe3sGA31lWUkapWp5qZ+kz9abjbQ4vxjeb6iIM94E2pPwQnxFCqei9yLdcnun9N4mYAImYAImYAI3KQELr5v0wnpYJmACJmACJrATBBAgc0ovm5ufDwkRhdJ1oq7exthVOmOn05UoyW83xMUge6gHlVMaJUxmBM+17B/NUoQeuUbRfAQceoa+Hti/Pz39zNPpcRWmP3LnHeqDalypj5tk1FUHLElISfhNpzA2+pWtVPQnDA29QV7xL3ZniZV530Jn5T6xnna0Y9So4nd5inwwazLT8kSxZutfExk+0kCrik4bKRWUZnnBwKlTZ5Ta+G766b/8NJ08eSqEEnmhY0WTITrpJ2+BhN1OTNEuQ5ddy2OnGD/9pF5aLe3duzfupwJbRHghWbne7Ec/PZmACZiACZiACZgABCy8fB+YgAmYgAmYgAlsmQDiamlxT5qX8CJdkBpUuI+OIm3WlRoX6WW0FmJGekQbyw/WZsbXbPmcW9kROYIQyaYpiyL69bGP3Z+e+dxn06c//Wm99U/F5yV4ot/qO/2KQuw4kqsUXlGvCwaIJ/0nG6O5IpQ0m9CB4reUUhohAim8DoeSBbvrH+XgIxJOcimWaSz6JTFH+ywDD7kW/6mF4jzasv1JJ0H6UZsr1zyri4v6qFc/TtT53/zmN+mF3/4uvfbqayExgxN90n9MOXovL1/Lb5AFv0J4MWz4ILPo556lPYpMU7SXrjUSrK/C9WsSXj1JTg618LqWV8NtmYAJmIAJmMDuJmDhtbuvn3tvAiZgAiZgAtePgIxCu61URsmullIaqeNE8XDeWtjrdSOlcaMzhRmJFWiLcppdX6776HPkFXWn8lsT1Z5O88gjj6Qvf+XL6aGHHlS/KayPzMl1vZjz5kXqfUWE1mwXt9Ud6Rja0DFILLxZyC2dn/lAYm2o+aj4hGSSuArppT5UKjX8jiSXpA6ySz+0ZvpphADTb52AfZBhCCAoZul0dR1HHtEXorpK4UXL+c2PlShef/SdY+kXv/hlelXSq6vIPd5aGcXsdexOReoxsBgbjBB8fLSG1EZqwbXbrShiz/2H8CKtkahC7j8izyy8hMuTCZiACZiACZhAELDw8o1gAiZgAiZgAiawNQIyEfv37VM9rlpq1JQ+qILi3fX1tLy8HNKrqjcjIp7CWJQtSlhEKp/msW3TxnKnjz5H1CBFmJoqcP7Qww+lr331q+njj35C50Xs9CW4crojEV4t1e9CeI0kTJA4WSFtvx9jjXdCO4pIGkog9TUfjFXPDJkkrdVRBFJPIgbpxe8QX9o2Eg+kF5FTWWQhvFSvSlKnrjV1xlGpp3azGb8RX41qPTW1P/sg6iqSVdUQQtvv90hpnQg6rhnhaDQTLxdQ2/m35JfSA48dezf98pf/rmiv36Zz595np4iu2jHhpT4xxfd0bLo6CC/9gxfptEhXGETtOAlXhFxPrDell24fi48wARMwARMwARO4iQhYeN1EF9NDMQETMAETMAEIIDJQP7OCqZROITmQGrPTjKNC3DAhg5Ah8ZZByQbqcJEyiGyI7dpGm+uq27W6shLRNXn/ou3sntSZQnjpoLyq3BDNbOuL8SA+qDnFRP0pzAiRSqgkfvM2v4cfejh98+vfSA88cL/OOYmoIN7qR4QS42eKqCaNcaxC90FL4+OtkkRNcZ7y7YqcgEijMn2QVMWI4oq5xl8dp3MjRbkhuBBb+vA2wyGRXcWHVMYy8itHduVrRF9iTPQnPvm8RHhV1c265g1FgNXFOmSXirc3GyrgXm3odzXt1bw9QZfl41mapj8W7cWZ1BbnYuQxeo1PA9UvjuNoJi3BNz5VMSblU5FrGvDRo0fTv/7rv6bf//536fz584oC0970Sy8KQDTG0WomCscj4tTG1Qux3F40OvtFv4oTNSUB5/R20GazrXOp9piuG+KSe7enWnJIr5GkI/OyH/QpT5lDBjF7Al3nmbFkHnHCOAdLU/82e5iXTcAETMAETMAEblgCFl437KVxx0zABEzABEzg6gggc2IqZFPZCiqBLYiMPGW5MPsgjzyiODkpY0RKRdSUDopIpBBgikhS+xzT76tulyJr+pIMyCSURNYvRfPXeEYKG2cgjQ2RQfoic0YxqY1Sc66WHpHs+tIXvpj+5MGHU1OCiD4hO6J+VtEfpFXJgoWJJE3U20J26XeWXTSq/2hf+48RbcLGpyfB0pNQ6Y8G6VxlmE6MO0lxYiF8kHFEkFEbi7TJLJCgfumJ4vFMxUy9zcsIL+TbRO0RyYT0om5VvLEQAaZreHt9Lu2pSH5JPLX0aWh9TTIqor4kb6JN+q+2QrQxbj4aC+3X+HGZiV4xDvo/lBR8552j6fnnn0sv/v736czZ82pT4m0qvBSdpjbLem4cU4qmyzR/1asj0ktjbzaaekvoogRnI1JZaZD7gZcnELE3lWDIMI0Dlgg5rgl/Bfiv6bXhhyaE53TSOtayD/uLWnCcbveCCZiACZiACZjADU/AwuuGv0TuoAmYgAmYgAlsj0CIIB1ChEs85OthvRQ/IcMwIEzFg36e5Qf8miRRQxE0vPGQZdailJhH4XI9+yMzqJdENA2pZAiRaI6voulYcQ2/6HdVKX70ZaxzE82D/JILiv60FxpKY3wgfemLkl0PPRKCI0SQxrKmKLS6xkPXSsdTdhOVMQg5pRRCiqEjv+BGmmO4DokcnXsge6SRpjWJrtVhL60Peqkj8bY6GSTFt6VxYayi3YIvswLxZUmU/Ykd2L/Yk3kpafK1k8jiKqhBPsiqPYrwWpTwamts8825NI8EkoRqqwJYHXfTH4bYCnmmn2M1yvmY068rykn2Le4fduZ6v/POO+m5555Pr7zyejp75kIIIO0W0XKaTaedkl2cIN+/yK16pDXOzc3Ffck54UIdNyauQ4hH3ZsRcadrRb05XqoA5JJpyF8GcakprmO50cLrUoi8zgRMwARMwARuZAIWXjfy1XHfTMAETMAETOBqCBTP6DzU54mH9fKjh32t5kGfSC7SFPMb71Q5SrKnoZS5qkRXTLIGCCYmtkWBdy0jDXr9vgqbq1A9EkHyiZRH2p2o7tNOTCF6kFEaB+l2TFHIXOvo/8MP35++8uUvpMceeyz6h6yZlwwhuqev/kZhefp3ic4ht3AbREgR3cWxIVDEp9Ksp65kydp4kC4MOul8r5OWx93UoU6X4qZQfT2ihoJpllGhU/Q7Vsb5LnXW2KD+xI75R/k9u0rL4V24EtFMnpO6OKf+NmWwVE0ttVVTbVEReXsb82lvvR0irCbh1dB2or6YmCHmSOyM/krkXXbSJq45wpRPQzKNwvBvvvFm+t3vX0r/8fzv0qrejshFD9E0c01gt1MT5yL1kDmya2FxSdFehcxUPyOCi9MzNM0jsg1xpz4NJCkHqvOln4VMlKhkGxFg2p7f8smxBZdNwyj579TI3K4JmIAJmIAJmMC1JmDhda2Juj0TMAETMAET+CMTQPLwtD+tqRUP/1ni8GBPtFMIrEiRU0qcBBfRXOUDf/mcj1Rg4hg+pDvWJFmQXN1uR5+cysg+yDAsw6SIsGHdtZ3UK0k1dSQkVlU1pNSreGvkvffck775Nb2N8WP3Kc1tQemLiAxFaKlPfBAYpDQylWOb7RuJkhWFPTG+2K79VRorDTX8ocKjznXWIqrrvITXMtFdE9XoUq33sYrgR52r6ZiRP7Mtf9gyO+tzcafKVWqsvAazLXEtOIhotGqRrlfXqpaK2i8pzXFvo5321Fppn8RXS+NCijFGzhMCi3Fyua4gvGDL/cCpSM8sx9XpdNK7755K//yTn6U33nwz6rfRN+457rd4S6aOyX1ky7Wfylpb1PJaXFyU+JrXddb1o59cb+5VrNYMWDjSJ+4NhCnSltTYiP5S9FqkjwZX+puvY2bPNYpVIULzD3+bgAmYgAmYgAnsBgIWXrvhKrmPJmACJmACJrANAkS5hHBAmOg4al8huEKASQy02yr2zT8th6TQNkQB0U0RBURUj9qIY9mGaNJUypJ+T9FdinQiyotoKMQAbbH/zkV4ZX0RUkPnIzoNsXHnkbsU2fXl9Pmn/0zpexJ9jE+F9TuqL9aTmKsq9S06pmNmp+hrsaIuIVSVGKJ8PSJorOL3qhKWlgfdtKxxnllfTj296bGrUKm+IqT6kmBDtTfSvKoD9L7H6AvNZfaxFLpl81mLE05n2qrjM7npyqmmQdlMJ+063a9stEKsVo4RoxWkF5/2WG8ynNTSXfsOJr3LMC2o/H2LIvOMU8y4RmP1PaTX9AQXLdC1kEbcPznNM4vUiq79ML388htRyP6NN15TpF8v9qkrJRTMunXy/XdRk9fqJ16K+5sXK8xLdi2olheijUi9mIKPaGk+lVaxTlvVOWQYRe0RX9T6iggv3fMdRSxyT22eygN3dkybz+lfJmACJmACJmAC14KAhde1oOg2TMAETMAETOCGIpAf2rOIymmLRHGRlhYF6ZX6Vk75+X7jIZ/UL2RAX+lwyBtkWVOFwetKmUNqkdaG8CLCa1iksYVQogkdO5Uy5Qmu0Tz7KkkanSOK18tD7D9wIH3m6c+kL3z+C2n/ot7aR7qedqRGFal7pDIyHsQIFqlUF9o0neSAFN2ljxYoSD/Uhwiu5WE3IrtIY1yR+BrWFSGk9MYJ8kdCbChBwlsYK5InTdXSKtssZWOcAh6549PzzS5kVaW+TXs2u5U+Fb/pu9raNDFGpVlWtFNOTZXY0y4TIr4Go1ST1DqwsCctVpuK+GqlPUWao15DEPW9pH3EqBBEmxrOP4ju4o2TIZYkDWFX/lY8X1pZ6aTf/PY36d9/+ct07NixiAJDeDHllNBYvOZfcf0lYZlY5sUKC4rq495mQsohZmHBVyWizhR5pns3T9xDeRvHxz+4abmzvhbHcs8wBkRYuZwbLNsomvLMBEzABEzABEzghiZg4XVDXx53zgRMwARMwAS2SUDP5KRnEdHFG/2iAL1EBNKHdVG7qxAGl3p870porSttDXHDvhxPjSRkF1IAyUVKI1E9kTYYYTQ5+gtJUCuiwbbZ6yvsHnZC27OcoFg57qIi6fTEE0+m733ve+ngbbelquRMBUHB+LXDQP3va11L/Z8n4mttPaRNKZEYOy0jvDQszXUMsksS6Vx3LZ3trUb6YkdRVCOlLg45qbazXxwXUkSMNGbFxmnD7BDKHznKaHbL7DJHjsVrDEMdQp+YmNNP6qIRdRdt6zy5o+JAh7VyIjFZkbSKCDyuDx/9Q9KEINMbHheV3nigtZBuay2mA7V2WlLh/zlFgI1J+yQi7jIT6YLII9IZyynOq1OPBW0ooba8vJx+9rOfped+9at04cKFiBZk36J7WipHVLbw0ef0gfRbJiK0IsprfiGiFrn3kKE91enK9eXy2zwRcUjbRohbBGOeop8BN/+mqD1RYqS/5pRH0h4lTbWO8/L348kETMAETMAETGD3ELDw2j3Xyj01ARMwARO4hQhUJXTyA3kxaP3goZtPRG4p0ohoqouVAsJjfn4xis8TpUPNrZySSMRKrlGFSEGYlA/2gwG1jAbxkE8BehpFqTQkCpb27IkaX6R+tSQMTp48FRKEfnxwQrRc3KMP7rW9NTqP7E+0ileif5oeVXF6ZNehQ4cina0pMYTuydFdkiExBo5VGh8HSP7UtFxTah8OiVYYP1FaI8nAvjzIeYmuc4ryudBbD/HVl1cZKbKLWl5IKYam/0JG5Ygrta+VH7wKnPDDJ+TZ6fPL6vVmkcI5uADILup0cR3jrZmax8sBommJH/W/Vhg8ri3XSBc8VXWdag2JH71Fsy4gLfVxcVRLd7T2pHuU5nib6nz1lao5lOCJVFTGpvNx0ri3GGV0IvcjTjf7pT5VFfE3HAzTqVOn009+8uP0q3//95BDyKUhqYWBPreLmKL5umQlEhZherUT/czpuZJ2GjNCjpp0C5KabaU3wovIPoRXV5/hUGPU+BClvJCBfak3lwVwVG9TV/ir4R7TP/1taPfoL38TfcmzvlJ3qfdVvgEyNuoo9gMUc/rCFFJM4pFN9HX6NxtrYhd/mYAJmIAJmIAJXCcCFl7XCbRPYwImYAImYALbIUANLYRHFF5nroPjsZyHaKJ9+MVMU1URSMipiMbSnCdw3mCI7EKWFE/mPH1H9M9IkU9IiEEU7da7BiUNsgzLbRIhxPGtlt72p6LgyALEAg/zp0+fmj7c57Nv/i4jqDav/Si/NEg1SsRZnsbp9tsPp29+65vpsccfj/GpW6klkRI1yJAP+iC8yknlqlSjS0KDj1ZWSEvUQWiYgaKczhPVNVYxesmN1X4nrUuSKNYnZNdYHEJ2FY3F8eLDOMtT5FbLs219jvDqKFKK48u2Zo8eSLR0O93YBnsim4hSQn41dF2bpFhKygyVYsq1RSYJwjS6Lcap1NQ5RXXtV3RXuztOre4o3d5aSocPHkhttRUpmOKC6KxL/CGH1tbWUlvXnuVLTdx23IL0qS/p9cILL6Sf//Sn6Z2jR0OCaUCCQ3SaOGtxNMyylf1zPbDyWl6q9Suv0zDjvBFxSDSW+s09zssKeGsjfwdEZZF6i/BCWNGJMg2W1ukDb/ZEfsEMScffSjnFywt0ItiUImuoNNFOd11/B/lvJ9e4yyKN+mGIrUh/pIMcy3ni71Bj1rgpju/JBEzABEzABEzg+hKw8Lq+vH02EzABEzABE9gSgRBeelCOiJvCO/AszcM0Rbd5wCZKpUw5RILw8F5KBhRK6SvKKBMimpBbRP5E6paWqdcVb7SjbT2mE8XEeRArS5JdzWY7+jvUfsP+QLWblvP+sfaDXzspvEaqrUWR8s9/4c/Tt7/1bQkLiThFaBG5RfQQggHRpYy9kF70jv7Uis9EUV4hzsRt0tTbJiW11iX9jnWW07v9FQkLCZT4iDEcCLxSm5fSM5vHWVygD+K44poQZUSc6V/g194x59zFMn0icgs5SURVRODlGyE150g3VUH6WjM19IZGos4Qk1HHSsfxQoKmPtX+KC2oiP3asdPp7RdeTnu1/+c/99n08Mfuj2vNV5myigjFsCFpLq3hkF1KbRV3RBH7XTh/IT3//PPpX3/+r4oAPCkhqyM5HomkgSBoc781KLWd3+h5RTSX36j2ctu6LhJe3LsIp7n2XGq1W0ptnNO6UURlIQtJb4QJfwtgmxRpnLSB9CJ1s6EaZw3Jw1Yr17bL9bvy31hWV8Wyjh9KMPL3Q/ojaY+wYKItTsLfWpwIepKPpfSy8Lr8JfUWEzABEzABE9gpAhZeO0XW7ZqACZiACZjARyDAwzIPzqWswhTw0M6DOsKAIt0InxBdSi8jIqvcN0d1SUxICFBoHFHCnAd0xAOpWlmkZaURkSlan6O88jmIltm7d6/2UyQUEkXHr62vKxWuF+e53NA2i6DL7bWN9dGghIzmjPHBhx5M3/2L76b7778v+sRYYyzhHSRBCtmFsGIiugvhxRsKGTu7jRuKuFEw1MqgF+mLxzoX0qmhanwRlYSoCdAcTSNcA5avNBUnu9Iul9gW6Z+K8OI8iEYmfoV01Jx7oKLxIdwUgxf9J7UuX89R6upNlFVJzsUFpfOpVhfir6Ixoqr4THT9FyS3tGNaP/l+Ovbia+mdl19LNQmwp574ZPqipNeRu45EBF+MU/IIwca170tuXm7gSCBIwir6LkDHjh1PP/vpz9MLv/2tpOharEe4FQmlIb3CBenIfJx2ucopro+OzeIXOVdJzZbknwrYL+mNjfwdIAl7vKlTteZISeTe5rLmKV/QuG80BiQxUV/IVCQy91SkjhKhJh5TqSXWpNTytzQQnyy+enE9aLGUW/G3q98x3kJOl30uOuCZCZiACZiACZjAdSBg4XUdIPsUJmACJmACJrBtAno45+E6ImMkF6L+Eals+lCInXTDi6f8UE1BcYmtEFyjSO8qZReCAKFBBAv7hnjAWTDpib0UZjz8Lyi6a2lpKfYluqjfG6TVVUVBqU9Xmq698OJ89DelgwcPpq9/8+vp05/+00hVoyYTUTkhM2SJ+IfoKj/4jUhn1NgQQPxHimJPsmt53E/vd1bS2fXVdHbYSWuyYojEkDScTMcgj2By8VSuKSXV1dYtCxlHNBQN5lNy2iy86Kt+MfoQKOobKZDIF4rNjzRf08sFero2RO0R3ddut9OcIvIaihqrSXa11Ha1q3vh/Gp668VX0/FX30jjjqL7uoO0MNdKT37y8fRZSa977rkn7hPG2tLx1I9DEkVnLh68fke/IoKsiGhS53mZwUsvvpL++Sf/nN5+++0ihU/nJ4KtEGO5vSxxL9HsllaV4ijfq+qigNF8rtHVSHv27A0BxvY+0ViK8uoqygtJWEpTbiYuMZOGEUIX0vlGpikAAEAASURBVDm1Mb/soU7klyLYeLtpvic0bu794sActYZEJqJurNRT1UTT39y0XfUrR4qROMu9pZvOkwmYgAmYgAmYwHUlYOF1XXH7ZCZgAiZgAiawNQKkpfFMHmJKESekXrUUwUIkCw/gPOlHNFLIBD2MS3CQnkg0FgW7iXDhAZ30Lh68EQClEAu5UsgcBAuRKUgJ5sgMHvyp3dWea6td1blS+lZHD/TrivD6sGlnhNdYMkeC5qmn0l9+7y8UebZHdaZW8pv5JOeo2VRXnSqickrZxbiYkEr0KWKRFL0zlMy5MOqlM/3VdKazmt4fKGpNO4wkz5iQZgFex8AMI6LvWBULsZdWF8KEdXFMsX47M/pV1hXjHExldBdzri8RXDlNMafPIU/iJQQSd9whfV3nrqLuerpGyLGmrt287pWFilJSq4ruutBJ7/zu5fTW719Jgwtr4qRrrHpUSffK3qX59MSTT6UvfP7zae++fXGvIBDhyP03O97oXPGlu0r31yAioegLnBq6N8+efj/9VLW8nn/+15HmOFIKKY4o36dETUmQ6R+C7mon7uG4LPpiTifjb0Q8kEpLujcQVaQ58jdAHS/+HqjlhfDlz6W813Wg2lAf9bcTqZG6P6JFNUybSMSmIinj7Y60qb87+p9PnG8A7RYTNcOInOScEUmpNiN9NraWN0ve198mYAImYAImYALXh4CF1/Xh7LOYgAmYgAmYwLYIENVDalVEmZC+qBpDdVLE4iFdgkYP6lGUXk/wOZqln1OslGo1VqRJmaZYRoghZUI8FGlaIQ2QBeoVbfLRlz4qAK9IoaXFpTg/ImCg1L+1tXWJlVxAPXa6zGh2SnjdeeRI+u53v50eV1QSkgORR4QX81iW4JFSmQovxBdTKbxCUvDmQsmaU73VdEJ1u86NJPGi9BI7I/vkgRQ9hUchmipHJhWRPVrHlN/OWC7n+ZV4lHtcah7n0Vmn8uwSO2WZRlRX2J3iWhGJpuuuQU4UQdXXIDujflpTCh911uoayNy4lvamRlp56930h1+9kNZOn01tSUG2w6Kht09OVKx/3/796VNPfSo99amnIoIuJBtWKJ/uEj0SD/6pnhp8kEy8vZAIK+pUvfWHt9I//ejH6a233lbUU0/rstwq7z3sIwL2aqd8/6t7SNyik3HvqkFSG5eW9kgKqyaXBBXCibRDZC21vBi3bv+4FeL86gZtcPXBiyQr/2647/PfoMbIGx6JoFOqJ+cqx8JyHKvjkcsbUZV66ymRX1HjC/EVJ4pT+ssETMAETMAETOD6EbDwun6sfSYTMAETMIFbioAepfWcGw6Jr2JiHY/ZTPGgPrMtVsZ6CQvqCfGgTTF6CrLrYZ4H51yHKj+kx0O2HqyjppCiS8rIkghn4hlbD+Hsk8UAD+f6p/PlyBMe3PUbuaGJKBfW8ybARcmuBb31jvNxPLJgdWUlR/3EI34c8oGvGGUe2ge2bXVFSUpnDnbMW4pqe/KpJ9Nf/uVfqF/z4ZeiXhKCQv0DJ/Wr2DDRmGRh4nTUsKoQYaRtvGmxJzF0XtFdJyW7TvVWUkcxUqOW6p9xnCJzYrwacwgo7Q8beOVzoMNmJp0z91XfMeb8q8STJRbrSiDQ1zHFz2JvjY7zsTJfm/IMsbeuB32a3ifqC3vG9dN6qZhofqzxjjTuvgQWUUa95fU0PLeSKufX04kX30hrx0+mpuQYSnBAHTcdW9f+VZ13pM++2/anZz73OaWKfjot6r4bqY16jF3NR6c5Z5xZLWiF/ivvocynvNeriqjqpX/5539Jzz/3fDp3/ryiq1TcXfKIe1gHBdNoqhzoNuf5/tVBIc1KmES7aVljWlxSZKKEV0uSGKwUl+90OyG9OBWSOP6GxDb/bWg44hr3CPeS2oG9VuW5vrmlWFEpxBf183hZBIXq49poc7RVDCxefiDOpFRSC22kaDj+vjam3H6ApG0dl/nmvuT92JAnbaVbnkzABEzABEzABLZJwMJrm8C8uwmYgAmYgAlsjQCyiBQqHm4lYHAwPLRe9HBLFIkeqafyKepI6UF6YX4hHqbzA3X58JsfjBFcvZ5Eguak8zHnXLQdD9FX6GA8yOucpJuxXNW5eKAeS5wxRXSXaneRQslD+kBtd5TKSDpj+XC/Ew/f8dyvhmOkMhUTRW6BDWtx/733pWe/8Wz6xKMfDwlR7JSX84+QRkQeVSTsGopQQ3YM1lXUXcOqKRJsqLbODDrp3e5KpDMuT8QvJAbSgtPA7iomDitcBnwQbkiivEwUVo4Yi0gz9ZUhIdj4MFYEVAgNfkdHYsixLYqpa12u26UIIu3JWyhjo2ZNAOm6IeZog3sCQdpf76VTb7ydjv325TQ8u5Jqa73UlKoi7bOvCDai3OCj9zqmrozguFlN933sgfSFL34xPf7InyhCTBFg9EVtjqn4r0Ui32DUpD6YzkfqXmzIZk/LTByT0vHjx9M//uOP0ssvvaR7R1pRIon7iXpXNUVejYpC/bHzNr+CrbpUFXNYBn4w6MO2pmqTzev6t+saMWNQnzuKTLywqreLKtqsrhc8cEz+QK38lfdlBGhFxgqjfN3YX3XKdIKq0h4RXSGiibzUvUXkJTcR1w9xxjLnhRF/n6Rwrqj+XZxt5u+Uv/0QbdqXfTg+S1b6QE+KfoqfdvFkAiZgAiZgAiawTQIWXtsE5t1NwARMwARMYEsE4rk3P7TG/jywzvxkXUSF6AG4rlQ76nNRiJ4IKyQZUwgPyQWOQ2jlh+cickSpWhGpoofhkF3aPx6Yedjm0fpyD8jazH7ILHYN4RUP3Lw9rxJF4BclvEgJo3YUEUOdzrqiZJTOyAGXa5cOf4SJXjPRByJiskUap/nFhfTMM8+kL33pC2lxz1IWRepH9AUtkK1YmImRpIwGpPRP1TnTtpGia6KgfL2aVpTyd1o1u95TZNcFFazvSeQQ9RXD0fgL5NGHbX1JguToHPrCkfqK/gkV7RdRWnkL24olFnXyECqaZ/XCxnztomcFa2Z8Ik1TuyB2mJqKOJro+nD+kGjaqaadzrx9PL39wsvpwrFTadLpp6reyojc4nzcFxVFhE2QVmqnX9f55hrp8L13pyeU1vikhNfBuaU0pxarureGSl1EJNIDBFJDvDl9RL2xVHaGDuk3/VxX+utzzz2XfvzjH6fTp88oUpFINPVRc66XbqvYl+/tTnE6xqAPwouJc/J2TiLl+JuZk/Cab8/FPczt0VGE4rKE16A/ZFRxALxDanG0+kYbRAbSfo64y+eo6e8O54fwkpLKQkrsSjHNHElFrS/+dvM9AIm8bwgwNb22tqZx57/dUoJxStIjpwexQueHb/QnvviR7wk2ezIBEzABEzABE9g6AQuvrbPyniZgAiZgAiawdQLFg+umh9mLjuZhuKaIHKJfmtPURT0AayolCstE1wwjPaofaVIR1aXIESaeiXlADtnFwzdP3Fd6QI5+kaZHRIke/1XEXbtHTSTezjinOkXz80qnpDaTCpuTkkZK2EDSgLbZdycmxkAKJn2YaLx4AMZ9j0TMd77znfTYY49J+OnNgYgEdmbU2In4oUgZjSNioLQOsYKIiHFpv4HaOrV6Pp3uraezgzWlMmpPRTWF9NE52fFqhRciJK6Bzku3omu5l3mZbuo3qYNoo7HmRGrlY1JqDHXuGAdDYTwcXLSinUiPi9/F+qyeOFp+hnUSMqSy1nUtW6rbtXzsZDoq2XX27XfTSJFeFUVTIYHo3YQIK8mmlvj0m7XUkYdKe+fS0t23p4N3H0m333l7evDgHemB2+5I+2t626OiAGHOfUA0UkPRTTWx2qifpQ7Q9+m0sfzOO0fTP/zDP6TXX3890hkRp1wXorsqihLLA50euOWF2dMhveKMGUchsJQOLOFFhGRDqY0TQeqottkFveSAN40Kfogy/soQWdN3J4o5Zf+HWokIxKjRvnxgaqjPpfCK2m7QnF6r3AfSHOv6GyZlsh5RYPVCXvM3KbEYqY3DkG68BAIevBggi+d8/8bfVoyluD8KKrF+y4S8owmYgAmYgAmYQEnAwqsk4bkJmIAJmIAJ7BgBHvL11KtPfk5WREgT0dUqHpIlX+LcWU4gBoZDav9Q+Jq0KNUC0gNyFl1Zl4ReoUmOo91iXjQTsyt9EXkUxbclMsoi4jywz6uGU7ypT8KI1EkKfnf1oTB5nCR39EpNX9U2+p8lX448q0lUUKj/adWV+ta3v5X2798b40cfsR8eSK5H4o4DlTKnWlwYCsaCyCOqaKzIrr72X1HE2NFzp9OqorxWqHOl/UZqH+HF4bSZtVX82NYXRxZXIS8VfOJ6aEukI2qOqCEKqRRfiBMmoqiKqxdzxBu/kS3sER+EVbF/HjtRffQcQaioKfZVFFfn5DnJrlfSqdf+kCrreotiDE5tScDAhOspyyLJU02dltrcv5j2P3xv2nv/kdRYmou3Eh5uLaZ7FvenB/YeTHsm2od7MGQVUUw6EsEmURMd42vWQBU9Rtesra6ln/zkJ+kXv/jFNK2RSEQ+VcnUogHNr+2EyG01JbxUg25O4rYiPtSgW1eUIkX0+ZvKXGGsvsTpuWeEhvtKMMHG/cCHCDw+/CIwjXlMmhVLsTfHE+lFqiPyi7/vXHuPM+hc2s6147oN1cehCvwjkYf6+4Znvq46v+5lljkAIc5156cnEzABEzABEzCB7ROw8No+Mx9hAiZgAiZgAh9KgAdcomKI4CD1UI+uivjItX9IF2zPtaOeEE/N+k8P0nzpgVgfHnhJIyRyB8nFQzEP8uyZa4JxEEflWRyrp/TyYTnLkbw9drroCyHBucp0qpBE6ivFvpEEDdU/YhpKFCEueqqBlPt3UUPX8Ce9rSsljOgXRI78TLr99kPp29/5Vnr66U+LgQRORH9laRLyRJE3REBpKJJ0kjEIAjBpqlK3q1FJFyR53u+vpaPnT6tovWpm6TPUAWjDYBj1l7JoyEdu91tCgvNyFdUu8immYk4aIhKFbiG7OK+upv7FVYgaaRwb0X7qS00DJ1or/hXtUSMq0lvVRkX3EvcURfaHMjGMU9o0rZw8k97+9Yvp7BtH0+TcWqoqmqmhSKqQNLrvxvoMYSXh1FAqZOXQ3rT04F1pz8fuTpXbFlNPqYvqadqv0vb7xvX0xOG70x2NxbSoNkibRP4gcxgjqXmVCC+LwcVw8xdXUWJI9ypjevnlV9IPf/DD9NbbbwVqrhnRXeHqtP1qptmjQIxvmyLXdeBvh/uoLXG7ULz4gTdTDnQPU1C/V0RGxrl1PfiX/5Q0199QRX0k8ovx8mEKWak5KbDTKa45v7SOPmhQOnX8fSIh6UMUtxd3frNMc3FGrqGuBRKZGm+83bKrKMqQo7qubIs7SgKN+yJ6kbsyPb0XTMAETMAETMAEPpyAhdeHM/IeJmACJmACJrBtAjwbI7x4CGYixa4u0UX6YqQ+Sd6EJNG2iLTSARS57qpWVl+RH/HGRT0YE+EVBcO1PaSHHp55wOYpOM4RP/QwrhPlmmA5civvxJkvnvTIXXSKB3GmnEpYK9IZFyIti4duJNOK3s7YkygI2RQ7xyHX/IshNRQVM5ZM6Q96EgS19OSTT6bv/sV30x13HE6rKvrdbmcRF93X+ANtEWGEIMPBVKPQFY3VU09+5lS/k95bu6B0xmUJIglIXYeSH5E8WWsAM1q7inHl68LR8VHnmEtlxD+uaX4roEQR11OCo6y9FrF6ikJjX04PA13ImBNVRFopY65r3kCgqOg8KYUYI95AGfeNfnf1RsZjL72ejr74WpqsdFJbDMYdCUKxYYxqKA0Ep6dPdUFS88DedNvDD6Q9992Zek2lfCq9cSI5yP3U6o/TXG+cHtl3e/rYnoPpjvZSqimtVXYmUhoZFWOq1umtPgV/TpNHoHOqfwif998/l370ox+lX/7yF1FQn3Q/XSEdT69itBy0rWl6FJA1hYxSx6OGl9rkzaakIc7X22l/eyFJ36aKUjOrg7H+rpRKqML+3P8j3d89GS79pYmLXs6gZQW0RdRXMKZxXRR6OtJ6ppBQefGD38BTu/E3qHlVY83SK6c2EjUZY9Zu0Y72R0wzHiLvkHEj/b1FFKf4ZjmofbVPDLUY7wdP7DUmYAImYAImYAKXI2DhdTkyXm8CJmACJmACH4FA6A49+DckuIicQnRRrwvNlZ9dERv6pQfakEuKbOqpED0fIj+yYFIrEiA8/BK9lafikV+zqM0kiaMmeNaOyB/aChESj9KXGkB+KOe8pfAKQSH5Na80sPLtkPRhgPBaXlZKWDfSs2iN8+zEVIwqUsF6vY76MqfaXd9OX/ryl0IErHfWYlv0m4gniSvS9IgYIgpmpFpTzOthLSQpFFmz3piko50L6djqubSq1zX2xYb+E+GEREISkirKtaIG2NVMKIsqUUs6GHEVHzUVMku/eUsh4jDqpcFcfSaKK86mc44km3hPoy5yRG3xJkEEJNecztI+9d24h9p6w2BEf2lTVdFtDXGYrPfTm7/5fXrz179L49Veqmt9RcXZeUuhrA7GhNGljixQr620xDtuS/seuS/tu+vOVF2aD9FDiudEWYbaNdUlh9qSQ3c1l9KfHLgjPbR0KLUkz2SLQtpGWqZqelUl6lA3lxRe4kw6H2P41a+eS9///v9Kp06d0vVrqY6W5Jl4xbFXATy4cbSGxoTw4m2byMzcH0k7Gar99bl0ZH5fOlzTPV1ppIVqIyLhKqqZ1tffGm9uPDtaS2eHnXQ2ddNydRDyayTxlYVXPgFvf+yru4xW6kwn5KT8PTKLHzGnYD2bEZalUOZeRXpz7bl+Ve473ZeIbwQ4U7kvywg5/v7pH6mX0225K+ziyQRMwARMwARMYBsELLy2Acu7moAJmIAJ3FoEEACzUzzeFvKJZWQED7RZvuQ98zOwtupg3rzIQ36zpSidiKbi4TfvF/W5FO0TtXz0gMvDLuuQT7RM8faYeLhmgXleyOs5t9riobqceEBmn7xqY325fWOeH8rpNzsjWIhG4e2Mc3q7HeuQNLxZjhpeRJll0aR9ow8bLV2rJXpL/4nsIq3x7nvuSv/1//yv6b777ol0L4RfjRpSMW7GXgqvvBxxUuKHeUI+9OQfTg066Z21c+n0UGmZimAKZaj+S5FJOumMsiURbQXhAve2x0M76gvyDMlFfaaot6a+IIWIagp22o++I7u0JpY1C1ETSDU+uhHXUAuIs4Ha6hGVVNRvm9O9tKCUU8RXSxKndqGb3lVk1x9++2JaPXsuNWWjKFKPDOJ6EiGGTBvpHh0v6T6882Cav/dwqt+xP1XmJGC4L7VfpM4qfZV7ua77rqF7fI8K4N9ZX0hP3XF/OijVQ5RXU/sO9CIB7kgNS1NmuMFMv7WOiKUsXavxlsb/8T/+3/Tiiy+GvO1KeNUjZZZ9tz8R7chEoX/+oQSRXhN1iDdU1vuTdGDSTA/N3ZY+vvfOdG9rn6K8FB2nbVx37iC6zt/Z8ribTuslBkdHq+nEZD29vnwinRsplVjRa+OGouIo1i8pSdDgWNeT1FIuUr5e9KJcVi/ifmRdnjb20W8dzz3A/waU9b3y21hnb7pyPPltrPzvQV9Sjnsp/k7VTNwb6nf5N16ec6f+JouheGYCJmACJmACu5aAhdeuvXTuuAmYgAmYwE4TwGXE02o5Q0jwjydMfWYjpNglonf0UEutLkQCbzzkwTcLj1yPh/142I70KkmlATW6JHio00WbWSzlNwyy705NjIF6YDphjIe6YggvIlFYR5QJ0V30kygz/pVvPtyJPoE6+kTanX588olPpr/6q++lPXv3RHFvBCCF7OHDhDKin6GONNemNBbPCSJExe7XquN0fO18OqZUxvNJnCUwuBYhSjQe6jTRCsIkrmoZMsTqbUzU7yLCiILnpKL2JHRCHCk9k76Sioh44ixVrq/OO/1oXdwfmude5BMjWEijI7qoJ8FD0XXSSke6Fg21tSjpNS/hde53/5lOvvBaWlb9LgWzKepLxysyjzERzVbTtSRtr7Z3Ie27/+60pHpd6cBCWqsrtVK7sn1eUUdVFbwnna6CZNXbK+nV3GCS9qqW16duvyfd19qT5iWSmhI+wxzDpjEWPcc2TSeWkYhZkHJtEFw/+scfpn/7t38Lgcp9XlW0VR7x9MCtLQhctC1RG2+21HVE+hBhhy9sDirpNsVxPdK8Lf3pwp3pYUmvw5N2vJkS5mNFrzFvIJ401nihgb5PVLrpRK2X/uPC0fRm92w6qcgvBClpnllCZ8mmU8X12lpnN+/F3w8RiBS2538b4iNxyf9WxL2NCFW/uHf4OyC1kWg4oiz5G+R/M1hffjJ1fbPApfBkAiZgAiZgAibwAQIWXh9A4hUmYAImYAImkAno+VRTfrSMNTOL/CbyggdRiogz8fCKMGq12xIdSl/UAyyRITzsomZ4LuVBlogdHmKRDBwfD9V6YkeQRESQ2kUy7dxEj9T/PEAtScwo5XJxcSGi0hgyqVXU7xqon0w8aGfZdBGE2PrRv2iVSDPOvbi0kL721a+kZz73jKRhW8wkkWBzBeFVFT+iwMYSGUN93lf0znvrF9LJwXpaVyX7ASJBbZfCC1+Tr0mcWduujjeyqycJ1KXumoqjIz1bYtlUkfKICArJpbYvap6zMnFaPmimchppI6mD9HkYOyjKSGPrr66n4bpeIKBoq/751XT616+mzvEzaawUxobuGSKc4MSts67opFFLYufgvrT3wXvSgQfvTbUDe6R31I4kWl9Saiyei1X1NUKYdP/p90guSltSU5Fii+rIA+196eP770yHKuyX73leZlCRUIyLdQnhRR/yPa8oKRVk/81vfp1+8IMfpJMnT+oaMXJGWxIoR72FuVgQ9UZ6MIMcKf0Tzg3BqvZGad+wmZ7Ye1d6cv7O9MnmQf1WDTSJulJKRoqnuj1WOxOsqm4CMmBJWVxvjNMfRsvppfVT6fnzb6cTw9WUVO9soGL+iMaJovUGGvNFl3ELnc67wEOD1w+kF3/nul7634iIqNMY2vrfjIiK07a4hhof/9vBdV9fWw8xTn27XP9toxdCnZvdck+8owmYgAmYgAncOgQsvG6da+2RmoAJmIAJbJMAD57xXF5EVkwP1/rYxgOslvPDa34rW1ORPciu8qGVWly0wYN/nxpdMwXpEWU80CKTmBBQZZTHmPpLOzqV7SsOR6Kj1WyrbpZKfBdvk+uqjtaqhBeCLsZCH/VfjHuH+sWbKPEQd911V/qbv/nrdM+994Tk4iFfmuKKwkv2UCJBskZpj2sSXCd6K+lkZyUtT1SbSeMbiDNT+CONA+USBixf4KsWXgikC6pxRtonbzFcaIuhIo4qpDQiN2DG/cP5NMUcSZF/TmVXBEyxr9aXEV4R5aV7grciIkPma83Uv7Cajr76Rjr15ttpePz9VFnRucWHcxHpFNdH4rWvtLzGIcmuP7k/7Xn43jRZaKeuWHDiuiKsupKIvfFAta2UJqli+Dn6CPmj2m1SXsoIVS2vSbptUEtPHLkv3Te3L363dexgKOmmyLGYLiG8iFiiBlzcN5q/996J9A//8P+kV155ReuQxIySzzYnwSRltK5UzKhtJ+HVrkswa1h7BvX0cPtg+srhj6cHxgvprr5EmNbXJe0QoH2dria7RTppX32XnozroltDslBYtHCuMUxHK+vp5+f/kH597p20XJdwUortUJx6im0bKCywvG7b7HmkeepSxjUqIyvLNqjpRaoqaY5EBBIFhsWCIRFtWapLUkq8ke6LIM8CWvupzZ2V42UvPTcBEzABEzCB3UfAwmv3XTP32ARMwARM4DoRIBKDicijLF3y426k0Wkb0TwUoS7rdEVUV1nnRw+s1HWiBR5ay4L0CKTyqblMTypXIAhCWGi+8w+xenhX/3TCeMhuK/2yrfpd1BlifafTTStry/E2QB7Ao5C61ueosMwl4Fyjr5ITPJ944on0t3/7v6f5eVJCSScTS12DK0V4TRQtR82sXruuQuSqbbV+Pp3pKTVNcmOk/vNWvjzpTAxbPyoha1gSC8zUVUxdyahza6tpXtFxbUnDqBHFdSQCifRGLVO3K8REnElfuQsxD/ejUyO8yg/diK5xLXSf9dfX1V5Kujpp5b1T6U3V7Dr7zvFUXZcII4KJ5iV1iD/S3ZUa4ta+Xel8jz2Sqof3ptHeOZVlFwcxqEuKNaXHOooy7ErktCW75pVah2ihA9IpaaioJq5zSwXe22uD9InD96aPHzic9ozqaUkplf3uehZegY6vcmI538PU8eLvBKqkY/7P//n/Ka3xFyFQJ3QYCNuddI1Gik5jrNy6VbUzp1pj890Usutzhx5Mn1q4K82tjmKd4qd0BkVm6Xuo07Wku/TqiNRVpBaiEola0X3V0EdxcamvKK9VZfS+npbTv515M/1u5b20pmCyQVvHjHoaS3kPbbfjOpP+N4B7Iepxac4Uf1M6N290JMKyoXsf4Yz4ClGuXqHYuH/4m4RpX1GESK+hrl+O9kIswtOTCZiACZiACZjAxQQsvC4m4t8mYAImYAImUBAI+aTlHGWR6/gguUhVJEqj3VIakmog8aBKehLpiHniMVUPtBIMiKMuhd/1sBpT8bDLjIf26TS7rJUho6Ybr/GCzs0jNxKJqUktp7n5mDM+zs1bEddWV7WPHrglkog4izdARv/zA3scfI2+aJHzttut9LVnv5qe/drXtEYRcCJZlYghqqWufpTXBJmiHxpHXhfCS9E4q61KOtFfi/pdFyS+4g2EATt3NCvIUrfo+DBLVy+8BmK4rsi9tiRTQ8XYEV0T9ZWLS2RXFBafYRSXucDHqUlbZKrrOISXAqzi2sRKRCN3kmpP1bR9+dipdOzFV9Ppt49FpJcC2aRv6iHF4u2JhCu1GvEGxsMffygt3nckrUjtrOsNjVVFHgYvvYGxrhNT46snSUgts5bu3YaOk4GJFD7EDuNoar+63tB4z9KB9Nihe9KR5kJaVJ2syUD6DANH14Nf9FZfrMjj4d6KsWo7kufnP/95+uH3f5DOqy5cTmvM+5VHbmku4YWYRNyRpqik0dSW7LpjMpc+t++B9Oe3fSzdtq43USoLt6VC+1Ui4tSPgSLBSC/VX676q7tKf6aIRG4LUmFrRDFKpKmaXupIei0v1dJLvTPpx+++nP5zcD51FvXGSY5RVNzVTqQ7878HEZmm+yLuDzqgD/+iY1qGFeK8RWq0/veloXp0Q/U/75qZUV+vK4nY7SjVMYral/+7c7W983EmYAImYAImcHMSsPC6Oa+rR2UCJmACJnANCPCQybMp0Rk8vJcRXXWlrhEJNTe/UEQ8cbIcjREP+jqIYyg63dOb1ngoRVyELNMDbZYCWqNGOUf8Lp55+cW0k8IrzqkvJBIT9YMWFhaiHhK/c92gtbQq4cVEgW3EV5lal/sfm67ZF8NHZi3tWUx//b/9dfr4Jx7RGkW/KJqH/k7Esy6hdTnhVdF2hS+l9yUsjneX03vd1bSmFL4h4kUfIpuYECVcSz6hGkLYZJHC9u1PdE7iStIEEYrYiJpsnFP3CcKLvrMPY5zOtUh01xBJpSmElxyS6snn/bQu7j0JHiTY2vvn09EXXknvvfqfaaRaXnWlGyrUSf/prZa6jqoGl9oH9qalI4fT/ofuTfseuDutKVqrh2SRKKxyDZV2SYRhCFtxHahYPfW4ePtlHSGmNsZs5xZVOl1LfaeW15Jsz+N33Jse3nt7WlhR1JrGM6GGF12/hPDi3uU65fs7C8k333wz/ff/+7+no8eO6l5ibHncamHrk1jgrHh7IlFRTfVrcX2SHp+/Iz172yPp4cre1FZ0V1tpmknRdsRt9SQLmwrxWpQA6+j+IN21qWZ0ZSQLEYaKfNM/vntjxbepUP1goZ6OTlbTT8++qUL2x9KJBgZNwkqsrnYicpG/q5zGXGhXMYqISVhxnwJMU1X7UpsM4UWKdPm/G/lvQbFoujZIL1IcifTqdGX98qFX2z0fZwImYAImYAI3JQELr5vysnpQJmACJmAC14YAUgpVxbO9HpDjQZToC6WuSRKQyqhn1Zh4VkUmDBU1w5voeGMfwggxhmBgigL22hEZkGt3IdFyVEcWORsSoHz4jQOv9ZdOw/moO8WTclvRXRSsJ0KJ36RKra9JeClVjx5dD+HFeUlZPHBgf/pv/+3/SgcP3RbipSHO8TQvbjDPnPL1yPB1ZTQWoqnGEjtnqoN0tHshne6tpg4aQ3KGcTYVicdUCi+WuaZZ2Fy98CJCTEpH11PXX1F8eBzkUUWpf4MiIohrDEduJOZ4Gyb25U2MTERaETRVoz2W9SGVjX6vv38hvfHCS+ld1e4aqFi94shSW9FLXYmuke7Jns4zaTfToUce0Odjqao3MfK7QwQXkVvanwLv9IPx00+EEdy6EicKTUw1RRLRQWqP1Yg6g5kkGdKrvq60xjvuSZ88dHdaONeRlFNHLym8GEkWitSlQuIw8bdx9uzZ9Pd///fp1Vdf098HcieIxPatf6l/6iuSrq40zLqCJvevVdMXDz6SvrH/4bTnwjDtnbQki1SvTI32NBbIL9UUwSi1ta5TrqvfdUk8IubUwfiMJcGIWBup3fnFeaU8DtMfFNn12/7p9O/LR9Mrw7NJJcKiRtzW+7p5T/7e4Y28UpdiKlMaWUHtPvjDiol06rhvtP++/fsi6gvpTDuxXccQZUra9OnTpzJkbSiPj538ZQImYAImYAK3OAELr1v8BvDwTcAETOBWJ4DOCmGih1H9pyk/jfLNwyQPpWwnWodIKD48zLPvUIXo8yShoKgT6usQ0UVxeqTRRopjsdsNMSP6jDFl00LUyDz1u/Qp+4usW1PdqFywPj9El/Ki5HOth1KJFLlJeuzRj6e/+7u/UypXris1VDTLYNAL6cbbD/EBISF5std/SADWIRXHkjbHhivprQtn0upE0ToaG16FtFNqP8WknRk5UonjdPVjSLmVvMv2vrlTsuT5wHE0Lc5RhFwbEZ4jSVGsBP3lPuJ+Yaz4FyLDkFwN1dWqScrUVZ8rrXXSsVfeTG+/+FpaO3c+0hHZmXEPKKiummW1A0tp8Z470r6P3Z3mVLuL9DteksC1LftGLxlw9FbzsQBUdDz7dRUhVKOGlNJJEV2kM1LcfaT7gBTTyno/3bW4N33qyAMqBq86UyGSiJ+69KTm42+GrQP9TSAqkY4/+clP0g9++EP9fVB0Pd9/l27hcmsnqcGY5HyIamuoEv29o6X0vfs+nf60cigdHCjJsa9+qe3oQ1xdiSyNdaBPVSF1FK4nsm6sP+B4W6NOVdX1qEkktfl7V6TX2qSXzs9N0uv1tfSTs6+n33ZOpn5b0WL6G6fd6zYVgCPNUf/705Jgb+l6lP/7Q3okfwvwXdObHNckqKkVmP9W+d8zpBj3Hw1t9FyH5EnzHRXr1w2UT2QCJmACJmAClyZg4XVpLl5rAiZgAiZwixDgEZdICn3pAT4/GPJAyEMjD4NEdc2pmHtLogtJwT5l5AXbh3oIHvSKQtKSGWX6Iw+YO/+mxau5SDPCS8OlODbja/OWOKXIwQNht47wou5Y8ax8PYSXAorSn336T9Pf/s3/Idb5gZ0OUKS7JmlFWlie2DY7du2jh/++jjk2WEnvrJxN6yq8Pip2r6jhqfDSYcgu0gR57o+i8WqL5auZQpgFpEsfDc+o26T7CfnA/UR0VaQ9ii9SYiLJRVF16sCRzqaK8qneUyTSWi+dfvUP6Q+/eSl1zlxQHaqcHohm7enY4VwzLd59OO196J5UPbg3DZWKV5lTaXbuUw2IulWzE8gYO9tC9jR1XkV+UVS+KmlSD+GlEem+VkshvFpqr9Lpp8PzS+mJO+5N941aqS0JWaV4/GzjM8uMmXEBdaAosxwhOE4/++nP0vd/8EPVhtNbHq9CeHG+Ou1KBg51vdvDWnpwvDf91X2fSU+MD6T9fd1AKrTP32j0Qd8iLdk1Tl3litZV6KyuV1/qxY2F8FIXtYzwIqUU4aW8Rd073bQ6X01vNtfTP51+Lf167XhaV/BjT+1oj+s+MeSQXpKSSC8EaU0RhAVi3UvcRxJ5knYDpVF3izRqxPZsRJmg819MHEsDIbz+GIO67hR9QhMwARMwgVuRgIXXrXjVPWYTMAETMIEpAR74eDgnCqJ8gCSChPUIFkQXBaRz+mJ+QCRSh+ivkR7mo36SaulEnS49YDJFWwgDiYEbb+KhtxAS6hwSb07RXXwQMTw09yVAEF5RaL+AQsHtPPGkfO0nIrwazUp69mtfS9/+znciEoooOVJCh+JdTqRxxfXimvHRP2TlUOaiI5NzrLecjq29H2/iG+o3z/LUr/pjCa9c041oKP2TsEJcwJ/oOe4ZUvS4h4hOo7A8kYQtSZnKcjddeO2ddPS536X1E2dTtSupgcjS/iMiuxrVtHDPkbT/kfvSwr2H02p1lM4pjVO5b2l+aVHpiLxeUGqsvGziwJXbJLxUr2qk9MIeb5NU27WW3t+o/RFeqN2x7m+Kpld7w3SwMafC9XelB+uLaY6UQIkkxNmlppBNujaME7FXl6zkvnruuefT9//X99OZsxckAbd/H3EE/VL4pGRySgvjRvp4OpD++t7PpEeHe9JCl3NmoUWqKO+tJP1yqEGNQlaxRtJR/YZDmVXJMHSkUkVZqYg31fLqqlD9281u+qeTL6dfLb+TViXMSGssj7nUuHdqHX973OuIzJruD96o2dCc3+X9RIonkpjIP6IGe4ra6+v+IqIwR3Tq/lMbTIw3vwW2/N+B7V+LaMhfJmACJmACJnCDE7DwusEvkLtnAiZgAiawswRCifAEqCnq5kiekNoXIojILsmuUhBFipj2JWqFVK319bXYxrF6tteDpP7pAZsHTKb/n7038ZPrKu+8T3dV9d5qLZZsWZawvGAMwQYCYRKWMQEmk4TwCe+QZJL3877z581n3nwymWQIEEICY0iA4JXFBhMC3lfJknqpqq6l3+/3Ofd2t+RuWWp1S72cY1Xdqruce87vnFv+PN9+nufUYYPxZRe91UBCM1eD2XDGKTy8wvMIkqCxvESIVHiOcNzOCfgCLu1QPwReExOt9Mdf+mL67d/+nQjNEghp3EfBWLetYZpX9vmaAY+hj/G/iHfOC+0L6TVyeHVxbjKRu2MnJNgQeFGPI3UjEENVxCWblQwrDCsTdAFfmDeGEcacYq4x2QLorQCqXH1QiDSFa9rCi28E7Fr49StpcnQsNQjVI1A29YAajUPkXLvzjnTiwXtT88QRPL1aaZ4QzoVeO61Qn+M5gSfQCp6HRorWJVpK/d7DkMYVNHLe6qHoaaPoJGAcAWjp9cRkRnPCeQFMh/D5euDI7el9U8fSLII1AEObAS/v57Mk8LXPghn7++yzz6av/t3X0wsvvrIl4BX18hawBuA1S76uByvg9eDyTJpuewZhmkxZIi9pH/fmvswOvgC98IIik1liXYN4ydzoZXj5ufpjQ7GYQ70hockzrfT8eDv9w6s/TT+4+HxaBHgNALKef2tKvrPzqMFLr7mAX2jr4hkR3kjr8jNKCCe/USa177BKbIBVYZcTwIImMTboksOY6wP5cHkvChQFigJFgaLAflGgAK/9MpKlH0WBokBRoCiwNQU0ejEAA4xoSGL0jxE6FK/WOOCrAj54TuilIgTSgHR1NL2gtCI9J8Ii+aZXUiSn53OdE2trDdvJqzCM6avWu22fJGm9Hl6214Tg7XabF8CLvEtCJovAyz6y2ZEyAoA5cmQm/d9/8RfpgQceqFahMzk5HkbAE9tpWKONzuOVxy2+s7dP2y8BKp7Hu+vN3kLqk8BejOOKdg08pzYCXjmX0411512BlyL7LyBDTqDvjpgzaBueVYQy9phXg2W8cTq9dPGF19Lrz/xbmn/xtdRYIH+ZOb04d9mVAmcm0sypO9LxB+5Jk7cfTW0AWBeXpeEEoIf+mo/LHFzjeHi1BLd2T95TdVNI5ecBH1Z0c+KbYY16mTWAKM57gdcI81geZxCfqxpOESp4z/SR9MHDJ9NhwumahPK+K/Bi/kB9Y94IJ1948cX0la/8HeDrF1sDXrRHXz+6hyfaKKtHjqX7B4fSl+76aPqN3qF0qCvuaaRlGq4m9lPgZX6ups+uwIt2jFOJq2F6gptlRHIuiMMEr329vAgP/WVzIX3jNYAXHl5tRFjBI07FbnbRc8vnLmA6H+xX5IADdgkTZ2Zno0lqbAijoF3Q6G+RK8UuL3f43cordLrPEmHZzCnn5S3pVLSivBUFigJFgaJAUWBnFSjAa2f1LbUXBYoCRYGiwC5XQE8UiwZgDheqgBfgS4tYg1Dgko3HbngeuRKjAEiYUhcuj6L9mC3Iakfevaveo61Vg4Vck1OENE6QwwuopGdIG5C3BPQyHEqvr7Cw6ZgGde7f9ndH4HXm9Mn0//63/yedOHEidI+k+dw8PO804r0tDYj/3NoY/pECPa0Aat7udQBe59K5ATmixgAfrtBoSJ0eXoE2vJ6xrl56dpnP6UZGKuOHzWsIry7Aj4DUYlsMR/Omtr8PmJgYm8zeWOTuWnz9fPrVkz9J5379UmqYjwoYtcw5oy6WcBtQ5z0n07F73pMaR2ZjhcYOHkmksiJ3V4v+9lN7YTH6NzE+mYEXU3QVTNXNVDZ2ggMDfJprros3kMn9XZRhxHkNGBGyDYA/rgo5Rkjl6YlD6SMnzqRjrpAIoAteFr1655ug1Lnk/PG2fj93/lz627/9u/T440/dEPCi0dRJuLFJ65en0x/d9eH0IXJ4He+jLeGg/QBetolnl/eGfXGuxDc81uieYY2Ov0+w4Y/OqRH0M4Vaj1Ub5ydTeiZdSP/w2jPp8c6rkbTeDlvLzS6rwMs5XwErn0WhtVtB8BjhqOb3EoBZ1DxD7eztpddmm1c9D4WbES7MMx7SxFXlrShQFCgKFAWKAvtLgQK89td4lt4UBYoCRYGiwPUogFWowWh4kBBijJdAIntJxMEwMHsYha5caIiQEEbQJaxokkvJEuFEldVofWFussl5cuKUXfUWTRT0Yb1r9E6senjhRQSYaROqqZeXubPCS80uca7X7ZRxLPC6//6z6b8BvPQ2czzU2TZ4X4FJHSqaxczBW1r2K5zQg1S8tbyUnidh/flhN41MjEVo2gBgZJJvwZLFrgiABCHuwVEo943NVsq7AS8Bg55ydqKB15lwogYRNXBrkXdqsodX0ivn0gskqH/1uX9PKySKb7ToQ+qn7ngzjZ8gKft9Z9Ls3ScJaZwlZA9Yhj72YYV67Ycr9LngQIt7jOOd2GJsjdKrwZT3WwM2wBM00cPMvE8drhNOqb05snw5v4VWY4DQ5mIn3Tk2kz565z3peAMPSGHoWmXvkC6AF303SX88K7RpfmEh/e+//Ur653/5Ac+GI3H9xbEmKVuM+Wh3JZ3otNLv3flw+q3RE+nMcCpNoCO9IvSTsa1ukVdhNDE9npiIUAPAnLze+aMXGCOJd6OrQPYag/TWeD89NXgrfeONZ9OP+2+l4RT3BC7eimKXQ2re/JwLH6rPzi+fF8OvxwFfLn4grHQMLML6Hr9f5mpzAYi+CdCcONbrA32VcYwKyltRoChQFCgKFAX2qAIFeO3RgSvNLgoUBYoCRYFrUyA8uLTpAnhg7Gok8lbDqMlJPGcwFjUYhRERtucpvFylUMjlS0Mxr7ooKMiGosZ8lDAY32k17hQcyje9sffas81+m79L7xBBzDL9XAJMdEhcH0CksrBrkBcG8o3desOrBV7vf/D+9Od/8V+jLXXuND20HIwaeNmOQF1u2e93IcgSn19vs0IjIY2XwEQQnzDsh4AZxzVWJeTOjuuOAi/bxT3UyVe0n+963qzNRecKL87VU5AZmIZvXkov/+jn6ZUf/zwtXbgEZMILDHgxmMR7h9DFuXtPp7m770zD6YnwXIPOAtIMOKQ0hTwmws9ha8b8iTom8fKq++tpNfBygURUA3rwAnz6aAi8aCDXTETThEQs2hnPgBCoucRKjY2J9JHbz6RTrNg4TvjlZsCLnse4CCjDw8tGUAwB/sd//Fb6p396lOcpw6MYP9sRPQnl+Fxd4EXrinsJ4uMo85Q+jJKTf7Yzmn5z7u70qanT6TfGT6SJRcYb0iXPWbFvvPKc4XwEGK2PcT/1cAz09mrxvQ8UahC22G6tpFea7fSv7ZfTd8//Mv07M2rIOKwIim5BCT3jvnnOhz7rJDKE2n0C1TEg6Thj2MLjUVhN92IeRjg24+HzsEweuS59NQ+h2ujBGidSix5kDH18jbFxaEopChQFigJFgaLAHlWgAK89OnCl2UWBokBRoChwbQrUYCfsaY1cLgsDGBuvgafI3JHDmIprRrG1CiGEPUuLixjpkQn72m62J86ybxlI2NwJEvPPsKqfWlh6fZKfA7zM/bNmLOMBY2gjxWt3ogi8Hn7oA+n/+i9/nGamZwJweacMKvOYRbsZq/xvbTvEYJ8Hcby6CDTqXEgLI5AQVhcMHISnUjSZPEh12U7gZWNQM+tikwy3Q7ghcGQIgBIi1p429f0v2wJ7Vi610/OP/yS98cy/p8ZiNw2BSQP2N4/Opqm7bk8z95xK46dPkKerFYnrBVNNgIZ6CL2iOFj0UW+fHoB2gHfV9MxswL265wG8AEV6PilHQF8uV58u51uf4DPCe6lP4CsobHGyIY23gYU+cORkuu8oYIn5sSnwoh7/q5PVu9Uz0oUQHnv8ifT1r38zLS6Y/w690CcDG7WrdHSANyjunVgBPBHq2TFHlx5pkK+TeHY9cvie9Mlj96VDl/ppkhhFoZjKEOGYwReaudcfAIL4kit4Og8a3HMCYVjTEhBE0n/ypF0aH6Znu2+mf77wq/RM57X0ZgsdxvUwvDXAawMpLt+lMA4iRT2F2OZic9vC2yvCkuMoY08fIqG93oCMed+VPLne6WMVq8BLUMh/O/W8V80pm6JAUaAoUBQoCuyoAgV47ai8pfKiQFGgKFAUuNUKaHhrwNcWnUadBngd/qM3hCFdWsK1wW1Sej0gDA/Ta2Z/FRRBBPtq2U3A67c+9pFYpdE22UZDGgcY6BrhJnk39FQjPP9b2wq8LhG7F8CLVRoXcf1x1UPH3tA8xzwIT/Q4Lg/YIfgJLx+OZzWqE65rYzuAIbpJWU+layQJByY0aYfzbaPS4JIJwvJ+8dhT6Vc/ejatALsmR3P4ZQPPw6P3nElHH7g7DQ6Npx6eXQM8uQQ1+T7gGz8CfyyhCzoYArrcc972A3h5rAZTVwNeev2oVwAvatPrJ4AXFzf53Or20zGA129UwGuyQ8hlvrW3uKxYj+O3CrwAU9bVBh4/9viT6Wtf+8aWgde4sZvMB5P1MyFSE2e+o+Tu+sjUqfTxuTPpvSOH0izxjJOsdKlOA9qhB2C8hIu+6I+ebdQUEMwk/2Y0644OUmdyNL04spgee/vX6QlWZ3xtiLfjFHUR3umCDruuOP3sn30IL1b6xHyLVRzZjhHaOk54r4s/cCLSESZsDkK2Phjm6hN6uRiHw7n6W8nn2gt21/W5NKgoUBQoChQFigLXqEABXtcoVDmtKFAUKAoUBfaqAhqCth3whQGo14Owy5CfJoZ49r7BauR4hDDiuSLsMveSRmG+dq/2faN2q8fuBF6PPPLJ9MUvfiFAyQBQpf4a4oKvdwNeFwVeS3h4Cbz08AI06eFlAvYYQwFJVeITc6IGXn4XHm2pALsCeAWYU9fgCAGc+kCkMWEDXjYblfHeSnr1sWfSCz/6WXr7zbfy/ATijB+eS3eQz+y2955NjRNz6SI5yeZJqO6qiubcEtWYm4vc6hKdaHuANm5ufqaOwAvdpsj15XnXCrxsoyFx4eEFEIqVI7lYD69mBbzef/Rkuv/IiTRtjrFNNBMf1cBLmOxiCAJAV5B84omnWanxa1sGXq3gNCTZbwEZ8WYaAfhN4eV1X/Nw+uDE7em3Zu9KJ/pj6QgrOLZM0uVcR69RPBiFp+oiiNPrSSUtwsoOQl0aX0kvjyylp5deSU9ffDG92LuQllp46o1xLyaInp+7rtCF8GJFZ3N1xbNtj9FcaNkgNNa8Xi5GoNcXZ8dzFXkIGSeT2UfYNqHMOSG+FXIafbW/AVJ3XadLg4oCRYGiQFGgKHBtChTgdW06lbOKAkWBokBRYE8rgOGGcazBNxmGHyvR6RWhQSehoAwAChrkGoB6x9RlN9q4ddu2tt29wOvzn38k/eEf/kEY2QISwYnFMD0NeMdqMw+vC6PD9EoFvJYCeJGVCZBRA6+AAnmoZZtRBF46DAmEbgR4GcaYPdGqipk0Pbxm9BQcnwCuAlk3KgKvx/7yq+niy28w77qpyblzx4+lu953fzoB8EpzU2kRN7BLrD65aA45Gj6qxxjwJiCWwAvQEVBLSiGkEnj18U5kPk/NArw4BcelDMX4rJdX9Jmt8z/i/thkD68MvAzzE5bUwKtZAa+jI630/mMn03sPn0gzAi/g04alqtvFH4RJhsO6Fay4QqMrNW41pFEQ4wD2yVcVOboAfi0cr46tTKTTozPp4ZlT6d6JY+lM63CaIp5xpNMjWf1ImmpNhGbxbMcwMbtCC/pJXUuwoBeG8+mZhdfS05deSq8MLqZF6BrOY4RAstonutqfXVfoQ/1bFuOpPo6fv2u+KCawD49Wf/vw+PJZEG4JR936rOX5aq7CNe8vry/Aa9eNeGlQUaAoUBQoClyHAgV4XYdY5dSiQFGgKFAU2HsKaPOZtFwvhzE8uwz1WTNchV4Y4sAEV7gzibOGrUZ12NVBRrLRuPd6vlmLdy/w+tznHkm///u/hwGePbv0vhsxc7rgCtgwCnjZDHi9/Q7glXOS4dKTYY9G/hWSRHQcw3tjwIsKaGPkd4pJk0FqQAQ9vJh3zrmNisDr19/+Yfr1T3+W2sy/20/fBex6bzp+9kxqHJ7GU20QryXmZ5vcanpLCSsiGxW0Rk0MO6PrEZonAOqxkqDn9gBek4fIhUan4zjT2s8BeXKTmePs0GOKl6BDffTwCuDFg2MdAy5qEErZwMNrFXjNnUiHrgK8BDB6BwldfJ4MpxNeeg89vP76r/92S8CLlsZ/eltReQAduh9Az1DHOejUqeZsunfytvTAzO3pZOtQmsPTaxJPr8kVPLrUjHbVnl0ixDZ6XYAInm/209PzL6efL72Rnl8+lxaaQK5xPObEXZwTtxQfKuCuK46cxTnhJm95z4oJJtmvp+EEUHWMPG1CMNWsfwsFkkJXV2eNuRDPXFRmxaUUBYoCRYGiQFFgTypQgNeeHLbS6KJAUaAoUBS4VgWEXAG7DGF0tT4M3vD8yZYhXl3t8DxxFcbIWYMhHYZinIchWduS13rDXX+e/V/zbNtNObw+//nPpM9//vMY3CRdJ/TM8TIMVfqoh16TVTEdm/xvbWsOL4HXy+0c0qiH14iQyeuAZ45heLVcMTbbArxozEqAJ6mCrEFIAEfSgwZPwabhc/Zhg9LEO2l4bj797PGnAzacfeCBdOKuO8N7aUDOqAEJ1NtAryVCbNvm2BJuUb8Aa4Vr4xxup6dV6FIBr6UBwAv9auAFu8nQyyZyfmxokh5j64GXeglD4h7cZyPg9SAeXg/g4TXLqo1NK9qgZA8iRad69Bf4+Ripx5NPPp3+6q/+15aBV24w40p94dmE5198w4urYXjjoJkOp/F0amwunZ0+nu6eui3d1phKMyaypxGCnkblqbU47KW3lhfTS8uX0uvDxfSLxTfSudRJ86PoR+f6aN9fwdtTL0Du6AqPuw945ec5Q6782xXi1OOiUA4zXlyWCOnG00uPr3i+Aip7kgtWkLsQ8OrLPF/ON6ZEKUWBokBRoChQFNizChTgtWeHrjS8KFAUKAoUBa6Arw20AABAAElEQVSqADacZtzhw4dJHG54G2YxRnyAAfbr0TDAAL9w8aK2IiV75vjJotGPuYehuN8svvXAixXqMH53yyqNf/AHn0+f+9xnA/5ofGuQm28pvIWAOYKTGL8Y2zzAfl8FXoY0skqjObxGDSMEOo26iqFDiHdYjGSMNd/5si0hjc6beu5Qtx4z4eEUoWK0I4DCxqFwelyN0Yj2pYVIHD4xMZXGJscJoCPEEDozJE9Vj0vn20upjfeNoCYAGteYaLw33kxwnAyzbEMFvDp4eOWQxuzh1aBCoZigzKKTko5zAi+9u3xt5OHVx8OrTyMNaRxl5Ug9vK4ZeFWkZD3w0uvtqaeeTn/5l3+9deBFY0Vc0Rf7AQQdMkd63E/PwFG8uSYgmdPDRjqSJtPJ5qF0aupwumvyCAn5J+isnmbLaanbTue7S+mtznx6vb+Qzq9009vArsEEtbdGUneI/5eeXcEqnSxoyH+7EXjVubZWf8ec3PQzPPiYF4an5l9D3vks9JpgsQ7DbS9bfZUK9FTsksfQPwTEnNCFrpSiQFGgKFAUKArsUQUK8NqjA1eaXRQoChQFDpoCYcxliy53PQw67Low7jDm8fTIdh7hb0CGCTwYJqemCdFqRSiYObqED6NYsBry7cWl1MHo1SCvvXKsuDbvNBEt3GbPlVom2571ycZv3RW9XOpQs6mZmTQ9ObXqSSVoWlhYCOgUHVcIKqohTtaqVmf7pBkBrHziE/8hfelLXwwPE8dKw9yt/RBSBPCqOle3w69D3hZgEW/grfNC91J6e8C4Mh0EROQc5wTgEd8DcHG+rdfbxxIRanzeeo8qkJary/VQWZ433mTzmiNMznsDU0ZpiJDVfq0wl/uACaHXEisDLpGEvmvIIefWydb93GV0G4RMemDYE86Mhrdip9tJTTwaxwAa3j1yeNkSm7NauEbkxT6BSaw/yD1BjLzwBIowTaAa+K01xp52Nx0dHUsPnTid3jM5mw4TjrlZDi+hSuRgo94WYXSClwa5x1z19HFWafzv//3/w4OIG3tzisfzR79nDeLAO97y+VwRfbFvrr6IcPKoqENPLCZ3GlsBDjLoE/TjMO2dm5wJD0HDQoU5C0sLadncVUCtDl5c6t1nIOBkgMOsyQqC5XvU9+Pbrg5pVLBosR+uKOzP/9hmjYWz09PT8dsZz1uTBQvIZzYkDFgvL3MaOpdiTjJA/lY6V8JLLrxlmT+A3VKKAkWBokBRoCiwWxUowGu3jkxpV1GgKFAUKAqsKlCHINaQY/WAeEqDl38aaZY6ZMcE9Q08giIUCWiiEa7BFonpMeJM0qyXV4QxrlW4Lz4pSYgi7gpGUIOCvF84aCJ4AdI0wMtE/qtgCe+gdwKvLLMQw/Ny3da1fUXg9ZsfeTj96Z99OY9JdCKDNr28IjxwEw8vPZsWadabvTb5ly6mc4MlMA2eSSRLH6uAF/nLk4v2uY05sSs8VwRDeiwBu+oX/bY/A3TuCrwAkHpsdQwxQ25zmsUQcP4y3msmuhdk6fHlHO/hCdYjBLKFN1Nele/y0VqDXgAM5z/XqtXA5wNPrgZUsAXUGec+esgtk8OqRXjlCvXeNjqePnT7mXTX2HQ6BLDabJXGNeDl80gYMVrrrSdg/uEPH0//43/8lVUHoarnZw294nEGxGypxE+BmgK3mTPxGNCvqcnpNDU1Gd5M3meJPFVLiwsBbxQg5jXnh8BbuvEevQiB/L007NvfgBb52xQhgy3z6PF72fa3shcgNTwtGaDwGHOg0E49SykKFAWKAkWBosBuVaAAr906MqVdRYGiQFGgKLCqgN5IGq8Cr4Bebt3jv/isU4erwY3i1TWVJvFYqr2YtMcMA9PrS6+FhYV5vJc6Yeg3CIfa38CrklDx6sJnQVAfeGUS62n0Mqwxw0RC6fTwmlejbr7Ca9FQ+3angdcHf+N96c//4r8GqNHY7mNoO8YuOmAzHK/VcY/B93AGREs18OpeTG8BvExsbrjWlcBLTy+hj+GEt7roP2SuL3the/KsZh9i206yyqU23ogdAE63Wjk0kvdzzDDEPpN7FLBrfwSYlj4rIQ4YwybwIgMM610rNfACVeCsxAsYNaCegQMMHAKn4eEF9BI6CbzIczWGh9dIZznd3ppKHzpxhjBBwmCBbZsBL29ov3z2Angxlo7dwsJi+sEPfhhJ61d0t7MNMQ71lrZGY+NtrdHX+onL1LAAr2sVjHFiIpnPy9/MsTE8Kh13BiGH5prXi0UQgF4dwmrVNY9Xrv9GhuraW1jOLAoUBYoCRYGiwNYVKMBr69qVK4sCRYGiQFHgpimQDeL13gQaxjUAE2YZujiGV4vhV3UyZpund0kfQ60HCOji+SJEEaYI0azPc/db2Qwa2F+P6aUVXjd43wi81M19HjOkcf4WAa8HH7w//fmf/xlhVjOMzTA8SxybAEE07qrAi7af08ML4KWHVx+YI/BqyZOEOtjxenjpPeVKfTX4uZVjL/CKkDz7CPjJMMF9ua3LaNAmpLHL/F1mzqpDvVKloMqoQCZwwAk9HCOMEJDpOOsVJ9C0UN1qqfst7AJJyZzC0ynagjZ6mokVBV7W0yMBvh5eY8uDdHJiJn3ottPp+CigFOC1KTRUZ9qXm0fyfdrk2F28eCl95zvfTV//+jc5vr5Vq827sQ9UWYDX9UlY/yb4GzrOggWTeMK59bslgKjgkz8WtF3gAxDuHxf87c25wa7vfuXsokBRoChQFCgK3EwFCvC6mWqXexUFigJFgaLAlhRoEIKn+RyhNmFIa55j3IbRhUcK3izTGmoTk9ngBWZZ9PIS4EQuGsKYNLz1kAnnFT2IAAnNRoYCccE+eTOkLErwDGFhftXdywAJ7xu8g6b07CAPlB4dhoG5OtulS5duiYfXAw/ck7785S+nI0eO0FTG2DbRl2VgpUWIY9vzv7WtEKvN13OEzL24fCGd62OYQ2PsT6wkSP/r/F1u+bc7gBfzd0UoZYMAc+ZDcqwiCpN9XeZxh/xdPeaqSdkz8FIDTneFRz6YsN+xW3E+6xHnecx784HpGWfx/LrUwCtyVfnFm3FN9UTlecCuegotA7zGqG+S885MzaWHj54iGXwjTfAsbQq8rJL/vLPjJ2B2hc1zb51L//hP30qPPvovBXihzm4oEX6K96AeeT5fE5OThH9OrUIvgZfzyfnVCei1FM+jHoX5Dw67oRelDUWBokBRoChQFNhYgQK8Ntal7C0KFAWKAkWBXaRAzgNEwmSMMo1nbPls1GNM68XiimOuxGiC7DCwOU9wo1HWJV+XoMsQviEvbPsw1GrvBL/vt6I+q5hjPe2oOlofHwd4TQAJm3h6CVP0wjFX1q0CXmdO35n+5E/+Szp+4kSMsTmo9DwTWNbwa0PgRYc69PM8wOul7gVCGllhThqj95PjG0AHOMQ5qznHnQeVHrdqo3fXkHmr75ZtDK/D8NwSeuFdJfAyRJFjOqq54IL511aEXcIxtPFYLNjAdXrh2Kc6F5MJ7i3r+1kDrxVYmGGTVJBfCKN/l8+FIENkBdcKz0iCJtOhlUa6Z+ZYevjYyTQD/GoBi+u6vMemhbp8/gRer732Wvr7v/9meuyHT9B+7hH/1m2jEuHsprVd/UBVXwlpvLpMGx0VtMaqlMwBV28UhI/zuxowNeAlVzEufeckfzzQ28vf01KKAkWBokBRoCiwmxUowGs3j05pW1GgKFAUKAqEAoZx6WmgkW8Jzx29d0hiPkb4jTloomBcY/MG3FomfFHPoPAO0oLmWK4jG2kBUIQH1LvfyvowJYGRnht6/AhAVmEG31vo1zJ8CQFUwfMEXvPzt8bD68iR2fRnf/Yn6cyZ90SbBDmO8fJyL3JBOU6bAa9lOnEeI/zlTvbw6jYBJ0CWKIy//RN2rQIv63Ja8Fq/L19wc97N1dVD84i6BCQYKjYQeLE13LBvWCfQNqao41eNYwAvYQOhhn0AcAZeeITRfwGFoCIv9JDD0hzfutSQSuBlmKcrRI4QGzmCCIYz+lwo/oATzVtvTrAJ4NRRMnvdd+h4eujonWmCNo2S26uuq677si11OFbqPmBOCVNfeeWV9NW/+1p6+umfBvDKHkJxYjUvcw1bfiarexbgddlIXPUL04qB4k3g5W8sc87fAX8bxphHJvz3uB5//pY4Nq4Y6u9qF/DVJ+S2lKJAUaAoUBQoCuxWBQrw2q0jU9pVFCgKFAUOlAKaxRatr7zxU+yt3jTG3KPRlUFXTsrdItGynl0Wz+lhgAXo6rK+HF5eOUwsDq++CYSq2rOBv3pkf3zQaFW/rJW5zVpohvcbACkDr9xPQ95M6B/eHUAWYceAJOmu0qhXVXa1ySPhdQLHfH01Ttso1wjkZXKylf7kT7+cHnzwwfAKEpgISmyf3l6G8cljAqVEEwJ/hUHeo30XgZyvmsOru5QWG4AiVxfkvDzecVnApdVpxjQIaOM5N9CXmE7UEU26jnoEXi4NQCrwCnbhmSj0AmLp4RUgjONRP7WPMH5CqQxuAV145vWASQGWOGkZb0bHVA8dQ9ACXnH9+nbVkGoNeKEpyc1GBV+IFeOr59goQA3KMeQ5muT4bamVHjxyR/oAr2aPEFPmyfp613dbvGg9vtQ+cngxz55//vn0v//2K+nnP/8l+xXMlrv1X946EKvjtb7Sa/xMlXE/5773dzs5Pc0qhK7SmHPXLbUX09LSUr5PtE/IA8y5kUlwje3bbaflPyb428l4V3rZRr1jBV+HDs2Fx6AeerGf+en8U9tFVro0zDH/xjpbLTGSMaY3Mo65rvJeFCgKFAWKAkWBG1OgAK8b069cXRQoChQFigLboEA2jNaMZA2vKJUFajiiZpTAJjwP8EoKiEPuLj1awrDGUu7heWC4TYfQtl7PFcUwZEcJ16vr24a27pUqDI8T45iAeook8JOsxGgZqEmlWeyo3hwD5da3SNilMdtHQz3DwoiVRwAMYqx2AAwIvMYnmul3P/NI+uznPss4diJMVWBhwwLibTKONqdB4v0B8+OtQSe9PH8uvdldTP0WwKUl5AAOVUDFc6P59ocPNwq8QjPqz9UzS62Xt3rOeby6ox8uK4Y0LuN1t8z8NtecKzHq1WUl5iWT7tUYQa+ugEFVDfE8jLfwsCGhPVoNuXYU2NUiRNJnwpOvBryGLLE4MM8Z3lsjvBq8RoFQNteE9h5T8xY7xklYf6o5nT508u50dmIuDVmxb2TE+bVxce4JS4SUegzWoPTJJ55M//N//nW6cHERSEL/tr3YZvpNvW4FXIbsTk1PAXabAb/UWaAbnp/en/M813nOppR1CsQ8VkOerXF+Pwwbr0cNuUK3HkC0ze/tMtt4zjzANXG8hDyuU7N8LAoUBYoCRYFboUABXrdC9XLPokBRoChQFLhCgRxytmZMaXyuWZ8BD7Cg9EbSiPal8ZUNe21WYBeG7HrPLo0vSwYPdc1X3HYffw2PDfpnyKdJqCfWAS/VEIaEQYsJq3EawIv9QsIMvABGAMSAJhyPazBkdxJ4NQFU/+Hjv5W+8IUvYEzrpaaHVzPa5HTI8O2dg+ZMadDPIe17e9BNLy+cT28uL6YOtGbQzMArp3q340K9vBV2mePL63U42kqJa8PjxauzlnnOZY3Vc/1cXn+PFcagz0vg1XH+Aq96ns+ArADvrC/GBdiV67B+xk2goEcS/8WqowF388qM6hVdQbB3BV4IIOTaDHhBCVOj20+z/ZTumTqaPnD8VDrZmEws1QeQq1Hc+h7lz3kVP+YeocaR5wmRhGDf/e5301e/+vW0uMD1K/Zvu0utUw28GngNTrDyIMBLD0d0XWZOLwBzXbU1CjoV4LX5ODiXR/mjgX9gMHTc35PIf+iYMlfDG7H+7UVTw0ktXrfZvN/8buVIUaAoUBQoChQFtleBAry2V89SW1GgKFAUKApsRQEtdMmBJny11div/mXPLry5TE5vCGMY/Rx0hTHDaXqEWHXxMDBvlwZYVdk6g2uLNMMm7cVCd8OrhrYb/unKa2MAQksODdUJg9xehClFInS9iSgaqBr/3U43e3hhyNbwxsEIvR2gGKO4ZNve9PAaBaI8+P4HSFz/pxGCJsTUwM7wLoenbXbDRpOQR/pxiVUFX29fSq/3F9PCCN5PRGLZXFJ6RXEj3PK1HcAr1+p71hA7vyrCKY3+qwAviNIQgNUVeBGK61bgZagj7kk+DYSWMZ9pNLXle9BHYZfPgNCmThzueLr4QPZU4sp3CWkc0vmVyOhvzWgbYY3cg39xX3RrcK/RxQ75u1rpg8fuSvfOHkuH4BkjK3hPXgV4OY8MYzS0svbuWlpqp69//WvpO9/5Z9qtJjsBvHLbVcr76mVWrzqoh5edW2bVy4UFYW4GXjEfaK/wvACaauqu2zAdnX78VmRPrwkAYvb0UmUUzZsAidm7thtzUi3rhUHixPJWFCgKFAWKAkWBW6BAAV63QPRyy6JAUaAoUBS4XIHaaKqBizaUsCA8VPjiqnMTeBdMAm5M3B3nYVBrmBsy1caYFnppZAegsUKstPguINCKP0BlDbQAtoAjEc7F1qJ2DcLo9ARy9Us9Xwz9CsuVYx53ZcvFxcUIERUS5ILHEOd5PCzgau92bQRejGY6dcqVGr+c7rzzzoCYeqZlaKKHV84jdOU9Ncjth6BogWTq55eX0muDxXRh2E1L5KJSj8Y6hySj6XzJe4jsC4+vrXp4qY/TbeNSe7nYwo2KeuaQRj28OoAkcEH0YwXAYK4kgVfAScbMNgok3ad3zQpz3+FxfAN2OY4WrhME12O3vnlCPothi/6HqLxn4NXgBh6OYwIvOtZc6KY7WzPpw3fcnU6NTaex9nKAyasBL+s3vDhyiTlfKG+++Wb6X4Qz/ugnP+UGPsM7A7zy5Myg0d8Kc3fVIY15bmeYa/tCH8WhjTs5t+3/Xi01IPcZEp4bMusfHZoNtnw295nFPzQIYDv8dnTJ6yWsjt+Vvdrx0u6iQFGgKFAU2BcKFOC1L4axdKIoUBQoCuxtBfQc0tKuvWE0rvRiEcy4suD01CQGKasyYsAKaiyCLj2RuoRXGcpYJ6ePFes0YjH6zW8kJLG+g1Synmv5jHLf1+CLHhr1KmyRCw1gokaZTQi88IKJsC89vDJCEBaEF0wM1ParGcBrpZeOHJlL//n3fz89/NDDMX55xUHD8/Tw2mwcAVqEXZnmqr0ySJcAXa8Nl9IbvcW0iJeXnRB41YgFZ6ZVD68bB15ooUiWYDsZGuYdvHNss1bjJgV0A3j1hqkNqBN4dUhXPxBCGYrpM8EKiuGJJ2ykun5vEN40/f5y1FtDCLdRGKeAkn6pIN/6+9fAqxrVNGQFVINHzeXlKzeWOgReCDrVHaZ7Dt2WHr7tdDrGSo2j5AuTcQxNar9ZoRqTngvhbIvA8rnnnkt/8zd/k1568SUkGWN/PRqbVbK1/Xko6BNAUFA4BSSfnJoOKGg7MswlpJEw0HrY7PROei9urSe74yp/E+L3mOYISP0sXI4/QqCtv8kWtfTc1TyKy+0AtnGwvBUFigJFgaJAUeAWKVCA1y0Svty2KFAUKAoUBdYU0IjSnNJ7xU96W4QhjxE/ymuWpOt6a4URS+iRBmqP0KRFVlozWXIY+FzotXXR+LLOXPf6I/UZB2WbAUgNQZTFsLdssJKMGs85V7msoaOqdAkNNexLrzkkpOSxyeFyft/+koHXcnjjfPzjH0+f+cxnYg44DwxNuwo2isaYZ0inJj2kFoExrwwX06udS2keiIarUmrCZyKCj7PDw4tpJPzZDuCV55rNuEJr6hfAqttGZUTgNWwCsAYBvNp6eOHpJvAaNr0G8EWfYg6zHXAjoU0PkOs2PLAIS9XTxnPcp1cYAY8Z4EjMopbY5M95lzXzHW8xtBlwbQMK6CqNuXAMjjHS7aVjo5PpweN3pvdN35ZmlRK47Fi9G/CqKlqFIP/6rz9If/+1r6e3L1wERO0k8KIP/BOAq/3kxNSqh5e/Ie11CzLEnKehobRA0YGs9Knbf+C36FH/Nvj7rD6u7JhXAzVUGlju7zXQPFbBZMJGLkV+O1z4ouh54GdQEaAoUBQoCtxSBQrwuqXyl5sXBYoCRYGigArIA7QzNTg1PgUcGvHmb9Kjy3DGfFJOTq8HUgfvLvPwGHJTe/74eTDEo0ejTI+wFqFTgIIa9nivg1BCR4Rcg32CmMpwRQBDj1ok/tf7ZZyQrzFCRrNR60nkJOf4zV7JrvbwmpwcTw888ED6wy/8UZqdna3gXM4/pofJxgUDHE8+GEdiRqQ2sEbg9VL7Qrq40g1vwRp4Ob/08BpuI/DKYV9rsEutQ3Da6/zV02ijMgrwagyyh9cSHl5tvLs6Aby4HKjAhXwASAHEIjk4id99QiKHF8dHuJEeNr4cc1fVFPSEZ6Qhkbq8UexzXWoPryuBV6zWWAEv6xV4rSy20ymS1T/M6ozvaQCOSGDfCohGe/Scu0rRC6iHF5qlzcqp3/rWt9K3eXU6ArMW7d1Yk6tUeU2HYs7T4QB/aDQ5Sbv18AIM6nXW7rQDxOjhlUEkOnJ+CWncXF6ngy8dLDMkZPawwzHOi4jk3+o8z/Oc8/gbb7we521eczlSFCgKFAWKAkWBnVWgAK+d1bfUXhQoChQFigKhQAVctLyxLt1kMzwbR2FxukujCqsqjCg9j4BehtEJr4Qdhih28dBwFUFXp9MIC2PVNy9nR3i5cG4kYzf2in2et6+KhudVOpR12eQMdhsOOtYiJxqhoubIMrxRIYUEFpPEL7WX0hIedGpqEaSYU81x8N/2F2gVsKrJmN1x58n0xS9+MZ0+fTo8RyLUlaMxFwQ9ziH6Yds8NiR/0AT9GRAa2COkcTDeTBdG++mV9sX0+vJ8eE3VXioCH/sQ6CjmVvbsqft5vf0KKWL+2ZY8//Qk6gNXXK2wNYbni/o6Yv5jfscTwL3dCpqIWkwdQO0S87vjtbYQHQRWQ+oR2lJ59FkwMwq8GQFoGfMoNopcd97bBRviPGr2+mo8ue1a4V5+585xfzOn+VKVOMD1o9xwFMg2x0IA9x++Pd0zdywd64+mcdpjT9QP1as6L6s9avYZFKgOmGd6Bb366qvp63h3/fjHP4rjdJGyQ8ArqAxtRAt/P6anyTvmyoLhJQgQBZKbXN1FLlw5Ur2i4zTHnsRX3vLcsp3sjy5e2c987CC8189Gfu6yDvU+dXVBDEOP9RY1/NbzPN7m98OcXr3lXp4vSO3viCWfcxDUK30sChQFigJFgVupQAFet1L9cu+iQFGgKHBgFMgGpEaOZuWaAamxmY1MQYDhaxpPGqjmmdJjwCs0nkyCrGeXIYwCG41qD2bzK79HZQfmLWt3mZ7rZQjjEjARFjx4Q62ELWhq+FF40GGgjuGlYeiXcMRE6KgdoUmRx2thHsho0nfYCrCjNmR3RmL74zwZpsOH59Jnf/ez6aMf+1jMCUMrTY5tGFUUqJW4JJvO0dE02WRFQCBND3A0Mj6Wuq0RcngtpJeWLqQLA4xuQwT9Fxd5Df/0osJgj8/Coi2UcIrSwOfaeNF+YZdwVo8iww+dvwIo4UBTAEY//CzAG2HrrbuctwgYWMK7rsf81pMrGsxBz9ODzVCyeCYMN2QsHa7cn+tvOLMADzE9IIU+hiiCvcL9a8CKjYM0wUqKdx8+lh48cns6MQocNZcYHQynM/uaO17d2LbWBY802+yzS7vV4sc//nH6xt9/Pb340ksRPtsPrddfU197g1uqdI7m+TpMY8Dc2ZkZ5nPOURf5/eK3pB9ejs6rHu0bon0O13MEc/FT3cLYu3aoPuXAbwWfFp9NvURdEXO8gou1OHqLdvCq8/dEEMzEyVdVv0v1eWVbFCgKFAWKAkWBnVCgAK+dULXUWRQoChQFigIbKLC5xSi80gtmivCjcZe9x6MrzE0sTsOOTDTdw1gyFE/PLg1qzSZM2zBuw3ba4I77dZd9z54S9r9+KVltosswDO9Ec2CG4EHPC3N1GS6qV1fAF6GLBIPiGGQ4loGXnjDm8TI5uiNnfda+c1pTPzfQK8iwxg+StP4Lf/hHeKFNRC4xvUdMgm7YXn/gIgVAL6CP86alV4kABignXDIRexc2dpHk9a925tNb3fm0ZDL4Ve8wZw598Q1tvCY6ydfrLWqjJ1eMg1SR4viovTnnhFdD5q7n+V2NvV/ck30uxrAiGOJzl3nd5VwdoARh4aVYeWL5HKhPDLHAi88r5t3i3K0U84f5UoO8YqPAj35w/yYQ6DYA4t2HjqV7Dx1NR4FjLVeL5Iw4l87UHmL53utbYS4x+k89gmtDYx999NH03e9+J50/dx7Pr3H67lXrr8m1bMd7QF37xD0MhZ4O4KWHqLBOCMcHvjjfhZK9ZV7kAxTC9chd53VZZ06Mk/PG/c65UtYUqOQJgZyf/pFC4OXvS5OVHPXsMtzWZ2CJVV+FXvoG8hjEs7D12bvWhvKpKFAUKAoUBYoCV1OgAK+rqVOOFQWKAkWBosD2KKDtSE3Z0LfKbDgKCSxCGMMYw1AynxT79fSpy8L8fEAFjegAMxirloAMbLMBHbsOyNsaMAllK31z59VuTYaAQpVHlwZpXgzAJOfqJwCoLq6uyeGDOXy0jZHa0UilwgA0UXEes7U7bNcnQBueIn08+WzSqVN3pS/98ZfSe+6+O6BbXhnOfFcZejoP9NjRU61FrrYh4YwBNJhpAqhloFAHl6S3lhfT64Q2nmfVuB4QbEgooOfFufR5hTkVKM+bbqEoyZAwShsdeupFJ0SjLlRLfTyobKv6BfCqPwttOUkPOjoC8GIhBnYse57tCy8wEJNV+58V1rX6hUPZu2tr7Y7M/dRrQn9XZIznjTa1eE0Ct84cOpLeM3M4nZ48lKYFa0ALJRp677i9wKy+d721jXn+CTv0+HnpxZfSV77ylfTss88APPTUk9aJztZf43XbU+r5bAL1ccDL1NRUgEO195j76yKYc+z8XREgt1mB0jBHPUj1zrOjzpNoM+0ND6X64rKN+ZBlcMwzsG7y++2quhMsFpDnaz4mXNTTq4PGPg8ec/6XUhQoChQFigJFgZ1UoACvnVS31F0UKAoUBYoCoUCwBN4CnISxg7nLd8Pr3E5ilI4DvPzeqIxhDVGXuNf4NOeOPl1Yp7kODSXs5aiDjwfNcKr1VJIAUWE8VlAqFNdId6VLYdBYQCG9oyKZuRfzEnBkhxVxDyCA89Vfwz+gIsc1UM3jpYeSxf1qHuLHnu18WwlPLYHDAOP40KFD6dOf+nT61Kc/DXTIsEFY57ywjcIk2+0xvXrMX2VfY6U4jg8AMwPg1oV+J73ZWUivAb3aDTyo4C2u/BnAy/lkonf7RN+3VtTziivV1/Y5lzlW2/V5nmbw5RV5P23nvB5taTPX2855B4b26IUXnlTBBzzbMabvAZ387r2vvLk1v3tBonxtizF3+Ur0a+AhNwPEOkRG//ceuz2dmphNx1p466gRAMjumOzfiYP/2abAy7vnudJITzzxRPrq330lvfnmm1xP+CZzaYTwzGi7J25zydPTVUhbrNBIiB25pZwjEWJazWPHxfkeHnQcy+Pnyq+EOKL/MpC3izdpAC4GzbmizsXD6/LBCojILvVxbjvn/axnnd59wka9u/zN0NNrGZjdXmRlXbT1OTZMupSiQFGgKFAUKArspAIFeO2kuqXuokBRoChQFAgFaiM0QAU2jt/1zjG3jobnJKuoGW6nyZSBSk4uLWwxSX1dwjxaZyNFvdlarU85ENsAfdjgq6CvEibDL7Vt5nxoGJ2GGLWAXcIs5KVglgIs9CyK8FAMT0z/1OAck9dn/TVdGQNCSefnFyqvq9EAAMKDnYEVAC/a4BzRy2t8Yjzde8+9rNb4hXT8+LEwkl28oBF5rAz3AxQhwIDVDU2yL7xoNvRgE6bYRI7T5aWVfrrQ65DAnhUbWcNxntUFh/QhoBfQZwSYI/uhYt+vu6iXObkEPAGjsuUPlKqqqrd+zRM2HwgYBsgDCAzZv4zgnQBehGxaB8ftr1DPwZBx+Rb3iNFxjDi2vs5c8zW9y9TIl59GyHUmPmwAvEjtnm4jX9dxXiarP05Y4zRtGAKAhBvmEFtx/AVedHAzDy8bIFQ6f/58+qd/+lb6/ve/F+MngDUHX5CznXhuQw7e6NsE82eCEGk9RyMsGphlEnVzijnPzBWoN5IgxjGMYQsIbDgmY8C8qAFYzhlYga9rUvdgnBRJ/+mqkDn/bthvIbSwdjTNTM+wzfrmkFx+Q3hW2yyI4cIj2YvuYGhVelkUKAoUBYoCt0aBArxuje7lrkWBokBR4GApoCFKj2sgI3zR0NQLI5a2J8m48Cs8wDC/NTA1jPUwMoRNmGFZb9troIZlS81rxpb7DkKJzud+I4r9zwZlWPzh1WJievNbhVeXkELAgWiG+w0ASj0NevNz4WXhqn8TgLExIIHGq+Mg2FL7SxcvASu6YbgKZ8LbZSdgBQ00F5eeOFAvIFIjHT5yJD3yyCPpoYceyn2kbQJS85HZPj1EBgNzuvXJ+5b7KrgTZun1JdTDjyR18GB6felSerO3mM4NSKDN9xHPc+4AQAJ4UfdWito7d4VuAb3CdYqaHBd1Zxv4EP0dtQx98/h5v9bYBPcn5xh9Dg8vNI4cdQIx9ht2J+zy+Ym3IF95h8BrrSZPuPYyRIPw1rJ9tLlFSOjMSCudwavr1PhsumtqLh0e5bnU05Lxx+9vVXeBl7DrasBLWPejH/04/cM3vpFeeOH5aJieXY5JfnajR9fe4Gs5M+TmjRtMAdFdhVQIShfx2OoCb+cjr5RzKIf38vvDPBPOxDNEm32ObLtjJnjV00uPr4BeQMFS1isggPW7b+rmmPpy/wq5+CbTmLn3AJ3qW8PFZbzozOnVxnO3lKJAUaAoUBQoCuykAgV47aS6pe6iQFGgKFAUyApgA4UZlK2jWLHO8DPDGCPsrgoxExgIWczzondFNqPIc2Q4FQaThmtdNKgCBlh3wIH6yP7f6uUjuIrV+4A/QiohT5OtMHFqypXpMNrDY0X7n/MN5wJUZA+LdhjwwiVUrcKPJiMEqQ4P1Hh1hcGLb19YBV4a/d4rj+Z265xzeLkwQYNQRL3QpqangV0fTJ/5zGfSNJ8DLgm8hBRMhkGERQmaSJA+kldwFGS1SHqvDkJTz1shx9dbS/PpNZLXv24C+1FA2Ji6AVLRhVtFCOFWeqR+9dxen+MpvFzUyvvHTK5q517O3bo4dw0Y7bKrDWDpACL18DKRvTo7x4049HPM/1p+vb3Yt1aT51x7CeDlsov8GyFn1zirMh5tjKd7po+mu3ndRijjJJoOV4Q+eONw4jiJyJs2gjYxpaLf+X3dgxl7Q5H07W9/O33zm99Miyx+YJcFrsIkgV599bW3+BrO5LbOEfvk3DGkTsiicMLzWISB35UAk1TnXBZ86QWmd6OAOMYNMBdAlfYKU/VE8ndJSEPVuax+qHccvG14/KGDYNDi8+Rz57PrM2kONzU2N+P4+CRnuD/D7A7eoxfefjvrWbQM/cpbUaAoUBQoCmy/AgV4bb+mpcaiQFGgKHBgFQhjc73tq+GOMZMN9WyICiA0MPOqe4Qx8t1VGYUAehIZ6mKOF+FBbQdlpHCwZBVMZcgn6FABrfl1GigsxZChyJlDriJzXGWtsreFnw1FWwaidE0Y7WqXeFe4X4PeetVdIzUWDcAoHcPbTkcN4YS3EzwukHfHbX3+6sBEC7brLRvJet/QrMgbpnF8x8k70u/+7mfTxz76UfrRS4uLC7SxRZ8nwkNwqb3IycM0NzEToGOREMcBUKih9yD9GgGu9AR+hONdGBDauHQhneuSR2gczyygq/3sD8lRFb3dWl/C6epqlypkNZn9uFaAdtI2xnBAW7v0Qy+vLoBl4PjWcZF6U3FR5O6yooBdGXiFWGsVrn3ycnuFmHrEWYPf1dR8Z/q+jY4x7sCd4VI3zfZH0tnDx9MDR+5IJxp4RrF64ai6QdviP+4pH2vKqmibYZB6bNlMn1XnnkniXfXQ5/iFF15MX/3qV9MzP/1pBpSOBc+5AM9rLp/Ma82+kU/OG4GaPZ+emSWH10RU5xjrTdReWqxg29pdvCbawlaoKkwVwushqXbWJVwW4NhPgazzsF55M0Jwq/772xb6cn48V3wXoGWIHJ1eu/F++JTlCY1yd0LM1Z6pmf1v8XvvCrx6fPl7lYEvc4h5OD9/KbX5zVfH+g8YgkehWT5vtbryoShQFCgKFAWKAtetQAFe1y1ZuaAoUBQoChQFNlIgG4frj2SDRaNFA1ejT6O4zp1jHp0Iu8MA0kg0ubGgS2NZKOM+bM3K6Fxf78H4LPDSg0vdVrVFyDCo2bpPD4pJQRda6imkwa2BqfeNwEQD3TBEPbP0wtCjKwxLQgGjXqQMsIWd2mwKIXkBCQwtrA12PVsW8WxxbMK+3TG7nXlCn4Uzttn+2UYhxMc+9tH0iU98ks9T0Rc9wDwunHCRgz6hmdPNiVi1cBGPpL6OVdTT4vgofTVsc6U5kuaHy+nNLmGNrNx4MQHGYCPm85Lh+NpqWTXz30Wb+rx6yyiEkb8GvHLi+q7j5UOj4hXs8ll4B/BCgzhng4Z7+ZDxFmaG15Ig0fsxOYQJaTT3utkdpClS0N9JKOPd08fSyfGZNJfwdoo6gYECryB6KwG7Wlzm3GDhxqg7ABb1OVaGdjoPDR18/PHH0qP/5/+k119/oxpL52cjA9eAUrUKGzR+i7uUI/pK/c4bPYtsq2GU5o1qA32dC5sV878FuOOZEvxmL0mBV160wVxteny5cmkXgBbwuJqHQjGfrSvHw/tbVp/h+HaA3hgTvbzqP3KYzF6gZVGvHr9LdXijWgnE/B9GJdsBEqp0tShQFCgKFAV2QoECvHZC1VJnUaAoUBQ4gApo8IZRHpaKBkv1Ci007fNqjK6cZhhRDWdGMMS7HQxIvI8CzOCNpGdA/mt/hj210XiQZI0V0DCmhV5Il1XEQBRQuU+vCbU0ObeQSNk1IDWvBV19PG1ixTng4QAPJksANCqLPFkxWBl4ecw6XDhgctLwoxwS6Jgt97phkHYYI2HbWp4er9rOEh2I+oWezhHb42puZ8/enT796UfS/fffTz/JeIUkNQw0LNbk+uPkn5LLtElSj7MSBC+DHj2SRniN8r1DXQsAsfPLS+mN5YW0ACjrk7R9hTmYkcbW+qPm1RC9o4JgRdXe+px6K8xyPFcANAOfA8BR9vDKwCuemsrLy2s4kxv5zn9RsXtXa7vs3j4zQ0OBeS6FXgEQq3O9vgnIGkHnVqefTs4cZVXGO9LtTfJe9QhdRC/hjzm+auA1Qn3CrlYllFDRfjvv4oMtYWD0sHr++ecjd9czzz676gmVG0euMsJM9aDarN35vK2918DLuTNNwnTnsXPWHFxLAC+30d5NqnduCVzMLZjzCwL++B7a0bfIQRVAGW9Unosu9cWKg9zDBSAisT/9F7pZBIvCMus1l9hBK/X/E6LfTFNhor9Z2dMrhz6qrQBxCe+7CGNnjqlXLhvP7YOmY+lvUaAoUBQoCmxdgQK8tq5dubIoUBQoChQF1ilQGzcaK+H1gRUc5kpAG727CEMDpuiVZL4cjWSNUT0j9L4IwxFQEwCAfRqm2dDMYXfrbnUgPgol1kACWmBE6ylRhx9OEiLkCWoUuXPYRsgVHlnLy3pzuQqjnl14dSGm55mcW1CkYa7AMU4VAYjjwBGN0Uk8qfS+E0rq4eXqdoYd6SUWea82gSw3NjD2l3YxaQwXE8AJDrzn3Nxc+s3f/Ej65Cc/TfvG6fUKHiOuKQjMwSHEMLPxUYEX7QVdGaAoJxLANOhTk22L/rRJcE8Gp7TASo1vdhbSuQ75vKBhQ2BYb4u2Na2ONkff48va11qPTaHXVYBXL8bFRuWGWUftaeXW/wSS9fH6Xqtbz7eODfrl/gmesUl0Pjw6kc4evT2dnbstwhpHuj38u7gM0GNoqCGN1ER4Y/bwipBG5sVQ3Xt4IYZHDuejc4Mx0LvrBz/4fvo2+bvOnXuLZz2Pl20Nj0MgUA473KBhq43f2geaFVDFuTHlHAZcCf0MZxSo+CxsKEh1O5+BAIVo4+fwSAWo6p1kXZEPjH7kJPfOUxZEALZav79f4eHFdXXPVn/L0E/vt4NX8u+O/c6gfgRQz9iwmMA4izVEnjS0dkx6PJttPEkF687tKNUmfynvRYGiQFGgKFAUuH4FCvC6fs3KFUWBokBRoCiwgQIZeK0LueOc8PgAsuS/7BM4BVgYI29S9khaCQ+JDsaiK6FpPGpshrFTGToasNkI3eCG+3xX7neGhxqGYXzjsaJ+GvStMRKKo5nQSi8oYYK5hYQ/rsAY3l4Cj/wv1FJPS+TRwdDMwCsjgCw53j2Echk6OE5Yl4a9oaYuItABSrrS3Y4Cr2isHlw0lLbnxPz2nZC7U6fSZz/7uXTf/feGoWw/BIDSBftuHriG+ajYr1eNBrbHRgFdLfqhbh3DZblHD6+ui+TzOtdeiO0SV7mS41ZKXGVzuZjNO0oNu+qtJ6yd986QxiX0rkMaRVrrz467VLArMtkPhStrtV1583jOCOGLMEafLTWJGkeAWwNydY2l04duS3fNHk1H8JAbW8YjjFPUdSAIpGpfZv8SeJnDy0hIx8dQUJ9bF5+wXgEpR9Nzzz1Hovp/SD979hnmDuDS/RwXXvrdsMa6FdGYbXzzmTEU0dxdY8xf+6E3oyG5QikB+9X0sl/ZK6uGxIBSF0Ggj3p8Cb5Uw+cxIDP1+wzqQSmoiVBs5mJ4dXEv+xn3c4hyp7ext7u/KrVXJ/XKU495ACA1rN1w0zGgF7OT4+aYyytpLgHXAx56wQHUbPePamlhUaAoUBTYWwoU4LW3xqu0tihQFCgK7FoFhCm1d4SNDO8aQIUhQRqKrpiWjcWcS0hjKBJJk3R8wCpxUbR66lIZOxnSrD9Qn7C/tyMkWbfXvpvzxvA+jfnwbEIUtQ7wANAwHNRV6AReYbBjdMeVnKexacljk4GixnsNy9RXTy6PCJj0YnGswkOGe8YKdazSp4eXcFKoYN3bXzCGqXsIPDBxvW0RZAkc9BoUOnz4wx9OjzzySDp69EjANzUxf1msEgd80HAe1bWL6wyLdQq5aqPeOdYdIIx9fbTtAHSEXhd7gK9+J11aWd5Sl7xdTNXQhSoclytqqmHX6nb1eAZeK2g+pP0d4OUSz0VXzzwNfuq8vDbvxMu8Wh65FuBFPY51XSIUlP7fTgKzeydn012HjqVjTcKMO3jv8RyGFyDPbc8VMOmIbbYVAi/7FX3gg8dcbdFQvewxmNLbrOj5/e9/P33/e9/j89ucbChlbnL0hWY4l3dqlUafB+euXop6VDlvBLZ6d0U4oyIo4aYFVavj9XDmU3kKqVsvVcMkhcKCHE8NTRg756CgecDWRSLM9RW50qyAk1Y/5woPxLsgMOYbYq7+bqCF2jZ5nqcdJ59NBfIc/jNUVEDZw0vV36xSigJFgaJAUaAocCMKFOB1I+qVa4sCRYGiQFHgMgUinFHDGONFg1AY4V/zBSx6DGWjB+AAkDD/TUAacvqE8V4ZPNo+UahHg0ebp86Jc9nN9vkXwUPAwko/oU32ljAkMecGMvRPrxLzIpn/RkCUDfpsYKo3/yo5AR8V94j8TAIhvmvIe68AYoJHiIahpzMzM+EV5b3iHgC1JYDXzhnueBDRjgBVdUNpe/YOYR6w7/iJE+kRgNfDDz8UbdbrTSBmWNnAvvJ9TAiEJ5GhbDGvxjCoOacLiHAumuSebGSEMK6kDi5Li+T8eqV9Kb3RW9jSjBJ4CX/qwt0ZgzVDvT4UoIiT6m0+H5QE5BJ4xSqNXBceXsCSvon2Y/DqGryCfXqiUYn/jZI5Pu6XK9v4ndNtjcAvwkQrCH3/2Gz6wMRcmsOza5JIv0YPeEVtK8CwCGWMewRby7DLPtEUp5D3to/CLnc7d4TXP/3pM+m73/1ueoEcXoImT/PZZcO4Ai1ZGMH5pGdhVMb7dhbn8tyhQ3gPTUabhOquGtkGqkc4Ixpcbf5Gv2hQVtx39thUt7yrobnz/C1z3umtFCMQF1A3D5TPYJ+51+d5jJyEzkX6Xv/2WdtBKY6HfffZtf/5dzzrZGi2+bwEiP7/of6Nd8wMyV5cWMi/ZwdFrNLPokBRoChQFNgRBQrw2hFZS6VFgaJAUeAgKhCWYRia9l4YoWGod5eGYayoh5GjAWT4T7uzFDmm1huV643CbEhnQqO32F4v6/tmXzLMy3DwsmPZ2g7d9CgZA9jo3WR4lpoIhPRUMj9XJM3GsBZ8eQybstpihvuluk98iM/5HA3RAC1cI1DS+Iz2aJzqTcWYzQK8HD+LY+a9FsIINQ/SWqnvKyao77929Ho+Ge7EOFOh3jG2fpQ5FHmRAjcAZQiPe//7358+85nPpDtOnow5Zo6uZWCWAWQjenihDbSouo42tQCvaLhISGasQElfe4IJzs+5u4bp9d5Sep3VG62nz/VDYQ+dCS8mzg3wFHLmPga0op1uPWdFPauuZtXX9dtxWX9s3XevQVo7FsBrmTrbGvyCTEPl4jqvruqvK4r9Vb0OwLpXDDvtwW0m5oVthGGlJmRugvk0w5jOTEyl+yYPp7NNwoy7eNQBOhscb/p8ci4K0GdvQn+jvfSVb2If2+ztbPf4+GTcQ0jx2muvpX/5l39JTz7xRMwTrxZs+dx7viDIBQYMa8wlblB9vr6NrfBq53huT/YO9DfnEPneDF/1fi5+IDwRiMY88vyAbRvfr34u7GmGcvn5cGLXz5Od8TyfycjtxT2FNYZ0eo7XRYgxwM/QPJ+bgH+2t2pzfff6NyB05tr9Vnye/W3y9woFYy7YV39j1CrCtJkTOa8jnoJMqghjRl9XblQ7x1Gdsnpor068rjaO+03H0p+iQFGgKFAU2LoCBXhtXbtyZVGgKFAUKApcpoCGYA5h0jzR6DS0aJx8Uxoo8Zd+DB1DVVwxzZUZNSz1AtOe2Y8GjP0KI1cAoaEW3+ws/wQpHo9DGtQmWMdjBDqhJ8k0wEkY5T5LeHUBFgwxNITREMOw9uPo9r1FexjHSULDpkmMrzHvuGq4Xrx4MTx5MnDQcKUDNEIjNDw02N74OFrnO4vtEibMHZ5LH/3ob/H6aDp8+EjoJwgbhcxwd0IdO+GRpgdOGMfs0ztO45luBDg0IbsGuN5S4InUBorNG+K4OJ8udcj3BKzo4f3VR/o+9Q7tVzWEXjdCOyKXFf2XVwnONiqO+JUlA6S81572eXOVxhUa5+qSy8JFtPbVB3qZK4uDqhz/2RD/YwcUi3vbAuDnCNe5kqI6mch/xWOEJdrOFvunUyMdbU2m22fm0snZw+m2NJZmeATXt2d9W+tRoLqq1Hu8tXOy1neU8MXz6cmnnkg/IJzx1VdejnHK2tfXrt+u1bh+7/V89rfEfkYuOvomFHG8Jyen08z0NFUZvmpeLcNw82IL7vMaTt9a4Vpbnn/HMghz3umd5Pzyt06As1q4kaDLUErBl96sWZOqIo5nOEZfuCgn8l+9+gB8YCAYEEOoDdMeZ7VZPQD9zcuwEfjL+Am+8mIDcXr8FkVutlVwegCkKl0sChQFigJFgS0rUIDXlqUrFxYFigJFgaLAOxXIXjpCLlfjMkTNPEt6eXTxRDKhusafBkwNfLRAt2yEvrMBu2uPxrXWbJTVD3zT8yUbx9mAVrdGeMBEuBQeSZ6tge6b3ik9vI8MLfTV55XzIEXF2/pW31NvHKGb46ehbjsFlYuLC8Avxyy/vLnXBOzk806NZd0uAaDeXb/ziU+kD37woZhb6jMG8GgAC5cBXnqI6YGjN5xePnrk6I1jPzyH1trsOL4CFOpx7TKhfl3Onwd4nW/PpwXBGfN3ZJI8Zpzed2EAIKXGuGBJo9vwSGFYH+iUww+p+QoBBErrS75ztYdjNL0CXtRDXcvcR9jVCeAFFKHtK+FuJVQD2mTXq9gK8CKfF5UEeuNmGcHRRvY1aOsY0GyG1RNvn5pNp2YOp6Pj02kagDaJK9fEcGNQt769G36GqI2MqO8QoLOcnv3Zs3h3/XP6t3/7N8DOEvBR8L3Fuje84eU7nXvOB8fT58A+T+C1Ng2kNUTOIeiz6p9QXThsiKHPXFx0xXhcXvPm37xXwBgqzznReGYZgNp71efW3F6GedaeYkI354v/GaLndXrDhUcmtxJs+9xYbhwURzV75s3xy+MBkAYU6uVlKKrPVfwmOqrMr/AG5nfH3zz/P1Jfc8Vjtmf6XRpaFCgKFAWKAjdXgQK8bq7e5W5FgaJAUWDfK9AC1kxPTQO8zO+DUVgZv+HVhfGph5e8IYfo4UVT/aVeg3K/FfukYRaeUG7pYPSSN41d3sJoVyONvpwQm9Xl8BjSOBYKClkGGHuGZgXsMnxP6LJTetEsjW/bYx4vDflswOdwo/n5S4wZbaB9uR3aoLkfjt9OGaLRXd6EBeaievDB96dPfeo/ptNnzgQQFGQZEWnb1HuSPGTCEAGMRQ8SIYx8wTEINERdJlwf6pnDa4UKOgCnS8tL6W3yPi0OACZ4fi0DkiLUz23UxvVUYj0CL4FYzVHcJ+Rya3kHAHNndbLncDtO0sMrA6+uwAvw1tHLjHEwmX0GXlGzJwfs8lsrvuFJRBv7owC5yO/Fs0X/W0DJaRo2x1l3ALnunD6c7iBJ/TRAptnLIZ+2c2tF8DAW8Pqll14M2PX0U0+mBWBoLByQB2trVV/DVfVcEHQKkHx+ZmZn8e6aibloWJw57WrvqgAoMTHrUbmGm1xxis9AwBjnS8z9PBMEVj7Lwi9DgSd4XtwySjHHYtQ4LugXWutpGMCaNlqf1zkM1nmQSvx+IY7eeWowAajUS05Q7Rz3+VSfHuO7BCzUWy8X4Tshkox5KUWBokBRoChQFHg3BQrwejeFyvGiQFGgKFAUuCYFNGAMTxSQuOS8oSqWnG+KJMQsNy+MEEJoDEa+JoyaNUNv68boNTXwJp+UDTr6JLTglf+Dcdn72K2HiJ5H46y+mBM313mAaqyiXq68qGdceMVhJAc8i77slF62l9X68KSamppMk4SI6cmkUe6YXrp0iTaZJD9DL0FAwDv6JcnZKeCVKVHWzkUPzDH20MMfTr/927/Nqo1HaZvtMLqPRRBohB4jmsSGODoWgq3sUSOcsK2+sp4RTmoCdoDXCrCxx4Xz/W46vzQP+MLYJquV4Y1DjutxZf6vPt47ghXHdRQvuJodRc1XiLAeLHl8fQnOIfTgZXa0ZdrZxchfBniZuH4Yhj1XVaGM4eFV3cwVLVeAXSaaN1GX80q/wRZxkiaivxOvrhNj0+mOiZl0qDmeJqjLpzLGiznp3NxKocdo3Eivv/5Geuyxx9Jjj/8wvfnGGxngqKHzfWtVX0NzgL1oZQnwBCA0rHB25lCsLOrvi89NV8AUz01eufRGnxu1VWDrEbStr89nwCK4qfPuxQIJQNQM/PPxOiF7D69Dn2fnZOiEVmv1RVUH5M15kuG93lt6YUYSe34T41n1dweN9NJ0wQyhodr7vB5MvQ7ItCjdLAoUBYoC26hAAV7bKGapqihQFCgKHGQFNDpd3c/E4BnqYJRi52msuIJb5OzS7ls17viAAel/7tw5A/nWjIqQJQwzDLRBBbw04oQtwiSP66lk+KfAaw0Q5qTtQ0KyeuRmUr+AS5WhF6AQyVaAITtRGIkAFjQvDNApgJdeF7bXMV7Ci8cwI0PFIsE0+wNAxLjqpeJ4bn/JBi5eH2hmzwdoI+j6zY9+LH34wx9Jx44ejrBGYdwA7QQPXmNYmaG1OYeXK1+aK40ZGpDCmvBmA960WK0wogXJ5zVojsRKjpf6nTTf6+LxRS6oETyvIFddOjyV8AAAQABJREFUVnXsAVlMkz9w0tLdOs9a3eurAS6P1QrpNWYOL724mBSRpH7ZMMwKeA0MHRXbVbBrlAsEXl7vEZAO3mVCt+wxOc68mqbfenUdIYnXfXO3pcN4Ys2NEO7JOQIWYZ2AzP90CNtKGdKGhYVO+tGPfpS+973vpZfx8tJTxznCW1S5UyF6jmkAS+4j8PKeAnbDbwUmegA61s5PnxvnqD8ua4Akt+/6+w18dLzVzG66qfrqNntqMd9YACBAth5LhOjZpgjF4/zIw8f4hsemILt6CXFyjWwOSMkh7YZ25z+MqI0a+nu45ulVe7LmUOUF83nxbAjga8/gAyJX6WZRoChQFCgKbFGBAry2KFy5rChQFCgKFAXWKYD1Z0iRYSnmfMqgQU8LkzYDCwhH0UAR1mgjagzr9aT1qJFj0ZbcT0UjuAZeua8wDUCDubuENhrCgiS9uoQwGrxCAw26Abp1uu3wtApPEAz7QB/WWesV+m2/Yo5dwCDGw7GaMi8S3lJCHYGXIKEDwNTjwnZqsHq+46dnmCBlJ4rt0kj2fs4ZtfJ+p+46HQnsH37ogwCww9yaED+gl+1xa/iT4bXCBUGEWtdeN2pKq/GKaqaxCni5pweVGjAkgq8B519kBcc24GxxyIILg2VWUgRWCLz0EEMkr/FVlwBn9ZcrtuvP81BmHWhmn9gIvPTw8tUTeDkIalpBr7xlFx1kSNgCWKBmYua5xng6PjGdbp+YTUebE+n4GInUmTujvFx5sg7LNASySR6vljBtC2VxqZOeffYX6YnHH0/P/eK5yONlE50Pq/Dnyo5u4T4bXZK9D9UkF5+h6ZnpHHpLI5wj/t60SRJvCCGUKU7cFuDl/PYZrF65BbSFfwJrn/OA07TB30HDaA1xdJVQ/wjgA2XLhTt6odXAyxVXnc8HqawBL30ShfyiWBc7QTf+P6KHZnhe8lw08JQTZJrE3v+fRMiqofGlFAWKAkWBokBR4F0UKMDrXQQqh4sCRYGiQFHg3RXQJr/t+IlVzxkNQo25JcIYuxgpEfqlsSis0eLDsomwJz74Ne+MD/vmTQ00cDW4wzOEnmm4uZqcia316jLRenh7AWI06Axf1DtFUGM4VmUjhyYCnIA+QUisemuw4t0E9h7mEPN+AgwNz2m9vDDgbb+Guh57i3hbZODFan0BvISYOwm8gDaABEUxdNY5pE6uzHfm9On0uc99Np29+z2016TlAgVX6WsHADGZeITSIlkOlaogFfWZtL6JB1QLTygGK/fbyp2rLXRAiyVD5MBbbYIOl4Bei9y3Tehkh/2RsN7+c7Wgq97WOtff3VrWw7Dw9gJq4R+UQxrZkXN40XYgSJ9+CKk8wxxffsn/oQIVNpgz48wDQdcx8nTd0ZwGck2lo6NjaYq8YBPczBxw4JRYbXJAHeb5GnBxk7paQK/rKRkQJkIZ30pf/erfk6T+l6zceSGee8fF8fecAEJ834mylr/J+7ia6GSEMwqRnY8+c87PjonO/V6V7QBeVrX6XK9VHJ9qgO/x+l4+285V8+HpteTvn95JnuNc9o8AtUdaB5ATk6eud99v6yfCZ4f/4netAtLo5Cqx/lHA30pBtdp5jmPr/1cCZtZV7HutSgeLAkWBokBRYKsKFOC1VeXKdUWBokBR4IApILvRvghjdp1R52p+UySL1sMhwlM4JhRxVTKNE0FD7cVlHXUJW0WqEmXdgfqEPbENRbSxV4vGri+NcVdw06C1m6vhixHilI1gQ+vkAoKCgF3AwU4FvOIYtWYDmw/UEXXHKHjZupuu3n07PnAjOxT3w6PKsEvzsgnozK1Dn/TyagszCbdcHcLq1jsVymaD1kBCBjXh7UN7NIzvveds+sQnfifdf/99q94yepEIxcYAXnqomd8rPMTon7nlQls9teBojVHhY14hLmASnnd6JPYMQeN2Q7zz+mzxGWMFRXKrAcrIoEWS+346tzgPnDLEsYJy6qeRzlZQJabTG6wOgRSmhfcKc2Rl2aTrnMdn7xMhjdzTsEaBF8OgE1eGiQ4N/40Cs8CM6eTs4XSkNZ5mWYVxrjER4YuHgHf4FEVC+8hnRme8vx5e/lfPmgjD5L4BqZyvHvEg93Bf1obvFL87DxzbX/36V+nxx5/k9VR+vgnhWz9Ho4K4qr5TfNm2N++FVMAtflcYn8Nzc0DOqTw3aPvi0iKwuBvP06BanTFfw0XqqaA3ULj9ZSWq4825ZlkD0flGWZu8SqjeaHklRxZIoCF1Dq+A3bYZyB0eYpX+ca0j402vvC9j4X92aO2elzVtj3zJOq011v76zVDV8bxSLLrZT/9fMuS5E2xeJJdg/B6wv/5dWKsjX3/59/KtKFAUKAoUBQ6iAgV4HcRRL30uChQFigJbVGDV2OODRrohbnouuJy8icQDbGG/6FmzhOGpt5LmjPvDoN7ifXfvZfbucmM0PNcwwnLJHgvmk9LYVS89PoQNei1oqKmbq7a5emWEOAELA+Rw/NaUy6GA7WzSbsfYEC1DjgzBMo+XYZe2WWM0rFSavFO5xa6mhfNyenoy3XfffenjH/94Onv27tBQoNCg/XqDqKntNM+cXnb2IfKhgYMIxCMmrRVeUysCWs4bASh4foywYZAAHxPWkwIdKEVuKBoUqzoSHniOkMfI64Uh7qpysbIm54W/E9e47dEWoZif474+Q0A2stNHuJtgzJBGoZiQrc+rxzG9gITJY4bIGeoF4BoXnHDtHa1p8nVlT65xvLmmyEUGkgwvIru0HEntqz7QXleMbNChBlL0vRdt8KjPpl567IqhDE86ztMzSTDoPBW6vPTiS+kH//qD9MwzP0tvvXme/V5xc4va2R4h0Thzcg7gpT7CEMNVL1x4Oz9TjEWGzTlsOrxLaerOAdmr65DDmR3DsQC0EQrMWNEiII4wx3x9rsaaV3GM+bpuXK72O5PB2NXvv9eOChD9zdTTyxxt9R8AfB719HLxDH97DAF30jq+zsasmz9HaltKUaAoUBQoChx0BQrwOugzoPS/KFAUKApcowLZMNY8o2BgGJI3M5Pzdpl/RaOrXpGx210ObwWNuNpYDoPtGu+1V06jy1GQI2/FB36Jf77lhNpCQaGRIU6CQg1zDTO9uvTqWAYMarhpjAsezDGldremVJ3h5n4SgzT18sLo1JPKnET2UYhkLi9zJelJo4EZoY2CopteBDIrARPuB3p96tOfDvilB1qX9gluwvuQHjkOhjGa8NzcXvatxzi2BWLM4yYgaUz9gU0j7GsRUuW8DpiLl5dwokvfI+OSkIqwxw65tMKDyzGtFxtg/HoAJ6FTj/0RWshW4DXUFnfy8BrqIYWx7mefIdXToLd9zgcypKUpPOtmJqbSLIBnqsXCEPRnDC+vccIhW7SnBlmjdCGb+RlkBQHwVlTqfpPUe47QiyxnaZkD9sv5ZnFcY/7GN66jf+EJxvcXX3wxfec7j6af/OQneG8y5tRzK4CXnmaG++ppOHdoLnLM+SzV3lLz85cCdAmSA3jR9ghjVWP6vb5/VTdvykYtuXn8BuQcVa5k20JkdyMmH9wKv2NRCOZuDvPbrHlcGLPF437eX0VA6H/+ZgraJ/Hiy6HMhiv7RwLCig1d9Y8qPCcZXvMcVmGsXldKUaAoUBQoChQFCvAqc6AoUBQoChQFrkmBMIYxsDSt9HaZwgCZBXhFXieMNGy58E7Qu8vVBTXtwx4LI/qabrHnTspGrAarOFBrOnchswySguvVBSRy5TGhS+zXjMP41VAzv5leHXVydQ4EgDGRvftuTak6ESOdP2tMjuFZZF/0ttCjxvHudJYil1fXfGMUvTDcf/OLnnI98ozRTsMb77s3/d5/+s/pzjvvJMfU22EwO1fN/xTJwgFWlsgRxDVkTwJ4Ae0ESIxTC5g0YsgcfRnj+5D5LdATnAi8hFpyPcdxiBZ9uAWWuWQlpoCeXD2AS49wx/D24qGJLZRI4BUrJXKJKbRgNRQMew186s//URV7m0ItoIheWxMRqsicAqIG2NLIJ6m+rMo6Yw46D31VLCRAD/UE6KK9bgN+se3TXhPy2wevEbCpj22JfdHB7OX1yiuvpO88+p305FNPhGcNGIy22umbD1qci0Ihc8sdnjscQERQpL4+TyasF3Q5TvbJUj+Pfravt6oE2KIxzjGhl8+TYEYA7jNvQwOEGzJMPwR7eq55XbS6brvzhFeASobgVnmt7aSO8UcB+iv00zPWPIJ6mdrv2ovLsXbxDJ9pRMrzmHnLKbx8gkopChQFigJFgYOuQAFeB30GlP4XBYoCRYFrViAbFHpWTBnGqNcSRlodSpK9abqVx4/hYhrFYYdUngo33zi+5q5t8UQhhTaoBqeGtKDAVwNQIQic1EADLLgyYxOj1lKHMGqsRb4ejPNI6o9JqwFbJ2jWaL9VxXGz1Ea2RqbAzlckkwbkCR70TjNXW0AGDNNbZ2Sq/wCAhTdW5Rn3vvc9kD796f+Yzpw5HQayHkAZ1AUeCiNa76ZeD+86jWMAhCO00kN3+qJnlWGNhjiap64JmFAHx1nvNrWJ74y3AGtUfZjzznuBk/cTfNUgTPRCbYAZQAxbgYyTp8HJIbfgifoz+MpwzQTncVz4RjsatMdwRPdxeurjqtWHYtmWFUhWjJft4oN9Idpy9fPqQfbHDenPCvNSyCVAcA7bH8dVCKOOAqOXX3k5YNdTTz0JpO3EHF0GaDdGx6uKrPDmFZ8vn5OZmZkIp7btMY6MyaWLl8IbL6AW2rpVZroVfbOVfr9VxXasFr4IcnwJvwTKFs+xT7UHZe3BZF+yF1vuQP6tEFhyPqB2v5V4tpi09ts5aRivwEtI7Xh7XK9YvYn9I4tesuoW/z9SxP0nyX4b4tKfokBRoChwUxQowOumyFxuUhQoChQF9r4C2hBaYxr/0xibYxggwhu9DwRf84sLaZm8TtlbCSM0gJeGRzbuK7N+7wuxrgca3xpWYWDzUUMswJCAi5xLhn3abyGWx/TWaOMVtbRYrSCnUcZ1oW3Iy5eqRJ31l5u8rcc6xg4j0kZqdAp09LQweb1ATwPT5PWGFullkdu81oeb12yFFHygNrTH1fkMYbznnnvSpz71qfTeB94bOdLM37UC4BEwmkvJfpqAfxnYYw6vpmOkdyLzusUYNjjBXF966LWczw4W8zmAF5d4P8mTfo+Ob/4uanJaZGM9Es/HabxVA+2xAF7cdxw4qm4BwTzFPlReP5j13jGtmHxd4AXYIJV+GqMtetMtrpDkHHcvV3KMuqlfry6bFbBLiEU7ow4bRRHGqZakZMgXw5EtPsOOqZBNbym9i379/K/To48+mn5KGKNQQRAWgCyAm6taWvPNLc5Dw9tmmIf2WTAn/BG6Xrx0MT7fymfnamoIMy2CxBwmS242gJe/E0Ivi/M2vL34nP+IABiv8pE5bx0v+7ffgVd4wzG/4pmqthFSjYdpCzjoPBB6GcK4xIqc5ozsA6v1DHNe7Eevt5gg5a0oUBQoChQFrkuBAryuS65yclGgKFAUOLgKaKxFEmEMjgnyCfnd3E0aY5FEmNw5YYwJDygCgDD7Mc7ck013j+yfsh54jaCHhqogUE+jUT7nMDixRQ5p0wuhzjvjPg02/sU2VPFLVa6ev6c+a2e2tisaLYjByNbAdp8Q07xtJn23n+5bJvQy5/LqhPF5a7y8bJ+zTE8lwBAhtzQ54Os995xNn/zkp9LZs2fT8eO3iZpiDAQGjl+DcVvGUO4xl2MffXIUhDthbFOPcui1F+PN/BZ4OalDJzQhVzy1sguQEUWtBFdsI6yOxghChRnZgOdcG8jpgjQ1Fnjp/WXy+hGMdg368Bw01FJwxcvcW6vhibSyN0JS+8rDK9oi6aL4OeTgnLyHnbY3b6oPAljuSb8bhoKSm03YtQSQXcBr799/+cv01FNPp5/8+EepyxjrrSgcFAC2xszjZo6k1dr5fHOK+Zycg8IPx3oY44Gn4SKLZAC9ok00a13Pq4YhQJSb32ZvG+MT9/eZyjDUeeV+50Ve0CL/drSa2YPS/gnGAigTxinI9TdW8GX//I1lyPalh5dgNeaxc9lOopXPkOPub4+h1T6PPiN6Hgre/S3aj95uMW3KW1GgKFAUKApsSYECvLYkW7moKFAUKArsUwW0BWu7cH0X2a9RZkjJ1BShjHjDRMFA1wtBY2MRryWLRsqaUV8Z9lR6a0BINGkb3mpRFGit2FdxnnuFQTk3D8nd8R4arTx3tNQGJC43EfWywEBAiG5eawnwEZ84Uy+hMPDwLOK8W1XC0MTGDCaDgW0oVTaw8fDCu0/gJfzU40uvtViVEy8LvYJyv+hbLVUt3Y52xpsAlWgPiCAAUuTbom3Co8Os5Pe5z38+3X///enw4bnVMbBJeoTEypOG8AESAiLQ+OzFlUFVeNNwXow3ougFtjqGjJkhjXpsuc+XdcTKnLRHyCmk0Fh3fkQSeLSJcefcFs+S940cX2z11oo2cD9OCuDRxODXo0sfM24U3l4Be4RdvryvnbFet5QYL+6/uiP25SPuHCEn2ArZ8/WQysAFj02gyhtvvBGvb3zjG+kVwhmFXIJc28dtQgOhwgjze22QrXcHC/3iX5QpPLtmpmcDCKqb/VxYWkgLrNrn+Kh1zF+fL58lrsrjEl/5VteU67tZ78IZ4aeeS7bP3wtL/JEAYZ0fLggxAdBbXeCCOeCcXlhYjHnkHxfCg1awSjecl273ozdTzOhqMsd4op9aOFcbeMWZk8/99t38fYY2hrcmv0E+Gx7baKzd7TwupShQFCgKFAUOhgIFeB2McS69LAoUBYoC766ABpR/Ma+NgdjypnGGYeVf1McJCTOXkR407l/GyJhfmE9LeIQYDpXNy3e/1V45Izx6kECDKkAGRn70nX16IGikCjrcTk9N4X0wQddCuDC49MQQAnWBHnof6E1zZajOXtGibqfwbnoK6DDLggWGuNF/tRng9aQnyvz8fBjsGqZqkT0uACQAG6Xx3J0p76w3bF5vxodJ5u9DDz+cPvzhj6Q77jgZ0C4fMj8ZnlYw3ABPwAQhhI0VPOV+ZDARgIW6GqzkKGvIsMLrWfnRyjYo4aW1rs9XPiMTE2OhYZ1o3bZqrHvfaA/zLIAb+wKE1RpaZ8Wc1DRCJLm/n31Zhytr9lgUQahV1xkgIOrg4hU6HgWvNc575dVX8ep6MkIY33rrzbi/Otg38YHb/OY3S73N37bnPbffuulCtNvn0Lk2gibOPVfWVEchereb55xjoVfc3vXwyf0WhDlXzZEoVA5wC9QRdvk7UgMvIbS/J/4OOT8cV/XKb3kkdu5Z256R3lItzgnmw6GZQ9UfFlwoI2Ym2vTSAqH1hrcqRTy7iBKgkYnrd6FZ/qPDlu5eLioKFAWKAkWBPaZAAV57bMBKc4sCRYGiwE4rEEmzMRdy2E3OxaUHjMDLVcU0MjU2hyQJ73ZcGn4pQkr0QNFI3U9FUz/ggZ3CcNL4tAgXakNTqGC4VwOvJ4/Xxme9apzGlWFgJlhe9TywngATUd0eexPwtUhePxn9FsLYtxzeisE5v4BU9E+pqj6GbBiphvDVxunN7LT3j4UDIFunz7wH6PWhdPbsPeFRo/E8Pi5gcgVHPWhYgRHAoHGst425ldwvUKmBlwnqne0ZeNlVyVMu9i9ekiH+CTDqeVOfs35r/ibPt+4IiaTiAFzo6n51FeQE7Aohs4bOzYCI9K2+p/Xmz1n+AEXc32fW+Wp7LcIjQxKHA4+NBKj89a9/lZ5++qn0i188ly5euBjnc/ubXgTCAZFpt8+cwNA2tggTViu9oPJqoHr2+BvUjhUNBYbqsRe9nWJYo6/ZM8k/HjjvfBneWI+DY67HoCF8/rEh5iMjtPq8VaNVzwG31h3Hb/pI7twN83zIYY1q5LPquPf6y/xhAW+vdl4QxL6rnbr5r8775e9wrenOtbLUXBQoChQFigK7QYECvHbDKJQ2FAWKAkWBXaFA9hLReKi9CrQShFwCnRymp5mPoY/xrMFlOGP2OLgFlvFN0Mx+qoEhXWFM81kooSFp0TA1xEqPDIsgMAMgDHEMU0NsNMT19NLIijMALKEvdexJ45z2224BxCxeXvXiBQIV+7hkAnuMTmGEVmUAUq7RSPW6WrsQ7Ca+eV8NXr3xjh09RiL796X3v//96cTxE8A7kocDvWy3wEuj2b5EviAS1keydgBvDbwy3M0QyX3hVYRxnWeAm/gSvaufp/iywZs62rYAzOhjCegMpHK/IaOGXdY5wbyHuoaOQubqXvGda+utc1FvxPAqZN7ajmbD8EmeXbwN09Bw1NF07txb6bnnnkvPPPPT9NKLL0QuLNuSw5LX+hENuwlvAf4go5G4vSIWgjt/g1whNJ5F9gtZnWvm7QqQFxoKjPJv1E1o6rbdwv5VXY1nxIoduwlgjrnVhF51MnZ/T/xtWV3lFUC4Wqp5wWZtHjCE+w140bt4XlyEQk9TdXLeh+cWYnQJH2+TxN55kfOdqYHzIj83WY+bP7dXx6l8KAoUBYoCRYGbpkABXjdN6nKjokBRoCiwVxTIHhVQmcgvlD0NCGXU44KiAbEM6NLgEnppaGigZ5ixV/p4be3U+LZofIZBWgGbDE7wcsII14NHmCAEEYppiLeX2miDIS4E0vikngwiBGJhgWp7VfuurS275iyab38i9IqwK/O6OTcwJQMI6c3W1gOF+aF+aqNBb7llc4Tb1+G6tl3j99ChQ+nus2fTe9/73nT27Ol05Mh0gIEAcwya0MdB8rt98Lv9yd8NIVvzmtKwFjB5zDmwHk7Fvuj9Bm+cLyC1qE1dMrPJXpa2wXPWe3i5z3nFzfKrvvCKbQbXzD32Oz+jH1zoynZvn59PL7zwcsCuX/zi5+mtt94KOOu4WnnUf0V9N+Or88hnpdZT0GNCd+eZXqbRbRoibDe5vr9BPo82WMgaOdJuRkO3+R557kQ38u8F9Qv3XABjcmomP0eoUs8tQxwjUTv97wvmAV/qFuNWieRv1v4szGH6rKfp9PQMOd1m4jcmvPx4JpZ7XVZtJIk94eTOdUvt/adncp4j+1ac/TnkpVdFgaJAUWCLChTgtUXhymVFgaJAUWC/KaBxJJjQI8QSS8ADNAReJmD3uAaVybz9C3qH3DnCjTDGBR7AgDC29pkw2WgE6FWGuMb1BF4/6jIxORWQIIACGvTRZonV4jp4YGTAhRgczIZo1BDqaGpp4PIe3/fSW4ZYghY91dCCOTKF541wRRhqh2MlSrxvwvOG/bmvHqoM8pve4csBVq37JB4iR44eTffe+570wHvvSSfvvDMd5bvjJdB1q0eYc9x+mwvIZ6SGT+7znAwhonvRf3blLe85PHHzcfZ62yNAq9gX97KurKXHhD4B0mLO5Pt43Qi5xOq+OB7ri18FJjEG/z97b/rk2JFl+TnW2DOTyWSxWF1drGJvqtJI6vkw+qAx6zGZNGb6IDPpj5VppC8ts5HUrbEea42mp/eujVVFFpfcIgKBQGAJnd+5zwFEMkkmmRkReIjrmQAe3up+/PoL3PPOva4NkLaQds+fPSuffvZp+cd/+Fn5h7/7p/Lb336sPHwKQ9U+tKvW/bbsk3qDCOQF9YmQYcKpFbqm7xAd4M4YY6yh6gnClRBTJeA3JutIbP4yfU2b6SPspdoaSBiDHeXzEvFFTi/Cy5kB9lI4TJR3bSpyB4KdnF6oTwkHpS+tGnPoqtZjUFtWsBPsmTDXw4N92wdNhCit4faTCxHvTRJ7tjFmwCkJL9DIkggkAonA3UAgCa+70c/ZykQgEUgEvh4BORA4SThNONfkyiGECAerOgo4zzgQTp4sZwvnwQ79liq8KocQpAShZr2yoxBPlCYkqIf8ggTBMcURh+g502yV4ISaxp4nyMvRgkiwY4tnq/0hOJZEEKtaUnDGccxd1BZCXg+YuVPOOM4m/51nCAWgQucgLmhy3eYvN95W1D8zEwZgTv+gqIJMoBwc7JTvvvdO+eBHPyo/+uCD8s4775jQZF9ezK4YedsahZeIBNoJFtjIjmblxEboX0IQHd7p7xFKWK/zsmbPRDBXEg1CB27isgmfZH+OZUbEnsYYNhMFxx0bgvCCfFzhS32bb9qOSiyS8EPgffbZZ+WnP/0nvX5aPvrNJ8q3NvIYriGZcWzTLl+Ic91scfXVILBkDO3qHoSSElKLNhNyyot7ECGo7Ed76z2qjQov244GRvR1YA5J5VBotRkSD4J9T+QyBA/kslbT7R5Op5o4pObRq7ZHX1rVJHzW1YM325vXdDU1nPbRLsZOvSdzL6L/wYbJNSKsXGH3+pvFOIgSY/qaapanTQQSgUQgEdgwBJLw2rAOyeokAolAInC7COBANCFEIrx2lLQ7HAgRBiJ0ZiK5nDC5eWpuBzk8VDuct0NmXCdikBjxciJp8pnhdIrs6vUhu4LkqKo3Qj0JqzLJo+PWHVg75QDk8+GwUe9wbq+zBW/63NQbAotC/0PSLNWAUuHgWIIBxOi5Eoo7ubacbohR20sceuPvXBu+SO++doQoEnKqPiwog4pzkr373e+a+PrB+++XR48emWwJQqsSXKG4ogNpaxAznBNU9Bmndz/7aly3rntJq6dSSeK0gyPElq7i84aDHiFs2BHkT8UvbJLLBeHltjUXqcvsA8llouvTT8uHys/1i5//onz024/K8fNjkQAK9brUNXVubBI8UKpRZ4jsqPJXVPwlbXlTq2gKbYbAcB4r2RXtok2QGGO1CxLDcGs9pDNET7Rd7WlZia7DnsIe6RO3tyG9IDpRGu4Ih6FeQeywDw3VbLnCAnUpBLMnXRCJamu8ne67AfTjnlzDb8GAHJMHyqe4o79b4IJNgMe5HkJgLygBIQo5Bjta3sRuoLZ5iUQgEUgEEoHbQyAJr9vDPq+cCCQCicCNI2AHKbwk/+DHWQ83PZ5643CRF4UwNRIC95un5TiWqHbGIjBQVTh0TQfiqLvIgcCHaF1R9atjicMPNDjaOFDQIDQK54h9CK3aN9lFEvNwqquCKcidiYkKSBWUB6iIQsXF6SrNEggZqjbiRVNQ88mZpL9RuIENZA34oEKp4UIoLEy4aMY0nE0MbolHwOD3sBujLdQbe1rb/qYWqaeNns9mkX6y81vIwRXKxr7Ua4dynN+Wyuv7v/P98u6775b33/+h20b72B7tiDGjnpZzPfVYiGtQ4yDF2I9rRhtZr2UUXPrnb/rivFoWn9S61P1Xn5wHm+PlZvhoro/qSYo1nUdb9D1IIdujxuuHv/xl+eST3+rzw/LJp5+Uk5OTZYgXx14uIFlCtVaPNR46D+RAAOWLvdE33zcESqjUot6AFASiFE0NuYOSsq/ZT9frRm4mSC/PXqn7D+eqxHPgT73bVVxvVRuiHEzAvtqOMWr6tqP7MWpDVF6QzCZBtS1suIjsunAi/6mI95VqT734AiRhj2GFulK7wHJtVzm8+ApuqE739g90j9bEBsIIe+IeHAQpxHuEmZvwMlFdcYn2B0Ys13HnC+VbIpAIJAKJQMsRSMKr5R2Y1U8EEoFE4JsgwI96HET+4UgtlUiNegTHCacep4FPHF6IC9YTqoezuVUFPASKFSKQBhALSH1Uat4bvjMTYSi7Qmlix1z7QADORQBC6PCCCOR8lRDbulAitRn7WRFFQXpBeOFI4ozHTHoDO9kTFBbKL4QqEILC9scbhU/Zlf7bvnA0w8mPzTf7Tr8F0UAfMi5oz74c6MPDAxFe75d3v/Nu+f7v/kCfmtVRxCd5lIL8grgR4aXmEM5IkmzOgVoKQoL8d1ALLyMWWE+o3ozjFHIJAQ0GA5E8HKvNUqlE2B44cQ1sFBKImSPFPvqaqMRmIt1Q0z158rh8/PFvFb74afnZz34uNdczE13YbBBmmuFQdbyUuqtrhdjNIs3VljakBlYSj/ahUtLoMXkK2bXbKEypO8olz8yovF3gfNcK+FAgw3gogaIJtZdtQevAEZwgmblPgxeDC6xtSByMAWkd58L2vJ11Qr1dpSG8NAZpXyU8Q2lKCKwUuBo/4EGoOeOCe/W0CcOn6RTu1SYbm+UKwzbet93gfEsEEoFE4A4ikITXHez0bHIikAjcXQRwDuzf6Je9c8TIscfxQZXTEbGDogsnP8JCUA40DgOhjI3DsF3oharETnejnrFjqbdKEED8oRyAzAk/CWdLuIhkYKY4VASQFfNZhLcRjsT5cJ4uFfK4baXxmdWsaJvbq5UQRCRJ31M+LwhCiELyU9WwutmMPDo6xgCvo4KzXXG6JcdbObOoQ5CdcqDVvyY8G4eYPHZHR/fKI6m+yO/1thLbP3z7kT8Pj5Qwe0COLWmscL51LC+ahB1AFvPPRKjIKvapxCrrHPJZj1EtcNT7uh7XpGBf2JKd8+qRewszFc6UcP5MMy4+Lp8/1uvzz8onv/2k/FaqruPj5yY9IBq5Pn3DuakP59TQ1jkJibz54vDDZpws7cljLiYJwIYgAklUzycEF/efCE0TAYgd3aFC39uO1GzwgmzlfkQSe9RMkMx1NkIeZEzASqF8VVm5Gl8vA+2WxtzLqvLK6+L+bFJYgNQxBxaEwO5LoTkQKUgYPq3jvsN9aDyGCLwQhughKS8hvIQxWGdJBBKBRCAR2A4EkvDajn7MViQCiUAi8EoIBOHFT305DKhK5BBQqjPssD3IHTnbbCc3FblyUOigGNg+R3OlFICwkadj5RufeJYoBghjHAwIY8SxgjpQbhgpBs7kPNUQpEqQ4CZBctwNwsumYwIHJxxlDmFFkKVWn5iw6diGLjSrJ+GfhNpZVcih1anUwf6nc9RVceabeydJPE4uI8PElAnLIIXJZ6VOVztFCMtGIKNIov7g/n2RXm+Xtx89LO+9966I4j3nAKuEH8436hvUJ8waRxtNfPkqq7aZ0Gq+1mtDQFfCENUTuPak5roQaTg6HVmxdSql0+MnT8rjx08VtviJPh9r26lJDhNaqrfHq/CNWSQd9Gj7NXmicEZZ66oiN7iEGq0n0sbjRNhWZRukIQQz96EYR5G3jHvP+GxkEieqSd3vTsEuKJX0oj9R+Nku9HlweLhG4pCwHVXTxOF8EDw1dF0LAZrHXNh6XRUb2vSOei3sF3uHRGXc8LcLArA+tEF9SqvJr4jyjRkt/Xdw2dTAtoHY+8bbcodcSAQSgUQgEWgxAkl4tbjzsuqJQCKQCHxTBILwCmIhnorjiEeSesKoDg6PrBzAkYLwIgzkTA4COWHiqfe2OZqiIOQNQS5UFQUrcCaHw8hlhlrJeXTwiLSt5skhN4wx0To7ouoM0FkqvLS8fQQhFtc4zWptOIlqdWMWYAjRA1Fo4sukl0LVpIAj99uZVCd2wEUcBnkIyRSEDCe7LbxMCKllEVaI0ktklR1l1FC8plcIGFCAkKGtJLS/d//QM3ceHBw6BPLevXvl3r37XkYZBh5gw4vj/NmovbAjnwsCSHbIuDNeCjscy0E/aUgsFE7k4Hr69Gl5/vx5gfBibHI8L4gx27KuAZb0U4xZamvTXX6HWILsIofXbRQTf+Chi9fwRMbbjshlZtyDgK9kBu2queAgTW978oPbwKtiQQczbtxr4NeoBR3Kx0yWuodTQJa+h+Rx3kURpfC2kLes53jOiR3aRuqQ9tHteLOJuyWMT6kqIZW1spJeKJUJPQYjxhRtPxfxPhqdCsMgsdvR0qxlIpAIJAKJwOsgkITX66CXxyYCiUAi0DIEcAgaH8EOAA4UyiacTGYePDjY1/pwiHAKRnK4z6SsqAmi4+CWNfqrqgsc4TkFI6B9IR+qymQoZRd4oR6gQNqMRDLgSOJU2nFaEkDexeer5xSUW1dQiwAKJJEaG+1TOyExsCfChXC8IbzIwUTYFetRYZyJtHEIHyGgOKE4npxN5wKz2yK8HI6oehCC6TZoTNA8yAVIMNevUUO5nrRTO0Rid+2jPHeEV+FsmwRTKN6uFF843PtSm5BziWugPiFU0aFowghbg8zhPIxDyAcUlYTuTeScEzJ7oeULkV8TqSzZF5Uc4WvMhGk7Uz1NYtS+qJ86l8mR2kUQHvpHMWnk9tyOwouJD3Sjcf2wG7Dblb3s6/7T7xHKiR0p15iwr2RXEHqx3oPSLbkbb9ia28z9RP3qf1p21+qNZPbYFXnPSGiPli9GKcomhfJp3HEPR/lVyR7w5bztJbzcegDx3yxCkIGHgn3vadKVI5HO2BaqUtCyPUmZy/gCR0rzwZKPj7PWc3uXfEsEEoFEIBFoMQJJeLW487LqiUAikAh8YwRwjpqDqpNcQ7QIQ8MR52k4DjwJfnGUIChqyNE3vt6mHwAecvyq0+eQPNRJchx3RADCHUDUkAuGnF2EdqKmwYHCkcJZYp/1wjpcp1j9wsb1HVu67PxLcigha6oxQVQ5bEptZz2ONOQOJMaOSC8Uc+yDuoswWYhDwtTIhcb6pfOt5dso9FLYQFy/ql8gB2gvDjQlXGIvqunRt3K3TSJgD5FI3ju6TZ5tDzy0q/MGaYG2LkMMIRxos7azL3Wwvcm+FiK15tpWCca4qt7jsv5qrHVcKHeiHisHvrgP8OJrvTkXbbLd0gKFSd5GWRItujghZyRfNzmqT75Tx6nIrhqWh73U+5V7KLrpNqp+K9dcEl716upA8Kh9bdtRL0N2HTgkXSSzCiQr4w3SEAwhDR3+pwMxI2zSdu+92/XGOMKy1wtt4YENq1EsE9romT6lGGTgQPhBYD9/9txjhv1q+42nVlRc1s+by4lAIpAIJALtRSAJr/b2XdY8EUgEEoFvgQAOQuMx6wPHe0dOpnOe6NMOlNajJomZviC7GqegbvwWV93sQ0JpQjgZyq6YoVKzfPXD8Sbxc83ZhdMY+F1aLWA1ivCy76UtxsokBThD5NyOguY68X454RVECtftKcwP5xEyBtuC8ELhRIFwweGG7EKpNBOJCFkDebQkHr3nzb7VkEa4pzo753oNrPJSJztvkuyEuuJYo5qh/j0IQBNeqP6wJ+lrMAaNL/5VwollSjjrcYUgTiGZtZewudRskZ3LlVGB2TpZxlHVOa+5wYJ8jHP7rFpE5UMJ0k71YZ36hAWTaJhoo1pj6SaLr68LghlJxnfJk9evYZ8BHTnyzvWKGSVVa2HpIlyB9i4V20tzk1mOE+MQWNT7D0Ttroj6fc0sSpgj9jRtSJ4Ycwp9ZczJPm2ZOjAIn3VAA+egfmwthpq163bMEZhplNXxtl2tjP3r9jf/SZvrVcHE37WC8Vsx4p5OSPGBkthjM9gShOrnjz83+YUMrrbfY0r7cJ5tvG+/+R7IMyYCiUAi0A4EkvBqRz9lLROBRCAReCMI4GhWFQo/7FEx4RwxOyNPv1F4Oe+LQhnPrWQiTAQvQi9cJA5qWaFdNWSMquPs4RRZHSPnx0nU1TxUXYdK/owDTqHJzOqF483+qJECh3CScJCCiPDucYwPXL5poX14uSFf+YYtqMgWaJ2/1Tets5qrcUVJTE6oFQoeFF8D5WmikEuHnFQoeILQwHHnJGBqVzxszReI63mzj37zb0uzjkupFrEQLYz+5qq2f3dptNx1Zld99b6x+gvHf2WNfXGdxP/jur5WYzvUpdZj/Ty1jnXdsg1e4Up6KXBt9lqtbjpufUU90yt86rBVTb+4PwQi/RUzB0ZOtLqOsUSd+kxwILtAgcN9B7uhDeTpOh9LkSQlTpAzMaFA9H/YhwH/4mW3es2L9971fq3L7AOBGjm9dj3BwgIVl/pjMb/Qg4wzhchKoapbmZha4UuoH/YFrhFa2u2Rs7AnZRjkre6dEgF2yY8l1a9uhCJj9dFVjjVdZ6Yviw4ni/NAsnYXUjouNM4xkO5MH19lKdrn2xZMt55ay3ylYCdWEEI8q76E60N47e3teycmkQCv0dmpH+oEOQ0coeR0aLGOzZIIJAKJQCKwHQgk4bUd/ZitSAQSgUTglRAItYjcZxE95Bra2913rhPIH5Q3eASouwhlRBFAeGMUHAAdd9WrbrZt9sfKGaQJK+oAJQ4eEw4SCpN95XwZyDny032tZKtn9RLhVfdjJVt8Ti23EQ815tqK8SB8UY4mjiR25bxVDeGFgg7ig1xZVeXlMEfZGvaH403hPH4t3VjWRl+xlOWWERC7ED318npwm2BcmUzQMnYA6VzVb8x2uQp5hfCKkDPGFmTX6cmxj439RXhxGb1x3hhzWsiyhkCMDePTjDlIRCYC6BKmLqXTpcIZIb3mClWfXihkfarJEWYLkWJS/Ynskf5JL5BWzqtFXwR/5FLr93VuTdrQWVwIfM3oCzHZlxpYxNjFQue65DjluZNcqnepfobwmhNSSWcpFNWEmL7eYAkbCaUlYeqQXbwGVp/SSiX019+5kSbRgAAkhF9UXXPfoaJpXzfYXXmpRCARSASuFYEkvK4V3jx5IpAIJAKbhQA/9PFE7QRoVq/dxgmwg6Df+MwKR6gZ6q4gIKh/u3/8x9N+Zr6LJN8426zzzF0iZUiujrILMgYHW26SCS0ImZokfNmLwGcMl2tyYR0BmQouM2QHL/neeimZOzMQCvNd2RzqEwgQCiqemqcJ4svJpTmBzrMkvFi2DQp5tmW5fQSafv6yipgQ1j7Ofca+jCt1nvtUrAyqG8hl1JQQM6yn7y805mo4NZ1tNaYuolOYpPd9SuvTDq4iD9EFvuACRuTuIjcj97qhxlxXEwF0RUz1tQ1+anymkPWJFHQ6zVRE1kJKrE5XM5Fq9HalgOrMu6U3H2idlgcK3b3UPh0RjxBnGs/SAuvvA/nfoInQdUkdpRP3uD5xjpcQmBrjHRReN19sJxhNAGJylfs8M6oOFF7NfYe6o2Y+1cynMfun2qNjsDkmn8iSCCQCiUAisB0IJOG1Hf2YrUgEEoFE4JUQqI4RTuahQhl35Aw5abjICEigZ0+fOlk9yY354Y/jUMmJtjqZtAvHpyrYaI/XCTHwePDgoRzDIGTsnGlfHCDUXZB/X+Wx2bF/JeTvxk7gMUPZpTAqMK62A4hsOzg4spoOR7zmrrqQ4oSJACC8UF1UcgTE6J+aQJ7vTvDOQpbbRYAh9TU14N5B/9Hvdewxe+dQ9559hTH2RDyg7EJRSeijZ2NU/0M0e1zpOP138bmwJ52wTnTwNZe/O5sZIwF04KaWB14irXSvG3oCDhGL2meXGTClwhqPNdvsuSaQIL9XjzxfYxGOo9KT0mlXmO9KpbWjl2RdIrk0gYCIq4vuolzoHBfqh8XljiguZoOUmkvkVodwQKk6RReJM6LTILSrXlOLN1yAw8a3dl0UhftS8vKQh5x8kFqEu49OTz1rIw9AbHeqv8P+147NxUQgEUgEEoH2IpCEV3v7LmueCCQCicA3RqDbwwmN5OyHB4dSAfTlYOopvDxLnMmnT5843CyegMcMahAOLmsO6De+8C0eILfZbQsHLIgXiBhCOskv9eCtt5wriCriKFayCxIGXEJd9PIGhIP08m13cS2u7nr6GxxPE4yyORRe+5o1bWdHihMt20lX38ylKCFXEC/UFuR4gmwNdc9KFYQPWwmQu4jtRrVZndFwUS+tFv3LeGOvuYkEZjXVrJ0KG94TAQPB3FMeKJSmFKspFcrILKhzyHY62vebIL2wI9sLC17vw/JNCBgb4e2xobcI1W7Wa2N/IPJqTxOTKF/joCvVlvJzXS66IvNjFt75ghkcIbvOylG/U94TKfTe/mF52FM/6fiFCK/TxaQ8nZ6VT87G5bFm7R1Ne+VChJcyH+o18EQL5PFy+KJDGLEO+l9/O0Sw3UYJe9HlrS4UCS+SvRJeEO7gxd8GyK+x2sUDDk9Akequ2+iuvGYikAgkAteGQBJe1wZtnjgRSAQSgc1DgETRTmgsp4YQPrxWCJ46W97ZaGQFRYQzRmiMPSr7nzgx7SsQJyZdRPbRXgpP90lST4jLnrBgtj3IK4i+0enIahP8NZymqirCsbQT50+WdbrwmuJLvlvV1ekoB1CTwwv8mKERm4uk9UOrTpbYNZjZORWWo9GpHVDsEUcUsqT2w1cRjwn9DSOwGkovvTDqPoYJw4NBB2mOsgvCi0T1jClUgMyESt9D0qDycoirVJUoKwlxRM3FJ/ZUS1f2ZXupK+76p4Be4tHgzX0psNe2rgIQdwbO19hXH3Q7Utah9NI9bzbSpBzPPy0HIrW+e7hTPnj7XvmDt+6X7+0dlrc6feXrUv+oj0YKfnw6HZffnJ6Unz1+Vn7xeFR+e6KJJy6HZSZibKb+VhSkwx5RhRHi6EJoowi2my9xowcXsMC+mLGRyTOGuuczE2/MFKq/cWojE2ic6r4P8bq8z998pfOKiUAikAgkAteAQBJe1wBqnjIRSAQSgU1FIH7s7zmBL04pxAJ5TCZ6ah+hRKGswdHEWViGpK05UJvati+v15pKpCq7cHxEwqDw4sl/5A9S7rLzc+cQmiuZc3V8cJhYDqeSBZa5GmQYYTBffuU7twVcRGSgIoRchewiUXRfybNR9XxlEZCE0oZNRmgbye1NKhpzSBQD/5WnyY03gIC64avMHpK5El3kTKpEl3O5afAQSkZfoiqtClJ6lrHEtplI+KmIrpmIL2bxJP9eEF/KPyiyeknw3EBTN/4Szdi4Uk8BuSK9IHE0K6bIxr7I/aFyWQ10H9xV0vpd4Xw0PS/vH+yVn7xzv3xw/6A8ksprX+NuILJZgd6ajbFfJiKx5hq+ZyIbP1Mo5D98flz+7jO9np6WT6fKCaYxPtEDhUuRa4Q1dkliX3N53QLh5XvG0kIBSFoz2ZrzCeq+dHR05GXsiBdE60T3flReM5FeGdJ4xZrySyKQCCQCrUYgCa9Wd19WPhFIBBKBFxCI3/ZaqQX94A8yJsLC9MteScN3HVbGJ9uC7NKTev3YR1VBqIcTt0tRYadSx1BC5YSLG9+9clPemjaHk6MaNnWmeqyDfHHInNoEAbPnZP1y/rRMayD1SJY9PhuVsUKqJCfhJEsH2+ow7bc8L+dvrunwIWDZqrLeIBCivLiu+S4s+BelsTetIyG5k0Q7fA2CIvoibIuz6XgM0IfGOQLWUNlhiySzNwlrUjFsuPaBr95U4Yt1a6qTH9eHAP25PLt709/CEiC0mPVOM/r1Q0G5uy+iReONLkc9anWNvsSYDdKBcYbqy+GQMgYUX1MRoNgAL6tQCX1lTK9drdak2gabvtw+2BpHs7QtxW1/sVkVX/VFF9x2FEIqYmtvV/m89LDjge6Hj4TUP3vwoPz+wW75vcPd8rbEWD2pnTqzSdlVXwzUf1OBeU6YKaSZxvNMBNjH55flZ8fn5d/+8qPy189Oy1ORkGdaP1eeL9DvK4G9dhfSffXxzSu8sK+rtiVw4gbj3j9ULsGhcICEd+4u1RlF6Sn5vDQrL8SsTtCYB/a5spSrtrVan0uJQCKQCCQCm4lAEl6b2S9Zq0QgEUgEvhUCOD41PxKOIaoIfviTKycS1R+a4NFeXodDOVLeJGZlrKF73+rCt3hQdfZwXCiEruA4EwZFqCJ4oDiB+NqT482MjKhOIF9Qk0ytIpmK8JNTLTwiwTb+UYRb3WLTbuXS4SjirQYRhQOL71dJKnDhG7ijzrFKR8s4gjiKB4dHWo96J/BjvzhnqHfAO5LUSxqiowaDnYaE3QkqQs7lpfqSUFv2g/zCGbX/yUWq86kVnLe+qAs1znIDCAhm+hjsTWK69+ka/bNddBzCSLgwM3OSO5D7CyGqjMtzKWn4zvHaXfciEthH6CvnbU6nhhDqqKTpswhzRO2FEod7G3aHOegkepO9edxrrPPd6/io9uEdo262X77fjdIXBjvKo3UuMmqi0MXhsFuOhr3ye0f75Ud7w/Kvvv875bsixe7r3re3mGqmxUhALyTLXFhNpepi9sb1kTXq7pbj3k75/07G5U9/9mH52+ej8kz7XYC7Hpr0NF77IsEuFxx1Ozm8vrR3VSVUp/v7B77vYIDY4myuhx7jsR/+8PeiEmEmYcl9qX+ypsZuv/TsuSERSAQSgURgwxBIwmvDOiSrkwgkAonA6yBQnU0cRX7E44ziQEJ2Ec6IA4ojQoHsmZxPNEPV2OoJnMM2FtqMN+YwKrXBxAdOjJYhSnBYaNpQYXWHImNQt0XIVai7Tk6OI3xKKpLI5QVxFsShT9xGUF6jzjh1AGZbAlvA5aMpkKhWvYlgws4oEF0OEVWo6ECvWugDCI5IRH9pchEiy4odkRc4kUycQD45wkshIzm/Z+LTcfQT+5ogEyGJUi9svHGiXdXYjzpdqWitRH6+cQTs+IO27CNeq0tgESSmJ18SZHNXtkEYIsdAJqPcOpOSBmJqlUeJ8Fe9ZAMQX87zhe1APHg/9uXMmkEV9Z9e08YeVAHbIzXAzlYFow37XK1jac2Yr27Yym99kU4KKC4XIrsuNNvioEzL0aBT/vidt8o/f+dB+a8eHJVHIrv2da8cSpnVFWRBJQp/YRtaPWgr7gl6qR8mygM27g7LLzWT45//9rPyZ7/+tPxqIjJSeb8W6u+uSDPTZO6yzcPbuSx1z+HvIfctzISwWVSl2NbkQqQq5Cx/P7Evkaku2g875n+WRCARSAQSgXYgkIRXO/opa5kIJAKJwCshoN/meKH6QR7OIq4LsxHuKnzDuVukpGDWLsgw8pWcKXwD1YR/w9uhfKXLbNROOCSICFAF4RwHBEF4QbZAqhBet6dExZB+JCnmGJwZnuqfHB+b/Fs0swXSuKpcYrmlsFD1b1nWvDnhxD//9zIRn7EdDGsiehQTJpy0rqvZ90yIaXmdsKpKLZMYwh6yg3Oj/oEwI5z28PBAfSP1oQgSyBJIjqnsk7w6E+eam1CVsHE+tZ19eNkOYitbslwnAuoErKA6/ya21GcQCfQ96hlChmuuLrqFfg/iEsLzwqHDlcyi7ziOfjfhpXHqMah15FNiG4ou7m0Oc4T0ct5Bqf90Xu5nUaOwGa5nu9VaDos3dsFW9HmHSleJ4zVViYgrEfqdeRnOz8oDkV//8gffLX/y/nvld7WMumsgMrnbgAO9wwuoyLbmfjamC51roXN1da5eeTY8LP9welH+zT/+svzHx8/LSKqvidarw7SfjlPfENq4acVqQNWRvwsHB9hqzw87sFcIWUIbIcBYpmB/tqGl8WBUWRKBRCARSATagEASXm3opaxjIpAIJAKviICdO+2LcwkJYOWNnEdUTTualh61V09Pq2fTeTk5eS7SS/lacGT0xv5aesUrbc5uJjpUbZzeq7lbqCOEH0TKkZ/m49DQzIFURRM5zacK5yTEzmFZKJF8RDjfNbQqcNmc9l53TaoNgVMocMI+HOKJ36d/JPqvii5m3zM5pYoZRz5RZ8lhRJ0VoaIx6+I6ltXufMbmogP1FefFXsmvQ39wDNeE6CDPGgQHjijhcev14zxZbggBoNbL5Kf6B1JqaQ+630CyO+RQHYgtzNV3jDcIL3JxxTaN1zpmfTrGnXra96ggQFGmMuHBQLYQIcahxIGKwdYYu+fKu4edeWBzH5N9hE01WFSD5qttGqu6S4VxRG5GcL9U2OK4vKtJGv/bH32v/Kv3v1seKl/XwXxisivIKUKDlX9NMFUCjMhERyfqTB0lsC8kpNdex4P98pk0Y//rP/2q/NlvPilPpCQ74WhUXrIJDdINJbxExusBB+Tq4dFh2RXxxf0OU+G+cnz83OHtU9mqifnGhrAc/t7wL0sikAgkAolAOxBIwqsd/ZS1TAQSgUTg1RDgd7h+ldcf6YQIES62Q4iRFBcUCAQcz9PRqT7P9dMdFQVhf5Hnyju16C18kSDsaINJFa1ELQK5h9qE9qMgMklCbho5YmMUbuQSwtOpBWdGr6omuYsOsok+4RFhiBEiZkyEH7hAbJB3a7grMgKntimVeJxc1Jk/STovBTEwnZ0AAEAASURBVI5yMOEfhmIrdtZpjLM3sEp9wD8cbghKhzjKbkmaTf45joXgiFA2Qo7i3DVvW80rtt6VTbXy4xoQoK+iT3XvkF2g8LNNiOxiOQhk7aUOmSn/1rlCp+k7xueyeDGUqNFvjEPGn951P6LPrfzj3FamSqmka8U+QTlApqH+49xMPBH591w72dTySrHg79TphfVb/nWuMTpXDi8NxLIjcI8uJ+X9/UH51x98r/yLd+6Vt0R27cyluNM2oIEc64nQGmi8kf+rr8+Ztk0d1kenieDUekIcTxTaeDLYK//HR5+VP/35b8qvlOH+uRRecwgv9VVH5NFmKryYoVhhl/77sK/cjvu2Nd+j1MTR2WnYlOwK4r4W8EnCq6KRn4lAIpAItAOBJLza0U9Zy0QgEUgEXhGBlTdH2Aa5cAjbGEglQS4rCjmUIHtQXKAEs5ejN5zTdk7H3rQZT1ltQHUCMQPZR14oJ1FvtkHs4RiPIPuU/Jo2m/DS9urIsKtLc4x2uVOlElcmvBosIRpILN7HQVQIEPuAM5/oQaAYIBtwIs8buyJ/Guscbqb9gJMCnnU51jTvrLcxqv90vR0Raw5D1adDiprdCHFE2QOZNtWkBOT1MtEpx/yu9dUV/G7yS0NKoZAhV9dwZyCCGRVWtYXo+5n6h76KcNbI/QbJYKJyOa5iDNJ32BHnIOx4XT2GYowcfIRJEpYM3RX7Yn3MCrnKv1QnOMAmrNnkFqeTm2zTufl3p0rTJ2K9pMUq5d5iUv7g/kH5H/7gd8t/eW9H4YznZfdS+fHA0fsKU/XFQJj19OoLvyn3TUIVtYG/Ij393SC08VQ5u05FeP27xycKa/xF+enovIwHu97/Un9vOM9mEl7YIPcOkvgPlw9F/OBH62a6d/H3wYpE7mHCAavBZMN67pgNqd1ZEoFEIBFoKwJJeLW157LeiUAikAi8FAEcu1DT4CTuKCkvpFcouMKZJG/X2WhkIgJSDEICJ5HSRsLLzqxcERN69krUTjloDo0T2YeDzDYcacLhUHVBeNFmFCS0X5u83QsVVwGJgxNvdeUd+DSGDfkg9w6CIiY9kOJKoaAo5+z2NVjPRDaQQPzCqisRHcI4SriH7Aau4I9xRn+xaHS9q/HXtaym0G4QllYOVUJFZAd9VUlbyAucUsIlp1xXJBjHrp0yqpDv14IA943dPakmIUEhohqyy6Gs6v9Vrq5QXbmvbQiqDvcn7AHqoK6jlo1tsGjirH7HFjSenddN1z1AjaPr2ka0nkK/c42FkqWfKEzZNqZ6OIRZ4xtiY0nQNsS/D7wDb6J2itLkGe+OxsjBxVn58cP75X/68Qflx4f9cnQx1iyO5PeKBPUkqoek6gsblFw9LTNTIwnp6TOS2is7m2dznA73yrH64i+enJb/5W/+qfz98agsDh94tsYLqbtivK538mYADoEPHUp4LW3aP9hXLi9mMNbfCNWb7ecivM6Z0IU8XhiYit9jcTMakrVIBBKBRCAR+FoEkvD6Wohyh0QgEUgE2oRAQ3j1u2VvZ0+hGpqVEVJHTeCH/Ug5kPwjnpw3rNEPfH7MW+nFdzk77SuNB0Ldo6HOIYQ6aF+EH84yIVYkqMcRP9fU8875o/Y6hGXt8PW2e3WzbX39di5HQ3m3BeD06rVU8JhwCqIrnFiRpCK6ajhZEE64kNLUSEmyDhvnoWv8JltrfMcGxrpn2J2TXGtxaYc6ELVPzwofzaqm0NSay4nzUAeISxRDELlV3eOTX7nWimirFeA82Ab8B+eyEq2p1d34COyNZ/BGAY3AYLy4zwQE2LDcEdkUYcJKTq97yo4Ir/odo6EPZsrVRd6jGnIKppBPtT9NROm7cQfkehGWXZ3GdqJqrNU+/r/cl2tCvBJCObCyLEJtfS6du84CirIMhRkkWJD6ImB0v4MMj3BdLkLdCMvUS3XhPkh7t6n01C5mVlwwA6Matj9F4XVU/uef/GH5yUG/HE5HZTA/R7alPib8UYDPLqX6EsYiui6V+2sq3KYin/sQQsK0rz4m1HEq8vGx8PyzZ8flf//pL8rfP1WOvZ17ut5uudB+XZ1zE+FcD9umv1EP7jKpiT6xTQoEKSqvsf5eQHr5Pua744v3MO+eb4lAIpAIJAIbikASXhvaMVmtRCARSAS+DQJ2F5sf8HvKXbW3C+ET+Y/wLR8/eeIQo29z7s0/Rg1XI3GIdzQrJVPOE86Jk03427nILhwYSJpw6HF+FRolx+1OFQgEjEG4gA2lIqC1LjWkkFxafYX89KyKYWvsObW6KmbKIyE5bm09lmTQ11EgOSAxyekVub1wTOk/lDyLJsRRzrn6F7LD4ZRqnx3V2l4fQe2ChDMO3gYc11NvrraJxWGgajJkT2Bkk/AbWBgbepX/wgg1l4kmffYgnER6xT6R6HuqXF3OsQb+el3XuOIeBykRZCz55FD/QXo19mAbjRBb6uOwNBEW2Ek0Rk00sRX9vZwNUm3cRsLLajqRkRcirnqSeh1o7L4vRdP/+J/9fvnj+4fK4TUq/fmpyK65sNTsi8pOv5gouf1sWHZENAvJMtYInw5EgAtn8nJ1L+ZShekBiu6zH0sO9qeff17+9MNflw9PZuW8cyDuTGHPyht22Z0ov31VfG7WKGDY11IVwfzN4N4ietB/RyBPR1JDT5SDTlZjsjTum/XI/EwEEoFEIBHYdASS8Nr0Hsr6JQKJQCLwDRDAUYXgYpa7Xf14H0oFwXecf2a5Ozk+turhG5yyBbs2T9zlwOD4MuMW4VbMHohDfoHqpAl9wwFG9YHz4if52n5djvnGAiecsAn4ner4g1NV+kAYkv8sZvbcMYaoHUyCqFHj8bnsSSGMUnmg6FkmdeYcsCPXVHR6hzmS2wsik5BV+pB6QVTgtJLPiz6+ELkJ6WKFD+SG/lEcBofT3lSTvm+3uvF1wG7GTYONySCdLmzBC3L6g1jqM1uiyA/GV2yXOlIEE3gT0jqXLZjskj2gAKJPrqt0RdpUO6PPqZPz9VE/vQjLpp9pj8NeIbodbkvdpAZU3dwGzlINwZWlztdnv9eFx9eel77Q/7mUboKr7OtvwbtSMv13P/xB+ZPffbc8ulQOr6nmVuxcmPBC4DWf6sHBvFv6CmME7zMltp9p/Q72oHP1RIr1L3vlmcbhL0Wg/W+/+k35P3/zcXk8H5RJd0+EmRSAyuU1vxzr0ptHeNV8btHt+lsgG4I45W8HIfCRj05CN9k2imBe3EtWyjBsJUsikAgkAolAGxBIwqsNvZR1TAQSgUTglRFQzhUpLw6UWByVE+SFPBmrX8Zn4zKeyAG5JgXOK1fxDe+Ic82rN5CySwQfYZw7Q4W+Wb21UBjnmfM84bAQ8gb5h2Nr510O4HUpkt5wM9/c6eS44uhX3HDxIQ4gNJjJknxdEAgmEiA4hCPhaqgdSPiPSo7vkB1WUZkwgQCpBAJnvI4SRAUkF8SGFT6qp+uqHFJ49bSJPFLk4YHcgOQlHIllSA9IGpxbEx1UEy7Ayh/qe1315tybVyoG9KXVXqqiCUHdM+hz8I1k8cy8GLNluhXGOPL+kQMJjK2qk23Uc5k8vUImvbn2k1MOusFqLIhO9WlfijMmqECFxr0vlFphL9gEdYSQOxdZy7J7GnttqqVdsJ4lUfbmanv7ZzIZjPrN9r4ouyKr76mt/+I7b5d//fs/LD/cLeVgeqqcXOf6eyH1lsaHkBMgsgMfFMQPSq2B2DByenUW+ruikMcnCpv/Gymg/s3PPyx/+fnTMurvKfxRhNdUORR1H5kTKqmzbVrhHkGhfdgHY8E5L0V2eVZjtcukmPYhXPtMqQBQChoObOWuqYKNVr4lAolAItBOBJLwame/Za0TgUQgEXgpAjiqJKlnJj0cQAoODz/WI1H79iX2xjHBYUGRVGf1wwlmPY7NyfGJCT9wCIImHB0IHRyYu+e8BDGEbUAe8YI0GkgxNYBIEmmA02vyQs4qDiFhi07iLNJIoHqdSQI7i4IR8kAvvV0bntg2lwhSBYWeyDnV2Uo0VBkievGtIeLod+rt4jotyvHz515X1Wr6wn+f04YQe9+pdyEgzMBJhKWIJHJzQR4xNvYVPmpw2EX/BL2/8wm+ZyLQsQtydjmPWkMcLm0hjuCoN1qwAYr7UbbI9VAsWu0lWyaUO8jbZtZIbMH179iGx0pEjiqRMFhsicLxta1esUVvjAPGeCggF6Wv0NNdvT442C1/8sEPyn/93tvl4WKsdWfKyzXVvkABHgpvpO9Rc4EPgcvgzbruTpn3d6Tu6pQ///iz8n9J3fWz8aSMuyK5eprMoDMkwZ5Qj8lQNg1O7DfMKAgvLNwEv+6DzDq6r9xkrHP+S+HHRCfkCKxE6t37m7FpPZj1SQQSgUTg1RFIwuvVsco9E4FEIBHYeATIsbMvh29I7iVICzl1KBoIySD5bpAA8VN/4xvzihXEN8PBXc9ZNpNDS7gd6h1ysKDyAQucZIrVSDiB+rckRl7xeu3fDaInnGATA1ZLiewiMb2UUnb+1chqO5ClvJbhYNVVbMyoEl0Vl+tyBuM6qlejSIKgqPm8BsrrNVQ4Euof9vM/OezYBoVuv1CyblR+5HOLHF+QYk24VXNM7H033mm77UD3iarsI0yUkC4c/SV4cvxRQc6VA4r8d4wtq+cguhQmt5gFsQxqoRATY6LSDDUvv8k3CE1VznZqm9A3j2tdkGtix6iLdqVwRa0I2cP+FCauuJig+ot8Y9gDOHgf2YDvBXGL8P7b8gbZBUG8kMK1o/viQJ9vSc31z77zVvnv/+CH5f2dTnmkXF2703MRWkxoAlUFnhpjmq+xJ8ILbKYom7Q8HeyXsdS0f/n58/Jvf/mb8nfPTsoT7TlS13REhKG0nU4u4Mw2ssT9L2yi/l1A/en7iUgvcl+yjB0xDlCHjvV3hFlh2d92spEty0olAolAIpAIvIhAEl4vIpLfE4FEIBFoMQKEMd67d3/pePLjfOyZps6c1ygcxIYFaHE716vel2PifGV6Mk9+JwokHyQNxAaheCSph4ipjopJkcqGrJ/sjiyjloLkMMEhzJz7yN6pHFspOcAL5xgMx5NI9A9pQIhskESilCCJMKWKY0MUVIzfNJTqvVCYNNf09SEy+K8XZB2EL20ayBZoH3UJRZeULSJxIpddJLZHnQR5AymK2ue6iLo3jcObOp8VXSI7Ubag6kPZ1e8RyooaSPmvyFmki9Gt3EdmGkfnSt4NcUjIqLdpY+1v+mAVyshYe1M1vXqeILxQZQW5iQFU8o66OGRV62iPcxlCXmhfZvS0segdMty53kRgkI9udW+gVdtWGDfCS/1MZzLr4kAyrR3l5frO7qD88XuPyk/eOiw/uXdY3ulqvbDp6oCF9lO3l2FfMY/Cc65157pHTGQfn4jk/FCKrr/4+NPy1589LU80q+O4NywTQ6wxKLsizLWGn24aovW+xSd9b3vWMjbFeOAesiPFMGppK+N0n+CBEUov8sJ5UGxao7I+iUAikAgkAi9FIAmvl8KSKxOBRCARaBkCOJuqMrNM3X/wllUwKHVw8MlhNR5rung5Kf6h7z1b1r4vq64aTQjK4eGBFQw4thAhOCVjh6GM5ZzgeYdCoTrny9MZN5C7OwUbQNnlHFhSAqKCATewCVJA0UgiO3DwUDY4Kb0OQr0DjhAOQFpJQz4ho8IJDKyvA03qF6FIoe4Ji69X4rpao3bQrlV+L9RKkccukusHSQcJRjtQKkF6VXI0ztKc88qXZl0bP9bMe21RZNCeQp8166VIzEoeQWw51E/kBveSmQgh7OBcpCcEBn1cVTvYiPtAJ12dd7V0XVDVMWxzbK4cy3FF2kB76gtb5x7BRAfk+aMN1L3OKgnxFco1zWIoLNZbc11tuMnzQgbSXqv2CpIrkVrDvvJsjctwcVEeScz3X7z7qPw3v/O98qPD/fJA+w+E4UJEIPnmB1JsXQpgacPKucbWM23/68dPy7//9UflH548VaJ6qYi7AyW11zk5v2ZnRGFp5ZzIsU0cRhC6cT8LdSD3Bupp5a/q3Bd5ztiwzciWKIyB05PTGAdek2+JQCKQCCQCbUAgCa829FLWMRFIBBKBNQSYNYu8OXYocFbljODUHR0d6Qe6EgbLkcfZg7wg7xIOK0onnHw7to2TuHbKjV9EuTNRiAzESoRbRZV5Ek/4CU/jcbVxdq3uUrvPUXhJldLtNEnKN76Vb66C2MNC4WazKY4cmEUicpx5cCLHm5OSS9EDWQCRhKqLZROFIgspEFvtKqqwGmEFm8aG2yj1EuFJOK+ouWgr7aKthDGZINVYmUF8yPGF/IAoZvywHwQLmK1jUUkXsDHZ14DEfr6+v/tbs+XbfZhUhENY7wcv66q0QY67S1NPlld1U14i2YGdeN0PsAHnahNpgZLLxy5PXOsa56VVjx8/9nhi2eddvvnrhr9FnSFAIXMZD3WiA09yoH63EkxGAJFHUnLUOxCgKHy4T3K/hCgSNWo7Yd0Srg1v/ZXqSc3Fv+5CWChE0UG86u5FR38nCFwcn5R3RID94b175Y8ePiwfPLhfHmnij31CnBlL+rcQoXWuAz8+Oy8/Fcn1908+L7/QjL/PUcqJHOpIPYnmz+InXaOjsQfmkIptK2BF2RfhG7kwI6wxyPFZOYH00oOAIPo1OnRP4Yg6zu6aUtRg5VsikAgkAhuMQBJeG9w5WbVEIBFIBF6GAI66Q87kuPOjG4eOEC5UTigZ/ANcnhkqJycaF/nDj3WctcjPVJ3bl519M9fRZpwKnC+WcOpxTAll5DWQwwUWEBWEcJ4rwXCQgkHicORdKuAF8QJoocgK8oOQT4gf8jSF8w4+ofqA6EHpBLEIjm0r1UZM+NjWQ+UD2eUxorxCPZHFJoFMFEN2CSIB4ZBGjSfshO+EczIjJTl7CHmLmTzBqrEjPv0/vvNeHeUXceO0rtOLG17huy9Xr6n91xb55nAsd/L6uZqdqCshWbQf8oFXrT/1qTNWRkinCD71OfnRKhYQQG103mk+7eN+UUkIq9ik3EHNCHnOBAdV1VhzkkGEnilPU6j/6LQAtWK2DnGbli8hvPTqzSG8qDmkl+6VPZG/zLyobYPZpOzrbwSzNz6SzbxzdFAeHh2WPSlA0W9eKDn96GJRnohAfzJdlFOtG/e75fnZaTmH/GEvwqBt6xpXujfrj41mBN7MpPVf3X/8fSme5ZiHKfx9ITSTscHDlNGpcnkprNft1Y7xN+mrz5hbE4FEIBFIBG4PgSS8bg/7vHIikAgkAt8KATurVhvww3xhh5bZCQlRirxFTCOvPEVSrEB4QWRAkEF22d9pHLlvdfFbOoiE2X0pdXA+IzQNh2S3HKBU6g+tVoF0mEjRhdN6Pj430QMpRsGBuUsFu1gvJKyG5GLmPQgv8jeBIyomiA7yNU0UsnMhwguVXJBg62fY/OVQLIVaDWeUfzijECC0Z6j8dn2Nmx75qmQXEEHOOaWmgQ/HhwIsxtU6SYVa0NtQiPGCHNKnr7JuWzI0CBOTzmzVNkgXSIZvU+L80R/RFr2rnpWE4dxR91AyBbknhZL6F3UToVkwN1TRtdD+rOd4MIr+Jxk9NqAZF0V6rAi+b1Pj2z8GuGO8R8fQVmMmPRMqLYi/HWb1lB1UVgs7gBQ7PT024YsyNO6zjV00fdrGcbFQXq4gvKQE1oyLjSUoDFH97whPKb10HxjoNfRLilBtkwkZyEsRPcNdPUzZPSyL4Z7DF0lrD5U1mejBwkSToWg88OLcl8ISQo07kPjlCrEW2lJi3PZE6HGvZMZGJoFhEDFGHOqthwLxd1XqP8Ya40k2giIQG8uSCCQCiUAisDkIJOG1OX2RNUkEEoFE4JUQQLFDQmYKTutAqp0D/SjvS72Af0G50FN3yC4StvMjPJy+iI0KZzD2a8s7arWhQmwo5CJDpXFweFh2FcJpIk+NwlmHtIHsWjmsOB8VFR9+J94gvFCs0HYcfMJzUCoQDloJADYTcmQVoMJeUbrg1EEYtBGzqLeaADnRvGgJdI8oD9lPTGhA25yw3aQXidoJfZQSivxOGk8mssBBxJLJKn16Zki2KUw0QpsgvUjqzTpCJJtrQoatLbMevBtQqc43KtEVHC/ijFbImcahdh/qTCg7mUEv1hOKFxMLrF/TShTdM8CBE7ENdRf3BnK0QVSg6qJdJO+20kttAhdf+BvV+PZ3Bm7BrkKfrNcnvqPW2RGBAWFe89cZTx14fj5ulH2Et0oVq/7lJPQjpf2El1tBS8pMt0ZeMFsdFGAsyg66snGUWfNLkrOr7Zqhs6+HCn2RXoO9w9LfObC9YeczkV0z1LQXesCgY2xfskEd4nEUOdG0unVF7VadmcyBWY/3FeLJGGOM8Ldl0jxMgvjmXsJ4YgxBiDF5RpZEIBFIBBKBzUEgCa/N6YusSSKQCCQCr4RAJbxw4nHUeAq9px/k5KqS+21HAxJjgrpLP9BD3SWnRo5IOG+vdJkN20nEAU/O5YXQjj0RfIdyRHD+rbiR8zWW4+U2N8SNSR85IRwHVnepoNyhzeSw2t3bDfWfiC+KlUoCcu4QRhFeIglRK1AI96PY0fdSe96CXKK+ajm2TmmIivjCunBkwcaEFrYhZ9WzOwor8jqhCmQ7hb0ZPzi+lUiJM7AxSJAIgRNJoO9+yeY4xv+0DgIJzL9NQb0FYcnFaZJtWXV2qJ7WUfempVEdNzHqxfVYqtsh5iC/IXLCcY9ZKq/Uq2lT83FlU3u+1PZHy6NfIs8Sa0z4qY8hQHcd3gtpWGf0RLmnPhdGqPq4j4IVfRn53mCI2lUc0qgqE87Yo2OVYwsKWBGOZS4bUmqvpZ0YH/0N4e8IKJLDCwXtVApAMn7toCTWfXdXRKussCx075iKJJxAfFkVhxqRoaEzyN46+pu0ssCW4BZm478r2AX3T1Re5L2LMb2QElZKYh4SiOAKAll4aoxjK4zZLIlAIpAIJAKbg0ASXpvTF1mTRCARSAReCQGIHIgeXiY0FMqI84bzOydROU+fnYupmWFPZ+VHud7Cs3mlq2zWTpATkDB87kqd4WTCajPrUHZB2IzleBHGSYEYwOnCAbmLhBdtRxFHqCuhjDjrOGsU3iEGydfFDHVWKQgvcHLRsfrfulLDOK2Akp2sk1YaMiKeZAvCwXnsGAsUNRTCNEiQCGuD8HKCcxFNNd+Xz8UQ4p+HUnN8nKU5VeAWTjEANt8N5rcH1GPX1/XVV9dXRaj7qrOiblSGY7ABcg5Bts1Qbml5ma9K4yaS8kPEhZIN3Dh5hGCGQqd9dkB/hqpu2c/0sV7cK1B30UZsHnuvpNdAY8X3VAhEY4dKNib8QM2zIiy/2O/gvcnFNZb5Bc2FdcpkaKM+F/pE1Rf9HmPD9ivCfM7fGRFWg95O2I2O6Pueslf2hlLHoWQSrtxjJ8IK4nwxB6u5iTVwZGZHrtymomo3NhLkHQpq0gVgK+R9o11TCFERXhBfqD4pjJWwk3a115XPt0QgEUgEthiBJLy2uHOzaYlAIrCdCED6EGJFvh6ePO8qNMczEbJezobVXSIz6syMuMn6KW5H0E5gyxwQehEnxCSOyC7ydpGMGwcDFQHKAvKqoGZDTeNir6U6ID5DrL8j7zvKV4WDFjMxhkIIrLAbnP3nx8/tnIEhUFWyC4wNbAttBNunWKHVEF6V6KBdOKq8rjTNzYWYihebTXzIsWU2P9RVhChBAmiTcBIhpG31ZQpKBxk3X/2Lb8vrfnHT166J7lAll6UuN+2g3toWIaxaFrnll1bS39wD5iJ66HO+R99yMloTbfY341IJM7ZpK+eql/OaNrxB5EHUqJ9Q6tEuFfeviTB9Wesv+hP1HuNkoL4eisjhHkm7672lEsM15NcnbNGb0nEpTJEKyw4UushLIi8V3oST/nXcYO+CVQCRN2sUaNsA3bDIK5RuCnUd9srB3oFehxoPfRNm5wqNHkvlNVVOLz1xKWihCIk9F+bSxulk7Sm0HbuI4aLaiyQdopQlBFZ/d2gXf2fOz6UAFNHHGGOsWG2ppsYEF+1pb9Y0EUgEEoFtRyAJr23v4WxfIpAIbB0C/ACH3GHGvcPDIztrNJIf3ORkGilpu0MZ9aO8Ovp8onzYWMILB6s61zgcTa/ZUbXzqaTKcjr2Dw7Lvp62Q2rgdMxEcvCUfXwWs6vFOeqJ4iSNr9eccYs+lphBXND/cmxlGxA0Bwf7Wo7wRPocQhQHHqxQrpyenhpDSAEK6hdIkyAIKvrtwmpd4WUw1toFPn3l6OKTt4oX+9Fm3HL58jY8cKRc2dcYBomCyoNZ/py7B/KLc+jT59JxK4LLdFic02d82ZsudhmEwKVmzHM99FlLV8wElITtWlX0OFY/0Vb2hYhYaEIHkzPKbecxoXuDNtvxZr0pDdXPDnkdWZyL66xdq14zGs61lmtatMB9LsgH+ueLfRmNor/YVu2A0DXGwqHyAtYxQD9TmK3Tub30EAE1lI/TesaM3t3vKChZ3kTMxG+Z8ILkqjM2BgqYJiv16Y18b4oWjB22qZcfsshWUDOxjMKLsHIIQqjgC9kgE16cn585rxehkxCIE+EVVHE98eZ/ut28AUYDFCTXjv7u7Cm80QS4xhV2MZGqmFmBI5SR+wJ/l1bjd/NbmzVMBBKBRGD7EUjCa/v7OFuYCCQCW4YAP6pRs5C0/WBfM2fh3argvJwpj9XpyUnrWmwnQ7WuDmh4WzjtKFOk2tDnvaOjcnTvnp6wB5Hjp+x2siK0pHWNfo0Kr/AKIhPnrC/F344cUGag8wQGzU4mRuSEEb6IgzZ1vi68uSxvAoGupqJDcYjNVvIrSK8gVUyG1A574YImsxZMxiB1ZldEFa8O+dfC0+6SaIlc4Jpd73KufS6ZcZU8UyK59O9iobBlK2/oz+ZlAg2iopJlkDFahtRwYb3O11G4Y4eTZzECgofJP3rK1TQY9q38oh9RdqEiZfxAbsCCQHZx/+HehNqPezJdBiG5iYWeX9VstRQ2s6pxtRDWsFf9bqWk/85oUgTdZ6yI0314//DA92OaDdFIWPlodBIEkLYHKbg6fxuWuF+i2OppYhSHgjftJpR+VyHideIPSGfUf6PRqcM5IZTJBZgKrzb0ctYxEUgE7hICSXjdpd7OtiYCicBWINCRg92TYudQzga5RVBu4Z7gmKF0GmuWwraV4AMapU3jj4XjEW1zrh3NMrivUBpm01so+TYzUU6kWGLWrOn0jjnu9mAjfItFHFBmnUP1h7Kr5prBDsjjNFH4Dc4Zyr9QckGCZHkzCMhSZabYsNVBUsDwz+SXV0J8VergxStq/SUhp/oQ+aQe1TKqLHQxQXIps7gJL0gvK7qYRU/7seyp9ZpT88Fx/Keg7Ik1QXhJ5+OzxidbINZSjQJKtXBv3dGMnUwCQrJ2wOSBAv1rgkPjCGUPOQNrCC1IGnT1Mf+2qdhsZc/M1Oh8cWoeajgIPoivPd1zUHmRG42/Q8yS61yKwqedIbH0HuOZUMYIia1KPnJ5eYIYUggIA/CYzaflbHRWzs7OsBTfh5Pw2qYRkG1JBBKBbUAgCa9t6MVsQyKQCNwpBAgpIZ8Iuax42hxhTpfO3QXhNRMZ1LayzgfQnvoKpUyn3L//wCFkKGkIVUJtcabQTdRKOB53L4ykUXbJzSKxeqgPlFh5IMJLihPUJxCG4AIx6ATL5JrRP5QIEYLVNivZzPrG+GPMBeHhsOFKfpgLwZ6/pO7aD8opuCmILl7NuRxmJqf7EvUQJxJhRViZXvQjjNalQ+mCcuG4LiFnOkfXF4yLkqCc5OSyFH1Ceomc0F6etc9k+ZfU7Q6uhtxCKTnQOOJe4zxuIj4YU6DJxAfLGXA1xuhY3390D3Jet6Y/tgU67r/Yc+TCg/hr7h8iBrmH8CCCUD+Idgrk+kwPHyC+eBjB/u0rHl3uT+pO/9KOahdHUhqT983rtf1cD5hOR8d+6JIKr/b1dtY4EUgEth+BJLy2v4+zhYlAIrBNCMjvJZE2ZNeeHA0KP8aZNersdGRHo5U+htxJq2BwzOWEV/UEuZJQEzx69MgORs05NVbo5kjthdiR797K0JnXMUvUJhRsAadzKOd8oFDGgfCCEIUQnF5MG/WbnFAS+stxk7EIr3BWX+f6eew6AkF6sKYStDZK2SU0VYzHlzv+rF04ozhLqLr0Ut+qh/QVw4bsapRZkFXaN3JvcW4tex9rweJY6DMdH/o9zqevfueTV1X2sYVSP+PbXX/X0FgSHJBeKL2crFwEB+OGzryQohQyByLZhDvkstY7Rxr7bFFZEl5Yj+7LtBM7qnaO2mtXyltyW0X4HzYmpZdCP0d6+OL7Mwe0sPjvkdoCsQXhh2qWvz/3FVbP/ZaxEw9fJs6JiIqWe28bwzhb2D1Z5UQgEUgEXhmBJLxeGarcMRFIBBKBDUBA/tS+8ojsi/AiKXB98o7qAAcDYqONYTURZqeay6nAo4LwwuHA6YTQuf/ggXKj8KRdM8+hsjgjWfDYOb7qMRvQOzdYBUJuug5p3VFuGYjB8LUhszqhQpHKAucc3Oy8sYMcNxw4nPMsbwqBIAJ8NmF8hfKITrFNv+xqVmyZ8ILkUp9CDujVIVG4XlBX6jIrs9zBJrxipyDHtJ9CHWthHSfwGs7jDXyvtBcr4jvnnqcdGKH6RncRmhfJ/iNUOAidfd2LyEkV+M2s9FKYsO5BKGqDBjK09VRb8WnzbWwYsgtjxMIo2JbzVolo39thBkPNaur7UKdMRAaiwD1XGPXyAB/VnjeaHU1GUVnb23HuTFIJeAZX3YPn6v8zzRJ8rocwdy60vj3dmTVNBBKBO4xAEl53uPOz6YlAItA+BPgR/uCttyJJtqqPEzKXFzY6OVXurjFr9MIVaVexokuNc/Jnqq52QWSRI8a5qUTq0DRCZpgOPhxN8lGtu1/tavPr1Bayi5Cr3d0dEYLklGmSawsfHDAcTkKLwBWMTHA1ZhGO6+tcPY9dR8B8gN/W164tC/+lma6tZnGd8ILsIrF8zb2FsguSi7BFrJzQRNExfkXoo9Y61JH10bnrtJZWNudqtnJ+VrqoTvry4v51613+rF1ZcyM6P55UTITtQeiQvwnknBtPhA5qr7lyOaHs+bJ+bi+eVwmusCCscVW4T4MNszaS4wr8LlCXSmV6cnLcQkyuts9tZuB4tWafVFt56ITyjzBWHjrNdN8dK48Xs9+GfazwyaVEIBFIBBKB20UgCa/bxT+vnggkAonAN0IAZ+I73/mu1T01XGQuUuP4+LkTk5M8uI1OF4oJVEg8NaeNtAHncl9OFC/ainOBYmkk5QAhey7aEcc0wk++EZSt3hk1hWeUU7L6ocKtCKVZKg2sOlESf+Eo/Y/8NGFkdVzghIOaYTdvsPuF81Vd14sO85dfi7657Fo2ZHIqCC+d0P3GJ+quIB08ri9RcEoNJpK7wwqFWKnzvZ87HEWYj2VVHM+nl7R/KMCa3fPjCwiQtN5RoQYbaEMxyU2JexP5mwjdM6mhXU106EEDDxsYY9tWfO9AEaqGOWRTeNiW9D34n7j/9qV+Ozw48r0aDEjmjpL06ZMnLfx7pFbX/le/R7vjbxL3TWxif/9A998DLxsIgXImhfWzZ08V+hizCINDlkQgEUgEEoHbRyAJr9vvg6xBIpAIJAJXELDTJW8iQtH4oR1ExVAqp31mKlQ4I9vIyYSCh6S5niVKTjA5RtroeEWYXThVOFkmu5ynLGbEwslAUcFTdNprsk/7rRyT6vRfgbLVX2jzwvmBwEVUhezAyi7bAWqKHa3DPpgtbO58QuQVggy0YxZeqj1T9sFBjVWcq9XQtKDy6wALdYB/SQkCKvYlH9eKTmALzrYOkvSL8XGpsY6VO+U8HSjnmxk5xb5obVyDc0C7cEb3uO0m7iE6QWzhnFov2kak2ZdUTLvcxRLEeb2vgH/g6gGjZcKrITuYJAIMmYnQOb0UUs4sqEwSwf2L/ekD92gDcTvHHFi4IVjY+kJzX2G7/u7IBv33SQ8nmDij3q/GwoUJM5hJN7Dl3iMCDZvVCZn9cTPLql5R76glWFB/VF6Qn7tStPF3mPYzocGzZ89sB8YK22kKS26zPvNhQ0UlPxOBRCARuBkEkvC6GZzzKolAIpAIvDICkBqQG5Ad4Tjg0zIz455/ZDMrH44Wyi7IDZyKKblS8CDkR2yuE/HlEISTGNtpazhPByZ1cBbA45wp7+U80WYIAHuU8SaccPq3rYTTRdtxtFDv4WjhZO0olLHPTGEQXSICSZ4NLqswxm3DYjvbY0e48a0huBjDEWoY7e2I7LLfrLEOYcXMikFvQRyI8JKaBP2Nw6r0Hf7AszJyuE7X4V5idR9kuFSTGls60jmquFCXpPhZXgkB+gFiY1fhbHt68EAORfpgqryJC5EdjD9e5HHiQQT7muRQn/B9W+9Rvj8JQRRwTKSyqwT2PLCgQAahfHK4vbCyqesNMp/SRvKHviT0/lCEF+QnN+f6d/r07FTpBU7cNrfPDVZ7GYuQfCptbLMrnm+JQCKQCLQUgSS8WtpxWe1EIBHYXgS6CqvRb+gl4cWPaUJocCQIo8CRouBonSt87QJlgX6Ecwxv/vQe7XnDIYjQRBJFa6p7tZW8MEz/jmqNWRlxJknOP1e7aWq4TLWNV7/VtW3+nC9mS8eRPg0SMJIl4zz3hcuFyK6LZsa4mUgvK4GWBrB9mLS5P19Wd3qoq6Tz6K1EidioHcLoRF5QYCK1TGmJ8GRn8nqxn5VcCvGVysuJ53sDTego1VFvt1z2hzopswoypqaKL5O6Zn5e+pcXZVAuSk/rOgvdM0R2SUv5smrlupcgEPfhUH2RVxDSi/BGJ7jXDQzVKTP1jc/PTDxz3+JeDcFBiN82hroF0SNVm+45tJV7FIT8UInsmcGRW9HFBROqnBkb1FHO08gNXxuXt6qX4L2pq/ywRdVHbQ3pxYQhFPp5qrF2/Py5xpX+6bvzwGlfK/1aTPJtal9kvRKBRCAReBUEkvB6FZRyn0QgEUgEbhABP/2WJ4BqQ7+VTfiQONnKHkJpVHhaTPjaaCTnSqQH+/Hjuq1KAtqMag0iB0dyd1/EjhwmEzuDXnn29JlDh1AyVeUbGNDuNjpN9OHXFRwr1H4o3noiNHCwmDGONqOcUMtNdqF882yMzBYnBxNfEkcUNyvLZiMAr9UziRWE16VWzM1nW7clBVZ89jQuGAvQXxBVBDcupO66QOE13CvD/QdlePiwdPceiDHe1zbUf1KBno9EcJ2XzuSkzE8/LZejz8RAnJbhpYgwny8VXq9qIYwpQSbCfSE1U89J2oeaOAIChxekD/dkQvgmIuf5TrECqrm3veq12rLfKvxeCkQVVF4kc4f4Goh47enevdB96VR5F0ejU4f9VfVXW3MvQmZxb+Zv8tHhkRP1xx+iuPc+f/7M5Cdh5k4v0NyPuRvbIsIsjFe+JQKJQCKQCFw/Akl4XT/GeYVEIBFIBL4lAvwyjmTJhLDhXOFQ4EDBZ6B2OhPhxY9vHLGF4pkilKZ9TmyQfITt9coBubtE7NB6t0eNe/L0iYi9mV+4DagHIADC0WinUuDrjKKSgDhWzhskRxKSD+UA6q+LiUIZpShA4YfaD/UEgHRxzJPw+jp4N2J7JbygtiX0MtkF6YWNdy9FazVhjMQjogKbSJE17fTLXGquxXC/9N55r3TuvV36B2+V/v7DUnbu6zzkFRIBQ0i0lEV9EV7diZzwZx+V6ZNfldmJSK/z4zJYXIj4CqJiI8BoQyXUR4w/7sEel8s8g2Ypdb8KlQ/5vCa6P89E9jAWUe1yf9624vu2GsXDivi7RNi1Hs5Aeunv1Y6UXhRyL54o1I8HFla9CT8e6KCQa2OJB0skr9ekKgeHbhPtIHn/qWZMhvgkbxk53UyUahv4RIH6ypIIJAKJQCJwUwgk4XVTSOd1EoFEIBF4ZQRWP4zhLWIadOWMkQMRhWnQZ3IiUBJMGmWUHCocMRzlFjoROE4OiRG5U6e3x0HAcSBUiOneUXbx1Bx3YRkWo2Uc0G0sqEjAgOT0h1IS9ORMzckPJBKEXF1nnhluZqeqJvG3c5VkV2vMAVsmpBELXsj3R91FDi9mYeyJjOrJtsnbdelcXb1y3h2Wi/6e4qnulXL0sOz84I/K4ugdnUQTGPREEne0jWUFL8KbeTbH2aj053rps3P2eRk//qiMPvt1GZz+thxOV/mGWgParVWUXoJMZhbCuA9xr9pXTq8IX5QSU/2k3vJ9OcL4pK7TP8Yy5Ne2Fd9q1D7/5WkIHUKtSe4/GOzo4cW+IGsmHNHDGR7SQBbxkAY0W/m3Sv1P3VFvDZidUmGNtBfb4IFUqPyUrF/pBrgv++GDMGD/tv593ja7zfYkAonA3UIgCa+71d/Z2kQgEWgBAp7Fyp5EKHV4Sr5/eOjZr/gBjYJnpJxW53pq7lnB5BzjQFCC8GjfU3MIrxoOA8HTVwgf5Vz5cEjKX5OxxxNzOUpyqlzkZDV+VnzfoveenGRmPDMBaIeKvG1T5zA7l4IEwnO92GTkdFFwrOyVre+QyxuHAL3V1dBdqbvUbWKqQtkl0gvCCyJbJNZMyq6xwhXne/dL/+13S+/R98rirQ/KbChlF6SDmTIpwUS6+IVBKJn65cVYxNdMtqS8bwqGnBw/KaPPPy6dj/5DuffspxuHycZWSHBCXjGw/HBBN56+QvaGInYgPMhbxX2Le5kfSBDaqHBjZu/jHrWNxHz9W7VMyK6GmuATEUT+RWYyBDUwQ4U6VgJ752Hk75jUqrFNHy0qfjijh0oz+lVjkzbuQ+ypnVVdC9l55hBOEV5uJwQZIeca21JrZkkEEoFEIBG4OQSS8Lo5rPNKiUAikAi8EgIoeOoPZ56O7yk8BMJroOS49Ynx6elJOdMTZOWz1o/omLERR2Pzf0zzbLwWHKEoOBEkqWcmSsJCaoJnZvc6OT3Wd+UuEqnn8E1hEk/NdSxkAN6knarmZK37uIpJJa7I3YUztScFCXvQ9zjPhAWRJwgiEDuhz8EvjsMetLPe/Nk6LDawwuGvf4OKrfdnPWxl63UNn17rHF4iUcR8kbAeaZYmZ1ySXRBeM4UwTvUa771V5g++W4bffb8Mv/NDrXtbx4hUWHLcOlDKMMYEuhvs4lKhVZfNzHKQDHPll5qNR+XyF/93GX70l7qcEqo7fJJjg7BYr6PWutQtnJdS1/vLHXhjfIEnoYl1rHFPQm1a8+uRn4p7E/cpyGkmlID0ggBblnrwFgBYQ/sg57HmCG1EgdstzCZ87/592zgh6BSIIP52MfFI/K0ChJePDR+wgW/YACo2CDzyZx4opPHo6F5jE/HgBmKPvGVMJJKE1wZ2YlYpEUgE7hQCSXjdqe7OxiYCiUA7EJDDi8MgJ2GoGa8O9YMaUoswGkJEPvvsM5MfPDHGsUJtgM8A+WGnYxOZjsanqbleqCeEDoXq0i5mPmPGKyeAVrsIDYHUIUfVJjbJlX+NN7oLYiJCUUlOrpAoOYl9KSNwqFANGA+RFOxHIuxIiD1xeMxrXDoP/QICK4KQfjGhyj6VnGC5ISi0Z7PckK3ax/urj7BT+kq96k8Ow7H/8tAtHbtgRkUd2JGdd3ScljtSa/UU4ziQkmSgTcf6PhkclNl3Pii97/+4dN9+Xzm83lKOLuV10/HO+6VjtUIvQqf4hKKKOnmk6Rycl+rrgNJ/8tdl8eFflNnTj8pQIY89kaldvTqdCL8zSaHdF2qfKHgdogkU1Laexqav0ZyKNt75IixQppK3ijA3lJncwwljPJMadyKCeiQCBBUrhL4AbMghyDOxlWDJfXyLCkPn3r37zucF0QoehPU9ffrUs+7S7kqYMX7qmPP4YTjoeAOzYZiYRNY4qMo9crnxUGpXDyZ4aEPh7zL9TqJ+2lxzL9LezX8otWGAZ3USgUQgEXhNBJLwek0A8/BEIBFIBN48AjhBPCnWD2lm5pPqyQ6RfmTjTD1+/Ng/qJeEl9bjG6wchjdfo9c/4xo5oJPh1FBwBCC+9vYO1E5CGcMZJBl7JH6eOHTETrqP2J43SEy8OvoNIhBlHwQXCZ95mfzSd5xFVF1jOVAoRuZymuwUbpmDfLs9+wLZgLe9tgon16Wx23DKGzJJmxxi22xjv1hsbJxz8XpZQd11SfiubKEbhBd0laxCoY6a/U+n6Mkuznq7ZXbwsFy+90elvPefi0lQOGP3qHRmItPIAWayqxJesg++c06KzsH5FBcpwqsJIxPh1Tv+aZl//B/K/POfl8H4celNlRJfkyF0SIov24JApwUQXdCxWtPUR+fXGlfdF8g3ECBPF6GNEPcQX+BH2Bsqn6mIr5PjY5uBx7tNw28e//RQvSduDZoyuT397aoh2YwhQtJJYH8mBRQKKUqMjBfHR2BTt24SJgxl+soPmhgVejjBrJQH+lu9owdUFGo/kQIbkpN7d+1zjqt/p71jviUCiUAikAhcOwJJeF07xHmBRCARSAS+KQJBDvEj+lChjBBfdoBFfPCE+Omzp0uCBFXA0s/WD3HchuX3b3rZa9xftXSda7J5EzyqO6EwJOXfk6NAe1E22SmSs4CaiZCRNd/wGmt486eu6oZKlqAKoK+ZpZLZvxwu5T6/dN6bsfKZkcsMQQg9jXIgy5tBwHyU33S+6mtjs83pl2REM7jCJnmHsNS7+omx5xHIAuvqGu1Ql73LlTfIJJG8qLI6Cj1ULCP5vELhpQXZREevyVAhU299r3S+9+OyeOcPy1x5u+ZlX9t0ZlcDmgzCqyG6/KkNONjUA2WXCCsrvIh/1KbB+W/K5eO/LdOP/7F0nn9U+pOR1GTYF4SXTsVhOirodCm8dJwVXtrHQrFm+5Xm3OEv4NW32mfP97IgNtw57oNnx5opE/JLrzpDIaqnsI21+/gWYUho466IIFTK3Od4SANhfyYiiHB1WZlete1gRWHd5pYgrRgfKG817jTG3O9MYCCCj7sG6kgIPfJ4nZ9Lkcs49o1C7arN3NwmZs0SgUQgEdgqBJLw2qruzMYkAonAdiCAA3BpddfhPTm6ahROEUofEv6enBz7R7V9b/145gd2/Iiuv6Q3z2GgPSiYCOnx0245ADwhJxxkZ29XoSAKBRLZg9rrQjmHRpqVkcTskDo4TW7rdnTuWitW/YX6ASeJsKhd4YFCBMzI/eM8QBcK7VRII+uqQmDbQqDWgLnxRXzRLy8oU6RG0U4xDrUzy3qh4vGnnHmPU38XiaHP2CdmFGXsvrygnNJsnPzragZOHTbnUMa7zGMhZdBM/T7ZVfjiw++Xznd+Umb3f1Rm3UMRXgpnrMQWIYy+CUB4YVd8cp7m3YSXvlWFl7YM55+XzsnPy/TDvy2Xn/2s9MbHRZnCtEsf/ZbP4jM0ZBnL1nqRI0wsWxBhcQVf5o6/MTYhsJzAvgltJIk99y/G9+hUCduVz+t8rET2VtJJMdfYzXbe32QxjBG1/Z7+jhHyV0Pa+Ts2ksoLIgjcuMHzyWIMnVAXNka4UZYFyQXZ1e2pjhpm3Bsg86xmUxg64cs8uOHv21gPbiC9uI+DRQ1t3KgGZWUSgUQgEdhyBJLw2vIOzuYlAolAGxGQKykHGaXPwf5BOARqBoQRIRIon1zwDCj2F8JhwMPFWd60gnsMQYOiix/+dnJUSXKekJQd4gtSAAeIJ+JnZ6fKWTXRHiQI7i/337R2vU59HCYnDw/HiHAoHMI9kV11hkq60eE/CmV00mt4DLq2cQ7jy+vUII+tCODEoroBXjumOKeML7/QRgVpgY3ygqjwMo4vZKWIXPb18ezrQ5vjl/1Vr7b+yRHqUn0sRF7NdS5eFGZvdL2kijnbeatcPvhBuXz4R2W6933RW1KSdHlBUClkStfwjSBuBl6Os7DI0iqUMZaVG6w8L53xx2X+y/9Y5r/5OxFez3VWhczq+jPLxnSYWtRVLrF6TyGbVylSeLmlzTnZLYsQoA/CfqrSq4YmAxfqTIgeEppPtcz+VRnoI+Nwn2Nb3hhDhHUeSalMPi/ay0MMEvoT8ndxIbWbFF/c93lhbx5/jAGPm81Dgr9lJrrVFv6OcW/mO/k2yeW1o9D8yNnHwxv+limHm/qd7mV9/du3eS3LGiUCiUAisJ0IJOG1nf2arUoEEoE2I6Df+qgEDhQiMRyi4mDWr7mdJec+aXKCLB1y2qof3uEw4HB9mZrkNkFZOYM4NfjffSlJcA5wCiuphboLQg/SC6cIRwIyYRvVTCa86BLBsaMk1/siOGsOGGYxY5ICCC+cZKsIpADjmFBCQDnowCxvBIEamoRDviSypMxhGZQHTU4myC3vI8Krp3HGWJOJNk7sWn9okdBcaI2pVFVT0Uuz7k6Z9XdFKO2VhT790rqi2RcvuySeDzLYJ6RVyEcIMUQNpBeqrY6uW9i3OywdJbG/1H3iUqrAsnOg7/sc5XvBsiYednyr5BTKGb6TH+xYacM+V+J6EV4f/o1CHJ+WvY5C7kS8SWvGjcQ2Ro4wXpTIFUZd9P0yZubzhnxzt0GaomKCEEWtSQ7GAQnsGbuCzPc3jWfyE86l3oM8qeN4G4kQ7le0k79nR/eOyq5IIUHksMY6KclC9zpmoK1/vxhzBgss48/GRlkX/ej66SNC8yNckXB0cmzev/8g7gfakTaRe5EE9qg1N/Nv80bBm5VJBBKBROCNI5CE1xuHNE+YCCQCicDrIcAPanI4keyXMDfCJSBAjhXKWMkPh1TgjPvXt64nz4Af1/gHXz4j3OvV63WOrk5CDWnpStEEyQPZBamH8os2EgIyPhtLAXEReW4aAmIbCS91mskT1G1MTGDiTzig+ILgOhspSb1wmEoF4RAokRYmYAzmZjqDr2Mjt3ks4UmMtY5efRFdMWGAvmvsMZ5q6CJ1XI459QO+70zE1kSk1qSzq5kUD5Vv62GZ7b9rEuuLbeKIKHXoNt+urDQp5V31ZgKbz7UXBNaV9aoro/9y4t2UVEgEmMjy3SMxy5r0gq2+YHMOHd+Zn2hiyKel/OqvRHr9pzKcPCv7yiN2LpJtqrBFGZvJmL4JL86g04sMI/TSNM2lVG1Wj0XV8x0EGJfchSHqdY8T0UMOq+FAqh/ZFfc/ZltF3RQh2w0JInC38R6HyXHP4i/TrkhjVF7ggsoLBS+EPmQXs1nySQEniGXw2EjCS3WjBNmlvm7aaDJc4+qd73zH9282sCfkJspsQtJjCEM+Z0kEEoFEIBG4KQSS8LoppPM6iUAikAhUBPQrmB/CodRhJT+aWcOi8lrJSSLnCXmtcAIgt5i1kFm+Io8Tu+vHdPPyYThachAoS4fc3zbozY2mPgptFJGAI4gCgpkJcQ1oI8mMcQRxJtQQ4wFObXwy7i7VWyX5aEOEMdIsuYBqF8oHZqgc7g6leEMxI0UQ6i6p+HCSFiIeIMCMh7at+lzn3URv0C24nrcYL6GmcCiY7QNrkt3bRoSJLm1c9J1l7Cow40uMMY8TLdIXlVAeSEWIyjAUXFI/QXqZAAtSueLPOS/ml+XscqeMFWZ4vv+9MtdnLUsTryu+8Bl1aKqytjXWL+uoetdlE1s+oFkH0VXJLu/Hd9kO+3i/ps7eplXOFyVVFmGXO0p0v/9A15Vqa35aLkefl/Lr/1Q6v/47K7x2ykT/FuVCdtcRCQjlNZCSCzoNQBV0qdBLcsmxTbNLJuG16kNB5NLYntWpsqmdnaHHeah1haHG81ShbiOHuk0am+M+0RzPeTA0vdnmtRSnrhdgWzsK9znyNvIwhnv+vfv3TewzBrnPTUUC8ZADUh8VM+1lvPJARDc/fd+8dr54D2fM0dfuJX08ePCWQ9S591BmTZJ+lMvRviS8DEy+JQKJQCJwQwgk4XVDQOdlEoFEIBGoCPi3sX4MOz8PxI5KJan4fU/uLsLiHuqnAABAAElEQVQicBBwCJitj/CPkZLfxsx87XN8qvNWw1VQNUF2keiXthO+x5NwnvgzMyNOBDjRXnKkEC7StkL9HdKjNkCYWJ0ltYMLjp0Il92dPYUy7i/zdqHkmiic006gSK9wfNvW8uupLznscJzBsQeOKC00YEwKNOsZP/HdS7KhIH/Amv7AKcU57YqIgOQiBKnXTJbAttiFfZtlrZnJ8T69HJbRzqNyfu/3FMk3fGkDfWyzhat/saz2iLrUPVbrm0qqWVrnnZpPlv0dcovl5pMk9CZK19ZpO/+Wii5fRttdAExk1uW5DhOWi7NSfvtPpfcJSeuflsF8XCbKlj8jGb4OkdamKCDPhBckF8GOmkYB5kshncIhCa8GV7oFjJmcA4yFnWwOW0Whi70eKI9V2C4E0NyE13g80r1BO/vY5aliQeexLXOv8Pbahy/st8FfmZGRttMOcCBs+1B5KcGBdYznk5MTJ/PnHsl32sq+2oH/7Srqol2Fsh5JyYYylAcWjMWxwlhHoxOHd7bx4U27OiFrmwgkAonAVQSS8LqKR35LBBKBROD6EdCPYrtG/kEfP+rxZ+xk60fywaGcAk3jjoql5nI6Vw6QsWb3ouAotLNQbyWhJ9RHTsEO4YwKa6SdkF20kVnMyPlS1VA4g5BAPeX7amdR/1Lxps/cx2ovpAv5uoZDJeuHeLG6qOsQRkIZwcGOcDsbfS21NpLCsWLoiwjcII5RDYr8UQmSIDgE59sS1qEIi9nTIFtJKh6KLgix6B4fp97i81yCqLP+URkd/VDhid/1eV/2xjj+uhKj9eqeXHNV1r40G76a8GrILhFRrvxS3UX71VbIMH0G4cUuq/Ov7h26gtrJ987F0zJ89tOy9+RnZWf0aRnLSZ80OcNES5SeFG0dEVsQXpciwxYdcnhBgkFKrM69as/dXKowV4yrnUL4ECq7j5pVYx3loICTwmmqGVh13xPB7VlAl7CtYxrWQ3+2sUDs8eBGZmZTJReec1Pq/s89EAUz+a1QPxHWCC5hr7I1/eN/q4q6if598NYDzzrMwyrayQOrk5NTK7Qh+7IkAolAIpAI3BwCSXjdHNZ5pUQgEUgEAgH9KLYCg5/0eAK8VKoS4FBKgB0pf/i1j1qA8LZTqbtwjiL/Sdu8ADfP7WFpKGcHp2egvDY4NyghCO+J2cvIV6XwFzuJcgzU/njq3z4nAYfNiiS1kXZWR5g+7PeH5VDEJuGc7MM09piBp7HXLG6exr6lTm7t7Tf9KQhVPHhWpxZo4EqYGLhSUIqAJbmACKcaitxC0UVuLogvHPCuSCLszvsznLR4ISXe885ROb3/BwpTfOhtX/UWR3/VHrEtRuvVvaMt9di1bc0Guf3BENRPr2edxoFfHMMy69Tu5bqvI7y4JjWCxGJ4oTBlQZ8CDfJr5/Hflv6zn5XL8RMklqUDEaFdpL2J64l7FpJWeSXhBZ5NoUuAtinuMlRewgq7ww4huSFcBaReEdbHRCQQ/tVufRId7H86nn+tJH9ooewq1FoyF9kSy6h6eagD4QzhNdXfN0gvwvUp3CtDyQyY4NSuwv384cO3nJfRf7vU9xCaVrKJ2EuFV7v6M2ubCCQC7UcgCa/292G2IBFIBFqIgJ0h1RvHPJzOUD7hDB0cHpkAgfjB+ZlMLhzOCAnip+WEwLStyG+x66KGM3U74T3V4aEpp6enJnsWcoAgMHgKXh2Dik/bmmwiRmoZyBX6m++0iTA6SD9UfLSzJmsmUf8pyY3V3zVPTNvafJ31xRGG12HMLEvzZeUaxz6oLGLWtIGJsCC5gjTlPLU4XLHsluPDD8r08He8erW17vXNP9eruDr66plX1Vhb36z8asJL+y8JLkgvCC/OEQTYiwqvZuQ11ag1g/BqCHdYmobwItzRy1rXPf2o7D3+q7Jz/GGZi4yY6XbkW48ug2oFwoxDs1QEVmCEjdFPdVt00b7GvMO4tcHEjnA/J4G9iBCIH+4RfukwMLYaiL71+tW52rMkO9M9jsJ9jrah7j06OnKOSh7oEKrsmXmlYK73+pXibQ3AljR6Np+W+wpppK/VyybWaTf3dsjNVO62pCOzmolAIrA1CCThtTVdmQ1JBBKB9iCAY4RjHj/m/TRbi1YAiAzaV44TfiiT/4Qf/sxaOCHETT+ao7TPCaDe+G0omph9cn9v344AYT1O0N7MzIhjV9vI/uEx4gQ2q1v1UQkFnFvaj/NDOOfQTt9Qag/W4QhCZjJz21iOL98JfUrH6Gpn2x54sy00BqHvrEJHA26oupgZD6easEXy6KgXPHachD5OUsZScz3tPypnj/746kXWvtn81r6/6uJXm+rVs7o6PnFdLzWPF3nTy8tBZDVGpHV8b9Y5hxeEQt0nPrl/XM3h9ULtNaCsG/LACnWXB9ka4RUkWJDuO5/8v2X45B/L/PxY6ps4treq/Asnv5tf4/4cBE8QXg0Owpht3M+5tzMDL8rDsE0lNWfs6/7ODLwogirpT3+H0lU9JabRXdVCaMNMpNpS28CA3Hk81Nnb2xUGEd6Jugvij0T2gUHYXTMAWtXqmf5mk58SpfZASt7a/osL5fGSkpkHGlkSgUQgEUgEbg6BJLxuDuu8UiKQCCQCDQLhEnfIOaTFCN/QBGq7O376vycyiA0ovKbk/pD6iVxePCm3yss5YNoHJgQfZATOADOWEVLG1PR+uu+QHoHR+PkkxQYDkLLz3kJvz46O3nDgaEivT1iTcpeJjBmI9OpBxqhdOHkXcngJawoVRLS9jc4eNb+2gm1gENUuhC02BJHlsCltITR0qDxBzHQKWUAB07lUJD051yeLXnl+8KNyce+H3sabOaXlt/U1vtiVLS9++fo9Xjxi/fyxrTrEfPP5wnDWNqqGleBim7dDbNG+uq353hyLygtaKhqnzytFW5rxZEWNl3Vlq7xQeFELbLZZR6287bL0j39Rdj77m9IdPZYYTJMqZFkiEOokUY/YnftBm4Qh478+rIDIJqk5pD/5C+kgtjNrYyW7mcAD0otipatsvM2EF7iYABQmtItlZuiF/ONeCEZ10hJIL/7GxUBoJ8lHX9P9h1Kx8WCH0eS/YVpC4TU6Hblv8y0RSAQSgUTgZhBIwutmcM6rJAKJQCKwhkD8BO72whGdS23CEkncefq/K+UPhfXkdDo5PpZPENO7Q4q0ccZCPBgIOxI3086BZsbD8aE9p6cn4eToO6oHCmEudhIDqsYB8qbWvEHw0R5UerSFftuVqmFX7WeZdSgeyM12pif/VnYJI5pMeBNETpZ1BEIpI9hcIAMIVewz06KW9+RARy40iNIwnEr1PL/cLc8e/KTMd99eP2HwQVfW8KUe1VzoC9tjxVdv/ZKDlqvrNWIFDjLXjXPqS/PdnjNf2MGvdZKLnZrvtpUX92G7Spw8lnWBepUgaLQCQA2qPmWPhRka6zoTXbDPV/frnj0uOx//u9I7/XR53li4u+/cs9wjssWKOWM8CC/y9A1Ebl/43nd0dF+z8erBhvqG3F0oXVF4QfageA3iO0K7fS6dx13UQnjJ3cW9HlI68pRdKqx76DxeEELk38O+UHkR9sdDHodBtrTN3Pe5fxOyfu/ePbWM9illgdrPff758XMPpxZ2ZVY5EUgEEoFWIpCEVyu7LSudCCQCbUbA/qcdHZwhHMyOnaA9OUA4AHaapP7CATgW2TWbMitaOE78cPbT8g0EgB/6oUQIsirqiXuN1oSn+rt2ACBy7AjKoeGJ91gJix0m1fjntWltdfBq/fmsfc2y87NBaCppM+VCObsilEeOrvP3aH9hSAklRJB/XnFH3kINQv42YSAigBw/kIbM7Ik9mQgQFhBcKLlQRRIeVscE+1ZVDDb1eNYvzx/+87LYOfoCgi+Y29r2ugVH9Tp903qdxk40RuKKumgYDgurZdb5VQmV+sl6lpvX8pg4D2NvvTD2olX6rMt8XiG3KsnVkF/UzPusHaN13clx2f3o/ynd4489pl0/7RcTCKDoiTA2rofqrOZSox+3rwgbF/qjWfSqWA/JDRECMca9AKWrk9gT3ih7BpORJichZ+NCoaVgBxnENp+vnr45dXs+mopjuw0ejFdUmDF5idSYIoMoEF6nJyc2ZZuj7bM9LaWmzBZ7oX4mRcHR0b3mfh9/vwl3PFMbITfBoBKibr/xaS+x2a5eytomAonAXUIgCa+71NvZ1kQgEdgIBPhdi2PI026cep5mDx3qB+G15x/BOIcT5fxA3eXk9XIUUArZ+Vl6UxvRnGUl1n/A15VLIkJOAOq1g30latdyqBpmdvDIaRJOeD1qSz7X/F6HMknZZXWX8pjhwTpvj0IZUXih7ACrUDbALbTWu32tzoPws6Mvhx+iZt0RhBAAIxSCMdtdEAUrkkvEgHBjv+eLQXn68I9FdD14aX0qH/HSjcvxFX1wvT2xVhMv1u/69I0CU2Fd892kVv0OEcKyPpfbawL7teO0+IVi+6JlerEc7IJOc1XdZbra25v9HOrI2SCxWdcsnz8tex/9eSknn9l2UfNQM+w4XlFV7mtU2Zfn0DtUsGUecHgWWi1zz0fNOyS8ucs94dJ5rMYiQyDC/fDAGEMWNn2+RXiBBw95mMSECUwwDMLbj0+UJ05/FzGSNtoJym0eUnHPP1SuMv7u0Xu0CUUvoau8KPwdxB7cfoZxi3O1uUH5lggkAonABiKQhNcGdkpWKRFIBLYbgfBdgvDCGcQ5DMJrzw4QqhaULpPziQihUfz4FyT8WMa539SCU7ZycO0Ji6ALEgcVzuHBgUNZnF+I9jmc8VT5W0T22CXY1JZ9u3q5n2mX/uPYHhwScte3g4MDdCanh0T1kF2VzAk1h7aaXwgMv93V23lUEF5StzAuBKBzcwmOBVMEChSTBFJB4iTjMOMQ11Ay7O94elme3PtxmTUzLq6jAOZfVa4Xbc7+ZTVYWx9GE/t6NW96eX3zybK/N4SX7wlr+9Xv6+e60vCmpYBnQ1tTcdXv9XO5j/ZdX3at6rp6cvXZya/L3sf/vlyOCcOOagZZE4frzuZ7xF0M1604GC11V+Sb0wQLDeFT75/cF8ZSvkKQ0EN+0GGicHPv/dUCvsknY518ZszYS4g7Nu2Zak+kclNYI4RfG0u9h3HvguxCyRfJ+blXza3ugtiD6KohnvU+l4RXG3s865wIJAKbjkASXpveQ1m/RCAR2D4E8FfVKqu79COf2eRI3utk5sptwo9gSKCJnvTztD+eduMwhgNwxXHaIHTCv14jveSuEXoGMUHbmKYdBxtyix/7hDOejc7UrsVGK9deB2L6iv4ldAfHB6dupnw9Eb40srqLXG0QAdgEhBeEIF/a6vC9Dl6QupAhOI3rziCEKaquXYUwMgwiWb1CGbUfWI4vpuXp/vvl/OFPXnp5sP26cn3u9fqZv6wma+tjIKm6WufVfLLQfHq5kl2sb5a98/q+DUGyPJ92be4hjMNYXvtcrgsCTD2gXZrtPo52rPbnyqvz+cvy6/DzvyrDT/9abI3y1/kYtnM0x4edx5q78+6HG4xvdUvtBkIbIcMHw4FVXtg1oc7cFyF9CG2G0IUw2dT7/uv04ED590juvqNJTDBT/tahfiK0k78R2ErbituhDubhFDPyouolfHP1oOfC6l6Ht+reTyOt7GXJ461tLc76JgKJQCKw2Qgk4bXZ/ZO1SwQSgW1EAE/RfiNEj9Rd+lGMYmWgnEQQRPzQR911PtE07c7tFE4iUPCDeJMdn1q3UCeI8ILs0o99J+SXMocZCWk8OatGcurOFdLHd3DYOpWX+hny5kDKNpwesKBEgmoS1Y8iP5uZA8Ngp6+qvO4i4bWewwusHO5rQrgJB5WDHLmNIr8XBNnTclRO3vuX7O5S4azfX/x8Mz70C2d54euL13zp93Uiyjus1Xy5Tevqsj/Xia66jc9KenEizlO3sdgQX2wy09JUdn05bkjsoP/hhHvfus+VT87Ofj4hbypxTu8WK/5/9t782Zblqu+sM8/n3qunhyQzCIRw2B1tdxsZW8KEaRzggcFGMuYHR/iX/ql5/AM2jnbQhMOObgfRQ3Q4otsddkSbVmAxGBBt5kEIAZZkmQYheE8SmvUeeu8OZ57P6e9nrcqadu199j5j1Tkr7z27qrIys3KtzMrK9c21Vlrc8ufel00/+7yADHx2SWPPAB/ATE9fJL0HJw7sA+aKW5CvHxv/bXxcyHdthBECvQR27Wh8QAuWgLYj8XcpAH7i72pFCyE2PmqsNNoF+G0L8Drqqal7+kbTZJg1sthjpuxsVKJ+z/hP+7KgxWJHatYAu+5S7w5aggPBgS5xIACvLrVG1CU4EBy4NxxwTQcJPHLGvSwn5ovSAJoz305uusgK/96+tJ9Y5DYBVPNiwDCt+HfVrBGaXENJK/VyGI5mAs7Gl0TfAg6aBehhsgIYhtPePduZMF/hlhSYwLK70gnQPsIEb1UmOzhYd38t7Mp4aJp7hwL7EHIM4BLRBhJKEE5moPcRFMD/TaIbzTgc/M9L+yUBolXebOwfZ0+e+6+yk+U3FF3mPEjgamCWRimNy6Iy45wkMKtImyjQ0U7z6wR4VI/VcxJzneKsvDxvkqiLZ3CSKs1Rf47AtB+Le57PwC47TWV4/EAUEYAaO3+SLX7+A9nU0Z6944A3Jujb/Xv0Q/Pk5MJSayqNEbO26LHgGqC6jz8vxk6cm+9qQw/GjTLnHeKXdVcfIzH9Y+dGvm2Ao+xObOb8pgHVL5oZx9OYzjcNLa8l0cf3jzcGE9UjaaTagoe+56ThO5DGvX5RG7UNDgQHggPd50AAXt1vo6hhcCA4cOc4oMktE1z9IdQz2V9eWrGdzZgsM+Hf0k5Ve7suIAIk8R9n7/0AvHLH46LD6VuRMOeOiY802XftLmkvCPRyP0zwAgEwiYN3o8HRXliWdhemeABfaCahtYfJjgF/trovx+wCMgm0Le0PHwB46B/3LQAS0ifY4QzNCIBCgF6EfkAAWML78WTm9dn2G76hxp5hvedyXGzkblzWKnDhi7zmBQHpREc7za8RjBXh7wn38j8SpXen0OYijgrZT0vNRIjRkhNkfY1z4itHu12JsxK5pkj74UTBzwe7bJlmUU7t555+ysofTOel3OXfKcBcvfPFO55rfEIzYA+aoIwZ7t8M00a0QKUFuyctWGvOYW3ZT67xrhMAuaCdHVfN15WiGR83N7RDsWkE94s+tE7NCb3eCbS1AbpW5b+R7wANyQIWuziyGyWuCwDHktaqv8Z3q5371XpR2+BAcOAuciAAr7vYqkFTcCA40HEO+Bbl+PTAdwuT/SWZ+zHNRRjC5AHAC3MWhAHX8MKBNxNjVoQrJkodotRMdiTEIZAzged6XqAF/quY7FPvo+ND24EMHy2Ya87irFjSL07K+2jSCBhp4gmSSi7bc4owB20uxM6YQAtos43Wxu62reYj9JMuaewB5KD5Qn6EoLsICkAbIdHm10TmoKf4gXkvQCH+jRAQvS/B6dNs5/A0e/z6t2UnS89TTBHyYovrdFLCLSlmkmMjd+NykpLOT5tTUBCSTnS0U78+M4bVQa8zS8J9TvIjD0zMtocTn0IiREc75adybo3Tcm3Z1d+LPM3yynZNd/IHFJcze69mC5/+dWl7HVj1GCu8L1ihVmdqmvpHkfEOnKTxGxAEug3YErGMC4C8mPbxPTBtRtpOTMCH4za7Furc+CI+cIR5dtRpX3kFAGjdTmZ+LPosLi8ZT/ybd5Ztbj6THzN2q0TDDZKrfSVRb7c69ZO+g2hs8T3HT5mbbcp5vcY32uvk9Ni+8ezGaXQpbfrOd4qYqExwIDgQHLgDHAjA6w40YpAQHAgO9IsDTGx95dcd2q5o63KccuOseFr/tiTgpG3L+0QZgA0+SxBijk+ODLBYW103Ux1zyquZPhoLmOkcaaJ/qkk+ch0T/lyM6xO5VlffOdN9EyWNLIRX106aN2fFHu/O6qH/UEBmojnl6R3hF6xw0upI5jsO+LnwCqS1urJmfWhO/chBP8BQwNOz7PHZinx1fVPxZHLlMEkh/Bc3K/eqceef5yWmgs/PcIUpcj7oUMIZFG8RfrRLCc2kSO+NZSONneTp07ll4KcREp2JUB0TcmJH4okjm/0U1zy9DNXzsohh91P8wqd/LZvd/EIBALiwjxar+7lL/SOlv+tHms42ZsCXo7S9OGcXRzSBMG3cP9TmJcfuwJ7+wD3eHZqqr7yysUAEoNkKuO0g97xrucm8nwWR7W00nXet+fm2QCt9pauLPlQUs+yTfFdZ+jPvKe25LLN+01jNF6z4DkLfibTY+GbY+yt+2Ot31zt80BccCA4EB26QAwF43SCz41HBgeBAcAAOILwjxGO2xSR/WdpdCPeYNzDZBfDCaX3fggFeTNwVWNnGjA8NJ/wwIdwgBOCbZQ/AS8IMxBZCe9+IzetrgBVYg645hx6EN5z0Q//crEwZATjVtmjsuaNiHHh7oL3vW0i4DPziDz92S2b2iQmjdinln/iCryfYg5bHa6t/Ojt89HUFqxKck9iXrlOCFJ+uxzvmuS6WebxHnJMKIMuCDqNAr6TpRdpC+M8Z62CY3bGihv8kehtHuF50zMQM4iipqKGdV8suslQjPVMtJl3MPnkxm//ChxksDOQwgZ+bKqi9rJTz7h1pOr4BNnbwLkgzFlNnNvnAwfm+zKAx70u+z0hrgBHsEgjUxwDN3qV8cxMcu0M3mrFGu8bM3e1tW/yxcULfFge8fJztKs01wEum6eBbMwLwzJdlxWyTNt0WfezayzucAMD71ve72o5Rr+BAcODucCAAr7vTlkFJcCA40BsOuECHqcMaW7JLwMFkhZVrhBomwTi17Vuorrwzecd3yZLMVGxVW8SgrQDgsy/Q61jaCiY8I/UUkk/fKFbVRSfSOQAfwhuCGkLbYi60oonBvT354dnb066Mal+gDLW25eP8PgVr6pxf0G27mKmfLK8ks1exRQL8sbQ+AAl3jqazJ1/+zdnZLP5vPFQ5djlRnzZIpd7+saxKTqEOw0AvT0sCT9sEjh0QSzShDZbOdbTM5dNKdElxhbSd7hOX8vqJF+XnRfKUpDhW03pkUUyRRtU/3s+WPvFz2cyxtHi8c6gKpKxWuJLhjp5a++gHkHdRmkAsEjCWoEEKP/DniAYw2lCY+JUACU3Wxtk+MCrvI4B3ohugC3Nmxk9aH9rZ3ARgKJl6O6mJ3m72Eb4JmGHTpqbZLFpoSxZBbLfGmTm7d8BOnNqc5khH6/FkEIG9bc4+dLmoY3AgOHAvORCA171s9iA6OBAcuE0OMK9lxstq/traurSAZgvBBi0gdmhEsOlfKAUR13JaMNM+HPgilO1La+1Qpjlo7OCLDB4g4BEsZ8reI8LTroImkEnQgdZFreIj3KDdhSB3LH8tu9v47to18AvzlWTCdR8Fe0xZoR+wCwFwCVOfOZzTJ4HvzMDRp6dL2dZXfHOtN3hvKaMu1WU6JFkO0pFTqkMb6FXqWVkCMcTTW9o8a4oruEX8wIM8gvfTs1USFPypxFFYEV+U3Dgp0xdVyVOUd+pZlj79y9n05stWNENCobVWT3Znr6DZ2XpmYwfmb2beqRv4+gL0ASApNrsQJxzkJB9cbXK6+6yyPqdqQycLAPjuAuwD9KL9GSNY+NnXbrb4unJfXk6n5+0mzQ54+e6LyZRfxGULMlW1sY6NONSuaO/tS9sZUC/5daMTnPt6db9po4bBgeBAcKBTHAjAq1PNEZUJDgQH7gMHEG5wTMx25SurqxJoHPBCowXfXUyA+2imUqxsa3JvQIa0FNilESH85ExbzQvwwXfX0RGmm+642QRb5JaeTvShGUEMAQzBbUEmebYro9qWHcdORbdtQZ8LNgAO9xnwMj5J22FW2o2YL/KXTJgQ2nHmjLnr47k3ZntveFttOGiKt8PAk1qm6kVHJMnx611SnMANJyePt4OfG1xVuU5k1wGwFJtAkvLajUd1bZWr1rByPpJ/lXRlsQNnVHFYyvmXP5TNfOkPDQS/n4AXmqJnthAC8IPJ+4zMfeek+bSvhRBMG/H/h5ao+z/M217tUu8fA2zvZEQJeOUbdIicRYFB0I7PKwILPywCsVMl30cD9pQuablZoo798H0HwGIxx3eYpcd7u7I5DaAX7YVWNxrPLIRg1qhIJQvAq2PNGdUJDgQH7gAHAvC6A40YJAQHggP94gDzWib0S0v4t9JW7AIAmPweaiV7R6YrxxL4EQb6FgB/TmSqyG5k+O5aXl6xST+k4MQ++SshDdSZHxqYQejtRB8BxQVOnE0vLrnvLkBMtBZoywO1K0Kba+1JCEKuMZqN8nv1Qx9B+29xYUmaLNKA0z93Su/y3p749GT9v8iOHr21xpe8lxRxF3o7OvBOTV7vOuV1YCO/pw5VlltJX5wWJwX/8h5o10N3XSwKLU4q+TkdFt9IVrlMNRmWc/bpx7PFL3zIxoNKtjt/6sOgvwsAJXMCgtM7gtYo/h0PDw4LbSfMpAteipn1ftEXdnkv8LqLGvm6mpW5HxpeaMhCH2ModO/u7gjww9eVj58OKHVzt2Lasgp4mbm72guQf0nfxFX9AeiSDq09du4tNjLp7XewL30u6hkcCA7cRw4E4HUfWz1oDg4EB26VA0x00WpZlf8uzBlZBWZyz0rvjib2mPt1QDafmEcAXQA8aDBB24om9qzI48z+SCvYW5ubBvrgnwmgY0bpbdbPk3o60Yc2AjSj2WU+ywR8EY51z7UT5IMG310Ce8AIDCCzFEZ2fnY/DgsCeM2Zv0AvNFcAPTEHPTo+zA60qcFrz//l7HT5eWMG70RbGAaWDKbNU46fYbCIMWMuBlDnFA4jtHh2PUEd3Kjcs1O/Lkmu3C/K460sU5TRTX61pSH1sPiypMucTe9+KVv+9K8LNeifH8OL0m1AjoZDxn38P6HZZRuaSEsWbWA0YjHrQwMYkAQQpdoM9T5x0VrccD66po370o7lG6jxEbNGdrhd0W6tfCcJ0L29s52DQg4UdRnwos6A+EnDi/ZE0xfgcnl52WiDXszh8Wu5re8iGnzWhj39DkJzhOBAcCA40FUOBODV1ZaJegUHggO95gCTV4QUNLfSxBeCku+qFSa+q2s+0Zf4iYPe7a0tCTNuzojg07fgu1Od2Or8qkw1ATTgw5G0E/alucY27L7LloQ1xXMvieNGbg9pFgkmfKKxR3u6/xlAPkAcCTNqUwA+6EagI5i5ao3wvrX08PrSptOi07QacuENLQ0DBG0Tg2WBvb6TJ8It/cA2atg/yp585bfJOf2CFZ7Y03zS+F2kkrJy2izvKq4vBnalJ+eUDiM4JSuOnhA+10PzWv1sII3nKFPmjBngTzOieV1/8mWuUl2aT5g6PsiWP/7eLDvaV/G6K1o8bcpxmad2M6+NhznoRQ3RhMSXV9rUBBDl6ODINr+wXW5znvCu9dEElHEBwMvozn120c5scsL3Efqhi/drZ3c729FmLj6+zJgJYJdphjZ6KvWl/vxR33mZuvNtTBu50Ha4MLCNagR+MXYqF80fITgQHAgOBAeuiAMBeF0RI6OY4EBwIDhQ5QDgBpNZ/hDs0X7S3NdM/pgEr60/MGGGlV7NhbNDabhsb2l3Ru3ERQRxfQvQzMQec8aV5VWjl8n74ZHMNuS0Hf9ddy3Qrmhv4XeGDQgAdhBXaPc97Ua5JcALue6+hKSlgXCOZgOgr/k2k9aG7cAmYRaNFZiCHyJMXXekyPP4zX+rYNEwcW98NlZSVk6LB1zhCf398iGneBjhAw8oEzKWDIYyrlm78k41VzOV3zNAQqftear5r+98+Y9+QnZfO95nVBH33USNbrNW10GvtwHjCeH0xAHyJWl4sYMp7Swo2UwbzdG5zKT1ain4e9TeD7jf3cDYwPvD5hUE04LV0Xa5hW58XaEJJdrZ2ffZxoa1P4sL+IHsI818H/DbCW0pmPazvhN7WhBirtBlIC/VOY7BgeBAcKBPHAjAq0+tFXUNDgQHesMBJuPmm0jABxPYJMgwwWcVF3BkUSZwTOgBR9iafFu7Mx4L8LoSGfoWOGWyt2hblTnKqkAvAn6rWMHGVBPfXXctmFabgB3ak5V7HCuzqxomN5ubG3JKfHDXSD6XHusH9H+1vTq/mSghuGOmZaY8cuaPoI5fok2BXc9GgF3tUExbFfKU42doK2Rk3NWAWyMfYfw6J0V+uwn4+LXxfrwChqZq0lk+6RzmlglVdu1i6LOaN1Ku6pOWX/qpbOZoV12GPiMfgQYKpJTNEvp6nWs62aKBawLzDTHwR98JNgHhGk3g6s6FvGMO/PSPHw54uTk4rQZtLA6Yjz+ZPq+ssGgCAMSOhkc2nuLryheJ6CH9oxkz/iVpr+G8fkbffgLjIJrAmKuKWFHVP7qMkPgJDgQHggMd5UAAXh1tmKhWcCA40G8OaN5qq9cuPLqZF5NZAivUqzJ/YxcuJvNMeA9wSKwVXlaubdbfy0mv70QFbUzqoQMfVvgm6+vOk7TXqIBG06xW7dfW17VD44IEs2MTyBDMNrc2TctpVP67dy+Z79DXxRs5al6WcIcTagLgLppDZxLUt05mBXb9DYtPP1VRrwp6pPvtx0rKyml72ovFNkGgi5UyZq58nBgvdZVjKYfHjVPMaLqcmW1PSE8aOBaJi5OBJKMiqrmqTbny8Z/Jpvb1Pkkr8E6afYlwB640auodMfAnf3/m5RNwXRrBaDrRXvCF3f22d7ZsESFpCY/iaxfvGSUixhaDdCz8IbIzZYVmxhHo3t7eynbkyws3AYy5OvQusEDCQtciJpty0M87iq/HPS12uck/anvVt6B3JEaFgwPBgeBA5zgQgFfnmiQqFBwIDtwFDiRh0wQUTcy5dvMM+fGYd4f15sNIxOK4FgGGbefxZ+Shf5NeaEQTYVmaTosyYYP2PYFd7ELl5oz9o+m8vjglAWZtFW090avErNofSktvh523ZMJp/rrOK+Qu3aefix6EUjZkAPjEB5FrMwDuHqkvHGc7p9PZxtd8+wDlqYeML8vmKcfPMPDMZgT99tZDGkDGrkji3NgZWhK2032pkieko/msao1M0+twx94z/2khoadRxiZ+1PcAhdEOJmD+C7iz/uCh+b6blnbkzOy0FhAOZC69aWOMA2F9JZzxglYX/CXaefUAwBgvWESYm53PAU5t6iINqC1pzbKogBZYH8dWFkgA85bZzVfjIm2HNjCawOxEiYZwF4afnvamqHZwIDgQHGjlQABerWyJyOBAcCA4cDkOpNV6JvJoJXA04UUaLzisXRMolATrffljwZwBsAsTQIS5Mv/l6nGTuTHXWJYZCr6azC+LZu7srgX4gz+nOxckpyF4PXr4OhPK0NTDUT8044SY0Eeh7DLtRL9FqEOEBfxc0k6d+K1JvpcAdTFj3Pia72h9jIu+rbdaInM4JD+0JJg4Kr2TE2e8jgyGgly0YDh5XhifceOU1vo0yzh+7mbKZg1XP/7T2dTB9p0DBbypk4Nz920FP9MiyfLqijRI56UVPJ/N6BtyJI1gxhl8W9n3pcmo1sboVmSi2WvlYJd9/PJqmq8rAeYz2t2QcdR9QW6b1jAbX+DnrG8BmpkH4JdtaVG+2TBhFeCFySaa0PdykaRvjRj1DQ4EB3rHgQC8etdkUeHgQHCgLxxgMktIzruZuM9JaAEIwLE7/ldYzcW5+R6ru6zsA3gp9M5xrUhl5XptTTtQ6YgowkQeExQm8oQ7t3ItmlfX1rKVpRXT4EvmeptsMy8AE59VfRTKrLEu+APghTA6r36+IL9dmO0SMNFC62tz7zB7+jXfVZTub0hxaf2mvBpxdiWdyQXmKylqRFUvdyvnUJNRlyv0QrkvVYUic3HSWofm3TZIY+WPfjyb0kYYdyk4+OOakYA7XLv/KqiUVpC0gvGDh8YkJozHMn0/0EIJZnCYT/fuewFVNDY/egHLd9A13BSj7+SSTDnX7XvCQhBjCOMqml6mGdXLRRQ2I9DCkJzWszhEW0I8tO1qYWhPmt73bZGEHh4hOBAcCA5cJwcC8LpO7kbZwYHgwL3mQBXwwkQF0xScEPtkd8WEFjRKEFowZ2DS75pQCDzu0LY3DJTcgm+SVQFeswL2AO9wSsxW8nt7+/lKdpv42hsKByqKrPa6556zFXtMcAB70LhgZ8ZjOejH3PGsh1oIA4ROEAEPEM5xOO1mrchzmGidZfsS0l9541/LzmYXrETk3WqYqHfwslwqeP5LF3OpOoybWZxqMmvcrFec7lLVsMznl9BM0WzpqeODbOWlnxaKKlXBOxIM9xEtLBIQDOzKF0w8IrOdb1dx5K54NgA50s6+LCZgNu47n1rK3vxAcxXwMh7ohbRvh/gwtzAv7dlHZhJ9JLN/vpVoiO7t7tmYctJDwAsaoHNZwCW+Lv07D+B3ZprQu/u79+6b0ZsOGxUNDgQHesuBALx623RR8eBAcKDLHDBTBSa3/BN2dXKs3RolqGCmsSahJQUm9+zmB+DF7n4EZdNEuCn2pRy3d8ThLnVD2MLPCs6juWayzvnDR68zGgD2mNWzYr21vWngj5u1NUXX26Nl3CcnsIa2MTMagTdoV+CMHVCHP7TyTDuPVfpcAKV80txFDS/vmo3+qT4+o46OieeaHGwbAIhgLqEU/3S7+nv25X81O11+3ljfyH2jml30196FDo0Hzba7EC/Poaf5jGaLTe9+KVv59K+gEmXaMdQBjcrZaZn7CRy5a4HvAfSx+y2ak2iTMs4eCAB6+uSp+X5CWwjtIQupj8PnfIzuG0+oupk1atOLBAxh+oeJPGOKPjJ9I4nPoo11jJPs6os2tG06IErYtGZjg40Z9H21duT76mAYhHZxTtC7BogKBweCA/eSAwF43ctmD6KDA8GB6+ZAFfBiXo6AwiSWCfyq/BoRkEmOT4/liHdTWlCVVXrFd3FyC00EAB4XrhzwIg6A48HDhzrOyufKtNG2IxCPnbUwR+kr4IV4gtBBe0yJLhOwBeIsSPtgWe24JNMUtJegEUEbX2xoISDVAAreRfMUtBUd0HL6AAXhzYKEt/l5+e2SQ2aEc8KBHPfvCwR88ujPZUeP3mpx/DRFVbHr/MALc8nQS7ALmpGUOxQuXZsx6Gk+o9n6s08/ni1+/oP2fsIa3jfe07voLxB2Mf4y5rDrKW8QiwxskLG1ta2NIDBrJFHOteJd4ZoxDA71K0DP4uKCfTPRGuYbip9EM2vUmAIP+hZS88wCeAm8nJM/TwO31D4Hh/sCvDZsQcm+NyKPdktjlrVv3wiO+gYHggPBgQ5wIACvDjRCVCE4EBy4exwwcKgQMiRwiERW5BNI4pN1HPHK+bAEFhzXAyKUoXuTeafJfazYJJ3Zu2bkxOO/CxMNNKEQxJJPEjSeEtjXT6HLW8TrXoJfthultLtoUwQRBDEDu+RPB20v+AIQ5u7by1a9C2cnAmlpZ0BMaATUQ/uNvr3AhgWKtz4grUbMdZ8svCk7eONfrJHe7N3Fq1JLVbnwBqhEjH+aBMbxc9xcyiQAN59Y8qPJqWbKK7guH5YXNhBRf0hepSvp28MYkD+xSX2zZvMvfyibe/VFB3tyYOcuAgM+1J7Z+8U4y7hDv2acxdE5vhLtFWkyqKdgF82PRjGmmmuil/H2UNpdEHkkDVt2qOzjYoJ3d/dzuCTgcl4LJ4B5zAdwyr+1iTk85ptwgJ/mG0B8hOBAcCA4EByYhAMBeE3CrUgbHAgOBAfG5ICBQ0rrk3LXEJrL/XctaFWXlXj8tbC9/M4uK/RHBhIkIKyLE10ESaA7aHLACwLPDOBYEG04VE5mmWg54VyY7daZuFveAWFsTGbeYrKyHeWHCiBLAVPFJTmqxw+L0zYtIQyhc8e0vHCobFpfmH7WQEzL3vsf+IDgRptiQkWb0/6Lyzipnzf6TrTj6IHAv42plWz7K7+lRnNThDu3W7j0Vytj3Is+gl2JNudLk1vp7hUdW5nfGll/YF6tS4NedKRzQjNFs3ZLn/rlbHbnT+z9dO1DAIS7FWAT5sFzGnsAvBbkL1GQuoZf5wYbZfDO8W4S4+3iAL1zosnF7vMHTWHoMTcA2hwEYA/TRjRKN5490yKD72jcfUrKGlp31w+LAswD8OmJeSPtdXJ2YtrefEt8o5t8jFV62pl/l37fyqrEWXAgOBAcuDccCMDr3jR1EBocCA7cJAdKoMQ1ojDxYpetRZl7zc7MGbhVaEGxtTw+vkwm6a5gQv0AcgC5SifJ0u7RhD2tVs9MoXngmj04Uzbn7crXW8CL5kDgyH0FAWahxYQpI076EUQQMQH28FmG/xVAIOLN19kdBLxoS/ou7YywRtuzo9rc7Ky1M+8Zmn3bR2fZxtf6jozDenUTvBh4R+lvFwwJDLhg9gtl4x3xUJykiGs9jsWlIlFxcjV1ykm9lDBeMq61Tk1uNilYeenfZ2d7WwYKYFZ91wLsoT/z7jH2LMkcDn4TD734gQQoORboZekYd8SkBNKTr28BDS/8JaI5irk8tDD+Qt+G6AVQh8a+BeYGaHPPaLzkGwLoldqHTV6gCy2v03xhyeYStCWm4/oXITgQHAgOBAcm40AAXpPxK1IHB4IDwYGxOMAkFRkDp+WAA6zMm8mXJrjJ7I8V6m2ZZqDlVczclYkp7SXk/LHqd7FEucaA6uh+R7jOBADJz4oEMFatoQ16t7VTISZ+AGSk7S5N53ECicqFDNMeEY0lcOkAD46UAffwV2W7rCGUSVhJAup5T+jbfYQzgD3CvPqzOdLWUdEmlGLeuaOd1B6/+W9pR8ZFS+cctNPi51xZ9RIvAby/6QD9HoqTFHEjx3MpLhIUJ1dXr5zkCwvkJfOG1qnK1SYFU8f72dIf/WQ2ZdqH1ZRDi+vVDdjDN0WYR+G8fnZeDs81NgGc4CsRoORIY5ABJdKOIuBvkeBO3+20Nz+MM8faiRNQaP3BA9ceFR9YSMBUelvgUF8Br2lpqvFdZAEMc03eG76faAnvaQHs8EDtqMa2uYLakvEMra8EjPWmEaOiwYHgQHCgAxwIwKsDjRBVCA4EB+4eB+qA17FN1lfMFGXeJrdMdo8EDGzKSe2hBBWukdGT3HcL8voYjVAHvNxcM7MJ+6pMTkRYNid/JABAmNjgiD9N5Cm8mzSNJttX1eVPJm+fWQmXmG7itB6C0WpCmwkBDMf1CCaAXgZ2KU8fBbLRHHFQi/6N7xkENjROZmcxy9EmDLkvs8cP/qyc1P/poijuEZpAhcdWf/MU5yesZsrPPdNN9LO+CZ51dl6Gxy1sb0RdijdpAGyUOc7l7JMXs6WX/5OBzeOk71MaeIoptY0xuZkf7x1AFqZ/ewKYAUoAvRh/pgWeEACHCIxf/QssFmk3So2xD9bXZdq4ZuMqfi+PBew907dzjAGlc2QzdqKpRliUdiztyDXAJTs1slhwoLY02jXGmmmnBjXAyz4Cl51rgKhQcCA4cO84EIDXvWvyIDg4EBy4CQ7YfFY/mGGgDcMqNaAQPo4SGMLW6lvShMJ8wQEVN1mhfjchtE/OBxeU06QbkzZ2RsOfFRpeCB84Kz+QA37o2pfwhekGtKHpdWHtj8kremU5oBETRehCu2JOWhUr8lU1m/uqQmxhVR7AyxpNbd5/7a46POIABpS6Rh+glpkySjMB8845gV2Af7orE6TD7HG2mu1+xTcXbZDALiLqJRdJKid5ivMTVvJw6hlu4r25FKDTqPVNXpYsvSiPx6/thXlkA+f4z2mmXPrsr2czG19oRt+B6zO9c/OuQSmzRYBmxlxAZ8AtzBn39/YN9HJgxN+60qSxn4AX9Ufzyf14rdsYy4IK7/mzZ08NBHLTP9FL39GNop8XJx1qfqumtw21WsI8Xiabrh09bZvYYBpvm73og0P7umafAK+efkM7xP2oSnAgOHBPORCA1z1t+CA7OBAcuF4OuNwmX0eYlGh+i4NzAK9Zmfy5EDKVbW3LnFFCCqAKgUm8aYbl5xbZsR/8qmh92swW0SQA8EDwWph3kzbo3dndMRDoRMAIE3YAPswc++lbB6f8broIDYWAYiDYjGmxoVmB+ab5tBL4kwC+/q7IA2y5tAhwAeBHH5azMqORe6ndAXIJCKHHR0fZ7vFU9uRrvsPi+ClFO48aLoPmd4YnKMpsnhQi7gXyNsuqXpfYS5OKaqr+n6e2vmpKLgR6FawuTiau1sqLP5FNHe5PnK/LGQz4mdPup9LosnFFAHza8XdafhP1Zsqk+kDfE2kHCfzC/A3kJ32HukzbsLrRf/ieMJ4ua5FhQX4COWfxAZq3tjYE8O2b3zID/hSffExSZj6EDSv+VuJTeyTNYTMJX13RQtiCvpHHGi+n/Pu5jT9IgX3y/WkLKGpM9192K9WOhwYHggPBgV5zIACvXjdfVD44EBzoKgeSsMzOWkzQlwUKmZ+rHPBCSGcLcrShksDJ0YREMl+x8H5VfJpiq3hNypmMJ+DDfJNJ84m6A3zs7pQmfrNanUfwQMutdHR/VbW5iXLUJhKyaBKETTdndCfDCFnbO9sGWlo7qtF8Rb7vPleanS+BDw4tYWKE3xnaHU0vBHBMqdiZ87U3fVN2svS8NUzKVW2lZsnlvfzO8ARl0srZdYFdPCK9w4OwXaUCd+A0jT/XQcrFQa+23jNeDad3X82WP/mL4yXuSarkPxDQwxZM+KYsarMIaXoZIK8x+fDoQKZw+3oXDwvzau/DF+flbbKHumPWx7jLeLMkWtFm4zsCHxh7MZvHsb3xQDyxvpwjXd0FvPge+kCHw/pVAV7s2GjtKoajLYzWMOMqAJ/T4XODLtJ0m30knh0cCA4EB8bhQABe43Ap0gQHggPBgQk54GYIMmfUDJVVWsCBZfnrsBV6aXQBAOF0F/9daULrgqfWeE0+6aaQYhpoqpr571JF0XhalPbavDSboAOhCwfumDOiZcCEHXr6a44hSEV0AVoinKCpB+BDHEfzwSag50jaTbQfAhk8QhvKV/G72Y7ndmdVm5pDk/85AER7sisjGl4IofiXwcHyrrTcns19Wbb/p95uRQ+j2sW8lqfD0AmDvy8TZhoj+YVAmjHK7UuSq+brhfhZdKDiZCj7rJ827i584beyuSefasT2+bIE3tPYC0gC4MUuuTg3xzQe4Jk/tC0BVexbws/kr9etM8u+G0YDY++83AJgSj6rRQWNsbqJVi2mf5hzMi4ZsYxXqrn1iS7SrIp53fy7Mj8/Z3MDxlIC796+QMtdaUmz42YZfF5wgWGyLCLOggPBgeDAPeVAAF73tOGD7OBAcOB6OQDowQotc+55aT8BdgESMFHH9A2BZIfJupzvpmBaU7pg9dqnxelOV44IULl5m2berLQvydRkUU53Z2RiAl0IW6xQHx1K4NI1tLjPL5/gd4WS8esh3ymYlkiba3ll2QAvzE4MzBIvNuQ4GUHTnUM7fwzsRPDSH2n7F9Rrrd1cY4J+TDA/MxI21/BFJ2Eb4ROhGgFt6+Ake/aW77R0wygeLn/qzvCbVmbz56pBmWr5FwJoqgX0/Pw6eHshnlpHGtabSiaToq37rLyoXRsP98qEPT7zT4IotVfFxxXeP74pC/q+4EcPbagjzBrR8mK3Rr23jL3k7S9QQsvKYb8WF4xWLTqwUQjhUDRiPs+iEQFaU9/tLs1OD/XlewldaH+z8y+gHd8a6PKdGg+kqec7M7Lg4nnsED/BgeBAcCA4MAEHAvCagFmRNDgQHAgOjMsBTP9Ojtx/F4DQsv5wOgwAIgjFzE72NFlHM8iFQUxVfJc/M6HrJFCiyTpAiNVN5nsSstB4WpAfJwQMBK59/FlplynbTUwTegLAGDjZ6QmT/b4FB64w3VtdXZXQtWTS47GESYCu7a1tE1IQXjyIO4WAWQo3faJaFFsLm+8uVTwBXvCAPgzgxY5iBLQr8KPz2vNvz05W3mBxLprZaSsQ4XfSb94nJugaSahNJVz2SHt5KE5SxPUfJ33kBHy6bOWvns+TEisKiizFydhkTe+8ki3/8a+Mnb7LCU1rNAfRYQp9ljjGXrSD8KEIGoZJOX680Lg81Q6N/i3pK+BVjp/4joRGFljSxi98b7a1OUpyC8B3NGkSl2Nw11o1vcC+aMIiAnMDHNcD5AFw0YaYpgJ62YY2WkxicxgG06t+J7vGnahPcCA4EBy4Dg4E4HUdXI0ygwPBgXvPASbo+BZhEg4ohO8n97XCvPXMQIJ9aXhhtpC0pgAWmLBj9nghjYhr57oLIAgTSFwAICuiC8e7qBCwex/mjAAgZnYDpdCDzxUJZ0zm+xfQ2kKwlK8VNh2YYUdCBMtj+SqT/y5oFY1JCLVT3fcwuZCeZ7zVA+AdNJuQpZq4aRQCp0yoFhfMpJEKwgOEzY2ZB627MiYujCZGqcZLaMVch8Bn/dlKv4X2mvSRE/BqNN/Pv3s9vJ6Q4CJ5cXJ+xSspFj/z69nsZv93beR7wpiKBpB/G5wfmPoBmCzKnxf9mIUGNGwx9TvJvy2kv462rLD5Wk75TqIhzJgKbZiU4wczAV48dGtrU6aN1Y1ffLx2mq+lWpcsNL3AvsCFVhcLYisrq6YJTpuxOQp+2Hb0fWFBDHPVALwuyfbIHhwIDtxrDgTgda+bP4gPDgQHrosDTFCZrDJhZzLLyrRpOumBTOR3pQW1j8NdCSjmf0Tx/QC8VFHRhECBKc0yE3Vp/aCdBi34HmHnSQ854KVV7BlN7I+lcdDHgLDJCvyq/pKwySr8xrNn5qidOG9DFyxNuJSA5ppw/aM4+R7D9xw0cE37IZgt6Q/NPnboBOza2T/Mnrz1nTUiXRQ/D8fKBb8k/9VKGHZBfxp2b/J4b8vJ842VIzFB/LuZcBF+TlazqwJNLsT3go3FyUDlq3eq3WT1Y/9OSFDVH9JA1s5H4CsPsKsEvByIBohPCypuRn9qYBdgPIB0Mim/qra7SUZVAS/qvyCwHS1bzKkZfxhzNzc3DeDjmjYHFKR/XaiP3QBx0ESwcVXfTOrJuJroAvCCksP9Aznl3zL/iCyUMZ+wNqx27BuobzwiOBAcCA7cBQ4E4HUXWjFoCA4EB7rHAUlfTFARVACFVuTDi2ku2jOs4D57+lTCCwJ8WrH39MxnXXCrim9dIc+FCVtxl8YWq+34JiNgOrOx8cx8k2FqIsIsPglaTOzzKIvvz8+ZaRaYQCJgTxJKocmGFoUJoBCjeAtGdpJKutiGXs1RvwhlCGTeZhIs1YeTo3qEzDkJYIcyZcR06un612WHr/8vB4qD8sSFgZsWobujEzSyeeKr7EPXJhQXzV6cNGi5rsucoRPxdfy6pHd5/BzDU07M+4KVxclA4c07iQ1zr/5+Nv/y79r4476QmikHiupchL+LUMQf9XfqGHfxA/Xw4SOLQwvqWP4Tn2ksxizO3hcl533uW2ARBdNpQDs0oRl7bPMX+VJM2tJo2OLH60AAEeMWwDzUXmVfvR6+eTvy2Ui+MFc1T6A9WfhCS3pHm9pgMo7ZIzShvecLK9dToyg1OBAcCA7cVQ4E4HVXWzboCg4EB26VA0y4mcwyYV9ZXtVEfcmEDwAuTP+ePHmSZJZbredkDxdNCBTQJsBrdXXddml05/TToumx+fEyYcPkMQA9/vSUngpdtCE+clZWMWdE8JCzZGl3IYzgoD+XOy3+7v24UI3fLrRIMJ8ywVlMwVH01tFZtpE7qp+YdusU4+byekyUZUTRE4MtI8oqgM5RaW71nvPuavppB9qBF3JEqN7NKbfUKy/9VJbtbxmIa4PRiDL6dgsN1IcPXycwRFq3GqsATNg9Fi1iFlcSeN03uqg7YF4CvKg/GqYraHlpTKJ9AYR2d3Zsx0YWHwDC+Na4SX33KKb7Wr/UYJZcGVDfJbkF4HuKVi3aauxACZDnWuKAK0pHwwAAPWpJREFUeGc54OXfoO5RFjUKDgQHggPd5UAAXt1tm6hZcCA40GMO+ArzmTn5Xl1dEWgC4CUfLPo71iT9qczhrkYIvUkmMUnX7Fx/rDqvSsMLp8kGaqkaTwXiIaRYyKXNxIe+CplmzigtNgAffKkAuhxqJzTfHazcYfMmW+G6n2VCGYQq2O5oamPALkwZAf3Q7sLHzKvPfX12svYVF6iOys77x/mZPWFenfOTj5HiygAvGNWLkDN7bJ4PI6oDbWEsH833dLdK7szW57Plz7zPwfdh5PU0nsWH9bX14h0FMEH7dFtmjebHyxYp+kecaXgJwGLDE3bBpT3N/M/8eC3oqvQbuSuAiDRoVPOt8e9O92i2sZVqaUArxiFFLgJ4mY/IGZsjHMpcfHtHLg801vq3U4CX2hX/nhGCA8GB4EBwYDIOBOA1Gb8idXAgOBAcGJMD7mCYXf3W1la1A5PM4TRBZyKOZtDG5sYEQv+Yj7z2ZBI5NDlHk4AVdvxa4ceLlXW01vBphZnmYPC4qwQtBp9xPTFzc7NG56JMhRBQACwxn8FXGTSPD9xcT/2uo1SEMtvtzAQxOam3DRfkz0vCFoDXDsL02Xy2+ea/PvnjJ+4EuYbg5E8qchSCZRFziZOEpqCW0cuQv59tr+mE9FwVqDBR+xRsL04Gap3uNElc+eTPZVO70qy9YwHAC8f1ywKCprWjn94Y291vSzsYpl2Au6rxNKop0IaezrVq+cbQ3/BZxkYpvoDEOCVtKHYGlpaXbwCTTLFHlXx79xhbCdBCv2c4JM7oMi1iAXy6ZlFhRzQdHgrwso7MfKICknkx8RscCA4EB4IDY3AgAK8xmBRJggPBgeDApBxg0orTYHyOPHiwbiuzTG41bTX/HGyn7hPZSUu+/fSsoiNwsNo+r50aEUYOpPWEA+HhgtXlgYvboBxHyfgqY3dG2hQNNsxN0KBAk8JX32+jZtf3TAcgJFxJMwQhelltTVxyZr+1vZU9/opvyU4X8Bs0YeAlmCBcFlSZCEw5r15qfw/FSYro2TFvg8maYoDGy7ZNtcCx26lgfXFSLcbO050medMHT7Pll/7DQPq+RzAuzcmRO5rE7ttKQIq+M5hd72txhXYaPi53m3poY4yFBsafOVwEsAmMvj02IOvuvgAvzBoNHCJ1h7WgqvRAWZoEzMsUFR9eaE7jp8t22xRN+wd7MlEF6MoXIXoLtDu18RscCA4EB26DAwF43QbX45nBgeDAnecAE1RW1/E38kgOhZPmE6vvTM4xiesj4IXgMSutJ/yS4dsKnyPmZFcgEEBIEqwKAdYEFm/udK9PjY/vtVWtvAP+AHCxE+We2g7Qy6SQplTdJ+KG1NWEMv3MCcxEcwRwk4DvslOBuM9OF7PtN3/rkNzDoicHWS4LqBR9cFiVxokv+m9xMk6uIs3FchXZ7aTZxVKZzfh6rnGvJm+XZsmXbadU3kTtZZ005Ww/Jj5xN/Fq6Y9/PpvZedyeoaexsAKgxHbMnZ/LTa/PBATta5ySWRzmgBMCzV1gBXRZu6UuKhrYQINFJMzpCYBDLLZs41NR9HpAy4uzag/Ib93yweqlH18sEX05gWw2YICXAD20aJkv7Krt+NacnPjGNn1sw1tmdzw+OBAcCA4YBwLwio4QHAgOBAeugQOYmRzKz9Ha+lr26NEj+RdBG4gJvK+843OkkMKu4fnXVSST7nkJVexaiP8uBJBTTcjxF4NGQTK7KIRXyRycA/SdaaW6b2FFWhNr8o8D3WiynciMcVuA5Z40vPDpdTcDu4vOGKCJIDY/5+acB4f7tjPj46/8Nml3rU9IepJax8t2WeGu6H/jPa49VSEvFyft6UbEXjxnvdD05jTLS/H11JNeTdY2zdIv21bV8sZuN0c0qlkHztt4NX2wKS2v9w6k7XWECMXMfEnA9JKAIPM1aOD8sZnF9XVzDb6hAEOAQtDn35bMAS99fwC0WHBhYWlra1NjE7tSAg5N9wbwwnQcAs2kEQ0vAV5osREwHd/FD1sAXsaP+AkOBAeCAxflQABeF+Vc5AsOBAeCAyM4wGT9SP431tcfZA8fPZTzWXfmfnp2kmHOuC8/UH0MCBSAIGtysDsvM5pkfrEtgQMzvxLwgjpJYvzXn83rW/17dYALql8dfJQQokojfAPsoeGF4IU5I22KIIIZje0IlmMFHaBisioM0Ex2J4a2QrsL310cZ81x9JQ0KPayZyfz2fZXT+K7q8KgyunoygocHTttS0n0OTreZcIYgArFX/IpY9cwsaP9eSk2pUotOXbxZcJLMP4qgC9ne6KnrFbr2Tlt1CwlcWfpk9Ly2r1DWl4ilLFqXv4UGZd5X3FwzljNIoRpozZ7apU5iTGtTL69yBLwkmaXNLkS4IU5Iw7e5U3SAC98d/H9gU4WJeCFA6dVIm+PjuqTrcvqJwF5/s5oEcl8kwmslPb0nDYHof4sqqAJfnx0rGtKUb5LvJ/VesR5cCA4EBy4TxwIwOs+tXbQGhwIDtwYB9hhalZgwcOHD83X1UkOeKEls7W5ZT46bqwyV/YgSUaaeWPmtiIQCC0gJuZsDf/s6VOjqW/zcQQJF6zEJIQKEYD/FMCspaXFbBHQR/670DA4wjH/02e2SyPOlBG0ZiSIecYrY/L1FwTNEC5arb2gWwFNPQBZHF+z0QK+cjDlnKaNZc6IE+xnX/HfZCdLr/cM5/5WJOnK6ehsnvDC/Sin5VKAF7wZI4yXaoyClCSxJ5V53nVZasqRYlLOssx0Z+zjhZlPlyqfP/bzKglL1jfpqiSqnpYZqrF23iwh1Wx677Vs+RO/MJC+zxGJDZjQL2tXWQeI3F8kWkKYNZKmAILsHIpL8KVr9BtN/Kjh+J7StfjmzGnHWHxHrq6sWTy0AnZtCvRyIAl9YmmFddCXV0GT6kdd0fBifGVhIS0yTOeaw3yHMGk0f5FKhysB/HlFCA4EB4IDwYHJOBCA12T8itTBgeBAcGAsDjBBZ8V9/YEALzk+xyyBGTt+Vbbl68quxyqpS4lyR+YCvPAXg+kME/gDaT1tbjzrJeAFyAWYJWUIx61y4QpAy/xXSXhEY4I0BwL2tjY2zDky908EeCFsecYutdM5dTFhF0HSBUNHWwC/cAwtwariGDqZbR7IefJTKSVuf+13nFN49XYunI0to3lCVeHiQWQRLgx4mUTqZYz6zR8zKsnY9yYld/DZzZicj2PXoCXhBRvhsoAXNfEmaNLUUkdLXPy0JmiWkni98vH3ZlP7m615+hiZui2bTKCZOauxmbbge7MjwIsNVODFIOAF8JID3x0jvNoPcFhPPQG8WEgys3oBXtDI2MxOjWhO8121UU3xnXRer0ZIYxN1dxPMKRtzoYsNUhLgxRzCtbx8g5QAvDrWQaM6wYHgQG84EIBXb5oqKhocCA70iQNMZBfk1B3/TwtakWZlFpM4TOHYbhxtmr4FJugzs+40eElAkIMhZ9nBwb52aJSwIfocPOkRZQggkqwQptD0ov4IVwhWyxIccdiOE2EEZejc3kJb4siEKVbgEbYQYfoWSmEyCbsJCpBpFDtTCtREAJuZllaBNBF2drezx4/+fHb88C0TkKoyU7Hn5vKE6mKXCi7QT1hE0XzFycgCBlOlmOGVH35n5KPGvpmE6GoGE/wVkWqX7o1dl0s0BmPFZcLY7VgQV5wMPLZ5h5rNPvvjbPFzvz2Qts8RjF+LMo0zU+TZeZGisVkO3Xd2dk0LF9qcF/qtMMXa6nLNdW1sS+MU31PXhpqWJpTM/jQ2ra6uaxwWKfrZ19iM+SZat+YXy2itEHltNZy84JImB7xojFn5IkuAFwssxInibI8NbpgvaAzGv1cfN36ZnEORIzgQHAgOXC0HAvC6Wn5GacGB4EBwwDjABB1QaFWmYUzOEfwxiWMCuyvQq48O3BGg07bwOKyfkcN6fMVgTmLOdXU+PsDRrY4CbWYCg4xkwB47Ua6YbxXiMfXbY9cz/JQJ6CIkfzE16dHu9OGn1ICgryL0oq3G35LoRisRaXJG5o3HJ0fZ5s5B9vStf2cywiYCPRD+Jiu+LfXYQEnKXMjExUm603psT5Vi2wloj20t/lKRddCLHu0h1a5aeLpXjWs9v2CjXB7wojZtNW+pZZGsOKklasYm2lf+8MeyqePDWtr+Xrj27Zy0ipe10LKwsGRgEDur7rKDoTZQGRYu21bDyr18PGOUWk9/AD0sRNDHEzjEYhKLEQnwwvTvUNrGmAp6aLb85Wt0JSVAkvVtNkKhN2rsRXNNgBY+I92Hl3YFFr3s1AjghTZxAF5Xwv0oJDgQHLiHHAjA6x42epAcHAgO3AQHzswHkpmXMCkXkICvKzSEWHXv40otgtG8tNXYPh1zTcCRY4F4CBr7ucPgC8rHN9EgQ54B0OLgAP64zJ+XZBBAyhVpeOGYH4ELzQH8qewfqO1ID6FGbEeFqiHUerSbLpr/MRMmXXvC/OPkdM9pZ0alsuQH2mDh8cKfyg7f+Da7ToDByEdw0/hzbipLYPwcL2lrqomBLkopmq44aS97IDalT5wor1PMQJYbikg14XGpLmVcOkt3vFL1q7aK5inOTziQ+aLtCs7hoThJEe1HS9aethmbyFh4+UPZ3GsvtZfXu1gHvHiHceqe/HgdC5xnMcJ2BYamRHx5MslreqNcoe8wHtu7rXMWGAgGDkkLav3Bunx5ocmGWf2B7dK4L9NrtKfJM8HwY2XczI83APMBmgAQj4qmxYb19XV9e/i2sgPwmb6tMtXc2TTH9bRtN2m6Gc7FU4IDwYHgwEU5EIDXRTkX+YIDwYHgwAgOILCtagV6UavtaAhhCghYgp8Rdvrr48SVFWc309ROYNpJCme7aBBgSsLKugkkhUA1gjmdulUKUggUZtYoJMQAL4A9tPMUDgErt7VjljRCINFMIDn2jl6owbz21LQjAPMQEGlbdghbFMC3JD8yOOpHqw2fOACar731XQU+NDbJYzMHAJF6XTxMDHgVKEhx0vrw9rseu7wyn/3Nd/wZy/ez7/+YtGiOWsu46UhqV2VnSUM6q9712g3GNGutFOcnamZSu14gU14KY2gFlRwoeyDCMwxGD8SUpKz9wbt7ufhQJ8kBe0ATWLC0KM1iaQpxDf/Z6Q8/XkVTWFPyk9om9Yt6qbd9BRjEN8bAIVUmjVPQxVi9/uCBfV/pl4dHR2ZyjgYuY5YDXom+26akfL61lPgODTRWVXONuAeAeBqDoY+wJw0vNgthwcXbsywrzoIDwYHgQHBgPA4E4DUenyJVcCA4EByYiAMAJ+vmv2vBJt+YI+C/a2tzU5pexxOV1ZXECE+L2rkwmZIwYQfo2mYXMAFCZp7RPRnjHPY5+EMiM4+R0IH4h2kQuxRiXoJ4fABYqc0G0JhAqMQnmwlVSFu9pFm7iOIrRsRgoonfG0C+JQG07Ew5K99dgGBoJT49Wci23/ytkwFehTANZ0cFZ97YyRtFTQx0kb+Q74uTRql+Ofyu3u31lexXf/gfZG96tGKJX3m2k/3Quz+Q/dSv/l5rWcMix63/IH8m73RuRlWtSb2M+lU1XX4+WImWRPWoywBelDQuf+yp1mCjWq1RN10u/fHPZzM7j+s3enflGqdoPhF4hxmj0/WuTOK2NHYxUFkTqqEBXqxtdD4Rj+0JN/OD03ZAnirglUAwaHsI4CW3ARDFLrKYbe4K3MO3IjR1UYsanvOv0K7VtZvIT4nWKQFeD2WOKsBL8wXGqX0BeJsAXgL0AvC6mX4XTwkOBAfuHgcC8Lp7bRoUBQeCA7fNAU1UbfK6/sDME9gtCg2vHWkIbW2zdTrCxm1XcvLnA+KxcyE7NJojdxGRnPADBCUBavKSbzOHA16mSaB2gkZoWxSdaErMyJkwq+v4UkF7IAnw+ImhXRFe+N+vUNHwklR1IrNUhEq0ETGHwkwI4Yo2xT/ba8/9hexk/asKnOhccifq3Jd7FyYW1gs8pDhpbbrRd7Ps73/727J/8d9+y0Del77wNPvv/+37svd/+BMD9woG5ncGAajBLKNiUl8claZ6b/B5gy05GFMtQecTtS3Jzy2x8YDBy7HbuGi04qRWWFvs9OZns6XP/Ia9wvacy1e39sybvDDtVPEbwGR1bc0AbGHWpvnE+IWWqpn7VSsFet9RmgHcaRNvf0wU3dcgSNC0/EeyoMR4xX3GqkOZNQLuHQkcUmRH6fLxLm12wvfDgTlfQFmVSeOKQDzGXxYh2CAFDS9cBqTdG6vNF+fBgeBAcCA4cD4HAvA6n0eRIjgQHAgOTMYBzbXZwRAfI2gIpVXqra1NM2lkgn4FcuBkdbqC1Dipx9xt2YAgTcgxd8ud6iLYmnDbUeFpOPlu0jhjO2N55eckMOK/a1GO+WVTkx2adpebbVo5otV3DOtnOyIJ2q5fAvZoM3bXxER1hbZl9808HgF5c2c/e/Z17zSyE2Awuol1d3SCWlNcFBBBnvVQnKSI4cciaXHSmnbY3SpZ3/+935j9Y/0NC//xpZezH/jXv5b90SdfHpbkSuPL8aRay/ZHlMBXM61TjhA+MpQPG5msevOi7ZzKcNAjXQ05Fg1XnNQStsdm2fLH/l12JlNltG4uQFrtGbd1UX0f5ubxP8jGE4tm3ndyemyauJg1ol0MuA8gBD8Auvs4bgPuYbbJLrq0G9rF5iNTgNehdmwEFBurz9xWg7U9Vw3C+LsmsJLFFDYLgQb8fm7vbIlOdm+MEBwIDgQHggOTciAAr0k5FumDA8GB4MB5HNDEFXMxAC+OTFoBvTBN2JFpCdd9FKzYHYsd/NDygh78QOHfaXfX/cP0UXAy8EeNAUBpSI3aZoGdzgT+zMtxuy7NIfK2/JQdHSYfTXcL8AL8wlEygJdrTKBdcGpA35PpB9nul3+T9XgEZMJwOCS/MzyBF5D/GrAyZtpaRl3QLh6KkxTRfiySFSet6UbdrVb1PMArFf7eD34i+6Ef+Y3siy8/TVHtx7YHVx/Ynqs19jxwyaGOtsJTJc6DvJS3LXtrbTzyvDqNyGq3xgIvUvWbqnR54cXtxsPmP/O+bObZZx3ohbAJaWsUdzuXIi7RN5tvPAEYBN8BtDH3A/A6FuBlmmCqJen7DHgta1GCnZCTtjF+vKAR83PnReLI7TTJxE9VdRl/11bX7Pvq5vNTNmfAJDUAr4k5GhmCA8GB4IBxIACv6AjBgeBAcOCqOaCJK/6Q2HHJgRT3z4FpAv6uAIu66F/kPDbMyan5MpoDAF5CHJiQ4zMFx7oAeH0FvKg7bUJAGESzi9015/CjomD+u9COEOAF0II8DK3Wjka4JevRjwN2ptFCrUUQu2/6rpSLRiO7b+5rd8YvvfGvZKeLzxltSXyE/vagO8Nv1rIUkMqY6WuZdTEWAJIypYoXkEC6UT8WyerRxVW1quMCXmRGG/Df/MpHsx/+0Q9kG5s7RXkOOVQuxzrNa1GtTEu+cQCmQXpTjBc+/BHj1aFerbzM4YXWkzeuxm5vIyHRUS+kPVatsPc4W/r4fzCfV/0cw6DTTeI4m9W4BRAE4MV45eC1A15oeFXBYsa7PtJs47Q02AC93M9iZn68WJhgvLYP0jnvO7zqVFBb8e1ZW1+zeQMLSvR7FslYLPO5RKdqHJUJDgQHggO94EAAXr1opqhkcCA40CsOaOKKHxUcB7uZjAsjrNLixwv/I70EvDCVkRaQmfppIo5/Efxa7coZP0BHHwUn71elsIg5n/nvMlAPkz9pOsk3zE7yDVMIUcoDcNlTwIt6u08YNZzakjZdXkF4nDeaDo9E8/5x9uRr/3bx6iXAYChmAS/GDJfR7uIRYwMglrj44aQ1JNpab+aRVeomAbxSmfuHx9n/+t6PZP/nz/xH+eTBz1C6M+axWoGELNbi6uWcx+PBx6eYstDyrF62vfBEDU/QyOAJJ+gitfyTtXeio1bEUHZTs5WP/Vg2fXbU0/cZOhnDAO0diPcxzM2TRZSBQG7SmPu3siz9HcMA7dz0fMU0cukfR/K1yMYiBwLqbVyGxp6FhUX5X5OGF5rhfHtYVGHewGY34cOrZ40Z1Q0OBAc6w4EAvDrTFFGR4EBw4M5wQJPxtFMWE3FW2DEjYuK6u7PbW8DLtIDksB4wDyGKnbEAvPb28ZlClETHsQXgbrU2AhQBX1ZoDeD/hnAC4CUBCsALgK8UvNWiPdWOoJFKwEvabfhmE8Bn/rtktopvtn216dOp9Wz3K/+q8YGfBCMMbeIJ0IyLCqSpncraFNUbflJmak2T6GreHEqnEl4E8ErlP9naz/75T/x29p5f+j1pScqr+DjBKtOoUe0yv6jFlQWP4ndJf3nmOb2wIUUqyehnlk8vz0bVo0w1eFa+d4P3BmKMjCYtZarmHahY+MyvZ/M7X0QdiqGtZ6H6PgNiySwbADtpP6n/H8iv1bYWW9hNlwCJNgboXv/o1duvRkSTjZ10oZUxjM1F0Iay75GI6iNd+F/Dh1fSWoMuNMM3NzYC8LKeGz/BgeBAcGByDgTgNTnPIkdwIDgQHBjNAU3G8XOFhhcBHyoIbNuauOLzii3V+6jh5avPq7aLH36fDPDS7lGAIwQTZnsnLKriaq8kBJv/m1yLDXrS7l8GeMlHjGlR5On7q+GFwCtNEDRCRAvaBMkfzvSMNPeOZKq6v5u9+tw3ZCerb7K25SfxaGgTTyBhXhz4SNVJtUnXQ46WbHja4XccFBhS6qUAr1Tmp1/dzH7oR38z+6Xffukc4bzkeMFii8rjy9squi3OnziM5yUPyrM8R6pqKrW4Lk/0vNrzyzttZ8Pq0Ja2GTc26FWQUZzUimrGUv2Z7S9mK599n8ZldgKsJe/BBZtQyA+hviveGFNmooz5OYsT8K00y3bACyJ7vfGGGhHtJ/xdmeN67YJ8cnxqGl570jjm+3qZvnZbjT4rtwEAXuyUS7tNCfBi3rDx7JlpFLv/vduqXTw3OBAcCA70kwMBePWz3aLWwYHgQJc5oMk4/pAwTSC489nMdltiV0PbBU8T8r6FZG4xL/9kAF7s4rcnwAsTEtAQEzD6R5YJFqkt5uSwfkWmfZj4nUj7hh3ODg5Lh8+2w5mIRcOgz4AXgnEC79CUWAXkE0iLkIVj662dvezVt5TmjIk/w49q+Ana/qLC6NigBxVVG3koTlKEHdtjxyPj+7/3r2iXxnfUyrvoxe9++kvZD777t7IPf/QzZZ1rvKxcFKcVDZaE0BT3qIkuatdeu1F8HxSm6wXUryrUpudXooafeikTZakUNnb7W+O2t3AzNtG19rH3SMMLs8bKA3txCuB1qu+KzODydndtXDc/R+PLAC/5tzrUWGZBRPYa8BIR0AXghXbqjMawU/mU3BKN+/rGAgCO6utdbdYZadiuo+E1v2B+Mqd1vbWJhtczKK59q7pKQ9QrOBAcCA50jQMBeHWtRaI+wYHgQP85IInq0cOHGdpCaM+Ajuxr1ZmV2v18B6mu+uMAyEFQQOjjnB9badYRwQITEnZrZAUdZ/W7e/ty5n6o9NKMGNFyLmT6b1syhBd/tu5aQaVAjxA3o5XuQhC1+vl97iGojy0Itzw8OZ+nTTBlXFpeMpMS+IBGHhoDp3LijlDJX6LT+FKiKi0ldzXKeYdwBbMXF9BG9J3BEILZiGDjZD7bfcvfHJOAnCOJMefkuowgOnY7F12tOKnVqj3Wk5xHBnV44e9945UBXqliv/bRz2X/w7s/kH3ys19KUZUKea3sN70IfmHvSzotL8iqWLvRKC7lr0fbe1SPGsw8GEOO9ufUy0pXXsKQKqREQ49jtz8lMKC0hGZsomn5j38um9590sqzlmI6FMX7nPvkgzgRNK3xFACb8ZoFFsz9GK9ZoDg5lsax7jOgoqVr36iejWM0LeM2CxTr0qQGvIcHR/I9iIP346SN26FWGqcq9O8H2t0ZuqAH7TW+QU+fPLHrccqINMGB4EBwIDhQ50AAXnV+xFVwIDgQHLg8BzQZf/TodSZoIEwgXLDqvLWlHaTkAJ3Q1R2XECSYaNuf6qlLEyagAbO3VQlQmGQC/Jj/LtF1JOHCTWp8p0PoawsqdmgwAYy7lsYBGf3aNUf4Zdd5GuqXgsu11PQiQWBZLvxNT89KSJTvG7a6B9TTMwzwEo2YpWLuZICXHp2eOZEAfpHqXUse5++MzIBoYYBMNCU4h76d3e3syepbsuPn/7w9veT0sMp4Ow27W42vtls1/rxz5zepxmxnS9aetj0273rnVCS193UAXjyabv0emTj+ix//nexLr21aHyyqZA2ReG0Xft9Py7Tp3UjpreCiFDsZ1Q7D+JNKyB+XLnVMFahEjTz1/jcyyZCbif9Dbtejy05Tj8+vEp2JnrlXfy9beOX3W9N2OxJ+loCXn+u9FliyzAIFgFe+6ypjtvkiFFhEOJKWbn8BrxktKs3absiYZ0M3AN6mHLzzTTKT7W433EDt6LLr6w/kkH/eXiu0qvcFUj55KsDrJPXUgWwRERwIDgQHggMjOBCA1wjmxK3gQHAgOHAhDmjS+rrXPWeAF0ANk1g0vBLghaDVRQ0v6gn4g7ycfNlYnP8YELSyKo0BCUuYaZrGgASoQwkXzM5HCU6AVThDHxbQNnJzQRefC4E8ydJJiFcBNaEXZipc3Ceaa5ZRxgyAl7S7AIBm1W5sNoAJKkLi6RmAlwuWqSqwZWwAhqSdCtKMk9bczNSMabStyN8PgXbdlYP+V7/6O8QQCV0K54pZiSGWevRP0a6jkw3cdV4TnTf4QIpGRJmhcWN4CefRWe131wV4pcoeyh/Rv/qVj2b/8mc+LDMt7YJKK1TfBTsnziONr633U4mkTed+HNYW53G4UUxeaHp4/RnDroY9e1j6FD/ROzeiD1BeojPRM3VyoN0afzw9qmfH0kSZcYpxnI1TDPDKzf0wa2Q8AwyyvizCAcIYz0tu9INsmhaT8jlpUa+vrxu4xatwfJIDXtI69l0r+0FPqiV0rUpjLflem5cTe3xkPnv6TCb2JylZHIMDwYHgQHBgAg4E4DUBsyJpcCA4EBwYhwNMWl/33OvN5MI1uc4c8JJ/kaNDhA1N1m0L+XFKu7k01At/TgijgD0JxyCe1XJMZNB+wpSkALwkQOHkHOkRIUqHC4XkT8oyS3ABIKsK8VWwwc7zB1E36nlxwMurS5mzM3MCvGTSuLhsJpT48Nrd23GfMPCjAnjxXPIkHl2I6FvNhFDsAiMbLCyKZriOX7bt3YPsyVu/u2hLsXd0mIAJNwN0UN3hPbF551z6KI0Gr4QXvlcmjX/vanx4VYodON3eP8p++Gf/U/Yjv/j78sPkwLInotPzjuiKH865Yed2UrnHNYF0fpZ+29qjTmlKWR4bRZQ3UuHDE9TSWt0rMeOcls1wXi1VmiUZni7dqVZ3RX68pgSa9C9UAS/tCqzxGu2gFfnmY+dZFjDQ5tqVttChgC8PaHT6hiqj3pdO8kKNB6g3NyuTRgFegHb0JwCvLWl4sQhz8a/R7VFM/17WohI+JKEJDTaASrTW8L/WR5puj5vx5OBAcCA44BwIwCt6QnAgOBAcuGIOMGl97vUCvKQ944Iy/q72ZCrGtvD56voIgfyKqzN+cbkQYXJrLkBTf+iBFge8lhzwkqCEqQWTcZwFe7oRJo2UoQn8sICjdIQvQhLCOabzAnCgMklCpb6Ww3/t9AI/CEoUO6edsQD0MGt0UE+Al8z7zAkydZHQmNJafZTJ6pfqc4Fn32YWBEYEK3yWsSsYtBwcSJvgdCHbfvO3FT30XPJgylghB2jGSltPVLR/PXrwqugKxUktTVvsebUfeLYKMQ2vGwC8UuVf2djN/vm//2D2M+9/0d639F44iJXzlXbQnzWH/1TOVZIRSppUqh/Lsvy6jUf1HANFVG7nhTeeUUmQn3oCq+bgzZExvKvpzR+dMN1tpyjFVqu69Mmfz2Z2H6eMPTrmgJdq7CCWA16YoTOu0RFsV11pqx4c4LheVDN+aUwbi5cd5IQBXrmGly8sTWVHOeCFX8k+0kXfXtI3iDEZjWncBwBUbskv2YHthpx6bQcbJKoUHAgOBAc6yoEAvDraMFGt4EBwoL8cYNL6+ueflzwxbaABjsAxacRUDLMEBOiLCHrXzxHf7Ss9Bw0ggB9Wmqdk4oeJDOZ+xKH9dHi4rz/XhpiWeZz7TGmfkKPQhvPkYQHA68SELwli/DcGJYBEQIwJMOQuBXqS6OrSoBf+x3DyPK+dsUzYEOBF22Hus7uzLaf1uy3aXSJIpFo9VY8+BgRGBGL+2OEN4BIH/U+Wvio7+LL/ekzAy9vrfPqdSRft9wOg07AHWvcb0geH5BnZfCqqplWRl/+CwK6b0PBqVvnFl59l/1T+vX7jI5+i8/Gq2NHeBPVjG1hyJqe+mY52zwokXb1kf9/qcXUuclXPVL+q5h0sv3q3PE/vdxkz7tl19AfomX/lP2fzr35s3Gp0KF0CvNIYPuUaXnq3ZwV40YePteMs5tmYyAF0Mb4Tiv7RIWrGqQrfWTaGwecVfsp4U03DS+CQa7HVe/A4Zd56GlWZjVOWpZk3L808+jlA5Y60w1k06yOId+s8jQoEB4ID954DAXjd+y4QDAgOBAeumgNMxJ9//ssKYEsiiAkZ3Qe8EH604i8C8KdlYJdMHDFzBKzCXwqaQPh+ks2jmb8BVAEWzeheDRhoMBXRg/KGBROeTU7mxwX5JIRzRDOOo5la6tloMQAk2vbzOj/WzmMXDScqb0b0zi8sGPiDs2d4gKDhgJcEDepkf9wSpaJZhxwIu+iTby8fdYeAVZnPoNUGwIdjfnZofPVN35ydLj5Se3qwtmmtan5neIJKrouDGxQyPsCRal15NPnrl7WrodXPMxX92q71o/8vfA8mjW+vlXOTFx/61Jeyf6IdHT/2iVeKvqkT/69+Sn9Nfdai7Vo15GjB0+YXHlPc89icfF2ks5TX79evPK74bZRVxDdO0jveiD73cuz+QEnW2QeLTFSlO9Azvf8kW/74z6Wo/hxFDP2UkRPgmitMGk3DSzv+aTkiO5Efwn0BXpg14k+RRYo+j2E0jvnwevBAizLyAakxmUUKdmk0wGtkB+1o06od8d/F7poL+U6NtvBCu2nBrHwXO1r/qFZwIDgQHOggBwLw6mCjRJWCA8GBfnDAhAWbVOvHLlRvTVgBdl7/HBpeToc5P9eEFSfvCBqACxcV9CgRocaK1gPyR+RyrM/wkzCYqkaOMpAjgQ9oBQDcoMFF1aXNJefxxDngNWNAF3FoAKHBZZpcEiyQZ0+01T0giQFjcvhuYFn5oJazVNuWW0VUqhsRXm/odd9imOuwU+KJaZi5iaHAMAk5+DehUoBg1KOQt1XEebwmLcISpj84bzeHwbo+En0721uuEUFdKFu1Muf6eeNa2UT2MEzPTGXraw9Mo4Dq05bbOKx/yzuNmtRaw8mDJ+MRfl4bjCol9edRacoKp1qXqQdj/N65VVfG4g2zQixCmadk0igNr++5PcArUfez//nT2T97z+9kX3jlqfdPOjP9ND+W50Tn7cXRQn6dCtOxrZ0KHhTpPH8qpYiunQyWXbtduWh7ZuV26+nYfYLc+bvaLKjZLxI9a3/wbgOym+m7fe1jObxkjIQ/ZqItDa957fiHSbrumJYQoPaJNkVgLCcU/aLbBA7Ujmblu7T+YN38lEEzGtTbW5tmtnmRfjXwkJuOEE3zArpYiFiQuTngJeOyuUSQlhdjT4TgQHAgOBAcmIwDAXhNxq9IHRwIDgQHjAMmQ+kngS7sugjQAni0LP8bawISAGbQjML8b2PzmQEnZB4UICdjKhNgJvdmIpjmv6b15P5YTJAx6Q3B1wUag2p0ATiFIEC8lTGLY9x5WymfU11nNdmmfhTLfastR/9vxxz70YFy7AF2DhX2WE7awrk39Vwe2Xg+MTOqJ4/iCSih2bNFsz/RMgnsQtPr2P4cjMPR/KkAsYbDeeUyktBw4J8/1MA+VtZNo018wsRyU+12sJ+cPPP8uxC83dBoe/TwddYnXGNO/XT3KHv6lu80Ip2rI9rUG2QshlxU+Extc+5DUmXpqI0wGOMJRnZHZfK3QGmtgLwUDuov3/8978h+oAOAF5QA8v7f7/+j7H/+yQ9mz57t+Dtp74koTO+nHblMceQkcO1n6bfZVgUfUoJKhkbWIkVR6PAElbR5vWoxoy/G7hcUk7/fzRLzFi2iU1VXXvzJbOoQ87G+BAe5GNvpCzamCbA3k2X8QWGGzqKG+HB4eGC7BaO9aultAQY6m9zoNu00Kd8/6F1bXRNoL61c+ryu0WDD9+LpSWrRbtNSq53oQmttbW3NAC8APMZmzFC3pbnWt3aq0RYXwYHgQHDgljgQgNctMT4eGxwIDvSbAyZD6ec2AC8mwAgvOLTliKhiABDze0349d9i+CUU036dIOSgzYTvEzQA5rQLFIJDEohIm0QfK9sIzSN1k7IRKtBaQ5PAtKnsiKbVSf5sntoIygNQNyzMYDYpLQQezvN5tp/7kZV8jxK9duJHTtk9EXCKfATVylfGTVjAHFKaaDpHE+xUpo/QgDAI3WbKp3jKnNMW8Csra+YPhmvSb0lboNzVzMu/K79ofjx88Mj6A4Ljieh9cjyfbX3lXzMSEz/pE60BRo4ZmiDKmNm8rcdJbJVNNa5naMaOU2vrY6mYVDZH9QvuvSCw6wf+7u1reKUqctw/PM7+91/4vexf/b8fkUYIIK3GAkBh2kl/1gZ25BZx5FLgvBGqUU3+lUk932DulEJ3ht9MifJjGrca0UMua+0zJE0RrfZqC83YVNWlT/1iNrP9aluWjsZ52xqApXEw9VF4hEnjaMDLvyU22HaUurZq0aQOeJ1mqxqz8b1IZ6Pf4nNxR5qqaFP3MfAdcsBrwTTx+NY64LUpcpq9to8URp2DA8GB4MDNciAAr5vldzwtOBAcuCMcMBlKP7cBeLkmWQ78sJIvnpqwxo9m/L7Kj9yjO7pvekz5Cj8gB7s/YaZoR4E+BM8v7QClR2iALsopQS0HlQy0yuPdvBDQiwx+f3wB1x5b/lTm8VTbqYJGksgfjerNhQF2mFYC3JkPGpzqC7DDPKeorwQf5cL0EB6g4XUioAuHxoBfaIFBBzSSkPpPix8Lclq/qpV13+JePspkJrktk8Yj+Q+7awG+wNMHDx6KR2jPnZrPsi/NvCHbf8PXG7mpSeBla6DdxwzXD3il2g5WqHnnvFrbe5OKyfufvWTWn3RDxxf+7jcK8PpLKVWnjk+2D7L/8ac/lP3Yr37U+noBegn8Su+qNx2dP696S1umqCb/SmJT5rKY8t7wcgfSWISXlZ7ZnqaMrbVRGd1+pvZqC83YRM3Cyx/K5l57qS1LR+Mc6DHAS++xd1kf+wC7AINs4xHxYVDDq7+Al9PrGl7QmYJpeGmzETSr+xb4cs1rMYrvEDvo2je2ALy2+MRFCA4EB4IDwYEJORCA14QMi+TBgeBAcAAOmAyln9sAvNLzE4hgc+A0E1adHBTiiO8t/HLJ/xagkO7N4cAY8MuAsiTyuSBMefyzSbZpRMl/CCaCEhzOBBAZ+EUKHugPNQE61WMiIRQiKsHKVHUKYY17MDnF6YR77m/MtdQc0JJJpuiDLk/rIBmpLS1tBF25oADQBU2AWJj1nMqXDc6cAc3wmbK6umL8Q1hiZ80dE5yGa6ZVSOjPKTwVX5YlJK6urhubYc/hwX728vqfy47Xv8pogd+EnHV+Uf1NTK3GDTlPfWTI7aHRY/cp+sqQkO4MpaORr/ZMMqeydbR7Or6ASeO7ugl4JXI++9pW9kM/9jvZL/7Oi3p/RX0F8OKF8OZTPIyZoC1T+WXHcM76b3E3P8nLb0a3XjP6KLQXVMtRa6PanZaL1H6NW6lfpOj02JmNz2RLn/3NFN2boy1WAOLnAR4Z4MUurBrfuL5LgJfTmxk4xFiWfwBsJ0oft0teJJ50/cjCA5rXa+sJ8GIBK9fw0uKLvcddJyLqFxwIDgQHOsaBALw61iBRneBAcKAfHDAZSj+3AXgx0UdANQAKwVUsS8Ibpn+APzNodnGOw3nMBdHqklZUkmut/spHGceAWWg9yefJ0dGB0jDJ1p9AH/xiMclmN8SqJIrwVAideWGmMXXB5qsCIl4u5UNYTlmquKNaSbYhgf3DvJOt6Wdloonmmml/iV5y47A51bVGG1pson1fQA8gIL5TMAEiAPIdAHjJwbPvembRd+NHTKEvLK+sCPRaMZpgM46Rv/jlfyM7m5nzuJzaBAQMEF+0ycCdgYhq+w7cHBGR2m1EEr+V+klLwrwHjYOj5P0qz2EH/XBU+fYIO05l34eG17u+oeVp3Yv6/z7zWvaDP/pb2Yd//zN6hZNGJkOIWtb+8jpP0J6Wo+gYxUkLj/N7ZZKRDMohr+pQ05p+7H5B7iF9w5q3Unqq4pQ0QVc+9p7Kne6fwg8NYRqr4KAo0X/iluRPkjHtrgFevJPWB9Rn0YbynWa9RRnHtuXgHTP2vgW+RwBe6wBe8ktmuxADeB0ciKZNa9++0RT1DQ4EB4IDt82BALxuuwXi+cGB4EAvOWAylH5uF/BCRMt3WsTET39zArfQVMJP15Su3T+Xm/xRZwexJBJJUGByjYnf0dGhaTzhB6sG7iiDixD+y+ozE3DKSQKnHYk4L9jzhq+4Ux+ooSQvOwcYFGPFp2eQaCDkkUqD1lcN6JNmAwIE2l7NQJF6rJku8nxAskU5cjcQUMLSgYQMd348vN7NMvtwDd30Cxz0L6IZIdrh+bZ2En3lzd9lJFRbtJXlpIJ5YwYDV8ZMm5KlPpauRx4hqhGaMePUtvZMCsjLNZBZ53Zfxxfe9Y7sH/UE8Eps+bWPfj77Jz/yG9mnP/eqvf/WfuraCSDhzF7ClGHSY85gf5OrmS9ZbrWoi5y39A2KafYP4lIf6dVOjSKEfskf3yMWKyAEsnm/l7XzLIsB3L8rGl7WfqIPUlcFDq3IbNPGeMXtazdkAK9jmbH3LaCBjEnj2tq6aecZ4KXGPMBpvTS8+mim2bc2iPoGB4IDd48DAXjdvTYNioIDwYEb4ADCBBLFrQBeNtF30cxALYAtAV2Y9jFZnp9fHMqBo+PD3I+VTPrwZ4UjdwlJJjlAVC4oIQ66cO+CE9fcrGEcVgWvB/HGkyFPJtVI0CMVrELsX87fVFyRt3gOCRTyg19UfhXvt6bEkwV30g+PxB8T/sQzAuXShma2qXMAQwe8jg0I272DGl60E31lZXXVwFE0+ABLNwR4vfrm7xxgqbdwhbfpNLVZuh5xLNpvRJrqLet71Yjzzhudr61bDKUjL7v2TCtAPxzpk5TPf47i1Qvvenv2j97ZDw2vKutosh/9wIvZ//SjH8hefSwn2PR/GFO0pS7OY1S1wOZ5nncA9CrKb2a4getG30hPpGnbAiSsfOzHsqmTw7bb3YuzLunjJmOXA15QgUnjomlyovVK371LgJc3hDS81tcLwIumdg2vrZ4CXsemabxugNeyLTDxQh5IC3lrS1prAsQu9X52r/dGjYIDwYHgwLVzIACva2dxPCA4EBy4ixxAoEPE8OAaMggaAAcrMhVbWV5FTjY5Eh8cT588NhML0pT52jmThGuACAcKXIp0n1TKo4Ipm3Iw5ZubZcdFATna3cnM+QzMUV7hWEyQj+WrCqftnOO7Ci0utLlMGwBTRZWVHLwPqZGlqd2zKnm9iHd5tryupS0uEr+KiMpJyutpoK8a6oCJ01+9b+cpk4oyIEuV4h/mimhvzeZ8AtQCIITP3MPPmZuOpHZEkw1H98fZ3sFhtifn9Zwbn8RbwZxWPlWEhzQG8BnlpSpYfawedtapH+rJ5gWrArwwdTVeiaanu8fZxtd8O2TWQmqZWiQX3ugD0W0R9fZrS1GPs3egHjX8yipcr3X9yrMOpSMvufbMVKaOFo/GJI1LG6sPfB+A13f/xeF16vidQ/mu+z9+4Xezf/lTH5QgvWd9QF3AwwTt2kpmXg7vXi1cttxaYRNc1F5Kz9fWP6olLr/009nUwXY1qtPnRqJ+GI+8H+tcH4B5aayiyTlvWq6Z+S1E+wntVfVkgWNpd9vzONI98hlT0GTGT9nKqm82Qi2hzTcb0Zjds2DfK32P1uVbEVNUvkN89w+1ULXx9FkAXj1rz6hucCA40A0OBODVjXaIWgQHggM94wDCBMIvQBFyHAIHoAnACkACPkUAvzBBkPFg9vjxa5bOJrADkEKDeOTqRlQpK/IMnNHPmDaXaSwJ7JrRpBhBB2GcvDyXXQlNiwuTRXx0sTpsIFqj8Dt+SVsl3uC7yp34uwkobTSv3Rk50pbWkGI2wCT5DuQT50BgITyF1yfSiNuVI/tj8RRNsTPxmeBZAcx0QX9IQr8diexOgBeLixKEJSRa/1WF6S9Pjmaz7Td/62DfG1b1slMOS1HEXxvgVbC2OLFn1q+8GnmTFHWqnSgDAEARrEG54p3ioCMnZiosk8Z3vj37hz0GvBKdm3uH2Q//1Ieyf/tzHxFQoN1IE5MmaNtUVu2Y+n9RYLpb3EgR13+0l7J8TNnK5Vl518+WPvXz2fT2a83oDl8nsB4QiG+Bf48A9/FxtZBr/Z6cHmfb0hRiQw6Cv5fD+dBdgn3RgW/hgnxWouU1K/N1ehdabIB6R4f9213Xuqp+1jQ2s3DGwhTfrCN9d54+fhKAV3c7ZNQsOBAc6DAHAvDqcONE1YIDwYHucuBaAa8kJGria//M+s7BNTiysIiPLnxT5c7oNelHZGGyj48udh88FsCFby58dAF0sfKPcJNW/ynnvgQTIiA2P/EDnCVqWmZ9cvIvR+1z0pBDQLTdv8RMeHasxKdTswKIZBqkFXcc2b/yysvZ7tamadWhIQGSaSKjgaBAJGR27ua6X37Rkd9hgNdrZ6vZ7pd/k9OS1zUno6XmJY0tN2tRk4JdZPZ+Wium/cIYbz+1+4MxRZPU0hUXyuA9QjGpTI5qf6tLruEFoEzcC+/6y9k//Dv91fAq6M5PXn66k/1TObZ/72/8gYGfFn0XQC9/2Qtyy35RnhU3KycLn3tfNvvsc5WYrp8G4BWAV9f7aNQvOBAcCA7cDgcC8LodvsdTgwPBgZ5z4DoBrySjoQ2GzIk2l4ExMkuZ1a6LrNanNLARUIL6kPZI5ne7ctprzumVnzIshTIUAj2Z7lHwXS0Twa4ZUIAw4gsmjW7uOC9tL5mFCvQCUEQkBvA6kcHivLQIALzQ8Hry2mvZ5sbTwpxxCsbrz8qUahf5TFuMMxrHYjh2IwwDvL4083y2/4a3FbW1qrdWOb8zPEGRq+BzETPeyfiAVztw0RY7qrq155HZXjC9MYV2lyLRnBHwReQL7/xLdwrwSq3y4uefZD/47t/M3v/hTyTMNu/DpCg5ODZ/iyx+UlymB6YyB28UKSY+KSpXnFgR5VV+VkYMPGL+5Q9lc6++OBDf3YgAvALw6m7vjJoFB4IDwYHb5EAAXrfJ/Xh2cCA40FsOXCfgZYiDCYAIMQJjpMm1IF8saBmx4yA+uIhHGMfPFxpdhwK6+EtaXQjwlsYEd8AYWJ2kyhGSXm9bZHjFa2BGwQNxw5liR9JgHgPYhT80nP9jwiiDEgFe4B8AYzP2EHjMTmCH2jnrJNfwErKYlwMukptHKvWpTCK7FqClzaTxlcU3Z4ev+7PjAV5jkJX4exH66202ogTr34P323r4qCoXz7OM+uGosi2eowFdHB30+r53SsPrb79t8MF3JOaDH38l+8f/5teyP/zEy+NRVDBXY01bDov0O633LU9+Z3iCtpLrcUXDFyd2Xy03JF09Ol3NvfaxbP6LH0mXPTgG4BWAVw+6aVQxOBAcCA7cAgcC8LoFpscjgwPBgf5z4DoBL4ACnPECuAC8AHKZry5MFyV8u18w/C5pl0V2WhTghTN6tmE/xU+X0rgfFxfyAMVIi/ndDJpLIGX3KIgdChWBt3LKHQBEeM4/AxgFeuHkeU5aXdM6n9E5YBfacicGNrpzaPx47Wv3LGsP+caBzwTaDg0xwonap2uBPtQGeH1x5c9kxw++uuDUUNwhBwrPo+taAa+iDYuTWnXaYofSo8QFIGIZLcLeI3hVBbt4t8xpPRpedxjwSsz86Q9+Ivtn/8/7sy+8/DRFnX/MGT0E+ipxd5U0NM35Txk7Rb1tx8s2s/HpbPEzvzle4k6kCsArAK9OdMSoRHAgOBAc6BwHAvDqXJNEhYIDwYE+cOA6AS8c35uWkZyp418qbSmPA9u0qxami3vSMEKryzW+XBBPTsjhoeESEj6pq5lHKs6AsALS6AOnL1/HKuBlAnYV+QDbIIGY5SakDnrRBoBc09rFcH5hMVtYWixAL4AchGiwkT1perEDJqAjftMMcMz5DIxyJoCsa2EY4PWFB38hO1l5g9FFnatsqtFwzYBXtb1qz61ewHwLxUmKKI7NO0PpUcI6KGIR3i8EXlr/qJgzGuD13d9wLwAvmMkGDv/6lz+a/S/v+a3s2cZOwd+xTozpQ2CtWoP4RS1qrAcMJirbPT8rI2qJ26LT82d2/yRb/MQv1dJ3+yIArwC8ut1Do3bBgeBAcOC2OBCA121xPp4bHAgO9JoDkwJer2mXRhAEQJVCuG5yIJfAlmS6iAkjuwnOCHAxEIu8BlydaIctaRUJXAFgQeOI3SEBCdyhtgrVNc8xh+q6nJ4CuMHMbtriL6N506xyH64TgILYbZpcEuCdB4i3U7bLl8XbfTWTeOfpdK7MM/KbtqRdN1e1cxa+1AAYAbkAQgAhTwR2HRwcGPgI8KUobw/aJEnQHWLUMMDr88+9IztdeHCrgJe3FcxqgyMqTCxuFyeVm+Vp9e6wpjBAK2WhApZJb2mL/y43JZ7J/rt3CvD6rq9Pue7Fce/gOPvffvYj2f/1Mx8U2N6yA17B4OKkzpccKB1y19OOvFkvbuhVtdEricro/KyMqKTSqeowdfAsW3rxvfX4Tl+dB3gtqPaMV3d0l8Y17dKoBQq6T+zS2OmOGpULDgQHggM3zoH/HwAA//9B77m8AABAAElEQVTsvfmzJclV5+lv33OtqqxNqlJtkgrUaEMbDZJgWg1YNzv8NDY2Nj8h8QcMDWMGZo310IzZdE/PmM2MtU332HTTWIOAYRCoEQIklQCVSlJRKpU2pFJVZqqqcs98+/7m+znHPW7EvRFx73svXy4v3d+7Eb778eMeHse/ftxj6PSZV3a2tjbDhz70EyGbzIHMgcyBzIHBOLCzsxOGhofC0NBQCDtKw217OwyPDIeZmbkwNTkVRmTf2toOW9ub4cL58ylaGBkd9UKUx7bSbJFuaDhMTIyHCaWbniLtiIUlaja3t8L62lpYW18PG7pTpF9SjHw/EA6offmzf7XR6NhomBifUDtNhrGxsbC5uWnFqinDxsZ6WFlZ0X3N2p2AoZ3tQF+x9sKtv+HhYes7CuD/hhv67KToP3bsmPqY+rGqt7a+Fs6e+mDYGZ2iqmYaSRuQaOq9WwMtbgpL8qjei+DCUg0vuYjRRok9wyk+BJBAd6OFu55zXfTv7TY0PBp+8afeGX75n749pbqj7pcWVsNvfvRz4fc++Zz6/3Zz3Y3pDZyP3p0nozmb/YbY80smtOugZnMlTL/w0a7YOzZWe/egf/jPMsazz/Nc6WddOdND9/C4FLnQV7eVwTAW/bb13iHPUY1RszOzerdMWn/mXbO0uBhW11bNTZk7GgNuV8OzOT4+HmZmZ8Oonkt4vLG5HhYWFsLG+sZtVy2aj4aZm52THDFj/W1E486G5mlXLl2We4tmzSZzIHMgcyBzYBccGMqA1y64laNmDmQOZA5EDtQDXppwjAxpgjEnQKEX8GJihEA7LDALA0BGPrjHJLSPa3IyKvsIdwnvgGfMgjY2NzRBWTPAC/vOVpZ4YzMc+M0mqcwKMWq80ZFRbyu11yi/UYDJHQO+AC+ZaK4L+FrThHJzgwnXNq2upMMCupjNWJNyNTt94kYb6lQAXqobFBjgdd+Hwg6TxkhQorCHvsSPnoCqx60CeFWp6nVVgAgeUBigu/lzB9gug156Rn/xJ+9cwCtx8Dvn58Nv/M5fhz//3DccrIn9oqffFB6FJWVRvXcFDwqGpf7qmVVd5lfj1Sk4BXYVrkWKma/8TidatAEqWYqif6QneMjGc8aARkPfajAe0hzekKzwJutawGtUgJfAoFbAi3brqn6R8a1sUZ15RjPgdSs3UqYtcyBzIHPg5nMgA143vw0yBZkDmQO3IQd2C3hdvHDBamnAh0AxVtWZZ6AFNjHhGkOjUfMLf9MC0tRqY2sjrK2sGoCytaXVXRnCs7kxHGAKasBNZDrgJBp6o5pIDgv8mp6eUgy1ZySH+6Y0C9ZMG0/aXtKcYoV+eHgEJSEztD2aFoJRHFSJaW/UrRHweuDHVA+ocpPq1EPXgB3wcAFeajxADrS8MuBV6RKf/sqZ8F//xu9X/NID0QhaFZ2rsFTTl139oqQOW07Tao8JmtJZeTth6u/+n/pclM6S0h8sRswo3uoTxXGkKRD/fvVsSZsBr6zh1dI9clDmQOZA5sAdzYEMeN3RzZ8rnzmQObBXDvQHvCZtWyJbGrd3toIBXjZBYtKsLScCPNDmSmDX2Ni4bUchX8LYwmjAiQCTdW1j3BbYxWQb8IQ8s7lBHADcMYCHqTtwEOCVfmo7wMtxbW807TyBloBaAFkAk9aG2lqztDTvhKbJbJxM41my3qDKeDFNgNeZB37cIqR5eyK5h7g7CfBCuysCXRnw6ukJhcdPCvB69oUzhbuni8TOVAuA9XS0Ho8i391bBgOj6vKdfq4e8PIc01PSlbLBuytWr1NV3gtAnDLKgFcGvFJfyPfMgcyBzIHMgSoHMuBV5Ud2ZQ5kDmQODMSBfoAXZzwBaAGAAH5cuigNLybO+gGYkJ5tZWw1GTPNLmZKPtFjS5yd17W2rq1y2sKoEM74Sqo3t/OZKwMx9xaKxBlcQ2orbT51qrhZW6g9ZND04pwc2putqCPxHBnAsO3tjbC8tGBtyPZGgDDa3c/w8j5wM9oyA17WdMUFfhQGO874rOrBs2cWsNn8dM8aXgW3Cssv/OYfhc8991Lh7lj8udkVANZJ3GuLj2ERUGq6wq/B0okabR0PT9GV9/SX6wEvi6wKWfQijcBw6zvdmXaIsS3sHWfF5qma01Yi1zgoOm9pzGd41XSN7JU5kDmQOXDHcyADXnd8F8gMyBzIHNgLBwYBvNDGYqJnGl4XLzJfNg0hDj5n+yLaXWh2Yfh4yNYmgMh2WF3VFka0ugSUMaviLC8OI2ZCA2hi4NdeiM5pds0BAC+1ok1ufW6rRtxhC6M1pm1vxB8Qa3x8MkzqgwNjYxMglGp42hTwUmd6ra+aph6TXibGaPnRN24lwOts3tJooFYZ8PKzu2ivDHg1PTyf++ar4Rd+/fe6gv1psQenKwQn42etqfHueHVstWnlqZaqD2rwro8sX9E395X/1BUs4Ns+QhG9jRyNDYqL1YtoLoixvakG0F0BXrtK7ufMgFfW8OrXR3J45kDmQObAncqBDHjdqS2f6505kDmwLw7sDfBy7a4JHXY+rS8wsT3OgA8OPddZXWxd3JAmULGFkVlMNMwP3dnxS2H5fnAcSICXTaStAfy8LgAvm7ymNpJGF1/WHJfGHtsc0foa0Vlt2oBqbWpneulcLzT2tu2jA50p8sFRX58zE+t8aH2HNxWggfbkEdM9AZNm7wK8PqyvNP73/+TO/Epj4tzpCwvhN/7z34Y/06H1VSRHfdsejuKmJD0eKZvKvREIq8Tam6PSzv2yEFh9/5mPV2JBG1vLrSYGcgF2qWZc5MsXW22RopKq4yjSdrwKG3nsB/ym22YNr6zhVXSobMkcyBzIHMgcKDiQAa+CFdmSOZA5kDkwOAeYoNjcmO1tTIHkMO0daWPxlcYpbXFD68e1sjbD/Py8TaD5yh9fleIrjqTjC39bmlytx4PON0yzS+d1xQk36dNWGPJD2+t2+Epj3eRym0+qmwFMSFaDklxLgnljxBscdTC2WkSbU8YkN/amdra2hk6IS4BXpALCqIxVCEBToJfad1zae/bVzVH1AU2S+Zz8htp4VV9vNEATTS9lYXwirfKhrbmzHTIBoQdRV4qDvmNHj3n5KoRttGfu+UDYGZ0yuiiX5qg10DmAcSBggIilKMZGc8OdFlMEF5aWyO1Blb4KAWSpe2ob2iJreHV4eHlhNfzWHz4Tfu8vviygvnSeYFu3iH2mN0r06Q3oFHhQtk5n8xJK/Xp4ay28efGZSsn0ZwCt1K9dr4tH1om3Lcto5TYYvrTbZNDuBQxvMptxO3RTOGAZGmSpL7sm2o62y7O4Mm0gPGkZh5aXlmwcwu3pmplPfv2esFR/8tutSfTuNl0qk2eT8XZ2ds6+oEt+fMl4YWFB4+16Y7YpfVOENrr6pW0LN35297suInjP82XN6elpXgf2LmAh7OqVKwaqEr2HPhqpuRmthDa6LEK+ZA5kDmQOHFIOZMDrkDZsrlbmQObAwXKAyQWTYrYamlAqgRPwCkDKhNWpGYEfQ7YFcUNgAhMWpg4ccM52RsAf3FvKh/O62MYIIGL+AB59hOKDrd3ecqf+GBfqucdtYOINwvaWNCC8Wqo5ArouqZ6EM/mqhHtudr1VhXUmXEw0bCIsy4gAr7Rlle2qaFLRzvQFAK211ZWwQlurT8AvY4PC6EOWhybMCdh0TTCr/nW9wGP64NyRowFtQ3i7qS21p4+/J2xPHDWaKLBx/gSxA5i9tJm3P5nDmRZTBBeWlsjtQakPWiwIsCzVamDZcgN2WTsbECm7NPl+8SffGX75n95ZGl6r65vhf/vTvwv/18e+FFa0TbdiarqEAUI1/pYu+ifQqJJXnaPIp7DUxXK/TidqjqMQnsuyKdMyurEY3rTy5XLwgdq3BRyi5dtkfCGkHkzjceT5ZWHEDe8dufUH4DUxqQ9qjI7Ycw74vry8ItBd4JvSAYA5iNdUsiK1PO+Umcb9uhwGbIq6pEZfU2vTcgmIHtc4OzsH4OUfEoEX165d03t1tT5f8622fTlifPzLXruyt/GDjNp4wlgzpnMhAbumtD3exh8lWF1dCwvzqlME8cjDxy0sbvd3aOoDuyI5R84cyBzIHDjUHMiA16Fu3ly5zIHMgYPiQD/Aa2ZaWxYllSL8MpFhooHwijDL1jcmGXY4vQRYhFifsDC5OCiKDz5fn295BcogQppAIKRjLAYXl9XjfCpVXNPQIoFFt8t+tvt0crn+tmFtWwT79EljAqsEeglQ8q9w6jB7TTY5dw2eUEsmr8sry4FtjkxSAE0NUFGY5aULE0m0xQ7CwN8RaRoeOXrENT9EA/3vzJG3hq3pUwUMkFqkh4aWCXA57q0CeNGdGuuisHJfjZ3PntUO4EVHBfTyNjTA66e+/44BvABq/8Onvhb+9e8/Ha7OL5ebuMLYMmBkkRqY3rdfNKUrSu6OYANG0W+LaN0Wj9btW+seW70Unlj7em3YQXnulS9OD9stNRAxlqiepm2mXs/7Zmxi3MYXHlvGqdUVAK916/fEYzGmyTAOtWlK8TEO8mwybV8URgvN3otNifv4s4jAM2mAlzS8RrTYxLO8oYWVhYX5Vrr7ZF3p1z1x+/SjfoBXczv7wgjvjhkdecBiiRrU6rQm8A4tcbbN2mAmGmhnhXKxeAQ0591Ti+yROZA5kDlwx3AgA153TFPnimYOZA5cTw70B7xmbZIBmoPQj3CPgDo8pFVoCepsX1nRxAPNLjSfMGnibdO57jnd9ST+gPIq6I+ACOANk2D+EMyZoLjpVK5TV4R1F+JNjEeOh2Euzd+ygnwZ8LI2FsVoaA1p8jUikITJCyv1aHsxOQPc4sudaB8sLS+HzQ1pYljfUFjkj09CNwWYjUV+Xd8bbAV0nTtyRBpeE2od/2jC2ek3hc0jD0WOt8z5Yvv2o2ovky9rcss49ZWGUorgwlIbsRza6XXVqKnferExhQgpAC+Iok2ZYBvwJQ2vn74zAK8/+eJ3wm/qnK7vnrtSZVrJ1dMdIqN7+N0T0TOp9+5JXSpxt9ZyL+ik7fQ19fWu4qZWXgmPrL/YiXzANntWuokol0l/LLvLdoWlccVAILkNaFJ+Y/ELsmgeYyhidW1FYJC0bdWfd+zd1FX5Ut4AXoxHTcY0yVoAL95vNsDUZIB2WWPeImlDC0VtCx2khytsaZzRFkA+EoPZ0Ji6qK/jsg2wyVDv5lqnt0596rZ09SmqvuV+Vw1x14jG/RltQ/VjD9zPAC+BeICa1g+KzlDqF4VfXa6pj++X+vq8s2/mQOZA5sCtzIEMeN3KrZNpyxzIHLhlOdAP8JqdmQWxMSmTSQYTGvvTnW2LrLCj4cMX/BzwYDLt295cbu0jvd6ynOkQVgESzDtqAhQSP3XuxE+2NPkz0Ry+yVIGv1K8W+FumlmiL2l4QTNVMmBEFiaakxNT/vVGaVtYoFfINC062xtdO8y6jLQCmQgelIYXNDA5PKItjZzlxcxva2crvDr++rB2/E0+oVIdqEutgf4BzM0GvLq7ViPVilhMGy2ReXifM5BL7gh4yWJg5ofR8PqJdwzAhdszyhdfPBd+7T98NnxV990bf2aLdJHxPfwvPApLkaTN0tT96saS+nyskWuCOnTMLb0UXrdxtibOAXmpUk31okQbZ/oUDTjFOEnc9GEMAC+ecddO9Aw4SwzNLAO8NNa0lqskPMdNHFOBrVSlxZy6SOTLIkGT8S3+DeFKu6ZtmdSXxQQ0olhowKA5Pa8tjbxfmwzja1O9jS6dq9lk0OBqSksaPlbSaNTF7KzGhgi8L9KWxgl9AIVRmDoCHM4b4AX4WM6/02dtFCsHdZWxl/G4K4vszBzIHMgcuC05kAGv27LZMtGZA5kDN5sDAwFeJSIRNlmRZqKxrhVoNHw25WalGYNQixANcGKTlj4TiVLWt5BVFYBuKqJ7kr0RydnMx18KS0RbHKs7sUqmNKPw9HagUinCrWFNzUT72i+SRb2sHQFK5JjU5GVyatq2ORIFDSsmXZzNwkH2G5q8MZGy/IpMY2YHcEMz7SiAlzS8KBQQ9rWhu8PKPW+rtFtt0aW2qQ2PnnuZYKWq02NaTRFcWCrR63y7elgnviIXvdUSmofxxdsQN0CC+mC8f/in33UoAa9vvnol/IvffTo89ex3In8aucZcvGK6nEVYT3eJHj3xezyKLBosJLAGawgveQ8YLaU4Mf+NcO/W+eS8IfdO368prg9vCEYbyrf5+VZ6chkf15ZGAULGKfEA1jPe+HmKvHMspKZA94JtbXT1tG1XTm1jgOfd3DBtwBAVKo4JGPMtgP4O3THAa3Fh0Q6v7yKncAKm2fuo8OlYeAe3aYexxbNRM03ZtIXZO6JFIw7NYAO89K6YEFBJ62AAvBYWrrlDnu7vlhSHwLb2iHig55GvmQOZA5kDdxAHMuB1BzV2rmrmQObA9eNAP8CLM7wwSeBHEN3YlFaXAA4ODLazOJhmR3nfBVVEV3ngV5Ziyei6GWXcPMfYVyloGJgBFJCFCUiqIPYRfbEQidxXyPnaWTzwWCSVq5uqb2TahWz2AXhZ5jGjfdWwLnGivNOWxMLX6UfbYsvO8ULTa0Ln6Yxom+PI8KixBtBzvQC9Oh838O2NB0WzaJMWyFG2NKJFoLYB8Dq/PRuW7ntf0T1SzXpq3TarKkVOfb/k1ddKl3FTWJJH9V4EF5ZKeJ1vY32U0vpqysH6LQ5ALuUkd+cOgDkUPvzT7w6//JOHR8PrtavL4bf+32fCx576hvpCg1ZN4k9D+xt/46WJ1z1JSxGbAIhU7P7u1R5RdfXmfGr+uXBiKwIMvcE33Icti8WDWVN62sJo26bR8BL4hQHwSqA2bp5JtjRubvAlYBZYHKgnrM7Ap8qz0RXJ+EhGezBWpZa0qQ5NWXtSNLxGdcg771sAPLaLr+vDICtW16a0CmwJ8ndUUwS+Atl29tiqym4ytBPbQJsM56mhfTstjTW2apoRqdRn/pq2NEoT1/1oN2zp7t4t7PQI+Zo5kDmQOXAHciADXndgo+cqZw5kDuyfA4MAXgikxEMu5b4mQXxVh5WznZHVawRbJhPYAYvYkmEH2pvbpNn9E1rJQXna3GTveVemNl2OEydP2Or0qLbujcetNNwBeEbHRkyAZzIN2McPLQMEfPyuXb2qr4ctmxac+UsLjoPUCWeSNqZzTfZM9Q6EVoitcGU/DusHypt2BBRhwmF0chHdnNdFm2II44DlKa3e87VO2p9o1JMV/BXVn75hW5OUF6DYQZkEeI2P6yuSNkHeDpc2RsP8gx8sONXIb9VrEHP7Al7UTo1Fm9JtrF1l4XmVXZfwETS89KXG290srm6Ef6MvL/72nz+v8YmJeLlty3avKexobP5SgKWMyYtckmXILaXonnkKd1dxbfAuwssW6Ks1jQG1scODV78Q5ra7Duivj3pdfI28XdJYLhhe8rwBjLEtLj17jDe2bdk6sgM5gCe2pVF+jL22FdDCyzlGu/JsO0erJkXFK51LWPEsOXr6QCmsiaQUhbTE8XMSpxmFVW+9Z7WghOZsG1C3H7rgbeJvoqV8LxZ+yp7RDr/btnHyxWYWdwC8TMPLGCSQcmU1XNU2Tcub8vkr7spcvLB3ahuYJqDOsquhyzLYR/+rDBu1+WfPzIHMgcyBm8eBDHjdPN7nkjMHMgducw4YmCUJ0g4pRwNJAuOEgAz/RDoaPL5lZF2C5poADUANwBwALgNIbFItJhRSKBNspE6E2YNgDvmmLZMUK0AmFjSictEO2Nzk7CimDj55MF2POLHAf3yCA3Vnw6y+isW5KXNzs+Ho0WN2P3nyLk0+2EIDuDVhABf3UX2lkGr5uSlRUFe5CP9JaF9YWAjLS0sCfDYM+Lp69Uq4fPlyuHrFgbD5+UVN0gDKNgxEgkvGX2OfnzEzDLAEz7WKXhwgj5/o3zHQC56qfNLqj219urZuQSFFu0kNpbwgqsGkCRKTM1buR0fHdSjxRAGGwYsVTWqWdNgyZ9DwcQMRZxNYABcjWjyz5pKTomLTNZTY4k16ETutw/SnpBkBIMekdl5nPF988L+yvEmdatabUwxpjmBJUp1707f4xLp5DVvipaAGpsOfbtOHXOOJpbHEkRDlb88kzwR22gLA62fQ8Lp9Aa+Nze3w7/7qq+H//JMvhYVFnXVU6UxlTnXsiaeVqJHJPX7Rw1LHLIqcCkt3C9HnWgJ7ow/gk6j2qFVXc/KHL/9tmAzrzREOIKSNtkG4wqNgfVWR4eOIvvJq4w1neAkE29LYDijC+GLvoajd5Y9Q7N/W31W5dCevqC3WVOU2uhnXzHghTl/MyMZ+5W1Buth7x8p1WuyDHjGulVHkET3jbUKgvYF61Fr5oUG9poWDNtNGM+kG4Xdb/n3Deh4YTwFPRqWxxhZ4P8PRKTEQb3nV2jXl7Vl0KLWFM73fmwxgWkOxel9K05hwS8x7xn/RqXe1Lzyl0opw82AbqV4eKbCLAJrNNbS7AqLTAMAmwhQnnc1Wn1rFNpTbFH9wf56ivRn6lz2Le0vep07tdJk26B7L7Zeslde0c0sGsau0xMhBmQMHx4EMeB0cb3POmQOZA4eYAybwSRyyF7wJ6zp7Q0DGtD4lPi5h1bR3JB1wbhfbGP2cJs7+cIG0nxB3MKxD5EBYcrp9+wtbBf08FLSRmCBZDJvkSPgWgDU9PW1bRo4eOxLuvvtkuOfUqXD3XXcL5JoTeCOAS/XmcGTSAiBxaC8Crk9gXIstmFZHs/jI16fgKYbPygMQLi4thqXFRQGF6+G1186HS5euhNdefUX3S/aFSyZTKkn0UivxVRZrF/njZ0KnQDyzxTADLeLEybbzKOYwYOUBGCsGgES89ImfuKNtnZzRMiqQiRV8AMERAYJM1OgjfLmTCRv8YAKD8GpnR0Gf3F4vaiY7jr0YJYcPfKFxZnZGtLgm2crGdnjlgQ8Z38i2OfsY0hwhUrUHGqmaDO06kIlt2R23LnU/cisTFPK1TOA/BOmOX9Ty+vBPvyf8s5+6/QAv+szvf/7b4X/+wy+EC5cWVDF5GGOcOx2+ububr4W7FFzuhx27InQc5SI6/aqUR5FvjWWQaB26azLYg9djl58Ko4wpt4lxrVCNtaI38Qsge0xjMuMzYwhb6Uy7Fq1aNGepW6mNKlVNzxVjl+I2GcYtH5XqYyTtVgtNz5AcKfvOM9ehnGffcoW2VBkFd5OatnkCDlFHDHwA7GIM7Y5vEW6DC4tmLIp0eKOD+FUnPjawH9OmeeaM9vE6yTYw0O2E6k9tbTaaJQJricd8RbLJALRuCGRtMq7xXv+skX8b3dY9EhE1BRjQ1jQ4kHfRwWoSU/8a7+TVD1hK8kyKX75b26aHoByAHbpagEuP3lQpni2FNQSbd1O5FI3s1MJPW1R0AnqvffnZmyT7ZA7cKA5kwOtGcTqXkzmQOXCoOMCKJyYJ9ABDfEp8YnLK/BEsOOsDYY4fEw0mDgAfCBQH9gU+K73pIqDLsB1JJhBYSHNYkoQEbaOFptopgVuvf+ih8OCDD4YTJ44LIJFWkDSDDBiTAGyfhpcABR8AjlxARvIB5JHAKMEN+QkZC2CnVGiFyKT9hVYCWjQIbZZXymd7OCwuLJnW17nz58Krr74qEOzVcOniRX29asG2fFCGCaGAEjF3arazFWlRhRGAnVZt55HbPxqQYldI2rcDeqgLEwXARBgB0InQCA1MRicEkDJhg0ec8cbkgMkaX29ECwMDL5KA7JRyhbcWvPsLdClPJlVo6QHAySdsbG2E0/f9aIV3zZmr8L7le4Rd0wl9BRXNFFgITK4xdb79yDUep7wsAyOkw3vT7hJlasMP/8ztB3g99fVXwz//3c+F75y9bH3ReZS4onuyWkAE8xM/uu+l6BYU06a2TncP80C7pnhFfj0eRcj1s3hNi/y6nIV/soikN176K2/35HeL3xkreKfY4xCfCR9jWJAYsz7rgJe0vAR8ucaOV6oKZDg475Nexpg+gJfCPW49g1gISYZnOj1j3H0s5J2RYtAtvd/hlcZplWD+hBE3xSGcYaIMePF+3dDRAWsb/hGQTs63j+2gAC8WoIxhtaxIjeA8ZjDwdkn+JPIHRyE0AlFkYnjDOEwM4vqCj7l6LmgcNp3XRt9cWl7sSZM8kKk49qDJ8PEBo7cuAlXgvbxn0z6QtLGkX5FtzxQyjMtx9bk4VhbbpSZKW9725m2pVlva5hKdCM+2JfMaWrNX5sD14kAGvK4XJ3M+mQOZA3cUBxKQM6KtIiPSkJmcmgwz07O2HcGFMLSU/PBczktJgiECA8LfzQO8EGTTtkbRrsk7mkQIhmwtOHH8RDh1773hkUceCQ899HC4555TBuQxcUFza2TUJy0IokycuDNxYRsG9m7hkkmOmxRWLxaZEKeo8Ef/Bb9cyKbMUYFZ+qkstjWyBfL8+fPh3Llz4bvfPRteeumlcOXKZdMIIw/aBAPQCIBHPkafwhKg5iu0Q/vc0mjF1F4QeMuAF3TBDergwNuwA14CSdH4wtAGHLrMijlbHG27R5xUGBhYSLqJT5Zsd5dIF5pdfFwBTTMM4OXLd/+wZpo+Sa1vqVJR3lAljzqr5zJQ1FLyNDEuedVbG2YV8Lnb9KtPpUzLAEaRi/qfgV2yUZ7a7yMAXj/9/d1F3JLu589cDv/jHzwTnvnqd23yaVUqGiRxxe8WFmuBno2ZsmeqoYJSSixle9ndKcZjVOIpr8JdyjdZm+/lVHXElVLWBtd6FomGdzbCE5c/W7hvBwsaofRRBzWcYp5vFiZcw0uANl8HFrjA+wi7Lb4I9jewwRqqA3bhTOMVfT4eu9bLinZWFkCGP6aM4/xiNrL4WJj8tRhg4e5mYaDzTJbbHNoAxFwzl4+BAN7zhqEuG9KEyoBXb1P19UmNLOYW3I4Wb7PUcJ2c6CMY2rHJmKy0R2DJco9l1OVPe/s7si5Uh/1LY5ry6wza9nwtu8nY+aItYBpnstaMYE3ZVfw7/bri3XEUD0nHK9msFVrCO42XUtTdixYuBfa2bynQrG3AZVMfSXn0C0/x8j1z4CA4kAGvg+BqzjNzIHPg0HOAlzdy2JBAoCkBFnwliq9FmZE/BwPbuV0Svll9d0EfoRCgQsBHAVzcSFZRtr7OFWVTo1/14BD1Y8eOSYPrZHjn93+/zuQ6Gk6eOGFbFm2FXpWF5s0tHai+s2mTKFtdF+m+9c4FypSf1zVNYnSXMLwjMMU/114naMEDhK3OhAsf/BI4xFm8SWambNs+qYogzM7Pz4czZ86Es2fPhBe//e1wRvdrV68531X2qACcYU3+mEwhHKNFlTTT0Eo7qLYwAS92FJtcikHU3sRK+XO2GQfTM1mbmp4yTSt4hGYgK88LC4u+DYnKyzCBte2N5NPERovZ5yICaCP4wXlsk+q/kAlPzs48GbbmXmcZ9C1iYCJ2T2/fCUGqIoTXmHrf/tOTSrmWiS6UYTddBCoQ5yM/897wz37m1ga8zlxaDP/yj74UPvHMtw3shU1DRZupda2BvZXL4JZq2WvSZJgQS1KKVcqqlGXRR4sii7SpHTRuePHp1lvuvnxKNJbyqfftRJhePxdet/DVjsdtYGN8TmdgQS48BxBKYwYappvS4ORcLBY3GGfQ8gIwSKBFuZqpzej6oy1gRjlNnX1ToAIGnhvflWG60/gsQvA8+SIE2+DRXvFnjJgWRrjFYayugnrkzfsXUI968OMsKrY11tWL+Le6OSgNL3jdaNQoZbC0eDCtDehPvWO4mqJkKo6Sf7K2lJ2i1N5727scDdAK2aLZNNNFndq+mIms0NaHOG6hyUAXi231hnPm+HBRPRAnsvwBrk/sY2ULOw1gbEgLN1oXW5vZ1ZBjyVs0tfGrFDNbMwduOAcy4HXDWZ4LzBzIHDgMHEhCOcDLjM64mhRoxMseIQehfHFh3s6isq2MEak5qLOiBucnUhJnQ2miI1r5gtfJkyfDI48+Et785u8JDzzwQDh+/LgBMUw8ELyoE/UxjakhJkgcTivhV38+WYpCoeKOSguMuGXTEYAom99gxic2bP9j1X9EkxjXRKBMtNIM+FFWvrXUgTE+CnDhwvnwrW/9ffjGN74Zzp45Ha4K+EKbAe0wACY7g0JkAEC5wEl+EagcjLQ9xuqdMFA3DNpdAKYATwirAE/wf2mRQ/zTAcw6T02Alxhsk0Ti7RmoUxOldgLw4ow2Wo1yz4+eCit3vdXo6ttadJABTacfDJYg0dc3dld/K8ev9sROSCvV8Ma4EeOTv2Uk35KW14d/9n3hV25RwOuyDqH/Vx9/Lnz0018XuMvzGSdWPMtWLb+nNnEWpjBF8Ejp1mFc8fymXBSUmKm7WUt3EqYuku6WWUwTb+aVIlb8PCRem0IisZW47mgMaekzpLxr8Rvh5Kq04W4jQ1saYCE2pXGZZ4ht5Ey+12zbmIMDhNNa1s+NF3L7f2+NabhK45WiKEg5KliWBsNYjUnPs91L/MftyWMedivlp3DGQn5ouHJn7Cddyqa8pZGFAjtGQPVtIauB2lvD+6AAr/baqR2jnOIPfuJvfNYBR8VQ7zNxjCweMOIWjppiet99NZHqvZStlVkfan2+rWy0GUu9qZIL+aZ3cCUgOuw5aexEkhsk+zUZAOV0JEFdHPuAUeJ3VwRxK2wIEGsyaIDTx5tNU415zCW3RRC6Lr3xsqUtWzW8aKmWtJTNfzaZAzeDAxnwuhlcz2VmDmQO3PYcYPKL9hPbKdjOiGCPCjwCFsLOwiIHQrugz4QgbaezSYmEgtbV1oPijrQ0+IIiK/9HjhwJDz/yhvCWt/yD8Ogjj9q2RZ80+WQCOc+1AHyrDKAME+dtaXgh0/gkxM/bSnXziY/qGoWa6kRIwnKbTIwopnQucLmQmwQk/IeHxiwcIdQmPxEsYjKX+Ay98Jf4Fy9eCl/96lfC1772tfDKd18z8MgO/VUg2gDUB+HNAcqo8nbd+Z7qFOslgbBjrLI2maQvAT5yNtqY7gBZ8BqhdlWaggjH0JoEbLbMelv5NshOngPamETQGOLFtM7wAvSCMrRAru1Mhiv3/ZBlhJ+obDYwekBT7Qv9E3lfgYIBTEvHasqhjfKK0G4Z6MJd5Xj/lIbXz743/MrPvmsA4m5clJX1zfB//OXXwr//xJd1pl0Epmkjq6zXWE+HEyT/MtvMPzIr3qzOye53T8u0F5OaP90LP0WzmJ2iKm5PbNdETXTEBO66ftdyRYtcU80Kj8Ly4LUvhJmNa4X7drAwJtA3GScYB3kXUUMm9DzXaLLYOF2qjIFHSkN87yaMVzQewBhbxeQmbaOmCn3Ax7hSthVr0npOzxT3ZGfxgXHYDE0vgim+bGg6SxNBrkQzi0ecm0kavnbL+Imh/oybfPjkdjUHBXjByyZjza529zjeRt5WnoI+RF9I7ZfaMN3bztGyHLratUxHG13E8zKaiG/vf215Q1IB8pUJSnYlbirVo7SFxmcp5dV1T/24y9ucPFNoYjYZl8OaGbq8vOTPcU0GgF1tYBnPDWNJk2nSSmuKX/aH193Pdzk82zMHDpIDGfA6SO7mvDMHMgcOFwdK8g1C2KQOHJ+d1bld0rxh0oCGDIIK5y8tLy87MKNVQJsU6GWPMI6gg1S5H8DLhDjJOxKpjL+IZYVdNCahwuJZDMWTgxXyuaOz4XUP3h+e/J7vDU888YRrdAFmKZ4JliQmoe4IudCMPyAZP8ph8gTwBDsIsxV32X3ixETaGWVh2M2tfBNhRlP1Yloo5KWfacIZCSpN5ThJDlClcpkswcuCtxLWqYRrhDn4uKgtB/y+9MVnw4svviTg67vaJjiveujAeE2QaC+0vzg8voU0alkldmAXtDs/jCdWvw4bOmGwaFjg6YQBUPQnJhCEcwbJ6sqy8dY0ukQKAimTUdpzT8aaxCfHaCfOzM4Zz9H8W5acfU5fasSkWtM3ak070ypJqMtujHUZS5Co6JO6k6AnYlMOTRSl/lsp3vKHcbSVAK+fk4bXLQJ40Rd++2++Ff7XP342XLm2bM+Bd2jV0CoZa6p4zgt3J5b1gF1eTY/rCSJPYz4pl062Fp6a2O4Ks+Cau0eOWeoWs+l4YEuZVX3bXalCPbEqlShCu30THY/yhcbtNg2KIoubavFnyhnMuYYYA7c0abWxWG4tX9iYuKPKMnYy6TQgK3Kdd8cGX4W1bBTOe0yTYsFdRfw2wMsKbbjAX7aSJ8Nz402kEP2zSDSqcTid22Vjtx287+8B0hMxNWt6Lu0uT74yi30CwEvgF+0HT/giIFspyTe1qWV1C1+oa6rXuBbSfOHDOQDZpulb+krjXurVOgaLb2hLQ4PRQaElu6VNz2T0T/HSnSR1hrRtZbeCTsowaXPX5b2fsklr8lhdxvJD9mmjuy1tvzq3pYWctnL7hqd2ImKXIV/GhibDcQptGmArkkWa+h75pnGoLn+OkmgDzFrr3FRoLEg9rOFFUkdJ9rulOKBhTqOOkXSQ7ZgBr1uq1TMxmQOZA7ccBxiHedmmQZm7fgjbUwIL0soygsKGNCxW11fDagS7LNEBVAiAxs5hkYDqB5lLsI+rs2gLueDggAgvEMLQ4rn77rvDu9/zrvD61z8Y7rrr7jA7N2sTIPuSkQShfkJYY1XgEaZNKElxWiN5Nj1XZmt7NMh+TOBOv3w6fOnZL0rj6+vh8qVL8gOI8kw51B7hlh/kIQjz61TnYDTAUvneXmgMxq82StOLSQ90IwgAoC5KY9BWZotETuce2aK6+QSH7UCzc3M6uF5filT9NwRm8qVGTOJ6hw9dpbUI1l0x+wrw3fFxe1UTFXUxSn6JLyWvZG3KobFeSliZSFkGusS7sEnX8Pq596Qibtr9T587E37rD78Qzp675geLW5uoZla50j1S6LzwmsOywp3s8V6w0yMotafxbOSZnLEIijUvLiU/i4/bAjv35O/5xbTJke4pUXK33QuCuyMVFagE1Ps6HW+8+BeVuDfKUVQh8q8oFz4o0MMZzx305p2DhiqLAiktYYwn6R0gp0xMw4IM5xfqGU+aHDapZ2JfFFZjaQ2siT+wl9PFe8d+WohA48uBLzS4/CMlAP0GTuieNKQpAuDf0mnb5qhtd+wccg/QBqCWNJOcH7BRefGOjGN9wTh1CB/3nXj4eBDG+l3sfAmAhKaxcZ3lODbhWmupYNpcf9RzXV+dpM1Sv3X6vJ2tzdWC5bxTFvmeOXCjOEA/5UNGTYZtmk1gGo8bcg6DG3au1q/94vIZi5p1RnEY1zxlXQTlx/PeYNLY0BBs40JTGP5t6SF/ryaN6U3pXUZJI0J3LPjXKdzZ6G74ZGfXdicpu5uyjXFKWZdT7cpO/awOjHOxskZzS+a2AN5QSr/xLwNeDYzL3pkDmQOZA0iQNhBrAE4vD4TxER2CbtsoBHr5uSJaJdfkY0VA16pe2pyb4+N3n7fGHlhMjkxYoAtB2bSuRB8rZ+5HprzQvGxWR48dOxLe+MY3he/7vrfqnK57/YB0gSsI06zKkRatJ36swh02A58QiC5dvhS+/e0XwwvPfyV85+WXdM7aYtGuo8NoCLjgBP9IA1DINGJIZ4gdhGHipULEf5+swP9x9amJiXFNgJj8uHYgq/sry/oIgsBU28IpuWX//QvAa9sOzEdLcUJbc6n3lup8+tj3h+2J43R/Mx2xKXqkm+ge1KTnZ9D4KV4ShJK78R77e114qkd3WD/qK2VbJrpwV1m/9HPa0ngTAa8vvnQh/Prvfj587cULIkg1oS2sQulObeMk2Pyju8SMIW1xTtUiFBbG6uE0h0dXBm5xfwHQpSy9eIUYCTHAuobs5uSe/Mkh2i2zsr957OdSJrKTT72vwrsDRMvY1nx4w5VnOolvERttY4fM26QS0Mo1QJOmcBpLeM7Sz2AsudfXNgwwSf5M/gwIinEr7XED6+v0MBFF0yZOelRRe4/JN2nxAlyxnRswbESaXOmdax22VF/AryHez8TXeM54WurE1u9sTFc78x4vmh/mlgxOZXsghpJsXJHFAC8VhN/Y+Ji01Mb1gVxt07QFHgggxIE9FtLQHi+PSfCvqITRW3JbynzJHLh1OOBjlXXUBqLo74xfPH/Eczt3tPHbwDKOfeDZrjOMd23bOH0srE9LfiwIt5qWKjXR1JpfKdDYUHKXrV3DVjnI7MiwZR5GlsLVQqu2J9EAHqRvpYs8fOjqzU28Mnk3Es+tGNPiwNuWN/XZq8mA1145l9NlDmQOHHoO2JgcB2ZWrzAczM5WxgltP0sCNcARoATb59Z0R+BuHvEtmz1fTCTQC5zDiFml4WVtB7fbi8Oz9Zfsjs6EmpQ210MCur4vvPlNT4a77j4ZxicQqKXJE89q4PVhW0pEM/c2dfc9E32TEzp4pS00mjTRji+ffjk888wz4YWvvBAuX75s2xo5lN/qb3t7NAlBWIhtv7MPDbO2qtskVRGgiZc84CXn0qDpxX3uyJwBkGxvZJsOQt3a6loUWHw7Z1v+7WEAXjoIX2XN6Bwv/1Ij2oHb4bXR+8LKybcUMkuziKGQ5sBK8S7AVrwGchTCUL/YJmDZpSdmva9H60d+pfxUhu4f+fn3hV+9CYDXN1+7Gv7FH34xPPXcyx3e03mKinTsXu8IapW4AtCFoXtbnHg3tyeygBRG5smbdJa6C/QyElLRRIh2E14tgby67uRlJvkn957uZQo7GdT7Krwh4MTSt8Jdyy93MriBNhtuIt9gVmSLMY5Fjs1tbVVEk8HGfMYoB4qsIRWfiQTj9xaaX3bXJNG0unyLY6cqqjz1twLaJy+dNAdlS+WX7laUj8G843yRKWl/SXNLQBZrBSwOYBKfqJKBXsZIOZSW7eGmKWbgF7FlxCfen9GKR8lu1gO9+HPGWJvqLMBL4/CYxny2eFrjKMyMbmjxOeC1YW1u4VRWBtmj05cTJzwsXzMHbiQHUr9uKtO7dHMfLd61iqInw7JJj0Gvo1pKJV41SM8ZX6ht1jwDSDYZuitdcrrMlVzVux9j0gyI2cIEMmWNoY6kbzTwoaViaZirT+8LB5GLNuYVeZFvfaKBfG3oieNPXQJIbiIbmk1LtzNoxfELepVOvGoHCVsKNmKaa5YBr7rWyn6ZA5kDmQPiAICED8KsxroG1TjnLAlI4uBzA0U0sgMerelw8RUBEginBiDZ26jf4Lx7NpMjLy7AEQwTIV5faHJRrp3Pohf80aOu1fXOd74jPPzwwwbSmUAx5ACZ1weAxc/C4sXMChoThsNmmPwxSbKvHMItvRMvaVvj3/3dc+GFF14IL7/8ssAkAUlqY4AmAxLFQ1uRFE9vDOAlolQWdKbfiRMnXeNOjY4QwHleHEgLUEVbJu2OvbSXkls+TCanBOBOanvumCaH8ObK1mi4cv8HCpGkWYSIIc0RCtIKYavwGcxSCMH9ovNgmCksyaO4N4W0kq9ENqlMucA4GQO8fv7GbWl8TWdz/cv/79nwsb/5hp75Mt9l139RNxowGfwtwP0i6dHP05if1dHjlt1k6vnGAqpZW7nmBSAsC3aKTySU7RZukTvhiUy7p7CKZ5vDKauL0RjSGNDJ5XVXnwlTG/Mdjxtkg++MOzwnjM3FT26bsAnw5rmHy8TBZtVRQtx83MI0hjSBYhGEc7dMcyGm8Woohf9bY1tbK8Dyjfz3eDfm6n3NamGdwkiIdVOl/F1EpESzLLzj8OA2rm3Yrv2lsZ3tj+KfjYulOhXaYQpnXLXzJpW4M+lyflJjFXnwJtbP6qE6pDKhjaMKqJOok79rnNC2yBRrOr+LD+L4OxwynSk2NsES96F3uCNfMwduBgdSh64r257dugD3awtuy9ZS94mwn6ciLXbXUc44zTjbZNb13DadWwbJnJ/YZJDJ+wF17fXyUGONX+J4g39FquklwRqjIXd5My41mjgeNYW3JbU0LVkPj7Rn3kZXBryaWiT7Zw5kDtzZHECeZNBncNcfrwdWhdHsQsNrROc+EczLjoM8VwVG8PJjMGfV5iC1vFiN0jTH6bNW8jeEASWi8fix4+Ftb39beNvb3hbuuedurZD7pMgPOWdViRUtwC0Ob6ceQyZUoz3AxOGwGUAs03SQAAGgxyr6llb15ucX7GuOTz31lA61fzFcunjReJEOtDdtClr+oLY0mlDhYCoTHFqRiRDtAth6/MQJlS6tQgFRtBGT2iVtm+VgWPrZngGv2LeTcDAu8HZagBfn0iEILYs3rz7wj61s+oL3Lmx1BkLq/Kt+qayq72Auew4HiQqzCqp7E1hwr3df8ivlxzI+8vPvDb+q30Gb+dWN8K8//lz4T5/8irRIHdwuCI58py8wHiTTXc/CLQtdztzxbl2wZC+7iWj5WoKUu+6pXKzYWwAv4lp07mbpuEs5Rs/iVgmqd3QT5bHqfRXWGFDN/bGLnw7D+hLtjTbwHcDGgC4tPDDRMW0tjVk2NkTmEY9nyTQLALUUDrjFYkthEsMLj6qF4DI7UrtUY90Al4go02Gukof1RZFRVKewRNoUoQxoARgNA2zZ4k/chh4ryzPMuV4s8IxoPB/WvfJc34DqUkQaBwHcDOBU7eC/afeKvvFxAV4GfDKJdmawqIXmOFurSGP5OFfM3rkYgzrObMscuMEcSP27rliet/RM94Sr63b3Xuv9xXjQDtCw0Nto2sJI1EiU59ga3FIsqduC4RUgdpMBKLMjLBoiAII38XtHc4R18jYCIqgvO3MZ2MEHipqII0/eK03G8rCFlPoY/fhV11apHsi/bR+pqC8x+cZ6JmfXPQNeXQzJzsyBzIHMAeOAXrS8oO3cANkRpgG72EbB1jgHtIJtM1sW4LWxrtVX9lnIsCJ7cICX778HwAG84Ze+jMPh4/ffd5++wPhkePLJJ8O9957Syw0QTlvXRDMvIgT97TiZwp/0iBIAd0y2is/EW00Ox2VUgM6mNCQQHmhHGMHXGTXlsFX/06dPh2effTY8/+XnTfPLV9VoS/8dmIaXskceoR3QLsO4UKg2UV+anp5RfxsTEMUkSIe6qg5rAlY5j8K+4tgidFhmTRflZZM9lYt2B32DbY1TOiwffybTL931Ac3C2F7TKBdZmEcwqarjbrAloaYhuNXb6G2NEQNhVINpCulPfZegroxcw+vgAK91nQP4b//qhfC///GXwuJSXAWOhFo91HZNplxP7OaOnrDHWKSLhdnF43TCANNjOgop2+W0knXp3BUBd/qRhsAuN17mF+/cChO3DVucwnN3FqpSa3oCejws2bC+zPjYpc/UZnHQnvZs6Fm0SY7GAiYcaBYwzhdNra2ojOecR8g7Bu0A25oexw7juS7O5w4nk41ae1iqjYf4s1XPkxTzIO5QCmhv/VGdzO66WM80Yr0uHcqiLd7s65ExPpqqvLsYyzjni3c1WwTha5pgka+9lzW2ckC8Ta4olDzkBx9wYgqeu/O6Xck+bdEsg1fY7WwygV7pyUs0IYNw4PfGVtTwUrPZO8Pq5u933EZ6pP+6EZwzyhzYBQfaul8ah5qyc4362PtLzyLPLaYtvY2fTRnLPz3XdVH2+6y3ld3RJK0rWX4thbfVl9yQGZuS23vCdn94EU6jxlPLVGOivVuaS+CIlibDXKH5rF/XSG3kiYpka74ZihdBNsrLjpN2apX1WhuS7Jq17TLg5WzP18yBzIHMgSoHGHj1B/jBfVLbGKcFCLCVkZcG2lQARAvz8/51GVIDeGm89UHXX9LVTK+HSwCFhHsD1UQDgNXG5rrR9sijj4W3vvWt4U1veqMJ/KNjbHP0M1C48xLi/B77oxL2hhFNujPRIty1wK4HnbdOHgA4vEThFXWl/ulcL59wDYfXXnstPP/887bN8ZVXvmv8RdNKMyEJFgfXlnCJpjDCdPVJF51vyCZw0wBRkxwoL0FBfZEDqFfXVmy1fz8aXghilIvgguYigNeMADZ4xGT71fEHwurxJ61cI89sDRevQENg1btREKpG63G1CkHl2NZU9e1V75s4X86kzt6ZDBP6kV/QGV4HoOEFK3/3c38f/qePfi5cvLxYJaSuIeTXUy95JD+7qy+V7+rSZpAd+XGJN1k9w+T2iJ38cBsZulTv3p+gv+gO0V6N10lneacCLJL7lKydKH1s0FtregJ6PIpkx5dfDHcvvVi4b6RlW88hgDbc8S2GPpnx54Vt8xu+UKF3DloBdkaXnlMfA8QxGlKML3ivfCp25Uwrl9vb6icPK2MvTN83g7oLVR1i83Dr0N9VkAXil9LHepGYMP0mx6f8XEKNZ2hP2bIO72cFck0aXox3w9L4Ik7a7giPrA0U73obALcxnQMKMGfvIxUA/3kfAYRZuczZRKvRpvi0MYta6dB64jsw6scQ2LtbcfhM68Dj5PWuWM4vc6APB2zsaYmTnjmT1Yisn6dhjNJ4SB9vMAnUbgjW48RTX2+ac/X4PgbXp8V3P89cM1Wd0a255OYQ8oUuZF0MY2lRDxwt/CA+OyCa+KLRp1UDjMX/VC55lQ00AN4bPcRyi8dXgWiztmmXIcs3EUaZaeG4XGayZ8ArcSLfMwcyBzIHujjAO8G2/gkQmJ6cDlMzfs4RL1cOEUelmIPEGaDTS88H3LbXWFchNU62XaCNxOCfhGLyZ8WXlz7qyoz6hOE3NTUdHnv00fD2d7wjPProI2FubtbCEYShBEHaAB6lg3ajjvwSmfFlyAsjrTrXkHXbenUALyqsH29yrFZv2tgBzCtXroTnnnsuPPulZ8PZ737X2pjtjOKK81385MthtAHbQkf1tU54xv/eTF3CUruISLYaTk5PhVGBbwgHBnpJYFhbk5aXJr4mCKpwpYp9UBTVZVsmUHWn3wDO2vZYdYQJbdN1QNc1H67qHK9L977fUvXLrn+BncILoavjNZAtPV99I9OuZgpL8ijuTSF96xkTwmvT8PqF66vh9amvng2/9tt/HV46e1G0JirbqUqxOvE7NgvjOSe39LDLYWOJ3bE7W7inHwnwTmHJ7THV3SNJdtOluHOQPW7zUOxoL8LJAL945+Yl6Wae5mGXLmcnoMYWq9Ab0hPQ41FJ8/qrnw+TB3h+F/y08btUKu8L3h881+msGJ4RJn8GahiotW2LKsQhvgEcMMgYrUz1X3zBzJ0KlAXDTfGIbj4iIt0JxqRJh7tu4FWEGC1dRVrb65L6X9GfYidJ1fZJbCkTpWE85B3HR0gMWLJtjGh98ZVHQCbGSV/8UWzZOaqAA+PH7QMeXqbyjDwr7olGlWFaGxbRKE0hRK0Y8iauAVcq0587tMx8yzpuM7ob4KX3OfJGMbHHP3IoTfh9uw9jvG87sr4Tt7YyETWelJkaaeoirUJndmQO3AgO0N1Tf+4uj/5J38ek5yI9Hj5KKMYBdeJ+2e5VZkl1KT+OVsFBL30Sdo83rdmm8awUKfG55OVW4rYxhXbsNE5vcr27mhqLfJE5MYmv/nbyJIxnKdwidV3QaE7puoKs/xRf1FQ5lq/Vwy4hA17dHMvuzIHMgcyBggMSiCWEotU1zcHeAr3sPCwN6Av6IiMHiNuwyngaB1gbjGVveyEU2TdYOFcLDS4mOAjpTH7Ij7LZxsG6DcI8QA73Jx5/Y3jPe98THn/8UfsyYydbH+iNuI7nnWdDa6UsLdn2KZcmLEQXP6x+JFy4cCF8+csCvbTF8cyZM5po6twUndeGQZU7bWXlxcxEKbW3RbjeF5HIeWIcKj8+qa20At98EuyHGHOIPRNdJkNJOwESiglTEz1JYDHBxidPaHmhSTbF4fXaCrSug9FPn/qRIofUkwqPikWh7RGK2E3CShGhyQLNcfLXFKXwt6a1S+FVtjSFDFSFmPiXfv4Hwq9eJ8DruZcvhl//nb8JX/zq6TKZtXbryt0hoqnCm+gu6pncPuMwLqLlRRqTWwlP3bhCsAAAQABJREFUP/KOdrt3l1Vywy8TjM1CF6gCXinM+KpL992zUmEYC3RrjbMT0GWLqbt85ewJ6PHoSfP4xb+UkoxPunoCB/Wg0sZUT2ClFkWzYOGABpO7LZXFogbaXTwXjPEI6Yz3jP2myaWVdraAsMDS97kelMY7KB5aumhTpR9AGGNl2roPvwGJ+Poy4x6a2+X2q7DKOrSCld5Ar9hnbWKliDHYkifNasAt36rogJd1TPUHa0sl4I92B/CyLYx2YD15Ma6rAOtOSmBAnT2xFt9Sqp/Qf5AVbKLIuTzkSL5Gm6e3OlCm+VVqlB2ZA5kDmQOHggOMe+VFIxsHbTykehpnT595ZYcB80Mf+olDUeFcicyBzIHMgevDARcaEZQnBTZMajvjuMAHhMZNnaWxvLSkrWWrHSHSZEsuSaosZjl7IocJEQIwq8MM4iYUy85ZVJzrpCABcRPhkUfeEN797veExx57VNvSdAaT4jgNiY7SHZLMuT/a9lShm5ZIFS4Ar1TveEcjBbqIIr4x6QBAunz5ir7e+JXwzOefCafPntVkU2ebcbi/ohJOW+hiK0qeU8zvAOqIdh6HyhvopfambCbDpl24oq+CajK8I5qgx+iiOuo7bhroMvJ1UV/1yZE0IgR4TegLYZzjRT9XhuGlmSfD1vS9Ma/YdQpX2WJcbItQipwmYyWvQayxKkz5BjK0UYNpCom1aEhV9f4ltjTqtx/znfPz4Z//578Of/7033dl00QhrVJvUttbeKw7N49P3/B0NrHGH3e8e3/2uIwrlogwkqQ79mgKPslidi5JuwuruTthKU4aGtPds7NSYuRYAHl0rI22mLI3vCegx6MnzdTmpfC6K8/2+O/Kg+cpJoCnzn+VHZlv2jvE0fO5rnGcrR1oIwG4EB8QBBAMoIuVbPvSosZ+FjYMKKsyblek3WmRE+gDX+3MLC1ajIxqe6MWDXivslXcNK3gewSXeNeaJhgLHGo23AW4JQbCfvK1tu1maKmL+XZFgC6AsXQ4vo+1Ro/8KJP+4Nu4PE8K5fwxM+oLlIUhjQFeCrexXW7T0CUQmsjH8nPtCDtjR+8Iy5s8iK8sYnakyiZzIHMgc+DQcaA8ztn4aUNoHEcz4HXo2jtXKHMgc+A6cmB8QtpdAgEAAxCAmYisaztZOkfJivLxVNbCsi/h0gXwuHUCIVeSKkI7EyPf5ohG0mh44xNvDP/wB3/QtjOOjvFVKrZypO0aUNahpwB9StpNxDj8RjwwwAsQiFlJaWYSAS8mmkxsNGewCQqTFDS9AL2++IVnw0s61J7JAloBm2wLlUYGfYFVde6VPK8jQ/3lTZuOGODK9kY0/tjuyqGiawJcfWLc0RChzdNEqY0um0TFuN6/RgxYm1Q/H9eBz0zWLmzPhvlT767UqNSjSv7Rtz6wFA+rR9rT5EtNp6lbV34NTotWH7feN1HWkF+X934Ar0sLq+E3f/9z4ff+4ssCLx2crNSriUCjoRNYscnhbp/cEtXauMufPqXObnFNy8vCPRJh6ZeKInoPy8vNjT09R7IX7YqdIC6YUljhZwFWgkc2t19SspJXxRpTVfwKR09gj0cRNVnun38uzK5dSM493TvPnfPeeUnZ3iYb0halXmzZMMCLc1I06PgYooUUO5tLGjv6GiegtgFdMEu/ct57Iu4OSwS/NKx7P1dDpG2IBviKF2iyspAAuA941AEUPa590VHjLpq/AGU8S5ZnCYiCpfhX2ll+yAqMn0P2ztYiCmAUwKV+KY2BXfInT36ej7aWj02SqS2s2NZVKmGJvC6Kav2FPpOOKkjPuYFo6jf2QQPO/CppDkIjabPJHMgcyBw49BxgXKWSpTEva3gd+lbPFcwcyBzYCwdMiJVQOcnZRnGbF4IpIAPndq3rYEaE1iZD3H0Z5kkM2srGhHWEck2O+ZzwuMCux594PLz//e8Pb37zm00AZhKFgMwI79s1Uvm623wvuu94wItWMYbYHf7a9kRbdff3Iyv/rJKjxffcl18If/3Xfxs4yN6BMbaVpjMIOqAkuV5vQx+ENiY0nLHFwfIT0vLCcIj1Gl/u4he3O1kL68Kr3muY6tlLGXljyhMutk8C8DJh42uWy5s74bX7/5FHLF1jT+r16Q0oxSlbvV+XfQa12+RukMhF1QtLJVW9r0cZpBp7AbxWBHj8Lx97NvzbP/68xhB9cS1RlBojuVvuBowVCT1ix88n3/gmPnFP2ad4vVpeMY7yJWvie5roUfQnL8/5ozAskVk8R+YsufEwZ9mPJNHtuVGiTMWvx+lxSteYquRTsvYE9niUIrv1sUufCsPp61E9oYN5dI/5VmpivrLg3VFoeYkJjCe4GWvQ3EVrk+cdoMvP5AIIQcuoDMgMRkuOFTlAv6IhUv+KXcGBLED+CY13fNHRv94LMEX/ROOVhYYxndPIAff2DiYbhdFulqHa1rTzAJ9kd60rztSUpjV/tJu1M1/WdBCzaP8EnHknsfzZBjkxEb+Uq3cM2ru8awz4omAZnmfbLqkyoS/9XEMZ+qQlqHcD7wcOuXeZwJIa7W7L18yBzIHMgcPFAYZSk3viGN9duwx4dXMkuzMHMgcyB8QBBk7O7kLjZUqHhrOiypeSODeJiQkCbJrg+Piqa2mgtTCXUXfPz5gVMq7IkOAszTJW/1XmmDS5Htf2RcCut771+0zgZSUXgRzQi1VetLwKU2zniz53NOAFD1Ij+R0e+xlpmkAI6GKCmTQrmExcvrwQnn76mfC5p/XVvPPnLdxeqppBefun/AqOXzcLE6bUz9jGOjWlLzbqa6F+rps+Va8+QV9E24uJss+JnC6nsQ9tBCuR1UMdjXw5E44yxsYA1nbCy8feEbYnTlTqVN+t5VsfUEmbHOnZSe7d3L1uA6Qoql9YKonqfQerxm4AL7at/btPfiX8q9/9m3D1ms79qxRccshaclVotYGg6hPjeiJPl+zxzuAhA7+itWNXP7dRQhcLt4jYLYndmbQXBJUPD7MxRPFKTU7f8/7X8a+4Y9+wW7THkvxW8evfBpFMT1u+9gT0eJRjm31i61p46PIzPf579fCx358r7M4HLZboObXtZwI7GK/5Q2MUjWHAMMLteQRQMdbrongAHD62dzFprwTeAelsjKAzG8viGKd6pz6ZACzGe0Av38o9VoBUthUR3gMs6b1g7wa57cGIzcD4TD7Eta888i1IlTmhIxCs3QVkGqCZQEy53T/2DdEDiaatpXK4T+jrkpgEkHH3cxopVD9uRoZrePGOGtUWTNu2KbuqY33MgNNYLhrB3g8j4RSQTeZA5kDmwCHjAONcMmW5Br8MeCXO5HvmQOZA5kCJAwizaHax+pu0ajiza1WA17q0aliVZ3CV7GlCrkuh2D0TVoFLY28p58GsJquTv4RgDJMiQI977703/OMf/ZCBXseOHTNwhtVlJGFWc93KoK+f0dJ5AZAP249igDkP/wU+wIOyNl5sJG894wcTEyYu/JiUbmqyYJOmMBpee+1i+Pznn7aD7K9cvmSNTFiavBwUD+mDaBzQrky42GrI9trxuGWG7YyrqwJgpXHo21fok7S8nwvU3s7wxPuNT4Zcq4GtstP66if9nsngxaG5MH/3uypVJGWt2UWHLwsmtXn18fS26ROJ4NTUHUslURFc8m2sXynOoIDXHz39rfAbv/2Z8MprV2LqmhJrvIjs3k2BMTQGd8Ap2fCzCzcLsYm856lA/u3HBN0LsnjYcRZ3T+uedvVLZBA3s+qS7kSwblDyq4RZBC7RJPAsOZN/yz2S1xujJ6DHozeNfO5b+HKYWz1fG7YbT/hmz58ujCGADowrhVaPnmMDQFKYgAg7nD5q4wBueLsoo9QIxjyocJBkN/TcyXFtfLAGSbwr3529abhCmwugny2Oo3ytUWMgGl+Moxp8LTJf50Vz2g+95xnzH0CXaVnZu4PnSW7lh2aWncVmZ2m55rXRFJ9qP7bAGxd/wC7ScnC+CnRNvwhY2VhJVLqz7j52Rrpiebwf+LqzL3bRfxSP9xh06MxRXziBB9lkDmQOZA4cQg7w3k3jpKrnY7TfqW0GvA5hm+cqZQ5kDuyfA4ANc7NzBjIgDDNRAexaEbiwsakvZukrdgieyNSFIGt2yk5bUPrRwejcazw/P+vFClA5AGynTp0Kb3/728KP/9iP2jY26EI4B9BBYE6TLF+9RiCuyb8ywRTBMh7L7SZU95LkkSxKJ88he7t45Ji6ktLhwJLXkAAZc5ZiV+jpxBUHOw7ZVMOKu4tqi9EVgWaIhryq+XkAEfwz8T4x4AuY+ouTF4DEzS3co+HVV14Jn/jEJ8Lz+oIjgGfnC43xJRtL6r0VRPQG9fGhD9Km9D3o5OudkwKjZgTEUj4Tau+TKza58gOQyZR+6XVrKoLJnNVV0dKE3Cd1o3a+DVt56VObKrr8tUbPvTnXWjbXRL9hgBdlF01QWCoUdfvW9ZRKAjn6AV5Pf/PV8Cv//q/C17/1anfSjru74A6hnTjJprgevSuR2tl8LNwuSiE/G5jMZglxW5cgtLA74GVRyaTwtyzIRRbztnv3JT3+6U54sts9MrLwswhduXQ9//147xR15ZGcPYE9Hilm5f64tjMO7XM7Ixn6M+fPE0C1g1nSBLZn2D8Mgd2Bam2LN03hjYIWnt+kMYQnz6gB3tG/iLhrSz+u9stwMD7W57KfsvdTrtpDBJVLT/0QOhl/jNdoRcV+zngH0AXYPz07a7xn4YO4nMmFxjeAFOOkt1MH7AL0wh/QilIBu9DYY1shbc7ClWmBaUyHKMZc2rsYB62q/i6CPrRCCePPn1ciCBjjYZW/jdlKTxj5UjZ3tHR9C6a/Lynfz4uTzFJmBoVkkzmQOZA5cEg4YOMlYy3juQ2XyDz8qKDu+dD6Q9LSuRqZA5kDu+bA8IgAjQ1W4bcMOGJbgBbhTRuCw2znjszJnxXXHTu3a0lnOjFJYWD1yY2NpJ1yo5PbYMKlJNAeUCrl7UIxgjRf65qRAP6BD34gvO+97w1Hjsx6ASrIBnck6CgII9N2qOqVcB1I8lgqyWIDJu0ovbtTdawWyWExTfwWvRYTHkhratjuykFZmvDOXams/nwRiwkAv2EJ+MG/SmY52EQXAZ44HLhPIv2MH3FF3Dywc/AvXw70g/ljCU6HlxbTWcmKVzb4Ifx3uFKEEoQx3pFr4dGJLdqZmIwI9Hr55ZfDn378T8I3v/4NTVpd84pcfaLKhEbgI25Nkqgzk5BtAaN7N+KUJkr0Nd/Wsm0ALIAXZ72gJcBkBrBuZWVZ53ltmHaBVccmU4OWnGh04cA0yVQGYCrtc3rmTWFz5oEisxS78CgsMaQ5QhETi/WXis/gDn/+Bo9fatDGRDU9xOLWVee/+SfvDL/5336gJ69vSZPrf/i/Px0+84VveVjM1J/TnujNHpaul6LCh0ZORnZc7iUb/+bo2AknAt4W2+JEwMvCYhpPQiQSxDyx9xrjS2KO7oW1sNDGnXRmLbkt5CYDXtPr58KD157vENlmU2W8zxpzIo8i35Qu9UnGa8AO0wSWFteYNG9GtTjBM2phbEPmuQUMiVxj22JKn+4W1s2vNvoaw5RJz3umMXJXgL8xisp2hbY5LWVto7elSmGRx94Rk+d1vydelzPmnTs9PSOAyxeUeF6s3UUSgBOLDWh92zZIgWA8JIBaGN53C5IT6PhpfLOFIaWFH16r1OrpmTFOWfrhHd5VeocoYvrxbsbwrh0RP3nXDmt8xxBiNuIAfKHlpQUb3kWAchg7K07vCjTUE9AWu51lAA9IXn5WLWG+ZA5kDmQOHBIOZMDrkDRkrkbmQObA7jmABg1bDxA/7aB3SX0IqazyjnNIuIReVnbx4+yu5WUBXtLuQTB0YdIFyt2XHFPYJMQFV/fB7m5WltPh84Ae3/s93xN++Ed+JDzwugfCpCZPey0ZkCoZF79VPxPFAb1SSPnuoZC6ows/BHgX3rG70M1dUzZbmfbVaXjENgttEdHBvzvDm9KOuyZPFWIglwR7TQ4A2ygYHsNX6u95s1JDoXgKdArjHjeGazrg4UYqcfRT1j6VoCKkxh+b/uorZ+FtF9ey0oq9+snq6lp47rnnwqc+9Sn7iiMaVrTRliYfTCSY7DAhogb8MYsADDPC2gppCIMn/iUuQDTXCLCzvNQvTQNL+XM4MX14WZNpwFhANqpN2r0aJnpTkwLVJscN6Lu6PRYunfrBIrv2nCm8iNrXslc66yaqfQujW5gpLMmjxbe+Oq+7/0R4+t/8d0X689eWw6/9x6fCH/1VO3iyJ7pTKWpvTEF9dJtfCiOwsMshu8Xnbk5zyZ7uEfTCWcSNZcQ45N9qUpOnO5GTPfYFu0V7Ja+u57IuSjm+U132ifaegB6PmkQhvO7q58PUxnxtWJ1nd3+1UiKfABYYE+wLi3ouGRPKZnF5MWwJ5OIsSDubSfFJyrjBfR+PbLmYGru4ygC9J2OjsFIOxs9yET5+k3L3ZXsKytx9uWUa9mJnzPftjZIDtPDFxzzYpmiGRlJjjesdPK2PiExN6nxPAU2M8xwWz7uA90QyTr2/03wkqfKCEIw/BgLTttUXFGVTr0UDvETLdmy7EXWnEd4JdrdUlpZ4lp5+xDtX7wDbZql7es7pt2in28dtRKMDdErIv+pzsP3PyMyXzIHMgcyBm8aBDHjdNNbngjMHMgduNgcMEDH5VQKfBEv7+pIEQIRdBNlJ/RAEOcQcYXFledm2KiAlJkFyX3UwQbYsAGPXT/8cZgzwtqUzQO69977woz/+Y+HJJ/VFRhE0qS/piaw9maI0KpZMZdLpwrlPUjqCupGqLYlGnEr3EAesXGh3YZv5wI5oNwAo5g/GNaoMRpHYZUxAVx4m0MsNTQjkpIUqVrApD7uVS7joJZ5Tjc1LxTNNFgwCk9AvvTN5RzBNCUZ2NpWnl62EuzNKT13W9YW9KW0nXFhcCH/5F38RvvDMF8K1+QXbRkLWvvWFc8AEemnSAVFMftw41bsrmBqqFqbh5YAXPELralLneAF4oX3IBIbJM31zTee8kYrtr7b1JXJrt+WyNYZtPWyf5L6u7Tkv3/uhntxS7XrypyEHNN0AwoDJ7Ln0uLvkrUUfLE13rO5aPfn4/eEfvuX14eL8SvjYUy+oj2wOSn4nXixEI0rHr9Xmk9MiSuk5tjFJ2Vhexd0sNl5ZCYpPkiKOeTrgYlnF/Pxmsbwoi1eUSjczU/BElrKdwHI3KNurCasZF3lYpOqlGrMU1hPQ41GKXLU+ceGTVY/dulSxRDMfkfAvpvpYA/igwVDPj7aVrfv7g6/sJvAaHvt4wVjlz/huix8sfqJwsNg9sWKf6PHv52HFxnG6X9yu8A7Fg7dlVxb7dibgizMNGW9ZeAIoYsxCy4txeEY/tjrSv9f58ID6QO+rxt+WThA1U58xnnbXDcBLWs/6bRngpYUUReH9Rkx/L+qdoCxwc0DAthyEa+e9pUNDDMCL94Rts1QfpB4Yvi7tgFd1O+V1kWWshHzJHMgcyBy4NTmQAa9bs10yVZkDmQM3gAMIfzbhYCujhEi2ouEG2ODLjJzXwcotZ3ZxVtKqtqlsS5vGV0QFwCC77scYmlPOBLuEY4RhfipgemY6vPs97wk/9IM/ZDTp8DCBcRK+91Cu5V4jaBuUpEDydFjJtaeSJpfRZFMyF9wNUDJgSVv2tM1wW3YLkeTtvAFuinkh/YvPHP7L9Nk+sU5eqjuCONtKh0c5pJeJhOKSh9VNdyT5aJQyWeOd2jjFXhKUQ4d+Ro/TRGSdRKVJgmjYgwHsAvBklX98lC8XhvDiSy+GP/svnwjf+MbXTfPPNDSsbtDkk1jqYdpdNfy2SANefDKCBhl5q3bSNJgQLUzAJnR4PQb60CpY0wH2TLpx+1bRDv8s4oAXykSjYVYaDIBegK7nRk+FlZPfV8nBa1vxig6FNAdWEtxwwIvSrU0qZNQ6urk3YJVq8xrc00ttJ5HnrJRjdNiTI39zJj93FH44vU/x1ODAzdPK3X/uaT4Em5Nbrelu6sik8thYthd5FMy0Enq9Cx+3VGOVAmsDaj1Lidx619I3w4nl0z3+TR5l3tFv04dJvA+7Bg1bFonnoPdOWJfWD0AD2pd29qOeY/u4iAqhHQzQZrFFbs6FPExmsFZor/HN4YgvGvB8MA5OCNCyBQbd2S5oiwlqM9ME19bGSS0KoFmLti0fl2HsTaYDh0YfY4rXijdiMulVNyrkCtCKdA52KS7R4o1tjclsCexC+8vAMT3CwzoOblQO3qmc5QXoZdvSI+i1pncEfQ8tRH7Wh2N+aUxIeed75kDmQObAYeJABrwOU2vmumQOZA7sigMAXumsCwAF3AiIMzNzmujHQ7uZsGiyYl/CE5hgmkuaIDKpKcmeuyq3iNwEeAl0w7BS+z1xKyNfZ3SzIwF7b1saEZUdDOoI2ky1bLqlyuAbp166C/QyIdtSxbK5EUNaVBFUKsAu81dc/gUukd4gJwnY2HeCPtU+orPHLAeFS+vKDorekZSun20RVbUR/KFkWwx2gd88wij0WfaJdqdWeyUtTyVRQuw2jXc/SMcUmmnu3M0V8Ig2B1waHvIzutYFfH7+88+Ez372s+E733nR+gEfEKBk4nb6heihoxhxuynV4/okRFMfZeiTap9Is3JvBysLDGUCZqCszgTii41MrjkUm624CcjYbcmUxTYdNBsAfjHr4u2r9/2jSlaJvRVPc8SQ5gilJNSt5NyldU8TtdSFrKyKo7b07hj7ILc2/zbPBEp1x+nxt35GdxO19l+90w8Js7qYnRzd7WkshGjuz929yhbzqq1/9LRbjZ1cKybN8CuePPv1piClO7g2oNazO2V47PKnw7C+YDeogTcAVH4mkvqtnnWevfTFPdOg0XjHuM0ztKbt76sr0vrReJGAMHuWYy2NytQmRsRgdA9K782OV9SmqVFbCCQJ/N5D0pZcBw2KpUYCuNmYGxcZAMAwtKUDYhN2RhvPEdp73aaoAxnJ4C53/yJc/knDiwdNPYvoMrxxxQ+VRw748m5EuwvQy7Y/KsKIuvLYpgJUTtLyKmt6sXDBwhJ3NJJd2yuVQTJyzyZzIHMgc+DwcSADXoevTXONMgcyBwbkABMVVmaR8zgHCcM2hWkd2D0+plVbreIyWeH8rjWBXkxaMEx6JB6awGsee700AV4iCLDivvvvDT/8wz8Svvd730JxWmUet3NCEGb3Ipoi2pYBrw64RQUAlFz4df9UKfy8NLuapK4YciB+20/0EgslJKAtQpgMwFh4y4r44tZYOLcgEE9acxNaNZ/WtwCmxMaxsCEwa0M5SQsr0AaI+foTb9J2DnnG7RyEasJp5QGnKYMEeBFHP+rApsaknQaLWQH3qQI57c5YPZSE6qRP0tNXLl28HJ5+5unwmU9/JizrkGJqjUYg8QGc4NmwDrp34/yLjoFvTEDIzyfUShZ5ydYaNM5mpIGVJl+u5bUalpYW7TDs1EcHLqwUkfIom8Pr2drLlh00Bk5PPho25h4qYlLnZqPQ9ggxqUeCv3sxe5qk9TRHj0eFlO7QPZJayXNQR4SorO2701hYQZws/q+7P3f28CmR8yiGE0ZGMU7Kw+8WEuN7aYpGZHeka3J2MaLchhbUFZ6S27084y8FNCVJRZaiurUnoMejJwkes2uvhPvnv1ob1uRJzmilGshlYJdrfzrI7V/mSzxA22dNYNeKtrnx3mBMA4TumE5NU5o99eVOhgdmG4yj9cVTt72khzv0vQ6X6vM/CF/r897xHdzUogdtw5g7MSmNLo2JLDToDaW6oQXGWV8ccM8XHLXQkBpUYdBvdVD6VBd399YNPrGd0TWb/e1K/fD395nb6Uu8G9O2R7/r/STtMH7QCvmAdEnTyzQO5QdI618kliawgV68X5yyW7X/wYNsMgcyBzIH9sOBDHjth3s5beZA5sBtzQGEQiYwrNhz0DDCIQfRAnghIAIaoDWzrPOR7BPyEhABb0x4VM2ToLhnJrQAXkeOHA3veve7wvve974wNzdnk6wJaXaxLWZcArZI37VBrHWwCDEdE2EgCbxDRot5ua/qGcXgFEtCN6CS4lqALgjQMRYaWZsIzuKbEBJBV0Oa7G2GJU36lpZWwtmFjfDcy1dsUjAzORZOSHPo1NGZcO+R6XBiRp+B10m8gF9+3hYTjA74RTmsmyegq7ON0rdUJkpHADClXaZj5JWP2kpuzKa2mKCJtheTzj/Z0najpN3BxIBJ79mzZ8Mf/OEfhLNnzobFhUUBRAKGNOnha4kc3D/CYf02mdhLa3X6JhNqOM0sxlvOz/JCE3EqaiLSJGghLizM25leXte9lUubkpLJG5pts/pCKM/GNWkPXLj3g5516UrZtcbqXhvS5cmkq8trl06xJprCkjza70X0wtIYP8Uok4pf2d2YeI8B6Um1BunKw8ISUYRZ/4h389fF/rmU7TiVWl5EsJslizYLSOEehyvG05TqXFN586rxjzmUErtPujYlSfSleJV7JbDiqETrdjx85W/D+Ka+prdLQ/0N8JKmDOcsOmig7WE8o6rAlsYc3hWcp8d5XmjT0LcZB0jrrIW3JVpj59/vM7DLqgwUHSr3Q1eplgOVlyLRF2BRU59I8Q7qXm4eKwMP/7cjD9CwNRnBtL0lE2isdNBLZ2dJptDLyuIzkvp7i1zkJ+N10tWd5mNWvJSusFtsovk7F39+jM9pQSgtCnEf0eIP6VN7sWCXQC9oRQuZ99KmNNU3pdmYPpyQ5JhKn4xl51vmQOZA5sBh4EAGvA5DK+Y6ZA5kDuyJA4AZyLFsQ0BDhi8yHTlyRIfWT9oEBYERsIsfZyO55guHkjt4kgTFPRVOIiFHBtaICM8LUVhfiRQdjz3+ePjhD34wPPTwwxbG1/nYgmDh0pBywZdMknExGlcUmVNAcbfcJaADn1i5En4F3QjEc0Ha8lQkp0IxrJ5Ro0qCNIASX4lKBm0u27BInvptCFiSvlZY3NgKVxdXw7nL18Ir5y6YNtTFZfmtUU8J5ipoWvU5PjsV7j4+F07q/rpTJ8Pdc9KuE142I+2vcQFggFZDqvPOtrS/RkW10glGsjK3RI9tmlS5NCJ/rtmFdpfS2c9rAghn2mCJ8F3caWsmCcPUUXcmCXySnnowqf2zP/t4eEYH2J977Zx/2Uttt5G+5CmQyNsVzu7eJDA2aXjRV73l0BaRlpxAQwBawCh4wFbLhYWFovzdl5hSdNqYSdKcngnqzHaY08feHrYmTqSIdu/ErnjLoZDmwErk/T5Lzhuy3AOviySFpUJbcqTQVKVud4p3Pe/Fs5wK68q8MkmNTLA0il+Eyd+SE27/cuOBvwcUXCuniZGJWIR3FV9xJr60trme2zpTpO0KrI9dilSJUHGUIlWtE1tXw0OXv1D1bHE5jzwCzz1nPbJAgqYMH+iws7xUaT4WwbOPNjAfeiAsGfo3wDV5oaFpfE7kxsqTz0EayoQO6oBxWuQXy01tn57F5IbM5GcJuy7kV+YRwakMsygwhSf/5KavlHlRLsfJ9KvHcYZZHMsoMbCLoH07E4/0ftS4z5lY3Gk/tHt5F09oe+O4xkTO8Uq0sb1xTGPxqMAvP+dLLzNV1N7yVAM+JNqMfn//4mexFEc9A7EgDp1AW4Rx0ZX0+vHehQe8xwlMgBpvQI9NKgyA17CBXry/0NjFoHHIewxN5HSWF/5WDyzZZA5kDmQOHDIOZMDrkDVork7mQObA4BxIgFcS+NnOeGTuiATcERMIAcEWBSBwNguiKgAYgiayKvKnC5eDl1eJifxqHgJ2JCQzgTIpV8LsPfecCu/7gR8Ib3vb2+yw3LGxUVud3QL4oWDTXBIRSa6NKfGAzibBlbnmDtpOxFdeHICPoD2qPJOQjiC8RR0VMowwP6IvUMmOhtOI+DGmsgHC8NtQ+RvKdE0ry+sCoi4urIUL+mLd2QtXBHRd1tfrlsLyqlaSFb4zNK5ydfaJMc5yJFdpYaHVtRFO3XUi3H/XsXDf8SPhwZPHDPyaGxNdmlwOba7q3DLOpQLo0RH0mqCtC3xhngYtdlaVBHr9mwGYYnICQMgkdELtOZICPcoerrSWt5gn9r7A1sY/+IPfD1/9Gtuj3I9JhBikfrQ/Da92ItHyAozSeXMcXi++MpFZ0vZKft6CZXrbcyuHkpZ/LgB+U3ou5nguNKG7vK7fvT9Uju5RKz7JYZnEvJJf87082W2O1R7S1PfbUym0YFVh6ZskRWhKEWufou3p7nnr2lAIz3slzJ4vugPjAEWm8Krbwi245G+xPb4njQ8U8cqFWKB5di6NlS1FbojT4G15l1J3ykq2nsAejxSzcn/91afD5Ib2V9eYyD4b4wnG7bz0vBlXOJjctrhrfOFdwJhM6Ly0K3lXuOmt1fXo3zHzXd9SXzCgRHRj0P7ht6GvSFJHgB3Mdjw8f0hullb8nadx36pko4N8vd/AD0yZR8RzkJ5xWGM2IJDGDvLhPcL7C9DPmCs/3qty6OfxyQ9jHzhRdMKJn7aEMr4CvqeFJ499467IBRwrYB8OEfBlWxnpA6KRqkAvQNiotoLzpc4dqV/BOt5TtAO8scPnVQ80knn3juk3qnSjbNHXO5U4nLO1rh+a07TFkMocUr68nzdVf/gJTwCzFN0PBICNsW2UwtoF1mJPX5okBu+KdWkg0vbkg6ENs8kcyBzIHDiMHMiA12Fs1VynzIHMgYE4kLarSeJj1mKHdM/OzJog7Sv4m2FxcdEmNwiMBeCl3F003LuAmMC2LZ31ghRsQJay45DZJ554Y3ivtjI++ugjRgurtIBebI9hUoCQ21iyAqC1zhjgpXOl0Mra0aHxO8oP+GtYS8r6UKLRYJMSTWI2kYElrA8pPud+bZvQzoq1Ngwqo039ljV5mV8G5FqWRtda+PbL3w3zK1thYXUzLK/pi1XgPsM6zH10XGvPEvw3mRxBmzJXmQ7KMPlCV0uaUyM7YVbnlB3XNsd7ThwJ9x4/Hu46eiQcnRwJd03rzC+Fo82E9tbO9rp+bDFVLpL24Q1AJb8d8UvzgbChC5OGCfFrb5tARVphoLvMV3ioMqTR8YUvfjH8l49/PFy8dMk0oQANMcOilQlfNZ0F7f8iUpiszkzP6iwvMUeGPsuXuBaXFuLhyWV6d1MkNGOYMLFDdcLKQKOBCe7p4+8J2+NzHkXXFLvwqFhiaHukIkWafBUee7DseeJWsKuwDFR6W+wBq91YTpF3w2TUwith8vF/3b39Sh7FpNZ4ZPFi/FIeafxwL4VjzBHt7jPgNaZpYESDd5F3Y4m1AbWeRV5YxraXwhsu/W3Fr+xIbIgYgAWV/dDu4jD6TYEFGPgI+LApv+UVNIHd3wK7Ltejb3dlOZDT33O+CMCg5W0vXslu45Os9k7ROEl7bGv8YtGAfsBWd+AawBreQ9zTu4rCGYPsq4TKA+7DN4AqX3AQKBPHP/JN7xYDwzSO2JZApYen+GGgzRcwVKrioL0EsOVtYCXIn5iM+9xvhnEeAuRNaBs7mlNoZcMX6jg6Jh6pXoTzG9I704zotbO4FGdc8saQthWiNT2jd96x2Rndlc+2v6vg+qr61NXlJb1Tl8OK3nUbMEHA4ZbuvkVfeRgPuMtP+cIvDDf5miV62XmM0EXItt4VBeAlPkcGW9p8yRzIHMgcOGwcyIDXYWvRXJ/MgcyBgTmQBEEEQLYj2Ffp9GU6JgibHDqslfwVJjESPF0Qd4GWAnDvVeC2chF4lQ+AF4IqEwfKPXb0aHjPe98b3v72d4STJ0/YNjWEUQRrVmXRWprQlgoEfoznYhZzV/wKH7cAeG0JwEKvy7b8ARhx3pWkZoPBFM7EB6BoSxMVtMH85wDSsr60uLIzIUF8O1xZWA6vXpQml34XrywJ5NoKS6taMZbAvqnflml1aaIigR9NJ76yOMJkUGTbFgzViXO/oInzSFSsgvTlqM0VB7/GR3R21Ew4KsDr+NRo+AcP3BtOTIyEIzNTAsXEjyEmC+t24D11YH3bpmbKcwstNoF1nPUFWIdm2ohNvLoYsisnrcUvGbfTD65cuRo++nsfDc8//2X1ozHrO2hJmBaDpSmnS+n3d7f+qP6CdhdnvOFOX95iWyPntOy1f9IS5Ee/IxMmnJzlhQYkB/NfUx+4dOofFhXwnlg4ayw0eo13g9f1AAaM/ob8B/Km7rs0/VLsggVWcjU/uaoepThdYZH2xIN0pz0tC8Ltv+te1LkYVawPWJrECz1PAxke7D6mHz8ac9h9QEHJ668+I+2ua4W721KwoNRlrT/qOQDE4TB6trUB0MAlxm62EvNhEwAEO8urO9Povh79uiHrVm9vMtHPKoB4B+hhtGtcZFumdQddUj+BvYD1nEnFe2dGW6cZZxiP+VAGW6nHpb3EO8vHBGkBix/wB+0r3p1oDmGfX1gKK8srYUELR8viERpw6zrIfx3QEKBLaSjX+kJlwBIV1s4OdsE78ieu0a973RcRWxlxnQJVtI+tuqPJxfZGxkf7OqdqMjrOx0pUIzF+VBrSYyz4UBe9g4bUBoBc43qMpgWMHRHIdWJ2Ohxhe/qYZJAdHTSvxSW0uNZU3yXx6ZKOVDivj5Fc1VbZFb3VtgQ87qhcgDQ1oRauNEbDLPjIe46yZOAVtNLW/E9N6LB90okYQEa23dpRDSrH+O/J8jVzIHMgc+DQcSADXoeuSXOFMgcyBwblgAuuDkwgwHNYvZ3PpAwQ2lckaK7GrzP6ZACQi5VpSatJuBy0sFI8yo2SqIRg33aHUDquQ+kffeyx8P73fyA8rjO8RkeHbSLFSjgTD9+it6ntD6zSim7+XKI1uy5uGqRX5qAbEqQ9pQAogCb5cfcph7YpSiDfBuiSZtaOBPXN7ZGwIqBtRVsTzy3uhFcWNsOVq/Ph4sVLui+ExWVNXgRwAZntmDaY0kr8Jkczos9t8kE6d09dC1+zOn9VNppn+kkkN8HctNtE30mBfCdmJsNdJ4+Ge47rd2xKE4WJcGxaEw6d9zW0tYLkb/xEfAdU8y0kmgqoztoNuU8DvbFOllOyuwbCU099Nnzyz/88XLt21bZRMpHc71ca2wh2rQ3/6iWgIFoW4p5RuKTJ5Yomlmmrbls+tWGqmreHQq2/oFgwEqb0fExNChAWb186+o6wPXHMkg/EWuWzG7NvcIA6VNprN6XHuDxbuzCDxB6UC715RZ+ugI5TtsLhdnPGOhTtyXNBnfC3/657qjODhf97XJIYL7oAL/e0kMqlD+DVjw9N2UYiKkW5ozFFEXd8ayG84crTDlYUvvUWY4OINK0ZAQKAK5vaBr6hRRCAbPjJeLyuD1QYiCPQC0CGcbnJ7LtPN2Xcz38IuvjRlB0+GT0id8g0iMdMA2hW4PmJ4yfC3ffcHe6++x7Zj2m7+UkDuY5oMeaItlDP8BVjaXsCeNlP7yc3fo6ZbTnUO2NT/Lh06aotHC3pXYq29OXLl8O5c+fChfPnwiXZr165Yv5sw2ZhiTGMcavQjNW4huGtlcAx0/gy0KaZ107PQV2hxp8HDqtnSyPyQwIBRya0qERf0DPAGYgTowLDkBnkN6p+NCoZYlpbFE8dnQv3a/v+Mb33WYZiUWiM9pB6teWv9++O0i+oj71y7Vp4bXFB7+DFsK66b8l/SAtJm4q7Jc1ptjXaOzyNs2rn1Nbe5EMCvESHNMWRJ9DC21S+6/oIDn2bvnCzuHlQrZTzzRzIHMgcSBzIgFfiRL5nDmQO3JEcYJLi2l2dA8BtlVoq/wv68h6aMkxsELKRJR3wkhCuecNeAYXOnEMZgjghbOp37Ngx+zLje9/9vnBCZ1qxTQ/tAbY5IjhrGiDhFDAIIwApCrV+ZxJm3paXRem6INBuaNLGnS9J8aN40uNnGwulmbU5NKrtE2NhWcL0FW1VPCctrguXroQzV7fC+cWgCd6abd1hMdmALiYlEu7hG8SZ8G13nEQS5Zp0bUbUSfiVbcEY0kq2f4Ld05CWlW0DrEjnxDl8ponmmBJO6FyvWX3l8eTRqXD/3cfCA3fNhVPHpnXwvVbStS1yTBOHYZWFBpsayH6shO8b/IA4++lmBrd8rA2GwyuvvBo+9scfC1954XnTAKExWNnnYOBqOku274sBXuIVd86dY9shdaQPoG2yKI2AvWpAkEeHZu+bgId8mQzQCy2vxaHJcOGeW1jLy5vHeLIvZsd8OvzYV24DJy6KLVKUfEpWgt2pa9nfG9G9kp27xaGfeOR0p+N4kPchK7YMehFqEZhYD2KaY+nJbjXNKZWsNrDWs6eMh3R210TD2V0pMuOwP9Pug6amHfKtcXNLWkvrep7HpA1MHLY2sijCvXxAfcqr+24AU7fnDXAPaUFAA6IBRrzvGF/ZGj7J8yytzfvvfyDcc+qe8PDDbwiPPPJIeOCBB8LxE8fDrL4COynwZkZfgh2T9hHvIFvsEc0GkIhXNubLDfCVwqiSh+ud4Dgbo7kNx7w7FgXczM/Ph8tXLodXX3nFfi+fPq2v3n43XLhwXosG14yvm+L9tvogrWv9lD4qhw3rKvtmGcAiaAI4Sv0Rfk6wJVELMyPaomjaaArEf3x0IozrzgdfxvWbViWOT42Hh6TBfZ++VDy+rWMNNtbCpEAwQCjwyVG0ovl4jtItqc0u6f13UYsY3xJ/FrSYsqayOSqAowc29JEY3nEsXIlhBU3Wj2FS5Nv4GFsvla/kCeCtBHjZxxdUp5vI0pvVlLnczIHMgTuEAxnwukMaOlczcyBzoI4DviKNADg7y8r1jAnU6fyueQneSaBnVR+AywAvNKwQvCWQ79WY4I6EKSEVwRQaXv/QQ9Luen944xvfpNVigU4Ct9CnYBWZrYZMIji43s4Bkb8JtIBWCnPhFniJiU0TXUwgOKBYGk9KIwu5aAIkjTZNLNa1nWJrWNvVljbCq5cXw2tXFsO5S4vasjgf5heXw9KWDvMfQcMHAIlJjYRkCeNMSeAPAIvlGPOFJqRowrdk3WbSRX1Fo/kbmbihQlfFT67y3cIFOg4x0RCQxW9M4NmUeDTD+V5HZsID9xwLJ+Ymw72AX/ra46z2jLBqHrbYRqk0lLkv41R2ssANyfHrXar7Zz7z6fDJT34yXLt6zTQg2BbE1h1qd70NvKU/wOJp9dtpnePF5AqNFM4Rmr82r9V/P0tst2V7s9HXmdTRT5SDHGyH4eBjtjGNqA+cnnlz2Jy5v8i+ncMxtD1SJy8K348psdz61nXJq5TpfvIbIG1vSV0+tU55lv1pSBm7yu7OFAeuuN2eU4sYOVXElWcEvTwfz08PO87CRN/C7ZZ6336tWp+qlHVPhB6PUuSOdXrjQnjw6nMdjwabP1OJVxqz9FyzjXFDQATvAugHh2c73urKqjQplw3ghrcFH1vybgg6WO8hjQNDgCI6C1KaSGybB9R6wxseCffr/pa3vMUArrtOngxHjh7TooI+LpKaWPVnrKVuSavUh2840WlNq7t3MK+Lnl8eYbaUm6GZcLvLrnq9aaxa01eQV8PVq1fDeWl9vfTyS+HrX/u67i+HM2deFTC2YB/hYOsdCyksTlmH1kuLtroZhvceD5OdZWbEiD/qFHZ4veibnJuxx0Yneem9LaBQms8T9lOYOHBEWlYPSkv5dfpAyxFVZ2Rd2/ilaTUpje5VnevFu3RCYJYQLTsHc01yxprG9kXl961z58M5LWYsql3C2KQWp7RAZWdjqjRbUHKe2FNBm9Ev43OOjMGXqEcFeuHLOXRsw+U9AUB3k9h5M5owl5k5kDlwh3EgA153WIPn6mYOZA50OCCR3LS3WPVES2Za55MAFvnnujdtu4Wt1CI4SggF3CnO2/r/2XuzKMuO60wvbt6cM2seMZIYSAIgCBAgZhAcwEEU1VJr6JbUcj+42+1ud/vF9ouX/eC1vPzqtbzsfmi3tLy6W2OLFEWKpCgSTRISCQKcQIIUSQDEPBcKQE05D/def9+OE/ferMrMysyqIlHFE5nnnnPixLgjTpzYf+y9g4lk2c2ql+LGr5yIFgDL1XFto9xw4w3pnnvuSQcPXhQTUBmsYWxZCToYVkkzV2PBv2KyXZiQLuBFosFkUM7VnbbCVGNkUkyehlpiiRiTXKgtpjS92EmPPv1ievX4fHrljZl0ZHoxzSwxMe6orogNMdQctYuV2RbApwChMpgUaoNWSgeTLJ08C1zBGhCfawtu3pGzuQuQec4MVeayZJA4tAHG00jDpGAytN0Sq+q2g9JkMAcaux9moj+BfS+N2+/fPhZSXxfvmUTya1vaMcEEH4aPWpBudpZKQuXSWh5dVfZ8Y4iuy0/6n3ud71W9sR0GYVCefOKJ2LHxqaefSqOszlszdxMrYbsJnoWL0n9MShsy27cj5UU/1r6QtD927Ggw6VvJyrStlzQX5JKxM039Nc4sOAwB0zyQ4uGLPrwii366rXgQN9XT9QN1o50xQ5ubKNILpq+b8hYuuml1L7aQyOainJrTST6r3uLZ72+j4eKX63ybwwRNyvPqbIAVYQW8egn0ki5ARn7a86/u86mKW/mdrtlXhl6R0GrJVQFOGyvCXXH0gTS4NBfv6iopd70c/wUvCjnagAmqfYW6Hc8cq/0+LMxX9qiU7uLd8B3pAkLd1FZenHF/XplcdbcOVSGNrdkYaCGZOcJ35WC6GlX5669/Z7rmmmvTpYBdShVP8D6rPi8lqUoY4fe6iZ+jMYMYzxjHom9Eovo6BGRnYGPHufLjmY+hTPeR99qG1CldbPAIkwNGONVDXz30ajqE2uNjjz6VnnjyqfToo4+m55EAmwHoKYs5fpcDjI/Uyk9/AYrf2T/bN2zLaE9uyvfX2iihvH3vrlATbQJyDfD+SMVRAKtJ7HmN8f3biRTYVQf2potQ0R9FumuURZkm37JlwL8O37EOtr2aLD45v2izUrTs0g3SWQtIfT135DjHESS+FlJjeAx7XkP0R23KQU+xwFBf5ZoySuEMREoDJLr5/ip1rBSa/kqvuyBjf86AV26bs0+xOsWaAjUFagr8fClQA14/X/rXudcUqCnwc6WAIBIqBhiM3QZg4AqyoIornidOHI8d7/KUPE8gY5JLefPKrpPerRXeyahOO2GUAMmcZrrk0ktCuktmxC3cBbectWoUV7DNCauTfSemqpdEEtVPTi+XMRJeo1wB8QyMY8eLOjLxnSO9w8en0nMvHUovvXQY0KudDjOhxv58HEvY72o3XGl2RRh7IgBLljczbpEatOARwIh+QRfyjuzLOQoEeCWDDGCWn2agC7mviCszVepQQLIqdcIHPMUZpisyCxYs016mh9wGBMNUZYRpQEYNWzRDacfkZNq1cxdA5nh6y/6JkPwaA1SEl0hjA8ustBN2Gf1MmQ1tmpgPhcj5UiLKa6rxS/rZVQ1X3fX7qebiJgd/e/9X0/33/y1SCzMwGKq2GGe1eCsS2fSNDEu0BoCaqjST1NfV+9w2DZjDKaRP5mBqlOizX1PxwqRFbmuXybaIvk4bujNpNE7V2W0DJcpUa1RS4NDIZWl+5zUryh/tv8Kn/6Z6un6gboRcn+7tGV3kPmYSa9d9Qxn0EtpQ8LMZqFfy6qrnEdnkW377/avyygDHfyk/5whWnse5ClOFNdEqVK5GiRMP8ruYH6z121+QtcKsLO6qodZMZs0H3WR2zT6d9s083b1f70L1RUF1+7kLHBr2Lmrtgr6O2UobBVAAWOB4bOnjPVkvYZ6dUV92DLJpHEfzCJtz0y98GA0oi+NClJ2yanR+BxJbV199ZXrn9dekt7/t7QBeV6O+eCDscAne+R5Hujm1SLmUM8AS0+ZdzVTO423o3Bk+3mGfUKbSd/QPl1/wla95/n4YMfepUnLOLHCUfuanz3UC1bLfeONIeubpp1EV/3H6yU9+nJ595lnsR76GAfz5CG+KQkq6Um7rJZ1i4xW+cdIjxkvos9H2WlnuSL77Y1WlSc7bquNRefodGEEFdBibm0MsRCjl61dkyHkGZdrJ9/xSFteu2Lcn7RtHRbQNcNWeIy1tedKfSMf+N4J01yA0UWdxWclrpLnmAbdexZbm468cSq+iSttGVXKZcZ2kiZ/LEcAracSYT73NO9c/S4k7lwig0DoQ0YWjsDdmbahUSG1zlk76e9a/9IUuEeqLmgI1BWoKnEcUqAGv86ix6qLWFKgpcPYp4KRVQ73bJiaZ4GE4lgmqKo1vvPFGnhyvN/PdYnGcGztDXVZ9gRVfd1285tp3pA9+4APpLVe8lQX1nt0wtzWPFWQmrlEUflypXdM59+ZvNad01nxnR3r5yDzG56fTK6jeHToylQ5jo+vY0ePYHhmHBsBQTIrbSpWFNBfMAxJeDcAv9C5IvCcptVoea/m522O7M0zJrIVMCgBVqBrCpHEOggRdKtAJ5sBQeZt14rBybVtZu3xkGigwJn1kl7Rv1oZhlQFzt8QhVsBVDd0xOJsu3j2e9h5gp8cdk+mSHUPp4DjAV+soyN4UzInSWDBIlNE8dS0YDo33W8ZmlC+8T/kJRgqGIPoOzMwPfvDD9Nd//fn00osvhdRXq2U5V2+PUxLbhEdmQMgXhkVjyRP0X9WV9PfQjtccoJv2hWSCVAWSZ84MHyWKTriJDEtQqqIk2djoWEiWKfvx/IEPn1JDW2p1Vz1ZO8Ap0Qoje8qDTXqsrPIZtsnKxDZZkjML3it5ddXz6CYcY0C/f1Xe4t9tf/wjWDy375gEP/Hfdy4pV+nkUD7nWNed7nmOvG6orT+MxN/++v0ML44xp3eCRjr7nN8BJbuylCbvDmkIZKvOGCAY5wwGZFDB4els9dWVJVWyjDEOWke5HOOgSQAXvNS+0wXUcRw17J7de9I7rnlHuuFdNyA5/K70NkAvpbm02dVNg0x8l7t9YWWmcedrminiqGq20pED+mSnWJFPqu9T5Ws5PHLvKmFNqRzdgFwoNexBOiUodwHkUDdVSqdQbXzhxRfTI99/JH33u99NTz31NFJfL1Q0oFS2W8TlO+C1/ZLx27oJgFlepaNtU53qfdGt1uhbfcWI8Bv/wT4aQFMAXtg7HHRMBsAS8BpFYmsX3/Ordu9OV+7fy67DgnJsttKgjzWRzEXtVAP0WPtiUQb1QwEvxK+XObcAtxY4XltCCht7kYdmWMygDkvkZUVikxalyfxm0R72DRdyrLuLHRkopRYn1VfQK1Q0K8J7bX/XdIJnF97yBgJEPe27vnEq1SFrCtQUqCnws6RADXj9LKld51VToKbAm44CMgrZfpdgD5AQE0Un2EfZPSomzluf+a5Z1zLn7MBACXhtY+er97znpjBYf/DggZhkCmQIUliesJkVzE6OmUGjNZInSMXCnhJgmcnw9545kn70zOH0ytFj6Rir5AvwBu7E2GIleXh8EkO2gEbm1WViYBp4PsAqcwfVGIGnrTgBLw3cZyfIBcQUTCjXXZbKp9bRGsJAxQTbextBaMWr8rzUMkuWOcn3qcxc5sU8G4byLh5HxVBJqIm0DdWeqy7anm686mC6YjcqJkh6NWj3ANdgNExdZ/4ChMZfWb78vPyan4xAHPQlVW/uu+++9KMfYrye/Ns/A8BLNUNteA1jhLoZdGiwuyj2hTSozdmyKblIpaJPB1m7NS012fi5gXFl7fyoAuyupq91JtKxfbefkuK6r05upA1nKp3Plsv1N7XS2meYcjeZ7sUZJrjx6L0cq6ueB7Xjpu+ejhAJF8a1nPXvhbUvE6yErdKI56VY1TMTjxS79yVA/7m/AP3+K6/XDLX5BysSvvj4I2ly8fUVfuvdWJWixiioJdNvz7P/tfguzMxOZ7VhgIAChMWCBO+EQ83Z7Ke9cjrGqAYorO94DdDGmBVSm9xnKR3sGmIbagf2uVRbvO3WW9Mtt96SrrjiCpwViroAAEAASURBVGx2bYtFlSgnCVlGjxiz1m27GDK6xTDvTIyuF10A6nD4d2po+4fjcnGG8fvh4XVxhjH16lw9yid/I2ck65S8nkpP/PQJpL6eSX/3ta+lJ598Kh06dCjALAHBUJkkSsQV/InvZ44fbRN1z0muV/WcN+E27QAc+Q7YNoMasWdMdkORYcZlQa9J8n8LUnfvuJjFF8wVNNrz7LosgAm4hH1N4UQgOnZr5Nf+tIQ/Pq3BsbQI4HVobjE98epr6fAcu4K6OEdeBA1H0kTOAJdA1yCgmXOIbAoA0AzAT1KW9z7oQZlcrCntIeDlvCdLdwl2eZ/7Ss6l/q0pUFOgpsD5R4Ea8Dr/2qwucU2BmgJnkQKuhivhpcSKkzyn6BrSPc4uUucK8IrJpZNI5vdNtycH5Lrnnvema6+9BvBrEmbECafSZk7YOQzo0Z2Fdy9OpYQTWme1q7glJsOf+dZj6XtPvpKm5rHdQbgOqo0NJtIdbIUMDY0huaCRdbMyDQ+YrDYrxgJeMjbyJFtwAmhZYsxUnclnICkb4JcByi7yjbA5b++FvwTIMgHwl2mrwnsVK9SmB3Mjg2MOZeIeaj4D1pTJO8xrAxWSS3aPpTtvvCrdAui1A41NxDgqvi1TzjJlwE2pg5JvleFJJ1VYzFMGQ4ZCNZwHHngAtcb708w0NoOwfdblSE6Keya3hVmT6R5ExTVLXI1Fn7H+i2EMWjtDSBBALMsXTCnXxg3maMsFgDq8N2NIBAq02Uefm3xXao3tX5FiaaMVnuVmCwUIBq3EP4NzoV1Own52Flw3me7FWUh0c0l03/u+IoRf956L6rowveVspyhhs18JW6Uat1VkE6kuq6e5U61a3BJn1YfhuW6INR+u+aCb0ejykXT50e917zd6IdC1wO64ARAQye+Afhr41kh9US33fbL+AaoAPPiena0+urKs5GPylCMyCeL7dvEeVmOPCzdXXnlFuu2229Kdd96VrrvuGiS6dsW76djnd8Z2zeNjTt16qZ6phGi3H6zMuMrPvCxARfPyYnsbXoKCgiYeujwGK7UVgFd/eInUHVP7H5hQiWcahHILQrwsm8OFY52glpJa7vaolNeD33gwff2Bb6RnnnmK3R1PBI1cABD4CbDSsZy40k+j8l60kV6Kb3vOZtXfUrJVH67ryVeOvIzfYFweRqJuhHFyBGmsJt+KUeqwf2w8vePg/nQ5NiZHkeoa6iyyFKQkWwaxaCTU82lzwkqqttLGqjRiEuC5Y9PpWXZMPrKAFDhjuotTUTlbgEw7zhcE3JTu8ppx2rP9w74pLbOJBMIyB1GCy8W1+IZSZvt0/nZmtUb7XPRp86ldTYGaAjUFzlMK1IDXedpwdbFrCtQUOBsU6IQamPaPlFQR8HJyt4hBWIELAZJz4WJCqQQXE9Zhtn1/+9vfhv2u97Fj1kWxSh/TzgBSXKFl8svkvUz6nUmvay/G+W/mQk4p+iIT509+8/H08FPY62K1fJmJ8BIqFA0m0jImQxjG7VAu8w8EyHRgchqgXAOAXh0m4lnq6pSkT+thPEEkf00/zoJU1b0J+KTicLiugCvjWGe5luBcIlD1g58gHJN2J+7BtMWEXuYuB5FHCyCTib9qHY3lubRvopHuuvHqdMc1l7JjFvUFFDJ9o3jWJpj5C9AJ8pWSVZmuOAl42Y4ykgsaEibjH6LW+LnPfza98vJhwKgxoleFWRHzzG5K/WTczHsESYKxyraW5VV1ZxYJr3lUG12hF9iVfFYy+hJ+W3dKBWhLzt1Nt0fe86jCHjqHBuxLWc8moFBoGEQpGZzN87rNvu7DLZei++73JR+X3cpyVz2L94Wc8jn7l+scvIQt71M3dWP10ukluEq5q8xWeaLX+k9XC3DaGN2crjzy9TTYWujeb+RCYMt3R7CrMP7ueqox9QyCYXeRV0dgwJJIrxhXAvASLNhILpsNY6K8c5TL/HzvBCm0JzaGnag97K54x513AnTdmW655Za0Z+9uvmtDAB3EImqU0/J2+0DO33fJ8cPxa02Xs86Pu6Q3UR9kOuSH/QHzswx4ZcnSCNMfP0CvHLOUMJ8rP5Lw26TL6pzm1XNgVoxBnZDEfvQnjwF6fT1985sPhYStatxN7F0pGW0dy1FiC/Tw0P81XX9eawZa9UH+tgWABF2V8BpBtVGzBQJhw9B7ku/QZTt3pHdedknaO4LqPVK4Q0g7Ly/Oq2PKRwiaEc63zTq0kdRaAqzDKmT66SuvhTmC4/RPVe79tDj+m58y0H6jddEvbfn45wfnHEcATMDL59JBm3VLYUKB/AwmvfwrdCPM1mkR2dY/NQVqCtQU+LlToAa8fu5NUBegpkBNgZ8fBbCfBcMg4KXxXpl4GYmyA1dRWTnb5XPVVIBGdYPJyQmYlJvTXXfdGdJdYaelWgF3lVZbI1ldz9kok1QmojIAa7q+Ce7JYRYxPv8nDzwG4PUqOz8xSQbgWtSoOfkIeKkC0QkbJwA+MDQxTa4Ar4bG1wnX3Wb+5MRPc78S88lMQY7CdJo6hYsZtxBYBXbFPZNzywDvk3ksw3J0gSiv8eIQfJI+zOTjebFrQxWRYmO3RozIJwzV7xpeTnff/Pb0vhuvSNu0n4KaUjZ8n8GuLuAlQ3Ga6b6liU0GAEfnkDoYxVjx8y88nz7/uc9jaPlR8gREXFn5qOqZ/gRpSCTsq1B3Aa8JAC+lNaSBfXlubjbNzmDcmOuuZIfNCHN+JjuMWnZtvMiQjcHMKV1mvq8P7klTe25eUTXps7qrnqwdYPVotsim46yeVKFh7kCrhzljX/vmqm7NB6uG3qynbROue+Kim2W+jjBeFkJwLn4Gzt4rw4Z/KUyJl2NV+XUzqUKdfF8iV8FX3p56d0r0UzxOjYPPgakfpx3zr6z6bD1PQeKQpDIbOpo74CklOTc7hzQUkqCRfa8DZtrhGeHXS/lMnmVJHMc91Rodk7QtNsF364Ybbkh33nFH+vg/+JW0d89uvicYJ8QJ2ZedEGOMYEx0DAigo3qBuu2+XtGs6smCW4y95a8Xtfpe8ETnr98U1fMqr0yj7tO4qH6CqPm6R9pTQna7G2EMZjUc6pcBxg4ffi09+OA3UCf/UvrhD3+QjrEZS8eFmviGZuDLzWgcG7VbFjSpcl/tdFIxVguyhl8uVHyHKPAAQNcwc4yw6cX3fpiqDjEe78L/XZdflt6KXbVxpexcaLJ/8Z1yR2NrGMCUYBftNss35BgiXBqsfx11xlnq7cYqho0+oaQWfkwOgjjmH2WQUvHPTsaYLCgqjr7n9nMl/DThEON5ENh4pWolbrmvzzUFagrUFDg/KVADXudnu9WlrilQU+CsUMAdGlXLmgxVMEECV/hlcNyF61wBXjGjZFap9Nau3bvSvfd+IL373TcGcNIDcjKQ4oTdI7iFPP90qrp27ZkrB9O6SggBr09/5/n0rUdfRsILlQgm166iN1VrZPIMF8DZtGGXBpw9O/EmNcAupbyYgW8Z8Cr1klHqd6Uuskv+BdvExDuzTzl/ChP5W7SiDlnSi7RkECJOBrxidZ06WBdTaC3L6LGrIKBmozWfdo0sp/cCeN117aVpaPkETAjMoOFpE88BeFFXfTfiBmFeFpAA0cbMKHZbpqam0le+8pX0tb97AGYMfuOcAV7QCY5P5k3ASfB0ZESj1LK7nZDwEvBSYkWmSOr5f6aAV5GmK5ItI+Q9hpqOjORzO29O7ZE9K8i2ssVXPOKmerp+oL5IOWCPKet7dIaXGwIAzjCPcxY9mNVTU/edipeAR/3XpS8Uv27dSSf7+eYQynTjMnyraPlZSaMKULLhtjyPFCKdtX76Q64Is/kH3eijy8dQZfxu934zFzNI9hanbSxV5+J7ABjhfYDoEaAUMAML9sdc7eJfUjkbZxc5TFeJHCTP+NvNd+P2229Pv/Hrv5Fuv/MOFmz8RsSaRJRDEMhvmTupDqrOyLNuG3MtCC4g4tn3dk1nxZSIcvyvhhDXPvJbWGIpW8T4Gb7+GjAHjnxLsJNilX4Tj1cm2I3R61Q9rxIejEfNxdiPQLBHCdufsJvjF7/0xfTNb32bnYdfCdDfersZzZKAF38jw+zRGwPzSWl6azlOqd8q4db0klY9hDBAKxathkeHWVwbSaOoOTah6SiFv5Q2fMfBg+mggBjfjhGiKs0tyUOymDG7xeLWHB5HFpdCjfE5bIseX2RRzm+xBeXbN0D7diCAixjxHbdsppF/8g2/oyxMuIDW5LBHCHgptaiqbvTtaCx/eq77Kkd6Pf/6qqZATYGaAucTBWrA63xqrbqsNQVqCpxlCrDqieFtAS8BAYGDRdQK5gAvZBbOFeDllDLb2WiwRfz+9Mu//DF21Hp7hlcGmFk6lXUuS5lUN1GtITMHTFKZ/KrCt6YjXsWanhJkCdDnUw8+kx76++fTPIzTwNhEgDquKrcWFtMy9R5RQgCgqC3gRSGcVGcJKxgYC9WdAZ+S/PoeYexeEC3m4ieFlSK6XvoxmfdeF4AXdIA0AXjJXLm0z2OpZaqeY7IPAxClDrDLVHjSGco8iJzE4kzaPd5O995+Q7rruktSY+FoGobmGUjLgJfXFfRFqpFNnNf6cfV+ZmYm2kZJK1VhH3zowfT5z/8Ndrzm8S/1WyuFrfnbFP1Mq5svyNRkwCsFs2e5lGzIUoL0KRioMO4c4gBbyzfs/lDnnA79iDR9h0Zh3BbZ0fOVg/eekrDts7qrnqwdYJVoObDNeTZdPyBwNtP9maW1xrsZ40HVBfuvy7tc6p3PBCSdnFTv7LvWixtXuVrdPHMGVTaRRhVgzep3w64WYs2Haz7opnIVqozNTaoylsizvC/W1fdqkTHR3U7d+EGQN5zZc2QKOBYbNoNHQTcfnnVHPoAoHn4PLr/8LeljH/tY+q3f+s10ySUX8363AFOU0s3O18J3w++XAJ27BpZnmy6aCVlJJbV0JIS5xxhvq9vwjgUDfPMrWYExETyP5BGo+3NSaXKk7tP+Cx8tY7jd72VzsIqHp7sZNocE1XJdzdiuuAgYdOTokfQ3X7wvffazn01PPflkmqUNh5FmblOXZYClLOmW40aFIhUTqi766lcebfycpfEcb6W6SQp6DaG66A6ZI6owUu4B5hcTAFXXXnpZumrv/gC8tvEdVpouJMCJ2eH5Et+mE4R9DQlDJbtepy4z1F17nAKPvrOhrg4Y25ZOzhUqMkWrG0YP/odJPzbCqQAv+7QLe4JebfqQfSVcDm7iQdPwoyKFPDlQ/VtToKZATYHzhwI14HX+tFVd0poCNQXOMgWc4AXghSqYjISrnNPT07H1vPP8c+WcpDqpdRJ/083vTu99793YXdmFlM5Q+IWxeldtKUTwG5SF4NU9Umljo1sqmoDXpx98On07JLxgoDDuq7pfE2ZA1ChPd2He4AUw2RWrx6owhmqKnjHl3SphzCAzjStZoJyrTIGu1NmKm1NM1i0ZoJGr9CGphDpdp70U4UPNEmYMHiAm6AJVPVCMSTzMGuwFITRijKQTypw7hxfTh++8Md3ytgNppD3DU9TzyK/UvwBe7ixpnQXa1nKxuQAMhNIFAj466/DEE0+kT33qM9iUeYm+lSUotJnis3Ywr6ocCWbmeq+V/lr+MnfRYkT30rTdpXEbGzConrtMX9YW3ZzSipyVXgwmrGJiKMaWXTBGxA8pEejju6OUyJDSA9R1ZnRPOnHgzhXpnza7TRcop7jpaCtKtf5NAYLWD/UmfZo7SLdwhenVo3dNz4n/6lzi2EfygxzaDlY9K/5xNjFdiZdjneSXbyOjcmmUvusVl5t/sCL6JezKOLHOrowmb8/xPYxqMe54Lai1gDSXqoJK4vheKqk5MzMVkjOlwN2qrsj1bNxQHhPn8Nuw8pr0GYQGAZavu/a69Nu/8zsAXr+MdDKqeTzCuxRvzYKsSdY1Y1QPlO4CDEHeOL4L7F0SQEuJ5vpMrNHgEYJNVoHNeC2XI7ijWy9vv2mZ9saPXlaGPxulF9DHW3JlPJiZmU/f+vZ30yc++efpO5ynp1VxpDy09yhSsAKZSvy2kIqyzZV60th9jM8AQRZnq670EelSvh2ueSi1Zd9yV+ZBrpsQbAd2tS7btTtdumcfksfjUNmvldsMtNJcazGdWJhLbzAneR1V26klxnS+SdrebPV9NyRbfL/IJL7V0Y8yna2PhxXSdEOTb6gLFC7KWG+lu/yGGaaUe6v1ruPVFKgpUFPgzUqBGvB6s7ZMXa6aAjUFzjkFVAWYmNgGgDTGJPBnC3g5Ax1BSuZWto6/E5WUXbt2MOlmqsusc1BD9QEAOVmtyBBSQhkE02bUVpyA118+9GQP8GJ3xmUm/M1BgJpQWyRVJuJiW3EwqdZGSAMuJ2yxhDEXWZmtOJk4GQnqwFGcU3Sr2AUXnKDr0z8B51rmQftiHQzsCmLFrmMaJuZgn8K0TIGpSahcRoqEkW3IgJeMDncwboSEyQDwuuvd6darBLxmM+BFbCXZbJcu4EV6+b40Qil17yyzINjjSrlqhYJA1uX5559Pf/VXn0+PPfpkrPBHypGMgJeVUYIvWJVeYlu4KqvyMizDME/bYabCHp2AFyv3SjcIeCm9aLnyQfZrV+m0pQgVGrpBUYuSgRKklWmUBtqKeWH4LWlxx1XdtE6b3ZYKlFPdUtRuyda/6PbL9YO9OZ+exMH6rvmv69Ur+5VnXX/7SoTnN+KsDGdCVVKm1ku3+J6UdzdA5H7yXeXpqZdon+e6D7rhts8/nw5O/bR7v+aFHcb6kZeXGu6W8VeqV5td9mXtAU5PTaPOOBvvapTL7rZm+dbMbUMPLIvvsn8xAvK+ClJbQL8F27aNx7fi137tH2Lz8Va+F9sZA3tJn0Lu7qNc6C0X2+gsikS9/S6QUEgWVV4Nxr8cQEJyqH4v4uW3gydl45cyTuWEeICLOq8oWIbJ8lN/+yrY81zjytx6bglwaG5+Kf3kJ4+mz3zm07Fz7tGjx2JhYJF2FtB0nNRcgJJwIQ1HdOcB0lu7Vlt1ZUEgNkKhWHxSg25eDAN4TTJGx+cd2mFMIO3CrMJu5iGTLDxNAMZJkkW+c/Ps2jjDMUf/nKVfLpFOiw1mOu7aGKGkpt+tfPaXGuRTKTz9h8fRhyeRwh1g7uDCh4t7fh+kheN4BFjRFiWB+lxToKZATYHznwI14HX+t2Fdg5oCNQW2SAFVAQS8xpCYcpKrwXolvDT2rZMZOhcuMyeNtJOJ79333A0D8560DftLzENjtdXJcGZ+zF3GLE9kizRQ4CRbKJi7NP7FNwG8Hn8xzS8iycUEe5mt3wW8Gi3AtmriLMjVBbwolGBXD/DKUlqbz95JNQd1kazB2LkiTdUymQWa8IfomT5O5HMczw0YgKW5mbQ0PxP+7kI2NDqBUeAxmADqodqijAAr4JGD6QTgRXlRz5S2qm1kwGspfQTA65YrD2BLZZbaCYyROeWRTTM+bCalleGStcgl5OYUVwAv+46STqr7uYr+xhtvpC996b+wc9jDmemjctY5XPeafNZO+pS8TvWgrME5UfSQ8BquJLyUVGj3AV55Fd/87UtB8zPItx/wEhgwXevuOySIu23bdnb+aqcX978ftRykByu3oSy3SJCQYigZneVz7o8mWrXfWU7/nCbXK3y0U6mCbVauqxcu+kbU0jgRL/eV6LlR9exfLsO/W3ifRexusiXdHCQe9ofuXsfFysd9z9Z80BcGaKS9kK468sBpB+3ST+yrutilDnAjDJrTZ0PtrQIDNFTf4lm8YxRDyatz53iXGaQsn7svxvjPvVKggtgf/OD708c//rF02223IUmKtBUvk1XwnYrrVcnUe+OivbdSeKss4GVS5BH2uzgPNGa5xd5Zh29ley7KEOHak6kxtJsAqMsTl6G56hecdVWRSsly98zjvGNt7zCwkTcCepXUjJOdo7jCaeb3zLPPpk9+8i/SV7785TBur122WABgjB/AKLyuAF6C9vYN7R5uydlPqJTNMUABVkp5IaXHd2uMb/0gtrziNSPMEO08zmLFCACcOynqv4wU8xLHMlJgLhOhOA4dGWPdeMWPM/d+s/Luwo7B1IGI7cjbO1w5VX6qVAroWToBr4UlJRoBvBzDq7A5Yv1bU6CmQE2BC4sCNeB1YbVnXZuaAjUFNkGBQbZ3V6VxdATAhxmf4IWr+qqBOf/bIu+9gRI4HW+kgwcPpA/e+8F0/fXXpdGxDFLI7AhWZIaHUEy+meZSvnyY+Lq7NK6Tu4DXJ771RPrO4y9htB4gSAkv5vXuJNgDvPJ8OgNeRWLKSbKMh2DXVgEv65xXm3Pty2yc/CxzACfCTEzinckz0W9waK+sifpie+54as1NA3pNw6wAXNF2w+Pb09DEjtQemsSmyShqmEh7IcVWpRjxLW9DroOEu4DX0FL68N1IeBXAy7xpbNskr8pnwKuoNGYmzEKe6mQWNASsk1ldhIEYomwai3/gGw+lL37xy6hK5d3dZKTsU6VtDS9QtTVHXKtVoZ9huD7Apm3Yq6Evkagr+HOowiwgfSaDIwfUleDZWqYR62TAS8+gHWUR+BrnndKW2UIaSodOsud12tpaqS26AmZsMfq60XoM4XnIGfYKH+3ETzjbLF/nc7nv9hHirfTrhc9JxtOKbr1nenCXXTfvrk/4r7zD6xSPKv7aD0qAOF959IE0uDy/wm+1m/K+KU0b7yt2upTOLBsx+B65AUWoAvP+6ByDrWnXVtdqCZ+xH/0eWvmeKnGj1Kj57tu7L911913pd3/3d9Lb334l3yqlkhiRwIb6SXsq+cp75Llqx62U0egOHSU50zCzgdc4Xk+Lr/8kzR1/nnIvc7B5xfhb09jO61Jj9OockOG4M1BExCyHI/zJrh/o6s9MFfHVwpf4pVDlrH++btGOLfTy3anS1F968aX0ub/6bPrc5/46vfTyK0Fn1RlL+kqixeYw1M2+IDC0JUf8Anh1Aam+4jWQKm+6ycfEWBriHD2L58N8Q0Y0LRAOD6rdwe6lAKP0js8EH+XmgIAXdOQ60u8uyCA5TIcQ9CpJ+B77zfF7o1SXY3KAtyQv0CvgpU0zv3YlWo5c/9YUqClQU+DCokANeF1Y7VnXpqZATYFNUEBj4xOoEwyza5MTZVd1Z5DwmofhcbJ4Brz3+qUgYdO/4q1vTR/56IfTlVddAYOTbUwtI8kkiBFABpPVmBBXYJdxnP06id+KC8Dr20+kbwF4zWu8C8CL7ABslPBiEq1ao9NfJ9vk0SH/bMPLyb8lgXUA4NmaE1CSyrkOpqF6jJP2uIbJMP0mHgF4aaOLowMA2FyeS+3jhzD0O5tai3O0U1ZJGRwD8Nq+OzXGdqWloW3YNqE+IVKQ05RTU04r8oHR6Ko0Di0i4XVTT8ILYC1W4om2WcBLZkGmQmZJRskVc8E4JUa+//2/Dzte01PZELZG3mWos+oqJYNrLQx4KfHGzwJe9iPaBTqaVr8NL8ukmpbA23wY3c7tZgufqZOB8uVQGiZAJs7hKIh9VFteo+za6I6VJxrb0tEDd3WzrEJ271e/INTGAq4SPUcsRVolwFnzyu/jWUvu3CZkJ6lc9IG4rXpDdW3XKM+ibhHHNjVi79wfrorRTdlnK/y6+caDKpwhTnKn9zgpQu/20uMPp/HFoz2Pda4KKJrfRaQgeUeWAL1adBiL4Ddgfg7AC2lSpX7CZqB1iPLR3wN5WCeDLT6Kd4q4Al7xDgGG7Nm9J9393nvSb//2b6drrrka6R9GNLp3sdnlYoXjz1Ax5t7Nu7w85WyrnkLgbuj1LxbJhPGrDRjTYkMTk+z47XgO6c1n08KLX0tHXvtJ2D8bQEFv547r0/aD96TG+O3QbJJvCJtmDOZNM9x8hdGBQxDL8pQjEuXeMaocXCrhFYO316u5Eq/U0zDZT8BLVXfvHfcdn1977XXUGz+bPvPpz6RXXjmUFydQiffbpmRuAbzsE2URwxQ35aiSgJeufFNcTCnO2gl6jaFeOI7qt7tr+lhJvhEWKvj4Rfv7YRTw0u5XUMk0NazpNzrALr/HPjNFz9STMIJeeUwmKb4BLkDEQfpRJ8duaGMdPZRM1uWxrFfO8Kx/agrUFKgpcIFQoAa8LpCGrKtRU6CmwOYpoAHZcQEvVladJAqkuKudK/xOAPvmqZtPfN0YGiBusjPjNRgf/qV08UUHmZ2ymgto0UaNIbYOZ1Lcc5lBKExLkerpPd/YlYDXJ5Hw+rYSXuxmhX4FzEAf4BXzXX6cV3ME4MWkWQ+ZlACnzpgoMX2PAjtNd6IezlV1Ju/a+RoAgErtxdRhBbqFlEVzaToNHHsxDS3P0ibunumqNHGHUQMd35ka2/amzsTetNRUvZFdCk0wyAfzGJJjMFpM+F3VVqVxZyXhVVQaUWYlT/I2GvUD5qMk/lr3zEyY5KquaiaZimwLBsP4qDRaxsceezJ94hOfSkePYDuGdGVqLUOozcicwHgUBnzVtNfxlNEN49a0j0Ww77iCPxlG6/NuXDJx7joXgFcl4bVOkpt4VLVZ5Fyuc3TvLI80GJsYT+PsGvna0IE0vfuGCLAydI6z6u8Z9bOcyxklsWqhTvXMjOKp/m9KH/pccTGWcFvO0WrxGB/9S1jO/WFW+pNaPO+lGo2fY2TPkk5+EH69UpR4nE/xPMWjL3Dvct/042nX3As9j9Ncmaq9w3dHIGSJMV8pFyU1fR/dpVfAyx0awZKDDuUd9f0914CXZWqy+HFg/8F0zz33pF/71V9P115/TZoYy/SgiCwKUAGO0r/FMHquvGHl7JOqDXuBNnEF2JWOkxmLHssAUKovogae0nN8FpDsevm7aero02H/TCng8W1XpdEDN6c0cSP026/oEvR2waQcglBe57Nx1nVWY0X9SuhSP8/l8Fn2d9R2DI++i+8yu5r4DXvhhRfTl7/8lVBxVOpLf215LdEHlH5yYxTnASV1U9yUs13s8/6TSBS9L7HoS3gOI1U+wa66SuOameV0w49RxnC/7yoxxhgP6OV9BgupE5/GDHiZshEz4CUwZiruCKwkoi7qw+JD2Z0xv7v24Qz09iQboZPf+9KhInb9U1OgpkBNgQuHAjXgdeG0ZV2TmgI1BTZJASVQxllpVX3ESaCGameQiFlEIqbYU9lkkhsK7nxYWx3XX399+mXssrhDo6p7wixOYvME1wmoyQmKeE0kz/ioMud0d7NOwOtT2vB6DAmvxSzhBX/FRBtVB7KOObP5wYO0m5QGBiBP3mUcAI3IXCmwrTvj9o4AraJGJAzQJ+A10OAckl2AXexQpURXc+F4GjnxQhpZhvlyMh9JNJAcGE2LgFxpcl8a2oeRdMCupeZ4lFk6KeEl69BsowaEZIFqN2HDCwmvD9+NhNdV+6tdGg1XMQkQ23K04QAyw8T9OoyATIRgkyCWfchrV9YFm55++jkYq8+kw68d7jITqqzG7ozSNho2CrrpH+OG6mswV7kM9il3ABsCyNRGjExcAF6o6GYD2CUbqbP1dswMlUwYx0puO+okHXymys54SHqNphdHr0wL269ckWtuo1Km1c6EOH2g1SLilyOu03RrxDtzb5tkpTvFY+Xjn9VdFCOXRQa7NEbvOvuV+8IgR9CoFE9KGhG0pBExqlqc5NclRkQsWfZqnL1796eG6Hu28nL7/IsYqX9spedp7gJMoFMIcimFqRq7UlWC1Up3ZRVgbDyp4qYoFU4QSlpkVd4td8h1SyaZlJiUHHv37cNm14fSP/z1X0/XvOMdSCAz+oIPCXR1+zPXhu2SN1IvZSvnkqXtY+gtuA5g1+IhxjYWIKBXe+koUsFH02DrBb4Fh9Lc60+gan4kDQUKx5g2vCuNbrsE4a63oGp+MC1PMC4j5SmYg1IdY+MoOxRqmB2gJ0y2U7H+4np9clFPvo9qlEie+494GJJwsVAjkmMIvp/Sd37WnWsX0h/94R+n+750H2P00yww5d0aTaaJxJXg55bBH8rqN3MtwbQYtxkfBxmjJ9gdenR0nOrmb8EgEnCjAGCxAQj0VBJMPNDaxeIIaGcBvsxAkKtIgYUkGH5+nx1/dQ36r2CeG4n4fQoHDezbIeGFKm+M1XyLasArk6f+rSlQU+DCpEANeF2Y7VrXqqZATYHTUYC5pEZcteGlNIqcxALSREp4uVtXl7E4XTpbeC6TMjY6mm5+z83pIx/+UNrJDo3ZOaGV8XHC7aQ1g13xjFkvd3EZq8I5wqZ+F7Fv9alvPZm+9ag2vMgLg+9tVBkFYOD4ggaiWqoztgUymAUHCxZcFZNpngkgddR5ZJJOwHyOUlhA0gAmMkx2slmEqRiAYAIgbIBmBvEgm1ChhPEcQLprCAkuVRgxDJPasxzzU2kAya7B+RNpkGeWwfTaSFQtNUfTwiAA1+T+NLzn8pDwWgb0yvmTD6o3IeHVoX0B+2R6MEecdgwupI9iw+s9b92ZJhJG61XRsTgwHDqlvKKm5GNa/SopEaDvR0Y4QC6Yiy6ARZ1kkl986VD69F9+FqPJz8BYZJrIVKs6IyjWDd+X3sYvbQfKVjF0lkEgdBKpASW9lDjTbwYbXrOzM8HUW9bIk3O3iTaeYTdkztdb6HMS4EUGka9tpN2YIdWGec8agMov7bg5tUf3dtPxIlNlhdfKG9LbustxzyiJLWYuiVe6UzxWPv5Z3EUReuWwd/sf7Vie9d1nwMvHhjwpbFQQ3xK+W/6+cJF0BIg84rYbrrooj7v+p3h0n/RfjLaOpsuPPNzvtaFr1cHtFQuAHtq48x2xni52LLCbaRiq5x3Vhb0jQreRArL63Xc2nm72p/Rjz7mO5iv98jjAu0zZdu7cFZJd//gf/3Z617uu5z3O+Yh9OEznqJQpOrXvWE5r9dKYF2Om0lQxVnPv+Bkujx8dFxpC985dCbGB1pliGEc9dPEYUQW7jqSFqUPQKRv2b6lezsJDY/lEGmixALE4lUaw0TVIAR3iFtpItwJqdQaxq9hkU5HJvaFm7ng0PDSGBNMkAMwuBLw89jAu7CPPST4b26ggpgX85kgTSuNZFy1mffnPNMttGGEiRL7S1yj2VUdwr/JBVG498jPk0559If3VZz+X/gr1xsOvYY+MZ8uVel8kGeNqVYDw2OBPlaW5r+Zsa0EmvwGj7Mg4DuilRLfl8q/JN2hYkApbbYNKx9FeAlQuWFh+x9SoU7R7VCjCENWJQ9SjVF2aDwE0Cni5O2OrSDJW4K59Pr5LVT9crby1X02BmgI1BS4ECtSA14XQinUdagrUFNg8BZggusIq4CVo4Mr/LLszTk0x4WdmqepZ2PTYfMobiNFG8mU03XnnHRgkvpst5nfFpLcNYOQ8ViYsQAVnrtw7EY5/T3FZTXo3kFN/EAGvv/z20+mhn7yYZpeYXI/DZMAIyQN1UOURrFK6K9gGwZ9AomRAcjngcOBHWOWHqemwK2KjoTqGk3VjwBR2UAMSPArgSz9VCV1ZBnwhubbxmZQ32RnSs1JlbRilltycdUciS7XFQcCuxtRraWD69dRYPBGAFK0R7STgFcZ5YRhao9tSG/tdAl7tyQOkP0oKSBEIupFeE6mEAcrjbovu3pgAyLQ/sx3A65fee0N6zyVjaUdjDjkDVViAwqCPZzmtzFJJduoeRz8lN3Z9+LWj6XOf/ev0gx/8IDOo0hkgM/c321Cmc2NprRYq+oIMvOnKRAG6jSFRJRMlI2w+gl1T01PRp2I7evIPxl3m6Jy4ipEmecun8echpBbcvRFrzenQRffGuWR9+lKcFOKk25LO6c4BKpwu0Hn8XFpn170oHivP8TiHKeOKAXrXPIv/6hwJr7zOea0MV6WQ86oKE2lG4oQ10e5vXOaf7L2eR9+zfNlknLnyyDcYPwTYN+eKhNcC0qOqLrq44HuhetcM78q5W+yg45pXRQdkQSNfQYlQ0ebZrl070x133JEEu266+SYWRRyPAGJYnBgcEtzihkUBJVd7aoJr1N+IjtsA+g1tYTFmx33EFw6qFjgAPRoCXe1phsZXAbCeT535pzDb9UJamHs1tRemAbc03i/Ixi+DTU6acQyPEYYxh+/iGNoBZ8DKOLPcwJDLt6L683uqNFWzyU6OAzvT8OjlqKO/DeDrUsSWL0uNkT1cbw/p2mXS5GvEHyM/Yzka/4zifgP43rBYwC1PLFU+LAIjvKM34fmJMhmqOD3CMyLYdV58+SUkvf4ofe7zn08nTpwIf0Ev1d/zok4VviRxVs7UyQGbd0T1yVHmAaOofXutE9BzvBxGWldbj0XtXf+wO0fc/Ho5vkeM6kzxbRsOx/egddCbXScBu/RTerFIrwl0eV3SL3l7rl1NgZoCNQUuNArUgNeF1qJ1fWoK1BTYGAWYLP68AS9333rve9/LtvPbmZAiZcAKbEeghsmp6ggBtlDOwoyGhBWzXKa+1HHzk3EBr08DeD344xfSDBxJk10OOxjrkkFoL6HGKfuAAWShKgrADJp8PGCcQmWCs6CUDI1XA+yKKKBlaeSGsjSV3IaMCr+UVaP3WS1SH4Eow3Gp8xzVUG0QDoQyDMwhWTBzJDVVk0F6YLA1yzPZQyS6AKJkctqsWidUQTrjSAlM7Mae8s7UGqEu7GCloeKwxyVzCbgVOz1SF+N3AFwE5HZgw+tjAF43C3jBEA5WgFerAF4Wi7JlClvIUmAuN+Fef+MYu4L9Dcbrvx+AVKQEnWxrGZhIdWtJRylkeMKuEGm8qQAvSyfzxcm+rASl0meDSHklpDxeufgjFW03QtmTCHTSbRBigz/BaG4w7PkYzP6QXfeieKw89wLSDnYi//M5AlbP7aPxJE6GKGG4Kmlw9rFcd5yra09VqvHM6+wTp95PN1LxOsWjPOierzrytdRsYUx9C85iq9qsNG/sUEc/FeRwoxJtN2bwaQsJnzZKvKSAQ4AYjE0ZmHAMBWhncWV8fDTdeutt6bd+67fS7bffFpKafAJ4v3PCQe4YOPO40f8aSLHumFqVI0tJCYwhMauEVxhlrCCiAL00Ro9twaXXUUl8AZOJr6Sl2ZdTa/bV1JpHwosNQgaUqHXE5ayLcbxKXzVvRlRTpk7WLf4ZZ4XjjBVLIPEdy1F6JRZMarGy0hlAuml0N3unHEwjk5en5uSljOsXI3nMuI4aZCftTAst1O0Zs8FsGEtMidr6TfKMs579sJZ+QQ9iVyOsXrjsm6+JAzK3RD948qdPpf/wH/9D+ru/+1pId7vYNMD3ZTl2cMx5lDhn4xztSEK2v8Cd0lejSHuH2iEAleUUFMxqiN4bNk5dYCvfrf5rfxJEbfJd9uy3pkRcwFSDQJd5Rx8M0Cvfm1r3nV496dq3pkBNgZoC5y0FasDrvG26uuA1BWoKnBEFmAf+PAGvCQx6v+9996S7kfBSykx4QBUbGS5VHGJbevycpxdG88wBr0EAr2cAvJ5P04tAQGMwFbHrE5mwY5NcU2MIgCoyzYCXBnIFu7QV4tw5wDHt3gBQ6eckGciMPybZwf4I1ClRBTRG4DZxXakXDGsywTbp2AHSMw0oONWE4Wwuk//cdGpNo14i4LWMqkx7HhXHhQjTZmV/EaZtUfBqZBuqMhirn9yDityO1BpENRPprZDOgkPMoJrgGoe5E7cNZ9QBoFOlcefQcvrl97073XTxaNom4AVDZ9yWao+cdfJwFBFnKT027944cjx94Qv3pYe/+13aVckMUpLRsYzWf2vJdgtiGm8+wIviRd2oXFVBpbxUm/U8Ps7GArTVKxd9qFuPjV2cRKyTbjeWRi+U7XAhu9Myr3YeXBlbVl7bsXrPumkRJ197zjFWhPMmXI5fpcCp51+uqoCRTzdO13PtiyuPPAAIrjTq1pzA8BISSy4u6OwH80j2ziLtpX09n5+bruGo6jgIIOR4B3rjOK9amefrrr02/ZPf+yd8E96f9uxxIQLSMBT1SJfBKiVro3wSsiJmjFj9qA/+ncYSI5/LEyo0Cv4zXi/pw8MmAFbrGGPt42n6+E/SIhJdCXtcHWxztbVfyYYmQ4y1QNRqgjNuMnZREN8Yxxv7gCNlk4I4xiImFPXyeewSaFiAF8dSyxrql15QBr9hPCKhkN3KwFgDydvmdiS+LmKji7ekwW2XA3y9hbyvI40dpEVwbEo2sO+YpYcBzsPQJOnoIj3z5iCGMF8Acflp9SuxPCpnufKQnB5++Pvp3/2//y5973vfC/DRz5S2LVeEL/HO8JzpZx+AbtBEcEtboiNIeWmqwPYecIEg7DBC/6rIks9r28+5gk6/fM4Xgl0xdyC+OwULqAXZ/V7TRothqsF8jVuBXtW16XTf80i1/qkpUFOgpsCFQ4Ea8Lpw2rKuSU2BmgKboQCTx58X4OWkfwfGxT/wwQ+g1nhn2FzKE1IAL1b7nayeK8Drs995Jn3jx8+lqXmYj1G2jYexCYkxAK8GAFUDY+dKZQVDASfRECiivAF4QV/VKgbaCzBHGEJfmEENhl0UkZxqDo0Sl/QwgN/mcP1f5gfrI0yuWe+XyXNerq0XdWBMk6dNVIkGSWMAsCvNnGATsCNhF2ZQsAvphEFsx4SKJ9JbixytoQmM1O8G7ML2y9jOsNulumInVsfNQCaMo68vCDAx36c8gnLLafdIK/2DD7wn3XAR9qXaM5RLFolyIeElS8FNuJxGTrMvuQ1fHjl6It1331fTt7/17TBiXxIujEUGXfpLuuGkc/mI+mYDvIJB48e6hTRBUNZyCvKhXIVEg7bzFtlc4NWLPriJCleNUmKcdFu8N3PO9N9MjPMrbOlnq5Y6Gio/CRCk6oa9OHYu//0R5CCs5+zpTdeve52fVolGBENHvMoz3+eb4lXdRcj+J6dcX3H0G6g8Y9/vDFwLgGke9e0OEjy+Oxqsn56ZBvTCNpV9lqO8/2eQzSpRGRGDfixsMNaGXSXGrCWu3/rWt6Tf+I3fTL/5m7+R9uxGugknvWNIKykJ9uA6qJBH1+8jl3gPQ2nPKcEF4NVxow5GvGaoLLqzIur6y8cx1fVCWpp+FrDr6bQw8zLjOWrjhGGrjVAT7W5gQppKGmtLKhfIk+pyfjGyhFdrgfFZdEi64dzopAGw3SgiWY6tShIhUdxyp8SQnCKuheZo8R1YAqlaBsBqYH9xCGnd0bHdaWj0QGpsv4Ux/jq+U9i4FBTroJrZIlIW9Yr8uj/Sg0MyqMQO3GPyfa6PYPhGM1PkJTZvsd2/+uWvhqTX448/Rvv4PVC6amWcvsS2fGmf8xsq6KldLiVgh7G5OAbgpaRXLIbQ8ErEan9rALVG38kYTymvcf1yhuNUXcXzQWjujoyCXqoxGs9vp5KMLWy1LVftFPGNS7374/fe/S1Xr45YU6CmQE2BNyUFasDrTdksdaFqCtQUOOcUYC778wK8mOMGY/PBez+Ybr/tdhgbABlWfJ2UtlmN9d5Jq1Nb59yFyTxTCa8llus//zCA14+eSyfmYaCGJ8mPCXVwHjA7lKvBBDvUEMM2FzmvALxizR6ACuYJ1cPWzFHsvcwwucYoLsaIO6gXtoaxqwUoJfAF5wOzgzQBtrQEvMyp0wW8yJ/t35vzs2logfSmjgB6YUcFg8gDgF1NpK4EoozXgmHqjIyn5aGsxtjYhs2uif1Idk2Ewo4Mi5N1pbfCskuQTepZIRlz6ZtBLXdp3DvWSb/6wVvSuy7CfkprmvyMR5gQZ8g9T1ZHECzaoMsW5Gcb/T12fDp95St/lx566CF2/gQkJGKwUJRJjisDLuGz0SRXhDOZNyvgVepHNXGZsbKmYVsG1UZBL9vzsDa9tuQiYZM+Q5cTyOU8w6TeZNFPy8DagcL5jnSvSieNs29A/HcDGNbAJU71vITzHC77RzjvS5z8sPdbgnfj9R71X7316INp2HHnDN0iYJfvYpSHpl/g3o0dliq/cwp4VWCHkmShakZdtqHO/ksf/Uj6vd/7r9I111zdrV1IHwEGuTOk71IjUCgeqwroqUu3wI36AC9RKgEvxzRtLCqpy7jafi11Fl5gnH0ynTj2aJoF8NLw/HCDBQuktELSljaKP8oZCxLmAXg1NMQiRrSvYA2PIhyl4H8ZybjWIuCahdIRfgCATPVlBGoJonKjARmL86cgG08HVLKcrJUE4IQyf84DVbwGETvs5JjGrk3D225MI7uuTo2xy6koNr7aSoORT9SfNEw7VBwd67nkQJ4pvjV+b9Zylteni0iz+X3QzuGn/uIv0p/+2Z+ml9hsRFX92Bl5rQS26B+0o6j5e2/5tdmVx0PHRFURtSk3wPd/GH8Xv5TcErjS3paAV65Wef8sSL4O6S6/xYKOhHPUFYxc4jsbABvfwHBVW1Wn7Ff/1hSoKVBT4AKmQA14XcCNW1etpkBNgXUowLzx5wZ4wcTs3bOLrec/mG655RYm1kxMmdAG4ES5tPNyLmx4CXh94fvPpwd/9Gw6PgeTMjzOxNvJMRwEk2HBE5mJALy4EOzKgJdqgaxGA14NLCMJoI0XwK4GxuWb2N3qMElvwxQ1dhxIS9rTckVe0At/uBkO2JlSPyb7MlMDGkJezAbqB+cwqo4a48Ai4BNckcBVGHeHdxugDC0VaCZQXcRIfWNib+pgqH55mPuBkXgmi0MmEU97LwJVVIqznBHMA9fa7aEQpLSUDiAk9msfujVdd3AsjSxhlBnuUnCs7NLITeVIJ1LrepQHGzofPzGT/vZvH0gPPPBA2AcKJis4RotCmsElmsfWXPA+pGcybxobXpI+c2RUKgNdGUQQ4LOeULqSapgYH9+CpFehVdUm1an4bu2cE8nl21oKb8ZYGZhap2R2oMpFm5W2K97xPDPThan2vSphs19E6vrFs0gz+3d7Q0mrZFjOJa9unykPeuezIdlVUpufn0Oqh80sWFQQeJoF7ArpLsanGDPiZSqhz+ZZsML3FJBHAIOxSIPlt7znlvS7v/O76dbbbw3pxyGADu2Xt5CEahHWe10AXjEwCewEhBT+1RsG9TI8H+BPdGTqkwT2FgG6nkjp+I9T6/gz6fjx55AqO8w4OI25RsrCuOk6gYbas9oxgNMwCuocCUP5AZywKKKLcZVXxbeFGoTR+sVZVEED8NIXQAzJokF2GBwaBclCWniRcX6Qig+4mECsGKoXGK+RrOKjhx8SSNTT3WuXqHOoL8YYqc3GSRZS9qeJHVel4R3v4IP9Dsp2CcnwfUF6LTvz9dDZmbiOPpXLHN5r/Cyh4jlIP4gUyPvZZ59Nf/hHf5j+y1fuT29gf/FcAF69ouRvvnkPAhKOIN2llJcG60OKTj+kYUMSkDIKWAmShaQscTJwlqXtQiqMOg+5IQD9xfHW74Hhpa1mEgpgVg3CuRjxTvZKVF/VFKgpUFPgQqVADXhdqC1b16umQE2B9SnABPHnBngxF99TAV7uxuVkVgBENYYmDIOr/zGhrSbvhcE8GxJe9z2SAa8jAl5I2LRCwgtwKwApgCH5hGCoVgJersYr2SXI1Z46nAYAvIZbc+z/xeoxHMaCKim7LkrLglGjqOWMYodGu1oAVk6+gxEhbXIIezKDgF0DAF0Ds0fS4PwxVBmPYbcLP/UembCrfSGE1USVpU0529t3A3TtJF2ALqTIlvRXBVHD+doSQyIsTCWrQhPlp4GVMIOlU5WojY2wDhP/YRjAi7Y10q/dexuA13gaXJohIwEzwhBeXkmVSJk7pQXKPd6bdgJeX/vag+mBr389zaEyRbIBKspntCvVnpzDppOOCKbzZpPwsmCWK+oVZ5sTelp5D1xIINDHlWYYZvfGzvBEOnzJR+LZ5n9ymsG1bj7ymjHsAeGq05oB38wPaIiqCdYuZW4swtmZcrDedfYr9xlAq/wiHk8iTr+fyYRn1RGquyq8OVRPS2b5vNK38kvsxnhmNru6CVUXc3N5J0aBGY3UT09PBwBWVaTqpyfHOhv3jijtsBemJI9j/MGDF6V/+k//afqVX/mV2MVUEG54eAigg3ENIsV4QdaZxnbEahy1OK6O4NzOI3ZcjFEYqSpsfGX8H3GqBurhzddT59A30uJL30oLC0cY71FfbC6ARTlq08sZh5qOoRzNQaRyAVzcehEBX74F5Ee2A3ybLItDVrzG3LsZiIbrl+exhxbgFX5+t6DrMGDXEHap0kgzzfLc8jsGI6sUCxixCKIAmqA/oEwbNX43DlhmDG+RrgsiZqw0aIvdJVvu6Ihtr8k9N6W083pAr8sJw7egoeo8J46gjYXTxcAdH5t8v8av5seMAf4YF3OU9aEHH0p//Kd/lr7x4LejrhFgjfhb8Y5xkEQDSKS83pcFgNERjNdzKOGljTd3ahyBjhqfd2ODNiqhoqYu4Ah8GSZASq6zVFgGLQVKW6gxLrPQFEAZ399QKy30qQoedMudaytVqePUFKgpUFPgvKFADXidN01VF7SmQE2Bs0oBZnsTk5Np+yQqeK6GMhlcQK1levpETA7zxDRPpc9qviTWRMJr//596d5770033HB9Zd+pEcyOoJer/8EMOGevipCZzTxRdoqf732eAwRbWYpbzftPLvcSgM79P3oJlcZn0usn5jAAz2pyEzUK1CBkXJowWrJPeTcuJL9gHOQ9lO4S8Bo4cTg1p1D3ECRiB0UBqkHUFWVMGjBL0y0kqsZ3swB/UWpwVmVtmZV9WavgSkgMZRWAM+LMsII+9XpKs28AOsGEYZtnELszTv5hAdIijFtrgMk/BurbgGcDgmlhnJ6dGGM3RtVeALSUhiNGMDyUXqYSKnXrEBkLuKHWMYzEQYNyv3XvaPqH996art6LVNr8VDA7GSQzLWJA/5xGKfYaBD2ZwCfddyW8AvBCMg5mxRRlQgL04fYkHuSkFE5za3JRNH9gKOk7MtNKCujMQ3Wt6Slso0EDJQGUnLO9cv+OYOfmx7Lhoohd8mUGr5s3fVc1nBEYu8bwWHrtkg/xcsBw47pR4m69nyrkxiOsl9iKZ5Q235+DtFdkdK5uumPDOhmUAYYgvTHE8cU4/FRn78tY48MSNvvlcF2/HMkIJdXqukozp+xNlf6Ki/BudrBtdfSbW9qN0VxV/7IXCQzoVGnWQPwyhrv112j4zOx0SHiF9Cllze9ILnNEOqs/vHeMfyFpSro7d+1Kv/oPfhVVxt9Ll156CXkjbQWAEUCGdBM8CuAnqEoMxjAPwRzGxyCc6TFmUjOEtLB3iArjUGcciS3G52XG19mfpPaR76fFY49hK/EV8gD0B1SKsXywog1jwiCSZhhg5ADlgl4tTmXDEcF/gsYLaQmKy2qQGPyfRWJuQbVFolPmJmOs6nhNpJPcWpEcKTIjOuk4NrsEodSuR9RFlUvaohOAl7amsAkG6BVtgQSWSxDLjFcL2O9aau5hvePtadf+O7DvdT3xD0ISvwdRbErgKolIGi7qk9s+e6z+6/gb3ZTzIiDRiRNT6ZsPfSf9n//X/51ePXQovs2Oq4YL0Ih2ss87lm7NScyTHelVQNb2HbvoB5ozEHvEoD0AWF4Ey/kJfkX+hHB8F+gKoDEqQRkpqLTzGxMH5fVdiD5evQsn517f1xSoKVBT4EKnQA14XegtXNevpkBNgdUpwIxyYgLAa1sGvDQgq6rLFIBXMEurzUtXT2nTvs47lfC6F8Dr3e++MZgvJ7GCXYMwDK66V5ALk1km5E5//YdxCAZTIKqacMd9PM5hojBrlH0ZgOjBnx5Of/fIT9MrR6ZgJMbgcZA2AGRYBuwbQCUiTL6YGUxVAbxkkDocQycOpaFjr2D4eBojxDPYgAGkktFyso60ztwi5Ub6qjG+l13l96bW+C6ksQC9ML4reBA7NWKkuYmURUMVxlBjPMaua9NhsyurMqpkM4Sq20Sk1ZnYldpIdjW2H4AJE+TKZRMU6zr8elWWwTJMz68BQ2XeQ0iPNZem0rWX7Uy/8r73pEuR9BpYxPB+hDUHUTxoAABAAElEQVS8gBdhKsBLo/vey/RtxWUbXl/DhteDoTYl0KRTfUe1Jttui0n3FYf6UjyZHlVaRgPwgoHF2UdmofX01BSMpAx3VqUy7zPPt68Im7m0aci8ABLSJGzP0Pexjp2OHrwTCcG9K1I0im5jrVCF2ljgnPAmfrtg3Sbi/LyCxtiwkczjffGNgdIVsXvX2a/c5/HGuxKWqyo+F/7j4mmcc3rVfTzMGeTfHMQY2WXfkeWj6fJjj/DeKXm5NRftVL0XpqDhbnfBFViyTIJfs9MzaZ5dCQvgVYDoLhG2lvUasQSrkJIV1OI9vO22W9M//+f/TbrppptCbW2QRZCWYHRFS4f36jKffWHjpeWB2xHqGM/cjVGwS0kvYRLgJiqLva5jP03Lh7/DusSPUB8/kobZnMNXouPGJOSlNBk/vHO8d6ijhzQs44JJF7CrAFVdwKsUKLIWuGqnuSnsn6HSaB8QgAnAi3fZxZMG4xHUjT+lcEMNknL6XWn6DUN/kRjQX9IA0gh0oZLuIa3SLAsgjFvLlHkR0GaBRZDBUVQcd92Yxra9m4UVjNonxgokvaw2BSKecQW9APBUqd+oI+oSElSq/z33/Mvp3//+/5fuv//+GDutV2mMUEXfaJpbCLdjB9JsLgBU9FSlUaP2qjcGwEWb2QzxRnmONgmPAHWVBJPigl69I/edAv5uoVh1lJoCNQVqCpzXFKgBr/O6+erC1xSoKbBlCjBH1IbQtm1se86MW6kqAa8TgANOas8tY9sm34n0gQ+8H8bndlZ086pt3qpeNY68lh5gi3NtObSY3MKsOME9A8DrkZem0pe/+ffp+cNHAJQwNJ9c3UeqDB1CkkXSRiYhuAcYEu45YuUcI8gjc2+kIdQZl1BrXF4ApEKlcRhmS4hKUKgFWrYEo6FkV2NiTxrYzk6K2N5qDyFx5JwbKavOjPa6jqXG7PE0hP2swfYcMTScDIPjKj9SYi0YmCVUIzuAZm12ZGyN0UYaw4/1fvIisQxCReGivIJVIaUVDIDZUZn4JQzt2RSUA6Ab6cyl2955ebr3lmvSblR7BpF4MGwG0KQ0udAX9OvPTyps1uVdGu9P3/72tzCUne0GkXAwVTIvtmXwsJtNeEV4+yrtdJ4AXmGEW3pXDJktKAAXzBzvwRjv5Bs7rksL26+MWtqK/c7w67u+EH2X68fZ3NNzOzZsrizrhc7M8HohqmfVOxPjjF6OA/knB+B5ue+mqV/E89yN1Atn/PD2HLE55evwjofxqFzFefv8S+ng1GMr/LZyU9oov2Oo3iHZ5e6I9jvHe6/nkH5c4L303jL6DciAU1X2rWS8ZpwMeJny/v370z/7Z/8s/aN/9FuxyGGZhlDt1fEah1sJeOHp4Gx/zp+GDO6E5K3e+W8gYZw+AXbNsdPgy99JM689kYYX32DURAILEGgAm1wDQ7xrwwJdHAJCAcIjwZRHccgAWBIDv98DQSq8KhteLgAU12TQcdScOY6KKDSUzoJoTb4fTY2tUx/VGxcBGC26zvCRtDd4CncJflmD/P0QjCS8lXQMnuMe4/ZtpL6W+Da0DctmKI3BPXwPLk+7Lr6b78s7+WZdAV1Qn6cMDdA5YDjiAxABAZ7iqrLEmFldlzCC8IKeM7ML6cGHHk6///v/Pj362KOZ5obtjid5zC3xzubZRTjHQG23KYXonGACKfTJ8QnoyzxB8K36aNjquUy5YAKPArnRG/QinJLrOt+H7rsbPvVPTYGaAjUFfnEoUANevzhtXde0pkBNgX4KMIFV9Ws7u2TpnBC6RbyAl8ZeC8PUH+XsXbfTOGok97zvnvTe976X7cjHmJiG4l8AFzGJpXzBIDC/DXbRe7iFmLQy8d+qhNfTx9vpSw8+kh5/7uWQoGrBGMROjTALLVaHB8ZYLQ82h8k1c+UGTEDs+AUjMox01NA8YNfs0dSaPZEGllRpnOcgHgyVho+XWLUHRiJtQa/daRDAqolKooBMC5s5y9Pu7gjghYTYCCo2TSQUNIZvHTuxPT1qlUOAW9v2pc6OfWkJwCx2Z8RaWKaEeQmwQa+YzBMP7lCGLc4VU+akX8gqOALoNQRzp52wHaPt9OHbr0u3XXNZGlk8loaRCsjG6uVoZMJg8khbACwDXiUdHm/SvY7h4y984b70/e99L2ywZGYF/qmrFkPZMz+yyZT7g1N+m+i8ArxoFfqVEgi+Z5IgAC/aTmkvpRqmd1yRZva8mxY51W2MZFWojQU+NZMz8Dm3Y8faBau6PgFWo9ra8RhM4mGMM15xW8acHCs8YuzpMs3EKWGyXw4TMSO5kloVt5Qp8ooAxadb3L3Tj6fdcy/mLM/gt9A/j5W5n2V1xrwLrrvhqr4+73iE5FcJL/DVrcsZ5L961HYaBgDqME7ec8/70r/5N/89uzJeQzmQksXf91dVtgC8qnG+tGeUqUh1lcTdhdEBmnEvwCHtKzaRvp39QZp+/btp6fjj2EacYoxbZBwjHLvvNgG7BkcAgTyU8GKBQkiro6V4DkdLrkjXRQXuBNRw8ZxzP+CliqKj7vzMHOrwGfByUQGkJlQaG0p5US/ljSKN6C08j9uq/bn2Kufst00PAzjm4hTUUupqCck8wBwlY2kiysGiSmN7Gpl8W5rYfyu2I2+nPiyudPhuYHfMY4BlFAW+TnE5a8ae/CSrjZJtENuxVPuRA+nwa8fTn/zJn6ZPfuLPQ+rbMVa12BzOuFVCp2RwZh5Kc23btj1UGRdpO0fHHdt3ph07d0T/sI9axrwox7XjaOVX+nipdq+sZ1amOnZNgZoCNQXOdwrUgNf53oJ1+WsK1BTYGgWYr446uQTwEuZwku2EcUr1L6WdnOGeI+cke2JiPN15x+3p/R/4ABPcSRgvbG4IGsUU1wk4q99cx0q/k2v/iReT2DMAvA4tjaSvfvcn6QePPYW6yTB5jgDGwC/AbC1T7wF31wp6uPpOnn2A1wAAVaOF6uMCNmJmjiOldTQ1F6YAvDCCPOBKvuaTGxiUd69FmCl2URzEBtfouJN17LCgXtee58BgfZO0tO4luBQAI0xMh/DtwckAyjpIh7Und6UF1G2AuChTtmsCbEa5BKUqjkXC8DwDXkExCm3bZaYNdoBLQBTU5Vozr6eDu0bTr37g5nTdJRjVn349jcIIdpBwC+kAogXMRTsIdp0p4PXq4TfSZ//qC+lHP/77qGNRKVGiIzvLfqZOJo0qnyeAV6mtjFy8YzYVzn7tIUPnTmWqZi6M7knHDiLFsYqroq3ypN+rCrWxwP0Rz/j6XI4fqxWugCNQcrXH6/v1IhPbgSYH711nv3LfZaSrNjNCTsJwEap3rtKrfMO/pO65yipdeuJ7aXyR3V/PghME8H2wTErtCGq5I2PZrc5x3t0aFwG9lIAJAMGXiP9u3c5COfqTUKVvCADo4IF96V/8i/82ffzjH4/d+QYYf0bY1VA1dlX6sp2/TKZMU68Z/wrgJcECiBINYhzRujxSq2n5Dcazh9PxN76eZo//NA13jieWHNLgosMfY/kYBs0ZgweU4A2pLmx1UV+PbpvxXXGkjXHfNpUk/MRhbqVAXCvhFUBV7C6CJJbfCcMogWT61NUza0d+xWJ8lb6kzpHD5gUJRlm88shd+o6lKKGIvYhaI6Da8txsGLgfHCYCdhxnltjZcMfb0tj+O1Nj9w34XU5CY9imRMKM+KcHvCxHVRbLUNWvBa3nFzrpkUd+lP7tv/1/0g8e+X5aWJwHI6ROVfnLghMeZ9UpxbUdwGsMiS4X4FwU2LF9R9qxYwfmDgD6kFQs/bWrslgBXkqExU6OkriqS6mTt3bx2tUUqClQU+AXkQI14PWL2Op1nWsK1BQICriaun37NlbVVSmEZ2AF+cSJEytW/c8FqRrMxCcBvN7znpvTvffey2R2Z0xkZXhUYYgd/JyAyyow9w82wHuYj5jAbhHwalHPN9JE+s7jL6aHmMwfndHg8SjMoJI1AEKsYGPZnSqTGexMMD4yjyFNoG2VzLgMtZj8Iz3QmH4D0ItdFpHWGsY8sUaRJWQbZhN7wyzOkwb2wYaR9hqEEVqCyQxJsJAIq8AuJuHtFjDW4ETqaKAeu19pGyor2O5qjTDppxxurS4jKD2ctSvZZdl0smhZHVHgKvuRIhccSKXJ0HTaQ2mYcnTmj6QrL92Tfu39706XbUehhrIPSW+NNUNo04UNDPXKfCXIRl6RXkl74+dXDr2W/vIvP5sef+yxYDZkwnUy5JbL0p+5k2G3+OeHDa+sPmate3XPvFm+z0AFrYpnE2mvDmq3xy79IMIoSvitdFUXWOm55l0VenOR1kztgnqQGyCqVMYab/qvfa/LfWGie348iebjJ/77zlWqXf9I2MAeAicL6S3HvpOGANLPlhNQDpVh3okWEkJLbJKhupeSlQJcS4AXbuagvaNw+IXql+9RHy3OVnlMx7G7ieTRL330o+lf/qt/ld5y2eWATUh9KREFkNIcpKx8fyx3ppVxcgkCXHHs5dYxjjeeIEoxMb5phL4j2PV4mn31gTR19GEG3mNptMmSA+PqEHavmhNIO41rlN60PYhNQo6O1jtANuvOnyCRtrWitYnfocxxGLYUiOtstJ4xVrTKkgniW0BikiAH4BB5LS3n0oZdxfLcgATLNXJhwtHWI3oY6fiwgTqkYzjjAABUZ4FvFW3m5iODTeIADM3yuZlvb0vjO9+eJi7FkP1ObXodQMqYbzpXUTSL1O8sbuUcN4vElN+L6DNBG745EOf116fTX3zyk+nP/vOfpFdefpkdE7NtxDx+l1TO7tn+N45aoztI65TeGkfFcZINdrTRGFJuFLwr2cW3pIC2Qf+++hn/XPVn065dTYGaAjUFzhcK1IDX+dJSdTlrCtQUOOsUGEJ1SsCrbO3tZPL4cVT2YIRcPa2m32c9X5mfUWyc3HDjDelDH/pQ2rt3D6u5qgSCN7lTIsBTS6CJGWzwJ1zFP/FiAgtDUFaY4z4e5zBR2GAsTi22gNfxge3psUMn0t9+63vppcPHYGLGqC/MAbssGq0dXEJmQYL56QJeMByENfwgEgVhaH7+KKARoNdMlvTCuFes/DNnD0alJfNABZT6UgWmCX1NXskA75Vq6ACVdVitXx7dmVqAXEuAXa3xnahEjoWReh4GHdhDi0QtIQlYf33jmaxNUIpT1IA7GKXMznGWaYDpQ6VxEJXM699xWfrYHdem/UOL2BBjp0mSU0XGNHKtzx7g9fIrh9MnPvGX6cknnoj2Km0lQtWTAJJYZ+JMi9KfJ4AXRA4nteOasmdaZJqo0ui7p7SCzk0chugL03vflRZ3Xh1+/T+2+MZdFXpzkTae/PkaMl7YXuG7bYNXj2HO7VWe5b5sY+ITbVqd88vf84tkq7Y2rPdVmB3zz6eDM0/aASLU2fpx/Iyd7Rh7lrlWkitLyzjetEOVcXZmOgD+YhPJPqfL9Y1Snq3i5HQZTC9Cuuvf/Ov/Ln0U0GsQ8EJMyEUGJa9GR0cqwCsKEXQqtPecISHGKh4LVFlC9rHlfBQb7U+kE098AduIjDNLhzD0jiQuIf2ujQyPsokIYDGSXQUYyTWF5qQryJM3kDBFjmgKFgN8jE94FNXGuM8/AlRK2oK8WIkcz7gmwXemg4RXh7RZSwnn16x6mD3yHUUgEu0fNfQcfUE/Fk3w9StMSirJY4ORfJBw0maY3w7LP7uMFNkQElG7r03j+5D0mnwP/pf5kYnsupmVi6o85da6C3oJhmqDLGy4UX67g1JeP/rRo+kP/uAP0kMPfiPAJuPFeGVdz5HTxIF2vIaR6PKNaQKKulvjEPf2YF2R8pJc5VtiPyl9Bl/8ewU0TO9Zz7++qilQU6CmwC8CBWrA6xehles61hSoKbAqBdz2W3sZg9pOATBQkujE8ROZOWISX0ClVSOfkWdWb3nnO69LH/7Ih9O+ffvgGdhlCyZhBJVCmaDM8FdsApP3PBGPOT4T2TKx9WxB8pnfPMnvm+j2F1PwaXZgIr14fCF9+aEfpJ8+dyi1mpNpEZsl7rKokWFticVqvOvtpBMYkkaPYa7aSNm0MSjfQKqg2UElEaP1AwsnUmfqdXbUOoq01wn8sOkVzBZxQ3oKqCoARHZ5hMZNmSxSg9QwLZwHx+HcJlNrkl0dsfm1NL49tUYnANe0d1OFJ56Gi6Mw+FlJUwk6BGdjLa10/8FdLjwXSFDwDNgk3fauq9K9N78tbevMIP2gDbGQ6SK9AsQpeQYDRP7LsJSyXCFJYRbrOHO2VIUhkdt4nt2+/vOf/0V64fnnAaSstYH45VlhUoy1NWeOPSczo8rL2Og4zDNMbpXszOxMmplmV00BXMpQpF/6maFeKuf+Kktw9fKxHMG8UT7PSrtkmzSy5bQ/ZRYc8N1Y2HZRml5FxXElJXppr35Vhd5cpNWTulB8S2ep6tMdR7jvMcl0qPivziUO5xzGswmcFK7bv7O/zw120YkfpO1LR4ywaRfZECuaMG5KY3LDZQa8tIfFmM5Cwjy2kFRjdDMQx7d5VKvnZucIByjEGBVxAD50pVpxEz8l7XIuuZdzL2S5Mo38fjN+M3ZxE/l8+MMfSP8a6a53XPOOWFQxjAsd7s4bYIbgEa7QsdA+0mMccmwR+tGpUpgEu1oAhtPfT889/Nm0c3w+jTStK4MrVB6dQKVcsMtdclkccAxY9j3jz3I1QfsFeZaRwsIrWiZGKdK2djH++0DwGT//PEfYOJPeAotD1KHrLKxjHe+xgNfACGf8wr6X/oy3pJCdmVAO6ZAl7Kx/5JLzYdS2VE0KEu0kiMW3ZGl6Ps0j3jWMVJxpL/JNaA3sSeO7rkuj+96XGqN3UWckho2OM5uuW3FjNuZt/RgfKZs09wyZQsrryJET6ZOf/ET6xJ//OXa9Xo3wOUUL0+9IuKTdrWD/841dm8QgKt1jqHQr2SUdpYn9Q1XvoINJRTPkjGwKnWV3HpP7Xq5bPOPHIKU/ReD6p6ZATYGaAr9AFKgBr1+gxq6rWlOgpsBKCijhpS2tkWobcCeK04AD09MYrmcCrFTQuXFOrjvpiiuuSL/y8V9OBw5eFCDXGIbsY9IaYkdOuFETjHI0mQRnUM7yBHhRAT0xiY25dp5we59ZylNLHmxMczQdR1jqa3//XPrmD59Mx5eHkJ0CZJPxwmB9R2ApnBN60hRcg9nSSHwHBiN5aOxYf5jEAZCrIYzXjyzPpNlDT6Xh5ak0jCH7BsBXgFRMwAeYrFMxVImw/wVN3YpeqatOA4P5I+ziOLYzNbbvZzfGnWkRcKMt3eW2qLs2vrwUrIvyxC9l0OEvxNQ9h6dMkEwVRxVnAAmFwdZsunh7I330ruvTzVfsT0snXoN5wLAyzKA2WwS1Bqm7MZUyWEbqawmbYuYPSxgpr/2jOhJ0oI2UKLF0qlB993uPpE996tOhVhXqVHJRuGCsoAucif9bcqYnGyMYVJzG3mWSlAYQ3FpYmI/+rPFjgmbykaGM/0DQpsQ8D86QS2mU5uhkOnHxnWzKtndFobdGxirW1iKvyP+8vuHd7HcxflRe/de+w7oYY0ocziVMjEXR+yNQvornESv638jycex1/QiwuYwzPtucU/pI526C4t95V0E8uAnJJM4CpdpinA9j5ywg8HiJ8WSGTTPmAeZDcpR03CUwym9pSz9wwOHGscW/GP/iCu8YWwybaYFP11l/wwvuKC1sGsNKVvGu7t69M/2v/8v/nG699T1I9O6NXVt99x2DjKeUl9+fArqYaDeHuJgjNcdCVN1YKEjY6Oq0n06dw19JbzzxtTQxcowIywA/PEJKsslizsgYUmSjjpuMEUuMubz3LupIC4tPtixKmJajpWMg5eEcUlaZBMRrpaWpefIiLt+Ilrsmciyjsx6q95bZkhKe367LYzZPsB+mlObo2HCUB6OJVjqArhCv5bmRBbxsxxghTUjacNO0oJYlXM5E1coO4/LsFJumcG5h62p5eRCpqP1pZC9G7HcAeo2/nc1O9omn5XLR9raO7Zcr300xLrplr/Kybi1oZfgHH3yQHRv/AJtejwBQIndGm5FctFsEj75A6lUicarSybls/FcgUnVFzS1o6mCYucky47fA5NjYOOcKxdt4knXImgI1BWoK/MJToAa8fuG7QE2AmgK/uBRw1XS8ArxkpgPwQtWlSMQobXJunNP6drrkkotRb/mldPXVVwfDMxTMESvwMBcCFvzDtGlw2b2u8iq3oEbM2yvAIpjMmNTHT0zCMwO3RsmVXGqMpoefeSPd/93H0nPYKVkaGIOzgDmSO5AdgvnIbIIsgowQ9/oNBgfCM5k4d3EkPP6DyxitR9qrdfwQtr2Q9Jo/hvoJu4aFBBV1IZjshrIF7QDLYL6aYwBhrMKP704dgK4Otru02dVWwifqlhnNME4fzJBtYfnKLxdRTpi1YC76y6xUgaWGgDKT2Aka7symd16+K33olrent+xiy/rFGRgXwK7gUpAAg4MZpLxRY/wy4DVMHVA5ChYxsj7lR/rbPjIqwxjYXxTUgzmZn3Nr+2+mz3/uCwEw2aZZioEiETbajfJHFU5J9fQeMq+yh/2Al8Bt6c9yegvsQjczMxMqXeZjvmYYgGnVf06f05snhOXPEl+DaX77W9LMgVtXFC66wQqfjdxUsbYWeSMZvLnD+HL2ubjr84uxpASp/KPvEiefeeh/PLNfm1jl13/Gd9/Uo2nP0mEDnJHrAl7alxIkqQAq89X+1ADvr4Cu4Mw8O/wJQgsPC/bMTp9Auot3P8IanlgxBkTBo+iOtbwoVRkdqx2L8n0B0bvoRl9NggaRDGCJ6tuASb6jqq/f+O4b0v/xv/9v6bLLLgkaLVE2bUf63VnGzliRyhHwsuyxMJCHryhTVukGRFsS4ObcYEfGI99NrZe/kuZOPJ2GGjNhv14D9aovogcMWJJ3ZmSw5Zsi4AUNGOesERWK8cAxX4k4Aa9BGk9VcwYsNhYB1Frk24ME1/w09tWUgOPoKO2lKroqhVxGdS1nHx3iLjIB1xom75If4+IQO0R6DAJ8DYxSFwGwqkw2Qwea5ayQaiLigGrrJQEyVKJrmfyMszTPpgOoq1JQ7kkbO5AjE1dnW167buW7ckMuF/FVWyxS0iuK2i25mViA/FTj8PblAcDDp596Jv3RH/9x+psvfjEdPQqwGNCgfT1/H3Nf4LoiQpyqdFbmdfo7x7gAvBjLt2GsfoS+E7sn009UddSuYe1qCtQUqClQU2BzFKgBr83Rqw5dU6CmwAVEAe0FKREzgv0U7Z0E4AUzNFtUwM4ZKAA3wAR8D7a77r33g+nGG9+NKtoYDIjePAsGIjNLSg7JkMiExQScia8qmDJGusJkycDFP4Hies12gqkZmUzPHG2lr3znJ+nhR59J8y1UJSa2ByAzAHcReTnzrxjB7gQ+L7njb94WlidwJ01BIezGNJH06qDa2Gb3w7SIemMbm17ak0FyKoAdAKYlpKla7sg4sj01AbsaE9jrGkXKa3A0q0xSP9lLXc4338nonOIi0Sp0MBiG8SiAl9cAcu3ZtAN7w++98Yp02zUXp50Dc2kEg/aCXUp3NTBaL7A2iNRJziUDXoJepwW8YFAWALeGYUxGkdATYNK4sJsffOWr96f7v/q1oKsE6DG1OZco8hYZo2JsWckQnYySkl3Z9gugKFnMV4DXktvbk08X8OJm/T4SSb7pfqIL8CPjGpIOwxNp6uAtSAYeWLOsWyNvFWtrkdcsy5vuwSrvVPTMPv/oJ7m7Unwu4r86l3Cce+G40p9/f7wcYffFS6YfTe63ejZcJE1CHd7hjvalOEpTZYPrvhMASYAWAtACvG12XlVidgapoAWAknBE6kl4OVLgSNxzBi/iKoJWj6prA5VSdB/HRQYsNI4vGD2QFgHcDhzcn37nd387/ct//l+Hau5yADS8r0rsAHoFEFUtbATgxbdIwCtUDrvZiCBxhLriFHa7Hktzz34lTb36nbRtWGPuC6kxBL0BkRoBeAHiV+3CCM37j5oeNRNMEiS0nLaTAl7uEOyIHmqSgG/L88tpcX4JOqEGirF4gS9BJ4HE+HPM5F5JMNuXB5GmBMijcQUEUdwA/QgX9sMIq5r7oIAXqo5NwK4hyqsEWANgjGQDmJTqWTVPAM4FCx7EAOYTwES+EdalQ7kX56k7bew3SXXP5uC+ND4J6HXg7tTYhWojm7SkDt8WMUK6Rf5sSkudhffQmbYu51UWnfSZmp5J933pvvQf/9Mfpiefegow07CZflHf6AtnF/BSfXES4/V+U+wfLqIM46dUeu1qCtQUqClQU2BzFKgBr83Rqw5dU6CmwAVEAe1huP23BoNVLXHOO4N9FyW8nGA7xz43jgk3DNH2HdvS3XfflW679Y40MYndKmblqsM42SV3Vv5V+2EaT9mc8Koao0qFgMpWAa9gVACXjgJyfeux59P93/5RevUYwJSSVjBZwQhJCMonc5NdZmDcXTI4neIb9JH5cdoPgydDtjCT2oBeHYzZD8wfBwSbxlj9PDFICxtgbhmv3a7G5K40MLmHFf5t7NDIpB7QKYwdG04uqkrbeF6qAupfcd2yVV6lpDl8BchFYCQs0kx664Ht6d7brk1X7R1LE+3pNDbYoa0B49z9T0kL6tuEKTYdayPY5aGqo4DeWk6mcQ5gaQy7WdrOUiVWycFXDr2S/uYL96Xvff+R3I96RV8rqU35By1IUwmRKDFn7b4IeA2pckObzKPSKAAn4KVTatDCyHx26RdPzo+fYK67fYM68K4IVC9uuzjNXnLPmpXYGumrWFuLvGZZ3jQPgpgrS5PfIX57L1PuJ9373rMAtXwaz7L/an4Xn/hh2tk6vjKjM7zLIwJvgECXgJfjguUIQEawi7EckEC1YgEnBk5uvZ5PszNzqPr6nueGdTzsd4IupuUbEo/iOofwUUhARQDvTnUDIEh590ftLjUZrxfS9Tdcn/6n//F/SDffdEOodasaqMqaixwC1q5xdMFwRhwlvBzfA5whm8gpCuMP36b2i2zM+EB6/YVvpNbMs2l8CMCKd7oJ0DWAGmMTMCmQLCuzBBDEe9LdYdHEOASNI11uWwBaSnV1ANOW5gC4ALqWAL2WkPIK4Ie0HWWMseIcQA/tAK1dAwlcinBm6wJF0HaJcnE9APin+qT+RXXR3XwFvia2MXZOAOQQpqThu82elaSGNwmGmqXfF9IOlUbzoVwdwK4W7bq04MIQj7FROTS8Ow3tvy0NHXg/UsSXUph9PBPt4p+uwTJHpBseFlwX/YigVZ6q69u5BS5VjX30sZ+m3/+D309f//oDLCRUCwg8t59EoTkHOUzK9KK9vNics97S0/mIi3Ghxkg+ARSyQDfCokbtagrUFKgpUFNgcxSoAa/N0asOXVOgpsAFRAEnl2HzCKAiS02x6xNbn8+g1hiTaSe958TJpOXtxm+66d3pzjvvSjt3IunEjN1dGmPSKyjBzLlIs3jtLFpj9qp1bRXwkh1cZoV6vjmennl9Nn0ZwOvRp19Oixivb6BS2NB+FmULVUKn85AgqwfKMFgmaZIVFLlgcu9E39X1XKawebUwHYBXOvEqoNeRNLw0Q0gAO8ClFmqMaXxHSuzG2AH0amFTbDmYDlKyktbbhAmfmQ/P8h5KuUk3nbnmUBquLy775fuspmTI5bRnrJ1uuuaSdMc735r2sjvjxP/P3nu/WXpc953n9r23c5iIwcxgMAgkEgECJEgQBClmSla2nPbR2rIt+gfLa1mipfUfsbJkcrW2ZPmxpV3Zlrx+RK1siklikAAhMAAgGJAzJueezjf03c/n1L09PYMZcGYwkCjgre73vqneCuetOm+db51zqoZGFuZQJ04uxPAYZpV6riHfU8BWAbzaAF6aM566Psjp9L0CbjoV5t0tLy0nCPXUk0/GH3/ms/HMMy9k5KxbeYlZx1MpnCr/qWvncwRVSM8/tb0UnMcnJtYJ0f3V6NBYXAHwMp6g6V9rwIv+an9QY0c/ZNlWOFfba6gxHMtbb4zWpre8jHi2n0sT+ildugQvTbHON5W1prZ2cNqTpf9w6YzbBcgaROVm/vf3gzbdb4vl2VrMzD8Tl7f3gWGckdggmVe1F/iQF9gH1PUxZAvnkl6ogN7hce3+6ozY39FUOgBdi5gzLgN8DTTNfNI0Sgqmkke2MVIp4Iv15Nj0k0eYL9fW8R2fG4QB4CWftL+NjjTjwx/9cPzCv/j52LxxJicsbMNqF4utwDV5FG0n2vAIIFgGCrFWov7BoLoxdCB6S9+Kk3s+F4snH4+x2lxqfTX1NyjgxaIn9RHSrPNgi/0KtGCiIrW/THxdXfnIZZ3aOp5nazMB0FpEq0ugq2+6KOhGcbOUZWLD8vpclhTySxdBLK4SVzBLP2Jd8yROA7yR3pmAl7QxXod89aeWlOTaMCDd2OQIkz7UH+0vQ09NMwBDzdvTtDG/xb53gc7yTXAl4wb5tFvLsbSAnzGAKTXjgBojZm6Ise3vi5FxzBrrb6JgLrjC45l88bNYXjCFNfA9MPjeM+CjbMiVJvmzLc2emI3/8nu/F//tv/+/cfQIEzrUzX5BLSmsz5T24rOZQp8+mdYF/AwALycnBETVAszVGuV9OanBIi9VqChQUaCiQEWBC6JABXhdELmqyBUFKgq8nijgQF6tmFG2ojWFts7SUmrFCCKUlRJfixozuCZ9zeDe/OY3oeX13tixYwcDWl2voAGFMK/4pqmHWmiaNaapI+XVr9jFA16IAlR6BcGmOzwWJ1eH475Hn4/7H3kyDs8z6z08hXSiyQTCWmo1FaFFzSv1t8rw3pE+AkNKPDnqT82w1M6iWmonaMY4tIxj6LlD0cO8sd7CwTJCwdDwJBpdbBMz+Oza0F+NEUfvSEomp+iRyZK/YkMKH0pceVYArxQmuFfEinKWQgfXyrOm4RXSgMautfjmnVNx1y1Xxw07N8VYdz7Gh1xlshOLanpgZtkbAmQkvn68TNenO0hGHa6nueYraHj5rhREbEtZ5gRjuvHggw/GZz/7+Th82JXoirCioGtQm8OtAAnlWt64gJ9Myh/SEZxtpnnuJO15NMuj3yJ9eC32Aa8ETmk7vtuiTXJx+V5AES95VIXBFDKhcTFT67956OD11GDDXHfp8ttZ9XPnWv62pksX+qld2kQvXfHOldLa6147eFlMKFiunRGltNNBdG7mf9l7de0+72Bk6VDsWHomxjF/Xrs+ePQS7YuGjtpd2cspgAAI5YHH+DdE303/XQBemjWKR6yiPbu0gnbXwiLmbUVzNh/hycI4fKHrX6ppk27mQQL9UMDvktfg2mCf9fUWExeyLb8h23dcHj/9v/50/M2f/PEYp29SECY18A1Iui4mIfA1cFyfIJiFWheyr8pXvc7CG73uY9E6fn8cO3g3PuoPxiTaXd0WaeZqt/BozARVVq5J/xb9vcWJmrlgQGRZgnwOsKiXjuf1a8YCI2hIacrYFfziupwiV1ZkL1c0JGfkOZPJpCSdfxC4aF2xB2hbBTzqkKecu9nhvk72+U8KSxeu+07UPHMv/NjEpHFyGh+Ek9AITS8zbQN+dQECm+QpfidwWTLmNs9pWQgmBSCF+SVApuaXmTjProxsi5HLbo3pTe/FXPIdPIefSPNmcxKExzmxENaUIKLIB6QYd5Iw5pJ1FwQhiiaFrqb553ffE7/1W78Vjz/2RK6E6TsctDsjmlwm5Y/lvYgwALxMz/HBRGqgQ5P+y5vAzLEKFQUqClQUqChwYRSoAK8Lo1cVu6JARYHXGQUECNZmUZFSlpYWY5FNgKnDjPFrExDWGLw7hr3iiivi/e9/P8DXdQz6FX4UbfjjnkCKs+IGwTeFNgX9sqokI3fCQMjymfznwTzOu2f+9PBdhaCFz6keZpPdkan4zh6d1383nto/i0IAs8cNHNgTagBCOY/OwL2HALmKtpNAkiP5hKKcEUdAKIKLKy4inHiJp/QF08CMsb50IgGv7vxhyk/eU5tAGBmwj2HGCODWBlwTKHPaXbAqgSqe9TjTpUoKnJmn9FKKsAgcFQEgr3AuLdx81k0NNeOz8iKO6O+8+cq466ZdsX0aP1v6FaNs+ubSUf8S5jz1JqsammrWT8GFJymXoFcBvKjYOYJgpGYmmp+6MptC6zI+gv7iL+6JL+D3ZX5uKYGYgYNqM0oTIIXOV3xX58iwfznfu1VGGFMgU8NsQg0vwFvvWRZ9eC3qtJ5VzPK9IDxKo6zmKyf/fX6XOljC/ClFzWaS9OScvYshLO24E8UOBN0SZe3Xd20483q5+mp++yle+oTPr1CDiq3FftmFtTtnO1jjG2c8NuAta88ksSGzjdl/zodWTsTMoYdiAwCMQrlRXqt2VlZNhR/SR9XOlCMVeMUSURb4pn6nNOltw8MFY9QqWqA/dNHeHWKRDf1Y5Z8aYjKcAq8X/pEVlQgFSDP9rChx9B6VxwN0I+OWH8GKUmme4FhfXW+5+ab4uX/2c/HWW26OTRvQbIUoAl5qha4AyGkG7bl8vQDR6xI0J8qeuYvudI9Ee/buOHH4HrSxHmViYT6GuTkMwtVoToLdoN3EBU3PXZl2qIvGVxvAC/NtrTzXAjxLQEeNKMGtY4f0CQa/JA83WbucIh3akztRSxmgkxSpk75lSm1L0CpX7BVJcoJCsGuVxU3cG6e5yveA5/nnSR9i84YNJE0cuce7EfTS39co2l6TmDgOAXytMuHT4l3qOrJpY5JnmorZsXVMI98H1wA2O75fALsG8RbqaBLP7Iotl/0gfiLfT74A4LwTikMKTHjwZCbS6xOm3w78ahjM06QFyPz2mvXzL7wQv/Uf/kN8Gd+MC5jG+m6SEtkW/G7koyUFinQxYQB4WV19drkIyTigVyYKnSammJSqQkWBigIVBSoKXBAFKsDrgshVRa4oUFHg9UWBsvz3BL4yhgEtHMDqI0vQS00vgYnXJjiSZhDNiHrTxo3xrjvvTLNGzSsFwhTEFHPqzHQrdFguBSJBFfeaOliygYDk/fT7osDFc2oWnC14t87zYmgdEuhiYniM5dzv/c6z8dXvPhfHFxEFavgzY7VBZ9OVA027wwy9gJbHCQr1Z8NTUCStNDFR+EzBR5kGwAsthwSWMCPqLc+lFlId7S6BNqQz8gYg8xm2AngpiZi+JTdjBVE2tROkB+/C8pOJvwTOKE8KuqbB5VWAHUnQUAMNB9UjaA1s2TARH3z7tXHj9smYQvIaBgAb4p70TzM4pLmaM/mkZ2ruzUlTGstXfHsN8jTf04OA1+TkZGoF+q7U1jh06FB89nOfjQe/8RACt+9CvzzlPfp0ym6Zi2dZKw8uKJBc1t/EBLxGAG5tx01M+xT49V20TBu2HbcRrvV1ZXsy71UEON/lX79w5ns4vQ5rNLFi5VVGd2JLLG8X+Jpeq+7gqTNTW4vwqg76qb42iZ+7ZINKrcV42YW1O2c7sPWvhXWHXst7p13jJM9p7625GNt3f6ye2A/Y24wpBPKZmQ2pqZrt3B/TsP2zvxRkSQ0v+q9ap/Ie0RzTl+8I9KAjC5iE6SLbCgBOl3vLtPl5NVsxWW/QH2SCqSUEFONevpGAFf05+Z68yIIniuFNy07p5X15kneNsRayT3FZzSh9P4mY/MiP/kj87Mf+cWzdsimm4RN2wOK3Sw3ibgLVRbOrJCN/NxStUcqQdOPaKqDU8vNxct/n4sTRr8d44yi8HD7GrfHxMWg/Dk8lX5EcKiAMOMTJUIcLqkdZbolvRSlDb0EH/suswsj3bh6eCA8xmkCPFHWzhpondkhPauhAXrWqph8Qr7FbQbvMNMXQjOUEjXSCDSWfqYMYCaDxn4laBB90b3KDfboQMAoTPmPjTUwRSWBmjImRpspp1MfIGdsneWccU7X8RHNriAJ0mWjo6peR48XacLT43kzP3BXjl/0Qmm/XEZmFWUhMPS7JVDLPI8rEd5d0BOasq47y/b6aYwJeHMzjvP6//8EfxO/919+PAwcw12cCQf9euheQB9c4l8/nd9kHLyKsAV4QrA7gp4aXExnmYXvRiX1DX5vQKfO6iDyqRyoKVBSoKPBGo0AFeL3R3nhV34oCFQXWUYCBOULaJA7jXfJ7EAQJZk/iaPkiB62DdM61rwnk9EEpHea/5S03xw/90A/Gxo2bGDgXLS4FHTW+crUqBtPps4gCqQFmmR1UD7QCHAx7XXPHFAZUtTprUAjCiTt2IGoAtahfGzPGJw7Mxt2PPB3P7D0aC5jB1EcA3oinfJGDeqSeroILZeKfUnDDvUKHZw7yFRNS+OQWD+pE2bwEjBSmFCZWU1AyrgILe9NL0Yxya1qyNttu+h3ul8081pant1BrAREXUMp8vdzFl4tZNGvM4HeWYuOGqbjp+qvirut3xPaRdq7CWMd5ddFFoAzkTemyLCbJo1kPjyyfoFfWY32Wa3mXA9/BMO+whbaGgqzv4InHH4//74/+MF56cS/pWS9TvvTBNpLvgsoLlurDy2tqk61gvrWIxsMKbbkL+KiPuhS0ieuqn4N3delL9f2Z4urE5ljZ8U7MaDfne36lUr7C636lx/7a3rMXnhbOesrFddfrS8di9MA3MFs+nHxI/4O2fYXzmemZXAwkeVc/YXmHz9tP5V2204sOTgqYjn1Ls2O1TzkbcqVYwOx6D+Cjg5kex4LWK/S/k5jszWL21p5nhVbYYw0gpYUWa1tNz6ZmgPAB+oX4ugCNe9lbsjgKymF247IqpBU5e/mtVllgpAPwNx3/9Of+afz4T/xYmhpTqCSh/dD6Z18FnDYMrslP3ATBTtEIU73V/dE7/kgc2fs5AKonYnIYXgdvrcEzRwFFhobxj0ih9ddlYd0J2gyh0iTAIz9Ps0i+E6H22+xSzLPpvyuBLp+RLpbF98PeunfQDnODs8GS4Yk4oW9aZm/y4IovAqbb5rqTLg3S1//WCCtG6geMZmFK/mSQbDzR3yjZoC2QZIJ8AnLGYT+6bYrVg9GA43uV3zbzoh78wJvZN8o3xPRq5NXDJLMH6NVjsYIVnl+iPTZHbopNO/9G1GZuJ9YV+YmxDFKlFML8OE4gU8DLusv3uU4wbbP1c90CKP3zu++O3/yNfx+PP/5ElslrddqYPHYIHjv4XueDmcKF/fjOS37QkzrI09WY1I1Bm/aj6XqTd61Gb+Zl2fo0tMSWtwoVBSoKVBSoKHA6BSrA63R6VGcVBSoKvKEoIICks+9J/KsIeCmERJqCzc2dLCDTazKCVMOmCBVqAlxzzTXxkY98NK666koGsUUAcqa3HANpEMdBbYOBv+V1VJuDYg7KYFewy03R1QHzuQvdUNBS+KGebfYLAFkYxsQjzx6Mr377yThwlFUW0RboIUQqW6hBUUOoRBYkSC9FBR52YE4dMidH2nk1c/fQGOyLeWZG4kJqaylcKD1kMCV1EQrYRQ3zwUwVsKuAXm1rxDMIiQgheZznJCDQhXCi+OKlUOBFGGrg62YMP11X7doR77jl+rhu62jM1BAQMZwRgDMNo5u7oFZ5E1zwquXMGAX0UnAcCD/GODMonCrsaGaqdqDv7YH7H4jPfOaP4+RJVlRLW6KkxpmPvupz22oGDnJFL0AvL0klV45cXl4CiGuhBYFGA1oBCuK2jTci4FUIxXsf3RCty94SnZmry6Wz/No23iihNKFBQ+rX+oxTr9qmDI3ZZ6N56LtRw1zZUMBm2hT9wDgjgL+2xanpaUz1RrjPVR4tgjz0F/y2m8mAXm2AvwjEDJPeMBMFo2hvjgF2TQPE4IEP4JsyMTnQAvSZRfPnKObFx3FuvohW5xJ9Yh6TwxWLga+kGmBFh36cGkn2eViUfX99KdUES6DFCvUBkbNVQd4uAHjdDdfHL//vvxTvetc7AYLgPqwoWCYNpEnZ1LyEBWXwmhMeBgEezzP00DbGd1dv/1/E0UP34YPsIKaM8BoI2azjf1IzZrRZu/JjCp58kvKtlR8tpAS7+H5on9g6iZ9Ktg4goJMRMLDEfDz2HfqC+kViBV0Br8IDh9D0raEaLAt3hcVVAKc2YM8yhFlVm4y3IQg3hE+tEfj3+OgQGmD54Sj16P/yeAb3akbZQEgm6+s3zHNebTSm0VxjG1PbC20nWHuCaDkZY+U01SS+pe2heYY6H4AXWm+uzonGVsfPQv3K2LDl3TG07T3QCC0v1ux1NWJDUtfGeOqELAoNpKHaW6afbTw/WbX49qOPxq//+q/HA/d9FbCu+PmUtzohNWjThYYl2Qv9Lf2EcvsuKP84i6pMTE2i1UX7oU3ZjirA60KpWsWvKFBR4I1OgQrweqO3gKr+FQXe0BRgUAkIMM5KSAppDmwVSPR5tIDvI32siIFc+sDgWKmBxAVJLrtsazquv/322ymHwBv3UthRQGQ2W5CG8yaaCM78t5mhHxTLwbUD47KUvcd55ZxFdja6B3qlWUoXoW+BQX1jckO8dHwp/uLhx+KbOLFf6eFbC/9eakC5NH1ZuZFMyDVNVsgwRSJlI64OQCj35djsjaPJURrXEMk6kRap6mOr7LmmZEM+Ja4rbBEyroKfoFdxMF3rFbNDwbLMIzP2SFGumJRoqqg54/DqQmzDHOZtN785bnkTflwa7RjDd1dKTKbfDwNHy2SS4F2pTf9XoYt4Cj5ql509INgiMLUwC5pAS1CAyTbzmc98Ju6/715MCSkdwKHpvyZB2ZC/OoKsy9frD8icbC9LmG65OqNOuwUjUoBW/Q3BLdvTa1Wm16SilyLRoiVp/05NEnzIrczsjpVtt583JbJtXoqi/BWn8fLWeMaVM04t7vD+b0TzxHMAJvDEfhArSIACCtrGPLctutLszPSG1Paqw6+S3jY9NX6MxJYLDAwSusC9pmMyvYb+pgA3xuj3G7m0HYft2wBZto830OJqYQoHoAMYoZHjInzsJBpA+wFFnp9bjBeOH4mD+PNaoJcvU8b0f6XmLNpJCXYB4siGTvV8eDF16KoJJG/25IyQvNdb0EIu8gPvf1/80i/9y9gJ8O5qlV0cn/tUnbL73ZGnFwCMfPrnmrT77ADwoghMUGDOuHhPLL74pZg7+RgauosUhHiUYXR0OrW7ek3onypalB9+VQPk0+xPbeIh+ZA1sdxzKzF7bB7NTxfukPOSDHXOanFs3utDlwi4Asv7uObKZ9TyajPBAnwXR5dr8dLhlZib11S+Eds3Dsfuy/CLGYukzQQD9T5XMCebg0TxG2b5LKJ0ceui4dycxlR7A4DeGIWgvunLUnBLwIsKSHMnLXjVAF1coz3U4MftVbT8oEc7NrFOyg0xseuDUZt8G2ngR3II0It8StZ+swz+8o79PnnM+++iUUUFKIuAGjEA+FyE5N/+29+IT3/6j3NFZ9tzHV+QBvuAvFUQ8wwy5v3z/bHuaSLJA5qqT05OpWaX15xwqgCv86VkFa+iQEWBigKFAhXgVbWEigIVBd7wFNCscBz/Ks6iOrjtMss+WK3x1Qxcz01YBSIFRAbIDJI1qbwJs8YPf+hDcfnl29KhsUNvIRfvO3us4CDYpTC5gtaOIQG6FChyiJ5jdq9p/nDuUAbjTvY7ineWeghzzlmEhSf2Hos///p3Yt8xlnnvOROO1pLCEuk5s0xpKbOCX0ona/vMSyFWAatPMEWs9O2Ve+mqoAjgZTw2JQJlFgudcYmn1FMu+avgoVAnrQiqAHBFsMx7p0tKPMsjNcyY6qvLsWliKG6+dke8/carYwcrf40h/AxjymiqWUIEiszH8yLtcGQoV6W9odxC4Dkn4MUT0oM/adRG2Nq7b2/84ac+Fc899yzCjwIt2gn9lDLRS/pDbchXp9f6dVOjxjporipgK5iqNpdltF0oHGZ5PX/NynRJK3hJE1OQLKH/hnnN0qSLg/vWlpuiO3Xl98xv0G6+Z8Tv0wgDCpxevDOu9k/rJ1+M4SM4R188Sjd8ec3txgONHBp7Cuk2K69NTc3gfHwqRvGNqGm2IQEv0yHOqXdxeknO56wO8K9PvxEmJsbR0toKX7lybDiuBRzZPoofMYCWBtf161SDb6QWKX24C4hxFE2uPVx/8uiRePzQwXhubi6OU5EWTqe6qclK4Yg7MKEW9FrjC5x8L5PGnBCAXzeo80/91E/Fx/7Jz+YkxrAr7mZZrHsxQbc5lk0QllLCY8tiJvROzrmdAEqvfTyGjn06Zvd8Gd6/PyZHWE0R8FCeODo+HTXM27p9L+voefGU/JD6Ul6dx496yfkDtLsWji/EwuwyABFTDGbAfs0/IqeDMGB5Tgp04TFqfzX4Fmiy2CGdRbSCD6HA+tXHZuORp+Zjdg4wBsDruivG4/3vuDx2b2XyobfI+7ceZ7Qdi97PaHDH+hqyi+YhviOhU3MC3rYJEz4WHOlRDl0i9lDd0jF/vgueK+aO0IryCXix/CXHRbN1ZRVt5eFtsXnXB6K2+T1ksJsEJtBOy68IOcoL/QKRZpZAYnEE77Z9F04h+EUc6t6m7r/7u/8l/vPv/m4cOqw5L9Tmu2wt/U6vwnv143hmlTPp8/wZAF5Gl7cLeI2ghWjwXgV4JSmqn4oCFQUqCpw3BSrA67xJVUWsKFBR4PVGAQfXDlJHRkZiErPGhn4xGGQ7Wl3B/OTECcx2GPRe6jDw4VWWr2dQz4B5x86d8eEPfziuvwGzi/5A2/IlQOGomos6sW1qouMsNjdz5T+1dnKoztCc59QYSLPHsxTaof2qwpzmbQhGQ2pDgSO1MJXQLGW+NhbfeHxPPPTEnngRaaalh98GAivoWGoo6F8MvzcDgIoSkYv0sgyk7s7C90P69oKe7hUv0DlgTzyEiRK1LwqVB5UxTgWArRREMjln8REGuZ/aYXkP8C1TIX3iWOcmJk11NLmu27U17nzrtXHl5rGYjmXALgRQti5lKSaMlsmsTHywDbIu5+ZdSkcdB0vXD6Ks2/t+FEZcmVGQ9BsPfiO+8PnPAzjNIyQpoLxGGl6Wn7xTQxGwawTtrqYLAnBNh93zAF5d/MtIm1JHidc/zDonAbz5hgn9Zpa1X/eT9U/TKvphd3JHtLfdHKvn4evrTMIlqc+8+Fd4fuFvmH65fCRGDn836gsHAUgKsP5KVcienIQtgJf9wTCGpurExFTxjwjoJXMQvPf+qwG7TFvQpU7nmgLg3k73uh5Q5E1sO9H4mVwF2F5GuwiARkBdIAO4no2SyuNGh+MkoNh++sYTx4/HgwcPsZ9l8Q74IIt4oO9KGQHJzjShFuyy0Qjc25FOY1aWCkwJsGOgsbVx06b4R//4H6b/LsEutS8b8LAEVuDZkizjwj4TNCxJ8Avf42a5plYiPLd1NNp7fzfaRzVnnIsRVa14XqCrMSJ4oyat/ArtotQQ880DGEGADoDXOKaIMPg0ZTx5Qr9daPhySQ0vV2kUa/IJg0BXeYOccLFLPVcBssTT6tCsCe1VsJrtjsaje1biD7+yLx5/iZtDM/CbWmweOxnve9um+OidM7F7GzTBl2Dh+5l8/mReVsFPRz/nQf6nYpE394ZG0GqegbdvYDGOsRHKx7tB7awAsNBKYJAymc4qBevRZmss7tJjUqhGeRfxcdauT8aGrXfG8PaPYNZ4CzREexlWKVmsrfrFvhlISOgDXpxnII558YkkH074/9znvhi/8Ru/Gc88+wx1hn7puwswjjbpBMPA7UBJ4MJ+7T6+e/mRfUVfXS6Koo9RJ1UsbwV4XRhNq9gVBSoKVBSoAK+qDVQUqCjwhqWAQodCist/u7pYk9nUgYZUi0HzsSNH+oDBpSYRo/0UbBAi+oPYCQa1d9xxB/5e3pXCooKk5gsKBQ641QZzcO9sdjqIRnhyYJ2DYAflDI4HwmSaVJylyCkSAcDUEGB6mv8hDGkpstLGmTMD7d74xtgz34uvP74vvvHoFkSiLwAAQABJREFUnjh6YgHfKaz8RzmGECSBjBCsdOtbgC7NEKkB50XgkJ4OyN3KCo7sPeO6Qo/+s4qAA5SkQMlV76XsSLr5HE8oeLjpO0vtqiw3dEqhTjq4kZ7XTTmBMe6PorKwdcN43H7jrnjr1VtjBj2E0c58cfVCLB1Yu6UJDE+aXwG1LJehlH1w3TwK2GU9zx5SKAHwWsFn1hHayx9j6vKtbz+SSanhVZ63nJc2SGvzVutAH3SjgLY6prcGAm/z8/ig01SJiCWuRfKub+DSlycT/r7+Kf1DYpTa81v+X1bqbAVDaPxMbo32putiFRDsfEOh8PnGfu3iXcgbHprfF8PHn4r6/CHwHE2IS7B99ZvM4NLavoBW5iJdvVxqno9wqBN4TcWncWCv422F+ORjxMzjEt0HLyiY4xBAxiS8a+dwDaCrGTei0bkLRGaitRQ1Jio02dYnl6uwFu0uXrUAmN0cVqXm03G0xI4CJnxnbiHuewnQ5shsnGBxDiAder0gtYy38Jbiq7DwigLeUIpkWqcX3VX0Eqji9u7du+Of//zPs/ruHYDRzeyfq+lLizT7fVLeLv9PHg/hBAT9HKi1CbmkbGpp9toHY+HZ34rRpW/y2cBUDx9ZwwBBdcC7jmaYfc1k/WfpcN6gOWObtDqgWuMw99rJdpw8werD8ytJC7mvWnk1NZc4HIQB4JWsi+tyZbntsGVe1hSeJ8nvUGss7vnW8fjMA8diz4lJ8tsAPsr3JPbFO24cjb/9kW1xwxUUgFV6B4CXPH0QzHKwDa6554l+EPShzcDTuyxu2cBUcgQz9abgaRs+jkay38Qh7ifgxYO50iOaXTU3nPHXMGFdpCIr9OXRqVtieucPRm383ZRzI0pepJ/1Lu+Vqa4ESK1tNmgJwHvwHUhS31m2bS4/9OC34hOf+GQ88sgjKJQ5+aTGXvHjZRvIb/q6ug5qdD775OmkZ100j5SnOzZwBV7zsM4V4HU+lKziVBSoKFBR4BQFKsDrFC2qo4oCFQXeYBQQQNLsy1nUqSmdLKvhBZCERpMOaw8fPpiD3EtPFiUvZmqZmXevU3FniW+84Yb4wAc/EJs3b04wq/jsoiz6vmGKmZhFSGBALPClE/sy6+sYvQhMDsxfCfAaQmOLMTn1QxsKDYARp/nR2tIhbod7i/WpePrIcvzFN5+Np5/bG8vMpquJsKq2BzjXUFORhC2BKIGvsiXopVDQFyJSEyK1IQCmkHRytUYG6wly8bxgWc6tEz+fEfByox4moTZG+s5SAuOKTpKVITgC8DKONCRw0XrUoOHUyFDc+pY3x9uu2xk7EJIm0e5qrJzMtCzzAOwqWl6mVYSdTCRTN4eyeS/FnbV6Zm5n/Fh44qcw1Ivnn38+fv/3fi/27d/Hs9zjHSV9qKB1GgTray6DkPdMZnChv1fYOj2ciuGRWQ8BLEyiSTOMBklZUCBicWEx5udmARgUoAv9bB8JYPBcAStOT/mNcMZrWqOBtCuhHCRNMsLger7WcsJ77IxMR2f6iuhsugEMs29edCrqKx6tZUWsU2/w9Dbwigl8j5vr0/weUcttwO7mscejMbc3hpZZjVaGQLD660s4aC9ePTOs0Ys2Bm6Sz/p41pUfhXW1UmY2bIgpTLLkqemXiEwEhVKj7sxEz+PcVVMbS/NxOSaDN20cj+unmnEFTt2n2gsxQr1cGRZuCggiEARwBa9UIym1eNgPw+fUDpuH1y8BxO2F737z6Im49/n98ejB49ECHOlgyk3PoTRuBPiXAJL8oDh251phdHl78GO97IMuYnHjjTemw/qbbroBc+ORrHNrCbCJ54aYcMhuKe/tZyNflEtoqtf0RbAH2cF8cAneuz9mn/zN2NB7CjAPc3u0l0bRaGuygmGL9HJhEUEX68mWfAPeC36XoNco2l2rJ5Zj9vgijvOhjo3fl6aJIvwjj/uVSMCL7PML5Z64akKNCf4sFe2lBmDhgaUJwK5D8ScPzsfBxS18P2C41GGk91LcfFXET//I5XHzlaS9tACnL7yaZE5r9FnNfo+gNMnXJQevMIO8S0vMFZbVrG/kG71lIkYAfvSiL7jmKpD61dKMVDo6BQISxgEgFGWNxQ5+xqAB3/QYvpbVGj8UtQ0fQMNtRwxNkraZEeT1GiUmyS0I3xKBrCYTGZ76Y1m0IjU8/fTz8Wu/9mtx/wMPMNEBwMp9V05OkIp377u82GCfU8t8AHj5LRfwmqSt6g9Pnl4BXhdL3eq5igIVBd6oFKgArzfqm6/qXVGgokAKac7IGjQJc1CpkOYNzcEWFhdSW6aDs+GcuSdeDkiZ5XacnitD5dMX9uMsrUJRzu4rSDlrzt/mLZvjrrveHbfeehsz+MxKawaDoOiI23xPnDjOnll0yqiwkOBWX8vLY/9yvE6cswYH7oJl/CV0hoBmMK3MgwMFqC6OkJ8/eDK+9p2n48kXDsYcM/udGiuuMeBWkO0yyFcAaDZdhU1BVkHNVc4UOiwY5U2wSx860rcIWalVkGUsWmHp44vyFF9fWfIsh2Xxv18srgniMYPelzicUTeC2ig6qW9gxrhhohG333wdvrt2YlZTQ9NgKf121TqIPAiYCr4F3jJVhUR+lVQyDDLrn2ZMjrmvNoMaF9J/YGYyiKWUlVoZpL2Ew/rPY8p4D8vWt/Ahk6Ajz6UJqUJuPyt3+JMu2gVZQcoB3RRUB3W2bAqt5XaKr9wsZ77jDLwrwdkG2onj4xOYN1FO2kKXcrrCaBuzLn0YDZ4rD1W/L6dA/8UM6PryCC+70gNMWaWPdCfwtzdzFSs/bnxZnPUXBjl4rf/21m6vv7d28QIOzkzvbI/Wlo+zuuLz0cBMsbYMAIyG0GsdnEzQZ9coTrc3bdqcPCv5HO3WhRTqAAQXE5oI/Jupwy0zE3HrpunYiXnfDP2/BuDVAajQ9Lr0HHpKguVQWCIlobmmRhMrCvYA7lcBbo7Rh/bil+khfFt98cnn4gAg0BKAJro1WTx5hCbZmgfC1uA1PO8dO2k/DI6yz3Kiv8P3vOfO+Hk0vN583TX0U/o7fbEBH8qVEVkUpI5vq+7QSq4miNpUNIfg6aTnipOC9yA2nOGcvneUlRkfid7eT8dE+yUgMAsB70VrrDlSAL0eZWnDfJ2wMRFBEangRIXRVw7Px9IR3PNT9vw0UCeve26ebqVSedmzDIMqqglVB3ka5sDJiy7M6tDKTPzpN+bisw8cj/2Lm+Hw+A8k3kjnQNy0eyh+5id2xrXbWDWzu4Kp+dm/R5nvILOz7HsQzvq2/EaOspoyzuvHpvBViDarHy15nX/St5Tcd+N78hvVijYrc7rQoitIRn17zGx9R9S2f5DPwZs5B6DzO+Kz0MIgWXLPj8Dj6aGU1qv79x2O3/7t/zv+8A8/lb4S/QbK79tMInlfvlwSPj2F8znzO57+wiwax74jHddPTU7nJJiv1L4zzDaUE15cINMzS3s+eVVxKgpUFKgo8EahQAV4vVHedFXPigIVBV5GAQePAl4OFkcwZ5zANGzMJd5z0IljXkCMZVa76wB+OYB1cO2/ZmQGB6MXExI8YVBeBuqmhwCGkDIxNRG33HJLvPc970UzYiZBNmeO03SDAXUXgCed4gKkOPxWqNSs0fIKQAmGpAjwCuVSr8qYaju5PLtnCg+pOQXy0sK8Ub8wy/g+eXzPkfjqt5+JZ/YewYk9Wg9qP6ArkWYt1h8gUPMhkBYqgYBIGVN7KgsnbQRcFHbUuWCgnhKUAJfldN/fUv+CCFwtm894XAS3FC5RVxhSa8M6Aha61fHZ1eguxcbJetz8pp25IuNVWycRvZid763gRJk0iKez6qwnKV5w8CVRXqUh35ulKiErmSCYws5TTz8dn//c55j9f4r2QvmIm86UuTdE/gP5KWsFMdS+GARNrQaAV14zu8ypCKReK/n6nvKmLz8BruHh0RibGC9tiDbQ5n0IeK3qO4c2VYXXngIJ7qAduTqMaRfgV2f8sjSDFBg7M9hq1odT7Wn91fM/Pi09gCzNExuLh9DcwtF5ax7zv+WL5lPnX4qzx7TbuNCGPoimWbVRoELA3MZcQOuzP/dKV9XQugpw63YWo3jLzGRsG+rGKGZ+q93lBEbStAygTXBd8CN7EnxAzSpyhV/R8eBtya7o2wtcP06RvrXQij95+oV4fAFNKAAv+SMMLbWhBHzUcjIF+6lsxW0QvG6QT1vnMXxN/eBHPxw/98/+aexihUZ5OxUnNXhuG6fjZg7g1WugrUXZuQRgMpr3UWbqc0M8wtdOEv/ZOHzwq1E/eG+Mtw7hZ4zncLzYBNxqAHjBXUhfZS20lADw5K1+04TrpIG26u3Dc7F4TPDMMvZ5mMeUyWqI+7xSkHRDYKTDAIg6wW+zIuThZQCvry8AeJ2IAwsAXtBL35TD7SMAXo34mZ/cHtdc1ooJVstsCOBdRFilrgJeaug1qPMoixKMTQN4jaNhKa+z4pTN4LuWyxftX57h29RiYqajJhif79rQlpjeenPUdnwgaiM3coHVGpkWWR+kRfHrRXq2maSOMcykZGScI0dOxH/9L7+X2rwnZme543cYrTPcICR/ToL2C+bjFxDkJekXjL3fdSdZnIzT5YJAqtfU9NKXZ1kBtV8uC1aFigIVBSoKVBQ4KwUqwOusZKkuVhSoKPBGoIDCycCRsmaN+ppRq0oAw4Gmzr/V3HH1PQWFlBj4VePHcLGA1yCdAagh4KVGmeYwOq//4Ac/FNdcfU0KIl6zjJo3Kjh2mEVu65iX4jj4tSzGyWOG25nmOQe/mm4oHDiwRzhaD3ihKTWEwOLs+AqATa05Fos4sX8csOtBNL2eYz+3gqbD8HQKsV1osoomk0Cb5koQSClBsiQ+RYFyn0XhsuVNASzL2Ae6BLw4L+IKwksKGJZBsxA2BUhAL00f682ZWMZUzxrqEyfNVlpzMTm8Gm/evSPuuv2m2LFxIqaaCFetBZwso2XlCyYNBSZNMC8mmLuPmxS/uUnrEhRvamgBIiz/yefj/vvuy6Xq1URzSftcHABBKGMlIQptsqYkkalxPd8lCWYxuaiA7Zl1TaDMOFxZE9q9q0CE4DMMQDuKryQFLoVq2+oc5oyuUpamSyZVhb8SCiQQ5qIF+JJaBRDr0ad6jXGAsQn2nDc8Z9NEMs3vAET6bct3L1ib7VwzrQ4AJpsrkdZo30Md+oLXAKiR6nnX8Cje//dLkF8W7VSqRtvUTNvV5gSFbKsXa9I4ghP3m+vteOfUSFyDWd80/VzAC2aU0HrD1Rbp8IUSfXrA1+p0qgZbFz7QU+MTn1890Ks2aA4QfzyLw6svP7cv7j1wKI7yLlrJGwEX7Kx0vgRC2NtXDYN9HucVf+izxJmZnoq/9bd+Kn72Z/9hbNw0k5MUw9R5eRG+TV5qZTbwP7aKhtcCfsda8P4hAIwmbaHBpIIGs0Ma49UwS156KA7s+bNoHv8OzucxuYTXY4ee5nauVilP9bWr/Cq9XVVRgE1u17SsOKhfAvBawVl9Bq5lFXKfR+X6OX/lPBQF0Ajvj1gTAnhBlCPL0/HFr8/H5+4/EYcAvFIjDqIMtw8n4PUPfnJHXIOG1/irALwS/JGnUcw6gNfwJCvu9gGvGiatepXMGmQRBRShP+3OvuOESEstL7YuGny92nTMbL4hGrs+GrWxW6nQVmKpVWcK5dvj1wbdQ36hpWnlvay9FPAgr8zPLcenPvWH8Tu/8ztx8CBuDyjjwLemGsE5VOjHz4cu4KcCvC6AWFXUigIVBSoKnCcFKsDrPAlVRasoUFHg9UkBBbAUzhAeNGdMM0LBAwSHNg6QV1bYXOZcTTDGximP+sNxAcFeDV0YYpPUAPDSgf7E5ES84x3vxIH9uzAF2rCWuMDS1PQk5nLMWgt4cSeBFBJQW8KBcpYtr649dsaBgJeCAYJfAl4ISJ75LEd1BENduljfjtP6o7p9H44nXjwQD3/nyXhiz/GYawMIAg6meAFBLJc4l/7F9H2ShJE4piig1d8Ea9YArywo4gT3DMbOX96FwkcBuwS9OPb9+GRjOlq8C6DB0JKngQbX9OhQXHPF1njLm3bHm3ZuiXE0D+r6vGlhzse0fvoeQ/AReNLs5GJCl/zVSpHGqUWXZabsNgb+vfbss8/Fp/7gU/Hc88/lzLsagUXk9hnz9W2VUOparig05x0vSkM2wa41wIs8vH8qXp714yI6IziP4dNGDQDLpwnZEs7zF+bnkICpfz/PaldR4C+fAvAGwBm7iT/6SNy4cWMxR6NV5/WLKJSA17txOP5OnNVvR0tqHNBvGECwxnX7QJOVFjuYJdqHOnYc+RJ7zfFGYU8CGq462AU0WxX08jbg40HAj3vRaP0fTz4TB+izy4Be8q8Gz9jr7JuD/mmxM2kPCN43FP7bA9zbGD/zD/5+/J2/+7cxRRsD3Oui9TUeKwt6lHKCAA0z2EIXUEuenxqh8JEGGnAN/IfJMYrG54nonfxKHNrzxWjMP4N/rHkAJ3g1DuubOKxXe87yS0tBr9QUtpwAXoL9DYC/7lI7lo/MR/ukeZ89vPJ3jASTKSUXjq6AV6MH4DWVgNcXBLzmBbx0+46GVwfA68pGCHhdva2NSSNwIt+VCw9q6FEX6C83RS0uGmPwOxzXj07huB4a8EXOog3gzQJQ5ZeJ94MpJL7OWizgkdpe3fGY2nhNTFz5w1GbuoOXdbmlJQ/SRlNYu3KoFuij8T7RwuP64L2WN1zOiM2EUy8+99nPx7//zd+E5z+fgFfOTvEyBHcLmHvq6QupewV4XQi1qrgVBSoKVBQ4PwpUgNf50amKVVGgosDrkgIMlRkYKzCoJaXJzSirQGkukj45EEbagD/LgAj68WJkXKQax8g+9KqCzzOoVtAh764z2WhqeLzzil3xvh94X9yAw+NhwCVBkx4jf80XXaErTRwHw/EcVztEJyDk6GtMP11nD+sBL9IkXYW6fI7hvgKL2iLSQv8oeMhCwBmLkyursefQ8bj/Oy/FYy8eL2CYK6Dhw0tBy7IpAabQybGCh+JCAbvIJ0U4gTHLtV4Q8JgE2FknfjgkrXxaIYlzrinCdHCe3wTgqa8uo9UyH5sxaboRf123vHl3bEezayRFFYRe6KNmjCYpppcmoJb1VQJe+mVJ8CrLShZUXM27pcWluO++e+OLX/wiml7LAF6YfQJ4KYx638pZqwJicUpQa8vNIrpPQZrrA99enlv3gYbW4L7p+CcVEZljDHPGibEJ8uQ98cwKQv8cAt6ijqIpXwrNJlWFigJ/yRRQcE9TPlssbdP+sAHAa2ZmQwIEasJcTBjBrPtD0414F2bMmwG4G6wC2ORaU97Byq/DAF5tAC8tF1v2VYAMgfNRuuIYrEHNrTZ5t+uYQYJm1Yk7Ao+bq0/H1w/Mxv/zre/GHvr6Iv1Y3qjCaHZHCpu4D+nSZbPvDso/uJ/sDT62FV+MH/snH4sf/dG/gX89HNYTcVxn64mIyQ9Ig3iFM3CXhD3vQBL5jFbi+vKKVfxunfhsHN/z+YjlFwFhFvE7Bh8aRUsMLVc15WSbXeog8M5HSw5u4nBcJhjQbFphVcbWsYVYXaTy5wiv+C2z0mrHkqYTG2p4dQC8Dgt4fWM+vnDviTg8p7ZUAY9GOgfjLVfW+4BX0b6rpx/Hc2R+jsvyObLK+lE9tPHInHpr1jjOSrw1zBqLQ31u5guQYAbagd8iyqt2V2tpMbWnW51RgLLdseGKvxG1je8j3na+cRqE8rgOymrqi+HDEiqbt8bImSz7clTOzEWa3/3n98Wv/1+/Ho8++mi25xIHuqOpV3xNnno6kzjPnwrwOk9CVdEqClQUqChwARSoAK8LIFYVtaJARYHXFwWEUnKwzyhWoEizRkGvEUEvAQuFEBwsLwEiqPVk0JxNQU7A45Rp28XQJXNHiGB4rbBC0AzDPBWObr311njXnXfG5ZdvwxmxIAq+qPTRw8C/mG2cynMw1PeKgo++Ps4eBoAXQpIgmpoOSGnFHFIhiZG8Tt6LSAYAAw3QdAC+waykHo8dWIwHH98XL+zZG7Pz+IQZRohjc6ZdvzFrfk+oQxnuWy/n0NkjyJ0OOkG/LCR5Dt5DP9+8nD8lhsCQ76azOIdguxyXb57EZ9euuPGaHXH5zHgMY2+T5l08r0yZufoo5UjQyTrm1VMpn++RGl7ITqk9IW09VpOqQ30FQZ944sm4556740n2ApIKPqlhkTP9aqcR32ulKpmtQJR+u6xXFpOfpIJ7L7jxpGBY0sZf2x17hbGkB+9vcrzvc47rLcq5jA+ZBQS8FTQA6xXgBVWq8FdFAfuhPNI+IxDk8QR8bROmjcMA1y5ycTFBwOujMwBeaHltREOriTbnCBwoV0/EObkmgR06kSvwtehA/tlzRsh/DFxjhcJ06JudBoAXjqkaOHsfw3/WUnNDfI2FOv4TgNeLa4AXJsNiIdnz4JnWSeZCsA8OQnZXr3EgcLVt22Xxv+G/60Mf/gCabRMiUulg3AiuqipX6JFvnXyalLcwBxJE64xZBKxYidebg48ciTj6hZjbfzemjQeIvxyrmDPWAbsGgJdg16qAl2bl5O90geVpyC9WOrF8km/XcUxhl52wsYzedZ+7/KHIlujUhdOO4HkJelnePuAFAzu8oobXXHzhvpNxCMALlav8Lo129sdbdg8BeO1EwwvAC6f1ag5faJDPqV0nD2yxpUkpZo0jTHRMbpqMGuaN0lq+eqrsRMx6wXHJsrXcZkXGRcqPP6/OCGag22LD9vdHbHkP9d9BkaaJzzP9z6XfO7915WtR2k0pt4lmwkkl6fW1rz0cn/zEJ+KRbz2SbbuQj2f8rpLkIH55/vx/K8Dr/GlVxawoUFGgosD5UqACvM6XUlW8igIVBV53FHCgPAC8FAD0RTWC1swofpHUrDK00dZZwnH9Mv68DMVMrgApmtBcfOjnncN1gRqEHLUiGE0rJF522ba48913JvClmaXAjWUcxSFyG9O+MvzuD/ZzgF1KIngmWHf2IOAlMKUAgXZAAl4CUQ7xhaUYySNQ9gBOUBbAdFHfQvXU6NL3zUJtKl46vhzfeuKZePK5l+Io2gPtGgImoJh+slwlMAUpRvwJ5rinIJoz9hDu0k9RFsz7CQNxxp545c+bxrU0AnLSV+GvE2M1QJzOfFzOymy33XRtvOWay2PDMHVlhTbLLdhWyEBdzFSppJ+/qZJY7i70h1QIvhvTpVxkYptwJUb9ZX32s5+Nbz3yrZifx0G4GhcCf9DBdqWQb2EGYFWmxKU1wCvThgIU7bTi+Vje44BQgC+vnapDg/Y5iZnYMG2jDVDa4p25Cc5qJqV22HqhPBOqfioK/CVRwPav8L62um0f/JrZsAFT7S2U4lRbvpAijQD6f3RmKN4F1r4JwGsYH2ajoBsCyF0XtgBAWgWcF/Bqc91VBe0Iw+Q/AoCyQn9sC7Y1WVEPH1rDaK8Ow78W6jPx9UMAXt99PF7i/gKaYvLHZkeAGd4ieGZf7nOZ9X3rVE3sr73YuXNH/OIv/Hx84AM/gLP+Yoa+CBDdpl8Oj2KyqN04UYdJf4TVGQuaw0TDiFpYSwBVszCFk1w/xiKN98bygYeiu8JKmwB0PbSchsbw9wXolWbMPNIBgG+g+WX51My1PA34VQ/AZwFn9Suz+H2jnrLT9YDX4Hg1fZ4VXnPmuzA1/YLpJKwBDVyhEWVbNLzGc5XGzwN4HZ5jkYbeGHy4F6OdvQBeNZzWa9LYQbOOb4m8+AKDvK4p2EixqDUbJINuAl5TmyZiCE0vmbF803dc3kGhv1nVAAFbgHxtTNxFvzodNeJmYvKyt+G+6+0QaAe02ExM0qm7MjM+9ViJOFMiMd90viQTy9RP5QAp4pGHvx2f+Df/Jh56+OH8JjgJUtp8+WaVZ/LhC/qpAK8LIlcVuaJARYGKAudFgQrwOi8yVZEqClQUeD1SQHApgwN6xrep5YU2lSs1jgxjioLQ0AFM0KTR1Rq7gE5eE3zSp9erBrzINGepGbiTGAKFgApDbvaaq7hi43vec1ds3rIlTYJcdn4E3y1LizhlF6TiGTXCLE9JgjQAW3K1LoUBLxIGgo1D9iEFEOWt9FGD+YxAlJtBeiCUKY81mM63rgoAHX3BIDB2EQzaOLI/eHIxnnjhpXj02Zdi75HZWESQ1Cn3qg66U3PDDEgWIUDBQRFAaUsfKZYly0Vekl3wzThe868Er1hab2ragr+u+nJctW1DvOX6q+PNVzJTP0r50O7QdbHmpz4rKMcb4inoIUBIHtY10zkNUSq5nM+vNfB5aaFJo2BSF227RYCl/Xv3xR/90f+Iffv2ZpysA3TSR89g9c+UMs3IqlA9wSv3bhm4XrS6yMNo3iMN09IElJqwJTlLPCIJagrMTrJyl8vTu+BB+ppLf3MAs/33Lk0s/Zkhsx7kf+bN6ryiwCWggDwpF9NInlYS1Ln36NgoPq62wGPRfOqHbKP+0Ca/V7NUw+sDU0NxB49vx5/VeHsF3SKQEdJu0ZGE9HHKlSBNpw94CYiAjaUTd9fRcxtqwDcwZasBCjUB7U/gI/CBQ7Pxnx9/MvbCx5ZZSMC0NGk0aG5oGGjXrvVfr+Udu12JfPVVu+OXf/mX4gd+4N3Jr1tMlswv4H+Lfjk6wbcFsFo+oMYUOmTwXBPH714Tra7l56M19zQA3XHSOxEx/2wsH3uJhQqKppQaXvrwqgNwyVt00M8nikMgIpidoNeAdwdmjPOYMy6fZFEDViuUwSRoTr5Z5n7BZfuneG+/Mv2dZp1uav82iNiRI5H14ZWJBLy+8MBc7D+5Bd7LKpPkPba6J27a1Yt/8OM74s3bdWLPRAXv4UKDRdOk0UcFu/TjtUr9mvhum94yGQ18efm9sk2lFi57z33Ob4qvoruMFi7+uWqgoV1U8/SPNjq1nVUFdqFIdxkRWKlx/Eq0xa7mKUFYGpVFpX7lczEot6m6laB3g+9+59H45Cc/GV//2tfLeMD8KWPGg17r45enzu83v+mk5d4cNdscQevcBR9cuMarLlawfpVG2b3fiywhz1WhokBFgYoCFQVOp0AFeJ1Oj+qsokBFgTcQBbqYOugzxRl3B425UiJghYCXWl6jDDQH5msLCCzLgBwJeDn4diXDHNi+GoKR6XrJKQfMZbCrFtGWzZviHXfcEbfdeluucuaAVwfIOtP3uAEo1sLkUj9jAl/6yRkGqNO0TlPMLnEFTQTPNIV0QN5r6WeKATkCXZdRvYDXkP5qKIq+p0YQpIpQdzpYwu0Evno802uMxDwz6M8dOhaPPr8nnj9wPI4jXCziNKeL8IjkxkZ+JCpkVs86cs9zABppKq2lpeBcliyFRfLM0TvSimVHwNEh+yQ+Y9771t2xa/NE7NgyEyzOhmA4l/66srx1VlUjzVXqkqAaeSr6DpGmkFGRXi5OEFCEQnZPmlreNnS1iHsw6/zTP/mTePyxx1LjiwqXsA5YS42QQvY1MEtNlLXAa5CuKaG5456mSAp5q0hVw9B5GY2WFei3ijlPB8fNPcrQHBmOiREEZ95rE4G3QZ6uSDaPs3qFazUVdbuTqZveuqpb9rzjC69CRYHXiAIFyIcL0PYK4G479KScX33VNZzTSLkmUJJMgLKoFZnCu9fOEgS87pwMnNYPxbVoS23A52BNLR74xTL9v2V/QDurdDP6jX2HzdSKpimAF5MVzaFuMHcQLVZObNDPDtYn4yt7DsUfPfdCHATwaqEpppapZnV26Zb4EmloKlzSOlU4zw1lAmU1rr/uuvhX/+qX45133E71WO2XlX41lV+BR+kfchg+LW9adfVNOqqgV20IB/W9AzG//8/i+IEHcKF/EoBunrgiNy0c80M/umzRXIOXmp8lsXBcb2EiOYrW1wi+rZqsYJg8ZQGecGQhVuagEXS5mJCAF/x1jPoPoUG6gplkrVmLI5g0fuWR+fjsAyfjxRMbKA9+tXhnE709aHhF/PQPbQP4YpJAfnSxgBfp6Q/Ld7nK96srqMf3aXoT32a0vPy+aOq/stJO83JBVtmen7oh6FWHNl0XJoCx5jVJBSjagohLUHi2PRmbr3x3bHnTR7hxLXTGxFEyGQ8SkoE/BC7klifkGfHUU0/HJz7xSfw33p/avrZZv7M+XyjtMxce5M+pFUnde9adc835J1nMRk1vgxMqAl5+79fcIfQZe+lrF55v9URFgYoCFQVezxSoAK/X89ut6lZRoKLAK1JA8MgBo0CGQa0cwSKBLgeXroCnNo9gkg7J1axyxtXBbWoQvVrASwmmPzzOAuQxYkxf2LNcu3fvjve+733xpmuvVTZEcEJKs9w+STlS4yi1zZjZV5DimVI+0iZSYzAw5liBTKfuaTpJ2VdwauyKZU3qq0+drH8/bwEjQxYxD3he5MdkGdj3AKMWER4Oz6HthaD4zJ7D8RIaElg5IlDwNMBXA6f2WR60ohRkaw7QBaU4FvQynSyL9QF8VDNriGXs3UYwndk4M4V50PbYtWVD3HL1ppjExw1WjNxnvt+V2ShM+itD80rwrgBeangpCrJR3wS8sh5S7CKC5bXO0MV3b/1nZ2fj7rvvjoe+8VCcODlb6JJJS2QPSl7Kompvqc0x2KSnUfK6QGt5AAC1+ItLDT3otMI7XUXQXEWIXXVVsg0T0cOMpwboZVlGoPHwEu315HKMq73RwvR2di6WVpYS8FpVoCZtRMSM3y9SltIfNSOqUFHgtaKAPKjfGUr7y3bIpT5/uXzb9hgbHY+G4IwxiZ99jHZp21Rj6WxhmL5/Q7Mdt8+waMX4WMwsL+L6ajFG6Rf6I1wCKBbwkqPLA7p0ODd7QvZLuop9YgzQRhO95Tb9rjkaTyytxhfQWL330NE4DuDVYTOmmmGrlGXlPACvUrVeXPfmN8XHP/7xePvtb4W/ya47MT4xAXgt8AJgzTYECDM0BF/Uu34P8KKG+WJvfyzu/3LMHrwXM038FQLLDFFGJwdcYdKydEFudMavmWH2bpkMoU09NHMcxtxxGHAcAkYMAK95dNousr+rNavPMxbEBXTTRNBvTy1mV6fiwWdW4g/+fH88exhwsDGZfi6n6kfjB27dGD/1wa2xa0MHM3T4+RpwlEU97x9BqnRMzxO+A0k1lIDXeIyxUIkfpx7lafHO2/C/otXrpAG3fM+AfKtpP662rNGJz+YKxMu94TjZmYpNAF4brhbwuh7isioyzxm4TeifUF+e9kIGP4NPYNb/CXx43S/gxSQICSfglbw9aX0q/uC589mTDO/cwvJ+K8DrfEhWxakoUFGgosD3pEAFeH1PElURKgpUFHi9UiBnhBlc5iwpA00BMP0vNTFr1KRxcnIytZ6sf4fZ7YWFRTRoVhjbOpp22H9xg9o1eop+ILacCuU8AS/S7yAsuJz9rWh43Xnnu9IZsrO9ClD5nNH7RUgBM88pFc8aBJvSDALhx7paBxSqGJhzzqC/hZDgDP4wTvpPX069PK9Itb54AxPB1BDjhuKA5iZHFtqx/8RSfPf5A7H36ELsPzoP8II4VgegAbRxFl4TUGemi84X6QOw1dAyU6hYRWAY6unrxdXWlmMGdYKdW6bjml3b4uod22LrzGhsQMjVMX2Xulsu6yZIlytBcqUAXgJIpwNeRSyETNLmYgKAl4Kl2m9llczV+ObDj8SXvvyl2PMSpkb8+Z+aFnlwKpP1gFea51AGowp26YRZEyQJnP5foE/630HK03Sn5TucmYnRXZfHyLXbo7Z9Bgsc/OQozCIINU+sROPAfNT3HYuhfSdidXYhYpEV2TAhavOeOwCC5Q1ZntImSrvijKT121OFigKvHQXWty8aHKHPljxKc1xXbBwfB7iwpQpyEUE+JcJc+oZPnR6aALmXdxfjFhareOvUeGzFpHGssxiTIOGCIsvwkgbm2gkwk67mjGkOZ9rwujqdj7VeE4RxIqOFn8J5+NB9h07Enzz1QjyrpiTPa87IT/bXLs+2RFG48EoaXt5Xo+v666+Lf/mLH49b33Yzzxe+q/mxUJH1bFIG5iEwTROAUWsUPh3HuHswFg/8ScwBeA1j4jiCj7HkFfDPsbaanHyH7P7UsyuSRrmGZDJcb9Ofm5o6sg3zDcuCa9IIP15ZgGcmCHM6Lc/nTMCrxYSC3q1GnaQgHV5BzNcm4vljQ/GZrx6Mh59dBFuDR3Jv99Za/OC7d8Q7rx+OqSGASDTp5MoXE6yi5oqpZctxh3rXATb14TWxcTwBIRcPcVKqC/AlQCRHJRrlpB2hhdylIQgglW+ZnNy2VY85zEgXAe1mdt4Z01d+iG/JjWSGTy+KKuhUlskclNt371aC9x977On4N/jw+uoDX4XX8n2j7n4fjKVPtfXx+4+d164CvM6LTFWkigIVBSoKXBAFKsDrgshVRa4oUFHg9USBolXA0NSRdQ50GVojFDUwCRNYmsBvhuCWZoEM82MRP15uZUXC0wfBF0WXcwBeWRYSNG9Bi40bNsU73/VOQK87Y9PGjZQBB+kKO5Q7B9lqITn7DtBhsOyGNGekLoY2s+ACXppv6gtM4dKBuSJAcdCPEIXQlBpZ/cF9gjn9MX8KDCZEtXUQn9ASxz4PXBXAL3F0qRcvHJ6NJ184EC8eOBqzc8tpYtRFaktRBEESYiNwqNmlUEYqaGxgjwLY1YpJtBN2bJ4C5NoaV12+MbZvGIupEcrbX4URb/qWgMf6z3I8kOPyGueWpwT35SyFnIHs0r973rsEvPSVg7gKzV588cX40he/lKsyLqDxJ42TKJngIO+SusIq8mKaKg58ARkD5azUVjA9hbMu7ybb4gg6HWh+tAQlL9sc02+/OcauuSJGd26JzjjmWqJmvE9NPetLAHCAjEP7ZmPlqb3Rev5gDB+nPAi5q4uszIaZVxd6qfVg1c3Xd6uQzH8FeJVXVP3+VVCA9lcHrHbFxunpGdolPdSOTMN0b1+wjZ8t6AB9Eo2u3Zju3TY9EVcPs1ojIPkEsJYLNbjSbYNOJ2uV62jOaH/rcyyAJfoOfy3iCQnPYxr8Qqsbf/bC/vja3oMxi4OqFtpdp/gI/dP+Qt/xG+CvIVl3v4DczlB8ePXihuuvj1/6lx+P297+VupSTNBdeddFQLpocgrGNZIPWy7yAyyq92YB6k7E4pGv4Wj+Ico5C8iEiXJrLjqtBUA9tFupTwfgTS0vy2N/TsBLHgwvbwB2uVpjk+vZx9Xwwml9iwkJV7G8mKDpZJvEmtBWx/98OWDDmGkymXGy24jHD7TiOy/Mx+xCmSzava0Zb33zTFw20YoJfKRRsOQ9F5O3TUAgqdBfvgm/BPCf2jSegJdaXWqAOZmi6WMB9XxHvnuvC56qVQfPo02kNh2+DxtjM3GyjYnp0ObYuPVtMXbZ29E+3s1TU77onHjwU+XbKcE3PHjLROHyY48+Fb/6q7+aPrxsr+nf028beVWAV59s1a6iQEWBigLfJxSoAK/vkxdRFaOiQEWBvwoKINYwQD01mHWAy+AYAUxH6EVIweQPgMZ4Oq9P58OaMPjcYDx8sUVPqWl9Ih4r8DmoFmizbEUA3Lnringfpo233Xor+BBmIpQxBR6FG/6Mr3ZEAfHK4Nz7dTSs6ghICgRqKSkANtBgUwtAYcyYDSQLZ+01DXH1v6SHmgN519RLuZBCU1tCgKrJMyMIbWobOdgHSUNQxKE+zk8OYULz1J6D8TgmQgeOHEfxCI0jVsByU4AxqGVm/TBGxASlF5vQ1ti1fUtct3t7XLtjEyswUq4OAE4HHzDkqoSpEOzKac7460jfOhsyHZEjyplmKwgeAmwDoTWPSrYZ/0J+UouMEkjXQ4cOxz33/DkaXg/H3Nx8Eaj6NDpbmgJeyE9pijQAvIynaY6+eBTG0iRTTQSAvzZC/BJaH7EVzYN3viVG331b9DYDCOi/C99FqwJ+0LzGeQ3BuYYw2Zzj2p7Z6D62J1Yf3xvNw3MxgT+1+RWEZVawy3aBQGibSk0H2oRF7lUaXmd7ZdW1S0SBZF39tGx7JQwO4CgcTk1Po8S4IU3Ik58aySi0z8KXy1Prf+02jc5KbISn3YgD85umRmInfq4muzivpw+NkHCDtp2+AO1/bAImJlrT2zp8Dc4Jr6oD2tTjOc6/dvhYfHXvoXgJgGiFOOokZUF83kcz2G/gOWyG/q4c569PEBuedM0118THf/EX4vbbb4OfAqDAL9UWTnCGAg0AL/3Op4YXDGEo8K04xAqrS8+zIuMeQH5XaTwaS8eeivnjL8U4/rxGavhlND34oHxAbWS5Pz0b/gF/BOyqQZe63waudgC/F9Dwas3jOF7w5yKC9dUkFAw++dgwL7bXoqbwoDY8n+VT4hjmoG3qoH/HsUYnUL7jPbRjgrKuLEuTC884a8WPfEp+qfaewKW8b3LzeExi0qjmsCCkvDkblBlx7PfK9pffJb49zhP0sFFc7eFnbGJHNDdfQ3qbSW8LPs+uiNrYTki4kcRHsq10eIdNvnWWoQSPTp35CfvOt5+IX/3XvxIPPvhQ3htMiPjNrQCvPtmqXUWBigIVBb5PKFABXt8nL6IqRkWBigJ/+RQoQpkDWUfk7AeHnnNzBGBofGISM8ACeOkva2Ee5/WYNTqwdpz9qkJKTesT8bikm/62+qCWM9j657r+huviXWh57d61K00VdZJrkQU1HPSnthEXHHwPgC/jDFZ3UjxQE2AIUAtZhAeLuUlTsIjnFSDUvCglMuXB5hFCDoN5ITKv6ovGJHo84+P6CtOcqId5UBsfOuIw+47Px7N7D8QLe/fHgdmVOLlC2hINOrpaZANtpo1oaezYujnetHsn+5nYNMGy85gn1RFgawi2ip/KdxomqYlXAC+SIBnzF8wbEvjCN1kKOgidOq7XGb/aE/q6UfPD7WJC+jZDSD1x4kQ8+I1vxP333xdHjx6DdCCE2YCofIKDL0/9bICXUbFgKhpe0E7ByrfYgibzI7ySy6Zj6rY3xYZ3vzVaV2yPDj6ONM8RAFC4s3araLylcE06TWycRmiO9WeOxNLDT0f3mQMxibZFZx4QDH9emoAm0CkoSVAgs9yVD6+Xv6/qyqWjQAJWMgq6ne02/7MP2g+9gdUYZuOCXtNT08XcOdu5QA7t8xzd1Sft94Jbu2qtePNkPd40NhSXgyLN0DfGQSOG4XGy1i6OnBIskQeAPNdX5SZqCg1htghQAxP5+smTce+Bw/H0yZVYYBW/bqqDyWfoYyQiYK2z+7qATp6XgiXrJi1DqU12K/paO3ZfuSv+xb/453Hnu+/AJJ1ODX8aGx3DHF7/iWhhwdCyG1Je6SLKUgMoaoiKry5yDSf8Q/P4pzoS7X1/HrOHH4mR7hzmga3oAmr1ZN6CXWwN+JwcuU291d4VGJI+gmodHPIvsEpjG03bOgD5xQSLZ73VkgrMKvU/JhFxO+ZHIJbJt8M+py7IosbMSZ33qCaeNMpJiovIWJoKssnofSU6rdekkZmamFTDC7PG5IdcsmiFkAXsSppysYXmHsvpAoBqLu4qwhuiseWWaO54F8AZqzUGIBfO68vGDAtqXSvQ07TKtI+1N5hBZpJnAl6PfPO78Su/8q/j4Ycfym+mPNaCOFGWQNu6+PnQef7Y7p2YSB5NOzavymn9eRKvilZRoKJARYFzUKACvM5BmOpyRYGKAq9/CqRjZAaUDpxzOOvImfMBgCTItGHDBgAvBsNGYDS6sLSI8/rF1O5J8OZVkYnM1ktOZm5p3BGKFhfaWwgQglgbN21EmLoyfuRHfjgmcYKsBprlarFKY5lhVqMLAYhrA5BjYNZYABPSQuNLTQBBolU0gNyPYeKIPNGvkzkX6MijUvFyxVXGuqQ/rDN6BQOEETUMhJbwus5sPIIFx6sCcaMTmOCN4N9rJfYdPYFj48X4zrNHYu7Eseguzaf54ja0l950JcvXX7k9Lud4DK/MNfyWBUCX2k8puEl3aLQKQCZY1ENgHJg0IoIKaQEI6aMGrTcIRw0T7EJ3quwpp3W8WMDLUnQQ9L717W/FV7785di7Z2+CSL77OiBfmgy+AuClwN1AalGWNZogmNpdap3UpR80baK11kY4P4HsNfGWq2PzR26PuPbyWMKkltohrOPzB5qm8Aew19P3D6aeriRWQ6jThGvkENpcj+6J5W8/F/UXj0Ydc8s6wKwreLqyZIKglCO1vGgggzaWr7j6qShwiSmw3ul88klYhPsBzxR4tQ2q+aRpoz4TbaMJ4sCf1Eg9V6jBj10xcHrlROzEbO6GqSbbWGwDKBgDeBizX9HnO6A+9jf7WgOwa5jO2NZnFwnvWV6Jp1nk4Z7DR+JbJ+fjBAaD3eYk6QqQEwHAS8BslZMh+tcwwLLfiVz1z9vG6QeSz+AkRRufYruYkFDD6wfedxf1Gy+r6tJ/22hGCV7UAW0EwXqCJOzr8ig/MWwYKkMXHM9bSgCv5f3/M+YO388iFcfR8MKnF6BWz5V0ccao38WG/JA/QRZ9UyUrgrDWoY1Pv0UBLxa2qKO9e7HB70mD99VGW0u+L6RWxzdXj20F0L4BLyoZUxLybqFhqp9HqgZaw/4iMpammk+i2grg5XcLUM8PAhMAangJeOW3higFICpaXdmofFMQYnmZd4gm7jB1b/fGeL9bY3j7+2Pyyo9SdrS6YhLH9jBmNKZzVgV+vgSgZ96u0elXsASvuFFNN34efujb8Sv/x6/EN7/5zQRrXVjAewKapY2X+D5zIcG0K8DrQihWxa0oUFGgosD3pkAFeH1vGlUxKgpUFHidUsCBvMFBpuPZwRC1CGacc2ECYGl0bCw1mLy/AoAgwNRiuXX3uXIf1xXgij8nB9tcOK/QjzjIOJ/h2uCy1ylEDqBJVKfvI6zSeMc73xFve9vb46qrdqeQuMSy97lCFXH1PyY40hYYQeLQhFDAzOs6wNcxOvIgIgv3ECoRlRBmELjIK8vNT+7XqGEhCiCo9gAV5b9oFVjcFA98Bm2xukIsUUy150w3whFYESsO9mJuZTX24N/r0MEDsQwYs2l6Kq7QIf3mjTGOADdM2nWlSMCrtK/k0JwLMTgxj7zAj1oG1DUFEuqokCXQVQQU4lGqFFeI597r5V4meOqHBEk56ZCaCKbDM75HBUgFj0W0JJ56+llW47qPpeifwE+ayBU0hXYCh6kpZSJnCUkL6lQ0zE5FGGh+6VQZymeeK1RpbroZWz94e0x+8LZY5Lg3qqto7ksL65yFzZM0u4UE1FqxDwFzHg2RQ/PR/sazsfrdF6JxYi4mEThdiEGAdhFNh1yUgXeU4Cd1kMKmMQil3UsDL667MYhQ7SsKnCcFTm9Xg4dscyVoau0CC2qKTrM4w8yGjfA2Voul2WXTHEQ8y76JJk4NgGGoNR9jAN1b8OO1U8ALjdyNaE9th8+NwheGXMk1URc1juCNZP8MMMq36dMvHDwce44di/1LS3jKEkxpog0GiES8BLP40ZzPvqqGF8qopWx5k0LZudcFz7r0NSdLtl++LX7u534ufuzHfoTvxzhm8LP0PUw4JzbAr11ddrnwXIC0LjwATgzCQr4jpoJuEYDXyKomjUdYjOLuOLrvnmie3IsuEv4jXS5xFK4Bb5CGNYA86ZWcjFvCLi5MKF/pLaG1BuC1cmIxaoBQa90avuabSN7FMxkGL6xPfLlmCcQkjibsEmPFdPjTj5jmhdINXC1NzOXbY9gPjjJxMcTKsZQMzbWzct5+2ufemburLKpZlitTQtcOZRiZRCsQh/XDrFwrkAnlrHypm/l5Th2kQW+FlWs1PcfX10oNDa+Ry2LzVT+KlteHqNNOKWVNSETfl2p4MblhWpyp50UK/Bky1TzyXHzsAZzV/+qv/Rq+HJ9I+vuNVZs6QVvSWf9MPniePwPeXHiwVUFjkX4xyeTHsCsdEOqAnU2OHQ/4jfKVGS9LOXiP55lfFa2iQEWBigJvBApUgNcb4S1XdawoUFHgIijAYJeB5DAA0zgC1EiuZIiAookYGjNLCEr69CrmC8ASztIrFBAKQHURWZ7HI45nN23agH+Y2+Nd77ozNiAsLi1jBuPwnQG3A2DjaH7pXv9WDsYdQI8IoCQAVobx55HdaVE0NUqTuNOunjpRuyxDfwCeYCBEzNzY69tkBXDOVa0E7tRQE5yzfMY6JWSdSvOSHKWQemadIY7lJFffcwJYlD81T6CR13yPTwN2PfDVr6dgMzs7C8jFO874RRvlFd81+ZbaZy5ZFTUvFKJ7vI8aB2pLaFi6QrqLl03Eth9+TzTec320MNXKF7gmgCs4+gzvVC0U5LRMawxhvYHTf53Yz9IeH3g6Vh96NkZPLsWkJj0EBfECei1muyjALGlRjvLDvl/fPDCfvOnTVagocOkpoHmyfU4QVt66adNmQC8d2AOUq/l0jvZnk9XxvGBIJ0F9/AlycRJNomkA6Bn68BbAgBl41Ub6VNM+iNbVIjxyaWkhHmrV45vLtTg5e4Jz+Cb5CBy4F6xwP2j7Ylp0i3Vh0I+9YUlOD04uuErjxk2b4mc/9rPx9/7e343J6bFY0QSeMIzGa4tvRg1/XKPk2QSEwQ0fkwJA1sPQYphJgx5A1upIjNXmyAPT6bmvxv7n/izGTj6HPtJctDHfjAlWYxwdpdyYS6J5Jh3rMIOyIiVgE2VL08PldiwDeC0BeAX8gW6d9bMsYG1Zt+RP1Hl9SHbJBa9632+cfh79lnQA6PQTptn6cSwvnzvYjuf2LccJVom1DFdubcbN107HjhkAzYUl/LP5TTidiuvzOtdx5u2EAC83V9+kDK5eOzEzhknjBPVntWK+dQl4rSXi9EAJdd8lJqSWYQUNryWc7A+NbY+tV/3NqE29H9To8nyFNRmqoFfaaJaSJjks8ulk6dOLZNF0+/KX/yz+z09+Ml548cXy/ZBGaErrFkA6XUSVs+CDfrGm5UWbGuFdT7HKZ/p7JJbtdT3g5YN+r6pQUaCiQEWBigJnp0AFeJ2dLtXVigIVBSoKMGYVRKqnU2W1vDS7EeBwNcRlAK8lhBd9OSnoJNCUM7sOPhl9vkYDUAUqtak2b9kSd9xxRwJfDoY1YXScXWZ8EQ6YEbfsbjqnt0wKcgWUOmMkv/auTXvt5GUHCXipaXSOkGBYP2nzkwzlpzzg/TpCqWZLKexKuyyXssW5ynSOzC7kckpw618IeeVp0T5YRXgerNRpefTZpvD7/AsvxH33PcCKXE+ipXESQVwtCQGykpZ1EUDsn768RP18kwwce1pyJHvfBX+rmOwIeHVYoXFl54bY/pPvj9V3XgPghYaG0rCAlwiZ9HGX5+zJN8M4gFkdLb1FtLxOrET3HrTQHngcsKsTo2wGBSTbx8L8XAK1AowlsVM74yVN+tms3c8b1U9FgUtLAXmmvKiA8ZGrNW7evCUnGOQN/dZ91kzFKOQX9LyiHUUPqtMJ62iHNkm3SVtvwsg0S1NjtNUC8EIjd5n9MZxyneiyCISACM/Ii+zH5pgr/clE+0FM6/Ry0IfzijdOxRvET6CMy/rt+umf/vvxM//w7wN4TQJUqHlbTBo7rUV6+1KMYdrYAPAC00FTCeCmiTkkTulX2/BHQK/x2iJaYCejt/D12PfcV2Js7qmY7J2M9ii5jQF48T2q4y+xtooJHXUWuEnAi70aaQkKouG0MgvgcxwTfBzYD+qS+z7gZdnzvF+dZFn9Cnkp8SBrLZPzJhpbmhceXx6Ph55YiHsePBp7j1AjwKW6PhlH2/G2G6bjh9+/IzaOA0YCSqpNfDFBh/V18wPYWiH/GprA4wBe46zeW4dfngl4qc9rUON3SE3cFRYh4Bu9wrterk1Ec3J3bNr1E1GbfA9McWu+Qr+nNBKI0NfpotJJCi/3aWKaBi+5LS9149Of/kz8u3/37+LAgf1pWprtmXeckzfyVyNeROithhYAAEAASURBVKgAr4sgWvVIRYGKAhUFvgcFKsDrexCoul1RoKLAG5kCZdSqQ3a1kcbYBJScxXUgrQDV7ftHkkoJmrBP4eAiB7zfm9oKZjo/rsVlWy+Ldybo9Q5mgCfxH6MvrwJ8pa8YBuCCXWpMKIw1mYFOoewcZfNymrmcoxAF1DtDClgXV7O7vMvPABRaG/gL8DBD7/XB5qNpQphAIbmfo1zrsri4wxRqBolbuMw501KOa0OfUbRM2unnppbOtF944fm455674zvffYwVGRdKXAQZtaUMaqYpxAokmcbZAzfI29tiVgOwK2nEtTpC1qqCGdqBrZFGrOzaHLv+7kej/fZdsTzCc22EVx9MedEE+k+msG26pKyje0yImstYOp3A1PZL34nFe74dk6Q7xfsQZBTEK+atq2mGq2ai5bbg5V2U0mfy/JjLuetU4la/FQVeDQXsR/ahbH+079Hx0dg4szEmAO/lEwII5wo9ADHNmtU0wuYt+1emI+8TLIMnr9KXV+GTtnP59HJrGcfu3M+VGgsfspGnFqoN3381htble8GAl4A+aZjcj/3Ej8fHPvYxgLxJTOKHk1c00IrqsOosnqIwEcQkDUhOX/IuBqJJYxfAa2UZzTXsm8dqCzHBahS9znfj+L57YujwQ/gnOxYtLe/GAMXQ+mmq4SXgBamY4oAefBvkdfyb+hAanu35FQCvheiyUqOgnnHXeHy/rOfq61Qj/QeaVof3tSr6hcbWMuk8sbcRn7vnWDz8JIuRLG/mHsAh9+udw7Frazd+/EOXxR03T8a05pu1wjPP9T7PdT0BLzS8BASF7mvwyAnMGccwZ9Sc0gVJKNFaEPAq5u3EbWGmuNSKZUxIV+Dbrdp0jG+8Pia3/wirMr6TdrO5D3j5uESxtmWXR1wqH7O8nD9ecpufa8Xv//5/i9/+nd+OYyxg4rc2fc7ld4w4FeB1imjVUUWBigIVBb4PKFABXt8HL6EqQkWBigLfpxRg5KsGl6aCY2OjrNjILDHgl8KV/mdWmEEWZNIpeI6Ey5g5j43z2gSENISPooXUSU2vu+66K2677Tb8xbASGH7FToFbWLwIyDAAb+D3Qx85PrteqDuzjAXuOPNqOU/AS2nuXGHdrTPTEXixDC1oJu0EuoYB4AQTNQVNp7/rhM1zZXFR19cALwqYr2VQ0D4ExbUE6yiT723v3n1x771/EY888s0Eu1ypUTMVhZoCKKqp1vf1Rfs496subUBZSn9ARYBSKOPQDWmtjm2R/s6WUDBY3rEhrvw7H4nVO66Nhbr+h7iYZo8Wm7IqoJqIyfoe0GLp9mh7OCca6WLmcnQ55v70oTh5zyMxicbFJjRANMnN6DynjzU1EFLjBQ1FNWm6av9B96IlYrKFNueu00W9geqhigIvo4B8KFs07VptLycUXCRkDO2lV2x/3LSV2h/sB5rn2W7zGlpB86y8aNuWXxlzETPqefwGCnzpxwu9qOznuTgJ/cH+mQ7g0fRK4KJfUvtNJto/Lx2v9KYBQLJ2y6iUwTwFlt7//venH69tl29hooG+Sf1GR8YoF37LgnLo3Jyu26K8PcHzUZzPY5bZXkGDeKUWo2h4jY20SOmZWD50f7T2/lmMtA5ivkyN8OFVR9tY307RK+7VBfM0/xPwUktXV/YofrJSI2Z9Al5zTM5A79RAIk+DAJ/bGgCWV0+vsqbTok2pBSsQSV0Weebeb3fi03cfiReOj8TJzkxqqumofrS7GFP1k/H2GyL+lx/eHTvGl3C2T0UvIiRPAtBUo0xwqz7ejKkNEzHMSr498lqbC8i0izljvnGrx3emu4h2F4XXZLRd2xIbtr4thrf9IMDZW3nhU0Sy/fQLNnit2WK4ZqMY3FsXxWhHDp+M//gf/1N86lN/wPdhPr9hagwmVW2blLWc9B+8gF2l4XUBxKqiVhSoKFBR4DwpUAFe50moKlpFgYoCbzAKON5l4Crg5b6JQ+Tiy0tnwQpG3T7otZIgjsLTWmDk+1oCXilUoc3gAFsto8suuwwn9rfFzTffgkbBVOYNdlP2/TgKXYaymlQOzfP8zJ86gti5gmkWsfJcMU5dz0F/ygxFavA8TZigk4JMalYoXHB9bTtTwjiV3Ks7El0y5K6Up1zwuJx7S39aL7zwImaM98Zj3300ZucQnCkrsBRllJ6lTZQV6KhDX3AsaZ37V7Crp8Otfkiwy1O0sHTAvQphl6Ht3KbR2PaD746xD94SC8iyQ6wop8CuiZLyVxYiy1toZoW6aIxQvBjR6/3eY3HiTx+MxW88HqN4kp7kERcqmBifTLOt9FFEJQQfFwAAbAtqtw1AUYuX7429da1CRYHXigK2QTUqky/Aw0RpXOFOP14z0xuyvZ4rb00E5a9dnnERDgEm+0aC1hzqM6uNho/nPfsWGo0nF/B/RVuvwzf175TtnLj0TLJxQ2MMIGd98OrpgSvJS2QGp8c1nmWSN5ueExC/8PFfjBtvvC4B/WHM8fRh2GMV2joAEBA69XfiRM2sZjTHR/ABJR2Aqshm1GSG8L3VezaWDn01VvZ8PoZX9uKyi/jD+CbDH2OT1XJrQy5sgckfgNdQ+ruiRvAlIHnMOvl+rfCdOkFfx7Sxrfk0m/czeegokH/mBMj6mumsvwHoBS5I3fE1CDi/QOpfenglPnPvidg3PxYnVzck+FgnvVH8pQ23D8dNu9vxi//o1thcPxKjQ3h5v4iQX1S/Y4JygG3Dk8MxuXEiGpiMSv71gJfaXdI9eSv73jITK/jv6lCBNs93a9tj8+V3xdCWDwAsXk9dWBKXepwWSJNWlbRJpnraTe+V7dmnX4p/iznjV77yFdrWCu8XbbOcPCBfJpScIMvIZzx/PqcV4HU+VKriVBSoKFBR4MIoUAFeF0avKnZFgYoCbxAKCHCsn/0WrFFDSgeyw8yuKxToy2tpidUa8Q+TPmEGtGFk/FoCXppQLONwOZ3XUi7NTbZs3hy33nZrXH/9DbF16+YEwgZAUpo3Ioy0NPUh7jnRDCo9DMhyroC8Q72t+dmDzo0H9xX8BvkPHhFEUcvIQb0mdpqGCsJ4PAygWEeYem2CoophUPbBvpDCd7eCgPTiiy/F1772tXjssccQZJaKVhdSlwKhAF2WHcFLYUYgtAi4Ck2n0stszvhRMNO/jmGggeATmmYNI+yuKIgi7M4i5U689dq47Efvivb26ehgCqWgVyyCfGLdloI1hkyat6LtMIw548q3n4vZLz0UQ08fiIaCNcK9GnSTk5MJfFluBXzrYZ1dfCHBATTuUkOBetruv1d9jFGFigKvhgKCBAOfePKJ4surhun4RMywEMcEbfZcwfZuO07AC55TwPPSt7ic5oyCuMmDBGgWFuLkyVn4H5pVmN6p/ZSBfD3yeft4mqJ5rXSCl2Vvnq8EePlAgmbwsyt3Xxm/+PGPx3vfe1c+MwZAtbg4D8SC+TEgDPqh9D+/IYBTjWHAKvw/AYqPNPi+gJcINGGXByj+YiwefSiW9/5PzJafx18f9cKvlZqbw6SJupeZxjKJDY2QOmmkNhZqb03qqnP/Nhpeanl14DMd/AK6MiSfA/gAkxDwAsGacwU58ig8iCphvt+LRZAm1nyMrz5Ri0/fczz+f/be/E2z46rzjDf3tTZVSdYubGNbtizvi9ptsMHYBtMYmsWsz8yAZ2l+mB76L+mGWXADhudhuoEBGhobDE2D8YIXLLzKsmx5k2SppNJSparc883M+XzOufHmm7WpspRVKlkRmfe998aN9cRy43zvOSe+jYTXYu8I7yDTYJdGJLz2jZ0sb7xtovzCu76n7O89ViYvEvByF8YAu5zrKPA0GwDMH5pBQouPBDSFz9MJ8ElmgbwEvfoAUSsLSLGyseG6dRy9pVx9/Q+W3sE3QtxbCOyOh6e9b5ijUSglDRP22SADrp078/inT3++/Pqv/wckgL8Y82YAqxGC5gLEda0QgTu/3Zwa4LUbarWwjQKNAo0CF0aBBnhdGJ1aqEaBRoHnGgVY68owCdLoZIIED6YBvDRgr50ZF7fLACNhEwlwYbDIJc4lBbxQvbE8SkgEgEX5xvA7fPhIue3lLyuvfvVrysGDB5AAmOC5kmACGdYFYCXKmZXyd3hJb5jxDsyzzmdzHTl2PKppmL5OBqACXtxEHjKCSnVUungdZYJzCckjw3FE/Pi9VD+1tLJG2U5rGHe+HwP1//iJT5S77/5yWVrEsHRXPr/Wy0bJQEsty6j9IesqQJdlrmmerczkAyMl6BXGlCPXDKekmxJ6y9iaGaNPnUAHafS6q8pN7/r+MvqSG8rCPmzDIM2hhFe2lInYzbIcShOMkMYEZRx/8EQ5+em7y6mPfrHMHDsFA2gZVV9FYoG6CHrNz+0Lhly11wlA09h8AWmYVZjDPgyzDL/9PZvBPJtrFLg0FIhx45jnr6pZO2f4MWF+fl85cPDgYD44vQRVuqemERMv/dYx6agWSBawti879y0BeJ1CWtO5bxQQSMNPda5yV0jncp1z0+nSTsN5m9b5AC9Vs6M+jLuDhw6WX/3VXy3veMcPkcQm6vBTAU5bvkkksUZ7bIzBlLIBajOGpJZ1WkblcnKCd4tDD3BqQsALwGjpJHPSA3/KxhRfAwBaA/DaKlPsUuj8ji4kYQS8ALdRddzQjhfAlNKq1lXB0nUkvAS81rXpxbEF4GUW49B7jLlBwCuN02dtVRGtrsf8QpAACdeRFutz0wfQ+dbjU+UvPnKsfOpuNsIYuQb8CFV/1SrXnijXzq+XH8Vo/Q++gU0I1h8HeHPu3L1jM1rqA0UpZ4/32/R+ditEpVFbXrbTTsCLcto8thHt2F9mo4IFNpUBBFyF1ltjLyrX3vjDpbf/1QS6jkMKnA3wQjIw4LNzAF4k/3d/99Hy7//9fyjf+OY3Agh0fo2db0nTudV3h8W4GHc64CWy50e2OcaEO2XqRlmH5C6NtC+00dnXm2sUaBRoFGgUODsFGuB1dro030aBRoHnPAVYUAMACEiE2kdwT+wAFqqN0zAcMCYswgW9FpG20oh9BQz6cDK5DM3fvSSlKQaAtSPRbrXLw7m5WaS8Xgzo9epyyy03hxSYi3GZulUYKlfo3IbKj+VUssrnpqmKTDznPiQVIo9O+kEwi2wMF3ZgoIcMp+CWxqe1aSVwol+CRQl6WbJkIlOySMLIFMa/8b3ABTNp4MFz065PTSPBtAh82o9MQmzZTnhTMr8sY8ax6EqUxHbxESaChYTZIuDWnXfeWb7wuc+X+x94IOKZrxJPWZdkrk7L8oJvg7WkWNYvGDLolvgV95SJogYNRmAYFwCnlmBY5158czn8pleVcvtN7NYIU0vbhR2b4KOIYCQY4h6M7eQGnk8uluXP3ltOfPJLpXzj4XJgmTzGoYGgFyW1HvZjpfeUUlQyUMBLBt1urR06dxxd64zZD2hNvGydpGvXOFamuUaBS0QBQHf65v79BwL0kqHX7p9zijYAHduMHMYQYHP0w9oZOYeH91uo7C4xhpW2SWnG2KEUPxAmYidwsNsKmPNTAV5KTTqutE/4sz/3s+UXf/EXKLfjbIOxh3SZIBPPtcE42kNSWDAG4GWT575vRkaUdE0oZgQjX1tbx8nyIQCvPy7rT3yO8EukjZoeIL0fOabYrATjXTHS+wLrTjJMMAHaWFz+JgG0thZXypPs1riKTS9E4wLk0saXdrdiPjlteq2gl/GdPzbdMRbajVsHjqMnxzBc3y///Z8eL/fcj6Qz5RE1u/5Qr7zihfPljtsPlpfeMls2VpRqI+5ZnG0rLcK2WJQpChzvJzLFHj8Hz0cA/afnsKGpsXqAvnjGxBVSgpQpNkBginJ+d2db1VnXsWFoKy9T/pURNkQ48qYycy32u8aej+/hKKubhdikAxf9R3tjTtiI2eF8HKrrXChZuMac+/73/275/d//f8tjjz1KGdgIhj/Lssw6wA9GISk4nG6kdGE/9u98f/rOo2fQT2ZnZ8KcgteCsgKdKbVtv8qMLIP9s7u9sMxaqEaBRoFGgecIBRrg9Rxp6FbNRoFGgd1SQNDEBWdK8biI9X5c4+9I48xiG8kFqJIxSv+oLihj5r2rzku18EwAYrgudWWdZ4GfOXY6u+GG68vLbntZeeELX4jERLXrhVQYu5XJOMpsCGwIdtWdBwVDVDOSoYhF/yAb65MckQCXz2o59M+FtvQChOF5qP5xNg9LJd1kHWIhb5pElomKVLzmL9OIRz6MIuTz+I20jXo2F1/YyUtJsZBWIL4MiOUwrzUYoDCOT5lCUovnhnvgge+Ub3zj6+Wz//y5cuzRYyHZNQazreSWaVnerQhbaXy23M/vpw2hZJtgmOgU8qNh0yuYU8oM/UYQ/9JodhhXph5T111d5m69pcy87qVl7SpUeGD2+kg1rGG/R2mxoDHGrccWUW96/FQ5efc3yskv3lvK0eNlbnkD+11I/sHNRj60iX0xmEv6q8CXddQe3bYqGGWiHG7CoGSMTLtxqHqca9tH+0mTLs3z17w9bRS4OAqMAiII3At6+YGhdsYYjzGxOqY4umGZs0zm5fjQe2kZqSb6cdgNZCwr5bWM3TpVkRliT+26tIcDhlpygCIOjDMTcR5S6tISmO/b3/G22Knx8JFDVKFf9s3NcE4bUSOALWO9ibBBpqH8HnPOJCqKIXFG1axhVHCLHWK3HsVo/QfKIsbrN/uPofKI5NcmdWOATqn6iXojeFFIPMXmGE56g/IBIFrnlXVogNTTKXarZI4YZU52LoqDqX24NrXqgl5O+xSP8lAnxr3208YBoBY3R8tji1vlvsd65b5HNssTJwB7APZecMNE+d4bpsthTGT1UCEdrZkME3JwnfO8DRat5ismK65X2RCMYzfGCYzVT2OofhI7Z97HnOxcCo19d9mmYGMR1d05+2u8jwHglKBdBlTcnDpUDl/71jJx1fcR6HpS3k/hzMxadzWPk7mmJC+65PGsvpcM59MnTjxZfut9v13+7M/+DDXZk7SbgCUScMzfSno7vwYIpedFON+VMc9SHtMZYyy4WY6b5lhfnR8uHBfxfnU8mJeTNRcxPAzUXKNAo0CjQKPAgAIN8BqQol00CjQKNAqcTgHABZgY15ICJCHxxaLTr7h+dZ1AIsoFt1+WPS8jQbCCPa9Yg9aF6OlJPs37WJebRixya2J1de2CNwEOJQyOXH2kvOxlLw1j9hq2D9UQGLZxDSgL0rmjI38CHy6e3R1Nu1rpapoJOEmElPwhrGAWX96TGdIOVz8AIpm8ZNik2ZmAlymJ/wh2yUDEqTsPmAQenQ6GGTC+mtfqnnY231FAPIGaYB5JI5gG0pZh0Ri2kni2kcCXjNC3vvXt8slPfrLcg72uJ59E3YlnCdbBUEEPaZLllQMbUP20nM9/K89J7lEK+WRVGhHgCiBKxlR1Hdg1eCwYG6Q8BNq05zO2b7aUg/vK6I1HSu/aQ2X8hiNl6/B8WZuFmYIWhCqjJ5bL2jePlpVvPliWvvFgWXvsCWz8rMcOdBOECWk2GFSBrGg38rWNpYuM0yw74oVkHAyaGxXYFqo4Ctq666j9QwkZmUnrb9wIxN2grc5f/fa0UeCiKOAcIviuHa9ZbHrJ3Ns/c85jTDOO7JOOKfGUhCIMwNjiTvVhd2YM9TImHOeOFQyYC3j1NwGLOlAlIvCTMetdd450d/oFmGamxhgAStthYl7jkWrkpvmy224r/+v/9j9jW/F2xuMmdhYPoG7oPOSHBiVOBWwwXM+Yc56yzs5BOf/pw9yAlNfo1pNlZOETZeGhj5fFk9/Azhc7A6LuKAg1NTON/fVp5hHnkuFiZa0s7YiAEO8vpbQWmTeWTyKJi4Qon3L4GsDZ+cKAuDjh7dlDWEgIaIJ5YzRQNUAv6TcJnUGZTq6NlKV+glA0G/a++mWauk4SyR0e10hh8zR6Ezuc7w/n4qgvcYN+ZBo1d1pEHXF0ls1ikHKdRiV0BONm7tYY5aKMFfAJQ/HO1xxBX1Qv16mrr7KVkX1l8sD3lEPX/0Dpzb+WxA+R9wyZmUrSyMLU5kwq4hE66PkxSBBKIItXRLkXNcb/+//6f8o//MNHAFQTHHNt4PM15kz7qe+NKKQJ79LZt32/RtEooh8nZmfn6BsCXPQNjgnfEbzfB/W3Kjhr013GfftpFGgUaBRoFEgKNMCr9YRGgUaBRoGzUcCFa3BZ+dBFrWonsAYh9TUDkzGpWiPAT9h5golZBexawoh9H4PhIdV0CVafLmrD1bTP8MgHllWgQ1teL3nJrYBet5VrrrmmHDgwT7kngiFYU8WRJbJSXQIjYTieL9X6JVOZNJABdXEdIEgs6s3UI8MZlv+gxfkAr4wjo1Jpuw16ZVpdCJJOps8LsvHHDM7lIthQ2Fj2Z9oykGHEmbYUxHriscfLV+65p3zxi18MI/Xa65JOgkDmKQPmXzItptkd58r7PP6WOCW8SIa8lfAaBry0Th3yIDBOY3CF0wCoU9PYqKF91uhX60h1bcwhoTAPEDkzUfrY6DFNIbSRBXYHffjx0j92Ats+7IyGf490+hqxp8iqTHGiPvBuwVkm/RLATbUxGewp7MMIeEWtoYO0tu9ozD4N2qviIxmSNoKbMl6Ga65R4FJQwL7mPGLf3LdvH8DXPH2afhnjlPHMX4JBjAW69QhoRfR1fkP6h7BLqugCJDlvKMyzhrr1MlJeaxv4OQir6y539Gb8hu/rtbmmlBc+FSGp6XRnPwQ4RvzwcOTqwyHh9a9+7EcALXhfgBQJIDPFxDtjHODCobmGSrF2x5QmJmEyz0JFXs4ZBcmh/lfL2tFPlOOP3snui4+WqbFV6NFHxXCS3QtnmEdQi3SMDpfHYvLXg25j0gHAanURKc6TSHktMq4BvTSOj+BozTJiW7WaDoJcaP4JiAG0A/iEaiNpMWVgt4s5ivl1A+Au5g8q0wMVGiFdd3a0Vaoq9nCxBtfkS1I5xQag7j0pEdfdN8vceJnYN1nmMFY/xgYeBtR/g3M0EKdoX/IdoY5b5KuEl2XkH/ALEH/y+jJ/9SvL9HVvYndLdmfcQiJuC0kxnfF1Q/WlxOkXgJdzJ+XBy3YVQPMjyW/8+v9Z7vryl4lmX4SMzt8AU/ZPwcyQLK4EzNQu+Ndqx8eFiJGbE7jLrh+wfKZ0tv1GSXM/YLnOkGZRFenSXKNAo0CjQKPAGRRogNcZJGkejQKNAo0CUIC1o4xXdanSmIth/bWjMc3X9clJAYNc8LvgFfRaXl4GRJLpqbH37jwo0XDaQ56WzYWwX73DGDSF0ND+DTfeWF70vd9bXnzri2IXR5lJF8uq7iXwxdd5/BK8SvVEieDi2/qFvTJW/GHcnDQNpxP8UMJKYElGL6WklFI4TcILrsEYSVPT3b62+KToj1nyHz8RNllZ/M/nDE69E4iBSZH5oXxRNsq+ij0XbXU98MB3yl13fal89WtfLU88/kSkqJRFqD4RzjSslqBQ2IPhJhiK8+V93mcyoMhhWEGvZMyimtQWprYn4OUzuLMxGKz5qdkyx9f8LSRa1qGlKrML9KWTywtlFabKHRsFAiwfxI54mOqCATYXGFfSXIcJXoWBVuLNsNYnCes56URF/Y8+rPRM2BMC6FSyQABX+lXprlDVRRJQsDNVGSm3kW2j5hoFLiEFlMacB/A6gGqjjH6OTYD3ESQ52brUsSR25aYOubEDPZ0+3GM+WnKXPg6lJ8WPNpgDVgC8VvoARVWcibJHLzaN4XoM3XfYUzx1zIbKoP0/B/VwrJgrtNclqCXgNQFw/eM//u7y3vf+crn+huvKwsknIh/tdiklrLqaOE+oDJPnOGNwCwPvyMzGVJiFGkf6k7puPli2jv1zOX70I2Vr9Zto9p0iIuAzcSYB07YAyzepezrnGubBrrzCaIJeGqDvQY91QC8lvfqAXsLi+lnPGts5idtwWxA4tPsAy3rYC2R6oCwYhWf6sT1GBWKgh/OE6tkawkeAOMCx2LnR+aQm3KVZT87tQUo9SCveAbxizdtj4ip2rATsmlKVEfBfty7A05FfujlPj1IQQa5NVNcDkIP+fTPdgr5zLylzz3tz6V11G4W6ET+M/OM/cKQlnc1P520WwA1egBEBsnIOLWUBO2h/9ud/Vn73/b9XHvzOQ8zP7hbpXMn8TVuahu9934eDBE1vl274PeS7e4Z3grbOfBe5O+c4eY3x7jBcBbzMIsouQZtrFGgUaBRoFNhBgQZ47SBHu2kUaBRoFOgowLoxGfvuPlbELLZZ/VYwZYKv6y5I/borcOJaM3a+A6TQCLjSQnvtBsvZ05Pe8UDWQfsfCcSp6mcZ92HL6wUvfH75nuffXG666SZUbA4jUTQVtkdUZdSQucnKSCRolICWxpE1kmu9/ZodX725NkvBF58LimnDRCKczYZXMHWRukxOxASQ2aaxaetkgvLfczJEA/8IcZafCGpM/mC4BG6irIBG1uvho4+Ur3zlnvLlu+4qDz/ycNTB51kDeGLCpJombUjyFiUYCYEz7gNgOku2T+21DXjJLIcNL/sE1/GH5ESoKMLBTY2gujI1EztybQJ0yfKqZrmEmuziqYWQwgtACjoLu1r+HhIj4xCxR3ttaTvOVKGpDLMXgo7WZ9sN3cmEWhbopU2YKYDbcZhX49hWtpGSX30AtFDVpU+Hmif+CXxtp9quGgX2mgJ0QeaHXjD7+/fvD3Vrx6FTxwa6ckAcAeoEUBOAF13evskxQj9eAaRdtM+yK2GAP4xxAa/lNfyIXV2MCIdk9fA8dG/61T014JVSWtWOV4/Ir37ta8qv/dr/Xm5/+W3l1MnjMceOT6Cep4gUjioCWjHWuFYSFfiE8cccyx8TD0eqsk1uHMfw/L1l9ZH/XpZOfB6gSvAMgIcwE8zh49jkS9i71oW5gPw3EG+r0nHa7RoVLULlb/U476hTAILr5APgNSz0tgPwgniWpY+xdnd9nECVUQIhxMwcCa0pe1ZCZVLmJNCxpBlt1M0vQyS0ygPnHJNlIw/VJU0KgowxrylVNn31XBlBsrUXCFq8LKivxXX2NP8E2Jz/NrHb1QfU3KC9yZh/31kzZeqqN5Te1W9F7fNmEsdYfVG6S0DKeuAU/+NyQLuusErcOff5QcD3gRned/8D5Xfe/7vlr/7qQ+z6iTF+3q/RZtQz7GuRjtLSewV4KVU2TbvOodbrx5s+7wOlclVp9IOGY6G+p7IuvP/0bK5RoFGgUaBRYAcFGuC1gxztplGgUaBRoKMA68Ydi0fveeTiN4GsXORO8qV+CvVG1QF9qGSMX4afPPkkqhnd6nkPiTpYzp4t6XjoAxgCyuIiWQYibGz5hZ/nk5Pa9jpcbr755vKCF7ywuJPjLEZxleAJkMNFPGET8ILJ4d4t0AVDXFwr4SWwFIkFPWAuoiwwLZGHUgAJtpi3j/IrNIyFAaOMuTD3uR7+ysLI5AaP16VvefMp56dYyKetKstr/u6YtRzg1kMPHS1f++q9Id312GOPkYf2VvwyL41kBq0vjBoZW27LKwCmdJwAk0x2VA//3Tvrz5d56iHzmTa8OJNQspGkTHlnxlDbmQTsAnQKaQkCaB/nBH1ImzRbSGxpD0e1RykS7D6XWzKb/lsXyrsFgyYvF8yQXKv05FSd9JXOXYNFe3kvsGX7TgLeCnqGxF4kTGTSFnjTHpKH4Gn2jZpqOzcK7DUFst857mTw9wF4zaPWWKW8am4CWXUjCP3EMDaZU0Yx/r4CIrMAWLxOn2UUg0Rgx2sBwGt1KdTOaho8cVAYYtsN3Sd4k48uCPBiPDum8qNBv1x//XXl1/7d/1G+7/v+JeNzLTaLEIjJMcXmEIIqflDgcI7bxBj95hZSaGTpXFBGVJvnHbO2wPvkaNl64r+Vk0c/xiT1MPPTGnMB8xbvnpl980RwfrC2CT5tAuYozRbqgTxRmkvQS7tdGN4K1cZl1BtHmDZqPc1yGPASLdRPwIuXCXk5rbgTImBVyJ4l+Mi0wTxCwE0umKc2KZs00N6g9D2bq3P6hqqIvCt9H7gL5Aw7MY5NUdoj1Akj9RAl6NGDRluqhVIHVQd9zypRRgjALuanZSW8eI85HxaMvc/sL+PP+wHsIf4gNT+I+uU+QDAkvIYBLyuP04qirtLBeS9Uwal8fgQo5dP/dGf5jd/4jfJ5dvSVjL5jtcHmc3tQth/vFOh0rjpHJk/xYzokHSDaDLYW53g/+x5U6lc7m76PtRlmw8RcDC0MnzY6aYPmGgUaBRoFGgV2UKABXjvI0W4aBRoFGgW2KZAL8m617qrftaS3rC5DQojrURbg00jmqN4o0OIi2WdKO2n8W5BAkCUWxcQPG1GEyUXydl67uTrvkrZ7KLORi3D5BdASnEDGBoZNlMiaZiGthNdNAF4333Rz2PdSksKvytaxAl7SwMW1jKf2ofqoBCWQ1oFBsdhOsCu+bJuR8SN/b9K5INeZXh4yCZIyUJhBeNN2x6soRxfe9GI3LJgLy6WLNAhbaSHNtTmlRNSJEyfKgw8+iGH6b5WHHnqwPI76olvVB1BJhMrA1HRq2YJRwTN3qhQ8SyZIBuuiXNQVBo06pnSUrJYlToZYME21xRlswc2gzijTuw7YtiqdCXPixPHMlvyVwAjpjOiHsrSAj6TrbfwEHaENDKD1qCpeg3JbBSqa/TbrE795GXEEFJT2crc427xKdI3C0Hm9js03+/MKdDYd2yXrkkWoecWzehPn2ko7PNtNo8BTUiClXNyxcV9Iu8S82Q1YR789SykhD/s+HTnsWq0CzJ9aXCgrS8uRh+p8q8tIS2K4XuAgwtfcu/QyterJuRsbAx/QkG2vM/u0/T7GY0R1fGxif2y2vOdnf7b8wi/+HLs0Mq4sHx9JBNWdq/wYobqa6uQCGZsYqVcyzF0bI68eHxsAxLeQTBsrJ8vWymfL2rFPlCcf/Rwqhk/yoUUwqBdqjRrWEhQyD9MwAaeFNYCvDQB0Z7MRgKVxjh6SXZsARKtIeS2eWAn7XkRLinZVi7lC2gKsd9NupCtYt9kHaPJ9Qj1EicbHc17fQu1xU8QMg1+mt4X0WLST0z1pWSfnLqdUryV9nxuvxwG3ptmRcRY6jajGyM6MNrBgfl9AzPmYOm6CbJICySXIz1u3rCPdtbbUvWup9MrY88r0oVeVfdci4TXzEjKZRB5upgO8SKdKeJFvdCLPFqJzztm2pV5CewtsevBf/+tflN/+7d/inXKUulEOy00AP5pEF+roVtO4mLPvtTq3KkHuxg1haoC8pLv2vKS7beJffrihEFlQyrwHhbiYgrc4jQKNAo0CVzAFGuB1BTdOK1qjQKPAlUyB/MrsSlN7XkpJqX6gVNAGX+3rNuXBYAF8DRwr4wASBqvswZPLcNExZC7kY4WuBMUUNr2OhMTXtdddh6rjzXwZpy6AHq6hlfySOQwJNr6Gb7rLGS5BK5bcMGsCIt4LtJhuSLlp86nLQyY1DutMuJ0qgjANLOZDcojwLuY9VMc0bDiYk/FxDLdrjJgv+LpQoySMaVnGU6dOlWOPPFLuu+/b5b5v31cePvYwKkSnAnRMFbzLzwgEjWDCc8MDpcmgg1JZ8idwkDI00tX+41k6y4yvIJ22GrslanQ7qntZfyZo+2lt08E8C/qFEWZKINgoI7gMiFDbWCkL/Wt/sM2sbzR1lJr2HpDei2QSL2uFWmbPMgpkp7dPOYcIvs4h4aU9L4H3LeYDe1JVX45+CkDkBwcBMm3X2S9PnjpZFpgXTMM+KCC+sHAqQNsAhfEzp5inuMh+asoX53K+2x6wqrlZple+6lXl3yHl9bKXvoCxjSpcIEu9GOeGdgc+57z8GOLcBsilyFTnnB/WBKkwXj85fgzVxi+Xx+75AGDV18u+WaQuAcg3AV1GsHM1Nj1JXMYsdOitQ6fVkbIyiW1JsCNtXSnhNcbwHOesLS7VGZ/4DuqSqDkyuOMQKwsq8COYthnIFX7EV6IOgoUmoMXzkVhWOsIizhqCZp2PqoaG8cNQ2JaEyIL5VCckz7TJBZGQ3kNdchrwH7Brih0ZC1JeOfcJhjnvUJYN1eoFqwD2sLY/Nq606SrvhTXATDaKAXwjKQOWhbk3lPHr/8dy8MDhMt5LdU+luEZCpVHor2v8rpyDU+cdG9RQVsEusi7f/vb95Xd++3fKBz/4QYDKZeZq5crMjMMA1QXhdnrVRxdy9n0miGjfnwPsmp9nt176hsCobo775hoFGgUaBRoFdkeBBnjtjl4tdKNAo0CjQEcBGfdc6SqlMwlgoUqYzIrARUj1AAQI0MRud0jGhJocDBC4B2vy4VXy5SIqjIoSQJRP5xdjVUMEl1J1Yq7cqLTX864p1193fTl06FBXJ1TeYLpGYDK22Gg+eR7Kz4W1iNT4MYw0CWCEdHUu3IMJtdK4UK8EEDGcjJ+MnQt6aSNwtRHPjIsEAc9HoO0YX9PFDHswGcHIkaa2xJaQ2FhYWECC63FUFu8vRx96qBx9+ChA18lIy/IluGjeHSdiIS6byz4yDAaZdUf+AEgD6KL+MsaWUOPPK9RrBWmqS6ESeyFVt4/YJyaQRFHaS8kTGbEK3Fl+AcpV+vQaIIJGm1OK0RokSJF17MCuWmEf07R13FxIWVqY5yIFcl5x/OoEjqYAumT23dRBY+Gqvzl/BDjO/CDoZTjHmoCB84lzwyJSXikVimF1xtQC90oqhrNfRhaZz9OdIyI5krL0Mb8x5/keuOWWW8p73vMz5ad+8keR/F2MeXceMEMD50oJKcWjFNOGoBZxrJN1q4djb42wiHmBAyHltfbtsvTAh0PKa7Q8hlpfpz7IXDkuUM27aBSbgA43y7GOeGifKZCRGX6CVmOUc1QpJsZjn11eN5Z5T2HMfnUJSVikv4w7ZoXIW21G6aSfcSMd4nnvse3yLkPoCx18D9SAtBkvHwAxzvyDtZG2hth5f06PY5we4B+gqwdgx6Qf8U2DFEK9czOs50MX7RNS9o31Vd4fSHMhKbe8ogF/6IZEHLt+lHLkrQBe7ylTE3yEQr2Rtw2Hc6ymB+wnpG+9hp3lxOltu6UR/rGY5z71qU8j3fX+8tk7/5l3i4CU5euO4XSG0jCt3Trn3lTvHIl+oTpjbj4iHXt8WGOXyeYaBRoFGgUaBXZFgQZ47YpcLXCjQKNAo8BOCsgTuIjXoK9f1pVAUGWlglsyP6uoNy5hMFkVx2Bi+Az9jAFelFcGynLLbMWuizAlIY0Aw6RKm+DXwYMHy9VXX12U+rrmmueVq666CtUKgQ+YJRiLakNEgMo0lKiQUQsHE2MGQRrz6sAcjTELjghsyYgZXsDHQ2caPpN2ckQ+FxBzB6zFRezasOaXmV1CLekxQK6jqCsePfpwOfboI+WxRx+Dvti0EXwJpgzGhbOAV24oIHNyeV3mn9vUJ4MkZ2S9NPQ/Fmql0ls/VTuVmhIc9ZAOZzBkl6342X7Zzmm/LYHJlPay/yiNso5kiaqi2klK2iOJ0QGdNr7t72+MkbjEh/bgv7lGgXNTILpJgiUVLBY0n52dLwcOHAgJVMeP41pJT+eXmFfpaM63grD2QzcOcd6N+YQ+t8Y85f3qWt1QJDuieWSf9D577bkLd+4nghXZv+3jCeg758+zWcgdd7yh/Nt/+2/K/n0zjJV+zKduJOLYcWytMo6UAI15lSyMH3Mf9bQuSn6qwjdZFnl2jC0D7yqnHv4nNrT4CsDVSWSXUFWHDuMjAl7TzOdISQEGbY3xEQGJuISwuoGnCBd0CgiIfGLWRsJrHZXA1QXmcsCvMP4OACd4lbNx1jsBL6EepcWYj4nP/8AlpGY74MhnFFVH5+CQ0OIn7JKhXqlkcLw3UWMU5JqaRtIV0Cu2eIw2CJiL8MZB+s05B/LaOnx3CRXMrWXbGYnYVSRO8dsMFfQ5JKNuKBM3vK2U/T9A+JTEyloq2eVun3706d5VlvM0Z9kD8OI95I6IDyM5/Cd//KflT/70v5SjDx4lc95pEecSAF7RF3nHAurOKmmNzS7nWzP0fTiF+ntzjQKNAo0CjQK7o0ADvHZHrxa6UaBRoFGgowBLezl5Dx2LepkupbwC9AopBBfVAF4wNUrtrCJZEDZP8E0AxIiX07GUr0W23DBSSnjpLHssrKmHZROUkeHyi/JBJL0OAYBp7P7goYMsxGdCvcgFuSCfdBA8GxihjzwSYPKZ/jJtGxhk9ou/DFDNU5U5d+Xqw7EI+sjYCpVVME5JonVAtSePnyzHOR5GgkvVxePHn4idsjROL1OZAKNsGNUC9DI/JdmUEEuposjyMv/IDHb9hJyDCYZpURpQxkWgL0BC6CUTvKxk1/JK1MV+FTbHLnOJzS4Yd8tb+8agzO7kOBmSd5YvHPVzZ9I1jUbTv5V+UIovWrhr5+HrGDN2wuYaBc5BAbuWYyXGi8x+TFoFNevpsh/AS8nTifHJmKeyr9qfCC+gwhyyBvBt3DVApJWV5dz4gXt3uXO+WF3RdtaQKq558DylQS++bw4AryxxzKdKolqfm26+sfzqv3lvedO/eGPMrarAq8qoepxjQoDbedc5t4L2dX4QCDfMKGJZvfVlgKaTTNiPlXLqy+X4I59EtfFbZbJ3CtU98CLV9jBy30MFnA0eyxbqjFtIRKXdKwsGjRydnK2p0JTSXqGqiCjXFmrjfaW9kPRa59zX1lc3D0gjbaGJ63kmiZhjKbYpdql5nYBXAFS8AgXFlOYyX98xqjeOjLO7JBuozGCny10YBS5Dqkti4Sg1Eq5cmJmvUTU8LTNpjWAwPxAu25ePHxsAgX0ArGVUHicnbiqHrntTKde8BlDte6MsJEJkpbsEvHxH+IbR73RnLaKUEcY+5AedO++8s7z/d363fOYzd0b/iXe3lYs0OGflMzG9ccNe6XPhv6Zv28/YRzhbWgHCcXZndHOR5hoFGgUaBRoFdkeBBnjtjl4tdKNAo0CjQEcBlrQszoOB51LAxeuwxwQjox0sv9i79PVrscCNxr41Zi9zowrb5Xcuw/OIRXuUjXu9Oie/0QPgEHZKbxkcmRTsq2CYf25+LuyVKWkh47l//4G4d2F+AFBM9be0o5MqOS7WdZtId62zc1qAUB24FkwtzFQwFpwD3IJOSmacRC3R4xR2eFb4kv/oo0+gorRYnnzyBFIaMKyALDoZqGgDr4PeVAd6m2YwVzwPNcnE9SLOZf2x+kFIygNx/XLvV3t39kzawGDxfA2pk0WlT+gjhlNF65mRApSmdgKKDbMnsysdlTxRGk2plGDE8UuwzoAyhqrHunub7bcc4IP9vraxACYjIfpSbafL2g4ts2cNBZyDwjkOlA6lPzomtHk3h9Huqw4fBggAKKEP2lEd74Lc6510aAVoHPeCsALiAbTTB1dXV+if7t6oVCpAEmkI9usS4K2Zh9eufiz3NvCfEjn2fz907ENt8V3venv55f/pfyjXsXOjYJwTg2VTolbnhhCWxTg6x5eHY2scUMhiblJmtiQsk2NuHPFQWX/8E+Xksc+U0f53yiQG77XPheV6IiMJNEVa09ZHA/hZr8BpuFNyyvyd5b0MKMiHjlN2cVxfAUTC/lZ/FQkqVB3JLJ5Rwe6c9+7M6AcNU4u2iFQNjh/l7SMR7M6ZtqHG+ceQ6BqfQFKU8+QU8wmSXTrjx1zB2V1tff9soocZ79Bx3q1Kq/nlgg8jI2ik9gDWQTbLKmqNW1R6ZRPVw97+cvjIG8vYkR8uvdlrCXTAGKRkagl2eZfOc72O3Dt/5yn7VPaJx4+fKP/lT/60/MEf/AEfWx4JMkS8IGSXRlZ+O1muhr26hC/4lCq80yEB7EYm0sV5d3JiKt6tF5xQC9go0CjQKNAoEBRogFfrCI0CjQKNAhdFgVzSJtjC4hymy1WuDIvSUUpGuXAN4+rYmHHRKqixhIRB7tz4dJbEF1VgIpknB+v0AFs8d9xlMBuUUQZQ478u+yvDZRTBDCUNvA7wA4BL4CbAG+zGjPHl+eABAC/OAiJT+E0A/IXqkZwa9FmDOTFN6SKrIGOqOqQAoHTRGLoG27Wzo+SDzKnP3Pp9FTszfcIHU2oVTNPayIBRKEGUZFW45Zn1C0aY5/k13xwvt6NElpWsBQEDDNUuFnSJHdmolzRVrUmm2H4h426beBj3GXP2jZp5V560/caOcJQ/JPNgwmzfatTe8vZRMVpdQdVIEIJ+pAqrwEJK3dlOWbeadDs3CpxBAfteACSqMwN6MF+M089k+u13B5hnBLxCKpX+FNKgjqNQaXY+YLzF+FFlux8SX2kIHMP1jLHlpYVUGyaOqm1KHDnUNgFTiIYb9HxvLtglYMO86RzKvFM3fVCqbIzNKm59yfeW/+W97y13vOlfOPmFZKQfEub5iOC4UMJTV8dIliWmM+ov8OUOjilRu8V8MTHyJKKh3yzrJz5TTj36T0hqnUCLcSXmaHc07AWwhMQYUrgb3XxZaybI5XXWPK/rMyXllMqKzSeQ8FpfAPACPBQA31KCEzo5nkMC1XQ4pJ9OsMjUvN9kiu5NMdfH3Me7kPJoryvpwhwNiEcDEIn8zNMEdFQ8doZd88MLf+NrpEG7QrMtQLgNADmIR/65m+06afRHUXU9cGuZvvrN1Pu1vKSwi4Z6p22i7UffByFZTMES4BzUNvMcqgGfeAiL3TTAvi9/+cvl937vd8tHPvLRmNcCrLdhLhHg5RzqnCoIGpvgUDf7d7xTed821yjQKNAo0Ciwewo0wGv3NGsxGgUaBRoFWB6zMo3F9DYDX0Ejz9MsWAU4VG8U+HF57df8FcAApQ6U5BmssS8bPVnKw3xYdhmWQfk7ZkhGIxwL7JCSGi6XHAyPZRzi37Ac8df5C0IJaAnyKcmUBuY7YCq+tXeAhwlQhjCaD0Na7XoFExVkNX8zDCp3paDcUS4lzsiVvAyiZF0wNYbSvzuikIIuthEMTNx3KV2uk+Vyty+lVMYFCFHJcot5aZQST0h40BcWkFirhrSjfaiXDHoyZpertNv5BNWlW9BSrpVn2WQRSJDRvl0BTxlY62qZBbqMp3SNRrkFNJW8EXgwHsGaaxQ4PwXoa4JGbpogICTY426yjg3BFndsdE51XCkBZN8L4Jj5tUp3OT/YZZWOEki2/ymJ5KYQSwBeSto6H5uPedjnBWjtuxc7V1SJRsvlTr0aG1cqUolHJlzsdh0o//onfqL85E/+a6Rjr4ps5mYxqm69AN8SGE61bkEP57Yq3TUBYCYgNj41B/A3VU6eWCoj/cWybx57ZKt3l2P3fhDA6wHUHR8HgOqHeqPG/cdR/dyYGitr0DDmaoAaAarR7mxtQ5KU9EfcQZbhLlClwXZGaxnjNeFRAL4gcqiHbkA3VR0DAHNAD8Z0Al3OuHptQMuJOTY7AdhSQk2bgD2N0eNvm0UYwnkVSZC99I/5nTQ2VwEjKYyAVxmhEKhbYoitrANESSuNiC1vQJctVO8PvrgcuPGtpTdzGxl/D+FpUw5dtmlK09k//CiT0tc+NefI3RucZXF+HkGaeKF8+MP/EIDXV7/61ehbYfuLMvoXDeh5OLreuGGv9LmwX98Lzq2z9AtBryAvP/Z3ATDp1lyjQKNAo0CjwO4o0ACv3dGrhW4UaBRoFOgoUBee3QrXU3ilvwtXJWFcpAbgFYxZMvyqpQhyxM5cggABBGS8p8NwPXXTCGIYikX9oKx4DFWhpjF4PLx0pw5dUIJ5lWXO37yN8kcgfrYDd2FlhbZdsDlEzkW8FzyrcbvLmrYMRr02BYMN7isTkJXz8U43+Bq/0/uS31FI6RH2WPg6L9NuyWW6BLNOLZ6KHcYC/ILB9FmtQtJkmFqXvLRDGVTKZv6DMnUhgtnjUaq6yswi1QeT5tl6GTsZQkFNVVW174Vhe0AHQTDbPZossql9cSj74UtpGPf52xi+YeJcude2k/0mgKdsOua5BKCAlgCaEoywBnXOiPC0dqhvMVZUl9MgfYDogiXc69YAPexrM8ytgheOJ4GwmBFIxFA5jwqIa2OOvhcqjCI33qN2i+0nPz4IUtmPDf/0+9b2uLGPZzmUFgIEjvG9VV5+28vKz//8z5fXv/71Zd8+gDuAcIF/895EYklQzrp574cRPzxMIBnljonMHEg6oQqNLSfxHu1ZjfeQCtt6sGyd+kI59uDHytKTXymzEytlVjVAwwAIrRJ/axYQhY8vAbavARByWO+UHCNvVA+1474JGrbFro5xUAFVJMfAm7TZRWEI4BlPrz1sNE5UIs+MfxoKD4JybAG0bYYgl+UnrETRP08RP6Zn0jL8sJvAFlnY6kIymAz8YoRhfVRUpRcg4Sag4NLmTBmdurkcfN7ry/jBN1DYIyQ+T3htXZFxl5/pSktzzrZOYL62U4CiENU+FdJdayPlnnvuKe9732+WT34SO2n0lSrhnJuw1IRPq9Bpt+Z7pjPXLFrtp9n+fkiYjI9lfkxIKUVqAQ2VmB5DUk+SN9co0CjQKNAosDsKNMBrd/RqoRsFGgUaBS6IAi6uVcXRttUEtje0W1IldmTCtFcVkl4wNduG7Osi2iyGry8oywsIxGo5kr3YVTORgzu5gKzOCGLeF5vvGYntzuMSA17yfDJ+wftRRQFM21gGXYkuga4JGPOQSIEhlEHXsPbCwkIw4rurzDMfOoAH6ynzSHFkopVK8BhDkkPJHDmzYOJkZIMeydS7g56SNSHdF0wyjDc0URpGSRfHhUxdsoTZXRM0EfDkj53jmrvyKZDgAqBoACDbY8OS2y/isF9wLWOfNopS3TfU8fAT/FE6M8dVgqdKPblBgmHcPGMWm14jSA053uw49hWdcXQ516b9wGpA3r7nTq9h0J4+mMO3A9QvWfey7/bZ9ONAeefb31F+5mfegyH7mykf9hwZP4J7fQAve34YcOfsHOHHEZ9PYuR9DJBwBDU9AiS+RFk3Ae9GNo5zPFjWFr5QTh3/FOdvl2mM2M9AijGsxS+Q6jrvn/npKYATLdlrHxAICUCMJgiVQ3QIkYji40uPNgH8civELc4jAGZjGyoWOhahrzTmHIMUv3COSejII9ICZAKgMbRug3qdDmTFA34IXoOFF0HDRdvxUAlhRM1KWUIaj6NHgQXlhMwXKVN/fL6MTN+MdNfrysyhV5fe5IuID20EBtnPMkuNV5dupm6ueVSwU39prVSyfXED6a4TSNB94AMfLH/4h39Q7rvvvpCC20JaN9QjCWNdz3D6dXmd7fF2ePs/QQm7A/DC03fF7DTG6qeYQ3GGE9QV8KrSv9vptKtGgUaBRoFGgQuhQAO8LoRKLUyjQKNAo8AuKZCgQK5q/Yo/DfChWlt1gh/abdJmlcbslXxxBRyqFi6az79irsns8mx5jHKxiRP56QBeuyztIPjTKrPVNYFIZJDkXl3ItNhuwbyQB6wMgFeCPCMwfvvn9wUzn+2a7astMw3UK1UQdnD2qjCXKR37dpVIENgQlAi7PIANSqdMs7tYkkW6ZJ0raCXYpc0yVR1VL1PVbMA9EraOg4zXtZun6LLJKF6marZsngYFKiNvw9XZRvgq/jnZDxwT9psxgNIJ+o3zpLbt7CuOi5qGAJUqv6qB21/6AVL1QqXWjTKq0XfBAUGyAJvtMziv/aCglJdgavgBXGgzcJVDlcEKPlg4+/WlcaTrRxASf/7zn19++VfeW97ylrdQvjRIP4UBd8viTrbOJdaj2vdzjM0CgChFWXpI/vDuAIdCw4+xpPTTJkbsR9bL1MRjZe3E58pjRz9Rtpa+UebGMIhfUKMHNOoTPmiMlNeYoBfg2Qb+a+zMKGCYNtopI4BXAjteW2bHL9J1XCq76QwXh3Tif9NdHVVlFnCkPVXF1FaXlRDoUq2RJztdtE03lknH+upClZEb781rE6k8jdP3V5AQRcKqBzo3NsnBWq/RAABAAElEQVR7EztmC+vTZXz+hWXu8KvL9KHXAXbdQAr7iQUQBh1Henxg6NK1z227lPLyXptvgvTZ/l3NqMc6NPnSl75afvM3f5MdGj8TOzPaTvbHsL1IhKjvdqJnXJ1R5zNCnOlhvScAtpQy0xSC5dIJeG1v0pB+7bdRoFGgUaBR4MIp0ACvC6dVC9ko0CjQKHDBFHDxGkZyiaHtkirlMyJDAMOiRIPMlaDHEuBHlTaIr9qXjPGSKbEKF7McNx6RLzbqTq7DxHbnYMQu2l1KwEuxhEoTLgOogWHXuLEM5jyAlwx7MHP4y7QrXaKkUzLX0SAXXbVnKmIAXjDiWQeldJTSot5IZcRujvRz6x+GxunvAQBH/5HR7VQdte8FCBFAhuAXEhwaylaSYUyj29IWp40hbSLZ/wSKm7vyKZD2+5SWQWIoQCXnnq79QH0EDmxL+0eAJABfAqfOmzrHUYBVgl30DceLQLFSWsIhSg2qKn7VVYcxYn8g+p5+xtN+nGfTEjSogFeo0+IheGGfW2FTDEEP88lsAT2McEkceZC0klxKbP3g295WfumXfqnceMP10d+nALTs2m5s4oQi/Zw33LjDcmvra5wxUbYwxO6uiz3AMexa+QfVytQ4IEk5WbZW7isrJ+4sC098pmwsPYik1wLqkIxTaLMFQZQ6HoVuY5NIMzFGBalU9NRIfUxkAWBzzdnDOFEwngbgRbh6xgvQkA03VpC5IorjNTbkwDC9oJxxbS13XdR1J67MK9PbQe/0jucjJLjG7ryCXT36zzjoFT2prIH09Ucx8j99U9l/zZvL2P7bMYz/AlKc5qmUYN6wLJFD9zO4MQMP6uWVdQHMs/0tLyRCxXwVVfMVdmX845DuevTRY9FeKbFI6tKM2BcPeJkz5ZOuOMsg7VLKlXacRPVdMwioL1oLg/mhTGCuxomI7adRoFGgUaBR4IIp0ACvCyZVC9go0CjQKHDhFKjqErFIZdG6rbbj7oUaE3YBKzOf6m0yYDJ1YdzbFfDOJfuFZ3zekKQb6+xcdJ836F4/fLqgk1xMsCkXUbCnm/d5sqzSTimRArgp0INKX0ir8GVeNZmU4krbQYKbyxjMHpZgOU/yV+SjZNKG+lDXv6s6mcBDqjnazzmgiYx2AGICYwNmT0Yblh1AI+x7wdgq8aiLIUB717zMza4rY9rclU+BClZW+4QCwAKZ7rIo6ONOi7at82QATtGHfJ4bIGhnS3BLQCo2PQj9uwQHTFubXYJC+/btLwcPHgrwq4IHnivg5ZQhABYSXiFNaH7Dc+4az7cBG+Ne7DRzvlax70oLx4MA4JEjR8rP/PRPl3f/xI+X/fvnyRIAD5BjdZX+z1w3ALyYKyyfNp0ECDc3NGYPsINxrZExAJgJpeQArzbZjVGj9ptLwGHfKf2Tny8nHv0COxreVyY3F8r4xjJSXAB6FET7Vz0AxokpxibvIgZkVNkyxjRrRTo6GF7QSlclvASjgkiclk+t8LGGzQLwCdVL0lSNX0P1CXhRMxPGdacuD+rIPEDW2Q+gTWx6Abht+0S/IN1egJfEBUzvUxhl1qbmvqdMH3xlGQfwKqPXkc8cz4DtAPZQ/kuErWY2nHGUMssumKgdObIazClifKeozyc+8anyW7/9/vKVu++Ovue8lf3CuGTj/DWcfvju/MmQO/3yrkuDNCW6dfUiJGRHKT2S4IJeCaxZb0DEbvOG2q/PlmrzaxRoFGgUaBQ4NwUa4HVu2rQnjQKNAo0CF00BpQiCwY+FbTLuSr9MAnQp7TUFA6MKi4tdpVlcBsvsLy4upJrXU62oL6pk5BIL9Vx0X1QSUdKLiekC/ym4hPMle6UCXlRJalozwRhtdcm0aLdNBl/m1n6g+qpqjDLwyS9mn3hKzul8NHmGnlVpB7NPYIHa+x9AFgwrTGowiDy37jJvMvqqrk1Vw9kQIWydQb1tkAFQEDWmkOiBTqqgVRtPAma6BA/jsv1cwRSgVWNMCFQI1MjQRx9grrMtlf5L58gZAjkEOxgz9gGBLoGvzc4gveNLAMC/kJ5l4CnltW9+f+zcaB72KTpigKqGtW/ZH1MVEglC5mX7UB91wJDyAlASWAswoQsfA3qPaWsttcdl2VVRszyvfOWryq/8yi+XV73qlcwX0Ai6bFCunrazKEtVaRT8sW7aj9rakAZKUCEpRpxxbHv1oOkaUlZj6C1quWp07ETZWru/rC98uSycvKtsnry3TKweYzBSCqZh5ZtUYXRXRoG1qZnJkMy0bCROSTninG2jFJlO+12CXjHjxSTGO+skgBdSXlvM7apGTgKg2SYCXrbDOkkNT/spHcYj0/PgR9BHsMtD9UjBTP1G6AdT1JvEygoJbY7sK/MHn1/GD91eyuytSHa9kBTmAdRS6ipk1awYdLD3hbeZhOvKXcsffj7MAvoqpmuUe7/2jfJbv/M75e///sOhcp1x+aW+sfMsgdzZ0751PmduZ3c8sX8SXxJW6UcN0k9osJ51gYbr7Qs6213AK98l1Oop8j17ns23UaBRoFHguU2BBng9t9u/1b5RoFHgElHAhXzyBNtL3/wyrFrEeKiouPB1YSvg5fJfJkyDzG4/vx6qO3tdOBfbprldpt3lYLyLjStjwXGx7goFvGSUQwVvINmVKlpKD9gHtCejvarlpaWw1WankOG3L8jUPRsBnAQzYCitoK475Q2/1DFU2eQgcQIVGuJWumd6CukFmDvjKvWzncS2lEnQDMBDunldmUJBjmcjvYIIz7EfGXWBTtW5lUCy/e0H1U6T/SOAAzoAzZpzH+rdqxwbAlDCMgBTggwVPNv+gAAx6TsBmJKONrwOodpo39LPDwupQkzHJG3zMs0+arHxkQEAybMgtNKW2pQzLwEgz5Znr51DJNIm31HoorH6+fn58pa3vKX81E/9VLn1pS8OEEQppTGAIwtejdY7X6wrhQatxtm5cHSMHSyxUaXb2MIuGWmurS+X+al5bHnhb/k3niS/+8tW/+tl8/g/lt6JLwVtBZR67MIIiXBQmcpOTKk+jIe2upy3aCcyYeD6XpL+xOFXwCsSVxQqHGU8pR1KysAjAS8Bfw8anvSQxBvniPlBsAwvwg2mC9vF9uXsGE9gMv0gEMqJSGwJLo2y6+L4kTI5B8h11StKb/YFlO8QGc7SVoTqTSDVlm0NIkjd2bnSHR5Ht21mWo8kTFeHrBG/ShTyhGiPHDte/r8/+uPyJ3/6J+WRR1RldFfEnN8NZD+yDXUxbw0qEl47fjLUDq/uJp/4zjDfULOFeEp8a+dzckp1xrRjJ6UcN34gMz9VuxvgdTaaNr9GgUaBRoHzU6ABXuenT3vaKNAo0ChwURTYli5IY7cya65aXdjr/JI7GZJAuRuTkgc6wa8FpLyU9qpSDC7UXRzHmd/4Eu+tXMZZ3XlW4k8HOIq8zpXnWQsy5En9hz/1Dz25sEvyjbJfWOjtUB0jBNXO63hcQ3SkjuDB2HBV6W8bGi7DwIBwL4DprloTSC+FnZ0uhO2nOlIYqAfITMkou4FST0hzBKNXmcfzlu6Ke1jpIj0kjvSROQzK1Idxv7PoMu+h9glTF/Qag1lN7jviRxrEl8YCgkr4CALL/AtSxPPhvCJ5wbMoxs7M8DOd6nYUZ/jBIEB3MfwsGroGeBaeh+oydHnmzHFGPfUYjrGz7tnEPq8RufbftuNQgjVU2wS8AtgU7rCfJMgi2GX7hhQTYJSSj0r0KfmU817mn/l0eXc3gg5+KFAV0n5hPoePXF3m5wBGcCkNleUgwwhn33Esml8CZRl3FcBLW16CLQFCBOBV69TluwcnKWWv9j3g7ryh2sicf801V5ef+7mfLz/6o+8q8/tmAvQaR3KrGuo3a8eLwJwSWlNTs2WCMYNvlHl9HcAOg/xbG2tlfnY/trzcIZXH1LOU46VMAnyd+mzZevTTZfHkY9jbOgnEs1wmR9exJcm7CeDNcRHvK0FEwS7tRwlYka/A4YggTzSvtfCaI0AvVEOxd7UG4GW7Wrdx4o4j4dUjrqqTmyRD6ADLes7/CuDh0yNN33mC2ran9N+Q9l4TYZOw64BWmOJnnrimXHX41jJ61WtKb+IWUruKRKY5CKP0H6Jc2vhSEG0LA/49jPUXd7OERtWRMpce6ex7m+haIg8X+fZJ5+Mf+8fyvve9r3z57q9EfQzpHG1bDc87Xu/ol12a9bSdS/UZPufTqv6tVJvlUg1+GuBWcEuQuH4UGUPNUYlAJcKUfGuA1zAt23WjQKNAo8CFUaABXhdGpxaqUaBRoFFgzyjg4ttFs19yw5i9RoQBTWSIOvYgpBFW2ZlKo/aqucgQyAgKmoQKJOtm04iFOLHqAlxmk7vzlPX8y/HzRNyDR+cr11Ml/3TK/VT5JnA1IKJFkbackoH367qSDvKcMO7Ju0eYedSpxtmVzDaR4bONQm2Ks+p5J0/CcEZ6/jRXQb8KfGnfy74vSCH9tH2WBNvu39HPIZ2ARRi4BxQRHEkArGsjVYRgTiF7dP9oN8ndDQxPVTpD7wiULdxdOpYGwTMIv9F23g0uBo+eFRc5H1DUsw2BIFZWI6rnj+E6f+MOql0DBCEJBr0FrWoU21ND9DLnAgSqMRo/5izbJbOJ5PVfWFggG0EOJXoAowA/VF3cRNQmgSGQknM4ixDtSjmVALR/KN3ljo372CRCCaqcF8mVwAYXHLN/CJA5LoMuPNNu4qlTpwKEEoQwzKVwlkHpqhmAQMsgiaWufy+59cXlp3/6p8oPvf0HeScwHqCfc74goACS42JpcSnOqrcZVwlgVQfdzU/QZGlpAXVhJIQ4BKmkbS+kxQDdl46i3vggKoJHMQJ/f1lb+HrZWn4Ie18LZXpENUsSDFoyZ9GufSXdUJXcUmUSqa9x7IOF1Jd2uXxGZXpIlvXYUbK/hI0x6EnDBZ1BIssYO06O0R6jqDduAGj5TDGvTXY/LB60GQ1CrrYdwBx5+7dBwqpGbiEJvF4mytKBF5feoVvLwf03lbmZG6DgNRwHCD/LwaVErW5wbfsJIlHWmKgzqDTTRTB/unumkQBZv3rP18p//I/vK//wDx+mroKJlmjvnX3XvingZn/zfeIrxbabm9sXGdo3lfhy849RaB59tSvKUxnL3/sStxQbBRoFGgWe/RRogNezvw1bDRoFGgWedRRgMc1qOlThZBRZ2CajCKOgKglLbZ9ru0VpgBW+7gt8ybC7YI4fAgQQ4Kocv/T21wV1nNrPBVFA5iPpKmOxzVwkLQecURCeu45Rkam33aamUTchH+PJ5Ns2Si2sAFYKzqgu1dw2BSrglUbMk2Y9JRqgojScm58LRjOpn2BF9m7TkAnN9hJUTJs/2wbv6y58hre5ttuztuVQOcylGyieBHBqqBhXkZ25RbaADT6tIfR8NriklSVNWsRV0Ma62BYJDCW9okYQrlIiah/Eod4SwuoHQbiEHglsISPjWLANObbVVJNWNUpI1ISEFcAWY0ipvcybMpJHXJN25hklOc+P49WUkXqhH1gPwQFVBGeR8pqbow9FmiZR29A8ADcAigSc4ob7NcaqYNIquyNGHMGZWkmj75ELOoDFuONezgnYbgTMEOybm58pr3vda8tPYMD+xS95UTl06FDQd1MVd8tKeZRFcoykZBLSaIJzVEiAWJVOQTul3qJNoh1s02yD/vopwCbArbFFgCqkvha/VZaf/EZZO3kfBHgUw/CLpL1GfOqO/TBVJzU0n9AjEqyAUNG2lHdEyS/afoRwhEISmY1WBLxw5uYcqP0uQUcB0VXaOZ4BeNFMIdkVtCcuLRfvOIGpLYC10sOW2IjG+WfKxtj+MnbDG8vmgVvL1OgBjNELBjk3zFCH08DQqKbtJtjlYZtrF9MvEwJagqoAeyBLqppDHvziURTlwQcfKu9///vLhz70VwCHS/E+EHjLGmW4vfu1nNXRRtAydnEGCJ0BJPRrinNNrAkEjqF3bcftPl3jt3OjQKNAo0CjwIVQoAFeF0KlFqZRoFGgUeASUMAFrDyJjIqMi1/rVW3wPh6QpwyRDJKAl+pdyeS7eCcIDEUuhlngw6jVr791gXwJivxdmGSlG4wIRI2/4HW8Smc7yfxIVxlNpS4m+CIvSKm6Vj6Th1biRCkkbBEBUqqe1dxOClTAK3w7enttf5aOAoihRsUYkGFOxhkmmmsDxZixZfgXfBTwEOjSFpA2mU6391VBnWxD88BFvnHR5auXaUYhbEiYZVz307W+Ps8yRz2i71LsWud6loBUsD7Pqsav1c9nQYAEJcPAOWCBIL1tkXMWAEWQzbGRc1FSMIGoKumodKTjItqJNrPdNEivGx5vnUfQfac0XjwZ/NimkR/AgIUVBBKQcf5UVfwI6o21PtYv6khB7VeWZRWAxp1BAzwi5BrgtGqNYSCf513DD/Lbi4ugNoVSPTEkE5mvR9llUbeBpNTBgwfKm9/85vLuH/+x8opX3A59lRaVVhvYdFyJe9Wl48MHdXJjDAF163AQyTY/iujsx2E7jXx0UccegBS7Ok4CKo1I/5XjSHwdZVdHJL3695UTj99VRrceR5prmTOSY8QbFeRSHxFgi5aLdpZ++W6hbKZN661RlrTRZVvyPqNeRCE+19LeliBe16kMFPJXYlHKYSlfto4E2SYqiuMTRwD/birT+24E27qh9NiNMdQXMcWPlSuS0D4ZBvFNr7q4tLUtkSlWwIs0se+lCzthQXv7KB5cK2RG8crx4yfLH/3hH5Y//KM/LEcfeigBKCQVBZ6isPzupcu+SOrOZzjLE+qMtKeSfSO2EX05PqhQDsebNM9+vJclaWk1CjQKNAo8dyjQAK/nTlu3mjYKNApcKRRgkeu6W8kGV93BQMKgqN6lgWftQY0pLYRzsetXYO13rMKUydRr3yv9WQwTRqZCFQyZf11IGsVV+3lKCtgWMhQwagmOGIN2gbLSfZu5gvGXqaZtZKwDlMxQxFfaQmk8NhxYWe6k8WS8dLZQc5UC2zSW7tW3nm2MZAalr9KOGriXgfe+Gj2Ptom4/thuHjCx2CMK1V+Y+gHAAmebxqZTdW6Qk5k7tobaZ2d5fF5DO0wdq9v3z5Yr+3A4y4/LU17b76ur/sNnQXjjB/Ao/W0PGXCYdePW9qhgpIkHwMJYcJdFVfjcmXA9zlwHRJI5KmmlizJEO3TXQfRszwx55q9AmnlajnDka40spxJU1z7v2gANHJfRPxjbJmt5dao0ChYJPOmcNwWMBKmrEfF4sIc/UjokSSmIYFb0WUo9qu0pzqpyXn31kfLOd76z/NiP/aty8803UwcAOmnJvNLnEMxLuqbBe+cbJZKUbHN8CLCbbgW8pG3UcYS5aAwagXttUecekmOjW6hLjp6AaMfL4iNf4tlDZYOdHLdWnyi9ddQnCTNO3qWH+jBhe9jtUmbK0oYJLy42SR/FRnZPDF+HU4Bcgl6jqqcyDkcnqKt1B0DbRFVxExBtg3Pf6xHAq0k2sZi6qkzNPa/MzN+Cccsb2X3xeSR0kAbDJltvJnINiSvSSGCVBHe4yAGfBLs8C5Ct983PXRVTqiuiUEa6ZLiFhaXygQ98sPz+7/9+uf/++6NuzhuZh33Feu2tc/4zXdvI5O3HgpfVMH2oxmu3K9YCqc4qXe07tu3wmN3bkrXUGgUaBRoFvnsp0ACv7962bTVrFGgUuIIp4CI2HRdedyf93J5cZlNmfxwDxX7llZnUXo2qGargyAgp7eWCXsbCJX8mKVOQV6bV3PkpIKlkFqVngiVSMhmLYHw6hl8GZRzpu1QZ6hhtQhqm2pZSsquPCpLtYRt40GzNDVEgAC/ppp80ihO/NgROpl2QMQGNDlQR3MDPNnBc+CxUpzhHPIgsnbPfC7okgJCSNEqBJRCjTaQKbKb0jMOKsRPxEzTJUth2XXpc6PdsbccAvKBNBVisSF7DbFu3jrbWN+0JJa2lpfamAlTiOp4FTXjOn2kIFAky2R52c8eBttWU3hKYSWk7R5M0loj+J2jibXp6US+328BxdS5nm1m+bcDL+JFigEmHD1+NBKa7BSqBlmU1rVDLo+zOm0p0WdZwRI0dG/mQoAp5TSsf7uEvWIeASgWknLvtXJQQWqbU7i0331Te/s53lB/5kR8uN1x/A7RM9UvVpG0P6eomGBXkEqgTgPdw7NjnrbN5eI53A1JbjAKeSSPaL4BLAGWQK61ljW2dAgh7opTl72CT6/6yvvhA2Vp7DGTQnR4XyBOVR9JQrmtUEEsRLsodqo/SUxpz6KnlLCW7BL0IgU0w25Q+ErtKov49MkdJ5gDL5sr41KEyc+BaAC5sc01fh0YjQNcIBuk3AbqMbgomq+uGeuQbYzbVOqMgekYEIyXoBeQG7fDFK3a97NKzmOKcx48/WT7+8Y+X3/vd3ytfu/drpJD9TZqFZG70v5q5BdgbV/tW7FrKe0dgKzavQSXXD2C+XzRU7w6Radcw+29Ib0tX57zmGgUaBRoFGgV2RYEGeO2KXC1wo0CjQKPAXlGAxaur72AUSJPFrMyJjLjMvJIKdSEczD9BQ6KCBW9IJ8DcyJytwQDFV3wW9FWa43zqQHtV+u+WdCS/dE0AJMEP20XmOEAVwEZVTbQRJBOpSyZS5gOGEu5Jw9fuoqZ0iC4kSeSVaFP+m9tBgW1Qw74vmeIcF5AsGOVkVDNahpefDZt3SEBq88Y2kWkUrAxgMgKTSNB9e1ilhw+3AtQw/Q3GmO3muIm27Mbddt41T9vPBhR4M+GukCb3bHEdSbK4eVOnnApwOb/EIV0ZCzHfUN+0J0gb2U5d1WPOIjGpIg37gDZKawn0BiAvCB/0TeAhxoJghXGIVMeO7RYOP6kddO7Gi3mdD/DKiIbxqitYTQxPbVrNzsxiz2uOPpI77Jm+bWi6ggepJp4qgdZJkE7JWSWmUgqn5rI350H9UZmUvtrvsuaCKwJfziVKUakufcstt5S3v/3t5fvf8paQ+krVXqTXmIuc+z2U9lIyyHpJS4ESaVv7tKWOdqRuG7SPknZiOGMYoleKGDwIqTGASaTE9k1rO4u5qw/w1Qf4Wn0Um19PEAfAa+1xdmI8CiCGrS7B/A1UJzlGCmqW2P0aQ10SiCjaVqPzbKnCMQFQNRkSXJvUtTeK+vf4PKDcQUDIw2Vk4hAFwfj8JMf0QfLGCH2vHnOUXJDHGnBlNxLjkYDR1L4js89NTLgTI55d2HyOV/QoSkXciMoPXTL6i5jfiSdOlo997GPlD/7TH5S77r6LaPQJ+yz0sy847/dDtTUyNME9dFlYgSvf8bnRgCA+DUKl9UvAK1UbKU60cRjRp4y+l5prFGgUaBRoFNgdBRrgtTt6tdCNAo0CjQJ7QIFkqGM57YpWx2JX5iUYP25lYmTWJmLXM6W93JrcL+XdF18WvzI3MptKrrhrlxIWMnOVKY1028/5KQD5YTU7wCtpNzqmna4EuJQoEuzSJROm9FAyR9oiWlxaDqBLpjWAR8LZdraVTvsxzQ1RIOg9dB+XjoFkBLP/Jq1zaHTjgxB1qASTC3lHsXejFERIzCgRAVgwkESyVYmQYyHTULrGfOo4i7EWY452ErgBfEi7YLSxYJjtTPsJgGR7bpclin2l/1DcSoOYO2CqQyIL4ETgR/XEYKCl0xC9Uo1X0JcEaBb7vTQIenRzlKpxqtQJcgVoI70YD7ptmtum0izb1mfpyC0ARO4Gj2yX+vz854jblcOQAXgKahifw+f79u0rB/YfKBOAQj7YLls3LjspL0Fq46da43LuHtnV4/yl2N3ToALksb9m/0tabSLZpUvbaJmm88fzn/895R3veGd5y1vfgormNZQRW2NIpTnHhH2nAHwTgLdt9dNZT6XADGc76I9WIqAXJuIBp0ZRbRybYn7CfhivDD6YbJZxDMW7M2KYwOIHWI3y9JnH1rHjhaTXyn0EROWTdPtrGMDfOIm64zEsaz2GENiDqEGejFZ2J8fN8f1sOYgNtSkltg6j0oix+dFZ+hpA1ijPxjDIP4ofkl6Y8OcAwEGiCc+Q5pIqNqPTZtQIaSxBKo3kj2KHjBry3PHJhyGAtAiM7+lOybDan0yP4U0apTwB2PXpT3+6/Of/9J/LF7/4ReyjLQMeYiQfenlIS8GonLdttb11zmG2v22jVN7M7BzvF0FZ8uGZUokCXvYHVV91AvG2q/Ea4BUkaT+NAo0CjQK7okADvHZFrha4UaBRoFFgryjgCvfsLp50i2IXuC6IYyEsQy9z4xd6nAvgYNRhRNZg3DTELPPpcXYHWCaH0GXt4jtdXuRivPo9m86VltQj/7frZdWgE/9P6WSUq/TQJECXX9sFvpQM0e6PtqAEVMxDkFGGf4Hd0QJUoF2CMQEYMEvbzbZSfaq5IQoMtc/ONskGsk9D0Ijg7wA8Sa+uLW3PDF8ZVIEcgS8lJWzHKp0X4CNtZjo78zOL7U4xADEJJOgl8KafbVrHmfEjX/0N52EqEcerWkjT1m2nn/e7/xWIqvQ4a+zusTlHP5R2XX0hA0y1UjDdMzxqGM/2Zel3LmfpZbQDzGVOSVtczDPSJgACAEIjS5jqSNeykCNHR6MMFH6Zv8/P7QbBzxHENGraBon78LMozImUbRYpr4MHD2EEfT7qGGAmzwS3rHNIefmhgDEcqsykYz2XFhbLSrf5QZXqsz9YJu9N/2JclBi8JgGv7F/WIWhHupl2wj3mMTk5UV7wghcE6PW2t72t7GMnx02M21vXtPk0GfUU3NIp1abzvs7/AQQzJrawZbWlZXmnrlHy0AgXAJJNDzniY4nG0qFOAD1uxOH8Z14jSHkVwC3hp60+0lvr2I/Uctfo/YBg3yzLD36mrC08QJJKqWHjbfbGMnXVbaW37+VEEfRi50GNx8fhe4v+2BOo85rMVUEkv6oSqfqjJKaLIT3GY6+56Y0Avhnc8IYx7qZqmxmGIWlQcbOIz2UkH83FAwG0J0+cKh/96Eew2/WB8rnPfi4lpWlbASZdAF7M2wmOmvDFOvs9ZTEJfrK/ch2FST/npxmkEJXUM5x1FOCaYqfGEejoHBbxu2jR70wT/+YaBRoFGgUaBXZHgQZ47Y5eLXSjQKNAo8BloYAL3Kpaoz0P7XkpaeR1LpJZ+Lr2JZxAjMyajJvb2Kuaoz0QmVLX2C6cKzAQzJueZ3H6Vnb1LI+vYK9krKP0A34g6ZP1yfpmtev1Ng1iJ0DoqjqRYKJMqUCJcT2DDJRN9GNsD5kX06lG0U8tnAQUCcJFWwwYYsJ1zXMF0+27q2i2jQy8QE7u7pgSTDKXPnMMDZjPQU8nTtdnBj0iLvwZdCbAHi1+55iUGU8wTC47mdvYCQ6WuwJkOX65lw2P9C6S1hQhQFbL63WgFIJVWbaQAuHaeukncJJ0EB1IAHeQs+G2byKst4OyUpeoV9QJtT9V4ZhXnDNU8VIaKoBB0QMqJXh05bncKdUPBPuR8tqvlBeSNNE+1CWlwRjTOOdHbXf1AbNtIumnavLy8lKoixtGWgpG5HWcLupnQHeTGtwMJ2U/2qardPZDx0tf+rLy1re+tXzf999R5udmQipIIEtwxrnJawEupYX0E6yJ9retuwO5ITJCYlWwhCYLYB5JrjHALyW+llYWAPd5ABDVV5xqC1uFSk/hRqHZZO8UF/sYA9q3ErQjtdGH2e3xS+WJB/6urJ26h2QF3lCtnH9xOXDNHdibv6NsjVwXuJaQP8XKeZJrQSmLIhnocZzz0Cd6aBjuyvITBBcpdGfvbT8AOneRxEm22hUlb7+/yr3vypyrIUN5/PFT5cMf/vvy53/+5+UrX7mnLCOZO5irIxVL45EuW7ze7e6c6WZDJ3CV6Up3y2K7CURPA1Lafr639Q8zBqhpNjtdu6N3C90o0CjQKPBUFGiA11NRqD1vFGgUaBS4zBSQUZFRTrUqF8kpseJCWVWHGVQwlCCKnZw4u1qWKRX4kumRMdXIsfa9QrJBbkNWwlV1uGDD5TYG9/VqeNG/7XelX2VF4ndQpyyzVR5mbLaZQJ7z0OeqtMROXqEeJ9ClBIEMKG0gw885GOUufKRBGM9Ly4sh6aVkhW0QCVKGVEFRFS6Zsiudgt8t5bM9bQPP/Oa1V3DYsetgPNPovX4p7ZNSThF6O3yXRiREko6poV426FN0jXCeo59xkWeHl9eeBUsz3G5/7WNKr+kG9YmyRQUT4KpPrbuh4hyeWZa8jGdBku7eMgWABWKQElvOH4JclJcj+nRXB6PIsEetuspcqYCXUq+q8k1PYcsLO17a8xLstF0sei13/UCgZGy0GXRzzlRy0x0bPesfkl7Es/bDtJUmF+qGmuQcUWrZEtSMdiDvOVTennfN1eUH3/aW8qY3vSGkvkzAeV6pLgETy1glu+wv1t02dO73fmKMXWVDZZBSiAzFIThK+1OrPobxFboSGI7eCv3oGJH2JPHHVLvcmgDwmgjoCQEk0jxOf/hOOf7wnWV18Zukj1F7QKbJ2eeX2f23lpHpl5IgxufZIdI/aRc285k3BXArPYKmPNPQffTyALvw0CmJ5kH8pL6eOkMqPZt10CfahUSpDfQQfJvMMER//NHj5W/+5m/KB/7iA+Xee+8NNUZpkGWoJYlUMptIx/uLdZb5TKevc43Sc4JdfsCKPom/H1u05+VOqNTmzMjNp1GgUaBRoFHgoinQAK+LJl2L2CjQKNAocGkoUNUWEvBKZtkFfTAKLJhjB8eQSMJwNza+xuBAgikbKk7Y1pF5C/te7pzGrmla8Q3H0psEc1ndMcjBMbDe76QZhpK64i+T2emYBBin013abkr6CRSqtpjgYaodTqlWUv8GyQhXYL8ZxlcVJ2+UppFJ8Ut8ghDa/toItSh3SwuJGMUNKEOV+Ekm8vQStftLQYE6biLt6AbZhraHToArx1ECx2nPSukvATDBLxrfceG1Z/xDkoprAYTKDUdfiaB2FqVIgLRqHnVU+dxr/h1TWQJLsTuX5U0A1pjBIHeJmap2uKJSXf5ZbZ7EfUp8RfkoQwW3BLP0s78KjOtCikngK8pqyvyFJFc8Jousa1e98Lwy5wpBaiWXsOnGOFf9T3tes7PzUYdsR+tiuyQo5Pwg+BV2yjo6LWO8fmFhgbRSksr6GzfpENF39ZM5njtKtpdNab/rykcb6W+/vPbaq8q//Jd3lHe9611Ifb003gGCJwJfzj0ZTlXNrFO9lwbjhBsnyXXb1j4NADaCGh8wPu8FPpAQR1DJ+Q2sjH6xxLFcJjGsPz/O3LiOml+f/qJEFfF6+I+OLlGuU5j2OkoZngDwQiUP1Gxk7KoyMn6EcByGH7N/QV9+ka/j188Jgjr5IcD+Gps+chG1rsMMf7aPxFOPYWeogMaoK20IiuYcPIr+4wjgmrl4bKI6qQTYffc9WD70oQ+Vv/7rvy7f+ta3sIPGrpfmJJ25ylzzKm4tELeeno7rmjDaI9s2x6K2OP1gpeqi85Xt5/vIfuouwLoYuk8n8xa3UaBRoFGgUWAHBRrgtYMc7aZRoFGgUeCZp0Bl3INRhgnt1uADZsjnsg2xax3Al4tovxC7q1pKL9QYyeT6pb/v7mksrt3ZUQZHhjYS7pgqa+1CuzJbzzwVdl8CmYxacxmagcuKDYCu2OEPWqm6KNMokBhSPl0cpXnCRhdnd2DUfpcpC5b5dd7dM91QQFoJaMkUGz53UMMmEPfJ5FiCoXIMCtQuLgUF6riJtO0I0RsyJ2/t/7aH4QLIinHkWOIeZt8+YGsl4MV19A2e2s70FfuU1wGGMf68ziPHjjlFu5NZZO+96flgjxxZhjPf6gRqzNe84tyNaf21IecTAR37pfa3tjgLjIQ0KNdBExOzPnHiN649+2Db1WwjrxTZ2X54RVxRP+pvWzrsleyqBuwd9/p56IJWHR2cI7N/8IA6a8z8FPb5lPgKUBFP6TdM90jkAn9OI+MZsSp4GHO7tOeoqqybW0pq9QHtJsvrX//68p73vKe89rWvjTCCXRGW+irZZZsqmebZe+kwCRg1Tl8Q8NpE0msUYKXH/CcMtU64PunbP1QBHAfQ6mPgfm1lHSmu8TI3MV3GaOf1dQzmW3+Qs5Fx+r7YF7iV+QDvY29Lu1MpeSXmtImklseYOylaefIPSa+Q2tIjD0G3EcLFne2yA/AyWPbPGh6fgbMdN203gK4x8t5EssvyuAPmynIpX73nW+WDf/mXocr42KOPAu65KyXtSb1qH8jEyL3rE3F/2u0gwwu+SIlgKyWo6vvWtnRX2TRUPwutkczDXzc5NYm/truU1N5ZlAvOsgVsFGgUaBRoFDgnBRrgdU7StAeNAo0CjQLPDAWSqZQF6FbhlcvEx8tYrPOjVInMd3zF7ySPXFS7mNaZQjoZKK96gDLLbNcO6wFjIHMguBPnYFz4Sq++yrPMhWQGnIJs0zZYYW0FLdgNCwZPGiVj2IWBQRIcNI4MkgyndFASToZxDcZI6ZfKBAc4BpdnGqYl46IdFumqn8yz9oC0nyaTnG0H0zckJfMsI+uzrrgB+TBksq93xR+6sa0HY8qrGF47OV3bUgGS6Blcxz1n1YcDTO7aW//44yyoMD7eSWdEtqaZuXlLkIwbz3b3k327K2MtqtXoXOzcBxARdeFnAH55TRiBWF3WNS8iGX5qWMva/UfYehOAi3kNInt5lkJ0sa6MkzSQ3oIuGgLXOPgMoNf+MBLufXxIqIUljFJt66j19WPc8oDIzgFLi0uM6ZSeiuDMm7X2NfqFnoea7KxRLFMtb51PIiDlC5r3VK9cD/uNL3/5y8u73/3u8ppXv6ZcdfiqqJ/AlwBXVXEUfFfN0b45o2QqJUdIKyS8CARaBVAPmKQs1BYiVn4QsXJjvQnowbN1gShsGlLwUWm0xW60W6u8HwDGJujbI9gMQ0prY5Pw7PCYYFnKXgXISvhx8kC3MdK1LsBrZUMpLHEx0mUm5SLn4AC9JK74ViWytuQD8OoiVH+8dQJwsZMoKUtf6dTHb2lhpXzuc3dhr+sD5ZOf/ER58mTuIqnUrW0rrXvdXB4J+TOcNokN3w7CXOCF4yo3zyAd3yv0G/udktnTSHZpg1PA2fIqiTjFu0SpYW7juMBsWrBGgUaBRoFGgQukQAO8LpBQLVijQKNAo8DlooDMWnAEQydX4LKw+cgVuYxaLpplapQ+clGt0XV3+HJhHypZIc3SSTARuzLQFewK6a9Q6VHqI0Gfy1XPvcpHusg8hKQWzJ10SBU1ACpoMz09FZJYMhTpjLHtBA1lcJcRCwgJOJk/nHQ1jqCZaXqTTBNf5QHRpmeQfuiAEOENGTB3fRNkUJogQcX8ir+dW7u6VBSIVh1uWDNywHQNH1Ja27fhb7/pHhs6wscYyzvG0I67TG9HOFte0CvB0JAek4mn72xL63SJXcTJsllGC+n4VH0rABvu9d/QvpIu7vOSm4wT5bL8HF01rI7l9Vd6RdpGq/mEb96Hp890lQ4dffO2SzRDXCG/1smi+JNgpJJdc3OzGLHfjwF7Vd2seTqlagLwCpA7bXaZwAaghcbsnRMEsiNRKl2lcrroF3w6L6UojGW2VNGbKJPt4vzu0VNdEAPzquw5Jxnm2uuuLe985zvLD/3QD5VDh9iNEltlzkUC8fbZJVQyBcEMP4Va4ngPQBbcyF0aqR3AVwJPtmNIea2rCsm8twl4yztEydX+GhJR9K/J6UnSpkwbgKf0v4kJJGN740i/MscBHI2MqiLpph+UjHKvry1RQiTEoHXZmKTPYuxeKbLIl4oiSdZzvATYxXwNFRX8UrWRQBIi3RjlCZXGBMYG/j6l3FCIH23NCepCF8rywH1Hy8c//snyN3/7N+Xuu+8ui0uLzNl9pPSUyFUKLN8T2e8jkcxr+Pcc3sNBznetJKBAlu8VqU2m0G+8qDqvNNeYUsGUw3dUSBsblut835B5c40CjQKNAo0Ce0qBBnjtKTlbYo0CjQKNAk+fAjIhsaLvkpIRktHSBo8Ldb8U67iMH/3imnAyOzI+fu2X+dEuiDZCavhIK8IbR4YqzyagutOpk2xDP+Qq7zHktX153ofbwfb86jSewDrLPMhEqX40CnMxrroi9RaIkPEYpmfSN0vl1/eT1FmphNh5ESkvWSmZI9MksrfBJMvIJMOkVBgqpOQzNzcfjIoMmKyoTgZMZjNUi0jf+M1degqktEfmE+Mh+jnkd9zgLUOZbeEowPk8zj6DCafNa2NFfJ7W5/aZ9DPCkMNfAEK3Exzrwgx3ts5rV6cu0+0xPhw7SjfsEdfbWQosZNniQU3Lm3NVJgJGgABb6rixbtKISm6HYL648pzzWR4BUtuuFNKNKQSGpqdnYywbJsBJ5gf7h7adlIoKFTTujWXrq9q4BGiiPTPVXv1QcLFum3JnT4FsAdqQWqIfVvU2Q46iQjiiMfY4skWct2dnZ8sdd9xR3v6Od5bXve61GOdnMxPq406TzkHmF0BKb4pdFWd4F9h8zHObq8xj64Bo22qQfcS/VleRwGIenEZl23fHinbM1pbL1L7ZMs09lef5eqh1j1LGRSTgEugCTGJs+d5ZX1/F7uESOW9gl2qW/AEYQ72Rd43wj8gW+UZ/0uaXdbWceIe2o4BXdWOCufaxswNevg9XV1eY88c4b5S77rqnfPADf1n+8eOfKscePUo9NWCv6m4ChUo+m6+Ap/N4Hbc1u+Hz0+nZgtACbPa/eMdSB20/zrB5Qry7Y+whNar9TcoUfZFyKeWli8fDhWnXjQKNAo0CjQJPiwIN8Hpa5GuRGwUaBRoFLicFumV4ZTrPsioPqQCN+ML4+JVZUCbBH2xWwfwJgCUAJPOzkwUzuWQGUt0xpL80bM0X8mQEhzJkVe7CvDKX8USPoTR3pB+r+KH4p5PN9PALJoRieTZ+TaO/gXpOMIL5JTyMUsNkydDJyGi8P+PUenmnAwzT/hJOiStVFvthrNt6KS0DA4g0li6KGKXwbidt9EnX1cGy4SHTrGqjalMT0FZ6BHAmgEZei4sLEc20zV8mzXrIHMp0Se/m9ogCw03WyLoHRJWIw0TdgyQvSxLOTdughuPfDwDjgA4HDx4MkLraNLR+IYlnuRjTy8tLMU6Nr3OO0I6fALYgkgCG4erswqzRfTRIAG3bP6Kf8XM+ag532TPCAVTlDLmdpHOjHzME3X8Gu1533PGmctvLXhZgvHOc84sq1uKUM5MaqZcmglbaGUTNzo8CzJ9KdAmgKd26uoJqJ/O9gNfc7AwSSdNAV5vMY4shvar0sIDYBna+FpjbnHsFcfJdo5SxhvP5eMJ8LXg2Duglzcw7ehOF8d0kuKz6YR/JOtMIlWH7Wkd3JkYkz9Z5XwFSAXj12XBFiGp8THiMuVRwML9NlIcfPlb+/u8/XP7qLz8UUl0h2eZHHhG0cJFzd719Oldb1VjbIXd3pUSgNLWONFHYfJxlt80J+qAubG/Gexkba9BLFx+eqFRIhhqpuUaBRoFGgUaBPaNAA7z2jJQtoUaBRoFGgWeeAvFFGWZBdRGZDxfQ8ZWfswxSbn2+7Sf4EsBSPO/4DZiOBLK875gVuACBIdVflHZQMiqMYAvicG34Ck5lXNOAHpWBgV2xPOd0g3CwIa73/cl/ToJWqSIS6ooCXJ2RfiUazC8MKkd441s/bzIBDRUrmVHLKzMYKp0wXKHeNMj7nKU75wOlimTYBL1Coo5y6iyP9NIWmAyzzGRKh3VlI8zTyDbyaD+NAo0Cp1Eghr1SPM5PKS7knCHA7HnfvgNlHtVG56oY+4Sp6qemtAlIs4qUUm5UkZJ/a8wX7tq4gv1DQeuYn5ycwnXznHAOD/zbe2fapuqEeqZzfj8AkPeyl95Wvv/7v7+8/g1vLDfecF0EXFwCqFs+Rf3Zt1B1Tv5WV9i4BFBLCbF5drAUFAvAhQkpPpho64qpOt4bzKXOZdLFMggaCnBJP/2dR51/dTFPC2Y59+LMqwfNPVdnPEEeQS/dBnFV8TN03fRDcHIK1b/6PjFc5pEAktkp0bV4aql85s5/Ln/z1/+tfPazny3Hnzge4WJHYt5blv+ZcCkF6HsIgE7Jrlnsdk3N2D3C1U1T7JMN8HomWqjl2SjQKPBco0ADvJ5rLd7q2yjQKPBdToHKgJ29mhNKQsGEqJKiyp8SAvmlP1X/BJKCPRnwKFx01wojxS5vKqcIenUgUmWWZCiDzSFcME4BhME8waEkT5QM6NlKpmqHi//K5AzOHQOpod9Mo8beZqMMK3CXeZtXPotfrpeXMNQPg1e/osuohSRbMMTu6JbMV015N+eqRjeC/RgBrynshfl1X5LJdHtewQ6QqlEhSdZVwjJmHTsuaDeZtrCNAo0CZ6WAoIJAh+Cy4JQuAPAAWbBnhWqjBuxVcXTkqe4W8wcgjXOWwPoq0lyOV11ILBFGW17Vxl+dDyNA95NgxqUay8wikbSzydmdHyCUILr66mvKK175yvLmN39fecXtryiHDx9G0gqD8xzSRVBKKVNd7DjLnFUlkXzuHG5aGrwPqTYAewEsQS4Bmqg7ZVEiSxU8bRa6SUed752knU99p0R44jrX+TzsH5JAfISBYEl35+0M48cVAbBIg+fuhuu8HvHx9521SnmOHXu8PPidh8rf/u3fYpz+8+Xer94bapyqEUon87I9zOeZcNZLyUDLLqioKqPv2fzgkaqL0rl+xLGMPuOHzpt0eSbK3fJsFGgUaBT4bqVAA7y+W1u21atRoFHgOU4BgR9JkABQd8VJlkeppE7Ki4W3i/GUcoAh1FaLIYIh8aqTAIOB2JKL6FymXe/yLGOi8wSLE4yKN+GPX2BSGfSMX7/4V1XL+tAyVDd8Xf3qOfKDWZKRC8kt1QkBuFSp0S92W5SZiP8hehDRHJ4O4GURKyOj+ugEKj8p6aVKS8fsUQYZQ23raCtISbOsz3b9al3auVGgUeDiKeB4FLhhlHegtsAyc088UCVuIlQANWAvICM4YgCfC5AJ7ATYg22oAMzwF7gW1FECaXl5Iec35hP//DfpHM8591186c8V00x8xvkszkfOYVXiyjpcf/0N5TWveU1Ie91+263lyOF9KW2KpKnAuyCX6omqYStRVedurwVjpIuAl3OnH0mUVJKuzq/Sx/qajyBVGLunbMYJelLYcT6cCOgoHWfaHtLJilRgzXPQnXg+997Da9MRUPOdsAT4aBssL6+Ue7/29fLRj368fP7zXyhf+9q9Mcdre8zwVY0/pPso19mpdRYC7rGXEr/O8dJsls0EJjnbV+K9OySZPPyBxzpT8aBHR6g9LlVLrlGgUaBR4LlLgQZ4PXfbvtW8UaBR4LuQAslUdKyRK36ZsaF6proFfgSMo2M6DON9fHXGL75Ad1/qvVaCyYW44E7G9bZTz+vSUg0oFu5D+dVL0+fj9a5dTU9ptHDBDMlACXAlIyVjqhqLjI5f1r3XPoyql0p1hevyjpPlTd/ud+fdjkdPcZPgVTJqJqqhe5lId+OSubYlKhO3hg0g1YliJ0jKSPGbaxRoFNhDCjC0A7wXYGCCiPnIcaa/zo0tZpDu2r//AFJe04MHzmnOH4IQhvfaOUWgWskkh6p2qbTJF9KtGkQnfeeXyLPL4NKMaStg6S3FORwZB5DFPKkklOCX9bsB4Ov221+Kba+XlOc//wXlphtvRMUu7Wrlu6AXUkgCRuuAU6qCCwQKoDm3Oc9OaEerm7w3+ZDQhx4WJQzrk6/vgTEkupyrLYNpOee5ecjSMhsBUGSBqzgoX4BqPHf+Ns8A1AgrlTeIbzq2h+ksIZ376LFj5evf+HqAXF/43BfKt779bTYaOUUY6ko5JQ5R4gjQzPpjq8z4z4QT6PIDkrbOpjh0lk/p6YlxbGhWKS7qGM3KOd5zhKl0fibK3fJsFGgUaBT4bqVAA7y+W1u21atRoFHgOUkB1s64jrs77XIHQeRChoINP5PZkDkJqS9BLcLpN8pCXmYlVWAEzBLw8lllUE5PpzJpZiWDeC6XwFY+D2bV8HAJNUZIW3AvgykzJ9MpQybTFAAXAFIGrjGMb2713kr4350pc3XnK1cNc66zDGHSI8trOAFCpbwEvmRydGkrTSaPncWQnFhBgkRJiaeTdyTcfhoFGgV2UMChnUPfX8f59jziOKySN/Pz8zFGnSicKwQbHI8BSHCtrT8NkPcdpzw3lTXGrVJPSi65kYagus75L/OM2z3+sXAmGTmcNW3nIMvlnKnErhFUTTTOFIDVkSNXlRe/+MXl9lfcXl70oheV66+7vuw/sD8NqgMAmv6GhuGt6P/P3pv+1rpk533FPXFzJs+5PQ9S1LKkloTujuOOWjAsSLCsGFCsD0EAA/nr8tGAE8BxFAsIoESDYUVTHEuW5e52t9TDvd2t23c853DYA5nn96yqvV/ykLwkzzn3clhF7neot8anql5yPXutVTXg4J73W8/bJxLJe15H/iBI85cTpFnsjhs7EnpnWsXxDmSDFP3VMPFkU3iV5VLUVsqgnZBdc+0Qyc6G8YWF3o/CfKJ35Le+/e3yja9/Q7sv/mX51re+XX70o78rT548saYa5fR6YWIJsdbXNQQXWr32i6W2fSSEl+pdW12zdhommXwBwt8s5tRIfxOYe5cF5lGGRCARSAQSgZeLQBJeLxfPLC0RSAQSgY8UAf+/zKEjfS2II8VZGLishQt5Jy6WeeVDRYIFDnfj23s5jpfAgkaYzRH1j33z0YJgGHKTytAF1/wbzz/9FwltfLOPYBD1dequAhiaUYQo20dJNBFDPoQzyKxGviEAulLy6HnUGwKbH3TkihchnfDhRROtLaEL6reWgfAAq3VpWTSBECGQgLklQvRT73w2dVweEoFE4GUgACnOi2H5LmjvAd6JEC3N397O7q7MGze9fiHQIad5Dzmv0vEumovYmmhXw9j1MHxDsVsj7yPOsdNraHn5vfIyuvBcGTScSN5j5wf7q9Lj9iVA89EIYTWfT5T9xCaM23JS/8lPfap84ae+IOLrZ8vnPvfZ8olPfNKmd9siANltFv9bgAKMxyfa1VZEGu9u3mst8J7jfcYXDv5yRDWgwYoZJLih2YSftN6KNLfUBmvFQXjp14Si+hNfqCifTBLJ9+TJe+X1N94o/+Wb3yzf/e53y9dFdv3wRz+wM/pDO9pHa0t/h6TVhfk4ZqYjE0hBTqpa/X2LnSepk3Z82IE/vVtbOyb7THapDW13ZHys0WfwomVn25dk14c9WllfIpAIPBQEkvB6KCOd/UwEEoEHgQD/cPtreP+vXwkkXUMRIcQ0baQAw1KUL53vLELnRJo7UjrMXtiZkN20ED4QhhBAqIMdwDBt4bP4p951n61geW8hVWmi2bSbZ/VeZzQzCM2MkXLRCHD5amd7jmAYvVpcuE1RnoswPHEVx+6zbvxVrhEOQ7MAQRlhLvzS0C6wRvDD181QmgyYCXUQL8/2n8kv0KHxQpBzp9WXliawayTd6dZUeE5H5l0i8OAROEN4iahp68nQ+J0mskYaQds72wVfXjaX1nqFwLFWFC+E9u7TtU0b5XsPzVJ8H0JY44svtDTD5DFeWG2txrunWy9F3jzQHnJfUogqwOG73j5+N0Ps8QUE2q8r0tCiO3zae2lNm2vs7u5pd8fd8vNf/Pny+PHj8qlPfVqfT5bHjx5r98atsoaz9YHKEeHH+6uPU3haoS8XCCaXKk6863n/QxhC3PDOG43GuufLCDKJLPT7D80zac6J4ILwf/utt8tbb/24fP/73y9/K1PF73znu+UHP3yjvPfuuzIffWZtLr6QwGSS+o7n/E1Qf9RTtI3jSxLKZ9z1RGf/jdOfi0vQovkvEBgP5hWD0uoMArAn/11bm1vCSmageoqZJn8f2SHTRKLiDJmKMCxqLyHJLsOQh0QgEUgEXgkCSXi9Eliz0EQgEUgE7h8CI1VwzwAAQABJREFUCBz8e462AwGTDfzEYKrBt9lV9rGQgq8byBz+n2//4CMAPKRg0UwAIJit4tdLTqL7utZ3/BUG+byR8Izwh0NstMQssFUs0YoQeiEMCTxwtHjEQZ8gxB4SotnXRODFEIBYaOsGk+PtnZ0gKETgQw6Z/OpUAaluQltkF+szCB0RGYrn/eaNKOznK0yqWaPUYQJjsWApEGKkU/C1LpXRL8+bFWB9om7lLqs1AHJKm20IC0w8P/bax8unP/MpO71nx8fd3S2RYbvy+7VubTj8f7FDIwEMrOWlM6aMEECYcqP1i1bY0SFkYLGz+f39fac5lE+vH7/1Znn99dfLG2+8LqLrdfnjeq+88847Ya4oIpEQmrO85HxbDzS82/iz93rc0utRu+yW8DKuea/bRB1STZU0HNiRcW0s81CQ0Njz5Yd3qxT5ZU1o/f2kVf5y42U0JMtIBBKBRCARuBICSXhdCaZMlAgkAolAImDGBSHOIb5JN5kjIWekb7BHmASJpMHMB2fPCITNxAVC7AUkvjsKPqKRhDdpeqEZAlb4tUHAHEhbwvKwJCbwgvA6PDywqSOdxfQlCC9dk5BfQx/4I7S/iCnmHQU0m50IvDQE0MKBpMCBPeQ95FYjqlhlrF3WGesQU0E0VzHbwySNYLJaBA3vudh9FYI61inluKyI8bERbb651kEtcZW06PohDOguzud3Sa0Cwg/tLL7IGOuzvj4W4fVI2l5rZXtrU6TYts0eSQOJwzuN/DO978Xw+N6actL0YhOTt99+rzx9+lQaW++Z0DrQjotPdP/0/fdFFup9p3Q2eexouDb/kRBJHoRTTQ/sl1Fn7/UEmBR9M7SWJV905eGvc4A0XGJauSZzUDS5cOrP3zvw4T3Pu7+ZMpL+VbWLsjMkAolAIpAIPI9AEl7PY5IxiUAikAgkAucgYDlC/8jzzXUIgvr6Xv/t862+BaTxmoVG4niOcIOmF9vW48dEkeeUev+jwAIBDMEHwQhT0JG0vewPTVgh2NkkSMIzOzjizB7TqlOElvKjQeHfCuWp5/cfxuxhIvDCCHgpsozqOwqia1eE18bGlokLDkFWqSotW5tQi4xhjWKKNxExHZSFClGYVfM8tDRN3rBuFR9PKYu6RPbrfPP1Gu+PqNfVvtRDw4L3lN9VtXT3we3XlxsQOAsSR74b0VrS+yy0foWP3vH0EZIHDVZILPs/m8ysGcffgObnkH4sMBI2xqgiFm1oGPKsacNev8vU8SoC7XVn6a/MNCH9bMLJO124zGV2CemHGehQ5oxgR/D4G08X4Lg8JAKJQCKQCLx6BJLwevUYZw2JQCKQCNwPBEJ6kxAShFY4qS/6h59v+kf+5h/fXggAaESgtQTphbkL9+HM5X5AcaVeINwoYQhxKECEnxcwQjCEJERAMg9YZSBMgdCKQ2MEDRIeNt80CIohjFOwPq9KortS5zJRInD3EGAttjXE+4t1iLP2LTlzh5yAwInn0TfWJkQFzt95h7EmY4ON0OYi1dT+q3BkH6RXS29SR+vUGmG8M9FiulFQPr8fbpqfSusL5pz6eQKxx7uGGri3RpKJmvDJ6Ny8c1qoCYkBU/yHEWzarhKMl6JclggwMCUQT3oCZBbEULwfl3XHM8rQVSQl6nToNOX0g+XdRVmXKW52RUsZU3xz8cUFX2Bg5kkfaTNn5hVfbpgA1Hvf73DNNwBpBNjNas9ciUAikAgkAtdFIAmv6yKW6ROBRCAReKAIeDt6CSkIflJkcEAmspNg/ZPvnbnk6HgsIYDt4acy1TvGDMjmjfJRhVP7BxYES4TFxRIA+/WS038IQps4CkvMpzCb4ozJD36F7DsILCVNUQyaXg3zZWl5lQgkAh+EQBASpIKciPWEltemHI1DQLMmISS8znQgfWyOoSyQNfqZtl0b/RKMctgl1kS1zPgwfWTd2iSPmlROI0Oo+foBFoVcN6VwlPmkvYierx2H8GAR2mzxYnebhYPNC9V+NE7pj7FQEeHDSn13PKhE23g3ua2+jR0VY1fGihPkoXFTISoXbeEWdGuc2j2aUh6AFnH2fHGXnPKmaJ2t5uw9fUW7bU0azZh94v+MPoIPTvXR3OWLDL7YCAKVqRNagpSVhNdZRPM+EUgEEoFXi0ASXq8W3yw9EUgEEoF7g4AJL0kz+ChBEOG+CSwITPyD30wbife32hIOIL3Q9tqXeWOVi+4NJpd3pAqBIclFUgRLBCMJzwhFOPzH7wuaAkJT8JBH2Ooa30BolGDiyAchmqdBeFHcB0h8JMmQCCQCCwSCeGrrUmSL1iPLCGfj7Ey4sbHpdxrvNtISQmOrUToQNqHpZRNGSBmvymKimp0K8Wc11cYeJr5EdCyJnJuu12hjq8eNutZBZNMHvCtCCy3eLfSUPkNy0WK0lBZBeAFZ08pyDr706JQfRGLEtB4T1w1tHHgX8rfiXFIMc8dupvOuL0lwusbzMt8sDof6aDRDeKHd1RP5RUP9Xta8GfZHMYdov+cReAVm1Njm1c1qz1yJQCKQCCQC10UgCa/rIpbpE4FEIBF4qAhUAdDmL8KgCXIhvMQ/8pA4fOsN8YUQ08we5zLVe/vtt24us91JzEM4rLCBmD7ExceCHr5epBHQSC98wiCooQWBFtdUuOHXCy05BGybRVUhz9d3EpdsdCLw0SDQiBYICAh6iGecq0M47+0+KtsybUQrpxEwi/Ro6Ji0CYKG65nyTaTtdcIXAFrbaL7avFFrlTU7E/kFacSCjnflUpvp2r1f8Vvh2tkiw+WEF6QT/Yz3VLxc9IZSu+P9hXZYIwBJAwxBAipfRwuMuvxuU16XJ0xORNK7HMd1TBtVJ9iTnvcg7zrOLiMKcj2O+IBDtPv5RCD2KsJQDvvH0syF7GommaA2kM+u1aG0vWymWWumEXoIHgSOr6pdriAPiUAikAgkAs8hkITXc5BkRCKQCCQCicC5CMT/7AtBpCsgkb4JTiZwRHhh4jgQgcN/+Zjo7R/E1vRTm+xJEFJogoBvLA7E1f05XibeVCFIxOCgEl84Px7g+0XCH8KyNS8EBsQXWnI4zWZXRwYB7Bp51vBDUNeDEDIvq/r+AJw9SQSujEBdGk4PiQP7ACnPuoHI+MQnPhG+vCBhTMTEGmWdEUzk1HWH2fZsLo0udhpUGWi0UiA/kGiYOB6J+MLnF2EgX4cuRodueX6oQ4tr98+dTXo9F3vFiOjHeYkvqre9m+P5xfn9BGAVWln11vhGp/VQSULvK9I5bYvrnF2QC1tcXfviKq8+t3HRUFXhcaljrPnAWNmEUxdgwfzAfHGkLyj6MgO1WafimTt9+fNa1XO04WIe1CZTCKFbT8TkMRFIBBKBROBDQiAJrw8J6KwmEUgEEoH7jgCEFxKOHfbqn/81EV72byIyB+khtJUmEgTRfphI0JxXATJMQpT1QQVkIAtV6rgurS2A/xeTXhKc0JQDk/CTwy5x2ggA7REc2kuzZD5DM6NBxsVZABcPW6I8JwKJwAUIsJb2Hj0q6xsb9uVFMogOtHggMZr5HbQNaw0tJ+LsYw8zR2l0QeKQZ65nE5kkH+qDdiZaYCuYvhG8TDtrtV5ClGX4cBDAeT7jxEeHqHQxLjWO8dV4mgzVlxCYn/P3jC8nCOQNskv+uvry2yVCs31REQXmMRFIBBKBROA2IJCE120YhWxDIpAIJAL3AAELe/q220KATBvZ9WwkMw+EBITGEAwxIZrIIfuhzkcWKBASCJA/DylYw0QdRjukCWCYwyBQcX4k4dumQ0oDpgjaYAhuaHvxQUg2bjo0n2nIzS39Q8Iz+5oIvBACWmKQzbs7e/bn5XUkkopdaNECQ2urp/dacCSY4ak2rbUwzSvhc8+kF+8yCOp410F44YOPHVgjkLGFWL+Nc2mxeX61CHjXYFXRJb2a9hl8ZpCZvEeZE/KzqC9v0PDC5Jxgsktzo6/54Pe14nmfo5H7wP6MGY88JAKJQCJwmxFIwus2j062LRFIBBKBO4ZA+6efZiMUIEB6Jyt9Q869fd9U8zwIG8yBQkKoxM0d6++LNLcRXk2DC0EJgck+bSQ8se09fmLQlBuKOITY8q6N0iYx8SUhGiF8MkVjTmZV1loIXzgL4e1FGph5E4EHhgCk/c7OTtnb2zPBEWtRG3CIaMaEEcIrCH38fGHWtiSvMF9E+xLH9WzUQVloetmJvd55mDiiEcaHZwQTJyazIcmSKvnwpht/b+rfHA1hG0XGA39iMTY9+3lDs2tVn6HG3mSYhslzQO9n4noybySfx0/P2nv9w+tL1pQIJAKJQCJwGQJJeF2GTj5LBBKBRCARuDICyH7xz37755+dG0XaiLDByS8aX2ghYZrHN+yz6VzmPjL5waeX4h/aV+NNVkbORVgyfnGwAIWADNm1homVBK4+gpieI2SbPJTgjHPs8BWEiaN2ceyWsxDjrjyEmTARePAIrOpdtbO9Iy2vbWvwsOFGmLb1reHTtDDRWg1H60GXoNUF6XXw7EBnkVtobgpNiGgIavzvYdYNSW2iX0/RGGq7ILKrY4YPBwHvrCj8m+81UV9+WwYBKS1byCyZl/NhfBgnSC7GPtKIDBPZxbPQptU4179hSXh9OGOYtSQCiUAicFUEkvC6KlKZLhFIBBKBROBSBBb/6FcCBwkCgdB+qSQ4YBZC8I5cIm8QBNHyOjw8sMkPZiQPK4SGwWmiS/hUosraICKwILgwp1kbr9mPjH3IkEnPSIMTe/wHYToFedicZFNShkQgEbg6AhAhkMbra+vl0eNH1rBkPUFyoOmDVld/ReSH0nFNfAS9u3SNpiWbc/BOY01CgrQkEz3D9x7vPEgv1q5JFJVDSMIrkPwwjuzQyTgzBpCRBMaCjQowU0SzdiStZP52tRHmbxkEl00Y9ffLO1Q6T6RQcRkSgUQgEUgEbiECSXjdwkHJJiUCiUAicBcRMOGlf/oRIhAEuUfYQxBAWFiTE3a+MR+xdftA2koSBm0GJKLm8EACojSUHlJAI4RgrCwVN9EqUMAJMkIzWiHsCBaactr5Eo0DtAuEKYI3ghdkIbtfhjCtszB9eARi4JbHROCmCPT6QVpBbOzKtHFbml723aT7kbR+bMao9bYkuvR+09prWlxogkFcQXxBPofJdpBhaGCi3coz/Hmxrtl44vgkdl2FgMnw4SDAOPP65W8V2l28S9HY493KLrnebIX3q9671qi1vy60vPrWVOZvW3e8mA8mzHTG31uGRCARSAQSgduDQBJet2cssiWJQCKQCNxpBBACLEBIcPO34RAx6hFCH8IBGl5oTqyvr5uowZwkhL5Zeba/b60HiY8myDhbQ0kcEDTQfZQFG+FFD00MMvrqKFiFEIaDbPfeQhRxCGT2iyYNBPAEZxONKgNfYDMJ22gsPHnyZClsfxB+p3m2gJ62ZEgEHhgCLLcpfgUVNmVK/OjxY/n02rW2j0kNEc1erzp6nVZzRd57kMwsHogTnk0nM5PQkFzknUmri5cZ7zK0MqfyvWeCWn6/cHDfTONUyAWhEWJnF+wFyR98dP0bcgEOvH8ZJ8YGgnPElzHswqgzuy5CYhLQ6Bp2dmfkiwiIMJ53zRj71vrraVzTNPUCyDM6EUgEEoGPBIEkvD4S2LPSRCARSAQeFgJNOERLic9QAobNg+o36zh6RtvrSH6rcPyM1kNPpkPe6l1CJv5vMlQEJO8ipDXyC/9e1ppDa0EyHsQXQjY7w4EluGKWZfMqkZJoLJBOpzhQnouOo8dKWisZEoH7h0Cd15r8/EBQec1w0LXNrSEu9BxtVMiux689lonbmqHgnWVSnzUmja3ZsQhmnSE/XMQlgO0/e6YaYq1BtnjnR2l5HSv/oXx+He4firxmSYbTdOpxuTrTVK9XWl3b7nNEqu5cr13ol2SWxlLvvAreMonwamQXY+ovEeS7bSyzcTRmIa30VYI0kbXbsAgu++sS8WWTV2v0Jd5LMPMqEUgEEoHbjUASXrd7fLJ1iUAikAjcEwRCQEBgGFaTEYQMvj1HwEOwwyQP00YIGrS/EOgQVDgdz1PAODURgEaCHBsBgGNgiUYY5lZhqoOxTttdDmzRXMGcCjLMZjodfJGX226RIUiH0H2qzrxJBO44AmhJanmY1PD7RdcmiKVxBcHEw7W1jbKxvmatH8jkzc0ta6ViRsw64d2E2SLrCG1KTBr98wGvqKMjdmlkTUI+Q2bhQ4pMJ958Yv/Zvt+DroT1SDvdWB0gaByjyBqCsIubJLwaKh08BBsasLzrCDY3reTkSLveMp5odTWT1UhnwOPvEnlFhvE3yhsUmAiNv1XMgwyJQCKQCCQCdwOBJLzuxjhlKxOBRCARuNMIhMwhk0cRWwghqyJpxvLphWNgvlFHeDPphT8vaXlBejX/NwgdGc4iIPFXQhcEov3OoIkg8svmNsILDbrwMxPkF4QXWnRT4QuuOM3muX9CnlZ5SxOfpmVytta8TwTuMgJLAoleaAERYWYpemVNHxyWr45ifYlA3thYL1tbWzZrM2EskquZDjfiw+WqHIq6KISWZTPjjh1VSQvxBnmGdit+DPHvxX0jsXjO2jwVzlTU0p5K84BvbOYNd9VwagNVMVmTaT0afLwveW/yN4gBt2mpxhyn9bCf4ZcrzMbblwRXITcfMPTZ9UQgEUgEbh0CSXjduiHJBiUCiUAicH8RaIIbJA3aE3xwEozTYBM00nhAE2IfTS8JgGhCQJAhfGQ4i0BIc9bIEkaN+EJzAV9pkGGEprmFEG3NEmmoPH36xBoPzeE26SzQGWvyNEmRJxkSgfuBQNPqOq6EEmQ6JmvswAhJjLYP/pl439iZvK4gRtgh1c+UHlNEk/FtjWAm7HUTJPSFSIlQgZhqzutDOyzMFskDJ0OctTFFTlMHvr5O1NYISiDya/kmXF4l4VUhqieT+YIHbTzeeRD4YQIOyTX03502F0CUecD7Ej9c/Z42BBEJ1oJRNqMZf4XyzdiQyXMikAgkAncDgSS87sY4ZSsTgUQgEbjjCIT5TmgV0RU5CpZwgaCJ8/VVOQVGmMMEDyEPbQgEPxxBs1NhahydHv4m0JmwwhRLweY71fzGRCLmovoMEOYkkDcBD9MeyERMHCcVXwiARpxRVhJeoJDh/iFQ6Qq9a1gT3jVW756x/DdBhIjlcpdZX5Al4f/uWARIr4yl9bOxuW3SKtZHODyPdRPkE6TVRSE4E9Jh1gjxpfXnnRqnJrtifeqZCjHZpWdoYkKCofUFcUNwOTosqC8VmevV0Jw+CBePirAa2PQ7iC40ugiQhAwXODK+jL934tQXBmfDZeN6Nm3eJwKJQCKQCNwuBJLwul3jka1JBBKBROCeIhDaDUhrFvkkQSDgWRCR+RAmJAigEC/NbwomjvvavfHgQL5tEEQvESbvKWgXdqtLeFlwQyITnminWEEFIU5kl33USJCznxoRX+SziKcT5lkTmY5CekF+WeOEcvhNCe9C7PPB3UWA+c+6iJ33RmHWph35IN+DSQoyKsyrj6xpyuYPEGMbG5tle2vH7ykTyCaRWStXw0PL0+881h+arpBeEFv2B+bdVdFEoiwOQXzZIb7eifu8A5Umlmd9l5JUEa7+im0gy0MIxlrjg1aXSU2NX58P70c9xHTRRJfGvTeILwXQjEXL69wvVzr4di4fApTZx0QgEUgE7jwCSXjd+SHMDiQCiUAicAcQQNhTMxE0IFMQNuwfxUJj7IjWnK/j1wvJD20vayBJ0Hvy5AkyYIaGQMXTwna9NsKArM/xLITn8PElwkuYropYBFvi0AgBTs6YOs6qj6+mWZKbBDSg83yfEFiVJhfmib1Ketk/IGsG4ojFpPcO2o9H2hV2LlIqfN6FhunG+kZ59Pg1kWXatU/kyUBECeRJMxMm72WhPfaapT4ldg49QNvrUKbc0Y5oj8uqRR4eHthvmB3ma702TVjMlf0+DZb7suof1LOhnNKj5doXyd9nl0XIfmPEOIc27Ip2tbVDetKIGIPE9BjquXe0BbE6aDFOFUI9Z+wyJAKJQCKQCNwNBJLwuhvjlK1MBBKBROBOIxByA8JhOGNGULSAoV6FNtGKHUVvbGzIvBGHwUHENGHu/fffW/i+QcgjUAbBwseDk0BOC8xNcDYgYCKMMI0iHkEPrRY0HdD0QlDHhHSBn9JBRFrTRE6z0WhB4yv83+D3K8AF7tAQC9AZG4RHgp/V8QgpXpH1YYxPd4Bi3JwxD4nAGQRiGjFHYs4wjTzbYyLV1ExG/y7msSdhK6vOTeY42lto+kBqjDTvvVEGxesZhC++upo/rUnVeoT4xacd9c5FHpNmIE2w3d09mTVuaifHNdfbiONW7WVn+uW+1HVBWkj/0GyVtpfq5v0IAY2fMN1Ev9VRa4SJgMOpPeQYJo6+ZsdHxdOOFryu6Z9DVNpdw+3JZef2bog0y7Ivy3Pes6h30RglWZZFHa2e+BtwuoT2d4FYsGtpF+8XHrTi9BztVmtpCVOPswgv5yvsthht4J7Ac2vp1TZ445R6Tb0LvEhcM7W8neHjaYZEIBFIBBKBW45AEl63fICyeYlAIpAIPAQEEOj6JmLkz6v605FxyULImUgDCSIGzQsLhkqP7NKEoBRCTs8S8AQThLTAqGKpezYI2Hv0aJEBbTsHBD5dQH7NpvhSk2AN+aUPgngTAltG59LBuWoRUU5LobMaYZm0niNZN3EnbV4mAkKgEQuAsZg7zJ+48XxmTnMfaU/PJ8eJ4ECrJxyVyyG9iF6c0juDywpSY3asOS4/WcxxiCZ8Zp1HvrSBQVPy0aPHZVO7NtK4MMEWoSJSze11G1vqq59bn03AmXyO9QfpDHm90srXPZpnEHJoeVm7TM/Z2TbgiQbUVec2+l3AdwSCqeFlxGqlPD8blu8ElvAlnaLMs5kX94zRmbxnbp/PvKh5mbdW0N710QnMt5VWH4grm6lqfBlvtPdMZvFmUl5fK02X4GIcF+Ut2psXiUAikAgkAvcRgSS87uOoZp8SgUQgEbhjCFj4kHCCCcqomqM0oQRNJSQ3hDsEUkx/JkeThbBJ3rNy1R3r/ktvbgia4BZCIRU0jLnGdxqaL2DMLnXWjJCGBAIiWKIwgiCMwD218+wgHNECgxxoWmPWnKimQmTs1suYLQNSa7vnOkMicBECjdxqBE3MnMWs0ST1bGrTqc4r5i3zlzmNFqPntt4l7LpnzcSagLxsjIEZL3N5og/k7glaVc8zMKcayTrZEtm1tb1tLSE/pF4RbG7TqdTXv/H6UTutXcn604e40ECjw7HG6IpJLZ1JwxcBEGOk8weC2oQYecAlyB/6B0buZzsrX6QiHc9UNhUsQvd6EXmFC+qiwFro2Rz0s1NPa05L39qybCtXSuXfMIPnPWbNVWmv8i6i3VEmhFhofUEWQoj1V2InRmOB+WKGRCARSAQSgQeBQBJeD2KYs5OJQCKQCNxuBEIgpY0nFk7wv8IOjggqSDiQYMhGCKj4szk8kE8baTkQtxDgbncXP+TWdYVUi5IdYRbNlGNrPIRTZxw7owWzJL5aYy1sI0jLlGo2l6aXHG3v7z8T7me1QpogLQ0xkQcWTV1ti4+zW9VtWqsoz4lARSA4kpiz54ECoQNDA8FhMgOiVkQ595i1ra2HuSET3lpA0CRo+Oge8nZyxM6HYbbrdwiEz4J4ubhe2gJZwnsJ5/UQX2ilovkYU/3yvOf15VSc2rBYGrU9rV20mzXLvc0oIcNUbyO9aBfEV5g7opmpj9Zh+EzUWq0mj1G+jvHr6pt22qItZ+o2aXVB1yDZavJF9u6F89YIjQKvhedC5FdPaFOrWw1EExVinb8NfBHis0grzvheG8ustM8YQ14pzkH527stxjy074LsqnmNVSDxXGMyIhFIBBKBRODeIZCE170b0uxQIpAIJAJ3EYEmgCCcxk5qbB+PI/uBNJDW19etuYAgN60O1ifS9sKXDULXuZLUXYThQ2kzwmXgjUDZk/PmvvwTjaqmV5h/DRctIW3T+ELYZmdHa36JNGi7yJ02d+yQYRIuQxStwm4b5kXpeZEInEYAkkTT0qFOUxM0HDx9FEkaO56vZmz20cUueyZJTLcGWaJpF/OXOR+mf4cHhzZftLmg4lwW+fTe8Tz+gDlK+o3NLfnz2i1j7S7bkhN/46A+tXIog7KWxald0j4Ls2KRWvbxVTW4yKcP5po2h9Q1z63dRR79BFktEloVQAaFzy/Ki7zxpQK1RgsoT7/+rKycmEjk6XmBdC3f88+7eLT+cI53AfVERZGTosjhInVEewsyrvnmQiO1OZeH8GIHWvpCXymKvKSH6PJ8UBpCYBnjG/dRrR/mIRFIBBKBRODeI5CE170f4uxgIpAIJAK3HwEEMSQWvtUnIAyhvbEqzSNIr82tTQtuCHMhkJ2I+JqZfIEAy10FT4/xUljuCncdoRp8q/YEuEsM5WRhExMhNg7AfCuIBAmLKrDhjqAc2iSYT4U2CRooaJdgTgSB5mDJtYqvnesQTU+3N+8SgVMItMnoyJhDXHK1Oh6XoTQ/ITa8C5+0rGyyhhaQ5invkiBVgihCM/FoIvNFfTxHTfpoLUD46IeZb20xrQevkGV1rv3sgVfVWH4Gt7Z3yqY22WCNqMKo82zia9ybAFL6IGjqmVWpX541gspEnRoxlyP9ILlCs4uqlMwhTuqNLiDK+FIAXND4Ir/fo7qm3PZOJXGs8ajPWKi0upqj4DPHwO2iFNp9Em08leC3i5KhZRfaWOShcfqgsQXxrvFsBBfXzQF9vKcgvkKbiyIos+HlO4rVnGhEl/PyHlLx+s2QCCQCiUAi8IARSMLrAQ9+dj0RSAQSgduCQDORWxArahjXfKvPt/mb2hnNginf8tdv7hHU0PjCp9fR4dFt6cqtaAfaKg4IfFUKtjDbEf9s7lUJRtLy3GSBdjXDVAvhcWRTR2l/oW2hOITPY/wdIUWSXuVhFsZnrrGYn7DTnBgBPXN50sDQr65DuDYRoZHMkAhchABEC0QOc8WESiVEGkHLTq5o+sQsMpWiorireUR8oNU0nR6JEMdH1yTmp+ZolAmp3uZgzFOTIpqzl83PeKZaaJveQ+tr6zJr3Lb2KWTLiwbWi1sVjI7aQit9YDkp+OBr0tZbr7ejiZzWO672p6aPfNGyhmtoeJEu1iR+ESGq/eP1yrP6QUfMvs3O7x3vmdrccxKI8NIOl/TJ7yNILSX2ONItXfNujzEWaamyIC6JIz0kGHnj0C4CA+7oG3l7JubJT16Nreuo88IFkJpQ26p8Xd9h8SyPiUAikAgkAvcVgSS87uvIZr8SgUQgEbhLCEgwCW0FNAL40h9yBe0EtInmZX1jU1pHI/vPGUjAQdqx4CbhBcLr6ZMn0dulPBT3D/R4IeGFlChcETxDqLV8aOEzCAUAq/ZkXEnohFwA+1WZb2Fe6gIkGDeNE3K0AAm5/+ypytZzxkgaHvYjxDiKCEPIbcRBy5PnROA0ArGImwYXDuj7IlwHJkPwoTX2/CXPgphhXivwTsCBuwkvSFjIWQhYJr3fMUHyLIgWr4PIxzulFuOyzh48b3kpqSrm8kjO8bd2dsqOHNizRl5l8HqlAtrok45ub/Q7HsUaYw02E8i2xnl+NtAVCmPXx3j3Umasa3CkfPo5EXF4YTjThtPp8L246iivezS46vrn3hpZvMs7gSYxTgQV7RBxQVbxjvJQKj/4c0+ZOrRsxicOyq5Hrpv6nIYI/AyGGWTUkMdEIBFIBBKB+4xAEl73eXSzb4lAIpAI3CkElsJbNFuSiSSXJviwmyDmTAhR+Kzxt/mSXiBX2GkNZ+oTditTBoRlQvh3UbkIPPoQj3zUAmUj7N27EHLdaeFvIQXS28D2VL/BxxEVIGDxJbjxTD8SMNmhbik8EscTIOYoIRkBmjNkF87ucRRed8JbNAHcBT5jR+DaZyfoltfKbQQdWjhO6rYsiD3iNI61mEiQx1eGAGMQa6yDuceTe8YoBsmj2sa2MzjW4iGJC9KZ+SByxSaxims777F5BRsqoHFYi4wxdl1BVDWzWpy0o2mIRpenUVQe6Wkv1dQ4CosWOtY4tUe+ueAAyYvWqYPKWNW7aFNaXtv60EbPYyqh/KjAxDAVt3fSBUXfLDo6FDjq2n2gpBaviKlMOsHF0V4jQXCRlhwQiSQH/xbX0CEFJqGBXlTjghb4keKCoAehjVuBaKW0W+rsZA28lrjxyO8WiDJ9QoMrNMIC31ZQp5BLLp26ZmnwXJI8HyUCiUAikAjcEwSS8LonA5ndSAQSgUTgPiOAIIl/lzCzk6aXdm2E+AohM3ZvnEOsyE/PocwbIVkQihBOw78XohXClCSeJidVqSeFn+vMnBX5L0LDRsShBOUBYyKfXwijYM04TWaTIBdDgrWWSGiciJiUw3t22kTrK3bbwym2hFm0d/SxYG4pOERhyvOHJnakYxetQxvK6MHpu+v0KtPeBIHOgCh7DBvjRVkcgrwwaeF1V9efnrSxJyVEEL77mEdob9oPkwkupVe8fyBc63yifIjSmQjVGUSq1voUbS6RqyZbXxGBTY8gx4PwYq6FY/WN9Q1pem1bA5I2Ml+7wfeKeyWEV7eiC6699tBo0o9NF4UdmlvRLmVyV0KbqzWdqPaujP4sx7NbDc9O97bzVA9izM5fl46tjxbpWNM1jvdC0+Cyjy+9X8CQ56SHfMyQCCQCiUAikAh8EAJJeH0QQvk8EUgEEoFE4CNHACEHYQ1ZCGIEE7s17dwI+ULAgT2ky/x4JpO6/XJwuF+FU+JCo4F0p8Qzy0tooyxN+EiT4XIEQhBeMTkBUQVRERp3kFYSWE10BEHBuCEU2zTVO8YFMWGSAp9fGi+EbMpEqMV8lXsOFqbbWVFo6IVWnx/XRpIuLqlLJdX4PL1aBII8CbTrcYE/a+r0ONQhWjQJbaIwaYv5w458Nl3UfApNniBPF3Og5qRUNkiYoTlYfXNx3TQFVTGL/JUF5hrzkCpoG31YH6/J5Fqk19ZWGYqIb+aBPCecxcKRH9GBtoFVw5WOzDCB1McaXmpztHtJPNm8kfa6O9EnpXIPtCIv7d9lfTfRKfxYs23t2jzRJUs7TORnaJYqhQhPAuW1MueX+BarReQpEUgEEoFEIBEoSXjlJEgEEoFEIBG49Qgg8FhTQcIaAg8mT5BdNnGUsNyEIDQXMG3CEfORtYkmpwXQkNNOCU63vvO3rIENa4GoX2nnQBhKHvW4yNR0a3tr0eIm9FvAtpCsPHpq/14Sstl0oGnoYALZNE8YJufVRROuTXhZQF4UTxMWIYT5xW1evEIEjPsp8E9XFqSK4pgXcXCCNnfW0BIUoQFRiv+r7u6sJCQdH8+DuqZtHqs5cnR4UH0wBTlDGmscWgtMc2tOzKsLbhfzUuQQEAzlS2ok08u9vT07sKdmuC7mMhfWUuP99RFpJLFueH/SJq9DLtzGOPNeZbwgttr686h5DJzSz52f1dj6QYTTdBahS14eLvsyIcwURWrVOeK5QVFEKNhsul47Qge/E+pN7UZ7lOdEIBFIBBKBROBcBJLwOheWjEwEEoFEIBG4TQj4G35JOAiNFpAwgZLAjHkRztTH0rJAYENUQusIwe3g4FCfZ9YGsUCnOEQ8BHCby0gIRBhMTYHrjbQFU2VpwqcF4Sp9IqSujldDG8uERtXg0TUmqezaxlhQRhAHJ9Lykq8vyC4J3pikhvAdJlZonjDmIWQ3zSHyMpAhGNeT06QQfL2xvGlqMG9aN8Zch8BeZxXKuBHYfKI5nR/KTBGSi934NrTrqrX+GHfNh0gr40XNEQpgTWoGhCYXJouaF/iBgxRt/qjC8TxmbjEPagPayWW+ikObt22uNU21nd29sqnNNfA1SJvavOWadcH9RxE8VnrnxciwbqMVbf02U2S3rz5r48t7cqQvFxgUk9SQYibIYrzxn8b9RSEIrzo+ZxK5Dg68kX2qZ2IccfodQ3a32R1Q2jbuPMiQCCQCiUAikAhcgEASXhcAk9GJQCKQCCQCtweBJgC5RWfkJ3z+rK+tW1OkObOH8ML0CVPH2LVNgpnibLojoQ4BFOFaR5Mtt6ent78lglGhCe9nBkPxyKrGV8Iyu+vhbw2NPGvyVPPRJmxTSiuhjTEECARYc3g/1fUJ95X8iqqjfh9rU0JGbqXdfhzvQwsbUXGqLxoC++IS8QwZBDGFr7fQ5ML5vMiKSmw1MzrGnDnBB+JlMfY2X2SnxUp2qmxIL4LLjkGPPMwTkWT93umd/0617aXexFyrTZBZ41bZFpGHqTXznb5gTk1gPZinean1X7Mw8D0nC+/P5XqGbNJYMV4iK+03ccgXCMpb35+QkW28MCflvXpRuEzDizztPQCSXv+6WLwHqLML2pnGJ+F1EeoZnwgkAolAItBFIAmvLhp5nQgkAolAInCrEWjCJY1EFuIewQezInZMG62O7APIslEVliC8pvL3g2NrnFyHRlc4S0e46spUt7rzt6RxCL+iLAT8skHdcbEgKlARVk1uQHyZ+JC2iMYIjR/HK5OdUC+KkV8whG/low78eVnTB6LLcSLCNIYmLrk3CVbNsCR0h3+vTqMW5ebFq0CgrT20uCCf0Nzy7os6j+RjD9IryIuYKx7z2hA7racALVTGmXXp9cn4QqhozCGLGGPWMiaL/YE+IrMwWW6LlmeMeHe9n5qYtb6XffL8Vz9dF1pPmq/0eUO+vLZ3dkXAr7lKHOubrHPal92Kq5fXJY5iTJZ57TeLriiEmSEEJaamWqdau6BrrUuNi4lo+d2bQ0ZpfCi3W7YLWRyEUvfFsIiPC2V1GXFHWl3p0LKA6dnQnUPPPz2bOu8TgUQgEUgEEgH9afnu997QF6ez8hu/8VuJRyKQCCQCiUAicGsRkGgVbZOkZMEHycgfCWoSe3GeDqGCRhFOsC3IKYedXEvTC9LrSKZR7BLYtBJIg5CH8GXBTkfLfornJ4Q9nmVoCJwVYkPojaceDoR7AQrGPPNYCWPn0yN8ftnvEaSIzb/CjK2lpaQYVoRfZahjQXk4ufdZppHzuZyXi1AIgkSkg4iHyny0pvrcBGNGsxvqkHejltc1ccvT5scyQfdqKaR3Y9t1q7/dX+t8lcxn2npe+af72ikUfBVaP7t5g8iofWMMnEhn0uumaVhBZuJgHILExKbG1+NW08X4+SaKVwFzfLdp7MKHG2sSEgVyCFNGBQHeaaXzRRs5Bsnieac7YqjX5KnahXbYqwrMA3BYzEvdhOZTEK5r0jTd2d0pm5tbahPao5BhMS+DPHpVLbtaubQ9EAt0Pa9rp9BCA8eBSEXWZWjn8W6MPtDPILwgotHsWq7x82tnzrjCcx97frkB9XFNu8ijZ7Sy3fOYa354ch4hdm5FGZkIJAKJQCLwoBFIwutBD392PhFIBBKBu48Awg/CGMIQGkJjaVfgzB4tBYcqOaNJgjP7w6NDk1/wI0jLCFI4ura5o8pCoLIAL4EVEuVVO8G++yNw9R40jK0VZI2dIElwWs74YQ7GoDAmFm11YSFXZ2RjhO+QkT3quta5ju8hzsylIcQtwvAJBArP+VEk5CbPuK8Xig+CRdW5Hp0i0IBOWBAxnbh26bzWhGkxZ85uw5m4q97SYDf24gzg46Dz4lLoEdw7lwF29Bss4oO5WWjFKaE7ESdn1IH1oSTWmDSpxU6KIkQwc2uaQIu07aK2FY0sSgPrBWFS66UN77777ule1TYuirmDFxBbkH7r69Ly0sYNnMHNc1F9/iDzvlfdZeY/2pf88F4L7cloM+0c9jW++tLA46vxY0isacea0nqa6/0JudxMi1kTTLjF/HvVHcjyE4FEIBFIBBKBGyCQhNcNQMssiUAikAgkArcIgSrvI6Eh0EF6YV40kpnj2R3gEMBxej2RmeOBCBK0vfDj1YgCetUIFgR2yAbJqhleIgKBtbDlVzehiYfgrPtKfPXl9wnyIAgW/EBBsnBWIo1HjAljEx+ah9BOQJBHEwzyayahHP9fkBE2L6vpF/l8T71NcI/B9pFDvYj6XPw5h8hzzgNHmWi66OGV4tXnCwN1B3aLc5vMQNU1CzvTCRMVlQAJMiSIrKhNZsJaQwuSxORYaEMGmcUY1H6rPudp59pWzFDRBApzRWnjaTzCJHU5Zhd2644+ABPMqvfkwH5rS7uVQoRqDHgP3QaNpJgajFZ9r6m9Q2nEer1p/bCGrImmoVUKE1xoxvoaEllEGWuJoaevbdzv6HBlsxOBRCARSAQeAAJJeD2AQc4uJgKJQCJwnxGwEBeS3KKbaAyZ9IL4Go0XhFbTRsC08eBg3w7tZ3KMHaTXkjgIgbCRCUEBLArPixsjYP9eIW9HGRKam/BMBIJ1I18Qvv2BBNMHodwmkBArEDA6Q4R5THUdgniQMK2KNnLUcTQ5XNRlza4qwCO4h0+iqhGme8gaEzr1bO2cVth5vY9qz3sSvbr0+QXZFM20vswUzj6uVDbpGuEVc5yMnXiXFRFOyoyXphaEIuVDYoXmVpCLlMEaIrjpxiHuuKcM0oCRfypOvlcCzIgxW7SGpAiSMIFDWxKdsw/TsTxt/nACYwCpCqbb2ztlW6aNw+rHDPJwJjPcjyLE3AitRw+mp0GML+sR34eMv9dmbWCMYxCWR5MjTwLG2UGnevVRdCfrTAQSgUQgEUgEroVAEl7XgisTJwKJQCKQCNw+BBC/EOBDlLcmhQRwfNCwW9p4dWxtoSBPqhaQzN3QOOHz7NmzENwR2q0RE+WZMHBno9zb1++716ImfNPyIEt8oWvHBHmly0baOH3NBMGFpgzCeWh/nfYbRXmLoLSUwQ+BIpoQH/VqrJUeYovKmx8whHoTZyJpfFZepxNRoyuKei74udJfFKJZ5+e9KE+Ldx8q8dTiumf3zv1UbPdMh9V3dkdcYFm12AITPRsNylBmistugQmlR1s5uhSXRTyYcg5MILVYL+BkMzeRPTiaBw9I5DAFXvab+HbXtMSitPtxpHeY+UHCYlKNHy+c2EN2QdZ+VBpeMWZBCHuAFQGZiSYsWpOj1dXl+lD7Y/4zF8KM8ehwEgNUxz7m0/0Ys+xFIpAIJAKJwP1HIAmv+z/G2cNEIBFIBO41AghmCOkQXAh39jcjwQ35zL6GFI+21+pYvr10RnC3ho+l75OyL00vk18yb5zJ4TUCH9oOIZQj+N1r+D7Uzhl3jwDVLgkUUyt17J5vUB0ADa4JIJ2t3aVxDVPH0Pbqi7xhp0ANnuKVRkK9NVfQXmEynAnnj2sQOKHhFeRNEDjhG+xMEb6F5MA09vzySKL233AOLefhOTWrT8vNGQLL1s9GcqG15dCwA/OI0HHZqJa+PvSJ/gRJhYaWsGhkiB5AbEFq+XkzdcMfmni/th6jYu65auso6oRouW8Bf1fMuaaRtyoiCdPG9Y1Nz1vP8Y+g08wJRl0j4Nr9ThT+TYMSv12MEdqC9tnFmbFUJO9CNhZwqJPL84f5pMgoMR7nMRFIBBKBRCARuI0IJOF1G0cl25QIJAKJQCJwdQRCgq/SVxXrJKyFsE4x8lMjoY4d1FbR9oIY4wdBUIeZdirGt9BEZo4TObXnvkrpIdClVHf1sfiAlI1otOyM0MwH0bmOIePgUJ9BbHmguuV6PGJQgkyJhwP5/ArSs5lrSaiH9LJmU2iFUZYoiai3EWHUoWCiRsV63rjgRhH4qdOcdyA9hNDFgUIvfnrZExNe6sNFAVPLaD19ivlM2iCwap8uyAyZYQ232rglltFYiI6zJok2TYTVsmZX7RT1tjoqlm39tGhStEfELetaprjrV5BFbHbBmEGg857ZkWnj7u6utOlEtJ8sUPrQu8o6ol1omkE2soOkyTnmj+L9JYHee7z7rO3IGCswtz8qzbQPHaSsMBFIBBKBROBeIpCE170c1uxUIpAIJAIPBwGTAhLoEDIRyJGsw/8QAia7owXBARmCI/tVOZX2bmQroRGG4AdhMZ1BeE2srYPGDhoPhI96dzU34h4eNCygGz2rp7k07IjSiJkgMXETCX1vioWDBPFGTAV5Eo7Bg0CLIp2h1kB8jDmCfyXCukI/cyQqdubanFZQK6reX+9EO28a2ty9KL/Nz1R8hUhncFu2PjAiN3hxlOaObzv4ifgKR//S7NGctz+zUNWKPGBNPvJbm8slmChxu+LWlw3CqKNGuTm1TfVEOfctgFKQSPLlNZU/OP1saNfRvcePy/bWtjD+6Prs+S9CGBPWIOVEdLWx0MAy7tZyhfDSfGDedOeRx0rNp0/MA8K5aeJRHhOBRCARSAQSgVuDQBJet2YosiGJQCKQCCQCN0EAwovQNBO4Q/AMMiWksyb4o9mATx1MHNH6QgsDIdCpJMnZVEu7kh0cHJTDw0MLf8uyqIWA0Ifop3osNVbJ0c/ycCkCguoytMA1wjJVE8zPlhtjRmzksYDeErdi6jPn1TMem9qqmi3k8UexTRMsCFQIgYgjE/Pkopa7zIWmlWs6dVh06VTs8ob8FwbacEkCCN6YiRWFCkrD5lgEBpjCL5nIQKurEhrki3Whs4ksPQMvzBL1Yzxbw2on4kTpwo111ypSTOcSyJ4LH4TDcxnuXETFTJ0P4vBY75mhtby2pOm1LvLLRJiAwt8geJCO+ahBPo33NfvO3I2x1DhUoGM+h1YX85f3WOx0GlpdMZ9P9J478JxgXjT/h4zlcgwZTI+uW3X/x/Ga4GfyRCARSAQSgVuNQBJet3p4snGJQCKQCCQCL47AUrCnLIQ/tH1G+uADaSzfXhYOK3GGUHp0dChtryObOGKq1ALCHmSACQKdl5pkLUWe7yICQRJUbUCIARFY+L+yyaDkfRx8nyKAOp0kLfMJ3uK8EH7ELnioDBeVS1mQEHORVhcFNOKaWaL7oAnqOWpWAqKr3YvMkBajfTNVwosGX1b3RXVm/PkIYK4Lnvjwwt8ZjvwxIcSUen1jvbz22sekRRWmgkFQFZtSQ3iteK5dPEfOrzFiyQWZFeanQUzRDsh96ud9x8dz2e84ctR3mNq8v79f59BlteSzRCARSAQSgUTgbiKQhNfdHLdsdSKQCCQCicAVEbA2hdKeWOAXqaFrzBsH+nBel0AKYcE9Aa2ZOcKrro+OJqEBobjQgAiTMAu2qEAsFR+cNw93EwFITcghhtQEBBpbkBcREdcXdI00zKOLGC80tCA4LgpoFV4WLvOhdKJ2N40eURgxHc/OSUhaE1+QX8xfzigV0a775zz+Mixf5TPmEKSSNwoQwM28mo0yRqPV8liE13CgHRsHIsT0fLGLpcbB8+xFGseAqhwGFsLNZJf8iYXPriif+DDPVttElLLLJj7zQkvwRSrPvIlAIpAIJAKJwO1FIAmv2zs22bJEIBFIBBKBl4BA7FQnIV9mWyYXEA5Fa4QGj3w7iawYaUc1dlUb4HQawZEUOpN+Kk2voyN9dMaRN7lDc0JaFdaWcfI83GkEGNXKXy65g2WPLuarTIwuEz5/5flU59TzTxUTVZ/7KCIvSXC2XM/tZa6uryyS1qnfafMlHbukRfnoeQSC8GrkJ+aK+MI6tvYVfrP2Hj0uWxtbZTQeiWQKjTveQdb2wqT0+SKvHINGGfMMUov3GfW1TRxcCIUz1DrTTsgu/BRCfJEnQyKQCCQCiUAicF8RSMLrvo5s9isRSAQSgUTACDROwFoVSPxV6scHET8ETH7wt7M6HtuxfVfzBVMhk144tNdnJm2vJp027RoXkoc7i4DnAoQQPeBQL4I/ClPHyzp32Tx4lYRXa9+5beswXLEG1EGmez15KeDcK8NLQQByS6yTCS4wPpGTesglqCzFFvx4sWvjxsZGmBBqAIJ0R+MLcuzFmgFxZnPtnjS7ZIKL1iFx/NjcUe+tqQj72VxEl67DLJsmMykyJAKJQCKQCCQC9xOBJLzu57hmrxKBRCARSAQqAhZEkUAXYUlgIOxBbiEQIvcNtYvjGqSXTJDwixO8B8cQGmfSjJjIzDG0vaaOXxSbF3cWAcv8HCrr0Ma9cRCXb04QvrIu7LzKvIzM6Gv3vMvCZWSan9VGug8qqEtghH8vZq8fLFdB7etl7bqsTfnsPATqe6UOBGMTGqAM0EkZr66Xza2tsqUPG2UEORbvpRcZB6rDF6EJr+qzK7S2gs6HcEMDDI2uiTbkQLuMF1uQvOHs/rzeZFwikAgkAolAInAfEEjC6z6MYvYhEUgEEoFE4BIEEDgl/IVs6XRLAVOO56UJ0QRTBEV2b4TwGg6lJYEAqTg7fZa2BFoRCI2YOFqAFPl1GSFxSaPy0S1CAFJgwUrViRLTpTNpLmgvyS8zC7MmDdo/NwzM3osCrVsQXGqI21JpLfJhVhfBPayXtUTSLymwmi5PN0XAu1aSWS+Xs+8E3jdoXI1XxyK8tsvm5qa1sEhns1PmEIN3gwAZix9C5mCQWOEjDJILsh+zxdlx+OpqZBfDHrs2sqMkft0yJAKJQCKQCCQC9xOBJLzu57hmrxKBRCARSAQqAs1crQGC8ImQiVZXCJz42cH8B182IfohnEJ8rWkHR3x7NcKMpyYwlA5h8u2339Z9FRhTamwQ38Ez4wnpQNMrOQohVDkIO46/cHyfJzi6ALSdHrtx3evLnNJT/2VESHM4Hs2WtqLb7EyuorWfvtFBnz13l33ttuW+X9fhdDcNSTdCsSt1jM9E+61w0okkXefWr42enNFzMceUUe8Gxq19qJBxxkcgGl57e4/kN3CkXRu1WYLMC3n3XEaakv+iQN7t7e1FXbzTILHY3ZP5AUFPPQS3xxdxzeVl84/nGRKBRCARSAQSgbuMQBJed3n0su2JQCKQCCQCLwEBpNxT4qtviRnIF85IWhmrEk5HMneUxGjhtpkDscvZ4eFhOdBnKsESTTFYhTAlk/aY/OmQwcRaFabdYBVzuZmcU+UhEUgEXiICEFU9MVfHWn/H4qc4Q2Q1oquntduDzKpr1aeaxnlq2j7laKmTthtaeURTbnusS633nja9mFp7dO/RI/vzguTi3dBCIzcbUdnuIaVIxz2mi7yXMIu0KaPI+faOaUQXfgbxH8b7qOVtdeQ5EUgEEoFEIBF4SAgk4fWQRjv7mggkAolAInAtBBAw+9pJDRPH1bE++PbSfdOi8FmCKL69Dg8O5NtLpJe0K0iDKSS7PJKmaYEh+FrjR0KrHvCbIRFIBD4kBCCoeifaXVX1QXjNFdElvPoiloIUiwY1AquRY+RDjwuyy6QX61cf1rXT6swN14S2vLnFfBSNK8iqbZk1bu/sVF+BkZh3De8KB518xTsiYhZEF1pilBFkWM1bza3RFpuL6PIHU8WmxdoKqWXlKRFIBBKBRCAReCgIJOH1UEY6+5kIJAKJQCJwAwRCUkQTY+HQXiaOaGdhtmQBVgIou6JBauHM/sjaXtoJDe0KCaAWTJXeUjHFmehqEmgIrDdoWGZJBBKBayLQRytLC9GEl5beidgtE14qx1pdWpZNa8saWkozhxgjbacuSC+v3Brp685zEhPX0nAWl+aAhhZao5ghbm7Igb18BUZCUikRv5XoagTYQBsb9HnP6D0E4dX8dfm50tq0VRX4nWStrtDu0qMMiUAikAgkAonAg0YgCa8HPfzZ+UQgEUgEEoHLEAgtihAokUoHEk7x6YWmF7vr2feORGi0wGK3vRU7tN/ff2biazKZ+pnTmSTDv05oYKDphZlThkQgEfhwEGjaW01zC1ILhqkRU5BdpDH1xHrVhT9apnBHJsXI4gxcdEIll3jUyiBTS4ppIb4BXZLK3ljfLDu7O2VNDudbgBeP0Px/xR2+BHlfhMZWxPHOaX6/0C6F/MKUOjbgQLsriDNSx3ss8uUxEUgEEoFEIBF4SAgk4fWQRjv7mggkAolAInA9BCSANhk0zBOP7ZcLh9Oj0ci7o/m2HXIAAEAASURBVFEggiZCJcQWQi6aFlNpez3b37fmF/d2lC+hN7Q2SC+BdSnhXq9dmToRSASujUBodFUzwbawKUVrNswd47xiJkwmhnpk88SaFiKLuKb9xTUvCM5OogvO7ZrH7TlqZZDiaIKyWyLEOWaNmxubNlF0IdL+QovLJtEixyDEeU+wgYbLgdASYU5aesH7g/cJfgTdK+J1T3v8nuFCjcn3DAORIRFIBBKBROAhIpCE10Mc9exzIpAIJAKJwJUQQKPCRJa0KQj457KmRhVKEVqHg1EZjgZBdjkVQmtochweHpSpHNtP5NsLh9VoX1CeNTMQTBFIMyQCicCHg8AKxoxadyKBTAqZmaLqiGgaXji2d5xTxyVkVzN37GqItSW80OpS8hYohhoJmFJCiEN8Y4LI9cb6hndtHK+t2WQRc0dIsb7IroE2vEAjrPkMpAz8gEFk4ZB+pvdK+OrCfLG1ohJdJK4hya6GRJ4TgUQgEUgEHiICSXg9xFHPPicCiUAikAhcCYFQwEL47QiU5NRtI8PQvliVydFoNAyh1ZkwSZKwi3B7PBPZNdMujlORX/LtJWHXTuyXRV6pLZkoEUgEXgwBvHf1RWKb9tL6NCGlheqlGIvdaxvCix8etNUP2YWjekI3f8QoXSetk7H+64c0A2lqtddIaHseW3MLX17b2ztlPB6bBIPkQssL0mtFxDkkmLW2IMj1PoE0n81FdvGZVbKLRnZCklwdMPIyEUgEEoFE4EEjkITXgx7+7HwikAgkAonAZQisSNgk2C+OhE2Ez+Y3B9IKcyMkYpzY49SenRw522eXcwbxhSYXxNdUPr0mMnWE/DLx9ZyKlwprwmvn2VKArc9Vnk2WXEceEoFE4CoIrJzMS1/MFGvYZLTILwfWsRYe68zLzhpeSxKLJdmWJRfkOjbDFXnIxHokitAIL+eqGXsirygbXs1aWnU31w2ZNO7t7ZXdnV3X30ydedeooZHeZpDy/Yf/Pz7S8LJWF/VGlT66qkbcKcaXStBN00mel4lAIpAIJAKJwL1HIAmvez/E2cFEIBFIBBKBV4VAI8TQvOB6IK2MoXx7jaT1NeDTH4bQqQYg5HrnRgurx+VA/r0m08lCa8MCsyRUhG4+FmiRees9ffA1ZenneJ5iLJhkSASujMDJTNpTYXIMiT2XWSBsUJggw0RRUmh8aRVyqV/9iACzNlhPeSKRWG6RUZBSCvjwg82C8OoSXzy1Xz/SqByeRSVqA+8KvSOG0gxFw+vjH/u4NUSpk7Y5KDnmiwcyjcbvV4ZEIBFIBBKBRCARuB4CSXhdD69MnQgkAolAIpAILBBo/nWaiaJ98GCSNBjYEfXqKmZK8t2zEqZJYqyqUH1ismuCmaP8e0F8zWX2GPoapNdH5TggNSMnt1DvIdkyJAKJwNURmK/MRDwdy59Wr8hDlv1qrUBWcy1tKvztoVV1YpIZ7c22XuOyJ7vGqdYqgTXOY3hnr1tuSO5lKW1QnSHA8N1FmIrEYvMKyocQx2/XiN1eK/G1vb1V0PaCfEOLi1Ihvg6PjnSvd4PLdVF5SAQSgUQgEUgEEoErIpCE1xWBymSJQCKQCCQCicBZBPpyZo92B4RX08rAJMm7rEkDBA2O/mBo/144t+8NQvxFdj2RpIxp0kx+vXBqb8f2OKLWBwF6oHyLsBB29WRxvXiaF4lAInAFBCY9mQOKicKfVl8OtvrwTzqzKiGaWMtzXdv3ls4sNegqzj2RVUOMGdt6l8YVvrbQ9AoaTY/60gbTvXdaVKaeyLSTGZpZIsqUrzcclFWRXBBdaHZRJ+WjKba6uiYH9uzYODTBpWhVFcS4tT2JyJAIJAKJQCKQCCQC10IgCa9rwZWJE4FEIBFIBBKBJQI9CbiSSW2WiHDKDyZQ9r+DKKvfs2aOFnLRILE5lPJLKA7H9hBf+qDtJY2O8NFDXYjby0B9KJOEKL6Mz6tEIBG4HIFjmSRKb0qJtP6kdclCQpcKinnKcl0blzIWMa1zT/74pPbldcimE73Dw9J78rT0p9phUZ++Mo4gzFzlSpBe3IgEZ21LpzO0vESGs2bHaG+xA6M1w+K9gbnjUHEscbS/xuN1fVad3w7qlZG1zvXpt4ArzUMikAgkAolAIpAIfAACSXh9AED5OBFIBBKBRCARuAiB5sPHEm1LFGxU3JkEs3htra+htDdWV0O7g2vyQ5RBbqEhhr8edl4j7v0n77cSJfFK4K2fiERgD1F7mSivEoFE4DIE8N91LDIZ88IVEU8zaVweivI6XteafG23bP3kZ0tvV8TU7lYZbm+IrR7YzHF6OCkr77xfTr73Rpn88O0yefu9MtifldWj4zIQ6SXjxjKX/aIMIn3GoT3E9lCfUV/Gkzpv7ex4jYcfP4gstMpEiqEhJq1O/HRh6ri1tV3W1tcird4FC9PmyzqWzxKBRCARSAQSgUTgXASS8DoXloxMBBKBRCARSAQ+GIEl51TJJ04iphz0kOfHMn1CyOUR2h0jObXHbAniC+2v00Gp/LtSnjyVgK2yTIS5DGl96cx9OLJnZ7kMiUAicFUEBiK8UPCSV6wykXbm0UgmydtrZeMLny17v/DTZfUnPllmm6siwEZS3xrZl9ex/GmdoNV1cFj6779bJt97szz5xnfL5G9+WIZv7ZfRRKSXiC/87kFgz6hCS3PAWteOrWN9BiK9+MytqRVaoLwbeC/Yh181acaf19b2dtmRE3u0wbwxBe8DEmdIBBKBRCARSAQSgWsjkITXtSHLDIlAIpAIJAKJwBkEmjxqgipMG0mB0GtbpPa8k20swstOqyXYspsjfr8I4QAfw6sgu3BmP8W5vXx9oQnineWUDq2RDIlAInB1BFgxA62bfV0862udfkzk0pd+uux9+efKymcel8ONfpmtiQQb9eWPS4nEXZ+IZD6ZimQ+nsjn11EZPp2Wk9ffLUf/8Tvl4C+/U2ZvvFVWFafirNG1It9cw1WRXDpDcqHFJSrMDuzx72eiS2U2oot1jZN6E2uqcDxeK7u7u2Vjc0vvj2gD5o6NR796bzNlIpAIJAKJQCKQCCThlXMgEUgEEoFEIBF4aQhUXztVOm0CbvP0gwRt/S89R2sD0mooR9ZDObGGHEPDoylz8AxBGS0vnNuHgHwkH1/TEI5rHVWfTCkJyqELnG+flZBDS+Qc5u2l9T0LSgRuNwLyoCUCalDelgLX8ad2y+bXfr6Mv/RTZfTxvXKsdTjXujkeyOxxqHUCO6bg3VBZT2hWnsh3l3xz9acyWfzRk7L/l39T3vuTvy69779VNqXWtdMf2SzRps4qAhIb4hqiGhNHb1IBeV0/3LO+Wz1cY+K4vr5ednb3tGvjht8T6bTeEOUhEUgEEoFEIBG4NgJJeF0bssyQCCQCiUAikAi8DAQQdEVQyQwK08Y+Zk+QXyK+8NuDjy8CQjAftDysCSLBGyfah0eH1dxR2iF6DqEFYdaTFok1QpQuiC8XI0GaupoWWQjZ8SSPicADQWBlIAKqX56+tl7W/v7PlLVf+cVy/F891u6pQ++m2PP2jBBeWndaKqKbBUx8vGI4sBOjfH8ND7Qev/tWOfjTr5fj//S9svbOQdmTPeOq1p/UMGU0ya6MPZczkwbXZHJk4muqtTubTYJIA/bKcDfNTqJG0v7ckc+vbfnzYpdXLe8MiUAikAgkAolAInADBJLwugFomSURSAQSgUQgEXhxBILIcjkSetHssK8fmTHZybV8+SDpLjRAFlKvBHKRXzOZQqEpMpH/HwgwyDBClZ+58jVaZro8Fay1ciombxKB+4/ARGTyEevrZz5bXvvHXy3li58pk72RiGD5y5rIT5cIr5UTrS+0u7xmguwy6cUlGzxiZahPXx7q+4fy3fWtvytH/+FbZf6N75ft9yZlQxpgQ5HNoqFNek3msfPq5OjImplz++FDswuzZDmt7+z0ytpFm6svQm1Duzpu6x2wtiYtL/0k53X/52f2MBFIBBKBRODlI5CE18vHNEtMBBKBRCARSAQ+EAHMmRCkIaQQfLuOqSG5cFyNSRRaW5hhoaF1NkBy4QNoMuFzZAIMIoyAphdO8l227iHJwul9mE05UR4SgQeEwLPxsEy1++LW136h7P3Kf10OX1srM/nt6km7sqDdJQf0ZpbEEUMwNQ0vDJEhwnr6aB/VcqLkKyKmWGPjNw/K5K/+thz9v98qGzJzXFcZI/zuScvraD4pB5NDa2PiyQuWi00nCGHSrNi6rk1Ci/Fqml5oeW3rHbC9tWUtr8rAOW8eEoFEIBFIBBKBROBqCCThdTWcMlUikAgkAolAIvBSETgRAUXAzHBBdlWBGHKqtyKiS9oo7Oq4Kh9fIxxhy7ypj18gNEhmc+dDU+RYvoXwEzRT3LEE7cNDaZPU8lujbRpZd4lDUM+QCDw0BN5dl1+8z3+qvPbrXy3DL/9kORRxVTak4SWtrF5PpoPajZH1RAh6mZv4oGW1IlJsLo2tsooKGDTYvAyfzErv9XfK9E++WQbf/EHpvfWklCf7ZXosZ/Rag6K4XILLU+FehyoSbS6v+6aSScUmvPDZFz6/NjbR8top62h56T2RIRFIBBKBRCARSASuh0ASXtfDK1MnAolAIpAIJAIvBQFMmfjBz1bT6kDMtiAs4TYILWRgtLx6QXzVnR3R2iI04TkaVKVo3Uzk3yvMHcPs8RhtMhWM42w0StD0ypAIPDQEfrwhjaxf/OnyiX/2j8pMvrumIorlLK+UGZqWIrG01oKYEjLwXCsc6oflJTNGyOXeqvKMtEZFag2ezspYn6e/++/L5M+/WVbefLcM9uVfD3BVGJqZfKDHGpnGIxfri7jpPmO9kn68Oi6b2q1xVw7s8eWVIRFIBBKBRCARSASuh0ASXtfDK1MnAolAIpAIJAIvBQHMFRGu0dbiY/m6Q3j1RWqhpTWf6ZnOaHjg3H4wHJr8Go/HtR3QZgoitHzW0fmk6YVvL4gvzBzn1ZQKSft4Tm0ZEoGHhcDbO6Oy+dVfKI/+6S+V6ed2Y1dGaT1CZBWZK5YhmltaR5BbjuKCtVLJKogxCCzFlJH8fvWlifneYVk7Oilv/5s/Lgd//Ndl8M7Tsiazxp60M7Wy5QxfmphRQhRK+bDaDo0EY1MK1aNfyGzILkgvTJlZ5x//xCe05tt6r1nzlAgkAolAIpAIJAIfiEASXh8IUSZIBBKBRCARSARePgJoZxHsm6sKwGF2yO6KEpiljdWCqSzJyE1QxiRxKM2UgcwdMXkcSfsjTJ5CgMa3V4jUoVkym07K0dEk/HzJ9LG3ELijBrdkcaAixUfz6kWU1toTDztxnctlvmXqvEoEPnoETsqTj2+Vza99qWz+6ldEeG2L+BXhPJH5YJ9tGbVWrImlNVkVIE96WgQivPhp87ovTbCTI5k1DpVen/LefhntS8Pr//r/ytGffV0aXu+X8aEYtIGeQ1SLXO5rvR3JFBKyzD8itbymF6BAcEU9EN2sc3Z2ZFkNtb4/8YlPlrUxZo2Ra7E0F/nzIhFIBBKBRCARSATOQyAJr/NQybhEIBFIBBKBROAWIxBkmZxmo/Elsms00keaX2h/YbaINhfCMg7vEZLh1iDB8PM11+fZs6d6SgoIstAusUN7zLWU3yaTxC80zyDbJIirrGOVg8BtwV2CubmzdlZ8ao8JhAyvDIHwe1WLr6Qxd77UlPbzGt9I5bg9Ke893ijbv/zlsvVrXylHn9kUsyXTRBFdK3PNa238sKJ1dKK5fB7hZaqJeY5GmAgxzBl7a8PSeyazxvcPynv/55+Vgz/5eum//UQaXlpH0hZj/aw08tmaWzeApfZpd/dRee2117yTKzuzsl7REmUBNiL8BqVnlkQgEUgEEoFE4F4jkITXvR7e7FwikAgkAonA/UQAoirMnyCncG4P0QUBxv362pqvm28wa441FRUBMpewPLfJo3Z3lMkjZFgjByjYhBaCPySXBG77GSNewn5TdeGqG0wIdCPyOhF4BQigNRUEViW3GsmlunTp4LlZE8U10Sflnd21sv1Lv1j2/slXy9Fnt8uJ1gvJjqWR1dOOpmJ0Y+63yd18eKHlxdyXRphJJq2fk4HipMXVe3JYxvvH5Z3f+eOy/yd/XYbvPLNJ44oIL1HGyoN/sE674vJaRwitDfny2tvbK2ta2yapmx8+PUvC61pwZuJEIBFIBBKBB4RAEl4PaLCzq4lAIpAIJAL3BQEJ25K/EaQt7FroReAPyXptfV2+uAcSzgfW8sJMivSNLLATbUWwixwaX+zuaD9fIr64tz8hyq5wOS/aXirDJph+opvF8+X1Mld7mudE4OUh4N1HNRGZ9+3jhXCFKt5/tF7WvvyzZffX/n6Zfn6vzOV4/gRNrGeTMpCvrJPm247pzKcRXtzIl96xdnHsj0eisXB2r7xS9erLYf3q+5Py1r/+t+Xwz75RRiLA1qbS7EL7ys6+Ym0EWXyFRl6QZKSdWje35MB+Z9c7trKphTefAAdpXmZIBBKBRCARSAQSgecRSMLreUwyJhFIBBKBRCARuOUIBOG1aGSHnCIOTS/MGQcivYaDkUwdIb56VWOLxPpYDo9yIBFwko0APZWDexzdo/XFhzilCvIL4Zor/8Z50YZ68aKC/dny8j4ReA6BxdRbXCyS2NRPBFBoPsrPHVqPfKS99XRXfrB+4pNl/WtfLCc/++lyNNbGEOv45MI8UH68ILzi1+XJGFjn+sHHlgivnswej/taD9plFQJ5/FS+tr77VvnR//6HZf7X35O216SM5dxejrv0gRSL/F4XXL5AWBuvl73Hj8qWiC+0vNjQwmuR9ZwhEUgEEoFEIBFIBJ5DIAmv5yDJiEQgEUgEEoFE4LYjAAVlWbc2FG2X1mY0PiSmV+EaB/V9iC/59+LDNU7ucZJ9LJ9dpCMvProgBWYydZziI8jaX9L80j1+u7gnLSQYF2FGFZVG/qAH3LDWlDwnAi8bAebqqTI7EcxlkV1oNEL2DoYjb+4A6dsf9MoTEb9HWxtl/A9+toz/m79X3tvqlckYMldlnGj+H3PWPLZmFvWwiFhrSkPZen6ivSRORuHna0WE09pbR+XZn3+9vPV7f16Gr79TVuW/a1XaVy5DdVIkGpMrLB6Ku0EgK+uP9bsjDS+0vCCxWcMqXg3z8QYlZ5ZEIBFIBBKBROB+I5CE1/0e3+xdIpAIJAKJwD1F4HkZV0Jvk3uRkBU4OZ0OEF9ovbCb43hVPr4k1HMd2i+I/OTXx1lrft3Y3xdmjyK+ILuOJkeSvkmmH7Re9ENFPqsMfIllSAReHQIxN5spb5vXzF3mNz6umqmj57uJXM1uPd9X1olIsN4XP1fWv/pzZf8n98rBZsx7ecIzobUiwuuYKey1RF3tE2vEfrlkCtmfaNOIp5NSvvGD8v6/+4/l4K/+pqy/f1hWtTZ6mAUrH1pgx1pn7LgICeeibgAM6xiNLsyJ19Y2RHptl42NTa3dKJMWZkgEEoFEIBFIBBKB5xFIwut5TDImEUgEEoFEIBG41QjAS5mcopWQTZZ4l+eQ1k/fo/kCOeB8Og1ETMUOj5g8aodH+fuyAF3LjBNloAnGOTS8Dg8PRXTJ3FE+vWz2iCkk/o2kLUbos/NdhkTgFSLQ5nJfmoqYLKK1OBD5A4E7FKHF8og1QSOCDuLeyonzXnn70bj0f/HzZfSPfqFMPyfn9Xq2ovWwMlVyEVbHsm5EQ2uh4YV6F79OqHg5qx8ditx981l58vv/oTyTs/rem++VLZFgQ1V+zIYQqsxmjypnOtdOjphM3jC4Wjql0Nc6xaRxd2evjORPjDbxPEMikAgkAolAIpAIPI9AEl7PY5IxiUAikAgkAonArUZgQXgh7NLS7lkRdkpPNI7mnQKyC20udl1csWN6a8GIIIDoGrDLI6QX95g9mrSqgrQEbXRb7KxeeadTmTtKswsGAH9JNoHE55e0WiDBokE0ikAZ8YE0Q8uFev1kIaQvLpaCu+t0Mh2qpH+64Pawc27pOlFXvlS7FTDrNKnhtqrXIvEg9U4UPxiORVyIvJC52kh+nKzHJiKD5slFuXKL2eBD/7hdUT45Nz+BCFR5QlDl8QlNIen+OO10Lofpwtw+1DBRg3hxO1yIyuAsjOQg3WZ1XDfI9KhdKtH1AsW+QDgvu9vCQQ/bc3W9E+KG/p0KLTGRSsIYtDnGfEFTyx/80uGPi3nEXNV8bv7qeuCmn7kIWIpbVhsrgKLnR/MyOZqWNwcy2/34Vtn62i+Uta98oQxe2ynzVZkIKteJiOFjNKcYYKYFc13t8ViWaelrOIfTlbL648My/c/fL2/9u78os2+9UUYqe13qXJBxjKVoYE0HKDP6Iuf2at9Ng/Or33TsWH7GRqujsru7V7ZFfNH/Jeml2eL1JSQqpqfxv2kLMl8ikAgkAolAInA3EUjC626OW7Y6EUgEEoFEIBF4JQisjlfL6uo4TCAhFCSoQ1RBMliAx4m9OACTaiYmIL1wbh+EV/j/ggwLLTA7vUc7TD+Qbo0NCXm8URNxZ7KJXukW8mJxdk+7FIYiqiRPbOQm0fKKuysHkVKiukRyhF8kbddXpMRToEC8i6VIqsF4oxxMe+VIrNeaTEJHPTk6n0nbTT9T14tm21B3IjnoZl+mnysTNXMmlkJpT6RBp08f0ku19djpT3VMjqciLSBq2B1TdQ7GitfOgUonxJQf0gRyTKSJ+owvqCC+VKzi9PhG4ab5ojI1VL/LqnW1vFmMTTeyETCOI60boELOBkXZ5xVFas5BFNkfl7S52HgB31Uma12lsFTB7Z42xHwTPQXppDkYc1PzU2NwPBXG+jwZnJR9/HB9eq9sfemny/ZXfqb0Pvu4zNaHZaaBZ/zgKU14qZ347vJYrhyUtZna9PqTcvDvv+XP9Ps/LqP3joIsZtxoQ/20Luo24Dmnu2e7f949fYGYZvnM1H5K29zcLLt7e2VdO7LSf/rnNQEerNcKOMukLpXzis64RCARSAQSgUTgXiOQhNe9Ht7sXCKQCCQCiUAicD0EbC4G0SDNEZMNIhia2RiEFeZjEqGlPYYgjQSv6yrIQ/6YWIBskCbUvJp2NWE8yAfIm0oABA0ggT3aiKDeLY+Co2w0V9CeiXS1WmqmERxbSZHg2kfYDdWh+tU6MRZoU52U1f5MH2l0rer5icgrtKxIpx+5cRK9FX1BK0j6a8o4CB5H92LDRJyIqNA1t315O1/RB8KLlK6pdyIiTSSaSK+52JH+YF0aZOPy5luT8uQpOmBQboBF+TrZYzrl6IYYlW8yjNtrBpMx18yzSA7mHoTAHcKFqziprcKvPl6MrfPWgQa/yOmOuCtxJYpP8w7n7ANpGfbRPNR8s0aX8jDSEK3kjvy+WNRBndMZGoiY21aysvqeo019dVpcVzkQ7keyPTxc01ze2yjrX/hM2fzpz5eNn/xMmW+ulmNpe52oDSci2JgPlNs73C/Hb/5dKW8+Kc++8f2y/5+/W8qP3i+r2uFxdcI8YJyVXvNiHg104xo56ajoZDT6WkfmfxRK3yhmdXVVpo3bZUvE11h+y2LdefbqqdoCTmrPUvvrWhVm4kQgEUgEEoFE4F4gkITXvRjG7EQikAgkAolAIvCyEECclrAMUYOmCOSXz5jayWn2uhzeS5OF6yaEw1iglQMz0I1H2A5fX+z0eFwmMoe0iaDiISDazo+NIIHgoCyK4hDCetxbgFc7HHje0i0iOiyD465xEJGFOs8xzJT6dSKzsRMRJRujWdndOC5f/cony/b6UVkdHKnvM1kriqhSWj7wEKOxtG9EYWEHd0IETemjfSWybBhmeCa7xIbIIE+aXqLHxISsiEzrS6ELJ+nz3lA6X9vl29+blX/7R98v3/3ekdozKDNgRdMLmuxkVZis1o6JCrPTKci664cXIrxUHV3kE6H2ud1yZvx8ogMxhhEjWlDaSgAHIdOczjPf+MG8EzLHc89pVLaKsB85XWDGSOAe08EZDuKZS/UzOTqiOqWs9XKlSw5jtBU1Dw+V71jjMtHnQOM+X5P22KPtsvOFz5fe3pavV3Y2ysl4KA28WZlo19KVt98r5dtvlIPv/ahM33qvDPZnZSyfXQNNnVVr5Kkc1QHZZYUwVQk+TC23mDbcMIANG0TQx6ZZCTm7LqJra2un7Oztun+YgeJrj75aywszSNUb5qE3rDyzJQKJQCKQCCQCdxiBJLzu8OBl0xOBRCARSAQSgZeNgIkHJPUampxOFNfDwcgEGKZlmJqhgdNH9Qqix4kRuk031BxBZPB4OsPXF36twuSsmT0G+SXTQBELLZhMq4SH61YeBH5CEG0QJr7rVu3n1z2sYBpowks5IRfEWtDOjdG0vLZ9XP75b32xfPlnVnUteuTo/TKSCSKEgrgTkxpDmTeKiSCzcYD0WpEWkdkOnWzEKM0u013ci+yS8ZsuMIcUWSNzvePhenn9x8Pyu3/4Zvnd3/9OeeNHKmMobSP7AgvzxnI8FtEztqYZZBpmkeiB3SS8COEF7AuyszPmtEPD5GcxNtEykngMnUAEkcxmIQhNalmTUNc628+ccAztJMbXA+x5tZhRzAPZG3rDBI0RcwrSK4jUpWaZa1bFzDUK4GSCUtf2NSfyS9aJIrRUFmSb/GKJnUR1qvTW1T7d48trpjk3Ux3l4KCsPHla+tqgYaj5AdHVk3lrX+UOReDhs2sOKVWbjGaXp4DO7rsOurxRwJST/gXhhdYWhN+xmjuyaeNrr33M8xG4SEOfwQ4H94QkvG4Ee2ZKBBKBRCARuAcIJOF1DwYxu5AIJAKJQCKQCLwsBEwyVKHdZVpKb6K6HvDMJwTq8K80ZLc8aeZwL+oAeiGIBqWD7LG2iQRwTBoR3IOAUJkSzE2O1eL395/Ve5fA4wi6WGivEKOy/ENbdMXvjdkEF6E2ifSCrICsOpbKFT6c1oaTsrt+UH79lx+V3/yVj5Uvfl5EwvT9MmYrPpEQz6ZoaolIUZ9oz6ItKsPN0gkn4+JBbE5nLNRQHkN6EY5F8OxL82s22Cx//BfPyr/87e+V//TNw7I/eSQSRTiI2CKDfXlBdulzjLmkCS9ML13MtQ8vQnhRGSafMT6MlQL3nHVsxJW1BEWG4og/tARjLozlA81jqH7FOIKdo3ym3EZ6EeHNEdDKEsNok0Vp3zEfIH2Iw8eViS1lhIQlP63x3BIBZO0wRfbEQHnjBs1KSFbILIg3z9uqpaXRUU7wVr0MlIL7pQmxIn9sQ89xxYn4cttFlnlOk9Skp7OY7IIHjRLQ4KvlxONrHfHx5v6qr6HhpbLUd9o9EkH3+PFjbaSwalNQCgYTQuy6Gn1xRB4SgUQgEUgEEoEHhkASXg9swLO7iUAikAgkAonA5QhYvFcSierxu7gmH369ELabxglkln182e+SyIPqXBztEtJCejiIQQgTRsoXVeCyOUAbECDEpiYp0PyaSWhvjvCb1goshEkMpW4Eh+8VH9pAtS6Xd/XDicwU2VVxBdJD7TieY7IpDbbepKz2npaf+tSs/Navfbr8k69tmwAbinA6FtN0JD0tfEKtHEJ40ZXaE/ocv8RWpiOMHt1v5V3RB3JtJs2vfZkpvvHuoPwf//cPy+/83o/K20/WRXY9koP8Q+EZpBYln5zIrxQf6pf/Lu/4eEPm6obZAlTGQWQRfQuNQMZzOabW+rOmVofsEjkDAQMZZpNG9yeKA6AYzwqVopvJInOBnTHnaAfqGuf+TrvIupwTRFH+IgBaJ/Q0b9HmYyQwPwR/NMsgk45kbuv+6BkbNVj7jLGr46fZq/T0WQPOFCa/fpi9pOXe8XrEmVZ0ycgXIbyYM2q46wgtx1qnooje2d6RqbF8kcmBPSQYxLI65YexIyYFZEgEEoFEIBFIBB4eAkl4Pbwxzx4nAolAIpAIJAIXI4AQrafI9J2D5XkiEO6R7SGvaqQ1uBD8LZgrGyQIhNdQ2jYDmUAORpBHOB8/LXhTToR2ETVHPHQCQWdFQHZMJiLEJMij0WNSDM0eiDHFmXQwKRAlXud4rN0UcQAvfRnVQ/9Eeqjd2hOvnEzfKxu9t6Xl9cnyP/33ny1/73Nqy+x9awf1VqXZhobQEeaFIKAgpsPkjxsAeYYJnW9ExkDIkEaki9JBvRyiTTZ6XP7gz98t/+Jff6v81X8R2dfbK5MTkV7ziTAU5gKCD9sH2hiyOsRf0b23FIzir3V8IcKLkRFJZFIIYkskC0RLEJw9WQVi9oqfLtoMHt2mCRMPcMVLj/y4psHcENNWdiPE59tM2lzURSHgah9VnhOeGTrE/IjZEkRQFFXnY63cJ5V1IsLM4ENS+RMaXd7VsWpt0Q/MdE1YoUmmAXT50rQ6MVmpGvSca/dPPcAvm69pKt3VuQWw9qdFXPPM/A9tLWmKyXwTEguTYuIx59wQ2WUH9tvb0vKSeaXWCuvDofrbu2aVmTwRSAQSgUQgEbgXCCThdS+GMTuRCCQCiUAikAi8agSaBB90wimJ3lV34ztkg6KhNvgZj8c2u7Kpm8gGiAW0aZqWUJhiRT0I876q5+bc3OSXSBEcllvzy9e4WHomEkpCPpnI0/nQgjBlo6GtnctLudOXxtZMZocjkRwiumCjYEj02zuZluHJs7I9eq/8D7/x6fLPfv1TZW/7qTgYSLJ+GcvR/spEJARFE+oFBBhtgeuC9OJmpK0de4OVcqT0M5ErAxFDT2aD8taTjfIv/tXflt//kx+Xt55uqTUyXRThhtkgtpV9mTz2ZG8ZRYuAEWGGthFmjmqEPs8HnjSNs8ACWMA02hI5lMqFquwFMeSIIEzEzkFqMU6YCkJYxnipPcrYxmRFmls2WYQkUnrq0YEWuJpa9KKOufDgKbt44isNUgsiJ0wU0QRcmii6rGisSoOcImc3nL3nWdTrVLpsd3ObrTIitV1OwKGm0COu1LPFE1+oitDW4kJdU4fOElj210XeTnO6aVxD59npCj7ojnprGyuu7baZdu7s7pZHe3uaY5i9am5ASGpcYqfGDyo/nycCiUAikAgkAvcTgSS87ue4Zq8SgUQgEUgEEoFbh4CJLpEiCOI2g0QDTJpBdlguomQ4EtkEKQAx0/24J122oJI/kvrrlUzURJKY/MIUUlpgCP1ouiiOsuzHSSQAZIBNK9Hcqfcn0u461o6Jvbm00Y4hvJSHH8g41d1XOWuDJ+XnfnJe/sff/Hz5B18ayZfToZzXQ4jJb9QC6WhjpSZgRoIgoS+ivnA+LoUbEV5o4EhXa7xWfrw/LH/6l/vlX/326+Wv/2ZSDmXKOBXhMtcuj9BKtKAnE8veMTtBYnap9tM+KvFhUduiFacvqJu0/HKIe2uhCXOfXYSQBE+YFP1CTkL8tOfhU6vds0Nl9DrKjAqi9yJaqlbRYgzdAqWkbiU6YidFkUsmLRkPxgttPY9VbSynlxzAdL7QylpShUTZPHRRX2h9dQkrCC1lD6JL+NjfG+mNnc4uI26J0m2k1ZlgQozIlx5iHo+1Y+Puzo41vVhnYMo6g6BknmdIBBKBRCARSAQeIgJJeD3EUc8+JwKJQCKQCCQCHwkCVfCuxEpwK5VkEXOwtr6mo2gWNIkaEQZBhsaVQpizkb41Pi7aPYRKpKvkCnmgHhQf2mBxxmzuRATLvJqqzaTFJZ0rEUtyvC9iib0TpX8kUkP1wnrMVspq/6Csrvyw/Mp/u6ddGz9XfuJTiltROmkoDUQstNCumqaPi1CJ+IwSf6QzRI8uRUTM++vl2z/qlf/lt79d/vCP3ivvPlP/xx8rUxFwk5MD9VukkkwsV9Sm/hwTQZnjqV2QLPTU5FSr+OxZaYybzmAav3EmqTW3RDgGwSW865jYNFTP2YTA+XRtDMlEUD/IM1D7W2i4+zFJ1EEoQ8zqbIJ6itA6KYdHy9043REXFGRY9KyV/HLPNkEUWUidQmJxhuxqAVzR4GKSKaWHn8Q4oB+gQKhrPhBescmB7pXO4065rexaoJJFINGrCKrAY6hx2djcLI8ePZJJqTY2EPbeLCIJr1eBepaZCCQCiUAicEcQSMLrjgxUNjMRSAQSgUQgEbjrCLDbHFRDkFAiCiSkh1ZPsAHeLU9kl00dRXiF9hfO74MAG/RFwjQGQRftElxMYqlkYv1TEy5JoSXj0Aiadobwmshh/oo1qeRTS4SXvCOFVph0rOQvXc8OZPL4d+XTj4/KP5eW16//w4+XtfKkjPBa76KjfIgP11+rgxcy+aMjZJe4H5k1ilhbGZX3D8fld/7orfK//pu/KX/7HaXr7ZbeeMfaXUfzJ9IIWxWBMgztrhPIKbURv2KmV+i9KRm6/1zAlA0C0a0BKyUHi/aJCB4LW/007bswLxWPJyIv+hVFL3HkXjjX/jUM4zaORyK0ZgLNZBfkF5p2aNyhVQfxVwkm2tTaRzu4b3OCJy8/1EarYFfd6Uery+aKujlltqjEEF5oeBHOI7woLzTFouzwudbqiTzL2l3MyzmoYsYGk9CRNCR3Zda4vbWtzQ5it8plC15OdVlKIpAIJAKJQCJwlxBIwusujVa2NRFIBBKBRCARuMMINILDXQjGwSRH6xJcyEUBzSOc4HO2k3QxSZhsQZKhyYSAD1mDBhLBJx3OLROSoFuRb8Rm4BReajuippQPLSWoqhXvEjgUgzEoT8vw+M3yS7+4UX7rH3+2/OxnjsvaqnYPPJ4sygvTNZE3tS9Y/rkkRbCX41z+uEbDcZlOh+Vvf7BS/uf/7fvlT//qWTk82Bajsi3SayhVInkVO9kXNrjEx5eXDBthWSrhhbN61VCG8gEWJGK3M8tr+m6Ci9QmlIJUAnQ03rzxgJ8pD8/1U399vyipg2MjpPC/1dXegtQKzbmqTQd2bTydn7EgQgSbxvC5EJPDA9dItOfSvISIyrV1SjL96n63SMb8bGA8+7U/JryUoJXloanPGP+YA/VMOn3mKrKlP1v2y7oHQkxRd/celU1pexEwZ4ydGl9WLVlOIpAIJAKJQCJwdxBIwuvujFW2NBFIBBKBRCARuNMImJBqPRALEMRGMAVcd4mQBVliuiAyWcsIYkYfSC5rI0GA6TGCPkSY04iw4Bm0EKGRPb7RIWrkIq76Kg9fWTZTUzTes0LTB8KLXRanZX1NZmKzIxFe75ePbzwtv/zlzfJP/+FuebwzEel2qNxBk0BM9WA2VDS1Q3jhTywIDwgvdjRcL2//+Lj8P3/xrPzL33u3/N0TaeRoZ0a5tddzZZLW2FxaZvjgh/QKkzv0umR2eYKD/CC8aL3N73Q+L9B2k1g8VGMqGiqTfJHDCOjQxoIzceTjOjSz1H60tKrPM3xvzeR4P/yhKT15rL0FyYUPL8ZIbXQdOtS6YmyErztZ63cDltfkiXwR9/KPtTEuuFauqNYMnzv3JAMrCC+ILMLZEloePyQdaThrLFtaWaYu6nC6l3aAYBQZO5RmInNH9aDhtbe7Z7NUDYfH4qVVlwUlAolAIpAIJAJ3CIEkvO7QYGVTE4FEIBFIBBKBu4yACS8YAAnhQZKgZaQbRQRRAlWAgN4IE50dVckXnF+RvEMdtFscwsOUsFsgvoswi7STeO4V3/yA4R+MQsMJO/XIH5WYrqGKnuHUXMUcs0viylAKXzAWInb6mDiKPDpeLWOp+YwmPy4/9cnD8pu/ulu+8sWRyLBn4hkq4aWyIKggPHSU5lkpUznUl86YyuxJW0zlHq+Vb33rWfmdP/hh+YNvDsuk9ynFhZYaOy9CaMFdYFY4ZLdG38npvcrp+RPlz9W3qBVMzgu0WkEH8OWixjjeMdXUsEtokZZ7jxE50AarZFcUI5JFpJWgczlU0YgdX/OAOM7+xHN6RphOxeTpuj6Kh37yag+uXdpxhBifwCRaFX2B9ITginOQoGBGmqa9ZeJLWYmjBC44t7yOqs8bSUac03LxUgOkpAgv7RbK2EA8ro5X5cB+r2xubVkDkrHLkAgkAolAIpAIPEQEkvB6iKOefU4EEoFEIBFIBD4CBNAIQvSGKOAYfEjccYOwHqHRMvVWJ5Mvyh+kCXk7+XVtB+mS+CNeZfKcmmrxlKQoEV8iwkQOhJ8wEV8ioaRDJaUqaV+JnTg2ITYS2SXTQhyc6zNYLeXZ/jP569qU83oRaNMnZW9jv3z1Szvlv/vVnf+/vXv9keS86jh+uq59r+7Z9a5NHGNFMlEkkDBBCETAMb4QI2IjXvPvISEhkKy8sKLIilCsGAdhJCQEIgEh23uxZRtsZ70z011V/M5T3XPb2c14Znr69q319LW6Lp+qvMhP5zmPPXXzEwVmEx+JqFBK29L2QmCl0/G+814l5Wde6rtJ3bMv7nXtpz/71H741l1774uxVcl1hUCqHvPeXt5kXL/z4GuqvkyhWiow+Lmr9kzbCpGNvm9pXQ/RjkYpc0FPP8LMh+EDeYY0pHn2l1Ov0tL2g2sItJohjiHY8mBx5hYMw/5ngHryY/I/v0q+Lb+o8+vTrHro3mxm9hiedBa+fe3Ar0cTivmvmvfhMMP3zZYu8zHsXm6+NK+Px4XhVPwL/Xl4VfkB6uT8tSvPq7z82c+5+Vav/a3ehD9/M/vCn/zP113c0lyDKNF9qX8eTnrgO+gPbKyhjVmeh7DS9x+ORc/hXvD3utfD9fMvWRBAAAEEENhAAQKvDbyonBICCCCAAAIIPEJg/v/8Z6t4UKD6qiYRaFKYwzBGaUXWzkID/clkEoZdpgoXqnLXbjxW2Ivfie0vX963fHLfehNV12ibSaZG90qt7ilN8H9xqrhEr6eeI2U37N3/mNhfv37b/ud2bHsKwCo1pj++zA7Qf3+QSJxITfQ2zDwZ9tGEGGHd2fr+3e7u/fNnLSd2d/z41vvdicv/wMkcnLpWPHittcLvZh+c3MbBeg/94oHdXNoHfo95PzvfdVN5pxlEFXR5hVe/N9DQRgW4ui9CFaTWKWcTEiRp0txDl3YkbAgBBBBAAIHVEiDwWq3rwdEggAACCCCAwBULeOAVanj8SYFXyLzCMXjFmAKCMLWihuLt7YVgIddseJOpQi71DXv2WxP7q7/o2m88kdo4Lq2rbCtS2OSj9ioFX7WGQE5VEqQe76oU69j7H3bs9R/dsTff+cI+/qytlTV8solSHjjrUOnljbwesniI0eRbHnnMKncOkpfZ+4f8lo83RaAJRef965oqSe/plaqvXceKotBzN1RP+r3swZgv80o+rwZjQQABBBBAYFMFCLw29cpyXggggAACCCBwdoFZbyfPnjwYCLU94Xn2UrnAZLKvYKm2tqpnplOfnbGyr127Z9/7o5698p2b9uuP1dZRt650Xw3nNdxQZWE2jUrb02elqrjqaGA/+dmX9jev/7f9/FZk9/b71lKj/dkOHzjWeZj1wBezD8JwwNnrkHPNHsLv/DweEqQ9bHt8vo4CGnKp+9BnKfVhpmHQsCelGq7oQ2SHw0JN7AvdYk2w5bN6JlrXe7RN9iZheO/D7r911OCYEUAAAQQQOCpA4HVUg9cIIIAAAgggsJUCTbjUnHrIuWZhlwdc3ucr1jBG73lVqlTLh4KFIYp638s+t289Fdtrf/qk/eGzXSuSfWur+stnzaumte2rsde+Krwm1rP37kb2+hsf2T+884n97/2O5lzUcEavzZoHayfkm/wqPJ74pnkbZrVs0rnmg2OreuXPqT/jw40SaHq1xZodIUzIoHMLTep18T0Q7XZ7NlQD+26nE3p7NUMbFbLqvptO1CPOA1cWBBBAAAEENlSAwGtDLyynhQACCCCAAAJfUWAWEM1zIm+y74v3PooVDHjz+VKVXf69h00eKKS2a8Nsar//bMdee2XHnnk8sWG0a6lWikpV32jU4p6qbT7+smc//un/2Q9+9Im9fze3Pc34WKkxflk32ws7OvHgYdthI/8TX4Zj8KSsScsOcy+9nwVoj/rtg1vjk/UUaCq8wv04G57o1z1MEKF7MFX/rsFgGIY2phqKG/q8+V1zeMOs52lz1AgggAACCJxBgMDrDEisggACCCCAAAKbK3Dy//wf742lCi8Pt/z0PSRQ5UxZTfVeje5VVZNqFseo3Lev3dDQxheu2fPfHtvXRxPLtE6mgKxuJ3Zf8za++4va/u6NW/ZP/7pr9yfXbFJFYYZFxRUhQDtNt8kkZunVKSt4IOb/hfVmAcbhb7RlBW4s2yDgAZfOU7fK4TDW+bVvaabGto2KkfX7/VDR5TM5+k2TaMitN7mfr7kNUpwjAggggMB2CRB4bdf15mwRQAABBBBA4IRASxVYHhQdDAHUi6OhlwdeU/U88qGNISRQYOB9k/xHPrtjUifWaX9ov/Nbmb32J0/Y7z4TWZFq6KOGNt7Xd19MM/vBTz63v1ez+tsf5wq7dlQtVmqIWUgoThzNibdNgnXiw+at92EKB611PLQLf/7V7DdUeJ3Ktlkf+i2k6x1m7NQ9Ge6BWfWhn2gza2Nkg+HARqOxGthrkgSvANN3BF6bdStwNggggAACDwoQeD1owicIIIAAAgggsEUCIR/yh1Dq0tS7NOFX89obfleaLTGECT7LnT5uwiT/3qu/VOkVfWo3r5f2/O8N7PvP7djTN2PL6/v2+f3c/v2/9uxv3/zI3vk3VXeVQ5vUXSvVAN+HSiqueKh02HtzCKeuMx9yefClzqHZ2sO3ebAuLzZGINy6s5DW76dwn/qHfhvo/vGeXqlmbRwMh6HSy3vQ+f3t682HOG4MBieCAAIIIIDAEQECryMYvEQAAQQQQACBbRU4mSydLTTyLl91rWFj8dTaalj/za/v2qsvXbc//vY1K7p79sHtxH781sf2xtuf2nufdmzS6qh/l4KucmKJZnIMwZp+z4LAIgSOhlrewL4YjUIj+3mD+ybYXcSe2SYCCCCAAALLFyDwWv414AgQQAABBBBAYKkCXu5yygGEDOy0Lw7X9VU89MrU1D7SkLJh5679wW931cD+GfvGk7H987v37Idv3rJ/+c9d+2Wt3l1ad0+N7xOtH7cUePnQSAKvQ1BeLUTAgy9vYN/rD2yoJvZ5noUKr9LvPxYEEEAAAQQ2VIDAa0MvLKeFAAIIIIAAAmcUaHlsFdKt4z8IQdRpgdeRz/RSuZW16tQi9epKog/sycf37YXnnrbf/ObI/vHtj+2ttz+0W5+qSX123abR1CZqcp9ohsZYKVsYUnbKro8fCO8QOJ+A318+0LXpF9eydt5RL68iBF8+pJam9edz5VcIIIAAAushQOC1HteJo0QAAQQQQACBRQlopsUHAy8lWacGXvOwq3lueVjmzecrVXgp9ErjzyzLPrNvPF3YU08O7Rc//9zef+9LuzfJrWr1zFKfl1H7813qz3/KgsCiBELgpequpg9dpUb1iQ3Vy6sYjjR7Y6bJE0hbF2XPdhFAAAEEli9A4LX8a8ARIIAAAggggMAyBULg5QnUfPEUSn8PDbwOUyoPFPwvbiXhN3G8rxTrvrUzUzVNZPd+Wdpkqibhltm00qyOifp3eRP8UsGXZlkMfevnu+UZgUsWOAy8fCZHVXvp1u10ulYURdPLS0NrWRBAAAEEENhUAQKvTb2ynBcCCCCAAAIInE3gAoFXSyFWKJJplQq6SgVbChVUtlV7EZcChkj5lv+FpEFPtRrWtyKFY3Vkk30NbUwOw7OzHSxrIfDVBbyHly8hnI0T6/f7oYG99/Waf/fVt8ovEEAAAQQQWG0BAq/Vvj4cHQIIIIAAAggsWuCBIY2zEOrUCi8/mMOQKlJlV6K/vck9i9LSSgVgrShXsOAN6SM1Cq9tou80LaPlWWr7+5V+nYQG4ru7uwq8PA1jQWDxAi0lr2GSBO3Kq7zGOzvhmcBr8fbsAQEEEEBgOQIEXstxZ68IIIAAAgggsDIC6mN0mGGpDObogR394ujnzevwrQdj6uVVh+DMP1GwELbhrxVwHTTF14eq7Dq+s2Y7PCJwpQJ+y+rf47/2hPW6fQWvsYLZqZeAWaw+X/6/Bx92y4IAAggggMA6CxB4rfPV49gRQAABBBBAAAEEEDiHgI9yvP7YY9bv9S1vt60sNZ1CVapCMdJkCk3PL8LZc8DyEwQQQACBlREg8FqZS8GBIIAAAggggAACCCBwRQIKvLyX12AwtP5gEEKuqSZSaMoTvQTMa8D0zIIAAggggMCaChB4remF47ARQAABBBBAAAEEEDi3gLKsVMMXPewajcaWZZkqvCpVeqnKy4MuzSZKf69z6/JDBBBAAIEVECDwWoGLwCEggAACCCCAAAIIIHD1ArUa13dC4NVTtZcHXJVXeWlpRbE/htc8IIAAAgggsI4CBF7reNU4ZgQQQAABBBBAAAEELijgPbvSNNWwxoENi5HleW6Vz7hQ1aGXF4HXBYH5OQIIIIDAUgUIvJbKz84RQAABBBBAAAEEEFiOQF1XYcde5TUe71hT5eWzjPrnXt1Fhddyrgx7RQABBBC4DAECr8tQZBsIIIAAAggggAACCKydQG3lrMqrGBY20F+aZrPeXYRda3c5OWAEEEAAgWMCBF7HOHiDAAIIIIAAAggggMB2CNQavuh/at1lqZrWh6GNmrUx1dBG08hGKry24z7gLBFAAIFNFSDw2tQry3khgAACCCCAAAIIIPAIAa/uStIkDFys1bcrNLAfj/Xc1a80V6NmamRBAAEEEEBgXQUIvNb1ynHcCCCAAAIIIIAAAghcQCA0rVdllw9e3N/fV/iVWqHm9UM1sU/C0EYCrwvw8lMEEEAAgSULEHgt+QKwewQQQAABBBBAAAEEliHgQxlbUdOrq5yWOoSWtTvtEHr1e32L4mQZh8U+EUAAAQQQuBQBAq9LYWQjCCCAAAIIIIAAAgisl0AcR1aWZWjXFWn4YllOwzDGYVHYaDSyPO+s1wlxtAgggAACCBwRIPA6gsFLBBBAAAEEEEAAAQS2RSDywEuVXWpdb3EU2VThl3er73R6NvKhjfpjQQABBBBAYF0FCLzW9cpx3AgggAACCCCAAAIIXEDAhzT6Mp+tsaorb1Vvmfp69XoDe+zGzWYFHhFAAAEEEFhDAQKvNbxoHDICCCCAAAIIIIAAApci4KFX7VtSnZeeQ18vDW/0Bvaj0di6mrExVQDmS8jH9FBpRsfwfp6YhXc8IIAAAgggsFoCBF6rdT04GgQQQAABBBBAAAEEli7gwx19aGMxLKzb6ykIa1ldVSEb89csCCCAAAIIrLoAgdeqXyGODwEEEEAAAQQQQACBKxbwUCtJUvXxUgN79fKKk6Tp96UysCSNw9HMK72u+NDYHQIIIIAAAmcSIPA6ExMrIYAAAggggAACCCCwXQItNbL3IY2FZmzsdXuhuqsqK4VfcRjeWPkYSBYEEEAAAQRWVIDAa0UvDIeFAAIIIIAAAggggMAyBbzKK4oSGwz6VqjKK8vz0OB+mcfEvhFAAAEEEDirAIHXWaVYDwEEEEAAAQQQQACBLREIfbpmfbvydlu9vEY2GA4tVm+vclqFDvb08tqSm4HTRAABBNZUgMBrTS8ch40AAggggAACCCCAwKIE5oGXj2OM49i6GtJYjAprK/ya9+4i8FqUPttFAAEEELgMAQKvy1BkGwgggAACCCCAAAIIbJiAB1rex0uPlmWZDVXh1e8P9ZlmbFT/LgKvDbvgnA4CCCCwYQIEXht2QTkdBBBAAAEEEEAAAQQuU6D0RvUKvvoKvMbjseV5O2y+rlT+1dJ/3uvLhz/qX1XqryrDrI6XeQxsCwEEEEAAga8qQOD1VcVYHwEEEEAAAQQQQACBLRHwiRi9mitSVVe73Ql9vHqdniVZqqBLCP69nvz1fF1/4ZVhLAgggAACCCxTgMBrmfrsGwEEEEAAAQQQQACBFRXwoYyVh1ezKi4PsToeeg0G1usPLE2SEIZVdXXQ18tPpan2WtGT4rAQQAABBLZGgMBray4WV6WDAAAIoUlEQVQ1J4oAAggggAACCCCAwNkFPPDyYYqtlldr1eZDG5M0sX5vYDs7O5a387CxqlLgpaGMoRJMszj68MdSn7EggAACCCCwTAECr2Xqs28EEEAAAQQQQAABBFZcwCu7vF9XWU5D+NXpdmxnvGPdXl8zODZDFz0M83UivU+S2KbTcsXPisNDAAEEENh0AQKvTb/CnB8CCCCAAAIIIIAAAucUaKq7TEMWVcXlvbw0vjFWoDUcFNbX0MZ2nof3lQIvX8fDsSRW4FUSeJ2TnJ8hgAACCFySAIHXJUGyGQQQQAABBBBAAAEENk2gFcWedmmIojeuV3N6PXi41e32FHp5L6++ZVmmMEzr6HNfPPBiSOOm3QmcDwIIILB+AgRe63fNOGIEEEAAAQQQQAABBK5EoKWKLu/N1czU6ImX8i/16/Khix56jUZFePaD8SDMO9z7MMdKARkLAggggAACyxQg8FqmPvtGAAEEEEAAAQQQQGANBaqqtDRNbViMbFQUamavKi995kuiz8spTevX8LJyyAgggMBGCRB4bdTl5GQQQAABBBBAAAEEEFi8gFd+ebVXO2/baGesmRv7oceXSsFCEDYl8Fr8RWAPCCCAAAKPFCDweiQPXyKAAAIIIIAAAggggMBJgShuzYY2tmw4LDS0cRyCLuVd6vXFkMaTXrxHAAEEELh6AQKvqzdnjwgggAACCCCAAAIIrLVAK1J5l6dbWtIsD8MaBwq+kjSx6WSqVl7q98WCAAIIIIDAEgUIvJaIz64RQAABBBBAAAEEEFhPgTrM2OgjGz336na7trNzLTxPpx54aXZHFgQQQAABBJYoQOC1RHx2jQACCCCAAAIIIIDAOgrUdaWZGmOLlHhVVaWZGRMrRiMrVOWVZmpar5kcWRBAAAEEEFimAIHXMvXZNwIIIIAAAggggAACaynQVHiFfl0Kv8yrvDodG6vKq9CsjXt7k7U8Kw4aAQQQQGBzBFrvv3+7npZTe/nlVzfnrDgTBBBAAAEEEEAAAQQQWJjAfJZGD7r8/0t4xVeeacbG8Vj9vEah+quq9KUXevmEjqoEmw9/DGMg/Q0LAggggAACCxQg8FogLptGAAEEEEAAAQQQQGBTBZrG9abhi1OrFHilaWaD/tD6g756efWVa3nadRh2+evwkT8QeDkHCwIIIIDAAgUIvBaIy6YRQAABBBBAAAEEENhMAQ1p9NBKf7V6eHkfLx/e2G639ddRA/vroal9pNkcw3pC8IqvoyHYZrpwVggggAACqyJA4LUqV4LjQAABBBBAAAEEEEBgTQR8CGMYpqiQy5eqLEP1VpLGamCf2s2bNy1NMkvSJARhXtTloRiB15pcYA4TAQQQ2AABAq8NuIicAgIIIIAAAggggAACVyngwVUo8JoFXqHKy1Mt/edVXdeu3zio9koVenl11zwUC6MZw8NVHjH7QgABBBDYNgECr2274pwvAggggAACCCCAAAIXFZj1nJ+3nm+yLg1ZVBWXxjlar9e3Xr9vg97AsjxTjy8FXvourE/YdVF9fo8AAgggcAYBAq8zILEKAggggAACCCCAAAIIHAqEhvV6G4YoetrVRFkq8PIqrzrM0ugN7IvRKFR6+S+9yuvYbI3+IQsCCCCAAAILEgiBl8+s8tLLry5oF2wWAQQQQAABBBBAAAEENkngIPDyvlw6Ma/c8jArZF/6pFS41ev2rCgK66vKK4qjUOUVAi+t679hQQABBBBAYJECCrzu1GU5IfBapDLbRgABBBBAAAEEEEBgiwQ8+PIQrNPt2mg8tq7CL198yGOrFWkGx/lgyPAxDwgggAACCFy6AIHXpZOyQQQQQAABBBBAAAEEtlxgVvaVZbn1BwMb9AeWZtlsCKTCMAKvLb9BOH0EEEBg8QIEXos3Zg8IIIAAAggggAACCGydQNOvK7I8b2to41BN7DW0UUHXvJfX1oFwwggggAACVyrQBF6Veni99P0r3TE7QwABBBBAAAEEEEAAgc0V8MDLw604iUOF12i0oyqvNFR5+XcsCCCAAAIILFKAwGuRumwbAQQQQAABBBBAAIEtFPAeXvNqLj/9dqdjo2Fh3V4vzOBI4LWFNwWnjAACCFyxwCzwKlXh9edXvGt2hwACCCCAAAIIIIAAApsoECq7oih0rq+VfkVxHBrX+6yNnXbHp3TcxNPmnBBAAAEEVkig9cGtO/V0SuC1QteEQ0EAAQQQQAABBBBAYK0FPPDyCi8PukzVXmVZWqam9Ts7OzZQpRcLAggggAACixYIgVepwOtFKrwWbc32EUAAAQQQQAABBBDYCoF5Y3oPvbzMq64qa8WRtdXAfjAY2lCVXvOlKfby9Wr195p/yjMCCCCAAAIXE2jdun1XFV5Te/FFhjRejJJfI4AAAggggAACCCCAgAt44OVLM1NjeBVeK/uyXq9vN67fUPVXZC0FYv7P//Owq/JgjOGOwY4HBBBAAIGLCcwCr0qB159dbEv8GgEEEEAAAQQQQAABBBCQwNFKrXkF1/w5z3Mbj3fU06urGRwTrVvpF17hpcBLQx+9vxehV+DgAQEEEEDgAgKtW3fu1uWkshcIvC7AyE8RQAABBBBAAAEEEEDg0QJNqBXHiQ36fStGI8vbuYY7Ho5j9F5fLTW7J/B6tCTfIoAAAgj8aoHW7Tsfakh9Zc8//8qvXps1EEAAAQQQQAABBBBAAIELCPgQxkxB106o8up7QVeo6vKysDCkkcDrArr8FAEEEEBgLtC6c7cJvL77XQKvOQrPCCCAAAIIIIAAAgggcH6BoxVa9Wx849FhjnESq8prqBkbh5Zr9saQenmhl8Kvo789/xHwSwQQQACBbRdo3f3wo1Dh9dxz39t2C84fAQQQQAABBBBAAAEELkHAhyWGRSnX0cDLX4c29fo6b7etGI6sr+GNHnL50MY4jec/u4SjYBMIIIAAAtss8P8TBOvXbm4YOQAAAABJRU5ErkJggg=="/>
 </defs>
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
index 8a7d6c3b27b8d..0467f0f50fc71 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
@@ -8,8 +8,8 @@ import { EuiDataGridColumn } from '@elastic/eui';
 import type {
   BrowserFields,
   TimelineNonEcsData,
-} from '../../../../../timelines/common/search_strategy';
-import { TGridCellAction } from '../../../../../timelines/common/types';
+} from '@kbn/timelines-plugin/common/search_strategy';
+import { TGridCellAction } from '@kbn/timelines-plugin/common/types';
 import { Ecs } from '../../../../common/ecs';
 import { ColumnHeaderType } from '../../../timelines/store/timeline/model';
 
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
index d1452af25a709..d9511f89c9c81 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
@@ -9,13 +9,13 @@ import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
 import { head, getOr, get, isEmpty } from 'lodash/fp';
 import React, { useMemo } from 'react';
 
-import type { TimelineNonEcsData } from '../../../../../timelines/common/search_strategy';
+import type { TimelineNonEcsData } from '@kbn/timelines-plugin/common/search_strategy';
 import {
   ColumnHeaderOptions,
   DataProvider,
   TGridCellAction,
-} from '../../../../../timelines/common/types';
-import { getPageRowIndex } from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/common/types';
+import { getPageRowIndex } from '@kbn/timelines-plugin/public';
 import { Ecs } from '../../../../common/ecs';
 import { useGetMappedNonEcsValue } from '../../../timelines/components/timeline/body/data_driven_columns';
 import { FormattedFieldValue } from '../../../timelines/components/timeline/body/renderers/formatted_field';
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
index 94ae557dfc300..5a238c19511ad 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
@@ -10,7 +10,7 @@ import { noop } from 'lodash/fp';
 import React, { useMemo, useState, useCallback } from 'react';
 import styled from 'styled-components';
 import type { Filter } from '@kbn/es-query';
-import { BrowserFields } from '../../../../../timelines/common/search_strategy';
+import { BrowserFields } from '@kbn/timelines-plugin/common/search_strategy';
 import { allowTopN } from '../../components/drag_and_drop/helpers';
 import { ShowTopNButton } from '../../components/hover_actions/actions/show_top_n';
 import { getAllFieldsByName } from '../../containers/source';
diff --git a/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts b/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts
index 690a3e3e196fc..b680eb05dca9b 100644
--- a/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { KibanaServices } from '../kibana';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { isolateHost, unIsolateHost } from './index';
+import { coreMock } from '@kbn/core/public/mocks';
+import { isolateHost, unIsolateHost } from '.';
 import { ISOLATE_HOST_ROUTE, UNISOLATE_HOST_ROUTE } from '../../../../common/endpoint/constants';
 import { hostIsolationRequestBodyMock } from './mocks';
 
diff --git a/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts
index a90f9a3508cd8..19badb56007aa 100644
--- a/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { KibanaServices } from '../kibana';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { fetchPendingActionsByAgentId } from './endpoint_pending_actions';
 import { pendingActionsHttpMock, pendingActionsResponseMock } from './mocks';
 import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
diff --git a/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx b/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx
index cbc9e4eb44286..047e83a0f0dc4 100644
--- a/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { asArrayIfExists, decodeIpv6, encodeIpv6 } from '../helpers';
+import { asArrayIfExists, decodeIpv6, encodeIpv6 } from '.';
 
 describe('Helpers', () => {
   describe('#encodeIpv6', () => {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
index b76b5ee99843e..c4c5c36497289 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { notificationServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createTGridMocks } from '../../../../../../timelines/public/mock';
+import { createTGridMocks } from '@kbn/timelines-plugin/public/mock';
 
 import {
   createKibanaContextProviderMock,
@@ -18,7 +18,7 @@ import {
   createWithKibanaMock,
 } from '../kibana_react.mock';
 import { APP_UI_ID } from '../../../../../common/constants';
-import { mockCasesContract } from '../../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 const mockStartServicesMock = createStartServicesMock();
 export const KibanaServices = { get: jest.fn(), getKibanaVersion: jest.fn(() => '8.0.0') };
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts
index ebf361914ca3b..97befebc04d50 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts
@@ -12,6 +12,8 @@ import { i18n } from '@kbn/i18n';
 
 import { camelCase, isArray, isObject } from 'lodash';
 import { set } from '@elastic/safer-lodash-set';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import {
   APP_UI_ID,
   CASES_FEATURE_ID,
@@ -19,8 +21,6 @@ import {
   DEFAULT_DATE_FORMAT_TZ,
 } from '../../../../common/constants';
 import { errorToToaster, useStateToaster } from '../../components/toasters';
-import { AuthenticatedUser } from '../../../../../security/common/model';
-import { NavigateToAppOptions } from '../../../../../../../src/core/public';
 import { StartServices } from '../../../types';
 import { useUiSetting, useKibana } from './kibana_react';
 
@@ -169,19 +169,19 @@ export const useGetUserCasesPermissions = () => {
  * Returns a full URL to the provided page path by using
  * kibana's `getUrlForApp()`
  */
+
+export type GetAppUrl = (param: {
+  appId?: string;
+  deepLinkId?: string;
+  path?: string;
+  absolute?: boolean;
+}) => string;
+
 export const useAppUrl = () => {
   const { getUrlForApp } = useKibana().services.application;
 
-  const getAppUrl = useCallback(
-    ({
-      appId = APP_UI_ID,
-      ...options
-    }: {
-      appId?: string;
-      deepLinkId?: string;
-      path?: string;
-      absolute?: boolean;
-    }) => getUrlForApp(appId, options),
+  const getAppUrl = useCallback<GetAppUrl>(
+    ({ appId = APP_UI_ID, ...options }) => getUrlForApp(appId, options),
     [getUrlForApp]
   );
   return { getAppUrl };
@@ -191,18 +191,19 @@ export const useAppUrl = () => {
  * Navigate to any app using kibana's `navigateToApp()`
  * or by url using `navigateToUrl()`
  */
+
+export type NavigateTo = (
+  param: {
+    url?: string;
+    appId?: string;
+  } & NavigateToAppOptions
+) => void;
+
 export const useNavigateTo = () => {
   const { navigateToApp, navigateToUrl } = useKibana().services.application;
 
-  const navigateTo = useCallback(
-    ({
-      url,
-      appId = APP_UI_ID,
-      ...options
-    }: {
-      url?: string;
-      appId?: string;
-    } & NavigateToAppOptions) => {
+  const navigateTo = useCallback<NavigateTo>(
+    ({ url, appId = APP_UI_ID, ...options }) => {
       if (url) {
         navigateToUrl(url);
       } else {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
index a0053bba304cc..0097e31cfee8a 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
@@ -10,10 +10,11 @@
 import React from 'react';
 
 import { RecursivePartial } from '@elastic/eui/src/components/common';
-import { coreMock, themeServiceMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { securityMock } from '../../../../../../plugins/security/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 import {
   DEFAULT_APP_REFRESH_INTERVAL,
   DEFAULT_APP_TIME_RANGE,
@@ -35,10 +36,10 @@ import {
 } from '../../../../common/constants';
 import { StartServices } from '../../../types';
 import { createSecuritySolutionStorageMock } from '../../mock/mock_local_storage';
-import { MlLocatorDefinition } from '../../../../../ml/public';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { MockUrlService } from 'src/plugins/share/common/mocks';
-import { fleetMock } from '../../../../../fleet/public/mocks';
+import { MlLocatorDefinition } from '@kbn/ml-plugin/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
+import { fleetMock } from '@kbn/fleet-plugin/public/mocks';
 
 const mockUiSettings: Record<string, unknown> = {
   [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
@@ -95,6 +96,7 @@ export const createStartServicesMock = (
   const urlService = new MockUrlService();
   const locator = urlService.locators.create(new MlLocatorDefinition());
   const fleet = fleetMock.createStartMock();
+  const unifiedSearch = unifiedSearchPluginMock.createStartContract();
 
   return {
     ...core,
@@ -105,6 +107,7 @@ export const createStartServicesMock = (
       getCreateCase: jest.fn(),
       getRecentCases: jest.fn(),
     },
+    unifiedSearch,
     data: {
       ...data,
       query: {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts
index 88213d2b03452..32641541df6d9 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts
@@ -12,7 +12,7 @@ import {
   useUiSetting,
   useUiSetting$,
   withKibana,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
 
 export type KibanaContext = KibanaReactContextValue<StartServices>;
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
index 5a2619a00417e..a4ec5a081304b 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from '../../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { StartPlugins } from '../../../types';
 
 type GlobalServices = Pick<CoreStart, 'http' | 'uiSettings' | 'notifications'> &
diff --git a/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts b/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts
index 901f3eb61d28b..006e7f840329a 100644
--- a/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts
@@ -7,7 +7,7 @@
 
 import { Action, Dispatch, MiddlewareAPI } from 'redux';
 
-import { track, METRIC_TYPE, TELEMETRY_EVENT } from './';
+import { track, METRIC_TYPE, TELEMETRY_EVENT } from '.';
 import * as timelineActions from '../../../timelines/store/timeline/actions';
 
 export const telemetryMiddleware = (api: MiddlewareAPI) => (next: Dispatch) => (action: Action) => {
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
index 440ea57ec58ad..2e533230e0a0f 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
@@ -9,9 +9,10 @@ import React from 'react';
 import { createMemoryHistory, MemoryHistory } from 'history';
 import { render as reactRender, RenderOptions, RenderResult } from '@testing-library/react';
 import { Action, Reducer, Store } from 'redux';
-import { AppDeepLink } from 'kibana/public';
+import { AppDeepLink } from '@kbn/core/public';
 import { QueryClient, QueryClientProvider, setLogger } from 'react-query';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
 import { StartPlugins, StartServices } from '../../../types';
 import { depsStartMock } from './dependencies_start_mock';
 import { MiddlewareActionSpyHelper, createSpyMiddleware } from '../../store/test_utils';
@@ -22,13 +23,12 @@ import { managementMiddlewareFactory } from '../../../management/store/middlewar
 import { createStartServicesMock } from '../../lib/kibana/kibana_react.mock';
 import { SUB_PLUGINS_REDUCER, mockGlobalState, createSecuritySolutionStorageMock } from '..';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
-import { PLUGIN_ID } from '../../../../../fleet/common';
 import { APP_UI_ID, APP_PATH } from '../../../../common/constants';
 import { KibanaContextProvider, KibanaServices } from '../../lib/kibana';
 import { getDeepLinks } from '../../../app/deep_links';
 import { fleetGetPackageListHttpMock } from '../../../management/pages/mocks';
 
-type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
+export type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
 // hide react-query output in console
 setLogger({
@@ -46,7 +46,7 @@ export interface AppContextTestRender {
   store: Store<State>;
   history: ReturnType<typeof createMemoryHistory>;
   coreStart: ReturnType<typeof coreMock.createStart>;
-  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet' | 'unifiedSearch'>;
   startServices: StartServices;
   middlewareSpy: MiddlewareActionSpyHelper;
   /**
@@ -69,7 +69,7 @@ export interface AppContextTestRender {
   setExperimentalFlag: (flags: Partial<ExperimentalFeatures>) => void;
 }
 
-// Defined a private custom reducer that reacts to an action that enables us to updat the
+// Defined a private custom reducer that reacts to an action that enables us to update the
 // store with new values for technical preview features/flags. Because the `action.type` is a `Symbol`,
 // and its not exported the action can only be `dispatch`'d from this module
 const UpdateExperimentalFeaturesTestActionType = Symbol('updateExperimentalFeaturesTestAction');
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx
index 63b11d3d07543..83dee8742bef0 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx
@@ -12,11 +12,11 @@ import { Router } from 'react-router-dom';
 import { History } from 'history';
 import useObservable from 'react-use/lib/useObservable';
 import { Store } from 'redux';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { RouteCapture } from '../../components/endpoint/route_capture';
 import { StartPlugins } from '../../../types';
-import { CoreStart } from '../../../../../../../src/core/public';
 
 /**
  * Provides the context for rendering the endpoint app
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
index 5e296d4bb30e6..bdc3afbf7a99a 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
@@ -5,14 +5,11 @@
  * 2.0.
  */
 
-import { FleetStart } from '../../../../../fleet/public';
-import {
-  dataPluginMock,
-  Start as DataPublicStartMock,
-} from '../../../../../../../src/plugins/data/public/mocks';
-import type { UnifiedSearchPublicPluginStart } from '../../../../../../../src/plugins/unified_search/public';
-import { fleetMock } from '../../../../../fleet/public/mocks';
-import { unifiedSearchPluginMock } from '../../../../../../../src/plugins/unified_search/public/mocks';
+import { FleetStart } from '@kbn/fleet-plugin/public';
+import { dataPluginMock, Start as DataPublicStartMock } from '@kbn/data-plugin/public/mocks';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { fleetMock } from '@kbn/fleet-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 
 type DataMock = Omit<DataPublicStartMock, 'indexPatterns' | 'query'> & {
   indexPatterns: Omit<DataPublicStartMock['indexPatterns'], 'getFieldsForWildcard'> & {
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts
index 9adc946bc397e..9feee6cb614bb 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import type { HttpFetchOptions, HttpFetchOptionsWithPath, HttpStart } from 'kibana/public';
+import type { HttpFetchOptions, HttpFetchOptionsWithPath, HttpStart } from '@kbn/core/public';
 import { merge } from 'lodash';
 import { act } from '@testing-library/react';
 
diff --git a/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts b/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
index 9748c36e544b3..d76140f60fca8 100644
--- a/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IStorage, Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { IStorage, Storage } from '@kbn/kibana-utils-plugin/public';
 
 export const localStorageMock = (): IStorage => {
   let store: Record<string, unknown> = {};
diff --git a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
index f183198e6f5c5..23a01bfc5f9e2 100644
--- a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
@@ -14,7 +14,7 @@ import { Provider as ReduxStoreProvider } from 'react-redux';
 import { Store } from 'redux';
 import { BehaviorSubject } from 'rxjs';
 import { ThemeProvider } from 'styled-components';
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import { createStore, State } from '../store';
diff --git a/x-pack/plugins/security_solution/public/common/mock/utils.ts b/x-pack/plugins/security_solution/public/common/mock/utils.ts
index e0c57f90b4986..f405ebd59de9d 100644
--- a/x-pack/plugins/security_solution/public/common/mock/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/utils.ts
@@ -8,7 +8,7 @@
 import { AnyAction, Reducer } from 'redux';
 import reduceReducers from 'reduce-reducers';
 
-import { tGridReducer } from '../../../../timelines/public';
+import { tGridReducer } from '@kbn/timelines-plugin/public';
 
 import { hostsReducer } from '../../hosts/store';
 import { networkReducer } from '../../network/store';
diff --git a/x-pack/plugins/security_solution/public/common/store/actions.ts b/x-pack/plugins/security_solution/public/common/store/actions.ts
index 1987edc0e7307..585fdb98a0323 100644
--- a/x-pack/plugins/security_solution/public/common/store/actions.ts
+++ b/x-pack/plugins/security_solution/public/common/store/actions.ts
@@ -7,7 +7,6 @@
 
 import { EndpointAction } from '../../management/pages/endpoint_hosts/store/action';
 import { PolicyDetailsAction } from '../../management/pages/policy/store/policy_details';
-import { TrustedAppsPageAction } from '../../management/pages/trusted_apps/store/action';
 import { EventFiltersPageAction } from '../../management/pages/event_filters/store/action';
 
 export { appActions } from './app';
@@ -20,5 +19,4 @@ export type AppAction =
   | EndpointAction
   | RoutingAction
   | PolicyDetailsAction
-  | TrustedAppsPageAction
   | EventFiltersPageAction;
diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts b/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
index 3e3643fe6dbe0..ede7e2af44025 100644
--- a/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
+++ b/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
@@ -8,11 +8,10 @@
 import actionCreatorFactory from 'typescript-fsa';
 
 import type { Filter } from '@kbn/es-query';
+import type { SavedQuery } from '@kbn/data-plugin/public';
 import { InspectQuery, Refetch, RefetchKql } from './model';
 import { InputsModelId } from './constants';
 
-import type { SavedQuery } from '../../../../../../../src/plugins/data/public';
-
 const actionCreator = actionCreatorFactory('x-pack/security_solution/local/inputs');
 
 export const setAbsoluteRangeDatePicker = actionCreator<{
diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/model.ts b/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
index f5e31d42e22ea..66ab38cf77a95 100644
--- a/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
+++ b/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
@@ -7,9 +7,9 @@
 
 import { Dispatch } from 'redux';
 import type { Filter, Query } from '@kbn/es-query';
+import type { SavedQuery } from '@kbn/data-plugin/public';
 import { InputsModelId } from './constants';
 import { CONSTANTS } from '../../components/url_state/constants';
-import type { SavedQuery } from '../../../../../../../src/plugins/data/public';
 
 export interface AbsoluteTimeRange {
   kind: 'absolute';
diff --git a/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts b/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts
index 61377662fa812..efc848d3e76f1 100644
--- a/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts
+++ b/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts
@@ -12,7 +12,7 @@ import {
   EMPTY_BROWSER_FIELDS,
   EMPTY_DOCVALUE_FIELD,
   EMPTY_INDEX_FIELDS,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
 import { SecuritySolutionDataViewBase } from '../../types';
 /** Uniquely identifies a Sourcerer Scope */
 export enum SourcererScopeName {
@@ -60,9 +60,12 @@ export interface KibanaDataView {
  */
 export interface SourcererDataView extends KibanaDataView {
   id: string;
-  /** we need this for @timestamp data */
+  /** determines how we can use the field in the app
+   * aggregatable, searchable, type, example
+   * category, description, format
+   * indices the field is included in etc*/
   browserFields: BrowserFields;
-  /** we need this for @timestamp data */
+  /** query DSL field and format */
   docValueFields: DocValueFields[];
   /** comes from dataView.fields.toSpec() */
   indexFields: SecuritySolutionDataViewBase['fields'];
diff --git a/x-pack/plugins/security_solution/public/common/store/sourcerer/readme.md b/x-pack/plugins/security_solution/public/common/store/sourcerer/readme.md
new file mode 100644
index 0000000000000..6dbc8f5ad817c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/store/sourcerer/readme.md
@@ -0,0 +1,83 @@
+# Sourcerer Redux
+
+Sourcerer model for redux
+```typescript
+interface SourcererModel {
+  /** default security-solution data view */
+  defaultDataView: SourcererDataView & { id: string; error?: unknown };
+  /** all Kibana data views, including security-solution */
+  kibanaDataViews: SourcererDataView[];
+  /** security solution signals index name */
+  signalIndexName: string | null;
+  /** sourcerer scope data by id */
+  sourcererScopes: SourcererScopeById;
+}
+```
+
+The SourcererScopeName uniquely identifies a Sourcerer Scope. There are 3 in our app:
+```typescript
+enum SourcererScopeName {
+  default = 'default',
+  detections = 'detections',
+  timeline = 'timeline',
+}
+```
+
+Data related to each sourcerer scope
+```typescript
+interface SourcererScope {
+  /** Uniquely identifies a Sourcerer Scope */
+  id: SourcererScopeName;
+  /** is an update being made to the sourcerer data view */
+  loading: boolean;
+  /** selected data view id, null if it is legacy index patterns*/
+  selectedDataViewId: string | null;
+  /** selected patterns within the data view */
+  selectedPatterns: string[];
+  /** if has length,
+   * id === SourcererScopeName.timeline
+   * selectedDataViewId === null OR defaultDataView.id
+   * saved timeline has pattern that is not in the default */
+  missingPatterns: string[];
+}
+
+type SourcererScopeById = Record<SourcererScopeName, SourcererScope>;
+```
+
+```typescript
+interface KibanaDataView {
+  /** Uniquely identifies a Kibana Data View */
+  id: string;
+  /**  list of active patterns that return data  */
+  patternList: string[];
+  /**
+   * title of Kibana Data View
+   * title also serves as "all pattern list", including inactive
+   * comma separated string
+   */
+  title: string;
+}
+```
+
+KibanaDataView + timelines/index_fields enhanced field data
+```typescript
+interface SourcererDataView extends KibanaDataView {
+  id: string;
+  /** determines how we can use the field in the app
+   * aggregatable, searchable, type, example
+   * category, description, format
+   * indices the field is included in etc*/
+  browserFields: BrowserFields;
+  /** query DSL field and format */
+  docValueFields: DocValueFields[];
+  /** comes from dataView.fields.toSpec() */
+  indexFields: SecuritySolutionDataViewBase['fields'];
+  /** set when data view fields are fetched */
+  loading: boolean;
+  /**
+   * Needed to pass to search strategy
+   * Remove once issue resolved: https://github.com/elastic/kibana/issues/111762
+   */
+  runtimeMappings: MappingRuntimeFields;
+}
+```
\ No newline at end of file
diff --git a/x-pack/plugins/security_solution/public/common/store/store.ts b/x-pack/plugins/security_solution/public/common/store/store.ts
index a289eaf5cf853..02bee6595b1e1 100644
--- a/x-pack/plugins/security_solution/public/common/store/store.ts
+++ b/x-pack/plugins/security_solution/public/common/store/store.ts
@@ -20,6 +20,8 @@ import {
 import { createEpicMiddleware } from 'redux-observable';
 import { Observable } from 'rxjs';
 
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { telemetryMiddleware } from '../lib/telemetry';
 import { appSelectors } from './app';
 import { timelineSelectors } from '../../timelines/store/timeline';
@@ -29,8 +31,6 @@ import { createRootEpic } from './epic';
 import { AppAction } from './actions';
 import { Immutable } from '../../../common/endpoint/types';
 import { State } from './types';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-import { CoreStart } from '../../../../../../src/core/public';
 import { TimelineEpicDependencies } from '../../timelines/store/timeline/types';
 
 type ComposeType = typeof compose;
diff --git a/x-pack/plugins/security_solution/public/common/store/types.ts b/x-pack/plugins/security_solution/public/common/store/types.ts
index ac9a9643914da..226ab872ca2ee 100644
--- a/x-pack/plugins/security_solution/public/common/store/types.ts
+++ b/x-pack/plugins/security_solution/public/common/store/types.ts
@@ -7,7 +7,7 @@
 
 import { Dispatch, Action, Middleware, CombinedState } from 'redux';
 
-import { CoreStart } from '../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { StartPlugins } from '../../types';
 import { AppAction } from './actions';
 import { Immutable } from '../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/common/types.ts b/x-pack/plugins/security_solution/public/common/types.ts
index 9399c5d31733f..1e0391b99c5be 100644
--- a/x-pack/plugins/security_solution/public/common/types.ts
+++ b/x-pack/plugins/security_solution/public/common/types.ts
@@ -6,9 +6,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ResponseErrorAttributes } from 'kibana/server';
+import { ResponseErrorAttributes } from '@kbn/core/server';
 import type { DataViewBase } from '@kbn/es-query';
-import { FieldSpec } from '../../../../../src/plugins/data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 
 export interface ServerApiError {
   statusCode: number;
diff --git a/x-pack/plugins/security_solution/public/common/utils/alerts.ts b/x-pack/plugins/security_solution/public/common/utils/alerts.ts
index b147bc4dd61d1..b8843f447627d 100644
--- a/x-pack/plugins/security_solution/public/common/utils/alerts.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/alerts.ts
@@ -7,7 +7,7 @@
 
 import { merge } from '@kbn/std';
 import { isPlainObject } from 'lodash';
-import { Ecs } from '../../../../cases/common';
+import { Ecs } from '@kbn/cases-plugin/common';
 
 // TODO we need to allow ->  docValueFields: [{ field: "@timestamp" }],
 export const buildAlertsQuery = (alertIds: string[]) => {
diff --git a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts
index a6eb5909c0027..d24de08051115 100644
--- a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneHttpFetchQuery } from './clone_http_fetch_query';
-import { HttpFetchQuery } from '../../../../../../src/core/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { Immutable } from '../../../common/endpoint/types';
 
 describe('cloneHttpFetchQuery', () => {
diff --git a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts
index dae3740a09fa3..0f230e3b72f95 100644
--- a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchQuery } from '../../../../../../src/core/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { Immutable } from '../../../common/endpoint/types';
 
 export function cloneHttpFetchQuery(query: Immutable<HttpFetchQuery>): HttpFetchQuery {
diff --git a/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx b/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx
index b46b3b4177239..7cf603cc7bfd3 100644
--- a/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx
@@ -17,7 +17,7 @@ jest.mock('../route/use_route_spy', () => ({
     .mockImplementationOnce(() => [{ pageName: 'get_started' }])
     .mockImplementationOnce(() => [{ pageName: 'get_started' }]),
 }));
-jest.mock('../../../common/containers/sourcerer', () => ({
+jest.mock('../../containers/sourcerer', () => ({
   useSourcererDataView: jest
     .fn()
     .mockImplementationOnce(() => [{ indicesExist: false }])
diff --git a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
index 58bad0f698d68..abc5f1fb3f414 100644
--- a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
@@ -6,7 +6,7 @@
  */
 
 import { find, getOr, some } from 'lodash/fp';
-import { TimelineEventsDetailsItem } from '../../../../timelines/common';
+import { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import { Ecs } from '../../../common/ecs';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx b/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx
index a5c4d81b1728c..46a3a86a47924 100644
--- a/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx
@@ -6,10 +6,7 @@
  */
 
 import { useState, useEffect } from 'react';
-import {
-  SavedQueryService,
-  createSavedQueryService,
-} from '../../../../../../../src/plugins/data/public';
+import { SavedQueryService, createSavedQueryService } from '@kbn/data-plugin/public';
 
 import { useKibana } from '../../lib/kibana';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
index 4fc47421a720e..94e009a067fb5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
@@ -11,7 +11,7 @@ import { waitFor, act } from '@testing-library/react';
 import { mount } from 'enzyme';
 import { TestProviders } from '../../../../common/mock';
 
-import { AlertsCountPanel } from './index';
+import { AlertsCountPanel } from '.';
 import { useQueryToggle } from '../../../../common/containers/query_toggle';
 
 jest.mock('../../../../common/containers/query_toggle');
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
index 3135e2e173793..3c82161851dd3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../../../common/mock';
 import { SecurityPageName } from '../../../../app/types';
 import { MatrixLoader } from '../../../../common/components/matrix_histogram/matrix_loader';
 
-import { AlertsHistogramPanel } from './index';
+import { AlertsHistogramPanel } from '.';
 import * as helpers from './helpers';
 import { useQueryToggle } from '../../../../common/containers/query_toggle';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
index 84476c3ee6885..297027fdb9ab6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
@@ -15,13 +15,13 @@ import { isEmpty } from 'lodash/fp';
 import uuid from 'uuid';
 
 import { Filter, buildEsQuery, Query } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useGlobalTime } from '../../../../common/containers/use_global_time';
 import { DEFAULT_NUMBER_FORMAT, APP_UI_ID } from '../../../../../common/constants';
 import type { UpdateDateRange } from '../../../../common/components/charts/common';
 import type { LegendItem } from '../../../../common/components/charts/draggable_legend_item';
 import { escapeDataProviderId } from '../../../../common/components/drag_and_drop/helpers';
 import { HeaderSection } from '../../../../common/components/header_section';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useQueryAlerts } from '../../../containers/detection_engine/alerts/use_query';
 import { getDetectionEngineUrl, useFormatUrl } from '../../../../common/components/link_to';
 import { defaultLegendColors } from '../../../../common/components/matrix_histogram/utils';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts
index 85d8be5a2e846..a666c1781dba2 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts
@@ -8,7 +8,7 @@
 import { useEffect, useState, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import type { EuiComboBoxOptionOption } from '@elastic/eui';
-import type { BrowserField } from '../../../../../../timelines/common';
+import type { BrowserField } from '@kbn/timelines-plugin/common';
 import type { GlobalTimeArgs } from '../../../../common/containers/use_global_time';
 import { getScopeFromPath, useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { getAllFieldsByName } from '../../../../common/containers/source';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index 49498a82c1a48..be4668282cad3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -18,7 +18,7 @@ import {
   mockTimelineDetails,
   mockTimelineResult,
   mockAADEcsDataWithAlert,
-} from '../../../common/mock/';
+} from '../../../common/mock';
 import { CreateTimeline, UpdateTimelineLoading } from './types';
 import { Ecs } from '../../../../common/ecs';
 import {
@@ -27,8 +27,8 @@ import {
   TimelineStatus,
   TimelineTabs,
 } from '../../../../common/types/timeline';
-import type { ISearchStart } from '../../../../../../../src/plugins/data/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import type { ISearchStart } from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { getTimelineTemplate } from '../../../timelines/containers/api';
 import { defaultHeaders } from '../../../timelines/components/timeline/body/column_headers/default_headers';
 import { KibanaServices } from '../../../common/lib/kibana';
@@ -47,7 +47,7 @@ import {
   NAMESPACE_TYPE,
   TIE_BREAKER,
   USER,
-} from '../../../../../lists/common/constants.mock';
+} from '@kbn/lists-plugin/common/constants.mock';
 import { of } from 'rxjs';
 
 jest.mock('../../../timelines/containers/api', () => ({
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx
index 7c0b7cae95d03..4a56616ca8547 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AlertsTableFilterGroup } from './index';
+import { AlertsTableFilterGroup } from '.';
 
 describe('AlertsTableFilterGroup', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx
index a3d3bf4834376..a9a0875a6f29a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 
-import { AlertsUtilityBar, AlertsUtilityBarProps } from './index';
+import { AlertsUtilityBar, AlertsUtilityBarProps } from '.';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
 jest.useFakeTimers();
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
index dba7915460ada..304f0ac180821 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 import '../../../common/mock/match_media';
 import { TimelineId } from '../../../../common/types/timeline';
 import { TestProviders } from '../../../common/mock';
-import { AlertsTableComponent } from './index';
+import { AlertsTableComponent } from '.';
 
 describe('AlertsTableComponent', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index d04984a21ae15..61199141c5ece 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -10,7 +10,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 import type { Filter } from '@kbn/es-query';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
 import { RowRendererId, TimelineIdLiteral } from '../../../../common/types/timeline';
 import { StatefulEventsViewer } from '../../../common/components/events_viewer';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
index d5fc54c5cbac7..0f613aff8d456 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
@@ -12,7 +12,7 @@ import { TestProviders } from '../../../../common/mock';
 import React from 'react';
 import { Ecs } from '../../../../../common/ecs';
 import { mockTimelines } from '../../../../common/mock/mock_timelines_plugin';
-import { mockCasesContract } from '../../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 const ecsRowData: Ecs = {
   _id: '1',
@@ -61,12 +61,9 @@ jest.mock('../../../../common/lib/kibana', () => ({
   }),
 }));
 
-jest.mock(
-  '../../../../detections/containers/detection_engine/alerts/use_alerts_privileges',
-  () => ({
-    useAlertsPrivileges: jest.fn().mockReturnValue({ hasIndexWrite: true, hasKibanaCRUD: true }),
-  })
-);
+jest.mock('../../../containers/detection_engine/alerts/use_alerts_privileges', () => ({
+  useAlertsPrivileges: jest.fn().mockReturnValue({ hasIndexWrite: true, hasKibanaCRUD: true }),
+}));
 
 const actionMenuButton = '[data-test-subj="timeline-context-menu-button"] button';
 const addToExistingCaseButton = '[data-test-subj="add-to-existing-case-action"]';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
index 3d1fe638eab5a..a6af9febe8b3e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
@@ -12,11 +12,11 @@ import { indexOf } from 'lodash';
 import { connect, ConnectedProps } from 'react-redux';
 import { ExceptionListType } from '@kbn/securitysolution-io-ts-list-types';
 import { get } from 'lodash/fp';
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { useRouteSpy } from '../../../../common/utils/route/use_route_spy';
 import { buildGetAlertByIdQuery } from '../../../../common/components/exceptions/helpers';
 import { useUserPrivileges } from '../../../../common/components/user_privileges';
 import { EventsTdContent } from '../../../../timelines/components/timeline/styles';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../timelines/public';
 import { Ecs } from '../../../../../common/ecs';
 import {
   AddExceptionFlyout,
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx
index 9564347e88ccd..151c390fda5ee 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx
@@ -10,7 +10,7 @@ import { TestProviders } from '../../../../common/mock';
 import { KibanaServices, useKibana } from '../../../../common/lib/kibana';
 import { Ecs } from '../../../../../common/ecs';
 import * as actions from '../actions';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { SendAlertToTimelineActionProps } from '../types';
 import { InvestigateInTimelineAction } from './investigate_in_timeline_action';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx
index 34807e368cbe4..b6c8f5aea2ce5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx
@@ -7,8 +7,8 @@
 
 import React, { useCallback, useMemo } from 'react';
 import { EuiContextMenuItem } from '@elastic/eui';
-import { CommentType } from '../../../../../../cases/common';
-import { CaseAttachments } from '../../../../../../cases/public';
+import { CommentType } from '@kbn/cases-plugin/common';
+import { CaseAttachments } from '@kbn/cases-plugin/public';
 import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import type { TimelineNonEcsData } from '../../../../../common/search_strategy';
 import { TimelineId } from '../../../../../common/types';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
index b87cea7008442..828c72aad3986 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
@@ -8,7 +8,7 @@
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { useStatusBulkActionItems } from '../../../../../../timelines/public';
+import { useStatusBulkActionItems } from '@kbn/timelines-plugin/public';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { timelineActions } from '../../../../timelines/store/timeline';
 import { useAlertsPrivileges } from '../../../containers/detection_engine/alerts/use_alerts_privileges';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx
index 7dea1581e9f0f..dad495cdc507d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx
@@ -11,7 +11,7 @@ import { KibanaServices, useKibana } from '../../../../common/lib/kibana';
 import { Ecs } from '../../../../../common/ecs';
 import { useInvestigateInTimeline } from './use_investigate_in_timeline';
 import * as actions from '../actions';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { SendAlertToTimelineActionProps } from '../types';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
index 6773a4fddaeaf..e564bc221e275 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
@@ -7,7 +7,7 @@
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import type { ISearchStart } from '../../../../../../../src/plugins/data/public';
+import type { ISearchStart } from '@kbn/data-plugin/public';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
 import { Ecs } from '../../../../common/ecs';
 import { NoteResult } from '../../../../common/types/timeline/note';
diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx
index 23f6eea435d72..889f19acae630 100644
--- a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../../common/mock';
 import { useInstalledSecurityJobs } from '../../../../common/components/ml/hooks/use_installed_security_jobs';
-import { MlJobCompatibilityCallout } from './index';
+import { MlJobCompatibilityCallout } from '.';
 
 jest.mock('../../../../common/components/ml/hooks/use_installed_security_jobs');
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx
index 66b2bae98c1ae..1ca40a32195f8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { mount } from 'enzyme';
 import React from 'react';
-import { NeedAdminForUpdateRulesCallOut } from './index';
+import { NeedAdminForUpdateRulesCallOut } from '.';
 import { TestProviders } from '../../../../common/mock';
 import * as userInfo from '../../user_info';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx
index 8157cf9057690..ee7b8723ae1bc 100644
--- a/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { NoApiIntegrationKeyCallOut } from './index';
+import { NoApiIntegrationKeyCallOut } from '.';
 
 describe('no_api_integration_callout', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx
index acbae367fe75e..929b7c4109787 100644
--- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo } from 'react';
 import { find } from 'lodash/fp';
-import { Maybe } from '../../../../../observability/common/typings';
+import { Maybe } from '@kbn/observability-plugin/common/typings';
 import { useCasesFromAlerts } from '../../containers/detection_engine/alerts/use_cases_from_alerts';
 import { TimelineEventsDetailsItem } from '../../../../common/search_strategy';
 import { IsolateHost } from './isolate';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx
index fc0757baecbeb..6ed37e16ec747 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AccordionTitle } from './index';
+import { AccordionTitle } from '.';
 
 describe('AccordionTitle', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx
index a125d3e4f0f8c..575baa1647d5e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AddItem } from './index';
+import { AddItem } from '.';
 import { useFormFieldMock } from '../../../../common/mock/test_providers';
 
 describe('AddItem', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx
index b219d0d026380..ec0b95aab778a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AnomalyThresholdSlider } from './index';
+import { AnomalyThresholdSlider } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('AnomalyThresholdSlider', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx
index 3c733870e8498..41db125b70a16 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx
@@ -9,7 +9,7 @@ import React, { useCallback, useMemo } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { FieldComponent } from '@kbn/securitysolution-autocomplete';
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
-import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+import { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 interface AutocompleteFieldProps {
   dataTestSubj: string;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx
index 8618575a7a4c9..066a29b4c05b7 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { startCase } from 'lodash/fp';
-import { RuleAction } from '../../../../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 const ActionsDescription = ({ actions }: { actions: RuleAction[] }) => {
   if (!actions.length) return null;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
index 2e34935d0f281..2cefb21e81294 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { FilterManager, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
-import { FilterLabel } from '../../../../../../../../src/plugins/unified_search/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { FilterManager, UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FilterLabel } from '@kbn/unified-search-plugin/public';
 import { DataViewBase, FilterStateStore } from '@kbn/es-query';
 import { SeverityBadge } from '../severity_badge';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
index 42104c5052548..df407e4e88ecf 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
@@ -24,13 +24,13 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { ThreatMapping, Type } from '@kbn/securitysolution-io-ts-alerting-types';
+import { getDisplayValueFromFilter } from '@kbn/data-plugin/public';
+import { FilterLabel } from '@kbn/unified-search-plugin/public';
 import { MATCHES, AND, OR } from '../../../../common/components/threat_match/translations';
 import { assertUnreachable } from '../../../../../common/utility_types';
 import * as i18nSeverity from '../severity_mapping/translations';
 import * as i18nRiskScore from '../risk_score_mapping/translations';
 import { Threshold } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { getDisplayValueFromFilter } from '../../../../../../../../src/plugins/data/public';
-import { FilterLabel } from '../../../../../../../../src/plugins/unified_search/public';
 import {
   subtechniquesOptions,
   tacticsOptions,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx
index 70fc4cf61503b..109b59b89ea16 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx
@@ -15,13 +15,13 @@ import {
   getDescriptionItem,
 } from '.';
 
-import { FilterManager, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager, UI_SETTINGS } from '@kbn/data-plugin/public';
 import { Filter, FilterStateStore } from '@kbn/es-query';
 import {
   mockAboutStepRule,
   mockDefineStepRule,
 } from '../../../pages/detection_engine/rules/all/__mocks__/mock';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
index 62ea034dd0b33..c72b96242df07 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
@@ -12,7 +12,7 @@ import styled from 'styled-components';
 
 import { ThreatMapping, Threats, Type } from '@kbn/securitysolution-io-ts-alerting-types';
 import { DataViewBase, Filter, FilterStateStore } from '@kbn/es-query';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations';
 import { useKibana } from '../../../../common/lib/kibana';
 import { AboutStepRiskScore, AboutStepSeverity } from '../../../pages/detection_engine/rules/types';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx
index 4b61504ec997a..9aff7d8effd30 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { EuiBadge, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
 
-import { ML_PAGES, MlSummaryJob, useMlHref } from '../../../../../../ml/public';
+import { ML_PAGES, MlSummaryJob, useMlHref } from '@kbn/ml-plugin/public';
 import { isJobStarted } from '../../../../../common/machine_learning/helpers';
 import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/use_security_jobs';
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts
index ab7c0ea9ed47d..7820cc5a09c87 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts
@@ -8,7 +8,7 @@
 import { ReactNode } from 'react';
 import { Threats } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { DataViewBase, Filter } from '@kbn/es-query';
-import type { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
 export interface ListItems {
   title: NonNullable<ReactNode>;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx
index 588c058aade2e..4728507abab4c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AddMitreAttackThreat } from './index';
+import { AddMitreAttackThreat } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('AddMitreThreat', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx
index 0de48057cc8dc..5323ac16bff4f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { MlJobSelect } from './index';
+import { MlJobSelect } from '.';
 import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/use_security_jobs';
 import { useFormFieldMock } from '../../../../common/mock';
 jest.mock('../../../../common/components/ml_popover/hooks/use_security_jobs');
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx
index 9fa75161e027e..462855bbf9618 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { NextStep } from './index';
+import { NextStep } from '.';
 
 describe('NextStep', () => {
   test('renders correctly against snapshot', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx
index bb34eddfb6b32..48f1e7b603d1b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 
-import { OptionalFieldLabel } from './index';
+import { OptionalFieldLabel } from '.';
 
 describe('OptionalFieldLabel', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx
index 5f1ecf04c0ee9..a7e07e4178c5f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { PickTimeline } from './index';
+import { PickTimeline } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('PickTimeline', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx
index 460f984202327..793e138cebfa4 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { QueryBarDefineRule } from './index';
+import { QueryBarDefineRule } from '.';
 import {
   TestProviders,
   useFormFieldMock,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx
index a2d2a2ab10f81..2ce403a832906 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx
@@ -11,7 +11,7 @@ import { Subscription } from 'rxjs';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import { FilterManager, SavedQuery } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager, SavedQuery } from '@kbn/data-plugin/public';
 
 import { BrowserFields } from '../../../../common/containers/source';
 import { OpenTimelineModal } from '../../../../timelines/components/open_timeline/open_timeline_modal';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
index fcc95f2398cf7..bad1c644ccdbe 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
@@ -22,8 +22,8 @@ import { noop } from 'lodash/fp';
 import { RiskScoreMapping } from '@kbn/securitysolution-io-ts-alerting-types';
 import { FieldComponent } from '@kbn/securitysolution-autocomplete';
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import * as i18n from './translations';
-import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 import { AboutStepRiskScore } from '../../../pages/detection_engine/rules/types';
 
 const NestedContent = styled.div`
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
index 93c429bb84797..a438af12f8d71 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { getSupportedActions, RuleActionsField } from './index';
+import { getSupportedActions, RuleActionsField } from '.';
 import { useForm, Form } from '../../../../shared_imports';
 import { useKibana } from '../../../../common/lib/kibana';
 import { useFormFieldMock } from '../../../../common/mock';
-import { ActionType } from '../../../../../../actions/common';
+import { ActionType } from '@kbn/actions-plugin/common';
 jest.mock('../../../../common/lib/kibana');
 
 describe('RuleActionsField', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
index 5fb7266e228a5..01e978ca2e61c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
@@ -12,15 +12,15 @@ import deepMerge from 'deepmerge';
 import ReactMarkdown from 'react-markdown';
 import styled from 'styled-components';
 
-import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../common/constants';
-import { FieldHook, useFormContext } from '../../../../shared_imports';
 import {
   ActionForm,
   ActionType,
   loadActionTypes,
   ActionVariables,
-} from '../../../../../../triggers_actions_ui/public';
-import { RuleAction } from '../../../../../../alerting/common';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleAction } from '@kbn/alerting-plugin/common';
+import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../common/constants';
+import { FieldHook, useFormContext } from '../../../../shared_imports';
 import { convertArrayToCamelCase, useKibana } from '../../../../common/lib/kibana';
 import { FORM_ERRORS_TITLE } from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx
index 71fabef22c904..6085fab4419ab 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx
@@ -12,7 +12,7 @@ import {
   goToRuleEditPage,
   executeRulesBulkAction,
 } from '../../../pages/detection_engine/rules/all/actions';
-import { RuleActionsOverflow } from './index';
+import { RuleActionsOverflow } from '.';
 import { mockRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock';
 
 jest.mock('../../../../common/hooks/use_app_toasts');
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx
index 0bf229000088a..e6aaa976ef3d5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 
 import { TestProviders } from '../../../../common/mock';
-import { RulePreview, RulePreviewProps } from './';
+import { RulePreview, RulePreviewProps } from '.';
 import { usePreviewRoute } from './use_preview_route';
 import { usePreviewHistogram } from './use_preview_histogram';
 
@@ -85,44 +85,44 @@ describe('PreviewQuery', () => {
     jest.clearAllMocks();
   });
 
-  test('it renders timeframe select and preview button on render', () => {
+  test('it renders timeframe select and preview button on render', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} />
       </TestProviders>
     );
 
-    expect(wrapper.findByTestId('rule-preview')).toBeTruthy();
-    expect(wrapper.findByTestId('preview-time-frame')).toBeTruthy();
+    expect(await wrapper.findByTestId('rule-preview')).toBeTruthy();
+    expect(await wrapper.findByTestId('preview-time-frame')).toBeTruthy();
   });
 
-  test('it renders preview button disabled if "isDisabled" is true', () => {
+  test('it renders preview button disabled if "isDisabled" is true', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} isDisabled={true} />
       </TestProviders>
     );
 
-    expect(wrapper.getByTestId('queryPreviewButton').closest('button')).toBeDisabled();
+    expect(await wrapper.getByTestId('queryPreviewButton').closest('button')).toBeDisabled();
   });
 
-  test('it renders preview button enabled if "isDisabled" is false', () => {
+  test('it renders preview button enabled if "isDisabled" is false', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} />
       </TestProviders>
     );
 
-    expect(wrapper.getByTestId('queryPreviewButton').closest('button')).not.toBeDisabled();
+    expect(await wrapper.getByTestId('queryPreviewButton').closest('button')).not.toBeDisabled();
   });
 
-  test('does not render histogram when there is no previewId', () => {
+  test('does not render histogram when there is no previewId', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} />
       </TestProviders>
     );
 
-    expect(wrapper.queryByTestId('[data-test-subj="preview-histogram-panel"]')).toBeNull();
+    expect(await wrapper.queryByTestId('[data-test-subj="preview-histogram-panel"]')).toBeNull();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx
index 1286f6d5758c7..237f4806a58e6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx
@@ -17,7 +17,7 @@ import {
   EuiButton,
   EuiSpacer,
 } from '@elastic/eui';
-import { useSecurityJobs } from '../../../../../public/common/components/ml_popover/hooks/use_security_jobs';
+import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/use_security_jobs';
 import { FieldValueQueryBar } from '../query_bar';
 import * as i18n from './translations';
 import { usePreviewRoute } from './use_preview_route';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx
index 1f16ddf3f845e..59c0af79391bd 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx
@@ -8,7 +8,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 
-import * as i18n from '../rule_preview/translations';
 import { useGlobalTime } from '../../../../common/containers/use_global_time';
 import { TestProviders } from '../../../../common/mock';
 import { usePreviewHistogram } from './use_preview_histogram';
@@ -19,7 +18,7 @@ import { ALL_VALUES_ZEROS_TITLE } from '../../../../common/components/charts/tra
 jest.mock('../../../../common/lib/kibana');
 jest.mock('../../../../common/containers/use_global_time');
 jest.mock('./use_preview_histogram');
-jest.mock('../../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../../common/components/url_state/normalize_time_range');
 
 describe('PreviewHistogram', () => {
   const mockSetQuery = jest.fn();
@@ -49,7 +48,7 @@ describe('PreviewHistogram', () => {
       },
     ]);
 
-    test('it renders an empty histogram and table', () => {
+    test('it renders an empty histogram and table', async () => {
       const wrapper = render(
         <TestProviders>
           <PreviewHistogram
@@ -63,37 +62,38 @@ describe('PreviewHistogram', () => {
         </TestProviders>
       );
 
-      expect(wrapper.findByText('hello grid')).toBeTruthy();
-      expect(wrapper.findByText(ALL_VALUES_ZEROS_TITLE)).toBeTruthy();
+      expect(await wrapper.findByText('hello grid')).toBeTruthy();
+      expect(await wrapper.findByText(ALL_VALUES_ZEROS_TITLE)).toBeTruthy();
     });
   });
 
-  test('it renders loader when isLoading is true', () => {
-    (usePreviewHistogram as jest.Mock).mockReturnValue([
-      true,
-      {
-        inspect: { dsl: [], response: [] },
-        totalCount: 1,
-        refetch: jest.fn(),
-        data: [],
-        buckets: [],
-      },
-    ]);
+  describe('when there is data', () => {
+    test('it renders loader when isLoading is true', async () => {
+      (usePreviewHistogram as jest.Mock).mockReturnValue([
+        true,
+        {
+          inspect: { dsl: [], response: [] },
+          totalCount: 1,
+          refetch: jest.fn(),
+          data: [],
+          buckets: [],
+        },
+      ]);
 
-    const wrapper = render(
-      <TestProviders>
-        <PreviewHistogram
-          addNoiseWarning={jest.fn()}
-          timeFrame="M"
-          previewId={'test-preview-id'}
-          spaceId={'default'}
-          ruleType={'query'}
-          index={['']}
-        />
-      </TestProviders>
-    );
+      const wrapper = render(
+        <TestProviders>
+          <PreviewHistogram
+            addNoiseWarning={jest.fn()}
+            timeFrame="M"
+            previewId={'test-preview-id'}
+            spaceId={'default'}
+            ruleType={'query'}
+            index={['']}
+          />
+        </TestProviders>
+      );
 
-    expect(wrapper.findByTestId('preview-histogram-loading')).toBeTruthy();
-    expect(wrapper.findByText(i18n.QUERY_PREVIEW_SUBTITLE_LOADING)).toBeTruthy();
+      expect(await wrapper.findByTestId('preview-histogram-loading')).toBeTruthy();
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx
index 37b03dbc3fd88..d4c57910a9269 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx
@@ -15,7 +15,7 @@ import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../com
 import { PreviewTableCellRenderer } from './preview_table_cell_renderer';
 import { getColumnRenderer } from '../../../../timelines/components/timeline/body/renderers/get_column_renderer';
 import { DroppableWrapper } from '../../../../common/components/drag_and_drop/droppable_wrapper';
-import { BrowserFields } from '../../../../../../timelines/common/search_strategy';
+import { BrowserFields } from '@kbn/timelines-plugin/common/search_strategy';
 import { Ecs } from '../../../../../common/ecs';
 import { columnRenderers } from '../../../../timelines/components/timeline/body/renderers';
 
@@ -114,7 +114,6 @@ describe('PreviewTableCellRenderer', () => {
 
     expect(mockImplementation.renderColumn).toBeCalledWith({
       asPlainText: false,
-      browserFields,
       columnName: header.id,
       ecsData,
       eventId,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx
index 0e9df27827e47..8d9edd2ebc92b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx
@@ -7,18 +7,17 @@
 
 import React, { useMemo } from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
+import { CellValueElementProps } from '@kbn/timelines-plugin/common';
 import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { StyledContent } from '../../../../common/lib/cell_actions/expanded_cell_value_actions';
 import { getLinkColumnDefinition } from '../../../../common/lib/cell_actions/helpers';
 import { useGetMappedNonEcsValue } from '../../../../timelines/components/timeline/body/data_driven_columns';
 import { columnRenderers } from '../../../../timelines/components/timeline/body/renderers';
 import { getColumnRenderer } from '../../../../timelines/components/timeline/body/renderers/get_column_renderer';
-import { CellValueElementProps } from '../../../../../../timelines/common';
 
 export const PreviewRenderCellValue: React.FC<
   EuiDataGridCellValueElementProps & CellValueElementProps
 > = ({
-  browserFields,
   columnId,
   data,
   ecsData,
@@ -38,7 +37,6 @@ export const PreviewRenderCellValue: React.FC<
   truncate,
 }) => (
   <PreviewTableCellRenderer
-    browserFields={browserFields}
     columnId={columnId}
     data={data}
     ecsData={ecsData}
@@ -60,7 +58,6 @@ export const PreviewRenderCellValue: React.FC<
 );
 
 export const PreviewTableCellRenderer: React.FC<CellValueElementProps> = ({
-  browserFields,
   data,
   ecsData,
   eventId,
@@ -95,7 +92,6 @@ export const PreviewTableCellRenderer: React.FC<CellValueElementProps> = ({
       <StyledContent className={styledContentClassName} $isDetails={isDetails}>
         {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
           asPlainText,
-          browserFields,
           columnName: header.id,
           ecsData,
           eventId,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx
index c8f59149ea1a2..a110ceb8edaf6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx
@@ -8,11 +8,8 @@
 import { EuiToolTip, EuiButtonIcon } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
-import { ControlColumnProps, ActionProps } from '../../../../../../timelines/common';
-import {
-  getActionsColumnWidth,
-  DEFAULT_ACTION_BUTTON_WIDTH,
-} from '../../../../../../timelines/public';
+import { ControlColumnProps, ActionProps } from '@kbn/timelines-plugin/common';
+import { getActionsColumnWidth, DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import * as i18n from './translations';
 
 const EventsTdContent = styled.div.attrs(({ className }) => ({
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts
index 81ff4b8cfc440..3be499b5a60d0 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts
@@ -146,13 +146,6 @@ export const ML_PREVIEW_HISTOGRAM_DISCLAIMER = i18n.translate(
   }
 );
 
-export const QUERY_PREVIEW_SUBTITLE_LOADING = i18n.translate(
-  'xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading',
-  {
-    defaultMessage: '...loading',
-  }
-);
-
 export const QUERY_PREVIEW_EQL_SEQUENCE_TITLE = i18n.translate(
   'xpack.securitySolution.detectionEngine.queryPreview.queryPreviewEqlSequenceTitle',
   {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx
index d336c75bb5f49..d65fd91e6b891 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx
@@ -6,10 +6,10 @@
  */
 import { useMemo } from 'react';
 import { Type } from '@kbn/securitysolution-io-ts-alerting-types';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useMatrixHistogramCombined } from '../../../../common/containers/matrix_histogram';
 import { MatrixHistogramType } from '../../../../../common/search_strategy';
 import { convertToBuildEsQuery } from '../../../../common/lib/keury';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useKibana } from '../../../../common/lib/kibana';
 import { QUERY_PREVIEW_ERROR } from './translations';
 import { DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx
index ec643962d41a6..68e7d9a973b85 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { waitFor } from '@testing-library/react';
 
 import { performBulkAction } from '../../../containers/detection_engine/rules';
-import { RuleSwitchComponent } from './index';
+import { RuleSwitchComponent } from '.';
 import { getRulesSchemaMock } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
 import { useRulesTableContextOptional } from '../../../pages/detection_engine/rules/all/rules_table/rules_table_context';
 import { useRulesTableContextMock } from '../../../pages/detection_engine/rules/all/rules_table/__mocks__/rules_table_context';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx
index 11393c0fdda2a..057ecbdae5fc8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { ScheduleItem } from './index';
+import { ScheduleItem } from '.';
 import { TestProviders, useFormFieldMock } from '../../../../common/mock';
 
 describe('ScheduleItem', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx
index 7270145bdbbb3..c751780a1c333 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { SelectRuleType } from './index';
+import { SelectRuleType } from '.';
 import { TestProviders, useFormFieldMock } from '../../../../common/mock';
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx
index cff7b50a5ea28..fd636814d921d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { SeverityBadge } from './index';
+import { SeverityBadge } from '.';
 
 describe('SeverityBadge', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
index da7b1e0067691..bcb368ba288ac 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
@@ -30,8 +30,8 @@ import {
 } from '@kbn/securitysolution-autocomplete';
 
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import * as i18n from './translations';
-import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 import { SeverityOptionItem } from '../step_about_rule/data';
 import { AboutStepSeverity } from '../../../pages/detection_engine/rules/types';
 import { useKibana } from '../../../../common/lib/kibana';
@@ -256,7 +256,7 @@ export const SeverityField = ({
 
                       <EuiFlexItemComboBoxColumn>
                         <AutocompleteFieldMatchComponent
-                          autocompleteService={services.data.autocomplete}
+                          autocompleteService={services.unifiedSearch.autocomplete}
                           placeholder={''}
                           selectedField={getFieldTypeByMapping(severityMappingItem, indices)}
                           selectedValue={severityMappingItem.value}
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx
index 7afcad39d5a70..810bab87e5f97 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { TestProviders } from '../../../../common/mock';
-import { RuleStatusIcon } from './index';
+import { RuleStatusIcon } from '.';
 jest.mock('../../../../common/lib/kibana');
 
 describe('RuleStatusIcon', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
index 3c34897fe2e65..02600b80c3b66 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
@@ -10,7 +10,7 @@ import { mount, shallow } from 'enzyme';
 import { ThemeProvider } from 'styled-components';
 import { act } from '@testing-library/react';
 
-import { stubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { StepAboutRule } from '.';
 import { useFetchIndex } from '../../../../common/containers/source';
 import { mockAboutStepRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx
index 0c6dbe73933af..a631fbc70d016 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepContentWrapper } from './index';
+import { StepContentWrapper } from '.';
 
 describe('StepContentWrapper', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx
index 10d07d87b09fd..6c19a49c7f491 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx
@@ -8,11 +8,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepDefineRule } from './index';
+import { StepDefineRule, aggregatableFields } from '.';
 import mockBrowserFields from './mock_browser_fields.json';
 
-import { aggregatableFields } from '.';
-
 jest.mock('../../../../common/lib/kibana');
 
 test('aggregatableFields', function () {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx
index 6b3e9500040c4..f10459999e82f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepPanel } from './index';
+import { StepPanel } from '.';
 
 describe('StepPanel', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx
index 24bd485d83d15..2589ff1a30c62 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepRuleActions } from './index';
+import { StepRuleActions } from '.';
 
 jest.mock('../../../../common/lib/kibana', () => ({
   useKibana: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
index 94a883e6bae19..2fa0919a072ef 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
@@ -17,7 +17,7 @@ import {
 import { findIndex } from 'lodash/fp';
 import React, { FC, memo, useCallback, useEffect, useMemo } from 'react';
 
-import { ActionVariables } from '../../../../../../triggers_actions_ui/public';
+import { ActionVariables } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RuleStep,
   RuleStepProps,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
index d40d7c776c0d5..016100c762eb7 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
@@ -7,7 +7,7 @@
 
 import { validateSingleAction, validateRuleActionsField } from './schema';
 import { getActionTypeName, validateMustache, validateActionParams } from './utils';
-import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 import { FormHook } from '../../../../shared_imports';
 jest.mock('./utils');
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
index 936dd283793cb..ceaa3365e2785 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
@@ -9,10 +9,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  RuleAction,
-  ActionTypeRegistryContract,
-} from '../../../../../../triggers_actions_ui/public';
+import { RuleAction, ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   FormSchema,
   ValidationFunc,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx
index 6fd90adfc0e06..57dd5670dba80 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useEffect, useRef, useState } from 'react';
-import { getAllConnectorsUrl, getCreateConnectorUrl } from '../../../../../../cases/common';
+import { getAllConnectorsUrl, getCreateConnectorUrl } from '@kbn/cases-plugin/common';
 import { convertArrayToCamelCase, KibanaServices } from '../../../../common/lib/kibana';
 
 interface CaseAction {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
index 575791afd110b..a793306c70323 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 import { getActionTypeName, validateMustache, validateActionParams } from './utils';
 
 describe('stepRuleActions utils', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
index 4826a10e978bd..b16ea4e3a667b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
@@ -8,10 +8,7 @@
 import mustache from 'mustache';
 import { uniq, startCase, flattenDeep, isArray, isString } from 'lodash/fp';
 
-import {
-  RuleAction,
-  ActionTypeRegistryContract,
-} from '../../../../../../triggers_actions_ui/public';
+import { RuleAction, ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
 import * as I18n from './translations';
 
 export const getActionTypeName = (actionTypeId: RuleAction['actionTypeId']) => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx
index 687b1a52560a4..83141e7d886a8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 
 import { TestProviders } from '../../../../common/mock';
-import { StepScheduleRule } from './index';
+import { StepScheduleRule } from '.';
 
 describe('StepScheduleRule', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx
index 61e893bdb3d00..c27031617a3ea 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { ThrottleSelectField } from './index';
+import { ThrottleSelectField } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('ThrottleSelectField', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
index bbc10fcb2dfd4..eaa492b2effd3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
@@ -17,7 +17,7 @@ import { TestProviders } from '../../../common/mock';
 import { mockTimelines } from '../../../common/mock/mock_timelines_plugin';
 import { createStartServicesMock } from '../../../common/lib/kibana/kibana_react.mock';
 import { useKibana } from '../../../common/lib/kibana';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { initialUserPrivilegesState as mockInitialUserPrivilegesState } from '../../../common/components/user_privileges/user_privileges_context';
 import { useUserPrivileges } from '../../../common/components/user_privileges';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx
index 32911a2c8e4ab..bb49f47596fc8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useUserInfo, ManageUserInfo } from './index';
-import { Capabilities } from 'src/core/public';
+import { useUserInfo, ManageUserInfo } from '.';
+import { Capabilities } from '@kbn/core/public';
 
 import { useKibana } from '../../../common/lib/kibana';
 import * as api from '../../containers/detection_engine/alerts/api';
diff --git a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
index 58331add50dce..164d333650443 100644
--- a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { getListResponseMock } from '../../../../../lists/common/schemas/response/list_schema.mock';
+import { getListResponseMock } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
 import { useDeleteList, useFindLists } from '@kbn/securitysolution-list-hooks';
 import { exportList } from '@kbn/securitysolution-list-api';
 import type { ListSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
index 06fb89da85c0a..fb39e60bbad16 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
@@ -21,7 +21,7 @@ import { ColumnHeaderOptions } from '../../../../../common/types';
 
 import { RenderCellValue } from '.';
 
-jest.mock('../../../../common/lib/kibana/');
+jest.mock('../../../../common/lib/kibana');
 
 describe('RenderCellValue', () => {
   const columnId = '@timestamp';
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
index 2070a620183d6..728f9eaaee0d0 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
@@ -19,7 +19,7 @@ import { DefaultCellRenderer } from '../../../../timelines/components/timeline/c
 import { RenderCellValue } from '.';
 import { ColumnHeaderOptions } from '../../../../../common/types';
 
-jest.mock('../../../../common/lib/kibana/');
+jest.mock('../../../../common/lib/kibana');
 
 describe('RenderCellValue', () => {
   const columnId = '@timestamp';
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts
index fa850ce6b36ea..adbb0048818fe 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts
@@ -22,7 +22,7 @@ import {
   createSignalIndex,
   createHostIsolation,
 } from './api';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const abortCtrl = new AbortController();
 const mockKibanaServices = KibanaServices.get as jest.Mock;
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts
index 9816eea9e1675..fd7d364239226 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { getCasesFromAlertsUrl } from '../../../../../../cases/common';
+import { getCasesFromAlertsUrl } from '@kbn/cases-plugin/common';
 import { HostIsolationResponse, HostInfo } from '../../../../../common/endpoint/types';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
index 7223e11eed76d..cb78a7a116ae4 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
@@ -7,7 +7,7 @@
 
 import { camelCase } from 'lodash';
 import dateMath from '@kbn/datemath';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 import {
   DETECTION_ENGINE_RULES_URL,
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
index 0138dcee514c2..65bb1b5e06820 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import * as api from './api';
 import { getRulesSchemaMock } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
index cf2500cd4036e..1c9dd79d36031 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
@@ -8,7 +8,7 @@
 import { useEffect, useState, useRef } from 'react';
 
 import type { List } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpStart } from '../../../../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { patchRule } from './api';
 
 type Func = (lists: List[]) => void;
diff --git a/x-pack/plugins/security_solution/public/detections/index.ts b/x-pack/plugins/security_solution/public/detections/index.ts
index ca35efe4d9294..9b7345fe1ac15 100644
--- a/x-pack/plugins/security_solution/public/detections/index.ts
+++ b/x-pack/plugins/security_solution/public/detections/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { getTimelinesInStorageByIds } from '../timelines/containers/local_storage';
 import { TimelineIdLiteral, TimelineId } from '../../common/types/timeline';
 import { routes } from './routes';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx
index 3cf344c691ccd..9945d5225ea02 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { ALERTS_PATH, SecurityPageName } from '../../../../common/constants';
 import { NotFoundPage } from '../../../app/404';
 import * as i18n from './translations';
-import { TrackApplicationView } from '../../../../../../../src/plugins/usage_collection/public';
-import { DetectionEnginePage } from '../../pages/detection_engine/detection_engine';
+import { DetectionEnginePage } from '../detection_engine/detection_engine';
 import { SpyRoute } from '../../../common/utils/route/spy_routes';
 import { useReadonlyHeader } from '../../../use_readonly_header';
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
index 1f3cacbefcc3b..a783ac7e1e260 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
@@ -24,7 +24,7 @@ import { createStore, State } from '../../../common/store';
 import { mockHistory, Router } from '../../../common/mock/router';
 import { mockTimelines } from '../../../common/mock/mock_timelines_plugin';
 import { mockBrowserFields } from '../../../common/containers/source/mock';
-import { mockCasesContext } from '../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
 // 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
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
index 3fc05c0ef428f..2b1607550a8ff 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
@@ -23,8 +23,8 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 
+import { isTab } from '@kbn/timelines-plugin/public';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
-import { isTab } from '../../../../../timelines/public';
 import { useDeepEqualSelector, useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { SecurityPageName } from '../../../app/types';
 import { TimelineId } from '../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts
index 488fd3625bf59..2f03b1ebc6b90 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { NavigateToAppOptions } from '../../../../../../../../../src/core/public';
+import type { NavigateToAppOptions } from '@kbn/core/public';
 import { APP_UI_ID } from '../../../../../../common/constants';
 import {
   BulkAction,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx
index d35a89484f264..3908c890b1f89 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx
@@ -13,14 +13,14 @@ export const bulkApplyTimelineTemplate = {
   FORM_TITLE: i18n.translate(
     'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.formTitle',
     {
-      defaultMessage: 'Apply timeline template',
+      defaultMessage: 'Apply Timeline template',
     }
   ),
 
   TEMPLATE_SELECTOR_LABEL: i18n.translate(
     'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorLabel',
     {
-      defaultMessage: 'Apply timeline template to selected rules',
+      defaultMessage: 'Apply Timeline template to selected rules',
     }
   ),
 
@@ -28,7 +28,7 @@ export const bulkApplyTimelineTemplate = {
     'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorHelpText',
     {
       defaultMessage:
-        'Select which timeline to apply to selected rules when investigating generated alerts.',
+        'Select which Timeline to apply to selected rules when investigating generated alerts.',
     }
   ),
 
@@ -42,8 +42,8 @@ export const bulkApplyTimelineTemplate = {
   warningCalloutMessage: (rulesCount: number): JSX.Element => (
     <FormattedMessage
       id="xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.warningCalloutMessage"
-      defaultMessage="You are about to apply changes to {rulesCount, plural, one {# selected rule} other {# selected rules}}.
-      If you already applied any templates to these rules, they will be overwritten or (if you select 'None') reset to none."
+      defaultMessage="You're about to apply changes to {rulesCount, plural, one {# selected rule} other {# selected rules}}.
+      If you previously applied Timeline templates to these rules, they will be overwritten or (if you select 'None') reset to none."
       values={{ rulesCount }}
     />
   ),
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx
index 9aa175002af7b..44f040bb1ab1e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx
@@ -18,8 +18,8 @@ import {
 import { euiThemeVars } from '@kbn/ui-theme';
 import { useIsMounted } from '@kbn/securitysolution-hook-utils';
 
-import type { Toast } from '../../../../../../../../../../src/core/public';
-import { mountReactNode } from '../../../../../../../../../../src/core/public/utils';
+import type { Toast } from '@kbn/core/public';
+import { mountReactNode } from '@kbn/core/public/utils';
 import {
   BulkAction,
   BulkActionEditType,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
index 15b0392c7f3bd..4a81e239527e0 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
@@ -10,7 +10,7 @@ import { mount } from 'enzyme';
 
 import { TestProviders } from '../../../../../../common/mock';
 import { mockHistory } from '../../../../../../common/utils/route/index.test';
-import { getExceptionListSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { useUserData } from '../../../../../components/user_info';
 
 import { ExceptionListsTable } from './exceptions_table';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
index 3b24dda539174..c5146f245cc8e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
@@ -12,12 +12,12 @@ import { useKibana } from '../../../../../common/lib/kibana';
 import { TestProviders } from '../../../../../common/mock';
 import '../../../../../common/mock/formatted_relative';
 import '../../../../../common/mock/match_media';
-import { AllRules } from './index';
+import { AllRules } from '.';
 
 jest.mock('../../../../../common/components/link_to');
 jest.mock('../../../../../common/lib/kibana');
 jest.mock('../../../../containers/detection_engine/rules');
-jest.mock('../../../../pages/detection_engine/rules/all/rules_table/rules_table_context');
+jest.mock('./rules_table/rules_table_context');
 
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx
index 9f0c0d0cb9695..91aa36b62f9f7 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx
@@ -12,7 +12,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import React from 'react';
-import { NavigateToAppOptions } from '../../../../../../../../../src/core/public';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import { BulkAction } from '../../../../../../common/detection_engine/schemas/common/schemas';
 import { UseAppToasts } from '../../../../../common/hooks/use_app_toasts';
 import { canEditRuleWithActions } from '../../../../../common/utils/privileges';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
index b3cf1ded717fa..a834f42545ee4 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 
 import '../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../common/mock';
-import { CreateRulePage } from './index';
+import { CreateRulePage } from '.';
 import { useUserData } from '../../../../components/user_info';
 import { useAppToastsMock } from '../../../../../common/hooks/use_app_toasts.mock';
 import { useAppToasts } from '../../../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx
index 5242b6dbe0313..c48f5d6971d23 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx
@@ -8,7 +8,7 @@
 import { EuiBasicTableColumn, EuiHealth, EuiLink, EuiText } from '@elastic/eui';
 import { capitalize } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import React from 'react';
 import {
   AggregateRuleExecutionEvent,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
index 84e6d6879bb8b..8212bebabb5c3 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
@@ -17,7 +17,7 @@ import {
   TestProviders,
   SUB_PLUGINS_REDUCER,
 } from '../../../../../common/mock';
-import { RuleDetailsPage } from './index';
+import { RuleDetailsPage } from '.';
 import { createStore, State } from '../../../../../common/store';
 import { useUserData } from '../../../../components/user_info';
 import { useRuleWithFallback } from '../../../../containers/detection_engine/rules/use_rule_with_fallback';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
index 791a3fcd0a5b4..8550d03eca2aa 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -33,7 +33,7 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 
 import { Dispatch } from 'redux';
-import { isTab } from '../../../../../../../timelines/public';
+import { isTab } from '@kbn/timelines-plugin/public';
 import {
   useDeepEqualSelector,
   useShallowEqualSelector,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
index 4532982032772..c990621acd47b 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 
 import '../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../common/mock';
-import { EditRulePage } from './index';
+import { EditRulePage } from '.';
 import { useUserData } from '../../../../components/user_info';
 import { useParams } from 'react-router-dom';
 import { useAppToastsMock } from '../../../../../common/hooks/use_app_toasts.mock';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
index d91eed9301ae4..a8037ea9216a3 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
@@ -20,7 +20,7 @@ import {
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 import type { Filter } from '@kbn/es-query';
-import { ActionVariables } from '../../../../../../triggers_actions_ui/public';
+import { ActionVariables } from '@kbn/triggers-actions-ui-plugin/public';
 import { normalizeThresholdField } from '../../../../../common/detection_engine/utils';
 import { RuleAlertAction } from '../../../../../common/detection_engine/types';
 import { assertUnreachable } from '../../../../../common/utility_types';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
index 4f40f1c86c697..05867a9830ad1 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow, mount, ReactWrapper } from 'enzyme';
 
 import '../../../../common/mock/match_media';
-import { RulesPage } from './index';
+import { RulesPage } from '.';
 import { useUserData } from '../../../components/user_info';
 import { waitFor } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
@@ -27,7 +27,7 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-jest.mock('../../../pages/detection_engine/rules/all/rules_table/rules_table_context');
+jest.mock('./all/rules_table/rules_table_context');
 jest.mock('../../../containers/detection_engine/lists/use_lists_config');
 jest.mock('../../../containers/detection_engine/rules/use_find_rules_query');
 jest.mock('../../../../common/components/link_to');
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
index 09949cc5c1a09..7071ef95c8c7e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
@@ -196,7 +196,7 @@ export const BULK_ACTION_DELETE_TAGS = i18n.translate(
 export const BULK_ACTION_APPLY_TIMELINE_TEMPLATE = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.applyTimelineTemplateTitle',
   {
-    defaultMessage: 'Apply timeline template',
+    defaultMessage: 'Apply Timeline template',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
index 567e408089883..e94365da0a3a7 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
@@ -16,8 +16,8 @@ import {
   Severity,
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { Filter } from '@kbn/es-query';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 import { RuleAlertAction } from '../../../../../common/detection_engine/types';
-import { RuleAction } from '../../../../../../alerting/common';
 import { FieldValueQueryBar } from '../../../components/rules/query_bar';
 import { FieldValueTimeline } from '../../../components/rules/pick_timeline';
 import { FieldValueThreshold } from '../../../components/rules/threshold_input';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts
index d4ce5da4a1413..b4778bb8c24ea 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts
@@ -7,7 +7,7 @@
 
 import { isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import {
   getRulesUrl,
   getRuleDetailsUrl,
diff --git a/x-pack/plugins/security_solution/public/exceptions/index.ts b/x-pack/plugins/security_solution/public/exceptions/index.ts
index eccb2ba7578c7..6854612c7db92 100644
--- a/x-pack/plugins/security_solution/public/exceptions/index.ts
+++ b/x-pack/plugins/security_solution/public/exceptions/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { SecuritySubPlugin } from '../app/types';
 import { DETECTIONS_TIMELINE_IDS } from '../detections';
diff --git a/x-pack/plugins/security_solution/public/exceptions/routes.tsx b/x-pack/plugins/security_solution/public/exceptions/routes.tsx
index 262db114ae84e..5e89ec8e4d40b 100644
--- a/x-pack/plugins/security_solution/public/exceptions/routes.tsx
+++ b/x-pack/plugins/security_solution/public/exceptions/routes.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import * as i18n from './translations';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { EXCEPTIONS_PATH, SecurityPageName } from '../../common/constants';
 import { ExceptionListsTable } from '../detections/pages/detection_engine/rules/all/exceptions/exceptions_table';
 import { SpyRoute } from '../common/utils/route/spy_routes';
diff --git a/x-pack/plugins/security_solution/public/helpers.test.tsx b/x-pack/plugins/security_solution/public/helpers.test.tsx
index 4f39ea32c6d5d..63d7bc4b1699f 100644
--- a/x-pack/plugins/security_solution/public/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/helpers.test.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Capabilities } from '../../../../src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { CASES_FEATURE_ID, SERVER_APP_ID } from '../common/constants';
 import { mockEcsDataWithAlert } from './common/mock';
 import { ALERT_RULE_UUID, ALERT_RULE_NAME, ALERT_RULE_PARAMETERS } from '@kbn/rule-data-utils';
diff --git a/x-pack/plugins/security_solution/public/helpers.tsx b/x-pack/plugins/security_solution/public/helpers.tsx
index adc22b96d2050..ce4e2a448763c 100644
--- a/x-pack/plugins/security_solution/public/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/helpers.tsx
@@ -10,7 +10,7 @@ import { has, get, isEmpty } from 'lodash/fp';
 import React from 'react';
 import { matchPath, RouteProps, Redirect } from 'react-router-dom';
 
-import { Capabilities, CoreStart } from '../../../../src/core/public';
+import { Capabilities, CoreStart } from '@kbn/core/public';
 import {
   ALERTS_PATH,
   APP_UI_ID,
diff --git a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx
index 88d041775320c..e8dc9a0da8b10 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx
@@ -18,7 +18,7 @@ import { FormattedRelativePreferenceDate } from '../../../common/components/form
 import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider';
 import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
 import { DefaultDraggable } from '../../../common/components/draggables';
-import { HostsTableColumns } from './';
+import { HostsTableColumns } from '.';
 
 import * as i18n from './translations';
 import { Maybe, RiskSeverity } from '../../../../common/search_strategy';
diff --git a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
index 43dc31c68d1bc..f606b1ff67dee 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
@@ -18,9 +18,9 @@ import {
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { createStore, State } from '../../../common/store';
-import { hostsModel } from '../../../hosts/store';
-import { HostsTableType } from '../../../hosts/store/model';
-import { HostsTable } from './index';
+import { hostsModel } from '../../store';
+import { HostsTableType } from '../../store/model';
+import { HostsTable } from '.';
 import { mockData } from './mock';
 import { render } from '@testing-library/react';
 import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx
index 164b88399bbe9..08e517921e974 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { HostsKpiAuthentications } from './index';
+import { HostsKpiAuthentications } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_hosts/authentications');
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx
index 49b6986515564..5b03586b86513 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { HostsKpiHosts } from './index';
+import { HostsKpiHosts } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_hosts/hosts');
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx
index b000b2f22dc95..2ca32c6063ea6 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { render } from '@testing-library/react';
 
-import { RiskyHosts } from './';
+import { RiskyHosts } from '.';
 import { TestProviders } from '../../../../common/mock';
 import { KpiRiskScoreStrategyResponse } from '../../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx
index 20de5db340b5e..0e82bf5b39a1b 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { HostsKpiUniqueIps } from './index';
+import { HostsKpiUniqueIps } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_hosts/unique_ips');
diff --git a/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx
index a3b7022ee83ef..ceb4394619fc5 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx
@@ -15,10 +15,10 @@ import {
   EuiTableFieldDataColumnType,
 } from '@elastic/eui';
 
+import { Direction } from '@kbn/timelines-plugin/common';
 import { HeaderSection } from '../../../common/components/header_section';
 import { InspectButton, InspectButtonContainer } from '../../../common/components/inspect';
 import * as i18n from './translations';
-import { Direction } from '../../../../../timelines/common';
 
 import { buildHostNamesFilter, RiskScoreFields } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx
index a0f4386be59a4..f78307d7a61a7 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { useKibana } from '../../../../common/lib/kibana';
@@ -21,10 +22,6 @@ import {
 } from '../../../../../common/search_strategy/security_solution/hosts';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
index 59b08a1b7c07d..e6174801e69cb 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
@@ -9,6 +9,7 @@ import deepEqual from 'fast-deep-equal';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useKibana } from '../../../../common/lib/kibana';
 import {
@@ -19,10 +20,6 @@ import {
 
 import * as i18n from './translations';
 import { Direction, DocValueFields } from '../../../../../common/search_strategy';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 
 const ID = 'firstLastSeenHostQuery';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx
index df64f4cd6f81a..8047f5699e208 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useAllHost } from './index';
+import { useAllHost } from '.';
 import { HostsType } from '../../store/model';
 
 describe('useAllHost', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
index a951712f97022..6d4b311712953 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { inputsModel, State } from '../../../common/store';
 import { createFilter } from '../../../common/containers/helpers';
 import { useKibana } from '../../../common/lib/kibana';
@@ -27,7 +28,6 @@ import {
 import { ESTermQuery } from '../../../../common/typed_json';
 
 import * as i18n from './translations';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx
index f62fc3a77786e..3fd27eecaa912 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useHostsKpiAuthentications } from './index';
+import { useHostsKpiAuthentications } from '.';
 
 describe('kpi hosts - authentications', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx
index f12b92f0661bc..69155eb7c979d 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useHostsKpiHosts } from './index';
+import { useHostsKpiHosts } from '.';
 
 describe('kpi hosts - hosts', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx
index ec8c73ad1d6a6..f50f46bdf90d2 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useHostsKpiUniqueIps } from './index';
+import { useHostsKpiUniqueIps } from '.';
 
 describe('kpi hosts - Unique Ips', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx
index e334465fdbc1c..b6e7ef1f2da9f 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useUncommonProcesses } from './index';
+import { useUncommonProcesses } from '.';
 import { HostsType } from '../../store/model';
 
 describe('useUncommonProcesses', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
index d196c4ea01af1..a2c5cb20d2bca 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
@@ -10,7 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 
 import { inputsModel, State } from '../../../common/store';
 import { useKibana } from '../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/hosts/index.ts b/x-pack/plugins/security_solution/public/hosts/index.ts
index f818a812b57a3..9820f76762b93 100644
--- a/x-pack/plugins/security_solution/public/hosts/index.ts
+++ b/x-pack/plugins/security_solution/public/hosts/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelineIdLiteral, TimelineId } from '../../common/types/timeline';
 import { SecuritySubPluginWithStore } from '../app/types';
 import { getTimelinesInStorageByIds } from '../timelines/containers/local_storage';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
index f0ac78e3950d4..90fd6ab1e77b6 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
@@ -18,7 +18,7 @@ import { type } from './utils';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { getHostDetailsPageFilters } from './helpers';
 import { HostsTableType } from '../../store/model';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../common/lib/kibana', () => {
   const original = jest.requireActual('../../../common/lib/kibana');
@@ -36,7 +36,7 @@ jest.mock('../../../common/lib/kibana', () => {
   };
 });
 
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 
 jest.mock('../../../common/containers/source', () => ({
   useFetchIndex: () => [false, { indicesExist: true, indexPatterns: mockIndexPattern }],
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx
index f1b03c7a3c4c4..1ee0821579646 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx
@@ -11,6 +11,7 @@ import React, { useEffect, useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
 import type { Filter } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { HostItem, LastEventIndexKey } from '../../../../common/search_strategy';
 import { SecurityPageName } from '../../../app/types';
 import { UpdateDateRange } from '../../../common/components/charts/common';
@@ -34,7 +35,6 @@ import { inputsSelectors } from '../../../common/store';
 import { setHostDetailsTablesActivePageToZero } from '../../store/actions';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { SpyRoute } from '../../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 
 import { HostDetailsTabs } from './details_tabs';
 import { navTabsHostDetails } from './nav_tabs';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.test.tsx
index 8b951722439a6..351b43b8e54fc 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.test.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { TabNavigationItemProps } from '../../../common/components/navigation/tab_navigation/types';
 import { HostsTableType } from '../../store/model';
 import { navTabsHostDetails } from './nav_tabs';
 
@@ -50,4 +51,22 @@ describe('navTabsHostDetails', () => {
     expect(tabs).toHaveProperty(HostsTableType.events);
     expect(tabs).toHaveProperty(HostsTableType.risk);
   });
+
+  test('it should display Beta badge for sessions tab only', () => {
+    const tabs = navTabsHostDetails({
+      hasMlUserPermissions: false,
+      isRiskyHostsEnabled: true,
+      hostName: mockHostName,
+    });
+
+    Object.values(tabs).forEach((item) => {
+      const tab = item as TabNavigationItemProps;
+
+      if (tab.id === HostsTableType.sessions) {
+        expect(tab.isBeta).toEqual(true);
+      } else {
+        expect(tab.isBeta).toEqual(undefined);
+      }
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.tsx
index eb22e69e14c43..474bbbac7271e 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/nav_tabs.tsx
@@ -67,6 +67,7 @@ export const navTabsHostDetails = ({
       name: i18n.NAVIGATION_SESSIONS_TITLE,
       href: getTabsOnHostDetailsUrl(hostName, HostsTableType.sessions),
       disabled: false,
+      isBeta: true,
     },
   };
 
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts b/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts
index 346ac7bf3517b..859790b4f342e 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts
@@ -7,7 +7,7 @@
 
 import { get, isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { hostsModel } from '../../store';
 import { HostsTableType } from '../../store/model';
 import { getHostDetailsUrl } from '../../../common/components/link_to/redirect_to_hosts';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
index bdf249dc07526..565ab35ca4c6d 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
@@ -24,7 +24,7 @@ import { State, createStore } from '../../common/store';
 import { Hosts } from './hosts';
 import { HostsTabs } from './hosts_tabs';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
-import { mockCasesContract } from '../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 jest.mock('../../common/containers/sourcerer');
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
index 859e20607a4f7..efeff5cdea54d 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
@@ -12,7 +12,8 @@ import React, { useCallback, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import { Filter } from '@kbn/es-query';
-import { isTab } from '../../../../timelines/public';
+import { isTab } from '@kbn/timelines-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../app/types';
 import { UpdateDateRange } from '../../common/components/charts/common';
 import { FiltersGlobal } from '../../common/components/filters_global';
@@ -33,7 +34,6 @@ import { inputsSelectors, State } from '../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../common/store/inputs/actions';
 
 import { SpyRoute } from '../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../src/plugins/data/common';
 import { useMlCapabilities } from '../../common/components/ml/hooks/use_ml_capabilities';
 import { Display } from './display';
 import { HostsTabs } from './hosts_tabs';
diff --git a/x-pack/plugins/security_solution/public/hosts/routes.tsx b/x-pack/plugins/security_solution/public/hosts/routes.tsx
index 1eeddf2155613..683a4a66ab383 100644
--- a/x-pack/plugins/security_solution/public/hosts/routes.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/routes.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { HostsContainer } from './pages';
 import { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { HOSTS_PATH } from '../../common/constants';
 
 export const HostsRoutes = () => (
diff --git a/x-pack/plugins/security_solution/public/index.ts b/x-pack/plugins/security_solution/public/index.ts
index 5f2f6014822ab..ab20271b4bda3 100644
--- a/x-pack/plugins/security_solution/public/index.ts
+++ b/x-pack/plugins/security_solution/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { Plugin } from './plugin';
 import { PluginSetup } from './types';
 export type { TimelineModel } from './timelines/store/timeline/model';
diff --git a/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts b/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts
index 40a726bdf42e4..49b4214d60bd6 100644
--- a/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts
+++ b/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { AdministrationSubTab } from '../types';
 import { ENDPOINTS_TAB, EVENT_FILTERS_TAB, POLICIES_TAB, TRUSTED_APPS_TAB } from './translations';
 import { AdministrationRouteSpyState } from '../../common/utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/management/common/routing.test.ts b/x-pack/plugins/security_solution/public/management/common/routing.test.ts
deleted file mode 100644
index 99afd30688983..0000000000000
--- a/x-pack/plugins/security_solution/public/management/common/routing.test.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { extractTrustedAppsListPageLocation, getTrustedAppsListPath } from './routing';
-import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from './constants';
-import { TrustedAppsListPageLocation } from '../pages/trusted_apps/state';
-
-describe('routing', () => {
-  describe('extractListPaginationParams()', () => {
-    it('extracts default page index when not provided', () => {
-      expect(extractTrustedAppsListPageLocation({}).page_index).toBe(MANAGEMENT_DEFAULT_PAGE);
-    });
-
-    it('extracts default page index when too small value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_index: '-1' }).page_index).toBe(
-        MANAGEMENT_DEFAULT_PAGE
-      );
-    });
-
-    it('extracts default page index when not a number provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_index: 'a' }).page_index).toBe(
-        MANAGEMENT_DEFAULT_PAGE
-      );
-    });
-
-    it('extracts only last page index when multiple values provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_index: ['1', '2'] }).page_index).toBe(2);
-    });
-
-    it('extracts proper page index when single valid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_index: '2' }).page_index).toBe(2);
-    });
-
-    it('extracts default page size when not provided', () => {
-      expect(extractTrustedAppsListPageLocation({}).page_size).toBe(MANAGEMENT_DEFAULT_PAGE_SIZE);
-    });
-
-    it('extracts default page size when invalid option provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_size: '25' }).page_size).toBe(
-        MANAGEMENT_DEFAULT_PAGE_SIZE
-      );
-    });
-
-    it('extracts default page size when not a number provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_size: 'a' }).page_size).toBe(
-        MANAGEMENT_DEFAULT_PAGE_SIZE
-      );
-    });
-
-    it('extracts only last page size when multiple values provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_size: ['10', '20'] }).page_size).toBe(20);
-    });
-
-    it('extracts proper page size when single valid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ page_size: '20' }).page_size).toBe(20);
-    });
-
-    it('extracts proper "show" when single valid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ show: 'create' }).show).toBe('create');
-    });
-
-    it('extracts only last "show" when multiple values provided', () => {
-      expect(extractTrustedAppsListPageLocation({ show: ['invalid', 'create'] }).show).toBe(
-        'create'
-      );
-    });
-
-    it('extracts default "show" when no value provided', () => {
-      expect(extractTrustedAppsListPageLocation({}).show).toBeUndefined();
-    });
-
-    it('extracts default "show" when single invalid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ show: 'invalid' }).show).toBeUndefined();
-    });
-
-    it('extracts proper view type when single valid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ view_type: 'list' }).view_type).toBe('list');
-    });
-
-    it('extracts only last view type when multiple values provided', () => {
-      expect(extractTrustedAppsListPageLocation({ view_type: ['grid', 'list'] }).view_type).toBe(
-        'list'
-      );
-    });
-
-    it('extracts default view type when no value provided', () => {
-      expect(extractTrustedAppsListPageLocation({}).view_type).toBe('grid');
-    });
-
-    it('extracts default view type when single invalid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ view_type: 'invalid' }).view_type).toBe('grid');
-    });
-  });
-
-  describe('getTrustedAppsListPath()', () => {
-    it('builds proper path when no parameters provided', () => {
-      expect(getTrustedAppsListPath()).toEqual('/administration/trusted_apps');
-    });
-
-    it('builds proper path when empty parameters provided', () => {
-      expect(getTrustedAppsListPath({})).toEqual('/administration/trusted_apps');
-    });
-
-    it('builds proper path when only page size provided', () => {
-      const pageSize = 20;
-      expect(getTrustedAppsListPath({ page_size: pageSize })).toEqual(
-        `/administration/trusted_apps?page_size=${pageSize}`
-      );
-    });
-
-    it('builds proper path when only page index provided', () => {
-      const pageIndex = 2;
-      expect(getTrustedAppsListPath({ page_index: pageIndex })).toEqual(
-        `/administration/trusted_apps?page_index=${pageIndex}`
-      );
-    });
-
-    it('builds proper path when only "show" provided', () => {
-      const show = 'create';
-      expect(getTrustedAppsListPath({ show })).toEqual(`/administration/trusted_apps?show=${show}`);
-    });
-
-    it('builds proper path when only view type provided', () => {
-      const viewType = 'list';
-      expect(getTrustedAppsListPath({ view_type: viewType })).toEqual(
-        `/administration/trusted_apps?view_type=${viewType}`
-      );
-    });
-
-    it('builds proper path when all params provided', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: 2,
-        page_size: 20,
-        show: 'create',
-        view_type: 'list',
-        filter: 'test',
-        included_policies: 'globally',
-      };
-
-      expect(getTrustedAppsListPath(location)).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}&view_type=${location.view_type}&show=${location.show}&filter=${location.filter}&included_policies=${location.included_policies}`
-      );
-    });
-
-    it('builds proper path when page index is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: MANAGEMENT_DEFAULT_PAGE,
-        page_size: 20,
-        show: 'create',
-        view_type: 'list',
-        filter: '',
-        included_policies: '',
-      };
-      const path = getTrustedAppsListPath(location);
-
-      expect(path).toEqual(
-        `/administration/trusted_apps?page_size=${location.page_size}&view_type=${location.view_type}&show=${location.show}`
-      );
-    });
-
-    it('builds proper path when page size is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: 2,
-        page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
-        show: 'create',
-        view_type: 'list',
-        filter: '',
-        included_policies: '',
-      };
-      const path = getTrustedAppsListPath(location);
-
-      expect(path).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&view_type=${location.view_type}&show=${location.show}`
-      );
-    });
-
-    it('builds proper path when "show" is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: 2,
-        page_size: 20,
-        show: undefined,
-        view_type: 'list',
-        filter: '',
-        included_policies: '',
-      };
-      const path = getTrustedAppsListPath(location);
-
-      expect(path).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}&view_type=${location.view_type}`
-      );
-    });
-
-    it('builds proper path when view type is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: 2,
-        page_size: 20,
-        show: 'create',
-        view_type: 'grid',
-        filter: '',
-        included_policies: '',
-      };
-      const path = getTrustedAppsListPath(location);
-
-      expect(path).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}&show=${location.show}`
-      );
-    });
-
-    it('builds proper path when params are equal to default', () => {
-      const path = getTrustedAppsListPath({
-        page_index: MANAGEMENT_DEFAULT_PAGE,
-        page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
-        show: undefined,
-        view_type: 'grid',
-      });
-
-      expect(path).toEqual('/administration/trusted_apps');
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/common/routing.ts b/x-pack/plugins/security_solution/public/management/common/routing.ts
index 2e84f38989542..828be47d9d0dd 100644
--- a/x-pack/plugins/security_solution/public/management/common/routing.ts
+++ b/x-pack/plugins/security_solution/public/management/common/routing.ts
@@ -6,6 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
+// FIXME: Remove references to `querystring`
 // eslint-disable-next-line import/no-nodejs-modules
 import querystring from 'querystring';
 import { generatePath } from 'react-router-dom';
@@ -14,26 +15,25 @@ import { ArtifactListPageUrlParams } from '../components/artifact_list_page';
 import { paginationFromUrlParams } from '../components/hooks/use_url_pagination';
 import { EndpointIndexUIQueryParams } from '../pages/endpoint_hosts/types';
 import { EventFiltersPageLocation } from '../pages/event_filters/types';
-import { HostIsolationExceptionsPageLocation } from '../pages/host_isolation_exceptions/types';
 import { PolicyDetailsArtifactsPageLocation } from '../pages/policy/types';
-import { TrustedAppsListPageLocation } from '../pages/trusted_apps/state';
 import { AdministrationSubTab } from '../types';
 import {
   MANAGEMENT_DEFAULT_PAGE,
   MANAGEMENT_DEFAULT_PAGE_SIZE,
   MANAGEMENT_PAGE_SIZE_OPTIONS,
+  MANAGEMENT_ROUTING_BLOCKLIST_PATH,
   MANAGEMENT_ROUTING_ENDPOINTS_PATH,
   MANAGEMENT_ROUTING_EVENT_FILTERS_PATH,
   MANAGEMENT_ROUTING_HOST_ISOLATION_EXCEPTIONS_PATH,
   MANAGEMENT_ROUTING_POLICIES_PATH,
+  MANAGEMENT_ROUTING_POLICY_DETAILS_BLOCKLISTS_PATH,
+  MANAGEMENT_ROUTING_POLICY_DETAILS_EVENT_FILTERS_PATH,
   MANAGEMENT_ROUTING_POLICY_DETAILS_FORM_PATH,
   MANAGEMENT_ROUTING_POLICY_DETAILS_HOST_ISOLATION_EXCEPTIONS_PATH,
   MANAGEMENT_ROUTING_POLICY_DETAILS_TRUSTED_APPS_PATH,
-  MANAGEMENT_ROUTING_POLICY_DETAILS_EVENT_FILTERS_PATH,
   MANAGEMENT_ROUTING_TRUSTED_APPS_PATH,
-  MANAGEMENT_ROUTING_BLOCKLIST_PATH,
-  MANAGEMENT_ROUTING_POLICY_DETAILS_BLOCKLISTS_PATH,
 } from './constants';
+import { isDefaultOrMissing, getArtifactListPageUrlPath } from './url_routing';
 
 // Taken from: https://github.com/microsoft/TypeScript/issues/12936#issuecomment-559034150
 type ExactKeys<T1, T2> = Exclude<keyof T1, keyof T2> extends never ? T1 : never;
@@ -149,34 +149,6 @@ export const getPolicyEventFiltersPath = (
   )}`;
 };
 
-const isDefaultOrMissing = <T>(value: T | undefined, defaultValue: T) => {
-  return value === undefined || value === defaultValue;
-};
-
-const normalizeTrustedAppsPageLocation = (
-  location?: Partial<TrustedAppsListPageLocation>
-): Partial<TrustedAppsListPageLocation> => {
-  if (location) {
-    return {
-      ...(!isDefaultOrMissing(location.page_index, MANAGEMENT_DEFAULT_PAGE)
-        ? { page_index: location.page_index }
-        : {}),
-      ...(!isDefaultOrMissing(location.page_size, MANAGEMENT_DEFAULT_PAGE_SIZE)
-        ? { page_size: location.page_size }
-        : {}),
-      ...(!isDefaultOrMissing(location.view_type, 'grid') ? { view_type: location.view_type } : {}),
-      ...(!isDefaultOrMissing(location.show, undefined) ? { show: location.show } : {}),
-      ...(!isDefaultOrMissing(location.id, undefined) ? { id: location.id } : {}),
-      ...(!isDefaultOrMissing(location.filter, '') ? { filter: location.filter } : ''),
-      ...(!isDefaultOrMissing(location.included_policies, '')
-        ? { included_policies: location.included_policies }
-        : ''),
-    };
-  } else {
-    return {};
-  }
-};
-
 const normalizePolicyDetailsArtifactsListPageLocation = (
   location?: Partial<PolicyDetailsArtifactsPageLocation>
 ): Partial<PolicyDetailsArtifactsPageLocation> => {
@@ -219,52 +191,6 @@ const normalizeEventFiltersPageLocation = (
   }
 };
 
-const normalizBlocklistsPageLocation = (
-  location?: Partial<ArtifactListPageUrlParams>
-): Partial<ArtifactListPageUrlParams> => {
-  if (location) {
-    return {
-      ...(!isDefaultOrMissing(location.page, MANAGEMENT_DEFAULT_PAGE)
-        ? { page: location.page }
-        : {}),
-      ...(!isDefaultOrMissing(location.pageSize, MANAGEMENT_DEFAULT_PAGE_SIZE)
-        ? { pageSize: location.pageSize }
-        : {}),
-      ...(!isDefaultOrMissing(location.show, undefined) ? { show: location.show } : {}),
-      ...(!isDefaultOrMissing(location.itemId, undefined) ? { id: location.itemId } : {}),
-      ...(!isDefaultOrMissing(location.filter, '') ? { filter: location.filter } : ''),
-      ...(!isDefaultOrMissing(location.includedPolicies, '')
-        ? { includedPolicies: location.includedPolicies }
-        : ''),
-    };
-  } else {
-    return {};
-  }
-};
-
-const normalizeHostIsolationExceptionsPageLocation = (
-  location?: Partial<HostIsolationExceptionsPageLocation>
-): Partial<EventFiltersPageLocation> => {
-  if (location) {
-    return {
-      ...(!isDefaultOrMissing(location.page_index, MANAGEMENT_DEFAULT_PAGE)
-        ? { page_index: location.page_index }
-        : {}),
-      ...(!isDefaultOrMissing(location.page_size, MANAGEMENT_DEFAULT_PAGE_SIZE)
-        ? { page_size: location.page_size }
-        : {}),
-      ...(!isDefaultOrMissing(location.show, undefined) ? { show: location.show } : {}),
-      ...(!isDefaultOrMissing(location.id, undefined) ? { id: location.id } : {}),
-      ...(!isDefaultOrMissing(location.filter, '') ? { filter: location.filter } : ''),
-      ...(!isDefaultOrMissing(location.included_policies, '')
-        ? { included_policies: location.included_policies }
-        : ''),
-    };
-  } else {
-    return {};
-  }
-};
-
 /**
  * Given an object with url params, and a given key, return back only the first param value (case multiples were defined)
  * @param query
@@ -315,31 +241,12 @@ export const extractArtifactsListPaginationParams = (query: querystring.ParsedUr
   included_policies: extractIncludedPolicies(query),
 });
 
-export const extractTrustedAppsListPageLocation = (
-  query: querystring.ParsedUrlQuery
-): TrustedAppsListPageLocation => {
-  const showParamValue = extractFirstParamValue(
-    query,
-    'show'
-  ) as TrustedAppsListPageLocation['show'];
-
-  return {
-    ...extractTrustedAppsListPaginationParams(query),
-    view_type: extractFirstParamValue(query, 'view_type') === 'list' ? 'list' : 'grid',
-    show:
-      showParamValue && ['edit', 'create'].includes(showParamValue) ? showParamValue : undefined,
-    id: extractFirstParamValue(query, 'id'),
-  };
-};
-
-export const getTrustedAppsListPath = (location?: Partial<TrustedAppsListPageLocation>): string => {
+export const getTrustedAppsListPath = (location?: Partial<ArtifactListPageUrlParams>): string => {
   const path = generatePath(MANAGEMENT_ROUTING_TRUSTED_APPS_PATH, {
     tabName: AdministrationSubTab.trustedApps,
   });
 
-  return `${path}${appendSearch(
-    querystring.stringify(normalizeTrustedAppsPageLocation(location))
-  )}`;
+  return getArtifactListPageUrlPath(path, location);
 };
 
 export const extractPolicyDetailsArtifactsListPageLocation = (
@@ -395,33 +302,14 @@ export const getEventFiltersListPath = (location?: Partial<EventFiltersPageLocat
   )}`;
 };
 
-export const extractHostIsolationExceptionsPageLocation = (
-  query: querystring.ParsedUrlQuery
-): HostIsolationExceptionsPageLocation => {
-  const showParamValue = extractFirstParamValue(
-    query,
-    'show'
-  ) as HostIsolationExceptionsPageLocation['show'];
-
-  return {
-    ...extractListPaginationParams(query),
-    included_policies: extractIncludedPolicies(query),
-    show:
-      showParamValue && ['edit', 'create'].includes(showParamValue) ? showParamValue : undefined,
-    id: extractFirstParamValue(query, 'id'),
-  };
-};
-
 export const getHostIsolationExceptionsListPath = (
-  location?: Partial<HostIsolationExceptionsPageLocation>
+  location?: Partial<ArtifactListPageUrlParams>
 ): string => {
   const path = generatePath(MANAGEMENT_ROUTING_HOST_ISOLATION_EXCEPTIONS_PATH, {
     tabName: AdministrationSubTab.hostIsolationExceptions,
   });
 
-  return `${path}${appendSearch(
-    querystring.stringify(normalizeHostIsolationExceptionsPageLocation(location))
-  )}`;
+  return getArtifactListPageUrlPath(path, location);
 };
 
 export const getPolicyHostIsolationExceptionsPath = (
@@ -442,7 +330,7 @@ export const getBlocklistsListPath = (location?: Partial<ArtifactListPageUrlPara
     tabName: AdministrationSubTab.blocklist,
   });
 
-  return `${path}${appendSearch(querystring.stringify(normalizBlocklistsPageLocation(location)))}`;
+  return getArtifactListPageUrlPath(path, location);
 };
 
 export const getPolicyBlocklistsPath = (
diff --git a/x-pack/plugins/security_solution/public/management/common/url_routing/artifact_list_page_routing.test.ts b/x-pack/plugins/security_solution/public/management/common/url_routing/artifact_list_page_routing.test.ts
new file mode 100644
index 0000000000000..efbed1e2e14fc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/common/url_routing/artifact_list_page_routing.test.ts
@@ -0,0 +1,232 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ArtifactListPageUrlParams } from '../../components/artifact_list_page';
+import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../constants';
+import {
+  getArtifactListPageUrlPath,
+  extractArtifactListPageUrlSearchParams,
+} from './artifact_list_page_routing';
+import {
+  getTrustedAppsListPath,
+  getBlocklistsListPath,
+  getHostIsolationExceptionsListPath,
+} from '../routing';
+
+describe('routing', () => {
+  describe('extractListPaginationParams()', () => {
+    it('extracts default page when not provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({}).page).toBe(1);
+    });
+
+    it('extracts default page when too small value provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ page: '-1' }).page).toBe(1);
+    });
+
+    it('extracts default page when not a number provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ page: 'a' }).page).toBe(1);
+    });
+
+    it('extracts only last page when multiple values provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ page: ['1', '2'] }).page).toBe(2);
+    });
+
+    it('extracts proper page when single valid value provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ page: '2' }).page).toBe(2);
+    });
+
+    it('extracts default page size when not provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({}).pageSize).toBe(
+        MANAGEMENT_DEFAULT_PAGE_SIZE
+      );
+    });
+
+    it('extracts default page size when invalid option provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ pageSize: '25' }).pageSize).toBe(
+        MANAGEMENT_DEFAULT_PAGE_SIZE
+      );
+    });
+
+    it('extracts default page size when not a number provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ pageSize: 'a' }).pageSize).toBe(
+        MANAGEMENT_DEFAULT_PAGE_SIZE
+      );
+    });
+
+    it('extracts only last page size when multiple values provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ pageSize: ['10', '20'] }).pageSize).toBe(20);
+    });
+
+    it('extracts proper page size when single valid value provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ pageSize: '20' }).pageSize).toBe(20);
+    });
+
+    it('extracts proper "show" when single valid value provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ show: 'create' }).show).toBe('create');
+    });
+
+    it('extracts only last "show" when multiple values provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ show: ['invalid', 'create'] }).show).toBe(
+        'create'
+      );
+    });
+
+    it('extracts default "show" when no value provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({}).show).toBeUndefined();
+    });
+
+    it('extracts default "show" when single invalid value provided', () => {
+      expect(extractArtifactListPageUrlSearchParams({ show: 'invalid' }).show).toBeUndefined();
+    });
+  });
+
+  describe('getArtifactListPageUrlPath()', () => {
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when no parameters provided', (path, getPath) => {
+      expect(getArtifactListPageUrlPath(getPath())).toEqual(`/administration/${path}`);
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when only page size provided', (path, getPath) => {
+      const pageSize = 20;
+      expect(getArtifactListPageUrlPath(getPath({ pageSize }))).toEqual(
+        `/administration/${path}?pageSize=${pageSize}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when only page index provided', (path, getPath) => {
+      const pageIndex = 2;
+      expect(getArtifactListPageUrlPath(getPath({ page: pageIndex }))).toEqual(
+        `/administration/${path}?page=${pageIndex}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when only "show" provided', (path, getPath) => {
+      const show = 'create';
+      expect(getArtifactListPageUrlPath(getPath({ show }))).toEqual(
+        `/administration/${path}?show=${show}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when all params provided', (path, getPath) => {
+      const location: ArtifactListPageUrlParams = {
+        page: 2,
+        pageSize: 20,
+        show: 'create',
+        filter: 'test',
+        includedPolicies: 'globally',
+      };
+
+      expect(getPath(location)).toEqual(
+        `/administration/${path}?page=${location.page}&pageSize=${location.pageSize}&show=${location.show}&filter=${location.filter}&includedPolicies=${location.includedPolicies}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when page index is equal to default', (path, getPath) => {
+      const location: ArtifactListPageUrlParams = {
+        page: MANAGEMENT_DEFAULT_PAGE,
+        pageSize: 20,
+        show: 'create',
+        filter: '',
+        includedPolicies: '',
+      };
+
+      expect(getPath(location)).toEqual(
+        `/administration/${path}?pageSize=${location.pageSize}&show=${location.show}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when page size is equal to default', (path, getPath) => {
+      const location: ArtifactListPageUrlParams = {
+        page: 2,
+        pageSize: MANAGEMENT_DEFAULT_PAGE_SIZE,
+        show: 'create',
+        filter: '',
+        includedPolicies: '',
+      };
+
+      expect(getPath(location)).toEqual(
+        `/administration/${path}?page=${location.page}&show=${location.show}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when "show" is equal to default', (path, getPath) => {
+      const location: ArtifactListPageUrlParams = {
+        page: 2,
+        pageSize: 20,
+        show: undefined,
+        filter: '',
+        includedPolicies: '',
+      };
+
+      expect(getPath(location)).toEqual(
+        `/administration/${path}?page=${location.page}&pageSize=${location.pageSize}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when view type is equal to default', (path, getPath) => {
+      const location: ArtifactListPageUrlParams = {
+        page: 2,
+        pageSize: 20,
+        show: 'create',
+        filter: '',
+        includedPolicies: '',
+      };
+
+      expect(getPath(location)).toEqual(
+        `/administration/${path}?page=${location.page}&pageSize=${location.pageSize}&show=${location.show}`
+      );
+    });
+
+    it.each([
+      ['trusted_apps', getTrustedAppsListPath],
+      ['blocklist', getBlocklistsListPath],
+      ['host_isolation_exceptions', getHostIsolationExceptionsListPath],
+    ])('builds proper path for %s when params are equal to default', (path, getPath) => {
+      const location: ArtifactListPageUrlParams = {
+        page: MANAGEMENT_DEFAULT_PAGE,
+        pageSize: MANAGEMENT_DEFAULT_PAGE_SIZE,
+      };
+
+      expect(getPath(location)).toEqual(`/administration/${path}`);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/common/url_routing/artifact_list_page_routing.ts b/x-pack/plugins/security_solution/public/management/common/url_routing/artifact_list_page_routing.ts
new file mode 100644
index 0000000000000..88127323301bb
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/common/url_routing/artifact_list_page_routing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// FIXME: Remove references to `querystring`
+// eslint-disable-next-line import/no-nodejs-modules
+import querystring from 'querystring';
+import { ArtifactListPageUrlParams } from '../../components/artifact_list_page';
+import {
+  isDefaultOrMissing,
+  extractFirstParamValue,
+  extractPageSizeNumber,
+  extractPageNumber,
+} from './utils';
+import { MANAGEMENT_DEFAULT_PAGE_SIZE } from '../constants';
+import { appendSearch } from '../../../common/components/link_to/helpers';
+
+const SHOW_PARAM_ALLOWED_VALUES: ReadonlyArray<Required<ArtifactListPageUrlParams>['show']> = [
+  'edit',
+  'create',
+];
+
+/**
+ * Normalizes the URL search params by dropping any that are either undefined or whose value is
+ * equal to the default value.
+ * @param urlSearchParams
+ */
+const normalizeArtifactListPageUrlSearchParams = (
+  urlSearchParams: Partial<ArtifactListPageUrlParams> = {}
+): Partial<ArtifactListPageUrlParams> => {
+  return {
+    ...(!isDefaultOrMissing(urlSearchParams.page, 1) ? { page: urlSearchParams.page } : {}),
+    ...(!isDefaultOrMissing(urlSearchParams.pageSize, MANAGEMENT_DEFAULT_PAGE_SIZE)
+      ? { pageSize: urlSearchParams.pageSize }
+      : {}),
+    ...(!isDefaultOrMissing(urlSearchParams.show, undefined) ? { show: urlSearchParams.show } : {}),
+    ...(!isDefaultOrMissing(urlSearchParams.itemId, undefined)
+      ? { itemId: urlSearchParams.itemId }
+      : {}),
+    ...(!isDefaultOrMissing(urlSearchParams.filter, '') ? { filter: urlSearchParams.filter } : ''),
+    ...(!isDefaultOrMissing(urlSearchParams.includedPolicies, '')
+      ? { includedPolicies: urlSearchParams.includedPolicies }
+      : ''),
+  };
+};
+
+export const extractArtifactListPageUrlSearchParams = (
+  query: querystring.ParsedUrlQuery
+): ArtifactListPageUrlParams => {
+  const showParamValue = extractFirstParamValue(query, 'show') as ArtifactListPageUrlParams['show'];
+
+  return {
+    page: extractPageNumber(query),
+    pageSize: extractPageSizeNumber(query),
+    includedPolicies: extractFirstParamValue(query, 'includedPolicies'),
+    show:
+      showParamValue && SHOW_PARAM_ALLOWED_VALUES.includes(showParamValue)
+        ? showParamValue
+        : undefined,
+    itemId: extractFirstParamValue(query, 'itemId'),
+  };
+};
+
+export const getArtifactListPageUrlPath = (
+  /** The path to the desired page that is using the `<ArtifactListPage>` component */
+  path: string,
+  /** An optional set of url search params. These will be normalized prior to being appended to the url path */
+  searchParams: Partial<ArtifactListPageUrlParams> = {}
+): string => {
+  return `${path}${appendSearch(
+    querystring.stringify(normalizeArtifactListPageUrlSearchParams(searchParams))
+  )}`;
+};
diff --git a/x-pack/plugins/security_solution/public/management/common/url_routing/index.ts b/x-pack/plugins/security_solution/public/management/common/url_routing/index.ts
new file mode 100644
index 0000000000000..36cbb148c21a9
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/common/url_routing/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './utils';
+export {
+  getArtifactListPageUrlPath,
+  extractArtifactListPageUrlSearchParams,
+} from './artifact_list_page_routing';
diff --git a/x-pack/plugins/security_solution/public/management/common/url_routing/utils.ts b/x-pack/plugins/security_solution/public/management/common/url_routing/utils.ts
new file mode 100644
index 0000000000000..afff61e94b06d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/common/url_routing/utils.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// eslint-disable-next-line import/no-nodejs-modules
+import querystring from 'querystring';
+import { MANAGEMENT_DEFAULT_PAGE_SIZE, MANAGEMENT_PAGE_SIZE_OPTIONS } from '../constants';
+
+/**
+ * Checks if a given value is either undefined or equal to the default value provided on input
+ * @param value
+ * @param defaultValue
+ */
+export const isDefaultOrMissing = <T>(value: T | undefined | 0, defaultValue: T) => {
+  return value === undefined || value === defaultValue || value === 0;
+};
+
+/**
+ * Given an object with url params, and a given key, return back only the first param value (case multiples were defined)
+ * @param query
+ * @param key
+ */
+export const extractFirstParamValue = (
+  query: querystring.ParsedUrlQuery,
+  key: string
+): string | undefined => {
+  const value = query[key];
+
+  return Array.isArray(value) ? value[value.length - 1] : value;
+};
+
+/**
+ * Extracts the page number from a url query object `page` param and validates it.
+ * @param query
+ */
+export const extractPageNumber = (query: querystring.ParsedUrlQuery): number => {
+  const pageIndex = Number(extractFirstParamValue(query, 'page'));
+
+  return !Number.isFinite(pageIndex) || pageIndex < 1 ? 1 : pageIndex;
+};
+
+/**
+ * Extracts the page size from a url query object `pageSize` param and validates it
+ * @param query
+ */
+export const extractPageSizeNumber = (query: querystring.ParsedUrlQuery): number => {
+  const pageSize = Number(extractFirstParamValue(query, 'pageSize'));
+
+  return MANAGEMENT_PAGE_SIZE_OPTIONS.includes(pageSize) ? pageSize : MANAGEMENT_DEFAULT_PAGE_SIZE;
+};
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
index 6482fc3d3331e..fb0f55f9e5f72 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
@@ -8,8 +8,8 @@
 import { cloneDeep } from 'lodash';
 import uuid from 'uuid';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { TrustedAppGenerator } from '../../../../common/endpoint/data_generators/trusted_app_generator';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { TrustedApp } from '../../../../common/endpoint/types';
 
 const getCommonItemDataOverrides = () => {
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx
index 383a72031ed76..c24a74b75da12 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx
@@ -54,11 +54,13 @@ describe('When using the ArtifactListPage component', () => {
   });
 
   describe('and data exists', () => {
-    let renderWithListData: () => Promise<ReturnType<typeof render>>;
+    let renderWithListData: (
+      props?: Partial<ArtifactListPageProps>
+    ) => Promise<ReturnType<typeof render>>;
 
     beforeEach(async () => {
-      renderWithListData = async () => {
-        render();
+      renderWithListData = async (props) => {
+        render(props);
 
         await act(async () => {
           await waitFor(() => {
@@ -113,7 +115,7 @@ describe('When using the ArtifactListPage component', () => {
       });
     });
 
-    it('should persist pagination `page size` changes to the URL', async () => {
+    it('should persist pagination `pageSize` changes to the URL', async () => {
       const { getByTestId } = await renderWithListData();
       act(() => {
         userEvent.click(getByTestId('tablePaginationPopoverButton'));
@@ -122,6 +124,8 @@ describe('When using the ArtifactListPage component', () => {
         await waitFor(() => {
           expect(getByTestId('tablePagination-20-rows'));
         });
+      });
+      act(() => {
         userEvent.click(getByTestId('tablePagination-20-rows'));
       });
 
@@ -157,8 +161,39 @@ describe('When using the ArtifactListPage component', () => {
         const { getByTestId } = await renderWithListData();
         await clickCardAction('delete');
 
-        expect(getByTestId('testPage-deleteModal')).toBeTruthy();
+        await waitFor(() => {
+          expect(getByTestId('testPage-deleteModal')).toBeTruthy();
+        });
+      });
+
+      it.each([
+        ['create button', 'testPage-pageAddButton', { allowCardCreateAction: false }],
+        ['edit card action', 'testPage-card-cardEditAction', { allowCardEditAction: false }],
+        ['delete card action', 'testPage-card-cardDeleteAction', { allowCardDeleteAction: false }],
+      ])('should hide the %s', async (_, testId, renderProps) => {
+        const { queryByTestId } = await renderWithListData(
+          renderProps as Partial<ArtifactListPageProps>
+        );
+        await getFirstCard({ showActions: true });
+
+        expect(queryByTestId(testId)).toBeNull();
       });
+
+      it.each([
+        ['create', 'show=create'],
+        ['edit', 'show=edit&itemId=123'],
+      ])(
+        'should NOT show flyout if url has a show param of %s but the action is not allowed',
+        async (_, urlParam) => {
+          history.push(`somepage?${urlParam}`);
+          const { queryByTestId } = await renderWithListData({
+            allowCardCreateAction: false,
+            allowCardEditAction: false,
+          });
+
+          expect(queryByTestId('testPage-flyout')).toBeNull();
+        }
+      );
     });
 
     describe('and search bar is used', () => {
@@ -257,7 +292,6 @@ describe('When using the ArtifactListPage component', () => {
         });
 
         await waitFor(() => {
-          // console.log(`\n\n${renderResult.getByTestId('testPage-list').outerHTML}\n\n\n`);
           expect(renderResult.getByTestId('testPage-list-noResults')).toBeTruthy();
         });
       });
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx
index 19f3a810f76d4..a299f932bc21d 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.tsx
@@ -68,6 +68,9 @@ export interface ArtifactListPageProps {
   searchableFields?: MaybeImmutable<string[]>;
   flyoutSize?: EuiFlyoutSize;
   'data-test-subj'?: string;
+  allowCardEditAction?: boolean;
+  allowCardDeleteAction?: boolean;
+  allowCardCreateAction?: boolean;
 }
 
 export const ArtifactListPage = memo<ArtifactListPageProps>(
@@ -79,12 +82,15 @@ export const ArtifactListPage = memo<ArtifactListPageProps>(
     onFormSubmit,
     flyoutSize,
     'data-test-subj': dataTestSubj,
+    allowCardEditAction = true,
+    allowCardCreateAction = true,
+    allowCardDeleteAction = true,
   }) => {
     const { state: routeState } = useLocation<ListPageRouteState | undefined>();
     const getTestId = useTestIdGenerator(dataTestSubj);
     const toasts = useToasts();
     const isMounted = useIsMounted();
-    const isFlyoutOpened = useIsFlyoutOpened();
+    const isFlyoutOpened = useIsFlyoutOpened(allowCardEditAction, allowCardCreateAction);
     const setUrlParams = useSetUrlParams();
     const {
       urlParams: { filter, includedPolicies },
@@ -141,6 +147,8 @@ export const ArtifactListPage = memo<ArtifactListPageProps>(
       cardActionDeleteLabel: labels.cardActionDeleteLabel,
       cardActionEditLabel: labels.cardActionEditLabel,
       dataTestSubj: getTestId('card'),
+      allowCardDeleteAction,
+      allowCardEditAction,
     });
 
     const policiesRequest = useGetEndpointSpecificPolicies({
@@ -234,15 +242,17 @@ export const ArtifactListPage = memo<ArtifactListPageProps>(
         title={labels.pageTitle}
         subtitle={labels.pageAboutInfo}
         actions={
-          <EuiButton
-            fill
-            iconType="plusInCircle"
-            isDisabled={isFlyoutOpened}
-            onClick={handleOpenCreateFlyoutClick}
-            data-test-subj={getTestId('pageAddButton')}
-          >
-            {labels.pageAddButtonTitle}
-          </EuiButton>
+          allowCardCreateAction && (
+            <EuiButton
+              fill
+              iconType="plusInCircle"
+              isDisabled={isFlyoutOpened}
+              onClick={handleOpenCreateFlyoutClick}
+              data-test-subj={getTestId('pageAddButton')}
+            >
+              {labels.pageAddButtonTitle}
+            </EuiButton>
+          )
         }
       >
         {isFlyoutOpened && (
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx
index ba37f1ab167e2..b21579d25dedb 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx
@@ -10,12 +10,14 @@ import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { getArtifactListPageRenderingSetup, getDeferred, getFormComponentMock } from '../mocks';
 import { ExceptionsListItemGenerator } from '../../../../../common/endpoint/data_generators/exceptions_list_item_generator';
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../../common/endpoint/service/artifacts';
 import { getEndpointPrivilegesInitialStateMock } from '../../../../common/components/user_privileges/endpoint/mocks';
 import { AppContextTestRender } from '../../../../common/mock/endpoint';
 import { trustedAppsAllHttpMocks } from '../../../pages/mocks';
 import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges';
+import { entriesToConditionEntries } from '../../../../common/utils/exception_list_items/mappers';
+import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 jest.mock('../../../../common/components/user_privileges');
 const useUserPrivileges = _useUserPrivileges as jest.Mock;
@@ -357,12 +359,19 @@ describe('When the flyout is opened in the ArtifactListPage component', () => {
         });
       });
 
-      expect(getLastFormComponentProps().item).toEqual({
+      const expectedProps = {
         ...mockedApi.responseProvider.trustedApp({
           query: { item_id: '123' },
         } as unknown as HttpFetchOptionsWithPath),
         created_at: expect.any(String),
-      });
+      };
+
+      // map process.hash entries to have * as suffix
+      expectedProps.entries = entriesToConditionEntries(
+        expectedProps.entries
+      ) as ExceptionListItemSchema['entries'];
+
+      expect(getLastFormComponentProps().item).toEqual(expectedProps);
     });
 
     it('should show error toast and close flyout if item for edit does not exist', async () => {
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx
index 9120042318f5b..e30160028defa 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 
 import { EuiFlyoutSize } from '@elastic/eui/src/components/flyout/flyout';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useUrlParams } from '../../hooks/use_url_params';
 import { useIsFlyoutOpened } from '../hooks/use_is_flyout_opened';
 import { useTestIdGenerator } from '../../hooks/use_test_id_generator';
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_artifact_card_props_provider.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_artifact_card_props_provider.ts
index 58a0f59feaa38..ace3fdb671865 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_artifact_card_props_provider.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_artifact_card_props_provider.ts
@@ -25,6 +25,8 @@ export interface UseArtifactCardPropsProviderProps {
   cardActionEditLabel: string;
   cardActionDeleteLabel: string;
   dataTestSubj?: string;
+  allowCardEditAction?: boolean;
+  allowCardDeleteAction?: boolean;
 }
 
 type ArtifactCardPropsProvider = (artifactItem: ExceptionListItemSchema) => ArtifactEntryCardProps;
@@ -39,6 +41,8 @@ export const useArtifactCardPropsProvider = ({
   cardActionDeleteLabel,
   cardActionEditLabel,
   dataTestSubj,
+  allowCardDeleteAction = true,
+  allowCardEditAction = true,
 }: UseArtifactCardPropsProviderProps): ArtifactCardPropsProvider => {
   const getTestId = useTestIdGenerator(dataTestSubj);
   const toasts = useToasts();
@@ -59,28 +63,35 @@ export const useArtifactCardPropsProvider = ({
     // Casting `listItems` below to remove the `Immutable<>` from it in order to prevent errors
     // with common component's props
     for (const artifactItem of items as ExceptionListItemSchema[]) {
+      const cardActions: ArtifactEntryCardProps['actions'] = [];
+
+      if (allowCardEditAction) {
+        cardActions.push({
+          icon: 'controlsHorizontal',
+          onClick: () => {
+            onAction({ type: 'edit', item: artifactItem });
+          },
+          'data-test-subj': getTestId('cardEditAction'),
+          children: cardActionEditLabel,
+        });
+      }
+
+      if (allowCardDeleteAction) {
+        cardActions.push({
+          icon: 'trash',
+          onClick: () => {
+            onAction({ type: 'delete', item: artifactItem });
+          },
+          'data-test-subj': getTestId('cardDeleteAction'),
+          children: cardActionDeleteLabel,
+        });
+      }
+
       cachedCardProps[artifactItem.id] = {
         item: artifactItem as AnyArtifact,
         policies,
         'data-test-subj': dataTestSubj,
-        actions: [
-          {
-            icon: 'controlsHorizontal',
-            onClick: () => {
-              onAction({ type: 'edit', item: artifactItem });
-            },
-            'data-test-subj': getTestId('cardEditAction'),
-            children: cardActionEditLabel,
-          },
-          {
-            icon: 'trash',
-            onClick: () => {
-              onAction({ type: 'delete', item: artifactItem });
-            },
-            'data-test-subj': getTestId('cardDeleteAction'),
-            children: cardActionDeleteLabel,
-          },
-        ],
+        actions: cardActions.length > 0 ? cardActions : undefined,
         hideDescription: !artifactItem.description,
         hideComments: !artifactItem.comments.length,
       };
@@ -89,12 +100,14 @@ export const useArtifactCardPropsProvider = ({
     return cachedCardProps;
   }, [
     items,
+    allowCardEditAction,
+    allowCardDeleteAction,
     policies,
     dataTestSubj,
     getTestId,
     cardActionEditLabel,
-    cardActionDeleteLabel,
     onAction,
+    cardActionDeleteLabel,
   ]);
 
   return useCallback(
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_is_flyout_opened.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_is_flyout_opened.ts
index d6e66dd972525..79200349a8500 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_is_flyout_opened.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_is_flyout_opened.ts
@@ -11,7 +11,19 @@ import { ArtifactListPageUrlParams } from '../types';
 
 const SHOW_VALUES: readonly string[] = ['create', 'edit'];
 
-export const useIsFlyoutOpened = (): boolean => {
+export const useIsFlyoutOpened = (
+  allowEdit: boolean = true,
+  allowCreate: boolean = true
+): boolean => {
   const showUrlParamValue = useUrlParams<ArtifactListPageUrlParams>().urlParams.show ?? '';
-  return useMemo(() => SHOW_VALUES.includes(showUrlParamValue), [showUrlParamValue]);
+  return useMemo(() => {
+    if (SHOW_VALUES.includes(showUrlParamValue)) {
+      return (
+        (showUrlParamValue === 'create' && allowCreate) ||
+        (showUrlParamValue === 'edit' && allowEdit)
+      );
+    }
+
+    return false;
+  }, [allowCreate, allowEdit, showUrlParamValue]);
 };
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts
index df47472861a59..73e5a9d66a15d 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts
@@ -8,7 +8,7 @@
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { i18n } from '@kbn/i18n';
 import { useMemo } from 'react';
-import type { HttpFetchError } from 'kibana/public';
+import type { HttpFetchError } from '@kbn/core/public';
 import { useToasts } from '../../../../common/lib/kibana';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { useDeleteArtifact } from '../../../hooks/artifacts';
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts
index b1742c761ba49..c0a292ea54fb2 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts
@@ -10,16 +10,14 @@ import { Pagination } from '@elastic/eui';
 import { useQuery } from 'react-query';
 import type { ServerApiError } from '../../../../common/types';
 import { useIsMounted } from '../../hooks/use_is_mounted';
-import {
-  MANAGEMENT_DEFAULT_PAGE_SIZE,
-  MANAGEMENT_PAGE_SIZE_OPTIONS,
-} from '../../../common/constants';
+import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../../common/constants';
 import { useUrlParams } from '../../hooks/use_url_params';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { ArtifactListPageUrlParams } from '../types';
 import { MaybeImmutable } from '../../../../../common/endpoint/types';
 import { useKueryFromExceptionsSearchFilter } from './use_kuery_from_exceptions_search_filter';
 import { useListArtifact } from '../../../hooks/artifacts';
+import { useUrlPagination } from '../../hooks/use_url_pagination';
 
 type WithArtifactListDataInterface = ReturnType<typeof useListArtifact> & {
   /**
@@ -46,9 +44,13 @@ export const useWithArtifactListData = (
   const isMounted = useIsMounted();
 
   const {
-    urlParams: { page = 1, pageSize = MANAGEMENT_DEFAULT_PAGE_SIZE, filter, includedPolicies },
+    urlParams: { filter, includedPolicies },
   } = useUrlParams<ArtifactListPageUrlParams>();
 
+  const {
+    pagination: { page, pageSize },
+  } = useUrlPagination();
+
   // Used to determine if the `does data exist` check should be done.
   const kuery = useKueryFromExceptionsSearchFilter(filter, searchableFields, includedPolicies);
 
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/mocks.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/mocks.tsx
index 3cf1874f8d551..ebf98c64d7dc4 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/mocks.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/mocks.tsx
@@ -14,7 +14,7 @@ import { ArtifactFormComponentProps } from './types';
 import { ArtifactListPage, ArtifactListPageProps } from './artifact_list_page';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../common/mock/endpoint';
 import { trustedAppsAllHttpMocks } from '../../pages/mocks';
-import { TrustedAppsApiClient } from '../../pages/trusted_apps/service/trusted_apps_api_client';
+import { TrustedAppsApiClient } from '../../pages/trusted_apps/service/api_client';
 import { artifactListPageLabels } from './translations';
 
 export const getFormComponentMock = (): {
@@ -68,6 +68,34 @@ export const getDeferred = function <T = void>(): DeferredInterface<T> {
   return { promise, resolve, reject };
 };
 
+export const getFirstCard = async (
+  renderResult: ReturnType<AppContextTestRender['render']>,
+  {
+    showActions = false,
+    testId = 'testPage',
+  }: Partial<{ showActions: boolean; testId: string }> = {}
+): Promise<HTMLElement> => {
+  const cards = await renderResult.findAllByTestId(`${testId}-card`);
+
+  if (cards.length === 0) {
+    throw new Error('No cards found!');
+  }
+
+  const card = cards[0];
+
+  if (showActions) {
+    await act(async () => {
+      userEvent.click(within(card).getByTestId(`${testId}-card-header-actions-button`));
+
+      await waitFor(() => {
+        expect(renderResult.getByTestId(`${testId}-card-header-actions-contextMenuPanel`));
+      });
+    });
+  }
+
+  return card;
+};
+
 export interface ArtifactListPageRenderingSetup {
   renderArtifactListPage: (
     props?: Partial<ArtifactListPageProps>
@@ -112,28 +140,8 @@ export const getArtifactListPageRenderingSetup = (): ArtifactListPageRenderingSe
     return renderResult;
   };
 
-  const getFirstCard = async ({
-    showActions = false,
-  }: Partial<{ showActions: boolean }> = {}): Promise<HTMLElement> => {
-    const cards = await renderResult.findAllByTestId('testPage-card');
-
-    if (cards.length === 0) {
-      throw new Error('No cards found!');
-    }
-
-    const card = cards[0];
-
-    if (showActions) {
-      await act(async () => {
-        userEvent.click(within(card).getByTestId('testPage-card-header-actions-button'));
-
-        await waitFor(() => {
-          expect(renderResult.getByTestId('testPage-card-header-actions-contextMenuPanel'));
-        });
-      });
-    }
-
-    return card;
+  const getCard: ArtifactListPageRenderingSetup['getFirstCard'] = (props) => {
+    return getFirstCard(renderResult, props);
   };
 
   return {
@@ -143,6 +151,6 @@ export const getArtifactListPageRenderingSetup = (): ArtifactListPageRenderingSe
     mockedApi,
     FormComponentMock,
     getLastFormComponentProps,
-    getFirstCard,
+    getFirstCard: getCard,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts
index d8a5e316d2b7d..ae0007f1aa86b 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import type {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
@@ -13,6 +13,7 @@ import type {
 import { PolicyData } from '../../../../common/endpoint/types';
 
 export interface ArtifactListPageUrlParams {
+  /** The page number for the list. Must be 1 based. */
   page?: number;
   pageSize?: number;
   filter?: string;
diff --git a/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx b/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx
index 81f3cc5fa3737..c9f62001035ea 100644
--- a/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx
@@ -13,7 +13,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import styled from 'styled-components';
-import { NavigateToAppOptions } from 'kibana/public';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import { useNavigateToAppEventHandler } from '../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import { useTestIdGenerator } from '../hooks/use_test_id_generator';
 
diff --git a/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.tsx b/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.tsx
index ee2d274704408..aba5c69189c92 100644
--- a/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.tsx
@@ -88,6 +88,7 @@ export type EffectedPolicySelectProps = Omit<
   description?: string;
   onChange: (selection: EffectedPolicySelection) => void;
   selected?: PolicyData[];
+  disabled?: boolean;
 };
 export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
   ({
@@ -99,6 +100,7 @@ export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
     listProps,
     options,
     selected = [],
+    disabled = false,
     'data-test-subj': dataTestSubj,
     ...otherSelectableProps
   }) => {
@@ -140,7 +142,7 @@ export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
               id={htmlIdGenerator()()}
               onChange={NOOP}
               checked={isPolicySelected.has(policy.id)}
-              disabled={isGlobal || !isPlatinumPlus}
+              disabled={isGlobal || !isPlatinumPlus || disabled}
               data-test-subj={`policy-${policy.id}-checkbox`}
             />
           ),
@@ -158,11 +160,11 @@ export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
           ),
           policy,
           checked: isPolicySelected.has(policy.id) ? 'on' : undefined,
-          disabled: isGlobal || !isPlatinumPlus,
+          disabled: isGlobal || !isPlatinumPlus || disabled,
           'data-test-subj': `policy-${policy.id}`,
         }))
         .sort(({ label: labelA }, { label: labelB }) => labelA.localeCompare(labelB));
-    }, [getAppUrl, isGlobal, isPlatinumPlus, options, selected]);
+    }, [disabled, getAppUrl, isGlobal, isPlatinumPlus, options, selected]);
 
     const handleOnPolicySelectChange = useCallback<
       Required<EuiSelectableProps<OptionPolicyData>>['onChange']
@@ -223,7 +225,7 @@ export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
             </EuiText>
           </EuiFlexItem>
           <StyledEuiFlexItemButtonGroup grow={1}>
-            <EuiFormRow fullWidth>
+            <EuiFormRow fullWidth isDisabled={disabled}>
               <StyledButtonGroup
                 legend="Global Policy Toggle"
                 options={toggleGlobal}
@@ -231,6 +233,7 @@ export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
                 onChange={handleGlobalButtonChange}
                 color="primary"
                 data-test-subj={getTestId('byPolicyGlobalButtonGroup')}
+                isDisabled={disabled}
               />
             </EuiFormRow>
           </StyledEuiFlexItemButtonGroup>
diff --git a/x-pack/plugins/security_solution/public/management/components/effected_policy_select/test_utils.ts b/x-pack/plugins/security_solution/public/management/components/effected_policy_select/test_utils.ts
index 4461dd504a7d6..5fec52f0c90c4 100644
--- a/x-pack/plugins/security_solution/public/management/components/effected_policy_select/test_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/components/effected_policy_select/test_utils.ts
@@ -5,6 +5,9 @@
  * 2.0.
  */
 
+import userEvent from '@testing-library/user-event';
+import { AppContextTestRender } from '../../../common/mock/endpoint';
+
 /**
  * Forces the `offsetWidth` of `HTMLElement` to a given value. Needed due to the use of
  * `react-virtualized-auto-sizer` by the eui `Selectable` component
@@ -42,3 +45,51 @@ export const forceHTMLElementOffsetWidth = (width: number = 100): (() => void) =
     }
   };
 };
+
+/**
+ * Clicks on a policy being displayed when `per policy` is selected.
+ * NOTE: ensure that per-policy is selected first. This utility will
+ * not do that.
+ * @param renderResult
+ * @param [atIndex=0]
+ */
+export const clickOnEffectedPolicy = async (
+  renderResult: ReturnType<AppContextTestRender['render']>,
+  atIndex: number = 0
+): Promise<Element> => {
+  const policiesHolderElement = await renderResult.findByTestId(
+    'effectedPolicies-select-policiesSelectable'
+  );
+  const policyElements = policiesHolderElement.querySelectorAll('li.euiSelectableListItem');
+  const item = policyElements.item(atIndex);
+
+  if (item) {
+    userEvent.click(item);
+  }
+
+  return item;
+};
+
+/**
+ * Returns true or false as to whether an effect policy at a given index in the list is selected or not
+ * @param renderResult
+ * @param atIndex
+ */
+export const isEffectedPolicySelected = async (
+  renderResult: ReturnType<AppContextTestRender['render']>,
+  atIndex: number = 0
+): Promise<boolean> => {
+  const policiesHolderElement = await renderResult.findByTestId(
+    'effectedPolicies-select-policiesSelectable'
+  );
+  const policyElements = policiesHolderElement.querySelectorAll<HTMLLIElement>(
+    'li.euiSelectableListItem'
+  );
+  const item = policyElements.item(atIndex);
+
+  if (!item) {
+    throw new Error(`No policy found in EffectedPolicySelect at index position ${atIndex}`);
+  }
+
+  return item.dataset.testSelected === 'true';
+};
diff --git a/x-pack/plugins/security_solution/public/management/components/formatted_error/formatted_error.test.tsx b/x-pack/plugins/security_solution/public/management/components/formatted_error/formatted_error.test.tsx
new file mode 100644
index 0000000000000..bea883a9762e1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/formatted_error/formatted_error.test.tsx
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { AppContextTestRender, createAppRootMockRenderer } from '../../../common/mock/endpoint';
+import { FormattedError } from './formatted_error';
+import React from 'react';
+import type { HttpFetchError } from '@kbn/core/public';
+
+describe('When using the `FormattedError` component', () => {
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let error: Error;
+
+  beforeEach(() => {
+    const mockedContext = createAppRootMockRenderer();
+
+    render = () =>
+      (renderResult = mockedContext.render(<FormattedError error={error} data-test-subj="test" />));
+    error = new Error('foo');
+  });
+
+  it('should display the error message for normal errors', () => {
+    render();
+
+    expect(renderResult.getByTestId('test').textContent).toEqual('foo');
+  });
+
+  it('should display status code, message and API response body for HttpFetchError', () => {
+    const httpError = new Error('api foo') as HttpFetchError;
+    Object.assign(httpError, {
+      name: 'foo',
+      req: {} as Request,
+      res: {} as Response,
+      response: {
+        status: '400',
+        statusText: 'some 400 error',
+      } as unknown as Response,
+      body: { message: 'something bad happen', at: 'some place' },
+    });
+    error = httpError;
+    render();
+
+    expect(renderResult.getByTestId('test').textContent).toEqual(
+      '400: some 400 errormessage: something bad happenat: some place'
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/components/formatted_error/formatted_error.tsx b/x-pack/plugins/security_solution/public/management/components/formatted_error/formatted_error.tsx
new file mode 100644
index 0000000000000..805a824437ea0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/formatted_error/formatted_error.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useMemo } from 'react';
+import { EuiText } from '@elastic/eui';
+import type { HttpFetchError } from '@kbn/core/public';
+
+const isHttpFetchError = (error: Error | HttpFetchError): error is HttpFetchError => {
+  return 'body' in error && 'req' in error && 'res' in error && 'response' in error;
+};
+
+export interface ObjectContentProps {
+  data: object;
+}
+
+export const ObjectContent = memo<ObjectContentProps>(({ data }) => {
+  return (
+    <EuiText size="s">
+      {Object.entries(data).map(([key, value]) => {
+        return (
+          <div key={key} className="eui-textBreakAll">
+            <strong>{key}</strong>
+            {': '}
+            {value}
+          </div>
+        );
+      })}
+    </EuiText>
+  );
+});
+ObjectContent.displayName = 'ObjectContent';
+
+export interface FormattedErrorProps {
+  error: Error;
+  'data-test-subj'?: string;
+}
+
+/**
+ * A general component for formatting errors. Recognizes different types of errors and displays
+ * their information.
+ */
+export const FormattedError = memo<FormattedErrorProps>(
+  ({ error, 'data-test-subj': dataTestSubj }) => {
+    return useMemo(() => {
+      let content: JSX.Element = <>{error.message}</>;
+
+      if (isHttpFetchError(error)) {
+        content = (
+          <>
+            <div>{`${error.response?.status}: ${error.response?.statusText}`}</div>
+            {error.body && <ObjectContent data={error.body} />}
+          </>
+        );
+      }
+
+      return <EuiText data-test-subj={dataTestSubj}>{content}</EuiText>;
+    }, [dataTestSubj, error]);
+  }
+);
+FormattedError.displayName = 'FormattedError';
diff --git a/x-pack/plugins/security_solution/public/management/components/formatted_error/index.ts b/x-pack/plugins/security_solution/public/management/components/formatted_error/index.ts
new file mode 100644
index 0000000000000..3ce35b378deef
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/formatted_error/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { FormattedError } from './formatted_error';
diff --git a/x-pack/plugins/security_solution/public/management/components/no_permissons/index.ts b/x-pack/plugins/security_solution/public/management/components/no_permissons/index.ts
new file mode 100644
index 0000000000000..25421ba1dcd1a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/no_permissons/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { NoPermissions } from './no_permissions';
diff --git a/x-pack/plugins/security_solution/public/management/components/no_permissons/no_permissions.tsx b/x-pack/plugins/security_solution/public/management/components/no_permissons/no_permissions.tsx
new file mode 100644
index 0000000000000..87a5b5cf7142b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/no_permissons/no_permissions.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+export const NoPermissions = memo(() => {
+  return (
+    <>
+      <EuiEmptyPrompt
+        iconType="alert"
+        iconColor="danger"
+        titleSize="l"
+        data-test-subj="noIngestPermissions"
+        title={
+          <FormattedMessage
+            id="xpack.securitySolution.endpointManagemnet.noPermissionsText"
+            defaultMessage="You do not have the required Kibana permissions to use Elastic Security Administration"
+          />
+        }
+        body={
+          <EuiText color="subdued">
+            <FormattedMessage
+              id="xpack.securitySolution.endpointManagement.noPermissionsSubText"
+              defaultMessage="You must have the superuser role to use this feature. If you do not have the superuser role and do not have permissions to edit user roles, contact your Kibana administrator."
+            />
+          </EuiText>
+        }
+      />
+    </>
+  );
+});
+NoPermissions.displayName = 'NoPermissions';
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx
index a27a0e949835a..63e5871f67f7f 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useBulkDeleteArtifact } from './use_bulk_delete_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Bulk delete artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx
index 9957ff27d4bf9..994ed4f466d00 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import pMap from 'p-map';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx
index 7309979266e2c..973955135c0f6 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useBulkUpdateArtifact } from './use_bulk_update_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Bulk update artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx
index b4854209fa07b..3389b3563577a 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import pMap from 'p-map';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   UpdateExceptionListItemSchema,
   ExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx
index 6bc703939bdf7..9ea5f6aca0201 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCreateArtifact } from './use_create_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Create artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx
index 74aa6752f371c..c1aed4be8005b 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx
@@ -8,7 +8,7 @@ import {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx
index c4195c3a63886..89c04f5e1bb93 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useDeleteArtifact } from './use_delete_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Delete artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx
index e072eecb06130..16568a0766444 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx
index ad66381c8185a..88992960421a9 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useGetArtifact } from './use_get_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderQuery,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('Get artifact hook', () => {
   let result: ReturnType<typeof useGetArtifact>;
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx
index 676c424e1a278..eb80a689e5a0d 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx
index 75387e3d01b1b..300910e5c7afd 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useListArtifact } from './use_list_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   getFakeListId,
   getFakeListDefinition,
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx
index b3e1451218750..68bee6de0113a 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { FoundExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
 import { useMemo } from 'react';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx
index 32c14ece79a78..666587ace1dd0 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useSummaryArtifact } from './use_summary_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   getFakeListId,
   getFakeListDefinition,
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx
index b92929f10503f..62e5372dc39aa 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ExceptionListSummarySchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
 import { parsePoliciesAndFilterToKql, parseQueryFilterToKQL } from '../../common/utils';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
@@ -28,7 +28,7 @@ export function useSummaryArtifact(
   const { filter = '', policies = [] } = options;
 
   return useQuery<ExceptionListSummarySchema, HttpFetchError>(
-    ['summary', exceptionListApiClient, options],
+    ['summary', exceptionListApiClient, filter, policies],
     () => {
       return exceptionListApiClient.summary(
         parsePoliciesAndFilterToKql({
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx
index 3673114041552..d545216354b4e 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useUpdateArtifact } from './use_update_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Update artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx
index 54acea6489574..92da096f71e66 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx
@@ -8,7 +8,7 @@ import {
   UpdateExceptionListItemSchema,
   ExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx b/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx
index 7d7f999831363..f1818babd8b30 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx
@@ -6,9 +6,9 @@
  */
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { CreateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ReactQueryClientProvider } from '../../common/containers/query_client/query_client_provider';
 
 export const getFakeListId: () => string = () => 'FAKE_LIST_ID';
diff --git a/x-pack/plugins/security_solution/public/management/index.ts b/x-pack/plugins/security_solution/public/management/index.ts
index 4ca8adee5f9a8..2bd23c6cb0a12 100644
--- a/x-pack/plugins/security_solution/public/management/index.ts
+++ b/x-pack/plugins/security_solution/public/management/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { Reducer, CombinedState } from 'redux';
 import { routes } from './routes';
 import { StartPlugins } from '../types';
diff --git a/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts
index 9c02729c68273..b8e3078533b7c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts
@@ -12,7 +12,7 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_BLOCKLISTS_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ConditionEntry } from '../../../../../common/endpoint/types';
 import {
   conditionEntriesToEntries,
diff --git a/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx b/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx
index 3926d42fb36cf..ccb2ec9055fc8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx
@@ -61,7 +61,7 @@ import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
 } from '../../../../../../common/endpoint/service/artifacts/constants';
 import { useLicense } from '../../../../../common/hooks/use_license';
-import { isValidHash } from '../../../../../../common/endpoint/service/trusted_apps/validations';
+import { isValidHash } from '../../../../../../common/endpoint/service/artifacts/validations';
 import { isArtifactGlobal } from '../../../../../../common/endpoint/service/artifacts';
 import type { PolicyData } from '../../../../../../common/endpoint/types';
 import { isGlobalPolicyEffected } from '../../../../components/effected_policy_select/utils';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts
index 969bac811e632..83f643ec6a437 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 import { History, createBrowserHistory } from 'history';
 import { applyMiddleware, Store, createStore } from 'redux';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { AppLocation, MetadataListResponse } from '../../../../../common/endpoint/types';
 import { DepsStartMock, depsStartMock } from '../../../../common/mock/endpoint';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
index ab24e2a41a64e..57cdaca1f2147 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 import { applyMiddleware, createStore, Store } from 'redux';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { History, createBrowserHistory } from 'history';
 import { DepsStartMock, depsStartMock } from '../../../../common/mock/endpoint';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index 2d433a4cdf8c5..af2aa3e87326d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -6,10 +6,10 @@
  */
 
 import type { DataViewBase, Query } from '@kbn/es-query';
-import { CoreStart, HttpStart } from 'kibana/public';
+import { CoreStart, HttpStart } from '@kbn/core/public';
 import { Dispatch } from 'redux';
 import semverGte from 'semver/functions/gte';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../fleet/common';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import {
   BASE_POLICY_RESPONSE_ROUTE,
   ENDPOINT_ACTION_LOG_ROUTE,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
index 3c0d7163ef723..c3975f63aac1e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
@@ -5,7 +5,13 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
+import {
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetPackagesResponse,
+  GetAgentsResponse,
+} from '@kbn/fleet-plugin/common/types/rest_spec';
 import {
   GetHostPolicyResponse,
   HostInfo,
@@ -21,12 +27,6 @@ import {
   INGEST_API_PACKAGE_POLICIES,
   INGEST_API_FLEET_AGENTS,
 } from '../../../services/policies/ingest';
-import {
-  GetAgentPoliciesResponse,
-  GetAgentPoliciesResponseItem,
-  GetPackagesResponse,
-  GetAgentsResponse,
-} from '../../../../../../fleet/common/types/rest_spec';
 import { GetPolicyListResponse } from '../../policy/types';
 import { pendingActionsResponseMock } from '../../../../common/lib/endpoint_pending_actions/mocks';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
index 7757aa7f1329b..67fc0eec6d0a3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
@@ -7,6 +7,7 @@
 
 import { EuiSuperDatePickerRecentRange } from '@elastic/eui';
 import type { DataViewBase } from '@kbn/es-query';
+import { GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import {
   ActivityLog,
   HostInfo,
@@ -20,7 +21,6 @@ import {
   EndpointPendingActions,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
-import { GetPackagesResponse } from '../../../../../fleet/common';
 import { AsyncResourceState } from '../../state';
 import { TRANSFORM_STATES } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
index 00afb94addafb..889c5005ec193 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
@@ -10,10 +10,10 @@ import { useHistory } from 'react-router-dom';
 import { encode, RisonValue } from 'rison-node';
 import styled from 'styled-components';
 import type { Query } from '@kbn/es-query';
-import { TimeHistory } from '../../../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
-import { SearchBar } from '../../../../../../../../../src/plugins/unified_search/public';
-import { Storage } from '../../../../../../../../../src/plugins/kibana_utils/public';
+import { TimeHistory } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { urlFromQueryParams } from '../url_from_query_params';
 import { useEndpointSelector } from '../hooks';
 import * as selectors from '../../store/selectors';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
index 717368a1ff3a0..a0dc4d030277b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
@@ -8,6 +8,7 @@
 import React, { ComponentType } from 'react';
 import moment from 'moment';
 
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   ActivityLog,
   Immutable,
@@ -16,7 +17,6 @@ import {
 import { EndpointDetailsFlyoutTabs } from './components/endpoint_details_tabs';
 import { EndpointActivityLog } from './endpoint_activity_log';
 import { EndpointDetailsFlyout } from '.';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { AsyncResourceState } from '../../../../state';
 
 export const dummyEndpointActivityLog = (
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
index e8fa53e2cf920..5ad2c15366eb0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
@@ -7,6 +7,7 @@
 
 import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { EndpointState } from '../../types';
 import { State } from '../../../../../common/store';
 import {
@@ -14,7 +15,6 @@ import {
   MANAGEMENT_STORE_GLOBAL_NAMESPACE,
 } from '../../../../common/constants';
 import { useAppUrl } from '../../../../../common/lib/kibana';
-import { pagePathGetters } from '../../../../../../../fleet/public';
 
 export function useEndpointSelector<TSelected>(selector: (state: EndpointState) => TSelected) {
   return useSelector(function (state: State) {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
index cbaa6ce4bf56d..2b30d6b4682cb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
@@ -7,8 +7,8 @@
 
 import React, { useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { APP_UI_ID } from '../../../../../../common/constants';
-import { pagePathGetters } from '../../../../../../../fleet/public';
 import { getEndpointDetailsPath } from '../../../../common/routing';
 import { HostMetadata, MaybeImmutable } from '../../../../../../common/endpoint/types';
 import { useEndpointSelector } from './hooks';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index 9e86b0389c19d..39b1c9aecaf65 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import * as reactTestingLibrary from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { EndpointList } from './index';
+import { EndpointList } from '.';
 import '../../../../common/mock/match_media';
 
-import { createUseUiSetting$Mock } from '../../../../../public/common/lib/kibana/kibana_react.mock';
+import { createUseUiSetting$Mock } from '../../../../common/lib/kibana/kibana_react.mock';
 
 import {
   mockEndpointDetailsApiResult,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 441f2502fa3f7..97bae3e150848 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -27,6 +27,12 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { createStructuredSelector } from 'reselect';
 import { useDispatch } from 'react-redux';
+import {
+  CreatePackagePolicyRouteState,
+  AgentPolicyDetailsDeployAgentAction,
+  pagePathGetters,
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { EndpointDetailsFlyout } from './details';
 import * as selectors from '../store/selectors';
 import { useEndpointSelector } from './hooks';
@@ -40,11 +46,6 @@ import { PolicyEmptyState, HostsEmptyState } from '../../../components/managemen
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import { EndpointPolicyLink } from '../../../components/endpoint_policy_link';
-import {
-  CreatePackagePolicyRouteState,
-  AgentPolicyDetailsDeployAgentAction,
-  pagePathGetters,
-} from '../../../../../../fleet/public';
 import { SecurityPageName } from '../../../../app/types';
 import {
   getEndpointListPath,
@@ -57,7 +58,6 @@ import { EndpointAction } from '../store/action';
 import { OutOfDate } from './components/out_of_date';
 import { AdminSearchBar } from './components/search_bar';
 import { AdministrationListPage } from '../../../components/administration_list_page';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { LinkToApp } from '../../../../common/components/endpoint/link_to_app';
 import { TableRowActions } from './components/table_row_actions';
 import { EndpointAgentStatus } from './components/endpoint_agent_status';
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts
index 89cf2f0cbd276..cccb37ebf0af3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts
@@ -6,7 +6,7 @@
  */
 
 import { ENDPOINT_EVENT_FILTERS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { EVENT_FILTER_LIST_DEFINITION } from '../constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts
index a2b0575601123..a1259647ddbe8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import type {
   FoundExceptionListItemSchema,
   ExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts
index 787d8495a3d45..05c00a291c510 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts
@@ -12,7 +12,7 @@ import {
   FoundExceptionListItemSchema,
   UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   EXCEPTION_LIST_ITEM_URL,
   EXCEPTION_LIST_URL,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts
index 45c6ad0d453d9..9ec7e84d693fd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts
@@ -19,7 +19,7 @@ import { initialEventFiltersPageState } from './builders';
 import { getInitialExceptionFromEvent } from './utils';
 import { createdEventFilterEntryMock, ecsEventMock } from '../test_utils';
 import { EventFiltersListPageState, EventFiltersService } from '../types';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { isFailedResourceState, isLoadedResourceState } from '../../../state';
 import { getListFetchError } from './selector';
 import type {
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
index 671479e099a59..fa3a519bc1908 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
@@ -29,7 +29,7 @@ import { ecsEventMock } from '../test_utils';
 import { getInitialExceptionFromEvent } from './utils';
 import { EventFiltersListPageState, EventFiltersPageLocation } from '../types';
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../../common/constants';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   asStaleResourceState,
   createFailedResourceState,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts
index 9f30fcd8ccd2a..398b3d9fa6d37 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts
@@ -12,6 +12,9 @@ import type {
   ExceptionListSummarySchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getSummaryExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_summary_schema.mock';
 import { Ecs } from '../../../../../common/ecs';
 
 import {
@@ -24,9 +27,6 @@ import {
   httpHandlerMockFactory,
   ResponseProvidersInterface,
 } from '../../../../common/mock/endpoint/http_handler_mock_factory';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getSummaryExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_summary_schema.mock';
 
 export const createGlobalNoMiddlewareStore = () => {
   return createStore(
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
index 2c09eed85b191..9e245e5c8214e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
@@ -13,7 +13,7 @@ import {
 import { act } from '@testing-library/react';
 import { fireEvent } from '@testing-library/dom';
 import { EventFilterDeleteModal } from './event_filter_delete_modal';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { showDeleteModal } from '../../store/selector';
 import { isFailedResourceState, isLoadedResourceState } from '../../../../state';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
index b731e404f1230..0ba0a3385dcb6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
@@ -24,7 +24,7 @@ import { getFormEntryState, isUninitialisedForm } from '../../../store/selector'
 import { EventFiltersListPageState } from '../../../types';
 import { useKibana } from '../../../../../../common/lib/kibana';
 import { licenseService } from '../../../../../../common/hooks/use_license';
-import { getExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { of } from 'rxjs';
 
 jest.mock('../../../../../../common/lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
index dc1721d2580e8..f0589099a8077 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { EventFiltersForm } from '.';
 import { RenderResult, act } from '@testing-library/react';
 import { fireEvent, waitFor } from '@testing-library/dom';
-import { stubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { getInitialExceptionFromEvent } from '../../../store/utils';
 import { useFetchIndex } from '../../../../../../common/containers/source';
 import { ecsEventMock } from '../../../test_utils';
@@ -87,6 +87,7 @@ describe('Event filter form', () => {
       services: {
         http: {},
         data: {},
+        unifiedSearch: {},
         notifications: {},
       },
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
index 027d6e2bacfa6..11d1af0a5a2e9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
@@ -27,6 +27,8 @@ import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-t
 import { EVENT_FILTERS_OPERATORS } from '@kbn/securitysolution-list-utils';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
 
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
+import type { OnChangeProps } from '@kbn/lists-plugin/public';
 import { PolicyData } from '../../../../../../../common/endpoint/types';
 import { AddExceptionComments } from '../../../../../../common/components/exceptions/add_exception_comments';
 import { filterIndexPatterns } from '../../../../../../common/components/exceptions/helpers';
@@ -34,8 +36,6 @@ import { Loader } from '../../../../../../common/components/loader';
 import { useKibana } from '../../../../../../common/lib/kibana';
 import { useFetchIndex } from '../../../../../../common/containers/source';
 import { AppAction } from '../../../../../../common/store/actions';
-import { getExceptionBuilderComponentLazy } from '../../../../../../../../lists/public';
-import type { OnChangeProps } from '../../../../../../../../lists/public';
 import { useEventFiltersSelector } from '../../hooks';
 import { getFormEntryStateMutable, getHasNameError, getNewComment } from '../../../store/selector';
 import {
@@ -88,7 +88,7 @@ interface EventFiltersFormProps {
 }
 export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
   ({ allowSelectOs = false, policies, arePoliciesLoading }) => {
-    const { http, data } = useKibana().services;
+    const { http, unifiedSearch } = useKibana().services;
 
     const dispatch = useDispatch<Dispatch<AppAction>>();
     const exception = useEventFiltersSelector(getFormEntryStateMutable);
@@ -225,7 +225,7 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
         getExceptionBuilderComponentLazy({
           allowLargeValueLists: false,
           httpService: http,
-          autocompleteService: data.autocomplete,
+          autocompleteService: unifiedSearch.autocomplete,
           exceptionListItems: [exception as ExceptionListItemSchema],
           listType: EVENT_FILTER_LIST_TYPE,
           listId: ENDPOINT_EVENT_FILTERS_LIST_ID,
@@ -243,7 +243,7 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
           operatorsList: EVENT_FILTERS_OPERATORS,
           osTypes: exception?.os_types,
         }),
-      [data, handleOnBuilderChange, http, indexPatterns, exception]
+      [unifiedSearch, handleOnBuilderChange, http, indexPatterns, exception]
     );
 
     const nameInputMemo = useMemo(
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
index 82fe231505ad5..7643125c587e7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { renderHook, act } from '@testing-library/react-hooks';
 
-import { NotificationsStart } from 'kibana/public';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public/context';
+import { NotificationsStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public/context';
 import type {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/constants.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/constants.ts
index 9fe60fe6508be..9425a6c8f7aea 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/constants.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/constants.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 import {
-  ExceptionListType,
   ExceptionListTypeEnum,
   CreateExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
@@ -22,13 +21,10 @@ export const SEARCHABLE_FIELDS: Readonly<string[]> = [
   `entries.value`,
 ];
 
-export const HOST_ISOLATION_EXCEPTIONS_LIST_TYPE: ExceptionListType =
-  ExceptionListTypeEnum.ENDPOINT_HOST_ISOLATION_EXCEPTIONS;
-
 export const HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION: CreateExceptionListSchema = {
   name: ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_NAME,
   namespace_type: 'agnostic',
   description: ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_DESCRIPTION,
   list_id: ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
-  type: HOST_ISOLATION_EXCEPTIONS_LIST_TYPE,
+  type: ExceptionListTypeEnum.ENDPOINT_HOST_ISOLATION_EXCEPTIONS,
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts
index 7e711732fa6f3..cdb5b35be03fd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts
@@ -6,7 +6,7 @@
  */
 
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from './constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
deleted file mode 100644
index 6fd0b77abfffc..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  CreateExceptionListItemSchema,
-  ExceptionListItemSchema,
-  ExceptionListSummarySchema,
-  FoundExceptionListItemSchema,
-  UpdateExceptionListItemSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
-import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { transformNewItemOutput, transformOutput } from '@kbn/securitysolution-list-hooks';
-import { HttpStart } from 'kibana/public';
-import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '../event_filters/constants';
-import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from './constants';
-
-async function createHostIsolationExceptionList(http: HttpStart): Promise<void> {
-  try {
-    await http.post<ExceptionListItemSchema>(EXCEPTION_LIST_URL, {
-      body: JSON.stringify(HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION),
-    });
-  } catch (err) {
-    // Ignore 409 errors. List already created
-    if (err.response?.status !== 409) {
-      throw err;
-    }
-  }
-}
-
-let listExistsPromise: Promise<void>;
-async function ensureHostIsolationExceptionsListExists(http: HttpStart): Promise<void> {
-  if (!listExistsPromise) {
-    listExistsPromise = createHostIsolationExceptionList(http);
-  }
-  await listExistsPromise;
-}
-
-export async function getHostIsolationExceptionItems({
-  http,
-  perPage,
-  page,
-  sortField = 'created_at',
-  sortOrder = 'desc',
-  filter,
-}: {
-  http: HttpStart;
-  page?: number;
-  perPage?: number;
-  sortField?: keyof ExceptionListItemSchema;
-  sortOrder?: 'asc' | 'desc';
-  filter?: string;
-}): Promise<FoundExceptionListItemSchema> {
-  await ensureHostIsolationExceptionsListExists(http);
-  const entries: FoundExceptionListItemSchema = await http.get(`${EXCEPTION_LIST_ITEM_URL}/_find`, {
-    query: {
-      list_id: [ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID],
-      namespace_type: ['agnostic'],
-      page,
-      per_page: perPage,
-      sort_field: sortField,
-      sort_order: sortOrder,
-      filter,
-    },
-  });
-  return entries;
-}
-
-export async function createHostIsolationExceptionItem(
-  http: HttpStart,
-  exception: CreateExceptionListItemSchema
-): Promise<ExceptionListItemSchema> {
-  await ensureHostIsolationExceptionsListExists(http);
-  const entry = transformNewItemOutput(exception);
-  return http.post<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-    body: JSON.stringify(entry),
-  });
-}
-
-export async function deleteOneHostIsolationExceptionItem(http: HttpStart, id: string) {
-  await ensureHostIsolationExceptionsListExists(http);
-  return http.delete<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-    query: {
-      id,
-      namespace_type: 'agnostic',
-    },
-  });
-}
-
-export async function getOneHostIsolationExceptionItem(
-  http: HttpStart,
-  id: string
-): Promise<UpdateExceptionListItemSchema> {
-  await ensureHostIsolationExceptionsListExists(http);
-  return http.get<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-    query: {
-      id,
-      namespace_type: 'agnostic',
-    },
-  });
-}
-
-export async function updateOneHostIsolationExceptionItem(
-  http: HttpStart,
-  exception: UpdateExceptionListItemSchema
-): Promise<ExceptionListItemSchema> {
-  await ensureHostIsolationExceptionsListExists(http);
-  const entry = transformOutput(exception);
-
-  // Clean unnecessary fields for update action
-  const fieldsToRemove: Array<keyof ExceptionListItemSchema> = [
-    'created_at',
-    'created_by',
-    'created_at',
-    'created_by',
-    'list_id',
-    'tie_breaker_id',
-    'updated_at',
-    'updated_by',
-  ];
-
-  fieldsToRemove.forEach((field) => {
-    delete entry[field as keyof UpdateExceptionListItemSchema];
-  });
-  return http.put<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-    body: JSON.stringify(entry),
-  });
-}
-export async function getHostIsolationExceptionSummary(
-  http: HttpStart,
-  filter?: string
-): Promise<ExceptionListSummarySchema> {
-  return http.get<ExceptionListSummarySchema>(`${EXCEPTION_LIST_URL}/summary`, {
-    query: {
-      filter,
-      list_id: ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
-      namespace_type: 'agnostic',
-    },
-  });
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/builders.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/builders.ts
deleted file mode 100644
index d8d71da41f7d2..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/builders.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../../common/constants';
-import { HostIsolationExceptionsPageState } from '../types';
-
-export const initialHostIsolationExceptionsPageState = (): HostIsolationExceptionsPageState => ({
-  location: {
-    page_index: MANAGEMENT_DEFAULT_PAGE,
-    page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
-    filter: '',
-    included_policies: '',
-  },
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.test.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.test.ts
deleted file mode 100644
index 56529025ed086..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { UserChangedUrl } from '../../../../common/store/routing/action';
-import { HostIsolationExceptionsPageState } from '../types';
-import { initialHostIsolationExceptionsPageState } from './builders';
-import { HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../../../common/constants';
-import { hostIsolationExceptionsPageReducer } from './reducer';
-import { getCurrentLocation } from './selector';
-
-describe('Host isolation exceptions Reducer', () => {
-  let initialState: HostIsolationExceptionsPageState;
-
-  beforeEach(() => {
-    initialState = initialHostIsolationExceptionsPageState();
-  });
-
-  describe('UserChangedUrl', () => {
-    const userChangedUrlAction = (
-      search = '',
-      pathname = HOST_ISOLATION_EXCEPTIONS_PATH
-    ): UserChangedUrl => ({
-      type: 'userChangedUrl',
-      payload: { search, pathname, hash: '' },
-    });
-
-    describe('When the url is set to host isolation exceptions', () => {
-      it('should set the default page size and index', () => {
-        const result = hostIsolationExceptionsPageReducer(initialState, userChangedUrlAction());
-        expect(getCurrentLocation(result)).toEqual({
-          filter: '',
-          id: undefined,
-          included_policies: '',
-          page_index: 0,
-          page_size: 10,
-          show: undefined,
-        });
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.ts
deleted file mode 100644
index e5dcdbac0d881..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// eslint-disable-next-line import/no-nodejs-modules
-import { parse } from 'querystring';
-import { matchPath } from 'react-router-dom';
-import { ImmutableReducer } from '../../../../common/store';
-import { AppAction } from '../../../../common/store/actions';
-import { AppLocation, Immutable } from '../../../../../common/endpoint/types';
-import { extractHostIsolationExceptionsPageLocation } from '../../../common/routing';
-import { HostIsolationExceptionsPageState } from '../types';
-import { initialHostIsolationExceptionsPageState } from './builders';
-import { MANAGEMENT_ROUTING_HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../common/constants';
-
-type StateReducer = ImmutableReducer<HostIsolationExceptionsPageState, AppAction>;
-const isHostIsolationExceptionsPageLocation = (location: Immutable<AppLocation>) => {
-  return (
-    matchPath(location.pathname ?? '', {
-      path: MANAGEMENT_ROUTING_HOST_ISOLATION_EXCEPTIONS_PATH,
-      exact: true,
-    }) !== null
-  );
-};
-
-export const hostIsolationExceptionsPageReducer: StateReducer = (
-  state = initialHostIsolationExceptionsPageState(),
-  action
-) => {
-  if (action.type === 'userChangedUrl' && isHostIsolationExceptionsPageLocation(action.payload)) {
-    const location = extractHostIsolationExceptionsPageLocation(
-      parse(action.payload.search.slice(1))
-    );
-    return {
-      ...state,
-      location,
-    };
-  }
-  return state;
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.ts
deleted file mode 100644
index f4531faa646e8..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Immutable } from '../../../../../common/endpoint/types';
-import { HostIsolationExceptionsPageState } from '../types';
-
-type StoreState = Immutable<HostIsolationExceptionsPageState>;
-type HostIsolationExceptionsSelector<T> = (state: StoreState) => T;
-
-export const getCurrentLocation: HostIsolationExceptionsSelector<StoreState['location']> = (
-  state
-) => state.location;
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.ts
deleted file mode 100644
index a70e6dc6f2e1e..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export interface HostIsolationExceptionsPageLocation {
-  page_index: number;
-  page_size: number;
-  show?: 'create' | 'edit';
-  /** Used for editing. The ID of the selected event filter */
-  id?: string;
-  filter: string;
-  // A string with comma dlimetered list of included policy IDs
-  included_policies: string;
-}
-
-export interface HostIsolationExceptionsPageState {
-  location: HostIsolationExceptionsPageLocation;
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/utils.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/utils.ts
deleted file mode 100644
index 33765addfd329..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/utils.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
-
-export function createEmptyHostIsolationException(): CreateExceptionListItemSchema {
-  return {
-    comments: [],
-    description: '',
-    entries: [
-      {
-        field: 'destination.ip',
-        operator: 'included',
-        type: 'match',
-        value: '',
-      },
-    ],
-    item_id: undefined,
-    list_id: ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
-    name: '',
-    namespace_type: 'agnostic',
-    os_types: ['windows', 'linux', 'macos'],
-    tags: ['policy:all'],
-    type: 'simple',
-  };
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
deleted file mode 100644
index 0477e8fa5055d..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { waitFor } from '@testing-library/dom';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import uuid from 'uuid';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import {
-  AppContextTestRender,
-  createAppRootMockRenderer,
-} from '../../../../../common/mock/endpoint';
-import { deleteOneHostIsolationExceptionItem } from '../../service';
-import { HostIsolationExceptionDeleteModal } from './delete_modal';
-
-jest.mock('../../service');
-const deleteOneHostIsolationExceptionItemMock = deleteOneHostIsolationExceptionItem as jest.Mock;
-
-describe('When on the host isolation exceptions delete modal', () => {
-  let render: () => ReturnType<AppContextTestRender['render']>;
-  let renderResult: ReturnType<typeof render>;
-  let coreStart: AppContextTestRender['coreStart'];
-  let onCancel: (forceRefresh?: boolean) => void;
-  let itemToDelete: ExceptionListItemSchema;
-
-  beforeEach(() => {
-    const mockedContext = createAppRootMockRenderer();
-    itemToDelete = getExceptionListItemSchemaMock();
-    deleteOneHostIsolationExceptionItemMock.mockReset();
-    onCancel = jest.fn();
-    render = () =>
-      (renderResult = mockedContext.render(
-        <HostIsolationExceptionDeleteModal item={itemToDelete} onCancel={onCancel} />
-      ));
-    ({ coreStart } = mockedContext);
-  });
-
-  it('should render the delete modal with the cancel and submit buttons', () => {
-    render();
-    expect(renderResult.getByTestId('hostIsolationExceptionsDeleteModalCancelButton')).toBeTruthy();
-    expect(
-      renderResult.getByTestId('hostIsolationExceptionsDeleteModalConfirmButton')
-    ).toBeTruthy();
-  });
-
-  it.each(['all', '0', '1', '2', '5'])(
-    'should display a warning banner with how many policies (%s) will be affected. skipping non-policy-tags',
-    (amount) => {
-      if (amount === 'all') {
-        itemToDelete.tags = ['policy:all', 'non-policy-tag'];
-      } else {
-        itemToDelete.tags = [
-          ...Array.from({ length: +amount }, (_) => `policy:${uuid.v4()}`),
-          'non-policy-tag',
-        ];
-      }
-      render();
-      expect(
-        renderResult.getByTestId('hostIsolationExceptionsDeleteModalCalloutMessage')
-      ).toHaveTextContent(`Deleting this entry will remove it from ${amount} associated`);
-    }
-  );
-
-  it('should disable the buttons when confirm is pressed and show loading', async () => {
-    render();
-
-    // fake a delay on a response
-    deleteOneHostIsolationExceptionItemMock.mockImplementationOnce(() => {
-      return new Promise((resolve) => {
-        setTimeout(resolve, 300);
-      });
-    });
-
-    const submitButton = renderResult.baseElement.querySelector(
-      '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    ) as HTMLButtonElement;
-
-    const cancelButton = renderResult.baseElement.querySelector(
-      '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    ) as HTMLButtonElement;
-
-    userEvent.click(submitButton);
-
-    // wait for the mock API to be called
-    await waitFor(expect(deleteOneHostIsolationExceptionItemMock).toHaveBeenCalled);
-
-    expect(submitButton.disabled).toBe(true);
-    expect(cancelButton.disabled).toBe(true);
-    expect(submitButton.querySelector('.euiLoadingSpinner')).not.toBeNull();
-  });
-
-  it('should call the onCancel callback when cancel is pressed', async () => {
-    render();
-    const cancelButton = renderResult.baseElement.querySelector(
-      '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    ) as HTMLButtonElement;
-
-    userEvent.click(cancelButton);
-    await waitFor(() => {
-      expect(onCancel).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  it('should show success toast after the delete is completed and call onCancel with forceRefresh', async () => {
-    deleteOneHostIsolationExceptionItemMock.mockResolvedValue({});
-    render();
-
-    const submitButton = renderResult.baseElement.querySelector(
-      '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    ) as HTMLButtonElement;
-
-    userEvent.click(submitButton);
-
-    // wait for the mock API to be called
-    await waitFor(expect(deleteOneHostIsolationExceptionItemMock).toHaveBeenCalled);
-
-    expect(coreStart.notifications.toasts.addSuccess).toHaveBeenCalledWith(
-      '"some name" has been removed from the host isolation exceptions list.'
-    );
-    expect(onCancel).toHaveBeenCalledWith(true);
-  });
-
-  it('should show error toast if error is encountered and call onCancel with forceRefresh', async () => {
-    deleteOneHostIsolationExceptionItemMock.mockRejectedValue(
-      new Error("That's not true. That's impossible")
-    );
-    render();
-
-    const submitButton = renderResult.baseElement.querySelector(
-      '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    ) as HTMLButtonElement;
-
-    userEvent.click(submitButton);
-
-    // wait for the mock API to be called
-    await waitFor(expect(deleteOneHostIsolationExceptionItemMock).toHaveBeenCalled);
-
-    expect(coreStart.notifications.toasts.addDanger).toHaveBeenCalledWith(
-      'Unable to remove "some name" from the host isolation exceptions list. Reason: That\'s not true. That\'s impossible'
-    );
-    expect(onCancel).toHaveBeenCalledWith(true);
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.tsx
deleted file mode 100644
index c101f4884825b..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiButtonEmpty,
-  EuiCallOut,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiText,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import React, { memo } from 'react';
-import { useMutation } from 'react-query';
-import { AutoFocusButton } from '../../../../../common/components/autofocus_button/autofocus_button';
-import { useHttp, useToasts } from '../../../../../common/lib/kibana';
-import {
-  getArtifactPoliciesIdByTag,
-  isGlobalPolicyEffected,
-} from '../../../../components/effected_policy_select/utils';
-import { deleteOneHostIsolationExceptionItem } from '../../service';
-
-export const HostIsolationExceptionDeleteModal = memo(
-  ({
-    item,
-    onCancel,
-  }: {
-    item: ExceptionListItemSchema;
-    onCancel: (forceRefresh?: boolean) => void;
-  }) => {
-    const toasts = useToasts();
-    const http = useHttp();
-
-    const mutation = useMutation(
-      () => {
-        return deleteOneHostIsolationExceptionItem(http, item.id);
-      },
-      {
-        onError: (error: Error) => {
-          toasts.addDanger(
-            i18n.translate(
-              'xpack.securitySolution.hostIsolationExceptions.deletionDialog.deleteFailure',
-              {
-                defaultMessage:
-                  'Unable to remove "{name}" from the host isolation exceptions list. Reason: {message}',
-                values: { name: item?.name, message: error.message },
-              }
-            )
-          );
-          onCancel(true);
-        },
-        onSuccess: () => {
-          toasts.addSuccess(
-            i18n.translate(
-              'xpack.securitySolution.hostIsolationExceptions.deletionDialog.deleteSuccess',
-              {
-                defaultMessage:
-                  '"{name}" has been removed from the host isolation exceptions list.',
-                values: { name: item?.name },
-              }
-            )
-          );
-          onCancel(true);
-        },
-      }
-    );
-
-    const handleConfirmButton = () => {
-      mutation.mutate();
-    };
-
-    const handleCancelButton = () => {
-      onCancel();
-    };
-
-    return (
-      <EuiModal onClose={() => onCancel()}>
-        <EuiModalHeader data-test-subj="hostIsolationExceptionsDeleteModalHeader">
-          <EuiModalHeaderTitle>
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.deletionDialog.title"
-              defaultMessage="Delete host isolation exception"
-            />
-          </EuiModalHeaderTitle>
-        </EuiModalHeader>
-
-        <EuiModalBody data-test-subj="hostIsolationExceptionsFilterDeleteModalBody">
-          <EuiText>
-            <EuiCallOut
-              data-test-subj="hostIsolationExceptionsDeleteModalCallout"
-              title={i18n.translate(
-                'xpack.securitySolution.hostIsolationExceptions.deletionDialog.calloutTitle',
-                {
-                  defaultMessage: 'Warning',
-                }
-              )}
-              color="danger"
-              iconType="alert"
-            >
-              <p data-test-subj="hostIsolationExceptionsDeleteModalCalloutMessage">
-                <FormattedMessage
-                  id="xpack.securitySolution.hostIsolationExceptions.deletionDialog.calloutMessage"
-                  defaultMessage="Deleting this entry will remove it from {count} associated {count, plural, one {policy} other {policies}}."
-                  values={{
-                    count: isGlobalPolicyEffected(Array.from(item.tags || []))
-                      ? 'all'
-                      : getArtifactPoliciesIdByTag(item.tags).length,
-                  }}
-                />
-              </p>
-            </EuiCallOut>
-            <p>
-              <FormattedMessage
-                id="xpack.securitySolution.hostIsolationExceptions.deletionDialog.confirmation"
-                defaultMessage="This action cannot be undone. Are you sure you wish to continue?"
-              />
-            </p>
-          </EuiText>
-        </EuiModalBody>
-
-        <EuiModalFooter>
-          <EuiButtonEmpty
-            onClick={handleCancelButton}
-            isDisabled={mutation.isLoading}
-            data-test-subj="hostIsolationExceptionsDeleteModalCancelButton"
-          >
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.deletionDialog.cancel"
-              defaultMessage="Cancel"
-            />
-          </EuiButtonEmpty>
-
-          <AutoFocusButton
-            fill
-            color="danger"
-            onClick={handleConfirmButton}
-            isLoading={mutation.isLoading}
-            data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"
-          >
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.deletionDialog.confirmButton"
-              defaultMessage="Delete"
-            />
-          </AutoFocusButton>
-        </EuiModalFooter>
-      </EuiModal>
-    );
-  }
-);
-
-HostIsolationExceptionDeleteModal.displayName = 'HostIsolationExceptionDeleteModal';
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/empty.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/empty.tsx
deleted file mode 100644
index 605229dc04c53..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/empty.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { memo } from 'react';
-import styled, { css } from 'styled-components';
-import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { ManagementEmptyStateWrapper } from '../../../../components/management_empty_state_wrapper';
-
-const EmptyPrompt = styled(EuiEmptyPrompt)`
-  ${() => css`
-    max-width: 100%;
-  `}
-`;
-
-export const HostIsolationExceptionsEmptyState = memo<{
-  onAdd: () => void;
-  backComponent?: React.ReactNode;
-}>(({ onAdd, backComponent }) => {
-  return (
-    <ManagementEmptyStateWrapper>
-      <EmptyPrompt
-        data-test-subj="hostIsolationExceptionsEmpty"
-        iconType="plusInCircle"
-        title={
-          <h2>
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.listEmpty.title"
-              defaultMessage="Add your first host isolation exception"
-            />
-          </h2>
-        }
-        body={
-          <FormattedMessage
-            id="xpack.securitySolution.hostIsolationExceptions.listEmpty.message"
-            defaultMessage="Add a host isolation exception to allow isolated hosts to communicate with specific IPs."
-          />
-        }
-        actions={[
-          <EuiButton
-            fill
-            onClick={onAdd}
-            data-test-subj="hostIsolationExceptionsEmptyStateAddButton"
-          >
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.listEmpty.addButton"
-              defaultMessage="Add host isolation exception"
-            />
-          </EuiButton>,
-
-          ...(backComponent ? [backComponent] : []),
-        ]}
-      />
-    </ManagementEmptyStateWrapper>
-  );
-});
-
-HostIsolationExceptionsEmptyState.displayName = 'HostIsolationExceptionsEmptyState';
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
index b9ffec3c8bc39..8876c1f5db345 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
@@ -6,52 +6,97 @@
  */
 
 import {
-  CreateExceptionListItemSchema,
-  UpdateExceptionListItemSchema,
+  ExceptionListItemSchema,
+  FoundExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import uuid from 'uuid';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
 } from '../../../../../common/mock/endpoint';
-import { sendGetEndpointSpecificPackagePoliciesMock } from '../../../../services/policies/test_mock_utils';
-import { GetPolicyListResponse } from '../../../policy/types';
-import { createEmptyHostIsolationException } from '../../utils';
-import { HostIsolationExceptionsForm } from './form';
+import { HostIsolationExceptionsList } from '../host_isolation_exceptions_list';
+import { act, waitFor } from '@testing-library/react';
+import { HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../../../../common/constants';
+import {
+  exceptionsListAllHttpMocks,
+  fleetGetEndpointPackagePolicyListHttpMock,
+} from '../../../mocks';
+import {
+  clickOnEffectedPolicy,
+  isEffectedPolicySelected,
+} from '../../../../components/effected_policy_select/test_utils';
+import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../../../common/endpoint/service/artifacts';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
+
+jest.mock('../../../../../common/components/user_privileges');
 
 describe('When on the host isolation exceptions entry form', () => {
-  let render: (
-    exception: CreateExceptionListItemSchema | UpdateExceptionListItemSchema
-  ) => ReturnType<AppContextTestRender['render']>;
-  let renderResult: ReturnType<typeof render>;
-  const onChange = jest.fn();
-  const onError = jest.fn();
-  let policiesRequest: GetPolicyListResponse;
-
-  beforeEach(async () => {
-    onChange.mockReset();
-    onError.mockReset();
-    const mockedContext = createAppRootMockRenderer();
-    policiesRequest = await sendGetEndpointSpecificPackagePoliciesMock();
-    render = (exception) => {
-      return mockedContext.render(
-        <HostIsolationExceptionsForm
-          exception={exception}
-          policies={policiesRequest.items}
-          onChange={onChange}
-          onError={onError}
-        />
-      );
+  let render: () => Promise<ReturnType<AppContextTestRender['render']>>;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let history: AppContextTestRender['history'];
+  let mockedContext: AppContextTestRender;
+  let exceptionsApiMock: ReturnType<typeof exceptionsListAllHttpMocks>;
+  let fleetApiMock: ReturnType<typeof fleetGetEndpointPackagePolicyListHttpMock>;
+
+  const formRowHasError = (testId: string): boolean => {
+    const formRow = renderResult.getByTestId(testId);
+
+    return formRow.querySelector('.euiFormErrorText') !== null;
+  };
+
+  const submitButtonDisabledState = (): boolean => {
+    return (
+      renderResult.getByTestId(
+        'hostIsolationExceptionsListPage-flyout-submitButton'
+      ) as HTMLButtonElement
+    ).disabled;
+  };
+
+  beforeEach(() => {
+    mockedContext = createAppRootMockRenderer();
+    ({ history } = mockedContext);
+    render = async () => {
+      renderResult = mockedContext.render(<HostIsolationExceptionsList />);
+
+      await waitFor(async () => {
+        await expect(
+          renderResult.findAllByTestId('hostIsolationExceptionsListPage-card')
+        ).resolves.toHaveLength(10);
+      });
+
+      await act(async () => {
+        await waitFor(() => {
+          userEvent.click(
+            renderResult.getByTestId('hostIsolationExceptionsListPage-pageAddButton')
+          );
+        });
+      });
+
+      await act(async () => {
+        await waitFor(() => {
+          expect(renderResult.getByTestId('hostIsolationExceptions-form')).toBeTruthy();
+        });
+
+        await waitFor(() => {
+          expect(fleetApiMock.responseProvider.endpointPackagePolicyList).toHaveBeenCalled();
+        });
+      });
+
+      return renderResult;
     };
+
+    exceptionsApiMock = exceptionsListAllHttpMocks(mockedContext.coreStart.http);
+    fleetApiMock = fleetGetEndpointPackagePolicyListHttpMock(mockedContext.coreStart.http);
+
+    act(() => {
+      history.push(HOST_ISOLATION_EXCEPTIONS_PATH);
+    });
   });
 
-  describe('When creating a new exception', () => {
-    let newException: CreateExceptionListItemSchema;
-    beforeEach(() => {
-      newException = createEmptyHostIsolationException();
-      renderResult = render(newException);
+  describe('and creating a new exception', () => {
+    beforeEach(async () => {
+      await render();
     });
 
     it('should render the form with empty inputs', () => {
@@ -63,18 +108,30 @@ describe('When on the host isolation exceptions entry form', () => {
     });
 
     it.each(['not an ip', '100', '900.0.0.1', 'x.x.x.x', '10.0.0'])(
-      'should call onError with true when a wrong ip value is introduced. Case: "%s"',
-      (value: string) => {
+      'should show validation error when a wrong ip value is entered. Case: "%s"',
+      async (value: string) => {
         const nameInput = renderResult.getByTestId('hostIsolationExceptions-form-name-input');
         const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
+
         userEvent.type(nameInput, 'test name');
+
+        await waitFor(() => {
+          expect(submitButtonDisabledState()).toBe(true);
+        });
+
         userEvent.type(ipInput, value);
-        expect(onError).toHaveBeenCalledWith(true);
+        userEvent.tab();
+
+        await waitFor(() =>
+          expect(formRowHasError('hostIsolationExceptions-form-ip-input-formRow')).toBe(true)
+        );
+
+        await waitFor(() => expect(submitButtonDisabledState()).toBe(true));
       }
     );
 
     it.each(['192.168.0.1', '10.0.0.1', '100.90.1.1/24', '192.168.200.6/30'])(
-      'should call onError with false when a correct ip value is introduced. Case: "%s"',
+      'should NOT show validation error when a correct ip value is entered. Case: "%s"',
       (value: string) => {
         const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
         const nameInput = renderResult.getByTestId('hostIsolationExceptions-form-name-input');
@@ -82,106 +139,87 @@ describe('When on the host isolation exceptions entry form', () => {
         userEvent.type(nameInput, 'test name');
         userEvent.type(ipInput, value);
 
-        expect(onError).toHaveBeenLastCalledWith(false);
+        expect(formRowHasError('hostIsolationExceptions-form-ip-input-formRow')).toBe(false);
+        expect(submitButtonDisabledState()).toBe(false);
       }
     );
 
-    it('should call onChange with the partial change when a value is introduced in a field', () => {
-      const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
-      userEvent.type(ipInput, '10.0.0.1');
-      expect(onChange).toHaveBeenLastCalledWith({
-        entries: [
-          { field: 'destination.ip', operator: 'included', type: 'match', value: '10.0.0.1' },
-        ],
-      });
-    });
-
     it('should select the "global" policy by default', () => {
       expect(
         renderResult
           .getByTestId('effectedPolicies-select-global')
           .classList.contains('euiButtonGroupButton-isSelected')
       ).toBe(true);
-      // policy selector should be hidden
-      expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeFalsy();
     });
 
-    it('should display the policy list when "per policy" is selected', () => {
+    it('should show policy as selected when user clicks on it', async () => {
       userEvent.click(renderResult.getByTestId('perPolicy'));
+      await clickOnEffectedPolicy(renderResult);
 
-      // policy selector should show up
-      expect(renderResult.getByTestId('effectedPolicies-select-policiesSelectable')).toBeTruthy();
-    });
-
-    it('should call onChange when a policy is selected from the policy selectiion', () => {
-      const policyId = policiesRequest.items[0].id;
-      userEvent.click(renderResult.getByTestId('perPolicy'));
-      userEvent.click(renderResult.getByTestId(`policy-${policyId}`));
-      expect(onChange).toHaveBeenLastCalledWith({
-        tags: [`policy:${policyId}`],
-      });
+      await expect(isEffectedPolicySelected(renderResult)).resolves.toBe(true);
     });
 
-    it('should retain the previous policy selection when switching from per-policy to global', () => {
-      const policyId = policiesRequest.items[0].id;
-
+    it('should retain the previous policy selection when switching from per-policy to global', async () => {
       // move to per-policy and select the first
       userEvent.click(renderResult.getByTestId('perPolicy'));
-      userEvent.click(renderResult.getByTestId(`policy-${policyId}`));
-      expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeTruthy();
-      expect(onChange).toHaveBeenLastCalledWith({
-        tags: [`policy:${policyId}`],
-      });
+      await clickOnEffectedPolicy(renderResult);
+
+      await expect(isEffectedPolicySelected(renderResult)).resolves.toBe(true);
 
       // move back to global
       userEvent.click(renderResult.getByTestId('globalPolicy'));
+
       expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeFalsy();
-      expect(onChange).toHaveBeenLastCalledWith({
-        tags: [`policy:all`],
-      });
 
       // move back to per-policy
       userEvent.click(renderResult.getByTestId('perPolicy'));
-      // the previous selected policy should be selected
-      expect(renderResult.getByTestId(`policy-${policyId}`)).toHaveAttribute(
-        'data-test-selected',
-        'true'
-      );
-      // on change called with the previous policy
-      expect(onChange).toHaveBeenLastCalledWith({
-        tags: [`policy:${policyId}`],
-      });
+      await expect(isEffectedPolicySelected(renderResult)).resolves.toBe(true);
     });
   });
 
-  /**
-   * NOTE: fewer tests exists for update as the form component
-   * behaves the same for edit and add with the only
-   * difference of having pre-filled fields
-   */
-  describe('When editing an existing exception with global policy', () => {
-    let existingException: UpdateExceptionListItemSchema;
+  describe('and editing an existing exception with global policy', () => {
+    let existingException: ExceptionListItemSchema;
+
     beforeEach(() => {
-      existingException = {
-        ...createEmptyHostIsolationException(),
-        name: 'name edit me',
-        description: 'initial description',
-        id: uuid.v4(),
-        item_id: uuid.v4(),
-        tags: ['policy:all'],
-        entries: [
-          {
-            field: 'destination.ip',
-            operator: 'included',
-            type: 'match',
-            value: '10.0.0.1',
-          },
-        ],
-      };
+      const generateExceptionsFindResponse =
+        exceptionsApiMock.responseProvider.exceptionsFind.getMockImplementation()!;
+
+      exceptionsApiMock.responseProvider.exceptionsFind.mockImplementation((options) => {
+        const response: FoundExceptionListItemSchema = generateExceptionsFindResponse(options);
+
+        Object.assign(response.data[0], {
+          name: 'name edit me',
+          description: 'initial description',
+          item_id: '123-321',
+          tags: ['policy:all'],
+          entries: [
+            {
+              field: 'destination.ip',
+              operator: 'included',
+              type: 'match',
+              value: '10.0.0.1',
+            },
+          ],
+        });
+
+        return response;
+      });
+
+      existingException = exceptionsApiMock.responseProvider.exceptionsFind({
+        query: {},
+      } as HttpFetchOptionsWithPath).data[0];
+
+      exceptionsApiMock.responseProvider.exceptionGetOne.mockImplementation(() => {
+        return existingException;
+      });
+
+      act(() => {
+        history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?itemId=123-321&show=edit`);
+      });
     });
 
-    it('should render the form with pre-filled inputs', () => {
-      renderResult = render(existingException);
+    it('should render the form with pre-filled inputs', async () => {
+      await render();
       expect(renderResult.getByTestId('hostIsolationExceptions-form-name-input')).toHaveValue(
         'name edit me'
       );
@@ -193,59 +231,54 @@ describe('When on the host isolation exceptions entry form', () => {
       ).toHaveValue('initial description');
     });
 
-    it('should call onChange with the partial change when a value is introduced in a field', () => {
-      renderResult = render(existingException);
+    it('should update field with new value', async () => {
+      await render();
       const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
       userEvent.clear(ipInput);
       userEvent.type(ipInput, '10.0.100.1');
-      expect(onChange).toHaveBeenCalledWith({
-        entries: [
-          { field: 'destination.ip', operator: 'included', type: 'match', value: '10.0.100.1' },
-        ],
-      });
+
+      expect(
+        (renderResult.getByTestId('hostIsolationExceptions-form-ip-input') as HTMLInputElement)
+          .value
+      ).toBe('10.0.100.1');
     });
 
-    it('should show global pre-selected', () => {
-      renderResult = render(existingException);
+    it('should show global pre-selected', async () => {
+      await render();
+
       expect(
         renderResult
           .getByTestId('effectedPolicies-select-global')
           .classList.contains('euiButtonGroupButton-isSelected')
       ).toBe(true);
-      // policy selector should be hidden
-      expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeFalsy();
     });
 
-    it('should show pre-selected policies', () => {
-      const policyId1 = policiesRequest.items[0].id;
-      const policyId2 = policiesRequest.items[3].id;
-      existingException.tags = [`policy:${policyId1}`, `policy:${policyId2}`];
+    it('should show pre-selected policies', async () => {
+      const policyApiResponse = fleetApiMock.responseProvider.endpointPackagePolicyList();
+      const policyId1 = policyApiResponse.items[0].id;
+      const policyId2 = policyApiResponse.items[3].id;
 
-      renderResult = render(existingException);
+      existingException.tags = [
+        `${BY_POLICY_ARTIFACT_TAG_PREFIX}${policyId1}`,
+        `${BY_POLICY_ARTIFACT_TAG_PREFIX}${policyId2}`,
+      ];
 
-      expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeTruthy();
-      expect(renderResult.getByTestId(`policy-${policyId1}`)).toHaveAttribute(
-        'data-test-selected',
-        'true'
-      );
-      expect(renderResult.getByTestId(`policy-${policyId2}`)).toHaveAttribute(
-        'data-test-selected',
-        'true'
-      );
+      await render();
+
+      await expect(isEffectedPolicySelected(renderResult, 0)).resolves.toBe(true);
+      await expect(isEffectedPolicySelected(renderResult, 3)).resolves.toBe(true);
     });
 
-    it('should show the policies selector when no policy is selected', () => {
+    it('should show the policies selector when no policy is selected', async () => {
       existingException.tags = [];
-
-      renderResult = render(existingException);
+      await render();
 
       expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeTruthy();
     });
 
-    it('should show the policies selector when no policy is selected and there are previous tags', () => {
+    it('should show the policies selector when no policy is selected and there are previous tags', async () => {
       existingException.tags = ['non-a-policy-tag'];
-
-      renderResult = render(existingException);
+      await render();
 
       expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeTruthy();
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
index 605d2a0dfb544..3834da243ab75 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
@@ -16,12 +16,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  CreateExceptionListItemSchema,
-  UpdateExceptionListItemSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
 import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
-import { PolicyData } from '../../../../../../common/endpoint/types';
 import { isValidIPv4OrCIDR } from '../../../../../../common/endpoint/utils/is_valid_ip';
 import {
   EffectedPolicySelect,
@@ -44,6 +39,8 @@ import {
   NAME_LABEL,
   NAME_PLACEHOLDER,
 } from './translations';
+import { ArtifactFormComponentProps } from '../../../../components/artifact_list_page';
+import { FormattedError } from '../../../../components/formatted_error';
 
 interface ExceptionIpEntry {
   field: 'destination.ip';
@@ -52,215 +49,268 @@ interface ExceptionIpEntry {
   value: string;
 }
 
-export const HostIsolationExceptionsForm: React.FC<{
-  exception: CreateExceptionListItemSchema | UpdateExceptionListItemSchema;
-  policies: PolicyData[];
-  onError: (error: boolean) => void;
-  onChange: (
-    exception: Partial<CreateExceptionListItemSchema> | Partial<UpdateExceptionListItemSchema>
-  ) => void;
-}> = memo(({ exception, onError, policies, onChange }) => {
-  const ipEntry = exception.entries[0] as ExceptionIpEntry;
-  const [hasBeenInputNameVisited, setHasBeenInputNameVisited] = useState(false);
-  const [hasBeenInputIpVisited, setHasBeenInputIpVisited] = useState(false);
-  const [hasNameError, setHasNameError] = useState(!exception.name);
-  const [hasIpError, setHasIpError] = useState(!ipEntry.value);
+export const HostIsolationExceptionsForm = memo<ArtifactFormComponentProps>(
+  ({ item: exception, onChange, policies, disabled, mode, error }) => {
+    const ipEntry = useMemo(() => {
+      return (exception.entries[0] || {
+        field: 'destination.ip',
+        operator: 'included',
+        type: 'match',
+        value: '',
+      }) as ExceptionIpEntry;
+    }, [exception.entries]);
 
-  const [selectedPolicies, setSelectedPolicies] = useState<EffectedPolicySelection>({
-    isGlobal: isGlobalPolicyEffected(exception.tags),
-    selected: [],
-  });
+    const [hasBeenInputNameVisited, setHasBeenInputNameVisited] = useState(false);
+    const [hasBeenInputIpVisited, setHasBeenInputIpVisited] = useState(false);
+    const [hasNameError, setHasNameError] = useState(!exception.name);
+    const [hasIpError, setHasIpError] = useState(!ipEntry.value);
 
-  // set current policies if not previously selected
-  useEffect(() => {
-    if (selectedPolicies.selected.length === 0 && exception.tags) {
-      setSelectedPolicies(getEffectedPolicySelectionByTags(exception.tags, policies));
-    }
-  }, [exception.tags, policies, selectedPolicies.selected.length]);
+    const [selectedPolicies, setSelectedPolicies] = useState<EffectedPolicySelection>({
+      isGlobal: isGlobalPolicyEffected(exception.tags),
+      selected: [],
+    });
 
-  useEffect(() => {
-    onError(hasNameError || hasIpError);
-  }, [hasNameError, hasIpError, onError]);
+    const isFormContentValid = useMemo(() => {
+      return !hasNameError && !hasIpError;
+    }, [hasIpError, hasNameError]);
 
-  const handleOnChangeName = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      const name = event.target.value;
-      if (!name.trim()) {
-        setHasNameError(true);
-        return;
-      }
-      setHasNameError(false);
-      onChange({ name });
-    },
-    [onChange]
-  );
+    const notifyOfChange = useCallback(
+      (updatedItem?: Partial<ArtifactFormComponentProps['item']>) => {
+        onChange({
+          item: updatedItem
+            ? {
+                ...exception,
+                ...updatedItem,
+              }
+            : exception,
+          isValid: isFormContentValid,
+        });
+      },
+      [exception, isFormContentValid, onChange]
+    );
 
-  const handleOnIpChange = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      const ip = event.target.value;
-      if (!isValidIPv4OrCIDR(ip)) {
-        setHasIpError(true);
-        return;
-      }
-      setHasIpError(false);
-      onChange({
-        entries: [
-          {
-            field: 'destination.ip',
-            operator: 'included',
-            type: 'match',
-            value: ip,
-          },
-        ],
-      });
-    },
-    [onChange]
-  );
+    const handleOnChangeName = useCallback(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        const name = event.target.value;
+        if (!name.trim()) {
+          setHasNameError(true);
+        } else {
+          setHasNameError(false);
+        }
+        notifyOfChange({ name });
+      },
+      [notifyOfChange]
+    );
 
-  const handlePolicySelectChange: EffectedPolicySelectProps['onChange'] = useCallback(
-    (selection) => {
-      // preseve the previous selection between global and not global toggle
-      if (selection.isGlobal) {
-        setSelectedPolicies({ isGlobal: true, selected: selection.selected });
-      } else {
-        setSelectedPolicies(selection);
-      }
+    const handleOnIpChange = useCallback(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        const ip = event.target.value;
 
-      onChange({
-        tags: getArtifactTagsByEffectedPolicySelection(
-          selection,
-          getArtifactTagsWithoutPolicies(exception.tags)
-        ),
-      });
-    },
-    [exception.tags, onChange]
-  );
+        if (!isValidIPv4OrCIDR(ip)) {
+          setHasIpError(true);
+        } else {
+          setHasIpError(false);
+        }
 
-  const handleOnDescriptionChange = useCallback(
-    (event: React.ChangeEvent<HTMLTextAreaElement>) => {
-      onChange({ description: event.target.value });
-    },
-    [onChange]
-  );
+        notifyOfChange({
+          entries: [
+            {
+              ...ipEntry,
+              value: ip,
+            },
+          ],
+        });
+      },
+      [ipEntry, notifyOfChange]
+    );
 
-  const nameInput = useMemo(
-    () => (
-      <EuiFormRow
-        label={NAME_LABEL}
-        fullWidth
-        isInvalid={hasNameError && hasBeenInputNameVisited}
-        error={NAME_ERROR}
-      >
-        <EuiFieldText
-          id="eventFiltersFormInputName"
-          placeholder={NAME_PLACEHOLDER}
-          defaultValue={exception.name ?? ''}
-          onChange={handleOnChangeName}
+    const handlePolicySelectChange: EffectedPolicySelectProps['onChange'] = useCallback(
+      (selection) => {
+        // preserve the previous selection between global and not global toggle
+        if (selection.isGlobal) {
+          setSelectedPolicies({ isGlobal: true, selected: selection.selected });
+        } else {
+          setSelectedPolicies(selection);
+        }
+
+        notifyOfChange({
+          tags: getArtifactTagsByEffectedPolicySelection(
+            selection,
+            getArtifactTagsWithoutPolicies(exception.tags)
+          ),
+        });
+      },
+      [exception.tags, notifyOfChange]
+    );
+
+    const handleOnDescriptionChange = useCallback(
+      (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+        notifyOfChange({ description: event.target.value });
+      },
+      [notifyOfChange]
+    );
+
+    const nameInput = useMemo(
+      () => (
+        <EuiFormRow
+          label={NAME_LABEL}
           fullWidth
-          aria-label={NAME_PLACEHOLDER}
-          required={hasBeenInputNameVisited}
-          maxLength={256}
-          data-test-subj="hostIsolationExceptions-form-name-input"
-          onBlur={() => !hasBeenInputNameVisited && setHasBeenInputNameVisited(true)}
-        />
-      </EuiFormRow>
-    ),
-    [exception.name, handleOnChangeName, hasBeenInputNameVisited, hasNameError]
-  );
+          isInvalid={hasNameError && hasBeenInputNameVisited}
+          error={NAME_ERROR}
+          isDisabled={disabled}
+          data-test-subj="hostIsolationExceptions-form-name-input-formRow"
+        >
+          <EuiFieldText
+            id="eventFiltersFormInputName"
+            placeholder={NAME_PLACEHOLDER}
+            defaultValue={exception.name ?? ''}
+            onChange={handleOnChangeName}
+            fullWidth
+            aria-label={NAME_PLACEHOLDER}
+            required={hasBeenInputNameVisited}
+            maxLength={256}
+            data-test-subj="hostIsolationExceptions-form-name-input"
+            onBlur={() => !hasBeenInputNameVisited && setHasBeenInputNameVisited(true)}
+            disabled={disabled}
+          />
+        </EuiFormRow>
+      ),
+      [disabled, exception.name, handleOnChangeName, hasBeenInputNameVisited, hasNameError]
+    );
 
-  const ipInput = useMemo(
-    () => (
-      <EuiFormRow
-        label={IP_LABEL}
-        fullWidth
-        isInvalid={hasIpError && hasBeenInputIpVisited}
-        error={IP_ERROR}
-      >
-        <EuiFieldText
-          id="eventFiltersFormInputName"
-          placeholder={IP_PLACEHOLDER}
-          defaultValue={(exception.entries?.[0] as ExceptionIpEntry)?.value ?? ''}
-          onChange={handleOnIpChange}
+    const ipInput = useMemo(
+      () => (
+        <EuiFormRow
+          label={IP_LABEL}
           fullWidth
-          aria-label={IP_PLACEHOLDER}
-          required={hasBeenInputIpVisited}
-          maxLength={256}
-          data-test-subj="hostIsolationExceptions-form-ip-input"
-          onBlur={() => !hasBeenInputIpVisited && setHasBeenInputIpVisited(true)}
-        />
-      </EuiFormRow>
-    ),
-    [exception.entries, handleOnIpChange, hasBeenInputIpVisited, hasIpError]
-  );
+          isInvalid={hasIpError && hasBeenInputIpVisited}
+          error={IP_ERROR}
+          isDisabled={disabled}
+          data-test-subj="hostIsolationExceptions-form-ip-input-formRow"
+        >
+          <EuiFieldText
+            id="eventFiltersFormInputName"
+            placeholder={IP_PLACEHOLDER}
+            defaultValue={(exception.entries?.[0] as ExceptionIpEntry)?.value ?? ''}
+            onChange={handleOnIpChange}
+            fullWidth
+            aria-label={IP_PLACEHOLDER}
+            required={hasBeenInputIpVisited}
+            maxLength={256}
+            data-test-subj="hostIsolationExceptions-form-ip-input"
+            onBlur={() => !hasBeenInputIpVisited && setHasBeenInputIpVisited(true)}
+            disabled={disabled}
+          />
+        </EuiFormRow>
+      ),
+      [disabled, exception.entries, handleOnIpChange, hasBeenInputIpVisited, hasIpError]
+    );
 
-  const descriptionInput = useMemo(
-    () => (
-      <EuiFormRow label={DESCRIPTION_LABEL} fullWidth>
-        <EuiTextArea
-          id="eventFiltersFormInputName"
-          placeholder={DESCRIPTION_PLACEHOLDER}
-          defaultValue={exception.description ?? ''}
-          onChange={handleOnDescriptionChange}
+    const descriptionInput = useMemo(
+      () => (
+        <EuiFormRow
+          label={DESCRIPTION_LABEL}
           fullWidth
-          data-test-subj="hostIsolationExceptions-form-description-input"
-          aria-label={DESCRIPTION_PLACEHOLDER}
-          maxLength={256}
-        />
-      </EuiFormRow>
-    ),
-    [exception.description, handleOnDescriptionChange]
-  );
+          isDisabled={disabled}
+          data-test-subj="hostIsolationExceptions-form-description-input-formRow"
+        >
+          <EuiTextArea
+            id="eventFiltersFormInputName"
+            placeholder={DESCRIPTION_PLACEHOLDER}
+            defaultValue={exception.description ?? ''}
+            onChange={handleOnDescriptionChange}
+            fullWidth
+            data-test-subj="hostIsolationExceptions-form-description-input"
+            aria-label={DESCRIPTION_PLACEHOLDER}
+            maxLength={256}
+            disabled={disabled}
+          />
+        </EuiFormRow>
+      ),
+      [disabled, exception.description, handleOnDescriptionChange]
+    );
+
+    // set current policies if not previously selected
+    useEffect(() => {
+      if (selectedPolicies.selected.length === 0 && exception.tags) {
+        setSelectedPolicies(getEffectedPolicySelectionByTags(exception.tags, policies));
+      }
+    }, [exception.tags, policies, selectedPolicies.selected.length]);
+
+    // Anytime the `notificyOfChange()` is re-defined, call it with current values.
+    // This will happen
+    useEffect(() => {
+      notifyOfChange(); // << Important to call it with no arguments, so that existing values are sent
+    }, [notifyOfChange]);
 
-  return (
-    <EuiForm component="div">
-      <EuiTitle size="xs">
-        <h2>
+    // Make sure in the create flow, the OS array is set to the 3 OSs supported
+    useEffect(() => {
+      if (mode === 'create' && (exception.os_types?.length ?? 0) !== 3) {
+        notifyOfChange({ os_types: ['windows', 'linux', 'macos'] });
+      }
+    }, [exception.os_types?.length, mode, notifyOfChange]);
+
+    return (
+      <EuiForm
+        component="div"
+        error={error && <FormattedError error={error} />}
+        isInvalid={!!error}
+        data-test-subj="hostIsolationExceptions-form"
+      >
+        <EuiTitle size="xs">
+          <h2>
+            <FormattedMessage
+              id="xpack.securitySolution.hostIsolationExceptions.form.title"
+              defaultMessage="Details"
+            />
+          </h2>
+        </EuiTitle>
+        <EuiText size="s">
           <FormattedMessage
-            id="xpack.securitySolution.hostIsolationExceptions.form.title"
-            defaultMessage="Details"
+            id="xpack.securitySolution.hostIsolationExceptions.form.description"
+            defaultMessage="Allows isolated hosts to connect to these IP addresses. Only accepts IPv4 with optional CIDR."
           />
-        </h2>
-      </EuiTitle>
-      <EuiText size="s">
-        <FormattedMessage
-          id="xpack.securitySolution.hostIsolationExceptions.form.description"
-          defaultMessage="Allows isolated hosts to connect to these IP addresses. Only accepts IPv4 with optional CIDR."
-        />
-      </EuiText>
-      <EuiSpacer size="m" />
-      {nameInput}
-      {descriptionInput}
-      <EuiSpacer size="m" />
-      <EuiHorizontalRule />
-      <EuiTitle size="xs">
-        <h2>
+        </EuiText>
+        <EuiSpacer size="m" />
+        {nameInput}
+        {descriptionInput}
+        <EuiSpacer size="m" />
+        <EuiHorizontalRule />
+        <EuiTitle size="xs">
+          <h2>
+            <FormattedMessage
+              id="xpack.securitySolution.hostIsolationExceptions.form.conditions.title"
+              defaultMessage="Conditions"
+            />
+          </h2>
+        </EuiTitle>
+        <EuiText size="s">
           <FormattedMessage
-            id="xpack.securitySolution.hostIsolationExceptions.form.conditions.title"
-            defaultMessage="Conditions"
+            id="xpack.securitySolution.hostIsolationExceptions.form.conditions.subtitle"
+            defaultMessage="Host Isolation exceptions will apply to all operating systems."
+          />
+        </EuiText>
+        <EuiSpacer size="m" />
+        {ipInput}
+        <EuiHorizontalRule />
+        <EuiFormRow
+          fullWidth={true}
+          data-test-subj={'effectedPolicies-container'}
+          isDisabled={disabled}
+        >
+          <EffectedPolicySelect
+            isGlobal={selectedPolicies.isGlobal}
+            isPlatinumPlus={true}
+            selected={selectedPolicies.selected}
+            options={policies}
+            onChange={handlePolicySelectChange}
+            data-test-subj={'effectedPolicies-select'}
+            disabled={disabled}
           />
-        </h2>
-      </EuiTitle>
-      <EuiText size="s">
-        <FormattedMessage
-          id="xpack.securitySolution.hostIsolationExceptions.form.conditions.subtitle"
-          defaultMessage="Host Isolation exceptions will apply to all operating systems."
-        />
-      </EuiText>
-      <EuiSpacer size="m" />
-      {ipInput}
-      <EuiHorizontalRule />
-      <EuiFormRow fullWidth={true} data-test-subj={'effectedPolicies-container'}>
-        <EffectedPolicySelect
-          isGlobal={selectedPolicies.isGlobal}
-          isPlatinumPlus={true}
-          selected={selectedPolicies.selected}
-          options={policies}
-          onChange={handlePolicySelectChange}
-          data-test-subj={'effectedPolicies-select'}
-        />
-      </EuiFormRow>
-    </EuiForm>
-  );
-});
+        </EuiFormRow>
+      </EuiForm>
+    );
+  }
+);
 
 HostIsolationExceptionsForm.displayName = 'HostIsolationExceptionsForm';
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
deleted file mode 100644
index 46ea59a802c49..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { waitFor, waitForElementToBeRemoved } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import uuid from 'uuid';
-import {
-  AppContextTestRender,
-  createAppRootMockRenderer,
-} from '../../../../../common/mock/endpoint';
-import { getHostIsolationExceptionsListPath } from '../../../../common/routing';
-import { sendGetEndpointSpecificPackagePolicies } from '../../../../services/policies/policies';
-import { sendGetEndpointSpecificPackagePoliciesMock } from '../../../../services/policies/test_mock_utils';
-import {
-  createHostIsolationExceptionItem,
-  getOneHostIsolationExceptionItem,
-  updateOneHostIsolationExceptionItem,
-} from '../../service';
-import { createEmptyHostIsolationException } from '../../utils';
-import { HostIsolationExceptionsFormFlyout } from './form_flyout';
-
-jest.mock('../../service.ts');
-jest.mock('../../../../../common/hooks/use_license');
-jest.mock('../../../../services/policies/policies');
-
-const createHostIsolationExceptionItemMock = createHostIsolationExceptionItem as jest.Mock;
-const updateOneHostIsolationExceptionItemMock = updateOneHostIsolationExceptionItem as jest.Mock;
-const getOneHostIsolationExceptionItemMock = getOneHostIsolationExceptionItem as jest.Mock;
-(sendGetEndpointSpecificPackagePolicies as jest.Mock).mockImplementation(
-  sendGetEndpointSpecificPackagePoliciesMock
-);
-
-describe('When on the host isolation exceptions flyout form', () => {
-  let mockedContext: AppContextTestRender;
-  let render: () => ReturnType<AppContextTestRender['render']>;
-  let renderResult: ReturnType<typeof render>;
-  let onCancel: () => void;
-
-  beforeEach(async () => {
-    onCancel = jest.fn();
-    mockedContext = createAppRootMockRenderer();
-    mockedContext.history.push(getHostIsolationExceptionsListPath({ show: 'create' }));
-
-    createHostIsolationExceptionItemMock.mockReset();
-    updateOneHostIsolationExceptionItemMock.mockReset();
-    getOneHostIsolationExceptionItemMock.mockReset();
-  });
-
-  describe('When creating a new exception', () => {
-    beforeEach(() => {
-      render = () => {
-        return mockedContext.render(<HostIsolationExceptionsFormFlyout onCancel={onCancel} />);
-      };
-    });
-    describe('with invalid data', () => {
-      beforeEach(async () => {
-        renderResult = render();
-        await waitForElementToBeRemoved(renderResult.queryByTestId('loading-spinner'));
-      });
-
-      it('should show disabled buttons when the form first load', async () => {
-        expect(renderResult.getByTestId('add-exception-cancel-button')).not.toHaveAttribute(
-          'disabled'
-        );
-        expect(renderResult.getByTestId('add-exception-confirm-button')).toHaveAttribute(
-          'disabled'
-        );
-      });
-
-      it('should disable submit if the data is invalid', async () => {
-        const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
-        const nameInput = renderResult.getByTestId('hostIsolationExceptions-form-name-input');
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        userEvent.type(nameInput, 'test name');
-        userEvent.clear(ipInput);
-        userEvent.type(ipInput, 'not an ip');
-        expect(confirmButton).toHaveAttribute('disabled');
-      });
-
-      it('should call onCancel when cancel is pressed', async () => {
-        const cancelButton = renderResult.getByTestId('add-exception-cancel-button');
-        userEvent.click(cancelButton);
-        expect(onCancel).toHaveBeenCalled();
-      });
-    });
-
-    describe('with valid data', () => {
-      beforeEach(async () => {
-        renderResult = render();
-        await waitForElementToBeRemoved(renderResult.queryByTestId('loading-spinner'));
-
-        const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
-        const nameInput = renderResult.getByTestId('hostIsolationExceptions-form-name-input');
-        userEvent.type(nameInput, 'test name');
-        userEvent.type(ipInput, '10.0.0.1');
-      });
-
-      it('should show enable buttons when the form is valid', () => {
-        expect(renderResult.getByTestId('add-exception-cancel-button')).not.toHaveAttribute(
-          'disabled'
-        );
-        expect(renderResult.getByTestId('add-exception-confirm-button')).not.toHaveAttribute(
-          'disabled'
-        );
-      });
-
-      it('should submit the entry data when submit is pressed with valid data', async () => {
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        expect(confirmButton).not.toHaveAttribute('disabled');
-        userEvent.click(confirmButton);
-        await waitFor(() => {
-          expect(createHostIsolationExceptionItemMock).toHaveBeenCalled();
-        });
-      });
-
-      it('should disable the submit button when an operation is in progress', async () => {
-        // simulate a pending request
-        createHostIsolationExceptionItemMock.mockImplementationOnce(() => {
-          return new Promise((resolve) => {
-            setTimeout(resolve, 300);
-          });
-        });
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        expect(confirmButton).not.toHaveAttribute('disabled');
-        userEvent.click(confirmButton);
-        await waitFor(() => {
-          expect(createHostIsolationExceptionItemMock).toHaveBeenCalled();
-          expect(confirmButton).toHaveAttribute('disabled');
-        });
-      });
-
-      it('should show a toast and close the flyout when the operation is finished calling onCancel', async () => {
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        userEvent.click(confirmButton);
-        await waitFor(() => {
-          expect(mockedContext.coreStart.notifications.toasts.addSuccess).toHaveBeenCalled();
-          expect(onCancel).toHaveBeenCalled();
-        });
-      });
-
-      it('should show an error toast if operation fails and enable the submit button', async () => {
-        createHostIsolationExceptionItemMock.mockRejectedValue(new Error('not valid'));
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        userEvent.click(confirmButton);
-        await waitFor(() => {
-          expect(mockedContext.coreStart.notifications.toasts.addDanger).toHaveBeenCalledWith(
-            'There was an error creating the exception: "not valid"'
-          );
-          expect(confirmButton).not.toHaveAttribute('disabled');
-        });
-      });
-    });
-  });
-
-  describe('When editing an existing exception', () => {
-    const fakeId = uuid.v4();
-    beforeEach(() => {
-      mockedContext.history.push(getHostIsolationExceptionsListPath({ show: 'edit', id: fakeId }));
-      render = () => {
-        return mockedContext.render(
-          <HostIsolationExceptionsFormFlyout id={fakeId} onCancel={onCancel} />
-        );
-      };
-    });
-
-    describe('without loaded data', () => {
-      it('should show a loading status while the item is loaded', () => {
-        renderResult = render();
-        expect(renderResult.getByTestId('loading-spinner')).toBeTruthy();
-      });
-
-      it('should request to load data about the editing exception', async () => {
-        renderResult = render();
-        await waitFor(() => {
-          expect(getOneHostIsolationExceptionItemMock).toHaveBeenCalledWith(
-            mockedContext.coreStart.http,
-            fakeId
-          );
-        });
-      });
-    });
-
-    describe('with loaded data', () => {
-      beforeEach(async () => {
-        getOneHostIsolationExceptionItemMock.mockReturnValueOnce({
-          ...createEmptyHostIsolationException(),
-          name: 'name edit me',
-          description: 'initial description',
-          id: fakeId,
-          item_id: fakeId,
-          entries: [
-            {
-              field: 'destination.ip',
-              operator: 'included',
-              type: 'match',
-              value: '10.0.0.5',
-            },
-          ],
-        });
-        renderResult = render();
-        await waitForElementToBeRemoved(renderResult.queryByTestId('loading-spinner'));
-      });
-
-      it('should enable the buttons after data is loaded', () => {
-        expect(renderResult.getByTestId('add-exception-cancel-button')).not.toHaveAttribute(
-          'disabled'
-        );
-        expect(renderResult.getByTestId('add-exception-confirm-button')).not.toHaveAttribute(
-          'disabled'
-        );
-      });
-
-      it('should disable submit if the data is invalid', async () => {
-        const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
-        const nameInput = renderResult.getByTestId('hostIsolationExceptions-form-name-input');
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        userEvent.type(nameInput, 'test name');
-        userEvent.clear(ipInput);
-        userEvent.type(ipInput, 'not an ip');
-        expect(confirmButton).toHaveAttribute('disabled');
-      });
-
-      it('should submit the entry data when submit is pressed with valid data', async () => {
-        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
-        expect(confirmButton).not.toHaveAttribute('disabled');
-        userEvent.click(confirmButton);
-        await waitFor(() => {
-          expect(updateOneHostIsolationExceptionItemMock).toHaveBeenCalledWith(
-            mockedContext.coreStart.http,
-            {
-              comments: [],
-              description: 'initial description',
-              entries: [
-                { field: 'destination.ip', operator: 'included', type: 'match', value: '10.0.0.5' },
-              ],
-              id: fakeId,
-              item_id: fakeId,
-              list_id: 'endpoint_host_isolation_exceptions',
-              name: 'name edit me',
-              namespace_type: 'agnostic',
-              os_types: ['windows', 'linux', 'macos'],
-              tags: ['policy:all'],
-              type: 'simple',
-            }
-          );
-        });
-        expect(confirmButton).toHaveAttribute('disabled');
-      });
-
-      it('should call onCancel when cancel is pressed', async () => {
-        const cancelButton = renderResult.getByTestId('add-exception-cancel-button');
-        userEvent.click(cancelButton);
-        expect(onCancel).toHaveBeenCalled();
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
deleted file mode 100644
index 981fe418ba2fe..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutFooter,
-  EuiFlyoutHeader,
-  EuiTitle,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  CreateExceptionListItemSchema,
-  UpdateExceptionListItemSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
-import React, { memo, useCallback, useMemo, useState } from 'react';
-import { useMutation, useQueryClient } from 'react-query';
-import { Loader } from '../../../../../common/components/loader';
-import { useHttp, useToasts } from '../../../../../common/lib/kibana';
-import { ServerApiError } from '../../../../../common/types';
-import { useGetEndpointSpecificPolicies } from '../../../../services/policies/hooks';
-import {
-  createHostIsolationExceptionItem,
-  updateOneHostIsolationExceptionItem,
-} from '../../service';
-import { useGetHostIsolationExceptionFormEntry } from '../hooks';
-import { HostIsolationExceptionsForm } from './form';
-import {
-  getCreateErrorMessage,
-  getCreationSuccessMessage,
-  getLoadErrorMessage,
-  getUpdateErrorMessage,
-  getUpdateSuccessMessage,
-} from './translations';
-
-export const HostIsolationExceptionsFormFlyout = memo(
-  ({ onCancel, id }: { onCancel: () => void; id?: string }) => {
-    const http = useHttp();
-    const toasts = useToasts();
-    const queryClient = useQueryClient();
-
-    const isEditing = id !== undefined;
-    const [exception, setException] = useState<
-      CreateExceptionListItemSchema | UpdateExceptionListItemSchema | undefined
-    >(undefined);
-
-    // Load the entry to create or edit
-    useGetHostIsolationExceptionFormEntry({
-      id,
-      onSuccess: (data) => setException(data),
-      onError: (error) => {
-        toasts.addWarning(getLoadErrorMessage(error));
-        onCancel();
-      },
-    });
-
-    // load the list of policies>
-    const policiesRequest = useGetEndpointSpecificPolicies({
-      onError: (error) => {
-        toasts.addWarning(getLoadErrorMessage(error));
-        onCancel();
-      },
-    });
-
-    const mutation = useMutation(
-      () => {
-        if (isEditing) {
-          return updateOneHostIsolationExceptionItem(
-            http,
-            exception as UpdateExceptionListItemSchema
-          );
-        } else {
-          return createHostIsolationExceptionItem(http, exception as CreateExceptionListItemSchema);
-        }
-      },
-      {
-        onSuccess: () => {
-          if (exception?.name) {
-            if (isEditing) {
-              toasts.addSuccess(getUpdateSuccessMessage(exception.name));
-            } else {
-              toasts.addSuccess(getCreationSuccessMessage(exception.name));
-            }
-          }
-          queryClient.invalidateQueries('hostIsolationExceptions');
-          onCancel();
-        },
-        onError: (error: ServerApiError) => {
-          if (isEditing) {
-            toasts.addDanger(getUpdateErrorMessage(error));
-          } else {
-            toasts.addDanger(getCreateErrorMessage(error));
-          }
-        },
-      }
-    );
-
-    const [formHasError, setFormHasError] = useState(true);
-
-    const handleOnCancel = useCallback(() => {
-      if (mutation.isLoading) return;
-      onCancel();
-    }, [mutation, onCancel]);
-
-    const handleOnSubmit = useCallback(() => {
-      mutation.mutate();
-    }, [mutation]);
-
-    const confirmButtonMemo = useMemo(
-      () => (
-        <EuiButton
-          data-test-subj="add-exception-confirm-button"
-          fill
-          disabled={formHasError || mutation.isLoading}
-          onClick={handleOnSubmit}
-          isLoading={mutation.isLoading}
-        >
-          {isEditing ? (
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.flyout.editButton"
-              defaultMessage="Save"
-            />
-          ) : (
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.flyout.createButton"
-              defaultMessage="Add host isolation exception"
-            />
-          )}
-        </EuiButton>
-      ),
-      [formHasError, handleOnSubmit, isEditing, mutation.isLoading]
-    );
-
-    const handleFormChange = (
-      change: Partial<CreateExceptionListItemSchema> | Partial<UpdateExceptionListItemSchema>
-    ) => {
-      setException(Object.assign(exception, change));
-    };
-
-    return exception && policiesRequest.data?.items ? (
-      <EuiFlyout
-        size="m"
-        onClose={handleOnCancel}
-        data-test-subj="hostIsolationExceptionsCreateEditFlyout"
-      >
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle size="m">
-            {isEditing ? (
-              <h2>
-                <FormattedMessage
-                  id="xpack.securitySolution.hostIsolationExceptions.flyout.editTitle"
-                  defaultMessage="Edit host isolation exception"
-                />
-              </h2>
-            ) : (
-              <h2>
-                <FormattedMessage
-                  id="xpack.securitySolution.hostIsolationExceptions.flyout.title"
-                  defaultMessage="Add host isolation exception"
-                />
-              </h2>
-            )}
-          </EuiTitle>
-        </EuiFlyoutHeader>
-
-        <EuiFlyoutBody>
-          <HostIsolationExceptionsForm
-            policies={policiesRequest.data?.items}
-            onChange={handleFormChange}
-            exception={exception}
-            onError={setFormHasError}
-          />
-        </EuiFlyoutBody>
-
-        <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty data-test-subj="add-exception-cancel-button" onClick={handleOnCancel}>
-                <FormattedMessage
-                  id="xpack.securitySolution.hostIsolationExceptions.flyout.cancel"
-                  defaultMessage="Cancel"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>{confirmButtonMemo}</EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    ) : (
-      <Loader size="xl" />
-    );
-  }
-);
-
-HostIsolationExceptionsFormFlyout.displayName = 'HostIsolationExceptionsFormFlyout';
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts
index 2c23c43734869..6a8c0d9c5d21b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts
@@ -5,21 +5,34 @@
  * 2.0.
  */
 import { useCanSeeHostIsolationExceptionsMenu } from './hooks';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook as _renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { getHostIsolationExceptionSummary } from '../service';
 import { useEndpointPrivileges } from '../../../../common/components/user_privileges/endpoint';
+import { createAppRootMockRenderer } from '../../../../common/mock/endpoint';
+import { exceptionsGetSummaryHttpMock } from '../../mocks/exceptions_list_http_mocks';
 
 jest.mock('../../../../common/hooks/use_license');
-jest.mock('../service');
 jest.mock('../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
 
-const getHostIsolationExceptionSummaryMock = getHostIsolationExceptionSummary as jest.Mock;
-
 describe('host isolation exceptions hooks', () => {
   const useEndpointPrivilegesMock = useEndpointPrivileges as jest.Mock;
+  let renderHook: typeof _renderHook;
+  let mockedApis: ReturnType<typeof exceptionsGetSummaryHttpMock>;
+
   describe('useCanSeeHostIsolationExceptionsMenu', () => {
     beforeEach(() => {
+      const mockedContext = createAppRootMockRenderer();
+
+      mockedApis = exceptionsGetSummaryHttpMock(mockedContext.coreStart.http);
+      renderHook = (callback, options = {}) => {
+        return _renderHook(callback, {
+          ...options,
+          wrapper: mockedContext.AppWrapper,
+        });
+      };
+    });
+
+    afterEach(() => {
       useEndpointPrivilegesMock.mockReset();
     });
 
@@ -33,7 +46,12 @@ describe('host isolation exceptions hooks', () => {
 
     it('should return false if does not have privileges and there are not existing host isolation items', () => {
       useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: false });
-      getHostIsolationExceptionSummaryMock.mockReturnValueOnce({ total: 0 });
+      mockedApis.responseProvider.exceptionsSummary.mockReturnValue({
+        total: 0,
+        linux: 0,
+        macos: 0,
+        windows: 0,
+      });
       const { result } = renderHook(() => useCanSeeHostIsolationExceptionsMenu(), {
         wrapper: TestProviders,
       });
@@ -42,7 +60,6 @@ describe('host isolation exceptions hooks', () => {
 
     it('should return true if does not have privileges and there are existing host isolation items', async () => {
       useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: false });
-      getHostIsolationExceptionSummaryMock.mockReturnValueOnce({ total: 11 });
       const { result, waitForNextUpdate } = renderHook(
         () => useCanSeeHostIsolationExceptionsMenu(),
         {
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts
index 6b043822968f5..091559203f6d7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts
@@ -4,55 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import {
-  CreateExceptionListItemSchema,
-  FoundExceptionListItemSchema,
-  UpdateExceptionListItemSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
-import { useCallback, useEffect, useState } from 'react';
-import { QueryObserverResult, useQuery } from 'react-query';
-import { useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import { useEffect, useMemo } from 'react';
 import { useEndpointPrivileges } from '../../../../common/components/user_privileges/endpoint';
 import { useHttp } from '../../../../common/lib/kibana/hooks';
-import { State } from '../../../../common/store';
-import { ServerApiError } from '../../../../common/types';
-import {
-  MANAGEMENT_STORE_GLOBAL_NAMESPACE,
-  MANAGEMENT_STORE_HOST_ISOLATION_EXCEPTIONS_NAMESPACE,
-} from '../../../common/constants';
-import { getHostIsolationExceptionsListPath } from '../../../common/routing';
-import { parsePoliciesAndFilterToKql, parseQueryFilterToKQL } from '../../../common/utils';
-import { SEARCHABLE_FIELDS } from '../constants';
-import {
-  getHostIsolationExceptionItems,
-  getHostIsolationExceptionSummary,
-  getOneHostIsolationExceptionItem,
-} from '../service';
-import { getCurrentLocation } from '../store/selector';
-import { HostIsolationExceptionsPageLocation, HostIsolationExceptionsPageState } from '../types';
-import { createEmptyHostIsolationException } from '../utils';
-
-export function useHostIsolationExceptionsSelector<R>(
-  selector: (state: HostIsolationExceptionsPageState) => R
-): R {
-  return useSelector((state: State) =>
-    selector(
-      state[MANAGEMENT_STORE_GLOBAL_NAMESPACE][MANAGEMENT_STORE_HOST_ISOLATION_EXCEPTIONS_NAMESPACE]
-    )
-  );
-}
-
-export function useHostIsolationExceptionsNavigateCallback() {
-  const location = useHostIsolationExceptionsSelector(getCurrentLocation);
-  const history = useHistory();
-
-  return useCallback(
-    (args: Partial<HostIsolationExceptionsPageLocation>) =>
-      history.push(getHostIsolationExceptionsListPath({ ...location, ...args })),
-    [history, location]
-  );
-}
+import { useSummaryArtifact } from '../../../hooks/artifacts';
+import { HostIsolationExceptionsApiClient } from '../host_isolation_exceptions_api_client';
 
 /**
  * Checks if the current user should be able to see the host isolation exceptions
@@ -61,93 +17,26 @@ export function useHostIsolationExceptionsNavigateCallback() {
 export function useCanSeeHostIsolationExceptionsMenu(): boolean {
   const http = useHttp();
   const privileges = useEndpointPrivileges();
+  const apiQuery = useSummaryArtifact(
+    HostIsolationExceptionsApiClient.getInstance(http),
+    undefined,
+    undefined,
+    {
+      enabled: false,
+    }
+  );
+
+  const { data: summary, isFetching, refetch: checkIfHasExceptions, isFetched } = apiQuery;
 
-  const [canSeeMenu, setCanSeeMenu] = useState(privileges.canIsolateHost);
+  const canSeeMenu = useMemo(() => {
+    return privileges.canIsolateHost || Boolean(summary?.total);
+  }, [privileges.canIsolateHost, summary?.total]);
 
   useEffect(() => {
-    async function checkIfHasExceptions() {
-      try {
-        const summary = await getHostIsolationExceptionSummary(http);
-        if (summary?.total > 0) {
-          setCanSeeMenu(true);
-        }
-      } catch (error) {
-        // an error will ocurr if the exception list does not exist
-        setCanSeeMenu(false);
-      }
-    }
-    if (!privileges.canIsolateHost) {
+    if (!privileges.canIsolateHost && !privileges.loading && !isFetched && !isFetching) {
       checkIfHasExceptions();
-    } else {
-      setCanSeeMenu(true);
     }
-  }, [http, privileges.canIsolateHost]);
+  }, [checkIfHasExceptions, isFetched, isFetching, privileges.canIsolateHost, privileges.loading]);
 
   return canSeeMenu;
 }
-
-export function useFetchHostIsolationExceptionsList({
-  filter,
-  page,
-  perPage,
-  policies,
-  excludedPolicies = [],
-  enabled = true,
-}: {
-  filter?: string;
-  page: number;
-  perPage: number;
-  policies?: string[];
-  excludedPolicies?: string[];
-  enabled?: boolean;
-}): QueryObserverResult<FoundExceptionListItemSchema, ServerApiError> {
-  const http = useHttp();
-
-  return useQuery<FoundExceptionListItemSchema, ServerApiError>(
-    ['hostIsolationExceptions', 'list', filter, perPage, page, policies, excludedPolicies],
-    () => {
-      const kql = parsePoliciesAndFilterToKql({
-        policies,
-        excludedPolicies,
-        kuery: filter ? parseQueryFilterToKQL(filter, SEARCHABLE_FIELDS) : undefined,
-      });
-
-      return getHostIsolationExceptionItems({
-        http,
-        page: page + 1,
-        perPage,
-        filter: kql,
-      });
-    },
-    { enabled, keepPreviousData: true }
-  );
-}
-
-export function useGetHostIsolationExceptionFormEntry({
-  id,
-  onSuccess,
-  onError,
-}: {
-  id?: string;
-  onSuccess: (data: CreateExceptionListItemSchema | UpdateExceptionListItemSchema) => void;
-  onError?: (error: ServerApiError) => void;
-}): QueryObserverResult {
-  const http = useHttp();
-  return useQuery<UpdateExceptionListItemSchema | CreateExceptionListItemSchema, ServerApiError>(
-    ['hostIsolationExceptions', 'form', id],
-    async () => {
-      // for editing, fetch from the API
-      if (id !== undefined) {
-        return getOneHostIsolationExceptionItem(http, id);
-      }
-      // for adding, return a new empty object
-      return createEmptyHostIsolationException();
-    },
-    {
-      refetchIntervalInBackground: false,
-      refetchOnWindowFocus: false,
-      onSuccess,
-      onError,
-    }
-  );
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
index e84dfeb336f1f..e9d7bc31ae91b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
@@ -5,308 +5,103 @@
  * 2.0.
  */
 
-import { act, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react';
+import { act, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
 import { HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../../../common/constants';
-import { EndpointPrivileges } from '../../../../../common/endpoint/types';
-import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
-import { sendGetEndpointSpecificPackagePolicies } from '../../../services/policies/policies';
-import { sendGetEndpointSpecificPackagePoliciesMock } from '../../../services/policies/test_mock_utils';
-import { getHostIsolationExceptionItems } from '../service';
 import { HostIsolationExceptionsList } from './host_isolation_exceptions_list';
+import { exceptionsListAllHttpMocks } from '../../mocks/exceptions_list_http_mocks';
+import { SEARCHABLE_FIELDS } from '../constants';
+import { parseQueryFilterToKQL } from '../../../common/utils';
+import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges';
+import { getUserPrivilegesMockDefaultValue } from '../../../../common/components/user_privileges/__mocks__';
+import { getFirstCard } from '../../../components/artifact_list_page/mocks';
 
-jest.mock('../service');
-jest.mock('../../../../common/hooks/use_license');
 jest.mock('../../../../common/components/user_privileges');
-jest.mock('../../../services/policies/policies');
-
-const getHostIsolationExceptionItemsMock = getHostIsolationExceptionItems as jest.Mock;
-(sendGetEndpointSpecificPackagePolicies as jest.Mock).mockImplementation(
-  sendGetEndpointSpecificPackagePoliciesMock
-);
+const useUserPrivilegesMock = _useUserPrivileges as jest.Mock;
 
 describe('When on the host isolation exceptions page', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
   let renderResult: ReturnType<typeof render>;
   let history: AppContextTestRender['history'];
   let mockedContext: AppContextTestRender;
-
-  const useUserPrivilegesMock = _useUserPrivileges as jest.Mock;
-
-  const setEndpointPrivileges = (overrides: Partial<EndpointPrivileges> = {}) => {
-    const newPrivileges = _useUserPrivileges();
-
-    useUserPrivilegesMock.mockReturnValue({
-      ...newPrivileges,
-      endpointPrivileges: {
-        ...newPrivileges.endpointPrivileges,
-        ...overrides,
-      },
-    });
-  };
-
-  const waitForApiCall = () => {
-    return waitFor(() => {
-      expect(getHostIsolationExceptionItemsMock).toHaveBeenCalled();
-    });
-  };
+  let apiMocks: ReturnType<typeof exceptionsListAllHttpMocks>;
 
   beforeEach(() => {
-    getHostIsolationExceptionItemsMock.mockClear();
     mockedContext = createAppRootMockRenderer();
     ({ history } = mockedContext);
     render = () => (renderResult = mockedContext.render(<HostIsolationExceptionsList />));
 
+    apiMocks = exceptionsListAllHttpMocks(mockedContext.coreStart.http);
+
     act(() => {
       history.push(HOST_ISOLATION_EXCEPTIONS_PATH);
     });
   });
 
-  describe('When on the host isolation list page', () => {
-    describe('And no data exists', () => {
-      beforeEach(async () => {
-        getHostIsolationExceptionItemsMock.mockReturnValue({
-          data: [],
-          page: 1,
-          per_page: 10,
-          total: 0,
-        });
-      });
+  afterEach(() => {
+    useUserPrivilegesMock.mockImplementation(getUserPrivilegesMockDefaultValue);
+  });
 
-      it('should show the Empty message', async () => {
-        render();
-        await waitForApiCall();
-        expect(renderResult.getByTestId('hostIsolationExceptionsEmpty')).toBeTruthy();
-      });
+  it('should search using expected exception item fields', async () => {
+    const expectedFilterString = parseQueryFilterToKQL('fooFooFoo', SEARCHABLE_FIELDS);
+    const { findAllByTestId } = render();
 
-      it('should not display the search bar', async () => {
-        render();
-        await waitForApiCall();
-        expect(renderResult.queryByTestId('searchExceptions')).toBeFalsy();
-      });
+    await waitFor(async () => {
+      await expect(findAllByTestId('hostIsolationExceptionsListPage-card')).resolves.toHaveLength(
+        10
+      );
     });
 
-    describe('And data exists', () => {
-      beforeEach(async () => {
-        getHostIsolationExceptionItemsMock.mockImplementation(() =>
-          getFoundExceptionListItemSchemaMock(1)
-        );
-      });
-
-      it('should show loading indicator while retrieving data and hide it when it gets it', async () => {
-        let releaseApiResponse: (value?: unknown) => void;
-
-        // make the request wait
-        getHostIsolationExceptionItemsMock.mockReturnValue(
-          new Promise((resolve) => (releaseApiResponse = resolve))
-        );
-        render();
-        await waitForApiCall();
-
-        // see if loader is present
-        expect(renderResult.getByTestId('hostIsolationExceptionListLoader')).toBeTruthy();
-
-        // release the request
-        releaseApiResponse!(getFoundExceptionListItemSchemaMock());
-
-        //  check the loader is gone
-        await waitForElementToBeRemoved(
-          renderResult.getByTestId('hostIsolationExceptionListLoader')
-        );
-      });
-
-      it('should display the search bar, item count and policy filter', async () => {
-        render();
-        await waitForApiCall();
-        expect(renderResult.getByTestId('searchExceptions')).toBeTruthy();
-        expect(renderResult.getByTestId('hostIsolationExceptions-totalCount').textContent).toBe(
-          'Showing 1 host isolation exception'
-        );
-        expect(renderResult.getByTestId('policiesSelectorButton')).toBeTruthy();
-      });
-
-      it('should show items on the list', async () => {
-        render();
-        await waitForApiCall();
-
-        expect(renderResult.getByTestId('hostIsolationExceptionsCard')).toBeTruthy();
-      });
-
-      it('should show API error if one is encountered', async () => {
-        getHostIsolationExceptionItemsMock.mockImplementation(() => {
-          throw new Error('Server is too far away');
-        });
-        render();
-        await waitForApiCall();
-        expect(
-          renderResult.getByTestId('hostIsolationExceptionsContent-error').textContent
-        ).toEqual(' Server is too far away');
-      });
-
-      it('should show the searchbar when no results from search', async () => {
-        // render the page with data
-        render();
-        await waitForApiCall();
-
-        // check if the searchbar is there
-        expect(renderResult.getByTestId('searchExceptions')).toBeTruthy();
+    apiMocks.responseProvider.exceptionsFind.mockClear();
 
-        // simulate a no-data scenario
-        getHostIsolationExceptionItemsMock.mockReturnValueOnce({
-          data: [],
-          page: 1,
-          per_page: 10,
-          total: 0,
-        });
-
-        // type something to search and press the button
-        userEvent.type(renderResult.getByTestId('searchField'), 'this does not exists');
-        userEvent.click(renderResult.getByTestId('searchButton'));
-
-        // wait for the page render
-        await waitFor(() =>
-          expect(getHostIsolationExceptionItemsMock).toHaveBeenLastCalledWith({
-            http: mockedContext.coreStart.http,
-            filter:
-              '(exception-list-agnostic.attributes.item_id:(*this*does*not*exists*) OR exception-list-agnostic.attributes.name:(*this*does*not*exists*) OR exception-list-agnostic.attributes.description:(*this*does*not*exists*) OR exception-list-agnostic.attributes.entries.value:(*this*does*not*exists*))',
-            page: 1,
-            perPage: 10,
-          })
-        );
-
-        // check the url changed
-        expect(mockedContext.history.location.search).toBe('?filter=this%20does%20not%20exists');
-
-        // check the searchbar is still there
-        expect(renderResult.getByTestId('searchExceptions')).toBeTruthy();
-      });
-
-      it('should apply a policy filter when a filter is selected', async () => {
-        const policies = await sendGetEndpointSpecificPackagePoliciesMock();
-        const firstPolicy = policies.items[0];
-        (sendGetEndpointSpecificPackagePolicies as jest.Mock).mockResolvedValue(policies);
-
-        render();
-        await waitForApiCall();
-
-        // press the filter button
-        const button = renderResult.getByTestId('policiesSelectorButton');
-        expect(button).toBeTruthy();
-        userEvent.click(button);
-
-        // find the first policy option and click it
-        const option = within(renderResult.getByTestId('policiesSelector-popover')).getByText(
-          firstPolicy.name
-        );
-        userEvent.click(option);
-
-        // wait for the page render
-        await waitFor(() =>
-          expect(getHostIsolationExceptionItemsMock).toHaveBeenLastCalledWith({
-            http: mockedContext.coreStart.http,
-            filter: `((exception-list-agnostic.attributes.tags:"policy:${firstPolicy.id}"))`,
-            page: 1,
-            perPage: 10,
-          })
-        );
-
-        // check the url changed
-        expect(mockedContext.history.location.search).toBe(`?included_policies=${firstPolicy.id}`);
-      });
+    act(() => {
+      userEvent.type(renderResult.getByTestId('searchField'), 'fooFooFoo');
     });
-
-    describe('has canIsolateHost privileges', () => {
-      beforeEach(async () => {
-        setEndpointPrivileges({ canIsolateHost: true });
-        getHostIsolationExceptionItemsMock.mockImplementation(() =>
-          getFoundExceptionListItemSchemaMock(1)
-        );
-      });
-
-      it('should show the create flyout when the add button is pressed', async () => {
-        render();
-        await waitForApiCall();
-        userEvent.click(renderResult.getByTestId('hostIsolationExceptionsListAddButton'));
-        await waitForApiCall();
-        await waitFor(() => {
-          expect(sendGetEndpointSpecificPackagePolicies).toHaveBeenCalled();
-        });
-        expect(renderResult.getByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeTruthy();
-      });
-
-      it('should show the create flyout when the show location is create', async () => {
-        history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=create`);
-        render();
-        await waitForApiCall();
-        await waitFor(() => {
-          expect(sendGetEndpointSpecificPackagePolicies).toHaveBeenCalled();
-        });
-        expect(renderResult.getByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeTruthy();
-        expect(renderResult.queryByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeTruthy();
-      });
+    act(() => {
+      fireEvent.click(renderResult.getByTestId('searchButton'));
     });
 
-    describe('does not have canIsolateHost privileges', () => {
-      beforeEach(() => {
-        setEndpointPrivileges({ canIsolateHost: false });
-      });
-
-      it('should not show the create flyout if the user navigates to the create url', () => {
-        history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=create`);
-        render();
-        expect(renderResult.queryByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeFalsy();
-      });
-
-      it('should not show the create flyout if the user navigates to the edit url', () => {
-        history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=edit`);
-        render();
-        expect(renderResult.queryByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeFalsy();
-      });
+    await waitFor(() => {
+      expect(apiMocks.responseProvider.exceptionsFind).toHaveBeenCalled();
     });
 
-    describe('and the back button is present', () => {
-      beforeEach(async () => {
-        renderResult = render();
-        act(() => {
-          history.push(HOST_ISOLATION_EXCEPTIONS_PATH, {
-            onBackButtonNavigateTo: [{ appId: 'appId' }],
-            backButtonLabel: 'back to fleet',
-            backButtonUrl: '/fleet',
-          });
-        });
-      });
-
-      it('back button is present', () => {
-        const button = renderResult.queryByTestId('backToOrigin');
-        expect(button).not.toBeNull();
-        expect(button).toHaveAttribute('href', '/fleet');
-      });
+    expect(apiMocks.responseProvider.exceptionsFind).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        query: expect.objectContaining({
+          filter: expectedFilterString,
+        }),
+      })
+    );
+  });
 
-      it('back button is still present after push history', () => {
-        act(() => {
-          history.push(HOST_ISOLATION_EXCEPTIONS_PATH);
-        });
-        const button = renderResult.queryByTestId('backToOrigin');
-        expect(button).not.toBeNull();
-        expect(button).toHaveAttribute('href', '/fleet');
-      });
+  it('should hide the Create and Edit actions when host isolation authz is not allowed', async () => {
+    // Use case: license downgrade scenario, where user still has entries defined, but no longer
+    // able to create or edit them (only Delete them)
+    const existingPrivileges = useUserPrivilegesMock();
+    useUserPrivilegesMock.mockReturnValue({
+      ...existingPrivileges,
+      endpointPrivileges: {
+        ...existingPrivileges.endpointPrivileges,
+        canIsolateHost: false,
+      },
     });
 
-    describe('and the back button is not present', () => {
-      beforeEach(async () => {
-        renderResult = render();
-        act(() => {
-          history.push(HOST_ISOLATION_EXCEPTIONS_PATH);
-        });
-      });
+    const { findAllByTestId, queryByTestId, getByTestId } = await render();
 
-      it('back button is not present when missing history params', () => {
-        const button = renderResult.queryByTestId('backToOrigin');
-        expect(button).toBeNull();
-      });
+    await waitFor(async () => {
+      await expect(findAllByTestId('hostIsolationExceptionsListPage-card')).resolves.toHaveLength(
+        10
+      );
+    });
+    await getFirstCard(renderResult, {
+      showActions: true,
+      testId: 'hostIsolationExceptionsListPage',
     });
+
+    expect(queryByTestId('hostIsolationExceptionsListPage-pageAddButton')).toBeNull();
+    expect(getByTestId('hostIsolationExceptionsListPage-card-cardDeleteAction')).toBeTruthy();
+    expect(queryByTestId('hostIsolationExceptionsListPage-card-cardEditAction')).toBeNull();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
index 5af8863f3a5cc..e8963d5111bc8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
@@ -5,310 +5,128 @@
  * 2.0.
  */
 
-import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
-import { Immutable, ListPageRouteState } from '../../../../../common/endpoint/types';
-import { ExceptionItem } from '../../../../common/components/exceptions/viewer/exception_item';
+import React, { memo } from 'react';
+import { useHttp } from '../../../../common/lib/kibana';
+import { ArtifactListPage } from '../../../components/artifact_list_page';
+import type { ArtifactListPageProps } from '../../../components/artifact_list_page';
+import { HostIsolationExceptionsApiClient } from '../host_isolation_exceptions_api_client';
+import { SEARCHABLE_FIELDS } from '../constants';
+import { HostIsolationExceptionsForm } from './components/form';
 import { useUserPrivileges } from '../../../../common/components/user_privileges';
-import { useToasts } from '../../../../common/lib/kibana';
-import {
-  MANAGEMENT_DEFAULT_PAGE_SIZE,
-  MANAGEMENT_PAGE_SIZE_OPTIONS,
-} from '../../../common/constants';
-import { getEndpointListPath } from '../../../common/routing';
-import { getLoadPoliciesError } from '../../../common/translations';
-import { AdministrationListPage } from '../../../components/administration_list_page';
-import { ArtifactEntryCard, ArtifactEntryCardProps } from '../../../components/artifact_entry_card';
-import { useEndpointPoliciesToArtifactPolicies } from '../../../components/artifact_entry_card/hooks/use_endpoint_policies_to_artifact_policies';
-import { BackToExternalAppSecondaryButton } from '../../../components/back_to_external_app_secondary_button';
-import { BackToExternalAppButton } from '../../../components/back_to_external_app_button';
-import { ManagementPageLoader } from '../../../components/management_page_loader';
-import { PaginatedContent, PaginatedContentProps } from '../../../components/paginated_content';
-import { SearchExceptions } from '../../../components/search_exceptions';
-import { useGetEndpointSpecificPolicies } from '../../../services/policies/hooks';
-import { getCurrentLocation } from '../store/selector';
-import { HostIsolationExceptionDeleteModal } from './components/delete_modal';
-import { HostIsolationExceptionsEmptyState } from './components/empty';
-import { HostIsolationExceptionsFormFlyout } from './components/form_flyout';
-import {
-  DELETE_HOST_ISOLATION_EXCEPTION_LABEL,
-  EDIT_HOST_ISOLATION_EXCEPTION_LABEL,
-} from './components/translations';
-import {
-  useFetchHostIsolationExceptionsList,
-  useHostIsolationExceptionsNavigateCallback,
-  useHostIsolationExceptionsSelector,
-} from './hooks';
-import { useMemoizedRouteState } from '../../../common/hooks';
 
-type HostIsolationExceptionPaginatedContent = PaginatedContentProps<
-  Immutable<ExceptionListItemSchema>,
-  typeof ExceptionItem
->;
-
-const getPaginationObject = ({
-  total = 0,
-  perPage = MANAGEMENT_DEFAULT_PAGE_SIZE,
-  page = 1,
-}: {
-  total?: number;
-  perPage?: number;
-  page?: number;
-}) => ({
-  totalItemCount: total,
-  pageSize: perPage,
-  pageSizeOptions: [...MANAGEMENT_PAGE_SIZE_OPTIONS],
-  pageIndex: page - 1,
-});
-
-export const HostIsolationExceptionsList = () => {
-  const history = useHistory();
-  const privileges = useUserPrivileges().endpointPrivileges;
-  const { state: routeState } = useLocation<ListPageRouteState | undefined>();
-
-  const location = useHostIsolationExceptionsSelector(getCurrentLocation);
-  const navigateCallback = useHostIsolationExceptionsNavigateCallback();
-
-  const memoizedRouteState = useMemoizedRouteState(routeState);
-
-  const backButtonEmptyComponent = useMemo(() => {
-    if (memoizedRouteState && memoizedRouteState.onBackButtonNavigateTo) {
-      return <BackToExternalAppSecondaryButton {...memoizedRouteState} />;
+const HOST_ISOLATION_EXCEPTIONS_LABELS: ArtifactListPageProps['labels'] = Object.freeze({
+  pageTitle: i18n.translate('xpack.securitySolution.hostIsolationExceptions.pageTitle', {
+    defaultMessage: 'Host isolation exceptions',
+  }),
+  pageAboutInfo: i18n.translate('xpack.securitySolution.hostIsolationExceptions.pageAboutInfo', {
+    defaultMessage:
+      'Add a host isolation exception to allow isolated hosts to communicate with specific IPs.',
+  }),
+  pageAddButtonTitle: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.pageAddButtonTitle',
+    {
+      defaultMessage: 'Add host isolation exception',
     }
-  }, [memoizedRouteState]);
-
-  const backButtonHeaderComponent = useMemo(() => {
-    if (memoizedRouteState && memoizedRouteState.onBackButtonNavigateTo) {
-      return <BackToExternalAppButton {...memoizedRouteState} />;
+  ),
+  getShowingCountLabel: (total) =>
+    i18n.translate('xpack.securitySolution.hostIsolationExceptions.showingTotal', {
+      defaultMessage:
+        'Showing {total} {total, plural, one {host isolation exception} other {host isolation exceptions}}',
+      values: { total },
+    }),
+  cardActionEditLabel: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.cardActionEditLabel',
+    {
+      defaultMessage: 'Edit exception',
     }
-  }, [memoizedRouteState]);
-
-  const [itemToDelete, setItemToDelete] = useState<ExceptionListItemSchema | null>(null);
-
-  const includedPoliciesParam = location.included_policies;
-
-  const { isLoading, isRefetching, data, error, refetch } = useFetchHostIsolationExceptionsList({
-    filter: location.filter,
-    page: location.page_index,
-    perPage: location.page_size,
-    policies:
-      includedPoliciesParam && includedPoliciesParam !== ''
-        ? includedPoliciesParam.split(',')
-        : undefined,
-  });
-
-  const { isLoading: isLoadingAll, data: allData } = useFetchHostIsolationExceptionsList({
-    page: 0,
-    perPage: 1,
-    enabled: data && !data.total,
-  });
-
-  const toasts = useToasts();
-
-  // load the list of policies>
-  const policiesRequest = useGetEndpointSpecificPolicies({
-    onError: (err) => {
-      toasts.addDanger(getLoadPoliciesError(err));
-    },
-  });
-
-  const pagination = getPaginationObject({
-    total: data?.total,
-    perPage: data?.per_page,
-    page: data?.page,
-  });
-
-  const listItems = data?.data || [];
-  const allListItems = allData?.data || [];
-
-  const showFlyout = privileges.canIsolateHost && !!location.show;
-  const hasDataToShow = allListItems.length > 0 || listItems.length > 0;
-
-  useEffect(() => {
-    if (!isLoading && listItems.length === 0 && !privileges.canIsolateHost) {
-      history.replace(getEndpointListPath({ name: 'endpointList' }));
+  ),
+  cardActionDeleteLabel: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.cardActionDeleteLabel',
+    {
+      defaultMessage: 'Delete exception',
     }
-  }, [history, isLoading, listItems.length, privileges.canIsolateHost]);
-
-  const handleOnSearch = useCallback(
-    (filter: string, includedPolicies: string) => {
-      navigateCallback({
-        filter,
-        included_policies: includedPolicies,
-      });
-    },
-    [navigateCallback]
-  );
-
-  const artifactCardPolicies = useEndpointPoliciesToArtifactPolicies(policiesRequest.data?.items);
-
-  function handleItemComponentProps(element: ExceptionListItemSchema): ArtifactEntryCardProps {
-    const editAction = {
-      icon: 'controlsHorizontal',
-      onClick: () => {
-        navigateCallback({
-          show: 'edit',
-          id: element.id,
-        });
-      },
-      'data-test-subj': 'editHostIsolationException',
-      children: EDIT_HOST_ISOLATION_EXCEPTION_LABEL,
-    };
-    const deleteAction = {
-      icon: 'trash',
-      onClick: () => {
-        setItemToDelete(element);
-      },
-      'data-test-subj': 'deleteHostIsolationException',
-      children: DELETE_HOST_ISOLATION_EXCEPTION_LABEL,
-    };
-    return {
-      item: element,
-      'data-test-subj': `hostIsolationExceptionsCard`,
-      actions: privileges.canIsolateHost ? [editAction, deleteAction] : [deleteAction],
-      policies: artifactCardPolicies,
-      hideDescription: !element.description,
-      hideComments: !element.comments.length,
-    };
-  }
-
-  const handlePaginatedContentChange: HostIsolationExceptionPaginatedContent['onChange'] =
-    useCallback(
-      ({ pageIndex, pageSize }) => {
-        navigateCallback({
-          page_index: pageIndex,
-          page_size: pageSize,
-        });
-      },
-      [navigateCallback]
-    );
-
-  const handleAddButtonClick = useCallback(
-    () =>
-      navigateCallback({
-        show: 'create',
-        id: undefined,
-      }),
-    [navigateCallback]
-  );
-
-  const handleCloseDeleteDialog = (forceRefresh: boolean = false) => {
-    if (forceRefresh) {
-      refetch();
+  ),
+  flyoutCreateTitle: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.flyoutCreateTitle',
+    {
+      defaultMessage: 'Add host isolation exception',
     }
-    setItemToDelete(null);
-  };
-
-  const handleCloseFlyout = useCallback(
-    () =>
-      navigateCallback({
-        show: undefined,
-        id: undefined,
-      }),
-    [navigateCallback]
-  );
-
-  const isSearchLoading = isLoading || isRefetching;
+  ),
+  flyoutEditTitle: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.flyoutEditTitle',
+    {
+      defaultMessage: 'Edit host isolation exception',
+    }
+  ),
+  flyoutCreateSubmitButtonLabel: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.flyoutCreateSubmitButtonLabel',
+    { defaultMessage: 'Add host isolation exception' }
+  ),
+  flyoutCreateSubmitSuccess: ({ name }) =>
+    i18n.translate('xpack.securitySolution.hostIsolationExceptions.flyoutCreateSubmitSuccess', {
+      defaultMessage: '"{name}" has been added to your host isolation exception list.',
+      values: { name },
+    }),
+  flyoutEditSubmitSuccess: ({ name }) =>
+    i18n.translate('xpack.securitySolution.hostIsolationExceptions.flyoutEditSubmitSuccess', {
+      defaultMessage: '"{name}" has been updated.',
+      values: { name },
+    }),
+  flyoutDowngradedLicenseDocsInfo: () => {
+    // Host Isolation Exceptions does not need to show a downgrade license message because
+    // this feature is only available for license levels that also includes per-policy functionality.
+    return null;
+  },
+  deleteModalTitle: () =>
+    i18n.translate('xpack.securitySolution.hostIsolationExceptions.deleteModtalTitle', {
+      defaultMessage: 'Delete host isolation exception',
+    }),
+  deleteActionSuccess: (itemName) =>
+    i18n.translate('xpack.securitySolution.hostIsolationExceptions.deleteSuccess', {
+      defaultMessage: '"{itemName}" has been removed from host isolation exception list.',
+      values: { itemName },
+    }),
+  emptyStateTitle: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.emptyStateTitle',
+    {
+      defaultMessage: 'Add your first host isolation exception',
+    }
+  ),
+  emptyStateInfo: i18n.translate('xpack.securitySolution.hostIsolationExceptions.emptyStateInfo', {
+    defaultMessage:
+      'Add a host isolation exception to allow isolated hosts to communicate with specific IPs.',
+  }),
+  emptyStatePrimaryButtonLabel: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.emptyStatePrimaryButtonLabel',
+    { defaultMessage: 'Add host isolation exception' }
+  ),
+  searchPlaceholderInfo: i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.searchPlaceholderInfo',
+    {
+      defaultMessage: 'Search on the fields below: name, description, IP',
+    }
+  ),
+});
 
-  if ((isSearchLoading || isLoadingAll) && !hasDataToShow) {
-    return <ManagementPageLoader data-test-subj="hostIsolationExceptionListLoader" />;
-  }
+export const HostIsolationExceptionsList = memo(() => {
+  const http = useHttp();
+  const apiClient = HostIsolationExceptionsApiClient.getInstance(http);
+  // There is a flow when the Host Isolation Exceptions page is accessible to the user, even
+  // though they might not have authz to isolate hosts - in a downgrade scenario when entries
+  // still exist. The only thing the user can do is view and delete entries.
+  const canIsolate = useUserPrivileges().endpointPrivileges.canIsolateHost;
 
   return (
-    <AdministrationListPage
-      headerBackComponent={backButtonHeaderComponent}
-      title={
-        <FormattedMessage
-          id="xpack.securitySolution.hostIsolationExceptions.list.pageTitle"
-          defaultMessage="Host isolation exceptions"
-        />
-      }
-      subtitle={
-        <FormattedMessage
-          id="xpack.securitySolution.hostIsolationExceptions.list.pageSubTitle"
-          defaultMessage="Add a host isolation exception to allow isolated hosts to communicate with specific IPs."
-        />
-      }
-      actions={
-        privileges.canIsolateHost && hasDataToShow ? (
-          <EuiButton
-            fill
-            iconType="plusInCircle"
-            isDisabled={showFlyout}
-            onClick={handleAddButtonClick}
-            data-test-subj="hostIsolationExceptionsListAddButton"
-          >
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.list.addButton"
-              defaultMessage="Add host isolation exception"
-            />
-          </EuiButton>
-        ) : (
-          []
-        )
-      }
-      hideHeader={!hasDataToShow}
-    >
-      {showFlyout && (
-        <HostIsolationExceptionsFormFlyout onCancel={handleCloseFlyout} id={location.id} />
-      )}
-
-      {itemToDelete ? (
-        <HostIsolationExceptionDeleteModal item={itemToDelete} onCancel={handleCloseDeleteDialog} />
-      ) : null}
-
-      {hasDataToShow ? (
-        <>
-          <SearchExceptions
-            defaultValue={location.filter}
-            onSearch={handleOnSearch}
-            policyList={policiesRequest.data?.items}
-            hasPolicyFilter
-            defaultIncludedPolicies={location.included_policies}
-            placeholder={i18n.translate(
-              'xpack.securitySolution.hostIsolationExceptions.search.placeholder',
-              {
-                defaultMessage: 'Search on the fields below: name, description, IP',
-              }
-            )}
-          />
-          <EuiSpacer size="m" />
-          <EuiText color="subdued" size="xs" data-test-subj="hostIsolationExceptions-totalCount">
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.list.totalCount"
-              defaultMessage="Showing {total, plural, one {# host isolation exception} other {# host isolation exceptions}}"
-              values={{ total: listItems.length }}
-            />
-          </EuiText>
-          <EuiSpacer size="s" />
-        </>
-      ) : null}
-
-      <PaginatedContent<ExceptionListItemSchema, typeof ArtifactEntryCard>
-        items={listItems}
-        ItemComponent={ArtifactEntryCard}
-        itemComponentProps={handleItemComponentProps}
-        onChange={handlePaginatedContentChange}
-        error={error?.message}
-        loading={isSearchLoading}
-        pagination={pagination}
-        contentClassName="host-isolation-exceptions-container"
-        data-test-subj="hostIsolationExceptionsContent"
-        noItemsMessage={
-          !hasDataToShow && (
-            <HostIsolationExceptionsEmptyState
-              onAdd={handleAddButtonClick}
-              backComponent={backButtonEmptyComponent}
-            />
-          )
-        }
-      />
-    </AdministrationListPage>
+    <ArtifactListPage
+      apiClient={apiClient}
+      ArtifactFormComponent={HostIsolationExceptionsForm}
+      labels={HOST_ISOLATION_EXCEPTIONS_LABELS}
+      data-test-subj="hostIsolationExceptionsListPage"
+      searchableFields={SEARCHABLE_FIELDS}
+      allowCardCreateAction={canIsolate}
+      allowCardEditAction={canIsolate}
+    />
   );
-};
-
+});
 HostIsolationExceptionsList.displayName = 'HostIsolationExceptionsList';
diff --git a/x-pack/plugins/security_solution/public/management/pages/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/index.test.tsx
index 5abdb5020110e..e4516110c91ab 100644
--- a/x-pack/plugins/security_solution/public/management/pages/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/index.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
-import { ManagementContainer } from './index';
-import '../../common/mock/match_media.ts';
+import { ManagementContainer } from '.';
+import '../../common/mock/match_media';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../common/mock/endpoint';
 import { useUserPrivileges } from '../../common/components/user_privileges';
 import { endpointPageHttpMock } from './endpoint_hosts/mocks';
diff --git a/x-pack/plugins/security_solution/public/management/pages/index.tsx b/x-pack/plugins/security_solution/public/management/pages/index.tsx
index fb23b7466623c..2da77bb24c919 100644
--- a/x-pack/plugins/security_solution/public/management/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/index.tsx
@@ -7,8 +7,8 @@
 
 import React, { memo } from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
-import { EuiEmptyPrompt, EuiLoadingSpinner, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import {
   MANAGEMENT_ROUTING_ENDPOINTS_PATH,
   MANAGEMENT_ROUTING_EVENT_FILTERS_PATH,
@@ -18,7 +18,6 @@ import {
   MANAGEMENT_ROUTING_BLOCKLIST_PATH,
 } from '../common/constants';
 import { NotFoundPage } from '../../app/404';
-import { TrackApplicationView } from '../../../../../../src/plugins/usage_collection/public';
 import { EndpointsContainer } from './endpoint_hosts';
 import { PolicyContainer } from './policy';
 import { TrustedAppsContainer } from './trusted_apps';
@@ -29,35 +28,7 @@ import { getEndpointListPath } from '../common/routing';
 import { useUserPrivileges } from '../../common/components/user_privileges';
 import { HostIsolationExceptionsContainer } from './host_isolation_exceptions';
 import { BlocklistContainer } from './blocklist';
-
-const NoPermissions = memo(() => {
-  return (
-    <>
-      <EuiEmptyPrompt
-        iconType="alert"
-        iconColor="danger"
-        titleSize="l"
-        data-test-subj="noIngestPermissions"
-        title={
-          <FormattedMessage
-            id="xpack.securitySolution.endpointManagemnet.noPermissionsText"
-            defaultMessage="You do not have the required Kibana permissions to use Elastic Security Administration"
-          />
-        }
-        body={
-          <EuiText color="subdued">
-            <FormattedMessage
-              id="xpack.securitySolution.endpointManagement.noPermissionsSubText"
-              defaultMessage="You must have the superuser role to use this feature. If you do not have the superuser role and do not have permissions to edit user roles, contact your Kibana administrator."
-            />
-          </EuiText>
-        }
-      />
-      <SpyRoute pageName={SecurityPageName.administration} />
-    </>
-  );
-});
-NoPermissions.displayName = 'NoPermissions';
+import { NoPermissions } from '../components/no_permissons';
 
 const EndpointTelemetry = () => (
   <TrackApplicationView viewId={SecurityPageName.endpoints}>
@@ -99,7 +70,12 @@ export const ManagementContainer = memo(() => {
   }
 
   if (!canAccessEndpointManagement) {
-    return <Route path="*" component={NoPermissions} />;
+    return (
+      <>
+        <Route path="*" component={NoPermissions} />
+        <SpyRoute pageName={SecurityPageName.administration} />
+      </>
+    );
   }
 
   return (
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/exceptions_list_http_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/exceptions_list_http_mocks.ts
new file mode 100644
index 0000000000000..cbf85ad294b9f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/exceptions_list_http_mocks.ts
@@ -0,0 +1,259 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  ExceptionListItemSchema,
+  FoundExceptionListItemSchema,
+  FindExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+  ReadExceptionListItemSchema,
+  CreateExceptionListItemSchema,
+  DeleteExceptionListItemSchema,
+  ExceptionListSchema,
+  ExceptionListSummarySchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import {
+  composeHttpHandlerMocks,
+  httpHandlerMockFactory,
+  ResponseProvidersInterface,
+} from '../../../common/mock/endpoint/http_handler_mock_factory';
+import { ExceptionsListItemGenerator } from '../../../../common/endpoint/data_generators/exceptions_list_item_generator';
+import {
+  BY_POLICY_ARTIFACT_TAG_PREFIX,
+  GLOBAL_ARTIFACT_TAG,
+} from '../../../../common/endpoint/service/artifacts';
+
+interface FindExceptionListItemSchemaQueryParams
+  extends Omit<FindExceptionListItemSchema, 'page' | 'per_page'> {
+  page?: number;
+  per_page?: number;
+}
+
+export type ExceptionsFindHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionsFind: (options: HttpFetchOptionsWithPath) => FoundExceptionListItemSchema;
+}>;
+/**
+ * HTTP mock for retrieving list of Exception
+ */
+export const exceptionsFindHttpMocks = httpHandlerMockFactory<ExceptionsFindHttpMocksInterface>([
+  {
+    id: 'exceptionsFind',
+    path: `${EXCEPTION_LIST_ITEM_URL}/_find`,
+    method: 'get',
+    handler: ({ query }): FoundExceptionListItemSchema => {
+      const apiQueryParams = query as unknown as FindExceptionListItemSchemaQueryParams;
+      const generator = new ExceptionsListItemGenerator('seed');
+      const perPage = apiQueryParams.per_page ?? 10;
+      const data = Array.from({ length: Math.min(perPage, 50) }, () =>
+        generator.generate({ tags: [GLOBAL_ARTIFACT_TAG] })
+      );
+
+      // If we have more than 2 items, then set policy ids on the per-policy trusted app
+      if (data.length > 2) {
+        // FIXME: remove hard-coded IDs below adn get them from the new FleetPackagePolicyGenerator (#2262)
+
+        // Change the 3rd entry (index 2) to be policy specific
+        data[2].tags = [
+          // IDs below are those generated by the `fleetGetEndpointPackagePolicyListHttpMock()` mock,
+          // so if using in combination with that API mock, these should just "work"
+          `${BY_POLICY_ARTIFACT_TAG_PREFIX}ddf6570b-9175-4a6d-b288-61a09771c647`,
+          `${BY_POLICY_ARTIFACT_TAG_PREFIX}b8e616ae-44fc-4be7-846c-ce8fa5c082dd`,
+        ];
+      }
+
+      return {
+        page: apiQueryParams.page ?? 1,
+        per_page: perPage,
+        total: 20,
+        data,
+      };
+    },
+  },
+]);
+
+export type ExceptionsPutHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionUpdate: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mocks that support updating a single Exception
+ */
+export const exceptionPutHttpMocks = httpHandlerMockFactory<ExceptionsPutHttpMocksInterface>([
+  {
+    id: 'exceptionUpdate',
+    path: EXCEPTION_LIST_ITEM_URL,
+    method: 'put',
+    handler: ({ body, path }): ExceptionListItemSchema => {
+      const updatedExceptionItem = JSON.parse(
+        body as string
+      ) as Required<UpdateExceptionListItemSchema>;
+      const response: ExceptionListItemSchema = {
+        ...updatedExceptionItem,
+        id: path.split('/').pop() ?? 'unknown-id',
+        list_id: 'endpoint_list_id',
+        comments: [],
+        created_at: '2021-10-12T16:02:55.856Z',
+        created_by: 'elastic',
+        updated_at: '2021-10-13T16:02:55.856Z',
+        updated_by: 'elastic',
+        _version: 'abc',
+        tie_breaker_id: '1111',
+      };
+
+      return response;
+    },
+  },
+]);
+
+export type ExceptionsGetOneHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionGetOne: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mock for retrieving one Exception
+ */
+export const exceptionsGetOneHttpMocks = httpHandlerMockFactory<ExceptionsGetOneHttpMocksInterface>(
+  [
+    {
+      id: 'exceptionGetOne',
+      path: EXCEPTION_LIST_ITEM_URL,
+      method: 'get',
+      handler: ({ query }): ExceptionListItemSchema => {
+        const apiQueryParams = query as ReadExceptionListItemSchema;
+        const exceptionItem = new ExceptionsListItemGenerator('seed').generate({
+          os_types: ['windows'],
+          tags: [GLOBAL_ARTIFACT_TAG],
+        });
+
+        exceptionItem.item_id = apiQueryParams.item_id ?? exceptionItem.item_id;
+        exceptionItem.namespace_type =
+          apiQueryParams.namespace_type ?? exceptionItem.namespace_type;
+
+        return exceptionItem;
+      },
+    },
+  ]
+);
+
+export type ExceptionsDeleteOneHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionDelete: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mock for deleting one Exception
+ */
+export const exceptionsDeleteOneHttpMocks =
+  httpHandlerMockFactory<ExceptionsDeleteOneHttpMocksInterface>([
+    {
+      id: 'exceptionDelete',
+      path: EXCEPTION_LIST_ITEM_URL,
+      method: 'delete',
+      handler: ({ query }): ExceptionListItemSchema => {
+        const apiQueryParams = query as DeleteExceptionListItemSchema;
+        const exceptionItem = new ExceptionsListItemGenerator('seed').generate({
+          os_types: ['windows'],
+          tags: [GLOBAL_ARTIFACT_TAG],
+        });
+
+        exceptionItem.item_id = apiQueryParams.item_id ?? exceptionItem.item_id;
+        exceptionItem.id = apiQueryParams.id ?? exceptionItem.id;
+        exceptionItem.namespace_type =
+          apiQueryParams.namespace_type ?? exceptionItem.namespace_type;
+
+        return exceptionItem;
+      },
+    },
+  ]);
+
+export type ExceptionsPostHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionCreate: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mocks that support creating a single Exception
+ */
+export const exceptionPostHttpMocks = httpHandlerMockFactory<ExceptionsPostHttpMocksInterface>([
+  {
+    id: 'exceptionCreate',
+    path: EXCEPTION_LIST_ITEM_URL,
+    method: 'post',
+    handler: ({ body, path }): ExceptionListItemSchema => {
+      const { comments, ...updatedExceptionItem } = JSON.parse(
+        body as string
+      ) as CreateExceptionListItemSchema;
+      const response: ExceptionListItemSchema = {
+        ...new ExceptionsListItemGenerator('seed').generate({
+          os_types: ['windows'],
+          tags: [GLOBAL_ARTIFACT_TAG],
+        }),
+        ...updatedExceptionItem,
+      };
+      response.id = path.split('/').pop() ?? response.id;
+
+      return response;
+    },
+  },
+]);
+
+export type ExceptionsPostCreateListHttpMockInterface = ResponseProvidersInterface<{
+  exceptionCreateList: (options: HttpFetchOptionsWithPath) => ExceptionListSchema;
+}>;
+/**
+ * HTTP mock that support creating the list
+ */
+export const exceptionsPostCreateListHttpMock =
+  httpHandlerMockFactory<ExceptionsPostCreateListHttpMockInterface>([
+    {
+      id: 'exceptionCreateList',
+      path: EXCEPTION_LIST_URL,
+      method: 'post',
+      handler: (): ExceptionListSchema => {
+        return getExceptionListSchemaMock();
+      },
+    },
+  ]);
+
+export type ExceptionsGetSummaryHttpMockInterface = ResponseProvidersInterface<{
+  exceptionsSummary: (options: HttpFetchOptionsWithPath) => ExceptionListSummarySchema;
+}>;
+/**
+ * HTTP mocks that support the Get Summary api
+ */
+export const exceptionsGetSummaryHttpMock =
+  httpHandlerMockFactory<ExceptionsGetSummaryHttpMockInterface>([
+    {
+      id: 'exceptionsSummary',
+      path: `${EXCEPTION_LIST_URL}/summary`,
+      method: 'get',
+      handler: (): ExceptionListSummarySchema => {
+        return {
+          total: 10,
+          linux: 2,
+          macos: 3,
+          windows: 5,
+        };
+      },
+    },
+  ]);
+
+export type ExceptionsListAllHttpMocksInterface = ExceptionsFindHttpMocksInterface &
+  ExceptionsGetOneHttpMocksInterface &
+  ExceptionsPutHttpMocksInterface &
+  ExceptionsDeleteOneHttpMocksInterface &
+  ExceptionsPostHttpMocksInterface &
+  ExceptionsPostCreateListHttpMockInterface &
+  ExceptionsGetSummaryHttpMockInterface;
+/** Use this HTTP mock when wanting to mock the API calls done by the Exception Http service */
+export const exceptionsListAllHttpMocks =
+  composeHttpHandlerMocks<ExceptionsListAllHttpMocksInterface>([
+    exceptionsFindHttpMocks,
+    exceptionsGetOneHttpMocks,
+    exceptionPutHttpMocks,
+    exceptionPostHttpMocks,
+    exceptionsPostCreateListHttpMock,
+    exceptionsDeleteOneHttpMocks,
+    exceptionsGetSummaryHttpMock,
+  ]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
index f015943b994b5..c134d7825a0fb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
@@ -6,10 +6,6 @@
  */
 
 import { fromKueryExpression } from '@kbn/es-query';
-import {
-  httpHandlerMockFactory,
-  ResponseProvidersInterface,
-} from '../../../common/mock/endpoint/http_handler_mock_factory';
 import {
   AGENT_API_ROUTES,
   AGENT_POLICY_API_ROUTES,
@@ -21,7 +17,11 @@ import {
   GetAgentStatusResponse,
   GetPackagesResponse,
   PACKAGE_POLICY_API_ROUTES,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import {
+  httpHandlerMockFactory,
+  ResponseProvidersInterface,
+} from '../../../common/mock/endpoint/http_handler_mock_factory';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse, GetPolicyResponse } from '../policy/types';
 import { FleetAgentPolicyGenerator } from '../../../../common/endpoint/data_generators/fleet_agent_policy_generator';
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts
index e1f793f6087dc..5368872e207af 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts
@@ -7,3 +7,4 @@
 
 export * from './fleet_mocks';
 export * from './trusted_apps_http_mocks';
+export * from './exceptions_list_http_mocks';
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
index 8e5f780bbab39..612793ade703e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import {
   ENDPOINT_TRUSTED_APPS_LIST_ID,
   EXCEPTION_LIST_ITEM_URL,
@@ -21,13 +21,13 @@ import {
   DeleteExceptionListItemSchema,
   ExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
+import { getTrustedAppsListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   composeHttpHandlerMocks,
   httpHandlerMockFactory,
   ResponseProvidersInterface,
 } from '../../../common/mock/endpoint/http_handler_mock_factory';
 import { ExceptionsListItemGenerator } from '../../../../common/endpoint/data_generators/exceptions_list_item_generator';
-import { getTrustedAppsListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
 import {
   fleetGetAgentPolicyListHttpMock,
   FleetGetAgentPolicyListHttpMockInterface,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts
index eec0ab1c6445c..3b578f85364c3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../../../../../../licensing/common/types';
-import { GetAgentStatusResponse } from '../../../../../../../../fleet/common/types/rest_spec';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { GetAgentStatusResponse } from '@kbn/fleet-plugin/common/types/rest_spec';
 import { PolicyData, UIPolicyConfig } from '../../../../../../../common/endpoint/types';
 import { ServerApiError } from '../../../../../../common/types';
 import { PolicyDetailsState } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
index 1fe646c86bd6a..96375cae68be9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
@@ -7,7 +7,7 @@
 
 import { PolicyDetailsState } from '../../types';
 import { applyMiddleware, createStore, Dispatch, Store } from 'redux';
-import { policyDetailsReducer, PolicyDetailsAction, policyDetailsMiddlewareFactory } from './index';
+import { policyDetailsReducer, PolicyDetailsAction, policyDetailsMiddlewareFactory } from '.';
 import { policyConfig } from './selectors';
 import { policyFactory } from '../../../../../../common/endpoint/models/policy_config';
 import { PolicyData } from '../../../../../../common/endpoint/types';
@@ -19,9 +19,9 @@ import {
   AppContextTestRender,
   createAppRootMockRenderer,
 } from '../../../../../common/mock/endpoint';
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 import { cloneDeep } from 'lodash';
-import { licenseMock } from '../../../../../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 
 describe('policy details: ', () => {
   let store: Store;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts
index f90fdf1213581..32f8bf44a4831 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError } from 'kibana/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import {
   DefaultPolicyNotificationMessage,
   DefaultPolicyRuleNotificationMessage,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts
index eda993be89848..fc2a6f160fce9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts
@@ -7,7 +7,7 @@
 
 import { matchPath } from 'react-router-dom';
 import { createSelector } from 'reselect';
-import { ILicense } from '../../../../../../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { unsetPolicyFeaturesAccordingToLicenseLevel } from '../../../../../../../common/license/policy_config';
 import { PolicyDetailsState } from '../../../types';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts
index bfd4637a1f416..129f904b39b51 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import {
   INGEST_API_EPM_PACKAGES,
   INGEST_API_PACKAGE_POLICIES,
 } from '../../../services/policies/ingest';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse } from '../types';
-import { GetPackagesResponse } from '../../../../../../fleet/common';
 
 const generator = new EndpointDocGenerator('policy-list');
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
index c1b30b6fad10c..e3641ba66e15b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
@@ -5,8 +5,61 @@
  * 2.0.
  */
 
-import { GetTrustedAppsListResponse } from '../../../../../common/endpoint/types';
-import { createSampleTrustedApps } from '../../trusted_apps/test_utils';
+import { OperatingSystem } from '@kbn/securitysolution-utils';
+import { GetTrustedAppsListResponse, TrustedApp } from '../../../../../common/endpoint/types';
+import {
+  MANAGEMENT_DEFAULT_PAGE,
+  MANAGEMENT_DEFAULT_PAGE_SIZE,
+  MANAGEMENT_PAGE_SIZE_OPTIONS,
+} from '../../../common/constants';
+
+interface Pagination {
+  pageIndex: number;
+  pageSize: number;
+  totalItemCount: number;
+  pageSizeOptions: number[];
+}
+
+const OPERATING_SYSTEMS: OperatingSystem[] = [
+  OperatingSystem.WINDOWS,
+  OperatingSystem.MAC,
+  OperatingSystem.LINUX,
+];
+
+const generate = <T>(count: number, generator: (i: number) => T) =>
+  [...new Array(count).keys()].map(generator);
+
+const createSampleTrustedApp = (i: number, longTexts?: boolean): TrustedApp => {
+  return {
+    id: String(i),
+    version: 'abc123',
+    name: generate(longTexts ? 10 : 1, () => `trusted app ${i}`).join(' '),
+    description: generate(longTexts ? 10 : 1, () => `Trusted App ${i}`).join(' '),
+    created_at: '1 minute ago',
+    created_by: 'someone',
+    updated_at: '1 minute ago',
+    updated_by: 'someone',
+    os: OPERATING_SYSTEMS[i % 3],
+    entries: [],
+    effectScope: { type: 'global' },
+  };
+};
+
+const createDefaultPagination = (): Pagination => ({
+  pageIndex: MANAGEMENT_DEFAULT_PAGE,
+  pageSize: MANAGEMENT_DEFAULT_PAGE_SIZE,
+  totalItemCount: 200,
+  pageSizeOptions: [...MANAGEMENT_PAGE_SIZE_OPTIONS],
+});
+
+const createSampleTrustedApps = (
+  pagination: Partial<Pagination>,
+  longTexts?: boolean
+): TrustedApp[] => {
+  const fullPagination = { ...createDefaultPagination(), ...pagination };
+
+  return generate(fullPagination.pageSize, (i: number) => createSampleTrustedApp(i, longTexts));
+};
 
 export const getMockListResponse: () => GetTrustedAppsListResponse = () => ({
   data: createSampleTrustedApps({}),
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
index dfdd0145992bf..bba1d87f307f7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
@@ -5,8 +5,14 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { ILicense } from '../../../../../licensing/common/types';
+import { CoreStart } from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import {
+  GetAgentStatusResponse,
+  GetOnePackagePolicyResponse,
+  GetPackagePoliciesResponse,
+  UpdatePackagePolicyResponse,
+} from '@kbn/fleet-plugin/common';
 import {
   AppLocation,
   Immutable,
@@ -19,12 +25,6 @@ import {
   PutTrustedAppUpdateResponse,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
-import {
-  GetAgentStatusResponse,
-  GetOnePackagePolicyResponse,
-  GetPackagePoliciesResponse,
-  UpdatePackagePolicyResponse,
-} from '../../../../../fleet/common';
 import { ImmutableMiddlewareAPI } from '../../../common/store';
 import { AppAction } from '../../../common/store/actions';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx
index ed5553337d6ac..c30b5a8887338 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx
@@ -10,7 +10,7 @@ import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import uuid from 'uuid';
-import { getExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx
index a92411c22ce2b..172a8e671d2ad 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx
@@ -7,7 +7,7 @@
 
 import { EuiCallOut, EuiConfirmModal, EuiSpacer, EuiText } from '@elastic/eui';
 import { useQueryClient } from 'react-query';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import React, { useCallback } from 'react';
 import { useBulkUpdateArtifact } from '../../../../../hooks/artifacts';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unassigned.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unassigned.tsx
index 5a606de45068d..2bee159dc6e4d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unassigned.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unassigned.tsx
@@ -12,8 +12,7 @@ import { useGetLinkTo } from './use_policy_artifacts_empty_hooks';
 import { useUserPrivileges } from '../../../../../../common/components/user_privileges';
 import { POLICY_ARTIFACT_EMPTY_UNASSIGNED_LABELS } from './translations';
 import { EventFiltersPageLocation } from '../../../../event_filters/types';
-import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
-import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
+import { ArtifactListPageUrlParams } from '../../../../../components/artifact_list_page';
 interface CommonProps {
   policyId: string;
   policyName: string;
@@ -21,10 +20,7 @@ interface CommonProps {
   labels: typeof POLICY_ARTIFACT_EMPTY_UNASSIGNED_LABELS;
   getPolicyArtifactsPath: (policyId: string) => string;
   getArtifactPath: (
-    location?:
-      | Partial<EventFiltersPageLocation>
-      | Partial<TrustedAppsListPageLocation>
-      | Partial<HostIsolationExceptionsPageLocation>
+    location?: Partial<EventFiltersPageLocation> | Partial<ArtifactListPageUrlParams>
   ) => string;
 }
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unexisting.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unexisting.tsx
index c62db552e9a01..7d12389048753 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unexisting.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unexisting.tsx
@@ -10,8 +10,7 @@ import { EuiEmptyPrompt, EuiButton, EuiPageTemplate } from '@elastic/eui';
 import { useGetLinkTo } from './use_policy_artifacts_empty_hooks';
 import { POLICY_ARTIFACT_EMPTY_UNEXISTING_LABELS } from './translations';
 import { EventFiltersPageLocation } from '../../../../event_filters/types';
-import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
-import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
+import { ArtifactListPageUrlParams } from '../../../../../components/artifact_list_page';
 
 interface CommonProps {
   policyId: string;
@@ -19,10 +18,7 @@ interface CommonProps {
   labels: typeof POLICY_ARTIFACT_EMPTY_UNEXISTING_LABELS;
   getPolicyArtifactsPath: (policyId: string) => string;
   getArtifactPath: (
-    location?:
-      | Partial<EventFiltersPageLocation>
-      | Partial<TrustedAppsListPageLocation>
-      | Partial<HostIsolationExceptionsPageLocation>
+    location?: Partial<EventFiltersPageLocation> | Partial<ArtifactListPageUrlParams>
   ) => string;
 }
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/use_policy_artifacts_empty_hooks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/use_policy_artifacts_empty_hooks.ts
index 2304cb7dfdd6d..b2ee8e7dd17ba 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/use_policy_artifacts_empty_hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/use_policy_artifacts_empty_hooks.ts
@@ -11,18 +11,14 @@ import { useNavigateToAppEventHandler } from '../../../../../../common/hooks/end
 import { useAppUrl } from '../../../../../../common/lib/kibana/hooks';
 import { APP_UI_ID } from '../../../../../../../common/constants';
 import { EventFiltersPageLocation } from '../../../../event_filters/types';
-import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
-import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
+import { ArtifactListPageUrlParams } from '../../../../../components/artifact_list_page';
 
 export const useGetLinkTo = (
   policyId: string,
   policyName: string,
   getPolicyArtifactsPath: (policyId: string) => string,
   getArtifactPath: (
-    location?:
-      | Partial<EventFiltersPageLocation>
-      | Partial<TrustedAppsListPageLocation>
-      | Partial<HostIsolationExceptionsPageLocation>
+    location?: Partial<EventFiltersPageLocation> | Partial<ArtifactListPageUrlParams>
   ) => string,
   location?: Partial<{ show: 'create' }>
 ) => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx
index f93cb91ba8384..edf9f5b21d8b4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx
@@ -9,8 +9,8 @@ import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import uuid from 'uuid';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx
index 3372d4e122f7c..3ee0159e959cc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx
@@ -26,7 +26,7 @@ import {
 import { SearchExceptions } from '../../../../../components/search_exceptions';
 import { ImmutableObject, PolicyData } from '../../../../../../../common/endpoint/types';
 import { useToasts } from '../../../../../../common/lib/kibana';
-import { PolicyArtifactsAssignableList } from '../../artifacts/assignable';
+import { PolicyArtifactsAssignableList } from '../assignable';
 import { ExceptionsListApiClient } from '../../../../../services/exceptions_list/exceptions_list_api_client';
 import { useListArtifact, useBulkUpdateArtifact } from '../../../../../hooks/artifacts';
 import { POLICY_ARTIFACT_FLYOUT_LABELS } from './translations';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx
index 62342b4e64fcd..453c84f63689e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx
@@ -21,7 +21,7 @@ import { PolicyArtifactsLayout } from './policy_artifacts_layout';
 import { ImmutableObject, PolicyData } from '../../../../../../../common/endpoint/types';
 import { parsePoliciesAndFilterToKql } from '../../../../../common/utils';
 import { eventFiltersListQueryHttpMock } from '../../../../event_filters/test_utils';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { getEndpointPrivilegesInitialStateMock } from '../../../../../../common/components/user_privileges/endpoint/mocks';
 import { POLICY_ARTIFACT_EVENT_FILTERS_LABELS } from '../../tabs/event_filters_translations';
 import { EventFiltersApiClient } from '../../../../event_filters/service/event_filters_api_client';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.tsx
index c1f771fdcccde..ac3cf9e536b9a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.tsx
@@ -32,8 +32,7 @@ import { PolicyArtifactsFlyout } from '../flyout';
 import { PolicyArtifactsPageLabels, policyArtifactsPageLabels } from '../translations';
 import { PolicyArtifactsDeleteModal } from '../delete_modal';
 import { EventFiltersPageLocation } from '../../../../event_filters/types';
-import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
-import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
+import { ArtifactListPageUrlParams } from '../../../../../components/artifact_list_page';
 
 interface PolicyArtifactsLayoutProps {
   policyItem?: ImmutableObject<PolicyData> | undefined;
@@ -42,10 +41,7 @@ interface PolicyArtifactsLayoutProps {
   getExceptionsListApiClient: () => ExceptionsListApiClient;
   searchableFields: readonly string[];
   getArtifactPath: (
-    location?:
-      | Partial<EventFiltersPageLocation>
-      | Partial<TrustedAppsListPageLocation>
-      | Partial<HostIsolationExceptionsPageLocation>
+    location?: Partial<EventFiltersPageLocation> | Partial<ArtifactListPageUrlParams>
   ) => string;
   getPolicyArtifactsPath: (policyId: string) => string;
   /** A boolean to check extra privileges for restricted actions, true when it's allowed, false when not */
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx
index 76d4bb4535bc7..de2f245a9c098 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx
@@ -8,7 +8,7 @@
 import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.tsx
index 7f6e2e5cec180..445725915899b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.tsx
@@ -29,18 +29,14 @@ import { ExceptionsListApiClient } from '../../../../../services/exceptions_list
 import { useListArtifact } from '../../../../../hooks/artifacts';
 import { POLICY_ARTIFACT_LIST_LABELS } from './translations';
 import { EventFiltersPageLocation } from '../../../../event_filters/types';
-import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
-import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
+import { ArtifactListPageUrlParams } from '../../../../../components/artifact_list_page';
 
 interface PolicyArtifactsListProps {
   policy: ImmutableObject<PolicyData>;
   apiClient: ExceptionsListApiClient;
   searchableFields: string[];
   getArtifactPath: (
-    location?:
-      | Partial<EventFiltersPageLocation>
-      | Partial<TrustedAppsListPageLocation>
-      | Partial<HostIsolationExceptionsPageLocation>
+    location?: Partial<EventFiltersPageLocation> | Partial<ArtifactListPageUrlParams>
   ) => string;
   getPolicyArtifactsPath: (policyId: string) => string;
   labels: typeof POLICY_ARTIFACT_LIST_LABELS;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx
index c079ae8a3a7da..77debc1c866b6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx
@@ -21,7 +21,7 @@ import {
 import { OperatingSystem } from '@kbn/securitysolution-utils';
 import { ThemeContext } from 'styled-components';
 import { PolicyOperatingSystem, UIPolicyConfig } from '../../../../../../../common/endpoint/types';
-import { ConfigForm, ConfigFormHeading } from '../../components/config_form';
+import { ConfigForm, ConfigFormHeading } from '../config_form';
 
 const OPERATING_SYSTEM_TO_TEST_SUBJ: { [K in OperatingSystem]: string } = {
   [OperatingSystem.WINDOWS]: 'Windows',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx
index 781aa880d1483..f15382d983f99 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx
@@ -8,13 +8,13 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { useKibana } from '../../../../../common/lib/kibana';
-import { APP_PATH } from '../../../../../../common/constants';
 import {
   CustomAssetsAccordionProps,
   CustomAssetsAccordion,
   PackageAssetsComponent,
-} from '../../../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '../../../../../common/lib/kibana';
+import { APP_PATH } from '../../../../../../common/constants';
 
 export const EndpointCustomAssetsExtension: PackageAssetsComponent = () => {
   const { http } = useKibana().services;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
index 973d0d457756d..c98def71f8a59 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
@@ -10,7 +10,7 @@ import { ThemeProvider } from 'styled-components';
 import { I18nProvider } from '@kbn/i18n-react';
 import { ExceptionItemsSummary } from './exception_items_summary';
 import * as reactTestingLibrary from '@testing-library/react';
-import { getMockTheme } from '../../../../../../../../public/common/lib/kibana/kibana_react.mock';
+import { getMockTheme } from '../../../../../../../common/lib/kibana/kibana_react.mock';
 import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
 
 const mockTheme = getMockTheme({
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx
index dc8256d93ae00..a5380c740ed9c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx
@@ -9,12 +9,9 @@ import React, { memo, useMemo } from 'react';
 import { EuiPanel, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  PackageCustomExtensionComponentProps,
-  pagePathGetters,
-} from '../../../../../../../../../fleet/public';
+import { PackageCustomExtensionComponentProps, pagePathGetters } from '@kbn/fleet-plugin/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
 import { ListPageRouteState } from '../../../../../../../../common/endpoint/types';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../../fleet/common';
 import { useToasts } from '../../../../../../../common/lib/kibana';
 import { useAppUrl } from '../../../../../../../common/lib/kibana/hooks';
 import { LinkWithIcon } from './link_with_icon';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx
index 7989bb2646483..c88f54f01fd2b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx
@@ -18,7 +18,7 @@ import { FleetIntegrationArtifactsCard } from './fleet_integration_artifacts_car
 import { EndpointDocGenerator } from '../../../../../../../../common/endpoint/generate_data';
 import { getPolicyEventFiltersPath } from '../../../../../../common/routing';
 import { PolicyData } from '../../../../../../../../common/endpoint/types';
-import { getSummaryExceptionListSchemaMock } from '../../../../../../../../../lists/common/schemas/response/exception_list_summary_schema.mock';
+import { getSummaryExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_summary_schema.mock';
 import { EventFiltersApiClient } from '../../../../../event_filters/service/event_filters_api_client';
 import { SEARCHABLE_FIELDS } from '../../../../../event_filters/constants';
 import { EVENT_FILTERS_LABELS } from '../../endpoint_policy_edit_extension';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx
index 6ed604df57918..ce846ccb14560 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx
@@ -9,8 +9,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { memo, useMemo } from 'react';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../../fleet/common';
-import { pagePathGetters } from '../../../../../../../../../fleet/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { PolicyDetailsRouteState } from '../../../../../../../../common/endpoint/types';
 import { useAppUrl, useToasts } from '../../../../../../../common/lib/kibana';
 import { ExceptionItemsSummary } from './exception_items_summary';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.test.tsx
new file mode 100644
index 0000000000000..6aba0483fc945
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { AppContextTestRender } from '../../../../../../common/mock/endpoint';
+import { createFleetContextRendererMock, generateFleetPackageInfo } from '../mocks';
+import { EndpointPackageCustomExtension } from './endpoint_package_custom_extension';
+import { useEndpointPrivileges as _useEndpointPrivileges } from '../../../../../../common/components/user_privileges/endpoint/use_endpoint_privileges';
+import { getEndpointPrivilegesInitialStateMock } from '../../../../../../common/components/user_privileges/endpoint/mocks';
+import { exceptionsListAllHttpMocks } from '../../../../mocks/exceptions_list_http_mocks';
+import { waitFor } from '@testing-library/react';
+
+jest.mock('../../../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
+const useEndpointPrivilegesMock = _useEndpointPrivileges as jest.Mock;
+
+describe('When displaying the EndpointPackageCustomExtension fleet UI extension', () => {
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let http: AppContextTestRender['coreStart']['http'];
+  const artifactCards = Object.freeze([
+    'trustedApps-fleetCard',
+    'eventFilters-fleetCard',
+    'hostIsolationExceptions-fleetCard',
+    'blocklists-fleetCard',
+  ]);
+
+  beforeEach(() => {
+    const mockedTestContext = createFleetContextRendererMock();
+    http = mockedTestContext.coreStart.http;
+    render = () => {
+      renderResult = mockedTestContext.render(
+        <EndpointPackageCustomExtension
+          pkgkey="endpoint-8.2.0"
+          packageInfo={generateFleetPackageInfo()}
+        />
+      );
+
+      return renderResult;
+    };
+  });
+
+  afterEach(() => {
+    useEndpointPrivilegesMock.mockImplementation(getEndpointPrivilegesInitialStateMock);
+  });
+
+  it('should show artifact cards', async () => {
+    render();
+
+    await waitFor(() => {
+      artifactCards.forEach((artifactCard) => {
+        expect(renderResult.getByTestId(artifactCard)).toBeTruthy();
+      });
+    });
+  });
+
+  it('should NOT show artifact cards if no endpoint management authz', async () => {
+    useEndpointPrivilegesMock.mockReturnValue({
+      ...getEndpointPrivilegesInitialStateMock(),
+      canAccessEndpointManagement: false,
+    });
+    render();
+
+    await waitFor(() => {
+      artifactCards.forEach((artifactCard) => {
+        expect(renderResult.queryByTestId(artifactCard)).toBeNull();
+      });
+      expect(renderResult.queryByTestId('noIngestPermissions')).toBeTruthy();
+    });
+  });
+
+  it('should show Host Isolations Exceptions if user has no authz but entries exist', async () => {
+    useEndpointPrivilegesMock.mockReturnValue({
+      ...getEndpointPrivilegesInitialStateMock(),
+      canIsolateHost: false,
+    });
+    // Mock APIs
+    exceptionsListAllHttpMocks(http);
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByTestId('hostIsolationExceptions-fleetCard')).toBeTruthy();
+    });
+  });
+
+  it('should NOT show Host Isolation Exceptions if user has no authz and no entries exist', async () => {
+    useEndpointPrivilegesMock.mockReturnValue({
+      ...getEndpointPrivilegesInitialStateMock(),
+      canIsolateHost: false,
+    });
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.queryByTestId('hostIsolationExceptions-fleetCard')).toBeNull();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.tsx
new file mode 100644
index 0000000000000..7700c1f71fbab
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useMemo } from 'react';
+import { EuiSpacer } from '@elastic/eui';
+import { PackageCustomExtensionComponentProps } from '@kbn/fleet-plugin/public';
+import { useHttp } from '../../../../../../common/lib/kibana';
+import { useCanSeeHostIsolationExceptionsMenu } from '../../../../host_isolation_exceptions/view/hooks';
+import { TrustedAppsApiClient } from '../../../../trusted_apps/service/api_client';
+import { EventFiltersApiClient } from '../../../../event_filters/service/event_filters_api_client';
+import { HostIsolationExceptionsApiClient } from '../../../../host_isolation_exceptions/host_isolation_exceptions_api_client';
+import { BlocklistsApiClient } from '../../../../blocklist/services';
+import { FleetArtifactsCard } from './components/fleet_artifacts_card';
+import {
+  getBlocklistsListPath,
+  getEventFiltersListPath,
+  getHostIsolationExceptionsListPath,
+  getTrustedAppsListPath,
+} from '../../../../../common/routing';
+import {
+  BLOCKLISTS_LABELS,
+  EVENT_FILTERS_LABELS,
+  HOST_ISOLATION_EXCEPTIONS_LABELS,
+  TRUSTED_APPS_LABELS,
+} from './translations';
+import { useEndpointPrivileges } from '../../../../../../common/components/user_privileges/endpoint';
+import { NoPermissions } from '../../../../../components/no_permissons';
+
+export const EndpointPackageCustomExtension = memo<PackageCustomExtensionComponentProps>(
+  (props) => {
+    const http = useHttp();
+    const canSeeHostIsolationExceptions = useCanSeeHostIsolationExceptionsMenu();
+    const { canAccessEndpointManagement } = useEndpointPrivileges();
+
+    const trustedAppsApiClientInstance = useMemo(
+      () => TrustedAppsApiClient.getInstance(http),
+      [http]
+    );
+
+    const eventFiltersApiClientInstance = useMemo(
+      () => EventFiltersApiClient.getInstance(http),
+      [http]
+    );
+
+    const hostIsolationExceptionsApiClientInstance = useMemo(
+      () => HostIsolationExceptionsApiClient.getInstance(http),
+      [http]
+    );
+
+    const blocklistsApiClientInstance = useMemo(
+      () => BlocklistsApiClient.getInstance(http),
+      [http]
+    );
+
+    const artifactCards = useMemo(
+      () => (
+        <div data-test-subj="fleetEndpointPackageCustomContent">
+          <FleetArtifactsCard
+            {...props}
+            artifactApiClientInstance={trustedAppsApiClientInstance}
+            getArtifactsPath={getTrustedAppsListPath}
+            labels={TRUSTED_APPS_LABELS}
+            data-test-subj="trustedApps"
+          />
+          <EuiSpacer />
+          <FleetArtifactsCard
+            {...props}
+            artifactApiClientInstance={eventFiltersApiClientInstance}
+            getArtifactsPath={getEventFiltersListPath}
+            labels={EVENT_FILTERS_LABELS}
+            data-test-subj="eventFilters"
+          />
+          {canSeeHostIsolationExceptions && (
+            <>
+              <EuiSpacer />
+              <FleetArtifactsCard
+                {...props}
+                artifactApiClientInstance={hostIsolationExceptionsApiClientInstance}
+                getArtifactsPath={getHostIsolationExceptionsListPath}
+                labels={HOST_ISOLATION_EXCEPTIONS_LABELS}
+                data-test-subj="hostIsolationExceptions"
+              />
+            </>
+          )}
+          <EuiSpacer />
+          <FleetArtifactsCard
+            {...props}
+            artifactApiClientInstance={blocklistsApiClientInstance}
+            getArtifactsPath={getBlocklistsListPath}
+            labels={BLOCKLISTS_LABELS}
+            data-test-subj="blocklists"
+          />
+        </div>
+      ),
+      [
+        blocklistsApiClientInstance,
+        canSeeHostIsolationExceptions,
+        eventFiltersApiClientInstance,
+        hostIsolationExceptionsApiClientInstance,
+        trustedAppsApiClientInstance,
+        props,
+      ]
+    );
+
+    return canAccessEndpointManagement ? artifactCards : <NoPermissions />;
+  }
+);
+
+EndpointPackageCustomExtension.displayName = 'EndpointPackageCustomExtension';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx
index 68f3dbd494a0d..dde0dc54ecab3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx
@@ -5,156 +5,5 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { EuiSpacer } from '@elastic/eui';
-import React, { memo, useMemo } from 'react';
-import { useHttp } from '../../../../../../common/lib/kibana/hooks';
-import { PackageCustomExtensionComponentProps } from '../../../../../../../../fleet/public';
-import { FleetArtifactsCard } from './components/fleet_artifacts_card';
-import {
-  getBlocklistsListPath,
-  getEventFiltersListPath,
-  getHostIsolationExceptionsListPath,
-  getTrustedAppsListPath,
-} from '../../../../../common/routing';
-import { TrustedAppsApiClient } from '../../../../trusted_apps/service/trusted_apps_api_client';
-import { EventFiltersApiClient } from '../../../../event_filters/service/event_filters_api_client';
-import { HostIsolationExceptionsApiClient } from '../../../../host_isolation_exceptions/host_isolation_exceptions_api_client';
-import { BlocklistsApiClient } from '../../../../blocklist/services';
-import { useCanSeeHostIsolationExceptionsMenu } from '../../../../host_isolation_exceptions/view/hooks';
-
-export const TRUSTED_APPS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error',
-      {
-        defaultMessage: 'There was an error trying to fetch trusted applications stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title"
-      defaultMessage="Trusted applications"
-    />
-  ),
-};
-
-export const EVENT_FILTERS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error',
-      {
-        defaultMessage: 'There was an error trying to fetch event filters stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title"
-      defaultMessage="Event filters"
-    />
-  ),
-};
-
-export const HOST_ISOLATION_EXCEPTIONS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error',
-      {
-        defaultMessage:
-          'There was an error trying to fetch host isolation exceptions stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title"
-      defaultMessage="Host isolation exceptions"
-    />
-  ),
-};
-
-export const BLOCKLISTS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error',
-      {
-        defaultMessage: 'There was an error trying to fetch blocklist stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.blocklist.fleetIntegration.title"
-      defaultMessage="Blocklist"
-    />
-  ),
-};
-
-export const EndpointPackageCustomExtension = memo<PackageCustomExtensionComponentProps>(
-  (props) => {
-    const http = useHttp();
-    const canSeeHostIsolationExceptions = useCanSeeHostIsolationExceptionsMenu();
-
-    const trustedAppsApiClientInstance = useMemo(
-      () => TrustedAppsApiClient.getInstance(http),
-      [http]
-    );
-
-    const eventFiltersApiClientInstance = useMemo(
-      () => EventFiltersApiClient.getInstance(http),
-      [http]
-    );
-
-    const hostIsolationExceptionsApiClientInstance = useMemo(
-      () => HostIsolationExceptionsApiClient.getInstance(http),
-      [http]
-    );
-
-    const bloklistsApiClientInstance = useMemo(() => BlocklistsApiClient.getInstance(http), [http]);
-
-    return (
-      <div data-test-subj="fleetEndpointPackageCustomContent">
-        <FleetArtifactsCard
-          {...props}
-          artifactApiClientInstance={trustedAppsApiClientInstance}
-          getArtifactsPath={getTrustedAppsListPath}
-          labels={TRUSTED_APPS_LABELS}
-          data-test-subj="trustedApps"
-        />
-        <EuiSpacer />
-        <FleetArtifactsCard
-          {...props}
-          artifactApiClientInstance={eventFiltersApiClientInstance}
-          getArtifactsPath={getEventFiltersListPath}
-          labels={EVENT_FILTERS_LABELS}
-          data-test-subj="eventFilters"
-        />
-        {canSeeHostIsolationExceptions && (
-          <>
-            <EuiSpacer />
-            <FleetArtifactsCard
-              {...props}
-              artifactApiClientInstance={hostIsolationExceptionsApiClientInstance}
-              getArtifactsPath={getHostIsolationExceptionsListPath}
-              labels={HOST_ISOLATION_EXCEPTIONS_LABELS}
-              data-test-subj="hostIsolationExceptions"
-            />
-          </>
-        )}
-        <EuiSpacer />
-        <FleetArtifactsCard
-          {...props}
-          artifactApiClientInstance={bloklistsApiClientInstance}
-          getArtifactsPath={getBlocklistsListPath}
-          labels={BLOCKLISTS_LABELS}
-          data-test-subj="blocklists"
-        />
-      </div>
-    );
-  }
-);
-
-EndpointPackageCustomExtension.displayName = 'EndpointPackageCustomExtension';
+export { EndpointPackageCustomExtension } from './endpoint_package_custom_extension';
+export * from './translations';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/translations.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/translations.tsx
new file mode 100644
index 0000000000000..ad694b54c7459
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/translations.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+export const TRUSTED_APPS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error',
+      {
+        defaultMessage: 'There was an error trying to fetch trusted applications stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title"
+      defaultMessage="Trusted applications"
+    />
+  ),
+};
+
+export const EVENT_FILTERS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error',
+      {
+        defaultMessage: 'There was an error trying to fetch event filters stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title"
+      defaultMessage="Event filters"
+    />
+  ),
+};
+
+export const HOST_ISOLATION_EXCEPTIONS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error',
+      {
+        defaultMessage:
+          'There was an error trying to fetch host isolation exceptions stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title"
+      defaultMessage="Host isolation exceptions"
+    />
+  ),
+};
+
+export const BLOCKLISTS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error',
+      {
+        defaultMessage: 'There was an error trying to fetch blocklist stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.blocklists.fleetIntegration.title"
+      defaultMessage="Blocklist"
+    />
+  ),
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx
index 7fe0bd80f91d2..20a904844e74e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx
@@ -8,7 +8,7 @@
 import React, { memo, useEffect } from 'react';
 import { EuiCallOut, EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { PackagePolicyCreateExtensionComponentProps } from '../../../../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public';
 
 /**
  * Exports Endpoint-specific package policy instructions
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.test.tsx
new file mode 100644
index 0000000000000..189a439e4e2d8
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { waitFor } from '@testing-library/react';
+import { PackagePolicy, NewPackagePolicy } from '@kbn/fleet-plugin/common';
+
+import { useEndpointPrivileges } from '../../../../../common/components/user_privileges/endpoint/use_endpoint_privileges';
+import { useUserPrivileges } from '../../../../../common/components/user_privileges';
+import { getEndpointPrivilegesInitialStateMock } from '../../../../../common/components/user_privileges/endpoint/mocks';
+import { composeHttpHandlerMocks } from '../../../../../common/mock/endpoint/http_handler_mock_factory';
+import { AppContextTestRender } from '../../../../../common/mock/endpoint';
+import { fleetGetAgentStatusHttpMock, fleetGetEndpointPackagePolicyHttpMock } from '../../../mocks';
+import { EndpointPolicyEditExtension } from './endpoint_policy_edit_extension';
+import { createFleetContextRendererMock } from './mocks';
+
+jest.mock('../../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
+jest.mock('../../../../../common/components/user_privileges');
+const useEndpointPrivilegesMock = useEndpointPrivileges as jest.Mock;
+const useUserPrivilegesMock = useUserPrivileges as jest.Mock;
+
+describe('When displaying the EndpointPolicyEditExtension fleet UI extension', () => {
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  const artifactCards = Object.freeze([
+    'trustedApps-fleet-integration-card',
+    'eventFilters-fleet-integration-card',
+    'hostIsolationExceptions-fleet-integration-card',
+    'blocklists-fleet-integration-card',
+  ]);
+
+  beforeEach(() => {
+    useEndpointPrivilegesMock.mockReturnValue(getEndpointPrivilegesInitialStateMock());
+    useUserPrivilegesMock.mockReturnValue({
+      endpointPrivileges: getEndpointPrivilegesInitialStateMock(),
+    });
+    const mockedTestContext = createFleetContextRendererMock();
+    composeHttpHandlerMocks([fleetGetEndpointPackagePolicyHttpMock, fleetGetAgentStatusHttpMock]);
+
+    render = () =>
+      mockedTestContext.render(
+        <EndpointPolicyEditExtension
+          policy={{ id: 'someid' } as PackagePolicy}
+          newPolicy={{ id: 'someid' } as NewPackagePolicy}
+          onChange={jest.fn()}
+        />
+      );
+  });
+
+  it('should show artifact cards', async () => {
+    const renderResult = render();
+
+    await waitFor(() => {
+      artifactCards.forEach((artifactCard) => {
+        expect(renderResult.getByTestId(artifactCard)).toBeTruthy();
+      });
+    });
+  });
+
+  it('should NOT show artifact cards if no endpoint management authz', async () => {
+    useEndpointPrivilegesMock.mockReturnValue({
+      ...getEndpointPrivilegesInitialStateMock(),
+      canAccessEndpointManagement: false,
+    });
+    const renderResult = render();
+
+    await waitFor(() => {
+      artifactCards.forEach((artifactCard) => {
+        expect(renderResult.queryByTestId(artifactCard)).toBeNull();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx
index 704ed6b2233c7..dfb2677ecb594 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx
@@ -13,7 +13,7 @@ import { useDispatch } from 'react-redux';
 import {
   PackagePolicyEditExtensionComponentProps,
   NewPackagePolicy,
-} from '../../../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 import { useHttp } from '../../../../../common/lib/kibana/hooks';
 import {
   getPolicyDetailPath,
@@ -36,11 +36,12 @@ import { FleetIntegrationArtifactsCard } from './endpoint_package_custom_extensi
 import { BlocklistsApiClient } from '../../../blocklist/services';
 import { HostIsolationExceptionsApiClient } from '../../../host_isolation_exceptions/host_isolation_exceptions_api_client';
 import { EventFiltersApiClient } from '../../../event_filters/service/event_filters_api_client';
-import { TrustedAppsApiClient } from '../../../trusted_apps/service/trusted_apps_api_client';
+import { TrustedAppsApiClient } from '../../../trusted_apps/service/api_client';
 import { SEARCHABLE_FIELDS as BLOCKLIST_SEARCHABLE_FIELDS } from '../../../blocklist/constants';
 import { SEARCHABLE_FIELDS as HOST_ISOLATION_EXCEPTIONS_SEARCHABLE_FIELDS } from '../../../host_isolation_exceptions/constants';
 import { SEARCHABLE_FIELDS as EVENT_FILTERS_SEARCHABLE_FIELDS } from '../../../event_filters/constants';
 import { SEARCHABLE_FIELDS as TRUSTED_APPS_SEARCHABLE_FIELDS } from '../../../trusted_apps/constants';
+import { useEndpointPrivileges } from '../../../../../common/components/user_privileges/endpoint';
 
 export const BLOCKLISTS_LABELS = {
   artifactsSummaryApiError: (error: string) =>
@@ -158,6 +159,7 @@ const WrappedPolicyDetailsForm = memo<{
 
   const http = useHttp();
   const blocklistsApiClientInstance = useMemo(() => BlocklistsApiClient.getInstance(http), [http]);
+  const { canAccessEndpointManagement } = useEndpointPrivileges();
 
   const hostIsolationExceptionsApiClientInstance = useMemo(
     () => HostIsolationExceptionsApiClient.getInstance(http),
@@ -225,8 +227,8 @@ const WrappedPolicyDetailsForm = memo<{
     });
   }, [onChange, updatedPolicy]);
 
-  return (
-    <div data-test-subj="endpointIntegrationPolicyForm">
+  const artifactCards = useMemo(
+    () => (
       <>
         <div>
           <EuiText>
@@ -276,6 +278,22 @@ const WrappedPolicyDetailsForm = memo<{
           />
         </div>
         <EuiSpacer size="l" />
+      </>
+    ),
+    [
+      blocklistsApiClientInstance,
+      eventFiltersApiClientInstance,
+      hostIsolationExceptionsApiClientInstance,
+      policyId,
+      privileges.canIsolateHost,
+      trustedAppsApiClientInstance,
+    ]
+  );
+
+  return (
+    <div data-test-subj="endpointIntegrationPolicyForm">
+      <>
+        {canAccessEndpointManagement && artifactCards}
         <div>
           <EuiText>
             <h5>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx
index 2a3134b1986ec..56a8144d08a25 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { lazy } from 'react';
+import { PackageCustomExtensionComponent } from '@kbn/fleet-plugin/public';
 import { StartPlugins } from '../../../../../types';
-import { PackageCustomExtensionComponent } from '../../../../../../../fleet/public';
 
 export const getLazyEndpointPackageCustomExtension = (
   coreStart: CoreStart,
@@ -16,7 +16,7 @@ export const getLazyEndpointPackageCustomExtension = (
 ) => {
   return lazy<PackageCustomExtensionComponent>(async () => {
     const [{ withSecurityContext }, { EndpointPackageCustomExtension }] = await Promise.all([
-      import('./with_security_context'),
+      import('./with_security_context/with_security_context'),
       import('./endpoint_package_custom_extension'),
     ]);
     return {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx
index c217b0ecb9770..eb4a9b98084dc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyEndpointPolicyCreateExtension = lazy<PackagePolicyCreateExtensionComponent>(
   async () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx
index 1c4d37268b80e..23fe4a959cfc5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx
@@ -6,11 +6,11 @@
  */
 
 import { lazy } from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import {
   PackagePolicyEditExtensionComponent,
   PackagePolicyEditExtensionComponentProps,
-} from '../../../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 import { StartPlugins } from '../../../../../types';
 
 export const getLazyEndpointPolicyEditExtension = (
@@ -19,7 +19,7 @@ export const getLazyEndpointPolicyEditExtension = (
 ) => {
   return lazy<PackagePolicyEditExtensionComponent>(async () => {
     const [{ withSecurityContext }, { EndpointPolicyEditExtension }] = await Promise.all([
-      import('./with_security_context'),
+      import('./with_security_context/with_security_context'),
       import('./endpoint_policy_edit_extension'),
     ]);
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/mocks.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/mocks.tsx
new file mode 100644
index 0000000000000..908ebc22a19cd
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/mocks.tsx
@@ -0,0 +1,203 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useMemo } from 'react';
+import { Action, Reducer } from 'redux';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { render as reactRender, RenderOptions } from '@testing-library/react';
+import { I18nProvider } from '@kbn/i18n-react';
+import type { PackageInfo } from '@kbn/fleet-plugin/common/types';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { QueryClient } from 'react-query';
+import {
+  AppContextTestRender,
+  createAppRootMockRenderer,
+  UiRender,
+} from '../../../../../common/mock/endpoint';
+import { createFleetContextReduxStore } from './with_security_context/store';
+import {
+  allowedExperimentalValues,
+  ExperimentalFeatures,
+} from '../../../../../../common/experimental_features';
+import { State } from '../../../../../common/store';
+import { mockGlobalState } from '../../../../../common/mock';
+import { managementReducer } from '../../../../store/reducer';
+import { appReducer } from '../../../../../common/store/app';
+import { ExperimentalFeaturesService } from '../../../../../common/experimental_features_service';
+import { RenderContextProviders } from './with_security_context/render_context_providers';
+import { AppAction } from '../../../../../common/store/actions';
+
+// Defined a private custom reducer that reacts to an action that enables us to update the
+// store with new values for technical preview features/flags. Because the `action.type` is a `Symbol`,
+// and its not exported the action can only be `dispatch`'d from this module
+const UpdateExperimentalFeaturesTestActionType = Symbol('updateExperimentalFeaturesTestAction');
+
+type UpdateExperimentalFeaturesTestAction = Action<
+  typeof UpdateExperimentalFeaturesTestActionType
+> & {
+  payload: Partial<ExperimentalFeatures>;
+};
+
+const experimentalFeaturesReducer: Reducer<
+  State['app'],
+  AppAction | UpdateExperimentalFeaturesTestAction
+> = (state = mockGlobalState.app, action) => {
+  if (action.type === UpdateExperimentalFeaturesTestActionType) {
+    return {
+      ...state,
+      enableExperimental: {
+        ...state.enableExperimental,
+        ...action.payload,
+      },
+    };
+  }
+  return state;
+};
+
+export const createFleetContextRendererMock = (): AppContextTestRender => {
+  ExperimentalFeaturesService.init({
+    experimentalFeatures: { ...allowedExperimentalValues },
+  });
+
+  const mockedContext = createAppRootMockRenderer();
+  const store = createFleetContextReduxStore({
+    coreStart: mockedContext.coreStart,
+    depsStart: mockedContext.depsStart,
+    reducersObject: {
+      management: managementReducer,
+      app: (state, action: AppAction | UpdateExperimentalFeaturesTestAction) => {
+        return appReducer(experimentalFeaturesReducer(state, action), action);
+      },
+    },
+    preloadedState: {
+      // @ts-expect-error TS2322
+      management: undefined,
+      // @ts-expect-error TS2322
+      app: {
+        enableExperimental: ExperimentalFeaturesService.get(),
+      },
+    },
+    additionalMiddleware: [mockedContext.middlewareSpy.actionSpyMiddleware],
+  });
+
+  const queryClient = new QueryClient();
+
+  const Wrapper: RenderOptions['wrapper'] = ({ children }) => {
+    const services = useMemo(() => {
+      const { http, notifications, application } = mockedContext.coreStart;
+
+      return {
+        http,
+        notifications,
+        application,
+        data: mockedContext.depsStart.data,
+      };
+    }, []);
+
+    useEffect(() => {
+      return () => {
+        // When the component un-mounts, reset the Experimental features since
+        // `ExperimentalFeaturesService` is a global singleton
+        ExperimentalFeaturesService.init({
+          experimentalFeatures: { ...allowedExperimentalValues },
+        });
+      };
+    }, []);
+
+    return (
+      <I18nProvider>
+        <EuiThemeProvider>
+          <KibanaContextProvider services={services}>
+            <RenderContextProviders
+              store={store}
+              depsStart={mockedContext.depsStart}
+              queryClient={queryClient}
+            >
+              {children}
+            </RenderContextProviders>
+          </KibanaContextProvider>
+        </EuiThemeProvider>
+      </I18nProvider>
+    );
+  };
+
+  const render: UiRender = (ui, options) => {
+    return reactRender(ui, {
+      wrapper: Wrapper,
+      ...options,
+    });
+  };
+
+  const setExperimentalFlag: AppContextTestRender['setExperimentalFlag'] = (flags) => {
+    // TODO: Is this context even using the Redux store `app` namespace?
+    //    `ExperimentalFeaturesService` seems to be used instead
+    store.dispatch({
+      type: UpdateExperimentalFeaturesTestActionType,
+      payload: flags,
+    });
+
+    ExperimentalFeaturesService.init({
+      experimentalFeatures: { ...allowedExperimentalValues, ...flags },
+    });
+  };
+
+  return {
+    ...mockedContext,
+    store,
+    render,
+    setExperimentalFlag,
+  };
+};
+
+export const generateFleetPackageInfo = (): PackageInfo => {
+  // Copied from: x-pack/plugins/fleet/common/services/package_to_package_policy.test.ts
+  const mockPackage: PackageInfo = {
+    name: 'endpoint',
+    title: 'Endpoint mock package',
+    version: '0.0.0',
+    latestVersion: '0.0.0',
+    description: 'description',
+    type: 'integration',
+    categories: [],
+    conditions: { kibana: { version: '' } },
+    format_version: '',
+    download: '',
+    path: '',
+    assets: {
+      kibana: {
+        csp_rule_template: [],
+        dashboard: [],
+        visualization: [],
+        search: [],
+        index_pattern: [],
+        map: [],
+        lens: [],
+        ml_module: [],
+        security_rule: [],
+        tag: [],
+        osquery_pack_asset: [],
+      },
+      elasticsearch: {
+        ingest_pipeline: [],
+        component_template: [],
+        index_template: [],
+        transform: [],
+        ilm_policy: [],
+        data_stream_ilm_policy: [],
+        ml_model: [],
+      },
+    },
+    status: 'not_installed',
+    release: 'experimental',
+    owner: {
+      github: 'elastic/fleet',
+    },
+  };
+
+  return mockPackage;
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context.tsx
deleted file mode 100644
index 06a099ed119ab..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { ComponentType, memo } from 'react';
-import { CoreStart } from 'kibana/public';
-import { combineReducers, createStore, compose, applyMiddleware } from 'redux';
-import { Provider as ReduxStoreProvider } from 'react-redux';
-import { CurrentLicense } from '../../../../../common/components/current_license';
-import { StartPlugins } from '../../../../../types';
-import { managementReducer } from '../../../../store/reducer';
-import { managementMiddlewareFactory } from '../../../../store/middleware';
-import { appReducer } from '../../../../../common/store/app';
-import { ExperimentalFeaturesService } from '../../../../../common/experimental_features_service';
-import { SecuritySolutionStartDependenciesContext } from '../../../../../common/components/user_privileges/endpoint/security_solution_start_dependencies';
-import { ReactQueryClientProvider } from '../../../../../common/containers/query_client/query_client_provider';
-
-type ComposeType = typeof compose;
-declare global {
-  interface Window {
-    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: ComposeType;
-  }
-}
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-
-interface WithSecurityContextProps<P extends {}> {
-  coreStart: CoreStart;
-  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
-  WrappedComponent: ComponentType<P>;
-}
-
-/**
- * Returns a new component that wraps the provided `WrappedComponent` in a bare minimum set of rendering context
- * needed to render Security Solution components that may be dependent on a Redux store and/or Security Solution
- * specific context based functionality
- *
- * @param coreStart
- * @param depsStart
- * @param WrappedComponent
- */
-export const withSecurityContext = <P extends {}>({
-  coreStart,
-  depsStart,
-  WrappedComponent,
-}: WithSecurityContextProps<P>): ComponentType<P> => {
-  let store: ReturnType<typeof createStore>; // created on first render
-
-  return memo((props) => {
-    if (!store) {
-      // Most of the code here was copied form
-      // x-pack/plugins/security_solution/public/management/index.ts
-      store = createStore(
-        combineReducers({
-          management: managementReducer,
-          app: appReducer,
-        }),
-        {
-          management: undefined,
-          // ignore this error as we just need the enableExperimental and it's temporary
-          // @ts-expect-error TS2739
-          app: {
-            enableExperimental: ExperimentalFeaturesService.get(),
-          },
-        },
-        composeEnhancers(applyMiddleware(...managementMiddlewareFactory(coreStart, depsStart)))
-      );
-    }
-
-    return (
-      <ReduxStoreProvider store={store}>
-        <ReactQueryClientProvider>
-          <SecuritySolutionStartDependenciesContext.Provider value={depsStart}>
-            <CurrentLicense>
-              <WrappedComponent {...props} />
-            </CurrentLicense>
-          </SecuritySolutionStartDependenciesContext.Provider>
-        </ReactQueryClientProvider>
-      </ReduxStoreProvider>
-    );
-  });
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/index.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/index.ts
new file mode 100644
index 0000000000000..4007729b248f6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { withSecurityContext } from './with_security_context';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/render_context_providers.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/render_context_providers.tsx
new file mode 100644
index 0000000000000..9b3472192a718
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/render_context_providers.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, PropsWithChildren } from 'react';
+import { Provider as ReduxStoreProvider } from 'react-redux';
+import { Store } from 'redux';
+import type { QueryClient } from 'react-query';
+import { ReactQueryClientProvider } from '../../../../../../common/containers/query_client/query_client_provider';
+import { SecuritySolutionStartDependenciesContext } from '../../../../../../common/components/user_privileges/endpoint/security_solution_start_dependencies';
+import { CurrentLicense } from '../../../../../../common/components/current_license';
+import { StartPlugins } from '../../../../../../types';
+
+export type RenderContextProvidersProps = PropsWithChildren<{
+  store: Store;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+  queryClient?: QueryClient;
+}>;
+
+export const RenderContextProviders = memo<RenderContextProvidersProps>(
+  ({ store, depsStart, queryClient, children }) => {
+    return (
+      <ReduxStoreProvider store={store}>
+        <ReactQueryClientProvider queryClient={queryClient}>
+          <SecuritySolutionStartDependenciesContext.Provider value={depsStart}>
+            <CurrentLicense>{children}</CurrentLicense>
+          </SecuritySolutionStartDependenciesContext.Provider>
+        </ReactQueryClientProvider>
+      </ReduxStoreProvider>
+    );
+  }
+);
+RenderContextProviders.displayName = 'RenderContextProviders';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/store.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/store.ts
new file mode 100644
index 0000000000000..7524dce744204
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/store.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  applyMiddleware,
+  combineReducers,
+  compose,
+  createStore,
+  Dispatch,
+  Middleware,
+  PreloadedState,
+  ReducersMapObject,
+} from 'redux';
+import { CoreStart } from '@kbn/core/public';
+import { managementReducer } from '../../../../../store/reducer';
+import { appReducer } from '../../../../../../common/store/app';
+import { ExperimentalFeaturesService } from '../../../../../../common/experimental_features_service';
+import { managementMiddlewareFactory } from '../../../../../store/middleware';
+import type { StartPlugins } from '../../../../../../types';
+import type { State } from '../../../../../../common/store';
+import type { AppAction } from '../../../../../../common/store/actions';
+import type { Immutable } from '../../../../../../../common/endpoint/types';
+
+type ComposeType = typeof compose;
+declare global {
+  interface Window {
+    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: ComposeType;
+  }
+}
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+
+interface CreateFleetContextReduxStoreProps {
+  coreStart: CoreStart;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+  /** `reducersObject` should be used for testing only */
+  reducersObject?: ReducersMapObject;
+  /** `preloadedState` should be used for testing only */
+  preloadedState?: PreloadedState<Pick<State, 'management' | 'app'>>;
+  /** `additionalMiddleware` should be used for testing only */
+  additionalMiddleware?: Array<Middleware<{}, State, Dispatch<AppAction | Immutable<AppAction>>>>;
+}
+
+export const createFleetContextReduxStore = ({
+  coreStart,
+  depsStart,
+  reducersObject = {
+    management: managementReducer,
+    app: appReducer,
+  },
+  preloadedState = {
+    // @ts-expect-error TS2322
+    management: undefined,
+    // @ts-expect-error TS2322
+    app: {
+      enableExperimental: ExperimentalFeaturesService.get(),
+    },
+  },
+  additionalMiddleware = [],
+}: CreateFleetContextReduxStoreProps) => {
+  // Most of the code here was copied form
+  // x-pack/plugins/security_solution/public/management/index.ts
+  return createStore(
+    combineReducers(reducersObject),
+    preloadedState,
+    composeEnhancers(
+      applyMiddleware(...managementMiddlewareFactory(coreStart, depsStart), ...additionalMiddleware)
+    )
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/with_security_context.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/with_security_context.tsx
new file mode 100644
index 0000000000000..91355c0edc2e8
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/with_security_context.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { ComponentType, memo } from 'react';
+import { CoreStart } from '@kbn/core/public';
+import { StartPlugins } from '../../../../../../types';
+import { createFleetContextReduxStore } from './store';
+import { RenderContextProviders } from './render_context_providers';
+
+interface WithSecurityContextProps<P extends {}> {
+  coreStart: CoreStart;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+  WrappedComponent: ComponentType<P>;
+}
+
+/**
+ * Returns a new component that wraps the provided `WrappedComponent` in a bare minimum set of rendering context
+ * needed to render Security Solution components that may be dependent on a Redux store and/or Security Solution
+ * specific context based functionality
+ *
+ * @param coreStart
+ * @param depsStart
+ * @param WrappedComponent
+ */
+export const withSecurityContext = <P extends {}>({
+  coreStart,
+  depsStart,
+  WrappedComponent,
+}: WithSecurityContextProps<P>): ComponentType<P> => {
+  let store: ReturnType<typeof createFleetContextReduxStore>; // created on first render
+
+  return memo((props) => {
+    if (!store) {
+      store = createFleetContextReduxStore({ coreStart, depsStart });
+    }
+
+    return (
+      <RenderContextProviders store={store} depsStart={depsStart}>
+        <WrappedComponent {...props} />
+      </RenderContextProviders>
+    );
+  });
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
index fdbe4ae83b043..80081223f4e07 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
@@ -8,25 +8,22 @@
 import { waitFor } from '@testing-library/react';
 import { mount } from 'enzyme';
 import React from 'react';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { AGENT_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '../../../../../../fleet/common';
+import { AGENT_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '@kbn/fleet-plugin/common';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { useUserPrivileges } from '../../../../common/components/user_privileges';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
 import { getEndpointListPath, getPoliciesPath, getPolicyDetailPath } from '../../../common/routing';
-import { getHostIsolationExceptionItems } from '../../host_isolation_exceptions/service';
 import { policyListApiPathHandlers } from '../store/test_mock_utils';
 import { PolicyDetails } from './policy_details';
 import { APP_UI_ID } from '../../../../../common/constants';
 import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
+import { exceptionsFindHttpMocks } from '../../mocks/exceptions_list_http_mocks';
 
 jest.mock('./policy_forms/components/policy_form_layout');
 jest.mock('../../../../common/components/user_privileges');
-jest.mock('../../host_isolation_exceptions/service');
 jest.mock('../../../../common/hooks/use_experimental_features');
 
 const useUserPrivilegesMock = useUserPrivileges as jest.Mock;
-const getHostIsolationExceptionItemsMock = getHostIsolationExceptionItems as jest.Mock;
 const useIsExperimentalFeatureMock = useIsExperimentalFeatureEnabled as jest.Mock;
 
 describe('Policy Details', () => {
@@ -211,6 +208,8 @@ describe('Policy Details', () => {
     });
 
     describe('without canIsolateHost permissions', () => {
+      let findExceptionsApiHttpMock: ReturnType<typeof exceptionsFindHttpMocks>;
+
       beforeEach(() => {
         useUserPrivilegesMock.mockReturnValue({
           endpointPrivileges: {
@@ -218,38 +217,48 @@ describe('Policy Details', () => {
             canIsolateHost: false,
           },
         });
+
+        findExceptionsApiHttpMock = exceptionsFindHttpMocks(http);
       });
 
       it('should not display the host isolation exceptions tab with no privileges and no assigned exceptions', async () => {
-        getHostIsolationExceptionItemsMock.mockReturnValue({ total: 0, data: [] });
+        findExceptionsApiHttpMock.responseProvider.exceptionsFind.mockReturnValue({
+          data: [],
+          total: 0,
+          page: 1,
+          per_page: 100,
+        });
         policyView = render();
         await asyncActions;
         policyView.update();
         await waitFor(() => {
-          expect(getHostIsolationExceptionItemsMock).toHaveBeenCalled();
+          expect(findExceptionsApiHttpMock.responseProvider.exceptionsFind).toHaveBeenCalled();
         });
         expect(policyView.find('button#hostIsolationExceptions')).toHaveLength(0);
       });
 
       it('should not display the host isolation exceptions tab with no privileges and no data', async () => {
-        getHostIsolationExceptionItemsMock.mockReturnValue({ total: 0 });
+        findExceptionsApiHttpMock.responseProvider.exceptionsFind.mockReturnValue({
+          data: [],
+          total: 0,
+          page: 1,
+          per_page: 100,
+        });
         policyView = render();
         await asyncActions;
         policyView.update();
         await waitFor(() => {
-          expect(getHostIsolationExceptionItemsMock).toHaveBeenCalled();
+          expect(findExceptionsApiHttpMock.responseProvider.exceptionsFind).toHaveBeenCalled();
         });
         expect(policyView.find('button#hostIsolationExceptions')).toHaveLength(0);
       });
 
       it('should display the host isolation exceptions tab with no privileges if there are assigned exceptions', async () => {
-        // simulate existing assigned policies
-        getHostIsolationExceptionItemsMock.mockReturnValue(getFoundExceptionListItemSchemaMock(1));
         policyView = render();
         await asyncActions;
         policyView.update();
         await waitFor(() => {
-          expect(getHostIsolationExceptionItemsMock).toHaveBeenCalled();
+          expect(findExceptionsApiHttpMock.responseProvider.exceptionsFind).toHaveBeenCalled();
         });
         expect(policyView.find('button#hostIsolationExceptions')).toHaveLength(1);
       });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
index 2702aec1cbabe..7068d20308309 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 
 import { PolicyFormLayout } from './policy_form_layout';
-import '../../../../../../common/mock/match_media.ts';
+import '../../../../../../common/mock/match_media';
 import { EndpointDocGenerator } from '../../../../../../../common/endpoint/generate_data';
 import {
   AppContextTestRender,
@@ -18,7 +18,7 @@ import {
 import { getPolicyDetailPath, getEndpointListPath } from '../../../../../common/routing';
 import { policyListApiPathHandlers } from '../../../store/test_mock_utils';
 import { licenseService } from '../../../../../../common/hooks/use_license';
-import { PACKAGE_POLICY_API_ROOT, AGENT_API_ROUTES } from '../../../../../../../../fleet/common';
+import { PACKAGE_POLICY_API_ROOT, AGENT_API_ROUTES } from '@kbn/fleet-plugin/common';
 
 jest.mock('../../../../../../common/hooks/use_license');
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
index 1d1aeeb660632..27eac2e5d69cd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
@@ -19,7 +19,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useDispatch } from 'react-redux';
 import { useLocation } from 'react-router-dom';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import {
   policyDetails,
@@ -28,7 +29,6 @@ import {
   isLoading,
 } from '../../../store/policy_details/selectors';
 
-import { toMountPoint } from '../../../../../../../../../../src/plugins/kibana_react/public';
 import { useToasts, useKibana } from '../../../../../../common/lib/kibana';
 import { AppAction } from '../../../../../../common/store/actions';
 import { SpyRoute } from '../../../../../../common/utils/route/spy_routes';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index bdc0c7d779b15..884a8572ecfe2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -19,6 +19,8 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useLocation } from 'react-router-dom';
+import { AgentPolicy } from '@kbn/fleet-plugin/common';
+import { CreatePackagePolicyRouteState, pagePathGetters } from '@kbn/fleet-plugin/public';
 import { AdministrationListPage } from '../../../components/administration_list_page';
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { EndpointPolicyLink } from '../../../components/endpoint_policy_link';
@@ -29,10 +31,8 @@ import {
   useGetEndpointSecurityPackage,
   useGetEndpointSpecificPolicies,
 } from '../../../services/policies/hooks';
-import { AgentPolicy } from '../../../../../../fleet/common';
 import { PolicyEmptyState } from '../../../components/management_empty_state';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
-import { CreatePackagePolicyRouteState, pagePathGetters } from '../../../../../../fleet/public';
 import { APP_UI_ID } from '../../../../../common/constants';
 import { getPoliciesPath } from '../../../common/routing';
 import { useAppUrl, useToasts } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx
index ad09653017ebb..f3a20a1abfd66 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx
@@ -9,7 +9,7 @@ import { EuiSpacer, EuiTabbedContent, EuiTabbedContentTab } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useEffect, useMemo } from 'react';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { useUserPrivileges } from '../../../../../common/components/user_privileges';
 import {
   getPolicyDetailPath,
@@ -25,7 +25,6 @@ import {
 } from '../../../../common/routing';
 import { useHttp } from '../../../../../common/lib/kibana';
 import { ManagementPageLoader } from '../../../../components/management_page_loader';
-import { useFetchHostIsolationExceptionsList } from '../../../host_isolation_exceptions/view/hooks';
 import {
   isOnHostIsolationExceptionsView,
   isOnPolicyEventFiltersView,
@@ -42,7 +41,7 @@ import { POLICY_ARTIFACT_EVENT_FILTERS_LABELS } from './event_filters_translatio
 import { POLICY_ARTIFACT_TRUSTED_APPS_LABELS } from './trusted_apps_translations';
 import { POLICY_ARTIFACT_HOST_ISOLATION_EXCEPTIONS_LABELS } from './host_isolation_exceptions_translations';
 import { POLICY_ARTIFACT_BLOCKLISTS_LABELS } from './blocklists_translations';
-import { TrustedAppsApiClient } from '../../../trusted_apps/service/trusted_apps_api_client';
+import { TrustedAppsApiClient } from '../../../trusted_apps/service/api_client';
 import { EventFiltersApiClient } from '../../../event_filters/service/event_filters_api_client';
 import { BlocklistsApiClient } from '../../../blocklist/services/blocklists_api_client';
 import { HostIsolationExceptionsApiClient } from '../../../host_isolation_exceptions/host_isolation_exceptions_api_client';
@@ -50,6 +49,8 @@ import { SEARCHABLE_FIELDS as TRUSTED_APPS_SEARCHABLE_FIELDS } from '../../../tr
 import { SEARCHABLE_FIELDS as EVENT_FILTERS_SEARCHABLE_FIELDS } from '../../../event_filters/constants';
 import { SEARCHABLE_FIELDS as HOST_ISOLATION_EXCEPTIONS_SEARCHABLE_FIELDS } from '../../../host_isolation_exceptions/constants';
 import { SEARCHABLE_FIELDS as BLOCKLISTS_SEARCHABLE_FIELDS } from '../../../blocklist/constants';
+import { PolicyDetailsRouteState } from '../../../../../../common/endpoint/types';
+import { useListArtifact } from '../../../../hooks/artifacts';
 
 const enum PolicyTabKeys {
   SETTINGS = 'settings',
@@ -76,14 +77,20 @@ export const PolicyTabs = React.memo(() => {
   const policyId = usePolicyDetailsSelector(policyIdFromParams);
   const policyItem = usePolicyDetailsSelector(policyDetails);
   const privileges = useUserPrivileges().endpointPrivileges;
+  const { state: routeState = {} } = useLocation<PolicyDetailsRouteState>();
 
-  const allPolicyHostIsolationExceptionsListRequest = useFetchHostIsolationExceptionsList({
-    page: 1,
-    perPage: 100,
-    policies: [policyId, 'all'],
-    // only enable if privileges are not loading and can not isolate a host
-    enabled: !privileges.loading && !privileges.canIsolateHost,
-  });
+  const allPolicyHostIsolationExceptionsListRequest = useListArtifact(
+    HostIsolationExceptionsApiClient.getInstance(http),
+    {
+      page: 1,
+      perPage: 100,
+      policies: [policyId, 'all'],
+    },
+    HOST_ISOLATION_EXCEPTIONS_SEARCHABLE_FIELDS,
+    {
+      enabled: !privileges.loading && !privileges.canIsolateHost,
+    }
+  );
 
   const canSeeHostIsolationExceptions =
     privileges.canIsolateHost ||
@@ -320,9 +327,9 @@ export const PolicyTabs = React.memo(() => {
           path = getPolicyBlocklistsPath(policyId);
           break;
       }
-      history.push(path);
+      history.push(path, routeState?.backLink ? { backLink: routeState.backLink } : null);
     },
-    [history, policyId]
+    [history, policyId, routeState]
   );
 
   // show loader for privileges validation
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts
index 590df456322b5..e122571837c4a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts
@@ -6,7 +6,7 @@
  */
 
 import styled from 'styled-components';
-import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 type SpacingOptions = keyof EuiTheme['eui']['spacerSizes'];
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx
index 018987c81b94d..d9edd9986e156 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx
@@ -6,16 +6,18 @@
  */
 
 import { Switch, Route } from 'react-router-dom';
-import React from 'react';
-import { TrustedAppsPage } from './view';
+import React, { memo } from 'react';
+import { TrustedAppsList } from './view/trusted_apps_list';
 import { MANAGEMENT_ROUTING_TRUSTED_APPS_PATH } from '../../common/constants';
 import { NotFoundPage } from '../../../app/404';
 
-export function TrustedAppsContainer() {
+export const TrustedAppsContainer = memo(() => {
   return (
     <Switch>
-      <Route path={MANAGEMENT_ROUTING_TRUSTED_APPS_PATH} exact component={TrustedAppsPage} />
+      <Route path={MANAGEMENT_ROUTING_TRUSTED_APPS_PATH} exact component={TrustedAppsList} />
       <Route path="*" component={NotFoundPage} />
     </Switch>
   );
-}
+});
+
+TrustedAppsContainer.displayName = 'TrustedAppsContainer';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/api_client.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/api_client.ts
new file mode 100644
index 0000000000000..e66c16717e428
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/api_client.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  CreateExceptionListItemSchema,
+  ExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '@kbn/securitysolution-list-constants';
+
+import { HttpStart } from '@kbn/core/public';
+import { ConditionEntry } from '../../../../../common/endpoint/types';
+import {
+  conditionEntriesToEntries,
+  entriesToConditionEntries,
+} from '../../../../common/utils/exception_list_items';
+import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
+import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '../constants';
+
+function readTransform(item: ExceptionListItemSchema): ExceptionListItemSchema {
+  return {
+    ...item,
+    entries: entriesToConditionEntries(item.entries) as ExceptionListItemSchema['entries'],
+  };
+}
+
+function writeTransform<T extends CreateExceptionListItemSchema | UpdateExceptionListItemSchema>(
+  item: T
+): T {
+  return {
+    ...item,
+    entries: conditionEntriesToEntries(item.entries as ConditionEntry[], true),
+  } as T;
+}
+
+/**
+ * Trusted Apps exceptions Api client class using ExceptionsListApiClient as base class
+ * It follows the Singleton pattern.
+ * Please, use the getInstance method instead of creating a new instance when using this implementation.
+ */
+export class TrustedAppsApiClient extends ExceptionsListApiClient {
+  constructor(http: HttpStart) {
+    super(
+      http,
+      ENDPOINT_TRUSTED_APPS_LIST_ID,
+      TRUSTED_APPS_EXCEPTION_LIST_DEFINITION,
+      readTransform,
+      writeTransform
+    );
+  }
+
+  public static getInstance(http: HttpStart): ExceptionsListApiClient {
+    return super.getInstance(
+      http,
+      ENDPOINT_TRUSTED_APPS_LIST_ID,
+      TRUSTED_APPS_EXCEPTION_LIST_DEFINITION,
+      readTransform,
+      writeTransform
+    );
+  }
+}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts
index 3c0d58043dd02..4b2dee13ce70a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from './trusted_apps_http_service';
+export { TrustedAppsApiClient } from './api_client';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.ts
deleted file mode 100644
index 4d1f0170b4117..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
-import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
-import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '../constants';
-
-/**
- * Trusted apps Api client class using ExceptionsListApiClient as base class
- * It follow the Singleton pattern.
- * Please, use the getInstance method instead of creating a new instance when using this implementation.
- */
-export class TrustedAppsApiClient extends ExceptionsListApiClient {
-  constructor(http: HttpStart) {
-    super(http, ENDPOINT_TRUSTED_APPS_LIST_ID, TRUSTED_APPS_EXCEPTION_LIST_DEFINITION);
-  }
-
-  public static getInstance(http: HttpStart): ExceptionsListApiClient {
-    return super.getInstance(
-      http,
-      ENDPOINT_TRUSTED_APPS_LIST_ID,
-      TRUSTED_APPS_EXCEPTION_LIST_DEFINITION
-    );
-  }
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts
deleted file mode 100644
index 6e883b614f01f..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  ExceptionListItemSchema,
-  ExceptionListSchema,
-  ExceptionListSummarySchema,
-  FoundExceptionListItemSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
-import {
-  ENDPOINT_TRUSTED_APPS_LIST_ID,
-  EXCEPTION_LIST_ITEM_URL,
-  EXCEPTION_LIST_URL,
-} from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
-import pMap from 'p-map';
-import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
-import {
-  DeleteTrustedAppsRequestParams,
-  GetOneTrustedAppRequestParams,
-  GetOneTrustedAppResponse,
-  GetTrustedAppsListRequest,
-  GetTrustedAppsListResponse,
-  MaybeImmutable,
-  PostTrustedAppCreateRequest,
-  PostTrustedAppCreateResponse,
-  PutTrustedAppsRequestParams,
-  PutTrustedAppUpdateRequest,
-  PutTrustedAppUpdateResponse,
-  TrustedApp,
-} from '../../../../../common/endpoint/types';
-import { sendGetEndpointSpecificPackagePolicies } from '../../../services/policies/policies';
-import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '../constants';
-import { isGlobalEffectScope } from '../state/type_guards';
-import {
-  exceptionListItemToTrustedApp,
-  newTrustedAppToCreateExceptionListItem,
-  updatedTrustedAppToUpdateExceptionListItem,
-} from './mappers';
-import { validateTrustedAppHttpRequestBody } from './validate_trusted_app_http_request_body';
-
-export interface TrustedAppsService {
-  getTrustedApp(params: GetOneTrustedAppRequestParams): Promise<GetOneTrustedAppResponse>;
-
-  getTrustedAppsList(request: GetTrustedAppsListRequest): Promise<GetTrustedAppsListResponse>;
-
-  deleteTrustedApp(request: DeleteTrustedAppsRequestParams): Promise<void>;
-
-  createTrustedApp(request: PostTrustedAppCreateRequest): Promise<PostTrustedAppCreateResponse>;
-
-  updateTrustedApp(
-    params: PutTrustedAppsRequestParams,
-    request: PutTrustedAppUpdateRequest
-  ): Promise<PutTrustedAppUpdateResponse>;
-
-  getPolicyList(
-    options?: Parameters<typeof sendGetEndpointSpecificPackagePolicies>[1]
-  ): ReturnType<typeof sendGetEndpointSpecificPackagePolicies>;
-
-  assignPolicyToTrustedApps(
-    policyId: string,
-    trustedApps: MaybeImmutable<TrustedApp[]>
-  ): Promise<PutTrustedAppUpdateResponse[]>;
-
-  removePolicyFromTrustedApps(
-    policyId: string,
-    trustedApps: MaybeImmutable<TrustedApp[]>
-  ): Promise<PutTrustedAppUpdateResponse[]>;
-}
-
-const P_MAP_OPTIONS = Object.freeze<pMap.Options>({
-  concurrency: 5,
-  /** When set to false, instead of stopping when a promise rejects, it will wait for all the promises to settle
-   * and then reject with an aggregated error containing all the errors from the rejected promises. */
-  stopOnError: false,
-});
-
-export class TrustedAppsHttpService implements TrustedAppsService {
-  private readonly getHttpService: () => Promise<HttpStart>;
-
-  constructor(http: HttpStart) {
-    let ensureListExists: Promise<void>;
-
-    this.getHttpService = async () => {
-      if (!ensureListExists) {
-        ensureListExists = http
-          .post<ExceptionListSchema>(EXCEPTION_LIST_URL, {
-            body: JSON.stringify(TRUSTED_APPS_EXCEPTION_LIST_DEFINITION),
-          })
-          .then(() => {})
-          .catch((err) => {
-            if (err.response.status !== 409) {
-              return Promise.reject(err);
-            }
-          });
-      }
-
-      await ensureListExists;
-      return http;
-    };
-  }
-
-  private async getExceptionListItem(itemId: string): Promise<ExceptionListItemSchema> {
-    return (await this.getHttpService()).get<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-      query: {
-        item_id: itemId,
-        namespace_type: 'agnostic',
-      },
-    });
-  }
-
-  async getTrustedApp(params: GetOneTrustedAppRequestParams) {
-    const exceptionItem = await this.getExceptionListItem(params.id);
-
-    return {
-      data: exceptionListItemToTrustedApp(exceptionItem),
-    };
-  }
-
-  async getTrustedAppsList({
-    page = 1,
-    per_page: perPage = 10,
-    kuery,
-  }: GetTrustedAppsListRequest): Promise<GetTrustedAppsListResponse> {
-    const itemListResults = await (
-      await this.getHttpService()
-    ).get<FoundExceptionListItemSchema>(`${EXCEPTION_LIST_ITEM_URL}/_find`, {
-      query: {
-        page,
-        per_page: perPage,
-        filter: kuery,
-        sort_field: 'name',
-        sort_order: 'asc',
-        list_id: [ENDPOINT_TRUSTED_APPS_LIST_ID],
-        namespace_type: ['agnostic'],
-      },
-    });
-
-    return {
-      ...itemListResults,
-      data: itemListResults.data.map(exceptionListItemToTrustedApp),
-    };
-  }
-
-  async deleteTrustedApp(request: DeleteTrustedAppsRequestParams): Promise<void> {
-    await (
-      await this.getHttpService()
-    ).delete<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-      query: {
-        item_id: request.id,
-        namespace_type: 'agnostic',
-      },
-    });
-  }
-
-  async createTrustedApp(request: PostTrustedAppCreateRequest) {
-    await validateTrustedAppHttpRequestBody(await this.getHttpService(), request);
-
-    const newTrustedAppException = newTrustedAppToCreateExceptionListItem(request);
-    const createdExceptionItem = await (
-      await this.getHttpService()
-    ).post<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-      body: JSON.stringify(newTrustedAppException),
-    });
-
-    return {
-      data: exceptionListItemToTrustedApp(createdExceptionItem),
-    };
-  }
-
-  async updateTrustedApp(
-    params: PutTrustedAppsRequestParams,
-    updatedTrustedApp: PutTrustedAppUpdateRequest
-  ) {
-    const [currentExceptionListItem] = await Promise.all([
-      await this.getExceptionListItem(params.id),
-      await validateTrustedAppHttpRequestBody(await this.getHttpService(), updatedTrustedApp),
-    ]);
-
-    const updatedExceptionListItem = await (
-      await this.getHttpService()
-    ).put<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
-      body: JSON.stringify(
-        updatedTrustedAppToUpdateExceptionListItem(currentExceptionListItem, updatedTrustedApp)
-      ),
-    });
-
-    return {
-      data: exceptionListItemToTrustedApp(updatedExceptionListItem),
-    };
-  }
-
-  async getTrustedAppsSummary(filter?: string) {
-    return (await this.getHttpService()).get<ExceptionListSummarySchema>(
-      `${EXCEPTION_LIST_URL}/summary`,
-      {
-        query: {
-          filter,
-          list_id: ENDPOINT_TRUSTED_APPS_LIST_ID,
-          namespace_type: 'agnostic',
-        },
-      }
-    );
-  }
-
-  async getPolicyList(options?: Parameters<typeof sendGetEndpointSpecificPackagePolicies>[1]) {
-    return sendGetEndpointSpecificPackagePolicies(await this.getHttpService(), options);
-  }
-
-  /**
-   * Assign a policy to trusted apps. Note that Trusted Apps MUST NOT be global
-   *
-   * @param policyId
-   * @param trustedApps[]
-   */
-  assignPolicyToTrustedApps(
-    policyId: string,
-    trustedApps: MaybeImmutable<TrustedApp[]>
-  ): Promise<PutTrustedAppUpdateResponse[]> {
-    return this._handleAssignOrRemovePolicyId('assign', policyId, trustedApps);
-  }
-
-  /**
-   * Remove a policy from trusted apps. Note that Trusted Apps MUST NOT be global
-   *
-   * @param policyId
-   * @param trustedApps[]
-   */
-  removePolicyFromTrustedApps(
-    policyId: string,
-    trustedApps: MaybeImmutable<TrustedApp[]>
-  ): Promise<PutTrustedAppUpdateResponse[]> {
-    return this._handleAssignOrRemovePolicyId('remove', policyId, trustedApps);
-  }
-
-  private _handleAssignOrRemovePolicyId(
-    action: 'assign' | 'remove',
-    policyId: string,
-    trustedApps: MaybeImmutable<TrustedApp[]>
-  ): Promise<PutTrustedAppUpdateResponse[]> {
-    if (policyId.trim() === '') {
-      throw new Error('policy ID is required');
-    }
-
-    if (trustedApps.length === 0) {
-      throw new Error('at least one trusted app is required');
-    }
-
-    return pMap(
-      trustedApps,
-      async (trustedApp) => {
-        if (isGlobalEffectScope(trustedApp.effectScope)) {
-          throw new Error(
-            `Unable to update trusted app [${trustedApp.id}] policy assignment. It's effectScope is 'global'`
-          );
-        }
-
-        const policies: string[] = !isGlobalEffectScope(trustedApp.effectScope)
-          ? [...trustedApp.effectScope.policies]
-          : [];
-
-        const indexOfPolicyId = policies.indexOf(policyId);
-
-        if (action === 'assign' && indexOfPolicyId === -1) {
-          policies.push(policyId);
-        } else if (action === 'remove' && indexOfPolicyId !== -1) {
-          policies.splice(indexOfPolicyId, 1);
-        }
-
-        return this.updateTrustedApp(
-          { id: trustedApp.id },
-          {
-            ...toUpdateTrustedApp(trustedApp),
-            effectScope: {
-              type: 'policy',
-              policies,
-            },
-          }
-        );
-      },
-      P_MAP_OPTIONS
-    );
-  }
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts
deleted file mode 100644
index 60568594c7784..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { HttpStart } from 'kibana/public';
-import {
-  PostTrustedAppCreateRequest,
-  PutTrustedAppUpdateRequest,
-} from '../../../../../common/endpoint/types';
-import { HttpRequestValidationError } from './errors';
-import { sendGetAgentPolicyList } from '../../../services/policies/ingest';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../fleet/common';
-
-/**
- * Validates that the Trusted App is valid for sending to the API (`POST` + 'PUT')
- *
- * @throws
- */
-export const validateTrustedAppHttpRequestBody = async (
-  http: HttpStart,
-  trustedApp: PostTrustedAppCreateRequest | PutTrustedAppUpdateRequest
-): Promise<void> => {
-  const failedValidations: string[] = [];
-
-  // Validate that the Policy IDs are still valid
-  if (trustedApp.effectScope.type === 'policy' && trustedApp.effectScope.policies.length) {
-    const policyIds = trustedApp.effectScope.policies;
-
-    // We can't search against the Package Policy API by ID because there is no way to do that.
-    // So, as a work-around, we use the Agent Policy API and check for those Agent Policies that
-    // have these package policies in it. For endpoint, these are 1-to-1.
-    const agentPoliciesFound = await sendGetAgentPolicyList(http, {
-      query: {
-        kuery: `${AGENT_POLICY_SAVED_OBJECT_TYPE}.package_policies: (${policyIds.join(' or ')})`,
-      },
-    });
-
-    if (!agentPoliciesFound.items.length) {
-      failedValidations.push(`Invalid Policy Id(s) [${policyIds.join(', ')}]`);
-    } else {
-      const missingPolicies = policyIds.filter(
-        (policyId) =>
-          !agentPoliciesFound.items.find(({ package_policies: packagePolicies }) =>
-            (packagePolicies as string[]).includes(policyId)
-          )
-      );
-
-      if (missingPolicies.length) {
-        failedValidations.push(`Invalid Policy Id(s) [${missingPolicies.join(', ')}]`);
-      }
-    }
-  }
-
-  if (failedValidations.length) {
-    throw new HttpRequestValidationError(failedValidations);
-  }
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts
deleted file mode 100644
index 292b982eebb47..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { NewTrustedApp, TrustedApp } from '../../../../../common/endpoint/types/trusted_apps';
-import { AsyncResourceState } from '../../../state/async_resource_state';
-import { GetPolicyListResponse } from '../../policy/types';
-
-export interface Pagination {
-  pageIndex: number;
-  pageSize: number;
-  totalItemCount: number;
-  pageSizeOptions: number[];
-}
-
-export interface TrustedAppsListData {
-  items: TrustedApp[];
-  pageIndex: number;
-  pageSize: number;
-  timestamp: number;
-  totalItemsCount: number;
-  filter: string;
-  includedPolicies: string;
-}
-
-export type ViewType = 'list' | 'grid';
-
-export interface TrustedAppsListPageLocation {
-  page_index: number;
-  page_size: number;
-  view_type: ViewType;
-  show?: 'create' | 'edit';
-  /** Used for editing. The ID of the selected trusted app */
-  id?: string;
-  filter: string;
-  // A string with comma dlimetered list of included policy IDs
-  included_policies: string;
-}
-
-export interface TrustedAppsListPageState {
-  /** Represents if trusted apps entries exist, regardless of whether the list is showing results
-   * or not (which could use filtering in the future)
-   */
-  entriesExist: AsyncResourceState<boolean>;
-  listView: {
-    listResourceState: AsyncResourceState<TrustedAppsListData>;
-    freshDataTimestamp: number;
-  };
-  deletionDialog: {
-    entry?: TrustedApp;
-    confirmed: boolean;
-    submissionResourceState: AsyncResourceState;
-  };
-  creationDialog: {
-    formState?: {
-      entry: NewTrustedApp;
-      isValid: boolean;
-    };
-    /** The trusted app to be edited (when in edit mode)  */
-    editItem?: AsyncResourceState<TrustedApp>;
-    confirmed: boolean;
-    submissionResourceState: AsyncResourceState<TrustedApp>;
-  };
-  /** A list of all available polices for use in associating TA to policies */
-  policies: AsyncResourceState<GetPolicyListResponse>;
-  location: TrustedAppsListPageLocation;
-  active: boolean;
-  forceRefresh: boolean;
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/type_guards.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/type_guards.ts
index 1a28e6f3bfecf..239255b641bf4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/type_guards.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/type_guards.ts
@@ -8,11 +8,7 @@
 import { ConditionEntryField } from '@kbn/securitysolution-utils';
 import {
   TrustedAppConditionEntry,
-  EffectScope,
-  GlobalEffectScope,
   MacosLinuxConditionEntry,
-  MaybeImmutable,
-  PolicyEffectScope,
   WindowsConditionEntry,
 } from '../../../../../common/endpoint/types';
 
@@ -27,15 +23,3 @@ export const isMacosLinuxTrustedAppCondition = (
 ): condition is MacosLinuxConditionEntry => {
   return condition.field !== ConditionEntryField.SIGNER;
 };
-
-export const isGlobalEffectScope = (
-  effectedScope: MaybeImmutable<EffectScope>
-): effectedScope is GlobalEffectScope => {
-  return effectedScope.type === 'global';
-};
-
-export const isPolicyEffectScope = (
-  effectedScope: MaybeImmutable<EffectScope>
-): effectedScope is PolicyEffectScope => {
-  return effectedScope.type === 'policy';
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/action.ts
deleted file mode 100644
index f9965da4a2256..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/action.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Action } from 'redux';
-
-import { NewTrustedApp, TrustedApp } from '../../../../../common/endpoint/types';
-import { AsyncResourceState, TrustedAppsListData } from '../state';
-import { GetPolicyListResponse } from '../../policy/types';
-
-export type TrustedAppsListDataOutdated = Action<'trustedAppsListDataOutdated'>;
-
-interface ResourceStateChanged<T, D = null> extends Action<T> {
-  payload: { newState: AsyncResourceState<D> };
-}
-
-export type TrustedAppsListResourceStateChanged = ResourceStateChanged<
-  'trustedAppsListResourceStateChanged',
-  TrustedAppsListData
->;
-
-export type TrustedAppDeletionSubmissionResourceStateChanged =
-  ResourceStateChanged<'trustedAppDeletionSubmissionResourceStateChanged'>;
-
-export type TrustedAppDeletionDialogStarted = Action<'trustedAppDeletionDialogStarted'> & {
-  payload: {
-    entry: TrustedApp;
-  };
-};
-
-export type TrustedAppDeletionDialogConfirmed = Action<'trustedAppDeletionDialogConfirmed'>;
-
-export type TrustedAppDeletionDialogClosed = Action<'trustedAppDeletionDialogClosed'>;
-
-export type TrustedAppCreationSubmissionResourceStateChanged = ResourceStateChanged<
-  'trustedAppCreationSubmissionResourceStateChanged',
-  TrustedApp
->;
-
-export type TrustedAppCreationDialogStarted = Action<'trustedAppCreationDialogStarted'> & {
-  payload: {
-    entry: NewTrustedApp;
-  };
-};
-
-export type TrustedAppCreationDialogFormStateUpdated =
-  Action<'trustedAppCreationDialogFormStateUpdated'> & {
-    payload: {
-      entry: NewTrustedApp;
-      isValid: boolean;
-    };
-  };
-
-export type TrustedAppCreationEditItemStateChanged =
-  Action<'trustedAppCreationEditItemStateChanged'> & {
-    payload: AsyncResourceState<TrustedApp>;
-  };
-
-export type TrustedAppCreationDialogConfirmed = Action<'trustedAppCreationDialogConfirmed'>;
-
-export type TrustedAppCreationDialogClosed = Action<'trustedAppCreationDialogClosed'>;
-
-export type TrustedAppsExistResponse = Action<'trustedAppsExistStateChanged'> & {
-  payload: AsyncResourceState<boolean>;
-};
-
-export type TrustedAppsPoliciesStateChanged = Action<'trustedAppsPoliciesStateChanged'> & {
-  payload: AsyncResourceState<GetPolicyListResponse>;
-};
-
-export type TrustedAppForceRefresh = Action<'trustedAppForceRefresh'> & {
-  payload: {
-    forceRefresh: boolean;
-  };
-};
-
-export type TrustedAppsPageAction =
-  | TrustedAppsListDataOutdated
-  | TrustedAppsListResourceStateChanged
-  | TrustedAppDeletionSubmissionResourceStateChanged
-  | TrustedAppDeletionDialogStarted
-  | TrustedAppDeletionDialogConfirmed
-  | TrustedAppDeletionDialogClosed
-  | TrustedAppCreationSubmissionResourceStateChanged
-  | TrustedAppCreationEditItemStateChanged
-  | TrustedAppCreationDialogStarted
-  | TrustedAppCreationDialogFormStateUpdated
-  | TrustedAppCreationDialogConfirmed
-  | TrustedAppsExistResponse
-  | TrustedAppsPoliciesStateChanged
-  | TrustedAppCreationDialogClosed
-  | TrustedAppForceRefresh;
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/builders.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/builders.ts
deleted file mode 100644
index f0fab98188927..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/builders.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
-import { TrustedAppConditionEntry, NewTrustedApp } from '../../../../../common/endpoint/types';
-
-import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../../common/constants';
-
-import { TrustedAppsListPageState } from '../state';
-
-export const defaultConditionEntry = (): TrustedAppConditionEntry<ConditionEntryField.HASH> => ({
-  field: ConditionEntryField.HASH,
-  operator: 'included',
-  type: 'match',
-  value: '',
-});
-
-export const defaultNewTrustedApp = (): NewTrustedApp => ({
-  name: '',
-  os: OperatingSystem.WINDOWS,
-  entries: [defaultConditionEntry()],
-  description: '',
-  effectScope: { type: 'global' },
-});
-
-export const initialDeletionDialogState = (): TrustedAppsListPageState['deletionDialog'] => ({
-  confirmed: false,
-  submissionResourceState: { type: 'UninitialisedResourceState' },
-});
-
-export const initialCreationDialogState = (): TrustedAppsListPageState['creationDialog'] => ({
-  confirmed: false,
-  submissionResourceState: { type: 'UninitialisedResourceState' },
-});
-
-export const initialTrustedAppsPageState = (): TrustedAppsListPageState => ({
-  entriesExist: { type: 'UninitialisedResourceState' },
-  listView: {
-    listResourceState: { type: 'UninitialisedResourceState' },
-    freshDataTimestamp: Date.now(),
-  },
-  deletionDialog: initialDeletionDialogState(),
-  creationDialog: initialCreationDialogState(),
-  policies: { type: 'UninitialisedResourceState' },
-  location: {
-    page_index: MANAGEMENT_DEFAULT_PAGE,
-    page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
-    show: undefined,
-    id: undefined,
-    view_type: 'grid',
-    filter: '',
-    included_policies: '',
-  },
-  active: false,
-  forceRefresh: false,
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
deleted file mode 100644
index 4455baddb047c..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { applyMiddleware, createStore } from 'redux';
-
-import { createSpyMiddleware } from '../../../../common/store/test_utils';
-
-import {
-  createDefaultPagination,
-  createListLoadedResourceState,
-  createLoadedListViewWithPagination,
-  createSampleTrustedApp,
-  createSampleTrustedApps,
-  createServerApiError,
-  createUninitialisedResourceState,
-  createUserChangedUrlAction,
-} from '../test_utils';
-
-import { TrustedAppsService } from '../service';
-import { Pagination, TrustedAppsListPageLocation, TrustedAppsListPageState } from '../state';
-import { initialTrustedAppsPageState } from './builders';
-import { trustedAppsPageReducer } from './reducer';
-import { createTrustedAppsPageMiddleware } from './middleware';
-import { Immutable } from '../../../../../common/endpoint/types';
-import { getGeneratedPolicyResponse } from './mocks';
-
-const initialNow = 111111;
-const dateNowMock = jest.fn();
-dateNowMock.mockReturnValue(initialNow);
-
-Date.now = dateNowMock;
-
-const initialState: Immutable<TrustedAppsListPageState> = initialTrustedAppsPageState();
-
-const createGetTrustedListAppsResponse = (pagination: Partial<Pagination>) => {
-  const fullPagination = { ...createDefaultPagination(), ...pagination };
-
-  return {
-    data: createSampleTrustedApps(pagination),
-    page: fullPagination.pageIndex,
-    per_page: fullPagination.pageSize,
-    total: fullPagination.totalItemCount,
-  };
-};
-
-const createTrustedAppsServiceMock = (): jest.Mocked<TrustedAppsService> => ({
-  getTrustedAppsList: jest.fn(),
-  deleteTrustedApp: jest.fn(),
-  createTrustedApp: jest.fn(),
-  getPolicyList: jest.fn(),
-  updateTrustedApp: jest.fn(),
-  getTrustedApp: jest.fn(),
-  assignPolicyToTrustedApps: jest.fn(),
-  removePolicyFromTrustedApps: jest.fn(),
-});
-
-const createStoreSetup = (trustedAppsService: TrustedAppsService) => {
-  const spyMiddleware = createSpyMiddleware<TrustedAppsListPageState>();
-
-  return {
-    spyMiddleware,
-    store: createStore(
-      trustedAppsPageReducer,
-      applyMiddleware(
-        createTrustedAppsPageMiddleware(trustedAppsService),
-        spyMiddleware.actionSpyMiddleware
-      )
-    ),
-  };
-};
-
-describe('middleware', () => {
-  type TrustedAppsEntriesExistState = Pick<TrustedAppsListPageState, 'entriesExist'>;
-  const entriesExistLoadedState = (): TrustedAppsEntriesExistState => {
-    return {
-      entriesExist: {
-        data: true,
-        type: 'LoadedResourceState',
-      },
-    };
-  };
-  const entriesExistLoadingState = (): TrustedAppsEntriesExistState => {
-    return {
-      entriesExist: {
-        previousState: {
-          type: 'UninitialisedResourceState',
-        },
-        type: 'LoadingResourceState',
-      },
-    };
-  };
-
-  const createLocationState = (
-    params?: Partial<TrustedAppsListPageLocation>
-  ): TrustedAppsListPageLocation => {
-    return {
-      ...initialState.location,
-      ...(params ?? {}),
-    };
-  };
-
-  beforeEach(() => {
-    dateNowMock.mockReturnValue(initialNow);
-  });
-
-  describe('initial state', () => {
-    it('sets initial state properly', async () => {
-      expect(createStoreSetup(createTrustedAppsServiceMock()).store.getState()).toStrictEqual(
-        initialState
-      );
-    });
-  });
-
-  describe('refreshing list resource state', () => {
-    it('refreshes the list when location changes and data gets outdated', async () => {
-      const pagination = { pageIndex: 2, pageSize: 50 };
-      const location = createLocationState({
-        page_index: 2,
-        page_size: 50,
-      });
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-
-      service.getTrustedAppsList.mockResolvedValue(createGetTrustedListAppsResponse(pagination));
-
-      store.dispatch(
-        createUserChangedUrlAction('/administration/trusted_apps', '?page_index=2&page_size=50')
-      );
-
-      expect(store.getState()).toStrictEqual({
-        ...initialState,
-        listView: {
-          listResourceState: {
-            type: 'LoadingResourceState',
-            previousState: createUninitialisedResourceState(),
-          },
-          freshDataTimestamp: initialNow,
-        },
-        active: true,
-        location,
-      });
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      expect(store.getState()).toStrictEqual({
-        ...initialState,
-        ...entriesExistLoadingState(),
-        listView: createLoadedListViewWithPagination(initialNow, pagination),
-        active: true,
-        location,
-      });
-    });
-
-    it('does not refresh the list when location changes and data does not get outdated', async () => {
-      const pagination = { pageIndex: 2, pageSize: 50 };
-      const location = createLocationState({
-        page_index: 2,
-        page_size: 50,
-      });
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-
-      service.getTrustedAppsList.mockResolvedValue(createGetTrustedListAppsResponse(pagination));
-
-      store.dispatch(
-        createUserChangedUrlAction('/administration/trusted_apps', '?page_index=2&page_size=50')
-      );
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      store.dispatch(
-        createUserChangedUrlAction('/administration/trusted_apps', '?page_index=2&page_size=50')
-      );
-
-      expect(service.getTrustedAppsList).toBeCalledTimes(2);
-      expect(store.getState()).toStrictEqual({
-        ...initialState,
-        ...entriesExistLoadingState(),
-        listView: createLoadedListViewWithPagination(initialNow, pagination),
-        active: true,
-        location,
-      });
-    });
-
-    it('refreshes the list when data gets outdated with and outdate action', async () => {
-      const newNow = 222222;
-      const pagination = { pageIndex: 0, pageSize: 10 };
-      const location = createLocationState();
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-      const policiesResponse = getGeneratedPolicyResponse();
-
-      service.getTrustedAppsList.mockResolvedValue(createGetTrustedListAppsResponse(pagination));
-      service.getPolicyList.mockResolvedValue(policiesResponse);
-
-      store.dispatch(createUserChangedUrlAction('/administration/trusted_apps'));
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      dateNowMock.mockReturnValue(newNow);
-
-      store.dispatch({ type: 'trustedAppsListDataOutdated' });
-
-      expect(store.getState()).toStrictEqual({
-        ...initialState,
-        ...entriesExistLoadingState(),
-        listView: {
-          listResourceState: {
-            type: 'LoadingResourceState',
-            previousState: createListLoadedResourceState(pagination, initialNow),
-          },
-          freshDataTimestamp: newNow,
-        },
-        active: true,
-        location,
-      });
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-      await spyMiddleware.waitForAction('trustedAppsPoliciesStateChanged');
-
-      expect(store.getState()).toStrictEqual({
-        ...initialState,
-        ...entriesExistLoadedState(),
-        policies: {
-          data: policiesResponse,
-          type: 'LoadedResourceState',
-        },
-        listView: createLoadedListViewWithPagination(newNow, pagination),
-        active: true,
-        location,
-      });
-    });
-
-    it('set list resource state to failed when failing to load data', async () => {
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-
-      service.getTrustedAppsList.mockRejectedValue({
-        body: createServerApiError('Internal Server Error'),
-      });
-
-      store.dispatch(
-        createUserChangedUrlAction('/administration/trusted_apps', '?page_index=2&page_size=50')
-      );
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      expect(store.getState()).toStrictEqual({
-        ...initialState,
-        ...entriesExistLoadingState(),
-        listView: {
-          listResourceState: {
-            type: 'FailedResourceState',
-            error: createServerApiError('Internal Server Error'),
-            lastLoadedState: undefined,
-          },
-          freshDataTimestamp: initialNow,
-        },
-        active: true,
-        location: createLocationState({
-          page_index: 2,
-          page_size: 50,
-        }),
-      });
-
-      const infiniteLoopTest = async () => {
-        await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-      };
-
-      await expect(infiniteLoopTest).rejects.not.toBeNull();
-    });
-  });
-
-  describe('submitting deletion dialog', () => {
-    const newNow = 222222;
-    const entry = createSampleTrustedApp(3);
-    const notFoundError = createServerApiError('Not Found');
-    const pagination = { pageIndex: 0, pageSize: 10 };
-    const location = createLocationState();
-    const getTrustedAppsListResponse = createGetTrustedListAppsResponse(pagination);
-    const listView = createLoadedListViewWithPagination(initialNow, pagination);
-    const listViewNew = createLoadedListViewWithPagination(newNow, pagination);
-    const testStartState = {
-      ...initialState,
-      ...entriesExistLoadingState(),
-      listView,
-      active: true,
-      location,
-    };
-
-    it('does not submit when entry is undefined', async () => {
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-
-      service.getTrustedAppsList.mockResolvedValue(getTrustedAppsListResponse);
-      service.deleteTrustedApp.mockResolvedValue();
-
-      store.dispatch(createUserChangedUrlAction('/administration/trusted_apps'));
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      store.dispatch({ type: 'trustedAppDeletionDialogConfirmed' });
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        deletionDialog: { ...testStartState.deletionDialog, confirmed: true },
-      });
-    });
-
-    it('submits successfully when entry is defined', async () => {
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-      const policiesResponse = getGeneratedPolicyResponse();
-
-      service.getTrustedAppsList.mockResolvedValue(getTrustedAppsListResponse);
-      service.deleteTrustedApp.mockResolvedValue();
-      service.getPolicyList.mockResolvedValue(policiesResponse);
-
-      store.dispatch(createUserChangedUrlAction('/administration/trusted_apps'));
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      dateNowMock.mockReturnValue(newNow);
-
-      store.dispatch({ type: 'trustedAppDeletionDialogStarted', payload: { entry } });
-      store.dispatch({ type: 'trustedAppDeletionDialogConfirmed' });
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        deletionDialog: {
-          entry,
-          confirmed: true,
-          submissionResourceState: {
-            type: 'LoadingResourceState',
-            previousState: { type: 'UninitialisedResourceState' },
-          },
-        },
-      });
-
-      await spyMiddleware.waitForAction('trustedAppDeletionSubmissionResourceStateChanged');
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        ...entriesExistLoadedState(),
-        policies: {
-          data: policiesResponse,
-          type: 'LoadedResourceState',
-        },
-        listView: listViewNew,
-      });
-      expect(service.deleteTrustedApp).toBeCalledWith({ id: '3' });
-      expect(service.deleteTrustedApp).toBeCalledTimes(1);
-    });
-
-    it('does not submit twice', async () => {
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-      const policiesResponse = getGeneratedPolicyResponse();
-
-      service.getTrustedAppsList.mockResolvedValue(getTrustedAppsListResponse);
-      service.deleteTrustedApp.mockResolvedValue();
-      service.getPolicyList.mockResolvedValue(policiesResponse);
-
-      store.dispatch(createUserChangedUrlAction('/administration/trusted_apps'));
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      dateNowMock.mockReturnValue(newNow);
-
-      store.dispatch({ type: 'trustedAppDeletionDialogStarted', payload: { entry } });
-      store.dispatch({ type: 'trustedAppDeletionDialogConfirmed' });
-      store.dispatch({ type: 'trustedAppDeletionDialogConfirmed' });
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        deletionDialog: {
-          entry,
-          confirmed: true,
-          submissionResourceState: {
-            type: 'LoadingResourceState',
-            previousState: { type: 'UninitialisedResourceState' },
-          },
-        },
-      });
-
-      await spyMiddleware.waitForAction('trustedAppDeletionSubmissionResourceStateChanged');
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        ...entriesExistLoadedState(),
-        policies: {
-          data: policiesResponse,
-          type: 'LoadedResourceState',
-        },
-        listView: listViewNew,
-      });
-      expect(service.deleteTrustedApp).toBeCalledWith({ id: '3' });
-      expect(service.deleteTrustedApp).toBeCalledTimes(1);
-    });
-
-    it('does not submit when server response with failure', async () => {
-      const service = createTrustedAppsServiceMock();
-      const { store, spyMiddleware } = createStoreSetup(service);
-      const policiesResponse = getGeneratedPolicyResponse();
-
-      service.getTrustedAppsList.mockResolvedValue(getTrustedAppsListResponse);
-      service.deleteTrustedApp.mockRejectedValue({ body: notFoundError });
-      service.getPolicyList.mockResolvedValue(policiesResponse);
-
-      store.dispatch(createUserChangedUrlAction('/administration/trusted_apps'));
-
-      await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
-
-      store.dispatch({ type: 'trustedAppDeletionDialogStarted', payload: { entry } });
-      store.dispatch({ type: 'trustedAppDeletionDialogConfirmed' });
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        deletionDialog: {
-          entry,
-          confirmed: true,
-          submissionResourceState: {
-            type: 'LoadingResourceState',
-            previousState: { type: 'UninitialisedResourceState' },
-          },
-        },
-      });
-
-      await spyMiddleware.waitForAction('trustedAppDeletionSubmissionResourceStateChanged');
-      await spyMiddleware.waitForAction('trustedAppsPoliciesStateChanged');
-
-      expect(store.getState()).toStrictEqual({
-        ...testStartState,
-        ...entriesExistLoadedState(),
-        policies: {
-          data: policiesResponse,
-          type: 'LoadedResourceState',
-        },
-        deletionDialog: {
-          entry,
-          confirmed: true,
-          submissionResourceState: {
-            type: 'FailedResourceState',
-            error: notFoundError,
-            lastLoadedState: undefined,
-          },
-        },
-      });
-      expect(service.deleteTrustedApp).toBeCalledWith({ id: '3' });
-      expect(service.deleteTrustedApp).toBeCalledTimes(1);
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
deleted file mode 100644
index cd39ee27353e9..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-import {
-  Immutable,
-  PostTrustedAppCreateRequest,
-  TrustedApp,
-} from '../../../../../common/endpoint/types';
-import { AppAction } from '../../../../common/store/actions';
-import {
-  ImmutableMiddleware,
-  ImmutableMiddlewareAPI,
-  ImmutableMiddlewareFactory,
-} from '../../../../common/store';
-
-import { TrustedAppsHttpService, TrustedAppsService } from '../service';
-
-import {
-  AsyncResourceState,
-  getLastLoadedResourceState,
-  isLoadedResourceState,
-  isLoadingResourceState,
-  isStaleResourceState,
-  isUninitialisedResourceState,
-  StaleResourceState,
-  TrustedAppsListData,
-  TrustedAppsListPageState,
-} from '../state';
-
-import { defaultNewTrustedApp } from './builders';
-
-import {
-  TrustedAppCreationSubmissionResourceStateChanged,
-  TrustedAppDeletionSubmissionResourceStateChanged,
-  TrustedAppsListResourceStateChanged,
-} from './action';
-
-import {
-  getListResourceState,
-  getDeletionDialogEntry,
-  getDeletionSubmissionResourceState,
-  getLastLoadedListResourceState,
-  getCurrentLocationPageIndex,
-  getCurrentLocationPageSize,
-  getCurrentLocationFilter,
-  needsRefreshOfListData,
-  getCreationSubmissionResourceState,
-  getCreationDialogFormEntry,
-  isCreationDialogLocation,
-  isCreationDialogFormValid,
-  entriesExist,
-  getListTotalItemsCount,
-  trustedAppsListPageActive,
-  entriesExistState,
-  policiesState,
-  isEdit,
-  isFetchingEditTrustedAppItem,
-  editItemId,
-  editingTrustedApp,
-  getListItems,
-  getCurrentLocationIncludedPolicies,
-} from './selectors';
-import { parsePoliciesToKQL, parseQueryFilterToKQL } from '../../../common/utils';
-import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
-import { SEARCHABLE_FIELDS } from '../constants';
-
-const createTrustedAppsListResourceStateChangedAction = (
-  newState: Immutable<AsyncResourceState<TrustedAppsListData>>
-): Immutable<TrustedAppsListResourceStateChanged> => ({
-  type: 'trustedAppsListResourceStateChanged',
-  payload: { newState },
-});
-
-const refreshListIfNeeded = async (
-  store: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>,
-  trustedAppsService: TrustedAppsService
-) => {
-  if (needsRefreshOfListData(store.getState())) {
-    store.dispatch({ type: 'trustedAppForceRefresh', payload: { forceRefresh: false } });
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction({
-        type: 'LoadingResourceState',
-        // need to think on how to avoid the casting
-        previousState: getListResourceState(store.getState()) as Immutable<
-          StaleResourceState<TrustedAppsListData>
-        >,
-      })
-    );
-
-    try {
-      const pageIndex = getCurrentLocationPageIndex(store.getState());
-      const pageSize = getCurrentLocationPageSize(store.getState());
-      const filter = getCurrentLocationFilter(store.getState());
-      const includedPolicies = getCurrentLocationIncludedPolicies(store.getState());
-
-      const kuery = [];
-
-      const filterKuery = parseQueryFilterToKQL(filter, SEARCHABLE_FIELDS) || undefined;
-      if (filterKuery) kuery.push(filterKuery);
-
-      const policiesKuery =
-        parsePoliciesToKQL(includedPolicies ? includedPolicies.split(',') : []) || undefined;
-      if (policiesKuery) kuery.push(policiesKuery);
-
-      const response = await trustedAppsService.getTrustedAppsList({
-        page: pageIndex + 1,
-        per_page: pageSize,
-        kuery: kuery.join(' AND ') || undefined,
-      });
-
-      store.dispatch(
-        createTrustedAppsListResourceStateChangedAction({
-          type: 'LoadedResourceState',
-          data: {
-            items: response.data,
-            pageIndex,
-            pageSize,
-            totalItemsCount: response.total,
-            timestamp: Date.now(),
-            filter,
-            includedPolicies,
-          },
-        })
-      );
-    } catch (error) {
-      store.dispatch(
-        createTrustedAppsListResourceStateChangedAction({
-          type: 'FailedResourceState',
-          error: error.body,
-          lastLoadedState: getLastLoadedListResourceState(store.getState()),
-        })
-      );
-    }
-  }
-};
-
-const updateCreationDialogIfNeeded = (
-  store: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>
-) => {
-  const newEntry = getCreationDialogFormEntry(store.getState());
-  const shouldShow = isCreationDialogLocation(store.getState());
-
-  if (shouldShow && !newEntry) {
-    store.dispatch({
-      type: 'trustedAppCreationDialogStarted',
-      payload: { entry: defaultNewTrustedApp() },
-    });
-  } else if (!shouldShow && newEntry) {
-    store.dispatch({
-      type: 'trustedAppCreationDialogClosed',
-    });
-  }
-};
-
-const createTrustedAppCreationSubmissionResourceStateChanged = (
-  newState: Immutable<AsyncResourceState<TrustedApp>>
-): Immutable<TrustedAppCreationSubmissionResourceStateChanged> => ({
-  type: 'trustedAppCreationSubmissionResourceStateChanged',
-  payload: { newState },
-});
-
-const submitCreationIfNeeded = async (
-  store: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>,
-  trustedAppsService: TrustedAppsService
-) => {
-  const currentState = store.getState();
-  const submissionResourceState = getCreationSubmissionResourceState(currentState);
-  const isValid = isCreationDialogFormValid(currentState);
-  const entry = getCreationDialogFormEntry(currentState);
-  const editMode = isEdit(currentState);
-
-  if (isStaleResourceState(submissionResourceState) && entry !== undefined && isValid) {
-    store.dispatch(
-      createTrustedAppCreationSubmissionResourceStateChanged({
-        type: 'LoadingResourceState',
-        previousState: submissionResourceState,
-      })
-    );
-
-    try {
-      let responseTrustedApp: TrustedApp;
-
-      if (editMode) {
-        responseTrustedApp = (
-          await trustedAppsService.updateTrustedApp(
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            { id: editItemId(currentState)! },
-            // TODO: try to remove the cast
-            entry as PostTrustedAppCreateRequest
-          )
-        ).data;
-      } else {
-        // TODO: try to remove the cast
-        responseTrustedApp = (
-          await trustedAppsService.createTrustedApp(entry as PostTrustedAppCreateRequest)
-        ).data;
-      }
-
-      store.dispatch(
-        createTrustedAppCreationSubmissionResourceStateChanged({
-          type: 'LoadedResourceState',
-          data: responseTrustedApp,
-        })
-      );
-      store.dispatch({
-        type: 'trustedAppsListDataOutdated',
-      });
-    } catch (error) {
-      store.dispatch(
-        createTrustedAppCreationSubmissionResourceStateChanged({
-          type: 'FailedResourceState',
-          error: error.body,
-          lastLoadedState: getLastLoadedResourceState(submissionResourceState),
-        })
-      );
-    }
-  }
-};
-
-const createTrustedAppDeletionSubmissionResourceStateChanged = (
-  newState: Immutable<AsyncResourceState>
-): Immutable<TrustedAppDeletionSubmissionResourceStateChanged> => ({
-  type: 'trustedAppDeletionSubmissionResourceStateChanged',
-  payload: { newState },
-});
-
-const submitDeletionIfNeeded = async (
-  store: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>,
-  trustedAppsService: TrustedAppsService
-) => {
-  const submissionResourceState = getDeletionSubmissionResourceState(store.getState());
-  const entry = getDeletionDialogEntry(store.getState());
-
-  if (isStaleResourceState(submissionResourceState) && entry !== undefined) {
-    store.dispatch(
-      createTrustedAppDeletionSubmissionResourceStateChanged({
-        type: 'LoadingResourceState',
-        previousState: submissionResourceState,
-      })
-    );
-
-    try {
-      await trustedAppsService.deleteTrustedApp({ id: entry.id });
-
-      store.dispatch(
-        createTrustedAppDeletionSubmissionResourceStateChanged({
-          type: 'LoadedResourceState',
-          data: null,
-        })
-      );
-      store.dispatch({
-        type: 'trustedAppDeletionDialogClosed',
-      });
-      store.dispatch({
-        type: 'trustedAppsListDataOutdated',
-      });
-    } catch (error) {
-      store.dispatch(
-        createTrustedAppDeletionSubmissionResourceStateChanged({
-          type: 'FailedResourceState',
-          error: error.body,
-          lastLoadedState: getLastLoadedResourceState(submissionResourceState),
-        })
-      );
-    }
-  }
-};
-
-const checkTrustedAppsExistIfNeeded = async (
-  store: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>,
-  trustedAppsService: TrustedAppsService
-) => {
-  const currentState = store.getState();
-  const currentEntriesExistState = entriesExistState(currentState);
-
-  if (
-    trustedAppsListPageActive(currentState) &&
-    !isLoadingResourceState(currentEntriesExistState)
-  ) {
-    const currentListTotal = getListTotalItemsCount(currentState);
-    const currentDoEntriesExist = entriesExist(currentState);
-
-    if (
-      !isLoadedResourceState(currentEntriesExistState) ||
-      (currentListTotal === 0 && currentDoEntriesExist) ||
-      (currentListTotal > 0 && !currentDoEntriesExist)
-    ) {
-      store.dispatch({
-        type: 'trustedAppsExistStateChanged',
-        payload: { type: 'LoadingResourceState', previousState: currentEntriesExistState },
-      });
-
-      let doTheyExist: boolean;
-      try {
-        const { total } = await trustedAppsService.getTrustedAppsList({
-          page: 1,
-          per_page: 1,
-        });
-        doTheyExist = total > 0;
-      } catch (e) {
-        // If a failure occurs, lets assume entries exits so that the UI is not blocked to the user
-        doTheyExist = true;
-      }
-
-      store.dispatch({
-        type: 'trustedAppsExistStateChanged',
-        payload: { type: 'LoadedResourceState', data: doTheyExist },
-      });
-    }
-  }
-};
-
-export const retrieveListOfPoliciesIfNeeded = async (
-  { getState, dispatch }: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>,
-  trustedAppsService: TrustedAppsService
-) => {
-  const currentState = getState();
-  const currentPoliciesState = policiesState(currentState);
-  const isLoading = isLoadingResourceState(currentPoliciesState);
-  const isPageActive = trustedAppsListPageActive(currentState);
-  const isCreateFlow = isCreationDialogLocation(currentState);
-  const isUninitialized = isUninitialisedResourceState(currentPoliciesState);
-
-  if (isPageActive && ((isCreateFlow && !isLoading) || isUninitialized)) {
-    dispatch({
-      type: 'trustedAppsPoliciesStateChanged',
-      payload: {
-        type: 'LoadingResourceState',
-        previousState: currentPoliciesState,
-      } as TrustedAppsListPageState['policies'],
-    });
-
-    try {
-      const policyList = await trustedAppsService.getPolicyList({
-        query: {
-          page: 1,
-          perPage: 1000,
-        },
-      });
-
-      dispatch({
-        type: 'trustedAppsPoliciesStateChanged',
-        payload: {
-          type: 'LoadedResourceState',
-          data: policyList,
-        },
-      });
-    } catch (error) {
-      dispatch({
-        type: 'trustedAppsPoliciesStateChanged',
-        payload: {
-          type: 'FailedResourceState',
-          error: error.body || error,
-          lastLoadedState: getLastLoadedResourceState(policiesState(getState())),
-        },
-      });
-    }
-  }
-};
-
-const fetchEditTrustedAppIfNeeded = async (
-  { getState, dispatch }: ImmutableMiddlewareAPI<TrustedAppsListPageState, AppAction>,
-  trustedAppsService: TrustedAppsService
-) => {
-  const currentState = getState();
-  const isPageActive = trustedAppsListPageActive(currentState);
-  const isEditFlow = isEdit(currentState);
-  const isAlreadyFetching = isFetchingEditTrustedAppItem(currentState);
-  const editTrustedAppId = editItemId(currentState);
-
-  if (isPageActive && isEditFlow && !isAlreadyFetching) {
-    if (!editTrustedAppId) {
-      const errorMessage = i18n.translate(
-        'xpack.securitySolution.trustedapps.middleware.editIdMissing',
-        {
-          defaultMessage: 'No id provided',
-        }
-      );
-
-      dispatch({
-        type: 'trustedAppCreationEditItemStateChanged',
-        payload: {
-          type: 'FailedResourceState',
-          error: Object.assign(new Error(errorMessage), { statusCode: 404, error: errorMessage }),
-        },
-      });
-      return;
-    }
-
-    let trustedAppForEdit = editingTrustedApp(currentState);
-
-    // If Trusted App is already loaded, then do nothing
-    if (trustedAppForEdit && trustedAppForEdit.id === editTrustedAppId) {
-      return;
-    }
-
-    // See if we can get the Trusted App record from the current list of Trusted Apps being displayed
-    trustedAppForEdit = getListItems(currentState).find((ta) => ta.id === editTrustedAppId);
-
-    try {
-      // Retrieve Trusted App record via API if it was not in the list data.
-      // This would be the case when linking from another place or using an UUID for a Trusted App
-      // that is not currently displayed on the list view.
-      if (!trustedAppForEdit) {
-        dispatch({
-          type: 'trustedAppCreationEditItemStateChanged',
-          payload: {
-            type: 'LoadingResourceState',
-          },
-        });
-
-        trustedAppForEdit = (await trustedAppsService.getTrustedApp({ id: editTrustedAppId })).data;
-      }
-
-      dispatch({
-        type: 'trustedAppCreationEditItemStateChanged',
-        payload: {
-          type: 'LoadedResourceState',
-          data: trustedAppForEdit,
-        },
-      });
-
-      dispatch({
-        type: 'trustedAppCreationDialogFormStateUpdated',
-        payload: {
-          entry: toUpdateTrustedApp(trustedAppForEdit),
-          isValid: true,
-        },
-      });
-    } catch (e) {
-      dispatch({
-        type: 'trustedAppCreationEditItemStateChanged',
-        payload: {
-          type: 'FailedResourceState',
-          error: e,
-        },
-      });
-    }
-  }
-};
-
-export const createTrustedAppsPageMiddleware = (
-  trustedAppsService: TrustedAppsService
-): ImmutableMiddleware<TrustedAppsListPageState, AppAction> => {
-  return (store) => (next) => async (action) => {
-    next(action);
-
-    // TODO: need to think if failed state is a good condition to consider need for refresh
-    if (action.type === 'userChangedUrl' || action.type === 'trustedAppsListDataOutdated') {
-      await refreshListIfNeeded(store, trustedAppsService);
-      await checkTrustedAppsExistIfNeeded(store, trustedAppsService);
-    }
-
-    if (action.type === 'userChangedUrl') {
-      updateCreationDialogIfNeeded(store);
-      retrieveListOfPoliciesIfNeeded(store, trustedAppsService);
-      fetchEditTrustedAppIfNeeded(store, trustedAppsService);
-    }
-
-    if (action.type === 'trustedAppCreationDialogConfirmed') {
-      await submitCreationIfNeeded(store, trustedAppsService);
-    }
-
-    if (action.type === 'trustedAppDeletionDialogConfirmed') {
-      await submitDeletionIfNeeded(store, trustedAppsService);
-    }
-  };
-};
-
-export const trustedAppsPageMiddlewareFactory: ImmutableMiddlewareFactory<
-  TrustedAppsListPageState
-> = (coreStart) => createTrustedAppsPageMiddleware(new TrustedAppsHttpService(coreStart.http));
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/mocks.ts
deleted file mode 100644
index c97dd37db6bbf..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/mocks.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { GetPolicyListResponse } from '../../policy/types';
-
-import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
-
-export const getGeneratedPolicyResponse = (): GetPolicyListResponse => ({
-  items: [new EndpointDocGenerator('seed').generatePolicyPackagePolicy()],
-  total: 1,
-  perPage: 1,
-  page: 1,
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts
deleted file mode 100644
index 5047608cbb4ec..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { AsyncResourceState } from '../state';
-import { initialTrustedAppsPageState } from './builders';
-import { trustedAppsPageReducer } from './reducer';
-import {
-  createSampleTrustedApp,
-  createListLoadedResourceState,
-  createLoadedListViewWithPagination,
-  createUserChangedUrlAction,
-  createTrustedAppsListResourceStateChangedAction,
-} from '../test_utils';
-
-const initialNow = 111111;
-const dateNowMock = jest.fn();
-dateNowMock.mockReturnValue(initialNow);
-
-Date.now = dateNowMock;
-
-const initialState = initialTrustedAppsPageState();
-
-describe('reducer', () => {
-  describe('UserChangedUrl', () => {
-    it('makes page state active and extracts all parameters', () => {
-      const result = trustedAppsPageReducer(
-        initialState,
-        createUserChangedUrlAction(
-          '/administration/trusted_apps',
-          '?page_index=5&page_size=50&show=create&view_type=list&filter=test&included_policies=global'
-        )
-      );
-
-      expect(result).toStrictEqual({
-        ...initialState,
-        location: {
-          page_index: 5,
-          page_size: 50,
-          show: 'create',
-          view_type: 'list',
-          id: undefined,
-          filter: 'test',
-          included_policies: 'global',
-        },
-        active: true,
-      });
-    });
-
-    it('extracts default pagination parameters when invalid provided', () => {
-      const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          location: {
-            page_index: 5,
-            page_size: 50,
-            view_type: 'grid',
-            filter: '',
-            included_policies: '',
-          },
-        },
-        createUserChangedUrlAction(
-          '/administration/trusted_apps',
-          '?page_index=b&page_size=60&show=a&view_type=c'
-        )
-      );
-
-      expect(result).toStrictEqual({ ...initialState, active: true });
-    });
-
-    it('extracts default pagination parameters when none provided', () => {
-      const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          location: {
-            page_index: 5,
-            page_size: 50,
-            view_type: 'grid',
-            filter: '',
-            included_policies: '',
-          },
-        },
-        createUserChangedUrlAction('/administration/trusted_apps')
-      );
-
-      expect(result).toStrictEqual({ ...initialState, active: true });
-    });
-
-    it('makes page state inactive and resets list to uninitialised state when navigating away', () => {
-      const result = trustedAppsPageReducer(
-        { ...initialState, listView: createLoadedListViewWithPagination(initialNow), active: true },
-        createUserChangedUrlAction('/administration/endpoints')
-      );
-
-      expect(result).toStrictEqual(initialState);
-    });
-  });
-
-  describe('TrustedAppsListResourceStateChanged', () => {
-    it('sets the current list resource state', () => {
-      const listResourceState = createListLoadedResourceState(
-        { pageIndex: 3, pageSize: 50 },
-        initialNow
-      );
-      const result = trustedAppsPageReducer(
-        initialState,
-        createTrustedAppsListResourceStateChangedAction(listResourceState)
-      );
-
-      expect(result).toStrictEqual({
-        ...initialState,
-        listView: { ...initialState.listView, listResourceState },
-      });
-    });
-  });
-
-  describe('TrustedAppsListDataOutdated', () => {
-    it('sets the list view freshness timestamp', () => {
-      const newNow = 222222;
-      dateNowMock.mockReturnValue(newNow);
-
-      const result = trustedAppsPageReducer(initialState, { type: 'trustedAppsListDataOutdated' });
-
-      expect(result).toStrictEqual({
-        ...initialState,
-        listView: { ...initialState.listView, freshDataTimestamp: newNow },
-      });
-    });
-  });
-
-  describe('TrustedAppDeletionSubmissionResourceStateChanged', () => {
-    it('sets the deletion dialog submission resource state', () => {
-      const submissionResourceState: AsyncResourceState = {
-        type: 'LoadedResourceState',
-        data: null,
-      };
-      const result = trustedAppsPageReducer(initialState, {
-        type: 'trustedAppDeletionSubmissionResourceStateChanged',
-        payload: { newState: submissionResourceState },
-      });
-
-      expect(result).toStrictEqual({
-        ...initialState,
-        deletionDialog: { ...initialState.deletionDialog, submissionResourceState },
-      });
-    });
-  });
-
-  describe('TrustedAppDeletionDialogStarted', () => {
-    it('sets the deletion dialog state to started', () => {
-      const entry = createSampleTrustedApp(3);
-      const result = trustedAppsPageReducer(initialState, {
-        type: 'trustedAppDeletionDialogStarted',
-        payload: { entry },
-      });
-
-      expect(result).toStrictEqual({
-        ...initialState,
-        deletionDialog: { ...initialState.deletionDialog, entry },
-      });
-    });
-  });
-
-  describe('TrustedAppDeletionDialogConfirmed', () => {
-    it('sets the deletion dialog state to confirmed', () => {
-      const entry = createSampleTrustedApp(3);
-      const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          deletionDialog: {
-            entry,
-            confirmed: false,
-            submissionResourceState: { type: 'UninitialisedResourceState' },
-          },
-        },
-        { type: 'trustedAppDeletionDialogConfirmed' }
-      );
-
-      expect(result).toStrictEqual({
-        ...initialState,
-        deletionDialog: {
-          entry,
-          confirmed: true,
-          submissionResourceState: { type: 'UninitialisedResourceState' },
-        },
-      });
-    });
-  });
-
-  describe('TrustedAppDeletionDialogClosed', () => {
-    it('sets the deletion dialog state to confirmed', () => {
-      const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          deletionDialog: {
-            entry: createSampleTrustedApp(3),
-            confirmed: true,
-            submissionResourceState: { type: 'UninitialisedResourceState' },
-          },
-        },
-        { type: 'trustedAppDeletionDialogClosed' }
-      );
-
-      expect(result).toStrictEqual(initialState);
-    });
-  });
-
-  describe('TrustedAppsForceRefresh', () => {
-    it('sets the force refresh state to true', () => {
-      const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          forceRefresh: false,
-        },
-        { type: 'trustedAppForceRefresh', payload: { forceRefresh: true } }
-      );
-
-      expect(result).toStrictEqual({ ...initialState, forceRefresh: true });
-    });
-    it('sets the force refresh state to false', () => {
-      const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          forceRefresh: true,
-        },
-        { type: 'trustedAppForceRefresh', payload: { forceRefresh: false } }
-      );
-
-      expect(result).toStrictEqual({ ...initialState, forceRefresh: false });
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts
deleted file mode 100644
index 07409a46156db..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// eslint-disable-next-line import/no-nodejs-modules
-import { parse } from 'querystring';
-import { matchPath } from 'react-router-dom';
-import { ImmutableReducer } from '../../../../common/store';
-import { AppLocation, Immutable } from '../../../../../common/endpoint/types';
-import { UserChangedUrl } from '../../../../common/store/routing/action';
-import { AppAction } from '../../../../common/store/actions';
-import { extractTrustedAppsListPageLocation } from '../../../common/routing';
-
-import { MANAGEMENT_ROUTING_TRUSTED_APPS_PATH } from '../../../common/constants';
-
-import {
-  TrustedAppDeletionDialogClosed,
-  TrustedAppDeletionDialogConfirmed,
-  TrustedAppDeletionDialogStarted,
-  TrustedAppDeletionSubmissionResourceStateChanged,
-  TrustedAppCreationSubmissionResourceStateChanged,
-  TrustedAppsListDataOutdated,
-  TrustedAppsListResourceStateChanged,
-  TrustedAppCreationDialogStarted,
-  TrustedAppCreationDialogFormStateUpdated,
-  TrustedAppCreationDialogConfirmed,
-  TrustedAppCreationDialogClosed,
-  TrustedAppsExistResponse,
-  TrustedAppsPoliciesStateChanged,
-  TrustedAppCreationEditItemStateChanged,
-  TrustedAppForceRefresh,
-} from './action';
-
-import { TrustedAppsListPageState } from '../state';
-import {
-  initialCreationDialogState,
-  initialDeletionDialogState,
-  initialTrustedAppsPageState,
-} from './builders';
-import { entriesExistState, trustedAppsListPageActive } from './selectors';
-
-type StateReducer = ImmutableReducer<TrustedAppsListPageState, AppAction>;
-type CaseReducer<T extends AppAction> = (
-  state: Immutable<TrustedAppsListPageState>,
-  action: Immutable<T>
-) => Immutable<TrustedAppsListPageState>;
-
-const isTrustedAppsPageLocation = (location: Immutable<AppLocation>) => {
-  return (
-    matchPath(location.pathname ?? '', {
-      path: MANAGEMENT_ROUTING_TRUSTED_APPS_PATH,
-      exact: true,
-    }) !== null
-  );
-};
-
-const trustedAppsListDataOutdated: CaseReducer<TrustedAppsListDataOutdated> = (state, action) => {
-  return { ...state, listView: { ...state.listView, freshDataTimestamp: Date.now() } };
-};
-
-const trustedAppsListResourceStateChanged: CaseReducer<TrustedAppsListResourceStateChanged> = (
-  state,
-  action
-) => {
-  return { ...state, listView: { ...state.listView, listResourceState: action.payload.newState } };
-};
-
-const trustedAppDeletionSubmissionResourceStateChanged: CaseReducer<
-  TrustedAppDeletionSubmissionResourceStateChanged
-> = (state, action) => {
-  return {
-    ...state,
-    deletionDialog: { ...state.deletionDialog, submissionResourceState: action.payload.newState },
-  };
-};
-
-const trustedAppDeletionDialogStarted: CaseReducer<TrustedAppDeletionDialogStarted> = (
-  state,
-  action
-) => {
-  return { ...state, deletionDialog: { ...initialDeletionDialogState(), ...action.payload } };
-};
-
-const trustedAppDeletionDialogConfirmed: CaseReducer<TrustedAppDeletionDialogConfirmed> = (
-  state
-) => {
-  return { ...state, deletionDialog: { ...state.deletionDialog, confirmed: true } };
-};
-
-const trustedAppDeletionDialogClosed: CaseReducer<TrustedAppDeletionDialogClosed> = (state) => {
-  return { ...state, deletionDialog: initialDeletionDialogState() };
-};
-
-const trustedAppCreationSubmissionResourceStateChanged: CaseReducer<
-  TrustedAppCreationSubmissionResourceStateChanged
-> = (state, action) => {
-  return {
-    ...state,
-    creationDialog: { ...state.creationDialog, submissionResourceState: action.payload.newState },
-  };
-};
-
-const trustedAppCreationDialogStarted: CaseReducer<TrustedAppCreationDialogStarted> = (
-  state,
-  action
-) => {
-  return {
-    ...state,
-    creationDialog: {
-      ...initialCreationDialogState(),
-      formState: { ...action.payload, isValid: false },
-    },
-  };
-};
-
-const trustedAppCreationDialogFormStateUpdated: CaseReducer<
-  TrustedAppCreationDialogFormStateUpdated
-> = (state, action) => {
-  return {
-    ...state,
-    creationDialog: { ...state.creationDialog, formState: { ...action.payload } },
-  };
-};
-
-const handleUpdateToEditItemState: CaseReducer<TrustedAppCreationEditItemStateChanged> = (
-  state,
-  action
-) => {
-  return {
-    ...state,
-    creationDialog: { ...state.creationDialog, editItem: action.payload },
-  };
-};
-
-const trustedAppCreationDialogConfirmed: CaseReducer<TrustedAppCreationDialogConfirmed> = (
-  state
-) => {
-  return { ...state, creationDialog: { ...state.creationDialog, confirmed: true } };
-};
-
-const trustedAppCreationDialogClosed: CaseReducer<TrustedAppCreationDialogClosed> = (state) => {
-  return { ...state, creationDialog: initialCreationDialogState() };
-};
-
-const userChangedUrl: CaseReducer<UserChangedUrl> = (state, action) => {
-  if (isTrustedAppsPageLocation(action.payload)) {
-    const location = extractTrustedAppsListPageLocation(parse(action.payload.search.slice(1)));
-
-    return { ...state, active: true, location };
-  } else {
-    return initialTrustedAppsPageState();
-  }
-};
-
-const updateEntriesExists: CaseReducer<TrustedAppsExistResponse> = (state, { payload }) => {
-  if (entriesExistState(state) !== payload) {
-    return {
-      ...state,
-      entriesExist: payload,
-    };
-  }
-  return state;
-};
-
-const updatePolicies: CaseReducer<TrustedAppsPoliciesStateChanged> = (state, { payload }) => {
-  if (trustedAppsListPageActive(state)) {
-    return {
-      ...state,
-      policies: payload,
-    };
-  }
-  return state;
-};
-
-const forceRefresh: CaseReducer<TrustedAppForceRefresh> = (state, { payload }) => {
-  return {
-    ...state,
-    forceRefresh: payload.forceRefresh,
-  };
-};
-
-export const trustedAppsPageReducer: StateReducer = (
-  state = initialTrustedAppsPageState(),
-  action
-) => {
-  switch (action.type) {
-    case 'trustedAppsListDataOutdated':
-      return trustedAppsListDataOutdated(state, action);
-
-    case 'trustedAppsListResourceStateChanged':
-      return trustedAppsListResourceStateChanged(state, action);
-
-    case 'trustedAppDeletionSubmissionResourceStateChanged':
-      return trustedAppDeletionSubmissionResourceStateChanged(state, action);
-
-    case 'trustedAppDeletionDialogStarted':
-      return trustedAppDeletionDialogStarted(state, action);
-
-    case 'trustedAppDeletionDialogConfirmed':
-      return trustedAppDeletionDialogConfirmed(state, action);
-
-    case 'trustedAppDeletionDialogClosed':
-      return trustedAppDeletionDialogClosed(state, action);
-
-    case 'trustedAppCreationSubmissionResourceStateChanged':
-      return trustedAppCreationSubmissionResourceStateChanged(state, action);
-
-    case 'trustedAppCreationDialogStarted':
-      return trustedAppCreationDialogStarted(state, action);
-
-    case 'trustedAppCreationDialogFormStateUpdated':
-      return trustedAppCreationDialogFormStateUpdated(state, action);
-
-    case 'trustedAppCreationEditItemStateChanged':
-      return handleUpdateToEditItemState(state, action);
-
-    case 'trustedAppCreationDialogConfirmed':
-      return trustedAppCreationDialogConfirmed(state, action);
-
-    case 'trustedAppCreationDialogClosed':
-      return trustedAppCreationDialogClosed(state, action);
-
-    case 'userChangedUrl':
-      return userChangedUrl(state, action);
-
-    case 'trustedAppsExistStateChanged':
-      return updateEntriesExists(state, action);
-
-    case 'trustedAppsPoliciesStateChanged':
-      return updatePolicies(state, action);
-
-    case 'trustedAppForceRefresh':
-      return forceRefresh(state, action);
-  }
-
-  return state;
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts
deleted file mode 100644
index 4468d044827c0..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  AsyncResourceState,
-  TrustedAppsListPageLocation,
-  TrustedAppsListPageState,
-} from '../state';
-import { initialTrustedAppsPageState } from './builders';
-import {
-  getListResourceState,
-  getLastLoadedListResourceState,
-  getCurrentLocationPageIndex,
-  getCurrentLocationPageSize,
-  getListErrorMessage,
-  getListItems,
-  getListTotalItemsCount,
-  isListLoading,
-  needsRefreshOfListData,
-  isDeletionDialogOpen,
-  isDeletionInProgress,
-  isDeletionSuccessful,
-  getDeletionError,
-  getDeletionDialogEntry,
-  getDeletionSubmissionResourceState,
-} from './selectors';
-
-import {
-  createDefaultPagination,
-  createListComplexLoadingResourceState,
-  createListFailedResourceState,
-  createListLoadedResourceState,
-  createLoadedListViewWithPagination,
-  createSampleTrustedApp,
-  createSampleTrustedApps,
-  createServerApiError,
-  createUninitialisedResourceState,
-} from '../test_utils';
-
-const initialNow = 111111;
-const dateNowMock = jest.fn();
-dateNowMock.mockReturnValue(initialNow);
-
-Date.now = dateNowMock;
-
-const initialState = initialTrustedAppsPageState();
-
-const createStateWithDeletionSubmissionResourceState = (
-  submissionResourceState: AsyncResourceState
-): TrustedAppsListPageState => ({
-  ...initialState,
-  deletionDialog: { ...initialState.deletionDialog, submissionResourceState },
-});
-
-describe('selectors', () => {
-  describe('needsRefreshOfListData()', () => {
-    it('returns false for outdated resource state and inactive state', () => {
-      expect(needsRefreshOfListData(initialState)).toBe(false);
-    });
-
-    it('returns true for outdated resource state and active state', () => {
-      expect(needsRefreshOfListData({ ...initialState, active: true })).toBe(true);
-    });
-
-    it('returns true when current loaded page index is outdated', () => {
-      const listView = createLoadedListViewWithPagination(initialNow, { pageIndex: 1 });
-
-      expect(needsRefreshOfListData({ ...initialState, listView, active: true })).toBe(true);
-    });
-
-    it('returns true when current loaded page size is outdated', () => {
-      const listView = createLoadedListViewWithPagination(initialNow, { pageSize: 50 });
-
-      expect(needsRefreshOfListData({ ...initialState, listView, active: true })).toBe(true);
-    });
-
-    it('returns true when current loaded data timestamp is outdated', () => {
-      const listView = {
-        ...createLoadedListViewWithPagination(111111),
-        freshDataTimestamp: 222222,
-      };
-
-      expect(needsRefreshOfListData({ ...initialState, listView, active: true })).toBe(true);
-    });
-
-    it('returns false when current loaded data is up to date', () => {
-      const listView = createLoadedListViewWithPagination(initialNow);
-      const location: TrustedAppsListPageLocation = {
-        page_index: 0,
-        page_size: 10,
-        view_type: 'grid',
-        filter: '',
-        included_policies: '',
-      };
-
-      expect(needsRefreshOfListData({ ...initialState, listView, active: true, location })).toBe(
-        false
-      );
-    });
-  });
-
-  describe('getListResourceState()', () => {
-    it('returns current list resource state', () => {
-      expect(getListResourceState(initialState)).toStrictEqual(createUninitialisedResourceState());
-    });
-  });
-
-  describe('getLastLoadedListResourceState()', () => {
-    it('returns last loaded list resource state', () => {
-      const state = {
-        ...initialState,
-        listView: {
-          listResourceState: createListComplexLoadingResourceState(
-            createDefaultPagination(),
-            initialNow
-          ),
-          freshDataTimestamp: initialNow,
-        },
-      };
-
-      expect(getLastLoadedListResourceState(state)).toStrictEqual(
-        createListLoadedResourceState(createDefaultPagination(), initialNow)
-      );
-    });
-  });
-
-  describe('getListItems()', () => {
-    it('returns empty list when no valid data loaded', () => {
-      expect(getListItems(initialState)).toStrictEqual([]);
-    });
-
-    it('returns last loaded list items', () => {
-      const state = {
-        ...initialState,
-        listView: {
-          listResourceState: createListComplexLoadingResourceState(
-            createDefaultPagination(),
-            initialNow
-          ),
-          freshDataTimestamp: initialNow,
-        },
-      };
-
-      expect(getListItems(state)).toStrictEqual(createSampleTrustedApps(createDefaultPagination()));
-    });
-  });
-
-  describe('getListTotalItemsCount()', () => {
-    it('returns 0 when no valid data loaded', () => {
-      expect(getListTotalItemsCount(initialState)).toBe(0);
-    });
-
-    it('returns last loaded total items count', () => {
-      const state = {
-        ...initialState,
-        listView: {
-          listResourceState: createListComplexLoadingResourceState(
-            createDefaultPagination(),
-            initialNow
-          ),
-          freshDataTimestamp: initialNow,
-        },
-      };
-
-      expect(getListTotalItemsCount(state)).toBe(200);
-    });
-  });
-
-  describe('getListCurrentPageIndex()', () => {
-    it('returns page index', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: 3,
-        page_size: 10,
-        view_type: 'grid',
-        filter: '',
-        included_policies: '',
-      };
-
-      expect(getCurrentLocationPageIndex({ ...initialState, location })).toBe(3);
-    });
-  });
-
-  describe('getListCurrentPageSize()', () => {
-    it('returns page size', () => {
-      const location: TrustedAppsListPageLocation = {
-        page_index: 0,
-        page_size: 20,
-        view_type: 'grid',
-        filter: '',
-        included_policies: '',
-      };
-
-      expect(getCurrentLocationPageSize({ ...initialState, location })).toBe(20);
-    });
-  });
-
-  describe('getListErrorMessage()', () => {
-    it('returns undefined when not in failed state', () => {
-      const state = {
-        ...initialState,
-        listView: {
-          listResourceState: createListComplexLoadingResourceState(
-            createDefaultPagination(),
-            initialNow
-          ),
-          freshDataTimestamp: initialNow,
-        },
-      };
-
-      expect(getListErrorMessage(state)).toBeUndefined();
-    });
-
-    it('returns message when not in failed state', () => {
-      const state = {
-        ...initialState,
-        listView: {
-          listResourceState: createListFailedResourceState('Internal Server Error'),
-          freshDataTimestamp: initialNow,
-        },
-      };
-
-      expect(getListErrorMessage(state)).toBe('Internal Server Error');
-    });
-  });
-
-  describe('isListLoading()', () => {
-    it('returns false when no loading is happening', () => {
-      expect(isListLoading(initialState)).toBe(false);
-    });
-
-    it('returns true when loading is in progress', () => {
-      const state = {
-        ...initialState,
-        listView: {
-          listResourceState: createListComplexLoadingResourceState(
-            createDefaultPagination(),
-            initialNow
-          ),
-          freshDataTimestamp: initialNow,
-        },
-      };
-
-      expect(isListLoading(state)).toBe(true);
-    });
-  });
-
-  describe('isDeletionDialogOpen()', () => {
-    it('returns false when no entry is set', () => {
-      expect(isDeletionDialogOpen(initialState)).toBe(false);
-    });
-
-    it('returns true when entry is set', () => {
-      const state = {
-        ...initialState,
-        deletionDialog: {
-          ...initialState.deletionDialog,
-          entry: createSampleTrustedApp(5),
-        },
-      };
-
-      expect(isDeletionDialogOpen(state)).toBe(true);
-    });
-  });
-
-  describe('isDeletionInProgress()', () => {
-    it('returns false when resource state is uninitialised', () => {
-      expect(isDeletionInProgress(initialState)).toBe(false);
-    });
-
-    it('returns true when resource state is loading', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'LoadingResourceState',
-        previousState: { type: 'UninitialisedResourceState' },
-      });
-
-      expect(isDeletionInProgress(state)).toBe(true);
-    });
-
-    it('returns false when resource state is loaded', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'LoadedResourceState',
-        data: null,
-      });
-
-      expect(isDeletionInProgress(state)).toBe(false);
-    });
-
-    it('returns false when resource state is failed', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'FailedResourceState',
-        error: createServerApiError('Not Found'),
-      });
-
-      expect(isDeletionInProgress(state)).toBe(false);
-    });
-  });
-
-  describe('isDeletionSuccessful()', () => {
-    it('returns false when resource state is uninitialised', () => {
-      expect(isDeletionSuccessful(initialState)).toBe(false);
-    });
-
-    it('returns false when resource state is loading', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'LoadingResourceState',
-        previousState: { type: 'UninitialisedResourceState' },
-      });
-
-      expect(isDeletionSuccessful(state)).toBe(false);
-    });
-
-    it('returns true when resource state is loaded', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'LoadedResourceState',
-        data: null,
-      });
-
-      expect(isDeletionSuccessful(state)).toBe(true);
-    });
-
-    it('returns false when resource state is failed', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'FailedResourceState',
-        error: createServerApiError('Not Found'),
-      });
-
-      expect(isDeletionSuccessful(state)).toBe(false);
-    });
-  });
-
-  describe('getDeletionError()', () => {
-    it('returns undefined when resource state is uninitialised', () => {
-      expect(getDeletionError(initialState)).toBeUndefined();
-    });
-
-    it('returns undefined when resource state is loading', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'LoadingResourceState',
-        previousState: { type: 'UninitialisedResourceState' },
-      });
-
-      expect(getDeletionError(state)).toBeUndefined();
-    });
-
-    it('returns undefined when resource state is loaded', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'LoadedResourceState',
-        data: null,
-      });
-
-      expect(getDeletionError(state)).toBeUndefined();
-    });
-
-    it('returns error when resource state is failed', () => {
-      const state = createStateWithDeletionSubmissionResourceState({
-        type: 'FailedResourceState',
-        error: createServerApiError('Not Found'),
-      });
-
-      expect(getDeletionError(state)).toStrictEqual(createServerApiError('Not Found'));
-    });
-  });
-
-  describe('getDeletionSubmissionResourceState()', () => {
-    it('returns submission resource state', () => {
-      expect(getDeletionSubmissionResourceState(initialState)).toStrictEqual({
-        type: 'UninitialisedResourceState',
-      });
-    });
-  });
-
-  describe('getDeletionDialogEntry()', () => {
-    it('returns undefined when no entry is set', () => {
-      expect(getDeletionDialogEntry(initialState)).toBeUndefined();
-    });
-
-    it('returns entry when entry is set', () => {
-      const entry = createSampleTrustedApp(5);
-      const state = { ...initialState, deletionDialog: { ...initialState.deletionDialog, entry } };
-
-      expect(getDeletionDialogEntry(state)).toStrictEqual(entry);
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts
deleted file mode 100644
index 743d8b84760ba..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { createSelector } from 'reselect';
-import { ServerApiError } from '../../../../common/types';
-import {
-  Immutable,
-  NewTrustedApp,
-  PolicyData,
-  TrustedApp,
-} from '../../../../../common/endpoint/types';
-import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../../common/constants';
-
-import {
-  AsyncResourceState,
-  getCurrentResourceError,
-  getLastLoadedResourceState,
-  isFailedResourceState,
-  isLoadedResourceState,
-  isLoadingResourceState,
-  isOutdatedResourceState,
-  LoadedResourceState,
-  Pagination,
-  TrustedAppsListData,
-  TrustedAppsListPageLocation,
-  TrustedAppsListPageState,
-} from '../state';
-import { GetPolicyListResponse } from '../../policy/types';
-
-export const needsRefreshOfListData = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  const freshDataTimestamp = state.listView.freshDataTimestamp;
-  const currentPage = state.listView.listResourceState;
-  const location = state.location;
-  const forceRefresh = state.forceRefresh;
-  return (
-    Boolean(state.active) &&
-    (forceRefresh ||
-      isOutdatedResourceState(currentPage, (data) => {
-        return (
-          data.pageIndex === location.page_index &&
-          data.pageSize === location.page_size &&
-          data.timestamp >= freshDataTimestamp
-        );
-      }))
-  );
-};
-
-export const getListResourceState = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<AsyncResourceState<TrustedAppsListData>> | undefined => {
-  return state.listView.listResourceState;
-};
-
-export const getLastLoadedListResourceState = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<LoadedResourceState<TrustedAppsListData>> | undefined => {
-  return getLastLoadedResourceState(state.listView.listResourceState);
-};
-
-export const getListItems = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<TrustedApp[]> => {
-  return getLastLoadedResourceState(state.listView.listResourceState)?.data.items || [];
-};
-
-export const getCurrentLocationPageIndex = (state: Immutable<TrustedAppsListPageState>): number => {
-  return state.location.page_index;
-};
-
-export const getCurrentLocationPageSize = (state: Immutable<TrustedAppsListPageState>): number => {
-  return state.location.page_size;
-};
-
-export const getCurrentLocationFilter = (state: Immutable<TrustedAppsListPageState>): string => {
-  return state.location.filter;
-};
-
-export const getCurrentLocationIncludedPolicies = (
-  state: Immutable<TrustedAppsListPageState>
-): string => {
-  return state.location.included_policies;
-};
-
-export const getListTotalItemsCount = (state: Immutable<TrustedAppsListPageState>): number => {
-  return getLastLoadedResourceState(state.listView.listResourceState)?.data.totalItemsCount || 0;
-};
-
-export const getListPagination = (state: Immutable<TrustedAppsListPageState>): Pagination => {
-  const lastLoadedResourceState = getLastLoadedResourceState(state.listView.listResourceState);
-
-  return {
-    pageIndex: state.location.page_index,
-    pageSize: state.location.page_size,
-    totalItemCount: lastLoadedResourceState?.data.totalItemsCount || 0,
-    pageSizeOptions: [...MANAGEMENT_PAGE_SIZE_OPTIONS],
-  };
-};
-
-export const getCurrentLocation = (
-  state: Immutable<TrustedAppsListPageState>
-): TrustedAppsListPageLocation => state.location;
-
-export const getListErrorMessage = (
-  state: Immutable<TrustedAppsListPageState>
-): string | undefined => {
-  return getCurrentResourceError(state.listView.listResourceState)?.message;
-};
-
-export const isListLoading = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return isLoadingResourceState(state.listView.listResourceState);
-};
-
-export const isDeletionDialogOpen = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return state.deletionDialog.entry !== undefined;
-};
-
-export const isDeletionInProgress = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return isLoadingResourceState(state.deletionDialog.submissionResourceState);
-};
-
-export const isDeletionSuccessful = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return isLoadedResourceState(state.deletionDialog.submissionResourceState);
-};
-
-export const getDeletionError = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<ServerApiError> | undefined => {
-  const submissionResourceState = state.deletionDialog.submissionResourceState;
-
-  return isFailedResourceState(submissionResourceState) ? submissionResourceState.error : undefined;
-};
-
-export const getDeletionSubmissionResourceState = (
-  state: Immutable<TrustedAppsListPageState>
-): AsyncResourceState => {
-  return state.deletionDialog.submissionResourceState;
-};
-
-export const getDeletionDialogEntry = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<TrustedApp> | undefined => {
-  return state.deletionDialog.entry;
-};
-
-export const isCreationDialogLocation = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return !!state.location.show;
-};
-
-export const getCreationSubmissionResourceState = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<AsyncResourceState<TrustedApp>> => {
-  return state.creationDialog.submissionResourceState;
-};
-
-export const getCreationDialogFormEntry = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<NewTrustedApp> | undefined => {
-  return state.creationDialog.formState?.entry;
-};
-
-export const isCreationDialogFormValid = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return state.creationDialog.formState?.isValid || false;
-};
-
-export const isCreationInProgress = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return isLoadingResourceState(state.creationDialog.submissionResourceState);
-};
-
-export const isCreationSuccessful = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return isLoadedResourceState(state.creationDialog.submissionResourceState);
-};
-
-export const getCreationError = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<ServerApiError> | undefined => {
-  const submissionResourceState = state.creationDialog.submissionResourceState;
-
-  return isFailedResourceState(submissionResourceState) ? submissionResourceState.error : undefined;
-};
-
-export const entriesExistState: (
-  state: Immutable<TrustedAppsListPageState>
-) => Immutable<TrustedAppsListPageState['entriesExist']> = (state) => state.entriesExist;
-
-export const checkingIfEntriesExist: (state: Immutable<TrustedAppsListPageState>) => boolean =
-  createSelector(entriesExistState, (doEntriesExists) => {
-    return !isLoadedResourceState(doEntriesExists);
-  });
-
-export const entriesExist: (state: Immutable<TrustedAppsListPageState>) => boolean = createSelector(
-  entriesExistState,
-  (doEntriesExists) => {
-    return isLoadedResourceState(doEntriesExists) && doEntriesExists.data;
-  }
-);
-
-export const prevEntriesExist: (state: Immutable<TrustedAppsListPageState>) => boolean =
-  createSelector(entriesExistState, (doEntriesExists) => {
-    return (
-      isLoadingResourceState(doEntriesExists) && !!getLastLoadedResourceState(doEntriesExists)?.data
-    );
-  });
-
-export const trustedAppsListPageActive: (state: Immutable<TrustedAppsListPageState>) => boolean = (
-  state
-) => state.active;
-
-export const policiesState = (
-  state: Immutable<TrustedAppsListPageState>
-): Immutable<TrustedAppsListPageState['policies']> => state.policies;
-
-export const loadingPolicies: (state: Immutable<TrustedAppsListPageState>) => boolean =
-  createSelector(policiesState, (policies) => isLoadingResourceState(policies));
-
-export const listOfPolicies: (
-  state: Immutable<TrustedAppsListPageState>
-) => Immutable<GetPolicyListResponse['items']> = createSelector(policiesState, (policies) => {
-  return isLoadedResourceState(policies) ? policies.data.items : [];
-});
-
-export const isLoadingListOfPolicies: (state: Immutable<TrustedAppsListPageState>) => boolean =
-  createSelector(policiesState, (policies) => {
-    return isLoadingResourceState(policies);
-  });
-
-export const getMapOfPoliciesById: (
-  state: Immutable<TrustedAppsListPageState>
-) => Immutable<Record<string, Immutable<PolicyData>>> = createSelector(
-  listOfPolicies,
-  (policies) => {
-    return policies.reduce<Record<string, Immutable<PolicyData>>>((mapById, policy) => {
-      mapById[policy.id] = policy;
-      return mapById;
-    }, {}) as Immutable<Record<string, Immutable<PolicyData>>>;
-  }
-);
-
-export const isEdit: (state: Immutable<TrustedAppsListPageState>) => boolean = createSelector(
-  getCurrentLocation,
-  ({ show }) => {
-    return show === 'edit';
-  }
-);
-
-export const editItemId: (state: Immutable<TrustedAppsListPageState>) => string | undefined =
-  createSelector(getCurrentLocation, ({ id }) => {
-    return id;
-  });
-
-export const editItemState: (
-  state: Immutable<TrustedAppsListPageState>
-) => Immutable<TrustedAppsListPageState>['creationDialog']['editItem'] = (state) => {
-  return state.creationDialog.editItem;
-};
-
-export const isFetchingEditTrustedAppItem: (state: Immutable<TrustedAppsListPageState>) => boolean =
-  createSelector(editItemState, (editTrustedAppState) => {
-    return editTrustedAppState ? isLoadingResourceState(editTrustedAppState) : false;
-  });
-
-export const editTrustedAppFetchError: (
-  state: Immutable<TrustedAppsListPageState>
-) => ServerApiError | undefined = createSelector(editItemState, (itemForEditState) => {
-  return itemForEditState && getCurrentResourceError(itemForEditState);
-});
-
-export const editingTrustedApp: (
-  state: Immutable<TrustedAppsListPageState>
-) => undefined | Immutable<TrustedApp> = createSelector(editItemState, (editTrustedAppState) => {
-  if (editTrustedAppState && isLoadedResourceState(editTrustedAppState)) {
-    return editTrustedAppState.data;
-  }
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
deleted file mode 100644
index 32e1867db567c..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { combineReducers, createStore } from 'redux';
-import { OperatingSystem } from '@kbn/securitysolution-utils';
-import { TrustedApp } from '../../../../../common/endpoint/types';
-import { RoutingAction } from '../../../../common/store/routing';
-
-import {
-  MANAGEMENT_DEFAULT_PAGE,
-  MANAGEMENT_DEFAULT_PAGE_SIZE,
-  MANAGEMENT_PAGE_SIZE_OPTIONS,
-  MANAGEMENT_STORE_GLOBAL_NAMESPACE,
-  MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE,
-} from '../../../common/constants';
-
-import {
-  AsyncResourceState,
-  FailedResourceState,
-  LoadedResourceState,
-  LoadingResourceState,
-  Pagination,
-  StaleResourceState,
-  TrustedAppsListData,
-  TrustedAppsListPageState,
-  UninitialisedResourceState,
-} from '../state';
-
-import { trustedAppsPageReducer } from '../store/reducer';
-import { TrustedAppsListResourceStateChanged } from '../store/action';
-
-const OPERATING_SYSTEMS: OperatingSystem[] = [
-  OperatingSystem.WINDOWS,
-  OperatingSystem.MAC,
-  OperatingSystem.LINUX,
-];
-
-const generate = <T>(count: number, generator: (i: number) => T) =>
-  [...new Array(count).keys()].map(generator);
-
-export const createSampleTrustedApp = (i: number, longTexts?: boolean): TrustedApp => {
-  return {
-    id: String(i),
-    version: 'abc123',
-    name: generate(longTexts ? 10 : 1, () => `trusted app ${i}`).join(' '),
-    description: generate(longTexts ? 10 : 1, () => `Trusted App ${i}`).join(' '),
-    created_at: '1 minute ago',
-    created_by: 'someone',
-    updated_at: '1 minute ago',
-    updated_by: 'someone',
-    os: OPERATING_SYSTEMS[i % 3],
-    entries: [],
-    effectScope: { type: 'global' },
-  };
-};
-
-export const createSampleTrustedApps = (
-  pagination: Partial<Pagination>,
-  longTexts?: boolean
-): TrustedApp[] => {
-  const fullPagination = { ...createDefaultPagination(), ...pagination };
-
-  return generate(fullPagination.pageSize, (i: number) => createSampleTrustedApp(i, longTexts));
-};
-
-export const createTrustedAppsListData = (
-  pagination: Partial<Pagination>,
-  timestamp: number,
-  longTexts?: boolean
-) => {
-  const fullPagination = { ...createDefaultPagination(), ...pagination };
-
-  return {
-    items: createSampleTrustedApps(fullPagination, longTexts),
-    pageSize: fullPagination.pageSize,
-    pageIndex: fullPagination.pageIndex,
-    totalItemsCount: fullPagination.totalItemCount,
-    timestamp,
-    filter: '',
-    includedPolicies: '',
-  };
-};
-
-export const createServerApiError = (message: string) => ({
-  statusCode: 500,
-  error: 'Internal Server Error',
-  message,
-});
-
-export const createUninitialisedResourceState = (): UninitialisedResourceState => ({
-  type: 'UninitialisedResourceState',
-});
-
-export const createListLoadedResourceState = (
-  pagination: Partial<Pagination>,
-  timestamp: number,
-  longTexts?: boolean
-): LoadedResourceState<TrustedAppsListData> => ({
-  type: 'LoadedResourceState',
-  data: createTrustedAppsListData(pagination, timestamp, longTexts),
-});
-
-export const createListFailedResourceState = (
-  message: string,
-  lastLoadedState?: LoadedResourceState<TrustedAppsListData>
-): FailedResourceState<TrustedAppsListData> => ({
-  type: 'FailedResourceState',
-  error: createServerApiError(message),
-  lastLoadedState,
-});
-
-export const createListLoadingResourceState = (
-  previousState: StaleResourceState<TrustedAppsListData> = createUninitialisedResourceState()
-): LoadingResourceState<TrustedAppsListData> => ({
-  type: 'LoadingResourceState',
-  previousState,
-});
-
-export const createListComplexLoadingResourceState = (
-  pagination: Partial<Pagination>,
-  timestamp: number
-): LoadingResourceState<TrustedAppsListData> =>
-  createListLoadingResourceState(
-    createListFailedResourceState(
-      'Internal Server Error',
-      createListLoadedResourceState(pagination, timestamp)
-    )
-  );
-
-export const createDefaultPagination = (): Pagination => ({
-  pageIndex: MANAGEMENT_DEFAULT_PAGE,
-  pageSize: MANAGEMENT_DEFAULT_PAGE_SIZE,
-  totalItemCount: 200,
-  pageSizeOptions: [...MANAGEMENT_PAGE_SIZE_OPTIONS],
-});
-
-export const createLoadedListViewWithPagination = (
-  freshDataTimestamp: number,
-  pagination: Partial<Pagination> = createDefaultPagination()
-): TrustedAppsListPageState['listView'] => ({
-  listResourceState: createListLoadedResourceState(pagination, freshDataTimestamp),
-  freshDataTimestamp,
-});
-
-export const createUserChangedUrlAction = (path: string, search: string = ''): RoutingAction => {
-  return { type: 'userChangedUrl', payload: { pathname: path, search, hash: '' } };
-};
-
-export const createTrustedAppsListResourceStateChangedAction = (
-  newState: AsyncResourceState<TrustedAppsListData>
-): TrustedAppsListResourceStateChanged => ({
-  type: 'trustedAppsListResourceStateChanged',
-  payload: { newState },
-});
-
-export const createGlobalNoMiddlewareStore = () => {
-  return createStore(
-    combineReducers({
-      [MANAGEMENT_STORE_GLOBAL_NAMESPACE]: combineReducers({
-        [MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE]: trustedAppsPageReducer,
-      }),
-    })
-  );
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap
deleted file mode 100644
index 070f1b9eabe23..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap
+++ /dev/null
@@ -1,414 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TrustedAppDeletionDialog renders correctly initially 1`] = `
-<body>
-  <div />
-</body>
-`;
-
-exports[`TrustedAppDeletionDialog renders correctly when deletion failed 1`] = `
-<body
-  class="euiBody-hasOverlayMask"
->
-  <div />
-  <div
-    class="euiOverlayMask euiOverlayMask--aboveHeader"
-  >
-    <div
-      data-eui="EuiFocusTrap"
-    >
-      <div
-        class="euiModal euiModal--maxWidth-default"
-        tabindex="0"
-      >
-        <button
-          aria-label="Closes this modal window"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
-          type="button"
-        >
-          <span
-            aria-hidden="true"
-            class="euiButtonIcon__icon"
-            color="inherit"
-            data-euiicon-type="cross"
-          />
-        </button>
-        <div
-          class="euiModal__flex"
-        >
-          <div
-            class="euiModalHeader"
-          >
-            <div
-              class="euiModalHeader__title"
-            >
-              Delete "
-              <b
-                class="eui-textBreakWord"
-              >
-                trusted app 3
-              </b>
-              "
-            </div>
-          </div>
-          <div
-            class="euiModalBody"
-          >
-            <div
-              class="euiModalBody__overflow"
-            >
-              <div
-                class="euiCallOut euiCallOut--danger"
-              >
-                <div
-                  class="euiCallOutHeader"
-                >
-                  <span
-                    aria-hidden="true"
-                    class="euiCallOutHeader__icon"
-                    color="inherit"
-                    data-euiicon-type="alert"
-                  />
-                  <span
-                    class="euiCallOutHeader__title"
-                  >
-                    Warning
-                  </span>
-                </div>
-                <div
-                  class="euiText euiText--small"
-                >
-                  <div
-                    class="euiTextColor euiTextColor--default"
-                  >
-                    <p>
-                      Deleting this entry will remove it from all associated policies.
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-              <div
-                class="euiText euiText--medium"
-              >
-                <p>
-                  This action cannot be undone. Are you sure you wish to continue?
-                </p>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiModalFooter"
-          >
-            <button
-              class="euiButtonEmpty euiButtonEmpty--primary"
-              data-test-subj="trustedAppDeletionCancel"
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButtonEmpty__content"
-              >
-                <span
-                  class="euiButtonEmpty__text"
-                >
-                  Cancel
-                </span>
-              </span>
-            </button>
-            <button
-              class="euiButton euiButton--danger euiButton--fill"
-              data-test-subj="trustedAppDeletionConfirm"
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButton__content"
-              >
-                <span
-                  class="euiButton__text"
-                >
-                  Delete
-                </span>
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</body>
-`;
-
-exports[`TrustedAppDeletionDialog renders correctly when deletion is in progress 1`] = `
-<body
-  class="euiBody-hasOverlayMask"
->
-  <div />
-  <div
-    class="euiOverlayMask euiOverlayMask--aboveHeader"
-  >
-    <div
-      data-eui="EuiFocusTrap"
-    >
-      <div
-        class="euiModal euiModal--maxWidth-default"
-        tabindex="0"
-      >
-        <button
-          aria-label="Closes this modal window"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
-          type="button"
-        >
-          <span
-            aria-hidden="true"
-            class="euiButtonIcon__icon"
-            color="inherit"
-            data-euiicon-type="cross"
-          />
-        </button>
-        <div
-          class="euiModal__flex"
-        >
-          <div
-            class="euiModalHeader"
-          >
-            <div
-              class="euiModalHeader__title"
-            >
-              Delete "
-              <b
-                class="eui-textBreakWord"
-              >
-                trusted app 3
-              </b>
-              "
-            </div>
-          </div>
-          <div
-            class="euiModalBody"
-          >
-            <div
-              class="euiModalBody__overflow"
-            >
-              <div
-                class="euiCallOut euiCallOut--danger"
-              >
-                <div
-                  class="euiCallOutHeader"
-                >
-                  <span
-                    aria-hidden="true"
-                    class="euiCallOutHeader__icon"
-                    color="inherit"
-                    data-euiicon-type="alert"
-                  />
-                  <span
-                    class="euiCallOutHeader__title"
-                  >
-                    Warning
-                  </span>
-                </div>
-                <div
-                  class="euiText euiText--small"
-                >
-                  <div
-                    class="euiTextColor euiTextColor--default"
-                  >
-                    <p>
-                      Deleting this entry will remove it from all associated policies.
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-              <div
-                class="euiText euiText--medium"
-              >
-                <p>
-                  This action cannot be undone. Are you sure you wish to continue?
-                </p>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiModalFooter"
-          >
-            <button
-              class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty-isDisabled"
-              data-test-subj="trustedAppDeletionCancel"
-              disabled=""
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButtonEmpty__content"
-              >
-                <span
-                  class="euiButtonEmpty__text"
-                >
-                  Cancel
-                </span>
-              </span>
-            </button>
-            <button
-              class="euiButton euiButton--danger euiButton--fill euiButton-isDisabled"
-              data-test-subj="trustedAppDeletionConfirm"
-              disabled=""
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButton__content"
-              >
-                <span
-                  class="euiLoadingSpinner euiLoadingSpinner--medium euiButtonContent__spinner"
-                />
-                <span
-                  class="euiButton__text"
-                >
-                  Delete
-                </span>
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</body>
-`;
-
-exports[`TrustedAppDeletionDialog renders correctly when dialog started 1`] = `
-<body
-  class="euiBody-hasOverlayMask"
->
-  <div />
-  <div
-    class="euiOverlayMask euiOverlayMask--aboveHeader"
-  >
-    <div
-      data-eui="EuiFocusTrap"
-    >
-      <div
-        class="euiModal euiModal--maxWidth-default"
-        tabindex="0"
-      >
-        <button
-          aria-label="Closes this modal window"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
-          type="button"
-        >
-          <span
-            aria-hidden="true"
-            class="euiButtonIcon__icon"
-            color="inherit"
-            data-euiicon-type="cross"
-          />
-        </button>
-        <div
-          class="euiModal__flex"
-        >
-          <div
-            class="euiModalHeader"
-          >
-            <div
-              class="euiModalHeader__title"
-            >
-              Delete "
-              <b
-                class="eui-textBreakWord"
-              >
-                trusted app 3
-              </b>
-              "
-            </div>
-          </div>
-          <div
-            class="euiModalBody"
-          >
-            <div
-              class="euiModalBody__overflow"
-            >
-              <div
-                class="euiCallOut euiCallOut--danger"
-              >
-                <div
-                  class="euiCallOutHeader"
-                >
-                  <span
-                    aria-hidden="true"
-                    class="euiCallOutHeader__icon"
-                    color="inherit"
-                    data-euiicon-type="alert"
-                  />
-                  <span
-                    class="euiCallOutHeader__title"
-                  >
-                    Warning
-                  </span>
-                </div>
-                <div
-                  class="euiText euiText--small"
-                >
-                  <div
-                    class="euiTextColor euiTextColor--default"
-                  >
-                    <p>
-                      Deleting this entry will remove it from all associated policies.
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-              <div
-                class="euiText euiText--medium"
-              >
-                <p>
-                  This action cannot be undone. Are you sure you wish to continue?
-                </p>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiModalFooter"
-          >
-            <button
-              class="euiButtonEmpty euiButtonEmpty--primary"
-              data-test-subj="trustedAppDeletionCancel"
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButtonEmpty__content"
-              >
-                <span
-                  class="euiButtonEmpty__text"
-                >
-                  Cancel
-                </span>
-              </span>
-            </button>
-            <button
-              class="euiButton euiButton--danger euiButton--fill"
-              data-test-subj="trustedAppDeletionConfirm"
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButton__content"
-              >
-                <span
-                  class="euiButton__text"
-                >
-                  Delete
-                </span>
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</body>
-`;
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_flyout.tsx
deleted file mode 100644
index f76ac89474e7b..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_flyout.tsx
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiCallOut,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutFooter,
-  EuiFlyoutHeader,
-  EuiLink,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
-import React, { memo, useCallback, useEffect, useState, useMemo } from 'react';
-import { EuiFlyoutProps } from '@elastic/eui/src/components/flyout/flyout';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { useDispatch } from 'react-redux';
-import { useHistory } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
-import _ from 'lodash';
-import { CreateTrustedAppForm, CreateTrustedAppFormProps } from './create_trusted_app_form';
-import {
-  editTrustedAppFetchError,
-  getCreationDialogFormEntry,
-  getCreationError,
-  getCurrentLocation,
-  isCreationDialogFormValid,
-  isCreationInProgress,
-  isCreationSuccessful,
-  isEdit,
-  listOfPolicies,
-  loadingPolicies,
-} from '../../store/selectors';
-import { AppAction } from '../../../../../common/store/actions';
-import { useTrustedAppsSelector } from '../hooks';
-
-import { ABOUT_TRUSTED_APPS } from '../translations';
-import { defaultNewTrustedApp } from '../../store/builders';
-import { getTrustedAppsListPath } from '../../../../common/routing';
-import { useKibana, useToasts } from '../../../../../common/lib/kibana';
-import { useTestIdGenerator } from '../../../../components/hooks/use_test_id_generator';
-import { useLicense } from '../../../../../common/hooks/use_license';
-import { isGlobalEffectScope } from '../../state/type_guards';
-import { NewTrustedApp } from '../../../../../../common/endpoint/types';
-
-export type CreateTrustedAppFlyoutProps = Omit<EuiFlyoutProps, 'hideCloseButton'>;
-export const CreateTrustedAppFlyout = memo<CreateTrustedAppFlyoutProps>(
-  ({ onClose, ...flyoutProps }) => {
-    const dispatch = useDispatch<(action: AppAction) => void>();
-    const history = useHistory();
-    const toasts = useToasts();
-
-    const creationInProgress = useTrustedAppsSelector(isCreationInProgress);
-    const creationErrors = useTrustedAppsSelector(getCreationError);
-    const creationSuccessful = useTrustedAppsSelector(isCreationSuccessful);
-    const isFormValid = useTrustedAppsSelector(isCreationDialogFormValid);
-    const isLoadingPolicies = useTrustedAppsSelector(loadingPolicies);
-    const policyList = useTrustedAppsSelector(listOfPolicies);
-    const isEditMode = useTrustedAppsSelector(isEdit);
-    const trustedAppFetchError = useTrustedAppsSelector(editTrustedAppFetchError);
-    const formValues = useTrustedAppsSelector(getCreationDialogFormEntry) || defaultNewTrustedApp();
-    const location = useTrustedAppsSelector(getCurrentLocation);
-    const isPlatinumPlus = useLicense().isPlatinumPlus();
-    const docLinks = useKibana().services.docLinks;
-    const [isFormDirty, setIsFormDirty] = useState(false);
-
-    const dataTestSubj = flyoutProps['data-test-subj'];
-
-    const policies = useMemo<CreateTrustedAppFormProps['policies']>(() => {
-      return {
-        // Casting is needed due to the use of `Immutable<>` on the return value from the selector above
-        options: policyList as CreateTrustedAppFormProps['policies']['options'],
-        isLoading: isLoadingPolicies,
-      };
-    }, [isLoadingPolicies, policyList]);
-
-    const creationErrorsMessage = useMemo<CreateTrustedAppFormProps['error'] | undefined>(() => {
-      return creationErrors?.message ?? [];
-    }, [creationErrors]);
-
-    const getTestId = useTestIdGenerator(dataTestSubj);
-
-    const handleCancelClick = useCallback(() => {
-      if (creationInProgress) {
-        return;
-      }
-      onClose();
-    }, [onClose, creationInProgress]);
-
-    const handleSaveClick = useCallback(
-      () => dispatch({ type: 'trustedAppCreationDialogConfirmed' }),
-      [dispatch]
-    );
-
-    const handleFormOnChange = useCallback<CreateTrustedAppFormProps['onChange']>(
-      (newFormState) => {
-        dispatch({
-          type: 'trustedAppCreationDialogFormStateUpdated',
-          payload: { entry: newFormState.item, isValid: newFormState.isValid },
-        });
-        if (_.isEqual(formValues, newFormState.item) === false) {
-          setIsFormDirty(true);
-        }
-      },
-
-      [dispatch, formValues]
-    );
-
-    const [wasByPolicy, setWasByPolicy] = useState(!isGlobalEffectScope(formValues.effectScope));
-    // set initial state of `wasByPolicy` that checks if the initial state of the exception was by policy or not
-    useEffect(() => {
-      if (!isFormDirty && formValues.effectScope) {
-        setWasByPolicy(!isGlobalEffectScope(formValues.effectScope));
-      }
-    }, [isFormDirty, formValues.effectScope]);
-
-    const isGlobal = useMemo(() => {
-      return isGlobalEffectScope((formValues as NewTrustedApp).effectScope);
-    }, [formValues]);
-
-    const showExpiredLicenseBanner = useMemo(() => {
-      return !isPlatinumPlus && isEditMode && wasByPolicy && (!isGlobal || isFormDirty);
-    }, [isPlatinumPlus, isEditMode, isGlobal, isFormDirty, wasByPolicy]);
-
-    // If there was a failure trying to retrieve the Trusted App for edit item,
-    // then redirect back to the list ++ show toast message.
-    useEffect(() => {
-      if (trustedAppFetchError) {
-        // Replace the current URL route so that user does not keep hitting this page via browser back/fwd buttons
-        history.replace(
-          getTrustedAppsListPath({
-            ...location,
-            show: undefined,
-            id: undefined,
-          })
-        );
-
-        toasts.addWarning(
-          i18n.translate(
-            'xpack.securitySolution.trustedapps.createTrustedAppFlyout.notFoundToastMessage',
-            {
-              defaultMessage: 'Unable to edit trusted application ({apiMsg})',
-              values: {
-                apiMsg: trustedAppFetchError.message,
-              },
-            }
-          )
-        );
-      }
-    }, [history, location, toasts, trustedAppFetchError]);
-
-    // If it was created, then close flyout
-    useEffect(() => {
-      if (creationSuccessful) {
-        onClose();
-      }
-    }, [onClose, creationSuccessful]);
-
-    return (
-      <EuiFlyout onClose={handleCancelClick} {...flyoutProps} hideCloseButton={creationInProgress}>
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle size="m">
-            <h2 data-test-subj={getTestId('headerTitle')}>
-              {isEditMode ? (
-                <FormattedMessage
-                  id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.editTitle"
-                  defaultMessage="Edit trusted application"
-                />
-              ) : (
-                <FormattedMessage
-                  id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.createTitle"
-                  defaultMessage="Add trusted application"
-                />
-              )}
-            </h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        {showExpiredLicenseBanner && (
-          <EuiCallOut
-            title={i18n.translate(
-              'xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseTitle',
-              { defaultMessage: 'Expired License' }
-            )}
-            color="warning"
-            iconType="help"
-            data-test-subj={getTestId('expired-license-callout')}
-          >
-            <FormattedMessage
-              id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseMessage"
-              defaultMessage="Your Kibana license has been downgraded. Future policy configurations will now be globally assigned to all policies. For more information, see our "
-            />
-            <EuiLink target="_blank" href={`${docLinks.links.securitySolution.trustedApps}`}>
-              <FormattedMessage
-                id="xpack.securitySolution.trustedapps.docsLink"
-                defaultMessage="Trusted applications documentation."
-              />
-            </EuiLink>
-          </EuiCallOut>
-        )}
-        <EuiFlyoutBody>
-          <EuiText size="xs">
-            <h3>
-              {i18n.translate('xpack.securitySolution.trustedApps.detailsSectionTitle', {
-                defaultMessage: 'Details',
-              })}
-            </h3>
-          </EuiText>
-          <EuiSpacer size="xs" />
-          {!isEditMode && (
-            <>
-              <EuiText size="s">
-                <p data-test-subj={getTestId('about')}>{ABOUT_TRUSTED_APPS}</p>
-              </EuiText>
-              <EuiSpacer size="m" />
-            </>
-          )}
-          <CreateTrustedAppForm
-            fullWidth
-            onChange={handleFormOnChange}
-            isInvalid={!!creationErrors}
-            isEditMode={isEditMode}
-            isDirty={isFormDirty}
-            wasByPolicy={wasByPolicy}
-            error={creationErrorsMessage}
-            policies={policies}
-            trustedApp={formValues}
-            data-test-subj={getTestId('createForm')}
-          />
-        </EuiFlyoutBody>
-
-        <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                onClick={handleCancelClick}
-                flush="left"
-                isDisabled={creationInProgress}
-                data-test-subj={getTestId('cancelButton')}
-              >
-                <FormattedMessage
-                  id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.cancelButton"
-                  defaultMessage="Cancel"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                onClick={handleSaveClick}
-                fill
-                isDisabled={!isFormValid || creationInProgress}
-                isLoading={creationInProgress}
-                data-test-subj={getTestId('createButton')}
-              >
-                {isEditMode ? (
-                  <FormattedMessage
-                    id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.editSaveButton"
-                    defaultMessage="Save"
-                  />
-                ) : (
-                  <FormattedMessage
-                    id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.createSaveButton"
-                    defaultMessage="Add trusted application"
-                  />
-                )}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    );
-  }
-);
-
-CreateTrustedAppFlyout.displayName = 'NewTrustedAppFlyout';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
deleted file mode 100644
index 8e7246962b5ee..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { ChangeEventHandler, memo, useCallback, useEffect, useMemo, useState } from 'react';
-import {
-  EuiFieldText,
-  EuiForm,
-  EuiFormRow,
-  EuiHorizontalRule,
-  EuiSuperSelect,
-  EuiSuperSelectOption,
-  EuiTextArea,
-  EuiText,
-  EuiSpacer,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import {
-  hasSimpleExecutableName,
-  isPathValid,
-  ConditionEntryField,
-  OperatingSystem,
-} from '@kbn/securitysolution-utils';
-import { EuiFormProps } from '@elastic/eui/src/components/form/form';
-
-import {
-  TrustedAppConditionEntry,
-  EffectScope,
-  MacosLinuxConditionEntry,
-  MaybeImmutable,
-  NewTrustedApp,
-} from '../../../../../../common/endpoint/types';
-import {
-  isValidHash,
-  getDuplicateFields,
-} from '../../../../../../common/endpoint/service/trusted_apps/validations';
-
-import {
-  isGlobalEffectScope,
-  isMacosLinuxTrustedAppCondition,
-  isPolicyEffectScope,
-  isWindowsTrustedAppCondition,
-} from '../../state/type_guards';
-import { defaultConditionEntry } from '../../store/builders';
-import { CONDITION_FIELD_TITLE, OS_TITLES } from '../translations';
-import { LogicalConditionBuilder, LogicalConditionBuilderProps } from './logical_condition';
-import { useTestIdGenerator } from '../../../../components/hooks/use_test_id_generator';
-import { useLicense } from '../../../../../common/hooks/use_license';
-import {
-  EffectedPolicySelect,
-  EffectedPolicySelection,
-  EffectedPolicySelectProps,
-} from '../../../../components/effected_policy_select';
-
-const OPERATING_SYSTEMS: readonly OperatingSystem[] = [
-  OperatingSystem.MAC,
-  OperatingSystem.WINDOWS,
-  OperatingSystem.LINUX,
-];
-
-interface FieldValidationState {
-  /** If this fields state is invalid. Drives display of errors on the UI */
-  isInvalid: boolean;
-  errors: React.ReactNode[];
-  warnings: React.ReactNode[];
-}
-interface ValidationResult {
-  /** Overall indicator if form is valid */
-  isValid: boolean;
-
-  /** Individual form field validations */
-  result: Partial<{
-    [key in keyof NewTrustedApp]: FieldValidationState;
-  }>;
-}
-
-const addResultToValidation = (
-  validation: ValidationResult,
-  field: keyof NewTrustedApp,
-  type: 'warnings' | 'errors',
-  resultValue: React.ReactNode
-) => {
-  if (!validation.result[field]) {
-    validation.result[field] = {
-      isInvalid: false,
-      errors: [],
-      warnings: [],
-    };
-  }
-  const errorMarkup: React.ReactNode = type === 'warnings' ? <div>{resultValue}</div> : resultValue;
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  validation.result[field]![type].push(errorMarkup);
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  validation.result[field]!.isInvalid = true;
-};
-
-const validateFormValues = (values: MaybeImmutable<NewTrustedApp>): ValidationResult => {
-  let isValid: ValidationResult['isValid'] = true;
-  const validation: ValidationResult = {
-    isValid,
-    result: {},
-  };
-
-  // Name field
-  if (!values.name.trim()) {
-    isValid = false;
-    addResultToValidation(
-      validation,
-      'name',
-      'errors',
-      i18n.translate('xpack.securitySolution.trustedapps.create.nameRequiredMsg', {
-        defaultMessage: 'Name is required',
-      })
-    );
-  }
-
-  if (!values.os) {
-    isValid = false;
-    addResultToValidation(
-      validation,
-      'os',
-      'errors',
-      i18n.translate('xpack.securitySolution.trustedapps.create.osRequiredMsg', {
-        defaultMessage: 'Operating System is required',
-      })
-    );
-  }
-
-  if (!values.entries.length) {
-    isValid = false;
-    addResultToValidation(
-      validation,
-      'entries',
-      'errors',
-      i18n.translate('xpack.securitySolution.trustedapps.create.conditionRequiredMsg', {
-        defaultMessage: 'At least one Field definition is required',
-      })
-    );
-  } else {
-    const duplicated = getDuplicateFields(values.entries as TrustedAppConditionEntry[]);
-    if (duplicated.length) {
-      isValid = false;
-      duplicated.forEach((field) => {
-        addResultToValidation(
-          validation,
-          'entries',
-          'errors',
-          i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldDuplicatedMsg', {
-            defaultMessage: '{field} cannot be added more than once',
-            values: { field: CONDITION_FIELD_TITLE[field] },
-          })
-        );
-      });
-    }
-    values.entries.forEach((entry, index) => {
-      const isValidPathEntry = isPathValid({
-        os: values.os,
-        field: entry.field,
-        type: entry.type,
-        value: entry.value,
-      });
-
-      if (!entry.field || !entry.value.trim()) {
-        isValid = false;
-        addResultToValidation(
-          validation,
-          'entries',
-          'errors',
-          i18n.translate(
-            'xpack.securitySolution.trustedapps.create.conditionFieldValueRequiredMsg',
-            {
-              defaultMessage: '[{row}] Field entry must have a value',
-              values: { row: index + 1 },
-            }
-          )
-        );
-      } else if (entry.field === ConditionEntryField.HASH && !isValidHash(entry.value)) {
-        isValid = false;
-        addResultToValidation(
-          validation,
-          'entries',
-          'errors',
-          i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldInvalidHashMsg', {
-            defaultMessage: '[{row}] Invalid hash value',
-            values: { row: index + 1 },
-          })
-        );
-      } else if (!isValidPathEntry) {
-        addResultToValidation(
-          validation,
-          'entries',
-          'warnings',
-          i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldInvalidPathMsg', {
-            defaultMessage: '[{row}] Path may be formed incorrectly; verify value',
-            values: { row: index + 1 },
-          })
-        );
-      } else if (
-        isValidPathEntry &&
-        !hasSimpleExecutableName({ os: values.os, value: entry.value, type: entry.type })
-      ) {
-        addResultToValidation(
-          validation,
-          'entries',
-          'warnings',
-          i18n.translate(
-            'xpack.securitySolution.trustedapps.create.conditionFieldDegradedPerformanceMsg',
-            {
-              defaultMessage: `[{row}] A wildcard in the filename will affect the endpoint's performance`,
-              values: { row: index + 1 },
-            }
-          )
-        );
-      }
-    });
-  }
-
-  validation.isValid = isValid;
-  return validation;
-};
-
-export interface TrustedAppFormState {
-  isValid: boolean;
-  item: NewTrustedApp;
-}
-
-export type CreateTrustedAppFormProps = Pick<
-  EuiFormProps,
-  'className' | 'data-test-subj' | 'isInvalid' | 'error' | 'invalidCallout'
-> & {
-  /** The trusted app values that will be passed to the form */
-  trustedApp: MaybeImmutable<NewTrustedApp>;
-  isEditMode: boolean;
-  isDirty: boolean;
-  wasByPolicy: boolean;
-  onChange: (state: TrustedAppFormState) => void;
-  /** Setting passed on to the EffectedPolicySelect component */
-  policies: Pick<EffectedPolicySelectProps, 'options' | 'isLoading'>;
-  /** if form should be shown full width of parent container */
-  fullWidth?: boolean;
-};
-export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
-  ({
-    fullWidth,
-    isEditMode,
-    isDirty,
-    wasByPolicy,
-    onChange,
-    trustedApp: _trustedApp,
-    policies = { options: [] },
-    ...formProps
-  }) => {
-    const trustedApp = _trustedApp as NewTrustedApp;
-
-    const dataTestSubj = formProps['data-test-subj'];
-
-    const isPlatinumPlus = useLicense().isPlatinumPlus();
-
-    const isGlobal = useMemo(() => {
-      return isGlobalEffectScope(trustedApp.effectScope);
-    }, [trustedApp]);
-
-    const showAssignmentSection = useMemo(() => {
-      return isPlatinumPlus || (isEditMode && (!isGlobal || (wasByPolicy && isGlobal && isDirty)));
-    }, [isEditMode, isGlobal, isDirty, isPlatinumPlus, wasByPolicy]);
-
-    const osOptions: Array<EuiSuperSelectOption<OperatingSystem>> = useMemo(
-      () => OPERATING_SYSTEMS.map((os) => ({ value: os, inputDisplay: OS_TITLES[os] })),
-      []
-    );
-
-    // We create local state for the list of policies because we want the selected policies to
-    // persist while the user is on the form and possibly toggling between global/non-global
-    const [selectedPolicies, setSelectedPolicies] = useState<EffectedPolicySelection>({
-      isGlobal,
-      selected: [],
-    });
-
-    const [validationResult, setValidationResult] = useState<ValidationResult>(() =>
-      validateFormValues(trustedApp)
-    );
-
-    const [wasVisited, setWasVisited] = useState<
-      Partial<{
-        [key in keyof NewTrustedApp]: boolean;
-      }>
-    >({});
-
-    const getTestId = useTestIdGenerator(dataTestSubj);
-
-    const notifyOfChange = useCallback(
-      (updatedFormValues: TrustedAppFormState['item']) => {
-        const updatedValidationResult = validateFormValues(updatedFormValues);
-
-        setValidationResult(updatedValidationResult);
-
-        onChange({
-          item: updatedFormValues,
-          isValid: updatedValidationResult.isValid,
-        });
-      },
-      [onChange]
-    );
-
-    const handleAndClick = useCallback(() => {
-      if (trustedApp.os === OperatingSystem.WINDOWS) {
-        notifyOfChange({
-          ...trustedApp,
-          entries: [...trustedApp.entries, defaultConditionEntry()].filter(
-            isWindowsTrustedAppCondition
-          ),
-        });
-      } else {
-        notifyOfChange({
-          ...trustedApp,
-          entries: [
-            ...trustedApp.entries.filter(isMacosLinuxTrustedAppCondition),
-            defaultConditionEntry(),
-          ],
-        });
-      }
-    }, [notifyOfChange, trustedApp]);
-
-    const handleDomChangeEvents = useCallback<
-      ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement>
-    >(
-      ({ target: { name, value } }) => {
-        notifyOfChange({
-          ...trustedApp,
-          [name]: value,
-        });
-      },
-      [notifyOfChange, trustedApp]
-    );
-
-    // Handles keeping track if an input form field has been visited
-    const handleDomBlurEvents = useCallback<ChangeEventHandler<HTMLInputElement>>(
-      ({ target: { name } }) => {
-        setWasVisited((prevState) => {
-          return {
-            ...prevState,
-            [name]: true,
-          };
-        });
-      },
-      []
-    );
-
-    const handleOsChange = useCallback<(v: OperatingSystem) => void>(
-      (newOsValue) => {
-        setWasVisited((prevState) => {
-          return {
-            ...prevState,
-            os: true,
-          };
-        });
-
-        const updatedState: NewTrustedApp = {
-          ...trustedApp,
-          entries: [],
-          os: newOsValue,
-        };
-        if (updatedState.os !== OperatingSystem.WINDOWS) {
-          updatedState.entries.push(
-            ...(trustedApp.entries.filter((entry) =>
-              isMacosLinuxTrustedAppCondition(entry)
-            ) as MacosLinuxConditionEntry[])
-          );
-          if (updatedState.entries.length === 0) {
-            updatedState.entries.push(defaultConditionEntry());
-          }
-        } else {
-          updatedState.entries.push(...trustedApp.entries);
-        }
-
-        notifyOfChange(updatedState);
-      },
-      [notifyOfChange, trustedApp]
-    );
-
-    const handleEntryRemove = useCallback(
-      (entry: NewTrustedApp['entries'][0]) => {
-        notifyOfChange({
-          ...trustedApp,
-          entries: trustedApp.entries.filter((item) => item !== entry),
-        } as NewTrustedApp);
-      },
-      [notifyOfChange, trustedApp]
-    );
-
-    const handleEntryChange = useCallback<LogicalConditionBuilderProps['onEntryChange']>(
-      (newEntry, oldEntry) => {
-        if (trustedApp.os === OperatingSystem.WINDOWS) {
-          notifyOfChange({
-            ...trustedApp,
-            entries: trustedApp.entries.map((item) => {
-              if (item === oldEntry) {
-                return newEntry;
-              }
-              return item;
-            }),
-          } as NewTrustedApp);
-        } else {
-          notifyOfChange({
-            ...trustedApp,
-            entries: trustedApp.entries.map((item) => {
-              if (item === oldEntry) {
-                return newEntry;
-              }
-              return item;
-            }),
-          } as NewTrustedApp);
-        }
-      },
-      [notifyOfChange, trustedApp]
-    );
-
-    const handleConditionBuilderOnVisited: LogicalConditionBuilderProps['onVisited'] =
-      useCallback(() => {
-        setWasVisited((prevState) => {
-          return {
-            ...prevState,
-            entries: true,
-          };
-        });
-      }, []);
-
-    const handlePolicySelectChange: EffectedPolicySelectProps['onChange'] = useCallback(
-      (selection) => {
-        setSelectedPolicies(() => selection);
-
-        let newEffectedScope: EffectScope;
-
-        if (selection.isGlobal) {
-          newEffectedScope = {
-            type: 'global',
-          };
-        } else {
-          newEffectedScope = {
-            type: 'policy',
-            policies: selection.selected.map((policy) => policy.id),
-          };
-        }
-
-        notifyOfChange({
-          ...trustedApp,
-          effectScope: newEffectedScope,
-        });
-      },
-      [notifyOfChange, trustedApp]
-    );
-
-    // Anytime the form values change, re-validate
-    useEffect(() => {
-      setValidationResult((prevState) => {
-        const newResults = validateFormValues(trustedApp);
-
-        // Only notify if the overall validation result is different
-        if (newResults.isValid !== prevState.isValid) {
-          notifyOfChange(trustedApp);
-        }
-
-        return newResults;
-      });
-    }, [notifyOfChange, trustedApp]);
-
-    // Anytime the TrustedApp has an effective scope of `policies`, then ensure that
-    // those polices are selected in the UI while at the same time preserving prior
-    // selections (UX requirement)
-    useEffect(() => {
-      setSelectedPolicies((currentSelection) => {
-        if (isPolicyEffectScope(trustedApp.effectScope) && policies.options.length > 0) {
-          const missingSelectedPolicies: EffectedPolicySelectProps['selected'] = [];
-
-          for (const policyId of trustedApp.effectScope.policies) {
-            if (
-              !currentSelection.selected.find(
-                (currentlySelectedPolicyItem) => currentlySelectedPolicyItem.id === policyId
-              )
-            ) {
-              const newSelectedPolicy = policies.options.find((policy) => policy.id === policyId);
-              if (newSelectedPolicy) {
-                missingSelectedPolicies.push(newSelectedPolicy);
-              }
-            }
-          }
-
-          if (missingSelectedPolicies.length) {
-            return {
-              ...currentSelection,
-              selected: [...currentSelection.selected, ...missingSelectedPolicies],
-            };
-          }
-        }
-
-        return currentSelection;
-      });
-    }, [policies.options, trustedApp.effectScope]);
-
-    return (
-      <EuiForm {...formProps} component="div">
-        <EuiFormRow
-          label={i18n.translate('xpack.securitySolution.trustedapps.create.name', {
-            defaultMessage: 'Name your trusted application',
-          })}
-          fullWidth={fullWidth}
-          data-test-subj={getTestId('nameRow')}
-          isInvalid={wasVisited?.name && validationResult.result.name?.isInvalid}
-          error={validationResult.result.name?.errors}
-        >
-          <EuiFieldText
-            name="name"
-            value={trustedApp.name}
-            onChange={handleDomChangeEvents}
-            onBlur={handleDomBlurEvents}
-            fullWidth
-            required={wasVisited?.name}
-            maxLength={256}
-            data-test-subj={getTestId('nameTextField')}
-          />
-        </EuiFormRow>
-        <EuiFormRow
-          label={i18n.translate('xpack.securitySolution.trustedapps.create.description', {
-            defaultMessage: 'Description',
-          })}
-          fullWidth={fullWidth}
-          data-test-subj={getTestId('descriptionRow')}
-        >
-          <EuiTextArea
-            name="description"
-            value={trustedApp.description}
-            onChange={handleDomChangeEvents}
-            fullWidth
-            compressed
-            maxLength={256}
-            data-test-subj={getTestId('descriptionField')}
-          />
-        </EuiFormRow>
-        <EuiHorizontalRule />
-        <EuiText size="xs">
-          <h3>
-            {i18n.translate('xpack.securitySolution.trustedApps.conditionsSectionTitle', {
-              defaultMessage: 'Conditions',
-            })}
-          </h3>
-        </EuiText>
-        <EuiSpacer size="xs" />
-        <EuiText size="s">
-          <p>
-            {i18n.translate('xpack.securitySolution.trustedApps.conditionsSectionDescription', {
-              defaultMessage:
-                'Select an operating system and add conditions. Availability of conditions may depend on your chosen OS.',
-            })}
-          </p>
-        </EuiText>
-        <EuiSpacer size="m" />
-        <EuiFormRow
-          label={i18n.translate('xpack.securitySolution.trustedapps.create.os', {
-            defaultMessage: 'Select operating system',
-          })}
-          fullWidth={fullWidth}
-          data-test-subj={getTestId('OsRow')}
-          isInvalid={wasVisited?.os && validationResult.result.os?.isInvalid}
-          error={validationResult.result.os?.errors}
-        >
-          <EuiSuperSelect
-            name="os"
-            options={osOptions}
-            valueOfSelected={trustedApp.os}
-            onChange={handleOsChange}
-            fullWidth
-            data-test-subj={getTestId('osSelectField')}
-          />
-        </EuiFormRow>
-        <EuiFormRow
-          fullWidth={fullWidth}
-          data-test-subj={getTestId('conditionsRow')}
-          isInvalid={wasVisited?.entries && validationResult.result.entries?.isInvalid}
-          error={validationResult.result.entries?.errors}
-          helpText={validationResult.result.entries?.warnings}
-        >
-          <LogicalConditionBuilder
-            entries={trustedApp.entries}
-            os={trustedApp.os}
-            onAndClicked={handleAndClick}
-            onEntryRemove={handleEntryRemove}
-            onEntryChange={handleEntryChange}
-            onVisited={handleConditionBuilderOnVisited}
-            data-test-subj={getTestId('conditionsBuilder')}
-          />
-        </EuiFormRow>
-        {showAssignmentSection ? (
-          <>
-            <EuiHorizontalRule />
-            <EuiFormRow fullWidth={fullWidth} data-test-subj={getTestId('policySelection')}>
-              <EffectedPolicySelect
-                isGlobal={isGlobal}
-                isPlatinumPlus={isPlatinumPlus}
-                selected={selectedPolicies.selected}
-                options={policies.options}
-                onChange={handlePolicySelectChange}
-                isLoading={policies?.isLoading}
-                description={i18n.translate(
-                  'xpack.securitySolution.trustedApps.assignmentSectionDescription',
-                  {
-                    defaultMessage:
-                      'Assign this trusted application globally across all policies, or assign it to specific policies.',
-                  }
-                )}
-                data-test-subj={getTestId('effectedPolicies')}
-              />
-            </EuiFormRow>
-          </>
-        ) : null}
-      </EuiForm>
-    );
-  }
-);
-
-CreateTrustedAppForm.displayName = 'NewTrustedAppForm';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/form.test.tsx
similarity index 52%
rename from x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
rename to x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/form.test.tsx
index 68dd43fa41152..dca86557f6309 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/form.test.tsx
@@ -6,25 +6,30 @@
  */
 
 import React from 'react';
-import * as reactTestingLibrary from '@testing-library/react';
-import { fireEvent, getByTestId } from '@testing-library/dom';
+import { screen, cleanup, act, fireEvent, getByTestId } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  TrustedAppEntryTypes,
+  OperatingSystem,
+  ConditionEntryField,
+} from '@kbn/securitysolution-utils';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
-import { NewTrustedApp } from '../../../../../../common/endpoint/types';
+import { TrustedAppsForm } from './form';
+import {
+  ArtifactFormComponentOnChangeCallbackProps,
+  ArtifactFormComponentProps,
+} from '../../../../components/artifact_list_page';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
 } from '../../../../../common/mock/endpoint';
-
-import { CreateTrustedAppForm, CreateTrustedAppFormProps } from './create_trusted_app_form';
-import { defaultNewTrustedApp } from '../../store/builders';
-import { EndpointDocGenerator } from '../../../../../../common/endpoint/generate_data';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
+import { INPUT_ERRORS } from '../translations';
 import { licenseService } from '../../../../../common/hooks/use_license';
 import { forceHTMLElementOffsetWidth } from '../../../../components/effected_policy_select/test_utils';
+import type { PolicyData, TrustedAppConditionEntry } from '../../../../../../common/endpoint/types';
 
-jest.mock('../../../../../common/hooks/use_experimental_features');
-const useIsExperimentalFeatureEnabledMock = useIsExperimentalFeatureEnabled as jest.Mock;
+import { EndpointDocGenerator } from '../../../../../../common/endpoint/generate_data';
 
 jest.mock('../../../../../common/hooks/use_license', () => {
   const licenseServiceInstance = {
@@ -38,55 +43,108 @@ jest.mock('../../../../../common/hooks/use_license', () => {
   };
 });
 
-describe('When using the Trusted App Form', () => {
-  const dataTestSubjForForm = 'createForm';
+describe('Trusted apps form', () => {
+  const formPrefix = 'trustedApps-form';
   const generator = new EndpointDocGenerator('effected-policy-select');
-
   let resetHTMLElementOffsetWidth: ReturnType<typeof forceHTMLElementOffsetWidth>;
 
+  let formProps: jest.Mocked<ArtifactFormComponentProps>;
   let mockedContext: AppContextTestRender;
-  let formProps: jest.Mocked<CreateTrustedAppFormProps>;
   let renderResult: ReturnType<AppContextTestRender['render']>;
+  let latestUpdatedItem: ArtifactFormComponentProps['item'];
 
-  // As the form's `onChange()` callback is executed, this variable will
-  // hold the latest updated trusted app. Use it to re-render
-  let latestUpdatedTrustedApp: NewTrustedApp;
-
-  const getUI = () => <CreateTrustedAppForm {...formProps} />;
+  const getUI = () => <TrustedAppsForm {...formProps} />;
   const render = () => {
     return (renderResult = mockedContext.render(getUI()));
   };
   const rerender = () => renderResult.rerender(getUI());
-  const rerenderWithLatestTrustedApp = () => {
-    formProps.trustedApp = latestUpdatedTrustedApp;
+  const rerenderWithLatestProps = () => {
+    formProps.item = latestUpdatedItem;
     rerender();
   };
 
+  function createEntry<T extends ConditionEntryField = ConditionEntryField>(
+    field: T,
+    type: TrustedAppEntryTypes,
+    value: string
+  ): TrustedAppConditionEntry {
+    return {
+      field,
+      type,
+      operator: 'included',
+      value,
+    };
+  }
+
+  function createItem(
+    overrides: Partial<ArtifactFormComponentProps['item']> = {}
+  ): ArtifactFormComponentProps['item'] {
+    const defaults: ArtifactFormComponentProps['item'] = {
+      list_id: ENDPOINT_TRUSTED_APPS_LIST_ID,
+      name: '',
+      description: '',
+      os_types: [OperatingSystem.WINDOWS],
+      entries: [createEntry(ConditionEntryField.HASH, 'match', '')],
+      type: 'simple',
+      tags: ['policy:all'],
+    };
+    return {
+      ...defaults,
+      ...overrides,
+    };
+  }
+
+  function createOnChangeArgs(
+    overrides: Partial<ArtifactFormComponentOnChangeCallbackProps>
+  ): ArtifactFormComponentOnChangeCallbackProps {
+    const defaults = {
+      item: createItem(),
+      isValid: false,
+    };
+    return {
+      ...defaults,
+      ...overrides,
+    };
+  }
+
+  function createPolicies(): PolicyData[] {
+    const policies = [
+      generator.generatePolicyPackagePolicy(),
+      generator.generatePolicyPackagePolicy(),
+    ];
+    policies.map((p, i) => {
+      p.id = `id-${i}`;
+      p.name = `some-policy-${Math.random().toString(36).split('.').pop()}`;
+      return p;
+    });
+    return policies;
+  }
+
   // Some helpers
   const setTextFieldValue = (textField: HTMLInputElement | HTMLTextAreaElement, value: string) => {
-    reactTestingLibrary.act(() => {
+    act(() => {
       fireEvent.change(textField, {
         target: { value },
       });
       fireEvent.blur(textField);
     });
   };
-  const getNameField = (dataTestSub: string = dataTestSubjForForm): HTMLInputElement => {
+  const getDetailsBlurb = (dataTestSub: string = formPrefix): HTMLInputElement => {
+    return renderResult.queryByTestId(`${dataTestSub}-about`) as HTMLInputElement;
+  };
+  const getNameField = (dataTestSub: string = formPrefix): HTMLInputElement => {
     return renderResult.getByTestId(`${dataTestSub}-nameTextField`) as HTMLInputElement;
   };
-  const getOsField = (dataTestSub: string = dataTestSubjForForm): HTMLButtonElement => {
+  const getOsField = (dataTestSub: string = formPrefix): HTMLButtonElement => {
     return renderResult.getByTestId(`${dataTestSub}-osSelectField`) as HTMLButtonElement;
   };
-  const getDescriptionField = (dataTestSub: string = dataTestSubjForForm): HTMLTextAreaElement => {
+  const getDescriptionField = (dataTestSub: string = formPrefix): HTMLTextAreaElement => {
     return renderResult.getByTestId(`${dataTestSub}-descriptionField`) as HTMLTextAreaElement;
   };
-  const getCondition = (
-    index: number = 0,
-    dataTestSub: string = dataTestSubjForForm
-  ): HTMLElement => {
+  const getCondition = (index: number = 0, dataTestSub: string = formPrefix): HTMLElement => {
     return renderResult.getByTestId(`${dataTestSub}-conditionsBuilder-group1-entry${index}`);
   };
-  const getAllConditions = (dataTestSub: string = dataTestSubjForForm): HTMLElement[] => {
+  const getAllConditions = (dataTestSub: string = formPrefix): HTMLElement[] => {
     return Array.from(
       renderResult.getByTestId(`${dataTestSub}-conditionsBuilder-group1-entries`).children
     ) as HTMLElement[];
@@ -97,19 +155,16 @@ describe('When using the Trusted App Form', () => {
   const getConditionFieldSelect = (condition: HTMLElement): HTMLButtonElement => {
     return getByTestId(condition, `${condition.dataset.testSubj}-field`) as HTMLButtonElement;
   };
+
   const getConditionValue = (condition: HTMLElement): HTMLInputElement => {
     return getByTestId(condition, `${condition.dataset.testSubj}-value`) as HTMLInputElement;
   };
-  const getConditionBuilderAndButton = (
-    dataTestSub: string = dataTestSubjForForm
-  ): HTMLButtonElement => {
+  const getConditionBuilderAndButton = (dataTestSub: string = formPrefix): HTMLButtonElement => {
     return renderResult.getByTestId(
       `${dataTestSub}-conditionsBuilder-group1-AndButton`
     ) as HTMLButtonElement;
   };
-  const getConditionBuilderAndConnectorBadge = (
-    dataTestSub: string = dataTestSubjForForm
-  ): HTMLElement => {
+  const getConditionBuilderAndConnectorBadge = (dataTestSub: string = formPrefix): HTMLElement => {
     return renderResult.getByTestId(`${dataTestSub}-conditionsBuilder-group1-andConnector`);
   };
   const getAllValidationErrors = (): HTMLElement[] => {
@@ -121,42 +176,44 @@ describe('When using the Trusted App Form', () => {
 
   beforeEach(() => {
     resetHTMLElementOffsetWidth = forceHTMLElementOffsetWidth();
-    useIsExperimentalFeatureEnabledMock.mockReturnValue(true);
     (licenseService.isPlatinumPlus as jest.Mock).mockReturnValue(true);
-
     mockedContext = createAppRootMockRenderer();
-
-    latestUpdatedTrustedApp = defaultNewTrustedApp();
+    latestUpdatedItem = createItem();
 
     formProps = {
-      'data-test-subj': dataTestSubjForForm,
-      trustedApp: latestUpdatedTrustedApp,
-      isEditMode: false,
-      isDirty: false,
-      wasByPolicy: false,
+      item: latestUpdatedItem,
+      mode: 'create',
+      disabled: false,
+      error: undefined,
+      policiesIsLoading: false,
       onChange: jest.fn((updates) => {
-        latestUpdatedTrustedApp = updates.item;
+        latestUpdatedItem = updates.item;
       }),
-      policies: {
-        options: [],
-      },
+      policies: [],
     };
   });
 
   afterEach(() => {
     resetHTMLElementOffsetWidth();
-    reactTestingLibrary.cleanup();
+    cleanup();
   });
 
-  describe('and the form is rendered', () => {
+  describe('Details and Conditions', () => {
     beforeEach(() => render());
 
-    it('should show Name as required after blur', () => {
-      expect(getNameField().required).toBe(false);
-      reactTestingLibrary.act(() => {
-        fireEvent.blur(getNameField());
-      });
-      expect(getNameField().required).toBe(true);
+    it('should NOT initially show any inline validation errors', () => {
+      expect(renderResult.container.querySelectorAll('.euiFormErrorText').length).toBe(0);
+    });
+
+    it('should hide details text when in edit mode', () => {
+      formProps.mode = 'edit';
+      rerenderWithLatestProps();
+      expect(getDetailsBlurb()).toBeNull();
+    });
+
+    it('should show name required name blur', () => {
+      setTextFieldValue(getNameField(), '  ');
+      expect(renderResult.getByText(INPUT_ERRORS.name)).toBeTruthy();
     });
 
     it('should default OS to Windows', () => {
@@ -165,42 +222,68 @@ describe('When using the Trusted App Form', () => {
 
     it('should allow user to select between 3 OSs', () => {
       const osField = getOsField();
-      reactTestingLibrary.act(() => {
-        fireEvent.click(osField, { button: 1 });
-      });
+      userEvent.click(osField, { button: 1 });
       const options = Array.from(
         renderResult.baseElement.querySelectorAll(
           '.euiSuperSelect__listbox button.euiSuperSelect__item'
         )
       ).map((button) => button.textContent);
-      expect(options).toEqual(['Mac', 'Windows', 'Linux']);
+      expect(options).toEqual(['Linux', 'Mac', 'Windows']);
     });
 
     it('should show Description as optional', () => {
       expect(getDescriptionField().required).toBe(false);
     });
 
-    it('should NOT initially show any inline validation errors', () => {
-      expect(renderResult.container.querySelectorAll('.euiFormErrorText').length).toBe(0);
+    it('should be invalid if no name', () => {
+      const emptyName = '  ';
+      setTextFieldValue(getNameField(), emptyName);
+      const expected = createOnChangeArgs({
+        item: createItem({
+          name: emptyName,
+        }),
+      });
+      expect(formProps.onChange).toHaveBeenCalledWith(expected);
     });
 
-    it('should show top-level Errors', () => {
-      formProps.isInvalid = true;
-      formProps.error = 'a top level error';
-      rerender();
-      expect(renderResult.queryByText(formProps.error as string)).not.toBeNull();
+    it('should correctly edit name', () => {
+      setTextFieldValue(getNameField(), 'z');
+      const expected = createOnChangeArgs({
+        item: createItem({
+          name: 'z',
+        }),
+      });
+      expect(formProps.onChange).toHaveBeenCalledWith(expected);
+    });
+
+    it('should correctly edit description', () => {
+      setTextFieldValue(getDescriptionField(), 'describe ta');
+      const expected = createOnChangeArgs({
+        item: createItem({ description: 'describe ta' }),
+      });
+      expect(formProps.onChange).toHaveBeenCalledWith(expected);
+    });
+
+    it('should correctly change OS', () => {
+      userEvent.click(getOsField());
+      userEvent.click(screen.getByRole('option', { name: 'Linux' }));
+      const expected = createOnChangeArgs({
+        item: createItem({ os_types: [OperatingSystem.LINUX] }),
+      });
+      expect(formProps.onChange).toHaveBeenCalledWith(expected);
     });
   });
 
-  describe('the condition builder component', () => {
+  describe('ConditionBuilder', () => {
     beforeEach(() => render());
 
-    it('should show an initial condition entry with labels', () => {
+    it('should default to hash entry field', () => {
       const defaultCondition = getCondition();
       const labels = Array.from(defaultCondition.querySelectorAll('.euiFormRow__labelWrapper')).map(
         (label) => (label.textContent || '').trim()
       );
       expect(labels).toEqual(['Field', 'Operator', 'Value', '']);
+      expect(formProps.onChange).not.toHaveBeenCalled();
     });
 
     it('should not allow the entry to be removed if its the only one displayed', () => {
@@ -210,9 +293,7 @@ describe('When using the Trusted App Form', () => {
 
     it('should display 3 options for Field for Windows', () => {
       const conditionFieldSelect = getConditionFieldSelect(getCondition());
-      reactTestingLibrary.act(() => {
-        fireEvent.click(conditionFieldSelect, { button: 1 });
-      });
+      userEvent.click(conditionFieldSelect, { button: 1 });
       const options = Array.from(
         renderResult.baseElement.querySelectorAll(
           '.euiSuperSelect__listbox button.euiSuperSelect__item'
@@ -228,12 +309,37 @@ describe('When using the Trusted App Form', () => {
 
     it('should show the value field as required after blur', () => {
       expect(getConditionValue(getCondition()).required).toEqual(false);
-      reactTestingLibrary.act(() => {
+      act(() => {
         fireEvent.blur(getConditionValue(getCondition()));
       });
       expect(getConditionValue(getCondition()).required).toEqual(true);
     });
 
+    it('should show path malformed warning', () => {
+      render();
+      expect(screen.queryByText(INPUT_ERRORS.pathWarning(0))).toBeNull();
+
+      const propsItem: Partial<ArtifactFormComponentProps['item']> = {
+        entries: [createEntry(ConditionEntryField.PATH, 'match', 'malformed-path')],
+      };
+      formProps.item = { ...formProps.item, ...propsItem };
+      render();
+      expect(screen.getByText(INPUT_ERRORS.pathWarning(0))).not.toBeNull();
+    });
+
+    it('should show wildcard in path warning', () => {
+      render();
+      expect(screen.queryByText(INPUT_ERRORS.wildcardPathWarning(0))).toBeNull();
+
+      const propsItem: Partial<ArtifactFormComponentProps['item']> = {
+        os_types: [OperatingSystem.LINUX],
+        entries: [createEntry(ConditionEntryField.PATH, 'wildcard', '/sys/wil*/*.app')],
+      };
+      formProps.item = { ...formProps.item, ...propsItem };
+      render();
+      expect(screen.getByText(INPUT_ERRORS.wildcardPathWarning(0))).not.toBeNull();
+    });
+
     it('should display the `AND` button', () => {
       const andButton = getConditionBuilderAndButton();
       expect(andButton.textContent).toEqual('AND');
@@ -243,11 +349,9 @@ describe('When using the Trusted App Form', () => {
     describe('and when the AND button is clicked', () => {
       beforeEach(() => {
         const andButton = getConditionBuilderAndButton();
-        reactTestingLibrary.act(() => {
-          fireEvent.click(andButton, { button: 1 });
-        });
+        userEvent.click(andButton, { button: 1 });
         // re-render with updated `newTrustedApp`
-        formProps.trustedApp = formProps.onChange.mock.calls[0][0].item;
+        formProps.item = formProps.onChange.mock.calls[0][0].item;
         rerender();
       });
 
@@ -270,127 +374,105 @@ describe('When using the Trusted App Form', () => {
 
   describe('the Policy Selection area', () => {
     beforeEach(() => {
-      const policy = generator.generatePolicyPackagePolicy();
-      policy.name = 'test policy A';
-      policy.id = '123';
-
-      formProps.policies.options = [policy];
+      formProps.policies = createPolicies();
     });
 
     it('should have `global` switch on if effective scope is global and policy options hidden', () => {
       render();
       const globalButton = renderResult.getByTestId(
-        `${dataTestSubjForForm}-effectedPolicies-global`
+        `${formPrefix}-effectedPolicies-global`
       ) as HTMLButtonElement;
 
       expect(globalButton.classList.contains('euiButtonGroupButton-isSelected')).toEqual(true);
-      expect(renderResult.queryByTestId('policy-123')).toBeNull();
+      expect(
+        renderResult.queryByTestId(`${formPrefix}-effectedPolicies-policiesSelectable`)
+      ).toBeNull();
+      expect(renderResult.queryByTestId('policy-id-0')).toBeNull();
     });
 
     it('should have policy options visible and specific policies checked if scope is per-policy', () => {
-      (formProps.trustedApp as NewTrustedApp).effectScope = {
-        type: 'policy',
-        policies: ['123'],
-      };
+      formProps.item.tags = [formProps.policies.map((p) => `policy:${p.id}`)[0]];
       render();
+
       const perPolicyButton = renderResult.getByTestId(
-        `${dataTestSubjForForm}-effectedPolicies-perPolicy`
+        `${formPrefix}-effectedPolicies-perPolicy`
       ) as HTMLButtonElement;
 
       expect(perPolicyButton.classList.contains('euiButtonGroupButton-isSelected')).toEqual(true);
-      expect(renderResult.getByTestId('policy-123').getAttribute('aria-disabled')).toEqual('false');
-      expect(renderResult.getByTestId('policy-123').getAttribute('aria-checked')).toEqual('true');
+      expect(renderResult.getByTestId('policy-id-0').getAttribute('aria-disabled')).toEqual(
+        'false'
+      );
+      expect(renderResult.getByTestId('policy-id-0-checkbox')).toBeChecked();
     });
+
     it('should show loader when setting `policies.isLoading` to true and scope is per-policy', () => {
-      formProps.policies.isLoading = true;
-      (formProps.trustedApp as NewTrustedApp).effectScope = {
-        type: 'policy',
-        policies: ['123'],
-      };
+      formProps.policiesIsLoading = true;
+      formProps.item.tags = [formProps.policies.map((p) => `policy:${p.id}`)[0]];
       render();
       expect(renderResult.queryByTestId('loading-spinner')).not.toBeNull();
     });
   });
 
-  describe('the Policy Selection area under feature flag', () => {
-    it("shouldn't display the policiy selection area ", () => {
-      useIsExperimentalFeatureEnabledMock.mockReturnValue(false);
-      render();
-      expect(
-        renderResult.queryByText('Apply trusted application globally')
-      ).not.toBeInTheDocument();
-    });
-  });
-
   describe('the Policy Selection area when the license downgrades to gold or below', () => {
     beforeEach(() => {
-      // select per policy for trusted app
-      const policy = generator.generatePolicyPackagePolicy();
-      policy.name = 'test policy A';
-      policy.id = '123';
-
-      formProps.policies.options = [policy];
-
-      (formProps.trustedApp as NewTrustedApp).effectScope = {
-        type: 'policy',
-        policies: ['123'],
-      };
-
-      formProps.isEditMode = true;
-
+      const policies = createPolicies();
+      formProps.policies = policies;
+      formProps.item.tags = [policies.map((p) => `policy:${p.id}`)[0]];
+      formProps.mode = 'edit';
       // downgrade license
       (licenseService.isPlatinumPlus as jest.Mock).mockReturnValue(false);
+      render();
     });
 
     it('maintains policy configuration but does not allow the user to edit add/remove individual policies in edit mode', () => {
-      render();
       const perPolicyButton = renderResult.getByTestId(
-        `${dataTestSubjForForm}-effectedPolicies-perPolicy`
+        `${formPrefix}-effectedPolicies-perPolicy`
       ) as HTMLButtonElement;
-
       expect(perPolicyButton.classList.contains('euiButtonGroupButton-isSelected')).toEqual(true);
-      expect(renderResult.getByTestId('policy-123').getAttribute('aria-disabled')).toEqual('true');
-      expect(renderResult.getByTestId('policy-123-checkbox')).toBeChecked();
+      expect(renderResult.getByTestId('policy-id-0').getAttribute('aria-disabled')).toEqual('true');
+      expect(renderResult.getByTestId('policy-id-0-checkbox')).toBeChecked();
     });
     it("allows the user to set the trusted app entry to 'Global' in the edit option", () => {
-      render();
       const globalButtonInput = renderResult.getByTestId('globalPolicy') as HTMLButtonElement;
-
-      reactTestingLibrary.act(() => {
+      act(() => {
         fireEvent.click(globalButtonInput);
       });
 
-      expect(formProps.onChange.mock.calls[0][0].item.effectScope.type).toBe('global');
+      const policyItem = formProps.onChange.mock.calls[0][0].item.tags
+        ? formProps.onChange.mock.calls[0][0].item.tags[0]
+        : '';
+      expect(policyItem).toBe('policy:all');
     });
+
     it('hides the policy assignment section if the TA is set to global', () => {
-      (formProps.trustedApp as NewTrustedApp).effectScope = {
-        type: 'global',
-      };
-      expect(renderResult.queryByTestId(`${dataTestSubjForForm}-effectedPolicies`)).toBeNull();
+      formProps.item.tags = ['policy:all'];
+      rerender();
+      expect(renderResult.queryByTestId(`${formPrefix}-effectedPolicies`)).toBeNull();
     });
     it('hides the policy assignment section if the user is adding a new TA', () => {
-      formProps.isEditMode = false;
-      expect(renderResult.queryByTestId(`${dataTestSubjForForm}-effectedPolicies`)).toBeNull();
+      formProps.mode = 'create';
+      rerender();
+      expect(renderResult.queryByTestId(`${formPrefix}-effectedPolicies`)).toBeNull();
     });
   });
 
   describe('and the user visits required fields but does not fill them out', () => {
     beforeEach(() => {
       render();
-      reactTestingLibrary.act(() => {
+      act(() => {
         fireEvent.blur(getNameField());
       });
-      reactTestingLibrary.act(() => {
+      act(() => {
         fireEvent.blur(getConditionValue(getCondition()));
       });
     });
 
     it('should show Name validation error', () => {
-      expect(renderResult.getByText('Name is required'));
+      expect(renderResult.getByText(INPUT_ERRORS.name)).not.toBeNull();
     });
 
     it('should show Condition validation error', () => {
-      expect(renderResult.getByText('[1] Field entry must have a value'));
+      expect(renderResult.getByText(INPUT_ERRORS.mustHaveValue(0)));
     });
 
     it('should NOT display any other errors', () => {
@@ -403,129 +485,107 @@ describe('When using the Trusted App Form', () => {
 
     it('should validate that Name has a non empty space value', () => {
       setTextFieldValue(getNameField(), '  ');
-      expect(renderResult.getByText('Name is required'));
+      expect(renderResult.getByText(INPUT_ERRORS.name));
     });
 
     it('should validate invalid Hash value', () => {
       setTextFieldValue(getConditionValue(getCondition()), 'someHASH');
-      expect(renderResult.getByText('[1] Invalid hash value'));
+      expect(renderResult.getByText(INPUT_ERRORS.invalidHash(0)));
     });
 
     it('should validate that a condition value has a non empty space value', () => {
       setTextFieldValue(getConditionValue(getCondition()), '  ');
-      expect(renderResult.getByText('[1] Field entry must have a value'));
+      expect(renderResult.getByText(INPUT_ERRORS.mustHaveValue(0)));
     });
 
     it('should validate all condition values (when multiples exist) have non empty space value', () => {
       const andButton = getConditionBuilderAndButton();
-      reactTestingLibrary.act(() => {
-        fireEvent.click(andButton, { button: 1 });
-      });
-      rerenderWithLatestTrustedApp();
+      userEvent.click(andButton, { button: 1 });
+      rerenderWithLatestProps();
 
       setTextFieldValue(getConditionValue(getCondition()), 'someHASH');
-      rerenderWithLatestTrustedApp();
+      rerenderWithLatestProps();
 
-      expect(renderResult.getByText('[2] Field entry must have a value'));
+      expect(renderResult.getByText(INPUT_ERRORS.mustHaveValue(1)));
     });
 
     it('should validate duplicated conditions', () => {
       const andButton = getConditionBuilderAndButton();
-      reactTestingLibrary.act(() => {
-        fireEvent.click(andButton, { button: 1 });
-      });
+      userEvent.click(andButton, { button: 1 });
 
       setTextFieldValue(getConditionValue(getCondition()), '');
-      rerenderWithLatestTrustedApp();
+      rerenderWithLatestProps();
 
-      expect(renderResult.getByText('Hash cannot be added more than once'));
+      expect(renderResult.getByText(INPUT_ERRORS.noDuplicateField(ConditionEntryField.HASH)));
     });
 
     it('should validate multiple errors in form', () => {
       const andButton = getConditionBuilderAndButton();
 
-      reactTestingLibrary.act(() => {
-        fireEvent.click(andButton, { button: 1 });
-      });
-      rerenderWithLatestTrustedApp();
+      userEvent.click(andButton, { button: 1 });
+      rerenderWithLatestProps();
 
       setTextFieldValue(getConditionValue(getCondition()), 'someHASH');
-      rerenderWithLatestTrustedApp();
-      expect(renderResult.getByText('[1] Invalid hash value'));
-      expect(renderResult.getByText('[2] Field entry must have a value'));
+      rerenderWithLatestProps();
+      expect(renderResult.getByText(INPUT_ERRORS.invalidHash(0)));
+      expect(renderResult.getByText(INPUT_ERRORS.mustHaveValue(1)));
     });
   });
 
   describe('and all required data passes validation', () => {
     it('should call change callback with isValid set to true and contain the new item', () => {
+      const propsItem: Partial<ArtifactFormComponentProps['item']> = {
+        os_types: [OperatingSystem.LINUX],
+        name: 'Some process',
+        description: 'some description',
+        entries: [
+          createEntry(ConditionEntryField.HASH, 'match', 'e50fb1a0e5fff590ece385082edc6c41'),
+        ],
+      };
+      formProps.item = { ...formProps.item, ...propsItem };
       render();
-
-      setTextFieldValue(getNameField(), 'Some Process');
-      rerenderWithLatestTrustedApp();
-
-      setTextFieldValue(getConditionValue(getCondition()), 'e50fb1a0e5fff590ece385082edc6c41');
-      rerenderWithLatestTrustedApp();
-
-      setTextFieldValue(getDescriptionField(), 'some description');
-      rerenderWithLatestTrustedApp();
+      act(() => {
+        fireEvent.blur(getNameField());
+      });
 
       expect(getAllValidationErrors()).toHaveLength(0);
-      expect(formProps.onChange).toHaveBeenLastCalledWith({
+      const expected = createOnChangeArgs({
         isValid: true,
-        item: {
-          name: 'Some Process',
-          description: 'some description',
-          os: OperatingSystem.WINDOWS,
-          effectScope: { type: 'global' },
-          entries: [
-            {
-              field: ConditionEntryField.HASH,
-              operator: 'included',
-              type: 'match',
-              value: 'e50fb1a0e5fff590ece385082edc6c41',
-            },
-          ],
-        },
+        item: createItem(propsItem),
       });
+      expect(formProps.onChange).toHaveBeenCalledWith(expected);
     });
 
     it('should not validate form to true if name input is empty', () => {
-      const props = {
+      const propsItem: Partial<ArtifactFormComponentProps['item']> = {
         name: 'some name',
-        description: '',
-        effectScope: {
-          type: 'global',
-        },
-        os: OperatingSystem.WINDOWS,
-        entries: [
-          { field: ConditionEntryField.PATH, operator: 'included', type: 'wildcard', value: 'x' },
-        ],
-      } as NewTrustedApp;
-
-      formProps.trustedApp = props;
+        os_types: [OperatingSystem.LINUX],
+        entries: [createEntry(ConditionEntryField.PATH, 'wildcard', '/sys/usr*/doc.app')],
+      };
+      formProps.item = { ...formProps.item, ...propsItem };
       render();
+      expect(getAllValidationErrors()).toHaveLength(0);
+      expect(getAllValidationWarnings()).toHaveLength(0);
 
-      formProps.trustedApp = {
-        ...props,
-        name: '',
-      };
+      formProps.item.name = '';
       rerender();
-
-      expect(getAllValidationErrors()).toHaveLength(0);
-      expect(getAllValidationWarnings()).toHaveLength(1);
+      act(() => {
+        fireEvent.blur(getNameField());
+      });
+      expect(getAllValidationErrors()).toHaveLength(1);
+      expect(getAllValidationWarnings()).toHaveLength(0);
       expect(formProps.onChange).toHaveBeenLastCalledWith({
         isValid: false,
         item: {
+          ...formProps.item,
           name: '',
-          description: '',
-          os: OperatingSystem.WINDOWS,
-          effectScope: { type: 'global' },
+          os_types: [OperatingSystem.LINUX],
           entries: [
             {
               field: ConditionEntryField.PATH,
               operator: 'included',
               type: 'wildcard',
-              value: 'x',
+              value: '/sys/usr*/doc.app',
             },
           ],
         },
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/form.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/form.tsx
new file mode 100644
index 0000000000000..9656b5821b756
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/form.tsx
@@ -0,0 +1,519 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { ChangeEventHandler, memo, useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  EuiFieldText,
+  EuiForm,
+  EuiFormRow,
+  EuiHorizontalRule,
+  EuiSuperSelect,
+  EuiSuperSelectOption,
+  EuiTextArea,
+  EuiText,
+  EuiTitle,
+  EuiSpacer,
+} from '@elastic/eui';
+import {
+  hasSimpleExecutableName,
+  isPathValid,
+  ConditionEntryField,
+  OperatingSystem,
+  AllConditionEntryFields,
+  EntryTypes,
+} from '@kbn/securitysolution-utils';
+import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+
+import { TrustedAppConditionEntry, NewTrustedApp } from '../../../../../../common/endpoint/types';
+import {
+  isValidHash,
+  getDuplicateFields,
+} from '../../../../../../common/endpoint/service/artifacts/validations';
+
+import {
+  isArtifactGlobal,
+  getPolicyIdsFromArtifact,
+} from '../../../../../../common/endpoint/service/artifacts';
+import {
+  isMacosLinuxTrustedAppCondition,
+  isWindowsTrustedAppCondition,
+} from '../../state/type_guards';
+
+import {
+  CONDITIONS_HEADER,
+  CONDITIONS_HEADER_DESCRIPTION,
+  DETAILS_HEADER,
+  DETAILS_HEADER_DESCRIPTION,
+  DESCRIPTION_LABEL,
+  INPUT_ERRORS,
+  NAME_LABEL,
+  POLICY_SELECT_DESCRIPTION,
+  SELECT_OS_LABEL,
+} from '../translations';
+import { OS_TITLES } from '../../../../common/translations';
+import { LogicalConditionBuilder, LogicalConditionBuilderProps } from './logical_condition';
+import { useTestIdGenerator } from '../../../../components/hooks/use_test_id_generator';
+import { useLicense } from '../../../../../common/hooks/use_license';
+import {
+  EffectedPolicySelect,
+  EffectedPolicySelection,
+} from '../../../../components/effected_policy_select';
+import {
+  GLOBAL_ARTIFACT_TAG,
+  BY_POLICY_ARTIFACT_TAG_PREFIX,
+} from '../../../../../../common/endpoint/service/artifacts/constants';
+import type { PolicyData } from '../../../../../../common/endpoint/types';
+import { ArtifactFormComponentProps } from '../../../../components/artifact_list_page';
+import { isGlobalPolicyEffected } from '../../../../components/effected_policy_select/utils';
+
+interface FieldValidationState {
+  /** If this fields state is invalid. Drives display of errors on the UI */
+  isInvalid: boolean;
+  errors: React.ReactNode[];
+  warnings: React.ReactNode[];
+}
+interface ValidationResult {
+  /** Overall indicator if form is valid */
+  isValid: boolean;
+
+  /** Individual form field validations */
+  result: Partial<{
+    [key in keyof NewTrustedApp]: FieldValidationState;
+  }>;
+}
+
+const addResultToValidation = (
+  validation: ValidationResult,
+  field: keyof NewTrustedApp,
+  type: 'warnings' | 'errors',
+  resultValue: React.ReactNode
+) => {
+  if (!validation.result[field]) {
+    validation.result[field] = {
+      isInvalid: false,
+      errors: [],
+      warnings: [],
+    };
+  }
+  const errorMarkup: React.ReactNode = type === 'warnings' ? <div>{resultValue}</div> : resultValue;
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  validation.result[field]![type].push(errorMarkup);
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  validation.result[field]!.isInvalid = true;
+};
+
+const validateValues = (values: ArtifactFormComponentProps['item']): ValidationResult => {
+  let isValid: ValidationResult['isValid'] = true;
+  const validation: ValidationResult = {
+    isValid,
+    result: {},
+  };
+
+  // Name field
+  if (!values.name.trim()) {
+    isValid = false;
+    addResultToValidation(validation, 'name', 'errors', INPUT_ERRORS.name);
+  }
+
+  if (!values.os_types) {
+    isValid = false;
+    addResultToValidation(validation, 'os', 'errors', INPUT_ERRORS.os);
+  }
+
+  const os = ((values.os_types ?? [])[0] as OperatingSystem) ?? OperatingSystem.WINDOWS;
+  if (!values.entries.length) {
+    isValid = false;
+    addResultToValidation(validation, 'entries', 'errors', INPUT_ERRORS.field);
+  } else {
+    const duplicated = getDuplicateFields(values.entries as TrustedAppConditionEntry[]);
+    if (duplicated.length) {
+      isValid = false;
+      duplicated.forEach((field: ConditionEntryField) => {
+        addResultToValidation(
+          validation,
+          'entries',
+          'errors',
+          INPUT_ERRORS.noDuplicateField(field)
+        );
+      });
+    }
+    values.entries.forEach((entry, index) => {
+      const isValidPathEntry = isPathValid({
+        os,
+        field: entry.field as AllConditionEntryFields,
+        type: entry.type as EntryTypes,
+        value: (entry as TrustedAppConditionEntry).value,
+      });
+
+      if (!entry.field || !(entry as TrustedAppConditionEntry).value.trim()) {
+        isValid = false;
+        addResultToValidation(validation, 'entries', 'errors', INPUT_ERRORS.mustHaveValue(index));
+      } else if (
+        entry.field === ConditionEntryField.HASH &&
+        !isValidHash((entry as TrustedAppConditionEntry).value)
+      ) {
+        isValid = false;
+        addResultToValidation(validation, 'entries', 'errors', INPUT_ERRORS.invalidHash(index));
+      } else if (!isValidPathEntry) {
+        addResultToValidation(validation, 'entries', 'warnings', INPUT_ERRORS.pathWarning(index));
+      } else if (
+        isValidPathEntry &&
+        !hasSimpleExecutableName({
+          os,
+          value: (entry as TrustedAppConditionEntry).value,
+          type: entry.type as EntryTypes,
+        })
+      ) {
+        addResultToValidation(
+          validation,
+          'entries',
+          'warnings',
+          INPUT_ERRORS.wildcardPathWarning(index)
+        );
+      }
+    });
+  }
+
+  validation.isValid = isValid;
+  return validation;
+};
+
+const defaultConditionEntry = (): TrustedAppConditionEntry<ConditionEntryField.HASH> => ({
+  field: ConditionEntryField.HASH,
+  operator: 'included',
+  type: 'match',
+  value: '',
+});
+
+export const TrustedAppsForm = memo<ArtifactFormComponentProps>(
+  ({ item, policies, policiesIsLoading, onChange, mode }) => {
+    const getTestId = useTestIdGenerator('trustedApps-form');
+    const [visited, setVisited] = useState<
+      Partial<{
+        [key in keyof NewTrustedApp]: boolean;
+      }>
+    >({});
+
+    const [selectedPolicies, setSelectedPolicies] = useState<PolicyData[]>([]);
+    const isPlatinumPlus = useLicense().isPlatinumPlus();
+    const isGlobal = useMemo(() => isArtifactGlobal(item as ExceptionListItemSchema), [item]);
+    const [wasByPolicy, setWasByPolicy] = useState(!isGlobalPolicyEffected(item.tags));
+    const [hasFormChanged, setHasFormChanged] = useState(false);
+
+    useEffect(() => {
+      if (!hasFormChanged && item.tags) {
+        setWasByPolicy(!isGlobalPolicyEffected(item.tags));
+      }
+    }, [item.tags, hasFormChanged]);
+
+    // select policies if editing
+    useEffect(() => {
+      if (hasFormChanged) {
+        return;
+      }
+      const policyIds = item.tags ? getPolicyIdsFromArtifact({ tags: item.tags }) : [];
+      if (!policyIds.length) {
+        return;
+      }
+      const policiesData = policies.filter((policy) => policyIds.includes(policy.id));
+
+      setSelectedPolicies(policiesData);
+    }, [hasFormChanged, item, policies]);
+
+    const showAssignmentSection = useMemo(() => {
+      return (
+        isPlatinumPlus ||
+        (mode === 'edit' && (!isGlobal || (wasByPolicy && isGlobal && hasFormChanged)))
+      );
+    }, [mode, isGlobal, hasFormChanged, isPlatinumPlus, wasByPolicy]);
+
+    const [validationResult, setValidationResult] = useState<ValidationResult>(() =>
+      validateValues(item)
+    );
+
+    const processChanged = useCallback(
+      (updatedFormValues: ArtifactFormComponentProps['item']) => {
+        const updatedValidationResult = validateValues(updatedFormValues);
+        setValidationResult(updatedValidationResult);
+        onChange({
+          item: updatedFormValues,
+          isValid: updatedValidationResult.isValid,
+        });
+      },
+      [onChange]
+    );
+
+    const handleOnPolicyChange = useCallback(
+      (change: EffectedPolicySelection) => {
+        const tags = change.isGlobal
+          ? [GLOBAL_ARTIFACT_TAG]
+          : change.selected.map((policy) => `${BY_POLICY_ARTIFACT_TAG_PREFIX}${policy.id}`);
+
+        const nextItem = { ...item, tags };
+        // Preserve old selected policies when switching to global
+        if (!change.isGlobal) {
+          setSelectedPolicies(change.selected);
+        }
+        processChanged(nextItem);
+        setHasFormChanged(true);
+      },
+      [item, processChanged]
+    );
+
+    const handleOnNameOrDescriptionChange = useCallback<
+      ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement>
+    >(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        const nextItem = {
+          ...item,
+          [event.target.name]: event.target.value,
+        };
+
+        processChanged(nextItem);
+        setHasFormChanged(true);
+      },
+      [item, processChanged]
+    );
+
+    const handleOnNameBlur = useCallback(
+      ({ target: { name } }) => {
+        processChanged(item);
+        setVisited((prevVisited) => ({ ...prevVisited, [name]: true }));
+      },
+      [item, processChanged]
+    );
+
+    const osOptions: Array<EuiSuperSelectOption<OperatingSystem>> = useMemo(
+      () =>
+        [OperatingSystem.LINUX, OperatingSystem.MAC, OperatingSystem.WINDOWS].map((os) => ({
+          value: os,
+          inputDisplay: OS_TITLES[os],
+        })),
+      []
+    );
+
+    const handleOnOsChange = useCallback(
+      (os: OperatingSystem) => {
+        setVisited((prevVisited) => {
+          return {
+            ...prevVisited,
+            os: true,
+          };
+        });
+
+        const nextItem: ArtifactFormComponentProps['item'] = {
+          ...item,
+          os_types: [os],
+          entries: [] as ArtifactFormComponentProps['item']['entries'],
+        };
+
+        if (os !== OperatingSystem.WINDOWS) {
+          const macOsLinuxConditionEntry = item.entries.filter((entry) =>
+            isMacosLinuxTrustedAppCondition(entry as TrustedAppConditionEntry)
+          );
+          nextItem.entries.push(...macOsLinuxConditionEntry);
+          if (item.entries.length === 0) {
+            nextItem.entries.push(defaultConditionEntry());
+          }
+        } else {
+          nextItem.entries.push(...item.entries);
+        }
+
+        processChanged(nextItem);
+        setHasFormChanged(true);
+      },
+      [item, processChanged]
+    );
+
+    const handleConditionBuilderOnVisited: LogicalConditionBuilderProps['onVisited'] =
+      useCallback(() => {
+        setVisited((prevState) => {
+          return {
+            ...prevState,
+            entries: true,
+          };
+        });
+      }, []);
+
+    const handleEntryChange = useCallback<LogicalConditionBuilderProps['onEntryChange']>(
+      (newEntry, oldEntry) => {
+        const nextItem: ArtifactFormComponentProps['item'] = {
+          ...item,
+          entries: item.entries.map((e) => {
+            if (e === oldEntry) {
+              return newEntry;
+            }
+            return e;
+          }),
+        };
+
+        processChanged(nextItem);
+        setHasFormChanged(true);
+      },
+      [item, processChanged]
+    );
+
+    const handleEntryRemove = useCallback(
+      (entry: NewTrustedApp['entries'][0]) => {
+        const nextItem: ArtifactFormComponentProps['item'] = {
+          ...item,
+          entries: item.entries.filter((e) => e !== entry),
+        };
+
+        processChanged(nextItem);
+        setHasFormChanged(true);
+      },
+      [item, processChanged]
+    );
+
+    const handleAndClick = useCallback(() => {
+      const nextItem: ArtifactFormComponentProps['item'] = {
+        ...item,
+        entries: [],
+      };
+      const os = ((item.os_types ?? [])[0] as OperatingSystem) ?? OperatingSystem.WINDOWS;
+      if (os === OperatingSystem.WINDOWS) {
+        nextItem.entries = [...item.entries, defaultConditionEntry()].filter((entry) =>
+          isWindowsTrustedAppCondition(entry as TrustedAppConditionEntry)
+        );
+      } else {
+        nextItem.entries = [
+          ...item.entries.filter((entry) =>
+            isMacosLinuxTrustedAppCondition(entry as TrustedAppConditionEntry)
+          ),
+          defaultConditionEntry(),
+        ];
+      }
+      processChanged(nextItem);
+      setHasFormChanged(true);
+    }, [item, processChanged]);
+
+    const selectedOs = useMemo((): OperatingSystem => {
+      if (!item?.os_types?.length) {
+        return OperatingSystem.WINDOWS;
+      }
+      return item.os_types[0] as OperatingSystem;
+    }, [item?.os_types]);
+
+    const trustedApp = useMemo<ArtifactFormComponentProps['item']>(() => {
+      const ta = item;
+
+      ta.entries = item.entries.length
+        ? (item.entries as TrustedAppConditionEntry[])
+        : [defaultConditionEntry()];
+
+      return ta;
+    }, [item]);
+
+    return (
+      <EuiForm component="div" data-test-subj={getTestId('')}>
+        <EuiTitle size="xs">
+          <h3>{DETAILS_HEADER}</h3>
+        </EuiTitle>
+        <EuiSpacer size="xs" />
+        {mode === 'create' && (
+          <EuiText size="s" data-test-subj={getTestId('about')}>
+            <p>{DETAILS_HEADER_DESCRIPTION}</p>
+          </EuiText>
+        )}
+        <EuiSpacer size="m" />
+        <EuiFormRow
+          label={NAME_LABEL}
+          fullWidth
+          data-test-subj={getTestId('nameRow')}
+          isInvalid={visited.name && validationResult.result.name?.isInvalid}
+          error={validationResult.result.name?.errors}
+        >
+          <EuiFieldText
+            name="name"
+            value={item.name}
+            onChange={handleOnNameOrDescriptionChange}
+            onBlur={handleOnNameBlur}
+            fullWidth
+            required={visited.name}
+            maxLength={256}
+            data-test-subj={getTestId('nameTextField')}
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={DESCRIPTION_LABEL}
+          fullWidth
+          data-test-subj={getTestId('descriptionRow')}
+        >
+          <EuiTextArea
+            name="description"
+            value={item.description}
+            onChange={handleOnNameOrDescriptionChange}
+            fullWidth
+            compressed
+            maxLength={256}
+            data-test-subj={getTestId('descriptionField')}
+          />
+        </EuiFormRow>
+        <EuiHorizontalRule />
+        <EuiText size="xs">
+          <h3>{CONDITIONS_HEADER}</h3>
+        </EuiText>
+        <EuiSpacer size="xs" />
+        <EuiText size="s">{CONDITIONS_HEADER_DESCRIPTION}</EuiText>
+        <EuiSpacer size="m" />
+        <EuiFormRow
+          label={SELECT_OS_LABEL}
+          fullWidth
+          data-test-subj={getTestId('OsRow')}
+          isInvalid={visited?.os && validationResult.result.os?.isInvalid}
+          error={validationResult.result.os?.errors}
+        >
+          <EuiSuperSelect
+            name="os"
+            options={osOptions}
+            valueOfSelected={selectedOs}
+            onChange={handleOnOsChange}
+            fullWidth
+            data-test-subj={getTestId('osSelectField')}
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          fullWidth
+          data-test-subj={getTestId('conditionsRow')}
+          isInvalid={visited.entries && validationResult.result.entries?.isInvalid}
+          error={validationResult.result.entries?.errors}
+          helpText={validationResult.result.entries?.warnings}
+        >
+          <LogicalConditionBuilder
+            entries={trustedApp.entries as NewTrustedApp['entries']}
+            os={selectedOs}
+            onAndClicked={handleAndClick}
+            onEntryRemove={handleEntryRemove}
+            onEntryChange={handleEntryChange}
+            onVisited={handleConditionBuilderOnVisited}
+            data-test-subj={getTestId('conditionsBuilder')}
+          />
+        </EuiFormRow>
+        {showAssignmentSection ? (
+          <>
+            <EuiHorizontalRule />
+            <EuiFormRow fullWidth data-test-subj={getTestId('policySelection')}>
+              <EffectedPolicySelect
+                isGlobal={isGlobal}
+                isPlatinumPlus={isPlatinumPlus}
+                selected={selectedPolicies}
+                options={policies}
+                onChange={handleOnPolicyChange}
+                isLoading={policiesIsLoading}
+                description={POLICY_SELECT_DESCRIPTION}
+                data-test-subj={getTestId('effectedPolicies')}
+              />
+            </EuiFormRow>
+          </>
+        ) : null}
+      </EuiForm>
+    );
+  }
+);
+
+TrustedAppsForm.displayName = 'TrustedAppsForm';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 8b496dcb519b9..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,12717 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TrustedAppsGrid renders correctly initially 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        >
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--transparent euiPanel--noShadow euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge"
-          >
-            <div
-              class="euiEmptyPrompt__main"
-            >
-              <div
-                class="euiEmptyPrompt__content"
-              >
-                <div
-                  class="euiEmptyPrompt__contentInner"
-                >
-                  <span>
-                    No items found
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`TrustedAppsGrid renders correctly when failed loading data for the first time 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        >
-          <div
-            class="euiText euiText--medium"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-              <span
-                color="danger"
-                data-euiicon-type="minusInCircle"
-              />
-               
-              Intenal Server Error
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`TrustedAppsGrid renders correctly when failed loading data for the second time 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        >
-          <div
-            class="euiText euiText--medium"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-              <span
-                color="danger"
-                data-euiicon-type="minusInCircle"
-              />
-               
-              Intenal Server Error
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          class="euiSpacer euiSpacer--l"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap eui-xScroll"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <span
-                      class="euiButtonContent__icon"
-                      color="inherit"
-                      data-euiicon-type="arrowDown"
-                    />
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <span
-                aria-atomic="true"
-                aria-relevant="additions text"
-                class="euiScreenReaderOnly"
-                role="status"
-              >
-                Page 1 of 20
-              </span>
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowLeft"
-                />
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 3 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-2"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        3
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 4 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-3"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        4
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 5 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-4"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        5
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  aria-label="Skipping pages 6 to 19"
-                  class="euiPaginationButton-isPlaceholder euiPagination__item"
-                >
-                  …
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 20 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-19"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        20
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-next"
-                title="Next page"
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowRight"
-                />
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c6 {
-  padding-top: 2px;
-}
-
-.c5 {
-  margin-bottom: 4px !important;
-}
-
-.c7 {
-  margin: 6px;
-}
-
-.c3.artifactEntryCard + .c2.artifactEntryCard {
-  margin-top: 24px;
-}
-
-.c4 {
-  padding: 32px;
-}
-
-.c4.top-section {
-  padding-bottom: 24px;
-}
-
-.c4.bottom-section {
-  padding-top: 24px;
-}
-
-.c4.artifact-entry-collapsible-card {
-  padding: 24px !important;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        >
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 0
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 0
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 1
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 1
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 2
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 2
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 3
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 3
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 4
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 4
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 5
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 5
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 6
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 6
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 7
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 7
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 8
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 8
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 9
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 9
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          class="euiSpacer euiSpacer--l"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap eui-xScroll"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <span
-                      class="euiButtonContent__icon"
-                      color="inherit"
-                      data-euiicon-type="arrowDown"
-                    />
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <span
-                aria-atomic="true"
-                aria-relevant="additions text"
-                class="euiScreenReaderOnly"
-                role="status"
-              >
-                Page 1 of 20
-              </span>
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowLeft"
-                />
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 3 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-2"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        3
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 4 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-3"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        4
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 5 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-4"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        5
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  aria-label="Skipping pages 6 to 19"
-                  class="euiPaginationButton-isPlaceholder euiPagination__item"
-                >
-                  …
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 20 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-19"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        20
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-next"
-                title="Next page"
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowRight"
-                />
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`TrustedAppsGrid renders correctly when loading data for the first time 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="euiProgress euiProgress--indeterminate euiProgress--xs euiProgress--primary euiProgress--absolute"
-      />
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`TrustedAppsGrid renders correctly when loading data for the second time 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c6 {
-  padding-top: 2px;
-}
-
-.c5 {
-  margin-bottom: 4px !important;
-}
-
-.c7 {
-  margin: 6px;
-}
-
-.c3.artifactEntryCard + .c2.artifactEntryCard {
-  margin-top: 24px;
-}
-
-.c4 {
-  padding: 32px;
-}
-
-.c4.top-section {
-  padding-bottom: 24px;
-}
-
-.c4.bottom-section {
-  padding-top: 24px;
-}
-
-.c4.artifact-entry-collapsible-card {
-  padding: 24px !important;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="euiProgress euiProgress--indeterminate euiProgress--xs euiProgress--primary euiProgress--absolute"
-      />
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        >
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 0
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 0
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 1
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 1
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 2
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 2
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 3
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 3
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 4
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 4
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 5
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 5
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 6
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 6
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 7
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 7
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 8
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 8
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 9
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 9
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          class="euiSpacer euiSpacer--l"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap eui-xScroll"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <span
-                      class="euiButtonContent__icon"
-                      color="inherit"
-                      data-euiicon-type="arrowDown"
-                    />
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <span
-                aria-atomic="true"
-                aria-relevant="additions text"
-                class="euiScreenReaderOnly"
-                role="status"
-              >
-                Page 1 of 20
-              </span>
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowLeft"
-                />
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 3 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-2"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        3
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 4 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-3"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        4
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 5 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-4"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        5
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  aria-label="Skipping pages 6 to 19"
-                  class="euiPaginationButton-isPlaceholder euiPagination__item"
-                >
-                  …
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 20 of 20"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-19"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        20
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-next"
-                title="Next page"
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowRight"
-                />
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`TrustedAppsGrid renders correctly when new page and page size set (not loading yet) 1`] = `
-.c1 {
-  position: relative;
-  padding-top: 4px;
-}
-
-.c1 .body {
-  min-height: 40px;
-}
-
-.c1 .body-content {
-  position: relative;
-}
-
-.c6 {
-  padding-top: 2px;
-}
-
-.c5 {
-  margin-bottom: 4px !important;
-}
-
-.c7 {
-  margin: 6px;
-}
-
-.c3.artifactEntryCard + .c2.artifactEntryCard {
-  margin-top: 24px;
-}
-
-.c4 {
-  padding: 32px;
-}
-
-.c4.top-section {
-  padding-bottom: 24px;
-}
-
-.c4.bottom-section {
-  padding-top: 24px;
-}
-
-.c4.artifact-entry-collapsible-card {
-  padding: 24px !important;
-}
-
-.c0 .trusted-app + .trusted-app {
-  margin-top: 24px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1"
-    >
-      <div
-        class="body"
-      >
-        <div
-          class="body-content undefined"
-        >
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 0
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 0
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 1
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 1
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 2
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 2
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 3
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 3
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 4
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 4
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 5
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 5
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 6
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 6
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 7
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 7
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Mac
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 8
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 8
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Linux
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder c2 c3 artifactEntryCard "
-            data-test-subj="trustedAppCard"
-          >
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 top-section"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                data-test-subj="trustedAppCard-header"
-              >
-                <div
-                  class="euiFlexItem c5"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <h3
-                        class="euiTitle euiTitle--small"
-                        data-test-subj="trustedAppCard-header-title"
-                      >
-                        trusted app 9
-                      </h3>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-updated"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Last updated
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-updated-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow"
-                            data-test-subj="trustedAppCard-header-created"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero c6"
-                            >
-                              <span
-                                data-euiicon-type="calendar"
-                              />
-                            </div>
-                            <div
-                              class="euiFlexItem"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionColumn"
-                              >
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-label"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    Created
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem eui-textTruncate"
-                                  data-test-subj="trustedAppCard-header-created-value"
-                                >
-                                  <div
-                                    class="euiText euiText--small eui-textBreakWord"
-                                  >
-                                    <strong>
-                                      1 minute ago
-                                    </strong>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                    data-test-subj="trustedAppCard-header-actions"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        aria-label="Open"
-                        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        data-test-subj="trustedAppCard-header-actions-button"
-                        type="button"
-                      >
-                        <span
-                          aria-hidden="true"
-                          class="euiButtonIcon__icon"
-                          color="inherit"
-                          data-euiicon-type="boxesHorizontal"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                data-test-subj="trustedAppCard-subHeader"
-              >
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-touchedBy"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Created by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Created by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                        data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <span
-                            class="euiBadge euiBadge--iconLeft"
-                            data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-label"
-                            style="background-color: rgb(211, 218, 230); color: rgb(0, 0, 0);"
-                            title="Updated by"
-                          >
-                            <span
-                              class="euiBadge__content"
-                            >
-                              <span
-                                class="euiBadge__text"
-                              >
-                                Updated by
-                              </span>
-                            </span>
-                          </span>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero c7"
-                        >
-                          <div
-                            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                          >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                            >
-                              <div
-                                aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
-                                data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
-                                role="img"
-                                style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
-                                title="someone"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                >
-                                  s
-                                </span>
-                              </div>
-                            </div>
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
-                              data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-value"
-                            >
-                              <div
-                                class="euiText euiText--small eui-textBreakWord"
-                              >
-                                someone
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    data-test-subj="trustedAppCard-subHeader-effectScope"
-                  >
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        data-euiicon-type="globe"
-                      />
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
-                      data-test-subj="trustedAppCard-subHeader-effectScope-value"
-                    >
-                      <div
-                        class="euiText euiText--extraSmall eui-textBreakWord"
-                      >
-                        Applied globally
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="euiSpacer euiSpacer--l"
-              />
-              <div
-                class="euiText euiText--medium eui-textBreakWord"
-                data-test-subj="trustedAppCard-description"
-              >
-                Trusted App 9
-              </div>
-            </div>
-            <hr
-              class="euiHorizontalRule euiHorizontalRule--full"
-            />
-            <div
-              class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder c4 bottom-section"
-            >
-              <div
-                data-test-subj="trustedAppCard-criteriaConditions"
-              >
-                <div
-                  data-test-subj="trustedAppCard-criteriaConditions-os"
-                >
-                  <strong>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      />
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        OS
-                      </span>
-                    </span>
-                    <span
-                      class="euiExpression euiExpression-isUppercase euiExpression--success"
-                    >
-                      <span
-                        class="euiExpression__description"
-                      >
-                        IS
-                      </span>
-                       
-                      <span
-                        class="euiExpression__value"
-                      >
-                        Windows
-                      </span>
-                    </span>
-                  </strong>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          class="euiSpacer euiSpacer--l"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap eui-xScroll"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <span
-                      class="euiButtonContent__icon"
-                      color="inherit"
-                      data-euiicon-type="arrowDown"
-                    />
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      50
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <span
-                aria-atomic="true"
-                aria-relevant="additions text"
-                class="euiScreenReaderOnly"
-                role="status"
-              >
-                Page 3 of 4
-              </span>
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-previous"
-                title="Previous page"
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowLeft"
-                />
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 1 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-0"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 3 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive"
-                    data-test-subj="pagination-button-2"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        3
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 4 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton"
-                    data-test-subj="pagination-button-3"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        4
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiPaginationArrowButton"
-                data-test-subj="pagination-button-next"
-                title="Next page"
-                type="button"
-              >
-                <span
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  color="inherit"
-                  data-euiicon-type="arrowRight"
-                />
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx
deleted file mode 100644
index 79ada90287192..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { Provider } from 'react-redux';
-import { ThemeProvider } from 'styled-components';
-import { storiesOf } from '@storybook/react';
-import { euiLightVars } from '@kbn/ui-theme';
-import { EuiHorizontalRule } from '@elastic/eui';
-
-import { KibanaContextProvider } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
-import {
-  createGlobalNoMiddlewareStore,
-  createListFailedResourceState,
-  createListLoadedResourceState,
-  createListLoadingResourceState,
-  createTrustedAppsListResourceStateChangedAction,
-} from '../../../test_utils';
-
-import { TrustedAppsGrid } from '.';
-
-const now = 111111;
-
-const renderGrid = (store: ReturnType<typeof createGlobalNoMiddlewareStore>) => (
-  <Provider store={store}>
-    <KibanaContextProvider services={{ uiSettings: { get: () => 'MMM D, YYYY @ HH:mm:ss.SSS' } }}>
-      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
-        <EuiHorizontalRule margin="none" />
-
-        <TrustedAppsGrid />
-
-        <EuiHorizontalRule margin="none" />
-      </ThemeProvider>
-    </KibanaContextProvider>
-  </Provider>
-);
-
-storiesOf('TrustedApps/TrustedAppsGrid', module)
-  .add('default', () => {
-    return renderGrid(createGlobalNoMiddlewareStore());
-  })
-  .add('loading', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(createListLoadingResourceState())
-    );
-
-    return renderGrid(store);
-  })
-  .add('error', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListFailedResourceState('Intenal Server Error')
-      )
-    );
-
-    return renderGrid(store);
-  })
-  .add('loaded', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadedResourceState({ pageSize: 10 }, now)
-      )
-    );
-
-    return renderGrid(store);
-  })
-  .add('loading second time', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadingResourceState(createListLoadedResourceState({ pageSize: 10 }, now))
-      )
-    );
-
-    return renderGrid(store);
-  })
-  .add('long texts', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadedResourceState({ pageSize: 10 }, now, true)
-      )
-    );
-
-    return renderGrid(store);
-  });
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx
deleted file mode 100644
index d5eca75f9c2b5..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { render, act } from '@testing-library/react';
-import React from 'react';
-import { Provider } from 'react-redux';
-
-import {
-  createSampleTrustedApp,
-  createListFailedResourceState,
-  createListLoadedResourceState,
-  createListLoadingResourceState,
-  createTrustedAppsListResourceStateChangedAction,
-  createUserChangedUrlAction,
-  createGlobalNoMiddlewareStore,
-} from '../../../test_utils';
-import { TrustedAppsGrid } from '.';
-import { EuiThemeProvider } from '../../../../../../../../../../src/plugins/kibana_react/common';
-
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
-  htmlIdGenerator: () => () => 'mockId',
-}));
-
-jest.mock('../../../../../../common/lib/kibana');
-
-const now = 111111;
-
-const renderList = (store: ReturnType<typeof createGlobalNoMiddlewareStore>) => {
-  const Wrapper: React.FC = ({ children }) => (
-    <Provider store={store}>
-      <EuiThemeProvider>{children}</EuiThemeProvider>
-    </Provider>
-  );
-
-  return render(<TrustedAppsGrid />, { wrapper: Wrapper });
-};
-
-describe('TrustedAppsGrid', () => {
-  it('renders correctly initially', () => {
-    expect(renderList(createGlobalNoMiddlewareStore()).container).toMatchSnapshot();
-  });
-
-  it('renders correctly when loading data for the first time', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(createListLoadingResourceState())
-    );
-
-    expect(renderList(store).container).toMatchSnapshot();
-  });
-
-  it('renders correctly when failed loading data for the first time', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListFailedResourceState('Intenal Server Error')
-      )
-    );
-
-    expect(renderList(store).container).toMatchSnapshot();
-  });
-
-  it('renders correctly when loaded data', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadedResourceState({ pageSize: 10 }, now)
-      )
-    );
-
-    expect(renderList(store).container).toMatchSnapshot();
-  });
-
-  it('renders correctly when new page and page size set (not loading yet)', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadedResourceState({ pageSize: 10 }, now)
-      )
-    );
-    store.dispatch(
-      createUserChangedUrlAction('/administration/trusted_apps', '?page_index=2&page_size=50')
-    );
-
-    expect(renderList(store).container).toMatchSnapshot();
-  });
-
-  it('renders correctly when loading data for the second time', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadingResourceState(createListLoadedResourceState({ pageSize: 10 }, now))
-      )
-    );
-
-    expect(renderList(store).container).toMatchSnapshot();
-  });
-
-  it('renders correctly when failed loading data for the second time', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListFailedResourceState(
-          'Intenal Server Error',
-          createListLoadedResourceState({ pageSize: 10 }, now)
-        )
-      )
-    );
-
-    expect(renderList(store).container).toMatchSnapshot();
-  });
-
-  it('triggers deletion dialog when delete action clicked', async () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(
-      createTrustedAppsListResourceStateChangedAction(
-        createListLoadedResourceState({ pageSize: 10 }, now)
-      )
-    );
-    store.dispatch = jest.fn();
-
-    const renderResult = renderList(store);
-
-    await act(async () => {
-      (await renderResult.findAllByTestId('trustedAppCard-header-actions-button'))[0].click();
-    });
-
-    await act(async () => {
-      (await renderResult.findByTestId('deleteTrustedAppAction')).click();
-    });
-
-    expect(store.dispatch).toBeCalledWith({
-      type: 'trustedAppDeletionDialogStarted',
-      payload: {
-        entry: createSampleTrustedApp(0),
-      },
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
deleted file mode 100644
index a8e2187083523..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { memo, useCallback, useMemo } from 'react';
-
-import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
-import { i18n } from '@kbn/i18n';
-import { useDispatch } from 'react-redux';
-import { Dispatch } from 'redux';
-import { Pagination } from '../../../state';
-
-import {
-  getCurrentLocation,
-  getListErrorMessage,
-  getListItems,
-  getListPagination,
-  isListLoading,
-  getMapOfPoliciesById,
-  isLoadingListOfPolicies,
-} from '../../../store/selectors';
-
-import { useTrustedAppsNavigateCallback, useTrustedAppsSelector } from '../../hooks';
-
-import { getPolicyDetailPath, getTrustedAppsListPath } from '../../../../../common/routing';
-import {
-  PaginatedContent,
-  PaginatedContentProps,
-} from '../../../../../components/paginated_content';
-import { PolicyDetailsRouteState, TrustedApp } from '../../../../../../../common/endpoint/types';
-import {
-  ArtifactEntryCard,
-  ArtifactEntryCardProps,
-} from '../../../../../components/artifact_entry_card';
-import { AppAction } from '../../../../../../common/store/actions';
-import { APP_UI_ID } from '../../../../../../../common/constants';
-import { useAppUrl } from '../../../../../../common/lib/kibana';
-
-export interface PaginationBarProps {
-  pagination: Pagination;
-  onChange: (pagination: { size: number; index: number }) => void;
-}
-
-type ArtifactEntryCardType = typeof ArtifactEntryCard;
-
-const RootWrapper = styled.div`
-  .trusted-app + .trusted-app {
-    margin-top: ${({ theme }) => theme.eui.spacerSizes.l};
-  }
-`;
-
-const BACK_TO_TRUSTED_APPS_LABEL = i18n.translate(
-  'xpack.securitySolution.trustedapps.grid.policyDetailsLinkBackLabel',
-  { defaultMessage: 'Back to trusted applications' }
-);
-
-const EDIT_TRUSTED_APP_ACTION_LABEL = i18n.translate(
-  'xpack.securitySolution.trustedapps.grid.cardAction.edit',
-  {
-    defaultMessage: 'Edit trusted application',
-  }
-);
-
-const DELETE_TRUSTED_APP_ACTION_LABEL = i18n.translate(
-  'xpack.securitySolution.trustedapps.grid.cardAction.delete',
-  {
-    defaultMessage: 'Delete trusted application',
-  }
-);
-
-export const TrustedAppsGrid = memo(() => {
-  const history = useHistory();
-  const dispatch = useDispatch<Dispatch<AppAction>>();
-  const { getAppUrl } = useAppUrl();
-
-  const pagination = useTrustedAppsSelector(getListPagination);
-  const listItems = useTrustedAppsSelector(getListItems);
-  const isLoading = useTrustedAppsSelector(isListLoading);
-  const error = useTrustedAppsSelector(getListErrorMessage);
-  const location = useTrustedAppsSelector(getCurrentLocation);
-  const policyListById = useTrustedAppsSelector(getMapOfPoliciesById);
-  const loadingPoliciesList = useTrustedAppsSelector(isLoadingListOfPolicies);
-
-  const handlePaginationChange: PaginatedContentProps<
-    TrustedApp,
-    ArtifactEntryCardType
-  >['onChange'] = useTrustedAppsNavigateCallback(({ pageIndex, pageSize }) => ({
-    page_index: pageIndex,
-    page_size: pageSize,
-  }));
-
-  const artifactCardPropsPerItem = useMemo(() => {
-    const cachedCardProps: Record<string, ArtifactEntryCardProps> = {};
-
-    // Casting `listItems` below to remove the `Immutable<>` from it in order to prevent errors
-    // with common component's props
-    for (const trustedApp of listItems as TrustedApp[]) {
-      let policies: ArtifactEntryCardProps['policies'];
-
-      if (trustedApp.effectScope.type === 'policy' && trustedApp.effectScope.policies.length) {
-        policies = trustedApp.effectScope.policies.reduce<
-          Required<ArtifactEntryCardProps>['policies']
-        >((policyToNavOptionsMap, policyId) => {
-          const currentPagePath = getTrustedAppsListPath({
-            ...location,
-          });
-
-          const policyDetailsPath = getPolicyDetailPath(policyId);
-
-          const routeState: PolicyDetailsRouteState = {
-            backLink: {
-              label: BACK_TO_TRUSTED_APPS_LABEL,
-              navigateTo: [
-                APP_UI_ID,
-                {
-                  path: currentPagePath,
-                },
-              ],
-              href: getAppUrl({ path: currentPagePath }),
-            },
-            onCancelNavigateTo: [
-              APP_UI_ID,
-              {
-                path: currentPagePath,
-              },
-            ],
-          };
-
-          policyToNavOptionsMap[policyId] = {
-            navigateAppId: APP_UI_ID,
-            navigateOptions: {
-              path: policyDetailsPath,
-              state: routeState,
-            },
-            href: getAppUrl({ path: policyDetailsPath }),
-            children: policyListById[policyId]?.name ?? policyId,
-            target: '_blank',
-          };
-          return policyToNavOptionsMap;
-        }, {});
-      }
-
-      cachedCardProps[trustedApp.id] = {
-        item: trustedApp,
-        policies,
-        loadingPoliciesList,
-        hideComments: true,
-        'data-test-subj': 'trustedAppCard',
-        actions: [
-          {
-            icon: 'controlsHorizontal',
-            onClick: () => {
-              history.push(
-                getTrustedAppsListPath({
-                  ...location,
-                  show: 'edit',
-                  id: trustedApp.id,
-                })
-              );
-            },
-            'data-test-subj': 'editTrustedAppAction',
-            children: EDIT_TRUSTED_APP_ACTION_LABEL,
-          },
-          {
-            icon: 'trash',
-            onClick: () => {
-              dispatch({
-                type: 'trustedAppDeletionDialogStarted',
-                payload: { entry: trustedApp },
-              });
-            },
-            'data-test-subj': 'deleteTrustedAppAction',
-            children: DELETE_TRUSTED_APP_ACTION_LABEL,
-          },
-        ],
-        hideDescription: !trustedApp.description,
-      };
-    }
-
-    return cachedCardProps;
-  }, [dispatch, getAppUrl, history, listItems, location, policyListById, loadingPoliciesList]);
-
-  const handleArtifactCardProps = useCallback(
-    (trustedApp: TrustedApp) => {
-      return artifactCardPropsPerItem[trustedApp.id];
-    },
-    [artifactCardPropsPerItem]
-  );
-
-  return (
-    <RootWrapper>
-      <PaginatedContent<TrustedApp, ArtifactEntryCardType>
-        items={listItems as TrustedApp[]}
-        onChange={handlePaginationChange}
-        ItemComponent={ArtifactEntryCard}
-        itemComponentProps={handleArtifactCardProps}
-        loading={isLoading}
-        itemId="id"
-        error={error}
-        pagination={pagination}
-      />
-    </RootWrapper>
-  );
-});
-
-TrustedAppsGrid.displayName = 'TrustedAppsGrid';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 09a13f11d2adb..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,53 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`view_type_toggle ViewTypeToggle should render grid selection correctly 1`] = `
-<EuiButtonGroup
-  color="primary"
-  data-test-subj="viewTypeToggleButtonGroup"
-  idSelected="grid"
-  legend="View type"
-  onChange={[Function]}
-  options={
-    Array [
-      Object {
-        "data-test-subj": "viewTypeToggleButton",
-        "iconType": "grid",
-        "id": "grid",
-        "label": "Grid view",
-      },
-      Object {
-        "data-test-subj": "viewTypeToggleButton",
-        "iconType": "list",
-        "id": "list",
-        "label": "List view",
-      },
-    ]
-  }
-/>
-`;
-
-exports[`view_type_toggle ViewTypeToggle should render list selection correctly 1`] = `
-<EuiButtonGroup
-  color="primary"
-  data-test-subj="viewTypeToggleButtonGroup"
-  idSelected="list"
-  legend="View type"
-  onChange={[Function]}
-  options={
-    Array [
-      Object {
-        "data-test-subj": "viewTypeToggleButton",
-        "iconType": "grid",
-        "id": "grid",
-        "label": "Grid view",
-      },
-      Object {
-        "data-test-subj": "viewTypeToggleButton",
-        "iconType": "list",
-        "id": "list",
-        "label": "List view",
-      },
-    ]
-  }
-/>
-`;
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.stories.tsx
deleted file mode 100644
index 8ba70769838a3..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.stories.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState } from 'react';
-import { ThemeProvider } from 'styled-components';
-import { storiesOf, addDecorator } from '@storybook/react';
-import { euiLightVars } from '@kbn/ui-theme';
-
-import { ViewType } from '../../../state';
-import { ViewTypeToggle } from '.';
-
-addDecorator((storyFn) => (
-  <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>{storyFn()}</ThemeProvider>
-));
-
-const useRenderStory = (viewType: ViewType) => {
-  const [selectedOption, setSelectedOption] = useState<ViewType>(viewType);
-
-  return <ViewTypeToggle selectedOption={selectedOption} onToggle={setSelectedOption} />;
-};
-
-storiesOf('TrustedApps/ViewTypeToggle', module)
-  .add('grid selected', () => useRenderStory('grid'))
-  .add('list selected', () => useRenderStory('list'));
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.test.tsx
deleted file mode 100644
index d6b2bb5a2e7ef..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.test.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { render } from '@testing-library/react';
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { ViewTypeToggle } from '.';
-
-describe('view_type_toggle', () => {
-  describe('ViewTypeToggle', () => {
-    it('should render grid selection correctly', () => {
-      const element = shallow(<ViewTypeToggle selectedOption="grid" onToggle={() => {}} />);
-
-      expect(element).toMatchSnapshot();
-    });
-
-    it('should render list selection correctly', () => {
-      const element = shallow(<ViewTypeToggle selectedOption="list" onToggle={() => {}} />);
-
-      expect(element).toMatchSnapshot();
-    });
-
-    it('should trigger onToggle', async () => {
-      const onToggle = jest.fn();
-      const element = render(<ViewTypeToggle selectedOption="list" onToggle={onToggle} />);
-
-      (await element.findAllByTestId('viewTypeToggleButton'))[0].click();
-
-      expect(onToggle).toBeCalledWith('grid');
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.tsx
deleted file mode 100644
index 700358d6beef6..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/view_type_toggle/index.tsx
+++ /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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { memo, useCallback } from 'react';
-import { EuiButtonGroup } from '@elastic/eui';
-
-import { i18n } from '@kbn/i18n';
-import { ViewType } from '../../../state';
-import { GRID_VIEW_TOGGLE_LABEL, LIST_VIEW_TOGGLE_LABEL } from '../../translations';
-
-export interface ViewTypeToggleProps {
-  selectedOption: ViewType;
-  onToggle: (type: ViewType) => void;
-}
-
-export const ViewTypeToggle = memo(({ selectedOption, onToggle }: ViewTypeToggleProps) => {
-  const handleChange = useCallback(
-    (id) => {
-      if (id === 'list' || id === 'grid') {
-        onToggle(id);
-      }
-    },
-    [onToggle]
-  );
-
-  return (
-    <EuiButtonGroup
-      color="primary"
-      idSelected={selectedOption}
-      data-test-subj="viewTypeToggleButtonGroup"
-      options={[
-        {
-          id: 'grid',
-          iconType: 'grid',
-          label: GRID_VIEW_TOGGLE_LABEL,
-          'data-test-subj': 'viewTypeToggleButton',
-        },
-        {
-          id: 'list',
-          iconType: 'list',
-          label: LIST_VIEW_TOGGLE_LABEL,
-          'data-test-subj': 'viewTypeToggleButton',
-        },
-      ]}
-      onChange={handleChange}
-      legend={i18n.translate('xpack.securitySolution.trustedapps.viewTypeToggle.controlLegend', {
-        defaultMessage: 'View type',
-      })}
-    />
-  );
-});
-
-ViewTypeToggle.displayName = 'ViewTypeToggle';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/hooks.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/hooks.ts
deleted file mode 100644
index 4c2747d74d31e..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/hooks.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
-import { useCallback } from 'react';
-
-import { State } from '../../../../common/store';
-
-import {
-  MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE as TRUSTED_APPS_NS,
-  MANAGEMENT_STORE_GLOBAL_NAMESPACE as GLOBAL_NS,
-} from '../../../common/constants';
-
-import { AppAction } from '../../../../common/store/actions';
-import { getTrustedAppsListPath } from '../../../common/routing';
-import { TrustedAppsListPageLocation, TrustedAppsListPageState } from '../state';
-import { getCurrentLocation } from '../store/selectors';
-
-export function useTrustedAppsSelector<R>(selector: (state: TrustedAppsListPageState) => R): R {
-  return useSelector((state: State) =>
-    selector(state[GLOBAL_NS][TRUSTED_APPS_NS] as TrustedAppsListPageState)
-  );
-}
-
-export type NavigationCallback = (
-  ...args: Parameters<Parameters<typeof useCallback>[0]>
-) => Partial<TrustedAppsListPageLocation>;
-
-export function useTrustedAppsNavigateCallback(callback: NavigationCallback) {
-  const location = useTrustedAppsSelector(getCurrentLocation);
-  const history = useHistory();
-
-  return useCallback(
-    (...args) => history.push(getTrustedAppsListPath({ ...location, ...callback(...args) })),
-    // TODO: needs more investigation, but if callback is in dependencies list memoization will never happen
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [history, location]
-  );
-}
-
-export function useTrustedAppsStoreActionCallback(
-  callback: (...args: Parameters<Parameters<typeof useCallback>[0]>) => AppAction
-) {
-  const dispatch = useDispatch();
-
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  return useCallback((...args) => dispatch(callback(...args)), [dispatch]);
-}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts
index 3d8a56ad74315..b5b92f3a686ea 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts
@@ -13,14 +13,54 @@ import {
   OperatorFieldIds,
 } from '../../../../../common/endpoint/types';
 
-export { OS_TITLES } from '../../../common/translations';
-
 export const ABOUT_TRUSTED_APPS = i18n.translate('xpack.securitySolution.trustedapps.aboutInfo', {
   defaultMessage:
     'Add a trusted application to improve performance or alleviate conflicts with other applications running on ' +
     'your hosts.',
 });
 
+export const NAME_LABEL = i18n.translate('xpack.securitySolution.trustedApps.name.label', {
+  defaultMessage: 'Name',
+});
+
+export const DETAILS_HEADER = i18n.translate('xpack.securitySolution.trustedApps.details.header', {
+  defaultMessage: 'Details',
+});
+
+export const DETAILS_HEADER_DESCRIPTION = i18n.translate(
+  'xpack.securitySolution.trustedApps.details.header.description',
+  {
+    defaultMessage:
+      'Trusted applications improve performance or alleviate conflicts with other applications running on your hosts.',
+  }
+);
+
+export const DESCRIPTION_LABEL = i18n.translate(
+  'xpack.securitySolution.trustedapps.create.description',
+  {
+    defaultMessage: 'Description',
+  }
+);
+
+export const CONDITIONS_HEADER = i18n.translate(
+  'xpack.securitySolution.trustedApps.conditions.header',
+  {
+    defaultMessage: 'Conditions',
+  }
+);
+
+export const CONDITIONS_HEADER_DESCRIPTION = i18n.translate(
+  'xpack.securitySolution.trustedApps.conditions.header.description',
+  {
+    defaultMessage:
+      'Select an operating system and add conditions. Availability of conditions may depend on your chosen OS.',
+  }
+);
+
+export const SELECT_OS_LABEL = i18n.translate('xpack.securitySolution.trustedApps.os.label', {
+  defaultMessage: 'Select operating system',
+});
+
 export const CONDITION_FIELD_TITLE: { [K in ConditionEntryField]: string } = {
   [ConditionEntryField.HASH]: i18n.translate(
     'xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.hash',
@@ -74,23 +114,50 @@ export const ENTRY_PROPERTY_TITLES: Readonly<{
   }),
 };
 
-export const GRID_VIEW_TOGGLE_LABEL = i18n.translate(
-  'xpack.securitySolution.trustedapps.view.toggle.grid',
+export const POLICY_SELECT_DESCRIPTION = i18n.translate(
+  'xpack.securitySolution.trustedApps.assignmentSectionDescription',
   {
-    defaultMessage: 'Grid view',
+    defaultMessage:
+      'Assign this trusted application globally across all policies, or assign it to specific policies.',
   }
 );
 
-export const LIST_VIEW_TOGGLE_LABEL = i18n.translate(
-  'xpack.securitySolution.trustedapps.view.toggle.list',
-  {
-    defaultMessage: 'List view',
-  }
-);
-
-export const SEARCH_TRUSTED_APP_PLACEHOLDER = i18n.translate(
-  'xpack.securitySolution.trustedapps.list.search.placeholder',
-  {
-    defaultMessage: 'Search on the fields below: name, description, value',
-  }
-);
+export const INPUT_ERRORS = {
+  name: i18n.translate('xpack.securitySolution.trustedapps.create.nameRequiredMsg', {
+    defaultMessage: 'Name is required',
+  }),
+  os: i18n.translate('xpack.securitySolution.trustedapps.create.osRequiredMsg', {
+    defaultMessage: 'Operating System is required',
+  }),
+  field: i18n.translate('xpack.securitySolution.trustedapps.create.conditionRequiredMsg', {
+    defaultMessage: 'At least one Field definition is required',
+  }),
+  noDuplicateField: (field: ConditionEntryField) =>
+    i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldDuplicatedMsg', {
+      defaultMessage: '{field} cannot be added more than once',
+      values: { field: CONDITION_FIELD_TITLE[field] },
+    }),
+  mustHaveValue: (index: number) =>
+    i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldValueRequiredMsg', {
+      defaultMessage: '[{row}] Field entry must have a value',
+      values: { row: index + 1 },
+    }),
+  invalidHash: (index: number) =>
+    i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldInvalidHashMsg', {
+      defaultMessage: '[{row}] Invalid hash value',
+      values: { row: index + 1 },
+    }),
+  pathWarning: (index: number) =>
+    i18n.translate('xpack.securitySolution.trustedapps.create.conditionFieldInvalidPathMsg', {
+      defaultMessage: '[{row}] Path may be formed incorrectly; verify value',
+      values: { row: index + 1 },
+    }),
+  wildcardPathWarning: (index: number) =>
+    i18n.translate(
+      'xpack.securitySolution.trustedapps.create.conditionFieldDegradedPerformanceMsg',
+      {
+        defaultMessage: `[{row}] A wildcard in the filename will affect the endpoint's performance`,
+        values: { row: index + 1 },
+      }
+    ),
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.test.tsx
deleted file mode 100644
index 6abce21d7ccf5..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.test.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { Provider } from 'react-redux';
-import { render } from '@testing-library/react';
-import { I18nProvider } from '@kbn/i18n-react';
-
-import {
-  createGlobalNoMiddlewareStore,
-  createSampleTrustedApp,
-  createServerApiError,
-} from '../test_utils';
-
-import {
-  TrustedAppDeletionDialogStarted,
-  TrustedAppDeletionSubmissionResourceStateChanged,
-} from '../store/action';
-
-import { TrustedAppDeletionDialog } from './trusted_app_deletion_dialog';
-
-const renderDeletionDialog = (store: ReturnType<typeof createGlobalNoMiddlewareStore>) => {
-  const Wrapper: React.FC = ({ children }) => (
-    <Provider store={store}>
-      <I18nProvider>{children}</I18nProvider>
-    </Provider>
-  );
-
-  return render(<TrustedAppDeletionDialog />, { wrapper: Wrapper });
-};
-
-const createDialogStartAction = (): TrustedAppDeletionDialogStarted => ({
-  type: 'trustedAppDeletionDialogStarted',
-  payload: { entry: createSampleTrustedApp(3) },
-});
-
-const createDialogLoadingAction = (): TrustedAppDeletionSubmissionResourceStateChanged => ({
-  type: 'trustedAppDeletionSubmissionResourceStateChanged',
-  payload: {
-    newState: {
-      type: 'LoadingResourceState',
-      previousState: { type: 'UninitialisedResourceState' },
-    },
-  },
-});
-
-const createDialogFailedAction = (): TrustedAppDeletionSubmissionResourceStateChanged => ({
-  type: 'trustedAppDeletionSubmissionResourceStateChanged',
-  payload: {
-    newState: { type: 'FailedResourceState', error: createServerApiError('Not Found') },
-  },
-});
-
-describe('TrustedAppDeletionDialog', () => {
-  it('renders correctly initially', () => {
-    expect(renderDeletionDialog(createGlobalNoMiddlewareStore()).baseElement).toMatchSnapshot();
-  });
-
-  it('renders correctly when dialog started', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(createDialogStartAction());
-
-    expect(renderDeletionDialog(store).baseElement).toMatchSnapshot();
-  });
-
-  it('renders correctly when deletion is in progress', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(createDialogStartAction());
-    store.dispatch(createDialogLoadingAction());
-
-    expect(renderDeletionDialog(store).baseElement).toMatchSnapshot();
-  });
-
-  it('renders correctly when deletion failed', () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(createDialogStartAction());
-    store.dispatch(createDialogFailedAction());
-
-    expect(renderDeletionDialog(store).baseElement).toMatchSnapshot();
-  });
-
-  it('triggers confirmation action when confirm button clicked', async () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(createDialogStartAction());
-    store.dispatch = jest.fn();
-
-    (await renderDeletionDialog(store).findByTestId('trustedAppDeletionConfirm')).click();
-
-    expect(store.dispatch).toBeCalledWith({
-      type: 'trustedAppDeletionDialogConfirmed',
-    });
-  });
-
-  it('triggers closing action when cancel button clicked', async () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(createDialogStartAction());
-    store.dispatch = jest.fn();
-
-    (await renderDeletionDialog(store).findByTestId('trustedAppDeletionCancel')).click();
-
-    expect(store.dispatch).toBeCalledWith({
-      type: 'trustedAppDeletionDialogClosed',
-    });
-  });
-
-  it('does not trigger closing action when deletion in progress and cancel button clicked', async () => {
-    const store = createGlobalNoMiddlewareStore();
-
-    store.dispatch(createDialogStartAction());
-    store.dispatch(createDialogLoadingAction());
-
-    store.dispatch = jest.fn();
-
-    (await renderDeletionDialog(store).findByTestId('trustedAppDeletionCancel')).click();
-
-    expect(store.dispatch).not.toBeCalled();
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx
deleted file mode 100644
index 458a83d37322e..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_app_deletion_dialog.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiButtonEmpty,
-  EuiCallOut,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiSpacer,
-  EuiText,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import React, { memo, useCallback, useMemo } from 'react';
-import { useDispatch } from 'react-redux';
-import { Dispatch } from 'redux';
-import { AutoFocusButton } from '../../../../common/components/autofocus_button/autofocus_button';
-import { Immutable, TrustedApp } from '../../../../../common/endpoint/types';
-import { AppAction } from '../../../../common/store/actions';
-import { isPolicyEffectScope } from '../state/type_guards';
-import {
-  getDeletionDialogEntry,
-  isDeletionDialogOpen,
-  isDeletionInProgress,
-} from '../store/selectors';
-import { useTrustedAppsSelector } from './hooks';
-
-const CANCEL_SUBJ = 'trustedAppDeletionCancel';
-const CONFIRM_SUBJ = 'trustedAppDeletionConfirm';
-
-const getTranslations = (entry: Immutable<TrustedApp> | undefined) => ({
-  title: (
-    <FormattedMessage
-      id="xpack.securitySolution.trustedapps.deletionDialog.title"
-      defaultMessage='Delete "{name}"'
-      values={{ name: <b className="eui-textBreakWord">{entry?.name}</b> }}
-    />
-  ),
-  calloutTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.trustedapps.deletionDialog.calloutTitle"
-      defaultMessage="Warning"
-    />
-  ),
-  calloutMessage: (
-    <FormattedMessage
-      id="xpack.securitySolution.trustedapps.deletionDialog.calloutMessage"
-      defaultMessage="Deleting this entry will remove it from {count} associated {count, plural, one {policy} other {policies}}."
-      values={{
-        count:
-          entry && isPolicyEffectScope(entry.effectScope)
-            ? entry.effectScope.policies.length
-            : 'all',
-      }}
-    />
-  ),
-  subMessage: (
-    <FormattedMessage
-      id="xpack.securitySolution.trustedapps.deletionDialog.subMessage"
-      defaultMessage="This action cannot be undone. Are you sure you wish to continue?"
-    />
-  ),
-  cancelButton: (
-    <FormattedMessage
-      id="xpack.securitySolution.trustedapps.deletionDialog.cancelButton"
-      defaultMessage="Cancel"
-    />
-  ),
-  confirmButton: (
-    <FormattedMessage
-      id="xpack.securitySolution.trustedapps.deletionDialog.confirmButton"
-      defaultMessage="Delete"
-    />
-  ),
-});
-
-export const TrustedAppDeletionDialog = memo(() => {
-  const dispatch = useDispatch<Dispatch<AppAction>>();
-  const isBusy = useTrustedAppsSelector(isDeletionInProgress);
-  const entry = useTrustedAppsSelector(getDeletionDialogEntry);
-  const translations = useMemo(() => getTranslations(entry), [entry]);
-  const onConfirm = useCallback(() => {
-    dispatch({ type: 'trustedAppDeletionDialogConfirmed' });
-  }, [dispatch]);
-  const onCancel = useCallback(() => {
-    if (!isBusy) {
-      dispatch({ type: 'trustedAppDeletionDialogClosed' });
-    }
-  }, [dispatch, isBusy]);
-
-  if (useTrustedAppsSelector(isDeletionDialogOpen)) {
-    return (
-      <EuiModal onClose={onCancel}>
-        <EuiModalHeader>
-          <EuiModalHeaderTitle>{translations.title}</EuiModalHeaderTitle>
-        </EuiModalHeader>
-
-        <EuiModalBody>
-          <EuiCallOut title={translations.calloutTitle} color="danger" iconType="alert">
-            <p>{translations.calloutMessage}</p>
-          </EuiCallOut>
-          <EuiSpacer size="m" />
-          <EuiText>
-            <p>{translations.subMessage}</p>
-          </EuiText>
-        </EuiModalBody>
-
-        <EuiModalFooter>
-          <EuiButtonEmpty onClick={onCancel} isDisabled={isBusy} data-test-subj={CANCEL_SUBJ}>
-            {translations.cancelButton}
-          </EuiButtonEmpty>
-
-          <AutoFocusButton
-            fill
-            color="danger"
-            onClick={onConfirm}
-            isLoading={isBusy}
-            data-test-subj={CONFIRM_SUBJ}
-          >
-            {translations.confirmButton}
-          </AutoFocusButton>
-        </EuiModalFooter>
-      </EuiModal>
-    );
-  } else {
-    return <></>;
-  }
-});
-
-TrustedAppDeletionDialog.displayName = 'TrustedAppDeletionDialog';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.test.tsx
new file mode 100644
index 0000000000000..f778e6f471e1f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { act, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { TRUSTED_APPS_PATH } from '../../../../../common/constants';
+import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
+import { TrustedAppsList } from './trusted_apps_list';
+import { exceptionsListAllHttpMocks } from '../../mocks/exceptions_list_http_mocks';
+import { SEARCHABLE_FIELDS } from '../constants';
+import { parseQueryFilterToKQL } from '../../../common/utils';
+import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges';
+
+jest.mock('../../../../common/components/user_privileges');
+
+describe('When on the trusted applications page', () => {
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  let renderResult: ReturnType<typeof render>;
+  let history: AppContextTestRender['history'];
+  let mockedContext: AppContextTestRender;
+  let apiMocks: ReturnType<typeof exceptionsListAllHttpMocks>;
+
+  beforeEach(() => {
+    mockedContext = createAppRootMockRenderer();
+    ({ history } = mockedContext);
+    render = () => (renderResult = mockedContext.render(<TrustedAppsList />));
+
+    apiMocks = exceptionsListAllHttpMocks(mockedContext.coreStart.http);
+
+    act(() => {
+      history.push(TRUSTED_APPS_PATH);
+    });
+  });
+
+  it('should search using expected exception item fields', async () => {
+    const expectedFilterString = parseQueryFilterToKQL('fooFooFoo', SEARCHABLE_FIELDS);
+    const { findAllByTestId } = render();
+    await waitFor(async () => {
+      await expect(findAllByTestId('trustedAppsListPage-card')).resolves.toHaveLength(10);
+    });
+
+    apiMocks.responseProvider.exceptionsFind.mockClear();
+    userEvent.type(renderResult.getByTestId('searchField'), 'fooFooFoo');
+    userEvent.click(renderResult.getByTestId('searchButton'));
+    await waitFor(() => {
+      expect(apiMocks.responseProvider.exceptionsFind).toHaveBeenCalled();
+    });
+
+    expect(apiMocks.responseProvider.exceptionsFind).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        query: expect.objectContaining({
+          filter: expectedFilterString,
+        }),
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx
new file mode 100644
index 0000000000000..359e9d1aeb99d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { DocLinks } from '@kbn/doc-links';
+import { EuiLink } from '@elastic/eui';
+
+import { useHttp } from '../../../../common/lib/kibana';
+import { ArtifactListPage, ArtifactListPageProps } from '../../../components/artifact_list_page';
+import { TrustedAppsApiClient } from '../service';
+import { TrustedAppsForm } from './components/form';
+import { SEARCHABLE_FIELDS } from '../constants';
+
+const TRUSTED_APPS_PAGE_LABELS: ArtifactListPageProps['labels'] = {
+  pageTitle: i18n.translate('xpack.securitySolution.trustedApps.pageTitle', {
+    defaultMessage: 'Trusted applications',
+  }),
+  pageAboutInfo: i18n.translate('xpack.securitySolution.trustedApps.pageAboutInfo', {
+    defaultMessage:
+      'Trusted applications improve performance or alleviate conflicts with other applications running on your hosts.',
+  }),
+  pageAddButtonTitle: i18n.translate('xpack.securitySolution.trustedApps.pageAddButtonTitle', {
+    defaultMessage: 'Add trusted application',
+  }),
+  getShowingCountLabel: (total) =>
+    i18n.translate('xpack.securitySolution.trustedApps.showingTotal', {
+      defaultMessage:
+        'Showing {total} {total, plural, one {trusted application} other {trusted applications}}',
+      values: { total },
+    }),
+  cardActionEditLabel: i18n.translate('xpack.securitySolution.trustedApps.cardActionEditLabel', {
+    defaultMessage: 'Edit trusted application',
+  }),
+  cardActionDeleteLabel: i18n.translate(
+    'xpack.securitySolution.trustedApps.cardActionDeleteLabel',
+    {
+      defaultMessage: 'Delete trusted application',
+    }
+  ),
+  flyoutCreateTitle: i18n.translate('xpack.securitySolution.trustedApps.flyoutCreateTitle', {
+    defaultMessage: 'Add trusted application',
+  }),
+  flyoutEditTitle: i18n.translate('xpack.securitySolution.trustedApps.flyoutEditTitle', {
+    defaultMessage: 'Edit trusted application',
+  }),
+  flyoutCreateSubmitButtonLabel: i18n.translate(
+    'xpack.securitySolution.trustedApps.flyoutCreateSubmitButtonLabel',
+    { defaultMessage: 'Add trusted application' }
+  ),
+  flyoutCreateSubmitSuccess: ({ name }) =>
+    i18n.translate('xpack.securitySolution.trustedApps.flyoutCreateSubmitSuccess', {
+      defaultMessage: '"{name}" has been added to your trusted applications.',
+      values: { name },
+    }),
+  flyoutEditSubmitSuccess: ({ name }) =>
+    i18n.translate('xpack.securitySolution.trustedApps.flyoutEditSubmitSuccess', {
+      defaultMessage: '"{name}" has been updated.',
+      values: { name },
+    }),
+  flyoutDowngradedLicenseDocsInfo: (
+    securitySolutionDocsLinks: DocLinks['securitySolution']
+  ): React.ReactNode => {
+    return (
+      <>
+        <FormattedMessage
+          id="xpack.securitySolution.trustedApps.flyoutDowngradedLicenseDocsInfo"
+          defaultMessage="For more information, see our "
+        />
+        <EuiLink target="_blank" href={`${securitySolutionDocsLinks.trustedApps}`}>
+          <FormattedMessage
+            id="xpack.securitySolution.trustedApps.flyoutDowngradedLicenseDocsLink"
+            defaultMessage="Trusted applications documentation"
+          />
+        </EuiLink>
+      </>
+    );
+  },
+  deleteActionSuccess: (itemName) =>
+    i18n.translate('xpack.securitySolution.trustedApps.deleteSuccess', {
+      defaultMessage: '"{itemName}" has been removed from trusted applications.',
+      values: { itemName },
+    }),
+  emptyStateTitle: i18n.translate('xpack.securitySolution.trustedApps.emptyStateTitle', {
+    defaultMessage: 'Add your first trusted application',
+  }),
+  emptyStateInfo: i18n.translate('xpack.securitySolution.trustedApps.emptyStateInfo', {
+    defaultMessage:
+      'Add a trusted application to improve performance or alleviate conflicts with other applications running on your hosts.',
+  }),
+  emptyStatePrimaryButtonLabel: i18n.translate(
+    'xpack.securitySolution.trustedApps.emptyStatePrimaryButtonLabel',
+    { defaultMessage: 'Add trusted application' }
+  ),
+  searchPlaceholderInfo: i18n.translate(
+    'xpack.securitySolution.trustedApps.searchPlaceholderInfo',
+    {
+      defaultMessage: 'Search on the fields below: name, description, value',
+    }
+  ),
+};
+
+export const TrustedAppsList = memo(() => {
+  const http = useHttp();
+  const trustedAppsApiClient = TrustedAppsApiClient.getInstance(http);
+
+  return (
+    <ArtifactListPage
+      apiClient={trustedAppsApiClient}
+      ArtifactFormComponent={TrustedAppsForm}
+      labels={TRUSTED_APPS_PAGE_LABELS}
+      data-test-subj="trustedAppsListPage"
+      searchableFields={SEARCHABLE_FIELDS}
+    />
+  );
+});
+
+TrustedAppsList.displayName = 'TrustedAppsList';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx
deleted file mode 100644
index ff170906309c8..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { Provider } from 'react-redux';
-import { render } from '@testing-library/react';
-
-import { NotificationsStart } from 'kibana/public';
-
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public/context';
-
-import {
-  createGlobalNoMiddlewareStore,
-  createSampleTrustedApp,
-  createServerApiError,
-} from '../test_utils';
-
-import { TrustedAppsNotifications } from './trusted_apps_notifications';
-
-const mockNotifications = () => coreMock.createStart({ basePath: '/mock' }).notifications;
-
-const renderNotifications = (
-  store: ReturnType<typeof createGlobalNoMiddlewareStore>,
-  notifications: NotificationsStart
-) => {
-  const Wrapper: React.FC = ({ children }) => (
-    <Provider store={store}>
-      <KibanaContextProvider services={{ notifications }}>{children}</KibanaContextProvider>
-    </Provider>
-  );
-
-  return render(<TrustedAppsNotifications />, { wrapper: Wrapper });
-};
-
-describe('TrustedAppsNotifications', () => {
-  it('renders correctly initially', () => {
-    const notifications = mockNotifications();
-
-    renderNotifications(createGlobalNoMiddlewareStore(), notifications);
-
-    expect(notifications.toasts.addSuccess).not.toBeCalled();
-    expect(notifications.toasts.addDanger).not.toBeCalled();
-  });
-
-  it('shows success notification when deletion successful', () => {
-    const store = createGlobalNoMiddlewareStore();
-    const notifications = mockNotifications();
-
-    renderNotifications(store, notifications);
-
-    store.dispatch({
-      type: 'trustedAppDeletionDialogStarted',
-      payload: { entry: createSampleTrustedApp(3) },
-    });
-    store.dispatch({
-      type: 'trustedAppDeletionSubmissionResourceStateChanged',
-      payload: { newState: { type: 'LoadedResourceState', data: null } },
-    });
-    store.dispatch({
-      type: 'trustedAppDeletionDialogClosed',
-    });
-
-    expect(notifications.toasts.addSuccess).toBeCalledWith({
-      text: '"trusted app 3" has been removed from the trusted applications list.',
-      title: 'Successfully removed',
-    });
-    expect(notifications.toasts.addDanger).not.toBeCalled();
-  });
-
-  it('shows error notification when deletion fails', () => {
-    const store = createGlobalNoMiddlewareStore();
-    const notifications = mockNotifications();
-
-    renderNotifications(store, notifications);
-
-    store.dispatch({
-      type: 'trustedAppDeletionDialogStarted',
-      payload: { entry: createSampleTrustedApp(3) },
-    });
-    store.dispatch({
-      type: 'trustedAppDeletionSubmissionResourceStateChanged',
-      payload: {
-        newState: { type: 'FailedResourceState', error: createServerApiError('Not Found') },
-      },
-    });
-
-    expect(notifications.toasts.addSuccess).not.toBeCalled();
-    expect(notifications.toasts.addDanger).toBeCalledWith({
-      text: 'Unable to remove "trusted app 3" from the trusted applications list. Reason: Not Found',
-      title: 'Removal failure',
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.tsx
deleted file mode 100644
index dd03636d7cc66..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { memo, useState } from 'react';
-import { i18n } from '@kbn/i18n';
-
-import { ServerApiError } from '../../../../common/types';
-import { Immutable, NewTrustedApp, TrustedApp } from '../../../../../common/endpoint/types';
-import {
-  getCreationDialogFormEntry,
-  getDeletionDialogEntry,
-  getDeletionError,
-  isCreationSuccessful,
-  isDeletionSuccessful,
-  isEdit,
-} from '../store/selectors';
-
-import { useToasts } from '../../../../common/lib/kibana';
-import { useTrustedAppsSelector } from './hooks';
-
-const getDeletionErrorMessage = (error: ServerApiError, entry: Immutable<TrustedApp>) => {
-  return {
-    title: i18n.translate('xpack.securitySolution.trustedapps.deletionError.title', {
-      defaultMessage: 'Removal failure',
-    }),
-    text: i18n.translate('xpack.securitySolution.trustedapps.deletionError.text', {
-      defaultMessage:
-        'Unable to remove "{name}" from the trusted applications list. Reason: {message}',
-      values: { name: entry.name, message: error.message },
-    }),
-  };
-};
-
-const getDeletionSuccessMessage = (entry: Immutable<TrustedApp>) => {
-  return {
-    title: i18n.translate('xpack.securitySolution.trustedapps.deletionSuccess.title', {
-      defaultMessage: 'Successfully removed',
-    }),
-    text: i18n.translate('xpack.securitySolution.trustedapps.deletionSuccess.text', {
-      defaultMessage: '"{name}" has been removed from the trusted applications list.',
-      values: { name: entry?.name },
-    }),
-  };
-};
-
-const getCreationSuccessMessage = (entry: Immutable<NewTrustedApp>) => {
-  return {
-    title: i18n.translate('xpack.securitySolution.trustedapps.creationSuccess.title', {
-      defaultMessage: 'Success!',
-    }),
-    text: i18n.translate(
-      'xpack.securitySolution.trustedapps.createTrustedAppFlyout.successToastTitle',
-      {
-        defaultMessage: '"{name}" has been added to the trusted applications list.',
-        values: { name: entry.name },
-      }
-    ),
-  };
-};
-
-const getUpdateSuccessMessage = (entry: Immutable<NewTrustedApp>) => {
-  return {
-    title: i18n.translate('xpack.securitySolution.trustedapps.updateSuccess.title', {
-      defaultMessage: 'Success!',
-    }),
-    text: i18n.translate(
-      'xpack.securitySolution.trustedapps.createTrustedAppFlyout.updateSuccessToastTitle',
-      {
-        defaultMessage: '"{name}" has been updated.',
-        values: { name: entry.name },
-      }
-    ),
-  };
-};
-
-export const TrustedAppsNotifications = memo(() => {
-  const deletionError = useTrustedAppsSelector(getDeletionError);
-  const deletionDialogEntry = useTrustedAppsSelector(getDeletionDialogEntry);
-  const deletionSuccessful = useTrustedAppsSelector(isDeletionSuccessful);
-  const creationDialogNewEntry = useTrustedAppsSelector(getCreationDialogFormEntry);
-  const creationSuccessful = useTrustedAppsSelector(isCreationSuccessful);
-  const editMode = useTrustedAppsSelector(isEdit);
-  const toasts = useToasts();
-
-  const [wasAlreadyHandled] = useState(new WeakSet());
-
-  if (deletionError && deletionDialogEntry) {
-    toasts.addDanger(getDeletionErrorMessage(deletionError, deletionDialogEntry));
-  }
-
-  if (deletionSuccessful && deletionDialogEntry) {
-    toasts.addSuccess(getDeletionSuccessMessage(deletionDialogEntry));
-  }
-
-  if (
-    creationSuccessful &&
-    creationDialogNewEntry &&
-    !wasAlreadyHandled.has(creationDialogNewEntry)
-  ) {
-    wasAlreadyHandled.add(creationDialogNewEntry);
-
-    toasts.addSuccess(
-      (editMode && getUpdateSuccessMessage(creationDialogNewEntry)) ||
-        getCreationSuccessMessage(creationDialogNewEntry)
-    );
-  }
-
-  return <></>;
-});
-
-TrustedAppsNotifications.displayName = 'TrustedAppsNotifications';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
deleted file mode 100644
index 6c1319ca6e9e3..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
+++ /dev/null
@@ -1,885 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import * as reactTestingLibrary from '@testing-library/react';
-import { TrustedAppsPage } from './trusted_apps_page';
-import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
-import { fireEvent } from '@testing-library/dom';
-import { MiddlewareActionSpyHelper } from '../../../../common/store/test_utils';
-import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
-import { TrustedApp } from '../../../../../common/endpoint/types';
-import { HttpFetchOptions, HttpFetchOptionsWithPath } from 'kibana/public';
-import { isFailedResourceState, isLoadedResourceState } from '../state';
-import { forceHTMLElementOffsetWidth } from '../../../components/effected_policy_select/test_utils';
-import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
-import { licenseService } from '../../../../common/hooks/use_license';
-import { FoundExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { trustedAppsAllHttpMocks } from '../../mocks';
-import { waitFor } from '@testing-library/react';
-
-jest.mock('../../../../common/hooks/use_license', () => {
-  const licenseServiceInstance = {
-    isPlatinumPlus: jest.fn(),
-  };
-  return {
-    licenseService: licenseServiceInstance,
-    useLicense: () => {
-      return licenseServiceInstance;
-    },
-  };
-});
-
-jest.mock('../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
-
-describe('When on the Trusted Apps Page', () => {
-  const expectedAboutInfo =
-    'Add a trusted application to improve performance or alleviate conflicts with other ' +
-    'applications running on your hosts.';
-
-  let mockedContext: AppContextTestRender;
-  let history: AppContextTestRender['history'];
-  let coreStart: AppContextTestRender['coreStart'];
-  let waitForAction: MiddlewareActionSpyHelper['waitForAction'];
-  let render: () => ReturnType<AppContextTestRender['render']>;
-  let renderResult: ReturnType<AppContextTestRender['render']>;
-  let mockedApis: ReturnType<typeof trustedAppsAllHttpMocks>;
-  let getFakeTrustedApp = jest.fn();
-
-  const originalScrollTo = window.scrollTo;
-  const act = reactTestingLibrary.act;
-  const waitForListUI = async (): Promise<void> => {
-    await waitFor(() => {
-      expect(renderResult.getByTestId('trustedAppsListPageContent')).toBeTruthy();
-    });
-  };
-
-  beforeAll(() => {
-    window.scrollTo = () => {};
-  });
-
-  afterAll(() => {
-    window.scrollTo = originalScrollTo;
-  });
-
-  beforeEach(() => {
-    mockedContext = createAppRootMockRenderer();
-    getFakeTrustedApp = jest.fn(
-      (): TrustedApp => ({
-        id: '2d95bec3-b48f-4db7-9622-a2b061cc031d',
-        version: 'abc123',
-        name: 'Generated Exception (3xnng)',
-        os: OperatingSystem.WINDOWS,
-        created_at: '2021-01-04T13:55:00.561Z',
-        created_by: 'me',
-        updated_at: '2021-01-04T13:55:00.561Z',
-        updated_by: 'me',
-        description: 'created by ExceptionListItemGenerator',
-        effectScope: { type: 'global' },
-        entries: [
-          {
-            field: ConditionEntryField.PATH,
-            value: 'one/two',
-            operator: 'included',
-            type: 'match',
-          },
-        ],
-      })
-    );
-
-    history = mockedContext.history;
-    coreStart = mockedContext.coreStart;
-    (licenseService.isPlatinumPlus as jest.Mock).mockReturnValue(true);
-    waitForAction = mockedContext.middlewareSpy.waitForAction;
-    mockedApis = trustedAppsAllHttpMocks(coreStart.http);
-    render = () => (renderResult = mockedContext.render(<TrustedAppsPage />));
-    reactTestingLibrary.act(() => {
-      history.push('/administration/trusted_apps');
-    });
-    window.scrollTo = jest.fn();
-  });
-
-  afterEach(() => reactTestingLibrary.cleanup());
-
-  describe('and there are trusted app entries', () => {
-    const renderWithListData = async () => {
-      render();
-      await act(async () => {
-        await waitForListUI();
-      });
-
-      return renderResult;
-    };
-
-    it('should display subtitle info about trusted apps', async () => {
-      const { getByTestId } = await renderWithListData();
-      expect(getByTestId('header-panel-subtitle').textContent).toEqual(expectedAboutInfo);
-    });
-
-    it('should display a Add Trusted App button', async () => {
-      const { getByTestId } = await renderWithListData();
-      const addButton = getByTestId('trustedAppsListAddButton');
-      expect(addButton.textContent).toBe('Add trusted application');
-    });
-
-    it('should display the searchExceptions', async () => {
-      await renderWithListData();
-      expect(await renderResult.findByTestId('searchExceptions')).not.toBeNull();
-    });
-
-    describe('and the Grid view is being displayed', () => {
-      const renderWithListDataAndClickOnEditCard = async () => {
-        await renderWithListData();
-
-        await act(async () => {
-          // The 3rd Trusted app to be rendered will be a policy specific one
-          (await renderResult.findAllByTestId('trustedAppCard-header-actions-button'))[2].click();
-        });
-
-        act(() => {
-          fireEvent.click(renderResult.getByTestId('editTrustedAppAction'));
-        });
-      };
-
-      const renderWithListDataAndClickAddButton = async (): Promise<
-        ReturnType<AppContextTestRender['render']>
-      > => {
-        await renderWithListData();
-
-        act(() => {
-          const addButton = renderResult.getByTestId('trustedAppsListAddButton');
-          fireEvent.click(addButton, { button: 1 });
-        });
-
-        // Wait for the policies to be loaded
-        await act(async () => {
-          await waitForAction('trustedAppsPoliciesStateChanged', {
-            validate: (action) => {
-              return isLoadedResourceState(action.payload);
-            },
-          });
-        });
-
-        return renderResult;
-      };
-
-      describe('the license is downgraded to gold or below and the user is editing a per policy TA', () => {
-        beforeEach(async () => {
-          (licenseService.isPlatinumPlus as jest.Mock).mockReturnValue(false);
-
-          const originalFakeTrustedAppProvider = getFakeTrustedApp.getMockImplementation();
-          getFakeTrustedApp.mockImplementation(() => {
-            return {
-              ...originalFakeTrustedAppProvider!(),
-              effectScope: {
-                type: 'policy',
-                policies: ['abc123'],
-              },
-            };
-          });
-          await renderWithListDataAndClickOnEditCard();
-        });
-
-        it('shows a message at the top of the flyout to inform the user their license is expired', () => {
-          expect(
-            renderResult.queryByTestId('addTrustedAppFlyout-expired-license-callout')
-          ).toBeTruthy();
-        });
-      });
-
-      describe('the license is downgraded to gold or below and the user is adding a new TA', () => {
-        beforeEach(async () => {
-          (licenseService.isPlatinumPlus as jest.Mock).mockReturnValue(false);
-
-          const originalFakeTrustedAppProvider = getFakeTrustedApp.getMockImplementation();
-          getFakeTrustedApp.mockImplementation(() => {
-            return {
-              ...originalFakeTrustedAppProvider!(),
-              effectScope: {
-                type: 'policy',
-                policies: ['abc123'],
-              },
-            };
-          });
-          await renderWithListDataAndClickAddButton();
-        });
-        it('does not show the expired license message at the top of the flyout', async () => {
-          expect(
-            renderResult.queryByTestId('addTrustedAppFlyout-expired-license-callout')
-          ).toBeNull();
-        });
-      });
-
-      describe('and the edit trusted app button is clicked', () => {
-        beforeEach(async () => {
-          await renderWithListDataAndClickOnEditCard();
-        });
-
-        it('should persist edit params to url', () => {
-          expect(history.location.search).toEqual(
-            '?show=edit&id=bec3b48f-ddb7-4622-a2b0-61cc031d17eb'
-          );
-        });
-
-        it('should display the Edit flyout', () => {
-          expect(renderResult.getByTestId('addTrustedAppFlyout'));
-        });
-
-        it('should NOT display the about info for trusted apps', () => {
-          expect(renderResult.queryByTestId('addTrustedAppFlyout-about')).toBeNull();
-        });
-
-        it('should show correct flyout title', () => {
-          expect(renderResult.getByTestId('addTrustedAppFlyout-headerTitle').textContent).toBe(
-            'Edit trusted application'
-          );
-        });
-
-        it('should display the expected text for the Save button', () => {
-          expect(renderResult.getByTestId('addTrustedAppFlyout-createButton').textContent).toEqual(
-            'Save'
-          );
-        });
-
-        it('should display trusted app data for edit', async () => {
-          const formNameInput = renderResult.getByTestId(
-            'addTrustedAppFlyout-createForm-nameTextField'
-          ) as HTMLInputElement;
-          const formDescriptionInput = renderResult.getByTestId(
-            'addTrustedAppFlyout-createForm-descriptionField'
-          ) as HTMLTextAreaElement;
-
-          expect(formNameInput.value).toEqual('Generated Exception (nng74)');
-          expect(formDescriptionInput.value).toEqual('created by ExceptionListItemGenerator');
-        });
-
-        describe('and when Save is clicked', () => {
-          it('should call the correct api (PUT)', async () => {
-            await act(async () => {
-              fireEvent.click(renderResult.getByTestId('addTrustedAppFlyout-createButton'));
-              await waitForAction('trustedAppCreationSubmissionResourceStateChanged', {
-                validate({ payload }) {
-                  return isLoadedResourceState(payload.newState);
-                },
-              });
-            });
-
-            expect(coreStart.http.put).toHaveBeenCalledTimes(1);
-
-            const lastCallToPut = coreStart.http.put.mock.calls[0] as unknown as [
-              string,
-              HttpFetchOptions
-            ];
-
-            expect(lastCallToPut[0]).toEqual('/api/exception_lists/items');
-
-            expect(JSON.parse(lastCallToPut[1].body as string)).toEqual({
-              _version: '9zawi',
-              name: 'Generated Exception (nng74)',
-              description: 'created by ExceptionListItemGenerator',
-              entries: [
-                {
-                  field: 'process.hash.md5',
-                  operator: 'included',
-                  type: 'match',
-                  value: '741462ab431a22233c787baab9b653c7',
-                },
-                {
-                  field: 'process.executable.caseless',
-                  operator: 'included',
-                  type: 'match',
-                  value: 'c:\\fol\\bin.exe',
-                },
-              ],
-              os_types: ['windows'],
-              tags: [
-                'policy:ddf6570b-9175-4a6d-b288-61a09771c647',
-                'policy:b8e616ae-44fc-4be7-846c-ce8fa5c082dd',
-              ],
-              id: '05b5e350-0cad-4dc3-a61d-6e6796b0af39',
-              comments: [],
-              item_id: 'bec3b48f-ddb7-4622-a2b0-61cc031d17eb',
-              namespace_type: 'agnostic',
-              type: 'simple',
-            });
-          });
-        });
-      });
-
-      describe('and attempting to show Edit panel based on URL params', () => {
-        const renderAndWaitForGetApi = async () => {
-          // the store action watcher is setup prior to render because `renderWithListData()`
-          // also awaits API calls and this action could be missed.
-          const apiResponseForEditTrustedApp = waitForAction(
-            'trustedAppCreationEditItemStateChanged',
-            {
-              validate({ payload }) {
-                return isLoadedResourceState(payload) || isFailedResourceState(payload);
-              },
-            }
-          );
-
-          await renderWithListData();
-
-          await reactTestingLibrary.act(async () => {
-            await apiResponseForEditTrustedApp;
-          });
-
-          return renderResult;
-        };
-
-        beforeEach(() => {
-          reactTestingLibrary.act(() => {
-            history.push('/administration/trusted_apps?show=edit&id=9999-edit-8888');
-          });
-        });
-
-        it('should retrieve trusted app via API using url `id`', async () => {
-          await renderAndWaitForGetApi();
-
-          expect(coreStart.http.get.mock.calls).toContainEqual([
-            EXCEPTION_LIST_ITEM_URL,
-            {
-              query: {
-                item_id: '9999-edit-8888',
-                namespace_type: 'agnostic',
-              },
-            },
-          ]);
-
-          expect(
-            (
-              renderResult.getByTestId(
-                'addTrustedAppFlyout-createForm-nameTextField'
-              ) as HTMLInputElement
-            ).value
-          ).toEqual('Generated Exception (u6kh2)');
-        });
-
-        it('should redirect to list and show toast message if `id` is missing from URL', async () => {
-          reactTestingLibrary.act(() => {
-            history.push('/administration/trusted_apps?show=edit&id=');
-          });
-
-          await renderAndWaitForGetApi();
-
-          expect(history.location.search).toEqual('');
-          expect(coreStart.notifications.toasts.addWarning.mock.calls[0][0]).toEqual(
-            'Unable to edit trusted application (No id provided)'
-          );
-        });
-
-        it('should redirect to list and show toast message on API error for GET of `id`', async () => {
-          // Mock the API GET for the trusted application
-          mockedApis.responseProvider.trustedApp.mockImplementation(() => {
-            throw new Error('test: api error response');
-          });
-
-          await renderAndWaitForGetApi();
-
-          expect(history.location.search).toEqual('');
-          expect(coreStart.notifications.toasts.addWarning.mock.calls[0][0]).toEqual(
-            'Unable to edit trusted application (test: api error response)'
-          );
-        });
-      });
-    });
-  });
-
-  describe('and the Add Trusted App button is clicked', () => {
-    const renderAndClickAddButton = async (): Promise<
-      ReturnType<AppContextTestRender['render']>
-    > => {
-      render();
-      await act(async () => {
-        await Promise.all([
-          waitForAction('trustedAppsListResourceStateChanged'),
-          waitForAction('trustedAppsExistStateChanged', {
-            validate({ payload }) {
-              return isLoadedResourceState(payload);
-            },
-          }),
-        ]);
-      });
-
-      act(() => {
-        const addButton = renderResult.getByTestId('trustedAppsListAddButton');
-        fireEvent.click(addButton, { button: 1 });
-      });
-
-      // Wait for the policies to be loaded
-      await act(async () => {
-        await waitForAction('trustedAppsPoliciesStateChanged', {
-          validate: (action) => {
-            return isLoadedResourceState(action.payload);
-          },
-        });
-      });
-
-      return renderResult;
-    };
-
-    it('should display the create flyout', async () => {
-      const { getByTestId } = await renderAndClickAddButton();
-      const flyout = getByTestId('addTrustedAppFlyout');
-      expect(flyout).not.toBeNull();
-
-      const flyoutTitle = getByTestId('addTrustedAppFlyout-headerTitle');
-      expect(flyoutTitle.textContent).toBe('Add trusted application');
-
-      expect(getByTestId('addTrustedAppFlyout-about'));
-    });
-
-    it('should update the URL to indicate the flyout is opened', async () => {
-      await renderAndClickAddButton();
-      expect(/show\=create/.test(history.location.search)).toBe(true);
-    });
-
-    it('should preserve other URL search params', async () => {
-      const createListResponse =
-        mockedApis.responseProvider.trustedAppsList.getMockImplementation()!;
-      mockedApis.responseProvider.trustedAppsList.mockImplementation((...args) => {
-        const response = createListResponse(...args);
-        response.total = 100; // Trigger the UI to show pagination
-        return response;
-      });
-
-      reactTestingLibrary.act(() => {
-        history.push('/administration/trusted_apps?page_index=2&page_size=20');
-      });
-      await renderAndClickAddButton();
-      expect(history.location.search).toBe('?page_index=2&page_size=20&show=create');
-    });
-
-    it('should display create form', async () => {
-      const { queryByTestId } = await renderAndClickAddButton();
-      expect(queryByTestId('addTrustedAppFlyout-createForm')).not.toBeNull();
-    });
-
-    it('should have list of policies populated', async () => {
-      const resetEnv = forceHTMLElementOffsetWidth();
-      await renderAndClickAddButton();
-      act(() => {
-        fireEvent.click(renderResult.getByTestId('perPolicy'));
-      });
-      expect(renderResult.getByTestId('policy-ddf6570b-9175-4a6d-b288-61a09771c647'));
-      resetEnv();
-    });
-
-    it('should initially have the flyout Add button disabled', async () => {
-      const { getByTestId } = await renderAndClickAddButton();
-      expect((getByTestId('addTrustedAppFlyout-createButton') as HTMLButtonElement).disabled).toBe(
-        true
-      );
-    });
-
-    it('should close flyout if cancel button is clicked', async () => {
-      const { getByTestId, queryByTestId } = await renderAndClickAddButton();
-      const cancelButton = getByTestId('addTrustedAppFlyout-cancelButton');
-      await reactTestingLibrary.act(async () => {
-        fireEvent.click(cancelButton, { button: 1 });
-        await waitForAction('trustedAppCreationDialogClosed');
-      });
-      expect(history.location.search).toBe('');
-      expect(queryByTestId('addTrustedAppFlyout')).toBeNull();
-    });
-
-    it('should close flyout if flyout close button is clicked', async () => {
-      const { getByTestId, queryByTestId } = await renderAndClickAddButton();
-      const flyoutCloseButton = getByTestId('euiFlyoutCloseButton');
-      await reactTestingLibrary.act(async () => {
-        fireEvent.click(flyoutCloseButton, { button: 1 });
-        await waitForAction('trustedAppCreationDialogClosed');
-      });
-      expect(queryByTestId('addTrustedAppFlyout')).toBeNull();
-      expect(history.location.search).toBe('');
-    });
-
-    describe('and when the form data is valid', () => {
-      const fillInCreateForm = async () => {
-        mockedContext.store.dispatch({
-          type: 'trustedAppCreationDialogFormStateUpdated',
-          payload: {
-            isValid: true,
-            entry: toUpdateTrustedApp<TrustedApp>(getFakeTrustedApp()),
-          },
-        });
-      };
-
-      it('should enable the Flyout Add button', async () => {
-        await renderAndClickAddButton();
-        await fillInCreateForm();
-
-        const flyoutAddButton = renderResult.getByTestId(
-          'addTrustedAppFlyout-createButton'
-        ) as HTMLButtonElement;
-
-        expect(flyoutAddButton.disabled).toBe(false);
-      });
-
-      describe('and the Flyout Add button is clicked', () => {
-        let releasePostCreateApi: () => void;
-
-        beforeEach(async () => {
-          // Add a delay to the create api response provider and expose a function that allows
-          // us to release it at the right time.
-          mockedApis.responseProvider.trustedAppCreate.mockDelay.mockReturnValue(
-            new Promise((resolve) => {
-              releasePostCreateApi = resolve as typeof releasePostCreateApi;
-            })
-          );
-
-          await renderAndClickAddButton();
-          await fillInCreateForm();
-
-          const userClickedSaveActionWatcher = waitForAction('trustedAppCreationDialogConfirmed');
-          reactTestingLibrary.act(() => {
-            fireEvent.click(renderResult.getByTestId('addTrustedAppFlyout-createButton'), {
-              button: 1,
-            });
-          });
-
-          await reactTestingLibrary.act(async () => {
-            await userClickedSaveActionWatcher;
-          });
-        });
-
-        afterEach(() => releasePostCreateApi());
-
-        it('should display info about Trusted Apps', async () => {
-          expect(renderResult.getByTestId('addTrustedAppFlyout-about').textContent).toEqual(
-            expectedAboutInfo
-          );
-        });
-
-        it('should disable the Cancel button', async () => {
-          expect(
-            (renderResult.getByTestId('addTrustedAppFlyout-cancelButton') as HTMLButtonElement)
-              .disabled
-          ).toBe(true);
-          releasePostCreateApi();
-        });
-
-        it('should hide the dialog close button', async () => {
-          expect(renderResult.queryByTestId('euiFlyoutCloseButton')).toBeNull();
-        });
-
-        it('should disable the flyout Add button and set it to loading', async () => {
-          const saveButton = renderResult.getByTestId(
-            'addTrustedAppFlyout-createButton'
-          ) as HTMLButtonElement;
-          expect(saveButton.disabled).toBe(true);
-          expect(saveButton.querySelector('.euiLoadingSpinner')).not.toBeNull();
-        });
-
-        describe('and if create was successful', () => {
-          beforeEach(async () => {
-            await reactTestingLibrary.act(async () => {
-              const serverResponseAction = waitForAction(
-                'trustedAppCreationSubmissionResourceStateChanged'
-              );
-
-              coreStart.http.get.mockClear();
-              releasePostCreateApi();
-              await serverResponseAction;
-            });
-          });
-
-          it('should close the flyout', () => {
-            expect(renderResult.queryByTestId('addTrustedAppFlyout')).toBeNull();
-          });
-
-          it('should show success toast notification', () => {
-            expect(coreStart.notifications.toasts.addSuccess.mock.calls[0][0]).toEqual({
-              text: '"Generated Exception (3xnng)" has been added to the trusted applications list.',
-              title: 'Success!',
-            });
-          });
-
-          it('should trigger the List to reload', () => {
-            const isCalled = coreStart.http.get.mock.calls.some(
-              (call) => call[0].toString() === `${EXCEPTION_LIST_ITEM_URL}/_find`
-            );
-            expect(isCalled).toEqual(true);
-          });
-        });
-
-        describe('and if create failed', () => {
-          const ServerErrorResponseBodyMock = class extends Error {
-            public readonly body: { message: string };
-            constructor(message = 'Test - Bad Call') {
-              super(message);
-              this.body = {
-                message,
-              };
-            }
-          };
-          beforeEach(async () => {
-            const failedCreateApiResponse = new ServerErrorResponseBodyMock();
-
-            mockedApis.responseProvider.trustedAppCreate.mockImplementation(() => {
-              throw failedCreateApiResponse;
-            });
-
-            await reactTestingLibrary.act(async () => {
-              const serverResponseAction = waitForAction(
-                'trustedAppCreationSubmissionResourceStateChanged',
-                {
-                  validate({ payload }) {
-                    return isFailedResourceState(payload.newState);
-                  },
-                }
-              );
-
-              releasePostCreateApi();
-              await serverResponseAction;
-            });
-          });
-
-          it('should continue to show the flyout', () => {
-            expect(renderResult.getByTestId('addTrustedAppFlyout')).not.toBeNull();
-          });
-
-          it('should enable the Cancel Button', () => {
-            expect(
-              (renderResult.getByTestId('addTrustedAppFlyout-cancelButton') as HTMLButtonElement)
-                .disabled
-            ).toBe(false);
-          });
-
-          it('should show the dialog close button', () => {
-            expect(renderResult.getByTestId('euiFlyoutCloseButton')).not.toBeNull();
-          });
-
-          it('should enable the flyout Add button and remove loading indicating', () => {
-            expect(
-              (renderResult.getByTestId('addTrustedAppFlyout-createButton') as HTMLButtonElement)
-                .disabled
-            ).toBe(false);
-          });
-
-          it('should show API errors in the form', () => {
-            expect(renderResult.container.querySelector('.euiForm__errors')).not.toBeNull();
-          });
-        });
-      });
-    });
-
-    describe('and when the form data is not valid', () => {
-      it('should not enable the Flyout Add button with an invalid hash', async () => {
-        await renderAndClickAddButton();
-        const { getByTestId } = renderResult;
-
-        reactTestingLibrary.act(() => {
-          fireEvent.change(getByTestId('addTrustedAppFlyout-createForm-nameTextField'), {
-            target: { value: 'trusted app A' },
-          });
-
-          fireEvent.change(
-            getByTestId('addTrustedAppFlyout-createForm-conditionsBuilder-group1-entry0-value'),
-            { target: { value: 'invalid hash' } }
-          );
-        });
-
-        const flyoutAddButton = getByTestId(
-          'addTrustedAppFlyout-createButton'
-        ) as HTMLButtonElement;
-        expect(flyoutAddButton.disabled).toBe(true);
-      });
-    });
-  });
-
-  describe('and there are no trusted apps', () => {
-    const releaseExistsResponse = jest.fn((): FoundExceptionListItemSchema => {
-      return {
-        data: [],
-        total: 0,
-        page: 1,
-        per_page: 1,
-      };
-    });
-    const releaseListResponse = jest.fn((): FoundExceptionListItemSchema => {
-      return {
-        data: [],
-        total: 0,
-        page: 1,
-        per_page: 20,
-      };
-    });
-
-    beforeEach(() => {
-      mockedApis.responseProvider.trustedAppsList.mockImplementation(({ query }) => {
-        const { page, per_page: perPage } = query as { page: number; per_page: number };
-
-        if (page === 1 && perPage === 1) {
-          return releaseExistsResponse();
-        } else {
-          return releaseListResponse();
-        }
-      });
-    });
-
-    afterEach(() => {
-      releaseExistsResponse.mockClear();
-      releaseListResponse.mockClear();
-    });
-
-    it('should show a loader until trusted apps existence can be confirmed', async () => {
-      render();
-      expect(await renderResult.findByTestId('trustedAppsListLoader')).not.toBeNull();
-    });
-
-    it('should show Empty Prompt if not entries exist', async () => {
-      render();
-      await act(async () => {
-        await waitForAction('trustedAppsExistStateChanged');
-      });
-      expect(await renderResult.findByTestId('trustedAppEmptyState')).not.toBeNull();
-    });
-
-    it('should hide empty prompt and show list after one trusted app is added', async () => {
-      render();
-      await act(async () => {
-        await waitForAction('trustedAppsExistStateChanged');
-      });
-      expect(await renderResult.findByTestId('trustedAppEmptyState')).not.toBeNull();
-      releaseListResponse.mockReturnValueOnce({
-        data: [mockedApis.responseProvider.trustedApp({ query: {} } as HttpFetchOptionsWithPath)],
-        total: 1,
-        page: 1,
-        per_page: 20,
-      });
-      releaseExistsResponse.mockReturnValueOnce({
-        data: [mockedApis.responseProvider.trustedApp({ query: {} } as HttpFetchOptionsWithPath)],
-        total: 1,
-        page: 1,
-        per_page: 1,
-      });
-
-      await act(async () => {
-        mockedContext.store.dispatch({
-          type: 'trustedAppsListDataOutdated',
-        });
-        await waitForAction('trustedAppsListResourceStateChanged');
-      });
-
-      expect(await renderResult.findByTestId('trustedAppsListPageContent')).not.toBeNull();
-    });
-
-    it('should should show empty prompt once the last trusted app entry is deleted', async () => {
-      releaseListResponse.mockReturnValueOnce({
-        data: [mockedApis.responseProvider.trustedApp({ query: {} } as HttpFetchOptionsWithPath)],
-        total: 1,
-        page: 1,
-        per_page: 20,
-      });
-      releaseExistsResponse.mockReturnValueOnce({
-        data: [mockedApis.responseProvider.trustedApp({ query: {} } as HttpFetchOptionsWithPath)],
-        total: 1,
-        page: 1,
-        per_page: 1,
-      });
-
-      render();
-
-      await act(async () => {
-        await waitForAction('trustedAppsExistStateChanged');
-      });
-
-      expect(await renderResult.findByTestId('trustedAppsListPageContent')).not.toBeNull();
-
-      await act(async () => {
-        mockedContext.store.dispatch({
-          type: 'trustedAppsListDataOutdated',
-        });
-        await waitForAction('trustedAppsListResourceStateChanged');
-      });
-
-      expect(await renderResult.findByTestId('trustedAppEmptyState')).not.toBeNull();
-    });
-
-    it('should not display the searchExceptions', async () => {
-      render();
-      await act(async () => {
-        await waitForAction('trustedAppsExistStateChanged');
-      });
-      expect(renderResult.queryByTestId('searchExceptions')).toBeNull();
-    });
-  });
-
-  describe('and the search is dispatched', () => {
-    beforeEach(async () => {
-      reactTestingLibrary.act(() => {
-        history.push('/administration/trusted_apps?filter=test');
-      });
-      render();
-      await act(async () => {
-        await waitForListUI();
-      });
-    });
-
-    it('search bar is filled with query params', () => {
-      expect(renderResult.getByDisplayValue('test')).not.toBeNull();
-    });
-
-    it('search action is dispatched', async () => {
-      await act(async () => {
-        fireEvent.click(renderResult.getByTestId('searchButton'));
-        expect(await waitForAction('userChangedUrl')).not.toBeNull();
-      });
-    });
-  });
-
-  describe('and the back button is present', () => {
-    beforeEach(async () => {
-      render();
-      await act(async () => {
-        await waitForListUI();
-      });
-      reactTestingLibrary.act(() => {
-        history.push('/administration/trusted_apps', {
-          onBackButtonNavigateTo: [{ appId: 'appId' }],
-          backButtonLabel: 'back to fleet',
-          backButtonUrl: '/fleet',
-        });
-      });
-    });
-
-    it('back button is present', () => {
-      const button = renderResult.queryByTestId('backToOrigin');
-      expect(button).not.toBeNull();
-      expect(button).toHaveAttribute('href', '/fleet');
-    });
-
-    it('back button is present after push history', () => {
-      reactTestingLibrary.act(() => {
-        history.push('/administration/trusted_apps');
-      });
-      const button = renderResult.queryByTestId('backToOrigin');
-      expect(button).not.toBeNull();
-      expect(button).toHaveAttribute('href', '/fleet');
-    });
-  });
-
-  describe('and the back button is not present', () => {
-    beforeEach(async () => {
-      render();
-      await act(async () => {
-        await waitForAction('trustedAppsListResourceStateChanged');
-      });
-      reactTestingLibrary.act(() => {
-        history.push('/administration/trusted_apps');
-      });
-    });
-
-    it('back button is not present when missing history params', () => {
-      const button = renderResult.queryByTestId('backToOrigin');
-      expect(button).toBeNull();
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
deleted file mode 100644
index 6b3f59f44ce12..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { memo, useMemo, useCallback } from 'react';
-import { useDispatch } from 'react-redux';
-import { Dispatch } from 'redux';
-import { useLocation } from 'react-router-dom';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import {
-  checkingIfEntriesExist,
-  entriesExist,
-  getCurrentLocation,
-  getListTotalItemsCount,
-  listOfPolicies,
-  prevEntriesExist,
-} from '../store/selectors';
-import { useTrustedAppsNavigateCallback, useTrustedAppsSelector } from './hooks';
-import { AdministrationListPage } from '../../../components/administration_list_page';
-import { CreateTrustedAppFlyout } from './components/create_trusted_app_flyout';
-import { TrustedAppsGrid } from './components/trusted_apps_grid';
-import { TrustedAppDeletionDialog } from './trusted_app_deletion_dialog';
-import { TrustedAppsNotifications } from './trusted_apps_notifications';
-import { AppAction } from '../../../../common/store/actions';
-import { ABOUT_TRUSTED_APPS, SEARCH_TRUSTED_APP_PLACEHOLDER } from './translations';
-import { EmptyState } from './components/empty_state';
-import { SearchExceptions } from '../../../components/search_exceptions';
-import { BackToExternalAppSecondaryButton } from '../../../components/back_to_external_app_secondary_button';
-import { BackToExternalAppButton } from '../../../components/back_to_external_app_button';
-import { ListPageRouteState } from '../../../../../common/endpoint/types';
-import { ManagementPageLoader } from '../../../components/management_page_loader';
-import { useMemoizedRouteState } from '../../../common/hooks';
-
-export const TrustedAppsPage = memo(() => {
-  const dispatch = useDispatch<Dispatch<AppAction>>();
-  const { state: routeState } = useLocation<ListPageRouteState | undefined>();
-  const location = useTrustedAppsSelector(getCurrentLocation);
-  const totalItemsCount = useTrustedAppsSelector(getListTotalItemsCount);
-  const isCheckingIfEntriesExists = useTrustedAppsSelector(checkingIfEntriesExist);
-  const policyList = useTrustedAppsSelector(listOfPolicies);
-  const doEntriesExist = useTrustedAppsSelector(entriesExist);
-  const didEntriesExist = useTrustedAppsSelector(prevEntriesExist);
-  const navigationCallbackQuery = useTrustedAppsNavigateCallback(
-    (query: string, includedPolicies?: string) => ({
-      filter: query,
-      included_policies: includedPolicies,
-    })
-  );
-
-  const memoizedRouteState = useMemoizedRouteState(routeState);
-
-  const backButtonEmptyComponent = useMemo(() => {
-    if (memoizedRouteState && memoizedRouteState.onBackButtonNavigateTo) {
-      return <BackToExternalAppSecondaryButton {...memoizedRouteState} />;
-    }
-  }, [memoizedRouteState]);
-
-  const backButtonHeaderComponent = useMemo(() => {
-    if (memoizedRouteState && memoizedRouteState.onBackButtonNavigateTo) {
-      return <BackToExternalAppButton {...memoizedRouteState} />;
-    }
-  }, [memoizedRouteState]);
-
-  const handleAddButtonClick = useTrustedAppsNavigateCallback(() => ({
-    show: 'create',
-    id: undefined,
-  }));
-  const handleAddFlyoutClose = useTrustedAppsNavigateCallback(() => ({
-    show: undefined,
-    id: undefined,
-  }));
-
-  const handleOnSearch = useCallback(
-    (query: string, includedPolicies?: string) => {
-      dispatch({ type: 'trustedAppForceRefresh', payload: { forceRefresh: true } });
-      navigationCallbackQuery(query, includedPolicies);
-    },
-    [dispatch, navigationCallbackQuery]
-  );
-
-  const showCreateFlyout = !!location.show;
-
-  const canDisplayContent = useCallback(
-    () => doEntriesExist || (isCheckingIfEntriesExists && didEntriesExist),
-    [didEntriesExist, doEntriesExist, isCheckingIfEntriesExists]
-  );
-
-  const addButton = (
-    <EuiButton
-      fill
-      iconType="plusInCircle"
-      isDisabled={showCreateFlyout}
-      onClick={handleAddButtonClick}
-      data-test-subj="trustedAppsListAddButton"
-    >
-      <FormattedMessage
-        id="xpack.securitySolution.trustedapps.list.addButton"
-        defaultMessage="Add trusted application"
-      />
-    </EuiButton>
-  );
-
-  const content = (
-    <>
-      <TrustedAppDeletionDialog />
-
-      {showCreateFlyout && (
-        <CreateTrustedAppFlyout
-          onClose={handleAddFlyoutClose}
-          size="m"
-          data-test-subj="addTrustedAppFlyout"
-        />
-      )}
-
-      {canDisplayContent() ? (
-        <>
-          <SearchExceptions
-            defaultValue={location.filter}
-            onSearch={handleOnSearch}
-            placeholder={SEARCH_TRUSTED_APP_PLACEHOLDER}
-            hasPolicyFilter={true}
-            policyList={policyList}
-            defaultIncludedPolicies={location.included_policies}
-          />
-          <EuiFlexGroup
-            direction="column"
-            gutterSize="none"
-            data-test-subj="trustedAppsListPageContent"
-          >
-            <EuiSpacer size="m" />
-            <EuiFlexItem grow={false}>
-              <EuiText color="subdued" size="xs" data-test-subj="trustedAppsListViewCountLabel">
-                {i18n.translate('xpack.securitySolution.trustedapps.list.totalCount', {
-                  defaultMessage:
-                    'Showing {totalItemsCount, plural, one {# trusted application} other {# trusted applications}}',
-                  values: { totalItemsCount },
-                })}
-              </EuiText>
-
-              <EuiSpacer size="s" />
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <TrustedAppsGrid />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
-      ) : (
-        <EmptyState
-          onAdd={handleAddButtonClick}
-          isAddDisabled={showCreateFlyout}
-          backComponent={backButtonEmptyComponent}
-        />
-      )}
-    </>
-  );
-
-  return (
-    <AdministrationListPage
-      data-test-subj="trustedAppsListPage"
-      headerBackComponent={backButtonHeaderComponent}
-      title={
-        <FormattedMessage
-          id="xpack.securitySolution.trustedapps.list.pageTitle"
-          defaultMessage="Trusted applications"
-        />
-      }
-      subtitle={ABOUT_TRUSTED_APPS}
-      actions={addButton}
-      hideHeader={!canDisplayContent()}
-    >
-      <TrustedAppsNotifications />
-
-      {isCheckingIfEntriesExists && !didEntriesExist ? (
-        <ManagementPageLoader data-test-subj="trustedAppsListLoader" />
-      ) : (
-        content
-      )}
-    </AdministrationListPage>
-  );
-});
-
-TrustedAppsPage.displayName = 'TrustedAppsPage';
diff --git a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts
index c27d983fec128..a8c6b0eda16a8 100644
--- a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 import { CreateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ExceptionsListItemGenerator } from '../../../../common/endpoint/data_generators/exceptions_list_item_generator';
 import { ExceptionsListApiClient } from './exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts
index b8afc98b6f1e5..832a3248c5753 100644
--- a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts
@@ -15,7 +15,7 @@ import {
   UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../common/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts b/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts
index aa7b50c69ed56..aa4aeafb096ff 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { useGetEndpointSecurityPackage } from './hooks';
-import { HttpFetchError, HttpSetup } from 'kibana/public';
+import { HttpFetchError, HttpSetup } from '@kbn/core/public';
 import { getFakeHttpService, renderQuery } from '../../hooks/test_utils';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { UseQueryOptions } from 'react-query';
-import { GetPackagesResponse } from '../../../../../fleet/common';
+import { GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import { useHttp } from '../../../common/lib/kibana';
 
 jest.mock('../../../common/lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts b/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts
index 649dd39e38da6..6cc6140d336d2 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   GetAgentPoliciesResponse,
   GetPackagesResponse,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { useHttp } from '../../../common/lib/kibana';
 import { MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../common/constants';
 import { sendGetAgentPolicyList, sendGetEndpointSecurityPackage } from './ingest';
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts b/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts
index bd34f7c14e22a..d29eedd06f765 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts
@@ -10,8 +10,8 @@ import {
   sendGetPackagePolicy,
   sendGetEndpointSecurityPackage,
 } from './ingest';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { EPM_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '../../../../../fleet/common';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { EPM_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '@kbn/fleet-plugin/common';
 import { policyListApiPathHandlers } from '../../pages/policy/store/test_mock_utils';
 
 describe('ingest service', () => {
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts b/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts
index 0863682357aca..447984e1e1a3c 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptions, HttpStart } from '@kbn/core/public';
 import {
   GetAgentStatusResponse,
   GetAgentsResponse,
@@ -14,7 +14,7 @@ import {
   GetPackagesResponse,
   GetAgentPoliciesRequest,
   GetAgentPoliciesResponse,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { NewPolicyData } from '../../../../common/endpoint/types';
 import { GetPolicyResponse, UpdatePolicyResponse } from '../../pages/policy/types';
 
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts b/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts
index acdecd7072366..86715ebff3f75 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../fleet/common';
-import { PACKAGE_POLICY_API_ROUTES } from '../../../../../fleet/common/constants/routes';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { PACKAGE_POLICY_API_ROUTES } from '@kbn/fleet-plugin/common/constants/routes';
 import { sendGetEndpointSpecificPackagePolicies } from './policies';
 
 describe('ingest service', () => {
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/policies.ts b/x-pack/plugins/security_solution/public/management/services/policies/policies.ts
index 219bf7698baaa..e78237c87827b 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/policies.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/policies.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptions, HttpStart } from '@kbn/core/public';
 import {
   GetPackagePoliciesRequest,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { GetPolicyListResponse } from '../../pages/policy/types';
 import { INGEST_API_PACKAGE_POLICIES } from './ingest';
 
diff --git a/x-pack/plugins/security_solution/public/management/store/middleware.ts b/x-pack/plugins/security_solution/public/management/store/middleware.ts
index d011a9dcb91a7..86a5ade340058 100644
--- a/x-pack/plugins/security_solution/public/management/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/store/middleware.ts
@@ -14,12 +14,10 @@ import {
   MANAGEMENT_STORE_ENDPOINTS_NAMESPACE,
   MANAGEMENT_STORE_GLOBAL_NAMESPACE,
   MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE,
-  MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE,
   MANAGEMENT_STORE_EVENT_FILTERS_NAMESPACE,
 } from '../common/constants';
 import { policyDetailsMiddlewareFactory } from '../pages/policy/store/policy_details';
 import { endpointMiddlewareFactory } from '../pages/endpoint_hosts/store/middleware';
-import { trustedAppsPageMiddlewareFactory } from '../pages/trusted_apps/store/middleware';
 import { eventFiltersPageMiddlewareFactory } from '../pages/event_filters/store/middleware';
 
 type ManagementSubStateKey = keyof State[typeof MANAGEMENT_STORE_GLOBAL_NAMESPACE];
@@ -42,10 +40,7 @@ export const managementMiddlewareFactory: SecuritySubPluginMiddlewareFactory = (
       createSubStateSelector(MANAGEMENT_STORE_ENDPOINTS_NAMESPACE),
       endpointMiddlewareFactory(coreStart, depsStart)
     ),
-    substateMiddlewareFactory(
-      createSubStateSelector(MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE),
-      trustedAppsPageMiddlewareFactory(coreStart, depsStart)
-    ),
+
     substateMiddlewareFactory(
       createSubStateSelector(MANAGEMENT_STORE_EVENT_FILTERS_NAMESPACE),
       eventFiltersPageMiddlewareFactory(coreStart, depsStart)
diff --git a/x-pack/plugins/security_solution/public/management/store/reducer.ts b/x-pack/plugins/security_solution/public/management/store/reducer.ts
index 677114a58d56e..2fd20129ddca8 100644
--- a/x-pack/plugins/security_solution/public/management/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/store/reducer.ts
@@ -13,21 +13,15 @@ import {
 import {
   MANAGEMENT_STORE_ENDPOINTS_NAMESPACE,
   MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE,
-  MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE,
   MANAGEMENT_STORE_EVENT_FILTERS_NAMESPACE,
-  MANAGEMENT_STORE_HOST_ISOLATION_EXCEPTIONS_NAMESPACE,
 } from '../common/constants';
 import { ImmutableCombineReducers } from '../../common/store';
 import { Immutable } from '../../../common/endpoint/types';
 import { ManagementState } from '../types';
 import { endpointListReducer } from '../pages/endpoint_hosts/store/reducer';
-import { initialTrustedAppsPageState } from '../pages/trusted_apps/store/builders';
-import { trustedAppsPageReducer } from '../pages/trusted_apps/store/reducer';
 import { initialEventFiltersPageState } from '../pages/event_filters/store/builders';
 import { eventFiltersPageReducer } from '../pages/event_filters/store/reducer';
 import { initialEndpointPageState } from '../pages/endpoint_hosts/store/builders';
-import { initialHostIsolationExceptionsPageState } from '../pages/host_isolation_exceptions/store/builders';
-import { hostIsolationExceptionsPageReducer } from '../pages/host_isolation_exceptions/store/reducer';
 
 const immutableCombineReducers: ImmutableCombineReducers = combineReducers;
 
@@ -37,9 +31,7 @@ const immutableCombineReducers: ImmutableCombineReducers = combineReducers;
 export const mockManagementState: Immutable<ManagementState> = {
   [MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE]: initialPolicyDetailsState(),
   [MANAGEMENT_STORE_ENDPOINTS_NAMESPACE]: initialEndpointPageState(),
-  [MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE]: initialTrustedAppsPageState(),
   [MANAGEMENT_STORE_EVENT_FILTERS_NAMESPACE]: initialEventFiltersPageState(),
-  [MANAGEMENT_STORE_HOST_ISOLATION_EXCEPTIONS_NAMESPACE]: initialHostIsolationExceptionsPageState(),
 };
 
 /**
@@ -48,7 +40,5 @@ export const mockManagementState: Immutable<ManagementState> = {
 export const managementReducer = immutableCombineReducers({
   [MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE]: policyDetailsReducer,
   [MANAGEMENT_STORE_ENDPOINTS_NAMESPACE]: endpointListReducer,
-  [MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE]: trustedAppsPageReducer,
   [MANAGEMENT_STORE_EVENT_FILTERS_NAMESPACE]: eventFiltersPageReducer,
-  [MANAGEMENT_STORE_HOST_ISOLATION_EXCEPTIONS_NAMESPACE]: hostIsolationExceptionsPageReducer,
 });
diff --git a/x-pack/plugins/security_solution/public/management/types.ts b/x-pack/plugins/security_solution/public/management/types.ts
index 23b356207028a..0ad0f2e757c00 100644
--- a/x-pack/plugins/security_solution/public/management/types.ts
+++ b/x-pack/plugins/security_solution/public/management/types.ts
@@ -9,9 +9,7 @@ import { CombinedState } from 'redux';
 import { SecurityPageName } from '../app/types';
 import { PolicyDetailsState } from './pages/policy/types';
 import { EndpointState } from './pages/endpoint_hosts/types';
-import { TrustedAppsListPageState } from './pages/trusted_apps/state';
 import { EventFiltersListPageState } from './pages/event_filters/types';
-import { HostIsolationExceptionsPageState } from './pages/host_isolation_exceptions/types';
 
 /**
  * The type for the management store global namespace. Used mostly internally to reference
@@ -22,9 +20,7 @@ export type ManagementStoreGlobalNamespace = 'management';
 export type ManagementState = CombinedState<{
   policyDetails: PolicyDetailsState;
   endpoints: EndpointState;
-  trustedApps: TrustedAppsListPageState;
   eventFilters: EventFiltersListPageState;
-  hostIsolationExceptions: HostIsolationExceptionsPageState;
 }>;
 
 /**
diff --git a/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx
index fb24289c52642..be5ed7b88eb69 100644
--- a/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx
@@ -20,7 +20,7 @@ import {
 import { createStore, State } from '../../../common/store';
 import { networkModel } from '../../store';
 
-import { IpOverview } from './index';
+import { IpOverview } from '.';
 import { mockData } from './mock';
 import { mockAnomalies } from '../../../common/components/ml/mock';
 import { NarrowDateRange } from '../../../common/components/ml/types';
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts b/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts
index db6acd6d2a3bb..7067407e8a01f 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts
@@ -7,7 +7,7 @@
 
 import { IndexPatternMapping } from '../types';
 import { IndexPatternSavedObject } from '../../../../common/hooks/types';
-import { LAYER_TYPE } from '../../../../../../maps/common';
+import { LAYER_TYPE } from '@kbn/maps-plugin/common';
 
 export const mockIndexPatternIds: IndexPatternMapping[] = [
   { title: 'filebeat-*', id: '8c7323ac-97ad-4b53-ac0a-40f8f691a918' },
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx
index 083f858dc7742..f3b6a394db0ff 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx
@@ -12,10 +12,9 @@ import { createPortalNode, InPortal } from 'react-reverse-portal';
 import styled, { css } from 'styled-components';
 
 import type { Filter, Query } from '@kbn/es-query';
-import {
-  ErrorEmbeddable,
-  isErrorEmbeddable,
-} from '../../../../../../../src/plugins/embeddable/public';
+import { ErrorEmbeddable, isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { MapEmbeddable } from '@kbn/maps-plugin/public/embeddable';
 import { Loader } from '../../../common/components/loader';
 import { displayErrorToast, useStateToaster } from '../../../common/components/toasters';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
@@ -24,8 +23,6 @@ import { createEmbeddable } from './embedded_map_helpers';
 import { IndexPatternsMissingPrompt } from './index_patterns_missing_prompt';
 import { MapToolTip } from './map_tool_tip/map_tool_tip';
 import * as i18n from './translations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { MapEmbeddable } from '../../../../../../plugins/maps/public/embeddable';
 import { useKibana } from '../../../common/lib/kibana';
 import { getLayerList } from './map_config';
 import { sourcererSelectors } from '../../../common/store/sourcerer';
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx
index 613a6ce4c00da..b7e27b2422451 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { embeddablePluginMock } from '../../../../../../../src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { createEmbeddable, findMatchingIndexPatterns } from './embedded_map_helpers';
 import { createPortalNode } from 'react-reverse-portal';
 import {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx
index 3789c41f23a78..8a68ea87682e2 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx
@@ -10,23 +10,23 @@ import React from 'react';
 import { OutPortal, PortalNode } from 'react-reverse-portal';
 import minimatch from 'minimatch';
 import type { Filter, Query } from '@kbn/es-query';
-import { IndexPatternMapping } from './types';
-import { getLayerList } from './map_config';
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../maps/public';
+import { MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/public';
 import type {
   RenderTooltipContentParams,
   MapEmbeddable,
   MapEmbeddableInput,
-} from '../../../../../../plugins/maps/public';
-import * as i18n from './translations';
-
+} from '@kbn/maps-plugin/public';
 import {
   EmbeddableStart,
   isErrorEmbeddable,
   EmbeddableOutput,
   ViewMode,
   ErrorEmbeddable,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { IndexPatternMapping } from './types';
+import { getLayerList } from './map_config';
+import * as i18n from './translations';
+
 import { IndexPatternSavedObject } from '../../../common/hooks/types';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts b/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts
index 348dd996b64c2..757c5391e6f3a 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts
@@ -7,6 +7,7 @@
 
 import uuid from 'uuid';
 import { euiPaletteColorBlind } from '@elastic/eui';
+import { LAYER_TYPE, SCALING_TYPES, SOURCE_TYPES } from '@kbn/maps-plugin/common';
 import {
   IndexPatternMapping,
   LayerMapping,
@@ -14,7 +15,6 @@ import {
   LayerMappingDetails,
 } from './types';
 import * as i18n from './translations';
-import { LAYER_TYPE, SCALING_TYPES, SOURCE_TYPES } from '../../../../../maps/common';
 const euiVisColorPalette = euiPaletteColorBlind();
 
 // Update field mappings to modify what fields will be returned to map tooltip
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
index 951434f21cc8b..b74d8a86bfea6 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
@@ -19,7 +19,7 @@ import {
 import {
   ITooltipProperty,
   TooltipProperty,
-} from '../../../../../../maps/public/classes/tooltips/tooltip_property';
+} from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 
 describe('LineToolTipContent', () => {
   const mockFeatureProps: ITooltipProperty[] = [
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
index 134fd0b90cb78..c344c6e0c4317 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
@@ -8,6 +8,8 @@
 import React from 'react';
 import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import styled from 'styled-components';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ITooltipProperty } from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { SourceDestinationArrows } from '../../source_destination/source_destination_arrows';
 import {
   SUM_OF_CLIENT_BYTES,
@@ -17,8 +19,6 @@ import {
 } from '../map_config';
 
 import * as i18n from '../translations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ITooltipProperty } from '../../../../../../maps/public/classes/tooltips/tooltip_property';
 
 const FlowBadge = styled(EuiBadge)`
   height: 45px;
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
index 7d5e34df8c8fc..611690b1d1a79 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 import '../../../../common/mock/match_media';
 import { MapToolTipComponent } from './map_tool_tip';
-import { TooltipFeature } from '../../../../../../maps/common';
+import { TooltipFeature } from '@kbn/maps-plugin/common';
 
 describe('MapToolTip', () => {
   test('placeholder component renders correctly against snapshot', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx
index 665ea0e885439..39960df0f1c17 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx
@@ -13,14 +13,14 @@ import {
   EuiOutsideClickDetector,
 } from '@elastic/eui';
 import { Geometry } from 'geojson';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ITooltipProperty } from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { MapToolTipProps } from '../types';
 import { ToolTipFooter } from './tooltip_footer';
 import { LineToolTipContent } from './line_tool_tip_content';
 import { PointToolTipContent } from './point_tool_tip_content';
 import { Loader } from '../../../../common/components/loader';
 import * as i18n from '../translations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ITooltipProperty } from '../../../../../../maps/public/classes/tooltips/tooltip_property';
 
 export const MapToolTipComponent = ({
   closeTooltip,
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
index 7b3f9e956c765..b75b5075e33ff 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
@@ -16,7 +16,7 @@ import { HostDetailsLink, NetworkDetailsLink } from '../../../../common/componen
 import {
   TooltipProperty,
   ITooltipProperty,
-} from '../../../../../../maps/public/classes/tooltips/tooltip_property';
+} from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { FlowTarget } from '../../../../../common/search_strategy';
 
 describe('PointToolTipContent', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
index 0fa59c6fd9e42..6483cd2ab30f3 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
@@ -6,6 +6,8 @@
  */
 
 import React, { useMemo } from 'react';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ITooltipProperty } from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { sourceDestinationFieldMappings } from '../map_config';
 import {
   getEmptyTagValue,
@@ -14,8 +16,6 @@ import {
 import { DescriptionListStyled } from '../../../../common/components/page';
 import { HostDetailsLink, NetworkDetailsLink } from '../../../../common/components/links';
 import { DefaultFieldRenderer } from '../../../../timelines/components/field_renderers/field_renderers';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ITooltipProperty } from '../../../../../../maps/public/classes/tooltips/tooltip_property';
 import { FlowTarget } from '../../../../../common/search_strategy';
 
 interface PointToolTipContentProps {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts b/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts
index 6317cad7f8d98..c6e32210f7835 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RenderTooltipContentParams } from '../../../../../maps/public';
+import type { RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 
 export interface IndexPatternMapping {
   title: string;
diff --git a/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx
index 8794d48b5aa13..8a964d53c9123 100644
--- a/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx
@@ -11,7 +11,7 @@ import { MemoryRouter } from 'react-router-dom';
 
 import '../../../common/mock/match_media';
 import { TestProviders } from '../../../common/mock';
-import { FlowTargetSelectConnectedComponent } from './index';
+import { FlowTargetSelectConnectedComponent } from '.';
 import { FlowTarget } from '../../../../common/search_strategy';
 
 describe('Flow Target Select Connected', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx
index d5dee1b84f8d7..e055154728e85 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiDns } from './index';
+import { NetworkKpiDns } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/dns');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx
index 87f1a173740f3..4b27cff48ac4e 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiNetworkEvents } from './index';
+import { NetworkKpiNetworkEvents } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/network_events');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx
index 28bf73eb6b2d6..3af02cb1d17cb 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiTlsHandshakes } from './index';
+import { NetworkKpiTlsHandshakes } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/tls_handshakes');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx
index c1a28bdc28692..5f5da4e3c1ba1 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiUniqueFlows } from './index';
+import { NetworkKpiUniqueFlows } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/unique_flows');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx
index 25807f3dc2cad..03ad5b9ee6e3c 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiUniquePrivateIps } from './index';
+import { NetworkKpiUniquePrivateIps } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/unique_private_ips');
diff --git a/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
index bb8b4683c9d30..ee35ebb74767f 100644
--- a/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
@@ -24,7 +24,7 @@ import {
   DESTINATION_PACKETS_FIELD_NAME,
   SOURCE_BYTES_FIELD_NAME,
   SOURCE_PACKETS_FIELD_NAME,
-} from '../source_destination/source_destination_arrows';
+} from './source_destination_arrows';
 import * as i18n from '../../../timelines/components/timeline/body/renderers/translations';
 
 import { SourceDestination } from '.';
diff --git a/x-pack/plugins/security_solution/public/network/containers/details/index.tsx b/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
index b86ff666bec7c..cadc0e0000e6a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useKibana } from '../../../common/lib/kibana';
@@ -20,7 +21,6 @@ import {
   NetworkDetailsRequestOptions,
   NetworkDetailsStrategyResponse,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx
index 44b8472a0606c..1c84df8b6e57a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiDns } from './index';
+import { useNetworkKpiDns } from '.';
 
 describe('kpi network - dns', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
index 9e6cf9f620287..03f7e589b1953 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx
index 4171a86fae9cc..4c82590b1b0c4 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiNetworkEvents } from './index';
+import { useNetworkKpiNetworkEvents } from '.';
 
 describe('kpi network - network events', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
index b5c8058f5035c..3d8168c0beb89 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx
index bad0e6ad71512..b431a55d05741 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiTlsHandshakes } from './index';
+import { useNetworkKpiTlsHandshakes } from '.';
 
 describe('kpi network - tls handshakes', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
index b5e1eaa401a46..644dd5f71e4b2 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx
index 83cb2a40aabce..037db82c2d660 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiUniqueFlows } from './index';
+import { useNetworkKpiUniqueFlows } from '.';
 
 describe('kpi network - unique flows', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
index 130efc8d755a6..f348ddabf8c6a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx
index 370c4e671e886..30653ce2e638c 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiUniquePrivateIps } from './index';
+import { useNetworkKpiUniquePrivateIps } from '.';
 
 describe('kpi network - unique private ips', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
index fafd38cf15f73..bcd573d85b9d8 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -23,10 +24,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx
index f303cdf85a5f8..7c0655cddf2fd 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkDns } from './index';
+import { useNetworkDns } from '.';
 import { NetworkType } from '../../store/model';
 
 describe('useNetworkDns', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
index 86949777dd535..e052a1b5cbe5a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -26,7 +27,6 @@ import {
   NetworkDnsEdges,
   PageInfoPaginated,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx
index b687896efcea4..19a40f1b14cb7 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkHttp } from './index';
+import { useNetworkHttp } from '.';
 import { NetworkType } from '../../store/model';
 
 describe('useNetworkHttp', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
index eba2b22f30e29..e75f1aaa91f40 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -25,7 +26,6 @@ import {
   NetworkHttpStrategyResponse,
   SortField,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { InspectResponse } from '../../../types';
 import { getInspectResponse } from '../../../helpers';
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx
index fe7507c85567a..2e485454a4300 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkTopCountries } from './index';
+import { useNetworkTopCountries } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTargetSourceDest } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
index 4bb8f62b10a87..3b3aa6778876a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -25,7 +26,6 @@ import {
   NetworkTopCountriesStrategyResponse,
   PageInfoPaginated,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx
index c31dec3ce0aed..a58e6fecd2091 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkTopNFlow } from './index';
+import { useNetworkTopNFlow } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTargetSourceDest } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
index 26d2f7a9d1df5..89eb4d006bc73 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -25,7 +26,6 @@ import {
   NetworkTopNFlowStrategyResponse,
   PageInfoPaginated,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx
index 6b236d4ddfb20..342f6f1174a70 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkTls } from './index';
+import { useNetworkTls } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTargetSourceDest } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
index ed771455446c0..00b539faf4d3b 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -22,7 +23,6 @@ import {
   NetworkTlsRequestOptions,
   NetworkTlsStrategyResponse,
 } from '../../../../common/search_strategy/security_solution/network';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
diff --git a/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx
index 4a6c1fac4191c..b7eb0835071f3 100644
--- a/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkUsers } from './index';
+import { useNetworkUsers } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTarget } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/users/index.tsx b/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
index 9ad2c59f6bb79..e56cd466e5eb2 100644
--- a/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
@@ -24,7 +25,6 @@ import {
   NetworkUsersRequestOptions,
   NetworkUsersStrategyResponse,
 } from '../../../../common/search_strategy/security_solution/network';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/network/index.ts b/x-pack/plugins/security_solution/public/network/index.ts
index f34ebcc6e33b9..882921ba9f657 100644
--- a/x-pack/plugins/security_solution/public/network/index.ts
+++ b/x-pack/plugins/security_solution/public/network/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { SecuritySubPluginWithStore } from '../app/types';
 import { routes } from './routes';
 import { initialNetworkState, networkReducer, NetworkState } from './store';
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx b/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
index 7d8389d95f33e..237c25ffcc1d9 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
@@ -20,7 +20,7 @@ import {
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { createStore, State } from '../../../common/store';
-import { NetworkDetails } from './index';
+import { NetworkDetails } from '.';
 import { FlowTarget } from '../../../../common/search_strategy';
 
 jest.mock('@elastic/eui', () => {
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/index.tsx b/x-pack/plugins/security_solution/public/network/pages/details/index.tsx
index f8aa0a5d85730..e01ab13722bf2 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/details/index.tsx
@@ -10,6 +10,7 @@ import React, { useCallback, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import {
   FlowTarget,
@@ -33,7 +34,7 @@ import { useNetworkDetails, ID } from '../../containers/details';
 import { useKibana } from '../../../common/lib/kibana';
 import { decodeIpv6 } from '../../../common/lib/helpers';
 import { convertToBuildEsQuery } from '../../../common/lib/keury';
-import { ConditionalFlexGroup } from '../../pages/navigation/conditional_flex_group';
+import { ConditionalFlexGroup } from '../navigation/conditional_flex_group';
 import { inputsSelectors } from '../../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { setNetworkDetailsTablesActivePageToZero } from '../../store/actions';
@@ -44,7 +45,6 @@ import { NetworkTopNFlowQueryTable } from './network_top_n_flow_query_table';
 import { TlsQueryTable } from './tls_query_table';
 import { UsersQueryTable } from './users_query_table';
 import { AnomaliesQueryTabBody } from '../../../common/containers/anomalies/anomalies_query_tab_body';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { networkModel } from '../../store';
 import { SecurityPageName } from '../../../app/types';
 import { useSourcererDataView } from '../../../common/containers/sourcerer';
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/utils.ts b/x-pack/plugins/security_solution/public/network/pages/details/utils.ts
index 7bcf79ba4b434..98094665cbcd2 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/utils.ts
+++ b/x-pack/plugins/security_solution/public/network/pages/details/utils.ts
@@ -7,7 +7,7 @@
 
 import { get, isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { decodeIpv6 } from '../../../common/lib/helpers';
 import { getNetworkDetailsUrl } from '../../../common/components/link_to/redirect_to_network';
 import { networkModel } from '../../store';
diff --git a/x-pack/plugins/security_solution/public/network/pages/network.test.tsx b/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
index bf300569d6e23..a52c4e1560893 100644
--- a/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
@@ -24,7 +24,7 @@ import { inputsActions } from '../../common/store/inputs';
 
 import { Network } from './network';
 import { NetworkRoutes } from './navigation';
-import { mockCasesContract } from '../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 jest.mock('../../common/containers/sourcerer');
diff --git a/x-pack/plugins/security_solution/public/network/pages/network.tsx b/x-pack/plugins/security_solution/public/network/pages/network.tsx
index 634a96b0e74df..fffb202959182 100644
--- a/x-pack/plugins/security_solution/public/network/pages/network.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/network.tsx
@@ -12,8 +12,8 @@ import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import styled from 'styled-components';
 
-import { isTab } from '../../../../timelines/public';
-import { getEsQueryConfig } from '../../../../../../src/plugins/data/common';
+import { isTab } from '@kbn/timelines-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../app/types';
 import { UpdateDateRange } from '../../common/components/charts/common';
 import { EmbeddedMap } from '../components/embeddables/embedded_map';
diff --git a/x-pack/plugins/security_solution/public/network/routes.tsx b/x-pack/plugins/security_solution/public/network/routes.tsx
index 32fbe96a21caa..21e018c959234 100644
--- a/x-pack/plugins/security_solution/public/network/routes.tsx
+++ b/x-pack/plugins/security_solution/public/network/routes.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { NetworkContainer } from './pages';
 
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
 import { NETWORK_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx
index 3402a7bef4905..21f1e2bbf25cf 100644
--- a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx
@@ -15,7 +15,7 @@ import { waitFor } from '@testing-library/react';
 import { mockIndexPattern, TestProviders } from '../../../common/mock';
 
 import { AlertsByCategory } from '.';
-import { mockCasesContext } from '../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 import { useRouteSpy } from '../../../common/utils/route/use_route_spy';
 
 jest.mock('../../../common/components/link_to');
diff --git a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
index da01092ed1409..5d8e1ab5fa7dc 100644
--- a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
@@ -12,12 +12,12 @@ import styled from 'styled-components';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
 import { EuiButton } from '@elastic/eui';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { DEFAULT_NUMBER_FORMAT, APP_UI_ID } from '../../../../common/constants';
 import { SHOWING, UNIT } from '../../../common/components/alerts_viewer/translations';
 import { MatrixHistogram } from '../../../common/components/matrix_histogram';
 import { useKibana, useUiSetting$ } from '../../../common/lib/kibana';
 import { convertToBuildEsQuery } from '../../../common/lib/keury';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { HostsTableType } from '../../../hosts/store/model';
 
 import * as i18n from '../../pages/translations';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alerts_by_status.test.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alerts_by_status.test.tsx
new file mode 100644
index 0000000000000..4c8280f90304d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alerts_by_status.test.tsx
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { render } from '@testing-library/react';
+import { AlertsByStatus } from './alerts_by_status';
+import { parsedMockAlertsData } from './mock_data';
+import { useKibana } from '../../../../common/lib/kibana/kibana_react';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
+import { CASES_FEATURE_ID } from '../../../../../common/constants';
+import { TestProviders } from '../../../../common/mock/test_providers';
+import { useAlertsByStatus } from './use_alerts_by_status';
+
+jest.mock('../../../../common/lib/kibana/kibana_react');
+
+jest.mock('./chart_label', () => {
+  return {
+    ChartLabel: jest.fn((props) => <span data-test-subj="chart-label" {...props} />),
+  };
+});
+jest.mock('./use_alerts_by_status', () => ({
+  useAlertsByStatus: jest.fn().mockReturnValue({
+    items: [],
+    isLoading: true,
+  }),
+}));
+describe('AlertsByStatus', () => {
+  const mockCases = mockCasesContract();
+
+  const props = {
+    showInspectButton: true,
+    signalIndexName: 'mock-signal-index',
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useKibana as jest.Mock).mockReturnValue({
+      services: {
+        cases: mockCases,
+        application: {
+          capabilities: { [CASES_FEATURE_ID]: { crud_cases: true, read_cases: true } },
+          getUrlForApp: jest.fn(),
+        },
+        theme: {},
+      },
+    });
+    (useAlertsByStatus as jest.Mock).mockReturnValue({
+      items: [],
+      isLoading: true,
+    });
+  });
+
+  test('render HoverVisibilityContainer', () => {
+    const { container } = render(
+      <TestProviders>
+        <AlertsByStatus {...props} />
+      </TestProviders>
+    );
+    expect(
+      container.querySelector(`[data-test-subj="hoverVisibilityContainer"]`)
+    ).toBeInTheDocument();
+  });
+  test('render HistogramPanel', () => {
+    const { container } = render(
+      <TestProviders>
+        <AlertsByStatus {...props} />
+      </TestProviders>
+    );
+    expect(
+      container.querySelector(`[data-test-subj="detection-response-alerts-by-status-panel"]`)
+    ).toBeInTheDocument();
+  });
+
+  test('render HeaderSection', () => {
+    const { container } = render(
+      <TestProviders>
+        <AlertsByStatus {...props} />
+      </TestProviders>
+    );
+    expect(container.querySelector(`[data-test-subj="header-section"]`)).toBeInTheDocument();
+  });
+
+  test('render Legend', () => {
+    const testProps = {
+      ...props,
+      isInitialLoading: false,
+    };
+    (useAlertsByStatus as jest.Mock).mockReturnValue({
+      items: parsedMockAlertsData,
+      isLoading: false,
+    });
+
+    const { container } = render(
+      <TestProviders>
+        <AlertsByStatus {...testProps} />
+      </TestProviders>
+    );
+    expect(container.querySelector(`[data-test-subj="legend"]`)).toBeInTheDocument();
+  });
+
+  test('render toggle query button', () => {
+    const testProps = {
+      ...props,
+      isInitialLoading: false,
+    };
+
+    (useAlertsByStatus as jest.Mock).mockReturnValue({
+      items: parsedMockAlertsData,
+      isLoading: false,
+    });
+
+    const { container } = render(
+      <TestProviders>
+        <AlertsByStatus {...testProps} />
+      </TestProviders>
+    );
+    expect(container.querySelector(`[data-test-subj="query-toggle-header"]`)).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alerts_by_status.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alerts_by_status.tsx
new file mode 100644
index 0000000000000..963b12a35dbf0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alerts_by_status.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiProgress, EuiSpacer, EuiText } from '@elastic/eui';
+import React, { useCallback, useMemo } from 'react';
+import { ShapeTreeNode } from '@elastic/charts';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import styled from 'styled-components';
+import { DonutChart, FillColor } from '../../../../common/components/charts/donutchart';
+import { SecurityPageName } from '../../../../../common/constants';
+import { useNavigation } from '../../../../common/lib/kibana';
+import { HeaderSection } from '../../../../common/components/header_section';
+import { HoverVisibilityContainer } from '../../../../common/components/hover_visibility_container';
+import { BUTTON_CLASS as INPECT_BUTTON_CLASS } from '../../../../common/components/inspect';
+import { LegendItem } from '../../../../common/components/charts/legend_item';
+import { useAlertsByStatus } from './use_alerts_by_status';
+import {
+  ALERTS,
+  ALERTS_TITLE,
+  STATUS_ACKNOWLEDGED,
+  STATUS_CLOSED,
+  STATUS_CRITICAL_LABEL,
+  STATUS_HIGH_LABEL,
+  STATUS_LOW_LABEL,
+  STATUS_MEDIUM_LABEL,
+  STATUS_OPEN,
+} from '../translations';
+import { useQueryToggle } from '../../../../common/containers/query_toggle';
+import { getDetectionEngineUrl, useFormatUrl } from '../../../../common/components/link_to';
+import { VIEW_ALERTS } from '../../../pages/translations';
+import { LastUpdatedAt, SEVERITY_COLOR } from '../utils';
+import { FormattedCount } from '../../../../common/components/formatted_number';
+import { ChartLabel } from './chart_label';
+import { Legend } from '../../../../common/components/charts/legend';
+import { emptyDonutColor } from '../../../../common/components/charts/donutchart_empty';
+import { LinkButton } from '../../../../common/components/links';
+
+const donutHeight = 120;
+const StyledFlexItem = styled(EuiFlexItem)`
+  padding: 0 4px;
+`;
+
+const StyledLegendFlexItem = styled(EuiFlexItem)`
+  padding-left: 32px;
+  padding-top: 45px;
+`;
+
+interface AlertsByStatusProps {
+  signalIndexName: string | null;
+}
+
+const legendField = 'kibana.alert.severity';
+const chartConfigs: Array<{ key: Severity; label: string; color: string }> = [
+  { key: 'critical', label: STATUS_CRITICAL_LABEL, color: SEVERITY_COLOR.critical },
+  { key: 'high', label: STATUS_HIGH_LABEL, color: SEVERITY_COLOR.high },
+  { key: 'medium', label: STATUS_MEDIUM_LABEL, color: SEVERITY_COLOR.medium },
+  { key: 'low', label: STATUS_LOW_LABEL, color: SEVERITY_COLOR.low },
+];
+const DETECTION_RESPONSE_ALERTS_BY_STATUS_ID = 'detection-response-alerts-by-status';
+
+export const AlertsByStatus = ({ signalIndexName }: AlertsByStatusProps) => {
+  const { toggleStatus, setToggleStatus } = useQueryToggle(DETECTION_RESPONSE_ALERTS_BY_STATUS_ID);
+  const { formatUrl, search: urlSearch } = useFormatUrl(SecurityPageName.alerts);
+  const { navigateTo } = useNavigation();
+  const goToAlerts = useCallback(
+    (ev) => {
+      ev.preventDefault();
+      navigateTo({
+        deepLinkId: SecurityPageName.alerts,
+        path: getDetectionEngineUrl(urlSearch),
+      });
+    },
+    [navigateTo, urlSearch]
+  );
+
+  const detailsButtonOptions = useMemo(
+    () => ({
+      name: VIEW_ALERTS,
+      href: formatUrl(getDetectionEngineUrl()),
+      onClick: goToAlerts,
+    }),
+    [formatUrl, goToAlerts]
+  );
+
+  const {
+    items: donutData,
+    isLoading: loading,
+    updatedAt,
+  } = useAlertsByStatus({
+    signalIndexName,
+    queryId: DETECTION_RESPONSE_ALERTS_BY_STATUS_ID,
+    skip: !toggleStatus,
+  });
+  const legendItems: LegendItem[] = useMemo(
+    () =>
+      chartConfigs.map((d) => ({
+        color: d.color,
+        field: legendField,
+        value: d.label,
+      })),
+    []
+  );
+
+  const totalAlerts =
+    loading || donutData == null
+      ? 0
+      : (donutData?.open?.total ?? 0) +
+        (donutData?.acknowledged?.total ?? 0) +
+        (donutData?.closed?.total ?? 0);
+
+  const fillColor: FillColor = useCallback((d: ShapeTreeNode) => {
+    return chartConfigs.find((cfg) => cfg.label === d.dataName)?.color ?? emptyDonutColor;
+  }, []);
+
+  return (
+    <>
+      <HoverVisibilityContainer show={true} targetClassNames={[INPECT_BUTTON_CLASS]}>
+        <EuiPanel hasBorder data-test-subj={`${DETECTION_RESPONSE_ALERTS_BY_STATUS_ID}-panel`}>
+          {loading && (
+            <EuiProgress
+              data-test-subj="initialLoadingPanelMatrixOverTime"
+              size="xs"
+              position="absolute"
+              color="accent"
+            />
+          )}
+          <HeaderSection
+            id={DETECTION_RESPONSE_ALERTS_BY_STATUS_ID}
+            title={ALERTS_TITLE}
+            subtitle={<LastUpdatedAt isUpdating={loading} updatedAt={updatedAt} />}
+            inspectMultiple
+            toggleStatus={toggleStatus}
+            toggleQuery={setToggleStatus}
+          >
+            <EuiFlexGroup alignItems="center" gutterSize="none">
+              <EuiFlexItem grow={false}>
+                <LinkButton
+                  data-test-subj="view-details-button"
+                  onClick={detailsButtonOptions.onClick}
+                  href={detailsButtonOptions.href}
+                >
+                  {detailsButtonOptions.name}
+                </LinkButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </HeaderSection>
+          {toggleStatus && (
+            <>
+              <EuiFlexGroup justifyContent="center" gutterSize="none">
+                <EuiFlexItem grow={false}>
+                  <EuiText className="eui-textCenter" size="s">
+                    {loading ? (
+                      <EuiSpacer size="l" />
+                    ) : (
+                      <>
+                        <b>
+                          <FormattedCount count={totalAlerts} />
+                        </b>
+                        <> </>
+                        <small>{ALERTS(totalAlerts)}</small>
+                      </>
+                    )}
+                  </EuiText>
+
+                  <EuiSpacer size="l" />
+                  <EuiFlexGroup justifyContent="center">
+                    <StyledFlexItem key="alerts-status-open" grow={false}>
+                      <DonutChart
+                        data={donutData?.open?.severities}
+                        fillColor={fillColor}
+                        height={donutHeight}
+                        label={STATUS_OPEN}
+                        title={<ChartLabel count={donutData?.open?.total ?? 0} />}
+                        totalCount={donutData?.open?.total ?? 0}
+                      />
+                    </StyledFlexItem>
+                    <StyledFlexItem key="alerts-status-acknowledged" grow={false}>
+                      <DonutChart
+                        data={donutData?.acknowledged?.severities}
+                        fillColor={fillColor}
+                        height={donutHeight}
+                        label={STATUS_ACKNOWLEDGED}
+                        title={<ChartLabel count={donutData?.acknowledged?.total ?? 0} />}
+                        totalCount={donutData?.acknowledged?.total ?? 0}
+                      />
+                    </StyledFlexItem>
+                    <StyledFlexItem key="alerts-status-closed" grow={false}>
+                      <DonutChart
+                        data={donutData?.closed?.severities}
+                        fillColor={fillColor}
+                        height={donutHeight}
+                        label={STATUS_CLOSED}
+                        title={<ChartLabel count={donutData?.closed?.total ?? 0} />}
+                        totalCount={donutData?.closed?.total ?? 0}
+                      />
+                    </StyledFlexItem>
+                  </EuiFlexGroup>
+                </EuiFlexItem>
+                <StyledLegendFlexItem grow={false}>
+                  {legendItems.length > 0 && <Legend legendItems={legendItems} />}
+                </StyledLegendFlexItem>
+              </EuiFlexGroup>
+              <EuiSpacer size="m" />
+            </>
+          )}
+        </EuiPanel>
+      </HoverVisibilityContainer>
+    </>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/chart_label.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/chart_label.tsx
new file mode 100644
index 0000000000000..ad609102409d2
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/chart_label.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import styled from 'styled-components';
+import { FormattedCount } from '../../../../common/components/formatted_number';
+
+interface ChartLabelProps {
+  count: number | null | undefined;
+}
+
+const PlaceHolder = styled.div`
+  padding: ${(props) => props.theme.eui.paddingSizes.s};
+`;
+
+const ChartLabelComponent: React.FC<ChartLabelProps> = ({ count }) => {
+  return count != null ? (
+    <b>
+      <FormattedCount count={count} />
+    </b>
+  ) : (
+    <PlaceHolder />
+  );
+};
+
+ChartLabelComponent.displayName = 'ChartLabelComponent';
+export const ChartLabel = React.memo(ChartLabelComponent);
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/index.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/index.ts
new file mode 100644
index 0000000000000..257e690ba72e5
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { AlertsByStatus } from './alerts_by_status';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/mock_data.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/mock_data.ts
new file mode 100644
index 0000000000000..f8aff3bdc87ac
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/mock_data.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { AlertsByStatusResponse, AlertsByStatusAgg, ParsedAlertsData } from './types';
+
+export const from = '2022-04-05T12:00:00.000Z';
+export const to = '2022-04-08T12:00:00.000Z';
+
+export const mockAlertsData: AlertsByStatusResponse<[], AlertsByStatusAgg> = {
+  took: 4,
+  _shards: {
+    total: 1,
+    successful: 1,
+    skipped: 0,
+    failed: 0,
+  },
+  hits: {
+    total: {
+      value: 10000,
+      relation: 'gte',
+    },
+    hits: [],
+  },
+  aggregations: {
+    alertsByStatus: {
+      doc_count_error_upper_bound: 0,
+      sum_other_doc_count: 0,
+      buckets: [
+        {
+          key: 'open',
+          doc_count: 28149,
+          statusBySeverity: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 22717,
+              },
+              {
+                key: 'high',
+                doc_count: 5027,
+              },
+              {
+                key: 'medium',
+                doc_count: 405,
+              },
+            ],
+          },
+        },
+        {
+          key: 'closed',
+          doc_count: 4,
+          statusBySeverity: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 4,
+              },
+              {
+                key: 'low',
+                doc_count: 0,
+              },
+            ],
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const parsedMockAlertsData: ParsedAlertsData = {
+  open: {
+    total: 28149,
+    severities: [
+      {
+        key: 'low',
+        label: 'Low',
+        value: 22717,
+      },
+      {
+        key: 'high',
+        label: 'High',
+        value: 5027,
+      },
+      {
+        key: 'medium',
+        label: 'Medium',
+        value: 405,
+      },
+    ],
+  },
+  closed: {
+    total: 4,
+    severities: [
+      {
+        key: 'high',
+        label: 'High',
+        value: 4,
+      },
+      {
+        key: 'low',
+        label: 'Low',
+        value: 0,
+      },
+    ],
+  },
+};
+
+export const alertsByStatusQuery = {
+  size: 0,
+  query: {
+    bool: {
+      filter: [{ range: { '@timestamp': { gte: from, lte: to } } }],
+    },
+  },
+  aggs: {
+    alertsByStatus: {
+      terms: {
+        field: 'kibana.alert.workflow_status',
+      },
+      aggs: {
+        statusBySeverity: {
+          terms: {
+            field: 'kibana.alert.severity',
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/types.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/types.ts
new file mode 100644
index 0000000000000..523edf91775fe
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/types.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
+
+interface StatusBySeverity {
+  doc_count_error_upper_bound: number;
+  sum_other_doc_count: number;
+  buckets: SeverityBucket[];
+}
+
+interface StatusBucket {
+  key: Status;
+  doc_count: number;
+  statusBySeverity?: StatusBySeverity;
+}
+
+interface SeverityBucket {
+  key: Severity;
+  doc_count: number;
+}
+
+export interface AlertsByStatusAgg {
+  alertsByStatus: {
+    doc_count_error_upper_bound: number;
+    sum_other_doc_count: number;
+    buckets: StatusBucket[];
+  };
+}
+
+export interface AlertsByStatusResponse<Hit = {}, Aggregations = {} | undefined> {
+  took: number;
+  _shards: {
+    total: number;
+    successful: number;
+    skipped: number;
+    failed: number;
+  };
+  aggregations?: Aggregations;
+  hits: {
+    total: {
+      value: number;
+      relation: string;
+    };
+    hits: Hit[];
+  };
+}
+
+export interface SeverityBuckets {
+  key: Severity;
+  value: number;
+  label?: string;
+}
+export type ParsedAlertsData = Partial<
+  Record<Status, { total: number; severities: SeverityBuckets[] }>
+> | null;
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/use_alerts_by_status.test.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/use_alerts_by_status.test.tsx
new file mode 100644
index 0000000000000..68ee64370b26d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/use_alerts_by_status.test.tsx
@@ -0,0 +1,131 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+import { TestProviders } from '../../../../common/mock';
+import { from, mockAlertsData, alertsByStatusQuery, parsedMockAlertsData, to } from './mock_data';
+import {
+  useAlertsByStatus,
+  UseAlertsByStatus,
+  UseAlertsByStatusProps,
+} from './use_alerts_by_status';
+
+const dateNow = new Date('2022-04-08T12:00:00.000Z').valueOf();
+const mockDateNow = jest.fn().mockReturnValue(dateNow);
+Date.now = jest.fn(() => mockDateNow()) as unknown as DateConstructor['now'];
+
+const defaultUseQueryAlertsReturn = {
+  loading: false,
+  data: null,
+  setQuery: () => {},
+  response: '',
+  request: '',
+  refetch: () => {},
+};
+const mockUseQueryAlerts = jest.fn().mockReturnValue(defaultUseQueryAlertsReturn);
+jest.mock('../../../../detections/containers/detection_engine/alerts/use_query', () => {
+  return {
+    useQueryAlerts: (...props: unknown[]) => mockUseQueryAlerts(...props),
+  };
+});
+
+const mockUseGlobalTime = jest
+  .fn()
+  .mockReturnValue({ from, to, setQuery: jest.fn(), deleteQuery: jest.fn() });
+jest.mock('../../../../common/containers/use_global_time', () => {
+  return {
+    useGlobalTime: (...props: unknown[]) => mockUseGlobalTime(...props),
+  };
+});
+
+// helper function to render the hook
+const renderUseAlertsByStatus = (props: Partial<UseAlertsByStatusProps> = {}) =>
+  renderHook<UseAlertsByStatusProps, ReturnType<UseAlertsByStatus>>(
+    () =>
+      useAlertsByStatus({
+        queryId: 'test',
+        signalIndexName: 'signal-alerts',
+        ...props,
+      }),
+    {
+      wrapper: TestProviders,
+    }
+  );
+
+describe('useAlertsByStatus', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockDateNow.mockReturnValue(dateNow);
+    mockUseQueryAlerts.mockReturnValue(defaultUseQueryAlertsReturn);
+  });
+
+  it('should return default values', () => {
+    const { result } = renderUseAlertsByStatus();
+
+    expect(result.current).toEqual({
+      items: null,
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+    expect(mockUseQueryAlerts).toBeCalledWith({
+      query: alertsByStatusQuery,
+      indexName: 'signal-alerts',
+      skip: false,
+    });
+  });
+
+  it('should return parsed items', () => {
+    mockUseQueryAlerts.mockReturnValue({
+      ...defaultUseQueryAlertsReturn,
+      data: mockAlertsData,
+    });
+
+    const { result } = renderUseAlertsByStatus();
+
+    expect(result.current).toEqual({
+      items: parsedMockAlertsData,
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+  });
+
+  it('should return new updatedAt', () => {
+    const newDateNow = new Date('2022-04-08T14:00:00.000Z').valueOf();
+    mockDateNow.mockReturnValue(newDateNow); // setUpdatedAt call
+    mockDateNow.mockReturnValueOnce(dateNow); // initialization call
+
+    mockUseQueryAlerts.mockReturnValue({
+      ...defaultUseQueryAlertsReturn,
+      data: mockAlertsData,
+    });
+
+    const { result } = renderUseAlertsByStatus();
+
+    expect(mockDateNow).toHaveBeenCalled();
+    expect(result.current).toEqual({
+      items: parsedMockAlertsData,
+      isLoading: false,
+      updatedAt: newDateNow,
+    });
+  });
+
+  it('should skip the query', () => {
+    const { result } = renderUseAlertsByStatus({ skip: true });
+
+    expect(mockUseQueryAlerts).toBeCalledWith({
+      query: alertsByStatusQuery,
+      indexName: 'signal-alerts',
+      skip: true,
+    });
+
+    expect(result.current).toEqual({
+      items: null,
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/use_alerts_by_status.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/use_alerts_by_status.ts
new file mode 100644
index 0000000000000..979fd6292243f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/use_alerts_by_status.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { useGlobalTime } from '../../../../common/containers/use_global_time';
+import { useQueryAlerts } from '../../../../detections/containers/detection_engine/alerts/use_query';
+import { useQueryInspector } from '../../../../common/components/page/manage_query';
+import { AlertsByStatusAgg, AlertsByStatusResponse, ParsedAlertsData } from './types';
+import {
+  STATUS_CRITICAL_LABEL,
+  STATUS_HIGH_LABEL,
+  STATUS_LOW_LABEL,
+  STATUS_MEDIUM_LABEL,
+} from '../translations';
+
+export const severityLabels: Record<Severity, string> = {
+  critical: STATUS_CRITICAL_LABEL,
+  high: STATUS_HIGH_LABEL,
+  medium: STATUS_MEDIUM_LABEL,
+  low: STATUS_LOW_LABEL,
+};
+
+export const getAlertsByStatusQuery = ({ from, to }: { from: string; to: string }) => ({
+  size: 0,
+  query: {
+    bool: {
+      filter: [{ range: { '@timestamp': { gte: from, lte: to } } }],
+    },
+  },
+  aggs: {
+    alertsByStatus: {
+      terms: {
+        field: 'kibana.alert.workflow_status',
+      },
+      aggs: {
+        statusBySeverity: {
+          terms: {
+            field: 'kibana.alert.severity',
+          },
+        },
+      },
+    },
+  },
+});
+
+export const parseAlertsData = (
+  response: AlertsByStatusResponse<{}, AlertsByStatusAgg>
+): ParsedAlertsData => {
+  const statusBuckets = response?.aggregations?.alertsByStatus?.buckets ?? [];
+
+  if (statusBuckets.length === 0) {
+    return null;
+  }
+
+  return statusBuckets.reduce<ParsedAlertsData>((parsedAlertsData, statusBucket) => {
+    const severityBuckets = statusBucket.statusBySeverity?.buckets ?? [];
+
+    return {
+      ...parsedAlertsData,
+      [statusBucket.key]: {
+        total: statusBucket.doc_count,
+        severities: severityBuckets.map((severityBucket) => ({
+          key: severityBucket.key,
+          value: severityBucket.doc_count,
+          label: severityLabels[severityBucket.key],
+        })),
+      },
+    };
+  }, {});
+};
+
+export interface UseAlertsByStatusProps {
+  queryId: string;
+  signalIndexName: string | null;
+  skip?: boolean;
+}
+
+export type UseAlertsByStatus = (props: UseAlertsByStatusProps) => {
+  items: ParsedAlertsData;
+  isLoading: boolean;
+  updatedAt: number;
+};
+
+export const useAlertsByStatus: UseAlertsByStatus = ({
+  queryId,
+  signalIndexName,
+  skip = false,
+}) => {
+  const { to, from, deleteQuery, setQuery } = useGlobalTime();
+  const [updatedAt, setUpdatedAt] = useState(Date.now());
+  const [items, setItems] = useState<null | ParsedAlertsData>(null);
+
+  const {
+    data,
+    loading: isLoading,
+    refetch: refetchQuery,
+    request,
+    response,
+    setQuery: setAlertsQuery,
+  } = useQueryAlerts<{}, AlertsByStatusAgg>({
+    query: getAlertsByStatusQuery({
+      from,
+      to,
+    }),
+    indexName: signalIndexName,
+    skip,
+  });
+
+  useEffect(() => {
+    setAlertsQuery(
+      getAlertsByStatusQuery({
+        from,
+        to,
+      })
+    );
+  }, [setAlertsQuery, from, to]);
+
+  useEffect(() => {
+    if (data == null) {
+      setItems(null);
+    } else {
+      setItems(parseAlertsData(data));
+    }
+    setUpdatedAt(Date.now());
+  }, [data]);
+
+  const refetch = useCallback(() => {
+    if (!skip && refetchQuery) {
+      refetchQuery();
+    }
+  }, [skip, refetchQuery]);
+
+  useQueryInspector({
+    deleteQuery,
+    inspect: {
+      dsl: [request],
+      response: [response],
+    },
+    refetch,
+    setQuery,
+    queryId,
+    loading: isLoading,
+  });
+
+  return { items, isLoading, updatedAt };
+};
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/index.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/index.tsx
new file mode 100644
index 0000000000000..3be512cbb38a1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/index.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { RuleAlertsTable } from './rule_alerts_table';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/mock_data.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/mock_data.ts
new file mode 100644
index 0000000000000..8fb1279d75fff
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/mock_data.ts
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { RuleAlertsItem, SeverityRuleAlertsAggsResponse } from './use_rule_alerts_items';
+
+export const from = '2022-04-05T12:00:00.000Z';
+export const to = '2022-04-08T12:00:00.000Z';
+
+export const severityRuleAlertsQuery = {
+  size: 0,
+  query: {
+    bool: {
+      filter: [
+        { term: { 'kibana.alert.workflow_status': 'open' } },
+        { range: { '@timestamp': { gte: from, lte: to } } },
+      ],
+    },
+  },
+  aggs: {
+    alertsByRule: {
+      terms: {
+        // top 4 rules sorted by severity counters
+        field: 'kibana.alert.rule.uuid',
+        size: 4,
+        order: [{ critical: 'desc' }, { high: 'desc' }, { medium: 'desc' }, { low: 'desc' }],
+      },
+      aggs: {
+        // severity aggregations for sorting
+        critical: { filter: { term: { 'kibana.alert.severity': 'critical' } } },
+        high: { filter: { term: { 'kibana.alert.severity': 'high' } } },
+        medium: { filter: { term: { 'kibana.alert.severity': 'medium' } } },
+        low: { filter: { term: { 'kibana.alert.severity': 'low' } } },
+        // get the newest alert to extract timestamp and rule name
+        lastRuleAlert: {
+          top_hits: {
+            size: 1,
+            sort: {
+              '@timestamp': 'desc',
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const mockSeverityRuleAlertsResponse: { aggregations: SeverityRuleAlertsAggsResponse } = {
+  aggregations: {
+    alertsByRule: {
+      buckets: [
+        {
+          key: '79ec0270-b4c5-11ec-970e-8f7c5a7144f7',
+          doc_count: 54,
+          lastRuleAlert: {
+            hits: {
+              total: {
+                value: 54,
+              },
+              hits: [
+                {
+                  _source: {
+                    'kibana.alert.rule.name': 'RULE_1',
+                    '@timestamp': '2022-04-05T15:58:35.079Z',
+                    'kibana.alert.severity': 'critical',
+                  },
+                },
+              ],
+            },
+          },
+        },
+        {
+          key: '955c79d0-b403-11ec-b5a7-6dc1ed01bdd7',
+          doc_count: 112,
+          lastRuleAlert: {
+            hits: {
+              total: {
+                value: 112,
+              },
+              hits: [
+                {
+                  _source: {
+                    'kibana.alert.rule.name': 'RULE_2',
+                    '@timestamp': '2022-04-05T15:58:47.164Z',
+                    'kibana.alert.severity': 'high',
+                  },
+                },
+              ],
+            },
+          },
+        },
+        {
+          key: '13bc7bc0-b1d6-11ec-a799-67811b37527a',
+          doc_count: 170,
+          lastRuleAlert: {
+            hits: {
+              total: {
+                value: 170,
+              },
+              hits: [
+                {
+                  _source: {
+                    'kibana.alert.rule.name': 'RULE_3',
+                    '@timestamp': '2022-04-05T15:56:16.606Z',
+                    'kibana.alert.severity': 'low',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const severityRuleAlertsResponseParsed: RuleAlertsItem[] = [
+  {
+    alert_count: 54,
+    id: '79ec0270-b4c5-11ec-970e-8f7c5a7144f7',
+    last_alert_at: '2022-04-05T15:58:35.079Z',
+    name: 'RULE_1',
+    severity: 'critical',
+  },
+  {
+    alert_count: 112,
+    id: '955c79d0-b403-11ec-b5a7-6dc1ed01bdd7',
+    last_alert_at: '2022-04-05T15:58:47.164Z',
+    name: 'RULE_2',
+    severity: 'high',
+  },
+  {
+    alert_count: 170,
+    id: '13bc7bc0-b1d6-11ec-a799-67811b37527a',
+    last_alert_at: '2022-04-05T15:56:16.606Z',
+    name: 'RULE_3',
+    severity: 'low',
+  },
+];
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.test.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.test.tsx
new file mode 100644
index 0000000000000..f41e05a2c04dc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.test.tsx
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { TestProviders } from '../../../../common/mock';
+import { RuleAlertsTable, RuleAlertsTableProps } from './rule_alerts_table';
+import { RuleAlertsItem, UseRuleAlertsItems } from './use_rule_alerts_items';
+import moment from 'moment';
+import { SecurityPageName } from '../../../../../common/constants';
+
+const mockGetAppUrl = jest.fn();
+jest.mock('../../../../common/lib/kibana/hooks', () => {
+  const original = jest.requireActual('../../../../common/lib/kibana/hooks');
+  return {
+    ...original,
+    useNavigation: () => ({
+      getAppUrl: mockGetAppUrl,
+    }),
+  };
+});
+
+type UseRuleAlertsItemsReturn = ReturnType<UseRuleAlertsItems>;
+const defaultUseRuleAlertsItemsReturn: UseRuleAlertsItemsReturn = {
+  items: [],
+  isLoading: false,
+  updatedAt: Date.now(),
+};
+const mockUseRuleAlertsItems = jest.fn(() => defaultUseRuleAlertsItemsReturn);
+const mockUseRuleAlertsItemsReturn = (param: Partial<UseRuleAlertsItemsReturn>) => {
+  mockUseRuleAlertsItems.mockReturnValueOnce({ ...defaultUseRuleAlertsItemsReturn, ...param });
+};
+jest.mock('./use_rule_alerts_items', () => ({
+  useRuleAlertsItems: () => mockUseRuleAlertsItems(),
+}));
+
+const defaultProps: RuleAlertsTableProps = {
+  signalIndexName: '',
+};
+const items: RuleAlertsItem[] = [
+  {
+    id: 'ruleId',
+    name: 'ruleName',
+    last_alert_at: moment().subtract(1, 'day').format(),
+    alert_count: 10,
+    severity: 'high',
+  },
+];
+
+describe('RuleAlertsTable', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render empty table', () => {
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByTestId('severityRuleAlertsPanel')).toBeInTheDocument();
+    expect(result.getByText('No alerts to display')).toBeInTheDocument();
+    expect(result.getByTestId('severityRuleAlertsButton')).toBeInTheDocument();
+  });
+
+  it('should render a loading table', () => {
+    mockUseRuleAlertsItemsReturn({ isLoading: true });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByText('Updating...')).toBeInTheDocument();
+    expect(result.getByTestId('severityRuleAlertsButton')).toBeInTheDocument();
+    expect(result.getByTestId('severityRuleAlertsTable')).toHaveClass('euiBasicTable-loading');
+  });
+
+  it('should render the updated at subtitle', () => {
+    mockUseRuleAlertsItemsReturn({ isLoading: false });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByText('Updated now')).toBeInTheDocument();
+  });
+
+  it('should render the table columns', () => {
+    mockUseRuleAlertsItemsReturn({ items });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    const columnHeaders = result.getAllByRole('columnheader');
+    expect(columnHeaders.at(0)).toHaveTextContent('Rule name');
+    expect(columnHeaders.at(1)).toHaveTextContent('Last alert');
+    expect(columnHeaders.at(2)).toHaveTextContent('Alert count');
+    expect(columnHeaders.at(3)).toHaveTextContent('Severity');
+  });
+
+  it('should render the table items', () => {
+    mockUseRuleAlertsItemsReturn({ items });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByTestId('severityRuleAlertsTable-name')).toHaveTextContent('ruleName');
+    expect(result.getByTestId('severityRuleAlertsTable-lastAlertAt')).toHaveTextContent(
+      'yesterday'
+    );
+    expect(result.getByTestId('severityRuleAlertsTable-alertCount')).toHaveTextContent('10');
+    expect(result.getByTestId('severityRuleAlertsTable-severity')).toHaveTextContent('High');
+  });
+
+  it('should generate the table items links', () => {
+    const linkUrl = '/fake/link';
+    mockGetAppUrl.mockReturnValue(linkUrl);
+    mockUseRuleAlertsItemsReturn({ items });
+
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(mockGetAppUrl).toBeCalledWith({
+      deepLinkId: SecurityPageName.rules,
+      path: `id/${items[0].id}`,
+    });
+
+    expect(result.getByTestId('severityRuleAlertsTable-name')).toHaveAttribute('href', linkUrl);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.tsx
new file mode 100644
index 0000000000000..a5ddfe25dd985
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.tsx
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useCallback, useMemo } from 'react';
+import { capitalize } from 'lodash';
+import {
+  EuiBasicTable,
+  EuiBasicTableColumn,
+  EuiButton,
+  EuiEmptyPrompt,
+  EuiHealth,
+  EuiLink,
+  EuiPanel,
+  EuiSpacer,
+  EuiToolTip,
+} from '@elastic/eui';
+import { FormattedRelative } from '@kbn/i18n-react';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { HeaderSection } from '../../../../common/components/header_section';
+
+import { LastUpdatedAt, SEVERITY_COLOR } from '../util';
+import * as i18n from '../translations';
+import { useRuleAlertsItems, RuleAlertsItem } from './use_rule_alerts_items';
+import { useNavigation, NavigateTo, GetAppUrl } from '../../../../common/lib/kibana';
+import { SecurityPageName } from '../../../../../common/constants';
+import { useQueryToggle } from '../../../../common/containers/query_toggle';
+import { HoverVisibilityContainer } from '../../../../common/components/hover_visibility_container';
+import { BUTTON_CLASS as INPECT_BUTTON_CLASS } from '../../../../common/components/inspect';
+
+export interface RuleAlertsTableProps {
+  signalIndexName: string | null;
+}
+
+export type GetTableColumns = (params: {
+  getAppUrl: GetAppUrl;
+  navigateTo: NavigateTo;
+}) => Array<EuiBasicTableColumn<RuleAlertsItem>>;
+
+const DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID =
+  'detection-response-rule-alerts-severity-table' as const;
+
+export const getTableColumns: GetTableColumns = ({ getAppUrl, navigateTo }) => [
+  {
+    field: 'name',
+    name: i18n.RULE_ALERTS_COLUMN_RULE_NAME,
+    render: (name: string, { id }) => {
+      const url = getAppUrl({ deepLinkId: SecurityPageName.rules, path: `id/${id}` });
+      return (
+        <EuiToolTip data-test-subj={`${id}-tooltip`} content={i18n.OPEN_RULE_DETAIL_TOOLTIP}>
+          {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
+          <EuiLink
+            data-test-subj="severityRuleAlertsTable-name"
+            href={url}
+            onClick={(ev?: React.MouseEvent) => {
+              if (ev) {
+                ev.preventDefault();
+              }
+              navigateTo({ url });
+            }}
+          >
+            {name}
+          </EuiLink>
+        </EuiToolTip>
+      );
+    },
+  },
+  {
+    field: 'last_alert_at',
+    name: i18n.RULE_ALERTS_COLUMN_LAST_ALERT,
+    'data-test-subj': 'severityRuleAlertsTable-lastAlertAt',
+    render: (lastAlertAt: string) => <FormattedRelative value={new Date(lastAlertAt)} />,
+  },
+  {
+    field: 'alert_count',
+    name: i18n.RULE_ALERTS_COLUMN_ALERT_COUNT,
+    'data-test-subj': 'severityRuleAlertsTable-alertCount',
+  },
+  {
+    field: 'severity',
+    name: i18n.RULE_ALERTS_COLUMN_SEVERITY,
+    'data-test-subj': 'severityRuleAlertsTable-severity',
+    render: (severity: Severity) => (
+      <EuiHealth color={SEVERITY_COLOR[severity]}>{capitalize(severity)}</EuiHealth>
+    ),
+  },
+];
+
+export const RuleAlertsTable = React.memo<RuleAlertsTableProps>(({ signalIndexName }) => {
+  const { getAppUrl, navigateTo } = useNavigation();
+  const { toggleStatus, setToggleStatus } = useQueryToggle(DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID);
+  const { items, isLoading, updatedAt } = useRuleAlertsItems({
+    signalIndexName,
+    queryId: DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID,
+    skip: !toggleStatus,
+  });
+
+  const navigateToAlerts = useCallback(() => {
+    navigateTo({ deepLinkId: SecurityPageName.alerts });
+  }, [navigateTo]);
+
+  const columns = useMemo(
+    () => getTableColumns({ getAppUrl, navigateTo }),
+    [getAppUrl, navigateTo]
+  );
+
+  return (
+    <HoverVisibilityContainer show={true} targetClassNames={[INPECT_BUTTON_CLASS]}>
+      <EuiPanel hasBorder data-test-subj="severityRuleAlertsPanel">
+        <HeaderSection
+          id={DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID}
+          title={i18n.RULE_ALERTS_SECTION_TITLE}
+          titleSize="s"
+          toggleStatus={toggleStatus}
+          toggleQuery={setToggleStatus}
+          subtitle={<LastUpdatedAt updatedAt={updatedAt} isUpdating={isLoading} />}
+        />
+        {toggleStatus && (
+          <>
+            <EuiBasicTable
+              data-test-subj="severityRuleAlertsTable"
+              columns={columns}
+              items={items}
+              loading={isLoading}
+              noItemsMessage={
+                <EuiEmptyPrompt title={<h3>{i18n.NO_ALERTS_FOUND}</h3>} titleSize="xs" />
+              }
+            />
+            <EuiSpacer size="m" />
+            <EuiButton data-test-subj="severityRuleAlertsButton" onClick={navigateToAlerts}>
+              {i18n.OPEN_ALL_ALERTS_BUTTON}
+            </EuiButton>
+          </>
+        )}
+      </EuiPanel>
+    </HoverVisibilityContainer>
+  );
+});
+RuleAlertsTable.displayName = 'RuleAlertsTable';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.test.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.test.ts
new file mode 100644
index 0000000000000..85d4c8e5b6a93
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.test.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+import { TestProviders } from '../../../../common/mock';
+import {
+  from,
+  mockSeverityRuleAlertsResponse,
+  severityRuleAlertsQuery,
+  severityRuleAlertsResponseParsed,
+  to,
+} from './mock_data';
+import {
+  useRuleAlertsItems,
+  UseRuleAlertsItems,
+  UseRuleAlertsItemsProps,
+} from './use_rule_alerts_items';
+
+const dateNow = new Date('2022-04-08T12:00:00.000Z').valueOf();
+const mockDateNow = jest.fn().mockReturnValue(dateNow);
+Date.now = jest.fn(() => mockDateNow()) as unknown as DateConstructor['now'];
+
+const defaultUseQueryAlertsReturn = {
+  loading: false,
+  data: null,
+  setQuery: () => {},
+  response: '',
+  request: '',
+  refetch: () => {},
+};
+const mockUseQueryAlerts = jest.fn().mockReturnValue(defaultUseQueryAlertsReturn);
+jest.mock('../../../../detections/containers/detection_engine/alerts/use_query', () => {
+  return {
+    useQueryAlerts: (...props: unknown[]) => mockUseQueryAlerts(...props),
+  };
+});
+
+const mockUseGlobalTime = jest
+  .fn()
+  .mockReturnValue({ from, to, setQuery: jest.fn(), deleteQuery: jest.fn() });
+jest.mock('../../../../common/containers/use_global_time', () => {
+  return {
+    useGlobalTime: (...props: unknown[]) => mockUseGlobalTime(...props),
+  };
+});
+
+// helper function to render the hook
+const renderUseRuleAlertsItems = (props: Partial<UseRuleAlertsItemsProps> = {}) =>
+  renderHook<UseRuleAlertsItemsProps, ReturnType<UseRuleAlertsItems>>(
+    () =>
+      useRuleAlertsItems({
+        queryId: 'test',
+        signalIndexName: 'signal-alerts',
+        ...props,
+      }),
+    {
+      wrapper: TestProviders,
+    }
+  );
+
+describe('useRuleAlertsItems', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockDateNow.mockReturnValue(dateNow);
+    mockUseQueryAlerts.mockReturnValue(defaultUseQueryAlertsReturn);
+  });
+
+  it('should return default values', () => {
+    const { result } = renderUseRuleAlertsItems();
+
+    expect(result.current).toEqual({
+      items: [],
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+    expect(mockUseQueryAlerts).toBeCalledWith({
+      query: severityRuleAlertsQuery,
+      indexName: 'signal-alerts',
+      skip: false,
+    });
+  });
+
+  it('should return parsed items', () => {
+    mockUseQueryAlerts.mockReturnValue({
+      ...defaultUseQueryAlertsReturn,
+      data: mockSeverityRuleAlertsResponse,
+    });
+
+    const { result } = renderUseRuleAlertsItems();
+
+    expect(result.current).toEqual({
+      items: severityRuleAlertsResponseParsed,
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+  });
+
+  it('should return new updatedAt', () => {
+    const newDateNow = new Date('2022-04-08T14:00:00.000Z').valueOf();
+    mockDateNow.mockReturnValue(newDateNow); // setUpdatedAt call
+    mockDateNow.mockReturnValueOnce(dateNow); // initialization call
+
+    mockUseQueryAlerts.mockReturnValue({
+      ...defaultUseQueryAlertsReturn,
+      data: mockSeverityRuleAlertsResponse,
+    });
+
+    const { result } = renderUseRuleAlertsItems();
+
+    expect(mockDateNow).toHaveBeenCalled();
+    expect(result.current).toEqual({
+      items: severityRuleAlertsResponseParsed,
+      isLoading: false,
+      updatedAt: newDateNow,
+    });
+  });
+
+  it('should skip the query', () => {
+    const { result } = renderUseRuleAlertsItems({ skip: true });
+
+    expect(mockUseQueryAlerts).toBeCalledWith({
+      query: severityRuleAlertsQuery,
+      indexName: 'signal-alerts',
+      skip: true,
+    });
+
+    expect(result.current).toEqual({
+      items: [],
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.ts
new file mode 100644
index 0000000000000..2fd107f3caf39
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.ts
@@ -0,0 +1,176 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { useGlobalTime } from '../../../../common/containers/use_global_time';
+import { useQueryAlerts } from '../../../../detections/containers/detection_engine/alerts/use_query';
+import { useQueryInspector } from '../../../../common/components/page/manage_query';
+
+// Formatted item result
+export interface RuleAlertsItem {
+  id: string;
+  name: string;
+  last_alert_at: string;
+  alert_count: number;
+  severity: Severity;
+}
+
+// Raw aggregation response
+export interface SeverityRuleAlertsAggsResponse {
+  alertsByRule: {
+    buckets?: Array<{
+      key: string;
+      doc_count: number;
+      lastRuleAlert: {
+        hits: {
+          total: {
+            value: number;
+          };
+          hits: [
+            {
+              _source: {
+                '@timestamp': string;
+                'kibana.alert.rule.name': string;
+                'kibana.alert.severity': Severity;
+              };
+            }
+          ];
+        };
+      };
+    }>;
+  };
+}
+
+const getSeverityRuleAlertsQuery = ({ from, to }: { from: string; to: string }) => ({
+  size: 0,
+  query: {
+    bool: {
+      filter: [
+        { term: { 'kibana.alert.workflow_status': 'open' } },
+        { range: { '@timestamp': { gte: from, lte: to } } },
+      ],
+    },
+  },
+  aggs: {
+    alertsByRule: {
+      terms: {
+        // top 4 rules sorted by severity counters
+        field: 'kibana.alert.rule.uuid',
+        size: 4,
+        order: [{ critical: 'desc' }, { high: 'desc' }, { medium: 'desc' }, { low: 'desc' }],
+      },
+      aggs: {
+        // severity aggregations for sorting
+        critical: { filter: { term: { 'kibana.alert.severity': 'critical' } } },
+        high: { filter: { term: { 'kibana.alert.severity': 'high' } } },
+        medium: { filter: { term: { 'kibana.alert.severity': 'medium' } } },
+        low: { filter: { term: { 'kibana.alert.severity': 'low' } } },
+        // get the newest alert to extract timestamp and rule name
+        lastRuleAlert: {
+          top_hits: {
+            size: 1,
+            sort: {
+              '@timestamp': 'desc',
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+const getRuleAlertsItemsFromAggs = (
+  aggregations?: SeverityRuleAlertsAggsResponse
+): RuleAlertsItem[] => {
+  const buckets = aggregations?.alertsByRule.buckets ?? [];
+  return buckets.map<RuleAlertsItem>((bucket) => {
+    const lastAlert = bucket.lastRuleAlert.hits.hits[0]._source;
+    return {
+      id: bucket.key,
+      alert_count: bucket.lastRuleAlert.hits.total.value,
+      name: lastAlert['kibana.alert.rule.name'],
+      last_alert_at: lastAlert['@timestamp'],
+      severity: lastAlert['kibana.alert.severity'],
+    };
+  });
+};
+
+export interface UseRuleAlertsItemsProps {
+  queryId: string;
+  signalIndexName: string | null;
+  skip?: boolean;
+}
+export type UseRuleAlertsItems = (props: UseRuleAlertsItemsProps) => {
+  items: RuleAlertsItem[];
+  isLoading: boolean;
+  updatedAt: number;
+};
+
+export const useRuleAlertsItems: UseRuleAlertsItems = ({
+  queryId,
+  signalIndexName,
+  skip = false,
+}) => {
+  const [items, setItems] = useState<RuleAlertsItem[]>([]);
+  const [updatedAt, setUpdatedAt] = useState(Date.now());
+  const { to, from, deleteQuery, setQuery } = useGlobalTime();
+
+  const {
+    loading: isLoading,
+    data,
+    setQuery: setAlertsQuery,
+    response,
+    request,
+    refetch: refetchQuery,
+  } = useQueryAlerts<{}, SeverityRuleAlertsAggsResponse>({
+    query: getSeverityRuleAlertsQuery({
+      from,
+      to,
+    }),
+    indexName: signalIndexName,
+    skip,
+  });
+
+  useEffect(() => {
+    setAlertsQuery(
+      getSeverityRuleAlertsQuery({
+        from,
+        to,
+      })
+    );
+  }, [setAlertsQuery, from, to]);
+
+  useEffect(() => {
+    if (data == null) {
+      setItems([]);
+    } else {
+      setItems(getRuleAlertsItemsFromAggs(data.aggregations));
+    }
+    setUpdatedAt(Date.now());
+  }, [data]);
+
+  const refetch = useCallback(() => {
+    if (!skip && refetchQuery) {
+      refetchQuery();
+    }
+  }, [skip, refetchQuery]);
+
+  useQueryInspector({
+    deleteQuery,
+    inspect: {
+      dsl: [request],
+      response: [response],
+    },
+    refetch,
+    setQuery,
+    queryId,
+    loading: isLoading,
+  });
+
+  return { items, isLoading, updatedAt };
+};
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/translations.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/translations.ts
new file mode 100644
index 0000000000000..c2c5b412f1a9d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/translations.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const STATUS_CRITICAL_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.criticalLabel',
+  {
+    defaultMessage: 'Critical',
+  }
+);
+export const STATUS_HIGH_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.highLabel',
+  {
+    defaultMessage: 'High',
+  }
+);
+export const STATUS_MEDIUM_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.mediumLabel',
+  {
+    defaultMessage: 'Medium',
+  }
+);
+export const STATUS_LOW_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.lowLabel',
+  {
+    defaultMessage: 'Low',
+  }
+);
+export const STATUS_OPEN = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.title.open',
+  {
+    defaultMessage: 'Open',
+  }
+);
+export const STATUS_ACKNOWLEDGED = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.title.acknowledged',
+  {
+    defaultMessage: 'Acknowledged',
+  }
+);
+export const STATUS_CLOSED = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.title.closed',
+  {
+    defaultMessage: 'Closed',
+  }
+);
+export const STATUS_IN_PROGRESS = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.donut.title.inProgress',
+  {
+    defaultMessage: 'In progress',
+  }
+);
+export const ALERTS = (totalAlerts: number) =>
+  i18n.translate('xpack.securitySolution.detectionResponse.alertsByStatus.totalAlerts', {
+    values: { totalAlerts },
+    defaultMessage: 'total {totalAlerts, plural, =1 {alert} other {alerts}}',
+  });
+export const ALERTS_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionResponse.alertsByStatus.title',
+  {
+    defaultMessage: 'Alerts',
+  }
+);
+export const UPDATING = i18n.translate('xpack.securitySolution.detectionResponse.updating', {
+  defaultMessage: 'Updating...',
+});
+export const UPDATED = i18n.translate('xpack.securitySolution.detectionResponse.updated', {
+  defaultMessage: 'Updated',
+});
+export const RULE_ALERTS_SECTION_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsSectionTitle',
+  {
+    defaultMessage: 'Open alerts by rule',
+  }
+);
+export const NO_ALERTS_FOUND = i18n.translate(
+  'xpack.securitySolution.detectionResponse.noRuleAlerts',
+  {
+    defaultMessage: 'No alerts to display',
+  }
+);
+export const RULE_ALERTS_COLUMN_RULE_NAME = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnRuleName',
+  {
+    defaultMessage: 'Rule name',
+  }
+);
+export const RULE_ALERTS_COLUMN_LAST_ALERT = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnLastAlert',
+  {
+    defaultMessage: 'Last alert',
+  }
+);
+export const RULE_ALERTS_COLUMN_ALERT_COUNT = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnAlertCount',
+  {
+    defaultMessage: 'Alert count',
+  }
+);
+export const RULE_ALERTS_COLUMN_SEVERITY = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnSeverity',
+  {
+    defaultMessage: 'Severity',
+  }
+);
+export const OPEN_RULE_DETAIL_TOOLTIP = i18n.translate(
+  'xpack.securitySolution.detectionResponse.openRuleDetailTooltip',
+  {
+    defaultMessage: 'Open rule detail',
+  }
+);
+export const OPEN_RULE_ALERTS_TOOLTIP = i18n.translate(
+  'xpack.securitySolution.detectionResponse.openRuleAlertsTooltip',
+  {
+    defaultMessage: 'Open rule alerts',
+  }
+);
+
+export const OPEN_ALL_ALERTS_BUTTON = i18n.translate(
+  'xpack.securitySolution.detectionResponse.openAllAlertsButton',
+  {
+    defaultMessage: 'View all open alerts',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/util.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/util.tsx
new file mode 100644
index 0000000000000..4ceba66773397
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/util.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { FormattedRelative } from '@kbn/i18n-react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import * as i18n from './translations';
+
+export const SEVERITY_COLOR = {
+  critical: '#EF6550',
+  high: '#EE9266',
+  medium: '#F3B689',
+  low: '#F8D9B2',
+} as const;
+
+export interface LastUpdatedAtProps {
+  updatedAt: number;
+  isUpdating: boolean;
+}
+export const LastUpdatedAt: React.FC<LastUpdatedAtProps> = ({ isUpdating, updatedAt }) => (
+  <EuiFlexGroup>
+    {isUpdating ? (
+      <EuiFlexItem grow={false}>{i18n.UPDATING}</EuiFlexItem>
+    ) : (
+      <EuiFlexItem grow={false}>
+        <>{i18n.UPDATED} </>
+        <FormattedRelative
+          data-test-subj="last-updated-at-date"
+          key={`formattedRelative-${Date.now()}`}
+          value={new Date(updatedAt)}
+        />
+      </EuiFlexItem>
+    )}
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/utils.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/utils.tsx
new file mode 100644
index 0000000000000..4ceba66773397
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/utils.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { FormattedRelative } from '@kbn/i18n-react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import * as i18n from './translations';
+
+export const SEVERITY_COLOR = {
+  critical: '#EF6550',
+  high: '#EE9266',
+  medium: '#F3B689',
+  low: '#F8D9B2',
+} as const;
+
+export interface LastUpdatedAtProps {
+  updatedAt: number;
+  isUpdating: boolean;
+}
+export const LastUpdatedAt: React.FC<LastUpdatedAtProps> = ({ isUpdating, updatedAt }) => (
+  <EuiFlexGroup>
+    {isUpdating ? (
+      <EuiFlexItem grow={false}>{i18n.UPDATING}</EuiFlexItem>
+    ) : (
+      <EuiFlexItem grow={false}>
+        <>{i18n.UPDATED} </>
+        <FormattedRelative
+          data-test-subj="last-updated-at-date"
+          key={`formattedRelative-${Date.now()}`}
+          value={new Date(updatedAt)}
+        />
+      </EuiFlexItem>
+    )}
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx b/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx
index 114813ea50a4f..40e32af9abde7 100644
--- a/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx
@@ -10,12 +10,12 @@ import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { ID as OverviewHostQueryId } from '../../containers/overview_host';
 import { OverviewHost } from '../overview_host';
 import { OverviewNetwork } from '../overview_network';
 import { useKibana } from '../../../common/lib/kibana';
 import { convertToBuildEsQuery } from '../../../common/lib/keury';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 import { useInvalidFilterQuery } from '../../../common/hooks/use_invalid_filter_query';
 import {
diff --git a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
index 96571d47ab72e..86f791383ba53 100644
--- a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
@@ -13,6 +13,7 @@ import React, { useEffect, useMemo, useCallback } from 'react';
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
 import styled from 'styled-components';
 import { EuiButton } from '@elastic/eui';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { DEFAULT_NUMBER_FORMAT, APP_UI_ID } from '../../../../common/constants';
 import { SHOWING, UNIT } from '../../../common/components/events_viewer/translations';
 import { getTabsOnHostsUrl } from '../../../common/components/link_to/redirect_to_hosts';
@@ -27,7 +28,6 @@ import {
   eventsStackByOptions,
   histogramConfigs,
 } from '../../../common/components/events_tab/events_query_tab_body';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { HostsTableType } from '../../../hosts/store/model';
 import { InputsModelId } from '../../../common/store/inputs/constants';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
index 7f447670fd1e1..130f9ac8d870e 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
@@ -12,7 +12,7 @@ import '../../../../common/mock/match_media';
 import '../../../../common/mock/react_beautiful_dnd';
 import { TestProviders } from '../../../../common/mock';
 
-import { EndpointOverview } from './index';
+import { EndpointOverview } from '.';
 import {
   EndpointFields,
   HostPolicyResponseActionStatus,
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx
index 28c02c6d8ed4f..d928cc77d73df 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import '../../../common/mock/match_media';
 import { TestProviders } from '../../../common/mock';
 
-import { HostOverview } from './index';
+import { HostOverview } from '.';
 import { mockData } from './mock';
 import { mockAnomalies } from '../../../common/components/ml/mock';
 import { useHostRiskScore } from '../../../risk_score/containers/all';
diff --git a/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx b/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx
index eaa4c9d6fbe44..42457f9b494ab 100644
--- a/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx
@@ -11,7 +11,7 @@ import { waitFor } from '@testing-library/react';
 import { TestProviders } from '../../../common/mock';
 import { Sidebar } from './sidebar';
 import { useGetUserCasesPermissions, useKibana } from '../../../common/lib/kibana';
-import { casesPluginMock, CaseUiClientMock } from '../../../../../cases/public/mocks';
+import { casesPluginMock, CaseUiClientMock } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts
index ad737ac410e3b..a121efed34779 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { EPM_API_ROUTES } from '@kbn/fleet-plugin/common';
 import { KibanaServices } from '../../../common/lib/kibana';
-import { EPM_API_ROUTES } from '../../../../../fleet/common';
 
 export interface IntegrationResponse {
   id: string;
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx
index b1310e363eef0..5766bd8d6170e 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx
@@ -6,7 +6,7 @@
  */
 import { useState, useEffect, useCallback } from 'react';
 import { SavedObjectAttributes } from '@kbn/securitysolution-io-ts-alerting-types';
-import { TiDataSources } from '../../containers/overview_cti_links/use_ti_data_sources';
+import { TiDataSources } from './use_ti_data_sources';
 import { LinkPanelListItem } from '../../components/link_panel';
 import { useKibana } from '../../../common/lib/kibana';
 
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
index 19ea075aee489..837bc01007601 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
@@ -8,12 +8,12 @@ import { Observable } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { useEffect, useState } from 'react';
 import { useObservable, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
-import { useKibana } from '../../../common/lib/kibana';
 import {
   DataPublicPluginStart,
   isCompleteResponse,
   isErrorResponse,
-} from '../../../../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
+import { useKibana } from '../../../common/lib/kibana';
 import {
   Bucket,
   CtiQueries,
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx
index 53f07d5195c26..27714fd14449d 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useHostOverview } from './index';
+import { useHostOverview } from '.';
 
 describe('useHostOverview', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
index b79169b1ac762..cb6c9d484cf6f 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   HostsQueries,
   HostOverviewRequestOptions,
@@ -19,7 +20,6 @@ import { useKibana } from '../../../common/lib/kibana';
 import { inputsModel } from '../../../common/store/inputs';
 import { createFilter } from '../../../common/containers/helpers';
 import { ESQuery } from '../../../../common/typed_json';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx
index 64cc2e6bbd179..23bfea8ad55bd 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkOverview } from './index';
+import { useNetworkOverview } from '.';
 
 describe('useNetworkOverview', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx
index c2683b74a5b1a..e33060e247b83 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   NetworkQueries,
   NetworkOverviewRequestOptions,
@@ -19,7 +20,6 @@ import { useKibana } from '../../../common/lib/kibana';
 import { inputsModel } from '../../../common/store/inputs';
 import { createFilter } from '../../../common/containers/helpers';
 import { ESQuery } from '../../../../common/typed_json';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/overview/pages/detection_response.test.tsx b/x-pack/plugins/security_solution/public/overview/pages/detection_response.test.tsx
new file mode 100644
index 0000000000000..8cd387978e97d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/pages/detection_response.test.tsx
@@ -0,0 +1,191 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { render } from '@testing-library/react';
+import { DetectionResponse } from './detection_response';
+import { TestProviders } from '../../common/mock';
+
+jest.mock('../components/detection_response/rule_alerts_table', () => ({
+  RuleAlertsTable: () => <div data-test-subj="mock_RuleAlertsTable" />,
+}));
+// TODO: add all sections mocks
+
+jest.mock('../../common/components/search_bar', () => ({
+  SiemSearchBar: () => <div data-test-subj="mock_globalDatePicker" />,
+}));
+
+const defaultUseSourcererReturn = {
+  indicesExist: true,
+  loading: false,
+  indexPattern: '',
+};
+const mockUseSourcererDataView = jest.fn(() => defaultUseSourcererReturn);
+jest.mock('../../common/containers/sourcerer', () => ({
+  useSourcererDataView: () => mockUseSourcererDataView(),
+}));
+
+const defaultUseUserInfoReturn = {
+  signalIndexName: '',
+  canUserREAD: true,
+  hasIndexRead: true,
+};
+const mockUseUserInfo = jest.fn(() => defaultUseUserInfoReturn);
+jest.mock('../../detections/components/user_info', () => ({
+  useUserInfo: () => mockUseUserInfo(),
+}));
+
+const defaultUseCasesPermissionsReturn = { read: true };
+const mockUseCasesPermissions = jest.fn(() => defaultUseCasesPermissionsReturn);
+jest.mock('../../common/lib/kibana/hooks', () => {
+  const original = jest.requireActual('../../common/lib/kibana/hooks');
+  return {
+    ...original,
+    useGetUserCasesPermissions: () => mockUseCasesPermissions(),
+  };
+});
+
+describe('DetectionResponse', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSourcererDataView.mockReturnValue(defaultUseSourcererReturn);
+    mockUseUserInfo.mockReturnValue(defaultUseUserInfoReturn);
+    mockUseCasesPermissions.mockReturnValue(defaultUseCasesPermissionsReturn);
+  });
+
+  it('should render default page', () => {
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_globalDatePicker')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseSections')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseLoader')).not.toBeInTheDocument();
+    expect(result.getByText('Detection & Response')).toBeInTheDocument();
+  });
+
+  it('should render landing page if index not exist', () => {
+    mockUseSourcererDataView.mockReturnValue({
+      ...defaultUseSourcererReturn,
+      indicesExist: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.getByTestId('siem-landing-page')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponsePage')).not.toBeInTheDocument();
+    expect(result.queryByTestId('mock_globalDatePicker')).not.toBeInTheDocument();
+  });
+
+  it('should render loader if sourcerer is loading', () => {
+    mockUseSourcererDataView.mockReturnValue({
+      ...defaultUseSourcererReturn,
+      loading: true,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_globalDatePicker')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseLoader')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseSections')).not.toBeInTheDocument();
+  });
+
+  it('should not render alerts data sections if user has not index read permission', () => {
+    mockUseUserInfo.mockReturnValue({
+      ...defaultUseUserInfoReturn,
+      hasIndexRead: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_RuleAlertsTable')).not.toBeInTheDocument();
+    // TODO: assert other alert sections are not in the document
+    // TODO: assert cases sections are in the document
+  });
+
+  it('should not render alerts data sections if user has not kibana read permission', () => {
+    mockUseUserInfo.mockReturnValue({
+      ...defaultUseUserInfoReturn,
+      canUserREAD: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_RuleAlertsTable')).not.toBeInTheDocument();
+    // TODO: assert all alert sections are not in the document
+    // TODO: assert all cases sections are in the document
+  });
+
+  it('should not render cases data sections if user has not cases read permission', () => {
+    mockUseCasesPermissions.mockReturnValue({ read: false });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_RuleAlertsTable')).toBeInTheDocument();
+    // TODO: assert all alert sections are in the document
+    // TODO: assert all cases sections are not in the document
+  });
+
+  it('should render page permissions message if user has any read permission', () => {
+    mockUseCasesPermissions.mockReturnValue({ read: false });
+    mockUseUserInfo.mockReturnValue({
+      ...defaultUseUserInfoReturn,
+      hasIndexRead: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).not.toBeInTheDocument();
+    expect(result.queryByTestId('noPermissionPage')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx b/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
index f3dc4d400c9c2..2e0030bafa00e 100644
--- a/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
+++ b/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
@@ -4,89 +4,97 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useEffect, useMemo, useState } from 'react';
-import { FormattedRelative } from '@kbn/i18n-react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import React, { useMemo } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 import { SiemSearchBar } from '../../common/components/search_bar';
 import { SecuritySolutionPageWrapper } from '../../common/components/page_wrapper';
-// import { useGlobalTime } from '../../common/containers/use_global_time';
-
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { SecurityPageName } from '../../app/types';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
-import { useAlertsPrivileges } from '../../detections/containers/detection_engine/alerts/use_alerts_privileges';
+import { useUserInfo } from '../../detections/components/user_info';
 import { HeaderPage } from '../../common/components/header_page';
-import { useShallowEqualSelector } from '../../common/hooks/use_selector';
-import { DETECTION_RESPONSE_TITLE, UPDATED, UPDATING } from './translations';
-import { inputsSelectors } from '../../common/store/selectors';
+import { useKibana, useGetUserCasesPermissions } from '../../common/lib/kibana';
+import { RuleAlertsTable } from '../components/detection_response/rule_alerts_table';
 import { LandingPageComponent } from '../../common/components/landing_page';
+import * as i18n from './translations';
+import { EmptyPage } from '../../common/components/empty_page';
+import { AlertsByStatus } from '../components/detection_response/alerts_by_status';
 
-const DetectionResponseComponent = () => {
-  const getGlobalQuery = useMemo(() => inputsSelectors.globalQuery(), []);
-  const { indicesExist, indexPattern, loading: isSourcererLoading } = useSourcererDataView();
-  const [updatedAt, setUpdatedAt] = useState(Date.now());
-  // TODO: link queries with global time queries
-  // const { to, from, deleteQuery, setQuery, isInitializing } = useGlobalTime();
-
-  const queriesLoading: boolean = useShallowEqualSelector(
-    (state) => !!getGlobalQuery(state).find((query) => query.loading)
+const NoPrivilegePage: React.FC = () => {
+  const { docLinks } = useKibana().services;
+  const emptyPageActions = useMemo(
+    () => ({
+      feature: {
+        icon: 'documents',
+        label: i18n.GO_TO_DOCUMENTATION,
+        url: `${docLinks.links.siem.privileges}`,
+        target: '_blank',
+      },
+    }),
+    [docLinks]
   );
-
-  useEffect(() => {
-    if (!queriesLoading) {
-      setUpdatedAt(Date.now());
-    }
-  }, [queriesLoading]);
-
-  const showUpdating = useMemo(
-    () => queriesLoading || isSourcererLoading,
-    [queriesLoading, isSourcererLoading]
+  return (
+    <EmptyPage
+      data-test-subj="noPermissionPage"
+      actions={emptyPageActions}
+      title={i18n.NO_PERMISSIONS_TITLE}
+      message={i18n.NO_PERMISSIONS_MSG}
+    />
   );
+};
 
-  const { hasIndexRead, hasKibanaREAD } = useAlertsPrivileges();
+const DetectionResponseComponent = () => {
+  const { indicesExist, indexPattern, loading: isSourcererLoading } = useSourcererDataView();
+  const { signalIndexName, canUserREAD, hasIndexRead } = useUserInfo();
+  const canReadCases = useGetUserCasesPermissions()?.read;
+  const canReadAlerts = canUserREAD && hasIndexRead;
+
+  if (!canReadAlerts && !canReadCases) {
+    return <NoPrivilegePage />;
+  }
 
   return (
     <>
       {indicesExist ? (
         <>
-          <SecuritySolutionPageWrapper>
-            <HeaderPage title={DETECTION_RESPONSE_TITLE}>
+          <SecuritySolutionPageWrapper data-test-subj="detectionResponsePage">
+            <HeaderPage title={i18n.DETECTION_RESPONSE_TITLE}>
               <SiemSearchBar id="global" indexPattern={indexPattern} hideFilterBar hideQueryInput />
             </HeaderPage>
-            <EuiFlexGroup>
-              {showUpdating ? (
-                <EuiFlexItem grow={false}>{UPDATING}</EuiFlexItem>
-              ) : (
-                <EuiFlexItem grow={false}>
-                  <>{UPDATED} </>
-                  <FormattedRelative
-                    data-test-subj="last-updated-at-date"
-                    key={`formatedRelative-${Date.now()}`}
-                    value={new Date(updatedAt)}
-                  />
+
+            {isSourcererLoading ? (
+              <EuiLoadingSpinner size="l" data-test-subj="detectionResponseLoader" />
+            ) : (
+              <EuiFlexGroup direction="column" data-test-subj="detectionResponseSections">
+                <EuiFlexItem>
+                  <EuiFlexGroup>
+                    {canReadAlerts && (
+                      <EuiFlexItem>
+                        <AlertsByStatus signalIndexName={signalIndexName} />
+                      </EuiFlexItem>
+                    )}
+                    {canReadCases && <EuiFlexItem>{'[cases chart]'}</EuiFlexItem>}
+                  </EuiFlexGroup>
                 </EuiFlexItem>
-              )}
-            </EuiFlexGroup>
 
-            <EuiFlexGroup direction="column">
-              <EuiFlexItem>
-                <EuiFlexGroup>
+                {canReadAlerts && (
                   <EuiFlexItem>
-                    {hasIndexRead && hasKibanaREAD && <>{'[alerts charts]'}</>}
+                    <RuleAlertsTable signalIndexName={signalIndexName} />
                   </EuiFlexItem>
-                  <EuiFlexItem>{'[cases chart]'}</EuiFlexItem>
-                </EuiFlexGroup>
-              </EuiFlexItem>
+                )}
 
-              <EuiFlexItem>{'[rules table]'}</EuiFlexItem>
-              <EuiFlexItem>{'[cases table]'}</EuiFlexItem>
-              <EuiFlexItem>
-                <EuiFlexGroup>
-                  <EuiFlexItem>{'[hosts table]'}</EuiFlexItem>
-                  <EuiFlexItem>{'[users table]'}</EuiFlexItem>
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            </EuiFlexGroup>
+                {canReadCases && <EuiFlexItem>{'[cases table]'}</EuiFlexItem>}
+
+                {canReadAlerts && (
+                  <EuiFlexItem>
+                    <EuiFlexGroup>
+                      <EuiFlexItem>{'[hosts table]'}</EuiFlexItem>
+                      <EuiFlexItem>{'[users table]'}</EuiFlexItem>
+                    </EuiFlexGroup>
+                  </EuiFlexItem>
+                )}
+              </EuiFlexGroup>
+            )}
           </SecuritySolutionPageWrapper>
         </>
       ) : (
diff --git a/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx b/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
index cd941e26e20a6..ad3eff86e6753 100644
--- a/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
@@ -16,7 +16,7 @@ import {
   useMessagesStorage,
   UseMessagesStorage,
 } from '../../common/containers/local_storage/use_messages_storage';
-import { Overview } from './index';
+import { Overview } from '.';
 import { useUserPrivileges } from '../../common/components/user_privileges';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
 import { useFetchIndex } from '../../common/containers/source';
@@ -27,7 +27,7 @@ import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experime
 import { initialUserPrivilegesState } from '../../common/components/user_privileges/user_privileges_context';
 import { EndpointPrivileges } from '../../../common/endpoint/types';
 import { useHostRiskScore } from '../../risk_score/containers';
-import { mockCasesContract } from '../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 const mockNavigateToApp = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/overview/pages/translations.ts b/x-pack/plugins/security_solution/public/overview/pages/translations.ts
index b45216f2f528e..414326dd0539b 100644
--- a/x-pack/plugins/security_solution/public/overview/pages/translations.ts
+++ b/x-pack/plugins/security_solution/public/overview/pages/translations.ts
@@ -57,14 +57,25 @@ export const VIEW_EVENTS = i18n.translate('xpack.securitySolution.overview.viewE
 export const DETECTION_RESPONSE_TITLE = i18n.translate(
   'xpack.securitySolution.detectionResponse.pageTitle',
   {
-    defaultMessage: 'Detection & Response - SOC',
+    defaultMessage: 'Detection & Response',
+  }
+);
+export const NO_PERMISSIONS_MSG = i18n.translate(
+  'xpack.securitySolution.detectionResponse.noPagePermissionsMessage',
+  {
+    defaultMessage:
+      'To view this page you must update privileges. For more information, contact your Kibana administrator.',
+  }
+);
+export const NO_PERMISSIONS_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionResponse.noPermissionsTitle',
+  {
+    defaultMessage: 'Privileges required',
+  }
+);
+export const GO_TO_DOCUMENTATION = i18n.translate(
+  'xpack.securitySolution.detectionResponse.goToDocumentationButton',
+  {
+    defaultMessage: 'View documentation',
   }
 );
-
-export const UPDATING = i18n.translate('xpack.securitySolution.detectionResponse.updating', {
-  defaultMessage: 'Updating...',
-});
-
-export const UPDATED = i18n.translate('xpack.securitySolution.detectionResponse.updated', {
-  defaultMessage: 'Updated',
-});
diff --git a/x-pack/plugins/security_solution/public/overview/routes.tsx b/x-pack/plugins/security_solution/public/overview/routes.tsx
index b4aa19e1e9bc1..f1df9517e7d06 100644
--- a/x-pack/plugins/security_solution/public/overview/routes.tsx
+++ b/x-pack/plugins/security_solution/public/overview/routes.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import {
   LANDING_PATH,
   OVERVIEW_PATH,
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index f966586557bd1..1dc14ababd781 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -10,6 +10,18 @@ import reduceReducers from 'reduce-reducers';
 import { BehaviorSubject, Subject, Subscription } from 'rxjs';
 import { pluck } from 'rxjs/operators';
 import { AnyAction, Reducer } from 'redux';
+import {
+  AppMountParameters,
+  AppUpdater,
+  CoreSetup,
+  CoreStart,
+  PluginInitializerContext,
+  Plugin as IPlugin,
+  DEFAULT_APP_CATEGORIES,
+  AppNavLinkStatus,
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { TimelineState } from '@kbn/timelines-plugin/public';
 import type {
   PluginSetup,
   PluginStart,
@@ -20,17 +32,6 @@ import type {
   SubPlugins,
   StartedSubPlugins,
 } from './types';
-import {
-  AppMountParameters,
-  AppUpdater,
-  CoreSetup,
-  CoreStart,
-  PluginInitializerContext,
-  Plugin as IPlugin,
-  DEFAULT_APP_CATEGORIES,
-  AppNavLinkStatus,
-} from '../../../../src/core/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
 import { initTelemetry } from './common/lib/telemetry';
 import { KibanaServices } from './common/lib/kibana/services';
 import { SOLUTION_NAME } from './common/translations';
@@ -60,7 +61,6 @@ import {
   ExperimentalFeatures,
   parseExperimentalConfigValue,
 } from '../common/experimental_features';
-import type { TimelineState } from '../../timelines/public';
 import { LazyEndpointCustomAssetsExtension } from './management/pages/policy/view/ingest_manager_integration/lazy_endpoint_custom_assets_extension';
 import { initDataView, SourcererModel, KibanaDataView } from './common/store/sourcerer/model';
 import { SecurityDataView } from './common/containers/sourcerer/api';
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
index 413007e44632e..758f942966ea1 100644
--- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaReactContextValue } from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../types';
 import { DataAccessLayer, TimeRange } from '../types';
 import {
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
index 83af8feafcc7f..c4d6987545939 100644
--- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
@@ -5,9 +5,12 @@
  * 2.0.
  */
 
-import { ResolverNode, SafeResolverEvent } from './../../../../common/endpoint/types/index';
-
-import { ResolverRelatedEvents, ResolverEntityIndex } from '../../../../common/endpoint/types';
+import {
+  ResolverNode,
+  SafeResolverEvent,
+  ResolverRelatedEvents,
+  ResolverEntityIndex,
+} from '../../../../common/endpoint/types';
 import { DataAccessLayer } from '../../types';
 
 type PausableRequests =
diff --git a/x-pack/plugins/security_solution/public/resolver/index.ts b/x-pack/plugins/security_solution/public/resolver/index.ts
index 321d3e483c4a4..1869c3c1b11a5 100644
--- a/x-pack/plugins/security_solution/public/resolver/index.ts
+++ b/x-pack/plugins/security_solution/public/resolver/index.ts
@@ -7,7 +7,7 @@
 
 import { Provider } from 'react-redux';
 import { ResolverPluginSetup } from './types';
-import { resolverStoreFactory } from './store/index';
+import { resolverStoreFactory } from './store';
 import { ResolverWithoutProviders } from './view/resolver_without_providers';
 import { noAncestorsTwoChildrenWithRelatedEventsOnOrigin } from './data_access_layer/mocks/no_ancestors_two_children_with_related_events_on_origin';
 
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts
index e09299909c1f8..450f451b71347 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts
@@ -9,7 +9,7 @@ import { ResolverNode } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { generateTree, genResolverNode } from '../../mocks/generator';
 import { IndexedProcessTree } from '../../types';
-import { factory } from './index';
+import { factory } from '.';
 
 describe('factory', () => {
   const originID = 'origin';
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
index f1fdd46caa7e1..b83dd4ba13610 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
@@ -7,7 +7,7 @@
 
 import { ResolverNode } from '../../../../common/endpoint/types';
 import { isometricTaxiLayoutFactory } from './isometric_taxi_layout';
-import { factory } from './index';
+import { factory } from '.';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { genResolverNode } from '../../mocks/generator';
 import { IsometricTaxiLayout } from '../../types';
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
index 177f96ce8c90e..7d45f4ae6e727 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
@@ -19,7 +19,7 @@ import {
 import * as nodeModel from '../../../../common/endpoint/models/node';
 import { ResolverNode } from '../../../../common/endpoint/types';
 import * as vector2 from '../vector2';
-import * as indexedProcessTreeModel from './index';
+import * as indexedProcessTreeModel from '.';
 import { getFriendlyElapsedTime as elapsedTime } from '../../lib/date';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
index d1da7e816d01a..a448df4600baf 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
@@ -12,7 +12,7 @@ import * as selectors from './selectors';
 import { DataState, GeneratedTreeMetadata } from '../../types';
 import { DataAction } from './action';
 import { generateTreeWithDAL } from '../../data_access_layer/mocks/generator_tree';
-import { endpointSourceSchema, winlogSourceSchema } from './../../mocks/tree_schema';
+import { endpointSourceSchema, winlogSourceSchema } from '../../mocks/tree_schema';
 import { NewResolverTree, ResolverSchema } from '../../../../common/endpoint/types';
 import { ancestorsWithAncestryField, descendantsLimit } from '../../models/resolver_tree';
 
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
index b864bb254a5fc..0fb86ec93c89f 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
@@ -16,7 +16,7 @@ import {
   mockTreeWith1AncestorAnd2ChildrenAndAllNodesHave2GraphableEvents,
   mockTreeWithNoProcessEvents,
 } from '../../mocks/resolver_tree';
-import { endpointSourceSchema } from './../../mocks/tree_schema';
+import { endpointSourceSchema } from '../../mocks/tree_schema';
 import * as nodeModel from '../../../../common/endpoint/models/node';
 import { mockTreeFetcherParameters } from '../../mocks/tree_fetcher_parameters';
 import { SafeResolverEvent } from '../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
index 5020aadd0f280..71dcbffb5db67 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
@@ -13,7 +13,7 @@ import { ResolverNode } from '../../../../common/endpoint/types';
 import { visibleNodesAndEdgeLines } from '../selectors';
 import { mock as mockResolverTree } from '../../models/resolver_tree';
 import { mockTreeFetcherParameters } from '../../mocks/tree_fetcher_parameters';
-import { endpointSourceSchema } from './../../mocks/tree_schema';
+import { endpointSourceSchema } from '../../mocks/tree_schema';
 import { mockResolverNode } from '../../mocks/resolver_node';
 
 describe('resolver visible entities', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
index 26cf874edda00..5a5a1ba14e185 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
@@ -16,7 +16,7 @@ import {
 } from '../mocks/resolver_tree';
 import { ResolverNode } from '../../../common/endpoint/types';
 import { mockTreeFetcherParameters } from '../mocks/tree_fetcher_parameters';
-import { endpointSourceSchema } from './../mocks/tree_schema';
+import { endpointSourceSchema } from '../mocks/tree_schema';
 
 describe('resolver selectors', () => {
   const actions: ResolverAction[] = [];
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
index 22de53be9379d..7e1f4d4d73ead 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { Store, createStore, applyMiddleware } from 'redux';
 import { mount, ReactWrapper } from 'enzyme';
 import { History as HistoryPackageHistoryInterface, createMemoryHistory } from 'history';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { spyMiddlewareFactory } from '../spy_middleware_factory';
 import { resolverMiddlewareFactory } from '../../store/middleware';
 import { resolverReducer } from '../../store/reducer';
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx
index b8dbb5611b26c..6d5bdbea48f97 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx
@@ -12,8 +12,8 @@ import { Router } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Provider } from 'react-redux';
 import { Store } from 'redux';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { CoreStart } from '../../../../../../../src/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { ResolverState, SideEffectSimulator, ResolverProps } from '../../types';
 import { ResolverAction } from '../../store/actions';
 import { ResolverWithoutProviders } from '../../view/resolver_without_providers';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/index.tsx b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
index 3c3e0e3e74319..794658758eccf 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
@@ -9,9 +9,9 @@
 
 import React, { useMemo, useState, useEffect } from 'react';
 import { Provider } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { resolverStoreFactory } from '../store';
 import { StartServices } from '../../types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { DataAccessLayer, ResolverProps } from '../types';
 import { dataAccessLayerFactory } from '../data_access_layer/factory';
 import { ResolverWithoutProviders } from './resolver_without_providers';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx
index 4a702d05a3d1b..668c324565520 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx
@@ -11,7 +11,7 @@ import { EuiToolTip, EuiButtonIcon, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import React, { memo, useState, useCallback, useContext, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useColors } from '../use_colors';
 import { StyledPanel } from '../styles';
 import { SideEffectContext } from '../side_effect_context';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx
index e6140f8834799..1c3f1948edc4d 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx
@@ -9,8 +9,8 @@ import { mount } from 'enzyme';
 
 import React from 'react';
 import { useFormattedDate } from './use_formatted_date';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { uiSetting } from '../../mocks/ui_setting';
 
 describe(`useFormattedDate, when the "dateFormat" UI setting is "${uiSetting(
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts
index 53434fb69064c..789f6d8573076 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
-import { useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 
 const invalidDateText = i18n.translate(
   'xpack.securitySolution.enpdoint.resolver.panelutils.invaliddate',
diff --git a/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx b/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx
index fe25547ef99dc..878dbe30a6971 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/submenu.tsx
@@ -5,66 +5,17 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import React, { useMemo, useContext, useCallback } from 'react';
-import { FormattedMessage } from '@kbn/i18n-react';
 import { useDispatch } from 'react-redux';
-import { EuiI18nNumber } from '@elastic/eui';
 import { EventStats } from '../../../common/endpoint/types';
 import { useColors } from './use_colors';
 import { useLinkProps } from './use_link_props';
 import { ResolverAction } from '../store/actions';
 import { SideEffectContext } from './side_effect_context';
+import { FormattedCount } from '../../common/components/formatted_number';
 
 /* eslint-disable react/display-name */
 
-/**
- * Until browser support accomodates the `notation="compact"` feature of Intl.NumberFormat...
- * exported for testing
- * @param num The number to format
- * @returns [mantissa ("12" in "12k+"), Scalar of compact notation (k,M,B,T), remainder indicator ("+" in "12k+")]
- */
-export function compactNotationParts(
-  num: number
-): [mantissa: number, compactNotation: string, remainderIndicator: string] {
-  if (!Number.isFinite(num)) {
-    return [num, '', ''];
-  }
-
-  // "scale" here will be a term indicating how many thousands there are in the number
-  // e.g. 1001 will be 1000, 1000002 will be 1000000, etc.
-  const scale = Math.pow(10, 3 * Math.min(Math.floor(Math.floor(Math.log10(num)) / 3), 4));
-
-  const compactPrefixTranslations = {
-    compactThousands: i18n.translate('xpack.securitySolution.endpoint.resolver.compactThousands', {
-      defaultMessage: 'k',
-    }),
-    compactMillions: i18n.translate('xpack.securitySolution.endpoint.resolver.compactMillions', {
-      defaultMessage: 'M',
-    }),
-
-    compactBillions: i18n.translate('xpack.securitySolution.endpoint.resolver.compactBillions', {
-      defaultMessage: 'B',
-    }),
-
-    compactTrillions: i18n.translate('xpack.securitySolution.endpoint.resolver.compactTrillions', {
-      defaultMessage: 'T',
-    }),
-  };
-  const prefixMap: Map<number, string> = new Map([
-    [1, ''],
-    [1000, compactPrefixTranslations.compactThousands],
-    [1000000, compactPrefixTranslations.compactMillions],
-    [1000000000, compactPrefixTranslations.compactBillions],
-    [1000000000000, compactPrefixTranslations.compactTrillions],
-  ]);
-  const hasRemainder = i18n.translate('xpack.securitySolution.endpoint.resolver.compactOverflow', {
-    defaultMessage: '+',
-  });
-  const prefix = prefixMap.get(scale) ?? '';
-  return [Math.floor(num / scale), prefix, (num / scale) % 1 > Number.EPSILON ? hasRemainder : ''];
-}
-
 /**
  * A Submenu that displays a collection of "pills" for each related event
  * category it has events for.
@@ -89,15 +40,7 @@ export const NodeSubMenuComponents = React.memo(
         return [];
       } else {
         return Object.entries(nodeStats.byCategory).map(([category, total]) => {
-          const [mantissa, scale, hasRemainder] = compactNotationParts(total || 0);
-          const prefix = (
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.node.pillNumber"
-              description=""
-              defaultMessage="{mantissa}{scale}{hasRemainder}"
-              values={{ mantissa: <EuiI18nNumber value={mantissa} />, scale, hasRemainder }}
-            />
-          );
+          const prefix = <FormattedCount count={total || 0} />;
           return {
             prefix,
             category,
diff --git a/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx b/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx
index 987ac9849f722..9f73f1080aab8 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx
@@ -10,7 +10,7 @@
 import React, { memo } from 'react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
-import { useUiSetting } from '../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { useSymbolIDs } from './use_symbol_ids';
 import { usePaintServerIDs } from './use_paint_server_ids';
 
diff --git a/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx b/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx
index fe91c2fc1af9e..8ddd081088686 100644
--- a/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx
+++ b/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { createFilter } from '../../../common/containers/helpers';
 import { useKibana } from '../../../common/lib/kibana';
 import {
@@ -25,7 +26,6 @@ import {
 import { ESQuery } from '../../../../common/typed_json';
 
 import * as i18n from './translations';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx b/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx
index bad3799b42ed3..13335a3e82e40 100644
--- a/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx
+++ b/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx
@@ -9,6 +9,8 @@ import type { Observable } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { useEffect, useMemo } from 'react';
 import { useObservable, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { createFilter } from '../../../common/containers/helpers';
 
 import {
@@ -21,9 +23,6 @@ import {
   RiskSeverity,
 } from '../../../../common/search_strategy';
 
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
-
 import { useKibana } from '../../../common/lib/kibana';
 import { isIndexNotFoundError } from '../../../common/utils/exceptions';
 import { ESTermQuery } from '../../../../common/typed_json';
diff --git a/x-pack/plugins/security_solution/public/rules/index.ts b/x-pack/plugins/security_solution/public/rules/index.ts
index e74efabad4932..10af0407c18e6 100644
--- a/x-pack/plugins/security_solution/public/rules/index.ts
+++ b/x-pack/plugins/security_solution/public/rules/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { SecuritySubPlugin } from '../app/types';
 import { DETECTIONS_TIMELINE_IDS } from '../detections';
diff --git a/x-pack/plugins/security_solution/public/rules/routes.tsx b/x-pack/plugins/security_solution/public/rules/routes.tsx
index 4172e75a3cd96..468e2b41e9290 100644
--- a/x-pack/plugins/security_solution/public/rules/routes.tsx
+++ b/x-pack/plugins/security_solution/public/rules/routes.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import * as i18n from './translations';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { RULES_PATH, SecurityPageName } from '../../common/constants';
 import { NotFoundPage } from '../app/404';
 import { RulesPage } from '../detections/pages/detection_engine/rules';
diff --git a/x-pack/plugins/security_solution/public/shared_imports.ts b/x-pack/plugins/security_solution/public/shared_imports.ts
index 421b92a6e8b7f..30c2b4d2584ce 100644
--- a/x-pack/plugins/security_solution/public/shared_imports.ts
+++ b/x-pack/plugins/security_solution/public/shared_imports.ts
@@ -13,7 +13,7 @@ export type {
   FormSchema,
   ValidationError,
   ValidationFunc,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   getUseField,
   getFieldValidityAndErrorMessage,
@@ -26,7 +26,7 @@ export {
   useFormContext,
   useFormData,
   VALIDATION_TYPES,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-export { Field, SelectField } from '../../../../src/plugins/es_ui_shared/static/forms/components';
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
-export type { ERROR_CODE } from '../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+export { Field, SelectField } from '@kbn/es-ui-shared-plugin/static/forms/components';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
+export type { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx
index f81146a612f5c..5f2f47073be6c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { useCreateFieldButton, UseCreateFieldButton, UseCreateFieldButtonProps } from './index';
+import { useCreateFieldButton, UseCreateFieldButton, UseCreateFieldButtonProps } from '.';
 
 import { TestProviders } from '../../../../common/mock';
 import { renderHook } from '@testing-library/react-hooks';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx
index 6a758d8deb9b0..f20e7dce7d8bd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx
@@ -9,7 +9,7 @@ import React, { useCallback } from 'react';
 import { EuiButton } from '@elastic/eui';
 import styled from 'styled-components';
 
-import type { CreateFieldComponent } from '../../../../../../timelines/common/types';
+import type { CreateFieldComponent } from '@kbn/timelines-plugin/common/types';
 import type { OpenFieldEditor } from '..';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx
index 511998d02867f..7b3b303dc2962 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { useFieldTableColumns, UseFieldTableColumnsProps, UseFieldTableColumns } from './index';
+import { useFieldTableColumns, UseFieldTableColumnsProps, UseFieldTableColumns } from '.';
 
 import { TestProviders } from '../../../../common/mock';
 import { renderHook } from '@testing-library/react-hooks';
-import { BrowserFieldItem } from '../../../../../../timelines/common/types';
+import { BrowserFieldItem } from '@kbn/timelines-plugin/common/types';
 import { EuiInMemoryTable } from '@elastic/eui';
 
 const mockOnHide = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx
index 48354491562d6..29622eadb6a08 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx
@@ -19,10 +19,7 @@ import {
   EuiHighlight,
 } from '@elastic/eui';
 import { Action } from '@elastic/eui/src/components/basic_table/action_types';
-import type {
-  BrowserFieldItem,
-  GetFieldTableColumns,
-} from '../../../../../../timelines/common/types';
+import type { BrowserFieldItem, GetFieldTableColumns } from '@kbn/timelines-plugin/common/types';
 
 import * as i18n from './translations';
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx
index 03c04066f0c11..8f4fc13ddbe3b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx
@@ -12,22 +12,22 @@ import {
   UseFieldBrowserOptionsProps,
   UseFieldBrowserOptions,
   FieldEditorActionsRef,
-} from './index';
+} from '.';
 import {
   indexPatternFieldEditorPluginMock,
   Start,
-} from '../../../../../../../src/plugins/data_view_field_editor/public/mocks';
+} from '@kbn/data-view-field-editor-plugin/public/mocks';
 
 import { TestProviders } from '../../../common/mock';
 import { useKibana } from '../../../common/lib/kibana';
-import type { DataView, DataViewField } from '../../../../../../../src/plugins/data/common';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
 import { TimelineId } from '../../../../common/types';
 import { renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import { removeColumn, upsertColumn } from '../../store/timeline/actions';
 import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/constants';
-import { BrowserFieldItem } from '../../../../../timelines/common/types';
+import { BrowserFieldItem } from '@kbn/timelines-plugin/common/types';
 import { EuiInMemoryTable } from '@elastic/eui';
 
 let mockIndexPatternFieldEditor: Start;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
index b38b6d03749c9..35bb1f8e888fe 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
@@ -7,11 +7,11 @@
 
 import { MutableRefObject, useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { DataViewField, DataView } from '../../../../../../../src/plugins/data_views/common';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/common';
 import type {
   CreateFieldComponent,
   GetFieldTableColumns,
-} from '../../../../../timelines/common/types';
+} from '@kbn/timelines-plugin/common/types';
 import { TimelineId } from '../../../../common/types';
 import { useDataView } from '../../../common/containers/source/use_data_view';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx
index 5d85e1c4b3f14..02381f8347ff2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, ReactWrapper } from 'enzyme';
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 
-import { AddTimelineButton } from './';
+import { AddTimelineButton } from '.';
 import { useKibana } from '../../../../common/lib/kibana';
 import { TimelineId } from '../../../../../common/types/timeline';
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
index c83507570410d..b48361202e54b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
@@ -10,16 +10,16 @@ import { EuiButton, EuiContextMenuPanel, EuiContextMenuItem, EuiPopover } from '
 import React, { useCallback, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Case } from '../../../../../../cases/common';
+import { Case } from '@kbn/cases-plugin/common';
 import { APP_ID, APP_UI_ID } from '../../../../../common/constants';
-import { timelineSelectors } from '../../../../timelines/store/timeline';
+import { timelineSelectors } from '../../../store/timeline';
 import { setInsertTimeline, showTimeline } from '../../../store/timeline/actions';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import { TimelineStatus, TimelineId, TimelineType } from '../../../../../common/types/timeline';
 import { getCreateCaseUrl, getCaseDetailsUrl } from '../../../../common/components/link_to';
 import { SecurityPageName } from '../../../../app/types';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import * as i18n from '../../timeline/properties/translations';
 
 interface Props {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
index fba78be83fa36..a269ae6989598 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
@@ -21,6 +21,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { FormattedRelative } from '@kbn/i18n-react';
 
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import {
   TimelineStatus,
@@ -30,7 +31,7 @@ import {
 } from '../../../../../common/types/timeline';
 import { State } from '../../../../common/store';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { AddToFavoritesButton } from '../../timeline/properties/helpers';
 import { TimerangeInput } from '../../../../../common/search_strategy';
 import { AddToCaseButton } from '../add_to_case_button';
@@ -39,9 +40,8 @@ import { SaveTimelineButton } from '../../timeline/header/save_timeline_button';
 import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import { InspectButton } from '../../../../common/components/inspect';
 import { useTimelineKpis } from '../../../containers/kpis';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 import {
   startSelector,
   endSelector,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
index aa501965193dd..ab8ab6a3f4383 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
@@ -10,7 +10,7 @@ import { EuiFocusTrap, EuiOutsideClickDetector } from '@elastic/eui';
 import React, { useEffect, useMemo, useCallback, useState, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { AppLeaveHandler } from '../../../../../../../src/core/public';
+import { AppLeaveHandler } from '@kbn/core/public';
 import { TimelineId, TimelineStatus, TimelineTabs } from '../../../../common/types/timeline';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { timelineActions } from '../../store/timeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx
index 8c4356e100c15..ba965cd7ad3d4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx
@@ -13,7 +13,7 @@ import { TimelineId } from '../../../../../common/types/timeline';
 import { Pane } from '.';
 
 jest.mock('../../../../common/lib/kibana');
-jest.mock('../../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../../common/components/url_state/normalize_time_range');
 
 jest.mock('../../../../common/hooks/use_resolve_conflict', () => {
   return {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx
index 80fdd6dfc7dd4..ee0551c5f5296 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx
@@ -8,10 +8,10 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { FormattedIp } from './index';
+import { FormattedIp } from '.';
 import { TestProviders } from '../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../common/types';
-import { StatefulEventContext } from '../../../../../timelines/public';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { timelineActions } from '../../store/timeline';
 import { activeTimeline } from '../../containers/active_timeline_context';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
index e1f0954683e04..72d5ad43e91e2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
@@ -11,6 +11,7 @@ import { useDispatch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { FlowTarget } from '../../../../common/search_strategy/security_solution/network';
 import {
   DragEffects,
@@ -19,12 +20,9 @@ import {
 import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers';
 import { Content } from '../../../common/components/draggables';
 import { getOrEmptyTagFromValue } from '../../../common/components/empty_value';
-import { parseQueryValue } from '../../../timelines/components/timeline/body/renderers/parse_query_value';
-import {
-  DataProvider,
-  IS_OPERATOR,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
-import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
+import { parseQueryValue } from '../timeline/body/renderers/parse_query_value';
+import { DataProvider, IS_OPERATOR } from '../timeline/data_providers/data_provider';
+import { Provider } from '../timeline/data_providers/provider';
 import {
   TimelineExpandedDetailType,
   TimelineId,
@@ -33,7 +31,6 @@ import {
 import { activeTimeline } from '../../containers/active_timeline_context';
 import { timelineActions } from '../../store/timeline';
 import { NetworkDetailsLink } from '../../../common/components/links';
-import { StatefulEventContext } from '../../../../../timelines/public';
 
 const getUniqueId = ({
   contextId,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
index 2087bb1a5e511..7ddb09e28fead 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
@@ -59,7 +59,8 @@ const StyledResolver = styled(Resolver)`
 `;
 
 const ScrollableFlexItem = styled(EuiFlexItem)`
-  ${({ theme }) => `margin: 0 ${theme.eui.euiSizeM};`}
+  ${({ theme }) => `padding: 0 ${theme.eui.euiSizeM};
+  background-color: ${theme.eui.euiColorEmptyShade};`}
   overflow: hidden;
   width: 100%;
 `;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
index 00d2a7b35483e..fb9cdd37bf4db 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
@@ -9,7 +9,7 @@ import { EuiFlexGroup, EuiPanel, EuiScreenReaderOnly } from '@elastic/eui';
 import React, { useState, useCallback } from 'react';
 import styled from 'styled-components';
 
-import { getNotesContainerClassName } from '../../../../../../timelines/public';
+import { getNotesContainerClassName } from '@kbn/timelines-plugin/public';
 import { AddNote } from '../add_note';
 import { AssociateNote } from '../helpers';
 import { NotePreviews, NotePreviewsContainer } from '../../open_timeline/note_previews';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
index 225158061ad21..6a7738de7b318 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
@@ -52,7 +52,7 @@ import {
 import { resolveTimeline } from '../../containers/api';
 
 jest.mock('../../../common/store/inputs/actions');
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 jest.mock('../../store/timeline/actions');
 jest.mock('../../../common/store/app/actions');
 jest.mock('uuid', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index 31748f40a4b2a..8d69e822d0990 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -38,9 +38,9 @@ import {
   applyKqlFilterQuery as dispatchApplyKqlFilterQuery,
   addTimeline as dispatchAddTimeline,
   addNote as dispatchAddGlobalTimelineNote,
-} from '../../../timelines/store/timeline/actions';
-import { TimelineModel } from '../../../timelines/store/timeline/model';
-import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
+} from '../../store/timeline/actions';
+import { TimelineModel } from '../../store/timeline/model';
+import { timelineDefaults } from '../../store/timeline/defaults';
 
 import {
   defaultColumnHeaderType,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
index f12731396c053..b6163ea93169e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
@@ -10,12 +10,12 @@ import { useDispatch } from 'react-redux';
 
 import { useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { SortFieldTimeline, TimelineId } from '../../../../common/types/timeline';
-import { TimelineModel } from '../../../timelines/store/timeline/model';
-import { timelineSelectors } from '../../../timelines/store/timeline';
+import { TimelineModel } from '../../store/timeline/model';
+import { timelineSelectors } from '../../store/timeline';
 import {
   createTimeline as dispatchCreateNewTimeline,
   updateIsLoading as dispatchUpdateIsLoading,
-} from '../../../timelines/store/timeline/actions';
+} from '../../store/timeline/actions';
 
 import { useGetAllTimeline } from '../../containers/all';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx
index c23cffa854514..c2423da9ca372 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx
@@ -8,7 +8,7 @@
 import { EuiModal } from '@elastic/eui';
 import React from 'react';
 
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 
 import * as i18n from '../translations';
 import { ActionTimelineToShow } from '../types';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
index e2184aaaec773..ddf35eec86e04 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
@@ -29,6 +29,7 @@ describe('OpenTimelineModal', () => {
       euiBreakpoints: {
         s: '500px',
       },
+      paddingSizes: { m: '16px' },
     },
   });
   const title = 'All Timelines / Open Timelines';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/title_row/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/title_row/index.test.tsx
index d46cad3c43a98..9e54d708db496 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/title_row/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/title_row/index.test.tsx
@@ -14,7 +14,13 @@ import { TitleRow } from '.';
 import { getMockTheme } from '../../../../common/lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({
-  eui: { euiSizeS: '10px', euiLineHeight: 10, euiBreakpoints: { s: '10px' }, euiSize: '10px' },
+  eui: {
+    euiSizeS: '10px',
+    euiLineHeight: 10,
+    euiBreakpoints: { s: '10px' },
+    euiSize: '10px',
+    paddingSizes: { m: '16px' },
+  },
 });
 
 describe('TitleRow', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx
index 5402210d22cce..66bbca5c7c18c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx
@@ -31,8 +31,8 @@ jest.mock('../../../common/components/link_to', () => {
   };
 });
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const originalModule = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const originalModule = jest.requireActual('@kbn/kibana-react-plugin/public');
   const useKibana = jest.fn().mockImplementation(() => ({
     services: {
       application: {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx
index d6aa34f2528e5..23456e62a26f7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx
@@ -24,7 +24,6 @@ const AlertsExampleComponent: React.FC = () => {
   return (
     <>
       {alertsRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndpointProcessExecutionMalwarePreventionAlert,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx
index 2c6ce5886462b..f6b3962412267 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx
@@ -21,7 +21,6 @@ const AuditdExampleComponent: React.FC = () => {
   return (
     <>
       {auditdRowRenderer.renderRow({
-        browserFields: {},
         data: mockTimelineData[26].ecs,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx
index a525b26571dc8..fff934ed55039 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx
@@ -21,7 +21,6 @@ const AuditdFileExampleComponent: React.FC = () => {
   return (
     <>
       {auditdFileRowRenderer.renderRow({
-        browserFields: {},
         data: mockTimelineData[27].ecs,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx
index f8704b63fe47e..cf1ddafcd4b0a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx
@@ -21,7 +21,6 @@ const LibraryExampleComponent: React.FC = () => {
   return (
     <>
       {libraryRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndpointLibraryLoadEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx
index c5a0f09440899..b9755bcf573b5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const NetflowExampleComponent: React.FC = () => (
   <>
     {netflowRowRenderer.renderRow({
-      browserFields: {},
       data: getMockNetflowData(),
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx
index 67859db1a5ea4..8742b0e62dfa3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx
@@ -21,7 +21,6 @@ const RegistryExampleComponent: React.FC = () => {
   return (
     <>
       {registryRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndpointRegistryModificationEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx
index 1e6caca2effa9..1c26ee13229bd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const SuricataExampleComponent: React.FC = () => (
   <>
     {suricataRowRenderer.renderRow({
-      browserFields: {},
       data: mockTimelineData[2].ecs,
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx
index 7d38f8feaace6..649edd08c450f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx
@@ -21,7 +21,6 @@ const SystemExampleComponent: React.FC = () => {
   return (
     <>
       {systemRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameTerminationEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx
index 72c5060b27701..0566cf503443b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx
@@ -17,7 +17,6 @@ const SystemDnsExampleComponent: React.FC = () => {
   return (
     <>
       {systemDnsRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameDnsRequest,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx
index 6103746b3238b..3af5d401bc3ac 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx
@@ -21,7 +21,6 @@ const SystemEndgameProcessExampleComponent: React.FC = () => {
   return (
     <>
       {systemEndgameProcessRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameCreationEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx
index cb8668536f8d2..d693c7df1b06f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx
@@ -21,7 +21,6 @@ const SystemFileExampleComponent: React.FC = () => {
   return (
     <>
       {systemFileRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameFileDeleteEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx
index 12ad132131d1b..257719e573986 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx
@@ -21,7 +21,6 @@ const SystemFimExampleComponent: React.FC = () => {
   return (
     <>
       {systemFimRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameFileCreateEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx
index 8dfb0bf998738..9490a9e776e73 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx
@@ -19,7 +19,6 @@ const SystemSecurityEventExampleComponent: React.FC = () => {
   return (
     <>
       {systemSecurityEventRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameUserLogon,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx
index 7fa430e812625..47dd0122a47fe 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx
@@ -20,7 +20,6 @@ const SystemSocketExampleComponent: React.FC = () => {
   return (
     <>
       {systemSocketRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameIpv4ConnectionAcceptEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx
index 73d458a23ca17..cffa39584a624 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const ThreatMatchExampleComponent: React.FC = () => (
   <>
     {threatMatchRowRenderer.renderRow({
-      browserFields: {},
       data: mockTimelineData[31].ecs,
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx
index 83d9e0122e971..f47fa275245a6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const ZeekExampleComponent: React.FC = () => (
   <>
     {zeekRowRenderer.renderRow({
-      browserFields: {},
       data: mockTimelineData[13].ecs,
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx
index ad79e075903a0..55cdcb229bba4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx
@@ -14,8 +14,8 @@ import { Ecs } from '../../../../../common/ecs';
 import { mockAlertDetailsData } from '../../../../common/components/event_details/__mocks__';
 import type { TimelineEventsDetailsItem } from '../../../../../common/search_strategy';
 import { KibanaServices, useKibana } from '../../../../common/lib/kibana';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { mockCasesContract } from '../../../../../../cases/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 const ecsData: Ecs = {
   _id: '1',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx
index 5147301b4ea5d..488cd1758565d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import { render } from '@testing-library/react';
-import { EventDetailsPanel } from './';
+import { EventDetailsPanel } from '.';
 import '../../../../common/mock/match_media';
 import { TestProviders } from '../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
@@ -23,8 +23,8 @@ import {
   mockDocValueFields,
   mockRuntimeMappings,
 } from '../../../../common/containers/source/mock';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { coreMock } from '@kbn/core/public/mocks';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
 const ecsData: Ecs = {
   _id: '1',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
index 2dfd219ea7da5..a5de47f5e8913 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
@@ -18,6 +18,7 @@ import React, { useState, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { BrowserFields, DocValueFields } from '../../../../common/containers/source';
 import { ExpandableEvent, ExpandableEventTitle } from './expandable_event';
 import { useTimelineEventsDetails } from '../../../containers/details';
@@ -32,7 +33,6 @@ import { getFieldValue } from '../../../../detections/components/host_isolation/
 import { ALERT_DETAILS } from './translations';
 import { useWithCaseDetailsRefresh } from '../../../../common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context';
 import { EventDetailsFooter } from './footer';
-import { EntityType } from '../../../../../../timelines/common';
 import { buildHostNamesFilter } from '../../../../../common/search_strategy';
 import { useHostRiskScore, HostRisk } from '../../../../risk_score/containers';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
index 4c5f4d048f367..f54b2b2433832 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
@@ -7,8 +7,8 @@
 
 import React, { useMemo, useCallback, useRef } from 'react';
 import { useDispatch } from 'react-redux';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import type { EntityType } from '../../../../../../timelines/common';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
 import { activeTimeline } from '../../../containers/active_timeline_context';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
index 9809a15eee23c..31118e4e66897 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
@@ -17,7 +17,7 @@ import {
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { createStore, State } from '../../../common/store';
-import { DetailsPanel } from './index';
+import { DetailsPanel } from '.';
 import {
   TimelineExpandedDetail,
   TimelineId,
@@ -26,7 +26,7 @@ import {
 import { FlowTarget } from '../../../../common/search_strategy/security_solution/network';
 import { EventDetailsPanel } from './event_details';
 import { useKibana } from '../../../common/lib/kibana';
-import { mockCasesContext } from '../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
 jest.mock('../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
index b943d3251c476..dee4926cf5bec 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
@@ -10,6 +10,7 @@ import { useDispatch } from 'react-redux';
 import { EuiFlyout, EuiFlyoutProps } from '@elastic/eui';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineActions, timelineSelectors } from '../../store/timeline';
 import { timelineDefaults } from '../../store/timeline/defaults';
 import { BrowserFields, DocValueFields } from '../../../common/containers/source';
@@ -18,7 +19,6 @@ import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { EventDetailsPanel } from './event_details';
 import { HostDetailsPanel } from './host_details';
 import { NetworkDetailsPanel } from './network_details';
-import { EntityType } from '../../../../../timelines/common';
 import { UserDetailsPanel } from './user_details';
 
 interface DetailsPanelProps {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx
index 242767eac2432..440d8280e19aa 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import React, { useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useInvalidFilterQuery } from '../../../../common/hooks/use_invalid_filter_query';
 import { FlowTarget } from '../../../../../common/search_strategy';
 import { NetworkDetailsLink } from '../../../../common/components/links';
@@ -22,7 +23,6 @@ import { useKibana } from '../../../../common/lib/kibana';
 import { convertToBuildEsQuery } from '../../../../common/lib/keury';
 import { inputsSelectors } from '../../../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../../../common/store/inputs/actions';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { useNetworkDetails } from '../../../../network/containers/details';
 import { networkModel } from '../../../../network/store';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
index 7012cf89896f9..2bcac278f85d9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
@@ -8,8 +8,8 @@
 import React, { MouseEvent } from 'react';
 import { EuiContextMenuItem, EuiButtonIcon, EuiToolTip, EuiText } from '@elastic/eui';
 
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { EventsTdContent } from '../../styles';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 
 interface ActionIconItemProps {
   ariaLabel?: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx
index 0e26edc6ae1c1..2c9a538a96076 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx
@@ -16,6 +16,7 @@ import {
 import { useDispatch } from 'react-redux';
 
 import styled from 'styled-components';
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import {
   HeaderActionProps,
   SortDirection,
@@ -28,7 +29,6 @@ import {
   useGlobalFullScreen,
   useTimelineFullScreen,
 } from '../../../../../common/containers/use_full_screen';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 import { StatefulRowRenderersBrowser } from '../../../row_renderers_browser';
 import { EventsTh, EventsThContent } from '../../styles';
 import { EventsSelect } from '../column_headers/events_select';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
index 7a94dcef31cf7..197cf4e1d09a4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
@@ -12,7 +12,7 @@ import { TestProviders, mockTimelineModel, mockTimelineData } from '../../../../
 import { Actions } from '.';
 import { mockTimelines } from '../../../../../common/mock/mock_timelines_plugin';
 import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
-import { mockCasesContract } from '../../../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../../../detections/components/user_info', () => ({
   useUserData: jest.fn().mockReturnValue([{ canUserCRUD: true, hasIndexWrite: true }]),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
index b319ae12e7613..05815d92b3feb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
@@ -11,6 +11,7 @@ import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elas
 import { noop } from 'lodash/fp';
 import styled from 'styled-components';
 
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { eventHasNotes, getEventType, getPinOnClick } from '../helpers';
 import { AlertContextMenu } from '../../../../../detections/components/alerts_table/timeline_actions/alert_context_menu';
@@ -19,7 +20,6 @@ import { AddEventNoteAction } from './add_note_icon_item';
 import { PinEventAction } from './pin_event_action';
 import { EventsTdContent } from '../../styles';
 import * as i18n from '../translations';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 import { useShallowEqualSelector } from '../../../../../common/hooks/use_selector';
 import {
   setActiveTabTimeline,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
index 9527ad4e3ee44..68773090f06be 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
@@ -8,8 +8,8 @@
 import React, { useMemo } from 'react';
 import { EuiToolTip } from '@elastic/eui';
 
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { EventsTdContent } from '../../styles';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 import { eventHasNotes, getPinTooltip } from '../helpers';
 import { Pin } from '../../pin';
 import { TimelineType } from '../../../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx
index 74593e40ddf4c..67fcff7de1332 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx
@@ -9,7 +9,6 @@ import { EuiContextMenu, EuiContextMenuPanelDescriptor, EuiIcon, EuiPopover } fr
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import { Resizable, ResizeCallback } from 're-resizable';
-import deepEqual from 'fast-deep-equal';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { DRAGGABLE_KEYBOARD_WRAPPER_CLASS_NAME } from '@kbn/securitysolution-t-grid';
@@ -298,14 +297,4 @@ const ColumnHeaderComponent: React.FC<ColumneHeaderProps> = ({
   );
 };
 
-export const ColumnHeader = React.memo(
-  ColumnHeaderComponent,
-  (prevProps, nextProps) =>
-    prevProps.draggableIndex === nextProps.draggableIndex &&
-    prevProps.tabType === nextProps.tabType &&
-    prevProps.timelineId === nextProps.timelineId &&
-    prevProps.isDragging === nextProps.isDragging &&
-    prevProps.onFilterChange === nextProps.onFilterChange &&
-    deepEqual(prevProps.sort, nextProps.sort) &&
-    deepEqual(prevProps.header, nextProps.header)
-);
+export const ColumnHeader = React.memo(ColumnHeaderComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx
index 22c0b78885f5d..e3e1d49f2eb9c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx
@@ -8,7 +8,7 @@
 import { mount, shallow } from 'enzyme';
 import React from 'react';
 
-import { ColumnHeaderType } from '../../../../../../timelines/store/timeline/model';
+import { ColumnHeaderType } from '../../../../../store/timeline/model';
 import { defaultHeaders } from '../default_headers';
 
 import { Filter } from '.';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx
index 9df435c277777..e1a193e2a414b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../common/mock/match_media';
-import { getActionsColumnWidth } from '../../../../../../../timelines/public';
+import { getActionsColumnWidth } from '@kbn/timelines-plugin/public';
 import { defaultHeaders } from './default_headers';
 import { mockBrowserFields } from '../../../../../common/containers/source/mock';
 import { Sort } from '../sort';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
index 56984452964de..2bd5eda49bd98 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import deepEqual from 'fast-deep-equal';
+
 import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import { Droppable, DraggableChildrenFn } from 'react-beautiful-dnd';
 
@@ -312,19 +312,4 @@ export const ColumnHeadersComponent = ({
   );
 };
 
-export const ColumnHeaders = React.memo(
-  ColumnHeadersComponent,
-  (prevProps, nextProps) =>
-    prevProps.actionsColumnWidth === nextProps.actionsColumnWidth &&
-    prevProps.isEventViewer === nextProps.isEventViewer &&
-    prevProps.isSelectAllChecked === nextProps.isSelectAllChecked &&
-    prevProps.onSelectAll === nextProps.onSelectAll &&
-    prevProps.show === nextProps.show &&
-    prevProps.showEventsSelect === nextProps.showEventsSelect &&
-    prevProps.showSelectAllCheckbox === nextProps.showSelectAllCheckbox &&
-    deepEqual(prevProps.sort, nextProps.sort) &&
-    prevProps.timelineId === nextProps.timelineId &&
-    deepEqual(prevProps.columnHeaders, nextProps.columnHeaders) &&
-    prevProps.tabType === nextProps.tabType &&
-    deepEqual(prevProps.browserFields, nextProps.browserFields)
-);
+export const ColumnHeaders = React.memo(ColumnHeadersComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx
index d1457200bca8a..11e8dd7f4d329 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 
+import { getActionsColumnWidth } from '@kbn/timelines-plugin/public';
 import { ControlColumnProps } from '../../../../../../common/types/timeline';
 import { Actions } from '../actions';
-import { getActionsColumnWidth } from '../../../../../../../timelines/public';
 import * as i18n from '../../../../../common/components/events_viewer/translations';
 
 export const getDefaultControlColumn = (actionButtonCount: number): ControlColumnProps[] => [
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
index d9879cc2e12af..3aa5b2ea7376b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
@@ -10,9 +10,9 @@ import React, { useMemo } from 'react';
 import { getOr } from 'lodash/fp';
 import { DRAGGABLE_KEYBOARD_WRAPPER_CLASS_NAME } from '@kbn/securitysolution-t-grid';
 
+import type { SetEventsLoading, SetEventsDeleted } from '@kbn/timelines-plugin/common';
 import { Ecs } from '../../../../../../common/ecs';
 import { TimelineNonEcsData } from '../../../../../../common/search_strategy/timeline';
-import type { SetEventsLoading, SetEventsDeleted } from '../../../../../../../timelines/common';
 import {
   ColumnHeaderOptions,
   CellValueElementProps,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
index ac4a09c01cc06..334bd464f700f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
@@ -19,8 +19,8 @@ import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use
 import { getDefaultControlColumn } from '../control_columns';
 import { testLeadingControlColumn } from '../../../../../common/mock/mock_timeline_control_columns';
 import { mockTimelines } from '../../../../../common/mock/mock_timelines_plugin';
-import { getActionsColumnWidth } from '../../../../../../../timelines/public';
-import { mockCasesContract } from '../../../../../../../cases/public/mocks';
+import { getActionsColumnWidth } from '@kbn/timelines-plugin/public';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../../../common/hooks/use_experimental_features');
 const useIsExperimentalFeatureEnabledMock = useIsExperimentalFeatureEnabled as jest.Mock;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
index 3876b91c8bdaa..ae576e7c81512 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
@@ -7,9 +7,9 @@
 
 import React, { useMemo } from 'react';
 
+import type { SetEventsLoading, SetEventsDeleted } from '@kbn/timelines-plugin/common';
 import { Ecs } from '../../../../../../common/ecs';
 import { TimelineNonEcsData } from '../../../../../../common/search_strategy/timeline';
-import type { SetEventsLoading, SetEventsDeleted } from '../../../../../../../timelines/common';
 import { OnRowSelected } from '../../events';
 import { EventsTrData, EventsTdGroupActions } from '../../styles';
 import { DataDrivenColumns, getMappedNonEcsValue } from '../data_driven_columns';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
index c09de87c87f32..69d97a4e248ea 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { isEmpty } from 'lodash';
 
 import { inputsModel } from '../../../../../common/store';
-import { BrowserFields } from '../../../../../common/containers/source';
 import {
   TimelineItem,
   TimelineNonEcsData,
@@ -31,7 +30,6 @@ const ARIA_ROW_INDEX_OFFSET = 2;
 
 interface Props {
   actionsColumnWidth: number;
-  browserFields: BrowserFields;
   columnHeaders: ColumnHeaderOptions[];
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
   data: TimelineItem[];
@@ -55,7 +53,6 @@ interface Props {
 
 const EventsComponent: React.FC<Props> = ({
   actionsColumnWidth,
-  browserFields,
   columnHeaders,
   containerRef,
   data,
@@ -81,7 +78,6 @@ const EventsComponent: React.FC<Props> = ({
       <StatefulEvent
         actionsColumnWidth={actionsColumnWidth}
         ariaRowindex={i + ARIA_ROW_INDEX_OFFSET}
-        browserFields={browserFields}
         columnHeaders={columnHeaders}
         containerRef={containerRef}
         event={event}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index 3f85551d005d0..1e8835c57d449 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -8,6 +8,8 @@
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
+import type { SetEventsDeleted, SetEventsLoading } from '@kbn/timelines-plugin/common';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { useDeepEqualSelector } from '../../../../../common/hooks/use_selector';
 import {
   ColumnHeaderOptions,
@@ -18,8 +20,6 @@ import {
   TimelineId,
   TimelineTabs,
 } from '../../../../../../common/types/timeline';
-import type { SetEventsDeleted, SetEventsLoading } from '../../../../../../../timelines/common';
-import { BrowserFields } from '../../../../../common/containers/source';
 import {
   TimelineItem,
   TimelineNonEcsData,
@@ -40,12 +40,10 @@ import { StatefulRowRenderer } from './stateful_row_renderer';
 import { NOTES_BUTTON_CLASS_NAME } from '../../properties/helpers';
 import { timelineDefaults } from '../../../../store/timeline/defaults';
 import { useGetMappedNonEcsValue } from '../data_driven_columns';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   actionsColumnWidth: number;
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
-  browserFields: BrowserFields;
   columnHeaders: ColumnHeaderOptions[];
   event: TimelineItem;
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
@@ -78,7 +76,6 @@ EventsTrSupplementContainerWrapper.displayName = 'EventsTrSupplementContainerWra
 
 const StatefulEventComponent: React.FC<Props> = ({
   actionsColumnWidth,
-  browserFields,
   containerRef,
   columnHeaders,
   event,
@@ -236,31 +233,6 @@ const StatefulEventComponent: React.FC<Props> = ({
     [dispatch, timelineId]
   );
 
-  const RowRendererContent = useMemo(
-    () => (
-      <EventsTrSupplement>
-        <StatefulRowRenderer
-          ariaRowindex={ariaRowindex}
-          browserFields={browserFields}
-          containerRef={containerRef}
-          event={event}
-          lastFocusedAriaColindex={lastFocusedAriaColindex}
-          rowRenderers={rowRenderers}
-          timelineId={timelineId}
-        />
-      </EventsTrSupplement>
-    ),
-    [
-      ariaRowindex,
-      browserFields,
-      containerRef,
-      event,
-      lastFocusedAriaColindex,
-      rowRenderers,
-      timelineId,
-    ]
-  );
-
   return (
     <StatefulEventContext.Provider value={activeStatefulEventContext}>
       <EventsTrGroup
@@ -319,7 +291,16 @@ const StatefulEventComponent: React.FC<Props> = ({
             />
           </EventsTrSupplement>
 
-          {RowRendererContent}
+          <EventsTrSupplement>
+            <StatefulRowRenderer
+              ariaRowindex={ariaRowindex}
+              containerRef={containerRef}
+              event={event}
+              lastFocusedAriaColindex={lastFocusedAriaColindex}
+              rowRenderers={rowRenderers}
+              timelineId={timelineId}
+            />
+          </EventsTrSupplement>
         </EventsTrSupplementContainerWrapper>
       </EventsTrGroup>
     </StatefulEventContext.Provider>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
index d71dfcae1b4e6..9d2cd7a03ad55 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
@@ -13,9 +13,8 @@ import {
   ARIA_COLINDEX_ATTRIBUTE,
   ARIA_ROWINDEX_ATTRIBUTE,
   getRowRendererClassName,
-} from '../../../../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { RowRenderer } from '../../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { TimelineItem } from '../../../../../../../common/search_strategy/timeline';
 import { getRowRenderer } from '../../renderers/get_row_renderer';
 import { useStatefulEventFocus } from '../use_stateful_event_focus';
@@ -37,7 +36,6 @@ import * as i18n from '../translations';
  */
 export const StatefulRowRenderer = ({
   ariaRowindex,
-  browserFields,
   containerRef,
   event,
   lastFocusedAriaColindex,
@@ -45,7 +43,6 @@ export const StatefulRowRenderer = ({
   timelineId,
 }: {
   ariaRowindex: number;
-  browserFields: BrowserFields;
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
   event: TimelineItem;
   lastFocusedAriaColindex: number;
@@ -78,7 +75,6 @@ export const StatefulRowRenderer = ({
               </EuiScreenReaderOnly>
               <div onKeyDown={onKeyDown}>
                 {rowRenderer.renderRow({
-                  browserFields,
                   data: event.ecs,
                   isDraggable: true,
                   timelineId,
@@ -90,7 +86,6 @@ export const StatefulRowRenderer = ({
       ),
     [
       ariaRowindex,
-      browserFields,
       event.ecs,
       focusOwnership,
       onFocus,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx
index 3064b29b65640..85a2f0a1e08f2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx
@@ -13,7 +13,7 @@ import {
   isEscape,
   focusColumn,
   OnColumnFocused,
-} from '../../../../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 
 type FocusOwnership = 'not-owned' | 'owned';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
index 67f67bca5e10f..01953cc1272d6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
@@ -38,7 +38,7 @@ jest.mock('../../../../common/lib/kibana/hooks');
 jest.mock('../../../../common/hooks/use_app_toasts');
 jest.mock('../../../../common/lib/kibana', () => {
   const originalModule = jest.requireActual('../../../../common/lib/kibana');
-  const mockCasesContract = jest.requireActual('../../../../../../cases/public/mocks');
+  const mockCasesContract = jest.requireActual('@kbn/cases-plugin/public/mocks');
   return {
     ...originalModule,
     useKibana: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
index 8501a4327d15b..bf4821e132f05 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
@@ -15,7 +15,7 @@ import {
   ARIA_ROWINDEX_ATTRIBUTE,
   onKeyDownFocusHandler,
   getActionsColumnWidth,
-} from '../../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { CellValueElementProps } from '../cell_rendering';
 import { DEFAULT_COLUMN_MIN_WIDTH } from './constants';
 import {
@@ -260,7 +260,6 @@ export const StatefulBody = React.memo<Props>(
             <Events
               containerRef={containerRef}
               actionsColumnWidth={actionsColumnWidth}
-              browserFields={browserFields}
               columnHeaders={columnHeaders}
               data={data}
               eventIdToNoteIds={eventIdToNoteIds}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap
index 684764e39848f..12cc57ff09c7d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`GenericRowRenderer #createGenericAuditRowRenderer renders correctly aga
 <span>
   <RowRendererContainer>
     <AuditdGenericDetails
-      browserFields={Object {}}
       contextId="connected-to-test"
       data={
         Object {
@@ -110,7 +109,6 @@ exports[`GenericRowRenderer #createGenericFileRowRenderer renders correctly agai
 <span>
   <RowRendererContainer>
     <AuditdGenericFileDetails
-      browserFields={Object {}}
       contextId="opened-file-test"
       data={
         Object {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx
index e3c82179b91e2..058d8105a4744 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { AuditdGenericDetails, AuditdGenericLine } from './generic_details';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -30,13 +28,10 @@ describe('GenericDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default AuditAcquiredCredsDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <AuditdGenericDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={browserFields}
           data={mockTimelineData[21].ecs}
           timelineId="test"
         />
@@ -50,7 +45,6 @@ describe('GenericDetails', () => {
           <AuditdGenericDetails
             contextId="contextid-123"
             text="generic-text-123"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[19].ecs}
             timelineId="test"
           />
@@ -66,7 +60,6 @@ describe('GenericDetails', () => {
         <AuditdGenericDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={mockBrowserFields}
           data={mockTimelineData[0].ecs}
           timelineId="test"
         />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx
index fb14d44995c95..bfb4b8677d900 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 
@@ -116,7 +115,6 @@ export const AuditdGenericLine = React.memo<Props>(
 AuditdGenericLine.displayName = 'AuditdGenericLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   data: Ecs;
   isDraggable?: boolean;
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
index a4c5944f50623..a28603d827538 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { AuditdGenericFileDetails, AuditdGenericFileLine } from './generic_file_details';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -30,13 +28,10 @@ describe('GenericFileDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default GenericFileDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <AuditdGenericFileDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={browserFields}
           data={mockTimelineData[27].ecs}
           fileIcon="document"
           timelineId="test"
@@ -51,7 +46,6 @@ describe('GenericFileDetails', () => {
           <AuditdGenericFileDetails
             contextId="contextid-123"
             text="generic-text-123"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[19].ecs}
             fileIcon="document"
             timelineId="test"
@@ -68,7 +62,6 @@ describe('GenericFileDetails', () => {
         <AuditdGenericFileDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={mockBrowserFields}
           data={mockTimelineData[0].ecs}
           fileIcon="document"
           timelineId="test"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx
index 89fbbf751b0ee..dd48571092dec 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer, IconType } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 
@@ -135,7 +134,6 @@ export const AuditdGenericFileLine = React.memo<Props>(
 AuditdGenericFileLine.displayName = 'AuditdGenericFileLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   text: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
index dcfb0efc11455..a5571f9c50b43 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
@@ -10,8 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { RowRenderer } from '../../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -49,10 +47,7 @@ describe('GenericRowRenderer', () => {
       });
     });
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = connectedToRenderer.renderRow({
-        browserFields,
         data: auditd,
         isDraggable: true,
         timelineId: 'test',
@@ -82,7 +77,6 @@ describe('GenericRowRenderer', () => {
 
     test('should render a auditd row', () => {
       const children = connectedToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: auditd,
         isDraggable: true,
         timelineId: 'test',
@@ -113,10 +107,7 @@ describe('GenericRowRenderer', () => {
     });
 
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = fileToRenderer.renderRow({
-        browserFields,
         data: auditdFile,
         isDraggable: true,
         timelineId: 'test',
@@ -146,7 +137,6 @@ describe('GenericRowRenderer', () => {
 
     test('should render a auditd row', () => {
       const children = fileToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: auditdFile,
         isDraggable: true,
         timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
index 8ac1a24c9d389..87baa4aaffac0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
@@ -34,10 +34,9 @@ export const createGenericAuditRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <AuditdGenericDetails
-        browserFields={browserFields}
         data={data}
         isDraggable={isDraggable}
         contextId={`${actionName}-${timelineId}`}
@@ -68,10 +67,9 @@ export const createGenericFileRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <AuditdGenericFileDetails
-        browserFields={browserFields}
         contextId={`${actionName}-${timelineId}`}
         data={data}
         fileIcon={fileIcon}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
index 9dd17ee9ffed9..c10261bfbb3a1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
@@ -7,7 +7,6 @@
 
 import type React from 'react';
 import type { Filter } from '@kbn/es-query';
-import { BrowserFields } from '../../../../../../../timelines/common/search_strategy';
 
 import { ColumnHeaderOptions, RowRenderer } from '../../../../../../common/types';
 import { Ecs } from '../../../../../../common/ecs';
@@ -16,7 +15,6 @@ import { TimelineNonEcsData } from '../../../../../../common/search_strategy/tim
 export interface ColumnRenderer {
   isInstance: (columnName: string, data: TimelineNonEcsData[]) => boolean;
   renderColumn: ({
-    browserFields,
     className,
     columnName,
     eventId,
@@ -31,7 +29,6 @@ export interface ColumnRenderer {
     values,
   }: {
     asPlainText?: boolean;
-    browserFields?: BrowserFields;
     className?: string;
     columnName: string;
     ecsData?: Ecs;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx
index ca15f7f3082a8..8fa827a274fd7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx
@@ -54,7 +54,6 @@ describe('threatMatchRowRenderer', () => {
   describe('#renderRow', () => {
     it('renders correctly against snapshot', () => {
       const children = threatMatchRowRenderer.renderRow({
-        browserFields: {},
         data: threatMatchData,
         isDraggable: true,
         timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
index 0cf90982c9c31..78a19ba4c1990 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 
 import '../../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../../common/mock';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockEndgameDnsRequest } from '../../../../../../common/mock/mock_endgame_ecs_data';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
 
@@ -32,7 +31,6 @@ describe('DnsRequestEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <DnsRequestEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameDnsRequest}
           timelineId="timeline-id-test"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx
index 90d68eceb7fb3..5c3efba0bc3b6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx
@@ -9,7 +9,6 @@ import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Details } from '../helpers';
 import { Ecs } from '../../../../../../../common/ecs';
 import { NetflowRenderer } from '../netflow';
@@ -17,7 +16,6 @@ import { NetflowRenderer } from '../netflow';
 import { DnsRequestEventDetailsLine } from './dns_request_event_details_line';
 
 interface Props {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
index 438a98e85bb62..b9f3b26feac8b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 
 import '../../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../../common/mock';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import {
   mockEndgameAdminLogon,
   mockEndgameExplicitUserLogon,
@@ -37,7 +36,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameUserLogon}
           timelineId="timeline-id-test"
@@ -53,7 +51,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameAdminLogon}
           timelineId="timeline-id-test"
@@ -69,7 +66,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameExplicitUserLogon}
           timelineId="timeline-id-test"
@@ -85,7 +81,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameUserLogoff}
           timelineId="timeline-id-test"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
index 8f39cf933570f..00d506df424d3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
@@ -9,7 +9,6 @@ import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { NetflowRenderer } from '../netflow';
 
@@ -17,7 +16,6 @@ import { EndgameSecurityEventDetailsLine } from './endgame_security_event_detail
 import { Details } from '../helpers';
 
 interface Props {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index ebd0fb974f3aa..0cc79c6936992 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -17,7 +17,7 @@ import { Bytes, BYTES_FORMAT } from './bytes';
 import { Duration, EVENT_DURATION_FIELD_NAME } from '../../../duration';
 import { getOrEmptyTagFromValue } from '../../../../../common/components/empty_value';
 import { FormattedDate } from '../../../../../common/components/formatted_date';
-import { FormattedIp } from '../../../../components/formatted_ip';
+import { FormattedIp } from '../../../formatted_ip';
 import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { Port } from '../../../../../network/components/port';
 import { PORT_NAMES } from '../../../../../network/components/port/helpers';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx
index edc2f2c0e4690..73bfdfc283361 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx
@@ -11,7 +11,6 @@ import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
 import '../../../../../common/mock/match_media';
-import { mockBrowserFields } from '../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../common/ecs';
 import { mockTimelineData } from '../../../../../common/mock';
 import { TestProviders } from '../../../../../common/mock/test_providers';
@@ -57,7 +56,6 @@ describe('get_column_renderer', () => {
   test('renders correctly against snapshot', () => {
     const rowRenderer = getRowRenderer(nonSuricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: nonSuricata,
       isDraggable: true,
       timelineId: 'test',
@@ -70,7 +68,6 @@ describe('get_column_renderer', () => {
   test('should render plain row data when it is a non suricata row', () => {
     const rowRenderer = getRowRenderer(nonSuricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: nonSuricata,
       isDraggable: true,
       timelineId: 'test',
@@ -86,7 +83,6 @@ describe('get_column_renderer', () => {
   test('should render a suricata row data when it is a suricata row', () => {
     const rowRenderer = getRowRenderer(suricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
@@ -105,7 +101,6 @@ describe('get_column_renderer', () => {
     suricata.event = { ...suricata.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(suricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
@@ -124,7 +119,6 @@ describe('get_column_renderer', () => {
     zeek.event = { ...zeek.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(zeek, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: zeek,
       isDraggable: true,
       timelineId: 'test',
@@ -143,7 +137,6 @@ describe('get_column_renderer', () => {
     system.event = { ...system.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(system, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: system,
       isDraggable: true,
       timelineId: 'test',
@@ -162,7 +155,6 @@ describe('get_column_renderer', () => {
     auditd.event = { ...auditd.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(auditd, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: auditd,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
index 6f2f6c28ecfbe..e8c4c54f868a0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
@@ -11,7 +11,7 @@ import { waitFor } from '@testing-library/react';
 import { HostName } from './host_name';
 import { TestProviders } from '../../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../../common/types';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { timelineActions } from '../../../../store/timeline';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
index 5864e144a681e..2673304d2deb8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useContext, useMemo } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { HostDetailsLink } from '../../../../../common/components/links';
 import {
   TimelineId,
@@ -20,7 +21,6 @@ import { getEmptyTagValue } from '../../../../../common/components/empty_value';
 import { TruncatableText } from '../../../../../common/components/truncatable_text';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 import { timelineActions } from '../../../../store/timeline';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
index 01e05bbc365e9..f2f95dec90144 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { getMockNetflowData, TestProviders } from '../../../../../../common/mock';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -34,9 +32,7 @@ describe('netflowRowRenderer', () => {
   const mount = useMountAppended();
 
   test('renders correctly against snapshot', () => {
-    const browserFields: BrowserFields = {};
     const children = netflowRowRenderer.renderRow({
-      browserFields,
       data: getMockNetflowData(),
       isDraggable: true,
       timelineId: 'test',
@@ -106,7 +102,6 @@ describe('netflowRowRenderer', () => {
 
   test('should render netflow data', () => {
     const children = netflowRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: getMockNetflowData(),
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx
index f28c72253a4e7..da5a71d4c12f8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx
@@ -9,7 +9,6 @@ import { mount, shallow } from 'enzyme';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 
-import { mockBrowserFields } from '../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../common/ecs';
 import { mockTimelineData } from '../../../../../common/mock';
 import { plainRowRenderer } from './plain_row_renderer';
@@ -22,7 +21,6 @@ describe('plain_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: true,
       timelineId: 'test',
@@ -37,7 +35,6 @@ describe('plain_row_renderer', () => {
 
   test('should render a plain row', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
index f71db57c1b42a..77caaabcae3ba 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
@@ -14,11 +14,10 @@ import { reasonColumnRenderer } from './reason_column_renderer';
 import { plainColumnRenderer } from './plain_column_renderer';
 
 import { RowRendererId, ColumnHeaderOptions, RowRenderer } from '../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/search_strategy';
 
 import { render } from '@testing-library/react';
-import { TestProviders } from '../../../../../../../timelines/public/mock';
-import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../../timelines/public/components';
+import { TestProviders } from '@kbn/timelines-plugin/public/mock';
+import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '@kbn/timelines-plugin/public/components';
 import { cloneDeep } from 'lodash';
 jest.mock('./plain_column_renderer');
 
@@ -61,7 +60,6 @@ const rowRenderers: RowRenderer[] = [
     renderRow: () => <span data-test-subj="test-row-render" />,
   },
 ];
-const browserFields: BrowserFields = {};
 
 const defaultProps = {
   columnName: REASON_FIELD_NAME,
@@ -83,19 +81,18 @@ describe('reasonColumnRenderer', () => {
   });
 
   describe('renderColumn', () => {
-    it('calls `plainColumnRenderer.renderColumn` when ecsData, rowRenderers or browserFields is empty', () => {
+    it('calls `plainColumnRenderer.renderColumn` when ecsData, or rowRenderers is empty', () => {
       reasonColumnRenderer.renderColumn(defaultProps);
 
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(1);
     });
 
-    it("doesn't call `plainColumnRenderer.renderColumn` in expanded value when ecsData, rowRenderers or browserFields fields are not empty", () => {
+    it("doesn't call `plainColumnRenderer.renderColumn` in expanded value when ecsData, or rowRenderers fields are not empty", () => {
       reasonColumnRenderer.renderColumn({
         ...defaultProps,
         isDetails: true,
         ecsData: invalidEcs,
         rowRenderers,
-        browserFields,
       });
 
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(0);
@@ -107,7 +104,6 @@ describe('reasonColumnRenderer', () => {
         isDetails: false,
         ecsData: invalidEcs,
         rowRenderers,
-        browserFields,
       });
 
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(1);
@@ -119,7 +115,6 @@ describe('reasonColumnRenderer', () => {
         isDetails: true,
         ecsData: invalidEcs,
         rowRenderers,
-        browserFields,
       });
 
       const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
@@ -133,7 +128,6 @@ describe('reasonColumnRenderer', () => {
         isDetails: true,
         ecsData: validEcs,
         rowRenderers,
-        browserFields,
       });
 
       const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
index a5ba7360c966f..72fbc7be19dd2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
@@ -10,7 +10,6 @@ import { isEqual } from 'lodash/fp';
 import React, { useMemo } from 'react';
 
 import { ColumnHeaderOptions, RowRenderer } from '../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/search_strategy';
 import { Ecs } from '../../../../../../common/ecs';
 import { eventRendererNames } from '../../../row_renderers_browser/catalog/constants';
 import { ColumnRenderer } from './column_renderer';
@@ -23,7 +22,6 @@ export const reasonColumnRenderer: ColumnRenderer = {
   isInstance: isEqual(REASON_FIELD_NAME),
 
   renderColumn: ({
-    browserFields,
     columnName,
     ecsData,
     eventId,
@@ -36,7 +34,6 @@ export const reasonColumnRenderer: ColumnRenderer = {
     truncate,
     values,
   }: {
-    browserFields?: BrowserFields;
     columnName: string;
     ecsData?: Ecs;
     eventId: string;
@@ -49,10 +46,9 @@ export const reasonColumnRenderer: ColumnRenderer = {
     truncate?: boolean;
     values: string[] | undefined | null;
   }) => {
-    if (isDetails && values && ecsData && rowRenderers && browserFields) {
+    if (isDetails && values && ecsData && rowRenderers) {
       return values.map((value, i) => (
         <ReasonCell
-          browserFields={browserFields}
           ecsData={ecsData}
           key={`reason-column-renderer-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}-${i}`}
           rowRenderers={rowRenderers}
@@ -81,21 +77,19 @@ const ReasonCell: React.FC<{
   timelineId: string;
   ecsData: Ecs;
   rowRenderers: RowRenderer[];
-  browserFields: BrowserFields;
-}> = ({ ecsData, rowRenderers, browserFields, timelineId, value }) => {
+}> = ({ ecsData, rowRenderers, timelineId, value }) => {
   const rowRenderer = useMemo(() => getRowRenderer(ecsData, rowRenderers), [ecsData, rowRenderers]);
 
   const rowRender = useMemo(() => {
     return (
       rowRenderer &&
       rowRenderer.renderRow({
-        browserFields,
         data: ecsData,
         isDraggable: false,
         timelineId,
       })
     );
-  }, [rowRenderer, browserFields, ecsData, timelineId]);
+  }, [rowRenderer, ecsData, timelineId]);
 
   return (
     <>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap
index d6fccadf02e9d..36f62dc5ff728 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap
@@ -4,596 +4,6 @@ exports[`suricata_row_renderer renders correctly against snapshot 1`] = `
 <span>
   <RowRendererContainer>
     <SuricataDetails
-      browserFields={
-        Object {
-          "agent": Object {
-            "fields": Object {
-              "agent.ephemeral_id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-                "example": "8a4f500f",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.ephemeral_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.hostname": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.hostname",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-                "example": "8a4f500d",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.name": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-                "example": "foo",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "auditd": Object {
-            "fields": Object {
-              "auditd.data.a0": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a0",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a1": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a1",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a2": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a2",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "base": Object {
-            "fields": Object {
-              "@timestamp": Object {
-                "aggregatable": true,
-                "category": "base",
-                "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-                "example": "2016-05-23T08:05:34.853Z",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "@timestamp",
-                "readFromDocValues": true,
-                "searchable": true,
-                "type": "date",
-              },
-              "_id": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "Each document has an _id that uniquely identifies it",
-                "example": "Y-6TfmcB0WOhS6qyMv3s",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "message": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-                "example": "Hello World",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "message",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "client": Object {
-            "fields": Object {
-              "client.address": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.bytes": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Bytes sent from the client to the server.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "client.domain": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Client domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.geo.country_iso_code": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Country ISO code.",
-                "example": "CA",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.geo.country_iso_code",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "cloud": Object {
-            "fields": Object {
-              "cloud.account.id": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-                "example": "666777888999",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.account.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "cloud.availability_zone": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "Availability zone in which this host is running.",
-                "example": "us-east-1c",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.availability_zone",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "container": Object {
-            "fields": Object {
-              "container.id": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Unique container id.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.name": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Name of the image the container was built on.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.name",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.tag": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Container image tag.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.tag",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "destination": Object {
-            "fields": Object {
-              "destination.address": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.bytes": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Bytes sent from the destination to the source.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "destination.domain": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Destination domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.ip": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "destination.port": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Port of the destination.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "event": Object {
-            "fields": Object {
-              "event.action": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-                "example": "user-password-change",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.action",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.category": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-                "example": "authentication",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.category",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.end": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "event.end contains the date when the event ended or when the activity was last observed.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.end",
-                "searchable": true,
-                "type": "date",
-              },
-              "event.severity": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-                "example": 7,
-                "format": "number",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.severity",
-                "searchable": true,
-                "type": "number",
-              },
-            },
-          },
-          "host": Object {
-            "fields": Object {
-              "host.name": Object {
-                "aggregatable": true,
-                "category": "host",
-                "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "host.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "nestedField": Object {
-            "fields": Object {
-              "nestedField.firstAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.firstAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-              "nestedField.secondAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.secondAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-            },
-          },
-          "source": Object {
-            "fields": Object {
-              "source.ip": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "source.port": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "Port of the source.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "user": Object {
-            "fields": Object {
-              "user.name": Object {
-                "aggregatable": true,
-                "category": "user",
-                "description": "Short name or login of the user.",
-                "example": "albert",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "user.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-        }
-      }
       data={
         Object {
           "_id": "1",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx
index f8693d4a4f8ea..2a4e82a183999 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx
@@ -9,7 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData } from '../../../../../../common/mock';
 import '../../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../../common/mock/test_providers';
@@ -33,24 +32,14 @@ describe('SuricataDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default SuricataDetails', () => {
-      const wrapper = shallow(
-        <SuricataDetails
-          data={mockTimelineData[2].ecs}
-          browserFields={mockBrowserFields}
-          timelineId="test"
-        />
-      );
+      const wrapper = shallow(<SuricataDetails data={mockTimelineData[2].ecs} timelineId="test" />);
       expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns text if the data does contain suricata data', () => {
       const wrapper = mount(
         <TestProviders>
-          <SuricataDetails
-            data={mockTimelineData[2].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <SuricataDetails data={mockTimelineData[2].ecs} timelineId="test" />
         </TestProviders>
       );
       const removeEuiIconText = removeExternalLinkText(wrapper.text()).replaceAll(
@@ -63,13 +52,7 @@ describe('SuricataDetails', () => {
     });
 
     test('it returns null for text if the data contains no suricata data', () => {
-      const wrapper = shallow(
-        <SuricataDetails
-          data={mockTimelineData[0].ecs}
-          browserFields={mockBrowserFields}
-          timelineId="test"
-        />
-      );
+      const wrapper = shallow(<SuricataDetails data={mockTimelineData[0].ecs} timelineId="test" />);
       expect(wrapper.isEmptyRender()).toBeTruthy();
     });
   });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx
index f096cd906f619..08eeb4248b6b6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx
@@ -10,7 +10,6 @@ import { get } from 'lodash/fp';
 import React from 'react';
 import styled from 'styled-components';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 
 import { NetflowRenderer } from '../netflow';
@@ -24,7 +23,6 @@ const Details = styled.div`
 Details.displayName = 'Details';
 
 export const SuricataDetails = React.memo<{
-  browserFields: BrowserFields;
   data: Ecs;
   isDraggable?: boolean;
   timelineId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
index 2022904e548aa..bde4fb7f592aa 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
@@ -10,7 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { mockTimelineData } from '../../../../../../common/mock';
 import '../../../../../../common/mock/match_media';
@@ -42,7 +41,6 @@ describe('suricata_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = suricataRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: nonSuricata,
       isDraggable: true,
       timelineId: 'test',
@@ -62,7 +60,6 @@ describe('suricata_row_renderer', () => {
 
   test('should render a suricata row', () => {
     const children = suricataRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
@@ -85,7 +82,6 @@ describe('suricata_row_renderer', () => {
   test('should render a suricata row even if it does not have a suricata signature', () => {
     delete suricata?.suricata?.eve?.alert?.signature;
     const children = suricataRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
index 887ffdd9584a5..303e0e3f78ba1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
@@ -19,14 +19,9 @@ export const suricataRowRenderer: RowRenderer = {
     const module: string | null | undefined = get('event.module[0]', ecs);
     return module != null && module.toLowerCase() === 'suricata';
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
-      <SuricataDetails
-        data={data}
-        browserFields={browserFields}
-        isDraggable={isDraggable}
-        timelineId={timelineId}
-      />
+      <SuricataDetails data={data} isDraggable={isDraggable} timelineId={timelineId} />
     </RowRendererContainer>
   ),
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap
index 15443058f434e..99d495f3cd96d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`GenericRowRenderer #createGenericFileRowRenderer renders correctly agai
 <span>
   <RowRendererContainer>
     <SystemGenericFileDetails
-      browserFields={Object {}}
       contextId="user_login-test"
       data={
         Object {
@@ -68,7 +67,6 @@ exports[`GenericRowRenderer #createGenericSystemRowRenderer renders correctly ag
 <span>
   <RowRendererContainer>
     <SystemGenericDetails
-      browserFields={Object {}}
       contextId="process_started-test"
       data={
         Object {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx
index 16874b30de835..d9235a5056f3d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { SystemGenericDetails, SystemGenericLine } from './generic_details';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -32,13 +30,10 @@ describe('SystemGenericDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default SystemGenericDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <SystemGenericDetails
           contextId="[contextid-123]"
           text="[generic-text-123]"
-          browserFields={browserFields}
           data={mockTimelineData[28].ecs}
           timelineId="test"
         />
@@ -52,7 +47,6 @@ describe('SystemGenericDetails', () => {
           <SystemGenericDetails
             contextId="[contextid-123]"
             text="[generic-text-123]"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[28].ecs}
             timelineId="test"
           />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx
index 2cf42ecc9c670..10b2c39ab74ca 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 import { OverflowField } from '../../../../../../common/components/tables/helpers';
@@ -141,7 +140,6 @@ export const SystemGenericLine = React.memo<Props>(
 SystemGenericLine.displayName = 'SystemGenericLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx
index 20a635a16bbaf..ff6ebcbd9ddde 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx
@@ -8,8 +8,6 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import '../../../../../../common/mock/match_media';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { mockEndgameCreationEvent } from '../../../../../../common/mock/mock_endgame_ecs_data';
@@ -43,13 +41,10 @@ describe('SystemGenericFileDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default SystemGenericDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <SystemGenericFileDetails
           contextId="[contextid-123]"
           text="[generic-text-123]"
-          browserFields={browserFields}
           data={mockTimelineData[29].ecs}
           timelineId="test"
         />
@@ -63,7 +58,6 @@ describe('SystemGenericFileDetails', () => {
           <SystemGenericFileDetails
             contextId="[contextid-123]"
             text="[generic-text-123]"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[29].ecs}
             timelineId="test"
           />
@@ -80,7 +74,6 @@ describe('SystemGenericFileDetails', () => {
           <SystemGenericFileDetails
             contextId="[contextid-123]"
             text="[generic-text-123]"
-            browserFields={mockBrowserFields}
             data={mockEndgameCreationEvent}
             timelineId="test"
           />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx
index 9722f36e42eb0..d1a29dad8cf23 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 import { OverflowField } from '../../../../../../common/components/tables/helpers';
@@ -251,7 +250,6 @@ export const SystemGenericFileLine = React.memo<Props>(
 SystemGenericFileLine.displayName = 'SystemGenericFileLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index 4b93c5accb590..3b2b17fc4cc38 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -10,8 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import {
   mockDnsEvent,
@@ -118,10 +116,7 @@ describe('GenericRowRenderer', () => {
       });
     });
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = connectedToRenderer.renderRow({
-        browserFields,
         data: system,
         isDraggable: true,
         timelineId: 'test',
@@ -151,7 +146,6 @@ describe('GenericRowRenderer', () => {
     });
     test('should render a system row', () => {
       const children = connectedToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: system,
         isDraggable: true,
         timelineId: 'test',
@@ -182,10 +176,7 @@ describe('GenericRowRenderer', () => {
     });
 
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = fileToRenderer.renderRow({
-        browserFields,
         data: systemFile,
         isDraggable: true,
         timelineId: 'test',
@@ -214,7 +205,6 @@ describe('GenericRowRenderer', () => {
 
     test('should render a system row', () => {
       const children = fileToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: systemFile,
         isDraggable: true,
         timelineId: 'test',
@@ -246,7 +236,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileCreationMalwarePreventionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileCreationMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -274,7 +263,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileCreationMalwareDetectionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileCreationMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -304,7 +292,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFilesEncryptedRansomwarePreventionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFilesEncryptedRansomwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -334,7 +321,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFilesEncryptedRansomwareDetectionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFilesEncryptedRansomwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -364,7 +350,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFileModificationMalwarePreventionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileModificationMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -394,7 +379,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFileModificationMalwareDetectionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileModificationMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -422,7 +406,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileRenameMalwarePreventionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileRenameMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -450,7 +433,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileRenameMalwareDetectionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileRenameMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -480,7 +462,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointProcessExecutionMalwarePreventionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessExecutionMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -510,7 +491,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointProcessExecutionMalwareDetectionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessExecutionMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -538,7 +518,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessExecEvent) &&
             endpointProcessStartRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessExecEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -564,7 +543,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessForkEvent) &&
             endpointProcessStartRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessForkEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -590,7 +568,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessStartEvent) &&
             endpointProcessStartRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessStartEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -619,7 +596,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -645,7 +621,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessEndRowRenderer.isInstance(mockEndpointProcessEndEvent) &&
             endpointProcessEndRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessEndEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -674,7 +649,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessTerminationEventRowRenderer.isInstance(endgameTerminationEvent) &&
             endgameProcessTerminationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameTerminationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -703,7 +677,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -734,7 +707,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -765,7 +737,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -791,7 +762,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileCreationRowRenderer.isInstance(mockEndpointFileCreationEvent) &&
             endpointFileCreationRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -820,7 +790,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileCreateEventRowRenderer.isInstance(endgameFileCreateEvent) &&
             endgameFileCreateEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileCreateEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -846,7 +815,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileDeletionRowRenderer.isInstance(mockEndpointFileDeletionEvent) &&
             endpointFileDeletionRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileDeletionEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -872,7 +840,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileModificationRowRenderer.isInstance(mockEndpointFileModificationEvent) &&
             endpointFileModificationRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileModificationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -898,7 +865,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileOverwriteRowRenderer.isInstance(mockEndpointFileOverwriteEvent) &&
             endpointFileOverwriteRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileOverwriteEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -924,7 +890,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileRenameRowRenderer.isInstance(mockEndpointFileRenameEvent) &&
             endpointFileRenameRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileRenameEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -953,7 +918,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileDeleteEventRowRenderer.isInstance(endgameFileDeleteEvent) &&
             endgameFileDeleteEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileDeleteEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -982,7 +946,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {fileCreatedEventRowRenderer.isInstance(fimFileCreatedEvent) &&
             fileCreatedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: fimFileCreatedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1009,7 +972,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {fileDeletedEventRowRenderer.isInstance(fimFileDeletedEvent) &&
             fileDeletedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: fimFileDeletedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1038,7 +1000,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileCreateEventRowRenderer.isInstance(endgameFileCreateEvent) &&
             endgameFileCreateEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileCreateEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1069,7 +1030,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileCreateEventRowRenderer.isInstance(endgameFileCreateEvent) &&
             endgameFileCreateEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileCreateEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1100,7 +1060,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {fileCreatedEventRowRenderer.isInstance(fimFileCreatedEvent) &&
             fileCreatedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: fimFileCreatedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1128,7 +1087,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointNetworkConnectionAcceptedEvent
           ) &&
             endpointConnectionAcceptedRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkConnectionAcceptedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1157,7 +1115,6 @@ describe('GenericRowRenderer', () => {
               mockEndpointRegistryModificationEvent
             ) &&
               endpointRegistryModificationRowRenderer.renderRow({
-                browserFields: mockBrowserFields,
                 data: mockEndpointRegistryModificationEvent,
                 isDraggable: true,
                 timelineId: 'test',
@@ -1185,7 +1142,6 @@ describe('GenericRowRenderer', () => {
           <TestProviders>
             {endpointLibraryLoadRowRenderer.isInstance(mockEndpointLibraryLoadEvent) &&
               endpointLibraryLoadRowRenderer.renderRow({
-                browserFields: mockBrowserFields,
                 data: mockEndpointLibraryLoadEvent,
                 isDraggable: true,
                 timelineId: 'test',
@@ -1212,7 +1168,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointHttpRequestEventRowRenderer.isInstance(mockEndpointNetworkHttpRequestEvent) &&
             endpointHttpRequestEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkHttpRequestEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1241,7 +1196,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv4ConnectionAcceptEventRowRenderer.isInstance(ipv4ConnectionAcceptEvent) &&
             endgameIpv4ConnectionAcceptEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv4ConnectionAcceptEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1270,7 +1224,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv6ConnectionAcceptEventRowRenderer.isInstance(ipv6ConnectionAcceptEvent) &&
             endgameIpv6ConnectionAcceptEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv6ConnectionAcceptEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1296,7 +1249,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointDisconnectReceivedRowRenderer.isInstance(mockEndpointDisconnectReceivedEvent) &&
             endpointDisconnectReceivedRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointDisconnectReceivedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1325,7 +1277,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv4DisconnectReceivedEventRowRenderer.isInstance(ipv4DisconnectReceivedEvent) &&
             endgameIpv4DisconnectReceivedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv4DisconnectReceivedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1354,7 +1305,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv6DisconnectReceivedEventRowRenderer.isInstance(ipv6DisconnectReceivedEvent) &&
             endgameIpv6DisconnectReceivedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv6DisconnectReceivedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1383,7 +1333,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {socketOpenedEventRowRenderer.isInstance(socketOpenedEvent) &&
             socketOpenedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: socketOpenedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1412,7 +1361,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {socketClosedEventRowRenderer.isInstance(socketClosedEvent) &&
             socketClosedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: socketClosedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1441,7 +1389,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv4ConnectionAcceptEventRowRenderer.isInstance(ipv4ConnectionAcceptEvent) &&
             endgameIpv4ConnectionAcceptEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv4ConnectionAcceptEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1463,7 +1410,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {securityLogOnRowRenderer.isInstance(mockEndpointSecurityLogOnSuccessEvent) &&
             securityLogOnRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointSecurityLogOnSuccessEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1485,7 +1431,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {securityLogOnRowRenderer.isInstance(mockEndpointSecurityLogOnFailureEvent) &&
             securityLogOnRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointSecurityLogOnFailureEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1510,7 +1455,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {userLogonEventRowRenderer.isInstance(userLogonEvent) &&
             userLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: userLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1535,7 +1479,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {adminLogonEventRowRenderer.isInstance(adminLogonEvent) &&
             adminLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: adminLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1560,7 +1503,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {explicitUserLogonEventRowRenderer.isInstance(explicitUserLogonEvent) &&
             explicitUserLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: explicitUserLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1582,7 +1524,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {securityLogOffRowRenderer.isInstance(mockEndpointSecurityLogOffEvent) &&
             securityLogOffRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointSecurityLogOffEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1607,7 +1548,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {userLogoffEventRowRenderer.isInstance(userLogoffEvent) &&
             userLogoffEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: userLogoffEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1632,7 +1572,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {userLogonEventRowRenderer.isInstance(userLogonEvent) &&
             userLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: userLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1652,7 +1591,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(mockEndpointNetworkLookupRequestedEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkLookupRequestedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1672,7 +1610,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(mockEndpointNetworkLookupResultEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkLookupResultEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1696,7 +1633,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(requestEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: requestEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1720,7 +1656,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(dnsEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: dnsEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1750,7 +1685,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(requestEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: requestEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1778,7 +1712,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(requestEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: requestEvent,
               isDraggable: true,
               timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx
index ba791aae4b86c..36ba6adb06917 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx
@@ -38,10 +38,9 @@ export const createGenericSystemRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericDetails
-        browserFields={browserFields}
         contextId={`${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -70,10 +69,9 @@ export const createEndgameProcessRowRenderer = ({
       action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         data={data}
         contextId={`endgame-process-${actionName}-${timelineId}`}
         isDraggable={isDraggable}
@@ -102,10 +100,9 @@ export const createFimRowRenderer = ({
       action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         data={data}
         contextId={`fim-${actionName}-${timelineId}`}
         isDraggable={isDraggable}
@@ -152,10 +149,9 @@ export const createEndpointAlertsRowRenderer = ({
       eventActionMatches
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`endpoint-alerts-row-renderer-${eventAction}-${eventCategory}-${eventType}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -184,10 +180,9 @@ export const createEndpointLibraryRowRenderer = ({
       dataset?.toLowerCase() === 'endpoint.events.library' && action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`library-row-renderer-${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -217,10 +212,9 @@ export const createGenericFileRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -243,10 +237,9 @@ export const createSocketRowRenderer = ({
     const action: string | null | undefined = get('event.action[0]', ecs);
     return action != null && action.toLowerCase() === actionName;
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`socket-${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -273,10 +266,9 @@ export const createSecurityEventRowRenderer = ({
       action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <EndgameSecurityEventDetails
-        browserFields={browserFields}
         contextId={`authentication-${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -293,10 +285,9 @@ export const createDnsRowRenderer = (): RowRenderer => ({
     const dnsQuestionName: string | null | undefined = get('dns.question.name[0]', ecs);
     return !isNillEmptyOrNotFinite(dnsQuestionType) && !isNillEmptyOrNotFinite(dnsQuestionName);
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <DnsRequestEventDetails
-        browserFields={browserFields}
         contextId={`dns-request-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
index d81104ff5be03..12d5e808f98fc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
@@ -10,7 +10,7 @@ import { waitFor } from '@testing-library/react';
 
 import { TestProviders } from '../../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../../common/types';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { timelineActions } from '../../../../store/timeline';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 import { UserName } from './user_name';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
index 61f62ee3c0e29..3d75835a54bac 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useContext, useMemo } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import {
   TimelineId,
   TimelineTabs,
@@ -20,7 +21,6 @@ import { UserDetailsLink } from '../../../../../common/components/links';
 import { TruncatableText } from '../../../../../common/components/truncatable_text';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 import { timelineActions } from '../../../../store/timeline';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap
index 107239a9aa52f..dab754c0fcc14 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap
@@ -2,596 +2,6 @@
 
 exports[`ZeekDetails rendering it renders the default ZeekDetails 1`] = `
 <ZeekDetails
-  browserFields={
-    Object {
-      "agent": Object {
-        "fields": Object {
-          "agent.ephemeral_id": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-            "example": "8a4f500f",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.ephemeral_id",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.hostname": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.hostname",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.id": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-            "example": "8a4f500d",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.name": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-            "example": "foo",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "auditd": Object {
-        "fields": Object {
-          "auditd.data.a0": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a0",
-            "searchable": true,
-            "type": "string",
-          },
-          "auditd.data.a1": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a1",
-            "searchable": true,
-            "type": "string",
-          },
-          "auditd.data.a2": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a2",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "base": Object {
-        "fields": Object {
-          "@timestamp": Object {
-            "aggregatable": true,
-            "category": "base",
-            "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-            "example": "2016-05-23T08:05:34.853Z",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "@timestamp",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "date",
-          },
-          "_id": Object {
-            "aggregatable": false,
-            "category": "base",
-            "description": "Each document has an _id that uniquely identifies it",
-            "example": "Y-6TfmcB0WOhS6qyMv3s",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "_id",
-            "searchable": true,
-            "type": "string",
-          },
-          "message": Object {
-            "aggregatable": false,
-            "category": "base",
-            "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-            "example": "Hello World",
-            "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "message",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "client": Object {
-        "fields": Object {
-          "client.address": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.address",
-            "searchable": true,
-            "type": "string",
-          },
-          "client.bytes": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Bytes sent from the client to the server.",
-            "example": "184",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.bytes",
-            "searchable": true,
-            "type": "number",
-          },
-          "client.domain": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Client domain.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.domain",
-            "searchable": true,
-            "type": "string",
-          },
-          "client.geo.country_iso_code": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Country ISO code.",
-            "example": "CA",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.geo.country_iso_code",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "cloud": Object {
-        "fields": Object {
-          "cloud.account.id": Object {
-            "aggregatable": true,
-            "category": "cloud",
-            "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-            "example": "666777888999",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "cloud.account.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "cloud.availability_zone": Object {
-            "aggregatable": true,
-            "category": "cloud",
-            "description": "Availability zone in which this host is running.",
-            "example": "us-east-1c",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "cloud.availability_zone",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "container": Object {
-        "fields": Object {
-          "container.id": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Unique container id.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "container.image.name": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Name of the image the container was built on.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.image.name",
-            "searchable": true,
-            "type": "string",
-          },
-          "container.image.tag": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Container image tag.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.image.tag",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "destination": Object {
-        "fields": Object {
-          "destination.address": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.address",
-            "searchable": true,
-            "type": "string",
-          },
-          "destination.bytes": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Bytes sent from the destination to the source.",
-            "example": "184",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.bytes",
-            "searchable": true,
-            "type": "number",
-          },
-          "destination.domain": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Destination domain.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.domain",
-            "searchable": true,
-            "type": "string",
-          },
-          "destination.ip": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.ip",
-            "searchable": true,
-            "type": "ip",
-          },
-          "destination.port": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Port of the destination.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.port",
-            "searchable": true,
-            "type": "long",
-          },
-        },
-      },
-      "event": Object {
-        "fields": Object {
-          "event.action": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-            "example": "user-password-change",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.action",
-            "searchable": true,
-            "type": "string",
-          },
-          "event.category": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-            "example": "authentication",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.category",
-            "searchable": true,
-            "type": "string",
-          },
-          "event.end": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "event.end contains the date when the event ended or when the activity was last observed.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.end",
-            "searchable": true,
-            "type": "date",
-          },
-          "event.severity": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-            "example": 7,
-            "format": "number",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.severity",
-            "searchable": true,
-            "type": "number",
-          },
-        },
-      },
-      "host": Object {
-        "fields": Object {
-          "host.name": Object {
-            "aggregatable": true,
-            "category": "host",
-            "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "host.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "nestedField": Object {
-        "fields": Object {
-          "nestedField.firstAttributes": Object {
-            "aggregatable": false,
-            "category": "nestedField",
-            "description": "",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "nestedField.firstAttributes",
-            "searchable": true,
-            "subType": Object {
-              "nested": Object {
-                "path": "nestedField",
-              },
-            },
-            "type": "string",
-          },
-          "nestedField.secondAttributes": Object {
-            "aggregatable": false,
-            "category": "nestedField",
-            "description": "",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "nestedField.secondAttributes",
-            "searchable": true,
-            "subType": Object {
-              "nested": Object {
-                "path": "nestedField",
-              },
-            },
-            "type": "string",
-          },
-        },
-      },
-      "source": Object {
-        "fields": Object {
-          "source.ip": Object {
-            "aggregatable": true,
-            "category": "source",
-            "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "source.ip",
-            "searchable": true,
-            "type": "ip",
-          },
-          "source.port": Object {
-            "aggregatable": true,
-            "category": "source",
-            "description": "Port of the source.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "source.port",
-            "searchable": true,
-            "type": "long",
-          },
-        },
-      },
-      "user": Object {
-        "fields": Object {
-          "user.name": Object {
-            "aggregatable": true,
-            "category": "user",
-            "description": "Short name or login of the user.",
-            "example": "albert",
-            "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "user.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-    }
-  }
   data={
     Object {
       "_id": "4",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap
index 938f047f7014e..a98f0c53fbc8f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap
@@ -4,596 +4,6 @@ exports[`zeek_row_renderer renders correctly against snapshot 1`] = `
 <span>
   <RowRendererContainer>
     <ZeekDetails
-      browserFields={
-        Object {
-          "agent": Object {
-            "fields": Object {
-              "agent.ephemeral_id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-                "example": "8a4f500f",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.ephemeral_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.hostname": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.hostname",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-                "example": "8a4f500d",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.name": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-                "example": "foo",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "auditd": Object {
-            "fields": Object {
-              "auditd.data.a0": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a0",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a1": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a1",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a2": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a2",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "base": Object {
-            "fields": Object {
-              "@timestamp": Object {
-                "aggregatable": true,
-                "category": "base",
-                "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-                "example": "2016-05-23T08:05:34.853Z",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "@timestamp",
-                "readFromDocValues": true,
-                "searchable": true,
-                "type": "date",
-              },
-              "_id": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "Each document has an _id that uniquely identifies it",
-                "example": "Y-6TfmcB0WOhS6qyMv3s",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "message": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-                "example": "Hello World",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "message",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "client": Object {
-            "fields": Object {
-              "client.address": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.bytes": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Bytes sent from the client to the server.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "client.domain": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Client domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.geo.country_iso_code": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Country ISO code.",
-                "example": "CA",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.geo.country_iso_code",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "cloud": Object {
-            "fields": Object {
-              "cloud.account.id": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-                "example": "666777888999",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.account.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "cloud.availability_zone": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "Availability zone in which this host is running.",
-                "example": "us-east-1c",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.availability_zone",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "container": Object {
-            "fields": Object {
-              "container.id": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Unique container id.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.name": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Name of the image the container was built on.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.name",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.tag": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Container image tag.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.tag",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "destination": Object {
-            "fields": Object {
-              "destination.address": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.bytes": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Bytes sent from the destination to the source.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "destination.domain": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Destination domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.ip": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "destination.port": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Port of the destination.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "event": Object {
-            "fields": Object {
-              "event.action": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-                "example": "user-password-change",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.action",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.category": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-                "example": "authentication",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.category",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.end": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "event.end contains the date when the event ended or when the activity was last observed.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.end",
-                "searchable": true,
-                "type": "date",
-              },
-              "event.severity": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-                "example": 7,
-                "format": "number",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.severity",
-                "searchable": true,
-                "type": "number",
-              },
-            },
-          },
-          "host": Object {
-            "fields": Object {
-              "host.name": Object {
-                "aggregatable": true,
-                "category": "host",
-                "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "host.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "nestedField": Object {
-            "fields": Object {
-              "nestedField.firstAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.firstAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-              "nestedField.secondAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.secondAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-            },
-          },
-          "source": Object {
-            "fields": Object {
-              "source.ip": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "source.port": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "Port of the source.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "user": Object {
-            "fields": Object {
-              "user.name": Object {
-                "aggregatable": true,
-                "category": "user",
-                "description": "Short name or login of the user.",
-                "example": "albert",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "user.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-        }
-      }
       data={
         Object {
           "_id": "1",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx
index 9af22fca0c707..717c76d0baf7a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
 import '../../../../../../common/mock/match_media';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
 import { ZeekDetails } from './zeek_details';
@@ -39,11 +38,7 @@ describe('ZeekDetails', () => {
     test('it renders the default ZeekDetails', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[2].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[2].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(wrapper.find('ZeekDetails')).toMatchSnapshot();
@@ -52,11 +47,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.connection if the data does contain zeek.connection data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[13].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[13].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -67,11 +58,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.dns if the data does contain zeek.dns data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[14].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[14].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -82,11 +69,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.http if the data does contain zeek.http data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[15].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[15].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -97,11 +80,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.notice if the data does contain zeek.notice data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[16].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[16].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -112,11 +91,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.ssl if the data does contain zeek.ssl data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[17].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[17].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -127,11 +102,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.files if the data does contain zeek.files data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[18].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[18].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(wrapper.text()).toEqual('Cu0n232QMyvNtzb75jfilessha1: fa5195a...md5: f7653f1...');
@@ -140,11 +111,7 @@ describe('ZeekDetails', () => {
     test('it returns null for text if the data contains no zeek data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[0].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[0].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(wrapper.find('ZeekDetails').children().exists()).toBeFalsy();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx
index a4dbde1a5626d..ac899cad8521e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx
@@ -9,7 +9,6 @@ import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 
 import { NetflowRenderer } from '../netflow';
@@ -22,7 +21,6 @@ const Details = styled.div`
 Details.displayName = 'Details';
 
 interface ZeekDetailsProps {
-  browserFields: BrowserFields;
   data: Ecs;
   isDraggable?: boolean;
   timelineId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
index fda83c0ade12b..80f4aafbcfeb7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
@@ -10,7 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import '../../../../../../common/mock/match_media';
@@ -41,7 +40,6 @@ describe('zeek_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = zeekRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: nonZeek,
       isDraggable: true,
       timelineId: 'test',
@@ -61,7 +59,6 @@ describe('zeek_row_renderer', () => {
 
   test('should render a zeek row', () => {
     const children = zeekRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: zeek,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
index 6786bb996325c..5fd2acd852804 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
@@ -19,14 +19,9 @@ export const zeekRowRenderer: RowRenderer = {
     const module: string | null | undefined = get('event.module[0]', ecs);
     return module != null && module.toLowerCase() === 'zeek';
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
-      <ZeekDetails
-        data={data}
-        browserFields={browserFields}
-        isDraggable={isDraggable}
-        timelineId={timelineId}
-      />
+      <ZeekDetails data={data} isDraggable={isDraggable} timelineId={timelineId} />
     </RowRendererContainer>
   ),
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
index 9e74fa84a5adc..133b3ab5f36db 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
@@ -16,7 +16,7 @@ import { DroppableWrapper } from '../../../../common/components/drag_and_drop/dr
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../common/mock';
 import { DefaultCellRenderer } from './default_cell_renderer';
-import { BrowserFields } from '../../../../../../timelines/common/search_strategy';
+import { BrowserFields } from '@kbn/timelines-plugin/common/search_strategy';
 import { Ecs } from '../../../../../common/ecs';
 
 jest.mock('../../../../common/lib/kibana');
@@ -114,7 +114,6 @@ describe('DefaultCellRenderer', () => {
 
     expect(mockImplementation.renderColumn).toBeCalledWith({
       asPlainText: false,
-      browserFields,
       columnName: header.id,
       ecsData,
       eventId,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
index e075712b0bea2..88de4a9c2c6df 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
@@ -60,7 +60,6 @@ export const DefaultCellRenderer: React.FC<CellValueElementProps> = ({
       <StyledContent className={styledContentClassName} $isDetails={isDetails}>
         {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
           asPlainText, // we want to render value with links as plain text but keep other formatters like badge.
-          browserFields,
           columnName: header.id,
           ecsData,
           eventId,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx
index 3db938f5efe07..7e52267cd6f1b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx
@@ -11,7 +11,6 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { Draggable, DraggingStyle, Droppable, NotDraggingStyle } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
-import deepEqual from 'fast-deep-equal';
 
 import {
   DRAGGABLE_KEYBOARD_WRAPPER_CLASS_NAME,
@@ -357,14 +356,7 @@ export const DataProvidersGroupItem = React.memo<DataProvidersGroupItem>(
         </Draggable>
       </div>
     );
-  },
-  (prevProps, nextProps) =>
-    prevProps.groupIndex === nextProps.groupIndex &&
-    prevProps.index === nextProps.index &&
-    prevProps.timelineId === nextProps.timelineId &&
-    deepEqual(prevProps.browserFields, nextProps.browserFields) &&
-    deepEqual(prevProps.group, nextProps.group) &&
-    deepEqual(prevProps.dataProvider, nextProps.dataProvider)
+  }
 );
 
 DataProvidersGroupItem.displayName = 'DataProvidersGroupItem';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx
index 361fb5a8fecb1..2b4cbc6c74995 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx
@@ -15,26 +15,26 @@ import { defaultHeaders, mockTimelineData } from '../../../../common/mock';
 import '../../../../common/mock/match_media';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
-import { EqlTabContentComponent, Props as EqlTabContentComponentProps } from './index';
+import { EqlTabContentComponent, Props as EqlTabContentComponentProps } from '.';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import { useTimelineEvents } from '../../../containers/index';
-import { useTimelineEventsDetails } from '../../../containers/details/index';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
-import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../timelines/public/components';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '@kbn/timelines-plugin/public/components';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
-jest.mock('../../../containers/index', () => ({
+jest.mock('../../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
-jest.mock('../../../containers/details/index', () => ({
+jest.mock('../../../containers/details', () => ({
   useTimelineEventsDetails: jest.fn(),
 }));
 jest.mock('../../fields_browser', () => ({
   useFieldBrowserOptions: jest.fn(),
 }));
-jest.mock('../body/events/index', () => ({
+jest.mock('../body/events', () => ({
   Events: () => <></>,
 }));
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
index 8e15312eeb290..c53871cf2e52b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
@@ -24,7 +24,7 @@ import { InPortal } from 'react-reverse-portal';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { CellValueElementProps } from '../cell_rendering';
 import { TimelineItem } from '../../../../../common/search_strategy';
-import { useTimelineEvents } from '../../../containers/index';
+import { useTimelineEvents } from '../../../containers';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { StatefulBody } from '../body';
 import { Footer, footerHeight } from '../footer';
@@ -43,10 +43,10 @@ import { SuperDatePicker } from '../../../../common/components/super_date_picker
 import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context';
 import { inputsModel, inputsSelectors, State } from '../../../../common/store';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { useEqlEventsCountPortal } from '../../../../common/hooks/use_timeline_events_count';
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 import { TimelineDatePickerLock } from '../date_picker_lock';
 import { useTimelineFullScreen } from '../../../../common/containers/use_full_screen';
 import { activeTimeline } from '../../../containers/active_timeline_context';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
index bb7eda8ef1ff0..4942e92177134 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../../common/mock/test_providers';
 
-import { FooterComponent, PagingControlComponent } from './index';
+import { FooterComponent, PagingControlComponent } from '.';
 
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
index d9c5068109cee..196c2655e6ab0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
@@ -8,10 +8,10 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mockIndexPattern } from '../../../../common/mock';
 import { TestProviders } from '../../../../common/mock/test_providers';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
index 61b9c8b2e9585..052bed15ac8a9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiCallOut } from '@elastic/eui';
 import React from 'react';
-import type { FilterManager } from 'src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
 import { DataProviders } from '../data_providers';
 import { StatefulSearchOrFilter } from '../search_or_filter';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
index e989685130a38..bd267abb23c7d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
@@ -24,7 +24,7 @@ import usePrevious from 'react-use/lib/usePrevious';
 import { getUseField, Field, Form, useForm } from '../../../../shared_imports';
 import { TimelineId, TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
-import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
+import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { NOTES_PANEL_WIDTH } from '../properties/notes_size';
 import { useCreateTimeline } from '../properties/use_create_timeline';
 import * as commonI18n from '../properties/translations';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx
index 04b108835d53c..cbe7a57bc13a3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx
@@ -15,7 +15,7 @@ import {
   getFocusedAriaColindexCell,
   getTableSkipFocus,
   stopPropagationAndPreventDefault,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { escapeQueryValue, convertToBuildEsQuery } from '../../../common/lib/keury';
 
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
index f138c026c6140..6b29ea26da045 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
@@ -23,7 +23,7 @@ import {
   TestProviders,
 } from '../../../common/mock';
 
-import { StatefulTimeline, Props as StatefulTimelineOwnProps } from './index';
+import { StatefulTimeline, Props as StatefulTimelineOwnProps } from '.';
 import { useTimelineEvents } from '../../containers';
 import { DefaultCellRenderer } from './cell_rendering/default_cell_renderer';
 import { SELECTOR_TIMELINE_GLOBAL_CONTAINER } from './styles';
@@ -32,14 +32,14 @@ import { useSourcererDataView } from '../../../common/containers/sourcerer';
 import { createStore } from '../../../common/store';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 
-jest.mock('../../containers/index', () => ({
+jest.mock('../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
 
 jest.mock('./tabs_content');
 
 jest.mock('../../../common/lib/kibana');
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 jest.mock('@kbn/i18n-react', () => {
   const originalModule = jest.requireActual('@kbn/i18n-react');
   const FormattedRelative = jest.fn().mockImplementation(() => '20 hours ago');
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
index b32246949e2cd..b97885fa84cbc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
@@ -11,9 +11,9 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
-import { isTab, TimelineContext } from '../../../../../timelines/public';
+import { isTab, TimelineContext } from '@kbn/timelines-plugin/public';
 import { timelineActions, timelineSelectors } from '../../store/timeline';
-import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../store/timeline/defaults';
 import { defaultHeaders } from './body/column_headers/default_headers';
 import { CellValueElementProps } from './cell_rendering';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx
index 3f8a5f2457d9e..28c0dfa0d0e7b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TimelineType } from '../../../../../common/types/timeline';
 
-import { getPinIcon, Pin } from './';
+import { getPinIcon, Pin } from '.';
 
 interface ButtonIcon {
   isDisabled: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
index b908a9023a684..8a7fd244c6f20 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
@@ -17,25 +17,25 @@ import { defaultRowRenderers } from '../body/renderers';
 import { Sort } from '../body/sort';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import { useTimelineEvents } from '../../../containers/index';
-import { useTimelineEventsDetails } from '../../../containers/details/index';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
 import { PinnedTabContentComponent, Props as PinnedTabContentComponentProps } from '.';
 import { Direction } from '../../../../../common/search_strategy';
-import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../timelines/public/components';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '@kbn/timelines-plugin/public/components';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
-jest.mock('../../../containers/index', () => ({
+jest.mock('../../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
-jest.mock('../../../containers/details/index', () => ({
+jest.mock('../../../containers/details', () => ({
   useTimelineEventsDetails: jest.fn(),
 }));
 jest.mock('../../fields_browser', () => ({
   useFieldBrowserOptions: jest.fn(),
 }));
-jest.mock('../body/events/index', () => ({
+jest.mock('../body/events', () => ({
   Events: () => <></>,
 }));
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
index 8abae059e607d..9259039ae2535 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
@@ -17,7 +17,7 @@ import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { HeaderActions } from '../body/actions/header_actions';
 import { CellValueElementProps } from '../cell_rendering';
 import { Direction } from '../../../../../common/search_strategy';
-import { useTimelineEvents } from '../../../containers/index';
+import { useTimelineEvents } from '../../../containers';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { StatefulBody } from '../body';
 import { Footer, footerHeight } from '../footer';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx
index 16b22fe99ac88..1366fe632a000 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx
@@ -12,7 +12,7 @@ import { waitFor } from '@testing-library/react';
 import { AddToFavoritesButton, NewTimeline, NewTimelineProps } from './helpers';
 import { useCreateTimelineButton } from './use_create_timeline';
 import { kibanaObservable, TestProviders } from '../../../../common/mock/test_providers';
-import { timelineActions } from '../../../../timelines/store/timeline';
+import { timelineActions } from '../../../store/timeline';
 import { TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 import {
   createSecuritySolutionStorageMock,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
index 7e790ab820039..c59c0a15ff53d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -15,7 +15,7 @@ import {
   TimelineType,
   TimelineStatus,
 } from '../../../../../common/types/timeline';
-import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
+import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { useShallowEqualSelector } from '../../../../common/hooks/use_selector';
 
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
index 066d466bf9149..b301703f3cae2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
@@ -8,23 +8,25 @@
 import { mount } from 'enzyme';
 import React from 'react';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../../common/constants';
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury';
 import { mockIndexPattern, TestProviders } from '../../../../common/mock';
 import { QueryBar } from '../../../../common/components/query_bar';
 import { FilterStateStore } from '@kbn/es-query';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { buildGlobalQuery } from '../helpers';
+import { setAutocomplete } from '@kbn/unified-search-plugin/public/services';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 
 import {
   QueryBarTimeline,
   QueryBarTimelineComponentProps,
   getDataProviderFilter,
   TIMELINE_FILTER_DROP_AREA,
-} from './index';
+} from '.';
 import { waitFor } from '@testing-library/dom';
 
 const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
@@ -184,6 +186,11 @@ describe('Timeline QueryBar ', () => {
   });
 
   describe('#onSavedQuery', () => {
+    beforeEach(() => {
+      const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+      setAutocomplete(autocompleteStart.autocomplete);
+    });
+
     test('is only reference that changed when dataProviders props get updated', async () => {
       const Proxy = (props: QueryBarTimelineComponentProps) => (
         <TestProviders>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx
index c561c26383896..6412567174c73 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx
@@ -12,16 +12,12 @@ import { Subscription } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
 
 import { FilterStateStore, Filter, Query } from '@kbn/es-query';
+import type { FilterManager, SavedQuery, SavedQueryTimeFilter } from '@kbn/data-plugin/public';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
 
-import type {
-  FilterManager,
-  SavedQuery,
-  SavedQueryTimeFilter,
-} from '../../../../../../../../src/plugins/data/public';
 import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury';
-import { KqlMode } from '../../../../timelines/store/timeline/model';
+import { KqlMode } from '../../../store/timeline/model';
 import { useSavedQueryServices } from '../../../../common/utils/saved_query_services';
 import { DispatchUpdateReduxTime } from '../../../../common/components/super_date_picker';
 import { QueryBar } from '../../../../common/components/query_bar';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
index 7ae25f5b5b6ab..300d793460c09 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
@@ -14,30 +14,30 @@ import { defaultHeaders, mockTimelineData } from '../../../../common/mock';
 import '../../../../common/mock/match_media';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
-import { QueryTabContentComponent, Props as QueryTabContentComponentProps } from './index';
+import { QueryTabContentComponent, Props as QueryTabContentComponentProps } from '.';
 import { defaultRowRenderers } from '../body/renderers';
 import { Sort } from '../body/sort';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineId, TimelineStatus, TimelineTabs } from '../../../../../common/types/timeline';
-import { useTimelineEvents } from '../../../containers/index';
-import { useTimelineEventsDetails } from '../../../containers/details/index';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
 import { Direction } from '../../../../../common/search_strategy';
 import * as helpers from '../helpers';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
-jest.mock('../../../containers/index', () => ({
+jest.mock('../../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
-jest.mock('../../../containers/details/index', () => ({
+jest.mock('../../../containers/details', () => ({
   useTimelineEventsDetails: jest.fn(),
 }));
 jest.mock('../../fields_browser', () => ({
   useFieldBrowserOptions: jest.fn(),
 }));
-jest.mock('../body/events/index', () => ({
+jest.mock('../body/events', () => ({
   Events: () => <></>,
 }));
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
index 1a6fcbf7c25ba..b206260850c4a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
@@ -21,11 +21,13 @@ import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 import { InPortal } from 'react-reverse-portal';
 
+import { FilterManager } from '@kbn/data-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useInvalidFilterQuery } from '../../../../common/hooks/use_invalid_filter_query';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { CellValueElementProps } from '../cell_rendering';
 import { Direction, TimelineItem } from '../../../../../common/search_strategy';
-import { useTimelineEvents } from '../../../containers/index';
+import { useTimelineEvents } from '../../../containers';
 import { useKibana } from '../../../../common/lib/kibana';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { StatefulBody } from '../body';
@@ -33,8 +35,6 @@ import { Footer, footerHeight } from '../footer';
 import { TimelineHeader } from '../header';
 import { calculateTotalPages, combineQueries } from '../helpers';
 import { TimelineRefetch } from '../refetch_timeline';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import {
   ControlColumnProps,
   KueryFilterQueryKind,
@@ -48,10 +48,10 @@ import { SuperDatePicker } from '../../../../common/components/super_date_picker
 import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context';
 import { inputsModel, inputsSelectors, State } from '../../../../common/store';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { useTimelineEventsCountPortal } from '../../../../common/hooks/use_timeline_events_count';
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 import { TimelineDatePickerLock } from '../date_picker_lock';
 import { useTimelineFullScreen } from '../../../../common/containers/use_full_screen';
 import { activeTimeline } from '../../../containers/active_timeline_context';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx
index 9479c3209ad85..23da1c6b74fd5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx
@@ -12,7 +12,7 @@ import styled from 'styled-components';
 import { AndOrBadge } from '../../../../common/components/and_or_badge';
 
 import * as i18n from './translations';
-import { KqlMode } from '../../../../timelines/store/timeline/model';
+import { KqlMode } from '../../../store/timeline/model';
 
 const AndOrContainer = styled.div`
   position: relative;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
index 98e74269ae2df..08ac3ff9ff50a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
@@ -12,11 +12,11 @@ import { Dispatch } from 'redux';
 import deepEqual from 'fast-deep-equal';
 import type { Filter } from '@kbn/es-query';
 
-import type { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 import { State, inputsModel, inputsSelectors } from '../../../../common/store';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import { KqlMode, TimelineModel } from '../../../../timelines/store/timeline/model';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { KqlMode, TimelineModel } from '../../../store/timeline/model';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { dispatchUpdateReduxTime } from '../../../../common/components/super_date_picker';
 import { SearchOrFilter } from './search_or_filter';
 import { SerializedFilterQuery } from '../../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx
index aa2905955210a..17dd6491f2326 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx
@@ -10,8 +10,8 @@ import React, { useCallback } from 'react';
 import styled, { createGlobalStyle } from 'styled-components';
 import type { Filter } from '@kbn/es-query';
 
-import type { FilterManager } from '../../../../../../../../src/plugins/data/public';
-import { KqlMode } from '../../../../timelines/store/timeline/model';
+import type { FilterManager } from '@kbn/data-plugin/public';
+import { KqlMode } from '../../../store/timeline/model';
 import { DispatchUpdateReduxTime } from '../../../../common/components/super_date_picker';
 import { KueryFilterQuery } from '../../../../../common/types/timeline';
 import { DataProvider } from '../data_providers/data_provider';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
index 7269c005e9af5..edaf8728c4e75 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow, ShallowWrapper, mount } from 'enzyme';
 
 import { SortFieldTimeline, TimelineType } from '../../../../../common/types/timeline';
-import { SelectableTimeline, ORIGINAL_PAGE_SIZE } from './';
+import { SelectableTimeline, ORIGINAL_PAGE_SIZE } from '.';
 import { Direction } from '../../../../../common/search_strategy';
 
 const mockFetchAllTimeline = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx
index 693429ac9fc8c..941b24df76a23 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx
@@ -9,11 +9,11 @@ import React, { useMemo, useCallback } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
-import type { EntityType } from '../../../../../../timelines/common';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineSelectors } from '../../../store/timeline';
 import { useKibana } from '../../../../common/lib/kibana';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { useDetailPanel } from '../../side_panel/hooks/use_detail_panel';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
@@ -22,7 +22,7 @@ import {
   SCROLLING_DISABLED_CLASS_NAME,
   FULL_SCREEN_TOGGLED_CLASS_NAME,
 } from '../../../../../common/constants';
-import { FULL_SCREEN } from '../../timeline/body/column_headers/translations';
+import { FULL_SCREEN } from '../body/column_headers/translations';
 import { EXIT_FULL_SCREEN } from '../../../../common/components/exit_full_screen/translations';
 import {
   useTimelineFullScreen,
@@ -32,7 +32,7 @@ import {
   updateTimelineGraphEventId,
   updateTimelineSessionViewConfig,
   setActiveTabTimeline,
-} from '../../../../timelines/store/timeline/actions';
+} from '../../../store/timeline/actions';
 import { detectionsTimelineIds } from '../../../containers/helpers';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
index 44a750cc7283b..024a7cd16944c 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -10,7 +10,7 @@ import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { isEmpty } from 'lodash';
 
-import { throwErrors } from '../../../../cases/common';
+import { throwErrors } from '@kbn/cases-plugin/common';
 import {
   TimelineResponse,
   TimelineResponseType,
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx
index cc60e9421d26b..0173b6cfce0ed 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx
@@ -11,6 +11,8 @@ import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { useKibana } from '../../../common/lib/kibana';
 import {
   DocValueFields,
@@ -19,10 +21,8 @@ import {
   TimelineEventsDetailsRequestOptions,
   TimelineEventsDetailsStrategyResponse,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
 import * as i18n from './translations';
-import { EntityType } from '../../../../../timelines/common';
 import { Ecs } from '../../../../common/ecs';
 
 export interface EventsArgs {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
index 3586aa186b020..56eb11109d742 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
@@ -12,18 +12,14 @@ import { useDispatch } from 'react-redux';
 import { Subscription } from 'rxjs';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { DataView, isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../../common/typed_json';
-import {
-  DataView,
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../src/plugins/data/common';
 
 import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experimental_features';
 import { inputsModel } from '../../common/store';
 import { useKibana } from '../../common/lib/kibana';
 import { createFilter } from '../../common/containers/helpers';
-import { timelineActions } from '../../timelines/store/timeline';
+import { timelineActions } from '../store/timeline';
 import { detectionsTimelineIds, skipQueryForDetectionsPage } from './helpers';
 import { getInspectResponse } from '../../helpers';
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx
index 3b13c261f970c..de2169bb390c3 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/public';
 import { inputsModel } from '../../../common/store';
 import { useKibana } from '../../../common/lib/kibana';
 import {
@@ -20,7 +21,6 @@ import {
   TimerangeInput,
 } from '../../../../common/search_strategy';
 import { ESQuery } from '../../../../common/typed_json';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/public';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
index c44d1351b0830..b344b5a3fdb82 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelinesStorage } from './types';
 import { useKibana } from '../../../common/lib/kibana';
 import { TimelineModel } from '../../store/timeline/model';
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts
index d6f88698448fb..b8030cc07d6a3 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TimelineModel } from '../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../store/timeline/model';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 
 export interface TimelinesStorage {
diff --git a/x-pack/plugins/security_solution/public/timelines/pages/index.tsx b/x-pack/plugins/security_solution/public/timelines/pages/index.tsx
index 58049ef164e15..b2c813087f8db 100644
--- a/x-pack/plugins/security_solution/public/timelines/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/pages/index.tsx
@@ -9,7 +9,7 @@ import { isEmpty } from 'lodash/fp';
 import React from 'react';
 import { Switch, Route, Redirect } from 'react-router-dom';
 
-import { ChromeBreadcrumb } from '../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
 import { TimelineType } from '../../../common/types/timeline';
 import { TimelineRouteSpyState } from '../../common/utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/timelines/routes.tsx b/x-pack/plugins/security_solution/public/timelines/routes.tsx
index 0bc95b3b4959f..0b427eeb86767 100644
--- a/x-pack/plugins/security_solution/public/timelines/routes.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/routes.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { Timelines } from './pages';
 import { TIMELINES_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
index 10251f25fb02d..d90813f5288ea 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
@@ -12,7 +12,7 @@ import {
   DataProvider,
   DataProviderType,
   QueryOperator,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
+} from '../../components/timeline/data_providers/data_provider';
 
 import { KqlMode, TimelineModel } from './model';
 import { InsertTimeline } from './types';
@@ -44,7 +44,7 @@ export {
   updateItemsPerPageOptions,
   updateSort,
   upsertColumn,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { ResolveTimelineConfig } from '../../components/open_timeline/types';
 import { SessionViewConfig } from '../../components/timeline/session_tab_content/use_session_view';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
index 5748f0e9cf07a..76c94619a7fb3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
@@ -11,7 +11,7 @@ import uuid from 'uuid';
 
 import type { Filter } from '@kbn/es-query';
 
-import { Sort } from '../../../timelines/components/timeline/body/sort';
+import { Sort } from '../../components/timeline/body/sort';
 import {
   DataProvider,
   QueryOperator,
@@ -19,7 +19,7 @@ import {
   DataProviderType,
   IS_OPERATOR,
   EXISTS_OPERATOR,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
+} from '../../components/timeline/data_providers/data_provider';
 import { TimelineNonEcsData } from '../../../../common/search_strategy/timeline';
 import {
   ColumnHeaderOptions,
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
index d0bbd47a10176..5356c4bf3c7e3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { TGridModelForTimeline } from '@kbn/timelines-plugin/public';
 import { EqlOptionsSelected } from '../../../../common/search_strategy/timeline';
 import type {
   TimelineEventsType,
@@ -14,7 +15,6 @@ import type {
   ScrollToTopEvent,
 } from '../../../../common/types/timeline';
 import { PinnedEvent } from '../../../../common/types/timeline/pinned_event';
-import type { TGridModelForTimeline } from '../../../../../timelines/public';
 import { ResolveTimelineConfig } from '../../components/open_timeline/types';
 import type { SessionViewConfig } from '../../components/timeline/session_tab_content/use_session_view';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
index 203b988be378f..b1a92743d13f0 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
@@ -19,12 +19,12 @@ import {
   DataProvider,
   DataProviderType,
   DataProvidersAnd,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
-import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers';
+} from '../../components/timeline/data_providers/data_provider';
+import { defaultColumnHeaderType } from '../../components/timeline/body/column_headers/default_headers';
 import {
   DEFAULT_COLUMN_MIN_WIDTH,
   RESIZED_COLUMN_MIN_WITH,
-} from '../../../timelines/components/timeline/body/constants';
+} from '../../components/timeline/body/constants';
 import { defaultHeaders } from '../../../common/mock';
 
 import {
@@ -52,9 +52,9 @@ import { TimelineModel } from './model';
 import { timelineDefaults } from './defaults';
 import { TimelineById } from './types';
 import { Direction } from '../../../../common/search_strategy';
-import type { FilterManager } from '../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 jest.mock('../../../common/utils/default_date_settings', () => {
   const actual = jest.requireActual('../../../common/utils/default_date_settings');
   return {
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
index 0dd898f1c4ab9..ec57984ada1f3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
@@ -7,7 +7,7 @@
 
 import { createSelector } from 'reselect';
 
-export { getManageTimelineById } from '../../../../../timelines/public';
+export { getManageTimelineById } from '@kbn/timelines-plugin/public';
 import { State } from '../../../common/store/types';
 
 import { TimelineModel } from './model';
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
index d4a96d036bd5f..c91f16b1345ad 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
@@ -8,12 +8,12 @@
 import { Action } from 'redux';
 import { Observable } from 'rxjs';
 
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { inputsModel } from '../../../common/store/inputs';
 import { NotesById } from '../../../common/store/app/model';
 
 import { TimelineModel } from './model';
-import { CoreStart } from '../../../../../../../src/core/public';
 
 export interface AutoSavedWarningMsg {
   timelineId: string | null;
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index 05538a1ecbb35..3fa7e964f6ca1 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -5,31 +5,35 @@
  * 2.0.
  */
 
-import type { CoreStart } from '../../../../src/core/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { LensPublicStart } from '../../../plugins/lens/public';
-import type { NewsfeedPublicPluginStart } from '../../../../src/plugins/newsfeed/public';
-import type { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
-import type { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import type { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { FleetStart } from '../../fleet/public';
-import type { PluginStart as ListsPluginStart } from '../../lists/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { NewsfeedPublicPluginStart } from '@kbn/newsfeed-plugin/public';
+import type { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { FleetStart } from '@kbn/fleet-plugin/public';
+import type { PluginStart as ListsPluginStart } from '@kbn/lists-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup as TriggersActionsSetup,
   TriggersAndActionsUIPublicPluginStart as TriggersActionsStart,
-} from '../../triggers_actions_ui/public';
-import type { CasesUiStart } from '../../cases/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import type { TimelinesUIStart } from '../../timelines/public';
-import type { SessionViewStart } from '../../session_view/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { CasesUiStart } from '@kbn/cases-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { TimelinesUIStart } from '@kbn/timelines-plugin/public';
+import type { SessionViewStart } from '@kbn/session-view-plugin/public';
+import type { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
+import type { OsqueryPluginStart } from '@kbn/osquery-plugin/public';
+import type { LicensingPluginStart, LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { ResolverPluginSetup } from './resolver/types';
 import type { Inspect } from '../common/search_strategy';
-import type { MlPluginSetup, MlPluginStart } from '../../ml/public';
-import type { OsqueryPluginStart } from '../../osquery/public';
 import type { Detections } from './detections';
 import type { Cases } from './cases';
 import type { Exceptions } from './exceptions';
@@ -40,10 +44,6 @@ import type { Overview } from './overview';
 import type { Rules } from './rules';
 import type { Timelines } from './timelines';
 import type { Management } from './management';
-import type { LicensingPluginStart, LicensingPluginSetup } from '../../licensing/public';
-import type { DashboardStart } from '../../../../src/plugins/dashboard/public';
-import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 
 export interface SetupPlugins {
   home?: HomePublicPluginSetup;
diff --git a/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx b/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx
index 117a62e0494df..95cc6ceef4e62 100644
--- a/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx
@@ -48,5 +48,29 @@ describe('Users Table Component', () => {
       expect(getAllByRole('columnheader').length).toBe(3);
       expect(getByText(userName)).toBeInTheDocument();
     });
+
+    test('it renders empty string token when users name is empty', () => {
+      const { getByTestId } = render(
+        <TestProviders>
+          <UsersTable
+            users={[{ name: '', lastSeen: '2019-04-08T18:35:45.064Z', domain: 'test domain' }]}
+            fakeTotalCount={50}
+            id="users"
+            loading={false}
+            loadPage={loadPage}
+            showMorePagesIndicator={false}
+            totalCount={0}
+            type={usersModel.UsersType.page}
+            sort={{
+              field: UsersFields.name,
+              direction: Direction.asc,
+            }}
+            setQuerySkip={() => {}}
+          />
+        </TestProviders>
+      );
+
+      expect(getByTestId('table-allUsers-loading-false')).toHaveTextContent('(Empty string)');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx b/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx
index 9a00a637f551d..fff8a188fd0a6 100644
--- a/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx
@@ -10,6 +10,7 @@ import { useDispatch } from 'react-redux';
 
 import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date';
 import { UserDetailsLink } from '../../../common/components/links';
+import { getOrEmptyTagFromValue } from '../../../common/components/empty_value';
 
 import {
   Columns,
@@ -66,12 +67,14 @@ const getUsersColumns = (): UsersTableColumns => [
     sortable: true,
     mobileOptions: { show: true },
     render: (name) =>
-      getRowItemDraggables({
-        rowItems: [name],
-        attrName: 'user.name',
-        idPrefix: `users-table-${name}-name`,
-        render: (item) => <UserDetailsLink userName={item} />,
-      }),
+      name != null && name.length > 0
+        ? getRowItemDraggables({
+            rowItems: [name],
+            attrName: 'user.name',
+            idPrefix: `users-table-${name}-name`,
+            render: (item) => <UserDetailsLink userName={item} />,
+          })
+        : getOrEmptyTagFromValue(name),
   },
   {
     field: 'lastSeen',
@@ -88,11 +91,13 @@ const getUsersColumns = (): UsersTableColumns => [
     truncateText: false,
     mobileOptions: { show: true },
     render: (domain) =>
-      getRowItemDraggables({
-        rowItems: [domain],
-        attrName: 'user.domain',
-        idPrefix: `users-table-${domain}-domain`,
-      }),
+      domain != null && domain.length > 0
+        ? getRowItemDraggables({
+            rowItems: [domain],
+            attrName: 'user.domain',
+            idPrefix: `users-table-${domain}-domain`,
+          })
+        : getOrEmptyTagFromValue(domain),
   },
 ];
 
diff --git a/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx b/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx
index cedfd6b50153d..94c2c6b5755f7 100644
--- a/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx
@@ -9,7 +9,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { TotalUsersKpi } from './index';
+import { TotalUsersKpi } from '.';
 import { useSearchStrategy } from '../../../../common/containers/use_search_strategy';
 
 jest.mock('../../../../common/containers/query_toggle');
diff --git a/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx b/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx
index 0b87165cbe8ac..121ccae4553fc 100644
--- a/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx
@@ -20,7 +20,7 @@ import { getUserRiskScoreColumns } from './columns';
 
 import * as i18nUsers from '../../pages/translations';
 import * as i18n from './translations';
-import { usersModel, usersSelectors } from '../../store';
+import { usersModel, usersSelectors, usersActions } from '../../store';
 import {
   UserRiskScoreFields,
   UserRiskScoreItem,
@@ -29,7 +29,6 @@ import { SeverityCount } from '../../../common/components/severity/types';
 import { SeverityBadges } from '../../../common/components/severity/severity_badges';
 import { SeverityBar } from '../../../common/components/severity/severity_bar';
 import { SeverityFilterGroup } from '../../../common/components/severity/severity_filter_group';
-import { usersActions } from '../../../users/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { State } from '../../../common/store';
 import {
diff --git a/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx b/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx
index d8687524215d5..effe635ac921c 100644
--- a/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx
@@ -10,15 +10,12 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { useKibana } from '../../../../common/lib/kibana';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 import {
diff --git a/x-pack/plugins/security_solution/public/users/index.ts b/x-pack/plugins/security_solution/public/users/index.ts
index 63fdc52e19e52..1ff1f7056d8de 100644
--- a/x-pack/plugins/security_solution/public/users/index.ts
+++ b/x-pack/plugins/security_solution/public/users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { SecuritySubPluginWithStore } from '../app/types';
 import { routes } from './routes';
 import { initialUsersState, usersReducer, usersModel } from './store';
diff --git a/x-pack/plugins/security_solution/public/users/pages/details/index.tsx b/x-pack/plugins/security_solution/public/users/pages/details/index.tsx
index 3dfe67de92c81..80c2bab837b00 100644
--- a/x-pack/plugins/security_solution/public/users/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/pages/details/index.tsx
@@ -11,6 +11,7 @@ import React, { useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
 import type { Filter } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../../app/types';
 import { FiltersGlobal } from '../../../common/components/filters_global';
 import { HeaderPage } from '../../../common/components/header_page';
@@ -24,7 +25,6 @@ import { inputsSelectors } from '../../../common/store';
 import { setUsersDetailsTablesActivePageToZero } from '../../store/actions';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { SpyRoute } from '../../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 
 import { UsersDetailsTabs } from './details_tabs';
 import { navTabsUsersDetails } from './nav_tabs';
diff --git a/x-pack/plugins/security_solution/public/users/pages/details/utils.ts b/x-pack/plugins/security_solution/public/users/pages/details/utils.ts
index e648a8998a989..4b85d0f59314f 100644
--- a/x-pack/plugins/security_solution/public/users/pages/details/utils.ts
+++ b/x-pack/plugins/security_solution/public/users/pages/details/utils.ts
@@ -7,7 +7,7 @@
 
 import { get, isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { usersModel } from '../../store';
 import { UsersTableType } from '../../store/model';
 import { getUsersDetailsUrl } from '../../../common/components/link_to/redirect_to_users';
diff --git a/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts b/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts
index d5c49590dad60..d66e6b8d84c29 100644
--- a/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts
+++ b/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { DocValueFields } from '@kbn/timelines-plugin/common';
 import { UsersTableType, UsersType } from '../../store/model';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 import { ESTermQuery } from '../../../../common/typed_json';
-import { DocValueFields } from '../../../../../timelines/common';
 import { NavTab } from '../../../common/components/navigation/types';
 
 type KeyUsersNavTabWithoutMlPermission = UsersTableType.allUsers &
diff --git a/x-pack/plugins/security_solution/public/users/pages/types.ts b/x-pack/plugins/security_solution/public/users/pages/types.ts
index 787f5def1a18c..79336098813da 100644
--- a/x-pack/plugins/security_solution/public/users/pages/types.ts
+++ b/x-pack/plugins/security_solution/public/users/pages/types.ts
@@ -7,10 +7,10 @@
 import { ActionCreator } from 'typescript-fsa';
 
 import { Filter } from '@kbn/es-query';
+import { DocValueFields } from '@kbn/timelines-plugin/common';
 import { GlobalTimeArgs } from '../../common/containers/use_global_time';
 
-import { usersModel } from '../../users/store';
-import { DocValueFields } from '../../../../timelines/common';
+import { usersModel } from '../store';
 import { InputsModelId } from '../../common/store/inputs/constants';
 
 export type UsersTabsProps = GlobalTimeArgs & {
diff --git a/x-pack/plugins/security_solution/public/users/pages/users.tsx b/x-pack/plugins/security_solution/public/users/pages/users.tsx
index 046cf5ead65b7..f1f07249ff19e 100644
--- a/x-pack/plugins/security_solution/public/users/pages/users.tsx
+++ b/x-pack/plugins/security_solution/public/users/pages/users.tsx
@@ -12,7 +12,8 @@ import React, { useCallback, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import { Filter } from '@kbn/es-query';
-import { isTab } from '../../../../timelines/public';
+import { isTab } from '@kbn/timelines-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../app/types';
 import { FiltersGlobal } from '../../common/components/filters_global';
 import { HeaderPage } from '../../common/components/header_page';
@@ -29,7 +30,6 @@ import { inputsSelectors, State } from '../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../common/store/inputs/actions';
 
 import { SpyRoute } from '../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../src/plugins/data/common';
 import { UsersTabs } from './users_tabs';
 import { navTabsUsers } from './nav_tabs';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx b/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx
index c3ffdc646966f..d16dd6053002e 100644
--- a/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx
+++ b/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../common/mock';
 import { SecuritySolutionTabNavigation } from '../../common/components/navigation';
 import { Users } from './users';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
-import { mockCasesContext } from '../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 jest.mock('../../common/containers/sourcerer');
diff --git a/x-pack/plugins/security_solution/public/users/routes.tsx b/x-pack/plugins/security_solution/public/users/routes.tsx
index dcdda586449f9..426e7090ca845 100644
--- a/x-pack/plugins/security_solution/public/users/routes.tsx
+++ b/x-pack/plugins/security_solution/public/users/routes.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { UsersContainer } from './pages';
 
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
 import { USERS_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts
index 0866d2d8465c5..4160c11fc3521 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 import { AxiosResponse } from 'axios';
-import { indexFleetEndpointPolicy } from '../../../common/endpoint/data_loaders/index_fleet_endpoint_policy';
 import {
   PACKAGE_POLICY_API_ROUTES,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../fleet/common/constants';
+} from '@kbn/fleet-plugin/common/constants';
+import { indexFleetEndpointPolicy } from '../../../common/endpoint/data_loaders/index_fleet_endpoint_policy';
 import { setupFleetForEndpoint } from '../../../common/endpoint/data_loaders/setup_fleet_for_endpoint';
 import { GetPolicyListResponse } from '../../../public/management/pages/policy/types';
 
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator_script.ts b/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator_script.ts
index 1d0b07f1b64e1..a564e627c9909 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator_script.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator_script.ts
@@ -10,7 +10,8 @@ import yargs from 'yargs';
 import fs from 'fs';
 import { Client, errors } from '@elastic/elasticsearch';
 import type { ClientOptions } from '@elastic/elasticsearch/lib/client';
-import { ToolingLog, CA_CERT_PATH } from '@kbn/dev-utils';
+import { CA_CERT_PATH } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient, KbnClientOptions } from '@kbn/test';
 import { indexHostsAndAlerts } from '../../common/endpoint/index_data';
 import { ANCESTRY_LIMIT, EndpointDocGenerator } from '../../common/endpoint/generate_data';
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts b/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
index 72f7b2688de1c..9df43704da81c 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
@@ -6,7 +6,7 @@
  */
 
 import minimist from 'minimist';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { KbnClient } from '@kbn/test';
 import pMap from 'p-map';
 import { basename } from 'path';
diff --git a/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts b/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts
index 917eb205837a6..f5764fe28e9d3 100644
--- a/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts
+++ b/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts
@@ -7,10 +7,10 @@
 
 // See: https://github.com/elastic/kibana/issues/117255, this creates mocks to avoid memory leaks from kibana core.
 
-import { parseDuration } from '../../../alerting/common/parse_duration';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 // We _must_ import from the restricted path or we pull in _everything_ including memory leaks from Kibana core
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ReadOperations, WriteOperations } from '../../../alerting/server/authorization';
+import { ReadOperations, WriteOperations } from '@kbn/alerting-plugin/server/authorization';
 
 module.exports = {
   parseDuration,
diff --git a/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts b/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts
index c5e07f9c135a7..adf7a0a8eb193 100644
--- a/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts
+++ b/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts
@@ -9,7 +9,7 @@
 
 // We _must_ import from the restricted path or we pull in _everything_ including memory leaks from Kibana core
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsUtils } from '../../../../../src/core/server/saved_objects/service/lib/utils';
+import { SavedObjectsUtils } from '@kbn/core/server/saved_objects/service/lib/utils';
 module.exports = {
   SavedObjectsUtils,
 };
diff --git a/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts b/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts
index e61080e56ea69..8a0eb39aa8f23 100644
--- a/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts
@@ -8,7 +8,7 @@
 // See: https://github.com/elastic/kibana/issues/117255, this creates mocks to avoid memory leaks from kibana core.
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { TaskStatus } from '../../../task_manager/server/task';
+import { TaskStatus } from '@kbn/task-manager-plugin/server/task';
 module.exports = {
   TaskStatus,
 };
diff --git a/x-pack/plugins/security_solution/server/client/factory.test.ts b/x-pack/plugins/security_solution/server/client/factory.test.ts
index 2a8653a6fc15d..f424b5c6901a1 100644
--- a/x-pack/plugins/security_solution/server/client/factory.test.ts
+++ b/x-pack/plugins/security_solution/server/client/factory.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { createMockConfig } from '../lib/detection_engine/routes/__mocks__';
 import { AppClientFactory } from './factory';
 import { AppClient } from './client';
diff --git a/x-pack/plugins/security_solution/server/client/factory.ts b/x-pack/plugins/security_solution/server/client/factory.ts
index 67af254ec37d7..09a6791596ce1 100644
--- a/x-pack/plugins/security_solution/server/client/factory.ts
+++ b/x-pack/plugins/security_solution/server/client/factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from '../../../../../src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { AppClient } from './client';
 import { ConfigType } from '../config';
 
diff --git a/x-pack/plugins/security_solution/server/config.ts b/x-pack/plugins/security_solution/server/config.ts
index d7e8547fd50ef..42eaed75be239 100644
--- a/x-pack/plugins/security_solution/server/config.ts
+++ b/x-pack/plugins/security_solution/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SIGNALS_INDEX_KEY, DEFAULT_SIGNALS_INDEX } from '../common/constants';
 import {
   ExperimentalFeatures,
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
index ece99dfd8e443..e65dac1e0b688 100644
--- a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -5,20 +5,21 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'src/core/server';
-import { ExceptionListClient } from '../../../lists/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import {
   CasesClient,
   PluginStartContract as CasesPluginStartContract,
-} from '../../../cases/server';
-import { SecurityPluginStart } from '../../../security/server';
+} from '@kbn/cases-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   AgentService,
   FleetStartContract,
   AgentPolicyServiceInterface,
   PackagePolicyServiceInterface,
-} from '../../../fleet/server';
-import { PluginStartContract as AlertsPluginStartContract } from '../../../alerting/server';
+} from '@kbn/fleet-plugin/server';
+import { PluginStartContract as AlertsPluginStartContract } from '@kbn/alerting-plugin/server';
+import type { ListsServerExtensionRegistrar } from '@kbn/lists-plugin/server';
 import {
   getPackagePolicyCreateCallback,
   getPackagePolicyUpdateCallback,
@@ -39,7 +40,6 @@ import {
   EndpointInternalFleetServicesInterface,
   EndpointScopedFleetServicesInterface,
 } from './services/fleet/endpoint_fleet_services_factory';
-import type { ListsServerExtensionRegistrar } from '../../../lists/server';
 import { registerListsPluginEndpointExtensionPoints } from '../lists_integration';
 import { EndpointAuthz } from '../../common/endpoint/types/authz';
 import { calculateEndpointAuthz } from '../../common/endpoint/service/authz';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
index 20da1e212f40f..4a1552e2b3a25 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   InternalArtifactSchema,
   InternalArtifactCompleteSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
index 179ea3827df0c..0f4890ac3baba 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ExceptionListClient } from '../../../../../lists/server';
-import { listMock } from '../../../../../lists/server/mocks';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import type { EntriesArray, EntryList } from '@kbn/securitysolution-io-ts-list-types';
 import { buildArtifact, getEndpointExceptionList, getFilteredEndpointExceptionList } from './lists';
 import { TranslatedEntry, TranslatedExceptionListItem } from '../../schemas/artifacts';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
index 2ea52485e625b..f2fda48dbc05e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
@@ -22,7 +22,7 @@ import {
   ENDPOINT_LIST_ID,
   ENDPOINT_TRUSTED_APPS_LIST_ID,
 } from '@kbn/securitysolution-list-constants';
-import { ExceptionListClient } from '../../../../../lists/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import {
   InternalArtifactCompleteSchema,
   TranslatedEntry,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts
index 5f1fe72b7c0f9..0226e8d47df3d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { relativeDownloadUrlFromArtifact } from '@kbn/fleet-plugin/server';
 import { InternalArtifactSchema } from '../../schemas/artifacts';
 import { CompressionAlgorithm } from '../../../../common/endpoint/schema/common';
 import { ManifestEntrySchema } from '../../../../common/endpoint/schema/manifest';
 import { getArtifactId } from './common';
-import { relativeDownloadUrlFromArtifact } from '../../../../../fleet/server';
 
 export class ManifestEntry {
   private artifact: InternalArtifactSchema;
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts
index aef57f6679b27..ee850f93a7b2a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts
@@ -8,19 +8,19 @@
 import {
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../../src/core/server/mocks';
+  elasticsearchServiceMock,
+} from '@kbn/core/server/mocks';
 import {
   Logger,
   SavedObjectsClient,
   SavedObjectsFindResponse,
   SavedObjectsFindResult,
-} from 'kibana/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
 import { migrateArtifactsToFleet } from './migrate_artifacts_to_fleet';
 import { createEndpointArtifactClientMock } from '../../services/artifacts/mocks';
 import { InternalArtifactCompleteSchema } from '../../schemas';
-import { generateArtifactEsGetSingleHitMock } from '../../../../../fleet/server/services/artifacts/mocks';
-import { NewArtifact } from '../../../../../fleet/server/services';
+import { generateArtifactEsGetSingleHitMock } from '@kbn/fleet-plugin/server/services/artifacts/mocks';
+import { NewArtifact } from '@kbn/fleet-plugin/server/services';
 import { CreateRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 describe('When migrating artifacts to fleet', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts
index 53c4d5bafe39c..ee72ccbc73e82 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts
@@ -7,7 +7,7 @@
 
 import { inflate as _inflate } from 'zlib';
 import { promisify } from 'util';
-import { SavedObjectsClient, Logger } from 'kibana/server';
+import { SavedObjectsClient, Logger } from '@kbn/core/server';
 import { EndpointArtifactClientInterface } from '../../services';
 import { InternalArtifactCompleteSchema, InternalArtifactSchema } from '../../schemas';
 import { ArtifactConstants } from './common';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts
index 814a9880014cd..9ec6cd9e26a02 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { ManifestConstants } from './common';
 import { migrations, OldInternalManifestSchema } from './migrations';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts
index e419c4297b23a..057a840d2fc6e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectMigrationMap,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { InternalManifestSchema } from '../../schemas/artifacts';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
index 172e4656b9754..bf3e4d398933a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
@@ -6,8 +6,8 @@
  */
 
 import { mapValues } from 'lodash';
-import { PackagePolicy, PackagePolicyConfigRecord } from '../../../../../fleet/common';
-import { createPackagePolicyMock } from '../../../../../fleet/common/mocks';
+import { PackagePolicy, PackagePolicyConfigRecord } from '@kbn/fleet-plugin/common';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
 import {
   getInternalArtifactMock,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
index 2202336ef4519..0805e94262572 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { ArtifactConstants, ManifestConstants } from './common';
 import { migrations } from './migrations';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts
index 396cc402c0ab5..5cd96436489e0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { taskManagerMock } from '../../../../../task_manager/server/mocks';
-import { TaskStatus } from '../../../../../task_manager/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
 
 import { createMockEndpointAppContext } from '../../mocks';
 
@@ -17,7 +17,7 @@ import { buildManifestManagerMock } from '../../services/artifacts/manifest_mana
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
 import { getMockArtifacts } from './mocks';
 import { InvalidInternalManifestError } from '../../services/artifacts/errors';
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('task', () => {
   const MOCK_TASK_INSTANCE = {
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
index 06192fa8ba82f..ad31b51cae22b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { EndpointAppContext } from '../../types';
 import { getArtifactId, reportErrors } from './common';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts
index b15101bf3cdb3..0395db54b7a2e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts
@@ -14,24 +14,20 @@ import {
   BASE_NEXT_ATTEMPT_DELAY,
 } from './check_metadata_transforms_task';
 import { createMockEndpointAppContext } from '../../mocks';
-import { coreMock } from '../../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../../task_manager/server/mocks';
-import { TaskManagerSetupContract, TaskStatus } from '../../../../../task_manager/server';
-import { CoreSetup } from '../../../../../../../src/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { TaskManagerSetupContract, TaskStatus } from '@kbn/task-manager-plugin/server';
+import { CoreSetup } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { TRANSFORM_STATES } from '../../../../common/constants';
 import { METADATA_TRANSFORMS_PATTERN } from '../../../../common/endpoint/constants';
-import { RunResult } from '../../../../../task_manager/server/task';
-import {
-  ElasticsearchAssetType,
-  EsAssetReference,
-  Installation,
-} from '../../../../../fleet/common';
+import { RunResult } from '@kbn/task-manager-plugin/server/task';
+import { ElasticsearchAssetType, EsAssetReference, Installation } from '@kbn/fleet-plugin/common';
 
 import type { EndpointAppContext } from '../../types';
-import type { PackagePolicy } from '../../../../../fleet/common/types/models/package_policy';
-import type { PackageClient } from '../../../../../fleet/server';
+import type { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
+import type { PackageClient } from '@kbn/fleet-plugin/server';
 
 const MOCK_TASK_INSTANCE = {
   id: `${TYPE}:${VERSION}`,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
index 39c93e748d75b..114e29d0a221b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
@@ -10,18 +10,18 @@ import {
   TransformGetTransformStatsResponse,
   TransformGetTransformStatsTransformStats,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { CoreSetup, ElasticsearchClient, Logger } from 'src/core/server';
+import { CoreSetup, ElasticsearchClient, Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
   throwUnrecoverableError,
-} from '../../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+import { ElasticsearchAssetType, FLEET_ENDPOINT_PACKAGE } from '@kbn/fleet-plugin/common';
 import { EndpointAppContext } from '../../types';
 import { METADATA_TRANSFORMS_PATTERN } from '../../../../common/endpoint/constants';
 import { WARNING_TRANSFORM_STATES } from '../../../../common/constants';
 import { wrapErrorIfNeeded } from '../../utils';
-import { ElasticsearchAssetType, FLEET_ENDPOINT_PACKAGE } from '../../../../../fleet/common';
 
 const SCOPE = ['securitySolution'];
 const INTERVAL = '2h';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
index 32d5806a4b47a..d49f07919a9c9 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
@@ -10,15 +10,15 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { LicenseService } from '../../../../common/license';
-import { createPackagePolicyServiceMock } from '../../../../../fleet/server/mocks';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
 import { PolicyWatcher } from './license_watch';
-import { ILicense } from '../../../../../licensing/common/types';
-import { licenseMock } from '../../../../../licensing/common/licensing.mock';
-import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
-import { PackagePolicy } from '../../../../../fleet/common';
-import { createPackagePolicyMock } from '../../../../../fleet/common/mocks';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
 import { policyFactory } from '../../../../common/endpoint/models/policy_config';
 import { PolicyConfig } from '../../../../common/endpoint/types';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
index 8303291b5bcd4..f88b3dab61b26 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
@@ -14,10 +14,10 @@ import {
   Logger,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'src/core/server';
-import { PackagePolicy, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../fleet/common';
-import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
-import { ILicense } from '../../../../../licensing/common/types';
+} from '@kbn/core/server';
+import { PackagePolicy, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import {
   isEndpointPolicyValidForLicense,
   unsetPolicyFeaturesAccordingToLicenseLevel,
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index d646b3b505ede..6d6c83efd70fd 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -5,20 +5,32 @@
  * 2.0.
  */
 
-import { loggingSystemMock, savedObjectsServiceMock } from '../../../../../src/core/server/mocks';
-import { IScopedClusterClient, SavedObjectsClientContract } from '../../../../../src/core/server';
-import { listMock } from '../../../lists/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { alertsMock } from '../../../alerting/server/mocks';
-import { xpackMocks } from '../fixtures';
-import { FleetStartContract, ExternalCallback } from '../../../fleet/server';
+import type { AwaitedProperties } from '@kbn/utility-types';
+import {
+  loggingSystemMock,
+  savedObjectsServiceMock,
+  ScopedClusterClientMock,
+} from '@kbn/core/server/mocks';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { FleetStartContract, ExternalCallback } from '@kbn/fleet-plugin/server';
 import {
   createPackagePolicyServiceMock,
   createMockAgentPolicyService,
   createMockAgentService,
   createArtifactsClientMock,
   createMockPackageService,
-} from '../../../fleet/server/mocks';
+} from '@kbn/fleet-plugin/server/mocks';
+// A TS error (TS2403) is thrown when attempting to export the mock function below from Cases
+// plugin server `index.ts`. Its unclear what is actually causing the error. Since this is a Mock
+// file and not bundled with the application, adding a eslint disable below and using import from
+// a restricted path.
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createCasesClientMock } from '@kbn/cases-plugin/server/client/mocks';
+import { createFleetAuthzMock } from '@kbn/fleet-plugin/common';
+import { xpackMocks } from '../fixtures';
 import { createMockConfig, requestContextMock } from '../lib/detection_engine/routes/__mocks__';
 import {
   EndpointAppContextService,
@@ -28,18 +40,10 @@ import {
 import { ManifestManager } from './services/artifacts/manifest_manager/manifest_manager';
 import { getManifestManagerMock } from './services/artifacts/manifest_manager/manifest_manager.mock';
 import { EndpointAppContext } from './types';
-import { MetadataRequestContext } from './routes/metadata/handlers';
 import { SecuritySolutionRequestHandlerContext } from '../types';
 import { parseExperimentalConfigValue } from '../../common/experimental_features';
-// A TS error (TS2403) is thrown when attempting to export the mock function below from Cases
-// plugin server `index.ts`. Its unclear what is actually causing the error. Since this is a Mock
-// file and not bundled with the application, adding a eslint disable below and using import from
-// a restricted path.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createCasesClientMock } from '../../../cases/server/client/mocks';
 import { requestContextFactoryMock } from '../request_context_factory.mock';
 import { EndpointMetadataService } from './services/metadata';
-import { createFleetAuthzMock } from '../../../fleet/common';
 import { createMockClients } from '../lib/detection_engine/routes/__mocks__/request_context';
 import { createEndpointMetadataServiceTestContextMock } from './services/metadata/mocks';
 
@@ -190,24 +194,22 @@ export const createMockFleetStartContract = (indexPattern: string): FleetStartCo
   };
 };
 
-export const createMockMetadataRequestContext = (): jest.Mocked<MetadataRequestContext> => {
+export const createMockMetadataRequestContext = () => {
   return {
     endpointAppContextService: createMockEndpointAppContextService(),
     logger: loggingSystemMock.create().get('mock_endpoint_app_context'),
-    requestHandlerContext:
-      xpackMocks.createRequestHandlerContext() as unknown as jest.Mocked<SecuritySolutionRequestHandlerContext>,
+    requestHandlerContext: xpackMocks.createRequestHandlerContext() as unknown as jest.Mocked<
+      AwaitedProperties<SecuritySolutionRequestHandlerContext>
+    >,
   };
 };
 
 export function createRouteHandlerContext(
-  dataClient: jest.Mocked<IScopedClusterClient>,
+  dataClient: ScopedClusterClientMock,
   savedObjectsClient: jest.Mocked<SavedObjectsClientContract>,
   overrides: { endpointAuthz?: Partial<EndpointAuthz> } = {}
 ) {
-  const context = requestContextMock.create(
-    createMockClients(),
-    overrides
-  ) as jest.Mocked<SecuritySolutionRequestHandlerContext>;
+  const context = requestContextMock.create(createMockClients(), overrides);
   context.core.elasticsearch.client = dataClient;
   context.core.savedObjects.client = savedObjectsClient;
   return context;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
index fe35d4689b487..c6dbe24cdb901 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
@@ -7,14 +7,15 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import { KibanaResponseFactory, RequestHandler, RouteConfig } from '@kbn/core/server';
 import {
+  coreMock,
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   EndpointActionLogRequestParams,
   EndpointActionLogRequestQuery,
@@ -162,7 +163,9 @@ describe('Action Log API', () => {
           path.startsWith(ENDPOINT_ACTION_LOG_ROUTE)
         )!;
         await routeHandler(
-          createRouteHandlerContext(esClientMock, savedObjectsClientMock.create()),
+          coreMock.createCustomRequestHandlerContext(
+            createRouteHandlerContext(esClientMock, savedObjectsClientMock.create())
+          ) as SecuritySolutionRequestHandlerContext,
           req,
           mockResponse
         );
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts
index 716c1ab833559..1218df3b42a14 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import {
   EndpointActionLogRequestParams,
   EndpointActionLogRequestQuery,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
index 559ecf0a621d6..85d3fd1f064e2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
@@ -6,16 +6,22 @@
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { KibanaRequest, KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AwaitedProperties } from '@kbn/utility-types';
+import {
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandler,
+  RouteConfig,
+} from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
-import { SecuritySolutionRequestHandlerContext } from '../../../types';
 import { EndpointAppContextService } from '../../endpoint_app_context_services';
 import {
   createMockEndpointAppContextServiceSetupContract,
@@ -27,9 +33,9 @@ import { registerHostIsolationRoutes } from './isolation';
 import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
 import { LicenseService } from '../../../../common/license';
 import { Subject } from 'rxjs';
-import { ILicense } from '../../../../../licensing/common/types';
-import { licenseMock } from '../../../../../licensing/common/licensing.mock';
-import { License } from '../../../../../licensing/common/license';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { License } from '@kbn/licensing-plugin/common/license';
 import {
   ISOLATE_HOST_ROUTE,
   UNISOLATE_HOST_ROUTE,
@@ -45,11 +51,12 @@ import {
 } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { legacyMetadataSearchResponseMock } from '../metadata/support/test_support';
-import { AGENT_ACTIONS_INDEX, ElasticsearchAssetType } from '../../../../../fleet/common';
-import { CasesClientMock } from '../../../../../cases/server/client/mocks';
+import { AGENT_ACTIONS_INDEX, ElasticsearchAssetType } from '@kbn/fleet-plugin/common';
+import { CasesClientMock } from '@kbn/cases-plugin/server/client/mocks';
 import { EndpointAuthz } from '../../../../common/endpoint/types/authz';
-import type { PackageClient } from '../../../../../fleet/server';
-import { createMockPackageService } from '../../../../../fleet/server/mocks';
+import type { PackageClient } from '@kbn/fleet-plugin/server';
+import { createMockPackageService } from '@kbn/fleet-plugin/server/mocks';
+import { SecuritySolutionRequestHandlerContextMock } from '../../../lib/detection_engine/routes/__mocks__/request_context';
 
 interface CallRouteInterface {
   body?: HostIsolationRequestBody;
@@ -117,7 +124,7 @@ describe('Host Isolation', () => {
       routePrefix: string,
       opts: CallRouteInterface,
       indexExists?: { endpointDsExists: boolean }
-    ) => Promise<jest.Mocked<SecuritySolutionRequestHandlerContext>>;
+    ) => Promise<AwaitedProperties<SecuritySolutionRequestHandlerContextMock>>;
     const superUser = {
       username: 'superuser',
       roles: ['superuser'],
@@ -185,7 +192,7 @@ describe('Host Isolation', () => {
         routePrefix: string,
         { body, idxResponse, searchResponse, mockUser, license, authz = {} }: CallRouteInterface,
         indexExists?: { endpointDsExists: boolean }
-      ): Promise<jest.Mocked<SecuritySolutionRequestHandlerContext>> => {
+      ): Promise<AwaitedProperties<SecuritySolutionRequestHandlerContextMock>> => {
         const asUser = mockUser ? mockUser : superUser;
         (startContract.security.authc.getCurrentUser as jest.Mock).mockImplementationOnce(
           () => asUser
@@ -199,31 +206,30 @@ describe('Host Isolation', () => {
         };
 
         // mock _index_template
-        ctx.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate = jest
-          .fn()
-          .mockImplementationOnce(() => {
+        ctx.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate.mockResponseImplementationOnce(
+          () => {
             if (indexExists) {
-              return Promise.resolve({
+              return {
                 body: true,
                 statusCode: 200,
-              });
+              };
             }
-            return Promise.resolve({
+            return {
               body: false,
               statusCode: 404,
-            });
-          });
+            };
+          }
+        );
 
         const withIdxResp = idxResponse ? idxResponse : { statusCode: 201 };
-        const mockIndexResponse = jest.fn().mockImplementation(() => Promise.resolve(withIdxResp));
-        const mockSearchResponse = jest
-          .fn()
-          .mockImplementation(() =>
-            Promise.resolve({ body: legacyMetadataSearchResponseMock(searchResponse) })
-          );
-
-        ctx.core.elasticsearch.client.asInternalUser.index = mockIndexResponse;
-        ctx.core.elasticsearch.client.asCurrentUser.search = mockSearchResponse;
+        ctx.core.elasticsearch.client.asInternalUser.index.mockResponseImplementation(
+          () => withIdxResp
+        );
+        ctx.core.elasticsearch.client.asCurrentUser.search.mockResponseImplementation(() => {
+          return {
+            body: legacyMetadataSearchResponseMock(searchResponse),
+          };
+        });
 
         const withLicense = license ? license : Platinum;
         licenseEmitter.next(withLicense);
@@ -236,7 +242,7 @@ describe('Host Isolation', () => {
 
         await routeHandler(ctx, mockRequest, mockResponse);
 
-        return ctx as unknown as jest.Mocked<SecuritySolutionRequestHandlerContext>;
+        return ctx;
       };
     });
 
@@ -278,8 +284,9 @@ describe('Host Isolation', () => {
         searchResponse: metadataResponse,
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.agents).toContain(AgentID);
     });
     it('records the user who performed the action to the action record', async () => {
@@ -289,8 +296,9 @@ describe('Host Isolation', () => {
         mockUser: testU,
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.user_id).toEqual(testU.username);
     });
     it('records the comment in the action payload', async () => {
@@ -299,8 +307,9 @@ describe('Host Isolation', () => {
         body: { endpoint_ids: ['XYZ'], comment: CommentText },
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.data.comment).toEqual(CommentText);
     });
     it('creates an action and returns its ID', async () => {
@@ -308,8 +317,9 @@ describe('Host Isolation', () => {
         body: { endpoint_ids: ['XYZ'], comment: 'XYZ' },
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       const actionID = actionDoc.action_id;
       expect(mockResponse.ok).toBeCalled();
       expect((mockResponse.ok.mock.calls[0][0]?.body as HostIsolationResponse).action).toEqual(
@@ -321,8 +331,9 @@ describe('Host Isolation', () => {
         body: { endpoint_ids: ['XYZ'] },
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.timeout).toEqual(300);
     });
     it('sends the action to the correct agent when endpoint ID is given', async () => {
@@ -334,8 +345,9 @@ describe('Host Isolation', () => {
         searchResponse: doc,
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.agents).toContain(AgentID);
     });
 
@@ -344,8 +356,9 @@ describe('Host Isolation', () => {
         body: { endpoint_ids: ['XYZ'] },
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.data.command).toEqual('isolate');
     });
     it('sends the unisolate command payload from the unisolate route', async () => {
@@ -353,8 +366,9 @@ describe('Host Isolation', () => {
         body: { endpoint_ids: ['XYZ'] },
       });
       const actionDoc: EndpointAction = (
-        ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock
-      ).mock.calls[0][0].body;
+        ctx.core.elasticsearch.client.asInternalUser.index.mock
+          .calls[0][0] as estypes.IndexRequest<EndpointAction>
+      ).body!;
       expect(actionDoc.data.command).toEqual('unisolate');
     });
 
@@ -370,14 +384,17 @@ describe('Host Isolation', () => {
 
         const indexDoc = ctx.core.elasticsearch.client.asInternalUser.index;
         const actionDocs: [
-          { index: string; body: LogsEndpointAction },
-          { index: string; body: EndpointAction }
-        ] = [(indexDoc as jest.Mock).mock.calls[0][0], (indexDoc as jest.Mock).mock.calls[1][0]];
+          { index: string; body?: LogsEndpointAction },
+          { index: string; body?: EndpointAction }
+        ] = [
+          indexDoc.mock.calls[0][0] as estypes.IndexRequest<LogsEndpointAction>,
+          indexDoc.mock.calls[1][0] as estypes.IndexRequest<EndpointAction>,
+        ];
 
         expect(actionDocs[0].index).toEqual(ENDPOINT_ACTIONS_INDEX);
         expect(actionDocs[1].index).toEqual(AGENT_ACTIONS_INDEX);
-        expect(actionDocs[0].body.EndpointActions.data.command).toEqual('unisolate');
-        expect(actionDocs[1].body.data.command).toEqual('unisolate');
+        expect(actionDocs[0].body!.EndpointActions.data.command).toEqual('unisolate');
+        expect(actionDocs[1].body!.data.command).toEqual('unisolate');
       });
 
       it('handles isolation', async () => {
@@ -390,14 +407,17 @@ describe('Host Isolation', () => {
         );
         const indexDoc = ctx.core.elasticsearch.client.asInternalUser.index;
         const actionDocs: [
-          { index: string; body: LogsEndpointAction },
-          { index: string; body: EndpointAction }
-        ] = [(indexDoc as jest.Mock).mock.calls[0][0], (indexDoc as jest.Mock).mock.calls[1][0]];
+          { index: string; body?: LogsEndpointAction },
+          { index: string; body?: EndpointAction }
+        ] = [
+          indexDoc.mock.calls[0][0] as estypes.IndexRequest<LogsEndpointAction>,
+          indexDoc.mock.calls[1][0] as estypes.IndexRequest<EndpointAction>,
+        ];
 
         expect(actionDocs[0].index).toEqual(ENDPOINT_ACTIONS_INDEX);
         expect(actionDocs[1].index).toEqual(AGENT_ACTIONS_INDEX);
-        expect(actionDocs[0].body.EndpointActions.data.command).toEqual('isolate');
-        expect(actionDocs[1].body.data.command).toEqual('isolate');
+        expect(actionDocs[0].body!.EndpointActions.data.command).toEqual('isolate');
+        expect(actionDocs[1].body!.data.command).toEqual('isolate');
       });
 
       it('handles errors', async () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
index 859a0cc06348a..69954dbd7e7a7 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
@@ -6,11 +6,12 @@
  */
 
 import moment from 'moment';
-import { RequestHandler, Logger } from 'src/core/server';
+import { RequestHandler, Logger } from '@kbn/core/server';
 import uuid from 'uuid';
 import { TypeOf } from '@kbn/config-schema';
-import { CommentType } from '../../../../../cases/common';
-import { CasesByAlertId } from '../../../../../cases/common/api/cases/case';
+import { CommentType } from '@kbn/cases-plugin/common';
+import { CasesByAlertId } from '@kbn/cases-plugin/common/api/cases/case';
+import { AGENT_ACTIONS_INDEX } from '@kbn/fleet-plugin/common';
 import { HostIsolationRequestSchema } from '../../../../common/endpoint/schema/actions';
 import {
   ENDPOINT_ACTIONS_DS,
@@ -19,7 +20,6 @@ import {
   UNISOLATE_HOST_ROUTE,
   failedFleetActionErrorCode,
 } from '../../../../common/endpoint/constants';
-import { AGENT_ACTIONS_INDEX } from '../../../../../fleet/common';
 import {
   EndpointAction,
   HostMetadata,
@@ -84,7 +84,7 @@ const createFailedActionResponseEntry = async ({
   logger: Logger;
 }): Promise<void> => {
   // 8.0+ requires internal user to write to system indices
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const esClient = (await context.core).elasticsearch.client.asInternalUser;
   try {
     await esClient.index<LogsEndpointActionResponse>({
       index: `${ENDPOINT_ACTION_RESPONSES_DS}-default`,
@@ -178,7 +178,7 @@ export const isolationRequestHandler = function (
     });
 
     // 8.0+ requires internal user to write to system indices
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
 
     // if the new endpoint indices/data streams exists
     // write the action request to the new endpoint index
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
index a239ae03ce135..5a84d7764454c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
@@ -7,14 +7,14 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import { KibanaResponseFactory, RequestHandler, RouteConfig } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { ActionStatusRequestSchema } from '../../../../common/endpoint/schema/actions';
 import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
index 124c01c1dc1cb..bfd17cccb3d0d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { ActionStatusRequestSchema } from '../../../../common/endpoint/schema/actions';
 import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
@@ -47,7 +47,7 @@ export const actionStatusRequestHandler = function (
   SecuritySolutionRequestHandlerContext
 > {
   return async (context, req, res) => {
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     const agentIDs: string[] = Array.isArray(req.query.agent_ids)
       ? [...new Set(req.query.agent_ids)]
       : [req.query.agent_ids];
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
index 8cbdbc064f8b9..0aaa138c90d31 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
@@ -5,20 +5,29 @@
  * 2.0.
  */
 
+import { coreMock } from '@kbn/core/server/mocks';
 import { HostStatus } from '../../../../common/endpoint/types';
 import { createMockMetadataRequestContext } from '../../mocks';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { enrichHostMetadata, MetadataRequestContext } from './handlers';
-import { AgentClient } from '../../../../../fleet/server';
+import { AgentClient } from '@kbn/fleet-plugin/server';
 
 describe('test document enrichment', () => {
-  let metaReqCtx: jest.Mocked<MetadataRequestContext>;
+  let metaReqCtx: ReturnType<typeof createMockMetadataRequestContext>;
   const docGen = new EndpointDocGenerator();
 
   beforeEach(() => {
     metaReqCtx = createMockMetadataRequestContext();
   });
 
+  const getMetadataRequestContext = () =>
+    ({
+      ...metaReqCtx,
+      requestHandlerContext: coreMock.createCustomRequestHandlerContext(
+        metaReqCtx.requestHandlerContext
+      ),
+    } as unknown as MetadataRequestContext);
+
   describe('host status enrichment', () => {
     let statusFn: jest.Mock;
 
@@ -32,49 +41,70 @@ describe('test document enrichment', () => {
     it('should return host healthy for online agent', async () => {
       statusFn.mockImplementation(() => 'online');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.HEALTHY);
     });
 
     it('should return host offline for offline agent', async () => {
       statusFn.mockImplementation(() => 'offline');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.OFFLINE);
     });
 
     it('should return host updating for unenrolling agent', async () => {
       statusFn.mockImplementation(() => 'unenrolling');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.UPDATING);
     });
 
     it('should return host unhealthy for degraded agent', async () => {
       statusFn.mockImplementation(() => 'degraded');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.UNHEALTHY);
     });
 
     it('should return host unhealthy for erroring agent', async () => {
       statusFn.mockImplementation(() => 'error');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.UNHEALTHY);
     });
 
     it('should return host unhealthy for warning agent', async () => {
       statusFn.mockImplementation(() => 'warning');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.UNHEALTHY);
     });
 
     it('should return host unhealthy for invalid agent', async () => {
       statusFn.mockImplementation(() => 'asliduasofb');
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.host_status).toEqual(HostStatus.UNHEALTHY);
     });
   });
@@ -109,7 +139,10 @@ describe('test document enrichment', () => {
         };
       });
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.policy_info).toBeDefined();
       expect(enrichedHostList.policy_info?.agent.applied.id).toEqual(policyID);
       expect(enrichedHostList.policy_info?.agent.applied.revision).toEqual(policyRev);
@@ -125,7 +158,10 @@ describe('test document enrichment', () => {
         };
       });
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.policy_info).toBeDefined();
       expect(enrichedHostList.policy_info?.agent.configured.id).toEqual(policyID);
       expect(enrichedHostList.policy_info?.agent.configured.revision).toEqual(policyRev);
@@ -146,7 +182,10 @@ describe('test document enrichment', () => {
         };
       });
 
-      const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
+      const enrichedHostList = await enrichHostMetadata(
+        docGen.generateHostMetadata(),
+        getMetadataRequestContext()
+      );
       expect(enrichedHostList.policy_info).toBeDefined();
       expect(enrichedHostList.policy_info?.endpoint.id).toEqual(policyID);
       expect(enrichedHostList.policy_info?.endpoint.revision).toEqual(policyRev);
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
index 1d2c589cd15a2..1b86924101b68 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
@@ -13,7 +13,9 @@ import {
   Logger,
   RequestHandler,
   SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
+import { AgentNotFoundError } from '@kbn/fleet-plugin/server';
 import {
   HostInfo,
   HostMetadata,
@@ -24,10 +26,8 @@ import {
 import type { SecuritySolutionRequestHandlerContext } from '../../../types';
 
 import { kibanaRequestToMetadataListESQuery } from './query_builders';
-import { PackagePolicy } from '../../../../../fleet/common/types/models';
-import { AgentNotFoundError } from '../../../../../fleet/server';
 import { EndpointAppContext, HostListQueryResult } from '../../types';
-import { GetMetadataRequestSchema } from './index';
+import { GetMetadataRequestSchema } from '.';
 import { findAllUnenrolledAgentIds } from './support/unenroll';
 import { findAgentIdsByStatus } from './support/agent_status';
 import { EndpointAppContextService } from '../../endpoint_app_context_services';
@@ -94,7 +94,7 @@ export function getMetadataListRequestHandler(
   return async (context, request, response) => {
     const endpointMetadataService = endpointAppContext.service.getEndpointMetadataService();
     const fleetServices = endpointAppContext.service.getScopedFleetServices(request);
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
 
     let doesUnitedIndexExist = false;
     let didUnitedIndexError = false;
@@ -168,9 +168,10 @@ export const getMetadataRequestHandler = function (
     const endpointMetadataService = endpointAppContext.service.getEndpointMetadataService();
 
     try {
+      const esClient = (await context.core).elasticsearch.client;
       return response.ok({
         body: await endpointMetadataService.getEnrichedHostMetadata(
-          context.core.elasticsearch.client.asInternalUser,
+          esClient.asInternalUser,
           endpointAppContext.service.getScopedFleetServices(request),
           request.params.id
         ),
@@ -185,7 +186,7 @@ export function getMetadataTransformStatsHandler(
   logger: Logger
 ): RequestHandler<unknown, unknown, unknown, SecuritySolutionRequestHandlerContext> {
   return async (context, _, response) => {
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     try {
       const transformStats = await esClient.transform.getTransformStats({
         transform_id: METADATA_TRANSFORMS_PATTERN,
@@ -235,19 +236,14 @@ export async function enrichHostMetadata(
   let hostStatus = HostStatus.UNHEALTHY;
   let elasticAgentId = hostMetadata?.elastic?.agent?.id;
   const log = metadataRequestContext.logger;
+  const coreContext = await metadataRequestContext.requestHandlerContext?.core;
 
   try {
-    if (
-      !metadataRequestContext.esClient &&
-      !metadataRequestContext.requestHandlerContext?.core.elasticsearch.client
-    ) {
+    if (!metadataRequestContext.esClient && !coreContext?.elasticsearch.client) {
       throw new Error('esClient not found');
     }
 
-    if (
-      !metadataRequestContext.savedObjectsClient &&
-      !metadataRequestContext.requestHandlerContext?.core.savedObjects
-    ) {
+    if (!metadataRequestContext.savedObjectsClient && !coreContext?.savedObjects) {
       throw new Error('esSavedObjectClient not found');
     }
   } catch (e) {
@@ -257,8 +253,8 @@ export async function enrichHostMetadata(
 
   const esSavedObjectClient =
     metadataRequestContext?.savedObjectsClient ??
-    (metadataRequestContext.requestHandlerContext?.core.savedObjects
-      .client as SavedObjectsClientContract);
+    (coreContext?.savedObjects.client as SavedObjectsClientContract);
+  const fleetContext = await metadataRequestContext.requestHandlerContext?.fleet;
 
   try {
     /**
@@ -270,10 +266,7 @@ export async function enrichHostMetadata(
       log.warn(`Missing elastic agent id, using host id instead ${elasticAgentId}`);
     }
 
-    const status =
-      await metadataRequestContext.requestHandlerContext?.fleet?.agentClient.asCurrentUser.getAgentStatusById(
-        elasticAgentId
-      );
+    const status = await fleetContext?.agentClient.asCurrentUser.getAgentStatusById(elasticAgentId);
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     hostStatus = fleetAgentStatusToEndpointHostStatus(status!);
   } catch (e) {
@@ -287,10 +280,7 @@ export async function enrichHostMetadata(
 
   let policyInfo: HostInfo['policy_info'];
   try {
-    const agent =
-      await metadataRequestContext.requestHandlerContext?.fleet?.agentClient.asCurrentUser.getAgent(
-        elasticAgentId
-      );
+    const agent = await fleetContext?.agentClient.asCurrentUser.getAgent(elasticAgentId);
     const agentPolicy = await metadataRequestContext.endpointAppContextService
       .getAgentPolicyService()
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -338,17 +328,18 @@ async function legacyListMetadataQuery(
   queryOptions: GetMetadataListRequestQuery
 ): Promise<HostResultList> {
   const fleetAgentClient = fleetServices.agent;
+  const coreContext = await context.core;
 
   const metadataRequestContext: MetadataRequestContext = {
-    esClient: context.core.elasticsearch.client,
+    esClient: coreContext.elasticsearch.client,
     endpointAppContextService: endpointAppContext.service,
     logger,
     requestHandlerContext: context,
-    savedObjectsClient: context.core.savedObjects.client,
+    savedObjectsClient: coreContext.savedObjects.client,
   };
 
   const endpointPolicyIds = endpointPolicies.map((policy) => policy.policy_id);
-  const esClient = context.core.elasticsearch.client.asInternalUser;
+  const esClient = coreContext.elasticsearch.client.asInternalUser;
 
   const unenrolledAgentIds = await findAllUnenrolledAgentIds(fleetAgentClient, endpointPolicyIds);
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
index 8998b88391f96..628672b13006e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
@@ -10,17 +10,17 @@ import {
   RequestHandler,
   RouteConfig,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { HostInfo, HostStatus, MetadataListResponse } from '../../../../common/endpoint/types';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
-import { registerEndpointRoutes } from './index';
+import { registerEndpointRoutes } from '.';
 import {
   createMockEndpointAppContextServiceSetupContract,
   createMockEndpointAppContextServiceStartContract,
@@ -32,12 +32,12 @@ import {
 } from '../../endpoint_app_context_services';
 import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
-import { Agent, ElasticsearchAssetType } from '../../../../../fleet/common/types/models';
+import { Agent, ElasticsearchAssetType } from '@kbn/fleet-plugin/common/types/models';
 import {
   legacyMetadataSearchResponseMock,
   unitedMetadataSearchResponseMock,
 } from './support/test_support';
-import type { AgentClient, PackageService, PackageClient } from '../../../../../fleet/server';
+import type { AgentClient, PackageService, PackageClient } from '@kbn/fleet-plugin/server';
 import {
   HOST_METADATA_GET_ROUTE,
   HOST_METADATA_LIST_ROUTE,
@@ -48,15 +48,15 @@ import {
 } from '../../../../common/endpoint/constants';
 import { TRANSFORM_STATES } from '../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../types';
-import { AgentNotFoundError, PackagePolicyServiceInterface } from '../../../../../fleet/server';
+import { AgentNotFoundError, PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import {
   ClusterClientMock,
   ScopedClusterClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
 import { EndpointHostNotFoundError } from '../../services/metadata';
 import { FleetAgentGenerator } from '../../../../common/endpoint/data_generators/fleet_agent_generator';
-import { createMockAgentClient, createMockPackageService } from '../../../../../fleet/server/mocks';
+import { createMockAgentClient, createMockPackageService } from '@kbn/fleet-plugin/server/mocks';
 import { TransformGetTransformStatsResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { getEndpointAuthzInitialStateMock } from '../../../../common/endpoint/service/authz';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
index 3785f1b7577f6..4c7ca37d53560 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
@@ -7,13 +7,13 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   ENDPOINT_DEFAULT_PAGE,
   ENDPOINT_DEFAULT_PAGE_SIZE,
   metadataCurrentIndexPattern,
   METADATA_UNITED_INDEX,
 } from '../../../../common/endpoint/constants';
-import { KibanaRequest } from '../../../../../../../src/core/server';
 import { EndpointAppContext } from '../../types';
 import { buildStatusesKuery } from './support/agent_status';
 import { GetMetadataListRequestQuery } from '../../../../common/endpoint/schema/metadata';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts
index 4fbe94809a1d1..04cbdf0363a52 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { endpointFilters } from './index';
+import { endpointFilters } from '.';
 
 describe('Filters Schema Test', () => {
   it('accepts a single host status', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts
index 50961ee494254..427ab33d04b1b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { buildStatusesKuery, findAgentIdsByStatus } from './agent_status';
-import { AgentClient } from '../../../../../../fleet/server/services';
-import { createMockAgentClient } from '../../../../../../fleet/server/mocks';
-import { Agent } from '../../../../../../fleet/common/types/models';
-import { AgentStatusKueryHelper } from '../../../../../../fleet/common/services';
+import { AgentClient } from '@kbn/fleet-plugin/server/services';
+import { createMockAgentClient } from '@kbn/fleet-plugin/server/mocks';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
+import { AgentStatusKueryHelper } from '@kbn/fleet-plugin/common/services';
 
 describe('test filtering endpoint hosts by agent status', () => {
   let mockAgentClient: jest.Mocked<AgentClient>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts
index f4fbcb53e4824..058fff6481a4d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { AgentClient } from '../../../../../../fleet/server';
-import { AgentStatusKueryHelper } from '../../../../../../fleet/common/services';
-import { Agent } from '../../../../../../fleet/common/types/models';
+import { AgentClient } from '@kbn/fleet-plugin/server';
+import { AgentStatusKueryHelper } from '@kbn/fleet-plugin/common/services';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
 import { HostStatus } from '../../../../../common/endpoint/types';
 
 const getStatusQueryMap = (path: string = '') =>
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts
index 6302bb94b1cbd..9577c32d512e7 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
-import { createPackagePolicyServiceMock } from '../../../../../../fleet/server/mocks';
-import { PackagePolicy } from '../../../../../../fleet/common/types/models';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { getAllEndpointPackagePolicies } from './endpoint_package_policies';
 
 describe('endpoint_package_policies', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts
index ce8f7bcac510c..2e09360a34901 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
-import { PackagePolicy } from '../../../../../../fleet/common/types/models';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
 
 export const getAllEndpointPackagePolicies = async (
   packagePolicyService: PackagePolicyServiceInterface,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts
index 6f8a0f83bf846..ce78153d78dea 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Agent } from '../../../../../../fleet/common';
+import { Agent } from '@kbn/fleet-plugin/common';
 import { METADATA_UNITED_INDEX } from '../../../../../common/endpoint/constants';
 import { HostMetadata, UnitedAgentMetadata } from '../../../../../common/endpoint/types';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
index 0c1e4578679e0..054dae748b6f3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { findAllUnenrolledAgentIds } from './unenroll';
-import { AgentClient } from '../../../../../../fleet/server/services';
+import { AgentClient } from '@kbn/fleet-plugin/server/services';
 import {
   createMockAgentClient,
   createPackagePolicyServiceMock,
-} from '../../../../../../fleet/server/mocks';
-import { Agent, PackagePolicy } from '../../../../../../fleet/common/types/models';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
+} from '@kbn/fleet-plugin/server/mocks';
+import { Agent, PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 
 describe('test find all unenrolled Agent id', () => {
   let mockAgentClient: jest.Mocked<AgentClient>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
index bf52d34d39932..2163308bd0f91 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { AgentClient } from '../../../../../../fleet/server';
-import { Agent } from '../../../../../../fleet/common/types/models';
+import type { AgentClient } from '@kbn/fleet-plugin/server';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
 
 export async function findAllUnenrolledAgentIds(
   agentClient: AgentClient,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
index ac4a1ee25ebbf..01136fef81884 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
@@ -11,28 +11,28 @@ import {
   createMockEndpointAppContextServiceStartContract,
   createRouteHandlerContext,
 } from '../../mocks';
-import { createMockAgentClient, createMockAgentService } from '../../../../../fleet/server/mocks';
+import { createMockAgentClient, createMockAgentService } from '@kbn/fleet-plugin/server/mocks';
 import { getHostPolicyResponseHandler, getAgentPolicySummaryHandler } from './handlers';
-import {
-  KibanaResponseFactory,
-  SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
+import { KibanaResponseFactory, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { GetHostPolicyResponse, HostPolicyResponse } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
-import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
-import { Agent } from '../../../../../fleet/common/types/models';
-import { AgentClient, AgentService } from '../../../../../fleet/server/services';
+import {
+  createMockConfig,
+  requestContextMock,
+} from '../../../lib/detection_engine/routes/__mocks__';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
+import { AgentClient, AgentService } from '@kbn/fleet-plugin/server/services';
 import { get } from 'lodash';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ScopedClusterClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { ScopedClusterClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 describe('test policy response handler', () => {
   let endpointAppContextService: EndpointAppContextService;
@@ -62,7 +62,9 @@ describe('test policy response handler', () => {
       });
 
       await hostPolicyResponseHandler(
-        createRouteHandlerContext(mockScopedClient, mockSavedObjectClient),
+        requestContextMock.convertContext(
+          createRouteHandlerContext(mockScopedClient, mockSavedObjectClient)
+        ),
         mockRequest,
         mockResponse
       );
@@ -84,7 +86,9 @@ describe('test policy response handler', () => {
       });
 
       await hostPolicyResponseHandler(
-        createRouteHandlerContext(mockScopedClient, mockSavedObjectClient),
+        requestContextMock.convertContext(
+          createRouteHandlerContext(mockScopedClient, mockSavedObjectClient)
+        ),
         mockRequest,
         mockResponse
       );
@@ -188,7 +192,9 @@ describe('test policy response handler', () => {
       });
 
       await policySummarysHandler(
-        createRouteHandlerContext(mockScopedClient, mockSavedObjectClient),
+        requestContextMock.convertContext(
+          createRouteHandlerContext(mockScopedClient, mockSavedObjectClient)
+        ),
         mockRequest,
         mockResponse
       );
@@ -219,7 +225,9 @@ describe('test policy response handler', () => {
       });
 
       await agentPolicySummaryHandler(
-        createRouteHandlerContext(mockScopedClient, mockSavedObjectClient),
+        requestContextMock.convertContext(
+          createRouteHandlerContext(mockScopedClient, mockSavedObjectClient)
+        ),
         mockRequest,
         mockResponse
       );
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts
index d02e0402a922e..7ccae199a3ed9 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { policyIndexPattern } from '../../../../common/endpoint/constants';
 import {
@@ -22,11 +22,8 @@ export const getHostPolicyResponseHandler = function (): RequestHandler<
   undefined
 > {
   return async (context, request, response) => {
-    const doc = await getPolicyResponseByAgentId(
-      policyIndexPattern,
-      request.query.agentId,
-      context.core.elasticsearch.client
-    );
+    const client = (await context.core).elasticsearch.client;
+    const doc = await getPolicyResponseByAgentId(policyIndexPattern, request.query.agentId, client);
 
     if (doc) {
       return response.ok({ body: doc });
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
index 8991dfa9a6bcc..c21a47452b6e8 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { EndpointAppContext } from '../../types';
 import {
   GetPolicyResponseSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
index 258e1d8ba45b8..1280cfb3db016 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, KibanaRequest } from '../../../../../../../src/core/server';
+import { IScopedClusterClient, KibanaRequest } from '@kbn/core/server';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { GetHostPolicyResponse, HostPolicyResponse } from '../../../../common/endpoint/types';
-import { INITIAL_POLICY_ID } from './index';
-import { Agent } from '../../../../../fleet/common/types/models';
+import { INITIAL_POLICY_ID } from '.';
 import { EndpointAppContext } from '../../types';
-import type { ISearchRequestParams } from '../../../../../../../src/plugins/data/common';
 
 export const getESQueryPolicyResponseByAgentID = (
   agentID: string,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
index 617a1907cf4be..2e50b54f9db70 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import {
   validateEvents,
   validateEntities,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
index f2b29897e2f26..ef438667c3647 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { validateEntities } from '../../../../common/endpoint/schema/resolver';
 import { ResolverEntityIndex, ResolverSchema } from '../../../../common/endpoint/types';
@@ -87,7 +87,8 @@ export function handleEntities(): RequestHandler<unknown, TypeOf<typeof validate
       query: { _id, indices },
     } = request;
 
-    const queryResponse = await context.core.elasticsearch.client.asCurrentUser.search({
+    const esClient = (await context.core).elasticsearch.client;
+    const queryResponse = await esClient.asCurrentUser.search({
       ignore_unavailable: true,
       index: indices,
       body: {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
index 6b574b3bcbc27..2acc9e6aeb114 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
@@ -6,7 +6,7 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { ResolverPaginatedEvents, SafeResolverEvent } from '../../../../common/endpoint/types';
 import { validateEvents } from '../../../../common/endpoint/schema/resolver';
 import { EventsQuery } from './queries/events';
@@ -39,7 +39,7 @@ export function handleEvents(): RequestHandler<
       query: { limit, afterEvent },
       body,
     } = req;
-    const client = context.core.elasticsearch.client;
+    const client = (await context.core).elasticsearch.client;
     const query = new EventsQuery({
       pagination: PaginationBuilder.createBuilder(limit, afterEvent),
       indexPatterns: body.indexPatterns,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
index fb7be34a3e5a1..1dab8bd7e1ab3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { parseFilterQuery } from '../../../../utils/serialized_query';
 import { SafeResolverEvent } from '../../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts
index 675c861b984de..2d82c1eedf540 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { validateTree } from '../../../../../common/endpoint/schema/resolver';
 import { Fetcher } from './utils/fetch';
 
 export function handleTree(): RequestHandler<unknown, unknown, TypeOf<typeof validateTree.body>> {
   return async (context, req, res) => {
-    const client = context.core.elasticsearch.client;
+    const client = (await context.core).elasticsearch.client;
     const fetcher = new Fetcher(client);
     const body = await fetcher.tree(req.body);
     return res.ok({
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts
index 83deae716e12e..09da7f87bf6c8 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { FieldsObject, ResolverSchema } from '../../../../../../common/endpoint/types';
-import { NodeID, TimeRange, docValueFields, validIDs } from '../utils/index';
+import { NodeID, TimeRange, docValueFields, validIDs } from '../utils';
 
 interface DescendantsParams {
   schema: ResolverSchema;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts
index c8a850b49c756..88b2e842ce8cb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { FieldsObject, ResolverSchema } from '../../../../../../common/endpoint/types';
-import { NodeID, TimeRange, docValueFields, validIDs } from '../utils/index';
+import { NodeID, TimeRange, docValueFields, validIDs } from '../utils';
 
 interface LifecycleParams {
   schema: ResolverSchema;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts
index 6459792147217..b87b121e5769f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { EventStats, ResolverSchema } from '../../../../../../common/endpoint/types';
-import { NodeID, TimeRange } from '../utils/index';
+import { NodeID, TimeRange } from '../utils';
 
 interface AggBucket {
   key: string;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts
index 8022484b99c53..59be8f76576dd 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts
@@ -17,8 +17,8 @@ import {
 import { LifecycleQuery } from '../queries/lifecycle';
 import { DescendantsQuery } from '../queries/descendants';
 import { StatsQuery } from '../queries/stats';
-import { IScopedClusterClient } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   FieldsObject,
   ResolverNode,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts
index 1bbfbde67e981..f7d4b7d97efdb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   firstNonNullValue,
   values,
@@ -17,7 +17,7 @@ import {
   ResolverSchema,
 } from '../../../../../../common/endpoint/types';
 import { DescendantsQuery } from '../queries/descendants';
-import { NodeID } from './index';
+import { NodeID } from '.';
 import { LifecycleQuery } from '../queries/lifecycle';
 import { StatsQuery } from '../queries/stats';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts
index 0ca051734be19..58082530f8c5b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { validIDs } from './index';
+import { validIDs } from '.';
 
 describe('validIDs', () => {
   it('removes empty strings', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts
index a9f43036a118e..34f2f7a434fbd 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServerMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { RequestHandler } from 'kibana/server';
+import { coreMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { RequestHandler } from '@kbn/core/server';
 import { requestContextMock } from '../../lib/detection_engine/routes/__mocks__';
 import { EndpointApiNeededAuthz, withEndpointAuthz } from './with_endpoint_authz';
 import { EndpointAuthz } from '../../../common/endpoint/types/authz';
@@ -14,7 +14,7 @@ import { EndpointAuthorizationError } from '../errors';
 
 describe('When using `withEndpointAuthz()`', () => {
   let mockRequestHandler: jest.Mocked<RequestHandler>;
-  let mockContext: jest.Mocked<ReturnType<typeof requestContextMock.create>>;
+  let mockContext: ReturnType<typeof requestContextMock.create>;
   let mockRequest: ReturnType<typeof httpServerMock.createKibanaRequest>;
   let mockResponse: ReturnType<typeof httpServerMock.createResponseFactory>;
   let logger: ReturnType<typeof loggingSystemMock.createLogger>;
@@ -58,10 +58,10 @@ describe('When using `withEndpointAuthz()`', () => {
       },
       { canCreateArtifactsByPolicy: false },
     ],
-  ])('should grant access when needed authz is %j', (neededAuthz, authzOverrides) => {
+  ])('should grant access when needed authz is %j', async (neededAuthz, authzOverrides) => {
     Object.assign(mockContext.securitySolution.endpointAuthz, authzOverrides);
-    withEndpointAuthz(neededAuthz, logger, mockRequestHandler)(
-      mockContext,
+    await withEndpointAuthz(neededAuthz, logger, mockRequestHandler)(
+      coreMock.createCustomRequestHandlerContext(mockContext),
       mockRequest,
       mockResponse
     );
@@ -85,11 +85,11 @@ describe('When using `withEndpointAuthz()`', () => {
       },
       { canCreateArtifactsByPolicy: false },
     ],
-  ])('should deny access when not authorized for %j', (neededAuthz, authzOverrides) => {
+  ])('should deny access when not authorized for %j', async (neededAuthz, authzOverrides) => {
     Object.assign(mockContext.securitySolution.endpointAuthz, authzOverrides);
 
-    withEndpointAuthz(neededAuthz, logger, mockRequestHandler)(
-      mockContext,
+    await withEndpointAuthz(neededAuthz, logger, mockRequestHandler)(
+      coreMock.createCustomRequestHandlerContext(mockContext),
       mockRequest,
       mockResponse
     );
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts
index e971ef19f8ee9..14a61a92e52e8 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler, Logger } from 'kibana/server';
+import type { RequestHandler, Logger } from '@kbn/core/server';
 import type { EndpointAuthzKeyList } from '../../../common/endpoint/types/authz';
 import type { SecuritySolutionRequestHandlerContext } from '../../types';
 import { EndpointAuthorizationError } from '../errors';
@@ -51,7 +51,7 @@ export const withEndpointAuthz = <T>(
     SecuritySolutionRequestHandlerContext
   > = async (context, request, response) => {
     if (enforceAuthz) {
-      const endpointAuthz = context.securitySolution.endpointAuthz;
+      const endpointAuthz = (await context.securitySolution).endpointAuthz;
       const permissionChecker = (permission: EndpointAuthzKeyList[0]) => endpointAuthz[permission];
 
       // has `all`?
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
index 876949a7ac291..080ee6e588b03 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TransportResult } from '@elastic/elasticsearch';
-import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '../../../../fleet/common';
+import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
 import { ENDPOINT_ACTION_RESPONSES_INDEX_PATTERN } from '../../../common/endpoint/constants';
 import { SecuritySolutionRequestHandlerContext } from '../../types';
 import {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts
index 2987049511c51..b5861a14a6993 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts
@@ -7,7 +7,7 @@
 
 import { getInternalArtifactMock } from '../../schemas/artifacts/saved_objects.mock';
 import { EndpointArtifactClient } from './artifact_client';
-import { createArtifactsClientMock } from '../../../../../fleet/server/mocks';
+import { createArtifactsClientMock } from '@kbn/fleet-plugin/server/mocks';
 
 describe('artifact_client', () => {
   describe('ArtifactClient sanity checks', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
index 062702bb14a49..0161b9ccb12a2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
@@ -5,13 +5,9 @@
  * 2.0.
  */
 
+import { Artifact, ArtifactsClientInterface, ListArtifactsProps } from '@kbn/fleet-plugin/server';
+import { ListResult } from '@kbn/fleet-plugin/common';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
-import {
-  Artifact,
-  ArtifactsClientInterface,
-  ListArtifactsProps,
-} from '../../../../../fleet/server';
-import { ListResult } from '../../../../../fleet/common';
 
 export interface EndpointArtifactClientInterface {
   getArtifact(id: string): Promise<InternalArtifactCompleteSchema | undefined>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts
index 8b3a4b221b115..72637a3497fff 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { ManifestSchemaVersion } from '../../../../common/endpoint/schema/common';
 import { ManifestConstants } from '../../lib/artifacts';
 import { getInternalManifestMock } from '../../schemas/artifacts/saved_objects.mock';
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts
index 85db51087b609..e20cd1f8c9bf4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts
@@ -9,7 +9,7 @@ import {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import {
   manifestSchemaVersion,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
index a7fb5dc23877c..2928f35c721b5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
@@ -6,12 +6,12 @@
  */
 
 import LRU from 'lru-cache';
-import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
-import { Logger } from 'src/core/server';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
-import { createPackagePolicyServiceMock } from '../../../../../../fleet/server/mocks';
-import { ExceptionListClient } from '../../../../../../lists/server';
-import { listMock } from '../../../../../../lists/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   createPackagePolicyWithManifestMock,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
index 717eadc136331..324d3a1974cd4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
   ENDPOINT_LIST_ID,
@@ -13,8 +13,8 @@ import {
   ENDPOINT_EVENT_FILTERS_LIST_ID,
   ENDPOINT_BLOCKLISTS_LIST_ID,
 } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { PackagePolicy } from '../../../../../../fleet/common/types/models';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
 import { getEmptyInternalArtifactMock } from '../../../schemas/artifacts/saved_objects.mock';
 import {
   InternalArtifactCompleteSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
index a8c63bbb88e13..d1f744b3791c6 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
@@ -9,16 +9,16 @@ import pMap from 'p-map';
 import semver from 'semver';
 import LRU from 'lru-cache';
 import { isEqual, isEmpty } from 'lodash';
-import { Logger, SavedObjectsClientContract } from 'src/core/server';
+import { Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ENDPOINT_EVENT_FILTERS_LIST_ID,
   ENDPOINT_TRUSTED_APPS_LIST_ID,
   ENDPOINT_BLOCKLISTS_LIST_ID,
   ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
 } from '@kbn/securitysolution-list-constants';
-import { ListResult } from '../../../../../../fleet/common';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
-import { ExceptionListClient } from '../../../../../../lists/server';
+import { ListResult } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { ManifestSchemaVersion } from '../../../../../common/endpoint/schema/common';
 import {
   manifestDispatchSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts
index 0a2e6253fd76f..bdaf93e7bea7f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts
@@ -5,17 +5,16 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { ManifestClient } from './manifest_client';
-import { EndpointArtifactClient, EndpointArtifactClientInterface } from './artifact_client';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
-import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 // Because mocks are for testing only, should be ok to import the FleetArtifactsClient directly
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FleetArtifactsClient } from '../../../../../fleet/server/services';
-import { createArtifactsClientMock } from '../../../../../fleet/server/mocks';
+import { FleetArtifactsClient } from '@kbn/fleet-plugin/server/services';
+import { createArtifactsClientMock } from '@kbn/fleet-plugin/server/mocks';
+import { EndpointArtifactClient, EndpointArtifactClientInterface } from './artifact_client';
+import { ManifestClient } from './manifest_client';
 
 export const getManifestClientMock = (
   savedObjectsClient?: SavedObjectsClientContract
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts b/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts
index 337b851466f49..2efc8528e4a5d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Values } from '@kbn/utility-types';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../../../../licensing/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 const FEATURES = {
   HOST_ISOLATION: 'Host isolation',
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts b/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
index 7ab263705eaaf..55b737b573fdb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
@@ -5,14 +5,18 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract, SavedObjectsServiceStart } from 'kibana/server';
+import {
+  KibanaRequest,
+  SavedObjectsClientContract,
+  SavedObjectsServiceStart,
+} from '@kbn/core/server';
 import type {
   AgentClient,
   AgentPolicyServiceInterface,
   FleetStartContract,
   PackagePolicyServiceInterface,
   PackageClient,
-} from '../../../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import { createInternalReadonlySoClient } from '../../utils/create_internal_readonly_so_client';
 
 export interface EndpointFleetServicesFactoryInterface {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts
index 24fdfd15ed105..d8003d368e63e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts
@@ -9,9 +9,9 @@ import {
   createEndpointMetadataServiceTestContextMock,
   EndpointMetadataServiceTestContextMock,
 } from './mocks';
-import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import {
   legacyMetadataSearchResponseMock,
   unitedMetadataSearchResponseMock,
@@ -22,8 +22,8 @@ import {
   buildUnitedIndexQuery,
 } from '../../routes/metadata/query_builders';
 import { HostMetadata } from '../../../../common/endpoint/types';
-import { Agent, PackagePolicy } from '../../../../../fleet/common';
-import { AgentPolicyServiceInterface } from '../../../../../fleet/server/services';
+import { Agent, PackagePolicy } from '@kbn/fleet-plugin/common';
+import { AgentPolicyServiceInterface } from '@kbn/fleet-plugin/server/services';
 import { EndpointError } from '../../../../common/endpoint/errors';
 
 describe('EndpointMetadataService', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
index 7ddebf93bb025..4b43d51a44c53 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
@@ -10,9 +10,16 @@ import {
   Logger,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { SearchTotalHits, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
+import { Agent, AgentPolicy, PackagePolicy } from '@kbn/fleet-plugin/common';
+import {
+  AgentNotFoundError,
+  AgentPolicyServiceInterface,
+  PackagePolicyServiceInterface,
+} from '@kbn/fleet-plugin/server';
+import { getAgentStatus } from '@kbn/fleet-plugin/common/services/agent_status';
 import {
   HostInfo,
   HostMetadata,
@@ -21,12 +28,6 @@ import {
   PolicyData,
   UnitedAgentMetadata,
 } from '../../../../common/endpoint/types';
-import { Agent, AgentPolicy, PackagePolicy } from '../../../../../fleet/common';
-import {
-  AgentNotFoundError,
-  AgentPolicyServiceInterface,
-  PackagePolicyServiceInterface,
-} from '../../../../../fleet/server';
 import {
   EndpointHostNotFoundError,
   EndpointHostUnEnrolledError,
@@ -52,7 +53,6 @@ import {
 import { createInternalReadonlySoClient } from '../../utils/create_internal_readonly_so_client';
 import { METADATA_UNITED_INDEX } from '../../../../common/endpoint/constants';
 import { getAllEndpointPackagePolicies } from '../../routes/metadata/support/endpoint_package_policies';
-import { getAgentStatus } from '../../../../../fleet/common/services/agent_status';
 import { GetMetadataListRequestQuery } from '../../../../common/endpoint/schema/metadata';
 import { EndpointError } from '../../../../common/endpoint/errors';
 import { EndpointFleetServicesInterface } from '../fleet/endpoint_fleet_services_factory';
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/metadata.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/metadata.ts
index bd2cdd7e45a3a..9e21c2c192b82 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/metadata.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/metadata.ts
@@ -18,7 +18,7 @@ export async function getMetadataForEndpoints(
   requestHandlerContext: SecuritySolutionRequestHandlerContext
 ): Promise<HostMetadata[]> {
   const query = getESQueryHostMetadataByIDs(endpointIDs);
-  const esClient = requestHandlerContext.core.elasticsearch.client.asCurrentUser;
+  const esClient = (await requestHandlerContext.core).elasticsearch.client.asCurrentUser;
   const { body } = await esClient.search<HostMetadata>(query as estypes.SearchRequest, {
     meta: true,
   });
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts
index 599f153e19e05..ce9f6123635a9 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts
@@ -5,19 +5,16 @@
  * 2.0.
  */
 
-import { SavedObjectsServiceStart } from 'kibana/server';
-import { EndpointMetadataService } from './endpoint_metadata_service';
-import {
-  loggingSystemMock,
-  savedObjectsServiceMock,
-} from '../../../../../../../src/core/server/mocks';
+import { SavedObjectsServiceStart } from '@kbn/core/server';
+import { loggingSystemMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import {
   createMockAgentPolicyService,
   createMockAgentService,
   createMockPackageService,
   createPackagePolicyServiceMock,
-} from '../../../../../fleet/server/mocks';
-import { AgentPolicyServiceInterface, AgentService } from '../../../../../fleet/server';
+} from '@kbn/fleet-plugin/server/mocks';
+import { AgentPolicyServiceInterface, AgentService } from '@kbn/fleet-plugin/server';
+import { EndpointMetadataService } from './endpoint_metadata_service';
 import {
   EndpointFleetServicesFactory,
   EndpointInternalFleetServicesInterface,
diff --git a/x-pack/plugins/security_solution/server/endpoint/types.ts b/x-pack/plugins/security_solution/server/endpoint/types.ts
index bc52b759b9f0a..acf04c0b0527e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LoggerFactory } from 'kibana/server';
+import { LoggerFactory } from '@kbn/core/server';
 
 import { ConfigType } from '../config';
 import { EndpointAppContextService } from './endpoint_app_context_services';
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts b/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts
index 36c6bffce2c6a..3a1e25c32b683 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { SearchRequest } from 'src/plugins/data/public';
+import type { SearchRequest } from '@kbn/data-plugin/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TransportResult } from '@elastic/elasticsearch';
-import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '../../../../fleet/common';
+import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
 import {
   ENDPOINT_ACTIONS_INDEX,
   ENDPOINT_ACTION_RESPONSES_INDEX_PATTERN,
@@ -30,7 +30,7 @@ import {
   LogsEndpointActionResponse,
   ActivityLogEntry,
 } from '../../../common/endpoint/types';
-import { doesLogsEndpointActionsIndexExist } from '../utils';
+import { doesLogsEndpointActionsIndexExist } from '.';
 
 const actionsIndices = [AGENT_ACTIONS_INDEX, ENDPOINT_ACTIONS_INDEX];
 // search all responses indices irrelevant of namespace
@@ -194,7 +194,7 @@ export const getActionRequestsResult = async ({
 
   let actionRequests: TransportResult<estypes.SearchResponse<unknown>, unknown>;
   try {
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     actionRequests = await esClient.search(actionsSearchQuery, { ...queryOptions, meta: true });
     const actionIds = actionRequests?.body?.hits?.hits?.map((e) => {
       return logsEndpointActionsRegex.test(e._index)
@@ -251,7 +251,7 @@ export const getActionResponsesResult = async ({
 
   let actionResponses: TransportResult<estypes.SearchResponse<unknown>, unknown>;
   try {
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     actionResponses = await esClient.search(responsesSearchQuery, { ...queryOptions, meta: true });
   } catch (error) {
     logger.error(error);
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts
index eee6b57232bc1..ab453a574e89c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  savedObjectsServiceMock,
-  savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { savedObjectsServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   createInternalReadonlySoClient,
   InternalReadonlySoClientMethodNotAllowedError,
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts
index 2a76b24cc4655..962abe330ea39 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract, SavedObjectsServiceStart } from 'kibana/server';
+import {
+  KibanaRequest,
+  SavedObjectsClientContract,
+  SavedObjectsServiceStart,
+} from '@kbn/core/server';
 import { EndpointError } from '../../../common/endpoint/errors';
 
 type SavedObjectsClientContractKeys = keyof SavedObjectsClientContract;
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts b/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts
index 5570de1f63461..d87046b6ea0d1 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AgentStatus } from '../../../../fleet/common';
+import { AgentStatus } from '@kbn/fleet-plugin/common';
 import { HostStatus } from '../../../common/endpoint/types';
 
 // For an understanding of how fleet agent status is calculated:
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts
index d2894c8c64c14..eb53a5854c2aa 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts
@@ -6,10 +6,11 @@
  */
 
 import {
+  coreMock,
   elasticsearchServiceMock,
   savedObjectsClientMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { SecuritySolutionRequestHandlerContext } from '../../types';
 import { createRouteHandlerContext } from '../mocks';
 import {
@@ -18,7 +19,7 @@ import {
 } from './yes_no_data_stream';
 
 describe('Accurately answers if index template for data stream exists', () => {
-  let ctxt: jest.Mocked<SecuritySolutionRequestHandlerContext>;
+  let ctxt: ReturnType<typeof createRouteHandlerContext>;
 
   beforeEach(() => {
     ctxt = createRouteHandlerContext(
@@ -27,17 +28,17 @@ describe('Accurately answers if index template for data stream exists', () => {
     );
   });
 
-  const mockEsApiResponse = (response: { body: boolean; statusCode: number }) => {
-    return jest.fn().mockImplementationOnce(() => Promise.resolve(response));
-  };
-
   it('Returns FALSE for a non-existent data stream index template', async () => {
-    ctxt.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate = mockEsApiResponse({
-      body: false,
-      statusCode: 404,
-    });
+    ctxt.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate.mockResponseImplementation(
+      () => ({
+        body: false,
+        statusCode: 404,
+      })
+    );
     const doesItExist = await doLogsEndpointActionDsExists({
-      context: ctxt,
+      context: coreMock.createCustomRequestHandlerContext(
+        ctxt
+      ) as SecuritySolutionRequestHandlerContext,
       logger: loggingSystemMock.create().get('host-isolation'),
       dataStreamName: '.test-stream.name',
     });
@@ -45,12 +46,16 @@ describe('Accurately answers if index template for data stream exists', () => {
   });
 
   it('Returns TRUE for an existing index', async () => {
-    ctxt.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate = mockEsApiResponse({
-      body: true,
-      statusCode: 200,
-    });
+    ctxt.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate.mockResponseImplementation(
+      () => ({
+        body: true,
+        statusCode: 200,
+      })
+    );
     const doesItExist = await doLogsEndpointActionDsExists({
-      context: ctxt,
+      context: coreMock.createCustomRequestHandlerContext(
+        ctxt
+      ) as SecuritySolutionRequestHandlerContext,
       logger: loggingSystemMock.create().get('host-isolation'),
       dataStreamName: '.test-stream.name',
     });
@@ -59,7 +64,7 @@ describe('Accurately answers if index template for data stream exists', () => {
 });
 
 describe('Accurately answers if index exists', () => {
-  let ctxt: jest.Mocked<SecuritySolutionRequestHandlerContext>;
+  let ctxt: ReturnType<typeof createRouteHandlerContext>;
 
   beforeEach(() => {
     ctxt = createRouteHandlerContext(
@@ -68,17 +73,15 @@ describe('Accurately answers if index exists', () => {
     );
   });
 
-  const mockEsApiResponse = (response: { body: boolean; statusCode: number }) => {
-    return jest.fn().mockImplementationOnce(() => Promise.resolve(response));
-  };
-
   it('Returns FALSE for a non-existent index', async () => {
-    ctxt.core.elasticsearch.client.asInternalUser.indices.exists = mockEsApiResponse({
+    ctxt.core.elasticsearch.client.asInternalUser.indices.exists.mockResponseImplementation(() => ({
       body: false,
       statusCode: 404,
-    });
+    }));
     const doesItExist = await doesLogsEndpointActionsIndexExist({
-      context: ctxt,
+      context: coreMock.createCustomRequestHandlerContext(
+        ctxt
+      ) as SecuritySolutionRequestHandlerContext,
       logger: loggingSystemMock.create().get('host-isolation'),
       indexName: '.test-index.name-default',
     });
@@ -86,12 +89,14 @@ describe('Accurately answers if index exists', () => {
   });
 
   it('Returns TRUE for an existing index', async () => {
-    ctxt.core.elasticsearch.client.asInternalUser.indices.exists = mockEsApiResponse({
+    ctxt.core.elasticsearch.client.asInternalUser.indices.exists.mockResponseImplementation(() => ({
       body: true,
       statusCode: 200,
-    });
+    }));
     const doesItExist = await doesLogsEndpointActionsIndexExist({
-      context: ctxt,
+      context: coreMock.createCustomRequestHandlerContext(
+        ctxt
+      ) as SecuritySolutionRequestHandlerContext,
       logger: loggingSystemMock.create().get('host-isolation'),
       indexName: '.test-index.name-default',
     });
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts
index fae38da9a8985..9e94e4ba29c32 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { SecuritySolutionRequestHandlerContext } from '../../types';
 
 export const doLogsEndpointActionDsExists = async ({
@@ -18,7 +18,7 @@ export const doLogsEndpointActionDsExists = async ({
   dataStreamName: string;
 }): Promise<boolean> => {
   try {
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     const doesIndexTemplateExist = await esClient.indices.existsIndexTemplate(
       {
         name: dataStreamName,
@@ -46,7 +46,7 @@ export const doesLogsEndpointActionsIndexExist = async ({
   indexName: string;
 }): Promise<boolean> => {
   try {
-    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const esClient = (await context.core).elasticsearch.client.asInternalUser;
     const doesIndexExist = await esClient.indices.exists(
       {
         index: indexName,
diff --git a/x-pack/plugins/security_solution/server/features.ts b/x-pack/plugins/security_solution/server/features.ts
index 6fe65ce8692e5..340c4c54c5fc6 100644
--- a/x-pack/plugins/security_solution/server/features.ts
+++ b/x-pack/plugins/security_solution/server/features.ts
@@ -7,11 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { KibanaFeatureConfig, SubFeatureConfig } from '../../features/common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { KibanaFeatureConfig, SubFeatureConfig } from '@kbn/features-plugin/common';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { APP_ID, CASES_FEATURE_ID, SERVER_APP_ID } from '../common/constants';
 import { savedObjectTypes } from './saved_objects';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../src/plugins/data_views/common';
 
 export const getCasesKibanaFeature = (): KibanaFeatureConfig => ({
   id: CASES_FEATURE_ID,
diff --git a/x-pack/plugins/security_solution/server/fixtures.ts b/x-pack/plugins/security_solution/server/fixtures.ts
index 0d8f91e481730..2f89cc0153d33 100644
--- a/x-pack/plugins/security_solution/server/fixtures.ts
+++ b/x-pack/plugins/security_solution/server/fixtures.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../src/core/server/mocks';
-import { createFleetRequestHandlerContextMock } from '../../fleet/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { createFleetRequestHandlerContextMock } from '@kbn/fleet-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 function createCoreRequestHandlerContextMock() {
   return {
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
index b5e787bd90c98..17bfa0d584f28 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
@@ -7,8 +7,11 @@
 
 import { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
-import { createNewPackagePolicyMock, deletePackagePolicyMock } from '../../../fleet/common/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import {
+  createNewPackagePolicyMock,
+  deletePackagePolicyMock,
+} from '@kbn/fleet-plugin/common/mocks';
 import {
   policyFactory,
   policyFactoryWithoutPaidFeatures,
@@ -19,35 +22,34 @@ import {
   getPackagePolicyDeleteCallback,
   getPackagePolicyUpdateCallback,
 } from './fleet_integration';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { requestContextMock } from '../lib/detection_engine/routes/__mocks__';
 import { requestContextFactoryMock } from '../request_context_factory.mock';
 import { EndpointAppContextServiceStartContract } from '../endpoint/endpoint_app_context_services';
 import { createMockEndpointAppContextServiceStartContract } from '../endpoint/mocks';
-import { licenseMock } from '../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 import { LicenseService } from '../../common/license';
 import { Subject } from 'rxjs';
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { EndpointDocGenerator } from '../../common/endpoint/generate_data';
 import { ProtectionModes } from '../../common/endpoint/types';
-import type { SecuritySolutionRequestHandlerContext } from '../types';
-import { getExceptionListClientMock } from '../../../lists/server/services/exception_lists/exception_list_client.mock';
-import { getExceptionListSchemaMock } from '../../../lists/common/schemas/response/exception_list_schema.mock';
-import { ExceptionListClient } from '../../../lists/server';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { InternalArtifactCompleteSchema } from '../endpoint/schemas/artifacts';
 import { ManifestManager } from '../endpoint/services/artifacts/manifest_manager';
 import { getMockArtifacts, toArtifactRecords } from '../endpoint/lib/artifacts/mocks';
 import { Manifest } from '../endpoint/lib/artifacts';
-import { NewPackagePolicy } from '../../../fleet/common/types/models';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/common/types/models';
 import { ManifestSchema } from '../../common/endpoint/schema/manifest';
-import { DeletePackagePoliciesResponse } from '../../../fleet/common';
+import { DeletePackagePoliciesResponse } from '@kbn/fleet-plugin/common';
 import { createMockPolicyData } from '../endpoint/services/feature_usage';
 import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../common/endpoint/service/artifacts/constants';
 
 describe('ingest_integration tests ', () => {
   let endpointAppContextMock: EndpointAppContextServiceStartContract;
   let req: KibanaRequest;
-  let ctx: SecuritySolutionRequestHandlerContext;
+  let ctx: ReturnType<typeof requestContextMock.create>;
   const exceptionListClient: ExceptionListClient = getExceptionListClientMock();
   let licenseEmitter: Subject<ILicense>;
   let licenseService: LicenseService;
@@ -96,7 +98,7 @@ describe('ingest_integration tests ', () => {
         exceptionListClient
       );
 
-      return callback(createNewPackagePolicyMock(), ctx, req);
+      return callback(createNewPackagePolicyMock(), requestContextMock.convertContext(ctx), req);
     };
 
     const TEST_POLICY_ID_1 = 'c6d16e42-c32d-4dce-8a88-113cfe276ad1';
@@ -262,9 +264,9 @@ describe('ingest_integration tests ', () => {
       );
       const policyConfig = generator.generatePolicyPackagePolicy();
       policyConfig.inputs[0]!.config!.policy.value = mockPolicy;
-      await expect(() => callback(policyConfig, ctx, req)).rejects.toThrow(
-        'Requires Platinum license'
-      );
+      await expect(() =>
+        callback(policyConfig, requestContextMock.convertContext(ctx), req)
+      ).rejects.toThrow('Requires Platinum license');
     });
     it('updates successfully if no paid features are turned on in the policy', async () => {
       const mockPolicy = policyFactoryWithoutPaidFeatures();
@@ -278,7 +280,11 @@ describe('ingest_integration tests ', () => {
       );
       const policyConfig = generator.generatePolicyPackagePolicy();
       policyConfig.inputs[0]!.config!.policy.value = mockPolicy;
-      const updatedPolicyConfig = await callback(policyConfig, ctx, req);
+      const updatedPolicyConfig = await callback(
+        policyConfig,
+        requestContextMock.convertContext(ctx),
+        req
+      );
       expect(updatedPolicyConfig.inputs[0]!.config!.policy.value).toEqual(mockPolicy);
     });
   });
@@ -299,7 +305,11 @@ describe('ingest_integration tests ', () => {
       );
       const policyConfig = generator.generatePolicyPackagePolicy();
       policyConfig.inputs[0]!.config!.policy.value = mockPolicy;
-      const updatedPolicyConfig = await callback(policyConfig, ctx, req);
+      const updatedPolicyConfig = await callback(
+        policyConfig,
+        requestContextMock.convertContext(ctx),
+        req
+      );
       expect(updatedPolicyConfig.inputs[0]!.config!.policy.value).toEqual(mockPolicy);
     });
   });
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
index 154b11b88fe5d..a67f08c92d4e4 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger, RequestHandlerContext } from 'kibana/server';
-import { ExceptionListClient } from '../../../lists/server';
-import { PluginStartContract as AlertsStartContract } from '../../../alerting/server';
+import { KibanaRequest, Logger, RequestHandlerContext } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { PluginStartContract as AlertsStartContract } from '@kbn/alerting-plugin/server';
 import {
   PostPackagePolicyCreateCallback,
   PostPackagePolicyDeleteCallback,
   PutPackagePolicyUpdateCallback,
-} from '../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 
-import { NewPackagePolicy, UpdatePackagePolicy } from '../../../fleet/common';
+import { NewPackagePolicy, UpdatePackagePolicy } from '@kbn/fleet-plugin/common';
 
 import { NewPolicyData, PolicyConfig } from '../../common/endpoint/types';
 import { LicenseService } from '../../common/license';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts
index 2440a0a93187d..6fb356c1906f3 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { ManifestManager } from '../../endpoint/services';
 import { Manifest, reportErrors } from '../../endpoint/lib/artifacts';
 import { InternalArtifactCompleteSchema } from '../../endpoint/schemas';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
index 01368ccb22c62..609fb8a9554f5 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'kibana/server';
-import { ExceptionListClient } from '../../../../lists/server';
-import { PluginStartContract as AlertsStartContract } from '../../../../alerting/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { PluginStartContract as AlertsStartContract } from '@kbn/alerting-plugin/server';
 import { createDetectionIndex } from '../../lib/detection_engine/routes/index/create_index_route';
 import { createPrepackagedRules } from '../../lib/detection_engine/routes/rules/add_prepackaged_rules_route';
 import { SecuritySolutionApiRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts
index 28ee9d5ad81da..ac666579faa2a 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts
@@ -7,8 +7,8 @@
 
 import pMap from 'p-map';
 
-import { ExceptionListClient } from '../../../../lists/server';
-import { PostPackagePolicyDeleteCallback } from '../../../../fleet/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { PostPackagePolicyDeleteCallback } from '@kbn/fleet-plugin/server';
 import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../../common/endpoint/service/artifacts/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts
index a82f89e31803f..97314d4a39803 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { isEndpointPolicyValidForLicense } from '../../../common/license/policy_config';
 import { PolicyConfig } from '../../../common/endpoint/types';
 import { LicenseService } from '../../../common/license';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts b/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts
index 6bf77e236212f..2d1618f8f0147 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { NewPackagePolicy } from '../../../fleet/common';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/common';
 import { PolicyConfig, PolicyOperatingSystem, ProtectionModes } from '../../common/endpoint/types';
 import { EndpointMetadataService } from '../endpoint/services/metadata';
 import { FeatureUsageService } from '../endpoint/services/feature_usage/service';
diff --git a/x-pack/plugins/security_solution/server/index.ts b/x-pack/plugins/security_solution/server/index.ts
index f3ce6e458fe7d..ab133d6c0a4a6 100644
--- a/x-pack/plugins/security_solution/server/index.ts
+++ b/x-pack/plugins/security_solution/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { Plugin, PluginSetup, PluginStart } from './plugin';
 import { configSchema, ConfigSchema, ConfigType } from './config';
 import { SIGNALS_INDEX_KEY } from '../common/constants';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts
index 4fa91bdbfd06d..6cc2a9baef062 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { createMigrationIndex } from './create_migration_index';
 import { createMigration } from './create_migration';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
index c17431c117d82..10f2dbdd93d50 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { SignalsReindexOptions } from '../../../../common/detection_engine/schemas/request/create_signals_migration_schema';
 import { createMigrationIndex } from './create_migration_index';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts
index d74d10e0fc311..e541f7e3e66aa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { createMigrationIndex } from './create_migration_index';
 
 describe('createMigrationIndex', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts
index b1f1ecf85746a..00c6bc369dfc7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Creates the destination index to be used during the migration of a
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts
index 29fd6c21166b0..e8a6e2f1c9692 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { createMigrationSavedObject } from './create_migration_saved_object';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts
index bb9f7599ca6d5..4bee5cbe6dd4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts
@@ -8,7 +8,7 @@
 import { chain, tryCatch } from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { validateTaskEither } from '@kbn/securitysolution-io-ts-utils';
 import { toError, toPromise } from '@kbn/securitysolution-list-api';
 import { signalsMigrationSOClient } from './saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts
index dce3781b133f8..50fab4a3e1e02 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { deleteMigration } from './delete_migration';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { deleteMigrationSavedObject } from './delete_migration_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts
index db2e0e70889a4..e1e4bfe0bc562 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { deleteMigrationSavedObject } from './delete_migration_saved_object';
 import { isMigrationFailed, isMigrationPending, isMigrationSuccess } from './helpers';
 import { applyMigrationCleanupPolicy } from './migration_cleanup';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts
index 664bd683804b1..97495c1e55ff1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { signalsMigrationSOClient } from './saved_objects_client';
 
 export const deleteMigrationSavedObject = async ({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts
index 22f4384483715..6c855a5b77748 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getIndexCount } from '@kbn/securitysolution-es-utils';
 import { updateMigrationSavedObject } from './update_migration_saved_object';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts
index b1784d0b2ba1c..21741de8775e8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { getIndexCount } from '@kbn/securitysolution-es-utils';
 import { isMigrationPending } from './helpers';
 import { applyMigrationCleanupPolicy } from './migration_cleanup';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts
index 9f0d9b01c43d4..2837dacbd32eb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { findMigrationSavedObjects } from './find_migration_saved_objects';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts
index 2cc73c36500f2..8022b66ed465d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts
@@ -8,7 +8,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract, SavedObjectsFindOptions } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObjectsFindOptions } from '@kbn/core/server';
 import { validateEither } from '@kbn/securitysolution-io-ts-utils';
 import { signalsMigrationSOClient } from './saved_objects_client';
 import { SignalsMigrationSO, signalsMigrationSOs } from './saved_objects_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts
index cd9d8cdb52a77..2d87ff68d1b99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getIndexVersionsByIndex } from './get_index_versions_by_index';
 
 describe('getIndexVersionsByIndex', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts
index 2de176cebe6ae..49056eecb9454 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export interface IndexMappingsResponse {
   [indexName: string]: { mappings: { _meta: { version: number } } };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts
index 7e678b308e1f9..7b7ff29ec8a5a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   getSignalsMigrationSavedObjectMock,
   getSignalsMigrationSavedObjectErrorMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts
index 66bbc01ef0d68..cdae6104c2945 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts
@@ -8,7 +8,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { validateEither } from '@kbn/securitysolution-io-ts-utils';
 import { signalsMigrationSOClient } from './saved_objects_client';
 import { SignalsMigrationSO, signalsMigrationSOs } from './saved_objects_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts
index 12b4f06d358ea..713710b6b96f8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { findMigrationSavedObjects } from './find_migration_saved_objects';
 import { getMigrationSavedObjectsByIndex } from './get_migration_saved_objects_by_index';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts
index 18589b8e3ef89..62f748a03547c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { findMigrationSavedObjects } from './find_migration_saved_objects';
 
 import { SignalsMigrationSO } from './saved_objects_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts
index 2a063a7f7df0e..635880969ea38 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSignalVersionsByIndex } from './get_signal_versions_by_index';
 
 describe('getSignalVersionsByIndex', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts
index a5fd7fbe3ce5a..665bbe86d6b9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export interface SignalVersionsAggResponse {
   aggregations: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts
index 2ad23ed3584a6..7d77dddc9a7f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSignalsIndicesInRange } from './get_signals_indices_in_range';
 
 describe('getSignalsIndicesInRange', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts
index a03f64c7b8f48..24eb70dde03f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 interface IndexesResponse {
   aggregations: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
index e8b9b000a47d3..ab6a13c96985a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import migrationCleanupPolicy from './migration_cleanup_policy.json';
 
 export const getMigrationCleanupPolicyName = (alias: string): string =>
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts
index 721b1ce5835be..9c35adba92a2e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { SignalsReindexOptions } from '../../../../common/detection_engine/schemas/request/create_signals_migration_schema';
 import { SignalsMigrationSO } from './saved_objects_schema';
 import { createMigrationSavedObject } from './create_migration_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts
index 22cc14be66900..211e81d0168bd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Updates aliases for the old and new concrete indexes specified, respectively
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts
index c8e3d1275ebfd..7bcc30798806f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const signalsMigrationType = 'security-solution-signals-migration';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts
index 61f35af8cabc8..fe3801cf24276 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts
@@ -14,7 +14,7 @@ import {
   SavedObjectsBulkGetObject,
   SavedObjectsBulkResponse,
   SavedObjectsBaseOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { signalsMigrationType } from './saved_objects';
 import { SignalsMigrationSOAttributes } from './saved_objects_schema';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts
index 8dbc0c29be3f8..ed4ebea7dfb93 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SignalsMigrationSOUpdateAttributes } from './saved_objects_schema';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { updateMigrationSavedObject } from './update_migration_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts
index 91919246c15a3..a4268895498cc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts
@@ -8,7 +8,7 @@
 import { chain, tryCatch } from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract, SavedObjectsUpdateResponse } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObjectsUpdateResponse } from '@kbn/core/server';
 import { validateTaskEither } from '@kbn/securitysolution-io-ts-utils';
 import { toError, toPromise } from '@kbn/securitysolution-list-api';
 import { signalsMigrationSOClient } from './saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts
index 23a955423f413..a3c22273ed140 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { SignalSearchResponse, SignalSource } from '../signals/types';
 import { buildSignalsSearchQuery } from './build_signals_query';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts
index cc9e885d49644..077afdd65e504 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { legacyCreateNotifications } from './legacy_create_notifications';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts
index f28dd8b45b035..dec6d51aa9082 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SanitizedRule } from '../../../../../alerting/common';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { SERVER_APP_ID, LEGACY_NOTIFICATIONS_ID } from '../../../../common/constants';
 // eslint-disable-next-line no-restricted-imports
 import { CreateNotificationParams, LegacyRuleNotificationAlertTypeParams } from './legacy_types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts
index a7fa01226f008..919af2a131046 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams, FindResult } from '../../../../../alerting/server';
+import { RuleTypeParams, FindResult } from '@kbn/alerting-plugin/server';
 import { LEGACY_NOTIFICATIONS_ID } from '../../../../common/constants';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyFindNotificationParams } from './legacy_types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts
index efe4e51e761b9..0980159d67882 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts
@@ -7,7 +7,7 @@
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyReadNotifications } from './legacy_read_notifications';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   legacyGetNotificationResult,
   legacyGetFindNotificationsResultWithSingleHit,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts
index f6c6f0f982660..05f64e19df26e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams, SanitizedRule } from '../../../../../alerting/common';
+import { RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyReadNotificationParams, legacyIsAlertType } from './legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts
index c49e6d060c7c0..0facf29681270 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getAlertMock } from '../routes/__mocks__/request_responses';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRulesNotificationAlertType } from './legacy_rules_notification_alert_type';
 import { buildSignalsSearchQuery } from './build_signals_query';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyNotificationExecutorOptions } from './legacy_types';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts
index 62d187bd3ea0d..55e7b69610501 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
 import {
   DEFAULT_RULE_NOTIFICATION_QUERY_SIZE,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts
index 231451947a1dd..f7b97b884a381 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts
index 1461b78ba73a6..1d883cc21cdb0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { RuleParamsAndRefs } from '../../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { RuleParamsAndRefs } from '@kbn/alerting-plugin/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts
index 8e6732727abf2..05c923a01fc52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts
index 1647e213c1e9e..c223b08b5170c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyGetRuleReference } from '../../rule_actions/legacy_utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts
index ae34479e73534..214164063c5f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts
index 5a7118d64ba3a..8af032f8b099b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts
index f28d78e5c0304..52a0d6019bfaa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyInjectRuleIdReferences } from './legacy_inject_rule_id_references';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts
index b6ad98eb864ed..da76a562a940e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts
index 44cca599a0468..417740ecdea5a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts
@@ -16,8 +16,8 @@ import {
   AlertInstanceState,
   AlertInstanceContext,
   RuleExecutorOptions,
-} from '../../../../../alerting/server';
-import { Rule, RuleAction } from '../../../../../alerting/common';
+} from '@kbn/alerting-plugin/server';
+import { Rule, RuleAction } from '@kbn/alerting-plugin/common';
 import { LEGACY_NOTIFICATIONS_ID } from '../../../../common/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
index a10f4a59c7359..d97eff43aeb8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleExecutorServicesMock, alertsMock } from '../../../../../alerting/server/mocks';
+import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { sampleThresholdAlert } from '../rule_types/__mocks__/threshold';
 import {
   NotificationRuleTypeParams,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
index d4cc8385429da..80ed63663a4d0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
@@ -6,7 +6,7 @@
  */
 
 import { mapKeys, snakeCase } from 'lodash/fp';
-import { Alert } from '../../../../../alerting/server';
+import { Alert } from '@kbn/alerting-plugin/server';
 import { expandDottedObject } from '../../../../common/utils/expand_dotted';
 import { RuleParams } from '../schemas/rule_schemas';
 import aadFieldConversion from '../routes/index/signal_aad_mapping.json';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts
index a094a87acfbf6..d7293275c9c49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { alertsMock } from '../../../../../alerting/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { scheduleThrottledNotificationActions } from './schedule_throttle_notification_actions';
 import {
   NotificationRuleTypeParams,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts
index 2399962ad281e..64701060a5418 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObject, Logger } from 'src/core/server';
+import { ElasticsearchClient, SavedObject, Logger } from '@kbn/core/server';
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
-import { Alert } from '../../../../../alerting/server';
+import { Alert } from '@kbn/alerting-plugin/server';
 import { RuleParams } from '../schemas/rule_schemas';
-import { deconflictSignalsAndResults, getNotificationResultsLink } from '../notifications/utils';
+import { deconflictSignalsAndResults, getNotificationResultsLink } from './utils';
 import { DEFAULT_RULE_NOTIFICATION_QUERY_SIZE } from '../../../../common/constants';
-import { getSignals } from '../notifications/get_signals';
+import { getSignals } from './get_signals';
 import {
   NotificationRuleTypeParams,
   scheduleNotificationActions,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts
index 36e0b6a6c02ab..96ea4362b3338 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { SignalSource } from '../signals/types';
 import { deconflictSignalsAndResults, getNotificationResultsLink } from './utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts
index c8fc6febe4d0f..e376d7941fa36 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { APP_PATH } from '../../../../common/constants';
 import { SignalSearchResponse } from '../signals/types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts
index 8a3e779f09d3b..8baa7cd6899ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from '../../../../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 export const requestMock = {
   create: httpServerMock.createKibanaRequest,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
index db4026775a381..60e8f0c8cf858 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -6,19 +6,20 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { coreMock } from 'src/core/server/mocks';
+import type { AwaitedProperties } from '@kbn/utility-types';
+import { coreMock } from '@kbn/core/server/mocks';
 
-import { ActionsApiRequestHandlerContext } from '../../../../../../actions/server';
-import { AlertingApiRequestHandlerContext } from '../../../../../../alerting/server';
-import { rulesClientMock } from '../../../../../../alerting/server/mocks';
+import { ActionsApiRequestHandlerContext } from '@kbn/actions-plugin/server';
+import { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 
 // See: https://github.com/elastic/kibana/issues/117255, the moduleNameMapper creates mocks to avoid memory leaks from kibana core.
 // We cannot import from "../../../../../../actions/server" directly here or we have a really bad memory issue. We cannot add this to the existing mocks we created, this fix must be here.
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { actionsClientMock } from '../../../../../../actions/server/actions_client.mock';
-import { licensingMock } from '../../../../../../licensing/server/mocks';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
+import { actionsClientMock } from '@kbn/actions-plugin/server/actions_client.mock';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
 
 import { siemMock } from '../../../../mocks';
 import { createMockConfig } from '../../../../config.mock';
@@ -62,10 +63,11 @@ export const createMockClients = () => {
 
 type MockClients = ReturnType<typeof createMockClients>;
 
-type SecuritySolutionRequestHandlerContextMock =
-  MockedKeys<SecuritySolutionRequestHandlerContext> & {
-    core: MockClients['core'];
-  };
+export type SecuritySolutionRequestHandlerContextMock = MockedKeys<
+  AwaitedProperties<Omit<SecuritySolutionRequestHandlerContext, 'resolve'>>
+> & {
+  core: MockClients['core'];
+};
 
 const createRequestContextMock = (
   clients: MockClients = createMockClients(),
@@ -89,6 +91,14 @@ const createRequestContextMock = (
   };
 };
 
+const convertRequestContextMock = (
+  context: AwaitedProperties<SecuritySolutionRequestHandlerContextMock>
+): SecuritySolutionRequestHandlerContext => {
+  return coreMock.createCustomRequestHandlerContext(
+    context
+  ) as unknown as SecuritySolutionRequestHandlerContext;
+};
+
 const createSecuritySolutionRequestContextMock = (
   clients: MockClients,
   overrides: { endpointAuthz?: Partial<EndpointAuthz> } = {}
@@ -127,6 +137,7 @@ const createTools = () => {
 
 export const requestContextMock = {
   create: createRequestContextMock,
+  convertContext: convertRequestContextMock,
   createMockClients,
   createTools,
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index e38df7657f512..b79ae4b38abb9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -9,9 +9,9 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import { ruleTypeMappings } from '@kbn/securitysolution-rules';
 
-import { SavedObjectsFindResponse } from 'src/core/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 
-import { ActionResult } from '../../../../../../actions/server';
+import { ActionResult } from '@kbn/actions-plugin/server';
 import {
   DETECTION_ENGINE_RULES_URL,
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
@@ -38,7 +38,7 @@ import { getFinalizeSignalsMigrationSchemaMock } from '../../../../../common/det
 import { EqlSearchResponse } from '../../../../../common/detection_engine/types';
 import { getSignalsMigrationStatusSchemaMock } from '../../../../../common/detection_engine/schemas/request/get_signals_migration_status_schema.mock';
 import { RuleParams } from '../../schemas/rule_schemas';
-import { SanitizedRule, ResolvedSanitizedRule } from '../../../../../../alerting/common';
+import { SanitizedRule, ResolvedSanitizedRule } from '@kbn/alerting-plugin/common';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 import {
   getPerformBulkActionSchemaMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts
index 9ef6aae00406f..8efe2407f2245 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from '../../../../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 export const responseMock = {
   create: httpServerMock.createResponseFactory,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts
index 4531ca1ed5031..ef2a3016e5f91 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import {
-  RequestHandler,
-  RouteConfig,
-  KibanaRequest,
-} from '../../../../../../../../src/core/server';
-import { httpServiceMock } from '../../../../../../../../src/core/server/mocks';
+import { RequestHandler, RouteConfig, KibanaRequest } from '@kbn/core/server';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { requestContextMock } from './request_context';
 import { responseMock as responseFactoryMock } from './response_factory';
 import { requestMock } from '.';
@@ -21,6 +17,7 @@ interface Route {
   config: RouteConfig<unknown, unknown, unknown, 'get' | 'post' | 'delete' | 'patch' | 'put'>;
   handler: RequestHandler;
 }
+
 const getRoute = (routerMock: MockServer['router']): Route => {
   const routeCalls = [
     ...routerMock.get.mock.calls,
@@ -45,7 +42,7 @@ class MockServer {
   constructor(
     public readonly router = httpServiceMock.createRouter(),
     private responseMock = responseFactoryMock.create(),
-    private contextMock = requestContextMock.create(),
+    private contextMock = requestContextMock.convertContext(requestContextMock.create()),
     private resultMock = buildResultMock()
   ) {}
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
index 50ec789266aa0..3a2afef665cf4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { isOutdated } from '../../migrations/helpers';
 import {
   ALIAS_VERSION_FIELD,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
index 5ff76179eeb03..d4ad4bb75e41b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
@@ -7,7 +7,7 @@
 
 import { chunk, get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   transformError,
   getBootstrapIndexExists,
@@ -47,11 +47,12 @@ export const createIndexRoute = (router: SecuritySolutionPluginRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const siemClient = context.securitySolution?.getAppClient();
+        const securitySolution = await context.securitySolution;
+        const siemClient = securitySolution?.getAppClient();
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
         }
-        await createDetectionIndex(context.securitySolution);
+        await createDetectionIndex(securitySolution);
         return response.ok({ body: { acknowledged: true } });
       } catch (err) {
         const error = transformError(err);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/delete_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/delete_index_route.ts
index 6eae3908e2156..ddaa497823604 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/delete_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/delete_index_route.ts
@@ -40,9 +40,9 @@ export const deleteIndexRoute = (router: SecuritySolutionPluginRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
+        const esClient = (await context.core).elasticsearch.client.asCurrentUser;
 
-        const siemClient = context.securitySolution?.getAppClient();
+        const siemClient = (await context.securitySolution)?.getAppClient();
 
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts
index 9d50de51c053c..ea9c36a4f8f41 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { readIndex } from '@kbn/securitysolution-es-utils';
-import { ElasticsearchClient } from '../../../../../../../../src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export const getIndexVersion = async (
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
index 3b1b27176ef88..c03f8e000d0f1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
@@ -6,11 +6,11 @@
  */
 
 import { transformError, getBootstrapIndexExists } from '@kbn/securitysolution-es-utils';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { DETECTION_ENGINE_INDEX_URL } from '../../../../../common/constants';
 
 import { buildSiemResponse } from '../utils';
-import { RuleDataPluginService } from '../../../../../../rule_registry/server';
 import { fieldAliasesOutdated } from './check_template_version';
 import { getIndexVersion } from './get_index_version';
 import { isOutdated } from '../../migrations/helpers';
@@ -32,19 +32,22 @@ export const readIndexRoute = (
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const siemClient = context.securitySolution?.getAppClient();
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
+        const core = await context.core;
+        const securitySolution = await context.securitySolution;
+
+        const siemClient = securitySolution?.getAppClient();
+        const esClient = core.elasticsearch.client.asCurrentUser;
 
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
         }
 
-        const spaceId = context.securitySolution.getSpaceId();
+        const spaceId = securitySolution.getSpaceId();
         const indexName = ruleDataService.getResourceName(`security.alerts-${spaceId}`);
 
         const index = siemClient.getSignalsIndex();
         const indexExists = await getBootstrapIndexExists(
-          context.core.elasticsearch.client.asInternalUser,
+          core.elasticsearch.client.asInternalUser,
           index
         );
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
index 2c2c65f5f78f7..002b4c2264eee 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
@@ -9,7 +9,7 @@ import { readPrivilegesRoute } from './read_privileges_route';
 import { serverMock, requestContextMock } from '../__mocks__';
 import { getPrivilegeRequest, getMockPrivilegesResult } from '../__mocks__/request_responses';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 describe('read_privileges route', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -30,7 +30,7 @@ describe('read_privileges route', () => {
     test('returns 200 when doing a normal request', async () => {
       const response = await server.inject(
         getPrivilegeRequest({ auth: { isAuthenticated: false } }),
-        context
+        requestContextMock.convertContext(context)
       );
       expect(response.status).toEqual(200);
     });
@@ -38,7 +38,7 @@ describe('read_privileges route', () => {
     test('returns the payload when doing a normal request', async () => {
       const response = await server.inject(
         getPrivilegeRequest({ auth: { isAuthenticated: false } }),
-        context
+        requestContextMock.convertContext(context)
       );
       const expectedBody = {
         ...getMockPrivilegesResult(),
@@ -58,7 +58,7 @@ describe('read_privileges route', () => {
 
       const response = await server.inject(
         getPrivilegeRequest({ auth: { isAuthenticated: true } }),
-        context
+        requestContextMock.convertContext(context)
       );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(expectedBody);
@@ -70,7 +70,7 @@ describe('read_privileges route', () => {
       );
       const response = await server.inject(
         getPrivilegeRequest({ auth: { isAuthenticated: false } }),
-        context
+        requestContextMock.convertContext(context)
       );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({ message: 'Test error', status_code: 500 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
index 22f8ccb39118a..31ea057facb69 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
@@ -28,15 +28,17 @@ export const readPrivilegesRoute = (
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
-        const siemClient = context.securitySolution?.getAppClient();
+        const core = await context.core;
+        const securitySolution = await context.securitySolution;
+        const esClient = core.elasticsearch.client.asCurrentUser;
+        const siemClient = securitySolution?.getAppClient();
 
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
         }
 
-        const spaceId = context.securitySolution.getSpaceId();
-        const index = context.securitySolution
+        const spaceId = securitySolution.getSpaceId();
+        const index = securitySolution
           .getRuleDataService()
           .getResourceName(`security.alerts-${spaceId}`);
         const clusterPrivileges = await readPrivileges(esClient, index);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
index 119f7a0b07db5..f80756ce353d6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -15,11 +15,11 @@ import {
 import { configMock, requestContextMock, serverMock } from '../__mocks__';
 import { AddPrepackagedRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/add_prepackaged_rules_schema';
 import { addPrepackedRulesRoute, createPrepackagedRules } from './add_prepackaged_rules_route';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { ExceptionListClient } from '../../../../../../lists/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { installPrepackagedTimelines } from '../../../timeline/routes/prepackaged_timelines/install_prepackaged_timelines';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 
 jest.mock('../../rules/get_prepackaged_rules', () => {
@@ -106,7 +106,7 @@ describe('add_prepackaged_rules_route', () => {
   describe('status codes', () => {
     test('returns 200', async () => {
       const request = addPrepackagedRulesRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
     });
@@ -116,7 +116,7 @@ describe('add_prepackaged_rules_route', () => {
     test('1 rule is installed and 0 are updated when find results are empty', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
       const request = addPrepackagedRulesRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -129,7 +129,7 @@ describe('add_prepackaged_rules_route', () => {
 
     test('1 rule is updated and 0 are installed when we return a single find and the versions are different', async () => {
       const request = addPrepackagedRulesRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -159,7 +159,7 @@ describe('add_prepackaged_rules_route', () => {
       ],
     });
     const request = addPrepackagedRulesRequest();
-    const response = await server.inject(request, context);
+    const response = await server.inject(request, requestContextMock.convertContext(context));
     expect(response.body).toEqual({
       rules_installed: 0,
       rules_updated: 1,
@@ -178,7 +178,7 @@ describe('add_prepackaged_rules_route', () => {
       errors: [],
     });
     const request = addPrepackagedRulesRequest();
-    const response = await server.inject(request, context);
+    const response = await server.inject(request, requestContextMock.convertContext(context));
     expect(response.body).toEqual({
       rules_installed: 0,
       rules_updated: 1,
@@ -197,7 +197,7 @@ describe('add_prepackaged_rules_route', () => {
       errors: [],
     });
     const request = addPrepackagedRulesRequest();
-    const response = await server.inject(request, context);
+    const response = await server.inject(request, requestContextMock.convertContext(context));
     expect(response.body).toEqual({
       rules_installed: 0,
       rules_updated: 1,
@@ -224,7 +224,7 @@ describe('add_prepackaged_rules_route', () => {
       ],
     });
     const request = addPrepackagedRulesRequest();
-    const response = await server.inject(request, context);
+    const response = await server.inject(request, requestContextMock.convertContext(context));
     expect(response.body).toEqual({
       rules_installed: 0,
       rules_updated: 1,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
index d5c6c0da2cec7..b6a6681aad9a1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -8,6 +8,8 @@
 import moment from 'moment';
 import { transformError, getIndexExists } from '@kbn/securitysolution-es-utils';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { RulesClient } from '@kbn/alerting-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import type {
   SecuritySolutionApiRequestHandlerContext,
   SecuritySolutionPluginRouter,
@@ -29,9 +31,7 @@ import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackage
 import { ruleAssetSavedObjectsClientFactory } from '../../rules/rule_asset/rule_asset_saved_objects_client';
 
 import { buildSiemResponse } from '../utils';
-import { RulesClient } from '../../../../../../alerting/server';
 
-import { ExceptionListClient } from '../../../../../../lists/server';
 import { installPrepackagedTimelines } from '../../../timeline/routes/prepackaged_timelines/install_prepackaged_timelines';
 
 export const addPrepackedRulesRoute = (router: SecuritySolutionPluginRouter) => {
@@ -54,10 +54,10 @@ export const addPrepackedRulesRoute = (router: SecuritySolutionPluginRouter) =>
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const rulesClient = context.alerting.getRulesClient();
+        const rulesClient = (await context.alerting).getRulesClient();
 
         const validated = await createPrepackagedRules(
-          context.securitySolution,
+          await context.securitySolution,
           rulesClient,
           undefined
         );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
index 1d63a977e2480..e3afd247b3321 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -21,9 +21,9 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { createRulesBulkRoute } from './create_rules_bulk_route';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -54,7 +54,10 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getReadBulkRequest(), context);
+      const response = await server.inject(
+        getReadBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
   });
@@ -67,7 +70,10 @@ describe.each([
           .mockResolvedValue({ valid: false, message: 'mocked validation message' }),
       });
 
-      const response = await server.inject(createBulkMlRuleRequest(), context);
+      const response = await server.inject(
+        createBulkMlRuleRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
         {
@@ -86,7 +92,10 @@ describe.each([
           getBasicNoShardsSearchResponse()
         )
       );
-      const response = await server.inject(getReadBulkRequest(), context);
+      const response = await server.inject(
+        getReadBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
 
@@ -106,7 +115,10 @@ describe.each([
 
     test('returns a duplicate error if rule_id already exists', async () => {
       clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled));
-      const response = await server.inject(getReadBulkRequest(), context);
+      const response = await server.inject(
+        getReadBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
@@ -123,7 +135,10 @@ describe.each([
       clients.rulesClient.create.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getReadBulkRequest(), context);
+      const response = await server.inject(
+        getReadBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
@@ -142,7 +157,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_CREATE,
         body: [getCreateRulesSchemaMock(), getCreateRulesSchemaMock()],
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
index 8a350e7e12f46..cbd5b755b5649 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -7,6 +7,7 @@
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import { getIndexExists } from '@kbn/securitysolution-es-utils';
+import { Logger } from '@kbn/core/server';
 import { createRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/create_rules_type_dependents';
 import { createRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/create_rules_bulk_schema';
 import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/response/rules_bulk_schema';
@@ -26,7 +27,6 @@ import { buildRouteValidation } from '../../../../utils/build_validation/route_v
 import { transformBulkError, createBulkErrorObject, buildSiemResponse } from '../utils';
 import { convertCreateAPIToInternalSchema } from '../../schemas/rule_converters';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
-import { Logger } from '../../../../../../../../src/core/server';
 
 /**
  * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
@@ -51,13 +51,16 @@ export const createRulesBulkRoute = (
       logDeprecatedBulkEndpoint(logger, DETECTION_ENGINE_RULES_BULK_CREATE);
 
       const siemResponse = buildSiemResponse(response);
-      const rulesClient = context.alerting.getRulesClient();
-      const esClient = context.core.elasticsearch.client;
-      const savedObjectsClient = context.core.savedObjects.client;
-      const siemClient = context.securitySolution.getAppClient();
+
+      const ctx = await context.resolve(['core', 'securitySolution', 'licensing', 'alerting']);
+
+      const rulesClient = ctx.alerting.getRulesClient();
+      const esClient = ctx.core.elasticsearch.client;
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const siemClient = ctx.securitySolution.getAppClient();
 
       const mlAuthz = buildMlAuthz({
-        license: context.licensing.license,
+        license: ctx.licensing.license,
         ml,
         request,
         savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
index 122ab20a3ed6b..836569a34b9ea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -22,8 +22,9 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { createRulesRoute } from './create_rules_route';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
+
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
 describe.each([
@@ -55,21 +56,30 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200 with a rule created via RulesClient', async () => {
-      const response = await server.inject(getCreateRequest(), context);
+      const response = await server.inject(
+        getCreateRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 if license is not platinum', async () => {
       (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false);
 
-      const response = await server.inject(getCreateRequest(), context);
+      const response = await server.inject(
+        getCreateRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
   });
 
   describe('creating an ML Rule', () => {
     test('is successful', async () => {
-      const response = await server.inject(createMlRuleRequest(), context);
+      const response = await server.inject(
+        createMlRuleRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -80,7 +90,10 @@ describe.each([
           .mockResolvedValue({ valid: false, message: 'mocked validation message' }),
       });
 
-      const response = await server.inject(createMlRuleRequest(), context);
+      const response = await server.inject(
+        createMlRuleRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(403);
       expect(response.body).toEqual({
         message: 'mocked validation message',
@@ -96,7 +109,10 @@ describe.each([
           getBasicNoShardsSearchResponse()
         )
       );
-      const response = await server.inject(getCreateRequest(), context);
+      const response = await server.inject(
+        getCreateRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(isRuleRegistryEnabled ? 200 : 400);
 
@@ -110,7 +126,10 @@ describe.each([
 
     test('returns a duplicate error if rule_id already exists', async () => {
       clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled));
-      const response = await server.inject(getCreateRequest(), context);
+      const response = await server.inject(
+        getCreateRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(409);
       expect(response.body).toEqual({
@@ -123,7 +142,10 @@ describe.each([
       clients.rulesClient.create.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getCreateRequest(), context);
+      const response = await server.inject(
+        getCreateRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts
index fe39c5cb9680e..aabcf9722fe90 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -46,11 +46,19 @@ export const createRulesRoute = (
       }
 
       try {
-        const rulesClient = context.alerting.getRulesClient();
-        const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-        const esClient = context.core.elasticsearch.client;
-        const savedObjectsClient = context.core.savedObjects.client;
-        const siemClient = context.securitySolution.getAppClient();
+        const ctx = await context.resolve([
+          'core',
+          'securitySolution',
+          'licensing',
+          'alerting',
+          'lists',
+        ]);
+
+        const rulesClient = ctx.alerting.getRulesClient();
+        const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+        const esClient = ctx.core.elasticsearch.client;
+        const savedObjectsClient = ctx.core.savedObjects.client;
+        const siemClient = ctx.securitySolution.getAppClient();
 
         if (request.body.rule_id != null) {
           const rule = await readRules({
@@ -74,7 +82,7 @@ export const createRulesRoute = (
         );
 
         const mlAuthz = buildMlAuthz({
-          license: context.licensing.license,
+          license: ctx.licensing.license,
           ml,
           request,
           savedObjectsClient,
@@ -93,7 +101,7 @@ export const createRulesRoute = (
         }
 
         // This will create the endpoint list if it does not exist yet
-        await context.lists?.getExceptionListClient().createEndpointList();
+        await ctx.lists?.getExceptionListClient().createEndpointList();
 
         const createdRule = await rulesClient.create({
           data: internalRule,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
index 9d46ebabb7c8a..98bdca2db0571 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
@@ -17,7 +17,7 @@ import {
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { deleteRulesBulkRoute } from './delete_rules_bulk_route';
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe.each([
   ['Legacy', false],
@@ -40,40 +40,61 @@ describe.each([
 
   describe('status codes with actionClient and alertClient', () => {
     test('returns 200 when deleting a single rule with a valid actionClient and alertClient by alertId', async () => {
-      const response = await server.inject(getDeleteBulkRequest(), context);
+      const response = await server.inject(
+        getDeleteBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 when deleting a single rule and related rule status', async () => {
-      const response = await server.inject(getDeleteBulkRequest(), context);
+      const response = await server.inject(
+        getDeleteBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 when deleting a single rule with a valid actionClient and alertClient by alertId using POST', async () => {
-      const response = await server.inject(getDeleteAsPostBulkRequest(), context);
+      const response = await server.inject(
+        getDeleteAsPostBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 when deleting a single rule with a valid actionClient and alertClient by id', async () => {
-      const response = await server.inject(getDeleteBulkRequestById(), context);
+      const response = await server.inject(
+        getDeleteBulkRequestById(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 when deleting a single rule with a valid actionClient and alertClient by id using POST', async () => {
-      const response = await server.inject(getDeleteAsPostBulkRequestById(), context);
+      const response = await server.inject(
+        getDeleteAsPostBulkRequestById(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(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 () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      const response = await server.inject(getDeleteBulkRequest(), context);
+      const response = await server.inject(
+        getDeleteBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 404 in the payload when deleting a single rule that does not exist with a valid actionClient and alertClient', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
 
-      const response = await server.inject(getDeleteBulkRequest(), context);
+      const response = await server.inject(
+        getDeleteBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(
         expect.arrayContaining([
@@ -93,7 +114,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_DELETE,
         body: [{}],
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
         {
@@ -109,7 +130,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_DELETE,
         body: [{ id: 'c1e1b359-7ac1-4e96-bc81-c683c092436f', rule_id: 'rule_1' }],
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
         {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
index cd3c219675ccb..09b0174bb24b5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
@@ -7,6 +7,7 @@
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 
+import type { RouteConfig, RequestHandler, Logger } from '@kbn/core/server';
 import { queryRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/query_rules_type_dependents';
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import {
@@ -14,7 +15,6 @@ import {
   QueryRulesBulkSchemaDecoded,
 } from '../../../../../common/detection_engine/schemas/request/query_rules_bulk_schema';
 import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/response/rules_bulk_schema';
-import type { RouteConfig, RequestHandler, Logger } from '../../../../../../../../src/core/server';
 import type {
   SecuritySolutionPluginRouter,
   SecuritySolutionRequestHandlerContext,
@@ -60,9 +60,12 @@ export const deleteRulesBulkRoute = (
     logDeprecatedBulkEndpoint(logger, DETECTION_ENGINE_RULES_BULK_DELETE);
 
     const siemResponse = buildSiemResponse(response);
-    const rulesClient = context.alerting.getRulesClient();
-    const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-    const savedObjectsClient = context.core.savedObjects.client;
+
+    const ctx = await context.resolve(['core', 'securitySolution', 'alerting']);
+
+    const rulesClient = ctx.alerting.getRulesClient();
+    const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+    const savedObjectsClient = ctx.core.savedObjects.client;
 
     const rules = await Promise.all(
       request.body.map(async (payloadRule) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
index b18e330eab5a4..85d7939ba359d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
@@ -37,7 +37,10 @@ describe.each([
 
   describe('status codes with actionClient and alertClient', () => {
     test('returns 200 when deleting a single rule with a valid actionClient and alertClient by alertId', async () => {
-      const response = await server.inject(getDeleteRequest(), context);
+      const response = await server.inject(
+        getDeleteRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
     });
@@ -46,14 +49,20 @@ describe.each([
       clients.rulesClient.resolve.mockResolvedValue(
         resolveAlertMock(isRuleRegistryEnabled, getQueryRuleParams())
       );
-      const response = await server.inject(getDeleteRequestById(), context);
+      const response = await server.inject(
+        getDeleteRequestById(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
     });
 
     test('returns 404 when deleting a single rule that does not exist with a valid actionClient and alertClient', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      const response = await server.inject(getDeleteRequest(), context);
+      const response = await server.inject(
+        getDeleteRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({
@@ -66,7 +75,10 @@ describe.each([
       clients.rulesClient.delete.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getDeleteRequest(), context);
+      const response = await server.inject(
+        getDeleteRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -82,7 +94,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_URL,
         query: {},
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(400);
       expect(response.body).toEqual({
         message: ['either "id" or "rule_id" must be set'],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.ts
index 5e2382cfe640a..ae241a1f8f62b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.ts
@@ -47,9 +47,10 @@ export const deleteRulesRoute = (
       try {
         const { id, rule_id: ruleId } = request.query;
 
-        const rulesClient = context.alerting.getRulesClient();
-        const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-        const savedObjectsClient = context.core.savedObjects.client;
+        const ctx = await context.resolve(['core', 'securitySolution', 'alerting']);
+        const rulesClient = ctx.alerting.getRulesClient();
+        const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+        const savedObjectsClient = ctx.core.savedObjects.client;
 
         const rule = await readRules({ isRuleRegistryEnabled, rulesClient, id, ruleId });
         const migratedRule = await legacyMigrate({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts
index 84b37cd023036..22ca1f84d47c2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   exportRulesQuerySchema,
   ExportRulesQuerySchemaDecoded,
@@ -45,9 +45,9 @@ export const exportRulesRoute = (
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
-      const rulesClient = context.alerting.getRulesClient();
-      const exceptionsClient = context.lists?.getExceptionListClient();
-      const savedObjectsClient = context.core.savedObjects.client;
+      const rulesClient = (await context.alerting).getRulesClient();
+      const exceptionsClient = (await context.lists)?.getExceptionListClient();
+      const savedObjectsClient = (await context.core).savedObjects.client;
 
       try {
         const exportSizeLimit = config.maxRuleImportExportSize;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
index 176a642a8d163..bc143bf1c3943 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 import { requestContextMock, requestMock, serverMock } from '../__mocks__';
@@ -45,7 +45,10 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getFindRequest(), context);
+      const response = await server.inject(
+        getFindRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -53,7 +56,10 @@ describe.each([
       clients.rulesClient.find.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getFindRequest(), context);
+      const response = await server.inject(
+        getFindRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts
index 97ab879df1240..8927cb018fecb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { findRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/find_rules_type_dependents';
 import {
   findRulesSchema,
@@ -49,9 +49,10 @@ export const findRulesRoute = (
 
       try {
         const { query } = request;
-        const rulesClient = context.alerting.getRulesClient();
-        const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-        const savedObjectsClient = context.core.savedObjects.client;
+        const ctx = await context.resolve(['core', 'securitySolution', 'alerting']);
+        const rulesClient = ctx.alerting.getRulesClient();
+        const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+        const savedObjectsClient = ctx.core.savedObjects.client;
 
         const rules = await findRules({
           isRuleRegistryEnabled,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
index 3d3d80284aaac..d3db8e598f279 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
@@ -13,7 +13,7 @@ import {
   getPrepackagedRulesStatusRequest,
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, createMockConfig } from '../__mocks__';
-import { SecurityPluginSetup } from '../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { checkTimelinesStatus } from '../../../timeline/utils/check_timelines_status';
 import {
   mockCheckTimelinesStatusBeforeInstallResult,
@@ -95,7 +95,10 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getPrepackagedRulesStatusRequest(), context);
+      const response = await server.inject(
+        getPrepackagedRulesStatusRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -103,7 +106,10 @@ describe.each([
       clients.rulesClient.find.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getPrepackagedRulesStatusRequest(), context);
+      const response = await server.inject(
+        getPrepackagedRulesStatusRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -116,7 +122,7 @@ describe.each([
     test('0 rules installed, 0 custom rules, 1 rules not installed, and 1 rule not updated', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
       const request = getPrepackagedRulesStatusRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -133,7 +139,7 @@ describe.each([
     test('1 rule installed, 1 custom rules, 0 rules not installed, and 1 rule to not updated', async () => {
       clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled));
       const request = getPrepackagedRulesStatusRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -153,7 +159,7 @@ describe.each([
         mockCheckTimelinesStatusBeforeInstallResult
       );
       const request = getPrepackagedRulesStatusRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -173,7 +179,7 @@ describe.each([
         mockCheckTimelinesStatusAfterInstallResult
       );
       const request = getPrepackagedRulesStatusRequest();
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
index 4fcf1bd992c6a..98464c4c6850b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
@@ -45,8 +45,9 @@ export const getPrepackagedRulesStatusRoute = (
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
-      const savedObjectsClient = context.core.savedObjects.client;
-      const rulesClient = context.alerting.getRulesClient();
+      const ctx = await context.resolve(['core', 'alerting']);
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const rulesClient = ctx.alerting.getRulesClient();
       const ruleAssetsClient = ruleAssetSavedObjectsClientFactory(savedObjectsClient);
 
       try {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.test.ts
index b24789d77a9bb..37b1f41328674 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.test.ts
@@ -30,7 +30,10 @@ describe('getRuleExecutionEventsRoute', () => {
       const executionEvents = getAggregateExecutionEvents();
       clients.ruleExecutionLog.getAggregateExecutionEvents.mockResolvedValue(executionEvents);
 
-      const response = await server.inject(getRuleExecutionEventsRequest(), context);
+      const response = await server.inject(
+        getRuleExecutionEventsRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(executionEvents);
@@ -41,7 +44,10 @@ describe('getRuleExecutionEventsRoute', () => {
     it('returns 500 response with it', async () => {
       clients.ruleExecutionLog.getAggregateExecutionEvents.mockRejectedValue(new Error('Boom!'));
 
-      const response = await server.inject(getRuleExecutionEventsRequest(), context);
+      const response = await server.inject(
+        getRuleExecutionEventsRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.ts
index 76088cd07b80e..6bd6610c9c912 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_rule_execution_events_route.ts
@@ -48,7 +48,7 @@ export const getRuleExecutionEventsRoute = (router: SecuritySolutionPluginRouter
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const executionLog = context.securitySolution.getRuleExecutionLog();
+        const executionLog = (await context.securitySolution).getRuleExecutionLog();
         const { events, total } = await executionLog.getAggregateExecutionEvents({
           ruleId,
           start,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
index a54b373250657..4f3113f443eb2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -26,7 +26,7 @@ import {
   rulesToNdJsonString,
 } from '../../../../../common/detection_engine/schemas/request/import_rules_schema.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
@@ -62,7 +62,7 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200 when importing a single rule with a valid actionClient and alertClient', async () => {
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
     });
@@ -70,7 +70,10 @@ describe.each([
     test('returns 500 if more than 10,000 rules are imported', async () => {
       const ruleIds = new Array(10001).fill(undefined).map((__, index) => `rule-${index}`);
       const multiRequest = getImportRulesRequest(buildHapiStream(ruleIdsToNdJsonString(ruleIds)));
-      const response = await server.inject(multiRequest, context);
+      const response = await server.inject(
+        multiRequest,
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -88,7 +91,7 @@ describe.each([
           .mockResolvedValue({ valid: false, message: 'mocked validation message' }),
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
         errors: [
@@ -114,7 +117,7 @@ describe.each([
         .mockImplementation(() => {
           throw new Error('Test error');
         });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({ message: 'Test error', status_code: 500 });
 
@@ -128,7 +131,7 @@ describe.each([
           getBasicNoShardsSearchResponse()
         )
       );
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(isRuleRegistryEnabled ? 200 : 400);
       if (!isRuleRegistryEnabled) {
         expect(response.body).toEqual({
@@ -146,7 +149,7 @@ describe.each([
         })
       );
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -157,7 +160,7 @@ describe.each([
     test('returns 400 if file extension type is not .ndjson', async () => {
       const requestPayload = buildHapiStream(ruleIdsToNdJsonString(['rule-1']), 'wrong.html');
       const badRequest = getImportRulesRequest(requestPayload);
-      const response = await server.inject(badRequest, context);
+      const response = await server.inject(badRequest, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(400);
       expect(response.body).toEqual({ message: 'Invalid file extension .html', status_code: 400 });
@@ -169,7 +172,7 @@ describe.each([
       clients.rulesClient.create.mockResolvedValue(
         getAlertMock(isRuleRegistryEnabled, getQueryRuleParams())
       );
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
         errors: [],
@@ -184,7 +187,7 @@ describe.each([
     test('returns reported conflict if error parsing rule', async () => {
       const requestPayload = buildHapiStream('this is not a valid ndjson string!');
       const badRequest = getImportRulesRequest(requestPayload);
-      const response = await server.inject(badRequest, context);
+      const response = await server.inject(badRequest, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -210,7 +213,7 @@ describe.each([
         clients.rulesClient.find.mockResolvedValue(
           getFindResultWithSingleHit(isRuleRegistryEnabled)
         ); // extant rule
-        const response = await server.inject(request, context);
+        const response = await server.inject(request, requestContextMock.convertContext(context));
 
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
@@ -238,7 +241,10 @@ describe.each([
         const overwriteRequest = getImportRulesRequestOverwriteTrue(
           buildHapiStream(ruleIdsToNdJsonString(['rule-1']))
         );
-        const response = await server.inject(overwriteRequest, context);
+        const response = await server.inject(
+          overwriteRequest,
+          requestContextMock.convertContext(context)
+        );
 
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
@@ -258,7 +264,10 @@ describe.each([
       const multiRequest = getImportRulesRequest(
         buildHapiStream(ruleIdsToNdJsonString(['rule-1', 'rule-2']))
       );
-      const response = await server.inject(multiRequest, context);
+      const response = await server.inject(
+        multiRequest,
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -274,7 +283,10 @@ describe.each([
     test('returns 200 if many rules are imported successfully', async () => {
       const ruleIds = new Array(9999).fill(undefined).map((__, index) => `rule-${index}`);
       const multiRequest = getImportRulesRequest(buildHapiStream(ruleIdsToNdJsonString(ruleIds)));
-      const response = await server.inject(multiRequest, context);
+      const response = await server.inject(
+        multiRequest,
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -298,7 +310,7 @@ describe.each([
       const badPayload = buildHapiStream(rulesToNdJsonString(rulesWithoutRuleIds));
       const badRequest = getImportRulesRequest(badPayload);
 
-      const response = await server.inject(badRequest, context);
+      const response = await server.inject(badRequest, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
@@ -331,7 +343,10 @@ describe.each([
         const multiRequest = getImportRulesRequest(
           buildHapiStream(ruleIdsToNdJsonString(['rule-1', 'rule-1']))
         );
-        const response = await server.inject(multiRequest, context);
+        const response = await server.inject(
+          multiRequest,
+          requestContextMock.convertContext(context)
+        );
 
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
@@ -357,7 +372,10 @@ describe.each([
           buildHapiStream(ruleIdsToNdJsonString(['rule-1', 'rule-1']))
         );
 
-        const response = await server.inject(multiRequest, context);
+        const response = await server.inject(
+          multiRequest,
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
           errors: [],
@@ -381,7 +399,10 @@ describe.each([
         const multiRequest = getImportRulesRequest(
           buildHapiStream(ruleIdsToNdJsonString(['rule-1', 'rule-2', 'rule-3']))
         );
-        const response = await server.inject(multiRequest, context);
+        const response = await server.inject(
+          multiRequest,
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
           errors: [
@@ -405,7 +426,10 @@ describe.each([
         const multiRequest = getImportRulesRequestOverwriteTrue(
           buildHapiStream(ruleIdsToNdJsonString(['rule-1', 'rule-2', 'rule-3']))
         );
-        const response = await server.inject(multiRequest, context);
+        const response = await server.inject(
+          multiRequest,
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
           errors: [],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
index b0f09a8c76d3c..6eabed2f9dd3a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -76,18 +76,27 @@ export const importRulesRoute = (
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const rulesClient = context.alerting.getRulesClient();
-        const actionsClient = context.actions.getActionsClient();
-        const esClient = context.core.elasticsearch.client;
-        const actionSOClient = context.core.savedObjects.getClient({
+        const ctx = await context.resolve([
+          'core',
+          'securitySolution',
+          'alerting',
+          'actions',
+          'lists',
+          'licensing',
+        ]);
+
+        const rulesClient = ctx.alerting.getRulesClient();
+        const actionsClient = ctx.actions.getActionsClient();
+        const esClient = ctx.core.elasticsearch.client;
+        const actionSOClient = ctx.core.savedObjects.getClient({
           includedHiddenTypes: ['action'],
         });
-        const savedObjectsClient = context.core.savedObjects.client;
-        const siemClient = context.securitySolution.getAppClient();
-        const exceptionsClient = context.lists?.getExceptionListClient();
+        const savedObjectsClient = ctx.core.savedObjects.client;
+        const siemClient = ctx.securitySolution.getAppClient();
+        const exceptionsClient = ctx.lists?.getExceptionListClient();
 
         const mlAuthz = buildMlAuthz({
-          license: context.licensing.license,
+          license: ctx.licensing.license,
           ml,
           request,
           savedObjectsClient,
@@ -172,7 +181,7 @@ export const importRulesRoute = (
           savedObjectsClient,
           exceptionsClient,
           isRuleRegistryEnabled,
-          spaceId: context.securitySolution.getSpaceId(),
+          spaceId: ctx.securitySolution.getSpaceId(),
           signalsIndex,
           existingLists: foundReferencedExceptionLists,
         });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts
index 5908a9dc6e0f8..6b6e65329c06f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 // eslint-disable-next-line no-restricted-imports
@@ -56,8 +56,8 @@ export const legacyCreateLegacyNotificationRoute = (
       },
     },
     async (context, request, response) => {
-      const rulesClient = context.alerting.getRulesClient();
-      const savedObjectsClient = context.core.savedObjects.client;
+      const rulesClient = (await context.alerting).getRulesClient();
+      const savedObjectsClient = (await context.core).savedObjects.client;
       const { alert_id: ruleAlertId } = request.query;
       const { actions, interval, name } = request.body;
       try {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
index 9539ad2cb9c7b..f09763f8dec10 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
@@ -22,7 +22,7 @@ import { serverMock, requestContextMock, requestMock } from '../__mocks__';
 import { patchRulesBulkRoute } from './patch_rules_bulk_route';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -50,13 +50,19 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getPatchBulkRequest(), context);
+      const response = await server.inject(
+        getPatchBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns an error in the response when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      const response = await server.inject(getPatchBulkRequest(), context);
+      const response = await server.inject(
+        getPatchBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
         {
@@ -79,7 +85,7 @@ describe.each([
           },
         ],
       });
-      await server.inject(request, context);
+      await server.inject(request, requestContextMock.convertContext(context));
 
       expect(clients.rulesClient.update).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -104,7 +110,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [typicalMlRulePayload()],
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
@@ -130,7 +136,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [payloadWithoutType],
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
@@ -152,7 +158,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), rule_id: undefined }],
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
index aedb78a248c34..7e103d13635a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
@@ -6,6 +6,7 @@
  */
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { Logger } from '@kbn/core/server';
 import { RuleAlertAction } from '../../../../../common/detection_engine/types';
 import {
   patchRulesBulkSchema,
@@ -26,7 +27,6 @@ import { readRules } from '../../rules/read_rules';
 import { PartialFilter } from '../../types';
 import { legacyMigrate } from '../../rules/utils';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
-import { Logger } from '../../../../../../../../src/core/server';
 
 /**
  * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
@@ -54,12 +54,14 @@ export const patchRulesBulkRoute = (
 
       const siemResponse = buildSiemResponse(response);
 
-      const rulesClient = context.alerting.getRulesClient();
-      const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-      const savedObjectsClient = context.core.savedObjects.client;
+      const ctx = await context.resolve(['core', 'securitySolution', 'alerting', 'licensing']);
+
+      const rulesClient = ctx.alerting.getRulesClient();
+      const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+      const savedObjectsClient = ctx.core.savedObjects.client;
 
       const mlAuthz = buildMlAuthz({
-        license: context.licensing.license,
+        license: ctx.licensing.license,
         ml,
         request,
         savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
index 51bced3480f28..f8f6e39171430 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
@@ -53,13 +53,19 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getPatchRequest(), context);
+      const response = await server.inject(
+        getPatchRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 404 when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      const response = await server.inject(getPatchRequest(), context);
+      const response = await server.inject(
+        getPatchRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({
         message: 'rule_id: "rule-1" not found',
@@ -69,7 +75,10 @@ describe.each([
 
     test('returns error if requesting a non-rule', async () => {
       clients.rulesClient.find.mockResolvedValue(nonRuleFindResult(isRuleRegistryEnabled));
-      const response = await server.inject(getPatchRequest(), context);
+      const response = await server.inject(
+        getPatchRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({
         message: expect.stringContaining('not found'),
@@ -81,7 +90,10 @@ describe.each([
       clients.rulesClient.update.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getPatchRequest(), context);
+      const response = await server.inject(
+        getPatchRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -100,7 +112,7 @@ describe.each([
           machine_learning_job_id: 'some_job_id',
         },
       });
-      await server.inject(request, context);
+      await server.inject(request, requestContextMock.convertContext(context));
 
       expect(clients.rulesClient.update).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -125,7 +137,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_URL,
         body: typicalMlRulePayload(),
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(403);
       expect(response.body).toEqual({
@@ -146,7 +158,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_URL,
         body: payloadWithoutType,
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(403);
       expect(response.body).toEqual({
@@ -163,7 +175,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_URL,
         body: { ...getPatchRulesSchemaMock(), rule_id: undefined },
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         message: ['either "id" or "rule_id" must be set'],
         status_code: 400,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts
index a5bc76cc5ef2e..6516d612de3b7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts
@@ -106,12 +106,12 @@ export const patchRulesRoute = (
         const actions: RuleAlertAction[] = actionsRest as RuleAlertAction[];
         const filters: PartialFilter[] | undefined = filtersRest as PartialFilter[];
 
-        const rulesClient = context.alerting.getRulesClient();
-        const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-        const savedObjectsClient = context.core.savedObjects.client;
+        const rulesClient = (await context.alerting).getRulesClient();
+        const ruleExecutionLog = (await context.securitySolution).getRuleExecutionLog();
+        const savedObjectsClient = (await context.core).savedObjects.client;
 
         const mlAuthz = buildMlAuthz({
-          license: context.licensing.license,
+          license: (await context.licensing).license,
           ml,
           request,
           savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
index ecf925bda97e5..b250af78968a8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
@@ -21,7 +21,7 @@ import {
   getPerformBulkActionSchemaMock,
   getPerformBulkActionEditSchemaMock,
 } from '../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { readRules } from '../../rules/read_rules';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
@@ -49,7 +49,10 @@ describe.each([
 
   describe('status codes', () => {
     it('returns 200 when performing bulk action with all dependencies present', async () => {
-      const response = await server.inject(getBulkActionRequest(), context);
+      const response = await server.inject(
+        getBulkActionRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
         success: true,
@@ -67,7 +70,10 @@ describe.each([
 
     it("returns 200 when provided filter query doesn't match any rules", async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      const response = await server.inject(getBulkActionRequest(), context);
+      const response = await server.inject(
+        getBulkActionRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({
         success: true,
@@ -87,7 +93,10 @@ describe.each([
       clients.rulesClient.find.mockResolvedValue(
         getFindResultWithMultiHits({ data: [], total: Infinity })
       );
-      const response = await server.inject(getBulkActionRequest(), context);
+      const response = await server.inject(
+        getBulkActionRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(400);
       expect(response.body).toEqual({
         message: 'More than 10000 rules matched the filter query. Try to narrow it down.',
@@ -105,7 +114,10 @@ describe.each([
         })
       );
 
-      const response = await server.inject(getBulkActionEditRequest(), context);
+      const response = await server.inject(
+        getBulkActionEditRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -138,7 +150,10 @@ describe.each([
       clients.rulesClient.disable.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getBulkActionRequest(), context);
+      const response = await server.inject(
+        getBulkActionRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Bulk edit failed',
@@ -172,7 +187,10 @@ describe.each([
           .fn()
           .mockResolvedValue({ valid: false, message: 'mocked validation message' }),
       });
-      const response = await server.inject(getBulkActionRequest(), context);
+      const response = await server.inject(
+        getBulkActionRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -222,7 +240,7 @@ describe.each([
         },
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -273,7 +291,7 @@ describe.each([
         },
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -325,7 +343,10 @@ describe.each([
           .mockImplementationOnce(() => ({ valid: true }))
           .mockImplementationOnce(() => ({ valid: true })),
       });
-      const response = await server.inject(getBulkActionEditRequest(), context);
+      const response = await server.inject(
+        getBulkActionEditRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -372,7 +393,10 @@ describe.each([
       clients.rulesClient.disable.mockImplementation(async () => {
         throw new Error('a'.repeat(1_300));
       });
-      const response = await server.inject(getBulkActionRequest(), context);
+      const response = await server.inject(
+        getBulkActionRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body.attributes.errors[0].message.length).toEqual(1000);
     });
@@ -392,7 +416,7 @@ describe.each([
         },
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
@@ -489,7 +513,7 @@ describe.each([
         },
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(400);
       expect(response.body.message).toEqual('More than 100 ids sent for bulk edit action.');
@@ -506,7 +530,7 @@ describe.each([
         },
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(400);
       expect(response.body.message).toEqual(
@@ -524,7 +548,10 @@ describe.each([
       })
     );
 
-    const response = await server.inject(getBulkActionEditRequest(), context);
+    const response = await server.inject(
+      getBulkActionEditRequest(),
+      requestContextMock.convertContext(context)
+    );
 
     expect(response.status).toEqual(200);
     expect(response.body).toEqual(
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
index 94294192531f8..b9009fd14a8ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
@@ -8,14 +8,13 @@
 import { truncate } from 'lodash';
 import moment from 'moment';
 import { BadRequestError, transformError } from '@kbn/securitysolution-es-utils';
-import { KibanaResponseFactory, Logger } from 'src/core/server';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { KibanaResponseFactory, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { RuleAlertType } from '../../rules/types';
 
-import type { RulesClient } from '../../../../../../alerting/server';
-import { SanitizedRule } from '../../../../../../alerting/common';
-
 import {
   DETECTION_ENGINE_RULES_BULK_ACTION,
   MAX_RULES_TO_UPDATE_IN_PARALLEL,
@@ -38,11 +37,10 @@ import { deleteRules } from '../../rules/delete_rules';
 import { duplicateRule } from '../../rules/duplicate_rule';
 import { findRules } from '../../rules/find_rules';
 import { readRules } from '../../rules/read_rules';
-import { patchRules } from '../../rules/patch_rules';
+import { editRule } from '../../rules/edit_rule';
 import { applyBulkActionEditToRule } from '../../rules/bulk_action_edit';
 import { getExportByObjectIds } from '../../rules/get_export_by_object_ids';
 import { buildSiemResponse } from '../utils';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { internalRuleToAPIResponse } from '../../schemas/rule_converters';
 import { legacyMigrate } from '../../rules/utils';
 import { RuleParams } from '../../schemas/rule_schemas';
@@ -272,13 +270,21 @@ export const performBulkActionRoute = (
       request.events.completed$.subscribe(() => abortController.abort());
 
       try {
-        const rulesClient = context.alerting.getRulesClient();
-        const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-        const exceptionsClient = context.lists?.getExceptionListClient();
-        const savedObjectsClient = context.core.savedObjects.client;
+        const ctx = await context.resolve([
+          'core',
+          'securitySolution',
+          'alerting',
+          'licensing',
+          'lists',
+        ]);
+
+        const rulesClient = ctx.alerting.getRulesClient();
+        const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+        const exceptionsClient = ctx.lists?.getExceptionListClient();
+        const savedObjectsClient = ctx.core.savedObjects.client;
 
         const mlAuthz = buildMlAuthz({
-          license: context.licensing.license,
+          license: ctx.licensing.license,
           ml,
           request,
           savedObjectsClient,
@@ -424,24 +430,18 @@ export const performBulkActionRoute = (
                   rule,
                 });
 
-                const editedRule = body[BulkAction.edit].reduce(
-                  (acc, action) => applyBulkActionEditToRule(acc, action),
-                  migratedRule
-                );
-
-                const { tags, params: { timelineTitle, timelineId } = {} } = editedRule;
-                const index = 'index' in editedRule.params ? editedRule.params.index : undefined;
-
-                await patchRules({
+                const updatedRule = await editRule({
                   rulesClient,
                   rule: migratedRule,
-                  tags,
-                  index,
-                  timelineTitle,
-                  timelineId,
+                  edit: (ruleToEdit) => {
+                    return body[BulkAction.edit].reduce(
+                      (acc, action) => applyBulkActionEditToRule(acc, action),
+                      ruleToEdit
+                    );
+                  },
                 });
 
-                return editedRule;
+                return updatedRule;
               },
               abortSignal: abortController.signal,
             });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts
index 5e7e0504c99ed..587be0bfe9b08 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts
@@ -7,8 +7,17 @@
 import moment from 'moment';
 import uuid from 'uuid';
 import { transformError } from '@kbn/securitysolution-es-utils';
-import type { StartServicesAccessor } from 'kibana/server';
-import { IRuleDataClient } from '../../../../../../rule_registry/server';
+import type { StartServicesAccessor } from '@kbn/core/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import {
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleTypeState,
+  parseDuration,
+} from '@kbn/alerting-plugin/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ExecutorType } from '@kbn/alerting-plugin/server/types';
+import { Alert } from '@kbn/alerting-plugin/server';
 import type { StartPlugins } from '../../../../plugin';
 import { buildSiemResponse } from '../utils';
 import { convertCreateAPIToInternalSchema } from '../../schemas/rule_converters';
@@ -21,7 +30,10 @@ import { buildRouteValidation } from '../../../../utils/build_validation/route_v
 import { SetupPlugins } from '../../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { createRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/create_rules_type_dependents';
-import { DETECTION_ENGINE_RULES_PREVIEW } from '../../../../../common/constants';
+import {
+  DEFAULT_PREVIEW_INDEX,
+  DETECTION_ENGINE_RULES_PREVIEW,
+} from '../../../../../common/constants';
 import { wrapScopedClusterClient } from './utils/wrap_scoped_cluster_client';
 import {
   previewRulesSchema,
@@ -29,15 +41,6 @@ import {
 } from '../../../../../common/detection_engine/schemas/request';
 import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common';
 
-import {
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleTypeState,
-  parseDuration,
-} from '../../../../../../alerting/common';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExecutorType } from '../../../../../../alerting/server/types';
-import { Alert } from '../../../../../../alerting/server';
 import { ConfigType } from '../../../../config';
 import { alertInstanceFactoryStub } from '../../signals/preview/alert_instance_factory_stub';
 import { CreateRuleOptions, CreateSecurityRuleTypeWrapperProps } from '../../rule_types/types';
@@ -77,14 +80,15 @@ export const previewRulesRoute = async (
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
       const validationErrors = createRuleValidateTypeDependents(request.body);
+      const coreContext = await context.core;
       if (validationErrors.length) {
         return siemResponse.error({ statusCode: 400, body: validationErrors });
       }
       try {
-        const [, { data }] = await getStartServices();
+        const [, { data, security: securityService }] = await getStartServices();
         const searchSourceClient = data.search.searchSource.asScoped(request);
-        const savedObjectsClient = context.core.savedObjects.client;
-        const siemClient = context.securitySolution.getAppClient();
+        const savedObjectsClient = coreContext.savedObjects.client;
+        const siemClient = (await context.securitySolution).getAppClient();
 
         let invocationCount = request.body.invocationCount;
         if (
@@ -104,13 +108,15 @@ export const previewRulesRoute = async (
         const previewRuleParams = internalRule.params;
 
         const mlAuthz = buildMlAuthz({
-          license: context.licensing.license,
+          license: (await context.licensing).license,
           ml,
           request,
           savedObjectsClient,
         });
         throwAuthzError(await mlAuthz.validateRuleType(internalRule.params.type));
-        await context.lists?.getExceptionListClient().createEndpointList();
+
+        const listsContext = await context.lists;
+        await listsContext?.getExceptionListClient().createEndpointList();
 
         const spaceId = siemClient.getSpaceId();
         const previewId = uuid.v4();
@@ -121,6 +127,34 @@ export const previewRulesRoute = async (
         const logs: RulePreviewLogs[] = [];
         let isAborted = false;
 
+        const { hasAllRequested } = await securityService.authz
+          .checkPrivilegesWithRequest(request)
+          .atSpace(spaceId, {
+            elasticsearch: {
+              index: {
+                [`${DEFAULT_PREVIEW_INDEX}`]: ['read'],
+                [`.internal${DEFAULT_PREVIEW_INDEX}-`]: ['read'],
+              },
+              cluster: [],
+            },
+          });
+
+        if (!hasAllRequested) {
+          return response.ok({
+            body: {
+              logs: [
+                {
+                  errors: [
+                    'Missing "read" privileges for the ".preview.alerts-security.alerts" or ".internal.preview.alerts-security.alerts" indices. Without these privileges you cannot use the Rule Preview feature.',
+                  ],
+                  warnings: [],
+                  duration: 0,
+                },
+              ],
+            },
+          });
+        }
+
         const previewRuleTypeWrapper = createSecurityRuleTypeWrapper({
           ...securityRuleTypeOptions,
           ruleDataClient: previewRuleDataClient,
@@ -203,13 +237,13 @@ export const previewRulesRoute = async (
                 shouldWriteAlerts,
                 shouldStopExecution: () => false,
                 alertFactory,
-                savedObjectsClient: context.core.savedObjects.client,
+                savedObjectsClient: coreContext.savedObjects.client,
                 scopedClusterClient: wrapScopedClusterClient({
                   abortController,
-                  scopedClusterClient: context.core.elasticsearch.client,
+                  scopedClusterClient: coreContext.elasticsearch.client,
                 }),
                 searchSourceClient,
-                uiSettingsClient: context.core.uiSettings.client,
+                uiSettingsClient: coreContext.uiSettings.client,
               },
               spaceId,
               startedAt: startedAt.toDate(),
@@ -308,7 +342,7 @@ export const previewRulesRoute = async (
         }
 
         // Refreshes alias to ensure index is able to be read before returning
-        await context.core.elasticsearch.client.asInternalUser.indices.refresh(
+        await coreContext.elasticsearch.client.asInternalUser.indices.refresh(
           {
             index: previewRuleDataClient.indexNameWithNamespace(spaceId),
           },
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
index 7237f8f9f22fb..dc5cbec2e26df 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { readRulesRoute } from './read_rules_route';
@@ -53,12 +53,18 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getReadRequest(), context);
+      const response = await server.inject(
+        getReadRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 when reading a single rule outcome === exactMatch', async () => {
-      const response = await server.inject(getReadRequestWithId(myFakeId), context);
+      const response = await server.inject(
+        getReadRequestWithId(myFakeId),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -70,7 +76,10 @@ describe.each([
         id: myFakeId,
         outcome: 'aliasMatch',
       });
-      const response = await server.inject(getReadRequestWithId(myFakeId), context);
+      const response = await server.inject(
+        getReadRequestWithId(myFakeId),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -83,14 +92,20 @@ describe.each([
         outcome: 'conflict',
         alias_target_id: 'myaliastargetid',
       });
-      const response = await server.inject(getReadRequestWithId(myFakeId), context);
+      const response = await server.inject(
+        getReadRequestWithId(myFakeId),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body.alias_target_id).toEqual('myaliastargetid');
     });
 
     test('returns error if requesting a non-rule', async () => {
       clients.rulesClient.find.mockResolvedValue(nonRuleFindResult(isRuleRegistryEnabled));
-      const response = await server.inject(getReadRequest(), context);
+      const response = await server.inject(
+        getReadRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({
         message: 'rule_id: "rule-1" not found',
@@ -102,7 +117,10 @@ describe.each([
       clients.rulesClient.find.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getReadRequest(), context);
+      const response = await server.inject(
+        getReadRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -119,7 +137,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_URL,
         query: { rule_id: 'DNE_RULE' },
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'rule_id: "DNE_RULE" not found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts
index 006217028fb87..0b3852c298329 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { queryRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/query_rules_type_dependents';
 import {
   queryRulesSchema,
@@ -49,9 +49,9 @@ export const readRulesRoute = (
       const { id, rule_id: ruleId } = request.query;
 
       try {
-        const rulesClient = context.alerting.getRulesClient();
-        const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-        const savedObjectsClient = context.core.savedObjects.client;
+        const rulesClient = (await context.alerting).getRulesClient();
+        const ruleExecutionLog = (await context.securitySolution).getRuleExecutionLog();
+        const savedObjectsClient = (await context.core).savedObjects.client;
 
         const rule = await readRules({
           id,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
index 12b7968b9793a..a1342d86a328d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
@@ -20,7 +20,7 @@ import { updateRulesBulkRoute } from './update_rules_bulk_route';
 import { BulkError } from '../utils';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -50,7 +50,10 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getUpdateBulkRequest(), context);
+      const response = await server.inject(
+        getUpdateBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -62,7 +65,10 @@ describe.each([
           rule_id: 'rule-1',
         },
       ];
-      const response = await server.inject(getUpdateBulkRequest(), context);
+      const response = await server.inject(
+        getUpdateBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(expected);
@@ -79,7 +85,10 @@ describe.each([
           rule_id: 'rule-1',
         },
       ];
-      const response = await server.inject(getUpdateBulkRequest(), context);
+      const response = await server.inject(
+        getUpdateBulkRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
       expect(response.body).toEqual(expected);
     });
@@ -96,7 +105,7 @@ describe.each([
         body: [typicalMlRulePayload()],
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
       expect(response.body).toEqual([
         {
@@ -117,7 +126,7 @@ describe.each([
         path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), rule_id: undefined }],
       });
-      const response = await server.inject(noIdRequest, context);
+      const response = await server.inject(noIdRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual([
         {
           error: { message: 'either "id" or "rule_id" must be set', status_code: 400 },
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
index 646fab5077dec..b476a4c8b350d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -6,6 +6,7 @@
  */
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { Logger } from '@kbn/core/server';
 import { updateRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/update_rules_type_dependents';
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import { updateRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/update_rules_bulk_schema';
@@ -22,7 +23,6 @@ import { updateRules } from '../../rules/update_rules';
 import { legacyMigrate } from '../../rules/utils';
 import { readRules } from '../../rules/read_rules';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
-import { Logger } from '../../../../../../../../src/core/server';
 
 /**
  * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
@@ -48,13 +48,15 @@ export const updateRulesBulkRoute = (
 
       const siemResponse = buildSiemResponse(response);
 
-      const rulesClient = context.alerting.getRulesClient();
-      const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
-      const savedObjectsClient = context.core.savedObjects.client;
-      const siemClient = context.securitySolution.getAppClient();
+      const ctx = await context.resolve(['core', 'securitySolution', 'alerting', 'licensing']);
+
+      const rulesClient = ctx.alerting.getRulesClient();
+      const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const siemClient = ctx.securitySolution.getAppClient();
 
       const mlAuthz = buildMlAuthz({
-        license: context.licensing.license,
+        license: ctx.licensing.license,
         ml,
         request,
         savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
index 8a7a09a80c743..a8e9924c91b7a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
@@ -54,13 +54,19 @@ describe.each([
 
   describe('status codes', () => {
     test('returns 200', async () => {
-      const response = await server.inject(getUpdateRequest(), context);
+      const response = await server.inject(
+        getUpdateRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 404 when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      const response = await server.inject(getUpdateRequest(), context);
+      const response = await server.inject(
+        getUpdateRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({
@@ -71,7 +77,10 @@ describe.each([
 
     test('returns error when updating non-rule', async () => {
       clients.rulesClient.find.mockResolvedValue(nonRuleFindResult(isRuleRegistryEnabled));
-      const response = await server.inject(getUpdateRequest(), context);
+      const response = await server.inject(
+        getUpdateRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({
@@ -84,7 +93,10 @@ describe.each([
       clients.rulesClient.find.mockImplementation(async () => {
         throw new Error('Test error');
       });
-      const response = await server.inject(getUpdateRequest(), context);
+      const response = await server.inject(
+        getUpdateRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -104,7 +116,7 @@ describe.each([
         body: typicalMlRulePayload(),
       });
 
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(403);
       expect(response.body).toEqual({
         message: 'mocked validation message',
@@ -123,7 +135,7 @@ describe.each([
           id: undefined,
         },
       });
-      const response = await server.inject(noIdRequest, context);
+      const response = await server.inject(noIdRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         message: ['either "id" or "rule_id" must be set'],
         status_code: 400,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts
index 8ac90748d9217..817a6468a355c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -44,12 +44,14 @@ export const updateRulesRoute = (
         return siemResponse.error({ statusCode: 400, body: validationErrors });
       }
       try {
-        const rulesClient = context.alerting.getRulesClient();
-        const savedObjectsClient = context.core.savedObjects.client;
-        const siemClient = context.securitySolution.getAppClient();
+        const ctx = await context.resolve(['core', 'securitySolution', 'alerting', 'licensing']);
+
+        const rulesClient = ctx.alerting.getRulesClient();
+        const savedObjectsClient = ctx.core.savedObjects.client;
+        const siemClient = ctx.securitySolution.getAppClient();
 
         const mlAuthz = buildMlAuthz({
-          license: context.licensing.license,
+          license: ctx.licensing.license,
           ml,
           request,
           savedObjectsClient,
@@ -76,7 +78,7 @@ export const updateRulesRoute = (
         });
 
         if (rule != null) {
-          const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
+          const ruleExecutionLog = ctx.securitySolution.getRuleExecutionLog();
           const ruleExecutionSummary = await ruleExecutionLog.getExecutionSummary(rule.id);
           const [validated, errors] = transformValidate(
             rule,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
index 04823606faf3e..93ec83bb750d1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -27,7 +27,7 @@ import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import { PartialFilter } from '../../types';
 import { BulkError, createBulkErrorObject } from '../utils';
 import { getOutputRuleAlertForRest } from '../__mocks__/utils';
-import { PartialRule } from '../../../../../../alerting/server';
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { createRulesAndExceptionsStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
 import { RuleAlertType } from '../../rules/types';
 import { ImportRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/import_rules_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
index bd74e83f5a664..3c0ad839bc8b3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
@@ -8,15 +8,15 @@
 import { countBy, partition } from 'lodash/fp';
 import uuid from 'uuid';
 import { Action } from '@kbn/securitysolution-io-ts-alerting-types';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import pMap from 'p-map';
 
+import { PartialRule, FindResult } from '@kbn/alerting-plugin/server';
+import { ActionsClient, FindActionResult } from '@kbn/actions-plugin/server';
 import { RuleExecutionSummary } from '../../../../../common/detection_engine/schemas/common';
 import { RulesSchema } from '../../../../../common/detection_engine/schemas/response/rules_schema';
 import { ImportRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/import_rules_schema';
 import { CreateRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/create_rules_bulk_schema';
-import { PartialRule, FindResult } from '../../../../../../alerting/server';
-import { ActionsClient, FindActionResult } from '../../../../../../actions/server';
 import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import { RuleAlertType, isAlertType } from '../../rules/types';
 import { createBulkErrorObject, BulkError, OutputError } from '../utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts
index ebf55011ee6a7..c46efeabd1dac 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts
@@ -7,7 +7,7 @@
 
 import { getImportRulesSchemaDecodedMock } from '../../../../../../common/detection_engine/schemas/request/import_rules_schema.mock';
 import { checkRuleExceptionReferences } from './check_rule_exception_references';
-import { getExceptionListSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 
 describe('checkRuleExceptionReferences', () => {
   it('returns empty array if rule has no exception list references', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.ts
index 18f77bfa85bc3..9145eb50f80d7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.ts
@@ -6,7 +6,7 @@
  */
 
 import { getDocLinks } from '@kbn/doc-links';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { DETECTION_ENGINE_RULES_BULK_ACTION } from '../../../../../../common/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts
index fdc188df1b178..b67db94bcef00 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
-import { savedObjectsClientMock } from '../../../../../../../../../src/core/server/mocks';
-import { findExceptionList } from '../../../../../../../lists/server/services/exception_lists/find_exception_list';
-import { getExceptionListSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { findExceptionList } from '@kbn/lists-plugin/server/services/exception_lists/find_exception_list';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { getReferencedExceptionLists } from './gather_referenced_exceptions';
 import { getImportRulesSchemaDecodedMock } from '../../../../../../common/detection_engine/schemas/request/import_rules_schema.mock';
 
-jest.mock('../../../../../../../lists/server/services/exception_lists/find_exception_list');
+jest.mock('@kbn/lists-plugin/server/services/exception_lists/find_exception_list');
 
 describe('getReferencedExceptionLists', () => {
   let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts
index 85d7cc23a6d50..4033e572553f5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 import { ExceptionListSchema, ListArray } from '@kbn/securitysolution-io-ts-list-types';
-import { SavedObjectsClientContract } from 'kibana/server';
-import { ImportRulesSchemaDecoded } from '../../../../../../common/detection_engine/schemas/request';
-
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ExceptionListQueryInfo,
   getAllListTypes,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../lists/server/services/exception_lists/utils/import/find_all_exception_list_types';
+} from '@kbn/lists-plugin/server/services/exception_lists/utils/import/find_all_exception_list_types';
+import { ImportRulesSchemaDecoded } from '../../../../../../common/detection_engine/schemas/request';
 
 /**
  * Helper that takes rules, goes through their referenced exception lists and
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts
index 42edd694dedc4..957915a0e7775 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getImportExceptionsListSchemaMock } from '../../../../../../../lists/common/schemas/request/import_exceptions_schema.mock';
+import { getImportExceptionsListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 
 import { importRuleExceptions } from './import_rule_exceptions';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts
index 13ac7dba61509..f2487df4f6615 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts
@@ -10,7 +10,7 @@ import {
   ImportExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 
-import { ExceptionListClient } from '../../../../../../../../plugins/lists/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 
 /**
  * Util to call into exceptions list client import logic
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts
index fd4c751d7fb84..70083f8c04214 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ImportExceptionsListSchema,
   ImportExceptionListItemSchema,
   ExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { legacyMigrate } from '../../../rules/utils';
 import { PartialFilter } from '../../../types';
 import { createBulkErrorObject, ImportRuleResponse } from '../../utils';
@@ -22,8 +24,6 @@ import { patchRules } from '../../../rules/patch_rules';
 import { ImportRulesSchemaDecoded } from '../../../../../../common/detection_engine/schemas/request/import_rules_schema';
 import { MlAuthz } from '../../../../machine_learning/authz';
 import { throwAuthzError } from '../../../../machine_learning/validation';
-import { RulesClient } from '../../../../../../../../plugins/alerting/server';
-import { ExceptionListClient } from '../../../../../../../../plugins/lists/server';
 import { checkRuleExceptionReferences } from './check_rule_exception_references';
 
 export type PromiseFromStreams = ImportRulesSchemaDecoded | Error;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts
index ce037566e8284..2c355661ecfba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { wrapScopedClusterClient } from './wrap_scoped_cluster_client';
 
 const esQuery = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts
index f007a7dc745cd..da6264e756ad9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts
@@ -20,7 +20,7 @@ import type {
   SearchRequest as SearchRequestWithBody,
   AggregationsAggregate,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient, ElasticsearchClient } from 'src/core/server';
+import { IScopedClusterClient, ElasticsearchClient } from '@kbn/core/server';
 
 interface WrapScopedClusterClientOpts {
   scopedClusterClient: IScopedClusterClient;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
index 293f73b9dcd05..bde5d3ebf2027 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
@@ -7,6 +7,7 @@
 
 import { validateNonExact } from '@kbn/securitysolution-io-ts-utils';
 
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { RuleExecutionSummary } from '../../../../../common/detection_engine/schemas/common';
 import {
   FullResponseSchema,
@@ -16,7 +17,6 @@ import {
   RulesSchema,
   rulesSchema,
 } from '../../../../../common/detection_engine/schemas/response/rules_schema';
-import { PartialRule } from '../../../../../../alerting/server';
 import { isAlertType } from '../../rules/types';
 import { createBulkErrorObject, BulkError } from '../utils';
 import { transform } from './utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts
index 8da147d64a6cf..df4ff25e9c640 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts
@@ -39,9 +39,12 @@ export const createSignalsMigrationRoute = (
       const { index: indices, ...reindexOptions } = request.body;
 
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
-        const soClient = context.core.savedObjects.client;
-        const appClient = context.securitySolution?.getAppClient();
+        const core = await context.core;
+        const securitySolution = await context.securitySolution;
+
+        const esClient = core.elasticsearch.client.asCurrentUser;
+        const soClient = core.savedObjects.client;
+        const appClient = securitySolution?.getAppClient();
         if (!appClient) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts
index 65ed42a0a166e..f94aff365f496 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts
@@ -35,9 +35,12 @@ export const deleteSignalsMigrationRoute = (
       const { migration_ids: migrationIds } = request.body;
 
       try {
-        const esClient = context.core.elasticsearch.client.asCurrentUser;
-        const soClient = context.core.savedObjects.client;
-        const appClient = context.securitySolution?.getAppClient();
+        const core = await context.core;
+        const securitySolution = await context.securitySolution;
+
+        const esClient = core.elasticsearch.client.asCurrentUser;
+        const soClient = core.savedObjects.client;
+        const appClient = securitySolution?.getAppClient();
         if (!appClient) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
index 84a3a01974710..79fc38e21c7ce 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
@@ -11,8 +11,8 @@ import { getFinalizeSignalsMigrationRequest } from '../__mocks__/request_respons
 import { getMigrationSavedObjectsById } from '../../migrations/get_migration_saved_objects_by_id';
 import { getSignalsMigrationSavedObjectMock } from '../../migrations/saved_objects_schema.mock';
 import { finalizeSignalsMigrationRoute } from './finalize_signals_migration_route';
-import { RuleDataPluginService } from '../../../../../../rule_registry/server';
-import { ruleDataServiceMock } from '../../../../../../rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
+import { ruleDataServiceMock } from '@kbn/rule-registry-plugin/server/rule_data_plugin_service/rule_data_plugin_service.mock';
 
 jest.mock('../../migrations/get_migration_saved_objects_by_id');
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
index c1dc153896d72..6029ad8e86bbc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
@@ -6,6 +6,7 @@
  */
 
 import { transformError, BadRequestError } from '@kbn/securitysolution-es-utils';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { SetupPlugins } from '../../../../plugin';
 import { DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL } from '../../../../../common/constants';
@@ -16,7 +17,6 @@ import { signalsMigrationService } from '../../migrations/migration_service';
 import { buildSiemResponse } from '../utils';
 
 import { getMigrationSavedObjectsById } from '../../migrations/get_migration_saved_objects_by_id';
-import { RuleDataPluginService } from '../../../../../../rule_registry/server';
 
 export const finalizeSignalsMigrationRoute = (
   router: SecuritySolutionPluginRouter,
@@ -35,12 +35,16 @@ export const finalizeSignalsMigrationRoute = (
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const soClient = context.core.savedObjects.client;
+
+      const core = await context.core;
+      const securitySolution = await context.securitySolution;
+
+      const esClient = core.elasticsearch.client.asCurrentUser;
+      const soClient = core.savedObjects.client;
       const { migration_ids: migrationIds } = request.body;
 
       try {
-        const appClient = context.securitySolution?.getAppClient();
+        const appClient = securitySolution?.getAppClient();
         if (!appClient) {
           return siemResponse.error({ statusCode: 404 });
         }
@@ -55,7 +59,7 @@ export const finalizeSignalsMigrationRoute = (
           soClient,
         });
 
-        const spaceId = context.securitySolution.getSpaceId();
+        const spaceId = securitySolution.getSpaceId();
         const signalsAlias = ruleDataService.getResourceName(`security.alerts-${spaceId}`);
         const finalizeResults = await Promise.all(
           migrations.map(async (migration) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/get_signals_migration_status_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/get_signals_migration_status_route.ts
index d800cead20cdc..f23bf4ae4185e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/get_signals_migration_status_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/get_signals_migration_status_route.ts
@@ -31,11 +31,15 @@ export const getSignalsMigrationStatusRoute = (router: SecuritySolutionPluginRou
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const soClient = context.core.savedObjects.client;
+
+      const core = await context.core;
+      const securitySolution = await context.securitySolution;
+
+      const esClient = core.elasticsearch.client.asCurrentUser;
+      const soClient = core.savedObjects.client;
 
       try {
-        const appClient = context.securitySolution?.getAppClient();
+        const appClient = securitySolution?.getAppClient();
         if (!appClient) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
index 54ecd5efcd67c..5a46d7a9b55f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
@@ -18,7 +18,7 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { SetupPlugins } from '../../../../plugin';
 import { createMockTelemetryEventsSender } from '../../../telemetry/__mocks__';
 import { setSignalsStatusRoute } from './open_close_signals_route';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('set signal status', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -44,12 +44,18 @@ describe('set signal status', () => {
 
   describe('status on signal', () => {
     test('returns 200 when setting a status on a signal by ids', async () => {
-      const response = await server.inject(getSetSignalStatusByIdsRequest(), context);
+      const response = await server.inject(
+        getSetSignalStatusByIdsRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('returns 200 when setting a status on a signal by query', async () => {
-      const response = await server.inject(getSetSignalStatusByQueryRequest(), context);
+      const response = await server.inject(
+        getSetSignalStatusByQueryRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
@@ -68,7 +74,10 @@ describe('set signal status', () => {
       context.core.elasticsearch.client.asCurrentUser.updateByQuery.mockRejectedValue(
         new Error('Test error')
       );
-      const response = await server.inject(getSetSignalStatusByQueryRequest(), context);
+      const response = await server.inject(
+        getSetSignalStatusByQueryRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -106,7 +115,7 @@ describe('set signal status', () => {
         path: DETECTION_ENGINE_SIGNALS_STATUS_URL,
         body: setStatusSignalMissingIdsAndQueryPayload(),
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(400);
       expect(response.body).toEqual({
         message: ['either "signal_ids" or "query" must be set'],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
index bf62d7602b2d9..63b90ccc4cfc7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { setSignalStatusValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/set_signal_status_type_dependents';
 import {
   SetSignalsStatusSchemaDecoded,
@@ -49,11 +49,13 @@ export const setSignalsStatusRoute = (
     },
     async (context, request, response) => {
       const { conflicts, signal_ids: signalIds, query, status } = request.body;
-      const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const siemClient = context.securitySolution?.getAppClient();
+      const core = await context.core;
+      const securitySolution = await context.securitySolution;
+      const esClient = core.elasticsearch.client.asCurrentUser;
+      const siemClient = securitySolution?.getAppClient();
       const siemResponse = buildSiemResponse(response);
       const validationErrors = setSignalStatusValidateTypeDependents(request.body);
-      const spaceId = context.securitySolution?.getSpaceId() ?? 'default';
+      const spaceId = securitySolution?.getSpaceId() ?? 'default';
 
       if (validationErrors.length) {
         return siemResponse.error({ statusCode: 400, body: validationErrors });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
index 0e436760a88ee..8a8af78a9b86e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
@@ -16,7 +16,7 @@ import {
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { querySignalsRoute } from './query_signals_route';
-import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
 
 describe('query for signal', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -35,7 +35,10 @@ describe('query for signal', () => {
 
   describe('query and agg on signals index', () => {
     test('returns 200 when using single query', async () => {
-      const response = await server.inject(getSignalsQueryRequest(), context);
+      const response = await server.inject(
+        getSignalsQueryRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(ruleDataClient.getReader().search).toHaveBeenCalledWith(
@@ -46,7 +49,10 @@ describe('query for signal', () => {
     });
 
     test('returns 200 when using single agg', async () => {
-      const response = await server.inject(getSignalsAggsQueryRequest(), context);
+      const response = await server.inject(
+        getSignalsAggsQueryRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(ruleDataClient.getReader().search).toHaveBeenCalledWith(
@@ -55,7 +61,10 @@ describe('query for signal', () => {
     });
 
     test('returns 200 when using aggs and query together', async () => {
-      const response = await server.inject(getSignalsAggsAndQueryRequest(), context);
+      const response = await server.inject(
+        getSignalsAggsAndQueryRequest(),
+        requestContextMock.convertContext(context)
+      );
 
       expect(response.status).toEqual(200);
       expect(ruleDataClient.getReader().search).toHaveBeenCalledWith(
@@ -70,7 +79,10 @@ describe('query for signal', () => {
 
     test('catches error if query throws error', async () => {
       ruleDataClient.getReader().search.mockRejectedValue(new Error('Test error'));
-      const response = await server.inject(getSignalsAggsQueryRequest(), context);
+      const response = await server.inject(
+        getSignalsAggsQueryRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
@@ -120,7 +132,7 @@ describe('query for signal', () => {
         path: DETECTION_ENGINE_QUERY_SIGNALS_URL,
         body: {},
       });
-      const response = await server.inject(request, context);
+      const response = await server.inject(request, requestContextMock.convertContext(context));
       expect(response.status).toEqual(400);
       expect(response.body).toEqual({
         message: '"value" must have at least 1 children',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
index def203f534ad3..7b8216084ac9d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
@@ -7,6 +7,7 @@
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { transformError } from '@kbn/securitysolution-es-utils';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../common/constants';
 import { buildSiemResponse } from '../utils';
@@ -16,7 +17,6 @@ import {
   querySignalsSchema,
   QuerySignalsSchemaDecoded,
 } from '../../../../../common/detection_engine/schemas/request/query_signals_index_schema';
-import { IRuleDataClient } from '../../../../../../rule_registry/server';
 
 export const querySignalsRoute = (
   router: SecuritySolutionPluginRouter,
@@ -52,20 +52,19 @@ export const querySignalsRoute = (
       }
 
       try {
-        const result = await ruleDataClient
-          ?.getReader({ namespace: context.securitySolution.getSpaceId() })
-          .search({
-            body: {
-              query,
-              // Note: I use a spread operator to please TypeScript with aggs: { ...aggs }
-              aggs: { ...aggs },
-              _source,
-              track_total_hits,
-              size,
-              runtime_mappings: runtime_mappings as MappingRuntimeFields,
-            },
-            ignore_unavailable: true,
-          });
+        const spaceId = (await context.securitySolution).getSpaceId();
+        const result = await ruleDataClient?.getReader({ namespace: spaceId }).search({
+          body: {
+            query,
+            // Note: I use a spread operator to please TypeScript with aggs: { ...aggs }
+            aggs: { ...aggs },
+            _source,
+            track_total_hits,
+            size,
+            runtime_mappings: runtime_mappings as MappingRuntimeFields,
+          },
+          ignore_unavailable: true,
+        });
         return response.ok({ body: result });
       } catch (err) {
         // error while getting or updating signal with id: id in signal index .siem-signals
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/tags/read_tags_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/tags/read_tags_route.ts
index 04464e5d6f5a7..87bfa3fcbac90 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/tags/read_tags_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/tags/read_tags_route.ts
@@ -26,7 +26,7 @@ export const readTagsRoute = (
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
-      const rulesClient = context.alerting?.getRulesClient();
+      const rulesClient = (await context.alerting)?.getRulesClient();
 
       if (!rulesClient) {
         return siemResponse.error({ statusCode: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts
index 2aad64324cfae..01a99028d1ec0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { SECURITY_TELEMETRY_URL } from '../../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts
index b7c9215e6c190..2372cb515b4fa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts
index e630ef7f250d3..4fb6ca22070e5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts
index 0ac9c95dadd40..5e37baadd02d7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts
index ac79fea7acf9e..a0a35e2d01088 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
index 66418e6f8db24..662e20368ff99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
@@ -12,7 +12,7 @@ import {
   RouteValidationFunction,
   KibanaResponseFactory,
   CustomHttpResponseOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { CustomHttpRequestError } from '../../../utils/custom_http_request_error';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts
index c67db80e18003..514f1b3096ee0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyCreateRuleActionsSavedObject } from './legacy_create_rule_actions_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts
index 55e3ae3b346bc..974aa41b25473 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
@@ -18,7 +19,6 @@ import {
   legacyGetThrottleOptions,
   legacyTransformActionToReference,
 } from './legacy_utils';
-import { RuleAction } from '../../../../../alerting/common';
 
 /**
  * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
index ab5a352747723..92db1aa2a265e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsFindOptions, SavedObjectsFindResult } from 'kibana/server';
+import { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
 
-import { loggingSystemMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyGetBulkRuleActionsSavedObject } from './legacy_get_bulk_rule_actions_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
index df135e9c1c8ef..944c7cd5c2cf8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
@@ -6,10 +6,9 @@
  */
 
 import { chunk } from 'lodash';
-import { SavedObjectsFindOptionsReference } from 'kibana/server';
-import { Logger } from 'src/core/server';
+import { SavedObjectsFindOptionsReference, Logger } from '@kbn/core/server';
 
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts
index 1e38cea801c53..d1798c4065b49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsFindOptions, SavedObjectsFindResult } from 'kibana/server';
-import { loggingSystemMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 // eslint-disable-next-line no-restricted-imports
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts
index de47e127daa73..5f23ceace2b55 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsFindOptionsReference } from 'kibana/server';
-import { Logger } from 'src/core/server';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { SavedObjectsFindOptionsReference, Logger } from '@kbn/core/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts
index 7dd05c5122a61..5837733e75cbd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { legacyMigrateRuleAlertId, legacyMigrateAlertId } from './legacy_migrations';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts
index aa85898e94a33..9fff45b3cf023 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectSanitizedDoc,
   SavedObjectAttributes,
   SavedObjectReference,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts
index 835ccd92f9cc4..8a0858830be98 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectMigration } from './legacy_migrations';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts
index 475f17b8b58a3..7ea80663df92e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectAttributes } from 'kibana/server';
-import { RuleActionParams } from '../../../../../alerting/common';
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RuleActionParams } from '@kbn/alerting-plugin/common';
 
 /**
  * This was the pre-7.16 version of LegacyRuleAlertAction and how it was stored on disk pre-7.16.
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts
index f700f78fd41b6..a6146dcea638f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { RuleAction } from '../../../../../alerting/common';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { RuleAction } from '@kbn/alerting-plugin/common';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyGetRuleActionsSavedObject } from './legacy_get_rule_actions_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts
index feb6895b87a2f..b524a0127283c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
@@ -21,7 +22,6 @@ import {
 } from './legacy_utils';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyIRuleActionsAttributesSavedObjectAttributes } from './legacy_types';
-import { RuleAction } from '../../../../../alerting/common';
 
 /**
  * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts
index 0d5e4e704d7ff..c3962dc28ae3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsUpdateResponse } from 'kibana/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { SavedObjectsUpdateResponse } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
-import { RuleAction } from '../../../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts
index b84550d56dbd5..8d35272d10fdd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsUpdateResponse } from 'kibana/server';
-import { Logger } from 'src/core/server';
+import { SavedObjectsUpdateResponse, Logger } from '@kbn/core/server';
 
-import { RuleAction } from '../../../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 // eslint-disable-next-line no-restricted-imports
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts
index 8c3395f02f7d0..73ca6eb2dad9e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectsClientContract } from 'src/core/server';
-import { IEventLogClient, IEventLogService } from '../../../../../event_log/server';
+import { Logger, SavedObjectsClientContract } from '@kbn/core/server';
+import { IEventLogClient, IEventLogService } from '@kbn/event-log-plugin/server';
 
 import { IRuleExecutionLogForRoutes } from './client_for_routes/client_interface';
 import { createClientForRoutes } from './client_for_routes/client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts
index e3227373ceaae..b680bcfe261bc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts
@@ -7,7 +7,7 @@
 
 import { sum } from 'lodash';
 import { Duration } from 'moment';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import {
   RuleExecutionStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts
index 1ee23da39fe74..476b199a1f2f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts
@@ -6,7 +6,7 @@
  */
 
 import { chunk, mapValues } from 'lodash';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { GetAggregateRuleExecutionEventsResponse } from '../../../../../common/detection_engine/schemas/response';
 import { initPromisePool } from '../../../../utils/promise_pool';
 import { withSecuritySpan } from '../../../../utils/with_security_span';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts
index f2ee7fa7c3097..78e8e62702d47 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts
@@ -7,7 +7,7 @@
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MAX_EXECUTION_EVENTS_DISPLAYED } from '@kbn/securitysolution-rules';
-import { IEventLogClient } from '../../../../../../event_log/server';
+import { IEventLogClient } from '@kbn/event-log-plugin/server';
 
 import {
   RuleExecutionEvent,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts
index 816aab5cec5ac..9672992a85f57 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsUtils } from '../../../../../../../../src/core/server';
-import { IEventLogService, SAVED_OBJECT_REL_PRIMARY } from '../../../../../../event_log/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
+import { IEventLogService, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import {
   RuleExecutionStatus,
   ruleExecutionStatusOrderByStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts
index baa4dd572ced0..7cee84cd64594 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts
@@ -20,7 +20,7 @@ import {
   formatSortForTermsSort,
   getExecutionEventAggregation,
   getProviderAndActionFilter,
-} from './index';
+} from '.';
 
 describe('getExecutionEventAggregation', () => {
   test('should throw error when given bad maxExecutions field', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts
index 4b1bd1f185198..4cf8e0bd5f1dc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
 import { flatMap, get } from 'lodash';
 import { MAX_EXECUTION_EVENTS_DISPLAYED } from '@kbn/securitysolution-rules';
-import { AggregateEventsBySavedObjectResult } from '../../../../../../../event_log/server';
+import { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 import { AggregateRuleExecutionEvent } from '../../../../../../common/detection_engine/schemas/common';
 import { GetAggregateRuleExecutionEventsResponse } from '../../../../../../common/detection_engine/schemas/response';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts
index 7f28715198da6..dc64fe9e1f717 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEventLogService } from '../../../../../../event_log/server';
+import { IEventLogService } from '@kbn/event-log-plugin/server';
 import { RuleExecutionLogAction, RULE_EXECUTION_LOG_PROVIDER } from './constants';
 
 export const registerEventLogProvider = (eventLogService: IEventLogService) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts
index 07307cafd50f2..fcb145dd406e9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts
@@ -5,11 +5,7 @@
  * 2.0.
  */
 
-import {
-  Logger,
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../../../src/core/server';
+import { Logger, SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 import { withSecuritySpan } from '../../../../utils/with_security_span';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts
index d5a2ecd813d35..f2d1628efd539 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsType } from 'src/core/server';
+import { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import {
   RuleExecutionMetrics,
   RuleExecutionStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts
index c0e0427bf99a7..960197a03cd5d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import uuidv5 from 'uuid/v5';
-import { SavedObjectReference } from 'src/core/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { RULE_EXECUTION_SO_TYPE } from './saved_objects_type';
 
 export const getRuleExecutionSoId = (ruleId: string): string => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts
index 4d373f68c00bc..4306fb5e15d9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogMeta } from 'src/core/server';
+import { LogMeta } from '@kbn/core/server';
 import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts
index da65c7e483428..a7eb512564d42 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { EqlSearchResponse } from '../../../../../common/detection_engine/types';
 
 export const sequenceResponse = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts
index 2129596a1b204..812b8cdb73e70 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts
@@ -8,22 +8,22 @@
 import { of } from 'rxjs';
 import { v4 } from 'uuid';
 
-import { Logger, SavedObject } from 'kibana/server';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
-import { mlPluginServerMock } from '../../../../../../ml/server/mocks';
+import { Logger, SavedObject } from '@kbn/core/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { mlPluginServerMock } from '@kbn/ml-plugin/server/mocks';
 
-import type { IRuleDataClient } from '../../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
-import { eventLogServiceMock } from '../../../../../../event_log/server/mocks';
-import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../../../alerting/server';
+import type { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { eventLogServiceMock } from '@kbn/event-log-plugin/server/mocks';
+import { PluginSetupContract as AlertingPluginSetupContract } from '@kbn/alerting-plugin/server';
 import { ConfigType } from '../../../../config';
 import { AlertAttributes } from '../../signals/types';
 import { createRuleMock } from './rule';
-import { listMock } from '../../../../../../lists/server/mocks';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { QueryRuleParams, RuleParams } from '../../schemas/rule_schemas';
 // this is only used in tests
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createDefaultAlertExecutorOptions } from '../../../../../../rule_registry/server/utils/rule_executor_test_utils';
+import { createDefaultAlertExecutorOptions } from '@kbn/rule-registry-plugin/server/utils/rule_executor_test_utils';
 import { getCompleteRuleMock } from '../../schemas/rule_schemas.mock';
 
 export const createRuleTypeMocks = (
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts
index 177dd3866816c..39c4a922cd008 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts
@@ -24,7 +24,7 @@ import {
 } from '@kbn/rule-data-utils';
 import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
-import { TypeOfFieldMap } from '../../../../../../rule_registry/common/field_map';
+import { TypeOfFieldMap } from '@kbn/rule-registry-plugin/common/field_map';
 import { SERVER_APP_ID } from '../../../../../common/constants';
 import { ANCHOR_DATE } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
 import { getListArrayMock } from '../../../../../common/detection_engine/schemas/types/lists.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
index 14bbc3a7fe0e8..4501c81a82aaf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
@@ -10,7 +10,7 @@ import { isEmpty } from 'lodash';
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
 import agent from 'elastic-apm-node';
 
-import { createPersistenceRuleTypeWrapper } from '../../../../../rule_registry/server';
+import { createPersistenceRuleTypeWrapper } from '@kbn/rule-registry-plugin/server';
 import { buildRuleMessageFactory } from './factories/build_rule_message_factory';
 import {
   checkPrivilegesFromEsClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts
index 60a3be4b5345f..5d0a870ac553b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts
@@ -8,16 +8,16 @@
 import { performance } from 'perf_hooks';
 import { isEmpty } from 'lodash';
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
+import { PersistenceAlertService } from '@kbn/rule-registry-plugin/server';
+import { AlertWithCommonFieldsLatest } from '@kbn/rule-registry-plugin/common/schemas';
 import { BuildRuleMessage } from '../../signals/rule_messages';
 import { makeFloatString } from '../../signals/utils';
 import { RefreshTypes } from '../../types';
-import { PersistenceAlertService } from '../../../../../../rule_registry/server';
 import {
   BaseFieldsLatest,
   WrappedFieldsLatest,
 } from '../../../../../common/detection_engine/schemas/alerts';
-import { AlertWithCommonFieldsLatest } from '../../../../../../rule_registry/common/schemas';
 
 export interface GenericBulkCreateResponse<T extends BaseFieldsLatest> {
   success: boolean;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts
index b1b68829665fc..29ca39442f033 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import { ALERT_RULE_CONSUMER } from '@kbn/rule-data-utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts
index a991da87485a5..445f6944a1835 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts
@@ -7,7 +7,7 @@
 
 import { ALERT_UUID } from '@kbn/rule-data-utils';
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import type { ConfigType } from '../../../../../config';
 import { Ancestor, SignalSource, SignalSourceHit } from '../../../signals/types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts
index 0aeb8935c6cc0..5bea6e346f438 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import { WrapSequences } from '../../signals/types';
 import { buildAlertGroupFromSequence } from './utils/build_alert_group_from_sequence';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts
index d9119b3cff8dd..78741552bb7e7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { allowedExperimentalValues } from '../../../../../common/experimental_features';
 import { createQueryAlertType } from './create_query_alert_type';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts
index 3606bd610648f..62dc5b3134205 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts
@@ -10,19 +10,20 @@ import { Moment } from 'moment';
 import { Logger } from '@kbn/logging';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { RuleExecutorOptions, RuleType } from '../../../../../alerting/server';
+import { RuleExecutorOptions, RuleType } from '@kbn/alerting-plugin/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeState,
   WithoutReservedActionGroups,
-} from '../../../../../alerting/common';
-import { ListClient } from '../../../../../lists/server';
+} from '@kbn/alerting-plugin/common';
+import { ListClient } from '@kbn/lists-plugin/server';
 import {
   PersistenceServices,
   IRuleDataClient,
   IRuleDataReader,
-} from '../../../../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
+import { IEventLogService } from '@kbn/event-log-plugin/server';
 import { ConfigType } from '../../../config';
 import { SetupPlugins } from '../../../plugin';
 import { CompleteRule, RuleParams } from '../schemas/rule_schemas';
@@ -34,7 +35,6 @@ import {
   WrapSequences,
 } from '../signals/types';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
-import { IEventLogService } from '../../../../../event_log/server';
 import { ITelemetryEventsSender } from '../../telemetry/sender';
 import { RuleExecutionLogForExecutorsFactory } from '../rule_execution_log';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts
index 83a473799068a..15b12223d758a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import { ExceptionListClient, ListClient, ListPluginSetup } from '../../../../../../lists/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { ExceptionListClient, ListClient, ListPluginSetup } from '@kbn/lists-plugin/server';
 
 export const getListClient = ({
   lists,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
index 59e2b9f2f597b..4624b66d870ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeState } from '../../../../../../alerting/server';
+import { RuleTypeState } from '@kbn/alerting-plugin/server';
 import { SecurityAlertTypeReturnValue } from '../types';
 
 export const createResultObject = <TState extends RuleTypeState>(state: TState) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts
index c3e15b061842e..126726ab08a79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts
@@ -6,7 +6,7 @@
  */
 
 import { CreateRulesOptions } from './types';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 
 export const getCreateRulesOptionsMock = (isRuleRegistryEnabled: boolean): CreateRulesOptions => ({
   isRuleRegistryEnabled,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts
index 863d1104ded36..9ba39746ae4d2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts
@@ -7,12 +7,12 @@
 
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
+import { RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 import {
   normalizeMachineLearningJobIds,
   normalizeThresholdObject,
 } from '../../../../common/detection_engine/utils';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { RuleTypeParams, SanitizedRule } from '../../../../../alerting/common';
 import {
   DEFAULT_INDICATOR_SOURCE_PATH,
   NOTIFICATION_THROTTLE_NO_ACTIONS,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts
index 4fd4dd80a3202..fbbac1609fdea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { ruleExecutionLogMock } from '../rule_execution_log/__mocks__';
 import { deleteRules } from './delete_rules';
 import { DeleteRuleOptions } from './types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts
index 1b15f71a1827c..4efd6934aeee8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import { i18n } from '@kbn/i18n';
 import { ruleTypeMappings, SIGNALS_ID } from '@kbn/securitysolution-rules';
 
-import { SanitizedRule } from '../../../../../alerting/common';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { SERVER_APP_ID } from '../../../../common/constants';
 import { InternalRuleCreate, RuleParams } from '../schemas/rule_schemas';
 import { addTags } from './add_tags';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/edit_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/edit_rule.ts
new file mode 100644
index 0000000000000..93a297e6965b4
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/edit_rule.ts
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { cloneDeep, isEqual, pick } from 'lodash';
+import { validate } from '@kbn/securitysolution-io-ts-utils';
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import { RuleAlertType } from './types';
+import { InternalRuleUpdate, internalRuleUpdate } from '../schemas/rule_schemas';
+import { addTags } from './add_tags';
+
+class EditRuleError extends Error {
+  public readonly statusCode: number;
+  constructor(message: string, statusCode: number) {
+    super(message);
+    this.statusCode = statusCode;
+  }
+}
+
+interface EditRuleParams {
+  /** An instance of RulesClient from the Alerting Framework. */
+  rulesClient: RulesClient;
+
+  /** Original, existing rule to be edited. Needs to be fetched from Elasticsearch via RulesClient. */
+  rule: RuleAlertType;
+
+  /** A function that implements in-memory modifications: returns a new rule object with the changes. */
+  edit: (rule: RuleAlertType) => RuleAlertType;
+}
+
+/** At this point we support editing of only these fields. */
+const FIELDS_THAT_CAN_BE_EDITED = ['params', 'tags'] as const;
+
+/**
+ * Applies in-memory modifications to a given rule and updates it in Elasticsearch via RulesClient.
+ *
+ * NOTE: At this point we only support editing of the following fields:
+ *   - rule.params
+ *   - rule.tags
+ * All other changes made by the `edit` function will be ignored.
+ *
+ * @returns The edited rule.
+ */
+export const editRule = async (params: EditRuleParams): Promise<RuleAlertType> => {
+  const { rulesClient, rule, edit } = params;
+  const isPrebuiltRule = rule.params.immutable;
+  const isCustomRule = !rule.params.immutable;
+
+  if (isPrebuiltRule) {
+    throw new EditRuleError('Elastic rule can`t be edited', 400);
+  }
+
+  const editedRule = applyChanges(rule, edit);
+
+  // If the rule wasn't changed by the `edit` function, we don't need to proceed with the update.
+  if (!isRuleChanged(rule, editedRule)) {
+    return rule;
+  }
+
+  // We need to increment the rule's version if it is a custom rule. If the rule is an Elastic
+  // prebuilt rule, we don't want to touch its version - it's managed by the rule authors.
+  // This check is left here explicitly because we're planning to allow editing for prebuilt rules,
+  // and the check for isPrebuiltRule above might be removed.
+  if (isCustomRule) {
+    editedRule.params.version = editedRule.params.version + 1;
+  }
+
+  const updateData = createUpdateData(rule, editedRule);
+  await rulesClient.update({
+    id: rule.id,
+    data: updateData,
+  });
+
+  // It would be great to return the updated rule returned from the RulesClient.update() call.
+  // Note that there's a type mismatch between RuleAlertType and the update method result.
+  return editedRule;
+};
+
+const applyChanges = (
+  originalRule: RuleAlertType,
+  edit: (rule: RuleAlertType) => RuleAlertType
+): RuleAlertType => {
+  // For safety, deeply clone the rule object before applying edits to it.
+  const clonedRule = cloneDeep(originalRule);
+  const editedRule = edit(clonedRule);
+  const sanitizedRule = validateAndSanitizeChanges(originalRule, editedRule);
+  return sanitizedRule;
+};
+
+const validateAndSanitizeChanges = (
+  original: RuleAlertType,
+  changed: RuleAlertType
+): RuleAlertType => {
+  // These checks should never throw unless there's a bug in the passed `edit` function.
+  if (changed.params.immutable !== original.params.immutable) {
+    throw new EditRuleError(`Internal rule editing error: can't change "params.immutable"`, 500);
+  }
+  if (changed.params.version !== original.params.version) {
+    throw new EditRuleError(`Internal rule editing error: can't change "params.version"`, 500);
+  }
+
+  return {
+    ...changed,
+    tags: addTags(changed.tags, changed.params.ruleId, changed.params.immutable),
+  };
+};
+
+const isRuleChanged = (originalRule: RuleAlertType, editedRule: RuleAlertType): boolean => {
+  const originalData = pick(originalRule, FIELDS_THAT_CAN_BE_EDITED);
+  const editedData = pick(editedRule, FIELDS_THAT_CAN_BE_EDITED);
+  return !isEqual(originalData, editedData);
+};
+
+const createUpdateData = (
+  originalRule: RuleAlertType,
+  editedRule: RuleAlertType
+): InternalRuleUpdate => {
+  const data: InternalRuleUpdate = {
+    // At this point we intentionally support updating of only these fields:
+    ...pick(editedRule, FIELDS_THAT_CAN_BE_EDITED),
+    // We omit other fields and get them from the original (unedited) rule:
+    name: originalRule.name,
+    schedule: originalRule.schedule,
+    actions: originalRule.actions,
+    throttle: originalRule.throttle,
+    notifyWhen: originalRule.notifyWhen,
+  };
+
+  const [validatedData, validationError] = validate(data, internalRuleUpdate);
+  if (validationError != null || validatedData === null) {
+    throw new EditRuleError(`Editing rule would create invalid rule: ${validationError}`, 500);
+  }
+
+  return validatedData;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts
index ef1b3fbb28b5a..4f23d1425344f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts
@@ -7,7 +7,7 @@
 
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
-import { FindResult } from '../../../../../alerting/server';
+import { FindResult } from '@kbn/alerting-plugin/server';
 import { RuleParams } from '../schemas/rule_schemas';
 import { FindRuleOptions } from './types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
index b478cc2df09a1..7ddf4c4427286 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   getAlertMock,
   getFindResultWithSingleHit,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
index caa32a809b0a8..68a0c077e59a4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { INTERNAL_IMMUTABLE_KEY } from '../../../../common/constants';
-import { RulesClient } from '../../../../../alerting/server';
 import { RuleAlertType, isAlertTypes } from './types';
 import { findRules } from './find_rules';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
index 304582378c2f1..b42508b0a73b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
@@ -11,7 +11,7 @@ import {
   FindHit,
   getEmptySavedObjectsResponse,
 } from '../routes/__mocks__/request_responses';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getExportAll } from './get_export_all';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { getThreatMock } from '../../../../common/detection_engine/schemas/types/threat.mock';
@@ -21,8 +21,8 @@ import {
 } from '../../../../common/detection_engine/schemas/response/export_rules_details_schema.mock';
 
 import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
-import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { requestContextMock } from '../routes/__mocks__/request_context';
 
 const exceptionsClient = getExceptionListClientMock();
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
index 81db46bb9fee2..3c2d516b8369d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
@@ -7,9 +7,9 @@
 
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { ExceptionListClient } from '../../../../../lists/server';
-import { RulesClient, RuleExecutorServices } from '../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { RulesClient, RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { getNonPackagedRules } from './get_existing_prepackaged_rules';
 import { getExportDetailsNdjson } from './get_export_details_ndjson';
 import { transformAlertsToRules } from '../routes/rules/utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
index a047100bc5262..7371f2390478e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
@@ -12,7 +12,7 @@ import {
   FindHit,
   getEmptySavedObjectsResponse,
 } from '../routes/__mocks__/request_responses';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { getThreatMock } from '../../../../common/detection_engine/schemas/types/threat.mock';
 import {
@@ -20,10 +20,10 @@ import {
   getOutputDetailsSampleWithExceptions,
 } from '../../../../common/detection_engine/schemas/response/export_rules_details_schema.mock';
 import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
-import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
 
 const exceptionsClient = getExceptionListClientMock();
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { requestContextMock } from '../routes/__mocks__/request_context';
 
 describe.each([
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
index 9da3cc3cfdde3..5dde3048b61e7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
@@ -8,14 +8,14 @@
 import { chunk } from 'lodash';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { ExceptionListClient } from '../../../../../lists/server';
+import { Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { RulesClient, RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
-import { RulesClient, RuleExecutorServices } from '../../../../../alerting/server';
 
 import { getExportDetailsNdjson } from './get_export_details_ndjson';
 
-import { isAlertType } from '../rules/types';
+import { isAlertType } from './types';
 import { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
 import { findRules } from './find_rules';
 import { getRuleExceptionsForExport } from './get_export_rule_exceptions';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
index 614c0ae0a1281..79507a73147a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
@@ -7,9 +7,9 @@
 
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
-import { getDetectionsExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
+import { getDetectionsExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 import {
   getRuleExceptionsForExport,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
index 6faf3fdfe6104..bafaf29ac9940 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
@@ -9,10 +9,7 @@ import { chunk } from 'lodash/fp';
 import { ListArray } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import {
-  ExceptionListClient,
-  ExportExceptionListAndItemsReturn,
-} from '../../../../../lists/server';
+import { ExceptionListClient, ExportExceptionListAndItemsReturn } from '@kbn/lists-plugin/server';
 
 const NON_EXPORTABLE_LIST_IDS = [ENDPOINT_LIST_ID];
 export const EXCEPTIONS_EXPORT_CHUNK_SIZE = 50;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
index 8116a42f42827..cc70dd1008de7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
@@ -10,6 +10,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { exactCheck, formatErrors } from '@kbn/securitysolution-io-ts-utils';
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
+import { SavedObjectAttributes } from '@kbn/core/types';
 import {
   addPrepackagedRulesSchema,
   AddPrepackagedRulesSchema,
@@ -20,7 +21,6 @@ import {
 import { rawRules } from './prepackaged_rules';
 import { RuleAssetSavedObjectsClient } from './rule_asset/rule_asset_saved_objects_client';
 import { IRuleAssetSOAttributes } from './types';
-import { SavedObjectAttributes } from '../../../../../../../src/core/types';
 import { ConfigType } from '../../../config';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts
index 59fcca766f1b9..298a87565bdfd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { SanitizedRule, RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { AddPrepackagedRulesSchemaDecoded } from '../../../../common/detection_engine/schemas/request/add_prepackaged_rules_schema';
-import { SanitizedRule, RuleTypeParams } from '../../../../../alerting/common';
-import { RulesClient } from '../../../../../alerting/server';
 import { createRules } from './create_rules';
 import { PartialFilter } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
index 2bd59abb1ea6f..b02e297f78c8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
@@ -6,7 +6,7 @@
  */
 
 import { PatchRulesOptions } from './types';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getAlertMock } from '../routes/__mocks__/request_responses';
 import { getMlRuleParams, getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts
index b5580de152fcc..e16a108dec907 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts
@@ -8,7 +8,7 @@
 import { patchRules } from './patch_rules';
 import { getPatchRulesOptionsMock, getPatchMlRulesOptionsMock } from './patch_rules.mock';
 import { PatchRulesOptions } from './types';
-import { RulesClientMock } from '../../../../../alerting/server/rules_client.mock';
+import { RulesClientMock } from '@kbn/alerting-plugin/server/rules_client.mock';
 import { getAlertMock } from '../routes/__mocks__/request_responses';
 import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
index 8b86f139cd742..05f58e44ecaa2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
@@ -7,7 +7,7 @@
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import { defaults } from 'lodash/fp';
-import { PartialRule } from '../../../../../alerting/server';
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import {
   normalizeMachineLearningJobIds,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
index 6dbae907d892d..edbf848d78106 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
index 5ac169440ce79..1536791a3eb2d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Port Forwarding Rule Addition",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Port Forwarding Rule Addition\n\nNetwork port forwarding is a mechanism to redirect incoming TCP connections (IPv4 or IPv6) from the local TCP port to\nany other port number, or even to a port on a remote computer.\n\nAttackers may configure port forwarding rules to bypass network segmentation restrictions, using the host as a jump box\nto access previously unreachable systems.\n\nThis rule monitors the modifications to the `HKLM\\SYSTEM\\*ControlSet*\\Services\\PortProxy\\v4tov4\\` subkeys.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Identify the target host IP address, verify if connections were made from the host where the modification occurred,\nand check what credentials were used to perform it.\n  - Investigate suspicious login activity, such as unauthorized access and logins from outside working hours and unusual locations.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Analysts can dismiss the alert if the Administrator is aware of the activity\nand there are justifications for this configuration.\n- If this activity is expected and noisy in your environment, consider adding exceptions \u2014 preferably with a combination\nof user and command line conditions.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Delete the port forwarding rule.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If potential malware or credential compromise activities were discovered during the alert triage, activate the respective\nincident response plan.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where registry.path : \"HKLM\\\\SYSTEM\\\\*ControlSet*\\\\Services\\\\PortProxy\\\\v4tov4\\\\*\"\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2019/01/bypassing-network-restrictions-through-rdp-tunneling.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
index 81e353ba7aaf7..b3c2e6905ed9b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Remote Desktop Tunneling Detected",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Remote Desktop Tunneling Detected\n\nProtocol Tunneling is a mechanism that involves explicitly encapsulating a protocol within another for various use cases,\nranging from providing an outer layer of encryption (similar to a VPN) to enabling traffic that network appliances would\nfilter to reach their destination.\n\nAttackers may tunnel Remote Desktop Protocol (RDP) traffic through other protocols like Secure Shell (SSH) to bypass network restrictions that block incoming RDP\nconnections but may be more permissive to other protocols.\n\nThis rule looks for command lines involving the `3389` port, which RDP uses by default and options commonly associated\nwith tools that perform tunneling.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Determine if the activity is unique by validating if other machines in the organization have similar entries.\n- Examine network data to determine if the host communicated with external servers using the tunnel.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n- Investigate the command line for the execution of programs that are unrelated to tunneling, like Remote Desktop clients.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Take actions to disable the tunneling.\n- Investigate the initial attack vector.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  /* RDP port and usual SSH tunneling related switches in command line */\n  process.args : \"*:3389\" and\n  process.args : (\"-L\", \"-P\", \"-R\", \"-pw\", \"-ssh\")\n",
   "references": [
     "https://blog.netspi.com/how-to-access-rdp-over-a-reverse-ssh-tunnel/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json
index f4c64f6f8f968..6707f4185e125 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via Desktopimgdownldr Utility",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via Desktopimgdownldr Utility\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse signed utilities to drop these files.\n\nThe `Desktopimgdownldr.exe` utility is used to to configure lockscreen/desktop image, and can be abused with the\n`lockscreenurl` argument to download remote files and tools, this rule looks for this behavior.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Determine if the activity is unique by validating if other machines in the organization have similar entries.\n- Check the reputation of the domain or IP address used to host the downloaded file or if the user downloaded the file\nfrom an internal system.\n- Retrieve the file and determine if it is malicious:\n  - Identify the file type.\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity is unusual but can be done by administrators. Benign true positives (B-TPs) can be added as exceptions\nif necessary.\n- Analysts can dismiss the alert if the downloaded file is a legitimate image.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Investigate the initial attack vector.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"desktopimgdownldr.exe\" or process.pe.original_file_name == \"desktopimgdownldr.exe\") and\n  process.args : \"/lockscreenurl:http*\"\n",
   "references": [
     "https://labs.sentinelone.com/living-off-windows-land-a-new-native-file-downldr/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json
index 703155453e7fc..eb5c0e07a534d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via MpCmdRun",
-  "note": "## Triage and analysis\n\n### Investigating Remote File Download via MpCmdRun\nVerify details such as the parent process, URL reputation, and downloaded file details. Additionally, `MpCmdRun` logs this information in the Appdata Temp folder in `MpCmdRun.log`.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via MpCmdRun\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse signed utilities to drop these files.\n\nThe `MpCmdRun.exe` is a command-line tool part of Windows Defender and is used to manage various Microsoft Windows\nDefender Antivirus settings and perform certain tasks. It can also be abused by attackers to download remote files,\nincluding malware and offensive tooling. This rule looks for the patterns used to perform downloads using the utility.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check the reputation of the domain or IP address used to host the downloaded file.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Investigate the initial attack vector.\nVerify details such as the parent process, URL reputation, and downloaded file details. Additionally, `MpCmdRun` logs this information in the Appdata Temp folder in `MpCmdRun.log`.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type == \"start\" and\n  (process.name : \"MpCmdRun.exe\" or process.pe.original_file_name == \"MpCmdRun.exe\") and\n   process.args : \"-DownloadFile\" and process.args : \"-url\" and process.args : \"-path\"\n",
   "references": [
     "https://twitter.com/mohammadaskar2/status/1301263551638761477",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json
index 3ffd0391df866..2f30ef0bf0421 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json
@@ -12,6 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via PowerShell",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via PowerShell\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse signed utilities to drop these files.\n\nPowerShell is one of system administrators' main tools for automation, report routines, and other tasks. This makes it\navailable for use in various environments and creates an attractive way for attackers to execute code and perform\nactions. This rule correlates network and file events to detect downloads of executable and script files performed using\nPowerShell.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Consider whether the user needs PowerShell to complete its tasks.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check the reputation of the domain or IP address used to host the downloaded file.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- Administrators can use PowerShell legitimately to download executable and script files. Analysts can dismiss the alert\nif the Administrator is aware of the activity and the triage has not identified suspicious or malicious files.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Investigate the initial attack vector.\n",
   "query": "sequence by host.id, process.entity_id with maxspan=30s\n  [network where process.name : (\"powershell.exe\", \"pwsh.exe\", \"powershell_ise.exe\") and network.protocol == \"dns\" and\n   not dns.question.name : (\"localhost\", \"*.microsoft.com\", \"*.azureedge.net\", \"*.powershellgallery.com\", \"*.windowsupdate.com\", \"metadata.google.internal\") and \n   not user.domain : \"NT AUTHORITY\"]\n    [file where process.name : \"powershell.exe\" and event.type == \"creation\" and file.extension : (\"exe\", \"dll\", \"ps1\", \"bat\") and \n   not file.name : \"__PSScriptPolicy*.ps1\"]\n",
   "risk_score": 47,
   "rule_id": "33f306e8-417c-411b-965c-c2812d6d3f4d",
@@ -63,5 +64,5 @@
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
index eed29634daeef..d6d74d8102ee5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
@@ -12,6 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via Script Interpreter",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via Script Interpreter\n\nThe Windows Script Host (WSH) is a Windows automation technology, which is ideal for non-interactive scripting needs,\nsuch as logon scripting, administrative scripting, and machine automation.\n\nAttackers commonly use WSH scripts as their initial access method, acting like droppers for second stage payloads, but\ncan also use them to download tools and utilities needed to accomplish their goals.\n\nThis rule looks for DLLs and executables downloaded using `cscript.exe` or `wscript.exe`.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Retrieve the script file and the executable involved:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n  - Manually analyze the script to determine if malicious capabilities are present.\n- Investigate whether the potential malware ran successfully, is active on the host, or was stopped by defenses.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n\n### False positive analysis\n\n- The usage of these script engines by regular users is unlikely. In the case of authorized benign true positives\n(B-TPs), exceptions can be added.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n- Remove and block malicious artifacts identified on the triage.\n- Reimage the host operating system and restore compromised files to clean versions.\n",
   "query": "sequence by host.id, process.entity_id\n  [network where process.name : (\"wscript.exe\", \"cscript.exe\") and network.protocol != \"dns\" and\n   network.direction : (\"outgoing\", \"egress\") and network.type == \"ipv4\" and destination.ip != \"127.0.0.1\"\n  ]\n  [file where event.type == \"creation\" and file.extension : (\"exe\", \"dll\")]\n",
   "risk_score": 47,
   "rule_id": "1d276579-3380-4095-ad38-e596a01bc64f",
@@ -41,5 +42,5 @@
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json
index 96d87cc39d82d..2f08c107752ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json
@@ -10,7 +10,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "SUNBURST Command and Control Activity",
-  "note": "## Triage and analysis\n\nThe SUNBURST malware attempts to hide within the Orion Improvement Program (OIP) network traffic. As this rule detects post-exploitation network traffic, investigations into this should be prioritized.",
+  "note": "## Triage and analysis\n\n### Investigating SUNBURST Command and Control Activity\n\nSUNBURST is a trojanized version of a digitally signed SolarWinds Orion plugin called\nSolarWinds.Orion.Core.BusinessLayer.dll. The plugin contains a backdoor that communicates via HTTP to third-party\nservers. After an initial dormant period of up to two weeks, SUNBURST may retrieve and execute commands that instruct\nthe backdoor to transfer files, execute files, profile the system, reboot the system, and disable system services.\nThe malware's network traffic attempts to blend in with legitimate SolarWinds activity by imitating the Orion\nImprovement Program (OIP) protocol, and the malware stores persistent state data within legitimate plugin configuration files. The\nbackdoor uses multiple obfuscated blocklists to identify processes, services, and drivers associated with forensic and\nanti-virus tools.\n\nMore details on SUNBURST can be found on the [Mandiant Report](https://www.mandiant.com/resources/sunburst-additional-technical-details).\n\nThis rule identifies suspicious network connections that attempt to blend in with legitimate SolarWinds activity\nby imitating the Orion Improvement Program (OIP) protocol behavior.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Retrieve the executable involved:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n  - Manually analyze the executable to determine if malicious capabilities are present.\n- Investigate whether the potential malware ran successfully, is active on the host, or was stopped by defenses.\n- Investigate the network traffic.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n\n### False positive analysis\n\n- False positives are unlikely for this rule.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n- Remove and block malicious artifacts identified on the triage.\n- Reimage the host operating system and restore compromised files to clean versions.\n- Upgrade SolarWinds systems to the latest version.\n",
   "query": "network where event.type == \"protocol\" and network.protocol == \"http\" and\n  process.name : (\"ConfigurationWizard.exe\",\n                  \"NetFlowService.exe\",\n                  \"NetflowDatabaseMaintenance.exe\",\n                  \"SolarWinds.Administration.exe\",\n                  \"SolarWinds.BusinessLayerHost.exe\",\n                  \"SolarWinds.BusinessLayerHostx64.exe\",\n                  \"SolarWinds.Collector.Service.exe\",\n                  \"SolarwindsDiagnostics.exe\") and\n  (http.request.body.content : \"*/swip/Upload.ashx*\" and http.request.body.content : (\"POST*\", \"PUT*\")) or\n  (http.request.body.content : (\"*/swip/SystemDescription*\", \"*/swip/Events*\") and http.request.body.content : (\"GET*\", \"HEAD*\")) and\n  not http.request.body.content : \"*solarwinds.com*\"\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2020/12/evasive-attacker-leverages-solarwinds-supply-chain-compromises-with-sunburst-backdoor.html"
@@ -73,5 +73,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
index 022ae049f58f2..200c5ebe48356 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Copy via TeamViewer",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Copy via TeamViewer\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse legitimate utilities to drop these files.\n\nTeamViewer is a remote access and remote control tool used by helpdesks and system administrators to perform various\nsupport activities. It is also frequently used by attackers and scammers to deploy malware interactively and other\nmalicious activities. This rule looks for the TeamViewer process creating files with suspicious extensions.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Contact the user to gather information about who and why was conducting the remote access.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check whether the company uses TeamViewer for the support activities and if there is a support ticket related to this\naccess.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Analysts can dismiss the alert if the company relies on TeamViewer to conduct\nremote access and the triage has not identified suspicious or malicious files.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type == \"creation\" and process.name : \"TeamViewer.exe\" and\n  file.extension : (\"exe\", \"dll\", \"scr\", \"com\", \"bat\", \"ps1\", \"vbs\", \"vbe\", \"js\", \"wsh\", \"hta\")\n",
   "references": [
     "https://blog.menasec.net/2019/11/hunting-for-suspicious-use-of.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json
index a8a73e2176f03..97ca284b78912 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json
@@ -11,7 +11,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Credential Access via DCSync",
-  "note": "## Triage and analysis.\n\n### Investigating Active Directory Replication From User Account\n\nActive Directory replication is the process by which the changes that originate on one domain controller are\nautomatically transferred to other domain controllers that store the same data. \n\nActive Directory data takes the form of objects that have properties, or attributes. Each object is an instance\nof an object class, and object classes and their respective attributes are defined in the Active Directory schema.\nThe values of the attributes define the object, and a change to a value of an attribute must be transferred from\nthe domain controller on which it occurs to every other domain controller that stores a replica of that object.\n\nAdversaries can use the DCSync technique that uses Windows Domain Controller's API to simulate the replication process\nfrom a remote domain controller, compromising major credential material such as the Kerberos krbtgt keys used\nlegitimately for tickets creation, but also tickets forging by attackers. This attack requires some extended privileges\nto succeed (DS-Replication-Get-Changes and DS-Replication-Get-Changes-All), which are granted by default to members of\nthe Administrators, Domain Admins, Enterprise Admins, and Domain Controllers groups. Privileged accounts can be abused\nto grant controlled objects the right to DCsync/Replicate.\n\nMore details can be found on [Threat Hunter Playbook](https://threathunterplaybook.com/library/windows/active_directory_replication.html?highlight=dcsync#directory-replication-services-auditing).\nand [The Hacker Recipes](https://www.thehacker.recipes/ad/movement/credentials/dumping/dcsync)\n\nThis rule will monitor for Event ID 4662 (Operation was performed on an Active Directory object) and identify events that use the access\nmask 0x100 (Control Access) and properties that contain at least one of the following or their equivalent Schema-Id-GUID\n(DS-Replication-Get-Changes, DS-Replication-Get-Changes-All, DS-Replication-Get-Changes-In-Filtered-Set). It also filters out events that\nuse computer accounts and also Azure AD Connect MSOL accounts (more details [here](https://techcommunity.microsoft.com/t5/microsoft-defender-for-identity/ad-connect-msol-user-suspected-dcsync-attack/m-p/788028)).\n\n#### Possible investigation steps:\n\n- Identify the account that performed the action.\n- Confirm whether the account owner is aware of the operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Correlate security events 4662 and 4624 (Logon Type 3) by their Logon ID (`winlog.logon.id`) on the Domain Controller (DC) that received\nthe replication request. This will tell you where the AD replication request came from, and if it came from another DC or not.\n- Investigate which credentials were compromised (e.g. All accounts were replicated or a specific account).\n\n### False Positive Analysis\n\n- This activity should not happen legitimately. Any potential B-TP (Benign True Positive) should be mapped and monitored by the security\nteam as replication should be done by Domain Controllers only. Any account that performs this activity can put the domain at risk for not\nhaving the same security standards (Long, complex, random passwords that change frequently) as computer accounts, exposing it to credential\ncracking attacks (Kerberoasting, brute force, etc.).\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If specific credentials were compromised:\n    - Reset the password for the accounts.\n- If the entire domain or the `krbtgt` user were compromised:\n    - Activate your incident response plan for total Active Directory compromise which should include, but not be limited to, a password\n    reset (twice) of the `krbtgt` user.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nAudit Policies > \nDS Access > \nAudit Directory Service Changes (Success,Failure)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Credential Access via DCSync\n\nActive Directory replication is the process by which the changes that originate on one domain controller are\nautomatically transferred to other domain controllers that store the same data.\n\nActive Directory data consists of objects that have properties, or attributes. Each object is an instance of an object\nclass, and object classes and their respective attributes are defined in the Active Directory schema. Objects are\ndefined by the values of their attributes, and changes to attribute values must be transferred from the domain\ncontroller on which they occur to every other domain controller that stores a replica of an affected object. \n\nAdversaries can use the DCSync technique that uses Windows Domain Controller's API to simulate the replication process\nfrom a remote domain controller, compromising major credential material such as the Kerberos krbtgt keys used\nlegitimately for tickets creation, but also tickets forging by attackers. This attack requires some extended privileges\nto succeed (DS-Replication-Get-Changes and DS-Replication-Get-Changes-All), which are granted by default to members of\nthe Administrators, Domain Admins, Enterprise Admins, and Domain Controllers groups. Privileged accounts can be abused\nto grant controlled objects the right to DCsync/Replicate.\n\nMore details can be found on [Threat Hunter Playbook](https://threathunterplaybook.com/library/windows/active_directory_replication.html?highlight=dcsync#directory-replication-services-auditing) and [The Hacker Recipes](https://www.thehacker.recipes/ad/movement/credentials/dumping/dcsync).\n\nThis rule monitors for Event ID 4662 (Operation was performed on an Active Directory object) and identifies events that\nuse the access mask 0x100 (Control Access) and properties that contain at least one of the following or their equivalent:\nSchema-Id-GUID (DS-Replication-Get-Changes, DS-Replication-Get-Changes-All, DS-Replication-Get-Changes-In-Filtered-Set).\nIt also filters out events that use computer accounts and also Azure AD Connect MSOL accounts (more details [here](https://techcommunity.microsoft.com/t5/microsoft-defender-for-identity/ad-connect-msol-user-suspected-dcsync-attack/m-p/788028)). \n\n#### Possible investigation steps\n\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Correlate security events 4662 and 4624 (Logon Type 3) by their Logon ID (`winlog.logon.id`) on the Domain Controller\n(DC) that received the replication request. This will tell you where the AD replication request came from, and if it\ncame from another DC or not.\n- Investigate which credentials were compromised (for example whether all accounts were replicated, or only a specific account).\n\n### False positive analysis \n\n- This activity should not happen legitimately, since replication should be done by Domain Controllers only. Any\npotential benign true positive (B-TP) should be mapped and monitored by the security team. Any account that performs\nthis activity can put the domain at risk for not having the same security standards as computer accounts (which have\nlong, complex, random passwords that change frequently), exposing it to credential cracking attacks (Kerberoasting,\nbrute force, etc.).\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If specific credentials were compromised:\n  - Reset passwords for affected accounts.\n- If the entire domain or the `krbtgt` user were compromised:\n  - Activate your incident response plan for total Active Directory compromise which should include, but not be limited\n  to, a password reset (twice) of the `krbtgt` user. \n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nAudit Policies >\nDS Access >\nAudit Directory Service Changes (Success,Failure)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "any where event.action == \"Directory Service Access\" and\n  event.code == \"4662\" and winlog.event_data.Properties : (\n\n    /* Control Access Rights/Permissions Symbol */\n\n    \"*DS-Replication-Get-Changes*\",\n    \"*DS-Replication-Get-Changes-All*\",\n    \"*DS-Replication-Get-Changes-In-Filtered-Set*\",\n\n    /* Identifying GUID used in ACE */\n\n    \"*1131f6ad-9c07-11d1-f79f-00c04fc2dcd2*\",\n    \"*1131f6aa-9c07-11d1-f79f-00c04fc2dcd2*\",\n    \"*89e95b76-444d-4c62-991a-0facbeda640c*\") \n    \n    /* The right to perform an operation controlled by an extended access right. */\n\n    and winlog.event_data.AccessMask : \"0x100\" and\n    not winlog.event_data.SubjectUserName : (\"*$\", \"MSOL_*\")\n",
   "references": [
     "https://threathunterplaybook.com/notebooks/windows/06_credential_access/WIN-180815210510.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json
index ed0657315d243..aa19cb45d9352 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
index 4688a7b3c9be9..de1cad9c2f081 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Credential Acquisition via Registry Hive Dumping",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Credential Acquisition via Registry Hive Dumping\n\nDumping registry hives is a common way to access credential information as some hives store credential material.\n\nFor example, the SAM hive stores locally cached credentials (SAM Secrets), and the SECURITY hive stores domain cached\ncredentials (LSA secrets).\n\nDumping these hives in combination with the SYSTEM hive enables the attacker to decrypt these secrets.\n\nThis rule identifies the usage of `reg.exe` to dump SECURITY and/or SAM hives, which potentially indicates the\ncompromise of the credentials stored in the host.\n\n#### Possible investigation steps\n\n- Investigate script execution chain (parent process tree).\n- Confirm whether the involved account should perform this kind of operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Investigate if the file was exfiltrated or processed locally by other tools.\n- Scope potentially compromised accounts. Analysts can do this by searching for login events (e.g., 4624) to the target\nhost.\n\n### False positive analysis\n\n- Administrators can export registry hives for backup purposes using command line tools like `reg.exe`. Check whether\nthe user is legitamitely performing this kind of activity.\n\n### Related rules\n\n- Registry Hive File Creation via SMB - a4c7473a-5cb4-4bc1-9d06-e4a75adbc494\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- Scope compromised credentials and disable affected accounts.\n- Reset passwords for potentially compromised user and service accounts (Email, services, CRMs, etc.).\n- Reimage the host operating system and restore compromised files to clean versions.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n process.pe.original_file_name == \"reg.exe\" and\n process.args : (\"save\", \"export\") and\n process.args : (\"hklm\\\\sam\", \"hklm\\\\security\")\n",
   "references": [
     "https://medium.com/threatpunter/detecting-attempts-to-steal-passwords-from-the-registry-7512674487f8"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
index 813fa167f6ab1..c42b1a068992d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
@@ -15,7 +15,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Kerberos Traffic from Unusual Process",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Kerberos Traffic from Unusual Process\n\nKerberos is the default authentication protocol in Active Directory, designed to provide strong authentication for\nclient/server applications by using secret-key cryptography.\n\nDomain-joined hosts usually perform Kerberos traffic using the `lsass.exe` process. This rule detects the occurrence of\ntraffic on the Kerberos port (88) by processes other than `lsass.exe` to detect the unusual request and usage of\nKerberos tickets.\n\n#### Possible investigation steps\n\n- Investigate script execution chain (parent process tree).\n- Investigate other alerts related to the host and user in the last 48 hours.\n- Check if the Destination IP is related to a Domain Controller.\n- Review event ID 4769 for suspicious ticket requests.\n\n### False positive analysis\n\n- This rule uses a Kerberos-related port but does not identify the protocol used on that port. HTTP traffic on a\nnon-standard port or destination IP address unrelated to Domain controllers can create false positives.\n- Exceptions can be added for noisy/frequent connections.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Scope possible compromised credentials based on ticket requests.\n- Isolate the involved host to prevent further post-compromise behavior.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "network where event.type == \"start\" and network.direction : (\"outgoing\", \"egress\") and\n destination.port == 88 and source.port >= 49152 and\n process.executable != \"C:\\\\Windows\\\\System32\\\\lsass.exe\" and destination.address !=\"127.0.0.1\" and destination.address !=\"::1\" and\n /* insert false positives here */\n not process.name in (\"swi_fc.exe\", \"fsIPcam.exe\", \"IPCamera.exe\", \"MicrosoftEdgeCP.exe\", \"MicrosoftEdge.exe\", \"iexplore.exe\", \"chrome.exe\", \"msedge.exe\", \"opera.exe\", \"firefox.exe\")\n",
   "risk_score": 47,
   "rule_id": "897dc6b5-b39f-432a-8d75-d3730d50c782",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
index 2f04843ec7a95..db2ddac681a6c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
@@ -56,5 +56,5 @@
   "timeline_title": "Comprehensive File Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json
index 03ae8e244d578..c639af0e1745c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json
@@ -11,7 +11,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "LSASS Memory Dump Handle Access",
-  "note": "## Triage and analysis.\n\n### Investigating\n\nLocal Security Authority Server Service (LSASS) is a process in Microsoft Windows operating systems that is responsible\nfor enforcing the security policy on the system. It verifies users logging on to a Windows computer or server, handles\npassword changes, and creates access tokens.\n\nAdversaries may attempt to access credential material stored in the process memory of the LSASS. After a user logs on,\nthe system generates and stores a variety of credential materials in LSASS process memory. This is meant to facilitate\nsingle sign-on (SSO) ensuring a user isn\u2019t prompted each time resource access is requested. These credential materials\ncan be harvested by an adversary using administrative user or SYSTEM privileges to conduct Lateral Movement using\n[Use Alternate Authentication Material](https://attack.mitre.org/techniques/T1550/).\n\n#### Possible investigation steps:\n\n- Validate the correct install path for the process that triggered this detection\n- Confirm that any AV or EDR solutions that trigger this detection have the correct install path\n\n### False Positive Analysis\n\n- There should be very few if any false positives for this rule. However, it may be tripped by AV or EDR solutions.\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage\n- In case of specific credentials were compromised:\n    - Reset the password for the accounts\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested)\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nSystem Audit Policies >\nObject Access >\nAudit File System (Success,Failure)\nAudit Handle Manipulation (Success,Failure)\n```\n\nAlso, this event generates only if the object\u2019s [SACL](https://docs.microsoft.com/en-us/windows/win32/secauthz/access-control-lists) has the required ACE to handle the use of specific access rights.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating LSASS Memory Dump Handle Access\n\nLocal Security Authority Server Service (LSASS) is a process in Microsoft Windows operating systems that is responsible\nfor enforcing security policy on the system. It verifies users logging on to a Windows computer or server, handles\npassword changes, and creates access tokens.\n\nAdversaries may attempt to access credential material stored in LSASS process memory. After a user logs on,the system\ngenerates and stores a variety of credential materials in LSASS process memory. This is meant to facilitate single\nsign-on (SSO) ensuring a user isn\u2019t prompted each time resource access is requested. These credential materials can be\nharvested by an adversary using administrative user or SYSTEM privileges to conduct lateral movement using \n[alternate authentication material](https://attack.mitre.org/techniques/T1550/).\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Validate the correct install path for the process that triggered this detection.\n\n### False positive analysis\n\n- There should be very few if any false positives for this rule. However, it may be tripped by antivirus or endpoint detection and response solutions;\ncheck whether these solutions are installed on the correct paths.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Scope compromised credentials and disable the accounts.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically:\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested)\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nSystem Audit Policies >\nObject Access >\nAudit File System (Success,Failure)\nAudit Handle Manipulation (Success,Failure)\n```\n\nAlso, this event generates only if the object\u2019s [SACL](https://docs.microsoft.com/en-us/windows/win32/secauthz/access-control-lists) has the required access control entry (ACE) to handle the use of specific access rights.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "any where event.action == \"File System\" and event.code == \"4656\" and\n\n    winlog.event_data.ObjectName : (\n        \"?:\\\\Windows\\\\System32\\\\lsass.exe\",\n        \"\\\\Device\\\\HarddiskVolume?\\\\Windows\\\\System32\\\\lsass.exe\",\n        \"\\\\Device\\\\HarddiskVolume??\\\\Windows\\\\System32\\\\lsass.exe\") and\n\n    /* The right to perform an operation controlled by an extended access right. */\n\n    (winlog.event_data.AccessMask : (\"0x1fffff\" , \"0x1010\", \"0x120089\", \"0x1F3FFF\") or\n     winlog.event_data.AccessMaskDescription : (\"READ_CONTROL\", \"Read from process memory\"))\n\n     /* Common Noisy False Positives */\n\n    and not winlog.event_data.ProcessName : (\n        \"?:\\\\Program Files\\\\*.exe\",\n        \"?:\\\\Program Files (x86)\\\\*.exe\",\n        \"?:\\\\Windows\\\\system32\\\\wbem\\\\WmiPrvSE.exe\",\n        \"?:\\\\Windows\\\\System32\\\\dllhost.exe\",\n        \"?:\\\\Windows\\\\System32\\\\svchost.exe\",\n        \"?:\\\\Windows\\\\System32\\\\msiexec.exe\",\n        \"?:\\\\ProgramData\\\\Microsoft\\\\Windows Defender\\\\*.exe\",\n        \"?:\\\\Windows\\\\explorer.exe\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json
index 0cdf87c777ce1..05bcd8d38ac37 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Mimikatz Memssp Log File Detected",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis.\n\n### Investigating Mimikatz Memssp Log File Detected\n\n[Mimikatz](https://github.com/gentilkiwi/mimikatz) is an open-source tool used to collect, decrypt, and/or use cached\ncredentials. This tool is commonly abused by adversaries during the post-compromise stage where adversaries have gained\nan initial foothold on an endpoint and are looking to elevate privileges and seek out additional authentication objects\nsuch as tokens/hashes/credentials that can then be used to laterally move and pivot across a network.\n\nThis rule looks for the creation of a file named `mimilsa.log`, which is generated when using the Mimikatz misc::memssp\nmodule, which injects a malicious Windows SSP to collect locally authenticated credentials, which includes the computer\naccount password, running service credentials, and any accounts that logon.\n\n#### Possible investigation steps\n\n- Investigate script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Scope potentially compromised accounts. Analysts can do this by searching for login events (e.g., 4624) to the target\nhost.\n- Retrieve and inspect the log file contents.\n- By default, the log file is created in the same location as the DLL file.\n- Search for DLL files created in the location, and retrieve any DLLs that are not signed:\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of these files.\n    - Search for the existence of these files in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This file name `mimilsa.log` should not legitimately be created.\n\n### Related rules\n\n- Mimikatz Powershell Module Activity - ac96ceb8-4399-4191-af1d-4feeac1f1f46\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- If the host is a Domain Controller (DC):\n  - Activate your incident response plan for total Active Directory compromise.\n  - Review the permissions of users that can access the DCs.\n- Reset passwords for all compromised accounts.\n- Disable remote login for compromised user accounts.\n- Reboot the host to remove the injected SSP from memory.\n- Reimage the host operating system or restore compromised files to clean versions.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where file.name : \"mimilsa.log\" and process.name : \"lsass.exe\"\n",
   "risk_score": 73,
   "rule_id": "ebb200e8-adf0-43f8-a0bb-4ee5b5d852c6",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json
index 4e0abecf3e443..3c6d4d2c1a166 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json
@@ -2,14 +2,15 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies the creation or modification of a medium size registry hive file via the SMB protocol. This may indicate an exfiltration attempt via dumping SAM registry hive in preparation for credential access.",
+  "description": "Identifies the creation or modification of a medium-size registry hive file on an SMB share, which may indicate an exfiltration attempt of a previously dumped SAM registry hive for credential extraction on an attacker-controlled system.",
   "from": "now-9m",
   "index": [
     "logs-endpoint.events.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Registry Hive File Creation via SMB",
+  "name": "Windows Registry File Creation in SMB Share",
+  "note": "## Triage and analysis\n\n### Investigating Windows Registry File Creation in SMB Share\n\nDumping registry hives is a common way to access credential information. Some hives store credential material, as is the\ncase for the SAM hive, which stores locally cached credentials (SAM Secrets), and the SECURITY hive, which stores domain\ncached credentials (LSA secrets). Dumping these hives in combination with the SYSTEM hive enables the attacker to\ndecrypt these secrets.\n\nAttackers can try to evade detection on the host by transferring this data to a system that is not\nmonitored to be parsed and decrypted. This rule identifies the creation or modification of a medium-size registry hive\nfile on an SMB share, which may indicate this kind of exfiltration attempt.\n\n#### Possible investigation steps\n\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Confirm whether the account owner is aware of the operation.\n- Examine command line logs for the period when the alert was triggered.\n- Capture the registry file(s) to scope the compromised credentials in an eventual Incident Response.\n\n### False positive analysis\n\n- Administrators can export registry hives for backup purposes. Check whether the user should be performing this kind of\nactivity and is aware of it.\n\n### Related rules\n\n- Credential Acquisition via Registry Hive Dumping - a7e7bfa3-088e-4f13-b29e-3986e0e756b8\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- Scope compromised credentials and disable associated accounts.\n- Reset passwords for compromised accounts.\n- Reimage the host operating system and restore compromised files to clean versions.\n",
   "query": "file where event.type == \"creation\" and\n /* regf file header */\n file.Ext.header_bytes : \"72656766*\" and file.size >= 30000 and\n process.pid == 4 and user.id : \"s-1-5-21*\"\n",
   "risk_score": 47,
   "rule_id": "a4c7473a-5cb4-4bc1-9d06-e4a75adbc494",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json
index 102056540e0e2..110a71702fb81 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Remote Credential Access via Registry",
-  "note": "## Config\n\nThis rule uses Elastic Endpoint file creation and System Integration events for correlation. Both data should be\ncollected from the host for this detection to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Remote Credential Access via Registry\n\nDumping registry hives is a common way to access credential information. Some hives store credential material, \nsuch as the SAM hive, which stores locally cached credentials (SAM Secrets), and the SECURITY hive, which stores domain\ncached credentials (LSA secrets). Dumping these hives in combination with the SYSTEM hive enables the attacker to\ndecrypt these secrets.\n\nAttackers can use tools like secretsdump.py or CrackMapExec to dump the registry hives remotely, and use dumped\ncredentials to access other systems in the domain.\n\n#### Possible investigation steps\n\n- Identify the target host role, involved account, and source host.\n- Determine the privileges assigned to any compromised accounts.\n- Investigate other alerts related to the involved user and source host in the last 48 hours.\n- Scope potentially compromised accounts. Analysts can do this by searching for login events (e.g., 4624) to the target\nhost.\n\n### False positive analysis\n\n- False positives for this rule are unlikely. Any activity that triggered the alert and is not inherently malicious must\nbe monitored by the security team.\n\n### Related rules\n\n- Credential Acquisition via Registry Hive Dumping - a7e7bfa3-088e-4f13-b29e-3986e0e756b8\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- Scope compromised credentials and disable the accounts.\n- Reset the passwords of compromised accounts.\n- Determine if other hosts were compromised.\n\n## Config\n\nThis rule uses Elastic Endpoint file creation and System Integration events for correlation. Both data should be\ncollected from the host for this detection to work.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "sequence by host.id, user.id with maxspan=1m\n [authentication where\n   event.outcome == \"success\" and\n   winlog.logon.type == \"Network\" and not user.name == \"ANONYMOUS LOGON\" and\n   not user.domain == \"NT AUTHORITY\" and source.ip != \"127.0.0.1\" and source.ip !=\"::1\"]\n [file where event.action == \"creation\" and process.name : \"svchost.exe\" and\n  file.Ext.header_bytes : \"72656766*\" and user.id : \"S-1-5-21-*\" and file.size >= 30000]\n",
   "references": [
     "https://github.com/SecureAuthCorp/impacket/blob/master/examples/secretsdump.py"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json
index 853b1446cb41f..14a042b2cff52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json
index 261510427a628..5c9fc3f5777ed 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json
@@ -9,7 +9,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -52,5 +51,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json
index 70f897b2ee83a..71c47ee2a7bc3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "User account exposed to Kerberoasting",
-  "note": "## Triage and analysis.\n\n### Investigating User account exposed to Kerberoasting\n\nService principal names (SPNs) is the name by which a Kerberos client uniquely identifies an instance of a service for a\ngiven Kerberos target computer. \n\nBy default, only computer accounts have SPNs, and there is no significant risk about this, as machine accounts have a\ndefault domain policy that configures these accounts to rotate their passwords every 30 days, and the password is\ncompound of 120 random characters, making them not to be vulnerable to Kerberoasting.\n\nSo, a user account with an SPN assigned is considered a Service Account, making it available to be accessed by the\nentire domain. If any user in the directory requests a TGS, the domain controller will encrypt it with the secret key of\nthe account executing the service. An attacker can potentially perform a Kerberoasting attack with this information, as\nthe human-defined password is more likely to be less complex.\n\nFor scenarios where SPNs cannot be avoided on user accounts, Microsoft provides the Group Managed Service Accounts (gMSA)\nfeature, which ensures that the account password is robust and changed regularly and automatically. More information can\nbe found [here](https://docs.microsoft.com/en-us/windows-server/security/group-managed-service-accounts/group-managed-service-accounts-overview).\n\nAttackers can also perform \"Targeted Kerberoasting\", which consists of adding fake SPNs to user accounts that they have\nwrite privileges to, making them potentially vulnerable to Kerberoasting.\n\n#### Possible investigation steps:\n\n- Identify the account that performed the action.\n- Check whether this user should be doing this kind of activity.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate if the target account is a member of Privileged groups (Domain Admins, Enterprise Admins, etc).\n- Investigate if tickets have been requested for the target account.\n- Investigate other alerts related to the user in the last 48 hours.\n\n### False Positive Analysis\n\n- The use of user accounts as service accounts is a bad security practice and should not be allowed in the domain. The\nsecurity team should map and monitor any potential B-TP (Benign True Positive), especially if the account is privileged.\nDomain Administrators that define this kind of setting can put the domain at risk as user accounts don't have the same\nsecurity standards (Long, complex, random passwords that change frequently) as computer accounts, exposing them to\ncredential cracking attacks (Kerberoasting, brute force, etc.).\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage\n- Reset the password of the involved accounts. Priority should be given to privileged accounts.\n- Quarantine the involved host for forensic investigation, as well as eradication and recovery activities.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nAudit Policies > \nDS Access > \nAudit Directory Service Changes (Success,Failure)\n```\n\nThe above policy does not cover User objects, so we need to set up an AuditRule using https://github.com/OTRF/Set-AuditRule.\nAs this specifies the servicePrincipalName Attribute GUID, it is expected to be low noise.\n\n```\nSet-AuditRule -AdObjectPath 'AD:\\CN=Users,DC=Domain,DC=com' -WellKnownSidType WorldSid -Rights WriteProperty -InheritanceFlags Children -AttributeGUID f3a64788-5306-11d1-a9c5-0000f80367c1 -AuditFlags Success\n```\n",
+  "note": "## Triage and analysis\n\n### Investigating User account exposed to Kerberoasting\n\nService Principal Names (SPNs) are names by which Kerberos clients uniquely identify service instances for Kerberos target\ncomputers.\n\nBy default, only computer accounts have SPNs, which creates no significant risk, since machine accounts have a default\ndomain policy that rotates their passwords every 30 days, and the password is composed of 120 random characters, making\nthem invulnerable to Kerberoasting.\n\nA user account with an SPN assigned is considered a Service Account, and is accessible to the entire domain. If any\nuser in the directory requests a ticket-granting service (TGS), the domain controller will encrypt it with the secret\nkey of the account executing the service. An attacker can potentially perform a Kerberoasting attack with this\ninformation, as the human-defined password is likely to be less complex.\n\nFor scenarios where SPNs cannot be avoided on user accounts, Microsoft provides the Group Managed Service Accounts (gMSA)\nfeature, which ensures that account passwords are robust and changed regularly and automatically. More information can\nbe found [here](https://docs.microsoft.com/en-us/windows-server/security/group-managed-service-accounts/group-managed-service-accounts-overview).\n\nAttackers can also perform \"Targeted Kerberoasting\", which consists of adding fake SPNs to user accounts that they have\nwrite privileges to, making them potentially vulnerable to Kerberoasting.\n\n#### Possible investigation steps\n\n- Identify the account that performed the action.\n- Check whether this user should be doing this kind of activity.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate if the target account is a member of privileged groups (Domain Admins, Enterprise Admins, etc.).\n- Investigate if tickets have been requested for the target account.\n- Investigate other alerts related to the user in the last 48 hours.\n\n### False positive analysis\n\n- The use of user accounts as service accounts is a bad security practice and should not be allowed in the domain. The\nsecurity team should map and monitor any potential benign true positive (B-TP), especially if the account is privileged.\nDomain Administrators that define this kind of setting can put the domain at risk as user accounts don't have the same\nsecurity standards as computer accounts (which have long, complex, random passwords that change frequently), exposing\nthem to credential cracking attacks (Kerberoasting, brute force, etc.).\n\n### Response and remediation \n\n- Initiate the incident response process based on the outcome of the triage.\n- Reset the passwords of affected accounts, prioritizing privileged accounts.\n- Quarantine the involved host for forensic investigation, as well as eradication and recovery activities.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nAudit Policies >\nDS Access >\nAudit Directory Service Changes (Success,Failure)\n```\n\nThe above policy does not cover User objects, so we need to set up an AuditRule using https://github.com/OTRF/Set-AuditRule.\nAs this specifies the servicePrincipalName Attribute GUID, it is expected to be low noise.\n\n```\nSet-AuditRule -AdObjectPath 'AD:\\CN=Users,DC=Domain,DC=com' -WellKnownSidType WorldSid -Rights WriteProperty -InheritanceFlags Children -AttributeGUID f3a64788-5306-11d1-a9c5-0000f80367c1 -AuditFlags Success\n```\n",
   "query": "event.action:\"Directory Service Changes\" and event.code:5136 and winlog.event_data.ObjectClass:\"user\" \nand winlog.event_data.AttributeLDAPDisplayName:\"servicePrincipalName\"\n",
   "references": [
     "https://www.thehacker.recipes/ad/movement/access-controls/targeted-kerberoasting",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json
index 1daea178fca7e..32cfc08f94770 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json
@@ -16,7 +16,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Symbolic Link to Shadow Copy Created",
-  "note": "## Triage and analysis.\n\n### Investigating\n\nShadow copies are backups or snapshots of an endpoints files or volumes at the time of being in use. Adversaries may attempt to discover and create symbolic links to these shadow copies in order to copy sensitive information offline. If Active Directory (AD) is in use, often the ntds.dit file is a target as it contains password hashes but an offline copy is needed to extract these hashes and potentially conduct lateral movement.\n\n#### Possible investigation steps:\n\n- Determine if a volume shadow copy was recently created on this endpoint.\n- Review priviledges of the end user as this requires administrative access.\n- Verify ntds.dit file was successfully copied and the location.\n- Investigate for registry SYSTEM file copies made recently or saved via Reg.exe.\n- Investigate recent deletions of volume shadow copies.\n- Identify other files potentially copied from volume shadow copy paths directly.\n\n### False Positive Analysis\n\n- There should be very little false positive triggers with this rule.\n\n### Related Rules\n- NTDS or SAM Database File Copied - 3bc6deaa-fbd4-433a-ae21-3e892f95624f\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- In case specific credentials were compromised:\n    - Reset the password for the accounts\n- Locate and remove static files copied from volume shadow copies.\n- Command-Line tool mklink should require administrative access by default unless in developer mode.\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested)\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nSystem Audit Policies >\nObject Access >\nAudit File System (Success,Failure)\nAudit Handle Manipulation (Success,Failure)\n```\n\nThis event will only trigger if symbolic links are created from a new process spawning for cmd.exe or powershell.exe with the correct arguments.\nDirect access to a shell and calling symbolic link creation tools will not generate an event.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating Symbolic Link to Shadow Copy Created\n\nShadow copies are backups or snapshots of an endpoint's files or volumes while they are in use. Adversaries may attempt\nto discover and create symbolic links to these shadow copies in order to copy sensitive information offline. If Active\nDirectory (AD) is in use, often the ntds.dit file is a target as it contains password hashes, but an offline copy is\nneeded to extract these hashes and potentially conduct lateral movement.\n\n#### Possible investigation steps\n\n- Determine if a volume shadow copy was recently created on this endpoint.\n- Review priviledges of the end user as this requires administrative access.\n- Verify if the ntds.dit file was successfully copied and determine its copy destination.\n- Investigate for registry SYSTEM file copies made recently or saved via Reg.exe.\n- Investigate recent deletions of volume shadow copies.\n- Identify other files potentially copied from volume shadow copy paths directly.\n\n### False positive analysis\n\n- This rule should cause very few false positives. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Related rules \n\n- NTDS or SAM Database File Copied - 3bc6deaa-fbd4-433a-ae21-3e892f95624f\n\n### Response and remediation \n\n- Initiate the incident response process based on the outcome of the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- If the entire domain or the `krbtgt` user was compromised:\n  - Activate your incident response plan for total Active Directory compromise which should include, but not be limited\n  to, a password reset (twice) of the `krbtgt` user.\n- Locate and remove static files copied from volume shadow copies.\n- Command-Line tool mklink should require administrative access by default unless in developer mode.\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically:\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested) \n \n``` \nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nSystem Audit Policies > \nObject Access > \nAudit File System (Success,Failure) \nAudit Handle Manipulation (Success,Failure) \n``` \n \nThis event will only trigger if symbolic links are created from a new process spawning cmd.exe or powershell.exe with the correct arguments. \nDirect access to a shell and calling symbolic link creation tools will not generate an event matching this rule. \n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\",\"process_created\") and \n process.pe.original_file_name in (\"Cmd.Exe\",\"PowerShell.EXE\") and    \n \n /* Create Symbolic Link to Shadow Copies */\n process.args : (\"*mklink*\", \"*SymbolicLink*\") and process.command_line : (\"*HarddiskVolumeShadowCopy*\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/mklink",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
index 03189a0c45a28..791cfb1c3fce1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
@@ -61,5 +61,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 10
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
index eedca883e371c..c79afb655744e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
@@ -7,7 +7,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -50,5 +49,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
index b5c007363bdb8..0509138cf5238 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Windows Defender Exclusions Added via PowerShell",
-  "note": "## Triage and analysis\n\n### Investigating Windows Defender Exclusions\n\nMicrosoft Windows Defender is an anti-virus product built-in within Microsoft Windows. Since this software product is\nused to prevent and stop malware, it's important to monitor what specific exclusions are made to the product's configuration\nsettings. These can often be signs of an adversary or malware trying to bypass Windows Defender's capabilities. One of the more\nnotable [examples](https://www.cyberbit.com/blog/endpoint-security/latest-trickbot-variant-has-new-tricks-up-its-sleeve/) was observed in 2018 where Trickbot incorporated mechanisms to disable Windows Defense to avoid detection.\n\n#### Possible investigation steps:\n- With this specific rule, it's completely possible to trigger detections on network administrative activity or benign users\nusing scripting and PowerShell to configure the different exclusions for Windows Defender. Therefore, it's important to\nidentify the source of the activity first and determine if there is any mal-intent behind the events.\n- The actual exclusion such as the process, the file or directory should be reviewed in order to determine the original\nintent behind the exclusion. Is the excluded file or process malicious in nature or is it related to software that needs\nto be legitimately allowlisted from Windows Defender?\n\n### False Positive Analysis\n- This rule has a higher chance to produce false positives based on the nature around configuring exclusions by possibly\na network administrator. In order to validate the activity further, review the specific exclusion and its intent. There\nare many legitimate reasons for exclusions, so it's important to gain context.\n\n### Related Rules\n- Windows Defender Disabled via Registry Modification\n- Disabling Windows Defender Security Settings via PowerShell\n\n### Response and Remediation\n- Since this is related to post-exploitation activity, take immediate action to review, investigate and\npotentially isolate further activity.\n- If further analysis showed malicious intent was behind the Defender exclusions, administrators should remove\nthe exclusion and ensure antimalware capability has not been disabled or deleted.\n- Exclusion lists for antimalware capabilities should always be routinely monitored for review.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Windows Defender Exclusions Added via PowerShell\n\nMicrosoft Windows Defender is an antivirus product built into Microsoft Windows. Since this software product is\nused to prevent and stop malware, it's important to monitor what specific exclusions are made to the product's configuration\nsettings. These can often be signs of an adversary or malware trying to bypass Windows Defender's capabilities. One of\nthe more notable [examples](https://www.cyberbit.com/blog/endpoint-security/latest-trickbot-variant-has-new-tricks-up-its-sleeve/)\nwas observed in 2018 where Trickbot incorporated mechanisms to disable Windows Defender to avoid detection. \n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Examine the exclusion in order to determine the intent behind it.\n- Check for similar behavior in other hosts on the environment.\n- If the exclusion specifies a suspicious file, retrieve it and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This rule has a high chance to produce false positives due to how often network administrators legitimately configure\nexclusions. In order to validate the activity further, review the specific exclusion and its intent. There are many\nlegitimate reasons for exclusions, so it's important to gain context.\n\n### Related rules\n\n- Windows Defender Disabled via Registry Modification - 2ffa1f1e-b6db-47fa-994b-1512743847eb\n- Disabling Windows Defender Security Settings via PowerShell - c8cccb06-faf2-4cd5-886e-2c9636cfcb87\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n    - Immediately block the identified indicators of compromise (IoCs).\n    - Remove and block malicious artifacts identified on the triage.\n- Exclusion lists for antimalware capabilities should always be routinely monitored for review.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type == \"start\" and\n (process.name : (\"powershell.exe\", \"pwsh.exe\", \"powershell_ise.exe\") or process.pe.original_file_name in (\"powershell.exe\", \"pwsh.dll\", \"powershell_ise.exe\")) and\n  process.args : (\"*Add-MpPreference*\", \"*Set-MpPreference*\") and\n  process.args : (\"*-Exclusion*\")\n",
   "references": [
     "https://www.bitdefender.com/files/News/CaseStudies/study/400/Bitdefender-PR-Whitepaper-MosaicLoader-creat5540-en-EN.pdf"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json
index fc5dd888d5d45..96430e3705ce1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "PowerShell Script Block Logging Disabled",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating PowerShell Script Block Logging Disabled\n\nPowerShell is one of the main tools system administrators use for automation, report routines, and other tasks, making\nit available in various environments and creating an attractive way for attackers to execute code.\n\nPowerShell Script Block Logging is a feature of PowerShell that records the content of all script blocks that it\nprocesses, giving defenders visibility of PowerShell scripts and sequences of executed commands.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action.\n- Check whether the account should perform this kind of action.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check whether it makes sense for the user to use PowerShell to complete its tasks.\n- Investigate if PowerShell scripts were run after logging was disabled.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Related rules\n\n- PowerShell Suspicious Discovery Related Windows API Functions - 61ac3638-40a3-44b2-855a-985636ca985e\n- PowerShell Keylogging Script - bd2c86a0-8b61-4457-ab38-96943984e889\n- PowerShell Suspicious Script with Audio Capture Capabilities - 2f2f4939-0b34-40c2-a0a3-844eb7889f43\n- Potential Process Injection via PowerShell - 2e29e96a-b67c-455a-afe4-de6183431d0d\n- PowerShell Reflection Assembly Load - e26f042e-c590-4e82-8e05-41e81bd822ad\n- PowerShell Suspicious Payload Encoded and Compressed - 81fe9dc6-a2d7-4192-a2d8-eed98afc766a\n- PowerShell Suspicious Script with Screenshot Capabilities - 959a7353-1129-4aa7-9084-30746b256a70\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Review the implicated user account's privileges.\n- Configure AppLocker or equivalent software to restrict access to PowerShell for regular users.\n\n## Config\n\nThe 'PowerShell Script Block Logging' logging policy must be configured (Enable).\n\nSteps to implement the logging policy with with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nAdministrative Templates > \nWindows PowerShell > \nTurn on PowerShell Script Block Logging (Enable)\n```\n\nSteps to implement the logging policy via registry:\n\n```\nreg add \"hklm\\SOFTWARE\\Policies\\Microsoft\\Windows\\PowerShell\\ScriptBlockLogging\" /v EnableScriptBlockLogging /t REG_DWORD /d 1\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where event.type == \"change\" and\n    registry.path : \n        \"HKLM\\\\SOFTWARE\\\\Policies\\\\Microsoft\\\\Windows\\\\PowerShell\\\\ScriptBlockLogging\\\\EnableScriptBlockLogging\"\n    and registry.data.strings : (\"0\", \"0x00000000\")\n",
   "references": [
     "https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.PowerShell::EnableScriptBlockLogging"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
index 7e5451355c17a..d8901907381ec 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Disable Windows Firewall Rules via Netsh",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Disable Windows Firewall Rules via Netsh\n\nThe Windows Defender Firewall is a native component which provides host-based, two-way network traffic filtering for a\ndevice, and blocks unauthorized network traffic flowing into or out of the local device.\n\nAttackers can disable firewall rules which are intended to prevent lateral movement and command and control traffic to\nenable their operations.\n\nThis rule identifies patterns related to disabling firewall rules using the `netsh.exe` utility.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Contact the user to check if they are aware of the operation.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Analyze the executed command to determine what it allowed.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Check whether the user is legitimately performing this kind of activity.\n- Assess the need to disable the modification of the rule, and whether these actions expose the environment to\nunnecessary risks.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Evaluate exceptions that can be added to the firewall rule and re-enable the rule.\n- Review the implicated account's privileges.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.name : \"netsh.exe\" and\n  (process.args : \"disable\" and process.args : \"firewall\" and process.args : \"set\") or\n  (process.args : \"advfirewall\" and process.args : \"off\" and process.args : \"state\")\n",
   "risk_score": 47,
   "rule_id": "4b438734-3793-4fda-bd42-ceeada0be8f9",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
index 10ed16998c4cc..98c13db978a53 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
@@ -11,8 +11,8 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Remote Desktop Enabled in Windows Firewall",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "name": "Remote Desktop Enabled in Windows Firewall by Netsh",
+  "note": "## Triage and analysis\n\n### Investigating Remote Desktop Enabled in Windows Firewall by Netsh\n\nMicrosoft Remote Desktop Protocol (RDP) is a proprietary Microsoft protocol that enables remote connections to other\ncomputers, typically over TCP port 3389.\n\nAttackers can use RDP to conduct their actions interactively. Ransomware operators frequently use RDP to access\nvictim servers, often using privileged accounts.\n\nThis rule detects the creation of a Windows Firewall inbound rule that would allow inbound RDP traffic using the\n`netsh.exe` utility.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Contact the user to check if they are aware of the operation.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check whether it makes sense to enable RDP to this host, given its role in the environment.\n- Check if the host is directly exposed to the internet.\n- Check whether privileged accounts accessed the host shortly after the modification.\n\n### False positive analysis\n\n- The `netsh.exe` utility can be used legitimately. Check whether the user should be performing this kind of activity, whether the user is aware\nof it, whether RDP should be open, and whether the action exposes the environment to unnecessary risks.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If RDP is needed, make sure to secure it:\n  - Allowlist RDP traffic to specific trusted hosts.\n  - Restrict RDP logins to authorized non-administrator accounts, where possible.\n- Quarantine the implicated host to prevent further post-compromise behavior.\n- Review the implicated account's privileges.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n (process.name : \"netsh.exe\" or process.pe.original_file_name == \"netsh.exe\") and\n process.args : (\"localport=3389\", \"RemoteDesktop\", \"group=\\\"remote desktop\\\"\") and\n process.args : (\"action=allow\", \"enable=Yes\", \"enable\")\n",
   "risk_score": 47,
   "rule_id": "074464f9-f30d-4029-8c03-0ed237fffec7",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json
index eeb45198e7e21..a4608867ecde7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json
@@ -48,5 +48,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json
index 1ae658f2f14f3..40d25d7813a30 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json
@@ -52,5 +52,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 11
+  "version": 12
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
index 7ed0cc2f60dcd..4d66650aecb9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
@@ -40,5 +40,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json
index 06d9dc6fec4e7..9bb002ceecebc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Signed Proxy Execution via MS WorkFolders",
-  "note": "## Triage and analysis\n\n### Investigating control.exe Execution via Work Folders in Current Working Directory\n\nWork Folders is a role service for file servers running Windows Server that provides a consistent way for users to access their work files from their PCs and devices. This allows for users to store work files and access them from anywhere. When called, Work Folders will automatically execute any Portable Executable (PE) named `control.exe` as an argument before accessing the synced share.\n\nUsing Work Folders to execute a masqueraded control.exe could allow an adversary to bypass application controls and increase privileges.\n\n#### Possible investigation steps:\n- Investigate the process tree starting with parent process WorkFolders.exe and child process control.exe to determine if other child processes spawned during execution.\n- Trace the activity related to the `control.exe` binary to determine continued intrusion activity on the host.\n- Examine the location of the WorkFolders.exe binary to determine if it was copied to the location of the control.exe binary as it resides in the System32 directory by default.\n- Review the control.exe binary executed with Work Folders to determine maliciousness such as additional host activity or network traffic generated\n- Determine if control.exe was synced to sync share, indicating potential lateral movement.\n- Review where control.exe originated from on the host in terms of delivery such as email, web download or written to disk from a seperate binary.\n\n### False Positive Analysis\n- Windows Work Folders are used legitimately by end users and administrators for file sharing and syncing but not in the instance where a suspicious `control.exe` is passed as an argument.\n\n### Response and Remediation\n- If identified as a compromise, engage incident response processes and policies.\n- Take immediate action to review, investigate and potentially isolate activity to prevent further post-compromise\nbehavior.\n- Review the Work Folders synced share to determine if the 'control.exe' was shared and if so remove it.\n- If no lateral movement was identified during investigation, take the effected host offline if possible and remove the control.exe binary as well as any additional artifacts identified during investigation.\n- Review integrating Windows Information Protection (WIP) to enforce data protection by encrypting the data on PCs using Work Folders.\n- Confirm with user whether this was expected or not and reset their password.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Signed Proxy Execution via MS WorkFolders\n\nWork Folders is a role service for file servers running Windows Server that provides a consistent way for users to access\ntheir work files from their PCs and devices. This allows users to store work files and access them from anywhere. When\ncalled, Work Folders will automatically execute any Portable Executable (PE) named `control.exe` as an argument before\naccessing the synced share.\n\nUsing Work Folders to execute a masqueraded control.exe could allow an adversary to bypass application controls and\nincrease privileges.\n \n#### Possible investigation steps\n\n- Investigate the process tree starting with parent process WorkFolders.exe and child process control.exe to determine\nif other child processes spawned during execution.\n- Trace the activity related to the `control.exe` binary to identify any continuing intrusion activity on the host.\n- Examine the location of the WorkFolders.exe binary to determine if it was copied to the location of the control.exe\nbinary. It resides in the System32 directory by default.\n- Review the control.exe binary executed with Work Folders to determine maliciousness such as additional host activity\nor network traffic.\n- Determine if control.exe was synced to sync share, indicating potential lateral movement.\n- Review how control.exe was originally delivered on the host, such as emailed, downloaded from the web, or written to\ndisk from a separate binary.\n \n### False positive analysis \n\n- Windows Work Folders are used legitimately by end users and administrators for file sharing and syncing but not in the\ninstance where a suspicious `control.exe` is passed as an argument.\n\n### Response and remediation \n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Review the Work Folders synced share to determine if the 'control.exe' was shared and if so remove it.\n- If no lateral movement was identified during investigation, take the effected host offline if possible and remove the\ncontrol.exe binary as well as any additional artifacts identified during investigation.\n- Review integrating Windows Information Protection (WIP) to enforce data protection by encrypting the data on PCs using\nWork Folders.\n- Confirm with the user whether this was expected or not, and reset their password.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\",\"process_started\")\n    and process.name : \"control.exe\" and process.parent.name : \"WorkFolders.exe\"\n    and not process.executable : (\"?:\\\\Windows\\\\System32\\\\control.exe\", \"?:\\\\Windows\\\\SysWOW64\\\\control.exe\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows-server/storage/work-folders/work-folders-overview",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
index c6fdb26a1eade..26a15cf522b5f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "AdFind Command Activity",
-  "note": "## Triage and analysis\n\n### Investigating AdFind Command Activity\n\n[AdFind](http://www.joeware.net/freetools/tools/adfind/) is a freely available command-line tool used to retrieve information from\nActive Directory (AD). Network discovery and enumeration tools like `AdFind` are useful to adversaries in the same ways\nthey are effective for network administrators. This tool provides quick ability to scope AD person/computer objects and\nunderstand subnets and domain information. There are many [examples](https://thedfirreport.com/category/adfind/)\nobserved where this tool has been adopted by ransomware and criminal groups and used in compromises.\n\n#### Possible investigation steps:\n- `AdFind` is a legitimate Active Directory enumeration tool used by network administrators, it's important to understand\nthe source of the activity.  This could involve identifying the account using `AdFind` and determining based on the command-lines\nwhat information was retrieved, then further determining if these actions are in scope of that user's traditional responsibilities.\n- In multiple public references, `AdFind` is leveraged after initial access is achieved. Review previous activity on impacted\nmachines for suspicious indicators such as previous anti-virus/EDR alerts, phishing emails received, or network traffic\nto suspicious infrastructure.\n\n### False Positive Analysis\n- This rule has a high chance to produce false positives as it is a legitimate tool used by network administrators. One\noption could be allowlisting specific users or groups who use the tool as part of their daily responsibilities. This can\nbe done by leveraging the exception workflow in the Kibana Security App or Elasticsearch API to tune this rule to your environment.\n- Malicious behavior with `AdFind` should be investigated as part of a step within an attack chain. It doesn't happen in\nisolation, so reviewing previous logs/activity from impacted machines can be very telling.\n\n### Related Rules\n- Windows Network Enumeration\n- Enumeration of Administrator Accounts\n- Enumeration Command Spawned via WMIPrvSE\n\n### Response and Remediation\n- Take immediate action to validate activity, investigate and potentially isolate activity to prevent further\npost-compromise behavior.\n- It's important to understand that `AdFind` is an Active Directory enumeration tool and can be used for malicious or legitimate\npurposes, so understanding the intent behind the activity will help determine the appropropriate response.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating AdFind Command Activity\n\n[AdFind](http://www.joeware.net/freetools/tools/adfind/) is a freely available command-line tool used to retrieve information\nfrom Active Directory (AD). Network discovery and enumeration tools like `AdFind` are useful to adversaries in the same\nways they are effective for network administrators. This tool provides quick ability to scope AD person/computer objects\nand understand subnets and domain information. There are many [examples](https://thedfirreport.com/category/adfind/) of\nthis tool being adopted by ransomware and criminal groups and used in compromises.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Examine the command line to determine what information was retrieved by the tool.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n\n### False positive analysis\n\n- This rule has a high chance to produce false positives as it is a legitimate tool used by network administrators. One\noption could be allowlisting specific users or groups who use the tool as part of their daily responsibilities. This can\nbe done by leveraging the exception workflow in the Kibana Security App or Elasticsearch API to tune this rule to your environment.\n- Malicious behavior with `AdFind` should be investigated as part of a step within an attack chain. It doesn't happen in\nisolation, so reviewing previous logs/activity from impacted machines can be very telling.\n\n### Related rules\n\n- Windows Network Enumeration - 7b8bfc26-81d2-435e-965c-d722ee397ef1\n- Enumeration of Administrator Accounts - 871ea072-1b71-4def-b016-6278b505138d\n- Enumeration Command Spawned via WMIPrvSE - 770e0c4d-b998-41e5-a62e-c7901fd7f470\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Determine the initial infection vector.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and \n  (process.name : \"AdFind.exe\" or process.pe.original_file_name == \"AdFind.exe\") and \n  process.args : (\"objectcategory=computer\", \"(objectcategory=computer)\", \n                  \"objectcategory=person\", \"(objectcategory=person)\",\n                  \"objectcategory=subnet\", \"(objectcategory=subnet)\",\n                  \"objectcategory=group\", \"(objectcategory=group)\", \n                  \"objectcategory=organizationalunit\", \"(objectcategory=organizationalunit)\",\n                  \"objectcategory=attributeschema\", \"(objectcategory=attributeschema)\",\n                  \"domainlist\", \"dcmodes\", \"adinfo\", \"dclist\", \"computers_pwnotreqd\", \"trustdmp\")\n",
   "references": [
     "http://www.joeware.net/freetools/tools/adfind/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
index 7ac70f0094d17..7f167f0da268e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
@@ -11,9 +11,9 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Net command via SYSTEM account",
+  "name": "Account Discovery Command via SYSTEM Account",
   "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
-  "query": "process where event.type in (\"start\", \"process_started\") and \n  (?process.Ext.token.integrity_level_name : \"System\" or\n  ?winlog.event_data.IntegrityLevel : \"System\") and\n  process.name : \"whoami.exe\" or\n  (process.name : \"net1.exe\" and not process.parent.name : \"net.exe\")\n",
+  "query": "process where event.type in (\"start\", \"process_started\") and \n  (?process.Ext.token.integrity_level_name : \"System\" or\n  ?winlog.event_data.IntegrityLevel : \"System\") and\n  (process.name : \"whoami.exe\" or\n  (process.name : \"net1.exe\" and not process.parent.name : \"net.exe\"))\n",
   "risk_score": 21,
   "rule_id": "2856446a-34e6-435b-9fb5-f8f040bfa7ed",
   "severity": "low",
@@ -43,5 +43,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 10
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json
index 2fdcdbcc948c7..effcfa6aef6f8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json
@@ -6,7 +6,7 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
index e9f029c6b25bb..9b703f6108231 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
index 23a8b0820a65c..58aa6445e4c19 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
@@ -45,5 +45,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
index e694e21393324..cdb5051feb498 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
index 825ab59886d6f..8c4ba919753ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 9
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
index aae167f36443d..3a18be0ae60c8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
@@ -30,5 +30,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 9
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
index f919c2459aa3f..4f7535803cc79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Deleting Backup Catalogs with Wbadmin",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Deleting Backup Catalogs with Wbadmin\n\nWindows Server Backup stores the details about your backups (what volumes are backed up and where the backups are\nlocated) in a file called a backup catalog, which ransomware victims can use to recover corrupted backup files.\nDeleting these files is a common step in threat actor playbooks.\n\nThis rule identifies the deletion of the backup catalog using the `wbadmin.exe` utility.\n\n#### Possible investigation steps\n\n- Investigate the script execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Confirm whether the account owner is aware of the operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check if any files on the host machine have been encrypted.\n\n### False positive analysis\n\n- Administrators can use this command to delete corrupted catalogs, but overall the activity is unlikely to be legitimate.\n\n### Related rules\n\n- Third-party Backup Files Deleted via Unexpected Process - 11ea6bec-ebde-4d71-a8e9-784948f8e3e9\n- Volume Shadow Copy Deleted or Resized via VssAdmin - b5ea4bfe-a1b2-421f-9d47-22a75a6f2921\n- Volume Shadow Copy Deletion via PowerShell - d99a037b-c8e2-47a5-97b9-170d076827c4\n- Volume Shadow Copy Deletion via WMIC - dc9c1f74-dac3-48e3-b47f-eb79db358f57\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent destructive behavior, which is commonly associated with this activity.\n- Reset the password of the involved accounts.\n- If any other destructive action was identified on the host, it is recommended to prioritize the investigation and look\nfor ransomware preparation and execution activities.\n- If any backups were affected:\n  - Perform data recovery locally or restore the backups from replicated copies (cloud, other servers, etc.).\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"wbadmin.exe\" or process.pe.original_file_name == \"WBADMIN.EXE\") and\n  process.args : \"catalog\" and process.args : \"delete\"\n",
   "risk_score": 21,
   "rule_id": "581add16-df76-42bb-af8e-c979bfb39a59",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json
index c8609bf8b8513..48a6990b9edbf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json
@@ -58,5 +58,5 @@
   "timeline_title": "Comprehensive File Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
index 2f9efd05d9cba..e3063f78ffd23 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Modification of Boot Configuration",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Modification of Boot Configuration\n\nBoot entry parameters, or boot parameters, are optional, system-specific settings that represent configuration options.\nThese are stored in a boot configuration data (BCD) store, and administrators can use utilities like `bcdedit.exe` to\nconfigure these.\n\nThis rule identifies the usage of `bcdedit.exe` to:\n\n- Disable Windows Error Recovery (recoveryenabled).\n- Ignore errors if there is a failed boot, failed shutdown, or failed checkpoint (bootstatuspolicy ignoreallfailures).\n\nThese are common steps in destructive attacks by adversaries leveraging ransomware.\n\n#### Possible investigation steps\n\n- Investigate the script execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Confirm whether the account owner is aware of the operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check if any files on the host machine have been encrypted.\n\n### False positive analysis\n\n- The usage of these options is not inherently malicious. Administrators can modify these configurations to force a\nmachine to boot for troubleshooting or data recovery purposes.\n\n### Related rules\n\n- Deleting Backup Catalogs with Wbadmin - 581add16-df76-42bb-af8e-c979bfb39a59\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent destructive behavior, which is commonly associated with this activity.\n- Reset the password of the involved accounts.\n- If any other destructive action was identified on the host, it is recommended to prioritize the investigation and look\nfor ransomware preparation and execution activities.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"bcdedit.exe\" or process.pe.original_file_name == \"bcdedit.exe\") and\n  (process.args : \"/set\" and process.args : \"bootstatuspolicy\" and process.args : \"ignoreallfailures\") or\n  (process.args : \"no\" and process.args : \"recoveryenabled\")\n",
   "risk_score": 21,
   "rule_id": "69c251fb-a5d6-4035-b5ec-40438bd829ff",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_deletion.json
similarity index 66%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_deletion.json
index c114c26556033..64c28c5033d9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_deletion.json
@@ -2,9 +2,9 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies the deletion of an Amazon Relational Database Service (RDS) Aurora database cluster or global database cluster.",
+  "description": "Identifies the deletion of an Amazon Relational Database Service (RDS) Aurora database cluster, global database cluster, or database instance.",
   "false_positives": [
-    "Clusters may be deleted by a system administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Cluster deletions by unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+    "Clusters or instances may be deleted by a system administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Cluster or instance deletions by unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
   ],
   "from": "now-60m",
   "index": [
@@ -14,14 +14,16 @@
   "interval": "10m",
   "language": "kuery",
   "license": "Elastic License v2",
-  "name": "AWS RDS Cluster Deletion",
+  "name": "AWS Deletion of RDS Instance or Cluster",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(DeleteDBCluster or DeleteGlobalCluster) and event.outcome:success\n",
+  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(DeleteDBCluster or DeleteGlobalCluster or DeleteDBInstance) \nand event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-db-cluster.html",
     "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteDBCluster.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-global-cluster.html",
-    "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteGlobalCluster.html"
+    "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteGlobalCluster.html",
+    "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-db-instance.html",
+    "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteDBInstance.html"
   ],
   "risk_score": 47,
   "rule_id": "9055ece6-2689-4224-a0e0-b04881e1f8ad",
@@ -53,5 +55,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
index ec361a8795538..9b86a862caf19 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
@@ -12,6 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "High Number of Process and/or Service Terminations",
+  "note": "## Triage and analysis\n\n### Investigating High Number of Process and/or Service Terminations\n\nAttackers can stop services and kill processes for a variety of purposes. For example, they can stop services associated\nwith business applications and databases to release the lock on files used by these applications so they may be encrypted,\nor stop security and backup solutions, etc.\n\nThis rule identifies a high number (10) of service and/or process terminations (stop, delete, or suspend) from the same\nhost within a short time period.\n\n#### Possible investigation steps\n\n- Investigate the script execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Confirm whether the account owner is aware of the operation, and why it was performed.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check if any files on the host machine have been encrypted.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further destructive behavior, which is commonly associated with this activity.\n- Reset the password of the involved accounts.\n- Reimage the host operating system or restore it to the operational state.\n- If any other destructive action was identified on the host, it is recommended to prioritize the investigation and look\nfor ransomware preparation and execution activities.\n",
   "query": "event.category:process and event.type:start and process.name:(net.exe or sc.exe or taskkill.exe) and\n process.args:(stop or pause or delete or \"/PID\" or \"/IM\" or \"/T\" or \"/F\" or \"/t\" or \"/f\" or \"/im\" or \"/pid\")\n",
   "risk_score": 47,
   "rule_id": "035889c4-2686-4583-a7df-67f89c292f2c",
@@ -47,5 +48,5 @@
     "value": 10
   },
   "type": "threshold",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
index 26629d7155ebc..6bf4a1d804a9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
@@ -160,7 +160,7 @@ import rule147 from './defense_evasion_waf_acl_deletion.json';
 import rule148 from './impact_attempt_to_revoke_okta_api_token.json';
 import rule149 from './impact_iam_group_deletion.json';
 import rule150 from './impact_possible_okta_dos_attack.json';
-import rule151 from './impact_rds_cluster_deletion.json';
+import rule151 from './impact_rds_instance_cluster_deletion.json';
 import rule152 from './initial_access_suspicious_activity_reported_by_okta_user.json';
 import rule153 from './okta_attempt_to_deactivate_okta_policy.json';
 import rule154 from './okta_attempt_to_deactivate_okta_policy_rule.json';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json
index 8bb99f6beaa38..dcd4084fb0aac 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Windows Script Executing PowerShell",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Windows Script Executing PowerShell\n\nThe Windows Script Host (WSH) is an Windows automation technology, which is ideal for non-interactive scripting needs,\nsuch as logon scripting, administrative scripting, and machine automation.\n\nAttackers commonly use WSH scripts as their initial access method, acting like droppers for second stage payloads, but\ncan also use them to download tools and utilities needed to accomplish their goals.\n\nThis rule looks for the spawn of the `powershell.exe` process with `cscript.exe` or `wscript.exe` as its parent process.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate commands executed by the spawned PowerShell process.\n- Retrieve the script file(s) involved:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n  - Manually analyze the script to determine if malicious capabilities are present.\n- Determine how the script file was delivered (email attachment, dropped by other processes, etc.).\n- Investigate other alerts related to the user/host in the last 48 hours.\n\n### False positive analysis\n\n- The usage of these script engines by regular users is unlikely. In the case of authorized benign true positives\n(B-TPs), exceptions can be added.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove and block malicious artifacts identified on the triage.\n- If the malicious file was delivered via phishing:\n  - Block the email sender from sending future emails.\n  - Block the malicious web pages.\n  - Remove emails from the sender from mailboxes.\n- Reimage the host operating system and restore compromised files to clean versions.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : (\"cscript.exe\", \"wscript.exe\") and process.name : \"powershell.exe\"\n",
   "risk_score": 21,
   "rule_id": "f545ff26-3c94-4fd0-bd33-3c7f95a3a0fc",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
index e15da7079788e..48b2151176b1e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
@@ -13,7 +13,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Abnormally Large DNS Response",
-  "note": "## Triage and analysis\n\n### Investigating Large DNS Responses\nDetection alerts from this rule indicate possible anomalous activity around large byte DNS responses from a Windows DNS\nserver. This detection rule was created based on activity represented in exploitation of vulnerability (CVE-2020-1350)\nalso known as [SigRed](https://www.elastic.co/blog/detection-rules-for-sigred-vulnerability) during July 2020.\n\n#### Possible investigation steps:\n- This specific rule is sourced from network log activity such as DNS or network level data. It's important to validate\nthe source of the incoming traffic and determine if this activity has been observed previously within an environment.\n- Activity can be further investigated and validated by reviewing available corresponding Intrusion Detection Signatures (IDS) alerts associated with activity.\n- Further examination can include a review of the `dns.question_type` network fieldset with a protocol analyzer, such as Zeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data.\n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale Internet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.\n\n#### False Positive Analysis\n- Based on this rule, which looks for a threshold of 60k bytes, it is possible for activity to be generated under 65k bytes\nand related to legitimate behavior.  In packet capture files received by the [SANS Internet Storm Center](https://isc.sans.edu/forums/diary/PATCH+NOW+SIGRed+CVE20201350+Microsoft+DNS+Server+Vulnerability/26356/), byte responses\nwere all observed as greater than 65k bytes.\n- This activity can be triggered by compliance/vulnerability scanning or compromise assessment, it's\nimportant to determine the source of the activity and potentially allowlist the source host.\n\n\n### Related Rules\n- Unusual Child Process of dns.exe\n- Unusual File Modification by dns.exe\n\n### Response and Remediation\n- Review and implement the above detection logic within your environment using technology such as Endpoint security, Winlogbeat, Packetbeat, or network security monitoring (NSM) platforms such as Zeek or Suricata.\n- Ensure that you have deployed the latest Microsoft [Security Update](https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2020-1350) (Monthly Rollup or Security Only) and restart the\npatched machines. If unable to patch immediately: Microsoft [released](https://support.microsoft.com/en-us/help/4569509/windows-dns-server-remote-code-execution-vulnerability) a registry-based workaround that doesn\u2019t require a\nrestart. This can be used as a temporary solution before the patch is applied.\n- Maintain backups of your critical systems to aid in quick recovery.\n- Perform routine vulnerability scans of your systems, monitor [CISA advisories](https://us-cert.cisa.gov/ncas/current-activity) and patch identified vulnerabilities.\n- If you observe a true positive, implement a remediation plan and monitor host-based artifacts for additional post-exploitation behavior.\n",
+  "note": "## Triage and analysis\n\n### Investigating Abnormally Large DNS Response\n\nDetection alerts from this rule indicate possible anomalous activity around large byte DNS responses from a Windows DNS\nserver. This detection rule was created based on activity represented in exploitation of vulnerability (CVE-2020-1350)\nalso known as [SigRed](https://www.elastic.co/blog/detection-rules-for-sigred-vulnerability) during July 2020.\n\n#### Possible investigation steps\n\n- This specific rule is sourced from network log activity such as DNS or network level data. It's important to validate\nthe source of the incoming traffic and determine if this activity has been observed previously within an environment.\n- Activity can be further investigated and validated by reviewing any associated Intrusion Detection Signatures (IDS) alerts.\n- Further examination can include a review of the `dns.question_type` network fieldset with a protocol analyzer, such as\nZeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data. \n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale\ninternet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.\n\n#### False positive analysis\n\n- Based on this rule, which looks for a threshold of 60k bytes, it is possible for activity to be generated under 65k bytes\nand related to legitimate behavior.  In packet capture files received by the [SANS Internet Storm Center](https://isc.sans.edu/forums/diary/PATCH+NOW+SIGRed+CVE20201350+Microsoft+DNS+Server+Vulnerability/26356/), byte responses\nwere all observed as greater than 65k bytes.\n- This activity can be triggered by compliance/vulnerability scanning or compromise assessment; it's important to\ndetermine the source of the activity and potentially allowlist the source host.\n\n### Related rules\n\n- Unusual Child Process of dns.exe - 8c37dc0e-e3ac-4c97-8aa0-cf6a9122de45\n- Unusual File Modification by dns.exe - c7ce36c0-32ff-4f9a-bfc2-dcb242bf99f9\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Ensure that you have deployed the latest Microsoft [Security Update](https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2020-1350)\n(Monthly Rollup or Security Only) and restarted the patched machines. If unable to patch immediately, Microsoft [released](https://support.microsoft.com/en-us/help/4569509/windows-dns-server-remote-code-execution-vulnerability)\na registry-based workaround that doesn\u2019t require a restart. This can be used as a temporary solution before the patch is applied. \n- Maintain backups of your critical systems to aid in quick recovery.\n- Perform routine vulnerability scans of your systems, monitor [CISA advisories](https://us-cert.cisa.gov/ncas/current-activity) and patch identified vulnerabilities.\n- If you observe a true positive, implement a remediation plan and monitor host-based artifacts for additional post-exploitation behavior.\n",
   "query": "event.category:(network or network_traffic) and destination.port:53 and\n  (event.dataset:zeek.dns or type:dns or event.type:connection) and network.bytes > 60000\n",
   "references": [
     "https://research.checkpoint.com/2020/resolving-your-way-into-domain-admin-exploiting-a-17-year-old-bug-in-windows-dns-servers/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
index 37b07aa4b19f0..1a8eb370e9167 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "RDP Enabled via Registry",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating RDP Enabled via Registry\n\nMicrosoft Remote Desktop Protocol (RDP) is a proprietary Microsoft protocol that enables remote connections to other\ncomputers, typically over TCP port 3389.\n\nAttackers can use RDP to conduct their actions interactively. Ransomware operators frequently use RDP to access\nvictim servers, often using privileged accounts.\n\nThis rule detects modification of the fDenyTSConnections registry key to the value `0`, which specifies that remote\ndesktop connections are enabled. Attackers can abuse remote registry, use psexec, etc., to enable RDP and move laterally.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Contact the user to check if they are aware of the operation.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check whether it makes sense to enable RDP to this host, given its role in the environment.\n- Check if the host is directly exposed to the internet.\n- Check whether privileged accounts accessed the host shortly after the modification.\n- Review network events within a short timespan of this alert for incoming RDP connection attempts.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Check whether the user should be performing this kind of activity, whether they are aware\nof it, whether RDP should be open, and whether the action exposes the environment to unnecessary risks.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If RDP is needed, make sure to secure it using firewall rules:\n  - Allowlist RDP traffic to specific trusted hosts.\n  - Restrict RDP logins to authorized non-administrator accounts, where possible.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Review the implicated account's privileges.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where event.type in (\"creation\", \"change\") and\n  registry.path : \"HKLM\\\\SYSTEM\\\\*ControlSet*\\\\Control\\\\Terminal Server\\\\fDenyTSConnections\" and\n  registry.data.strings : (\"0\", \"0x00000000\") and not (process.name : \"svchost.exe\" and user.domain == \"NT AUTHORITY\") and\n  not process.executable : \"C:\\\\Windows\\\\System32\\\\SystemPropertiesRemote.exe\"\n",
   "risk_score": 47,
   "rule_id": "58aa72ca-d968-4f34-b9f7-bea51d75eb50",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
index 95170577bc8c9..d4d82d7532cbe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote Scheduled Task Creation",
-  "note": "## Triage and analysis\n\n### Investigating Creation of Remote Scheduled Tasks\n\n[Scheduled tasks](https://docs.microsoft.com/en-us/windows/win32/taskschd/about-the-task-scheduler) are a great\nmechanism for persistence and program execution. These features can\nbe used remotely for a variety of legitimate reasons, but at the same time used by malware and adversaries.\nWhen investigating scheduled tasks that were set up remotely, one of the first steps should be to determine the\noriginal intent behind the configuration and to verify if the activity is tied to benign behavior such as software installation or any kind\nof network administrator work. One objective for these alerts is to understand the configured action within the scheduled\ntask. This is captured within the registry event data for this rule and can be base64 decoded to view the value.\n\n#### Possible investigation steps:\n- Review the base64 encoded tasks actions registry value to investigate the task configured action.\n- Determine if task is related to legitimate or benign behavior based on the corresponding process or program tied to the\nscheduled task.\n- Further examination should include both the source and target machines where host-based artifacts and network logs\nshould be reviewed further around the time window of the creation of the scheduled task.\n\n### False Positive Analysis\n- There is a high possibility of benign activity tied to the creation of remote scheduled tasks as it is a general feature\nwithin Windows and used for legitimate purposes for a wide range of activity. Any kind of context should be found to\nfurther understand the source of the activity and determine the intent based on the scheduled task contents.\n\n### Related Rules\n- Service Command Lateral Movement\n- Remotely Started Services via RPC\n\n### Response and Remediation\n- This behavior represents post-exploitation actions such as persistence or lateral movement, immediately review and\ninvestigate the activity and potentially isolate involved machines to prevent further post-compromise\nbehavior.\n- Remove scheduled task and any other related artifacts to the activity.\n- Review privileged account management and user account management settings such as implementing GPO policies to further\nrestrict activity or configure settings that only allow Administrators to create remote scheduled tasks.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote Scheduled Task Creation\n\n[Scheduled tasks](https://docs.microsoft.com/en-us/windows/win32/taskschd/about-the-task-scheduler) are a great mechanism\nfor persistence and program execution. These features can be used remotely for a variety of legitimate reasons, but at\nthe same time used by malware and adversaries. When investigating scheduled tasks that were set up remotely, one of the\nfirst steps should be to determine the original intent behind the configuration and to verify if the activity is tied to\nbenign behavior such as software installation or any kind of network administrator work. One objective for these alerts\nis to understand the configured action within the scheduled task. This is captured within the registry event data for\nthis rule and can be base64 decoded to view the value.\n\n#### Possible investigation steps\n\n- Review the base64 encoded tasks actions registry value to investigate the task configured action.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate software\ninstallations.\n- Further examination should include review of host-based artifacts and network logs from around when the scheduled task\nwas created, on both the source and target machines.\n\n### False positive analysis\n\n- There is a high possibility of benign activity tied to the creation of remote scheduled tasks as it is a general feature\nwithin Windows and used for legitimate purposes for a wide range of activity. Any kind of context should be found to\nfurther understand the source of the activity and determine the intent based on the scheduled task's contents.\n\n### Related rules\n\n- Service Command Lateral Movement - d61cbcf8-1bc1-4cff-85ba-e7b21c5beedc\n- Remotely Started Services via RPC - aa9a274d-6b53-424d-ac5e-cb8ca4251650\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Remove scheduled task and any other related artifacts.\n- Review privileged account management and user account management settings. Consider implementing group policy object (GPO) policies to further\nrestrict activity, or configuring settings that only allow administrators to create remote scheduled tasks.\n",
   "query": "/* Task Scheduler service incoming connection followed by TaskCache registry modification  */\n\nsequence by host.id, process.entity_id with maxspan = 1m\n   [network where process.name : \"svchost.exe\" and\n   network.direction : (\"incoming\", \"ingress\") and source.port >= 49152 and destination.port >= 49152 and\n   source.ip != \"127.0.0.1\" and source.ip != \"::1\"\n   ]\n   [registry where registry.path : \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\\\\Schedule\\\\TaskCache\\\\Tasks\\\\*\\\\Actions\"]\n",
   "risk_score": 47,
   "rule_id": "954ee7c8-5437-49ae-b2d6-2960883898e9",
@@ -64,5 +64,5 @@
     }
   ],
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
index 29fb27e3d944a..87a6618d4c9d8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
@@ -30,5 +30,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 9
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json
index 2aa6e71b4f845..cc94c5962192b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -41,5 +40,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
index 93d253d1020c8..f64aab9da8fff 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
@@ -12,8 +12,11 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Adobe Hijack Persistence",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Adobe Hijack Persistence\n\nAttackers can replace the `RdrCEF.exe` executable with their own to maintain their access, which will be launched\nwhenever Adobe Acrobat Reader is executed.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type == \"creation\" and\n  file.path : (\"?:\\\\Program Files (x86)\\\\Adobe\\\\Acrobat Reader DC\\\\Reader\\\\AcroCEF\\\\RdrCEF.exe\",\n               \"?:\\\\Program Files\\\\Adobe\\\\Acrobat Reader DC\\\\Reader\\\\AcroCEF\\\\RdrCEF.exe\") and\n  not process.name : \"msiexec.exe\"\n",
+  "references": [
+    "https://twitter.com/pabraeken/status/997997818362155008"
+  ],
   "risk_score": 21,
   "rule_id": "2bf78aa2-9c56-48de-b139-f169bf99cf86",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
index 5856c5a7a0111..526438d6bf430 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "AWS Security Group Configuration Change Detection",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:(AuthorizeSecurityGroupEgress or \nCreateSecurityGroup or ModifyInstanceAttribute or ModifySecurityGroupRules or RevokeSecurityGroupEgress or \nRevokeSecurityGroupIngress) and event.outcome:success\n",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:(AuthorizeSecurityGroupEgress or \nCreateSecurityGroup or ModifyInstanceAttribute or ModifySecurityGroupRules or RevokeSecurityGroupEgress or \nRevokeSecurityGroupIngress) and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-security-groups.html"
   ],
@@ -67,5 +67,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
index fdf6ef77b87e3..5197c5b9a67bb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Creation of a Hidden Local User Account",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Creation of a Hidden Local User Account\n\nAttackers can create accounts ending with a `$` symbol to make the account hidden to user enumeration utilities and\nbypass detections that identify computer accounts by this pattern to apply filters.\n\nThis rule uses registry events to identify the creation of local hidden accounts.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positive (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Delete the hidden account.\n- Review the privileges of the involved accounts.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where registry.path : \"HKLM\\\\SAM\\\\SAM\\\\Domains\\\\Account\\\\Users\\\\Names\\\\*$\\\\\"\n",
   "references": [
     "https://blog.menasec.net/2019/02/threat-hunting-6-hiding-in-plain-sights_8.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
index a6b1f077c154b..493cc46dcc860 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
@@ -10,7 +10,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Suspicious Startup Shell Folder Modification",
-  "note": "## Triage and analysis\n\n### Investigating Suspicious Startup Shell Activity\n\nTechniques used within malware and by adversaries often leverage the Windows registry to store malicious programs for\npersistence. Startup shell folders are often targeted as they are not as prevalent as normal Startup folder paths so this\nbehavior may evade existing AV/EDR solutions. These programs may also run with higher privileges which can be ideal for\nan attacker.\n\n#### Possible investigation steps:\n- Review the source process and related file tied to the Windows Registry entry.\n- Validate the activity is not related to planned patches, updates, network administrator activity or legitimate software\ninstallations.\n- Determine if activity is unique by validating if other machines in same organization have similar entry.\n\n### False Positive Analysis\n- There is a high possibility of benign legitimate programs being added to Shell folders. This activity could be based\non new software installations, patches, or any kind of network administrator related activity. Before entering further\ninvestigation, it should be verified that this activity is not benign.\n\n### Related Rules\n- Startup or Run Key Registry Modification\n- Persistent Scripts in the Startup Directory\n\n### Response and Remediation\n- Activity should first be validated as a true positive event if so then take immediate action to review,\ninvestigate and potentially isolate activity to prevent further post-compromise behavior.\n- The respective binary or program tied to this persistence method should be further analyzed and reviewed to understand\nits behavior and capabilities.\n- Since this activity is considered post-exploitation behavior, it's important to understand how the behavior was first\ninitialized such as through a macro-enabled document that was attached in a phishing email. By understanding the source\nof the attack, this information can then be used to search for similar indicators on other machines in the same environment.\n",
+  "note": "## Triage and analysis\n\n### Investigating Suspicious Startup Shell Folder Modification\n\nTechniques used within malware and by adversaries often leverage the Windows registry to store malicious programs for\npersistence. Startup shell folders are often targeted as they are not as prevalent as normal Startup folder paths so this\nbehavior may evade existing AV/EDR solutions. These programs may also run with higher privileges which can be ideal for\nan attacker.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Review the source process and related file tied to the Windows Registry entry.\n- Validate the activity is not related to planned patches, updates, network administrator activity or legitimate software\ninstallations.\n- Determine if activity is unique by validating if other machines in the same organization have similar entries.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- There is a high possibility of benign legitimate programs being added to shell folders. This activity could be based\non new software installations, patches, or other network administrator activity. Before entering further investigation,\nit should be verified that this activity is not benign.\n\n### Related rules\n\n- Startup or Run Key Registry Modification - 97fc44d3-8dae-4019-ae83-298c3015600f\n- Persistent Scripts in the Startup Directory - f7c4dc5a-a58d-491d-9f14-9b66507121c0\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Since this activity is considered post-exploitation behavior, it's important to understand how the behavior was first\ninitialized such as through a macro-enabled document that was attached in a phishing email. After understanding the source\nof the attack, you can use this information to search for similar indicators on other machines in the same environment.\n",
   "query": "registry where\n registry.path : (\n     \"HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\User Shell Folders\\\\Common Startup\",\n     \"HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\Shell Folders\\\\Common Startup\",\n     \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\User Shell Folders\\\\Startup\",\n     \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\Shell Folders\\\\Startup\"\n     ) and\n  registry.data.strings != null and\n  /* Normal Startup Folder Paths */\n  not registry.data.strings : (\n           \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"%ProgramData%\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"%USERPROFILE%\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\"\n           )\n",
   "risk_score": 73,
   "rule_id": "c8b150f0-0164-475b-a75e-74b47800a9ff",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
index 1df067ebceeeb..4678055d6a7e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
index ebe596b18864f..1fc8f4de93b72 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
index 8cd9d55cd5b6c..eb018b490eb23 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
index 7588bdaad04e1..881e1e8893afe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json
index ff15cfa02e090..8ac95785e10d3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json
@@ -51,5 +51,5 @@
     }
   ],
   "type": "eql",
-  "version": 11
+  "version": 12
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json
index 5d5b7b2c10236..2895fef234f7b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -63,5 +62,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json
index 89446880d5a0b..a47c158e4af29 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Modification of Accessibility Binaries",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Modification of Accessibility Binaries\n\nAdversaries may establish persistence and/or elevate privileges by executing malicious content triggered by\naccessibility features. Windows contains accessibility features that may be launched with a key combination before a\nuser has logged in (ex: when the user is on the Windows logon screen). An adversary can modify the way these programs\nare launched to get a command prompt or backdoor without logging in to the system.\n\nMore details can be found [here](https://attack.mitre.org/techniques/T1546/008/).\n\nThis rule looks for the execution of supposed accessibility binaries that don't match any of the accessibility features\nbinaries' original file names, which is likely a custom binary deployed by the attacker.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity should not happen legitimately. The security team should address any potential benign true positive\n(B-TP), as this configuration can put the user and the domain at risk.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\", \"info\") and\n process.parent.name : (\"Utilman.exe\", \"winlogon.exe\") and user.name == \"SYSTEM\" and\n process.args :\n    (\n    \"C:\\\\Windows\\\\System32\\\\osk.exe\",\n    \"C:\\\\Windows\\\\System32\\\\Magnify.exe\",\n    \"C:\\\\Windows\\\\System32\\\\Narrator.exe\",\n    \"C:\\\\Windows\\\\System32\\\\Sethc.exe\",\n    \"utilman.exe\",\n    \"ATBroker.exe\",\n    \"DisplaySwitch.exe\",\n    \"sethc.exe\"\n    )\n and not process.pe.original_file_name in\n    (\n    \"osk.exe\",\n    \"sethc.exe\",\n    \"utilman2.exe\",\n    \"DisplaySwitch.exe\",\n    \"ATBroker.exe\",\n    \"ScreenMagnifier.exe\",\n    \"SR.exe\",\n    \"Narrator.exe\",\n    \"magnify.exe\",\n    \"MAGNIFY.EXE\"\n    )\n\n/* uncomment once in winlogbeat to avoid bypass with rogue process with matching pe original file name */\n/* and process.code_signature.subject_name == \"Microsoft Windows\" and process.code_signature.status == \"trusted\" */\n",
   "references": [
     "https://www.elastic.co/blog/practical-security-engineering-stateful-detection"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
index 86fa0b2ed1204..2ac177bda0b06 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
@@ -67,5 +67,5 @@
   "timeline_title": "Comprehensive Registry Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json
index 2931ecc753ea3..4c7390210eb37 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json
@@ -9,7 +9,7 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json
index d17662494b71e..a3bcd8f8a92e0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json
@@ -11,7 +11,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "AdminSDHolder SDProp Exclusion Added",
-  "note": "## Triage and analysis.\n\n### Investigating AdminSDHolder SDProp Exclusion Added\n\nThe SDProp process compares the permissions on protected objects with those defined on the AdminSDHolder object. If the\npermissions on any of the protected accounts and groups do not match, it resets the permissions on the protected\naccounts and groups to match those defined in the domain AdminSDHolder object.\n\nThe dSHeuristics is a Unicode string attribute, in which each character in the string represents a heuristic that is\nused to determine the behavior of Active Directory.\n\nAdministrators can use the dSHeuristics attribute to exclude privilege groups from the SDProp process by setting the\n16th bit (dwAdminSDExMask) of the string to a certain value, which represents the group(s):\n\n* For example, to exclude the Account Operators group, an administrator would modify the string, so the 16th character\nis set to 1 (i.e., 0000000001000001). \n\nThe usage of this exclusion can leave the accounts unprotected and facilitate the misconfigurations of privilege on the\nexcluded groups, leaving a gap for attackers to add accounts to these groups to maintain long-term persistence with high\nprivileges.\n\nThis rule will monitor changes on the dsHeuristics object where the 16th bit is set to a value other than zero.\n\n#### Possible investigation steps:\n\n- Identify the account that performed the action\n- Confirm whether the account owner is aware of the operation\n- Investigate other alerts related to the user in the last 48 hours.\n- Check the value assigned to the 16th bit of the string on the `winlog.event_data.AttributeValue` field:\n    - Account Operators eq 1\n    - Server Operators eq 2\n    - Print Operators eq 4\n    - Backup Operators eq 8\n    The field value can range from 0 to f (15). If more than one group is specified, the values will be summed together;\n    for example, Backup Operators and Print Operators will set the `c` value on the bit.\n\n### False Positive Analysis\n\n- While this modification can be done legitimately, it is not best practice. Any potential B-TP (Benign True Positive)\nshould be mapped and reviewed by the security team for alternatives as this weakens the security of the privileged group.\n\n### Response and Remediation\n\n- The change can be reverted by setting the dwAdminSDExMask (16th bit) to 0 in dSHeuristics.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nAudit Policies > \nDS Access > \nAudit Directory Service Changes (Success)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating AdminSDHolder SDProp Exclusion Added\n\nThe SDProp process compares the permissions on protected objects with those defined on the AdminSDHolder object. If the\npermissions on any of the protected accounts and groups do not match, it resets the permissions on the protected\naccounts and groups to match those defined in the domain AdminSDHolder object.\n\nThe dSHeuristics is a Unicode string attribute, in which each character in the string represents a heuristic that is\nused to determine the behavior of Active Directory.\n\nAdministrators can use the dSHeuristics attribute to exclude privilege groups from the SDProp process by setting the\n16th bit (dwAdminSDExMask) of the string to a certain value, which represents the group(s):\n\n* For example, to exclude the Account Operators group, an administrator would modify the string, so the 16th character\nis set to 1 (i.e., 0000000001000001).\n\nThe usage of this exclusion can leave the accounts unprotected and facilitate the misconfiguration of privileges for the\nexcluded groups, enabling attackers to add accounts to these groups to maintain long-term persistence with high\nprivileges.\n\nThis rule matches changes of the dsHeuristics object where the 16th bit is set to a value other than zero.\n\n#### Possible investigation steps\n\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check the value assigned to the 16th bit of the string on the `winlog.event_data.AttributeValue` field:\n    - Account Operators eq 1\n    - Server Operators eq 2\n    - Print Operators eq 4\n    - Backup Operators eq 8\n    The field value can range from 0 to f (15). If more than one group is specified, the values will be summed together;\n    for example, Backup Operators and Print Operators will set the `c` value on the bit.\n\n### False positive analysis\n\n- While this modification can be done legitimately, it is not best practice. Any potential benign true positive (B-TP)\nshould be mapped and reviewed by the security team for alternatives as this weakens the security of the privileged group.\n\n### Response and remediation\n\n- The change can be reverted by setting the dwAdminSDExMask (16th bit) to 0 in dSHeuristics.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nAudit Policies >\nDS Access >\nAudit Directory Service Changes (Success)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "any where event.action == \"Directory Service Changes\" and\n  event.code == \"5136\" and\n  length(winlog.event_data.AttributeValue) > 15 and\n  winlog.event_data.AttributeValue regex~ \"[0-9]{15}([1-9a-f]).*\"\n",
   "references": [
     "https://www.cert.ssi.gouv.fr/uploads/guide-ad.html#dsheuristics_bad",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json
index a18d14e6fb047..b33f7305a5b4b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json
@@ -11,8 +11,8 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Shortcut File Written or Modified for Persistence",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "name": "Startup Persistence by a Suspicious Process",
+  "note": "## Triage and analysis\n\n### Investigating Startup Persistence by a Suspicious Process\n\nThe Windows Startup folder is a special folder in Windows. Programs added to this folder are executed during account\nlogon, without user interaction, providing an excellent way for attackers to maintain persistence.\n\nThis rule monitors for commonly abused processes writing to the Startup folder locations.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate\nsoftware installations.\n- Determine if activity is unique by validating if other machines in the organization have similar entries.\n- Retrieve the file:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- Administrators may add programs to this mechanism via command-line shells. Before the further investigation, \nverify that this activity is not benign.\n\n### Related rules\n\n- Suspicious Startup Shell Folder Modification - c8b150f0-0164-475b-a75e-74b47800a9ff\n- Persistent Scripts in the Startup Directory - f7c4dc5a-a58d-491d-9f14-9b66507121c0\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove malicious artifacts identified on the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type != \"deletion\" and\n  user.domain != \"NT AUTHORITY\" and\n  file.path : (\"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\\\\*\", \n               \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\StartUp\\\\*\") and\n  process.name : (\"cmd.exe\",\n                  \"powershell.exe\",\n                  \"wmic.exe\",\n                  \"mshta.exe\",\n                  \"pwsh.exe\",\n                  \"cscript.exe\",\n                  \"wscript.exe\",\n                  \"regsvr32.exe\",\n                  \"RegAsm.exe\",\n                  \"rundll32.exe\",\n                  \"EQNEDT32.EXE\",\n                  \"WINWORD.EXE\",\n                  \"EXCEL.EXE\",\n                  \"POWERPNT.EXE\",\n                  \"MSPUB.EXE\",\n                  \"MSACCESS.EXE\",\n                  \"iexplore.exe\",\n                  \"InstallUtil.exe\")\n",
   "risk_score": 47,
   "rule_id": "440e2db4-bc7f-4c96-a068-65b78da59bde",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json
index 99a7e07dfc395..89022325ab5f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json
@@ -10,6 +10,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Startup Folder Persistence via Unsigned Process",
+  "note": "## Triage and analysis\n\n### Investigating Startup Folder Persistence via Unsigned Process\n\nThe Windows Startup folder is a special folder in Windows. Programs added to this folder are executed during account\nlogon, without user interaction, providing an excellent way for attackers to maintain persistence.\n\nThis rule looks for unsigned processes writing to the Startup folder locations.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate\nsoftware installations.\n- Determine if activity is unique by validating if other machines in the organization have similar entries.\n- Retrieve the file:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- There is a high possibility of benign legitimate programs being added to Startup folders. This activity could be based\non new software installations, patches, or any kind of network administrator related activity. Before entering further\ninvestigation, verify that this activity is not benign.\n\n### Related rules\n\n- Suspicious Startup Shell Folder Modification - c8b150f0-0164-475b-a75e-74b47800a9ff\n- Persistent Scripts in the Startup Directory - f7c4dc5a-a58d-491d-9f14-9b66507121c0\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove malicious artifacts identified on the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n",
   "query": "sequence by host.id, process.entity_id with maxspan=5s\n  [process where event.type in (\"start\", \"process_started\") and process.code_signature.trusted == false and\n  /* suspicious paths can be added here  */\n   process.executable : (\"C:\\\\Users\\\\*.exe\", \n                         \"C:\\\\ProgramData\\\\*.exe\", \n                         \"C:\\\\Windows\\\\Temp\\\\*.exe\", \n                         \"C:\\\\Windows\\\\Tasks\\\\*.exe\", \n                         \"C:\\\\Intel\\\\*.exe\", \n                         \"C:\\\\PerfLogs\\\\*.exe\")\n   ]\n   [file where event.type != \"deletion\" and user.domain != \"NT AUTHORITY\" and\n    file.path : (\"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\\\\*\", \n                 \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\StartUp\\\\*\")\n   ]\n",
   "risk_score": 41,
   "rule_id": "2fba96c0-ade5-4bce-b92f-a5df2509da3f",
@@ -46,5 +47,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json
index c77e24bc6db41..bee5bf58ea39d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies script engines creating files in the startup folder, or the creation of script files in the startup folder.",
+  "description": "Identifies script engines creating files in the Startup folder, or the creation of script files in the Startup folder. Adversaries may abuse this technique to maintain persistence in an environment.",
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Persistent Scripts in the Startup Directory",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Persistent Scripts in the Startup Directory\n\nThe Windows Startup folder is a special folder in Windows. Programs added to this folder are executed during account\nlogon, without user interaction, providing an excellent way for attackers to maintain persistence.\n\nThis rule looks for shortcuts created by wscript.exe or cscript.exe, or js/vbs scripts created by any process.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate\nsoftware installations.\n- Determine if activity is unique by validating if other machines in the organization have similar entries.\n- Retrieve the script file:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- There is a low possibility of benign legitimate scripts being added to Startup folders. Validate whether this activity\nis benign.\n\n\n### Related rules\n\n- Suspicious Startup Shell Folder Modification - c8b150f0-0164-475b-a75e-74b47800a9ff\n- Startup Folder Persistence via Unsigned Process - 2fba96c0-ade5-4bce-b92f-a5df2509da3f\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type != \"deletion\" and user.domain != \"NT AUTHORITY\" and\n  \n  /* detect shortcuts created by wscript.exe or cscript.exe */\n  (file.path : \"C:\\\\*\\\\Programs\\\\Startup\\\\*.lnk\" and\n     process.name : (\"wscript.exe\", \"cscript.exe\")) or\n\n  /* detect vbs or js files created by any process */\n  file.path : (\"C:\\\\*\\\\Programs\\\\Startup\\\\*.vbs\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.vbe\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.wsh\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.wsf\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.js\")\n",
   "risk_score": 47,
   "rule_id": "f7c4dc5a-a58d-491d-9f14-9b66507121c0",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
index 3f869207d8d97..8a06669f42fc5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "System Shells via Services",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating System Shells via Services\n\nAttackers may configure existing services or create new ones to execute system shells to elevate their privileges from\nadministrator to SYSTEM. They can also configure services to execute these shells with persistence payloads.\n\nThis rule looks for system shells being spawned by `services.exe`, which is compatible with the above behavior.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify how the service was created or modified. Look for registry changes events or Windows events related to\nservice activities (for example, 4697 and/or 7045).\n  - Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check for commands executed under the spawned shell.\n\n### False positive analysis\n\n- This activity should not happen legitimately. The security team should address any potential benign true positive\n(B-TP), as this configuration can put the user and the domain at risk.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Delete the service or restore it to the original configuration.\n- Investigate the initial attack vector.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : \"services.exe\" and\n  process.name : (\"cmd.exe\", \"powershell.exe\", \"pwsh.exe\", \"powershell_ise.exe\") and\n  \n  /* Third party FP's */\n  not process.args : \"NVDisplay.ContainerLocalSystem\"\n",
   "risk_score": 47,
   "rule_id": "0022d47d-39c7-4f69-a232-4fe9dc7a3acd",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
index 70422a0429998..e85a08f63959d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
@@ -7,13 +7,12 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
   "name": "User Added to Privileged Group in Active Directory",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating User Added to Privileged Group in Active Directory\n\nPrivileged accounts and groups in Active Directory are those to which powerful rights, privileges, and permissions are\ngranted that allow them to perform nearly any action in Active Directory and on domain-joined systems.\n\nAttackers can add users to privileged groups to maintain a level of access if their other privileged accounts are\nuncovered by the security team. This allows them to keep operating after the security team discovers abused accounts.\n\nThis rule monitors events related to a user being added to a privileged group.\n\n#### Possible investigation steps\n\n- Identify the user account that performed the action and whether it should manage members of this group.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user during the past 48 hours.\n\n### False positive analysis\n\n- This attack abuses a legitimate Active Directory mechanism, so it is important to determine whether the activity is\nlegitimate, if the administrator is authorized to perform this operation, and if there is a need to grant the account\nthis level of privilege.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If the admin is not aware of the operation, activate your Active Directory incident response plan.\n- If the user does not need the administrator privileges, remove the account from the privileged group.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "iam where event.action == \"added-member-to-group\" and\n  group.name : (\"Admin*\",\n                \"Local Administrators\",\n                \"Domain Admins\",\n                \"Enterprise Admins\",\n                \"Backup Admins\",\n                \"Schema Admins\",\n                \"DnsAdmins\",\n                \"Exchange Organization Administrators\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/plan/security-best-practices/appendix-b--privileged-accounts-and-groups-in-active-directory"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
index ec9b8ed562839..d4f289a3e8988 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies attempts to create new local users. This is sometimes done by attackers to increase access to a system or domain.",
+  "description": "Identifies attempts to create new users. This is sometimes done by attackers to increase access or establish persistence on a system or domain.",
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "User Account Creation",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating User Account Creation\n\nAttackers may create new accounts (both local and domain) to maintain access to victim systems.\n\nThis rule identifies the usage of `net.exe` to create new accounts.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Identify if the account was added to privileged groups or assigned special privileges after creation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n\n### False positive analysis\n\n- Account creation is a common administrative task, so there is a high chance of the activity being legitimate. Before\ninvestigating further, verify that this activity is not benign.\n\n### Related rules\n\n- Creation of a Hidden Local User Account - 2edc8076-291e-41e9-81e4-e3fcbc97ae5e\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Delete the created account.\n- Reset the password for the user account leveraged to create the new account.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.name : (\"net.exe\", \"net1.exe\") and\n  not process.parent.name : \"net.exe\" and\n  (process.args : \"user\" and process.args : (\"/ad\", \"/add\"))\n",
   "risk_score": 21,
   "rule_id": "1aa9181a-492b-4c01-8b16-fa0735786b2b",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json
index 423fdeb75889c..26e0a95503af9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Privilege Escalation via InstallerFileTakeOver",
-  "note": "## Triage and analysis.\n\n### Investigating Potential Priivilege Escalation via InstallerFileTakeOver\n\nInstallerFileTakeOver is a weaponized EoP PoC to the CVE-2021-41379 vulnerability. Upon successful exploitation,\nan unprivileged user will escalate privileges to SYSTEM/NT AUTHORITY.\n\nThis rule detects the default execution of the PoC, which overwrites the `elevation_service.exe` DACL and copies itself\nto the location to escalate privileges. An attacker is able to still take over any file that is not in use (locked), which is outside the scope of this rule.\n\n#### Possible investigation steps:\n\n- Check for the digital signature of the executable.\n- Look for additional processes spawned by the process, command lines, and network communications.\n- Look for additional alerts involving the host and the user.\n\n### False Positive Analysis\n\n- Verify whether the digital signature exists in the executable, and if it is valid.\n\n### Related Rules\n\n- Suspicious DLL Loaded for Persistence or Privilege Escalation - bfeaf89b-a2a7-48a3-817f-e41829dc61ee\n\n### Response and Remediation\n\n- Immediate response steps should be taken to validate, investigate, and potentially contain the activity to prevent\nfurther post-compromise behavior.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Privilege Escalation via InstallerFileTakeOver\n\nInstallerFileTakeOver is a weaponized escalation of privilege proof of concept (EoP PoC) to the CVE-2021-41379 vulnerability. Upon successful exploitation, an\nunprivileged user will escalate privileges to SYSTEM/NT AUTHORITY.\n\nThis rule detects the default execution of the PoC, which overwrites the `elevation_service.exe` DACL and copies itself\nto the location to escalate privileges. An attacker is able to still take over any file that is not in use (locked),\nwhich is outside the scope of this rule.\n\n#### Possible investigation steps:\n\n- Check the executable's digital signature.\n- Look for additional processes spawned by the process, command lines, and network communications.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- Verify whether a digital signature exists in the executable, and if it is valid.\n\n### Related rules\n\n- Suspicious DLL Loaded for Persistence or Privilege Escalation - bfeaf89b-a2a7-48a3-817f-e41829dc61ee\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove and block malicious artifacts identified on the triage.\n- Disable user account\u2019s ability to log in remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Determine the initial infection vector.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "/* This rule is compatible with both Sysmon and Elastic Endpoint */\n\nprocess where event.type == \"start\" and \n    (?process.Ext.token.integrity_level_name : \"System\" or\n    ?winlog.event_data.IntegrityLevel : \"System\") and\n    (\n      (process.name : \"elevation_service.exe\" and \n       not process.pe.original_file_name == \"elevation_service.exe\") or\n\n      (process.parent.name : \"elevation_service.exe\" and \n       process.name : (\"rundll32.exe\", \"cmd.exe\", \"powershell.exe\")) \n    )\n",
   "references": [
     "https://github.com/klinix5/InstallerFileTakeOver"
@@ -46,5 +46,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json
index f8859ae7b9b60..7e52ab1c3fd52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json
@@ -6,7 +6,7 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json
index 15200e98de46f..b603e25ecf1e5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
index 2e17b91fbcd54..683744640dc9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { readRules } from './read_rules';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   resolveAlertMock,
   getAlertMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts
index b866755e00371..48f3ee86bd0ef 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ResolvedSanitizedRule, SanitizedRule } from '../../../../../alerting/common';
+import { ResolvedSanitizedRule, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
 import { RuleParams } from '../schemas/rule_schemas';
 import { findRules } from './find_rules';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts
index d42248823e733..43a37fc79438f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const ruleAssetSavedObjectType = 'security-rule';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts
index c594385dce22b..93fdbc5cac20e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindOptions,
   SavedObjectsFindResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { ruleAssetSavedObjectType } from './rule_asset_saved_object_mappings';
 import { IRuleAssetSavedObject } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
index 6c98ba56b9c88..95def15c20e27 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
@@ -7,7 +7,7 @@
 
 import { Readable } from 'stream';
 
-import { SavedObjectAttributes, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectAttributes, SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   MachineLearningJobIdOrUndefined,
   From,
@@ -42,6 +42,8 @@ import type { VersionOrUndefined, Version } from '@kbn/securitysolution-io-ts-ty
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
 import type { ListArrayOrUndefined, ListArray } from '@kbn/securitysolution-io-ts-list-types';
+import { RulesClient, PartialRule } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { UpdateRulesSchema } from '../../../../common/detection_engine/schemas/request';
 import { RuleAlertAction } from '../../../../common/detection_engine/types';
 import {
@@ -93,8 +95,6 @@ import {
   NamespaceOrUndefined,
 } from '../../../../common/detection_engine/schemas/common';
 
-import { RulesClient, PartialRule } from '../../../../../alerting/server';
-import { SanitizedRule } from '../../../../../alerting/common';
 import { PartialFilter } from '../types';
 import { RuleParams } from '../schemas/rule_schemas';
 import { IRuleExecutionLogForRoutes } from '../rule_execution_log';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
index 44a7fa58a385f..ee6179a9c7e68 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
-import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getFindResultWithSingleHit } from '../routes/__mocks__/request_responses';
 import { updatePrepackagedRules } from './update_prepacked_rules';
 import { patchRules } from './patch_rules';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
index 93b038fbb58ce..b8ff87dbd0ff2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
@@ -6,10 +6,10 @@
  */
 
 import { chunk } from 'lodash/fp';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { RulesClient, PartialRule } from '@kbn/alerting-plugin/server';
 import { AddPrepackagedRulesSchemaDecoded } from '../../../../common/detection_engine/schemas/request/add_prepackaged_rules_schema';
 import { MAX_RULES_TO_UPDATE_IN_PARALLEL } from '../../../../common/constants';
-import { RulesClient, PartialRule } from '../../../../../alerting/server';
 import { patchRules } from './patch_rules';
 import { readRules } from './read_rules';
 import { PartialFilter } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
index c027f3b8505a9..9482a1d3aa1c4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
-import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   getUpdateMachineLearningSchemaMock,
   getUpdateRulesSchemaMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts
index ecf625ceaee17..519ecd0c01ed2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts
@@ -8,7 +8,7 @@
 import { getAlertMock, resolveAlertMock } from '../routes/__mocks__/request_responses';
 import { updateRules } from './update_rules';
 import { getUpdateRulesOptionsMock, getUpdateMlRulesOptionsMock } from './update_rules.mock';
-import { RulesClientMock } from '../../../../../alerting/server/rules_client.mock';
+import { RulesClientMock } from '@kbn/alerting-plugin/server/rules_client.mock';
 import { getMlRuleParams, getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
 // Failing with rule registry enabled
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
index 23038df541ff2..df9a09ba98bb5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
@@ -7,9 +7,9 @@
 
 /* eslint-disable complexity */
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { DEFAULT_MAX_SIGNALS } from '../../../../common/constants';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { PartialRule } from '../../../../../alerting/server';
 
 import { UpdateRulesOptions } from './types';
 import { addTags } from './add_tags';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
index 06324f4827b84..5151a58d0d885 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
@@ -14,7 +14,7 @@ import {
   transformFromAlertThrottle,
   transformActions,
 } from './utils';
-import { RuleAction, SanitizedRule } from '../../../../../alerting/common';
+import { RuleAction, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { RuleParams } from '../schemas/rule_schemas';
 import {
   NOTIFICATION_THROTTLE_NO_ACTIONS,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
index fe5785d841b8f..c7858a131cb1f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
@@ -28,7 +28,8 @@ import type {
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ListArrayOrUndefined } from '@kbn/securitysolution-io-ts-list-types';
 import type { VersionOrUndefined } from '@kbn/securitysolution-io-ts-types';
-import { RuleAction, RuleNotifyWhenType, SanitizedRule } from '../../../../../alerting/common';
+import { RuleAction, RuleNotifyWhenType, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import {
   DescriptionOrUndefined,
   AnomalyThresholdOrUndefined,
@@ -61,7 +62,6 @@ import {
   NOTIFICATION_THROTTLE_NO_ACTIONS,
   NOTIFICATION_THROTTLE_RULE,
 } from '../../../../common/constants';
-import { RulesClient } from '../../../../../alerting/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRuleActions } from '../rule_actions/legacy_types';
 import { FullResponseSchema } from '../../../../common/detection_engine/schemas/request';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts
index d72cdc560543f..b806b42e5180a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts
@@ -9,6 +9,7 @@ import uuid from 'uuid';
 
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
+import { ResolvedSanitizedRule, SanitizedRule } from '@kbn/alerting-plugin/common';
 import {
   normalizeMachineLearningJobIds,
   normalizeThresholdObject,
@@ -31,7 +32,6 @@ import { AppClient } from '../../../types';
 import { addTags } from '../rules/add_tags';
 import { DEFAULT_MAX_SIGNALS, SERVER_APP_ID } from '../../../../common/constants';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { ResolvedSanitizedRule, SanitizedRule } from '../../../../../alerting/common';
 import { transformTags } from '../routes/rules/utils';
 import {
   transformFromAlertThrottle,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts
index 47b66e7cc3bbb..edaacf38d7712 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts
@@ -18,7 +18,7 @@ import {
   ThreatRuleParams,
   ThresholdRuleParams,
 } from './rule_schemas';
-import { SanitizedRuleConfig } from '../../../../../alerting/common';
+import { SanitizedRuleConfig } from '@kbn/alerting-plugin/common';
 import { sampleRuleGuid } from '../signals/__mocks__/es_results';
 
 const getBaseRuleParams = (): BaseRuleParams => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts
index 201c4b3957914..47e49e5f9c467 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts
@@ -37,6 +37,7 @@ import {
   SAVED_QUERY_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 
+import { SanitizedRuleConfig } from '@kbn/alerting-plugin/common';
 import {
   author,
   buildingBlockTypeOrUndefined,
@@ -73,7 +74,6 @@ import {
   updated_at,
 } from '../../../../common/detection_engine/schemas/common/schemas';
 import { SERVER_APP_ID } from '../../../../common/constants';
-import { SanitizedRuleConfig } from '../../../../../alerting/common';
 
 const nonEqlLanguages = t.keyof({ kuery: null, lucene: null });
 export const baseRuleParams = t.exact(
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json
index a35a77ef91991..c1a62bf7ca31f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json
@@ -6,6 +6,8 @@
         "names": [
           ".siem-signals-*",
           ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
           ".lists*",
           ".items*",
           "apm-*-transaction*",
@@ -20,11 +22,7 @@
         "privileges": ["manage", "write", "read"]
       },
       {
-        "names": [
-          "metrics-endpoint.metadata_current_*",
-          ".fleet-agents*",
-          ".fleet-actions*"
-        ],
+        "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
         "privileges": ["read"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json
index cbdef3270ac58..88d863631a90b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json
@@ -23,7 +23,12 @@
         "privileges": ["all"]
       },
       {
-        "names": [".alerts-security*", ".siem-signals-*"],
+        "names": [
+          ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
+          ".siem-signals-*"
+        ],
         "privileges": ["all"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json
index e8820c5810ae2..ea1fb2bf1433f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json
@@ -18,15 +18,16 @@
         "privileges": ["read", "write"]
       },
       {
-        "names": [".alerts-security*", ".siem-signals-*"],
+        "names": [
+          ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
+          ".siem-signals-*"
+        ],
         "privileges": ["read", "write", "maintenance", "view_index_metadata"]
       },
       {
-        "names": [
-          "metrics-endpoint.metadata_current_*",
-          ".fleet-agents*",
-          ".fleet-actions*"
-        ],
+        "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
         "privileges": ["read"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json
index e906e67c4d7b5..4ad6488d0b5ab 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json
@@ -18,15 +18,16 @@
         "privileges": ["read", "write"]
       },
       {
-        "names": [".alerts-security*", ".siem-signals-*"],
+        "names": [
+          ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
+          ".siem-signals-*"
+        ],
         "privileges": ["read", "write", "manage"]
       },
       {
-        "names": [
-          "metrics-endpoint.metadata_current_*",
-          ".fleet-agents*",
-          ".fleet-actions*"
-        ],
+        "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
         "privileges": ["read"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json
index 1799bf8fa24d5..f8216a613cb5a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json
@@ -2,7 +2,10 @@
   "elasticsearch": {
     "cluster": [],
     "indices": [
-      { "names": [".alerts-security*", ".siem-signals-*"], "privileges": ["read", "write", "maintenance"] },
+      {
+        "names": [".alerts-security*", ".siem-signals-*"],
+        "privileges": ["read", "write", "maintenance"]
+      },
       {
         "names": [
           ".lists*",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts
index 3ed5dccaccdf2..d699e71947853 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts
@@ -16,8 +16,8 @@ import type {
   AlertAttributes,
   AlertSourceHit,
 } from '../types';
-import { SavedObject } from '../../../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { SavedObject } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getListArrayMock } from '../../../../../common/detection_engine/schemas/types/lists.mock';
 import { RulesSchema } from '../../../../../common/detection_engine/schemas/response';
 import { RuleParams } from '../../schemas/rule_schemas';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts
index 7a9afe04cfeb0..3b93b38c87a25 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildEqlSearchRequest, buildEventsSearchQuery } from './build_events_query';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('create_signals', () => {
   test('it builds a now-5m up to today filter', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
index fdd6dcf0f4da2..66394d4bca81d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -8,12 +8,12 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { flow, omit } from 'lodash/fp';
 import set from 'set-value';
 
-import { Logger } from '../../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { GenericBulkCreateResponse } from '../rule_types/factories';
 import { AnomalyResults, Anomaly } from '../../machine_learning';
 import { BuildRuleMessage } from './rule_messages';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts
index 288fd7a688e3c..67054b10793cc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts
@@ -6,11 +6,11 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { eqlExecutor } from './eql';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntryListMock } from '../../../../../../lists/common/schemas/types/entry_list.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntryListMock } from '@kbn/lists-plugin/common/schemas/types/entry_list.mock';
 import { getCompleteRuleMock, getEqlRuleParams } from '../../schemas/rule_schemas.mock';
 import { getIndexVersion } from '../../routes/index/get_index_version';
 import { SIGNALS_TEMPLATE_VERSION } from '../../routes/index/get_signals_template';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts
index 6975445f5d04f..e601f41aa7628 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts
@@ -7,12 +7,12 @@
 
 import { performance } from 'perf_hooks';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { buildEqlSearchRequest } from '../build_events_query';
 import { hasLargeValueItem } from '../../../../../common/detection_engine/utils';
 import { isOutdated } from '../../migrations/helpers';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts
index bc756bf9681e3..94a363333f1e5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts
@@ -6,16 +6,16 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { mlExecutor } from './ml';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { getCompleteRuleMock, getMlRuleParams } from '../../schemas/rule_schemas.mock';
 import { buildRuleMessageFactory } from '../rule_messages';
-import { getListClientMock } from '../../../../../../lists/server/services/lists/list_client.mock';
+import { getListClientMock } from '@kbn/lists-plugin/server/services/lists/list_client.mock';
 import { findMlSignals } from '../find_ml_signals';
 import { bulkCreateMlSignals } from '../bulk_create_ml_signals';
-import { mlPluginServerMock } from '../../../../../../ml/server/mocks';
+import { mlPluginServerMock } from '@kbn/ml-plugin/server/mocks';
 import { MachineLearningRuleParams } from '../../schemas/rule_schemas';
 
 jest.mock('../find_ml_signals');
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
index d20885ebb9292..2070d487c49d0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'src/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ListClient } from '../../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { isJobStarted } from '../../../../../common/machine_learning/helpers';
 import { CompleteRule, MachineLearningRuleParams } from '../../schemas/rule_schemas';
 import { bulkCreateMlSignals } from '../bulk_create_ml_signals';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts
index da1e93bf76b54..c4d1348741b12 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ListClient } from '../../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { getFilter } from '../get_filter';
 import { getInputIndex } from '../get_input_output_index';
 import { searchAfterAndBulkCreate } from '../search_after_bulk_create';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts
index 1aedf7111e078..e7cd27549ff4d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ListClient } from '../../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { getInputIndex } from '../get_input_output_index';
 import { RuleRangeTuple, BulkCreate, WrapHits } from '../types';
 import { ITelemetryEventsSender } from '../../../telemetry/sender';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts
index 1596d2582b402..0e37cc66d9654 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts
@@ -6,19 +6,19 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { thresholdExecutor } from './threshold';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntryListMock } from '../../../../../../lists/common/schemas/types/entry_list.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntryListMock } from '@kbn/lists-plugin/common/schemas/types/entry_list.mock';
 import { getThresholdRuleParams, getCompleteRuleMock } from '../../schemas/rule_schemas.mock';
 import { buildRuleMessageFactory } from '../rule_messages';
 import { sampleEmptyDocSearchResults } from '../__mocks__/es_results';
 import { allowedExperimentalValues } from '../../../../../common/experimental_features';
 import { ThresholdRuleParams } from '../../schemas/rule_schemas';
-import { createRuleDataClientMock } from '../../../../../../rule_registry/server/rule_data_client/rule_data_client.mock';
+import { createRuleDataClientMock } from '@kbn/rule-registry-plugin/server/rule_data_client/rule_data_client.mock';
 
 describe('threshold_executor', () => {
   const version = '8.0.0';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts
index cf56f46e11004..0a89f15ad4b01 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts
@@ -8,13 +8,14 @@
 import { SearchHit } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { IRuleDataReader } from '@kbn/rule-registry-plugin/server';
 import { hasLargeValueItem } from '../../../../../common/detection_engine/utils';
 import { CompleteRule, ThresholdRuleParams } from '../../schemas/rule_schemas';
 import { getFilter } from '../get_filter';
@@ -41,7 +42,6 @@ import { BuildRuleMessage } from '../rule_messages';
 import { ExperimentalFeatures } from '../../../../../common/experimental_features';
 import { withSecuritySpan } from '../../../../utils/with_security_span';
 import { buildThresholdSignalHistory } from '../threshold/build_signal_history';
-import { IRuleDataReader } from '../../../../../../rule_registry/server';
 
 export const thresholdExecutor = async ({
   completeRule,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts
index 89820bf504c37..47725bbeefcc2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts
@@ -8,9 +8,9 @@
 import { createFieldAndSetTuples } from './create_field_and_set_tuples';
 import { mockLogger, sampleDocWithSortId } from '../__mocks__/es_results';
 
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import type { EntryList } from '@kbn/securitysolution-io-ts-list-types';
 import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts
index 743218f9ed940..c6061d37f4279 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts
@@ -7,8 +7,8 @@
 
 import { mockLogger, sampleDocWithSortId } from '../__mocks__/es_results';
 
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import { createSetToFilterAgainst } from './create_set_to_filter_against';
 import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts
index 45a058b55d84b..df9bb0cd59f83 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts
@@ -7,8 +7,8 @@
 
 import { sampleDocWithSortId } from '../__mocks__/es_results';
 
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import { filterEvents } from './filter_events';
 import { FieldSet } from './types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts
index 9e118eaada4b5..8c33cf2ea1314 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts
@@ -10,9 +10,9 @@ import { filterEventsAgainstList } from './filter_events_against_list';
 import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock';
 import { mockLogger, repeatedSearchResultsWithSortId } from '../__mocks__/es_results';
 
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 
 const someGuids = Array.from({ length: 13 }).map((x) => uuid.v4());
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
index 5feb8e8b92c5b..051685c67db4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import type { Type, ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { ListClient } from '../../../../../../lists/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { BuildRuleMessage } from '../rule_messages';
 
 export interface FilterEventsAgainstListOptions<T> {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
index 7d2041d86e395..f06d62b8cf302 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
@@ -8,8 +8,8 @@
 import dateMath from '@kbn/datemath';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../../src/core/server';
-import { MlPluginSetup } from '../../../../../ml/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { AnomalyResults, getAnomalies } from '../../machine_learning';
 
 export const findMlSignals = async ({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts
index 6e824a9a639a3..60d630d3e1178 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { getFilter } from './get_filter';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('get_filter', () => {
   let servicesMock: RuleExecutorServicesMock;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
index d674cc9a3e5a1..8b7a531db78b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
@@ -8,6 +8,11 @@
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
 import { Type, LanguageOrUndefined, Language } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleExecutorServices,
+} from '@kbn/alerting-plugin/server';
 import { assertUnreachable } from '../../../../common/utility_types';
 import { getQueryFilter } from '../../../../common/detection_engine/get_query_filter';
 import {
@@ -15,11 +20,6 @@ import {
   SavedIdOrUndefined,
   IndexOrUndefined,
 } from '../../../../common/detection_engine/schemas/common/schemas';
-import {
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleExecutorServices,
-} from '../../../../../alerting/server';
 import { PartialFilter } from '../types';
 import { withSecuritySpan } from '../../../utils/with_security_span';
 import { ESBoolQuery } from '../../../../common/typed_json';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts
index fea6ac75677bf..5a2150c191a4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import { getInputIndex, GetInputIndex } from './get_input_output_index';
 import { allowedExperimentalValues } from '../../../../common/experimental_features';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts
index c2a77cb608303..9a4d068dc9658 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
 import { withSecuritySpan } from '../../../utils/with_security_span';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts
index 3958cb2a81a7f..a1d78386fa1ea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { RuleParams } from '../../schemas/rule_schemas';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeState,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Alert } from '../../../../../../alerting/server/alert';
+import { Alert } from '@kbn/alerting-plugin/server/alert';
+import { RuleParams } from '../../schemas/rule_schemas';
 
 export const alertInstanceFactoryStub = <
   TParams extends RuleParams,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
index e38d1aa774094..367f9f32d8716 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { extractExceptionsList } from './extract_exceptions_list';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { RuleParams } from '../../schemas/rule_schemas';
 import {
   EXCEPTION_LIST_NAMESPACE,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
index 93deae014005b..34b5b2d205d20 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { getSavedObjectNamePatternForExceptionsList } from './utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
index df5fdf4fcead4..0a06b42049768 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { extractReferences } from './extract_references';
 import { RuleParams } from '../../schemas/rule_schemas';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts
index c24842486c0bb..533055d7cd572 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { RuleParamsAndRefs } from '../../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { RuleParamsAndRefs } from '@kbn/alerting-plugin/server';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { extractExceptionsList } from './extract_exceptions_list';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
index 1212b73a6250e..e8addc01720e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
 import { injectExceptionsReferences } from './inject_exceptions_list';
 import { RuleParams } from '../../schemas/rule_schemas';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts
index baaaa2eb60ce9..9e5bb24b2c443 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { getSavedObjectReferenceForExceptionsList, logMissingSavedObjectError } from './utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
index eae4cb20f7948..daffc56731633 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
 import { injectReferences } from './inject_references';
 import { RuleParams } from '../../schemas/rule_schemas';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts
index 991a88828d469..3aa1e46331fb1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { injectExceptionsReferences } from './inject_exceptions_list';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts
index 70f321eed030e..d64d024c67e76 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import { getSavedObjectReference } from '.';
 
 describe('get_saved_object_reference', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts
index fe3a7393bf377..dca564b9a495b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { getSavedObjectNamePattern } from './get_saved_object_name_pattern';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts
index 9a16037ed7fd5..7bb10a83053e4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME,
   getSavedObjectReferenceForExceptionsList,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts
index d1534cc2a06bb..ddb073da8ef96 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './constants';
 import { getSavedObjectReference } from './get_saved_object_reference';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts
index d0158be285667..7f96ff68636ad 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { logMissingSavedObjectError } from '.';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts
index 8d448c3cd10c4..303c5b394bcc2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { RuleParams } from '../../../schemas/rule_schemas';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
index 58e472c75870c..b96b0e6dc7148 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
@@ -15,24 +15,24 @@ import {
   sampleDocWithSortId,
 } from './__mocks__/es_results';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import uuid from 'uuid';
-import { listMock } from '../../../../../lists/server/mocks';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { BulkCreate, BulkResponse, RuleRangeTuple, WrapHits } from './types';
 import type { SearchListItemArraySchema } from '@kbn/securitysolution-io-ts-list-types';
-import { getSearchListItemResponseMock } from '../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import { getRuleRangeTuples } from './utils';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getCompleteRuleMock, getQueryRuleParams } from '../schemas/rule_schemas.mock';
 import { bulkCreateFactory } from '../rule_types/factories/bulk_create_factory';
 import { wrapHitsFactory } from '../rule_types/factories/wrap_hits_factory';
 import { mockBuildRuleMessage } from './__mocks__/build_rule_message.mock';
 import { BuildReasonMessage } from './reason_formatters';
 import { QueryRuleParams } from '../schemas/rule_schemas';
-import { createPersistenceServicesMock } from '../../../../../rule_registry/server/utils/create_persistence_rule_type_wrapper.mock';
-import { PersistenceServices } from '../../../../../rule_registry/server';
+import { createPersistenceServicesMock } from '@kbn/rule-registry-plugin/server/utils/create_persistence_rule_type_wrapper.mock';
+import { PersistenceServices } from '@kbn/rule-registry-plugin/server';
 import {
   ALERT_RULE_CATEGORY,
   ALERT_RULE_CONSUMER,
@@ -46,7 +46,7 @@ import {
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
 import { SERVER_APP_ID } from '../../../../common/constants';
-import { CommonAlertFieldsLatest } from '../../../../../rule_registry/common/schemas';
+import { CommonAlertFieldsLatest } from '@kbn/rule-registry-plugin/common/schemas';
 
 const buildRuleMessage = mockBuildRuleMessage;
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts
index fc3aed36939cd..511f148f13d68 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Logger } from '@kbn/core/server';
 import { ITelemetryEventsSender } from '../../telemetry/sender';
 import { TelemetryEvent } from '../../telemetry/types';
 import { BuildRuleMessage } from './rule_messages';
 import { SignalSearchResponse, SignalSource } from './types';
-import { Logger } from '../../../../../../../src/core/server';
 
 interface SearchResultSource {
   _source: SignalSource;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts
index f401e3bd228ce..cc7883ede6c33 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ActionGroup } from '../../../../../alerting/common';
+import { ActionGroup } from '@kbn/alerting-plugin/common';
 
 export const siemRuleActionGroups: Array<ActionGroup<'default'>> = [
   {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
index 5bbef98b48335..35c1c7c319c3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
@@ -11,10 +11,10 @@ import {
   sampleDocSearchResultsWithSortId,
 } from './__mocks__/es_results';
 import { singleSearchAfter } from './single_search_after';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { buildRuleMessageFactory } from './rule_messages';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 const buildRuleMessage = buildRuleMessageFactory({
   id: 'fake id',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
index c247cf00b141f..12c08b7fa9824 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
@@ -10,8 +10,8 @@ import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
-import { Logger } from '../../../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { Logger } from '@kbn/core/server';
 import type { SignalSearchResponse, SignalSource } from './types';
 import { BuildRuleMessage } from './rule_messages';
 import { buildEventsSearchQuery } from './build_events_query';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts
index b2b397bf21683..d53d935f1f239 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import moment from 'moment';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getEventCount } from './get_event_count';
 
 describe('getEventCount', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts
index 2c6d3bd8cc38d..ed9e8d68b8c91 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts
@@ -8,7 +8,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { EventCountOptions, EventsOptions, EventDoc } from './types';
 import { getQueryFilter } from '../../../../../common/detection_engine/get_query_filter';
-import { singleSearchAfter } from '../../signals/single_search_after';
+import { singleSearchAfter } from '../single_search_after';
 import { buildEventsSearchQuery } from '../build_events_query';
 
 export const MAX_PER_PAGE = 9000;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts
index 08915efd4f372..1a9264f36b568 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts
@@ -19,13 +19,13 @@ import type {
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { OpenPointInTimeResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ListClient } from '../../../../../../lists/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ElasticsearchClient, Logger } from '../../../../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ITelemetryEventsSender } from '../../../telemetry/sender';
 import { BuildRuleMessage } from '../rule_messages';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
index f7d0418f63b2c..12a6bef472aaa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
@@ -9,13 +9,13 @@ import { TIMESTAMP } from '@kbn/rule-data-utils';
 
 import { get } from 'lodash/fp';
 import set from 'set-value';
-import { ThresholdNormalized } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { Logger } from '../../../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { ThresholdNormalized } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { BaseHit } from '../../../../../common/detection_engine/types';
 import { TermAggregationBucket } from '../../../types';
 import { GenericBulkCreateResponse } from '../../rule_types/factories/bulk_create_factory';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts
index 5b0ee22d87093..786739760a68d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { getQueryFilter } from '../../../../../common/detection_engine/get_query_filter';
 import { mockLogger } from '../__mocks__/es_results';
 import { buildRuleMessageFactory } from '../rule_messages';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts
index 45b56dce7e69e..fe7e5e2c8316e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts
@@ -8,16 +8,16 @@
 import { set } from '@elastic/safer-lodash-set';
 import { TIMESTAMP } from '@kbn/rule-data-utils';
 
-import {
-  ThresholdNormalized,
-  TimestampOverrideOrUndefined,
-} from '../../../../../common/detection_engine/schemas/common/schemas';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { Logger } from '../../../../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { Logger } from '@kbn/core/server';
+import {
+  ThresholdNormalized,
+  TimestampOverrideOrUndefined,
+} from '../../../../../common/detection_engine/schemas/common/schemas';
 import { BuildRuleMessage } from '../rule_messages';
 import { singleSearchAfter } from '../single_search_after';
 import type { SignalSearchResponse } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
index bc9dc69dbe19e..9ce6898e084bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { ESFilter } from '../../../../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { ThresholdSignalHistory, ThresholdSignalHistoryRecord } from '../types';
 
 /*
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts
index c5fb69ef65471..8a4931b3ce2de 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts
@@ -6,9 +6,9 @@
  */
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IRuleDataReader } from '@kbn/rule-registry-plugin/server';
 import { ThresholdSignalHistory } from '../types';
 import { buildThresholdSignalHistory } from './build_signal_history';
-import { IRuleDataReader } from '../../../../../../rule_registry/server';
 import { createErrorsFromShard } from '../utils';
 
 interface GetThresholdSignalHistoryParams {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts
index 541d2cd4c19b8..235865a8b60a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts
@@ -8,8 +8,6 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import moment from 'moment';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
-import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
 import {
   RuleType,
   RuleTypeState,
@@ -17,7 +15,13 @@ import {
   AlertInstanceContext,
   RuleExecutorOptions as AlertingRuleExecutorOptions,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
+import { Logger } from '@kbn/core/server';
+import { EcsFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/ecs_field_map';
+import { TypeOfFieldMap } from '@kbn/rule-registry-plugin/common/field_map';
+import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
+import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
 import { TermAggregationBucket } from '../../types';
 import {
   BaseHit,
@@ -25,14 +29,10 @@ import {
   SearchTypes,
   EqlSequence,
 } from '../../../../common/detection_engine/types';
-import { ListClient } from '../../../../../lists/server';
-import { Logger } from '../../../../../../../src/core/server';
 import { BuildRuleMessage } from './rule_messages';
 import { ITelemetryEventsSender } from '../../telemetry/sender';
 import { CompleteRule, RuleParams } from '../schemas/rule_schemas';
 import { GenericBulkCreateResponse } from '../rule_types/factories';
-import { EcsFieldMap } from '../../../../../rule_registry/common/assets/field_maps/ecs_field_map';
-import { TypeOfFieldMap } from '../../../../../rule_registry/common/field_map';
 import { BuildReasonMessage } from './reason_formatters';
 import {
   BaseFieldsLatest,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
index 3b0d5d17b4445..9c5becc8353b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
@@ -10,13 +10,13 @@ import sinon from 'sinon';
 import type { TransportResult } from '@elastic/elasticsearch';
 import { ALERT_REASON, ALERT_RULE_PARAMETERS, ALERT_UUID } from '@kbn/rule-data-utils';
 
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
-import { listMock } from '../../../../../lists/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { buildRuleMessageFactory } from './rule_messages';
-import { ExceptionListClient } from '../../../../../lists/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { RuleExecutionStatus } from '../../../../common/detection_engine/schemas/common';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 moment.suppressDeprecationWarnings = true;
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
index 738a9d9dd0c50..1f96f7eb9dde7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
@@ -20,24 +20,24 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { hasLargeValueList } from '@kbn/securitysolution-list-utils';
 
-import {
-  TimestampOverrideOrUndefined,
-  Privilege,
-  RuleExecutionStatus,
-} from '../../../../common/detection_engine/schemas/common';
 import type {
   ElasticsearchClient,
   IUiSettingsClient,
   Logger,
   SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
   parseDuration,
-} from '../../../../../alerting/server';
-import type { ExceptionListClient, ListClient, ListPluginSetup } from '../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import type { ExceptionListClient, ListClient, ListPluginSetup } from '@kbn/lists-plugin/server';
+import {
+  TimestampOverrideOrUndefined,
+  Privilege,
+  RuleExecutionStatus,
+} from '../../../../common/detection_engine/schemas/common';
 import type {
   BulkResponseErrorAggregation,
   SignalHit,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
index 505f8958ca44d..3886a7dacc3b7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getAlertMock, getFindResultWithMultiHits } from '../routes/__mocks__/request_responses';
 import { INTERNAL_RULE_ID_KEY, INTERNAL_IDENTIFIER } from '../../../../common/constants';
 import { readRawTags, readTags, convertTagsToSet, convertToTags, isTags } from './read_tags';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts
index 183ac6f777963..da579ee306544 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts
@@ -6,8 +6,8 @@
  */
 
 import { has } from 'lodash/fp';
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { INTERNAL_IDENTIFIER } from '../../../../common/constants';
-import { RulesClient } from '../../../../../alerting/server';
 import { findRules } from '../rules/find_rules';
 
 export interface TagType {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
index d81832d9bbe35..324a16956bf77 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
@@ -28,6 +28,7 @@ import { Version } from '@kbn/securitysolution-io-ts-types';
 
 import type { ListArrayOrUndefined } from '@kbn/securitysolution-io-ts-list-types';
 import type { Filter } from '@kbn/es-query';
+import { RuleTypeParams as AlertingRuleTypeParams } from '@kbn/alerting-plugin/common';
 import {
   AnomalyThresholdOrUndefined,
   Description,
@@ -53,8 +54,6 @@ import {
   EventCategoryOverrideOrUndefined,
 } from '../../../common/detection_engine/schemas/common/schemas';
 
-import { RuleTypeParams as AlertingRuleTypeParams } from '../../../../alerting/common';
-
 export type PartialFilter = Partial<Filter>;
 
 export interface RuleTypeParams extends AlertingRuleTypeParams {
diff --git a/x-pack/plugins/security_solution/server/lib/framework/types.ts b/x-pack/plugins/security_solution/server/lib/framework/types.ts
index 3ecd2adf00242..6b69251e6d7ff 100644
--- a/x-pack/plugins/security_solution/server/lib/framework/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/framework/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest, RequestHandlerContext } from '../../../../../../src/core/server';
-import { AuthenticatedUser } from '../../../../security/common/model';
+import { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
 export const internalFrameworkRequest = Symbol('internalFrameworkRequest');
 
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts
index d87c53ecfba71..7a0c72c85d62e 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
-import { httpServerMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { httpServerMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions';
 import { mlServicesMock } from './mocks';
 import { hasMlLicense, isMlAdmin, buildMlAuthz } from './authz';
-import { licensingMock } from '../../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 jest.mock('../../../common/machine_learning/has_ml_admin_permissions');
 
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
index 3b96de2d4b1d1..ffaedc19a7f7b 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 
 import { Type } from '@kbn/securitysolution-io-ts-alerting-types';
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
-import { ILicense } from '../../../../licensing/server';
-import { MlPluginSetup } from '../../../../ml/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { SetupPlugins } from '../../plugin';
 import { MINIMUM_ML_LICENSE } from '../../../common/constants';
 import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions';
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts
index 41f6833743797..9e6df67b89d87 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
-import { getExceptionListItemSchemaMock } from '../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { getAnomalies, AnomaliesSearchParams } from '.';
 
 const getFiltersFromMock = (mock: jest.Mock) => {
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
index 5beba022d8614..3728d6faf79f9 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { buildExceptionFilter } from '@kbn/securitysolution-list-utils';
-import { MlAnomalyRecordDoc as Anomaly } from '../../../../ml/server';
+import { MlAnomalyRecordDoc as Anomaly } from '@kbn/ml-plugin/server';
 
 export type { Anomaly };
 export type AnomalyResults = estypes.SearchResponse<Anomaly>;
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts
index a121a682d2892..b76dba6d072ef 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mlPluginServerMock } from '../../../../ml/server/mocks';
+import { mlPluginServerMock } from '@kbn/ml-plugin/server/mocks';
 
 export const mlServicesMock = mlPluginServerMock;
 
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/readme.md b/x-pack/plugins/security_solution/server/lib/sourcerer/readme.md
new file mode 100644
index 0000000000000..3435959348c6a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/readme.md
@@ -0,0 +1,78 @@
+# Sourcerer API
+
+### Model reference
+
+```typescript
+interface KibanaDataView {
+  /** Uniquely identifies a Kibana Data View */
+  id: string;
+  /**  list of active patterns that return data  */
+  patternList: string[];
+  /**
+   * title of Kibana Data View
+   * title also serves as "all pattern list", including inactive
+   * comma separated string
+   */
+  title: string;
+}
+```
+
+### API usage
+
+The sourcerer API has one route with 2 methods
+
+1. POST - `createSourcererDataViewRoute`
+   1. REQUEST:
+       ```typescript
+         POST /internal/security_solution/sourcerer
+         {
+           patternList: [...configPatternList, ...(signal.name != null ? [signal.name] : [])]
+         }
+         ```
+   2. RESPONSE:
+       ```typescript
+         {
+             /** default security-solution data view */
+             defaultDataView: KibanaDataView;
+
+             /** all Kibana data views, including default security-solution */
+             kibanaDataViews: KibanaDataView[];
+          }
+          ```
+   3. This route is called from `security_solution/public/plugin.tsx` on app load. It passes an argument of `patternList` which is an array of the config index patterns defined in Stack Management > Advanced Settings > Security Solution > Elasticsearch indices along with the default signal index
+   4. `dataViewService.getIdsWithTitle` is called to get all existing data views ids and titles
+   5. Next `dataViewService.get` method is called to attempt to retrieve the default security data view by id (`siemClient.getSourcererDataViewId()`). If the data view id does not exist, it uses `dataViewService.createAndSave` to create the default security data view. 
+   6. `patternListAsTitle` (a string of the patternList passed) is compared to the current `siemDataViewTitle`. If they do not match, we use `dataViewService.updateSavedObject` to update the data view title. This may happen when a pattern is added or removed from the Stack Management > Advanced Settings > Security Solution > Elasticsearch indices.
+   7. Next we call `buildSourcererDataView` for the default data view only. This takes the `dataView.title` and finds which patterns on the list returns data. Valid patterns are returned in an array called `patternList`. The non-default data views will have an empty array for patternList, and we will call this function if/when the data view is selected to save time.
+   8. At the end we return a body of 
+      ```
+        {
+           /** default security-solution data view */
+           defaultDataView: KibanaDataView;
+      
+           /** all Kibana data views, including default security-solution */
+           kibanaDataViews: KibanaDataView[];
+        }
+        ```
+   9. The other place this POST is called is when the default signal index does not yet exist. In the front-end there is a method called `pollForSignalIndex` that is defined when the signal index has been initiated but does not have data. It is called whenever the detection sourcerer or timeline sourcerer mounts, or whenever the search bar is refreshed. If the signal index is defined, `pollForSignalIndex` ceases to exist and is not called.
+   10. One more place we call the POST method is when the signal index first has data, we send a POST in a method called `onSignalIndexUpdated` to include the newly created index in the data view
+2. GET - `getSourcererDataViewRoute`
+   1. REQUEST:
+       ```typescript
+         GET /internal/security_solution/sourcerer?dataViewId=security-solution-default
+         ```
+   2. RESPONSE:
+       ```typescript
+         KibanaDataView
+       ```
+3. When the user changes the data view from the default in the UI, we call the GET method to find which index patterns in the `dataView.title` are valid, returning a valid `patternList`. 
+4. We return a body of a single `KibanaDataView`
+
+### Helpers
+To build the valid pattern list, we call `findExistingIndices` which takes the pattern list as an argument, and returns a boolean array of which patterns are valid. To check if indices exist, we use the field caps API for each pattern checking for the field `_id`. This will return a list of valid indices. If the array is empty, no indices exist for the pattern. For example:
+```typescript
+  // Given
+  findExistingIndices(['auditbeat-*', 'fakebeat-*', 'packetbeat-*'])
+  // Returns
+  [true, false, true]
+```
\ No newline at end of file
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts
index 9c920a29529ab..46e332ca33e19 100644
--- a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export const findExistingIndices = async (
   indices: string[],
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts
index 1e87a8564df21..232aba9d1ae3a 100644
--- a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createSourcererDataViewRoute } from './';
+import { createSourcererDataViewRoute } from '.';
 import {
   requestMock,
   serverMock,
@@ -13,7 +13,7 @@ import {
 } from '../../detection_engine/routes/__mocks__';
 
 import { SOURCERER_API_URL } from '../../../../common/constants';
-import { StartServicesAccessor } from 'kibana/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { StartPlugins } from '../../../plugin';
 
 jest.mock('./helpers', () => {
@@ -137,7 +137,10 @@ describe('sourcerer route', () => {
       });
       test('returns sourcerer formatted Data Views when SIEM Data View does NOT exist', async () => {
         createSourcererDataViewRoute(server.router, getStartServicesNotSiem);
-        const response = await server.inject(getSourcererRequest(mockPatternList), context);
+        const response = await server.inject(
+          getSourcererRequest(mockPatternList),
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual(mockDataViewsTransformed);
       });
@@ -163,7 +166,10 @@ describe('sourcerer route', () => {
           },
         ] as unknown) as StartServicesAccessor<StartPlugins>;
         createSourcererDataViewRoute(server.router, getStartServicesSpecial);
-        const response = await server.inject(getSourcererRequest(mockPatternList), context);
+        const response = await server.inject(
+          getSourcererRequest(mockPatternList),
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual(mockDataViewsTransformed);
       });
@@ -192,14 +198,20 @@ describe('sourcerer route', () => {
           },
         ] as unknown) as StartServicesAccessor<StartPlugins>;
         createSourcererDataViewRoute(server.router, getStartServicesSpecial);
-        await server.inject(getSourcererRequest(mockPatternList), context);
+        await server.inject(
+          getSourcererRequest(mockPatternList),
+          requestContextMock.convertContext(context)
+        );
         expect(mockCreateAndSave).toHaveBeenCalled();
         expect(mockCreateAndSave.mock.calls[0][1]).toEqual(true);
       });
 
       test('returns sourcerer formatted Data Views when SIEM Data View exists', async () => {
         createSourcererDataViewRoute(server.router, getStartServices);
-        const response = await server.inject(getSourcererRequest(mockPatternList), context);
+        const response = await server.inject(
+          getSourcererRequest(mockPatternList),
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual(mockDataViewsTransformed);
       });
@@ -207,7 +219,10 @@ describe('sourcerer route', () => {
       test('returns sourcerer formatted Data Views when SIEM Data View exists and patternList input is changed', async () => {
         createSourcererDataViewRoute(server.router, getStartServices);
         mockPatternList.shift();
-        const response = await server.inject(getSourcererRequest(mockPatternList), context);
+        const response = await server.inject(
+          getSourcererRequest(mockPatternList),
+          requestContextMock.convertContext(context)
+        );
         expect(response.status).toEqual(200);
         expect(response.body).toEqual({
           defaultDataView: {
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts
index 9e182793d0b47..bf69ed03fb79a 100644
--- a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts
@@ -6,12 +6,9 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import type { ElasticsearchClient, StartServicesAccessor } from 'kibana/server';
+import type { ElasticsearchClient, StartServicesAccessor } from '@kbn/core/server';
 
-import type {
-  DataView,
-  DataViewListItem,
-} from '../../../../../../../src/plugins/data_views/common';
+import type { DataView, DataViewListItem } from '@kbn/data-views-plugin/common';
 import { DEFAULT_TIME_FIELD, SOURCERER_API_URL } from '../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
@@ -37,7 +34,8 @@ export const createSourcererDataViewRoute = (
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
-      const siemClient = context.securitySolution?.getAppClient();
+      const coreContext = await context.core;
+      const siemClient = (await context.securitySolution)?.getAppClient();
       const dataViewId = siemClient.getSourcererDataViewId();
 
       try {
@@ -49,8 +47,8 @@ export const createSourcererDataViewRoute = (
         ] = await getStartServices();
 
         const dataViewService = await indexPatterns.dataViewsServiceFactory(
-          context.core.savedObjects.client,
-          context.core.elasticsearch.client.asCurrentUser,
+          coreContext.savedObjects.client,
+          coreContext.elasticsearch.client.asCurrentUser,
           request,
           true
         );
@@ -106,7 +104,7 @@ export const createSourcererDataViewRoute = (
 
         const defaultDataView = await buildSourcererDataView(
           siemDataView,
-          context.core.elasticsearch.client.asCurrentUser
+          coreContext.elasticsearch.client.asCurrentUser
         );
         return response.ok({
           body: {
@@ -146,6 +144,7 @@ export const getSourcererDataViewRoute = (
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
+      const coreContext = await context.core;
       const { dataViewId } = request.query;
       try {
         const [
@@ -156,8 +155,8 @@ export const getSourcererDataViewRoute = (
         ] = await getStartServices();
 
         const dataViewService = await indexPatterns.dataViewsServiceFactory(
-          context.core.savedObjects.client,
-          context.core.elasticsearch.client.asCurrentUser,
+          coreContext.savedObjects.client,
+          coreContext.elasticsearch.client.asCurrentUser,
           request,
           true
         );
@@ -166,7 +165,7 @@ export const getSourcererDataViewRoute = (
         const kibanaDataView = siemDataView
           ? await buildSourcererDataView(
               siemDataView,
-              context.core.elasticsearch.client.asCurrentUser
+              coreContext.elasticsearch.client.asCurrentUser
             )
           : {};
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts b/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts
index e18d104b0d73a..b28a5213b4326 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ConcreteTaskInstance, TaskStatus } from '../../../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TelemetryEventsSender } from '../sender';
 import { TelemetryReceiver } from '../receiver';
 import { SecurityTelemetryTaskConfig } from '../task';
-import { PackagePolicy } from '../../../../../fleet/common/types/models/package_policy';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
 
 export const createMockTelemetryEventsSender = (
   enableTelemetry?: boolean
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts
index 15f7b0a2a54c8..5a62513b1ab38 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts
@@ -62,8 +62,8 @@ const allowlistBaseEventFields: AllowlistFields = {
     directory: true,
     hash: true,
     Ext: {
-      compressed_bytes: true,
-      compressed_bytes_present: true,
+      bytes_compressed: true,
+      bytes_compressed_present: true,
       code_signature: true,
       header_bytes: true,
       header_data: true,
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts
index 7f3756c2971ef..176210b07062b 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { copyAllowlistedFields } from './index';
+import { copyAllowlistedFields } from '.';
 
 describe('Security Telemetry filters', () => {
   describe('allowlistEventFields', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts
index e02e62417f63a..b71ab6118adb5 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts
@@ -77,7 +77,9 @@ export const prebuiltRuleAllowlistFields: AllowlistFields = {
   group: {
     name: true,
   },
-  host: true,
+  host: {
+    os: true,
+  },
   http: {
     request: {
       body: {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts b/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts
index 9f63775a1bff7..095d55228fa71 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { PackagePolicy } from '../../../../fleet/common/types/models/package_policy';
-import { copyAllowlistedFields, exceptionListAllowlistFields } from './filterlists/index';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
+import { copyAllowlistedFields, exceptionListAllowlistFields } from './filterlists';
 import { PolicyData } from '../../../common/endpoint/types';
 import type {
   ExceptionListItem,
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts b/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts
index 367eb92824117..9c7f9aa4f7370 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { sha256 } from 'js-sha256';
 
 interface AlertContext {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts
index 3c5f3bdd52bde..6499d9328652c 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts
@@ -7,14 +7,14 @@
 
 import axios, { AxiosInstance, AxiosResponse } from 'axios';
 
-import { Logger } from 'src/core/server';
-import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ITelemetryEventsSender } from './sender';
 import { TelemetryEvent } from './types';
 import { ITelemetryReceiver } from './receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts b/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts
index 36dfc191ce335..2f1a5fbd5cc7d 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts
@@ -10,7 +10,7 @@ import {
   CoreStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   AggregationsAggregate,
   SearchRequest,
@@ -27,9 +27,9 @@ import {
   THRESHOLD_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 import { TransportResult } from '@elastic/elasticsearch';
-import { Agent, AgentPolicy } from '../../../../fleet/common';
-import { AgentClient, AgentPolicyServiceInterface } from '../../../../fleet/server';
-import { ExceptionListClient } from '../../../../lists/server';
+import { Agent, AgentPolicy } from '@kbn/fleet-plugin/common';
+import { AgentClient, AgentPolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../endpoint/endpoint_app_context_services';
 import { TELEMETRY_MAX_BUFFER_SIZE } from './constants';
 import {
@@ -533,8 +533,63 @@ export class TelemetryReceiver implements ITelemetryReceiver {
                 bool: {
                   should: [
                     {
-                      match_phrase: {
-                        'kibana.alert.rule.parameters.immutable': 'true',
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Malware Prevention Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Malware Detection Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Ransomware Prevention Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Ransomware Detection Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
                       },
                     },
                   ],
@@ -542,17 +597,13 @@ export class TelemetryReceiver implements ITelemetryReceiver {
               },
               {
                 bool: {
-                  must_not: {
-                    bool: {
-                      should: [
-                        {
-                          match_phrase: {
-                            'event.module': 'endpoint',
-                          },
-                        },
-                      ],
+                  should: [
+                    {
+                      match_phrase: {
+                        'kibana.alert.rule.parameters.immutable': 'true',
+                      },
                     },
-                  },
+                  ],
                 },
               },
               {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts
index dff3676c20c8a..71e8b8e11c215 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable dot-notation */
 import { TelemetryEventsSender } from './sender';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { URL } from 'url';
 
 describe('TelemetryEventsSender', () => {
@@ -59,8 +59,8 @@ describe('TelemetryEventsSender', () => {
             test: 'me',
             another: 'nope',
             Ext: {
-              compressed_bytes: 'data up to 4mb',
-              compressed_bytes_present: 'data up to 4mb',
+              bytes_compressed: 'data up to 4mb',
+              bytes_compressed_present: 'data up to 4mb',
               code_signature: {
                 key1: 'X',
                 key2: 'Y',
@@ -133,8 +133,8 @@ describe('TelemetryEventsSender', () => {
             created: 0,
             path: 'X',
             Ext: {
-              compressed_bytes: 'data up to 4mb',
-              compressed_bytes_present: 'data up to 4mb',
+              bytes_compressed: 'data up to 4mb',
+              bytes_compressed_present: 'data up to 4mb',
               code_signature: {
                 key1: 'X',
                 key2: 'Y',
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
index db35cf0c7ad8a..218afc7bc69a1 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
@@ -9,16 +9,16 @@ import { cloneDeep } from 'lodash';
 import { URL } from 'url';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import axios, { AxiosInstance } from 'axios';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ITelemetryReceiver } from './receiver';
-import { copyAllowlistedFields, endpointAllowlistFields } from './filterlists/index';
+import { copyAllowlistedFields, endpointAllowlistFields } from './filterlists';
 import { createTelemetryTaskConfigs } from './tasks';
 import { createUsageCounterLabel } from './helpers';
 import type { TelemetryEvent } from './types';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts
index aa695b92c1455..36a93fd232bb7 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { SuccessfulRunResult } from '../../../../task_manager/server/task';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { SuccessfulRunResult } from '@kbn/task-manager-plugin/server/task';
 import { SecurityTelemetryTask } from './task';
 import {
   createMockTaskInstance,
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/task.ts b/x-pack/plugins/security_solution/server/lib/telemetry/task.ts
index c3d674f721491..dc55d43bd8008 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/task.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/task.ts
@@ -6,12 +6,12 @@
  */
 
 import moment from 'moment';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ITelemetryReceiver } from './receiver';
 import { ITelemetryEventsSender } from './sender';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts
index 5b0c2e334cec9..9cfbaffbcaa42 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryDetectionRuleListsTaskConfig } from './detection_rule';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts
index 73931f856a336..d5d093a2fa074 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { LIST_DETECTION_RULE_EXCEPTION, TELEMETRY_CHANNEL_LISTS } from '../constants';
 import { batchTelemetryRecords, templateExceptionList } from '../helpers';
 import { ITelemetryEventsSender } from '../sender';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts
index 579ec42b1ec32..45d3eeb40a801 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryDiagnosticsTaskConfig } from './diagnostic';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts
index a798077e62aff..efaac1b78e421 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getPreviousDiagTaskTimestamp } from '../helpers';
 import { ITelemetryEventsSender } from '../sender';
 import type { TelemetryEvent } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts
index 16c10a90109b2..ce31247f075d7 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryEndpointTaskConfig } from './endpoint';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts
index c2c318debccda..59bc07f8ca2eb 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
+import { FLEET_ENDPOINT_PACKAGE } from '@kbn/fleet-plugin/common';
 import { ITelemetryEventsSender } from '../sender';
 import type {
   EndpointMetricsAggregation,
@@ -25,7 +26,6 @@ import {
   isPackagePolicyList,
 } from '../helpers';
 import { PolicyData } from '../../../../common/endpoint/types';
-import { FLEET_ENDPOINT_PACKAGE } from '../../../../../fleet/common';
 import { TELEMETRY_CHANNEL_ENDPOINT_META } from '../constants';
 
 // Endpoint agent uses this Policy ID while it's installing.
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts
index 1efd4299de523..cc784f54a33e0 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryPrebuiltRuleAlertsTaskConfig } from './prebuilt_rule_alerts';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts
index ad284df0e7c06..20de990816c9e 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ITelemetryEventsSender } from '../sender';
 import { ITelemetryReceiver } from '../receiver';
 import type { ESClusterInfo, ESLicense } from '../types';
@@ -13,7 +13,7 @@ import { TaskExecutionPeriod } from '../task';
 import { TELEMETRY_CHANNEL_DETECTION_ALERTS } from '../constants';
 import { batchTelemetryRecords } from '../helpers';
 import { TelemetryEvent } from '../types';
-import { copyAllowlistedFields, prebuiltRuleAllowlistFields } from '../filterlists/index';
+import { copyAllowlistedFields, prebuiltRuleAllowlistFields } from '../filterlists';
 
 export function createTelemetryPrebuiltRuleAlertsTaskConfig(maxTelemetryBatch: number) {
   return {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts
index e4e09d308d4c2..7f31066ed90ec 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetrySecurityListTaskConfig } from './security_lists';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts
index f655674b6ca96..54733fe0cc13b 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ENDPOINT_LIST_ID,
   ENDPOINT_EVENT_FILTERS_LIST_ID,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts b/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts
index a6508f609d9d6..00edc25541566 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { TimelineStatus, TimelineType } from '../../../../common/types/timeline';
-import { ResolvedTimelineWithOutcomeSavedObject } from './../../../../common/types/timeline/index';
+import {
+  TimelineStatus,
+  TimelineType,
+  ResolvedTimelineWithOutcomeSavedObject,
+} from '../../../../common/types/timeline';
 
 export const mockResolvedSavedObject = {
   saved_object: {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts
index 81f62e0c76542..1a62b7604bfd7 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { TimelineType } from '../../../../../../common/types/timeline';
 
 import {
@@ -73,7 +73,7 @@ describe('clean draft timelines', () => {
       persistNote: mockPersistNote,
     }));
 
-    const cleanDraftTimelinesRoute = jest.requireActual('./index').cleanDraftTimelinesRoute;
+    const cleanDraftTimelinesRoute = jest.requireActual('.').cleanDraftTimelinesRoute;
     cleanDraftTimelinesRoute(server.router, createMockConfig(), securitySetup);
   });
 
@@ -82,7 +82,10 @@ describe('clean draft timelines', () => {
       timeline: [],
     });
 
-    const response = await server.inject(cleanDraftTimelinesRequest(TimelineType.default), context);
+    const response = await server.inject(
+      cleanDraftTimelinesRequest(TimelineType.default),
+      requestContextMock.convertContext(context)
+    );
     const req = cleanDraftTimelinesRequest(TimelineType.default);
     expect(mockPersistTimeline).toHaveBeenCalled();
     expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
@@ -106,7 +109,10 @@ describe('clean draft timelines', () => {
     mockResetTimeline.mockResolvedValue({});
     mockGetTimeline.mockResolvedValue({ ...mockGetDraftTimelineValue });
 
-    const response = await server.inject(cleanDraftTimelinesRequest(TimelineType.default), context);
+    const response = await server.inject(
+      cleanDraftTimelinesRequest(TimelineType.default),
+      requestContextMock.convertContext(context)
+    );
     const req = cleanDraftTimelinesRequest(TimelineType.default);
 
     expect(mockPersistTimeline).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts
index ec9b4e08a673a..cb488ef7d84ac 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { TimelineType } from '../../../../../../common/types/timeline';
 
 import {
@@ -74,7 +74,7 @@ describe('get draft timelines', () => {
           persistNote: mockPersistNote,
         }));
 
-        const getDraftTimelinesRoute = jest.requireActual('./index').getDraftTimelinesRoute;
+        const getDraftTimelinesRoute = jest.requireActual('.').getDraftTimelinesRoute;
         getDraftTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
@@ -83,7 +83,7 @@ describe('get draft timelines', () => {
           timeline: [],
         });
         const req = getDraftTimelinesRequest(TimelineType.default);
-        const response = await server.inject(req, context);
+        const response = await server.inject(req, requestContextMock.convertContext(context));
         expect(mockPersistTimeline).toHaveBeenCalled();
         expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
           ...draftTimelineDefaults,
@@ -107,7 +107,7 @@ describe('get draft timelines', () => {
 
         const response = await server.inject(
           getDraftTimelinesRequest(TimelineType.default),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(mockPersistTimeline).not.toHaveBeenCalled();
         expect(response.status).toEqual(200);
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
index d4425d17671a3..6e0921eae8b29 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { createPromiseFromStreams } from '@kbn/utils';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import { FrameworkRequest } from '../../../../framework';
 import {
@@ -57,7 +57,11 @@ describe.each([
     });
 
     const request = addPrepackagedRulesRequest();
-    frameworkRequest = await buildFrameworkRequest(context, securitySetup, request);
+    frameworkRequest = await buildFrameworkRequest(
+      requestContextMock.convertContext(context),
+      securitySetup,
+      request
+    );
   });
 
   afterEach(() => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
index 345987a82873f..34a26b977e38e 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -64,7 +64,10 @@ describe('installPrepackagedTimelines', () => {
       mockCheckTimelinesStatusBeforeInstallResult
     );
 
-    await server.inject(installPrepackedTimelinesRequest(), context);
+    await server.inject(
+      installPrepackedTimelinesRequest(),
+      requestContextMock.convertContext(context)
+    );
 
     expect(installPrepackagedTimelines).toHaveBeenCalled();
   });
@@ -81,7 +84,10 @@ describe('installPrepackagedTimelines', () => {
       timelines_updated: 0,
     });
 
-    const result = await server.inject(installPrepackedTimelinesRequest(), context);
+    const result = await server.inject(
+      installPrepackedTimelinesRequest(),
+      requestContextMock.convertContext(context)
+    );
 
     expect(result.body).toEqual({
       errors: [],
@@ -95,7 +101,10 @@ describe('installPrepackagedTimelines', () => {
   test('should not call installPrepackagedTimelines if it has nothing to install or update', async () => {
     (checkTimelinesStatus as jest.Mock).mockReturnValue(mockCheckTimelinesStatusAfterInstallResult);
 
-    await server.inject(installPrepackedTimelinesRequest(), context);
+    await server.inject(
+      installPrepackedTimelinesRequest(),
+      requestContextMock.convertContext(context)
+    );
 
     expect(installPrepackagedTimelines).not.toHaveBeenCalled();
   });
@@ -103,7 +112,10 @@ describe('installPrepackagedTimelines', () => {
   test('should return success if it has nothing to install or update', async () => {
     (checkTimelinesStatus as jest.Mock).mockReturnValue(mockCheckTimelinesStatusAfterInstallResult);
 
-    const result = await server.inject(installPrepackedTimelinesRequest(), context);
+    const result = await server.inject(
+      installPrepackedTimelinesRequest(),
+      requestContextMock.convertContext(context)
+    );
 
     expect(result.body).toEqual({
       errors: [],
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
index 18dcdfe103b1f..be97cbd01e428 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
@@ -12,7 +12,7 @@ import { FrameworkRequest } from '../../../../framework';
 import { SavedTimeline } from '../../../../../../common/types';
 import { mockTemplate, mockTimeline } from '../../../__mocks__/create_timelines';
 import { buildFrameworkRequest } from '../../../utils/common';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { requestContextMock } from '../../../../detection_engine/routes/__mocks__';
 import {
   getCreateTimelinesRequest,
@@ -69,7 +69,11 @@ describe('createTimelines', () => {
     const { context } = requestContextMock.createTools();
     const mockRequest = getCreateTimelinesRequest(createTimelineWithoutTimelineId);
 
-    frameworkRequest = await buildFrameworkRequest(context, securitySetup, mockRequest);
+    frameworkRequest = await buildFrameworkRequest(
+      requestContextMock.convertContext(context),
+      securitySetup,
+      mockRequest
+    );
     Date.now = jest.fn().mockReturnValue(new Date('2020-11-04T11:37:31.655Z'));
   });
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts
index de11037db7038..9de715751ca7f 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -89,11 +89,11 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getCreateTimelinesRequest(createTimelineWithoutTimelineId);
-        await server.inject(mockRequest, context);
+        await server.inject(mockRequest, requestContextMock.convertContext(context));
       });
 
       test('should Create a new timeline savedObject', async () => {
@@ -123,7 +123,7 @@ describe('create timelines', () => {
       test('returns 200 when create timeline successfully', async () => {
         const response = await server.inject(
           getCreateTimelinesRequest(createTimelineWithoutTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.status).toEqual(200);
       });
@@ -150,14 +150,14 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
       test('returns error message', async () => {
         const response = await server.inject(
           getCreateTimelinesRequest(createTimelineWithTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.body).toEqual({
           message: CREATE_TIMELINE_ERROR_MESSAGE,
@@ -191,11 +191,11 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getCreateTimelinesRequest(createTemplateTimelineWithoutTimelineId);
-        await server.inject(mockRequest, context);
+        await server.inject(mockRequest, requestContextMock.convertContext(context));
       });
 
       test('should Create a new timeline template savedObject', async () => {
@@ -227,7 +227,7 @@ describe('create timelines', () => {
       test('returns 200 when create timeline successfully', async () => {
         const response = await server.inject(
           getCreateTimelinesRequest(createTimelineWithoutTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.status).toEqual(200);
       });
@@ -257,14 +257,14 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
       test('returns error message', async () => {
         const response = await server.inject(
           getCreateTimelinesRequest(updateTemplateTimelineWithTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.body).toEqual({
           message: CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
index 832310b57a76c..cfd61beb4b174 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
@@ -24,7 +24,7 @@ import { convertSavedObjectToSavedNote } from '../../../saved_object/notes/saved
 import { convertSavedObjectToSavedPinnedEvent } from '../../../saved_object/pinned_events';
 import { convertSavedObjectToSavedTimeline } from '../../../saved_object/timelines/convert_saved_object_to_savedtimeline';
 import { mockGetCurrentUser } from '../../../__mocks__/import_timelines';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 jest.mock('../../../saved_object/timelines/convert_saved_object_to_savedtimeline', () => {
   return {
@@ -71,14 +71,20 @@ describe('export timelines', () => {
 
   describe('status codes', () => {
     test('returns 200 when finding selected timelines', async () => {
-      const response = await server.inject(getExportTimelinesRequest(), context);
+      const response = await server.inject(
+        getExportTimelinesRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(200);
     });
 
     test('catch error when status search throws error', async () => {
       clients.savedObjectsClient.bulkGet.mockReset();
       clients.savedObjectsClient.bulkGet.mockRejectedValue(new Error('Test error'));
-      const response = await server.inject(getExportTimelinesRequest(), context);
+      const response = await server.inject(
+        getExportTimelinesRequest(),
+        requestContextMock.convertContext(context)
+      );
       expect(response.status).toEqual(500);
       expect(response.body).toEqual({
         message: 'Test error',
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
index edc0afd08c4ef..c5c8ab6bfb7f2 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -49,7 +49,10 @@ describe('get timeline', () => {
 
   test('should call getTimelineTemplateOrNull if templateTimelineId is given', async () => {
     const templateTimelineId = '123';
-    await server.inject(getTimelineRequest({ template_timeline_id: templateTimelineId }), context);
+    await server.inject(
+      getTimelineRequest({ template_timeline_id: templateTimelineId }),
+      requestContextMock.convertContext(context)
+    );
 
     expect((getTimelineTemplateOrNull as jest.Mock).mock.calls[0][1]).toEqual(templateTimelineId);
   });
@@ -57,13 +60,16 @@ describe('get timeline', () => {
   test('should call getTimelineOrNull if id is given', async () => {
     const id = '456';
 
-    await server.inject(getTimelineRequest({ id }), context);
+    await server.inject(getTimelineRequest({ id }), requestContextMock.convertContext(context));
 
     expect((getTimelineOrNull as jest.Mock).mock.calls[0][1]).toEqual(id);
   });
 
   test('should throw error message if nither templateTimelineId nor id is given', async () => {
-    const res = await server.inject(getTimelineRequest(), context);
+    const res = await server.inject(
+      getTimelineRequest(),
+      requestContextMock.convertContext(context)
+    );
     expect(res.body.message).toEqual('please provide id or template_timeline_id');
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
index 54c9345d4ac7f..208b804f222dc 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -46,13 +46,13 @@ describe('get all timelines', () => {
   });
 
   test('should get the total count', async () => {
-    await server.inject(getTimelineRequest(), context);
+    await server.inject(getTimelineRequest(), requestContextMock.convertContext(context));
     expect((getAllTimeline as jest.Mock).mock.calls[0][2]).toEqual({ pageSize: 1, pageIndex: 1 });
   });
 
   test('should get all timelines with total count', async () => {
     (getAllTimeline as jest.Mock).mockResolvedValue({ totalCount: 100 });
-    await server.inject(getTimelineRequest(), context);
+    await server.inject(getTimelineRequest(), requestContextMock.convertContext(context));
     expect((getAllTimeline as jest.Mock).mock.calls[1][2]).toEqual({ pageSize: 100, pageIndex: 1 });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts
index b4e2bc0222dd5..9148c8f5441d1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../../detection_engine/routes/__mocks__';
 import { TIMELINE_EXPORT_URL } from '../../../../../../common/constants';
 import { TimelineStatus, TimelineType } from '../../../../../../common/types/timeline';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   mockUniqueParsedObjects,
@@ -152,37 +152,37 @@ describe('import timelines', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
     test('should use given timelineId to check if the timeline savedObject already exist', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockGetTimeline.mock.calls[0][1]).toEqual(mockUniqueParsedObjects[0].savedObjectId);
     });
 
     test('should Create a new timeline savedObject', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline).toHaveBeenCalled();
     });
 
     test('should Create a new timeline savedObject without timelineId', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][1]).toBeNull();
     });
 
     test('should Create a new timeline savedObject without timeline version', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][2]).toBeNull();
     });
 
     test('should Create a new timeline savedObject with given timeline', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
         ...mockParsedTimelineObject,
         status: TimelineStatus.active,
@@ -202,7 +202,7 @@ describe('import timelines', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -222,13 +222,13 @@ describe('import timelines', () => {
 
     test('should Create new pinned events', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistPinnedEventOnTimeline).toHaveBeenCalled();
     });
 
     test('should Create a new pinned event with new timeline id', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistPinnedEventOnTimeline.mock.calls[0][1]).toEqual(
         mockCreatedTimeline.savedObjectId
       );
@@ -236,7 +236,7 @@ describe('import timelines', () => {
 
     test('should Create a new pinned event with pinnedEventId', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistPinnedEventOnTimeline.mock.calls[0][2]).toEqual(
         mockUniqueParsedObjects[0].pinnedEventIds
       );
@@ -244,7 +244,7 @@ describe('import timelines', () => {
 
     test('should Check if note exists', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockGetNote.mock.calls[0][1]).toEqual(
         mockUniqueParsedObjects[0].globalNotes[0].noteId
       );
@@ -252,19 +252,19 @@ describe('import timelines', () => {
 
     test('should Create notes', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote).toHaveBeenCalled();
     });
 
     test('should provide no noteSavedObjectId when Creating notes for a timeline', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].noteId).toBeNull();
     });
 
     test('should provide new notes with original author info when Creating notes for a timeline', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].note).toEqual({
         eventId: undefined,
         note: 'original note',
@@ -299,7 +299,7 @@ describe('import timelines', () => {
       mockGetNote.mockRejectedValue(new Error());
 
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].note).toEqual({
         created: mockUniqueParsedObjects[0].globalNotes[0].created,
         createdBy: mockUniqueParsedObjects[0].globalNotes[0].createdBy,
@@ -331,7 +331,7 @@ describe('import timelines', () => {
 
     test('returns 200 when import timeline successfully', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
     });
   });
@@ -358,13 +358,13 @@ describe('import timelines', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
     test('returns error message', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -393,7 +393,7 @@ describe('import timelines', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -422,7 +422,7 @@ describe('import timelines', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -472,7 +472,7 @@ describe('import timelines', () => {
         path: TIMELINE_EXPORT_URL,
         body: { id: 'someId' },
       });
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
 
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
       const result = server.validate(request);
@@ -576,13 +576,13 @@ describe('import timeline templates', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
     test('should use given timelineId to check if the timeline savedObject already exist', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockGetTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
       );
@@ -590,7 +590,7 @@ describe('import timeline templates', () => {
 
     test('should use given templateTimelineId to check if the timeline savedObject already exist', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId
       );
@@ -598,25 +598,25 @@ describe('import timeline templates', () => {
 
     test('should Create a new timeline savedObject', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline).toHaveBeenCalled();
     });
 
     test('should Create a new timeline savedObject without timelineId', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][1]).toBeNull();
     });
 
     test('should Create a new timeline savedObject without timeline version', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][2]).toBeNull();
     });
 
     test('should Create a new timeline savedObject witn given timeline and skip the omitted fields', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
         ...mockParsedTemplateTimelineObject,
         status: TimelineStatus.active,
@@ -625,19 +625,19 @@ describe('import timeline templates', () => {
 
     test('should NOT Create new pinned events', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistPinnedEventOnTimeline).not.toHaveBeenCalled();
     });
 
     test('should provide no noteSavedObjectId when Creating notes for a timeline', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].noteId).toBeNull();
     });
 
     test('should exclude event notes when creating notes', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].note).toEqual({
         eventId: undefined,
         note: mockUniqueParsedTemplateTimelineObjects[0].globalNotes[0].note,
@@ -651,7 +651,7 @@ describe('import timeline templates', () => {
 
     test('returns 200 when import timeline successfully', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
     });
 
@@ -666,7 +666,7 @@ describe('import timeline templates', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][3].templateTimelineId).toEqual(
         mockNewTemplateTimelineId
       );
@@ -684,7 +684,7 @@ describe('import timeline templates', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      const result = await server.inject(mockRequest, context);
+      const result = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(result.body).toEqual({
         errors: [],
         success: true,
@@ -721,13 +721,13 @@ describe('import timeline templates', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
     test('should use given timelineId to check if the timeline savedObject already exist', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockGetTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
       );
@@ -735,7 +735,7 @@ describe('import timeline templates', () => {
 
     test('should use given templateTimelineId to check if the timeline savedObject already exist', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId
       );
@@ -743,13 +743,13 @@ describe('import timeline templates', () => {
 
     test('should UPDATE timeline savedObject', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline).toHaveBeenCalled();
     });
 
     test('should UPDATE timeline savedObject with timelineId', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
       );
@@ -757,7 +757,7 @@ describe('import timeline templates', () => {
 
     test('should UPDATE timeline savedObject without timeline version', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][2]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].version
       );
@@ -765,25 +765,25 @@ describe('import timeline templates', () => {
 
     test('should UPDATE a new timeline savedObject witn given timeline and skip the omitted fields', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistTimeline.mock.calls[0][3]).toEqual(mockParsedTemplateTimelineObject);
     });
 
     test('should NOT Create new pinned events', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistPinnedEventOnTimeline).not.toHaveBeenCalled();
     });
 
     test('should provide noteSavedObjectId when Creating notes for a timeline', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].noteId).toBeNull();
     });
 
     test('should exclude event notes when creating notes', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
+      await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(mockPersistNote.mock.calls[0][0].note).toEqual({
         eventId: undefined,
         note: mockUniqueParsedTemplateTimelineObjects[0].globalNotes[0].note,
@@ -797,7 +797,7 @@ describe('import timeline templates', () => {
 
     test('returns 200 when import timeline successfully', async () => {
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.status).toEqual(200);
     });
 
@@ -812,7 +812,7 @@ describe('import timeline templates', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -841,7 +841,7 @@ describe('import timeline templates', () => {
         ],
       ]);
       const mockRequest = await getImportTimelinesRequest();
-      const response = await server.inject(mockRequest, context);
+      const response = await server.inject(mockRequest, requestContextMock.convertContext(context));
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -891,7 +891,7 @@ describe('import timeline templates', () => {
         path: TIMELINE_EXPORT_URL,
         body: { id: 'someId' },
       });
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
 
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
       const result = server.validate(request);
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts
index c06d99adf04d0..4336c9fd93418 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts
@@ -46,7 +46,7 @@ export const importTimelinesRoute = (
     async (context, request, response) => {
       try {
         const siemResponse = buildSiemResponse(response);
-        const savedObjectsClient = context.core.savedObjects.client;
+        const savedObjectsClient = (await context.core).savedObjects.client;
         if (!savedObjectsClient) {
           return siemResponse.error({ statusCode: 404 });
         }
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts
index 09316098cea23..1c7ab73cc3809 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -86,11 +86,11 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getUpdateTimelinesRequest(updateTimelineWithTimelineId);
-        await server.inject(mockRequest, context);
+        await server.inject(mockRequest, requestContextMock.convertContext(context));
       });
 
       test('should Check if given timeline id exist', async () => {
@@ -122,7 +122,7 @@ describe('update timelines', () => {
       test('returns 200 when create timeline successfully', async () => {
         const response = await server.inject(
           getUpdateTimelinesRequest(updateTimelineWithTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.status).toEqual(200);
       });
@@ -150,14 +150,14 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
       test('returns error message', async () => {
         const response = await server.inject(
           getUpdateTimelinesRequest(updateTimelineWithTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.body).toEqual({
           message: UPDATE_TIMELINE_ERROR_MESSAGE,
@@ -194,11 +194,11 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getUpdateTimelinesRequest(updateTemplateTimelineWithTimelineId);
-        await server.inject(mockRequest, context);
+        await server.inject(mockRequest, requestContextMock.convertContext(context));
       });
 
       test('should Check if given timeline id exist', async () => {
@@ -242,7 +242,7 @@ describe('update timelines', () => {
       test('returns 200 when create timeline template successfully', async () => {
         const response = await server.inject(
           getUpdateTimelinesRequest(updateTemplateTimelineWithTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.status).toEqual(200);
       });
@@ -270,14 +270,14 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
       test('returns error message', async () => {
         const response = await server.inject(
           getUpdateTimelinesRequest(updateTemplateTimelineWithTimelineId),
-          context
+          requestContextMock.convertContext(context)
         );
         expect(response.body).toEqual({
           message: UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts
index fcfbb2345c4e4..64820711d6685 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts
@@ -13,8 +13,8 @@ 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 '../../../../../../security/common/model';
+import { SavedObjectsFindOptions } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import {
   SavedNote,
@@ -34,7 +34,7 @@ import { timelineSavedObjectType } from '../../saved_object_mappings';
 import { noteFieldsMigrator } from './field_migrator';
 
 export const deleteNote = async (request: FrameworkRequest, noteIds: string[]) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   await Promise.all(
     noteIds.map((noteId) => savedObjectsClient.delete(noteSavedObjectType, noteId))
@@ -47,7 +47,7 @@ export const deleteNoteByTimelineId = async (request: FrameworkRequest, timeline
     hasReference: { type: timelineSavedObjectType, id: timelineId },
   };
   const notesToBeDeleted = await getAllSavedNote(request, options);
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   await Promise.all(
     notesToBeDeleted.notes.map((note) =>
@@ -159,7 +159,7 @@ const createNote = async ({
   note: SavedNote;
   overrideOwner?: boolean;
 }) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const userInfo = request.user;
 
   const shallowCopyOfNote = { ...note };
@@ -217,7 +217,7 @@ const updateNote = async ({
   note: SavedNote;
   overrideOwner?: boolean;
 }) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const userInfo = request.user;
 
   const existingNote = await savedObjectsClient.get<NoteWithoutExternalRefs>(
@@ -258,7 +258,7 @@ const updateNote = async ({
 };
 
 const getSavedNote = async (request: FrameworkRequest, NoteId: string) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const savedObject = await savedObjectsClient.get<NoteWithoutExternalRefs>(
     noteSavedObjectType,
     NoteId
@@ -270,7 +270,7 @@ const getSavedNote = async (request: FrameworkRequest, NoteId: string) => {
 };
 
 const getAllSavedNote = async (request: FrameworkRequest, options: SavedObjectsFindOptions) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const savedObjects = await savedObjectsClient.find<NoteWithoutExternalRefs>(options);
 
   return {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts
index f413c39306bb5..59d83ee93e5a2 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts
@@ -11,8 +11,8 @@ 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 '../../../../../../security/common/model';
+import { SavedObjectsFindOptions } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import {
   PinnedEventSavedObject,
@@ -23,7 +23,7 @@ import {
 } from '../../../../../common/types/timeline/pinned_event';
 import { FrameworkRequest } from '../../../framework';
 
-import { createTimeline } from '../../saved_object/timelines';
+import { createTimeline } from '../timelines';
 import { pinnedEventSavedObjectType } from '../../saved_object_mappings/pinned_events';
 import { pinnedEventFieldsMigrator } from './field_migrator';
 import { timelineSavedObjectType } from '../../saved_object_mappings';
@@ -70,7 +70,7 @@ export const deletePinnedEventOnTimeline = async (
   request: FrameworkRequest,
   pinnedEventIds: string[]
 ) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   await Promise.all(
     pinnedEventIds.map((pinnedEventId) =>
@@ -83,7 +83,7 @@ export const deleteAllPinnedEventsOnTimeline = async (
   request: FrameworkRequest,
   timelineId: string
 ) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const options: SavedObjectsFindOptions = {
     type: pinnedEventSavedObjectType,
     search: timelineId,
@@ -186,7 +186,7 @@ const getValidTimelineIdAndVersion = async (
     };
   }
 
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   // create timeline because it didn't exist
   const { timeline: timelineResult } = await createTimeline({
@@ -224,7 +224,7 @@ const createPinnedEvent = async ({
   timelineId: string;
   timelineVersion?: string;
 }) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   const savedPinnedEvent: SavedPinnedEvent = {
     eventId,
@@ -252,7 +252,7 @@ const createPinnedEvent = async ({
 };
 
 const getSavedPinnedEvent = async (request: FrameworkRequest, pinnedEventId: string) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const savedObject = await savedObjectsClient.get<PinnedEventWithoutExternalRefs>(
     pinnedEventSavedObjectType,
     pinnedEventId
@@ -267,7 +267,7 @@ const getAllSavedPinnedEvents = async (
   request: FrameworkRequest,
   options: SavedObjectsFindOptions
 ) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const savedObjects = await savedObjectsClient.find<PinnedEventWithoutExternalRefs>(options);
 
   return savedObjects.saved_objects.map((savedObject) => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts
index 87d3aa4c6f908..c9500d4c3c122 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common';
 import { DATA_VIEW_ID_REF_NAME, SAVED_QUERY_ID_REF_NAME, SAVED_QUERY_TYPE } from '../../constants';
 import { FieldMigrator } from '../../utils/migrator';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../../../../../src/plugins/data/common';
 /**
  * A migrator to handle moving specific fields that reference other saved objects to the references field within a saved
  * object.
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
index 00355422687b2..920d9a85ed484 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
@@ -27,7 +27,7 @@ import {
   mockResolveTimelineResponse,
 } from '../../__mocks__/resolve_timeline';
 import { DATA_VIEW_ID_REF_NAME, SAVED_QUERY_ID_REF_NAME, SAVED_QUERY_TYPE } from '../../constants';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../../../../../src/plugins/data_views/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 
 jest.mock('./convert_saved_object_to_savedtimeline', () => ({
   convertSavedObjectToSavedTimeline: jest.fn(),
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
index d9bc1ccfa2fe4..de7c31fb47a98 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
@@ -7,10 +7,8 @@
 
 import { getOr } from 'lodash/fp';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsFindOptions,
-} from '../../../../../../../../src/core/server';
+import { SavedObjectsClientContract, SavedObjectsFindOptions } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import { NoteSavedObject } from '../../../../../common/types/timeline/note';
 import { PinnedEventSavedObject } from '../../../../../common/types/timeline/pinned_event';
@@ -37,9 +35,8 @@ import * as note from '../notes/saved_object';
 import * as pinnedEvent from '../pinned_events';
 import { convertSavedObjectToSavedTimeline } from './convert_saved_object_to_savedtimeline';
 import { pickSavedTimeline } from './pick_saved_timeline';
-import { timelineSavedObjectType } from '../../saved_object_mappings/';
+import { timelineSavedObjectType } from '../../saved_object_mappings';
 import { draftTimelineDefaults } from '../../utils/default_timeline';
-import { AuthenticatedUser } from '../../../../../../security/server';
 import { Maybe } from '../../../../../common/search_strategy';
 import { timelineFieldsMigrator } from './field_migrator';
 export { pickSavedTimeline } from './pick_saved_timeline';
@@ -383,7 +380,7 @@ export const persistTimeline = async (
   timeline: SavedTimeline,
   isImmutable?: boolean
 ): Promise<ResponseTimeline> => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const userInfo = isImmutable ? ({ username: 'Elastic' } as AuthenticatedUser) : request.user;
   try {
     if (timelineId == null) {
@@ -501,7 +498,7 @@ const updatePartialSavedTimeline = async (
   timelineId: string,
   timeline: SavedTimeline
 ) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const currentSavedTimeline = await savedObjectsClient.get<SavedTimeline>(
     timelineSavedObjectType,
     timelineId
@@ -566,7 +563,7 @@ export const resetTimeline = async (
 };
 
 export const deleteTimeline = async (request: FrameworkRequest, timelineIds: string[]) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   await Promise.all(
     timelineIds.map((timelineId) =>
@@ -580,7 +577,7 @@ export const deleteTimeline = async (request: FrameworkRequest, timelineIds: str
 };
 
 const resolveBasicSavedTimeline = async (request: FrameworkRequest, timelineId: string) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const { saved_object: savedObject, ...resolveAttributes } =
     await savedObjectsClient.resolve<TimelineWithoutExternalRefs>(
       timelineSavedObjectType,
@@ -618,7 +615,7 @@ const resolveSavedTimeline = async (request: FrameworkRequest, timelineId: strin
 };
 
 const getBasicSavedTimeline = async (request: FrameworkRequest, timelineId: string) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   const savedObject = await savedObjectsClient.get<TimelineWithoutExternalRefs>(
     timelineSavedObjectType,
     timelineId
@@ -647,7 +644,7 @@ const getSavedTimeline = async (request: FrameworkRequest, timelineId: string) =
 
 const getAllSavedTimeline = async (request: FrameworkRequest, options: SavedObjectsFindOptions) => {
   const userName = request.user?.username ?? UNAUTHENTICATED_USER;
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
 
   const savedObjects = await savedObjectsClient.find<TimelineWithoutExternalRefs>(options);
 
@@ -696,7 +693,7 @@ export const getSelectedTimelines = async (
   request: FrameworkRequest,
   timelineIds?: string[] | null
 ) => {
-  const savedObjectsClient = request.context.core.savedObjects.client;
+  const savedObjectsClient = (await request.context.core).savedObjects.client;
   let exportedIds = timelineIds;
   if (timelineIds == null || timelineIds.length === 0) {
     const { timeline: savedAllTimelines } = await getAllTimeline(
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts
index 39e05b267735d..59899ca564e18 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AuthenticatedUser } from '../../../../../../security/common/model';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
 import { TimelineStatus, TimelineType, SavedTimeline } from '../../../../../common/types/timeline';
 import { NoteSavedObject } from '../../../../../common/types/timeline/note';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts
index 25a4c98f90ee6..1df6c4f2108e7 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import { AuthenticatedUser } from '../../../../../../security/common/model';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import {
   TimelineType,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts
index 76773b7fcd518..02ca8a4dd63ce 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap } from 'kibana/server';
+import { SavedObjectMigrationMap } from '@kbn/core/server';
 import { migrateTimelineIdToReferences } from './utils';
 
 export const notesMigrations: SavedObjectMigrationMap = {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts
index 4d21190d9381c..6f960888c83bd 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap } from 'kibana/server';
+import { SavedObjectMigrationMap } from '@kbn/core/server';
 import { migrateTimelineIdToReferences } from './utils';
 
 export const pinnedEventsMigrations: SavedObjectMigrationMap = {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts
index 45733d7737b62..ce4ecd1a46479 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectMigrationMap,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { SAVED_QUERY_ID_REF_NAME, SAVED_QUERY_TYPE } from '../../constants';
 import { createMigratedDoc, createReference } from './utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts
index 7bd7bc148c263..fa35c1c622303 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectReference,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { timelineSavedObjectType } from '../timelines';
 import { TIMELINE_ID_REF_NAME } from '../../constants';
 import { TimelineId } from './types';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts
index 444acbac4d147..a1d39af289184 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { notesMigrations } from './migrations/notes';
 
 export const noteSavedObjectType = 'siem-ui-timeline-note';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts
index f5ae5f38af3a2..bd21e2a4b1cf7 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { pinnedEventsMigrations } from './migrations/pinned_events';
 
 export const pinnedEventSavedObjectType = 'siem-ui-timeline-pinned-event';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts
index 66c58c5f34446..24fc9ddcbf110 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { timelinesMigrations } from './migrations/timelines';
 
 export const timelineSavedObjectType = 'siem-ui-timeline';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
index 91f8e4153a63b..f05366264ece6 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
@@ -12,7 +12,7 @@ import { Readable } from 'stream';
 import { createListStream } from '@kbn/utils';
 import { schema } from '@kbn/config-schema';
 
-import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
+import { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 import { formatErrors } from '@kbn/securitysolution-io-ts-utils';
 import { SetupPlugins, StartPlugins } from '../../../plugin';
 
@@ -23,7 +23,7 @@ export const buildFrameworkRequest = async (
   security: StartPlugins['security'] | SetupPlugins['security'] | undefined,
   request: KibanaRequest
 ): Promise<FrameworkRequest> => {
-  const savedObjectsClient = context.core.savedObjects.client;
+  const savedObjectsClient = (await context.core).savedObjects.client;
   const user = await security?.authc.getCurrentUser(request);
 
   return set<FrameworkRequest>(
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts
index 58379a2af0b71..9e3475d697807 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'kibana/server';
+import { SavedObject, SavedObjectReference } from '@kbn/core/server';
 import { FieldMigrator } from './migrator';
 
 describe('FieldMigrator', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts
index 0392a3e5c7e3f..6267975e3a33b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts
@@ -7,7 +7,7 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import _ from 'lodash';
-import { SavedObject, SavedObjectReference, SavedObjectsUpdateResponse } from 'kibana/server';
+import { SavedObject, SavedObjectReference, SavedObjectsUpdateResponse } from '@kbn/core/server';
 
 interface Field {
   path: string;
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts
index add586c6cb67f..93497f20501ee 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts
@@ -8,7 +8,7 @@
 import {
   CreateExceptionListItemOptions,
   ExceptionsListPreCreateItemServerExtension,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
 import {
   EventFilterValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts
index 095e4b5631540..ab010d8efe6dd 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts
@@ -6,8 +6,8 @@
  */
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { ExceptionsListPreDeleteItemServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreDeleteItemServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts
index 8067356532a3a..d14a5792036fa 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreExportServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreExportServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts
index a21a99eea3a9d..ec5b3f45ea855 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts
@@ -6,8 +6,8 @@
  */
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { ExceptionsListPreGetOneItemServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreGetOneItemServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts
index 96262e5e4459d..2856bb0af867f 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExceptionsListPreImportServerExtension } from '../../../../../lists/server';
+import { ExceptionsListPreImportServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointArtifactExceptionValidationError } from '../validators/errors';
 import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../../../common/endpoint/service/artifacts/constants';
 
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts
index 5cfe7311eb9e3..3c8e9382486bb 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreMultiListFindServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreMultiListFindServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts
index 917e6c97b1bfd..cad00afd961e4 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreSingleListFindServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreSingleListFindServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts
index 93c1abdcb7d7a..2a459ef99409f 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreSummaryServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreSummaryServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts
index acedbf7d1ed25..1dfa597314f1a 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts
@@ -8,7 +8,7 @@
 import {
   ExceptionsListPreUpdateItemServerExtension,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
 import { ExceptionItemLikeOptions } from '../types';
 import {
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts
index 98d509ecf928f..6ba50ccaceb9d 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { ListsServerExtensionRegistrar } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../endpoint/endpoint_app_context_services';
 import { getExceptionsPreCreateItemHandler } from './handlers/exceptions_pre_create_handler';
 import { getExceptionsPreUpdateItemHandler } from './handlers/exceptions_pre_update_handler';
-import type { ListsServerExtensionRegistrar } from '../../../../lists/server';
 import { getExceptionsPreGetOneHandler } from './handlers/exceptions_pre_get_one_handler';
 import { getExceptionsPreSummaryHandler } from './handlers/exceptions_pre_summary_handler';
 import { getExceptionsPreDeleteItemHandler } from './handlers/exceptions_pre_delete_item_handler';
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts
index 4b00bafafc967..9108e83ad0aa3 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CreateExceptionListItemOptions } from '../../../../lists/server';
+import { CreateExceptionListItemOptions } from '@kbn/lists-plugin/server';
 
 /**
  * An Exception Like item is a structure used internally by several of the Exceptions api/service in that
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts
index e06a6b64a9295..cff835ac2d58e 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts
@@ -12,15 +12,15 @@ import {
 } from '../../../endpoint/mocks';
 import { BaseValidatorMock, createExceptionItemLikeOptionsMock } from './mocks';
 import { EndpointArtifactExceptionValidationError } from './errors';
-import { httpServerMock } from '../../../../../../../src/core/server/mocks';
-import { createFleetAuthzMock, PackagePolicy } from '../../../../../fleet/common';
-import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { createFleetAuthzMock, PackagePolicy } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { ExceptionItemLikeOptions } from '../types';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
 } from '../../../../common/endpoint/service/artifacts';
-import { securityMock } from '../../../../../security/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
 describe('When using Artifacts Exceptions BaseValidator', () => {
   let endpointAppContextServices: EndpointAppContextService;
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts
index 293066a3a1824..97c5dc84a8040 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { isEqual } from 'lodash/fp';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts
index f6f08d792b115..5510f352a414e 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts
@@ -10,13 +10,13 @@ import { ENDPOINT_BLOCKLISTS_LIST_ID } from '@kbn/securitysolution-list-constant
 import { schema, Type, TypeOf } from '@kbn/config-schema';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
-import { BaseValidator } from './base_validator';
-import { ExceptionItemLikeOptions } from '../types';
 import {
   CreateExceptionListItemOptions,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
-import { isValidHash } from '../../../../common/endpoint/service/trusted_apps/validations';
+} from '@kbn/lists-plugin/server';
+import { BaseValidator } from './base_validator';
+import { ExceptionItemLikeOptions } from '../types';
+import { isValidHash } from '../../../../common/endpoint/service/artifacts/validations';
 import { EndpointArtifactExceptionValidationError } from './errors';
 
 const allowedHashes: Readonly<string[]> = ['file.hash.md5', 'file.hash.sha1', 'file.hash.sha256'];
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts
index 69a8d9c5914de..296023317eabc 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ListsErrorWithStatusCode } from '../../../../../lists/server';
+import { ListsErrorWithStatusCode } from '@kbn/lists-plugin/server';
 
 export class EndpointArtifactExceptionValidationError extends ListsErrorWithStatusCode {
   constructor(message: string, statusCode: number = 400) {
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts
index 875bc04646321..e90c6e4263b38 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts
@@ -12,7 +12,7 @@ import { ENDPOINT_EVENT_FILTERS_LIST_ID } from '@kbn/securitysolution-list-const
 import {
   CreateExceptionListItemOptions,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
 import { EXCEPTIONABLE_ENDPOINT_EVENT_FIELDS } from '../../../../common/endpoint/exceptions/exceptionable_endpoint_event_fields';
 
 import { ExceptionItemLikeOptions } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts
index 6454584783863..5d85866a3918f 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts
@@ -8,14 +8,14 @@
 import { schema } from '@kbn/config-schema';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
+import {
+  CreateExceptionListItemOptions,
+  UpdateExceptionListItemOptions,
+} from '@kbn/lists-plugin/server';
 import { BaseValidator, BasicEndpointExceptionDataSchema } from './base_validator';
 import { EndpointArtifactExceptionValidationError } from './errors';
 import { ExceptionItemLikeOptions } from '../types';
 
-import {
-  CreateExceptionListItemOptions,
-  UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
 import { isValidIPv4OrCIDR } from '../../../../common/endpoint/utils/is_valid_ip';
 
 function validateIp(value: string) {
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts
index 97a29aee962e5..baaac6debb7c0 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts
@@ -6,9 +6,9 @@
  */
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { BaseValidator } from './base_validator';
 import { ExceptionItemLikeOptions } from '../types';
-import { listMock } from '../../../../../lists/server/mocks';
 import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../common/endpoint/service/artifacts';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts
index b2171ebd018bd..af98ba7076535 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts
@@ -9,17 +9,17 @@ import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '@kbn/securitysolution-list-consta
 import { schema, TypeOf } from '@kbn/config-schema';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { OperatingSystem, TrustedAppEntryTypes } from '@kbn/securitysolution-utils';
-import { BaseValidator } from './base_validator';
-import { ExceptionItemLikeOptions } from '../types';
 import {
   CreateExceptionListItemOptions,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
+import { BaseValidator } from './base_validator';
+import { ExceptionItemLikeOptions } from '../types';
 import { TrustedAppConditionEntry as ConditionEntry } from '../../../../common/endpoint/types';
 import {
   getDuplicateFields,
   isValidHash,
-} from '../../../../common/endpoint/service/trusted_apps/validations';
+} from '../../../../common/endpoint/service/artifacts/validations';
 import { EndpointArtifactExceptionValidationError } from './errors';
 
 const ProcessHashField = schema.oneOf([
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index e22886ccd53ff..a313a0b86a246 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -17,16 +17,16 @@ import {
   THRESHOLD_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 
-import { Logger, SavedObjectsClient } from '../../../../src/core/server';
-import { UsageCounter } from '../../../../src/plugins/usage_collection/server';
-
-import { ECS_COMPONENT_TEMPLATE_NAME } from '../../rule_registry/common/assets';
-import { FieldMap } from '../../rule_registry/common/field_map';
-import { technicalRuleFieldMap } from '../../rule_registry/common/assets/field_maps/technical_rule_field_map';
-import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { IRuleDataClient, Dataset } from '../../rule_registry/server';
-import { ListPluginSetup } from '../../lists/server';
-import { ILicense } from '../../licensing/server';
+import { Logger, SavedObjectsClient } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+
+import { ECS_COMPONENT_TEMPLATE_NAME } from '@kbn/rule-registry-plugin/common/assets';
+import { FieldMap } from '@kbn/rule-registry-plugin/common/field_map';
+import { technicalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/technical_rule_field_map';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { IRuleDataClient, Dataset } from '@kbn/rule-registry-plugin/server';
+import { ListPluginSetup } from '@kbn/lists-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 import {
   createEqlAlertType,
diff --git a/x-pack/plugins/security_solution/server/plugin_contract.ts b/x-pack/plugins/security_solution/server/plugin_contract.ts
index 956daed0a31f7..c07dfa59c3deb 100644
--- a/x-pack/plugins/security_solution/server/plugin_contract.ts
+++ b/x-pack/plugins/security_solution/server/plugin_contract.ts
@@ -5,43 +5,35 @@
  * 2.0.
  */
 
-import {
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  PluginInitializerContext,
-} from '../../../../src/core/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { UsageCollectionSetup as UsageCollectionPluginSetup } from '../../../../src/plugins/usage_collection/server';
+} from '@kbn/data-plugin/server';
+import { UsageCollectionSetup as UsageCollectionPluginSetup } from '@kbn/usage-collection-plugin/server';
 import {
   PluginSetupContract as AlertingPluginSetup,
   PluginStartContract as AlertingPluginStart,
-} from '../../alerting/server';
-import { PluginStartContract as CasesPluginStart } from '../../cases/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
-import { IEventLogClientService, IEventLogService } from '../../event_log/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { FleetStartContract as FleetPluginStart } from '../../fleet/server';
-import { LicensingPluginStart, LicensingPluginSetup } from '../../licensing/server';
-import { ListPluginSetup } from '../../lists/server';
-import { MlPluginSetup } from '../../ml/server';
+} from '@kbn/alerting-plugin/server';
+import { PluginStartContract as CasesPluginStart } from '@kbn/cases-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import { IEventLogClientService, IEventLogService } from '@kbn/event-log-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FleetStartContract as FleetPluginStart } from '@kbn/fleet-plugin/server';
+import { LicensingPluginStart, LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { ListPluginSetup } from '@kbn/lists-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import {
   RuleRegistryPluginSetupContract as RuleRegistryPluginSetup,
   RuleRegistryPluginStartContract as RuleRegistryPluginStart,
-} from '../../rule_registry/server';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/rule-registry-plugin/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   TaskManagerSetupContract as TaskManagerPluginSetup,
   TaskManagerStartContract as TaskManagerPluginStart,
-} from '../../task_manager/server';
-import {
-  TelemetryPluginStart,
-  TelemetryPluginSetup,
-} from '../../../../src/plugins/telemetry/server';
+} from '@kbn/task-manager-plugin/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 
 export interface SecuritySolutionPluginSetupDependencies {
   alerting: AlertingPluginSetup;
diff --git a/x-pack/plugins/security_solution/server/request_context_factory.ts b/x-pack/plugins/security_solution/server/request_context_factory.ts
index 4d7a34b1cc2ac..9f6b950c46202 100644
--- a/x-pack/plugins/security_solution/server/request_context_factory.ts
+++ b/x-pack/plugins/security_solution/server/request_context_factory.ts
@@ -7,8 +7,9 @@
 
 import { memoize } from 'lodash';
 
-import { Logger, KibanaRequest, RequestHandlerContext } from 'kibana/server';
+import { Logger, KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 
+import { FleetAuthz } from '@kbn/fleet-plugin/common';
 import { DEFAULT_SPACE_ID } from '../common/constants';
 import { AppClientFactory } from './client';
 import { ConfigType } from './config';
@@ -29,7 +30,6 @@ import {
   getEndpointAuthzInitialState,
 } from '../common/endpoint/service/authz';
 import { licenseService } from './lib/license';
-import { FleetAuthz } from '../../fleet/common';
 
 export interface IRequestContextFactory {
   create(
@@ -72,11 +72,14 @@ export class RequestContextFactory implements IRequestContextFactory {
 
     // If Fleet is enabled, then get its Authz
     if (startPlugins.fleet) {
-      fleetAuthz = context.fleet?.authz ?? (await startPlugins.fleet?.authz.fromRequest(request));
+      fleetAuthz =
+        (await context.fleet)?.authz ?? (await startPlugins.fleet?.authz.fromRequest(request));
     }
 
+    const coreContext = await context.core;
+
     return {
-      core: context.core,
+      core: coreContext,
 
       get endpointAuthz(): Immutable<EndpointAuthz> {
         // Lazy getter of endpoint Authz. No point in defining it if it is never used.
@@ -105,7 +108,7 @@ export class RequestContextFactory implements IRequestContextFactory {
 
       getRuleExecutionLog: memoize(() =>
         ruleExecutionLogForRoutesFactory(
-          context.core.savedObjects.client,
+          coreContext.savedObjects.client,
           startPlugins.eventLog.getClient(request),
           logger
         )
@@ -117,7 +120,7 @@ export class RequestContextFactory implements IRequestContextFactory {
         }
 
         const username = security?.authc.getCurrentUser(request)?.username || 'elastic';
-        return lists.getExceptionListClient(context.core.savedObjects.client, username);
+        return lists.getExceptionListClient(coreContext.savedObjects.client, username);
       },
     };
   }
diff --git a/x-pack/plugins/security_solution/server/routes/index.ts b/x-pack/plugins/security_solution/server/routes/index.ts
index 8646cb54088c5..fe093b0b31ee3 100644
--- a/x-pack/plugins/security_solution/server/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/routes/index.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { StartServicesAccessor } from 'kibana/server';
-import { Logger } from 'src/core/server';
-import { IRuleDataClient, RuleDataPluginService } from '../../../rule_registry/server';
+import { StartServicesAccessor, Logger } from '@kbn/core/server';
+import { IRuleDataClient, RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 
 import { SecuritySolutionPluginRouter } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts b/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts
index 7e0b1686ee467..34ef50a17e02d 100644
--- a/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts
+++ b/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts
@@ -10,7 +10,7 @@ import {
   KibanaRequest,
   LifecycleResponseFactory,
   OnPreAuthToolkit,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { LIMITED_CONCURRENCY_ROUTE_TAG_PREFIX } from '../../common/constants';
 
 class MaxCounter {
diff --git a/x-pack/plugins/security_solution/server/saved_objects.ts b/x-pack/plugins/security_solution/server/saved_objects.ts
index 9b76249c035c5..677bd581d82d4 100644
--- a/x-pack/plugins/security_solution/server/saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 
 import { noteType, pinnedEventType, timelineType } from './lib/timeline/saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts
index 6f1c2cc7f60b0..1b21e8f412f56 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { SecuritySolutionFactory } from '../../types';
 import {
   CtiDataSourceStrategyResponse,
   CtiQueries,
   CtiDataSourceRequestOptions,
 } from '../../../../../../common/search_strategy/security_solution/cti';
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { buildTiDataSourceQuery } from './query.threat_intel_source.dsl';
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts
index e039eff160241..4f84578118cb6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts
@@ -5,12 +5,9 @@
  * 2.0.
  */
 
-import {
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../../src/core/server';
-import { elasticsearchServiceMock } from '../../../../../../../../../../src/core/server/mocks';
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { allowedExperimentalValues } from '../../../../../../../common/experimental_features';
 
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
index d05b9e1f8fb1a..8158190eb65ad 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
@@ -7,7 +7,8 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
   HostAggEsItem,
@@ -27,7 +28,6 @@ import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { SecuritySolutionFactory } from '../../types';
 import { buildHostsQuery } from './query.all_hosts.dsl';
 import { formatHostEdgesData, HOSTS_FIELDS } from './helpers';
-import { IScopedClusterClient } from '../../../../../../../../../src/core/server';
 
 import { EndpointAppContext } from '../../../../../endpoint/types';
 import { buildRiskScoreQuery } from '../../risk_score/all/query.risk_score.dsl';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts
index 4419653166519..3e97f2ab28ab4 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildHostsQuery } from './query.all_hosts.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildHostsQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
index d3758df94074f..5afe096b6671d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   Direction,
   HostsRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts
index 0cb4f3dd90074..7b8fae9c77fb1 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   Direction,
   HostsQueries,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
index 28f114b1cccf7..79abb9d7137e6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
@@ -7,11 +7,7 @@
 
 import { set } from '@elastic/safer-lodash-set/fp';
 import { get, has, head } from 'lodash/fp';
-import {
-  IScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../src/core/server';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { hostFieldsMap } from '../../../../../../common/ecs/ecs_fields';
 import { Direction } from '../../../../../../common/search_strategy/common';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx
index 89d691e5c9ce8..6eda020d4decf 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx
@@ -12,11 +12,7 @@ import {
   mockSearchStrategyResponse,
   formattedSearchStrategyResponse,
 } from './__mocks__';
-import {
-  IScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../src/core/server';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { EndpointAppContext } from '../../../../../endpoint/types';
 import { EndpointAppContextService } from '../../../../../endpoint/endpoint_app_context_services';
 import { allowedExperimentalValues } from '../../../../../../common/experimental_features';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts
index aedb1061af2fa..0499d4105f247 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts
@@ -7,7 +7,8 @@
 
 import { get } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   HostAggEsData,
   HostDetailsStrategyResponse,
@@ -21,11 +22,6 @@ import { SecuritySolutionFactory } from '../../types';
 import { buildHostDetailsQuery } from './query.host_details.dsl';
 import { formatHostItem, getHostEndpoint } from './helpers';
 import { EndpointAppContext } from '../../../../../endpoint/types';
-import {
-  IScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../src/core/server';
 
 export const hostDetails: SecuritySolutionFactory<HostsQueries.details> = {
   buildDsl: (options: HostDetailsRequestOptions) => buildHostDetailsQuery(options),
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts
index c54e20c70c632..2577d46cc116b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildHostDetailsQuery } from './query.host_details.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 // Failing with rule registry enabled
 describe('buildHostDetailsQuery', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts
index d34e9d9c84537..33867f78c6542 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { cloudFieldsMap, hostFieldsMap } from '../../../../../../common/ecs/ecs_fields';
 import { HostDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution';
 import { reduceFields } from '../../../../../utils/build_query/reduce_fields';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts
index d6a1e1a8ac7ec..4ac9098274eae 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsKpiQueries,
   HostsKpiAuthenticationsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts
index c4714e81c6ec4..a06beae77daeb 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsKpiQueries,
   HostsKpiHostsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts
index 17eceea840029..47c4396c142f6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsKpiQueries,
   HostsKpiUniqueIpsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
index bab799620ad6e..80393447d62a8 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostFirstLastSeenStrategyResponse,
   HostsQueries,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts
index 33623c198913a..8775851bb7e7d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   HostOverviewRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
index 19ea4c3bc37d2..f46ee2b8f315d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsOverviewStrategyResponse,
   HostsQueries,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts
index 9c284c4e442cd..cb78d0cdbfbc4 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildOverviewHostQuery as buildQuery } from './query.overview_host.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts
index 7a215a2e781fa..1e85fcd9786bb 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
 import { HostOverviewRequestOptions } from '../../../../../../common/search_strategy/security_solution/hosts';
 
 export const buildOverviewHostQuery = ({
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts
index df68256b7be65..594108b72e06e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildQuery } from './query.dsl';
-import { mockOptions, expectedDsl } from '../__mocks__/';
+import { mockOptions, expectedDsl } from '../__mocks__';
 
 describe('buildQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts
index 79cd2973a309b..ae46adca25680 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import { HostsQueries } from '../../../../../../common/search_strategy/security_solution';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
index d41d2ca737f9a..6bd26d6ef8ed8 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { MatrixHistogramStrategyResponse } from '../../../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts
index 76204f0475aa8..19f6dc202824a 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildAlertsHistogramQuery } from './query.alerts_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildAlertsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts
index b8695bef294ed..80e5a64137ae6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildAuthenticationsHistogramQuery } from './query.authentications_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildAuthenticationsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts
index d671973f57572..024bbec987f9f 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildDnsHistogramQuery } from './query.dns_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildDnsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts
index 895184c9b7be2..6d52262c047d6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts
@@ -8,7 +8,7 @@
 import { eventsMatrixHistogramConfig } from '.';
 import { buildEventsHistogramQuery } from './query.events_histogram.dsl';
 
-jest.mock('./query.events_histogram.dsl.ts', () => ({
+jest.mock('./query.events_histogram.dsl', () => ({
   buildEventsHistogramQuery: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts
index 1f73770f5fdb4..472b0eb23b0ee 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts
@@ -15,7 +15,7 @@ import {
   expectedThresholdGroupWithCardinalityDsl,
   expectedIpIncludingMissingDataDsl,
   expectedIpNotIncludingMissingDataDsl,
-} from './__mocks__/';
+} from './__mocks__';
 
 describe('buildEventsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts
index 06405fb74bc0f..0b0895beace5b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   FactoryQueryTypes,
   MatrixHistogramRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts
index 005bff5cd47da..e12142e21a156 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildPreviewHistogramQuery } from './query.preview_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildAlertsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts
index 12452c7a79fbf..c121a0d7830a7 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   NetworkDetailsRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts
index c5689954942ec..22f207ef3ac17 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   NetworkDetailsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts
index ac5272b8d04fc..4eff4cb2efe61 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts
index 85f836463686b..78bce6f41f7a3 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkDnsBuckets,
   NetworkDnsEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts
index 87bcc9a1225e8..daa7787411ade 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts
index 733b8584e77d4..6c4648728efac 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
index fb0217f0aebf8..377786b05198d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkHttpBuckets,
   NetworkHttpEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
index cada5212b812b..eaa9a39dc5dcd 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts
index 25dd078955203..f2952c1c4c2e7 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiDnsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts
index 89773581f6515..e198a98735883 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiNetworkEventsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts
index 1f3c7280cd7c1..1eb3ca9e12581 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiTlsHandshakesStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts
index 2581249d179f5..7c26be3260a00 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiUniqueFlowsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts
index 9fa63eb939977..ae1d3b337af81 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiUniquePrivateIpsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts
index ad2a6dd7cdf73..c2e433e12a379 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   NetworkOverviewRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts
index 473a192b72920..0909c3248689e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkQueries,
   NetworkOverviewStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts
index d2b530c2b4a1e..c67b11ab42ece 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
 import { NetworkOverviewRequestOptions } from '../../../../../../common/search_strategy/security_solution/network';
 
 export const buildOverviewNetworkQuery = ({
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts
index 4e5c3f4074b94..1a27c980f8ea2 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
index cabaae2e54b70..50beaddec701b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkTlsBuckets,
   NetworkTlsEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
index 39029089a4306..9c1dd0a0f303b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts
index 79ff8a74c220f..3bed0bd26260d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts
index 9540da3eb65f7..4d86918171b59 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkTopCountriesBuckets,
   NetworkTopCountriesEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts
index ef114dcb6167d..72b608735e249 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts
index 59150354613f0..31a6556a26b29 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts
index f504727812760..20a4696b0ba99 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts
@@ -7,8 +7,8 @@
 
 import { getOr } from 'lodash/fp';
 
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { assertUnreachable } from '../../../../../../common/utility_types';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import {
   Direction,
   GeoItem,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts
index 218c9361517ce..59a2ea962ba93 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts
index d36d38564392b..dda794f657ae2 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts
index 0e1286c8c2fc0..baf22028dae68 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, getOr } from 'lodash/fp';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkUsersBucketsItem,
   NetworkUsersEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts
index 32778ba2bc665..ccbfb68757cd9 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts
index c1a1cd93dd618..53eef7121517b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { SecuritySolutionFactory } from '../../types';
 import {
   RiskScoreRequestOptions,
   RiskScoreStrategyResponse,
   RiskQueries,
 } from '../../../../../../common/search_strategy';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { buildRiskScoreQuery } from './query.risk_score.dsl';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts
index 088e16a5edbd5..c1b4a1f25e8de 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import type {
   KpiRiskScoreRequestOptions,
   KpiRiskScoreStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts
index 83a6096e51abf..51529bc21d801 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts
@@ -9,11 +9,8 @@ import type {
   IScopedClusterClient,
   KibanaRequest,
   SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
-import type {
-  IEsSearchResponse,
-  ISearchRequestParams,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/core/server';
+import type { IEsSearchResponse, ISearchRequestParams } from '@kbn/data-plugin/common';
 import type {
   FactoryQueryTypes,
   StrategyRequestType,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts
index 753a648d307e8..bc31f64fcc626 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Direction } from '../../../../../../../common/search_strategy';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 import { UsersRequestOptions } from '../../../../../../../common/search_strategy/security_solution/users/all';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
index 645a5350ca988..b8babe0b19845 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 
 import { inspectStringifyObject } from '../../../../../utils/build_query';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts
index 3a0e209044514..53bf75521e93f 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildUsersQuery } from './query.all_users.dsl';
-import { mockOptions } from './__mocks__/';
+import { mockOptions } from './__mocks__';
 
 describe('buildUsersQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts
index 850a590fdfe41..82df1d2d97246 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { Direction } from '../../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
 import { UsersRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/all';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts
index 6b57ff7fdb7cd..487f4537cd50d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   UserAuthenticationsRequestOptions,
   AuthenticationHit,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts
index df68256b7be65..594108b72e06e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildQuery } from './query.dsl';
-import { mockOptions, expectedDsl } from '../__mocks__/';
+import { mockOptions, expectedDsl } from '../__mocks__';
 
 describe('buildQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx
index e748023bfe76c..5bb62f685ce4b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
index b5eb1b7c3b6e8..33760eec4556e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 
 import { UserDetailsRequestOptions } from '../../../../../../../common/search_strategy/security_solution/users/details';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
index 1ab721cb19a93..26705965ea67e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { SecuritySolutionFactory } from '../../types';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
index c0dde76c77147..394890ad163e1 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildUserDetailsQuery } from './query.user_details.dsl';
-import { mockOptions } from './__mocks__/';
+import { mockOptions } from './__mocks__';
 
 describe('buildUserDetailsQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
index 4b91391b698d4..463e27d09356c 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { UserDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/details';
 import { buildFieldsTermAggregation } from '../../hosts/details/helpers';
 import { USER_FIELDS } from './helpers';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts
index 50e4cfe50bca2..d47a5d96870c1 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts
@@ -13,7 +13,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 import {
   TotalUsersKpiRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
index 7786962d86083..47b6b82c3792c 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
@@ -6,12 +6,9 @@
  */
 
 import { map, mergeMap } from 'rxjs/operators';
-import {
-  ISearchStrategy,
-  PluginStart,
-  shimHitsTotal,
-} from '../../../../../../src/plugins/data/server';
-import { ENHANCED_ES_SEARCH_STRATEGY } from '../../../../../../src/plugins/data/common';
+import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   FactoryQueryTypes,
   StrategyResponseType,
@@ -20,7 +17,6 @@ import {
 import { securitySolutionFactory } from './factory';
 import { SecuritySolutionFactory } from './factory/types';
 import { EndpointAppContext } from '../../endpoint/types';
-import { KibanaRequest } from '../../../../../../src/core/server';
 
 function isObj(req: unknown): req is Record<string, unknown> {
   return typeof req === 'object' && req !== null;
diff --git a/x-pack/plugins/security_solution/server/types.ts b/x-pack/plugins/security_solution/server/types.ts
index b231d530d8172..b1bf51439a3f6 100644
--- a/x-pack/plugins/security_solution/server/types.ts
+++ b/x-pack/plugins/security_solution/server/types.ts
@@ -5,13 +5,17 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { ActionsApiRequestHandlerContext } from '../../actions/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { FleetRequestHandlerContext } from '../../fleet/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
-import type { ListsApiRequestHandlerContext, ExceptionListClient } from '../../lists/server';
-import type { IRuleDataService } from '../../rule_registry/server';
+import type {
+  IRouter,
+  CustomRequestHandlerContext,
+  CoreRequestHandlerContext,
+} from '@kbn/core/server';
+import type { ActionsApiRequestHandlerContext } from '@kbn/actions-plugin/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { FleetRequestHandlerContext } from '@kbn/fleet-plugin/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
+import type { ListsApiRequestHandlerContext, ExceptionListClient } from '@kbn/lists-plugin/server';
+import type { IRuleDataService } from '@kbn/rule-registry-plugin/server';
 
 import { AppClient } from './client';
 import { ConfigType } from './config';
@@ -21,7 +25,8 @@ import { EndpointAuthz } from '../common/endpoint/types/authz';
 
 export { AppClient };
 
-export interface SecuritySolutionApiRequestHandlerContext extends RequestHandlerContext {
+export interface SecuritySolutionApiRequestHandlerContext {
+  core: CoreRequestHandlerContext;
   endpointAuthz: EndpointAuthz;
   getConfig: () => ConfigType;
   getFrameworkRequest: () => FrameworkRequest;
@@ -32,13 +37,13 @@ export interface SecuritySolutionApiRequestHandlerContext extends RequestHandler
   getExceptionListClient: () => ExceptionListClient | null;
 }
 
-export interface SecuritySolutionRequestHandlerContext extends RequestHandlerContext {
+export type SecuritySolutionRequestHandlerContext = CustomRequestHandlerContext<{
   securitySolution: SecuritySolutionApiRequestHandlerContext;
   actions: ActionsApiRequestHandlerContext;
   alerting: AlertingApiRequestHandlerContext;
   licensing: LicensingApiRequestHandlerContext;
   lists?: ListsApiRequestHandlerContext;
   fleet?: FleetRequestHandlerContext['fleet'];
-}
+}>;
 
 export type SecuritySolutionPluginRouter = IRouter<SecuritySolutionRequestHandlerContext>;
diff --git a/x-pack/plugins/security_solution/server/ui_settings.ts b/x-pack/plugins/security_solution/server/ui_settings.ts
index 57b821249e10f..c35e8ea1bad4f 100644
--- a/x-pack/plugins/security_solution/server/ui_settings.ts
+++ b/x-pack/plugins/security_solution/server/ui_settings.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, UiSettingsParams } from '../../../../src/core/server';
+import { CoreSetup, UiSettingsParams } from '@kbn/core/server';
 import {
   APP_ID,
   DEFAULT_ANOMALY_SCORE,
diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts
index 1169b04a868e6..eb5099cb7be33 100644
--- a/x-pack/plugins/security_solution/server/usage/collector.ts
+++ b/x-pack/plugins/security_solution/server/usage/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
+import type { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import type { CollectorDependencies } from './types';
 import { getDetectionsMetrics } from './detections/get_metrics';
 import { getInternalSavedObjectsClient } from './get_internal_saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts
index a044c1a22e91e..4e782f914df70 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts
@@ -11,7 +11,7 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { mlServicesMock } from '../../lib/machine_learning/mocks';
 import {
   getMockMlJobSummaryResponse,
diff --git a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts
index 2d44928026859..904c80debf5da 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'kibana/server';
-import type { MlPluginSetup } from '../../../../ml/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
+import type { MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { DetectionMetrics } from './types';
 
 import { getMlJobMetrics } from './ml_jobs/get_metrics';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts
index a507a76e0c4f2..0863ca6cef411 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResponse } from 'kibana/server';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 import type { RuleSearchResult } from '../../types';
 
 export const getMockListModulesResponse = () => [
diff --git a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts
index 2eea42f28d953..fc730f36b8a3c 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaRequest, SavedObjectsClientContract, Logger } from 'kibana/server';
-import type { MlDatafeedStats, MlJob, MlPluginSetup } from '../../../../../ml/server';
+import type { KibanaRequest, SavedObjectsClientContract, Logger } from '@kbn/core/server';
+import type { MlDatafeedStats, MlJob, MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { MlJobMetric, MlJobUsageMetric } from './types';
 
 import { isJobStarted } from '../../../../common/machine_learning/helpers';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts
index 8cedbeaec03d7..14663cad3787c 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts
@@ -6,9 +6,9 @@
  */
 
 import type { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import type { SavedObjectsFindResponse } from 'kibana/server';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
+import { CommentAttributes, CommentType } from '@kbn/cases-plugin/common/api/cases/comment';
 import type { AlertAggs, EventLogTypeStatusAggs } from '../../types';
-import { CommentAttributes, CommentType } from '../../../../../cases/common/api/cases/comment';
 import type { EventLogStatusMetric, SingleEventLogStatusMetric } from './types';
 
 export const getMockRuleAlertsResponse = (docCount: number): SearchResponse<never, AlertAggs> => ({
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts
index a6d653632a564..abd9c8b9391a2 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
 import type { RuleAdoption } from './types';
 
 import { updateRuleUsage } from './update_usage';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts
index d7ce790be0750..361b195a06bde 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult } from 'kibana/server';
-import type { CommentAttributes } from '../../../../../../cases/common/api/cases/comment';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
+import type { CommentAttributes } from '@kbn/cases-plugin/common/api/cases/comment';
 
 export const getRuleIdToCasesMap = (
   cases: Array<SavedObjectsFindResult<CommentAttributes>>
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts
index b280d3a4ba17d..cffe536549e9c 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult } from 'kibana/server';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import type { LegacyIRuleActionsAttributesSavedObjectAttributes } from '../../../../lib/detection_engine/rule_actions/legacy_types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts
index 0c364efe73bd9..169cb502521df 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult } from 'kibana/server';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
 import type { RuleMetric } from '../types';
 import type { RuleSearchResult } from '../../../types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts b/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts
index aea462ecf1fa6..85fe139aa36c9 100644
--- a/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup, SavedObjectsClientContract } from 'kibana/server';
+import type { CoreSetup, SavedObjectsClientContract } from '@kbn/core/server';
 
-import { SAVED_OBJECT_TYPES } from '../../../cases/common/constants';
+import { SAVED_OBJECT_TYPES } from '@kbn/cases-plugin/common/constants';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from '../lib/detection_engine/rule_actions/legacy_saved_object_mappings';
 
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts b/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
index 792ca28dcfba3..e80cd4aa88a85 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
@@ -10,7 +10,7 @@ import type {
   AggregationsCompositeAggregation,
   SearchRequest,
 } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ALERT_RULE_UUID } from '@kbn/rule-data-utils';
 import type { AlertBucket, AlertAggs } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts b/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
index 0a6c7f2fc209a..c39ad34f14b11 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
@@ -10,10 +10,10 @@ import type {
   SavedObjectsFindResult,
   Logger,
   SavedObjectsCreatePointInTimeFinderOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { CASE_COMMENT_SAVED_OBJECT } from '../../../../cases/common/constants';
-import type { CommentAttributes } from '../../../../cases/common/api/cases/comment';
+import { CASE_COMMENT_SAVED_OBJECT } from '@kbn/cases-plugin/common/constants';
+import type { CommentAttributes } from '@kbn/cases-plugin/common/api/cases/comment';
 
 export interface GetCasesOptions {
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts b/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
index 62f5691f73d07..36a81c074dc48 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsCreatePointInTimeFinderOptions,
   SavedObjectsClientContract,
   SavedObjectsFindResult,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   SIGNALS_ID,
   EQL_RULE_TYPE_ID,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts b/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
index 4e6d982bf1d7d..6813ffd647819 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsFindResult } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsFindResult } from '@kbn/core/server';
 import {
   EQL_RULE_TYPE_ID,
   INDICATOR_RULE_TYPE_ID,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts b/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
index 6d720bef7d822..8a3eba441d269 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsFindResult,
   Logger,
   SavedObjectsCreatePointInTimeFinderOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import type { LegacyIRuleActionsAttributesSavedObjectAttributes } from '../../lib/detection_engine/rule_actions/legacy_types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts
index 34dc545f9b8bf..c74765ded94f7 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts
@@ -11,7 +11,7 @@ import type {
   SortResults,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { SearchRequest } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 export interface FetchWithPitOptions {
   esClient: ElasticsearchClient;
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts
index a1d57387bfb60..7c226fd01bd78 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type { EventLogStatusMetric } from '../../detections/rules/types';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getInitialEventLogUsage } from '../../detections/rules/get_initial_usage';
 import {
   getAllEventLogTransform,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts
index d7299fdb375b2..76389247ffb26 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SingleEventLogStatusMetric } from '../../detections/rules/types';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   getElasticLogCustomRules,
   getEventLogAllRules,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts
index b9b2cba496dfd..461eb5c5e1f14 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import type { EventLogTypeStatusAggs } from '../../types';
 import type { SingleEventLogStatusMetric } from '../../detections/rules/types';
 import { getInitialSingleEventLogUsage } from '../../detections/rules/get_initial_usage';
diff --git a/x-pack/plugins/security_solution/server/usage/types.ts b/x-pack/plugins/security_solution/server/usage/types.ts
index 9844d9721af75..fe7711196303c 100644
--- a/x-pack/plugins/security_solution/server/usage/types.ts
+++ b/x-pack/plugins/security_solution/server/usage/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
-import type { SanitizedRule } from '../../../alerting/common/';
+import type { CoreSetup, Logger } from '@kbn/core/server';
+import type { SanitizedRule } from '@kbn/alerting-plugin/common';
 import type { RuleParams } from '../lib/detection_engine/schemas/rule_schemas';
 import type { SetupPlugins } from '../plugin';
 
diff --git a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
index 0d5b7ecfa94f0..6d1dceb482332 100644
--- a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { RouteValidationResultFactory } from 'src/core/server';
+import { RouteValidationResultFactory } from '@kbn/core/server';
 
 import { buildRouteValidation, buildRouteValidationWithExcess } from './route_validation';
 
diff --git a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
index 72f6c114c1c39..41e079a381f50 100644
--- a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
@@ -13,7 +13,7 @@ import {
   RouteValidationFunction,
   RouteValidationResultFactory,
   RouteValidationError,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import { excess, GenericIntersectionC } from '../runtime_types';
 
 type RequestValidationResult<T> =
diff --git a/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts b/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts
index 1203c35a4dc61..c26c5f240354c 100644
--- a/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts
+++ b/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { initPromisePool } from './promise_pool';
 
 const nextTick = () => new Promise((resolve) => setImmediate(resolve));
diff --git a/x-pack/plugins/security_solution/server/utils/promise_pool.ts b/x-pack/plugins/security_solution/server/utils/promise_pool.ts
index 766ba873fad53..45c1cc9e95013 100644
--- a/x-pack/plugins/security_solution/server/utils/promise_pool.ts
+++ b/x-pack/plugins/security_solution/server/utils/promise_pool.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 
 interface PromisePoolArgs<Item, Result> {
   concurrency?: number;
diff --git a/x-pack/plugins/session_view/common/constants.ts b/x-pack/plugins/session_view/common/constants.ts
index ed0c21f89a8d6..0e1a7c16172f2 100644
--- a/x-pack/plugins/session_view/common/constants.ts
+++ b/x-pack/plugins/session_view/common/constants.ts
@@ -9,7 +9,7 @@ export const PROCESS_EVENTS_ROUTE = '/internal/session_view/process_events_route
 export const ALERTS_ROUTE = '/internal/session_view/alerts_route';
 export const ALERT_STATUS_ROUTE = '/internal/session_view/alert_status_route';
 export const SESSION_ENTRY_LEADERS_ROUTE = '/internal/session_view/session_entry_leaders_route';
-export const PROCESS_EVENTS_INDEX = 'logs-endpoint.events.process-default';
+export const PROCESS_EVENTS_INDEX = 'logs-endpoint.events.process-*';
 export const PREVIEW_ALERTS_INDEX = '.preview.alerts-security.alerts-default';
 export const ENTRY_SESSION_ENTITY_ID_PROPERTY = 'process.entry_leader.entity_id';
 export const ALERT_UUID_PROPERTY = 'kibana.alert.uuid';
@@ -41,11 +41,11 @@ export const PROCESS_EVENTS_PER_PAGE = 1000;
 // causes a session to only list and highlight up to 1000 alerts, even though there could
 // be far greater than this amount. UX should be added to let the end user know this is
 // happening and to revise their rule to be more specific.
-export const ALERTS_PER_PAGE = 1000;
+export const ALERTS_PER_PAGE = 501;
 
 // when showing the count of alerts in details panel tab, if the number
-// exceeds ALERT_COUNT_THRESHOLD we put a + next to it, e.g  999+
-export const ALERT_COUNT_THRESHOLD = 999;
+// exceeds ALERT_COUNT_THRESHOLD we put a + next to it, e.g  500+
+export const ALERT_COUNT_THRESHOLD = 500;
 
 // react-query caching keys
 export const QUERY_KEY_PROCESS_EVENTS = 'sessionViewProcessEvents';
diff --git a/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx b/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx
index a75977535a12f..9bee1aabefb85 100644
--- a/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { BUTTON_TEST_ID, BackToInvestigatedAlert } from './index';
+import { BUTTON_TEST_ID, BackToInvestigatedAlert } from '.';
 
 describe('BackToInvestigatedAlert component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx
index 1adc34b230088..85ffc80ce0360 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelAccordion } from './index';
+import { DetailPanelAccordion } from '.';
 
 const TEST_ID = 'test';
 const TEST_LIST_ITEM = [
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx
index 09f107de0dd93..241a052fedd50 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx
@@ -12,7 +12,7 @@ import {
   BUTTON_TEST_ID,
   SHOW_DETAILS_TEST_ID,
   JUMP_TO_PROCESS_TEST_ID,
-} from './index';
+} from '.';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import userEvent from '@testing-library/user-event';
 import { ProcessEvent } from '../../../common/types/process_tree';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx
index c2f1e8d5a0494..a83e41d793e23 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx
@@ -49,14 +49,18 @@ export const DetailPanelAlertGroupItem = ({
       arrowDisplay="right"
       initialIsOpen={false}
       buttonContent={
-        <EuiText data-test-subj={ALERT_GROUP_ITEM_TITLE_TEST_ID} css={styles.alertTitle} size="s">
-          <p>
+        <EuiText
+          data-test-subj={ALERT_GROUP_ITEM_TITLE_TEST_ID}
+          css={styles.alertTitleContainer}
+          size="s"
+        >
+          <p css={styles.alertTitle}>
             <EuiIcon color="danger" type="alert" css={styles.alertIcon} />
             {dataOrDash(rule?.name)}
           </p>
         </EuiText>
       }
-      css={styles.alertItem}
+      css={styles.alertGroupItem}
       extraAction={
         <EuiNotificationBadge
           data-test-subj={ALERT_GROUP_ITEM_COUNT_TEST_ID}
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx
index b85b3e809e356..1c6dd0a57b7e7 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx
@@ -93,8 +93,8 @@ export const DetailPanelAlertListItem = ({
       data-test-subj={ALERT_LIST_ITEM_TEST_ID}
       arrowDisplay={isInvestigated ? 'right' : 'none'}
       buttonContent={
-        <EuiText css={styles.alertTitle} size="s">
-          <p>
+        <EuiText css={styles.alertTitleContainer} size="s">
+          <p css={styles.alertTitle}>
             <EuiIcon color="danger" type="alert" css={styles.alertIcon} />
             {dataOrDash(name)}
           </p>
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts
index 7672bb942ff32..403c6d3e2cacb 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts
@@ -50,10 +50,21 @@ export const useStyles = (minimal = false, isInvestigated = false) => {
       }
     `;
 
-    const alertTitle: CSSObject = {
+    const alertGroupItem = css`
+      ${alertItem}
+
+      & .euiAccordion__childWrapper {
+        overflow: hidden;
+      }
+    `;
+
+    const alertTitleContainer: CSSObject = {
       display: minimal ? 'none' : 'initial',
       color: alertTitleColor,
       fontWeight: font.weight.semiBold,
+    };
+
+    const alertTitle: CSSObject = {
       textOverflow: 'ellipsis',
       overflow: 'hidden',
       whiteSpace: 'nowrap',
@@ -98,6 +109,8 @@ export const useStyles = (minimal = false, isInvestigated = false) => {
 
     return {
       alertItem,
+      alertGroupItem,
+      alertTitleContainer,
       alertTitle,
       alertIcon,
       alertAccordionButton,
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx
index 676757666af51..76f1cf41fb26a 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx
@@ -8,24 +8,20 @@
 import React from 'react';
 
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelAlertTab } from './index';
+import { DetailPanelAlertTab } from '.';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import { fireEvent } from '@testing-library/dom';
-import {
-  INVESTIGATED_ALERT_TEST_ID,
-  VIEW_MODE_TOGGLE,
-  ALERTS_TAB_EMPTY_STATE_TEST_ID,
-} from './index';
+import { INVESTIGATED_ALERT_TEST_ID, VIEW_MODE_TOGGLE, ALERTS_TAB_EMPTY_STATE_TEST_ID } from '.';
 import {
   ALERT_LIST_ITEM_TEST_ID,
   ALERT_LIST_ITEM_ARGS_TEST_ID,
   ALERT_LIST_ITEM_TIMESTAMP_TEST_ID,
-} from '../detail_panel_alert_list_item/index';
+} from '../detail_panel_alert_list_item';
 import {
   ALERT_GROUP_ITEM_TEST_ID,
   ALERT_GROUP_ITEM_COUNT_TEST_ID,
   ALERT_GROUP_ITEM_TITLE_TEST_ID,
-} from '../detail_panel_alert_group_item/index';
+} from '../detail_panel_alert_group_item';
 
 const ACCORDION_BUTTON_CLASS = '.euiAccordion__button';
 const VIEW_MODE_GROUP = 'groupView';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx
index bb1dd243621bd..4d3c5e16e1bb7 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelCopy } from './index';
+import { DetailPanelCopy } from '.';
 
 const TEST_TEXT_COPY = 'copy component test';
 const TEST_CHILD = <span>{TEST_TEXT_COPY}</span>;
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx
index aaf3086aabf5e..69d0d633f8f30 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelDescriptionList } from './index';
+import { DetailPanelDescriptionList } from '.';
 
 const TEST_FIRST_TITLE = 'item title';
 const TEST_FIRST_DESCRIPTION = 'item description';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx
index 2df9f47e5a416..17e9102fb8ed9 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
 import { ProcessEventHost } from '../../../common/types/process_tree';
-import { DetailPanelHostTab } from './index';
+import { DetailPanelHostTab } from '.';
 
 const TEST_ARCHITECTURE = 'x86_64';
 const TEST_HOSTNAME = 'host-james-fleet-714-2';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx
index e6572a097d85a..3cf7e93494747 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelListItem } from './index';
+import { DetailPanelListItem } from '.';
 
 const TEST_STRING = 'item title';
 const TEST_CHILD = <span>{TEST_STRING}</span>;
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx
index 0a514e178b4b5..7daaf997e2af8 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
 import { DetailPanelProcess, DetailPanelProcessLeader } from '../../types';
-import { DetailPanelProcessTab } from './index';
+import { DetailPanelProcessTab } from '.';
 
 const getLeaderDetail = (leader: string): DetailPanelProcessLeader => ({
   id: `${leader}-id`,
diff --git a/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx
index 3201d6dfa7e1b..bdc07b3850987 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx
@@ -14,7 +14,7 @@ import {
 } from '../../../common/mocks/constants/session_view_process.mock';
 import { Process } from '../../../common/types/process_tree';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessTreeDeps, ProcessTree } from './index';
+import { ProcessTreeDeps, ProcessTree } from '.';
 
 describe('ProcessTree component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/process_tree/styles.ts b/x-pack/plugins/session_view/public/components/process_tree/styles.ts
index ed868b7203ccd..490829cad440b 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/styles.ts
+++ b/x-pack/plugins/session_view/public/components/process_tree/styles.ts
@@ -8,6 +8,7 @@
 import { useMemo } from 'react';
 import { transparentize, useEuiTheme } from '@elastic/eui';
 import { CSSObject } from '@emotion/react';
+import { euiLightVars } from '@kbn/ui-theme'; // using this temporarily until the euiTheme hook is updated to include proper hex values
 
 export const useStyles = () => {
   const { euiTheme } = useEuiTheme();
@@ -21,7 +22,7 @@ export const useStyles = () => {
       fontFamily: font.familyCode,
       overflow: 'auto',
       height: '100%',
-      backgroundColor: colors.lightestShade,
+      backgroundColor: euiLightVars.euiColorLightestShade,
       paddingTop: size.base,
       paddingLeft: size.s,
     };
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap b/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap
new file mode 100644
index 0000000000000..e9f66ea10d66e
--- /dev/null
+++ b/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,152 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ProcessTreeAlerts component When ProcessTreeAlert is mounted should render alert row correctly 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="euiText euiText--small css-37sku6-EuiText"
+        data-id="6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
+        data-test-subj="sessionView:sessionViewAlertDetail-6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
+      >
+        <button
+          aria-label="expand"
+          class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall css-aikc70-EuiButtonIcon"
+          data-test-subj="sessionView:sessionViewAlertDetailExpand-6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
+          type="button"
+        >
+          <span
+            aria-hidden="true"
+            class="euiButtonIcon__icon"
+            color="inherit"
+            data-euiicon-type="expand"
+          />
+        </button>
+        <span
+          class="css-1m18djg-EuiIcon"
+          color="danger"
+          data-euiicon-type="alert"
+        />
+        <div
+          class="euiText euiText--small css-1by8n1o-EuiText"
+        >
+          cmd test alert
+        </div>
+        <span
+          class="euiBadge euiBadge--iconLeft css-1mjg6jf-EuiInnerText"
+          style="background-color: rgb(121, 170, 217); color: rgb(0, 0, 0);"
+          title="open"
+        >
+          <span
+            class="euiBadge__content"
+          >
+            <span
+              class="euiBadge__text"
+            >
+              open
+            </span>
+          </span>
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="euiText euiText--small css-37sku6-EuiText"
+      data-id="6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
+      data-test-subj="sessionView:sessionViewAlertDetail-6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
+    >
+      <button
+        aria-label="expand"
+        class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall css-aikc70-EuiButtonIcon"
+        data-test-subj="sessionView:sessionViewAlertDetailExpand-6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
+        type="button"
+      >
+        <span
+          aria-hidden="true"
+          class="euiButtonIcon__icon"
+          color="inherit"
+          data-euiicon-type="expand"
+        />
+      </button>
+      <span
+        class="css-1m18djg-EuiIcon"
+        color="danger"
+        data-euiicon-type="alert"
+      />
+      <div
+        class="euiText euiText--small css-1by8n1o-EuiText"
+      >
+        cmd test alert
+      </div>
+      <span
+        class="euiBadge euiBadge--iconLeft css-1mjg6jf-EuiInnerText"
+        style="background-color: rgb(121, 170, 217); color: rgb(0, 0, 0);"
+        title="open"
+      >
+        <span
+          class="euiBadge__content"
+        >
+          <span
+            class="euiBadge__text"
+          >
+            open
+          </span>
+        </span>
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx
index f3b8fec23433c..7ed1783e2da3f 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessTreeAlertDeps, ProcessTreeAlert } from './index';
+import { ProcessTreeAlertDeps, ProcessTreeAlert } from '.';
 
 const mockAlert = mockAlerts[0];
 const TEST_ID = `sessionView:sessionViewAlertDetail-${mockAlert.kibana?.alert?.uuid}`;
@@ -40,6 +40,7 @@ describe('ProcessTreeAlerts component', () => {
       expect(renderResult.queryByTestId(TEST_ID)).toBeTruthy();
       expect(renderResult.queryByText(ALERT_RULE_NAME!)).toBeTruthy();
       expect(renderResult.queryByText(ALERT_STATUS!)).toBeTruthy();
+      expect(renderResult).toMatchSnapshot();
     });
 
     it('should execute onClick callback', async () => {
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alert/index.tsx b/x-pack/plugins/session_view/public/components/process_tree_alert/index.tsx
index bf4b6f63bbe95..95618123d709f 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_alert/index.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_alert/index.tsx
@@ -73,7 +73,7 @@ export const ProcessTreeAlert = ({
         data-test-subj={`sessionView:sessionViewAlertDetailExpand-${uuid}`}
         onClick={handleExpandClick}
       />
-      <EuiIcon type="alert" css={styles.alertRowItem} />
+      <EuiIcon type="alert" color="danger" css={styles.alertRowItem} />
       <EuiText size="s" css={styles.alertRuleName}>
         {dataOrDash(name)}
       </EuiText>
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx
index 54b17bc49dc8e..b0ec485ab5662 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessTreeAlertsDeps, ProcessTreeAlerts } from './index';
+import { ProcessTreeAlertsDeps, ProcessTreeAlerts } from '.';
 
 describe('ProcessTreeAlerts component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx
index 8bfe37fe12ee7..a5e0305595187 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx
@@ -14,7 +14,7 @@ import {
   sessionViewAlertProcessMock,
 } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessDeps, ProcessTreeNode } from './index';
+import { ProcessDeps, ProcessTreeNode } from '.';
 import { Cancelable } from 'lodash';
 import { DEBOUNCE_TIMEOUT } from '../../../common/constants';
 
diff --git a/x-pack/plugins/session_view/public/components/session_view/hooks.ts b/x-pack/plugins/session_view/public/components/session_view/hooks.ts
index 29beb6368c125..3beb664153e0c 100644
--- a/x-pack/plugins/session_view/public/components/session_view/hooks.ts
+++ b/x-pack/plugins/session_view/public/components/session_view/hooks.ts
@@ -7,8 +7,8 @@
 import { useEffect, useState, useMemo } from 'react';
 import { useQuery, useInfiniteQuery } from 'react-query';
 import { EuiSearchBarOnChangeArgs } from '@elastic/eui';
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   AlertStatusEventEntityIdMap,
   ProcessEvent,
diff --git a/x-pack/plugins/session_view/public/components/session_view/index.test.tsx b/x-pack/plugins/session_view/public/components/session_view/index.test.tsx
index 41865f1adad43..f51bdf16c6e56 100644
--- a/x-pack/plugins/session_view/public/components/session_view/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view/index.test.tsx
@@ -9,7 +9,7 @@ import { waitFor, waitForElementToBeRemoved } from '@testing-library/react';
 import React from 'react';
 import { sessionViewProcessEventsMock } from '../../../common/mocks/responses/session_view_process_events.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { SessionView } from './index';
+import { SessionView } from '.';
 import userEvent from '@testing-library/user-event';
 
 describe('SessionView component', () => {
@@ -35,6 +35,24 @@ describe('SessionView component', () => {
         });
       });
 
+      it('should show loading state while retrieving empty data and hide it when settled', async () => {
+        let releaseApiResponse: (value?: unknown) => void;
+
+        // make the request wait
+        mockedApi.mockReturnValue(new Promise((resolve) => (releaseApiResponse = resolve)));
+        render();
+        await waitForApiCall();
+
+        // see if loader is present
+        expect(renderResult.getByTestId('sectionLoading')).toBeTruthy();
+
+        // release the request
+        releaseApiResponse!(mockedApi);
+
+        //  check the loader is gone
+        await waitForElementToBeRemoved(renderResult.getByTestId('sectionLoading'));
+      });
+
       it('should show the Empty message', async () => {
         render();
         await waitForApiCall();
@@ -55,7 +73,7 @@ describe('SessionView component', () => {
         mockedApi.mockResolvedValue(sessionViewProcessEventsMock);
       });
 
-      it('should show loading indicator while retrieving data and hide it when it gets it', async () => {
+      it('should show loading state while retrieving data and hide it when settled', async () => {
         let releaseApiResponse: (value?: unknown) => void;
 
         // make the request wait
@@ -64,13 +82,13 @@ describe('SessionView component', () => {
         await waitForApiCall();
 
         // see if loader is present
-        expect(renderResult.getByText('Loading session…')).toBeTruthy();
+        expect(renderResult.getByTestId('sectionLoading')).toBeTruthy();
 
         // release the request
         releaseApiResponse!(mockedApi);
 
         //  check the loader is gone
-        await waitForElementToBeRemoved(renderResult.getByText('Loading session…'));
+        await waitForElementToBeRemoved(renderResult.getByTestId('sectionLoading'));
       });
 
       it('should display the search bar', async () => {
diff --git a/x-pack/plugins/session_view/public/components/session_view/index.tsx b/x-pack/plugins/session_view/public/components/session_view/index.tsx
index fee4a67c746fc..b1678a5265ee2 100644
--- a/x-pack/plugins/session_view/public/components/session_view/index.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view/index.tsx
@@ -13,7 +13,9 @@ import {
   EuiPanel,
   EuiHorizontalRule,
   EuiFlexGroup,
+  EuiBetaBadge,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 import { SectionLoading } from '../../shared_imports';
@@ -36,6 +38,10 @@ import {
 } from './hooks';
 import { LOCAL_STORAGE_DISPLAY_OPTIONS_KEY } from '../../../common/constants';
 
+const BETA = i18n.translate('xpack.sessionView.beta', {
+  defaultMessage: 'Beta',
+});
+
 /**
  * The main wrapper component for the session view.
  */
@@ -115,7 +121,7 @@ export const SessionView = ({
 
   const hasData = alerts && data && data.pages?.[0].events.length > 0;
   const hasError = error || alertsError;
-  const renderIsLoading = (isFetching || alertsFetching) && !data;
+  const renderIsLoading = (isFetching || alertsFetching) && !(data && alerts);
   const renderDetails = isDetailOpen && selectedProcess;
   const { data: newUpdatedAlertsStatus } = useFetchAlertStatus(
     updatedAlertsStatus,
@@ -154,7 +160,18 @@ export const SessionView = ({
     [setDisplayOptions]
   );
 
-  if (!isFetching && !hasData) {
+  if (renderIsLoading) {
+    return (
+      <SectionLoading>
+        <FormattedMessage
+          id="xpack.sessionView.loadingProcessTree"
+          defaultMessage="Loading session…"
+        />
+      </SectionLoading>
+    );
+  }
+
+  if (!hasData) {
     return (
       <EuiEmptyPrompt
         data-test-subj="sessionView:sessionViewProcessEventsEmpty"
@@ -182,7 +199,10 @@ export const SessionView = ({
     <>
       <div css={styles.sessionViewerComponent}>
         <EuiPanel css={styles.toolBar} hasShadow={false} borderRadius="none">
-          <EuiFlexGroup>
+          <EuiFlexGroup alignItems="center" gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <EuiBetaBadge label={BETA} size="s" css={styles.betaBadge} />
+            </EuiFlexItem>
             <EuiFlexItem
               data-test-subj="sessionView:sessionViewProcessEventsSearch"
               css={styles.searchBar}
@@ -195,7 +215,7 @@ export const SessionView = ({
               />
             </EuiFlexItem>
 
-            <EuiFlexItem grow={false} css={styles.buttonsEyeDetail}>
+            <EuiFlexItem grow={false}>
               <SessionViewDisplayOptions
                 displayOptions={displayOptions!}
                 onChange={handleOptionChange}
@@ -203,7 +223,7 @@ export const SessionView = ({
               />
             </EuiFlexItem>
 
-            <EuiFlexItem grow={false} css={styles.buttonsEyeDetail}>
+            <EuiFlexItem grow={false}>
               <EuiButton
                 onClick={toggleDetailPanel}
                 iconType="list"
@@ -227,15 +247,6 @@ export const SessionView = ({
                 minSize="60%"
                 paddingSize="none"
               >
-                {renderIsLoading && (
-                  <SectionLoading>
-                    <FormattedMessage
-                      id="xpack.sessionView.loadingProcessTree"
-                      defaultMessage="Loading session…"
-                    />
-                  </SectionLoading>
-                )}
-
                 {hasError && (
                   <EuiEmptyPrompt
                     iconType="alert"
diff --git a/x-pack/plugins/session_view/public/components/session_view/styles.ts b/x-pack/plugins/session_view/public/components/session_view/styles.ts
index b78ed74102785..d8cccebe9738a 100644
--- a/x-pack/plugins/session_view/public/components/session_view/styles.ts
+++ b/x-pack/plugins/session_view/public/components/session_view/styles.ts
@@ -8,6 +8,7 @@
 import { useMemo } from 'react';
 import { useEuiTheme } from '@elastic/eui';
 import { CSSObject } from '@emotion/react';
+import { euiLightVars } from '@kbn/ui-theme'; // using this temporarily until the euiTheme hook is updated to include proper hex values
 
 interface StylesDeps {
   height?: number;
@@ -18,7 +19,7 @@ export const useStyles = ({ height = 500, isFullScreen }: StylesDeps) => {
   const { euiTheme } = useEuiTheme();
 
   const cached = useMemo(() => {
-    const { border, colors } = euiTheme;
+    const { border, colors, size } = euiTheme;
 
     // 118px = Session View Toolbar height + Close Session button height + spacing margin at the bottom
     const sessionView: CSSObject = {
@@ -46,11 +47,9 @@ export const useStyles = ({ height = 500, isFullScreen }: StylesDeps) => {
     };
     const searchBar: CSSObject = {
       position: 'relative',
-      margin: `${euiTheme.size.m} ${euiTheme.size.xs}`,
-    };
-
-    const buttonsEyeDetail: CSSObject = {
-      margin: `${euiTheme.size.m} ${euiTheme.size.xs}`,
+      input: {
+        backgroundColor: colors.emptyShade,
+      },
     };
 
     const sessionViewerComponent: CSSObject = {
@@ -59,6 +58,11 @@ export const useStyles = ({ height = 500, isFullScreen }: StylesDeps) => {
     };
 
     const toolBar: CSSObject = {
+      backgroundColor: `${euiLightVars.euiFormBackgroundDisabledColor} !important`, // important used since euipanel overrides this
+      padding: `${size.m} ${size.base}`,
+    };
+
+    const betaBadge: CSSObject = {
       backgroundColor: `${colors.emptyShade}`,
     };
 
@@ -68,9 +72,9 @@ export const useStyles = ({ height = 500, isFullScreen }: StylesDeps) => {
       nonGrowGroup,
       resizeHandle,
       searchBar,
-      buttonsEyeDetail,
       sessionViewerComponent,
       toolBar,
+      betaBadge,
     };
   }, [euiTheme, isFullScreen, height]);
 
diff --git a/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx b/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx
index 75d04cbf6833b..f2d7249e43c90 100644
--- a/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx
@@ -11,7 +11,7 @@ import {
   sessionViewBasicProcessMock,
 } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { SessionViewDetailPanel } from './index';
+import { SessionViewDetailPanel } from '.';
 
 describe('SessionView component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts b/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts
index a0a1946942941..1d1625fc1cdbd 100644
--- a/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts
+++ b/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts
@@ -12,11 +12,11 @@ import { CSSObject } from '@emotion/react';
 export const useStyles = () => {
   const { euiTheme } = useEuiTheme();
   const cached = useMemo(() => {
-    const { border, colors } = euiTheme;
+    const { border } = euiTheme;
 
     const detailsPanel: CSSObject = {
       borderLeft: border.thin,
-      backgroundColor: colors.emptyShade,
+      height: '100%',
     };
 
     return {
diff --git a/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx b/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx
index b27260668af07..67347f2138f0a 100644
--- a/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { processMock } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { SessionViewSearchBar } from './index';
+import { SessionViewSearchBar } from '.';
 import userEvent from '@testing-library/user-event';
 import { fireEvent } from '@testing-library/dom';
 
diff --git a/x-pack/plugins/session_view/public/plugin.ts b/x-pack/plugins/session_view/public/plugin.ts
index d51d1bc0e6c67..988068ccda729 100644
--- a/x-pack/plugins/session_view/public/plugin.ts
+++ b/x-pack/plugins/session_view/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../src/core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { SessionViewServices, SessionViewDeps } from './types';
 import { getSessionViewLazy } from './methods';
 
diff --git a/x-pack/plugins/session_view/public/shared_imports.ts b/x-pack/plugins/session_view/public/shared_imports.ts
index 0a087e1ac36ae..db6e521678ead 100644
--- a/x-pack/plugins/session_view/public/shared_imports.ts
+++ b/x-pack/plugins/session_view/public/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { SectionLoading } from '../../../../src/plugins/es_ui_shared/public';
+export { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
diff --git a/x-pack/plugins/session_view/public/test/index.tsx b/x-pack/plugins/session_view/public/test/index.tsx
index e7a990000b018..6174925b6003c 100644
--- a/x-pack/plugins/session_view/public/test/index.tsx
+++ b/x-pack/plugins/session_view/public/test/index.tsx
@@ -13,10 +13,10 @@ import { Router } from 'react-router-dom';
 import { History } from 'history';
 import useObservable from 'react-use/lib/useObservable';
 import { I18nProvider } from '@kbn/i18n-react';
-import { CoreStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
diff --git a/x-pack/plugins/session_view/public/types.ts b/x-pack/plugins/session_view/public/types.ts
index 1dcfe4f47c069..8e5b9a7ed83f2 100644
--- a/x-pack/plugins/session_view/public/types.ts
+++ b/x-pack/plugins/session_view/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ReactNode } from 'react';
-import { CoreStart } from '../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { Teletype } from '../common/types/process_tree';
 
 export type SessionViewServices = CoreStart;
diff --git a/x-pack/plugins/session_view/server/index.ts b/x-pack/plugins/session_view/server/index.ts
index a86684094dfd7..cd524ea86cde2 100644
--- a/x-pack/plugins/session_view/server/index.ts
+++ b/x-pack/plugins/session_view/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SessionViewPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/session_view/server/plugin.ts b/x-pack/plugins/session_view/server/plugin.ts
index 7347f7676af62..b5847fb9072d5 100644
--- a/x-pack/plugins/session_view/server/plugin.ts
+++ b/x-pack/plugins/session_view/server/plugin.ts
@@ -12,7 +12,7 @@ import {
   Logger,
   PluginInitializerContext,
   IRouter,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 import { SessionViewSetupPlugins, SessionViewStartPlugins } from './types';
 import { registerRoutes } from './routes';
 
diff --git a/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts b/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts
index f546500d803b0..1c91af3ee0ab4 100644
--- a/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts
+++ b/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts
@@ -10,19 +10,19 @@ import {
   SPACE_IDS,
   ALERT_WORKFLOW_STATUS,
 } from '@kbn/rule-data-utils';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { searchAlertByUuid } from './alert_status_route';
 import { mockAlerts } from '../../common/mocks/constants/session_view_process.mock';
 
 import {
   AlertsClient,
   ConstructorOptions,
-} from '../../../rule_registry/server/alert_data_client/alerts_client';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../alerting/server';
-import { ruleDataServiceMock } from '../../../rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock';
+} from '@kbn/rule-registry-plugin/server/alert_data_client/alerts_client';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
+import { ruleDataServiceMock } from '@kbn/rule-registry-plugin/server/rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const auditLogger = auditLoggerMock.create();
diff --git a/x-pack/plugins/session_view/server/routes/alert_status_route.ts b/x-pack/plugins/session_view/server/routes/alert_status_route.ts
index c3708d386ec1b..f8d75b355664d 100644
--- a/x-pack/plugins/session_view/server/routes/alert_status_route.ts
+++ b/x-pack/plugins/session_view/server/routes/alert_status_route.ts
@@ -5,14 +5,17 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
+import type {
+  AlertsClient,
+  RuleRegistryPluginStartContract,
+} from '@kbn/rule-registry-plugin/server';
 import {
   ALERT_STATUS_ROUTE,
   ALERT_UUID_PROPERTY,
   PREVIEW_ALERTS_INDEX,
 } from '../../common/constants';
 import { expandDottedObject } from '../../common/utils/expand_dotted_object';
-import type { AlertsClient, RuleRegistryPluginStartContract } from '../../../rule_registry/server';
 
 export const registerAlertStatusRoute = (
   router: IRouter,
diff --git a/x-pack/plugins/session_view/server/routes/alerts_route.test.ts b/x-pack/plugins/session_view/server/routes/alerts_route.test.ts
index 4c8ee6fb2c83e..d3b50b366362e 100644
--- a/x-pack/plugins/session_view/server/routes/alerts_route.test.ts
+++ b/x-pack/plugins/session_view/server/routes/alerts_route.test.ts
@@ -10,19 +10,19 @@ import {
   SPACE_IDS,
   ALERT_WORKFLOW_STATUS,
 } from '@kbn/rule-data-utils';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { doSearch } from './alerts_route';
 import { mockEvents } from '../../common/mocks/constants/session_view_process.mock';
 
 import {
   AlertsClient,
   ConstructorOptions,
-} from '../../../rule_registry/server/alert_data_client/alerts_client';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../alerting/server';
-import { ruleDataServiceMock } from '../../../rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock';
+} from '@kbn/rule-registry-plugin/server/alert_data_client/alerts_client';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
+import { ruleDataServiceMock } from '@kbn/rule-registry-plugin/server/rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const auditLogger = auditLoggerMock.create();
diff --git a/x-pack/plugins/session_view/server/routes/alerts_route.ts b/x-pack/plugins/session_view/server/routes/alerts_route.ts
index 97b72706f5898..f2b1c3b7c809d 100644
--- a/x-pack/plugins/session_view/server/routes/alerts_route.ts
+++ b/x-pack/plugins/session_view/server/routes/alerts_route.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
+import type {
+  AlertsClient,
+  RuleRegistryPluginStartContract,
+} from '@kbn/rule-registry-plugin/server';
 import {
   ALERTS_ROUTE,
   ALERTS_PER_PAGE,
@@ -13,7 +17,6 @@ import {
   PREVIEW_ALERTS_INDEX,
 } from '../../common/constants';
 import { expandDottedObject } from '../../common/utils/expand_dotted_object';
-import type { AlertsClient, RuleRegistryPluginStartContract } from '../../../rule_registry/server';
 
 export const registerAlertsRoute = (
   router: IRouter,
diff --git a/x-pack/plugins/session_view/server/routes/index.ts b/x-pack/plugins/session_view/server/routes/index.ts
index 6980f345b49f9..b981b31f33978 100644
--- a/x-pack/plugins/session_view/server/routes/index.ts
+++ b/x-pack/plugins/session_view/server/routes/index.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
+import { RuleRegistryPluginStartContract } from '@kbn/rule-registry-plugin/server';
 import { registerProcessEventsRoute } from './process_events_route';
 import { registerAlertsRoute } from './alerts_route';
 import { registerAlertStatusRoute } from './alert_status_route';
 import { sessionEntryLeadersRoute } from './session_entry_leaders_route';
-import { RuleRegistryPluginStartContract } from '../../../rule_registry/server';
 
 export const registerRoutes = (router: IRouter, ruleRegistry: RuleRegistryPluginStartContract) => {
   registerProcessEventsRoute(router);
diff --git a/x-pack/plugins/session_view/server/routes/process_events_route.test.ts b/x-pack/plugins/session_view/server/routes/process_events_route.test.ts
index 836db10290b2f..fdf706c0ede25 100644
--- a/x-pack/plugins/session_view/server/routes/process_events_route.test.ts
+++ b/x-pack/plugins/session_view/server/routes/process_events_route.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { doSearch } from './process_events_route';
 import { mockEvents } from '../../common/mocks/constants/session_view_process.mock';
 
diff --git a/x-pack/plugins/session_view/server/routes/process_events_route.ts b/x-pack/plugins/session_view/server/routes/process_events_route.ts
index fc148faf71b7a..7341f8238f9af 100644
--- a/x-pack/plugins/session_view/server/routes/process_events_route.ts
+++ b/x-pack/plugins/session_view/server/routes/process_events_route.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import type { ElasticsearchClient } from 'kibana/server';
-import { IRouter } from '../../../../../src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
 import {
   PROCESS_EVENTS_ROUTE,
   PROCESS_EVENTS_PER_PAGE,
@@ -27,7 +27,7 @@ export const registerProcessEventsRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
-      const client = context.core.elasticsearch.client.asCurrentUser;
+      const client = (await context.core).elasticsearch.client.asCurrentUser;
       const { sessionEntityId, cursor, forward = true } = request.query;
       const body = await doSearch(client, sessionEntityId, cursor, forward);
 
diff --git a/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts b/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts
index 98aee357fb91e..c8fd28334f18e 100644
--- a/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts
+++ b/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { SESSION_ENTRY_LEADERS_ROUTE, PROCESS_EVENTS_INDEX } from '../../common/constants';
 
 export const sessionEntryLeadersRoute = (router: IRouter) => {
@@ -19,7 +19,7 @@ export const sessionEntryLeadersRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
-      const client = context.core.elasticsearch.client.asCurrentUser;
+      const client = (await context.core).elasticsearch.client.asCurrentUser;
       const { id } = request.query;
 
       const result = await client.get({
diff --git a/x-pack/plugins/session_view/server/types.ts b/x-pack/plugins/session_view/server/types.ts
index 29995077ccfbe..f3585be42e7b5 100644
--- a/x-pack/plugins/session_view/server/types.ts
+++ b/x-pack/plugins/session_view/server/types.ts
@@ -7,7 +7,7 @@
 import {
   RuleRegistryPluginSetupContract as RuleRegistryPluginSetup,
   RuleRegistryPluginStartContract as RuleRegistryPluginStart,
-} from '../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
 
 export interface SessionViewSetupPlugins {
   ruleRegistry: RuleRegistryPluginSetup;
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
index 9970b0100ceb8..5d94e0e960ce5 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
@@ -14,7 +14,7 @@ import {
   AsyncTestBedConfig,
   delay,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { SnapshotRestoreHome } from '../../../public/application/sections/home/home';
 import { BASE_PATH } from '../../../public/application/constants';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts
index 3c14c444d4664..e75d0c3544b74 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common';
 
 type HttpMethod = 'GET' | 'PUT' | 'POST';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts
index a5cf9aceff8c4..1ad248ba0e9e5 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PolicyAdd } from '../../../public/application/sections/policy_add';
 import { formSetup, PolicyFormTestSubjects } from './policy_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts
index 3334dc5337a4d..aa6f83ea4f2a7 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PolicyEdit } from '../../../public/application/sections/policy_edit';
 import { WithAppDependencies } from './setup_environment';
 import { POLICY_NAME } from './constant';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts
index c4a5fc4b7be93..ce92c211bc6af 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { RepositoryType } from '../../../common/types';
 import { RepositoryAdd } from '../../../public/application/sections/repository_add';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts
index 3e8bbf95d5ea9..04ddabf9c1bfd 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { RepositoryEdit } from '../../../public/application/sections/repository_edit';
 import { WithAppDependencies } from './setup_environment';
 import { REPOSITORY_NAME } from './constant';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts
index fe5a82f421def..afc5e14140b01 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts
@@ -6,11 +6,11 @@
  */
 import { act } from 'react-dom/test-utils';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
 import { RestoreSnapshot } from '../../../public/application/sections/restore_snapshot';
 import { WithAppDependencies } from './setup_environment';
-import { REPOSITORY_NAME, SNAPSHOT_NAME } from '../helpers/constant';
+import { REPOSITORY_NAME, SNAPSHOT_NAME } from './constant';
 
 const testBedConfig: AsyncTestBedConfig = {
   memoryRouter: {
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx
index 0c961d5e151bc..0ba6ee619b16c 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { LocationDescriptorObject } from 'history';
 
-import { HttpSetup } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { setUiMetricService, httpService } from '../../../public/application/services/http';
 import {
   breadcrumbService,
diff --git a/x-pack/plugins/snapshot_restore/common/constants.ts b/x-pack/plugins/snapshot_restore/common/constants.ts
index d8b159fd01e96..cd323d9bc4819 100644
--- a/x-pack/plugins/snapshot_restore/common/constants.ts
+++ b/x-pack/plugins/snapshot_restore/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { RepositoryType } from './types';
 
 const basicLicense: LicenseType = 'basic';
diff --git a/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts b/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts
index 7d911c13d1bb6..0907699b7e6d0 100644
--- a/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts
+++ b/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts
@@ -11,7 +11,7 @@ import {
   serializeSnapshotConfig,
   deserializeSnapshotRetention,
   serializeSnapshotRetention,
-} from './';
+} from '.';
 
 export const deserializePolicy = (
   name: string,
diff --git a/x-pack/plugins/snapshot_restore/kibana.json b/x-pack/plugins/snapshot_restore/kibana.json
index 66c4023337af1..114bd866b4746 100644
--- a/x-pack/plugins/snapshot_restore/kibana.json
+++ b/x-pack/plugins/snapshot_restore/kibana.json
@@ -10,5 +10,5 @@
   "requiredPlugins": ["licensing", "management", "features", "share"],
   "optionalPlugins": ["usageCollection", "security", "cloud", "home"],
   "configPath": ["xpack", "snapshot_restore"],
-  "requiredBundles": ["esUiShared", "kibanaReact", "home"]
+  "requiredBundles": ["esUiShared", "kibanaReact"]
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/app.tsx b/x-pack/plugins/snapshot_restore/public/application/app.tsx
index d2de3dba3d25f..641fb809c9ad8 100644
--- a/x-pack/plugins/snapshot_restore/public/application/app.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/app.tsx
@@ -10,7 +10,7 @@ import { Redirect, Route, Switch } from 'react-router-dom';
 import { EuiPageContent } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 import { APP_REQUIRED_CLUSTER_PRIVILEGES } from '../../common';
 import {
diff --git a/x-pack/plugins/snapshot_restore/public/application/app_context.tsx b/x-pack/plugins/snapshot_restore/public/application/app_context.tsx
index 8b94f683a7f2f..4f36da98cfed6 100644
--- a/x-pack/plugins/snapshot_restore/public/application/app_context.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/app_context.tsx
@@ -9,7 +9,7 @@ import React, { createContext, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
 
-import { CoreStart, ScopedHistory, CoreTheme } from '../../../../../src/core/public';
+import { CoreStart, ScopedHistory, CoreTheme } from '@kbn/core/public';
 import { ClientConfigType } from '../types';
 import { HttpService, UiMetricService } from './services';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx
index 501057066a5b0..9100ce22417e5 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx
@@ -24,16 +24,15 @@ import {
   EuiCode,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { Repository } from '../../../../../common/types';
 import { Frequency, CronEditor, SectionError } from '../../../../shared_imports';
 import { useCore, useServices } from '../../../app_context';
 import { DEFAULT_POLICY_SCHEDULE, DEFAULT_POLICY_FREQUENCY } from '../../../constants';
 import { useLoadRepositories } from '../../../services/http';
 import { linkToAddRepository } from '../../../services/navigation';
-import { InlineLoading } from '../../';
-import { StepProps } from './';
-
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { InlineLoading } from '../..';
+import { StepProps } from '.';
 
 export const PolicyStepLogistics: React.FunctionComponent<StepProps> = ({
   policy,
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
index c6ae5f0aac11d..c45e49e86db70 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
@@ -20,7 +20,7 @@ import {
 
 import { SlmPolicyPayload } from '../../../../../common/types';
 import { TIME_UNITS } from '../../../../../common/constants';
-import { StepProps } from './';
+import { StepProps } from '.';
 import { textService } from '../../../services/text';
 import { useCore } from '../../../app_context';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx
index f6de83c6b586f..1f744f05d3627 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { serializePolicy } from '../../../../../common/lib';
 import { useServices } from '../../../app_context';
-import { StepProps } from './';
+import { StepProps } from '.';
 import { CollapsibleIndicesList } from '../../collapsible_lists';
 
 export const PolicyStepReview: React.FunctionComponent<StepProps> = ({
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
index 1abccc789c678..7b74ef05aa0fc 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { SlmPolicyPayload } from '../../../../../../common/types';
-import { StepProps } from '../';
+import { StepProps } from '..';
 
 import { IndicesAndDataStreamsField } from './fields';
 import { useCore } from '../../../../app_context';
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
index 75cf590dfcc94..fc35e05f9b1cc 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
@@ -31,7 +31,7 @@ import { SectionError, Error } from '../../../shared_imports';
 import { useLoadRepositoryTypes } from '../../services/http';
 import { textService } from '../../services/text';
 import { RepositoryValidation } from '../../services/validation';
-import { SectionLoading, RepositoryTypeLogo } from '../';
+import { SectionLoading, RepositoryTypeLogo } from '..';
 import { useCore } from '../../app_context';
 import { getRepositoryTypeDocUrl } from '../../lib/type_to_doc_url';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
index ca9cf20f06393..fa6ee6c91abf1 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
@@ -33,7 +33,7 @@ import { useCore, useServices } from '../../../../app_context';
 import { orderDataStreamsAndIndices } from '../../../lib';
 import { DataStreamBadge } from '../../../data_stream_badge';
 
-import { StepProps } from '../index';
+import { StepProps } from '..';
 
 import { DataStreamsGlobalStateCallOut } from './data_streams_global_state_call_out';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx
index 039cac124d9d3..6ee119a2da62e 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx
@@ -25,7 +25,7 @@ import {
 import { serializeRestoreSettings } from '../../../../../common/lib';
 import { EuiCodeEditor } from '../../../../shared_imports';
 import { useServices } from '../../../app_context';
-import { StepProps } from './';
+import { StepProps } from '.';
 import { CollapsibleIndicesList } from '../../collapsible_lists/collapsible_indices_list';
 
 export const RestoreSnapshotStepReview: React.FunctionComponent<StepProps> = ({
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
index c56af689efb28..46ad27e9a997b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
@@ -25,7 +25,7 @@ import { RestoreSettings } from '../../../../../common/types';
 import { EuiCodeEditor } from '../../../../shared_imports';
 import { REMOVE_INDEX_SETTINGS_SUGGESTIONS } from '../../../constants';
 import { useCore, useServices } from '../../../app_context';
-import { StepProps } from './';
+import { StepProps } from '.';
 
 export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = ({
   restoreSettings,
diff --git a/x-pack/plugins/snapshot_restore/public/application/index.tsx b/x-pack/plugins/snapshot_restore/public/application/index.tsx
index 69b4b2dab1b34..733fe14298e0d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/index.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { App } from './app';
 import { AppProviders } from './app_providers';
diff --git a/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts b/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts
index b04c14bd73c25..df949a01f4fb5 100644
--- a/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { RepositoryType } from '../../../common/types';
 import { REPOSITORY_TYPES } from '../../../common';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts b/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts
index 327328de30f82..352e7c37f7ee2 100644
--- a/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { i18n } from '@kbn/i18n';
 
 import { ClientConfigType } from '../types';
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
index 408587f6465a0..0a283ebab6f61 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
@@ -26,7 +26,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { SlmPolicy } from '../../../../../../common/types';
 import { useServices } from '../../../../app_context';
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx
index 4dff022b82ff0..aee603d5d7f6d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx
@@ -21,14 +21,13 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SlmPolicy } from '../../../../../../../common/types';
 import { EuiCodeEditor } from '../../../../../../shared_imports';
 import { FormattedDateTime } from '../../../../../components';
 import { linkToSnapshot } from '../../../../../services/navigation';
 import { useServices } from '../../../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policy: SlmPolicy;
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx
index 22277ca6e50dd..8482eb4520460 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx
@@ -22,13 +22,12 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SlmPolicy } from '../../../../../../../common/types';
 import { useServices } from '../../../../../app_context';
 import { FormattedDateTime, CollapsibleIndicesList } from '../../../../../components';
 import { linkToSnapshots, linkToRepository } from '../../../../../services/navigation';
 
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policy: SlmPolicy;
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
index c2a8449a2bc94..943f429174dcd 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiPageContent, EuiEmptyPrompt, EuiButton, EuiCallOut, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import {
   PageLoading,
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx
index c1d05dfaa450c..84b674099269e 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx
@@ -21,6 +21,7 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SlmPolicy } from '../../../../../../common/types';
 import { UseRequestResponse } from '../../../../../shared_imports';
 import { UIM_POLICY_SHOW_DETAILS_CLICK } from '../../../../constants';
@@ -32,8 +33,6 @@ import {
 } from '../../../../components';
 import { linkToAddPolicy, linkToEditPolicy } from '../../../../services/navigation';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policies: SlmPolicy[];
   reload: UseRequestResponse['resendRequest'];
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx
index 6e6a84c1d3159..19a76b37e351b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx
@@ -25,6 +25,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SectionError, Error } from '../../../../../shared_imports';
 
 import { useCore, useServices } from '../../../../app_context';
@@ -50,7 +51,6 @@ import {
 } from '../../../../components';
 import { TypeDetails } from './type_details';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { getRepositoryTypeDocUrl } from '../../../../lib/type_to_doc_url';
 
 interface Props {
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
index 80cf2751143b2..38c7c00aac1f7 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiPageContent, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { Repository } from '../../../../../common/types';
 import { PageLoading, PageError, Error, useExecutionContext } from '../../../../shared_imports';
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx
index e19a5b7845805..abfd7e6f1b624 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx
@@ -16,6 +16,7 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { REPOSITORY_TYPES } from '../../../../../../common';
 import { Repository, RepositoryType } from '../../../../../../common/types';
 import { UseRequestResponse } from '../../../../../shared_imports';
@@ -25,8 +26,6 @@ import { useServices } from '../../../../app_context';
 import { textService } from '../../../../services/text';
 import { linkToEditRepository, linkToAddRepository } from '../../../../services/navigation';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   repositories: Repository[];
   managedRepository?: string;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx
index 3fde88bf3ca40..3ce492031b866 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx
@@ -20,6 +20,7 @@ import {
   EuiLoadingSpinner,
   EuiLink,
 } from '@elastic/eui';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { APP_RESTORE_INDEX_PRIVILEGES } from '../../../../../common';
 import {
   WithPrivileges,
@@ -35,8 +36,6 @@ import { linkToSnapshots } from '../../../services/navigation';
 import { useAppContext, useServices } from '../../../app_context';
 import { RestoreTable } from './restore_table';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
-
 const ONE_SECOND_MS = 1000;
 const TEN_SECONDS_MS = 10 * 1000;
 const THIRTY_SECONDS_MS = 30 * 1000;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
index 1b4bf28169044..cbf9903c83f4b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
@@ -23,6 +23,7 @@ import {
 import React, { Fragment, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SnapshotDetails as ISnapshotDetails } from '../../../../../../common/types';
 import { SectionError, Error } from '../../../../../shared_imports';
 import { SectionLoading, SnapshotDeleteProvider } from '../../../../components';
@@ -36,8 +37,6 @@ import { useLoadSnapshot } from '../../../../services/http';
 import { linkToRepository, linkToRestoreSnapshot } from '../../../../services/navigation';
 import { TabSummary, TabFailures } from './tabs';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   repositoryName: string;
   snapshotId: string;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx
index 56317533a3f5a..c633b6cf886d0 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx
@@ -17,6 +17,7 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SnapshotDetails } from '../../../../../../../common/types';
 import { SNAPSHOT_STATE } from '../../../../../constants';
 import {
@@ -29,8 +30,6 @@ import { linkToPolicy } from '../../../../../services/navigation';
 import { SnapshotState } from './snapshot_state';
 import { useServices } from '../../../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   snapshotDetails: SnapshotDetails;
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts b/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts
index b7c4f1565b9d1..401fd07f2cc4d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 export class HttpService {
   private client: HttpSetup | undefined;
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts b/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts
index c02d0f053f783..7ce0f9259cca4 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchQuery } from 'kibana/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../../common';
 import { UIM_SNAPSHOT_DELETE, UIM_SNAPSHOT_DELETE_MANY } from '../../constants';
 import { SnapshotListParams } from '../../lib';
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts b/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts
index dce93baa45769..139ea2b5378c8 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ManagementAppMountParams } from '../../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { textService } from '../text';
 import {
   linkToHome,
@@ -13,7 +13,7 @@ import {
   linkToRepositories,
   linkToPolicies,
   linkToRestoreStatus,
-} from './';
+} from '.';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts b/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts
index 1aa26b393bd84..5788fc73147ec 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts
@@ -7,7 +7,7 @@
 
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { UsageCollectionSetup } from '../../../../../../../src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export class UiMetricService {
   private usageCollection: UsageCollectionSetup | undefined;
diff --git a/x-pack/plugins/snapshot_restore/public/index.ts b/x-pack/plugins/snapshot_restore/public/index.ts
index 1248073af5527..da221bf9ce937 100644
--- a/x-pack/plugins/snapshot_restore/public/index.ts
+++ b/x-pack/plugins/snapshot_restore/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import './application/index.scss';
 import { SnapshotRestoreUIPlugin } from './plugin';
diff --git a/x-pack/plugins/snapshot_restore/public/locator.ts b/x-pack/plugins/snapshot_restore/public/locator.ts
index fac7d389d8e96..a1a732d327448 100644
--- a/x-pack/plugins/snapshot_restore/public/locator.ts
+++ b/x-pack/plugins/snapshot_restore/public/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 import { linkToSnapshots } from './application/services/navigation';
 import { PLUGIN } from '../common/constants';
 
diff --git a/x-pack/plugins/snapshot_restore/public/plugin.ts b/x-pack/plugins/snapshot_restore/public/plugin.ts
index 0351716fad5b5..1f2c31168d7ba 100644
--- a/x-pack/plugins/snapshot_restore/public/plugin.ts
+++ b/x-pack/plugins/snapshot_restore/public/plugin.ts
@@ -6,14 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, PluginInitializerContext } from 'src/core/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { ManagementSetup } from 'src/plugins/management/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 import { PLUGIN } from '../common/constants';
 
@@ -83,7 +80,7 @@ export class SnapshotRestoreUIPlugin {
           icon: 'storage',
           path: '/app/management/data/snapshot_restore',
           showOnHomePage: true,
-          category: FeatureCatalogueCategory.ADMIN,
+          category: 'admin',
           order: 630,
         });
       }
@@ -97,5 +94,6 @@ export class SnapshotRestoreUIPlugin {
   }
 
   public start() {}
+
   public stop() {}
 }
diff --git a/x-pack/plugins/snapshot_restore/public/shared_imports.ts b/x-pack/plugins/snapshot_restore/public/shared_imports.ts
index 21792338caece..dae759b818ced 100644
--- a/x-pack/plugins/snapshot_restore/public/shared_imports.ts
+++ b/x-pack/plugins/snapshot_restore/public/shared_imports.ts
@@ -12,7 +12,7 @@ export type {
   SendRequestResponse,
   UseRequestResponse,
   UseRequestConfig,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   AuthorizationProvider,
@@ -26,12 +26,12 @@ export {
   useRequest,
   WithPrivileges,
   EuiCodeEditor,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export {
   reactRouterNavigate,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/snapshot_restore/server/config.ts b/x-pack/plugins/snapshot_restore/server/config.ts
index cc430f4756610..d259b6674391a 100644
--- a/x-pack/plugins/snapshot_restore/server/config.ts
+++ b/x-pack/plugins/snapshot_restore/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/snapshot_restore/server/index.ts b/x-pack/plugins/snapshot_restore/server/index.ts
index 1e9d2b55aa20b..1375cec6846fe 100644
--- a/x-pack/plugins/snapshot_restore/server/index.ts
+++ b/x-pack/plugins/snapshot_restore/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SnapshotRestoreServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts b/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts
index 0e2f90fe50449..fe684cee8e911 100644
--- a/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts
+++ b/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 // Cloud has its own system for managing SLM policies and we want to make
 // this clear when Snapshot and Restore is used in a Cloud deployment.
diff --git a/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts b/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts
index c9ea3cdfffe12..464f90bed9e64 100644
--- a/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts
+++ b/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 // Cloud has its own system for managing snapshots and we want to make
 // this clear when Snapshot and Restore is used in a Cloud deployment.
diff --git a/x-pack/plugins/snapshot_restore/server/plugin.ts b/x-pack/plugins/snapshot_restore/server/plugin.ts
index d737807ec8dad..b07570b32f48a 100644
--- a/x-pack/plugins/snapshot_restore/server/plugin.ts
+++ b/x-pack/plugins/snapshot_restore/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN, APP_REQUIRED_CLUSTER_PRIVILEGES } from '../common';
 import { License } from './services';
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/app.ts b/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
index 7a91cb8dc6848..702a7633f7cc7 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Privileges } from '../../../../../../src/plugins/es_ui_shared/common';
+import { Privileges } from '@kbn/es-ui-shared-plugin/common';
 
 import {
   APP_REQUIRED_CLUSTER_PRIVILEGES,
@@ -32,7 +32,7 @@ export function registerAppRoutes({
   router.get(
     { path: addBasePath('privileges'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const privilegesResult: Privileges = {
         hasAllPrivileges: true,
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/policy.ts b/x-pack/plugins/snapshot_restore/server/routes/api/policy.ts
index 57cb81ca13b9b..8068c64ec77b6 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/policy.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/policy.ts
@@ -23,7 +23,7 @@ export function registerPolicyRoutes({
   router.get(
     { path: addBasePath('policies'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const managedPolicies = await getManagedPolicyNames(clusterClient.asCurrentUser);
 
@@ -53,7 +53,7 @@ export function registerPolicyRoutes({
   router.get(
     { path: addBasePath('policy/{name}'), validate: { params: nameParameterSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
 
       try {
@@ -80,7 +80,7 @@ export function registerPolicyRoutes({
   router.post(
     { path: addBasePath('policies'), validate: { body: policySchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const policy = req.body as TypeOf<typeof policySchema>;
       const { name } = policy;
@@ -120,7 +120,7 @@ export function registerPolicyRoutes({
       validate: { params: nameParameterSchema, body: policySchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
       const policy = req.body as TypeOf<typeof policySchema>;
 
@@ -147,7 +147,7 @@ export function registerPolicyRoutes({
   router.delete(
     { path: addBasePath('policies/{name}'), validate: { params: nameParameterSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
       const policyNames = name.split(',');
 
@@ -178,7 +178,7 @@ export function registerPolicyRoutes({
   router.post(
     { path: addBasePath('policy/{name}/run'), validate: { params: nameParameterSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
 
       try {
@@ -197,7 +197,7 @@ export function registerPolicyRoutes({
   router.get(
     { path: addBasePath('policies/indices'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       try {
         const response = await clusterClient.asCurrentUser.indices.resolveIndex({
@@ -227,7 +227,7 @@ export function registerPolicyRoutes({
   router.get(
     { path: addBasePath('policies/retention_settings'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { persistent, transient, defaults } =
         await clusterClient.asCurrentUser.cluster.getSettings({
           filter_path: '**.slm.retention*',
@@ -257,7 +257,7 @@ export function registerPolicyRoutes({
       validate: { body: retentionSettingsSchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { retentionSchedule } = req.body as TypeOf<typeof retentionSettingsSchema>;
 
       try {
@@ -282,7 +282,7 @@ export function registerPolicyRoutes({
   router.post(
     { path: addBasePath('policies/retention'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const response = await clusterClient.asCurrentUser.slm.executeRetention();
       return res.ok({ body: response });
     })
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/repositories.ts b/x-pack/plugins/snapshot_restore/server/routes/api/repositories.ts
index 4666870133f1f..4e86de4036d53 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/repositories.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/repositories.ts
@@ -43,7 +43,7 @@ export function registerRepositoriesRoutes({
   router.get(
     { path: addBasePath('repositories'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const managedRepositoryName = await getManagedRepositoryName(clusterClient.asCurrentUser);
 
       let repositoryNames: string[] | undefined;
@@ -102,7 +102,7 @@ export function registerRepositoriesRoutes({
   router.get(
     { path: addBasePath('repositories/{name}'), validate: { params: nameParameterSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
 
       const managedRepository = await getManagedRepositoryName(clusterClient.asCurrentUser);
@@ -157,7 +157,7 @@ export function registerRepositoriesRoutes({
   router.get(
     { path: addBasePath('repository_types'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       // module repo types are available everywhere out of the box
       // on-prem repo types are not available on Cloud
       const types: RepositoryType[] = isCloudEnabled
@@ -198,7 +198,7 @@ export function registerRepositoriesRoutes({
       validate: { params: nameParameterSchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
 
       try {
@@ -232,7 +232,7 @@ export function registerRepositoriesRoutes({
       validate: { params: nameParameterSchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
 
       try {
@@ -274,7 +274,7 @@ export function registerRepositoriesRoutes({
   router.put(
     { path: addBasePath('repositories'), validate: { body: repositorySchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name = '', type = '', settings = {} } = req.body as TypeOf<typeof repositorySchema>;
 
       // Check that repository with the same name doesn't already exist
@@ -313,7 +313,7 @@ export function registerRepositoriesRoutes({
       validate: { body: repositorySchema, params: nameParameterSchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
       const { type = '', settings = {} } = req.body as TypeOf<typeof repositorySchema>;
 
@@ -345,7 +345,7 @@ export function registerRepositoriesRoutes({
   router.delete(
     { path: addBasePath('repositories/{name}'), validate: { params: nameParameterSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { name } = req.params as TypeOf<typeof nameParameterSchema>;
       const repositoryNames = name.split(',');
 
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/restore.ts b/x-pack/plugins/snapshot_restore/server/routes/api/restore.ts
index ea688273781ed..e97a64f26a123 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/restore.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/restore.ts
@@ -24,7 +24,7 @@ export function registerRestoreRoutes({
   router.get(
     { path: addBasePath('restores'), validate: false },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       try {
         const snapshotRestores: SnapshotRestore[] = [];
@@ -99,7 +99,7 @@ export function registerRestoreRoutes({
       validate: { body: restoreSettingsSchema, params: restoreParamsSchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { repository, snapshot } = req.params as TypeOf<typeof restoreParamsSchema>;
       const restoreSettings = req.body as TypeOf<typeof restoreSettingsSchema>;
 
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/snapshots.ts b/x-pack/plugins/snapshot_restore/server/routes/api/snapshots.ts
index 7425ad0c272c6..c486180424da5 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/snapshots.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/snapshots.ts
@@ -47,7 +47,7 @@ export function registerSnapshotsRoutes({
   router.get(
     { path: addBasePath('snapshots'), validate: { query: snapshotListSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const sortField =
         sortFieldToESParams[(req.query as TypeOf<typeof snapshotListSchema>).sortField];
       const sortDirection = (req.query as TypeOf<typeof snapshotListSchema>).sortDirection;
@@ -176,7 +176,7 @@ export function registerSnapshotsRoutes({
       validate: { params: getOneParamsSchema },
     },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
       const { repository, snapshot } = req.params as TypeOf<typeof getOneParamsSchema>;
       const managedRepository = await getManagedRepositoryName(clusterClient.asCurrentUser);
 
@@ -232,7 +232,7 @@ export function registerSnapshotsRoutes({
   router.post(
     { path: addBasePath('snapshots/bulk_delete'), validate: { body: deleteSchema } },
     license.guardApiRoute(async (ctx, req, res) => {
-      const { client: clusterClient } = ctx.core.elasticsearch;
+      const { client: clusterClient } = (await ctx.core).elasticsearch;
 
       const response: {
         itemsDeleted: Array<{ snapshot: string; repository: string }>;
diff --git a/x-pack/plugins/snapshot_restore/server/services/license.ts b/x-pack/plugins/snapshot_restore/server/services/license.ts
index e209edcd899b4..e84ce13767a7e 100644
--- a/x-pack/plugins/snapshot_restore/server/services/license.ts
+++ b/x-pack/plugins/snapshot_restore/server/services/license.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
-import { LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/snapshot_restore/server/shared_imports.ts b/x-pack/plugins/snapshot_restore/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/snapshot_restore/server/shared_imports.ts
+++ b/x-pack/plugins/snapshot_restore/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts b/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts
index efd0ebd0fd1c4..0d7e0c4ddefa3 100644
--- a/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts
+++ b/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { IRouter } from 'src/core/server';
+import type { IRouter } from '@kbn/core/server';
 import { get } from 'lodash';
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type RequestHandler = (...params: any[]) => any;
 
diff --git a/x-pack/plugins/snapshot_restore/server/types.ts b/x-pack/plugins/snapshot_restore/server/types.ts
index 8c2ad74865e45..d5710bb39d4c9 100644
--- a/x-pack/plugins/snapshot_restore/server/types.ts
+++ b/x-pack/plugins/snapshot_restore/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext, IScopedClusterClient } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { CloudSetup } from '../../cloud/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import type { IRouter, CustomRequestHandlerContext, IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { License } from './services';
 import { wrapEsError } from './lib';
 import { handleEsError } from './shared_imports';
@@ -63,6 +63,6 @@ export interface SnapshotRestoreContext {
 /**
  * @internal
  */
-export interface SnapshotRestoreRequestHandlerContext extends RequestHandlerContext {
+export type SnapshotRestoreRequestHandlerContext = CustomRequestHandlerContext<{
   snapshotRestore: SnapshotRestoreContext;
-}
+}>;
diff --git a/x-pack/plugins/spaces/common/licensing/license_service.test.ts b/x-pack/plugins/spaces/common/licensing/license_service.test.ts
index 3d87588bc7497..24895697dab6b 100644
--- a/x-pack/plugins/spaces/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/spaces/common/licensing/license_service.test.ts
@@ -7,9 +7,10 @@
 
 import { of } from 'rxjs';
 
-import { licenseMock } from '../../../licensing/common/licensing.mock';
-import type { LicenseType } from '../../../licensing/common/types';
-import { LICENSE_TYPE } from '../../../licensing/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import type { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/common/types';
+
 import { SpacesLicenseService } from './license_service';
 
 describe('license#isEnabled', function () {
diff --git a/x-pack/plugins/spaces/common/licensing/license_service.ts b/x-pack/plugins/spaces/common/licensing/license_service.ts
index 0836c87613db7..57dffe61b3ae6 100644
--- a/x-pack/plugins/spaces/common/licensing/license_service.ts
+++ b/x-pack/plugins/spaces/common/licensing/license_service.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { ILicense } from '../../../licensing/common/types';
+import type { ILicense } from '@kbn/licensing-plugin/common/types';
 
 export interface SpacesLicense {
   isEnabled(): boolean;
diff --git a/x-pack/plugins/spaces/kibana.json b/x-pack/plugins/spaces/kibana.json
index 090e5d0894480..5d7dcae231d3a 100644
--- a/x-pack/plugins/spaces/kibana.json
+++ b/x-pack/plugins/spaces/kibana.json
@@ -20,7 +20,6 @@
   "extraPublicDirs": ["common"],
   "requiredBundles": [
     "esUiShared",
-    "kibanaReact",
-    "home"
+    "kibanaReact"
   ]
 }
diff --git a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
index 28b630efe0b44..6b547bfc9bbf4 100644
--- a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
+++ b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { advancedSettingsMock } from 'src/plugins/advanced_settings/public/mocks';
+import { advancedSettingsMock } from '@kbn/advanced-settings-plugin/public/mocks';
 
 import { AdvancedSettingsService } from './advanced_settings_service';
 
diff --git a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
index 28d64e41fcbe4..52e308d71c8fd 100644
--- a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
+++ b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import type { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
+import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public';
 
 import type { Space } from '../../common';
 import { AdvancedSettingsSubtitle, AdvancedSettingsTitle } from './components';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
index 858fddaf4698b..d00ae8349e62c 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
@@ -10,8 +10,8 @@ import Boom from '@hapi/boom';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Space } from '../../../common';
 import { getSpacesContextProviderWrapper } from '../../spaces_context';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx
index ab63ceb7d6b29..b4d3ec634b8f3 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx
@@ -259,7 +259,7 @@ export const CopyToSpaceFlyoutInternal = (props: CopyToSpaceFlyoutProps) => {
               <h2>
                 <FormattedMessage
                   id="xpack.spaces.management.copyToSpaceFlyoutHeader"
-                  defaultMessage="Copy to space"
+                  defaultMessage="Copy to spaces"
                 />
               </h2>
             </EuiTitle>
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index d58490a86b7f5..51701df4d3689 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -20,11 +20,11 @@ import {
 import moment from 'moment';
 import React, { Fragment } from 'react';
 
-import { i18n } from '@kbn/i18n';
 import type {
   SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportConflictError,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
 
 import type { SpacesDataEntry } from '../../types';
 import type { SummarizedCopyToSpaceResult } from '../lib';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts
index cf402b0dd4ec2..061900f2b1777 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts
@@ -14,7 +14,7 @@ import type {
   SavedObjectsImportSuccess,
   SavedObjectsImportUnknownError,
   SavedObjectsImportUnsupportedTypeError,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 export interface FailedImport {
   obj: Omit<SavedObjectsImportFailure, 'error'>;
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts
index 298b89050b637..faa1d1f4c6871 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FailedImport, ProcessedImportResponse } from '../lib';
+import type { FailedImport, ProcessedImportResponse } from '.';
 import type { CopyToSpaceSavedObjectTarget } from '../types';
 import { summarizeCopyResult } from './summarize_copy_result';
 
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts
index 206952774ff9a..260fee29bf37a 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts
@@ -8,9 +8,9 @@
 import type {
   SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportConflictError,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
-import type { FailedImport, ProcessedImportResponse } from '../lib';
+import type { FailedImport, ProcessedImportResponse } from '.';
 import type { CopyToSpaceSavedObjectTarget } from '../types';
 
 export interface SummarizedSavedObjectResult {
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
index 732d779c6f616..43ff6d20c66b4 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from 'src/core/public';
+import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from '@kbn/core/public';
 
 export interface CopyOptions {
   includeRelated: boolean;
diff --git a/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts b/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
index 86b2f0d3ac7fe..886f648cb8274 100644
--- a/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
+++ b/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
+import type { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
 import { i18n } from '@kbn/i18n';
-import type { FeatureCatalogueEntry } from 'src/plugins/home/public';
 
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 import { getSpacesFeatureDescription } from './constants';
 
 export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
@@ -21,6 +20,6 @@ export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
     icon: 'spacesApp',
     path: '/app/management/kibana/spaces',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
   };
 };
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx
index 913d8cf6710e5..e6ac998d3f175 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx
@@ -16,9 +16,9 @@ import {
 import React, { useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { StartServicesAccessor } from 'src/core/public';
 
 import type { PluginsStart } from '../../plugin';
 import type { SpacesManager } from '../../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx
index 5f4f1f845717a..d09e78f1d8213 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx
@@ -10,8 +10,8 @@ import { act } from '@testing-library/react';
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { LegacyUrlConflictInternal } from './legacy_url_conflict_internal';
 
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
index 71bcafe2b07fc..91c1de5367282 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
@@ -19,9 +19,9 @@ import React, { useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { first } from 'rxjs/operators';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { StartServicesAccessor } from 'src/core/public';
 
 import { DEFAULT_OBJECT_NOUN } from '../../constants';
 import type { PluginsStart } from '../../plugin';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts
index 4b117cabaeaed..5063288fc8d53 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts
@@ -7,7 +7,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { createRedirectLegacyUrl } from './redirect_legacy_url';
 
diff --git a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
index 5918e678d9bf6..521889e790391 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
@@ -7,8 +7,8 @@
 
 import { first } from 'rxjs/operators';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { StartServicesAccessor } from 'src/core/public';
 
 import { DEFAULT_OBJECT_NOUN } from '../constants';
 import type { PluginsStart } from '../plugin';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/types.ts b/x-pack/plugins/spaces/public/legacy_urls/types.ts
index 9c6f8518107b0..da78792bcf35a 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/types.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsResolveResponse } from 'src/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
 
 /**
  * Properties for the LegacyUrlConflict component.
diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
index 00596d665d138..a04f175366705 100644
--- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
+++ b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
@@ -13,8 +13,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Space } from '../../../../common';
 import type { SpacesManager } from '../../../spaces_manager';
 
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
index d3f95cadc051f..42a4f2f46832e 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { notificationServiceMock } from 'src/core/public/mocks';
 
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index ab1a40a2ee261..1395867d724d0 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -9,9 +9,9 @@ import type { EuiButtonIconProps } from '@elastic/eui';
 import { EuiButton, EuiButtonIcon } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { Space } from '../../../common';
 import type { SpacesManager } from '../../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
index 5283cfe8ad1a3..27e5dfa8d4137 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
@@ -8,10 +8,10 @@
 import type { EuiCheckboxProps } from '@elastic/eui';
 import React from 'react';
 
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { DEFAULT_APP_CATEGORIES } from 'src/core/public';
 
-import type { KibanaFeatureConfig } from '../../../../../features/public';
 import { EnabledFeatures } from './enabled_features';
 
 const features: KibanaFeatureConfig[] = [
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 7acca89fe5d2b..07a848e523f10 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -9,11 +9,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from
 import type { FunctionComponent } from 'react';
 import React from 'react';
 
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import type { KibanaFeatureConfig } from '../../../../../features/public';
 import type { Space } from '../../../../common';
 import { SectionPanel } from '../section_panel';
 import { FeatureTable } from './feature_table';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
index 2371a97370b53..bc4b586c6cd1d 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
@@ -23,10 +23,10 @@ import _ from 'lodash';
 import type { ChangeEvent, ReactElement } from 'react';
 import React, { Component } from 'react';
 
+import type { AppCategory } from '@kbn/core/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
 import { i18n } from '@kbn/i18n';
-import type { AppCategory } from 'src/core/public';
 
-import type { KibanaFeatureConfig } from '../../../../../features/public';
 import type { Space } from '../../../../common';
 import { getEnabledFeatures } from '../../lib/feature_utils';
 
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index 55672e9896ea3..071f02e6d3114 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -11,12 +11,12 @@ import { waitFor } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import { notificationServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/public';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { DEFAULT_APP_CATEGORIES } from 'src/core/public';
-import { notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
 
-import { KibanaFeature } from '../../../../features/public';
-import { featuresPluginMock } from '../../../../features/public/mocks';
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index 1920aee6c439b..80c99a33f2a10 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -20,12 +20,12 @@ import {
 import { difference } from 'lodash';
 import React, { Component } from 'react';
 
+import type { Capabilities, NotificationsStart, ScopedHistory } from '@kbn/core/public';
+import { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
+import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { Capabilities, NotificationsStart, ScopedHistory } from 'src/core/public';
 
-import { SectionLoading } from '../../../../../../src/plugins/es_ui_shared/public';
-import type { FeaturesPluginStart, KibanaFeature } from '../../../../features/public';
 import type { Space } from '../../../common';
 import { isReservedSpace } from '../../../common';
 import { getSpacesFeatureDescription } from '../../constants';
diff --git a/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts b/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts
index 83a06c8a4b733..6adba1705ac57 100644
--- a/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts
+++ b/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../features/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
+
 import { getEnabledFeatures } from './feature_utils';
 
 const buildFeatures = () =>
diff --git a/x-pack/plugins/spaces/public/management/lib/feature_utils.ts b/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
index 7598e18d6680c..932792fa7791b 100644
--- a/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
+++ b/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../features/common';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+
 import type { Space } from '../../../common';
 
 export function getEnabledFeatures(features: KibanaFeatureConfig[], space: Partial<Space>) {
diff --git a/x-pack/plugins/spaces/public/management/management_service.test.ts b/x-pack/plugins/spaces/public/management/management_service.test.ts
index d13dee0f4e3c7..7942ad162b147 100644
--- a/x-pack/plugins/spaces/public/management/management_service.test.ts
+++ b/x-pack/plugins/spaces/public/management/management_service.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import type { ManagementSection } from 'src/plugins/management/public';
-import { managementPluginMock } from 'src/plugins/management/public/mocks';
+import type { CoreSetup } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import type { ManagementSection } from '@kbn/management-plugin/public';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
 
 import type { PluginsStart } from '../plugin';
 import { spacesManagerMock } from '../spaces_manager/mocks';
diff --git a/x-pack/plugins/spaces/public/management/management_service.tsx b/x-pack/plugins/spaces/public/management/management_service.tsx
index e7446a01076d1..91e0ffaca281d 100644
--- a/x-pack/plugins/spaces/public/management/management_service.tsx
+++ b/x-pack/plugins/spaces/public/management/management_service.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { StartServicesAccessor } from 'src/core/public';
-import type { ManagementApp, ManagementSetup } from 'src/plugins/management/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import type { ManagementApp, ManagementSetup } from '@kbn/management-plugin/public';
 
 import type { PluginsStart } from '../plugin';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
index ea970d97d3674..2f765505e8e45 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
@@ -8,11 +8,15 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import {
+  httpServiceMock,
+  notificationServiceMock,
+  scopedHistoryMock,
+} from '@kbn/core/public/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/public';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { httpServiceMock, notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
 
-import { KibanaFeature } from '../../../../features/public';
-import { featuresPluginMock } from '../../../../features/public/mocks';
 import { SpaceAvatarInternal } from '../../space_avatar/space_avatar_internal';
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index c65530e773148..5d5897f3120d7 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -18,17 +18,17 @@ import {
 } from '@elastic/eui';
 import React, { Component, lazy, Suspense } from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import type {
   ApplicationStart,
   Capabilities,
   NotificationsStart,
   ScopedHistory,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
-import { reactRouterNavigate } from '../../../../../../src/plugins/kibana_react/public';
-import type { FeaturesPluginStart, KibanaFeature } from '../../../../features/public';
 import type { Space } from '../../../common';
 import { isReservedSpace } from '../../../common';
 import { DEFAULT_SPACE_ID } from '../../../common/constants';
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
index 5a8390e391584..685016be5fae5 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
@@ -18,9 +18,9 @@ jest.mock('./edit_space', () => ({
   },
 }));
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
 
-import { featuresPluginMock } from '../../../features/public/mocks';
 import type { PluginsStart } from '../plugin';
 import { spacesManagerMock } from '../spaces_manager/mocks';
 import { spacesManagementApp } from './spaces_management_app';
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
index 30a724ba504b3..b79dbe24e9335 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
@@ -9,16 +9,16 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Route, Router, Switch, useParams } from 'react-router-dom';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
-
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
+
 import type { Space } from '../../common';
 import type { PluginsStart } from '../plugin';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx b/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
index e48a685e926f0..aba453ba4aef8 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
@@ -9,8 +9,8 @@ import { EuiButton } from '@elastic/eui';
 import type { CSSProperties } from 'react';
 import React, { Component } from 'react';
 
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ApplicationStart, Capabilities } from 'src/core/public';
 
 interface Props {
   isDisabled?: boolean;
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx
index 4f7e47b6b7bbe..0292c414e9638 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx
@@ -11,7 +11,7 @@ import { EuiContextMenuPanel, EuiText } from '@elastic/eui';
 import type { FC } from 'react';
 import React from 'react';
 
-import type { ApplicationStart, Capabilities } from 'src/core/public';
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 
 import { getSpacesFeatureDescription } from '../../constants';
 import { ManageSpacesButton } from './manage_spaces_button';
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
index 9a88b3c2db169..36ba0f0bb93b1 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
@@ -18,9 +18,9 @@ import {
 import type { ReactElement } from 'react';
 import React, { Component, lazy, Suspense } from 'react';
 
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 import type { InjectedIntl } from '@kbn/i18n-react';
 import { FormattedMessage, injectI18n } from '@kbn/i18n-react';
-import type { ApplicationStart, Capabilities } from 'src/core/public';
 
 import type { Space } from '../../../common';
 import { addSpaceIdToPath, ENTER_SPACE_PATH, SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common';
diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control.tsx
index 1afb6c9244f35..cf12634ae188e 100644
--- a/x-pack/plugins/spaces/public/nav_control/nav_control.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/nav_control.tsx
@@ -9,9 +9,9 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 import type { SpacesManager } from '../spaces_manager';
 
 export function initSpacesNavControl(spacesManager: SpacesManager, core: CoreStart) {
diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
index d4e7ffe510c8f..953c40e946364 100644
--- a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -10,7 +10,7 @@ import { EuiHeaderSectionItemButton, EuiLoadingSpinner, EuiPopover } from '@elas
 import React, { Component, lazy, Suspense } from 'react';
 import type { Subscription } from 'rxjs';
 
-import type { ApplicationStart, Capabilities } from 'src/core/public';
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 
 import type { Space } from '../../common';
 import { getSpaceAvatarComponent } from '../space_avatar';
diff --git a/x-pack/plugins/spaces/public/plugin.test.ts b/x-pack/plugins/spaces/public/plugin.test.ts
index 43b701c48b2c2..4a2526ad89fd3 100644
--- a/x-pack/plugins/spaces/public/plugin.test.ts
+++ b/x-pack/plugins/spaces/public/plugin.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
-import { advancedSettingsMock } from 'src/plugins/advanced_settings/public/mocks';
-import { homePluginMock } from 'src/plugins/home/public/mocks';
+import { advancedSettingsMock } from '@kbn/advanced-settings-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
 import {
   createManagementSectionMock,
   managementPluginMock,
-} from 'src/plugins/management/public/mocks';
+} from '@kbn/management-plugin/public/mocks';
 
 import { SpacesPlugin } from './plugin';
 
diff --git a/x-pack/plugins/spaces/public/plugin.tsx b/x-pack/plugins/spaces/public/plugin.tsx
index 782cb3ba708a3..827543d112ab8 100644
--- a/x-pack/plugins/spaces/public/plugin.tsx
+++ b/x-pack/plugins/spaces/public/plugin.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import type { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { ManagementSetup, ManagementStart } from 'src/plugins/management/public';
+import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public';
+import type { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
 
-import type { FeaturesPluginStart } from '../../features/public';
 import { AdvancedSettingsService } from './advanced_settings';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
 import { ManagementService } from './management';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
index bfd0594f3afa0..c7328718e9f50 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
@@ -8,8 +8,8 @@
 import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
 import React from 'react';
 
+import type { ApplicationStart } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ApplicationStart } from 'src/core/public';
 
 interface Props {
   application: ApplicationStart;
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx
index 89a5d5700bd44..d5f8f26fbfe97 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx
@@ -8,8 +8,8 @@
 import { EuiHorizontalRule, EuiText } from '@elastic/eui';
 import React, { useMemo } from 'react';
 
+import type { SavedObjectReferenceWithContext } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { SavedObjectReferenceWithContext } from 'src/core/public';
 
 import type { ShareToSpaceSavedObjectTarget } from '../types';
 
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
index 849a8a7805185..0be5795cb9454 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -43,6 +43,7 @@ interface Props {
   onChange: (selectedSpaceIds: string[]) => void;
   enableCreateNewSpaceLink: boolean;
   enableSpaceAgnosticBehavior: boolean;
+  prohibitedSpaces: Set<string>;
 }
 
 type SpaceOption = EuiSelectableOption & { ['data-space-id']: string };
@@ -73,6 +74,18 @@ const APPEND_CANNOT_DESELECT = (
     type="iInCircle"
   />
 );
+const APPEND_PROHIBITED = (
+  <EuiIconTip
+    title={i18n.translate('xpack.spaces.shareToSpace.prohibitedSpaceTooltipTitle', {
+      defaultMessage: 'Cannot share to this space',
+    })}
+    content={i18n.translate('xpack.spaces.shareToSpace.prohibitedSpaceTooltip', {
+      defaultMessage: 'A copy of this saved object exists in this space.',
+    })}
+    position="left"
+    type="iInCircle"
+  />
+);
 const APPEND_FEATURE_IS_DISABLED = (
   <EuiIconTip
     content={i18n.translate('xpack.spaces.shareToSpace.featureIsDisabledTooltip', {
@@ -85,8 +98,14 @@ const APPEND_FEATURE_IS_DISABLED = (
 );
 
 export const SelectableSpacesControl = (props: Props) => {
-  const { spaces, shareOptions, onChange, enableCreateNewSpaceLink, enableSpaceAgnosticBehavior } =
-    props;
+  const {
+    spaces,
+    shareOptions,
+    onChange,
+    enableCreateNewSpaceLink,
+    enableSpaceAgnosticBehavior,
+    prohibitedSpaces,
+  } = props;
   const { services } = useSpaces();
   const { application, docLinks } = services;
   const { selectedSpaceIds, initiallySelectedSpaceIds } = shareOptions;
@@ -108,7 +127,8 @@ export const SelectableSpacesControl = (props: Props) => {
         space,
         activeSpaceId,
         checked,
-        isGlobalControlChecked
+        isGlobalControlChecked,
+        prohibitedSpaces
       );
       return {
         label: space.name,
@@ -246,7 +266,8 @@ function getAdditionalProps(
   space: SpacesDataEntry,
   activeSpaceId: string | false,
   checked: boolean,
-  isGlobalControlChecked: boolean
+  isGlobalControlChecked: boolean,
+  prohibitedSpaces: Set<string>
 ) {
   if (space.id === activeSpaceId) {
     return {
@@ -267,6 +288,18 @@ function getAdditionalProps(
       disabled: true,
     };
   }
+  if (prohibitedSpaces.has(space.id) || prohibitedSpaces.has(ALL_SPACES_ID)) {
+    return {
+      append: (
+        <>
+          {APPEND_PROHIBITED}
+          {space.isFeatureDisabled ? APPEND_FEATURE_IS_DISABLED : null}
+        </>
+      ),
+      ...(space.isFeatureDisabled && { isAvatarDisabled: true }),
+      disabled: true,
+    };
+  }
   if (space.isFeatureDisabled) {
     return {
       append: APPEND_FEATURE_IS_DISABLED,
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx
index 0e8992ea6a3df..319b8a0c98a9c 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx
@@ -16,6 +16,7 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
+import type { ReactNode } from 'react';
 import React from 'react';
 
 import { i18n } from '@kbn/i18n';
@@ -35,6 +36,7 @@ interface Props {
   onChange: (selectedSpaceIds: string[]) => void;
   enableCreateNewSpaceLink: boolean;
   enableSpaceAgnosticBehavior: boolean;
+  prohibitedSpaces: Set<string>;
 }
 
 const buttonGroupLegend = i18n.translate(
@@ -54,9 +56,30 @@ const shareToExplicitSpacesButtonLabel = i18n.translate(
   { defaultMessage: 'Select spaces' }
 );
 
-const cannotChangeTooltip = i18n.translate(
-  'xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.cannotChangeTooltip',
-  { defaultMessage: 'You need additional privileges to change this option.' }
+const CANNOT_CHANGE_TOOLTIP = (
+  <EuiIconTip
+    content={i18n.translate(
+      'xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.cannotChangeTooltip',
+      { defaultMessage: 'You need additional privileges to change this option.' }
+    )}
+    position="left"
+    type="iInCircle"
+  />
+);
+
+const ALL_SPACES_PROHIBITED_TOOLTIP = (
+  <EuiIconTip
+    title={i18n.translate(
+      'xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.allSpacesProhibitedTooltipTitle',
+      { defaultMessage: 'Cannot share to all spaces' }
+    )}
+    content={i18n.translate(
+      'xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.allSpacesProhibitedTooltipContent',
+      { defaultMessage: 'A copy of this saved object exists in at least one other space.' }
+    )}
+    position="left"
+    type="iInCircle"
+  />
 );
 
 export const ShareModeControl = (props: Props) => {
@@ -68,6 +91,7 @@ export const ShareModeControl = (props: Props) => {
     onChange,
     enableCreateNewSpaceLink,
     enableSpaceAgnosticBehavior,
+    prohibitedSpaces,
   } = props;
   const { services } = useSpaces();
   const { docLinks } = services;
@@ -120,6 +144,14 @@ export const ShareModeControl = (props: Props) => {
     );
   };
 
+  const isGlobalControlChangeProhibited = prohibitedSpaces.size > 0 && !isGlobalControlChecked;
+  let globalControlTooltip: ReactNode = null;
+  if (!canShareToAllSpaces) {
+    globalControlTooltip = CANNOT_CHANGE_TOOLTIP;
+  } else if (isGlobalControlChangeProhibited) {
+    globalControlTooltip = ALL_SPACES_PROHIBITED_TOOLTIP;
+  }
+
   return (
     <>
       {getPrivilegeWarning()}
@@ -141,7 +173,7 @@ export const ShareModeControl = (props: Props) => {
         legend={buttonGroupLegend}
         color="success"
         isFullWidth={true}
-        isDisabled={!canShareToAllSpaces}
+        isDisabled={!canShareToAllSpaces || isGlobalControlChangeProhibited}
       />
 
       <EuiSpacer size="s" />
@@ -173,11 +205,7 @@ export const ShareModeControl = (props: Props) => {
                   )}
             </EuiText>
           </EuiFlexItem>
-          {!canShareToAllSpaces && (
-            <EuiFlexItem grow={false}>
-              <EuiIconTip content={cannotChangeTooltip} position="left" type="iInCircle" />
-            </EuiFlexItem>
-          )}
+          {globalControlTooltip && <EuiFlexItem grow={false}>{globalControlTooltip}</EuiFlexItem>}
         </EuiFlexGroup>
       </EuiFlexItem>
 
@@ -190,6 +218,7 @@ export const ShareModeControl = (props: Props) => {
           onChange={onChange}
           enableCreateNewSpaceLink={enableCreateNewSpaceLink}
           enableSpaceAgnosticBehavior={enableSpaceAgnosticBehavior}
+          prohibitedSpaces={prohibitedSpaces}
         />
       </EuiFlexGroup>
     </>
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx
index 174aa0f204439..8d0ac4c27c642 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx
@@ -11,9 +11,9 @@ import { act } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import type { SavedObjectReferenceWithContext } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { SavedObjectReferenceWithContext } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Space } from '../../../common';
 import { ALL_SPACES_ID } from '../../../common/constants';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx
index 71bbae4aa3178..157b684e2c993 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx
@@ -23,9 +23,9 @@ import {
 } from '@elastic/eui';
 import React, { lazy, Suspense, useEffect, useMemo, useState } from 'react';
 
+import type { SavedObjectReferenceWithContext, ToastsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { SavedObjectReferenceWithContext, ToastsStart } from 'src/core/public';
 
 import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../../common/constants';
 import { DEFAULT_OBJECT_NOUN } from '../../constants';
@@ -43,6 +43,14 @@ import { RelativesFooter } from './relatives_footer';
 import { ShareToSpaceForm } from './share_to_space_form';
 import type { InternalLegacyUrlAliasTarget } from './types';
 
+interface SpacesState {
+  isLoading: boolean;
+  spaces: SpacesDataEntry[];
+  referenceGraph: SavedObjectReferenceWithContext[];
+  aliasTargets: InternalLegacyUrlAliasTarget[];
+  prohibitedSpaces: Set<string>; // Any spaces that we cannot share this object to because another object with a matching origin exists there
+}
+
 // No need to wrap LazyCopyToSpaceFlyout in an error boundary, because the ShareToSpaceFlyoutInternal component itself is only ever used in
 // a lazy-loaded fashion with an error boundary.
 const LazyCopyToSpaceFlyout = lazy(() =>
@@ -143,7 +151,7 @@ export const ShareToSpaceFlyoutInternal = (props: ShareToSpaceFlyoutProps) => {
   const {
     flyoutIcon,
     flyoutTitle = i18n.translate('xpack.spaces.shareToSpace.flyoutTitle', {
-      defaultMessage: 'Assign {objectNoun} to spaces',
+      defaultMessage: 'Share {objectNoun} to spaces',
       values: { objectNoun: savedObjectTarget.noun },
     }),
     enableCreateCopyCallout = false,
@@ -166,12 +174,14 @@ export const ShareToSpaceFlyoutInternal = (props: ShareToSpaceFlyoutProps) => {
   const [canShareToAllSpaces, setCanShareToAllSpaces] = useState<boolean>(false);
   const [showMakeCopy, setShowMakeCopy] = useState<boolean>(false);
 
-  const [{ isLoading, spaces, referenceGraph, aliasTargets }, setSpacesState] = useState<{
-    isLoading: boolean;
-    spaces: SpacesDataEntry[];
-    referenceGraph: SavedObjectReferenceWithContext[];
-    aliasTargets: InternalLegacyUrlAliasTarget[];
-  }>({ isLoading: true, spaces: [], referenceGraph: [], aliasTargets: [] });
+  const [{ isLoading, spaces, referenceGraph, aliasTargets, prohibitedSpaces }, setSpacesState] =
+    useState<SpacesState>({
+      isLoading: true,
+      spaces: [],
+      referenceGraph: [],
+      aliasTargets: [],
+      prohibitedSpaces: new Set(),
+    });
   useEffect(() => {
     const { type, id } = savedObjectTarget;
     const getShareableReferences = spacesManager.getShareableReferences([{ type, id }]);
@@ -194,7 +204,7 @@ export const ShareToSpaceFlyoutInternal = (props: ShareToSpaceFlyoutProps) => {
           aliasTargets: shareableReferences.objects.reduce<InternalLegacyUrlAliasTarget[]>(
             (acc, x) => {
               for (const space of x.spacesWithMatchingAliases ?? []) {
-                if (space !== '?') {
+                if (space !== UNKNOWN_SPACE) {
                   const spaceExists = spacesData.spacesMap.has(space);
                   // If the user does not have privileges to view all spaces, they will be redacted; we cannot attempt to disable aliases for redacted spaces.
                   acc.push({ targetSpace: space, targetType: x.type, sourceId: x.id, spaceExists });
@@ -204,6 +214,20 @@ export const ShareToSpaceFlyoutInternal = (props: ShareToSpaceFlyoutProps) => {
             },
             []
           ),
+          prohibitedSpaces: shareableReferences.objects.reduce((acc, x) => {
+            // Whenever we detect that a space contains an object with a matching origin, *and* the list of currently selected spaces does
+            // not include it, then it is prohibited. That means the user cannot share the object to those spaces.
+            for (const space of x.spacesWithMatchingOrigins ?? []) {
+              if (
+                space !== UNKNOWN_SPACE &&
+                !selectedSpaceIds.includes(space) &&
+                space !== activeSpaceId
+              ) {
+                acc.add(space);
+              }
+            }
+            return acc;
+          }, new Set<string>()),
         });
       })
       .catch((e) => {
@@ -329,6 +353,7 @@ export const ShareToSpaceFlyoutInternal = (props: ShareToSpaceFlyoutProps) => {
           makeCopy={() => setShowMakeCopy(true)}
           enableCreateNewSpaceLink={enableCreateNewSpaceLink}
           enableSpaceAgnosticBehavior={enableSpaceAgnosticBehavior}
+          prohibitedSpaces={prohibitedSpaces}
         />
       );
     }
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
index 4d39a590d8603..e5391e3c87143 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
@@ -26,6 +26,7 @@ interface Props {
   makeCopy: () => void;
   enableCreateNewSpaceLink: boolean;
   enableSpaceAgnosticBehavior: boolean;
+  prohibitedSpaces: Set<string>;
 }
 
 export const ShareToSpaceForm = (props: Props) => {
@@ -39,6 +40,7 @@ export const ShareToSpaceForm = (props: Props) => {
     makeCopy,
     enableCreateNewSpaceLink,
     enableSpaceAgnosticBehavior,
+    prohibitedSpaces,
   } = props;
 
   const setSelectedSpaceIds = (selectedSpaceIds: string[]) =>
@@ -88,6 +90,7 @@ export const ShareToSpaceForm = (props: Props) => {
         onChange={(selection) => setSelectedSpaceIds(selection)}
         enableCreateNewSpaceLink={enableCreateNewSpaceLink}
         enableSpaceAgnosticBehavior={enableSpaceAgnosticBehavior}
+        prohibitedSpaces={prohibitedSpaces}
       />
     </>
   );
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
index 78bc23281e4c9..6ca7f86fd453c 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from 'src/core/public';
+import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from '@kbn/core/public';
 
 export interface ShareOptions {
   selectedSpaceIds: string[];
diff --git a/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx b/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx
index 118fac8cc9d0a..db753d7b57ce9 100644
--- a/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx
@@ -9,8 +9,8 @@ import { act } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Space } from '../../common';
 import { getSpacesContextProviderWrapper } from '../spaces_context';
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
index f785d5dbf3677..4d3a03852e49f 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
@@ -19,15 +19,12 @@ import {
 import React, { Component, Fragment } from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaPageTemplate, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaSolutionAvatar } from '@kbn/shared-ux-components';
-import type { AppMountParameters, CoreStart } from 'src/core/public';
 
-import {
-  KibanaPageTemplate,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
 import type { Space } from '../../common';
 import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../common/constants';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
index d6935e065815d..2ef3d9836bf3c 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
 import type { SpacesManager } from '../spaces_manager';
 
diff --git a/x-pack/plugins/spaces/public/spaces_context/context.tsx b/x-pack/plugins/spaces/public/spaces_context/context.tsx
index 639960c1724a5..820c993ccac59 100644
--- a/x-pack/plugins/spaces/public/spaces_context/context.tsx
+++ b/x-pack/plugins/spaces/public/spaces_context/context.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import type { SpacesManager } from '../spaces_manager';
 import type { SpacesData } from '../types';
diff --git a/x-pack/plugins/spaces/public/spaces_context/types.ts b/x-pack/plugins/spaces/public/spaces_context/types.ts
index d3a6859875b9c..1ca0985c1b62d 100644
--- a/x-pack/plugins/spaces/public/spaces_context/types.ts
+++ b/x-pack/plugins/spaces/public/spaces_context/types.ts
@@ -7,7 +7,7 @@
 
 import type * as React from 'react';
 
-import type { CoreStart, StartServicesAccessor } from 'src/core/public';
+import type { CoreStart, StartServicesAccessor } from '@kbn/core/public';
 
 import type { PluginsStart } from '../plugin';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx b/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx
index f0a263958c5eb..f316ff3001631 100644
--- a/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx
+++ b/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx
@@ -8,7 +8,7 @@
 import type { PropsWithChildren } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import type { ApplicationStart, DocLinksStart, NotificationsStart } from 'src/core/public';
+import type { ApplicationStart, DocLinksStart, NotificationsStart } from '@kbn/core/public';
 
 import type { GetAllSpacesPurpose } from '../../common';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
index f1e4b767b934c..bed49326efea5 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { SpacesManager } from './spaces_manager';
 
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
index 62f3a39a6b48b..540667931e49b 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -12,7 +12,7 @@ import { skipWhile } from 'rxjs/operators';
 import type {
   HttpSetup,
   SavedObjectsCollectMultiNamespaceReferencesResponse,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import type {
   GetAllSpacesOptions,
diff --git a/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx b/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx
index e2a1ce69deee8..4faea19df4e36 100644
--- a/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx
+++ b/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx
@@ -9,8 +9,8 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import type { PropsWithChildren } from 'react';
 import React, { Component, Suspense } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { NotificationsStart } from 'src/core/public';
 
 interface Props {
   notifications: NotificationsStart;
diff --git a/x-pack/plugins/spaces/public/ui_api/components.tsx b/x-pack/plugins/spaces/public/ui_api/components.tsx
index a0200adf01b48..c6623dfaf508b 100644
--- a/x-pack/plugins/spaces/public/ui_api/components.tsx
+++ b/x-pack/plugins/spaces/public/ui_api/components.tsx
@@ -8,7 +8,7 @@
 import type { FC, PropsWithChildren, PropsWithRef } from 'react';
 import React from 'react';
 
-import type { StartServicesAccessor } from 'src/core/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
 import { getCopyToSpaceFlyoutComponent } from '../copy_saved_objects_to_space';
 import { getEmbeddableLegacyUrlConflict, getLegacyUrlConflict } from '../legacy_urls';
diff --git a/x-pack/plugins/spaces/public/ui_api/index.ts b/x-pack/plugins/spaces/public/ui_api/index.ts
index a8c77dce6fdff..ad38a92784545 100644
--- a/x-pack/plugins/spaces/public/ui_api/index.ts
+++ b/x-pack/plugins/spaces/public/ui_api/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { StartServicesAccessor } from 'src/core/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
 import { createRedirectLegacyUrl } from '../legacy_urls';
 import type { PluginsStart } from '../plugin';
diff --git a/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx b/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx
index 384eee6c439c9..819ef2f17f94d 100644
--- a/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx
+++ b/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx
@@ -9,7 +9,7 @@ import type { FC, PropsWithChildren, PropsWithRef, ReactElement } from 'react';
 import React, { lazy, useMemo } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
-import type { StartServicesAccessor } from 'src/core/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
 import type { PluginsStart } from '../plugin';
 import { SuspenseErrorBoundary } from '../suspense_error_boundary';
diff --git a/x-pack/plugins/spaces/public/ui_api/types.ts b/x-pack/plugins/spaces/public/ui_api/types.ts
index 4fbba0c0af3e3..53161e9b5d540 100644
--- a/x-pack/plugins/spaces/public/ui_api/types.ts
+++ b/x-pack/plugins/spaces/public/ui_api/types.ts
@@ -7,7 +7,7 @@
 
 import type { ReactElement } from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import type { CopyToSpaceFlyoutProps } from '../copy_saved_objects_to_space';
 import type {
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
index 45c4d41112d7d..92c1c07622ac9 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { Capabilities, CoreSetup } from 'src/core/server';
-import { coreMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { Capabilities, CoreSetup } from '@kbn/core/server';
+import { coreMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 
-import type { KibanaFeature } from '../../../features/server';
-import { featuresPluginMock } from '../../../features/server/mocks';
 import type { Space } from '../../common';
 import type { PluginsStart } from '../plugin';
 import { spacesServiceMock } from '../spaces_service/spaces_service.mock';
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
index ac2ff735de797..4f2b61abc8025 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
@@ -7,9 +7,9 @@
 
 import _ from 'lodash';
 
-import type { Capabilities, CapabilitiesSwitcher, CoreSetup, Logger } from 'src/core/server';
+import type { Capabilities, CapabilitiesSwitcher, CoreSetup, Logger } from '@kbn/core/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 
-import type { KibanaFeature } from '../../../features/server';
 import type { Space } from '../../common';
 import type { PluginsStart } from '../plugin';
 import type { SpacesServiceStart } from '../spaces_service';
diff --git a/x-pack/plugins/spaces/server/capabilities/index.ts b/x-pack/plugins/spaces/server/capabilities/index.ts
index 4b23290bfd0ac..47f19b2d8b264 100644
--- a/x-pack/plugins/spaces/server/capabilities/index.ts
+++ b/x-pack/plugins/spaces/server/capabilities/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import type { PluginsStart } from '../plugin';
 import type { SpacesServiceStart } from '../spaces_service';
diff --git a/x-pack/plugins/spaces/server/config.ts b/x-pack/plugins/spaces/server/config.ts
index 7b4c85e3edcdc..980c034da9b61 100644
--- a/x-pack/plugins/spaces/server/config.ts
+++ b/x-pack/plugins/spaces/server/config.ts
@@ -9,7 +9,7 @@ import type { Observable } from 'rxjs';
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
-import type { PluginInitializerContext } from 'src/core/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 
 export const ConfigSchema = schema.object({
   maxSpaces: schema.number({ defaultValue: 1000 }),
diff --git a/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts b/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts
index 93c0ec3319d5c..25a98d09a2bb8 100644
--- a/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts
+++ b/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { createDefaultSpace } from './create_default_space';
 
diff --git a/x-pack/plugins/spaces/server/default_space/create_default_space.ts b/x-pack/plugins/spaces/server/default_space/create_default_space.ts
index a982feff59692..a7aee5a6d0ea1 100644
--- a/x-pack/plugins/spaces/server/default_space/create_default_space.ts
+++ b/x-pack/plugins/spaces/server/default_space/create_default_space.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { Logger, SavedObjectsRepository, SavedObjectsServiceStart } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { Logger, SavedObjectsRepository, SavedObjectsServiceStart } from 'src/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 
 interface Deps {
diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts
index 7e9ffae6751ac..5aaeb97ae76c4 100644
--- a/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts
+++ b/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts
@@ -7,14 +7,14 @@
 
 import * as Rx from 'rxjs';
 
+import type { CoreStatus, SavedObjectsRepository, ServiceStatusLevel } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers, ServiceStatusLevels } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { ILicense } from '@kbn/licensing-plugin/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
 import type { Writable } from '@kbn/utility-types';
-import type { CoreStatus, SavedObjectsRepository, ServiceStatusLevel } from 'src/core/server';
-import { SavedObjectsErrorHelpers, ServiceStatusLevels } from 'src/core/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
 
-import type { ILicense } from '../../../licensing/server';
-import { licensingMock } from '../../../licensing/server/mocks';
 import { SpacesLicenseService } from '../../common/licensing';
 import {
   DefaultSpaceService,
diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.ts
index f4418c0a5e358..8ba115e5d32f5 100644
--- a/x-pack/plugins/spaces/server/default_space/default_space_service.ts
+++ b/x-pack/plugins/spaces/server/default_space/default_space_service.ts
@@ -9,10 +9,10 @@ import type { Observable, ObservableInput, Subscription } from 'rxjs';
 import { BehaviorSubject, combineLatest, concat, defer, of, timer } from 'rxjs';
 import { catchError, mergeMap, switchMap, tap } from 'rxjs/operators';
 
-import type { CoreSetup, Logger, SavedObjectsServiceStart, ServiceStatus } from 'src/core/server';
+import type { CoreSetup, Logger, SavedObjectsServiceStart, ServiceStatus } from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
+import type { ILicense } from '@kbn/licensing-plugin/server';
 
-import { ServiceStatusLevels } from '../../../../../src/core/server';
-import type { ILicense } from '../../../licensing/server';
 import type { SpacesLicense } from '../../common/licensing';
 import { createDefaultSpace } from './create_default_space';
 
diff --git a/x-pack/plugins/spaces/server/index.ts b/x-pack/plugins/spaces/server/index.ts
index 6628d75a36494..bad6969f2a3a1 100644
--- a/x-pack/plugins/spaces/server/index.ts
+++ b/x-pack/plugins/spaces/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { SpacesPlugin } from './plugin';
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 24e6323cc9500..6335b95c1733d 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
@@ -11,14 +11,14 @@ import type {
   SavedObjectsExportByObjectOptions,
   SavedObjectsImportResponse,
   SavedObjectsImportSuccess,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { copySavedObjectsToSpacesFactory } from './copy_to_spaces';
 
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
index ed09c4d39d137..102e072d7c5d7 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
@@ -7,7 +7,7 @@
 
 import type { Readable } from 'stream';
 
-import type { CoreStart, KibanaRequest, SavedObject } from 'src/core/server';
+import type { CoreStart, KibanaRequest, SavedObject } from '@kbn/core/server';
 
 import { ALL_SPACES_ID } from '../../../common/constants';
 import { spaceIdToNamespace } from '../utils/namespace';
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts
index 4ef08381f2aee..91ea5f20b7eb7 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts
@@ -8,7 +8,7 @@
 import type { Payload } from '@hapi/boom';
 import Boom from '@hapi/boom';
 
-import type { SavedObjectsImportError } from 'src/core/server';
+import type { SavedObjectsImportError } from '@kbn/core/server';
 
 export const createEmptyFailureResponse = (errors?: Array<SavedObjectsImportError | Boom.Boom>) => {
   const errorMessages: Array<SavedObjectsImportError | Payload> = (errors || []).map((error) => {
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
index 80ff7a6b12ed1..ff21b0a5af84d 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectTypeRegistry } from 'src/core/server';
+import type { SavedObjectTypeRegistry } from '@kbn/core/server';
 
 /**
  * This function returns any importable/exportable saved object types that are namespace-agnostic. Even if these are eligible for
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts
index 83d10e5f1a27c..f548f5e2f6c99 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientProviderOptions } from 'src/core/server';
+import type { SavedObjectsClientProviderOptions } from '@kbn/core/server';
 
 export const COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS: SavedObjectsClientProviderOptions = {
   excludedWrappers: ['spaces'],
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 374892d018db9..14c08b876feda 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
@@ -12,14 +12,14 @@ import type {
   SavedObjectsImportResponse,
   SavedObjectsImportSuccess,
   SavedObjectsResolveImportErrorsOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { resolveCopySavedObjectsToSpacesConflictsFactory } from './resolve_copy_conflicts';
 
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
index 72a3921618ddc..42dbb0f2f3e2a 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
@@ -12,7 +12,7 @@ import type {
   KibanaRequest,
   SavedObject,
   SavedObjectsImportRetry,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { spaceIdToNamespace } from '../utils/namespace';
 import { createEmptyFailureResponse } from './lib/create_empty_failure_response';
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
index a6c5517743488..127b0c055ae95 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
@@ -12,7 +12,7 @@ import type {
   SavedObjectsImportFailure,
   SavedObjectsImportRetry,
   SavedObjectsImportSuccess,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 export interface CopyOptions {
   objects: Array<{ type: string; id: string }>;
diff --git a/x-pack/plugins/spaces/server/lib/errors.ts b/x-pack/plugins/spaces/server/lib/errors.ts
index 7e20fd72a9517..5d2c59055a1b4 100644
--- a/x-pack/plugins/spaces/server/lib/errors.ts
+++ b/x-pack/plugins/spaces/server/lib/errors.ts
@@ -7,7 +7,7 @@
 
 import { boomify, isBoom } from '@hapi/boom';
 
-import type { CustomHttpResponseOptions, ResponseError } from 'src/core/server';
+import type { CustomHttpResponseOptions, ResponseError } from '@kbn/core/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
   const boom = isBoom(error) ? error : boomify(error);
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 7cc7f67938d2e..f780ee704e319 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
@@ -8,14 +8,14 @@
 import Boom from '@hapi/boom';
 
 // @ts-ignore
+import type { CoreSetup, IBasePath, IRouter } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { kibanaTestUser } from '@kbn/test';
-import type { CoreSetup, IBasePath, IRouter } from 'src/core/server';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import type { KibanaFeature } from '../../../../features/server';
-import { featuresPluginMock } from '../../../../features/server/mocks';
 import { convertSavedObjectToSpace } from '../../routes/lib';
 import { spacesClientServiceMock } from '../../spaces_client/spaces_client_service.mock';
 import { SpacesService } from '../../spaces_service';
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
index f5b41786d2478..99f0bc8f1e5ce 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import type { Space } from '../../../common';
 import { addSpaceIdToPath } from '../../../common';
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
index abc960f7eab62..8e3eb5a555212 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
@@ -12,9 +12,9 @@ import type {
   IRouter,
   KibanaRequest,
   KibanaResponseFactory,
-} from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+} from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import { initSpacesOnRequestInterceptor } from './on_request_interceptor';
 
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts
index 19872e8470319..61d7ac23818ad 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts
@@ -10,7 +10,7 @@ import type {
   KibanaRequest,
   LifecycleResponseFactory,
   OnPreRoutingToolkit,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { getSpaceIdFromPath } from '../../../common';
 
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 a7bb34824096f..0c07a77468f6f 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { spacesClientServiceMock } from '../spaces_client/spaces_client_service.mock';
diff --git a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts
index 368e1b2cf5a2c..1d7ab6d6f2704 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../spaces_service/spaces_service';
 
diff --git a/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts b/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts
index 08435f338fa3a..e2985ded40284 100644
--- a/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts
@@ -7,7 +7,7 @@
 
 const mockNamespaceIdToString = jest.fn();
 const mockNamespaceStringToId = jest.fn();
-jest.mock('../../../../../../../src/core/server', () => ({
+jest.mock('@kbn/core/server', () => ({
   SavedObjectsUtils: {
     namespaceIdToString: mockNamespaceIdToString,
     namespaceStringToId: mockNamespaceStringToId,
diff --git a/x-pack/plugins/spaces/server/lib/utils/namespace.ts b/x-pack/plugins/spaces/server/lib/utils/namespace.ts
index e1c252597fb61..9422de22eea53 100644
--- a/x-pack/plugins/spaces/server/lib/utils/namespace.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/namespace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsUtils } from '../../../../../../src/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 /**
  * Converts a Space ID string to its namespace ID representation. Note that a Space ID string is equivalent to a namespace string.
diff --git a/x-pack/plugins/spaces/server/plugin.test.ts b/x-pack/plugins/spaces/server/plugin.test.ts
index c5732fc4045bb..024ae1e60100a 100644
--- a/x-pack/plugins/spaces/server/plugin.test.ts
+++ b/x-pack/plugins/spaces/server/plugin.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/server/mocks';
+import type { CoreSetup } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
-import { featuresPluginMock } from '../../features/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
 import type { PluginsStart } from './plugin';
 import { SpacesPlugin } from './plugin';
 
diff --git a/x-pack/plugins/spaces/server/plugin.ts b/x-pack/plugins/spaces/server/plugin.ts
index 6ed718ed3f301..ad73be5e5c19b 100644
--- a/x-pack/plugins/spaces/server/plugin.ts
+++ b/x-pack/plugins/spaces/server/plugin.ts
@@ -13,15 +13,15 @@ import type {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
-import type { HomeServerPluginSetup } from 'src/plugins/home/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-
+} from '@kbn/core/server';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../features/server';
-import type { LicensingPluginSetup } from '../../licensing/server';
+} from '@kbn/features-plugin/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+
 import { SpacesLicenseService } from '../common/licensing';
 import { setupCapabilities } from './capabilities';
 import type { ConfigType } from './config';
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts
index d48233a75c59c..d1e26143de906 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ISavedObjectsRepository } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 export const createMockSavedObjectsRepository = (spaces: any[] = []) => {
   const mockSavedObjectsClientContract = {
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
index be0b402364ecc..585e30b51f193 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { SavedObject, SavedObjectsUpdateResponse } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import type { SavedObject, SavedObjectsUpdateResponse } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   coreMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 export const createMockSavedObjectsService = (spaces: any[] = []) => {
   const typeRegistry = savedObjectsTypeRegistryMock.create();
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts
index 1d2cb6f37cfbe..d1044a6dd1a2a 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '@kbn/core/server';
 
 export const mockRouteContext = {
   licensing: {
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 f200017b620c4..876c9b772fddf 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
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
index 6815d19883d26..9b9a3488cc724 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
@@ -8,15 +8,15 @@
 import _ from 'lodash';
 
 import { schema } from '@kbn/config-schema';
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
+import type { ExternalRouteDeps } from '.';
 import {
   copySavedObjectsToSpacesFactory,
   resolveCopySavedObjectsToSpacesConflictsFactory,
 } from '../../../lib/copy_to_spaces';
 import { SPACE_ID_REGEX } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 type SavedObjectIdentifier = Pick<SavedObject, 'id' | 'type'>;
 
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 2ad392d48b2ae..95260615e86f4 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
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory, SavedObjectsErrorHelpers } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory, SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.ts
index 7d70cd1bb3664..b2f0d71d34a21 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.ts
@@ -8,11 +8,11 @@
 import Boom from '@hapi/boom';
 
 import { schema } from '@kbn/config-schema';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initDeleteSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, log, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts
index e475b6b21569a..b4fa5d677b255 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts
@@ -7,14 +7,14 @@
 
 import * as Rx from 'rxjs';
 
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts
index a14744ddc5eeb..ff523ea99c06b 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts
@@ -7,9 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initDisableLegacyUrlAliasesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getSpacesService, usageStatsServicePromise } = deps;
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 5ebe09444934b..818c748a97498 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
@@ -7,13 +7,13 @@
 
 import * as Rx from 'rxjs';
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get.ts b/x-pack/plugins/spaces/server/routes/api/external/get.ts
index 2cc0984b8ab93..a26cfe0211d16 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initGetSpaceApi(deps: ExternalRouteDeps) {
   const { externalRouter, getSpacesService } = deps;
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 e1d10ccd3cfe6..923d1668f59a6 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
@@ -8,13 +8,13 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
index 09a4ac5a843a6..06d629a194560 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
@@ -7,10 +7,10 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import type { Space } from '../../../../common';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initGetAllSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, log, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts
index 1100f767c33b8..5a1046579bfde 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts
@@ -7,14 +7,14 @@
 
 import * as Rx from 'rxjs';
 
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts
index a7afd38dcecb0..ec5b0ce82ece4 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts
@@ -7,9 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initGetShareableReferencesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getStartServices } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/index.ts b/x-pack/plugins/spaces/server/routes/api/external/index.ts
index c42e57dea736d..b4126e76a7110 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/index.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../../../spaces_service';
 import type { SpacesRouter } from '../../../types';
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 56104c247e23d..8107b6f341745 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
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.ts b/x-pack/plugins/spaces/server/routes/api/external/post.ts
index c2ea044741574..3ea6da647b4f2 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/post.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/post.ts
@@ -7,11 +7,12 @@
 
 import Boom from '@hapi/boom';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { spaceSchema } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initPostSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, log, getSpacesService } = deps;
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 760558572628a..5c82f0dd48ed9 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
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.ts b/x-pack/plugins/spaces/server/routes/api/external/put.ts
index 196f7c11932eb..fb9f818576580 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/put.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/put.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import type { ExternalRouteDeps } from '.';
 import type { Space } from '../../../../common';
 import { wrapError } from '../../../lib/errors';
 import { spaceSchema } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initPutSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts
index 06968c3bcb50e..0e7808dccfc1b 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts
index 4486d4b3ade09..ea95557514d52 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts
@@ -7,11 +7,11 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import { ALL_SPACES_ID } from '../../../../common/constants';
 import { wrapError } from '../../../lib/errors';
 import { SPACE_ID_REGEX } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initUpdateObjectsSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getStartServices } = deps;
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 2a0b3821f1e7f..6c239a7d0c9be 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
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock, httpServiceMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
 
 import { spacesClientServiceMock } from '../../../spaces_client/spaces_client_service.mock';
 import { SpacesService } from '../../../spaces_service';
diff --git a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts
index ba96620467376..feb6d8b59628b 100644
--- a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts
+++ b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { InternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { InternalRouteDeps } from './';
 
 export function initGetActiveSpaceApi(deps: InternalRouteDeps) {
   const { internalRouter, getSpacesService } = deps;
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 42d5719006e54..254130cc1c51b 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
@@ -5,24 +5,23 @@
  * 2.0.
  */
 
-import type { RequestHandler, RequestHandlerContext } from 'src/core/server';
-
-import type { LicensingApiRequestHandlerContext } from '../../../../licensing/server';
+import type { CustomRequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export const createLicensedRouteHandler = <
   P,
   Q,
   B,
-  Context extends RequestHandlerContext & { licensing: LicensingApiRequestHandlerContext }
+  Context extends CustomRequestHandlerContext<{ licensing: LicensingApiRequestHandlerContext }>
 >(
   handler: RequestHandler<P, Q, B, Context>
 ) => {
-  const licensedRouteHandler: RequestHandler<P, Q, B, Context> = (
+  const licensedRouteHandler: RequestHandler<P, Q, B, Context> = async (
     context,
     request,
     responseToolkit
   ) => {
-    const { license } = context.licensing;
+    const { license } = await context.licensing;
     const licenseCheck = license.check('spaces', 'basic');
     if (licenseCheck.state === 'unavailable' || licenseCheck.state === 'invalid') {
       return responseToolkit.forbidden({ body: { message: licenseCheck.message! } });
diff --git a/x-pack/plugins/spaces/server/routes/views/index.ts b/x-pack/plugins/spaces/server/routes/views/index.ts
index 18222f9122559..d0cff27e85433 100644
--- a/x-pack/plugins/spaces/server/routes/views/index.ts
+++ b/x-pack/plugins/spaces/server/routes/views/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpResources, IBasePath, Logger } from 'src/core/server';
+import type { HttpResources, IBasePath, Logger } from '@kbn/core/server';
 
 import { ENTER_SPACE_PATH } from '../../../common';
 import { wrapError } from '../../lib/errors';
@@ -26,7 +26,8 @@ export function initSpacesViewsRoutes(deps: ViewRouteDeps) {
     { path: ENTER_SPACE_PATH, validate: false },
     async (context, request, response) => {
       try {
-        const defaultRoute = await context.core.uiSettings.client.get<string>('defaultRoute');
+        const { uiSettings } = await context.core;
+        const defaultRoute = await uiSettings.client.get<string>('defaultRoute');
 
         const basePath = deps.basePath.get(request);
         const url = `${basePath}${defaultRoute}`;
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts
index c26983e84de57..28d4e42cfb9cf 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { Space } from '../../../common';
 
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts
index 3cece7dcbb553..c8beb16c4df08 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { UsageStats } from '../../usage_stats';
 import { migrateTo7141 } from './usage_stats_migrations';
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts
index 974b9ee1078b8..51f447b4f803b 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { UsageStats } from '../../usage_stats';
 
diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts
index c9050da88d1bb..4e2a12955d702 100644
--- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts
@@ -8,7 +8,7 @@
 import type {
   SavedObjectsClientWrapperFactory,
   SavedObjectsClientWrapperOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../spaces_service/spaces_service';
 import { SpacesSavedObjectsClient } from './spaces_saved_objects_client';
diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts
index 4cc94a6c39da5..27e632052dcb6 100644
--- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 import { spacesServiceMock } from '../spaces_service/spaces_service.mock';
 import { SPACES_USAGE_STATS_TYPE } from '../usage_stats';
diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts
index 2e2bad9ff0994..9a90a26a647d3 100644
--- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/server';
+import type { CoreSetup } from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../spaces_service';
 import { SPACES_USAGE_STATS_TYPE } from '../usage_stats';
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
index f52432786872e..0060039f6f2ca 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
@@ -7,9 +7,9 @@
 
 import Boom from '@hapi/boom';
 
-import type { SavedObject, SavedObjectsType } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
+import type { SavedObject, SavedObjectsType } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks';
 
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { spacesClientMock } from '../spaces_client/spaces_client.mock';
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
index 5149f8695284c..630a1baf2ef95 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
@@ -30,9 +30,9 @@ import type {
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
   SavedObjectsUpdateOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '../../../../../src/core/server';
 import { ALL_SPACES_ID } from '../../common/constants';
 import { spaceIdToNamespace } from '../lib/utils/namespace';
 import type { ISpacesClient } from '../spaces_client';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts
index 97a26447ad297..d18fe5d5ec3a9 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 import type { Space } from '../../common';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
index 86b2886d2461a..c1a51c5c52442 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 import type { GetAllSpacesPurpose } from '../../common';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
index 2bd51a13bc642..cfc001d570c8d 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
@@ -12,7 +12,7 @@ import type {
   ISavedObjectsPointInTimeFinder,
   ISavedObjectsRepository,
   SavedObject,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type {
   GetAllSpacesOptions,
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts
index 7ce9ea798c884..36a4438266239 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts
@@ -7,7 +7,7 @@
 
 import * as Rx from 'rxjs';
 
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import type { ConfigType } from '../config';
 import { spacesConfig } from '../lib/__fixtures__';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
index cf7766decc2dd..21b6de36dbd3f 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
@@ -12,7 +12,7 @@ import type {
   ISavedObjectsRepository,
   KibanaRequest,
   SavedObjectsServiceStart,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { ConfigType } from '../config';
 import type { ISpacesClient } from './spaces_client';
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 7b8fd40105bc4..cf7e27941508c 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
@@ -7,9 +7,9 @@
 
 import * as Rx from 'rxjs';
 
-import type { HttpServiceSetup, KibanaRequest, SavedObjectsRepository } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import type { HttpServiceSetup, KibanaRequest, SavedObjectsRepository } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { getSpaceIdFromPath } from '../../common/lib/spaces_url_parser';
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 36b9ed25fa541..4a2385cf746a6 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 @@
  * 2.0.
  */
 
-import type { IBasePath, KibanaRequest } from 'src/core/server';
+import type { IBasePath, KibanaRequest } from '@kbn/core/server';
 
 import type { Space } from '../../common';
 import { getSpaceIdFromPath } from '../../common';
diff --git a/x-pack/plugins/spaces/server/types.ts b/x-pack/plugins/spaces/server/types.ts
index 9fc70fedd30d0..267e7b51377a7 100644
--- a/x-pack/plugins/spaces/server/types.ts
+++ b/x-pack/plugins/spaces/server/types.ts
@@ -5,16 +5,15 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { CustomRequestHandlerContext, IRouter } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 /**
  * @internal
  */
-export interface SpacesRequestHandlerContext extends RequestHandlerContext {
+export type SpacesRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts
index 59c28034c321c..abf9af3f8afca 100644
--- a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts
+++ b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts
@@ -7,11 +7,11 @@
 
 import * as Rx from 'rxjs';
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
+import type { ILicense, LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 
-import { createCollectorFetchContextMock } from '../../../../../src/plugins/usage_collection/server/mocks';
-import type { KibanaFeature } from '../../../features/server';
-import type { ILicense, LicensingPluginSetup } from '../../../licensing/server';
 import type { PluginsSetup } from '../plugin';
 import type { UsageStats } from '../usage_stats';
 import { usageStatsClientMock } from '../usage_stats/usage_stats_client.mock';
diff --git a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
index 0463188631870..2cce7dc3c7bb8 100644
--- a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
+++ b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
@@ -7,11 +7,11 @@
 
 import { firstValueFrom } from 'rxjs';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type {
   CollectorFetchContext,
   UsageCollectionSetup,
-} from 'src/plugins/usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 import type { PluginsSetup } from '../plugin';
 import type { UsageStats, UsageStatsServiceSetup } from '../usage_stats';
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts
index aa3fa29e87ce1..db053f37770f0 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 import { SPACES_USAGE_STATS_ID, SPACES_USAGE_STATS_TYPE } from './constants';
 import type {
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts
index e73d6db948bb4..bb0f70ce4b002 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Headers, ISavedObjectsRepository } from 'src/core/server';
+import type { Headers, ISavedObjectsRepository } from '@kbn/core/server';
 
 import type { CopyOptions, ResolveConflictsOptions } from '../lib/copy_to_spaces/types';
 import { SPACES_USAGE_STATS_ID, SPACES_USAGE_STATS_TYPE } from './constants';
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts
index 5ea4d9ddd747c..6a365cb23787f 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { SPACES_USAGE_STATS_TYPE } from './constants';
 import { UsageStatsClient } from './usage_stats_client';
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts
index baf59cae2a638..cfcc1dffc2a36 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import { SPACES_USAGE_STATS_TYPE } from './constants';
 import { UsageStatsClient } from './usage_stats_client';
diff --git a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
index c3b59dbd1c557..de9e2a32e5c27 100644
--- a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
+++ b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ESSearchRequest } from '../../../../src/core/types/elasticsearch';
+import type { ESSearchRequest } from '@kbn/core/types/elasticsearch';
 
 interface BuildSortedEventsQueryOpts {
   aggs?: Record<string, estypes.AggregationsAggregationContainer>;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx
index 7b27167d5f5f9..d36c0016ca8d8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx
@@ -19,8 +19,8 @@ jest.mock('lodash', () => {
   };
 });
 
-jest.mock('../../../../triggers_actions_ui/public', () => {
-  const original = jest.requireActual('../../../../triggers_actions_ui/public');
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
   return {
     ...original,
     getIndexPatterns: () => {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx
index a8b9f3f56dd06..aad203016a065 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx
@@ -21,15 +21,15 @@ import {
   EuiPopoverTitle,
   EuiSelect,
 } from '@elastic/eui';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   firstFieldOption,
   getFields,
   getIndexOptions,
   getTimeFieldOptions,
   IErrorObject,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 
 interface KibanaDeps {
   http: HttpSetup;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts
index bd2de94ce1e96..bceb39ba08cf9 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { COMPARATORS } from '../../../../triggers_actions_ui/public';
+import { COMPARATORS } from '@kbn/triggers-actions-ui-plugin/public';
 
 export const DEFAULT_VALUES = {
   THRESHOLD_COMPARATOR: COMPARATORS.GREATER_THAN,
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
index e35706ce25710..828a4c4e952b8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
@@ -10,20 +10,21 @@ import 'brace';
 import { of } from 'rxjs';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   ISearchStart,
-} from 'src/plugins/data/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { EsQueryExpression } from './es_query_expression';
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public');
-jest.mock('../../../../../../../src/plugins/es_ui_shared/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public');
+jest.mock('@kbn/es-ui-shared-plugin/public', () => ({
   XJson: {
     useXJsonMode: jest.fn().mockReturnValue({
       convertToJson: jest.fn(),
@@ -43,8 +44,8 @@ jest.mock('../../../../../../../src/plugins/es_ui_shared/public', () => ({
     />
   ),
 }));
-jest.mock('../../../../../triggers_actions_ui/public', () => {
-  const original = jest.requireActual('../../../../../triggers_actions_ui/public');
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
   return {
     ...original,
     getIndexPatterns: () => {
@@ -99,6 +100,7 @@ const createDataPluginMock = () => {
 };
 
 const dataMock = createDataPluginMock();
+const dataViewMock = dataViewPluginMocks.createStartContract();
 const unifiedSearchMock = unifiedSearchPluginMock.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 
@@ -150,6 +152,7 @@ describe('EsQueryAlertTypeExpression', () => {
         setRuleProperty={() => {}}
         errors={errors}
         data={dataMock}
+        dataViews={dataViewMock}
         defaultActionGroupId=""
         actionGroups={[]}
         charts={chartsStartMock}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx
index c3091b136f795..10b774648d735 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx
@@ -24,20 +24,20 @@ import {
   EuiLink,
   EuiIconTip,
 } from '@elastic/eui';
-import { DocLinksStart, HttpSetup } from 'kibana/public';
+import { DocLinksStart, HttpSetup } from '@kbn/core/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { XJson, EuiCodeEditor } from '../../../../../../../src/plugins/es_ui_shared/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { XJson, EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   getFields,
   ValueExpression,
   RuleTypeParamsExpressionProps,
   ForLastExpression,
   ThresholdExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { validateExpression } from '../validation';
-import { parseDuration } from '../../../../../alerting/common';
 import { buildSortedEventsQuery } from '../../../../common/build_sorted_events_query';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { IndexSelectPopover } from '../../components/index_select_popover';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx
index 2c825cdc3c286..df44a8923183c 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import 'brace/theme/github';
 
 import { EuiSpacer, EuiCallOut } from '@elastic/eui';
-import { RuleTypeParamsExpressionProps } from '../../../../../triggers_actions_ui/public';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { EsQueryAlertParams } from '../types';
 import { SearchSourceExpression } from './search_source_expression';
 import { EsQueryExpression } from './es_query_expression';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
index 431f451c54f24..e753fee71d44b 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
@@ -9,11 +9,11 @@ import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { injectI18n } from '@kbn/i18n-react';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { getDisplayValueFromFilter } from '../../../../../../../src/plugins/data/public';
-import { Filter } from '../../../../../../../src/plugins/data/common';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { FilterItem } from '../../../../../../../src/plugins/unified_search/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { getDisplayValueFromFilter } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { FilterItem } from '@kbn/unified-search-plugin/public';
 
 const FilterItemComponent = injectI18n(FilterItem);
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
index 1751e52da3ce6..7041bba0fe2ff 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
@@ -7,12 +7,13 @@
 
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
-import { DataPublicPluginStart, ISearchStart } from 'src/plugins/data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { DataPublicPluginStart, ISearchStart } from '@kbn/data-plugin/public';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { SearchSourceExpression } from './search_source_expression';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { act } from 'react-dom/test-utils';
 import { EuiCallOut, EuiLoadingSpinner } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
@@ -21,6 +22,8 @@ const dataMock = dataPluginMock.createStartContract() as DataPublicPluginStart &
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   search: ISearchStart & { searchSource: { create: jest.MockedFunction<any> } };
 };
+
+const dataViewPluginMock = dataViewPluginMocks.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 const unifiedSearchMock = unifiedSearchPluginMock.createStartContract();
 
@@ -64,6 +67,7 @@ const setup = async (alertParams: EsQueryAlertParams<SearchType.searchSource>) =
       errors={errors}
       unifiedSearch={unifiedSearchMock}
       data={dataMock}
+      dataViews={dataViewPluginMock}
       defaultActionGroupId=""
       actionGroups={[]}
       charts={chartsStartMock}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx
index 2e99fa8e1356b..1d54609223aaf 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx
@@ -17,14 +17,14 @@ import {
   EuiCallOut,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Filter, ISearchSource } from '../../../../../../../src/plugins/data/common';
-import { EsQueryAlertParams, SearchType } from '../types';
+import { Filter, ISearchSource } from '@kbn/data-plugin/common';
 import {
   ForLastExpression,
   RuleTypeParamsExpressionProps,
   ThresholdExpression,
   ValueExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { EsQueryAlertParams, SearchType } from '../types';
 import { DEFAULT_VALUES } from '../constants';
 import { ReadOnlyFilterItems } from './read_only_filter_items';
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts
index 740bf10c04432..fe57801150526 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts
@@ -7,11 +7,11 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import { validateExpression } from './validation';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { EsQueryAlertParams, SearchType } from './types';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
-import { PluginSetupContract as AlertingSetup } from '../../../../alerting/public';
-import { SanitizedRule } from '../../../../alerting/common';
+import { validateExpression } from './validation';
 
 const PLUGIN_ID = 'discover';
 const ES_QUERY_ALERT_TYPE = '.es-query';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts
index 8b46dd6d57337..bccf6ed4ced43 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../../alerting/common';
-import { SerializedSearchSourceFields } from '../../../../../../src/plugins/data/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface Comparator {
   text: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts
index 4766ce68dba4a..914dd6a4f5f9f 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ValidationResult, builtInComparators } from '@kbn/triggers-actions-ui-plugin/public';
 import { EsQueryAlertParams } from './types';
-import { ValidationResult, builtInComparators } from '../../../../triggers_actions_ui/public';
 import { isSearchSourceAlert } from './util';
 
 export const validateExpression = (alertParams: EsQueryAlertParams): ValidationResult => {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts
index 19e58d8d1a22f..fad11da20940a 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts
@@ -7,9 +7,9 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { validateExpression } from './validation';
 import { GeoContainmentAlertParams } from './types';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
 
 export function getAlertType(): RuleTypeModel<GeoContainmentAlertParams> {
   return {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
index 1a44da5fdee58..f53b1bfab5982 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
@@ -8,16 +8,16 @@
 import React, { Fragment, FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
+import { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { ES_GEO_SHAPE_TYPES, GeoContainmentAlertParams } from '../../types';
 import { GeoIndexPatternSelect } from '../util_components/geo_index_pattern_select';
 import { SingleFieldSelect } from '../util_components/single_field_select';
 import { ExpressionWithPopover } from '../util_components/expression_with_popover';
-import { DataViewField, DataView } from '../../../../../../../../src/plugins/data/common';
 
 interface Props {
   ruleParams: GeoContainmentAlertParams;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx
index 3d816129a3ae6..322700209d4d2 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { EntityByExpression, getValidIndexPatternFields } from './entity_by_expression';
-import { DataViewField } from 'src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 const defaultProps = {
   errors: {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
index 9773009b2b52e..b0b02fe27f8ef 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
@@ -9,8 +9,8 @@ import React, { FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import { DataViewField } from 'src/plugins/data_views/public';
-import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import { SingleFieldSelect } from '../util_components/single_field_select';
 import { ExpressionWithPopover } from '../util_components/expression_with_popover';
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
index 8b189c59f2af9..10aba3123c2cc 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
@@ -9,19 +9,19 @@ import React, { Fragment, FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   IErrorObject,
   RuleTypeParamsExpressionProps,
-} from '../../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { ES_GEO_FIELD_TYPES } from '../../types';
 import { GeoIndexPatternSelect } from '../util_components/geo_index_pattern_select';
 import { SingleFieldSelect } from '../util_components/single_field_select';
 import { ExpressionWithPopover } from '../util_components/expression_with_popover';
-import { DataViewField, DataView } from '../../../../../../../../src/plugins/data/common';
 
 interface Props {
   dateField: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
index 4d8b2a7dcd936..5ef79b7379035 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
@@ -9,10 +9,10 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { EntityIndexExpression } from './expressions/entity_index_expression';
 import { BoundaryIndexExpression } from './expressions/boundary_index_expression';
-import { IErrorObject } from '../../../../../triggers_actions_ui/public';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 
 const dataStartMock = dataPluginMock.createStartContract();
 const unifiedSearchStartMock = unifiedSearchPluginMock.createStartContract();
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
index 5196834bc404b..e569bf7b93991 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
@@ -10,14 +10,14 @@ import { EuiCallOut, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { fromKueryExpression, luceneStringToDsl } from '@kbn/es-query';
-import { RuleTypeParamsExpressionProps } from '../../../../../triggers_actions_ui/public';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { GeoContainmentAlertParams } from '../types';
 import { EntityIndexExpression } from './expressions/entity_index_expression';
 import { EntityByExpression } from './expressions/entity_by_expression';
 import { BoundaryIndexExpression } from './expressions/boundary_index_expression';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import { Query } from '../../../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
 
 const DEFAULT_VALUES = {
   TRACKING_EVENT: '',
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx
index 0d2dc2c209562..01abe69d5f8c1 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { GeoIndexPatternSelect } from './geo_index_pattern_select';
-import { DataViewsContract } from 'src/plugins/data/public';
-import { HttpSetup } from 'kibana/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
 
 class MockIndexPatternSelectComponent extends React.Component {
   render() {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
index 735c0b9d8d97c..b2a235feb1a80 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
@@ -9,9 +9,9 @@ import React, { Component } from 'react';
 import { EuiCallOut, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataViewsContract } from 'src/plugins/data/public';
-import { HttpSetup } from 'kibana/public';
-import { DataView } from '../../../../../../../../src/plugins/data/common';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
+import { DataView } from '@kbn/data-plugin/common';
 
 interface Props {
   onChange: (indexPattern: DataView) => void;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx
index 84b68c4899a41..7783c943301f3 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx
@@ -15,7 +15,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { FieldIcon } from '@kbn/react-field';
-import { DataViewField } from 'src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 function fieldsToOptions(fields?: DataViewField[]): Array<EuiComboBoxOptionOption<DataViewField>> {
   if (!fields) {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts
index ccc94c8ac00f9..719a70858b341 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../../alerting/common';
-import { Query } from '../../../../../../src/plugins/data/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { Query } from '@kbn/data-plugin/common';
 
 export interface GeoContainmentAlertParams extends RuleTypeParams {
   index: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts
index 6c31b3ae157c9..71fd748ea5df1 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ValidationResult } from '../../../../triggers_actions_ui/public';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import { GeoContainmentAlertParams } from './types';
 
 export const validateExpression = (alertParams: GeoContainmentAlertParams): ValidationResult => {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/index.ts
index c0a0f7b6548cf..ff474ff9c6562 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { getAlertType as getGeoContainmentAlertType } from './geo_containment';
 import { getAlertType as getThresholdAlertType } from './threshold';
 import { getAlertType as getEsQueryAlertType } from './es_query';
 import { Config } from '../../common';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
-import { PluginSetupContract as AlertingSetup } from '../../../alerting/public';
 
 export function registerAlertTypes({
   ruleTypeRegistry,
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx
index d0aaa9b8fda52..6fb83aad7287d 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx
@@ -9,8 +9,9 @@ import React from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import IndexThresholdAlertTypeExpression, { DEFAULT_VALUES } from './expression';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { IndexThresholdAlertParams } from './types';
 import { validateExpression } from './validation';
 import {
@@ -18,10 +19,10 @@ import {
   builtInComparators,
   getTimeUnitLabel,
   TIME_UNITS,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 
-jest.mock('../../../../triggers_actions_ui/public', () => {
-  const original = jest.requireActual('../../../../triggers_actions_ui/public');
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
   return {
     ...original,
     getIndexPatterns: () => {
@@ -68,6 +69,7 @@ jest.mock('../../../../triggers_actions_ui/public', () => {
 });
 
 const dataMock = dataPluginMock.createStartContract();
+const dataViewMock = dataViewPluginMocks.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 
 describe('IndexThresholdAlertTypeExpression', () => {
@@ -95,6 +97,7 @@ describe('IndexThresholdAlertTypeExpression', () => {
         setRuleProperty={() => {}}
         errors={errors}
         data={dataMock}
+        dataViews={dataViewMock}
         defaultActionGroupId=""
         actionGroups={[]}
         charts={chartsStartMock}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
index 33855d94b6f15..de8b1ec484afc 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
@@ -9,8 +9,8 @@ import React, { useState, Fragment, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSpacer, EuiCallOut, EuiEmptyPrompt, EuiText, EuiTitle } from '@elastic/eui';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   getFields,
   COMPARATORS,
@@ -22,7 +22,7 @@ import {
   WhenExpression,
   builtInAggregationTypes,
   RuleTypeParamsExpressionProps,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { ThresholdVisualization } from './visualization';
 import { IndexThresholdAlertParams } from './types';
 import './expression.scss';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts
index 934525be66a14..f41856d7a5bc8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts
@@ -7,9 +7,9 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { validateExpression } from './validation';
 import { IndexThresholdAlertParams } from './types';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
 
 export function getAlertType(): RuleTypeModel<IndexThresholdAlertParams> {
   return {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts
index 6ec9087c40fee..a884d2230c2b9 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import { TimeSeriesResult } from '../../../../triggers_actions_ui/common';
+import { HttpSetup } from '@kbn/core/public';
+import { TimeSeriesResult } from '@kbn/triggers-actions-ui-plugin/common';
 import { IndexThresholdAlertParams } from './types';
 
 const INDEX_THRESHOLD_DATA_API_ROOT = '/api/triggers_actions_ui/data';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts
index ba6ca421173f5..ed6758e6d7326 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../../alerting/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 
 export interface Comparator {
   text: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts
index bd2b0c3c36d3c..a7f695094ce31 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexThresholdAlertParams } from './types';
 import {
   ValidationResult,
   builtInGroupByTypes,
   builtInAggregationTypes,
   builtInComparators,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { IndexThresholdAlertParams } from './types';
 
 export const validateExpression = (alertParams: IndexThresholdAlertParams): ValidationResult => {
   const {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx
index ed667b4940f29..643d6c79afc7d 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx
@@ -9,18 +9,18 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { ThresholdVisualization } from './visualization';
-import { DataPublicPluginStart } from 'src/plugins/data/public/types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { uiSettingsServiceMock } from 'src/core/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public/types';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import {
   builtInAggregationTypes,
   builtInComparators,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { Chart, LineAnnotation, LineSeries } from '@elastic/charts';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-jest.mock('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public');
 jest.mock('./index_threshold_api', () => ({
   getThresholdAlertVisualizationData: jest.fn(() =>
     Promise.resolve({
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx
index 9d7093c1603f2..e1d2ec285f39c 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { Fragment, useEffect, useState } from 'react';
-import { IUiSettingsClient, HttpSetup } from 'kibana/public';
+import { IUiSettingsClient, HttpSetup } from '@kbn/core/public';
 import { interval } from 'rxjs';
 import {
   AnnotationDomainType,
@@ -29,16 +29,16 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ChartsPluginSetup } from 'src/plugins/charts/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { AggregationType, Comparator } from '@kbn/triggers-actions-ui-plugin/public';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import {
   getThresholdAlertVisualizationData,
   GetThresholdAlertVisualizationDataParams,
 } from './index_threshold_api';
-import { AggregationType, Comparator } from '../../../../triggers_actions_ui/public';
 import { IndexThresholdAlertParams } from './types';
-import { parseDuration } from '../../../../alerting/common/parse_duration';
 
 const customTheme = () => {
   return {
diff --git a/x-pack/plugins/stack_alerts/public/index.ts b/x-pack/plugins/stack_alerts/public/index.ts
index d6a51e23ab139..f7dc42da7e50c 100644
--- a/x-pack/plugins/stack_alerts/public/index.ts
+++ b/x-pack/plugins/stack_alerts/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { StackAlertsPublicPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new StackAlertsPublicPlugin(ctx);
diff --git a/x-pack/plugins/stack_alerts/public/plugin.tsx b/x-pack/plugins/stack_alerts/public/plugin.tsx
index 8d004523558fb..b7a81e1b0f6bb 100644
--- a/x-pack/plugins/stack_alerts/public/plugin.tsx
+++ b/x-pack/plugins/stack_alerts/public/plugin.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { registerAlertTypes } from './alert_types';
 import { Config } from '../common';
-import { PluginSetupContract as AlertingSetup } from '../../alerting/public';
 
 export type Setup = void;
 export type Start = void;
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts
index 7e4e8bf831493..68367e5ec8104 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RuleExecutorOptions, AlertInstanceContext } from '../../../../alerting/server';
+import { RuleExecutorOptions, AlertInstanceContext } from '@kbn/alerting-plugin/server';
 import { OnlyEsQueryAlertParams, OnlySearchSourceAlertParams } from './types';
 
 // alert type context provided to actions
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts
index c59b24ddb6210..3fce895a2bfd1 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts
@@ -7,23 +7,23 @@
 
 import uuid from 'uuid';
 import type { Writable } from '@kbn/utility-types';
-import { RuleExecutorServices } from '../../../../alerting/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import {
   RuleExecutorServicesMock,
   alertsMock,
   AlertInstanceMock,
-} from '../../../../alerting/server/mocks';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+} from '@kbn/alerting-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getAlertType } from './alert_type';
 import { EsQueryAlertParams, EsQueryAlertState } from './alert_type_params';
 import { ActionContext } from './action_context';
-import { ESSearchResponse, ESSearchRequest } from '../../../../../../src/core/types/elasticsearch';
+import { ESSearchResponse, ESSearchRequest } from '@kbn/core/types/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
-import { coreMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { ActionGroupId, ConditionMetAlertInstanceId } from './constants';
 import { OnlyEsQueryAlertParams, OnlySearchSourceAlertParams } from './types';
-import { searchSourceInstanceMock } from 'src/plugins/data/common/search/search_source/mocks';
+import { searchSourceInstanceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { Comparator } from '../../../common/comparator_types';
 
 const logger = loggingSystemMock.create().get();
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts
index 86732a6803ee7..5b41d7c55fe0a 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger } from 'kibana/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { RuleType } from '../../types';
 import { ActionContext } from './action_context';
 import {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts
index 794e740c8cca6..f205fbd0327ce 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { validateTimeWindowUnits } from '../../../../triggers_actions_ui/server';
-import { RuleTypeState } from '../../../../alerting/server';
+import { validateTimeWindowUnits } from '@kbn/triggers-actions-ui-plugin/server';
+import { RuleTypeState } from '@kbn/alerting-plugin/server';
 import { Comparator } from '../../../common/comparator_types';
 import { ComparatorFnNames } from '../lib';
 import { getComparatorSchemaType } from '../lib/comparator';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts
index 175695aca5f4d..4f203b064592d 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts
@@ -6,10 +6,10 @@
  */
 import { sha256 } from 'js-sha256';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger } from 'kibana/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { parseDuration } from '@kbn/alerting-plugin/server';
 import { addMessages, EsQueryAlertActionContext } from './action_context';
 import { ComparatorFns, getHumanReadableComparator } from '../lib';
-import { parseDuration } from '../../../../alerting/server';
 import { ExecutorOptions, OnlyEsQueryAlertParams, OnlySearchSourceAlertParams } from './types';
 import { ActionGroupId, ConditionMetAlertInstanceId } from './constants';
 import { fetchEsQuery } from './lib/fetch_es_query';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts
index 99f9eb1795688..82f8297a85bb5 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { AlertingSetup } from '../../types';
 import { getAlertType } from './alert_type';
 
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts
index 519c392753c58..b4d74412b7f83 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { IScopedClusterClient, Logger } from 'kibana/server';
+import { IScopedClusterClient, Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { OnlyEsQueryAlertParams } from '../types';
 import { buildSortedEventsQuery } from '../../../../common/build_sorted_events_query';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts
index 1e6aac5dcb035..48082f565afb3 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { OnlySearchSourceAlertParams } from '../types';
-import { createSearchSourceMock } from 'src/plugins/data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { updateSearchSource } from './fetch_search_source_query';
-import { stubbedSavedObjectIndexPattern } from '../../../../../../../src/plugins/data_views/common/data_view.stub';
-import { DataView } from '../../../../../../../src/plugins/data_views/common';
-import { fieldFormatsMock } from '../../../../../../../src/plugins/field_formats/common/mocks';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { Comparator } from '../../../../common/comparator_types';
 
 const createDataView = () => {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts
index 490c6f81ec485..cff24f8975f0f 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import { buildRangeFilter, Filter } from '@kbn/es-query';
-import { Logger } from 'kibana/server';
-import { OnlySearchSourceAlertParams } from '../types';
+import { Logger } from '@kbn/core/server';
 import {
   getTime,
   ISearchSource,
   ISearchStartSearchSource,
   SortDirection,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
+import { OnlySearchSourceAlertParams } from '../types';
 
 export async function fetchSearchSourceQuery(
   alertId: string,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts
index 9a4d83630f21e..29bb7ad544804 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { OnlyEsQueryAlertParams } from '../types';
-import { parseDuration } from '../../../../../alerting/common';
 
 export function getSearchParams(queryParams: OnlyEsQueryAlertParams) {
   const date = Date.now();
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
index c65dc4d5745ea..0a76813881abf 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
@@ -7,9 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { Logger, SavedObjectReference } from 'src/core/server';
-import { STACK_ALERTS_FEATURE_ID } from '../../../common';
-import { getGeoContainmentExecutor } from './geo_containment';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import {
   RuleType,
   RuleTypeState,
@@ -17,8 +15,10 @@ import {
   AlertInstanceContext,
   RuleParamsAndRefs,
   RuleTypeParams,
-} from '../../../../alerting/server';
-import { Query } from '../../../../../../src/plugins/data/common/query';
+} from '@kbn/alerting-plugin/server';
+import { Query } from '@kbn/data-plugin/common/query';
+import { STACK_ALERTS_FEATURE_ID } from '../../../common';
+import { getGeoContainmentExecutor } from './geo_containment';
 
 export const ActionGroupId = 'Tracked entity contained';
 export const RecoveryActionGroupId = 'notGeoContained';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts
index 345c21d62c67a..9caec73ecb8c1 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
-import { Logger } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   fromKueryExpression,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
index 5d59c3cab0746..3b40cbc413bcf 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
@@ -6,10 +6,10 @@
  */
 
 import _ from 'lodash';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { executeEsQueryFactory, getShapesFilters, OTHER_CATEGORY } from './es_query_builder';
-import { RuleExecutorServices } from '../../../../alerting/server';
 import {
   ActionGroupId,
   GeoContainmentInstanceState,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts
index 195ffb97bd81f..072a01efc9749 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { AlertingSetup } from '../../types';
 import {
   GeoContainmentState,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts
index 9fc382240d0be..1f08564a4d668 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   getAlertType,
   injectEntityAndBoundaryIds,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts
index a5f8d0e064874..44bf9e06244f4 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts
@@ -6,8 +6,8 @@
  */
 
 import _ from 'lodash';
-import { loggingSystemMock, elasticsearchServiceMock } from 'src/core/server/mocks';
-import { RuleExecutorServicesMock, alertsMock } from '../../../../../alerting/server/mocks';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import sampleAggsJsonResponse from './es_sample_response.json';
 import sampleShapesJsonResponse from './es_sample_response_shapes.json';
 import sampleAggsJsonResponseWithNesting from './es_sample_response_with_nesting.json';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/index.ts
index 8ad10298f351b..93a3b679ab0f1 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { AlertingSetup, StackAlertsStartDeps } from '../types';
 import { register as registerIndexThreshold } from './index_threshold';
 import { register as registerGeoContainment } from './geo_containment';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts
index f75869d8e0db2..94e7f9b8501a4 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { RuleExecutorOptions, AlertInstanceContext } from '@kbn/alerting-plugin/server';
 import { Params } from './alert_type_params';
-import { RuleExecutorOptions, AlertInstanceContext } from '../../../../alerting/server';
 
 // alert type context provided to actions
 
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts
index 16117ed6fd507..1751fc6fc2344 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts
@@ -7,12 +7,12 @@
 
 import uuid from 'uuid';
 import type { Writable } from '@kbn/utility-types';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { RuleExecutorServices } from '../../../../alerting/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { getAlertType, ActionGroupId } from './alert_type';
 import { ActionContext } from './action_context';
 import { Params } from './alert_type_params';
-import { RuleExecutorServicesMock, alertsMock } from '../../../../alerting/server/mocks';
+import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { Comparator } from '../../../common/comparator_types';
 
 describe('alertType', () => {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts
index 9da47aa76e0c0..58d680794aedf 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
+import {
+  CoreQueryParamsSchemaProperties,
+  TimeSeriesQuery,
+} from '@kbn/triggers-actions-ui-plugin/server';
 import { RuleType, RuleExecutorOptions, StackAlertsStartDeps } from '../../types';
 import { Params, ParamsSchema } from './alert_type_params';
 import { ActionContext, BaseActionContext, addMessages } from './action_context';
 import { STACK_ALERTS_FEATURE_ID } from '../../../common';
-import {
-  CoreQueryParamsSchemaProperties,
-  TimeSeriesQuery,
-} from '../../../../triggers_actions_ui/server';
 import { ComparatorFns, getHumanReadableComparator } from '../lib';
 
 export const ID = '.index-threshold';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts
index bce50c59f038a..7bcf84db20a1f 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts
@@ -8,7 +8,7 @@
 import { ParamsSchema, Params } from './alert_type_params';
 import { ObjectType, TypeOf } from '@kbn/config-schema';
 import type { Writable } from '@kbn/utility-types';
-import { CoreQueryParams, MAX_GROUPS } from '../../../../triggers_actions_ui/server';
+import { CoreQueryParams, MAX_GROUPS } from '@kbn/triggers-actions-ui-plugin/server';
 import { Comparator } from '../../../common/comparator_types';
 
 const DefaultParams: Writable<Partial<Params>> = {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts
index a1a35db17edc6..5783b6a64ab83 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts
@@ -10,7 +10,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import {
   CoreQueryParamsSchemaProperties,
   validateCoreQueryBody,
-} from '../../../../triggers_actions_ui/server';
+} from '@kbn/triggers-actions-ui-plugin/server';
 import { ComparatorFnNames } from '../lib';
 import { Comparator } from '../../../common/comparator_types';
 import { getComparatorSchemaType } from '../lib/comparator';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts
index e9016e8cc6a18..065ef6b5ee22c 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { AlertingSetup, StackAlertsStartDeps } from '../../types';
 import { getAlertType } from './alert_type';
 
diff --git a/x-pack/plugins/stack_alerts/server/feature.test.ts b/x-pack/plugins/stack_alerts/server/feature.test.ts
index 61d0914fb7df1..8935a8a43c5d2 100644
--- a/x-pack/plugins/stack_alerts/server/feature.test.ts
+++ b/x-pack/plugins/stack_alerts/server/feature.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { AlertingBuiltinsPlugin } from './plugin';
-import { coreMock } from '../../../../src/core/server/mocks';
-import { alertsMock } from '../../alerting/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { BUILT_IN_ALERTS_FEATURE } from './feature';
 
 describe('Stack Alerts Feature Privileges', () => {
diff --git a/x-pack/plugins/stack_alerts/server/feature.ts b/x-pack/plugins/stack_alerts/server/feature.ts
index 166f2103526ef..f7257651f2aeb 100644
--- a/x-pack/plugins/stack_alerts/server/feature.ts
+++ b/x-pack/plugins/stack_alerts/server/feature.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaFeatureConfig } from '../../../plugins/features/common';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { TRANSFORM_RULE_TYPE } from '@kbn/transform-plugin/common';
 import { ID as IndexThreshold } from './alert_types/index_threshold/alert_type';
 import { GEO_CONTAINMENT_ID as GeoContainment } from './alert_types/geo_containment/alert_type';
 import { ES_QUERY_ID as ElasticsearchQuery } from './alert_types/es_query/constants';
 import { STACK_ALERTS_FEATURE_ID } from '../common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { TRANSFORM_RULE_TYPE } from '../../transform/common';
 
 const TransformHealth = TRANSFORM_RULE_TYPE.TRANSFORM_HEALTH;
 
diff --git a/x-pack/plugins/stack_alerts/server/index.test.ts b/x-pack/plugins/stack_alerts/server/index.test.ts
index 7d66367f7d752..8532883d02684 100644
--- a/x-pack/plugins/stack_alerts/server/index.test.ts
+++ b/x-pack/plugins/stack_alerts/server/index.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../../src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.stack_alerts';
 const deprecationContext = configDeprecationsMock.createContext();
diff --git a/x-pack/plugins/stack_alerts/server/index.ts b/x-pack/plugins/stack_alerts/server/index.ts
index b6b117ceb7075..8f18ac9a4df9a 100644
--- a/x-pack/plugins/stack_alerts/server/index.ts
+++ b/x-pack/plugins/stack_alerts/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { get } from 'lodash';
-import { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { AlertingBuiltinsPlugin } from './plugin';
 import { configSchema, Config } from '../common/config';
 export { ID as INDEX_THRESHOLD_ID } from './alert_types/index_threshold/alert_type';
diff --git a/x-pack/plugins/stack_alerts/server/plugin.test.ts b/x-pack/plugins/stack_alerts/server/plugin.test.ts
index b9263553173d2..b1ad7c9da8015 100644
--- a/x-pack/plugins/stack_alerts/server/plugin.test.ts
+++ b/x-pack/plugins/stack_alerts/server/plugin.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { AlertingBuiltinsPlugin } from './plugin';
-import { coreMock } from '../../../../src/core/server/mocks';
-import { alertsMock } from '../../alerting/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { BUILT_IN_ALERTS_FEATURE } from './feature';
 
 describe('AlertingBuiltins Plugin', () => {
diff --git a/x-pack/plugins/stack_alerts/server/plugin.ts b/x-pack/plugins/stack_alerts/server/plugin.ts
index ac8f60de88b6f..6473e8405dda7 100644
--- a/x-pack/plugins/stack_alerts/server/plugin.ts
+++ b/x-pack/plugins/stack_alerts/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, Logger, CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { Plugin, Logger, CoreSetup, PluginInitializerContext } from '@kbn/core/server';
 
 import { StackAlertsDeps, StackAlertsStartDeps } from './types';
 import { registerBuiltInAlertTypes } from './alert_types';
diff --git a/x-pack/plugins/stack_alerts/server/types.ts b/x-pack/plugins/stack_alerts/server/types.ts
index 3690cbd92e459..83e08b05f7634 100644
--- a/x-pack/plugins/stack_alerts/server/types.ts
+++ b/x-pack/plugins/stack_alerts/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginStartContract as TriggersActionsUiStartContract } from '../../triggers_actions_ui/server';
-import { PluginSetupContract as AlertingSetup } from '../../alerting/server';
+import { PluginStartContract as TriggersActionsUiStartContract } from '@kbn/triggers-actions-ui-plugin/server';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
 
 export type {
   PluginSetupContract as AlertingSetup,
@@ -14,8 +14,8 @@ export type {
   RuleParamsAndRefs,
   RuleExecutorOptions,
   RuleTypeParams,
-} from '../../alerting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+} from '@kbn/alerting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // this plugin's dependendencies
 export interface StackAlertsDeps {
diff --git a/x-pack/plugins/uptime/.buildkite/pipelines/flaky.js b/x-pack/plugins/synthetics/.buildkite/pipelines/flaky.js
similarity index 100%
rename from x-pack/plugins/uptime/.buildkite/pipelines/flaky.js
rename to x-pack/plugins/synthetics/.buildkite/pipelines/flaky.js
diff --git a/x-pack/plugins/uptime/.buildkite/pipelines/flaky.sh b/x-pack/plugins/synthetics/.buildkite/pipelines/flaky.sh
similarity index 100%
rename from x-pack/plugins/uptime/.buildkite/pipelines/flaky.sh
rename to x-pack/plugins/synthetics/.buildkite/pipelines/flaky.sh
diff --git a/x-pack/plugins/uptime/README.md b/x-pack/plugins/synthetics/README.md
similarity index 100%
rename from x-pack/plugins/uptime/README.md
rename to x-pack/plugins/synthetics/README.md
diff --git a/x-pack/plugins/uptime/common/config.ts b/x-pack/plugins/synthetics/common/config.ts
similarity index 94%
rename from x-pack/plugins/uptime/common/config.ts
rename to x-pack/plugins/synthetics/common/config.ts
index fe3e75b0bc5d2..02cb1cdc5f256 100644
--- a/x-pack/plugins/uptime/common/config.ts
+++ b/x-pack/plugins/synthetics/common/config.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { sslSchema } from '@kbn/server-http-tools';
 
diff --git a/x-pack/plugins/uptime/common/constants/alerts.ts b/x-pack/plugins/synthetics/common/constants/alerts.ts
similarity index 96%
rename from x-pack/plugins/uptime/common/constants/alerts.ts
rename to x-pack/plugins/synthetics/common/constants/alerts.ts
index 7c0f7e8168809..ff3cda7887ef7 100644
--- a/x-pack/plugins/uptime/common/constants/alerts.ts
+++ b/x-pack/plugins/synthetics/common/constants/alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionGroup } from '../../../alerting/common';
+import { ActionGroup } from '@kbn/alerting-plugin/common';
 
 export type MonitorStatusActionGroup =
   ActionGroup<'xpack.uptime.alerts.actionGroups.monitorStatus'>;
diff --git a/x-pack/plugins/uptime/common/constants/capabilities.ts b/x-pack/plugins/synthetics/common/constants/capabilities.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/capabilities.ts
rename to x-pack/plugins/synthetics/common/constants/capabilities.ts
diff --git a/x-pack/plugins/uptime/common/constants/chart_format_limits.ts b/x-pack/plugins/synthetics/common/constants/chart_format_limits.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/chart_format_limits.ts
rename to x-pack/plugins/synthetics/common/constants/chart_format_limits.ts
diff --git a/x-pack/plugins/uptime/common/constants/client_defaults.ts b/x-pack/plugins/synthetics/common/constants/client_defaults.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/client_defaults.ts
rename to x-pack/plugins/synthetics/common/constants/client_defaults.ts
diff --git a/x-pack/plugins/uptime/common/constants/context_defaults.ts b/x-pack/plugins/synthetics/common/constants/context_defaults.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/context_defaults.ts
rename to x-pack/plugins/synthetics/common/constants/context_defaults.ts
diff --git a/x-pack/plugins/uptime/common/constants/index.ts b/x-pack/plugins/synthetics/common/constants/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/index.ts
rename to x-pack/plugins/synthetics/common/constants/index.ts
diff --git a/x-pack/plugins/uptime/common/constants/monitor_management.ts b/x-pack/plugins/synthetics/common/constants/monitor_management.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/monitor_management.ts
rename to x-pack/plugins/synthetics/common/constants/monitor_management.ts
diff --git a/x-pack/plugins/uptime/common/constants/plugin.ts b/x-pack/plugins/synthetics/common/constants/plugin.ts
similarity index 79%
rename from x-pack/plugins/uptime/common/constants/plugin.ts
rename to x-pack/plugins/synthetics/common/constants/plugin.ts
index 6785bbc106aa2..8c1506621ba8c 100644
--- a/x-pack/plugins/uptime/common/constants/plugin.ts
+++ b/x-pack/plugins/synthetics/common/constants/plugin.ts
@@ -10,13 +10,13 @@ import { i18n } from '@kbn/i18n';
 export const PLUGIN = {
   APP_ROOT_ID: 'react-uptime-root',
   DESCRIPTION: i18n.translate('xpack.uptime.pluginDescription', {
-    defaultMessage: 'Uptime monitoring',
+    defaultMessage: 'Synthetics monitoring',
     description: 'The description text that will appear in the feature catalogue.',
   }),
   ID: 'uptime',
   LOCAL_STORAGE_KEY: 'xpack.uptime',
-  NAME: i18n.translate('xpack.uptime.featureRegistry.uptimeFeatureName', {
-    defaultMessage: 'Uptime',
+  NAME: i18n.translate('xpack.uptime.featureRegistry.syntheticsFeatureName', {
+    defaultMessage: 'Synthetics and Uptime',
   }),
   TITLE: i18n.translate('xpack.uptime.uptimeFeatureCatalogueTitle', {
     defaultMessage: 'Uptime',
diff --git a/x-pack/plugins/uptime/common/constants/query.ts b/x-pack/plugins/synthetics/common/constants/query.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/query.ts
rename to x-pack/plugins/synthetics/common/constants/query.ts
diff --git a/x-pack/plugins/uptime/common/constants/rest_api.ts b/x-pack/plugins/synthetics/common/constants/rest_api.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/rest_api.ts
rename to x-pack/plugins/synthetics/common/constants/rest_api.ts
diff --git a/x-pack/plugins/uptime/common/constants/settings_defaults.ts b/x-pack/plugins/synthetics/common/constants/settings_defaults.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/constants/settings_defaults.ts
rename to x-pack/plugins/synthetics/common/constants/settings_defaults.ts
diff --git a/x-pack/plugins/uptime/common/constants/ui.ts b/x-pack/plugins/synthetics/common/constants/ui.ts
similarity index 97%
rename from x-pack/plugins/uptime/common/constants/ui.ts
rename to x-pack/plugins/synthetics/common/constants/ui.ts
index 155c6ea80242f..a736e3296161e 100644
--- a/x-pack/plugins/uptime/common/constants/ui.ts
+++ b/x-pack/plugins/synthetics/common/constants/ui.ts
@@ -82,3 +82,5 @@ export const FILTER_FIELDS = {
   LOCATION: 'observer.geo.name',
   TYPE: 'monitor.type',
 };
+
+export const SYNTHETICS_INDEX_PATTERN = 'synthetics-*';
diff --git a/x-pack/plugins/uptime/common/lib/__snapshots__/assert_close_to.test.ts.snap b/x-pack/plugins/synthetics/common/lib/__snapshots__/assert_close_to.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/__snapshots__/assert_close_to.test.ts.snap
rename to x-pack/plugins/synthetics/common/lib/__snapshots__/assert_close_to.test.ts.snap
diff --git a/x-pack/plugins/uptime/common/lib/__snapshots__/stringify_kueries.test.ts.snap b/x-pack/plugins/synthetics/common/lib/__snapshots__/stringify_kueries.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/__snapshots__/stringify_kueries.test.ts.snap
rename to x-pack/plugins/synthetics/common/lib/__snapshots__/stringify_kueries.test.ts.snap
diff --git a/x-pack/plugins/uptime/common/lib/assert_close_to.test.ts b/x-pack/plugins/synthetics/common/lib/assert_close_to.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/assert_close_to.test.ts
rename to x-pack/plugins/synthetics/common/lib/assert_close_to.test.ts
diff --git a/x-pack/plugins/uptime/common/lib/assert_close_to.ts b/x-pack/plugins/synthetics/common/lib/assert_close_to.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/assert_close_to.ts
rename to x-pack/plugins/synthetics/common/lib/assert_close_to.ts
diff --git a/x-pack/plugins/uptime/common/lib/combine_filters_and_user_search.test.ts b/x-pack/plugins/synthetics/common/lib/combine_filters_and_user_search.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/combine_filters_and_user_search.test.ts
rename to x-pack/plugins/synthetics/common/lib/combine_filters_and_user_search.test.ts
diff --git a/x-pack/plugins/uptime/common/lib/combine_filters_and_user_search.ts b/x-pack/plugins/synthetics/common/lib/combine_filters_and_user_search.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/combine_filters_and_user_search.ts
rename to x-pack/plugins/synthetics/common/lib/combine_filters_and_user_search.ts
diff --git a/x-pack/plugins/uptime/common/lib/get_histogram_interval.test.ts b/x-pack/plugins/synthetics/common/lib/get_histogram_interval.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/get_histogram_interval.test.ts
rename to x-pack/plugins/synthetics/common/lib/get_histogram_interval.test.ts
diff --git a/x-pack/plugins/uptime/common/lib/get_histogram_interval.ts b/x-pack/plugins/synthetics/common/lib/get_histogram_interval.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/get_histogram_interval.ts
rename to x-pack/plugins/synthetics/common/lib/get_histogram_interval.ts
diff --git a/x-pack/plugins/uptime/common/lib/index.ts b/x-pack/plugins/synthetics/common/lib/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/index.ts
rename to x-pack/plugins/synthetics/common/lib/index.ts
diff --git a/x-pack/plugins/uptime/common/lib/ml.test.ts b/x-pack/plugins/synthetics/common/lib/ml.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/ml.test.ts
rename to x-pack/plugins/synthetics/common/lib/ml.test.ts
diff --git a/x-pack/plugins/uptime/common/lib/ml.ts b/x-pack/plugins/synthetics/common/lib/ml.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/ml.ts
rename to x-pack/plugins/synthetics/common/lib/ml.ts
diff --git a/x-pack/plugins/synthetics/common/lib/schedule_to_time.test.ts b/x-pack/plugins/synthetics/common/lib/schedule_to_time.test.ts
new file mode 100644
index 0000000000000..391963a960be4
--- /dev/null
+++ b/x-pack/plugins/synthetics/common/lib/schedule_to_time.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ScheduleUnit, SyntheticsMonitorSchedule } from '../runtime_types';
+import { scheduleToMilli } from './schedule_to_time';
+
+describe('schedule_to_time', () => {
+  describe('scheduleToMilli', () => {
+    it('converts seconds schedule to millis', () => {
+      const schedule: SyntheticsMonitorSchedule = { unit: ScheduleUnit.SECONDS, number: '10' };
+      expect(scheduleToMilli(schedule)).toEqual(10 * 1000);
+    });
+
+    it('converts minutes schedule to millis', () => {
+      const schedule: SyntheticsMonitorSchedule = { unit: ScheduleUnit.MINUTES, number: '6' };
+      expect(scheduleToMilli(schedule)).toEqual(6 * 60 * 1000);
+    });
+  });
+});
diff --git a/x-pack/plugins/synthetics/common/lib/schedule_to_time.ts b/x-pack/plugins/synthetics/common/lib/schedule_to_time.ts
new file mode 100644
index 0000000000000..d944c35b2ec78
--- /dev/null
+++ b/x-pack/plugins/synthetics/common/lib/schedule_to_time.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ScheduleUnit, SyntheticsMonitorSchedule } from '../runtime_types';
+
+export function scheduleToMilli(schedule: SyntheticsMonitorSchedule): number {
+  const timeValue = parseInt(schedule.number, 10);
+  return timeValue * getMilliFactorForScheduleUnit(schedule.unit);
+}
+
+function getMilliFactorForScheduleUnit(scheduleUnit: ScheduleUnit): number {
+  switch (scheduleUnit) {
+    case ScheduleUnit.SECONDS:
+      return 1000;
+    case ScheduleUnit.MINUTES:
+      return 60 * 1000;
+    default:
+      throw new Error(`Unit ${scheduleUnit} is not supported`);
+  }
+}
diff --git a/x-pack/plugins/uptime/common/lib/stringify_kueries.test.ts b/x-pack/plugins/synthetics/common/lib/stringify_kueries.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/stringify_kueries.test.ts
rename to x-pack/plugins/synthetics/common/lib/stringify_kueries.test.ts
diff --git a/x-pack/plugins/uptime/common/lib/stringify_kueries.ts b/x-pack/plugins/synthetics/common/lib/stringify_kueries.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/lib/stringify_kueries.ts
rename to x-pack/plugins/synthetics/common/lib/stringify_kueries.ts
diff --git a/x-pack/plugins/uptime/common/requests/get_certs_request_body.ts b/x-pack/plugins/synthetics/common/requests/get_certs_request_body.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/requests/get_certs_request_body.ts
rename to x-pack/plugins/synthetics/common/requests/get_certs_request_body.ts
diff --git a/x-pack/plugins/uptime/common/rules/uptime_rule_field_map.ts b/x-pack/plugins/synthetics/common/rules/uptime_rule_field_map.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/rules/uptime_rule_field_map.ts
rename to x-pack/plugins/synthetics/common/rules/uptime_rule_field_map.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/alerts/common.ts b/x-pack/plugins/synthetics/common/runtime_types/alerts/common.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/alerts/common.ts
rename to x-pack/plugins/synthetics/common/runtime_types/alerts/common.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/alerts/index.ts b/x-pack/plugins/synthetics/common/runtime_types/alerts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/alerts/index.ts
rename to x-pack/plugins/synthetics/common/runtime_types/alerts/index.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts b/x-pack/plugins/synthetics/common/runtime_types/alerts/status_check.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts
rename to x-pack/plugins/synthetics/common/runtime_types/alerts/status_check.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/certs.ts b/x-pack/plugins/synthetics/common/runtime_types/certs.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/certs.ts
rename to x-pack/plugins/synthetics/common/runtime_types/certs.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/common.ts b/x-pack/plugins/synthetics/common/runtime_types/common.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/common.ts
rename to x-pack/plugins/synthetics/common/runtime_types/common.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts b/x-pack/plugins/synthetics/common/runtime_types/dynamic_settings.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts
rename to x-pack/plugins/synthetics/common/runtime_types/dynamic_settings.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/index.ts b/x-pack/plugins/synthetics/common/runtime_types/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/index.ts
rename to x-pack/plugins/synthetics/common/runtime_types/index.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor/index.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor/index.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor/index.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor/locations.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor/locations.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor/locations.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor/locations.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor/state.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor/state.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor/state.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor/state.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/config_key.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/config_key.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/config_key.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/config_key.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/index.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/index.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/index.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/locations.ts
similarity index 94%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/locations.ts
index ab9a6f90de0a0..8ee664bda1ebf 100644
--- a/x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts
+++ b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/locations.ts
@@ -12,19 +12,16 @@ import { tEnum } from '../../utils/t_enum';
 export enum BandwidthLimitKey {
   DOWNLOAD = 'download',
   UPLOAD = 'upload',
-  LATENCY = 'latency',
 }
 
 export const DEFAULT_BANDWIDTH_LIMIT = {
   [BandwidthLimitKey.DOWNLOAD]: 100,
   [BandwidthLimitKey.UPLOAD]: 30,
-  [BandwidthLimitKey.LATENCY]: 1000,
 };
 
 export const DEFAULT_THROTTLING = {
   [BandwidthLimitKey.DOWNLOAD]: DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.DOWNLOAD],
   [BandwidthLimitKey.UPLOAD]: DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.UPLOAD],
-  [BandwidthLimitKey.LATENCY]: DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.LATENCY],
 };
 
 export const BandwidthLimitKeyCodec = tEnum<BandwidthLimitKey>(
@@ -107,7 +104,6 @@ export const isServiceLocationInvalid = (location: MonitorServiceLocation) =>
 export const ThrottlingOptionsCodec = t.interface({
   [BandwidthLimitKey.DOWNLOAD]: t.number,
   [BandwidthLimitKey.UPLOAD]: t.number,
-  [BandwidthLimitKey.LATENCY]: t.number,
 });
 
 export const ServiceLocationsApiResponseCodec = t.interface({
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_configs.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_configs.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_meta_data.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_meta_data.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_meta_data.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_meta_data.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_types.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
similarity index 98%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_types.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
index fa2f04b641f51..c093705e858d8 100644
--- a/x-pack/plugins/uptime/common/runtime_types/monitor_management/monitor_types.ts
+++ b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
@@ -19,11 +19,13 @@ import {
 } from './monitor_configs';
 import { MetadataCodec } from './monitor_meta_data';
 
-const Schedule = t.interface({
+const ScheduleCodec = t.interface({
   number: t.string,
   unit: ScheduleUnitCodec,
 });
 
+export type SyntheticsMonitorSchedule = t.TypeOf<typeof ScheduleCodec>;
+
 // TLSFields
 export const TLSFieldsCodec = t.partial({
   [ConfigKey.TLS_CERTIFICATE_AUTHORITIES]: t.string,
@@ -65,7 +67,7 @@ export const CommonFieldsCodec = t.intersection([
     [ConfigKey.NAMESPACE]: t.string,
     [ConfigKey.MONITOR_TYPE]: DataStreamCodec,
     [ConfigKey.ENABLED]: t.boolean,
-    [ConfigKey.SCHEDULE]: Schedule,
+    [ConfigKey.SCHEDULE]: ScheduleCodec,
     [ConfigKey.APM_SERVICE_NAME]: t.string,
     [ConfigKey.TAGS]: t.array(t.string),
     [ConfigKey.LOCATIONS]: MonitorServiceLocationsCodec,
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/state.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/state.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/monitor_management/state.ts
rename to x-pack/plugins/synthetics/common/runtime_types/monitor_management/state.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/network_events.ts b/x-pack/plugins/synthetics/common/runtime_types/network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/network_events.ts
rename to x-pack/plugins/synthetics/common/runtime_types/network_events.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/histogram.ts b/x-pack/plugins/synthetics/common/runtime_types/ping/histogram.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/ping/histogram.ts
rename to x-pack/plugins/synthetics/common/runtime_types/ping/histogram.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/index.ts b/x-pack/plugins/synthetics/common/runtime_types/ping/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/ping/index.ts
rename to x-pack/plugins/synthetics/common/runtime_types/ping/index.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts b/x-pack/plugins/synthetics/common/runtime_types/ping/ping.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/ping/ping.ts
rename to x-pack/plugins/synthetics/common/runtime_types/ping/ping.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.test.ts b/x-pack/plugins/synthetics/common/runtime_types/ping/synthetics.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/ping/synthetics.test.ts
rename to x-pack/plugins/synthetics/common/runtime_types/ping/synthetics.test.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts b/x-pack/plugins/synthetics/common/runtime_types/ping/synthetics.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts
rename to x-pack/plugins/synthetics/common/runtime_types/ping/synthetics.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/snapshot/index.ts b/x-pack/plugins/synthetics/common/runtime_types/snapshot/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/snapshot/index.ts
rename to x-pack/plugins/synthetics/common/runtime_types/snapshot/index.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts b/x-pack/plugins/synthetics/common/runtime_types/snapshot/snapshot_count.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
rename to x-pack/plugins/synthetics/common/runtime_types/snapshot/snapshot_count.ts
diff --git a/x-pack/plugins/uptime/common/runtime_types/synthetics_service_api_key.ts b/x-pack/plugins/synthetics/common/runtime_types/synthetics_service_api_key.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/runtime_types/synthetics_service_api_key.ts
rename to x-pack/plugins/synthetics/common/runtime_types/synthetics_service_api_key.ts
diff --git a/x-pack/plugins/uptime/common/translations.ts b/x-pack/plugins/synthetics/common/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/translations.ts
rename to x-pack/plugins/synthetics/common/translations.ts
diff --git a/x-pack/plugins/uptime/common/types/index.ts b/x-pack/plugins/synthetics/common/types/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/types/index.ts
rename to x-pack/plugins/synthetics/common/types/index.ts
diff --git a/x-pack/plugins/uptime/common/types/monitor_duration.ts b/x-pack/plugins/synthetics/common/types/monitor_duration.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/types/monitor_duration.ts
rename to x-pack/plugins/synthetics/common/types/monitor_duration.ts
diff --git a/x-pack/plugins/uptime/common/types/monitor_validation.ts b/x-pack/plugins/synthetics/common/types/monitor_validation.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/types/monitor_validation.ts
rename to x-pack/plugins/synthetics/common/types/monitor_validation.ts
diff --git a/x-pack/plugins/uptime/common/types/saved_objects.ts b/x-pack/plugins/synthetics/common/types/saved_objects.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/types/saved_objects.ts
rename to x-pack/plugins/synthetics/common/types/saved_objects.ts
diff --git a/x-pack/plugins/uptime/common/types/synthetics_monitor.ts b/x-pack/plugins/synthetics/common/types/synthetics_monitor.ts
similarity index 93%
rename from x-pack/plugins/uptime/common/types/synthetics_monitor.ts
rename to x-pack/plugins/synthetics/common/types/synthetics_monitor.ts
index d59e45e86b819..a54cd03003c4e 100644
--- a/x-pack/plugins/uptime/common/types/synthetics_monitor.ts
+++ b/x-pack/plugins/synthetics/common/types/synthetics_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SimpleSavedObject } from 'kibana/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { EncryptedSyntheticsMonitor, SyntheticsMonitor } from '../runtime_types';
 
 export interface MonitorIdParam {
diff --git a/x-pack/plugins/uptime/common/utils/as_mutable_array.ts b/x-pack/plugins/synthetics/common/utils/as_mutable_array.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/utils/as_mutable_array.ts
rename to x-pack/plugins/synthetics/common/utils/as_mutable_array.ts
diff --git a/x-pack/plugins/uptime/common/utils/es_search.ts b/x-pack/plugins/synthetics/common/utils/es_search.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/utils/es_search.ts
rename to x-pack/plugins/synthetics/common/utils/es_search.ts
diff --git a/x-pack/plugins/uptime/common/utils/get_monitor_url.ts b/x-pack/plugins/synthetics/common/utils/get_monitor_url.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/utils/get_monitor_url.ts
rename to x-pack/plugins/synthetics/common/utils/get_monitor_url.ts
diff --git a/x-pack/plugins/uptime/common/utils/t_enum.ts b/x-pack/plugins/synthetics/common/utils/t_enum.ts
similarity index 100%
rename from x-pack/plugins/uptime/common/utils/t_enum.ts
rename to x-pack/plugins/synthetics/common/utils/t_enum.ts
diff --git a/x-pack/plugins/uptime/e2e/config.ts b/x-pack/plugins/synthetics/e2e/config.ts
similarity index 94%
rename from x-pack/plugins/uptime/e2e/config.ts
rename to x-pack/plugins/synthetics/e2e/config.ts
index 66b97641b2156..e8af8510fe5dc 100644
--- a/x-pack/plugins/uptime/e2e/config.ts
+++ b/x-pack/plugins/synthetics/e2e/config.ts
@@ -26,7 +26,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
 
   const manifestUrl = process.env.SYNTHETICS_SERVICE_MANIFEST ?? kibanaConfig[MANIFEST_KEY];
   const serviceUsername = process.env.SYNTHETICS_SERVICE_USERNAME ?? kibanaConfig[SERVICE_USERNAME];
-  const servicPassword = process.env.SYNTHETICS_SERVICE_PASSWORD ?? kibanaConfig[SERVICE_PASSWORD];
+  const servicePassword = process.env.SYNTHETICS_SERVICE_PASSWORD ?? kibanaConfig[SERVICE_PASSWORD];
 
   return {
     ...kibanaCommonTestsConfig.getAll(),
@@ -62,7 +62,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
             ? serviceUsername
             : 'localKibanaIntegrationTestsUser'
         }`,
-        `--xpack.uptime.service.password=${servicPassword}`,
+        `--xpack.uptime.service.password=${servicePassword}`,
       ],
     },
   };
diff --git a/x-pack/plugins/uptime/e2e/fixtures/es_archiver/browser/data.json.gz b/x-pack/plugins/synthetics/e2e/fixtures/es_archiver/browser/data.json.gz
similarity index 100%
rename from x-pack/plugins/uptime/e2e/fixtures/es_archiver/browser/data.json.gz
rename to x-pack/plugins/synthetics/e2e/fixtures/es_archiver/browser/data.json.gz
diff --git a/x-pack/plugins/uptime/e2e/fixtures/es_archiver/browser/mappings.json b/x-pack/plugins/synthetics/e2e/fixtures/es_archiver/browser/mappings.json
similarity index 100%
rename from x-pack/plugins/uptime/e2e/fixtures/es_archiver/browser/mappings.json
rename to x-pack/plugins/synthetics/e2e/fixtures/es_archiver/browser/mappings.json
diff --git a/x-pack/plugins/uptime/e2e/fixtures/es_archiver/full_heartbeat/data.json.gz b/x-pack/plugins/synthetics/e2e/fixtures/es_archiver/full_heartbeat/data.json.gz
similarity index 100%
rename from x-pack/plugins/uptime/e2e/fixtures/es_archiver/full_heartbeat/data.json.gz
rename to x-pack/plugins/synthetics/e2e/fixtures/es_archiver/full_heartbeat/data.json.gz
diff --git a/x-pack/plugins/uptime/e2e/fixtures/es_archiver/full_heartbeat/mappings.json b/x-pack/plugins/synthetics/e2e/fixtures/es_archiver/full_heartbeat/mappings.json
similarity index 100%
rename from x-pack/plugins/uptime/e2e/fixtures/es_archiver/full_heartbeat/mappings.json
rename to x-pack/plugins/synthetics/e2e/fixtures/es_archiver/full_heartbeat/mappings.json
diff --git a/x-pack/plugins/uptime/e2e/helpers/make_checks.ts b/x-pack/plugins/synthetics/e2e/helpers/make_checks.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/helpers/make_checks.ts
rename to x-pack/plugins/synthetics/e2e/helpers/make_checks.ts
diff --git a/x-pack/plugins/uptime/e2e/helpers/make_ping.ts b/x-pack/plugins/synthetics/e2e/helpers/make_ping.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/helpers/make_ping.ts
rename to x-pack/plugins/synthetics/e2e/helpers/make_ping.ts
diff --git a/x-pack/plugins/uptime/e2e/helpers/make_tls.ts b/x-pack/plugins/synthetics/e2e/helpers/make_tls.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/helpers/make_tls.ts
rename to x-pack/plugins/synthetics/e2e/helpers/make_tls.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/alerts/default_email_settings.ts b/x-pack/plugins/synthetics/e2e/journeys/alerts/default_email_settings.ts
similarity index 95%
rename from x-pack/plugins/uptime/e2e/journeys/alerts/default_email_settings.ts
rename to x-pack/plugins/synthetics/e2e/journeys/alerts/default_email_settings.ts
index e518b9be48ac9..a8be2f2129b32 100644
--- a/x-pack/plugins/uptime/e2e/journeys/alerts/default_email_settings.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/alerts/default_email_settings.ts
@@ -13,13 +13,7 @@
  */
 
 import { journey, step, before } from '@elastic/synthetics';
-import {
-  assertNotText,
-  assertText,
-  byTestId,
-  loginToKibana,
-  waitForLoadingToFinish,
-} from '../utils';
+import { assertNotText, assertText, byTestId, waitForLoadingToFinish } from '../utils';
 import { settingsPageProvider } from '../../page_objects/settings';
 
 journey('DefaultEmailSettings', async ({ page, params }) => {
@@ -40,7 +34,7 @@ journey('DefaultEmailSettings', async ({ page, params }) => {
     await page.goto(`${baseUrl}?${queryParams}`, {
       waitUntil: 'networkidle',
     });
-    await loginToKibana({ page });
+    await settings.loginToKibana();
   });
 
   step('clear existing settings', async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/alerts/index.ts b/x-pack/plugins/synthetics/e2e/journeys/alerts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/alerts/index.ts
rename to x-pack/plugins/synthetics/e2e/journeys/alerts/index.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/alerts/status_alert_flyouts_in_alerting_app.ts b/x-pack/plugins/synthetics/e2e/journeys/alerts/status_alert_flyouts_in_alerting_app.ts
similarity index 92%
rename from x-pack/plugins/uptime/e2e/journeys/alerts/status_alert_flyouts_in_alerting_app.ts
rename to x-pack/plugins/synthetics/e2e/journeys/alerts/status_alert_flyouts_in_alerting_app.ts
index 859954364f9d3..5346d0de33c28 100644
--- a/x-pack/plugins/uptime/e2e/journeys/alerts/status_alert_flyouts_in_alerting_app.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/alerts/status_alert_flyouts_in_alerting_app.ts
@@ -6,9 +6,11 @@
  */
 
 import { journey, step, expect, before } from '@elastic/synthetics';
-import { assertText, byTestId, loginToKibana, waitForLoadingToFinish } from '../utils';
+import { assertText, byTestId, waitForLoadingToFinish } from '../utils';
+import { loginPageProvider } from '../../page_objects/login';
 
 journey('StatusFlyoutInAlertingApp', async ({ page, params }) => {
+  const login = loginPageProvider({ page });
   before(async () => {
     await waitForLoadingToFinish({ page });
   });
@@ -19,7 +21,7 @@ journey('StatusFlyoutInAlertingApp', async ({ page, params }) => {
     await page.goto(`${baseUrl}`, {
       waitUntil: 'networkidle',
     });
-    await loginToKibana({ page });
+    await login.loginToKibana();
   });
 
   step('Open monitor status flyout', async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/alerts/tls_alert_flyouts_in_alerting_app.ts b/x-pack/plugins/synthetics/e2e/journeys/alerts/tls_alert_flyouts_in_alerting_app.ts
similarity index 84%
rename from x-pack/plugins/uptime/e2e/journeys/alerts/tls_alert_flyouts_in_alerting_app.ts
rename to x-pack/plugins/synthetics/e2e/journeys/alerts/tls_alert_flyouts_in_alerting_app.ts
index d8b53f9f3c89f..873d10c0a21bb 100644
--- a/x-pack/plugins/uptime/e2e/journeys/alerts/tls_alert_flyouts_in_alerting_app.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/alerts/tls_alert_flyouts_in_alerting_app.ts
@@ -6,9 +6,11 @@
  */
 
 import { journey, step, before } from '@elastic/synthetics';
-import { assertText, byTestId, loginToKibana, waitForLoadingToFinish } from '../utils';
+import { assertText, byTestId, waitForLoadingToFinish } from '../utils';
+import { loginPageProvider } from '../../page_objects/login';
 
 journey('TlsFlyoutInAlertingApp', async ({ page, params }) => {
+  const login = loginPageProvider({ page });
   before(async () => {
     await waitForLoadingToFinish({ page });
   });
@@ -19,7 +21,7 @@ journey('TlsFlyoutInAlertingApp', async ({ page, params }) => {
     await page.goto(`${baseUrl}`, {
       waitUntil: 'networkidle',
     });
-    await loginToKibana({ page });
+    await login.loginToKibana();
   });
 
   step('Open tls alert flyout', async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts b/x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts
similarity index 83%
rename from x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
rename to x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts
index 5d8d2a1a5d848..7267084c82dea 100644
--- a/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/data_view_permissions.ts
@@ -6,10 +6,12 @@
  */
 
 import { journey, step, expect, before } from '@elastic/synthetics';
-import { byTestId, loginToKibana, waitForLoadingToFinish } from './utils';
-import { callKibana } from '../../../apm/scripts/create_apm_users_and_roles/helpers/call_kibana';
+import { callKibana } from '@kbn/apm-plugin/scripts/create_apm_users_and_roles/helpers/call_kibana';
+import { byTestId, waitForLoadingToFinish } from './utils';
+import { loginPageProvider } from '../page_objects/login';
 
 journey('DataViewPermissions', async ({ page, params }) => {
+  const login = loginPageProvider({ page });
   before(async () => {
     await waitForLoadingToFinish({ page });
     try {
@@ -36,7 +38,7 @@ journey('DataViewPermissions', async ({ page, params }) => {
     await page.goto(`${baseUrl}?${queryParams}`, {
       waitUntil: 'networkidle',
     });
-    await loginToKibana({ page, user: { username: 'obs_read_user', password: 'changeme' } });
+    await login.loginToKibana('obs_read_user', 'changeme');
   });
 
   step('Click explore data button', async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/index.ts b/x-pack/plugins/synthetics/e2e/journeys/index.ts
similarity index 95%
rename from x-pack/plugins/uptime/e2e/journeys/index.ts
rename to x-pack/plugins/synthetics/e2e/journeys/index.ts
index 8430dfec98642..1fe02882fcd89 100644
--- a/x-pack/plugins/uptime/e2e/journeys/index.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/index.ts
@@ -15,3 +15,4 @@ export * from './monitor_name.journey';
 export * from './monitor_management.journey';
 export * from './monitor_management_enablement.journey';
 export * from './monitor_details';
+export * from './locations';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/mocks/index.ts b/x-pack/plugins/synthetics/e2e/journeys/locations/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/mocks/index.ts
rename to x-pack/plugins/synthetics/e2e/journeys/locations/index.ts
diff --git a/x-pack/plugins/synthetics/e2e/journeys/locations/locations.ts b/x-pack/plugins/synthetics/e2e/journeys/locations/locations.ts
new file mode 100644
index 0000000000000..5f555dd6e5070
--- /dev/null
+++ b/x-pack/plugins/synthetics/e2e/journeys/locations/locations.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { journey, step, before, Page } from '@elastic/synthetics';
+import { makeChecksWithStatus } from '../../helpers/make_checks';
+import { monitorDetailsPageProvider } from '../../page_objects/monitor_details';
+
+journey('Observer location', async ({ page, params }: { page: Page; params: any }) => {
+  const monitorDetails = monitorDetailsPageProvider({ page, kibanaUrl: params.kibanaUrl });
+
+  const NO_LOCATION_MONITOR_ID = 'location-testing-id';
+
+  const LESS_AVAIL_MONITOR_ID = 'less-availability-monitor';
+
+  const addMonitorWithNoLocation = async () => {
+    /**
+     * This mogrify function will strip the documents of their location
+     * data (but preserve their location name), which is necessary for
+     * this test to work as desired.
+     * @param d current document
+     */
+    const mogrifyNoLocation = (d: any) => {
+      if (d.observer?.geo?.location) {
+        d.observer.geo.location = undefined;
+      }
+      return d;
+    };
+    await makeChecksWithStatus(
+      params.getService('es'),
+      NO_LOCATION_MONITOR_ID,
+      5,
+      2,
+      10000,
+      {},
+      'up',
+      mogrifyNoLocation
+    );
+  };
+
+  const addLessAvailMonitor = async () => {
+    await makeChecksWithStatus(
+      params.getService('es'),
+      LESS_AVAIL_MONITOR_ID,
+      5,
+      2,
+      10000,
+      {},
+      'up'
+    );
+    await makeChecksWithStatus(
+      params.getService('es'),
+      LESS_AVAIL_MONITOR_ID,
+      5,
+      2,
+      10000,
+      {},
+      'down'
+    );
+  };
+
+  before(async () => {
+    await addMonitorWithNoLocation();
+    await addLessAvailMonitor();
+  });
+
+  step('navigate to overview', async () => {
+    await monitorDetails.navigateToOverviewPage();
+  });
+
+  step('login to Kibana', async () => {
+    await monitorDetails.loginToKibana();
+  });
+
+  step('navigate to monitor details for no locaiton monitor', async () => {
+    await monitorDetails.navigateToMonitorDetails(NO_LOCATION_MONITOR_ID);
+  });
+
+  step('displays the overall availability', async () => {
+    await monitorDetails.waitForLoadingToFinish();
+    const availability = '100.00 %';
+    await monitorDetails.assertText({ text: availability });
+  });
+
+  step('displays less monitor availability', async () => {
+    await monitorDetails.navigateToOverviewPage();
+    await monitorDetails.navigateToMonitorDetails(LESS_AVAIL_MONITOR_ID);
+    await monitorDetails.assertText({ text: '50.00 %' });
+  });
+});
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_details.journey.ts
similarity index 61%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_details.journey.ts
index 5380c611c15cb..192fcf06c3095 100644
--- a/x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/monitor_details.journey.ts
@@ -11,17 +11,22 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
-import { journey, step, expect, before, Page } from '@elastic/synthetics';
+import uuid from 'uuid';
+import { journey, step, expect, after, before, Page } from '@elastic/synthetics';
 import { monitorManagementPageProvider } from '../page_objects/monitor_management';
 
 journey('MonitorDetails', async ({ page, params }: { page: Page; params: any }) => {
   const uptime = monitorManagementPageProvider({ page, kibanaUrl: params.kibanaUrl });
+  const name = `Test monitor ${uuid.v4()}`;
 
   before(async () => {
     await uptime.waitForLoadingToFinish();
   });
 
+  after(async () => {
+    await uptime.enableMonitorManagement(false);
+  });
+
   step('Go to monitor-management', async () => {
     await uptime.navigateToMonitorManagement();
   });
@@ -32,13 +37,31 @@ journey('MonitorDetails', async ({ page, params }: { page: Page; params: any })
     expect(await invalid.isVisible()).toBeFalsy();
   });
 
+  step('create basic monitor', async () => {
+    await uptime.enableMonitorManagement();
+    await uptime.clickAddMonitor();
+    await uptime.createBasicMonitorDetails({
+      name,
+      locations: ['US Central'],
+      apmServiceName: 'synthetics',
+    });
+    await uptime.fillByTestSubj('syntheticsUrlField', 'https://www.google.com');
+    await uptime.confirmAndSave();
+  });
+
   step('navigate to monitor details page', async () => {
-    await uptime.assertText({ text: 'Test Monitor' });
-    await Promise.all([page.waitForNavigation(), page.click('text="Test Monitor"')]);
-    await uptime.assertText({ text: 'Test Monitor' });
+    await uptime.assertText({ text: name });
+    await Promise.all([page.waitForNavigation(), page.click(`text=${name}`)]);
+    await uptime.assertText({ text: name });
     const url = await page.textContent('[data-test-subj="monitor-page-url"]');
     const type = await page.textContent('[data-test-subj="monitor-page-type"]');
     expect(url).toEqual('https://www.google.com(opens in a new tab or window)');
     expect(type).toEqual('HTTP');
   });
+
+  step('delete monitor', async () => {
+    await uptime.navigateToMonitorManagement();
+    const isSuccessful = await uptime.deleteMonitors();
+    expect(isSuccessful).toBeTruthy();
+  });
 });
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/index.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_details/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_details/index.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_details/index.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_alerts.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_details/monitor_alerts.journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_alerts.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_details/monitor_alerts.journey.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_details.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_details/monitor_details.journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_details/monitor_details.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_details/monitor_details.journey.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details/ping_redirects.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_details/ping_redirects.journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_details/ping_redirects.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_details/ping_redirects.journey.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_management.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_management.journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_management.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_management.journey.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_management_enablement.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_management_enablement.journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_management_enablement.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_management_enablement.journey.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/monitor_name.journey.ts
similarity index 81%
rename from x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/monitor_name.journey.ts
index 624538244e6d1..a21627548aeb1 100644
--- a/x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/monitor_name.journey.ts
@@ -11,14 +11,24 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import uuid from 'uuid';
 import { journey, step, expect, before, Page } from '@elastic/synthetics';
 import { monitorManagementPageProvider } from '../page_objects/monitor_management';
 import { byTestId } from './utils';
 
 journey(`MonitorName`, async ({ page, params }: { page: Page; params: any }) => {
+  const name = `Test monitor ${uuid.v4()}`;
   const uptime = monitorManagementPageProvider({ page, kibanaUrl: params.kibanaUrl });
 
+  const createBasicMonitor = async () => {
+    await uptime.createBasicMonitorDetails({
+      name,
+      locations: ['US Central'],
+      apmServiceName: 'synthetics',
+    });
+    await uptime.fillByTestSubj('syntheticsUrlField', 'https://www.google.com');
+  };
+
   before(async () => {
     await uptime.waitForLoadingToFinish();
   });
@@ -33,11 +43,17 @@ journey(`MonitorName`, async ({ page, params }: { page: Page; params: any }) =>
     expect(await invalid.isVisible()).toBeFalsy();
   });
 
-  step(`shows error if name already exists`, async () => {
+  step('create basic monitor', async () => {
     await uptime.enableMonitorManagement();
     await uptime.clickAddMonitor();
+    await createBasicMonitor();
+    await uptime.confirmAndSave();
+  });
+
+  step(`shows error if name already exists`, async () => {
+    await uptime.navigateToAddMonitor();
     await uptime.createBasicMonitorDetails({
-      name: 'Test monitor',
+      name,
       locations: ['US Central'],
       apmServiceName: 'synthetics',
     });
diff --git a/x-pack/plugins/uptime/e2e/journeys/read_only_user/index.ts b/x-pack/plugins/synthetics/e2e/journeys/read_only_user/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/read_only_user/index.ts
rename to x-pack/plugins/synthetics/e2e/journeys/read_only_user/index.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/read_only_user/monitor_management.ts b/x-pack/plugins/synthetics/e2e/journeys/read_only_user/monitor_management.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/read_only_user/monitor_management.ts
rename to x-pack/plugins/synthetics/e2e/journeys/read_only_user/monitor_management.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/step_duration.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/step_duration.journey.ts
similarity index 89%
rename from x-pack/plugins/uptime/e2e/journeys/step_duration.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/step_duration.journey.ts
index ffd235cf8106b..1e97c5e89125e 100644
--- a/x-pack/plugins/uptime/e2e/journeys/step_duration.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/step_duration.journey.ts
@@ -6,9 +6,11 @@
  */
 
 import { journey, step, expect, before } from '@elastic/synthetics';
-import { loginToKibana, waitForLoadingToFinish } from './utils';
+import { waitForLoadingToFinish } from './utils';
+import { loginPageProvider } from '../page_objects/login';
 
 journey('StepsDuration', async ({ page, params }) => {
+  const login = loginPageProvider({ page });
   before(async () => {
     await waitForLoadingToFinish({ page });
   });
@@ -24,7 +26,7 @@ journey('StepsDuration', async ({ page, params }) => {
     await page.goto(`${baseUrl}?${queryParams}`, {
       waitUntil: 'networkidle',
     });
-    await loginToKibana({ page });
+    await login.loginToKibana();
   });
 
   step('Go to monitor details', async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/uptime.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/uptime.journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/journeys/uptime.journey.ts
rename to x-pack/plugins/synthetics/e2e/journeys/uptime.journey.ts
diff --git a/x-pack/plugins/uptime/e2e/journeys/utils.ts b/x-pack/plugins/synthetics/e2e/journeys/utils.ts
similarity index 93%
rename from x-pack/plugins/uptime/e2e/journeys/utils.ts
rename to x-pack/plugins/synthetics/e2e/journeys/utils.ts
index a042d37a99375..2bd7219f5867b 100644
--- a/x-pack/plugins/uptime/e2e/journeys/utils.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/utils.ts
@@ -30,6 +30,8 @@ export async function loginToKibana({
   await page.click('[data-test-subj=loginSubmit]');
 
   await waitForLoadingToFinish({ page });
+  // Close Monitor Management tour added in 8.2.0
+  await page.click('[data-test-subj=syntheticsManagementTourDismiss]');
 }
 
 export const byTestId = (testId: string) => {
diff --git a/x-pack/plugins/uptime/e2e/page_objects/login.tsx b/x-pack/plugins/synthetics/e2e/page_objects/login.tsx
similarity index 86%
rename from x-pack/plugins/uptime/e2e/page_objects/login.tsx
rename to x-pack/plugins/synthetics/e2e/page_objects/login.tsx
index 88b0078e7bbf8..ae52bb45ddb84 100644
--- a/x-pack/plugins/uptime/e2e/page_objects/login.tsx
+++ b/x-pack/plugins/synthetics/e2e/page_objects/login.tsx
@@ -36,6 +36,12 @@ export function loginPageProvider({
       await page.click('[data-test-subj=loginSubmit]');
 
       await this.waitForLoadingToFinish();
+      // Close Monitor Management tour added in 8.2.0
+      try {
+        await page.click('[data-test-subj=syntheticsManagementTourDismiss]');
+      } catch (e) {
+        return;
+      }
     },
   };
 }
diff --git a/x-pack/plugins/uptime/e2e/page_objects/monitor_details.tsx b/x-pack/plugins/synthetics/e2e/page_objects/monitor_details.tsx
similarity index 100%
rename from x-pack/plugins/uptime/e2e/page_objects/monitor_details.tsx
rename to x-pack/plugins/synthetics/e2e/page_objects/monitor_details.tsx
diff --git a/x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx b/x-pack/plugins/synthetics/e2e/page_objects/monitor_management.tsx
similarity index 100%
rename from x-pack/plugins/uptime/e2e/page_objects/monitor_management.tsx
rename to x-pack/plugins/synthetics/e2e/page_objects/monitor_management.tsx
diff --git a/x-pack/plugins/uptime/e2e/page_objects/settings.tsx b/x-pack/plugins/synthetics/e2e/page_objects/settings.tsx
similarity index 100%
rename from x-pack/plugins/uptime/e2e/page_objects/settings.tsx
rename to x-pack/plugins/synthetics/e2e/page_objects/settings.tsx
diff --git a/x-pack/plugins/uptime/e2e/page_objects/utils.tsx b/x-pack/plugins/synthetics/e2e/page_objects/utils.tsx
similarity index 100%
rename from x-pack/plugins/uptime/e2e/page_objects/utils.tsx
rename to x-pack/plugins/synthetics/e2e/page_objects/utils.tsx
diff --git a/x-pack/plugins/uptime/e2e/playwright_run.ts b/x-pack/plugins/synthetics/e2e/playwright_run.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/playwright_run.ts
rename to x-pack/plugins/synthetics/e2e/playwright_run.ts
diff --git a/x-pack/plugins/uptime/e2e/playwright_start.ts b/x-pack/plugins/synthetics/e2e/playwright_start.ts
similarity index 89%
rename from x-pack/plugins/uptime/e2e/playwright_start.ts
rename to x-pack/plugins/synthetics/e2e/playwright_start.ts
index 9108412405602..14d62c9632fa6 100644
--- a/x-pack/plugins/uptime/e2e/playwright_start.ts
+++ b/x-pack/plugins/synthetics/e2e/playwright_start.ts
@@ -9,11 +9,10 @@
 
 import Url from 'url';
 import { run as playwrightRun } from '@elastic/synthetics';
+import { createApmAndObsUsersAndRoles } from '@kbn/apm-plugin/scripts/create_apm_users_and_roles/create_apm_users_and_roles';
 import { esArchiverLoad, esArchiverUnload } from './tasks/es_archiver';
 
 import './journeys';
-import { createApmAndObsUsersAndRoles } from '../../apm/scripts/create_apm_users_and_roles/create_apm_users_and_roles';
-import { importMonitors } from './tasks/import_monitors';
 
 export function playwrightRunTests({ headless, match }: { headless: boolean; match?: string }) {
   return async ({ getService }: any) => {
@@ -44,8 +43,6 @@ async function playwrightStart(getService: any, headless = true, match?: string)
     port: config.get('servers.kibana.port'),
   });
 
-  await importMonitors({ kibanaUrl });
-
   await createApmAndObsUsersAndRoles({
     elasticsearch: { username: 'elastic', password: 'changeme' },
     kibana: { roleSuffix: 'e2e', hostname: kibanaUrl },
diff --git a/x-pack/plugins/uptime/e2e/tasks/es_archiver.ts b/x-pack/plugins/synthetics/e2e/tasks/es_archiver.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/tasks/es_archiver.ts
rename to x-pack/plugins/synthetics/e2e/tasks/es_archiver.ts
diff --git a/x-pack/plugins/uptime/e2e/tasks/import_monitors.ts b/x-pack/plugins/synthetics/e2e/tasks/import_monitors.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/tasks/import_monitors.ts
rename to x-pack/plugins/synthetics/e2e/tasks/import_monitors.ts
diff --git a/x-pack/plugins/uptime/e2e/tasks/read_kibana_config.ts b/x-pack/plugins/synthetics/e2e/tasks/read_kibana_config.ts
similarity index 100%
rename from x-pack/plugins/uptime/e2e/tasks/read_kibana_config.ts
rename to x-pack/plugins/synthetics/e2e/tasks/read_kibana_config.ts
diff --git a/x-pack/plugins/uptime/e2e/tasks/uptime_monitor.ndjson b/x-pack/plugins/synthetics/e2e/tasks/uptime_monitor.ndjson
similarity index 100%
rename from x-pack/plugins/uptime/e2e/tasks/uptime_monitor.ndjson
rename to x-pack/plugins/synthetics/e2e/tasks/uptime_monitor.ndjson
diff --git a/x-pack/plugins/uptime/e2e/tsconfig.json b/x-pack/plugins/synthetics/e2e/tsconfig.json
similarity index 100%
rename from x-pack/plugins/uptime/e2e/tsconfig.json
rename to x-pack/plugins/synthetics/e2e/tsconfig.json
diff --git a/x-pack/plugins/uptime/jest.config.js b/x-pack/plugins/synthetics/jest.config.js
similarity index 70%
rename from x-pack/plugins/uptime/jest.config.js
rename to x-pack/plugins/synthetics/jest.config.js
index baafb5ce133e6..de4161347ae40 100644
--- a/x-pack/plugins/uptime/jest.config.js
+++ b/x-pack/plugins/synthetics/jest.config.js
@@ -8,8 +8,8 @@
 module.exports = {
   preset: '@kbn/test',
   rootDir: '../../..',
-  roots: ['<rootDir>/x-pack/plugins/uptime'],
-  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/uptime',
+  roots: ['<rootDir>/x-pack/plugins/synthetics'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/synthetics',
   coverageReporters: ['text', 'html'],
-  collectCoverageFrom: ['<rootDir>/x-pack/plugins/uptime/{common,public,server}/**/*.{ts,tsx}'],
+  collectCoverageFrom: ['<rootDir>/x-pack/plugins/synthetics/{common,public,server}/**/*.{ts,tsx}'],
 };
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/synthetics/kibana.json
similarity index 80%
rename from x-pack/plugins/uptime/kibana.json
rename to x-pack/plugins/synthetics/kibana.json
index 2479f25d3234e..d65a89a16161f 100644
--- a/x-pack/plugins/uptime/kibana.json
+++ b/x-pack/plugins/synthetics/kibana.json
@@ -1,6 +1,6 @@
 {
   "configPath": ["xpack", "uptime"],
-  "id": "uptime",
+  "id": "synthetics",
   "kibanaVersion": "kibana",
   "optionalPlugins": ["cloud", "data", "fleet", "home", "ml", "telemetry"],
   "requiredPlugins": [
@@ -18,12 +18,13 @@
     "share",
     "taskManager",
     "triggersActionsUi",
-    "usageCollection"
+    "usageCollection",
+    "unifiedSearch"
   ],
   "server": true,
   "ui": true,
   "version": "8.0.0",
-  "requiredBundles": ["unifiedSearch", "fleet", "home", "kibanaReact", "kibanaUtils", "ml", "observability"],
+  "requiredBundles": ["unifiedSearch", "fleet", "kibanaReact", "kibanaUtils", "ml", "observability"],
   "owner": {
     "name": "Uptime",
     "githubTeam": "uptime"
diff --git a/x-pack/plugins/uptime/public/apps/__snapshots__/uptime_page_template.test.tsx.snap b/x-pack/plugins/synthetics/public/apps/__snapshots__/uptime_page_template.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/apps/__snapshots__/uptime_page_template.test.tsx.snap
rename to x-pack/plugins/synthetics/public/apps/__snapshots__/uptime_page_template.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/apps/locators/overview.test.ts b/x-pack/plugins/synthetics/public/apps/locators/overview.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/apps/locators/overview.test.ts
rename to x-pack/plugins/synthetics/public/apps/locators/overview.test.ts
diff --git a/x-pack/plugins/uptime/public/apps/locators/overview.ts b/x-pack/plugins/synthetics/public/apps/locators/overview.ts
similarity index 94%
rename from x-pack/plugins/uptime/public/apps/locators/overview.ts
rename to x-pack/plugins/synthetics/public/apps/locators/overview.ts
index 313383c8f0943..e2267d4d0fe6d 100644
--- a/x-pack/plugins/uptime/public/apps/locators/overview.ts
+++ b/x-pack/plugins/synthetics/public/apps/locators/overview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { uptimeOverviewLocatorID } from '../../../../observability/public';
+import { uptimeOverviewLocatorID } from '@kbn/observability-plugin/public';
 import { OVERVIEW_ROUTE } from '../../../common/constants/ui';
 
 const formatSearchKey = (key: string, value: string) => `${key}: "${value}"`;
diff --git a/x-pack/plugins/uptime/public/apps/plugin.ts b/x-pack/plugins/synthetics/public/apps/plugin.ts
similarity index 87%
rename from x-pack/plugins/uptime/public/apps/plugin.ts
rename to x-pack/plugins/synthetics/public/apps/plugin.ts
index 26fb87e7fc4ce..e413d52d18865 100644
--- a/x-pack/plugins/uptime/public/apps/plugin.ts
+++ b/x-pack/plugins/synthetics/public/apps/plugin.ts
@@ -11,46 +11,41 @@ import {
   Plugin,
   PluginInitializerContext,
   AppMountParameters,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { SharePluginSetup, SharePluginStart } from '../../../../../src/plugins/share/public';
-import { DiscoverStart } from '../../../../../src/plugins/discover/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../../../src/core/public';
+import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../../src/plugins/home/public';
-import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../triggers_actions_ui/public';
-import {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../../src/plugins/data/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-import { alertTypeInitializers, legacyAlertTypeInitializers } from '../lib/alert_types';
-import { FleetStart } from '../../../fleet/public';
+import { FleetStart } from '@kbn/fleet-plugin/public';
 import {
   FetchDataParams,
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
+import { CasesUiStart } from '@kbn/cases-plugin/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
 import { PLUGIN } from '../../common/constants/plugin';
-import { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import {
   LazySyntheticsPolicyCreateExtension,
   LazySyntheticsPolicyEditExtension,
 } from '../components/fleet_package';
 import { LazySyntheticsCustomAssetsExtension } from '../components/fleet_package/lazy_synthetics_custom_assets_extension';
-import { Start as InspectorPluginStart } from '../../../../../src/plugins/inspector/public';
-import { CasesUiStart } from '../../../cases/public';
 import { uptimeOverviewNavigatorParams } from './locators/overview';
-import { CloudSetup } from '../../../cloud/public';
+import { alertTypeInitializers, legacyAlertTypeInitializers } from '../lib/alert_types';
 
 export interface ClientPluginsSetup {
   home?: HomePublicPluginSetup;
@@ -64,6 +59,7 @@ export interface ClientPluginsSetup {
 export interface ClientPluginsStart {
   fleet?: FleetStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   discover: DiscoverStart;
   inspector: InspectorPluginStart;
   embeddable: EmbeddableStart;
@@ -97,7 +93,7 @@ export class UptimePlugin
         icon: 'uptimeApp',
         path: '/app/uptime',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
       });
     }
     const getUptimeDataHelper = async () => {
diff --git a/x-pack/plugins/uptime/public/apps/render_app.tsx b/x-pack/plugins/synthetics/public/apps/render_app.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/apps/render_app.tsx
rename to x-pack/plugins/synthetics/public/apps/render_app.tsx
index 2e1a6edca6fd0..9a64fe9e18621 100644
--- a/x-pack/plugins/uptime/public/apps/render_app.tsx
+++ b/x-pack/plugins/synthetics/public/apps/render_app.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n as i18nFormatter } from '@kbn/i18n';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { getIntegratedAppAvailability } from '../lib/adapters/framework/capabilities_adapter';
 import {
   DEFAULT_DARK_MODE,
diff --git a/x-pack/plugins/uptime/public/apps/uptime_app.tsx b/x-pack/plugins/synthetics/public/apps/uptime_app.tsx
similarity index 91%
rename from x-pack/plugins/uptime/public/apps/uptime_app.tsx
rename to x-pack/plugins/synthetics/public/apps/uptime_app.tsx
index 4387da4038061..b106123de1b29 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_app.tsx
+++ b/x-pack/plugins/synthetics/public/apps/uptime_app.tsx
@@ -9,13 +9,15 @@ import { Provider as ReduxProvider } from 'react-redux';
 import { Router } from 'react-router-dom';
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { I18nStart, ChromeBreadcrumb, CoreStart, AppMountParameters } from 'kibana/public';
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
+import { I18nStart, ChromeBreadcrumb, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { InspectorContextProvider } from '@kbn/observability-plugin/public';
 import { ClientPluginsSetup, ClientPluginsStart } from './plugin';
 import { UMUpdateBadge } from '../lib/lib';
 import {
@@ -27,14 +29,11 @@ import {
 import { CommonlyUsedRange } from '../components/common/uptime_date_picker';
 import { setBasePath } from '../state/actions';
 import { PageRouter } from '../routes';
-import { UptimeAlertsFlyoutWrapper } from '../components/overview/alerts';
-import { store } from '../state';
+import { UptimeAlertsFlyoutWrapper } from '../components/overview';
+import { store, storage } from '../state';
 import { kibanaService } from '../state/kibana_service';
 import { ActionMenu } from '../components/common/header/action_menu';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import { UptimeIndexPatternContextProvider } from '../contexts/uptime_index_pattern_context';
-import { InspectorContextProvider } from '../../../observability/public';
 
 export interface UptimeAppColors {
   danger: string;
@@ -102,8 +101,6 @@ const Application = (props: UptimeAppProps) => {
 
   store.dispatch(setBasePath(basePath));
 
-  const storage = new Storage(window.localStorage);
-
   return (
     <EuiErrorBoundary>
       <i18nCore.Context>
diff --git a/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts b/x-pack/plugins/synthetics/public/apps/uptime_overview_fetcher.ts
similarity index 92%
rename from x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
rename to x-pack/plugins/synthetics/public/apps/uptime_overview_fetcher.ts
index 8f8cf16d1e383..d8756715b8181 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
+++ b/x-pack/plugins/synthetics/public/apps/uptime_overview_fetcher.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { UptimeFetchDataResponse, FetchDataParams } from '../../../observability/public';
+import { CoreStart } from '@kbn/core/public';
+import { UptimeFetchDataResponse, FetchDataParams } from '@kbn/observability-plugin/public';
 import { fetchIndexStatus, fetchPingHistogram, fetchSnapshotCount } from '../state/api';
 import { kibanaService } from '../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/apps/uptime_page_template.test.tsx b/x-pack/plugins/synthetics/public/apps/uptime_page_template.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/apps/uptime_page_template.test.tsx
rename to x-pack/plugins/synthetics/public/apps/uptime_page_template.test.tsx
diff --git a/x-pack/plugins/uptime/public/apps/uptime_page_template.tsx b/x-pack/plugins/synthetics/public/apps/uptime_page_template.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/apps/uptime_page_template.tsx
rename to x-pack/plugins/synthetics/public/apps/uptime_page_template.tsx
index 49b859509a555..e359916de1d22 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_page_template.tsx
+++ b/x-pack/plugins/synthetics/public/apps/uptime_page_template.tsx
@@ -8,14 +8,14 @@
 import React, { useEffect, useMemo } from 'react';
 import styled from 'styled-components';
 import { EuiPageHeaderProps, EuiPageTemplateProps } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useInspectorContext } from '@kbn/observability-plugin/public';
 import { CERTIFICATES_ROUTE, OVERVIEW_ROUTE } from '../../common/constants';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from './plugin';
 import { useNoDataConfig } from './use_no_data_config';
 import { EmptyStateLoading } from '../components/overview/empty_state/empty_state_loading';
 import { EmptyStateError } from '../components/overview/empty_state/empty_state_error';
 import { useHasData } from '../components/overview/empty_state/use_has_data';
-import { useInspectorContext } from '../../../observability/public';
 import { useBreakpoints } from '../hooks/use_breakpoints';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/apps/use_no_data_config.ts b/x-pack/plugins/synthetics/public/apps/use_no_data_config.ts
similarity index 94%
rename from x-pack/plugins/uptime/public/apps/use_no_data_config.ts
rename to x-pack/plugins/synthetics/public/apps/use_no_data_config.ts
index dc00a25e3a111..1424d4047b6f0 100644
--- a/x-pack/plugins/uptime/public/apps/use_no_data_config.ts
+++ b/x-pack/plugins/synthetics/public/apps/use_no_data_config.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useContext } from 'react';
 import { useSelector } from 'react-redux';
-import { KibanaPageTemplateProps, useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplateProps, useKibana } from '@kbn/kibana-react-plugin/public';
 import { UptimeSettingsContext } from '../contexts';
 import { ClientPluginsStart } from './plugin';
 import { indexStatusSelector } from '../state/selectors';
diff --git a/x-pack/plugins/uptime/public/badge.ts b/x-pack/plugins/synthetics/public/badge.ts
similarity index 86%
rename from x-pack/plugins/uptime/public/badge.ts
rename to x-pack/plugins/synthetics/public/badge.ts
index 6c5eb8f01e790..a42eaa58a7943 100644
--- a/x-pack/plugins/uptime/public/badge.ts
+++ b/x-pack/plugins/synthetics/public/badge.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-import { ChromeBadge } from 'src/core/public';
+import { ChromeBadge } from '@kbn/core/public';
 export type UMBadge = ChromeBadge | undefined;
diff --git a/x-pack/plugins/uptime/public/components/certificates/__snapshots__/cert_monitors.test.tsx.snap b/x-pack/plugins/synthetics/public/components/certificates/__snapshots__/cert_monitors.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/__snapshots__/cert_monitors.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/certificates/__snapshots__/cert_monitors.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/certificates/__snapshots__/cert_search.test.tsx.snap b/x-pack/plugins/synthetics/public/components/certificates/__snapshots__/cert_search.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/__snapshots__/cert_search.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/certificates/__snapshots__/cert_search.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/certificates/__snapshots__/cert_status.test.tsx.snap b/x-pack/plugins/synthetics/public/components/certificates/__snapshots__/cert_status.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/__snapshots__/cert_status.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/certificates/__snapshots__/cert_status.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_monitors.test.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_monitors.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_monitors.test.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_monitors.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_monitors.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_monitors.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_monitors.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_monitors.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_refresh_btn.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_refresh_btn.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_refresh_btn.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_refresh_btn.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_search.test.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_search.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_search.test.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_search.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_search.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_search.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_search.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_search.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_status.test.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_status.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_status.test.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_status.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_status.tsx b/x-pack/plugins/synthetics/public/components/certificates/cert_status.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/cert_status.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/cert_status.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/certificate_title.tsx b/x-pack/plugins/synthetics/public/components/certificates/certificate_title.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/certificate_title.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/certificate_title.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/certificates_list.test.tsx b/x-pack/plugins/synthetics/public/components/certificates/certificates_list.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/certificates_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/certificates_list.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/certificates_list.tsx b/x-pack/plugins/synthetics/public/components/certificates/certificates_list.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/certificates_list.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/certificates_list.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.test.tsx b/x-pack/plugins/synthetics/public/components/certificates/fingerprint_col.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/fingerprint_col.test.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/fingerprint_col.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx b/x-pack/plugins/synthetics/public/components/certificates/fingerprint_col.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
rename to x-pack/plugins/synthetics/public/components/certificates/fingerprint_col.tsx
diff --git a/x-pack/plugins/uptime/public/components/certificates/index.ts b/x-pack/plugins/synthetics/public/components/certificates/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/index.ts
rename to x-pack/plugins/synthetics/public/components/certificates/index.ts
diff --git a/x-pack/plugins/uptime/public/components/certificates/translations.ts b/x-pack/plugins/synthetics/public/components/certificates/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/certificates/translations.ts
rename to x-pack/plugins/synthetics/public/components/certificates/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts b/x-pack/plugins/synthetics/public/components/certificates/use_cert_search.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts
rename to x-pack/plugins/synthetics/public/components/certificates/use_cert_search.ts
index 0f6431fb7ab7e..47facebe4401f 100644
--- a/x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts
+++ b/x-pack/plugins/synthetics/public/components/certificates/use_cert_search.ts
@@ -7,7 +7,7 @@
 
 import { useSelector } from 'react-redux';
 import { useContext } from 'react';
-import { createEsParams, useEsSearch } from '../../../../observability/public';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 
 import { CertResult, GetCertsParams, Ping } from '../../../common/runtime_types';
 
diff --git a/x-pack/plugins/uptime/public/components/common/__snapshots__/location_link.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/__snapshots__/location_link.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/__snapshots__/location_link.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/__snapshots__/location_link.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/__snapshots__/monitor_page_link.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/__snapshots__/monitor_page_link.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/__snapshots__/monitor_page_link.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/__snapshots__/monitor_page_link.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/__snapshots__/monitor_tags.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/__snapshots__/monitor_tags.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/__snapshots__/monitor_tags.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/__snapshots__/monitor_tags.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx b/x-pack/plugins/synthetics/public/components/common/alerts/uptime_edit_alert_flyout.tsx
similarity index 90%
rename from x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx
rename to x-pack/plugins/synthetics/public/components/common/alerts/uptime_edit_alert_flyout.tsx
index a12589cc74971..ac25c537a8a7f 100644
--- a/x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/alerts/uptime_edit_alert_flyout.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type {
   Rule,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { UptimeAlertTypeParams } from '../../../state/alerts/alerts';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/chart_empty_state.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/chart_empty_state.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/__snapshots__/chart_empty_state.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/chart_empty_state.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/chart_wrapper.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/chart_wrapper.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/__snapshots__/chart_wrapper.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/chart_wrapper.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart_legend_row.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/donut_chart_legend_row.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart_legend_row.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/donut_chart_legend_row.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/monitor_bar_series.test.tsx.snap b/x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/monitor_bar_series.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/__snapshots__/monitor_bar_series.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/common/charts/__snapshots__/monitor_bar_series.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/common/charts/annotation_tooltip.tsx b/x-pack/plugins/synthetics/public/components/common/charts/annotation_tooltip.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/annotation_tooltip.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/annotation_tooltip.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/chart_empty_state.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/chart_empty_state.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/chart_empty_state.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/chart_empty_state.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/chart_empty_state.tsx b/x-pack/plugins/synthetics/public/components/common/charts/chart_empty_state.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/chart_empty_state.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/chart_empty_state.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/chart_wrapper.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/chart_wrapper.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/chart_wrapper.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/chart_wrapper.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/chart_wrapper.tsx b/x-pack/plugins/synthetics/public/components/common/charts/chart_wrapper/chart_wrapper.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/chart_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/chart_wrapper/chart_wrapper.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/index.ts b/x-pack/plugins/synthetics/public/components/common/charts/chart_wrapper/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/index.ts
rename to x-pack/plugins/synthetics/public/components/common/charts/chart_wrapper/index.ts
diff --git a/x-pack/plugins/uptime/public/components/common/charts/donut_chart.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/donut_chart.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/donut_chart.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/donut_chart.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/donut_chart.tsx b/x-pack/plugins/synthetics/public/components/common/charts/donut_chart.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/donut_chart.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/donut_chart.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend.tsx b/x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend_row.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend_row.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend_row.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend_row.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend_row.tsx b/x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend_row.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend_row.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/donut_chart_legend_row.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx b/x-pack/plugins/synthetics/public/components/common/charts/duration_chart.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/duration_chart.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_charts.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/duration_charts.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/duration_charts.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/duration_charts.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx b/x-pack/plugins/synthetics/public/components/common/charts/duration_line_bar_list.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/duration_line_bar_list.tsx
index 3d0fefbd083f8..6bafb9cef1d36 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/charts/duration_line_bar_list.tsx
@@ -8,12 +8,8 @@
 import React from 'react';
 import moment from 'moment';
 import { AnnotationTooltipFormatter, RectAnnotation, RectAnnotationDatum } from '@elastic/charts';
+import { ANOMALY_SEVERITY, getSeverityColor, getSeverityType } from '@kbn/ml-plugin/public';
 import { AnnotationTooltip } from './annotation_tooltip';
-import {
-  ANOMALY_SEVERITY,
-  getSeverityColor,
-  getSeverityType,
-} from '../../../../../../plugins/ml/public';
 
 interface Props {
   anomalies: any;
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx b/x-pack/plugins/synthetics/public/components/common/charts/duration_line_series_list.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/duration_line_series_list.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/get_tick_format.test.ts b/x-pack/plugins/synthetics/public/components/common/charts/get_tick_format.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/get_tick_format.test.ts
rename to x-pack/plugins/synthetics/public/components/common/charts/get_tick_format.test.ts
diff --git a/x-pack/plugins/uptime/public/components/common/charts/get_tick_format.ts b/x-pack/plugins/synthetics/public/components/common/charts/get_tick_format.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/get_tick_format.ts
rename to x-pack/plugins/synthetics/public/components/common/charts/get_tick_format.ts
diff --git a/x-pack/plugins/uptime/public/components/common/charts/index.ts b/x-pack/plugins/synthetics/public/components/common/charts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/index.ts
rename to x-pack/plugins/synthetics/public/components/common/charts/index.ts
diff --git a/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/monitor_bar_series.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/monitor_bar_series.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.tsx b/x-pack/plugins/synthetics/public/components/common/charts/monitor_bar_series.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/monitor_bar_series.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.test.tsx b/x-pack/plugins/synthetics/public/components/common/charts/ping_histogram.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/ping_histogram.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/ping_histogram.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx b/x-pack/plugins/synthetics/public/components/common/charts/ping_histogram.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
rename to x-pack/plugins/synthetics/public/components/common/charts/ping_histogram.tsx
index b0e39fd5bf651..c302f47e29bdd 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/charts/ping_histogram.tsx
@@ -24,6 +24,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import numeral from '@elastic/numeral';
 import moment from 'moment';
 import { useSelector } from 'react-redux';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { getChartDateLabel } from '../../../lib/helper';
 import { ChartWrapper } from './chart_wrapper';
 import { UptimeThemeContext } from '../../../contexts';
@@ -32,7 +33,6 @@ import { useMonitorId, useUrlParams } from '../../../hooks';
 import { ChartEmptyState } from './chart_empty_state';
 import { getDateRangeFromChartElement } from './utils';
 import { STATUS_DOWN_LABEL, STATUS_UP_LABEL } from '../translations';
-import { createExploratoryViewUrl } from '../../../../../observability/public';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 import { monitorStatusSelector } from '../../../state/selectors';
 
diff --git a/x-pack/plugins/uptime/public/components/common/charts/utils.test.ts b/x-pack/plugins/synthetics/public/components/common/charts/utils.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/utils.test.ts
rename to x-pack/plugins/synthetics/public/components/common/charts/utils.test.ts
diff --git a/x-pack/plugins/uptime/public/components/common/charts/utils.ts b/x-pack/plugins/synthetics/public/components/common/charts/utils.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/charts/utils.ts
rename to x-pack/plugins/synthetics/public/components/common/charts/utils.ts
diff --git a/x-pack/plugins/uptime/public/components/common/header/action_menu.tsx b/x-pack/plugins/synthetics/public/components/common/header/action_menu.tsx
similarity index 80%
rename from x-pack/plugins/uptime/public/components/common/header/action_menu.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/action_menu.tsx
index 7faa2fbc294cd..69821360aab8b 100644
--- a/x-pack/plugins/uptime/public/components/common/header/action_menu.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/header/action_menu.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import { HeaderMenuPortal } from '../../../../../observability/public';
-import { AppMountParameters } from '../../../../../../../src/core/public';
+import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { ActionMenuContent } from './action_menu_content';
 
 export const ActionMenu = ({ appMountParameters }: { appMountParameters: AppMountParameters }) => (
diff --git a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx b/x-pack/plugins/synthetics/public/components/common/header/action_menu_content.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/action_menu_content.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx b/x-pack/plugins/synthetics/public/components/common/header/action_menu_content.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/action_menu_content.tsx
index c0277aa535585..3e7a6db48ff36 100644
--- a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/header/action_menu_content.tsx
@@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import { createExploratoryViewUrl } from '../../../../../observability/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 import { useGetUrlParams } from '../../../hooks';
 import { ToggleAlertFlyoutButton } from '../../overview/alerts/alerts_containers';
diff --git a/x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx b/x-pack/plugins/synthetics/public/components/common/header/inspector_header_link.tsx
similarity index 86%
rename from x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/inspector_header_link.tsx
index c55ef9bdf781e..935f732f1b700 100644
--- a/x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/header/inspector_header_link.tsx
@@ -8,8 +8,8 @@
 import { EuiHeaderLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { enableInspectEsQueries, useInspectorContext } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { enableInspectEsQueries, useInspectorContext } from '@kbn/observability-plugin/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
diff --git a/x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx b/x-pack/plugins/synthetics/public/components/common/header/manage_monitors_btn.tsx
similarity index 53%
rename from x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/manage_monitors_btn.tsx
index 6c95025219c50..5cc489fe4d7a4 100644
--- a/x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/header/manage_monitors_btn.tsx
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { EuiHeaderLink, EuiTourStep, EuiText } from '@elastic/eui';
+import { EuiButton, EuiHeaderLink, EuiLink, EuiSpacer, EuiTourStep, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { MONITOR_MANAGEMENT_ROUTE } from '../../../../common/constants';
 import { PUBLIC_BETA_DESCRIPTION } from '../../../pages/monitor_management/service_allowed_wrapper';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsSetup } from '../../../apps/plugin';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
@@ -27,6 +27,11 @@ export const ManageMonitorsBtn = () => {
 
   const { isDev } = useUptimeSettingsContext();
 
+  const handleOnClick = () => {
+    setIsOpen(false);
+    history.push(MONITOR_MANAGEMENT_ROUTE + '/all');
+  };
+
   if (!cloud?.isCloudEnabled && !isDev) {
     return null;
   }
@@ -34,27 +39,35 @@ export const ManageMonitorsBtn = () => {
   return (
     <EuiTourStep
       content={
-        <EuiText>
-          <p>{PUBLIC_BETA_DESCRIPTION}</p>
-        </EuiText>
+        <>
+          <EuiText size="s">
+            <p>{PUBLIC_BETA_DESCRIPTION}</p>
+          </EuiText>
+          <EuiSpacer />
+          <EuiButton color="primary" fill onClick={handleOnClick}>
+            {MONITOR_MANAGEMENT_LABEL}
+          </EuiButton>
+        </>
       }
       isStepOpen={isOpen}
-      minWidth={300}
       onFinish={() => setIsOpen(false)}
       step={1}
       stepsTotal={1}
-      title={MONITOR_MANAGEMENT_LABEL}
+      subtitle={NEW_LABEL}
+      title={GETTING_STARTED_LABEL}
       anchorPosition="upCenter"
+      maxWidth={416}
+      footerAction={
+        <EuiLink data-test-subj="syntheticsManagementTourDismiss" onClick={() => setIsOpen(false)}>
+          {DISMISS_LABEL}
+        </EuiLink>
+      }
     >
       <EuiHeaderLink
-        aria-label={i18n.translate('xpack.uptime.page_header.manageLink.label', {
-          defaultMessage: 'Navigate to the Uptime Monitor Management page',
-        })}
+        aria-label={NAVIGATE_LABEL}
         color="text"
-        data-test-subj="management-page-link"
-        href={history.createHref({
-          pathname: MONITOR_MANAGEMENT_ROUTE + '/all',
-        })}
+        data-test-subj="syntheticsManagementPageLink"
+        onClick={handleOnClick}
       >
         <FormattedMessage
           id="xpack.uptime.page_header.manageMonitors"
@@ -65,6 +78,24 @@ export const ManageMonitorsBtn = () => {
   );
 };
 
+const GETTING_STARTED_LABEL = i18n.translate(
+  'xpack.uptime.monitorManagement.gettingStarted.label',
+  {
+    defaultMessage: 'Get started with Synthetic Monitoring',
+  }
+);
+
 const MONITOR_MANAGEMENT_LABEL = i18n.translate('xpack.uptime.monitorManagement.try.label', {
   defaultMessage: 'Try Monitor Management',
 });
+const DISMISS_LABEL = i18n.translate('xpack.uptime.monitorManagement.try.dismiss', {
+  defaultMessage: 'Dismiss',
+});
+
+const NAVIGATE_LABEL = i18n.translate('xpack.uptime.page_header.manageLink.label', {
+  defaultMessage: 'Navigate to the Uptime Monitor Management page',
+});
+
+const NEW_LABEL = i18n.translate('xpack.uptime.monitorManagement.new.label', {
+  defaultMessage: 'New',
+});
diff --git a/x-pack/plugins/uptime/public/components/common/header/page_tabs.test.tsx b/x-pack/plugins/synthetics/public/components/common/header/page_tabs.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/header/page_tabs.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/page_tabs.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/header/page_tabs.tsx b/x-pack/plugins/synthetics/public/components/common/header/page_tabs.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/header/page_tabs.tsx
rename to x-pack/plugins/synthetics/public/components/common/header/page_tabs.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/higher_order/index.ts b/x-pack/plugins/synthetics/public/components/common/higher_order/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/higher_order/index.ts
rename to x-pack/plugins/synthetics/public/components/common/higher_order/index.ts
diff --git a/x-pack/plugins/uptime/public/components/common/higher_order/responsive_wrapper.test.tsx b/x-pack/plugins/synthetics/public/components/common/higher_order/responsive_wrapper.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/higher_order/responsive_wrapper.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/higher_order/responsive_wrapper.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/higher_order/responsive_wrapper.tsx b/x-pack/plugins/synthetics/public/components/common/higher_order/responsive_wrapper.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/higher_order/responsive_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/common/higher_order/responsive_wrapper.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/location_link.test.tsx b/x-pack/plugins/synthetics/public/components/common/location_link.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/location_link.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/location_link.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/location_link.tsx b/x-pack/plugins/synthetics/public/components/common/location_link.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/location_link.tsx
rename to x-pack/plugins/synthetics/public/components/common/location_link.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/monitor_page_link.test.tsx b/x-pack/plugins/synthetics/public/components/common/monitor_page_link.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/monitor_page_link.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/monitor_page_link.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/monitor_page_link.tsx b/x-pack/plugins/synthetics/public/components/common/monitor_page_link.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/monitor_page_link.tsx
rename to x-pack/plugins/synthetics/public/components/common/monitor_page_link.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/monitor_tags.test.tsx b/x-pack/plugins/synthetics/public/components/common/monitor_tags.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/monitor_tags.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/monitor_tags.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/monitor_tags.tsx b/x-pack/plugins/synthetics/public/components/common/monitor_tags.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/common/monitor_tags.tsx
rename to x-pack/plugins/synthetics/public/components/common/monitor_tags.tsx
index 793c27a031546..35684e8326f6c 100644
--- a/x-pack/plugins/uptime/public/components/common/monitor_tags.tsx
+++ b/x-pack/plugins/synthetics/public/components/common/monitor_tags.tsx
@@ -9,6 +9,7 @@ import React, { useMemo, useState } from 'react';
 import { EuiBadge, EuiBadgeGroup, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useHistory } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Ping } from '../../../common/runtime_types/ping';
 import { MonitorSummary } from '../../../common/runtime_types/monitor';
 import { useFilterUpdate } from '../../hooks/use_filter_update';
@@ -16,7 +17,6 @@ import { useGetUrlParams } from '../../hooks';
 import { parseCurrentFilters } from '../overview/monitor_list/columns/monitor_name_col';
 import { EXPAND_TAGS_LABEL } from '../overview/monitor_list/columns/translations';
 import { OVERVIEW_ROUTE } from '../../../common/constants';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   ping?: Ping | null;
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/index.ts b/x-pack/plugins/synthetics/public/components/common/react_router_helpers/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/react_router_helpers/index.ts
rename to x-pack/plugins/synthetics/public/components/common/react_router_helpers/index.ts
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts b/x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_events.test.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts
rename to x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_events.test.ts
index f57596910c849..1046f47f8f380 100644
--- a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts
+++ b/x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_events.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { letBrowserHandleEvent } from './index';
+import { letBrowserHandleEvent } from '.';
 
 describe('letBrowserHandleEvent', () => {
   const event = {
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.ts b/x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.ts
rename to x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_events.ts
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.test.tsx b/x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_for_eui.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_for_eui.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.tsx b/x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_for_eui.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.tsx
rename to x-pack/plugins/synthetics/public/components/common/react_router_helpers/link_for_eui.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/step_detail_link.tsx b/x-pack/plugins/synthetics/public/components/common/step_detail_link.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/step_detail_link.tsx
rename to x-pack/plugins/synthetics/public/components/common/step_detail_link.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/translations.ts b/x-pack/plugins/synthetics/public/components/common/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/translations.ts
rename to x-pack/plugins/synthetics/public/components/common/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/common/uptime_date_picker.test.tsx b/x-pack/plugins/synthetics/public/components/common/uptime_date_picker.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/uptime_date_picker.test.tsx
rename to x-pack/plugins/synthetics/public/components/common/uptime_date_picker.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/common/uptime_date_picker.tsx b/x-pack/plugins/synthetics/public/components/common/uptime_date_picker.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/common/uptime_date_picker.tsx
rename to x-pack/plugins/synthetics/public/components/common/uptime_date_picker.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/advanced_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/advanced_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/advanced_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/advanced_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/advanced_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/advanced_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/advanced_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/advanced_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/browser/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.test.ts b/x-pack/plugins/synthetics/public/components/fleet_package/browser/normalizers.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.test.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/normalizers.test.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/browser/normalizers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/normalizers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/script_recorder_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/script_recorder_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/script_recorder_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/script_recorder_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/script_recorder_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/script_recorder_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/script_recorder_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/script_recorder_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/simple_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/simple_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/source_field.test.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/source_field.test.tsx
index 7bff465bae1bd..ae5db0662dd85 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/browser/source_field.test.tsx
@@ -25,8 +25,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/source_field.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/source_field.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/throttling_fields.test.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/throttling_fields.test.tsx
index f817f1ff9a805..dc74717ec2c98 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/browser/throttling_fields.test.tsx
@@ -214,7 +214,6 @@ describe('<ThrottlingFields />', () => {
     const throttling = {
       [BandwidthLimitKey.DOWNLOAD]: 100,
       [BandwidthLimitKey.UPLOAD]: 50,
-      [BandwidthLimitKey.LATENCY]: 25,
     };
 
     const defaultLocations = [defaultLocation];
@@ -339,54 +338,6 @@ describe('<ThrottlingFields />', () => {
         )
       ).not.toBeInTheDocument();
     });
-
-    it("shows latency warnings when exceeding the node's latency limits", () => {
-      const { getByLabelText, queryByText } = render(
-        <WrappedComponent
-          policyConfigOverrides={{ throttling, defaultLocations, runsOnService: true }}
-        />
-      );
-
-      const latencyLimit = throttling[BandwidthLimitKey.LATENCY];
-
-      const latency = getByLabelText('Latency') as HTMLInputElement;
-      userEvent.clear(latency);
-      userEvent.type(latency, String(latencyLimit + 1));
-
-      expect(
-        queryByText(
-          `You have exceeded the latency limit for Synthetic Nodes. The latency value can't be larger than ${latencyLimit}ms.`
-        )
-      ).toBeInTheDocument();
-
-      expect(
-        queryByText("You've exceeded the Synthetics Node bandwidth limits")
-      ).toBeInTheDocument();
-
-      expect(
-        queryByText(
-          'When using throttling values larger than a Synthetics Node bandwidth limit, your monitor will still have its bandwidth capped.'
-        )
-      ).toBeInTheDocument();
-
-      userEvent.clear(latency);
-      userEvent.type(latency, String(latencyLimit - 1));
-      expect(
-        queryByText(
-          `You have exceeded the latency limit for Synthetic Nodes. The latency value can't be larger than ${latencyLimit}ms.`
-        )
-      ).not.toBeInTheDocument();
-
-      expect(
-        queryByText("You've exceeded the Synthetics Node bandwidth limits")
-      ).not.toBeInTheDocument();
-
-      expect(
-        queryByText(
-          'When using throttling values larger than a Synthetics Node bandwidth limit, your monitor will still have its bandwidth capped.'
-        )
-      ).not.toBeInTheDocument();
-    });
   });
 
   it('only displays download, upload, and latency fields with throttling is on', () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/throttling_fields.tsx
similarity index 90%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/throttling_fields.tsx
index 683bc1e79e386..f7fc15887e721 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/browser/throttling_fields.tsx
@@ -76,17 +76,15 @@ export const ThrottlingExceededCallout = () => {
 export const ThrottlingExceededMessage = ({
   throttlingField,
   limit,
-  unit,
 }: {
   throttlingField: string;
   limit: number;
-  unit: string;
 }) => {
   return (
     <FormattedMessage
       id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.throttling_exceeded.message"
-      defaultMessage="You have exceeded the { throttlingField } limit for Synthetic Nodes. The { throttlingField } value can't be larger than { limit }{unit}."
-      values={{ throttlingField, limit, unit }}
+      defaultMessage="You have exceeded the { throttlingField } limit for Synthetic Nodes. The { throttlingField } value can't be larger than { limit }Mbps."
+      values={{ throttlingField, limit }}
     />
   );
 };
@@ -97,7 +95,6 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
 
   const maxDownload = throttling[BandwidthLimitKey.DOWNLOAD];
   const maxUpload = throttling[BandwidthLimitKey.UPLOAD];
-  const maxLatency = throttling[BandwidthLimitKey.LATENCY];
 
   const handleInputChange = useCallback(
     ({ value, configKey }: { value: unknown; configKey: ThrottlingConfigs }) => {
@@ -110,7 +107,6 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
     runsOnService && parseFloat(fields[ConfigKey.DOWNLOAD_SPEED]) > maxDownload;
   const exceedsUploadLimits =
     runsOnService && parseFloat(fields[ConfigKey.UPLOAD_SPEED]) > maxUpload;
-  const exceedsLatencyLimits = runsOnService && parseFloat(fields[ConfigKey.LATENCY]) > maxLatency;
   const isThrottlingEnabled = fields[ConfigKey.IS_THROTTLING_ENABLED];
 
   const throttlingInputs = isThrottlingEnabled ? (
@@ -127,7 +123,7 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
         isInvalid={!!validate[ConfigKey.DOWNLOAD_SPEED]?.(fields) || exceedsDownloadLimits}
         error={
           exceedsDownloadLimits ? (
-            <ThrottlingExceededMessage throttlingField="download" limit={maxDownload} unit="Mbps" />
+            <ThrottlingExceededMessage throttlingField="download" limit={maxDownload} />
           ) : (
             <FormattedMessage
               id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.error"
@@ -166,7 +162,7 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
         isInvalid={!!validate[ConfigKey.UPLOAD_SPEED]?.(fields) || exceedsUploadLimits}
         error={
           exceedsUploadLimits ? (
-            <ThrottlingExceededMessage throttlingField="upload" limit={maxUpload} unit="Mbps" />
+            <ThrottlingExceededMessage throttlingField="upload" limit={maxUpload} />
           ) : (
             <FormattedMessage
               id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.upload.error"
@@ -202,16 +198,12 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
           />
         }
         labelAppend={<OptionalLabel />}
-        isInvalid={!!validate[ConfigKey.LATENCY]?.(fields) || exceedsLatencyLimits}
+        isInvalid={!!validate[ConfigKey.LATENCY]?.(fields)}
         error={
-          exceedsLatencyLimits ? (
-            <ThrottlingExceededMessage throttlingField="latency" limit={maxLatency} unit="ms" />
-          ) : (
-            <FormattedMessage
-              id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error"
-              defaultMessage="Latency must not be negative."
-            />
-          )
+          <FormattedMessage
+            id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error"
+            defaultMessage="Latency must not be negative."
+          />
         }
       >
         <EuiFieldNumber
@@ -277,8 +269,7 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
         }
         onBlur={() => onFieldBlur?.(ConfigKey.IS_THROTTLING_ENABLED)}
       />
-      {isThrottlingEnabled &&
-      (exceedsDownloadLimits || exceedsUploadLimits || exceedsLatencyLimits) ? (
+      {isThrottlingEnabled && (exceedsDownloadLimits || exceedsUploadLimits) ? (
         <>
           <EuiSpacer />
           <ThrottlingExceededCallout />
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/uploader.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/uploader.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/uploader.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/uploader.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/browser/zip_url_tls_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/browser/zip_url_tls_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/code_editor.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/code_editor.tsx
index ee3ede16582f9..328d05217b98f 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/code_editor.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { EuiPanel } from '@elastic/eui';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { CodeEditor as MonacoCodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { CodeEditor as MonacoCodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { MonacoEditorLangId } from './types';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/combo_box.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/combo_box.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/combo_box.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/combo_box.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/combo_box.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/combo_box.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/combo_box.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/combo_box.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/common_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/common/common_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/common_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/common_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/default_values.ts b/x-pack/plugins/synthetics/public/components/fleet_package/common/default_values.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/default_values.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/default_values.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/common/described_form_group_with_wrap.tsx
similarity index 91%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/described_form_group_with_wrap.tsx
index 5668b6f1121c8..c029be5fbef22 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/common/described_form_group_with_wrap.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { EuiDescribedFormGroup } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 /**
  * EuiForm group doesn't expose props to control the flex wrapping on flex groups defining form rows.
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/enabled.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/common/enabled.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/enabled.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/enabled.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.test.ts b/x-pack/plugins/synthetics/public/components/fleet_package/common/formatters.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/formatters.test.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/formatters.test.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/common/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.test.ts b/x-pack/plugins/synthetics/public/components/fleet_package/common/normalizers.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.test.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/normalizers.test.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/common/normalizers.ts
similarity index 91%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/normalizers.ts
index e71a0511cbaf1..8f1b7ad230d9c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/common/normalizers.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { CommonFields, ConfigKey } from '../types';
-import { NewPackagePolicyInput } from '../../../../../fleet/common';
+import { NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
+import { CommonFields, ConfigKey, DataStream } from '../types';
 import { defaultValues as commonDefaultValues } from './default_values';
 import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants';
+import { defaultConfig } from '../contexts';
 
 // TO DO: create a standard input format that all fields resolve to
 export type Normalizer = (fields: NewPackagePolicyInput['vars']) => unknown;
@@ -64,6 +65,7 @@ export const commonNormalizers: CommonNormalizerMap = {
   [ConfigKey.LOCATIONS]: getCommonNormalizer(ConfigKey.LOCATIONS),
   [ConfigKey.SCHEDULE]: (fields) => {
     const value = fields?.[ConfigKey.SCHEDULE]?.value;
+    const type = fields?.[ConfigKey.MONITOR_TYPE]?.value as DataStream;
     if (value) {
       const fullString = JSON.parse(fields?.[ConfigKey.SCHEDULE]?.value);
       const fullSchedule = fullString.replace('@every ', '');
@@ -74,7 +76,7 @@ export const commonNormalizers: CommonNormalizerMap = {
         number,
       };
     } else {
-      return commonDefaultValues[ConfigKey.SCHEDULE];
+      return defaultConfig[type][ConfigKey.SCHEDULE];
     }
   },
   [ConfigKey.APM_SERVICE_NAME]: getCommonNormalizer(ConfigKey.APM_SERVICE_NAME),
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/simple_fields_wrapper.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/common/simple_fields_wrapper.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/simple_fields_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/simple_fields_wrapper.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/tls_options.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/common/tls_options.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/common/tls_options.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/common/tls_options.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context.tsx
similarity index 93%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context.tsx
index 015023318556a..f7b67488e4bcc 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext, useMemo, useState } from 'react';
-import { BrowserSimpleFields, ConfigKey, DataStream } from '../types';
+import { BrowserSimpleFields, ConfigKey, DataStream, ScheduleUnit } from '../types';
 import { defaultValues as commonDefaultValues } from '../common/default_values';
 
 interface BrowserSimpleFieldsContext {
@@ -22,6 +22,10 @@ interface BrowserSimpleFieldsContextProvider {
 
 export const initialValues: BrowserSimpleFields = {
   ...commonDefaultValues,
+  [ConfigKey.SCHEDULE]: {
+    unit: ScheduleUnit.MINUTES,
+    number: '10',
+  },
   [ConfigKey.METADATA]: {
     script_source: {
       is_generated_script: false,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context_advanced.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context_advanced.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context_advanced.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context_advanced.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_provider.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_provider.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_provider.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_provider.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_context.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context_advanced.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_context_advanced.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context_advanced.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_context_advanced.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_provider.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_provider.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/http_provider.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_provider.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/icmp_context.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/icmp_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/icmp_context.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/icmp_context.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/index.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/policy_config_context.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/policy_config_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/policy_config_context.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/policy_config_context.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/synthetics_context_providers.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/synthetics_context_providers.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/synthetics_context_providers.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/synthetics_context_providers.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_context.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context_advanced.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_context_advanced.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context_advanced.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_context_advanced.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_provider.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_provider.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_provider.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_provider.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tls_fields_context.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/contexts/tls_fields_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/contexts/tls_fields_context.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/contexts/tls_fields_context.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/custom_fields.test.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/custom_fields.test.tsx
index 9a22163b9c90d..e4e55b96f09dc 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/custom_fields.test.tsx
@@ -34,8 +34,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/custom_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/custom_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/header_field.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/header_field.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/header_field.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/header_field.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/header_field.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/header_field.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/header_field.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/header_field.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/helpers/context_helpers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/helpers/context_helpers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/helpers/context_helpers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/helpers/context_helpers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/helpers/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/helpers/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/helpers/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/helpers/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/helpers/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/helpers/normalizers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/helpers/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/helpers/normalizers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_policy.ts b/x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_policy.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/hooks/use_policy.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_policy.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_update_policy.test.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_update_policy.test.tsx
index c8a96c8eede83..9a3597e678c3c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_update_policy.test.tsx
@@ -6,7 +6,7 @@
  */
 import { renderHook } from '@testing-library/react-hooks';
 import { useUpdatePolicy } from './use_update_policy';
-import { NewPackagePolicy } from '../../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { validate } from '../validation';
 import {
   ConfigKey,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts b/x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_update_policy.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_update_policy.ts
index 8c312c8c9abfa..dcccecb220ac0 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_update_policy.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useEffect, useRef, useState } from 'react';
-import { NewPackagePolicy } from '../../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { ConfigKey, DataStream, Validation, MonitorFields } from '../types';
 import { formatters } from '../helpers/formatters';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/http/advanced_fields.test.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/http/advanced_fields.test.tsx
index b84a659753a35..c6d2d90467595 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/http/advanced_fields.test.tsx
@@ -26,8 +26,8 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/http/advanced_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/http/advanced_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/http/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/http/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/http/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/http/normalizers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/http/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/http/normalizers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/http/simple_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/http/simple_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/advanced_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/icmp/advanced_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/icmp/advanced_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/icmp/advanced_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/advanced_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/icmp/advanced_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/icmp/advanced_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/icmp/advanced_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/icmp/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/icmp/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/icmp/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/icmp/normalizers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/icmp/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/icmp/normalizers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/icmp/simple_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/icmp/simple_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/index.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/index.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/index.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/index.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/index_response_body_field.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/index_response_body_field.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/index_response_body_field.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/index_response_body_field.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/index_response_body_field.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/index_response_body_field.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/index_response_body_field.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/index_response_body_field.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/key_value_field.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/key_value_field.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/key_value_field.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/key_value_field.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/key_value_field.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/key_value_field.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/key_value_field.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/key_value_field.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_custom_assets_extension.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_custom_assets_extension.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_custom_assets_extension.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_custom_assets_extension.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
index ec7266acca989..5fce9cfd1461c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazySyntheticsPolicyCreateExtension = lazy<PackagePolicyCreateExtensionComponent>(
   async () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
index e7b0564ad4cc3..0810dec8591bf 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazySyntheticsPolicyEditExtension = lazy<PackagePolicyEditExtensionComponent>(
   async () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/optional_label.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/optional_label.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/optional_label.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/optional_label.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/request_body_field.test.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/request_body_field.test.tsx
index c3bc20076bc2f..6dad2b9b6efd9 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/request_body_field.test.tsx
@@ -17,8 +17,8 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/request_body_field.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/request_body_field.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/request_body_field.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/schedule_field.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/schedule_field.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/schedule_field.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/schedule_field.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/schedule_field.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/schedule_field.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/schedule_field.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/schedule_field.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_custom_assets_extension.tsx
similarity index 90%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_custom_assets_extension.tsx
index 7eda6efa20530..65ebdf27dd374 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_custom_assets_extension.tsx
@@ -12,8 +12,8 @@ import {
   PackageAssetsComponent,
   CustomAssetsAccordionProps,
   CustomAssetsAccordion,
-} from '../../../../fleet/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ClientPluginsStart } from '../../apps/plugin';
 import { PLUGIN } from '../../../common/constants/plugin';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension.tsx
index db06f9dd8cd91..e93cc20e4d2ad 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { memo, useEffect, useMemo } from 'react';
-import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public';
-import { useTrackPageview } from '../../../../observability/public';
+import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { DataStream } from './types';
 import { PolicyConfig } from './types';
 import {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
index 08c802803b3ea..977f2a94660ce 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
@@ -10,7 +10,7 @@ import 'jest-canvas-mock';
 import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../lib/helper/rtl_helpers';
-import { NewPackagePolicy } from '../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { SyntheticsPolicyCreateExtensionWrapper } from './synthetics_policy_create_extension_wrapper';
 import { defaultConfig } from './synthetics_policy_create_extension';
 import { ConfigKey, DataStream, ScheduleUnit, VerificationMode } from './types';
@@ -27,8 +27,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
similarity index 91%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
index e3e13b16ebf22..976c363ef6568 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { memo } from 'react';
-import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public';
 import { SyntheticsPolicyCreateExtension } from './synthetics_policy_create_extension';
 import { SyntheticsProviders } from './contexts';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension.tsx
similarity index 91%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension.tsx
index db512537dfdb8..edc8e3f58d490 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { memo } from 'react';
-import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public';
-import { useTrackPageview } from '../../../../observability/public';
+import { PackagePolicyEditExtensionComponentProps } from '@kbn/fleet-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { usePolicyConfigContext } from './contexts';
 import { MonitorFields, PolicyConfig } from './types';
 import { CustomFields } from './custom_fields';
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
index d61566c4ad12e..ed7f02a159822 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
@@ -10,7 +10,7 @@ import 'jest-canvas-mock';
 import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../lib/helper/rtl_helpers';
-import { NewPackagePolicy } from '../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { SyntheticsPolicyEditExtensionWrapper } from './synthetics_policy_edit_extension_wrapper';
 import { ConfigKey, DataStream, ScheduleUnit } from './types';
 import { defaultConfig } from './synthetics_policy_create_extension';
@@ -27,8 +27,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
index ed676443202ab..bffdc882115a0 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponentProps } from '@kbn/fleet-plugin/public';
 import { PolicyConfig, MonitorFields } from './types';
-import { ConfigKey, DataStream, TLSFields } from '././types';
+import { ConfigKey, DataStream, TLSFields } from './types';
 import { SyntheticsPolicyEditExtension } from './synthetics_policy_edit_extension';
 import {
   PolicyConfigContextProvider,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/tcp/advanced_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/tcp/advanced_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/tcp/advanced_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tcp/advanced_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/tcp/advanced_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/tcp/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tcp/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/tcp/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/tcp/normalizers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tcp/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/tcp/normalizers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/tcp/simple_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/tcp/simple_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls/default_values.ts b/x-pack/plugins/synthetics/public/components/fleet_package/tls/default_values.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tls/default_values.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/tls/default_values.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls/formatters.ts b/x-pack/plugins/synthetics/public/components/fleet_package/tls/formatters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tls/formatters.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/tls/formatters.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls/normalizers.ts b/x-pack/plugins/synthetics/public/components/fleet_package/tls/normalizers.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tls/normalizers.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/tls/normalizers.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.test.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/tls_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tls_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/tls_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/tls_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/tls_fields.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/tls_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/types.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/types.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/types.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/types.tsx
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/validation.test.ts b/x-pack/plugins/synthetics/public/components/fleet_package/validation.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/validation.test.ts
rename to x-pack/plugins/synthetics/public/components/fleet_package/validation.test.ts
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/validation.tsx b/x-pack/plugins/synthetics/public/components/fleet_package/validation.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/fleet_package/validation.tsx
rename to x-pack/plugins/synthetics/public/components/fleet_package/validation.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/__snapshots__/monitor_charts.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/__snapshots__/monitor_charts.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/__snapshots__/monitor_charts.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/__snapshots__/monitor_charts.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/index.ts b/x-pack/plugins/synthetics/public/components/monitor/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/confirm_delete.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/ml/__snapshots__/confirm_delete.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/confirm_delete.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/ml/__snapshots__/confirm_delete.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/confirm_alert_delete.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/confirm_alert_delete.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/confirm_alert_delete.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/confirm_alert_delete.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/confirm_delete.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/confirm_delete.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/confirm_delete.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/confirm_delete.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/confirm_delete.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/confirm_delete.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/confirm_delete.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/confirm_delete.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/index.ts b/x-pack/plugins/synthetics/public/components/monitor/ml/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ml/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/license_info.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/license_info.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/license_info.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/license_info.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/license_info.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/license_info.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/manage_ml_job.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/manage_ml_job.tsx
index 1176ea5e6a5c3..435eb7e4f9001 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ml/manage_ml_job.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useContext, useState } from 'react';
 
 import { EuiButton, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
 import { useSelector, useDispatch } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../../common/constants/alerts';
 import {
   canDeleteMLJobSelector,
@@ -30,7 +31,6 @@ import {
   isAnomalyAlertDeleting,
 } from '../../../state/alerts/alerts';
 import { UptimeEditAlertFlyoutComponent } from '../../common/alerts/uptime_edit_alert_flyout';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   hasMLJob: boolean;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout_container.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout_container.tsx
index ef0d2857b6b5f..482e3f70b3180 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_flyout_container.tsx
@@ -8,7 +8,8 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   canCreateMLJobSelector,
   hasMLJobSelector,
@@ -30,7 +31,6 @@ import { useGetUrlParams } from '../../../hooks';
 import { getDynamicSettings } from '../../../state/actions/dynamic_settings';
 import { useMonitorId } from '../../../hooks';
 import { kibanaService } from '../../../state/kibana_service';
-import { toMountPoint, useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { CLIENT_ALERT_TYPES } from '../../../../common/constants/alerts';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_integeration.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_integeration.tsx
index 0fe7dce9ee2c1..6396f99e4d62c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_integeration.tsx
@@ -7,6 +7,8 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { JobStat } from '@kbn/ml-plugin/public';
 import { MachineLearningFlyout } from './ml_flyout_container';
 import {
   hasMLFeatureSelector,
@@ -18,9 +20,7 @@ import { deleteMLJobAction, getExistingMLJobAction, resetMLState } from '../../.
 import { ConfirmJobDeletion } from './confirm_delete';
 import { UptimeRefreshContext } from '../../../contexts';
 import * as labels from './translations';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ManageMLJobComponent } from './manage_ml_job';
-import { JobStat } from '../../../../../../plugins/ml/public';
 import { useMonitorId } from '../../../hooks';
 import { getMLJobId } from '../../../../common/lib';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_integerations.test.tsx
similarity index 89%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_integerations.test.tsx
index f29be50633fab..1349348981b22 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_integerations.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { MLIntegrationComponent } from './ml_integeration';
 import { renderWithRouter, shallowWithRouter } from '../../../lib';
 import * as redux from 'react-redux';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const core = coreMock.createStart();
 describe('ML Integrations', () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_job_link.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_job_link.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_job_link.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_job_link.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_job_link.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_job_link.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_job_link.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_job_link.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_manage_job.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/ml_manage_job.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/ml_manage_job.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/ml_manage_job.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx b/x-pack/plugins/synthetics/public/components/monitor/ml/translations.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ml/translations.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/use_anomaly_alert.ts b/x-pack/plugins/synthetics/public/components/monitor/ml/use_anomaly_alert.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ml/use_anomaly_alert.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ml/use_anomaly_alert.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_charts.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/monitor_charts.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_charts.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_charts.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_charts.tsx b/x-pack/plugins/synthetics/public/components/monitor/monitor_charts.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_charts.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_charts.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/index.ts b/x-pack/plugins/synthetics/public/components/monitor/monitor_duration/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_duration/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_duration/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx b/x-pack/plugins/synthetics/public/components/monitor/monitor_duration/monitor_duration.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_duration/monitor_duration.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx b/x-pack/plugins/synthetics/public/components/monitor/monitor_duration/monitor_duration_container.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_duration/monitor_duration_container.tsx
index 35eab80c15967..8b88c8d59a47c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/monitor_duration/monitor_duration_container.tsx
@@ -7,6 +7,8 @@
 
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { JobStat } from '@kbn/ml-plugin/public';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { useGetUrlParams } from '../../../hooks';
 import {
   getAnomalyRecordsAction,
@@ -20,11 +22,9 @@ import {
   selectDurationLines,
 } from '../../../state/selectors';
 import { UptimeRefreshContext } from '../../../contexts';
-import { JobStat } from '../../../../../ml/public';
 import { MonitorDurationComponent } from './monitor_duration';
 import { MonitorIdParam } from '../../../../common/types';
 import { getMLJobId } from '../../../../common/lib';
-import { createExploratoryViewUrl } from '../../../../../observability/public';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
 export const MonitorDuration: React.FC<MonitorIdParam> = ({ monitorId }) => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/monitor_title.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_title.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_title.tsx b/x-pack/plugins/synthetics/public/components/monitor/monitor_title.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/monitor_title.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/monitor_title.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_histogram/index.ts b/x-pack/plugins/synthetics/public/components/monitor/ping_histogram/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_histogram/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ping_histogram/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_histogram/ping_histogram_container.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_histogram/ping_histogram_container.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_histogram/ping_histogram_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_histogram/ping_histogram_container.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/expand_row.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/expand_row.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/expand_row.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/expand_row.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/expand_row.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/expand_row.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/expand_row.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/expand_row.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/failed_step.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/failed_step.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/failed_step.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/failed_step.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_error.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_error.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_error.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_error.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_status.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_status.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_status.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_status.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/index.ts b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
similarity index 90%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
index c73753fd62783..4790b8c1dd376 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
@@ -8,7 +8,7 @@
 import { EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 const BorderedText = euiStyled(EuiText)`
   width: 120px;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/no_image_display.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
index 1e853bf3461dc..bc56dc7a8a354 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
@@ -10,13 +10,13 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import { PingTimestamp } from './ping_timestamp';
 import { mockReduxHooks } from '../../../../../lib/helper/test_helpers';
 import { render } from '../../../../../lib/helper/rtl_helpers';
-import * as observabilityPublic from '../../../../../../../observability/public';
+import * as observabilityPublic from '@kbn/observability-plugin/public';
 import { getShortTimeStamp } from '../../../../overview/monitor_list/columns/monitor_status_column';
 import moment from 'moment';
 import '../../../../../lib/__mocks__/use_composite_image.mock';
 import { mockRef } from '../../../../../lib/__mocks__/screenshot_ref.mock';
 
-jest.mock('../../../../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public');
 
 mockReduxHooks();
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
index f0f770779f436..4083df8c98a1a 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
@@ -10,13 +10,13 @@ import useIntersection from 'react-use/lib/useIntersection';
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 
+import { useFetcher, FETCH_STATUS } from '@kbn/observability-plugin/public';
 import {
   isScreenshotImageBlob,
   isScreenshotRef,
   ScreenshotImageBlob,
   ScreenshotRefImageData,
 } from '../../../../../../common/runtime_types';
-import { useFetcher, FETCH_STATUS } from '../../../../../../../observability/public';
 import { getJourneyScreenshot } from '../../../../../state/api/journey';
 import { UptimeSettingsContext } from '../../../../../contexts';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
index 3fa94e45f8937..eb0d8c30ae53d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
@@ -8,7 +8,7 @@
 import React, { MouseEvent, useEffect } from 'react';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText, useEuiTheme } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ScreenshotRefImageData } from '../../../../../../common/runtime_types';
 import { useBreakpoints } from '../../../../../hooks';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/step_image_popover.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/translations.ts b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/translations.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/ping_timestamp/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/response_code.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/response_code.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/columns/response_code.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/columns/response_code.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/doc_link_body.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/doc_link_body.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/doc_link_body.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/doc_link_body.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/doc_link_body.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/doc_link_body.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/doc_link_body.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/doc_link_body.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/expanded_row.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/expanded_row.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/expanded_row.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/expanded_row.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/headers.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/headers.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/headers.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/headers.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/index.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/index.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/index.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/index.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/location_name.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/location_name.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/location_name.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/location_name.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_headers.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_headers.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/ping_headers.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_headers.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_header.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list_header.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_header.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list_header.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_table.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list_table.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_table.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_list_table.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_redirects.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_redirects.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/ping_redirects.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/ping_redirects.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/response_code.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/ping_list/response_code.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/response_code.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/response_code.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/translations.ts b/x-pack/plugins/synthetics/public/components/monitor/ping_list/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/translations.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts b/x-pack/plugins/synthetics/public/components/monitor/ping_list/use_pings.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts
rename to x-pack/plugins/synthetics/public/components/monitor/ping_list/use_pings.ts
index 026ba57d3458f..94669b4aeb8e8 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor/ping_list/use_pings.ts
@@ -7,12 +7,12 @@
 
 import { useDispatch, useSelector } from 'react-redux';
 import { useCallback, useContext, useEffect } from 'react';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { selectPingList } from '../../../state/selectors';
 import { GetPingsParams, Ping } from '../../../../common/runtime_types/ping';
 import { getPings as getPingsAction } from '../../../state/actions';
 import { useGetUrlParams, useMonitorId } from '../../../hooks';
 import { UptimeRefreshContext, UptimeSettingsContext } from '../../../contexts';
-import { useFetcher } from '../../../../../observability/public';
 import { fetchJourneysFailedSteps } from '../../../state/api/journey';
 import { useSelectedFilters } from '../../../hooks/use_selected_filters';
 import { MONITOR_TYPES } from '../../../../common/constants';
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/__snapshots__/status_by_location.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/status_details/__snapshots__/status_by_location.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/__snapshots__/status_by_location.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/__snapshots__/status_by_location.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/availability_reporting.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/availability_reporting.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/index.ts b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
index c6309debdde1f..e43df25779ab9 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { MonitorLocation } from '../../../../../common/runtime_types/monitor';
-import { LocationStatusTags } from './index';
+import { LocationStatusTags } from '.';
 import { mockMoment } from '../../../../lib/helper/test_helpers';
 import { render } from '../../../../lib/helper/rtl_helpers';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
index 0ca7ea3c82750..53be56d16b9fe 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
@@ -11,7 +11,7 @@ import styled from 'styled-components';
 import { UptimeThemeContext } from '../../../../contexts';
 import { MonitorLocation } from '../../../../../common/runtime_types';
 import { SHORT_TIMESPAN_LOCALE, SHORT_TS_LOCALE } from '../../../../../common/constants';
-import { AvailabilityReporting } from '../index';
+import { AvailabilityReporting } from '..';
 import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column';
 
 // Set height so that it remains within panel, enough height to display 7 locations tags
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/tag_label.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/tag_label.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/tag_label.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/tag_label.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/tag_label.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/tag_label.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/tag_label.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/availability_reporting/tag_label.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/index.ts b/x-pack/plugins/synthetics/public/components/monitor/status_details/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/location_availability/location_availability.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/location_availability/location_availability.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/location_availability/location_availability.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/location_availability/location_availability.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/location_availability/location_availability.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/location_availability/location_availability.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/location_availability/location_availability.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/location_availability/location_availability.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/monitor_status.bar.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/monitor_status.bar.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/monitor_status.bar.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/monitor_status.bar.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/ssl_certificate.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/ssl_certificate.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/ssl_certificate.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/ssl_certificate.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/index.ts b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/monitor_redirects.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/monitor_redirects.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/monitor_redirects.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/monitor_redirects.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/ssl_certificate.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/ssl_certificate.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/ssl_certificate.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/ssl_certificate.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.test.ts b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/status_bar.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.test.ts
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/status_bar.test.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/status_bar.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/status_bar.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_by_location.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/status_by_location.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_by_location.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/status_by_location.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/use_status_bar.ts b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/use_status_bar.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/use_status_bar.ts
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_bar/use_status_bar.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_by_location.test.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_by_location.test.tsx
index d7e8f70475f54..9b58b0deb8ecc 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_by_location.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { renderWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import { MonitorLocation } from '../../../../common/runtime_types';
-import { StatusByLocations } from './index';
+import { StatusByLocations } from '.';
 
 describe('StatusByLocation component', () => {
   let monitorLocations: MonitorLocation[];
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_details.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_details.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_details.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_details.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_details_container.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/status_details_container.tsx
index ccd31edf73d27..1fb138da9e84b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/status_details/status_details_container.tsx
@@ -10,7 +10,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useGetUrlParams } from '../../../hooks';
 import { monitorLocationsSelector } from '../../../state/selectors';
 import { getMonitorLocationsAction } from '../../../state/actions/monitor';
-import { MonitorStatusDetailsComponent } from './index';
+import { MonitorStatusDetailsComponent } from '.';
 import { UptimeRefreshContext } from '../../../contexts';
 import { AppState } from '../../../state';
 import { MonitorIdParam } from '../../../../common/types';
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/translations.ts b/x-pack/plugins/synthetics/public/components/monitor/status_details/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/translations.ts
rename to x-pack/plugins/synthetics/public/components/monitor/status_details/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/step_detail_container.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/step_detail_container.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_nav.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/step_page_nav.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_nav.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/step_page_nav.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_title.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/step_page_title.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_title.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/step_page_title.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
index f64d36fa0f789..53c1b0066705b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { JourneyState } from '../../../../state/reducers/journey';
 import { PLUGIN } from '../../../../../common/constants/plugin';
 import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
index 4521d9f82f92e..a46fad2733bb2 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { of } from 'rxjs';
@@ -14,7 +14,7 @@ import { useMonitorBreadcrumb } from './use_monitor_breadcrumb';
 import { OVERVIEW_ROUTE } from '../../../../../common/constants';
 import { Ping } from '../../../../../common/runtime_types/ping';
 import { JourneyState } from '../../../../state/reducers/journey';
-import { chromeServiceMock, uiSettingsServiceMock } from 'src/core/public/mocks';
+import { chromeServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 describe('useMonitorBreadcrumbs', () => {
   it('sets the given breadcrumbs for steps list view', () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
index 441ede99fd8b4..235dceafcfd9d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
@@ -13,7 +13,7 @@ import {
   useStepWaterfallMetrics,
 } from './use_step_waterfall_metrics';
 import * as reduxHooks from 'react-redux';
-import * as searchHooks from '../../../../../../observability/public/hooks/use_es_search';
+import * as searchHooks from '@kbn/observability-plugin/public/hooks/use_es_search';
 
 describe('useStepWaterfallMetrics', () => {
   jest
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
index ad2762826c91f..321d9779db486 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
@@ -6,7 +6,7 @@
  */
 
 import { useSelector } from 'react-redux';
-import { createEsParams, useEsSearch } from '../../../../../../observability/public';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 import { selectDynamicSettings } from '../../../../state/selectors';
 import { MarkerItems } from '../waterfall/context/waterfall_chart';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/types.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/types.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/types.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_container.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
index aaa3d5c1cc23c..4b50f86e6ee3b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
@@ -7,10 +7,10 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 import { EuiHealth } from '@elastic/eui';
+import { useTrackMetric, METRIC_TYPE } from '@kbn/observability-plugin/public';
 import { getSeriesAndDomain, getSidebarItems, getLegendItems } from './data_formatting';
 import { SidebarItem, LegendItem, NetworkItems } from './types';
 import { WaterfallProvider, WaterfallChart, RenderItem, useFlyout } from '../../waterfall';
-import { useTrackMetric, METRIC_TYPE } from '../../../../../../../observability/public';
 import { WaterfallFilter } from './waterfall_filter';
 import { WaterfallFlyout } from './waterfall_flyout';
 import { WaterfallSidebarItem } from './waterfall_sidebar_item';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
index 42c2df4553b4c..a2667e2259e3a 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
@@ -18,6 +18,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import useDebounce from 'react-use/lib/useDebounce';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import {
   FILTER_REQUESTS_LABEL,
   FILTER_SCREENREADER_LABEL,
@@ -26,7 +27,6 @@ import {
   FILTER_COLLAPSE_REQUESTS_LABEL,
 } from '../../waterfall/components/translations';
 import { MimeType, FriendlyMimetypeLabels } from './types';
-import { METRIC_TYPE, useUiTracker } from '../../../../../../../observability/public';
 
 interface Props {
   query: string;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
index 53e6583e00cc2..bdcea95c0c0c3 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
@@ -18,11 +18,11 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import { Table } from '../../waterfall/components/waterfall_flyout_table';
 import { MiddleTruncatedText } from '../../waterfall';
 import { WaterfallMetadataEntry } from '../../waterfall/types';
 import { OnFlyoutClose } from '../../waterfall/components/use_flyout';
-import { METRIC_TYPE, useUiTracker } from '../../../../../../../observability/public';
 
 export const DETAILS = i18n.translate('xpack.uptime.synthetics.waterfall.flyout.details', {
   defaultMessage: 'Details',
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
index 2d08bbbadfbe4..2a69bbba2eb8c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import 'jest-canvas-mock';
 import { fireEvent } from '@testing-library/react';
 
-import { SidebarItem } from '../waterfall/types';
+import { SidebarItem } from './types';
 import { render } from '../../../../../lib/helper/rtl_helpers';
 import { WaterfallSidebarItem } from './waterfall_sidebar_item';
 import { SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL } from '../../waterfall/components/translations';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
index 1aea9d9e69db7..193fe33121636 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
@@ -7,7 +7,7 @@
 
 import React, { RefObject, useMemo, useCallback, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
-import { SidebarItem } from '../waterfall/types';
+import { SidebarItem } from './types';
 import { MiddleTruncatedText } from '../../waterfall';
 import { SideBarItemHighlighter } from '../../waterfall/components/styles';
 import { SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL } from '../../waterfall/components/translations';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/translations.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/translations.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/README.md b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/README.md
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/README.md
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/README.md
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/constants.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/constants.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/constants.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/constants.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/legend.tsx
similarity index 92%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/legend.tsx
index 9a66b586d1d56..0ac41c1d15ff6 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/legend.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { IWaterfallContext } from '../context/waterfall_chart';
 import { WaterfallChartProps } from './waterfall_chart';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 
 interface LegendProps {
   items: Required<IWaterfallContext>['legendItems'];
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
index 11cff8d164858..f649a5f2d373f 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
@@ -16,10 +16,10 @@ import {
   EuiIcon,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { WaterfallTooltipContent } from './waterfall_tooltip_content';
 import { WaterfallChartTooltip } from './styles';
 import { FIXED_AXIS_HEIGHT } from './constants';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { formatTooltipHeading } from '../../step_detail/waterfall/data_formatting';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/network_requests_total.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/network_requests_total.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/network_requests_total.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/network_requests_total.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/network_requests_total.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/network_requests_total.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/network_requests_total.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/network_requests_total.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/sidebar.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/sidebar.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/sidebar.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/sidebar.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/styles.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/styles.ts
index 239b93f83df9b..ae4792d8af883 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/styles.ts
@@ -9,8 +9,8 @@ import { FunctionComponent } from 'react';
 import { StyledComponent } from 'styled-components';
 import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiText, EuiPanelProps } from '@elastic/eui';
 import { rgba } from 'polished';
+import { euiStyled, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { FIXED_AXIS_HEIGHT } from './constants';
-import { euiStyled, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
 
 interface WaterfallChartOuterContainerProps {
   height?: string;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/translations.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/translations.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_bar_charts.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_bar_charts.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_bar_charts.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_bar_charts.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_bar_charts.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_bar_charts.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_bar_charts.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_bar_charts.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_flyout.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_flyout.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_flyout.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_flyout.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_flyout.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_flyout.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/use_flyout.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/use_flyout.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart_fixed_axis.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_chart_fixed_axis.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart_fixed_axis.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_chart_fixed_axis.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_flyout_table.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_flyout_table.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_flyout_table.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_flyout_table.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_test_helper.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_test_helper.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_test_helper.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_test_helper.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
index 1d4ba01d529b4..883a7a8ea9268 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
@@ -8,9 +8,9 @@
 import React, { useMemo } from 'react';
 import { AnnotationDomainType, LineAnnotation } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
+import { useTheme } from '@kbn/observability-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useWaterfallContext } from '..';
-import { useTheme } from '../../../../../../../observability/public';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { MarkerItems } from '../context/waterfall_chart';
 import { WaterfallMarkerIcon } from './waterfall_marker_icon';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
index 21b3bf72d2217..b9f385c29b9f8 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiText } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useWaterfallContext } from '../context/waterfall_chart';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   text: string;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/context/waterfall_chart.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/context/waterfall_chart.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/context/waterfall_chart.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/context/waterfall_chart.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/index.tsx b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/index.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/index.tsx
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/index.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/types.ts b/x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/types.ts
rename to x-pack/plugins/synthetics/public/components/monitor/synthetics/waterfall/types.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar.tsx
index 5f6e67e363171..4c6f296e468f9 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar.tsx
@@ -18,14 +18,14 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { useSelector } from 'react-redux';
-import { FETCH_STATUS, useFetcher } from '../../../../../observability/public';
+import { FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { MONITOR_MANAGEMENT_ROUTE } from '../../../../common/constants';
 import { UptimeSettingsContext } from '../../../contexts';
 import { setMonitor } from '../../../state/api';
 
 import { SyntheticsMonitor } from '../../../../common/runtime_types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { TestRun } from '../test_now_mode/test_now_mode';
 
 import { monitorManagementListSelector } from '../../../state/selectors';
@@ -121,7 +121,7 @@ export const ActionBar = ({
             <EuiButtonEmpty
               color="ghost"
               size="s"
-              href={`${basePath}/app/uptime/${MONITOR_MANAGEMENT_ROUTE}`}
+              href={`${basePath}/app/uptime/${MONITOR_MANAGEMENT_ROUTE}/all`}
             >
               {DISCARD_LABEL}
             </EuiButtonEmpty>
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
index 88520b8761ae7..b92357f3ecc14 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from '../../../lib/helper/rtl_helpers';
-import { FETCH_STATUS } from '../../../../../observability/public';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 import {
   DataStream,
   HTTPFields,
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_portal.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar_portal.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_portal.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/action_bar/action_bar_portal.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/add_monitor_btn.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/add_monitor_btn.tsx
index 70796e54624ac..7596c11dbddad 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/add_monitor_btn.tsx
@@ -9,11 +9,11 @@ import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiFlexItem, EuiFlexGroup, EuiToolTip, EuiSwitch } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { kibanaService } from '../../state/kibana_service';
 import { MONITOR_ADD_ROUTE } from '../../../common/constants';
 import { useEnablement } from './hooks/use_enablement';
 import { useSyntheticsServiceAllowed } from './hooks/use_service_allowed';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 export const AddMonitorBtn = () => {
   const history = useHistory();
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/content/index.ts b/x-pack/plugins/synthetics/public/components/monitor_management/content/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/content/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/content/index.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/edit_monitor_config.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/edit_monitor_config.tsx
index e22e393882945..28e0bb105e29a 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/edit_monitor_config.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useMemo } from 'react';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import {
   ConfigKey,
   MonitorFields,
@@ -14,7 +15,6 @@ import {
   ScheduleUnit,
   ThrottlingOptions,
 } from '../../../common/runtime_types';
-import { useTrackPageview } from '../../../../observability/public';
 import { SyntheticsProviders } from '../fleet_package/contexts';
 import { PolicyConfig } from '../fleet_package/types';
 import { MonitorConfig } from './monitor_config/monitor_config';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_enablement.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_enablement.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_enablement.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_enablement.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_format_monitor.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_format_monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_format_monitor.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_format_monitor.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors.test.tsx
similarity index 93%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors.test.tsx
index 649b009687e33..fe20dc3ea6c9d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors.test.tsx
@@ -9,7 +9,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { MockRedux } from '../../../lib/helper/rtl_helpers';
 import { useInlineErrors } from './use_inline_errors';
 import { DEFAULT_THROTTLING } from '../../../../common/runtime_types';
-import * as obsvPlugin from '../../../../../observability/public/hooks/use_es_search';
+import * as obsvPlugin from '@kbn/observability-plugin/public/hooks/use_es_search';
 
 function mockNow(date: string | number | Date) {
   const fakeNow = new Date(date).getTime();
@@ -63,10 +63,9 @@ describe('useInlineErrors', function () {
           size: 1000,
           sort: [{ '@timestamp': 'desc' }],
         },
-        index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
+        index: 'synthetics-*',
       },
       [
-        'heartbeat-8*,heartbeat-7*,synthetics-*',
         {
           error: { monitorList: null, serviceLocations: null, enablement: null },
           enablement: null,
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors.ts
similarity index 85%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors.ts
index 3753d95b8e858..adc07853a93cd 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors.ts
@@ -8,16 +8,18 @@
 import { useSelector } from 'react-redux';
 import moment from 'moment';
 import { useMemo } from 'react';
-import { monitorManagementListSelector, selectDynamicSettings } from '../../../state/selectors';
-import { useEsSearch } from '../../../../../observability/public';
+import { useEsSearch } from '@kbn/observability-plugin/public';
+import { monitorManagementListSelector } from '../../../state/selectors';
 import { Ping } from '../../../../common/runtime_types';
 import { EXCLUDE_RUN_ONCE_FILTER } from '../../../../common/constants/client_defaults';
 import { useUptimeRefreshContext } from '../../../contexts/uptime_refresh_context';
 import { useInlineErrorsCount } from './use_inline_errors_count';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../common/constants';
 
 const sortFieldMap: Record<string, string> = {
-  name: 'monitor.name',
-  urls: 'url.full',
+  ['name.keyword']: 'monitor.name',
+  ['urls.keyword']: 'url.full',
+  ['type.keyword']: 'monitor.type',
   '@timestamp': '@timestamp',
 };
 
@@ -71,8 +73,6 @@ export function useInlineErrors({
 }) {
   const monitorList = useSelector(monitorManagementListSelector);
 
-  const { settings } = useSelector(selectDynamicSettings);
-
   const { lastRefresh } = useUptimeRefreshContext();
 
   const configIds = monitorList.list.monitors.map((monitor) => monitor.id);
@@ -81,7 +81,7 @@ export function useInlineErrors({
 
   const { data, loading } = useEsSearch(
     {
-      index: doFetch ? settings?.heartbeatIndices : '',
+      index: doFetch ? SYNTHETICS_INDEX_PATTERN : '',
       body: {
         size: 1000,
         query: {
@@ -93,7 +93,7 @@ export function useInlineErrors({
         sort: [{ [sortFieldMap[sortField]]: sortOrder }],
       },
     },
-    [settings?.heartbeatIndices, monitorList, lastRefresh, doFetch, sortField, sortOrder],
+    [monitorList, lastRefresh, doFetch, sortField, sortOrder],
     { name: 'getInvalidMonitors' }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
similarity index 93%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
index e973e3dd1a7f1..7ad0d58488e99 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
@@ -8,7 +8,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { MockRedux } from '../../../lib/helper/rtl_helpers';
 import { useInlineErrorsCount } from './use_inline_errors_count';
-import * as obsvPlugin from '../../../../../observability/public/hooks/use_es_search';
+import * as obsvPlugin from '@kbn/observability-plugin/public/hooks/use_es_search';
 import { DEFAULT_THROTTLING } from '../../../../common/runtime_types';
 
 function mockNow(date: string | number | Date) {
@@ -62,10 +62,9 @@ describe('useInlineErrorsCount', function () {
           },
           size: 0,
         },
-        index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
+        index: 'synthetics-*',
       },
       [
-        'heartbeat-8*,heartbeat-7*,synthetics-*',
         {
           error: { monitorList: null, serviceLocations: null, enablement: null },
           list: { monitors: [], page: 1, perPage: 10, total: null, syncErrors: null },
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors_count.ts
similarity index 78%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors_count.ts
index adda7c433b29c..64b37d371cac5 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_inline_errors_count.ts
@@ -7,21 +7,20 @@
 
 import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
-import { monitorManagementListSelector, selectDynamicSettings } from '../../../state/selectors';
-import { useEsSearch } from '../../../../../observability/public';
+import { useEsSearch } from '@kbn/observability-plugin/public';
+import { monitorManagementListSelector } from '../../../state/selectors';
 import { useUptimeRefreshContext } from '../../../contexts/uptime_refresh_context';
 import { getInlineErrorFilters } from './use_inline_errors';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../common/constants';
 
 export function useInlineErrorsCount() {
   const monitorList = useSelector(monitorManagementListSelector);
 
-  const { settings } = useSelector(selectDynamicSettings);
-
   const { lastRefresh } = useUptimeRefreshContext();
 
   const { data, loading } = useEsSearch(
     {
-      index: settings?.heartbeatIndices,
+      index: SYNTHETICS_INDEX_PATTERN,
       body: {
         size: 0,
         query: {
@@ -36,7 +35,7 @@ export function useInlineErrorsCount() {
         },
       },
     },
-    [settings?.heartbeatIndices, monitorList, lastRefresh],
+    [monitorList, lastRefresh],
     { name: 'getInvalidMonitorsCount' }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_invalid_monitors.tsx
similarity index 91%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_invalid_monitors.tsx
index 98e882e543a87..cf63e7c4cd9e6 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_invalid_monitors.tsx
@@ -6,8 +6,8 @@
  */
 
 import moment from 'moment';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { useFetcher } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { Ping, SyntheticsMonitor } from '../../../../common/runtime_types';
 import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_locations.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_locations.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_locations.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_locations.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_locations.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_locations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_locations.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_locations.ts
diff --git a/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_run_once_errors.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_run_once_errors.ts
new file mode 100644
index 0000000000000..52218986744c0
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_run_once_errors.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useEffect, useMemo, useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { Locations, ServiceLocationErrors } from '../../../../common/runtime_types';
+
+export function useRunOnceErrors({
+  testRunId,
+  serviceError,
+  errors,
+  locations,
+}: {
+  testRunId: string;
+  serviceError: null | Error;
+  errors: ServiceLocationErrors;
+  locations: Locations;
+}) {
+  const [locationErrors, setLocationErrors] = useState<ServiceLocationErrors>([]);
+  const [runOnceServiceError, setRunOnceServiceError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    setLocationErrors([]);
+    setRunOnceServiceError(null);
+  }, [testRunId]);
+
+  useEffect(() => {
+    if (locationErrors.length || errors.length) {
+      setLocationErrors(errors);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [errors]);
+
+  useEffect(() => {
+    if (runOnceServiceError?.message !== serviceError?.message) {
+      setRunOnceServiceError(serviceError);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [serviceError]);
+
+  const locationsById: Record<string, Locations[number]> = useMemo(
+    () => (locations as Locations).reduce((acc, cur) => ({ ...acc, [cur.id]: cur }), {}),
+    [locations]
+  );
+
+  const expectPings =
+    locations.length - (locationErrors ?? []).filter(({ locationId }) => !!locationId).length;
+
+  const hasBlockingError =
+    !!runOnceServiceError ||
+    (locationErrors?.length && locationErrors?.length === locations.length);
+
+  const errorMessages = useMemo(() => {
+    if (hasBlockingError) {
+      return [{ name: 'Error', message: PushErrorService, title: PushErrorLabel }];
+    } else if (locationErrors?.length > 0) {
+      // If only some of the locations were unsuccessful
+      return locationErrors
+        .map(({ locationId }) => locationsById[locationId])
+        .filter((location) => !!location)
+        .map((location) => ({
+          name: 'Error',
+          message: getLocationTestErrorLabel(location.label),
+          title: RunErrorLabel,
+        }));
+    }
+
+    return [];
+  }, [locationsById, locationErrors, hasBlockingError]);
+
+  return {
+    expectPings,
+    hasBlockingError,
+    blockingErrorMessage: hasBlockingError ? PushErrorService : null,
+    errorMessages,
+  };
+}
+
+const PushErrorLabel = i18n.translate('xpack.uptime.testRun.pushErrorLabel', {
+  defaultMessage: 'Push error',
+});
+
+const RunErrorLabel = i18n.translate('xpack.uptime.testRun.runErrorLabel', {
+  defaultMessage: 'Error running test',
+});
+
+const getLocationTestErrorLabel = (locationName: string) =>
+  i18n.translate('xpack.uptime.testRun.runErrorLocation', {
+    defaultMessage: 'Failed to run monitor on location {locationName}.',
+    values: { locationName },
+  });
+
+const PushErrorService = i18n.translate('xpack.uptime.testRun.pushError', {
+  defaultMessage: 'Failed to push the monitor to service.',
+});
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_service_allowed.ts b/x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_service_allowed.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/hooks/use_service_allowed.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/hooks/use_service_allowed.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/loader/loader.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/loader/loader.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/loader/loader.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/loader/loader.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/loader/loader.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/loader/loader.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/loader/loader.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/loader/loader.tsx
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts b/x-pack/plugins/synthetics/public/components/monitor_management/mocks/index.ts
similarity index 87%
rename from x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/mocks/index.ts
index 78c22fc020a45..1ec4437601d57 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/mocks/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from './trusted_apps_page';
+export * from './locations';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/mocks/locations.ts b/x-pack/plugins/synthetics/public/components/monitor_management/mocks/locations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/mocks/locations.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/mocks/locations.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/locations.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/locations.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/locations.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/locations.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/locations.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
index 3b416436f9cc4..5fdae73a43e11 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
@@ -7,7 +7,7 @@
 import { EuiFieldText, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { memo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ConfigKey } from '../../../../common/runtime_types';
 import type { Validation } from '../../../../common/types';
 import { DescribedFormGroupWithWrap } from '../../fleet_package/common/described_form_group_with_wrap';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_config.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_config.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_config.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_config.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_config.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_config.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_config.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_config.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_fields.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_fields.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_fields.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_fields.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_fields.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_fields.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_fields.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_fields.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_name_location.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_name_location.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_name_location.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_name_location.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
index f1d2d9d470cfe..ccfc1312cbf25 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
@@ -18,7 +18,9 @@ describe('useMonitorName', () => {
     expect(result.current).toStrictEqual({ nameAlreadyExists: false, validName: '' });
     expect(defaultCore.savedObjects.client.find).toHaveBeenCalledWith({
       aggs: {
-        monitorNames: { terms: { field: 'synthetics-monitor.attributes.name', size: 10000 } },
+        monitorNames: {
+          terms: { field: 'synthetics-monitor.attributes.name.keyword', size: 10000 },
+        },
       },
       perPage: 0,
       type: 'synthetics-monitor',
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/use_monitor_name.ts
similarity index 89%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/use_monitor_name.ts
index f37bd94944b92..200a9599b405e 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/use_monitor_name.ts
@@ -6,8 +6,8 @@
  */
 
 import { useEffect, useState } from 'react';
-import { useFetcher } from '../../../../../observability/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
 import { useMonitorId } from '../../../hooks';
 
@@ -30,7 +30,7 @@ export const useMonitorName = ({ search = '' }: { search?: string }) => {
     const aggs = {
       monitorNames: {
         terms: {
-          field: `${syntheticsMonitorType}.attributes.name`,
+          field: `${syntheticsMonitorType}.attributes.name.keyword`,
           size: 10000,
         },
       },
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/actions.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/actions.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/actions.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/actions.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/actions.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/actions.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/actions.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/actions.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/all_monitors.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/all_monitors.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/all_monitors.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/all_monitors.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
index f8a81a6efce0b..aa1a845c3b759 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
@@ -10,10 +10,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from '../../../lib/helper/rtl_helpers';
 import * as fetchers from '../../../state/api/monitor_management';
-import {
-  FETCH_STATUS,
-  useFetcher as originalUseFetcher,
-} from '../../../../../observability/public';
+import { FETCH_STATUS, useFetcher as originalUseFetcher } from '@kbn/observability-plugin/public';
 import { spyOnUseFetcher } from '../../../lib/helper/spy_use_fetcher';
 import { Actions } from './actions';
 import { DeleteMonitor } from './delete_monitor';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/delete_monitor.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/delete_monitor.tsx
index 88bace104adac..0a90e4eb39a06 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/delete_monitor.tsx
@@ -9,10 +9,10 @@ import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
 import { EuiButtonIcon, EuiConfirmModal, EuiLoadingSpinner } from '@elastic/eui';
 
-import { FETCH_STATUS, useFetcher } from '../../../../../observability/public';
+import { FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { deleteMonitor } from '../../../state/api';
 import { kibanaService } from '../../../state/kibana_service';
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
 
 export const DeleteMonitor = ({
   id,
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
similarity index 85%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
index c1ed29e999569..0e7916f44a3aa 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
@@ -8,7 +8,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiEmptyPrompt, EuiButton, EuiTitle, EuiLink } from '@elastic/eui';
-import { useEnablement } from '..//hooks/use_enablement';
+import { useEnablement } from '../hooks/use_enablement';
 import { kibanaService } from '../../../state/kibana_service';
 import { SYNTHETICS_ENABLE_SUCCESS, SYNTHETICS_DISABLE_SUCCESS } from '../content';
 
@@ -75,7 +75,10 @@ export const EnablementEmptyState = ({ focusButton }: { focusButton: boolean })
           <EuiTitle size="xxs">
             <h3>{LEARN_MORE_LABEL}</h3>
           </EuiTitle>
-          <EuiLink href="#" target="_blank">
+          <EuiLink
+            href="https://docs.google.com/document/d/1hkzFibu9LggPWXQqfbAd0mMlV75wCME7_BebXlEH-oI"
+            target="_blank"
+          >
             {DOCS_LABEL}
           </EuiLink>
         </>
@@ -102,7 +105,7 @@ const MONITOR_MANAGEMENT_ENABLEMENT_MESSAGE = i18n.translate(
   'xpack.uptime.monitorManagement.emptyState.enablement',
   {
     defaultMessage:
-      'Enable Monitor Management to run lightweight checks and real-browser monitors from hosted testing locations around the world. Enabling Monitor Management will generate an API key to allow the Synthetics Service to write back to your Elasticsearch cluster.',
+      'Enable Monitor Management to run lightweight and real-browser monitors from hosted testing locations around the world. Enabling Monitor Management will generate an API key to allow the Synthetics Service to write back to your Elasticsearch cluster.',
   }
 );
 
@@ -110,7 +113,7 @@ const MONITOR_MANAGEMENT_DISABLED_MESSAGE = i18n.translate(
   'xpack.uptime.monitorManagement.emptyState.enablement.disabledDescription',
   {
     defaultMessage:
-      'Monitor Management is currently disabled. Monitor Management allows you to run lightweight checks and real-browser monitors from hosted testing locations around the world. To enable Monitor Management, please contact an administrator.',
+      'Monitor Management is currently disabled. Monitor Management allows you to run lightweight and real-browser monitors from hosted testing locations around the world. To enable Monitor Management, please contact an administrator.',
   }
 );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/inline_error.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/inline_error.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/inline_error.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/inline_error.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/inline_error.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/inline_error.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/inline_error.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/inline_error.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/invalid_monitors.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/invalid_monitors.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/invalid_monitors.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/invalid_monitors.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/list_tabs.test.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/list_tabs.test.tsx
index bfac60de96bc7..07a3e36f6ca78 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/list_tabs.test.tsx
@@ -28,7 +28,7 @@ describe('<MonitorListTabs />', () => {
     expect(onPageStateChange).toHaveBeenCalledWith({
       pageIndex: 1,
       pageSize: 10,
-      sortField: 'name',
+      sortField: 'name.keyword',
       sortOrder: 'asc',
     });
   });
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/list_tabs.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/list_tabs.tsx
index 1aad6d4d888e5..17b7ca839dcd0 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/list_tabs.tsx
@@ -39,7 +39,12 @@ export const MonitorListTabs = ({
 
   useEffect(() => {
     setSelectedTabId(viewType);
-    onPageStateChange({ pageIndex: 1, pageSize: 10, sortOrder: 'asc', sortField: ConfigKey.NAME });
+    onPageStateChange({
+      pageIndex: 1,
+      pageSize: 10,
+      sortOrder: 'asc',
+      sortField: `${ConfigKey.NAME}.keyword`,
+    });
   }, [viewType, onPageStateChange]);
 
   const tabs = [
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_async_error.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_async_error.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_async_error.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_async_error.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_async_error.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_async_error.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_async_error.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_async_error.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
index 8ce9b719c065c..d7e04f0e6140f 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
@@ -10,7 +10,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ConfigKey, DataStream, SyntheticsMonitor } from '../../../../common/runtime_types';
 import { render } from '../../../lib/helper/rtl_helpers';
-import { FETCH_STATUS } from '../../../../../observability/public';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 import { spyOnUseFetcher } from '../../../lib/helper/spy_use_fetcher';
 import { MonitorEnabled } from './monitor_enabled';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_enabled.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_enabled.tsx
index 00d146a8f44b4..e441e44da221d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_enabled.tsx
@@ -8,8 +8,8 @@
 import { EuiSwitch, EuiProgress, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { FETCH_STATUS, useFetcher } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
 import { ConfigKey, EncryptedSyntheticsMonitor } from '../../../../common/runtime_types';
 import { setMonitor } from '../../../state/api';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list.test.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list.test.tsx
index 40eb185a65f0c..a641f7a76f3a7 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list.test.tsx
@@ -72,7 +72,7 @@ describe('<MonitorManagementList />', () => {
   const pageState: MonitorManagementListPageState = {
     pageIndex: 1,
     pageSize: 10,
-    sortField: ConfigKey.NAME,
+    sortField: `${ConfigKey.NAME}.keyword`,
     sortOrder: 'asc',
   };
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list.tsx
index 6ad9c4c2535e5..e38dad1c10d46 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list.tsx
@@ -15,13 +15,12 @@ import {
 import { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/table_types';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useContext, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   CommonFields,
   ConfigKey,
   FetchMonitorManagementListQueryArgs,
   ICMPSimpleFields,
-  MonitorFields,
   Ping,
   ServiceLocations,
   EncryptedSyntheticsMonitorWithId,
@@ -39,7 +38,10 @@ import { MonitorTags } from './tags';
 export interface MonitorManagementListPageState {
   pageIndex: number;
   pageSize: number;
-  sortField: keyof MonitorFields;
+  sortField:
+    | `${ConfigKey.URLS}.keyword`
+    | `${ConfigKey.NAME}.keyword`
+    | `${ConfigKey.MONITOR_TYPE}.keyword`;
   sortOrder: NonNullable<FetchMonitorManagementListQueryArgs['sortOrder']>;
 }
 
@@ -86,7 +88,7 @@ export const MonitorManagementList = ({
       onPageStateChange({
         pageIndex: index + 1, // page index for Saved Objects is base 1
         pageSize: size,
-        sortField: field as keyof MonitorFields,
+        sortField: `${field}.keyword` as MonitorManagementListPageState['sortField'],
         sortOrder: direction,
       });
     },
@@ -102,7 +104,7 @@ export const MonitorManagementList = ({
 
   const sorting: EuiTableSortingType<EncryptedSyntheticsMonitorWithId> = {
     sort: {
-      field: sortField as keyof EncryptedSyntheticsMonitorWithId,
+      field: sortField.replace('.keyword', '') as keyof EncryptedSyntheticsMonitorWithId,
       direction: sortOrder,
     },
   };
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list_container.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list_container.tsx
index 53afdf49c1592..92b61cf1d744d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_list_container.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useReducer, useCallback, Reducer } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { ConfigKey } from '../../../../common/runtime_types';
 import { getMonitors } from '../../../state/actions';
 import { monitorManagementListSelector } from '../../../state/selectors';
@@ -27,7 +27,7 @@ export const MonitorListContainer: React.FC = () => {
       pageIndex: 1, // saved objects page index is base 1
       pageSize: 10,
       sortOrder: 'asc',
-      sortField: ConfigKey.NAME,
+      sortField: `${ConfigKey.NAME}.keyword`,
     }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_locations.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_locations.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_locations.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/monitor_locations.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/stderr_logs_popover.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/stderr_logs_popover.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/stderr_logs_popover.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/stderr_logs_popover.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/tags.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/tags.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/monitor_list/tags.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/monitor_list/tags.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/show_sync_errors.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/show_sync_errors.tsx
index 845215ec2d19f..2a6512b7b7dfc 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/show_sync_errors.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { kibanaService } from '../../state/kibana_service';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
 import { ServiceLocationErrors, ServiceLocations } from '../../../common/runtime_types';
 
 export const showSyncErrors = (errors: ServiceLocationErrors, locations: ServiceLocations) => {
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
similarity index 89%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
index d164e19705838..2a31d54097d5f 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
@@ -23,7 +23,14 @@ describe('BrowserTestRunResult', function () {
   });
 
   it('should render properly', async function () {
-    render(<BrowserTestRunResult monitorId={testId} isMonitorSaved={true} onDone={onDone} />);
+    render(
+      <BrowserTestRunResult
+        monitorId={testId}
+        isMonitorSaved={true}
+        expectPings={1}
+        onDone={onDone}
+      />
+    );
     expect(await screen.findByText('Test result')).toBeInTheDocument();
     expect(await screen.findByText('0 steps completed')).toBeInTheDocument();
     const dataApi = (kibanaService.core as any).data.search;
@@ -47,26 +54,42 @@ describe('BrowserTestRunResult', function () {
             },
             sort: [{ '@timestamp': 'desc' }],
           },
-          index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
-          size: 10,
+          index: 'synthetics-*',
+          size: 1000,
         },
       },
       {}
     );
   });
 
-  it('should displays results', async function () {
+  it('should display results', async function () {
     jest.spyOn(runOnceHooks, 'useBrowserRunOnceMonitors').mockReturnValue({
       data,
-      stepListData: { steps: [stepEndDoc._source] } as any,
-      loading: false,
-      stepsLoading: false,
-      journeyStarted: true,
-      summaryDoc: summaryDoc._source,
-      stepEnds: [stepEndDoc._source],
+      summariesLoading: false,
+      stepLoadingInProgress: false,
+      expectedSummariesLoaded: true,
+      lastUpdated: Date.now(),
+      checkGroupResults: [
+        {
+          checkGroupId: 'c01406bf-7467-11ec-9858-aa31996e0afe',
+          stepsLoading: false,
+          journeyStarted: true,
+          summaryDoc: summaryDoc._source,
+          journeyDoc: summaryDoc._source,
+          steps: [stepEndDoc._source],
+          completedSteps: 1,
+        },
+      ],
     });
 
-    render(<BrowserTestRunResult monitorId={testId} isMonitorSaved={true} onDone={onDone} />);
+    render(
+      <BrowserTestRunResult
+        monitorId={testId}
+        isMonitorSaved={true}
+        expectPings={1}
+        onDone={onDone}
+      />
+    );
 
     expect(await screen.findByText('Test result')).toBeInTheDocument();
 
diff --git a/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/browser_test_results.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/browser_test_results.tsx
new file mode 100644
index 0000000000000..e5ca115b09b97
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/browser_test_results.tsx
@@ -0,0 +1,138 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useEffect } from 'react';
+import * as React from 'react';
+import { EuiAccordion, EuiText, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
+import { StepsList } from '../../../synthetics/check_steps/steps_list';
+import { CheckGroupResult, useBrowserRunOnceMonitors } from './use_browser_run_once_monitors';
+import { TestResultHeader } from '../test_result_header';
+import { StdErrorLogs } from '../../../synthetics/check_steps/stderr_logs';
+
+interface Props {
+  monitorId: string;
+  isMonitorSaved: boolean;
+  expectPings: number;
+  onDone: () => void;
+}
+export const BrowserTestRunResult = ({ monitorId, isMonitorSaved, expectPings, onDone }: Props) => {
+  const { summariesLoading, expectedSummariesLoaded, stepLoadingInProgress, checkGroupResults } =
+    useBrowserRunOnceMonitors({
+      configId: monitorId,
+      expectSummaryDocs: expectPings,
+    });
+
+  useEffect(() => {
+    if (expectedSummariesLoaded) {
+      onDone();
+    }
+  }, [onDone, expectedSummariesLoaded]);
+
+  return (
+    <>
+      {checkGroupResults.map((checkGroupResult) => {
+        const { checkGroupId, journeyStarted, summaryDoc, stepsLoading, steps, completedSteps } =
+          checkGroupResult;
+        const isStepsLoading = !summariesLoading && journeyStarted && summaryDoc && stepsLoading;
+        const isStepsLoadingFailed =
+          summaryDoc && !summariesLoading && !stepLoadingInProgress && steps.length === 0;
+
+        return (
+          <AccordionWrapper
+            key={'accordion-' + checkGroupId}
+            id={'accordion-' + checkGroupId}
+            element="fieldset"
+            className="euiAccordionForm"
+            buttonClassName="euiAccordionForm__button"
+            buttonContent={getButtonContent(checkGroupResult)}
+            paddingSize="s"
+            data-test-subj="expandResults"
+            initialIsOpen={checkGroupResults.length === 1}
+          >
+            {isStepsLoading && (
+              <EuiFlexGroup alignItems="center" gutterSize="xs">
+                <EuiFlexItem grow={false}>
+                  <EuiText>{LOADING_STEPS}</EuiText>
+                </EuiFlexItem>
+                <EuiFlexItem>
+                  <EuiLoadingSpinner size="s" />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            )}
+            {isStepsLoadingFailed && (
+              <EuiText color="danger">{summaryDoc?.error?.message ?? FAILED_TO_RUN}</EuiText>
+            )}
+
+            {isStepsLoadingFailed &&
+              summaryDoc?.error?.message?.includes('journey did not finish executing') && (
+                <StdErrorLogs checkGroup={summaryDoc.monitor.check_group} hideTitle={true} />
+              )}
+
+            {summaryDoc && completedSteps > 0 && (
+              <StepsList
+                data={steps}
+                compactView={true}
+                showStepDurationTrend={isMonitorSaved}
+                loading={Boolean(stepLoadingInProgress)}
+                error={undefined}
+              />
+            )}
+          </AccordionWrapper>
+        );
+      })}
+    </>
+  );
+};
+
+const AccordionWrapper = styled(EuiAccordion)`
+  .euiAccordion__buttonContent {
+    width: 100%;
+  }
+`;
+
+function getButtonContent({
+  journeyDoc,
+  summaryDoc,
+  checkGroupId,
+  journeyStarted,
+  completedSteps,
+}: CheckGroupResult) {
+  return (
+    <div>
+      <TestResultHeader
+        title={journeyDoc?.observer?.geo?.name}
+        summaryDocs={summaryDoc ? [summaryDoc] : []}
+        checkGroupId={checkGroupId}
+        journeyStarted={journeyStarted}
+        isCompleted={Boolean(summaryDoc)}
+      />
+      <EuiText size="s">
+        <p>
+          <EuiText color="subdued">
+            {i18n.translate('xpack.uptime.monitorManagement.stepCompleted', {
+              defaultMessage:
+                '{stepCount, number} {stepCount, plural, one {step} other {steps}}  completed',
+              values: {
+                stepCount: completedSteps ?? 0,
+              },
+            })}
+          </EuiText>
+        </p>
+      </EuiText>
+    </div>
+  );
+}
+
+const FAILED_TO_RUN = i18n.translate('xpack.uptime.monitorManagement.failedRun', {
+  defaultMessage: 'Failed to run steps',
+});
+
+const LOADING_STEPS = i18n.translate('xpack.uptime.monitorManagement.loadingSteps', {
+  defaultMessage: 'Loading steps...',
+});
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.test.tsx
similarity index 62%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.test.tsx
index 285a4a4140c27..332af4403e180 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.test.tsx
@@ -26,18 +26,34 @@ describe('useBrowserRunOnceMonitors', function () {
       },
     });
 
-    const { result } = renderHook(() => useBrowserRunOnceMonitors({ configId: 'test-id' }), {
-      wrapper: WrappedHelper,
-    });
+    const { result } = renderHook(
+      () =>
+        useBrowserRunOnceMonitors({
+          configId: 'test-id',
+          testRunId: 'test-run-id',
+          expectSummaryDocs: 1,
+        }),
+      {
+        wrapper: WrappedHelper,
+      }
+    );
 
     expect(result.current).toEqual({
       data: undefined,
-      journeyStarted: false,
-      loading: true,
-      stepsLoading: true,
-      stepEnds: [],
-      stepListData: undefined,
-      summaryDoc: undefined,
+      expectedSummariesLoaded: false,
+      lastUpdated: expect.any(Number),
+      stepLoadingInProgress: true,
+      summariesLoading: true,
+      checkGroupResults: [
+        {
+          checkGroupId: 'placeholder-check-group-0',
+          completedSteps: 0,
+          steps: [],
+          summaryDoc: undefined,
+          journeyStarted: false,
+          stepsLoading: true,
+        },
+      ],
     });
   });
 });
diff --git a/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
new file mode 100644
index 0000000000000..68f96b5d7b487
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
@@ -0,0 +1,278 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { useEffect, useState, useRef } from 'react';
+import { createEsParams, useEsSearch, useFetcher } from '@kbn/observability-plugin/public';
+import { JourneyStep } from '../../../../../common/runtime_types';
+import { useTickTick } from '../use_tick_tick';
+import { fetchJourneySteps } from '../../../../state/api/journey';
+import { isStepEnd } from '../../../synthetics/check_steps/steps_list';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../../common/constants';
+
+export interface CheckGroupResult {
+  checkGroupId: string;
+  journeyStarted: boolean;
+  journeyDoc?: JourneyStep;
+  summaryDoc?: JourneyStep;
+  steps: JourneyStep[];
+  stepsLoading: boolean;
+  completedSteps: number;
+}
+
+export const useBrowserEsResults = ({
+  configId,
+  testRunId,
+  lastRefresh,
+}: {
+  configId: string;
+  testRunId?: string;
+  lastRefresh: number;
+}) => {
+  return useEsSearch(
+    createEsParams({
+      index: SYNTHETICS_INDEX_PATTERN,
+      body: {
+        sort: [
+          {
+            '@timestamp': 'desc',
+          },
+        ],
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  config_id: configId,
+                },
+              },
+              {
+                terms: {
+                  'synthetics.type': ['heartbeat/summary', 'journey/start'],
+                },
+              },
+              ...(testRunId
+                ? [
+                    {
+                      term: {
+                        test_run_id: testRunId,
+                      },
+                    },
+                  ]
+                : []),
+            ],
+          },
+        },
+      },
+      size: 1000,
+    }),
+    [configId, lastRefresh],
+    { name: 'TestRunData' }
+  );
+};
+
+export const useBrowserRunOnceMonitors = ({
+  configId,
+  testRunId,
+  skipDetails = false,
+  refresh = true,
+  expectSummaryDocs,
+}: {
+  configId: string;
+  testRunId?: string;
+  refresh?: boolean;
+  skipDetails?: boolean;
+  expectSummaryDocs: number;
+}) => {
+  const { refreshTimer, lastRefresh } = useTickTick(3 * 1000, refresh);
+
+  const [checkGroupResults, setCheckGroupResults] = useState<CheckGroupResult[]>(() => {
+    return new Array(expectSummaryDocs)
+      .fill({
+        checkGroupId: '',
+        journeyStarted: false,
+        steps: [],
+        stepsLoading: false,
+        completedSteps: 0,
+      } as CheckGroupResult)
+      .map((emptyCheckGroup, index) => ({
+        ...emptyCheckGroup,
+        checkGroupId: `placeholder-check-group-${index}`,
+      }));
+  });
+
+  const lastUpdated = useRef<{ checksum: string; time: number }>({
+    checksum: '',
+    time: Date.now(),
+  });
+
+  const { data, loading: summariesLoading } = useBrowserEsResults({
+    configId,
+    testRunId,
+    lastRefresh,
+  });
+
+  useEffect(() => {
+    const hits = data?.hits.hits;
+
+    if (hits && hits.length > 0) {
+      const allDocs = (hits ?? []).map(({ _source }) => _source as JourneyStep);
+      const checkGroupsById = allDocs
+        .filter(
+          (doc) =>
+            doc.synthetics?.type === 'journey/start' || doc.synthetics?.type === 'heartbeat/summary'
+        )
+        .reduce(
+          (acc, cur) => ({
+            ...acc,
+            [cur.monitor.check_group]: {
+              checkGroupId: cur.monitor.check_group,
+              journeyStarted: true,
+              journeyDoc: cur,
+              summaryDoc: null,
+              steps: [],
+              stepsLoading: false,
+              completedSteps: 0,
+            },
+          }),
+          {}
+        ) as Record<string, CheckGroupResult>;
+
+      allDocs.forEach((step) => {
+        if (step.synthetics?.type === 'heartbeat/summary') {
+          checkGroupsById[step.monitor.check_group].summaryDoc = step;
+        }
+      });
+
+      const checkGroups = Object.values(checkGroupsById);
+      const finishedCheckGroups = checkGroups.filter((group) => !!group.summaryDoc);
+
+      if (finishedCheckGroups.length >= expectSummaryDocs) {
+        clearInterval(refreshTimer);
+      }
+
+      replaceCheckGroupResults(checkGroups);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [expectSummaryDocs, data, refreshTimer]);
+
+  // Loading steps for browser runs
+  const checkGroupIds = checkGroupResults.map(({ checkGroupId }) => checkGroupId);
+  const checkGroupCheckSum = checkGroupIds.reduce((acc, cur) => acc + cur, '');
+  const { loading: stepLoadingInProgress } = useFetcher(() => {
+    if (checkGroupIds.length && !skipDetails) {
+      setCheckGroupResults((prevState) => {
+        return prevState.map((result) => ({ ...result, stepsLoading: true }));
+      });
+
+      return Promise.all(
+        checkGroupIds.map((id) => {
+          return fetchJourneySteps({
+            checkGroup: id,
+          })
+            .then((stepsData) => {
+              updateCheckGroupResult(stepsData.checkGroup, {
+                steps: stepsData.steps,
+                completedSteps: stepsData.steps.filter(isStepEnd).length,
+              });
+
+              return stepsData;
+            })
+            .finally(() => {
+              updateCheckGroupResult(id, {
+                stepsLoading: false,
+              });
+            });
+        })
+      );
+    }
+
+    return Promise.resolve(null);
+  }, [checkGroupCheckSum, setCheckGroupResults, lastRefresh]);
+
+  // Whenever a new found document is fetched, update lastUpdated
+  useEffect(() => {
+    const currentChecksum = getCheckGroupChecksum(checkGroupResults);
+    if (checkGroupCheckSum !== lastUpdated.current.checksum) {
+      // Mutating lastUpdated
+      lastUpdated.current.checksum = currentChecksum;
+      lastUpdated.current.time = Date.now();
+    }
+  }, [checkGroupResults, checkGroupCheckSum]);
+
+  const updateCheckGroupResult = (id: string, result: Partial<CheckGroupResult>) => {
+    setCheckGroupResults((prevState) => {
+      return prevState.map((r) => {
+        if (id !== r.checkGroupId) {
+          return r;
+        }
+
+        return mergeCheckGroups(r, result);
+      }) as CheckGroupResult[];
+    });
+  };
+
+  const replaceCheckGroupResults = (curCheckGroups: CheckGroupResult[]) => {
+    const emptyCheckGroups = checkGroupResults.filter((group) =>
+      group.checkGroupId.startsWith('placeholder-check-group')
+    );
+
+    // Padding the collection with placeholders so that rows could be shown on UI with loading state
+    const paddedCheckGroups =
+      curCheckGroups.length < expectSummaryDocs
+        ? [
+            ...curCheckGroups,
+            ...emptyCheckGroups.slice(-1 * (expectSummaryDocs - curCheckGroups.length)),
+          ]
+        : curCheckGroups;
+
+    setCheckGroupResults((prevCheckGroups) => {
+      const newIds = paddedCheckGroups.map(({ checkGroupId }) => checkGroupId);
+      const newById: Record<string, CheckGroupResult> = paddedCheckGroups.reduce(
+        (acc, cur) => ({ ...acc, [cur.checkGroupId]: cur }),
+        {}
+      );
+      const oldById: Record<string, CheckGroupResult> = prevCheckGroups.reduce(
+        (acc, cur) => ({ ...acc, [cur.checkGroupId]: cur }),
+        {}
+      );
+
+      return newIds.map((id) => mergeCheckGroups(oldById[id], newById[id]));
+    });
+  };
+
+  return {
+    data,
+    summariesLoading,
+    stepLoadingInProgress,
+    expectedSummariesLoaded:
+      checkGroupResults.filter(({ summaryDoc }) => !!summaryDoc).length >= expectSummaryDocs,
+    checkGroupResults,
+    lastUpdated: lastUpdated.current.time,
+  };
+};
+
+function mergeCheckGroups(prev: CheckGroupResult, curr: Partial<CheckGroupResult>) {
+  // Once completed steps has been determined and shown, don't lower the number on UI due to re-fetch
+  const completedSteps = curr.completedSteps
+    ? Math.max(prev?.completedSteps ?? 0, curr.completedSteps ?? 0)
+    : prev?.completedSteps ?? 0;
+
+  return {
+    ...(prev ?? {}),
+    ...curr,
+    completedSteps,
+  };
+}
+
+function getCheckGroupChecksum(checkGroupResults: CheckGroupResult[]) {
+  return checkGroupResults.reduce((acc, cur) => {
+    return (
+      acc + cur?.journeyDoc?._id ??
+      '' + cur?.summaryDoc?._id ??
+      '' + (cur?.steps ?? []).reduce((stepAcc, { _id }) => stepAcc + _id, '')
+    );
+  }, '');
+}
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
index 1d5dfef8a67e7..6ef4daf9fbdf3 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
@@ -23,7 +23,7 @@ describe('SimpleTestResults', function () {
   });
 
   it('should render properly', async function () {
-    render(<SimpleTestResults monitorId={testId} onDone={onDone} />);
+    render(<SimpleTestResults monitorId={testId} expectPings={1} onDone={onDone} />);
     expect(await screen.findByText('Test result')).toBeInTheDocument();
     const dataApi = (kibanaService.core as any).data.search;
 
@@ -39,8 +39,8 @@ describe('SimpleTestResults', function () {
             },
             sort: [{ '@timestamp': 'desc' }],
           },
-          index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
-          size: 10,
+          index: 'synthetics-*',
+          size: 1000,
         },
       },
       {}
@@ -51,15 +51,18 @@ describe('SimpleTestResults', function () {
     const doc = data.hits.hits[0];
     jest.spyOn(runOnceHooks, 'useSimpleRunOnceMonitors').mockReturnValue({
       data: data as any,
-      summaryDoc: {
-        ...(doc._source as unknown as Ping),
-        timestamp: (doc._source as unknown as Record<string, string>)?.['@timestamp'],
-        docId: doc._id,
-      },
+      summaryDocs: [
+        {
+          ...(doc._source as unknown as Ping),
+          timestamp: (doc._source as unknown as Record<string, string>)?.['@timestamp'],
+          docId: doc._id,
+        },
+      ],
       loading: false,
+      lastUpdated: Date.now(),
     });
 
-    render(<SimpleTestResults monitorId={'test-id'} onDone={onDone} />);
+    render(<SimpleTestResults monitorId={'test-id'} expectPings={1} onDone={onDone} />);
 
     expect(await screen.findByText('Test result')).toBeInTheDocument();
 
diff --git a/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/simple_test_results.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/simple_test_results.tsx
new file mode 100644
index 0000000000000..b1ac899a8951e
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/simple_test_results.tsx
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { useEffect, useState } from 'react';
+import { useSimpleRunOnceMonitors } from './use_simple_run_once_monitors';
+import { Ping } from '../../../../../common/runtime_types';
+import { PingListTable } from '../../../monitor/ping_list/ping_list_table';
+import { TestResultHeader } from '../test_result_header';
+
+interface Props {
+  monitorId: string;
+  expectPings: number;
+  onDone: () => void;
+}
+export function SimpleTestResults({ monitorId, expectPings, onDone }: Props) {
+  const [summaryDocsCache, setSummaryDocsCache] = useState<Ping[]>([]);
+  const { summaryDocs, loading } = useSimpleRunOnceMonitors({
+    configId: monitorId,
+    expectSummaryDocs: expectPings,
+  });
+
+  useEffect(() => {
+    if (summaryDocs) {
+      setSummaryDocsCache((prevState: Ping[]) => {
+        const prevById: Record<string, Ping> = prevState.reduce(
+          (acc, cur) => ({ ...acc, [cur.docId]: cur }),
+          {}
+        );
+        return summaryDocs.map((updatedDoc) => ({
+          ...updatedDoc,
+          ...(prevById[updatedDoc.docId] ?? {}),
+        }));
+      });
+
+      if (summaryDocs.length >= expectPings) {
+        onDone();
+      }
+    }
+  }, [expectPings, summaryDocs, onDone]);
+
+  return (
+    <>
+      <TestResultHeader
+        summaryDocs={summaryDocsCache}
+        isCompleted={Boolean(summaryDocs && summaryDocs.length >= expectPings)}
+      />
+      {summaryDocs && <PingListTable pings={summaryDocsCache} loading={loading} />}
+    </>
+  );
+}
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
similarity index 57%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
index fc43844103f25..3ca3691aef22c 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
@@ -5,27 +5,26 @@
  * 2.0.
  */
 
-import { useSelector } from 'react-redux';
-import { useMemo } from 'react';
-import { selectDynamicSettings } from '../../../../state/selectors';
+import { useMemo, useRef } from 'react';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 import { Ping } from '../../../../../common/runtime_types';
-import { createEsParams, useEsSearch } from '../../../../../../observability/public';
 import { useTickTick } from '../use_tick_tick';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../../common/constants';
 
 export const useSimpleRunOnceMonitors = ({
   configId,
+  expectSummaryDocs,
   testRunId,
 }: {
   configId: string;
+  expectSummaryDocs: number;
   testRunId?: string;
 }) => {
   const { refreshTimer, lastRefresh } = useTickTick(2 * 1000, false);
 
-  const { settings } = useSelector(selectDynamicSettings);
-
   const { data, loading } = useEsSearch(
     createEsParams({
-      index: settings?.heartbeatIndices,
+      index: SYNTHETICS_INDEX_PATTERN,
       body: {
         sort: [
           {
@@ -58,32 +57,52 @@ export const useSimpleRunOnceMonitors = ({
           },
         },
       },
-      size: 10,
+      size: 1000,
     }),
-    [configId, settings?.heartbeatIndices, lastRefresh],
+    [configId, lastRefresh],
     { name: 'TestRunData' }
   );
 
+  const lastUpdated = useRef<{ checksum: string; time: number }>({
+    checksum: '',
+    time: Date.now(),
+  });
+
   return useMemo(() => {
-    const doc = data?.hits.hits?.[0];
+    const docs = data?.hits.hits ?? [];
+
+    // Whenever a new found document is fetched, update lastUpdated
+    const docsChecksum = docs
+      .map(({ _id }: { _id: string }) => _id)
+      .reduce((acc, cur) => acc + cur, '');
+    if (docsChecksum !== lastUpdated.current.checksum) {
+      // Mutating lastUpdated
+      lastUpdated.current.checksum = docsChecksum;
+      lastUpdated.current.time = Date.now();
+    }
+
+    if (docs.length > 0) {
+      if (docs.length >= expectSummaryDocs) {
+        clearInterval(refreshTimer);
+      }
 
-    if (doc) {
-      clearInterval(refreshTimer);
       return {
         data,
         loading,
-        summaryDoc: {
+        summaryDocs: docs.map((doc) => ({
           ...(doc._source as Ping),
           timestamp: (doc._source as Record<string, string>)?.['@timestamp'],
           docId: doc._id,
-        },
+        })),
+        lastUpdated: lastUpdated.current.time,
       };
     }
 
     return {
       data,
       loading,
-      summaryDoc: null,
+      summaryDocs: null,
+      lastUpdated: lastUpdated.current.time,
     };
-  }, [data, loading, refreshTimer]);
+  }, [expectSummaryDocs, data, loading, refreshTimer]);
 };
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_now_mode.test.tsx
similarity index 53%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_now_mode.test.tsx
index 4a3f155a18813..da06b41d16530 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_now_mode.test.tsx
@@ -10,24 +10,42 @@ import { screen } from '@testing-library/react';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { TestNowMode } from './test_now_mode';
 import { kibanaService } from '../../../state/kibana_service';
-import { MonitorFields } from '../../../../common/runtime_types';
+import { Locations, MonitorFields } from '../../../../common/runtime_types';
+import * as runOnceErrorHooks from '../hooks/use_run_once_errors';
 
 describe('TestNowMode', function () {
+  const locations: Locations = [
+    {
+      id: 'test-location-id',
+      label: 'Test Location',
+      geo: { lat: 33.333, lon: 73.333 },
+      url: 'test-url',
+      isServiceManaged: true,
+    },
+  ];
+  const testMonitor = {
+    id: 'test-monitor-id',
+    type: 'browser',
+    locations,
+  } as unknown as MonitorFields;
+  const testRun = { id: 'test-run-id', monitor: testMonitor };
   const onDone = jest.fn();
 
+  beforeEach(() => {
+    jest.spyOn(runOnceErrorHooks, 'useRunOnceErrors').mockReturnValue({
+      expectPings: 1,
+      hasBlockingError: false,
+      blockingErrorMessage: '',
+      errorMessages: [],
+    });
+  });
+
   afterEach(() => {
     jest.resetAllMocks();
   });
 
   it('should render properly', async function () {
-    render(
-      <TestNowMode
-        testRun={{ id: 'test-run', monitor: { type: 'browser' } as MonitorFields }}
-        isMonitorSaved={false}
-        onDone={onDone}
-      />
-    );
-    expect(await screen.findByText('Test result')).toBeInTheDocument();
+    render(<TestNowMode testRun={testRun} isMonitorSaved={false} onDone={onDone} />);
     expect(await screen.findByText('PENDING')).toBeInTheDocument();
 
     expect(await screen.findByText('0 steps completed')).toBeInTheDocument();
@@ -36,7 +54,7 @@ describe('TestNowMode', function () {
 
     expect(kibanaService.core.http.post).toHaveBeenLastCalledWith(
       expect.stringContaining('/internal/uptime/service/monitors/run_once/'),
-      { body: '{"type":"browser"}', method: 'POST' }
+      { body: JSON.stringify(testMonitor), method: 'POST' }
     );
   });
 });
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_now_mode.tsx
similarity index 63%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_now_mode.tsx
index a4f04e04ddc14..0cc5f0658ff44 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_now_mode.tsx
@@ -15,9 +15,10 @@ import {
   EuiPanel,
   EuiSpacer,
 } from '@elastic/eui';
+import { useFetcher } from '@kbn/observability-plugin/public';
+import { useRunOnceErrors } from '../hooks/use_run_once_errors';
 import { TestRunResult } from './test_run_results';
-import { MonitorFields } from '../../../../common/runtime_types';
-import { useFetcher } from '../../../../../observability/public';
+import { Locations, MonitorFields, ServiceLocationErrors } from '../../../../common/runtime_types';
 import { runOnceMonitor } from '../../../state/api';
 import { kibanaService } from '../../../state/kibana_service';
 
@@ -43,31 +44,37 @@ export function TestNowMode({
         monitor: testRun.monitor,
         id: testRun.id,
       })
-        .then(() => setServiceError(null))
+        .then((d) => {
+          setServiceError(null);
+          return d;
+        })
         .catch((error) => setServiceError(error));
     }
     return new Promise((resolve) => resolve(null));
   }, [testRun]);
 
-  useEffect(() => {
-    const errors = (data as { errors: Array<{ error: Error }> })?.errors;
-
-    if (errors?.length > 0) {
-      errors.forEach(({ error }) => {
-        kibanaService.toasts.addError(error, { title: PushErrorLabel });
-      });
-    }
-  }, [data]);
+  const errors = (data as { errors?: ServiceLocationErrors })?.errors;
 
-  const errors = (data as { errors?: Array<{ error: Error }> })?.errors;
+  const { hasBlockingError, blockingErrorMessage, expectPings, errorMessages } = useRunOnceErrors({
+    testRunId: testRun?.id ?? '',
+    serviceError,
+    errors: errors ?? [],
+    locations: (testRun?.monitor.locations ?? []) as Locations,
+  });
 
-  const hasErrors = serviceError || (errors && errors?.length > 0);
+  useEffect(() => {
+    errorMessages.forEach(
+      ({ name, message, title }: { name: string; message: string; title: string }) => {
+        kibanaService.toasts.addError({ name, message }, { title });
+      }
+    );
+  }, [errorMessages]);
 
   useEffect(() => {
-    if (!isPushing && (!testRun || hasErrors)) {
+    if (!isPushing && (!testRun || hasBlockingError)) {
       onDone();
     }
-  }, [testRun, hasErrors, isPushing, onDone]);
+  }, [testRun, hasBlockingError, isPushing, onDone]);
 
   if (!testRun) {
     return null;
@@ -81,15 +88,19 @@ export function TestNowMode({
         </EuiCallOut>
       )}
 
-      {hasErrors && !isPushing && <EuiCallOut title={PushError} color="danger" iconType="alert" />}
+      {(hasBlockingError && !isPushing && (
+        <EuiCallOut title={blockingErrorMessage} color="danger" iconType="alert" />
+      )) ||
+        null}
 
-      {testRun && !hasErrors && !isPushing && (
+      {testRun && !hasBlockingError && !isPushing && (
         <EuiFlexGroup direction="column" gutterSize="xs">
           <EuiFlexItem key={testRun.id}>
             <TestRunResult
               monitorId={testRun.id}
               monitor={testRun.monitor}
               isMonitorSaved={isMonitorSaved}
+              expectPings={expectPings}
               onDone={onDone}
             />
           </EuiFlexItem>
@@ -103,11 +114,3 @@ export function TestNowMode({
 const PushingLabel = i18n.translate('xpack.uptime.testRun.pushing.description', {
   defaultMessage: 'Pushing the monitor to service...',
 });
-
-const PushError = i18n.translate('xpack.uptime.testRun.pushError', {
-  defaultMessage: 'Failed to push the monitor to service.',
-});
-
-const PushErrorLabel = i18n.translate('xpack.uptime.testRun.pushErrorLabel', {
-  defaultMessage: 'Push error',
-});
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_result_header.test.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_result_header.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_result_header.test.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_result_header.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_result_header.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_result_header.tsx
similarity index 92%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_result_header.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_result_header.tsx
index 38679ebff3b60..7c53e99a6e9af 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_result_header.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_result_header.tsx
@@ -21,14 +21,20 @@ import { JourneyStep, Ping } from '../../../../common/runtime_types';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
 interface Props {
-  doc?: JourneyStep;
+  checkGroupId?: string;
   summaryDocs?: Ping[] | JourneyStep[] | null;
   journeyStarted?: boolean;
   title?: string;
   isCompleted: boolean;
 }
 
-export function TestResultHeader({ doc, title, summaryDocs, journeyStarted, isCompleted }: Props) {
+export function TestResultHeader({
+  checkGroupId,
+  title,
+  summaryDocs,
+  journeyStarted,
+  isCompleted,
+}: Props) {
   const { basePath } = useUptimeSettingsContext();
   let duration = 0;
   if (summaryDocs && summaryDocs.length > 0) {
@@ -76,12 +82,9 @@ export function TestResultHeader({ doc, title, summaryDocs, journeyStarted, isCo
           </EuiFlexGroup>
         )}
       </EuiFlexItem>
-      {doc && (
+      {checkGroupId && (
         <EuiFlexItem grow={false}>
-          <EuiLink
-            href={`${basePath}/app/uptime/journey/${doc.monitor.check_group}/steps`}
-            target="_blank"
-          >
+          <EuiLink href={`${basePath}/app/uptime/journey/${checkGroupId}/steps`} target="_blank">
             {VIEW_DETAILS}
           </EuiLink>
         </EuiFlexItem>
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_run_results.tsx b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_run_results.tsx
similarity index 63%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_run_results.tsx
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_run_results.tsx
index 27c9eb8426a31..b1a6d0aba8cfc 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_run_results.tsx
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/test_run_results.tsx
@@ -14,12 +14,24 @@ interface Props {
   monitorId: string;
   monitor: SyntheticsMonitor;
   isMonitorSaved: boolean;
+  expectPings: number;
   onDone: () => void;
 }
-export const TestRunResult = ({ monitorId, monitor, isMonitorSaved, onDone }: Props) => {
+export const TestRunResult = ({
+  monitorId,
+  monitor,
+  isMonitorSaved,
+  expectPings,
+  onDone,
+}: Props) => {
   return monitor.type === 'browser' ? (
-    <BrowserTestRunResult monitorId={monitorId} isMonitorSaved={isMonitorSaved} onDone={onDone} />
+    <BrowserTestRunResult
+      monitorId={monitorId}
+      expectPings={expectPings}
+      isMonitorSaved={isMonitorSaved}
+      onDone={onDone}
+    />
   ) : (
-    <SimpleTestResults monitorId={monitorId} onDone={onDone} />
+    <SimpleTestResults monitorId={monitorId} expectPings={expectPings} onDone={onDone} />
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/use_tick_tick.ts b/x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/use_tick_tick.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/use_tick_tick.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/test_now_mode/use_tick_tick.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/validation.test.ts b/x-pack/plugins/synthetics/public/components/monitor_management/validation.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor_management/validation.test.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/validation.test.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/validation.ts b/x-pack/plugins/synthetics/public/components/monitor_management/validation.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/components/monitor_management/validation.ts
rename to x-pack/plugins/synthetics/public/components/monitor_management/validation.ts
index ce6e5110c8f88..78b0b8ba82b68 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/validation.ts
+++ b/x-pack/plugins/synthetics/public/components/monitor_management/validation.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { isValidNamespace } from '../../../../fleet/common';
+import { isValidNamespace } from '@kbn/fleet-plugin/common';
 import {
   ConfigKey,
   DataStream,
diff --git a/x-pack/plugins/uptime/public/components/overview/__snapshots__/snapshot_heading.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/__snapshots__/snapshot_heading.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/__snapshots__/snapshot_heading.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/__snapshots__/snapshot_heading.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_expression_popover.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alert_expression_popover.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alert_expression_popover.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alert_expression_popover.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_field_number.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alert_field_number.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alert_field_number.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alert_field_number.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_field_number.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alert_field_number.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alert_field_number.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alert_field_number.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alert_query_bar/query_bar.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alert_query_bar/query_bar.tsx
index ad6ffeacc909f..0e9244cdc15ad 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/alert_query_bar/query_bar.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useState } from 'react';
 import { EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { isValidKuery } from '../../query_bar/query_bar';
 import * as labels from '../translations';
 import { useIndexPattern } from '../../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_tls.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alert_tls.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alert_tls.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alert_tls.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_tls.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/alert_tls.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_tls.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/alert_tls.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/index.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
index b7d3fc368c4ba..2dc9489f39a6c 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import { setAlertFlyoutType, setAlertFlyoutVisible } from '../../../../state/actions';
-import { ToggleAlertFlyoutButtonComponent } from '../index';
+import { ToggleAlertFlyoutButtonComponent } from '..';
 
 export interface ToggleAlertFlyoutButtonProps {
   alertOptions?: string[];
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
similarity index 93%
rename from x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
index 5863fc84f4ac9..e6aee6207093e 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { useIndexPattern, generateUpdatedKueryString } from '../../../../hooks';
-import { useFetcher } from '../../../../../../observability/public';
 import { fetchSnapshotCount } from '../../../../state/api';
 
 export const useSnapShotCount = ({ query, filters }: { query: string; filters: [] | string }) => {
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
index 14cca50bdafdc..c22aed0c8a9ce 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
@@ -15,11 +15,11 @@ import {
 } from '@elastic/eui';
 import { useSelector } from 'react-redux';
 import React, { useEffect, useState } from 'react';
+import { getSeverityColor, getSeverity } from '@kbn/ml-plugin/public';
 import { AnomalyTranslations } from './translations';
 import { AlertExpressionPopover } from '../alert_expression_popover';
 import { DEFAULT_SEVERITY, SelectSeverity, SEVERITY_OPTIONS } from './select_severity';
 import { monitorIdSelector } from '../../../../state/selectors';
-import { getSeverityColor, getSeverity } from '../../../../../../ml/public';
 
 interface Props {
   ruleParams: { [key: string]: any };
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/select_severity.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/select_severity.tsx
index 92ae02972ff62..eed650fe6074a 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/select_severity.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiHealth, EuiSpacer, EuiSuperSelect, EuiText } from '@elastic/eui';
-import { getSeverityColor } from '../../../../../../ml/public';
+import { getSeverityColor } from '@kbn/ml-plugin/public';
 
 const warningLabel = i18n.translate('xpack.uptime.controls.selectSeverity.warningLabel', {
   defaultMessage: 'warning',
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/translations.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/translations.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/anomaly_alert/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/index.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/__snapshots__/down_number_select.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/__snapshots__/down_number_select.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/__snapshots__/down_number_select.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/__snapshots__/down_number_select.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/availability_expression_select.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/availability_expression_select.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/availability_expression_select.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/availability_expression_select.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/down_number_select.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/down_number_select.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/down_number_select.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/down_number_select.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/down_number_select.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/down_number_select.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/down_number_select.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/down_number_select.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
index d9927731a62ef..df0c40e477b26 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
@@ -10,7 +10,7 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import { FiltersExpressionsSelect } from './filters_expression_select';
 import { render } from '../../../../lib/helper/rtl_helpers';
 import { filterAriaLabels as aria } from './translations';
-import * as Hooks from '../../../../../../observability/public/hooks/use_values_list';
+import * as Hooks from '@kbn/observability-plugin/public/hooks/use_values_list';
 
 describe('FiltersExpressionSelect', () => {
   const LOCATION_FIELD_NAME = 'observer.geo.name';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
index 0e083d1fcd679..e34caf1b95b8b 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
@@ -7,9 +7,9 @@
 
 import React, { useState } from 'react';
 import { EuiButtonIcon, EuiExpression, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { FieldValueSuggestions } from '@kbn/observability-plugin/public';
 import { filterLabels } from '../../filter_group/translations';
 import { alertFilterLabels, filterAriaLabels } from './translations';
-import { FieldValueSuggestions } from '../../../../../../observability/public';
 import { useIndexPattern } from '../../../../contexts/uptime_index_pattern_context';
 import { FILTER_FIELDS } from '../../../../../common/constants';
 import { useGetUrlParams } from '../../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/index.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/status_expression_select.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/status_expression_select.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/status_expression_select.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/status_expression_select.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/time_expression_select.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/time_expression_select.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/time_expression_select.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/time_expression_select.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/time_expression_select.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/time_expression_select.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/time_expression_select.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/time_expression_select.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/time_unit_selectable.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/time_unit_selectable.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/time_unit_selectable.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/time_unit_selectable.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/translations.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/translations.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_expressions/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/add_filter_btn.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/add_filter_btn.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/add_filter_btn.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/add_filter_btn.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/add_filter_btn.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/add_filter_btn.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/add_filter_btn.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/add_filter_btn.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/alert_monitor_status.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/old_alert_call_out.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/old_alert_call_out.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/old_alert_call_out.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/old_alert_call_out.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/old_alert_callout.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/old_alert_callout.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/monitor_status_alert/old_alert_callout.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/monitor_status_alert/old_alert_callout.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/settings_message_expression_popover.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/settings_message_expression_popover.tsx
index 9c373731d7bb5..71cdee07699c3 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/settings_message_expression_popover.tsx
@@ -9,7 +9,7 @@ import { EuiLink } from '@elastic/eui';
 import { EuiExpression, EuiPopover } from '@elastic/eui';
 import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface SettingsMessageExpressionPopoverProps {
   'aria-label': string;
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.test.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/toggle_alert_flyout_button.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/toggle_alert_flyout_button.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/toggle_alert_flyout_button.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/toggle_alert_flyout_button.tsx
index 71553893b6725..9aede506dde97 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/toggle_alert_flyout_button.tsx
@@ -16,9 +16,9 @@ import {
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../../common/constants/alerts';
-import { ClientPluginsStart } from '../../../../public/apps/plugin';
+import { ClientPluginsStart } from '../../../apps/plugin';
 
 import { ToggleFlyoutTranslations } from './translations';
 import { ToggleAlertFlyoutButtonProps } from './alerts_containers';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/translations.ts b/x-pack/plugins/synthetics/public/components/overview/alerts/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/alerts/translations.ts
rename to x-pack/plugins/synthetics/public/components/overview/alerts/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx b/x-pack/plugins/synthetics/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
similarity index 86%
rename from x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
rename to x-pack/plugins/synthetics/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
index cf3a9d0800aea..609c4ff6c0c9f 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../../../plugins/triggers_actions_ui/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 
 interface Props {
   alertFlyoutVisible: boolean;
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx b/x-pack/plugins/synthetics/public/components/overview/empty_state/empty_state_error.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
rename to x-pack/plugins/synthetics/public/components/overview/empty_state/empty_state_error.tsx
index 9848ea77d4673..bf1459cbcd789 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/empty_state/empty_state_error.tsx
@@ -8,7 +8,7 @@
 import { EuiEmptyPrompt, EuiPanel, EuiTitle, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 interface EmptyStateErrorProps {
   errors: Array<IHttpFetchError<ResponseErrorBody>>;
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_loading.tsx b/x-pack/plugins/synthetics/public/components/overview/empty_state/empty_state_loading.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_loading.tsx
rename to x-pack/plugins/synthetics/public/components/overview/empty_state/empty_state_loading.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/use_has_data.tsx b/x-pack/plugins/synthetics/public/components/overview/empty_state/use_has_data.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/empty_state/use_has_data.tsx
rename to x-pack/plugins/synthetics/public/components/overview/empty_state/use_has_data.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx b/x-pack/plugins/synthetics/public/components/overview/filter_group/filter_group.test.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/filter_group/filter_group.test.tsx
index 62e9622c17615..706697357dab2 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/filter_group/filter_group.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { FilterGroup } from './filter_group';
-import * as Hooks from '../../../../../observability/public/hooks/use_values_list';
+import * as Hooks from '@kbn/observability-plugin/public/hooks/use_values_list';
 
 describe('FilterGroup', () => {
   it.each([
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx b/x-pack/plugins/synthetics/public/components/overview/filter_group/filter_group.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
rename to x-pack/plugins/synthetics/public/components/overview/filter_group/filter_group.tsx
index e25e764390f6b..d73c2df73919b 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/filter_group/filter_group.tsx
@@ -9,9 +9,9 @@ import React, { useCallback, useState } from 'react';
 import { EuiFilterGroup } from '@elastic/eui';
 import styled from 'styled-components';
 import { capitalize } from 'lodash';
+import { FieldValueSuggestions, useInspectorContext } from '@kbn/observability-plugin/public';
 import { useFilterUpdate } from '../../../hooks/use_filter_update';
 import { useSelectedFilters } from '../../../hooks/use_selected_filters';
-import { FieldValueSuggestions, useInspectorContext } from '../../../../../observability/public';
 import { SelectedFilters } from './selected_filters';
 import { useIndexPattern } from '../../../contexts/uptime_index_pattern_context';
 import { useGetUrlParams } from '../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx b/x-pack/plugins/synthetics/public/components/overview/filter_group/selected_filters.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx
rename to x-pack/plugins/synthetics/public/components/overview/filter_group/selected_filters.tsx
index 541723c331833..3f84fcbfecd75 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/filter_group/selected_filters.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { FilterValueLabel } from '../../../../../observability/public';
+import { FilterValueLabel } from '@kbn/observability-plugin/public';
 import { useIndexPattern } from '../../../contexts/uptime_index_pattern_context';
 import { useSelectedFilters } from '../../../hooks/use_selected_filters';
 
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/translations.tsx b/x-pack/plugins/synthetics/public/components/overview/filter_group/translations.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/filter_group/translations.tsx
rename to x-pack/plugins/synthetics/public/components/overview/filter_group/translations.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/index.ts b/x-pack/plugins/synthetics/public/components/overview/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/cert_status_column.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/cert_status_column.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/cert_status_column.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/cert_status_column.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/define_connectors.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/define_connectors.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/define_connectors.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/define_connectors.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/enable_alert.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/enable_alert.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/enable_alert.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/enable_alert.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_name_col.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_name_col.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_name_col.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_name_col.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
index 02fe666b79464..a6c837ca13a7f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { getLocationStatus, MonitorListStatusColumn } from './monitor_status_column';
 import { Ping } from '../../../../../common/runtime_types';
 import { STATUS } from '../../../../../common/constants';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { mockDate, mockMoment } from '../../../../lib/helper/test_helpers';
 import { render } from '../../../../lib/helper/rtl_helpers';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_status_column.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_status_column.tsx
index 896ab6bc662bb..92d7620b55938 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/monitor_status_column.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import moment, { Moment } from 'moment';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
@@ -19,6 +19,9 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { useDispatch, useSelector } from 'react-redux';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { kibanaService } from '../../../../state/kibana_service';
+import { useRunOnceErrors } from '../../../monitor_management/hooks/use_run_once_errors';
 import { parseTimestamp } from '../parse_timestamp';
 import { DataStream, Ping, PingError } from '../../../../../common/runtime_types';
 import {
@@ -28,7 +31,6 @@ import {
   SHORT_TS_LOCALE,
 } from '../../../../../common/constants';
 
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { STATUS_DOWN_LABEL, STATUS_UP_LABEL } from '../../../common/translations';
 import { MonitorProgress } from './progress/monitor_progress';
 import { refreshedMonitorSelector } from '../../../../state/reducers/monitor_list';
@@ -189,6 +191,25 @@ export const MonitorListStatusColumn = ({
 
   const testNowRun = useSelector(testNowRunSelector(configId));
 
+  const { expectPings, errorMessages, hasBlockingError } = useRunOnceErrors({
+    testRunId: testNowRun?.monitorId ?? '',
+    serviceError: (testNowRun?.fetchError as Error) ?? null,
+    locations: testNowRun?.locations ?? [],
+    errors: testNowRun?.errors ?? [],
+  });
+
+  useEffect(() => {
+    errorMessages.forEach(
+      ({ name, message, title }: { name: string; message: string; title: string }) => {
+        kibanaService.toasts.addError({ name, message }, { title });
+      }
+    );
+
+    if (hasBlockingError) {
+      stopProgressTrack();
+    }
+  }, [errorMessages, hasBlockingError, stopProgressTrack]);
+
   return (
     <div>
       <StatusColumnFlexG alignItems="center" gutterSize="xs" wrap={false} responsive={false}>
@@ -200,6 +221,8 @@ export const MonitorListStatusColumn = ({
               testRunId={testNowRun?.testRunId}
               monitorType={monitorType as DataStream}
               duration={duration ?? 0}
+              schedule={testNowRun.schedule}
+              expectPings={expectPings}
               stopProgressTrack={stopProgressTrack}
             />
           ) : (
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/browser_monitor_progress.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/browser_monitor_progress.tsx
similarity index 50%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/browser_monitor_progress.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/browser_monitor_progress.tsx
index c0453573693c4..b92916bd7b72b 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/browser_monitor_progress.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/browser_monitor_progress.tsx
@@ -6,7 +6,9 @@
  */
 
 import { EuiBadge, EuiProgress } from '@elastic/eui';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
+import { scheduleToMilli } from '../../../../../../common/lib/schedule_to_time';
+import { SyntheticsMonitorSchedule } from '../../../../../../common/runtime_types';
 import { useBrowserRunOnceMonitors } from '../../../../monitor_management/test_now_mode/browser/use_browser_run_once_monitors';
 import {
   IN_PROGRESS_LABEL,
@@ -17,52 +19,54 @@ export const BrowserMonitorProgress = ({
   configId,
   testRunId,
   duration,
+  schedule,
   isUpdating,
+  expectPings,
   updateMonitorStatus,
+  stopProgressTrack,
 }: {
   configId: string;
   testRunId: string;
   duration: number;
+  schedule: SyntheticsMonitorSchedule;
   isUpdating: boolean;
+  expectPings: number;
   updateMonitorStatus: () => void;
+  stopProgressTrack: () => void;
 }) => {
-  const { journeyStarted, summaryDoc, data } = useBrowserRunOnceMonitors({
-    configId,
-    testRunId,
-    refresh: false,
-    skipDetails: true,
-  });
+  const { data, checkGroupResults, lastUpdated, expectedSummariesLoaded } =
+    useBrowserRunOnceMonitors({
+      configId,
+      testRunId,
+      refresh: false,
+      skipDetails: true,
+      expectSummaryDocs: expectPings,
+    });
 
-  const [startTime, setStartTime] = useState(Date.now());
+  const journeyStarted = checkGroupResults.some((result) => result.journeyStarted);
   const [passedTime, setPassedTime] = useState(0);
 
+  const startTime = useRef(Date.now());
+
   useEffect(() => {
-    if (summaryDoc) {
+    if (expectedSummariesLoaded) {
       updateMonitorStatus();
     }
-  }, [updateMonitorStatus, summaryDoc]);
+  }, [updateMonitorStatus, expectedSummariesLoaded]);
 
   useEffect(() => {
-    const interVal = setInterval(() => {
-      if (journeyStarted) {
-        setPassedTime((Date.now() - startTime) * 1000);
-      }
-    }, 500);
-    const startTimeValue = startTime;
-    return () => {
-      if ((Date.now() - startTimeValue) * 1000 > duration) {
-        clearInterval(interVal);
-      }
-    };
-  }, [data, duration, journeyStarted, startTime]);
+    setPassedTime((Date.now() - startTime.current) * 1000);
 
-  useEffect(() => {
-    if (journeyStarted) {
-      setStartTime(Date.now());
+    // Stop waiting for docs if time elapsed is more than monitor frequency
+    const timeSinceLastDoc = Date.now() - lastUpdated;
+    const usualDurationMilli = duration / 1000;
+    const maxTimeout = scheduleToMilli(schedule) - usualDurationMilli;
+    if (timeSinceLastDoc >= maxTimeout) {
+      stopProgressTrack();
     }
-  }, [journeyStarted]);
+  }, [data, checkGroupResults, lastUpdated, duration, schedule, stopProgressTrack]);
 
-  if (isUpdating || passedTime > duration) {
+  if (journeyStarted && (isUpdating || passedTime > duration)) {
     return (
       <>
         <EuiBadge>{IN_PROGRESS_LABEL}</EuiBadge>
@@ -72,7 +76,7 @@ export const BrowserMonitorProgress = ({
   }
 
   return (
-    <span>
+    <>
       {journeyStarted ? (
         <>
           <EuiBadge>{IN_PROGRESS_LABEL}</EuiBadge>
@@ -84,6 +88,6 @@ export const BrowserMonitorProgress = ({
           <EuiProgress size="xs" />
         </>
       )}
-    </span>
+    </>
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/monitor_progress.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/monitor_progress.tsx
similarity index 81%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/monitor_progress.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/monitor_progress.tsx
index e4fc0cf90e87b..b03d278f09d45 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/monitor_progress.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/monitor_progress.tsx
@@ -9,7 +9,7 @@ import React, { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { SimpleMonitorProgress } from './simple_monitor_progress';
 import { BrowserMonitorProgress } from './browser_monitor_progress';
-import { DataStream } from '../../../../../../common/runtime_types';
+import { DataStream, SyntheticsMonitorSchedule } from '../../../../../../common/runtime_types';
 import { useUpdatedMonitor } from './use_updated_monitor';
 import { refreshedMonitorSelector } from '../../../../../state/reducers/monitor_list';
 
@@ -19,6 +19,8 @@ export const MonitorProgress = ({
   testRunId,
   duration,
   monitorType,
+  schedule,
+  expectPings,
   stopProgressTrack,
 }: {
   monitorId: string;
@@ -26,6 +28,8 @@ export const MonitorProgress = ({
   testRunId: string;
   duration: number;
   monitorType: DataStream;
+  schedule: SyntheticsMonitorSchedule;
+  expectPings: number;
   stopProgressTrack: () => void;
 }) => {
   const { updateMonitorStatus, isUpdating } = useUpdatedMonitor({
@@ -46,16 +50,22 @@ export const MonitorProgress = ({
       configId={configId}
       testRunId={testRunId}
       duration={duration}
+      schedule={schedule}
+      expectPings={expectPings}
       isUpdating={isUpdating}
       updateMonitorStatus={updateMonitorStatus}
+      stopProgressTrack={stopProgressTrack}
     />
   ) : (
     <SimpleMonitorProgress
       monitorId={monitorId}
       testRunId={testRunId}
       duration={duration}
+      schedule={schedule}
+      expectPings={expectPings}
       isUpdating={isUpdating}
       updateMonitorStatus={updateMonitorStatus}
+      stopProgressTrack={stopProgressTrack}
     />
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/simple_monitor_progress.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/simple_monitor_progress.tsx
similarity index 62%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/simple_monitor_progress.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/simple_monitor_progress.tsx
index d51ae3f4e9dff..f93bcadd58519 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/simple_monitor_progress.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/simple_monitor_progress.tsx
@@ -7,6 +7,8 @@
 
 import { EuiBadge, EuiProgress } from '@elastic/eui';
 import React, { useEffect, useRef, useState } from 'react';
+import { scheduleToMilli } from '../../../../../../common/lib/schedule_to_time';
+import { SyntheticsMonitorSchedule } from '../../../../../../common/runtime_types';
 import { useSimpleRunOnceMonitors } from '../../../../monitor_management/test_now_mode/simple/use_simple_run_once_monitors';
 import { IN_PROGRESS_LABEL } from '../../../../monitor_management/test_now_mode/test_result_header';
 
@@ -14,18 +16,25 @@ export const SimpleMonitorProgress = ({
   monitorId,
   testRunId,
   duration,
+  schedule,
+  expectPings,
   isUpdating,
   updateMonitorStatus,
+  stopProgressTrack,
 }: {
   monitorId: string;
   testRunId: string;
   duration: number;
+  schedule: SyntheticsMonitorSchedule;
+  expectPings: number;
   isUpdating: boolean;
   updateMonitorStatus: () => void;
+  stopProgressTrack: () => void;
 }) => {
-  const { summaryDoc, data } = useSimpleRunOnceMonitors({
+  const { summaryDocs, data, lastUpdated } = useSimpleRunOnceMonitors({
     configId: monitorId,
     testRunId,
+    expectSummaryDocs: expectPings,
   });
 
   const startTime = useRef(Date.now());
@@ -33,14 +42,22 @@ export const SimpleMonitorProgress = ({
   const [passedTime, setPassedTime] = useState(Date.now());
 
   useEffect(() => {
-    if (summaryDoc) {
+    if (summaryDocs?.length) {
       updateMonitorStatus();
     }
-  }, [updateMonitorStatus, summaryDoc]);
+  }, [updateMonitorStatus, summaryDocs]);
 
   useEffect(() => {
     setPassedTime(Date.now() - startTime.current);
-  }, [data]);
+
+    // Stop waiting for docs if time elapsed is more than monitor frequency
+    const timeSinceLastDoc = Date.now() - lastUpdated;
+    const usualDurationMilli = duration / 1000;
+    const maxTimeout = scheduleToMilli(schedule) - usualDurationMilli;
+    if (timeSinceLastDoc >= maxTimeout) {
+      stopProgressTrack();
+    }
+  }, [data, lastUpdated, duration, schedule, stopProgressTrack]);
 
   const passedTimeMicro = passedTime * 1000;
 
@@ -54,9 +71,9 @@ export const SimpleMonitorProgress = ({
   }
 
   return (
-    <span>
+    <>
       <EuiBadge>{IN_PROGRESS_LABEL}</EuiBadge>
       <EuiProgress value={passedTimeMicro} max={duration} size="xs" />
-    </span>
+    </>
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/use_updated_monitor.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/use_updated_monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/progress/use_updated_monitor.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/progress/use_updated_monitor.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/status_badge.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/status_badge.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/status_badge.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/status_badge.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/status_badge.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/status_badge.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/status_badge.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/status_badge.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/test_now_col.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/test_now_col.tsx
similarity index 84%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/test_now_col.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/test_now_col.tsx
index 3248f65963d77..b877da1824370 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/test_now_col.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/test_now_col.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import React from 'react';
+import { EuiButtonIcon, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { EuiButtonIcon, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
 import { testNowMonitorAction } from '../../../../state/actions';
-import { testNowRunSelector } from '../../../../state/reducers/test_now_runs';
+import { testNowRunSelector, TestRunStats } from '../../../../state/reducers/test_now_runs';
 
 export const TestNowColumn = ({
   monitorId,
@@ -35,7 +35,10 @@ export const TestNowColumn = ({
     dispatch(testNowMonitorAction.get(configId));
   };
 
-  if (testNowRun && testNowRun.status === 'loading') {
+  const isTestNowLoading = testNowRun && testNowRun.status === TestRunStats.LOADING;
+  const isTestNowCompleted = !testNowRun || testNowRun.status === TestRunStats.COMPLETED;
+
+  if (isTestNowLoading) {
     return <EuiLoadingSpinner size="s" />;
   }
 
@@ -44,7 +47,7 @@ export const TestNowColumn = ({
       <EuiButtonIcon
         iconType="play"
         onClick={() => testNowClick()}
-        isDisabled={Boolean(testNowRun)}
+        isDisabled={!isTestNowCompleted}
         aria-label={TEST_NOW_ARIA_LABEL}
       />
     </EuiToolTip>
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/columns/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/filter_status_button.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/filter_status_button.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/filter_status_button.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/filter_status_button.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/index.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list.test.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list.test.tsx
index 2da3a758c081e..b82cf6f552bf9 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list.test.tsx
@@ -17,7 +17,7 @@ import {
 } from '../../../../common/runtime_types';
 import { MonitorListComponent } from './monitor_list';
 import moment from 'moment';
-import { IHttpFetchError, ResponseErrorBody } from '../../../../../../../src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { mockMoment } from '../../../lib/helper/test_helpers';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { NO_DATA_MESSAGE } from './translations';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list.tsx
index ba9967490be78..f18f912e5231f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list.tsx
@@ -17,6 +17,7 @@ import {
   EuiSpacer,
   getBreakpoint,
 } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { X509Expiry } from '../../../../common/runtime_types';
 import { MonitorSummary } from '../../../../common/runtime_types';
 import { MonitorListStatusColumn } from './columns/monitor_status_column';
@@ -36,7 +37,6 @@ import { STATUS_ALERT_COLUMN, TEST_NOW_COLUMN } from './translations';
 import { MonitorNameColumn } from './columns/monitor_name_col';
 import { MonitorTags } from '../../common/monitor_tags';
 import { useMonitorHistogram } from './use_monitor_histogram';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { TestNowColumn } from './columns/test_now_col';
 import { NoItemsMessage } from './no_items_message';
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_container.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_container.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_group.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_group.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_group.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_group.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_link.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_link.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_link.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/integration_link.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/monitor_list_drawer.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/monitor_list_drawer.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/monitor_list_drawer.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/monitor_list_drawer.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
index 3677d6b770631..0a46c2f562d11 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { AppState } from '../../../../../state';
 import { isIntegrationsPopupOpen } from '../../../../../state/selectors';
 import { PopoverState, toggleIntegrationsPopover } from '../../../../../state/actions';
-import { ActionsPopoverComponent } from '../index';
+import { ActionsPopoverComponent } from '..';
 
 const mapStateToProps = (state: AppState) => ({
   popoverState: isIntegrationsPopupOpen(state),
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/data.json b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/data.json
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/data.json
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/data.json
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
index 9a00b1f2b7289..1875f4d335b0f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
@@ -17,8 +17,8 @@ import {
 import { EuiListGroupItemProps } from '@elastic/eui/src/components/list_group/list_group_item';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { UptimeSettingsContext } from '../../../../contexts';
-import { Rule } from '../../../../../../triggers_actions_ui/public';
 import { getUrlForAlert } from '../../../../lib/alert_types/common';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/index.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/integration_group.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/integration_group.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/integration_group.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/integration_group.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/integration_link.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/integration_link.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/integration_link.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/integration_link.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
index 0596c76662a58..092614b870bda 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { Rule } from '../../../../../../triggers_actions_ui/public';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { MostRecentError } from './most_recent_error';
 import { MonitorStatusList } from './monitor_status_list';
 import { MonitorDetails, MonitorSummary } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_url.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_url.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_url.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/monitor_url.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_run.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/most_recent_run.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_run.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_drawer/most_recent_run.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_header.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_header.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_header.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_header.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_page_size_select.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_page_size_select.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_page_size_select.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/monitor_list_page_size_select.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/no_items_meesage.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/no_items_meesage.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/no_items_meesage.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/no_items_meesage.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/no_items_message.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/no_items_message.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/no_items_message.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/no_items_message.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/overview_page_link.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/overview_page_link.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.test.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/parse_timestamp.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.test.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/parse_timestamp.test.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/parse_timestamp.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/parse_timestamp.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.test.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/status_filter.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/status_filter.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/status_filter.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/status_filter.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/troubleshoot_popover.tsx b/x-pack/plugins/synthetics/public/components/overview/monitor_list/troubleshoot_popover.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/troubleshoot_popover.tsx
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/troubleshoot_popover.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/types.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/types.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/types.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts b/x-pack/plugins/synthetics/public/components/overview/monitor_list/use_monitor_histogram.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts
rename to x-pack/plugins/synthetics/public/components/overview/monitor_list/use_monitor_histogram.ts
index 82299825b4154..8a6fb5a174856 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts
+++ b/x-pack/plugins/synthetics/public/components/overview/monitor_list/use_monitor_histogram.ts
@@ -8,6 +8,7 @@
 import { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { useEsSearch } from '@kbn/observability-plugin/public';
 import {
   Histogram,
   HistogramPoint,
@@ -15,7 +16,6 @@ import {
 } from '../../../../common/runtime_types/monitor';
 import { useGetUrlParams } from '../../../hooks';
 import { UptimeRefreshContext } from '../../../contexts';
-import { useEsSearch } from '../../../../../observability/public';
 import { esKuerySelector } from '../../../state/selectors';
 import { getHistogramInterval } from '../../../../common/lib/get_histogram_interval';
 import { Ping } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx b/x-pack/plugins/synthetics/public/components/overview/query_bar/query_bar.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
rename to x-pack/plugins/synthetics/public/components/overview/query_bar/query_bar.tsx
index c894ba345a36f..d6d864ed312af 100644
--- a/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
+++ b/x-pack/plugins/synthetics/public/components/overview/query_bar/query_bar.tsx
@@ -8,7 +8,7 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexItem } from '@elastic/eui';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public/';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { SyntaxType, useQueryBar } from './use_query_bar';
 import { KQL_PLACE_HOLDER, SIMPLE_SEARCH_PLACEHOLDER } from './translations';
 import { useGetUrlParams, useIndexPattern } from '../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/translations.ts b/x-pack/plugins/synthetics/public/components/overview/query_bar/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/query_bar/translations.ts
rename to x-pack/plugins/synthetics/public/components/overview/query_bar/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.test.tsx b/x-pack/plugins/synthetics/public/components/overview/query_bar/use_query_bar.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/query_bar/use_query_bar.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts b/x-pack/plugins/synthetics/public/components/overview/query_bar/use_query_bar.ts
similarity index 96%
rename from x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts
rename to x-pack/plugins/synthetics/public/components/overview/query_bar/use_query_bar.ts
index 296a8fa509d00..78dabd2cad7f7 100644
--- a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts
+++ b/x-pack/plugins/synthetics/public/components/overview/query_bar/use_query_bar.ts
@@ -8,7 +8,8 @@
 import React, { useCallback, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 import { useDispatch } from 'react-redux';
-import { Query } from 'src/plugins/data/common';
+import { Query } from '@kbn/data-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   useGetUrlParams,
   useIndexPattern,
@@ -16,7 +17,6 @@ import {
   useUrlParams,
 } from '../../../hooks';
 import { setEsKueryString } from '../../../state/actions';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { UptimePluginServices } from '../../../apps/plugin';
 
 export enum SyntaxType {
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/__snapshots__/snapshot.test.tsx.snap b/x-pack/plugins/synthetics/public/components/overview/snapshot/__snapshots__/snapshot.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/snapshot/__snapshots__/snapshot.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/overview/snapshot/__snapshots__/snapshot.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/index.ts b/x-pack/plugins/synthetics/public/components/overview/snapshot/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/snapshot/index.ts
rename to x-pack/plugins/synthetics/public/components/overview/snapshot/index.ts
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/snapshot.test.tsx b/x-pack/plugins/synthetics/public/components/overview/snapshot/snapshot.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/snapshot/snapshot.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/snapshot/snapshot.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/snapshot.tsx b/x-pack/plugins/synthetics/public/components/overview/snapshot/snapshot.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/snapshot/snapshot.tsx
rename to x-pack/plugins/synthetics/public/components/overview/snapshot/snapshot.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/snapshot_heading.tsx b/x-pack/plugins/synthetics/public/components/overview/snapshot/snapshot_heading.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/snapshot/snapshot_heading.tsx
rename to x-pack/plugins/synthetics/public/components/overview/snapshot/snapshot_heading.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts b/x-pack/plugins/synthetics/public/components/overview/snapshot/use_snap_shot.ts
similarity index 94%
rename from x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts
rename to x-pack/plugins/synthetics/public/components/overview/snapshot/use_snap_shot.ts
index 2d1a9691d60d2..72df487752fa1 100644
--- a/x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts
+++ b/x-pack/plugins/synthetics/public/components/overview/snapshot/use_snap_shot.ts
@@ -7,10 +7,10 @@
 
 import { useContext } from 'react';
 import { useSelector } from 'react-redux';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { useGetUrlParams } from '../../../hooks';
 import { esKuerySelector } from '../../../state/selectors';
 import { UptimeRefreshContext } from '../../../contexts';
-import { useFetcher } from '../../../../../observability/public';
 import { fetchSnapshotCount } from '../../../state/api';
 
 export const useSnapShotCount = () => {
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot_heading.test.tsx b/x-pack/plugins/synthetics/public/components/overview/snapshot_heading.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/snapshot_heading.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/snapshot_heading.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/status_panel.tsx b/x-pack/plugins/synthetics/public/components/overview/status_panel.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/status_panel.tsx
rename to x-pack/plugins/synthetics/public/components/overview/status_panel.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/synthetics_callout.test.tsx b/x-pack/plugins/synthetics/public/components/overview/synthetics_callout.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/synthetics_callout.test.tsx
rename to x-pack/plugins/synthetics/public/components/overview/synthetics_callout.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/overview/synthetics_callout.tsx b/x-pack/plugins/synthetics/public/components/overview/synthetics_callout.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/overview/synthetics_callout.tsx
rename to x-pack/plugins/synthetics/public/components/overview/synthetics_callout.tsx
diff --git a/x-pack/plugins/uptime/public/components/settings/__snapshots__/certificate_form.test.tsx.snap b/x-pack/plugins/synthetics/public/components/settings/__snapshots__/certificate_form.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/__snapshots__/certificate_form.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/settings/__snapshots__/certificate_form.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/settings/__snapshots__/indices_form.test.tsx.snap b/x-pack/plugins/synthetics/public/components/settings/__snapshots__/indices_form.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/__snapshots__/indices_form.test.tsx.snap
rename to x-pack/plugins/synthetics/public/components/settings/__snapshots__/indices_form.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx b/x-pack/plugins/synthetics/public/components/settings/add_connector_flyout.tsx
similarity index 90%
rename from x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
rename to x-pack/plugins/synthetics/public/components/settings/add_connector_flyout.tsx
index d69bcfee7efae..d8b6fa02796e9 100644
--- a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
+++ b/x-pack/plugins/synthetics/public/components/settings/add_connector_flyout.tsx
@@ -9,10 +9,10 @@ import React, { useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useDispatch } from 'react-redux';
 import { EuiButtonEmpty } from '@elastic/eui';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { getConnectorsAction } from '../../state/alerts/alerts';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { useFetcher } from '../../../../observability/public';
 import { fetchActionTypes } from '../../state/api/alerts';
 
 import { ActionTypeId } from './types';
diff --git a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx b/x-pack/plugins/synthetics/public/components/settings/alert_defaults_form.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
rename to x-pack/plugins/synthetics/public/components/settings/alert_defaults_form.tsx
index 5545f555bd81a..9f8ae139a62be 100644
--- a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
+++ b/x-pack/plugins/synthetics/public/components/settings/alert_defaults_form.tsx
@@ -18,14 +18,14 @@ import {
 } from '@elastic/eui';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { SettingsFormProps } from '../../pages/settings';
 import { connectorsSelector } from '../../state/alerts/alerts';
 import { AddConnectorFlyout, ALLOWED_ACTION_TYPES } from './add_connector_flyout';
 import { useGetUrlParams, useUrlParams } from '../../hooks';
 import { alertFormI18n } from './translations';
 import { useInitApp } from '../../hooks/use_init_app';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public/';
 import { ActionTypeId } from './types';
 import { DefaultEmail } from './default_email';
 
diff --git a/x-pack/plugins/uptime/public/components/settings/certificate_form.test.tsx b/x-pack/plugins/synthetics/public/components/settings/certificate_form.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/certificate_form.test.tsx
rename to x-pack/plugins/synthetics/public/components/settings/certificate_form.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/settings/certificate_form.tsx b/x-pack/plugins/synthetics/public/components/settings/certificate_form.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/certificate_form.tsx
rename to x-pack/plugins/synthetics/public/components/settings/certificate_form.tsx
diff --git a/x-pack/plugins/uptime/public/components/settings/default_email.tsx b/x-pack/plugins/synthetics/public/components/settings/default_email.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/settings/default_email.tsx
rename to x-pack/plugins/synthetics/public/components/settings/default_email.tsx
index b965d986f5413..6a79ddf39bfd4 100644
--- a/x-pack/plugins/uptime/public/components/settings/default_email.tsx
+++ b/x-pack/plugins/synthetics/public/components/settings/default_email.tsx
@@ -9,10 +9,10 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useSelector } from 'react-redux';
 import { EuiDescribedFormGroup } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { OnFieldChangeType } from './certificate_form';
 import { connectorsSelector } from '../../state/alerts/alerts';
 import { DefaultEmail as DefaultEmailType } from '../../../common/runtime_types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { UptimePluginServices } from '../../apps/plugin';
 import { SettingsPageFieldErrors } from '../../pages/settings';
 
diff --git a/x-pack/plugins/uptime/public/components/settings/indices_form.test.tsx b/x-pack/plugins/synthetics/public/components/settings/indices_form.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/indices_form.test.tsx
rename to x-pack/plugins/synthetics/public/components/settings/indices_form.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/settings/indices_form.tsx b/x-pack/plugins/synthetics/public/components/settings/indices_form.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/indices_form.tsx
rename to x-pack/plugins/synthetics/public/components/settings/indices_form.tsx
diff --git a/x-pack/plugins/uptime/public/components/settings/settings_actions.tsx b/x-pack/plugins/synthetics/public/components/settings/settings_actions.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/settings/settings_actions.tsx
rename to x-pack/plugins/synthetics/public/components/settings/settings_actions.tsx
index ae57233388427..c7aec1dd90d70 100644
--- a/x-pack/plugins/uptime/public/components/settings/settings_actions.tsx
+++ b/x-pack/plugins/synthetics/public/components/settings/settings_actions.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SettingsPageFieldErrors } from '../../pages/settings';
 
 export interface SettingsActionsProps {
diff --git a/x-pack/plugins/uptime/public/components/settings/settings_bottom_bar.tsx b/x-pack/plugins/synthetics/public/components/settings/settings_bottom_bar.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/settings_bottom_bar.tsx
rename to x-pack/plugins/synthetics/public/components/settings/settings_bottom_bar.tsx
diff --git a/x-pack/plugins/uptime/public/components/settings/translations.ts b/x-pack/plugins/synthetics/public/components/settings/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/translations.ts
rename to x-pack/plugins/synthetics/public/components/settings/translations.ts
diff --git a/x-pack/plugins/uptime/public/components/settings/types.ts b/x-pack/plugins/synthetics/public/components/settings/types.ts
similarity index 93%
rename from x-pack/plugins/uptime/public/components/settings/types.ts
rename to x-pack/plugins/synthetics/public/components/settings/types.ts
index 41c4ae41e38c0..4c2bcad2206e4 100644
--- a/x-pack/plugins/uptime/public/components/settings/types.ts
+++ b/x-pack/plugins/synthetics/public/components/settings/types.ts
@@ -16,7 +16,7 @@ import {
   WebhookActionTypeId,
   EmailActionTypeId,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../actions/server/builtin_action_types';
+} from '@kbn/actions-plugin/server/builtin_action_types';
 
 export type ActionTypeId =
   | typeof SlackActionTypeId
diff --git a/x-pack/plugins/uptime/public/components/settings/use_settings_errors.ts b/x-pack/plugins/synthetics/public/components/settings/use_settings_errors.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/settings/use_settings_errors.ts
rename to x-pack/plugins/synthetics/public/components/settings/use_settings_errors.ts
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/stderr_logs.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/stderr_logs.tsx
index c9fda97b6df04..44d8f23e1f068 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/stderr_logs.tsx
@@ -23,10 +23,10 @@ import { i18n } from '@kbn/i18n';
 import { EuiInMemoryTable } from '@elastic/eui';
 import moment from 'moment';
 import { useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { useStdErrorLogs } from './use_std_error_logs';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
-import { useFetcher } from '../../../../../observability/public';
 import { selectDynamicSettings } from '../../../state/selectors';
 import { Ping } from '../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_duration.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_duration.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/step_duration.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_duration.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
index f0bd56ae24bb7..7c729108cc0a1 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ReactRouterEuiLink } from '../../../common/react_router_helpers';
 import { Ping } from '../../../../../common/runtime_types/ping/ping';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 
 const LabelLink = euiStyled.div`
   margin-bottom: ${(props) => props.theme.eui.paddingSizes.xs};
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
index b3475828a5e51..4c734918d7502 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
@@ -9,11 +9,11 @@ import moment from 'moment';
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { StepScreenshotDisplay } from '../../step_screenshot_display';
 import { JourneyStep } from '../../../../../common/runtime_types/ping/synthetics';
 import { Ping } from '../../../../../common/runtime_types/ping/ping';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
-import { useFetcher } from '../../../../../../observability/public';
 import { fetchLastSuccessfulCheck } from '../../../../state/api/journey';
 import { ScreenshotLink } from './screenshot_link';
 import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column';
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_field_trend.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_field_trend.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_field_trend.tsx
similarity index 92%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_field_trend.tsx
index 01e0d8709905c..46df119d21014 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_field_trend.tsx
@@ -10,11 +10,11 @@ import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { useSelector } from 'react-redux';
-import { useUptimeStartPlugins } from '../../../contexts/uptime_startup_plugins_context';
+import { AllSeries, createExploratoryViewUrl } from '@kbn/observability-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { JourneyStep } from '../../../../common/runtime_types';
-import { AllSeries, createExploratoryViewUrl } from '../../../../../observability/public';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useUptimeStartPlugins } from '../../../contexts/uptime_startup_plugins_context';
 import { selectDynamicSettings } from '../../../state/selectors';
 
 export const getLast48Intervals = (activeStep: JourneyStep) => {
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_image.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_image.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/step_image.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/step_image.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/steps_list.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/steps_list.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/steps_list.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/steps_list.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/steps_list.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_check_steps.ts b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_check_steps.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/use_check_steps.ts
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_check_steps.ts
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_expanded_row.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_expanded_row.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.tsx b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_expanded_row.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_expanded_row.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_std_error_logs.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts
rename to x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_std_error_logs.ts
index fa563b2ef2728..11dfdcdcc434e 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts
+++ b/x-pack/plugins/synthetics/public/components/synthetics/check_steps/use_std_error_logs.ts
@@ -6,7 +6,7 @@
  */
 
 import { useSelector } from 'react-redux';
-import { createEsParams, useEsSearch } from '../../../../../observability/public';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 import { selectDynamicSettings } from '../../../state/selectors';
 import { Ping } from '../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/uptime/public/components/synthetics/code_block_accordion.tsx b/x-pack/plugins/synthetics/public/components/synthetics/code_block_accordion.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/code_block_accordion.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/code_block_accordion.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/console_event.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/console_event.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/console_event.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/console_event.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/console_event.tsx b/x-pack/plugins/synthetics/public/components/synthetics/console_event.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/console_event.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/console_event.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/console_output_event_list.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/console_output_event_list.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.tsx b/x-pack/plugins/synthetics/public/components/synthetics/console_output_event_list.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/console_output_event_list.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/console_output_event_list.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/empty_journey.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/empty_journey.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/empty_journey.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/empty_journey.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/empty_journey.tsx b/x-pack/plugins/synthetics/public/components/synthetics/empty_journey.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/empty_journey.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/empty_journey.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/executed_step.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/executed_step.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/executed_step.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/executed_step.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx b/x-pack/plugins/synthetics/public/components/synthetics/executed_step.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/executed_step.tsx
index 80786730505a9..3fc4e124bd2c4 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/executed_step.tsx
@@ -8,9 +8,9 @@
 import { EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui';
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CodeBlockAccordion } from './code_block_accordion';
 import { JourneyStep } from '../../../common/runtime_types/ping';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
 import { StepScreenshots } from './check_steps/step_expanded_row/step_screenshots';
 
 const CODE_BLOCK_OVERFLOW_HEIGHT = 360;
diff --git a/x-pack/plugins/uptime/public/components/synthetics/status_badge.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/status_badge.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/status_badge.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/status_badge.test.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/status_badge.tsx b/x-pack/plugins/synthetics/public/components/synthetics/status_badge.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/status_badge.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/status_badge.tsx
diff --git a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx b/x-pack/plugins/synthetics/public/components/synthetics/step_screenshot_display.test.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/step_screenshot_display.test.tsx
index ad8666f77ce6b..83e1a4e938650 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/step_screenshot_display.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { StepScreenshotDisplay } from './step_screenshot_display';
 import { render } from '../../lib/helper/rtl_helpers';
-import * as observabilityPublic from '../../../../observability/public';
+import * as observabilityPublic from '@kbn/observability-plugin/public';
 import '../../lib/__mocks__/use_composite_image.mock';
 import { mockRef } from '../../lib/__mocks__/screenshot_ref.mock';
 
-jest.mock('../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public');
 
 jest.mock('react-use/lib/useIntersection', () => () => ({
   isIntersecting: true,
diff --git a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx b/x-pack/plugins/synthetics/public/components/synthetics/step_screenshot_display.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx
rename to x-pack/plugins/synthetics/public/components/synthetics/step_screenshot_display.tsx
index 7dfc86575205b..e4e010016ea1f 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx
+++ b/x-pack/plugins/synthetics/public/components/synthetics/step_screenshot_display.tsx
@@ -18,12 +18,12 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useContext, useEffect, useMemo, useRef, useState, FC } from 'react';
 import useIntersection from 'react-use/lib/useIntersection';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import {
   isScreenshotRef as isAScreenshotRef,
   ScreenshotRefImageData,
 } from '../../../common/runtime_types';
 import { UptimeRefreshContext, UptimeSettingsContext, UptimeThemeContext } from '../../contexts';
-import { useFetcher } from '../../../../observability/public';
 import { getJourneyScreenshot } from '../../state/api/journey';
 import { useCompositeImage } from '../../hooks';
 
diff --git a/x-pack/plugins/uptime/public/components/synthetics/translations.ts b/x-pack/plugins/synthetics/public/components/synthetics/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/synthetics/translations.ts
rename to x-pack/plugins/synthetics/public/components/synthetics/translations.ts
diff --git a/x-pack/plugins/uptime/public/contexts/index.ts b/x-pack/plugins/synthetics/public/contexts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/contexts/index.ts
rename to x-pack/plugins/synthetics/public/contexts/index.ts
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx b/x-pack/plugins/synthetics/public/contexts/uptime_index_pattern_context.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx
rename to x-pack/plugins/synthetics/public/contexts/uptime_index_pattern_context.tsx
index 6c658ec7f5d40..765d9f8527c88 100644
--- a/x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx
+++ b/x-pack/plugins/synthetics/public/contexts/uptime_index_pattern_context.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { useFetcher } from '../../../observability/public';
-import { DataPublicPluginStart, IndexPattern } from '../../../../../src/plugins/data/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
+import { DataPublicPluginStart, IndexPattern } from '@kbn/data-plugin/public';
 import { useHasData } from '../components/overview/empty_state/use_has_data';
 
 export const UptimeIndexPatternContext = createContext({} as IndexPattern);
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_refresh_context.tsx b/x-pack/plugins/synthetics/public/contexts/uptime_refresh_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/contexts/uptime_refresh_context.tsx
rename to x-pack/plugins/synthetics/public/contexts/uptime_refresh_context.tsx
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx b/x-pack/plugins/synthetics/public/contexts/uptime_settings_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
rename to x-pack/plugins/synthetics/public/contexts/uptime_settings_context.tsx
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_startup_plugins_context.tsx b/x-pack/plugins/synthetics/public/contexts/uptime_startup_plugins_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/contexts/uptime_startup_plugins_context.tsx
rename to x-pack/plugins/synthetics/public/contexts/uptime_startup_plugins_context.tsx
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_theme_context.tsx b/x-pack/plugins/synthetics/public/contexts/uptime_theme_context.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/contexts/uptime_theme_context.tsx
rename to x-pack/plugins/synthetics/public/contexts/uptime_theme_context.tsx
diff --git a/x-pack/plugins/uptime/public/hooks/__snapshots__/use_url_params.test.tsx.snap b/x-pack/plugins/synthetics/public/hooks/__snapshots__/use_url_params.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/__snapshots__/use_url_params.test.tsx.snap
rename to x-pack/plugins/synthetics/public/hooks/__snapshots__/use_url_params.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/hooks/index.ts b/x-pack/plugins/synthetics/public/hooks/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/index.ts
rename to x-pack/plugins/synthetics/public/hooks/index.ts
diff --git a/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts b/x-pack/plugins/synthetics/public/hooks/update_kuery_string.ts
similarity index 96%
rename from x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
rename to x-pack/plugins/synthetics/public/hooks/update_kuery_string.ts
index 4069220a23d99..8d31ef0abbd91 100644
--- a/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
+++ b/x-pack/plugins/synthetics/public/hooks/update_kuery_string.ts
@@ -6,7 +6,7 @@
  */
 
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
-import type { IndexPattern } from '../../../../../src/plugins/data/public';
+import type { IndexPattern } from '@kbn/data-plugin/public';
 import { combineFiltersAndUserSearch, stringifyKueries } from '../../common/lib';
 
 const getKueryString = (urlFilters: string, excludedFilters?: string): string => {
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/synthetics/public/hooks/use_breadcrumbs.test.tsx
similarity index 93%
rename from x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
rename to x-pack/plugins/synthetics/public/hooks/use_breadcrumbs.test.tsx
index 9d7318a45f76e..e5b1a28ba72c6 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/synthetics/public/hooks/use_breadcrumbs.test.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { mountWithRouter } from '../lib';
 import { OVERVIEW_ROUTE } from '../../common/constants';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { UptimeUrlParams, getSupportedUrlParams, MountWithReduxProvider } from '../lib/helper';
 import { makeBaseBreadcrumb, useBreadcrumbs } from './use_breadcrumbs';
 
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/synthetics/public/hooks/use_breadcrumbs.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
rename to x-pack/plugins/synthetics/public/hooks/use_breadcrumbs.ts
index 5ea81e579ff92..83d269f4e35fa 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/synthetics/public/hooks/use_breadcrumbs.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { MouseEvent, useEffect } from 'react';
 import { EuiBreadcrumb } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { UptimeUrlParams } from '../lib/helper';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { useUrlParams } from '.';
 import { PLUGIN } from '../../common/constants/plugin';
 
diff --git a/x-pack/plugins/uptime/public/hooks/use_breakpoints.test.ts b/x-pack/plugins/synthetics/public/hooks/use_breakpoints.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_breakpoints.test.ts
rename to x-pack/plugins/synthetics/public/hooks/use_breakpoints.test.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_breakpoints.ts b/x-pack/plugins/synthetics/public/hooks/use_breakpoints.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_breakpoints.ts
rename to x-pack/plugins/synthetics/public/hooks/use_breakpoints.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_cert_status.ts b/x-pack/plugins/synthetics/public/hooks/use_cert_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_cert_status.ts
rename to x-pack/plugins/synthetics/public/hooks/use_cert_status.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_chart_theme.ts b/x-pack/plugins/synthetics/public/hooks/use_chart_theme.ts
similarity index 88%
rename from x-pack/plugins/uptime/public/hooks/use_chart_theme.ts
rename to x-pack/plugins/synthetics/public/hooks/use_chart_theme.ts
index f9231abaa75a8..f9faca7927d9d 100644
--- a/x-pack/plugins/uptime/public/hooks/use_chart_theme.ts
+++ b/x-pack/plugins/synthetics/public/hooks/use_chart_theme.ts
@@ -7,7 +7,7 @@
 
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 import { useMemo } from 'react';
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 
 export const useChartTheme = () => {
   const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
diff --git a/x-pack/plugins/uptime/public/hooks/use_composite_image.test.tsx b/x-pack/plugins/synthetics/public/hooks/use_composite_image.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_composite_image.test.tsx
rename to x-pack/plugins/synthetics/public/hooks/use_composite_image.test.tsx
diff --git a/x-pack/plugins/uptime/public/hooks/use_composite_image.ts b/x-pack/plugins/synthetics/public/hooks/use_composite_image.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_composite_image.ts
rename to x-pack/plugins/synthetics/public/hooks/use_composite_image.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_filter_update.test.ts b/x-pack/plugins/synthetics/public/hooks/use_filter_update.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_filter_update.test.ts
rename to x-pack/plugins/synthetics/public/hooks/use_filter_update.test.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_filter_update.ts b/x-pack/plugins/synthetics/public/hooks/use_filter_update.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_filter_update.ts
rename to x-pack/plugins/synthetics/public/hooks/use_filter_update.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_init_app.ts b/x-pack/plugins/synthetics/public/hooks/use_init_app.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_init_app.ts
rename to x-pack/plugins/synthetics/public/hooks/use_init_app.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_mapping_check.test.ts b/x-pack/plugins/synthetics/public/hooks/use_mapping_check.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_mapping_check.test.ts
rename to x-pack/plugins/synthetics/public/hooks/use_mapping_check.test.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_mapping_check.ts b/x-pack/plugins/synthetics/public/hooks/use_mapping_check.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_mapping_check.ts
rename to x-pack/plugins/synthetics/public/hooks/use_mapping_check.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_monitor.ts b/x-pack/plugins/synthetics/public/hooks/use_monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_monitor.ts
rename to x-pack/plugins/synthetics/public/hooks/use_monitor.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_overview_filter_check.test.tsx b/x-pack/plugins/synthetics/public/hooks/use_overview_filter_check.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_overview_filter_check.test.tsx
rename to x-pack/plugins/synthetics/public/hooks/use_overview_filter_check.test.tsx
diff --git a/x-pack/plugins/uptime/public/hooks/use_overview_filter_check.ts b/x-pack/plugins/synthetics/public/hooks/use_overview_filter_check.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_overview_filter_check.ts
rename to x-pack/plugins/synthetics/public/hooks/use_overview_filter_check.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_search_text.ts b/x-pack/plugins/synthetics/public/hooks/use_search_text.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_search_text.ts
rename to x-pack/plugins/synthetics/public/hooks/use_search_text.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_selected_filters.test.tsx b/x-pack/plugins/synthetics/public/hooks/use_selected_filters.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_selected_filters.test.tsx
rename to x-pack/plugins/synthetics/public/hooks/use_selected_filters.test.tsx
diff --git a/x-pack/plugins/uptime/public/hooks/use_selected_filters.ts b/x-pack/plugins/synthetics/public/hooks/use_selected_filters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_selected_filters.ts
rename to x-pack/plugins/synthetics/public/hooks/use_selected_filters.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/plugins/synthetics/public/hooks/use_telemetry.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_telemetry.ts
rename to x-pack/plugins/synthetics/public/hooks/use_telemetry.ts
diff --git a/x-pack/plugins/uptime/public/hooks/use_url_params.test.tsx b/x-pack/plugins/synthetics/public/hooks/use_url_params.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_url_params.test.tsx
rename to x-pack/plugins/synthetics/public/hooks/use_url_params.test.tsx
diff --git a/x-pack/plugins/uptime/public/hooks/use_url_params.ts b/x-pack/plugins/synthetics/public/hooks/use_url_params.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/hooks/use_url_params.ts
rename to x-pack/plugins/synthetics/public/hooks/use_url_params.ts
diff --git a/x-pack/plugins/uptime/public/icons/heartbeat_white.svg b/x-pack/plugins/synthetics/public/icons/heartbeat_white.svg
similarity index 100%
rename from x-pack/plugins/uptime/public/icons/heartbeat_white.svg
rename to x-pack/plugins/synthetics/public/icons/heartbeat_white.svg
diff --git a/x-pack/plugins/uptime/public/index.ts b/x-pack/plugins/synthetics/public/index.ts
similarity index 87%
rename from x-pack/plugins/uptime/public/index.ts
rename to x-pack/plugins/synthetics/public/index.ts
index f63ac34820763..86170e9bc863a 100644
--- a/x-pack/plugins/uptime/public/index.ts
+++ b/x-pack/plugins/synthetics/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UptimePlugin } from './apps/plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/screenshot_ref.mock.ts b/x-pack/plugins/synthetics/public/lib/__mocks__/screenshot_ref.mock.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/__mocks__/screenshot_ref.mock.ts
rename to x-pack/plugins/synthetics/public/lib/__mocks__/screenshot_ref.mock.ts
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/uptime_plugin_start_mock.ts b/x-pack/plugins/synthetics/public/lib/__mocks__/uptime_plugin_start_mock.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/__mocks__/uptime_plugin_start_mock.ts
rename to x-pack/plugins/synthetics/public/lib/__mocks__/uptime_plugin_start_mock.ts
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts b/x-pack/plugins/synthetics/public/lib/__mocks__/uptime_store.mock.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
rename to x-pack/plugins/synthetics/public/lib/__mocks__/uptime_store.mock.ts
index 0286e884a68d7..01a11fd809fe8 100644
--- a/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
+++ b/x-pack/plugins/synthetics/public/lib/__mocks__/uptime_store.mock.ts
@@ -126,7 +126,5 @@ export const mockState: AppState = {
     cacheSize: 0,
     hitCount: [],
   },
-  testNowRuns: {
-    testNowRuns: [],
-  },
+  testNowRuns: {},
 };
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/use_composite_image.mock.ts b/x-pack/plugins/synthetics/public/lib/__mocks__/use_composite_image.mock.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/__mocks__/use_composite_image.mock.ts
rename to x-pack/plugins/synthetics/public/lib/__mocks__/use_composite_image.mock.ts
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/ut_router_history.mock.ts b/x-pack/plugins/synthetics/public/lib/__mocks__/ut_router_history.mock.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/__mocks__/ut_router_history.mock.ts
rename to x-pack/plugins/synthetics/public/lib/__mocks__/ut_router_history.mock.ts
diff --git a/x-pack/plugins/uptime/public/lib/adapters/framework/capabilities_adapter.ts b/x-pack/plugins/synthetics/public/lib/adapters/framework/capabilities_adapter.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/adapters/framework/capabilities_adapter.ts
rename to x-pack/plugins/synthetics/public/lib/adapters/framework/capabilities_adapter.ts
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/alert_messages.tsx
similarity index 89%
rename from x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/alert_messages.tsx
index e35234aab54b0..fdfb07d7ff730 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/alert_messages.tsx
@@ -9,13 +9,13 @@ import type { Observable } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
-import { RedirectAppLinks, toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { RedirectAppLinks, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import type { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { ActionConnector } from '../../state/alerts/alerts';
 import { kibanaService } from '../../state/kibana_service';
 import { getUrlForAlert } from './common';
-import type { Rule } from '../../../../triggers_actions_ui/public';
 
 export const simpleAlertEnabled = (
   defaultActions: ActionConnector[],
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/common.ts b/x-pack/plugins/synthetics/public/lib/alert_types/common.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/alert_types/common.ts
rename to x-pack/plugins/synthetics/public/lib/alert_types/common.ts
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/duration_anomaly.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/duration_anomaly.tsx
index d6498015e41ce..79b2b28652497 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/duration_anomaly.tsx
@@ -10,11 +10,11 @@ import moment from 'moment';
 
 import { ALERT_END, ALERT_STATUS, ALERT_STATUS_ACTIVE, ALERT_REASON } from '@kbn/rule-data-utils';
 
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import { AlertTypeInitializer } from '.';
 import { getMonitorRouteFromMonitorId } from '../../../common/utils/get_monitor_url';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { DurationAnomalyTranslations } from '../../../common/translations';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
 
 const { defaultActionMessage, description } = DurationAnomalyTranslations;
 const DurationAnomalyAlert = React.lazy(() => import('./lazy_wrapper/duration_anomaly'));
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/index.ts b/x-pack/plugins/synthetics/public/lib/alert_types/index.ts
similarity index 83%
rename from x-pack/plugins/uptime/public/lib/alert_types/index.ts
rename to x-pack/plugins/synthetics/public/lib/alert_types/index.ts
index f2e721f9c8f40..7217e0a083e6b 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/index.ts
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { initMonitorStatusAlertType } from './monitor_status';
 import { initTlsAlertType } from './tls';
 import { initTlsLegacyAlertType } from './tls_legacy';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
index 6ec7a416ca01e..bb1f84a45114d 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { store } from '../../../state';
 import { AnomalyAlertComponent } from '../../../components/overview/alerts/anomaly_alert/anomaly_alert';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { kibanaService } from '../../../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
similarity index 89%
rename from x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
index 066c15238833a..362263fa006ab 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { store } from '../../../state';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { kibanaService } from '../../../state/kibana_service';
 import { AlertMonitorStatus } from '../../../components/overview/alerts/alerts_containers/alert_monitor_status';
@@ -28,7 +28,7 @@ export default function MonitorStatusAlert({ core, plugins, params }: Props) {
     <ReduxProvider store={store}>
       <KibanaContextProvider services={{ ...core, ...plugins }}>
         <UptimeIndexPatternContextProvider data={plugins.data}>
-          <AlertMonitorStatus {...params} autocomplete={plugins.data.autocomplete} />
+          <AlertMonitorStatus {...params} autocomplete={plugins.unifiedSearch.autocomplete} />
         </UptimeIndexPatternContextProvider>
       </KibanaContextProvider>
     </ReduxProvider>
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
similarity index 88%
rename from x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
index fcab43741e66d..f4136a079c8b0 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { store } from '../../../state';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { AlertTls } from '../../../components/overview/alerts/alerts_containers/alert_tls';
 import { kibanaService } from '../../../state/kibana_service';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
rename to x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
index 45af394b65723..881afb0d8eb52 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
@@ -7,12 +7,12 @@
 
 import { PathReporter } from 'io-ts/lib/PathReporter';
 import { isRight } from 'fp-ts/lib/Either';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   AtomicStatusCheckParamsType,
   MonitorAvailabilityType,
   StatusCheckParamsType,
 } from '../../../../common/runtime_types/alerts';
-import { ValidationResult } from '../../../../../triggers_actions_ui/public';
 
 export function validateMonitorStatusParams(ruleParams: any): ValidationResult {
   const errors: Record<string, any> = {};
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.test.ts b/x-pack/plugins/synthetics/public/lib/alert_types/monitor_status.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/alert_types/monitor_status.test.ts
rename to x-pack/plugins/synthetics/public/lib/alert_types/monitor_status.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/monitor_status.tsx
similarity index 93%
rename from x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/monitor_status.tsx
index 5d6f8f3fea333..99d8e22f11cdb 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/monitor_status.tsx
@@ -16,12 +16,12 @@ import {
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
 
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import { AlertTypeInitializer } from '.';
 import { getMonitorRouteFromMonitorId } from '../../../common/utils/get_monitor_url';
 import { MonitorStatusTranslations } from '../../../common/translations';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
-import { ValidationResult } from '../../../../triggers_actions_ui/public';
 
 const { defaultActionMessage, description } = MonitorStatusTranslations;
 
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/tls.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/tls.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/lib/alert_types/tls.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/tls.tsx
index f65578ea40ccf..1ecfaefaa1797 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/tls.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/tls.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { TlsTranslations } from '../../../common/translations';
 import { AlertTypeInitializer } from '.';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx b/x-pack/plugins/synthetics/public/lib/alert_types/tls_legacy.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx
rename to x-pack/plugins/synthetics/public/lib/alert_types/tls_legacy.tsx
index a2b145ce716d6..cce2e3d011bfa 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx
+++ b/x-pack/plugins/synthetics/public/lib/alert_types/tls_legacy.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { TlsTranslationsLegacy } from '../../../common/translations';
 import { AlertTypeInitializer } from '.';
diff --git a/x-pack/plugins/uptime/public/lib/formatting.ts b/x-pack/plugins/synthetics/public/lib/formatting.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/formatting.ts
rename to x-pack/plugins/synthetics/public/lib/formatting.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts b/x-pack/plugins/synthetics/public/lib/helper/charts/get_chart_date_label.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
rename to x-pack/plugins/synthetics/public/lib/helper/charts/get_chart_date_label.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/charts/get_label_format.test.ts b/x-pack/plugins/synthetics/public/lib/helper/charts/get_label_format.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/charts/get_label_format.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/charts/get_label_format.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/charts/get_label_format.ts b/x-pack/plugins/synthetics/public/lib/helper/charts/get_label_format.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/charts/get_label_format.ts
rename to x-pack/plugins/synthetics/public/lib/helper/charts/get_label_format.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/charts/index.ts b/x-pack/plugins/synthetics/public/lib/helper/charts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/charts/index.ts
rename to x-pack/plugins/synthetics/public/lib/helper/charts/index.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/charts/is_within_current_date.test.ts b/x-pack/plugins/synthetics/public/lib/helper/charts/is_within_current_date.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/charts/is_within_current_date.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/charts/is_within_current_date.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/charts/is_within_current_date.ts b/x-pack/plugins/synthetics/public/lib/helper/charts/is_within_current_date.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/charts/is_within_current_date.ts
rename to x-pack/plugins/synthetics/public/lib/helper/charts/is_within_current_date.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/compose_screenshot_images.test.ts b/x-pack/plugins/synthetics/public/lib/helper/compose_screenshot_images.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/compose_screenshot_images.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/compose_screenshot_images.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/compose_screenshot_images.ts b/x-pack/plugins/synthetics/public/lib/helper/compose_screenshot_images.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/compose_screenshot_images.ts
rename to x-pack/plugins/synthetics/public/lib/helper/compose_screenshot_images.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/convert_measurements.test.ts b/x-pack/plugins/synthetics/public/lib/helper/convert_measurements.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/convert_measurements.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/convert_measurements.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/convert_measurements.ts b/x-pack/plugins/synthetics/public/lib/helper/convert_measurements.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/convert_measurements.ts
rename to x-pack/plugins/synthetics/public/lib/helper/convert_measurements.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/enzyme_helpers.tsx b/x-pack/plugins/synthetics/public/lib/helper/enzyme_helpers.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/enzyme_helpers.tsx
rename to x-pack/plugins/synthetics/public/lib/helper/enzyme_helpers.tsx
diff --git a/x-pack/plugins/uptime/public/lib/helper/get_title.ts b/x-pack/plugins/synthetics/public/lib/helper/get_title.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/get_title.ts
rename to x-pack/plugins/synthetics/public/lib/helper/get_title.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/helper_with_redux.tsx b/x-pack/plugins/synthetics/public/lib/helper/helper_with_redux.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/helper_with_redux.tsx
rename to x-pack/plugins/synthetics/public/lib/helper/helper_with_redux.tsx
diff --git a/x-pack/plugins/uptime/public/lib/helper/index.ts b/x-pack/plugins/synthetics/public/lib/helper/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/index.ts
rename to x-pack/plugins/synthetics/public/lib/helper/index.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/add_base_path.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/add_base_path.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/add_base_path.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/add_base_path.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/build_href.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/build_href.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/build_href.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.test.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_apm_href.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_apm_href.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_apm_href.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_apm_href.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.test.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_infra_href.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_infra_href.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_infra_href.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_infra_href.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.test.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_logging_href.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_logging_href.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_logging_href.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/get_logging_href.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/index.ts b/x-pack/plugins/synthetics/public/lib/helper/observability_integration/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/observability_integration/index.ts
rename to x-pack/plugins/synthetics/public/lib/helper/observability_integration/index.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/parse_search.test.ts b/x-pack/plugins/synthetics/public/lib/helper/parse_search.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/parse_search.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/parse_search.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/parse_search.ts b/x-pack/plugins/synthetics/public/lib/helper/parse_search.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/parse_search.ts
rename to x-pack/plugins/synthetics/public/lib/helper/parse_search.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx b/x-pack/plugins/synthetics/public/lib/helper/rtl_helpers.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
rename to x-pack/plugins/synthetics/public/lib/helper/rtl_helpers.tsx
index 31d9bdd7c77e5..913f5e249c688 100644
--- a/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
+++ b/x-pack/plugins/synthetics/public/lib/helper/rtl_helpers.tsx
@@ -16,25 +16,22 @@ import {
 import { Router, Route } from 'react-router-dom';
 import { merge } from 'lodash';
 import { createMemoryHistory, History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 import { EuiPageTemplate } from '@elastic/eui';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { configure } from '@testing-library/dom';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { KibanaContextProvider, KibanaServices } from '@kbn/kibana-react-plugin/public';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { mockState } from '../__mocks__/uptime_store.mock';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
-import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
-import {
-  KibanaContextProvider,
-  KibanaServices,
-} from '../../../../../../src/plugins/kibana_react/public';
 import { MountWithReduxProvider } from './helper_with_redux';
 import { AppState } from '../../state';
 import { stringifyUrlParams } from './stringify_url_params';
 import { ClientPluginsStart } from '../../apps/plugin';
-import { triggersActionsUiMock } from '../../../../triggers_actions_ui/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
 import { UptimeRefreshContextProvider, UptimeStartupPluginsContextProvider } from '../../contexts';
 import { kibanaService } from '../../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/lib/helper/series_has_down_values.test.ts b/x-pack/plugins/synthetics/public/lib/helper/series_has_down_values.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/series_has_down_values.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/series_has_down_values.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/series_has_down_values.ts b/x-pack/plugins/synthetics/public/lib/helper/series_has_down_values.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/series_has_down_values.ts
rename to x-pack/plugins/synthetics/public/lib/helper/series_has_down_values.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts b/x-pack/plugins/synthetics/public/lib/helper/spy_use_fetcher.ts
similarity index 77%
rename from x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts
rename to x-pack/plugins/synthetics/public/lib/helper/spy_use_fetcher.ts
index 50a124ad60dfc..47d52a73e6850 100644
--- a/x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts
+++ b/x-pack/plugins/synthetics/public/lib/helper/spy_use_fetcher.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import * as observabilityPublic from '../../../../observability/public';
+import * as observabilityPublic from '@kbn/observability-plugin/public';
 
-jest.mock('../../../../observability/public', () => {
-  const originalModule = jest.requireActual('../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public', () => {
+  const originalModule = jest.requireActual('@kbn/observability-plugin/public');
 
   return {
     ...originalModule,
diff --git a/x-pack/plugins/uptime/public/lib/helper/stringify_url_params.test.ts b/x-pack/plugins/synthetics/public/lib/helper/stringify_url_params.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/stringify_url_params.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/stringify_url_params.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/stringify_url_params.ts b/x-pack/plugins/synthetics/public/lib/helper/stringify_url_params.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/stringify_url_params.ts
rename to x-pack/plugins/synthetics/public/lib/helper/stringify_url_params.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts b/x-pack/plugins/synthetics/public/lib/helper/test_helpers.ts
similarity index 96%
rename from x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
rename to x-pack/plugins/synthetics/public/lib/helper/test_helpers.ts
index 6a1fe15c9a6de..0b32c4a2420e8 100644
--- a/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
+++ b/x-pack/plugins/synthetics/public/lib/helper/test_helpers.ts
@@ -43,7 +43,7 @@ export function mockDate() {
 }
 
 export function mockDataPlugin() {
-  jest.mock('../../../../../../src/plugins/data/public', () => {
+  jest.mock('@kbn/data-plugin/public', () => {
     return function () {
       return {
         esKuery: {
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/__snapshots__/get_supported_url_params.test.ts.snap b/x-pack/plugins/synthetics/public/lib/helper/url_params/__snapshots__/get_supported_url_params.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/__snapshots__/get_supported_url_params.test.ts.snap
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/__snapshots__/get_supported_url_params.test.ts.snap
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.test.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/get_supported_url_params.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/get_supported_url_params.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/get_supported_url_params.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/get_supported_url_params.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/index.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/index.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/index.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.test.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/parse_absolute_date.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/parse_absolute_date.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/parse_absolute_date.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/parse_absolute_date.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/parse_is_paused.test.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/parse_is_paused.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/parse_is_paused.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/parse_is_paused.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/parse_is_paused.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/parse_is_paused.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/parse_is_paused.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/parse_is_paused.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.test.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/parse_url_int.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.test.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/parse_url_int.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts b/x-pack/plugins/synthetics/public/lib/helper/url_params/parse_url_int.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts
rename to x-pack/plugins/synthetics/public/lib/helper/url_params/parse_url_int.ts
diff --git a/x-pack/plugins/uptime/public/lib/index.ts b/x-pack/plugins/synthetics/public/lib/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/index.ts
rename to x-pack/plugins/synthetics/public/lib/index.ts
diff --git a/x-pack/plugins/uptime/public/lib/lib.ts b/x-pack/plugins/synthetics/public/lib/lib.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/lib.ts
rename to x-pack/plugins/synthetics/public/lib/lib.ts
diff --git a/x-pack/plugins/uptime/public/pages/certificates.test.tsx b/x-pack/plugins/synthetics/public/pages/certificates.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/certificates.test.tsx
rename to x-pack/plugins/synthetics/public/pages/certificates.test.tsx
diff --git a/x-pack/plugins/uptime/public/pages/certificates.tsx b/x-pack/plugins/synthetics/public/pages/certificates.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/pages/certificates.tsx
rename to x-pack/plugins/synthetics/public/pages/certificates.tsx
index 787238eb8ea6e..7b6a4d5e735e3 100644
--- a/x-pack/plugins/uptime/public/pages/certificates.tsx
+++ b/x-pack/plugins/synthetics/public/pages/certificates.tsx
@@ -8,7 +8,7 @@
 import { useDispatch } from 'react-redux';
 import { EuiSpacer } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { useTrackPageview } from '../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
 import { getDynamicSettings } from '../state/actions/dynamic_settings';
 import { CertificateList, CertificateSearch, CertSort } from '../components/certificates';
diff --git a/x-pack/plugins/uptime/public/pages/index.ts b/x-pack/plugins/synthetics/public/pages/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/index.ts
rename to x-pack/plugins/synthetics/public/pages/index.ts
diff --git a/x-pack/plugins/uptime/public/pages/mapping_error.tsx b/x-pack/plugins/synthetics/public/pages/mapping_error.tsx
similarity index 94%
rename from x-pack/plugins/uptime/public/pages/mapping_error.tsx
rename to x-pack/plugins/synthetics/public/pages/mapping_error.tsx
index 116586b140524..66dd6be289ad1 100644
--- a/x-pack/plugins/uptime/public/pages/mapping_error.tsx
+++ b/x-pack/plugins/synthetics/public/pages/mapping_error.tsx
@@ -11,9 +11,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import React from 'react';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useTrackPageview } from '../../../observability/public';
 
 export const MappingErrorPage = () => {
   useTrackPageview({ app: 'uptime', path: 'mapping-error' });
diff --git a/x-pack/plugins/uptime/public/pages/monitor.test.tsx b/x-pack/plugins/synthetics/public/pages/monitor.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/monitor.test.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor.test.tsx
diff --git a/x-pack/plugins/uptime/public/pages/monitor.tsx b/x-pack/plugins/synthetics/public/pages/monitor.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/pages/monitor.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor.tsx
index 42b921d56f0d5..3abde2d0db1c9 100644
--- a/x-pack/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/plugins/synthetics/public/pages/monitor.tsx
@@ -8,7 +8,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
-import { useTrackPageview } from '../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useMonitorId } from '../hooks';
 import { MonitorCharts } from '../components/monitor';
 import { MonitorStatusDetails, PingList } from '../components/monitor';
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/action_bar_portal_node.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/action_bar_portal_node.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/monitor_management/action_bar_portal_node.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/action_bar_portal_node.tsx
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/add_monitor.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/add_monitor.tsx
index 1cb3a023adbc1..cdb7ebeccbf04 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx
+++ b/x-pack/plugins/synthetics/public/pages/monitor_management/add_monitor.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { ScheduleUnit } from '../../../common/runtime_types';
 import { SyntheticsProviders } from '../../components/fleet_package/contexts';
 import { Loader } from '../../components/monitor_management/loader/loader';
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/bottom_bar.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/bottom_bar.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/monitor_management/bottom_bar.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/bottom_bar.tsx
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/content.ts b/x-pack/plugins/synthetics/public/pages/monitor_management/content.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/monitor_management/content.ts
rename to x-pack/plugins/synthetics/public/pages/monitor_management/content.ts
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/edit_monitor.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/edit_monitor.tsx
index f79698136461c..5c8c85d7c616d 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx
+++ b/x-pack/plugins/synthetics/public/pages/monitor_management/edit_monitor.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { useParams } from 'react-router-dom';
-import { useTrackPageview, FETCH_STATUS, useFetcher } from '../../../../observability/public';
+import { useTrackPageview, FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
 import { MonitorFields } from '../../../common/runtime_types';
 import { EditMonitorConfig } from '../../components/monitor_management/edit_monitor_config';
 import { Loader } from '../../components/monitor_management/loader/loader';
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/monitor_management.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/monitor_management.tsx
index 63ce73f7edc20..5c8efb14dac2f 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx
+++ b/x-pack/plugins/synthetics/public/pages/monitor_management/monitor_management.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useDispatch, useSelector } from 'react-redux';
 import { EuiCallOut, EuiButton, EuiSpacer, EuiLink } from '@elastic/eui';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { ConfigKey } from '../../../common/runtime_types';
 import { getMonitors } from '../../state/actions';
 import { monitorManagementListSelector } from '../../state/selectors';
@@ -47,7 +47,7 @@ export const MonitorManagementPage: React.FC = () => {
           page: 1, // saved objects page index is base 1
           perPage: 10,
           sortOrder: 'asc',
-          sortField: ConfigKey.NAME,
+          sortField: `${ConfigKey.NAME}.keyword`,
         })
       );
     }
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/service_allowed_wrapper.test.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/service_allowed_wrapper.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/monitor_management/service_allowed_wrapper.test.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/service_allowed_wrapper.test.tsx
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/service_allowed_wrapper.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/service_allowed_wrapper.tsx
similarity index 86%
rename from x-pack/plugins/uptime/public/pages/monitor_management/service_allowed_wrapper.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/service_allowed_wrapper.tsx
index 1c129ce74d958..4869b28495183 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/service_allowed_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/pages/monitor_management/service_allowed_wrapper.tsx
@@ -59,8 +59,6 @@ export const PUBLIC_BETA_DESCRIPTION = i18n.translate(
   'xpack.uptime.monitorManagement.publicBetaDescription',
   {
     defaultMessage:
-      'Monitor management is available only for selected public beta users. With public\n' +
-      'beta access, you will be able to add HTTP, TCP, ICMP and Browser checks which will\n' +
-      "run on Elastic's managed Synthetics service nodes.",
+      "We've got a brand new app on the way. In the meantime, we're excited to give you early access to our globally managed testing infrastructure. This will allow you to upload synthetic monitors using our new point and click script recorder and manage your monitors with a new UI.",
   }
 );
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx b/x-pack/plugins/synthetics/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
rename to x-pack/plugins/synthetics/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
index d013af54c38f6..7fd6cc421c3b6 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
+++ b/x-pack/plugins/synthetics/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { MONITOR_MANAGEMENT_ROUTE } from '../../../common/constants';
 import { PLUGIN } from '../../../common/constants/plugin';
diff --git a/x-pack/plugins/uptime/public/pages/not_found.test.tsx b/x-pack/plugins/synthetics/public/pages/not_found.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/not_found.test.tsx
rename to x-pack/plugins/synthetics/public/pages/not_found.test.tsx
diff --git a/x-pack/plugins/uptime/public/pages/not_found.tsx b/x-pack/plugins/synthetics/public/pages/not_found.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/not_found.tsx
rename to x-pack/plugins/synthetics/public/pages/not_found.tsx
diff --git a/x-pack/plugins/uptime/public/pages/overview.test.tsx b/x-pack/plugins/synthetics/public/pages/overview.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/overview.test.tsx
rename to x-pack/plugins/synthetics/public/pages/overview.test.tsx
diff --git a/x-pack/plugins/uptime/public/pages/overview.tsx b/x-pack/plugins/synthetics/public/pages/overview.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/pages/overview.tsx
rename to x-pack/plugins/synthetics/public/pages/overview.tsx
index 5199eab00f09f..b7f32c2b42448 100644
--- a/x-pack/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/plugins/synthetics/public/pages/overview.tsx
@@ -9,8 +9,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
 
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useTrackPageview } from '../../../observability/public';
 import { MonitorList } from '../components/overview/monitor_list/monitor_list_container';
 import { StatusPanel } from '../components/overview/status_panel';
 import { QueryBar } from '../components/overview/query_bar/query_bar';
diff --git a/x-pack/plugins/uptime/public/pages/settings.test.tsx b/x-pack/plugins/synthetics/public/pages/settings.test.tsx
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/settings.test.tsx
rename to x-pack/plugins/synthetics/public/pages/settings.test.tsx
diff --git a/x-pack/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/synthetics/public/pages/settings.tsx
similarity index 98%
rename from x-pack/plugins/uptime/public/pages/settings.tsx
rename to x-pack/plugins/synthetics/public/pages/settings.tsx
index 3e1c3c911efa1..a12b615bb703d 100644
--- a/x-pack/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/plugins/synthetics/public/pages/settings.tsx
@@ -8,11 +8,11 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiForm, EuiSpacer } from '@elastic/eui';
 import { useDispatch, useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { selectDynamicSettings } from '../state/selectors';
 import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic_settings';
 import { DynamicSettings } from '../../common/runtime_types';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { IndicesForm } from '../components/settings/indices_form';
 import {
   CertificateExpirationForm,
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx b/x-pack/plugins/synthetics/public/pages/synthetics/checks_navigation.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx
rename to x-pack/plugins/synthetics/public/pages/synthetics/checks_navigation.tsx
index 48ca6061941b6..63e8ff6f45654 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx
+++ b/x-pack/plugins/synthetics/public/pages/synthetics/checks_navigation.tsx
@@ -12,7 +12,7 @@ import { useHistory } from 'react-router-dom';
 import moment from 'moment';
 import { SyntheticsJourneyApiResponse } from '../../../common/runtime_types/ping';
 import { getShortTimeStamp } from '../../components/overview/monitor_list/columns/monitor_status_column';
-import { useBreakpoints } from '../../../public/hooks/use_breakpoints';
+import { useBreakpoints } from '../../hooks/use_breakpoints';
 
 interface Props {
   timestamp: string;
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx b/x-pack/plugins/synthetics/public/pages/synthetics/step_detail_page.tsx
similarity index 97%
rename from x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx
rename to x-pack/plugins/synthetics/public/pages/synthetics/step_detail_page.tsx
index 93df71698057f..2ded527f7bb57 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx
+++ b/x-pack/plugins/synthetics/public/pages/synthetics/step_detail_page.tsx
@@ -8,14 +8,14 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { useInitApp } from '../../hooks/use_init_app';
 import { StepDetailContainer } from '../../components/monitor/synthetics/step_detail/step_detail_container';
 import { journeySelector } from '../../state/selectors';
 import { JourneyState } from '../../state/reducers/journey';
 import { JourneyStep } from '../../../common/runtime_types/ping/synthetics';
 import { StepPageNavigation } from '../../components/monitor/synthetics/step_detail/step_page_nav';
-import { useUiSetting$ } from '../../../../../../src/plugins/kibana_react/public';
 import { StepPageTitleContent } from '../../components/monitor/synthetics/step_detail/step_page_title';
 import { getJourneySteps } from '../../state/actions/journey';
 
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx b/x-pack/plugins/synthetics/public/pages/synthetics/synthetics_checks.test.tsx
similarity index 99%
rename from x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx
rename to x-pack/plugins/synthetics/public/pages/synthetics/synthetics_checks.test.tsx
index cfe1b03e6305c..290cdd453bd3c 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx
+++ b/x-pack/plugins/synthetics/public/pages/synthetics/synthetics_checks.test.tsx
@@ -23,7 +23,7 @@ jest.mock('../../state/api/journey', () => ({
 // We must mock all other API calls because we're using the real store
 // in this test. Using the real store causes actions and effects to actually
 // run, which could trigger API calls.
-jest.mock('../../state/api/utils.ts', () => ({
+jest.mock('../../state/api/utils', () => ({
   apiService: { get: jest.fn().mockResolvedValue([]) },
 }));
 
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx b/x-pack/plugins/synthetics/public/pages/synthetics/synthetics_checks.tsx
similarity index 96%
rename from x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
rename to x-pack/plugins/synthetics/public/pages/synthetics/synthetics_checks.tsx
index a03fe674d7c30..276162d488a22 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
+++ b/x-pack/plugins/synthetics/public/pages/synthetics/synthetics_checks.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useInitApp } from '../../hooks/use_init_app';
 import { StepsList } from '../../components/synthetics/check_steps/steps_list';
 import { useCheckSteps } from '../../components/synthetics/check_steps/use_check_steps';
diff --git a/x-pack/plugins/uptime/public/pages/translations.ts b/x-pack/plugins/synthetics/public/pages/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/pages/translations.ts
rename to x-pack/plugins/synthetics/public/pages/translations.ts
diff --git a/x-pack/plugins/uptime/public/routes.tsx b/x-pack/plugins/synthetics/public/routes.tsx
similarity index 95%
rename from x-pack/plugins/uptime/public/routes.tsx
rename to x-pack/plugins/synthetics/public/routes.tsx
index e66954a5fd4af..a8610462e4363 100644
--- a/x-pack/plugins/uptime/public/routes.tsx
+++ b/x-pack/plugins/synthetics/public/routes.tsx
@@ -10,6 +10,8 @@ import { EuiPageTemplateProps, EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@
 import { Route, Switch } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { useInspectorContext } from '@kbn/observability-plugin/public';
 import {
   CERTIFICATES_ROUTE,
   MAPPING_ERROR_ROUTE,
@@ -46,7 +48,6 @@ import { UptimeDatePicker } from './components/common/uptime_date_picker';
 import { CertRefreshBtn } from './components/certificates/cert_refresh_btn';
 import { CertificateTitle } from './components/certificates/certificate_title';
 import { SyntheticsCallout } from './components/overview/synthetics_callout';
-import { APP_WRAPPER_CLASS } from '../../../../src/core/public';
 import {
   StepDetailPageChildren,
   StepDetailPageHeader,
@@ -54,7 +55,6 @@ import {
 } from './pages/synthetics/step_detail_page';
 import { UptimePageTemplateComponent } from './apps/uptime_page_template';
 import { apiService } from './state/api/utils';
-import { useInspectorContext } from '../../observability/public';
 import { AddMonitorBtn } from './components/monitor_management/add_monitor_btn';
 import { SettingsBottomBar } from './components/settings/settings_bottom_bar';
 import { ServiceAllowedWrapper } from './pages/monitor_management/service_allowed_wrapper';
@@ -259,7 +259,8 @@ const getRoutes = (): RouteProps[] => {
               <EuiBetaBadge
                 label="Beta"
                 tooltipContent={i18n.translate('xpack.uptime.routes.monitorManagement.betaLabel', {
-                  defaultMessage: 'This module is not GA. Please help us by reporting any bugs.',
+                  defaultMessage:
+                    'This functionality is in beta and is subject to change. The design and code is less mature than official generally available features and is being provided as-is with no warranties. Beta features are not subject to the support service level agreement of official generally available features.',
                 })}
               />
             </EuiFlexItem>
diff --git a/x-pack/plugins/uptime/public/state/actions/alerts.ts b/x-pack/plugins/synthetics/public/state/actions/alerts.ts
similarity index 89%
rename from x-pack/plugins/uptime/public/state/actions/alerts.ts
rename to x-pack/plugins/synthetics/public/state/actions/alerts.ts
index e62e7830951a3..9de508b4b4eda 100644
--- a/x-pack/plugins/uptime/public/state/actions/alerts.ts
+++ b/x-pack/plugins/synthetics/public/state/actions/alerts.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { createAsyncAction } from './utils';
 import { MonitorIdParam } from './types';
-import { Rule } from '../../../../triggers_actions_ui/public';
 
 export const getExistingAlertAction = createAsyncAction<MonitorIdParam, Rule>(
   'GET EXISTING ALERTS'
diff --git a/x-pack/plugins/uptime/public/state/actions/dynamic_settings.ts b/x-pack/plugins/synthetics/public/state/actions/dynamic_settings.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/dynamic_settings.ts
rename to x-pack/plugins/synthetics/public/state/actions/dynamic_settings.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/index.ts b/x-pack/plugins/synthetics/public/state/actions/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/index.ts
rename to x-pack/plugins/synthetics/public/state/actions/index.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/index_status.ts b/x-pack/plugins/synthetics/public/state/actions/index_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/index_status.ts
rename to x-pack/plugins/synthetics/public/state/actions/index_status.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/journey.ts b/x-pack/plugins/synthetics/public/state/actions/journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/journey.ts
rename to x-pack/plugins/synthetics/public/state/actions/journey.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts b/x-pack/plugins/synthetics/public/state/actions/ml_anomaly.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
rename to x-pack/plugins/synthetics/public/state/actions/ml_anomaly.ts
index cea387e1b88b0..9f3ddff0e9178 100644
--- a/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
+++ b/x-pack/plugins/synthetics/public/state/actions/ml_anomaly.ts
@@ -6,12 +6,12 @@
  */
 
 import { createAction } from 'redux-actions';
-import { createAsyncAction } from './utils';
 import {
   MlCapabilitiesResponse,
   AnomaliesTableRecord,
   JobExistResult,
-} from '../../../../../plugins/ml/public';
+} from '@kbn/ml-plugin/public';
+import { createAsyncAction } from './utils';
 import {
   CreateMLJobSuccess,
   DeleteJobResults,
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor.ts b/x-pack/plugins/synthetics/public/state/actions/monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/monitor.ts
rename to x-pack/plugins/synthetics/public/state/actions/monitor.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts b/x-pack/plugins/synthetics/public/state/actions/monitor_duration.ts
similarity index 93%
rename from x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
rename to x-pack/plugins/synthetics/public/state/actions/monitor_duration.ts
index b55e7a0c9e791..1dd88c663cec5 100644
--- a/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
+++ b/x-pack/plugins/synthetics/public/state/actions/monitor_duration.ts
@@ -6,7 +6,7 @@
  */
 
 import { createAction } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { QueryParams } from './types';
 import { MonitorDurationResult } from '../../../common/types';
 
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor_list.ts b/x-pack/plugins/synthetics/public/state/actions/monitor_list.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/monitor_list.ts
rename to x-pack/plugins/synthetics/public/state/actions/monitor_list.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor_management.ts b/x-pack/plugins/synthetics/public/state/actions/monitor_management.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/monitor_management.ts
rename to x-pack/plugins/synthetics/public/state/actions/monitor_management.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor_status.ts b/x-pack/plugins/synthetics/public/state/actions/monitor_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/monitor_status.ts
rename to x-pack/plugins/synthetics/public/state/actions/monitor_status.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/network_events.ts b/x-pack/plugins/synthetics/public/state/actions/network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/network_events.ts
rename to x-pack/plugins/synthetics/public/state/actions/network_events.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/ping.ts b/x-pack/plugins/synthetics/public/state/actions/ping.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/ping.ts
rename to x-pack/plugins/synthetics/public/state/actions/ping.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/selected_filters.ts b/x-pack/plugins/synthetics/public/state/actions/selected_filters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/selected_filters.ts
rename to x-pack/plugins/synthetics/public/state/actions/selected_filters.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/snapshot.ts b/x-pack/plugins/synthetics/public/state/actions/snapshot.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/snapshot.ts
rename to x-pack/plugins/synthetics/public/state/actions/snapshot.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/types.ts b/x-pack/plugins/synthetics/public/state/actions/types.ts
similarity index 82%
rename from x-pack/plugins/uptime/public/state/actions/types.ts
rename to x-pack/plugins/synthetics/public/state/actions/types.ts
index 13072c1b884e1..62f0051f411f7 100644
--- a/x-pack/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/plugins/synthetics/public/state/actions/types.ts
@@ -6,8 +6,8 @@
  */
 
 import { Action } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
-import type { Rule } from '../../../../triggers_actions_ui/public';
+import { IHttpFetchError } from '@kbn/core/public';
+import type { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { UptimeAlertTypeParams } from '../alerts/alerts';
 
 export interface AsyncAction<Payload, SuccessPayload> {
@@ -15,10 +15,9 @@ export interface AsyncAction<Payload, SuccessPayload> {
   success: (payload: SuccessPayload) => Action<SuccessPayload>;
   fail: (payload: IHttpFetchError) => Action<IHttpFetchError>;
 }
-export interface AsyncAction1<Payload, SuccessPayload> {
+export interface AsyncActionOptionalPayload<Payload, SuccessPayload>
+  extends AsyncAction<Payload, SuccessPayload> {
   get: (payload?: Payload) => Action<Payload>;
-  success: (payload: SuccessPayload) => Action<SuccessPayload>;
-  fail: (payload: IHttpFetchError) => Action<IHttpFetchError>;
 }
 
 export interface MonitorIdParam {
diff --git a/x-pack/plugins/uptime/public/state/actions/ui.ts b/x-pack/plugins/synthetics/public/state/actions/ui.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/actions/ui.ts
rename to x-pack/plugins/synthetics/public/state/actions/ui.ts
diff --git a/x-pack/plugins/uptime/public/state/actions/utils.ts b/x-pack/plugins/synthetics/public/state/actions/utils.ts
similarity index 79%
rename from x-pack/plugins/uptime/public/state/actions/utils.ts
rename to x-pack/plugins/synthetics/public/state/actions/utils.ts
index cd7cc13ed4517..6bac4be8b8173 100644
--- a/x-pack/plugins/uptime/public/state/actions/utils.ts
+++ b/x-pack/plugins/synthetics/public/state/actions/utils.ts
@@ -6,12 +6,12 @@
  */
 
 import { createAction } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
-import { AsyncAction, AsyncAction1 } from './types';
+import { IHttpFetchError } from '@kbn/core/public';
+import { AsyncAction, AsyncActionOptionalPayload } from './types';
 
 export function createAsyncAction<Payload, SuccessPayload>(
   actionStr: string
-): AsyncAction1<Payload, SuccessPayload>;
+): AsyncActionOptionalPayload<Payload, SuccessPayload>;
 export function createAsyncAction<Payload, SuccessPayload>(
   actionStr: string
 ): AsyncAction<Payload, SuccessPayload> {
diff --git a/x-pack/plugins/uptime/public/state/alerts/alerts.ts b/x-pack/plugins/synthetics/public/state/alerts/alerts.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/state/alerts/alerts.ts
rename to x-pack/plugins/synthetics/public/state/alerts/alerts.ts
index 757ee2acec0bd..db969394c2f24 100644
--- a/x-pack/plugins/uptime/public/state/alerts/alerts.ts
+++ b/x-pack/plugins/synthetics/public/state/alerts/alerts.ts
@@ -8,9 +8,13 @@
 import { i18n } from '@kbn/i18n';
 import { handleActions, Action } from 'redux-actions';
 import { call, put, select, takeLatest } from 'redux-saga/effects';
+import type {
+  ActionConnector as RawActionConnector,
+  Rule,
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { createAsyncAction } from '../actions/utils';
 import { asyncInitState, handleAsyncAction } from '../reducers/utils';
-import type { AppState } from '../../state';
+import type { AppState } from '..';
 import { AsyncInitState } from '../reducers/types';
 import { fetchEffectFactory } from '../effects/fetch_effect';
 import {
@@ -21,10 +25,6 @@ import {
   fetchMonitorAlertRecords,
   NewAlertParams,
 } from '../api/alerts';
-import type {
-  ActionConnector as RawActionConnector,
-  Rule,
-} from '../../../../triggers_actions_ui/public';
 import { kibanaService } from '../kibana_service';
 import { monitorIdSelector } from '../selectors';
 import { AlertsResult, MonitorIdParam } from '../actions/types';
diff --git a/x-pack/plugins/uptime/public/state/api/__snapshots__/snapshot.test.ts.snap b/x-pack/plugins/synthetics/public/state/api/__snapshots__/snapshot.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/__snapshots__/snapshot.test.ts.snap
rename to x-pack/plugins/synthetics/public/state/api/__snapshots__/snapshot.test.ts.snap
diff --git a/x-pack/plugins/uptime/public/state/api/alert_actions.test.ts b/x-pack/plugins/synthetics/public/state/api/alert_actions.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/alert_actions.test.ts
rename to x-pack/plugins/synthetics/public/state/api/alert_actions.test.ts
diff --git a/x-pack/plugins/uptime/public/state/api/alert_actions.ts b/x-pack/plugins/synthetics/public/state/api/alert_actions.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/state/api/alert_actions.ts
rename to x-pack/plugins/synthetics/public/state/api/alert_actions.ts
index 93a19cedc6001..5e65231388119 100644
--- a/x-pack/plugins/uptime/public/state/api/alert_actions.ts
+++ b/x-pack/plugins/synthetics/public/state/api/alert_actions.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NewAlertParams } from './alerts';
-import { RuleAction as RuleActionOrig } from '../../../../triggers_actions_ui/public';
-import { ACTION_GROUP_DEFINITIONS } from '../../../common/constants/alerts';
-import { MonitorStatusTranslations } from '../../../common/translations';
+import { RuleAction as RuleActionOrig } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   IndexActionParams,
   PagerDutyActionParams,
@@ -19,7 +16,10 @@ import {
   WebhookActionParams,
   EmailActionParams,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../actions/server';
+} from '@kbn/actions-plugin/server';
+import { NewAlertParams } from './alerts';
+import { ACTION_GROUP_DEFINITIONS } from '../../../common/constants/alerts';
+import { MonitorStatusTranslations } from '../../../common/translations';
 import { ActionTypeId } from '../../components/settings/types';
 import { Ping } from '../../../common/runtime_types/ping';
 import { DefaultEmail } from '../../../common/runtime_types';
diff --git a/x-pack/plugins/uptime/public/state/api/alerts.ts b/x-pack/plugins/synthetics/public/state/api/alerts.ts
similarity index 96%
rename from x-pack/plugins/uptime/public/state/api/alerts.ts
rename to x-pack/plugins/synthetics/public/state/api/alerts.ts
index 49df4f390611b..2e02c36289ab8 100644
--- a/x-pack/plugins/uptime/public/state/api/alerts.ts
+++ b/x-pack/plugins/synthetics/public/state/api/alerts.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
+import type { ActionType, AsApiContract, Rule } from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { apiService } from './utils';
 import { ActionConnector } from '../alerts/alerts';
 
 import { AlertsResult, MonitorIdParam } from '../actions/types';
-import type { ActionType, AsApiContract, Rule } from '../../../../triggers_actions_ui/public';
 import { API_URLS } from '../../../common/constants';
-import { RuleTypeParams } from '../../../../alerting/common';
 import { AtomicStatusCheckParams } from '../../../common/runtime_types/alerts';
 
 import { populateAlertActions, RuleAction } from './alert_actions';
diff --git a/x-pack/plugins/uptime/public/state/api/dynamic_settings.ts b/x-pack/plugins/synthetics/public/state/api/dynamic_settings.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/dynamic_settings.ts
rename to x-pack/plugins/synthetics/public/state/api/dynamic_settings.ts
diff --git a/x-pack/plugins/uptime/public/state/api/index.ts b/x-pack/plugins/synthetics/public/state/api/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/index.ts
rename to x-pack/plugins/synthetics/public/state/api/index.ts
diff --git a/x-pack/plugins/uptime/public/state/api/index_status.ts b/x-pack/plugins/synthetics/public/state/api/index_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/index_status.ts
rename to x-pack/plugins/synthetics/public/state/api/index_status.ts
diff --git a/x-pack/plugins/uptime/public/state/api/journey.ts b/x-pack/plugins/synthetics/public/state/api/journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/journey.ts
rename to x-pack/plugins/synthetics/public/state/api/journey.ts
diff --git a/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts b/x-pack/plugins/synthetics/public/state/api/ml_anomaly.ts
similarity index 96%
rename from x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
rename to x-pack/plugins/synthetics/public/state/api/ml_anomaly.ts
index 24f2d667323d1..e7655f37d3f01 100644
--- a/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
+++ b/x-pack/plugins/synthetics/public/state/api/ml_anomaly.ts
@@ -6,15 +6,15 @@
  */
 
 import moment from 'moment';
-import { apiService } from './utils';
-import { AnomalyRecords, AnomalyRecordsParams } from '../actions';
-import { API_URLS, ML_MODULE_ID } from '../../../common/constants';
 import {
   DataRecognizerConfigResponse,
   JobExistResult,
   MlCapabilitiesResponse,
-} from '../../../../../plugins/ml/public';
-import { extractErrorMessage } from '../../../../../plugins/ml/common';
+} from '@kbn/ml-plugin/public';
+import { extractErrorMessage } from '@kbn/ml-plugin/common';
+import { apiService } from './utils';
+import { AnomalyRecords, AnomalyRecordsParams } from '../actions';
+import { API_URLS, ML_MODULE_ID } from '../../../common/constants';
 import {
   CreateMLJobSuccess,
   DeleteJobResults,
diff --git a/x-pack/plugins/uptime/public/state/api/monitor.ts b/x-pack/plugins/synthetics/public/state/api/monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/monitor.ts
rename to x-pack/plugins/synthetics/public/state/api/monitor.ts
diff --git a/x-pack/plugins/uptime/public/state/api/monitor_duration.ts b/x-pack/plugins/synthetics/public/state/api/monitor_duration.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/monitor_duration.ts
rename to x-pack/plugins/synthetics/public/state/api/monitor_duration.ts
diff --git a/x-pack/plugins/uptime/public/state/api/monitor_list.ts b/x-pack/plugins/synthetics/public/state/api/monitor_list.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/monitor_list.ts
rename to x-pack/plugins/synthetics/public/state/api/monitor_list.ts
diff --git a/x-pack/plugins/uptime/public/state/api/monitor_management.ts b/x-pack/plugins/synthetics/public/state/api/monitor_management.ts
similarity index 92%
rename from x-pack/plugins/uptime/public/state/api/monitor_management.ts
rename to x-pack/plugins/synthetics/public/state/api/monitor_management.ts
index 58cc0217c298c..a776d33b8147b 100644
--- a/x-pack/plugins/uptime/public/state/api/monitor_management.ts
+++ b/x-pack/plugins/synthetics/public/state/api/monitor_management.ts
@@ -18,6 +18,8 @@ import {
   ServiceLocationsApiResponseCodec,
   ServiceLocationErrors,
   ThrottlingOptions,
+  Locations,
+  SyntheticsMonitorSchedule,
 } from '../../../common/runtime_types';
 import {
   DecryptedSyntheticsMonitorSavedObject,
@@ -84,12 +86,16 @@ export const runOnceMonitor = async ({
 };
 
 export interface TestNowResponse {
-  errors?: Array<{ error: Error }>;
+  schedule: SyntheticsMonitorSchedule;
+  locations: Locations;
+  errors?: ServiceLocationErrors;
   testRunId: string;
   monitorId: string;
 }
 
-export const testNowMonitor = async (configId: string): Promise<TestNowResponse | undefined> => {
+export const triggerTestNowMonitor = async (
+  configId: string
+): Promise<TestNowResponse | undefined> => {
   return await apiService.get(API_URLS.TRIGGER_MONITOR + `/${configId}`);
 };
 
diff --git a/x-pack/plugins/uptime/public/state/api/monitor_status.ts b/x-pack/plugins/synthetics/public/state/api/monitor_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/monitor_status.ts
rename to x-pack/plugins/synthetics/public/state/api/monitor_status.ts
diff --git a/x-pack/plugins/uptime/public/state/api/network_events.ts b/x-pack/plugins/synthetics/public/state/api/network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/network_events.ts
rename to x-pack/plugins/synthetics/public/state/api/network_events.ts
diff --git a/x-pack/plugins/uptime/public/state/api/ping.ts b/x-pack/plugins/synthetics/public/state/api/ping.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/ping.ts
rename to x-pack/plugins/synthetics/public/state/api/ping.ts
diff --git a/x-pack/plugins/uptime/public/state/api/snapshot.test.ts b/x-pack/plugins/synthetics/public/state/api/snapshot.test.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/state/api/snapshot.test.ts
rename to x-pack/plugins/synthetics/public/state/api/snapshot.test.ts
index 01177eceb4720..20a0a0d7a477c 100644
--- a/x-pack/plugins/uptime/public/state/api/snapshot.test.ts
+++ b/x-pack/plugins/synthetics/public/state/api/snapshot.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { fetchSnapshotCount } from './snapshot';
 import { apiService } from './utils';
 import { API_URLS } from '../../../common/constants';
diff --git a/x-pack/plugins/uptime/public/state/api/snapshot.ts b/x-pack/plugins/synthetics/public/state/api/snapshot.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/snapshot.ts
rename to x-pack/plugins/synthetics/public/state/api/snapshot.ts
diff --git a/x-pack/plugins/uptime/public/state/api/types.ts b/x-pack/plugins/synthetics/public/state/api/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/api/types.ts
rename to x-pack/plugins/synthetics/public/state/api/types.ts
diff --git a/x-pack/plugins/uptime/public/state/api/utils.ts b/x-pack/plugins/synthetics/public/state/api/utils.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/state/api/utils.ts
rename to x-pack/plugins/synthetics/public/state/api/utils.ts
index 833a6845d6343..cbba8cf02cf22 100644
--- a/x-pack/plugins/uptime/public/state/api/utils.ts
+++ b/x-pack/plugins/synthetics/public/state/api/utils.ts
@@ -7,8 +7,8 @@
 
 import { isRight } from 'fp-ts/lib/Either';
 import { formatErrors } from '@kbn/securitysolution-io-ts-utils';
-import { HttpFetchQuery, HttpSetup } from 'src/core/public';
-import { FETCH_STATUS, AddInspectorRequest } from '../../../../observability/public';
+import { HttpFetchQuery, HttpSetup } from '@kbn/core/public';
+import { FETCH_STATUS, AddInspectorRequest } from '@kbn/observability-plugin/public';
 
 class ApiService {
   private static instance: ApiService;
diff --git a/x-pack/plugins/uptime/public/state/certificates/certificates.ts b/x-pack/plugins/synthetics/public/state/certificates/certificates.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/state/certificates/certificates.ts
rename to x-pack/plugins/synthetics/public/state/certificates/certificates.ts
index b5e5376c00df9..c01d6042615b4 100644
--- a/x-pack/plugins/uptime/public/state/certificates/certificates.ts
+++ b/x-pack/plugins/synthetics/public/state/certificates/certificates.ts
@@ -6,7 +6,7 @@
  */
 
 import { Action, createAction, handleActions } from 'redux-actions';
-import { AppState } from '../index';
+import { AppState } from '..';
 
 export const setCertificatesTotalAction = createAction<CertificatesState>('SET_CERTIFICATES_TOTAL');
 
diff --git a/x-pack/plugins/uptime/public/state/effects/alerts.ts b/x-pack/plugins/synthetics/public/state/effects/alerts.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/alerts.ts
rename to x-pack/plugins/synthetics/public/state/effects/alerts.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts b/x-pack/plugins/synthetics/public/state/effects/dynamic_settings.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts
rename to x-pack/plugins/synthetics/public/state/effects/dynamic_settings.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts b/x-pack/plugins/synthetics/public/state/effects/fetch_effect.test.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts
rename to x-pack/plugins/synthetics/public/state/effects/fetch_effect.test.ts
index d02ba142b907a..5216260714cc8 100644
--- a/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts
+++ b/x-pack/plugins/synthetics/public/state/effects/fetch_effect.test.ts
@@ -8,7 +8,7 @@
 import { call, put } from 'redux-saga/effects';
 import { fetchEffectFactory } from './fetch_effect';
 import { indexStatusAction } from '../actions';
-import { HttpFetchError } from 'src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { StatesIndexStatus } from '../../../common/runtime_types';
 import { fetchIndexStatus } from '../api';
 
diff --git a/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts b/x-pack/plugins/synthetics/public/state/effects/fetch_effect.ts
similarity index 96%
rename from x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
rename to x-pack/plugins/synthetics/public/state/effects/fetch_effect.ts
index 4fbd60f7929ce..387ceeb56a514 100644
--- a/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
+++ b/x-pack/plugins/synthetics/public/state/effects/fetch_effect.ts
@@ -7,7 +7,7 @@
 
 import { call, put } from 'redux-saga/effects';
 import { Action } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 
 /**
  * Factory function for a fetch effect. It expects three action creators,
diff --git a/x-pack/plugins/uptime/public/state/effects/index.ts b/x-pack/plugins/synthetics/public/state/effects/index.ts
similarity index 91%
rename from x-pack/plugins/uptime/public/state/effects/index.ts
rename to x-pack/plugins/synthetics/public/state/effects/index.ts
index 5c61c2ff26d1f..82d9209e47995 100644
--- a/x-pack/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/plugins/synthetics/public/state/effects/index.ts
@@ -7,16 +7,13 @@
 
 import { fork } from 'redux-saga/effects';
 import { fetchMonitorDetailsEffect } from './monitor';
-import {
-  fetchMonitorListEffect,
-  fetchRunNowMonitorEffect,
-  fetchUpdatedMonitorEffect,
-} from './monitor_list';
+import { fetchMonitorListEffect, fetchUpdatedMonitorEffect } from './monitor_list';
 import {
   fetchMonitorManagementEffect,
   fetchSyntheticsServiceAllowedEffect,
 } from './monitor_management';
 import { fetchMonitorStatusEffect } from './monitor_status';
+import { fetchTestNowMonitorEffect } from './test_now_runs';
 import { fetchDynamicSettingsEffect, setDynamicSettingsEffect } from './dynamic_settings';
 import { fetchPingsEffect, fetchPingHistogramEffect } from './ping';
 import { fetchMonitorDurationEffect } from './monitor_duration';
@@ -37,6 +34,7 @@ export function* rootEffect() {
   yield fork(fetchUpdatedMonitorEffect);
   yield fork(fetchMonitorManagementEffect);
   yield fork(fetchMonitorStatusEffect);
+  yield fork(fetchTestNowMonitorEffect);
   yield fork(fetchDynamicSettingsEffect);
   yield fork(setDynamicSettingsEffect);
   yield fork(fetchPingsEffect);
@@ -50,6 +48,5 @@ export function* rootEffect() {
   yield fork(fetchScreenshotBlocks);
   yield fork(generateBlockStatsOnPut);
   yield fork(pruneBlockCache);
-  yield fork(fetchRunNowMonitorEffect);
   yield fork(fetchSyntheticsServiceAllowedEffect);
 }
diff --git a/x-pack/plugins/uptime/public/state/effects/index_status.ts b/x-pack/plugins/synthetics/public/state/effects/index_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/index_status.ts
rename to x-pack/plugins/synthetics/public/state/effects/index_status.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/journey.test.ts b/x-pack/plugins/synthetics/public/state/effects/journey.test.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/state/effects/journey.test.ts
rename to x-pack/plugins/synthetics/public/state/effects/journey.test.ts
index cbf5fc72a0716..93a9ceec50ae2 100644
--- a/x-pack/plugins/uptime/public/state/effects/journey.test.ts
+++ b/x-pack/plugins/synthetics/public/state/effects/journey.test.ts
@@ -10,7 +10,7 @@ import createSagaMiddleware from 'redux-saga';
 import { createStore as createReduxStore, applyMiddleware } from 'redux';
 
 import { rootReducer } from '../reducers';
-import { fetchJourneyStepsEffect } from '../effects/journey';
+import { fetchJourneyStepsEffect } from './journey';
 
 import { getJourneySteps } from '../actions/journey';
 
diff --git a/x-pack/plugins/uptime/public/state/effects/journey.ts b/x-pack/plugins/synthetics/public/state/effects/journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/journey.ts
rename to x-pack/plugins/synthetics/public/state/effects/journey.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts b/x-pack/plugins/synthetics/public/state/effects/ml_anomaly.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
rename to x-pack/plugins/synthetics/public/state/effects/ml_anomaly.ts
index 00c911e001fb3..28e9bb201743d 100644
--- a/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
+++ b/x-pack/plugins/synthetics/public/state/effects/ml_anomaly.ts
@@ -24,7 +24,7 @@ import {
 } from '../api/ml_anomaly';
 import type { MonitorIdParam, DeleteJobResults } from '../actions/types';
 import { anomalyAlertSelector, deleteAlertAction } from '../alerts/alerts';
-import type { AppState } from '../../state';
+import type { AppState } from '..';
 
 export function* fetchMLJobEffect() {
   yield takeLatest(
diff --git a/x-pack/plugins/uptime/public/state/effects/monitor.ts b/x-pack/plugins/synthetics/public/state/effects/monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/monitor.ts
rename to x-pack/plugins/synthetics/public/state/effects/monitor.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/monitor_duration.ts b/x-pack/plugins/synthetics/public/state/effects/monitor_duration.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/monitor_duration.ts
rename to x-pack/plugins/synthetics/public/state/effects/monitor_duration.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/monitor_list.ts b/x-pack/plugins/synthetics/public/state/effects/monitor_list.ts
similarity index 70%
rename from x-pack/plugins/uptime/public/state/effects/monitor_list.ts
rename to x-pack/plugins/synthetics/public/state/effects/monitor_list.ts
index 35322c3768190..3e4d0f67ffa18 100644
--- a/x-pack/plugins/uptime/public/state/effects/monitor_list.ts
+++ b/x-pack/plugins/synthetics/public/state/effects/monitor_list.ts
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import { takeEvery, takeLatest } from 'redux-saga/effects';
+import { takeLatest } from 'redux-saga/effects';
 import {
   getMonitorList,
   getMonitorListSuccess,
   getMonitorListFailure,
   getUpdatedMonitor,
-  testNowMonitorAction,
 } from '../actions';
-import { fetchMonitorList, testNowMonitor } from '../api';
+import { fetchMonitorList } from '../api';
 import { fetchEffectFactory } from './fetch_effect';
 
 export function* fetchMonitorListEffect() {
@@ -29,10 +28,3 @@ export function* fetchUpdatedMonitorEffect() {
     fetchEffectFactory(fetchMonitorList, getUpdatedMonitor.success, getUpdatedMonitor.fail)
   );
 }
-
-export function* fetchRunNowMonitorEffect() {
-  yield takeEvery(
-    testNowMonitorAction.get,
-    fetchEffectFactory(testNowMonitor, testNowMonitorAction.success, testNowMonitorAction.fail)
-  );
-}
diff --git a/x-pack/plugins/uptime/public/state/effects/monitor_management.ts b/x-pack/plugins/synthetics/public/state/effects/monitor_management.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/monitor_management.ts
rename to x-pack/plugins/synthetics/public/state/effects/monitor_management.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/monitor_status.ts b/x-pack/plugins/synthetics/public/state/effects/monitor_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/monitor_status.ts
rename to x-pack/plugins/synthetics/public/state/effects/monitor_status.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/network_events.ts b/x-pack/plugins/synthetics/public/state/effects/network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/network_events.ts
rename to x-pack/plugins/synthetics/public/state/effects/network_events.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/ping.ts b/x-pack/plugins/synthetics/public/state/effects/ping.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/ping.ts
rename to x-pack/plugins/synthetics/public/state/effects/ping.ts
diff --git a/x-pack/plugins/uptime/public/state/effects/synthetic_journey_blocks.ts b/x-pack/plugins/synthetics/public/state/effects/synthetic_journey_blocks.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/effects/synthetic_journey_blocks.ts
rename to x-pack/plugins/synthetics/public/state/effects/synthetic_journey_blocks.ts
diff --git a/x-pack/plugins/synthetics/public/state/effects/test_now_runs.ts b/x-pack/plugins/synthetics/public/state/effects/test_now_runs.ts
new file mode 100644
index 0000000000000..9272886ec7376
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/state/effects/test_now_runs.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { IHttpFetchError } from '@kbn/core/public';
+import { takeEvery } from 'redux-saga/effects';
+import { testNowMonitorAction } from '../actions';
+import { TestNowResponse, triggerTestNowMonitor } from '../api';
+import { fetchEffectFactory } from './fetch_effect';
+
+export function* fetchTestNowMonitorEffect() {
+  yield takeEvery(
+    testNowMonitorAction.get,
+    fetchEffectFactory(triggerTestNowMonitor, testNowMonitorSuccessAction, testNowMonitorFailAction)
+  );
+}
+
+function testNowMonitorSuccessAction(payload: TestNowResponse | undefined) {
+  return testNowMonitorAction.success(payload);
+}
+
+function testNowMonitorFailAction(payload: IHttpFetchError) {
+  return testNowMonitorAction.fail(payload);
+}
diff --git a/x-pack/plugins/uptime/public/state/index.ts b/x-pack/plugins/synthetics/public/state/index.ts
similarity index 86%
rename from x-pack/plugins/uptime/public/state/index.ts
rename to x-pack/plugins/synthetics/public/state/index.ts
index 506051b95fd5a..9d4fa202b3d1a 100644
--- a/x-pack/plugins/uptime/public/state/index.ts
+++ b/x-pack/plugins/synthetics/public/state/index.ts
@@ -9,6 +9,7 @@ import { createStore, applyMiddleware } from 'redux';
 import type { Store } from 'redux';
 import { composeWithDevTools } from 'redux-devtools-extension';
 import createSagaMiddleware from 'redux-saga';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { rootEffect } from './effects';
 import { rootReducer } from './reducers';
 
@@ -19,3 +20,5 @@ const sagaMW = createSagaMiddleware();
 export const store: Store = createStore(rootReducer, composeWithDevTools(applyMiddleware(sagaMW)));
 
 sagaMW.run(rootEffect);
+
+export const storage = new Storage(window.localStorage);
diff --git a/x-pack/plugins/uptime/public/state/kibana_service.ts b/x-pack/plugins/synthetics/public/state/kibana_service.ts
similarity index 94%
rename from x-pack/plugins/uptime/public/state/kibana_service.ts
rename to x-pack/plugins/synthetics/public/state/kibana_service.ts
index 6ca2651bf9748..f5f591a98422c 100644
--- a/x-pack/plugins/uptime/public/state/kibana_service.ts
+++ b/x-pack/plugins/synthetics/public/state/kibana_service.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable } from 'rxjs';
-import type { CoreStart, CoreTheme } from 'kibana/public';
+import type { CoreStart, CoreTheme } from '@kbn/core/public';
 import { apiService } from './api/utils';
 
 class KibanaService {
diff --git a/x-pack/plugins/uptime/public/state/reducers/dynamic_settings.ts b/x-pack/plugins/synthetics/public/state/reducers/dynamic_settings.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/dynamic_settings.ts
rename to x-pack/plugins/synthetics/public/state/reducers/dynamic_settings.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/index.ts b/x-pack/plugins/synthetics/public/state/reducers/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/index.ts
rename to x-pack/plugins/synthetics/public/state/reducers/index.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/index_status.ts b/x-pack/plugins/synthetics/public/state/reducers/index_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/index_status.ts
rename to x-pack/plugins/synthetics/public/state/reducers/index_status.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/journey.ts b/x-pack/plugins/synthetics/public/state/reducers/journey.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/journey.ts
rename to x-pack/plugins/synthetics/public/state/reducers/journey.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts b/x-pack/plugins/synthetics/public/state/reducers/ml_anomaly.ts
similarity index 95%
rename from x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
rename to x-pack/plugins/synthetics/public/state/reducers/ml_anomaly.ts
index 7cac6491aa937..f755609ec5607 100644
--- a/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
+++ b/x-pack/plugins/synthetics/public/state/reducers/ml_anomaly.ts
@@ -6,6 +6,7 @@
  */
 
 import { handleActions } from 'redux-actions';
+import { MlCapabilitiesResponse, JobExistResult } from '@kbn/ml-plugin/public';
 import {
   getExistingMLJobAction,
   createMLJobAction,
@@ -17,7 +18,6 @@ import {
 } from '../actions';
 import { asyncInitState, handleAsyncAction } from './utils';
 import { AsyncInitState } from './types';
-import { MlCapabilitiesResponse, JobExistResult } from '../../../../../plugins/ml/public';
 import { CreateMLJobSuccess, DeleteJobResults } from '../actions/types';
 
 export interface MLJobState {
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor.ts b/x-pack/plugins/synthetics/public/state/reducers/monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/monitor.ts
rename to x-pack/plugins/synthetics/public/state/reducers/monitor.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_duration.ts b/x-pack/plugins/synthetics/public/state/reducers/monitor_duration.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/monitor_duration.ts
rename to x-pack/plugins/synthetics/public/state/reducers/monitor_duration.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts b/x-pack/plugins/synthetics/public/state/reducers/monitor_list.ts
similarity index 97%
rename from x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
rename to x-pack/plugins/synthetics/public/state/reducers/monitor_list.ts
index 8083b50367fe7..3630842cb9f8f 100644
--- a/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
+++ b/x-pack/plugins/synthetics/public/state/reducers/monitor_list.ts
@@ -6,7 +6,7 @@
  */
 
 import { handleActions, Action } from 'redux-actions';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import {
   getMonitorList,
   getMonitorListSuccess,
@@ -16,7 +16,7 @@ import {
   setUpdatingMonitorId,
 } from '../actions';
 import { MonitorSummariesResult } from '../../../common/runtime_types';
-import { AppState } from '../index';
+import { AppState } from '..';
 import { TestNowResponse } from '../api';
 
 export interface MonitorList {
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_management.ts b/x-pack/plugins/synthetics/public/state/reducers/monitor_management.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/monitor_management.ts
rename to x-pack/plugins/synthetics/public/state/reducers/monitor_management.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_status.test.ts b/x-pack/plugins/synthetics/public/state/reducers/monitor_status.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/monitor_status.test.ts
rename to x-pack/plugins/synthetics/public/state/reducers/monitor_status.test.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_status.ts b/x-pack/plugins/synthetics/public/state/reducers/monitor_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/monitor_status.ts
rename to x-pack/plugins/synthetics/public/state/reducers/monitor_status.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/network_events.ts b/x-pack/plugins/synthetics/public/state/reducers/network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/network_events.ts
rename to x-pack/plugins/synthetics/public/state/reducers/network_events.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/ping.ts b/x-pack/plugins/synthetics/public/state/reducers/ping.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/ping.ts
rename to x-pack/plugins/synthetics/public/state/reducers/ping.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/ping_list.ts b/x-pack/plugins/synthetics/public/state/reducers/ping_list.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/ping_list.ts
rename to x-pack/plugins/synthetics/public/state/reducers/ping_list.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/selected_filters.test.ts b/x-pack/plugins/synthetics/public/state/reducers/selected_filters.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/selected_filters.test.ts
rename to x-pack/plugins/synthetics/public/state/reducers/selected_filters.test.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/selected_filters.ts b/x-pack/plugins/synthetics/public/state/reducers/selected_filters.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/selected_filters.ts
rename to x-pack/plugins/synthetics/public/state/reducers/selected_filters.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/synthetics.test.ts b/x-pack/plugins/synthetics/public/state/reducers/synthetics.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/synthetics.test.ts
rename to x-pack/plugins/synthetics/public/state/reducers/synthetics.test.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/synthetics.ts b/x-pack/plugins/synthetics/public/state/reducers/synthetics.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/synthetics.ts
rename to x-pack/plugins/synthetics/public/state/reducers/synthetics.ts
diff --git a/x-pack/plugins/synthetics/public/state/reducers/test_now_runs.ts b/x-pack/plugins/synthetics/public/state/reducers/test_now_runs.ts
new file mode 100644
index 0000000000000..d081039e4d901
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/state/reducers/test_now_runs.ts
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createReducer, PayloadAction } from '@reduxjs/toolkit';
+import { WritableDraft } from 'immer/dist/types/types-external';
+import { IHttpFetchError } from '@kbn/core/public';
+import {
+  Locations,
+  ScheduleUnit,
+  ServiceLocationErrors,
+  SyntheticsMonitorSchedule,
+} from '../../../common/runtime_types';
+import { clearTestNowMonitorAction, testNowMonitorAction } from '../actions';
+import { TestNowResponse } from '../api';
+import { AppState } from '..';
+
+export enum TestRunStats {
+  LOADING = 'loading',
+  IN_PROGRESS = 'in-progress',
+  COMPLETED = 'completed',
+}
+
+interface TestNowRun {
+  monitorId: string;
+  testRunId?: string;
+  status: TestRunStats;
+  schedule: SyntheticsMonitorSchedule;
+  locations: Locations;
+  errors?: ServiceLocationErrors;
+  fetchError?: { name: string; message: string };
+}
+
+export interface TestNowRunsState {
+  [monitorId: string]: TestNowRun;
+}
+
+export const initialState: TestNowRunsState = {};
+
+export const testNowRunsReducer = createReducer(initialState, (builder) => {
+  builder
+    .addCase(
+      String(testNowMonitorAction.get),
+      (state: WritableDraft<TestNowRunsState>, action: PayloadAction<string>) => ({
+        ...state,
+        [action.payload]: {
+          monitorId: action.payload,
+          status: TestRunStats.LOADING,
+          schedule: { unit: ScheduleUnit.MINUTES, number: '3' },
+          locations: [],
+        },
+      })
+    )
+    .addCase(
+      String(testNowMonitorAction.success),
+      (state: WritableDraft<TestNowRunsState>, { payload }: PayloadAction<TestNowResponse>) => ({
+        ...state,
+        [payload.monitorId]: {
+          monitorId: payload.monitorId,
+          testRunId: payload.testRunId,
+          status: TestRunStats.IN_PROGRESS,
+          errors: payload.errors,
+          schedule: payload.schedule,
+          locations: payload.locations,
+        },
+      })
+    )
+    .addCase(
+      String(testNowMonitorAction.fail),
+      (state: WritableDraft<TestNowRunsState>, action: PayloadAction<TestNowResponse>) => {
+        const fetchError = action.payload as unknown as IHttpFetchError;
+        if (fetchError?.request.url) {
+          const { name, message } = fetchError;
+
+          const [, errorMonitor] =
+            Object.entries(state).find(
+              ([key]) => fetchError.request.url.indexOf(key) > -1 ?? false
+            ) ?? [];
+
+          if (errorMonitor) {
+            return {
+              ...state,
+              [errorMonitor.monitorId]: {
+                ...state[errorMonitor.monitorId],
+                status: TestRunStats.COMPLETED,
+                errors: undefined,
+                fetchError: { name, message },
+              },
+            };
+          }
+        }
+
+        if (action.payload.monitorId) {
+          return {
+            ...state,
+            [action.payload.monitorId]: {
+              ...state[action.payload.monitorId],
+              status: TestRunStats.COMPLETED,
+              errors: action.payload.errors,
+              fetchError: undefined,
+            },
+          };
+        }
+
+        return state;
+      }
+    )
+    .addCase(
+      String(clearTestNowMonitorAction),
+      (state: WritableDraft<TestNowRunsState>, action: PayloadAction<string>) => {
+        const { [action.payload]: payloadTestRun, ...rest } = state;
+
+        return rest;
+      }
+    );
+});
+
+export const testNowRunsSelector = ({ testNowRuns }: AppState) => testNowRuns.testNowRuns;
+
+export const testNowRunSelector =
+  (monitorId?: string) =>
+  ({ testNowRuns }: AppState) =>
+    monitorId ? testNowRuns[monitorId] : undefined;
diff --git a/x-pack/plugins/uptime/public/state/reducers/types.ts b/x-pack/plugins/synthetics/public/state/reducers/types.ts
similarity index 85%
rename from x-pack/plugins/uptime/public/state/reducers/types.ts
rename to x-pack/plugins/synthetics/public/state/reducers/types.ts
index 71cf9a59f6478..b1b995fcefc4a 100644
--- a/x-pack/plugins/uptime/public/state/reducers/types.ts
+++ b/x-pack/plugins/synthetics/public/state/reducers/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 export interface AsyncInitState<ReduceStateType> {
   data: ReduceStateType | null;
diff --git a/x-pack/plugins/uptime/public/state/reducers/ui.test.ts b/x-pack/plugins/synthetics/public/state/reducers/ui.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/ui.test.ts
rename to x-pack/plugins/synthetics/public/state/reducers/ui.test.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/ui.ts b/x-pack/plugins/synthetics/public/state/reducers/ui.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/ui.ts
rename to x-pack/plugins/synthetics/public/state/reducers/ui.ts
diff --git a/x-pack/plugins/uptime/public/state/reducers/utils.ts b/x-pack/plugins/synthetics/public/state/reducers/utils.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/state/reducers/utils.ts
rename to x-pack/plugins/synthetics/public/state/reducers/utils.ts
diff --git a/x-pack/plugins/uptime/public/state/selectors/index.test.ts b/x-pack/plugins/synthetics/public/state/selectors/index.test.ts
similarity index 92%
rename from x-pack/plugins/uptime/public/state/selectors/index.test.ts
rename to x-pack/plugins/synthetics/public/state/selectors/index.test.ts
index 88573b748e0a4..62e39f40f1737 100644
--- a/x-pack/plugins/uptime/public/state/selectors/index.test.ts
+++ b/x-pack/plugins/synthetics/public/state/selectors/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getBasePath, isIntegrationsPopupOpen } from './index';
+import { getBasePath, isIntegrationsPopupOpen } from '.';
 import { mockState } from '../../lib/__mocks__/uptime_store.mock';
 
 describe('state selectors', () => {
diff --git a/x-pack/plugins/uptime/public/state/selectors/index.ts b/x-pack/plugins/synthetics/public/state/selectors/index.ts
similarity index 98%
rename from x-pack/plugins/uptime/public/state/selectors/index.ts
rename to x-pack/plugins/synthetics/public/state/selectors/index.ts
index f420648664fef..d250eb8bcf059 100644
--- a/x-pack/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/plugins/synthetics/public/state/selectors/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { createSelector } from 'reselect';
-import type { AppState } from '../../state';
+import type { AppState } from '..';
 
 // UI Selectors
 export const getBasePath = ({ ui: { basePath } }: AppState) => basePath;
diff --git a/x-pack/plugins/uptime/scripts/e2e.js b/x-pack/plugins/synthetics/scripts/e2e.js
similarity index 100%
rename from x-pack/plugins/uptime/scripts/e2e.js
rename to x-pack/plugins/synthetics/scripts/e2e.js
diff --git a/x-pack/plugins/uptime/server/index.ts b/x-pack/plugins/synthetics/server/index.ts
similarity index 85%
rename from x-pack/plugins/uptime/server/index.ts
rename to x-pack/plugins/synthetics/server/index.ts
index 7c3b2ec345bd6..3ed326d1fc143 100644
--- a/x-pack/plugins/uptime/server/index.ts
+++ b/x-pack/plugins/synthetics/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { Plugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/synthetics/server/kibana.index.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/kibana.index.ts
rename to x-pack/plugins/synthetics/server/kibana.index.ts
index 461c2ba16366a..34cec1a2af37a 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/synthetics/server/kibana.index.ts
@@ -6,8 +6,8 @@
  */
 
 import { Request, Server } from '@hapi/hapi';
-import { Logger } from 'kibana/server';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import { PLUGIN } from '../common/constants/plugin';
 import { compose } from './lib/compose/kibana';
 import { initUptimeServer } from './uptime_server';
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/synthetics/server/lib/adapters/framework/adapter_types.ts
similarity index 77%
rename from x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/framework/adapter_types.ts
index fb5c0cd1e69a1..b059d1d765067 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/synthetics/server/lib/adapters/framework/adapter_types.ts
@@ -5,33 +5,33 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   SavedObjectsClientContract,
   IScopedClusterClient,
   Logger,
   IBasePath,
-} from 'src/core/server';
-import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
-import { ObservabilityPluginSetup } from '../../../../../observability/server';
+} from '@kbn/core/server';
+import type { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server';
+import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';
 import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../../../../encrypted_saved_objects/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../task_manager/server';
-import { UMKibanaRoute } from '../../../rest_api';
-import { PluginSetupContract } from '../../../../../features/server';
-import { MlPluginSetup as MlSetup } from '../../../../../ml/server';
-import { RuleRegistryPluginSetupContract } from '../../../../../rule_registry/server';
+} from '@kbn/task-manager-plugin/server';
+import { PluginSetupContract } from '@kbn/features-plugin/server';
+import { MlPluginSetup as MlSetup } from '@kbn/ml-plugin/server';
+import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { FleetStartContract } from '@kbn/fleet-plugin/server';
 import { UptimeESClient } from '../../lib';
 import type { TelemetryEventsSender } from '../../telemetry/sender';
 import type { UptimeRouter } from '../../../types';
-import { SecurityPluginStart } from '../../../../../security/server';
-import { CloudSetup } from '../../../../../cloud/server';
-import { FleetStartContract } from '../../../../../fleet/server';
+import { UMKibanaRoute } from '../../../rest_api';
 import { UptimeConfig } from '../../../../common/config';
 import { SyntheticsService } from '../../synthetics_service/synthetics_service';
 
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/index.ts b/x-pack/plugins/synthetics/server/lib/adapters/framework/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/adapters/framework/index.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/framework/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/synthetics/server/lib/adapters/framework/kibana_framework_adapter.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/framework/kibana_framework_adapter.ts
diff --git a/x-pack/plugins/uptime/server/lib/adapters/index.ts b/x-pack/plugins/synthetics/server/lib/adapters/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/adapters/index.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/__snapshots__/kibana_telemetry_adapter.test.ts.snap b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/__snapshots__/kibana_telemetry_adapter.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/adapters/telemetry/__snapshots__/kibana_telemetry_adapter.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/adapters/telemetry/__snapshots__/kibana_telemetry_adapter.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/index.ts b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/adapters/telemetry/index.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/telemetry/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
index 70385698ca6e0..62d38ec3678bb 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { KibanaTelemetryAdapter } from './kibana_telemetry_adapter';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 jest
   .spyOn(KibanaTelemetryAdapter, 'countNoOfUniqueMonitorAndLocations')
   .mockResolvedValue(undefined as any);
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
index de09c686d4441..2a3bc50c3ba15 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
+++ b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
@@ -6,8 +6,8 @@
  */
 
 import moment from 'moment';
-import { SavedObjectsClientContract } from 'kibana/server';
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { PageViewParams, UptimeTelemetry, Usage } from './types';
 import { savedObjectsAdapter } from '../../saved_objects/saved_objects';
 import { UptimeESClient, createUptimeESClient } from '../../lib';
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts b/x-pack/plugins/synthetics/server/lib/adapters/telemetry/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
rename to x-pack/plugins/synthetics/server/lib/adapters/telemetry/types.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/action_variables.ts b/x-pack/plugins/synthetics/server/lib/alerts/action_variables.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/action_variables.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/action_variables.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/common.test.ts b/x-pack/plugins/synthetics/server/lib/alerts/common.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/common.test.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/common.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/common.ts b/x-pack/plugins/synthetics/server/lib/alerts/common.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/alerts/common.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/common.ts
index 542aaa27819a3..8381adce21d2c 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/common.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/common.ts
@@ -7,7 +7,7 @@
 
 import { isRight } from 'fp-ts/lib/Either';
 import Mustache from 'mustache';
-import { IBasePath } from 'kibana/server';
+import { IBasePath } from '@kbn/core/server';
 import { UptimeCommonState, UptimeCommonStateType } from '../../../common/runtime_types';
 
 export type UpdateUptimeAlertState = (
diff --git a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts b/x-pack/plugins/synthetics/server/lib/alerts/duration_anomaly.test.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/duration_anomaly.test.ts
index 2848df14776b5..eb4509850414b 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/duration_anomaly.test.ts
@@ -11,10 +11,10 @@ import {
 } from '@kbn/rule-data-utils';
 import { durationAnomalyAlertFactory } from './duration_anomaly';
 import { DURATION_ANOMALY } from '../../../common/constants/alerts';
-import { AnomaliesTableRecord, AnomalyRecordDoc } from '../../../../ml/common/types/anomalies';
+import { AnomaliesTableRecord, AnomalyRecordDoc } from '@kbn/ml-plugin/common/types/anomalies';
 import { DynamicSettings } from '../../../common/runtime_types';
 import { createRuleTypeMocks, bootstrapDependencies } from './test_utils';
-import { getSeverityType } from '../../../../ml/common/util/anomaly_utils';
+import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
 import { Ping } from '../../../common/runtime_types/ping';
 import { ALERT_REASON_MSG, VIEW_IN_APP_URL } from './action_variables';
 
diff --git a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts b/x-pack/plugins/synthetics/server/lib/alerts/duration_anomaly.ts
similarity index 95%
rename from x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/duration_anomaly.ts
index d1e83c917d6f7..db50b5cf4bdbc 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/duration_anomaly.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
 import {
@@ -12,12 +12,12 @@ import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { ActionGroupIdsOf } from '../../../../alerting/common';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { AnomaliesTableRecord } from '@kbn/ml-plugin/common/types/anomalies';
+import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
 import { updateState, generateAlertMessage, getViewInAppUrl } from './common';
 import { DURATION_ANOMALY } from '../../../common/constants/alerts';
 import { commonStateTranslations, durationAnomalyTranslations } from './translations';
-import { AnomaliesTableRecord } from '../../../../ml/common/types/anomalies';
-import { getSeverityType } from '../../../../ml/common/util/anomaly_utils';
 import { UptimeCorePluginsSetup } from '../adapters/framework';
 import { UptimeAlertTypeFactory } from './types';
 import { Ping } from '../../../common/runtime_types/ping';
diff --git a/x-pack/plugins/uptime/server/lib/alerts/index.ts b/x-pack/plugins/synthetics/server/lib/alerts/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/index.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/status_check.test.ts b/x-pack/plugins/synthetics/server/lib/alerts/status_check.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/status_check.test.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/status_check.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts b/x-pack/plugins/synthetics/server/lib/alerts/status_check.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/alerts/status_check.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/status_check.ts
index 007ad8672eb2f..f1f00a8f7491f 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/status_check.ts
@@ -12,6 +12,8 @@ import { i18n } from '@kbn/i18n';
 import { JsonObject } from '@kbn/utility-types';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { formatDurationFromTimeUnitChar, TimeUnitChar } from '@kbn/observability-plugin/common';
 import { UptimeAlertTypeFactory } from './types';
 import {
   StatusCheckFilters,
@@ -35,8 +37,6 @@ import {
 import { UNNAMED_LOCATION } from '../../../common/constants';
 import { getUptimeIndexPattern, IndexPatternTitleAndFields } from '../requests/get_index_pattern';
 import { UMServerLibs, UptimeESClient, createUptimeESClient } from '../lib';
-import { ActionGroupIdsOf } from '../../../../alerting/common';
-import { formatDurationFromTimeUnitChar, TimeUnitChar } from '../../../../observability/common';
 import {
   ALERT_REASON_MSG,
   MESSAGE,
diff --git a/x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts b/x-pack/plugins/synthetics/server/lib/alerts/test_utils/index.ts
similarity index 91%
rename from x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/test_utils/index.ts
index e1a5da32c5fe4..af248af730eee 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/test_utils/index.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IBasePath, Logger } from 'kibana/server';
+import { IBasePath, Logger } from '@kbn/core/server';
+import type { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { UMServerLibs } from '../../lib';
 import { UptimeCorePluginsSetup, UptimeServerSetup } from '../../adapters';
 import type { UptimeRouter } from '../../../types';
-import type { IRuleDataClient } from '../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../rule_registry/server/mocks';
 import { getUptimeESMockClient } from '../../requests/helper';
-import { alertsMock } from '../../../../../alerting/server/mocks';
 import { DynamicSettings } from '../../../../common/runtime_types';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/uptime/server/lib/alerts/tls.test.ts b/x-pack/plugins/synthetics/server/lib/alerts/tls.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/tls.test.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/tls.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/tls.ts b/x-pack/plugins/synthetics/server/lib/alerts/tls.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/alerts/tls.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/tls.ts
index 29e02080b2b51..55f7d3f972861 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/tls.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/tls.ts
@@ -7,6 +7,7 @@
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
 import { UptimeAlertTypeFactory } from './types';
 import { updateState, generateAlertMessage } from './common';
 import { TLS } from '../../../common/constants/alerts';
@@ -15,8 +16,6 @@ import { Cert, CertResult } from '../../../common/runtime_types';
 import { commonStateTranslations, tlsTranslations } from './translations';
 import { TlsTranslations } from '../../../common/translations';
 
-import { ActionGroupIdsOf } from '../../../../alerting/common';
-
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 import { createUptimeESClient } from '../lib';
 
diff --git a/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.test.ts b/x-pack/plugins/synthetics/server/lib/alerts/tls_legacy.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/tls_legacy.test.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/tls_legacy.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts b/x-pack/plugins/synthetics/server/lib/alerts/tls_legacy.ts
similarity index 96%
rename from x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/tls_legacy.ts
index e662160bef3e0..0490477cb24d1 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/tls_legacy.ts
@@ -7,16 +7,15 @@
 
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { AlertInstanceContext } from '@kbn/alerting-plugin/common';
+import { Alert } from '@kbn/alerting-plugin/server';
 import { UptimeAlertTypeFactory } from './types';
 import { updateState } from './common';
 import { TLS_LEGACY } from '../../../common/constants/alerts';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
 import { Cert, CertResult } from '../../../common/runtime_types';
 import { commonStateTranslations, tlsTranslations } from './translations';
-import { ActionGroupIdsOf } from '../../../../alerting/common';
-
-import { AlertInstanceContext } from '../../../../alerting/common';
-import { Alert } from '../../../../alerting/server';
 
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 import { createUptimeESClient } from '../lib';
diff --git a/x-pack/plugins/uptime/server/lib/alerts/translations.ts b/x-pack/plugins/synthetics/server/lib/alerts/translations.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/alerts/translations.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/translations.ts
diff --git a/x-pack/plugins/uptime/server/lib/alerts/types.ts b/x-pack/plugins/synthetics/server/lib/alerts/types.ts
similarity index 84%
rename from x-pack/plugins/uptime/server/lib/alerts/types.ts
rename to x-pack/plugins/synthetics/server/lib/alerts/types.ts
index b100965db7a73..50f3afd7d8aba 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/types.ts
+++ b/x-pack/plugins/synthetics/server/lib/alerts/types.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { UptimeCorePluginsSetup, UptimeServerSetup } from '../adapters';
+import { AlertTypeWithExecutor } from '@kbn/rule-registry-plugin/server';
+import { AlertInstanceContext, RuleTypeState } from '@kbn/alerting-plugin/common';
+import { LifecycleAlertService } from '@kbn/rule-registry-plugin/server';
 import { UMServerLibs } from '../lib';
-import { AlertTypeWithExecutor } from '../../../../rule_registry/server';
-import { AlertInstanceContext, RuleTypeState } from '../../../../alerting/common';
-import { LifecycleAlertService } from '../../../../rule_registry/server';
+import { UptimeCorePluginsSetup, UptimeServerSetup } from '../adapters';
 
 /**
  * Because all of our types are presumably going to list the `producer` as `'uptime'`,
diff --git a/x-pack/plugins/uptime/server/lib/compose/kibana.ts b/x-pack/plugins/synthetics/server/lib/compose/kibana.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/compose/kibana.ts
rename to x-pack/plugins/synthetics/server/lib/compose/kibana.ts
diff --git a/x-pack/plugins/uptime/server/lib/domains/__snapshots__/license.test.ts.snap b/x-pack/plugins/synthetics/server/lib/domains/__snapshots__/license.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/domains/__snapshots__/license.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/domains/__snapshots__/license.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/domains/index.ts b/x-pack/plugins/synthetics/server/lib/domains/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/domains/index.ts
rename to x-pack/plugins/synthetics/server/lib/domains/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/domains/license.test.ts b/x-pack/plugins/synthetics/server/lib/domains/license.test.ts
similarity index 95%
rename from x-pack/plugins/uptime/server/lib/domains/license.test.ts
rename to x-pack/plugins/synthetics/server/lib/domains/license.test.ts
index 80bd0ff3fe3da..23906d077e549 100644
--- a/x-pack/plugins/uptime/server/lib/domains/license.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/domains/license.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { licenseCheck } from './license';
 
 describe('license check', () => {
diff --git a/x-pack/plugins/uptime/server/lib/domains/license.ts b/x-pack/plugins/synthetics/server/lib/domains/license.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/lib/domains/license.ts
rename to x-pack/plugins/synthetics/server/lib/domains/license.ts
index a64213a44fc0b..d921766529e8f 100644
--- a/x-pack/plugins/uptime/server/lib/domains/license.ts
+++ b/x-pack/plugins/synthetics/server/lib/domains/license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 export interface UMLicenseStatusResponse {
   statusCode: number;
diff --git a/x-pack/plugins/uptime/server/lib/helper/__snapshots__/get_filter_clause.test.ts.snap b/x-pack/plugins/synthetics/server/lib/helper/__snapshots__/get_filter_clause.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/__snapshots__/get_filter_clause.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/helper/__snapshots__/get_filter_clause.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/helper/get_filter_clause.test.ts b/x-pack/plugins/synthetics/server/lib/helper/get_filter_clause.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/get_filter_clause.test.ts
rename to x-pack/plugins/synthetics/server/lib/helper/get_filter_clause.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/helper/get_filter_clause.ts b/x-pack/plugins/synthetics/server/lib/helper/get_filter_clause.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/get_filter_clause.ts
rename to x-pack/plugins/synthetics/server/lib/helper/get_filter_clause.ts
diff --git a/x-pack/plugins/uptime/server/lib/helper/index.ts b/x-pack/plugins/synthetics/server/lib/helper/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/index.ts
rename to x-pack/plugins/synthetics/server/lib/helper/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/helper/make_date_rate_filter.ts b/x-pack/plugins/synthetics/server/lib/helper/make_date_rate_filter.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/make_date_rate_filter.ts
rename to x-pack/plugins/synthetics/server/lib/helper/make_date_rate_filter.ts
diff --git a/x-pack/plugins/uptime/server/lib/helper/object_to_array.ts b/x-pack/plugins/synthetics/server/lib/helper/object_to_array.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/object_to_array.ts
rename to x-pack/plugins/synthetics/server/lib/helper/object_to_array.ts
diff --git a/x-pack/plugins/uptime/server/lib/helper/parse_relative_date.test.ts b/x-pack/plugins/synthetics/server/lib/helper/parse_relative_date.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/helper/parse_relative_date.test.ts
rename to x-pack/plugins/synthetics/server/lib/helper/parse_relative_date.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/lib.ts b/x-pack/plugins/synthetics/server/lib/lib.ts
similarity index 93%
rename from x-pack/plugins/uptime/server/lib/lib.ts
rename to x-pack/plugins/synthetics/server/lib/lib.ts
index 8b5761900e487..d4bcad0bb1f70 100644
--- a/x-pack/plugins/uptime/server/lib/lib.ts
+++ b/x-pack/plugins/synthetics/server/lib/lib.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract, KibanaRequest } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract, KibanaRequest } from '@kbn/core/server';
 import chalk from 'chalk';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { RequestStatus } from '@kbn/inspector-plugin';
+import { getInspectResponse } from '@kbn/observability-plugin/server';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
 import { UMBackendFrameworkAdapter } from './adapters';
 import { UMLicenseCheck } from './domains';
 import { UptimeRequests } from './requests';
 import { savedObjectsAdapter } from './saved_objects/saved_objects';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
-import { RequestStatus } from '../../../../../src/plugins/inspector';
-import { getInspectResponse } from '../../../observability/server';
-import { InspectResponse } from '../../../observability/typings/common';
 
 export interface UMDomainLibs {
   requests: UptimeRequests;
diff --git a/x-pack/plugins/uptime/server/lib/requests/__fixtures__/monitor_charts_mock.json b/x-pack/plugins/synthetics/server/lib/requests/__fixtures__/monitor_charts_mock.json
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/__fixtures__/monitor_charts_mock.json
rename to x-pack/plugins/synthetics/server/lib/requests/__fixtures__/monitor_charts_mock.json
diff --git a/x-pack/plugins/uptime/server/lib/requests/__snapshots__/generate_filter_aggs.test.ts.snap b/x-pack/plugins/synthetics/server/lib/requests/__snapshots__/generate_filter_aggs.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/__snapshots__/generate_filter_aggs.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/requests/__snapshots__/generate_filter_aggs.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_charts.test.ts.snap b/x-pack/plugins/synthetics/server/lib/requests/__snapshots__/get_monitor_charts.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_charts.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/requests/__snapshots__/get_monitor_charts.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap b/x-pack/plugins/synthetics/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_ping_histogram.test.ts.snap b/x-pack/plugins/synthetics/server/lib/requests/__snapshots__/get_ping_histogram.test.ts.snap
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_ping_histogram.test.ts.snap
rename to x-pack/plugins/synthetics/server/lib/requests/__snapshots__/get_ping_histogram.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/requests/generate_filter_aggs.test.ts b/x-pack/plugins/synthetics/server/lib/requests/generate_filter_aggs.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/generate_filter_aggs.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/generate_filter_aggs.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/generate_filter_aggs.ts b/x-pack/plugins/synthetics/server/lib/requests/generate_filter_aggs.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/generate_filter_aggs.ts
rename to x-pack/plugins/synthetics/server/lib/requests/generate_filter_aggs.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_certs.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_certs.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_certs.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_certs.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_certs.ts b/x-pack/plugins/synthetics/server/lib/requests/get_certs.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_certs.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_certs.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts b/x-pack/plugins/synthetics/server/lib/requests/get_index_pattern.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_index_pattern.ts
index e79779133e78c..fbee794b4f3d8 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
+++ b/x-pack/plugins/synthetics/server/lib/requests/get_index_pattern.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FieldDescriptor, IndexPatternsFetcher } from '../../../../../../src/plugins/data/server';
+import { FieldDescriptor, IndexPatternsFetcher } from '@kbn/data-plugin/server';
 import { UptimeESClient } from '../lib';
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts b/x-pack/plugins/synthetics/server/lib/requests/get_index_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_index_status.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_details.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_details.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_details.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_details.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_details.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_details.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_failed_steps.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_failed_steps.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_failed_steps.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_failed_steps.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot_blocks.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot_blocks.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot_blocks.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot_blocks.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot_blocks.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot_blocks.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot_blocks.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_screenshot_blocks.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_steps.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_steps.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_steps.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts b/x-pack/plugins/synthetics/server/lib/requests/get_journey_steps.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_journey_steps.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_last_successful_check.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_last_successful_check.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_last_successful_check.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_last_successful_check.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_last_successful_check.ts b/x-pack/plugins/synthetics/server/lib/requests/get_last_successful_check.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_last_successful_check.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_last_successful_check.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_latest_monitor.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_latest_monitor.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/synthetics/server/lib/requests/get_latest_monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_latest_monitor.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor.ts
similarity index 79%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor.ts
index b74852d581311..f8b01b63e88e6 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor.ts
+++ b/x-pack/plugins/synthetics/server/lib/requests/get_monitor.ts
@@ -5,16 +5,13 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsClientContract } from 'kibana/server';
-import { EncryptedSavedObjectsClient } from '../../../../encrypted_saved_objects/server';
+import { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import {
   SyntheticsMonitorWithSecrets,
   EncryptedSyntheticsMonitor,
 } from '../../../common/runtime_types';
-import {
-  syntheticsMonitor,
-  syntheticsMonitorType,
-} from '../../lib/saved_objects/synthetics_monitor';
+import { syntheticsMonitor, syntheticsMonitorType } from '../saved_objects/synthetics_monitor';
 
 export const getSyntheticsMonitor = async ({
   monitorId,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_availability.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_availability.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_availability.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_availability.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_charts.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_charts.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_charts.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_charts.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_details.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_details.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_details.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_details.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_details.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_duration.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_duration.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_locations.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_locations.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_states.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_states.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_status.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_status.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_status.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_status.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_monitor_status.ts
index f7ec023652d77..64e676b496350 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
+++ b/x-pack/plugins/synthetics/server/lib/requests/get_monitor_status.ts
@@ -8,13 +8,13 @@
 import { JsonObject } from '@kbn/utility-types';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { PromiseType } from 'utility-types';
+import { formatDurationFromTimeUnitChar, TimeUnitChar } from '@kbn/observability-plugin/common';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { Ping } from '../../../common/runtime_types/ping';
 import { createEsQuery } from '../../../common/utils/es_search';
 import { UptimeESClient } from '../lib';
 import { UNNAMED_LOCATION } from '../../../common/constants';
-import { formatDurationFromTimeUnitChar, TimeUnitChar } from '../../../../observability/common';
 
 export interface GetMonitorStatusParams {
   filters?: JsonObject;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_network_events.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_network_events.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_network_events.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_network_events.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts b/x-pack/plugins/synthetics/server/lib/requests/get_network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_network_events.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_ping_histogram.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_ping_histogram.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts b/x-pack/plugins/synthetics/server/lib/requests/get_ping_histogram.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_ping_histogram.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_pings.test.ts b/x-pack/plugins/synthetics/server/lib/requests/get_pings.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_pings.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_pings.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts b/x-pack/plugins/synthetics/server/lib/requests/get_pings.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/get_pings.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_pings.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts b/x-pack/plugins/synthetics/server/lib/requests/get_snapshot_counts.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
rename to x-pack/plugins/synthetics/server/lib/requests/get_snapshot_counts.ts
index 256219778048c..fa878bd7ac7bc 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
+++ b/x-pack/plugins/synthetics/server/lib/requests/get_snapshot_counts.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { CONTEXT_DEFAULTS } from '../../../common/constants';
 import { Snapshot } from '../../../common/runtime_types';
 import { QueryContext } from './search';
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
 import { EXCLUDE_RUN_ONCE_FILTER } from '../../../common/constants/client_defaults';
 
 export interface GetSnapshotCountParams {
diff --git a/x-pack/plugins/uptime/server/lib/requests/helper.ts b/x-pack/plugins/synthetics/server/lib/requests/helper.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/lib/requests/helper.ts
rename to x-pack/plugins/synthetics/server/lib/requests/helper.ts
index fbc838aa7c7dd..315b0bd3d0f96 100644
--- a/x-pack/plugins/uptime/server/lib/requests/helper.ts
+++ b/x-pack/plugins/synthetics/server/lib/requests/helper.ts
@@ -7,11 +7,8 @@
 
 import { AggregationsAggregate } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import {
-  elasticsearchServiceMock,
-  savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { createUptimeESClient, UptimeESClient } from '../lib';
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/index.ts b/x-pack/plugins/synthetics/server/lib/requests/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/index.ts
rename to x-pack/plugins/synthetics/server/lib/requests/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/fetch_chunk.ts b/x-pack/plugins/synthetics/server/lib/requests/search/fetch_chunk.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/fetch_chunk.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/fetch_chunk.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts b/x-pack/plugins/synthetics/server/lib/requests/search/find_potential_matches.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/find_potential_matches.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/index.ts b/x-pack/plugins/synthetics/server/lib/requests/search/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/index.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/monitor_summary_iterator.test.ts b/x-pack/plugins/synthetics/server/lib/requests/search/monitor_summary_iterator.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/monitor_summary_iterator.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/monitor_summary_iterator.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/monitor_summary_iterator.ts b/x-pack/plugins/synthetics/server/lib/requests/search/monitor_summary_iterator.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/monitor_summary_iterator.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/monitor_summary_iterator.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.test.ts b/x-pack/plugins/synthetics/server/lib/requests/search/query_context.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/query_context.test.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/query_context.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/synthetics/server/lib/requests/search/query_context.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/query_context.ts
index 17e254d3da800..6607c9912c468 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
+++ b/x-pack/plugins/synthetics/server/lib/requests/search/query_context.ts
@@ -6,10 +6,10 @@
  */
 
 import moment from 'moment';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { CursorPagination } from './types';
 import { CursorDirection, SortOrder } from '../../../../common/runtime_types';
 import { UptimeESClient } from '../../lib';
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
 import { parseRelativeDate } from '../../../../common/lib/get_histogram_interval';
 
 export class QueryContext {
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts b/x-pack/plugins/synthetics/server/lib/requests/search/refine_potential_matches.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/refine_potential_matches.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/test_helpers.ts b/x-pack/plugins/synthetics/server/lib/requests/search/test_helpers.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/test_helpers.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/test_helpers.ts
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/types.ts b/x-pack/plugins/synthetics/server/lib/requests/search/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/requests/search/types.ts
rename to x-pack/plugins/synthetics/server/lib/requests/search/types.ts
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/index.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/saved_objects/index.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/migrations.test.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/migrations.test.ts
index 172e549cc05fa..e07580011767c 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/saved_objects/migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { add820Indices } from './migrations';
-import { SavedObject, SavedObjectMigrationContext } from 'src/core/server';
+import { SavedObject, SavedObjectMigrationContext } from '@kbn/core/server';
 import { DynamicSettings } from '../../../common/runtime_types';
 
 describe('add820Indices migration', () => {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/migrations.ts
similarity index 93%
rename from x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/migrations.ts
index 211e58db9784e..01e83fc72d87c 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts
+++ b/x-pack/plugins/synthetics/server/lib/saved_objects/migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { DynamicSettings } from '../../../common/runtime_types';
 
 export const add820Indices: SavedObjectMigrationFn<DynamicSettings, DynamicSettings> = (doc) => {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/saved_objects.ts
similarity index 93%
rename from x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/saved_objects.ts
index 74f3a4a8f7366..136df1fca14c6 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
+++ b/x-pack/plugins/synthetics/server/lib/saved_objects/saved_objects.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  SavedObjectsErrorHelpers,
-  SavedObjectsServiceSetup,
-} from '../../../../../../src/core/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../../../encrypted_saved_objects/server';
+import { SavedObjectsErrorHelpers, SavedObjectsServiceSetup } from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
 import { secretKeys } from '../../../common/constants/monitor_management';
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/service_api_key.ts
similarity index 93%
rename from x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/service_api_key.ts
index 43fee5ecd6dad..1486c65f07b1a 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts
+++ b/x-pack/plugins/synthetics/server/lib/saved_objects/service_api_key.ts
@@ -10,9 +10,9 @@ import {
   SavedObjectsClientContract,
   SavedObjectsErrorHelpers,
   SavedObjectsType,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import { SyntheticsServiceApiKey } from '../../../common/runtime_types/synthetics_service_api_key';
-import { EncryptedSavedObjectsClient } from '../../../../encrypted_saved_objects/server';
 
 export const syntheticsApiKeyID = 'ba997842-b0cf-4429-aa9d-578d9bf0d391';
 export const syntheticsApiKeyObjectType = 'uptime-synthetics-api-key';
@@ -20,7 +20,7 @@ export const syntheticsApiKeyObjectType = 'uptime-synthetics-api-key';
 export const syntheticsServiceApiKey: SavedObjectsType = {
   name: syntheticsApiKeyObjectType,
   hidden: true,
-  namespaceType: 'single',
+  namespaceType: 'agnostic',
   mappings: {
     dynamic: false,
     properties: {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/synthetics_monitor.ts
similarity index 63%
rename from x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/synthetics_monitor.ts
index ea20c4c9232e9..306f6ee689a38 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts
+++ b/x-pack/plugins/synthetics/server/lib/saved_objects/synthetics_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 
 export const syntheticsMonitorType = 'synthetics-monitor';
@@ -18,27 +18,36 @@ export const syntheticsMonitor: SavedObjectsType = {
     dynamic: false,
     properties: {
       name: {
-        type: 'keyword',
-      },
-      id: {
-        type: 'keyword',
+        type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
       },
       type: {
-        type: 'keyword',
+        type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
       },
       urls: {
-        type: 'keyword',
-      },
-      tags: {
-        type: 'keyword',
-      },
-      secrets: {
         type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
       },
     },
   },
   management: {
-    importableAndExportable: true,
+    importableAndExportable: false,
     icon: 'uptimeApp',
     getTitle: (savedObject) =>
       savedObject.attributes.name +
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts b/x-pack/plugins/synthetics/server/lib/saved_objects/uptime_settings.ts
similarity index 96%
rename from x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts
rename to x-pack/plugins/synthetics/server/lib/saved_objects/uptime_settings.ts
index 4ed7887049c9b..e8307256ddb2c 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts
+++ b/x-pack/plugins/synthetics/server/lib/saved_objects/uptime_settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { add820Indices } from './migrations';
 
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/browser.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/browser.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/browser.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/browser.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/common.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/common.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/common.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/common.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/convert_to_data_stream.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/convert_to_data_stream.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/convert_to_data_stream.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/convert_to_data_stream.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/convert_to_data_stream.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/convert_to_data_stream.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/convert_to_data_stream.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/convert_to_data_stream.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/format_configs.test.ts
similarity index 99%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/format_configs.test.ts
index 815a02b9d4b3a..a54e777c13eee 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/format_configs.test.ts
@@ -53,7 +53,6 @@ describe('formatMonitorConfig', () => {
       expect(yamlConfig).toEqual({
         'check.request.method': 'GET',
         enabled: true,
-        locations: [],
         max_redirects: '0',
         name: 'Test',
         password: '3z9SBOQWW5F0UrdqLVFqlF6z',
@@ -110,7 +109,6 @@ describe('formatMonitorConfig', () => {
         enabled: true,
         'filter_journeys.tags': ['dev'],
         ignore_https_errors: false,
-        locations: [],
         name: 'Test',
         schedule: '@every 3m',
         screenshots: 'on',
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/format_configs.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/format_configs.ts
index 5743d05429799..f3b9787ce628d 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/format_configs.ts
@@ -7,7 +7,7 @@
 
 import { isNil, omitBy } from 'lodash';
 import { ConfigKey, MonitorFields } from '../../../../common/runtime_types';
-import { formatters } from './index';
+import { formatters } from '.';
 
 const UI_KEYS_TO_SKIP = [
   ConfigKey.METADATA,
@@ -15,6 +15,9 @@ const UI_KEYS_TO_SKIP = [
   ConfigKey.DOWNLOAD_SPEED,
   ConfigKey.LATENCY,
   ConfigKey.IS_THROTTLING_ENABLED,
+  ConfigKey.LOCATIONS,
+  ConfigKey.REVISION,
+  'secrets',
 ];
 
 const uiToHeartbeatKeyMap = {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/http.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/http.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/http.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/http.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/icmp.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/icmp.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/icmp.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/icmp.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/index.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/index.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/tcp.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/tcp.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/tcp.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/tcp.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/tls.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/tls.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/formatters/tls.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/tls.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_api_key.test.ts
similarity index 88%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/get_api_key.test.ts
index 7ad3d0b1e2e67..ffc24f93c57ff 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_api_key.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { getAPIKeyForSyntheticsService } from './get_api_key';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
-import { coreMock } from '../../../../../../src/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { syntheticsServiceApiKey } from '../saved_objects/service_api_key';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { UptimeServerSetup } from '../adapters';
 import { getUptimeESMockClient } from '../requests/helper';
 
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_api_key.ts
similarity index 96%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/get_api_key.ts
index 766f26a0aeca7..1552edd94843d 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_api_key.ts
@@ -8,9 +8,9 @@ import type {
   SecurityClusterPrivilege,
   SecurityIndexPrivilege,
 } from '@elastic/elasticsearch/lib/api/types';
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 
-import { SecurityPluginStart } from '../../../../security/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   getSyntheticsServiceAPIKey,
   deleteSyntheticsServiceApiKey,
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_es_hosts.test.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/get_es_hosts.test.ts
index d9795219ede28..0e198b000e6ea 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_es_hosts.test.ts
@@ -13,7 +13,7 @@
  */
 
 import { getEsHosts } from './get_es_hosts';
-import { CloudSetup } from '../../../../cloud/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 
 describe('getEsHostsTest', () => {
   const cloudSetup = {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_es_hosts.ts
similarity index 90%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/get_es_hosts.ts
index 847fcfa9db834..7cf2d04af7b80 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_es_hosts.ts
@@ -12,8 +12,8 @@
  * 2.0.
  */
 
-import { CloudSetup } from '../../../../cloud/server';
-import { decodeCloudId } from '../../../../fleet/common';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { decodeCloudId } from '@kbn/fleet-plugin/common';
 import { ServiceConfig } from '../../../common/config';
 
 export function getEsHosts({
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_service_locations.test.ts
similarity index 95%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/get_service_locations.test.ts
index 82fe06f36d533..9151a1dcac6ad 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_service_locations.test.ts
@@ -18,7 +18,6 @@ describe('getServiceLocations', function () {
       throttling: {
         [BandwidthLimitKey.DOWNLOAD]: 100,
         [BandwidthLimitKey.UPLOAD]: 50,
-        [BandwidthLimitKey.LATENCY]: 20,
       },
       locations: {
         us_central: {
@@ -50,7 +49,6 @@ describe('getServiceLocations', function () {
       throttling: {
         [BandwidthLimitKey.DOWNLOAD]: 100,
         [BandwidthLimitKey.UPLOAD]: 50,
-        [BandwidthLimitKey.LATENCY]: 20,
       },
       locations: [
         {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_service_locations.ts
similarity index 96%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/get_service_locations.ts
index 50ecfe38d20dd..45dd0ded1438d 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/get_service_locations.ts
@@ -54,8 +54,7 @@ export async function getServiceLocations(server: UptimeServerSetup) {
     const throttling = pick(
       data.throttling,
       BandwidthLimitKey.DOWNLOAD,
-      BandwidthLimitKey.UPLOAD,
-      BandwidthLimitKey.LATENCY
+      BandwidthLimitKey.UPLOAD
     ) as ThrottlingOptions;
 
     return { throttling, locations };
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/hydrate_saved_object.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/hydrate_saved_object.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/hydrate_saved_object.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/hydrate_saved_object.ts
index 6002d1bd8f1ec..d595bfaa5400e 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/hydrate_saved_object.ts
@@ -10,6 +10,7 @@ import { UptimeESClient } from '../lib';
 import { UptimeServerSetup } from '../adapters';
 import { DecryptedSyntheticsMonitorSavedObject } from '../../../common/types';
 import { SyntheticsMonitor, MonitorFields, Ping } from '../../../common/runtime_types';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../common/constants';
 
 export const hydrateSavedObjects = async ({
   monitors,
@@ -125,7 +126,7 @@ const fetchSampleMonitorDocuments = async (esClient: UptimeESClient, configIds:
       },
     },
     'getHydrateQuery',
-    'synthetics-*'
+    SYNTHETICS_INDEX_PATTERN
   );
 
   return data.body.hits.hits.map(
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/service_api_client.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/service_api_client.ts
index 3397dcad94e95..2cfd14b7ebe01 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/service_api_client.ts
@@ -10,7 +10,7 @@ import { forkJoin, from as rxjsFrom, Observable, of } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 import * as https from 'https';
 import { SslConfig } from '@kbn/server-http-tools';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   MonitorFields,
   ServiceLocations,
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/synthetics_service.test.ts
similarity index 95%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/synthetics_service.test.ts
index 6cfe4cb837ded..788e726c40d4f 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/synthetics_service.test.ts
@@ -7,7 +7,7 @@
 
 import { SyntheticsService } from './synthetics_service';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { loggerMock } from './../../../../../../src/core/server/logging/logger.mock';
+import { loggerMock } from '@kbn/core/server/logging/logger.mock';
 import { UptimeServerSetup } from '../adapters';
 
 describe('SyntheticsService', () => {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/synthetics_service.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/synthetics_service.ts
index c6fa280f2f163..083f0d9f6126c 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/synthetics_service.ts
@@ -7,14 +7,14 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { SavedObject } from 'kibana/server';
-import { KibanaRequest, Logger } from '../../../../../../src/core/server';
+import { SavedObject } from '@kbn/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
   TaskInstance,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { UptimeServerSetup } from '../adapters';
 import { installSyntheticsIndexTemplates } from '../../rest_api/synthetics_service/install_index_templates';
 import { SyntheticsServiceApiKey } from '../../../common/runtime_types/synthetics_service_api_key';
@@ -369,7 +369,10 @@ export class SyntheticsService {
       encryptedMonitors.map((monitor) =>
         encryptedClient.getDecryptedAsInternalUser<SyntheticsMonitorWithSecrets>(
           syntheticsMonitor.name,
-          monitor.id
+          monitor.id,
+          {
+            namespace: monitor.namespaces?.[0],
+          }
         )
       )
     );
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts b/x-pack/plugins/synthetics/server/lib/synthetics_service/utils/secrets.ts
similarity index 95%
rename from x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts
rename to x-pack/plugins/synthetics/server/lib/synthetics_service/utils/secrets.ts
index 7848dbedb7fed..7aa7aa8f32f40 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts
+++ b/x-pack/plugins/synthetics/server/lib/synthetics_service/utils/secrets.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { omit, pick } from 'lodash';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { secretKeys } from '../../../../common/constants/monitor_management';
 import {
   SyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/__mocks__/index.ts b/x-pack/plugins/synthetics/server/lib/telemetry/__mocks__/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/telemetry/__mocks__/index.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/__mocks__/index.ts
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/constants.ts b/x-pack/plugins/synthetics/server/lib/telemetry/constants.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/telemetry/constants.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/constants.ts
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/queue.test.ts b/x-pack/plugins/synthetics/server/lib/telemetry/queue.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/telemetry/queue.test.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/queue.test.ts
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/queue.ts b/x-pack/plugins/synthetics/server/lib/telemetry/queue.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/telemetry/queue.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/queue.ts
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts b/x-pack/plugins/synthetics/server/lib/telemetry/sender.test.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/sender.test.ts
index 5a7a69cbcd995..df1ceabaaadab 100644
--- a/x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts
+++ b/x-pack/plugins/synthetics/server/lib/telemetry/sender.test.ts
@@ -13,7 +13,7 @@ import axios from 'axios';
 
 import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { MONITOR_UPDATE_CHANNEL } from './constants';
 
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/sender.ts b/x-pack/plugins/synthetics/server/lib/telemetry/sender.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/lib/telemetry/sender.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/sender.ts
index 296bc2af2f71f..7a5239d7e2470 100644
--- a/x-pack/plugins/uptime/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/synthetics/server/lib/telemetry/sender.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreStart, ElasticsearchClient, Logger } from 'src/core/server';
-import type { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
+import type { CoreStart, ElasticsearchClient, Logger } from '@kbn/core/server';
+import type { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 
 import { cloneDeep } from 'lodash';
 
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/types.ts b/x-pack/plugins/synthetics/server/lib/telemetry/types.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/lib/telemetry/types.ts
rename to x-pack/plugins/synthetics/server/lib/telemetry/types.ts
diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/synthetics/server/plugin.ts
similarity index 93%
rename from x-pack/plugins/uptime/server/plugin.ts
rename to x-pack/plugins/synthetics/server/plugin.ts
index 13c05d0182119..7e7547913c373 100644
--- a/x-pack/plugins/uptime/server/plugin.ts
+++ b/x-pack/plugins/synthetics/server/plugin.ts
@@ -12,7 +12,10 @@ import {
   Logger,
   SavedObjectsClient,
   SavedObjectsClientContract,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
+import { Dataset } from '@kbn/rule-registry-plugin/server';
 import { uptimeRuleFieldMap } from '../common/rules/uptime_rule_field_map';
 import { initServerWithKibana } from './kibana.index';
 import {
@@ -23,9 +26,6 @@ import {
 } from './lib/adapters';
 import { TelemetryEventsSender } from './lib/telemetry/sender';
 import { registerUptimeSavedObjects, savedObjectsAdapter } from './lib/saved_objects/saved_objects';
-import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { experimentalRuleFieldMap } from '../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
-import { Dataset } from '../../rule_registry/server';
 import { UptimeConfig } from '../common/config';
 import { SyntheticsService } from './lib/synthetics_service/synthetics_service';
 import { syntheticsServiceApiKey } from './lib/saved_objects/service_api_key';
diff --git a/x-pack/plugins/uptime/server/rest_api/create_route_with_auth.ts b/x-pack/plugins/synthetics/server/rest_api/create_route_with_auth.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/rest_api/create_route_with_auth.ts
rename to x-pack/plugins/synthetics/server/rest_api/create_route_with_auth.ts
index c3d7c693ef00a..20bb6043e624f 100644
--- a/x-pack/plugins/uptime/server/rest_api/create_route_with_auth.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/create_route_with_auth.ts
@@ -22,7 +22,7 @@ export const createRouteWithAuth = (
     savedObjectsClient,
     server,
   }) => {
-    const { statusCode, message } = libs.license(context.licensing.license);
+    const { statusCode, message } = libs.license((await context.licensing).license);
     if (statusCode === 200) {
       return handler({
         uptimeEsClient,
diff --git a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.test.ts b/x-pack/plugins/synthetics/server/rest_api/dynamic_settings.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/dynamic_settings.test.ts
rename to x-pack/plugins/synthetics/server/rest_api/dynamic_settings.test.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts b/x-pack/plugins/synthetics/server/rest_api/dynamic_settings.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
rename to x-pack/plugins/synthetics/server/rest_api/dynamic_settings.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/index.ts b/x-pack/plugins/synthetics/server/rest_api/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts b/x-pack/plugins/synthetics/server/rest_api/index_state/get_index_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
rename to x-pack/plugins/synthetics/server/rest_api/index_state/get_index_status.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/index_state/index.ts b/x-pack/plugins/synthetics/server/rest_api/index_state/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/index_state/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/index_state/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/index.ts b/x-pack/plugins/synthetics/server/rest_api/monitors/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/monitors/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/monitors/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts b/x-pack/plugins/synthetics/server/rest_api/monitors/monitor_list.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
rename to x-pack/plugins/synthetics/server/rest_api/monitors/monitor_list.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_locations.ts b/x-pack/plugins/synthetics/server/rest_api/monitors/monitor_locations.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
rename to x-pack/plugins/synthetics/server/rest_api/monitors/monitor_locations.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_status.ts b/x-pack/plugins/synthetics/server/rest_api/monitors/monitor_status.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/monitors/monitor_status.ts
rename to x-pack/plugins/synthetics/server/rest_api/monitors/monitor_status.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/plugins/synthetics/server/rest_api/monitors/monitors_details.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
rename to x-pack/plugins/synthetics/server/rest_api/monitors/monitors_details.ts
index 64e9ed504e7cd..bed10c5cda9a7 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/monitors/monitors_details.ts
@@ -23,7 +23,7 @@ export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServ
   handler: async ({ uptimeEsClient, context, request }): Promise<any> => {
     const { monitorId, dateStart, dateEnd } = request.query;
 
-    const rulesClient = context.alerting?.getRulesClient();
+    const rulesClient = (await context.alerting)?.getRulesClient();
 
     return await libs.requests.getMonitorDetails({
       uptimeEsClient,
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts b/x-pack/plugins/synthetics/server/rest_api/monitors/monitors_durations.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
rename to x-pack/plugins/synthetics/server/rest_api/monitors/monitors_durations.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/network_events/get_network_events.ts b/x-pack/plugins/synthetics/server/rest_api/network_events/get_network_events.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/network_events/get_network_events.ts
rename to x-pack/plugins/synthetics/server/rest_api/network_events/get_network_events.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/network_events/index.ts b/x-pack/plugins/synthetics/server/rest_api/network_events/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/network_events/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/network_events/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts b/x-pack/plugins/synthetics/server/rest_api/pings/get_ping_histogram.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/get_ping_histogram.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts b/x-pack/plugins/synthetics/server/rest_api/pings/get_pings.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/get_pings.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/index.ts b/x-pack/plugins/synthetics/server/rest_api/pings/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshot_blocks.test.ts b/x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshot_blocks.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/journey_screenshot_blocks.test.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshot_blocks.test.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshot_blocks.ts b/x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshot_blocks.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/journey_screenshot_blocks.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshot_blocks.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.test.ts b/x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshots.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.test.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshots.test.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.ts b/x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshots.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/journey_screenshots.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/journey_screenshots.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/journeys.ts b/x-pack/plugins/synthetics/server/rest_api/pings/journeys.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/pings/journeys.ts
rename to x-pack/plugins/synthetics/server/rest_api/pings/journeys.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts b/x-pack/plugins/synthetics/server/rest_api/snapshot/get_snapshot_count.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
rename to x-pack/plugins/synthetics/server/rest_api/snapshot/get_snapshot_count.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/snapshot/index.ts b/x-pack/plugins/synthetics/server/rest_api/snapshot/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/snapshot/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/snapshot/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_check.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics/last_successful_check.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_check.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics/last_successful_check.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/add_monitor.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/add_monitor.ts
index 521dae85e85db..598328349227d 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/add_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import {
   MonitorFields,
   SyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/delete_monitor.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/delete_monitor.ts
index 17f34b0d82ec0..dc6fc759e81a4 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/delete_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   EncryptedSyntheticsMonitor,
   SyntheticsMonitorWithSecrets,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/edit_monitor.ts
similarity index 96%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/edit_monitor.ts
index 9ad9084b72ba5..55be289f7162a 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/edit_monitor.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsUpdateResponse, SavedObject } from 'kibana/server';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsUpdateResponse, SavedObject } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   MonitorFields,
   EncryptedSyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/enablement.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/enablement.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/enablement.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/enablement.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_monitor.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_monitor.ts
index 824d453a6804e..556741c99f599 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_monitor.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { UMServerLibs } from '../../lib/lib';
 import { UMRestApiRouteFactory } from '../types';
 import { API_URLS } from '../../../common/constants';
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_service_allowed.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_service_allowed.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/get_service_allowed.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_service_allowed.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_service_locations.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_service_locations.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/get_service_locations.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/get_service_locations.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/install_index_templates.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/install_index_templates.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/install_index_templates.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/install_index_templates.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/monitor_validation.test.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/monitor_validation.test.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/monitor_validation.test.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/monitor_validation.test.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/monitor_validation.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/monitor_validation.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/monitor_validation.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/monitor_validation.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/run_once_monitor.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/run_once_monitor.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/run_once_monitor.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/run_once_monitor.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/service_errors.ts
similarity index 85%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/service_errors.ts
index 23921c4d1d6ef..795c75aad4ab5 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/service_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 
 export function getMonitorNotFoundResponse(response: KibanaResponseFactory, monitorId: string) {
   return response.notFound({ body: { message: `Monitor id ${monitorId} not found!` } });
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
similarity index 97%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
index 24734c88301f1..9d8161b02b634 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import { sha256 } from 'js-sha256';
-import type { Logger } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObject } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObject } from '@kbn/core/server';
 import {
   SyntheticsMonitor,
   ConfigKey,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
similarity index 94%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
index 29f28e5ab36a6..526e40ef2f230 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 import { sha256 } from 'js-sha256';
-import type { Logger } from 'src/core/server';
-import { SavedObjectsUpdateResponse, SavedObject } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
+import { SavedObjectsUpdateResponse, SavedObject } from '@kbn/core/server';
+import { scheduleToMilli } from '../../../../common/lib/schedule_to_time';
 import {
   MonitorFields,
   EncryptedSyntheticsMonitor,
@@ -68,7 +69,7 @@ export function formatTelemetryEvent({
     ), // mark self-managed locations as other
     locationsCount: attributes[ConfigKey.LOCATIONS].length,
     monitorNameLength: attributes[ConfigKey.NAME].length,
-    monitorInterval: parseInt(attributes[ConfigKey.SCHEDULE].number, 10) * 60 * 1000,
+    monitorInterval: scheduleToMilli(attributes[ConfigKey.SCHEDULE]),
     stackVersion: kibanaVersion,
     scriptType: getScriptType(attributes as Partial<MonitorFields>),
     errors:
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/test_now_monitor.ts
similarity index 56%
rename from x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts
rename to x-pack/plugins/synthetics/server/rest_api/synthetics_service/test_now_monitor.ts
index 2ad270db213fb..fa06bda0cf66d 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/synthetics_service/test_now_monitor.ts
@@ -6,10 +6,18 @@
  */
 import { schema } from '@kbn/config-schema';
 import { v4 as uuidv4 } from 'uuid';
-import { SyntheticsMonitor } from '../../../common/runtime_types';
+import {
+  ConfigKey,
+  SyntheticsMonitor,
+  SyntheticsMonitorWithSecrets,
+} from '../../../common/runtime_types';
 import { UMRestApiRouteFactory } from '../types';
 import { API_URLS } from '../../../common/constants';
-import { syntheticsMonitorType } from '../../lib/saved_objects/synthetics_monitor';
+import {
+  syntheticsMonitor,
+  syntheticsMonitorType,
+} from '../../lib/saved_objects/synthetics_monitor';
+import { normalizeSecrets } from '../../lib/synthetics_service/utils/secrets';
 
 export const testNowMonitorRoute: UMRestApiRouteFactory = () => ({
   method: 'GET',
@@ -19,20 +27,30 @@ export const testNowMonitorRoute: UMRestApiRouteFactory = () => ({
       monitorId: schema.string({ minLength: 1, maxLength: 1024 }),
     }),
   },
-  handler: async ({ request, savedObjectsClient, response, server }): Promise<any> => {
+  handler: async ({ request, savedObjectsClient, server }): Promise<any> => {
     const { monitorId } = request.params;
     const monitor = await savedObjectsClient.get<SyntheticsMonitor>(
       syntheticsMonitorType,
       monitorId
     );
 
+    const encryptedClient = server.encryptedSavedObjects.getClient();
+
+    const monitorWithSecrets =
+      await encryptedClient.getDecryptedAsInternalUser<SyntheticsMonitorWithSecrets>(
+        syntheticsMonitor.name,
+        monitorId
+      );
+
+    const { [ConfigKey.SCHEDULE]: schedule, [ConfigKey.LOCATIONS]: locations } = monitor.attributes;
+
     const { syntheticsService } = server;
 
     const testRunId = uuidv4();
 
     const errors = await syntheticsService.triggerConfigs(request, [
       {
-        ...monitor.attributes,
+        ...normalizeSecrets(monitorWithSecrets).attributes,
         id: monitorId,
         fields_under_root: true,
         fields: { config_id: monitorId, test_run_id: testRunId },
@@ -40,9 +58,9 @@ export const testNowMonitorRoute: UMRestApiRouteFactory = () => ({
     ]);
 
     if (errors && errors?.length > 0) {
-      return { errors, testRunId, monitorId };
+      return { errors, testRunId, monitorId, schedule, locations };
     }
 
-    return { testRunId, monitorId };
+    return { testRunId, monitorId, schedule, locations };
   },
 });
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/index.ts b/x-pack/plugins/synthetics/server/rest_api/telemetry/index.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/telemetry/index.ts
rename to x-pack/plugins/synthetics/server/rest_api/telemetry/index.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts b/x-pack/plugins/synthetics/server/rest_api/telemetry/log_page_view.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
rename to x-pack/plugins/synthetics/server/rest_api/telemetry/log_page_view.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/types.ts b/x-pack/plugins/synthetics/server/rest_api/types.ts
similarity index 98%
rename from x-pack/plugins/uptime/server/rest_api/types.ts
rename to x-pack/plugins/synthetics/server/rest_api/types.ts
index 48e3f58ae0ad5..ef091214d4b04 100644
--- a/x-pack/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/types.ts
@@ -14,7 +14,7 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { UMServerLibs, UptimeESClient } from '../lib/lib';
 import type { UptimeRequestHandlerContext } from '../types';
 import { UptimeServerSetup } from '../lib/adapters';
diff --git a/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts b/x-pack/plugins/synthetics/server/rest_api/uptime_route_wrapper.ts
similarity index 74%
rename from x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
rename to x-pack/plugins/synthetics/server/rest_api/uptime_route_wrapper.ts
index 450997c7c110d..03948589774ab 100644
--- a/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
+++ b/x-pack/plugins/synthetics/server/rest_api/uptime_route_wrapper.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaResponse } from '@kbn/core/server/http/router';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/common';
 import { UMKibanaRouteWrapper } from './types';
 import { createUptimeESClient, inspectableEsQueriesMap } from '../lib/lib';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaResponse } from '../../../../../src/core/server/http/router';
-import { enableInspectEsQueries } from '../../../observability/common';
 import { syntheticsServiceApiKey } from '../lib/saved_objects/service_api_key';
 import { API_URLS } from '../../common/constants';
 
@@ -21,20 +21,21 @@ export const uptimeRouteWrapper: UMKibanaRouteWrapper = (uptimeRoute, server) =>
     tags: ['access:uptime-read', ...(uptimeRoute?.writeAccess ? ['access:uptime-write'] : [])],
   },
   handler: async (context, request, response) => {
-    const { client: esClient } = context.core.elasticsearch;
+    const coreContext = await context.core;
+    const { client: esClient } = coreContext.elasticsearch;
     let savedObjectsClient: SavedObjectsClientContract;
     if (server.config?.service) {
-      savedObjectsClient = context.core.savedObjects.getClient({
+      savedObjectsClient = coreContext.savedObjects.getClient({
         includedHiddenTypes: [syntheticsServiceApiKey.name],
       });
     } else {
-      savedObjectsClient = context.core.savedObjects.client;
+      savedObjectsClient = coreContext.savedObjects.client;
     }
 
     // specifically needed for the synthetics service api key generation
     server.authSavedObjectsClient = savedObjectsClient;
 
-    const isInspectorEnabled = await context.core.uiSettings.client.get<boolean>(
+    const isInspectorEnabled = await coreContext.uiSettings.client.get<boolean>(
       enableInspectEsQueries
     );
 
@@ -47,7 +48,10 @@ export const uptimeRouteWrapper: UMKibanaRouteWrapper = (uptimeRoute, server) =>
 
     server.uptimeEsClient = uptimeEsClient;
 
-    if (isInspectorEnabled || server.isDev) {
+    if (
+      (isInspectorEnabled || server.isDev) &&
+      server.config.service?.username !== 'localKibanaIntegrationTestsUser'
+    ) {
       inspectableEsQueriesMap.set(request, []);
     }
 
diff --git a/x-pack/plugins/uptime/server/types.ts b/x-pack/plugins/synthetics/server/types.ts
similarity index 58%
rename from x-pack/plugins/uptime/server/types.ts
rename to x-pack/plugins/synthetics/server/types.ts
index 9f649b0263d3c..e66400ce55a07 100644
--- a/x-pack/plugins/uptime/server/types.ts
+++ b/x-pack/plugins/synthetics/server/types.ts
@@ -5,16 +5,17 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, CustomRequestHandlerContext } from '@kbn/core/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
+
 /**
  * @internal
  */
-export interface UptimeRequestHandlerContext extends RequestHandlerContext {
+export type UptimeRequestHandlerContext = CustomRequestHandlerContext<{
   licensing: LicensingApiRequestHandlerContext;
   alerting: AlertingApiRequestHandlerContext;
-}
+}>;
 
 /**
  * @internal
diff --git a/x-pack/plugins/uptime/server/uptime_server.ts b/x-pack/plugins/synthetics/server/uptime_server.ts
similarity index 95%
rename from x-pack/plugins/uptime/server/uptime_server.ts
rename to x-pack/plugins/synthetics/server/uptime_server.ts
index fd16e8243c2cd..fe1795f501c0a 100644
--- a/x-pack/plugins/uptime/server/uptime_server.ts
+++ b/x-pack/plugins/synthetics/server/uptime_server.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { createLifecycleRuleTypeFactory, IRuleDataClient } from '../../rule_registry/server';
+import { Logger } from '@kbn/core/server';
+import { createLifecycleRuleTypeFactory, IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import { UMServerLibs } from './lib/lib';
 import { createRouteWithAuth, restApiRoutes, uptimeRouteWrapper } from './rest_api';
 import { UptimeServerSetup, UptimeCorePluginsSetup } from './lib/adapters';
diff --git a/x-pack/plugins/uptime/tsconfig.json b/x-pack/plugins/synthetics/tsconfig.json
similarity index 100%
rename from x-pack/plugins/uptime/tsconfig.json
rename to x-pack/plugins/synthetics/tsconfig.json
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
index 1d98e37a06a55..46105747f52a4 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
@@ -21,7 +21,7 @@ import { asTaskPollingCycleEvent, asTaskRunEvent, TaskPersistence } from './task
 import { TaskRunResult } from './task_running';
 import { TaskPoolRunResult } from './task_pool';
 import { TaskPoolMock } from './task_pool.mock';
-import { executionContextServiceMock } from '../../../../src/core/server/mocks';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
 
 const executionContext = executionContextServiceMock.createSetupContract();
 
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
index ded9091b4f226..16d8cd796809d 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
@@ -7,7 +7,7 @@
 
 import { Subject, Observable, Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { Logger, ExecutionContextStart } from '../../../../src/core/server';
+import { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Result, asErr, asOk } from './lib/result_type';
 import { TaskManagerConfig } from './config';
diff --git a/x-pack/plugins/task_manager/server/index.test.ts b/x-pack/plugins/task_manager/server/index.test.ts
index 2145c01dfe68f..9b54a274c0316 100644
--- a/x-pack/plugins/task_manager/server/index.test.ts
+++ b/x-pack/plugins/task_manager/server/index.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../../src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.task_manager';
 
diff --git a/x-pack/plugins/task_manager/server/index.ts b/x-pack/plugins/task_manager/server/index.ts
index c32ee6218c8c5..f6cb3a6e6b1d5 100644
--- a/x-pack/plugins/task_manager/server/index.ts
+++ b/x-pack/plugins/task_manager/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { TaskManagerPlugin } from './plugin';
 import { configSchema, TaskManagerConfig, MAX_WORKERS_LIMIT } from './config';
 
diff --git a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
index c5f03b1769385..aa945c74d71ff 100644
--- a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
@@ -6,18 +6,14 @@
  */
 
 import sinon from 'sinon';
-import {
-  elasticsearchServiceMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../src/core/server/mocks';
-import { SavedObjectsErrorHelpers, Logger } from '../../../../../src/core/server';
+import { elasticsearchServiceMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
+import { SavedObjectsErrorHelpers, Logger } from '@kbn/core/server';
 import { ADJUST_THROUGHPUT_INTERVAL } from '../lib/create_managed_configuration';
 import { TaskManagerPlugin, TaskManagerStartContract } from '../plugin';
-import { coreMock } from '../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { TaskManagerConfig } from '../config';
 
-// FAILING: https://github.com/elastic/kibana/issues/120269
-describe.skip('managed configuration', () => {
+describe('managed configuration', () => {
   let taskManagerStart: TaskManagerStartContract;
   let logger: Logger;
 
@@ -25,6 +21,19 @@ describe.skip('managed configuration', () => {
   const savedObjectsClient = savedObjectsRepositoryMock.create();
   const esStart = elasticsearchServiceMock.createStart();
 
+  const inlineScriptError = new Error('cannot execute [inline] scripts" error') as Error & {
+    meta: unknown;
+  };
+  inlineScriptError.meta = {
+    body: {
+      error: {
+        caused_by: {
+          reason: 'cannot execute [inline] scripts',
+        },
+      },
+    },
+  };
+
   beforeEach(async () => {
     jest.resetAllMocks();
     clock = sinon.useFakeTimers();
@@ -135,16 +144,12 @@ describe.skip('managed configuration', () => {
   });
 
   test('should lower max workers when Elasticsearch returns "cannot execute [inline] scripts" error', async () => {
-    esStart
-      .createClient('taskManager')
-      .asInternalUser.search.mockRejectedValueOnce(
-        elasticsearchServiceMock.createErrorTransportRequestPromise(
-          new Error('cannot execute [inline] scripts" error')
-        )
-      );
+    esStart.client.asInternalUser.search.mockImplementationOnce(async () => {
+      throw inlineScriptError;
+    });
 
     await expect(taskManagerStart.fetch({})).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"cannot execute [inline] scripts" error"`
+      `"cannot execute [inline] scripts\\" error"`
     );
     clock.tick(ADJUST_THROUGHPUT_INTERVAL);
 
@@ -158,16 +163,12 @@ describe.skip('managed configuration', () => {
   });
 
   test('should increase poll interval when Elasticsearch returns "cannot execute [inline] scripts" error', async () => {
-    esStart
-      .createClient('taskManager')
-      .asInternalUser.search.mockRejectedValueOnce(
-        elasticsearchServiceMock.createErrorTransportRequestPromise(
-          new Error('cannot execute [inline] scripts" error')
-        )
-      );
+    esStart.client.asInternalUser.search.mockImplementationOnce(async () => {
+      throw inlineScriptError;
+    });
 
     await expect(taskManagerStart.fetch({})).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"cannot execute [inline] scripts" error"`
+      `"cannot execute [inline] scripts\\" error"`
     );
 
     clock.tick(ADJUST_THROUGHPUT_INTERVAL);
diff --git a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
index b775260942ff1..6e05aceee9a54 100644
--- a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
+++ b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { map } from 'lodash';
 import { Subject, race, from } from 'rxjs';
 import { bufferWhen, filter, bufferCount, flatMap, mapTo, first } from 'rxjs/operators';
diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
index b544674d61c07..0b5e046743627 100644
--- a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
+++ b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
@@ -7,9 +7,9 @@
 
 import { isString } from 'lodash';
 import { JsonValue } from '@kbn/utility-types';
+import { Logger } from '@kbn/core/server';
 import { HealthStatus, RawMonitoringStats } from '../monitoring';
 import { TaskManagerConfig } from '../config';
-import { Logger } from '../../../../../src/core/server';
 
 export function calculateHealthStatus(
   summarizedStats: RawMonitoringStats,
diff --git a/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts b/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts
index 236131496001e..571f29f419e27 100644
--- a/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts
+++ b/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TaskInstance, TaskInstanceWithDeprecatedFields } from '../task';
 
 export function ensureDeprecatedFieldsAreCorrected(
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
index 2dc63b306643e..84dd65cd3cf16 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
@@ -7,7 +7,7 @@
 
 import sinon from 'sinon';
 import { Subject } from 'rxjs';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   createManagedConfiguration,
   ADJUST_THROUGHPUT_INTERVAL,
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
index 188e4bacd52e6..baed33ef9d048 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
@@ -7,8 +7,8 @@
 
 import { interval, merge, of, Observable } from 'rxjs';
 import { filter, mergeScan, map, scan, distinctUntilChanged, startWith } from 'rxjs/operators';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
-import { Logger } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 import { isEsCannotExecuteScriptError } from './identify_es_error';
 
 const FLUSH_MARKER = Symbol('flush');
diff --git a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts
index 0041e57a95e81..6cc6beb26bf7b 100644
--- a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { isTaskSavedObjectNotFoundError } from './is_task_not_found_error';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import uuid from 'uuid';
 
 describe('isTaskSavedObjectNotFoundError', () => {
diff --git a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts
index ca8a7c3bf5277..2acf627f03641 100644
--- a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts
+++ b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 export function isTaskSavedObjectNotFoundError(err: Error, taskId: string) {
   return SavedObjectsErrorHelpers.isNotFoundError(err) && `${err}`.includes(taskId);
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
index 2d4aa837ffb06..9b1b10127abe2 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import { merge } from 'lodash';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { configSchema, TaskManagerConfig } from '../config';
 import { HealthStatus } from '../monitoring';
 import { MonitoredHealth } from '../routes/health';
 import { logHealthMetrics, resetLastLogLevel } from './log_health_metrics';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TaskPersistence } from '../task_events';
 
 jest.mock('./calculate_health_status', () => ({
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
index 5d513c645a862..4a2757ee739e9 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
@@ -8,7 +8,7 @@
 import { kibanaPackageJson } from '@kbn/utils';
 
 import { isEmpty } from 'lodash';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { HealthStatus } from '../monitoring';
 import { TaskManagerConfig } from '../config';
 import { MonitoredHealth } from '../routes/health';
diff --git a/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts b/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts
index c563e9ca990c6..7b9ec4bbb8b28 100644
--- a/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { removeIfExists } from './remove_if_exists';
 import { taskStoreMock } from '../task_store.mock';
 
diff --git a/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts b/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts
index 34d114b585d45..9faba58a05c06 100644
--- a/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts
+++ b/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { TaskStore } from '../task_store';
 
 /**
diff --git a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
index a5b3288cba528..9b48c84da5319 100644
--- a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
@@ -8,11 +8,11 @@
 import { mapValues } from 'lodash';
 import stats from 'stats-lite';
 import { JsonObject } from '@kbn/utility-types';
+import { Logger } from '@kbn/core/server';
 import { RawMonitoringStats, RawMonitoredStat, HealthStatus } from './monitoring_stats_stream';
 import { AveragedStat } from './task_run_calcultors';
 import { TaskPersistenceTypes } from './task_run_statistics';
 import { asErr, asOk, map, Result } from '../lib/result_type';
-import { Logger } from '../../../../../src/core/server';
 
 export interface CapacityEstimationStat extends JsonObject {
   observed: {
diff --git a/x-pack/plugins/task_manager/server/monitoring/index.ts b/x-pack/plugins/task_manager/server/monitoring/index.ts
index a352ec55f2dbc..84dd78f432193 100644
--- a/x-pack/plugins/task_manager/server/monitoring/index.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Observable } from 'rxjs';
 import { TaskManagerConfig } from '../config';
 import {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
index 5175525b15cf1..125ce034b0c69 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
@@ -8,7 +8,7 @@
 import { merge, of, Observable } from 'rxjs';
 import { map, scan } from 'rxjs/operators';
 import { set } from '@elastic/safer-lodash-set';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { TaskStore } from '../task_store';
 import { TaskPollingLifecycle } from '../polling_lifecycle';
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
index 250ad344aa2e3..446467ffe0b65 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
@@ -9,6 +9,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, startWith, map } from 'rxjs/operators';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { isNumber, mapValues } from 'lodash';
+import { Logger } from '@kbn/core/server';
 import { AggregatedStatProvider, AggregatedStat } from './runtime_statistics_aggregator';
 import { TaskLifecycleEvent } from '../polling_lifecycle';
 import {
@@ -38,7 +39,6 @@ import {
 import { HealthStatus } from './monitoring_stats_stream';
 import { TaskPollingLifecycle } from '../polling_lifecycle';
 import { TaskExecutionFailureThreshold, TaskManagerConfig } from '../config';
-import { Logger } from '../../../../../src/core/server';
 
 interface FillPoolStat extends JsonObject {
   duration: number[];
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
index 9a63ece0dda46..947f8e397a2cf 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { first, take, bufferCount } from 'rxjs/operators';
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   TaskTypeAggregation,
   WorkloadAggregationResponse,
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
index 34ad4a1753fba..f211ed57a52ad 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
@@ -7,13 +7,13 @@
 
 import { combineLatest, Observable, timer } from 'rxjs';
 import { mergeMap, map, filter, switchMap, catchError } from 'rxjs/operators';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { keyBy, mapValues } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AggregationResultOf } from '@kbn/core/types/elasticsearch';
 import { AggregatedStatProvider } from './runtime_statistics_aggregator';
 import { parseIntervalAsSecond, asInterval, parseIntervalAsMillisecond } from '../lib/intervals';
-import { AggregationResultOf } from '../../../../../src/core/types/elasticsearch';
 import { HealthStatus } from './monitoring_stats_stream';
 import { TaskStore } from '../task_store';
 import { createRunningAveragedStat } from './task_run_calcultors';
diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts
index aa91533eabadf..0a1f77c665044 100644
--- a/x-pack/plugins/task_manager/server/plugin.test.ts
+++ b/x-pack/plugins/task_manager/server/plugin.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { TaskManagerPlugin, getElasticsearchAndSOAvailability } from './plugin';
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { TaskManagerConfig } from './config';
 import { Subject } from 'rxjs';
 import { bufferCount, take } from 'rxjs/operators';
-import { CoreStatus, ServiceStatusLevels } from 'src/core/server';
+import { CoreStatus, ServiceStatusLevels } from '@kbn/core/server';
 
 describe('TaskManagerPlugin', () => {
   describe('setup', () => {
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index b58b0665c10c0..3694f01227178 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -7,7 +7,7 @@
 
 import { combineLatest, Observable, Subject } from 'rxjs';
 import { map, distinctUntilChanged } from 'rxjs/operators';
-import { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
   PluginInitializerContext,
   Plugin,
@@ -16,7 +16,7 @@ import {
   CoreStart,
   ServiceStatusLevels,
   CoreStatus,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 import { TaskPollingLifecycle } from './polling_lifecycle';
 import { TaskManagerConfig } from './config';
 import { createInitialMiddleware, addMiddlewareToChain, Middleware } from './lib/middleware';
diff --git a/x-pack/plugins/task_manager/server/polling/task_poller.test.ts b/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
index ee9af6240e430..3d0deccec1b03 100644
--- a/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
+++ b/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
@@ -11,7 +11,7 @@ import { Option, none, some } from 'fp-ts/lib/Option';
 import { createTaskPoller, PollingError, PollingErrorType } from './task_poller';
 import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { sleep, resolvable, Resolvable } from '../test_utils';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { asOk, asErr } from '../lib/result_type';
 
 describe('TaskPoller', () => {
diff --git a/x-pack/plugins/task_manager/server/polling/task_poller.ts b/x-pack/plugins/task_manager/server/polling/task_poller.ts
index 21a1579f85767..fc8ab34e5a8d7 100644
--- a/x-pack/plugins/task_manager/server/polling/task_poller.ts
+++ b/x-pack/plugins/task_manager/server/polling/task_poller.ts
@@ -14,7 +14,7 @@ import { mapTo, filter, scan, concatMap, tap, catchError, switchMap } from 'rxjs
 
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, none, map as mapOptional, getOrElse } from 'fp-ts/lib/Option';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { pullFromSet } from '../lib/pull_from_set';
 import {
   Result,
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
index 7cbaa5a165544..b92ef758bdafb 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
@@ -20,7 +20,7 @@ import type { TaskClaiming as TaskClaimingClass } from './queries/task_claiming'
 import { asOk, Err, isErr, isOk, Result } from './lib/result_type';
 import { FillPoolResult } from './lib/fill_pool';
 import { ElasticsearchResponseError } from './lib/identify_es_error';
-import { executionContextServiceMock } from '../../../../src/core/server/mocks';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
 
 const executionContext = executionContextServiceMock.createSetupContract();
 let mockTaskClaiming = taskClaimingMock.create({});
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
index ee7e2ec32932e..b6a7c52536d5e 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
@@ -9,8 +9,8 @@ import { Subject, Observable, Subscription } from 'rxjs';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, some, map as mapOptional } from 'fp-ts/lib/Option';
 import { tap } from 'rxjs/operators';
-import { UsageCounter } from '../../../../src/plugins/usage_collection/server';
-import type { Logger, ExecutionContextStart } from '../../../../src/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import type { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Result, asErr, mapErr, asOk, map, mapOk } from './lib/result_type';
 import { ManagedConfiguration } from './lib/create_managed_configuration';
diff --git a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts
index 1c3309c9d53f1..a220c631d55b2 100644
--- a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts
+++ b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getOldestIdleActionTask } from './oldest_idle_action_task';
 
 describe('getOldestIdleActionTask', () => {
diff --git a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts
index a7fb5c1c8c893..49e7bc1e8d9e3 100644
--- a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts
+++ b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Returns the millisecond timestamp of the oldest action task that may still be executed (with a 24 hour delay).
diff --git a/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts b/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts
index 7b46f10adaabc..67175c86370d7 100644
--- a/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts
+++ b/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts
@@ -15,7 +15,7 @@ import { SearchOpts, StoreOpts, UpdateByQueryOpts, UpdateByQuerySearchOpts } fro
 import { asTaskClaimEvent, ClaimTaskErr, TaskClaimErrorType, TaskEvent } from '../task_events';
 import { asOk, asErr } from '../lib/result_type';
 import { TaskTypeDictionary } from '../task_type_dictionary';
-import type { MustNotCondition } from '../queries/query_clauses';
+import type { MustNotCondition } from './query_clauses';
 import { mockLogger } from '../test_utils';
 import {
   TaskClaiming,
diff --git a/x-pack/plugins/task_manager/server/queries/task_claiming.ts b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
index 1b4f0fdb73683..f15639661e5d0 100644
--- a/x-pack/plugins/task_manager/server/queries/task_claiming.ts
+++ b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
@@ -15,7 +15,7 @@ import { map, mergeScan } from 'rxjs/operators';
 import { difference, partition, groupBy, mapValues, countBy, pick, isPlainObject } from 'lodash';
 import { some, none } from 'fp-ts/lib/Option';
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { asOk, asErr, Result } from '../lib/result_type';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
diff --git a/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts
index 5cad8283f1566..ff63ad68df884 100644
--- a/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts
@@ -6,9 +6,9 @@
  */
 
 import type { MethodKeysOf } from '@kbn/utility-types';
-import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from 'kibana/server';
+import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { identity } from 'lodash';
-import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 export function mockHandlerArguments(
   {}: {},
diff --git a/x-pack/plugins/task_manager/server/routes/health.test.ts b/x-pack/plugins/task_manager/server/routes/health.test.ts
index 580cc9035b366..31d4a17434598 100644
--- a/x-pack/plugins/task_manager/server/routes/health.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.test.ts
@@ -9,19 +9,19 @@ import { Observable, of, Subject } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { merge } from 'lodash';
 import uuid from 'uuid';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { healthRoute } from './health';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { sleep } from '../test_utils';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   HealthStatus,
   MonitoringStats,
   RawMonitoringStats,
   summarizeMonitoringStats,
 } from '../monitoring';
-import { ServiceStatusLevels, Logger } from 'src/core/server';
+import { ServiceStatusLevels, Logger } from '@kbn/core/server';
 import { configSchema, TaskManagerConfig } from '../config';
 import { calculateHealthStatusMock } from '../lib/calculate_health_status.mock';
 import { FillPoolResult } from '../lib/fill_pool';
diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts
index 2c0e082eb0991..03fe93c79c951 100644
--- a/x-pack/plugins/task_manager/server/routes/health.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.ts
@@ -11,13 +11,13 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { IClusterClient } from 'src/core/server';
+} from '@kbn/core/server';
+import { IClusterClient } from '@kbn/core/server';
 import { Observable, Subject } from 'rxjs';
 import { tap, map } from 'rxjs/operators';
 import { throttleTime } from 'rxjs/operators';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { Logger, ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { Logger, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import {
   MonitoringStats,
   summarizeMonitoringStats,
diff --git a/x-pack/plugins/task_manager/server/saved_objects/index.ts b/x-pack/plugins/task_manager/server/saved_objects/index.ts
index 2a4dba6ed7d94..2418346234a29 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsServiceSetup, SavedObjectsTypeMappingDefinition } from 'kibana/server';
+import type { SavedObjectsServiceSetup, SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import mappings from './mappings.json';
 import { getMigrations } from './migrations';
diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
index cfd0f874f58ff..a59fb077dbdeb 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
@@ -7,8 +7,8 @@
 
 import uuid from 'uuid';
 import { getMigrations } from './migrations';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { TaskInstanceWithDeprecatedFields } from '../task';
 
 const migrationContext = migrationMocks.createContext();
diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
index 6e527918f2a7e..eb4ff6c1b0ecf 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectMigrationMap,
   SavedObjectsUtils,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 import { REMOVED_TYPES } from '../task_type_dictionary';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
 
diff --git a/x-pack/plugins/task_manager/server/task_pool.test.ts b/x-pack/plugins/task_manager/server/task_pool.test.ts
index 7712bb977803c..498fb8975aae6 100644
--- a/x-pack/plugins/task_manager/server/task_pool.test.ts
+++ b/x-pack/plugins/task_manager/server/task_pool.test.ts
@@ -8,10 +8,10 @@ import sinon from 'sinon';
 import { of, Subject } from 'rxjs';
 import { TaskPool, TaskPoolRunResult } from './task_pool';
 import { resolvable, sleep } from './test_utils';
-import { loggingSystemMock } from '../../../../src/core/server/mocks';
-import { Logger } from '../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { asOk } from './lib/result_type';
-import { SavedObjectsErrorHelpers } from '../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import moment from 'moment';
 import uuid from 'uuid';
 import { TaskRunningStage } from './task_running';
diff --git a/x-pack/plugins/task_manager/server/task_pool.ts b/x-pack/plugins/task_manager/server/task_pool.ts
index d8a9fdd6223fe..e73af74bc73e3 100644
--- a/x-pack/plugins/task_manager/server/task_pool.ts
+++ b/x-pack/plugins/task_manager/server/task_pool.ts
@@ -12,7 +12,7 @@
 import { Observable, Subject } from 'rxjs';
 import moment, { Duration } from 'moment';
 import { padStart } from 'lodash';
-import { Logger } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TaskRunner } from './task_running';
 import { isTaskSavedObjectNotFoundError } from './lib/is_task_not_found_error';
 import { TaskManagerStat } from './task_events';
diff --git a/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts b/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
index a9d1d8b6f2f16..e010a7a0126b8 100644
--- a/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
@@ -15,7 +15,7 @@ import apm from 'elastic-apm-node';
 import uuid from 'uuid';
 import { withSpan } from '@kbn/apm-utils';
 import { identity } from 'lodash';
-import { Logger, ExecutionContextStart } from '../../../../../src/core/server';
+import { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Middleware } from '../lib/middleware';
 import { asOk, asErr, eitherAsync, Result } from '../lib/result_type';
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
index ece82099728e3..73d30b022c626 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
@@ -9,7 +9,7 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import { secondsFromNow } from '../lib/intervals';
 import { asOk, asErr } from '../lib/result_type';
-import { TaskManagerRunner, TaskRunningStage, TaskRunResult } from '../task_running';
+import { TaskManagerRunner, TaskRunningStage, TaskRunResult } from '.';
 import {
   TaskEvent,
   asTaskRunEvent,
@@ -18,15 +18,15 @@ import {
   TaskPersistence,
 } from '../task_events';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import moment from 'moment';
 import { TaskDefinitionRegistry, TaskTypeDictionary } from '../task_type_dictionary';
 import { mockLogger } from '../test_utils';
 import { throwUnrecoverableError } from './errors';
 import { taskStoreMock } from '../task_store.mock';
 import apm from 'elastic-apm-node';
-import { executionContextServiceMock } from '../../../../../src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   TASK_MANAGER_RUN_TRANSACTION_TYPE,
   TASK_MANAGER_TRANSACTION_TYPE,
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
index 778a834c168a1..b6199f06300f1 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
@@ -15,12 +15,8 @@ import apm from 'elastic-apm-node';
 import uuid from 'uuid';
 import { withSpan } from '@kbn/apm-utils';
 import { identity, defaults, flow } from 'lodash';
-import {
-  Logger,
-  SavedObjectsErrorHelpers,
-  ExecutionContextStart,
-} from '../../../../../src/core/server';
-import { UsageCounter } from '../../../../../src/plugins/usage_collection/server';
+import { Logger, SavedObjectsErrorHelpers, ExecutionContextStart } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { Middleware } from '../lib/middleware';
 import {
   asOk,
diff --git a/x-pack/plugins/task_manager/server/task_scheduling.ts b/x-pack/plugins/task_manager/server/task_scheduling.ts
index abf1ea0f50eda..a38e2d23fccec 100644
--- a/x-pack/plugins/task_manager/server/task_scheduling.ts
+++ b/x-pack/plugins/task_manager/server/task_scheduling.ts
@@ -14,7 +14,7 @@ import uuid from 'uuid';
 import { pick } from 'lodash';
 import { merge, Subject } from 'rxjs';
 import agent from 'elastic-apm-node';
-import { Logger } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { asOk, either, map, mapErr, promiseResult, isErr } from './lib/result_type';
 import {
   isTaskRunEvent,
diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts
index 8b897d279fe4a..46eb792eedcd9 100644
--- a/x-pack/plugins/task_manager/server/task_store.test.ts
+++ b/x-pack/plugins/task_manager/server/task_store.test.ts
@@ -15,15 +15,15 @@ import {
   TaskLifecycleResult,
   SerializedConcreteTaskInstance,
 } from './task';
-import { elasticsearchServiceMock } from '../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { TaskStore, SearchOpts } from './task_store';
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import {
   SavedObjectsSerializer,
   SavedObjectTypeRegistry,
   SavedObjectAttributes,
   SavedObjectsErrorHelpers,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { TaskTypeDictionary } from './task_type_dictionary';
 import { mockLogger } from './test_utils';
 
diff --git a/x-pack/plugins/task_manager/server/task_store.ts b/x-pack/plugins/task_manager/server/task_store.ts
index db47ba25300ca..1d0d6ce80e073 100644
--- a/x-pack/plugins/task_manager/server/task_store.ts
+++ b/x-pack/plugins/task_manager/server/task_store.ts
@@ -20,7 +20,7 @@ import {
   ISavedObjectsRepository,
   SavedObjectsUpdateResponse,
   ElasticsearchClient,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 
 import { asOk, asErr, Result } from './lib/result_type';
 
diff --git a/x-pack/plugins/task_manager/server/task_type_dictionary.ts b/x-pack/plugins/task_manager/server/task_type_dictionary.ts
index a2ea46122acf8..75bd54510b43b 100644
--- a/x-pack/plugins/task_manager/server/task_type_dictionary.ts
+++ b/x-pack/plugins/task_manager/server/task_type_dictionary.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Logger } from '@kbn/core/server';
 import { TaskDefinition, taskDefinitionSchema, TaskRunCreatorFunction } from './task';
-import { Logger } from '../../../../src/core/server';
 
 /**
  * Types that are no longer registered and will be marked as unregistered
diff --git a/x-pack/plugins/task_manager/server/test_utils/index.ts b/x-pack/plugins/task_manager/server/test_utils/index.ts
index 215bd55981b8d..88b98025b5ff5 100644
--- a/x-pack/plugins/task_manager/server/test_utils/index.ts
+++ b/x-pack/plugins/task_manager/server/test_utils/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 /*
  * A handful of helper functions for testing the task manager.
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
index b7a52a7a41bcf..9fdd0c4988575 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
@@ -6,12 +6,12 @@
  */
 import { Subject } from 'rxjs';
 import { merge } from 'lodash';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
   createUsageCollectionSetupMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { HealthStatus } from '../monitoring';
 import { MonitoredHealth } from '../routes/health';
 import { TaskPersistence } from '../task_events';
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
index d6eb92b944ce1..82e9eb95dd760 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { Observable } from 'rxjs';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { MonitoredHealth } from '../routes/health';
 import { TaskManagerUsage } from './types';
 
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index 7db9d905d5c93..c8cd2b27210ff 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -1944,7 +1944,7 @@
             }
           }
         },
-        "percentile_num_scheduled_actions_per_day": {
+        "percentile_num_generated_actions_per_day": {
           "properties": {
             "p50": {
               "type": "long"
@@ -1957,7 +1957,7 @@
             }
           }
         },
-        "percentile_num_scheduled_actions_by_type_per_day": {
+        "percentile_num_generated_actions_by_type_per_day": {
           "properties": {
             "p50": {
               "properties": {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts b/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
index d601cb47bacda..64f5c858a655b 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
-import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
-import { getClusterUuids } from '../../../../src/plugins/telemetry/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import { TelemetryCollectionManagerPluginSetup } from '@kbn/telemetry-collection-manager-plugin/server';
+import { getClusterUuids } from '@kbn/telemetry-plugin/server';
 import { getStatsWithXpack } from './telemetry_collection';
 
 interface TelemetryCollectionXpackDepsSetup {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts
index 7d09280b29d3e..77b3bf4de968a 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getLicenseFromLocalOrMaster } from './get_license';
 
 describe('getLicenseFromLocalOrMaster', () => {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts
index 2510b467c381a..11f2b1359ab13 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export type ESLicense = estypes.LicenseGetLicenseInformation;
 
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
index e1bea8d1aa0e1..f2adb257f9cb6 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { coreMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { coreMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getStatsWithXpack } from './get_stats_with_xpack';
-import { SavedObjectsClient } from '../../../../../src/core/server';
-import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/server/mocks';
+import { SavedObjectsClient } from '@kbn/core/server';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const kibana = {
   kibana: {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
index 3adc5bc9f2eac..b789b1e54d2f9 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { StatsGetter } from 'src/plugins/telemetry_collection_manager/server';
-import { TelemetryLocalStats, getLocalStats } from '../../../../../src/plugins/telemetry/server';
+import { StatsGetter } from '@kbn/telemetry-collection-manager-plugin/server';
+import { TelemetryLocalStats, getLocalStats } from '@kbn/telemetry-plugin/server';
 import { getXPackUsage } from './get_xpack';
 import { ESLicense, getLicenseFromLocalOrMaster } from './get_license';
 import { isClusterOptedIn } from './is_cluster_opted_in';
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts
index 3a89e11c91a99..4f3cd6a5dc2d6 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getXPackUsage } from './get_xpack';
 
 describe('get_xpack', () => {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
index 871a2d846f9f7..26cee1c09561d 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { TIMEOUT } from './constants';
 
 /**
diff --git a/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts b/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
index 544ca033b060c..5e74e01fbe843 100644
--- a/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
@@ -12,7 +12,7 @@ import type {
   IEsSearchResponse,
   FieldSpec,
   RuntimeField,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import type { DocValueFields, Maybe } from '../common';
 
 export type BeatFieldsFactoryQueryType = 'beatFields';
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts
index 9ff370482ef08..8e50d6db48f24 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts
@@ -8,7 +8,7 @@
 import { JsonObject } from '@kbn/utility-types';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import type { Ecs } from '../../../../ecs';
 import type { CursorType, Inspect, Maybe, PaginationInputPaginated } from '../../../common';
 import type { TimelineRequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts
index 32dfde2b5c8ff..ccc558e96bf34 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts
@@ -7,10 +7,10 @@
 
 import { JsonObject } from '@kbn/utility-types';
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../common';
 import { TimelineRequestOptionsPaginated } from '../..';
-import { Ecs } from '../../../../../common/ecs';
+import { Ecs } from '../../../../ecs';
 
 export interface TimelineEventsDetailsItem {
   ariaRowindex?: Maybe<number>;
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts
index fee5014524fe7..dac5d5651003c 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts
@@ -6,10 +6,7 @@
  */
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
-import type {
-  EqlSearchStrategyRequest,
-  EqlSearchStrategyResponse,
-} from '../../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyRequest, EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { EqlSearchResponse, Inspect, Maybe, PaginationInputPaginated } from '../../..';
 import { TimelineEdges, TimelineEventsAllRequestOptions } from '../..';
 
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts
index 915f355b5f893..a78ba38f4b55e 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../common';
 import { TimelineRequestBasicOptions } from '../..';
 
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts
index c328ba49493f5..3d575ead5463a 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   TimelineEventsQueries,
diff --git a/x-pack/plugins/timelines/common/types/timeline/cells/index.ts b/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
index 32c28dfb7adf7..bea01e0dac6ca 100644
--- a/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
+++ b/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
@@ -7,7 +7,7 @@
 
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
-import { RowRenderer } from '../../../types';
+import { RowRenderer } from '../..';
 import { Ecs } from '../../../ecs';
 import { BrowserFields, TimelineNonEcsData } from '../../../search_strategy';
 import { ColumnHeaderOptions } from '../columns';
diff --git a/x-pack/plugins/timelines/common/types/timeline/rows/index.ts b/x-pack/plugins/timelines/common/types/timeline/rows/index.ts
index 089f886e1c221..b65f4d19c5abb 100644
--- a/x-pack/plugins/timelines/common/types/timeline/rows/index.ts
+++ b/x-pack/plugins/timelines/common/types/timeline/rows/index.ts
@@ -7,18 +7,15 @@
 
 import { RowRendererId } from '..';
 import { Ecs } from '../../../ecs';
-import { BrowserFields } from '../../../search_strategy/index_fields';
 
 export interface RowRenderer {
   id: RowRendererId;
   isInstance: (data: Ecs) => boolean;
   renderRow: ({
-    browserFields,
     data,
     isDraggable,
     timelineId,
   }: {
-    browserFields: BrowserFields;
     data: Ecs;
     isDraggable: boolean;
     timelineId: string;
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts b/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
index b24b1fdf8501a..9f0e76f20df15 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { EuiButtonEmpty, EuiButtonIcon, EuiButtonIconPropsForButton } from '@elastic/eui';
-import type { FilterManager } from '../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
 export interface FilterValueFnArgs {
   /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
diff --git a/x-pack/plugins/timelines/public/components/index.tsx b/x-pack/plugins/timelines/public/components/index.tsx
index a99466676376a..ea1e6fdcf3b6d 100644
--- a/x-pack/plugins/timelines/public/components/index.tsx
+++ b/x-pack/plugins/timelines/public/components/index.tsx
@@ -10,8 +10,8 @@ import { Provider } from 'react-redux';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Store } from 'redux';
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { createStore } from '../store/t_grid';
 
 import { TGrid as TGridComponent } from './t_grid';
diff --git a/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx b/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx
index 2e23d455157f8..f9c920cfe892a 100644
--- a/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n-react';
-import { LastUpdatedAt } from './';
+import { LastUpdatedAt } from '.';
 
 jest.mock('@kbn/i18n-react', () => {
   const originalModule = jest.requireActual('@kbn/i18n-react');
diff --git a/x-pack/plugins/timelines/public/components/rule_name/index.tsx b/x-pack/plugins/timelines/public/components/rule_name/index.tsx
index 766a7f4848495..2f51c5f78ac5a 100644
--- a/x-pack/plugins/timelines/public/components/rule_name/index.tsx
+++ b/x-pack/plugins/timelines/public/components/rule_name/index.tsx
@@ -8,8 +8,8 @@
 import { EuiLink } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import React, { useCallback, useMemo } from 'react';
-import { CoreStart } from '../../../../../../src/core/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface RuleNameProps {
   name: string;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/__snapshots__/index.test.tsx.snap b/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 233e1c921cd50..0000000000000
--- a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,658 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
-<ColumnHeadersComponent
-  actionsColumnWidth={124}
-  browserFields={
-    Object {
-      "agent": Object {
-        "fields": Object {
-          "agent.ephemeral_id": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-            "example": "8a4f500f",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.ephemeral_id",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.hostname": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.hostname",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.id": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-            "example": "8a4f500d",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.name": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-            "example": "foo",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "auditd": Object {
-        "fields": Object {
-          "auditd.data.a0": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a0",
-            "searchable": true,
-            "type": "string",
-          },
-          "auditd.data.a1": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a1",
-            "searchable": true,
-            "type": "string",
-          },
-          "auditd.data.a2": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a2",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "base": Object {
-        "fields": Object {
-          "@timestamp": Object {
-            "aggregatable": true,
-            "category": "base",
-            "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-            "example": "2016-05-23T08:05:34.853Z",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "@timestamp",
-            "searchable": true,
-            "type": "date",
-          },
-          "_id": Object {
-            "aggregatable": false,
-            "category": "base",
-            "description": "Each document has an _id that uniquely identifies it",
-            "example": "Y-6TfmcB0WOhS6qyMv3s",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "_id",
-            "searchable": true,
-            "type": "string",
-          },
-          "message": Object {
-            "aggregatable": false,
-            "category": "base",
-            "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-            "example": "Hello World",
-            "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "message",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "client": Object {
-        "fields": Object {
-          "client.address": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.address",
-            "searchable": true,
-            "type": "string",
-          },
-          "client.bytes": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Bytes sent from the client to the server.",
-            "example": "184",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.bytes",
-            "searchable": true,
-            "type": "number",
-          },
-          "client.domain": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Client domain.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.domain",
-            "searchable": true,
-            "type": "string",
-          },
-          "client.geo.country_iso_code": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Country ISO code.",
-            "example": "CA",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.geo.country_iso_code",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "cloud": Object {
-        "fields": Object {
-          "cloud.account.id": Object {
-            "aggregatable": true,
-            "category": "cloud",
-            "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-            "example": "666777888999",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "cloud.account.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "cloud.availability_zone": Object {
-            "aggregatable": true,
-            "category": "cloud",
-            "description": "Availability zone in which this host is running.",
-            "example": "us-east-1c",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "cloud.availability_zone",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "container": Object {
-        "fields": Object {
-          "container.id": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Unique container id.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "container.image.name": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Name of the image the container was built on.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.image.name",
-            "searchable": true,
-            "type": "string",
-          },
-          "container.image.tag": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Container image tag.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.image.tag",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "destination": Object {
-        "fields": Object {
-          "destination.address": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.address",
-            "searchable": true,
-            "type": "string",
-          },
-          "destination.bytes": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Bytes sent from the destination to the source.",
-            "example": "184",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.bytes",
-            "searchable": true,
-            "type": "number",
-          },
-          "destination.domain": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Destination domain.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.domain",
-            "searchable": true,
-            "type": "string",
-          },
-          "destination.ip": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.ip",
-            "searchable": true,
-            "type": "ip",
-          },
-          "destination.port": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Port of the destination.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.port",
-            "searchable": true,
-            "type": "long",
-          },
-        },
-      },
-      "event": Object {
-        "fields": Object {
-          "event.action": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-            "example": "user-password-change",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.action",
-            "searchable": true,
-            "type": "string",
-          },
-          "event.category": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-            "example": "authentication",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.category",
-            "searchable": true,
-            "type": "string",
-          },
-          "event.end": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "event.end contains the date when the event ended or when the activity was last observed.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.end",
-            "searchable": true,
-            "type": "date",
-          },
-          "event.severity": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-            "example": 7,
-            "format": "number",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.severity",
-            "searchable": true,
-            "type": "number",
-          },
-        },
-      },
-      "host": Object {
-        "fields": Object {
-          "host.name": Object {
-            "aggregatable": true,
-            "category": "host",
-            "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "host.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "nestedField": Object {
-        "fields": Object {
-          "nestedField.firstAttributes": Object {
-            "aggregatable": false,
-            "category": "nestedField",
-            "description": "",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "nestedField.firstAttributes",
-            "searchable": true,
-            "subType": Object {
-              "nested": Object {
-                "path": "nestedField",
-              },
-            },
-            "type": "string",
-          },
-          "nestedField.secondAttributes": Object {
-            "aggregatable": false,
-            "category": "nestedField",
-            "description": "",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "nestedField.secondAttributes",
-            "searchable": true,
-            "subType": Object {
-              "nested": Object {
-                "path": "nestedField",
-              },
-            },
-            "type": "string",
-          },
-        },
-      },
-      "source": Object {
-        "fields": Object {
-          "source.ip": Object {
-            "aggregatable": true,
-            "category": "source",
-            "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "source.ip",
-            "searchable": true,
-            "type": "ip",
-          },
-          "source.port": Object {
-            "aggregatable": true,
-            "category": "source",
-            "description": "Port of the source.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "source.port",
-            "searchable": true,
-            "type": "long",
-          },
-        },
-      },
-      "user": Object {
-        "fields": Object {
-          "user.name": Object {
-            "aggregatable": true,
-            "category": "user",
-            "description": "Short name or login of the user.",
-            "example": "albert",
-            "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "user.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-    }
-  }
-  columnHeaders={
-    Array [
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "@timestamp",
-        "initialWidth": 190,
-        "type": "number",
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "message",
-        "initialWidth": 180,
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "event.category",
-        "initialWidth": 180,
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "event.action",
-        "initialWidth": 180,
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "host.name",
-        "initialWidth": 180,
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "source.ip",
-        "initialWidth": 180,
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "destination.ip",
-        "initialWidth": 180,
-      },
-      Object {
-        "columnHeaderType": "not-filtered",
-        "id": "user.name",
-        "initialWidth": 180,
-      },
-    ]
-  }
-  isSelectAllChecked={false}
-  leadingControlColumns={Array []}
-  onSelectAll={[Function]}
-  showEventsSelect={false}
-  showSelectAllCheckbox={false}
-  sort={
-    Array [
-      Object {
-        "columnId": "@timestamp",
-        "columnType": "number",
-        "sortDirection": "desc",
-      },
-    ]
-  }
-  tabType="query"
-  timelineId="test"
-  trailingControlColumns={Array []}
-/>
-`;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/column_header.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/column_header.tsx
deleted file mode 100644
index 4e6db10cc8bce..0000000000000
--- a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/column_header.tsx
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiContextMenu, EuiContextMenuPanelDescriptor, EuiIcon, EuiPopover } from '@elastic/eui';
-import {
-  DRAGGABLE_KEYBOARD_WRAPPER_CLASS_NAME,
-  getDraggableFieldId,
-} from '@kbn/securitysolution-t-grid';
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { Draggable } from 'react-beautiful-dnd';
-import { Resizable, ResizeCallback } from 're-resizable';
-import deepEqual from 'fast-deep-equal';
-import { useDispatch } from 'react-redux';
-import styled from 'styled-components';
-
-import { DEFAULT_COLUMN_MIN_WIDTH } from '../constants';
-
-import { ARIA_COLUMN_INDEX_OFFSET } from '../../helpers';
-import { EventsTh, EventsThContent, EventsHeadingHandle } from '../../styles';
-import { Sort } from '../sort';
-
-import { Header } from './header';
-
-import * as i18n from './translations';
-import { tGridActions } from '../../../../store/t_grid';
-import { TimelineTabs } from '../../../../../common/types/timeline';
-import type { ColumnHeaderOptions } from '../../../../../common/types/timeline';
-
-import { Direction } from '../../../../../common/search_strategy';
-import { useDraggableKeyboardWrapper } from '../../../drag_and_drop';
-
-const ContextMenu = styled(EuiContextMenu)`
-  width: 115px;
-
-  & .euiContextMenuItem {
-    font-size: 12px;
-    padding: 4px 8px;
-    width: 115px;
-  }
-`;
-
-const PopoverContainer = styled.div<{ $width: number }>`
-  & .euiPopover__anchor {
-    padding-right: 8px;
-    width: ${({ $width }) => $width}px;
-  }
-`;
-
-const RESIZABLE_ENABLE = { right: true };
-
-interface ColumneHeaderProps {
-  draggableIndex: number;
-  header: ColumnHeaderOptions;
-  isDragging: boolean;
-  sort: Sort[];
-  tabType: TimelineTabs;
-  timelineId: string;
-}
-
-const ColumnHeaderComponent: React.FC<ColumneHeaderProps> = ({
-  draggableIndex,
-  header,
-  timelineId,
-  isDragging,
-  sort,
-  tabType,
-}) => {
-  const keyboardHandlerRef = useRef<HTMLDivElement | null>(null);
-  const [hoverActionsOwnFocus, setHoverActionsOwnFocus] = useState<boolean>(false);
-  const restoreFocus = useCallback(() => keyboardHandlerRef.current?.focus(), []);
-
-  const dispatch = useDispatch();
-  const resizableSize = useMemo(
-    () => ({
-      width: header.initialWidth ?? DEFAULT_COLUMN_MIN_WIDTH,
-      height: 'auto',
-    }),
-    [header.initialWidth]
-  );
-  const resizableStyle: {
-    position: 'absolute' | 'relative';
-  } = useMemo(
-    () => ({
-      position: isDragging ? 'absolute' : 'relative',
-    }),
-    [isDragging]
-  );
-  const resizableHandleComponent = useMemo(
-    () => ({
-      right: <EventsHeadingHandle />,
-    }),
-    []
-  );
-  const handleResizeStop: ResizeCallback = useCallback(
-    (e, direction, ref, delta) => {
-      dispatch(
-        tGridActions.applyDeltaToColumnWidth({
-          columnId: header.id,
-          delta: delta.width,
-          id: timelineId,
-        })
-      );
-    },
-    [dispatch, header.id, timelineId]
-  );
-  const draggableId = useMemo(
-    () =>
-      getDraggableFieldId({
-        contextId: `timeline-column-headers-${tabType}-${timelineId}`,
-        fieldId: header.id,
-      }),
-    [tabType, timelineId, header.id]
-  );
-
-  const onColumnSort = useCallback(
-    (sortDirection: Direction) => {
-      const columnId = header.id;
-      const headerIndex = sort.findIndex((col) => col.columnId === columnId);
-      const newSort =
-        headerIndex === -1
-          ? [
-              ...sort,
-              {
-                columnId,
-                columnType: `${header.type}`,
-                sortDirection,
-              },
-            ]
-          : [
-              ...sort.slice(0, headerIndex),
-              {
-                columnId,
-                columnType: `${header.type}`,
-                sortDirection,
-              },
-              ...sort.slice(headerIndex + 1),
-            ];
-
-      dispatch(
-        tGridActions.updateSort({
-          id: timelineId,
-          sort: newSort,
-        })
-      );
-    },
-    [dispatch, header, sort, timelineId]
-  );
-
-  const handleClosePopOverTrigger = useCallback(() => {
-    setHoverActionsOwnFocus(false);
-    restoreFocus();
-  }, [restoreFocus]);
-
-  const panels: EuiContextMenuPanelDescriptor[] = useMemo(
-    () => [
-      {
-        id: 0,
-        items: [
-          {
-            icon: <EuiIcon type="cross" size="s" />,
-            name: i18n.REMOVE_COLUMN,
-            onClick: () => {
-              dispatch(tGridActions.removeColumn({ id: timelineId, columnId: header.id }));
-              handleClosePopOverTrigger();
-            },
-          },
-          ...(tabType !== TimelineTabs.eql
-            ? [
-                {
-                  disabled: !header.aggregatable,
-                  icon: <EuiIcon type="sortUp" size="s" />,
-                  name: i18n.SORT_AZ,
-                  onClick: () => {
-                    onColumnSort(Direction.asc);
-                    handleClosePopOverTrigger();
-                  },
-                },
-                {
-                  disabled: !header.aggregatable,
-                  icon: <EuiIcon type="sortDown" size="s" />,
-                  name: i18n.SORT_ZA,
-                  onClick: () => {
-                    onColumnSort(Direction.desc);
-                    handleClosePopOverTrigger();
-                  },
-                },
-              ]
-            : []),
-        ],
-      },
-    ],
-    [
-      dispatch,
-      handleClosePopOverTrigger,
-      header.aggregatable,
-      header.id,
-      onColumnSort,
-      tabType,
-      timelineId,
-    ]
-  );
-
-  const headerButton = useMemo(
-    () => <Header timelineId={timelineId} header={header} sort={sort} />,
-    [header, sort, timelineId]
-  );
-
-  const DraggableContent = useCallback(
-    (dragProvided) => (
-      <EventsTh
-        data-test-subj="draggable-header"
-        {...dragProvided.draggableProps}
-        {...dragProvided.dragHandleProps}
-        ref={dragProvided.innerRef}
-      >
-        <EventsThContent>
-          <PopoverContainer $width={header.initialWidth ?? DEFAULT_COLUMN_MIN_WIDTH}>
-            <EuiPopover
-              anchorPosition="downLeft"
-              button={headerButton}
-              closePopover={handleClosePopOverTrigger}
-              isOpen={hoverActionsOwnFocus}
-              ownFocus
-              panelPaddingSize="none"
-            >
-              <ContextMenu initialPanelId={0} panels={panels} />
-            </EuiPopover>
-          </PopoverContainer>
-        </EventsThContent>
-      </EventsTh>
-    ),
-    [handleClosePopOverTrigger, headerButton, header.initialWidth, hoverActionsOwnFocus, panels]
-  );
-
-  const onFocus = useCallback(() => {
-    keyboardHandlerRef.current?.focus();
-  }, []);
-
-  const openPopover = useCallback(() => {
-    setHoverActionsOwnFocus(true);
-  }, []);
-
-  const { onBlur, onKeyDown } = useDraggableKeyboardWrapper({
-    closePopover: handleClosePopOverTrigger,
-    draggableId,
-    fieldName: header.id,
-    keyboardHandlerRef,
-    openPopover,
-  });
-
-  const keyDownHandler = useCallback(
-    (keyboardEvent: React.KeyboardEvent) => {
-      if (!hoverActionsOwnFocus) {
-        onKeyDown(keyboardEvent);
-      }
-    },
-    [hoverActionsOwnFocus, onKeyDown]
-  );
-
-  return (
-    <Resizable
-      enable={RESIZABLE_ENABLE}
-      size={resizableSize}
-      style={resizableStyle}
-      handleComponent={resizableHandleComponent}
-      onResizeStop={handleResizeStop}
-    >
-      <div
-        aria-colindex={
-          draggableIndex != null ? draggableIndex + ARIA_COLUMN_INDEX_OFFSET : undefined
-        }
-        className={DRAGGABLE_KEYBOARD_WRAPPER_CLASS_NAME}
-        data-test-subj="draggableWrapperKeyboardHandler"
-        onClick={onFocus}
-        onBlur={onBlur}
-        onKeyDown={keyDownHandler}
-        ref={keyboardHandlerRef}
-        role="columnheader"
-        tabIndex={0}
-      >
-        <Draggable
-          data-test-subj="draggable"
-          // Required for drag events while hovering the sort button to work: https://github.com/atlassian/react-beautiful-dnd/blob/master/docs/api/draggable.md#interactive-child-elements-within-a-draggable-
-          disableInteractiveElementBlocking
-          draggableId={draggableId}
-          index={draggableIndex}
-          key={header.id}
-        >
-          {DraggableContent}
-        </Draggable>
-      </div>
-    </Resizable>
-  );
-};
-
-export const ColumnHeader = React.memo(
-  ColumnHeaderComponent,
-  (prevProps, nextProps) =>
-    prevProps.draggableIndex === nextProps.draggableIndex &&
-    prevProps.tabType === nextProps.tabType &&
-    prevProps.timelineId === nextProps.timelineId &&
-    prevProps.isDragging === nextProps.isDragging &&
-    deepEqual(prevProps.sort, nextProps.sort) &&
-    deepEqual(prevProps.header, nextProps.header)
-);
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/index.test.tsx
deleted file mode 100644
index 084cd31d76e61..0000000000000
--- a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/index.test.tsx
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { getActionsColumnWidth } from './helpers';
-
-import { defaultHeaders } from './default_headers';
-import { Sort } from '../sort';
-
-import { ColumnHeadersComponent } from '.';
-import { cloneDeep } from 'lodash/fp';
-import { useMountAppended } from '../../../utils/use_mount_appended';
-import { mockBrowserFields } from '../../../../mock/browser_fields';
-import { Direction } from '../../../../../common/search_strategy';
-import { TimelineTabs } from '../../../../../common/types/timeline';
-import { tGridActions } from '../../../../store/t_grid';
-import { testTrailingControlColumns } from '../../../../mock/mock_timeline_control_columns';
-import { TestProviders } from '../../../../mock';
-import { mockGlobalState } from '../../../../mock/global_state';
-
-const mockDispatch = jest.fn();
-jest.mock('../../../../hooks/use_selector', () => ({
-  useShallowEqualSelector: () => mockGlobalState.timelineById.test,
-  useDeepEqualSelector: () => mockGlobalState.timelineById.test,
-}));
-
-window.matchMedia = jest.fn().mockImplementation((query) => {
-  return {
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: jest.fn(),
-    removeListener: jest.fn(),
-  };
-});
-
-jest.mock('react-redux', () => {
-  const original = jest.requireActual('react-redux');
-
-  return {
-    ...original,
-    useDispatch: () => mockDispatch,
-  };
-});
-const timelineId = 'test';
-
-describe('ColumnHeaders', () => {
-  const mount = useMountAppended();
-  const ACTION_BUTTON_COUNT = 4;
-  const actionsColumnWidth = getActionsColumnWidth(ACTION_BUTTON_COUNT);
-
-  describe('rendering', () => {
-    const sort: Sort[] = [
-      {
-        columnId: '@timestamp',
-        columnType: 'number',
-        sortDirection: Direction.desc,
-      },
-    ];
-
-    test('renders correctly against snapshot', () => {
-      const wrapper = shallow(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={sort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={[]}
-          />
-        </TestProviders>
-      );
-      expect(wrapper.find('ColumnHeadersComponent')).toMatchSnapshot();
-    });
-
-    // TODO BrowserField When we bring back browser fields unskip
-    test.skip('it renders the field browser', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={sort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={[]}
-          />
-        </TestProviders>
-      );
-
-      expect(wrapper.find('[data-test-subj="field-browser"]').first().exists()).toEqual(true);
-    });
-
-    test('it renders every column header', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={sort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={[]}
-          />
-        </TestProviders>
-      );
-
-      defaultHeaders.forEach((h) => {
-        expect(wrapper.find('[data-test-subj="headers-group"]').first().text()).toContain(h.id);
-      });
-    });
-  });
-
-  describe('#onColumnsSorted', () => {
-    let mockSort: Sort[] = [
-      {
-        columnId: '@timestamp',
-        columnType: 'number',
-        sortDirection: Direction.desc,
-      },
-      {
-        columnId: 'host.name',
-        columnType: 'text',
-        sortDirection: Direction.asc,
-      },
-    ];
-    let mockDefaultHeaders = cloneDeep(
-      defaultHeaders.map((h) => (h.id === 'message' ? h : { ...h, aggregatable: true }))
-    );
-
-    beforeEach(() => {
-      mockDefaultHeaders = cloneDeep(
-        defaultHeaders.map((h) => (h.id === 'message' ? h : { ...h, aggregatable: true }))
-      );
-      mockSort = [
-        {
-          columnId: '@timestamp',
-          columnType: 'number',
-          sortDirection: Direction.desc,
-        },
-        {
-          columnId: 'host.name',
-          columnType: 'text',
-          sortDirection: Direction.asc,
-        },
-      ];
-    });
-
-    test('Add column `event.category` as desc sorting', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={mockDefaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={mockSort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={[]}
-          />
-        </TestProviders>
-      );
-
-      wrapper
-        .find('[data-test-subj="header-event.category"] [data-test-subj="header-sort-button"]')
-        .first()
-        .simulate('click');
-      expect(mockDispatch).toHaveBeenCalledWith(
-        tGridActions.updateSort({
-          id: timelineId,
-          sort: [
-            {
-              columnId: '@timestamp',
-              columnType: 'number',
-              sortDirection: Direction.desc,
-            },
-            {
-              columnId: 'host.name',
-              columnType: 'text',
-              sortDirection: Direction.asc,
-            },
-            { columnId: 'event.category', columnType: 'text', sortDirection: Direction.desc },
-          ],
-        })
-      );
-    });
-
-    test('Change order of column `@timestamp` from desc to asc without changing index position', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={mockDefaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn()}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={mockSort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={[]}
-          />
-        </TestProviders>
-      );
-
-      wrapper
-        .find('[data-test-subj="header-@timestamp"] [data-test-subj="header-sort-button"]')
-        .first()
-        .simulate('click');
-      expect(mockDispatch).toHaveBeenCalledWith(
-        tGridActions.updateSort({
-          id: timelineId,
-          sort: [
-            {
-              columnId: '@timestamp',
-              columnType: 'number',
-              sortDirection: Direction.asc,
-            },
-            { columnId: 'host.name', columnType: 'text', sortDirection: Direction.asc },
-          ],
-        })
-      );
-    });
-
-    test('Change order of column `host.name` from asc to desc without changing index position', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={mockDefaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn()}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={mockSort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={[]}
-          />
-        </TestProviders>
-      );
-
-      wrapper
-        .find('[data-test-subj="header-host.name"] [data-test-subj="header-sort-button"]')
-        .first()
-        .simulate('click');
-      expect(mockDispatch).toHaveBeenCalledWith(
-        tGridActions.updateSort({
-          id: timelineId,
-          sort: [
-            {
-              columnId: '@timestamp',
-              columnType: 'number',
-              sortDirection: Direction.desc,
-            },
-            { columnId: 'host.name', columnType: 'text', sortDirection: Direction.desc },
-          ],
-        })
-      );
-    });
-    test('Does not render the default leading action column header and renders a custom trailing header', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={actionsColumnWidth}
-            browserFields={mockBrowserFields}
-            columnHeaders={mockDefaultHeaders}
-            isSelectAllChecked={false}
-            onSelectAll={jest.fn()}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={mockSort}
-            tabType={TimelineTabs.query}
-            timelineId={timelineId}
-            leadingControlColumns={[]}
-            trailingControlColumns={testTrailingControlColumns}
-          />
-        </TestProviders>
-      );
-
-      expect(wrapper.exists('[data-test-subj="field-browser"]')).toBeFalsy();
-      expect(wrapper.exists('[data-test-subj="test-header-action-cell"]')).toBeTruthy();
-    });
-  });
-});
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/index.tsx
deleted file mode 100644
index 6a8568dcc6179..0000000000000
--- a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/index.tsx
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { DRAG_TYPE_FIELD, droppableTimelineColumnsPrefix } from '@kbn/securitysolution-t-grid';
-import deepEqual from 'fast-deep-equal';
-import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { Droppable, DraggableChildrenFn } from 'react-beautiful-dnd';
-
-import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import type {
-  ControlColumnProps,
-  ColumnHeaderOptions,
-  HeaderActionProps,
-} from '../../../../../common/types/timeline';
-
-import type { BrowserFields } from '../../../../../common/search_strategy/index_fields';
-
-import type { OnSelectAll } from '../../types';
-import {
-  EventsTh,
-  EventsThead,
-  EventsThGroupData,
-  EventsTrHeader,
-  EventsThGroupActions,
-} from '../../styles';
-import { Sort } from '../sort';
-import { ColumnHeader } from './column_header';
-import { DraggableFieldBadge } from '../../../draggables';
-
-interface Props {
-  actionsColumnWidth: number;
-  browserFields: BrowserFields;
-  columnHeaders: ColumnHeaderOptions[];
-  isEventViewer?: boolean;
-  isSelectAllChecked: boolean;
-  onSelectAll: OnSelectAll;
-  showEventsSelect: boolean;
-  showSelectAllCheckbox: boolean;
-  sort: Sort[];
-  tabType: TimelineTabs;
-  timelineId: string;
-  leadingControlColumns: ControlColumnProps[];
-  trailingControlColumns: ControlColumnProps[];
-}
-
-interface DraggableContainerProps {
-  children: React.ReactNode;
-  onMount: () => void;
-  onUnmount: () => void;
-}
-
-export const DraggableContainer = React.memo<DraggableContainerProps>(
-  ({ children, onMount, onUnmount }) => {
-    useEffect(() => {
-      onMount();
-
-      return () => onUnmount();
-    }, [onMount, onUnmount]);
-
-    return <>{children}</>;
-  }
-);
-
-DraggableContainer.displayName = 'DraggableContainer';
-
-export const isFullScreen = ({
-  globalFullScreen,
-  timelineId,
-  timelineFullScreen,
-}: {
-  globalFullScreen: boolean;
-  timelineId: string;
-  timelineFullScreen: boolean;
-}) =>
-  (timelineId === TimelineId.active && timelineFullScreen) ||
-  (timelineId !== TimelineId.active && globalFullScreen);
-
-/** Renders the timeline header columns */
-export const ColumnHeadersComponent = ({
-  actionsColumnWidth,
-  browserFields,
-  columnHeaders,
-  isEventViewer = false,
-  isSelectAllChecked,
-  onSelectAll,
-  showEventsSelect,
-  showSelectAllCheckbox,
-  sort,
-  tabType,
-  timelineId,
-  leadingControlColumns,
-  trailingControlColumns,
-}: Props) => {
-  const [draggingIndex, setDraggingIndex] = useState<number | null>(null);
-
-  const renderClone: DraggableChildrenFn = useCallback(
-    (dragProvided, _dragSnapshot, rubric) => {
-      const index = rubric.source.index;
-      const header = columnHeaders[index];
-
-      const onMount = () => setDraggingIndex(index);
-      const onUnmount = () => setDraggingIndex(null);
-
-      return (
-        <EventsTh
-          data-test-subj="draggable-header"
-          {...dragProvided.draggableProps}
-          {...dragProvided.dragHandleProps}
-          ref={dragProvided.innerRef}
-        >
-          <DraggableContainer onMount={onMount} onUnmount={onUnmount}>
-            <DraggableFieldBadge fieldId={header.id} fieldWidth={header.initialWidth} />
-          </DraggableContainer>
-        </EventsTh>
-      );
-    },
-    [columnHeaders, setDraggingIndex]
-  );
-
-  const ColumnHeaderList = useMemo(
-    () =>
-      columnHeaders.map((header, draggableIndex) => (
-        <ColumnHeader
-          key={header.id}
-          draggableIndex={draggableIndex}
-          timelineId={timelineId}
-          header={header}
-          isDragging={draggingIndex === draggableIndex}
-          sort={sort}
-          tabType={tabType}
-        />
-      )),
-    [columnHeaders, timelineId, draggingIndex, sort, tabType]
-  );
-
-  const DroppableContent = useCallback(
-    (dropProvided, snapshot) => (
-      <>
-        <EventsThGroupData
-          data-test-subj="headers-group"
-          ref={dropProvided.innerRef}
-          isDragging={snapshot.isDraggingOver}
-          {...dropProvided.droppableProps}
-        >
-          {ColumnHeaderList}
-        </EventsThGroupData>
-      </>
-    ),
-    [ColumnHeaderList]
-  );
-
-  const leadingHeaderCells = useMemo(
-    () =>
-      leadingControlColumns ? leadingControlColumns.map((column) => column.headerCellRender) : [],
-    [leadingControlColumns]
-  );
-
-  const trailingHeaderCells = useMemo(
-    () =>
-      trailingControlColumns ? trailingControlColumns.map((column) => column.headerCellRender) : [],
-    [trailingControlColumns]
-  );
-
-  const LeadingHeaderActions = useMemo(() => {
-    return leadingHeaderCells.map(
-      (Header: React.ComponentType<HeaderActionProps> | React.ComponentType | undefined, index) => {
-        const passedWidth = leadingControlColumns[index] && leadingControlColumns[index].width;
-        const width = passedWidth ? passedWidth : actionsColumnWidth;
-        return (
-          <EventsThGroupActions
-            actionsColumnWidth={width}
-            data-test-subj="actions-container"
-            isEventViewer={isEventViewer}
-            key={index}
-          >
-            {Header && (
-              <Header
-                width={width}
-                browserFields={browserFields}
-                columnHeaders={columnHeaders}
-                isEventViewer={isEventViewer}
-                isSelectAllChecked={isSelectAllChecked}
-                onSelectAll={onSelectAll}
-                showEventsSelect={showEventsSelect}
-                showSelectAllCheckbox={showSelectAllCheckbox}
-                sort={sort}
-                tabType={tabType}
-                timelineId={timelineId}
-              />
-            )}
-          </EventsThGroupActions>
-        );
-      }
-    );
-  }, [
-    leadingHeaderCells,
-    leadingControlColumns,
-    actionsColumnWidth,
-    browserFields,
-    columnHeaders,
-    isEventViewer,
-    isSelectAllChecked,
-    onSelectAll,
-    showEventsSelect,
-    showSelectAllCheckbox,
-    sort,
-    tabType,
-    timelineId,
-  ]);
-
-  const TrailingHeaderActions = useMemo(() => {
-    return trailingHeaderCells.map(
-      (Header: React.ComponentType<HeaderActionProps> | React.ComponentType | undefined, index) => {
-        const passedWidth = trailingControlColumns[index] && trailingControlColumns[index].width;
-        const width = passedWidth ? passedWidth : actionsColumnWidth;
-        return (
-          <EventsThGroupActions
-            actionsColumnWidth={width}
-            data-test-subj="actions-container"
-            isEventViewer={isEventViewer}
-            key={index}
-          >
-            {Header && (
-              <Header
-                width={width}
-                browserFields={browserFields}
-                columnHeaders={columnHeaders}
-                isEventViewer={isEventViewer}
-                isSelectAllChecked={isSelectAllChecked}
-                onSelectAll={onSelectAll}
-                showEventsSelect={showEventsSelect}
-                showSelectAllCheckbox={showSelectAllCheckbox}
-                sort={sort}
-                tabType={tabType}
-                timelineId={timelineId}
-              />
-            )}
-          </EventsThGroupActions>
-        );
-      }
-    );
-  }, [
-    trailingHeaderCells,
-    trailingControlColumns,
-    actionsColumnWidth,
-    browserFields,
-    columnHeaders,
-    isEventViewer,
-    isSelectAllChecked,
-    onSelectAll,
-    showEventsSelect,
-    showSelectAllCheckbox,
-    sort,
-    tabType,
-    timelineId,
-  ]);
-  return (
-    <EventsThead data-test-subj="column-headers">
-      <EventsTrHeader>
-        {LeadingHeaderActions}
-        <Droppable
-          direction={'horizontal'}
-          droppableId={`${droppableTimelineColumnsPrefix}-${tabType}.${timelineId}`}
-          isDropDisabled={false}
-          type={DRAG_TYPE_FIELD}
-          renderClone={renderClone}
-        >
-          {DroppableContent}
-        </Droppable>
-        {TrailingHeaderActions}
-      </EventsTrHeader>
-    </EventsThead>
-  );
-};
-
-export const ColumnHeaders = React.memo(
-  ColumnHeadersComponent,
-  (prevProps, nextProps) =>
-    prevProps.actionsColumnWidth === nextProps.actionsColumnWidth &&
-    prevProps.isEventViewer === nextProps.isEventViewer &&
-    prevProps.isSelectAllChecked === nextProps.isSelectAllChecked &&
-    prevProps.onSelectAll === nextProps.onSelectAll &&
-    prevProps.showEventsSelect === nextProps.showEventsSelect &&
-    prevProps.showSelectAllCheckbox === nextProps.showSelectAllCheckbox &&
-    deepEqual(prevProps.sort, nextProps.sort) &&
-    prevProps.timelineId === nextProps.timelineId &&
-    deepEqual(prevProps.columnHeaders, nextProps.columnHeaders) &&
-    prevProps.tabType === nextProps.tabType &&
-    deepEqual(prevProps.browserFields, nextProps.browserFields)
-);
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
index 9655c61c8f155..8ad15580d7bfe 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
@@ -161,7 +161,6 @@ const StatefulEventComponent: React.FC<Props> = ({
       <EventsTrSupplement>
         <StatefulRowRenderer
           ariaRowindex={ariaRowindex}
-          browserFields={browserFields}
           containerRef={containerRef}
           event={event}
           lastFocusedAriaColindex={lastFocusedAriaColindex}
@@ -170,15 +169,7 @@ const StatefulEventComponent: React.FC<Props> = ({
         />
       </EventsTrSupplement>
     ),
-    [
-      ariaRowindex,
-      browserFields,
-      containerRef,
-      event,
-      lastFocusedAriaColindex,
-      rowRenderers,
-      timelineId,
-    ]
+    [ariaRowindex, containerRef, event, lastFocusedAriaColindex, rowRenderers, timelineId]
   );
 
   return (
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx
index 31b1963a24edd..80b6e332e4fcd 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx
@@ -17,7 +17,6 @@ import {
 import { useStatefulEventFocus } from '../use_stateful_event_focus';
 
 import * as i18n from '../translations';
-import type { BrowserFields } from '../../../../../../common/search_strategy/index_fields';
 import type { TimelineItem } from '../../../../../../common/search_strategy';
 import type { RowRenderer } from '../../../../../../common/types/timeline';
 import { getRowRenderer } from '../../renderers/get_row_renderer';
@@ -37,7 +36,6 @@ import { getRowRenderer } from '../../renderers/get_row_renderer';
  */
 export const StatefulRowRenderer = ({
   ariaRowindex,
-  browserFields,
   containerRef,
   event,
   lastFocusedAriaColindex,
@@ -45,7 +43,6 @@ export const StatefulRowRenderer = ({
   timelineId,
 }: {
   ariaRowindex: number;
-  browserFields: BrowserFields;
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
   event: TimelineItem;
   lastFocusedAriaColindex: number;
@@ -78,7 +75,6 @@ export const StatefulRowRenderer = ({
               </EuiScreenReaderOnly>
               <div onKeyDown={onKeyDown}>
                 {rowRenderer.renderRow({
-                  browserFields,
                   data: event.ecs,
                   isDraggable: false,
                   timelineId,
@@ -90,7 +86,6 @@ export const StatefulRowRenderer = ({
       ),
     [
       ariaRowindex,
-      browserFields,
       event.ecs,
       focusOwnership,
       onFocus,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx
index afe7c5954cdad..e17bb341b1408 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx
@@ -9,6 +9,7 @@ import { ALERT_RULE_CONSUMER, ALERT_RULE_PRODUCER } from '@kbn/rule-data-utils';
 import { isEmpty } from 'lodash/fp';
 
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import type { Ecs } from '../../../../common/ecs';
 import type {
   BrowserField,
@@ -22,8 +23,6 @@ import type {
   TimelineEventsType,
 } from '../../../../common/types/timeline';
 
-import type { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const omitTypenameAndEmpty = (k: string, v: any): any | undefined =>
   k !== '__typename' && v != null ? v : undefined;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
index a3d5a35321e80..ee40f80047682 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -36,6 +36,7 @@ import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import styled, { ThemeContext } from 'styled-components';
 import { ALERT_RULE_CONSUMER, ALERT_RULE_PRODUCER } from '@kbn/rule-data-utils';
 import { Filter } from '@kbn/es-query';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import {
   TGridCellAction,
   BulkActionsProp,
@@ -67,7 +68,7 @@ import type { OnRowSelected, OnSelectAll } from '../types';
 import type { FieldBrowserOptions } from '../../../../common/types';
 import type { Refetch } from '../../../store/t_grid/inputs';
 import { getPageRowIndex } from '../../../../common/utils/pagination';
-import { StatefulEventContext } from '../../../components/stateful_event_context';
+import { StatefulEventContext } from '../../stateful_event_context';
 import { StatefulFieldsBrowser } from '../toolbar/fields_browser';
 import { tGridActions, TGridModel, tGridSelectors, TimelineState } from '../../../store/t_grid';
 import { useDeepEqualSelector } from '../../../hooks/use_selector';
@@ -75,7 +76,6 @@ import { RowAction } from './row_action';
 import * as i18n from './translations';
 import { AlertCount } from '../styles';
 import { checkBoxControlColumn } from './control_columns';
-import type { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
 import { ViewSelection } from '../event_rendered_view/selector';
 import { EventRenderedView } from '../event_rendered_view';
 import { REMOVE_COLUMN } from './column_headers/translations';
@@ -851,7 +851,6 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
             <EventRenderedView
               appId={appId}
               alertToolbar={alertToolbar}
-              browserFields={browserFields}
               events={data}
               leadingControlColumns={leadingTGridControlColumns ?? []}
               onChangePage={onChangePage}
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx
index 1a4bfcb0e4ab5..094c2a6559585 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 import { Ecs } from '../../../../../common/ecs';
-import { mockBrowserFields, mockTimelineData } from '../../../../mock';
+import { mockTimelineData } from '../../../../mock';
 
 import { plainRowRenderer } from './plain_row_renderer';
 
@@ -21,7 +21,6 @@ describe('plain_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: false,
       timelineId: 'test',
@@ -36,7 +35,6 @@ describe('plain_row_renderer', () => {
 
   test('should render a plain row', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: false,
       timelineId: 'test',
diff --git a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx
index ca812e2c122d5..fec145b10525e 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { eventRenderedProps, TestProviders } from '../../../mock';
-import { EventRenderedView } from './';
+import { EventRenderedView } from '.';
 
 describe('event_rendered_view', () => {
   test('it renders the timestamp correctly', () => {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
index ef27a6a4c7aed..4e7138aae6cbf 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
@@ -21,9 +21,9 @@ import moment from 'moment';
 import React, { ComponentType, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 
-import type { BrowserFields, TimelineItem } from '../../../../common/search_strategy';
+import type { TimelineItem } from '../../../../common/search_strategy';
 import type { RowRenderer } from '../../../../common/types';
 import { RuleName } from '../../rule_name';
 import { isEventBuildingBlockType } from '../body/helpers';
@@ -62,7 +62,6 @@ const StyledEuiBasicTable = styled(EuiBasicTable as BasicTableType)`
 export interface EventRenderedViewProps {
   alertToolbar: React.ReactNode;
   appId: string;
-  browserFields: BrowserFields;
   events: TimelineItem[];
   leadingControlColumns: EuiDataGridControlColumn[];
   onChangePage: (newActivePage: number) => void;
@@ -85,7 +84,6 @@ export const PreferenceFormattedDate = React.memo(PreferenceFormattedDateCompone
 const EventRenderedViewComponent = ({
   alertToolbar,
   appId,
-  browserFields,
   events,
   leadingControlColumns,
   onChangePage,
@@ -142,7 +140,8 @@ const EventRenderedViewComponent = ({
             </ActionsContainer>
           );
         },
-        width: '152px',
+        // TODO: derive this from ACTION_BUTTON_COUNT as other columns are done
+        width: '184px',
       },
       {
         field: 'ecs.timestamp',
@@ -192,7 +191,6 @@ const EventRenderedViewComponent = ({
                     <EventRenderedFlexItem className="eui-xScroll">
                       <div className="eui-displayInlineBlock">
                         {rowRenderer.renderRow({
-                          browserFields,
                           data: ecsData,
                           isDraggable: false,
                           timelineId: 'NONE',
@@ -207,7 +205,7 @@ const EventRenderedViewComponent = ({
         width: '60%',
       },
     ],
-    [ActionTitle, browserFields, events, leadingControlColumns, rowRenderers, appId]
+    [ActionTitle, events, leadingControlColumns, rowRenderers, appId]
   );
 
   const handleTableChange = useCallback(
diff --git a/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx
index c5f8cb4afd318..20d30151e5ac7 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 
-import { FooterComponent, PagingControlComponent } from './index';
+import { FooterComponent, PagingControlComponent } from '.';
 
 describe('Footer Timeline Component', () => {
   const loadMore = jest.fn();
diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx
index d58cf96e81475..bbf1664ea6474 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx
@@ -8,7 +8,7 @@
 import { euiDarkVars } from '@kbn/ui-theme';
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { TGridIntegrated, TGridIntegratedProps } from './index';
+import { TGridIntegrated, TGridIntegratedProps } from '.';
 import { TestProviders, tGridIntegratedProps } from '../../../mock';
 
 const mockId = tGridIntegratedProps.id;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
index 2991d80c7af0a..59b2f9c1541a1 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
@@ -14,10 +14,12 @@ import { useDispatch } from 'react-redux';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { DataViewBase, Filter, Query } from '@kbn/es-query';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { Direction, EntityType } from '../../../../common/search_strategy';
 import type { DocValueFields } from '../../../../common/search_strategy';
-import type { CoreStart } from '../../../../../../../src/core/public';
 import type { BrowserFields } from '../../../../common/search_strategy/index_fields';
 import {
   BulkActionsProp,
@@ -35,8 +37,6 @@ import type {
   AlertStatus,
 } from '../../../../common/types/timeline';
 
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { useDeepEqualSelector } from '../../../hooks/use_selector';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { buildCombinedQuery, getCombinedFilterQuery, resolverIsShowing } from '../helpers';
diff --git a/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
index f2899547b464e..dbc8f11313797 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
@@ -16,8 +16,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import type { CoreStart } from '../../../../../../../src/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
 
 const heights = {
   tall: 490,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
index be71d159eafca..86fc4bbc163b2 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
@@ -11,9 +11,11 @@ import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Filter, Query } from '@kbn/es-query';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { Direction, EntityType } from '../../../../common/search_strategy';
-import type { CoreStart } from '../../../../../../../src/core/public';
 import { TGridCellAction, TimelineTabs } from '../../../../common/types/timeline';
 
 import type {
@@ -26,8 +28,6 @@ import type {
   BulkActionsProp,
   AlertStatus,
 } from '../../../../common/types/timeline';
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { useDeepEqualSelector } from '../../../hooks/use_selector';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { combineQueries, getCombinedFilterQuery } from '../helpers';
diff --git a/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx
index 37cb2b7fc92e5..00084cbe71c28 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../mock';
 
-import { Subtitle } from './index';
+import { Subtitle } from '.';
 
 describe('Subtitle', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
index 0fde09f555e00..2f580fdaf08e6 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
@@ -16,7 +16,7 @@ import type {
 } from '../../../../../common/types';
 import type { Refetch } from '../../../../store/t_grid/inputs';
 import { tGridActions, TGridModel, tGridSelectors, TimelineState } from '../../../../store/t_grid';
-import { BulkActions } from './';
+import { BulkActions } from '.';
 import { useStatusBulkActionItems } from '../../../../hooks/use_status_bulk_action_items';
 
 interface OwnProps {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx
index fe1c64f90a7f5..a1d8d467a3a60 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx
@@ -9,7 +9,7 @@ import { EuiPopover, EuiButtonEmpty, EuiContextMenuPanel } from '@elastic/eui';
 import numeral from '@elastic/numeral';
 import React, { useState, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
index 293121a4d3a61..d6c2c7de5aa18 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
@@ -9,7 +9,7 @@ import { EuiBadge, EuiLoadingSpinner } from '@elastic/eui';
 import { pickBy } from 'lodash/fp';
 import styled from 'styled-components';
 
-import { TimelineId } from '../../../../../public/types';
+import { TimelineId } from '../../../../types';
 import type { BrowserField, BrowserFields } from '../../../../../common/search_strategy';
 import { defaultHeaders } from '../../../../store/t_grid/defaults';
 import { ColumnHeaderOptions } from '../../../../../common';
diff --git a/x-pack/plugins/timelines/public/container/index.tsx b/x-pack/plugins/timelines/public/container/index.tsx
index 06316739fa307..322cd2bfdc54e 100644
--- a/x-pack/plugins/timelines/public/container/index.tsx
+++ b/x-pack/plugins/timelines/public/container/index.tsx
@@ -12,15 +12,15 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { Subscription } from 'rxjs';
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   clearEventsLoading,
   clearEventsDeleted,
   setTimelineUpdatedAt,
 } from '../store/t_grid/actions';
-
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { isCompleteResponse, isErrorResponse } from '../../../../../src/plugins/data/common';
 import {
   Direction,
   TimelineFactoryQueryTypes,
diff --git a/x-pack/plugins/timelines/public/container/source/index.tsx b/x-pack/plugins/timelines/public/container/source/index.tsx
index 8fa1989698e45..cbe2158784913 100644
--- a/x-pack/plugins/timelines/public/container/source/index.tsx
+++ b/x-pack/plugins/timelines/public/container/source/index.tsx
@@ -11,6 +11,12 @@ import { Subscription } from 'rxjs';
 
 import memoizeOne from 'memoize-one';
 import { DataViewBase } from '@kbn/es-query';
+
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import * as i18n from './translations';
 import {
   BrowserField,
   BrowserFields,
@@ -19,12 +25,6 @@ import {
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse,
 } from '../../../common/search_strategy';
-import * as i18n from './translations';
-
-import type { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../src/plugins/data/common';
-
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useAppToasts } from '../../hooks/use_app_toasts';
 
 const DEFAULT_BROWSER_FIELDS = {};
diff --git a/x-pack/plugins/timelines/public/container/use_update_alerts.ts b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
index a20bebe531d16..373490f8a014f 100644
--- a/x-pack/plugins/timelines/public/container/use_update_alerts.ts
+++ b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { CoreStart } from '../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type { AlertStatus } from '../../../timelines/common/types';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { AlertStatus } from '../../common/types';
 import {
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
   RAC_ALERTS_BULK_UPDATE_URL,
diff --git a/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts b/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts
index 8b05aa6df27a7..4a3cc315ae693 100644
--- a/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts
+++ b/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts
@@ -10,14 +10,9 @@ import { isString } from 'lodash/fp';
 import { isAppError, isKibanaError, isSecurityAppError } from '@kbn/securitysolution-t-grid';
 import type { AppError } from '@kbn/securitysolution-t-grid';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type {
-  ErrorToastOptions,
-  ToastsStart,
-  Toast,
-  NotificationsStart,
-} from '../../../../../src/core/public';
-import { IEsError, isEsError } from '../../../../../src/plugins/data/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { ErrorToastOptions, ToastsStart, Toast, NotificationsStart } from '@kbn/core/public';
+import { IEsError, isEsError } from '@kbn/data-plugin/public';
 
 export type UseAppToasts = Pick<ToastsStart, 'addSuccess' | 'addWarning'> & {
   api: ToastsStart;
diff --git a/x-pack/plugins/timelines/public/methods/index.tsx b/x-pack/plugins/timelines/public/methods/index.tsx
index 7d9ec4bcaab27..3bdb4c77e5fc0 100644
--- a/x-pack/plugins/timelines/public/methods/index.tsx
+++ b/x-pack/plugins/timelines/public/methods/index.tsx
@@ -8,8 +8,8 @@
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import type { Store } from 'redux';
-import type { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { TGridProps } from '../types';
 import type { LastUpdatedAtProps, LoadingPanelProps, FieldBrowserProps } from '../components';
 import { initialTGridState } from '../store/t_grid/reducer';
diff --git a/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts b/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts
index 1121ca2a6e11f..7bd449a622b68 100644
--- a/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts
+++ b/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts
@@ -8,10 +8,10 @@
 import React from 'react';
 
 import { RecursivePartial } from '@elastic/eui/src/components/common';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
-import { CoreStart } from '../../../../../src/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { CoreStart } from '@kbn/core/public';
 
 export const mockGetCreateCaseFlyout = jest.fn();
 export const mockGetAllCasesSelectorModal = jest.fn();
diff --git a/x-pack/plugins/timelines/public/mock/mock_local_storage.ts b/x-pack/plugins/timelines/public/mock/mock_local_storage.ts
index 89fb93a164a17..d76140f60fca8 100644
--- a/x-pack/plugins/timelines/public/mock/mock_local_storage.ts
+++ b/x-pack/plugins/timelines/public/mock/mock_local_storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IStorage, Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { IStorage, Storage } from '@kbn/kibana-utils-plugin/public';
 
 export const localStorageMock = (): IStorage => {
   let store: Record<string, unknown> = {};
diff --git a/x-pack/plugins/timelines/public/mock/t_grid.tsx b/x-pack/plugins/timelines/public/mock/t_grid.tsx
index 4d2ee5c7f8d67..d856cd43cadaf 100644
--- a/x-pack/plugins/timelines/public/mock/t_grid.tsx
+++ b/x-pack/plugins/timelines/public/mock/t_grid.tsx
@@ -134,7 +134,6 @@ export const tGridIntegratedProps: TGridIntegratedProps = {
 export const eventRenderedProps: EventRenderedViewProps = {
   alertToolbar: <></>,
   appId: '',
-  browserFields: mockBrowserFields,
   events: mockTimelineData,
   leadingControlColumns: [],
   onChangePage: () => null,
diff --git a/x-pack/plugins/timelines/public/plugin.ts b/x-pack/plugins/timelines/public/plugin.ts
index f2c2eafab9563..7e550d7140d62 100644
--- a/x-pack/plugins/timelines/public/plugin.ts
+++ b/x-pack/plugins/timelines/public/plugin.ts
@@ -8,8 +8,8 @@
 import { Store, Unsubscribe } from 'redux';
 import { throttle } from 'lodash';
 
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { CoreSetup, Plugin, CoreStart } from '../../../../src/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { CoreSetup, Plugin, CoreStart } from '@kbn/core/public';
 import type { LastUpdatedAtProps, LoadingPanelProps, FieldBrowserProps } from './components';
 import {
   getLastUpdatedLazy,
diff --git a/x-pack/plugins/timelines/public/store/t_grid/index.ts b/x-pack/plugins/timelines/public/store/t_grid/index.ts
index d37c62bc8c265..62ba6f53fa262 100644
--- a/x-pack/plugins/timelines/public/store/t_grid/index.ts
+++ b/x-pack/plugins/timelines/public/store/t_grid/index.ts
@@ -16,7 +16,7 @@ import {
 } from 'redux';
 
 import { createEpicMiddleware } from 'redux-observable';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelineState, TGridEpicDependencies } from '../../types';
 import { tGridReducer } from './reducer';
 import { getTGridByIdSelector } from './selectors';
diff --git a/x-pack/plugins/timelines/public/store/t_grid/model.ts b/x-pack/plugins/timelines/public/store/t_grid/model.ts
index 82a4c3e68fd02..4c872252c4f59 100644
--- a/x-pack/plugins/timelines/public/store/t_grid/model.ts
+++ b/x-pack/plugins/timelines/public/store/t_grid/model.ts
@@ -7,7 +7,7 @@
 
 import type { EuiDataGridColumn } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
-import type { FilterManager } from '../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 import type { TimelineNonEcsData } from '../../../common/search_strategy';
 import type {
   ColumnHeaderOptions,
diff --git a/x-pack/plugins/timelines/public/store/t_grid/types.ts b/x-pack/plugins/timelines/public/store/t_grid/types.ts
index b065a5e1b1e95..c4627b3accd71 100644
--- a/x-pack/plugins/timelines/public/store/t_grid/types.ts
+++ b/x-pack/plugins/timelines/public/store/t_grid/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { ColumnHeaderOptions } from '../../../common/types';
 import type { TGridModel, TGridModelSettings } from './model';
 
diff --git a/x-pack/plugins/timelines/public/types.ts b/x-pack/plugins/timelines/public/types.ts
index 0c9e6aa3e325f..4ebbfd51db6b7 100644
--- a/x-pack/plugins/timelines/public/types.ts
+++ b/x-pack/plugins/timelines/public/types.ts
@@ -8,9 +8,9 @@
 import { ReactElement } from 'react';
 import type { SensorAPI } from 'react-beautiful-dnd';
 import { Store } from 'redux';
-import { CoreStart } from '../../../../src/core/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { CasesUiStart } from '../../cases/public';
+import { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { CasesUiStart } from '@kbn/cases-plugin/public';
 import type {
   LastUpdatedAtProps,
   LoadingPanelProps,
@@ -22,7 +22,7 @@ export type { SortDirection } from '../common/types';
 import type { TGridIntegratedProps } from './components/t_grid/integrated';
 import type { TGridStandaloneProps } from './components/t_grid/standalone';
 import type { UseAddToTimelineProps, UseAddToTimeline } from './hooks/use_add_to_timeline';
-import { HoverActionsConfig } from './components/hover_actions/index';
+import { HoverActionsConfig } from './components/hover_actions';
 import { TimelineTabs } from '../common/types';
 export * from './store/t_grid';
 export interface TimelinesUIStart {
diff --git a/x-pack/plugins/timelines/server/index.ts b/x-pack/plugins/timelines/server/index.ts
index e14ac343ed815..c1f4c17e7d757 100644
--- a/x-pack/plugins/timelines/server/index.ts
+++ b/x-pack/plugins/timelines/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { TimelinesPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/timelines/server/plugin.ts b/x-pack/plugins/timelines/server/plugin.ts
index eb172b7d27bd6..3cc8356a90280 100644
--- a/x-pack/plugins/timelines/server/plugin.ts
+++ b/x-pack/plugins/timelines/server/plugin.ts
@@ -5,20 +5,14 @@
  * 2.0.
  */
 
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../../src/core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { SetupPlugins, StartPlugins, TimelinesPluginUI, TimelinesPluginStart } from './types';
 import { defineRoutes } from './routes';
 import { timelineSearchStrategyProvider } from './search_strategy/timeline';
 import { timelineEqlSearchStrategyProvider } from './search_strategy/timeline/eql';
 import { indexFieldsProvider } from './search_strategy/index_fields';
-import { SecurityPluginSetup } from '../../security/server';
 
 export class TimelinesPlugin
   implements Plugin<TimelinesPluginUI, TimelinesPluginStart, SetupPlugins, StartPlugins>
diff --git a/x-pack/plugins/timelines/server/routes/index.ts b/x-pack/plugins/timelines/server/routes/index.ts
index 1c651469b795a..c4cd611ca6719 100644
--- a/x-pack/plugins/timelines/server/routes/index.ts
+++ b/x-pack/plugins/timelines/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export function defineRoutes(router: IRouter) {
   router.get(
diff --git a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts
index c3af5a764d6a7..75c0add9f0575 100644
--- a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts
@@ -13,13 +13,10 @@ import {
   formatSecondFields,
   createFieldItem,
   requestIndexFieldSearch,
-} from './index';
+} from '.';
 import { mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField } from './mock';
 import { fieldsBeat as beatFields } from '../../utils/beat_schema/fields';
-import {
-  IndexPatternsFetcher,
-  SearchStrategyDependencies,
-} from '../../../../../../src/plugins/data/server';
+import { IndexPatternsFetcher, SearchStrategyDependencies } from '@kbn/data-plugin/server';
 
 describe('Index Fields', () => {
   describe('formatIndexFields', () => {
diff --git a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts
index ecd4862a7bd18..d6d23d7836ae9 100644
--- a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts
@@ -8,13 +8,14 @@
 import { from } from 'rxjs';
 import isEmpty from 'lodash/isEmpty';
 import get from 'lodash/get';
-import { ElasticsearchClient, StartServicesAccessor } from 'kibana/server';
+import { ElasticsearchClient, StartServicesAccessor } from '@kbn/core/server';
 import {
   IndexPatternsFetcher,
   ISearchStrategy,
   SearchStrategyDependencies,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
+import type { FieldSpec } from '@kbn/data-views-plugin/common';
 import { DELETED_SECURITY_SOLUTION_DATA_VIEW } from '../../../common/constants';
 import {
   IndexFieldsStrategyResponse,
@@ -23,7 +24,6 @@ import {
   BeatFields,
 } from '../../../common/search_strategy';
 import { StartPlugins } from '../../types';
-import type { FieldSpec } from '../../../../../../src/plugins/data_views/common';
 
 const apmIndexPattern = 'apm-*-transaction*';
 const apmDataStreamsPattern = 'traces-apm*';
diff --git a/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts b/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts
index 6ec6ca86538bd..b9f573ba8d38f 100644
--- a/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FieldDescriptor } from '../../../../../../src/plugins/data/server';
+import type { FieldDescriptor } from '@kbn/data-plugin/server';
 
 export const mockAuditbeatIndexField: FieldDescriptor[] = [
   {
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts
index a4c8803a758d5..9439f7a6423fb 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { EqlSearchResponse } from '../../../../../common/search_strategy';
 
 export const sequenceResponse = {
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts
index 976f1485ca761..c30a11ef76f1e 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants';
 import {
   EqlSearchResponse,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
index 5ea8fefff7acb..0b59a213e848d 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
@@ -6,15 +6,8 @@
  */
 
 import { map, mergeMap } from 'rxjs/operators';
-import {
-  ISearchStrategy,
-  PluginStart,
-  shimHitsTotal,
-} from '../../../../../../../src/plugins/data/server';
-import {
-  EqlSearchStrategyResponse,
-  EQL_SEARCH_STRATEGY,
-} from '../../../../../../../src/plugins/data/common';
+import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
+import { EqlSearchStrategyResponse, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 import { EqlSearchResponse } from '../../../../common/search_strategy';
 import {
   TimelineEqlRequestOptions,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
index 72770565ea40b..3cec04f52b671 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
@@ -6,8 +6,8 @@
  */
 
 import { cloneDeep, getOr } from 'lodash/fp';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import {
   EventHit,
   TimelineEventsQueries,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
index 04c61a645cf16..1ac0ff00c7db1 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
@@ -14,7 +14,7 @@ import {
   TimelineEventsAllRequestOptions,
   TimelineRequestSortField,
 } from '../../../../../../common/search_strategy';
-import { createQueryFilterClauses } from '../../../../../../server/utils/build_query';
+import { createQueryFilterClauses } from '../../../../../utils/build_query';
 
 export const buildTimelineEventsAllQuery = ({
   authFilter,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts
index 79043f6af3ddd..e0fe70af27c25 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep, merge, unionBy } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   EventHit,
   TimelineEventsQueries,
@@ -16,7 +16,7 @@ import {
   TimelineEventsDetailsItem,
   EventSource,
 } from '../../../../../../common/search_strategy';
-import { inspectStringifyObject } from '../../../../../../server/utils/build_query';
+import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { TimelineFactory } from '../../types';
 import { buildTimelineDetailsQuery } from './query.events_details.dsl';
 import {
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts
index 50484bbda0e6e..0973a96c2672f 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   TimelineEventsQueries,
   TimelineRequestBasicOptions,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts
index 528230d660a40..b83441900a41a 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   TimelineEventsQueries,
   TimelineEventsLastEventTimeStrategyResponse,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts
index 2862713b2d8bb..4f50ef11ff4f8 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { ISearchRequestParams } from 'src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   TimelineEventsLastEventTimeRequestOptions,
   LastEventIndexKey,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts
index 3eb35c88f8ea9..31bb37e077642 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import type {
-  IEsSearchResponse,
-  ISearchRequestParams,
-} from '../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse, ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   TimelineFactoryQueryTypes,
   TimelineStrategyRequestType,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
index 06f3b0e79b052..980f19ac2950c 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
@@ -12,13 +12,16 @@ import {
   AlertingAuthorizationEntity,
   AlertingAuthorizationFilterType,
   PluginStartContract as AlertingPluginStartContract,
-} from '../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import {
   ISearchStrategy,
   PluginStart,
   SearchStrategyDependencies,
   shimHitsTotal,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
+import { ENHANCED_ES_SEARCH_STRATEGY, ISearchOptions } from '@kbn/data-plugin/common';
+import { AuditLogger, SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { AlertAuditAction, alertAuditEvent } from '@kbn/rule-registry-plugin/server';
 import {
   TimelineFactoryQueryTypes,
   TimelineStrategyResponseType,
@@ -28,12 +31,6 @@ import {
 import { timelineFactory } from './factory';
 import { TimelineFactory } from './factory/types';
 import { isAggCardinalityAggregate } from './factory/helpers/is_agg_cardinality_aggregate';
-import {
-  ENHANCED_ES_SEARCH_STRATEGY,
-  ISearchOptions,
-} from '../../../../../../src/plugins/data/common';
-import { AuditLogger, SecurityPluginSetup } from '../../../../security/server';
-import { AlertAuditAction, alertAuditEvent } from '../../../../rule_registry/server';
 
 export const timelineSearchStrategyProvider = <T extends TimelineFactoryQueryTypes>(
   data: PluginStart,
diff --git a/x-pack/plugins/timelines/server/types.ts b/x-pack/plugins/timelines/server/types.ts
index 4367022573037..311281f67ea2a 100644
--- a/x-pack/plugins/timelines/server/types.ts
+++ b/x-pack/plugins/timelines/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { PluginSetup, PluginStart } from '../../../../src/plugins/data/server';
-import { PluginStartContract as AlertingPluginStartContract } from '../../alerting/server';
-import { SecurityPluginSetup } from '../../security/server';
+import type { PluginSetup, PluginStart } from '@kbn/data-plugin/server';
+import { PluginStartContract as AlertingPluginStartContract } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface TimelinesPluginUI {}
diff --git a/x-pack/plugins/transform/common/api_schemas/transforms.ts b/x-pack/plugins/transform/common/api_schemas/transforms.ts
index dd956855250a5..70d6a250eb386 100644
--- a/x-pack/plugins/transform/common/api_schemas/transforms.ts
+++ b/x-pack/plugins/transform/common/api_schemas/transforms.ts
@@ -7,7 +7,7 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import type { ES_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+import type { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 import type { Dictionary } from '../types/common';
 import type { PivotAggDict } from '../types/pivot_aggs';
diff --git a/x-pack/plugins/transform/common/constants.ts b/x-pack/plugins/transform/common/constants.ts
index e1d773025d31e..288aefdda7c5c 100644
--- a/x-pack/plugins/transform/common/constants.ts
+++ b/x-pack/plugins/transform/common/constants.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { TransformHealthTests } from './types/alerting';
 
 export const DEFAULT_REFRESH_INTERVAL_MS = 30000;
diff --git a/x-pack/plugins/transform/common/shared_imports.ts b/x-pack/plugins/transform/common/shared_imports.ts
index 2cc01a0dbfa57..0566086046d0e 100644
--- a/x-pack/plugins/transform/common/shared_imports.ts
+++ b/x-pack/plugins/transform/common/shared_imports.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-export type { ChartData } from '../../ml/common';
+export type { ChartData } from '@kbn/ml-plugin/common';
 export {
   composeValidators,
   isPopulatedObject,
   isRuntimeMappings,
   patternValidator,
   isRuntimeField,
-} from '../../ml/common';
+} from '@kbn/ml-plugin/common';
 
-export { RUNTIME_FIELD_TYPES } from '../../../../src/plugins/data/common';
+export { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
diff --git a/x-pack/plugins/transform/common/types/alerting.ts b/x-pack/plugins/transform/common/types/alerting.ts
index cc031d36f0483..aa08db9a8ce13 100644
--- a/x-pack/plugins/transform/common/types/alerting.ts
+++ b/x-pack/plugins/transform/common/types/alerting.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Rule, RuleTypeParams } from '../../../alerting/common';
+import type { Rule, RuleTypeParams } from '@kbn/alerting-plugin/common';
 
 export type TransformHealthRuleParams = {
   includeTransforms?: string[];
diff --git a/x-pack/plugins/transform/common/types/data_view.ts b/x-pack/plugins/transform/common/types/data_view.ts
index c09b84dea1e4e..98787a1281dbb 100644
--- a/x-pack/plugins/transform/common/types/data_view.ts
+++ b/x-pack/plugins/transform/common/types/data_view.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from '../../../../../src/plugins/data_views/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 
 import { isPopulatedObject } from '../shared_imports';
 
diff --git a/x-pack/plugins/transform/public/__mocks__/shared_imports.ts b/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
index e0788d7747e65..e03cec32d2ca8 100644
--- a/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
+++ b/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
@@ -16,4 +16,4 @@ export const useRequest = jest.fn(() => ({
 export const getSavedSearch = jest.fn();
 
 // just passing through the reimports
-export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '../../../ml/public';
+export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '@kbn/ml-plugin/public';
diff --git a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts
index ffbc0f6021481..dfbe7e3154bf1 100644
--- a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts
+++ b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts
@@ -7,9 +7,9 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { TRANSFORM_RULE_TYPE } from '../../../common';
 import type { TransformHealthRuleParams } from '../../../common/types/alerting';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
 import { getResultTestConfig } from '../../../common/utils/alerts';
 
 export function getTransformHealthRuleType(): RuleTypeModel<TransformHealthRuleParams> {
diff --git a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx
index 2bb857195a398..56bd9a2db877e 100644
--- a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx
+++ b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx
@@ -9,7 +9,7 @@ import { EuiForm, EuiSpacer } from '@elastic/eui';
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { RuleTypeParamsExpressionProps } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import type { TransformHealthRuleParams } from '../../../common/types/alerting';
 import { TestsSelectionControl } from './tests_selection_control';
 import { TransformSelectorControl } from './transform_selector_control';
diff --git a/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx b/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx
index 6aab7b558cf4d..3a3781070a863 100644
--- a/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx
+++ b/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx
@@ -7,19 +7,19 @@
 
 import { useContext } from 'react';
 
-import type { ScopedHistory } from 'kibana/public';
+import type { ScopedHistory } from '@kbn/core/public';
 
-import { coreMock, themeServiceMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { savedObjectsPluginMock } from '../../../../../../src/plugins/saved_objects/public/mocks';
-import { SharePluginStart } from '../../../../../../src/plugins/share/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import type { AppDependencies } from '../app_dependencies';
 import { MlSharedContext } from './shared_context';
 import type { GetMlSharedImportsReturnType } from '../../shared_imports';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 
 const coreSetup = coreMock.createSetup();
 const coreStart = coreMock.createStart();
diff --git a/x-pack/plugins/transform/public/app/app.tsx b/x-pack/plugins/transform/public/app/app.tsx
index ec88882d16425..0680228963add 100644
--- a/x-pack/plugins/transform/public/app/app.tsx
+++ b/x-pack/plugins/transform/public/app/app.tsx
@@ -8,16 +8,13 @@
 import React, { useContext, FC } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Route, Switch } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { EuiErrorBoundary } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
 import { API_BASE_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/transform/public/app/app_dependencies.tsx b/x-pack/plugins/transform/public/app/app_dependencies.tsx
index a89f8d5c944fa..9be316b5f1d16 100644
--- a/x-pack/plugins/transform/public/app/app_dependencies.tsx
+++ b/x-pack/plugins/transform/public/app/app_dependencies.tsx
@@ -16,18 +16,18 @@ import type {
   OverlayStart,
   SavedObjectsStart,
   ThemeServiceStart,
-} from 'kibana/public';
-import type { SavedObjectsStart as SavedObjectsPluginStart } from 'src/plugins/saved_objects/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { ScopedHistory } from 'kibana/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { SpacesPluginStart } from '../../../spaces/public';
+} from '@kbn/core/public';
+import type { SavedObjectsStart as SavedObjectsPluginStart } from '@kbn/saved-objects-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ScopedHistory } from '@kbn/core/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
 
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import type { GetMlSharedImportsReturnType } from '../shared_imports';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
 
 export interface AppDependencies {
   application: ApplicationStart;
diff --git a/x-pack/plugins/transform/public/app/common/data_grid.test.ts b/x-pack/plugins/transform/public/app/common/data_grid.test.ts
index 60218b4f09b2a..31f0a2bc688d8 100644
--- a/x-pack/plugins/transform/public/app/common/data_grid.test.ts
+++ b/x-pack/plugins/transform/public/app/common/data_grid.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPreviewTransformRequestBody, SimpleQuery } from '../common';
+import { getPreviewTransformRequestBody, SimpleQuery } from '.';
 
 import { getIndexDevConsoleStatement, getPivotPreviewDevConsoleStatement } from './data_grid';
 
diff --git a/x-pack/plugins/transform/public/app/common/pivot_aggs.ts b/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
index 42ce5744bcd26..9045191a779cb 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
@@ -7,7 +7,7 @@
 
 import { FC } from 'react';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 import type { AggName } from '../../../common/types/aggregations';
 import type { Dictionary } from '../../../common/types/common';
diff --git a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
index 0ad059fd29950..dd9a63088e791 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { AggName } from '../../../common/types/aggregations';
 import { Dictionary } from '../../../common/types/common';
 import { EsFieldName } from '../../../common/types/fields';
 import { GenericAgg } from '../../../common/types/pivot_group_by';
 import { isPopulatedObject } from '../../../common/shared_imports';
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
 import { PivotAggsConfigWithUiSupport } from './pivot_aggs';
 
 export enum PIVOT_SUPPORTED_GROUP_BY_AGGS {
diff --git a/x-pack/plugins/transform/public/app/common/request.test.ts b/x-pack/plugins/transform/public/app/common/request.test.ts
index 4fa395289de7a..c654596937387 100644
--- a/x-pack/plugins/transform/public/app/common/request.test.ts
+++ b/x-pack/plugins/transform/public/app/common/request.test.ts
@@ -7,7 +7,7 @@
 
 import { PIVOT_SUPPORTED_AGGS } from '../../../common/types/pivot_aggs';
 
-import { PivotGroupByConfig } from '../common';
+import { PivotGroupByConfig } from '.';
 
 import { StepDefineExposedState } from '../sections/create_transform/components/step_define';
 import { StepDetailsExposedState } from '../sections/create_transform/components/step_details';
@@ -29,7 +29,7 @@ import {
   PivotQuery,
 } from './request';
 import { LatestFunctionConfigUI } from '../../../common/types/transform';
-import { RuntimeField } from '../../../../../../src/plugins/data/common';
+import { RuntimeField } from '@kbn/data-plugin/common';
 
 const simpleQuery: PivotQuery = { query_string: { query: 'airline:AAL' } };
 
diff --git a/x-pack/plugins/transform/public/app/common/request.ts b/x-pack/plugins/transform/public/app/common/request.ts
index 6e82bb64b3e86..350f57a3bcf58 100644
--- a/x-pack/plugins/transform/public/app/common/request.ts
+++ b/x-pack/plugins/transform/public/app/common/request.ts
@@ -7,8 +7,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { HttpFetchError } from '../../../../../../src/core/public';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
+import { HttpFetchError } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import {
   DEFAULT_CONTINUOUS_MODE_DELAY,
@@ -40,7 +40,7 @@ import {
   GroupByConfigWithUiSupport,
   PivotAggsConfig,
   PivotGroupByConfig,
-} from './';
+} from '.';
 
 export interface SimpleQuery {
   query_string: {
diff --git a/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx b/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx
index 2539f1cf9bc06..266091f5420b8 100644
--- a/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx
+++ b/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx
@@ -8,13 +8,13 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 
-import { CoreStart } from 'src/core/public';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 import { ToastNotificationText } from './toast_notification_text';
 
 jest.mock('../../shared_imports');
-jest.mock('../../app/app_dependencies');
+jest.mock('../app_dependencies');
 
 describe('ToastNotificationText', () => {
   test('should render the text as plain text', () => {
diff --git a/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx b/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx
index aebe74a539a1c..6409a8fcf3b45 100644
--- a/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx
+++ b/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx
@@ -19,9 +19,9 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 const MAX_SIMPLE_MESSAGE_LENGTH = 140;
 
diff --git a/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts b/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts
index cd46caf931e17..1490a8da28e57 100644
--- a/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts
+++ b/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts
@@ -7,9 +7,9 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import { TransformId } from '../../../../common/types/transform';
 import type { FieldHistogramsResponseSchema } from '../../../../common/api_schemas/field_histograms';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_api.ts b/x-pack/plugins/transform/public/app/hooks/use_api.ts
index 65c0d2050a5ed..251848482f604 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_api.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_api.ts
@@ -9,9 +9,9 @@ import { useMemo } from 'react';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { HttpFetchError } from 'kibana/public';
+import type { HttpFetchError } from '@kbn/core/public';
 
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import type { GetTransformsAuditMessagesResponseSchema } from '../../../common/api_schemas/audit_messages';
 import type {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
index 65a20f2d24ddf..42708f2a3f2e2 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import type {
   DeleteTransformStatus,
   DeleteTransformsRequestSchema,
diff --git a/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts b/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts
index d39edb87432ef..63969e94bfbcf 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   isGetTransformNodesResponseSchema,
   isGetTransformsResponseSchema,
diff --git a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
index d74c11cbaf607..e56731b512ab3 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
@@ -12,7 +12,7 @@ import '@testing-library/jest-dom/extend-expect';
 import { render, screen, waitFor } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { getMlSharedImports, UseIndexDataReturnType } from '../../shared_imports';
 
@@ -27,7 +27,7 @@ jest.mock('./use_api');
 
 import { useAppDependencies } from '../__mocks__/app_dependencies';
 import { MlSharedContext } from '../__mocks__/shared_context';
-import { RuntimeField } from '../../../../../../src/plugins/data/common';
+import { RuntimeField } from '@kbn/data-plugin/common';
 
 const query: SimpleQuery = {
   query_string: {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts
index aa8f5421184e5..b38e77745ba99 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getCombinedProperties } from './use_pivot_data';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 describe('getCombinedProperties', () => {
   test('extracts missing mappings from docs', () => {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts
index d30237abcdb3f..ce94da34fce79 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { getFlattenedObject } from '@kbn/std';
 
 import { difference } from 'lodash';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 import type { PreviewMappingsProperties } from '../../../common/api_schemas/transforms';
 import { isPostTransformsPreviewResponseSchema } from '../../../common/api_schemas/type_guards';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx
index 1687bd751ac19..c33cec3f5b93f 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import type {
   ResetTransformStatus,
   ResetTransformsRequestSchema,
diff --git a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
index 910960cb24eea..07c0a9ae9bcbe 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
@@ -6,13 +6,9 @@
  */
 
 import { buildEsQuery } from '@kbn/es-query';
-import { SavedObjectsClientContract, SimpleSavedObject, IUiSettingsClient } from 'src/core/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/public';
-import {
-  DataView,
-  DataViewAttributes,
-  DataViewsContract,
-} from '../../../../../../../src/plugins/data_views/public';
+import { SavedObjectsClientContract, SimpleSavedObject, IUiSettingsClient } from '@kbn/core/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { DataView, DataViewAttributes, DataViewsContract } from '@kbn/data-views-plugin/public';
 
 import { matchAllQuery } from '../../common';
 
diff --git a/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx
index c8abd13db394d..e4d9bdfe431a9 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import type { StartTransformsRequestSchema } from '../../../common/api_schemas/start_transforms';
 import { isStartTransformsResponseSchema } from '../../../common/api_schemas/type_guards';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx
index 894ac757b396a..39d009e471180 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import type { StopTransformsRequestSchema } from '../../../common/api_schemas/stop_transforms';
 import { isStopTransformsResponseSchema } from '../../../common/api_schemas/type_guards';
diff --git a/x-pack/plugins/transform/public/app/mount_management_section.ts b/x-pack/plugins/transform/public/app/mount_management_section.ts
index 2f47b6d70bc79..851ebf374e3e7 100644
--- a/x-pack/plugins/transform/public/app/mount_management_section.ts
+++ b/x-pack/plugins/transform/public/app/mount_management_section.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public/';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { PluginsDependencies } from '../plugin';
 import { getMlSharedImports } from '../shared_imports';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx
index 4a9e8bcfc6b8d..6699edbfd8f96 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx
@@ -12,7 +12,7 @@ import { EuiFormRow } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { StepDefineFormHook } from '../step_define';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
index cad258d192061..df6a370707c20 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
@@ -10,7 +10,7 @@ import React, { memo, FC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { isRuntimeMappings } from '../../../../../../common/shared_imports';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
index b711a5a0cbb81..665c9986e6e69 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
@@ -9,7 +9,7 @@ import React, { FC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { StepDefineFormHook } from '../step_define';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx
index baf0bbd655925..d5b1139e6cdae 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx
@@ -8,10 +8,10 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
-import { coreMock } from '../../../../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 const startMock = coreMock.createStart();
 
 import { AggName } from '../../../../../../common/types/aggregations';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
index 2b4ab9c09e8c8..762f3bb72863f 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
@@ -11,7 +11,7 @@ import { EuiCode, EuiInputPopover } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { QueryStringInput } from '../../../../../../../../../src/plugins/unified_search/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 
 import { SearchItems } from '../../../../hooks/use_search_items';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx
index 63f76ef326740..2e785c2d6680b 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx
@@ -11,7 +11,7 @@ import { render } from '@testing-library/react';
 import { StepCreateForm, StepCreateFormProps } from './step_create_form';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: <StepCreateForm />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
index bac7754842510..975eacb569b67 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
@@ -24,10 +24,12 @@ import {
 } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { toMountPoint } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { DISCOVER_APP_LOCATOR } from '../../../../../../../../../src/plugins/discover/public';
+import { DISCOVER_APP_LOCATOR } from '@kbn/discover-plugin/public';
 
+import { DuplicateDataViewError } from '@kbn/data-plugin/public';
+import type { RuntimeField } from '@kbn/data-plugin/common';
 import type { PutTransformsResponseSchema } from '../../../../../../common/api_schemas/transforms';
 import {
   isGetTransformsStatsResponseSchema,
@@ -43,12 +45,10 @@ import { useApi } from '../../../../hooks/use_api';
 import { useAppDependencies, useToastNotifications } from '../../../../app_dependencies';
 import { RedirectToTransformManagement } from '../../../../common/navigation';
 import { ToastNotificationText } from '../../../../components';
-import { DuplicateDataViewError } from '../../../../../../../../../src/plugins/data/public';
 import {
   PutTransformsLatestRequestSchema,
   PutTransformsPivotRequestSchema,
 } from '../../../../../../common/api_schemas/transforms';
-import type { RuntimeField } from '../../../../../../../../../src/plugins/data/common';
 import { isPopulatedObject } from '../../../../../../common/shared_imports';
 import { isContinuousTransform, isLatestTransform } from '../../../../../../common/types/transform';
 import { TransformAlertFlyout } from '../../../../../alerting/transform_alerting_flyout';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts
index 61081e7858b27..ea0c5b8c471bd 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { getPivotDropdownOptions } from '../common';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import { getPivotDropdownOptions } from '.';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterAggForm } from './filter_agg/components';
-import type { RuntimeField } from '../../../../../../../../../../src/plugins/data/common';
+import type { RuntimeField } from '@kbn/data-plugin/common';
 
 describe('Transform: Define Pivot Common', () => {
   test('getPivotDropdownOptions()', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx
index 8a8c12dfc5583..d8d81d11b4f60 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiSpacer } from '@elastic/eui';
-import { CodeEditor } from '../../../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { FilterAggConfigEditor } from '../types';
 
 export const FilterEditorForm: FilterAggConfigEditor['aggTypeConfig']['FilterAggFormComponent'] = ({
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx
index 745cd81908ac8..a2305b88fbdda 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx
@@ -10,11 +10,8 @@ import React from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { FilterAggForm } from './filter_agg_form';
 import { CreateTransformWizardContext } from '../../../../wizard/wizard';
-import {
-  KBN_FIELD_TYPES,
-  RuntimeField,
-} from '../../../../../../../../../../../../src/plugins/data/common';
-import { DataView } from '../../../../../../../../../../../../src/plugins/data_views/public';
+import { KBN_FIELD_TYPES, RuntimeField } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterTermForm } from './filter_term_form';
 
 describe('FilterAggForm', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx
index 2fbebc600d6dd..6f590a0e17892 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx
@@ -9,9 +9,9 @@ import React, { useContext, useMemo } from 'react';
 import { EuiFormRow, EuiIcon, EuiSelect, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useUpdateEffect from 'react-use/lib/useUpdateEffect';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { CreateTransformWizardContext } from '../../../../wizard/wizard';
 import { commonFilterAggs, filterAggsFieldSupport } from '../constants';
-import { DataView } from '../../../../../../../../../../../../src/plugins/data_views/public';
 import { getFilterAggTypeConfig } from '../config';
 import type { FilterAggType, PivotAggsConfigFilter } from '../types';
 import type { RuntimeMappings } from '../../types';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts
index d0388861b20ce..20f6828f47beb 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../../src/plugins/data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { FilterAggType } from './types';
 
 export const FILTERS = {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts
index 5c4ff5a53f724..0aa29ed5af3b2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts
@@ -6,11 +6,8 @@
  */
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
-import {
-  ES_FIELD_TYPES,
-  KBN_FIELD_TYPES,
-} from '../../../../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 import { getNestedProperty } from '../../../../../../../common/utils/object_utils';
 import { removeKeywordPostfix } from '../../../../../../../common/utils/field_utils';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts
index 6e5a34fa6ef2b..e97d47864313c 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import { EsFieldName } from '../../../../../../../common/types/fields';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts
index d69183820db71..5d53c1e3f4264 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts
@@ -8,7 +8,7 @@
 import { useEffect, useState } from 'react';
 import { XJsonMode } from '@kbn/ace';
 
-import { XJson } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 import { PostTransformsPreviewRequestSchema } from '../../../../../../../common/api_schemas/transforms';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
index ec9c0392e7f17..03483a4258ee3 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
@@ -7,8 +7,8 @@
 
 import { useState } from 'react';
 import { XJsonMode } from '@kbn/ace';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import { StepDefineExposedState } from '../common';
-import { XJson } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
 
 const { useXJsonMode } = XJson;
 const xJsonMode = new XJsonMode();
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts
index 46d5d1b562a84..fe4d332f4a91b 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts
@@ -8,11 +8,11 @@
 import { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBoxOptionOption } from '@elastic/eui';
+import { AggConfigs, FieldParamType } from '@kbn/data-plugin/common';
 import { LatestFunctionConfigUI } from '../../../../../../../common/types/transform';
 import { StepDefineFormProps } from '../step_define_form';
 import { StepDefineExposedState } from '../common';
 import { LatestFunctionConfig } from '../../../../../../../common/api_schemas/transforms';
-import { AggConfigs, FieldParamType } from '../../../../../../../../../../src/plugins/data/common';
 import { useAppDependencies } from '../../../../../app_dependencies';
 
 /**
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts
index c16270a6a2dca..75450a4df16c1 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts
@@ -8,6 +8,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { AggName } from '../../../../../../../common/types/aggregations';
 import { dictionaryToArray } from '../../../../../../../common/types/common';
 
@@ -33,7 +34,6 @@ import {
 } from '../../../../../common/pivot_aggs';
 import { TransformPivotConfig } from '../../../../../../../common/types/transform';
 import { PIVOT_SUPPORTED_AGGS } from '../../../../../../../common/types/pivot_aggs';
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/common';
 import { isPivotAggConfigWithUiSupport } from '../../../../../common/pivot_group_by';
 
 /**
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts
index b8c818720f0a9..486e9e4da79e2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts
@@ -8,7 +8,7 @@
 import { useState } from 'react';
 
 import { toElasticsearchQuery, fromKueryExpression, luceneStringToDsl } from '@kbn/es-query';
-import { Query } from '../../../../../../../../../../src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 import { getPivotQuery } from '../../../../../common';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
index 054deb23eac50..628d2ad62ea8e 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
@@ -10,10 +10,10 @@ import { render } from '@testing-library/react';
 
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
-import { coreMock } from '../../../../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 const startMock = coreMock.createStart();
 
 import { PIVOT_SUPPORTED_AGGS } from '../../../../../../common/types/pivot_aggs';
@@ -29,9 +29,9 @@ import { getAggNameConflictToastMessages } from './common';
 import { StepDefineForm } from './step_define_form';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
-import { MlSharedContext } from '../../../../../app/__mocks__/shared_context';
+import { MlSharedContext } from '../../../../__mocks__/shared_context';
 import { getMlSharedImports } from '../../../../../shared_imports';
 
 const createMockWebStorage = () => ({
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx
index 1b2d5872e53b6..daa51169ffcef 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx
@@ -21,9 +21,9 @@ import { StepDefineExposedState } from './common';
 import { StepDefineSummary } from './step_define_summary';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
-import { MlSharedContext } from '../../../../../app/__mocks__/shared_context';
+import { MlSharedContext } from '../../../../__mocks__/shared_context';
 import { getMlSharedImports } from '../../../../../shared_imports';
 
 describe('Transform: <DefinePivotSummary />', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
index 06096c470d3b9..141eed06e7ef8 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
@@ -24,8 +24,8 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/common';
-import { toMountPoint } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import {
   isEsIndices,
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx
index c16756d0923e9..6873661fcfec2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiSteps, EuiStepStatus } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import type { TransformConfigUnion } from '../../../../../../common/types/transform';
 
 import { getCreateTransformRequestBody } from '../../../../common';
@@ -31,7 +32,6 @@ import {
   StepDetailsSummary,
 } from '../step_details';
 import { WizardNav } from '../wizard_nav';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import type { RuntimeMappings } from '../step_define/common/types';
 
 enum WIZARD_STEPS {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
index 85e5e1ce9a83e..1fb0d69682cda 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { DeleteActionName, DeleteActionNameProps } from './delete_action_name';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List Actions <DeleteAction />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
index 0f73f6aac40d3..4fb0f9e655208 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
@@ -17,7 +17,7 @@ import { isDiscoverActionDisabled, DiscoverActionName } from './discover_action_
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 // @ts-expect-error mock data is too loosely typed
 const item: TransformListRow = transformListRow;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx
index 71a45b572f833..9194d9f63045e 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { DISCOVER_APP_LOCATOR } from '../../../../../../../../../src/plugins/discover/public';
+import { DISCOVER_APP_LOCATOR } from '@kbn/discover-plugin/public';
 
 import { TransformListAction, TransformListRow } from '../../../../common';
 
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
index 490651afc7e96..ba4619b022620 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
@@ -14,7 +14,7 @@ import { StartActionName, StartActionNameProps } from './start_action_name';
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List Actions <StartAction />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
index 54a5e026135df..9496dbd82c70d 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
@@ -14,7 +14,7 @@ import { StopActionName, StopActionNameProps } from './stop_action_name';
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List Actions <StopAction />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
index fd0ca655f3056..f5e46a60ebb68 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
@@ -19,14 +19,13 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isEsIngestPipelines } from '../../../../../../common/api_schemas/type_guards';
 import { EditTransformFlyoutFormTextInput } from './edit_transform_flyout_form_text_input';
 import { UseEditTransformFlyoutReturnType } from './use_edit_transform_flyout';
 import { useAppDependencies } from '../../../../app_dependencies';
 import { useApi } from '../../../../hooks/use_api';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/common';
-
 interface EditTransformFlyoutFormProps {
   editTransformFlyout: UseEditTransformFlyoutReturnType;
   dataViewId?: string;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx
index 391ea16ecd89e..4adc6077abb9e 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx
@@ -9,7 +9,7 @@ import { EuiModalBody, EuiModalHeader, EuiModalHeaderTitle } from '@elastic/eui'
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { FC } from 'react';
-import { SavedObjectFinderUi } from '../../../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useAppDependencies } from '../../../../app_dependencies';
 
 interface SearchSelectionProps {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx
index e9ef4a4373116..e77de4b668eca 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx
@@ -15,9 +15,9 @@ import transformListRow from '../../../../common/__mocks__/transform_list_row.js
 import { within } from '@testing-library/dom';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
-import { MlSharedContext } from '../../../../../app/__mocks__/shared_context';
+import { MlSharedContext } from '../../../../__mocks__/shared_context';
 import { getMlSharedImports } from '../../../../../shared_imports';
 
 describe('Transform: Transform List <ExpandedRow />', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
index 76aed7dd13e51..51dfc449b89b2 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
@@ -17,7 +17,7 @@ import { SearchItems } from '../../../../hooks/use_search_items';
 import {
   applyTransformConfigToDefineState,
   getDefaultStepDefineState,
-} from '../../../create_transform/components/step_define/';
+} from '../../../create_transform/components/step_define';
 
 interface ExpandedRowPreviewPaneProps {
   transformConfig: TransformConfigUnion;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx
index ac00d31a620b9..430fa9478f60a 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { TransformList } from './transform_list';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List <TransformList />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx
index 68adbca5d662f..a56b58ba8f089 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx
@@ -8,7 +8,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 import { useActions } from './use_actions';
 
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx
index a26ccf0348c9a..82d1a7091b8a5 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx
@@ -10,7 +10,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useColumns } from './use_columns';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Job List Columns', () => {
   test('useColumns()', async () => {
diff --git a/x-pack/plugins/transform/public/app/services/es_index_service.ts b/x-pack/plugins/transform/public/app/services/es_index_service.ts
index 88b54a7487f92..5a0f907b78e22 100644
--- a/x-pack/plugins/transform/public/app/services/es_index_service.ts
+++ b/x-pack/plugins/transform/public/app/services/es_index_service.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { HttpSetup, SavedObjectsClientContract } from 'kibana/public';
+import { HttpSetup, SavedObjectsClientContract } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { API_BASE_PATH } from '../../../common/constants';
-import { DataView } from '../../../../../../src/plugins/data_views/public';
 
 export class IndexService {
   async canDeleteIndex(http: HttpSetup) {
diff --git a/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts b/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts
index 37d0ee3a92b75..4f4ff93289ae3 100644
--- a/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts
+++ b/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { textService } from '../text';
 
-import { ManagementAppMountParams } from '../../../../../../../src/plugins/management/public';
-
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
 export enum BREADCRUMB_SECTION {
diff --git a/x-pack/plugins/transform/public/plugin.ts b/x-pack/plugins/transform/public/plugin.ts
index a7d0dce256640..74cd845dd49da 100644
--- a/x-pack/plugins/transform/public/plugin.ts
+++ b/x-pack/plugins/transform/public/plugin.ts
@@ -7,16 +7,16 @@
 
 import { i18n as kbnI18n } from '@kbn/i18n';
 
-import type { CoreSetup } from 'src/core/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { SavedObjectsStart } from 'src/plugins/saved_objects/public';
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { SpacesApi } from '../../spaces/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { registerFeature } from './register_feature';
-import type { PluginSetupContract as AlertingSetup } from '../../alerting/public';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../triggers_actions_ui/public';
 import { getTransformHealthRuleType } from './alerting';
 
 export interface PluginsDependencies {
diff --git a/x-pack/plugins/transform/public/register_feature.ts b/x-pack/plugins/transform/public/register_feature.ts
index d105424052411..b72682f7a5c81 100644
--- a/x-pack/plugins/transform/public/register_feature.ts
+++ b/x-pack/plugins/transform/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  HomePublicPluginSetup,
-  FeatureCatalogueCategory,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export const registerFeature = (home: HomePublicPluginSetup) => {
   // register Transforms so it appears on the Kibana home page
@@ -25,6 +22,6 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     icon: 'managementApp', // there is currently no Transforms icon, so using the general management app icon
     path: '/app/management/data/transform',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
   });
 };
diff --git a/x-pack/plugins/transform/public/shared_imports.ts b/x-pack/plugins/transform/public/shared_imports.ts
index c8375af88a213..4c035753390dd 100644
--- a/x-pack/plugins/transform/public/shared_imports.ts
+++ b/x-pack/plugins/transform/public/shared_imports.ts
@@ -6,21 +6,18 @@
  */
 
 export { XJsonMode } from '@kbn/ace';
-export type { UseRequestConfig } from '../../../../src/plugins/es_ui_shared/public';
-export { useRequest } from '../../../../src/plugins/es_ui_shared/public';
-export {
-  getSavedSearch,
-  getSavedSearchUrlConflictMessage,
-} from '../../../../src/plugins/discover/public';
+export type { UseRequestConfig } from '@kbn/es-ui-shared-plugin/public';
+export { useRequest } from '@kbn/es-ui-shared-plugin/public';
+export { getSavedSearch, getSavedSearchUrlConflictMessage } from '@kbn/discover-plugin/public';
 
 export type {
   GetMlSharedImportsReturnType,
   UseIndexDataReturnType,
   EsSorting,
   RenderCellValue,
-} from '../../ml/public';
-export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '../../ml/public';
+} from '@kbn/ml-plugin/public';
+export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '@kbn/ml-plugin/public';
 
-import { XJson } from '../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 const { expandLiteralStrings, collapseLiteralStrings } = XJson;
 export { expandLiteralStrings, collapseLiteralStrings };
diff --git a/x-pack/plugins/transform/server/index.ts b/x-pack/plugins/transform/server/index.ts
index 9bd3ffe418b1e..0688210a78137 100644
--- a/x-pack/plugins/transform/server/index.ts
+++ b/x-pack/plugins/transform/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { TransformServerPlugin } from './plugin';
 
diff --git a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts
index 04a4685c45892..3288fa86a789d 100644
--- a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts
+++ b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts
@@ -6,18 +6,18 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type {
   ActionGroup,
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeState,
-} from '../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { RuleType } from '@kbn/alerting-plugin/server';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
 import { PLUGIN, TRANSFORM_RULE_TYPE } from '../../../../common/constants';
 import { transformHealthRuleParams, TransformHealthRuleParams } from './schema';
-import { RuleType } from '../../../../../alerting/server';
 import { transformHealthServiceProvider } from './transform_health_service';
-import type { PluginSetupContract as AlertingSetup } from '../../../../../alerting/server';
 
 export interface BaseResponse {
   transform_id: string;
diff --git a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
index 90b6c2fbcba60..a00c41f7ec3a1 100644
--- a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
+++ b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { keyBy } from 'lodash';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 import { TransformHealthRuleParams } from './schema';
 import {
   ALL_TRANSFORMS_SELECTION,
@@ -22,7 +23,6 @@ import {
   NotStartedTransformResponse,
   TransformHealthAlertContext,
 } from './register_transform_health_rule_type';
-import type { RulesClient } from '../../../../../alerting/server';
 import type { TransformHealthAlertRule } from '../../../../common/types/alerting';
 import { isContinuousTransform } from '../../../../common/types/transform';
 import { ML_DF_NOTIFICATION_INDEX_PATTERN } from '../../../routes/api/transforms_audit_messages';
diff --git a/x-pack/plugins/transform/server/plugin.ts b/x-pack/plugins/transform/server/plugin.ts
index 6e542bbefc3e1..c803785de2c4b 100644
--- a/x-pack/plugins/transform/server/plugin.ts
+++ b/x-pack/plugins/transform/server/plugin.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 import { Dependencies } from './types';
 import { ApiRoutes } from './routes';
diff --git a/x-pack/plugins/transform/server/routes/api/error_utils.ts b/x-pack/plugins/transform/server/routes/api/error_utils.ts
index d9b892b7afcee..6f02b1978506f 100644
--- a/x-pack/plugins/transform/server/routes/api/error_utils.ts
+++ b/x-pack/plugins/transform/server/routes/api/error_utils.ts
@@ -9,7 +9,7 @@ import Boom from '@hapi/boom';
 
 import { i18n } from '@kbn/i18n';
 
-import { ResponseError, CustomHttpResponseOptions } from 'src/core/server';
+import { ResponseError, CustomHttpResponseOptions } from '@kbn/core/server';
 
 import { CommonResponseStatusSchema, TransformIdsSchema } from '../../../common/api_schemas/common';
 import { DeleteTransformsResponseSchema } from '../../../common/api_schemas/delete_transforms';
diff --git a/x-pack/plugins/transform/server/routes/api/field_histograms.ts b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
index 5f464949a4fc8..c9623f262b5e0 100644
--- a/x-pack/plugins/transform/server/routes/api/field_histograms.ts
+++ b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
@@ -13,7 +13,7 @@ import {
 import { getHistogramsForFields } from '../../shared_imports';
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { wrapError, wrapEsError } from './error_utils';
 
@@ -32,8 +32,9 @@ export function registerFieldHistogramsRoutes({ router, license }: RouteDependen
         const { query, fields, runtimeMappings, samplerShardSize } = req.body;
 
         try {
+          const esClient = (await ctx.core).elasticsearch.client;
           const resp = await getHistogramsForFields(
-            ctx.core.elasticsearch.client,
+            esClient,
             dataViewTitle,
             query,
             fields,
diff --git a/x-pack/plugins/transform/server/routes/api/privileges.ts b/x-pack/plugins/transform/server/routes/api/privileges.ts
index c952ebcf264d2..bad077100c83a 100644
--- a/x-pack/plugins/transform/server/routes/api/privileges.ts
+++ b/x-pack/plugins/transform/server/routes/api/privileges.ts
@@ -9,7 +9,7 @@ import { APP_CLUSTER_PRIVILEGES, APP_INDEX_PRIVILEGES } from '../../../common/co
 import { Privileges } from '../../../common/types/privileges';
 
 import { RouteDependencies } from '../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerPrivilegesRoute({ router, license }: RouteDependencies) {
   router.get(
@@ -28,9 +28,10 @@ export function registerPrivilegesRoute({ router, license }: RouteDependencies)
         return res.ok({ body: privilegesResult });
       }
 
+      const esClient = (await ctx.core).elasticsearch.client;
       // Get cluster privileges
       const { has_all_requested: hasAllPrivileges, cluster } =
-        await ctx.core.elasticsearch.client.asCurrentUser.security.hasPrivileges({
+        await esClient.asCurrentUser.security.hasPrivileges({
           body: {
             // @ts-expect-error SecurityClusterPrivilege doesn’t contain all the priviledges
             cluster: APP_CLUSTER_PRIVILEGES,
@@ -42,8 +43,7 @@ export function registerPrivilegesRoute({ router, license }: RouteDependencies)
       privilegesResult.hasAllPrivileges = hasAllPrivileges;
 
       // Get all index privileges the user has
-      const { indices } =
-        await ctx.core.elasticsearch.client.asCurrentUser.security.getUserPrivileges();
+      const { indices } = await esClient.asCurrentUser.security.getUserPrivileges();
 
       // Check if they have all the required index privileges for at least one index
       const oneIndexWithAllPrivileges = indices.find(({ privileges }: { privileges: string[] }) => {
diff --git a/x-pack/plugins/transform/server/routes/api/transforms.ts b/x-pack/plugins/transform/server/routes/api/transforms.ts
index 78b51fca58547..f1c5e74056a94 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms.ts
@@ -14,8 +14,9 @@ import {
   RequestHandler,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
+import { DataView } from '@kbn/data-views-plugin/common';
 import { TRANSFORM_STATE } from '../../../common/constants';
 import {
   transformIdParamSchema,
@@ -56,12 +57,11 @@ import {
 
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { isRequestTimeout, fillResultsWithTimeouts, wrapError, wrapEsError } from './error_utils';
 import { registerTransformsAuditMessagesRoutes } from './transforms_audit_messages';
 import { registerTransformNodesRoutes } from './transforms_nodes';
-import { DataView } from '../../../../../../src/plugins/data_views/common';
 import { isLatestTransform } from '../../../common/types/transform';
 import { isKeywordDuplicate } from '../../../common/utils/field_utils';
 import { transformHealthServiceProvider } from '../../lib/alerting/transform_health_rule_type/transform_health_service';
@@ -90,15 +90,17 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
     license.guardApiRoute<estypes.TransformGetTransformRequest, undefined, undefined>(
       async (ctx, req, res) => {
         try {
-          const body = await ctx.core.elasticsearch.client.asCurrentUser.transform.getTransform({
+          const esClient = (await ctx.core).elasticsearch.client;
+          const body = await esClient.asCurrentUser.transform.getTransform({
             size: 1000,
             ...req.params,
           });
 
-          if (ctx.alerting) {
+          const alerting = await ctx.alerting;
+          if (alerting) {
             const transformHealthService = transformHealthServiceProvider(
-              ctx.core.elasticsearch.client.asCurrentUser,
-              ctx.alerting.getRulesClient()
+              esClient.asCurrentUser,
+              alerting.getRulesClient()
             );
 
             // @ts-ignore
@@ -130,7 +132,8 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
     license.guardApiRoute<TransformIdParamSchema, undefined, undefined>(async (ctx, req, res) => {
       const { transformId } = req.params;
       try {
-        const body = await ctx.core.elasticsearch.client.asCurrentUser.transform.getTransform({
+        const esClient = (await ctx.core).elasticsearch.client;
+        const body = await esClient.asCurrentUser.transform.getTransform({
           transform_id: transformId,
         });
         return res.ok({ body });
@@ -152,11 +155,11 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
     license.guardApiRoute<estypes.TransformGetTransformStatsResponse, undefined, undefined>(
       async (ctx, req, res) => {
         try {
-          const body =
-            await ctx.core.elasticsearch.client.asCurrentUser.transform.getTransformStats({
-              size: 1000,
-              transform_id: '_all',
-            });
+          const esClient = (await ctx.core).elasticsearch.client;
+          const body = await esClient.asCurrentUser.transform.getTransformStats({
+            size: 1000,
+            transform_id: '_all',
+          });
           return res.ok({ body });
         } catch (e) {
           return res.customError(wrapError(wrapEsError(e)));
@@ -182,7 +185,8 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
     license.guardApiRoute<TransformIdParamSchema, undefined, undefined>(async (ctx, req, res) => {
       const { transformId } = req.params;
       try {
-        const body = await ctx.core.elasticsearch.client.asCurrentUser.transform.getTransformStats({
+        const esClient = (await ctx.core).elasticsearch.client;
+        const body = await esClient.asCurrentUser.transform.getTransformStats({
           transform_id: transformId,
         });
         return res.ok({ body });
@@ -219,7 +223,8 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
           errors: [],
         };
 
-        await ctx.core.elasticsearch.client.asCurrentUser.transform
+        const esClient = (await ctx.core).elasticsearch.client;
+        await esClient.asCurrentUser.transform
           .putTransform({
             // @ts-expect-error @elastic/elasticsearch group_by is expected to be optional in TransformPivot
             body: req.body,
@@ -263,7 +268,8 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
         const { transformId } = req.params;
 
         try {
-          const body = await ctx.core.elasticsearch.client.asCurrentUser.transform.updateTransform({
+          const esClient = (await ctx.core).elasticsearch.client;
+          const body = await esClient.asCurrentUser.transform.updateTransform({
             // @ts-expect-error query doesn't satisfy QueryDslQueryContainer from @elastic/elasticsearch
             body: req.body,
             transform_id: transformId,
@@ -437,7 +443,8 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
     },
     license.guardApiRoute(async (ctx, req, res) => {
       try {
-        const body = await ctx.core.elasticsearch.client.asCurrentUser.search(req.body);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const body = await esClient.asCurrentUser.search(req.body);
         return res.ok({ body });
       } catch (e) {
         return res.customError(wrapError(wrapEsError(e)));
@@ -482,6 +489,10 @@ async function deleteTransforms(
 
   const results: DeleteTransformsResponseSchema = {};
 
+  const coreContext = await ctx.core;
+  const esClient = coreContext.elasticsearch.client;
+  const soClient = coreContext.savedObjects.client;
+
   for (const transformInfo of transformsInfo) {
     let destinationIndex: string | undefined;
 
@@ -501,7 +512,7 @@ async function deleteTransforms(
       if (!shouldForceDelete) {
         // Grab destination index info to delete
         try {
-          const body = await ctx.core.elasticsearch.client.asCurrentUser.transform.getTransform({
+          const body = await esClient.asCurrentUser.transform.getTransform({
             transform_id: transformId,
           });
           const transformConfig = body.transforms[0];
@@ -525,7 +536,7 @@ async function deleteTransforms(
         try {
           // If user does have privilege to delete the index, then delete the index
           // if no permission then return 403 forbidden
-          await ctx.core.elasticsearch.client.asCurrentUser.indices.delete({
+          await esClient.asCurrentUser.indices.delete({
             index: destinationIndex,
           });
           destIndexDeleted.success = true;
@@ -537,9 +548,9 @@ async function deleteTransforms(
       // Delete the data view if there's a data view that matches the name of dest index
       if (destinationIndex && deleteDestDataView) {
         try {
-          const dataViewId = await getDataViewId(destinationIndex, ctx.core.savedObjects.client);
+          const dataViewId = await getDataViewId(destinationIndex, soClient);
           if (dataViewId) {
-            await deleteDestDataViewById(dataViewId, ctx.core.savedObjects.client);
+            await deleteDestDataViewById(dataViewId, soClient);
             destDataViewDeleted.success = true;
           }
         } catch (deleteDestDataViewError) {
@@ -548,7 +559,7 @@ async function deleteTransforms(
       }
 
       try {
-        await ctx.core.elasticsearch.client.asCurrentUser.transform.deleteTransform({
+        await esClient.asCurrentUser.transform.deleteTransform({
           transform_id: transformId,
           force: shouldForceDelete && needToForceDelete,
         });
@@ -589,6 +600,7 @@ async function resetTransforms(
   const { transformsInfo } = reqBody;
 
   const results: ResetTransformsResponseSchema = {};
+  const esClient = (await ctx.core).elasticsearch.client;
 
   for (const transformInfo of transformsInfo) {
     const transformReset: ResponseStatus = { success: false };
@@ -596,7 +608,7 @@ async function resetTransforms(
 
     try {
       try {
-        await ctx.core.elasticsearch.client.asCurrentUser.transform.resetTransform({
+        await esClient.asCurrentUser.transform.resetTransform({
           transform_id: transformId,
         });
         transformReset.success = true;
@@ -632,12 +644,13 @@ const previewTransformHandler: RequestHandler<
 > = async (ctx, req, res) => {
   try {
     const reqBody = req.body;
-    const body = await ctx.core.elasticsearch.client.asCurrentUser.transform.previewTransform({
+    const esClient = (await ctx.core).elasticsearch.client;
+    const body = await esClient.asCurrentUser.transform.previewTransform({
       body: reqBody,
     });
     if (isLatestTransform(reqBody)) {
       // for the latest transform mappings properties have to be retrieved from the source
-      const fieldCapsResponse = await ctx.core.elasticsearch.client.asCurrentUser.fieldCaps({
+      const fieldCapsResponse = await esClient.asCurrentUser.fieldCaps({
         index: reqBody.source.index,
         fields: '*',
         include_unmapped: false,
@@ -676,7 +689,8 @@ const startTransformsHandler: RequestHandler<
   const transformsInfo = req.body;
 
   try {
-    const body = await startTransforms(transformsInfo, ctx.core.elasticsearch.client.asCurrentUser);
+    const esClient = (await ctx.core).elasticsearch.client;
+    const body = await startTransforms(transformsInfo, esClient.asCurrentUser);
     return res.ok({
       body,
     });
@@ -721,8 +735,9 @@ const stopTransformsHandler: RequestHandler<
   const transformsInfo = req.body;
 
   try {
+    const esClient = (await ctx.core).elasticsearch.client;
     return res.ok({
-      body: await stopTransforms(transformsInfo, ctx.core.elasticsearch.client.asCurrentUser),
+      body: await stopTransforms(transformsInfo, esClient.asCurrentUser),
     });
   } catch (e) {
     return res.customError(wrapError(wrapEsError(e)));
diff --git a/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts b/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts
index 4be207a21ac29..bd3e7d101624e 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts
@@ -10,7 +10,7 @@ import { AuditMessage } from '../../../common/types/messages';
 
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { wrapError, wrapEsError } from './error_utils';
 
@@ -78,7 +78,8 @@ export function registerTransformsAuditMessagesRoutes({ router, license }: Route
       }
 
       try {
-        const resp = await ctx.core.elasticsearch.client.asCurrentUser.search<AuditMessage>({
+        const esClient = (await ctx.core).elasticsearch.client;
+        const resp = await esClient.asCurrentUser.search<AuditMessage>({
           index: ML_DF_NOTIFICATION_INDEX_PATTERN,
           ignore_unavailable: true,
           size: SIZE,
diff --git a/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts b/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts
index 0ab01cdeb61c8..426dc3d4fa342 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts
@@ -12,7 +12,7 @@ import { isPopulatedObject } from '../../../common/shared_imports';
 
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { wrapError, wrapEsError } from './error_utils';
 
@@ -48,11 +48,12 @@ export function registerTransformNodesRoutes({ router, license }: RouteDependenc
     },
     license.guardApiRoute<undefined, undefined, undefined>(async (ctx, req, res) => {
       try {
+        const esClient = (await ctx.core).elasticsearch.client;
         // If security is enabled, check that the user has at least permission to
         // view transforms before calling the _nodes endpoint with the internal user.
         if (license.getStatus().isSecurityEnabled === true) {
           const { has_all_requested: hasAllPrivileges } =
-            await ctx.core.elasticsearch.client.asCurrentUser.security.hasPrivileges({
+            await esClient.asCurrentUser.security.hasPrivileges({
               body: {
                 // @ts-expect-error SecurityClusterPrivilege doesn’t contain all the priviledges
                 cluster: NODES_INFO_PRIVILEGES,
@@ -64,7 +65,7 @@ export function registerTransformNodesRoutes({ router, license }: RouteDependenc
           }
         }
 
-        const { nodes } = await ctx.core.elasticsearch.client.asInternalUser.nodes.info({
+        const { nodes } = await esClient.asInternalUser.nodes.info({
           filter_path: `nodes.*.${NODE_ROLES}`,
         });
 
diff --git a/x-pack/plugins/transform/server/services/license.ts b/x-pack/plugins/transform/server/services/license.ts
index ce28e0365bb21..7a54f45de707b 100644
--- a/x-pack/plugins/transform/server/services/license.ts
+++ b/x-pack/plugins/transform/server/services/license.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   IKibanaResponse,
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
-  RequestHandlerContext,
-} from 'kibana/server';
+  CustomRequestHandlerContext,
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup, LicenseType } from '../../../licensing/server';
-import type { AlertingApiRequestHandlerContext } from '../../../alerting/server';
+import { LicensingPluginSetup, LicenseType } from '@kbn/licensing-plugin/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
 
 export interface LicenseStatus {
   isValid: boolean;
@@ -29,9 +29,9 @@ interface SetupSettings {
   defaultErrorMessage: string;
 }
 
-type TransformRequestHandlerContext = RequestHandlerContext & {
+type TransformRequestHandlerContext = CustomRequestHandlerContext<{
   alerting?: AlertingApiRequestHandlerContext;
-};
+}>;
 
 export class License {
   private licenseStatus: LicenseStatus = {
@@ -75,7 +75,7 @@ export class License {
     const license = this;
 
     return function licenseCheck(
-      ctx: RequestHandlerContext,
+      ctx: TransformRequestHandlerContext,
       request: KibanaRequest<Params, Query, Body>,
       response: KibanaResponseFactory
     ): IKibanaResponse<any> | Promise<IKibanaResponse<any>> {
diff --git a/x-pack/plugins/transform/server/shared_imports.ts b/x-pack/plugins/transform/server/shared_imports.ts
index ebef6d9ea0ffc..dbb216a541694 100644
--- a/x-pack/plugins/transform/server/shared_imports.ts
+++ b/x-pack/plugins/transform/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { getHistogramsForFields } from '../../ml/server';
+export { getHistogramsForFields } from '@kbn/ml-plugin/server';
diff --git a/x-pack/plugins/transform/server/types.ts b/x-pack/plugins/transform/server/types.ts
index 53f13cc752650..f9be90a1a20da 100644
--- a/x-pack/plugins/transform/server/types.ts
+++ b/x-pack/plugins/transform/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import { IRouter } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { AlertingPlugin } from '@kbn/alerting-plugin/server';
 import { License } from './services';
-import type { AlertingPlugin } from '../../alerting/server';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index a1abc744c3336..43b4cbb3b2496 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -102,7 +102,7 @@
     "xpack.lens.indexPattern.counterRate.documentation.markdown": "\nCalcule le taux d'un compteur toujours croissant. Cette fonction renvoie uniquement des résultats utiles inhérents aux champs d'indicateurs de compteur qui contiennent une mesure quelconque à croissance régulière.\nSi la valeur diminue, elle est interprétée comme une mesure de réinitialisation de compteur. Pour obtenir des résultats plus précis, \"counter_rate\" doit être calculé d’après la valeur \"max\" du champ.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\nIl utilise l'intervalle en cours utilisé dans la formule.\n\nExemple : visualiser le taux d'octets reçus au fil du temps par un serveur Memcached :\n`counter_rate(max(memcached.stats.read.bytes))`\n      ",
     "xpack.lens.indexPattern.cumulativeSum.documentation.markdown": "\nCalcule la somme cumulée d'un indicateur au fil du temps, en ajoutant toutes les valeurs précédentes d'une série à chaque valeur. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nExemple : visualiser les octets reçus cumulés au fil du temps :\n`cumulative_sum(sum(bytes))`\n      ",
     "xpack.lens.indexPattern.differences.documentation.markdown": "\nCalcule la différence par rapport à la dernière valeur d'un indicateur au fil du temps. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\nLes données doivent être séquentielles pour les différences. Si vos données sont vides lorsque vous utilisez des différences, essayez d'augmenter l'intervalle de l'histogramme de dates.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nExemple : visualiser la modification des octets reçus au fil du temps :\n`differences(sum(bytes))`\n      ",
-    "xpack.lens.indexPattern.lastValue.documentation.markdown": "\nRenvoie la valeur d'un champ du dernier document, triée par le champ d'heure par défaut du modèle d'indexation.\n\nCette fonction permet de récupérer le dernier état d'une entité.\n\nExemple : obtenir le statut actuel du serveur A :\n`last_value(server.status, kql='server.name=\"A\"')`\n      ",
+    "xpack.lens.indexPattern.lastValue.documentation.markdown": "\nRenvoie la valeur d'un champ du dernier document, triée par le champ d'heure par défaut de la vue de données.\n\nCette fonction permet de récupérer le dernier état d'une entité.\n\nExemple : obtenir le statut actuel du serveur A :\n`last_value(server.status, kql='server.name=\"A\"')`\n      ",
     "xpack.lens.indexPattern.metric.documentation.markdown": "\nRenvoie l'indicateur {metric} d'un champ. Cette fonction fonctionne uniquement pour les champs numériques.\n\nExemple : obtenir l'indicateur {metric} d'un prix :\n\"{metric}(price)\"\n\nExemple : obtenir l'indicateur {metric} d'un prix pour des commandes du Royaume-Uni :\n\"{metric}(price, kql='location:UK')\"\n      ",
     "xpack.lens.indexPattern.movingAverage.documentation.markdown": "\nCalcule la moyenne mobile d'un indicateur au fil du temps, en prenant la moyenne des n dernières valeurs pour calculer la valeur actuelle. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\nLa valeur de fenêtre par défaut est {defaultValue}.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nPrend un paramètre nommé \"window\" qui spécifie le nombre de dernières valeurs à inclure dans le calcul de la moyenne de la valeur actuelle.\n\nExemple : lisser une ligne de mesures :\n`moving_average(sum(bytes), window=5)`\n      ",
     "xpack.lens.indexPattern.overall_average.documentation.markdown": "\nCalcule la moyenne d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_average\" calcule la moyenne pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : écart par rapport à la moyenne :\n\"sum(bytes) - overall_average(sum(bytes))\"\n      ",
@@ -110,13 +110,22 @@
     "xpack.lens.indexPattern.overall_min.documentation.markdown": "\nCalcule la valeur minimale d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_min\" calcule la valeur minimale pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de plage\n\"(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))\"\n      ",
     "xpack.lens.indexPattern.overall_sum.documentation.markdown": "\nCalcule la somme d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_sum\" calcule la somme pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de total\n\"sum(bytes) / overall_sum(sum(bytes))\"\n      ",
     "xpack.lens.indexPattern.percentile.documentation.markdown": "\nRenvoie le centile spécifié des valeurs d'un champ. Il s'agit de la valeur de n pour cent des valeurs présentes dans les documents.\n\nExemple : obtenir le nombre d'octets supérieurs à 95 % des valeurs :\n`percentile(bytes, percentile=95)`\n      ",
+    "xpack.lens.advancedSettings.useFieldExistenceSampling.description": "Lorsque cette option est activée, l’échantillonnage de document est utilisé pour déterminer l’existence des champs (disponibles ou vides) pour la liste de champs Lens au lieu de se fonder sur les mappings d’index.",
+    "xpack.lens.advancedSettings.useFieldExistenceSampling.title": "Utiliser l’échantillonnage d’existence des champs",
     "xpack.lens.app.addToLibrary": "Enregistrer dans la bibliothèque",
     "xpack.lens.app.cancel": "Annuler",
     "xpack.lens.app.cancelButtonAriaLabel": "Retour à la dernière application sans enregistrer les modifications",
     "xpack.lens.app.docLoadingError": "Erreur lors du chargement du document enregistré",
     "xpack.lens.app.downloadButtonAriaLabel": "Télécharger les données en fichier CSV",
     "xpack.lens.app.downloadButtonFormulasWarning": "Votre fichier CSV contient des caractères que les applications de feuilles de calcul pourraient considérer comme des formules.",
-    "xpack.lens.app.downloadCSV": "Télécharger en tant que CSV",
+    "xpack.lens.app.downloadCSV": "Télécharger au format CSV",
+    "xpack.lens.app.goBackLabel": "Retour vers {contextOriginatingApp}",
+    "xpack.lens.app.goBackModalCancelBtn": "Annuler",
+    "xpack.lens.app.goBackModalMessage": "Les modifications que vous avez effectuées ici ne sont pas rétrocompatibles avec votre visualisation {contextOriginatingApp} d’origine. Êtes-vous sûr de vouloir abandonner ces modifications non enregistrées et revenir à {contextOriginatingApp} ?",
+    "xpack.lens.app.goBackModalTitle": "Abandonner les modifications ?",
+    "xpack.lens.app.inspect": "Inspecter",
+    "xpack.lens.app.inspectAriaLabel": "inspecter",
+    "xpack.lens.app.lensContext": "Contexte Lens ({language})",
     "xpack.lens.app.save": "Enregistrer",
     "xpack.lens.app.saveAndReturn": "Enregistrer et revenir",
     "xpack.lens.app.saveAndReturnButtonAriaLabel": "Enregistrer la visualisation Lens en cours et revenir à l'application précédente",
@@ -124,17 +133,26 @@
     "xpack.lens.app.saveButtonAriaLabel": "Enregistrer la visualisation Lens en cours",
     "xpack.lens.app.saveModalType": "Visualisation Lens",
     "xpack.lens.app.saveVisualization.successNotificationText": "\"{visTitle}\" enregistré",
+    "xpack.lens.app.showUnderlyingDataMultipleLayers": "Impossible d’afficher les données sous-jacentes pour les visualisations avec plusieurs calques.",
+    "xpack.lens.app.showUnderlyingDataNoData": "La visualisation ne comprend aucune donnée disponible à afficher.",
+    "xpack.lens.app.showUnderlyingDataTimeShifts": "Impossible d’afficher les données sous-jacentes lorsqu’un décalage temporel est configuré.",
+    "xpack.lens.app.showUnderlyingDataUnsupportedDatasource": "Les données sous-jacentes sont incompatibles avec la source de données actuelle.",
     "xpack.lens.app.unsavedFilename": "non enregistré",
+    "xpack.lens.app.unsavedWorkConfirmBtn": "Abandonner les modifications",
     "xpack.lens.app.unsavedWorkMessage": "Quitter Lens avec un travail non enregistré ?",
     "xpack.lens.app.unsavedWorkTitle": "Modifications non enregistrées",
     "xpack.lens.app.updatePanel": "Mettre à jour le panneau sur {originatingAppName}",
     "xpack.lens.app404": "404 Page introuvable",
+    "xpack.lens.appName": "Visualisation Lens",
     "xpack.lens.breadcrumbsByValue": "Modifier la visualisation",
     "xpack.lens.breadcrumbsCreate": "Créer",
-    "xpack.lens.breadcrumbsTitle": "Visualiser la bibliothèque",
-    "xpack.lens.chartSwitch.dataLossDescription": "La sélection de ce type de visualisation entraînera une perte partielle des sélections de configuration actuellement appliquées.",
+    "xpack.lens.breadcrumbsTitle": "Bibliothèque Visualize",
+    "xpack.lens.chart.labelVisibility.auto": "Auto",
+    "xpack.lens.chart.labelVisibility.custom": "Personnalisé",
+    "xpack.lens.chart.labelVisibility.none": "Aucun",
+    "xpack.lens.chartSwitch.dataLossDescription": "La sélection de ce type de visualisation entraîne la suppression des options de configuration incompatibles et des calques multiples, le cas échéant.",
     "xpack.lens.chartSwitch.dataLossLabel": "Avertissement",
-    "xpack.lens.chartSwitch.experimentalLabel": "Expérimental",
+    "xpack.lens.chartSwitch.experimentalLabel": "Version d’évaluation technique",
     "xpack.lens.chartSwitch.noResults": "Résultats introuvables pour {term}.",
     "xpack.lens.chartTitle.unsaved": "Visualisation non enregistrée",
     "xpack.lens.chartWarnings.number": "{warningsCount} {warningsCount, plural, one {avertissement} other {avertissements}}",
@@ -142,23 +160,32 @@
     "xpack.lens.configPanel.color.tooltip.auto": "Lens choisit automatiquement des couleurs à votre place sauf si vous spécifiez une couleur personnalisée.",
     "xpack.lens.configPanel.color.tooltip.custom": "Effacez la couleur personnalisée pour revenir au mode \"Auto\".",
     "xpack.lens.configPanel.color.tooltip.disabled": "Les séries individuelles n'acceptent pas les couleurs personnalisées lorsque le calque inclut l'option \"Répartir par\".",
+    "xpack.lens.configPanel.selectLayerType": "Sélectionner le type de calque",
     "xpack.lens.configPanel.selectVisualization": "Sélectionner une visualisation",
     "xpack.lens.configPanel.visualizationType": "Type de visualisation",
     "xpack.lens.configure.configurePanelTitle": "{groupLabel}",
     "xpack.lens.configure.editConfig": "Modifier la configuration {label}",
     "xpack.lens.configure.emptyConfig": "Ajouter ou glisser-déposer un champ",
+    "xpack.lens.configure.emptyConfigClick": "Ajouter une annotation",
+    "xpack.lens.configure.invalidBottomReferenceLineDimension": "La ligne de référence est affectée à un axe qui n’existe plus ou qui n’est plus valide. Vous pouvez déplacer cette ligne de référence vers un autre axe disponible ou la supprimer.",
     "xpack.lens.configure.invalidConfigTooltip": "Configuration non valide.",
     "xpack.lens.configure.invalidConfigTooltipClick": "Cliquez pour en savoir plus.",
+    "xpack.lens.configure.invalidReferenceLineDimension": "La ligne de référence est affectée à un axe qui n’existe plus. Vous pouvez déplacer cette ligne de référence vers un autre axe disponible ou la supprimer.",
+    "xpack.lens.configure.suggestedValuee": "Valeur suggérée : {value}",
+    "xpack.lens.confirmModal.cancelButtonLabel": "Annuler",
+    "xpack.lens.confirmModal.saveDuplicateButtonLabel": "Enregistrer {name}",
+    "xpack.lens.confirmModal.saveDuplicateConfirmationMessage": "Il y a déjà une occurrence de {name} avec le titre \"{title}\". Voulez-vous tout de même enregistrer ?",
     "xpack.lens.customBucketContainer.dragToReorder": "Faire glisser pour réorganiser",
     "xpack.lens.dataPanelWrapper.switchDatasource": "Basculer vers la source de données",
-    "xpack.lens.datatable.addLayer": "Ajouter un calque de visualisation",
+    "xpack.lens.datatable.addLayer": "Visualisation",
     "xpack.lens.datatable.breakdownColumns": "Colonnes",
     "xpack.lens.datatable.breakdownColumns.description": "Divisez les colonnes d'indicateurs par champ. Il est recommandé de conserver un faible nombre de colonnes pour éviter le défilement horizontal.",
     "xpack.lens.datatable.breakdownRows": "Lignes",
     "xpack.lens.datatable.breakdownRows.description": "Divisez le tableau par champ. Cette opération est recommandée pour les répartitions à cardinalité élevée.",
+    "xpack.lens.datatable.column.help": "Colonne de tableau de données",
     "xpack.lens.datatable.conjunctionSign": " &amp; ",
     "xpack.lens.datatable.expressionHelpLabel": "Outil de rendu de tableaux de données",
-    "xpack.lens.datatable.groupLabel": "Valeur tabulaire et unique",
+    "xpack.lens.datatable.groupLabel": "Tabulaire",
     "xpack.lens.datatable.label": "Tableau",
     "xpack.lens.datatable.metrics": "Indicateurs",
     "xpack.lens.datatable.suggestionLabel": "En tant que tableau",
@@ -181,6 +208,9 @@
     "xpack.lens.dragDrop.altOption": "Alt/Option",
     "xpack.lens.dragDrop.announce.cancelled": "Mouvement annulé. {label} revenu à sa position initiale",
     "xpack.lens.dragDrop.announce.cancelledItem": "Mouvement annulé. {label} revenu au groupe {groupLabel} à la position {position}",
+    "xpack.lens.dragDrop.announce.combine.short": " Maintenir la touche Contrôle enfoncée pour combiner",
+    "xpack.lens.dragDrop.announce.dropped.combineCompatible": "Combinaison de {label} avec {dropGroupLabel} à la position {dropPosition} et de {dropLabel} avec {groupLabel} à la position {position}",
+    "xpack.lens.dragDrop.announce.dropped.combineIncompatible": "Conversion de {label} en {nextLabel} dans le groupe {groupLabel} à la position {position} et combinaison avec {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition}",
     "xpack.lens.dragDrop.announce.dropped.duplicated": "{label} dupliqué dans le groupe {groupLabel} à la position {position}",
     "xpack.lens.dragDrop.announce.dropped.duplicateIncompatible": "Copie de {label} convertie en {nextLabel} et ajoutée au groupe {groupLabel} à la position {position}",
     "xpack.lens.dragDrop.announce.dropped.moveCompatible": "{label} déplacé dans le groupe {groupLabel} à la position {position}",
@@ -193,9 +223,14 @@
     "xpack.lens.dragDrop.announce.droppedDefault": "{label} ajouté dans le groupe {dropGroupLabel} à la position {position}",
     "xpack.lens.dragDrop.announce.droppedNoPosition": "{label} ajouté à {dropLabel}",
     "xpack.lens.dragDrop.announce.duplicate.short": " Maintenez la touche Alt ou Option enfoncée pour dupliquer.",
+    "xpack.lens.dragDrop.announce.duplicated.combine": "Combiner {dropLabel} avec {label} dans {groupLabel} à la position {position}",
     "xpack.lens.dragDrop.announce.duplicated.replace": "{dropLabel} remplacé par {label} dans {groupLabel} à la position {position}",
     "xpack.lens.dragDrop.announce.duplicated.replaceDuplicateCompatible": "{dropLabel} remplacé par une copie de {label} dans {groupLabel} à la position {position}",
     "xpack.lens.dragDrop.announce.lifted": "{label} levé",
+    "xpack.lens.dragDrop.announce.selectedTarget.combine": "Combinez {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition} avec {label}. Appuyez sur la barre d’espace ou sur Entrée pour combiner.",
+    "xpack.lens.dragDrop.announce.selectedTarget.combineCompatible": "Combinez {label} dans le groupe {groupLabel} à la position {position} avec {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition}. Maintenez la touche Contrôle enfoncée et appuyez sur la barre d’espace ou sur Entrée pour combiner.",
+    "xpack.lens.dragDrop.announce.selectedTarget.combineIncompatible": "Convertissez {label} en {nextLabel} dans le groupe {groupLabel} à la position {position} et combinez avec {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition}. Maintenez la touche Contrôle enfoncée et appuyez sur la barre d’espace ou sur Entrée pour combiner.",
+    "xpack.lens.dragDrop.announce.selectedTarget.combineMain": "Vous faites glisser {label} à partir de {groupLabel} à la position {position} sur {dropLabel} à partir du groupe {dropGroupLabel} à la position {dropPosition}. Appuyer sur la barre d’espace ou sur Entrée pour combiner {dropLabel} avec {label}.{duplicateCopy}{swapCopy}{combineCopy}",
     "xpack.lens.dragDrop.announce.selectedTarget.default": "Ajoutez {label} au groupe {dropGroupLabel} à la position {position}. Appuyer sur la barre d'espace ou sur Entrée pour ajouter",
     "xpack.lens.dragDrop.announce.selectedTarget.defaultNoPosition": "Ajoutez {label} à {dropLabel}. Appuyer sur la barre d'espace ou sur Entrée pour ajouter",
     "xpack.lens.dragDrop.announce.selectedTarget.duplicated": "Dupliquez {label} dans le groupe {dropGroupLabel} à la position {position}. Maintenir la touche Alt ou Option enfoncée et appuyer sur la barre d'espace ou sur Entrée pour dupliquer",
@@ -217,37 +252,54 @@
     "xpack.lens.dragDrop.announce.selectedTarget.swapCompatible": "Permutez {label} dans le groupe {groupLabel} à la position {position} avec {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition}. Maintenir la touche Maj enfoncée tout en appuyant sur la barre d'espace ou sur Entrée pour permuter",
     "xpack.lens.dragDrop.announce.selectedTarget.swapIncompatible": "Convertir {label} en {nextLabel} dans le groupe {groupLabel} à la position {position} et permutez avec {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition}. Maintenir la touche Maj enfoncée tout en appuyant sur la barre d'espace ou sur Entrée pour permuter",
     "xpack.lens.dragDrop.announce.swap.short": " Maintenez la touche Maj enfoncée pour permuter.",
+    "xpack.lens.dragDrop.combine": "Combiner",
+    "xpack.lens.dragDrop.control": "Contrôle",
     "xpack.lens.dragDrop.duplicate": "Dupliquer",
     "xpack.lens.dragDrop.keyboardInstructions": "Appuyez sur la barre d'espace ou sur Entrée pour commencer à faire glisser. Lors du glissement, utilisez les touches fléchées gauche/droite pour vous déplacer entre les cibles de dépôt. Appuyez à nouveau sur la barre d'espace ou sur Entrée pour terminer.",
     "xpack.lens.dragDrop.keyboardInstructionsReorder": "Appuyez sur la barre d'espace ou sur Entrée pour commencer à faire glisser. Lors du glissement, utilisez les touches fléchées haut/bas pour réorganiser les éléments dans le groupe et les touches gauche/droite pour choisir les cibles de dépôt à l'extérieur du groupe. Appuyez à nouveau sur la barre d'espace ou sur Entrée pour terminer.",
     "xpack.lens.dragDrop.shift": "Déplacer",
     "xpack.lens.dragDrop.swap": "Permuter",
-    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "Supprimer",
+    "xpack.lens.editorFrame.applyChangesLabel": "Appliquer",
     "xpack.lens.editorFrame.buildExpressionError": "Une erreur inattendue s'est produite lors de la préparation du graphique",
     "xpack.lens.editorFrame.colorIndicatorLabel": "Couleur de cette dimension : {hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} {errors, plural, one {erreur} other {erreurs}}",
     "xpack.lens.editorFrame.dataFailure": "Une erreur s'est produite lors du chargement des données.",
+    "xpack.lens.editorFrame.dataViewNotFound": "Vue de données introuvable",
+    "xpack.lens.editorFrame.dataViewReconfigure": "Recréez-la dans la page de gestion des vues de données.",
     "xpack.lens.editorFrame.emptyWorkspace": "Déposer quelques champs ici pour commencer",
-    "xpack.lens.editorFrame.emptyWorkspaceHeading": "Lens est un nouvel outil permettant de créer des visualisations",
+    "xpack.lens.editorFrame.emptyWorkspaceHeading": "Lens est l’éditeur recommandé pour la création de visualisations.",
     "xpack.lens.editorFrame.emptyWorkspaceSimple": "Déposer le champ ici",
     "xpack.lens.editorFrame.expandRenderingErrorButton": "Afficher les détails de l'erreur",
     "xpack.lens.editorFrame.expressionFailure": "Une erreur s'est produite dans l'expression",
     "xpack.lens.editorFrame.expressionFailureMessage": "Erreur de requête : {type}, {reason}",
     "xpack.lens.editorFrame.expressionFailureMessageWithContext": "Erreur de requête : {type}, {reason} dans {context}",
     "xpack.lens.editorFrame.expressionMissingDatasource": "Impossible de trouver la source de données pour la visualisation",
+    "xpack.lens.editorFrame.expressionMissingDataView": "{count, plural, one {Vue de données introuvable} other {Vues de données introuvables}} : {ids}.",
     "xpack.lens.editorFrame.expressionMissingVisualizationType": "Type de visualisation non trouvé.",
     "xpack.lens.editorFrame.goToForums": "Formuler des requêtes et donner un retour",
     "xpack.lens.editorFrame.invisibleIndicatorLabel": "Cette dimension n'est pas visible actuellement dans le graphique",
     "xpack.lens.editorFrame.networkErrorMessage": "Erreur réseau, réessayez plus tard ou contactez votre administrateur.",
     "xpack.lens.editorFrame.noColorIndicatorLabel": "Cette dimension n'a pas de couleur individuelle",
+    "xpack.lens.editorFrame.optionalDimensionLabel": "Facultatif",
     "xpack.lens.editorFrame.paletteColorIndicatorLabel": "Cette dimension utilise une palette",
     "xpack.lens.editorFrame.previewErrorLabel": "L'aperçu du rendu a échoué",
+    "xpack.lens.editorFrame.requiresFieldWarningLabel": "Nécessite un champ.",
+    "xpack.lens.editorFrame.requiresTwoOrMoreFieldsWarningLabel": "Nécessite des champs {requiredMinDimensionCount}.",
     "xpack.lens.editorFrame.suggestionPanelTitle": "Suggestions",
     "xpack.lens.editorFrame.workspaceLabel": "Espace de travail",
     "xpack.lens.embeddable.failure": "Impossible d'afficher la visualisation",
     "xpack.lens.embeddable.fixErrors": "Effectuez des modifications dans l'éditeur Lens pour corriger l'erreur",
+    "xpack.lens.embeddable.legacyURLConflict.shortMessage": "Vous avez rencontré un conflit d’URL.",
+    "xpack.lens.embeddable.missingTimeRangeParam.longMessage": "La propriété timeRange est requise pour cette configuration.",
+    "xpack.lens.embeddable.missingTimeRangeParam.shortMessage": "Propriété timeRange manquante",
     "xpack.lens.embeddable.moreErrors": "Effectuez des modifications dans l'éditeur Lens pour afficher plus d'erreurs",
     "xpack.lens.embeddableDisplayName": "lens",
+    "xpack.lens.endValue.nearest": "La plus proche",
+    "xpack.lens.endValue.none": "Masquer",
+    "xpack.lens.endValue.zero": "Zéro",
+    "xpack.lens.endValueDescription.nearest": "Étendre la série avec la première/dernière valeur au bord du graphique",
+    "xpack.lens.endValueDescription.none": "Ne pas étendre la série au bord du graphique",
+    "xpack.lens.endValueDescription.zero": "Étendre la série au bord du graphique avec la valeur zéro",
     "xpack.lens.fieldFormats.longSuffix.d": "par jour",
     "xpack.lens.fieldFormats.longSuffix.h": "par heure",
     "xpack.lens.fieldFormats.longSuffix.m": "par minute",
@@ -312,30 +364,53 @@
     "xpack.lens.functions.counterRate.args.outputColumnIdHelpText": "Colonne dans laquelle le taux de compteur résultant sera stocké",
     "xpack.lens.functions.counterRate.args.outputColumnNameHelpText": "Nom de la colonne dans laquelle le taux de compteur résultant sera stocké",
     "xpack.lens.functions.counterRate.help": "Calcule le taux de compteur d'une colonne dans un tableau de données",
-    "xpack.lens.functions.lastValue.missingSortField": "Ce modèle d'indexation ne contient aucun champ de date",
+    "xpack.lens.functions.lastValue.missingSortField": "Cette vue de données ne contient aucun champ de date.",
     "xpack.lens.functions.mergeTables.help": "Aide pour fusionner n'importe quel nombre de tableaux Kibana en un tableau unique et l'exposer via un adaptateur d'inspecteur",
     "xpack.lens.functions.renameColumns.help": "Aide pour renommer les colonnes d'un tableau de données",
     "xpack.lens.functions.renameColumns.idMap.help": "Un objet encodé JSON dans lequel les clés sont les anciens ID de colonne et les valeurs sont les nouveaux ID correspondants. Tous les autres ID de colonne sont conservés.",
     "xpack.lens.functions.timeScale.dateColumnMissingMessage": "L'ID de colonne de date {columnId} n'existe pas.",
     "xpack.lens.functions.timeScale.timeInfoMissingMessage": "Impossible de récupérer les informations d'histogramme des dates",
+    "xpack.lens.gauge.addLayer": "Visualisation",
+    "xpack.lens.gauge.appearanceLabel": "Apparence",
+    "xpack.lens.gauge.dynamicColoring.label": "Couleurs de bande",
+    "xpack.lens.gauge.gaugeLabel": "Jauge",
+    "xpack.lens.gauge.goalValueLabel": "Valeur de l’objectif",
+    "xpack.lens.gauge.maxValueLabel": "Valeur maximale",
+    "xpack.lens.gauge.metricLabel": "Indicateur",
+    "xpack.lens.gauge.minValueLabel": "Valeur minimale",
+    "xpack.lens.gaugeHorizontal.gaugeLabel": "Horizontal à jauge",
+    "xpack.lens.gaugeVertical.gaugeLabel": "Vertical à jauge",
+    "xpack.lens.gaugeVisualization.goalValueGreaterMaximumShortMessage": "La valeur de l’objectif est supérieure à la valeur maximale.",
+    "xpack.lens.gaugeVisualization.metricValueGreaterMaximumShortMessage": "La valeur de l’indicateur est supérieure à la valeur maximale.",
+    "xpack.lens.gaugeVisualization.minimumValueGreaterGoalShortMessage": "La valeur minimale est supérieure à la valeur de l’objectif.",
+    "xpack.lens.gaugeVisualization.minValueGreaterMetricShortMessage": "La valeur minimale est supérieure à la valeur de l’indicateur.",
     "xpack.lens.geoFieldWorkspace.dropMessage": "Déposer le champ ici pour l'ouvrir dans Maps",
     "xpack.lens.geoFieldWorkspace.dropZoneLabel": "zone de dépôt pour ouvrir dans Maps",
-    "xpack.lens.heatmap.addLayer": "Ajouter un calque de visualisation",
+    "xpack.lens.guageVisualization.chartCannotRenderEqual": "Les valeurs minimale et maximale peuvent ne pas être égales.",
+    "xpack.lens.guageVisualization.chartCannotRenderMinGreaterMax": "La valeur minimale peut ne pas être supérieure à la valeur maximale.",
+    "xpack.lens.heatmap.addLayer": "Visualisation",
     "xpack.lens.heatmap.cellValueLabel": "Valeur de cellule",
     "xpack.lens.heatmap.groupLabel": "Carte thermique",
     "xpack.lens.heatmap.heatmapLabel": "Carte thermique",
+    "xpack.lens.heatmap.horizontalAxisDisabledHelpText": "Ce paramètre s'applique uniquement lorsque l'axe horizontal est activé.",
     "xpack.lens.heatmap.horizontalAxisLabel": "Axe horizontal",
+    "xpack.lens.heatmap.verticalAxisDisabledHelpText": "Ce paramètre s'applique uniquement lorsque l'axe vertical est activé.",
     "xpack.lens.heatmap.verticalAxisLabel": "Axe vertical",
     "xpack.lens.heatmapChart.legendVisibility.hide": "Masquer",
     "xpack.lens.heatmapChart.legendVisibility.show": "Afficher",
     "xpack.lens.heatmapVisualization.arrayValuesWarningMessage": "{label} contient des valeurs de tableau. Le rendu de votre visualisation peut ne pas se présenter comme attendu.",
-    "xpack.lens.heatmapVisualization.heatmapGroupLabel": "Carte thermique",
+    "xpack.lens.heatmapVisualization.heatmapGroupLabel": "Magnitude",
     "xpack.lens.heatmapVisualization.heatmapLabel": "Carte thermique",
     "xpack.lens.heatmapVisualization.missingXAccessorLongMessage": "La configuration de l'axe horizontal est manquante.",
     "xpack.lens.heatmapVisualization.missingXAccessorShortMessage": "Axe horizontal manquant.",
+    "xpack.lens.indexPattern.addColumnAriaLabel": "Ajouter ou glisser-déposer un champ dans {groupLabel}",
+    "xpack.lens.indexPattern.addColumnAriaLabelClick": "Ajouter une annotation à {groupLabel}",
     "xpack.lens.indexPattern.advancedSettings": "Ajouter des options avancées",
     "xpack.lens.indexPattern.allFieldsLabel": "Tous les champs",
-    "xpack.lens.indexPattern.allFieldsLabelHelp": "Les champs disponibles ont des données dans les 500 premiers documents correspondant à vos filtres. Pour afficher tous les filtres, développez les champs vides. Certains types de champ ne peuvent pas être visualisés dans Lens, y compris les champ de texte intégral et champs géographiques.",
+    "xpack.lens.indexPattern.allFieldsLabelHelp": "Glissez-déposez les champs disponibles dans l’espace de travail et créez des visualisations. Pour modifier les champs disponibles, sélectionnez une vue de données différente, modifiez vos requêtes ou utilisez une plage temporelle différente. Certains types de champ ne peuvent pas être visualisés dans Lens, y compris les champ de texte intégral et champs géographiques.",
+    "xpack.lens.indexPattern.allFieldsSamplingLabelHelp": "Les champs disponibles contiennent les données des 500 premiers documents correspondant aux filtres. Pour afficher tous les filtres, développez les champs vides. Vous ne pouvez pas créer de visualisations avec des champs de texte intégral, géographiques, lissés et d’objet.",
+    "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning": "{name} pour cette visualisation peut être approximatif en raison de la manière dont les données sont indexées. Essayez de trier par rareté plutôt que par nombre ascendant d’enregistrements. Pour en savoir plus sur cette limitation, {link}.",
+    "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning.link": "veuillez consulter la documentation",
     "xpack.lens.indexPattern.availableFieldsLabel": "Champs disponibles",
     "xpack.lens.indexPattern.avg": "Moyenne",
     "xpack.lens.indexPattern.avg.description": "Agrégation d'indicateurs à valeur unique qui calcule la moyenne des valeurs numériques extraites des documents agrégés",
@@ -346,12 +421,13 @@
     "xpack.lens.indexPattern.cardinality": "Compte unique",
     "xpack.lens.indexPattern.cardinality.signature": "champ : chaîne",
     "xpack.lens.indexPattern.cardinalityOf": "Compte unique de {name}",
-    "xpack.lens.indexPattern.chooseField": "Sélectionner un champ",
+    "xpack.lens.indexPattern.changeDataViewTitle": "Vue de données",
+    "xpack.lens.indexPattern.chooseField": "Champ",
     "xpack.lens.indexPattern.chooseFieldLabel": "Pour utiliser cette fonction, sélectionnez un champ.",
     "xpack.lens.indexPattern.chooseSubFunction": "Choisir une sous-fonction",
     "xpack.lens.indexPattern.columnFormatLabel": "Format de valeur",
-    "xpack.lens.indexPattern.columnLabel": "Afficher le nom",
-    "xpack.lens.indexPattern.count": "Compte",
+    "xpack.lens.indexPattern.columnLabel": "Nom",
+    "xpack.lens.indexPattern.count": "Décompte",
     "xpack.lens.indexPattern.counterRate": "Taux de compteur",
     "xpack.lens.indexPattern.counterRate.signature": "indicateur : nombre",
     "xpack.lens.indexPattern.CounterRateOf": "Taux de compteur de {name}",
@@ -359,6 +435,7 @@
     "xpack.lens.indexPattern.cumulative_sum.signature": "indicateur : nombre",
     "xpack.lens.indexPattern.cumulativeSum": "Somme cumulée",
     "xpack.lens.indexPattern.cumulativeSumOf": "Somme cumulée de {name}",
+    "xpack.lens.indexPattern.dataViewLoadError": "Erreur lors du chargement de la vue de données",
     "xpack.lens.indexPattern.dateHistogram": "Histogramme des dates",
     "xpack.lens.indexPattern.dateHistogram.autoAdvancedExplanation": "L'intervalle suit cette logique :",
     "xpack.lens.indexPattern.dateHistogram.autoBasicExplanation": "L'histogramme des dates automatique divise un champ de données en groupes par intervalle.",
@@ -367,8 +444,13 @@
     "xpack.lens.indexPattern.dateHistogram.autoInterval": "Personnaliser l'intervalle de temps",
     "xpack.lens.indexPattern.dateHistogram.autoIntervalHeader": "Intervalle utilisé",
     "xpack.lens.indexPattern.dateHistogram.autoLongerExplanation": "Pour choisir l'intervalle, Lens divise la plage temporelle spécifiée par le paramètre {targetBarSetting}. Lens calcule le meilleur intervalle pour vos données. Par exemple 30m, 1h et 12. Le nombre maximal de barres est défini par la valeur {maxBarSetting}.",
+    "xpack.lens.indexPattern.dateHistogram.bindToGlobalTimePicker": "Lier au sélecteur d'heure globale",
     "xpack.lens.indexPattern.dateHistogram.days": "jours",
+    "xpack.lens.indexPattern.dateHistogram.dropPartialBuckets": "Abandonner les compartiments partiels",
+    "xpack.lens.indexPattern.dateHistogram.dropPartialBucketsHelp": "L’abandon des compartiments partiels est désactivé, car ceux-ci ne peuvent être calculés que pour un champ temporel lié au sélecteur d’heure globale en haut à droite.",
+    "xpack.lens.indexPattern.dateHistogram.globalTimePickerHelp": "Filtrez le champ sélectionné à l’aide du sélecteur d’heure globale en haut à droite. Ce paramètre ne peut pas être désactivé pour le champ temporel par défaut de la vue de données actuelle.",
     "xpack.lens.indexPattern.dateHistogram.hours": "heures",
+    "xpack.lens.indexPattern.dateHistogram.includeEmptyRows": "Inclure les lignes vides",
     "xpack.lens.indexPattern.dateHistogram.milliseconds": "millisecondes",
     "xpack.lens.indexPattern.dateHistogram.minimumInterval": "Intervalle minimal",
     "xpack.lens.indexPattern.dateHistogram.minutes": "minutes",
@@ -380,12 +462,13 @@
     "xpack.lens.indexPattern.dateHistogram.upTo": "Jusqu'à",
     "xpack.lens.indexPattern.dateHistogram.week": "semaine",
     "xpack.lens.indexPattern.dateHistogram.year": "an",
+    "xpack.lens.indexPattern.dateHistogramTimeShift": "Dans un calque unique, vous ne pouvez pas combiner un décalage de plage temporelle précédent avec des histogrammes de dates. Utilisez une durée de décalage temporel explicite dans \"{column}\" ou remplacez l’histogramme de dates.",
     "xpack.lens.indexPattern.decimalPlacesLabel": "Décimales",
     "xpack.lens.indexPattern.defaultFormatLabel": "Par défaut",
     "xpack.lens.indexPattern.derivative": "Différences",
     "xpack.lens.indexPattern.derivativeOf": "Différences de {name}",
     "xpack.lens.indexPattern.differences.signature": "indicateur : nombre",
-    "xpack.lens.indexPattern.editFieldLabel": "Modifier le champ de modèle d'indexation",
+    "xpack.lens.indexPattern.editFieldLabel": "Modifier le champ de la vue de données",
     "xpack.lens.indexPattern.emptyDimensionButton": "Dimension vide",
     "xpack.lens.indexPattern.emptyFieldsLabel": "Champs vides",
     "xpack.lens.indexPattern.emptyFieldsLabelHelp": "Les champs vides ne contenaient aucune valeur dans les 500 premiers documents basés sur vos filtres.",
@@ -399,13 +482,16 @@
     "xpack.lens.indexPattern.fieldNoOperation": "Le champ {field} ne peut pas être utilisé sans opération",
     "xpack.lens.indexPattern.fieldPanelEmptyStringValue": "Chaîne vide",
     "xpack.lens.indexPattern.fieldPlaceholder": "Champ",
+    "xpack.lens.indexPattern.fieldsNotFound": "{count, plural, one {Champ} other {Champs}} {missingFields} {count, plural, one {introuvable} other {introuvables}}",
     "xpack.lens.indexPattern.fieldStatsButtonAriaLabel": "Prévisualiser {fieldName} : {fieldType}",
     "xpack.lens.indexPattern.fieldStatsButtonEmptyLabel": "Ce champ ne comporte aucune donnée mais vous pouvez toujours effectuer un glisser-déposer pour visualiser.",
     "xpack.lens.indexPattern.fieldStatsButtonLabel": "Cliquez pour obtenir un aperçu du champ, ou effectuez un glisser-déposer pour visualiser.",
     "xpack.lens.indexPattern.fieldStatsCountLabel": "Compte",
     "xpack.lens.indexPattern.fieldStatsDisplayToggle": "Basculer soit",
     "xpack.lens.indexPattern.fieldStatsLimited": "Le résumé des informations n'est pas disponible pour les champs de type de gamme.",
-    "xpack.lens.indexPattern.fieldStatsNoData": "Ce champ est vide car il n'existe pas dans les 500 documents échantillonnés. L'ajout de ce champ à la configuration peut générer un graphique vide.",
+    "xpack.lens.indexPattern.fieldStatsNoData": "Lens ne peut pas créer de visualisation avec ce champ, car il ne contient pas de données. Pour créer une visualisation, glissez-déposez un autre champ.",
+    "xpack.lens.indexPattern.fieldStatsSamplingNoData": "Lens ne peut pas créer de visualisation avec ce champ, car il ne contient aucune donnée des 500 premiers documents correspondant aux filtres. Pour créer une visualisation, glissez-déposez un autre champ.",
+    "xpack.lens.indexPattern.fieldsWrongType": "{count, plural, one {Champ} other {Champs}} {invalidFields} {count, plural, other {de type incorrect}}",
     "xpack.lens.indexPattern.fieldTimeDistributionLabel": "Répartition du temps",
     "xpack.lens.indexPattern.fieldTopValuesLabel": "Valeurs les plus élevées",
     "xpack.lens.indexPattern.filterBy.clickToEdit": "Cliquer pour modifier",
@@ -425,6 +511,7 @@
     "xpack.lens.indexPattern.formulaFieldNotFound": "{variablesLength, plural, one {Champ} other {Champs}} {variablesList} introuvable(s)",
     "xpack.lens.indexPattern.formulaFieldNotRequired": "L'opération {operation} n'accepte aucun champ comme argument",
     "xpack.lens.indexPattern.formulaFieldValue": "champ",
+    "xpack.lens.indexPattern.formulaFilterableHelpText": "Le filtre spécifié sera appliqué à la formule entière.",
     "xpack.lens.indexPattern.formulaLabel": "Formule",
     "xpack.lens.indexPattern.formulaMathMissingArgument": "L'opération {operation} dans la formule ne comprend pas les arguments {count} : {params}",
     "xpack.lens.indexPattern.formulaMetricValue": "indicateur",
@@ -432,28 +519,35 @@
     "xpack.lens.indexPattern.formulaNoOperation": "aucune opération",
     "xpack.lens.indexPattern.formulaOperationDoubleQueryError": "Utilisez uniquement kql= ou lucene=, mais pas les deux",
     "xpack.lens.indexPattern.formulaOperationDuplicateParams": "Les paramètres de l'opération {operation} ont été déclarés plusieurs fois : {params}",
+    "xpack.lens.indexPattern.formulaOperationFiltersTypeConflicts": "Le filtre de formule de type \"{outerType}\" n’est pas compatible avec le filtre interne de type \"{innerType}\" de l’opération {operation}.",
     "xpack.lens.indexPattern.formulaOperationQueryError": "Des guillemets simples sont requis pour {language}='' à {rawQuery}",
     "xpack.lens.indexPattern.formulaOperationTooManyFirstArguments": "L'opération {operation} dans la formule requiert un {type} {supported, plural, one {unique} other {pris en charge}}, trouvé : {text}",
     "xpack.lens.indexPattern.formulaOperationValue": "opération",
     "xpack.lens.indexPattern.formulaOperationwrongArgument": "L'opération {operation} dans la formule ne prend pas en charge les paramètres {type}, trouvé : {text}",
     "xpack.lens.indexPattern.formulaOperationWrongFirstArgument": "Le premier argument pour {operation} doit être un nom {type}. Trouvé {argument}",
+    "xpack.lens.indexPattern.formulaOperationWrongReturnedType": "Le type de valeur de retour de l’opération {text} n’est pas pris en charge dans la formule.",
     "xpack.lens.indexPattern.formulaParameterNotRequired": "L'opération {operation} n'accepte aucun paramètre",
     "xpack.lens.indexPattern.formulaPartLabel": "Partie de {label}",
     "xpack.lens.indexPattern.formulaWarning": "Formule actuellement appliquée",
+    "xpack.lens.indexPattern.formulaWarningStaticValueText": "Pour écraser votre formule, modifiez la valeur dans le champ de saisie.",
     "xpack.lens.indexPattern.formulaWarningText": "Pour écraser votre formule, sélectionnez une fonction rapide",
     "xpack.lens.indexPattern.formulaWithTooManyArguments": "L'opération {operation} a trop d'arguments",
-    "xpack.lens.indexPattern.functionsLabel": "Sélectionner une fonction",
+    "xpack.lens.indexPattern.functionsLabel": "Fonctions",
     "xpack.lens.indexPattern.groupByDropdown": "Regrouper par",
+    "xpack.lens.indexPattern.hideZero": "Masquer les valeurs nulles",
     "xpack.lens.indexPattern.incompleteOperation": "(incomplet)",
     "xpack.lens.indexPattern.intervals": "Intervalles",
-    "xpack.lens.indexPattern.invalidFieldLabel": "Champ non valide. Vérifiez votre modèle d'indexation ou choisissez un autre champ.",
+    "xpack.lens.indexPattern.invalidFieldLabel": "Champ non valide. Vérifiez votre vue de données ou choisissez un autre champ.",
     "xpack.lens.indexPattern.invalidInterval": "Valeur d'intervalle non valide",
     "xpack.lens.indexPattern.invalidOperationLabel": "Ce champ ne fonctionne pas avec la fonction sélectionnée.",
     "xpack.lens.indexPattern.invalidReferenceConfiguration": "La dimension \"{dimensionLabel}\" n'est pas configurée correctement",
     "xpack.lens.indexPattern.invalidTimeShift": "Décalage non valide. Entrez un entier positif suivi par l'une des unités suivantes : s, m, h, d, w, M, y. Par exemple, 3h pour 3 heures",
     "xpack.lens.indexPattern.lastValue": "Dernière valeur",
-    "xpack.lens.indexPattern.lastValue.disabled": "Cette fonction requiert la présence d'un champ de date dans votre index",
+    "xpack.lens.indexPattern.lastValue.disabled": "Cette fonction requiert la présence d'un champ de date dans la vue de données.",
     "xpack.lens.indexPattern.lastValue.invalidTypeSortField": "Le champ {invalidField} n'est pas un champ de date et ne peut pas être utilisé pour le tri",
+    "xpack.lens.indexPattern.lastValue.showArrayValues": "Afficher les valeurs de tableau",
+    "xpack.lens.indexPattern.lastValue.showArrayValuesExplanation": "Affiche toutes les valeurs associées à ce champ dans chaque dernier document.",
+    "xpack.lens.indexPattern.lastValue.showArrayValuesWithTopValuesWarning": "Lorsque vous affichez les valeurs de tableau, vous ne pouvez pas utiliser ce champ pour classer les valeurs les plus élevées.",
     "xpack.lens.indexPattern.lastValue.signature": "champ : chaîne",
     "xpack.lens.indexPattern.lastValue.sortField": "Trier par le champ de date",
     "xpack.lens.indexPattern.lastValue.sortFieldNotFound": "Champ {invalidField} introuvable",
@@ -471,6 +565,7 @@
     "xpack.lens.indexPattern.min": "Minimum",
     "xpack.lens.indexPattern.min.description": "Agrégation d'indicateurs à valeur unique qui renvoie la valeur minimale des valeurs numériques extraites des documents agrégés.",
     "xpack.lens.indexPattern.minOf": "Minimum de {name}",
+    "xpack.lens.indexPattern.missingDataView": "{count, plural, other {Vue de données}} ({count, plural, one {id} other {ids}} : {indexpatterns}) {count, plural, one {introuvable} other {introuvables}}",
     "xpack.lens.indexPattern.missingFieldLabel": "Champ manquant",
     "xpack.lens.indexPattern.missingReferenceError": "\"{dimensionLabel}\" n'est pas entièrement configuré",
     "xpack.lens.indexPattern.moveToWorkspace": "Ajouter {field} à l'espace de travail",
@@ -488,7 +583,11 @@
     "xpack.lens.indexPattern.movingAverage.windowLimitations": "La fenêtre n'inclut pas la valeur actuelle.",
     "xpack.lens.indexPattern.movingAverageOf": "Moyenne mobile de {name}",
     "xpack.lens.indexPattern.multipleDateHistogramsError": "\"{dimensionLabel}\" n'est pas le seul histogramme des dates. Lorsque vous utilisez des décalages, veillez à n'utiliser qu'un seul histogramme des dates.",
-    "xpack.lens.indexPattern.numberFormatLabel": "Numéro",
+    "xpack.lens.indexPattern.multipleTermsOf": "Les valeurs les plus élevées de {name} + {count} {count, plural, one {autre} other {autres}}",
+    "xpack.lens.indexPattern.noDataViewDescription": "Veuillez créer une vue de données ou basculer vers une autre source de données.",
+    "xpack.lens.indexPattern.noDataViewsLabel": "Aucune vue de données",
+    "xpack.lens.indexPattern.noRealMetricError": "Un calque uniquement doté de valeurs statiques n’affichera pas de résultats ; utilisez au moins un indicateur dynamique.",
+    "xpack.lens.indexPattern.numberFormatLabel": "Nombre",
     "xpack.lens.indexPattern.ofDocumentsLabel": "documents",
     "xpack.lens.indexPattern.operationsNotFound": "{operationLength, plural, one {Opération} other {Opérations}} {operationsList} non trouvée(s)",
     "xpack.lens.indexPattern.otherDocsLabel": "Autre",
@@ -508,6 +607,9 @@
     "xpack.lens.indexPattern.percentile.signature": "champ : chaîne, [percentile] : nombre",
     "xpack.lens.indexPattern.percentileOf": "{percentile, selectordinal, one {#er} two {#e} few {#e} other {#e}} centile de {name}",
     "xpack.lens.indexPattern.pinnedTopValuesLabel": "Filtres de {field}",
+    "xpack.lens.indexPattern.precisionErrorWarning.filters": "Filtres",
+    "xpack.lens.indexPattern.precisionErrorWarning.link": "veuillez consulter la documentation",
+    "xpack.lens.indexPattern.precisionErrorWarning.topValues": "Valeurs les plus élevées",
     "xpack.lens.indexPattern.quickFunctionsLabel": "Fonctions rapides",
     "xpack.lens.indexPattern.range.isInvalid": "Cette plage n'est pas valide",
     "xpack.lens.indexPattern.ranges.addRange": "Ajouter une plage",
@@ -523,24 +625,45 @@
     "xpack.lens.indexPattern.ranges.granularityPopoverBasicExplanation": "La granularité des intervalles divise le champ en intervalles régulièrement espacés sur la base des valeurs minimales et maximales du champ.",
     "xpack.lens.indexPattern.ranges.granularityPopoverExplanation": "La taille de l'intervalle est une valeur de \"gentillesse\". Lorsque la granularité du curseur change, l'intervalle reste le même lorsque l'intervalle de \"gentillesse\" est le même. La granularité minimale est 1, et la valeur maximale est {setting}. Pour modifier la granularité maximale, accédez aux Paramètres avancés.",
     "xpack.lens.indexPattern.ranges.granularityPopoverTitle": "Fonctionnement de la granularité des intervalles",
+    "xpack.lens.indexPattern.ranges.includeEmptyRows": "Inclure les lignes vides",
     "xpack.lens.indexPattern.ranges.increaseButtonLabel": "Augmenter la granularité",
     "xpack.lens.indexPattern.ranges.lessThanOrEqualAppend": "≤",
     "xpack.lens.indexPattern.ranges.lessThanOrEqualTooltip": "Inférieur ou égal à",
     "xpack.lens.indexPattern.ranges.lessThanPrepend": "&lt;",
     "xpack.lens.indexPattern.ranges.lessThanTooltip": "Inférieur à",
+    "xpack.lens.indexPattern.rareTermsOf": "Valeurs rares de {name}",
     "xpack.lens.indexPattern.records": "Enregistrements",
     "xpack.lens.indexPattern.referenceFunctionPlaceholder": "Sous-fonction",
     "xpack.lens.indexPattern.removeColumnLabel": "Retirer la configuration de \"{groupLabel}\"",
-    "xpack.lens.indexPattern.removeFieldLabel": "Retirer le champ du modèle d'indexation",
-    "xpack.lens.indexPattern.sortField.invalid": "Champ non valide. Vérifiez votre modèle d'indexation ou choisissez un autre champ.",
+    "xpack.lens.indexPattern.removeFieldLabel": "Retirer le champ de la vue de données",
+    "xpack.lens.indexPattern.sortField.invalid": "Champ non valide. Vérifiez votre vue de données ou choisissez un autre champ.",
+    "xpack.lens.indexPattern.staticValue.label": "Valeur de la ligne de référence",
+    "xpack.lens.indexPattern.staticValueError": "La valeur statique de {value} n’est pas un nombre valide.",
+    "xpack.lens.indexPattern.staticValueLabel": "Valeur statique",
+    "xpack.lens.indexPattern.staticValueLabelDefault": "Valeur statique",
+    "xpack.lens.indexPattern.staticValueLabelWithValue": "Valeur statique : {value}",
+    "xpack.lens.indexPattern.staticValueWarning": "Valeur statique actuellement appliquée",
+    "xpack.lens.indexPattern.staticValueWarningText": "Pour écraser la valeur statique, sélectionnez une fonction rapide.",
+    "xpack.lens.indexPattern.suffixLabel": "Suffixe",
+    "xpack.lens.indexPattern.suggestedValueAriaLabel": "Valeur suggérée : {value} pour {groupLabel}",
     "xpack.lens.indexpattern.suggestions.nestingChangeLabel": "{innerOperation} pour chaque {outerOperation}",
     "xpack.lens.indexpattern.suggestions.overallLabel": "{operation} générale",
     "xpack.lens.indexpattern.suggestions.overTimeLabel": "Sur la durée",
     "xpack.lens.indexPattern.sum": "Somme",
     "xpack.lens.indexPattern.sum.description": "Agrégation d'indicateurs à valeur unique qui récapitule les valeurs numériques extraites des documents agrégés.",
     "xpack.lens.indexPattern.sumOf": "Somme de {name}",
+    "xpack.lens.indexPattern.switchToRare": "Classer par rareté",
     "xpack.lens.indexPattern.terms": "Valeurs les plus élevées",
+    "xpack.lens.indexPattern.terms.addaFilter": "Ajouter un champ",
+    "xpack.lens.indexPattern.terms.addField": "Ajouter un champ",
     "xpack.lens.indexPattern.terms.advancedSettings": "Avancé",
+    "xpack.lens.indexPattern.terms.chooseFields": "{count, plural, zero {Champ} other {Champs}}",
+    "xpack.lens.indexPattern.terms.deleteButtonAriaLabel": "Supprimer",
+    "xpack.lens.indexPattern.terms.deleteButtonDisabled": "Cette fonction nécessite au minimum un champ défini.",
+    "xpack.lens.indexPattern.terms.deleteButtonLabel": "Supprimer",
+    "xpack.lens.indexPattern.terms.dragToReorder": "Faire glisser pour réorganiser",
+    "xpack.lens.indexPattern.terms.invalidFieldsErrorShort": "{invalidFieldsCount, plural, one {Champ invalide} other {Champs invalides}} : {invalidFields}. Vérifiez votre vue de données ou choisissez un autre champ.",
+    "xpack.lens.indexPattern.terms.maxDocCount": "Nombre de documents maximum par terme",
     "xpack.lens.indexPattern.terms.missingBucketDescription": "Inclure les documents sans ce champ",
     "xpack.lens.indexPattern.terms.missingLabel": "(valeur manquante)",
     "xpack.lens.indexPattern.terms.orderAlphabetical": "Alphabétique",
@@ -549,11 +672,17 @@
     "xpack.lens.indexPattern.terms.orderByHelp": "Spécifie la dimension selon laquelle les valeurs les plus élevées sont classées.",
     "xpack.lens.indexPattern.terms.orderDescending": "Décroissant",
     "xpack.lens.indexPattern.terms.orderDirection": "Sens de classement",
+    "xpack.lens.indexPattern.terms.orderRare": "Rareté",
     "xpack.lens.indexPattern.terms.otherBucketDescription": "Regrouper les autres valeurs sous \"Autre\"",
     "xpack.lens.indexPattern.terms.otherLabel": "Autre",
+    "xpack.lens.indexPattern.terms.scriptedFieldErrorShort": "Les champs scriptés ne sont pas pris en charge en cas d’utilisation de champs multiples.",
     "xpack.lens.indexPattern.terms.size": "Nombre de valeurs",
+    "xpack.lens.indexPattern.terms.sizeLimitMax": "La valeur est supérieure au maximum {max} ; elle est remplacée par la valeur maximale.",
+    "xpack.lens.indexPattern.terms.sizeLimitMin": "La valeur est inférieure au minimum {min} ; elle est remplacée par la valeur minimale.",
+    "xpack.lens.indexPattern.termsOf": "{numberOfTermsLabel} {termsCount, plural, one {valeur la plus élevée} other {valeurs les plus élevées}} de {name}",
     "xpack.lens.indexPattern.termsWithMultipleShifts": "Dans un seul calque, il est impossible de combiner des indicateurs avec des décalages temporels différents et des valeurs dynamiques les plus élevées. Utilisez la même valeur de décalage pour tous les indicateurs, ou utilisez des filtres à la place des valeurs les plus élevées.",
     "xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel": "Utiliser des filtres",
+    "xpack.lens.indexPattern.termsWithMultipleTermsAndScriptedFields": "Les champs scriptés ne sont pas pris en charge lors de l’utilisation de champs multiples ; {fields} trouvés.",
     "xpack.lens.indexPattern.timeScale.enableTimeScale": "Normaliser par unité",
     "xpack.lens.indexPattern.timeScale.label": "Normaliser par unité",
     "xpack.lens.indexPattern.timeScale.tooltip": "Normalisez les valeurs pour qu'elles soient toujours affichées en tant que taux par unité de temps spécifiée, indépendamment de l'intervalle de dates sous-jacent.",
@@ -563,11 +692,13 @@
     "xpack.lens.indexPattern.timeShift.6hours": "Il y a 6 heures (6h)",
     "xpack.lens.indexPattern.timeShift.6months": "Il y a 6 mois (6M)",
     "xpack.lens.indexPattern.timeShift.day": "Il y a 1 jour (1d)",
+    "xpack.lens.indexPattern.timeShift.genericInvalidHelp": "La valeur de décalage temporel n’est pas valide.",
     "xpack.lens.indexPattern.timeShift.help": "Entrer le nombre et l'unité du décalage temporel",
     "xpack.lens.indexPattern.timeShift.hour": "Il y a 1 heure (1h)",
     "xpack.lens.indexPattern.timeShift.label": "Décalage temporel",
     "xpack.lens.indexPattern.timeShift.month": "Il y a 1 mois (1M)",
     "xpack.lens.indexPattern.timeShift.noMultipleHelp": "Le décalage temporel doit être un multiple de l'intervalle de l'histogramme des dates. Ajustez le décalage ou l'intervalle de l'histogramme des dates",
+    "xpack.lens.indexPattern.timeShift.previous": "Plage temporelle précédente",
     "xpack.lens.indexPattern.timeShift.tooSmallHelp": "Le décalage temporel doit être supérieur à l'intervalle de l'histogramme des dates. Augmentez le décalage ou spécifiez un intervalle plus petit dans l'histogramme des dates",
     "xpack.lens.indexPattern.timeShift.week": "Il y a 1 semaine (1w)",
     "xpack.lens.indexPattern.timeShift.year": "Il y a 1 an (1y)",
@@ -576,13 +707,13 @@
     "xpack.lens.indexPattern.timeShiftSmallWarning": "{label} utilise un décalage temporel de {columnTimeShift} qui est inférieur à l'intervalle de l'histogramme des dates de {interval}. Pour éviter une non-correspondance des données, utilisez un multiple de {interval} comme décalage.",
     "xpack.lens.indexPattern.uniqueLabel": "{label} [{num}]",
     "xpack.lens.indexPattern.useAsTopLevelAgg": "Regrouper d'abord en fonction de ce champ",
-    "xpack.lens.indexPatterns.actionsPopoverLabel": "Paramètres du modèle d'indexation",
-    "xpack.lens.indexPatterns.addFieldButton": "Ajouter un champ au modèle d'indexation",
+    "xpack.lens.indexPatterns.actionsPopoverLabel": "Paramètres Vue de données",
+    "xpack.lens.indexPatterns.addFieldButton": "Ajouter un champ à la vue de données",
     "xpack.lens.indexPatterns.clearFiltersLabel": "Effacer le nom et saisissez les filtres",
     "xpack.lens.indexPatterns.fieldFiltersLabel": "Filtrer par type",
     "xpack.lens.indexPatterns.fieldSearchLiveRegion": "{availableFields} {availableFields, plural, one {champ} other {champs}} disponible(s). {emptyFields} {emptyFields, plural, one {champ} other {champs}} vide(s). {metaFields} {metaFields, plural, one {champ} other {champs}} méta.",
-    "xpack.lens.indexPatterns.filterByNameLabel": "Rechercher les noms des champs",
-    "xpack.lens.indexPatterns.manageFieldButton": "Gérer les champs du modèle d'indexation",
+    "xpack.lens.indexPatterns.filterByNameLabel": "Rechercher les noms de champs",
+    "xpack.lens.indexPatterns.manageFieldButton": "Gérer les champs de la vue de données",
     "xpack.lens.indexPatterns.noAvailableDataLabel": "Aucun champ disponible ne contient de données.",
     "xpack.lens.indexPatterns.noDataLabel": "Aucun champ.",
     "xpack.lens.indexPatterns.noEmptyDataLabel": "Aucun champ vide.",
@@ -590,36 +721,70 @@
     "xpack.lens.indexPatterns.noFields.fieldTypeFilterBullet": "Utilisation de différents filtres de champ",
     "xpack.lens.indexPatterns.noFields.globalFiltersBullet": "Modification des filtres globaux",
     "xpack.lens.indexPatterns.noFields.tryText": "Essayer :",
-    "xpack.lens.indexPatterns.noFieldsLabel": "Aucun champ n'existe dans ce modèle d'indexation.",
+    "xpack.lens.indexPatterns.noFieldsLabel": "Aucun champ n'existe dans cette vue de données.",
     "xpack.lens.indexPatterns.noFilteredFieldsLabel": "Aucun champ ne correspond aux filtres sélectionnés.",
     "xpack.lens.indexPatterns.noMetaDataLabel": "Aucun champ méta.",
     "xpack.lens.indexPatternSuggestion.removeLayerLabel": "Afficher uniquement {indexPatternTitle}",
     "xpack.lens.indexPatternSuggestion.removeLayerPositionLabel": "Afficher uniquement le calque {layerNumber}",
+    "xpack.lens.label.gauge.labelMajor.header": "Titre",
+    "xpack.lens.label.gauge.labelMinor.header": "Sous-titre",
+    "xpack.lens.label.header": "Étiquette",
+    "xpack.lens.label.shared.axisHeader": "Titre de l'axe",
     "xpack.lens.labelInput.label": "Étiquette",
     "xpack.lens.layerPanel.layerVisualizationType": "Type de visualisation du calque",
+    "xpack.lens.layerPanel.missingDataView": "Vue de données introuvable",
+    "xpack.lens.legacyUrlConflict.objectNoun": "Visualisation Lens",
     "xpack.lens.lensSavedObjectLabel": "Visualisation Lens",
-    "xpack.lens.metric.addLayer": "Ajouter un calque de visualisation",
-    "xpack.lens.metric.groupLabel": "Valeur tabulaire et unique",
+    "xpack.lens.lineMarker.positionRequirementTooltip": "Vous devez sélectionner une icône ou afficher le nom pour pouvoir en modifier la position.",
+    "xpack.lens.lineMarker.textVisibility": "Décoration du texte",
+    "xpack.lens.metric.addLayer": "Visualisation",
+    "xpack.lens.metric.dynamicColoring.background": "Remplir",
+    "xpack.lens.metric.dynamicColoring.label": "Couleur par valeur",
+    "xpack.lens.metric.dynamicColoring.none": "Aucun",
+    "xpack.lens.metric.dynamicColoring.text": "Texte",
+    "xpack.lens.metric.groupLabel": "Valeur d’objectif et unique",
     "xpack.lens.metric.label": "Indicateur",
+    "xpack.lens.metricChart.alignLabel.center": "Aligner au centre",
+    "xpack.lens.metricChart.alignLabel.left": "Aligner à gauche",
+    "xpack.lens.metricChart.alignLabel.right": "Aligner à droite",
+    "xpack.lens.metricChart.metricSize.extraLarge": "XL",
+    "xpack.lens.metricChart.metricSize.extraSmall": "XS",
+    "xpack.lens.metricChart.metricSize.large": "L",
+    "xpack.lens.metricChart.metricSize.medium": "M",
+    "xpack.lens.metricChart.metricSize.small": "S",
+    "xpack.lens.metricChart.metricSize.xxl": "XXL",
+    "xpack.lens.metricChart.textFormattingLabel": "Formatage du texte",
+    "xpack.lens.metricChart.titleAlignLabel": "Aligner",
+    "xpack.lens.metricChart.titlePositionLabel": "Position du titre",
     "xpack.lens.pageTitle": "Lens",
     "xpack.lens.paletteHeatmapGradient.customize": "Modifier",
     "xpack.lens.paletteHeatmapGradient.customizeLong": "Modifier la palette",
     "xpack.lens.paletteHeatmapGradient.label": "Couleur",
+    "xpack.lens.paletteMetricGradient.label": "Couleur",
     "xpack.lens.palettePicker.label": "Palette de couleurs",
     "xpack.lens.paletteTableGradient.customize": "Modifier",
     "xpack.lens.paletteTableGradient.label": "Couleur",
-    "xpack.lens.pie.addLayer": "Ajouter un calque de visualisation",
+    "xpack.lens.pie.addLayer": "Visualisation",
     "xpack.lens.pie.arrayValues": "{label} contient des valeurs de tableau. Le rendu de votre visualisation peut ne pas se présenter comme attendu.",
     "xpack.lens.pie.donutLabel": "Graphique en anneau",
     "xpack.lens.pie.groupLabel": "Proportion",
     "xpack.lens.pie.groupsizeLabel": "Taille par",
+    "xpack.lens.pie.mosaiclabel": "Mosaïque",
+    "xpack.lens.pie.mosaicSuggestionLabel": "En mosaïque",
     "xpack.lens.pie.pielabel": "Camembert",
     "xpack.lens.pie.sliceGroupLabel": "Section par",
+    "xpack.lens.pie.smallValuesWarningMessage": "Les graphiques en gaufre ne permettent pas d’afficher correctement les petites valeurs de champ. Pour afficher toutes les valeurs de champ, utilisez le tableau de données ou le compartimentage.",
     "xpack.lens.pie.suggestionLabel": "Comme {chartName}",
     "xpack.lens.pie.treemapGroupLabel": "Regrouper par",
     "xpack.lens.pie.treemaplabel": "Compartimentage",
     "xpack.lens.pie.treemapSuggestionLabel": "Comme compartimentage",
+    "xpack.lens.pie.wafflelabel": "Gaufre",
+    "xpack.lens.pie.waffleSuggestionLabel": "En gaufre",
     "xpack.lens.pieChart.categoriesInLegendLabel": "Masquer les étiquettes",
+    "xpack.lens.pieChart.emptySizeRatioLabel": "Taille de la zone intérieure",
+    "xpack.lens.pieChart.emptySizeRatioOptions.large": "Large",
+    "xpack.lens.pieChart.emptySizeRatioOptions.medium": "Moyenne",
+    "xpack.lens.pieChart.emptySizeRatioOptions.small": "Petite",
     "xpack.lens.pieChart.fitInsideOnlyLabel": "À l'intérieur uniquement",
     "xpack.lens.pieChart.hiddenNumbersLabel": "Masquer dans le graphique",
     "xpack.lens.pieChart.labelPositionLabel": "Position",
@@ -634,21 +799,25 @@
     "xpack.lens.pieChart.showPercentValuesLabel": "Afficher le pourcentage",
     "xpack.lens.pieChart.showTreemapCategoriesLabel": "Afficher les étiquettes",
     "xpack.lens.pieChart.valuesLabel": "Étiquettes",
+    "xpack.lens.pieChart.visualOptionsLabel": "Options visuelles",
     "xpack.lens.resetLayerAriaLabel": "Réinitialiser le calque {index}",
     "xpack.lens.resetVisualizationAriaLabel": "Réinitialiser la visualisation",
+    "xpack.lens.saveDuplicateRejectedDescription": "La confirmation d'enregistrement avec un doublon de titre a été rejetée.",
     "xpack.lens.searchTitle": "Lens : créer des visualisations",
     "xpack.lens.section.configPanelLabel": "Panneau de configuration",
     "xpack.lens.section.dataPanelLabel": "Panneau de données",
     "xpack.lens.section.workspaceLabel": "Espace de travail de visualisation",
+    "xpack.lens.shared.AppearanceLabel": "Apparence",
+    "xpack.lens.shared.axisNameLabel": "Titre de l'axe",
     "xpack.lens.shared.chartValueLabelVisibilityLabel": "Étiquettes",
     "xpack.lens.shared.curveLabel": "Options visuelles",
+    "xpack.lens.shared.legend.filterForValueButtonAriaLabel": "Filtre pour la valeur",
     "xpack.lens.shared.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
+    "xpack.lens.shared.legend.filterOutValueButtonAriaLabel": "Filtrer la valeur",
     "xpack.lens.shared.legendAlignmentLabel": "Alignement",
     "xpack.lens.shared.legendInsideAlignmentLabel": "Alignement",
     "xpack.lens.shared.legendInsideColumnsLabel": "Nombre de colonnes",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "Alignement",
-    "xpack.lens.shared.legendInsideTooltip": "Requiert que la légende soit placée dans la visualisation",
-    "xpack.lens.shared.legendIsTruncated": "Requiert que le texte soit tronqué",
     "xpack.lens.shared.legendLabel": "Légende",
     "xpack.lens.shared.legendLocationBottomLeft": "En bas à gauche",
     "xpack.lens.shared.legendLocationBottomRight": "En bas à droite",
@@ -659,14 +828,27 @@
     "xpack.lens.shared.legendPositionLeft": "Gauche",
     "xpack.lens.shared.legendPositionRight": "Droite",
     "xpack.lens.shared.legendPositionTop": "Haut",
+    "xpack.lens.shared.legendSizeSetting.label": "Largeur de la légende",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.auto": "Auto",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.extraLarge": "Très grande",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.large": "Large",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.medium": "Moyenne",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.small": "Petite",
     "xpack.lens.shared.legendVisibilityLabel": "Affichage",
-    "xpack.lens.shared.legendVisibleTooltip": "Requiert que la légende soit affichée",
     "xpack.lens.shared.maxLinesLabel": "Nombre maximal de lignes",
+    "xpack.lens.shared.metric.appearanceLabel": "Apparence",
     "xpack.lens.shared.nestedLegendLabel": "Imbriqué",
+    "xpack.lens.shared.overwriteAxisTitle": "Écraser le titre de l'axe",
+    "xpack.lens.shared.ticksPositionOptions": "Coches sur les bandes",
+    "xpack.lens.shared.ticksPositionOptionsTooltip": "Place les coches sur chaque bordure de bande au lieu de les répartir de manière homogène.",
     "xpack.lens.shared.truncateLegend": "Tronquer le texte",
     "xpack.lens.shared.valueInLegendLabel": "Afficher la valeur",
+    "xpack.lens.shared.valueLabelsVisibility.auto": "Masquer",
+    "xpack.lens.shared.valueLabelsVisibility.inside": "Afficher",
     "xpack.lens.sugegstion.refreshSuggestionLabel": "Actualiser",
     "xpack.lens.suggestion.refreshSuggestionTooltip": "Actualisez les suggestions en fonction de la visualisation sélectionnée.",
+    "xpack.lens.suggestions.applyChangesLabel": "Appliquer",
+    "xpack.lens.suggestions.applyChangesPrompt": "Appliquez vos modifications pour voir les suggestions.",
     "xpack.lens.suggestions.currentVisLabel": "Visualisation en cours",
     "xpack.lens.table.actionsLabel": "Afficher les actions",
     "xpack.lens.table.alignment.center": "Centre",
@@ -678,17 +860,16 @@
     "xpack.lens.table.columnVisibilityLabel": "Masquer la colonne",
     "xpack.lens.table.defaultAriaLabel": "Visualisation du tableau de données",
     "xpack.lens.table.dynamicColoring.cell": "Cellule",
-    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "Les types de valeurs en pourcentage sont relatifs à la plage complète des valeurs de données disponibles.",
     "xpack.lens.table.dynamicColoring.label": "Couleur par valeur",
     "xpack.lens.table.dynamicColoring.none": "Aucune",
-    "coloring.dynamicColoring.rangeType.label": "Type de valeur",
-    "coloring.dynamicColoring.rangeType.number": "Numéro",
-    "coloring.dynamicColoring.rangeType.percent": "Pour cent",
     "xpack.lens.table.dynamicColoring.text": "Texte",
     "xpack.lens.table.hide.hideLabel": "Masquer",
     "xpack.lens.table.palettePanelContainer.back": "Retour",
     "xpack.lens.table.palettePanelTitle": "Modifier la couleur",
     "xpack.lens.table.resize.reset": "Réinitialiser la largeur",
+    "xpack.lens.table.rowHeight.auto": "Ajustement automatique",
+    "xpack.lens.table.rowHeight.custom": "Personnalisé",
+    "xpack.lens.table.rowHeight.single": "Unique",
     "xpack.lens.table.sort.ascLabel": "Trier dans l'ordre croissant",
     "xpack.lens.table.sort.descLabel": "Trier dans l'ordre décroissant",
     "xpack.lens.table.summaryRow.average": "Moyenne",
@@ -700,21 +881,37 @@
     "xpack.lens.table.summaryRow.none": "Aucune",
     "xpack.lens.table.summaryRow.sum": "Somme",
     "xpack.lens.table.tableCellFilter.filterForValueAriaLabel": "Filtre pour la valeur : {cellContent}",
-    "xpack.lens.table.tableCellFilter.filterForValueText": "Filtre pour la valeur",
-    "xpack.lens.table.tableCellFilter.filterOutValueAriaLabel": "Filtrer la valeur : {cellContent}",
-    "xpack.lens.table.tableCellFilter.filterOutValueText": "Filtrer la valeur",
+    "xpack.lens.table.tableCellFilter.filterForValueText": "Filtrer sur la valeur",
+    "xpack.lens.table.tableCellFilter.filterOutValueAriaLabel": "Exclure la valeur : {cellContent}",
+    "xpack.lens.table.tableCellFilter.filterOutValueText": "Exclure la valeur",
+    "xpack.lens.table.valuesVisualOptions": "Options visuelles",
+    "xpack.lens.table.visualOptionsFitRowToContentLabel": "Hauteur de ligne de cellule",
+    "xpack.lens.table.visualOptionsHeaderRowHeightLabel": "Hauteur de ligne d’en-tête",
+    "xpack.lens.table.visualOptionsPaginateTable": "Paginer le tableau",
+    "xpack.lens.table.visualOptionsPaginateTableTooltip": "La pagination est masquée lorsqu’il y a moins de 10 éléments.",
     "xpack.lens.timeScale.removeLabel": "Retirer la normalisation par unité de temps",
     "xpack.lens.timeShift.removeLabel": "Retirer le décalage temporel",
+    "xpack.lens.TSVBLabel": "TSVB",
+    "xpack.lens.uniqueLabel": "{label} [{num}]",
+    "xpack.lens.unknownVisType.shortMessage": "Type de visualisation inconnu",
     "xpack.lens.visTypeAlias.description": "Créez des visualisations avec notre éditeur de glisser-déposer. Basculez entre les différents types de visualisation à tout moment.",
     "xpack.lens.visTypeAlias.note": "Recommandé pour la plupart des utilisateurs.",
     "xpack.lens.visTypeAlias.title": "Lens",
     "xpack.lens.visTypeAlias.type": "Lens",
     "xpack.lens.visualizeGeoFieldMessage": "Lens ne peut pas visualiser les champs {fieldType}",
-    "xpack.lens.xyChart.addDataLayerLabel": "Ajouter un calque de visualisation",
+    "xpack.lens.visualizeTSVBLegend": "Visualiser le graphique TSVB",
+    "xpack.lens.xyChart.addAnnotationsLayerLabel": "Annotations",
+    "xpack.lens.xyChart.addAnnotationsLayerLabelDisabledHelp": "Les annotations nécessitent un graphique temporel pour fonctionner. Ajoutez un histogramme de dates.",
+    "xpack.lens.xyChart.addDataLayerLabel": "Visualisation",
     "xpack.lens.xyChart.addLayer": "Ajouter un calque",
-    "xpack.lens.xyChart.addLayerTooltip": "Utilisez plusieurs calques pour combiner les types de visualisation ou pour visualiser différents modèles d'indexation.",
+    "xpack.lens.xyChart.addLayerTooltip": "Utilisez plusieurs calques pour combiner les types de visualisation ou pour visualiser différentes vues de données.",
+    "xpack.lens.xyChart.addReferenceLineLayerLabel": "Lignes de référence",
+    "xpack.lens.xyChart.addReferenceLineLayerLabelDisabledHelp": "Ajouter des données pour activer le calque de référence",
+    "xpack.lens.xyChart.annotation.name": "Masquer l’annotation",
+    "xpack.lens.xyChart.annotationDate": "Date de l’annotation",
+    "xpack.lens.xyChart.appearance": "Apparence",
     "xpack.lens.xyChart.axisExtent.custom": "Personnalisé",
-    "xpack.lens.xyChart.axisExtent.dataBounds": "Limites de données",
+    "xpack.lens.xyChart.axisExtent.dataBounds": "Données",
     "xpack.lens.xyChart.axisExtent.disabledDataBoundsMessage": "Seuls les graphiques linéaires peuvent être adaptés aux limites de données",
     "xpack.lens.xyChart.axisExtent.full": "Plein",
     "xpack.lens.xyChart.axisExtent.label": "Limites",
@@ -732,10 +929,37 @@
     "xpack.lens.xyChart.bottomAxisLabel": "Axe du bas",
     "xpack.lens.xyChart.boundaryError": "La limite inférieure doit être plus grande que la limite supérieure",
     "xpack.lens.xyChart.curveStyleLabel": "Courbes",
+    "xpack.lens.xyChart.defaultAnnotationLabel": "Événement",
+    "xpack.lens.xyChart.endValuesLabel": "Valeurs de fin",
+    "xpack.lens.xyChart.fill.above": "Au-dessus",
+    "xpack.lens.xyChart.fill.after": "Après",
+    "xpack.lens.xyChart.fill.before": "Avant",
+    "xpack.lens.xyChart.fill.below": "En dessous",
+    "xpack.lens.xyChart.fill.label": "Remplir",
+    "xpack.lens.xyChart.fill.none": "Aucun",
     "xpack.lens.xyChart.fillOpacityLabel": "Opacité de remplissage",
     "xpack.lens.xyChart.Gridlines": "Quadrillage",
     "xpack.lens.xyChart.horizontalAxisLabel": "Axe horizontal",
+    "xpack.lens.xyChart.horizontalLeftAxisLabel": "Axe supérieur horizontal",
+    "xpack.lens.xyChart.horizontalRightAxisLabel": "Axe inférieur horizontal",
+    "xpack.lens.xyChart.iconSelect.alertIconLabel": "Alerte",
+    "xpack.lens.xyChart.iconSelect.asteriskIconLabel": "Astérisque",
+    "xpack.lens.xyChart.iconSelect.bellIconLabel": "Cloche",
+    "xpack.lens.xyChart.iconSelect.boltIconLabel": "Éclair",
+    "xpack.lens.xyChart.iconSelect.bugIconLabel": "Bug",
+    "xpack.lens.xyChart.iconSelect.circleIconLabel": "Cercle",
+    "xpack.lens.xyChart.iconSelect.commentIconLabel": "Commentaire",
+    "xpack.lens.xyChart.iconSelect.flagIconLabel": "Drapeau",
+    "xpack.lens.xyChart.iconSelect.heartLabel": "Cœur",
+    "xpack.lens.xyChart.iconSelect.mapMarkerLabel": "Repère",
+    "xpack.lens.xyChart.iconSelect.mapPinLabel": "Punaise",
+    "xpack.lens.xyChart.iconSelect.noIconLabel": "Aucun",
+    "xpack.lens.xyChart.iconSelect.starLabel": "Étoile",
+    "xpack.lens.xyChart.iconSelect.tagIconLabel": "Balise",
+    "xpack.lens.xyChart.iconSelect.triangleIconLabel": "Triangle",
     "xpack.lens.xyChart.inclusiveZero": "Les limites doivent inclure zéro.",
+    "xpack.lens.xyChart.layerAnnotationsLabel": "Annotations",
+    "xpack.lens.xyChart.layerReferenceLineLabel": "Lignes de référence",
     "xpack.lens.xyChart.leftAxisDisabledHelpText": "Ce paramètre s'applique uniquement lorsque l'axe de gauche est activé.",
     "xpack.lens.xyChart.leftAxisLabel": "Axe de gauche",
     "xpack.lens.xyChart.legendLocation.inside": "Intérieur",
@@ -743,9 +967,25 @@
     "xpack.lens.xyChart.legendVisibility.auto": "Auto",
     "xpack.lens.xyChart.legendVisibility.hide": "Masquer",
     "xpack.lens.xyChart.legendVisibility.show": "Afficher",
+    "xpack.lens.xyChart.lineColor.label": "Couleur",
+    "xpack.lens.xyChart.lineMarker.auto": "Auto",
+    "xpack.lens.xyChart.lineMarker.icon": "Décoration de l’icône",
+    "xpack.lens.xyChart.lineMarker.position": "Position de la décoration",
+    "xpack.lens.xyChart.lineMarker.textVisibility.name": "Nom",
+    "xpack.lens.xyChart.lineMarker.textVisibility.none": "Aucun",
+    "xpack.lens.xyChart.lineStyle.dashed": "Tirets",
+    "xpack.lens.xyChart.lineStyle.dotted": "Pointillé",
+    "xpack.lens.xyChart.lineStyle.label": "Ligne",
+    "xpack.lens.xyChart.lineStyle.solid": "Uni",
+    "xpack.lens.xyChart.markerPosition.above": "Haut",
+    "xpack.lens.xyChart.markerPosition.below": "Bas",
+    "xpack.lens.xyChart.markerPosition.left": "Gauche",
+    "xpack.lens.xyChart.markerPosition.right": "Droite",
     "xpack.lens.xyChart.missingValuesLabel": "Valeurs manquantes",
-    "xpack.lens.xyChart.missingValuesLabelHelpText": "Par défaut, Lens masque les blancs dans les données. Pour remplir le blanc, effectuez une sélection.",
+    "xpack.lens.xyChart.missingValuesLabelHelpText": "Par défaut, les graphiques en aires et en courbes masquent les blancs entre les données. Pour remplir le blanc, effectuez une sélection.",
+    "xpack.lens.xyChart.missingValuesStyle": "Afficher sous la forme d’une ligne pointillée",
     "xpack.lens.xyChart.nestUnderRoot": "Ensemble de données entier",
+    "xpack.lens.xyChart.placement": "Placement",
     "xpack.lens.xyChart.rightAxisDisabledHelpText": "Ce paramètre s'applique uniquement lorsque l'axe de droite est activé.",
     "xpack.lens.xyChart.rightAxisLabel": "Axe de droite",
     "xpack.lens.xyChart.seriesColor.auto": "Auto",
@@ -759,6 +999,8 @@
     "xpack.lens.xyChart.valuesPercentageDisabledHelpText": "Ce paramètre ne peut pas être modifié dans les graphiques en aires à pourcentages.",
     "xpack.lens.xyChart.valuesStackedDisabledHelpText": "Ce paramètre ne peut pas être modifié dans les graphiques empilés ou les graphiques à barres à pourcentages",
     "xpack.lens.xyChart.verticalAxisLabel": "Axe vertical",
+    "xpack.lens.xyChart.verticalLeftAxisLabel": "Axe gauche vertical",
+    "xpack.lens.xyChart.verticalRightAxisLabel": "Axe droit vertical",
     "xpack.lens.xySuggestions.asPercentageTitle": "Pourcentage",
     "xpack.lens.xySuggestions.barChartTitle": "Graphique à barres",
     "xpack.lens.xySuggestions.dateSuggestion": "{yTitle} sur {xTitle}",
@@ -797,53 +1039,10 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "H. À barres à pourcentages",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "Vertical à barres à pourcentages",
     "xpack.lens.xyVisualization.xyLabel": "XY",
-    "expressionXY.legend.filterForValueButtonAriaLabel": "Filtre pour la valeur",
-    "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
-    "expressionXY.legend.filterOutValueButtonAriaLabel": "Filtrer la valeur",
-    "expressionXY.xyVis.axisTitlesVisibilitySettings.help": "Afficher les titres des axes X et Y",
-    "expressionXY.xyVis.curveType.help": "Définir de quelle façon le type de courbe est rendu pour un graphique linéaire",
-    "expressionXY.xyChart.emptyXLabel": "(vide)",
-    "expressionXY.axisExtentConfig.extentMode.help": "Mode d'extension",
-    "expressionXY.xyVis.fillOpacity.help": "Définir l'opacité du remplissage du graphique en aires",
-    "expressionXY.xyVis.fittingFunction.help": "Définir le mode de traitement des valeurs manquantes",
-    "expressionXY.legendConfig.floatingColumns.help": "Spécifie le nombre de colonnes lorsque la légende est affichée à l'intérieur du graphique.",
-    "expressionXY.xyVis.gridlinesVisibilitySettings.help": "Afficher le quadrillage des axes X et Y",
-    "expressionXY.xyVis.help": "Graphique X/Y",
-    "expressionXY.xyVis.hideEndzones.help": "Masquer les marqueurs de zone de fin pour les données partielles",
-    "expressionXY.legendConfig.horizontalAlignment.help": "Spécifie l'alignement horizontal de la légende lorsqu'elle est affichée à l'intérieur du graphique.",
-    "expressionXY.legendConfig.isInside.help": "Spécifie si une légende se trouve à l'intérieur d'un graphique",
-    "expressionXY.legendConfig.isVisible.help": "Spécifie si la légende est visible ou non.",
-    "expressionXY.xyVis.labelsOrientation.help": "Définit la rotation des étiquettes des axes",
-    "expressionXY.xyVis.legend.help": "Configurez la légende du graphique.",
-    "expressionXY.legendConfig.maxLines.help": "Spécifie le nombre de lignes par élément de légende.",
-    "expressionXY.legendConfig.position.help": "Spécifie la position de la légende.",
-    "expressionXY.xyVis.renderer.help": "Outil de rendu de graphique X/Y",
-    "expressionXY.legendConfig.shouldTruncate.help": "Spécifie si les éléments de légende seront tronqués ou non",
-    "expressionXY.legendConfig.showSingleSeries.help": "Spécifie si une légende comportant une seule entrée doit être affichée",
-    "expressionXY.xyVis.tickLabelsVisibilitySettings.help": "Afficher les étiquettes de graduation des axes X et Y",
-    "expressionXY.xyVis.valuesInLegend.help": "Afficher les valeurs dans la légende",
-    "expressionXY.legendConfig.verticalAlignment.help": "Spécifie l'alignement vertical de la légende lorsqu'elle est affichée à l'intérieur du graphique.",
-    "expressionXY.gridlinesConfig.x.help": "Spécifie si le quadrillage de l'axe X est visible ou non.",
-    "expressionXY.labelsOrientationConfig.x.help": "Spécifie l'orientation des étiquettes de l'axe X.",
-    "expressionXY.tickLabelsConfig.x.help": "Spécifie si les étiquettes de graduation de l'axe X sont visibles ou non.",
-    "expressionXY.axisTitlesVisibilityConfig.x.help": "Spécifie si le titre de l'axe X est visible ou non.",
-    "expressionXY.xyVis.xTitle.help": "Titre de l'axe X",
-    "expressionXY.gridlinesConfig.yLeft.help": "Spécifie si le quadrillage de l'axe Y de gauche est visible ou non.",
-    "expressionXY.labelsOrientationConfig.yLeft.help": "Spécifie l'orientation des étiquettes de l'axe Y de gauche.",
-    "expressionXY.tickLabelsConfig.yLeft.help": "Spécifie si les étiquettes de graduation de l'axe Y de gauche sont visibles ou non.",
-    "expressionXY.axisTitlesVisibilityConfig.yLeft.help": "Spécifie si le titre de l'axe Y de gauche est visible ou non.",
-    "expressionXY.xyVis.yLeftExtent.help": "Portée de l'axe Y de gauche",
-    "expressionXY.xyVis.yLeftTitle.help": "Titre de l'axe Y de gauche",
-    "expressionXY.gridlinesConfig.yRight.help": "Spécifie si le quadrillage de l'axe Y de droite est visible ou non.",
-    "expressionXY.labelsOrientationConfig.yRight.help": "Spécifie l'orientation des étiquettes de l'axe Y de droite.",
-    "expressionXY.tickLabelsConfig.yRight.help": "Spécifie si les étiquettes de graduation de l'axe Y de droite sont visibles ou non.",
-    "expressionXY.axisTitlesVisibilityConfig.yRight.help": "Spécifie si le titre de l'axe Y de droite est visible ou non.",
-    "expressionXY.xyVis.yRightExtent.help": "Portée de l'axe Y de droite",
-    "expressionXY.xyVis.yRightTitle.help": "Titre de l'axe Y de droite",
     "advancedSettings.advancedSettingsLabel": "Paramètres avancés",
     "advancedSettings.badge.readOnly.text": "Lecture seule",
     "advancedSettings.badge.readOnly.tooltip": "Impossible d’enregistrer les paramètres avancés",
-    "advancedSettings.callOutCautionDescription": "Soyez prudent, ces paramètres sont destinés aux utilisateurs très avancés uniquement. Toute modification est susceptible d’entraîner des dommages importants à Kibana. Certains de ces paramètres peuvent être non documentés, non pris en charge ou expérimentaux. Lorsqu’un champ dispose d’une valeur par défaut, le laisser vide entraîne l’application de cette valeur par défaut, ce qui peut ne pas être acceptable compte tenu d’autres directives de configuration. Toute suppression d'un paramètre personnalisé de la configuration de Kibana est définitive.",
+    "advancedSettings.callOutCautionDescription": "Soyez prudent, ces paramètres sont destinés aux utilisateurs très avancés uniquement. Toute modification est susceptible d’entraîner des dommages importants à Kibana. Certains de ces paramètres peuvent être non documentés, non compatibles ou en version d’évaluation technique. Lorsqu’un champ dispose d’une valeur par défaut, le laisser vide entraîne l’application de cette valeur par défaut, ce qui peut ne pas être acceptable compte tenu d’autres directives de configuration. Toute suppression d'un paramètre personnalisé de la configuration de Kibana est définitive.",
     "advancedSettings.callOutCautionTitle": "Attention : toute action est susceptible de provoquer des dommages.",
     "advancedSettings.categoryNames.dashboardLabel": "Tableau de bord",
     "advancedSettings.categoryNames.discoverLabel": "Discover",
@@ -900,11 +1099,15 @@
     "autocomplete.invalidNumberError": "Nombre non valide",
     "autocomplete.loadingDescription": "Chargement...",
     "autocomplete.selectField": "Veuillez d'abord sélectionner un champ...",
+    "bfetch.disableBfetch": "Désactiver la mise en lots de requêtes",
     "bfetch.disableBfetchCompression": "Désactiver la compression par lots",
     "bfetch.disableBfetchCompressionDesc": "Vous pouvez désactiver la compression par lots. Cela permet de déboguer des requêtes individuelles, mais augmente la taille des réponses.",
+    "bfetch.disableBfetchDesc": "Désactive la mise en lot des requêtes. Cette option augmente le nombre de requêtes HTTP depuis Kibana, mais permet de les déboguer individuellement.",
     "charts.advancedSettings.visualization.colorMappingText": "Mappe des valeurs à des couleurs spécifiques dans les graphiques avec la palette <strong>Compatibilité</strong>.",
-    "charts.advancedSettings.visualization.colorMappingTextDeprecation": "Ce paramètre est déclassé et ne sera plus pris en charge à partir de la version 8.0.",
+    "charts.advancedSettings.visualization.colorMappingTextDeprecation": "Ce paramètre est déclassé et ne sera plus compatible avec les futures versions.",
     "charts.advancedSettings.visualization.colorMappingTitle": "Mapping des couleurs",
+    "charts.advancedSettings.visualization.useLegacyTimeAxis.description": "Active l’axe hérité pour les graphiques dans Lens, Discover, Visualize et TSVB",
+    "charts.advancedSettings.visualization.useLegacyTimeAxis.name": "Axe hérité pour les graphiques",
     "charts.colormaps.bluesText": "Bleus",
     "charts.colormaps.greensText": "Verts",
     "charts.colormaps.greenToRedText": "Vert à rouge",
@@ -923,6 +1126,7 @@
     "charts.functions.systemPaletteHelpText": "Crée une palette de couleurs dynamique.",
     "charts.legend.toggleLegendButtonAriaLabel": "Afficher/Masquer la légende",
     "charts.legend.toggleLegendButtonTitle": "Afficher/Masquer la légende",
+    "charts.noDataLabel": "Résultat introuvable",
     "charts.palettes.complimentaryLabel": "Gratuite",
     "charts.palettes.coolLabel": "Froide",
     "charts.palettes.customLabel": "Personnalisée",
@@ -939,6 +1143,20 @@
     "console.consoleDisplayName": "Console",
     "console.consoleMenu.copyAsCurlFailedMessage": "Impossible de copier la requête en tant que cURL",
     "console.consoleMenu.copyAsCurlMessage": "Requête copiée en tant que cURL",
+    "console.deprecations.enabled.manualStepOneMessage": "Ouvrez le fichier de configuration kibana.yml.",
+    "console.deprecations.enabled.manualStepTwoMessage": "Remplacez le paramètre \"console.enabled\" par \"console.ui.enabled\".",
+    "console.deprecations.enabledMessage": "Pour empêcher les utilisateurs d’accéder à l’interface utilisateur de la console, utilisez le paramètre \"console.ui.enabled\" au lieu de \"console.enabled\".",
+    "console.deprecations.enabledTitle": "Le paramètre \"console.enabled\" est déclassé",
+    "console.deprecations.proxyConfig.manualStepOneMessage": "Ouvrez le fichier de configuration kibana.yml.",
+    "console.deprecations.proxyConfig.manualStepThreeMessage": "Configurez la connexion sécurisée entre Kibana et Elasticsearch à l’aide des paramètres \"server.ssl.*\".",
+    "console.deprecations.proxyConfig.manualStepTwoMessage": "Supprimez le paramètre \"console.proxyConfig\".",
+    "console.deprecations.proxyConfigMessage": "La configuration de \"console.proxyConfig\" est déclassée et sera supprimée dans la version 8.0.0. Pour sécuriser votre connexion entre Kibana et Elasticsearch, utilisez les paramètres \"server.ssl.*\" standards.",
+    "console.deprecations.proxyConfigTitle": "Le paramètre \"console.proxyConfig\" est déclassé",
+    "console.deprecations.proxyFilter.manualStepOneMessage": "Ouvrez le fichier de configuration kibana.yml.",
+    "console.deprecations.proxyFilter.manualStepThreeMessage": "Configurez la connexion sécurisée entre Kibana et Elasticsearch à l’aide des paramètres \"server.ssl.*\".",
+    "console.deprecations.proxyFilter.manualStepTwoMessage": "Supprimez le paramètre \"console.proxyFilter\".",
+    "console.deprecations.proxyFilterMessage": "La configuration de \"console.proxyFilter\" est déclassée et sera supprimée dans la version 8.0.0. Pour sécuriser votre connexion entre Kibana et Elasticsearch, utilisez les paramètres \"server.ssl.*\" standards.",
+    "console.deprecations.proxyFilterTitle": "Le paramètre \"console.proxyFilter\" est déclassé",
     "console.devToolsDescription": "Plutôt que l’interface cURL, utilisez une interface JSON pour exploiter vos données dans la console.",
     "console.devToolsTitle": "Interagir avec l'API Elasticsearch",
     "console.exampleOutputTextarea": "Outils de développement de la console - Exemple d’éditeur",
@@ -953,8 +1171,9 @@
     "console.helpPage.keyboardCommands.submitRequestDescription": "Envoyer la requête",
     "console.helpPage.keyboardCommands.switchFocusToAutoCompleteMenuDescription": "Permet d’accéder au menu de saisie semi-automatique. Utilisez les flèches pour sélectionner un terme.",
     "console.helpPage.keyboardCommandsTitle": "Commandes du clavier",
+    "console.helpPage.learnAboutConsoleAndQueryDslText": "Découvrez plus d’informations sur {console} et {queryDsl}",
     "console.helpPage.pageTitle": "Aide",
-    "console.helpPage.requestFormatDescription": "Vous pouvez saisir une ou plusieurs requêtes dans l'éditeur blanc. La console prend en charge les requêtes dans un format compact :",
+    "console.helpPage.requestFormatDescription": "Vous pouvez saisir une ou plusieurs requêtes dans l'éditeur. La console est compatible avec les requêtes dans un format compact.",
     "console.helpPage.requestFormatTitle": "Format de la requête",
     "console.historyPage.applyHistoryButtonLabel": "Appliquer",
     "console.historyPage.clearHistoryButtonLabel": "Effacer",
@@ -964,11 +1183,14 @@
     "console.historyPage.pageTitle": "Historique",
     "console.historyPage.requestListAriaLabel": "Historique des requêtes envoyées",
     "console.inputTextarea": "Outils de développement de la console",
+    "console.loadFromDataUriErrorMessage": "Impossible de charger les données du paramètre de requête load_from dans l’URL",
     "console.loadingError.buttonLabel": "Recharger la console",
     "console.loadingError.message": "Essayez de recharger pour obtenir les données les plus récentes.",
     "console.loadingError.title": "Impossible de charger la console",
+    "console.notification.clearHistory": "Effacer l’historique",
+    "console.notification.disableSavingToHistory": "Désactiver l’enregistrement",
     "console.notification.error.couldNotSaveRequestTitle": "Impossible d'enregistrer la requête dans l'historique de la console.",
-    "console.notification.error.historyQuotaReachedMessage": "L'historique des requêtes est arrivé à saturation. Effacez l'historique de la console pour pouvoir enregistrer de nouvelles requêtes.",
+    "console.notification.error.historyQuotaReachedMessage": "L'historique des requêtes est arrivé à saturation. Effacez l'historique de la console ou désactivez l’enregistrement de nouvelles requêtes.",
     "console.notification.error.noRequestSelectedTitle": "Aucune requête sélectionnée. Sélectionnez une requête en positionnant le curseur dessus.",
     "console.notification.error.unknownErrorTitle": "Erreur de requête inconnue",
     "console.outputTextarea": "Outils de développement de la console - Sortie",
@@ -982,18 +1204,25 @@
     "console.sendRequestButtonTooltip": "Cliquer pour envoyer la requête",
     "console.settingsPage.autocompleteLabel": "Saisie semi-automatique",
     "console.settingsPage.cancelButtonLabel": "Annuler",
+    "console.settingsPage.dataStreamsLabelText": "Flux de données",
     "console.settingsPage.fieldsLabelText": "Champs",
     "console.settingsPage.fontSizeLabel": "Taille de la police",
+    "console.settingsPage.historyLabel": "Historique",
     "console.settingsPage.indicesAndAliasesLabelText": "Index et alias",
     "console.settingsPage.jsonSyntaxLabel": "Syntaxe JSON",
     "console.settingsPage.pageTitle": "Paramètres de la console",
     "console.settingsPage.refreshButtonLabel": "Actualiser les suggestions de saisie semi-automatique",
-    "console.settingsPage.refreshingDataDescription": "La console actualise les suggestions de saisie semi-automatique en interrogeant Elasticsearch. L’actualisation automatique peut être un problème en cas de cluster volumineux ou de réseau limité.",
-    "console.settingsPage.refreshingDataLabel": "Actualisation des suggestions de saisie semi-automatique",
+    "console.settingsPage.refreshingDataDescription": "La console actualise les suggestions de saisie semi-automatique en interrogeant Elasticsearch. Une actualisation moins fréquente est recommandée pour réduire les coûts de bande passante.",
+    "console.settingsPage.refreshingDataLabel": "Fréquence d’actualisation",
+    "console.settingsPage.refreshInterval.everyHourTimeInterval": "Toutes les heures",
+    "console.settingsPage.refreshInterval.everyNMinutesTimeInterval": "Toutes les {value} {value, plural, one {minute} other {minutes}}",
+    "console.settingsPage.refreshInterval.onceTimeInterval": "Une fois, au chargement de la console",
     "console.settingsPage.saveButtonLabel": "Enregistrer",
+    "console.settingsPage.savingRequestsToHistoryMessage": "Désactiver l’enregistrement des requêtes dans l’historique",
     "console.settingsPage.templatesLabelText": "Modèles",
     "console.settingsPage.tripleQuotesMessage": "Utiliser des guillemets triples dans le volet de sortie",
-    "console.settingsPage.wrapLongLinesLabelText": "Renvoyer automatiquement à la ligne",
+    "console.settingsPage.wrapLongLinesLabelText": "Formater les longues lignes",
+    "console.splitPanel.adjustPanelSizeAriaLabel": "Utilisez les flèches gauche et droite pour ajuster la taille des panneaux.",
     "console.topNav.helpTabDescription": "Aide",
     "console.topNav.helpTabLabel": "Aide",
     "console.topNav.historyTabDescription": "Historique",
@@ -1012,6 +1241,91 @@
     "console.welcomePage.quickTipsTitle": "Quelques brèves astuces, pendant que j'ai toute votre attention :",
     "console.welcomePage.supportedRequestFormatDescription": "Lors de la saisie d'une requête, la console fera des suggestions que vous pourrez accepter en appuyant sur Entrée/Tab. Ces suggestions sont faites en fonction de la structure de la requête, des index et des types.",
     "console.welcomePage.supportedRequestFormatTitle": "La console prend en charge les requêtes dans un format compact, tel que le format cURL :",
+    "controls.controlGroup.emptyState.addControlButtonTitle": "Ajouter un contrôle",
+    "controls.controlGroup.emptyState.callToAction": "Les contrôles vous permettent de filtrer les données de votre tableau de bord et d’interagir avec elles",
+    "controls.controlGroup.emptyState.dismissButton": "Rejeter",
+    "controls.controlGroup.emptyState.twoLineLoadingTitle": "...",
+    "controls.controlGroup.floatingActions.editTitle": "Modifier le contrôle",
+    "controls.controlGroup.floatingActions.removeTitle": "Retirer le contrôle",
+    "controls.controlGroup.manageControl.cancelTitle": "Annuler",
+    "controls.controlGroup.manageControl.controlTypesTitle": "Type de contrôle",
+    "controls.controlGroup.manageControl.createFlyoutTitle": "Créer un contrôle",
+    "controls.controlGroup.manageControl.editFlyoutTitle": "Modifier le contrôle",
+    "controls.controlGroup.manageControl.saveChangesTitle": "Enregistrer et fermer",
+    "controls.controlGroup.manageControl.titleInputTitle": "Étiquette",
+    "controls.controlGroup.manageControl.widthInputTitle": "Taille du contrôle",
+    "controls.controlGroup.management.addControl": "Ajouter un contrôle",
+    "controls.controlGroup.management.buttonTitle": "Paramètres",
+    "controls.controlGroup.management.defaultWidthTitle": "Taille par défaut",
+    "controls.controlGroup.management.delete": "Supprimer le contrôle",
+    "controls.controlGroup.management.delete.cancel": "Annuler",
+    "controls.controlGroup.management.delete.confirm": "Supprimer",
+    "controls.controlGroup.management.delete.deleteAllTitle": "Supprimer tous les contrôles ?",
+    "controls.controlGroup.management.delete.deleteTitle": "Supprimer le contrôle ?",
+    "controls.controlGroup.management.delete.sub": "Une fois supprimés, les contrôles ne peuvent pas être récupérés.",
+    "controls.controlGroup.management.deleteAll": "Tout supprimer",
+    "controls.controlGroup.management.deleteNew.cancel": "Annuler",
+    "controls.controlGroup.management.deleteNew.confirm": "Supprimer le contrôle",
+    "controls.controlGroup.management.deleteNew.sub": "Les modifications apportées à ce contrôle seront ignorées. Voulez-vous vraiment continuer ?",
+    "controls.controlGroup.management.deleteNew.title": "Supprimer le nouveau contrôle",
+    "controls.controlGroup.management.discard.cancel": "Annuler",
+    "controls.controlGroup.management.discard.confirm": "Abandonner les modifications",
+    "controls.controlGroup.management.discard.sub": "Les modifications apportées à ce contrôle seront ignorées. Voulez-vous vraiment continuer ?",
+    "controls.controlGroup.management.discard.title": "Abandonner les modifications ?",
+    "controls.controlGroup.management.flyoutTitle": "Paramètres du contrôle",
+    "controls.controlGroup.management.hierarchy.subtitle": "Les sélections dans un contrôle diminuent les options disponibles dans le suivant. Les contrôles se suivent de gauche à droite.",
+    "controls.controlGroup.management.hierarchy.title": "Contrôles à la suite",
+    "controls.controlGroup.management.labelPosition.above": "Au-dessus",
+    "controls.controlGroup.management.labelPosition.designSwitchLegend": "Modifier la position de l’étiquette entre Aligné et Au-dessus",
+    "controls.controlGroup.management.labelPosition.inline": "Aligné",
+    "controls.controlGroup.management.labelPosition.title": "Position de l'étiquette",
+    "controls.controlGroup.management.layout.auto": "Auto",
+    "controls.controlGroup.management.layout.controlWidthLegend": "Modifier la taille du contrôle",
+    "controls.controlGroup.management.layout.large": "Large",
+    "controls.controlGroup.management.layout.medium": "Moyenne",
+    "controls.controlGroup.management.layout.small": "Petite",
+    "controls.controlGroup.management.query.advancedSettings": "Avancé",
+    "controls.controlGroup.management.query.ignoreFilterPills": "Ignorer les pilules de filtre",
+    "controls.controlGroup.management.query.ignoreQuery": "Ignorer la barre de requête",
+    "controls.controlGroup.management.query.ignoreTimerange": "Ignorer la plage temporelle",
+    "controls.controlGroup.management.query.searchSettingsTitle": "Synchronisation avec la barre de requête",
+    "controls.controlGroup.management.query.useAllSearchSettingsTitle": "Assure la synchronisation entre le groupe de contrôle et la barre de requête, en appliquant une plage temporelle, des pilules de filtre et des requêtes de la barre de requête",
+    "controls.controlGroup.management.setAllWidths": "Définir toutes les tailles sur la valeur par défaut",
+    "controls.controlGroup.management.validate.subtitle": "Ignorez automatiquement toutes les sélections de contrôle qui ne donneraient aucune donnée.",
+    "controls.controlGroup.management.validate.title": "Valider les sélections utilisateur",
+    "controls.controlGroup.title": "Groupe de contrôle",
+    "controls.controlGroup.toolbarButtonTitle": "Contrôles",
+    "controls.optionsList.description": "Ajoutez un menu pour la sélection de valeurs de champ.",
+    "controls.optionsList.displayName": "Liste des options",
+    "controls.optionsList.editor.allowMultiselectTitle": "Permettre des sélections multiples dans une liste déroulante",
+    "controls.optionsList.editor.dataViewTitle": "Vue de données",
+    "controls.optionsList.editor.fieldTitle": "Champ",
+    "controls.optionsList.editor.noDataViewTitle": "Sélectionner la vue de données",
+    "controls.optionsList.errors.dataViewNotFound": "Impossible de localiser la vue de données : {dataViewId}",
+    "controls.optionsList.errors.fieldNotFound": "Impossible de localiser le champ : {fieldId}",
+    "controls.optionsList.popover.allOptionsTitle": "Afficher toutes les options",
+    "controls.optionsList.popover.cardinalityPlaceholder": "Rechercher {totalOptions} {totalOptions, plural, one {option disponible} other {options disponibles}}",
+    "controls.optionsList.popover.cardinalityTooltip": "{totalOptions} options disponibles.",
+    "controls.optionsList.popover.clearAllSelectionsTitle": "Effacer les sélections",
+    "controls.optionsList.popover.empty": "Aucune option trouvée",
+    "controls.optionsList.popover.invalidSelectionsAriaLabel": "Désélectionnez toutes les sélections ignorées",
+    "controls.optionsList.popover.invalidSelectionsSectionTitle": "{invalidSelectionCount, plural, one {Sélection ignorée} other {Sélections ignorées}}",
+    "controls.optionsList.popover.invalidSelectionsTitle": "{invalidSelectionCount} options sélectionnées ignorées",
+    "controls.optionsList.popover.invalidSelectionsTooltip": "{selectedOptions} {selectedOptions, plural, one {option sélectionnée} other {options sélectionnées}} {selectedOptions, plural, one {est ignorée} other {sont ignorées}}, car {selectedOptions, plural, one {elle n’est plus présente} other {elles ne sont plus présentes}} dans les données.",
+    "controls.optionsList.popover.loading": "Options de chargement",
+    "controls.optionsList.popover.selectedOptionsTitle": "Afficher uniquement les options sélectionnées",
+    "controls.optionsList.popover.selectionsEmpty": "Vous n’avez pas de sélections",
+    "controls.optionsList.summary.placeholder": "Sélectionner…",
+    "controls.optionsList.summary.separator": ", ",
+    "controls.rangeSlider.description": "Ajoutez un contrôle pour la sélection d’une plage de valeurs de champ.",
+    "controls.rangeSlider.displayName": "Curseur de plage",
+    "controls.rangeSlider.editor.dataViewTitle": "Vue de données",
+    "controls.rangeSlider.editor.fieldTitle": "Champ",
+    "controls.rangeSlider.editor.noDataViewTitle": "Sélectionner la vue de données",
+    "controls.rangeSlider.popover.allOptionsTitle": "Afficher toutes les options",
+    "controls.rangeSlider.popover.clearRangeTitle": "Effacer la plage",
+    "controls.rangeSlider.popover.noDataHelpText": "La plage sélectionnée se trouve en dehors des données disponibles. Aucun filtre n’a été appliqué.",
+    "controls.rangeSlider.popover.upperLessThanLowerErrorMessage": "La limite supérieure doit être supérieure ou égale à la limite inférieure.",
     "core.application.appContainer.loadingAriaLabel": "Chargement de l'application",
     "core.application.appNotFound.pageDescription": "Aucune application détectée pour cette URL. Revenez en arrière ou sélectionnez une application dans le menu.",
     "core.application.appNotFound.title": "Application introuvable",
@@ -1019,13 +1333,30 @@
     "core.chrome.browserDeprecationLink": "la matrice de prise en charge sur notre site web",
     "core.chrome.browserDeprecationWarning": "La prise en charge d'Internet Explorer sera abandonnée dans les futures versions de ce logiciel. Veuillez consulter le site {link}.",
     "core.chrome.legacyBrowserWarning": "Votre navigateur ne satisfait pas aux exigences de sécurité de Kibana.",
+    "core.deprecations.deprecations.fetchFailed.manualStepOneMessage": "Vérifiez le message d’erreur dans les logs de serveur Kibana.",
+    "core.deprecations.deprecations.fetchFailedMessage": "Impossible d’extraire les informations de déclassement pour le plug-in {domainId}.",
+    "core.deprecations.deprecations.fetchFailedTitle": "Impossible d’extraire les déclassements pour {domainId}",
+    "core.deprecations.elasticsearchSSL.manualSteps1": "Ajoutez le paramètre \"{missingSetting}\" à kibana.yml.",
+    "core.deprecations.elasticsearchSSL.manualSteps2": "Si vous ne souhaitez pas utiliser l’authentification TLS mutuelle, vous pouvez aussi supprimer \"{existingSetting}\" dans kibana.yml.",
+    "core.deprecations.elasticsearchSSL.message": "Utilisez à la fois \"{existingSetting}\" et \"{missingSetting}\" afin d'activer Kibana pour utiliser l’authentification TLS mutuelle avec Elasticsearch.",
+    "core.deprecations.elasticsearchSSL.title": "L’utilisation de \"{existingSetting}\" sans \"{missingSetting}\" n’a pas d’effet",
+    "core.deprecations.elasticsearchUsername.manualSteps1": "Utilisez l’outil CLI elasticsearch-service-tokens afin de créer un jeton pour le compte de service \"elastic/kibana\".",
+    "core.deprecations.elasticsearchUsername.manualSteps2": "Ajoutez le paramètre \"elasticsearch.serviceAccountToken\" à kibana.yml.",
+    "core.deprecations.elasticsearchUsername.manualSteps3": "Supprimez \"elasticsearch.username\" et \"elasticsearch.password\" dans kibana.yml.",
+    "core.deprecations.elasticsearchUsername.message": "Kibana est configuré pour l’authentification sur Elasticsearch avec l’utilisateur \"{username}\". Utilisez plutôt un jeton de compte de service.",
+    "core.deprecations.elasticsearchUsername.title": "L’utilisation de \"elasticsearch.username: {username}\" est déclassée",
+    "core.deprecations.noCorrectiveAction": "Ce déclassement ne peut pas être résolu automatiquement.",
     "core.euiAccordion.isLoading": "Chargement",
+    "core.euiAutoRefresh.autoRefreshLabel": "Actualisation automatique",
+    "core.euiAutoRefresh.buttonLabelOff": "L’actualisation automatique est désactivée",
+    "core.euiAutoRefresh.buttonLabelOn": "L’actualisation automatique est activée et définie sur {prettyInterval}",
+    "core.euiBasicTable.noItemsMessage": "Aucun élément n'a été trouvé",
     "core.euiBasicTable.selectAllRows": "Sélectionner toutes les lignes",
     "core.euiBasicTable.selectThisRow": "Sélectionner cette ligne",
     "core.euiBasicTable.tableAutoCaptionWithoutPagination": "Ce tableau contient {itemCount} lignes.",
     "core.euiBasicTable.tableAutoCaptionWithPagination": "Ce tableau contient {itemCount} lignes sur {totalItemCount} lignes au total ; page {page} sur {pageCount}.",
     "core.euiBasicTable.tableCaptionWithPagination": "{tableCaption} ; page {page} sur {pageCount}.",
-    "core.euiBasicTable.tablePagination": "Pagination pour le tableau précédent : {tableCaption}",
+    "core.euiBasicTable.tablePagination": "Pagination pour le tableau : {tableCaption}",
     "core.euiBasicTable.tableSimpleAutoCaptionWithPagination": "Ce tableau contient {itemCount} lignes ; page {page} sur {pageCount}.",
     "core.euiBottomBar.customScreenReaderAnnouncement": "Il y a un nouveau repère de région nommé {landmarkHeading} avec des commandes de niveau de page à la fin du document.",
     "core.euiBottomBar.screenReaderAnnouncement": "Il y a un nouveau repère de région avec des commandes de niveau de page à la fin du document.",
@@ -1066,12 +1397,17 @@
     "core.euiColumnSelector.searchcolumns": "Rechercher dans les colonnes",
     "core.euiColumnSelector.selectAll": "Afficher tout",
     "core.euiColumnSorting.button": "Trier les champs",
+    "core.euiColumnSorting.buttonActive": "{numberOfSortedFields, plural, one {# champ trié} other {# champs triés}}",
     "core.euiColumnSorting.clearAll": "Annuler le tri",
     "core.euiColumnSorting.emptySorting": "Aucun champ n'est trié actuellement.",
     "core.euiColumnSorting.pickFields": "Sélectionner les champs de tri",
     "core.euiColumnSorting.sortFieldAriaLabel": "Trier par :",
+    "core.euiColumnSortingDraggable.activeSortLabel": "{display} trie cette grille de données",
     "core.euiColumnSortingDraggable.defaultSortAsc": "A-Z",
     "core.euiColumnSortingDraggable.defaultSortDesc": "Z-A",
+    "core.euiColumnSortingDraggable.removeSortLabel": "Retirer {display} du tri de la grille de données",
+    "core.euiColumnSortingDraggable.toggleLegend": "Sélectionner la méthode de tri pour {display}",
+    "core.euiComboBox.listboxAriaLabel": "Faites votre choix parmi les options suivantes",
     "core.euiComboBoxOptionsList.allOptionsSelected": "Vous avez sélectionné toutes les options disponibles.",
     "core.euiComboBoxOptionsList.alreadyAdded": "{label} a déjà été ajouté.",
     "core.euiComboBoxOptionsList.createCustomOption": "Ajouter {searchValue} en tant qu'option personnalisée",
@@ -1087,7 +1423,11 @@
     "core.euiDataGrid.ariaLabel": "{label} ; page {page} sur {pageCount}.",
     "core.euiDataGrid.ariaLabelledBy": "Page {page} sur {pageCount}.",
     "core.euiDataGrid.screenReaderNotice": "Cette cellule contient du contenu interactif.",
+    "core.euiDataGridCell.position": "Ligne : {row} ; colonne : {col}",
+    "core.euiDataGridCellActions.expandButtonTitle": "Cliquez ou appuyez sur Entrée pour interagir avec le contenu de la cellule.",
     "core.euiDataGridHeaderCell.headerActions": "Actions d'en-tête",
+    "core.euiDataGridPagination.detailedPaginationLabel": "Pagination pour la grille précédente : {label}",
+    "core.euiDataGridPagination.paginationLabel": "Pagination pour la grille précédente",
     "core.euiDataGridSchema.booleanSortTextAsc": "Faux-Vrai",
     "core.euiDataGridSchema.booleanSortTextDesc": "Vrai-Faux",
     "core.euiDataGridSchema.currencySortTextAsc": "Bas-Haut",
@@ -1100,13 +1440,31 @@
     "core.euiDataGridSchema.numberSortTextDesc": "Haut-Bas",
     "core.euiDatePopoverButton.invalidTitle": "Date non valide : {title}",
     "core.euiDatePopoverButton.outdatedTitle": "Mise à jour requise : {title}",
+    "core.euiDisplaySelector.buttonText": "Options d’affichage",
+    "core.euiDisplaySelector.densityLabel": "Densité",
+    "core.euiDisplaySelector.labelAuto": "Ajustement automatique",
+    "core.euiDisplaySelector.labelCompact": "Compact",
+    "core.euiDisplaySelector.labelCustom": "Personnalisé",
+    "core.euiDisplaySelector.labelExpanded": "Étendu",
+    "core.euiDisplaySelector.labelNormal": "Normal",
+    "core.euiDisplaySelector.labelSingle": "Unique",
+    "core.euiDisplaySelector.lineCountLabel": "Sous-lignes par ligne",
+    "core.euiDisplaySelector.resetButtonText": "Réinitialiser à la valeur par défaut",
+    "core.euiDisplaySelector.rowHeightLabel": "Hauteur de la ligne",
+    "core.euiErrorBoundary.error": "Erreur",
     "core.euiFieldPassword.maskPassword": "Masquer le mot de passe",
     "core.euiFieldPassword.showPassword": "Afficher le mot de passe en texte brut. Remarque : votre mot de passe sera visible à l'écran.",
     "core.euiFilePicker.clearSelectedFiles": "Effacer les fichiers sélectionnés",
+    "core.euiFilePicker.filesSelected": "{fileCount} fichiers sélectionnés",
+    "core.euiFilePicker.promptText": "Sélectionner ou glisser-déposer un fichier",
     "core.euiFilePicker.removeSelected": "Supprimer",
+    "core.euiFilterButton.filterBadgeActiveAriaLabel": "{count} filtres actifs",
+    "core.euiFilterButton.filterBadgeAvailableAriaLabel": "{count} filtres disponibles",
     "core.euiFlyout.closeAriaLabel": "Fermer cette boîte de dialogue",
     "core.euiForm.addressFormErrors": "Veuillez remédier aux erreurs signalées en surbrillance.",
     "core.euiFormControlLayoutClearButton.label": "Effacer l'entrée",
+    "core.euiFullscreenSelector.fullscreenButton": "Entrer en mode plein écran",
+    "core.euiFullscreenSelector.fullscreenButtonActive": "Quitter le mode plein écran",
     "core.euiHeaderLinks.appNavigation": "Menu de l'application",
     "core.euiHeaderLinks.openNavigationMenu": "Ouvrir le menu",
     "core.euiHue.label": "Sélectionner la valeur \"hue\" du mode de couleur HSV",
@@ -1116,10 +1474,14 @@
     "core.euiLink.newTarget.screenReaderOnlyText": "(s’ouvre dans un nouvel onglet ou une nouvelle fenêtre)",
     "core.euiMarkdownEditorFooter.closeButton": "Fermer",
     "core.euiMarkdownEditorFooter.errorsTitle": "Erreurs",
+    "core.euiMarkdownEditorFooter.mdSyntaxLink": "Markdown avec une touche GitHub",
     "core.euiMarkdownEditorFooter.openUploadModal": "Activer le mode de chargement de fichiers",
     "core.euiMarkdownEditorFooter.showMarkdownHelp": "Afficher l'aide de Markdown",
     "core.euiMarkdownEditorFooter.showSyntaxErrors": "Afficher les erreurs",
     "core.euiMarkdownEditorFooter.supportedFileTypes": "Fichiers pris en charge : {supportedFileTypes}",
+    "core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix": "Cet éditeur utilise",
+    "core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix": "Vous pouvez également utiliser ces plug-ins de syntaxe supplémentaires pour enrichir votre texte.",
+    "core.euiMarkdownEditorFooter.syntaxPopoverDescription": "Cet éditeur utilise",
     "core.euiMarkdownEditorFooter.syntaxTitle": "Aide pour la syntaxe",
     "core.euiMarkdownEditorFooter.unsupportedFileType": "Type de fichiers non pris en charge",
     "core.euiMarkdownEditorFooter.uploadingFiles": "Cliquer pour charger des fichiers",
@@ -1138,11 +1500,20 @@
     "core.euiNotificationEventReadIcon.readAria": "{eventName} lu",
     "core.euiNotificationEventReadIcon.unread": "Non lu",
     "core.euiNotificationEventReadIcon.unreadAria": "{eventName} non lu",
+    "core.euiPagination.collection": "collection",
     "core.euiPagination.firstRangeAriaLabel": "Ignorer les pages 2 à {lastPage}",
+    "core.euiPagination.fromEndLabel": "à partir de la fin",
+    "core.euiPagination.last": "Dernier",
     "core.euiPagination.lastRangeAriaLabel": "Ignorer les pages {firstPage} à {lastPage}",
+    "core.euiPagination.of": "de",
+    "core.euiPagination.page": "Page",
     "core.euiPagination.pageOfTotalCompressed": "{page} sur {total}",
     "core.euiPaginationButton.longPageString": "Page {page} sur {totalPages}",
     "core.euiPaginationButton.shortPageString": "Page {page}",
+    "core.euiPaginationButtonArrow.firstPage": "Première page",
+    "core.euiPaginationButtonArrow.lastPage": "Dernière page",
+    "core.euiPaginationButtonArrow.nextPage": "Page suivante",
+    "core.euiPaginationButtonArrow.previousPage": "Page précédente",
     "core.euiPinnableListGroup.pinExtraActionLabel": "Épingler l'élément",
     "core.euiPinnableListGroup.pinnedExtraActionLabel": "Désépingler l'élément",
     "core.euiPopover.screenReaderAnnouncement": "Il s’agit d’une boîte de dialogue. Appuyez sur Échap pour quitter.",
@@ -1157,7 +1528,10 @@
     "core.euiQuickSelect.unitLabel": "Unité de temps",
     "core.euiQuickSelect.valueLabel": "Valeur de temps",
     "core.euiRecentlyUsed.legend": "Plages de dates récemment utilisées",
+    "core.euiRefreshInterval.fullDescriptionOff": "L’actualisation est désactivée, intervalle défini sur {optionValue} {optionText}.",
+    "core.euiRefreshInterval.fullDescriptionOn": "L’actualisation est activée, intervalle défini sur {optionValue} {optionText}.",
     "core.euiRefreshInterval.legend": "Actualiser toutes les",
+    "core.euiRelativeTab.dateInputError": "Doit être une plage valide",
     "core.euiRelativeTab.fullDescription": "L'unité peut être modifiée. Elle est actuellement définie sur {unit}.",
     "core.euiRelativeTab.numberInputError": "Doit être >= 0.",
     "core.euiRelativeTab.numberInputLabel": "Nombre d'intervalles",
@@ -1171,10 +1545,15 @@
     "core.euiSelectable.noAvailableOptions": "Aucune option disponible",
     "core.euiSelectable.noMatchingOptions": "{searchValue} ne correspond à aucune option.",
     "core.euiSelectable.placeholderName": "Options de filtre",
+    "core.euiSelectable.screenReaderInstructions": "Utilisez les flèches vers le haut et vers le bas pour déplacer la mise au point sur les options. Appuyez sur Entrée pour sélectionner. Appuyez sur Échap pour réduire les options.",
+    "core.euiSelectable.searchResults": "{resultsLength, plural, one {# résultat} other {# résultats}}",
+    "core.euiSelectableListItem.checkedOption": "Option cochée.",
+    "core.euiSelectableListItem.checkedOptionInstructions": "Pour décocher cette option, appuyez sur Entrée.",
     "core.euiSelectableListItem.excludedOption": "Option exclue.",
-    "core.euiSelectableListItem.excludedOptionInstructions": "Pour désélectionner cette option, appuyez sur Entrée.",
-    "core.euiSelectableListItem.includedOption": "Option incluse.",
+    "core.euiSelectableListItem.excludedOptionInstructions": "Pour décocher cette option, appuyez sur Entrée.",
+    "core.euiSelectableListItem.includedOption": "Option sélectionnée.",
     "core.euiSelectableListItem.includedOptionInstructions": "Pour exclure cette option, appuyez sur Entrée.",
+    "core.euiSelectableListItem.unckeckedOptionInstructions": "Pour sélectionner cette option, appuyez sur Entrée.",
     "core.euiSelectableTemplateSitewide.loadingResults": "Chargement des résultats",
     "core.euiSelectableTemplateSitewide.noResults": "Aucun résultat disponible",
     "core.euiSelectableTemplateSitewide.onFocusBadgeGoTo": "Atteindre",
@@ -1196,6 +1575,13 @@
     "core.euiStepStrings.simpleWarning": "L'étape {number} contient des avertissements.",
     "core.euiStepStrings.step": "Étape {number} : {title}",
     "core.euiStepStrings.warning": "L'étape {number} : {title} contient des avertissements.",
+    "core.euiSuggest.stateLoading": "État : chargement.",
+    "core.euiSuggest.stateSaved": "État : enregistré.",
+    "core.euiSuggest.stateSavedTooltip": "Enregistré.",
+    "core.euiSuggest.stateUnchanged": "État : non modifié.",
+    "core.euiSuggest.stateUnsaved": "État : non enregistré.",
+    "core.euiSuggest.stateUnsavedTooltip": "Les modifications n'ont pas été enregistrées.",
+    "core.euiSuperSelect.screenReaderAnnouncement": "Vous êtes dans un sélecteur de formulaires et vous devez sélectionner une seule option. Utilisez les flèches vers le haut et vers le bas pour naviguer, ou appuyez sur Échap pour fermer.",
     "core.euiSuperSelectControl.selectAnOption": "Sélectionner une option : l’option {selectedValue} est sélectionnée.",
     "core.euiSuperUpdateButton.cannotUpdateTooltip": "Mise à jour impossible",
     "core.euiSuperUpdateButton.clickToApplyTooltip": "Cliquer pour appliquer",
@@ -1203,8 +1589,10 @@
     "core.euiSuperUpdateButton.updateButtonLabel": "Mettre à jour",
     "core.euiSuperUpdateButton.updatingButtonLabel": "Mise à jour",
     "core.euiTableHeaderCell.titleTextWithDesc": "{innerText} ; {description}",
+    "core.euiTablePagination.allRows": "Affichage de toutes les lignes",
     "core.euiTablePagination.rowsPerPage": "Lignes par page",
     "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} lignes",
+    "core.euiTablePagination.rowsPerPageOptionShowAllRows": "Afficher toutes les lignes",
     "core.euiTableSortMobile.sorting": "Tri",
     "core.euiToast.dismissToast": "Rejeter le toast",
     "core.euiToast.newNotification": "Une nouvelle notification apparaît.",
@@ -1225,38 +1613,52 @@
     "core.notifications.errorToast.closeModal": "Fermer",
     "core.notifications.globalToast.ariaLabel": "Liste de messages de notification",
     "core.notifications.unableUpdateUISettingNotificationMessageTitle": "Impossible de mettre à jour le paramètre de l'interface utilisateur",
+    "core.savedObjects.deprecations.unknownTypes.manualSteps.1": "Activez les plug-ins désactivés, puis redémarrez Kibana.",
+    "core.savedObjects.deprecations.unknownTypes.manualSteps.2": "Si aucun plug-in n’est désactivé ou si leur activation ne résout pas le problème, supprimez les documents.",
+    "core.savedObjects.deprecations.unknownTypes.message": "{objectCount, plural, one {# objet} other {# objets}} de type inconnu {objectCount, plural, one {a été trouvé} other {ont été trouvés}} dans les indices du système Kibana. La mise à niveau avec des types savedObject inconnus n’est plus compatible. Pour assurer la réussite des mises à niveau à l’avenir, réactivez les plug-ins ou supprimez ces documents dans les indices de Kibana",
+    "core.savedObjects.deprecations.unknownTypes.title": "Des objets enregistrés avec des types inconnus sont présents dans les indices du système Kibana",
     "core.status.greenTitle": "Vert",
     "core.status.redTitle": "Rouge",
     "core.status.yellowTitle": "Jaune",
+    "core.statusPage.coreStatus.sectionTitle": "Statut principal",
     "core.statusPage.loadStatus.serverIsDownErrorMessage": "Échec de requête du statut du serveur. Votre serveur est peut-être indisponible ?",
     "core.statusPage.loadStatus.serverStatusCodeErrorMessage": "Échec de requête du statut du serveur avec le code de statut {responseStatus}.",
     "core.statusPage.metricsTiles.columns.heapTotalHeader": "Tas total",
     "core.statusPage.metricsTiles.columns.heapUsedHeader": "Tas utilisé",
-    "core.statusPage.metricsTiles.columns.loadHeader": "Charger",
+    "core.statusPage.metricsTiles.columns.load.metaHeader": "Intervalle de charge",
+    "core.statusPage.metricsTiles.columns.loadHeader": "Charge",
+    "core.statusPage.metricsTiles.columns.processDelayDetailsHeader": "Centiles",
+    "core.statusPage.metricsTiles.columns.processDelayHeader": "Retard",
     "core.statusPage.metricsTiles.columns.requestsPerSecHeader": "Requêtes par seconde",
     "core.statusPage.metricsTiles.columns.resTimeAvgHeader": "Temps de réponse moyen",
     "core.statusPage.metricsTiles.columns.resTimeMaxHeader": "Temps de réponse max.",
     "core.statusPage.serverStatus.statusTitle": "Statut Kibana : {kibanaStatus}",
     "core.statusPage.statusApp.loadingErrorText": "Une erreur s'est produite lors du chargement du statut.",
-    "core.statusPage.statusApp.statusActions.buildText": "CRÉER {buildNum}",
-    "core.statusPage.statusApp.statusActions.commitText": "VALIDER {buildSha}",
+    "core.statusPage.statusApp.statusActions.buildText": "BUILD : {buildNum}",
+    "core.statusPage.statusApp.statusActions.commitText": "COMMIT : {buildSha}",
+    "core.statusPage.statusApp.statusActions.versionText": "VERSION : {versionNum}",
     "core.statusPage.statusApp.statusTitle": "Statut du plug-in",
+    "core.statusPage.statusTable.columns.expandRow.collapseLabel": "Réduire",
+    "core.statusPage.statusTable.columns.expandRow.expandLabel": "Développer",
+    "core.statusPage.statusTable.columns.expandRowHeader": "Développer la ligne",
     "core.statusPage.statusTable.columns.idHeader": "ID",
     "core.statusPage.statusTable.columns.statusHeader": "Statut",
+    "core.statusPage.statusTable.columns.statusSummaryHeader": "Résumé du statut",
     "core.toasts.errorToast.seeFullError": "Voir l'erreur en intégralité",
     "core.ui_settings.params.darkModeText": "Activez le mode sombre pour l'interface utilisateur Kibana. Vous devez actualiser la page pour que ce paramètre s’applique.",
     "core.ui_settings.params.darkModeTitle": "Mode sombre",
-    "core.ui_settings.params.dateFormat.dayOfWeekText": "Quel est le premier jour de la semaine ?",
+    "core.ui_settings.params.dateFormat.dayOfWeekText": "Le premier jour de la semaine",
     "core.ui_settings.params.dateFormat.dayOfWeekTitle": "Jour de la semaine",
     "core.ui_settings.params.dateFormat.optionsLinkText": "format",
     "core.ui_settings.params.dateFormat.scaled.intervalsLinkText": "Intervalles ISO8601",
     "core.ui_settings.params.dateFormat.scaledText": "Les valeurs qui définissent le format utilisé lorsque les données temporelles sont rendues dans l'ordre, et lorsque les horodatages formatés doivent s'adapter à l'intervalle entre les mesures. Les clés sont {intervalsLink}.",
     "core.ui_settings.params.dateFormat.scaledTitle": "Format de date scalé",
     "core.ui_settings.params.dateFormat.timezone.invalidValidationMessage": "Fuseau horaire non valide : {timezone}",
-    "core.ui_settings.params.dateFormat.timezoneTitle": "Fuseau horaire pour le format de date",
-    "core.ui_settings.params.dateFormatText": "{formatLink} utilisé pour les dates formatées",
+    "core.ui_settings.params.dateFormat.timezoneText": "Le fuseau horaire par défaut.",
+    "core.ui_settings.params.dateFormat.timezoneTitle": "Fuseau horaire",
+    "core.ui_settings.params.dateFormatText": "Le {formatLink} pour des dates joliment formatées.",
     "core.ui_settings.params.dateFormatTitle": "Format de date",
-    "core.ui_settings.params.dateNanosFormatText": "Utilisé pour le type de données {dateNanosLink} d'Elasticsearch",
+    "core.ui_settings.params.dateNanosFormatText": "Le format pour les données {dateNanosLink}.",
     "core.ui_settings.params.dateNanosFormatTitle": "Date au format nanosecondes",
     "core.ui_settings.params.dateNanosLinkTitle": "date_nanos",
     "core.ui_settings.params.dayOfWeekText.invalidValidationMessage": "Jour de la semaine non valide : {dayOfWeek}",
@@ -1308,10 +1710,14 @@
     "core.ui.observabilityNavList.label": "Observabilité",
     "core.ui.overlays.banner.attentionTitle": "Attention",
     "core.ui.overlays.banner.closeButtonLabel": "Fermer",
+    "core.ui.primaryNav.addData": "Ajouter des intégrations",
     "core.ui.primaryNav.pinnedLinksAriaLabel": "Liens épinglés",
     "core.ui.primaryNav.screenReaderLabel": "Principale",
     "core.ui.primaryNav.toggleNavAriaLabel": "Activer/Désactiver la navigation principale",
     "core.ui.primaryNavSection.screenReaderLabel": "Liens de navigation principale, {category}",
+    "core.ui.publicBaseUrlWarning.configRecommendedDescription": "Dans un environnement de production, il est recommandé de configurer {configKey}.",
+    "core.ui.publicBaseUrlWarning.configRecommendedTitle": "Configuration recommandée",
+    "core.ui.publicBaseUrlWarning.learnMoreLinkLabel": "En savoir plus.",
     "core.ui.publicBaseUrlWarning.muteWarningButtonLabel": "Avertissement de mise sur Muet",
     "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}, type : {pageType}",
     "core.ui.recentlyViewed": "Récemment consulté",
@@ -1319,6 +1725,27 @@
     "core.ui.securityNavList.label": "Security",
     "core.ui.welcomeErrorMessage": "Elastic ne s'est pas chargé correctement. Vérifiez la sortie du serveur pour plus d'informations.",
     "core.ui.welcomeMessage": "Chargement d'Elastic",
+    "customIntegrations.components.replacementAccordion.comparisonPageLinkLabel": "page de comparaison",
+    "customIntegrations.components.replacementAccordion.recommendationDescription": "Les intégrations d’Elastic Agent sont recommandées, mais vous pouvez également utiliser Beats. Pour plus de détails, consultez notre {link}.",
+    "customIntegrations.components.replacementAccordionLabel": "Également disponible dans Beats",
+    "customIntegrations.languageclients.DotNetDescription": "Indexez les données dans Elasticsearch avec le client .NET.",
+    "customIntegrations.languageclients.DotNetTitle": "Client .NET Elasticsearch",
+    "customIntegrations.languageclients.GoDescription": "Indexez les données dans Elasticsearch avec le client Go.",
+    "customIntegrations.languageclients.GoTitle": "Client Go Elasticsearch",
+    "customIntegrations.languageclients.JavaDescription": "Indexez les données dans Elasticsearch avec le client Java.",
+    "customIntegrations.languageclients.JavascriptDescription": "Indexez les données dans Elasticsearch avec le client JavaScript.",
+    "customIntegrations.languageclients.JavascriptTitle": "Client JavaScript Elasticsearch",
+    "customIntegrations.languageclients.JavaTitle": "Client Java Elasticsearch",
+    "customIntegrations.languageclients.PerlDescription": "Indexez les données dans Elasticsearch avec le client Perl.",
+    "customIntegrations.languageclients.PerlTitle": "Client Perl Elasticsearch",
+    "customIntegrations.languageclients.PhpDescription": "Indexez les données dans Elasticsearch avec le client PHP.",
+    "customIntegrations.languageclients.PhpTitle": "Client PHP Elasticsearch",
+    "customIntegrations.languageclients.PythonDescription": "Indexez les données dans Elasticsearch avec le client Python.",
+    "customIntegrations.languageclients.PythonTitle": "Client Python Elasticsearch",
+    "customIntegrations.languageclients.RubyDescription": "Indexez les données dans Elasticsearch avec le client Ruby.",
+    "customIntegrations.languageclients.RubyTitle": "Client Ruby Elasticsearch",
+    "customIntegrations.languageclients.RustDescription": "Indexez les données dans Elasticsearch avec le client Rust.",
+    "customIntegrations.languageclients.RustTitle": "Client Rust Elasticsearch",
     "dashboard.actions.DownloadCreateDrilldownAction.displayName": "Télécharger au format CSV",
     "dashboard.actions.downloadOptionsUnsavedFilename": "sans titre",
     "dashboard.actions.toggleExpandPanelMenuItem.expandedDisplayName": "Minimiser",
@@ -1339,7 +1766,7 @@
     "dashboard.createConfirmModal.cancelButtonLabel": "Annuler",
     "dashboard.createConfirmModal.confirmButtonLabel": "Redémarrer",
     "dashboard.createConfirmModal.continueButtonLabel": "Poursuivre les modifications",
-    "dashboard.createConfirmModal.unsavedChangesSubtitle": "Vous pouvez poursuivre les modifications ou utiliser un tableau de bord vierge.",
+    "dashboard.createConfirmModal.unsavedChangesSubtitle": "Poursuivez les modifications ou utilisez un tableau de bord vierge.",
     "dashboard.createConfirmModal.unsavedChangesTitle": "Nouveau tableau de bord déjà en cours",
     "dashboard.dashboardAppBreadcrumbsTitle": "Tableau de bord",
     "dashboard.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "Impossible de charger le tableau de bord.",
@@ -1368,12 +1795,13 @@
     "dashboard.helpMenu.appName": "Tableaux de bord",
     "dashboard.howToStartWorkingOnNewDashboardDescription": "Cliquez sur Modifier dans la barre de menu ci-dessus pour commencer à ajouter des panneaux.",
     "dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel": "Modifier le tableau de bord",
-    "dashboard.labs.enableLabsDescription": "Cet indicateur détermine si l'observateur a accès au bouton Ateliers, un moyen rapide d'activer et de désactiver les fonctionnalités expérimentales dans le tableau de bord.",
+    "dashboard.labs.enableLabsDescription": "Cet indicateur détermine si l'utilisateur a accès au bouton Ateliers, moyen rapide d'activer et de désactiver les fonctionnalités de la version d’évaluation technique dans le tableau de bord.",
     "dashboard.labs.enableUI": "Activer le bouton Ateliers dans le tableau de bord",
-    "dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "Vous pouvez combiner les vues de données de n'importe quelle application Kibana dans un seul tableau de bord afin de tout regrouper.",
-    "dashboard.listing.createNewDashboard.createButtonLabel": "Créer un nouveau tableau de bord",
+    "dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "Analysez toutes vos données Elastic en un seul endroit, en créant un tableau de bord et en ajoutant des visualisations.",
+    "dashboard.listing.createNewDashboard.createButtonLabel": "Créer un tableau de bord",
+    "dashboard.listing.createNewDashboard.inProgressTitle": "Tableau de bord en cours",
     "dashboard.listing.createNewDashboard.newToKibanaDescription": "Vous êtes nouveau sur Kibana ? {sampleDataInstallLink} pour découvrir l'application.",
-    "dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "Installez un exemple de données",
+    "dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "Ajoutez des exemples de données",
     "dashboard.listing.createNewDashboard.title": "Créer votre premier tableau de bord",
     "dashboard.listing.readonlyNoItemsBody": "Aucun tableau de bord n'est disponible. Pour modifier vos autorisations afin d’afficher les tableaux de bord dans cet espace, contactez votre administrateur.",
     "dashboard.listing.readonlyNoItemsTitle": "Aucun tableau de bord à afficher",
@@ -1386,7 +1814,8 @@
     "dashboard.listing.unsaved.editAria": "Poursuivre les modifications apportées à {title}",
     "dashboard.listing.unsaved.editTitle": "Poursuivre les modifications",
     "dashboard.listing.unsaved.loading": "Chargement",
-    "dashboard.listing.unsaved.unsavedChangesTitle": "Vous avez des modifications non enregistrées dans le {dash} suivant.",
+    "dashboard.listing.unsaved.unsavedChangesTitle": "Vous avez des modifications non enregistrées dans le {dash} suivant :",
+    "dashboard.loadingError.errorMessage": "Erreur rencontrée lors du chargement du tableau de bord enregistré : {message}",
     "dashboard.migratedChanges": "Certains des panneaux ont été mis à jour vers la version la plus récente.",
     "dashboard.noMatchRoute.bannerText": "L'application de tableau de bord ne reconnaît pas ce chemin : {route}.",
     "dashboard.noMatchRoute.bannerTitleText": "Page introuvable",
@@ -1395,7 +1824,7 @@
     "dashboard.panel.clonedToast": "Panneau cloné",
     "dashboard.panel.clonePanel": "Cloner le panneau",
     "dashboard.panel.copyToDashboard.cancel": "Annuler",
-    "dashboard.panel.copyToDashboard.description": "Sélectionnez l'emplacement où copier le panneau. Vous avez été redirigé vers le tableau de bord de destination.",
+    "dashboard.panel.copyToDashboard.description": "Choisissez le tableau de bord de destination.",
     "dashboard.panel.copyToDashboard.existingDashboardOptionLabel": "Tableau de bord existant",
     "dashboard.panel.copyToDashboard.goToDashboard": "Copier et accéder au tableau de bord",
     "dashboard.panel.copyToDashboard.newDashboardOptionLabel": "Nouveau tableau de bord",
@@ -1415,8 +1844,9 @@
     "dashboard.panelStorageError.setError": "Une erreur s'est produite lors de la définition des modifications non enregistrées : {message}.",
     "dashboard.placeholder.factory.displayName": "paramètre fictif",
     "dashboard.savedDashboard.newDashboardTitle": "Nouveau tableau de bord",
+    "dashboard.share.defaultDashboardTitle": "Tableau de bord [{date}]",
     "dashboard.solutionToolbar.addPanelButtonLabel": "Créer une visualisation",
-    "dashboard.solutionToolbar.editorMenuButtonLabel": "Tous les types",
+    "dashboard.solutionToolbar.editorMenuButtonLabel": "Sélectionner un type",
     "dashboard.strings.dashboardEditTitle": "Modification de {title}",
     "dashboard.topNav.cloneModal.cancelButtonLabel": "Annuler",
     "dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "Cloner le tableau de bord",
@@ -1490,6 +1920,7 @@
     "data.advancedSettings.query.queryStringOptions.optionsLinkText": "Options",
     "data.advancedSettings.query.queryStringOptionsText": "{optionsLink} pour l'analyseur de chaînes de requête Lucene. Uniquement utilisé lorsque \"{queryLanguage}\" est défini sur {luceneLanguage}.",
     "data.advancedSettings.query.queryStringOptionsTitle": "Options de chaîne de requête",
+    "data.advancedSettings.search.includeFrozenTextDeprecation": "Ce paramètre est déclassé et sera supprimé dans la version 9.0 de Kibana.",
     "data.advancedSettings.searchQueryLanguageKql": "KQL",
     "data.advancedSettings.searchQueryLanguageLucene": "Lucene",
     "data.advancedSettings.searchQueryLanguageText": "Le langage de requête utilisé par la barre de requête. KQL est un nouveau langage spécialement conçu pour Kibana.",
@@ -1521,6 +1952,7 @@
     "data.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} et {lt} {to}",
     "data.aggTypes.buckets.ranges.rangesFormatMessageArrowRight": "{from} → {to}",
     "data.errors.fetchError": "Vérifiez votre réseau et la configuration de votre proxy. Si le problème persiste, contactez votre administrateur réseau.",
+    "data.esError.unknownRootCause": "inconnue",
     "data.filter.filterBar.fieldNotFound": "Champ {key} introuvable dans le modèle d'indexation {indexPattern}",
     "data.functions.esaggs.help": "Exécuter l'agrégation AggConfig",
     "data.functions.esaggs.inspector.dataRequest.description": "Cette requête interroge Elasticsearch pour récupérer les données pour la visualisation.",
@@ -1543,22 +1975,6 @@
     "data.inspector.table.tableLabel": "Tableau {index}",
     "data.inspector.table.tablesDescription": "Il y a {tablesCount, plural, one {# tableau} other {# tableaux} } au total.",
     "data.inspector.table.tableSelectorLabel": "Sélectionné :",
-    "data.kueryAutocomplete.andOperatorDescription": "Nécessite que {bothArguments} soient ''vrai''.",
-    "data.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "les deux arguments",
-    "data.kueryAutocomplete.equalOperatorDescription": "{equals} une certaine valeur",
-    "data.kueryAutocomplete.equalOperatorDescription.equalsText": "égale",
-    "data.kueryAutocomplete.existOperatorDescription": "{exists} sous un certain format",
-    "data.kueryAutocomplete.existOperatorDescription.existsText": "existe",
-    "data.kueryAutocomplete.greaterThanOperatorDescription": "est {greaterThan} une certaine valeur",
-    "data.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText": "supérieur à",
-    "data.kueryAutocomplete.greaterThanOrEqualOperatorDescription": "est {greaterThanOrEqualTo} une certaine valeur",
-    "data.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText": "supérieur ou égal à",
-    "data.kueryAutocomplete.lessThanOperatorDescription": "est {lessThan} une certaine valeur",
-    "data.kueryAutocomplete.lessThanOperatorDescription.lessThanText": "inférieur à",
-    "data.kueryAutocomplete.lessThanOrEqualOperatorDescription": "est {lessThanOrEqualTo} une certaine valeur",
-    "data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "inférieur ou égal à",
-    "data.kueryAutocomplete.orOperatorDescription": "Nécessite qu’{oneOrMoreArguments} soit ''vrai''.",
-    "data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "au moins un argument",
     "data.painlessError.buttonTxt": "Modifier le script",
     "data.painlessError.painlessScriptedFieldErrorMessage": "Erreur d'exécution du champ d'exécution ou du champ scripté sur le modèle d'indexation {indexPatternName}",
     "data.parseEsInterval.invalidEsCalendarIntervalErrorMessage": "Intervalle de calendrier non valide : {interval} ; la valeur doit être 1.",
@@ -1571,6 +1987,7 @@
     "data.search.aggs.buckets.dateHistogram.dropPartials.help": "Spécifie l'utilisation ou non de drop_partials pour cette agrégation.",
     "data.search.aggs.buckets.dateHistogram.enabled.help": "Spécifie si cette agrégation doit être activée.",
     "data.search.aggs.buckets.dateHistogram.extendedBounds.help": "Avec le paramètre extended_bounds, il est désormais possible de \"forcer\" l'agrégation d'histogrammes à démarrer la conception des compartiments sur une valeur minimale spécifique et à continuer jusqu'à une valeur maximale. ",
+    "data.search.aggs.buckets.dateHistogram.extendToTimeRange.help": "Définit automatiquement les limites étendues sur la plage temporelle appliquée actuellement. Est ignoré si extended_bounds est défini",
     "data.search.aggs.buckets.dateHistogram.field.help": "Champ à utiliser pour cette agrégation",
     "data.search.aggs.buckets.dateHistogram.format.help": "Format à utiliser pour cette agrégation",
     "data.search.aggs.buckets.dateHistogram.id.help": "ID pour cette agrégation",
@@ -1593,6 +2010,13 @@
     "data.search.aggs.buckets.dateRange.schema.help": "Schéma à utiliser pour cette agrégation",
     "data.search.aggs.buckets.dateRange.timeZone.help": "Fuseau horaire à utiliser pour cette agrégation.",
     "data.search.aggs.buckets.dateRangeTitle": "Plage de dates",
+    "data.search.aggs.buckets.diversifiedSampler.enabled.help": "Spécifie si cette agrégation doit être activée.",
+    "data.search.aggs.buckets.diversifiedSampler.field.help": "Permet de fournir des valeurs utilisées pour la déduplication.",
+    "data.search.aggs.buckets.diversifiedSampler.id.help": "ID pour cette agrégation",
+    "data.search.aggs.buckets.diversifiedSampler.maxDocsPerValue.help": "Limite le nombre de documents autorisés par choix de valeur de déduplication.",
+    "data.search.aggs.buckets.diversifiedSampler.schema.help": "Schéma à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.diversifiedSampler.shardSize.help": "Le paramètre shard_size limite le nombre de documents les mieux classés recueillis dans l’échantillon traité sur chaque partition.",
+    "data.search.aggs.buckets.diversifiedSamplerTitle": "Échantillonneur diversifié",
     "data.search.aggs.buckets.filter.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
     "data.search.aggs.buckets.filter.enabled.help": "Spécifie si cette agrégation doit être activée.",
     "data.search.aggs.buckets.filter.filter.help": "Pour filtrer les résultats en fonction d’une requête KQL ou Lucene. Ne pas utiliser en association avec geo_bounding_box.",
@@ -1628,6 +2052,7 @@
     "data.search.aggs.buckets.geoTile.schema.help": "Schéma à utiliser pour cette agrégation",
     "data.search.aggs.buckets.geoTile.useGeocentroid.help": "Spécifie l'utilisation ou non d’un centroïde géométrique pour cette agrégation.",
     "data.search.aggs.buckets.geotileGridTitle": "Geotile",
+    "data.search.aggs.buckets.histogram.autoExtendBounds.help": "Définissez cette option comme vraie pour étendre les limites au domaine des données. Cela permet de s’assurer que chaque compartiment d’intervalle compris dans ces limites créera une ligne de tableau distincte.",
     "data.search.aggs.buckets.histogram.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
     "data.search.aggs.buckets.histogram.enabled.help": "Spécifie si cette agrégation doit être activée.",
     "data.search.aggs.buckets.histogram.extendedBounds.help": "Avec le paramètre extended_bounds, il est désormais possible de \"forcer\" l'agrégation d'histogrammes à démarrer la conception des compartiments sur une valeur minimale spécifique et à continuer jusqu'à une valeur maximale. ",
@@ -1660,6 +2085,21 @@
     "data.search.aggs.buckets.ipRange.schema.help": "Schéma à utiliser pour cette agrégation",
     "data.search.aggs.buckets.ipRangeLabel": "Plages d'IP de {fieldName}",
     "data.search.aggs.buckets.ipRangeTitle": "Plage d'IP",
+    "data.search.aggs.buckets.multiTerms.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
+    "data.search.aggs.buckets.multiTerms.enabled.help": "Spécifie si cette agrégation doit être activée.",
+    "data.search.aggs.buckets.multiTerms.fields.help": "Champs à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.multiTerms.id.help": "ID pour cette agrégation",
+    "data.search.aggs.buckets.multiTerms.json.help": "Json avancé à inclure lorsque l'agrégation est envoyée vers Elasticsearch",
+    "data.search.aggs.buckets.multiTerms.order.help": "Ordre dans lequel renvoyer les résultats : croissant ou décroissant",
+    "data.search.aggs.buckets.multiTerms.orderAgg.help": "Configuration d'agrégation à utiliser pour ordonner les résultats",
+    "data.search.aggs.buckets.multiTerms.orderBy.help": "Champ selon lequel ordonner les résultats",
+    "data.search.aggs.buckets.multiTerms.otherBucket.help": "Lorsqu'il est défini sur ''vrai'', ce paramètre regroupe tous les compartiments au-delà de la taille autorisée.",
+    "data.search.aggs.buckets.multiTerms.otherBucketLabel.help": "Étiquette par défaut utilisée dans les graphiques pour les documents du compartiment Autre",
+    "data.search.aggs.buckets.multiTerms.otherFilterJoinName": "ou",
+    "data.search.aggs.buckets.multiTerms.schema.help": "Schéma à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.multiTerms.separatorLabel.help": "Étiquette de séparateur utilisée pour associer chaque combinaison de termes",
+    "data.search.aggs.buckets.multiTerms.size.help": "Nombre maximal de compartiments à extraire",
+    "data.search.aggs.buckets.multiTermsTitle": "Termes multiples",
     "data.search.aggs.buckets.range.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
     "data.search.aggs.buckets.range.enabled.help": "Spécifie si cette agrégation doit être activée.",
     "data.search.aggs.buckets.range.field.help": "Champ à utiliser pour cette agrégation",
@@ -1668,6 +2108,17 @@
     "data.search.aggs.buckets.range.ranges.help": "Plages en série à utiliser pour cette agrégation.",
     "data.search.aggs.buckets.range.schema.help": "Schéma à utiliser pour cette agrégation",
     "data.search.aggs.buckets.rangeTitle": "Plage",
+    "data.search.aggs.buckets.rareTerms.enabled.help": "Spécifie si cette agrégation doit être activée.",
+    "data.search.aggs.buckets.rareTerms.fields.help": "Champ à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.rareTerms.id.help": "ID pour cette agrégation",
+    "data.search.aggs.buckets.rareTerms.maxDocCount.help": "Nombre maximum de fois où un terme peut être qualifié en tant que rare",
+    "data.search.aggs.buckets.rareTerms.schema.help": "Schéma à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.rareTermsTitle": "Termes rares",
+    "data.search.aggs.buckets.sampler.enabled.help": "Spécifie si cette agrégation doit être activée.",
+    "data.search.aggs.buckets.sampler.id.help": "ID pour cette agrégation",
+    "data.search.aggs.buckets.sampler.schema.help": "Schéma à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.sampler.shardSize.help": "Le paramètre shard_size limite le nombre de documents les mieux classés recueillis dans l’échantillon traité sur chaque partition.",
+    "data.search.aggs.buckets.samplerTitle": "Échantillonneur",
     "data.search.aggs.buckets.shardDelay.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
     "data.search.aggs.buckets.shardDelay.delay.help": "Délai entre les partitions à traiter. Exemple : \"5s\".",
     "data.search.aggs.buckets.shardDelay.enabled.help": "Spécifie si cette agrégation doit être activée.",
@@ -1687,6 +2138,21 @@
     "data.search.aggs.buckets.significantTerms.size.help": "Nombre maximal de compartiments à extraire",
     "data.search.aggs.buckets.significantTermsLabel": "Top {size} des termes les plus inhabituels pour {fieldName}",
     "data.search.aggs.buckets.significantTermsTitle": "Termes importants",
+    "data.search.aggs.buckets.significantText.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
+    "data.search.aggs.buckets.significantText.enabled.help": "Spécifie si cette agrégation doit être activée.",
+    "data.search.aggs.buckets.significantText.exclude.help": "Valeurs de compartiment spécifiques à exclure des résultats",
+    "data.search.aggs.buckets.significantText.excludeLabel": "Exclure",
+    "data.search.aggs.buckets.significantText.field.help": "Champ à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.significantText.filterDuplicateText.help": "Filtrage du texte quasi-doublon",
+    "data.search.aggs.buckets.significantText.id.help": "ID pour cette agrégation",
+    "data.search.aggs.buckets.significantText.include.help": "Valeurs de compartiment spécifiques à inclure dans les résultats",
+    "data.search.aggs.buckets.significantText.includeLabel": "Inclure",
+    "data.search.aggs.buckets.significantText.json.help": "Json avancé à inclure lorsque l'agrégation est envoyée vers Elasticsearch",
+    "data.search.aggs.buckets.significantText.minDocCount.help": "Renvoyer des termes dont la correspondance est supérieure à un nombre configuré",
+    "data.search.aggs.buckets.significantText.schema.help": "Schéma à utiliser pour cette agrégation",
+    "data.search.aggs.buckets.significantText.size.help": "Nombre maximal de compartiments à extraire",
+    "data.search.aggs.buckets.significantTextLabel": "Top {size} des termes les plus inhabituels pour \"{fieldName}\"",
+    "data.search.aggs.buckets.significantTextTitle": "Texte important",
     "data.search.aggs.buckets.terms.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
     "data.search.aggs.buckets.terms.enabled.help": "Spécifie si cette agrégation doit être activée.",
     "data.search.aggs.buckets.terms.exclude.help": "Valeurs de compartiment spécifiques à exclure des résultats",
@@ -1715,15 +2181,20 @@
     "data.search.aggs.error.aggNotFound": "Aucun type d'agrégation enregistré pour \"{type}\".",
     "data.search.aggs.function.buckets.dateHistogram.help": "Génère une configuration d'agrégation en série pour une agrégation Histogramme.",
     "data.search.aggs.function.buckets.dateRange.help": "Génère une configuration d'agrégation en série pour une agrégation Plage de dates.",
+    "data.search.aggs.function.buckets.diversifiedSampler.help": "Génère une configuration d'agrégation en série pour une agrégation Échantillonneur diversifié.",
     "data.search.aggs.function.buckets.filter.help": "Génère une configuration d'agrégation en série pour une agrégation Filtre.",
     "data.search.aggs.function.buckets.filters.help": "Génère une configuration d'agrégation en série pour une agrégation Filtre.",
     "data.search.aggs.function.buckets.geoHash.help": "Génère une configuration d'agrégation en série pour une agrégation Geohash.",
     "data.search.aggs.function.buckets.geoTile.help": "Génère une configuration d'agrégation en série pour une agrégation Geotile.",
     "data.search.aggs.function.buckets.histogram.help": "Génère une configuration d'agrégation en série pour une agrégation Histogramme.",
     "data.search.aggs.function.buckets.ipRange.help": "Génère une configuration d'agrégation en série pour une agrégation Plage d'IP.",
+    "data.search.aggs.function.buckets.multiTerms.help": "Génère une configuration d'agrégation en série pour une agrégation Termes multiples.",
     "data.search.aggs.function.buckets.range.help": "Génère une configuration d'agrégation en série pour une agrégation Plage.",
+    "data.search.aggs.function.buckets.rareTerms.help": "Génère une configuration d'agrégation en série pour une agrégation Termes rares.",
+    "data.search.aggs.function.buckets.sampler.help": "Génère une configuration d'agrégation en série pour une agrégation Échantillonneur.",
     "data.search.aggs.function.buckets.shardDelay.help": "Génère une configuration d'agrégation en série pour une agrégation Délai de partition.",
     "data.search.aggs.function.buckets.significantTerms.help": "Génère une configuration d'agrégation en série pour une agrégation Termes importants.",
+    "data.search.aggs.function.buckets.significantText.help": "Génère une configuration d'agrégation en série pour une agrégation Texte important.",
     "data.search.aggs.function.buckets.terms.help": "Génère une configuration d'agrégation en série pour une agrégation Termes.",
     "data.search.aggs.function.metrics.avg.help": "Génère une configuration d'agrégation en série pour une agrégation Moyenne.",
     "data.search.aggs.function.metrics.bucket_avg.help": "Génère une configuration d'agrégation en série pour une agrégation Moyenne compartiment.",
@@ -1748,6 +2219,7 @@
     "data.search.aggs.function.metrics.std_deviation.help": "Génère une configuration d'agrégation en série pour une agrégation Écart-type.",
     "data.search.aggs.function.metrics.sum.help": "Génère une configuration d'agrégation en série pour une agrégation Somme.",
     "data.search.aggs.function.metrics.top_hit.help": "Génère une configuration d'agrégation en série pour une agrégation Meilleur résultat.",
+    "data.search.aggs.function.metrics.topMetrics.help": "Génère une configuration d’agrégation en série pour Principaux indicateurs.",
     "data.search.aggs.histogram.missingMaxMinValuesWarning": "Impossible d’extraire les valeurs max. et min. pour scaler automatiquement les compartiments de l'histogramme. Cela peut entraîner des performances de visualisation médiocres.",
     "data.search.aggs.metrics.averageBucketTitle": "Moyenne compartiment",
     "data.search.aggs.metrics.averageLabel": "Moyenne {field}",
@@ -1818,6 +2290,7 @@
     "data.search.aggs.metrics.derivative.schema.help": "Schéma à utiliser pour cette agrégation",
     "data.search.aggs.metrics.derivativeLabel": "dérivée",
     "data.search.aggs.metrics.derivativeTitle": "Dérivée",
+    "data.search.aggs.metrics.emptyAsNull.help": "Si cette valeur est définie comme vraie, une valeur manquante est traitée en tant que null dans le tableau de données obtenu. Si elle est définie comme fausse, un \"zéro\" est indiqué.",
     "data.search.aggs.metrics.filtered_metric.customBucket.help": "Configuration d'agrégation à utiliser pour la conception d'agrégations de pipelines enfants. Doit être une agrégation de filtres.",
     "data.search.aggs.metrics.filtered_metric.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
     "data.search.aggs.metrics.filtered_metric.customMetric.help": "Configuration d'agrégation à utiliser pour la conception d'agrégations de pipelines enfants",
@@ -1966,25 +2439,48 @@
     "data.search.aggs.metrics.topHit.minLabel": "Min.",
     "data.search.aggs.metrics.topHit.sumLabel": "Somme",
     "data.search.aggs.metrics.topHitTitle": "Meilleur résultat",
+    "data.search.aggs.metrics.topMetrics.ascendingLabel": "Croissant",
+    "data.search.aggs.metrics.topMetrics.ascNoSizeLabel": "Première valeur \"{fieldName}\" par \"{sortField}\"",
+    "data.search.aggs.metrics.topMetrics.ascWithSizeLabel": "{size} premières valeurs \"{fieldName}\" par \"{sortField}\"",
+    "data.search.aggs.metrics.topMetrics.customLabel.help": "Représente une étiquette personnalisée pour cette agrégation",
+    "data.search.aggs.metrics.topMetrics.descendingLabel": "Décroissant",
+    "data.search.aggs.metrics.topMetrics.descNoSizeLabel": "Dernière valeur \"{fieldName}\" par \"{sortField}\"",
+    "data.search.aggs.metrics.topMetrics.descWithSizeLabel": "{size} dernières valeurs \"{fieldName}\" par \"{sortField}\"",
+    "data.search.aggs.metrics.topMetrics.enabled.help": "Spécifie si cette agrégation doit être activée.",
+    "data.search.aggs.metrics.topMetrics.field.help": "Champ à utiliser pour cette agrégation",
+    "data.search.aggs.metrics.topMetrics.id.help": "ID pour cette agrégation",
+    "data.search.aggs.metrics.topMetrics.json.help": "JSON avancé à inclure lorsque l'agrégation est envoyée à Elasticsearch",
+    "data.search.aggs.metrics.topMetrics.schema.help": "Schéma à utiliser pour cette agrégation",
+    "data.search.aggs.metrics.topMetrics.size.help": "Nombre de valeurs principales à récupérer",
+    "data.search.aggs.metrics.topMetrics.sortField.help": "Champ selon lequel ordonner les résultats",
+    "data.search.aggs.metrics.topMetrics.sortOrder.help": "Ordre dans lequel renvoyer les résultats : croissant ou décroissant",
+    "data.search.aggs.metrics.topMetricsTitle": "Principaux indicateurs",
     "data.search.aggs.metrics.uniqueCountLabel": "Décompte unique de {field}",
     "data.search.aggs.metrics.uniqueCountTitle": "Décompte unique",
     "data.search.aggs.otherBucket.labelForMissingValuesLabel": "Étiquette pour des valeurs manquantes",
     "data.search.aggs.otherBucket.labelForOtherBucketLabel": "Étiquette pour autre compartiment",
-    "data.search.aggs.paramTypes.field.invalidSavedFieldParameterErrorMessage": "Le champ enregistré \"{fieldParameter}\" du modèle d'indexation \"{indexPatternTitle}\" n'est pas valide pour une utilisation avec l'agrégation \"{aggType}\". Veuillez sélectionner un nouveau champ.",
-    "data.search.aggs.paramTypes.field.notFoundSavedFieldParameterErrorMessage": "Le champ \"{fieldParameter}\" associé à cet objet n'existe plus dans le modèle d'indexation. Veuillez utiliser un autre champ.",
+    "data.search.aggs.paramTypes.field.invalidSavedFieldParameterErrorMessage": "Le champ enregistré \"{fieldParameter}\" de la vue de données \"{indexPatternTitle}\" n'est pas valide pour une utilisation avec l'agrégation \"{aggType}\". Veuillez sélectionner un nouveau champ.",
+    "data.search.aggs.paramTypes.field.notFoundSavedFieldParameterErrorMessage": "Le champ \"{fieldParameter}\" associé à cet objet n'existe plus dans la vue de données. Veuillez utiliser un autre champ.",
     "data.search.aggs.paramTypes.field.requiredFieldParameterErrorMessage": "{fieldParameter} est un paramètre requis.",
     "data.search.aggs.percentageOfLabel": "Pourcentage de {label}",
+    "data.search.aggs.rareTerms.aggTypesLabel": "Termes rares de {fieldName}",
     "data.search.aggs.string.customLabel": "Étiquette personnalisée",
     "data.search.dataRequest.title": "Données",
+    "data.search.eql.field.help": "Liste de champs à récupérer",
+    "data.search.eql.help": "Exécuter une requête Elasticsearch",
+    "data.search.eql.index.help": "Index Elasticsearch à interroger",
+    "data.search.eql.q.help": "Requête DSL",
+    "data.search.eql.size.help": "Paramètre de taille de l’API de recherche d’Elasticsearch",
     "data.search.es_search.dataRequest.description": "Cette requête interroge Elasticsearch pour récupérer les données pour la visualisation.",
+    "data.search.es_search.dataViewLabel": "Vue de données",
     "data.search.es_search.hitsDescription": "Le nombre de documents renvoyés par la requête.",
     "data.search.es_search.hitsLabel": "Résultats",
     "data.search.es_search.hitsTotalDescription": "Le nombre de documents correspondant à la requête.",
     "data.search.es_search.hitsTotalLabel": "Résultats (total)",
-    "data.search.es_search.indexPatternDescription": "Le modèle d'indexation qui se connecte aux index Elasticsearch.",
+    "data.search.es_search.indexPatternDescription": "La vue de données qui se connecte aux index Elasticsearch.",
     "data.search.es_search.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la requête ni l'analyser dans le navigateur.",
     "data.search.es_search.queryTimeLabel": "Durée de la requête",
-    "data.search.es_search.queryTimeValue": "{queryTime}ms",
+    "data.search.es_search.queryTimeValue": "{queryTime} ms",
     "data.search.esaggs.error.kibanaRequest": "Une requête Kibana est nécessaire pour exécuter cette recherche sur le serveur. Veuillez fournir un objet de requête pour les paramètres d'exécution de l'expression.",
     "data.search.esdsl.help": "Exécuter une requête Elasticsearch",
     "data.search.esdsl.index.help": "Index Elasticsearch à interroger",
@@ -1997,7 +2493,7 @@
     "data.search.functions.dateRange.help": "Créer une plage de dates",
     "data.search.functions.dateRange.to.help": "Spécifier la date de fin",
     "data.search.functions.esaggs.aggConfigs.help": "Liste des agrégations configurées avec des fonctions agg_type",
-    "data.search.functions.esaggs.index.help": "Modèle d'indexation extrait avec indexPatternLoad",
+    "data.search.functions.esaggs.index.help": "Vue de données extraite avec indexPatternLoad",
     "data.search.functions.esaggs.metricsAtAllLevels.help": "Spécifie l’inclusion ou non des colonnes avec indicateurs pour chaque niveau de compartiment.",
     "data.search.functions.esaggs.partialRows.help": "Détermine s'il faut renvoyer ou non les lignes ne contenant que des données partielles.",
     "data.search.functions.esaggs.timeFields.help": "Spécifiez des champs temporels afin d’obtenir les plages temporelles résolues pour la requête.",
@@ -2065,11 +2561,22 @@
     "data.search.functions.rangeFilter.help": "Créer un filtre de plage Kibana",
     "data.search.functions.rangeFilter.negate.help": "Si le filtre doit être inversé",
     "data.search.functions.rangeFilter.range.help": "Spécifiez la plage à l’aide de la fonction ''range''.",
+    "data.search.functions.removeFilter.from.help": "Supprime uniquement les filtres appartenant à l’ID fourni",
+    "data.search.functions.removeFilter.group.help": "Supprime uniquement les filtres appartenant au groupe fourni",
+    "data.search.functions.removeFilter.help": "Supprime les filtres du contexte",
+    "data.search.functions.removeFilter.ungrouped.help": "Les filtres sans groupe doivent-ils être retirés ?",
+    "data.search.functions.selectFilter.from.help": "Sélectionnez uniquement les filtres appartenant à l’ID fourni",
+    "data.search.functions.selectFilter.group.help": "Sélectionnez uniquement les filtres appartenant au groupe fourni",
+    "data.search.functions.selectFilter.help": "Sélectionne les filtres du contexte",
+    "data.search.functions.selectFilter.ungrouped.help": "Les filtres sans groupe doivent-ils être inclus ?",
     "data.search.functions.timerange.from.help": "Spécifier la date de début",
     "data.search.functions.timerange.help": "Créer une plage temporelle Kibana",
     "data.search.functions.timerange.mode.help": "Spécifier le mode (absolu ou relatif)",
     "data.search.functions.timerange.to.help": "Spécifier la date de fin",
     "data.search.httpErrorTitle": "Impossible d’extraire vos données",
+    "data.search.searchSource.dataViewDescription": "La vue de données qui a été interrogée.",
+    "data.search.searchSource.dataViewIdLabel": "ID de vue de données",
+    "data.search.searchSource.dataViewLabel": "Vue de données",
     "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "Les données peuvent être incomplètes parce que votre requête est arrivée à échéance.",
     "data.search.searchSource.fetch.shardsFailedModal.close": "Fermer",
     "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "Copier la réponse dans le presse-papiers",
@@ -2093,10 +2600,10 @@
     "data.search.searchSource.indexPatternIdDescription": "L'ID dans l'index {kibanaIndexPattern}.",
     "data.search.searchSource.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la requête ni l'analyser dans le navigateur.",
     "data.search.searchSource.queryTimeLabel": "Durée de la requête",
-    "data.search.searchSource.queryTimeValue": "{queryTime}ms",
+    "data.search.searchSource.queryTimeValue": "{queryTime} ms",
     "data.search.searchSource.requestTimeDescription": "Durée de la requête depuis le navigateur jusqu’à Elasticsearch et retour. N’inclut pas le temps d’attente de la requête dans la file.",
     "data.search.searchSource.requestTimeLabel": "Durée de la requête",
-    "data.search.searchSource.requestTimeValue": "{requestTime}ms",
+    "data.search.searchSource.requestTimeValue": "{requestTime} ms",
     "data.search.timeBuckets.dayLabel": "{amount, plural, one {un jour} other {# jours}}",
     "data.search.timeBuckets.hourLabel": "{amount, plural, one {une heure} other {# heures}}",
     "data.search.timeBuckets.infinityLabel": "Plus d'une année",
@@ -2114,150 +2621,58 @@
     "data.searchSessions.sessionService.sessionObjectFetchError": "Échec de récupération des informations de la session de recherche",
     "data.triggers.applyFilterDescription": "Lorsque le filtre Kibana est appliqué. Peut être un filtre simple ou un filtre de plage.",
     "data.triggers.applyFilterTitle": "Appliquer le filtre",
-    "unifiedSearch.search.unableToGetSavedQueryToastTitle": "Impossible de charger la requête enregistrée {savedQueryId}",
-    "unifiedSearch.noDataPopover.content": "Cette plage temporelle ne contient pas de données. Étendez ou ajustez la plage temporelle pour obtenir plus de champs et pouvoir créer des graphiques.",
-    "unifiedSearch.noDataPopover.dismissAction": "Ne plus afficher",
-    "unifiedSearch.noDataPopover.subtitle": "Conseil",
-    "unifiedSearch.noDataPopover.title": "Ensemble de données vide",
-    "unifiedSearch.query.queryBar.clearInputLabel": "Effacer l'entrée",
-    "unifiedSearch.query.queryBar.comboboxAriaLabel": "Rechercher et filtrer la page {pageType}",
-    "unifiedSearch.query.queryBar.kqlFullLanguageName": "Langage de requête Kibana",
-    "unifiedSearch.query.queryBar.kqlLanguageName": "KQL",
-    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "documents",
-    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "Ne plus afficher",
-    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoText": "Il semblerait que votre requête porte sur un champ imbriqué. Selon le résultat visé, il existe plusieurs façons de construire une syntaxe KQL pour des requêtes imbriquées. Apprenez-en plus avec notre {link}.",
-    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "Syntaxe de requête imbriquée KQL",
-    "unifiedSearch.query.queryBar.kqlOffLabel": "Désactivé",
-    "unifiedSearch.query.queryBar.kqlOnLabel": "Activé",
-    "unifiedSearch.query.queryBar.languageSwitcher.toText": "Passer au langage de requête Kibana pour la recherche",
-    "unifiedSearch.query.queryBar.luceneLanguageName": "Lucene",
-    "unifiedSearch.query.queryBar.searchInputAriaLabel": "Commencer à taper pour rechercher et filtrer la page {pageType}",
-    "unifiedSearch.query.queryBar.searchInputPlaceholder": "Recherche",
-    "unifiedSearch.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) offre une syntaxe de requête simplifiée et la prise en charge des champs scriptés. KQL offre également une fonctionnalité de saisie semi-automatique. Si vous désactivez KQL, {nonKqlModeHelpText}.",
-    "unifiedSearch.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "Kibana utilise Lucene.",
-    "unifiedSearch.search.searchBar.savedQueryDescriptionLabelText": "Description",
-    "unifiedSearch.search.searchBar.savedQueryDescriptionText": "Enregistrez le texte et les filtres de la requête que vous souhaitez réutiliser.",
-    "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "Ce nom est en conflit avec une requête enregistrée existante.",
-    "unifiedSearch.search.searchBar.savedQueryFormCancelButtonText": "Annuler",
-    "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "Enregistrer",
-    "unifiedSearch.search.searchBar.savedQueryFormTitle": "Enregistrer la requête",
-    "unifiedSearch.search.searchBar.savedQueryIncludeFiltersLabelText": "Inclure les filtres",
-    "unifiedSearch.search.searchBar.savedQueryIncludeTimeFilterLabelText": "Inclure le filtre temporel",
-    "unifiedSearch.search.searchBar.savedQueryNameHelpText": "Un nom est requis. Le nom ne peut pas contenir d'espace vide au début ou à la fin. Le nom doit être unique.",
-    "unifiedSearch.search.searchBar.savedQueryNameLabelText": "Nom",
-    "unifiedSearch.search.searchBar.savedQueryNoSavedQueriesText": "Aucune requête enregistrée.",
-    "unifiedSearch.search.searchBar.savedQueryPopoverButtonText": "Voir les requêtes enregistrées",
-    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "Effacer la requête enregistrée en cours",
-    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonText": "Effacer",
-    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "Annuler",
-    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "Supprimer",
-    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "Supprimer \"{savedQueryName}\" ?",
-    "unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "Supprimer la requête enregistrée {savedQueryName}",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "Enregistrer en tant que nouvelle requête enregistrée",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "Enregistrer en tant que nouvelle",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "Enregistrer une nouvelle requête enregistrée",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonText": "Enregistrer la requête en cours",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "Enregistrer les modifications apportées à {title}",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonText": "Enregistrer les modifications",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName}",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "Description de {savedQueryName}",
-    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName} sélectionné. Appuyez pour effacer les modifications.",
-    "unifiedSearch.search.searchBar.savedQueryPopoverTitleText": "Requêtes enregistrées",
-    "unifiedSearch.query.queryBar.syntaxOptionsTitle": "Options de syntaxe",
-    "unifiedSearch.filter.applyFilterActionTitle": "Appliquer le filtre à la vue en cours",
-    "unifiedSearch.filter.applyFilters.popupHeader": "Sélectionner les filtres à appliquer",
-    "unifiedSearch.filter.applyFiltersPopup.cancelButtonLabel": "Annuler",
-    "unifiedSearch.filter.applyFiltersPopup.saveButtonLabel": "Appliquer",
-    "unifiedSearch.filter.filterBar.addFilterButtonLabel": "Ajouter un filtre",
-    "unifiedSearch.filter.filterBar.deleteFilterButtonLabel": "Supprimer",
-    "unifiedSearch.filter.filterBar.disabledFilterPrefix": "Désactivé",
-    "unifiedSearch.filter.filterBar.disableFilterButtonLabel": "Désactiver temporairement",
-    "unifiedSearch.filter.filterBar.editFilterButtonLabel": "Modifier le filtre",
-    "unifiedSearch.filter.filterBar.enableFilterButtonLabel": "Réactiver",
-    "unifiedSearch.filter.filterBar.excludeFilterButtonLabel": "Exclure les résultats",
-    "unifiedSearch.filter.filterBar.filterItemBadgeAriaLabel": "Actions de filtrage",
-    "unifiedSearch.filter.filterBar.filterItemBadgeIconAriaLabel": "Supprimer {filter}",
-    "unifiedSearch.filter.filterBar.includeFilterButtonLabel": "Inclure les résultats",
-    "unifiedSearch.filter.filterBar.indexPatternSelectPlaceholder": "Sélectionner un modèle d'indexation",
-    "unifiedSearch.filter.filterBar.labelErrorInfo": "Modèle d'indexation {indexPattern} introuvable",
-    "unifiedSearch.filter.filterBar.labelErrorText": "Erreur",
-    "unifiedSearch.filter.filterBar.labelWarningInfo": "Le champ {fieldName} n'existe pas dans la vue en cours.",
-    "unifiedSearch.filter.filterBar.labelWarningText": "Avertissement",
-    "unifiedSearch.filter.filterBar.moreFilterActionsMessage": "Filtre : {innerText}. Sélectionner pour plus d’actions de filtrage.",
-    "unifiedSearch.filter.filterBar.negatedFilterPrefix": "NON ",
-    "unifiedSearch.filter.filterBar.pinFilterButtonLabel": "Épingler dans toutes les applications",
-    "unifiedSearch.filter.filterBar.pinnedFilterPrefix": "Épinglé",
-    "unifiedSearch.filter.filterBar.unpinFilterButtonLabel": "Désépingler",
-    "unifiedSearch.filter.filterEditor.cancelButtonLabel": "Annuler",
-    "unifiedSearch.filter.filterEditor.createCustomLabelInputLabel": "Étiquette personnalisée",
-    "unifiedSearch.filter.filterEditor.createCustomLabelSwitchLabel": "Créer une étiquette personnalisée ?",
-    "unifiedSearch.filter.filterEditor.doesNotExistOperatorOptionLabel": "n'existe pas",
-    "unifiedSearch.filter.filterEditor.editFilterPopupTitle": "Modifier le filtre",
-    "unifiedSearch.filter.filterEditor.editFilterValuesButtonLabel": "Modifier les valeurs du filtre",
-    "unifiedSearch.filter.filterEditor.editQueryDslButtonLabel": "Modifier en tant que Query DSL",
-    "unifiedSearch.filter.filterEditor.existsOperatorOptionLabel": "existe",
-    "unifiedSearch.filter.filterEditor.falseOptionLabel": "false",
-    "unifiedSearch.filter.filterEditor.fieldSelectLabel": "Champ",
-    "unifiedSearch.filter.filterEditor.fieldSelectPlaceholder": "Sélectionner d'abord un champ",
-    "unifiedSearch.filter.filterEditor.indexPatternSelectLabel": "Modèle d'indexation",
-    "unifiedSearch.filter.filterEditor.isBetweenOperatorOptionLabel": "est entre",
-    "unifiedSearch.filter.filterEditor.isNotBetweenOperatorOptionLabel": "n'est pas entre",
-    "unifiedSearch.filter.filterEditor.isNotOneOfOperatorOptionLabel": "n'est pas l'une des options suivantes",
-    "unifiedSearch.filter.filterEditor.isNotOperatorOptionLabel": "n'est pas",
-    "unifiedSearch.filter.filterEditor.isOneOfOperatorOptionLabel": "est l'une des options suivantes",
-    "unifiedSearch.filter.filterEditor.isOperatorOptionLabel": "est",
-    "unifiedSearch.filter.filterEditor.operatorSelectLabel": "Opérateur",
-    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderSelect": "Sélectionner",
-    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderWaiting": "En attente",
-    "unifiedSearch.filter.filterEditor.queryDslLabel": "Query DSL d'Elasticsearch",
-    "unifiedSearch.filter.filterEditor.rangeEndInputPlaceholder": "Fin de la plage",
-    "unifiedSearch.filter.filterEditor.rangeInputLabel": "Plage",
-    "unifiedSearch.filter.filterEditor.rangeStartInputPlaceholder": "Début de la plage",
-    "unifiedSearch.filter.filterEditor.saveButtonLabel": "Enregistrer",
-    "unifiedSearch.filter.filterEditor.trueOptionLabel": "vrai",
-    "unifiedSearch.filter.filterEditor.valueInputLabel": "Valeur",
-    "unifiedSearch.filter.filterEditor.valueInputPlaceholder": "Saisir une valeur",
-    "unifiedSearch.filter.filterEditor.valueSelectPlaceholder": "Sélectionner une valeur",
-    "unifiedSearch.filter.filterEditor.valuesSelectLabel": "Valeurs",
-    "unifiedSearch.filter.filterEditor.valuesSelectPlaceholder": "Sélectionner des valeurs",
-    "unifiedSearch.filter.options.changeAllFiltersButtonLabel": "Changer tous les filtres",
-    "unifiedSearch.filter.options.deleteAllFiltersButtonLabel": "Tout supprimer",
-    "unifiedSearch.filter.options.disableAllFiltersButtonLabel": "Tout désactiver",
-    "unifiedSearch.filter.options.enableAllFiltersButtonLabel": "Tout activer",
-    "unifiedSearch.filter.options.invertDisabledFiltersButtonLabel": "Inverser l’activation/désactivation",
-    "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "Inverser l'inclusion",
-    "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "Tout épingler",
-    "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "Tout désépingler",
-    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "Changer tous les filtres",
+    "dataViews.deprecations.scriptedFields.manualStepOneMessage": "Accédez à Gestion de la Suite  > Kibana > Vues de données.",
+    "dataViews.deprecations.scriptedFields.manualStepTwoMessage": "Mettez à jour les vues de données {numberOfIndexPatternsWithScriptedFields} qui ont des champs scriptés pour qu’elles utilisent des champs d’exécution. Dans la plupart des cas, pour migrer des scripts existants, vous devrez remplacer \"return <value>;\" par \"emit(<value>);\". Vues de données avec au moins un champ scripté : {allTitles}",
+    "dataViews.deprecations.scriptedFieldsMessage": "Vous avez {numberOfIndexPatternsWithScriptedFields} vues de données ({titlesPreview}...) qui utilisent des champs scriptés. Les champs scriptés sont déclassés et seront supprimés à l’avenir. Utilisez plutôt des champs d’exécution.",
+    "dataViews.deprecations.scriptedFieldsTitle": "Vues de données utilisant des champs scriptés trouvées",
+    "dataViews.ensureDefaultIndexPattern.bannerLabel": "Pour visualiser et explorer des données dans Kibana, vous devez créer un modèle d'indexation afin d’extraire les données d'Elasticsearch.",
+    "dataViews.fetchFieldErrorTitle": "Erreur lors de l’extraction des champs pour la vue de données {title} (ID : {id})",
+    "dataViews.functions.dataViewLoad.help": "Charge une vue de données",
+    "dataViews.functions.dataViewLoad.id.help": "ID de vue de données à charger",
+    "dataViews.indexPatternLoad.error.kibanaRequest": "Une requête Kibana est nécessaire pour exécuter cette recherche sur le serveur. Veuillez fournir un objet de requête pour les paramètres d'exécution de l'expression.",
+    "dataViews.unableWriteLabel": "Impossible d’écrire la vue de données ! Actualisez la page pour obtenir la dernière version de cette vue de données.",
+    "devTools.badge.betaLabel": "Bêta",
+    "devTools.badge.betaTooltipText": "Cette fonctionnalité pourra considérablement changer dans les futures versions",
     "devTools.badge.readOnly.text": "Lecture seule",
     "devTools.badge.readOnly.tooltip": "Enregistrement impossible",
+    "devTools.breadcrumb.homeLabel": "Outils de développement",
     "devTools.devToolsTitle": "Outils de développement",
     "discover.advancedSettings.context.defaultSizeText": "Le nombre d'entrées connexes à afficher dans la vue contextuelle",
     "discover.advancedSettings.context.defaultSizeTitle": "Taille de contexte",
     "discover.advancedSettings.context.sizeStepText": "L’incrément duquel augmenter ou diminuer la taille de contexte",
     "discover.advancedSettings.context.sizeStepTitle": "Incrément de taille de contexte",
-    "discover.advancedSettings.context.tieBreakerFieldsText": "Une liste de champs séparés par des virgules à utiliser pour départager les documents présentant la même valeur d'horodatage. Le premier champ de cette liste qui est à la fois présent et triable dans le modèle d'indexation en cours est utilisé.",
+    "discover.advancedSettings.context.tieBreakerFieldsText": "Une liste de champs séparés par des virgules à utiliser pour départager les documents présentant la même valeur d'horodatage. Le premier champ de cette liste qui est à la fois présent et triable dans la vue de données en cours est utilisé.",
     "discover.advancedSettings.context.tieBreakerFieldsTitle": "Champs de départage",
-    "discover.advancedSettings.defaultColumnsText": "Les colonnes affichées par défaut dans l'onglet Discover",
+    "discover.advancedSettings.defaultColumnsText": "Les colonnes affichées par défaut dans l'application Discover. Si elles sont vides, un résumé du document s’affiche.",
     "discover.advancedSettings.defaultColumnsTitle": "Colonnes par défaut",
-    "discover.advancedSettings.discover.modifyColumnsOnSwitchText": "Supprimez les colonnes qui ne sont pas disponibles dans le nouveau modèle d'indexation.",
-    "discover.advancedSettings.discover.modifyColumnsOnSwitchTitle": "Modifier les colonnes en cas de changement des modèles d'indexation",
+    "discover.advancedSettings.disableDocumentExplorer": "Explorateur de documents ou vue classique",
+    "discover.advancedSettings.disableDocumentExplorerDescription": "Désactivez cette option pour utiliser le nouveau {documentExplorerDocs} au lieu de la vue classique. L’explorateur de documents offre un meilleur tri des données, des colonnes redimensionnables et une vue en plein écran.",
+    "discover.advancedSettings.discover.fieldStatisticsLinkText": "Vue des statistiques de champ",
+    "discover.advancedSettings.discover.modifyColumnsOnSwitchText": "Supprimez les colonnes qui ne sont pas disponibles dans la nouvelle vue de données.",
+    "discover.advancedSettings.discover.modifyColumnsOnSwitchTitle": "Modifier les colonnes en cas de changement des vues de données",
     "discover.advancedSettings.discover.multiFieldsLinkText": "champs multiples",
     "discover.advancedSettings.discover.readFieldsFromSource": "Lire les champs depuis _source",
     "discover.advancedSettings.discover.readFieldsFromSourceDescription": "Lorsque cette option est activée, les documents sont chargés directement depuis ''_source''. Elle sera bientôt déclassée. Lorsqu'elle est désactivée, les champs sont extraits via la nouvelle API de champ du service de recherche de haut niveau.",
+    "discover.advancedSettings.discover.showFieldStatistics": "Afficher les statistiques de champ",
+    "discover.advancedSettings.discover.showFieldStatisticsDescription": "Activez le {fieldStatisticsDocs} pour afficher des détails tels que les valeurs minimale et maximale d’un champ numérique ou une carte d’un champ géographique. Cette fonctionnalité est en version bêta et susceptible d'être modifiée.",
     "discover.advancedSettings.discover.showMultifields": "Afficher les champs multiples",
     "discover.advancedSettings.discover.showMultifieldsDescription": "Détermine si les {multiFields} doivent s'afficher dans la fenêtre de document étendue. Dans la plupart des cas, les champs multiples sont les mêmes que les champs d'origine. Cette option est uniquement disponible lorsque le paramètre ''searchFieldsFromSource'' est désactivé.",
     "discover.advancedSettings.docTableHideTimeColumnText": "Permet de masquer la colonne ''Time'' dans Discover et dans toutes les recherches enregistrées des tableaux de bord.",
     "discover.advancedSettings.docTableHideTimeColumnTitle": "Masquer la colonne ''Time''",
+    "discover.advancedSettings.documentExplorerLinkText": "Explorateur de documents",
     "discover.advancedSettings.fieldsPopularLimitText": "Les N champs les plus populaires à afficher",
     "discover.advancedSettings.fieldsPopularLimitTitle": "Limite de champs populaires",
-    "discover.advancedSettings.maxDocFieldsDisplayedText": "Le nombre maximal de champs renvoyés dans la colonne de document",
+    "discover.advancedSettings.maxDocFieldsDisplayedText": "Le nombre maximal de champs renvoyés dans le résumé du document",
     "discover.advancedSettings.maxDocFieldsDisplayedTitle": "Nombre maximal de champs de document affichés",
+    "discover.advancedSettings.params.maxCellHeightText": "La hauteur maximale qu'une cellule de tableau peut atteindre. Définissez ce paramètre sur 0 pour désactiver la troncation.",
+    "discover.advancedSettings.params.maxCellHeightTitle": "Hauteur de cellule maximale dans le tableau classique",
+    "discover.advancedSettings.params.rowHeightText": "Nombre de sous-lignes à autoriser dans une ligne. La valeur -1 ajuste automatiquement la hauteur de ligne selon le contenu. La valeur 0 affiche le contenu en une seule ligne.",
+    "discover.advancedSettings.params.rowHeightTitle": "Hauteur de ligne dans l’explorateur de documents",
     "discover.advancedSettings.sampleSizeText": "Le nombre de lignes à afficher dans le tableau",
     "discover.advancedSettings.sampleSizeTitle": "Nombre de lignes",
     "discover.advancedSettings.searchOnPageLoadText": "Détermine si une recherche est exécutée lors du premier chargement de Discover. Ce paramètre n'a pas d'effet lors du chargement d’une recherche enregistrée.",
     "discover.advancedSettings.searchOnPageLoadTitle": "Recherche au chargement de la page",
-    "discover.advancedSettings.sortDefaultOrderText": "Détermine le sens de tri par défaut pour les modèles d'indexation temporelle dans l’application Discover.",
+    "discover.advancedSettings.sortDefaultOrderText": "Détermine le sens de tri par défaut pour les vues de données temporelles dans l’application Discover.",
     "discover.advancedSettings.sortDefaultOrderTitle": "Sens de tri par défaut",
     "discover.advancedSettings.sortOrderAsc": "Croissant",
     "discover.advancedSettings.sortOrderDesc": "Décroissant",
@@ -2267,6 +2682,8 @@
     "discover.bucketIntervalTooltip": "Cet intervalle crée {bucketsDescription} pour permettre l’affichage dans la plage temporelle sélectionnée, il a donc été redimensionné vers {bucketIntervalDescription}.",
     "discover.bucketIntervalTooltip.tooLargeBucketsText": "des compartiments trop volumineux",
     "discover.bucketIntervalTooltip.tooManyBucketsText": "un trop grand nombre de compartiments",
+    "discover.chartOptions": "Options de graphique",
+    "discover.chartOptionsButton": "Options de graphique",
     "discover.clearSelection": "Effacer la sélection",
     "discover.context.breadcrumb": "Documents relatifs",
     "discover.context.contextOfTitle": "Les documents relatifs à #{anchorId}",
@@ -2291,14 +2708,21 @@
     "discover.discoverBreadcrumbTitle": "Discover",
     "discover.discoverDefaultSearchSessionName": "Discover",
     "discover.discoverDescription": "Explorez vos données de manière interactive en interrogeant et en filtrant des documents bruts.",
+    "discover.discoverError.missingQueryParamsError": "La chaîne de requête URL est manquante {missingParamsList}.",
+    "discover.discoverError.title": "Chargement de cette page impossible",
     "discover.discoverSubtitle": "Recherchez et obtenez des informations.",
     "discover.discoverTitle": "Discover",
     "discover.doc.couldNotFindDocumentsDescription": "Aucun document ne correspond à cet ID.",
     "discover.doc.failedToExecuteQueryDescription": "Impossible d'exécuter la recherche",
+    "discover.doc.failedToLocateDataView": "Aucune vue de données ne correspond à l'ID {indexPatternId}.",
     "discover.doc.failedToLocateDocumentDescription": "Document introuvable",
     "discover.doc.loadingDescription": "Chargement…",
     "discover.doc.somethingWentWrongDescription": "Index {indexName} manquant.",
     "discover.doc.somethingWentWrongDescriptionAddon": "Veuillez vérifier que cet index existe.",
+    "discover.docExplorerCallout.closeButtonAriaLabel": "Fermer",
+    "discover.docExplorerCallout.headerMessage": "Une meilleure façon d’explorer",
+    "discover.docExplorerCallout.learnMore": "En savoir plus",
+    "discover.docExplorerCallout.tryDocumentExplorer": "Testez l’explorateur de documents",
     "discover.docTable.documentsNavigation": "Navigation dans les documents",
     "discover.docTable.limitedSearchResultLabel": "Limité à {resultCount} résultats. Veuillez affiner votre recherche.",
     "discover.docTable.noResultsTitle": "Aucun résultat trouvé.",
@@ -2314,6 +2738,8 @@
     "discover.docTable.tableHeader.sortByColumnAscendingAriaLabel": "Trier la colonne {columnName} par ordre croissant",
     "discover.docTable.tableHeader.sortByColumnDescendingAriaLabel": "Trier la colonne {columnName} par ordre décroissant",
     "discover.docTable.tableHeader.sortByColumnUnsortedAriaLabel": "Arrêter de trier la colonne {columnName}",
+    "discover.docTable.tableHeader.timeFieldIconTooltip": "Ce champ représente l'heure à laquelle les événements se sont produits.",
+    "discover.docTable.tableHeader.timeFieldIconTooltipAriaLabel": "Champ temporel principal.",
     "discover.docTable.tableRow.detailHeading": "Document développé",
     "discover.docTable.tableRow.filterForValueButtonAriaLabel": "Filtrer sur la valeur",
     "discover.docTable.tableRow.filterForValueButtonTooltip": "Filtrer sur la valeur",
@@ -2324,6 +2750,15 @@
     "discover.docTable.tableRow.viewSurroundingDocumentsLinkText": "Afficher les documents alentour",
     "discover.docTable.totalDocuments": "{totalDocuments} documents",
     "discover.documentsAriaLabel": "Documents",
+    "discover.docView.table.actions.label": "Actions",
+    "discover.docView.table.actions.open": "Actions ouvertes",
+    "discover.docView.table.ignored.multiAboveTooltip": "Une ou plusieurs valeurs dans ce champ sont trop longues et ne peuvent pas être recherchées ni filtrées.",
+    "discover.docView.table.ignored.multiMalformedTooltip": "Ce champ comporte une ou plusieurs valeurs mal formées qui ne peuvent pas être recherchées ni filtrées.",
+    "discover.docView.table.ignored.multiUnknownTooltip": "Une ou plusieurs valeurs dans ce champ ont été ignorées par Elasticsearch et ne peuvent pas être recherchées ni filtrées.",
+    "discover.docView.table.ignored.singleAboveTooltip": "La valeur dans ce champ est trop longue et ne peut pas être recherchée ni filtrée.",
+    "discover.docView.table.ignored.singleMalformedTooltip": "La valeur dans ce champ est mal formée et ne peut pas être recherchée ni filtrée.",
+    "discover.docView.table.ignored.singleUnknownTooltip": "La valeur dans ce champ a été ignorée par Elasticsearch et ne peut pas être recherchée ni filtrée.",
+    "discover.docView.table.searchPlaceHolder": "Rechercher les noms de champs",
     "discover.docViews.json.jsonTitle": "JSON",
     "discover.docViews.table.filterForFieldPresentButtonAriaLabel": "Filtrer sur le champ",
     "discover.docViews.table.filterForFieldPresentButtonTooltip": "Filtrer sur le champ",
@@ -2331,6 +2766,10 @@
     "discover.docViews.table.filterForValueButtonTooltip": "Filtrer sur la valeur",
     "discover.docViews.table.filterOutValueButtonAriaLabel": "Exclure la valeur",
     "discover.docViews.table.filterOutValueButtonTooltip": "Exclure la valeur",
+    "discover.docViews.table.ignored.multiValueLabel": "Contient des valeurs ignorées",
+    "discover.docViews.table.ignored.singleValueLabel": "Valeur ignorée",
+    "discover.docViews.table.pinFieldAriaLabel": "Épingler le champ",
+    "discover.docViews.table.pinFieldLabel": "Épingler le champ",
     "discover.docViews.table.scoreSortWarningTooltip": "Filtrez sur _score pour pouvoir récupérer les valeurs correspondantes.",
     "discover.docViews.table.tableTitle": "Tableau",
     "discover.docViews.table.toggleColumnInTableButtonAriaLabel": "Afficher/Masquer la colonne dans le tableau",
@@ -2338,13 +2777,18 @@
     "discover.docViews.table.toggleFieldDetails": "Afficher/Masquer les détails du champ",
     "discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "Impossible de filtrer sur les champs méta",
     "discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "Impossible de filtrer sur les champs scriptés",
-    "discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "Il est impossible d’effectuer une recherche sur des champs non indexés.",
+    "discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "Les champs non indexés ou les valeurs ignorées ne peuvent pas être recherchés",
+    "discover.docViews.table.unpinFieldAriaLabel": "Désépingler le champ",
+    "discover.docViews.table.unpinFieldLabel": "Désépingler le champ",
+    "discover.editVisualizationButton": "Modifier la visualisation",
     "discover.embeddable.inspectorRequestDataTitle": "Données",
     "discover.embeddable.inspectorRequestDescription": "Cette requête interroge Elasticsearch afin de récupérer les données pour la recherche.",
-    "discover.embeddable.search.displayName": "recherche",
+    "discover.embeddable.search.displayName": "rechercher",
+    "discover.errorLoadingChart": "Erreur lors du chargement du graphique",
     "discover.field.mappingConflict": "Ce champ est défini avec plusieurs types (chaîne, entier, etc.) dans les différents index qui correspondent à ce modèle. Vous pouvez toujours utiliser ce champ conflictuel, mais il sera indisponible pour les fonctions qui nécessitent que Kibana en connaisse le type. Pour corriger ce problème, vous devrez réindexer vos données.",
     "discover.field.mappingConflict.title": "Conflit de mapping",
     "discover.field.title": "{fieldName} ({fieldDisplayName})",
+    "discover.fieldChooser.dataViews.createNewDataView": "Créer une nouvelle vue de données",
     "discover.fieldChooser.detailViews.emptyStringText": "Chaîne vide",
     "discover.fieldChooser.detailViews.existsInRecordsText": "Existe dans {value} / {totalValue} enregistrements",
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "Exclure le {field} : \"{value}\"",
@@ -2353,8 +2797,8 @@
     "discover.fieldChooser.discoverField.actions": "Actions",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "Ajouter {field} au tableau",
     "discover.fieldChooser.discoverField.addFieldTooltip": "Ajouter le champ en tant que colonne",
-    "discover.fieldChooser.discoverField.deleteFieldLabel": "Supprimer le champ du modèle d'indexation",
-    "discover.fieldChooser.discoverField.editFieldLabel": "Modifier le champ du modèle d'indexation",
+    "discover.fieldChooser.discoverField.deleteFieldLabel": "Supprimer le champ de la vue de données",
+    "discover.fieldChooser.discoverField.editFieldLabel": "Modifier le champ de la vue de données",
     "discover.fieldChooser.discoverField.fieldTopValuesLabel": "Top 5 des valeurs",
     "discover.fieldChooser.discoverField.multiField": "champ multiple",
     "discover.fieldChooser.discoverField.multiFields": "Champs multiples",
@@ -2372,6 +2816,7 @@
     "discover.fieldChooser.filter.availableFieldsTitle": "Champs disponibles",
     "discover.fieldChooser.filter.fieldSelectorLabel": "Sélection des options du filtre {id}",
     "discover.fieldChooser.filter.filterByTypeLabel": "Filtrer par type",
+    "discover.fieldChooser.filter.hideEmptyFieldsLabel": "Masquer les champs vides",
     "discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "Index et champs",
     "discover.fieldChooser.filter.popularTitle": "Populaire",
     "discover.fieldChooser.filter.searchableLabel": "Interrogeable",
@@ -2380,9 +2825,10 @@
     "discover.fieldChooser.filter.toggleButton.no": "non",
     "discover.fieldChooser.filter.toggleButton.yes": "oui",
     "discover.fieldChooser.filter.typeLabel": "Type",
-    "discover.fieldChooser.indexPatterns.actionsPopoverLabel": "Paramètres du modèle d'indexation",
-    "discover.fieldChooser.indexPatterns.addFieldButton": "Ajouter un champ au modèle d'indexation",
-    "discover.fieldChooser.indexPatterns.manageFieldButton": "Gérer les champs du modèle d'indexation",
+    "discover.fieldChooser.indexPattern.changeDataViewTitle": "Changer de vue de données",
+    "discover.fieldChooser.indexPatterns.actionsPopoverLabel": "Paramètres Vue de données",
+    "discover.fieldChooser.indexPatterns.addFieldButton": "Ajouter un champ",
+    "discover.fieldChooser.indexPatterns.manageFieldButton": "Gérer les paramètres",
     "discover.fieldChooser.searchPlaceHolder": "Rechercher les noms de champs",
     "discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "Masquer les paramètres de filtre de champs",
     "discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "Afficher les paramètres de filtre de champs",
@@ -2395,12 +2841,17 @@
     "discover.fieldNameIcons.geoPointFieldAriaLabel": "Champ de point géographique",
     "discover.fieldNameIcons.geoShapeFieldAriaLabel": "Champ de forme géométrique",
     "discover.fieldNameIcons.ipAddressFieldAriaLabel": "Champ d'adresse IP",
+    "discover.fieldNameIcons.keywordFieldAriaLabel": "Champ de mot-clé",
     "discover.fieldNameIcons.murmur3FieldAriaLabel": "Champ Murmur3",
     "discover.fieldNameIcons.nestedFieldAriaLabel": "Champ imbriqué",
     "discover.fieldNameIcons.numberFieldAriaLabel": "Champ numérique",
     "discover.fieldNameIcons.sourceFieldAriaLabel": "Champ source",
     "discover.fieldNameIcons.stringFieldAriaLabel": "Champ de chaîne",
+    "discover.fieldNameIcons.textFieldAriaLabel": "Champ de texte",
     "discover.fieldNameIcons.unknownFieldAriaLabel": "Champ inconnu",
+    "discover.fieldNameIcons.versionFieldAriaLabel": "Champ de version",
+    "discover.goToDiscoverMainViewButtonText": "Accédez à la vue principale de Discover",
+    "discover.grid.copyToClipBoardButton": "Copier dans le presse-papiers",
     "discover.grid.documentHeader": "Document",
     "discover.grid.filterFor": "Filtrer sur",
     "discover.grid.filterForAria": "Filtrer sur cette {value}",
@@ -2412,6 +2863,7 @@
     "discover.grid.flyout.toastFilterAdded": "Le filtre a été ajouté.",
     "discover.grid.tableRow.detailHeading": "Document développé",
     "discover.grid.tableRow.viewSingleDocumentLinkTextSimple": "Document unique",
+    "discover.grid.tableRow.viewSurroundingDocumentsHover": "Inspectez des documents qui ont été créés avant et après ce document. Seuls les filtres épinglés restent actifs dans la vue Documents relatifs.",
     "discover.grid.tableRow.viewSurroundingDocumentsLinkTextSimple": "Documents relatifs",
     "discover.grid.tableRow.viewText": "Afficher :",
     "discover.grid.viewDoc": "Afficher/Masquer les détails de la boîte de dialogue",
@@ -2434,6 +2886,7 @@
     "discover.loadingDocuments": "Chargement des documents",
     "discover.loadingJSON": "Chargement de JSON",
     "discover.loadingResults": "Chargement des résultats",
+    "discover.localMenu.fallbackReportTitle": "Recherche Discover sans titre",
     "discover.localMenu.inspectTitle": "Inspecter",
     "discover.localMenu.localMenu.newSearchTitle": "Nouveau",
     "discover.localMenu.localMenu.optionsTitle": "Options",
@@ -2442,27 +2895,40 @@
     "discover.localMenu.openSavedSearchDescription": "Ouvrir une recherche enregistrée",
     "discover.localMenu.openTitle": "Ouvrir",
     "discover.localMenu.optionsDescription": "Options",
-    "discover.localMenu.saveSaveSearchObjectType": "recherche",
+    "discover.localMenu.saveSaveSearchObjectType": "rechercher",
     "discover.localMenu.saveSearchDescription": "Enregistrer la recherche",
     "discover.localMenu.saveTitle": "Enregistrer",
     "discover.localMenu.shareSearchDescription": "Partager la recherche",
     "discover.localMenu.shareTitle": "Partager",
+    "discover.noMatchRoute.bannerText": "L'application Discover ne reconnaît pas cet itinéraire : {route}",
+    "discover.noMatchRoute.bannerTitleText": "Page introuvable",
     "discover.noResults.adjustFilters": "Modifiez les filtres.",
     "discover.noResults.adjustSearch": "Modifiez la requête.",
     "discover.noResults.expandYourTimeRangeTitle": "Étendre la plage temporelle",
     "discover.noResults.queryMayNotMatchTitle": "Essayez de rechercher sur une période plus longue.",
     "discover.noResults.searchExamples.noResultsBecauseOfError": "Une erreur s’est produite lors de la récupération des résultats de recherche.",
     "discover.noResults.searchExamples.noResultsMatchSearchCriteriaTitle": "Aucun résultat ne correspond à vos critères de recherche.",
-    "discover.noResultsFound": "Aucun résultat trouvé.",
+    "discover.noResults.temporaryDisablingFiltersLinkText": "désactiver temporairement les filtres",
+    "discover.noResults.tryRemovingOrDisablingFilters": "Essayez de supprimer ou de {disablingFiltersLink}.",
+    "discover.noResults.trySearchingForDifferentCombination": "Essayez de rechercher une autre combinaison de termes.",
+    "discover.noResultsFound": "Résultat introuvable",
     "discover.notifications.invalidTimeRangeText": "La plage temporelle spécifiée n'est pas valide (de : \"{from}\" à \"{to}\").",
     "discover.notifications.invalidTimeRangeTitle": "Plage temporelle non valide",
     "discover.notifications.notSavedSearchTitle": "La recherche \"{savedSearchTitle}\" n'a pas été enregistrée.",
     "discover.notifications.savedSearchTitle": "La recherche \"{savedSearchTitle}\" a été enregistrée.",
+    "discover.openOptionsPopover.classicDiscoverText": "Classique",
+    "discover.openOptionsPopover.documentExplorerText": "Explorateur de documents",
+    "discover.openOptionsPopover.gotToSettings": "Afficher les paramètres de Discover",
+    "discover.openOptionsPopover.tryDocumentExplorer": "Testez l’explorateur de documents",
     "discover.partialHits": "≥ {formattedHits} {hits, plural, one {résultat} other {résultats}}",
     "discover.reloadSavedSearchButton": "Réinitialiser la recherche",
     "discover.removeColumnLabel": "Supprimer la colonne",
     "discover.rootBreadcrumb": "Discover",
     "discover.savedSearch.savedObjectName": "Recherche enregistrée",
+    "discover.savedSearchAliasMatchRedirect.objectNoun": "Recherche {savedSearch}",
+    "discover.savedSearchEmbeddable.action.viewSavedSearch.displayName": "Ouvrir dans Discover",
+    "discover.savedSearchEmbeddable.legacyURLConflict.errorMessage": "Cette recherche a la même URL qu'un alias hérité. Désactiver l'alias pour résoudre cette erreur : {json}",
+    "discover.savedSearchURLConflictCallout.objectNoun": "Recherche {savedSearch}",
     "discover.searchGenerationWithDescription": "Tableau généré par la recherche {searchTitle}",
     "discover.searchGenerationWithDescriptionGrid": "Tableau généré par la recherche {searchTitle} ({searchDescription})",
     "discover.searchingTitle": "Recherche",
@@ -2471,19 +2937,35 @@
     "discover.showAllDocuments": "Afficher tous les documents",
     "discover.showChart": "Afficher le graphique",
     "discover.showErrorMessageAgain": "Afficher le message d'erreur",
+    "discover.showingDefaultDataViewWarningDescription": "Affichage de la vue de données par défaut : \"{loadedIndexPatternTitle}\" ({loadedIndexPatternId})",
+    "discover.showingSavedDataViewWarningDescription": "Affichage de la vue de données enregistrée : \"{ownIndexPatternTitle}\" ({ownIndexPatternId})",
     "discover.showSelectedDocumentsOnly": "Afficher uniquement les documents sélectionnés",
+    "discover.singleDocRoute.errorMessage": "Pas de modèle d'indexation correspondant pour l'ID {indexPatternId}",
+    "discover.singleDocRoute.errorTitle": "Une erreur s'est produite",
     "discover.skipToBottomButtonLabel": "Atteindre la fin du tableau",
     "discover.sourceViewer.errorMessage": "Impossible de récupérer les données pour le moment. Actualisez l'onglet et réessayez.",
     "discover.sourceViewer.errorMessageTitle": "Une erreur s'est produite.",
     "discover.sourceViewer.refresh": "Actualiser",
-    "discover.toggleSidebarAriaLabel": "Afficher/Masquer la barre latérale",
+    "discover.timeIntervals": "Intervalles de temps",
+    "discover.timeIntervalWithValue": "Intervalle de temps : {timeInterval}",
+    "discover.timeIntervalWithValueWarning": "Avertissement",
+    "discover.toggleSidebarAriaLabel": "Activer/Désactiver la barre latérale",
+    "discover.topNav.openOptionsPopover.documentExplorerDisabledHint": "Saviez-vous que Discover possède un nouvel Explorateur de documents avec un meilleur tri des données, des colonnes redimensionnables et une vue en plein écran ? Vous pouvez modifier le mode d’affichage dans les Paramètres avancés.",
+    "discover.topNav.openOptionsPopover.documentExplorerEnabledHint": "Vous pouvez revenir à l’affichage Discover classique dans les Paramètres avancés.",
     "discover.topNav.openSearchPanel.manageSearchesButtonLabel": "Gérer les recherches",
     "discover.topNav.openSearchPanel.noSearchesFoundDescription": "Aucune recherche correspondante trouvée.",
     "discover.topNav.openSearchPanel.openSearchTitle": "Ouvrir une recherche",
     "discover.topNav.optionsPopover.currentViewMode": "{viewModeLabel} : {currentViewMode}",
+    "discover.topNav.optionsPopover.discoverViewModeLabel": "Mode d’affichage Discover",
     "discover.uninitializedRefreshButtonText": "Actualiser les données",
     "discover.uninitializedText": "Saisissez une requête, ajoutez quelques filtres, ou cliquez simplement sur Actualiser afin d’extraire les résultats pour la requête en cours.",
     "discover.uninitializedTitle": "Commencer la recherche",
+    "discover.utils.formatHit.moreFields": "et {count} {count, plural, one {autre champ} other {autres champs}}",
+    "discover.valueIsNotConfiguredDataViewIDWarningTitle": "{stateVal} n'est pas un ID de vue de données configuré",
+    "discover.viewModes.document.label": "Documents",
+    "discover.viewModes.fieldStatistics.betaTitle": "Bêta",
+    "discover.viewModes.fieldStatistics.label": "Statistiques de champ",
+    "discover.viewModes.legend": "Modes d’affichage",
     "embeddableApi.addPanel.createNewDefaultOption": "Créer",
     "embeddableApi.addPanel.displayName": "Ajouter un panneau",
     "embeddableApi.addPanel.noMatchingObjectsMessage": "Aucun objet correspondant trouvé.",
@@ -2514,6 +2996,7 @@
     "embeddableApi.panel.labelAborted": "Annulé",
     "embeddableApi.panel.labelError": "Erreur",
     "embeddableApi.panel.optionsMenu.panelOptionsButtonAriaLabel": "Options de panneau",
+    "embeddableApi.panel.optionsMenu.panelOptionsButtonAriaLabelWithIndex": "Options pour le panneau {index}",
     "embeddableApi.panel.optionsMenu.panelOptionsButtonEnhancedAriaLabel": "Options de panneau pour {title}",
     "embeddableApi.panel.placeholderTitle": "[Aucun titre]",
     "embeddableApi.panel.removePanel.displayName": "Supprimer du tableau de bord",
@@ -2533,7 +3016,7 @@
     "esQuery.kql.errors.literalText": "littéral",
     "esQuery.kql.errors.syntaxError": "{expectedList} attendu, mais {foundInput} détecté.",
     "esQuery.kql.errors.valueText": "valeur",
-    "esQuery.kql.errors.whitespaceText": "whitespace",
+    "esQuery.kql.errors.whitespaceText": "espace",
     "esUi.cronEditor.cronDaily.fieldHour.textAtLabel": "À",
     "esUi.cronEditor.cronDaily.fieldTimeLabel": "Heure",
     "esUi.cronEditor.cronDaily.hourSelectLabel": "Heure",
@@ -2592,12 +3075,85 @@
     "esUi.formWizard.saveButtonLabel": "Enregistrer",
     "esUi.formWizard.savingButtonLabel": "Enregistrement en cours...",
     "esUi.validation.string.invalidJSONError": "JSON non valide",
+    "esUi.viewApiRequest.closeButtonLabel": "Fermer",
+    "esUi.viewApiRequest.copyToClipboardButton": "Copier dans le presse-papiers",
+    "esUi.viewApiRequest.openInConsoleButton": "Ouvrir dans la console",
+    "eventAnnotation.group.args.annotationConfigs": "Configurations d’annotations",
+    "eventAnnotation.group.description": "Groupe d’annotations d’événement",
+    "eventAnnotation.manualAnnotation.args.color": "Couleur de la ligne",
+    "eventAnnotation.manualAnnotation.args.icon": "Icône facultative utilisée pour les lignes d’annotation",
+    "eventAnnotation.manualAnnotation.args.isHidden": "Basculer pour masquer l’annotation",
+    "eventAnnotation.manualAnnotation.args.label": "Nom de l’annotation",
+    "eventAnnotation.manualAnnotation.args.lineStyle": "Style de la ligne d’annotation",
+    "eventAnnotation.manualAnnotation.args.lineWidth": "Largeur de la ligne d’annotation",
+    "eventAnnotation.manualAnnotation.args.textVisibility": "Visibilité de l’étiquette sur la ligne d’annotation",
+    "eventAnnotation.manualAnnotation.args.time": "Horodatage de l’annotation",
+    "eventAnnotation.manualAnnotation.description": "Configurer l’annotation manuelle",
     "expressionError.errorComponent.description": "Échec de l'expression avec le message :",
     "expressionError.errorComponent.title": "Oups ! Échec de l'expression",
     "expressionError.renderer.debug.displayName": "Débogage",
     "expressionError.renderer.debug.helpDescription": "Présenter une sortie de débogage formatée {JSON}",
     "expressionError.renderer.error.displayName": "Informations sur l'erreur",
     "expressionError.renderer.error.helpDescription": "Présenter les données de l'erreur d'une manière utile pour les utilisateurs",
+    "expressionGauge.functions.gauge.args.centralMajor.help": "Spécifie la valeur centralMajor du graphique de jauge affiché dans le graphique.",
+    "expressionGauge.functions.gauge.args.centralMajorMode.help": "Spécifie le mode de centralMajor",
+    "expressionGauge.functions.gauge.args.colorMode.help": "Si la valeur est définie sur palette, les couleurs de celles-ci seront appliquées aux bandes",
+    "expressionGauge.functions.gauge.args.commonLabel.help": "Spécifie l’étiquette commune en dehors du graphique",
+    "expressionGauge.functions.gauge.args.goal.help": "Valeur de l’objectif",
+    "expressionGauge.functions.gauge.args.labelMajor.help": "Spécifie la valeur labelMajor du graphique de jauge affiché dans le graphique.",
+    "expressionGauge.functions.gauge.args.labelMajorMode.help": "Spécifie le mode de labelMajor",
+    "expressionGauge.functions.gauge.args.labelMinor.help": "Spécifie la valeur labelMinor du graphique de jauge",
+    "expressionGauge.functions.gauge.args.max.help": "Valeur maximale",
+    "expressionGauge.functions.gauge.args.metric.help": "Valeur actuelle",
+    "expressionGauge.functions.gauge.args.min.help": "Valeur minimale",
+    "expressionGauge.functions.gauge.args.palette.help": "Fournit des couleurs pour les valeurs",
+    "expressionGauge.functions.gauge.args.shape.help": "Type de graphique de jauge",
+    "expressionGauge.functions.gauge.args.ticksPosition.help": "Spécifie l’emplacement des coches",
+    "expressionGauge.functions.gauge.errors.centralMajorNotSupportedForShapeError": "Les champs \"centralMajor\" et \"centralMajorMode\" ne sont pas pris en charge par la forme \"{shape}\"",
+    "expressionGauge.functions.gauge.help": "Visualisation de la jauge",
+    "expressionGauge.functions.gauge.percentageMode.help": "Active le mode de pourcentage relatif",
+    "expressionGauge.functions.gaugeChart.config.ariaLabel.help": "Spécifie l’attribut aria-label du graphique de jauge.",
+    "expressionGauge.logDatatable.goal": "Objectif",
+    "expressionGauge.logDatatable.max": "Max.",
+    "expressionGauge.logDatatable.metric": "Indicateur",
+    "expressionGauge.logDatatable.min": "Min.",
+    "expressionGauge.renderer.chartCannotRenderEqual": "Les valeurs minimale et maximale peuvent ne pas être égales.",
+    "expressionGauge.renderer.chartCannotRenderMinGreaterMax": "La valeur minimale peut ne pas être supérieure à la valeur maximale.",
+    "expressionGauge.renderer.visualizationName": "Jauge",
+    "expressionHeatmap.function.args.addTooltipHelpText": "Afficher l'infobulle au survol",
+    "expressionHeatmap.function.args.grid.isCellLabelVisible.help": "Spécifie si l'étiquette de cellule est visible ou non.",
+    "expressionHeatmap.function.args.grid.isXAxisLabelVisible.help": "Spécifie si les étiquettes de l'axe X sont visibles ou non.",
+    "expressionHeatmap.function.args.grid.isXAxisTitleVisible.help": "Spécifie si le titre de l'axe X est visible ou non.",
+    "expressionHeatmap.function.args.grid.isYAxisLabelVisible.help": "Spécifie si les étiquettes de l'axe Y sont visibles ou non.",
+    "expressionHeatmap.function.args.grid.isYAxisTitleVisible.help": "Spécifie si le titre de l'axe Y est visible ou non.",
+    "expressionHeatmap.function.args.grid.strokeColor.help": "Spécifie la couleur de trait de la grille",
+    "expressionHeatmap.function.args.grid.strokeWidth.help": "Spécifie la largeur de trait de la grille",
+    "expressionHeatmap.function.args.grid.xTitle.help": "Spécifie le titre de l’axe X",
+    "expressionHeatmap.function.args.grid.yTitle.help": "Spécifie le titre de l’axe Y",
+    "expressionHeatmap.function.args.highlightInHoverHelpText": "Cette option permet de mettre en surbrillance les plages de la même couleur sur le survol de la légende",
+    "expressionHeatmap.function.args.lastRangeIsRightOpen": "Si elle est définie comme vraie, la dernière valeur de la gamme sera grande ouverte",
+    "expressionHeatmap.function.args.legend.isVisible.help": "Spécifie si la légende est visible ou non.",
+    "expressionHeatmap.function.args.legend.maxLines.help": "Spécifie le nombre de lignes par élément de légende.",
+    "expressionHeatmap.function.args.legend.position.help": "Spécifie la position de la légende.",
+    "expressionHeatmap.function.args.legend.shouldTruncate.help": "Spécifie si les éléments de légende doivent être tronqués ou non.",
+    "expressionHeatmap.function.args.legendSize.help": "Spécifie la taille de la légende en pixels.",
+    "expressionHeatmap.function.args.splitColumnAccessorHelpText": "L'identifiant de la colonne fractionnée ou la dimension correspondante",
+    "expressionHeatmap.function.args.splitRowAccessorHelpText": "L'identifiant de la ligne fractionnée ou la dimension correspondante",
+    "expressionHeatmap.function.args.valueAccessorHelpText": "L’identifiant de la colonne de valeurs ou la dimension correspondante",
+    "expressionHeatmap.function.args.xAccessorHelpText": "L’identifiant de la colonne de l’axe X ou la dimension correspondante",
+    "expressionHeatmap.function.args.yAccessorHelpText": "L’identifiant de la colonne de l’axe Y ou la dimension correspondante",
+    "expressionHeatmap.function.dimension.metric": "Indicateur",
+    "expressionHeatmap.function.dimension.splitColumn": "Diviser par colonne",
+    "expressionHeatmap.function.dimension.splitRow": "Diviser par ligne",
+    "expressionHeatmap.function.dimension.xaxis": "Axe X",
+    "expressionHeatmap.function.dimension.yaxis": "Axe Y",
+    "expressionHeatmap.function.gridConfig.help": "Configurez la disposition de la carte thermique.",
+    "expressionHeatmap.function.help": "Visualisation de la carte thermique",
+    "expressionHeatmap.function.legendConfig.help": "Configurez la légende du graphique.",
+    "expressionHeatmap.function.palette.help": "Fournit des couleurs pour les valeurs, basées sur les limites.",
+    "expressionHeatmap.function.percentageMode.help": "Lorsque cette option est activée, l’infobulle et les légendes apparaissent sous forme de pourcentages.",
+    "expressionHeatmap.functions.args.ariaLabelHelpText": "Spécifie l’attribut aria-label de la carte thermique.",
+    "expressionHeatmap.visualizationName": "Carte thermique",
     "expressionImage.functions.image.args.dataurlHelpText": "L'{URL} {https} ou l'{URL} de données {BASE64} d'une image.",
     "expressionImage.functions.image.args.modeHelpText": "{contain} affiche l'image entière, mise à l’échelle. {cover} remplit le conteneur avec l'image, en rognant les côtés ou le bas si besoin. {stretch} redimensionne la hauteur et la largeur de l'image pour correspondre à 100 % du conteneur.",
     "expressionImage.functions.image.invalidImageModeErrorMessage": "\"mode\" doit être défini sur \"{contain}\", \"{cover}\" ou \"{stretch}\".",
@@ -2611,6 +3167,64 @@
     "expressionMetric.functions.metricHelpText": "Affiche un nombre sur une étiquette.",
     "expressionMetric.renderer.metric.displayName": "Indicateur",
     "expressionMetric.renderer.metric.helpDescription": "Présenter un nombre sur une étiquette",
+    "expressionMetricVis.function.autoScale.help": "Activer le scaling automatique",
+    "expressionMetricVis.function.bucket.help": "configuration des dimensions de compartiment",
+    "expressionMetricVis.function.colorFullBackground.help": "Applique la couleur d’arrière-plan sélectionnée à l’intégralité du conteneur de visualisation",
+    "expressionMetricVis.function.colorMode.help": "La partie de l'indicateur à colorer",
+    "expressionMetricVis.function.dimension.metric": "Indicateur",
+    "expressionMetricVis.function.dimension.splitGroup": "Diviser le groupe",
+    "expressionMetricVis.function.errors.severalMetricsAndColorFullBackgroundSpecified": "La couleur d’arrière-plan intégrale ne peut pas être appliquée à une visualisation contenant plusieurs indicateurs.",
+    "expressionMetricVis.function.errors.splitByBucketAndColorFullBackgroundSpecified": "La couleur d’arrière-plan intégrale ne peut pas être appliquée à des visualisations pour lesquelles un compartiment est spécifié.",
+    "expressionMetricVis.function.font.help": "Paramètres de police.",
+    "expressionMetricVis.function.help": "Visualisation de l'indicateur",
+    "expressionMetricVis.function.labelFont.help": "Paramètres de police de l’étiquette.",
+    "expressionMetricVis.function.labelPosition.help": "Position de l'étiquette",
+    "expressionMetricVis.function.metric.help": "configuration des dimensions d’indicateur",
+    "expressionMetricVis.function.palette.help": "Fournit des couleurs pour les valeurs, basées sur les limites.",
+    "expressionMetricVis.function.percentageMode.help": "Affiche l'indicateur en mode de pourcentage. Nécessite qu’une plage de couleurs soit définie.",
+    "expressionMetricVis.function.showLabels.help": "Affiche les étiquettes sous les valeurs d’indicateur.",
+    "expressionPartitionVis.legend.filterForValueButtonAriaLabel": "Filtrer sur la valeur",
+    "expressionPartitionVis.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
+    "expressionPartitionVis.legend.filterOutValueButtonAriaLabel": "Exclure la valeur",
+    "expressionPartitionVis.negativeValuesFound": "Le graphique {chartType} ne peut pas rendre des valeurs négatives.",
+    "expressionPartitionVis.partitionLabels.function.args.last_level.help": "Afficher les étiquettes de niveau supérieur uniquement pour les camemberts/graphiques en anneau",
+    "expressionPartitionVis.partitionLabels.function.args.percentDecimals.help": "Définit le nombre de décimales qui s'affichent pour les valeurs sous forme de pourcentage.",
+    "expressionPartitionVis.partitionLabels.function.args.position.help": "Définit la position des étiquettes.",
+    "expressionPartitionVis.partitionLabels.function.args.show.help": "Affiche les étiquettes des graphiques à partition.",
+    "expressionPartitionVis.partitionLabels.function.args.truncate.help": "Définit le nombre de caractères affichés pour la valeur de section, uniquement pour les camemberts/graphiques en anneau.",
+    "expressionPartitionVis.partitionLabels.function.args.values.help": "Affiche les valeurs dans les sections.",
+    "expressionPartitionVis.partitionLabels.function.args.valuesFormat.help": "Définit le format des valeurs.",
+    "expressionPartitionVis.partitionLabels.function.help": "Génère l'objet d’étiquettes de partition.",
+    "expressionPartitionVis.pieVis.function.args.distinctColorsHelpText": "Mappe des couleurs différentes pour chaque section. Les sections avec la même valeur ont la même couleur.",
+    "expressionPartitionVis.pieVis.function.help": "Visualisation du camembert",
+    "expressionPartitionVis.renderer.partitionVis.pie.displayName": "Visualisation de partition",
+    "expressionPartitionVis.renderer.partitionVis.pie.helpDescription": "Effectuer le rendu des camemberts/graphiques en anneau/compartimentages/mosaïques/graphiques en gaufre",
+    "expressionPartitionVis.reusable.function.args.addTooltipHelpText": "Afficher l'infobulle au survol de la section",
+    "expressionPartitionVis.reusable.function.args.bucketsHelpText": "Configuration des dimensions de compartiment",
+    "expressionPartitionVis.reusable.function.args.emptySizeRatioHelpText": "Définit la taille de la zone vide à l’intérieur du graphique en anneau",
+    "expressionPartitionVis.reusable.function.args.isDonutHelpText": "Affiche le camembert sous la forme d'un graphique à anneau.",
+    "expressionPartitionVis.reusable.function.args.labelsHelpText": "Configuration des étiquettes du camembert",
+    "expressionPartitionVis.reusable.function.args.legendDisplayHelpText": "Afficher la légende du graphique",
+    "expressionPartitionVis.reusable.function.args.legendPositionHelpText": "Positionner la légende en haut, en bas, à gauche ou à droite du graphique",
+    "expressionPartitionVis.reusable.function.args.legendSizeHelpText": "Spécifie la taille de la légende en pixels.",
+    "expressionPartitionVis.reusable.function.args.maxLegendLinesHelpText": "Définit le nombre de lignes par élément de légende",
+    "expressionPartitionVis.reusable.function.args.metricHelpText": "Configuration des dimensions d’indicateur",
+    "expressionPartitionVis.reusable.function.args.nestedLegendHelpText": "Afficher une légende plus détaillée",
+    "expressionPartitionVis.reusable.function.args.paletteHelpText": "Définit le nom de la palette du graphique.",
+    "expressionPartitionVis.reusable.function.args.respectSourceOrderHelpText": "Maintient l’ordre des éléments renvoyés à partir de la source de données.",
+    "expressionPartitionVis.reusable.function.args.splitColumnHelpText": "Configuration de la dimension Diviser par colonne",
+    "expressionPartitionVis.reusable.function.args.splitRowHelpText": "Configuration de la dimension Diviser par ligne",
+    "expressionPartitionVis.reusable.function.args.startPlacementWithSecondLargestSliceHelpText": "Commence le placement par la deuxième section la plus grande.",
+    "expressionPartitionVis.reusable.function.args.truncateLegendHelpText": "Définit si les éléments de légende seront tronqués ou non.",
+    "expressionPartitionVis.reusable.function.dimension.buckets": "Section",
+    "expressionPartitionVis.reusable.function.dimension.metric": "Taille de section",
+    "expressionPartitionVis.reusable.function.dimension.splitcolumn": "Division de colonne",
+    "expressionPartitionVis.reusable.function.dimension.splitrow": "Division de ligne",
+    "expressionPartitionVis.reusable.function.errors.moreThenNumberBuckets": "Les compartiments de plus de {maxLength} ne sont pas pris en charge.",
+    "expressionPartitionVis.reusable.function.errors.splitRowAndColumnSpecified": "Une ligne fractionnée et une colonne sont spécifiées. L’expression n’en prend en charge qu’une à la fois.",
+    "expressionPartitionVis.reusable.functions.args.ariaLabelHelpText": "Spécifie l’attribut aria-label du graphique.",
+    "expressionPartitionVis.waffle.function.args.bucketHelpText": "Configuration des dimensions de compartiment",
+    "expressionPartitionVis.waffle.function.args.showValuesInLegendHelpText": "Afficher les valeurs dans la légende",
     "expressionRepeatImage.error.repeatImage.missingMaxArgument": "{maxArgument} doit être défini si un {emptyImageArgument} est fourni.",
     "expressionRepeatImage.functions.repeatImage.args.emptyImageHelpText": "Comble la différence entre les paramètres {CONTEXT} et {maxArg} pour l'élément avec cette image. Spécifiez une ressource d'image sous la forme d'une {URL} de données {BASE64}, ou saisissez une sous-expression.",
     "expressionRepeatImage.functions.repeatImage.args.imageHelpText": "L'image à répéter. Spécifiez une ressource d'image sous la forme d'une {URL} de données {BASE64}, ou saisissez une sous-expression.",
@@ -2649,10 +3263,12 @@
     "expressions.functions.font.args.familyHelpText": "Une chaîne de police Internet {css} acceptable",
     "expressions.functions.font.args.italicHelpText": "Mettre le texte en italique ?",
     "expressions.functions.font.args.lHeightHelpText": "La hauteur de la ligne en pixels",
-    "expressions.functions.font.args.sizeHelpText": "La taille de la police en pixels",
+    "expressions.functions.font.args.sizeHelpText": "La taille de la police",
+    "expressions.functions.font.args.sizeUnitHelpText": "L’unité de la taille de la police",
     "expressions.functions.font.args.underlineHelpText": "Souligner le texte ?",
     "expressions.functions.font.args.weightHelpText": "L’épaisseur de la police. Par exemple, {list} ou {end}.",
     "expressions.functions.font.invalidFontWeightErrorMessage": "Épaisseur de police non valide : \"{weight}\"",
+    "expressions.functions.font.invalidSizeUnitErrorMessage": "Unité de taille non valide : \"{sizeUnit}\"",
     "expressions.functions.font.invalidTextAlignmentErrorMessage": "Alignement du texte non valide : \"{align}\"",
     "expressions.functions.fontHelpText": "Créez un style de police.",
     "expressions.functions.mapColumn.args.copyMetaFromHelpText": "Si défini, l'objet méta de l'ID de colonne spécifié est copié dans la colonne cible spécifiée. Si la colonne n'existe pas, un échec silencieux se produit.",
@@ -2671,6 +3287,7 @@
     "expressions.functions.mathColumn.args.nameHelpText": "Le nom de la colonne produite. Les noms n'ont pas besoin d'être uniques.",
     "expressions.functions.mathColumn.arrayValueError": "Impossible de réaliser le calcul sur les valeurs du tableau à {name}",
     "expressions.functions.mathColumn.uniqueIdError": "L'ID doit être unique.",
+    "expressions.functions.mathColumnHelpText": "Ajoute une colonne en évaluant {tinymath} sur chaque ligne. Cette fonction est optimisée pour les mathématiques et livre de meilleures performances par rapport à l’utilisation d’une expression mathématique dans {mapColumnFn}.",
     "expressions.functions.mathHelpText": "Interprète une expression mathématique {TINYMATH} à l'aide d'un {TYPE_NUMBER} ou d'une {DATATABLE} en tant que {CONTEXT}. Les colonnes {DATATABLE} peuvent être recherchées d’après leur nom. Si {CONTEXT} est un nombre, il est disponible en tant que {value}.",
     "expressions.functions.movingAverage.args.byHelpText": "Colonne par laquelle diviser le calcul de la moyenne mobile",
     "expressions.functions.movingAverage.args.inputColumnIdHelpText": "Colonne pour laquelle calculer la moyenne mobile",
@@ -2721,6 +3338,125 @@
     "expressionShape.renderer.progress.helpDescription": "Présenter une progression basique",
     "expressionShape.renderer.shape.displayName": "Forme",
     "expressionShape.renderer.shape.helpDescription": "Présenter une forme basique",
+    "expressionTagcloud.feedbackMessage.tooSmallContainerDescription": "Le conteneur est trop petit pour afficher l'ensemble du nuage. Les balises peuvent être rognées ou omises.",
+    "expressionTagcloud.feedbackMessage.truncatedTagsDescription": "Le nombre de balises a été tronqué pour éviter des temps de traçage trop longs.",
+    "expressionTagcloud.functions.tagcloud.args.ariaLabelHelpText": "Spécifie l’attribut aria-label du nuage de balises",
+    "expressionTagcloud.functions.tagcloud.args.bucketHelpText": "configuration des dimensions de compartiment",
+    "expressionTagcloud.functions.tagcloud.args.maxFontSizeHelpText": "Taille maximale de la police",
+    "expressionTagcloud.functions.tagcloud.args.metricHelpText": "configuration des dimensions d’indicateur",
+    "expressionTagcloud.functions.tagcloud.args.minFontSizeHelpText": "Taille minimale de la police",
+    "expressionTagcloud.functions.tagcloud.args.orientationHelpText": "Orientation des mots dans le nuage de balises",
+    "expressionTagcloud.functions.tagcloud.args.paletteHelpText": "Définit le nom de la palette du graphique.",
+    "expressionTagcloud.functions.tagcloud.args.scaleHelpText": "Échelle pour déterminer la taille de police d'un mot",
+    "expressionTagcloud.functions.tagcloud.args.showLabelHelpText": "Afficher l’étiquette du graphique",
+    "expressionTagcloud.functions.tagcloud.dimension.tags": "Balises",
+    "expressionTagcloud.functions.tagcloud.dimension.tagSize": "Taille de balise",
+    "expressionTagcloud.functions.tagcloud.invalidImageUrl": "URL d'image non valide : \"{imageUrl}\".",
+    "expressionTagcloud.functions.tagcloud.invalidPercentErrorMessage": "Valeur non valide : \"{percent}\". Le pourcentage doit être compris entre 0 et 1.",
+    "expressionTagcloud.functions.tagcloudHelpText": "Visualisation du nuage de balises.",
+    "expressionTagcloud.renderer.tagcloud.displayName": "Visualisation du nuage de balises",
+    "expressionTagcloud.renderer.tagcloud.helpDescription": "Afficher le rendu d’un nuage de balises",
+    "expressionXY.axisExtentConfig.extentMode.help": "Mode d'extension",
+    "expressionXY.axisExtentConfig.help": "Configurer les étendues d’axe du graphique xy",
+    "expressionXY.axisExtentConfig.lowerBound.help": "Limite inférieure",
+    "expressionXY.axisExtentConfig.upperBound.help": "Limite supérieure",
+    "expressionXY.axisTitlesVisibilityConfig.help": "Configurer l’aspect des titres d’axe du graphique xy",
+    "expressionXY.axisTitlesVisibilityConfig.x.help": "Spécifie si le titre de l'axe X est visible ou non.",
+    "expressionXY.axisTitlesVisibilityConfig.yLeft.help": "Spécifie si le titre de l'axe Y de gauche est visible ou non.",
+    "expressionXY.axisTitlesVisibilityConfig.yRight.help": "Spécifie si le titre de l'axe Y de droite est visible ou non.",
+    "expressionXY.dataLayer.accessors.help": "Les colonnes à afficher sur l’axe y.",
+    "expressionXY.dataLayer.columnToLabel.help": "Paires clé-valeur JSON de l’ID de colonne pour l’étiquette",
+    "expressionXY.dataLayer.help": "Configurer un calque dans le graphique xy",
+    "expressionXY.dataLayer.hide.help": "Afficher/masquer l’axe",
+    "expressionXY.dataLayer.isHistogram.help": "Disposer le graphique sous forme d’histogramme ou non",
+    "expressionXY.dataLayer.layerId.help": "ID du calque",
+    "expressionXY.dataLayer.palette.help": "Palette",
+    "expressionXY.dataLayer.seriesType.help": "Type de graphique à afficher.",
+    "expressionXY.dataLayer.splitAccessor.help": "Colonne selon laquelle effectuer la division",
+    "expressionXY.dataLayer.xAccessor.help": "Axe X",
+    "expressionXY.dataLayer.xScaleType.help": "Type d’échelle de l’axe x",
+    "expressionXY.dataLayer.yConfig.help": "Configuration supplémentaire pour les axes y",
+    "expressionXY.dataLayer.yScaleType.help": "Type d’échelle des axes y",
+    "expressionXY.gridlinesConfig.help": "Configurer l’aspect du quadrillage du graphique xy",
+    "expressionXY.gridlinesConfig.x.help": "Spécifie si le quadrillage de l'axe X est visible ou non.",
+    "expressionXY.gridlinesConfig.yLeft.help": "Spécifie si le quadrillage de l'axe Y de gauche est visible ou non.",
+    "expressionXY.gridlinesConfig.yRight.help": "Spécifie si le quadrillage de l'axe Y de droite est visible ou non.",
+    "expressionXY.labelsOrientationConfig.help": "Configurer l’orientation des étiquettes de coche du graphique xy",
+    "expressionXY.labelsOrientationConfig.x.help": "Spécifie l'orientation des étiquettes de l'axe X.",
+    "expressionXY.labelsOrientationConfig.yLeft.help": "Spécifie l'orientation des étiquettes de l'axe Y de gauche.",
+    "expressionXY.labelsOrientationConfig.yRight.help": "Spécifie l'orientation des étiquettes de l'axe Y de droite.",
+    "expressionXY.legend.filterForValueButtonAriaLabel": "Filtrer sur la valeur",
+    "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
+    "expressionXY.legend.filterOutValueButtonAriaLabel": "Exclure la valeur",
+    "expressionXY.legendConfig.floatingColumns.help": "Spécifie le nombre de colonnes lorsque la légende est affichée à l'intérieur du graphique.",
+    "expressionXY.legendConfig.help": "Configurer la légende du graphique xy",
+    "expressionXY.legendConfig.horizontalAlignment.help": "Spécifie l'alignement horizontal de la légende lorsqu'elle est affichée à l'intérieur du graphique.",
+    "expressionXY.legendConfig.isInside.help": "Spécifie si une légende se trouve à l'intérieur d'un graphique",
+    "expressionXY.legendConfig.isVisible.help": "Spécifie si la légende est visible ou non.",
+    "expressionXY.legendConfig.legendSize.help": "Spécifie la taille de la légende en pixels.",
+    "expressionXY.legendConfig.maxLines.help": "Spécifie le nombre de lignes par élément de légende.",
+    "expressionXY.legendConfig.position.help": "Spécifie la position de la légende.",
+    "expressionXY.legendConfig.shouldTruncate.help": "Spécifie si les éléments de légende seront tronqués ou non",
+    "expressionXY.legendConfig.showSingleSeries.help": "Spécifie si une légende comportant une seule entrée doit être affichée",
+    "expressionXY.legendConfig.verticalAlignment.help": "Spécifie l'alignement vertical de la légende lorsqu'elle est affichée à l'intérieur du graphique.",
+    "expressionXY.referenceLineLayer.accessors.help": "Les colonnes à afficher sur l’axe y.",
+    "expressionXY.referenceLineLayer.columnToLabel.help": "Paires clé-valeur JSON de l’ID de colonne pour l’étiquette",
+    "expressionXY.referenceLineLayer.help": "Configurer une ligne de référence dans le graphique xy",
+    "expressionXY.referenceLineLayer.layerId.help": "ID du calque",
+    "expressionXY.referenceLineLayer.yConfig.help": "Configuration supplémentaire pour les axes y",
+    "expressionXY.tickLabelsConfig.help": "Configurer l’aspect des étiquettes de coche du graphique xy",
+    "expressionXY.tickLabelsConfig.x.help": "Spécifie si les étiquettes de graduation de l'axe X sont visibles ou non.",
+    "expressionXY.tickLabelsConfig.yLeft.help": "Spécifie si les étiquettes de graduation de l'axe Y de gauche sont visibles ou non.",
+    "expressionXY.tickLabelsConfig.yRight.help": "Spécifie si les étiquettes de graduation de l'axe Y de droite sont visibles ou non.",
+    "expressionXY.xyChart.emptyXLabel": "(vide)",
+    "expressionXY.xyChart.iconSelect.alertIconLabel": "Alerte",
+    "expressionXY.xyChart.iconSelect.asteriskIconLabel": "Astérisque",
+    "expressionXY.xyChart.iconSelect.bellIconLabel": "Cloche",
+    "expressionXY.xyChart.iconSelect.boltIconLabel": "Éclair",
+    "expressionXY.xyChart.iconSelect.bugIconLabel": "Bug",
+    "expressionXY.xyChart.iconSelect.circleIconLabel": "Cercle",
+    "expressionXY.xyChart.iconSelect.commentIconLabel": "Commentaire",
+    "expressionXY.xyChart.iconSelect.flagIconLabel": "Drapeau",
+    "expressionXY.xyChart.iconSelect.heartLabel": "Cœur",
+    "expressionXY.xyChart.iconSelect.mapMarkerLabel": "Repère",
+    "expressionXY.xyChart.iconSelect.mapPinLabel": "Punaise",
+    "expressionXY.xyChart.iconSelect.starLabel": "Étoile",
+    "expressionXY.xyChart.iconSelect.tagIconLabel": "Balise",
+    "expressionXY.xyChart.iconSelect.triangleIconLabel": "Triangle",
+    "expressionXY.xyVis.ariaLabel.help": "Spécifie l’attribut aria-label du graphique xy",
+    "expressionXY.xyVis.axisTitlesVisibilitySettings.help": "Afficher les titres des axes X et Y",
+    "expressionXY.xyVis.curveType.help": "Définir de quelle façon le type de courbe est rendu pour un graphique linéaire",
+    "expressionXY.xyVis.endValue.help": "Valeur de fin",
+    "expressionXY.xyVis.fillOpacity.help": "Définir l'opacité du remplissage du graphique en aires",
+    "expressionXY.xyVis.fittingFunction.help": "Définir le mode de traitement des valeurs manquantes",
+    "expressionXY.xyVis.gridlinesVisibilitySettings.help": "Afficher le quadrillage des axes X et Y",
+    "expressionXY.xyVis.help": "Graphique X/Y",
+    "expressionXY.xyVis.hideEndzones.help": "Masquer les marqueurs de zone de fin pour les données partielles",
+    "expressionXY.xyVis.labelsOrientation.help": "Définit la rotation des étiquettes des axes",
+    "expressionXY.xyVis.layers.help": "Calques de série visuelle",
+    "expressionXY.xyVis.legend.help": "Configurez la légende du graphique.",
+    "expressionXY.xyVis.logDatatable.breakDown": "Répartir par",
+    "expressionXY.xyVis.logDatatable.metric": "Axe vertical",
+    "expressionXY.xyVis.logDatatable.x": "Axe horizontal",
+    "expressionXY.xyVis.renderer.help": "Outil de rendu de graphique X/Y",
+    "expressionXY.xyVis.tickLabelsVisibilitySettings.help": "Afficher les étiquettes de graduation des axes X et Y",
+    "expressionXY.xyVis.valueLabels.help": "Mode des étiquettes de valeur",
+    "expressionXY.xyVis.valuesInLegend.help": "Afficher les valeurs dans la légende",
+    "expressionXY.xyVis.xTitle.help": "Titre de l'axe X",
+    "expressionXY.xyVis.yLeftExtent.help": "Portée de l'axe Y de gauche",
+    "expressionXY.xyVis.yLeftTitle.help": "Titre de l'axe Y de gauche",
+    "expressionXY.xyVis.yRightExtent.help": "Portée de l'axe Y de droite",
+    "expressionXY.xyVis.yRightTitle.help": "Titre de l'axe Y de droite",
+    "expressionXY.yConfig.axisMode.help": "Le mode axe de l’indicateur",
+    "expressionXY.yConfig.color.help": "La couleur des séries",
+    "expressionXY.yConfig.fill.help": "Remplir",
+    "expressionXY.yConfig.forAccessor.help": "L’accesseur auquel cette configuration s’applique",
+    "expressionXY.yConfig.help": "Configurer le comportement de l’indicateur d’axe y d’un graphique xy",
+    "expressionXY.yConfig.icon.help": "Icône facultative utilisée pour les lignes de référence",
+    "expressionXY.yConfig.iconPosition.help": "Le placement de l’icône pour la ligne de référence",
+    "expressionXY.yConfig.lineStyle.help": "Le style de la ligne de référence",
+    "expressionXY.yConfig.lineWidth.help": "La largeur de la ligne de référence",
+    "expressionXY.yConfig.textVisibility.help": "Visibilité de l’étiquette sur la ligne de référence",
     "fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText": "Format numérique",
     "fieldFormats.advancedSettings.format.bytesFormatText": "{numeralFormatLink} par défaut pour le format \"octets\"",
     "fieldFormats.advancedSettings.format.bytesFormatTitle": "Format octets",
@@ -2776,6 +3512,10 @@
     "fieldFormats.duration.outputFormats.humanize.approximate": "Lisible par l'humain (approximatif)",
     "fieldFormats.duration.outputFormats.humanize.precise": "Lisible par l'humain (précis)",
     "fieldFormats.duration.title": "Durée",
+    "fieldFormats.geoPoint.title": "Point géographique",
+    "fieldFormats.geoPoint.transformOptions.latLonString": "chaîne possédant le format : \"lat,lon\"",
+    "fieldFormats.geoPoint.transformOptions.none": "- Aucune -",
+    "fieldFormats.geoPoint.transformOptions.wkt": "Texte bien connu",
     "fieldFormats.histogram.title": "Histogramme",
     "fieldFormats.ip.title": "Adresse IP",
     "fieldFormats.number.title": "Nombre",
@@ -2816,16 +3556,18 @@
     "flot.time.thuLabel": "Jeu",
     "flot.time.tueLabel": "Mar",
     "flot.time.wedLabel": "Mer",
-    "home.addData.addDataButtonLabel": "Ajouter vos données",
+    "home.addData.addDataButtonLabel": "Ajouter des intégrations",
     "home.addData.sampleDataButtonLabel": "Utiliser un exemple de données",
-    "home.addData.sectionTitle": "Ajoutez vos données pour commencer",
+    "home.addData.sectionTitle": "Ajoutez des intégrations pour commencer",
     "home.addData.text": "Vous avez plusieurs options pour commencer à exploiter vos données. Vous pouvez collecter des données à partir d'une application ou d'un service, ou bien charger un fichier. Et si vous n'êtes pas encore prêt à utiliser vos propres données, utilisez notre exemple d’ensemble de données.",
+    "home.addData.uploadFileButtonLabel": "Charger un fichier",
     "home.breadcrumbs.homeTitle": "Accueil",
+    "home.breadcrumbs.integrationsAppTitle": "Intégrations",
     "home.exploreButtonLabel": "Explorer par moi-même",
     "home.exploreYourDataDescription": "Une fois toutes les étapes terminées, vous êtes prêt à explorer vos données.",
     "home.header.title": "Bienvenue chez vous",
     "home.letsStartDescription": "Ajoutez des données à votre cluster depuis n’importe quelle source, puis analysez-les et visualisez-les en temps réel. Utilisez nos solutions pour définir des recherches, observer votre écosystème et vous protéger contre les menaces de sécurité.",
-    "home.letsStartTitle": "Commencez par ajouter vos données",
+    "home.letsStartTitle": "Ajoutez des intégrations pour commencer",
     "home.loadTutorials.requestFailedErrorMessage": "Échec de la requête avec le code de statut : {status}",
     "home.loadTutorials.unableToLoadErrorMessage": "Impossible de charger les tutoriels",
     "home.manageData.devToolsButtonLabel": "Outils de développement",
@@ -2833,10 +3575,13 @@
     "home.manageData.stackManagementButtonLabel": "Gestion de la suite",
     "home.pageTitle": "Accueil",
     "home.recentlyAccessed.recentlyViewedTitle": "Récemment consulté",
+    "home.sampleData.customIntegrationsDescription": "Explorez les données dans Kibana avec ces ensembles de données en un clic.",
+    "home.sampleData.customIntegrationsTitle": "Exemple de données",
     "home.sampleData.ecommerceSpec.ordersTitle": "[e-commerce] Commandes",
     "home.sampleData.ecommerceSpec.promotionTrackingTitle": "[e-commerce] Suivi des promotions",
     "home.sampleData.ecommerceSpec.revenueDashboardDescription": "Analyser des commandes et revenus e-commerce",
     "home.sampleData.ecommerceSpec.revenueDashboardTitle": "[e-commerce] Tableau de bord des revenus",
+    "home.sampleData.ecommerceSpec.salesCountMapTitle": "[e-commerce] Carte du nombre de ventes",
     "home.sampleData.ecommerceSpec.soldProductsPerDayTitle": "[e-commerce] Produits vendus par jour",
     "home.sampleData.ecommerceSpecDescription": "Exemple de données, visualisations et tableaux de bord pour le suivi des commandes d’e-commerce.",
     "home.sampleData.ecommerceSpecTitle": "Exemple de commandes d’e-commerce",
@@ -2853,10 +3598,10 @@
     "home.sampleData.logsSpec.bytesDistributionTitle": "[Logs] Distribution des octets",
     "home.sampleData.logsSpec.discoverTitle": "[Logs] Visites",
     "home.sampleData.logsSpec.goalsTitle": "[Logs] Objectifs",
-    "home.sampleData.logsSpec.heatmapTitle": "[Logs] Carte thermique des visiteurs uniques",
+    "home.sampleData.logsSpec.heatmapTitle": "[Logs] Carte thermique de destination unique",
     "home.sampleData.logsSpec.hostVisitsBytesTableTitle": "[Logs] Tableau des hôtes, visites et octets",
     "home.sampleData.logsSpec.responseCodesOverTimeTitle": "[Logs] Codes de réponse sur la durée + annotations",
-    "home.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle": "[Logs] Diagramme de Sankey source-destination",
+    "home.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle": "[Logs] Diagramme de Sankey de système d’exploitation source et destination",
     "home.sampleData.logsSpec.visitorsMapTitle": "[Logs] Mappage des visiteurs",
     "home.sampleData.logsSpec.webTrafficDescription": "Analyser des données de log factices relatives au trafic Internet du site d'Elastic",
     "home.sampleData.logsSpec.webTrafficTitle": "[Logs] Trafic Internet",
@@ -2882,18 +3627,23 @@
     "home.sampleDataSetCard.viewDataButtonAriaLabel": "Consulter {datasetName}",
     "home.sampleDataSetCard.viewDataButtonLabel": "Consulter les données",
     "home.solutionsSection.sectionTitle": "Choisir votre solution",
-    "home.tryButtonLabel": "Ajouter des données",
-    "home.tutorial.addDataToKibanaTitle": "Ajouter des données",
+    "home.tryButtonLabel": "Ajouter des intégrations",
+    "home.tutorial.addDataToKibanaDescription": "En plus d’ajouter {integrationsLink}, vous pouvez essayer l’exemple de données ou charger vos propres données.",
+    "home.tutorial.addDataToKibanaDescription.integrations": "intégrations",
+    "home.tutorial.addDataToKibanaTitle": "Autres façons d’ajouter des données",
+    "home.tutorial.backToDirectory": "Retour au répertoire",
     "home.tutorial.card.sampleDataDescription": "Commencez votre exploration de Kibana avec ces ensembles de données \"en un clic\".",
     "home.tutorial.card.sampleDataTitle": "Exemple de données",
     "home.tutorial.elasticCloudButtonLabel": "Elastic Cloud",
-    "home.tutorial.instruction_variant.fleet": "Elastic APM (bêta) dans Fleet",
+    "home.tutorial.instruction_variant.fleet": "Elastic APM dans Fleet",
     "home.tutorial.instructionSet.checkStatusButtonLabel": "Vérifier le statut",
     "home.tutorial.instructionSet.customizeLabel": "Personnaliser les extraits de code",
     "home.tutorial.instructionSet.noDataLabel": "Aucune donnée trouvée",
     "home.tutorial.instructionSet.statusCheckTitle": "Vérification du statut",
     "home.tutorial.instructionSet.successLabel": "Réussite",
-    "home.tutorial.introduction.betaLabel": "Version bêta",
+    "home.tutorial.introduction.beatsBadgeLabel": "Beats",
+    "home.tutorial.introduction.betaLabel": "Bêta",
+    "home.tutorial.introduction.browseAllIntegrationsButton": "Parcourir toutes les intégrations",
     "home.tutorial.introduction.imageAltDescription": "Capture d'écran du tableau de bord principal.",
     "home.tutorial.introduction.viewButtonLabel": "Consulter les champs exportés",
     "home.tutorial.noTutorialLabel": "Tutoriel {tutorialId} introuvable",
@@ -2915,78 +3665,78 @@
     "home.tutorials.activemqLogs.artifacts.dashboards.linkLabel": "Événements d'audit ActiveMQ",
     "home.tutorials.activemqLogs.longDescription": "Collectez les logs ActiveMQ avec Filebeat. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.activemqLogs.nameTitle": "Logs ActiveMQ",
-    "home.tutorials.activemqLogs.shortDescription": "Collectez les logs ActiveMQ avec Filebeat.",
-    "home.tutorials.activemqMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.activemqMetrics.longDescription": "Le module Metricbeat ''activemq'' récupère les indicateurs de monitoring depuis les instances ActiveMQ. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.activemqLogs.shortDescription": "Collectez et analysez les logs à partir des instances ActiveMQ avec Filebeat.",
+    "home.tutorials.activemqMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.activemqMetrics.longDescription": "Le module Metricbeat ''activemq'' récupère les indicateurs depuis les instances ActiveMQ. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.activemqMetrics.nameTitle": "Indicateurs ActiveMQ",
-    "home.tutorials.activemqMetrics.shortDescription": "Récupérez les indicateurs de monitoring depuis les instances ActiveMQ.",
-    "home.tutorials.aerospikeMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.aerospikeMetrics.longDescription": "Le module Metricbeat ''aerospike'' récupère les indicateurs internes d’Aerospike. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.activemqMetrics.shortDescription": "Collectez les indicateurs à partir des instances ActiveMQ avec Metricbeat.",
+    "home.tutorials.aerospikeMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.aerospikeMetrics.longDescription": "Le module Metricbeat ''aerospike'' récupère les indicateurs d’Aerospike. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.aerospikeMetrics.nameTitle": "Indicateurs Aerospike",
-    "home.tutorials.aerospikeMetrics.shortDescription": "Récupérez les indicateurs internes depuis le serveur Aerospike.",
+    "home.tutorials.aerospikeMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs Aerospike avec Metricbeat.",
     "home.tutorials.apacheLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs Apache",
     "home.tutorials.apacheLogs.longDescription": "Le module Filebeat ''apache'' analyse les logs d'accès et d'erreurs créés par le serveur HTTP Apache. [En savoir plus]({learnMoreLink}).",
-    "home.tutorials.apacheLogs.nameTitle": "Logs Apache",
-    "home.tutorials.apacheLogs.shortDescription": "Collectez et analysez les logs d'accès et d'erreurs créés par le serveur HTTP Apache.",
+    "home.tutorials.apacheLogs.nameTitle": "Logs de serveur HTTP Apache",
+    "home.tutorials.apacheLogs.shortDescription": "Collectez et analysez les logs à partir des serveurs HTTP Apache avec Filebeat.",
     "home.tutorials.apacheMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Apache",
-    "home.tutorials.apacheMetrics.longDescription": "Le module Metricbeat ''apache'' récupère les indicateurs internes depuis le serveur HTTP Apache 2. [En savoir plus]({learnMoreLink}).",
-    "home.tutorials.apacheMetrics.nameTitle": "Indicateurs Apache",
-    "home.tutorials.apacheMetrics.shortDescription": "Récupérez les indicateurs internes depuis le serveur HTTP Apache 2.",
+    "home.tutorials.apacheMetrics.longDescription": "Le module Metricbeat ''apache'' récupère les indicateurs depuis le serveur HTTP Apache 2. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.apacheMetrics.nameTitle": "Indicateurs de serveur HTTP Apache",
+    "home.tutorials.apacheMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs HTTP Apache avec Metricbeat.",
     "home.tutorials.auditbeat.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.auditbeat.longDescription": "Utilisez Auditbeat pour collecter les données d'audit de vos hôtes. Ces données incluent les processus, utilisateurs, connexions, informations de socket, accès aux fichiers et bien plus encore. [En savoir plus]({learnMoreLink}).",
-    "home.tutorials.auditbeat.nameTitle": "Auditbeat",
-    "home.tutorials.auditbeat.shortDescription": "Collectez des données d'audit de vos hôtes.",
+    "home.tutorials.auditbeat.nameTitle": "Événements Auditbeat",
+    "home.tutorials.auditbeat.shortDescription": "Collectez les événements à partir de vos serveurs avec Auditbeat.",
     "home.tutorials.auditdLogs.artifacts.dashboards.linkLabel": "Événements d'audit",
     "home.tutorials.auditdLogs.longDescription": "Le module collecte et analyse les logs du démon d'audit (''auditd'') [En savoir plus]({learnMoreLink}).",
     "home.tutorials.auditdLogs.nameTitle": "Logs auditd",
-    "home.tutorials.auditdLogs.shortDescription": "Collectez les logs du démon Linux auditd.",
+    "home.tutorials.auditdLogs.shortDescription": "Collectez et analysez les logs à partir du démon d’audit Linux avec Filebeat.",
     "home.tutorials.awsLogs.artifacts.dashboards.linkLabel": "Tableau de bord du log d'accès au serveur AWS S3",
     "home.tutorials.awsLogs.longDescription": "Collectez des logs AWS en les exportant vers un compartiment S3 configuré avec la notification SQS [En savoir plus]({learnMoreLink}).",
     "home.tutorials.awsLogs.nameTitle": "Logs AWS S3",
-    "home.tutorials.awsLogs.shortDescription": "Collectez des logs AWS à partir du compartiment S3 avec Filebeat.",
+    "home.tutorials.awsLogs.shortDescription": "Collectez et analysez les logs à partir des compartiments S3 AWS avec Filebeat.",
     "home.tutorials.awsMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs AWS",
-    "home.tutorials.awsMetrics.longDescription": "Le module Metricbeat ''aws'' récupère les indicateurs de monitoring depuis les API AWS et Cloudwatch. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.awsMetrics.longDescription": "Le module Metricbeat ''aws'' récupère les indicateurs depuis les API AWS et Cloudwatch. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.awsMetrics.nameTitle": "Indicateurs AWS",
-    "home.tutorials.awsMetrics.shortDescription": "Récupérez les indicateurs de monitoring pour les instances EC2 depuis les API AWS et Cloudwatch.",
+    "home.tutorials.awsMetrics.shortDescription": "Collectez les indicateurs pour les instances EC2 depuis les API AWS et Cloudwatch avec Metricbeat.",
     "home.tutorials.azureLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs Azure",
     "home.tutorials.azureLogs.longDescription": "Le module Filebeat ''azure'' collecte les logs d’activité et d’audit Azure. [Learn more]({learnMoreLink}).",
     "home.tutorials.azureLogs.nameTitle": "Logs Azure",
-    "home.tutorials.azureLogs.shortDescription": "Collectez les logs d’activité et d’audit Azure.",
+    "home.tutorials.azureLogs.shortDescription": "Collectez et analysez les logs à partir d’Azure avec Filebeat.",
     "home.tutorials.azureMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Azure",
     "home.tutorials.azureMetrics.longDescription": "Le module Metricbeat ''azure'' récupère les indicateurs de monitoring Azure. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.azureMetrics.nameTitle": "Indicateurs Azure",
-    "home.tutorials.azureMetrics.shortDescription": "Récupérez les indicateurs de monitoring Azure.",
+    "home.tutorials.azureMetrics.shortDescription": "Collectez les indicateurs à partir d’Azure avec Metricbeat.",
     "home.tutorials.barracudaLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.barracudaLogs.longDescription": "Ce module permet de recevoir les logs Barracuda Web Application Firewall par le biais de Syslog ou d’un fichier. [Learn more]({learnMoreLink}).",
     "home.tutorials.barracudaLogs.nameTitle": "Logs Barracuda",
-    "home.tutorials.barracudaLogs.shortDescription": "Collectez les logs Barracuda Web Application Firewall par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.barracudaLogs.shortDescription": "Collectez et analysez les logs à partir de Barracuda Web Application Firewall avec Filebeat.",
     "home.tutorials.bluecoatLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.bluecoatLogs.longDescription": "Ce module permet de recevoir les logs Blue Coat Director par le biais de Syslog ou d’un fichier. [Learn more]({learnMoreLink}).",
     "home.tutorials.bluecoatLogs.nameTitle": "Logs Blue Coat Director",
-    "home.tutorials.bluecoatLogs.shortDescription": "Collectez les logs Blue Coat Director par le biais de Syslog ou d'un fichier.",
+    "home.tutorials.bluecoatLogs.shortDescription": "Collectez et analysez les logs à partir de Blue Coat Director avec Filebeat.",
     "home.tutorials.cefLogs.artifacts.dashboards.linkLabel": "Tableau de bord d'aperçu du réseau CEF",
     "home.tutorials.cefLogs.longDescription": "Ce module permet de recevoir des données Common Event Format (CEF) par le biais de Syslog. Lorsque des messages sont reçus par le biais du protocole Syslog, l'entrée Syslog analyse l'en-tête et définit la valeur d'horodatage. Puis le processeur est appliqué pour analyser les données CEF. Les données décodées sont alors écrites dans un champ objet ''cef''. Enfin, tous les champs Elastic Common Schema (ECS) ayant des correspondances CEF sont renseignés. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.cefLogs.nameTitle": "Logs CEF",
-    "home.tutorials.cefLogs.shortDescription": "Collectez des logs Common Event Format (CEF) par le biais de Syslog.",
-    "home.tutorials.cephMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.cephMetrics.longDescription": "Le module Metricbeat ''ceph'' récupère les indicateurs internes depuis Ceph. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.cefLogs.shortDescription": "Collectez et analysez les logs à partir de Common Event Format (CEF) avec Filebeat.",
+    "home.tutorials.cephMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.cephMetrics.longDescription": "Le module Metricbeat ''ceph'' récupère les indicateurs depuis Ceph. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.cephMetrics.nameTitle": "Indicateurs Ceph",
-    "home.tutorials.cephMetrics.shortDescription": "Récupérez les indicateurs internes depuis le serveur Ceph.",
+    "home.tutorials.cephMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs Ceph avec Metricbeat.",
     "home.tutorials.checkpointLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.checkpointLogs.longDescription": "Il s'agit d'un module pour les logs de pare-feu Check Point. Il prend en charge les logs de l’exportateur de journaux au format Syslog. [Learn more]({learnMoreLink}).",
     "home.tutorials.checkpointLogs.nameTitle": "Logs Check Point",
-    "home.tutorials.checkpointLogs.shortDescription": "Collectez des logs de pare-feu Check Point.",
+    "home.tutorials.checkpointLogs.shortDescription": "Collectez et analysez les logs à partir des pare-feu Check Point avec Filebeat.",
     "home.tutorials.ciscoLogs.artifacts.dashboards.linkLabel": "Tableau de bord de pare-feu ASA",
     "home.tutorials.ciscoLogs.longDescription": "Il s'agit d'un module pour les logs de dispositifs réseau Cisco (ASA, FTD, IOS, Nexus). Il inclut les ensembles de fichiers suivants pour la réception des logs par le biais de Syslog ou d'un ficher. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.ciscoLogs.nameTitle": "Logs Cisco",
-    "home.tutorials.ciscoLogs.shortDescription": "Collectez les logs de dispositifs réseau Cisco par le biais de Syslog ou d'un fichier.",
+    "home.tutorials.ciscoLogs.shortDescription": "Collectez et analysez les logs à partir des périphériques réseau Cisco avec Filebeat.",
     "home.tutorials.cloudwatchLogs.longDescription": "Collectez les logs Cloudwatch en déployant Functionbeat à des fins d'exécution en tant que fonction AWS Lambda. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.cloudwatchLogs.nameTitle": "Logs Cloudwatch AWS",
-    "home.tutorials.cloudwatchLogs.shortDescription": "Collectez les logs Cloudwatch avec Functionbeat.",
+    "home.tutorials.cloudwatchLogs.shortDescription": "Collectez et analysez les logs à partir d’AWS Cloudwatch avec Functionbeat.",
     "home.tutorials.cockroachdbMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs CockroachDB",
-    "home.tutorials.cockroachdbMetrics.longDescription": "Le module Metricbeat ''cockroachbd'' récupère les indicateurs de monitoring depuis CockroachDB. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.cockroachdbMetrics.longDescription": "Le module Metricbeat ''cockroachbd'' récupère les indicateurs depuis CockroachDB. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.cockroachdbMetrics.nameTitle": "Indicateurs CockroachDB",
-    "home.tutorials.cockroachdbMetrics.shortDescription": "Récupérez les indicateurs de monitoring depuis le serveur CockroachDB.",
+    "home.tutorials.cockroachdbMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs CockroachDB avec Metricbeat.",
     "home.tutorials.common.auditbeat.cloudInstructions.gettingStarted.title": "Commencer",
     "home.tutorials.common.auditbeat.premCloudInstructions.gettingStarted.title": "Commencer",
     "home.tutorials.common.auditbeat.premInstructions.gettingStarted.title": "Commencer",
@@ -2998,12 +3748,16 @@
     "home.tutorials.common.auditbeatCloudInstructions.config.rpmTitle": "Modifier la configuration",
     "home.tutorials.common.auditbeatCloudInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion pour Elastic Cloud :",
     "home.tutorials.common.auditbeatCloudInstructions.config.windowsTitle": "Modifier la configuration",
+    "home.tutorials.common.auditbeatInstructions.config.debTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.auditbeatInstructions.config.debTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.auditbeatInstructions.config.debTitle": "Modifier la configuration",
+    "home.tutorials.common.auditbeatInstructions.config.osxTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.auditbeatInstructions.config.osxTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.auditbeatInstructions.config.osxTitle": "Modifier la configuration",
+    "home.tutorials.common.auditbeatInstructions.config.rpmTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.auditbeatInstructions.config.rpmTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.auditbeatInstructions.config.rpmTitle": "Modifier la configuration",
+    "home.tutorials.common.auditbeatInstructions.config.windowsTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.auditbeatInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.auditbeatInstructions.config.windowsTitle": "Modifier la configuration",
     "home.tutorials.common.auditbeatInstructions.install.debTextPost": "Vous cherchez les packages 32 bits ? Consultez la [page de téléchargement]({linkUrl}).",
@@ -3030,7 +3784,7 @@
     "home.tutorials.common.auditbeatStatusCheck.successText": "Des données ont été reçues.",
     "home.tutorials.common.auditbeatStatusCheck.text": "Vérifier que des données sont reçues d'Auditbeat",
     "home.tutorials.common.auditbeatStatusCheck.title": "Statut",
-    "home.tutorials.common.cloudInstructions.passwordAndResetLink": "Où {passwordTemplate} est le mot de passe de l'utilisateur ''elastic''.\\{#config.cloud.profileUrl\\}\n      Mot de passe oublié ? [Réinitialiser dans Elastic Cloud](\\{config.cloud.baseUrl\\}\\{config.cloud.profileUrl\\}).\n      \\{/config.cloud.profileUrl\\}",
+    "home.tutorials.common.cloudInstructions.passwordAndResetLink": "Où {passwordTemplate} est le mot de passe de l'utilisateur ''elastic''.\\{#config.cloud.profileUrl\\}\n      Mot de passe oublié ? [Réinitialiser dans Elastic Cloud](\\{config.cloud.baseUrl\\}\\{config.cloud.deploymentUrl\\}/security).\n      \\{/config.cloud.profileUrl\\}",
     "home.tutorials.common.filebeat.cloudInstructions.gettingStarted.title": "Commencer",
     "home.tutorials.common.filebeat.premCloudInstructions.gettingStarted.title": "Commencer",
     "home.tutorials.common.filebeat.premInstructions.gettingStarted.title": "Commencer",
@@ -3052,12 +3806,16 @@
     "home.tutorials.common.filebeatEnableInstructions.windowsTextPost": "Modifiez les paramètres dans le fichier ''modules.d/{moduleName}.yml''.",
     "home.tutorials.common.filebeatEnableInstructions.windowsTextPre": "Dans le dossier {path}, exécutez la commande suivante :",
     "home.tutorials.common.filebeatEnableInstructions.windowsTitle": "Activer et configurer le module {moduleName}",
+    "home.tutorials.common.filebeatInstructions.config.debTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.filebeatInstructions.config.debTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.filebeatInstructions.config.debTitle": "Modifier la configuration",
+    "home.tutorials.common.filebeatInstructions.config.osxTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.filebeatInstructions.config.osxTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.filebeatInstructions.config.osxTitle": "Modifier la configuration",
+    "home.tutorials.common.filebeatInstructions.config.rpmTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.filebeatInstructions.config.rpmTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.filebeatInstructions.config.rpmTitle": "Modifier la configuration",
+    "home.tutorials.common.filebeatInstructions.config.windowsTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.filebeatInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.filebeatInstructions.config.windowsTitle": "Modifier la configuration",
     "home.tutorials.common.filebeatInstructions.install.debTextPost": "Vous cherchez les packages 32 bits ? Consultez la [page de téléchargement]({linkUrl}).",
@@ -3098,8 +3856,10 @@
     "home.tutorials.common.functionbeatEnableOnPremInstructions.defaultTitle": "Configurer le groupe de logs Cloudwatch",
     "home.tutorials.common.functionbeatEnableOnPremInstructionsOSXLinux.textPre": "Modifiez les paramètres dans le fichier ''functionbeat.yml''.",
     "home.tutorials.common.functionbeatEnableOnPremInstructionsWindows.textPre": "Modifiez les paramètres dans le fichier {path}.",
+    "home.tutorials.common.functionbeatInstructions.config.osxTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.functionbeatInstructions.config.osxTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.functionbeatInstructions.config.osxTitle": "Configurer le cluster Elastic",
+    "home.tutorials.common.functionbeatInstructions.config.windowsTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.functionbeatInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.functionbeatInstructions.config.windowsTitle": "Modifier la configuration",
     "home.tutorials.common.functionbeatInstructions.deploy.osxTextPre": "Ceci permet d'installer Functionbeat en tant que fonction Lambda. La commande ''setup'' vérifie la configuration d'Elasticsearch et charge le modèle d'indexation Kibana. L'omission de cette commande est normalement sans risque.",
@@ -3140,12 +3900,16 @@
     "home.tutorials.common.heartbeatEnableOnPremInstructions.osxTextPre": "Modifiez le paramètre ''heartbeat.monitors'' dans le fichier ''heartbeat.yml''.",
     "home.tutorials.common.heartbeatEnableOnPremInstructions.rpmTextPre": "Modifiez le paramètre ''heartbeat.monitors'' dans le fichier ''heartbeat.yml''.",
     "home.tutorials.common.heartbeatEnableOnPremInstructions.windowsTextPre": "Modifiez le paramètre ''heartbeat.monitors'' dans le fichier ''heartbeat.yml''.",
+    "home.tutorials.common.heartbeatInstructions.config.debTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.heartbeatInstructions.config.debTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.heartbeatInstructions.config.debTitle": "Modifier la configuration",
+    "home.tutorials.common.heartbeatInstructions.config.osxTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.heartbeatInstructions.config.osxTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.heartbeatInstructions.config.osxTitle": "Modifier la configuration",
+    "home.tutorials.common.heartbeatInstructions.config.rpmTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.heartbeatInstructions.config.rpmTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.heartbeatInstructions.config.rpmTitle": "Modifier la configuration",
+    "home.tutorials.common.heartbeatInstructions.config.windowsTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.heartbeatInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.heartbeatInstructions.config.windowsTitle": "Modifier la configuration",
     "home.tutorials.common.heartbeatInstructions.install.debTextPost": "Vous cherchez les packages 32 bits ? Consultez la [page de téléchargement]({link}).",
@@ -3199,12 +3963,16 @@
     "home.tutorials.common.metricbeatEnableInstructions.windowsTextPost": "Modifiez les paramètres dans le fichier ''modules.d/{moduleName}.yml''.",
     "home.tutorials.common.metricbeatEnableInstructions.windowsTextPre": "Dans le dossier {path}, exécutez la commande suivante :",
     "home.tutorials.common.metricbeatEnableInstructions.windowsTitle": "Activer et configurer le module {moduleName}",
+    "home.tutorials.common.metricbeatInstructions.config.debTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.metricbeatInstructions.config.debTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.metricbeatInstructions.config.debTitle": "Modifier la configuration",
+    "home.tutorials.common.metricbeatInstructions.config.osxTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.metricbeatInstructions.config.osxTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.metricbeatInstructions.config.osxTitle": "Modifier la configuration",
+    "home.tutorials.common.metricbeatInstructions.config.rpmTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.metricbeatInstructions.config.rpmTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.metricbeatInstructions.config.rpmTitle": "Modifier la configuration",
+    "home.tutorials.common.metricbeatInstructions.config.windowsTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.metricbeatInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.metricbeatInstructions.config.windowsTitle": "Modifier la configuration",
     "home.tutorials.common.metricbeatInstructions.install.debTextPost": "Vous cherchez les packages 32 bits ? Consultez la [page de téléchargement]({link}).",
@@ -3235,10 +4003,11 @@
     "home.tutorials.common.premCloudInstructions.option2.textPre": "Si vous exécutez cette instance Kibana sur une instance Elasticsearch hébergée, passez à la configuration manuelle.\n\nEnregistrez le point de terminaison **Elasticsearch** en tant que {urlTemplate} et le cluster **Mot de passe** en tant que {passwordTemplate} pour les conserver.",
     "home.tutorials.common.premCloudInstructions.option2.title": "Option 2 : connecter un Kibana local à une instance cloud",
     "home.tutorials.common.winlogbeat.cloudInstructions.gettingStarted.title": "Premiers pas",
-    "home.tutorials.common.winlogbeat.premCloudInstructions.gettingStarted.title": "Premiers pas",
-    "home.tutorials.common.winlogbeat.premInstructions.gettingStarted.title": "Premiers pas",
+    "home.tutorials.common.winlogbeat.premCloudInstructions.gettingStarted.title": "Commencer",
+    "home.tutorials.common.winlogbeat.premInstructions.gettingStarted.title": "Commencer",
     "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion pour Elastic Cloud :",
     "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTitle": "Modifier la configuration",
+    "home.tutorials.common.winlogbeatInstructions.config.windowsTextPostMarkdown": "Où {passwordTemplate} est le mot de passe de l'utilisateur \"elastic\", {esUrlTemplate} est l'URL d'Elasticsearch et {kibanaUrlTemplate} est l'URL de Kibana. Pour [configurer le SSL]({configureSslUrl}) avec le             certificat par défaut généré par Elasticsearch, ajoutez son empreinte digitale dans {esCertFingerprintTemplate}.",
     "home.tutorials.common.winlogbeatInstructions.config.windowsTextPre": "Modifiez {path} afin de définir les informations de connexion :",
     "home.tutorials.common.winlogbeatInstructions.config.windowsTitle": "Modifier la configuration",
     "home.tutorials.common.winlogbeatInstructions.install.windowsTextPost": "Modifiez les paramètres sous \"output.elasticsearch\" dans le fichier {path} afin de pointer vers votre installation Elasticsearch.",
@@ -3252,307 +4021,307 @@
     "home.tutorials.common.winlogbeatStatusCheck.text": "Vérifier que des données sont reçues de Winlogbeat",
     "home.tutorials.common.winlogbeatStatusCheck.title": "Statut du module",
     "home.tutorials.consulMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Consul",
-    "home.tutorials.consulMetrics.longDescription": "Le module Metricbeat \"consul\" récupère des indicateurs de monitoring depuis Consul. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.consulMetrics.longDescription": "Le module Metricbeat \"consul\" récupère des indicateurs depuis Consul. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.consulMetrics.nameTitle": "Indicateurs Consul",
-    "home.tutorials.consulMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis le serveur Consul.",
+    "home.tutorials.consulMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs Consul avec Metricbeat.",
     "home.tutorials.corednsLogs.artifacts.dashboards.linkLabel": "Aperçu de [Filebeat CoreDNS]",
     "home.tutorials.corednsLogs.longDescription": "Il s'agit d'un module Filebeat pour CoreDNS. Celui-ci prend en charge les déploiements CoreDNS autonomes et les déploiements CoreDNS dans Kubernetes. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.corednsLogs.nameTitle": "Logs CoreDNS",
-    "home.tutorials.corednsLogs.shortDescription": "Collectez les logs CoreDNS.",
-    "home.tutorials.corednsMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.corednsMetrics.longDescription": "Le module Metricbeat \"coredns\" récupère des indicateurs de monitoring depuis CoreDNS. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.corednsLogs.shortDescription": "Collectez et analysez les logs à partir des serveurs CoreDNS avec Filebeat.",
+    "home.tutorials.corednsMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.corednsMetrics.longDescription": "Le module Metricbeat \"coredns\" récupère des indicateurs depuis CoreDNS. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.corednsMetrics.nameTitle": "Indicateurs CoreDNS",
-    "home.tutorials.corednsMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis le serveur CoreDNS.",
-    "home.tutorials.couchbaseMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.couchbaseMetrics.longDescription": "Le module Metricbeat \"couchbase\" récupère des indicateurs internes depuis Couchbase. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.corednsMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs CoreDNS avec Metricbeat.",
+    "home.tutorials.couchbaseMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.couchbaseMetrics.longDescription": "Le module Metricbeat \"couchbase\" récupère des indicateurs depuis Couchbase. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.couchbaseMetrics.nameTitle": "Indicateurs Couchbase",
-    "home.tutorials.couchbaseMetrics.shortDescription": "Récupérez des indicateurs internes depuis Couchbase.",
+    "home.tutorials.couchbaseMetrics.shortDescription": "Collectez les indicateurs à partir des bases de données Couchbase avec Metricbeat.",
     "home.tutorials.couchdbMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs CouchDB",
-    "home.tutorials.couchdbMetrics.longDescription": "Le module Metricbeat \"couchdb\" récupère des indicateurs de monitoring depuis CouchDB. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.couchdbMetrics.longDescription": "Le module Metricbeat \"couchdb\" récupère des indicateurs depuis CouchDB. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.couchdbMetrics.nameTitle": "Indicateurs CouchDB",
-    "home.tutorials.couchdbMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis le serveur CouchdB.",
+    "home.tutorials.couchdbMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs CouchDB avec Metricbeat.",
     "home.tutorials.crowdstrikeLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.crowdstrikeLogs.longDescription": "Il s'agit du module Filebeat pour CrowdStrike Falcon utilisant le [connecteur SIEM](https://www.crowdstrike.com/blog/tech-center/integrate-with-your-siem) Falcon.         Ce module collecte ces données, les convertit en ECS et les ingère pour les afficher dans le SIEM.         Par défaut, le connecteur SIEM Falcon génère les données d'événement de l'API de streaming Falcon au format JSON. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.crowdstrikeLogs.nameTitle": "Logs CrowdStrike",
-    "home.tutorials.crowdstrikeLogs.shortDescription": "Collectez des logs CrowdStrike Falcon à l'aide du connecteur SIEM Falcon.",
+    "home.tutorials.crowdstrikeLogs.shortDescription": "Collectez et analysez les logs à partir de CrowdStrike Falcon à l’aide du Falcon SIEM Connector avec Filebeat.",
     "home.tutorials.cylanceLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.cylanceLogs.longDescription": "Ce module permet de recevoir des logs CylancePROTECT par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.cylanceLogs.nameTitle": "Logs CylancePROTECT",
-    "home.tutorials.cylanceLogs.shortDescription": "Collectez des logs CylancePROTECT par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.cylanceLogs.shortDescription": "Collectez et analysez les logs à partir de CylancePROTECT avec Filebeat.",
     "home.tutorials.dockerMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Docker",
     "home.tutorials.dockerMetrics.longDescription": "Le module Metricbeat \"docker\" récupère des indicateurs depuis le serveur Docker. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.dockerMetrics.nameTitle": "Indicateurs Docker",
-    "home.tutorials.dockerMetrics.shortDescription": "Récupérez des indicateurs concernant vos conteneurs Docker.",
-    "home.tutorials.dropwizardMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.dropwizardMetrics.longDescription": "Le module Metricbeat \"dropwizard\" récupère des indicateurs internes depuis l'application Java Dropwizard. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.dockerMetrics.shortDescription": "Collectez les indicateurs à partir des conteneurs Docker avec Metricbeat.",
+    "home.tutorials.dropwizardMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.dropwizardMetrics.longDescription": "Le module Metricbeat \"dropwizard\" récupère des indicateurs depuis l'application Java Dropwizard. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.dropwizardMetrics.nameTitle": "Indicateurs Dropwizard",
-    "home.tutorials.dropwizardMetrics.shortDescription": "Récupérez des indicateurs internes depuis l'application Java Dropwizard.",
-    "home.tutorials.elasticsearchLogs.artifacts.application.label": "Discover",
+    "home.tutorials.dropwizardMetrics.shortDescription": "Collectez les indicateurs à partir des applications Dropwizard Java avec Metricbeat.",
+    "home.tutorials.elasticsearchLogs.artifacts.application.label": "Découverte",
     "home.tutorials.elasticsearchLogs.longDescription": "Le module Filebeat \"elasticsearch\" analyse les logs créés par Elasticsearch. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.elasticsearchLogs.nameTitle": "Logs Elasticsearch",
-    "home.tutorials.elasticsearchLogs.shortDescription": "Collectez et analysez les logs créés par Elasticsearch.",
-    "home.tutorials.elasticsearchMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.elasticsearchMetrics.longDescription": "Le module Metricbeat \"elasticsearch\" récupère des indicateurs internes depuis Elasticsearch. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.elasticsearchLogs.shortDescription": "Collectez et analysez les logs à partir des clusters Elasticsearch avec Filebeat.",
+    "home.tutorials.elasticsearchMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.elasticsearchMetrics.longDescription": "Le module Metricbeat \"elasticsearch\" récupère des indicateurs depuis Elasticsearch. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.elasticsearchMetrics.nameTitle": "Indicateurs Elasticsearch",
-    "home.tutorials.elasticsearchMetrics.shortDescription": "Récupérez des indicateurs internes depuis Elasticsearch.",
+    "home.tutorials.elasticsearchMetrics.shortDescription": "Collectez les indicateurs à partir de clusters Elasticsearch avec Metricbeat.",
     "home.tutorials.envoyproxyLogs.artifacts.dashboards.linkLabel": "Aperçu d'Envoy Proxy",
     "home.tutorials.envoyproxyLogs.longDescription": "Il s'agit d'un module Filebeat pour le log d'accès à Envoy Proxy (https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/access_log). Celui-ci prend en charge les déploiements autonomes et les déploiements Envoy Proxy dans Kubernetes. [Learn more]({learnMoreLink}).",
     "home.tutorials.envoyproxyLogs.nameTitle": "Logs Envoy Proxy",
-    "home.tutorials.envoyproxyLogs.shortDescription": "Collectez des logs Envoy Proxy.",
-    "home.tutorials.envoyproxyMetrics.longDescription": "Le module Metricbeat \"envoyproxy\" récupère des indicateurs de monitoring depuis Envoy Proxy. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.envoyproxyLogs.shortDescription": "Collectez et analysez les logs à partir d’Envoy Proxy avec Filebeat.",
+    "home.tutorials.envoyproxyMetrics.longDescription": "Le module Metricbeat \"envoyproxy\" récupère des indicateurs depuis Envoy Proxy. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.envoyproxyMetrics.nameTitle": "Indicateurs Envoy Proxy",
-    "home.tutorials.envoyproxyMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis Envoy Proxy.",
-    "home.tutorials.etcdMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.etcdMetrics.longDescription": "Le module Metricbeat \"etcd\" récupère des indicateurs internes depuis Etcd. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.envoyproxyMetrics.shortDescription": "Collectez les indicateurs à partir d’Envoy Proxy avec Metricbeat.",
+    "home.tutorials.etcdMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.etcdMetrics.longDescription": "Le module Metricbeat \"etcd\" récupère des indicateurs depuis Etcd. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.etcdMetrics.nameTitle": "Indicateurs Etcd",
-    "home.tutorials.etcdMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur Etcd.",
+    "home.tutorials.etcdMetrics.shortDescription": "Collectez les indicateurs à partir des serveurs Etcd avec Metricbeat.",
     "home.tutorials.f5Logs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.f5Logs.longDescription": "Ce module permet de recevoir des logs Big-IP Access Policy Manager par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.f5Logs.nameTitle": "Logs F5",
-    "home.tutorials.f5Logs.shortDescription": "Collectez des logs F5 Big-IP Access Policy Manager par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.f5Logs.shortDescription": "Collectez et analysez les logs à partir de F5 Big-IP Access Policy Manager avec Filebeat.",
     "home.tutorials.fortinetLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.fortinetLogs.longDescription": "Il s'agit d'un module pour les logs Fortinet FortiOS envoyés au format Syslog. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.fortinetLogs.nameTitle": "Logs Fortinet",
-    "home.tutorials.fortinetLogs.shortDescription": "Collectez des logs Fortinet FortiOS par le biais de Syslog.",
+    "home.tutorials.fortinetLogs.shortDescription": "Collectez et analysez les logs à partir de Fortinet FortiOS avec Filebeat.",
     "home.tutorials.gcpLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs d'audit",
     "home.tutorials.gcpLogs.longDescription": "Il s'agit d'un module pour les logs Google Cloud. Il prend en charge la lecture des logs d'audit, de flux VPC et de pare-feu qui ont été exportés depuis Stackdriver dans un récepteur de rubriques Google Pub/Sub. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.gcpLogs.nameTitle": "Logs Google Cloud",
-    "home.tutorials.gcpLogs.shortDescription": "Collectez des logs d'audit, de pare-feu et de flux VPC Google Cloud.",
+    "home.tutorials.gcpLogs.shortDescription": "Collectez et analysez les logs à partir de Google Cloud Platform avec Filebeat.",
     "home.tutorials.gcpMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Google Cloud",
-    "home.tutorials.gcpMetrics.longDescription": "Le module Metricbeat \"gcp\" récupère des indicateurs de monitoring depuis Google Cloud Platform à l'aide de l'API de monitoring Stackdriver. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.gcpMetrics.longDescription": "Le module Metricbeat \"gcp\" récupère des indicateurs depuis Google Cloud Platform à l'aide de l'API de monitoring Stackdriver. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.gcpMetrics.nameTitle": "Indicateurs Google Cloud",
-    "home.tutorials.gcpMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis Google Cloud Platform à l'aide de l'API de monitoring Stackdriver.",
+    "home.tutorials.gcpMetrics.shortDescription": "Collectez les indicateurs à partir de Google Cloud Platform avec Metricbeat.",
     "home.tutorials.golangMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Golang",
-    "home.tutorials.golangMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs internes depuis une application Golang. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.golangMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs depuis une application Golang. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.golangMetrics.nameTitle": "Indicateurs Golang",
-    "home.tutorials.golangMetrics.shortDescription": "Récupérez des indicateurs internes depuis une application Golang.",
+    "home.tutorials.golangMetrics.shortDescription": "Collectez les indicateurs à partir d’applications Golang avec Metricbeat.",
     "home.tutorials.gsuiteLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.gsuiteLogs.longDescription": "Il s'agit d'un module pour l'ingestion de données depuis les différentes API de rapports d'audit GSuite. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.gsuiteLogs.nameTitle": "Logs GSuite",
-    "home.tutorials.gsuiteLogs.shortDescription": "Collectez des rapports d'activité GSuite.",
+    "home.tutorials.gsuiteLogs.shortDescription": "Collectez et analysez les rapports d’activité à partir de GSuite avec Filebeat.",
     "home.tutorials.haproxyLogs.artifacts.dashboards.linkLabel": "Aperçu de HAProxy",
     "home.tutorials.haproxyLogs.longDescription": "Le module collecte et analyse les logs d'un processus (\"haproxy\") [En savoir plus]({learnMoreLink}).",
     "home.tutorials.haproxyLogs.nameTitle": "Logs HAProxy",
-    "home.tutorials.haproxyLogs.shortDescription": "Collectez des logs HAProxy.",
-    "home.tutorials.haproxyMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.haproxyMetrics.longDescription": "Le module Metricbeat \"haproxy\" récupère des indicateurs internes depuis HAProxy. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.haproxyLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs HAProxy avec Filebeat.",
+    "home.tutorials.haproxyMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.haproxyMetrics.longDescription": "Le module Metricbeat \"haproxy\" récupère des indicateurs depuis HAProxy. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.haproxyMetrics.nameTitle": "Indicateurs HAProxy",
-    "home.tutorials.haproxyMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur HAProxy.",
+    "home.tutorials.haproxyMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs HAProxy avec Metricbeat.",
     "home.tutorials.ibmmqLogs.artifacts.dashboards.linkLabel": "Événements IBM MQ",
     "home.tutorials.ibmmqLogs.longDescription": "Collectez des logs IBM MQ avec Filebeat. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.ibmmqLogs.nameTitle": "Logs IBM MQ",
-    "home.tutorials.ibmmqLogs.shortDescription": "Collectez des logs IBM MQ avec Filebeat.",
-    "home.tutorials.ibmmqMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.ibmmqMetrics.longDescription": "Le module Metricbeat \"ibmmq\" récupère des indicateurs de monitoring depuis les instances IBM MQ. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.ibmmqLogs.shortDescription": "Collectez et analysez les logs à partir d’IBM MQ avec Filebeat.",
+    "home.tutorials.ibmmqMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.ibmmqMetrics.longDescription": "Le module Metricbeat \"ibmmq\" récupère des indicateurs depuis les instances IBM MQ. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.ibmmqMetrics.nameTitle": "Indicateurs IBM MQ",
-    "home.tutorials.ibmmqMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis les instances IBM MQ.",
+    "home.tutorials.ibmmqMetrics.shortDescription": "Collectez les indicateurs à partir d’instances IBM MQ avec Metricbeat.",
     "home.tutorials.icingaLogs.artifacts.dashboards.linkLabel": "Log principal Icinga",
     "home.tutorials.icingaLogs.longDescription": "Le module analyse le log principal et les logs de débogage et de démarrage d'[Icinga](https://www.icinga.com/products/icinga-2/). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.icingaLogs.nameTitle": "Logs Icinga",
-    "home.tutorials.icingaLogs.shortDescription": "Collectez le log principal et les logs de débogage et de démarrage d'Icinga.",
+    "home.tutorials.icingaLogs.shortDescription": "Collectez et analysez les logs principaux, de débogage et de démarrage à partir d’Icinga avec Filebeat.",
     "home.tutorials.iisLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs IIS",
     "home.tutorials.iisLogs.longDescription": "Le module Filebeat \"iis\" analyse les logs d'accès et d'erreurs créés par le serveur HTTP IIS. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.iisLogs.nameTitle": "Logs IIS",
-    "home.tutorials.iisLogs.shortDescription": "Collectez et analysez les logs d'accès et d'erreurs créés par le serveur HTTP IIS.",
+    "home.tutorials.iisLogs.shortDescription": "Collectez et analysez les logs à partir d’accès et d’erreurs à partir des serveurs HTTP IIS avec Filebeat.",
     "home.tutorials.iisMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs IIS",
     "home.tutorials.iisMetrics.longDescription": "Le module Metricbeat \"iis\" collecte les indicateurs du serveur IIS ainsi que des sites web et des pools d'applications en cours d'exécution. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.iisMetrics.nameTitle": "Indicateurs IIS",
-    "home.tutorials.iisMetrics.shortDescription": "Collectez les indicateurs en lien avec le serveur IIS.",
+    "home.tutorials.iisMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs HTTP IIS avec Metricbeat.",
     "home.tutorials.impervaLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.impervaLogs.longDescription": "Ce module permet de recevoir des logs Imperva SecureSphere par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.impervaLogs.nameTitle": "Logs Imperva",
-    "home.tutorials.impervaLogs.shortDescription": "Collectez des logs Imperva SecureSphere par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.impervaLogs.shortDescription": "Collectez et analysez les logs à partir d’Imperva SecureSphere avec Filebeat.",
     "home.tutorials.infobloxLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.infobloxLogs.longDescription": "Ce module permet de recevoir des logs Infoblox NIOS par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.infobloxLogs.nameTitle": "Logs Infoblox",
-    "home.tutorials.infobloxLogs.shortDescription": "Collectez des logs Infoblox NIOS par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.infobloxLogs.shortDescription": "Collectez et analysez les logs à partir d’Infoblox NIOS avec Filebeat.",
     "home.tutorials.iptablesLogs.artifacts.dashboards.linkLabel": "Aperçu d'Iptables",
     "home.tutorials.iptablesLogs.longDescription": "Il s'agit d'un module pour les logs iptables et ip6tables. Il analyse les logs reçus via le réseau par le biais de Syslog ou d’un fichier. En outre, il comprend le préfixe ajouté par certains pare-feux Ubiquiti qui contient le nom de l'ensemble de règles, le numéro de règle et l'action effectuée sur le trafic (autoriser/refuser). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.iptablesLogs.nameTitle": "Logs Iptables",
-    "home.tutorials.iptablesLogs.shortDescription": "Collectez des logs iptables et ip6tables.",
+    "home.tutorials.iptablesLogs.shortDescription": "Collectez et analysez les logs à partir d’iptables et ip6tables avec Filebeat.",
     "home.tutorials.juniperLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.juniperLogs.longDescription": "Ce module permet de recevoir des logs Juniper JUNOS par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.juniperLogs.nameTitle": "Logs Juniper",
-    "home.tutorials.juniperLogs.shortDescription": "Collectez des logs Juniper JUNOS par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.juniperLogs.shortDescription": "Collectez et analysez les logs à partir de Juniper JUNOS avec Filebeat.",
     "home.tutorials.kafkaLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs Kafka",
     "home.tutorials.kafkaLogs.longDescription": "Le module Filebeat \"kafka\" analyse les logs créés par Kafka. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.kafkaLogs.nameTitle": "Logs Kafka",
-    "home.tutorials.kafkaLogs.shortDescription": "Collectez et analysez les logs créés par Kafka.",
-    "home.tutorials.kafkaMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.kafkaMetrics.longDescription": "Le module Metricbeat \"kafka\" récupère des indicateurs internes depuis Kafka. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.kafkaLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs Kafka avec Filebeat.",
+    "home.tutorials.kafkaMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.kafkaMetrics.longDescription": "Le module Metricbeat \"kafka\" récupère des indicateurs depuis Kafka. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.kafkaMetrics.nameTitle": "Indicateurs Kafka",
-    "home.tutorials.kafkaMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur Kafka.",
-    "home.tutorials.kibanaLogs.artifacts.application.label": "Discover",
+    "home.tutorials.kafkaMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Kafka avec Metricbeat.",
+    "home.tutorials.kibanaLogs.artifacts.application.label": "Découverte",
     "home.tutorials.kibanaLogs.longDescription": "Il s'agit du module Kibana. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.kibanaLogs.nameTitle": "Logs Kibana",
-    "home.tutorials.kibanaLogs.shortDescription": "Collectez des logs Kibana.",
-    "home.tutorials.kibanaMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.kibanaMetrics.longDescription": "Le module Metricbeat \"kibana\" récupère des indicateurs internes depuis Kibana. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.kibanaLogs.shortDescription": "Collectez et analysez les logs à partir de Kibana avec Filebeat.",
+    "home.tutorials.kibanaMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.kibanaMetrics.longDescription": "Le module Metricbeat \"kibana\" récupère des indicateurs depuis Kibana. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.kibanaMetrics.nameTitle": "Indicateurs Kibana",
-    "home.tutorials.kibanaMetrics.shortDescription": "Récupérez des indicateurs internes depuis Kibana.",
+    "home.tutorials.kibanaMetrics.shortDescription": "Collectez les indicateurs à partir de Kibana avec Metricbeat.",
     "home.tutorials.kubernetesMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Kubernetes",
     "home.tutorials.kubernetesMetrics.longDescription": "Le module Metricbeat \"kubernetes\" récupère des indicateurs depuis les API Kubernetes. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.kubernetesMetrics.nameTitle": "Indicateurs Kubernetes",
-    "home.tutorials.kubernetesMetrics.shortDescription": "Récupérez des indicateurs depuis votre installation Kubernetes.",
+    "home.tutorials.kubernetesMetrics.shortDescription": "Collectez les indicateurs à partir d’installations Kubernetes avec Metricbeat.",
     "home.tutorials.logstashLogs.artifacts.dashboards.linkLabel": "Logs Logstash",
     "home.tutorials.logstashLogs.longDescription": "Le module analyse les logs standard et le log de requêtes lentes Logstash. Il prend en charge les formats texte brut et JSON. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.logstashLogs.nameTitle": "Logs Logstash",
-    "home.tutorials.logstashLogs.shortDescription": "Collectez le log principal et le log de requêtes lentes Logstash.",
-    "home.tutorials.logstashMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.logstashMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs internes depuis un serveur Logstash. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.logstashLogs.shortDescription": "Collectez et analysez les logs principaux et lents à partir de Logstash avec Filebeat.",
+    "home.tutorials.logstashMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.logstashMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs depuis un serveur Logstash. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.logstashMetrics.nameTitle": "Indicateurs Logstash",
-    "home.tutorials.logstashMetrics.shortDescription": "Récupérez des indicateurs internes depuis un serveur Logstash.",
-    "home.tutorials.memcachedMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.memcachedMetrics.longDescription": "Le module Metricbeat \"memcached\" récupère des indicateurs internes depuis Memcached. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.logstashMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Logstash avec Metricbeat.",
+    "home.tutorials.memcachedMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.memcachedMetrics.longDescription": "Le module Metricbeat \"memcached\" récupère des indicateurs depuis Memcached. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.memcachedMetrics.nameTitle": "Indicateurs Memcached",
-    "home.tutorials.memcachedMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur Memcached.",
+    "home.tutorials.memcachedMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Memcached avec Metricbeat.",
     "home.tutorials.microsoftLogs.artifacts.dashboards.linkLabel": "Aperçu de Microsoft ATP",
     "home.tutorials.microsoftLogs.longDescription": "Collectez des alertes Microsoft Defender ATP pour les utiliser avec Elastic Security [En savoir plus]({learnMoreLink}).",
     "home.tutorials.microsoftLogs.nameTitle": "Logs Microsoft Defender ATP",
-    "home.tutorials.microsoftLogs.shortDescription": "Collectez des alertes Microsoft Defender ATP.",
+    "home.tutorials.microsoftLogs.shortDescription": "Collectez et analysez les alertes à partir de Microsoft Defender ATP avec Filebeat.",
     "home.tutorials.mispLogs.artifacts.dashboards.linkLabel": "Aperçu de MISP",
     "home.tutorials.mispLogs.longDescription": "Il s'agit d'un module Filebeat pour la lecture des informations de Threat Intelligence depuis la plateforme MISP (https://www.circl.lu/doc/misp/). Il utilise l'entrée httpjson pour accéder à l'interface d'API REST MISP. [En savoir plus]({learnMoreLink}).",
-    "home.tutorials.mispLogs.nameTitle": "Logs de Threat Intelligence MISP",
-    "home.tutorials.mispLogs.shortDescription": "Collectez des données de Threat Intelligence MISP avec Filebeat.",
+    "home.tutorials.mispLogs.nameTitle": "Logs Threat Intelligence MISP",
+    "home.tutorials.mispLogs.shortDescription": "Collectez et analysez les logs à partir de MISP Threat Intelligence avec Filebeat.",
     "home.tutorials.mongodbLogs.artifacts.dashboards.linkLabel": "Aperçu de MongoDB",
     "home.tutorials.mongodbLogs.longDescription": "Le module collecte et analyse les logs créés par [MongoDB](https://www.mongodb.com/). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.mongodbLogs.nameTitle": "Logs MongoDB",
-    "home.tutorials.mongodbLogs.shortDescription": "Collectez des logs MongoDB.",
+    "home.tutorials.mongodbLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs MongoDB avec Filebeat.",
     "home.tutorials.mongodbMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs MongoDB",
-    "home.tutorials.mongodbMetrics.longDescription": "Le module Metricbeat \"mongodb\" récupère des indicateurs internes depuis le serveur MongoDB. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.mongodbMetrics.longDescription": "Le module Metricbeat \"mongodb\" récupère des indicateurs depuis le serveur MongoDB. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.mongodbMetrics.nameTitle": "Indicateurs MongoDB",
-    "home.tutorials.mongodbMetrics.shortDescription": "Récupérez des indicateurs internes depuis MongoDB.",
-    "home.tutorials.mssqlLogs.artifacts.application.label": "Discover",
+    "home.tutorials.mongodbMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs MongoDB avec Metricbeat.",
+    "home.tutorials.mssqlLogs.artifacts.application.label": "Découverte",
     "home.tutorials.mssqlLogs.longDescription": "Le module analyse les logs d'erreurs créés par MSSQL. [En savoir plus]({learnMoreLink}).",
-    "home.tutorials.mssqlLogs.nameTitle": "Logs MSSQL",
-    "home.tutorials.mssqlLogs.shortDescription": "Collectez des logs MSSQL.",
+    "home.tutorials.mssqlLogs.nameTitle": "Logs Microsoft SQL Server",
+    "home.tutorials.mssqlLogs.shortDescription": "Collectez et analysez les logs à partir d’instances Microsoft SQL Server avec Filebeat.",
     "home.tutorials.mssqlMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Microsoft SQL Server",
     "home.tutorials.mssqlMetrics.longDescription": "Le module Metricbeat \"mssql\" récupère des indicateurs de monitoring, de logs et de performances depuis une instance Microsoft SQL Server. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.mssqlMetrics.nameTitle": "Indicateurs Microsoft SQL Server",
-    "home.tutorials.mssqlMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis une instance Microsoft SQL Server.",
-    "home.tutorials.muninMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.muninMetrics.longDescription": "Le module Metricbeat \"munin\" récupère des indicateurs internes depuis Munin. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.mssqlMetrics.shortDescription": "Collectez les indicateurs à partir d’instances Microsoft SQL Server avec Metricbeat.",
+    "home.tutorials.muninMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.muninMetrics.longDescription": "Le module Metricbeat \"munin\" récupère des indicateurs depuis Munin. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.muninMetrics.nameTitle": "Indicateurs Munin",
-    "home.tutorials.muninMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur Munin.",
+    "home.tutorials.muninMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Munin avec Metricbeat.",
     "home.tutorials.mysqlLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs MySQL",
     "home.tutorials.mysqlLogs.longDescription": "Le module Filebeat \"mysql\" analyse les logs d'erreurs et de requêtes lentes créés par MySQL. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.mysqlLogs.nameTitle": "Logs MySQL",
-    "home.tutorials.mysqlLogs.shortDescription": "Collectez et analysez les logs d'erreurs et de requêtes lentes créés par MySQL.",
+    "home.tutorials.mysqlLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs MySQL avec Filebeat.",
     "home.tutorials.mysqlMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs MySQL",
-    "home.tutorials.mysqlMetrics.longDescription": "Le module Metricbeat \"mysql\" récupère des indicateurs internes depuis le serveur MySQL. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.mysqlMetrics.longDescription": "Le module Metricbeat \"mysql\" récupère des indicateurs depuis le serveur MySQL. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.mysqlMetrics.nameTitle": "Indicateurs MySQL",
-    "home.tutorials.mysqlMetrics.shortDescription": "Récupérez des indicateurs internes depuis MySQL.",
+    "home.tutorials.mysqlMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs MySQL avec Metricbeat.",
     "home.tutorials.natsLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs NATS",
     "home.tutorials.natsLogs.longDescription": "Le module Filebeat \"nats\" analyse les logs créés par NATS. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.natsLogs.nameTitle": "Logs NATS",
-    "home.tutorials.natsLogs.shortDescription": "Collectez et analysez les logs créés par NATS.",
+    "home.tutorials.natsLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs NATS avec Filebeat.",
     "home.tutorials.natsMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs NATS",
-    "home.tutorials.natsMetrics.longDescription": "Le module Metricbeat \"nats\" récupère des indicateurs de monitoring depuis NATS. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.natsMetrics.longDescription": "Le module Metricbeat \"nats\" récupère des indicateurs depuis NATS. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.natsMetrics.nameTitle": "Indicateurs NATS",
-    "home.tutorials.natsMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis le serveur NATS.",
+    "home.tutorials.natsMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs NATS avec Metricbeat.",
     "home.tutorials.netflowLogs.artifacts.dashboards.linkLabel": "Aperçu de Netflow",
     "home.tutorials.netflowLogs.longDescription": "Ce module permet de recevoir des enregistrements de flux NetFlow et IPFIX via UDP. Cette entrée prend en charge les versions 1, 5, 6, 7, 8 et 9 de NetFlow ainsi qu'IPFIX. Pour les versions de NetFlow antérieures à la version 9, les champs sont automatiquement mappés vers NetFlow v9. [En savoir plus]({learnMoreLink})",
-    "home.tutorials.netflowLogs.nameTitle": "Collecteur IPFIX/NetFlow",
-    "home.tutorials.netflowLogs.shortDescription": "Collectez des enregistrements de flux NetFlow et IPFIX.",
+    "home.tutorials.netflowLogs.nameTitle": "NetFlow / IPFIX Records",
+    "home.tutorials.netflowLogs.shortDescription": "Collecte les enregistrements de NetFlow et du flux IPFIX avec Filebeat.",
     "home.tutorials.netscoutLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.netscoutLogs.longDescription": "Ce module permet de recevoir des logs Arbor Peakflow SP par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.netscoutLogs.nameTitle": "Logs Arbor Peakflow",
-    "home.tutorials.netscoutLogs.shortDescription": "Collectez des logs Netscout Arbor Peakflow SP par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.netscoutLogs.shortDescription": "Collectez et analysez les logs à partir de Netscout Arbor Peakflow SP avec Filebeat.",
     "home.tutorials.nginxLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs Nginx",
     "home.tutorials.nginxLogs.longDescription": "Le module Filebeat \"nginx\" analyse les logs d'accès et d'erreurs créés par le serveur HTTP Nginx. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.nginxLogs.nameTitle": "Logs Nginx",
-    "home.tutorials.nginxLogs.shortDescription": "Collectez et analysez les logs d'accès et d'erreurs créés par le serveur HTTP Nginx.",
+    "home.tutorials.nginxLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs Nginx HTTP avec Filebeat.",
     "home.tutorials.nginxMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Nginx",
-    "home.tutorials.nginxMetrics.longDescription": "Le module Metricbeat \"nginx\" récupère des indicateurs internes depuis le serveur HTTP Nginx. Le module récupère les données de statut du serveur depuis la page web générée par {statusModuleLink}, qui doit être activé dans votre installation Nginx. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.nginxMetrics.longDescription": "Le module Metricbeat \"nginx\" récupère des indicateurs depuis le serveur HTTP Nginx. Le module récupère les données de statut du serveur depuis la page web générée par {statusModuleLink}, qui doit être activé dans votre installation Nginx. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.nginxMetrics.nameTitle": "Indicateurs Nginx",
-    "home.tutorials.nginxMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur HTTP Nginx.",
+    "home.tutorials.nginxMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Nginx HTTP avec Metricbeat.",
     "home.tutorials.o365Logs.artifacts.dashboards.linkLabel": "Tableau de bord des audits O365",
     "home.tutorials.o365Logs.longDescription": "Il s'agit d'un module pour les logs Office 365 reçus via l'un des points de terminaison d'API Office 365. Actuellement, il prend en charge les actions et les événements utilisateur, administrateur, système et de politique depuis les logs d’activité Office 365 et Azure AD exposés par l'API d’activité de gestion Office 365. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.o365Logs.nameTitle": "Logs Office 365",
-    "home.tutorials.o365Logs.shortDescription": "Collectez les logs d'activité Office 365 via l'API Office 365.",
+    "home.tutorials.o365Logs.shortDescription": "Collectez et analysez les logs à partir d’Office 365 avec Filebeat.",
     "home.tutorials.oktaLogs.artifacts.dashboards.linkLabel": "Aperçu d'Okta",
     "home.tutorials.oktaLogs.longDescription": "Le module Okta collecte les événements de l'[API Okta](https://developer.okta.com/docs/reference/).         Plus précisément, il prend en charge la lecture depuis l'[API de log système Okta](https://developer.okta.com/docs/reference/api/system-log/). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.oktaLogs.nameTitle": "Logs Okta",
-    "home.tutorials.oktaLogs.shortDescription": "Collectez le log système Okta via l'API Okta.",
+    "home.tutorials.oktaLogs.shortDescription": "Collectez et analysez les logs à partir de l’API Okta avec Filebeat.",
     "home.tutorials.openmetricsMetrics.longDescription": "Le module Metricbeat \"openmetrics\" récupère des indicateurs depuis un point de terminaison fournissant des indicateurs au format OpenMetrics. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.openmetricsMetrics.nameTitle": "Indicateurs OpenMetrics",
-    "home.tutorials.openmetricsMetrics.shortDescription": "Récupérez des indicateurs depuis un point de terminaison fournissant des indicateurs au format OpenMetrics.",
-    "home.tutorials.oracleMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.oracleMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs internes depuis un serveur Oracle. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.openmetricsMetrics.shortDescription": "Collectez les indicateurs à partir d’un point de terminaison qui sert des indicateurs au format OpenMetrics avec Metricbeat.",
+    "home.tutorials.oracleMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.oracleMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs depuis un serveur Oracle. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.oracleMetrics.nameTitle": "Indicateurs Oracle",
-    "home.tutorials.oracleMetrics.shortDescription": "Récupérez des indicateurs internes depuis un serveur Oracle.",
+    "home.tutorials.oracleMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Oracle avec Metricbeat.",
     "home.tutorials.osqueryLogs.artifacts.dashboards.linkLabel": "Pack de conformité osquery",
     "home.tutorials.osqueryLogs.longDescription": "Le module collecte et décode les logs de résultats écrits par [osqueryd](https://osquery.readthedocs.io/en/latest/introduction/using-osqueryd/) au format JSON. Pour configurer \"osqueryd\", suivez les instructions d'installation d'osquery pour votre système d'exploitation et configurez le pilote de logging \"filesystem\" (celui par défaut).         Assurez-vous que les horodatages UTC sont activés. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.osqueryLogs.nameTitle": "Logs osquery",
-    "home.tutorials.osqueryLogs.shortDescription": "Collectez des logs osquery au format JSON.",
+    "home.tutorials.osqueryLogs.shortDescription": "Collectez et analysez les logs à partir d’Osquery avec Filebeat.",
     "home.tutorials.panwLogs.artifacts.dashboards.linkLabel": "Flux de réseau PANW",
     "home.tutorials.panwLogs.longDescription": "Il s'agit d'un module pour les logs de monitoring des pare-feux Palo Alto Networks PAN-OS reçus par le biais de Syslog ou lus depuis un fichier. Actuellement, il prend en charge les messages de type Trafic et Menaces. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.panwLogs.nameTitle": "Logs Palo Alto Networks PAN-OS",
-    "home.tutorials.panwLogs.shortDescription": "Collectez des logs Palo Alto Networks PAN-OS relatifs aux menaces et au trafic par le biais de Syslog ou d’un fichier log.",
-    "home.tutorials.phpFpmMetrics.longDescription": "Le module Metricbeat \"php_fpm\" récupère des indicateurs internes depuis le serveur PHP-FPM. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.panwLogs.shortDescription": "Collectez et analysez les logs de menaces et de trafic à partir de Palo Alto Networks PAN-OS avec Filebeat.",
+    "home.tutorials.phpFpmMetrics.longDescription": "Le module Metricbeat \"php_fpm\" récupère des indicateurs depuis le serveur PHP-FPM. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.phpFpmMetrics.nameTitle": "Indicateurs PHP-FPM",
-    "home.tutorials.phpFpmMetrics.shortDescription": "Récupérez des indicateurs internes depuis PHP-FPM.",
+    "home.tutorials.phpFpmMetrics.shortDescription": "Collectez les indicateurs à partir de PHP-FPM avec Metricbeat.",
     "home.tutorials.postgresqlLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs PostgreSQL",
     "home.tutorials.postgresqlLogs.longDescription": "Le module Filebeat \"postgresql\" analyse les logs d'erreurs et de requêtes lentes créés par PostgreSQL. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.postgresqlLogs.nameTitle": "Logs PostgreSQL",
-    "home.tutorials.postgresqlLogs.shortDescription": "Collectez et analysez les logs d'erreurs et de requêtes lentes créés par PostgreSQL.",
-    "home.tutorials.postgresqlMetrics.longDescription": "Le module Metricbeat \"postgresql\" récupère des indicateurs internes depuis le serveur PostgreSQL. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.postgresqlLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs PostgreSQL avec Filebeat.",
+    "home.tutorials.postgresqlMetrics.longDescription": "Le module Metricbeat \"postgresql\" récupère des indicateurs depuis le serveur PostgreSQL. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.postgresqlMetrics.nameTitle": "Indicateurs PostgreSQL",
-    "home.tutorials.postgresqlMetrics.shortDescription": "Récupérez des indicateurs internes depuis PostgreSQL.",
-    "home.tutorials.prometheusMetrics.artifacts.application.label": "Discover",
+    "home.tutorials.postgresqlMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs PostgreSQL avec Metricbeat.",
+    "home.tutorials.prometheusMetrics.artifacts.application.label": "Découverte",
     "home.tutorials.prometheusMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs depuis le point de terminaison Prometheus. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.prometheusMetrics.nameTitle": "Indicateurs Prometheus",
-    "home.tutorials.prometheusMetrics.shortDescription": "Récupérez des indicateurs depuis un exportateur Prometheus.",
-    "home.tutorials.rabbitmqLogs.artifacts.application.label": "Discover",
+    "home.tutorials.prometheusMetrics.shortDescription": "Collectez les indicateurs à partir d’exportateurs Prometheus avec Metricbeat.",
+    "home.tutorials.rabbitmqLogs.artifacts.application.label": "Découverte",
     "home.tutorials.rabbitmqLogs.longDescription": "Ce module permet d'analyser les [fichiers log RabbitMQ](https://www.rabbitmq.com/logging.html). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.rabbitmqLogs.nameTitle": "Logs RabbitMQ",
-    "home.tutorials.rabbitmqLogs.shortDescription": "Collectez des logs RabbitMQ.",
+    "home.tutorials.rabbitmqLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs RabbitMQ avec Filebeat.",
     "home.tutorials.rabbitmqMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs RabbitMQ",
-    "home.tutorials.rabbitmqMetrics.longDescription": "Le module Metricbeat \"rabbitmq\" récupère des indicateurs internes depuis le serveur RabbitMQ. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.rabbitmqMetrics.longDescription": "Le module Metricbeat \"rabbitmq\" récupère des indicateurs depuis le serveur RabbitMQ. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.rabbitmqMetrics.nameTitle": "Indicateurs RabbitMQ",
-    "home.tutorials.rabbitmqMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur RabbitMQ.",
+    "home.tutorials.rabbitmqMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs RabbitMQ avec Metricbeat.",
     "home.tutorials.radwareLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.radwareLogs.longDescription": "Ce module permet de recevoir des logs Radware DefensePro par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.radwareLogs.nameTitle": "Logs Radware DefensePro",
-    "home.tutorials.radwareLogs.shortDescription": "Collectez des logs Radware DefensePro par le biais de Syslog ou d’un fichier.",
-    "home.tutorials.redisenterpriseMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.redisenterpriseMetrics.longDescription": "Le module Metricbeat \"redisenterprise\" récupère des indicateurs de monitoring depuis le serveur Redis Enterprise. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.radwareLogs.shortDescription": "Collectez et analysez les logs à partir de Radware DefensePro avec Filebeat.",
+    "home.tutorials.redisenterpriseMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.redisenterpriseMetrics.longDescription": "Le module Metricbeat \"redisenterprise\" récupère des indicateurs depuis le serveur Redis Enterprise. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.redisenterpriseMetrics.nameTitle": "Indicateurs Redis Enterprise",
-    "home.tutorials.redisenterpriseMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis le serveur Redis Enterprise.",
+    "home.tutorials.redisenterpriseMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Redis Enterprise avec Metricbeat.",
     "home.tutorials.redisLogs.artifacts.dashboards.linkLabel": "Tableau de bord des logs Redis",
     "home.tutorials.redisLogs.longDescription": "Le module Filebeat \"redis\" analyse les logs d'erreurs et de requêtes lentes créés par Redis. Pour que Redis écrive des logs d'erreurs, assurez-vous que l'option \"logfile\" est définie sur \"redis-server.log\" dans le fichier de configuration Redis. Les logs de requêtes lentes sont lus directement depuis Redis via la commande \"SLOWLOG\". Pour que Redis enregistre des logs de requêtes lentes, assurez-vous que l'option \"slowlog-log-slower-than\" est activée. Notez que l'ensemble de fichiers \"slowlog\" est expérimental. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.redisLogs.nameTitle": "Logs Redis",
-    "home.tutorials.redisLogs.shortDescription": "Collectez et analysez les logs d'erreurs et de requêtes lentes créés par Redis.",
+    "home.tutorials.redisLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs Redis avec Filebeat.",
     "home.tutorials.redisMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Redis",
-    "home.tutorials.redisMetrics.longDescription": "Le module Metricbeat \"redis\" récupère des indicateurs internes depuis le serveur Redis. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.redisMetrics.longDescription": "Le module Metricbeat \"redis\" récupère des indicateurs depuis le serveur Redis. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.redisMetrics.nameTitle": "Indicateurs Redis",
-    "home.tutorials.redisMetrics.shortDescription": "Récupérez des indicateurs internes depuis Redis.",
+    "home.tutorials.redisMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Redis avec Metricbeat.",
     "home.tutorials.santaLogs.artifacts.dashboards.linkLabel": "Aperçu de Santa",
     "home.tutorials.santaLogs.longDescription": "Le module collecte et analyse les logs de [Google Santa](https://github.com/google/santa), un outil de sécurité pour macOS qui monitore les exécutions de processus et est capable de mettre en liste noire/blanche des fichiers binaires. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.santaLogs.nameTitle": "Logs Google Santa",
-    "home.tutorials.santaLogs.shortDescription": "Collectez des logs Google Santa relatifs aux exécutions de processus sur MacOS.",
+    "home.tutorials.santaLogs.shortDescription": "Collectez et analysez les logs à partir de systèmes Google Santa avec Filebeat.",
     "home.tutorials.sonicwallLogs.longDescription": "Ce module permet de recevoir des logs Sonicwall FW par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.sonicwallLogs.nameTitle": "Logs Sonicwall FW",
-    "home.tutorials.sonicwallLogs.shortDescription": "Collectez des logs Sonicwall FW par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.sonicwallLogs.shortDescription": "Collectez et analysez les logs à partir de Sonicwall-FW avec Filebeat.",
     "home.tutorials.sophosLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.sophosLogs.longDescription": "Il s'agit d'un module pour les produits Sophos. Actuellement, il prend en charge les logs XG SFOS envoyés au format Syslog. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.sophosLogs.nameTitle": "Logs Sophos",
-    "home.tutorials.sophosLogs.shortDescription": "Collectez des logs Sophos XG SFOS par le biais de Syslog.",
+    "home.tutorials.sophosLogs.shortDescription": "Collectez et analysez les logs à partir de Sophos XG SFOS avec Filebeat.",
     "home.tutorials.squidLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.squidLogs.longDescription": "Ce module permet de recevoir des logs Squid par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.squidLogs.nameTitle": "Logs Squid",
-    "home.tutorials.squidLogs.shortDescription": "Collectez des logs Squid par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.squidLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs Squid avec Filebeat.",
     "home.tutorials.stanMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs Stan",
-    "home.tutorials.stanMetrics.longDescription": "Le module Metricbeat \"stan\" récupère des indicateurs de monitoring depuis STAN. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.stanMetrics.longDescription": "Le module Metricbeat \"stan\" récupère des indicateurs depuis STAN. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.stanMetrics.nameTitle": "Indicateurs STAN",
-    "home.tutorials.stanMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis le serveur STAN.",
-    "home.tutorials.statsdMetrics.longDescription": "Le module Metricbeat \"statsd\" récupère des indicateurs de monitoring depuis statsd. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.stanMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs STAN avec Metricbeat.",
+    "home.tutorials.statsdMetrics.longDescription": "Le module Metricbeat \"statsd\" récupère des indicateurs depuis statsd. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.statsdMetrics.nameTitle": "Indicateurs statsd",
-    "home.tutorials.statsdMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis statsd.",
+    "home.tutorials.statsdMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Statsd avec Metricbeat.",
     "home.tutorials.suricataLogs.artifacts.dashboards.linkLabel": "Aperçu des événements Suricata",
     "home.tutorials.suricataLogs.longDescription": "Il s'agit d'un module pour le log IDS/IPS/NSM Suricata. Il analyse les logs qui sont au [format JSON Suricata Eve](https://suricata.readthedocs.io/en/latest/output/eve/eve-json-format.html). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.suricataLogs.nameTitle": "Logs Suricata",
-    "home.tutorials.suricataLogs.shortDescription": "Collectez des logs IDS/IPS/NSM Suricata.",
+    "home.tutorials.suricataLogs.shortDescription": "Collectez et analysez les logs à partir de Suricata IDS/IPS/NSM avec Filebeat.",
     "home.tutorials.systemLogs.artifacts.dashboards.linkLabel": "Tableau de bord Syslog système",
     "home.tutorials.systemLogs.longDescription": "Le module collecte et analyse les logs créés par le service de logging système des distributions basées sur Unix/Linux communes. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.systemLogs.nameTitle": "Logs système",
@@ -3560,54 +4329,56 @@
     "home.tutorials.systemMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs système",
     "home.tutorials.systemMetrics.longDescription": "Le module Metricbeat \"system\" collecte des statistiques relatives au CPU, à la mémoire, au réseau et au disque depuis l'hôte. Il collecte des statistiques au niveau du système et des statistiques par processus et système de fichiers. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.systemMetrics.nameTitle": "Indicateurs système",
-    "home.tutorials.systemMetrics.shortDescription": "Collectez des statistiques relatives au CPU, à la mémoire, au réseau et au disque depuis l'hôte.",
+    "home.tutorials.systemMetrics.shortDescription": "Collectez les indicateurs de CPU, de mémoire, de réseau et de disque à partir des hôtes System avec Metricbeat.",
     "home.tutorials.tomcatLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.tomcatLogs.longDescription": "Ce module permet de recevoir des logs Apache Tomcat par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.tomcatLogs.nameTitle": "Logs Tomcat",
-    "home.tutorials.tomcatLogs.shortDescription": "Collectez des logs Apache Tomcat par le biais de Syslog ou d’un fichier.",
+    "home.tutorials.tomcatLogs.shortDescription": "Collectez et analysez les logs à partir de serveurs Apache Tomcat avec Filebeat.",
     "home.tutorials.traefikLogs.artifacts.dashboards.linkLabel": "Logs d'accès Traefik",
     "home.tutorials.traefikLogs.longDescription": "Le module analyse les logs d'accès créés par [Traefik](https://traefik.io/). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.traefikLogs.nameTitle": "Logs Traefik",
-    "home.tutorials.traefikLogs.shortDescription": "Collectez des logs d'accès Traefik.",
-    "home.tutorials.traefikMetrics.longDescription": "Le module Metricbeat \"traefik\" récupère des indicateurs de monitoring depuis Traefik. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.traefikLogs.shortDescription": "Collectez et analysez les logs à partir de Traefik avec Filebeat.",
+    "home.tutorials.traefikMetrics.longDescription": "Le module Metricbeat \"traefik\" récupère des indicateurs depuis Traefik. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.traefikMetrics.nameTitle": "Indicateurs Traefik",
-    "home.tutorials.traefikMetrics.shortDescription": "Récupérez des indicateurs de monitoring depuis Traefik.",
+    "home.tutorials.traefikMetrics.shortDescription": "Collectez les indicateurs à partir de Traefik avec Metricbeat.",
     "home.tutorials.uptimeMonitors.artifacts.dashboards.linkLabel": "Application Uptime",
     "home.tutorials.uptimeMonitors.longDescription": "Monitorez la disponibilité des services grâce à une détection active.         À partir d'une liste d'URL, Heartbeat pose cette question toute simple : Êtes-vous actif ? [En savoir plus]({learnMoreLink}).",
     "home.tutorials.uptimeMonitors.nameTitle": "Monitorings Uptime",
-    "home.tutorials.uptimeMonitors.shortDescription": "Monitorer la disponibilité des services",
+    "home.tutorials.uptimeMonitors.shortDescription": "Surveillez la disponibilité des services avec Heartbeat.",
     "home.tutorials.uwsgiMetrics.artifacts.dashboards.linkLabel": "Tableau de bord des indicateurs uWSGI",
-    "home.tutorials.uwsgiMetrics.longDescription": "Le module Metricbeat \"uwsgi\" récupère des indicateurs internes depuis le serveur uWSGI. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.uwsgiMetrics.longDescription": "Le module Metricbeat \"uwsgi\" récupère des indicateurs depuis le serveur uWSGI. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.uwsgiMetrics.nameTitle": "Indicateurs uWSGI",
-    "home.tutorials.uwsgiMetrics.shortDescription": "Récupérez des indicateurs internes depuis le serveur uWSGI.",
-    "home.tutorials.vsphereMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.vsphereMetrics.longDescription": "Le module Metricbeat \"vsphere\" récupère des indicateurs internes depuis un cluster vSphere. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.uwsgiMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs uWSGI avec Metricbeat.",
+    "home.tutorials.vsphereMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.vsphereMetrics.longDescription": "Le module Metricbeat \"vsphere\" récupère des indicateurs depuis un cluster vSphere. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.vsphereMetrics.nameTitle": "Indicateurs vSphere",
-    "home.tutorials.vsphereMetrics.shortDescription": "Récupérez des indicateurs internes depuis vSphere.",
+    "home.tutorials.vsphereMetrics.shortDescription": "Collectez les indicateurs à partir de vSphere avec Metricbeat.",
     "home.tutorials.windowsEventLogs.artifacts.application.label": "Application SIEM",
     "home.tutorials.windowsEventLogs.longDescription": "Utilisez Winlogbeat pour collecter des logs depuis le log des événements Windows. [En savoir plus]({learnMoreLink}).",
-    "home.tutorials.windowsEventLogs.nameTitle": "Log des événements Windows",
-    "home.tutorials.windowsEventLogs.shortDescription": "Récupérez des logs depuis le log des événements Windows.",
-    "home.tutorials.windowsMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.windowsMetrics.longDescription": "Le module Metricbeat \"windows\" récupère des indicateurs internes depuis Windows. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.windowsEventLogs.nameTitle": "Logs des événements Windows",
+    "home.tutorials.windowsEventLogs.shortDescription": "Collectez et analysez les logs à partir de Windows Event Logs avec WinLogBeat.",
+    "home.tutorials.windowsMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.windowsMetrics.longDescription": "Le module Metricbeat \"windows\" récupère des indicateurs depuis Windows. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.windowsMetrics.nameTitle": "Indicateurs Windows",
-    "home.tutorials.windowsMetrics.shortDescription": "Récupérez des indicateurs internes depuis Windows.",
+    "home.tutorials.windowsMetrics.shortDescription": "Collectez les indicateurs à partir de Windows avec Metricbeat.",
     "home.tutorials.zeekLogs.artifacts.dashboards.linkLabel": "Aperçu de Zeek",
     "home.tutorials.zeekLogs.longDescription": "Il s'agit d'un module pour Zeek, anciennement appelé Bro. Il analyse les logs qui sont au [format JSON Zeek](https://www.zeek.org/manual/release/logs/index.html). [En savoir plus]({learnMoreLink}).",
     "home.tutorials.zeekLogs.nameTitle": "Logs Zeek",
-    "home.tutorials.zeekLogs.shortDescription": "Collectez les logs de monitoring de la sécurité réseau Zeek.",
-    "home.tutorials.zookeeperMetrics.artifacts.application.label": "Discover",
-    "home.tutorials.zookeeperMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs internes depuis un serveur Zookeeper. [En savoir plus]({learnMoreLink}).",
+    "home.tutorials.zeekLogs.shortDescription": "Collectez et analysez les logs à partir de la sécurité réseau Zeek avec Filebeat.",
+    "home.tutorials.zookeeperMetrics.artifacts.application.label": "Découverte",
+    "home.tutorials.zookeeperMetrics.longDescription": "Le module Metricbeat \"{moduleName}\" récupère des indicateurs depuis un serveur Zookeeper. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.zookeeperMetrics.nameTitle": "Indicateurs Zookeeper",
-    "home.tutorials.zookeeperMetrics.shortDescription": "Récupérez des indicateurs internes depuis un serveur Zookeeper.",
+    "home.tutorials.zookeeperMetrics.shortDescription": "Collectez les indicateurs à partir de serveurs Zookeeper avec Metricbeat.",
     "home.tutorials.zscalerLogs.artifacts.dashboards.linkLabel": "Application Security",
     "home.tutorials.zscalerLogs.longDescription": "Ce module permet de recevoir des logs Zscaler NSS par le biais de Syslog ou d'un fichier. [En savoir plus]({learnMoreLink}).",
     "home.tutorials.zscalerLogs.nameTitle": "Logs Zscaler",
-    "home.tutorials.zscalerLogs.shortDescription": "Ce module permet de recevoir des logs Zscaler NSS par le biais de Syslog ou d'un fichier.",
+    "home.tutorials.zscalerLogs.shortDescription": "Collectez et analysez les logs à partir de Zscaler NSS avec Filebeat.",
     "home.welcomeTitle": "Bienvenue dans Elastic",
     "indexPatternEditor.aliasLabel": "Alias",
+    "indexPatternEditor.createDataView.emptyState.createAnywayLink": "créer une vue de données par rapport à des index masqués, système ou par défaut.",
     "indexPatternEditor.createIndex.noMatch": "Le nom doit correspondre à au moins un flux de données, index ou alias d'index.",
     "indexPatternEditor.createIndexPattern.emptyState.checkDataButton": "Rechercher de nouvelles données",
+    "indexPatternEditor.createIndexPattern.emptyState.createAnywayTxt": "Vous pouvez également {link}",
     "indexPatternEditor.createIndexPattern.emptyState.haveData": "Vous pensez avoir déjà des données ?",
     "indexPatternEditor.createIndexPattern.emptyState.integrationCardDescription": "Ajoutez des données depuis diverses sources.",
     "indexPatternEditor.createIndexPattern.emptyState.integrationCardTitle": "Ajouter une intégration",
@@ -3620,14 +4391,16 @@
     "indexPatternEditor.createIndexPattern.emptyState.uploadCardTitle": "Charger un fichier",
     "indexPatternEditor.createIndexPattern.stepTime.noTimeFieldOptionLabel": "--- Je ne souhaite pas utiliser le filtre temporel ---",
     "indexPatternEditor.dataStreamLabel": "Flux de données",
+    "indexPatternEditor.dataView.unableSaveLabel": "Échec de l’enregistrement de la vue de données.",
+    "indexPatternEditor.dataViewExists.ValidationErrorMessage": "Une vue de données avec ce titre existe déjà.",
     "indexPatternEditor.editor.emptyPrompt.flyoutCloseButtonLabel": "Fermer",
     "indexPatternEditor.editor.flyoutCloseButtonLabel": "Fermer",
-    "indexPatternEditor.editor.flyoutSaveButtonLabel": "Créer un modèle d'indexation",
+    "indexPatternEditor.editor.flyoutSaveButtonLabel": "Créer une vue de données",
     "indexPatternEditor.editor.form.advancedSettings.hideButtonLabel": "Masquer les paramètres avancés",
     "indexPatternEditor.editor.form.advancedSettings.showButtonLabel": "Afficher les paramètres avancés",
     "indexPatternEditor.editor.form.allowHiddenLabel": "Autoriser les index masqués et système",
-    "indexPatternEditor.editor.form.customIdHelp": "Kibana fournit un identifiant unique pour chaque modèle d'indexation, ou vous pouvez en créer un vous-même.",
-    "indexPatternEditor.editor.form.customIdLabel": "ID de modèle d'indexation personnalisé",
+    "indexPatternEditor.editor.form.customIdHelp": "Kibana fournit un identifiant unique pour chaque vue de données, ou vous pouvez en créer un vous-même.",
+    "indexPatternEditor.editor.form.customIdLabel": "ID de vue de données personnalisé",
     "indexPatternEditor.editor.form.noTimeFieldsLabel": "Aucun flux de données, index ni alias d'index correspondant ne dispose d'un champ d'horodatage.",
     "indexPatternEditor.editor.form.runtimeType.placeholderLabel": "Sélectionner un champ d'horodatage",
     "indexPatternEditor.editor.form.timeFieldHelp": "Sélectionnez le champ d'horodatage à utiliser avec le filtre temporel global.",
@@ -3635,17 +4408,21 @@
     "indexPatternEditor.editor.form.timestampFieldHelp": "Sélectionnez le champ d'horodatage à utiliser avec le filtre temporel global.",
     "indexPatternEditor.editor.form.timestampSelectAriaLabel": "Champ d'horodatage",
     "indexPatternEditor.editor.form.titleLabel": "Nom",
-    "indexPatternEditor.editor.form.TypeLabel": "Type de modèle d'indexation",
+    "indexPatternEditor.editor.form.TypeLabel": "Type de vue de données",
     "indexPatternEditor.editor.form.typeSelectAriaLabel": "Champ Type",
     "indexPatternEditor.form.allowHiddenAriaLabel": "Autoriser les index masqués et système",
-    "indexPatternEditor.form.customIndexPatternIdLabel": "ID de modèle d'indexation personnalisé",
+    "indexPatternEditor.form.customIndexPatternIdLabel": "ID de vue de données personnalisé",
     "indexPatternEditor.form.titleAriaLabel": "Champ de titre",
     "indexPatternEditor.frozenLabel": "Gelé",
     "indexPatternEditor.indexLabel": "Index",
     "indexPatternEditor.loadingHeader": "Recherche d'index correspondants…",
     "indexPatternEditor.pagingLabel": "Lignes par page : {perPage}",
     "indexPatternEditor.requireTimestampOption.ValidationErrorMessage": "Sélectionnez un champ d'horodatage.",
-    "indexPatternEditor.rollup.uncaughtError": "Erreur de modèle d'indexation de cumul : {error}",
+    "indexPatternEditor.rollup.uncaughtError": "Erreur de vue de données de cumul : {error}",
+    "indexPatternEditor.rollupDataView.createIndex.noMatchError": "Erreur de vue de données de cumul : doit correspondre à un index de cumul",
+    "indexPatternEditor.rollupDataView.createIndex.tooManyMatchesError": "Erreur de vue de données de cumul : ne peut correspondre qu’à un index de cumul",
+    "indexPatternEditor.rollupDataView.warning.textParagraphOne": "Kibana propose le support bêta pour les vues de données basées sur les cumuls. Vous pourriez donc rencontrer des problèmes lors de l'utilisation de ces vues dans les recherches enregistrées, les visualisations et les tableaux de bord. Ils ne sont pas compatibles avec certaines fonctionnalités avancées, telles que Timelion et le Machine Learning.",
+    "indexPatternEditor.rollupDataView.warning.textParagraphTwo": "Vous pouvez mettre une vue de données de cumul en correspondance avec un index de cumul et zéro index régulier ou plus. Une vue de données de cumul dispose d'indicateurs, de champs, d'intervalles et d'agrégations limités. Un index de cumul se limite aux index disposant d'une configuration de tâche ou de plusieurs tâches avec des configurations compatibles.",
     "indexPatternEditor.rollupIndexPattern.warning.title": "Fonctionnalité bêta",
     "indexPatternEditor.rollupLabel": "Cumul",
     "indexPatternEditor.saved": "\"{indexPatternTitle}\" enregistré",
@@ -3658,15 +4435,16 @@
     "indexPatternEditor.status.partialMatchLabel.partialMatchDetail": "Votre modèle d'indexation ne correspond à aucun flux de données, index ni alias d'index, mais {strongIndices} {matchedIndicesLength, plural, one {est semblable} other {sont semblables} }.",
     "indexPatternEditor.status.partialMatchLabel.strongIndicesLabel": "{matchedIndicesLength, plural, one {source} other {# sources} }",
     "indexPatternEditor.status.successLabel.successDetail": "Votre modèle d'indexation correspond à {sourceCount} {sourceCount, plural, one {source} other {sources} }.",
-    "indexPatternEditor.title": "Créer un modèle d'indexation",
+    "indexPatternEditor.title": "Créer une vue de données",
     "indexPatternEditor.typeSelect.betaLabel": "Bêta",
     "indexPatternEditor.typeSelect.rollup": "Cumul",
     "indexPatternEditor.typeSelect.rollupDescription": "Effectuer des agrégations limitées à partir de données résumées",
-    "indexPatternEditor.typeSelect.rollupTitle": "Modèle d'indexation de cumul",
+    "indexPatternEditor.typeSelect.rollupTitle": "Vue de données de cumul",
     "indexPatternEditor.typeSelect.standard": "Standard",
     "indexPatternEditor.typeSelect.standardDescription": "Effectuer des agrégations complètes à partir de n'importe quelles données",
-    "indexPatternEditor.typeSelect.standardTitle": "Modèle d'indexation standard",
-    "indexPatternEditor.validations.titleHelpText": "Utilisez un astérisque (*) pour faire correspondre plusieurs caractères. Les espaces et les caractères , /, ?, \", &lt;, >, | ne sont pas autorisés.",
+    "indexPatternEditor.typeSelect.standardTitle": "Vue de données standard",
+    "indexPatternEditor.validations.noSingleAstriskPattern": "Un seul astérisque \"*\" n’est pas un modèle d'indexation autorisé",
+    "indexPatternEditor.validations.titleHelpText": "Entrez un modèle d'indexation qui correspond à une ou plusieurs sources de données. Utilisez un astérisque (*) pour faire correspondre plusieurs caractères. Les espaces et les caractères , /, ?, \", &lt;, >, | ne sont pas autorisés.",
     "indexPatternEditor.validations.titleIsRequiredErrorMessage": "Nom obligatoire.",
     "indexPatternFieldEditor.cancelField.confirmationModal.cancelButtonLabel": "Annuler",
     "indexPatternFieldEditor.cancelField.confirmationModal.description": "Les modifications apportées à votre champ seront ignorées. Voulez-vous vraiment continuer ?",
@@ -3707,7 +4485,7 @@
     "indexPatternFieldEditor.editField.flyoutAriaLabel": "Modifier le champ {fieldName}",
     "indexPatternFieldEditor.editor.flyoutCancelButtonLabel": "Annuler",
     "indexPatternFieldEditor.editor.flyoutDefaultTitle": "Créer un champ",
-    "indexPatternFieldEditor.editor.flyoutEditFieldSubtitle": "Modèle d'indexation : {patternName}",
+    "indexPatternFieldEditor.editor.flyoutEditFieldSubtitle": "Vue de données : {patternName}",
     "indexPatternFieldEditor.editor.flyoutEditFieldTitle": "Modifier le champ \"{fieldName}\"",
     "indexPatternFieldEditor.editor.flyoutSaveButtonLabel": "Enregistrer",
     "indexPatternFieldEditor.editor.form.advancedSettings.hideButtonLabel": "Masquer les paramètres avancés",
@@ -3729,8 +4507,10 @@
     "indexPatternFieldEditor.editor.form.runtimeType.placeholderLabel": "Sélectionner un type",
     "indexPatternFieldEditor.editor.form.runtimeTypeLabel": "Type",
     "indexPatternFieldEditor.editor.form.script.learnMoreLinkText": "En savoir plus sur la syntaxe de script.",
+    "indexPatternFieldEditor.editor.form.scriptEditor.castErrorMessage": "Vérifiez que vous avez correctement configuré le type de champ de temps d’exécution.",
     "indexPatternFieldEditor.editor.form.scriptEditor.compileErrorMessage": "Erreur lors de la compilation du script Painless",
     "indexPatternFieldEditor.editor.form.scriptEditorAriaLabel": "Éditeur de script",
+    "indexPatternFieldEditor.editor.form.scriptEditorPainlessValidationMessage": "Script Painless non valide.",
     "indexPatternFieldEditor.editor.form.source.scriptFieldHelpText": "Les champs d'exécution sans script récupèrent les valeurs de {source}. Si un champ n'existe pas dans _source, la recherche ne renvoie pas de valeur. {learnMoreLink}",
     "indexPatternFieldEditor.editor.form.typeSelectAriaLabel": "Sélection du type",
     "indexPatternFieldEditor.editor.form.validations.customLabelIsRequiredErrorMessage": "Spécifiez une étiquette pour le champ.",
@@ -3738,30 +4518,40 @@
     "indexPatternFieldEditor.editor.form.validations.popularityGreaterThan0ErrorMessage": "La popularité doit être définie sur 0 ou plus.",
     "indexPatternFieldEditor.editor.form.validations.popularityIsRequiredErrorMessage": "Spécifiez la popularité du champ.",
     "indexPatternFieldEditor.editor.form.validations.scriptIsRequiredErrorMessage": "Un script est obligatoire pour définir la valeur du champ.",
+    "indexPatternFieldEditor.editor.form.validations.starCharacterNotAllowedValidationErrorMessage": "Le nom du champ ne peut pas contenir *.",
     "indexPatternFieldEditor.editor.form.valueDescription": "Définissez une valeur pour le champ au lieu de la récupérer à partir du champ portant le même nom dans {source}.",
     "indexPatternFieldEditor.editor.form.valueTitle": "Définir la valeur",
     "indexPatternFieldEditor.editor.runtimeFieldsEditor.existRuntimeFieldNamesValidationErrorMessage": "Un champ portant ce nom existe déjà.",
-    "indexPatternFieldEditor.fieldPreview.documentIdField.label": "ID du document",
+    "indexPatternFieldEditor.fieldPreview.documentIdField.label": "ID de document",
     "indexPatternFieldEditor.fieldPreview.documentIdField.loadDocumentsFromCluster": "Charger des documents depuis le cluster",
     "indexPatternFieldEditor.fieldPreview.documentNav.nextArialabel": "Document suivant",
     "indexPatternFieldEditor.fieldPreview.documentNav.previousArialabel": "Document précédent",
     "indexPatternFieldEditor.fieldPreview.emptyPromptDescription": "Saisissez le nom d'un champ existant ou définissez un script pour afficher un aperçu de la sortie calculée.",
     "indexPatternFieldEditor.fieldPreview.emptyPromptTitle": "Aperçu",
     "indexPatternFieldEditor.fieldPreview.error.documentNotFoundDescription": "ID du document introuvable",
-    "indexPatternFieldEditor.fieldPreview.errorCallout.title": "Erreur d'aperçu",
+    "indexPatternFieldEditor.fieldPreview.error.errorLoadingDocumentDescription": "Erreur lors du chargement du document.",
+    "indexPatternFieldEditor.fieldPreview.error.errorLoadingSampleDocumentsDescription": "Erreur lors du chargement des exemples de documents.",
+    "indexPatternFieldEditor.fieldPreview.error.painlessSyntax": "Syntaxe Painless non valide.",
+    "indexPatternFieldEditor.fieldPreview.errorCallout.title": "Erreur lors de la récupération du document",
     "indexPatternFieldEditor.fieldPreview.errorTitle": "Échec du chargement de l'aperçu du champ",
+    "indexPatternFieldEditor.fieldPreview.fieldNameNotSetLabel": "Nom de champ non défini",
     "indexPatternFieldEditor.fieldPreview.filterFieldsPlaceholder": "Champs de filtre",
+    "indexPatternFieldEditor.fieldPreview.notAvailableWarningCallout.description": "L’aperçu du temps de temps d’exécution est désactivé, car aucun document n’a pu être extrait du cluster.",
+    "indexPatternFieldEditor.fieldPreview.notAvailableWarningCallout.title": "Aperçu non disponible",
     "indexPatternFieldEditor.fieldPreview.pinFieldButtonLabel": "Épingler le champ",
+    "indexPatternFieldEditor.fieldPreview.scriptErrorBadgeLabel": "Erreur de script",
     "indexPatternFieldEditor.fieldPreview.searchResult.emptyPrompt.clearSearchButtonLabel": "Effacer la recherche",
-    "indexPatternFieldEditor.fieldPreview.searchResult.emptyPromptTitle": "Aucun champ correspondant dans ce modèle d'indexation",
+    "indexPatternFieldEditor.fieldPreview.searchResult.emptyPromptTitle": "Aucun champ correspondant dans cette vue de données",
     "indexPatternFieldEditor.fieldPreview.showLessFieldsButtonLabel": "Afficher moins",
     "indexPatternFieldEditor.fieldPreview.showMoreFieldsButtonLabel": "Afficher plus",
     "indexPatternFieldEditor.fieldPreview.subTitle": "Depuis : {from}",
     "indexPatternFieldEditor.fieldPreview.subTitle.customData": "Données personnalisées",
     "indexPatternFieldEditor.fieldPreview.title": "Aperçu",
-    "indexPatternFieldEditor.fieldPreview.updatingPreviewLabel": "Mise à jour en cours...",
+    "indexPatternFieldEditor.fieldPreview.updatingPreviewLabel": "Mise à jour...",
+    "indexPatternFieldEditor.fieldPreview.valueNotSetLabel": "Valeur non définie",
     "indexPatternFieldEditor.fieldPreview.viewImageButtonLabel": "Afficher l'image",
     "indexPatternFieldEditor.formatHeader": "Format",
+    "indexPatternFieldEditor.geoPoint.transformLabel": "Transformer",
     "indexPatternFieldEditor.histogram.histogramAsNumberLabel": "Format de nombre agrégé",
     "indexPatternFieldEditor.histogram.numeralLabel": "Modèle de format numérique (facultatif)",
     "indexPatternFieldEditor.histogram.subFormat.bytes": "Octets",
@@ -3804,6 +4594,23 @@
     "indexPatternManagement.actions.saveButton": "Enregistrer le champ",
     "indexPatternManagement.createHeader": "Créer un champ scripté",
     "indexPatternManagement.customLabel": "Étiquette personnalisée",
+    "indexPatternManagement.dataView.sectionsHeader": "Vues de données",
+    "indexPatternManagement.dataViews.badge.readOnly.tooltip": "Échec de l’enregistrement des vues de données",
+    "indexPatternManagement.dataViews.createBreadcrumb": "Créer une vue de données",
+    "indexPatternManagement.dataViews.listBreadcrumb": "Vues de données",
+    "indexPatternManagement.dataViewTable.columnDelete": "Supprimer",
+    "indexPatternManagement.dataViewTable.columnDeleteDescription": "Supprimer cette vue de données",
+    "indexPatternManagement.dataViewTable.createBtn": "Créer une vue de données",
+    "indexPatternManagement.dataViewTable.dataViewColumnName": "Vue de données",
+    "indexPatternManagement.dataViewTable.deleteButtonLabel": "Supprimer {selectedItems, number} {selectedItems, plural, one {vue de données} other {vues de données} }",
+    "indexPatternManagement.dataViewTable.deleteConfirmSummary": "Vous allez supprimer de manière définitive {count, number} {count, plural, one {vue de données} other {vues de données} }.",
+    "indexPatternManagement.dataViewTable.indexPatternExplanation": "Créez et gérez les vues de données afin de récupérer vos données depuis Elasticsearch.",
+    "indexPatternManagement.dataViewTable.nameColumn": "Nom",
+    "indexPatternManagement.dataViewTable.spaceCountAll": "tous",
+    "indexPatternManagement.dataViewTable.spacesColumn": "Espaces",
+    "indexPatternManagement.dataViewTable.spacesColumnName": "Espaces",
+    "indexPatternManagement.dataViewTable.tableTitle": "Vues de données sélectionnées pour la suppression",
+    "indexPatternManagement.dataViewTable.title": "Vues de données",
     "indexPatternManagement.defaultFormatDropDown": "- Par défaut -",
     "indexPatternManagement.defaultFormatHeader": "Format (par défaut : {defaultFormat})",
     "indexPatternManagement.deleteField.cancelButton": "Annuler",
@@ -3814,16 +4621,40 @@
     "indexPatternManagement.deleteFieldLabel": "Il est impossible de récupérer un champ supprimé.{separator}Voulez-vous vraiment continuer ?",
     "indexPatternManagement.disabledCallOutHeader": "Scripts désactivés",
     "indexPatternManagement.disabledCallOutLabel": "Tous les scripts en ligne ont été désactivés dans Elasticsearch. Vous devez activer les scripts en ligne pour au moins un langage afin d'utiliser des champs scriptés dans Kibana.",
+    "indexPatternManagement.editDataView.deleteHeader": "Supprimer la vue de données",
+    "indexPatternManagement.editDataView.deleteWarning": "La vue de données {dataViewName} va être supprimée. Vous ne pouvez pas annuler cette action.",
+    "indexPatternManagement.editDataView.deleteWarningWithNamespaces": "Supprimer la vue de données {dataViewName} de tous les espaces dans lesquels elle est partagée. Vous ne pouvez pas annuler cette action.",
+    "indexPatternManagement.editDataView.detailsAria": "Détails de la vue de données",
+    "indexPatternManagement.editDataView.fields.table.conflictType": "Conflit",
+    "indexPatternManagement.editDataView.fields.table.runtimeIconTipText": "Ce champ existe uniquement dans la vue de données.",
+    "indexPatternManagement.editDataView.removeAria": "Supprimer la vue de données.",
+    "indexPatternManagement.editDataView.removeTooltip": "Supprimer la vue de données.",
+    "indexPatternManagement.editDataView.setDefaultAria": "Définir en tant que vue de données par défaut.",
+    "indexPatternManagement.editDataView.setDefaultTooltip": "Définir en tant que vue de données par défaut.",
     "indexPatternManagement.editHeader": "Modifier {fieldName}",
+    "indexPatternManagement.editIndexPattern.badge.securityDataViewTitle": "Vue de données Security",
     "indexPatternManagement.editIndexPattern.deleteButton": "Supprimer",
     "indexPatternManagement.editIndexPattern.deprecation": "Les champs scriptés sont déclassés. Utilisez {runtimeDocs} à la place.",
     "indexPatternManagement.editIndexPattern.fields.addFieldButtonLabel": "Ajouter un champ",
+    "indexPatternManagement.editIndexPattern.fields.conflictModal.closeBtn": "Fermer",
+    "indexPatternManagement.editIndexPattern.fields.conflictModal.description": "Le type de champ {fieldName} change entre les index et peut ne pas être disponible pour la recherche, les visualisations et d’autres analyses.",
+    "indexPatternManagement.editIndexPattern.fields.conflictModal.title": "Ce champ possède un conflit de type",
+    "indexPatternManagement.editIndexPattern.fields.filter": "Type du champ",
     "indexPatternManagement.editIndexPattern.fields.filterAria": "Filtrer les types de champ",
-    "indexPatternManagement.editIndexPattern.fields.filterPlaceholder": "Rechercher",
-    "indexPatternManagement.editIndexPattern.fields.searchAria": "Rechercher des champs",
+    "indexPatternManagement.editIndexPattern.fields.filterPlaceholder": "Recherche",
+    "indexPatternManagement.editIndexPattern.fields.indexed": "Indexé",
+    "indexPatternManagement.editIndexPattern.fields.runtime": "Temps d’exécution",
+    "indexPatternManagement.editIndexPattern.fields.schema": "Type de schéma",
+    "indexPatternManagement.editIndexPattern.fields.schemaAria": "Filtrer les types de schéma",
+    "indexPatternManagement.editIndexPattern.fields.scriptedFieldFilter": "Tous les langages",
+    "indexPatternManagement.editIndexPattern.fields.scriptedFieldFilterAria": "Filtrer les langages de champ scriptés",
+    "indexPatternManagement.editIndexPattern.fields.searchAria": "Rechercher dans les champs",
     "indexPatternManagement.editIndexPattern.fields.table.additionalInfoAriaLabel": "Informations supplémentaires sur le champ",
     "indexPatternManagement.editIndexPattern.fields.table.aggregatableDescription": "Ces champs peuvent être utilisés dans des agrégations de visualisations.",
     "indexPatternManagement.editIndexPattern.fields.table.aggregatableLabel": "Regroupable",
+    "indexPatternManagement.editIndexPattern.fields.table.conflictDetailIconAria": "Détail sur le conflit",
+    "indexPatternManagement.editIndexPattern.fields.table.conflictModalIndicesColumn": "Index",
+    "indexPatternManagement.editIndexPattern.fields.table.conflictModalTypeColumn": "Type",
     "indexPatternManagement.editIndexPattern.fields.table.customLabelTooltip": "Une étiquette personnalisée pour le champ.",
     "indexPatternManagement.editIndexPattern.fields.table.deleteDescription": "Supprimer",
     "indexPatternManagement.editIndexPattern.fields.table.deleteLabel": "Supprimer",
@@ -3894,11 +4725,13 @@
     "indexPatternManagement.editIndexPattern.timeFilterLabel.timeFilterDetail": "Affichez et modifiez les champs dans {indexPatternTitle}. Les attributs de champ tels que le type et le niveau de recherche sont basés sur {mappingAPILink} dans Elasticsearch.",
     "indexPatternManagement.fieldTypeConflict": "Conflit de type de champ",
     "indexPatternManagement.formatHeader": "Format",
-    "indexPatternManagement.formatLabel": "La mise en forme vous permet de contrôler la façon dont des valeurs spécifiques sont affichées. Cela peut également entraîner une modification complète des valeurs et empêcher la mise en surbrillance dans Discover de fonctionner.",
+    "indexPatternManagement.formatLabel": "Le formatage détermine la façon dont les valeurs sont affichées. La modification de ce paramètre peut également affecter la valeur du champ et la mise en surbrillance dans Discover.",
     "indexPatternManagement.header.runtimeLink": "champs d'exécution",
     "indexPatternManagement.indexNameLabel": "Nom des index",
     "indexPatternManagement.indexPatterns.badge.readOnly.text": "Lecture seule",
     "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "Créer un champ",
+    "indexPatternManagement.indexPatternTable.badge.securityDataViewTitle": "Vue de données Security",
+    "indexPatternManagement.indexPatternTable.savedObjectName": "vue de données",
     "indexPatternManagement.labelHelpText": "Définissez une étiquette personnalisée à utiliser lorsque ce champ est affiché dans Discover, Maps et Visualize. Actuellement, les requêtes et les filtres ne prennent pas en charge les étiquettes personnalisées et utilisent le nom d'origine des champs.",
     "indexPatternManagement.languageLabel": "Langage",
     "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict} Vous avez déjà un champ nommé {fieldName}. Si vous donnez le même nom à votre champ scripté, vous ne pourrez pas interroger les deux champs en même temps.",
@@ -3915,7 +4748,9 @@
     "indexPatternManagement.scriptingLanguages.errorFetchingToastDescription": "Erreur lors de l'obtention des langages de script disponibles à partir d'Elasticsearch",
     "indexPatternManagement.scriptInvalidErrorMessage": "Script non valide. Voir l'aperçu du script pour plus de détails.",
     "indexPatternManagement.scriptLabel": "Script",
+    "indexPatternManagement.scriptLabelAriaLabel": "Éditeur de script",
     "indexPatternManagement.scriptRequiredErrorMessage": "Script obligatoire",
+    "indexPatternManagement.starCharacterNotAllowedValidationErrorMessage": "Le nom du champ ne peut pas contenir *.",
     "indexPatternManagement.syntax.default.formatLabel": "doc['some_field'].value",
     "indexPatternManagement.syntax.defaultLabel.defaultDetail": "Par défaut, les champs scriptés Kibana emploient {painless}, un langage de script simple et sécurisé spécialement conçu pour Elasticsearch. Pour accéder aux valeurs du document, utilisez le format suivant :",
     "indexPatternManagement.syntax.defaultLabel.painlessLink": "Painless",
@@ -4007,13 +4842,15 @@
     "inspector.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText": "L'élément n'a pas (encore) consigné de requêtes.",
     "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "Cela signifie généralement qu'il n'était pas nécessaire de récupérer des données ou que l'élément n'a pas encore commencé à récupérer des données.",
     "inspector.requests.noRequestsLoggedTitle": "Aucune requête consignée",
+    "inspector.requests.openInConsoleLabel": "Ouvrir dans la console",
+    "inspector.requests.openInSearchProfilerLabel": "Ouvrir dans Search Profiler",
     "inspector.requests.requestFailedTooltipTitle": "Échec de la requête",
     "inspector.requests.requestInProgressAriaLabel": "Requête en cours",
     "inspector.requests.requestsDescriptionTooltip": "Voir les requêtes qui ont collecté les données",
     "inspector.requests.requestsTitle": "Requêtes",
     "inspector.requests.requestSucceededTooltipTitle": "Requête réussie",
     "inspector.requests.requestTabLabel": "Requête",
-    "inspector.requests.requestTimeLabel": "{requestTime}ms",
+    "inspector.requests.requestTimeLabel": "{requestTime} ms",
     "inspector.requests.requestTooltipDescription": "Durée totale qu'a nécessité la requête.",
     "inspector.requests.requestWasMadeDescription": "{requestsCount, plural, one {# requête a été effectuée} other {# requêtes ont été effectuées} }{failedRequests}",
     "inspector.requests.requestWasMadeDescription.requestHadFailureText": ", {failedCount} a/ont échoué.",
@@ -4022,6 +4859,83 @@
     "inspector.requests.statisticsTabLabel": "Statistiques",
     "inspector.title": "Inspecteur",
     "inspector.view": "Vue : {viewName}",
+    "interactiveSetup.app.notReady": "Le serveur Kibana n’est pas encore prêt.",
+    "interactiveSetup.app.pageTitle": "Configurez Elastic pour commencer",
+    "interactiveSetup.certificateChain.cancelButton": "Fermer",
+    "interactiveSetup.certificateChain.title": "Chaîne de certificat",
+    "interactiveSetup.certificatePanel.fingerprint": "Empreinte digitale (SHA-256) : {fingerprint}",
+    "interactiveSetup.certificatePanel.intermediateCertificateAuthority": "CA intermédiaire",
+    "interactiveSetup.certificatePanel.issuer": "Émis par : {issuer}",
+    "interactiveSetup.certificatePanel.rootCertificateAuthority": "CA racine",
+    "interactiveSetup.certificatePanel.serverCertificate": "Certificat de serveur",
+    "interactiveSetup.certificatePanel.validFrom": "Émis le : {validFrom}",
+    "interactiveSetup.certificatePanel.validTo": "Expire le : {validTo}",
+    "interactiveSetup.clusterAddressForm.cancelButton": "Retour",
+    "interactiveSetup.clusterAddressForm.hostInvalidError": "Saisissez une adresse valide, avec \"http\" ou \"https\".",
+    "interactiveSetup.clusterAddressForm.hostLabel": "Adresse",
+    "interactiveSetup.clusterAddressForm.hostRequiredError": "Entrez une adresse.",
+    "interactiveSetup.clusterAddressForm.submitButton": "{isSubmitting, select, true{Vérification de l’adresse…} other{Vérifier l’adresse}}",
+    "interactiveSetup.clusterAddressForm.submitErrorTitle": "Vérification de l’adresse impossible",
+    "interactiveSetup.clusterConfigurationForm.caCertConfirmationRequiredError": "Confirmez que vous reconnaissez ce certificat et que vous lui faites confiance.",
+    "interactiveSetup.clusterConfigurationForm.caCertLabel": "Autorité de certificat",
+    "interactiveSetup.clusterConfigurationForm.cancelButton": "Retour",
+    "interactiveSetup.clusterConfigurationForm.connectTo": "Se connecter à",
+    "interactiveSetup.clusterConfigurationForm.insecureClusterDescription": "Toute personne possédant l’adresse peut accéder à vos données.",
+    "interactiveSetup.clusterConfigurationForm.insecureClusterLink": "Découvrez comment activer les fonctionnalités de sécurité.",
+    "interactiveSetup.clusterConfigurationForm.insecureClusterTitle": "Ce cluster n’est pas sécurisé",
+    "interactiveSetup.clusterConfigurationForm.passwordLabel": "Mot de passe",
+    "interactiveSetup.clusterConfigurationForm.passwordRequiredError": "Entrez un mot de passe.",
+    "interactiveSetup.clusterConfigurationForm.submitButton": "{isSubmitting, select, true{Configuration d’Elastic…} other{Configurer Elastic}}",
+    "interactiveSetup.clusterConfigurationForm.submitErrorTitle": "Configuration d’Elastic impossible",
+    "interactiveSetup.clusterConfigurationForm.trustCaCertLabel": "Je reconnais ce certificat et je lui fais confiance :",
+    "interactiveSetup.clusterConfigurationForm.usernameLabel": "Nom d'utilisateur",
+    "interactiveSetup.clusterConfigurationForm.usernameRequiredError": "Entrez un nom d'utilisateur.",
+    "interactiveSetup.clusterConfigurationForm.usernameReservedError": "L’utilisateur \"elastic\" ne peut pas être utilisé en tant qu’utilisateur système Kibana.",
+    "interactiveSetup.enrollmentTokenDetails.connectTo": "Se connecter à",
+    "interactiveSetup.enrollmentTokenForm.cancelButton": "Configurer manuellement",
+    "interactiveSetup.enrollmentTokenForm.submitButton": "{isSubmitting, select, true{Configuration d’Elastic…} other{Configurer Elastic}}",
+    "interactiveSetup.enrollmentTokenForm.submitErrorTitle": "Configuration d’Elastic impossible",
+    "interactiveSetup.enrollmentTokenForm.tokenInvalidError": "Entrez un jeton d’enregistrement valide.",
+    "interactiveSetup.enrollmentTokenForm.tokenLabel": "Jeton d'enregistrement",
+    "interactiveSetup.enrollmentTokenForm.tokenPlaceholder": "Collez le jeton d’enregistrement à partir du terminal.",
+    "interactiveSetup.enrollmentTokenForm.tokenRequiredError": "Entrez un jeton d'enregistrement.",
+    "interactiveSetup.enrollmentTokenHelpPopover.buttonText": "Où puis-je le trouver ?",
+    "interactiveSetup.enrollmentTokenHelpPopover.commandHelpText": "Pour générer un nouveau jeton d’enregistrement, exécutez la commande suivante à partir du répertoire d’installation Elasticsearch :",
+    "interactiveSetup.enrollmentTokenHelpPopover.docLinkText": "Découvrez comment configurer Elastic.",
+    "interactiveSetup.enrollmentTokenHelpPopover.helpText": "Le jeton d’enregistrement est automatiquement généré lorsque vous démarrez Elasticsearch pour la première fois. Vous devrez peut-être faire défiler la vue du terminal pour l’afficher.",
+    "interactiveSetup.forgotPasswordPopover.buttonText": "Mot de passe oublié ?",
+    "interactiveSetup.forgotPasswordPopover.helpText": "Pour réinitialiser le mot de passe pour l’utilisateur {username}, exécutez la commande suivante à partir du répertoire d’installation Elasticsearch :",
+    "interactiveSetup.progressIndicator.completeStepTitle": "Achèvement de la configuration",
+    "interactiveSetup.progressIndicator.prebootStepTitle": "Enregistrement des paramètres",
+    "interactiveSetup.progressIndicator.unavailableStepTitle": "Démarrage d'Elastic",
+    "interactiveSetup.singleCharsField.digitLabel": "Chiffre {index}",
+    "interactiveSetup.submitErrorCallout.compatibilityFailureErrorDescription": "Le cluster Elasticsearch (v{elasticsearchVersion}) est incompatible avec cette version de Kibana (v{kibanaVersion}).",
+    "interactiveSetup.submitErrorCallout.elasticsearchConnectionConfiguredErrorTitle": "Elastic est déjà configuré",
+    "interactiveSetup.submitErrorCallout.elasticsearchConnectionConfiguredSubmitButton": "Continuer vers Kibana",
+    "interactiveSetup.submitErrorCallout.EnrollFailureErrorDescription": "Générez un nouveau jeton d’enregistrement ou configurez-le manuellement.",
+    "interactiveSetup.submitErrorCallout.forbiddenErrorDescription": "Réessayez de configurer Elastic.",
+    "interactiveSetup.submitErrorCallout.forbiddenErrorTitle": "Vérification requise",
+    "interactiveSetup.submitErrorCallout.kibanaConfigFailureErrorDescription": "Réessayez ou mettez à jour le fichier {config} manuellement.",
+    "interactiveSetup.submitErrorCallout.kibanaConfigNotWritableErrorDescription": "Vérifiez les autorisations du fichier et assurez-vous que {config} peut être écrit par le processus Kibana.",
+    "interactiveSetup.submitErrorCallout.kibanaConfigNotWritableErrorTitle": "Écriture impossible dans le fichier de configuration",
+    "interactiveSetup.submitErrorCallout.pingFailureErrorDescription": "Vérifiez l’adresse et réessayez.",
+    "interactiveSetup.submitErrorCallout.pingFailureErrorTitle": "Connexion au cluster impossible",
+    "interactiveSetup.verificationCodeForm.codeDescription": "Copiez le code à partir du serveur Kibana ou exécutez {command} pour le récupérer.",
+    "interactiveSetup.verificationCodeForm.codeMinLengthError": "Entrez les six chiffres.",
+    "interactiveSetup.verificationCodeForm.codeRequiredError": "Entrez le code de vérification à partir du serveur Kibana.",
+    "interactiveSetup.verificationCodeForm.submitButton": "{isSubmitting, select, true{Vérification…} other{Vérifier}}",
+    "interactiveSetup.verificationCodeForm.submitErrorTitle": "Vérification du code impossible",
+    "interactiveSetup.verificationCodeForm.title": "Vérification requise",
+    "kbnConfig.deprecations.conflictSetting.manualStepOneMessage": "Assurez-vous que \"{fullNewPath}\" contient la valeur correcte dans le fichier de configuration, l’indicateur CLI ou la variable d’environnement (dans Docker uniquement).",
+    "kbnConfig.deprecations.conflictSetting.manualStepTwoMessage": "Supprimez \"{fullOldPath}\" de la configuration.",
+    "kbnConfig.deprecations.conflictSettingMessage": "Le paramètre \"{fullOldPath}\" a été remplacé par \"{fullNewPath}\". Cependant, les deux clés sont présentes. Ignorer \"{fullOldPath}\"",
+    "kbnConfig.deprecations.deprecatedSetting.manualStepOneMessage": "Retirez \"{fullPath}\" dans le fichier de configuration Kibana, l'indicateur CLI ou la variable d'environnement (dans Docker uniquement) avant de passer à {removeBy}.",
+    "kbnConfig.deprecations.deprecatedSettingMessage": "La configuration de \"{fullPath}\" est déclassée et sera supprimée dans {removeBy}.",
+    "kbnConfig.deprecations.deprecatedSettingTitle": "Le paramètre \"{deprecationPath}\" est déclassé",
+    "kbnConfig.deprecations.replacedSetting.manualStepOneMessage": "Remplacez \"{fullOldPath}\" par \"{fullNewPath}\" dans le fichier de configuration Kibana, l’indicateur CLI ou la variable d’environnement (dans Docker uniquement).",
+    "kbnConfig.deprecations.replacedSettingMessage": "Le paramètre \"{fullOldPath}\" a été remplacé par \"{fullNewPath}\".",
+    "kbnConfig.deprecations.unusedSetting.manualStepOneMessage": "Retirez \"{fullPath}\" dans le fichier de configuration Kibana, l'indicateur CLI ou la variable d'environnement (dans Docker uniquement).",
+    "kbnConfig.deprecations.unusedSettingMessage": "Vous n’avez plus besoin de configurer \"{fullPath}\".",
     "kibana_utils.history.savedObjectIsMissingNotificationMessage": "L'objet enregistré est manquant.",
     "kibana_utils.stateManagement.stateHash.unableToRestoreUrlErrorMessage": "Impossible de restaurer complètement l'URL. Assurez-vous d'utiliser la fonctionnalité de partage.",
     "kibana_utils.stateManagement.stateHash.unableToStoreHistoryInSessionErrorMessage": "Kibana n'est pas en mesure de stocker des éléments d'historique dans votre session, car le stockage est arrivé à saturation et il ne semble pas y avoir d'éléments pouvant être supprimés sans risque.\n\nCe problème peut généralement être corrigé en passant à un nouvel onglet, mais il peut être causé par un problème plus important. Si ce message s'affiche régulièrement, veuillez nous en faire part sur {gitHubIssuesUrl}.",
@@ -4035,6 +4949,7 @@
     "kibana-react.exitFullScreenButton.exitFullScreenModeButtonAriaLabel": "Quitter le mode Plein écran",
     "kibana-react.exitFullScreenButton.exitFullScreenModeButtonText": "Quitter le plein écran",
     "kibana-react.exitFullScreenButton.fullScreenModeDescription": "En mode Plein écran, appuyez sur Échap pour quitter.",
+    "kibana-react.kbnOverviewPageHeader.addIntegrationsButtonLabel": "Ajouter des intégrations",
     "kibana-react.kbnOverviewPageHeader.devToolsButtonLabel": "Outils de développement",
     "kibana-react.kbnOverviewPageHeader.stackManagementButtonLabel": "Gérer",
     "kibana-react.kibanaCodeEditor.ariaLabel": "Éditeur de code",
@@ -4048,9 +4963,12 @@
     "kibana-react.noDataPage.cantDecide": "Vous ne savez pas quoi utiliser ? {link}",
     "kibana-react.noDataPage.cantDecide.link": "Consultez la documentation pour en savoir plus.",
     "kibana-react.noDataPage.elasticAgentCard.description": "Utilisez Elastic Agent pour collecter de manière simple et unifiée les données de vos machines.",
+    "kibana-react.noDataPage.elasticAgentCard.noPermission.description": "Cette intégration n'est pas encore activée. Votre administrateur possède les autorisations requises pour l’activer.",
+    "kibana-react.noDataPage.elasticAgentCard.noPermission.title": "Contactez votre administrateur",
     "kibana-react.noDataPage.elasticAgentCard.title": "Ajouter Elastic Agent",
     "kibana-react.noDataPage.intro": "Ajoutez vos données pour commencer, ou {link} sur {solution}.",
     "kibana-react.noDataPage.intro.link": "en savoir plus",
+    "kibana-react.noDataPage.noDataCard.description": "Continuer sans collecter de données",
     "kibana-react.noDataPage.noDataPage.recommended": "Recommandé",
     "kibana-react.noDataPage.welcomeTitle": "Bienvenue dans Elastic {solution}.",
     "kibana-react.pageFooter.changeDefaultRouteSuccessToast": "Page de destination mise à jour",
@@ -4085,7 +5003,10 @@
     "kibanaOverview.manageData.sectionTitle": "Gérer vos données",
     "kibanaOverview.more.title": "Toujours plus avec Elastic",
     "kibanaOverview.news.title": "Nouveautés",
-    "kibanaOverview.noDataConfig.solutionName": "Analytique",
+    "kibanaOverview.noDataConfig.description": "Utilisez Elastic Agent ou Beats pour collecter des données et créer des solutions Analytics.",
+    "kibanaOverview.noDataConfig.pageTitle": "Bienvenue dans Analytics !",
+    "kibanaOverview.noDataConfig.solutionName": "Analyse",
+    "kibanaOverview.noDataConfig.title": "Ajouter des intégrations",
     "lists.exceptions.doesNotExistOperatorLabel": "n'existe pas",
     "lists.exceptions.existsOperatorLabel": "existe",
     "lists.exceptions.isInListOperatorLabel": "est dans la liste",
@@ -4094,6 +5015,7 @@
     "lists.exceptions.isNotOperatorLabel": "n'est pas",
     "lists.exceptions.isOneOfOperatorLabel": "est l'une des options suivantes",
     "lists.exceptions.isOperatorLabel": "est",
+    "lists.exceptions.matchesOperatorLabel": "correspond à",
     "management.breadcrumb": "Gestion de la Suite",
     "management.landing.header": "Bienvenue dans Gestion de la Suite {version}",
     "management.landing.subhead": "Gérez vos index, modèles d'indexation, objets enregistrés, paramètres Kibana et plus encore.",
@@ -4127,11 +5049,23 @@
     "newsfeed.headerButton.unreadAriaLabel": "Menu du fil d'actualités – Éléments non lus disponibles",
     "newsfeed.loadingPrompt.gettingNewsText": "Obtention des dernières actualités…",
     "presentationUtil.dashboardPicker.searchDashboardPlaceholder": "Recherche dans les tableaux de bord…",
+    "presentationUtil.dataViewPicker.changeDataViewTitle": "Vue de données",
+    "presentationUtil.expressionInput.argReferenceAliasesDetail": "{BOLD_MD_TOKEN}Alias{BOLD_MD_TOKEN} : {aliases}",
+    "presentationUtil.expressionInput.argReferenceDefaultDetail": "{BOLD_MD_TOKEN}Par défaut{BOLD_MD_TOKEN} : {defaultVal}",
+    "presentationUtil.expressionInput.argReferenceRequiredDetail": "{BOLD_MD_TOKEN}Requis{BOLD_MD_TOKEN} : {required}",
+    "presentationUtil.expressionInput.argReferenceTypesDetail": "{BOLD_MD_TOKEN}Types{BOLD_MD_TOKEN} : {types}",
+    "presentationUtil.expressionInput.functionReferenceAccepts": "{BOLD_MD_TOKEN}Accepte{BOLD_MD_TOKEN} : {acceptTypes}",
+    "presentationUtil.expressionInput.functionReferenceReturns": "{BOLD_MD_TOKEN}Renvoie{BOLD_MD_TOKEN} : {returnType}",
+    "presentationUtil.fieldPicker.noDataViewLabel": "Aucune vue de données sélectionnée",
+    "presentationUtil.fieldPicker.noFieldsLabel": "Aucun champ correspondant",
+    "presentationUtil.fieldSearch.fieldFilterButtonLabel": "Filtrer par type",
+    "presentationUtil.fieldSearch.filterByTypeLabel": "Filtrer par type",
+    "presentationUtil.fieldSearch.searchPlaceHolder": "Rechercher les noms de champs",
     "presentationUtil.labs.components.browserSwitchHelp": "Active l'atelier pour ce navigateur et persiste après sa fermeture.",
     "presentationUtil.labs.components.browserSwitchName": "Navigateur",
     "presentationUtil.labs.components.calloutHelp": "Actualiser pour appliquer les modifications",
     "presentationUtil.labs.components.closeButtonLabel": "Fermer",
-    "presentationUtil.labs.components.descriptionMessage": "Essayez nos fonctionnalités expérimentales ou en cours.",
+    "presentationUtil.labs.components.descriptionMessage": "Essayez des fonctionnalités en cours ou en version d’évaluation technique.",
     "presentationUtil.labs.components.disabledStatusMessage": "Par défaut : {status}",
     "presentationUtil.labs.components.enabledStatusMessage": "Par défaut : {status}",
     "presentationUtil.labs.components.kibanaSwitchHelp": "Active cet atelier pour tous les utilisateurs Kibana.",
@@ -4145,6 +5079,10 @@
     "presentationUtil.labs.components.sessionSwitchHelp": "Active l’atelier pour cette session de navigateur afin de le réinitialiser lors de sa fermeture.",
     "presentationUtil.labs.components.sessionSwitchName": "Session",
     "presentationUtil.labs.components.titleLabel": "Ateliers",
+    "presentationUtil.labs.enableByValueEmbeddableDescription": "Active la prise en charge pour les éléments d’incorporation by-value dans Canvas",
+    "presentationUtil.labs.enableByValueEmbeddableName": "Éléments d’incorporation By-Value",
+    "presentationUtil.labs.enableDashboardControlsProjectDescription": "Active le système de contrôles pour le tableau de bord, ce qui permet à ses auteurs de créer plus facilement des éléments interactifs pour leurs utilisateurs.",
+    "presentationUtil.labs.enableDashboardControlsProjectName": "Activer les contrôles pour le tableau de bord",
     "presentationUtil.labs.enableDeferBelowFoldProjectDescription": "Les panneaux sous \"le pli\" (la zone masquée en dessous de la fenêtre accessible en faisant défiler), ne se chargeront pas immédiatement, mais seulement lorsqu'ils entreront dans la fenêtre d'affichage.",
     "presentationUtil.labs.enableDeferBelowFoldProjectName": "Différer le chargement des panneaux sous \"le pli\"",
     "presentationUtil.saveModalDashboard.addToDashboardLabel": "Ajouter au tableau de bord",
@@ -4189,8 +5127,11 @@
     "savedObjects.saveModalOrigin.addToOriginLabel": "Ajouter",
     "savedObjects.saveModalOrigin.originAfterSavingSwitchLabel": "{originVerb} à {origin} après l'enregistrement",
     "savedObjects.saveModalOrigin.returnToOriginLabel": "Renvoyer",
-    "savedObjects.saveModalOrigin.saveAndReturnLabel": "Enregistrer et renvoyer",
+    "savedObjects.saveModalOrigin.saveAndReturnLabel": "Enregistrer et revenir",
     "savedObjectsManagement.breadcrumb.index": "Objets enregistrés",
+    "savedObjectsManagement.breadcrumb.inspect": "Inspecter {savedObjectType}",
+    "savedObjectsManagement.copyToSpace.actionDescription": "Effectuer une copie de cet objet enregistré dans un ou plusieurs espaces",
+    "savedObjectsManagement.copyToSpace.actionTitle": "Copier vers l'espace",
     "savedObjectsManagement.deleteConfirm.modalDeleteButtonLabel": "Supprimer",
     "savedObjectsManagement.deleteConfirm.modalDescription": "Cette action supprime définitivement l'objet de Kibana.",
     "savedObjectsManagement.deleteConfirm.modalTitle": "Supprimer \"{title}\" ?",
@@ -4204,9 +5145,10 @@
     "savedObjectsManagement.importSummary.overwrittenOutcomeLabel": "Écrasé",
     "savedObjectsManagement.importSummary.warnings.defaultButtonLabel": "Go",
     "savedObjectsManagement.managementSectionLabel": "Objets enregistrés",
-    "savedObjectsManagement.objects.savedObjectsDescription": "Importez, exportez et gérez vos recherches enregistrées, vos visualisations et vos tableaux de bord.",
+    "savedObjectsManagement.objects.savedObjectsDescription": "Importez, exportez et gérez vos objets enregistrés.",
     "savedObjectsManagement.objects.savedObjectsTitle": "Objets enregistrés",
-    "savedObjectsManagement.objectsTable.deleteConfirmModal.cannotDeleteCallout.title": "Certains objets ne peuvent pas être supprimés.",
+    "savedObjectsManagement.objectsTable.deleteConfirmModal.cannotDeleteCallout.content": "{objectCount, plural, one {# objet est masqué et ne peut pas être supprimé} other {# objets sont masqués et ne peuvent pas être supprimés}}. {objectCount, plural, one {Il a été exclu} other {Ils ont été exclus}} du récapitulatif du tableau.",
+    "savedObjectsManagement.objectsTable.deleteConfirmModal.cannotDeleteCallout.title": "Certains objets ne peuvent pas être supprimés",
     "savedObjectsManagement.objectsTable.deleteConfirmModal.sharedObjectsCallout.content": "Les objets partagés sont supprimés de tous les espaces dans lesquels ils se trouvent.",
     "savedObjectsManagement.objectsTable.deleteConfirmModal.sharedObjectsCallout.title": "{sharedObjectsCount, plural, one {# objet enregistré est partagé} other {# de vos objets enregistrés sont partagés}}.",
     "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "Annuler",
@@ -4218,6 +5160,7 @@
     "savedObjectsManagement.objectsTable.export.successNotification": "Votre fichier est en cours de téléchargement en arrière-plan.",
     "savedObjectsManagement.objectsTable.export.successWithExcludedObjectsNotification": "Votre fichier est en cours de téléchargement en arrière-plan. Certains objets ont été exclus de l'export. Vous trouverez la liste des objets exclus à la dernière ligne du fichier exporté.",
     "savedObjectsManagement.objectsTable.export.successWithMissingRefsNotification": "Votre fichier est en cours de téléchargement en arrière-plan. Certains objets associés sont introuvables. Vous trouverez la liste des objets manquants à la dernière ligne du fichier exporté.",
+    "savedObjectsManagement.objectsTable.export.toastErrorMessage": "Impossible de générer l'export : {error}",
     "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "Annuler",
     "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "Exporter tout",
     "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "Options",
@@ -4232,14 +5175,14 @@
     "savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "Importer les objets enregistrés",
     "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "Confirmer toutes les modifications",
     "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "Terminé",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "créer un nouveau modèle d'indexation",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "Les objets enregistrés suivants utilisent des modèles d'indexation qui n'existent pas. Veuillez sélectionner les modèles d'indexation que vous souhaitez réassocier aux objets. Vous pouvez {indexPatternLink} si nécessaire.",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "Conflits de modèle d'indexation",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "créer une nouvelle vue de données",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "Les objets enregistrés suivants utilisent des vues de données qui n'existent pas. Veuillez sélectionner les vues de données que vous souhaitez réassocier. Vous pouvez {indexPatternLink} si nécessaire.",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "Conflits de vues de données",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "Nombre d'objets concernés",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "Décompte",
-    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "ID du modèle d'indexation",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "ID de la vue de données",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "Nouveau modèle d'indexation",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "Nouvelle vue de données",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "Exemple d'objets concernés",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "Exemple d'objets concernés",
     "savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "Sélectionner un fichier à importer",
@@ -4297,12 +5240,23 @@
     "savedObjectsManagement.objectsTable.table.deleteButtonTitle": "Impossible de supprimer les objets enregistrés",
     "savedObjectsManagement.objectsTable.table.exportButtonLabel": "Exporter",
     "savedObjectsManagement.objectsTable.table.exportPopoverButtonLabel": "Exporter",
+    "savedObjectsManagement.objectsTable.table.tooManyResultsLabel": "Affichage de {limit} de {totalItemCount, plural, one {# objet} other {# objets}}",
     "savedObjectsManagement.objectsTable.table.typeFilterName": "Type",
     "savedObjectsManagement.objectsTable.unableFindSavedObjectNotificationMessage": "Objet enregistré introuvable",
     "savedObjectsManagement.objectsTable.unableFindSavedObjectsNotificationMessage": "Objets enregistrés introuvables",
     "savedObjectsManagement.objectView.unableFindSavedObjectNotificationMessage": "Objet enregistré introuvable",
-    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "Un champ associé à cet objet n'existe plus dans le modèle d'indexation.",
-    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "Le modèle d'indexation associé à cet objet n'existe plus.",
+    "savedObjectsManagement.shareToSpace.actionDescription": "Partager cet objet enregistré dans un ou plusieurs espaces",
+    "savedObjectsManagement.shareToSpace.actionTitle": "Partager dans l'espace",
+    "savedObjectsManagement.shareToSpace.columnDescription": "Autres espaces dans lesquels cet objet est actuellement partagé",
+    "savedObjectsManagement.shareToSpace.columnTitle": "Espaces partagés",
+    "savedObjectsManagement.view.copyToClipboardLabel": "Copier dans le presse-papiers",
+    "savedObjectsManagement.view.deleteItemButtonLabel": "Supprimer",
+    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "Un champ associé à cet objet n'existe plus dans la vue de données.",
+    "savedObjectsManagement.view.howToFixErrorDescription": "Si vous savez à quoi cette erreur fait référence, vous pouvez utiliser les {savedObjectsApis} pour la corriger. Sinon, cliquez sur le bouton Supprimer ci-dessus.",
+    "savedObjectsManagement.view.howToFixErrorDescriptionLinkText": "API des objets enregistrés",
+    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "La vue de données associée à cet objet n'existe plus.",
+    "savedObjectsManagement.view.inspectCodeEditorAriaLabel": "inspecter { title }",
+    "savedObjectsManagement.view.inspectItemTitle": "Inspecter {title}",
     "savedObjectsManagement.view.savedObjectProblemErrorMessage": "Un problème est survenu avec cet objet enregistré.",
     "savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage": "La recherche enregistrée associée à cet objet n'existe plus.",
     "savedObjectsManagement.view.viewItemButtonLabel": "Afficher {title}",
@@ -4336,6 +5290,18 @@
     "share.urlService.redirect.RedirectManager.missingParamLocator": "ID du localisateur non spécifié. Spécifiez le paramètre de recherche \"l\" dans l'URL ; ce devrait être un ID de localisateur existant.",
     "share.urlService.redirect.RedirectManager.missingParamParams": "Paramètres du localisateur non spécifiés. Spécifiez le paramètre de recherche \"p\" dans l'URL ; ce devrait être un objet sérialisé JSON des paramètres du localisateur.",
     "share.urlService.redirect.RedirectManager.missingParamVersion": "Version des paramètres du localisateur non spécifiée. Spécifiez le paramètre de recherche \"v\" dans l'URL ; ce devrait être la version de Kibana au moment de la génération des paramètres du localisateur.",
+    "sharedUXComponents.noDataPage.elasticAgentCard.description": "Utilisez Elastic Agent pour collecter de manière simple et unifiée les données de vos machines.",
+    "sharedUXComponents.noDataPage.elasticAgentCard.noPermission.description": "Cette intégration n'est pas encore activée. Votre administrateur possède les autorisations requises pour l’activer.",
+    "sharedUXComponents.noDataPage.elasticAgentCard.noPermission.title": "Contactez votre administrateur",
+    "sharedUXComponents.noDataPage.elasticAgentCard.title": "Ajouter Elastic Agent",
+    "sharedUXComponents.noDataViews.dataViewExplanation": "Kibana a besoin d'une vue de données pour identifier les flux de données, les index et les alias d'index que vous souhaitez explorer. Une vue de données peut pointer vers un index spécifique, par exemple, vos données de log de la veille ou tous les index contenant vos données de log.",
+    "sharedUXComponents.noDataViews.learnMore": "Envie d'en savoir plus ?",
+    "sharedUXComponents.noDataViews.nowCreate": "Créez à présent une vue de données.",
+    "sharedUXComponents.noDataViews.readDocumentation": "Lisez les documents",
+    "sharedUXComponents.noDataViews.youHaveData": "Vous avez des données dans Elasticsearch.",
+    "sharedUXComponents.noDataViewsPage.addDataViewText": "Créer une vue de données",
+    "sharedUXComponents.pageTemplate.noDataCard.description": "Continuer sans collecter de données",
+    "sharedUXComponents.toolbar.buttons.addFromLibrary.libraryButtonLabel": "Ajouter depuis la bibliothèque",
     "telemetry.callout.appliesSettingTitle": "Les modifications apportées à ce paramètre s'appliquent dans {allOfKibanaText} et sont enregistrées automatiquement.",
     "telemetry.callout.appliesSettingTitle.allOfKibanaText": "tout Kibana",
     "telemetry.callout.clusterStatisticsDescription": "Voici un exemple des statistiques de cluster de base que nous collecterons. Cela comprend le nombre d'index, de partitions et de nœuds. Cela comprend également des statistiques d'utilisation de niveau élevé, comme l'état d'activation du monitoring.",
@@ -4345,14 +5311,23 @@
     "telemetry.callout.errorUnprivilegedUserDescription": "Vous ne disposez pas de l'accès requis pour voir les statistiques non chiffrées du cluster.",
     "telemetry.callout.errorUnprivilegedUserTitle": "Erreur lors de l'affichage des statistiques du cluster",
     "telemetry.clusterData": "données du cluster",
+    "telemetry.dataManagementDisableCollection": " Pour mettre fin à la collecte, ",
+    "telemetry.dataManagementDisableCollectionLink": "désactivez les données d'utilisation ici.",
+    "telemetry.dataManagementDisclaimerPrivacy": "Pour en savoir plus sur la manière dont les données d'utilisation nous aident à gérer et à améliorer nos produits et nos services, consultez notre ",
+    "telemetry.dataManagementDisclaimerPrivacyLink": "Déclaration de confidentialité.",
+    "telemetry.dataManagementEnableCollection": " Pour démarrer la collecte, ",
+    "telemetry.dataManagementEnableCollectionLink": "activez les données d'utilisation ici.",
     "telemetry.optInErrorToastText": "Une erreur s'est produite lors de la définition des préférences relatives aux statistiques d'utilisation.",
     "telemetry.optInErrorToastTitle": "Erreur",
     "telemetry.optInNoticeSeenErrorTitle": "Erreur",
     "telemetry.optInNoticeSeenErrorToastText": "Une erreur s'est produite lors du rejet de l'avis.",
     "telemetry.optInSuccessOff": "Collecte des données d'utilisation désactivée.",
     "telemetry.optInSuccessOn": "Collecte des données d'utilisation activée.",
+    "telemetry.provideUsageDataAriaName": "Fournissez les données d’utilisation",
+    "telemetry.provideUsageDataTitle": "Fournissez les données d’utilisation",
     "telemetry.readOurUsageDataPrivacyStatementLinkText": "Déclaration de confidentialité",
-    "telemetry.securityData": "données de sécurité des points de terminaison",
+    "telemetry.securityData": "données de sécurité",
+    "telemetry.seeExampleOfClusterDataAndEndpointSecuity": "Découvrez des exemples de {clusterData} et de {securityData} que nous collectons.",
     "telemetry.telemetryBannerDescription": "Vous souhaitez nous aider à améliorer la Suite Elastic ? La collecte de données d'utilisation est actuellement désactivée. En activant la collecte de données d'utilisation, vous nous aidez à gérer et à améliorer nos produits et nos services. Consultez notre {privacyStatementLink} pour plus d'informations.",
     "telemetry.telemetryConfigAndLinkDescription": "En activant la collecte de données d'utilisation, vous nous aidez à gérer et à améliorer nos produits et nos services. Consultez notre {privacyStatementLink} pour plus d'informations.",
     "telemetry.telemetryOptedInDisableUsage": "désactivez les données d'utilisation ici",
@@ -4370,6 +5345,7 @@
     "timelion.expressionSuggestions.func.description.chainableHelpText": "Enchaînable",
     "timelion.expressionSuggestions.func.description.dataSourceHelpText": "Source de données",
     "timelion.fitFunctions.carry.downSampleErrorMessage": "N'utilisez pas la méthode fit \"carry\" pour sous-échantillonner, utilisez \"scale\" ou \"average\".",
+    "timelion.function.args.ariaLabelHelpText": "Spécifie l’attribut aria-label du timelion",
     "timelion.function.help": "Visualisation Timelion",
     "timelion.help.functions.absHelpText": "Renvoyer la valeur absolue de chaque valeur dans la liste des séries",
     "timelion.help.functions.aggregate.args.functionHelpText": "L'une des options suivantes : {functions}.",
@@ -4503,6 +5479,7 @@
     "timelion.serverSideErrors.colorFunction.colorNotProvidedErrorMessage": "couleur non spécifiée",
     "timelion.serverSideErrors.conditionFunction.unknownOperatorErrorMessage": "Opérateur inconnu",
     "timelion.serverSideErrors.conditionFunction.wrongArgTypeErrorMessage": "doit être un nombre ou une liste de séries",
+    "timelion.serverSideErrors.errorInCell": " dans la cellule #{number} : {message}",
     "timelion.serverSideErrors.esFunction.indexNotFoundErrorMessage": "Index Elasticsearch introuvable : {index}",
     "timelion.serverSideErrors.holtFunction.missingParamsErrorMessage": "Vous devez spécifier une longueur de saison et une taille d'échantillon >= 2.",
     "timelion.serverSideErrors.holtFunction.notEnoughPointsErrorMessage": "Au moins 2 points sont nécessaires pour utiliser le lissage exponentiel double.",
@@ -4519,7 +5496,7 @@
     "timelion.timelionDescription": "Affichez des données temporelles sur un graphe.",
     "timelion.uiSettings.defaultIndexDescription": "Index Elasticsearch par défaut dans lequel rechercher avec {esParam}",
     "timelion.uiSettings.defaultIndexLabel": "Index par défaut",
-    "timelion.uiSettings.legacyChartsLibraryDeprication": "Ce paramètre est déclassé et ne sera plus pris en charge à partir de la version 8.0.",
+    "timelion.uiSettings.legacyChartsLibraryDeprication": "Ce paramètre est déclassé et ne sera plus compatible avec les futures versions.",
     "timelion.uiSettings.legacyChartsLibraryDescription": "Active la bibliothèque de graphiques héritée pour les graphiques Timelion dans Visualize.",
     "timelion.uiSettings.legacyChartsLibraryLabel": "Bibliothèque de graphiques Timelion héritée",
     "timelion.uiSettings.maximumBucketsDescription": "Le nombre maximal de compartiments qu'une source de données unique peut renvoyer",
@@ -4548,6 +5525,8 @@
     "uiActions.errors.incompatibleAction": "Action non compatible",
     "uiActions.triggers.rowClickkDescription": "Un clic sur une ligne de tableau",
     "uiActions.triggers.rowClickTitle": "Clic sur ligne de tableau",
+    "utils.filename.pathWarning": "Le chemin est peut-être incorrectement formé ; vérifiez la valeur",
+    "utils.filename.wildcardWarning": "L’utilisation de caractères génériques dans les chemins de fichier peut affecter les performances du point de terminaison",
     "visDefaultEditor.advancedToggle.advancedLinkLabel": "Avancé",
     "visDefaultEditor.agg.disableAggButtonTooltip": "Désactiver l'agrégation {aggTitle} de {schemaTitle}",
     "visDefaultEditor.agg.enableAggButtonTooltip": "Activer l'agrégation {aggTitle} de {schemaTitle}",
@@ -4679,6 +5658,15 @@
     "visDefaultEditor.options.colorSchema.howToChangeColorsDescription": "Les couleurs individuelles peuvent être modifiées dans la légende.",
     "visDefaultEditor.options.colorSchema.resetColorsButtonLabel": "Réinitialiser les couleurs",
     "visDefaultEditor.options.colorSchema.reverseColorSchemaLabel": "Inverser le schéma",
+    "visDefaultEditor.options.legendSizeSetting.label": "Taille de la légende",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.auto": "Auto",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.extraLarge": "Très grande",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.large": "Large",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.medium": "Moyenne",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.small": "Petite",
+    "visDefaultEditor.options.legendSizeSetting.legendVertical": "Requiert que la légende soit alignée à droite ou à gauche",
+    "visDefaultEditor.options.longLegends.maxLegendLinesLabel": "Nombre maxi de lignes de légende",
+    "visDefaultEditor.options.longLegends.truncateLegendTextLabel": "Tronquer le texte de la légende",
     "visDefaultEditor.options.percentageMode.documentationLabel": "Documentation Numeral.js",
     "visDefaultEditor.options.percentageMode.numeralLabel": "Modèle de format",
     "visDefaultEditor.options.percentageMode.percentageModeLabel": "Mode de pourcentage",
@@ -4707,6 +5695,71 @@
     "visDefaultEditor.sidebar.tabs.optionsLabel": "Options",
     "visDefaultEditor.sidebar.updateChartButtonLabel": "Mettre à jour",
     "visDefaultEditor.sidebar.updateInfoTooltip": "CTRL + Entrée est le raccourci clavier pour Mettre à jour.",
+    "visTypeGauge.advancedSettings.visualization.legacyGaugeChartsLibrary.description": "Active la bibliothèque de graphiques héritée pour les graphiques de jauge dans Visualize.",
+    "visTypeGauge.advancedSettings.visualization.legacyGaugeChartsLibrary.name": "Bibliothèque de graphiques héritée pour les jauges",
+    "visTypeGauge.controls.gaugeOptions.alignmentLabel": "Alignement",
+    "visTypeGauge.controls.gaugeOptions.autoExtendRangeLabel": "Étendre automatiquement la plage",
+    "visTypeGauge.controls.gaugeOptions.extendRangeTooltip": "Étend la plage jusqu'à la valeur maximale de vos données.",
+    "visTypeGauge.controls.gaugeOptions.extendRangeTooltipNotAvailable": "La nouvelle bibliothèque de graphiques n’est compatible qu’avec les plages étendues. Pour la désactiver, veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les jauges.",
+    "visTypeGauge.controls.gaugeOptions.gaugeTypeLabel": "Type de jauge",
+    "visTypeGauge.controls.gaugeOptions.labelsTitle": "Étiquettes",
+    "visTypeGauge.controls.gaugeOptions.rangesTitle": "Plages",
+    "visTypeGauge.controls.gaugeOptions.showLabelsLabel": "Afficher les étiquettes",
+    "visTypeGauge.controls.gaugeOptions.showLegendLabel": "Afficher la légende",
+    "visTypeGauge.controls.gaugeOptions.showLegendNotAvailable": "La légende n’est pas prise en charge avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les jauges.",
+    "visTypeGauge.controls.gaugeOptions.showOutline": "Afficher le contour",
+    "visTypeGauge.controls.gaugeOptions.showOutlineNotAvailable": "Le contour n’est pas pris en charge avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les jauges.",
+    "visTypeGauge.controls.gaugeOptions.showScaleLabel": "Afficher l'échelle",
+    "visTypeGauge.controls.gaugeOptions.styleTitle": "Style",
+    "visTypeGauge.controls.gaugeOptions.subTextLabel": "Sous-étiquette",
+    "visTypeGauge.editors.gauge.alignmentNotAvailable": "L’alignement n’est pas encore pris en charge avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les jauges.",
+    "visTypeGauge.gauge.alignmentAutomaticTitle": "Automatique",
+    "visTypeGauge.gauge.alignmentHorizontalTitle": "Horizontal",
+    "visTypeGauge.gauge.alignmentVerticalTitle": "Vertical",
+    "visTypeGauge.gauge.gaugeDescription": "Affichez le statut d'un indicateur.",
+    "visTypeGauge.gauge.gaugeTitle": "Jauge",
+    "visTypeGauge.gauge.gaugeTypes.arcText": "Arc",
+    "visTypeGauge.gauge.gaugeTypes.circleText": "Cercle",
+    "visTypeGauge.gauge.groupTitle": "Diviser le groupe",
+    "visTypeGauge.gauge.metricTitle": "Indicateur",
+    "visTypeGauge.goal.goalDescription": "Suivez la progression d'un indicateur vers un objectif.",
+    "visTypeGauge.goal.goalTitle": "Objectif",
+    "visTypeGauge.goal.groupTitle": "Diviser le groupe",
+    "visTypeGauge.goal.metricTitle": "Indicateur",
+    "visTypeGauge.splitTitle.tooltip": "L’agrégation de graphique divisé n’est pas encore compatible avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les jauges afin d’utiliser l’agrégation de graphique divisé.",
+    "visTypeHeatmap.advancedSettings.visualization.legacyHeatmapChartsLibrary.description": "Active la bibliothèque de graphiques héritée pour les graphiques à carte thermique dans Visualize.",
+    "visTypeHeatmap.advancedSettings.visualization.legacyHeatmapChartsLibrary.name": "Bibliothèque de graphiques héritée pour les cartes thermiques",
+    "visTypeHeatmap.controls.heatmapOptions.colorLabel": "Couleur",
+    "visTypeHeatmap.controls.heatmapOptions.colorScaleLabel": "Échelle de couleurs",
+    "visTypeHeatmap.controls.heatmapOptions.colorsNumberLabel": "Nombre de couleurs",
+    "visTypeHeatmap.controls.heatmapOptions.labelsTitle": "Étiquettes",
+    "visTypeHeatmap.controls.heatmapOptions.overwriteAutomaticColorLabel": "Écraser la couleur automatique",
+    "visTypeHeatmap.controls.heatmapOptions.rotateLabel": "Faire pivoter",
+    "visTypeHeatmap.controls.heatmapOptions.scaleToDataBoundsLabel": "Scaler sur les limites de données",
+    "visTypeHeatmap.controls.heatmapOptions.showLabelsTitle": "Afficher les étiquettes",
+    "visTypeHeatmap.controls.heatmapOptions.useCustomRangesLabel": "Utiliser les plages personnalisées",
+    "visTypeHeatmap.editors.heatmap.basicSettingsTitle": "Paramètres de base",
+    "visTypeHeatmap.editors.heatmap.colorScaleTooltipNotAvailable": "L’échelle de couleurs n’est pas compatible avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les cartes thermiques.",
+    "visTypeHeatmap.editors.heatmap.heatmapSettingsTitle": "Paramètres de la carte thermique",
+    "visTypeHeatmap.editors.heatmap.highlightLabel": "Mettre la plage en surbrillance",
+    "visTypeHeatmap.editors.heatmap.highlightLabelTooltip": "Met en surbrillance la plage survolée dans le graphique et l'étiquette correspondante dans la légende.",
+    "visTypeHeatmap.editors.heatmap.highlightLabelTooltipNotAvailable": "La mise en surbrillance de la plage survolée n’est pas encore compatible avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les cartes thermiques.",
+    "visTypeHeatmap.editors.heatmap.overwriteColorlNotAvailable": "Le remplacement automatique des couleurs n’est pas compatible avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les cartes thermiques.",
+    "visTypeHeatmap.editors.heatmap.rotateLabelNotAvailable": "La rotation de l’étiquette n’est pas compatible avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les cartes thermiques.",
+    "visTypeHeatmap.heatmap.groupTitle": "Axe Y",
+    "visTypeHeatmap.heatmap.heatmapDescription": "Affichez les valeurs en tant que couleurs dans une matrice.",
+    "visTypeHeatmap.heatmap.heatmapTitle": "Carte thermique",
+    "visTypeHeatmap.heatmap.metricTitle": "Valeur",
+    "visTypeHeatmap.heatmap.segmentTitle": "Axe X",
+    "visTypeHeatmap.heatmap.splitTitle": "Diviser le graphique",
+    "visTypeHeatmap.legendPositions.bottomText": "Bas",
+    "visTypeHeatmap.legendPositions.leftText": "Gauche",
+    "visTypeHeatmap.legendPositions.rightText": "Droite",
+    "visTypeHeatmap.legendPositions.topText": "Haut",
+    "visTypeHeatmap.scaleTypes.linearText": "Linéaire",
+    "visTypeHeatmap.scaleTypes.logText": "Logarithmique",
+    "visTypeHeatmap.scaleTypes.squareRootText": "Racine carrée",
+    "visTypeHeatmap.splitTitle.tooltip": "L’agrégation de graphique divisé n’est pas encore compatible avec la nouvelle bibliothèque de graphiques. Veuillez activer le paramètre avancé de la bibliothèque de graphiques héritée pour les cartes thermiques afin d’utiliser l’agrégation de graphique divisé.",
     "visTypeMarkdown.function.font.help": "Paramètres de police.",
     "visTypeMarkdown.function.help": "Visualisation Markdown",
     "visTypeMarkdown.function.markdown.help": "Markdown à rendre",
@@ -4731,21 +5784,27 @@
     "visTypeMetric.params.style.styleTitle": "Style",
     "visTypeMetric.schemas.metricTitle": "Indicateur",
     "visTypeMetric.schemas.splitGroupTitle": "Diviser le groupe",
-    "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation": "La bibliothèque de graphiques héritée pour les camemberts dans Visualize est déclassée et ne sera plus prise en charge à partir de la version 8.0.",
+    "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation": "La bibliothèque de graphiques héritée pour les camemberts dans Visualize est déclassée et ne sera plus compatible à partir de la version 8.0.",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.description": "Active la bibliothèque de graphiques héritée pour les camemberts dans Visualize.",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.name": "Bibliothèque de graphiques héritée pour les camemberts",
     "visTypePie.controls.truncateLabel": "Tronquer",
+    "visTypePie.controls.truncateTooltip": "Nombre de caractères pour les étiquettes positionnées en dehors du graphique.",
     "visTypePie.editors.pie.decimalSliderLabel": "Nombre maximal de décimales pour les pourcentages",
     "visTypePie.editors.pie.distinctColorsLabel": "Utiliser des couleurs distinctes pour chaque section",
     "visTypePie.editors.pie.donutLabel": "Graphique en anneau",
+    "visTypePie.editors.pie.emptySizeRatioLabel": "Taille de la zone intérieure",
     "visTypePie.editors.pie.labelPositionLabel": "Position de l'étiquette",
     "visTypePie.editors.pie.labelsSettingsTitle": "Paramètres des étiquettes",
+    "visTypePie.editors.pie.legendDisplayLabel": "Afficher la légende",
     "visTypePie.editors.pie.nestedLegendLabel": "Imbriquer la légende",
     "visTypePie.editors.pie.pieSettingsTitle": "Paramètres du camembert",
     "visTypePie.editors.pie.showLabelsLabel": "Afficher les étiquettes",
     "visTypePie.editors.pie.showTopLevelOnlyLabel": "Afficher uniquement le niveau supérieur",
     "visTypePie.editors.pie.showValuesLabel": "Afficher les valeurs",
     "visTypePie.editors.pie.valueFormatsLabel": "Valeurs",
+    "visTypePie.emptySizeRatioOptions.large": "Large",
+    "visTypePie.emptySizeRatioOptions.medium": "Moyenne",
+    "visTypePie.emptySizeRatioOptions.small": "Petite",
     "visTypePie.labelPositions.insideOrOutsideText": "Intérieur ou extérieur",
     "visTypePie.labelPositions.insideText": "Intérieur",
     "visTypePie.legendPositions.bottomText": "Bas",
@@ -4776,6 +5835,7 @@
     "visTypeTable.function.dimension.splitColumn": "Diviser par colonne",
     "visTypeTable.function.dimension.splitRow": "Diviser par ligne",
     "visTypeTable.function.help": "Visualisation du tableau",
+    "visTypeTable.params.autoFitRow": "Ajuster automatiquement les lignes au contenu",
     "visTypeTable.params.defaultPercentageCol": "Ne pas afficher",
     "visTypeTable.params.PercentageColLabel": "Colonne de pourcentage",
     "visTypeTable.params.percentageTableColumnName": "Pourcentages de {title}",
@@ -4811,7 +5871,7 @@
     "visTypeTagCloud.orientations.rightAngledText": "Angle droit",
     "visTypeTagCloud.orientations.singleText": "Unique",
     "visTypeTagCloud.scales.linearText": "Linéaire",
-    "visTypeTagCloud.scales.logText": "Log",
+    "visTypeTagCloud.scales.logText": "Logarithmique",
     "visTypeTagCloud.scales.squareRootText": "Racine carrée",
     "visTypeTagCloud.vis.schemas.metricTitle": "Taille de balise",
     "visTypeTagCloud.vis.schemas.segmentTitle": "Balises",
@@ -4826,8 +5886,14 @@
     "visTypeTimeseries.addDeleteButtons.deleteButtonDefaultTooltip": "Supprimer",
     "visTypeTimeseries.addDeleteButtons.reEnableTooltip": "Réactiver",
     "visTypeTimeseries.addDeleteButtons.temporarilyDisableTooltip": "Désactiver temporairement",
+    "visTypeTimeseries.advancedSettings.allowCheckingForFailedShardsText": "Afficher un message d’avertissement pour les données partielles dans les graphiques TSVB si la requête réussit pour certaines partitions, mais échoue pour d’autres.",
+    "visTypeTimeseries.advancedSettings.allowCheckingForFailedShardsTitle": "Afficher les échecs de partition de requête TSVB",
+    "visTypeTimeseries.advancedSettings.allowStringIndicesText": "Vous permet d’interroger les index Elasticsearch dans les visualisations <strong>TSVB</strong>.",
+    "visTypeTimeseries.advancedSettings.allowStringIndicesTitle": "Autoriser les index de chaîne dans TSVB",
     "visTypeTimeseries.advancedSettings.maxBucketsText": "A un impact sur la densité de l'histogramme TSVB. Doit être défini sur une valeur supérieure à \"histogram:maxBars\".",
     "visTypeTimeseries.advancedSettings.maxBucketsTitle": "Limite de compartiments TSVB",
+    "visTypeTimeseries.agg.aggIsNotSupportedDescription": "L'agrégation {modelType} n'est plus prise en charge.",
+    "visTypeTimeseries.agg.aggIsUnsupportedForPanelConfigDescription": "L’agrégation {modelType} n’est pas compatible pour la configuration de panneau existante.",
     "visTypeTimeseries.aggRow.addMetricButtonTooltip": "Ajouter un indicateur",
     "visTypeTimeseries.aggRow.deleteMetricButtonTooltip": "Supprimer un indicateur",
     "visTypeTimeseries.aggSelect.aggGroups.metricAggLabel": "Agrégations d'indicateurs",
@@ -4835,6 +5901,38 @@
     "visTypeTimeseries.aggSelect.aggGroups.siblingPipelineAggLabel": "Agrégations de pipelines enfants",
     "visTypeTimeseries.aggSelect.aggGroups.specialAggLabel": "Agrégations spéciales",
     "visTypeTimeseries.aggSelect.selectAggPlaceholder": "Sélectionner une agrégation",
+    "visTypeTimeseries.aggUtils.averageLabel": "Moyenne",
+    "visTypeTimeseries.aggUtils.bucketScriptLabel": "Script de compartiment",
+    "visTypeTimeseries.aggUtils.cardinalityLabel": "Cardinalité",
+    "visTypeTimeseries.aggUtils.countLabel": "Décompte",
+    "visTypeTimeseries.aggUtils.cumulativeSumLabel": "Somme cumulée",
+    "visTypeTimeseries.aggUtils.derivativeLabel": "Dérivée",
+    "visTypeTimeseries.aggUtils.deviationLabel": "Écart type",
+    "visTypeTimeseries.aggUtils.filterRatioLabel": "Rapport de filtre",
+    "visTypeTimeseries.aggUtils.mathLabel": "Mathématique",
+    "visTypeTimeseries.aggUtils.maxLabel": "Max.",
+    "visTypeTimeseries.aggUtils.minLabel": "Min.",
+    "visTypeTimeseries.aggUtils.movingAverageLabel": "Moyenne mobile",
+    "visTypeTimeseries.aggUtils.overallAverageLabel": "Moyenne générale",
+    "visTypeTimeseries.aggUtils.overallMaxLabel": "Max. général",
+    "visTypeTimeseries.aggUtils.overallMinLabel": "Min. général",
+    "visTypeTimeseries.aggUtils.overallStdDeviationLabel": "Écart-type général",
+    "visTypeTimeseries.aggUtils.overallSumLabel": "Somme générale",
+    "visTypeTimeseries.aggUtils.overallSumOfSquaresLabel": "Somme générale des carrés",
+    "visTypeTimeseries.aggUtils.overallVarianceLabel": "Variance générale",
+    "visTypeTimeseries.aggUtils.percentileLabel": "Centile",
+    "visTypeTimeseries.aggUtils.percentileRankLabel": "Rang centile",
+    "visTypeTimeseries.aggUtils.positiveOnlyLabel": "Positif uniquement",
+    "visTypeTimeseries.aggUtils.positiveRateLabel": "Taux de compteur",
+    "visTypeTimeseries.aggUtils.serialDifferenceLabel": "Différenciation en série",
+    "visTypeTimeseries.aggUtils.seriesAggLabel": "Agrégation de séries",
+    "visTypeTimeseries.aggUtils.staticValueLabel": "Valeur statique",
+    "visTypeTimeseries.aggUtils.sumLabel": "Somme",
+    "visTypeTimeseries.aggUtils.sumOfSquaresLabel": "Somme des carrés",
+    "visTypeTimeseries.aggUtils.topHitLabel": "Meilleur résultat",
+    "visTypeTimeseries.aggUtils.valueCountLabel": "Nombre de valeurs",
+    "visTypeTimeseries.aggUtils.varianceLabel": "Variance",
+    "visTypeTimeseries.annotationRequest.label": "Annotation : {id}",
     "visTypeTimeseries.annotationsEditor.addDataSourceButtonLabel": "Ajouter une source de données",
     "visTypeTimeseries.annotationsEditor.dataSourcesLabel": "Sources de données",
     "visTypeTimeseries.annotationsEditor.fieldsLabel": "Champs (requis – chemins séparés par des virgules)",
@@ -4851,6 +5949,9 @@
     "visTypeTimeseries.calculateLabel.countLabel": "Décompte",
     "visTypeTimeseries.calculateLabel.filterRatioLabel": "Rapport de filtre",
     "visTypeTimeseries.calculateLabel.mathLabel": "Mathématique",
+    "visTypeTimeseries.calculateLabel.metricTypeOfMetricFieldRankLabel": "{metricTypeLabel} sur {metricField}",
+    "visTypeTimeseries.calculateLabel.metricTypeOfTargetLabel": "{metricTypeLabel} sur {targetLabel}",
+    "visTypeTimeseries.calculateLabel.metricTypeOfTargetWithAdditionalLabel": "{metricTypeLabel} sur {targetLabel} ({additionalLabel})",
     "visTypeTimeseries.calculateLabel.positiveRateLabel": "Taux de compteur de {field}",
     "visTypeTimeseries.calculateLabel.seriesAggLabel": "Agrégation de séries ({metricFunction})",
     "visTypeTimeseries.calculateLabel.staticValueLabel": "Valeur statique de {metricValue}",
@@ -4879,7 +5980,11 @@
     "visTypeTimeseries.dataFormatPicker.bytesLabel": "Octets",
     "visTypeTimeseries.dataFormatPicker.customLabel": "Personnalisé",
     "visTypeTimeseries.dataFormatPicker.decimalPlacesLabel": "Décimales",
+    "visTypeTimeseries.dataFormatPicker.defaultLabel": "Par défaut",
+    "visTypeTimeseries.dataFormatPicker.defaultLabelDescription": "Applique une mise en forme commune",
     "visTypeTimeseries.dataFormatPicker.durationLabel": "Durée",
+    "visTypeTimeseries.dataFormatPicker.formatPatternHelpText": "Documentation",
+    "visTypeTimeseries.dataFormatPicker.formatPatternLabel": "Modèle de format Numeral.js (par défaut : {defaultPattern})",
     "visTypeTimeseries.dataFormatPicker.fromLabel": "De",
     "visTypeTimeseries.dataFormatPicker.numberLabel": "Nombre",
     "visTypeTimeseries.dataFormatPicker.percentLabel": "Pour cent",
@@ -4902,9 +6007,18 @@
     "visTypeTimeseries.durationOptions.yearsLabel": "Années",
     "visTypeTimeseries.emptyTextValue": "(vide)",
     "visTypeTimeseries.error.requestForPanelFailedErrorMessage": "La requête pour ce panneau a échoué.",
+    "visTypeTimeseries.errors.fieldNotFound": "Champ \"{field}\" introuvable",
+    "visTypeTimeseries.errors.maxBucketsExceededErrorMessage": "Votre recherche a essayé de récupérer trop de données. Réduisez la plage de temps ou modifiez l'intervalle utilisé. Cela permet généralement de résoudre le problème.",
+    "visTypeTimeseries.errors.timeFieldNotSpecifiedError": "Le champ temporel est obligatoire pour visualiser les données",
+    "visTypeTimeseries.externalUrlErrorModal.bodyMessage": "Configurez {externalUrlPolicy} dans votre {kibanaConfigFileName} pour autoriser l’accès à {url}.",
+    "visTypeTimeseries.externalUrlErrorModal.closeButtonLabel": "Fermer",
+    "visTypeTimeseries.externalUrlErrorModal.headerTitle": "L’accès à cette URL externe n’est pas encore activé",
     "visTypeTimeseries.fetchFields.loadIndexPatternFieldsErrorMessage": "Impossible de charger les champs index_pattern",
-    "visTypeTimeseries.fieldSelect.fieldIsNotValid": "Le champ \"{fieldParameter}\" n'est pas valide pour une utilisation avec l'index actuel. Veuillez sélectionner un nouveau champ.",
+    "visTypeTimeseries.fieldSelect.dragAriaLabel": "Faire glisser le champ",
+    "visTypeTimeseries.fieldSelect.fieldIsNotValid": "La sélection \"{fieldParameter}\" n'est pas valide pour une utilisation avec l'index actuel.",
     "visTypeTimeseries.fieldSelect.selectFieldPlaceholder": "Sélectionner un champ…",
+    "visTypeTimeseries.fieldUtils.multiFieldLabel": "{firstFieldLabel} + {count} {count, plural, one {autre} other {autres}}",
+    "visTypeTimeseries.filterCannotBeAppliedError": "Le \"filter\" ne peut pas être appliqué avec cette configuration",
     "visTypeTimeseries.filterRatio.aggregationLabel": "Agrégation",
     "visTypeTimeseries.filterRatio.denominatorLabel": "Dénominateur",
     "visTypeTimeseries.filterRatio.fieldLabel": "Champ",
@@ -4971,10 +6085,16 @@
     "visTypeTimeseries.indexPattern.timeRange.lastValue": "Dernière valeur",
     "visTypeTimeseries.indexPattern.timeRange.selectTimeRange": "Sélectionner",
     "visTypeTimeseries.indexPattern.сoarse": "Grossier",
-    "visTypeTimeseries.indexPatternSelect.label": "Modèle d'indexation",
-    "visTypeTimeseries.indexPatternSelect.switchModePopover.areaLabel": "Configurer le mode de sélection du modèle d'indexation",
-    "visTypeTimeseries.indexPatternSelect.switchModePopover.title": "Mode de sélection du modèle d'indexation",
-    "visTypeTimeseries.indexPatternSelect.switchModePopover.useKibanaIndices": "Utiliser uniquement les modèles d'indexation Kibana",
+    "visTypeTimeseries.indexPatternSelect.createDataViewText": "Créer une vue de données",
+    "visTypeTimeseries.indexPatternSelect.defaultDataViewText": "Utilisation de la vue de données par défaut. {queryAllIndicesHelpText}",
+    "visTypeTimeseries.indexPatternSelect.label": "Vue de données",
+    "visTypeTimeseries.indexPatternSelect.queryAllIndicesText": "Pour interroger tous les index, utilisez {asterisk}.",
+    "visTypeTimeseries.indexPatternSelect.switchModePopover.allowStringIndices": "Autoriser les index de chaîne dans TSVB",
+    "visTypeTimeseries.indexPatternSelect.switchModePopover.areaLabel": "Configurer le mode de sélection de la vue de données",
+    "visTypeTimeseries.indexPatternSelect.switchModePopover.enableAllowStringIndices": "Pour interroger des index Elasticsearch, vous devez activer le paramètre {allowStringIndices}.",
+    "visTypeTimeseries.indexPatternSelect.switchModePopover.text": "Une vue de données regroupe et récupère les données à partir d’Elasticsearch. Désactivez ce mode pour interroger directement les index Elasticsearch. {allowStringIndicesLabel}",
+    "visTypeTimeseries.indexPatternSelect.switchModePopover.title": "Mode de vue de données",
+    "visTypeTimeseries.indexPatternSelect.switchModePopover.useKibanaIndices": "Utiliser des vues de données Kibana",
     "visTypeTimeseries.kbnVisTypes.metricsDescription": "Réalisez des analyses avancées de vos données temporelles.",
     "visTypeTimeseries.kbnVisTypes.metricsTitle": "TSVB",
     "visTypeTimeseries.lastValueModeIndicator.lastBucketDate": "Compartiment : {lastBucketDate}",
@@ -4996,7 +6116,7 @@
     "visTypeTimeseries.markdown.editor.toggleEditorAriaLabel": "Activer/Désactiver l'éditeur de séries",
     "visTypeTimeseries.markdown.editor.variableNamePlaceholder": "Nom de la variable",
     "visTypeTimeseries.markdown.optionsTab.backgroundColorLabel": "Couleur d'arrière-plan :",
-    "visTypeTimeseries.markdown.optionsTab.customCSSLabel": "CSS personnalisé (prend en charge Less)",
+    "visTypeTimeseries.markdown.optionsTab.customCSSLabel": "CSS personnalisée",
     "visTypeTimeseries.markdown.optionsTab.dataLabel": "Données",
     "visTypeTimeseries.markdown.optionsTab.ignoreGlobalFilterLabel": "Ignorer le filtre global ?",
     "visTypeTimeseries.markdown.optionsTab.openLinksInNewTab": "Ouvrir les liens dans un nouvel onglet ?",
@@ -5083,6 +6203,7 @@
     "visTypeTimeseries.searchStrategyUndefinedErrorMessage": "La stratégie de recherche n'était pas définie.",
     "visTypeTimeseries.serialDiff.aggregationLabel": "Agrégation",
     "visTypeTimeseries.serialDiff.lagLabel": "Décalage",
+    "visTypeTimeseries.serialDiff.lagLabel.hint": "Le groupe historique à soustraire à la valeur actuelle. Doit être un entier positif, différent de zéro",
     "visTypeTimeseries.serialDiff.metricLabel": "Indicateur",
     "visTypeTimeseries.series.missingAggregationKeyErrorMessage": "La clé des agrégations est manquante dans la réponse. Vérifiez vos autorisations pour cette requête.",
     "visTypeTimeseries.series.shouldOneSeriesPerRequestErrorMessage": "Il ne devrait y avoir qu'une seule série par requête.",
@@ -5104,8 +6225,10 @@
     "visTypeTimeseries.seriesConfig.ignoreGlobalFilterLabel": "Ignorer le filtre global ?",
     "visTypeTimeseries.seriesConfig.missingSeriesComponentDescription": "Composant de série manquant pour le type de panneau : {panelType}",
     "visTypeTimeseries.seriesConfig.offsetSeriesTimeLabel": "Décaler l'heure de la série de (1m, 1h, 1w, 1d)",
+    "visTypeTimeseries.seriesConfig.overrideDataViewLabel": "Écraser la vue de données ?",
     "visTypeTimeseries.seriesConfig.templateHelpText": "par ex. {templateExample}",
     "visTypeTimeseries.seriesConfig.templateLabel": "Modèle",
+    "visTypeTimeseries.seriesRequest.label": "Série : {id}",
     "visTypeTimeseries.sort.dragToSortAriaLabel": "Faire glisser pour trier",
     "visTypeTimeseries.sort.dragToSortTooltip": "Faire glisser pour trier",
     "visTypeTimeseries.splits.everything.groupByLabel": "Regrouper par",
@@ -5177,8 +6300,8 @@
     "visTypeTimeseries.table.optionsTab.panelFilterLabel": "Filtre de panneau",
     "visTypeTimeseries.table.optionsTab.panelOptionsButtonLabel": "Options du panneau",
     "visTypeTimeseries.table.overallAvgLabel": "Moy. générale",
-    "visTypeTimeseries.table.overallMaxLabel": "Max général",
-    "visTypeTimeseries.table.overallMinLabel": "Min général",
+    "visTypeTimeseries.table.overallMaxLabel": "Max. général",
+    "visTypeTimeseries.table.overallMinLabel": "Min. général",
     "visTypeTimeseries.table.overallSumLabel": "Somme générale",
     "visTypeTimeseries.table.showTrendArrowsLabel": "Afficher les flèches de tendance ?",
     "visTypeTimeseries.table.sumLabel": "Somme",
@@ -5186,7 +6309,8 @@
     "visTypeTimeseries.table.tab.optionsLabel": "Options",
     "visTypeTimeseries.table.templateHelpText": "par ex. {templateExample}",
     "visTypeTimeseries.table.templateLabel": "Modèle",
-    "visTypeTimeseries.table.toggleSeriesEditorAriaLabel": "Basculer l'éditeur de séries",
+    "visTypeTimeseries.table.toggleSeriesEditorAriaLabel": "Activer/Désactiver l'éditeur de séries",
+    "visTypeTimeseries.tableRequest.label": "Tableau : {id}",
     "visTypeTimeseries.timeSeries.addSeriesTooltip": "Ajouter une série",
     "visTypeTimeseries.timeseries.annotationsTab.annotationsButtonLabel": "Annotations",
     "visTypeTimeseries.timeSeries.axisMaxLabel": "Max. de l'axe",
@@ -5233,7 +6357,8 @@
     "visTypeTimeseries.timeseries.optionsTab.styleLabel": "Style",
     "visTypeTimeseries.timeseries.optionsTab.tooltipMode": "Infobulle",
     "visTypeTimeseries.timeseries.optionsTab.truncateLegendLabel": "Tronquer la légende ?",
-    "visTypeTimeseries.timeSeries.percentLabel": "Pour cent",
+    "visTypeTimeseries.timeSeries.overrideDataViewLabel": "Écraser la vue de données ?",
+    "visTypeTimeseries.timeSeries.percentLabel": "Pourcent",
     "visTypeTimeseries.timeseries.positionOptions.leftLabel": "Gauche",
     "visTypeTimeseries.timeseries.positionOptions.rightLabel": "Droite",
     "visTypeTimeseries.timeSeries.rainbowLabel": "Arc-en-ciel",
@@ -5257,7 +6382,7 @@
     "visTypeTimeseries.topHit.aggWithOptions.averageLabel": "Moy.",
     "visTypeTimeseries.topHit.aggWithOptions.concatenate": "Concaténer",
     "visTypeTimeseries.topHit.aggWithOptions.maxLabel": "Max",
-    "visTypeTimeseries.topHit.aggWithOptions.minLabel": "Min",
+    "visTypeTimeseries.topHit.aggWithOptions.minLabel": "Min.",
     "visTypeTimeseries.topHit.aggWithOptions.sumLabel": "Somme",
     "visTypeTimeseries.topHit.fieldLabel": "Champ",
     "visTypeTimeseries.topHit.order.selectPlaceholder": "Sélectionner…",
@@ -5272,7 +6397,7 @@
     "visTypeTimeseries.topN.deleteSeriesTooltip": "Supprimer la série",
     "visTypeTimeseries.topN.labelPlaceholder": "Étiquette",
     "visTypeTimeseries.topN.optionsTab.backgroundColorLabel": "Couleur de l'arrière-plan :",
-    "visTypeTimeseries.topN.optionsTab.colorRulesLabel": "Règles de couleurs",
+    "visTypeTimeseries.topN.optionsTab.colorRulesLabel": "Règles de couleur",
     "visTypeTimeseries.topN.optionsTab.dataLabel": "Données",
     "visTypeTimeseries.topN.optionsTab.ignoreGlobalFilterLabel": "Ignorer le filtre global ?",
     "visTypeTimeseries.topN.optionsTab.itemUrlDescription": "Prend en charge les modèles de moustaches. {key} est défini sur le terme.",
@@ -5297,12 +6422,18 @@
     "visTypeTimeseries.visEditorVisualization.changesHaveNotBeenAppliedMessage": "Les modifications apportées à cette visualisation n'ont pas été appliquées.",
     "visTypeTimeseries.visEditorVisualization.changesSuccessfullyAppliedMessage": "Les dernières modifications ont été appliquées.",
     "visTypeTimeseries.visEditorVisualization.changesWillBeAutomaticallyAppliedMessage": "Les modifications seront appliquées automatiquement.",
+    "visTypeTimeseries.visEditorVisualization.dataViewMode.dismissNoticeButtonText": "Rejeter",
+    "visTypeTimeseries.visEditorVisualization.dataViewMode.link": "Venez voir.",
+    "visTypeTimeseries.visEditorVisualization.dataViewMode.notificationMessage": "Bonne nouvelle ! Vous pouvez visualiser les données des vues de données Kibana (recommandé) ou des index Elasticsearch. {indexPatternModeLink}.",
+    "visTypeTimeseries.visEditorVisualization.dataViewMode.notificationTitle": "TSVB est compatible avec les vues de données",
     "visTypeTimeseries.visPicker.gaugeLabel": "Jauge",
     "visTypeTimeseries.visPicker.metricLabel": "Indicateur",
     "visTypeTimeseries.visPicker.tableLabel": "Tableau",
     "visTypeTimeseries.visPicker.timeSeriesLabel": "Séries temporelles",
     "visTypeTimeseries.visPicker.topNLabel": "N premiers",
+    "visTypeTimeseries.wrongAggregationErrorMessage": "L’agrégation {metricType} n’est pas compatible pour la configuration de panneau existante.",
     "visTypeTimeseries.yesButtonLabel": "Oui",
+    "visTypeVega.deprecatedHistogramIntervalInfo.message": "Le champ combiné \"interval\" a été déclassé à la faveur de deux nouveaux champs explicites : \"calendar_interval\" et \"fixed_interval\". {dateHistogramDoc}",
     "visTypeVega.editor.formatError": "Erreur lors du formatage des spécifications",
     "visTypeVega.editor.reformatAsHJSONButtonLabel": "Reformater en HJSON",
     "visTypeVega.editor.reformatAsJSONButtonLabel": "Reformater en JSON, supprimer les commentaires",
@@ -5328,6 +6459,7 @@
     "visTypeVega.inspector.dataSetsLabel": "Ensembles de données",
     "visTypeVega.inspector.dataViewer.dataSetAriaLabel": "Ensemble de données",
     "visTypeVega.inspector.dataViewer.gridAriaLabel": "Grille de données {name}",
+    "visTypeVega.inspector.errorHeading": "Vega n’a pas réussi le rendu",
     "visTypeVega.inspector.signalValuesLabel": "Valeurs de signal",
     "visTypeVega.inspector.signalViewer.gridAriaLabel": "Grille de données des valeurs de signal",
     "visTypeVega.inspector.specLabel": "Spéc.",
@@ -5335,7 +6467,7 @@
     "visTypeVega.inspector.vegaAdapter.signal": "Signal",
     "visTypeVega.inspector.vegaAdapter.value": "Valeur",
     "visTypeVega.inspector.vegaDebugLabel": "Débogage Vega",
-    "visTypeVega.mapView.experimentalMapLayerInfo": "Les calques de cartes sont expérimentaux et ne sont pas soumis aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Pour apporter des commentaires, veuillez créer une entrée dans {githubLink}.",
+    "visTypeVega.mapView.experimentalMapLayerInfo": "Cette fonctionnalité est en version d’évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités dans la version d’évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Pour apporter des commentaires, veuillez créer une entrée dans {githubLink}.",
     "visTypeVega.mapView.mapStyleNotFoundWarningMessage": "{mapStyleParam} est introuvable",
     "visTypeVega.mapView.minZoomAndMaxZoomHaveBeenSwappedWarningMessage": "{minZoomPropertyName} et {maxZoomPropertyName} ont été permutés",
     "visTypeVega.mapView.resettingPropertyToMaxValueWarningMessage": "Réinitialisation de {name} sur {max}",
@@ -5347,6 +6479,7 @@
     "visTypeVega.urlParser.urlShouldHaveQuerySubObjectWarningMessage": "L'utilisation d'un {urlObject} requiert un sous-objet {subObjectName}",
     "visTypeVega.vegaParser.autoSizeDoesNotAllowFalse": "{autoSizeParam} est activé ; il peut uniquement être désactivé en définissant {autoSizeParam} sur {noneParam}",
     "visTypeVega.vegaParser.baseView.externalUrlsAreNotEnabledErrorMessage": "Les URL externes ne sont pas activées. Ajouter {enableExternalUrls} à {kibanaConfigFileName}",
+    "visTypeVega.vegaParser.baseView.externalUrlServiceErrorMessage": "L’URL externe [{uri}] a été refusée par le service ExternalUrl. Vous pouvez configurer des politiques d’URL externe avec le paramètre \"{externalUrlPolicy}\" dans {kibanaConfigFileName}.",
     "visTypeVega.vegaParser.baseView.functionIsNotDefinedForGraphErrorMessage": "{funcName} n'est pas défini pour ce graphe",
     "visTypeVega.vegaParser.baseView.indexNotFoundErrorMessage": "Impossible de trouver l'index {index}",
     "visTypeVega.vegaParser.baseView.timeValuesTypeErrorMessage": "Erreur lors de la définition du filtre de temps : les deux valeurs temporelles doivent être des dates relatives ou absolues. {start}, {end}",
@@ -5361,6 +6494,7 @@
     "visTypeVega.vegaParser.maxBoundsValueTypeWarningMessage": "{maxBoundsConfigName} doit être un tableau avec quatre nombres",
     "visTypeVega.vegaParser.notSupportedUrlTypeErrorMessage": "{urlObject} n'est pas pris en charge",
     "visTypeVega.vegaParser.notValidLibraryVersionForInputSpecWarningMessage": "Les spécifications d'entrée utilisent {schemaLibrary} {schemaVersion}, mais la version actuelle de {schemaLibrary} est {libraryVersion}.",
+    "visTypeVega.vegaParser.notValidSchemaForInputSpec": "L’URL du \"$schema\" JSON est incorrecte. Corrigez l’URL, puis cliquez sur Mettre à jour.",
     "visTypeVega.vegaParser.paddingConfigValueTypeErrorMessage": "La valeur attendue pour {configName} est un nombre",
     "visTypeVega.vegaParser.someKibanaConfigurationIsNoValidWarningMessage": "{configName} n'est pas valide",
     "visTypeVega.vegaParser.someKibanaParamValueTypeWarningMessage": "{configName} doit être une valeur booléenne",
@@ -5376,9 +6510,9 @@
     "visTypeVislib.advancedSettings.visualization.heatmap.maxBucketsText": "Nombre maximal de groupes pouvant être renvoyés par une source de données unique. Un nombre plus élevé pourra impacter négativement les performances de rendu du navigateur",
     "visTypeVislib.advancedSettings.visualization.heatmap.maxBucketsTitle": "Nombre maximal de groupes pour la carte thermique",
     "visTypeVislib.aggResponse.allDocsTitle": "Tous les docs",
-    "visTypeVislib.functions.pie.help": "Visualisation camembert",
+    "visTypeVislib.functions.pie.help": "Visualisation du camembert",
     "visTypeVislib.functions.vislib.help": "Visualisation Vislib",
-    "visTypeVislib.vislib.errors.noResultsFoundTitle": "Aucun résultat trouvé",
+    "visTypeVislib.vislib.errors.noResultsFoundTitle": "Résultat introuvable",
     "visTypeVislib.vislib.heatmap.maxBucketsText": "Trop de séries sont définies ({nr}). La valeur de configuration maximale est {max}.",
     "visTypeVislib.vislib.legend.filterForValueButtonAriaLabel": "Filtrer pour la valeur {legendDataLabel}",
     "visTypeVislib.vislib.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
@@ -5412,6 +6546,7 @@
     "visTypeXy.chartTypes.barText": "Barre",
     "visTypeXy.chartTypes.lineText": "Ligne",
     "visTypeXy.controls.pointSeries.categoryAxis.alignLabel": "Aligner",
+    "visTypeXy.controls.pointSeries.categoryAxis.axisLabelsOptionsMultilayer.disabled": "Cette option peut être configurée uniquement avec des axes non basés sur le temps",
     "visTypeXy.controls.pointSeries.categoryAxis.filterLabelsLabel": "Étiquettes de filtre",
     "visTypeXy.controls.pointSeries.categoryAxis.labelsTitle": "Étiquettes",
     "visTypeXy.controls.pointSeries.categoryAxis.positionLabel": "Position",
@@ -5478,6 +6613,9 @@
     "visTypeXy.function.args.addTimeMarker.help": "Afficher le repère de temps",
     "visTypeXy.function.args.addTooltip.help": "Afficher l'infobulle au survol",
     "visTypeXy.function.args.args.chartType.help": "Type de graphique. Peut être linéaire, en aires ou histogramme",
+    "visTypeXy.function.args.args.legendSize.help": "Spécifie la taille de la légende en pixels.",
+    "visTypeXy.function.args.args.maxLegendLines.help": "Définit le nombre maximum de lignes par élément de légende",
+    "visTypeXy.function.args.ariaLabel.help": "Spécifie l’attribut aria-label du graphique xy",
     "visTypeXy.function.args.categoryAxes.help": "Configuration de l'axe de catégorie",
     "visTypeXy.function.args.detailedTooltip.help": "Afficher l'infobulle détaillée",
     "visTypeXy.function.args.fillOpacity.help": "Définit l'opacité du remplissage du graphique en aires",
@@ -5496,6 +6634,7 @@
     "visTypeXy.function.args.splitRowDimension.help": "Configuration de la dimension Diviser par ligne",
     "visTypeXy.function.args.thresholdLine.help": "Configuration de la ligne de seuil",
     "visTypeXy.function.args.times.help": "Configuration du repère de temps",
+    "visTypeXy.function.args.truncateLegend.help": "Détermine si la légende sera tronquée ou non",
     "visTypeXy.function.args.valueAxes.help": "Configuration de l'axe des valeurs",
     "visTypeXy.function.args.widthDimension.help": "Configuration de la dimension en largeur",
     "visTypeXy.function.args.xDimension.help": "Configuration de la dimension de l'axe X",
@@ -5574,7 +6713,7 @@
     "visTypeXy.interpolationModes.straightText": "Droit",
     "visTypeXy.legend.filterForValueButtonAriaLabel": "Filtre pour la valeur",
     "visTypeXy.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
-    "visTypeXy.legend.filterOutValueButtonAriaLabel": "Filtrer la valeur",
+    "visTypeXy.legend.filterOutValueButtonAriaLabel": "Exclure la valeur",
     "visTypeXy.legendPositions.bottomText": "Bas",
     "visTypeXy.legendPositions.leftText": "Gauche",
     "visTypeXy.legendPositions.rightText": "Droite",
@@ -5592,13 +6731,33 @@
     "visTypeXy.thresholdLine.style.dashedText": "Tirets",
     "visTypeXy.thresholdLine.style.dotdashedText": "Point-tiret",
     "visTypeXy.thresholdLine.style.fullText": "Pleine",
-    "visualizations.advancedSettings.visualizeEnableLabsText": "Permet aux utilisateurs de créer, d’afficher et de modifier des visualisations expérimentales. Si la fonctionnalité est désactivée,\n            seules les visualisations considérées prêtes pour la production sont disponibles pour l'utilisateur.",
-    "visualizations.advancedSettings.visualizeEnableLabsTitle": "Activer les visualisations expérimentales",
+    "visualizations.advancedSettings.visualizeEnableLabsText": "Permet aux utilisateurs de créer, d'afficher et de modifier les visualisations qui sont en version d'évaluation technique.\n            Si cette option est désactivée, seules les visualisations considérées prêtes pour la production sont disponibles pour l'utilisateur.",
+    "visualizations.advancedSettings.visualizeEnableLabsTitle": "Activer les visualisations de la version d'évaluation technique",
+    "visualizations.badge.readOnly.text": "Lecture seule",
+    "visualizations.badge.readOnly.tooltip": "Impossible d'enregistrer les visualisations dans la bibliothèque",
+    "visualizations.byValue_pageHeading": "Visualisation de type {chartType} intégrée à l'application {originatingApp}",
+    "visualizations.confirmModal.cancelButtonLabel": "Annuler",
+    "visualizations.confirmModal.confirmTextDescription": "Quitter l'éditeur Visualize sans enregistrer les modifications ?",
+    "visualizations.confirmModal.overwriteButtonLabel": "Écraser",
+    "visualizations.confirmModal.overwriteConfirmationMessage": "Êtes-vous sûr de vouloir écraser {title} ?",
+    "visualizations.confirmModal.overwriteTitle": "Écraser {name} ?",
+    "visualizations.confirmModal.saveDuplicateButtonLabel": "Enregistrer {name}",
+    "visualizations.confirmModal.saveDuplicateConfirmationMessage": "Il y a déjà une occurrence de {name} avec le titre \"{title}\". Voulez-vous tout de même enregistrer ?",
+    "visualizations.confirmModal.title": "Modifications non enregistrées",
+    "visualizations.createVisualization.failedToLoadErrorMessage": "Impossible de charger la visualisation",
+    "visualizations.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage": "Vous devez fournir un indexPattern ou un savedSearchId",
+    "visualizations.createVisualization.noVisTypeErrorMessage": "Vous devez fournir un type de visualisation valide",
     "visualizations.disabledLabVisualizationLink": "Lire la documentation",
     "visualizations.disabledLabVisualizationMessage": "Veuillez activer le mode lab dans les paramètres avancés pour consulter les visualisations lab.",
     "visualizations.disabledLabVisualizationTitle": "{title} est une visualisation lab.",
     "visualizations.displayName": "Visualisation",
+    "visualizations.editor.createBreadcrumb": "Créer",
+    "visualizations.editor.defaultEditBreadcrumbText": "Modifier la visualisation",
+    "visualizations.embeddable.inspectorTitle": "Inspecteur",
+    "visualizations.embeddable.legacyURLConflict.errorMessage": "Cette visualisation a la même URL qu'un alias hérité. Désactiver l'alias pour résoudre cette erreur : {json}",
     "visualizations.embeddable.placeholderTitle": "Titre de l'espace réservé",
+    "visualizations.experimentalVisInfoText": "Cette fonctionnalité est en version d'évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Pour apporter des commentaires, veuillez créer une entrée dans {githubLink}.",
+    "visualizations.function.findAccessorOrFail.error.accessor": "Le nom de la colonne ou l'index fourni sont non valides : {accessor}",
     "visualizations.function.range.from.help": "Début de la plage",
     "visualizations.function.range.help": "Génère un objet plage",
     "visualizations.function.range.to.help": "Fin de la plage",
@@ -5611,12 +6770,34 @@
     "visualizations.function.xyDimension.label.help": "Étiquette",
     "visualizations.function.xyDimension.params.help": "Paramètres",
     "visualizations.function.xyDimension.visDimension.help": "Configuration de l'objet dimension",
+    "visualizations.helpMenu.appName": "Bibliothèque Visualize",
     "visualizations.initializeWithoutIndexPatternErrorMessage": "Tentative d'initialisation des agrégations sans modèle d'indexation",
+    "visualizations.legacyCharts.conditionalMessage.noPermissions": "Contactez votre administrateur système pour passer à l'ancienne bibliothèque.",
+    "visualizations.legacyUrlConflict.objectNoun": "Visualisation {visName}",
+    "visualizations.linkedToSearch.unlinkSuccessNotificationText": "Dissocié de la recherche enregistrée \"{searchTitle}\"",
+    "visualizations.listing.betaTitle": "Version bêta",
+    "visualizations.listing.betaTooltip": "Cette visualisation est en version bêta et susceptible d'être modifiée. La conception et le code sont moins matures que les fonctionnalités officielles en disponibilité générale et sont fournis tels quels sans aucune garantie. Les fonctionnalités bêta ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale",
+    "visualizations.listing.breadcrumb": "Bibliothèque Visualize",
+    "visualizations.listing.createNew.createButtonLabel": "Créer une nouvelle visualisation",
+    "visualizations.listing.createNew.description": "Vous pouvez créer différentes visualisations basées sur vos données.",
+    "visualizations.listing.createNew.title": "Créer votre première visualisation",
+    "visualizations.listing.experimentalTitle": "Version d'évaluation technique",
+    "visualizations.listing.experimentalTooltip": "Cette fonctionnalité est en version d'évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "visualizations.listing.table.descriptionColumnName": "Description",
+    "visualizations.listing.table.entityName": "visualisation",
+    "visualizations.listing.table.entityNamePlural": "visualisations",
+    "visualizations.listing.table.listTitle": "Bibliothèque Visualize",
+    "visualizations.listing.table.titleColumnName": "Titre",
+    "visualizations.listing.table.typeColumnName": "Type",
+    "visualizations.listingPageTitle": "Bibliothèque Visualize",
+    "visualizations.newChart.conditionalMessage.advancedSettingsLink": "Paramètres avancés.",
+    "visualizations.newGaugeChart.notificationMessage": "La nouvelle bibliothèque de graphiques de jauge ne prend pas encore en charge l'agrégation de graphiques fractionnés. {conditionalMessage}",
+    "visualizations.newHeatmapChart.notificationMessage": "La nouvelle bibliothèque de graphiques de cartes thermiques ne prend pas encore en charge l'agrégation de graphiques fractionnés. {conditionalMessage}",
     "visualizations.newVisWizard.aggBasedGroupDescription": "Utilisez notre bibliothèque Visualize classique pour créer des graphiques basés sur des agrégations.",
     "visualizations.newVisWizard.aggBasedGroupTitle": "Basé sur une agrégation",
     "visualizations.newVisWizard.chooseSourceTitle": "Choisir une source",
-    "visualizations.newVisWizard.experimentalTitle": "Expérimental",
-    "visualizations.newVisWizard.experimentalTooltip": "Cette visualisation est susceptible d'être modifiée ou supprimée dans une version ultérieure, et n'est pas soumise à l'accord de niveau de service d'assistance.",
+    "visualizations.newVisWizard.experimentalTitle": "Version d'évaluation technique",
+    "visualizations.newVisWizard.experimentalTooltip": "Cette fonctionnalité est en version d'évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
     "visualizations.newVisWizard.exploreOptionLinkText": "Explorer les options",
     "visualizations.newVisWizard.filterVisTypeAriaLabel": "Filtrer un type de visualisation",
     "visualizations.newVisWizard.goBackLink": "Sélectionner une visualisation différente",
@@ -5625,14 +6806,50 @@
     "visualizations.newVisWizard.newVisTypeTitle": "Nouveau {visTypeName}",
     "visualizations.newVisWizard.readDocumentationLink": "Lire la documentation",
     "visualizations.newVisWizard.resultsFound": "{resultCount, plural, one {type trouvé} other {types trouvés}}",
-    "visualizations.newVisWizard.searchSelection.notFoundLabel": "Aucun index ni aucune recherche enregistrée correspondant(e) trouvé(e).",
+    "visualizations.newVisWizard.searchSelection.notFoundLabel": "Aucun recherche enregistrée ni aucun index correspondants n'ont été trouvés.",
+    "visualizations.newVisWizard.searchSelection.savedObjectType.dataView": "Vue de données",
     "visualizations.newVisWizard.searchSelection.savedObjectType.search": "Recherche enregistrée",
     "visualizations.newVisWizard.title": "Nouvelle visualisation",
     "visualizations.newVisWizard.toolsGroupTitle": "Outils",
-    "visualizations.noResultsFoundTitle": "Aucun résultat trouvé",
+    "visualizations.noMatchRoute.bannerText": "L'application Visualize ne reconnaît pas cet itinéraire : {route}.",
+    "visualizations.noMatchRoute.bannerTitleText": "Page introuvable",
+    "visualizations.noResultsFoundTitle": "Résultat introuvable",
+    "visualizations.overwriteRejectedDescription": "La confirmation d'écrasement a été rejetée.",
+    "visualizations.pageHeading": "Visualisation {chartType} {chartName}",
+    "visualizations.reporting.defaultReportTitle": "Visualisation [{date}]",
     "visualizations.savedObjectName": "Visualisation",
+    "visualizations.saveDuplicateRejectedDescription": "La confirmation d'enregistrement avec un doublon de titre a été rejetée.",
     "visualizations.savingVisualizationFailed.errorMsg": "L'enregistrement de la visualisation a échoué",
+    "visualizations.tonNavMenu.tryItBadgeText": "Essayer",
+    "visualizations.topNavMenu.cancelAndReturnButtonTooltip": "Abandonner vos modifications avant de terminer",
+    "visualizations.topNavMenu.cancelButtonAriaLabel": "Revenir à la dernière application sans enregistrer les modifications",
+    "visualizations.topNavMenu.cancelButtonLabel": "Annuler",
+    "visualizations.topNavMenu.goToLensButtonAriaLabel": "Rendez-vous sur Lens avec votre configuration actuelle",
+    "visualizations.topNavMenu.goToLensButtonLabel": "Modifier la visualisation dans Lens",
+    "visualizations.topNavMenu.openInspectorButtonAriaLabel": "Ouvrir l'Inspecteur pour la visualisation",
+    "visualizations.topNavMenu.openInspectorButtonLabel": "inspecter",
+    "visualizations.topNavMenu.openInspectorDisabledButtonTooltip": "Cette visualisation ne prend en charge aucun inspecteur.",
+    "visualizations.topNavMenu.saveAndReturnVisualizationButtonAriaLabel": "Terminer la modification de la visualisation et revenir à la dernière application",
+    "visualizations.topNavMenu.saveAndReturnVisualizationButtonLabel": "Enregistrer et revenir",
+    "visualizations.topNavMenu.saveAndReturnVisualizationDisabledButtonTooltip": "Appliquer ou abandonner vos modifications avant de terminer",
+    "visualizations.topNavMenu.saveVisualization.failureNotificationText": "Erreur lors de l'enregistrement de \"{visTitle}\"",
+    "visualizations.topNavMenu.saveVisualization.successNotificationText": "\"{visTitle}\" enregistré",
+    "visualizations.topNavMenu.saveVisualizationAsButtonLabel": "Enregistrer sous",
+    "visualizations.topNavMenu.saveVisualizationButtonAriaLabel": "Enregistrer la visualisation",
+    "visualizations.topNavMenu.saveVisualizationButtonLabel": "Enregistrer",
+    "visualizations.topNavMenu.saveVisualizationDisabledButtonTooltip": "Appliquer ou abandonner vos modifications avant d'enregistrer",
+    "visualizations.topNavMenu.saveVisualizationObjectType": "visualisation",
+    "visualizations.topNavMenu.saveVisualizationToLibraryButtonLabel": "Enregistrer dans la bibliothèque",
+    "visualizations.topNavMenu.shareVisualizationButtonAriaLabel": "Partager la visualisation",
+    "visualizations.topNavMenu.shareVisualizationButtonLabel": "partager",
+    "visualizations.topNavMenu.updatePanel": "Mettre à jour le panneau sur {originatingAppName}",
+    "visualizations.visualizationLoadingFailedErrorMessage": "Impossible de charger la visualisation",
     "visualizations.visualizationTypeInvalidMessage": "Type de visualisation non valide \"{visType}\"",
+    "visualizations.visualizeDescription": "Créez des visualisations et des datastores agrégés dans vos index Elasticsearch.",
+    "visualizations.visualizeListingBreadcrumbsTitle": "Bibliothèque Visualize",
+    "visualizations.visualizeListingDashboardAppName": "Application Tableau de bord",
+    "visualizations.visualizeListingDashboardFlowDescription": "Vous créez un tableau de bord ? Créez et ajoutez vos visualisations directement depuis l'{dashboardApp}.",
+    "visualizations.visualizeListingDeleteErrorTitle": "Erreur lors de la suppression de la visualisation",
     "xpack.actions.actionTypeRegistry.get.missingActionTypeErrorMessage": "Le type d'action \"{id}\" n'est pas enregistré.",
     "xpack.actions.actionTypeRegistry.register.duplicateActionTypeErrorMessage": "Le type d'action \"{id}\" est déjà enregistré.",
     "xpack.actions.alertHistoryEsIndexConnector.name": "Index Elasticsearch d'historique d'alertes",
@@ -5659,6 +6876,7 @@
     "xpack.actions.builtin.pagerdutyTitle": "PagerDuty",
     "xpack.actions.builtin.serverLog.errorLoggingErrorMessage": "erreur lors du logging du message",
     "xpack.actions.builtin.serverLogTitle": "Log de serveur",
+    "xpack.actions.builtin.serviceNowITOMTitle": "ServiceNow ITOM",
     "xpack.actions.builtin.serviceNowITSMTitle": "ServiceNow ITSM",
     "xpack.actions.builtin.serviceNowSIRTitle": "ServiceNow SecOps",
     "xpack.actions.builtin.serviceNowTitle": "ServiceNow",
@@ -5688,6 +6906,24 @@
     "xpack.actions.builtin.webhook.webhookConfigurationError": "erreur lors de la configuration de l'action webhook : {message}",
     "xpack.actions.builtin.webhook.webhookConfigurationErrorNoHostname": "erreur lors de la configuration de l'action webhook : impossible d'analyser l'url : {err}",
     "xpack.actions.builtin.webhookTitle": "Webhook",
+    "xpack.actions.builtin.xmatters.invalidUsernamePassword": "L'utilisateur et le mot de passe doivent être spécifiés.",
+    "xpack.actions.builtin.xmatters.missingConfigUrl": "Fournir une configUrl valide",
+    "xpack.actions.builtin.xmatters.missingPassword": "Fournir un mot de passe valide",
+    "xpack.actions.builtin.xmatters.missingSecretsUrl": "Fournir une secretsUrl valide avec la clé d'API",
+    "xpack.actions.builtin.xmatters.missingUser": "Fournir un nom d'utilisateur valide",
+    "xpack.actions.builtin.xmatters.noSecretsProvided": "Fournir le lien secretsUrl ou le nom d'utilisateur/le mot de passe pour vous authentifier",
+    "xpack.actions.builtin.xmatters.noUserPassWhenSecretsUrl": "Impossible d'utiliser le nom d'utilisateur/le mot de passe pour l'authentification de l'URL. Fournir une secretsUrl valide ou utiliser l'authentification de base.",
+    "xpack.actions.builtin.xmatters.postingErrorMessage": "Erreur de déclenchement du workflow xMatters",
+    "xpack.actions.builtin.xmatters.postingRetryErrorMessage": "Erreur lors du déclenchement du flux xMatters : statut http {status}, réessayer plus tard",
+    "xpack.actions.builtin.xmatters.shouldNotHaveConfigUrl": "configUrl ne doit pas être fournie lorsque usesBasic est faux",
+    "xpack.actions.builtin.xmatters.shouldNotHaveSecretsUrl": "secretsUrl ne doit pas être fournie lorsque usesBasic est vrai",
+    "xpack.actions.builtin.xmatters.shouldNotHaveUsernamePassword": "Le nom d'utilisateur et le mot de passe ne doivent pas être fournis lorsque usesBasic est faux",
+    "xpack.actions.builtin.xmatters.unexpectedStatusErrorMessage": "Erreur de déclenchement du flux xMatters : statut inattendu {status}",
+    "xpack.actions.builtin.xmatters.xmattersConfigurationError": "Erreur lors de la configuration de l'action xMatters : {message}",
+    "xpack.actions.builtin.xmatters.xmattersConfigurationErrorNoHostname": "Erreur lors de la configuration de l'action xMatters : impossible d'analyser l'url : {err}",
+    "xpack.actions.builtin.xmatters.xmattersHostnameNotAllowed": "{message}",
+    "xpack.actions.builtin.xmatters.xmattersInvalidUrlError": "secretsUrl non valide : {err}",
+    "xpack.actions.builtin.xmattersTitle": "xMatters",
     "xpack.actions.disabledActionTypeError": "le type d'action \"{actionType}\" n'est pas activé dans la configuration Kibana xpack.actions.enabledActionTypes",
     "xpack.actions.featureRegistry.actionsFeatureName": "Actions et connecteurs",
     "xpack.actions.savedObjects.goToConnectorsButtonText": "Accéder aux connecteurs",
@@ -5709,11 +6945,19 @@
     "xpack.alerting.rulesClient.invalidDate": "Date non valide pour le {field} de paramètre : \"{dateValue}\"",
     "xpack.alerting.rulesClient.validateActions.invalidGroups": "Groupes d'actions non valides : {groups}",
     "xpack.alerting.rulesClient.validateActions.misconfiguredConnector": "Connecteurs non valides : {groups}",
+    "xpack.alerting.ruleTypeRegistry.get.missingRuleTypeError": "Le type de règle \"{id}\" n'est pas enregistré.",
     "xpack.alerting.ruleTypeRegistry.register.customRecoveryActionGroupUsageError": "Le type de règle [id=\"{id}\"] ne peut pas être enregistré. Le groupe d'actions [{actionGroup}] ne peut pas être utilisé à la fois comme groupe de récupération et comme groupe d'actions actif.",
+    "xpack.alerting.ruleTypeRegistry.register.duplicateRuleTypeError": "Le type de règle \"{id}\" est déjà enregistré.",
+    "xpack.alerting.ruleTypeRegistry.register.invalidDefaultTimeoutRuleTypeError": "Le type de règle \"{id}\" a un intervalle par défaut non valide : {errorMessage}.",
+    "xpack.alerting.ruleTypeRegistry.register.invalidTimeoutRuleTypeError": "Le type de règle \"{id}\" a un délai d'expiration non valide : {errorMessage}.",
     "xpack.alerting.ruleTypeRegistry.register.reservedActionGroupUsageError": "Le type de règle [id=\"{id}\"] ne peut pas être enregistré. Les groupes d'actions [{actionGroups}] sont réservés par le framework.",
     "xpack.alerting.savedObjects.goToRulesButtonText": "Accéder aux règles",
     "xpack.alerting.savedObjects.onImportText": "{rulesSavedObjectsLength} {rulesSavedObjectsLength, plural, one {La règle doit être activée} other {Les règles doivent être activées}} après l'importation.",
+    "xpack.alerting.serverSideErrors.expirerdLicenseErrorMessage": "Le type de règle {ruleTypeId} est désactivé, car votre licence {licenseType} a expiré.",
+    "xpack.alerting.serverSideErrors.invalidLicenseErrorMessage": "La règle {ruleTypeId} est désactivée, car elle requiert une licence {licenseType}. Accédez à Gestion des licences pour consulter les options de mise à niveau.",
+    "xpack.alerting.serverSideErrors.unavailableLicenseErrorMessage": "Le type de règle {ruleTypeId} est désactivé, car les informations de licence ne sont pas disponibles actuellement.",
     "xpack.alerting.serverSideErrors.unavailableLicenseInformationErrorMessage": "Les alertes sont indisponibles – les informations de licence ne sont pas disponibles actuellement.",
+    "xpack.alerting.taskRunner.warning.maxExecutableActions": "Le nombre maximal d'actions pour ce type de règle a été atteint ; les actions excédentaires n'ont pas été déclenchées.",
     "xpack.apm.a.thresholdMet": "Seuil atteint",
     "xpack.apm.addDataButtonLabel": "Ajouter des données",
     "xpack.apm.agentConfig.allOptionLabel": "Tous",
@@ -5782,9 +7026,11 @@
     "xpack.apm.agentConfig.servicePage.cancelButton": "Annuler",
     "xpack.apm.agentConfig.servicePage.environment.description": "Seul un environnement unique par configuration est pris en charge.",
     "xpack.apm.agentConfig.servicePage.environment.fieldLabel": "Environnement de service",
+    "xpack.apm.agentConfig.servicePage.environment.placeholder": "Sélectionner une option",
     "xpack.apm.agentConfig.servicePage.environment.title": "Environnement",
     "xpack.apm.agentConfig.servicePage.service.description": "Choisissez le service que vous souhaitez configurer.",
     "xpack.apm.agentConfig.servicePage.service.fieldLabel": "Nom de service",
+    "xpack.apm.agentConfig.servicePage.service.placeholder": "Sélectionner une option",
     "xpack.apm.agentConfig.servicePage.service.title": "Service",
     "xpack.apm.agentConfig.settingsPage.discardChangesButton": "Abandonner les modifications",
     "xpack.apm.agentConfig.settingsPage.notFound.message": "La configuration demandée n'existe pas",
@@ -5832,40 +7078,53 @@
     "xpack.apm.alerting.fields.type": "Type",
     "xpack.apm.alerts.action_variables.environment": "Type de transaction pour lequel l'alerte est créée",
     "xpack.apm.alerts.action_variables.intervalSize": "La longueur et l'unité de la période à laquelle les conditions de l'alerte ont été remplies",
+    "xpack.apm.alerts.action_variables.reasonMessage": "Une description concise de la raison du signalement",
     "xpack.apm.alerts.action_variables.serviceName": "Service pour lequel l'alerte est créée",
     "xpack.apm.alerts.action_variables.threshold": "Toute valeur de déclenchement dépassant cette valeur lancera l'alerte",
     "xpack.apm.alerts.action_variables.transactionType": "Type de transaction pour lequel l'alerte est créée",
     "xpack.apm.alerts.action_variables.triggerValue": "Valeur ayant dépassé le seuil et déclenché l'alerte",
+    "xpack.apm.alerts.action_variables.viewInAppUrl": "Lien vers la vue ou la fonctionnalité dans Elastic qui peut être utilisée pour examiner l'alerte et son contexte de manière plus approfondie",
     "xpack.apm.alerts.anomalySeverity.criticalLabel": "critique",
     "xpack.apm.alerts.anomalySeverity.majorLabel": "majeur",
     "xpack.apm.alerts.anomalySeverity.minor": "mineur",
     "xpack.apm.alerts.anomalySeverity.scoreDetailsDescription": "score {value} {value, select, critical {} other {et plus}}",
     "xpack.apm.alerts.anomalySeverity.warningLabel": "avertissement",
+    "xpack.apm.alertTypes.anomaly.description": "Alerte lorsque la latence, le rendement ou le taux de transactions ayant échoué d'un service est anormal.",
     "xpack.apm.alertTypes.errorCount.defaultActionMessage": "L'alerte \\{\\{alertName\\}\\} se déclenche en raison des conditions suivantes :\n\n- Nom de service : \\{\\{context.serviceName\\}\\}\n- Environnement : \\{\\{context.environment\\}\\}\n- Seuil : \\{\\{context.threshold\\}\\} erreurs\n- Valeur de déclenchement : \\{\\{context.triggerValue\\}\\} erreurs sur la dernière période de \\{\\{context.interval\\}\\}",
     "xpack.apm.alertTypes.errorCount.description": "Alerte lorsque le nombre d'erreurs d'un service dépasse un seuil défini.",
+    "xpack.apm.alertTypes.errorCount.reason": "Le nombre d'erreurs est {measured} dans le dernier {interval} pour {serviceName}. Alerte lorsque > {threshold}.",
     "xpack.apm.alertTypes.transactionDuration.defaultActionMessage": "L'alerte \\{\\{alertName\\}\\} se déclenche en raison des conditions suivantes :\n\n- Nom de service : \\{\\{context.serviceName\\}\\}\n- Type : \\{\\{context.transactionType\\}\\}\n- Environnement : \\{\\{context.environment\\}\\}\n- Seuil de latence : \\{\\{context.threshold\\}\\} ms\n- Latence observée : \\{\\{context.triggerValue\\}\\} sur la dernière période de \\{\\{context.interval\\}\\}",
     "xpack.apm.alertTypes.transactionDuration.description": "Alerte lorsque la latence d'un type de transaction spécifique dans un service dépasse le seuil défini.",
+    "xpack.apm.alertTypes.transactionDuration.reason": "La latence de {aggregationType} est {measured} dans le dernier {interval} pour {serviceName}. Alerte lorsque > {threshold}.",
     "xpack.apm.alertTypes.transactionDurationAnomaly.defaultActionMessage": "L'alerte \\{\\{alertName\\}\\} se déclenche en raison des conditions suivantes :\n\n- Nom de service : \\{\\{context.serviceName\\}\\}\n- Type : \\{\\{context.transactionType\\}\\}\n- Environnement : \\{\\{context.environment\\}\\}\n- Seuil de sévérité : \\{\\{context.threshold\\}\\}\n- Valeur de sévérité : \\{\\{context.triggerValue\\}\\}\n",
+    "xpack.apm.alertTypes.transactionDurationAnomaly.reason": "Une anomalie {severityLevel} avec un score de {measured} a été détectée dans le dernier {interval} pour {serviceName}.",
     "xpack.apm.alertTypes.transactionErrorRate.defaultActionMessage": "L'alerte \\{\\{alertName\\}\\} se déclenche en raison des conditions suivantes :\n\n- Nom de service : \\{\\{context.serviceName\\}\\}\n- Type : \\{\\{context.transactionType\\}\\}\n- Environnement : \\{\\{context.environment\\}\\}\n- Seuil : \\{\\{context.threshold\\}\\} %\n- Valeur de déclenchement : \\{\\{context.triggerValue\\}\\} % des erreurs sur la dernière période de \\{\\{context.interval\\}\\}",
     "xpack.apm.alertTypes.transactionErrorRate.description": "Alerte lorsque le taux d'erreurs de transaction d'un service dépasse un seuil défini.",
-    "xpack.apm.analyzeDataButton.label": "Analyser les données",
-    "xpack.apm.analyzeDataButton.tooltip": "EXPÉRIMENTAL - La fonctionnalité Analyser les données vous permet de sélectionner et de filtrer les données de résultat dans toute dimension et de rechercher la cause ou l'impact des problèmes de performances",
+    "xpack.apm.alertTypes.transactionErrorRate.reason": "L'échec des transactions est {measured} dans le dernier {interval} pour {serviceName}. Alerte lorsque > {threshold}.",
+    "xpack.apm.analyzeDataButton.label": "Explorer les données",
+    "xpack.apm.analyzeDataButton.tooltip": "La fonctionnalité Explorer les données vous permet de sélectionner et de filtrer les données de résultat dans toute dimension et de rechercher la cause ou l'impact des problèmes de performances",
     "xpack.apm.anomaly_detection.error.invalid_license": "Pour utiliser la détection des anomalies, vous devez disposer d'une licence Elastic Platinum. Cette licence vous permet de monitorer vos services à l'aide du Machine Learning.",
     "xpack.apm.anomaly_detection.error.missing_read_privileges": "Vous devez disposer des privilèges \"read\" (lecture) pour le Machine Learning et l'APM pour consulter les tâches de détection des anomalies",
     "xpack.apm.anomaly_detection.error.missing_write_privileges": "Vous devez disposer des privilèges \"write\" (écriture) pour le Machine Learning et l'APM pour créer des tâches de détection des anomalies",
     "xpack.apm.anomaly_detection.error.not_available": "Le Machine Learning est indisponible",
     "xpack.apm.anomaly_detection.error.not_available_in_space": "Le Machine Learning est indisponible dans l'espace sélectionné",
+    "xpack.apm.anomalyAlert.name": "Anomalie",
     "xpack.apm.anomalyDetection.createJobs.failed.text": "Une erreur est survenue lors de la création d'une ou de plusieurs tâches de détection des anomalies pour les environnements de service APM [{environments}]. Erreur : \"{errorMessage}\"",
     "xpack.apm.anomalyDetection.createJobs.failed.title": "Les tâches de détection des anomalies n'ont pas pu être créées",
     "xpack.apm.anomalyDetection.createJobs.succeeded.text": "Tâches de détection des anomalies créées avec succès pour les environnements de service APM [{environments}]. Le démarrage de l'analyse du trafic à la recherche d'anomalies par le Machine Learning va prendre un certain temps.",
     "xpack.apm.anomalyDetection.createJobs.succeeded.title": "Tâches de détection des anomalies créées",
+    "xpack.apm.anomalyDetectionSetup.jobFetchFailureText": "Impossible de déterminer l'état de la configuration de la détection des anomalies.",
     "xpack.apm.anomalyDetectionSetup.linkLabel": "Détection des anomalies",
     "xpack.apm.anomalyDetectionSetup.notEnabledForEnvironmentText": "La détection des anomalies n'est pas encore activée pour l'environnement \"{currentEnvironment}\". Cliquez pour continuer la configuration.",
     "xpack.apm.anomalyDetectionSetup.notEnabledText": "La détection des anomalies n'est pas encore activée. Cliquez pour continuer la configuration.",
+    "xpack.apm.anomalyDetectionSetup.upgradeableJobsText": "Mises à jour disponibles pour les tâches de détection des anomalies existantes.",
+    "xpack.apm.anomalyScore": "Anomalie {severity, select, minor {mineure} major {majeure} critical {critique}}",
+    "xpack.apm.api.apiKeys.securityRequired": "Le plug-in de sécurité est requis",
     "xpack.apm.api.fleet.cloud_apm_package_policy.requiredRoleOnCloud": "Opération autorisée uniquement pour les utilisateurs Elastic Cloud disposant du rôle de superutilisateur.",
     "xpack.apm.api.fleet.fleetSecurityRequired": "Les plug-ins Fleet et Security sont requis",
     "xpack.apm.apmDescription": "Collecte automatiquement les indicateurs et les erreurs de performances détaillés depuis vos applications.",
     "xpack.apm.apmSchema.index": "Schéma du serveur APM - Index",
+    "xpack.apm.apmServiceGroups.index": "Groupes de services APM - Index",
     "xpack.apm.apmSettings.index": "Paramètres APM - Index",
     "xpack.apm.backendDetail.dependenciesTableColumnBackend": "Service",
     "xpack.apm.backendDetail.dependenciesTableTitle": "Services en amont",
@@ -5874,6 +7133,7 @@
     "xpack.apm.backendDetailThroughputChartTitle": "Rendement",
     "xpack.apm.backendErrorRateChart.chartTitle": "Taux de transactions ayant échoué",
     "xpack.apm.backendErrorRateChart.previousPeriodLabel": "Période précédente",
+    "xpack.apm.backendInventory.dependencyTableColumn": "Dépendance",
     "xpack.apm.backendLatencyChart.chartTitle": "Latence",
     "xpack.apm.backendLatencyChart.previousPeriodLabel": "Période précédente",
     "xpack.apm.backendThroughputChart.chartTitle": "Rendement",
@@ -5885,21 +7145,50 @@
     "xpack.apm.chart.cpuSeries.systemMaxLabel": "Max du système",
     "xpack.apm.chart.error": "Une erreur est survenue lors de la tentative de récupération des données. Réessayez plus tard",
     "xpack.apm.chart.memorySeries.systemAverageLabel": "Moyenne",
-    "xpack.apm.chart.memorySeries.systemMaxLabel": "Max",
+    "xpack.apm.chart.memorySeries.systemMaxLabel": "Max.",
+    "xpack.apm.coldstartRate": "Taux de démarrage à froid",
+    "xpack.apm.coldstartRate.chart.coldstartRate": "Taux de démarrage à froid (moy.)",
+    "xpack.apm.coldstartRate.chart.coldstartRate.previousPeriodLabel": "Période précédente",
     "xpack.apm.compositeSpanCallsLabel": ", {count} appels, sur une moyenne de {duration}",
     "xpack.apm.compositeSpanDurationLabel": "Durée moyenne",
-    "xpack.apm.correlations.correlationsTable.excludeDescription": "Filtrer la valeur",
+    "xpack.apm.correlations.cancelButtonTitle": "Annuler",
+    "xpack.apm.correlations.ccsWarningCalloutBody": "Les données pour l'analyse de corrélation n'ont pas pu être totalement récupérées. Cette fonctionnalité est prise en charge uniquement à partir des versions {version} et ultérieures.",
+    "xpack.apm.correlations.ccsWarningCalloutTitle": "Compatibilité de recherche inter-clusters",
+    "xpack.apm.correlations.correlationsTable.errorMessage": "Impossible de récupérer",
+    "xpack.apm.correlations.correlationsTable.excludeDescription": "Exclure la valeur",
     "xpack.apm.correlations.correlationsTable.excludeLabel": "Exclure",
     "xpack.apm.correlations.correlationsTable.filterDescription": "Filtrer par valeur",
     "xpack.apm.correlations.correlationsTable.filterLabel": "Filtre",
-    "xpack.apm.correlations.correlationsTable.loadingText": "Chargement",
+    "xpack.apm.correlations.correlationsTable.loadingText": "Chargement...",
     "xpack.apm.correlations.correlationsTable.noDataText": "Aucune donnée",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.failurePercentageDescription": "Pourcentage de fois où le terme apparaît dans des transactions ayant échoué.",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.failurePercentageLabel": "% d'échec",
     "xpack.apm.correlations.failedTransactions.correlationsTable.fieldNameLabel": "Nom du champ",
     "xpack.apm.correlations.failedTransactions.correlationsTable.fieldValueLabel": "Valeur du champ",
     "xpack.apm.correlations.failedTransactions.correlationsTable.impactLabel": "Impact",
-    "xpack.apm.correlations.failedTransactions.correlationsTable.pValueLabel": "Score",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.pValueDescription": "La probabilité d'obtenir au moins cette quantité de nom du champ et de valeur pour les transactions ayant échoué, compte tenu de sa prévalence dans les transactions réussies.",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.pValueLabel": "valeur-p",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.scoreLabel": "Score",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.scoreTooltip": "Score [0-1] d'un attribut ; plus le score est élevé, plus un attribut contribue à l'échec des transactions.",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.successPercentageDescription": "Pourcentage de fois où le terme apparaît dans des transactions ayant réussi.",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.successPercentageLabel": "% de réussite",
     "xpack.apm.correlations.failedTransactions.errorTitle": "Une erreur est survenue lors de l'exécution de corrélations sur les transactions ayant échoué",
-    "xpack.apm.correlations.failedTransactions.panelTitle": "Transactions ayant échoué",
+    "xpack.apm.correlations.failedTransactions.helpPopover.basicExplanation": "Les corrélations vous aident à découvrir les attributs qui ont le plus d'influence pour distinguer les échecs et les succès d'une transaction. Les transactions sont considérées comme un échec lorsque leur valeur {field} est {value}.",
+    "xpack.apm.correlations.failedTransactions.helpPopover.performanceExplanation": "Cette analyse réalise des recherches statistiques sur un grand nombre d'attributs. Pour les plages temporelles étendues et les services ayant un rendement de transactions élevé, cela peut prendre un certain temps. Réduisez la plage temporelle pour améliorer les performances.",
+    "xpack.apm.correlations.failedTransactions.helpPopover.tableExplanation": "Le tableau est trié par scores, qui sont mappés aux niveaux d'impact élevé, moyen ou bas. Les attributs ayant un niveau d'impact élevé sont plus susceptibles de faire échouer les transactions.",
+    "xpack.apm.correlations.failedTransactions.helpPopover.title": "Corrélations des transactions ayant échoué",
+    "xpack.apm.correlations.failedTransactions.panelTitle": "Distribution de la latence des transactions ayant échoué",
+    "xpack.apm.correlations.failedTransactions.tableTitle": "Corrélations",
+    "xpack.apm.correlations.fieldContextPopover.addFilterAriaLabel": "Filtrer sur le {fieldName} : \"{value}\"",
+    "xpack.apm.correlations.fieldContextPopover.calculatedFromSampleDescription": "Calculé à partir d'un échantillon de {sampleSize} documents",
+    "xpack.apm.correlations.fieldContextPopover.descriptionTooltipContent": "Afficher le top 10 des valeurs de champ",
+    "xpack.apm.correlations.fieldContextPopover.fieldTopValuesLabel": "Top 10 des valeurs",
+    "xpack.apm.correlations.fieldContextPopover.notTopTenValueMessage": "Le terme sélectionné n'est pas dans le top 10",
+    "xpack.apm.correlations.fieldContextPopover.removeFilterAriaLabel": "Exclure le {fieldName} : \"{value}\"",
+    "xpack.apm.correlations.fieldContextPopover.topFieldValuesAriaLabel": "Afficher le top 10 des valeurs de champ",
+    "xpack.apm.correlations.highImpactText": "Élevé",
+    "xpack.apm.correlations.latencyCorrelations.advancedStatisticsLabel": "Statistiques avancées",
+    "xpack.apm.correlations.latencyCorrelations.advancedStatisticsTooltipContent": "Activer des informations statistiques supplémentaires pour obtenir les résultats de la corrélation.",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.actionsLabel": "Filtre",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.correlationColumnDescription": "Score de corrélation [0-1] d'un attribut ; plus le score est élevé, plus un attribut augmente la latence.",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.correlationLabel": "Corrélation",
@@ -5910,29 +7199,54 @@
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.filterDescription": "Filtrer par valeur",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.filterLabel": "Filtre",
     "xpack.apm.correlations.latencyCorrelations.errorTitle": "Une erreur est survenue lors de la récupération des corrélations",
+    "xpack.apm.correlations.latencyCorrelations.fallbackCorrelationBadgeMessage": "Très bas",
     "xpack.apm.correlations.latencyCorrelations.panelTitle": "Distribution de la latence",
     "xpack.apm.correlations.latencyCorrelations.tableTitle": "Corrélations",
+    "xpack.apm.correlations.latencyCorrelations.titleHelp": "Le graphique utilise des échelles logarithmiques sur les deux axes pour éviter que les valeurs aberrantes ne le déforment",
     "xpack.apm.correlations.latencyPopoverBasicExplanation": "Les corrélations vous aident à découvrir quels attributs contribuent à l'augmentation des temps de réponse des transactions ou de la latence.",
-    "xpack.apm.correlations.latencyPopoverChartExplanation": "Le graphique de distribution de la latence permet de visualiser la latence globale des transactions dans le service. Lorsque vous passez votre souris sur des attributs du tableau, leur distribution de latence est ajoutée au graphique.",
+    "xpack.apm.correlations.latencyPopoverChartExplanation": "Le graphique de distribution de la latence permet de visualiser la latence globale des transactions dans le groupe de transactions. Lorsque vous passez votre souris sur des attributs du tableau, leur distribution de latence est ajoutée au graphique.",
     "xpack.apm.correlations.latencyPopoverFilterExplanation": "Vous pouvez également ajouter ou retirer des filtres pour modifier les requêtes dans l'application APM.",
     "xpack.apm.correlations.latencyPopoverPerformanceExplanation": "Cette analyse réalise des recherches statistiques sur un grand nombre d'attributs. Pour les plages temporelles étendues et les services ayant un rendement de transactions élevé, cela peut prendre un certain temps. Réduisez la plage temporelle pour améliorer les performances.",
     "xpack.apm.correlations.latencyPopoverTableExplanation": "Le tableau est trié par coefficient de corrélation, de 0 à 1. Les attributs ayant des valeurs de corrélation plus élevées sont plus susceptibles de contribuer à des transactions à haute latence.",
     "xpack.apm.correlations.latencyPopoverTitle": "Corrélations de latence",
+    "xpack.apm.correlations.license.text": "Pour utiliser l'API de corrélations, vous devez disposer d'une licence Elastic Platinum.",
+    "xpack.apm.correlations.lowImpactText": "Bas",
+    "xpack.apm.correlations.mediumImpactText": "Moyenne",
+    "xpack.apm.correlations.noCorrelationsTextLine1": "Les corrélations ne seront identifiées que si leur impact est important.",
+    "xpack.apm.correlations.noCorrelationsTextLine2": "Essayez de sélectionner une autre plage temporelle ou de retirer des filtres appliqués.",
+    "xpack.apm.correlations.noCorrelationsTitle": "Aucune corrélation importante",
+    "xpack.apm.correlations.progressAriaLabel": "Progression",
+    "xpack.apm.correlations.progressTitle": "Progression : {progress} %",
+    "xpack.apm.correlations.refreshButtonTitle": "Actualiser",
+    "xpack.apm.correlations.veryLowImpactText": "Très bas",
     "xpack.apm.customLink.buttom.create": "Créer un lien personnalisé",
     "xpack.apm.customLink.buttom.create.title": "Créer",
     "xpack.apm.customLink.buttom.manage": "Gérer des liens personnalisés",
     "xpack.apm.customLink.empty": "Aucun lien personnalisé trouvé. Configurez vos propres liens personnalisés, par ex. un lien vers un tableau de bord spécifique ou un lien externe.",
+    "xpack.apm.dependencies.kueryBarPlaceholder": "Rechercher dans les indicateurs de dépendance (par ex., span.destination.service.resource:elasticsearch)",
     "xpack.apm.dependenciesTable.columnErrorRate": "Taux de transactions ayant échoué",
+    "xpack.apm.dependenciesTable.columnErrorRateTip": "Le pourcentage de transactions ayant échoué pour le service sélectionné. Les transactions du serveur HTTP avec un code du statut 4xx (erreur du client) ne sont pas considérées comme des échecs, car l'appelant, et non le serveur, a provoqué l'échec.",
     "xpack.apm.dependenciesTable.columnImpact": "Impact",
+    "xpack.apm.dependenciesTable.columnImpactTip": "Points de terminaison les plus utilisés et les plus lents de votre service. Calculé en multipliant la latence par le rendement.",
     "xpack.apm.dependenciesTable.columnLatency": "Latence (moy.)",
     "xpack.apm.dependenciesTable.columnThroughput": "Rendement",
+    "xpack.apm.dependenciesTable.notFoundLabel": "Aucune dépendance trouvée",
     "xpack.apm.dependenciesTable.serviceMapLinkText": "Afficher la carte des services",
+    "xpack.apm.deprecations.legacyModeTitle": "Le serveur APM fonctionne en mode hérité",
+    "xpack.apm.deprecations.message": "L'exécution directe du binaire du serveur APM est considérée comme une option héritée et sera déclassée et retirée à l'avenir.",
+    "xpack.apm.deprecations.steps.apm": "Naviguer vers Observabilité/APM",
+    "xpack.apm.deprecations.steps.schema": "Sélectionner l'onglet \"Schema\"",
+    "xpack.apm.deprecations.steps.settings": "Cliquer sur \"Settings\"",
+    "xpack.apm.deprecations.steps.switch": "Cliquer sur \"Passer à Elastic Agent\". Vous serez guidé tout au long du processus",
     "xpack.apm.emptyMessage.noDataFoundDescription": "Essayez avec une autre plage temporelle ou réinitialisez le filtre de recherche.",
     "xpack.apm.emptyMessage.noDataFoundLabel": "Aucune donnée trouvée.",
+    "xpack.apm.environmentsSelectPlaceholder": "Sélectionner l'environnement",
     "xpack.apm.error.prompt.body": "Veuillez consulter la console de développeur de votre navigateur pour plus de détails.",
     "xpack.apm.error.prompt.title": "Désolé, une erreur s'est produite :(",
     "xpack.apm.errorCountAlert.name": "Seuil de nombre d'erreurs",
     "xpack.apm.errorCountAlertTrigger.errors": " erreurs",
+    "xpack.apm.errorGroup.chart.ocurrences": "Occurrences",
+    "xpack.apm.errorGroup.chart.ocurrences.previousPeriodLabel": "Période précédente",
     "xpack.apm.errorGroupDetails.culpritLabel": "Coupable",
     "xpack.apm.errorGroupDetails.errorGroupTitle": "Groupe d'erreurs {errorGroupId}",
     "xpack.apm.errorGroupDetails.errorOccurrenceTitle": "Occurrence d'erreur",
@@ -5945,14 +7259,18 @@
     "xpack.apm.errorRate": "Taux de transactions ayant échoué",
     "xpack.apm.errorRate.chart.errorRate": "Taux de transactions ayant échoué (moy.)",
     "xpack.apm.errorRate.chart.errorRate.previousPeriodLabel": "Période précédente",
+    "xpack.apm.errorRate.tip": "Le pourcentage de transactions ayant échoué pour le service sélectionné. Les transactions du serveur HTTP avec un code du statut 4xx (erreur du client) ne sont pas considérées comme des échecs, car l'appelant, et non le serveur, a provoqué l'échec.",
     "xpack.apm.errorsTable.errorMessageAndCulpritColumnLabel": "Message d'erreur et coupable",
     "xpack.apm.errorsTable.groupIdColumnDescription": "Hachage de la trace de pile. Regroupe les erreurs similaires, même lorsque le message d'erreur est différent en raison des paramètres dynamiques.",
     "xpack.apm.errorsTable.groupIdColumnLabel": "ID du groupe",
-    "xpack.apm.errorsTable.noErrorsLabel": "Aucune erreur n'a été trouvée",
+    "xpack.apm.errorsTable.lastSeenColumnLabel": "Vu en dernier",
+    "xpack.apm.errorsTable.noErrorsLabel": "Aucune erreur trouvée",
     "xpack.apm.errorsTable.occurrencesColumnLabel": "Occurrences",
     "xpack.apm.errorsTable.typeColumnLabel": "Type",
     "xpack.apm.errorsTable.unhandledLabel": "Non géré",
-    "xpack.apm.failedTransactionsCorrelations.licenseCheckText": "Pour utiliser la fonctionnalité de corrélation des transactions ayant échoué, vous devez disposer d'une licence Elastic Platinum.",
+    "xpack.apm.exactTransactionRateLabel": "{value} tpm",
+    "xpack.apm.failedTransactionsCorrelations.licenseCheckText": "Pour utiliser la fonctionnalité de corrélation des transactions ayant échoué, vous devez disposer d'une licence Elastic Platinum. Cette fonctionnalité vous aide à découvrir quels attributs contribuent à l'échec des transactions.",
+    "xpack.apm.failure_badge.tooltip": "event.outcome = échec",
     "xpack.apm.featureRegistry.apmFeatureName": "APM et expérience utilisateur",
     "xpack.apm.feedbackMenu.appName": "APM",
     "xpack.apm.fetcher.error.status": "Erreur",
@@ -5963,6 +7281,25 @@
     "xpack.apm.filter.environment.notDefinedLabel": "Non défini",
     "xpack.apm.filter.environment.selectEnvironmentLabel": "Sélectionner l'environnement",
     "xpack.apm.fleet_integration.settings.advancedOptionsLavel": "Options avancées",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousAllowAgentHelpText": "Noms d'agents autorisés pour l'accès anonyme.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousAllowAgentLabel": "Agents autorisés",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousAllowServiceHelpText": "Noms de service autorisés pour l'accès anonyme.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousAllowServiceLabel": "Service autorisés",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousEnabledDescription": "Autoriser l'accès anonyme uniquement pour les agents et/ou services spécifiés. Ceci est principalement destiné à autoriser un accès limité aux agents non fiables, tels que Real User Monitoring (monitoring des utilisateurs réels). Lorsque l'authentification anonyme est activée, seuls les agents correspondant à la configuration Agents autorisés et les services correspondant à la configuration Services autorisés sont autorisés. Voir ci-dessous pour plus de détails sur les valeurs par défaut.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousEnabledHelpText": "Activer l'accès anonyme au serveur APM pour certains agents APM.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousEnabledTitle": "Accès anonyme aux agents",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousRateLimitEventLimitHelpText": "Nombre maximal d'événements autorisés par IP client par seconde.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousRateLimitEventLimitLabel": "Limite de taux de l'événement (limite de l'événement)",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousRateLimitIpLimitHelpText": "Nombre d'IP clients uniques pour lesquels une limite de taux distincte sera maintenue.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.anonymousRateLimitIpLimitLabel": "Limite de taux (limite IP)",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.apiKeyAuthenticationHelpText": "Activez l'authentification de la clé d'API entre le serveur APM et les agents APM.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.apiKeyAuthenticationPlaceholder": "Clé d'API pour l'authentification des agents",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.apiKeyLimitDescription": "Limitez le nombre de clés d'API uniques par minute, utilisées pour l'authentification entre les agents APM et le serveur.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.apiKeyLimitHelpText": "Peut être utilisé pour la conformité à la politique de sécurité.",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.apiKeyLimitLabel": "Nombre de clés",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.apiKeyLimitTitle": "Nombre maximal de clés d'API pour l'authentification des agents",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.secretTokenLabel": "Token secret",
+    "xpack.apm.fleet_integration.settings.agentAuthorization.settings.title": "Autorisation de l'agent",
     "xpack.apm.fleet_integration.settings.apm.capturePersonalDataDescription": "Capturer des données personnelles, telles que l'IP ou l'agent utilisateur",
     "xpack.apm.fleet_integration.settings.apm.capturePersonalDataTitle": "Capture des données personnelles",
     "xpack.apm.fleet_integration.settings.apm.defaultServiceEnvironmentDescription": "Environnement de service par défaut pour l'enregistrement des événements n'ayant aucun environnement de service défini.",
@@ -5970,17 +7307,18 @@
     "xpack.apm.fleet_integration.settings.apm.defaultServiceEnvironmentTitle": "Configuration de service",
     "xpack.apm.fleet_integration.settings.apm.expvarEnabledDescription": "Exposé sous /debug/vars",
     "xpack.apm.fleet_integration.settings.apm.expvarEnabledTitle": "Activer la prise en charge d'expvar de Golang pour le serveur APM",
-    "xpack.apm.fleet_integration.settings.apm.hostDescription": "Choisissez un nom et une description pour identifier facilement le type d'utilisation de cette intégration.",
+    "xpack.apm.fleet_integration.settings.apm.hostDescription": "Hôte définit l'hôte et le port sur lesquels le serveur écoute. URL est l'URL du serveur invariable et accessible au public pour les déploiements sur Elastic Cloud ou ECK.",
     "xpack.apm.fleet_integration.settings.apm.hostLabel": "Hôte",
     "xpack.apm.fleet_integration.settings.apm.hostTitle": "Configuration du serveur",
     "xpack.apm.fleet_integration.settings.apm.idleTimeoutLabel": "Temps d'inactivité avant la fermeture de la connexion sous-jacente",
+    "xpack.apm.fleet_integration.settings.apm.maxConnectionsHelpText": "0 pour Illimités",
     "xpack.apm.fleet_integration.settings.apm.maxConnectionsLabel": "Connexions acceptées simultanément",
     "xpack.apm.fleet_integration.settings.apm.maxEventBytesLabel": "Taille maximale par événement (octets)",
     "xpack.apm.fleet_integration.settings.apm.maxHeaderBytesDescription": "Définissez des limites pour la taille des en-têtes de requêtes et les configurations de temporisation.",
     "xpack.apm.fleet_integration.settings.apm.maxHeaderBytesLabel": "Taille maximale de l'en-tête d'une requête (octets)",
     "xpack.apm.fleet_integration.settings.apm.maxHeaderBytesTitle": "Limites",
     "xpack.apm.fleet_integration.settings.apm.readTimeoutLabel": "Durée maximale pour la lecture d'une requête intégrale",
-    "xpack.apm.fleet_integration.settings.apm.responseHeadersDescription": "Définissez des limites pour la taille des en-têtes de requêtes et les configurations de temporisation.",
+    "xpack.apm.fleet_integration.settings.apm.responseHeadersDescription": "En-têtes HTTP personnalisés ajoutés aux réponses HTTP",
     "xpack.apm.fleet_integration.settings.apm.responseHeadersHelpText": "Peut être utilisé pour la conformité à la politique de sécurité.",
     "xpack.apm.fleet_integration.settings.apm.responseHeadersLabel": "En-têtes HTTP personnalisés ajoutés aux réponses HTTP",
     "xpack.apm.fleet_integration.settings.apm.responseHeadersTitle": "En-têtes personnalisés",
@@ -5993,16 +7331,21 @@
     "xpack.apm.fleet_integration.settings.disabledLabel": "Désactivé",
     "xpack.apm.fleet_integration.settings.enabledLabel": "Activé",
     "xpack.apm.fleet_integration.settings.optionalLabel": "Facultatif",
+    "xpack.apm.fleet_integration.settings.platinumBadgeLabel": "Platinum",
+    "xpack.apm.fleet_integration.settings.platinumBadgeTooltipDescription": "Les configurations sont enregistrées mais ignorées si votre licence Kibana n'est pas Platinum.",
+    "xpack.apm.fleet_integration.settings.platinumBadgeTooltipTitle": "Licence Platinum requise",
     "xpack.apm.fleet_integration.settings.requiredFieldLabel": "Champ requis",
     "xpack.apm.fleet_integration.settings.requiredLabel": "Requis",
     "xpack.apm.fleet_integration.settings.rum.enableRumDescription": "Activer le monitoring des utilisateurs réels (RUM)",
     "xpack.apm.fleet_integration.settings.rum.enableRumTitle": "Activer RUM",
     "xpack.apm.fleet_integration.settings.rum.rumAllowHeaderDescription": "Configurer l'authentification pour l'agent",
-    "xpack.apm.fleet_integration.settings.rum.rumAllowHeaderHelpText": "En-têtes Origin autorisés pouvant être envoyés par les agents utilisateurs.",
-    "xpack.apm.fleet_integration.settings.rum.rumAllowHeaderLabel": "En-têtes Origin autorisés",
+    "xpack.apm.fleet_integration.settings.rum.rumAllowHeaderHelpText": "Access-Control-Allow-Headers pris en charge en plus de \"Content-Type\", \"Content-Encoding\" et \"Accept\".",
+    "xpack.apm.fleet_integration.settings.rum.rumAllowHeaderLabel": "Access-Control-Allow-Headers",
     "xpack.apm.fleet_integration.settings.rum.rumAllowHeaderTitle": "En-têtes personnalisés",
-    "xpack.apm.fleet_integration.settings.rum.rumAllowOriginsHelpText": "Access-Control-Allow-Headers pris en charge en plus de \"Content-Type\", \"Content-Encoding\" et \"Accept\".",
-    "xpack.apm.fleet_integration.settings.rum.rumAllowOriginsLabel": "Access-Control-Allow-Headers",
+    "xpack.apm.fleet_integration.settings.rum.rumAllowOriginsHelpText": "En-têtes Origin autorisés pouvant être envoyés par les agents utilisateurs.",
+    "xpack.apm.fleet_integration.settings.rum.rumAllowOriginsLabel": "En-têtes Origin",
+    "xpack.apm.fleet_integration.settings.rum.rumExcludeFromGroupingHelpText": "Exclure les cadres des traces de pile du calcul des groupes d'erreurs en faisant correspondre le \"file_name\" d'un cadre de trace de pile avec ce regexp.",
+    "xpack.apm.fleet_integration.settings.rum.rumExcludeFromGroupingLabel": "Exclure du regroupement",
     "xpack.apm.fleet_integration.settings.rum.rumLibraryPatternHelpText": "Identifiez les cadres de la bibliothèque en faisant correspondre le file_name et le abs_path du cadre de la trace de pile avec ce regexp.",
     "xpack.apm.fleet_integration.settings.rum.rumLibraryPatternLabel": "Modèle du cadre de la bibliothèque",
     "xpack.apm.fleet_integration.settings.rum.rumResponseHeadersHelpText": "Ajouté aux réponses RUM, par ex. à des fins de conformité à la politique de sécurité.",
@@ -6010,6 +7353,18 @@
     "xpack.apm.fleet_integration.settings.rum.settings.subtitle": "Gérez la configuration de l'agent RUM JS.",
     "xpack.apm.fleet_integration.settings.rum.settings.title": "Real User Monitoring (monitoring des utilisateurs réels)",
     "xpack.apm.fleet_integration.settings.selectOrCreateOptions": "Sélectionner ou créer des options",
+    "xpack.apm.fleet_integration.settings.tailSampling.enableTailSamplingDescription": "Activer l'échantillonnage basé sur la queue.",
+    "xpack.apm.fleet_integration.settings.tailSampling.settings.subtitle": "Gérer l'échantillonnage basé sur la queue pour les services et les traces.",
+    "xpack.apm.fleet_integration.settings.tailSampling.settings.title": "Échantillonnage basé sur la queue",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingEnabledTitle": "Activer l'échantillonnage basé sur la queue",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingInterval": "Intervalle d'échantillonnage de la queue",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingIntervalDescription": "Intervalle pour la synchronisation entre plusieurs serveurs APM. Devrait être de l'ordre de quelques dizaines de secondes ou de quelques minutes.",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingIntervalTitle": "Intervalle",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPolicies": "Politiques d'échantillonnage de la queue",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPoliciesDescription": "Les politiques mappent les événements de trace à un taux d'échantillonnage. Chaque politique doit spécifier un taux d'échantillonnage. Les événements de trace sont mis en correspondance avec les politiques dans l'ordre spécifié. Toutes les conditions de la politique doivent être vraies pour qu'un événement de trace corresponde. Chaque liste de politiques doit se terminer par une politique qui ne spécifie qu'un taux d'échantillonnage. Cette politique finale est utilisée pour repérer les événements de trace restants qui ne correspondent pas à une politique plus stricte.",
+    "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPoliciesTitle": "Politiques",
+    "xpack.apm.fleet_integration.settings.tailSamplingDocsHelpText": "Pour en savoir plus sur les politiques d'échantillonnage de la queue, consultez notre {link}.",
+    "xpack.apm.fleet_integration.settings.tailSamplingDocsHelpTextLink": "documents",
     "xpack.apm.fleet_integration.settings.tls.settings.subtitle": "Paramètres pour la certification TLS.",
     "xpack.apm.fleet_integration.settings.tls.settings.title": "Paramètres TLS",
     "xpack.apm.fleet_integration.settings.tls.tlsCertificateLabel": "Chemin d'accès au certificat du serveur",
@@ -6020,11 +7375,44 @@
     "xpack.apm.fleet_integration.settings.tls.tlsEnabledTitle": "Activer TLS",
     "xpack.apm.fleet_integration.settings.tls.tlsKeyLabel": "Chemin d'accès à la clé de certificat du serveur",
     "xpack.apm.fleet_integration.settings.tls.tlsSupportedProtocolsLabel": "Versions de protocoles prises en charge",
+    "xpack.apm.fleet_integration.settings.yamlCodeEditor": "Éditeur de code YAML",
+    "xpack.apm.fleetIntegration.apmAgent.discoveryRule.DragHandle": "Faire glisser la poignée",
+    "xpack.apm.fleetIntegration.apmAgent.editDisacoveryRule.operation": "Opération",
+    "xpack.apm.fleetIntegration.apmAgent.editDisacoveryRule.probe": "Détecter",
+    "xpack.apm.fleetIntegration.apmAgent.editDisacoveryRule.type": "Type",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.addRule": "Ajouter une règle",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.autoAttachment": "Rattachement automatique",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.betaBadge.label": "BÊTA",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.betaBadge.tooltipContent": "Le rattachement automatique pour Java n'est pas disponible. Nous vous remercions de bien vouloir nous aider en nous signalant tout bug.",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.discoveryRules": "Règles de découverte",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.editRule.add": "Ajouter",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.editRule.helpText": "Choisir parmi les paramètres autorisés",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.editRule.probeValue": "Saisir la valeur de détection",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.editRule.save": "Enregistrer",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.enableRuntimeAttachement": "Activer le rattachement de l'exécution",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.manualInstrumentation": "Instrumentation manuelle",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.unsavedRules": "Des modifications ne sont pas enregistrées. Cliquez sur \"Enregistrer l'intégration\" pour synchroniser les modifications apportées à l'intégration.",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.version": "Version",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.version.invalid": "Version non valide",
+    "xpack.apm.fleetIntegration.apmAgent.runtimeAttachment.version.placeHolder": "Sélectionner ou ajouter une version",
     "xpack.apm.fleetIntegration.assets.description": "Consulter les traces de l'application et les cartes de service dans APM",
     "xpack.apm.fleetIntegration.assets.name": "Services",
     "xpack.apm.fleetIntegration.enrollmentFlyout.installApmAgentButtonText": "Installer l'agent APM",
     "xpack.apm.fleetIntegration.enrollmentFlyout.installApmAgentDescription": "Une fois l'agent lancé, vous pouvez installer des agents APM sur vos hôtes pour collecter des données depuis vos applications et services.",
     "xpack.apm.fleetIntegration.enrollmentFlyout.installApmAgentTitle": "Installer l'agent APM",
+    "xpack.apm.fleetIntegration.javaRuntime.discoveryRulesDescription": "Pour chaque JVM en cours d'exécution, les règles de découverte sont évaluées dans l'ordre où elles sont fournies. La première règle de correspondance détermine le résultat. Découvrez plus d'informations dans le {docLink}.",
+    "xpack.apm.fleetIntegration.javaRuntime.discoveryRulesDescription.docLink": "documents",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude": "Exclure",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude.options.main": "principale",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude.options.mainDescription": "Expression régulière de noms de classes principales entièrement qualifiés ou de chemins d'accès aux JAR des applications auxquelles l'agent Java doit être attaché. Effectue une correspondance partielle de sorte que foo corresponde à /bin/foo.jar.",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude.options.user": "utilisateur",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude.options.userDescription": "Un nom d'utilisateur qui est comparé à l'utilisateur du système d'exploitation qui exécute la JVM.",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude.options.vmarg": "vmarg",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.exclude.options.vmargDescription": "Une expression régulière comparée aux arguments transmis à la JVM, comme les propriétés du système. Effectue une correspondance partielle afin que attach=true corresponde à la propriété système -Dattach=true.",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.include": "Inclure",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.include.options.all": "Tous",
+    "xpack.apm.fleetIntegration.javaRuntime.operationType.include.options.allDescription": "Inclut toutes les JVM pour le rattachement.",
+    "xpack.apm.fleetIntegration.javaRuntime.toggleDescription": "Attacher l'agent Java aux applications Java en cours d'exécution et de démarrage.",
     "xpack.apm.formatters.hoursTimeUnitLabel": "h",
     "xpack.apm.formatters.microsTimeUnitLabel": "μs",
     "xpack.apm.formatters.millisTimeUnitLabel": "ms",
@@ -6037,12 +7425,15 @@
     "xpack.apm.home.alertsMenu.alerts": "Alertes et règles",
     "xpack.apm.home.alertsMenu.createAnomalyAlert": "Créer une règle d'anomalie",
     "xpack.apm.home.alertsMenu.createThresholdAlert": "Créer une règle de seuil",
-    "xpack.apm.home.alertsMenu.errorCount": "Nombre d'erreurs",
+    "xpack.apm.home.alertsMenu.errorCount": " Créer une règle de comptage des erreurs",
     "xpack.apm.home.alertsMenu.transactionDuration": "Latence",
     "xpack.apm.home.alertsMenu.transactionErrorRate": "Taux de transactions ayant échoué",
     "xpack.apm.home.alertsMenu.viewActiveAlerts": "Gérer les règles",
+    "xpack.apm.home.infraTabLabel": "Infrastructure",
     "xpack.apm.home.serviceLogsTabLabel": "Logs",
     "xpack.apm.home.serviceMapTabLabel": "Carte des services",
+    "xpack.apm.infra.announcement": "Données sur les infrastructures bientôt disponibles",
+    "xpack.apm.inspectButtonText": "Inspecter",
     "xpack.apm.instancesLatencyDistributionChartLegend": "Instances",
     "xpack.apm.instancesLatencyDistributionChartLegend.previousPeriod": "Période précédente",
     "xpack.apm.instancesLatencyDistributionChartTitle": "Distribution de la latence des instances",
@@ -6053,9 +7444,12 @@
     "xpack.apm.invalidLicense.licenseManagementLink": "Gérer votre licence",
     "xpack.apm.invalidLicense.message": "L'interface utilisateur d'APM n'est pas disponible car votre licence actuelle a expiré ou n'est plus valide.",
     "xpack.apm.invalidLicense.title": "Licence non valide",
+    "xpack.apm.jobsList.updateCompletedToastText": "Vos nouvelles tâches de détection d'anomalies ont été créées avec succès. Vous commencerez à voir les résultats de la détection des anomalies dans l'application dans quelques minutes. Les anciennes tâches ont été fermées mais les résultats sont toujours disponibles dans Machine Learning.",
+    "xpack.apm.jobsList.updateCompletedToastTitle": "Tâches de détection des anomalies créées !",
     "xpack.apm.jvmsTable.cpuColumnLabel": "Moy. CPU",
     "xpack.apm.jvmsTable.explainServiceNodeNameMissing": "Nous n'avons pas pu déterminer à quelles JVM ces indicateurs correspondent. Cela provient probablement du fait que vous exécutez une version du serveur APM antérieure à 7.5. La mise à niveau du serveur APM vers la version 7.5 ou supérieure devrait résoudre le problème.",
     "xpack.apm.jvmsTable.heapMemoryColumnLabel": "Moy. segment de mémoire",
+    "xpack.apm.jvmsTable.hostName": "Nom d'hôte",
     "xpack.apm.jvmsTable.nameColumnLabel": "Nom",
     "xpack.apm.jvmsTable.nameExplanation": "Par défaut, le nom de la JVM est l'ID du conteneur (le cas échéant) ou le nom d'hôte. Vous pouvez néanmoins le configurer manuellement via la configuration \"service_node_name\" de l'agent.",
     "xpack.apm.jvmsTable.noJvmsLabel": "Aucune JVM n'a été trouvée",
@@ -6074,14 +7468,30 @@
     "xpack.apm.localFilters.titles.os": "Système d'exploitation",
     "xpack.apm.localFilters.titles.serviceName": "Nom de service",
     "xpack.apm.localFilters.titles.transactionUrl": "URL",
+    "xpack.apm.managedTable.errorMessage": "Impossible de récupérer",
+    "xpack.apm.managedTable.loadingDescription": "Chargement…",
     "xpack.apm.metrics.transactionChart.machineLearningLabel": "Machine Learning :",
     "xpack.apm.metrics.transactionChart.machineLearningTooltip": "Le flux affiche les limites attendues de la latence moyenne. Une annotation verticale rouge signale des anomalies avec un score d'anomalie de 75 ou plus.",
     "xpack.apm.metrics.transactionChart.machineLearningTooltip.withKuery": "Les résultats de Machine Learning sont masqués lorsque la barre de recherche est utilisée comme filtre",
     "xpack.apm.metrics.transactionChart.viewJob": "Afficher la tâche",
+    "xpack.apm.mlCallout.dismissButton": "Rejeter",
+    "xpack.apm.mlCallout.learnMoreButton": "En savoir plus",
+    "xpack.apm.mlCallout.legacyJobsCalloutText": "Nous avons découvert d'anciennes tâches de Machine Learning de notre précédente intégration qui ne sont plus utilisées dans l'application APM",
+    "xpack.apm.mlCallout.legacyJobsCalloutTitle": "Les anciennes tâches ML ne sont plus utilisées dans l'application APM",
+    "xpack.apm.mlCallout.noJobsCalloutButtonText": "Créer une tâche de ML",
+    "xpack.apm.mlCallout.noJobsCalloutText": "Identifiez les transactions anormales et consultez l'intégrité des services en amont et en aval grâce à l'intégration de la détection des anomalies d'APM. Lancez-vous en quelques minutes seulement.",
+    "xpack.apm.mlCallout.noJobsCalloutTitle": "Activer la détection des anomalies pour ajouter des indicateurs de statut d'intégrité à vos services",
+    "xpack.apm.mlCallout.updateAvailableCalloutButtonText": "Mettre à jour les tâches",
+    "xpack.apm.mlCallout.updateAvailableCalloutText": "Nous avons mis à jour les tâches de détection des anomalies qui fournissent des indications sur la dégradation des performances et ajouté des détecteurs de débit et de taux de transactions ayant échoué. Si vous choisissez de mettre à jour, nous créerons les nouvelles tâches et fermerons les tâches héritées. Les données affichées dans l'application APM passeront automatiquement aux nouvelles. Veuillez noter que l'option de migration de toutes les tâches existantes ne sera pas disponible si vous choisissez de créer une nouvelle tâche.",
+    "xpack.apm.mlCallout.updateAvailableCalloutTitle": "Mises à jour disponibles",
+    "xpack.apm.navigation.dependenciesTitle": "Dépendances",
     "xpack.apm.navigation.serviceMapTitle": "Carte des services",
     "xpack.apm.navigation.servicesTitle": "Services",
     "xpack.apm.navigation.tracesTitle": "Traces",
-    "xpack.apm.notAvailableLabel": "N/A",
+    "xpack.apm.noDataConfig.addApmIntegrationButtonLabel": "Ajouter l'intégration APM",
+    "xpack.apm.noDataConfig.addDataButtonLabel": "Ajouter des données",
+    "xpack.apm.noDataConfig.solutionName": "Observabilité",
+    "xpack.apm.notAvailableLabel": "S. O.",
     "xpack.apm.percentOfParent": "({value} de {parentType, select, transaction { transaction } trace {trace} })",
     "xpack.apm.profiling.collapseSimilarFrames": "Réduire les éléments similaires",
     "xpack.apm.profiling.highlightFrames": "Rechercher",
@@ -6096,6 +7506,7 @@
     "xpack.apm.propertiesTable.tabs.metadataLabel": "Métadonnées",
     "xpack.apm.propertiesTable.tabs.timelineLabel": "Chronologie",
     "xpack.apm.searchInput.filter": "Filtrer…",
+    "xpack.apm.selectCustomOptionText": "Ajouter \\{searchValue\\} en tant que nouvelle option",
     "xpack.apm.selectPlaceholder": "Sélectionner une option :",
     "xpack.apm.serviceDependencies.breakdownChartTitle": "Temps consacré par dépendance",
     "xpack.apm.serviceDetails.dependenciesTabLabel": "Dépendances",
@@ -6107,21 +7518,84 @@
     "xpack.apm.serviceDetails.metricsTabLabel": "Indicateurs",
     "xpack.apm.serviceDetails.nodesTabLabel": "JVM",
     "xpack.apm.serviceDetails.overviewTabLabel": "Aperçu",
-    "xpack.apm.serviceDetails.profilingTabExperimentalDescription": "Le profilage est à un stade hautement expérimental, dédié uniquement à une utilisation interne.",
-    "xpack.apm.serviceDetails.profilingTabExperimentalLabel": "Expérimental",
+    "xpack.apm.serviceDetails.profilingTabExperimentalDescription": "Cette fonctionnalité est en version d'évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "xpack.apm.serviceDetails.profilingTabExperimentalLabel": "Version d'évaluation technique",
     "xpack.apm.serviceDetails.profilingTabLabel": "Profilage",
     "xpack.apm.serviceDetails.transactionsTabLabel": "Transactions",
+    "xpack.apm.serviceGroup.allServices.title": "Services",
+    "xpack.apm.serviceGroup.serviceInventory": "Inventory",
+    "xpack.apm.serviceGroup.serviceMap": "Carte des services",
+    "xpack.apm.serviceGroups.breadcrumb.title": "Services",
+    "xpack.apm.serviceGroups.cardsList.emptyDescription": "Aucune description disponible",
+    "xpack.apm.serviceGroups.cardsList.serviceCount": "{servicesCount} {servicesCount, plural, one {service} other {services}}",
+    "xpack.apm.serviceGroups.createFailure.toast.title": "Erreur lors de la création du groupe \"{groupName}\"",
+    "xpack.apm.serviceGroups.createGroupLabel": "Créer un groupe",
+    "xpack.apm.serviceGroups.createSuccess.toast.text": "Votre groupe est maintenant visible dans la nouvelle vue Services pour les groupes.",
+    "xpack.apm.serviceGroups.createSucess.toast.title": "Groupe \"{groupName}\" créé",
+    "xpack.apm.serviceGroups.deleteFailure.toast.title": "Erreur lors de la suppression du groupe \"{groupName}\"",
+    "xpack.apm.serviceGroups.deleteFailure.unknownId.toast.text": "Impossible de supprimer le groupe : id du groupe de service inconnu.",
+    "xpack.apm.serviceGroups.deleteFailure.unknownId.toast.title": "Erreur lors de la suppression du groupe \"{groupName}\"",
+    "xpack.apm.serviceGroups.deleteSuccess.toast.title": "Groupe \"{groupName}\" supprimé",
+    "xpack.apm.serviceGroups.editFailure.toast.title": "Erreur lors de la modification du groupe \"{groupName}\"",
+    "xpack.apm.serviceGroups.editGroupLabel": "Modifier un groupe",
+    "xpack.apm.serviceGroups.editSuccess.toast.text": "Nouveaux changements dans le groupe de services enregistrés.",
+    "xpack.apm.serviceGroups.editSucess.toast.title": "Groupe \"{groupName}\" modifié",
+    "xpack.apm.serviceGroups.emptyPrompt.message": "Aucun groupe trouvé pour ce filtre",
+    "xpack.apm.serviceGroups.emptyPrompt.serviceGroups": "Groupes de services",
+    "xpack.apm.serviceGroups.groupDetailsForm.cancel": "Annuler",
+    "xpack.apm.serviceGroups.groupDetailsForm.color": "Couleur",
+    "xpack.apm.serviceGroups.groupDetailsForm.create.title": "Créer un groupe",
+    "xpack.apm.serviceGroups.groupDetailsForm.deleteGroup": "Supprimer un groupe",
+    "xpack.apm.serviceGroups.groupDetailsForm.description": "Description",
+    "xpack.apm.serviceGroups.groupDetailsForm.description.optional": "Facultatif",
+    "xpack.apm.serviceGroups.groupDetailsForm.edit.title": "Modifier un groupe",
+    "xpack.apm.serviceGroups.groupDetailsForm.invalidColorError": "Veuillez fournir une valeur de couleur valide",
+    "xpack.apm.serviceGroups.groupDetailsForm.name": "Nom",
+    "xpack.apm.serviceGroups.groupDetailsForm.selectServices": "Sélectionner des services",
+    "xpack.apm.serviceGroups.groupsCount": "{servicesCount} {servicesCount, plural, =0 {groupe} one {groupe} other {groupes}}",
+    "xpack.apm.serviceGroups.list.allServices.description": "Afficher tous les services",
+    "xpack.apm.serviceGroups.list.allServices.name": "Tous les services",
+    "xpack.apm.serviceGroups.list.sort.alphabetical": "Alphabétique",
+    "xpack.apm.serviceGroups.list.sort.recentlyAdded": "Récemment ajouté",
+    "xpack.apm.serviceGroups.selectServicesForm.cancel": "Annuler",
+    "xpack.apm.serviceGroups.selectServicesForm.editGroupDetails": "Modifier les détails du groupe",
+    "xpack.apm.serviceGroups.selectServicesForm.kql": "Par exemple, labels.team : \"web\"",
+    "xpack.apm.serviceGroups.selectServicesForm.matchingServiceCount": "{servicesCount} {servicesCount, plural, =0 {service correspond} one {service correspond} other {services correspondent}} à la requête",
+    "xpack.apm.serviceGroups.selectServicesForm.panelLabel": "Entrer une requête pour sélectionner les services",
+    "xpack.apm.serviceGroups.selectServicesForm.preview": "Aperçu",
+    "xpack.apm.serviceGroups.selectServicesForm.refresh": "Actualiser",
+    "xpack.apm.serviceGroups.selectServicesForm.saveGroup": "Enregistrer le groupe",
+    "xpack.apm.serviceGroups.selectServicesForm.subtitle": "Utilisez une requête pour sélectionner les services pour ce groupe. Les services qui correspondent à cette requête dans les dernières 24 heures seront affectés au groupe.",
+    "xpack.apm.serviceGroups.selectServicesForm.title": "Sélectionner des services",
+    "xpack.apm.serviceGroups.selectServicesList.environmentColumnLabel": "Environnements",
+    "xpack.apm.serviceGroups.selectServicesList.nameColumnLabel": "Nom",
+    "xpack.apm.serviceGroups.selectServicesList.notFoundLabel": "Aucun service disponible dans les dernières 24 heures. Vous pouvez toujours créer le groupe et les services qui correspondent à votre requête.",
+    "xpack.apm.serviceGroups.sortLabel": "Trier",
+    "xpack.apm.serviceGroups.tour.content.link": "Découvrez plus d'informations dans le {docsLink}.",
+    "xpack.apm.serviceGroups.tour.content.link.docs": "documents",
+    "xpack.apm.serviceGroups.tour.createGroups.content": "Regroupez les services afin de créer des vues d'inventaire organisées qui éliminent le bruit et simplifient les enquêtes sur les services. Les groupes sont spécifiques à l'espace Kibana et sont disponibles pour tous les utilisateurs ayant un accès approprié.",
+    "xpack.apm.serviceGroups.tour.createGroups.title": "Présentation des groupes de services",
+    "xpack.apm.serviceGroups.tour.dismiss": "Rejeter",
+    "xpack.apm.serviceGroups.tour.editGroups.content": "Utilisez l'option de modification pour changer le nom, la requête ou les détails de ce groupe de services.",
+    "xpack.apm.serviceGroups.tour.editGroups.title": "Modifier ce groupe de services",
+    "xpack.apm.serviceGroups.tour.serviceGroups.content": "Maintenant que vous avez créé un groupe de services, votre inventaire Tous les services a été déplacé ici. Ce groupe ne peut être ni modifié ni retiré.",
+    "xpack.apm.serviceGroups.tour.serviceGroups.title": "Groupe Tous les services",
     "xpack.apm.serviceHealthStatus.critical": "Critique",
     "xpack.apm.serviceHealthStatus.healthy": "Intègre",
     "xpack.apm.serviceHealthStatus.unknown": "Inconnu",
     "xpack.apm.serviceHealthStatus.warning": "Avertissement",
     "xpack.apm.serviceIcons.cloud": "Cloud",
     "xpack.apm.serviceIcons.container": "Conteneur",
+    "xpack.apm.serviceIcons.serverless": "Sans serveur",
     "xpack.apm.serviceIcons.service": "Service",
     "xpack.apm.serviceIcons.serviceDetails.cloud.availabilityZoneLabel": "{zones, plural, =0 {Zone de disponibilité} one {Zone de disponibilité} other {Zones de disponibilité}} ",
+    "xpack.apm.serviceIcons.serviceDetails.cloud.faasTriggerTypeLabel": "{triggerTypes, plural, =0 {Type de déclencheur} one {Type de déclencheur} other {Types de déclencheurs}} ",
+    "xpack.apm.serviceIcons.serviceDetails.cloud.functionNameLabel": "{functionNames, plural, =0 {Nom de fonction} one {Nom de fonction} other {Noms de fonction}} ",
     "xpack.apm.serviceIcons.serviceDetails.cloud.machineTypesLabel": "{machineTypes, plural, =0{Type de machine} one {Type de machine} other {Types de machines}} ",
     "xpack.apm.serviceIcons.serviceDetails.cloud.projectIdLabel": "ID projet",
     "xpack.apm.serviceIcons.serviceDetails.cloud.providerLabel": "Fournisseur cloud",
+    "xpack.apm.serviceIcons.serviceDetails.cloud.regionLabel": "{regions, plural, =0 {Region} one {Région} other {Régions}} ",
+    "xpack.apm.serviceIcons.serviceDetails.cloud.serviceNameLabel": "Service Cloud",
     "xpack.apm.serviceIcons.serviceDetails.container.containerizedLabel": "Conteneurisé",
     "xpack.apm.serviceIcons.serviceDetails.container.noLabel": "Non",
     "xpack.apm.serviceIcons.serviceDetails.container.orchestrationLabel": "Orchestration",
@@ -6132,7 +7606,7 @@
     "xpack.apm.serviceIcons.serviceDetails.service.frameworkLabel": "Nom du framework",
     "xpack.apm.serviceIcons.serviceDetails.service.runtimeLabel": "Nom et version de l'exécution",
     "xpack.apm.serviceIcons.serviceDetails.service.versionLabel": "Version du service",
-    "xpack.apm.serviceLogs.noInfrastructureMessage": "Il n'y a aucun message log à afficher.",
+    "xpack.apm.serviceLogs.noInfrastructureMessage": "Il n'y a aucun message de log à afficher.",
     "xpack.apm.serviceMap.anomalyDetectionPopoverDisabled": "Affichez les indicateurs d'intégrité du service en activant la détection des anomalies dans les paramètres APM.",
     "xpack.apm.serviceMap.anomalyDetectionPopoverLink": "Afficher les anomalies",
     "xpack.apm.serviceMap.anomalyDetectionPopoverNoData": "Nous n'avons pas trouvé de score d'anomalie dans la plage temporelle sélectionnée. Consultez les détails dans l'explorateur d'anomalies.",
@@ -6144,6 +7618,7 @@
     "xpack.apm.serviceMap.avgReqPerMinutePopoverMetric": "Rendement (moy.)",
     "xpack.apm.serviceMap.avgTransDurationPopoverStat": "Latence (moy.)",
     "xpack.apm.serviceMap.center": "Centre",
+    "xpack.apm.serviceMap.dependencyDetailsButtonText": "Détails des dépendances",
     "xpack.apm.serviceMap.download": "Télécharger",
     "xpack.apm.serviceMap.emptyBanner.docsLink": "En savoir plus dans la documentation",
     "xpack.apm.serviceMap.emptyBanner.message": "Nous démapperons les services connectés et les requêtes externes si nous parvenons à les détecter. Assurez-vous d'exécuter la dernière version de l'agent APM.",
@@ -6164,15 +7639,23 @@
     "xpack.apm.serviceMap.viewFullMap": "Afficher la carte de services entière",
     "xpack.apm.serviceMap.zoomIn": "Zoom avant",
     "xpack.apm.serviceMap.zoomOut": "Zoom arrière",
-    "xpack.apm.serviceNodeMetrics.containerId": "ID conteneur",
+    "xpack.apm.serviceNamesSelectPlaceholder": "Sélectionner le nom du service",
+    "xpack.apm.serviceNodeMetrics.containerId": "ID de conteneur",
     "xpack.apm.serviceNodeMetrics.host": "Hôte",
     "xpack.apm.serviceNodeMetrics.serviceName": "Nom de service",
     "xpack.apm.serviceNodeMetrics.unidentifiedServiceNodesWarningDocumentationLink": "documentation du serveur APM",
     "xpack.apm.serviceNodeMetrics.unidentifiedServiceNodesWarningText": "Nous n'avons pas pu déterminer à quelles JVM ces indicateurs correspondent. Cela provient probablement du fait que vous exécutez une version du serveur APM antérieure à 7.5. La mise à niveau du serveur APM vers la version 7.5 ou supérieure devrait résoudre le problème. Pour plus d'informations sur la mise à niveau, consultez {link}. Vous pouvez également utiliser la barre de recherche de Kibana pour filtrer par nom d'hôte, par ID de conteneur ou en fonction d'autres champs.",
     "xpack.apm.serviceNodeMetrics.unidentifiedServiceNodesWarningTitle": "Impossible d'identifier les JVM",
     "xpack.apm.serviceNodeNameMissing": "(vide)",
+    "xpack.apm.serviceOveriew.errorsTableOccurrences": "{occurrences} occ.",
+    "xpack.apm.serviceOverview.coldstartHelp": "Le taux de démarrage à froid indique le pourcentage de demandes qui déclenchent un démarrage à froid d'une fonction sans serveur.",
+    "xpack.apm.serviceOverview.dependenciesTableColumn": "Dépendance",
     "xpack.apm.serviceOverview.dependenciesTableTabLink": "Afficher les dépendances",
-    "xpack.apm.serviceOverview.dependenciesTableTitle": "Services en aval et back-ends",
+    "xpack.apm.serviceOverview.dependenciesTableTitle": "Dépendances",
+    "xpack.apm.serviceOverview.dependenciesTableTitleTip": "Services en aval non instrumentés ou connexions externes dérivées des intervalles de sortie des services instrumentés.",
+    "xpack.apm.serviceOverview.errorsTable.errorMessage": "Impossible de récupérer",
+    "xpack.apm.serviceOverview.errorsTable.loading": "Chargement...",
+    "xpack.apm.serviceOverview.errorsTable.noResults": "Aucune erreur trouvée",
     "xpack.apm.serviceOverview.errorsTableColumnLastSeen": "Vu en dernier",
     "xpack.apm.serviceOverview.errorsTableColumnName": "Nom",
     "xpack.apm.serviceOverview.errorsTableColumnOccurrences": "Occurrences",
@@ -6188,6 +7671,7 @@
     "xpack.apm.serviceOverview.instancesTable.actionMenus.pod.title": "Détails du pod",
     "xpack.apm.serviceOverview.instancesTable.actionMenus.podLogs": "Logs du pod",
     "xpack.apm.serviceOverview.instancesTable.actionMenus.podMetrics": "Indicateurs du pod",
+    "xpack.apm.serviceOverview.instancesTable.errorMessage": "Impossible de récupérer",
     "xpack.apm.serviceOverview.instancesTableColumnCpuUsage": "Utilisation CPU (moy.)",
     "xpack.apm.serviceOverview.instancesTableColumnErrorRate": "Taux de transactions ayant échoué",
     "xpack.apm.serviceOverview.instancesTableColumnMemoryUsage": "Utilisation de la mémoire (moy.)",
@@ -6204,11 +7688,15 @@
     "xpack.apm.serviceOverview.latencyColumnDefaultLabel": "Latence",
     "xpack.apm.serviceOverview.latencyColumnP95Label": "Latence (95e)",
     "xpack.apm.serviceOverview.latencyColumnP99Label": "Latence (99e)",
+    "xpack.apm.serviceOverview.loadingText": "Chargement…",
+    "xpack.apm.serviceOverview.noResultsText": "Aucune instance trouvée",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "Période précédente",
     "xpack.apm.serviceOverview.throughtputChartTitle": "Rendement",
-    "xpack.apm.serviceOverview.tpmHelp": "Le rendement est mesuré en transactions par minute (tpm)",
+    "xpack.apm.serviceOverview.tpmHelp": "Le rendement est mesuré en transactions par minute (tpm).",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "Taux de transactions ayant échoué",
+    "xpack.apm.serviceOverview.transactionsTableColumnErrorRateTip": "Le pourcentage de transactions ayant échoué pour le service sélectionné. Les transactions du serveur HTTP avec un code du statut 4xx (erreur du client) ne sont pas considérées comme des échecs, car l'appelant, et non le serveur, a provoqué l'échec.",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "Impact",
+    "xpack.apm.serviceOverview.transactionsTableColumnImpactTip": "Points de terminaison les plus utilisés et les plus lents de votre service. Calculé en multipliant la latence par le rendement.",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "Nom",
     "xpack.apm.serviceOverview.transactionsTableColumnThroughput": "Rendement",
     "xpack.apm.serviceProfiling.valueTypeLabel.allocObjects": "Objets alloués",
@@ -6219,6 +7707,8 @@
     "xpack.apm.serviceProfiling.valueTypeLabel.samples": "Échantillons",
     "xpack.apm.serviceProfiling.valueTypeLabel.unknown": "Autre",
     "xpack.apm.serviceProfiling.valueTypeLabel.wallTime": "Mur",
+    "xpack.apm.servicesGroups.filter": "Groupes de filtres",
+    "xpack.apm.servicesGroups.loadingServiceGroups": "Chargement des groupes de services",
     "xpack.apm.servicesTable.environmentColumnLabel": "Environnement",
     "xpack.apm.servicesTable.environmentCount": "{environmentCount, plural, one {1 environnement} other {# environnements}}",
     "xpack.apm.servicesTable.healthColumnLabel": "Intégrité",
@@ -6233,6 +7723,49 @@
     "xpack.apm.settings.agentConfig": "Configuration de l'agent",
     "xpack.apm.settings.agentConfig.createConfigButton.tooltip": "Vous ne disposez pas d'autorisations pour créer des configurations d'agent",
     "xpack.apm.settings.agentConfig.descriptionText": "Affinez votre configuration d'agent depuis l'application APM. Les modifications sont automatiquement propagées à vos agents APM, ce qui vous évite d'effectuer un redéploiement.",
+    "xpack.apm.settings.agentKeys": "Clés d'agent",
+    "xpack.apm.settings.agentKeys.agentKeysErrorPromptTitle": "Impossible de charger les clés de l'agent APM.",
+    "xpack.apm.settings.agentKeys.agentKeysLoadingPromptTitle": "Chargement des clés de l'agent APM...",
+    "xpack.apm.settings.agentKeys.apiKeysDisabledErrorDescription": "Contactez votre administrateur système et reportez-vous aux {link} pour activer les clés d'API.",
+    "xpack.apm.settings.agentKeys.apiKeysDisabledErrorLinkText": "documents",
+    "xpack.apm.settings.agentKeys.apiKeysDisabledErrorTitle": "Clés d'API non activées dans Elasticsearch",
+    "xpack.apm.settings.agentKeys.copyAgentKeyField.agentKeyLabel": "Clé de l'agent APM",
+    "xpack.apm.settings.agentKeys.copyAgentKeyField.copyButton": "Copier dans le presse-papiers",
+    "xpack.apm.settings.agentKeys.copyAgentKeyField.message": "Copiez cette clé maintenant. Vous ne pourrez plus la visualiser à nouveau.",
+    "xpack.apm.settings.agentKeys.copyAgentKeyField.title": "Création de la clé \"{name}\" effectuée",
+    "xpack.apm.settings.agentKeys.crate.failed": "Erreur lors de la création de la clé de l'agent APM \"{keyName}\". Erreur : \"{message}\"",
+    "xpack.apm.settings.agentKeys.createAgentKeyButton": "Créer une clé d'agent APM",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.agentConfigHelpText": "Requis pour que les agents puissent lire la configuration des agents à distance.",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.cancelButton": "Annuler",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.createAgentKey": "Créer une clé d'agent APM",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.ingestAgentEvents": "Requis pour l'ingestion d'événements.",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.name.placeholder": "Entrer un nom",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.nameHelpText": "Quelle est l'utilisation de cette clé ?",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.namePlaceholder": "Par exemple, apm-key",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.nameTitle": "Nom",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.privilegesFieldset": "Attribuer des privilèges",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.sourcemaps": "Requis pour le téléchargement des cartes sources.",
+    "xpack.apm.settings.agentKeys.createKeyFlyout.userTitle": "Utilisateur",
+    "xpack.apm.settings.agentKeys.deleteConfirmModal.cancel": "Annuler",
+    "xpack.apm.settings.agentKeys.deleteConfirmModal.delete": "Supprimer",
+    "xpack.apm.settings.agentKeys.deleteConfirmModal.title": "Supprimer la clé de l'agent APM \"{name}\" ?",
+    "xpack.apm.settings.agentKeys.descriptionText": "Afficher et supprimer les clés de l'agent APM. Une clé de l'agent APM envoie des demandes de la part d'un utilisateur.",
+    "xpack.apm.settings.agentKeys.emptyPromptBody": "Créez des clés d'agent APM pour autoriser les demandes d'agent APM au serveur APM.",
+    "xpack.apm.settings.agentKeys.emptyPromptTitle": "Créer votre première clé",
+    "xpack.apm.settings.agentKeys.invalidate.failed": "Erreur lors de la suppression de la clé de l'agent APM \"{name}\"",
+    "xpack.apm.settings.agentKeys.invalidate.succeeded": "Suppression de la clé de l'agent APM \"{name}\"",
+    "xpack.apm.settings.agentKeys.noPermissionToManagelApiKeysDescription": "Contactez votre administrateur système",
+    "xpack.apm.settings.agentKeys.noPermissionToManagelApiKeysTitle": "Vous devez disposer d'une autorisation pour gérer les clés d'API",
+    "xpack.apm.settings.agentKeys.table.creationColumnName": "Créé",
+    "xpack.apm.settings.agentKeys.table.deleteActionDescription": "Supprimer la clé de l'agent APM",
+    "xpack.apm.settings.agentKeys.table.deleteActionTitle": "Supprimer",
+    "xpack.apm.settings.agentKeys.table.nameColumnName": "Nom",
+    "xpack.apm.settings.agentKeys.table.realmColumnName": "Domaine",
+    "xpack.apm.settings.agentKeys.table.realmFilterLabel": "Domaine",
+    "xpack.apm.settings.agentKeys.table.userFilterLabel": "Utilisateur",
+    "xpack.apm.settings.agentKeys.table.userNameColumnName": "Utilisateur",
+    "xpack.apm.settings.agentKeys.tableCaption": "Clés de l'agent APM",
+    "xpack.apm.settings.agentKeys.title": "Clés de l'agent APM",
     "xpack.apm.settings.anomaly_detection.legacy_jobs.button": "Consulter les tâches",
     "xpack.apm.settings.anomalyDetection": "Détection des anomalies",
     "xpack.apm.settings.anomalyDetection.addEnvironments.cancelButtonText": "Annuler",
@@ -6242,64 +7775,125 @@
     "xpack.apm.settings.anomalyDetection.addEnvironments.selectorPlaceholder": "Sélectionner ou ajouter des environnements",
     "xpack.apm.settings.anomalyDetection.addEnvironments.titleText": "Sélectionner des environnements",
     "xpack.apm.settings.anomalyDetection.jobList.actionColumnLabel": "Action",
-    "xpack.apm.settings.anomalyDetection.jobList.addEnvironments": "Créer une tâche de ML",
+    "xpack.apm.settings.anomalyDetection.jobList.addEnvironments": "Créer une tâche",
+    "xpack.apm.settings.anomalyDetection.jobList.closedStatusLabel": "Fermé",
     "xpack.apm.settings.anomalyDetection.jobList.emptyListText": "Aucune tâche de détection des anomalies.",
     "xpack.apm.settings.anomalyDetection.jobList.environmentColumnLabel": "Environnement",
     "xpack.apm.settings.anomalyDetection.jobList.environments": "Environnements",
     "xpack.apm.settings.anomalyDetection.jobList.failedFetchText": "Impossible de récupérer les tâches de détection des anomalies.",
+    "xpack.apm.settings.anomalyDetection.jobList.legacyStatusLabel": "Hérité",
+    "xpack.apm.settings.anomalyDetection.jobList.manageMlJobsButtonText": "Gérer les tâches",
     "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText": "Pour ajouter la détection des anomalies à un nouvel environnement, créez une tâche de Machine Learning. Vous pouvez gérer les tâches de Machine Learning existantes dans {mlJobsLink}.",
-    "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText": "Machine Learning",
-    "xpack.apm.settings.anomalyDetection.jobList.mlJobLinkText": "Afficher une tâche dans ML",
+    "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText": "Machine Learning",
+    "xpack.apm.settings.anomalyDetection.jobList.mlJobLinkText": "Gérer la tâche",
+    "xpack.apm.settings.anomalyDetection.jobList.okStatusLabel": "OK",
+    "xpack.apm.settings.anomalyDetection.jobList.openAnomalyExplorerrLinkText": "Ouvrir dans Anomaly Explorer",
+    "xpack.apm.settings.anomalyDetection.jobList.showLegacyJobsCheckboxText": "Afficher les tâches héritées",
+    "xpack.apm.settings.anomalyDetection.jobList.warningStatusBadgeLabel": "Avertissement",
+    "xpack.apm.settings.anomalyDetection.jobList.warningStatusLabel": "Il est possible que la tâche rencontre des problèmes. Cliquez sur le lien Gérer les tâches pour en savoir plus.",
     "xpack.apm.settings.apmIndices.applyButton": "Appliquer les modifications",
     "xpack.apm.settings.apmIndices.applyChanges.failed.text": "Un problème est survenu lors de l'application des index. Erreur : {errorMessage}",
     "xpack.apm.settings.apmIndices.applyChanges.failed.title": "Impossible d'appliquer les index.",
     "xpack.apm.settings.apmIndices.applyChanges.succeeded.text": "Les modifications apportées aux index ont été correctement appliquées. Ces modifications sont immédiatement appliquées dans l'interface utilisateur APM",
     "xpack.apm.settings.apmIndices.applyChanges.succeeded.title": "Index appliqués",
     "xpack.apm.settings.apmIndices.cancelButton": "Annuler",
-    "xpack.apm.settings.apmIndices.description": "L'interface utilisateur APM utilise des modèles d'indexation pour interroger vos index APM. Si vous avez personnalisé les noms des index sur lesquels le serveur APM écrit les événements, vous devrez peut-être mettre à jour ces modèles pour que l'interface utilisateur APM fonctionne. Dans ce cas précis, les paramètres prévalent sur ceux définis dans kibana.yml.",
+    "xpack.apm.settings.apmIndices.description": "L'interface utilisateur APM utilise des vues de données pour interroger vos indices APM. Si vous avez personnalisé les noms des index sur lesquels le serveur APM écrit les événements, vous devrez peut-être mettre à jour ces modèles pour que l'interface utilisateur APM fonctionne. Dans ce cas précis, les paramètres prévalent sur ceux définis dans kibana.yml.",
     "xpack.apm.settings.apmIndices.errorIndicesLabel": "Index des erreurs",
     "xpack.apm.settings.apmIndices.helpText": "Remplace {configurationName} : {defaultValue}",
     "xpack.apm.settings.apmIndices.metricsIndicesLabel": "Index des indicateurs",
     "xpack.apm.settings.apmIndices.noPermissionTooltipLabel": "Votre rôle d'utilisateur ne dispose pas d'autorisations pour changer les index APM",
     "xpack.apm.settings.apmIndices.onboardingIndicesLabel": "Intégration des index",
     "xpack.apm.settings.apmIndices.sourcemapIndicesLabel": "Index des source maps",
+    "xpack.apm.settings.apmIndices.spaceDescription": "Les paramètres des index s'appliquent à l'espace {spaceName}.",
     "xpack.apm.settings.apmIndices.spanIndicesLabel": "Index des intervalles",
     "xpack.apm.settings.apmIndices.title": "Index",
     "xpack.apm.settings.apmIndices.transactionIndicesLabel": "Index des transactions",
     "xpack.apm.settings.createApmPackagePolicy.errorToast.title": "Impossible de créer une politique de package APM sur la politique d'agent cloud",
-    "xpack.apm.settings.customizeApp": "Personnaliser l'application",
+    "xpack.apm.settings.customizeApp": "Liens personnalisés",
+    "xpack.apm.settings.customLink": "Liens personnalisés",
+    "xpack.apm.settings.customLink.create.failed": "Impossible d'enregistrer le lien !",
+    "xpack.apm.settings.customLink.create.failed.message": "Un problème est survenu lors de l'enregistrement du lien. Erreur : \"{errorMessage}\"",
+    "xpack.apm.settings.customLink.create.successed": "Lien enregistré !",
+    "xpack.apm.settings.customLink.createCustomLink": "Créer un lien personnalisé",
+    "xpack.apm.settings.customLink.default.label": "Elastic.co",
+    "xpack.apm.settings.customLink.default.url": "https://www.elastic.co",
+    "xpack.apm.settings.customLink.delete": "Supprimer",
+    "xpack.apm.settings.customLink.delete.failed": "Impossible de supprimer le lien personnalisé",
+    "xpack.apm.settings.customLink.delete.successed": "Lien personnalisé supprimé.",
+    "xpack.apm.settings.customLink.emptyPromptText": "Nous allons y remédier ! Vous pouvez ajouter des liens personnalisés au menu contextuel Actions à partir des détails de transaction de chaque service. Créez un lien utile vers le portail d'assistance de votre société, ou ouvrez un nouveau rapport de bug. Pour en savoir plus, consultez notre documentation.",
+    "xpack.apm.settings.customLink.emptyPromptTitle": "Aucun lien trouvé.",
+    "xpack.apm.settings.customLink.flyout.action.title": "Lien",
+    "xpack.apm.settings.customLink.flyout.close": "Fermer",
+    "xpack.apm.settings.customLink.flyout.filters.addAnotherFilter": "Ajouter un autre filtre",
+    "xpack.apm.settings.customLink.flyOut.filters.defaultOption": "Sélectionner un champ…",
+    "xpack.apm.settings.customLink.flyOut.filters.defaultOption.value": "Valeur",
+    "xpack.apm.settings.customLink.flyout.filters.prepend": "Champ",
+    "xpack.apm.settings.customLink.flyout.filters.subtitle": "Utilisez les options de filtre pour limiter leur portée à des services spécifiques.",
+    "xpack.apm.settings.customLink.flyout.filters.title": "Filtres",
+    "xpack.apm.settings.customLink.flyout.label": "Les liens seront disponibles dans le contexte des détails de transaction, depuis l'application APM. Vous pouvez créer autant de liens que vous le souhaitez. Vous pouvez faire référence aux variables dynamiques en utilisant n'importe quelle métadonnée de la transaction pour remplir vos URL. Vous trouverez davantage d'informations, notamment des exemples, dans la",
+    "xpack.apm.settings.customLink.flyout.label.doc": "documentation.",
+    "xpack.apm.settings.customLink.flyout.link.label": "Étiquette",
+    "xpack.apm.settings.customLink.flyout.link.label.helpText": "C'est l'étiquette qui s'affiche dans le menu contextuel des actions. Elle doit être la plus courte possible.",
+    "xpack.apm.settings.customLink.flyout.link.label.placeholder": "Par ex., tickets d'assistance",
+    "xpack.apm.settings.customLink.flyout.link.url": "URL",
+    "xpack.apm.settings.customLink.flyout.link.url.doc": "Découvrez plus d'informations dans la documentation.",
+    "xpack.apm.settings.customLink.flyout.link.url.helpText": "Ajoutez les variables des noms de champ à votre URL pour appliquer des valeurs, par ex., {sample}.",
+    "xpack.apm.settings.customLink.flyout.link.url.placeholder": "par ex., https://www.elastic.co/fr/",
+    "xpack.apm.settings.customLink.flyout.required": "Requis",
+    "xpack.apm.settings.customLink.flyout.save": "Enregistrer",
+    "xpack.apm.settings.customLink.flyout.title": "Créer un lien",
+    "xpack.apm.settings.customLink.info": "Ces liens seront affichés dans le menu contextuel Actions, dans des zones sélectionnées de l'application, par ex., par détail de transaction.",
+    "xpack.apm.settings.customLink.license.text": "Pour créer des liens personnalisés, vous devez disposer d'une licence Elastic Gold ou supérieure. Elle vous permet de créer des liens personnalisés pour améliorer votre workflow lors de l'analyse de vos services.",
+    "xpack.apm.settings.customLink.linkPreview.descrition": "Testez votre lien avec des valeurs tirées d'un document d'exemple de transaction avec les filtres ci-dessus.",
+    "xpack.apm.settings.customLink.noPermissionTooltipLabel": "Votre rôle d'utilisateur ne dispose pas d'autorisations pour créer des liens personnalisés",
+    "xpack.apm.settings.customLink.preview.contextVariable.invalid": "Nous n'avons pas trouvé de document d'exemple de transaction car les variables définies ne sont pas valides.",
+    "xpack.apm.settings.customLink.preview.contextVariable.noMatch": "Nous n'avons pas trouvé de valeur correspondante pour {variables} dans le document d'exemple de transaction.",
+    "xpack.apm.settings.customLink.preview.transaction.notFound": "Nous n'avons pas trouvé de document de transaction correspondant avec les filtres définis.",
+    "xpack.apm.settings.customLink.previewSectionTitle": "Aperçu",
+    "xpack.apm.settings.customLink.searchInput.filter": "Filtrer les liens par nom et URL…",
+    "xpack.apm.settings.customLink.table.editButtonDescription": "Modifier ce lien personnalisé",
+    "xpack.apm.settings.customLink.table.editButtonLabel": "Modifier",
+    "xpack.apm.settings.customLink.table.lastUpdated": "Dernière mise à jour",
+    "xpack.apm.settings.customLink.table.name": "Nom",
+    "xpack.apm.settings.customLink.table.noResultFound": "Pas de résultats pour \"{value}\".",
+    "xpack.apm.settings.customLink.table.url": "URL",
     "xpack.apm.settings.indices": "Index",
     "xpack.apm.settings.schema": "Schéma",
     "xpack.apm.settings.schema.confirm.apmServerSettingsCloudLinkText": "Accéder aux paramètres du serveur APM dans Elastic Cloud",
     "xpack.apm.settings.schema.confirm.cancelText": "Annuler",
-    "xpack.apm.settings.schema.confirm.checkboxLabel": "Je confirme vouloir basculer vers les flux de données",
+    "xpack.apm.settings.schema.confirm.checkboxLabel": "Je confirme vouloir passer à Elastic Agent",
     "xpack.apm.settings.schema.confirm.irreversibleWarning.message": "Il est possible que cela affecte temporairement votre collecte de données APM pendant la progression de la migration. Le processus de migration ne devrait prendre que quelques minutes.",
-    "xpack.apm.settings.schema.confirm.irreversibleWarning.title": "Le basculement vers les flux de données est une action irréversible",
-    "xpack.apm.settings.schema.confirm.switchButtonText": "Basculer vers les flux de données",
+    "xpack.apm.settings.schema.confirm.irreversibleWarning.title": "La transition vers Elastic Agent est une action irréversible",
+    "xpack.apm.settings.schema.confirm.switchButtonText": "Passer à Elastic Agent",
     "xpack.apm.settings.schema.confirm.title": "Veuillez confirmer votre choix",
     "xpack.apm.settings.schema.confirm.unsupportedConfigs.descriptionText": "Les paramètres utilisateur apm-server.yml personnalisés compatibles seront déplacés vers le serveur Fleet à votre place. Nous vous informerons des paramètres incompatibles avant de les supprimer.",
     "xpack.apm.settings.schema.confirm.unsupportedConfigs.title": "Les paramètres utilisateur apm-server.yml suivants sont incompatibles et seront supprimés",
+    "xpack.apm.settings.schema.descriptionText": "Nous avons créé un processus simple et transparent pour passer du binaire du serveur APM à Elastic Agent. Attention, il s'agit d'une action {irreversibleEmphasis} qui ne peut être réalisée que par un {superuserEmphasis} bénéficiant d'un accès à Fleet. En savoir plus sur {elasticAgentDocLink}.",
+    "xpack.apm.settings.schema.descriptionText.elasticAgentDocLinkText": "Elastic Agent",
     "xpack.apm.settings.schema.descriptionText.irreversibleEmphasisText": "irréversible",
     "xpack.apm.settings.schema.descriptionText.superuserEmphasisText": "superutilisateur",
-    "xpack.apm.settings.schema.disabledReason": "L'option Basculer vers les flux de données est indisponible : {reasons}",
+    "xpack.apm.settings.schema.disabledReason": "L'option Passer à Elastic Agent est non disponible : {reasons}",
     "xpack.apm.settings.schema.disabledReason.cloudApmMigrationEnabled": "La migration vers le cloud n'est pas activée",
     "xpack.apm.settings.schema.disabledReason.hasCloudAgentPolicy": "La politique d'agent cloud n'existe pas",
     "xpack.apm.settings.schema.disabledReason.hasRequiredRole": "L'utilisateur ne dispose pas du rôle de superutilisateur",
     "xpack.apm.settings.schema.migrate.classicIndices.currentSetup": "Configuration actuelle",
-    "xpack.apm.settings.schema.migrate.classicIndices.description": "Vous utilisez actuellement des index APM classiques pour vos données. Ce schéma de données est sur le point de disparaître et sera remplacé par des flux de données dans la version 8.0 d'Elastic Stack.",
-    "xpack.apm.settings.schema.migrate.classicIndices.title": "Index APM classiques",
-    "xpack.apm.settings.schema.migrate.dataStreams.buttonText": "Basculer vers les flux de données",
-    "xpack.apm.settings.schema.migrate.dataStreams.description": "À partir de maintenant, toutes les nouvelles données ingérées seront stockées dans les flux de données. Les données précédemment ingérées restent dans les index APM classiques. Les applications APM et UX continueront à prendre en charge les deux types d'index.",
-    "xpack.apm.settings.schema.migrate.dataStreams.title": "Flux de données",
+    "xpack.apm.settings.schema.migrate.classicIndices.description": "Vous utilisez actuellement le binaire du serveur APM. Cette option héritée est déclassée depuis la version 7.16 et est remplacée par un serveur APM géré dans Elastic Agent à partir de la version 8.0.",
+    "xpack.apm.settings.schema.migrate.classicIndices.title": "Binaire du serveur APM",
+    "xpack.apm.settings.schema.migrate.dataStreams.buttonText": "Passer à Elastic Agent",
+    "xpack.apm.settings.schema.migrate.dataStreams.description": "À partir de la version 8.0, il est recommandé de gérer le serveur APM avec Elastic Agent. Elastic Agent peut fonctionner sur notre service hébergé Elasticsearch, ECE, ou être autogéré. Ensuite, ajoutez l'intégration Elastic APM pour continuer à ingérer des données APM.",
+    "xpack.apm.settings.schema.migrate.dataStreams.title": "Elastic Agent",
     "xpack.apm.settings.schema.migrationInProgressPanelDescription": "Nous créons actuellement une instance de serveur Fleet pour contenir le nouveau serveur APM pendant la fermeture de l'ancienne instance du serveur APM. Dans quelques minutes, vous devriez voir vos données réintégrer l'application.",
-    "xpack.apm.settings.schema.migrationInProgressPanelTitle": "Basculement vers les flux de données…",
+    "xpack.apm.settings.schema.migrationInProgressPanelTitle": "En cours de transition vers Elastic Agent...",
     "xpack.apm.settings.schema.success.description": "Votre intégration APM est à présent configurée et prête à recevoir des données de vos agents actuellement instrumentés. N'hésitez pas à consulter les politiques appliquées à votre intégration.",
     "xpack.apm.settings.schema.success.returnText": "ou revenez simplement à l'{serviceInventoryLink}.",
     "xpack.apm.settings.schema.success.returnText.serviceInventoryLink": "Inventaire de service",
-    "xpack.apm.settings.schema.success.title": "Les flux de données ont été configurés avec succès !",
+    "xpack.apm.settings.schema.success.title": "Elastic Agent a été configuré avec succès !",
     "xpack.apm.settings.schema.success.viewIntegrationInFleet.buttonText": "Afficher l'intégration APM dans Fleet",
+    "xpack.apm.settings.schema.upgradeAvailable.title": "Mise à niveau de l'intégration APM disponible !",
+    "xpack.apm.settings.schema.upgradeAvailable.upgradePackagePolicyLink": "Mettre à niveau votre intégration APM",
     "xpack.apm.settings.title": "Paramètres",
     "xpack.apm.settings.unsupportedConfigs.errorToast.title": "Impossible de récupérer les paramètres du serveur APM",
+    "xpack.apm.settings.upgradeAvailable.description": "Même si votre intégration APM est configurée, une nouvelle version de l'intégration APM est disponible pour une mise à niveau avec votre stratégie de package. Consultez {upgradePackagePolicyLink} pour tirer le meilleur parti de votre configuration.",
     "xpack.apm.settingsLinkLabel": "Paramètres",
     "xpack.apm.setupInstructionsButtonLabel": "Instructions de configuration",
     "xpack.apm.stacktraceTab.causedByFramesToogleButtonLabel": "Provoqué par",
@@ -6312,7 +7906,7 @@
     "xpack.apm.toggleHeight.showLessButtonLabel": "Afficher moins de lignes",
     "xpack.apm.toggleHeight.showMoreButtonLabel": "Afficher plus de lignes",
     "xpack.apm.tracesTable.avgResponseTimeColumnLabel": "Latence (moy.)",
-    "xpack.apm.tracesTable.impactColumnDescription": "Points de terminaison les plus utilisés et les plus lents de votre service. C'est le résultat de la multiplication de la latence et du rendement",
+    "xpack.apm.tracesTable.impactColumnDescription": "Points de terminaison les plus utilisés et les plus lents de votre service. Calculé en multipliant la latence par le rendement.",
     "xpack.apm.tracesTable.impactColumnLabel": "Impact",
     "xpack.apm.tracesTable.nameColumnLabel": "Nom",
     "xpack.apm.tracesTable.notFoundLabel": "Aucune trace trouvée pour cette recherche",
@@ -6341,10 +7935,15 @@
     "xpack.apm.transactionActionMenu.trace.subtitle": "Afficher les logs de trace pour plus de détails.",
     "xpack.apm.transactionActionMenu.trace.title": "Détails de la trace",
     "xpack.apm.transactionActionMenu.viewInUptime": "Statut",
-    "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "Afficher l'exemple de document",
+    "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "Afficher la transaction dans Discover",
+    "xpack.apm.transactionBreakdown.chartHelp": "La durée moyenne de chaque type d'intervalle. \"app\" indique que quelque chose se passait au sein du service - cela peut signifier que le temps a été passé dans le code de l'application et non dans la base de données ou les requêtes externes, ou que l'auto-instrumentation de l'agent APM ne couvre pas le code exécuté.",
     "xpack.apm.transactionBreakdown.chartTitle": "Temps consacré par type d'intervalle",
     "xpack.apm.transactionDetails.clearSelectionAriaLabel": "Effacer la sélection",
+    "xpack.apm.transactionDetails.coldstartBadge": "démarrage à froid",
+    "xpack.apm.transactionDetails.distribution.failedTransactionsLatencyDistributionErrorTitle": "Une erreur s'est produite lors de la récupération de la distribution de la latence des transactions ayant échoué.",
+    "xpack.apm.transactionDetails.distribution.latencyDistributionErrorTitle": "Une erreur s'est produite lors de la récupération de la distribution de la latence globale.",
     "xpack.apm.transactionDetails.distribution.panelTitle": "Distribution de la latence",
+    "xpack.apm.transactionDetails.distribution.selectionText": "Selection : {formattedSelection}",
     "xpack.apm.transactionDetails.emptySelectionText": "Glisser et déposer pour sélectionner une plage",
     "xpack.apm.transactionDetails.errorCount": "{errorCount, number} {errorCount, plural, one {erreur} other {erreurs}}",
     "xpack.apm.transactionDetails.noTraceParentButtonTooltip": "Le parent de la trace n'a pas pu être trouvé",
@@ -6355,6 +7954,7 @@
     "xpack.apm.transactionDetails.servicesTitle": "Services",
     "xpack.apm.transactionDetails.spanFlyout.compositeExampleWarning": "Il s'agit d'un exemple de document pour un groupe d'intervalles similaires consécutifs",
     "xpack.apm.transactionDetails.spanFlyout.databaseStatementTitle": "Déclaration de la base de données",
+    "xpack.apm.transactionDetails.spanFlyout.dependencyLabel": "Dépendance",
     "xpack.apm.transactionDetails.spanFlyout.nameLabel": "Nom",
     "xpack.apm.transactionDetails.spanFlyout.spanAction": "Action",
     "xpack.apm.transactionDetails.spanFlyout.spanDetailsTitle": "Détails de l'intervalle",
@@ -6381,7 +7981,9 @@
     "xpack.apm.transactionDetails.viewingFullTraceButtonTooltip": "Affichage actuel de la trace complète",
     "xpack.apm.transactionDistribution.chart.allTransactionsLabel": "Toutes les transactions",
     "xpack.apm.transactionDistribution.chart.currentTransactionMarkerLabel": "Échantillon actuel",
-    "xpack.apm.transactionDistribution.chart.numberOfTransactionsLabel": "Nb de transactions",
+    "xpack.apm.transactionDistribution.chart.failedTransactionsLabel": "Transactions ayant échoué",
+    "xpack.apm.transactionDistribution.chart.latencyLabel": "Latence",
+    "xpack.apm.transactionDistribution.chart.numberOfTransactionsLabel": "Transactions",
     "xpack.apm.transactionDistribution.chart.percentileMarkerLabel": "{markerPercentile}e centile",
     "xpack.apm.transactionDurationAlert.aggregationType.95th": "95e centile",
     "xpack.apm.transactionDurationAlert.aggregationType.99th": "99e centile",
@@ -6397,6 +7999,13 @@
     "xpack.apm.transactions.latency.chart.95thPercentileLabel": "95e centile",
     "xpack.apm.transactions.latency.chart.99thPercentileLabel": "99e centile",
     "xpack.apm.transactions.latency.chart.averageLabel": "Moyenne",
+    "xpack.apm.transactionsTable.cardinalityWarning.body": "Le nombre de noms de transactions uniques dépasse la valeur configurée de {bucketSize}. Essayez de reconfigurer vos agents de façon à regrouper les transactions similaires ou augmentez la valeur de {codeBlock}",
+    "xpack.apm.transactionsTable.cardinalityWarning.docsLink": "En savoir plus dans la documentation",
+    "xpack.apm.transactionsTable.cardinalityWarning.title": "Cette vue présente un sous-ensemble de transactions signalées.",
+    "xpack.apm.transactionsTable.errorMessage": "Impossible de récupérer",
+    "xpack.apm.transactionsTable.linkText": "Afficher les transactions",
+    "xpack.apm.transactionsTable.title": "Transactions",
+    "xpack.apm.transactionTypesSelectPlaceholder": "Sélectionner le type de transaction",
     "xpack.apm.tutorial.agent_config.choosePolicy.helper": "Ajoute la configuration de la politique sélectionnée à l'extrait ci-dessous.",
     "xpack.apm.tutorial.agent_config.choosePolicyLabel": "Choix de la politique",
     "xpack.apm.tutorial.agent_config.defaultStandaloneConfig": "Configuration autonome par défaut",
@@ -6412,9 +8021,10 @@
     "xpack.apm.tutorial.apmServer.callOut.message": "Assurez-vous de mettre à jour votre serveur APM vers la version 7.0 ou supérieure.             Vous pouvez également migrer vos données 6.x à l'aide de l'assistant de migration disponible dans la section de gestion de Kibana.",
     "xpack.apm.tutorial.apmServer.callOut.title": "Important : mise à niveau vers la version 7.0 ou supérieure",
     "xpack.apm.tutorial.apmServer.fleet.apmIntegration.button": "Intégration APM",
+    "xpack.apm.tutorial.apmServer.fleet.apmIntegration.description": "Fleet vous permet de gérer de manière centralisée les agents Elastic qui exécutent l'intégration APM. L'option par défaut consiste à installer un serveur Fleet sur un hôte dédié. Pour les configurations sans hôte dédié, nous vous recommandons de suivre les instructions pour installer le serveur APM autonome pour votre système d'exploitation en sélectionnant l'onglet correspondant ci-dessus.",
     "xpack.apm.tutorial.apmServer.fleet.manageApmIntegration.button": "Gérer l'intégration APM dans Fleet",
-    "xpack.apm.tutorial.apmServer.fleet.message": "L'intégration d'APM installe les modèles Elasticsearch et les pipelines de nœuds d'ingestion pour les données APM.",
-    "xpack.apm.tutorial.apmServer.fleet.title": "Elastic APM (version bêta) est maintenant disponible dans Fleet !",
+    "xpack.apm.tutorial.apmServer.fleet.message": "L'intégration d'APM installe les modèles Elasticsearch et les pipelines d'ingestion pour les données APM.",
+    "xpack.apm.tutorial.apmServer.fleet.title": "Elastic APM est maintenant disponible dans Fleet !",
     "xpack.apm.tutorial.apmServer.statusCheck.btnLabel": "Vérifier le statut du serveur APM",
     "xpack.apm.tutorial.apmServer.statusCheck.errorMessage": "Aucun serveur APM détecté. Vérifiez qu'il est en cours d'exécution et que vous avez effectué la mise à jour vers la version 7.0 ou supérieure.",
     "xpack.apm.tutorial.apmServer.statusCheck.successMessage": "Vous avez correctement configuré le serveur APM",
@@ -6445,7 +8055,7 @@
     "xpack.apm.tutorial.downloadServerTitle": "Vous cherchez les packages 32 bits ? Consultez la [Download page]({downloadPageLink}).",
     "xpack.apm.tutorial.editConfig.textPre": "Si vous utilisez une version sécurisée X-Pack d'Elastic Stack, vous devez spécifier les informations d'identification dans le fichier de configuration \"apm-server.yml\".",
     "xpack.apm.tutorial.editConfig.title": "Modifier la configuration",
-    "xpack.apm.tutorial.elasticCloud.textPre": "Pour activer le serveur APM, accédez à [the Elastic Cloud console](https://cloud.elastic.co/deployments/{deploymentId}/edit) et activez APM dans les paramètres de déploiement. Une fois activé, actualisez la page.",
+    "xpack.apm.tutorial.elasticCloud.textPre": "Pour activer le serveur APM, accédez à [the Elastic Cloud console] (https://cloud.elastic.co/deployments/{deploymentId}/edit) et activez APM et Fleet dans la page de modification du déploiement en cliquant sur Ajouter une capacité, puis cliquez sur Enregistrer. Une fois activé, actualisez la page.",
     "xpack.apm.tutorial.elasticCloudInstructions.title": "Agents APM",
     "xpack.apm.tutorial.flaskClient.configure.commands.allowedCharactersComment": "a-z, A-Z, 0-9, -, _ et espace",
     "xpack.apm.tutorial.flaskClient.configure.commands.configureElasticApmComment": "ou configurer l'utilisation d'ELASTIC_APM dans les paramètres de votre application",
@@ -6459,6 +8069,7 @@
     "xpack.apm.tutorial.flaskClient.configure.title": "Configurer l'agent",
     "xpack.apm.tutorial.flaskClient.install.textPre": "Installez l'agent APM pour Python en tant que dépendance.",
     "xpack.apm.tutorial.flaskClient.install.title": "Installer l'agent APM",
+    "xpack.apm.tutorial.fleet.title": "Fleet",
     "xpack.apm.tutorial.goClient.configure.commands.initializeUsingEnvironmentVariablesComment": "Initialisez à l'aide des variables d'environnement :",
     "xpack.apm.tutorial.goClient.configure.commands.setCustomApmServerUrlComment": "Définir l'URL de serveur APM personnalisée (par défaut : {defaultApmServerUrl})",
     "xpack.apm.tutorial.goClient.configure.commands.setServiceEnvironment": "Définir l'environnement de service",
@@ -6473,13 +8084,13 @@
     "xpack.apm.tutorial.goClient.instrument.textPost": "Consultez la [documentation]({documentationLink}) pour obtenir un guide détaillé pour l'instrumentation du code source Go.",
     "xpack.apm.tutorial.goClient.instrument.textPre": "Pour instrumenter votre application Go, utilisez l'un des modules d'instrumentation proposés ou directement l'API de traçage.",
     "xpack.apm.tutorial.goClient.instrument.title": "Instrumenter votre application",
-    "xpack.apm.tutorial.introduction": "Collectez les indicateurs et les erreurs de performances approfondies depuis vos applications.",
+    "xpack.apm.tutorial.introduction": "Collectez les mesures de performance de vos applications avec Elastic APM.",
     "xpack.apm.tutorial.javaClient.download.textPre": "Téléchargez le fichier jar de l'agent depuis [Maven Central]({mavenCentralLink}). N'ajoutez **pas** l'agent comme dépendance de votre application.",
     "xpack.apm.tutorial.javaClient.download.title": "Télécharger l'agent APM",
     "xpack.apm.tutorial.javaClient.startApplication.textPost": "Consultez la [documentation]({documentationLink}) pour découvrir les options de configuration et l'utilisation avancée.",
     "xpack.apm.tutorial.javaClient.startApplication.textPre": "Ajoutez l'indicateur \"-javaagent\" et configurez l'agent avec les propriétés du système.\n\n * Définir le nom de service requis (caractères autorisés : a-z, A-Z, 0-9, -, _ et espace)\n * Définir l'URL personnalisée du serveur APM (par défaut : {customApmServerUrl})\n * Définir le token secret du serveur APM\n * Définir l'environnement de service\n * Définir le package de base de votre application",
     "xpack.apm.tutorial.javaClient.startApplication.title": "Lancer votre application avec l'indicateur javaagent",
-    "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.textPre": "Le serveur APM désactive la prise en charge du RUM par défaut. Consultez la [documentation]({documentationLink}) pour obtenir des détails sur l'activation de la prise en charge du RUM.",
+    "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.textPre": "Le serveur APM désactive la prise en charge du RUM par défaut. Consultez la [documentation]({documentationLink}) pour obtenir des détails sur l'activation de la prise en charge du RUM. Lorsque vous utilisez l'intégration APM avec Fleet, le support RUM est automatiquement activé.",
     "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.title": "Activer la prise en charge du Real User Monitoring (monitoring des utilisateurs réels) dans le serveur APM",
     "xpack.apm.tutorial.jsClient.installDependency.commands.setCustomApmServerUrlComment": "Définir l'URL de serveur APM personnalisée (par défaut : {defaultApmServerUrl})",
     "xpack.apm.tutorial.jsClient.installDependency.commands.setRequiredServiceNameComment": "Définir le nom de service requis (caractères autorisés : a-z, A-Z, 0-9, -, _ et espace)",
@@ -6488,7 +8099,7 @@
     "xpack.apm.tutorial.jsClient.installDependency.textPost": "Les intégrations de framework, tel que React ou Angular, ont des dépendances personnalisées. Consultez la [integration documentation]({docLink}) pour plus d'informations.",
     "xpack.apm.tutorial.jsClient.installDependency.textPre": "Vous pouvez installer l'Agent comme dépendance de votre application avec \"npm install @elastic/apm-rum --save\".\n\nVous pouvez ensuite initialiser l'agent et le configurer dans votre application de cette façon :",
     "xpack.apm.tutorial.jsClient.installDependency.title": "Configurer l'agent comme dépendance",
-    "xpack.apm.tutorial.jsClient.scriptTags.textPre": "Vous pouvez également utiliser les balises Script pour configurer l'agent. Ajoutez un indicateur \"<script>\" à la page HTML et utilisez l’objet global \"elasticApm\" pour charger et initialiser l’agent. N'oubliez pas de télécharger la dernière version de l'agent RUM depuis [GitHub]({GitHubLink}) ou [UNPKG]({UnpkgLink}) et d’héberger le fichier sur votre serveur/réseau de diffusion de contenu avant le déploiement en production.",
+    "xpack.apm.tutorial.jsClient.scriptTags.textPre": "Vous pouvez également utiliser les balises Script pour configurer l'agent. Ajoutez un indicateur \"<script>` tag to the HTML page and use the `elasticApm` global object to load and initialize the agent. Don't forget to download the latest version of the RUM Agent from [GitHub]({GitHubLink}) or [UNPKG]({UnpkgLink}), and host the file on your Server/CDN before deploying to production.",
     "xpack.apm.tutorial.jsClient.scriptTags.title": "Configurer l'agent avec les balises Script",
     "xpack.apm.tutorial.nodeClient.configure.commands.addThisToTheFileTopComment": "Ajouter ceci TOUT EN HAUT du premier fichier chargé dans votre application",
     "xpack.apm.tutorial.nodeClient.configure.commands.allowedCharactersComment": "Caractères autorisés : a-z, A-Z, 0-9, -, _ et espace",
@@ -6532,31 +8143,39 @@
     "xpack.apm.tutorial.specProvider.artifacts.dashboards.linkLabel": "Tableau de bord APM",
     "xpack.apm.tutorial.specProvider.longDescription": "Le monitoring des performances applicatives (APM) collecte les indicateurs et les erreurs de performance approfondies depuis votre application. Cela vous permet de monitorer les performances de milliers d'applications en temps réel. [Learn more]({learnMoreLink}).",
     "xpack.apm.tutorial.specProvider.name": "APM",
-    "xpack.apm.tutorial.specProvider.savedObjectsInstallMsg": "Un modèle d'indexation APM est requis pour certaines fonctionnalités de l'interface utilisateur APM.",
+    "xpack.apm.tutorial.specProvider.savedObjectsInstallMsg": "Une vue de données APM est requise pour certaines fonctionnalités de l'interface utilisateur APM.",
     "xpack.apm.tutorial.startServer.textPre": "Le serveur traite et conserve les indicateurs de performances de l'application dans Elasticsearch.",
     "xpack.apm.tutorial.startServer.title": "Lancer le serveur APM",
     "xpack.apm.tutorial.windowsServerInstructions.textPost": "Remarque : si l'exécution du script est désactivée dans votre système, vous devez définir la politique d'exécution de la session en cours de sorte que l'exécution du script soit autorisée. Par exemple : {command}.",
     "xpack.apm.tutorial.windowsServerInstructions.textPre": "1. Téléchargez le fichier zip APM Server Windows depuis [Download page]({downloadPageLink}).\n2. Extrayez le contenu du fichier zip dans {zipFileExtractFolder}.\n3. Renommez le répertoire {apmServerDirectory} en \"APM-Server\".\n4. Ouvrez une invite PowerShell en tant qu'administrateur (faites un clic droit sur l'icône PowerShell et sélectionnez **Exécuter en tant qu'administrateur**). Si vous exécutez Windows XP, vous devrez peut-être télécharger et installer PowerShell.\n5. Dans l'invite PowerShell, exécutez les commandes suivantes pour installer le serveur APM en tant que service Windows :",
     "xpack.apm.unitLabel": "Sélectionner l'unité",
     "xpack.apm.unsavedChanges": "{unsavedChangesCount, plural, =0{0 modification non enregistrée} one {1 modification non enregistrée} other {# modifications non enregistrées}} ",
+    "xpack.apm.ux.overview.agent.description": "Utiliser les agents APM pour collecter les données APM. Nous vous facilitons la tâche avec les agents pour de nombreuses langues courantes.",
     "xpack.apm.views.dependencies.title": "Dépendances",
+    "xpack.apm.views.dependenciesInventory.title": "Dépendances",
     "xpack.apm.views.errors.title": "Erreurs",
+    "xpack.apm.views.infra.title": "Infrastructure",
     "xpack.apm.views.listSettings.title": "Paramètres",
     "xpack.apm.views.logs.title": "Logs",
     "xpack.apm.views.metrics.title": "Indicateurs",
     "xpack.apm.views.nodes.title": "JVM",
     "xpack.apm.views.overview.title": "Aperçu",
+    "xpack.apm.views.serviceGroups.breadcrumbLabel": "Services",
+    "xpack.apm.views.serviceGroups.title": "Groupes de services",
     "xpack.apm.views.serviceInventory.title": "Services",
     "xpack.apm.views.serviceMap.title": "Carte des services",
     "xpack.apm.views.serviceProfiling.title": "Profilage",
     "xpack.apm.views.settings.agentConfiguration.title": "Configuration de l'agent",
+    "xpack.apm.views.settings.agentKeys.title": "Clés d'agent",
     "xpack.apm.views.settings.anomalyDetection.title": "Détection des anomalies",
     "xpack.apm.views.settings.createAgentConfiguration.title": "Créer une configuration d'agent",
+    "xpack.apm.views.settings.customLink.title": "Liens personnalisés",
     "xpack.apm.views.settings.editAgentConfiguration.title": "Modifier la configuration d'agent",
     "xpack.apm.views.settings.indices.title": "Index",
     "xpack.apm.views.settings.schema.title": "Schéma",
     "xpack.apm.views.traceOverview.title": "Traces",
     "xpack.apm.views.transactions.title": "Transactions",
+    "xpack.apm.waterfall.errorCount": "{errorCount, plural, one {Afficher l'erreur liée} other {Afficher # erreurs liées}}",
     "xpack.apm.waterfall.exceedsMax": "Le nombre d'éléments dans cette trace dépasse ce qui est affiché",
     "xpack.banners.settings.backgroundColor.description": "Définissez la couleur d'arrière-plan de la bannière. {subscriptionLink}",
     "xpack.banners.settings.backgroundColor.title": "Couleur d'arrière-plan de la bannière",
@@ -6639,6 +8258,8 @@
     "xpack.canvas.elements.dropdownFilterHelpText": "Liste déroulante dans laquelle vous pouvez sélectionner des valeurs pour un filtre \"exactly\"",
     "xpack.canvas.elements.filterDebugDisplayName": "Filtres de débogage",
     "xpack.canvas.elements.filterDebugHelpText": "Affiche les filtres globaux sous-jacents d'un workpad",
+    "xpack.canvas.elements.heatmapDisplayName": "Carte thermique",
+    "xpack.canvas.elements.heatmapHelpText": "Visualisation de la carte thermique",
     "xpack.canvas.elements.horizontalBarChartDisplayName": "Barre horizontale",
     "xpack.canvas.elements.horizontalBarChartHelpText": "Graphique à barres horizontal personnalisable",
     "xpack.canvas.elements.horizontalProgressBarDisplayName": "Barre horizontale",
@@ -6653,6 +8274,8 @@
     "xpack.canvas.elements.markdownHelpText": "Ajouter du texte à l'aide de Markdown",
     "xpack.canvas.elements.metricDisplayName": "Indicateur",
     "xpack.canvas.elements.metricHelpText": "Nombre avec une étiquette",
+    "xpack.canvas.elements.metricVisDisplayName": "(Nouveau) Vis. de l'indicateur",
+    "xpack.canvas.elements.metricVisHelpText": "Visualisation de l'indicateur",
     "xpack.canvas.elements.pieDisplayName": "Camembert",
     "xpack.canvas.elements.pieHelpText": "Diagramme en camembert",
     "xpack.canvas.elements.plotDisplayName": "Tracé des coordonnées",
@@ -6671,7 +8294,9 @@
     "xpack.canvas.elements.shapeHelpText": "Forme personnalisable",
     "xpack.canvas.elements.tableDisplayName": "Tableau de données",
     "xpack.canvas.elements.tableHelpText": "Grille déroulante pour l'affichage des données sous forme de tableau",
-    "xpack.canvas.elements.timeFilterDisplayName": "Filtre de temps",
+    "xpack.canvas.elements.tagCloudDisplayName": "Nuage de balises",
+    "xpack.canvas.elements.tagCloudHelpText": "Visualisation du nuage de balises",
+    "xpack.canvas.elements.timeFilterDisplayName": "Filtre temporel",
     "xpack.canvas.elements.timeFilterHelpText": "Définir une fenêtre temporelle",
     "xpack.canvas.elements.verticalBarChartDisplayName": "Barre verticale",
     "xpack.canvas.elements.verticalBarChartHelpText": "Graphique à barres vertical personnalisable",
@@ -6681,8 +8306,9 @@
     "xpack.canvas.elements.verticalProgressPillHelpText": "Affiche la progression sous forme de portion d'une pilule verticale",
     "xpack.canvas.elementSettings.dataTabLabel": "Données",
     "xpack.canvas.elementSettings.displayTabLabel": "Affichage",
+    "xpack.canvas.elementSettings.filtersTabLabel": "Filtres",
     "xpack.canvas.embedObject.noMatchingObjectsMessage": "Aucun objet correspondant trouvé.",
-    "xpack.canvas.embedObject.titleText": "Ajouter depuis Kibana",
+    "xpack.canvas.embedObject.titleText": "Ajouter depuis la bibliothèque",
     "xpack.canvas.error.actionsElements.invaludArgIndexErrorMessage": "Index d'argument non valide : {index}",
     "xpack.canvas.error.downloadWorkpad.downloadFailureErrorMessage": "Impossible de télécharger le workpad",
     "xpack.canvas.error.downloadWorkpad.downloadRenderedWorkpadFailureErrorMessage": "Impossible de télécharger le workpad rendu",
@@ -6696,11 +8322,13 @@
     "xpack.canvas.error.esService.indicesFetchErrorMessage": "Impossible de récupérer les index Elasticsearch",
     "xpack.canvas.error.RenderWithFn.renderErrorMessage": "La génération du rendu de \"{functionName}\" a échoué",
     "xpack.canvas.error.useCloneWorkpad.cloneFailureErrorMessage": "Impossible de cloner le workpad",
+    "xpack.canvas.error.useCreateWorkpad.createFailureErrorMessage": "Impossible de créer le workpad",
     "xpack.canvas.error.useDeleteWorkpads.deleteFailureErrorMessage": "Impossible de supprimer tous les workpads",
     "xpack.canvas.error.useFindWorkpads.findFailureErrorMessage": "Impossible de trouver le workpad",
     "xpack.canvas.error.useImportWorkpad.acceptJSONOnlyErrorMessage": "Seuls les fichiers {JSON} sont acceptés",
     "xpack.canvas.error.useImportWorkpad.fileUploadFailureWithoutFileNameErrorMessage": "Impossible de charger le fichier",
     "xpack.canvas.error.useImportWorkpad.missingPropertiesErrorMessage": "Certaines propriétés requises pour un workpad {CANVAS} sont manquantes.  Modifiez votre fichier {JSON} pour y inclure les valeurs de propriétés correctes et réessayez.",
+    "xpack.canvas.error.useUploadWorkpad.uploadFailureErrorMessage": "Impossible de charger le workpad",
     "xpack.canvas.error.workpadDropzone.tooManyFilesErrorMessage": "Un seul fichier peut être chargé à la fois",
     "xpack.canvas.error.workpadRoutes.createFailureErrorMessage": "Impossible de créer le workpad",
     "xpack.canvas.error.workpadRoutes.loadFailureErrorMessage": "Impossible de charger le workpad avec l'ID",
@@ -6747,6 +8375,8 @@
     "xpack.canvas.featureCatalogue.canvasSubtitle": "Concevez des présentations irréprochables.",
     "xpack.canvas.features.reporting.pdf": "Générer des rapports PDF",
     "xpack.canvas.features.reporting.pdfFeatureName": "Reporting",
+    "xpack.canvas.formatMsg.toaster.errorStatusMessage": "Erreur {errStatus} {errStatusText} : {errMessage}.",
+    "xpack.canvas.formatMsg.toaster.unavailableServerErrorMessage": "Échec de connexion d'une requête HTTP. Vérifiez que le serveur Kibana est en cours d'exécution et que votre navigateur dispose d'une connexion opérationnelle, ou contactez votre administrateur système.",
     "xpack.canvas.functionForm.contextError": "ERREUR : {errorMessage}",
     "xpack.canvas.functionForm.functionUnknown.unknownArgumentTypeError": "Type d'expression inconnu \"{expressionType}\"",
     "xpack.canvas.functions.all.args.conditionHelpText": "Conditions à vérifier.",
@@ -6756,6 +8386,7 @@
     "xpack.canvas.functions.alterColumn.args.typeHelpText": "Type choisi pour convertir la colonne. Laissez-le vide pour ne pas changer le type.",
     "xpack.canvas.functions.alterColumn.cannotConvertTypeErrorMessage": "Impossible de convertir en \"{type}\"",
     "xpack.canvas.functions.alterColumn.columnNotFoundErrorMessage": "Colonne introuvable : \"{column}\"",
+    "xpack.canvas.functions.alterColumnHelpText": "Convertit entre les principaux types, y compris {list} et {end}, et renomme les colonnes. Consultez aussi {mapColumnFn}, {mathColumnFn} et {staticColumnFn}.",
     "xpack.canvas.functions.any.args.conditionHelpText": "Conditions à vérifier.",
     "xpack.canvas.functions.anyHelpText": "Renvoie {BOOLEAN_TRUE} si au moins une des conditions est remplie. Consultez aussi {all_fn}.",
     "xpack.canvas.functions.as.args.nameHelpText": "Nom à donner à la colonne.",
@@ -6815,14 +8446,17 @@
     "xpack.canvas.functions.dropdownControl.args.labelColumnHelpText": "Colonne ou champ à utiliser comme étiquette dans la commande déroulante",
     "xpack.canvas.functions.dropdownControl.args.valueColumnHelpText": "Colonne ou champ depuis laquelle/lequel extraire les valeurs uniques pour la commande déroulante.",
     "xpack.canvas.functions.dropdownControlHelpText": "Configure un élément de commande de filtre déroulant.",
+    "xpack.canvas.functions.embeddable.args.idHelpText": "L'objet d'entrée incorporable codé en base64",
+    "xpack.canvas.functions.embeddable.args.typeHelpText": "Le type incorporable",
+    "xpack.canvas.functions.embeddableHelpText": "Retourne un objet incorporable avec la configuration fournie",
     "xpack.canvas.functions.eq.args.valueHelpText": "Valeur comparée au {CONTEXT}.",
     "xpack.canvas.functions.eqHelpText": "La valeur de renvoi indique si le {CONTEXT} est égal à l'argument.",
-    "xpack.canvas.functions.escount.args.indexHelpText": "Index ou modèle d'indexation. Par exemple, {example}.",
+    "xpack.canvas.functions.escount.args.indexHelpText": "Un index ou une vue de données. Par exemple, {example}.",
     "xpack.canvas.functions.escount.args.queryHelpText": "Chaîne de requête {LUCENE}.",
     "xpack.canvas.functions.escountHelpText": "Interrogez {ELASTICSEARCH} pour rechercher le nombre de correspondances de la requête spécifiée.",
     "xpack.canvas.functions.esdocs.args.countHelpText": "Nombre de documents à récupérer. Pour de meilleures performances, utilisez un ensemble de données plus petit.",
     "xpack.canvas.functions.esdocs.args.fieldsHelpText": "Liste de champs séparés par des virgules. Pour de meilleures performances, utilisez moins de champs.",
-    "xpack.canvas.functions.esdocs.args.indexHelpText": "Index ou modèle d'indexation. Par exemple, {example}.",
+    "xpack.canvas.functions.esdocs.args.indexHelpText": "Un index ou une vue de données. Par exemple, {example}.",
     "xpack.canvas.functions.esdocs.args.metaFieldsHelpText": "Liste de champs méta séparés par des virgules. Par exemple, {example}.",
     "xpack.canvas.functions.esdocs.args.queryHelpText": "Chaîne de requête {LUCENE}.",
     "xpack.canvas.functions.esdocs.args.sortHelpText": "Sens de tri au format {directions}. Par exemple, {example1} ou {example2}.",
@@ -6954,6 +8588,7 @@
     "xpack.canvas.functions.sortHelpText": "Trie un {DATATABLE} en fonction de la colonne spécifiée.",
     "xpack.canvas.functions.staticColumn.args.nameHelpText": "Nom de la nouvelle colonne.",
     "xpack.canvas.functions.staticColumn.args.valueHelpText": "Valeur à insérer dans chaque ligne dans la nouvelle colonne. CONSEIL : utilisez une sous-expression pour cumuler les autres colonnes en une valeur statique.",
+    "xpack.canvas.functions.staticColumnHelpText": "Ajoute une colonne avec la même valeur statique à chaque ligne. Consultez aussi {alterColumnFn}, {mapColumnFn} et {mathColumnFn}",
     "xpack.canvas.functions.string.args.valueHelpText": "Valeurs à rassembler dans une seule chaîne. Ajoutez des espaces le cas échéant.",
     "xpack.canvas.functions.stringHelpText": "Concatène tous les arguments en une seule chaîne.",
     "xpack.canvas.functions.switch.args.caseHelpText": "Conditions à vérifier.",
@@ -6980,6 +8615,7 @@
     "xpack.canvas.functions.timelion.args.query": "Requête Timelion",
     "xpack.canvas.functions.timelion.args.timezone": "Fuseau horaire de la plage temporelle. Consultez {MOMENTJS_TIMEZONE_URL}.",
     "xpack.canvas.functions.timelion.args.to": "Chaîne {ELASTICSEARCH} {DATEMATH} pour la fin de la plage temporelle.",
+    "xpack.canvas.functions.timelion.executionError": "Il y a eu une erreur dans l'exécution de la requête Timelion.  Vérifiez votre syntaxe et réessayez.",
     "xpack.canvas.functions.timelionHelpText": "Utilise Timelion pour extraire une ou plusieurs séries temporelles à partir de plusieurs sources.",
     "xpack.canvas.functions.timerange.args.fromHelpText": "Début de la plage temporelle",
     "xpack.canvas.functions.timerange.args.toHelpText": "Fin de la plage temporelle",
@@ -6990,6 +8626,9 @@
     "xpack.canvas.functions.urlparam.args.defaultHelpText": "Chaîne renvoyée lorsque le paramètre {URL} n'est pas spécifié.",
     "xpack.canvas.functions.urlparam.args.paramHelpText": "Paramètre de hachage de {URL} à récupérer.",
     "xpack.canvas.functions.urlparamHelpText": "Récupère un paramètre {URL} à utiliser dans une expression. La fonction {urlparamFn} renvoie toujours une {TYPE_STRING}. Par exemple, vous pouvez récupérer la valeur {value} à partir du paramètre {myVar} de {URL} {example}.",
+    "xpack.canvas.globalConfig.filter": "Filtre",
+    "xpack.canvas.globalConfig.general": "Général",
+    "xpack.canvas.globalConfig.title": "Paramètres du workpad",
     "xpack.canvas.groupSettings.multipleElementsActionsDescription": "Désélectionnez ces éléments pour modifier leurs paramètres individuels, appuyez sur ({gKey}) pour les regrouper, ou enregistrez cette sélection comme nouvel élément, pour le réutiliser dans votre workpad.",
     "xpack.canvas.groupSettings.multipleElementsDescription": "Plusieurs éléments sont actuellement sélectionnés.",
     "xpack.canvas.groupSettings.saveGroupDescription": "Enregistrez ce groupe comme nouvel élément pour le réutiliser dans votre workpad.",
@@ -7046,7 +8685,7 @@
     "xpack.canvas.keyboardShortcutsDoc.flyout.closeButtonAriaLabel": "Ferme la référence des raccourcis clavier",
     "xpack.canvas.keyboardShortcutsDoc.flyoutHeaderTitle": "Raccourcis clavier",
     "xpack.canvas.keyboardShortcutsDoc.shortcutListSeparator": "ou",
-    "xpack.canvas.labs.enableLabsDescription": "Cet indicateur détermine si l'utilisateur a accès au bouton Ateliers, moyen rapide d'activer et de désactiver les fonctionnalités expérimentales dans Canvas.",
+    "xpack.canvas.labs.enableLabsDescription": "Cet indicateur détermine si l'utilisateur a accès au bouton Ateliers, moyen rapide d'activer et de désactiver les fonctionnalités de la version d'évaluation technique dans Canvas.",
     "xpack.canvas.labs.enableUI": "Activer le bouton Ateliers dans Canvas",
     "xpack.canvas.lib.palettes.canvasLabel": "{CANVAS}",
     "xpack.canvas.lib.palettes.colorBlindLabel": "Daltonien",
@@ -7144,6 +8783,10 @@
     "xpack.canvas.sidebarHeader.bringToFrontArialLabel": "Déplacer l'élément jusqu'au premier calque en haut",
     "xpack.canvas.sidebarHeader.sendBackwardArialLabel": "Déplacer l'élément d'un calque vers le bas",
     "xpack.canvas.sidebarHeader.sendToBackArialLabel": "Déplacer l'élément jusqu'au dernier calque en bas",
+    "xpack.canvas.solutionToolbar.editorMenuButtonLabel": "Sélectionner un type",
+    "xpack.canvas.stopsColorPicker.deleteColorStopLabel": "Supprimer",
+    "xpack.canvas.stopsPalettePicker.addColorStopLabel": "Ajouter un arrêt de couleur",
+    "xpack.canvas.stopsPalettePicker.colorStopsLabel": "Arrêts de couleur",
     "xpack.canvas.tags.presentationTag": "présentation",
     "xpack.canvas.tags.reportTag": "rapport",
     "xpack.canvas.templates.darkHelp": "Série de présentations à thème de couleurs sombres",
@@ -7186,6 +8829,8 @@
     "xpack.canvas.uis.arguments.axisConfigDisabledText": "Activer pour afficher les paramètres de l'axe",
     "xpack.canvas.uis.arguments.axisConfigLabel": "Configuration de l'axe de visualisation",
     "xpack.canvas.uis.arguments.axisConfigTitle": "Configuration de l'axe",
+    "xpack.canvas.uis.arguments.colorLabel": "Sélecteur de couleur",
+    "xpack.canvas.uis.arguments.colorTitle": "Couleur",
     "xpack.canvas.uis.arguments.customPaletteLabel": "Personnalisé",
     "xpack.canvas.uis.arguments.dataColumn.options.averageDropDown": "Moyenne",
     "xpack.canvas.uis.arguments.dataColumn.options.countDropDown": "Compte",
@@ -7234,12 +8879,17 @@
     "xpack.canvas.uis.arguments.selectTitle": "Sélectionner",
     "xpack.canvas.uis.arguments.shapeLabel": "Modifier la forme de l'élément actuel",
     "xpack.canvas.uis.arguments.shapeTitle": "Forme",
+    "xpack.canvas.uis.arguments.stopsPaletteLabel": "Fournit des couleurs pour les valeurs, basées sur les limites",
+    "xpack.canvas.uis.arguments.stopsPaletteTitle": "Sélecteur de palette avec limites",
     "xpack.canvas.uis.arguments.stringLabel": "Saisir des chaînes courtes",
     "xpack.canvas.uis.arguments.stringTitle": "Chaîne",
     "xpack.canvas.uis.arguments.textareaLabel": "Saisir des chaînes longues",
     "xpack.canvas.uis.arguments.textareaTitle": "Zone de texte",
     "xpack.canvas.uis.arguments.toggleLabel": "Bouton bascule vrai/faux",
     "xpack.canvas.uis.arguments.toggleTitle": "Bascule",
+    "xpack.canvas.uis.arguments.visDimensionDefaultOptionName": "Sélectionner la colonne",
+    "xpack.canvas.uis.arguments.visDimensionLabel": "Génère un objet dimension visConfig",
+    "xpack.canvas.uis.arguments.visDimensionTitle": "Colonne",
     "xpack.canvas.uis.dataSources.demoData.headingTitle": "Cet élément utilise des données de démonstration",
     "xpack.canvas.uis.dataSources.demoDataDescription": "Par défaut, tout élément {canvas} est connecté à la source de données de démonstration. Modifiez la source de données ci-dessus pour connecter vos propres données.",
     "xpack.canvas.uis.dataSources.demoDataLabel": "Exemple d'ensemble de données utilisé pour remplir les éléments par défaut",
@@ -7249,7 +8899,7 @@
     "xpack.canvas.uis.dataSources.esdocs.fieldsLabel": "Les champs scriptés ne sont pas disponibles",
     "xpack.canvas.uis.dataSources.esdocs.fieldsTitle": "Champs",
     "xpack.canvas.uis.dataSources.esdocs.fieldsWarningLabel": "Cette source de données fonctionne mieux avec 10 champs ou moins",
-    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "Entrer un nom d'index ou sélectionner un modèle d'indexation",
+    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "Entrer un nom d'index ou sélectionner une vue de données",
     "xpack.canvas.uis.dataSources.esdocs.indexTitle": "Index",
     "xpack.canvas.uis.dataSources.esdocs.queryLabel": "syntaxe de chaîne de requête {lucene}",
     "xpack.canvas.uis.dataSources.esdocs.queryTitle": "Requête",
@@ -7274,6 +8924,34 @@
     "xpack.canvas.uis.dataSources.timelion.tips.time": "{timelion} requiert une plage temporelle. Ajoutez un élément de filtre de temps à votre page ou utilisez l'éditeur d'expression pour en transmettre un.",
     "xpack.canvas.uis.dataSources.timelion.tipsTitle": "Conseils d'utilisation de {timelion} dans {canvas}",
     "xpack.canvas.uis.dataSources.timelionLabel": "Utiliser la syntaxe de {timelion} pour récupérer des données temporelles",
+    "xpack.canvas.uis.models.heatmap_grid.args.isCellLabelVisibleLabel": "Spécifie si l'étiquette de cellule est visible ou non",
+    "xpack.canvas.uis.models.heatmap_grid.args.isCellLabelVisibleTitle": "Afficher l'étiquette de cellule",
+    "xpack.canvas.uis.models.heatmap_grid.args.isXAxisLabelVisibleLabel": "Spécifie si les étiquettes de l'axe X sont visibles ou non",
+    "xpack.canvas.uis.models.heatmap_grid.args.isXAxisLabelVisibleTile": "Afficher les étiquettes de l'axe X",
+    "xpack.canvas.uis.models.heatmap_grid.args.isXAxisTitleVisibleLabel": "Spécifie si le titre de l'axe X est visible ou non",
+    "xpack.canvas.uis.models.heatmap_grid.args.isXAxisTitleVisibleTile": "Afficher le titre de l'axe X",
+    "xpack.canvas.uis.models.heatmap_grid.args.isYAxisLabelVisibleLabel": "Spécifie si les étiquettes de l'axe Y sont visibles ou non",
+    "xpack.canvas.uis.models.heatmap_grid.args.isYAxisLabelVisibleTile": "Afficher les étiquettes de l'axe Y",
+    "xpack.canvas.uis.models.heatmap_grid.args.isYAxisTitleVisibleLabel": "Spécifie si le titre de l'axe Y est visible ou non",
+    "xpack.canvas.uis.models.heatmap_grid.args.isYAxisTitleVisibleTile": "Afficher le titre de l'axe Y",
+    "xpack.canvas.uis.models.heatmap_grid.args.strokeColorLabel": "Spécifie la couleur de trait de la grille",
+    "xpack.canvas.uis.models.heatmap_grid.args.strokeColorTitle": "Couleur de trait",
+    "xpack.canvas.uis.models.heatmap_grid.args.strokeWidthLabel": "Spécifie la largeur de trait de la grille",
+    "xpack.canvas.uis.models.heatmap_grid.args.strokeWidthTitle": "Largeur de trait",
+    "xpack.canvas.uis.models.heatmap_grid.title": "Configurez la disposition de la carte thermique",
+    "xpack.canvas.uis.models.heatmap_legend.args.isVisibleLabel": "Spécifie si la légende est visible ou non",
+    "xpack.canvas.uis.models.heatmap_legend.args.isVisibleTitle": "Afficher la légende",
+    "xpack.canvas.uis.models.heatmap_legend.args.maxLinesLabel": "Spécifie le nombre de lignes par élément de légende.",
+    "xpack.canvas.uis.models.heatmap_legend.args.maxLinesTitle": "Nombre maximal de lignes pour la légende",
+    "xpack.canvas.uis.models.heatmap_legend.args.positionBottomLabel": "Bas",
+    "xpack.canvas.uis.models.heatmap_legend.args.positionLabel": "Spécifie la position de la légende.",
+    "xpack.canvas.uis.models.heatmap_legend.args.positionLeftLabel": "Gauche",
+    "xpack.canvas.uis.models.heatmap_legend.args.positionRightLabel": "Droite",
+    "xpack.canvas.uis.models.heatmap_legend.args.positionTitle": "Position de la légende",
+    "xpack.canvas.uis.models.heatmap_legend.args.positionTopLabel": "Haut",
+    "xpack.canvas.uis.models.heatmap_legend.args.shouldTruncateLabel": "Spécifie si les éléments de légende doivent être tronqués ou non",
+    "xpack.canvas.uis.models.heatmap_legend.args.shouldTruncateTitle": "Tronquer l'étiquette",
+    "xpack.canvas.uis.models.heatmap_legend.title": "Configurer la légende du graphique de la carte thermique",
     "xpack.canvas.uis.models.math.args.valueLabel": "Fonction et colonne à utiliser pour extraire une valeur de la source de données",
     "xpack.canvas.uis.models.math.args.valueTitle": "Valeur",
     "xpack.canvas.uis.models.mathTitle": "Mesure",
@@ -7306,6 +8984,27 @@
     "xpack.canvas.uis.views.dropdownControlTitle": "Filtre de liste déroulante",
     "xpack.canvas.uis.views.getCellLabel": "Prélever la première ligne et la première colonne",
     "xpack.canvas.uis.views.getCellTitle": "Filtre de liste déroulante",
+    "xpack.canvas.uis.views.heatmap.args.gridConfigDisplayName": "Configuration de la disposition de la carte thermique",
+    "xpack.canvas.uis.views.heatmap.args.gridConfigHelp": "Configurer la disposition de la carte thermique",
+    "xpack.canvas.uis.views.heatmap.args.highlightInHoverDisplayName": "Mise en surbrillance du survol",
+    "xpack.canvas.uis.views.heatmap.args.highlightInHoverHelp": "Cette option permet de mettre en surbrillance les plages de la même couleur sur le survol de la légende",
+    "xpack.canvas.uis.views.heatmap.args.lastRangeIsRightOpenDisplayName": "La dernière plage est grande ouverte",
+    "xpack.canvas.uis.views.heatmap.args.lastRangeIsRightOpenHelp": "Si elle est définie comme vraie, la dernière valeur de la gamme sera grande ouverte",
+    "xpack.canvas.uis.views.heatmap.args.legendDisplayName": "Légende de la carte thermique",
+    "xpack.canvas.uis.views.heatmap.args.legendHelp": "Configurer la légende du graphique de la carte thermique",
+    "xpack.canvas.uis.views.heatmap.args.plitRowAccessorHelp": "L'identifiant de la ligne fractionnée ou de la dimension correspondante",
+    "xpack.canvas.uis.views.heatmap.args.showTooltipDisplayName": "Afficher l'infobulle",
+    "xpack.canvas.uis.views.heatmap.args.showTooltipHelp": "Afficher l'infobulle au survol",
+    "xpack.canvas.uis.views.heatmap.args.splitColumnAccessorDisplayName": "Colonne fractionnée",
+    "xpack.canvas.uis.views.heatmap.args.splitColumnAccessorHelp": "L'identifiant de la colonne fractionnée ou de la dimension correspondante",
+    "xpack.canvas.uis.views.heatmap.args.splitRowAccessorDisplayName": "Ligne fractionnée",
+    "xpack.canvas.uis.views.heatmap.args.valueAccessorDisplayName": "Valeur",
+    "xpack.canvas.uis.views.heatmap.args.valueAccessorHelp": "Le nom de la colonne de valeurs ou de la dimension correspondante",
+    "xpack.canvas.uis.views.heatmap.args.xAccessorDisplayName": "Axe X",
+    "xpack.canvas.uis.views.heatmap.args.xAccessorHelp": "Le nom de la colonne de l'axe x ou de la dimension correspondante",
+    "xpack.canvas.uis.views.heatmap.args.yAccessorDisplayName": "Axe Y",
+    "xpack.canvas.uis.views.heatmap.args.yAccessorHelp": "Le nom de la colonne de l'axe y ou de la dimension correspondante",
+    "xpack.canvas.uis.views.heatmapTitle": "Visualisation de la carte thermique",
     "xpack.canvas.uis.views.image.args.mode.containDropDown": "Contenir",
     "xpack.canvas.uis.views.image.args.mode.coverDropDown": "Couvrir",
     "xpack.canvas.uis.views.image.args.mode.stretchDropDown": "Étirer",
@@ -7324,7 +9023,23 @@
     "xpack.canvas.uis.views.metric.args.metricFontTitle": "Texte métrique",
     "xpack.canvas.uis.views.metric.args.metricFormatLabel": "Sélectionner un format pour la valeur métrique",
     "xpack.canvas.uis.views.metric.args.metricFormatTitle": "Format",
-    "xpack.canvas.uis.views.metricTitle": "Métrique",
+    "xpack.canvas.uis.views.metricTitle": "Indicateur",
+    "xpack.canvas.uis.views.metricVis.args.bucketDisplayName": "Compartiment",
+    "xpack.canvas.uis.views.metricVis.args.bucketHelp": "Configuration des dimensions de compartiment",
+    "xpack.canvas.uis.views.metricVis.args.colorMode.backgroundOption": "Arrière-plan",
+    "xpack.canvas.uis.views.metricVis.args.colorMode.labelsOption": "Étiquettes",
+    "xpack.canvas.uis.views.metricVis.args.colorMode.noneOption": "Aucun",
+    "xpack.canvas.uis.views.metricVis.args.colorModeDisplayName": "Mode de couleur de l'indicateur",
+    "xpack.canvas.uis.views.metricVis.args.colorModeHelp": "Quelle partie de l'indicateur à remplir de couleur.",
+    "xpack.canvas.uis.views.metricVis.args.fontDisplayName": "Police",
+    "xpack.canvas.uis.views.metricVis.args.fontHelp": "Configuration de la police d'indicateur",
+    "xpack.canvas.uis.views.metricVis.args.metricDisplayName": "Indicateur",
+    "xpack.canvas.uis.views.metricVis.args.metricHelp": "Configuration des dimensions d'indicateur",
+    "xpack.canvas.uis.views.metricVis.args.percentageModeDisplayName": "Activer le mode de pourcentage",
+    "xpack.canvas.uis.views.metricVis.args.percentageModeHelp": "Affiche l'indicateur en mode de pourcentage.",
+    "xpack.canvas.uis.views.metricVis.args.showLabelsDisplayName": "Afficher les étiquettes d'indicateur",
+    "xpack.canvas.uis.views.metricVis.args.showLabelsHelp": "Affiche les étiquettes sous les valeurs d’indicateur.",
+    "xpack.canvas.uis.views.metricVisTitle": "Vis. de l'indicateur",
     "xpack.canvas.uis.views.numberArgTitle": "Valeur",
     "xpack.canvas.uis.views.openLinksInNewTabHelpLabel": "Définir les liens de sorte qu'ils s'ouvrent dans un nouvel onglet",
     "xpack.canvas.uis.views.openLinksInNewTabLabel": "Ouvrir tous les liens dans un nouvel onglet",
@@ -7414,6 +9129,27 @@
     "xpack.canvas.uis.views.table.args.showHeaderToggleSwitch": "Afficher la ligne d'en-tête",
     "xpack.canvas.uis.views.tableLabel": "Définir le style pour un élément de tableau",
     "xpack.canvas.uis.views.tableTitle": "Style de tableau",
+    "xpack.canvas.uis.views.tagcloud.args.bucketDisplayName": "Compartiment",
+    "xpack.canvas.uis.views.tagcloud.args.bucketHelp": "Configuration des dimensions de compartiment",
+    "xpack.canvas.uis.views.tagcloud.args.maxFontHeightDisplayName": "Hauteur maximale de la police",
+    "xpack.canvas.uis.views.tagcloud.args.maxFontHeightHelp": "Hauteur maximale de la police de l'élément",
+    "xpack.canvas.uis.views.tagcloud.args.metricDisplayName": "Indicateur",
+    "xpack.canvas.uis.views.tagcloud.args.metricHelp": "Configuration des dimensions d'indicateur",
+    "xpack.canvas.uis.views.tagcloud.args.minFontHeightDisplayName": "Hauteur minimale de la police",
+    "xpack.canvas.uis.views.tagcloud.args.minFontHeightHelp": "Hauteur minimale de la police de l'élément",
+    "xpack.canvas.uis.views.tagcloud.args.orientationDisplayName": "Orientation",
+    "xpack.canvas.uis.views.tagcloud.args.orientationHelp": "Orientation des mots dans le nuage de balises",
+    "xpack.canvas.uis.views.tagcloud.args.orientationMultipleLabel": "Multiple",
+    "xpack.canvas.uis.views.tagcloud.args.orientationRightAngledLabel": "Angle droit",
+    "xpack.canvas.uis.views.tagcloud.args.orientationSingleLabel": "Unique",
+    "xpack.canvas.uis.views.tagcloud.args.scaleDisplayName": "Scaling",
+    "xpack.canvas.uis.views.tagcloud.args.scaleHelp": "Échelle pour déterminer la taille de police d'un mot",
+    "xpack.canvas.uis.views.tagcloud.args.scaleLinearLabel": "Linéaire",
+    "xpack.canvas.uis.views.tagcloud.args.scaleLogLabel": "Logarithmique",
+    "xpack.canvas.uis.views.tagcloud.args.scaleSquareRootLabel": "Racine carrée",
+    "xpack.canvas.uis.views.tagcloud.args.showLabelDisplayName": "Afficher l'étiquette",
+    "xpack.canvas.uis.views.tagcloud.args.showLabelHelp": "Afficher l'étiquette du graphique",
+    "xpack.canvas.uis.views.tagcloudTitle": "Nuage de balises",
     "xpack.canvas.uis.views.timefilter.args.columnConfirmButtonLabel": "Définir",
     "xpack.canvas.uis.views.timefilter.args.columnLabel": "Colonne à laquelle l'heure sélectionnée est appliquée",
     "xpack.canvas.uis.views.timefilter.args.columnTitle": "Colonne",
@@ -7478,7 +9214,24 @@
     "xpack.canvas.workpadConfig.swapDimensionsTooltip": "Permuter la largeur et la hauteur",
     "xpack.canvas.workpadConfig.USLetterButtonLabel": "Lettre US",
     "xpack.canvas.workpadConfig.widthLabel": "Largeur",
+    "xpack.canvas.workpadConflict.redirectLabel": "Workpad",
     "xpack.canvas.workpadCreate.createButtonLabel": "Créer un workpad",
+    "xpack.canvas.workpadFilters.defaultFilter.column": "Colonne",
+    "xpack.canvas.workpadFilters.defaultFilter.filterGroup": "Groupe de filtres",
+    "xpack.canvas.workpadFilters.defaultFilter.type": "Type",
+    "xpack.canvas.workpadFilters.defaultFilter.typeLabel": "Déroulant",
+    "xpack.canvas.workpadFilters.defaultFilter.value": "Valeur",
+    "xpack.canvas.workpadFilters.filter.blankTypeLabel": "(Vide)",
+    "xpack.canvas.workpadFilters.filters_group.blankValue": "(Vide)",
+    "xpack.canvas.workpadFilters.filters_group.withoutGroup": "Sans groupe",
+    "xpack.canvas.workpadFilters.groupByColumn": "Colonne",
+    "xpack.canvas.workpadFilters.groupByFilterGroup": "Groupe de filtres",
+    "xpack.canvas.workpadFilters.groupByFilterType": "Type de filtre",
+    "xpack.canvas.workpadFilters.groupBySelect": "Regrouper par",
+    "xpack.canvas.workpadFilters.timeFilter.from": "De",
+    "xpack.canvas.workpadFilters.timeFilter.invalidDate": "Date non valide : {date}",
+    "xpack.canvas.workpadFilters.timeFilter.to": "À",
+    "xpack.canvas.workpadFilters.timeFilter.typeLabel": "Heure",
     "xpack.canvas.workpadHeader.addElementModalCloseButtonLabel": "Fermer",
     "xpack.canvas.workpadHeader.cycleIntervalDaysText": "Tous les {days} {days, plural, one {jour} other {jours}}",
     "xpack.canvas.workpadHeader.cycleIntervalHoursText": "Toutes les {hours} {hours, plural, one {heure} other {heures}}",
@@ -7557,6 +9310,7 @@
     "xpack.canvas.workpadHeaderViewMenu.zoomPrecentageValue": "Réinitialiser",
     "xpack.canvas.workpadHeaderViewMenu.zoomResetText": "{scalePercentage}%",
     "xpack.canvas.workpadImport.filePickerPlaceholder": "Importer le fichier {JSON} du workpad",
+    "xpack.canvas.workpadResolve.redirectLabel": "Workpad",
     "xpack.canvas.workpadTable.cloneTooltip": "Cloner le workpad",
     "xpack.canvas.workpadTable.exportTooltip": "Exporter le workpad",
     "xpack.canvas.workpadTable.loadWorkpadArialLabel": "Charger le workpad \"{workpadName}\"",
@@ -7584,10 +9338,19 @@
     "xpack.canvas.workpadTemplates.table.descriptionColumnTitle": "Description",
     "xpack.canvas.workpadTemplates.table.nameColumnTitle": "Nom de modèle",
     "xpack.canvas.workpadTemplates.table.tagsColumnTitle": "Balises",
+    "xpack.cases.actions.caseAlertSuccessSyncText": "Les alertes dans ce cas ont leur statut synchronisé avec celui du cas",
+    "xpack.cases.actions.caseAlertSuccessToast": "Une alerte a été ajoutée à \"{title}\"",
+    "xpack.cases.actions.caseSuccessToast": "{title} a été mis à jour",
+    "xpack.cases.actions.viewCase": "Afficher le cas",
     "xpack.cases.addConnector.title": "Ajouter un connecteur",
     "xpack.cases.allCases.actions": "Actions",
     "xpack.cases.allCases.comments": "Commentaires",
-    "xpack.cases.allCases.noTagsAvailable": "Aucune balise disponible",
+    "xpack.cases.allCases.noTagsAvailable": "Aucune balise n'est disponible",
+    "xpack.cases.badge.readOnly.text": "Lecture seule",
+    "xpack.cases.badge.readOnly.tooltip": "Impossible de créer ou de modifier des cas",
+    "xpack.cases.breadcrumbs.all_cases": "Cas",
+    "xpack.cases.breadcrumbs.configure_cases": "Configurer",
+    "xpack.cases.breadcrumbs.create_case": "Créer",
     "xpack.cases.caseTable.bulkActions": "Actions groupées",
     "xpack.cases.caseTable.bulkActions.closeSelectedTitle": "Fermer la sélection",
     "xpack.cases.caseTable.bulkActions.deleteSelectedTitle": "Supprimer la sélection",
@@ -7600,9 +9363,9 @@
     "xpack.cases.caseTable.delete": "Supprimer",
     "xpack.cases.caseTable.incidentSystem": "Système de gestion des incidents",
     "xpack.cases.caseTable.inProgressCases": "Cas en cours",
-    "xpack.cases.caseTable.noCases.body": "Il n'existe aucun cas à afficher. Veuillez créer un nouveau cas ou modifier vos paramètres de filtre ci-dessus.",
-    "xpack.cases.caseTable.noCases.readonly.body": "Il n'existe aucun cas à afficher. Veuillez modifier vos paramètres de filtre ci-dessus.",
-    "xpack.cases.caseTable.noCases.title": "Aucun cas",
+    "xpack.cases.caseTable.noCases.body": "Créer un cas ou modifiez vos filtres.",
+    "xpack.cases.caseTable.noCases.readonly.body": "Modifier vos paramètres de filtre.",
+    "xpack.cases.caseTable.noCases.title": "Aucun cas à afficher",
     "xpack.cases.caseTable.notPushed": "Non transmis",
     "xpack.cases.caseTable.openCases": "Cas ouverts",
     "xpack.cases.caseTable.pushLinkAria": "cliquez pour afficher l'incident relatif à { thirdPartyName }.",
@@ -7610,6 +9373,7 @@
     "xpack.cases.caseTable.requiresUpdate": " requiert une mise à jour",
     "xpack.cases.caseTable.searchAriaLabel": "Rechercher des cas",
     "xpack.cases.caseTable.searchPlaceholder": "par exemple, un nom de cas",
+    "xpack.cases.caseTable.select": "Sélectionner",
     "xpack.cases.caseTable.selectedCasesTitle": "Sélection de {totalRules} {totalRules, plural, other {cas}} effectuée",
     "xpack.cases.caseTable.showingCasesTitle": "Affichage de {totalRules} {totalRules, plural, other {cas}}",
     "xpack.cases.caseTable.snIncident": "Incident externe",
@@ -7619,7 +9383,9 @@
     "xpack.cases.caseView.actionLabel.addDescription": "description ajoutée",
     "xpack.cases.caseView.actionLabel.addedField": "ajouté",
     "xpack.cases.caseView.actionLabel.changededField": "changé",
+    "xpack.cases.caseView.actionLabel.disableSetting": "désactivé",
     "xpack.cases.caseView.actionLabel.editedField": "modifié",
+    "xpack.cases.caseView.actionLabel.enabledSetting": "activé",
     "xpack.cases.caseView.actionLabel.on": "le",
     "xpack.cases.caseView.actionLabel.pushedNewIncident": "transmis comme nouvel incident",
     "xpack.cases.caseView.actionLabel.removedField": "retiré",
@@ -7627,6 +9393,7 @@
     "xpack.cases.caseView.actionLabel.selectedThirdParty": "sélectionné { thirdParty } comme système de gestion des incidents",
     "xpack.cases.caseView.actionLabel.updateIncident": "incident mis à jour",
     "xpack.cases.caseView.actionLabel.viewIncident": "Afficher {incidentNumber}",
+    "xpack.cases.caseView.activity": "Activité",
     "xpack.cases.caseView.alertCommentLabelTitle": "a ajouté une alerte depuis",
     "xpack.cases.caseView.alreadyPushedToExternalService": "Déjà transmis à l'incident { externalService }",
     "xpack.cases.caseView.backLabel": "Retour aux cas",
@@ -7646,8 +9413,9 @@
     "xpack.cases.caseView.commentFieldRequiredError": "Un commentaire est requis.",
     "xpack.cases.caseView.connectors": "Système de gestion des incidents externes",
     "xpack.cases.caseView.copyCommentLinkAria": "Copier le lien de référence",
-    "xpack.cases.caseView.create": "Créer un nouveau cas",
+    "xpack.cases.caseView.create": "Créer un cas",
     "xpack.cases.caseView.createCase": "Créer un cas",
+    "xpack.cases.caseView.createdOn": "Créé le",
     "xpack.cases.caseView.description": "Description",
     "xpack.cases.caseView.description.save": "Enregistrer",
     "xpack.cases.caseView.doesNotExist.button": "Retour aux cas",
@@ -7664,14 +9432,23 @@
     "xpack.cases.caseView.errorsPushServiceCallOutTitle": "Sélectionner un connecteur externe",
     "xpack.cases.caseView.fieldChanged": "a modifié le champ du connecteur",
     "xpack.cases.caseView.fieldRequiredError": "Champ requis",
-    "xpack.cases.caseView.generatedAlertCommentLabelTitle": "ont été ajoutés à partir de",
-    "xpack.cases.caseView.generatedAlertCountCommentLabelTitle": "{totalCount} {totalCount, plural, =1 {alerte} other {alertes}}",
     "xpack.cases.caseView.isolatedHost": "a soumis une demande d'isolement sur l'hôte",
     "xpack.cases.caseView.lockedIncidentDesc": "Aucune mise à jour n'est requise",
     "xpack.cases.caseView.lockedIncidentTitle": "L'incident { thirdParty } est à jour",
     "xpack.cases.caseView.lockedIncidentTitleNone": "L'incident externe est à jour",
     "xpack.cases.caseView.markedCaseAs": "a marqué le cas comme",
     "xpack.cases.caseView.markInProgress": "Marquer comme étant en cours",
+    "xpack.cases.caseView.metrics.associatedHosts": "Hôtes associés",
+    "xpack.cases.caseView.metrics.associatedUsers": "Utilisateurs associés",
+    "xpack.cases.caseView.metrics.isolatedHosts": "Hôtes isolés",
+    "xpack.cases.caseView.metrics.lifespan.caseCreated": "Cas créé",
+    "xpack.cases.caseView.metrics.lifespan.inProgressDuration": "Durée en cours",
+    "xpack.cases.caseView.metrics.lifespan.openDuration": "Durée d'ouverture",
+    "xpack.cases.caseView.metrics.lifespan.openToCloseDuration": "Durée de la création à la fermeture",
+    "xpack.cases.caseView.metrics.lifespan.reopened": "(réouverture)",
+    "xpack.cases.caseView.metrics.lifespan.reopenedOn": "Réouverture ",
+    "xpack.cases.caseView.metrics.totalAlerts": "Total des alertes",
+    "xpack.cases.caseView.metrics.totalConnectors": "Total des connecteurs",
     "xpack.cases.caseView.moveToCommentAria": "Surligner le commentaire référencé",
     "xpack.cases.caseView.name": "Nom",
     "xpack.cases.caseView.noReportersAvailable": "Aucun auteur disponible.",
@@ -7695,8 +9472,10 @@
     "xpack.cases.caseView.requiredUpdateToExternalService": "Requiert une mise à jour de l'incident { externalService }",
     "xpack.cases.caseView.sendEmalLinkAria": "cliquer pour envoyer un e-mail à {user}",
     "xpack.cases.caseView.showAlertTooltip": "Afficher les détails de l'alerte",
+    "xpack.cases.caseView.solution": "Solution",
     "xpack.cases.caseView.statusLabel": "Statut",
     "xpack.cases.caseView.syncAlertsLabel": "Synchroniser les alertes",
+    "xpack.cases.caseView.syncAlertsLowercaseLabel": "synchroniser les alertes",
     "xpack.cases.caseView.tags": "Balises",
     "xpack.cases.caseView.to": "à",
     "xpack.cases.caseView.unknown": "Inconnu",
@@ -7707,12 +9486,15 @@
     "xpack.cases.common.alertLabel": "Alerte",
     "xpack.cases.common.alertsLabel": "Alertes",
     "xpack.cases.common.allCases.caseModal.title": "Sélectionner le cas",
+    "xpack.cases.common.appDescription": "Ouvrir et suivre les problèmes, pousser l'information vers des systèmes tiers.",
     "xpack.cases.common.appropriateLicense": "licence appropriée",
+    "xpack.cases.common.appTitle": "Cas",
     "xpack.cases.common.noConnector": "Aucun connecteur sélectionné",
     "xpack.cases.components.create.syncAlertHelpText": "L'activation de cette option synchronisera le statut des alertes de ce cas avec le statut du cas.",
     "xpack.cases.configure.connectorDeletedOrLicenseWarning": "Le connecteur sélectionné a été supprimé ou vous ne disposez pas de la {appropriateLicense} pour pouvoir l'utiliser. Sélectionnez un autre connecteur ou créez-en un nouveau.",
-    "xpack.cases.configure.readPermissionsErrorDescription": "Vous ne disposez pas d'autorisation pour afficher les connecteurs. Si vous souhaitez afficher les connecteurs associés à ce cas, contactez votre administrateur Kibana.",
+    "xpack.cases.configure.readPermissionsErrorDescription": "Vous ne disposez pas d'autorisation pour afficher les connecteurs. Si vous souhaitez afficher les connecteurs, contactez votre administrateur Kibana.",
     "xpack.cases.configure.successSaveToast": "Paramètres de connexion externe enregistrés",
+    "xpack.cases.configureCases": "Configurer les cas",
     "xpack.cases.configureCases.addNewConnector": "Ajouter un nouveau connecteur",
     "xpack.cases.configureCases.cancelButton": "Annuler",
     "xpack.cases.configureCases.caseClosureOptionsDesc": "Définissez le mode de fermeture de vos cas. Les fermetures automatiques exigent une connexion établie avec un système de gestion des incidents externes.",
@@ -7721,6 +9503,8 @@
     "xpack.cases.configureCases.caseClosureOptionsNewIncident": "Fermer les cas automatiquement lors de la transmission d'un nouvel incident à un système externe",
     "xpack.cases.configureCases.caseClosureOptionsTitle": "Fermetures des cas",
     "xpack.cases.configureCases.commentMapping": "Commentaires",
+    "xpack.cases.configureCases.deprecatedTooltipContent": "Ce connecteur est déclassé. Mettez-le à jour, ou créez-en un nouveau.",
+    "xpack.cases.configureCases.deprecatedTooltipText": "déclassé",
     "xpack.cases.configureCases.fieldMappingDesc": "Mappez les champs des cas aux champs { thirdPartyName } lors de la transmission de données à { thirdPartyName }. Les mappings de champs requièrent une connexion établie à { thirdPartyName }.",
     "xpack.cases.configureCases.fieldMappingDescErr": "Impossible de récupérer les mappings pour { thirdPartyName }.",
     "xpack.cases.configureCases.fieldMappingEditAppend": "Ajouter",
@@ -7750,7 +9534,7 @@
     "xpack.cases.connectors.cases.externalIncidentCreated": "(créé le {date} par {user})",
     "xpack.cases.connectors.cases.externalIncidentDefault": "(créé le {date} par {user})",
     "xpack.cases.connectors.cases.externalIncidentUpdated": "(mis à jour le {date} par {user})",
-    "xpack.cases.connectors.jira.issueTypesSelectFieldLabel": "Type de problème",
+    "xpack.cases.connectors.jira.issueTypesSelectFieldLabel": "Type d'erreur",
     "xpack.cases.connectors.jira.parentIssueSearchLabel": "Problème parent",
     "xpack.cases.connectors.jira.prioritySelectFieldLabel": "Priorité",
     "xpack.cases.connectors.jira.searchIssuesComboBoxAriaLabel": "Taper pour rechercher",
@@ -7768,9 +9552,11 @@
     "xpack.cases.connectors.serviceNow.alertFieldEnabledText": "Oui",
     "xpack.cases.connectors.serviceNow.alertFieldsTitle": "Sélectionner les éléments observables à transmettre",
     "xpack.cases.connectors.serviceNow.categoryTitle": "Catégorie",
+    "xpack.cases.connectors.serviceNow.deprecatedConnectorWarningDesc": "Mettez à jour ce connecteur, ou créez-en un nouveau.",
+    "xpack.cases.connectors.serviceNow.deprecatedConnectorWarningTitle": "Ce type de connecteur est déclassé",
     "xpack.cases.connectors.serviceNow.destinationIPTitle": "IP de destination",
     "xpack.cases.connectors.serviceNow.impactSelectFieldLabel": "Impact",
-    "xpack.cases.connectors.serviceNow.malwareHashTitle": "Hachage du malware",
+    "xpack.cases.connectors.serviceNow.malwareHashTitle": "Hachages du malware",
     "xpack.cases.connectors.serviceNow.malwareURLTitle": "URL du malware",
     "xpack.cases.connectors.serviceNow.prioritySelectFieldTitle": "Priorité",
     "xpack.cases.connectors.serviceNow.severitySelectFieldLabel": "Sévérité",
@@ -7791,33 +9577,59 @@
     "xpack.cases.containers.markInProgressCases": "Marquage effectué de {totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases} cas}} comme étant en cours",
     "xpack.cases.containers.pushToExternalService": "Envoyé avec succès à { serviceName }",
     "xpack.cases.containers.reopenedCases": "Ouverture de {totalCases, plural, =1 {\"{caseTitle}\"} other {{totalCases} cas}} effectuée",
-    "xpack.cases.containers.statusChangeToasterText": "Le statut des alertes de ce cas a été également mis à jour",
+    "xpack.cases.containers.statusChangeToasterText": "Mise à jour des statuts des alertes attachées.",
     "xpack.cases.containers.syncCase": "Les alertes de \"{caseTitle}\" ont été synchronisées",
     "xpack.cases.containers.updatedCase": "\"{caseTitle}\" mis à jour",
     "xpack.cases.create.stepOneTitle": "Champs du cas",
     "xpack.cases.create.stepThreeTitle": "Champs du connecteur externe",
     "xpack.cases.create.stepTwoTitle": "Paramètres du cas",
     "xpack.cases.create.syncAlertsLabel": "Synchroniser le statut de l'alerte avec le statut du cas",
+    "xpack.cases.createCase": "Créer un cas",
+    "xpack.cases.createCase.ariaKeypadSolutionSelection": "Sélection d'une solution unique",
     "xpack.cases.createCase.descriptionFieldRequiredError": "Une description est requise.",
-    "xpack.cases.createCase.fieldTagsEmptyError": "Une balise ne doit pas être vide",
+    "xpack.cases.createCase.fieldTagsEmptyError": "Une balise doit contenir au moins un caractère différent d'un espace.",
     "xpack.cases.createCase.fieldTagsHelpText": "Entrez une ou plusieurs balises d'identification personnalisées pour ce cas. Appuyez sur Entrée après chaque balise pour en commencer une nouvelle.",
     "xpack.cases.createCase.maxLengthError": "La longueur de {field} est trop importante. La longueur maximale est de {length}.",
+    "xpack.cases.createCase.solutionFieldRequiredError": "Une solution est requise",
     "xpack.cases.createCase.titleFieldRequiredError": "Un titre est requis.",
     "xpack.cases.editConnector.editConnectorLinkAria": "cliquer pour modifier le connecteur",
     "xpack.cases.emptyString.emptyStringDescription": "Chaîne vide",
+    "xpack.cases.features.casesFeatureName": "Cas",
     "xpack.cases.getCurrentUser.Error": "Erreur lors de l'obtention de l'utilisateur",
     "xpack.cases.getCurrentUser.unknownUser": "Inconnu",
+    "xpack.cases.header.badge.betaDesc": "Cette fonctionnalité est actuellement en version bêta. Si vous rencontrez des bugs ou si vous souhaitez apporter des commentaires, ouvrez un ticket de problème ou visitez notre forum de discussion.",
+    "xpack.cases.header.badge.betaLabel": "Bêta",
+    "xpack.cases.header.badge.experimentalDesc": "Cette fonctionnalité est en version d'évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "xpack.cases.header.badge.experimentalLabel": "Version d'évaluation technique",
     "xpack.cases.header.editableTitle.cancel": "Annuler",
     "xpack.cases.header.editableTitle.editButtonAria": "Vous pouvez modifier {title} en cliquant",
     "xpack.cases.header.editableTitle.save": "Enregistrer",
     "xpack.cases.markdownEditor.plugins.lens.addVisualizationModalTitle": "Ajouter une visualisation",
-    "xpack.cases.markdownEditor.plugins.lens.betaDescription": "Le plug-in Lens des cas n'est pas proposé en disponibilité générale. Nous vous remercions de bien vouloir nous aider en nous signalant tout bug.",
+    "xpack.cases.markdownEditor.plugins.lens.betaDescription": "Ce module n'est pas disponible. Pour l'instant, vous ne pouvez insérer qu'un seul Lens par commentaire. Nous vous remercions de bien vouloir nous aider en nous signalant les bugs.",
     "xpack.cases.markdownEditor.plugins.lens.betaLabel": "Bêta",
+    "xpack.cases.markdownEditor.plugins.lens.closeButtonLabel": "Fermer",
     "xpack.cases.markdownEditor.plugins.lens.createVisualizationButtonLabel": "Créer une visualisation",
     "xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.searchSelection.notFoundLabel": "Impossible de trouver un Lens correspondant.",
     "xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.searchSelection.savedObjectType.lens": "Lens",
+    "xpack.cases.markdownEditor.plugins.lens.openVisualizationButtonLabel": "Visualisation ouverte",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.filterButtonLabel": "Types",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.searchInputHelpText": "Insérez un Lens à partir de modèles existants ou en créant un nouveau modèle. Vous créerez un Lens uniquement pour ce commentaire et ne changerez pas la Bibliothèque Visualize.",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.searchInputLabel": "Sélectionner un Lens",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.searchInputPrependLabel": "Modèle",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.searchPlaceholder": "Rechercher…",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.sortAsc": "Croissant",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.sortAuto": "Meilleure correspondance",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.sortButtonLabel": "Trier",
+    "xpack.cases.markdownEditor.plugins.lens.savedObjects.finder.sortDesc": "Décroissant",
+    "xpack.cases.markdownEditor.plugins.lens.visualizationButtonLabel": "Visualisation",
     "xpack.cases.markdownEditor.plugins.timeline.noParenthesesErrorMsg": "Parenthèses gauches attendues",
     "xpack.cases.markdownEditor.preview": "Aperçu",
+    "xpack.cases.navigation.cases": "Cas",
+    "xpack.cases.navigation.configure": "Configurer les cas",
+    "xpack.cases.navigation.create": "Créer un nouveau cas",
+    "xpack.cases.noPrivileges.button": "Retour aux cas",
+    "xpack.cases.noPrivileges.message": "Pour afficher la page {pageName}, vous devez mettre à jour les privilèges. Pour en savoir plus, contactez votre administrateur Kibana.",
+    "xpack.cases.noPrivileges.title": "Privilèges requis",
     "xpack.cases.pageTitle": "Cas",
     "xpack.cases.recentCases.commentsTooltip": "Commentaires",
     "xpack.cases.recentCases.controlLegend": "Filtre de cas",
@@ -7834,7 +9646,9 @@
     "xpack.cases.status.closed": "Fermé",
     "xpack.cases.status.iconAria": "Modifier le statut",
     "xpack.cases.status.inProgress": "En cours",
-    "xpack.cases.status.open": "Ouvert",
+    "xpack.cases.status.open": "Ouvrir",
+    "xpack.cloud.chat.chatFrameTitle": "Chat",
+    "xpack.cloud.chat.hideChatButtonLabel": "Masquer le chat",
     "xpack.cloud.deploymentLinkLabel": "Gérer ce déploiement",
     "xpack.cloud.userMenuLinks.accountLinkText": "Compte et facturation",
     "xpack.cloud.userMenuLinks.profileLinkText": "Profil",
@@ -7965,6 +9779,10 @@
     "xpack.crossClusterReplication.deleteAutoFollowPattern.confirmModal.deleteSingleTitle": "Retirer le modèle de suivi automatique \"{name}\" ?",
     "xpack.crossClusterReplication.deleteAutoFollowPattern.confirmModal.multipleDeletionDescription": "Vous êtes sur le point de supprimer les modèles de suivi automatique suivants :",
     "xpack.crossClusterReplication.deleteAutoFollowPatternButtonLabel": "Supprimer {total, plural, one {le modèle} other {les modèles}}",
+    "xpack.crossClusterReplication.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.crossClusterReplication.deprecations.enabled.manualStepTwoMessage": "Remplacer le paramètre \"xpack.ccr.enabled\" par \"xpack.ccr.ui.enabled\".",
+    "xpack.crossClusterReplication.deprecations.enabledMessage": "Pour empêcher les utilisateurs d'accéder à l'interface utilisateur de la réplication inter-clusters, utilisez le paramètre \"xpack.ccr.ui.enabled\" au lieu de \"xpack.ccr.enabled\".",
+    "xpack.crossClusterReplication.deprecations.enabledTitle": "Le paramètre \"xpack.ccr.enabled\" est déclassé",
     "xpack.crossClusterReplication.editAutoFollowPatternButtonLabel": "Modifier un modèle",
     "xpack.crossClusterReplication.editBreadcrumbTitle": "Modifier",
     "xpack.crossClusterReplication.followerIndex.addAction.successNotificationTitle": "Index suiveur \"{name}\" ajouté",
@@ -8146,7 +9964,114 @@
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.singleUnfollowDescription": "L'index suiveur sera converti en index standard. Il ne sera plus affiché dans la réplication inter-clusters, mais vous pouvez le gérer dans la page Gestion des index. Cette opération ne peut pas être annulée.",
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowMultipleTitle": "Annuler le suivi de {count} index meneurs ?",
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowSingleTitle": "Annuler le suivi de l'index meneur \"{name}\" ?",
+    "xpack.csp.active_frameworks": "Frameworks actifs",
+    "xpack.csp.benchmarks.integrationsNotFoundForNameMessage": " pour \"{name}\"",
+    "xpack.csp.benchmarks.integrationsNotFoundMessage": "Aucune intégration Benchmark trouvée",
+    "xpack.csp.benchmarks.integrationsNotFoundWithFiltersMessage": "Nous n'avons trouvé aucune intégration Benchmark avec les filtres ci-dessus.",
+    "xpack.csp.benchmarks.searchPlaceholder": "par exemple, le nom d'un benchmark",
+    "xpack.csp.benchmarks.totalIntegrationsCountMessage": "Affichage de {pageCount} sur {totalCount, plural, one {# intégration} other {# intégrations}}",
+    "xpack.csp.cloud_posture": "Niveau du cloud",
+    "xpack.csp.cloud_posture_score": "Score du niveau du cloud",
+    "xpack.csp.coming_soon": "Bientôt disponible",
+    "xpack.csp.compliance_score": "Score de conformité",
+    "xpack.csp.compliance_trend": "Tendance de conformité",
+    "xpack.csp.complianceDashboard.failedFindingsChartLabel": "Échec des résultats",
+    "xpack.csp.complianceDashboard.noDataConfig.actionDescription": "Vous pouvez essayer de récupérer vos données",
+    "xpack.csp.complianceDashboard.noDataConfig.actionTitle": "Réessayer",
+    "xpack.csp.complianceDashboard.noDataConfig.pageTitle": "Tableau de bord de conformité de la sécurité du cloud",
+    "xpack.csp.complianceDashboard.noDataConfig.solutionNameLabel": "Niveau de sécurité du cloud",
+    "xpack.csp.cspPageTemplate.defaultNoDataConfig.pageTitle": "Aucune donnée trouvée",
+    "xpack.csp.cspPageTemplate.defaultNoDataConfig.solutionNameLabel": "Niveau de sécurité du cloud",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.buttonLabel": "Ajouter une intégration CIS",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.description": "Utilisez notre intégration CIS Kubernetes Benchmark pour mesurer votre configuration de cluster Kubernetes par rapport aux recommandations du CIS.",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.pageTitle": "Installer l'intégration pour commencer",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.solutionNameLabel": "Niveau de sécurité du cloud",
+    "xpack.csp.cspSettings.rules": "Règles de sécurité du CSP - ",
+    "xpack.csp.error": "Erreur",
+    "xpack.csp.failed": "Échoué",
+    "xpack.csp.findings": "Résultats",
+    "xpack.csp.findings.agentLabel": "Agent",
+    "xpack.csp.findings.architectureLabel": "Architecture",
+    "xpack.csp.findings.auditLabel": "Audit",
+    "xpack.csp.findings.benchmarkLabel": "Benchmark",
+    "xpack.csp.findings.codenameLabel": "Nom de code",
+    "xpack.csp.findings.containerizedLabel": "Conteneurisé",
+    "xpack.csp.findings.defaultValueLabel": "Valeur par défaut",
+    "xpack.csp.findings.descriptionLabel": "Description",
+    "xpack.csp.findings.evaluationLabel": "Évaluation",
+    "xpack.csp.findings.evidenceLabel": "Preuve",
+    "xpack.csp.findings.expectedLabel": "Attendus",
+    "xpack.csp.findings.familyLabel": "Famille",
+    "xpack.csp.findings.filenameLabel": "Nom de fichier",
+    "xpack.csp.findings.frameworkSourcesLabel": "Sources du framework",
+    "xpack.csp.findings.gidLabel": "GID",
+    "xpack.csp.findings.hostLabel": "HÔTE",
+    "xpack.csp.findings.hostnameLabel": "Nom d'hôte",
+    "xpack.csp.findings.idLabel": "ID",
+    "xpack.csp.findings.impactLabel": "Impact",
+    "xpack.csp.findings.indexLabel": "Index",
+    "xpack.csp.findings.ipLabel": "IP",
+    "xpack.csp.findings.kernelLabel": "Kernel",
+    "xpack.csp.findings.macLabel": "Mac",
+    "xpack.csp.findings.modeLabel": "Mode",
+    "xpack.csp.findings.nameLabel": "Nom",
+    "xpack.csp.findings.nonFindingsLabel": "Il n'y a aucun résultat",
+    "xpack.csp.findings.osLabel": "Système d'exploitation",
+    "xpack.csp.findings.pathLabel": "Chemin",
+    "xpack.csp.findings.platformLabel": "Plateforme",
+    "xpack.csp.findings.profileApplicabilityLabel": "Applicabilité du profil",
+    "xpack.csp.findings.rationaleLabel": "Environnement",
+    "xpack.csp.findings.remediationLabel": "Résolution",
+    "xpack.csp.findings.resourceLabel": "Ressource",
+    "xpack.csp.findings.resultLabel": "Détails du résultat",
+    "xpack.csp.findings.ruleEvaluatedAt": "Règle évaluée à",
+    "xpack.csp.findings.ruleLabel": "Règle",
+    "xpack.csp.findings.ruleNameLabel": "Nom de règle",
+    "xpack.csp.findings.searchFailedLabel": "Échec de la recherche",
+    "xpack.csp.findings.sectionLabel": "Section",
+    "xpack.csp.findings.severityLabel": "Sévérité",
+    "xpack.csp.findings.tagsLabel": "Balises",
+    "xpack.csp.findings.timestampLabel": "Horodatage",
+    "xpack.csp.findings.typeLabel": "Type",
+    "xpack.csp.findings.uidLabel": "UID",
+    "xpack.csp.findings.versionLabel": "Version",
+    "xpack.csp.open_cases": "Cas ouverts",
+    "xpack.csp.pageTemplate.errorDetails.errorBodyTitle": "{body}",
+    "xpack.csp.pageTemplate.errorDetails.errorCodeTitle": "{error} {statusCode}",
+    "xpack.csp.pageTemplate.loadErrorMessage": "Nous n'avons pas pu récupérer vos données sur le niveau de sécurité du cloud.",
+    "xpack.csp.passed": "Approuvé",
+    "xpack.csp.posture_score": "Score du niveau",
+    "xpack.csp.posture_score_trend": "Tendance du score du niveau",
+    "xpack.csp.resource_type": "Type de ressource",
+    "xpack.csp.rules.activateAllButtonLabel": "Activer {count, plural, one {# règle} other {# règles}}",
+    "xpack.csp.rules.bulkActionsButtonLabel": "Actions groupées",
+    "xpack.csp.rules.cancelButtonLabel": "Annuler",
+    "xpack.csp.rules.clearSelectionButtonLabel": "Effacer la sélection",
+    "xpack.csp.rules.deactivateAllButtonLabel": "Désactiver {count, plural, one {# règle} other {# règles}}",
+    "xpack.csp.rules.disableLabel": "Désactiver",
+    "xpack.csp.rules.enableLabel": "Activer",
+    "xpack.csp.rules.header.rulesCountLabel": "{count, plural, one { règle} other { règles}}",
+    "xpack.csp.rules.header.selectedRulesCount": "{rules} sélectionnées",
+    "xpack.csp.rules.header.totalRulesCount": "Affichage des {rules}",
+    "xpack.csp.rules.manageIntegrationButtonLabel": "Gérer l'intégration",
+    "xpack.csp.rules.missingRulesMessage": "Règles manquantes",
+    "xpack.csp.rules.refreshButtonLabel": "Actualiser",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.enabledLabel": "Activé",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.lastModifiedLabel": "Dernière modification",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.nameLabel": "Nom de règle",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.sectionLabel": "Section",
+    "xpack.csp.rules.saveButtonLabel": "Enregistrer",
+    "xpack.csp.rules.searchPlaceholder": "Recherche",
+    "xpack.csp.rules.selectAllButtonLabel": "Tout sélectionner",
+    "xpack.csp.rules.tableHeader.lastModificationLabel": "Dernière modification de l'intégration {timeAgo} ",
+    "xpack.csp.rules.unknownErrorMessage": "Erreur inconnue",
+    "xpack.csp.rules.updateFailedMessage": "Échec de la mise à jour",
+    "xpack.csp.status": "STATUT",
+    "xpack.csp.total_failures": "Total des échecs",
+    "xpack.csp.total_resources": "Total des ressources",
+    "xpack.csp.view_all_failed_findings": "Afficher tous les échecs des résultats",
     "xpack.dashboard.components.DashboardDrilldownConfig.chooseDestinationDashboard": "Choisir le tableau de bord de destination",
+    "xpack.dashboard.components.DashboardDrilldownConfig.openInNewTab": "Ouvrir le tableau de bord dans un nouvel onglet",
     "xpack.dashboard.components.DashboardDrilldownConfig.useCurrentDateRange": "Utiliser la plage de dates du tableau de bord d'origine",
     "xpack.dashboard.components.DashboardDrilldownConfig.useCurrentFilters": "Utiliser les filtres et la requête du tableau de bord d'origine",
     "xpack.dashboard.drilldown.errorDestinationDashboardIsMissing": "Le tableau de bord de destination (\"{dashboardId}\") n'existe plus. Choisissez un autre tableau de bord.",
@@ -8206,6 +10131,7 @@
     "xpack.data.mgmt.searchSessions.table.headerStarted": "Créé",
     "xpack.data.mgmt.searchSessions.table.headerStatus": "Statut",
     "xpack.data.mgmt.searchSessions.table.headerType": "Application",
+    "xpack.data.mgmt.searchSessions.table.mlAppName": "Machine Learning",
     "xpack.data.mgmt.searchSessions.table.notRestorableWarning": "La session de recherche va être de nouveau exécutée. Vous pouvez ensuite l'enregistrer pour une utilisation ultérieure.",
     "xpack.data.mgmt.searchSessions.table.numSearches": "# recherches",
     "xpack.data.mgmt.searchSessions.table.versionIncompatibleWarning": "Cette session de recherche a été créée dans une instance Kibana exécutant une version différente. Il se peut qu'elle ne soit pas correctement restaurée.",
@@ -8268,12 +10194,14 @@
     "xpack.dataVisualizer.components.colorRangeLegend.redColorRangeLabel": "Rouge",
     "xpack.dataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel": "Rouge – Vert",
     "xpack.dataVisualizer.components.colorRangeLegend.sqrtScaleLabel": "Racine carrée",
-    "xpack.dataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "Jaune – Vert – Bleu",
+    "xpack.dataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "Jaune - Vert – Bleu",
+    "xpack.dataVisualizer.customIntegrationsDescription": "Téléchargez les données d'un fichier CSV, TSV, JSON ou autre fichier log vers Elasticsearch pour analyse.",
     "xpack.dataVisualizer.dataGrid.collapseDetailsForAllAriaLabel": "Réduire les détails pour tous les champs",
     "xpack.dataVisualizer.dataGrid.distinctValuesColumnName": "Valeurs distinctes",
     "xpack.dataVisualizer.dataGrid.distributionsColumnName": "Distributions",
     "xpack.dataVisualizer.dataGrid.documentsCountColumnName": "Documents (%)",
     "xpack.dataVisualizer.dataGrid.expandDetailsForAllAriaLabel": "Développer les détails pour tous les champs",
+    "xpack.dataVisualizer.dataGrid.field.addFilterAriaLabel": "Filtrer sur le {fieldName} : \"{value}\"",
     "xpack.dataVisualizer.dataGrid.field.cardBoolean.valuesLabel": "Valeurs",
     "xpack.dataVisualizer.dataGrid.field.cardDate.earliestLabel": "le plus tôt",
     "xpack.dataVisualizer.dataGrid.field.cardDate.latestLabel": "le plus récent",
@@ -8286,9 +10214,10 @@
     "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.seriesName": "distribution",
     "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueBetweenLabel": "{percent} % des documents ont des valeurs comprises entre {minValFormatted} et {maxValFormatted}",
     "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueEqualLabel": "{percent} % des documents ont une valeur de {valFormatted}",
+    "xpack.dataVisualizer.dataGrid.field.removeFilterAriaLabel": "Exclure le {fieldName} : \"{value}\"",
     "xpack.dataVisualizer.dataGrid.field.topValues.calculatedFromSampleDescription": "Calculé à partir d'un échantillon de {topValuesSamplerShardSize} documents par partition",
     "xpack.dataVisualizer.dataGrid.field.topValuesLabel": "Valeurs les plus élevées",
-    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.falseCountLabel": "false",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.falseCountLabel": "faux",
     "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.summaryTableTitle": "Résumé",
     "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.trueCountLabel": "vrai",
     "xpack.dataVisualizer.dataGrid.fieldExpandedRow.choroplethMapTopValues.calculatedFromSampleDescription": "Calculé à partir d'un échantillon de {topValuesSamplerShardSize} documents par partition",
@@ -8310,21 +10239,35 @@
     "xpack.dataVisualizer.dataGrid.nameColumnName": "Nom",
     "xpack.dataVisualizer.dataGrid.rowCollapse": "Masquer les détails pour {fieldName}",
     "xpack.dataVisualizer.dataGrid.rowExpand": "Afficher les détails pour {fieldName}",
+    "xpack.dataVisualizer.dataGrid.searchingMessage": "Recherche",
     "xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel": "Afficher les distributions",
     "xpack.dataVisualizer.dataGrid.showDistributionsTooltip": "Afficher les distributions",
     "xpack.dataVisualizer.dataGrid.typeColumnName": "Type",
     "xpack.dataVisualizer.dataGridChart.histogramNotAvailable": "Graphique non pris en charge.",
     "xpack.dataVisualizer.dataGridChart.singleCategoryLegend": "{cardinality, plural, one {# catégorie} other {# catégories}}",
+    "xpack.dataVisualizer.dataGridChart.singleTopValueLegend": "{cardinality, plural, one {# valeur {exampleValue}} other {# valeurs}}",
     "xpack.dataVisualizer.dataGridChart.topCategoriesLegend": "Premières {maxChartColumns} des catégories {cardinality}",
     "xpack.dataVisualizer.description": "Importez votre propre fichier CSV, NDJSON ou log.",
     "xpack.dataVisualizer.fieldNameSelect": "Nom du champ",
     "xpack.dataVisualizer.fieldStats.maxTitle": "max",
     "xpack.dataVisualizer.fieldStats.medianTitle": "médiane",
     "xpack.dataVisualizer.fieldStats.minTitle": "min",
+    "xpack.dataVisualizer.fieldTypeIcon.booleanTypeLabel": "Booléen",
+    "xpack.dataVisualizer.fieldTypeIcon.dateTypeLabel": "Date",
     "xpack.dataVisualizer.fieldTypeIcon.fieldTypeTooltip": "type {type}",
+    "xpack.dataVisualizer.fieldTypeIcon.geoPointTypeLabel": "Point géographique",
+    "xpack.dataVisualizer.fieldTypeIcon.geoShapeTypeLabel": "Forme géométrique",
+    "xpack.dataVisualizer.fieldTypeIcon.histogramTypeLabel": "Histogramme",
+    "xpack.dataVisualizer.fieldTypeIcon.ipTypeLabel": "IP",
+    "xpack.dataVisualizer.fieldTypeIcon.keywordTypeLabel": "Mot-clé",
+    "xpack.dataVisualizer.fieldTypeIcon.numberTypeLabel": "Nombre",
+    "xpack.dataVisualizer.fieldTypeIcon.textTypeLabel": "Texte",
+    "xpack.dataVisualizer.fieldTypeIcon.unknownTypeLabel": "Inconnu",
     "xpack.dataVisualizer.fieldTypeSelect": "Type du champ",
     "xpack.dataVisualizer.file.aboutPanel.analyzingDataTitle": "Analyse de données",
     "xpack.dataVisualizer.file.aboutPanel.selectOrDragAndDropFileDescription": "Sélectionner ou glisser-déposer un fichier",
+    "xpack.dataVisualizer.file.advancedImportSettings.createDataViewLabel": "Créer une vue de données",
+    "xpack.dataVisualizer.file.advancedImportSettings.dataViewNameLabel": "Nom de la vue de données",
     "xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel": "Nom d'index, champ requis",
     "xpack.dataVisualizer.file.advancedImportSettings.indexNameLabel": "Nom de l'index",
     "xpack.dataVisualizer.file.advancedImportSettings.indexNamePlaceholder": "nom de l'index",
@@ -8344,6 +10287,7 @@
     "xpack.dataVisualizer.file.bottomBar.missingImportPrivilegesMessage": "Vous devez avoir un rôle de ingest_admin pour activer l'importation des données",
     "xpack.dataVisualizer.file.bottomBar.readMode.cancelButtonLabel": "Annuler",
     "xpack.dataVisualizer.file.bottomBar.readMode.importButtonLabel": "Importer",
+    "xpack.dataVisualizer.file.cannotCreateDataView.tooltip": "Vous devez disposer d'une autorisation pour créer des vues de données.",
     "xpack.dataVisualizer.file.editFlyout.applyOverrideSettingsButtonLabel": "Appliquer",
     "xpack.dataVisualizer.file.editFlyout.closeOverrideSettingsButtonLabel": "Fermer",
     "xpack.dataVisualizer.file.editFlyout.overrides.customDelimiterFormRowLabel": "Délimiteur personnalisé",
@@ -8388,6 +10332,7 @@
     "xpack.dataVisualizer.file.geoPointForm.lonFieldLabel": "Champ de longitude",
     "xpack.dataVisualizer.file.geoPointForm.submitButtonLabel": "Ajouter",
     "xpack.dataVisualizer.file.importErrors.checkingPermissionErrorMessage": "Erreur liée aux autorisations d'importation",
+    "xpack.dataVisualizer.file.importErrors.creatingDataViewErrorMessage": "Erreur lors de la création de la vue de données",
     "xpack.dataVisualizer.file.importErrors.creatingIndexErrorMessage": "Erreur lors de la création de l'index",
     "xpack.dataVisualizer.file.importErrors.creatingIngestPipelineErrorMessage": "Erreur lors de la création du pipeline d'ingestion",
     "xpack.dataVisualizer.file.importErrors.defaultErrorMessage": "Erreur",
@@ -8396,11 +10341,15 @@
     "xpack.dataVisualizer.file.importErrors.readingFileErrorMessage": "Erreur lors de la lecture du fichier",
     "xpack.dataVisualizer.file.importErrors.unknownErrorMessage": "Erreur inconnue",
     "xpack.dataVisualizer.file.importErrors.uploadingDataErrorMessage": "Erreur lors du chargement des données",
+    "xpack.dataVisualizer.file.importProgress.createDataViewTitle": "Créer une vue de données",
     "xpack.dataVisualizer.file.importProgress.createIndexTitle": "Créer un index",
     "xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle": "Créer un pipeline d'ingestion",
+    "xpack.dataVisualizer.file.importProgress.creatingDataViewDescription": "Création d'une vue de données",
+    "xpack.dataVisualizer.file.importProgress.creatingDataViewTitle": "Création d'une vue de données",
     "xpack.dataVisualizer.file.importProgress.creatingIndexTitle": "Création d'un index",
     "xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle": "Création d'un pipeline d'ingestion",
     "xpack.dataVisualizer.file.importProgress.dataUploadedTitle": "Données chargées",
+    "xpack.dataVisualizer.file.importProgress.dataViewCreatedTitle": "Vue de donnée créée",
     "xpack.dataVisualizer.file.importProgress.fileProcessedTitle": "Fichier traité",
     "xpack.dataVisualizer.file.importProgress.indexCreatedTitle": "Index créé",
     "xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle": "Pipeline d'ingestion créé",
@@ -8414,6 +10363,7 @@
     "xpack.dataVisualizer.file.importProgress.uploadingDataTitle": "Chargement des données",
     "xpack.dataVisualizer.file.importSettings.advancedTabName": "Avancé",
     "xpack.dataVisualizer.file.importSettings.simpleTabName": "Simple",
+    "xpack.dataVisualizer.file.importSummary.dataViewTitle": "Vue de données",
     "xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedDescription": "Impossible d'importer {importFailuresLength} document(s) sur {docCount}. Cela peut être dû au manque de correspondance entre les lignes et le modèle Grok.",
     "xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedTitle": "Impossible d'importer certains documents",
     "xpack.dataVisualizer.file.importSummary.documentsIngestedTitle": "Documents ingérés",
@@ -8422,15 +10372,18 @@
     "xpack.dataVisualizer.file.importSummary.importCompleteTitle": "Importation terminée",
     "xpack.dataVisualizer.file.importSummary.indexTitle": "Index",
     "xpack.dataVisualizer.file.importSummary.ingestPipelineTitle": "Pipeline d'ingestion",
+    "xpack.dataVisualizer.file.importView.dataViewNameAlreadyExistsErrorMessage": "Le nom de la vue de données existe déjà",
     "xpack.dataVisualizer.file.importView.importButtonLabel": "Importer",
     "xpack.dataVisualizer.file.importView.importDataTitle": "Importer des données",
     "xpack.dataVisualizer.file.importView.importPermissionError": "Vous ne disposez pas d'autorisation pour créer ou importer des données dans l'index {index}.",
     "xpack.dataVisualizer.file.importView.indexNameAlreadyExistsErrorMessage": "Le nom de l'index existe déjà",
     "xpack.dataVisualizer.file.importView.indexNameContainsIllegalCharactersErrorMessage": "Le nom de l'index comporte des caractères non autorisés",
+    "xpack.dataVisualizer.file.importView.indexPatternDoesNotMatchDataViewErrorMessage": "La vue de données ne correspond pas au nom de l'index",
     "xpack.dataVisualizer.file.importView.parseMappingsError": "Erreur lors de l'analyse des mappings :",
     "xpack.dataVisualizer.file.importView.parsePipelineError": "Erreur lors de l'analyse du pipeline d'ingestion :",
     "xpack.dataVisualizer.file.importView.parseSettingsError": "Erreur lors de l'analyse des paramètres :",
     "xpack.dataVisualizer.file.importView.resetButtonLabel": "Réinitialiser",
+    "xpack.dataVisualizer.file.resultsLinks.dataViewManagementTitle": "Gestion de la vue de données",
     "xpack.dataVisualizer.file.resultsLinks.fileBeatConfig": "Créer une configuration de Filebeat",
     "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomText": "Où {password} est le mot de passe de l'utilisateur {user}, et {esUrl} est l'URL d'Elasticsearch.",
     "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomTextNoUsername": "Où {esUrl} est l'URL d'Elasticsearch.",
@@ -8442,6 +10395,7 @@
     "xpack.dataVisualizer.file.resultsView.analysisExplanationButtonLabel": "Explication de l'analyse",
     "xpack.dataVisualizer.file.resultsView.fileStatsName": "Statistiques du fichier",
     "xpack.dataVisualizer.file.resultsView.overrideSettingsButtonLabel": "Remplacer les paramètres",
+    "xpack.dataVisualizer.file.simpleImportSettings.createDataViewLabel": "Créer une vue de données",
     "xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel": "Nom d'index, champ requis",
     "xpack.dataVisualizer.file.simpleImportSettings.indexNameFormRowLabel": "Nom de l'index",
     "xpack.dataVisualizer.file.simpleImportSettings.indexNamePlaceholder": "nom de l'index",
@@ -8456,18 +10410,43 @@
     "xpack.dataVisualizer.fileBeatConfig.paths": "ajouter ici un chemin vers vos fichiers",
     "xpack.dataVisualizer.fileBeatConfigFlyout.closeButton": "Fermer",
     "xpack.dataVisualizer.fileBeatConfigFlyout.copyButton": "Copier dans le presse-papiers",
-    "xpack.dataVisualizer.index.actionsPanel.discoverAppTitle": "Discover",
+    "xpack.dataVisualizer.fullTimeRangeSelector.useFullDataExcludingFrozenButtonTooltip": "Utilisez toute la plage de données à l'exception du niveau de données frozen.",
+    "xpack.dataVisualizer.fullTimeRangeSelector.useFullDataIncludingFrozenButtonTooltip": "Utilisez toute la plage de données, y compris le niveau de données frozen, qui peut inclure des résultats de recherche plus lents.",
+    "xpack.dataVisualizer.index.actionsPanel.discoverAppTitle": "Découverte",
     "xpack.dataVisualizer.index.actionsPanel.exploreTitle": "Explorer vos données",
     "xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription": "Explorez les documents de votre index.",
+    "xpack.dataVisualizer.index.components.grid.description": "Visualiser les données",
+    "xpack.dataVisualizer.index.components.grid.displayName": "Grille du visualiseur de données",
     "xpack.dataVisualizer.index.dataGrid.actionsColumnLabel": "Actions",
-    "xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldDescription": "Supprimer le champ du modèle d'indexation",
+    "xpack.dataVisualizer.index.dataGrid.deleteDataViewFieldTitle": "Supprimer le champ de la vue de données",
+    "xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldDescription": "Supprimer le champ de la vue de données",
+    "xpack.dataVisualizer.index.dataGrid.editDataViewFieldDescription": "Modifier le champ de la vue de données",
+    "xpack.dataVisualizer.index.dataGrid.editDataViewFieldTitle": "Modifier le champ de la vue de données",
     "xpack.dataVisualizer.index.dataGrid.exploreInLensDescription": "Explorer dans Lens",
     "xpack.dataVisualizer.index.dataGrid.exploreInLensTitle": "Explorer dans Lens",
+    "xpack.dataVisualizer.index.dataGrid.exploreInMapsDescription": "Explorer dans Maps",
+    "xpack.dataVisualizer.index.dataGrid.exploreInMapsTitle": "Explorer dans Maps",
     "xpack.dataVisualizer.index.dataLoader.internalServerErrorMessage": "Erreur lors du chargement des données dans l'index {index}. {message}. La requête a peut-être expiré. Essayez d'utiliser un échantillon d'une taille inférieure ou de réduire la plage temporelle.",
+    "xpack.dataVisualizer.index.dataViewErrorMessage": "Erreur lors de la recherche de la vue de données",
+    "xpack.dataVisualizer.index.dataViewManagement.actionsPopoverLabel": "Paramètres Vue de données",
+    "xpack.dataVisualizer.index.dataViewManagement.addFieldButton": "Ajouter un champ à la vue de données",
+    "xpack.dataVisualizer.index.dataViewManagement.manageFieldButton": "Gérer les champs de la vue de données",
+    "xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationDescription": "La détection des anomalies ne s'exécute que sur des index temporels",
+    "xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationTitle": "La vue de données {dataViewTitle} n'est pas basée sur une série temporelle",
+    "xpack.dataVisualizer.index.embeddableErrorDescription": "Une erreur s'est produite lors du chargement de l'incorporable. Veuillez vérifier si toutes les entrées requises sont valides.",
+    "xpack.dataVisualizer.index.embeddableErrorTitle": "Erreur lors du chargement de l'incorporable",
+    "xpack.dataVisualizer.index.embeddableNoResultsMessage": "Résultat introuvable",
+    "xpack.dataVisualizer.index.errorFetchingFieldStatisticsMessage": "Erreur lors de la récupération des statistiques de champ",
     "xpack.dataVisualizer.index.errorLoadingDataMessage": "Erreur lors du chargement des données dans l'index {index}. {message}.",
     "xpack.dataVisualizer.index.fieldNameSelect": "Nom du champ",
+    "xpack.dataVisualizer.index.fieldStatisticsErrorMessage": "Erreur lors de l'obtention de statistiques pour le champ {fieldName}, car {reason}",
     "xpack.dataVisualizer.index.fieldTypeSelect": "Type du champ",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification": "Une erreur s'est produite lors de la définition de la plage temporelle.",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.moreOptionsButtonAriaLabel": "Plus d'options",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.noResults": "Aucun résultat ne correspond à vos critères de recherche.",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataButtonLabel": "Utiliser toutes les données",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataExcludingFrozenMenuLabel": "Exclure le niveau de données frozen",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataIncludingFrozenMenuLabel": "Inclure le niveau de données frozen",
     "xpack.dataVisualizer.index.lensChart.averageOfLabel": "Moyenne de {fieldName}",
     "xpack.dataVisualizer.index.lensChart.chartTitle": "Lens pour {fieldName}",
     "xpack.dataVisualizer.index.lensChart.countLabel": "Compte",
@@ -8478,6 +10457,7 @@
     "xpack.dataVisualizer.removeCombinedFieldsLabel": "Retirer le champ combiné",
     "xpack.dataVisualizer.searchPanel.allFieldsLabel": "Tous les champs",
     "xpack.dataVisualizer.searchPanel.allOptionLabel": "Tout rechercher",
+    "xpack.dataVisualizer.searchPanel.invalidSyntax": "Syntaxe non valide",
     "xpack.dataVisualizer.searchPanel.numberFieldsLabel": "Champs de numéros",
     "xpack.dataVisualizer.searchPanel.ofFieldsTotal": "sur un total de {totalCount}",
     "xpack.dataVisualizer.searchPanel.queryBarPlaceholder": "La sélection d'une taille d'échantillon plus petite réduira les temps d'exécution de la requête et la charge sur le cluster.",
@@ -8486,7 +10466,7 @@
     "xpack.dataVisualizer.searchPanel.sampleSizeOptionLabel": "Taille de l'échantillon (par partition) : {wrappedValue}",
     "xpack.dataVisualizer.searchPanel.showEmptyFields": "Afficher les champs vides",
     "xpack.dataVisualizer.searchPanel.totalDocCountLabel": "Total des documents : {strongTotalCount}",
-    "xpack.dataVisualizer.searchPanel.totalDocCountNumber": "{totalCount, plural, one {#} other {#}}",
+    "xpack.dataVisualizer.searchPanel.totalDocCountNumber": "{totalCount, plural, other {#}}",
     "xpack.dataVisualizer.title": "Charger un fichier",
     "xpack.discover.FlyoutCreateDrilldownAction.displayName": "Explorer les données sous-jacentes",
     "xpack.embeddableEnhanced.actions.panelNotifications.manyDrilldowns": "Le panneau comporte {count} recherches",
@@ -8500,23 +10480,31 @@
     "xpack.enterpriseSearch.actions.manageButtonLabel": "Gérer",
     "xpack.enterpriseSearch.actions.resetDefaultButtonLabel": "Réinitialiser aux valeurs par défaut",
     "xpack.enterpriseSearch.actions.saveButtonLabel": "Enregistrer",
+    "xpack.enterpriseSearch.actions.startButtonLabel": "Début",
     "xpack.enterpriseSearch.actions.updateButtonLabel": "Mettre à jour",
+    "xpack.enterpriseSearch.actions.viewButtonLabel": "Afficher",
     "xpack.enterpriseSearch.actionsHeader": "Actions",
     "xpack.enterpriseSearch.appSearch.actions.restoreDefaultsButonLabel": "Restaurer les valeurs par défaut",
     "xpack.enterpriseSearch.appSearch.adminRoleTypeDescription": "Les administrateurs peuvent tout faire, sauf gérer les paramètres de comptes.",
     "xpack.enterpriseSearch.appSearch.allEnginesDescription": "L'attribution à tous les moteurs comprend tous les moteurs actuels et futurs tels qu'ils ont été créés ou seront créés et administrés à une date ultérieure.",
     "xpack.enterpriseSearch.appSearch.allEnginesLabel": "Attribuer à tous les moteurs",
     "xpack.enterpriseSearch.appSearch.analystRoleTypeDescription": "Les analystes peuvent uniquement afficher des documents, Query Tester et les analyses.",
+    "xpack.enterpriseSearch.appSearch.audit.title": "Audit",
     "xpack.enterpriseSearch.appSearch.crawler.action.deleteDomain.confirmationPopupMessage": "Voulez-vous vraiment supprimer le domaine \"{domainUrl}\" et tous ses paramètres ?",
     "xpack.enterpriseSearch.appSearch.crawler.action.deleteDomain.successMessage": "Le domaine \"{domainUrl}\" a été supprimé",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainFlyout.description": "Vous pouvez ajouter plusieurs domaines au robot d'indexation de ce moteur. Ajoutez un autre domaine ici et modifiez les points d'entrée et les règles d'indexation à partir de la page \"Gérer\".",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainFlyout.openButtonLabel": "Ajouter un domaine",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainFlyout.title": "Ajouter un nouveau domaine",
+    "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.contentVerificationFailureMessage": "Impossible de vérifier le contenu, car le contrôle des \"Restrictions d'indexation\" a échoué.",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.contentVerificationLabel": "Vérification de contenu",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.entryPointLabel": "Le point d'entrée du robot d'indexation a été défini sur {entryPointValue}",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.errorsTitle": "Un problème est survenu. Veuillez corriger les erreurs et réessayer.",
+    "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.ignoreValidationDescription": "Le robot d'indexation ne pourra pas indexer le contenu de ce domaine tant que les erreurs ci-dessus n'auront pas été corrigées.",
+    "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.ignoreValidationTitle": "Ignorer les échecs de validation et continuer",
+    "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.indexingRestrictionsFailureMessage": "Impossible de déterminer les restrictions d'indexation, car le contrôle de la \"Connectivité réseau\" a échoué.",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.indexingRestrictionsLabel": "Restrictions d'indexation",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.initialVaidationLabel": "Validation initiale",
+    "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.networkConnectivityFailureMessage": "Impossible d'établir une connexion réseau, car le contrôle de la \"Validation initiale\" a échoué.",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.networkConnectivityLabel": "Connectivité réseau",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.submitButtonLabel": "Ajouter un domaine",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainForm.testUrlButtonLabel": "Tester l'URL dans le navigateur",
@@ -8533,7 +10521,40 @@
     "xpack.enterpriseSearch.appSearch.crawler.automaticCrawlSchedule.scheduleUnitsLabel": "Planifier des unités de temps",
     "xpack.enterpriseSearch.appSearch.crawler.automaticCrawlScheduler.disableCrawlSchedule.successMessage": "L'indexation automatique a été désactivée.",
     "xpack.enterpriseSearch.appSearch.crawler.automaticCrawlScheduler.submitCrawlSchedule.successMessage": "Votre planification d'indexation automatique a été mise à jour.",
+    "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlCountOnDomains": "{crawlType} indexation sur {domainCount, plural, one {# domaine} other {# domaines}}",
+    "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlDepthLabel": "Profondeur maximale de l'indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlTypeLabel": "Type d'indexation",
     "xpack.enterpriseSearch.appSearch.crawler.configurationDocumentationLinkDescription": "En savoir plus sur la configuration des logs des robots d'indexation dans Kibana",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.customEntryPointUrlsTextboxLabel": "URL de points d'entrée personnalisés",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.customSitemapUrlsTextboxLabel": "URL des plans de site personnalisés",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.domainsAccordionButtonLabel": "Ajouter des domaines à votre indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.emptyDomainsMessage": "Veuillez sélectionner un domaine.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.entryPointsTabLabel": "Points d'entrée",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.flyoutHeaderDescription": "Configurer une indexation unique avec des paramètres personnalisés.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.flyoutHeadTitle": "Configuration personnalisée de l'indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.includeSitemapsCheckboxLabel": "Inclure les plans de site découverts dans {robotsDotTxt}",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.maxCrawlDepthFieldDescription": "Définir une profondeur d'exploration maximale pour indiquer le nombre de pages que le robot d'exploration doit parcourir. Définir la valeur sur un (1) pour limiter l'indexation aux seuls points d'entrée.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.maxCrawlDepthFieldLabel": "Profondeur maximale de l'indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.seedUrlsAccordionButtonLabel": "URL de base",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.selectedDescriptor": "sélectionné",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.sitemapsTabLabel": "Plans de site",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.startCrawlButtonLabel": "Appliquer et indexer maintenant",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.previewTabLabel": "Aperçu",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.rawJSONTabLabel": "Raw JSON",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.title": "Détails de la requête d'indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsPreview.domainsTitle": "Domaines",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsPreview.seedUrlsTitle": "URL de base",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsPreview.sitemapUrlsTitle": "URL des plans de site",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.avgResponseTimeLabel": "Réponse moy.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.clientErrorsLabel": "Erreurs 4xx",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.durationTooltipTitle": "Durée",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.logsDisabledMessage": "Activer les journaux du robot d'indexation dans les paramètres pour obtenir des statistiques d'indexation plus détaillées.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.pagesTooltip": "URL visitées et extraites pendant l'indexation.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.pagesTooltipTitle": "Pages visitées",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.pagesVisitedTooltipTitle": "Pages",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.serverErrorsLabel": "Erreurs 5xx",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.urlsTooltip": "URL trouvées par le robot pendant l'indexation, y compris celles qui ne sont pas suivies en raison de la configuration de l'indexation.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsSummary.urlsTooltipTitle": "URL vues",
     "xpack.enterpriseSearch.appSearch.crawler.crawlerStatusBanner.changesCalloutTitle": "Les modifications que vous effectuez maintenant ne prendront effet qu'au début de votre prochaine indexation.",
     "xpack.enterpriseSearch.appSearch.crawler.crawlerStatusIndicator.cancelCrawlMenuItemLabel": "Annuler l'indexation",
     "xpack.enterpriseSearch.appSearch.crawler.crawlerStatusIndicator.crawlingButtonLabel": "Indexation en cours…",
@@ -8554,7 +10575,9 @@
     "xpack.enterpriseSearch.appSearch.crawler.crawlerStatusOptions.suspended": "Suspendu",
     "xpack.enterpriseSearch.appSearch.crawler.crawlerStatusOptions.suspending": "Suspension",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsDescription": "Les recherches d'indexations récentes sont consignées ici. Vous pouvez utiliser l'ID de requête de chaque indexation pour suivre la progression et examiner les événements d'indexation dans les interfaces utilisateur Logs ou Discover de Kibana.",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsTable.column.crawlType": "Type d'indexation",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsTable.column.created": "Créé",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsTable.column.domains": "Domaines",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsTable.column.domainURL": "ID de requête",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsTable.column.status": "Statut",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRequestsTable.emptyPrompt.body": "Vous n'avez encore démarré aucune indexation.",
@@ -8571,9 +10594,17 @@
     "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.description": "Créez une règle d'indexation pour inclure ou exclure les pages dont l'URL correspond à la règle. Les règles sont exécutées dans l'ordre séquentiel, et chaque URL est évaluée en fonction de la première correspondance. {link}",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.descriptionLinkText": "En savoir plus sur les règles d'indexation",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.pathPatternTableHead": "Modèle de chemin",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.pathPatternTooltip": "Le modèle de chemin est une chaîne littérale, à l'exception du caractère astérisque (*), qui est un métacaractère pouvant correspondre à n'importe quel élément.",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.policyTableHead": "Politique",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.regexPathPatternTooltip": "Le modèle de chemin est une expression régulière compatible avec le moteur d'expression régulière du langage Ruby.",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.ruleTableHead": "Règle",
     "xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.title": "Règles d'indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlSelectDomainsModal.modalHeaderTitle": "Indexation de domaines sélectionnés",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlSelectDomainsModal.selectedDescriptor": "sélectionné",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlSelectDomainsModal.startCrawlButtonLabel": "Appliquer et indexer maintenant",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlTypeOptions.full": "Pleine",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlTypeOptions.partial": "Partielle",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlTypeOptions.reAppliedCrawlRules": "Règles d'indexation réappliquées",
     "xpack.enterpriseSearch.appSearch.crawler.deduplicationPanel.allFieldsLabel": "Tous les champs",
     "xpack.enterpriseSearch.appSearch.crawler.deduplicationPanel.description": "Le robot d'indexation n'indexe que les pages uniques. Choisissez les champs que le robot d'indexation doit utiliser lorsqu'il recherche les pages en double. Désélectionnez tous les champs de schéma pour autoriser les documents en double dans ce domaine. {documentationLink}.",
     "xpack.enterpriseSearch.appSearch.crawler.deduplicationPanel.learnMoreMessage": "En savoir plus sur le hachage de contenu",
@@ -8610,12 +10641,19 @@
     "xpack.enterpriseSearch.appSearch.crawler.manageCrawlsPopover.manageCrawlsButtonLabel": "Gérer les indexations",
     "xpack.enterpriseSearch.appSearch.crawler.manageCrawlsPopover.reApplyCrawlRules.successMessage": "Les règles d'indexation sont en train d'être réappliquées dans l'arrière-plan",
     "xpack.enterpriseSearch.appSearch.crawler.manageCrawlsPopover.reApplyCrawlRulesButtonLabel": "Réappliquer les règles d'indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.simplifiedSelectable.deselectAllButtonLabel": "Tout désélectionner",
+    "xpack.enterpriseSearch.appSearch.crawler.simplifiedSelectable.selectAllButtonLabel": "Tout sélectionner",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.addButtonLabel": "Ajouter un plan du site",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.deleteSuccessToastMessage": "Le plan du site a été supprimé.",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.description": "Spécifiez les URL du plan du site pour le robot d'indexation dans ce domaine.",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.emptyMessageTitle": "Il n'existe aucun plan de site.",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.title": "Plans de site",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.urlTableHead": "URL",
+    "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlAllDomainsMenuLabel": "Indexation de tous les domaines sur ce moteur",
+    "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlCustomSettingsMenuLabel": "Indexation avec des paramètres personnalisés",
+    "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlSelectDomainsMenuLabel": "Indexation de domaines sélectionnés",
+    "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.startACrawlButtonLabel": "Démarrer une indexation",
+    "xpack.enterpriseSearch.appSearch.crawler.urlComboBox.invalidUrlErrorMessage": "Veuillez entrer une URL valide",
     "xpack.enterpriseSearch.appSearch.credentials.apiEndpoint": "Point de terminaison",
     "xpack.enterpriseSearch.appSearch.credentials.apiKeys": "Clés d'API",
     "xpack.enterpriseSearch.appSearch.credentials.copied": "Copié",
@@ -8657,11 +10695,51 @@
     "xpack.enterpriseSearch.appSearch.credentials.title": "Informations d'identification",
     "xpack.enterpriseSearch.appSearch.credentials.updateWarning": "Les clés d'API existantes peuvent être partagées entre les utilisateurs. La modification des autorisations relatives à cette clé affectera tous les utilisateurs disposant d'un accès à cette clé.",
     "xpack.enterpriseSearch.appSearch.credentials.updateWarningTitle": "Continuez avec prudence !",
+    "xpack.enterpriseSearch.appSearch.curations.ignoredSuggestions.allowButtonDescription": "Activer les suggestions pour cette requête",
+    "xpack.enterpriseSearch.appSearch.curations.ignoredSuggestions.allowButtonLabel": "Autoriser",
+    "xpack.enterpriseSearch.appSearch.curations.ignoredSuggestionsPanel.allowQuerySuccessMessage": "Vous serez informé des futures suggestions pour cette requête",
+    "xpack.enterpriseSearch.appSearch.curations.ignoredSuggestionsPanel.description": "Vous ne serez pas informé des suggestions pour ces requêtes",
+    "xpack.enterpriseSearch.appSearch.curations.ignoredSuggestionsPanel.queryColumnName": "Recherche",
+    "xpack.enterpriseSearch.appSearch.curations.ignoredSuggestionsPanel.title": "Requêtes ignorées",
+    "xpack.enterpriseSearch.appSearch.curations.settings.acceptNewSuggesstionsSwitchLabel": "Accepter automatiquement les nouvelles suggestions",
+    "xpack.enterpriseSearch.appSearch.curations.settings.analyticsDisabledCalloutDescription": "La pertinence adaptative exige que l'analytique soit activée sur votre compte.",
+    "xpack.enterpriseSearch.appSearch.curations.settings.analyticsDisabledCalloutTitle": "L'analytique est désactivée",
+    "xpack.enterpriseSearch.appSearch.curations.settings.automaticCurationsDescription": "App Search effectuera le monitoring de l'analytique de votre moteur et suggérera des modifications à vos curations pour vous aider à fournir les résultats les plus pertinents. Chaque suggestion peut être acceptée, rejetée ou modifiée.",
+    "xpack.enterpriseSearch.appSearch.curations.settings.automaticCurationsTitle": "Des curations alimentées par la pertinence adaptative",
+    "xpack.enterpriseSearch.appSearch.curations.settings.enableautomaticCurationsSwitchLabel": "Activer les suggestions",
+    "xpack.enterpriseSearch.appSearch.curations.settings.licenseUpgradeCTASubtitle": "Mettez à niveau vers un abonnement {platinumLicenseName} pour exploiter la puissance du Machine Learning. En analysant l'analytique de votre moteur, App Search est en mesure de suggérer des curations nouvelles ou mises à jour. Aidez facilement vos utilisateurs à trouver exactement ce qu'ils recherchent. Démarrez une version d'essai gratuite.",
+    "xpack.enterpriseSearch.appSearch.curations.settings.licenseUpgradeCTATitle": "Introduction de curations alimentées par la pertinence adaptative",
+    "xpack.enterpriseSearch.appSearch.curations.settings.manageAnalyticsButtonLabel": "Gérer l'analytique",
+    "xpack.enterpriseSearch.appSearch.curations.settings.platinum": "Platinum",
     "xpack.enterpriseSearch.appSearch.DEV_ROLE_TYPE_DESCRIPTION": "Les développeurs peuvent gérer tous les aspects d'un moteur.",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.description": "L'{documentsApiLink} peut être utilisée pour ajouter de nouveaux documents à votre moteur, mettre à jour des documents, récupérer des documents par ID et supprimer des documents. Il existe un grand nombre de {clientLibrariesLink} pour vous aider à démarrer.",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.example": "Pour voir l'API en action, vous pouvez tester l'exemple de requête ci-dessous à l'aide d'une ligne de commande ou d'une bibliothèque client.",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.title": "Indexation par API",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.apiDescription": "POST vers le point de terminaison des documents",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.apiTitle": "Index de l'API",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.crawlDescription": "Indexation automatique des documents à partir d'une URL",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.crawlTitle": "Utiliser le robot d'indexation",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateFooterLink": "Lire la documentation",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateFooterText": "Vous voulez en savoir plus sur l'indexation des documents ?",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateIllustrationAltText": "Illustration",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateTitle": "Ajouter des documents",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonDescription": "Ajoutez des documents en collant ou en téléchargeant Raw JSON",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonTitle": "Coller ou charger JSON",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.button": "Connecter pour indexer",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.description": "Vous pouvez désormais vous connecter directement à un index Elasticsearch existant pour rendre ses données interrogeables et ajustables par le biais d'interfaces utilisateur Enterprise Search. {learnMoreLink}",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.docCount": "Nombre de documents :",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.indexSelectorAriaLabel": "Sélectionner un index Elasticsearch",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.link": "En savoir plus sur l'utilisation d'un index existant",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.selectable.empty": "Aucun index Elasticsearch disponible",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.selectable.loading": "Chargement des index Elasticsearch",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.status": "Statut :",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.storage": "Taille du stockage :",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.title": "Connecter un index Elasticsearch",
     "xpack.enterpriseSearch.appSearch.documentCreation.errorsTitle": "Un problème est survenu. Veuillez corriger les erreurs et réessayer.",
+    "xpack.enterpriseSearch.appSearch.documentCreation.helperText": "Il existe trois façons d'envoyer des documents à votre moteur pour l'indexation. Vous pouvez coller ou télécharger un fichier JSON, envoyer un message POST au point de terminaison de l'API des documents, ou utiliser le robot d'indexation d'Elastic pour indexer automatiquement les documents à partir d'une URL.",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.pasteTabName": "Coller",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.title": "Coller ou charger JSON",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.uploadTabName": "Charger",
     "xpack.enterpriseSearch.appSearch.documentCreation.largeFile": "Vous êtes en train de charger un fichier extrêmement volumineux. Cette opération risque de bloquer votre navigateur ou de prendre beaucoup de temps à traiter. Si possible, essayez de diviser vos données en plusieurs fichiers plus petits.",
     "xpack.enterpriseSearch.appSearch.documentCreation.noFileFound": "Aucun fichier trouvé.",
     "xpack.enterpriseSearch.appSearch.documentCreation.notValidJson": "Le contenu du document doit être un objet ou un tableau JSON valide.",
@@ -8685,6 +10763,8 @@
     "xpack.enterpriseSearch.appSearch.documentDetail.fieldHeader": "Champ",
     "xpack.enterpriseSearch.appSearch.documentDetail.title": "Document : {documentId}",
     "xpack.enterpriseSearch.appSearch.documentDetail.valueHeader": "Valeur",
+    "xpack.enterpriseSearch.appSearch.documents.elasticsearchEngineCallout": "Le moteur est attaché à {elasticsearchIndexName}. Vous pouvez modifier les données de cet index dans Kibana.",
+    "xpack.enterpriseSearch.appSearch.documents.elasticsearchEngineCallout.title": "Les données de ce moteur sont gérées par Elasticsearch.",
     "xpack.enterpriseSearch.appSearch.documents.empty.description": "Vous pouvez indexer des documents à l'aide du robot d'indexation App Search en chargeant le JSON ou en utilisant l'API.",
     "xpack.enterpriseSearch.appSearch.documents.empty.title": "Ajouter vos premiers documents",
     "xpack.enterpriseSearch.appSearch.documents.indexDocuments": "Indexer les documents",
@@ -8711,8 +10791,14 @@
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.ariaLabel": "Trier les résultats par",
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.ascendingDropDownOptionLabel": "{fieldName} (croiss.)",
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.descendingDropDownOptionLabel": "{fieldName} (décroiss.)",
+    "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.documentId": "ID de document",
+    "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.relevance": "Pertinence",
     "xpack.enterpriseSearch.appSearch.documents.title": "Documents",
     "xpack.enterpriseSearch.appSearch.editorRoleTypeDescription": "Les éditeurs peuvent gérer les paramètres de recherche.",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateButton": "Gestion des index",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateIllustrationAltText": "Illustration",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateTitle": "Ajouter des documents à votre index",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.helperText": "Votre index Elasticsearch, {elasticsearchIndexName}, n'a pas encore de documents. Ouvrez la gestion des index dans Kibana pour apporter des modifications à vos index Elasticsearch.",
     "xpack.enterpriseSearch.appSearch.emptyState.createFirstEngineCta": "Créer un moteur",
     "xpack.enterpriseSearch.appSearch.emptyState.description1": "Un moteur App Search stocke les documents pour votre expérience de recherche.",
     "xpack.enterpriseSearch.appSearch.emptyState.nonAdmin.description": "Contactez votre administrateur App Search pour créer un accès ou vous donner accès à un moteur.",
@@ -8785,12 +10871,25 @@
     "xpack.enterpriseSearch.appSearch.engine.apiLogs.title": "Logs d'API",
     "xpack.enterpriseSearch.appSearch.engine.apiLogs.userAgentTitle": "Agent utilisateur",
     "xpack.enterpriseSearch.appSearch.engine.crawler.title": "Robot d'indexation",
+    "xpack.enterpriseSearch.appSearch.engine.curation.automatedLabel": "Automatisé",
+    "xpack.enterpriseSearch.appSearch.engine.curation.convertToManualCurationButtonLabel": "Convertir à la curation manuelle",
+    "xpack.enterpriseSearch.appSearch.engine.curation.detail.historyButtonLabel": "Historique",
+    "xpack.enterpriseSearch.appSearch.engine.curation.detail.historyTableDescription": "Un log détaillé des modifications récentes des curations alimentées par la pertinence adaptative.",
+    "xpack.enterpriseSearch.appSearch.engine.curation.detail.historyTableTitle": "Changements de pertinence adaptative",
+    "xpack.enterpriseSearch.appSearch.engine.curation.suggestedDocumentsCallout.description": "Sur la base de l'analytique de votre moteur, de nouvelles promotions de documents suggérées sont prêtes à être révisées.",
+    "xpack.enterpriseSearch.appSearch.engine.curation.suggestedDocumentsCallout.title": "Nouveaux documents suggérés pour cette requête",
+    "xpack.enterpriseSearch.appSearch.engine.curations.actionsPopoverAriaLabel": "Autres actions de suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.activeQueryHelpText": "Sélectionnez une requête pour afficher les résultats de recherche organique qui la concernent",
     "xpack.enterpriseSearch.appSearch.engine.curations.activeQueryLabel": "Recherche active",
     "xpack.enterpriseSearch.appSearch.engine.curations.addQueryButtonLabel": "Ajouter une recherche",
     "xpack.enterpriseSearch.appSearch.engine.curations.addResult.buttonLabel": "Ajouter le résultat manuellement",
     "xpack.enterpriseSearch.appSearch.engine.curations.addResult.searchEmptyDescription": "Impossible de trouver un contenu correspondant.",
     "xpack.enterpriseSearch.appSearch.engine.curations.addResult.searchPlaceholder": "Documents du moteur de recherche",
     "xpack.enterpriseSearch.appSearch.engine.curations.addResult.title": "Ajouter le résultat à la curation",
+    "xpack.enterpriseSearch.appSearch.engine.curations.automatedCurationsHistoryPanel.queryColumnHeader": "Recherche",
+    "xpack.enterpriseSearch.appSearch.engine.curations.automatedCurationsHistoryPanel.tableDecription": "Un log détaillé des modifications récentes des curations alimentées par la pertinence adaptative.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.automatedCurationsHistoryPanel.tableTitle": "Changements de pertinence adaptative",
+    "xpack.enterpriseSearch.appSearch.engine.curations.convertToManualCurationConfirmation": "Êtes-vous sûr de vouloir convertir cela en curation manuelle ?",
     "xpack.enterpriseSearch.appSearch.engine.curations.create.curationQueriesDescription": "Ajoutez une ou plusieurs recherches à préparer. Vous pourrez ajouter ou supprimer des requêtes supplémentaires ultérieurement.",
     "xpack.enterpriseSearch.appSearch.engine.curations.create.curationQueriesTitle": "Recherches de curation",
     "xpack.enterpriseSearch.appSearch.engine.curations.create.title": "Créer une curation",
@@ -8802,29 +10901,75 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.empty.noCurationsTitle": "Créez votre première curation",
     "xpack.enterpriseSearch.appSearch.engine.curations.hiddenDocuments.emptyDescription": "Masquez les documents en cliquant sur l'icône de l'œil dans les résultats organiques ci-dessus, ou recherchez et masquez un résultat manuellement.",
     "xpack.enterpriseSearch.appSearch.engine.curations.hiddenDocuments.emptyTitle": "Vous n'avez encore masqué aucun document",
-    "xpack.enterpriseSearch.appSearch.engine.curations.hiddenDocuments.removeAllButtonLabel": "Tout restaurer",
-    "xpack.enterpriseSearch.appSearch.engine.curations.hiddenDocuments.title": "Documents masqués",
+    "xpack.enterpriseSearch.appSearch.engine.curations.hiddenDocuments.removeAllButtonLabel": "Tout démasquer",
+    "xpack.enterpriseSearch.appSearch.engine.curations.hiddenDocuments.title": "Résultats cachés",
     "xpack.enterpriseSearch.appSearch.engine.curations.hideButtonLabel": "Masquer ce résultat",
+    "xpack.enterpriseSearch.appSearch.engine.curations.historyPageTabLabel": "Historique",
     "xpack.enterpriseSearch.appSearch.engine.curations.manage.title": "Gérer la curation",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryButtonLabel": "Gérer les requêtes",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryDescription": "Modifiez, ajoutez ou supprimez des requêtes pour cette curation.",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryTitle": "Gérer les requêtes",
+    "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.description": "Aucun résultat organique à afficher.{manualDescription}",
+    "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.manualDescription": "Ajoutez ou modifiez la requête active ci-dessus.",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.title": "Principaux documents organiques pour \"{currentQuery}\"",
     "xpack.enterpriseSearch.appSearch.engine.curations.overview.title": "Résultats pertinents",
+    "xpack.enterpriseSearch.appSearch.engine.curations.overviewPageTabLabel": "Aperçu",
     "xpack.enterpriseSearch.appSearch.engine.curations.promoteButtonLabel": "Mettre en avant ce résultat",
+    "xpack.enterpriseSearch.appSearch.engine.curations.promotedDocuments.automatedEmptyDescription": "Nous n'avons pas identifié de documents à promouvoir",
     "xpack.enterpriseSearch.appSearch.engine.curations.promotedDocuments.emptyDescription": "Marquez les documents des résultats organiques ci-dessous par une étoile, ou recherchez et mettez en avant un résultat manuellement.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.promotedDocuments.managedByAppSearchDescription": "Cette curation est automatisée par App Search",
     "xpack.enterpriseSearch.appSearch.engine.curations.promotedDocuments.removeAllButtonLabel": "Tout rétrograder",
-    "xpack.enterpriseSearch.appSearch.engine.curations.promotedDocuments.title": "Documents mis en avant",
+    "xpack.enterpriseSearch.appSearch.engine.curations.promotedDocuments.title": "Résultats mis en avant",
     "xpack.enterpriseSearch.appSearch.engine.curations.queryPlaceholder": "Entrer une recherche",
+    "xpack.enterpriseSearch.appSearch.engine.curations.rejectedCurationsHistoryPanel.queryColumnHeader": "Recherche",
+    "xpack.enterpriseSearch.appSearch.engine.curations.rejectedCurationsHistoryPanel.tableDescription": "Afficher les suggestions que vous avez précédemment rejetées.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.rejectedCurationsHistoryPanel.tableTitle": "Suggestions récemment rejetées",
     "xpack.enterpriseSearch.appSearch.engine.curations.restoreConfirmation": "Voulez-vous vraiment effacer vos modifications et revenir à vos résultats par défaut ?",
     "xpack.enterpriseSearch.appSearch.engine.curations.resultActionsDescription": "Mettez les documents en avant en cliquant sur l'étoile et masquez-les en cliquant sur l'œil.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.settingsPageTabLabel": "Paramètres",
     "xpack.enterpriseSearch.appSearch.engine.curations.showButtonLabel": "Afficher ce résultat",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.acceptButtonLabel": "Accepter",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.actionsAcceptButtonLabel": "Accepter cette suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.actionsAutomateButtonLabel": "Automatiser - toujours accepter de nouvelles suggestions pour cette requête",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.actionsPopoverTitle": "Gérer la suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.actionsRejectButtonLabel": "Rejeter cette suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.actionsTurnOffButtonLabel": "Rejeter et désactiver les suggestions pour cette requête",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.breadcrumbLabel": "Suggérée : {query}",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.collapseButtonLabel": "Réduire les résultats de recherche organiques",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.currentTitle": "Actuel",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.expandButtonLabel": "Développer les résultats de recherche organiques",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.noOrganicResultsDescription": "Aucun résultat de recherche organique n'a été obtenu pour cette requête",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.noOrganicResultsTitle": "Aucun résultat",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.noResultsMessage": "Il n'y a actuellement aucun document mis en avant pour cette requête",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.notFoundError": "Impossible de trouver la suggestion ; elle a peut-être déjà été appliquée ou rejetée.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.rejectButtonLabel": "Rejeter",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.resultPanelDescription": "Cette curation peut être automatisée par App Search",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.resultPanelTitle": "Résultats mis en avant",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.successfullyAppliedMessage": "La suggestion a été appliquée avec succès.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.successfullyAutomatedMessage": "La suggestion a été appliquée avec succès et toutes les suggestions futures pour la requête \"{query}\" seront automatiquement appliquées.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.successfullyDisabledMessage": "La suggestion a été rejetée avec succès et vous ne recevrez plus de suggestions pour la requête \"{query}\".",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.successfullyRejectedMessage": "La suggestion a été rejetée avec succès.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.suggestionTitle": "Suggérée",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestedCuration.title": "Gérer la suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsCallout.hideForNowLabel": "Masquer ceci pour l'instant",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsCallout.reviewSuggestionsButtonLabel": "Réviser les suggestions",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.column.lastUpdatedTableHeader": "Dernière mise à jour",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.column.promotedDocumentsTableHeader": "Résultats mis en avant",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.column.queryTableHeader": "Recherche",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.description": "D'après votre analytique, les résultats des requêtes suivantes pourraient être améliorés en promouvant certains documents.",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.overridesLabel": "Remplacements",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.title": "{totalSuggestions} Suggestions",
+    "xpack.enterpriseSearch.appSearch.engine.curations.suggestionsTable.viewTooltip": "Afficher la suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.table.automatedLabel": "Automatisé",
     "xpack.enterpriseSearch.appSearch.engine.curations.table.column.lastUpdated": "Dernière mise à jour",
     "xpack.enterpriseSearch.appSearch.engine.curations.table.column.queries": "Recherches",
     "xpack.enterpriseSearch.appSearch.engine.curations.table.deleteTooltip": "Supprimer la curation",
     "xpack.enterpriseSearch.appSearch.engine.curations.table.editTooltip": "Modifier la curation",
+    "xpack.enterpriseSearch.appSearch.engine.curations.table.newSuggestionLabel": "Nouvelle suggestion",
+    "xpack.enterpriseSearch.appSearch.engine.curations.table.title": "Curations actives",
     "xpack.enterpriseSearch.appSearch.engine.curations.title": "Curations",
     "xpack.enterpriseSearch.appSearch.engine.documents.empty.buttonLabel": "Lire le guide de documents",
+    "xpack.enterpriseSearch.appSearch.engine.elasticsearchEngineBadge": "INDEX ELASTICSEARCH",
     "xpack.enterpriseSearch.appSearch.engine.metaEngineBadge": "MÉTAMOTEUR",
     "xpack.enterpriseSearch.appSearch.engine.notFound": "Impossible de trouver un moteur portant le nom \"{engineName}\".",
     "xpack.enterpriseSearch.appSearch.engine.overview.analyticsLink": "Afficher l'analyse",
@@ -8858,6 +11003,7 @@
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.description": "Gérer les paramètres de précision et de pertinence de votre moteur",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.disabledFields.title": "Champs désactivés",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.disabledFieldsExplanationMessage": "Inactif en raison d'un conflit de type champ",
+    "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.elasticsearch.description": "Gérer les paramètres de pertinence de votre moteur",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.buttonLabel": "Lire le guide de réglage de la pertinence",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.description": "Un schéma sera automatiquement créé à votre place après votre indexation de quelques documents.",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.title": "Ajouter des documents pour régler la pertinence",
@@ -8961,6 +11107,8 @@
     "xpack.enterpriseSearch.appSearch.engine.schema.metaEngine.title": "Schéma de métamoteur",
     "xpack.enterpriseSearch.appSearch.engine.schema.pageDescription": "Ajoutez de nouveaux champs ou modifiez le type des champs existants.",
     "xpack.enterpriseSearch.appSearch.engine.schema.pageTitle": "Gérer le schéma du moteur",
+    "xpack.enterpriseSearch.appSearch.engine.schema.readOnly.pageDescription": "Afficher les types de champs du schéma.",
+    "xpack.enterpriseSearch.appSearch.engine.schema.readOnly.pageTitle": "Schéma de moteur",
     "xpack.enterpriseSearch.appSearch.engine.schema.reindexErrorsBreadcrumb": "Réindexer les erreurs",
     "xpack.enterpriseSearch.appSearch.engine.schema.reindexJob.title": "Erreurs de modification de schéma",
     "xpack.enterpriseSearch.appSearch.engine.schema.title": "Schéma",
@@ -9000,6 +11148,8 @@
     "xpack.enterpriseSearch.appSearch.engine.souceEngines.addSourceEnginesSuccessMessage": "{sourceEnginesCount, plural, one {# moteur a été ajouté} other {# moteurs ont été ajoutés}} à ce métamoteur",
     "xpack.enterpriseSearch.appSearch.engine.souceEngines.removeSourceEngineSuccessMessage": "Le moteur \"{engineName}\" a été retiré de ce métamoteur",
     "xpack.enterpriseSearch.appSearch.engine.souceEngines.title": "Gérer les moteurs",
+    "xpack.enterpriseSearch.appSearch.engine.suggestedCurationsCallout.description": "Sur la base de l'analytique de votre moteur, de nouvelles curations suggérées sont prêtes à être révisées.",
+    "xpack.enterpriseSearch.appSearch.engine.suggestedCurationsCallout.title": "Nouvelles curations suggérées à réviser",
     "xpack.enterpriseSearch.appSearch.engine.synonyms.createSuccessMessage": "Ensemble de synonymes créé",
     "xpack.enterpriseSearch.appSearch.engine.synonyms.createSynonymSetButtonLabel": "Créer un ensemble de synonymes",
     "xpack.enterpriseSearch.appSearch.engine.synonyms.createSynonymSetTitle": "Ajouter un ensemble de synonymes",
@@ -9024,6 +11174,8 @@
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.sanitizedNameHelpText": "Votre moteur sera nommé",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.submitButton.buttonLabel": "Créer un moteur",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.title": "Nommer votre moteur",
+    "xpack.enterpriseSearch.appSearch.engineCreation.searchIndexSelectable.helpText": "Seuls les indices précédés de \"rechercher-\" peuvent être sélectionnés",
+    "xpack.enterpriseSearch.appSearch.engineCreation.searchIndexSelectable.label": "Sélectionner un index Elasticsearch à utiliser",
     "xpack.enterpriseSearch.appSearch.engineCreation.successMessage": "Le moteur \"{name}\" a été créé",
     "xpack.enterpriseSearch.appSearch.engineCreation.supportedLanguages.chineseDropDownOptionLabel": "Chinois",
     "xpack.enterpriseSearch.appSearch.engineCreation.supportedLanguages.danishDropDownOptionLabel": "Danois",
@@ -9044,6 +11196,12 @@
     "xpack.enterpriseSearch.appSearch.engineRequiredError": "Au moins un moteur attribué est requis.",
     "xpack.enterpriseSearch.appSearch.engines.apiLogs.newEventsButtonLabel": "Actualiser",
     "xpack.enterpriseSearch.appSearch.engines.apiLogs.newEventsMessage": "De nouveaux événements ont été consignés dans un log.",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.closeButton": "Fermer",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.eventTip": "Afficher les événements des dernières 24 heures",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.eventCategory": "Catégorie d'événement",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.eventType": "Type d'événement",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.outcome": "Résultat",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.updatedBy": "Mis à jour par",
     "xpack.enterpriseSearch.appSearch.engines.createEngineButtonLabel": "Créer un moteur",
     "xpack.enterpriseSearch.appSearch.engines.createMetaEngineButtonLabel": "Créer un métamoteur",
     "xpack.enterpriseSearch.appSearch.engines.metaEngines.emptyPromptButtonLabel": "En savoir plus sur les métamoteurs",
@@ -9062,8 +11220,15 @@
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.documentCount": "Nombre de documents",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.fieldCount": "Nombre de champs",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.language": "Langue",
+    "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.lastUpdated": "Dernière mise à jour",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.name": "Nom",
     "xpack.enterpriseSearch.appSearch.enginesOverview.title": "Aperçu des moteurs",
+    "xpack.enterpriseSearch.appSearch.integrations.apiDescription": "Ajouter la recherche à votre application avec les API robustes d'App Search.",
+    "xpack.enterpriseSearch.appSearch.integrations.apiName": "API",
+    "xpack.enterpriseSearch.appSearch.integrations.jsonDescription": "Recherchez dans vos données JSON avec App Search.",
+    "xpack.enterpriseSearch.appSearch.integrations.jsonName": "JSON",
+    "xpack.enterpriseSearch.appSearch.integrations.webCrawlerDescription": "Ajoutez la recherche à votre site web avec le robot d'indexation App Search.",
+    "xpack.enterpriseSearch.appSearch.integrations.webCrawlerName": "Robot d'indexation",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.description.manageSettingsDetail": "Pour gérer les analyses et le logging, {visitSettingsLink}.",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.description.manageSettingsLinkText": "accédez à vos paramètres",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.disabledSinceTitle": "{logsTitle} ont été désactivés depuis le {disabledDate}.",
@@ -9078,6 +11243,10 @@
     "xpack.enterpriseSearch.appSearch.logRetention.type.analytics.title.lowercase": "analyse",
     "xpack.enterpriseSearch.appSearch.logRetention.type.api.title.capitalized": "API",
     "xpack.enterpriseSearch.appSearch.logRetention.type.api.title.lowercase": "API",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.audit.title.capitalized": "Audit",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.audit.title.lowercase": "audit",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.crawler.title.capitalized": "Robot d'indexation",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.crawler.title.lowercase": "robot d'indexation",
     "xpack.enterpriseSearch.appSearch.metaEngineCreation.form.documentationDescription": "{documentationLink} pour en savoir plus sur la mise en route.",
     "xpack.enterpriseSearch.appSearch.metaEngineCreation.form.documentationLink": "Lire la documentation",
     "xpack.enterpriseSearch.appSearch.metaEngineCreation.form.engineName.allowedCharactersHelpText": "Les noms de métamoteurs ne peuvent contenir que des caractères minuscules, des chiffres et des tirets",
@@ -9096,11 +11265,13 @@
     "xpack.enterpriseSearch.appSearch.multiInputRows.inputRowPlaceholder": "Entrer une valeur",
     "xpack.enterpriseSearch.appSearch.multiInputRows.removeValueButtonLabel": "Retirer une valeur",
     "xpack.enterpriseSearch.appSearch.ownerRoleTypeDescription": "Les propriétaires peuvent tout faire. Le compte peut avoir plusieurs propriétaires, mais il doit toujours y avoir au moins un propriétaire.",
-    "xpack.enterpriseSearch.appSearch.productCardDescription": "Concevez et déployez une recherche puissante pour vos sites web et vos applications.",
+    "xpack.enterpriseSearch.appSearch.productCardDescription": "Concevez, déployez et gérez des expériences de recherche puissantes pour vos sites web et vos applications web/mobiles.",
     "xpack.enterpriseSearch.appSearch.productDescription": "Tirez parti des tableaux de bord, des analyses et des API pour simplifier la recherche d'applications avancée.",
     "xpack.enterpriseSearch.appSearch.productName": "App Search",
+    "xpack.enterpriseSearch.appSearch.result.clicks": "{clicks} Clics",
     "xpack.enterpriseSearch.appSearch.result.documentDetailLink": "Accéder aux détails des documents",
     "xpack.enterpriseSearch.appSearch.result.hideAdditionalFields": "Masquer les champs supplémentaires",
+    "xpack.enterpriseSearch.appSearch.result.resultPositionLabel": "#{resultPosition}",
     "xpack.enterpriseSearch.appSearch.result.showAdditionalFields": "Afficher {numberOfAdditionalFields, number} {numberOfAdditionalFields, plural, one {champ supplémentaire} other {champs supplémentaires}}",
     "xpack.enterpriseSearch.appSearch.result.title": "Document {id}",
     "xpack.enterpriseSearch.appSearch.roleMappingCreatedMessage": "Votre mapping de rôles a été créé",
@@ -9112,6 +11283,8 @@
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.title": "Vous voulez simplement essayer ?",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.analytics.label": "Consigner les événements d'analyse",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.api.label": "Consigner les événements d'API",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.audit.label": "Consigner les événements d'audit",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.crawler.label": "Logs du robot d'indexation",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.description": "La conservation des logs est déterminée par les politiques de gestion de cycle de vie des index de votre déploiement.",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.learnMore": "Découvrez plus d'informations sur la conservation des logs pour Enterprise Search.",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.analytics.description": "Lorsque vous désactivez l'écriture, les moteurs arrêtent de consigner les événements d'analyse. Vos données existantes sont supprimées en fonction du délai de stockage.",
@@ -9120,6 +11293,12 @@
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.description": "Lorsque vous désactivez l'écriture, les moteurs arrêtent de consigner les événements d'API. Vos données existantes sont supprimées en fonction du délai de stockage.",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.subheading": "Vos logs d'API sont actuellement stockés pendant {minAgeDays} jours.",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.title": "Désactiver les écritures d'API",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.description": "Lorsque vous désactivez l'écriture, les moteurs arrêtent de consigner les événements d'audit. Vos données existantes sont supprimées en fonction du délai de stockage.",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.subheading": "Vos logs d'audit sont actuellement stockés pendant {minAgeDays} jours.",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.title": "Désactiver les écritures d'audit",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.description": "Lorsque vous désactivez l'écriture, les moteurs arrêtent de consigner les événements du robot d'indexation. Vos données existantes sont supprimées en fonction du délai de stockage.",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.subheading": "Vos logs du robot d'indexation sont actuellement stockés pendant {minAgeDays} jours.",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.title": "Désactiver l'écriture du robot d'indexation",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.disable": "DÉSACTIVER",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.prompt": "Tapez \"{target}\" pour confirmer.",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.recovery": "Vous ne pouvez pas récupérer les données supprimées.",
@@ -9147,18 +11326,37 @@
     "xpack.enterpriseSearch.appSearch.tokens.search.description": "Les clés de recherche publiques sont utilisées uniquement pour les points de terminaison de recherche.",
     "xpack.enterpriseSearch.appSearch.tokens.search.name": "Clé de recherche publique",
     "xpack.enterpriseSearch.appSearch.tokens.update": "La clé d'API \"{name}\" a été mise à jour",
+    "xpack.enterpriseSearch.content.description": "Enterprise search offre un certain nombre de moyens de rendre vos données facilement interrogeables. Vous pouvez choisir entre le robot d'indexation, les indices Elasticsearch, l'API, les téléchargements directs ou les connecteurs tiers.",
+    "xpack.enterpriseSearch.content.nav.appSearchTitle": "App Search",
+    "xpack.enterpriseSearch.content.nav.contentTitle": "Contenu",
+    "xpack.enterpriseSearch.content.nav.enterpriseSearchOverviewTitle": "Aperçu",
+    "xpack.enterpriseSearch.content.nav.searchIndicesTitle": "Rechercher dans les index",
+    "xpack.enterpriseSearch.content.nav.workplaceSearchTitle": "Workplace Search",
+    "xpack.enterpriseSearch.content.navTitle": "Contenu",
+    "xpack.enterpriseSearch.content.productName": "Enterprise Search",
+    "xpack.enterpriseSearch.curations.settings.licenseUpgradeLink": "En savoir plus sur les mises à niveau incluses dans la licence",
+    "xpack.enterpriseSearch.curations.settings.start30DayTrialButtonLabel": "Démarrer un essai gratuit de 30 jours",
     "xpack.enterpriseSearch.emailLabel": "E-mail",
+    "xpack.enterpriseSearch.engineCreation.appSearchManagedDescription": "Créez un moteur et ajoutez des documents via un robot d'indexation, une API ou un fichier JSON.",
+    "xpack.enterpriseSearch.engineCreation.appSearchManagedLabel": "Je veux qu'App Search ingère et gère mes données",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLabel": "Créez un moteur basé sur les données gérées dans un index Elasticsearch.",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLink": "En savoir plus sur l'utilisation d'un index Elasticsearch existant",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchManagedLabel": "Je veux gérer mes données avec Elasticsearch",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchTechPreviewBadge": "Version d'évaluation technique",
+    "xpack.enterpriseSearch.engineCreation.engineTypeLabel": "Sélectionnez la manière dont vous souhaitez gérer l'index pour ce moteur",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.description": "Effectuez des recherches sur tout, partout. Offrez à vos équipes débordées une expérience de recherche innovante et puissante facilement mise en œuvre. Intégrez rapidement une fonction de recherche préréglée à votre site web, à votre application ou à votre lieu de travail. Effectuez des recherches simples sur tout.",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.notConfigured": "Enterprise Search n'est pas encore configuré dans votre instance Kibana.",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.videoAlt": "Premiers pas avec Enterprise Search",
-    "xpack.enterpriseSearch.errorConnectingState.description1": "Impossible d'établir une connexion à Enterprise Search avec l'URL hôte : {enterpriseSearchUrl}",
+    "xpack.enterpriseSearch.errorConnectingState.cloudErrorMessage": "Les nœuds Enterprise Search fonctionnent-ils dans votre déploiement cloud ? {deploymentSettingsLink}",
+    "xpack.enterpriseSearch.errorConnectingState.cloudErrorMessageLinkText": "Vérifier vos paramètres de déploiement",
+    "xpack.enterpriseSearch.errorConnectingState.description1": "Impossible d'établir une connexion à Enterprise Search avec l'URL hôte {enterpriseSearchUrl} en raison de l'erreur suivante :",
     "xpack.enterpriseSearch.errorConnectingState.description2": "Vérifiez que l'URL hôte est correctement configurée dans {configFile}.",
     "xpack.enterpriseSearch.errorConnectingState.description3": "Assurez-vous que le serveur d'Enterprise Search est en état de répondre.",
     "xpack.enterpriseSearch.errorConnectingState.setupGuideCta": "Consulter le guide de configuration",
     "xpack.enterpriseSearch.errorConnectingState.title": "Impossible d'établir une connexion",
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuth": "Vérifiez votre authentification utilisateur :",
-    "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthNative": "Vous devez vous authentifier à l'aide d'une authentification native d'Elasticsearch ou de SSO/SAML.",
-    "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthSAML": "Si vous utilisez SSO/SAML, votre domaine SAML doit être également configuré sur Enterprise Search.",
+    "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthNative": "Vous devez vous authentifier à l'aide d'une authentification native d'Elasticsearch, de SSO/SAML ou d'OpenID Connect.",
+    "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthSAML": "Si vous utilisez un fournisseur de SSO externe, tel que SAML ou OpenID Connect, votre domaine SAML/OIDC doit également être configuré sur Enterprise Search.",
     "xpack.enterpriseSearch.hiddenText": "Texte masqué",
     "xpack.enterpriseSearch.inlineEditableTable.newRowButtonLabel": "Nouvelle ligne",
     "xpack.enterpriseSearch.licenseCalloutBody": "L'authentification d'Enterprise via SAML, la prise en charge des autorisations de niveau document, les expériences de recherche personnalisées et bien plus encore sont disponibles avec une licence Platinum valide.",
@@ -9168,13 +11366,43 @@
     "xpack.enterpriseSearch.notFound.action2": "Contacter le support technique",
     "xpack.enterpriseSearch.notFound.description": "Impossible de trouver la page que vous recherchez.",
     "xpack.enterpriseSearch.notFound.title": "Erreur 404",
+    "xpack.enterpriseSearch.overview.description": "Créez des expériences de recherche à l'aide d'un ensemble élaboré d'API et d'outils.",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.button": "Démarrer",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.description": "Concevez et créez des applications de recherche performantes et pertinentes ou des implémentations de recherche à grande échelle directement dans Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.heading": "Lancez-vous avec Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.cloudIdLabel": "Identifiant du cloud",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.copyCloudIdAriaLabel": "Copier l'Identifiant du cloud",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.heading": "Mon Déploiement",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.manageApiKeysLink": "Gérer les clés d'API",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.manageLink": "Gérer",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.connectToElasticsearchDescription": "Elastic construit et assure la maintenance des clients dans plusieurs langues populaires et notre communauté a contribué à beaucoup d'autres. À l'image d'Elasticsearch, ils sont simples à exploiter, leur utilisation est naturelle, et ils vous offrent une foule de possibilités.",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.connectToElasticsearchTitle": "Se connecter à Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsLink": "En savoir plus sur les clients Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsSelectAriaLabel": "Clients de langage",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsSelectLabel": "Sélectionner un client",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchDescription": "Que vous construisiez une application optimisée pour la recherche ou que vous conceviez une implémentation de recherche à grande échelle, Elasticsearch fournit les outils de bas niveau pour créer l'expérience de recherche la plus pertinente et la plus performante.",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchExperienceDescription": "Vous êtes prêt à ajouter une expérience de recherche moderne et attrayante à votre application ou à votre site web ? Search UI, le cadre de recherche JavaScript d'Elastic permettant de créer des expériences de recherche de classe mondiale, a été conçu pour cette tâche.",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchExperienceTitle": "Construire une expérience de recherche avec Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchUIGitHubLink": "Search UI sur GitHub",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchUIMarketingLink": "En savoir plus sur Search UI",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchTitle": "Prise en main d'Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.createIndex": "Créer un nouvel index",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.elasticsearchClients": "Clients d'Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.gettingStarted": "Prise en main d'Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.searchUi": "Search UI pour Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.title": "Ressources",
     "xpack.enterpriseSearch.overview.heading": "Bienvenue dans Elastic Enterprise Search",
+    "xpack.enterpriseSearch.overview.insufficientPermissionsBody": "Vous n'avez pas l'autorisation de consulter cette page. Si vous pensez qu'il s'agit d'une erreur, veuillez contacter votre administrateur.",
+    "xpack.enterpriseSearch.overview.insufficientPermissionsButtonLabel": "Rendez-vous sur le tableau de bord Kibana",
+    "xpack.enterpriseSearch.overview.insufficientPermissionsFooterBody": "Rendez-vous sur le tableau de bord Kibana",
+    "xpack.enterpriseSearch.overview.insufficientPermissionsFooterLinkLabel": "Lire la documentation",
+    "xpack.enterpriseSearch.overview.insufficientPermissionsTitle": "Permissions insuffisantes",
+    "xpack.enterpriseSearch.overview.navTitle": "Aperçu",
     "xpack.enterpriseSearch.overview.productCard.heading": "Elastic {productName}",
     "xpack.enterpriseSearch.overview.productCard.launchButton": "Ouvrir {productName}",
     "xpack.enterpriseSearch.overview.productCard.setupButton": "Configurer {productName}",
+    "xpack.enterpriseSearch.overview.productName": "Enterprise Search",
     "xpack.enterpriseSearch.overview.setupCta.description": "Ajoutez des fonctions de recherche à votre application ou à votre organisation interne avec Elastic App Search et Workplace Search. Regardez la vidéo pour savoir ce qu'il est possible de faire lorsque la recherche est facilitée.",
-    "xpack.enterpriseSearch.overview.setupHeading": "Choisissez un produit à configurer et lancez-vous.",
-    "xpack.enterpriseSearch.overview.subheading": "Ajoutez une fonction de recherche à votre application ou à votre organisation.",
     "xpack.enterpriseSearch.productSelectorCalloutTitle": "Des fonctionnalités de niveau entreprise pour les grandes et petites équipes",
     "xpack.enterpriseSearch.readOnlyMode.warning": "Enterprise Search est en mode de lecture seule. Vous ne pourrez pas effectuer de changements tels que création, modification ou suppression.",
     "xpack.enterpriseSearch.roleMapping.addRoleMappingButtonLabel": "Ajouter un mapping",
@@ -9206,6 +11434,9 @@
     "xpack.enterpriseSearch.roleMapping.invitationDescription": "Cette URL peut être partagée avec l'utilisateur pour lui permettre d'accepter l'invitation d'Enterprise Search et de définir un nouveau mot de passe",
     "xpack.enterpriseSearch.roleMapping.invitationLink": "Lien d'invitation d'Enterprise Search",
     "xpack.enterpriseSearch.roleMapping.invitationPendingLabel": "Invitation en attente",
+    "xpack.enterpriseSearch.roleMapping.kibanaAccessWarningDescription": "Envisagez de leur donner le rôle \"utilisateur-enterprise-search\".",
+    "xpack.enterpriseSearch.roleMapping.kibanaAccessWarningErrorMessage": "Cet utilisateur d'Elasticsearch n'a pas de rôle Enterprise Search dans Elasticsearch. Il n'a peut-être pas accès à Kibana.",
+    "xpack.enterpriseSearch.roleMapping.kibanaAccessWarningTitle": "Avertissement d'accès à Kibana",
     "xpack.enterpriseSearch.roleMapping.manageRoleMappingTitle": "Gérer le mapping de rôles",
     "xpack.enterpriseSearch.roleMapping.newInvitationLabel": "URL d'invitation",
     "xpack.enterpriseSearch.roleMapping.newRoleMappingTitle": "Ajouter un mapping de rôles",
@@ -9216,6 +11447,7 @@
     "xpack.enterpriseSearch.roleMapping.noUsersDescription": "Il est possible d'ajouter des utilisateurs individuellement, pour un maximum de flexibilité. Les mappings de rôles fournissent une interface plus large pour ajouter un grand nombre d'utilisateurs à l'aide des attributs d'utilisateur.",
     "xpack.enterpriseSearch.roleMapping.noUsersLabel": "Impossible de trouver les utilisateurs correspondants",
     "xpack.enterpriseSearch.roleMapping.noUsersTitle": "Aucun utilisateur ajouté",
+    "xpack.enterpriseSearch.roleMapping.rbacButtonDisabledLabel": "L'activation de RBAC peut être effectuée par un superutilisateur.",
     "xpack.enterpriseSearch.roleMapping.removeRoleMappingButton": "Retirer le mapping",
     "xpack.enterpriseSearch.roleMapping.removeRoleMappingTitle": "Retirer le mapping de rôles",
     "xpack.enterpriseSearch.roleMapping.removeUserButton": "Retirer l'utilisateur",
@@ -9228,7 +11460,7 @@
     "xpack.enterpriseSearch.roleMapping.roleMappingsHeadingDocsLink": "Découvrez plus d'informations sur les mappings de rôles.",
     "xpack.enterpriseSearch.roleMapping.roleMappingsHeadingTitle": "Mappings de rôles",
     "xpack.enterpriseSearch.roleMapping.roleMappingsTitle": "Utilisateurs et rôles",
-    "xpack.enterpriseSearch.roleMapping.roleModalText": "La suppression d'un mapping de rôles révoque l'accès de tous les utilisateurs correspondants aux attributs du mapping, mais peut ne pas être appliquée immédiatement aux rôles régis par SAML. Les utilisateurs ayant une session SAML active conserveront l'accès jusqu'à l'expiration de cette dernière.",
+    "xpack.enterpriseSearch.roleMapping.roleModalText": "La suppression d'un mapping de rôle pourrait révoquer l'accès à l'utilisateur actuellement connecté. Avant de poursuivre, vérifiez que l'utilisateur actuellement connecté dispose du niveau d'accès approprié via un mapping de rôle différent afin d'éviter tout comportement indésirable. Cette action peut ne pas prendre effet immédiatement pour les rôles gérés par SAML. Les utilisateurs ayant une session SAML active conserveront l'accès jusqu'à l'expiration de cette dernière.",
     "xpack.enterpriseSearch.roleMapping.rolesDisabledDescription": "Tous les utilisateurs définis pour ce déploiement disposent actuellement d'un accès total à {productName}. Pour limiter les accès et gérer les autorisations, vous devez activer l'accès basé sur les rôles pour Enterprise Search.",
     "xpack.enterpriseSearch.roleMapping.rolesDisabledNote": "Remarque : l'activation de l'accès basé sur les rôles limite les accès aussi bien pour App Search que pour Workplace Search. Une fois l'activation effectuée, vérifiez la gestion des accès pour les deux produits, le cas échéant.",
     "xpack.enterpriseSearch.roleMapping.rolesDisabledTitle": "L'accès basé sur les rôles est désactivé",
@@ -9275,6 +11507,9 @@
     "xpack.enterpriseSearch.setupGuide.cloud.step5.instruction1": "Pour les index de {productName} contenant des données statistiques temporelles, vous souhaiterez peut-être {configurePolicyLink} afin de garantir des performances optimales et un stockage rentable à long terme.",
     "xpack.enterpriseSearch.setupGuide.cloud.step5.instruction1LinkText": "configurer une politique de cycle de vie des index",
     "xpack.enterpriseSearch.setupGuide.cloud.step5.title": "{productName} est désormais disponible",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.instruction1": "Pour obtenir de l'aide sur les problèmes courants de configuration, lisez notre guide {link}.",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.instruction1LinkText": "Dépannage de la configuration d'Enterprise Search",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.title": "Résolution des problèmes",
     "xpack.enterpriseSearch.setupGuide.step1.instruction1": "Dans votre fichier {configFile}, définissez {configSetting} sur l'URL de votre instance {productName}. Par exemple :",
     "xpack.enterpriseSearch.setupGuide.step1.title": "Ajouter votre URL hôte {productName} à votre configuration Kibana",
     "xpack.enterpriseSearch.setupGuide.step2.instruction1": "Redémarrez Kibana pour prendre en compte les modifications de configuration de l'étape précédente.",
@@ -9287,11 +11522,26 @@
     "xpack.enterpriseSearch.trialCalloutTitle": "Votre licence d'essai de la Suite Elastic, qui vous permet d'utiliser les fonctionnalités Platinum, expire dans {days, plural, one {# jour} other {# jours}}.",
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.description": "Ce plug-in ne prend actuellement pas en charge l'exécution de {productName} et de Kibana sur des clusters différents.",
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.title": "{productName} et Kibana se trouvent sur des clusters Elasticsearch différents",
+    "xpack.enterpriseSearch.troubleshooting.setup.description": "Pour obtenir de l'aide sur d'autres problèmes courants de configuration, lisez notre guide {link}.",
+    "xpack.enterpriseSearch.troubleshooting.setup.documentationLinkLabel": "Dépannage de la configuration d'Enterprise Search",
+    "xpack.enterpriseSearch.units.allDaysLabel": "Tous les jours",
     "xpack.enterpriseSearch.units.daysLabel": "Jours",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.friday": "vendredi",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.monday": "lundi",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.saturday": "samedi",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.sunday": "dimanche",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.thursday": "jeudi",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.tuesday": "mardi",
+    "xpack.enterpriseSearch.units.daysOfWeekLabel.wednesday": "mercredi",
     "xpack.enterpriseSearch.units.hoursLabel": "Heures",
+    "xpack.enterpriseSearch.units.minutesLabel": "Minutes",
     "xpack.enterpriseSearch.units.monthsLabel": "Mois",
     "xpack.enterpriseSearch.units.weeksLabel": "Semaines",
     "xpack.enterpriseSearch.usernameLabel": "Nom d'utilisateur",
+    "xpack.enterpriseSearch.versionMismatch.body": "Vos versions de Kibana et d'Enterprise Search ne correspondent pas. Pour accéder à Enterprise Search, utilisez la même version majeure et mineure pour chaque service.",
+    "xpack.enterpriseSearch.versionMismatch.enterpriseSearchVersionText": "Version d'Enterprise Search : {enterpriseSearchVersion}",
+    "xpack.enterpriseSearch.versionMismatch.kibanaVersionText": "Version de Kibana: {kibanaVersion}",
+    "xpack.enterpriseSearch.versionMismatch.title": "Erreur de version incompatible",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.account.link": "Mon compte",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.logout.link": "Se déconnecter",
     "xpack.enterpriseSearch.workplaceSearch.accountNav.orgDashboard.link": "Accéder au tableau de bord organisationnel",
@@ -9305,8 +11555,31 @@
     "xpack.enterpriseSearch.workplaceSearch.add.label": "Ajouter",
     "xpack.enterpriseSearch.workplaceSearch.addField.label": "Ajouter un champ",
     "xpack.enterpriseSearch.workplaceSearch.and": "et",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.confirmDeleteLabel": "Voulez-vous vraiment supprimer cette clé d'API ? Cette action ne peut pas être annulée.",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.confirmDeleteTitle": "Supprimer la clé d'API",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.copied.tooltip": "Copié",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.copyApiEndpoint.buttonLabel": "Copiez le point de terminaison d'API dans le presse-papiers.",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.copyApiKey.buttonLabel": "Copier la clé d'API dans le presse-papiers.",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.createdMessage": "La clé d'API \"{name}\" a été créée",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.createKey.buttonLabel": "Créer une clé",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.deleteApiKey.buttonDescription": "Supprimer la clé d'API",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.deletedMessage": "La clé d'API \"{name}\" a été supprimée",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.emptyBody": "Autorisez les applications à accéder à Elastic Workplace Search en votre nom.",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.emptyButtonLabel": "En savoir plus sur les clés d'API",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.emptyTitle": "Créer votre première clé d'API",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.endpointTitle": "Point de terminaison",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.flyoutTitle": "Créer une nouvelle clé",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.formHelpText": "Votre clé sera nommée : {name}",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.formLabel": "Nom de clé",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.hideApiKeyLabel": "Masquer la clé d'API",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.keyTitle": "Clé",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.namePlaceholder": "par exemple, ma-clé-d'api",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.nameTitle": "Nom",
+    "xpack.enterpriseSearch.workplaceSearch.apiKeys.showApiKeyLabel": "Afficher la clé d'API",
     "xpack.enterpriseSearch.workplaceSearch.baseUri.label": "URI de base",
     "xpack.enterpriseSearch.workplaceSearch.baseUrl.label": "URL de base",
+    "xpack.enterpriseSearch.workplaceSearch.betweenLabel": "entre",
+    "xpack.enterpriseSearch.workplaceSearch.blockLabel": "Bloc",
     "xpack.enterpriseSearch.workplaceSearch.clientId.label": "ID client",
     "xpack.enterpriseSearch.workplaceSearch.clientSecret.label": "Identifiant client secret",
     "xpack.enterpriseSearch.workplaceSearch.comfirmModal.title": "Veuillez confirmer",
@@ -9317,12 +11590,25 @@
     "xpack.enterpriseSearch.workplaceSearch.connectors.header.description": "Tous vos connecteurs configurables.",
     "xpack.enterpriseSearch.workplaceSearch.connectors.header.title": "Connecteurs de sources de contenu",
     "xpack.enterpriseSearch.workplaceSearch.consumerKey.label": "Clé consommateur",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.description": "Pour vous préparer à la configuration, consultez notre {deploymentGuideLink} pour connaître toutes les conditions préalables nécessaires au déploiement rapide du pack de connecteurs. Finalisez votre configuration dans Enterprise Search en définissant l'URL et la clé d'API du connecteur à l'étape suivante.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.discussLinkLabel": "Des questions ? Discutez-en ici.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.feedbackLinkLabel": "Nous cherchons toujours à nous améliorer. Donnez-nous votre avis  ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.heading": "Le connecteur {name} est entièrement personnalisable, et sera autogéré sur l'infrastructure de votre choix.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.linkLabel": "documentation",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.configCompleted.feedbackCallOutText": "Vous avez des commentaires sur le déploiement d'un pack de connecteurs {name} ? Faites-nous le savoir.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.apiKeyLabel": "Clé d'API du connecteur",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.error": "Veuillez utiliser une URL valide",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.helpText": "Les URL doivent commencer par https://",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.insecureTitle": "Connexion non sécurisée",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.insecureWarning": "Votre connecteur utilise une connexion HTTP, qui n'est pas privée. Les informations synchronisées par ce connecteur peuvent être vues par d'autres personnes. Connectez-vous via HTTPS pour sécuriser vos informations.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.stepTitle": "Fournir les informations de configuration appropriées",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.urlLabel": "URL du connecteur",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.emptyBody": "Les sources seront disponibles pour la recherche lorsqu'un administrateur les ajoutera à cette organisation.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.emptyTitle": "Aucune source disponible",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.newSourceDescription": "Lorsque vous configurez et connectez une source, vous créez des entités distinctes avec un contenu interrogeable synchronisé à partir de la plateforme de contenus. Pour plus de flexibilité, une source peut être ajoutée soit en utilisant un des connecteurs de source disponibles, soit par le biais de sources d'API personnalisées. ",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.noSourcesTitle": "Configurer et connecter votre première source de contenu",
-    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.orgSourceDescription": "Les sources de contenu partagé sont disponibles pour toute votre organisation et peuvent être attribuées à des groupes d'utilisateurs spécifiques.",
-    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.orgSourcesTitle": "Ajouter une source de contenu partagé",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.orgSourceDescription": "Les sources de contenu organisationnelles sont disponibles pour toute votre organisation et peuvent être attribuées à des groupes d'utilisateurs spécifiques.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.orgSourcesTitle": "Ajouter une source de contenu organisationnelle",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.placeholder": "Filtrer les sources…",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.privateSourceDescription": "Connectez une nouvelle source pour ajouter son contenu et ses documents à votre expérience de recherche.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.privateSourcesTitle": "Ajouter une nouvelle source de contenu",
@@ -9338,11 +11624,34 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.orgCanConnect.message": "{name} peut maintenant être connecté à Workplace Search",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.personalConnectLink.message": "Les utilisateurs peuvent maintenant lier leurs comptes {name} à partir de leurs tableaux de bord personnels.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.button": "Découvrez plus d'informations sur les sources de contenu privées.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.link": "activation de la connexion source privée",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.message": "N'oubliez pas d'{securityLink} dans les paramètres de sécurité.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.button": "Créer une source d'API personnalisée",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.createNamedSourceButtonLabel": "Configurer {name}",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.description": "Pour vous préparer à la configuration, consultez notre {deploymentGuideLink} pour connaître toutes les conditions préalables nécessaires au déploiement rapide du pack de connecteurs. Finalisez votre configuration dans Enterprise Search en donnant un nom descriptif à la source de contenu {name}, et mettez à jour le fichier de configuration du connecteur avec l'identifiant de la source fourni à l'étape suivante.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.discussLinkLabel": "Des questions ? Discutez-en ici.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.feedbackLinkLabel": "Nous cherchons toujours à nous améliorer. Donnez-nous votre avis  ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.githubRepoLinkLabel": "Personnaliser le connecteur ici.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.heading": "Le connecteur {name} est entièrement personnalisable, et sera autogéré sur l'infrastructure de votre choix.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.linkLabel": "documentation",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.description": "{link} pour en savoir plus sur les sources d'API personnalisées.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.text": "Lire la documentation",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.title": "Comment ajouter {name}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configDocs.applicationPortal.button": "Portail de l'application {name}",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.button": "Instructions",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.description": "Configurez un connecteur personnalisé pour une plus grande flexibilité de configuration et un meilleur contrôle.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.title": "Connecteur personnalisé",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.betaLabel": "Bêta",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.button": "Instructions",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.description": "Déployez ce pack de connecteurs sur une infrastructure autogérée pour des cas d'utilisation avancés.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.recommendedLabel": "Recommandé",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.title": "Pack de connecteurs",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.button": "Connecter",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.description": "Utilisez ce connecteur pour démarrer rapidement sans déployer d'infrastructure supplémentaire.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.title": "Connecteur",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.alt.text": "Illustration de la connexion",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.configure.button": "Configurer {name}",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.badge": "Action ponctuelle",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.heading": "Étape 1",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.text": "Configurez une application OAuth sécurisée via la source de contenu que vous utiliserez, ou que votre équipe utilisera, pour connecter et synchroniser du contenu. Vous n'aurez besoin d'effectuer cette configuration qu'une seule fois par source de contenu.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.title": "Configurer un {badge} d'application OAuth",
@@ -9355,10 +11664,12 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configOauth.label": "Sélectionner les organisations GitHub à synchroniser",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.accountOnlyTooltip": "Source de contenu privée. Chaque utilisateur doit ajouter la source de contenu à partir de son propre tableau de bord personnel.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.body": "Configuré et prêt pour la connexion.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton": "Connecter un autre",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton": "Connecter",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.emptyState": "Aucune source configurée ne correspond à votre recherche.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.title": "Sources de contenu configurées",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.unConnectedTooltip": "Aucune source connectée",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSourcesList.betaBadge": "Bêta",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.button": "Connecter {name}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.docPermissionsUnavailable.message": "Les autorisations de niveau document ne sont pas encore disponibles pour cette source. {link}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.needsPermissions.text": "Les informations d'autorisation de niveau document seront synchronisées. Une configuration supplémentaire est requise après la connexion initiale pour que les documents soient disponibles pour la recherche.",
@@ -9375,6 +11686,7 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.oauthStep1": "Créer une application OAuth dans le compte {sourceName} de votre organisation",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.oauthStep2": "Fournir les informations de configuration appropriées",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.body1": "Vos points de terminaison sont prêts à accepter les requêtes.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.configureNewSourceButtonLabel": "Configurer une nouvelle source de contenu",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.heading": "{name} créé",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.addField.button": "Ajouter un champ",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.empty.description": "Un schéma est créé à votre place une fois que vous avez indexé quelques documents. Cliquez ci-dessous pour créer des champs de schéma à l'avance.",
@@ -9393,7 +11705,20 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.updated.message": "Schéma mis à jour.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.documentLevelPermissions.text": "Les autorisations de niveau document gèrent l'accès au contenu utilisateur en fonction des règles définies. Autorisez ou refusez l'accès à certains documents pour des personnes et des groupes.",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.documentLevelPermissions.title": "Autorisations de niveau document disponibles avec la licence Platinum",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.globalAccessPermissions.description": "Tous les documents accessibles à l'utilisateur du service qui se connecte seront synchronisés et deviendront disponibles pour les utilisateurs de l'organisation ou du groupe. Les documents sont immédiatement disponibles pour la recherche",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.globalAccessPermissions.title": "Permissions d'accès globales",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.private.description": "Les résultats renvoyés vous sont spécifiques et pertinents. La connexion de cette source n'expose pas vos données personnelles aux autres utilisateurs de la recherche. Vous êtes la seule personne à y avoir accès.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.private.title": "Toujours privé",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.remote.description": "Les données des messages et autres informations sont interrogeables en temps réel à partir de l'expérience Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.remote.title": "Toujours à jour",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.searchable.description": "Les éléments suivants sont interrogeables :",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.searchable.title": "Contenu interrogeable",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncedItems.title": "Éléments synchronisés",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncFrequency.text": "Cette source récupère le nouveau contenu de {name} toutes les {duration} (suivant la synchronisation initiale).",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncFrequency.time": "2 heures",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncFrequency.title": "Synchronisations toutes les 2 heures",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.color.label": "Couleur",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.createdBy.label": "Créé par",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.displaySettings.description": "Personnalisez le contenu et l'apparence des résultats de recherche de votre source d'API personnalisée.",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.displaySettings.title": "Paramètres d'affichage",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.displaySettingsEmpty.body": "Vous devez posséder un contenu à afficher pour pouvoir configurer les paramètres d'affichage.",
@@ -9403,6 +11728,8 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.featuredResults.title": "Résultats proposés",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.go.button": "Go",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.lastUpdated.heading": "Dernière mise à jour",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.mediaType.label": "Type de support",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.optionalArea.text": "Cette zone est facultative",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.preview.title": "Aperçu",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.reset.button": "Réinitialiser",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.resultDetail.label": "Détails du résultat",
@@ -9415,40 +11742,69 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.success.message": "Les paramètres d'affichage ont été mis à jour avec succès.",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.title.heading": "Titre",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.title.label": "Titre",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.type.label": "Type",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.unsaved.message": "Vos paramètres d'affichage n'ont pas été enregistrés. Voulez-vous vraiment quitter ?",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.updatedBy.label": "Mis à jour par",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.url.label": "URL",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.visibleFields.title": "Champs visibles",
-    "xpack.enterpriseSearch.workplaceSearch.contentSources.syncManagementContentExtractionLabel": "Synchroniser tous les textes et contenus",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.synchronization.estimateSummaryLabel": "La durée estimée de l'opération est de {estimateDisplay}.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.synchronization.frequencyItemLabel": "Effectuer un {label} à chaque",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.synchronization.lastRunLabel": "dernière exécution",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.synchronization.lastRunSummary": "Cette synchro {lastRunStrong} {lastRunTime}.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.synchronization.nextStartLabel": "Prochaine exécution",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.synchronization.nextStartSummary": "{nextStartStrong} commencera {nextStartTime}.",
+    "xpack.enterpriseSearch.workplaceSearch.contentSources.syncManagementContentExtractionLabel": "Synchroniser le texte intégral à partir de fichiers",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.syncManagementGlobalConfigLabel": "Synchroniser les miniatures – désactivé au niveau de la configuration globale",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.syncManagementSynchronizeLabel": "Synchroniser cette source",
     "xpack.enterpriseSearch.workplaceSearch.contentSources.syncManagementThumbnailsLabel": "Synchroniser les miniatures",
+    "xpack.enterpriseSearch.workplaceSearch.copied.tooltip": "Copié !",
+    "xpack.enterpriseSearch.workplaceSearch.copy.tooltip": "Copier dans le presse-papiers",
     "xpack.enterpriseSearch.workplaceSearch.copyText": "Copier",
+    "xpack.enterpriseSearch.workplaceSearch.credentialItem.copied.tooltip": "Copié !",
+    "xpack.enterpriseSearch.workplaceSearch.credentialItem.copy.tooltip": "Copier dans le presse-papiers",
+    "xpack.enterpriseSearch.workplaceSearch.credentialItem.show.tooltip": "Afficher {credential}.",
     "xpack.enterpriseSearch.workplaceSearch.credentials.description": "Utilisez les informations d'identification suivantes dans votre client pour demander des tokens d'accès à notre serveur d'authentification.",
     "xpack.enterpriseSearch.workplaceSearch.credentials.title": "Informations d'identification",
     "xpack.enterpriseSearch.workplaceSearch.customize.header.description": "Personnalisez les paramètres généraux d'organisation.",
     "xpack.enterpriseSearch.workplaceSearch.customize.header.title": "Personnaliser Workplace Search",
     "xpack.enterpriseSearch.workplaceSearch.customize.name.button": "Enregistrer le nom de l'organisation",
     "xpack.enterpriseSearch.workplaceSearch.customize.name.label": "Nom de l'organisation",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.documentationLinkLabel": "Documentation du connecteur {name}",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.genericDocumentationHelpText": "Consultez la {documentationLink} pour apprendre comment construire et déployer votre propre connecteur sur l'infrastructure autogérée de votre choix.",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.genericDocumentationLabel": "Documentation source de l'API personnalisée",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.preconfiguredDocumentationHelpText": "Examinez la {documentationLink} et déployez le pack de connecteurs pour qu'il soit autogéré sur l'infrastructure de votre choix.",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.preconfiguredRepositoryInstructions": "Configurez votre connecteur en clonant le {githubRepositoryLink}.",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.repositoryLinkLabel": "Référentiel du connecteur {name}",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.sourceIdentifierHelpText": "Spécifiez l'identificateur de source suivant ainsi qu'un {apiKeyLink} dans le fichier de configuration du connecteur déployé pour synchroniser les documents.",
+    "xpack.enterpriseSearch.workplaceSearch.deployment.title": "Déploiement",
     "xpack.enterpriseSearch.workplaceSearch.description.label": "Description",
     "xpack.enterpriseSearch.workplaceSearch.documentsHeader": "Documents",
     "xpack.enterpriseSearch.workplaceSearch.editField.label": "Modifier le champ",
+    "xpack.enterpriseSearch.workplaceSearch.explorePlatinumFeatures.link": "Explorer les fonctionnalités Platinum",
+    "xpack.enterpriseSearch.workplaceSearch.externalConnectorApiKey.label": "Clé d'API du connecteur",
+    "xpack.enterpriseSearch.workplaceSearch.externalConnectorUrl.label": "URL du connecteur",
     "xpack.enterpriseSearch.workplaceSearch.field.label": "Champ",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.heading": "Ajouter un groupe",
+    "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.label": "Nom du groupe",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.submit.action": "Ajouter le groupe",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroupForm.action": "Créer un groupe",
     "xpack.enterpriseSearch.workplaceSearch.groups.clearFilters.action": "Effacer les filtres",
-    "xpack.enterpriseSearch.workplaceSearch.groups.contentSourceCountHeading": "{numSources} sources de contenu partagées",
-    "xpack.enterpriseSearch.workplaceSearch.groups.description": "Attribuez des sources de contenu partagées et des utilisateurs à des groupes pour créer des expériences de recherche pertinentes pour différentes équipes internes.",
+    "xpack.enterpriseSearch.workplaceSearch.groups.contentSourceCountHeading": "{numSources} sources de contenu organisationnelles",
+    "xpack.enterpriseSearch.workplaceSearch.groups.description": "Attribuez des sources de contenu organisationnelles et des utilisateurs à des groupes pour créer des expériences de recherche pertinentes pour différentes équipes internes.",
     "xpack.enterpriseSearch.workplaceSearch.groups.filterGroups.placeholder": "Filtrer les groupes par nom…",
     "xpack.enterpriseSearch.workplaceSearch.groups.filterSources.buttonText": "Sources",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupDeleted": "Le groupe \"{groupName}\" a été supprimé avec succès.",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerHeaderTitle": "Gérer {label}",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerSourceEmpty.body": "Il semblerait que vous n'ayez pas encore ajouté de source de contenu partagée.",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerSourceEmpty.body": "Il semblerait que vous n'ayez pas encore ajouté de source de contenu organisationnelle.",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerSourceEmpty.title": "Oups !",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerUpdateAddSourceButton": "Ajouter une source partagée",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerSourceModal.deselectButton.text": "Tout désélectionner",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerSourceModal.selectButton.text": "Tout sélectionner",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupManagerUpdateAddSourceButton": "Ajouter une source organisationnelle",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupNotFound": "Impossible de trouver le groupe ayant l'ID : \"{groupId}\".",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupPrioritizationUpdated": "La hiérarchisation des sources partagées a été mise à jour avec succès.",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupPrioritizationUpdated": "La hiérarchisation des sources organisationnelles a été mise à jour avec succès.",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupRenamed": "Le nom du groupe a été changé en \"{groupName}\" avec succès.",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupSourcesUpdated": "Les sources de contenu partagées ont été mises à jour avec succès.",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupSourcesUpdated": "La sources de contenu organisationnelles ont été mises à jour avec succès.",
+    "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.groupPagination.label": "Groupes",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.groupTableHeader": "Regrouper",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.sourcesTableHeader": "Sources de contenu",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText": "Dernière mise à jour {updatedAt}.",
@@ -9456,7 +11812,7 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.inviteUsers.action": "Inviter des utilisateurs",
     "xpack.enterpriseSearch.workplaceSearch.groups.newGroup.action": "Gérer le groupe",
     "xpack.enterpriseSearch.workplaceSearch.groups.newGroupSavedSuccess": "{groupName} créé avec succès",
-    "xpack.enterpriseSearch.workplaceSearch.groups.noSourcesMessage": "Aucune source de contenu partagée",
+    "xpack.enterpriseSearch.workplaceSearch.groups.noSourcesMessage": "Aucune source de contenu organisationnelle",
     "xpack.enterpriseSearch.workplaceSearch.groups.noUsersMessage": "Aucun utilisateur",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.confirmRemoveButtonText": "Supprimer {name}",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.confirmRemoveDescription": "Votre groupe sera supprimé de Workplace Search. Voulez-vous vraiment supprimer {name} ?",
@@ -9465,7 +11821,7 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupSourcesDescription": "Interrogeable par tous les utilisateurs du groupe \"{name}\".",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupSourcesTitle": "Sources de contenu du groupe",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupUsersDescription": "Les utilisateurs attribués à ce groupe obtiennent un accès aux données et au contenu des sources définis ci-dessus. Les attributions des utilisateurs pour ce groupe peuvent être gérées dans la zone Utilisateurs et rôles.",
-    "xpack.enterpriseSearch.workplaceSearch.groups.overview.manageSourcesButtonText": "Gérer les sources de contenu partagées",
+    "xpack.enterpriseSearch.workplaceSearch.groups.overview.manageSourcesButtonText": "Gérer les sources de contenu organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.manageUsersButtonText": "Gérer les utilisateurs et les rôles",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.nameSectionDescription": "Personnalisez le nom de ce groupe.",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.nameSectionTitle": "Nom du groupe",
@@ -9476,17 +11832,57 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.usersSectionTitle": "Utilisateurs du groupe",
     "xpack.enterpriseSearch.workplaceSearch.groups.searchResults.notFoound": "Aucun résultat trouvé.",
     "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.headerDescription": "Calibrez l'importance relative des documents pour les sources de contenu du groupe.",
-    "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.headerTitle": "Hiérarchisation des sources de contenu partagées",
+    "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.headerTitle": "Hiérarchisation des sources de contenu organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.priorityTableHeader": "Priorité de pertinence",
     "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.sourceTableHeader": "Source",
     "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.zeroStateBody": "Partagez deux sources ou plus avec {groupName} pour personnaliser la hiérarchisation des sources.",
-    "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.zeroStateButtonText": "Ajouter des sources de contenu partagées",
+    "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.zeroStateButtonText": "Ajouter des sources de contenu organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.groups.sourceProioritization.zeroStateTitle": "Aucune source n'est partagée avec ce groupe",
-    "xpack.enterpriseSearch.workplaceSearch.groups.sourcesModalLabel": "sources de contenu partagées",
+    "xpack.enterpriseSearch.workplaceSearch.groups.sourcesModalLabel": "sources de contenu organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.groups.sourcesModalTitle": "Sélectionner des sources de contenu à partager avec {groupName}",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.boxDescription": "Effectuez des recherches dans vos fichiers et dossiers stockés sur Box avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.boxName": "Box",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.confluenceCloudDescription": "Effectuez des recherches sur le contenu de votre organisation sur le cloud Confluence avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.confluenceCloudName": "Cloud Confluence",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.confluenceServerDescription": "Effectuez des recherches sur le contenu de votre organisation sur le serveur Confluence avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.confluenceServerName": "Serveur Confluence",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.customApiSourceDescription": "Effectuez n'importe quelle recherche en créant votre propre intégration avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.customApiSourceName": "Source d'API personnalisée",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.dropboxDescription": "Effectuez des recherches dans vos fichiers et dossiers stockés sur Dropbox avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.dropboxName": "Dropbox",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.githubDescription": "Effectuez des recherches sur vos projets et référentiels sur GitHub avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerDescription": "Effectuez des recherches sur vos projets et référentiels sur GitHub avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerName": "GitHub Enterprise Server",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.githubName": "GitHub",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.gmailDescription": "Effectuez des recherches dans vos e-mails gérés par Gmail avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.gmailName": "Gmail",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription": "Effectuez des recherches dans vos documents sur Google Drive avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveName": "Google Drive",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.jiraCloudDescription": "Effectuez des recherches dans le flux de travail de votre projet sur le cloud Jira avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.jiraCloudName": "Jira Cloud",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.jiraServerDescription": "Effectuez des recherches dans le flux de travail de votre projet sur le serveur Jira avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.jiraServerName": "Serveur Jira",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.onedriveDescription": "Effectuez des recherches dans vos fichiers stockés sur OneDrive avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.onedriveName": "OneDrive",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceDescription": "Effectuez des recherches dans votre contenu sur Salesforce avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName": "Salesforce",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxDescription": "Effectuez des recherches dans votre contenu sur Salesforce Sandbox avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxName": "Sandbox Salesforce",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.servicenowDescription": "Effectuez des recherches dans votre contenu sur ServiceNow avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.servicenowName": "ServiceNow",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription": "Effectuez des recherches dans vos fichiers stockés sur SharePoint Online avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineName": "SharePoint Online",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointServerDescription": "Effectuez des recherches dans vos fichiers stockés sur le serveur Microsoft SharePoint avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointServerName": "Serveur SharePoint",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.slackDescription": "Effectuez des recherches dans vos messages sur Slack avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.slackName": "Slack",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.zendeskDescription": "Effectuez des recherches dans vos tickets sur Zendesk avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.zendeskName": "Zendesk",
     "xpack.enterpriseSearch.workplaceSearch.keepEditing.button": "Continuer la modification",
+    "xpack.enterpriseSearch.workplaceSearch.label.label": "Étiquette",
     "xpack.enterpriseSearch.workplaceSearch.name.label": "Nom",
     "xpack.enterpriseSearch.workplaceSearch.nav.addSource": "Ajouter une source",
+    "xpack.enterpriseSearch.workplaceSearch.nav.apiKeys": "Clés d'API",
     "xpack.enterpriseSearch.workplaceSearch.nav.content": "Contenu",
     "xpack.enterpriseSearch.workplaceSearch.nav.displaySettings": "Paramètres d'affichage",
     "xpack.enterpriseSearch.workplaceSearch.nav.groups": "Groupes",
@@ -9503,6 +11899,9 @@
     "xpack.enterpriseSearch.workplaceSearch.nav.settingsOauth": "Application OAuth",
     "xpack.enterpriseSearch.workplaceSearch.nav.settingsSourcePrioritization": "Connecteurs de sources de contenu",
     "xpack.enterpriseSearch.workplaceSearch.nav.sources": "Sources",
+    "xpack.enterpriseSearch.workplaceSearch.nav.synchronization": "Synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.nav.synchronizationAssetsAndObjects": "Actifs et objets",
+    "xpack.enterpriseSearch.workplaceSearch.nav.synchronizationFrequency": "Fréquence",
     "xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthDescription": "Configurez une application OAuth pour utiliser l'API de recherche de Workplace Search de façon sécurisée. Effectuez une mise à niveau vers la licence Platinum pour activer l'API de recherche et créer votre application OAuth.",
     "xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthTitle": "Configuration de OAuth pour les applications de recherche personnalisées",
     "xpack.enterpriseSearch.workplaceSearch.oauth.description": "Créez un client OAuth pour votre organisation.",
@@ -9517,8 +11916,10 @@
     "xpack.enterpriseSearch.workplaceSearch.oauthAuthorize.writeScopeDescription": "Modifier vos données",
     "xpack.enterpriseSearch.workplaceSearch.oauthPersisted.description": "Accédez aux informations d'identification du client OAuth de votre organisation et gérez les paramètres OAuth.",
     "xpack.enterpriseSearch.workplaceSearch.ok.button": "Ok",
+    "xpack.enterpriseSearch.workplaceSearch.onLabel": "le",
     "xpack.enterpriseSearch.workplaceSearch.organizationStats.activeUsers": "Utilisateurs actifs",
     "xpack.enterpriseSearch.workplaceSearch.organizationStats.invitations": "Invitations",
+    "xpack.enterpriseSearch.workplaceSearch.organizationStats.organizationalSources": "Sources organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.organizationStats.privateSources": "Sources privées",
     "xpack.enterpriseSearch.workplaceSearch.organizationStats.title": "Statistiques d'utilisation",
     "xpack.enterpriseSearch.workplaceSearch.orgNameOnboarding.buttonLabel": "Nommer votre organisation",
@@ -9527,11 +11928,14 @@
     "xpack.enterpriseSearch.workplaceSearch.overviewHeader.title": "Aperçu de votre organisation",
     "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingHeader.description": "Configurez votre organisation en procédant comme suit.",
     "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingHeader.title": "Premiers pas avec Workplace Search",
-    "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingSourcesCard.description": "Ajoutez des sources partagées pour votre organisation afin de commencer les recherches.",
-    "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingSourcesCard.title": "Sources partagées",
+    "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingSourcesCard.description": "Ajoutez des sources organisationnelles pour votre organisation afin de commencer les recherches.",
+    "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingSourcesCard.title": "Sources organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingUsersCard.description": "Invitez vos collègues dans cette organisation pour effectuer des recherches avec vous.",
+    "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingUsersCard.inviteFirstUsers.button": "Inviter des utilisateurs",
+    "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingUsersCard.inviteMoreUsers.button": "Inviter d'autres utilisateurs",
     "xpack.enterpriseSearch.workplaceSearch.overviewOnboardingUsersCard.title": "Utilisateurs et invitations",
     "xpack.enterpriseSearch.workplaceSearch.overviewUsersCard.title": "C'est bien, vous avez invité des collègues à effectuer des recherches avec vous.",
+    "xpack.enterpriseSearch.workplaceSearch.personalDashboard.readOnlyMode.warning": "Workplace Search est actuellement disponible uniquement pour la recherche, en raison de la maintenance périodique. Pour en savoir plus, contactez votre administrateur système.",
     "xpack.enterpriseSearch.workplaceSearch.personalDashboardSourceError": "Impossible de connecter la source, demandez de l'aide à votre administrateur. Message d'erreur : {error}",
     "xpack.enterpriseSearch.workplaceSearch.platinumFeature": "Fonctionnalité Platinum",
     "xpack.enterpriseSearch.workplaceSearch.privatePlatinumCallout.text": "Les sources privées requièrent une licence Platinum.",
@@ -9587,6 +11991,7 @@
     "xpack.enterpriseSearch.workplaceSearch.settings.configRemoved.message": "Retrait réussi de la configuration de {name}.",
     "xpack.enterpriseSearch.workplaceSearch.settings.confirmRemoveConfig.message": "Voulez-vous vraiment retirer la configuration OAuth pour {name} ?",
     "xpack.enterpriseSearch.workplaceSearch.settings.confirmRemoveConfigTitle": "Retirer la configuration",
+    "xpack.enterpriseSearch.workplaceSearch.settings.feedbackCallOutText": "Vous avez des commentaires sur le déploiement d'un pack de connecteurs {name} ? Faites-nous le savoir.",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconDescription": "Utilisé comme élément de marque pour les écrans de plus petite taille et les icônes de navigation",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconHelpText": "La taille maximale de fichier est de 2 Mo et les proportions recommandées sont de 1:1. Seuls les fichiers PNG sont pris en charge.",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconText": "icône",
@@ -9600,52 +12005,77 @@
     "xpack.enterpriseSearch.workplaceSearch.settings.resetImageConfirmationText": "Voulez-vous vraiment continuer ?",
     "xpack.enterpriseSearch.workplaceSearch.settings.resetImageTitle": "Réinitialiser sur la marque par défaut",
     "xpack.enterpriseSearch.workplaceSearch.settings.resetLogoDescription": "Vous êtes sur le point de réinitialiser le logo sur la marque par défaut de Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.setupGuide.button": "Premiers pas avec Workplace Search",
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.description": "Unifiez vos plateformes de contenu, telles que Google Drive et Salesforce, pour proposer une expérience de recherche personnalisée.",
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.imageAlt": "Premiers pas avec Workplace Search : un guide pour vous aider à configurer Workplace Search et vous expliquer son fonctionnement",
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.notConfigured": "Workplace Search n'est pas configuré dans Kibana. Suivez les instructions indiquées sur cette page.",
     "xpack.enterpriseSearch.workplaceSearch.source.text": "Source",
+    "xpack.enterpriseSearch.workplaceSearch.sourceIdentifier.sourceIdentifierFieldLabel": "Identificateur de source",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.detailsLabel": "Détails",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.reauthenticateStatusLinkLabel": "Authentifier à nouveau",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.remoteLabel": "Distant",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.remoteTooltip": "Les sources distantes s'appuient directement sur le service de recherche de la source ; aucun contenu n'est indexé avec Workplace Search. La vitesse et l'intégrité des résultats dépendent de la santé et des performances du service tiers.",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.searchableToggleLabel": "Bascule pour source interrogeable",
     "xpack.enterpriseSearch.workplaceSearch.sources.additionalConfig.heading": "Requiert une configuration supplémentaire",
+    "xpack.enterpriseSearch.workplaceSearch.sources.apiKeyLabel": "Clé d'API",
+    "xpack.enterpriseSearch.workplaceSearch.sources.apiKeysTitle": "Clés d'API",
     "xpack.enterpriseSearch.workplaceSearch.sources.applicationLinkTitles.github": "Portail du développeur GitHub",
     "xpack.enterpriseSearch.workplaceSearch.sources.baseUrlTitles.github": "URL de GitHub Enterprise",
-    "xpack.enterpriseSearch.workplaceSearch.sources.config.link": "Modifier les paramètres du connecteur de la source de contenu",
+    "xpack.enterpriseSearch.workplaceSearch.sources.blockedEmptyStateDescription": "Ajouter une fenêtre de temps bloqué pour n'effectuer les synchronisations qu'au bon moment.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.blockedEmptyStateTitle": "Vous n'avez pas de fenêtres de temps bloquées",
+    "xpack.enterpriseSearch.workplaceSearch.sources.blockedWindowsTitle": "Fenêtres de temps bloquées",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud": "Cloud",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing": "Partage de fichiers",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft": "Microsoft",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.office": "Office 365",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.storage": "Stockage",
+    "xpack.enterpriseSearch.workplaceSearch.sources.config.link": "Modifier les paramètres du connecteur",
     "xpack.enterpriseSearch.workplaceSearch.sources.config.title": "Configuration de la source de contenu",
     "xpack.enterpriseSearch.workplaceSearch.sources.configuration.title": "Configuration",
     "xpack.enterpriseSearch.workplaceSearch.sources.contentLoading.text": "Chargement du contenu…",
     "xpack.enterpriseSearch.workplaceSearch.sources.contentSummary.title": "Résumé du contenu",
+    "xpack.enterpriseSearch.workplaceSearch.sources.contentSummaryLoading.text": "Chargement des détails du résumé...",
     "xpack.enterpriseSearch.workplaceSearch.sources.contentType.header": "Type de contenu",
     "xpack.enterpriseSearch.workplaceSearch.sources.created.label": "Créé le : ",
     "xpack.enterpriseSearch.workplaceSearch.sources.customCallout.title": "Vous découvrez les sources personnalisées ?",
     "xpack.enterpriseSearch.workplaceSearch.sources.customSourceDocs.link": "documentation",
     "xpack.enterpriseSearch.workplaceSearch.sources.customSourceDocs.text": "En savoir plus sur l'ajout de contenu dans notre {documentationLink}",
+    "xpack.enterpriseSearch.workplaceSearch.sources.deletionSyncDescription": "Supprime les documents qui n'existent plus dans la source de contenu",
+    "xpack.enterpriseSearch.workplaceSearch.sources.deletionSyncLabel": "Synchronisation des suppressions",
     "xpack.enterpriseSearch.workplaceSearch.sources.docPermissions.description": "Les autorisations de niveau document gèrent l'accès au contenu selon les attributs individuels ou de groupe. Autorisez ou refusez l'accès à des documents spécifiques.",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentation": "Documentation",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissions.text": "Utiliser des autorisations de niveau document",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissions.title": "Les autorisations de niveau document",
-    "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissionsDisabled.text": "Désactivées pour ces sources",
+    "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissionsDisabled.text": "Désactivées pour cette source",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissionsLink": "En savoir plus sur la configuration des autorisations de niveau document",
+    "xpack.enterpriseSearch.workplaceSearch.sources.downloadDiagnosticButton": "Télécharger les fichiers groupés de diagnostic",
     "xpack.enterpriseSearch.workplaceSearch.sources.emptyActivity.title": "Il n'existe aucune activité récente",
     "xpack.enterpriseSearch.workplaceSearch.sources.event.header": "Événement",
     "xpack.enterpriseSearch.workplaceSearch.sources.externalIdentities.link": "API des identités externes",
     "xpack.enterpriseSearch.workplaceSearch.sources.externalIdentities.text": "L'{externalIdentitiesLink} doit être utilisée pour configurer les mappings d'accès utilisateur. Lisez le guide pour en savoir plus.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.feedbackCallOutText": "Vous avez des commentaires sur le déploiement d'un pack de connecteurs {name} ? Faites-nous le savoir.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.feedbackLinkLabel": "Vous avez des commentaires sur le déploiement d'un connecteur {name} ? Faites-nous le savoir.",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.additionalConfigurationNeeded": "Cette source requiert une configuration supplémentaire.",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceConfigUpdated": "Mise à jour réussie de la configuration.",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceConnected": "Connexion réussie de {sourceName}.",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceNameChanged": "Application réussie du changement de nom en {sourceName}.",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceRemoved": "Suppression réussie de {sourceName}.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.externalConnectorCreated": "Création réussie du connecteur externe.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.fullSyncDescription": "Récupère tous les documents possibles de la source de contenu",
+    "xpack.enterpriseSearch.workplaceSearch.sources.fullSyncLabel": "Synchronisation complète",
     "xpack.enterpriseSearch.workplaceSearch.sources.groupAccess.title": "Accès du groupe",
     "xpack.enterpriseSearch.workplaceSearch.sources.helpText.custom": "Pour créer une source d'API personnalisée, fournissez un nom descriptif et lisible par un humain. Ce nom apparaîtra tel quel dans les diverses expériences de recherche et interfaces de gestion.",
     "xpack.enterpriseSearch.workplaceSearch.sources.id.label": "Identificateur de source",
+    "xpack.enterpriseSearch.workplaceSearch.sources.incrementalSyncDescription": "Récupère les documents/mises à jour depuis la dernière synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.incrementalSyncLabel": "Synchronisation incrémentielle",
+    "xpack.enterpriseSearch.workplaceSearch.sources.indexingRulesTable.includeEverythingMessage": "Inclure tout le reste à partir de cette source",
     "xpack.enterpriseSearch.workplaceSearch.sources.items.header": "Éléments",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnCustom.features.button": "Découvrir les fonctionnalités de Platinum",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnMore.link": "En savoir plus",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnMore.text": "{learnMoreLink} sur les autorisations",
     "xpack.enterpriseSearch.workplaceSearch.sources.licenseCallout.description": "Pour en savoir plus, contactez votre administrateur d'expérience de recherche.",
     "xpack.enterpriseSearch.workplaceSearch.sources.licenseCallout.title": "Les sources privées ne sont plus disponibles",
+    "xpack.enterpriseSearch.workplaceSearch.sources.nextSyncRunningMessage": "dès que le travail en cours se termine",
     "xpack.enterpriseSearch.workplaceSearch.sources.noContent.title": "Aucun contenu pour l'instant",
     "xpack.enterpriseSearch.workplaceSearch.sources.noContentEmpty.message": "Cette source ne comprend aucun contenu pour l'instant",
     "xpack.enterpriseSearch.workplaceSearch.sources.noContentForValue.message": "Aucun résultat pour \"{contentFilterValue}\"",
@@ -9658,14 +12088,16 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.blogPosts": "Articles de blog",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.bugs": "Bugs",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.campaigns": "Campagnes",
+    "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.cases": "Cas (y compris les flux et les commentaires)",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.contacts": "Contacts",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.directMessages": "Messages directs",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.emails": "E-mails",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.epics": "Epics",
+    "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.files": "Fichiers (markdown uniquement)",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.folders": "Dossiers",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.gSuiteFiles": "Documents Google G Suite (documents, feuilles, présentations)",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.incidents": "Incidents",
-    "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.issues": "Problèmes",
+    "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.issues": "Problèmes (incluant les commentaires)",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.items": "Éléments",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.leads": "Prospects",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.opportunities": "Opportunités",
@@ -9673,7 +12105,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.privateMessages": "Messages de canal privé dans lesquels vous êtes un participant actif",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.projects": "Projets",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.publicMessages": "Messages de canal public",
-    "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.pullRequests": "Requêtes d'extraction",
+    "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.pullRequests": "Requêtes d'extraction (incluant les commentaires)",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.repositoryList": "Liste de référentiels",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.sites": "Sites",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.spaces": "Espaces",
@@ -9682,14 +12114,20 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.tickets": "Tickets",
     "xpack.enterpriseSearch.workplaceSearch.sources.objTypes.users": "Utilisateurs",
     "xpack.enterpriseSearch.workplaceSearch.sources.org.description": "Les sources des organisations sont disponibles pour toute l'organisation et peuvent être attribuées à des groupes d'utilisateurs spécifiques.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.org.empty.description": "Lorsque des sources de contenu seront partagées avec vous, elles seront affichées ici et seront disponibles via l'expérience de recherche.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.org.empty.title": "Aucune source de contenu disponible",
     "xpack.enterpriseSearch.workplaceSearch.sources.org.link": "Ajouter une source de contenu d'organisation",
     "xpack.enterpriseSearch.workplaceSearch.sources.org.title": "Sources d'organisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.permissionsSyncDescription": "Récupère tous les changements d'autorisation depuis la dernière synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.permissionsSyncLabel": "Synchronisation des permissions",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.canCreate.description": "Vérifiez le statut de toutes les sources privées connectées et gérez les sources privées pour votre compte.",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.canCreate.title": "Gérer les sources de contenu privé",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.empty.title": "Vous n'avez aucune source privée",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.header.description": "Les sources de contenu privé sont disponibles uniquement pour vous.",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.header.title": "Mes sources de contenu privé",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.link": "Ajouter une source de contenu privé",
+    "xpack.enterpriseSearch.workplaceSearch.sources.private.privateOrg.header.description": "Vous disposez d'un accès aux sources suivantes par le biais {newline} {groups, plural, one {du groupe} other {des groupes}} {groupsSentence}.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.private.privateOrg.header.title": "Sources de contenu organisationnelles",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.vewOnly.description": "Vérifiez le statut de toutes les sources partagées avec votre groupe.",
     "xpack.enterpriseSearch.workplaceSearch.sources.private.vewOnly.title": "Vérifier les sources de groupe",
     "xpack.enterpriseSearch.workplaceSearch.sources.ready.text": "Prêt à rechercher",
@@ -9700,10 +12138,29 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.settings.heading": "Paramètres",
     "xpack.enterpriseSearch.workplaceSearch.sources.settings.title": "Nom de la source de contenu",
     "xpack.enterpriseSearch.workplaceSearch.sources.settingsModal.text": "Vos documents source seront supprimés de Workplace Search.{lineBreak}Voulez-vous vraiment supprimer {name} ?",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsAddRuleLabel": "Ajouter une règle d'indexation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsAssetsLabel": "Ressources",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsDescription": "Gérez de manière flexible les documents à synchroniser et à rendre disponibles pour la recherche en utilisant les contrôles granulaires ci-dessous.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsLearnMoreLink": "En savoir plus sur les types d'objets de synchronisation.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsDescription": "Ajouter une règle d'indexation pour personnaliser les données qui sont synchronisées à partir de {contentSourceName}. Tout est inclus par défaut, et les documents sont validés par rapport à l'ensemble des règles d'indexation configurées, en commençant par le haut de la liste.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsLabel": "Objets",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableExcludeLabel": "Exclure",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableFileLabel": "Type de fichier",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableIncludeLabel": "Inclure",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableItemLabel": "Article",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTablePathLabel": "Chemin",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTablePolicyLabel": "Politique",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableRuleLabel": "Règle",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableValueLabel": "Valeur",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsSyncLearnMoreLink": "En savoir plus sur la personnalisation de vos règles d'indexation.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceBlockedTimeWindowsLinkLabel": "fenêtres de temps bloquées",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.searchBar.filter.placeholder": "Filtrer le contenu...",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.searchBar.search.placeholder": "Rechercher du contenu...",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.title": "Contenu de source",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceDisabled.button": "Explorer la licence Platinum",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceDisabled.description": "Le niveau de licence de votre organisation a changé. Vos données sont en sécurité, mais les autorisations de niveau document ne sont plus prises en charge et l'interrogation de cette source a été désactivée. Passez à une licence Platinum pour réactiver cette source.",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceDisabled.title": "La source de contenu est désactivée",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceFrequencyDescription": "Gérez la fréquence de la synchronisation des données de Workplace Search vers cette source de contenu. Effectuez des synchronisations plus fréquentes pour garantir la mise à jour de vos données. Synchronisation moins fréquente pour réduire la charge sur les serveurs tiers.",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceName.label": "Nom de source",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.box": "Box",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.confluence": "Confluence",
@@ -9721,9 +12178,20 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.salesforceSandbox": "Sandbox Salesforce",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.serviceNow": "ServiceNow",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.sharePoint": "SharePoint Online",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.sharePointServer": "Serveur SharePoint",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.slack": "Slack",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zendesk": "Zendesk",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceOverviewTitle": "Aperçu de la source",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncConfirmMessage": "Êtes-vous sûr de vouloir poursuivre cette demande et d'arrêter toutes les autres synchronisations ?",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncConfirmTitle": "Démarrer une nouvelle synchronisation de contenu ?",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncFrequencyLinkLabel": "fréquence de synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncFrequencyTitle": "Fréquence de synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationButtonLabel": "Contenu de synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationDescription": "Activez ou désactivez la synchronisation des données de cette source de contenu avec Workplace Search.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationFrequencyTitle": "Fréquence de synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationTitle": "Synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationToggleDescription": "Le contenu source sera automatiquement maintenu en synchronisation.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationToggleLabel": "Synchroniser cette source",
     "xpack.enterpriseSearch.workplaceSearch.sources.status.header": "Statut",
     "xpack.enterpriseSearch.workplaceSearch.sources.status.heading": "Tout semble parfait",
     "xpack.enterpriseSearch.workplaceSearch.sources.status.label": "Statut : ",
@@ -9731,10 +12199,19 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.syncDiagnosticsButton": "Télécharger les données de diagnostic",
     "xpack.enterpriseSearch.workplaceSearch.sources.syncDiagnosticsDescription": "Récupérez les données de diagnostic pertinentes pour résoudre les problèmes liés aux processus de synchronisation active.",
     "xpack.enterpriseSearch.workplaceSearch.sources.syncDiagnosticsTitle": "Diagnostic de synchronisation",
+    "xpack.enterpriseSearch.workplaceSearch.sources.synchronizationCallout": "Configurez {syncFrequencyLink} ou {blockTimeWindowsLink}.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.synchronizationDisabledDescription": "Contactez votre administrateur pour activer les contrôles de synchronisation.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.synchronizationDisabledTitle": "La synchronisation de la source est désactivée.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.syncSettingsUpdatedMessage": "Mise à jour des paramètres de synchronisation de la source.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.syncUnsavedChangesMessage": "Vos modifications n'ont pas été enregistrées. Voulez-vous vraiment quitter ?",
     "xpack.enterpriseSearch.workplaceSearch.sources.time.header": "Heure",
     "xpack.enterpriseSearch.workplaceSearch.sources.totalDocuments.label": "Total des documents",
     "xpack.enterpriseSearch.workplaceSearch.sources.understandButton": "Je comprends",
-    "xpack.enterpriseSearch.workplaceSearch.sourcesOnboardingCard.description": "Vous avez ajouté {sourcesCount, number} {sourcesCount, plural, one {source partagée} other {sources partagées}}. Bonne recherche.",
+    "xpack.enterpriseSearch.workplaceSearch.sources.utcLabel": "Heure UTC actuelle : {utcTime}",
+    "xpack.enterpriseSearch.workplaceSearch.sources.utcTitle": "Toutes les heures sont en UTC",
+    "xpack.enterpriseSearch.workplaceSearch.sourcesOnboardingCard.addFirstSources.button": "Ajouter des sources",
+    "xpack.enterpriseSearch.workplaceSearch.sourcesOnboardingCard.addMoreSources.button": "Ajouter d'autres sources",
+    "xpack.enterpriseSearch.workplaceSearch.sourcesOnboardingCard.description": "Vous avez ajouté {sourcesCount, number} {sourcesCount, plural, one {source} other {sources}} organisationnelles. Bonne recherche.",
     "xpack.enterpriseSearch.workplaceSearch.sourcesView.modal.docPermissions.description": "Les documents ne seront pas interrogeables à partir de Workplace Search tant que les mappings d'utilisateur et de groupe n'auront pas été configurés. {documentPermissionsLink}.",
     "xpack.enterpriseSearch.workplaceSearch.sourcesView.modal.heading": "{addedSourceName} requiert une configuration supplémentaire",
     "xpack.enterpriseSearch.workplaceSearch.sourcesView.modal.success": "{addedSourceName} a été connectée avec succès et la synchronisation initiale de contenu est déjà en cours. Étant donné que vous avez choisi de synchroniser les informations d'autorisation de niveau document, vous devez maintenant fournir les mappings d'utilisateur et de groupe à l'aide de l'{externalIdentitiesLink}.",
@@ -9745,9 +12222,10 @@
     "xpack.eventLog.savedObjectProviderRegistry.getProvidersClient.noDefaultProvider": "Le log d'événements requiert un fournisseur par défaut.",
     "xpack.features.advancedSettingsFeatureName": "Paramètres avancés",
     "xpack.features.dashboardFeatureName": "Tableau de bord",
+    "xpack.features.dataViewFeatureName": "Gestion de la vue de données",
     "xpack.features.devToolsFeatureName": "Outils de développement",
     "xpack.features.devToolsPrivilegesTooltip": "L'utilisateur doit également recevoir les privilèges de cluster et d'index Elasticsearch appropriés.",
-    "xpack.features.discoverFeatureName": "Discover",
+    "xpack.features.discoverFeatureName": "Découverte",
     "xpack.features.ossFeatures.dashboardCreateShortUrlPrivilegeName": "Créer des URL courtes",
     "xpack.features.ossFeatures.dashboardSearchSessionsFeatureName": "Stocker les sessions de recherche",
     "xpack.features.ossFeatures.dashboardShortUrlSubFeatureName": "URL courtes",
@@ -9764,12 +12242,23 @@
     "xpack.features.ossFeatures.visualizeCreateShortUrlPrivilegeName": "Créer des URL courtes",
     "xpack.features.ossFeatures.visualizeShortUrlSubFeatureName": "URL courtes",
     "xpack.features.savedObjectsManagementFeatureName": "Gestion des objets enregistrés",
-    "xpack.features.visualizeFeatureName": "Visualiser la bibliothèque",
+    "xpack.features.visualizeFeatureName": "Bibliothèque Visualize",
+    "xpack.fileUpload.dataViewAlreadyExistsErrorMessage": "La vue de données existe déjà.",
     "xpack.fileUpload.fileSizeError": "La taille du fichier {fileSize} dépasse la taille maximale de fichier de {maxFileSize}",
     "xpack.fileUpload.fileTypeError": "Le fichier ne fait pas partie des types acceptables :{types}",
+    "xpack.fileUpload.geoFilePicker.acceptedFormats": "Formats acceptés : {fileTypes}",
+    "xpack.fileUpload.geoFilePicker.filePicker": "Sélectionner ou glisser-déposer un fichier",
+    "xpack.fileUpload.geoFilePicker.noFeaturesDetected": "Aucune fonctionnalité trouvée dans le fichier sélectionné.",
+    "xpack.fileUpload.geoFilePicker.previewSummary": "Affichage de l'aperçu de {numFeatures} fonctionnalités, {previewCoverage} % du fichier.",
     "xpack.fileUpload.geojsonImporter.noGeometry": "La fonctionnalité ne contient pas le champ de géométrie requis",
+    "xpack.fileUpload.geoUploadWizard.creatingDataView": "Création de la vue de données : {indexName}",
+    "xpack.fileUpload.geoUploadWizard.dataIndexingError": "Erreur d'indexation des données",
+    "xpack.fileUpload.geoUploadWizard.dataIndexingStarted": "Création de l'index : {indexName}",
+    "xpack.fileUpload.geoUploadWizard.dataViewError": "Impossible de créer la vue de données",
+    "xpack.fileUpload.geoUploadWizard.writingToIndex": "Écriture dans l'index : {progress} % terminé",
     "xpack.fileUpload.import.noIdOrIndexSuppliedErrorMessage": "aucun ID ni index fournis",
     "xpack.fileUpload.importComplete.copyButtonAriaLabel": "Copier dans le presse-papiers",
+    "xpack.fileUpload.importComplete.dataViewResponse": "Réponse de la vue de données",
     "xpack.fileUpload.importComplete.failedFeaturesMsg": "Impossible d'indexer {numFailures} fonctionnalités.",
     "xpack.fileUpload.importComplete.indexingResponse": "Importer la réponse",
     "xpack.fileUpload.importComplete.indexMgmtLink": "Gestion des index.",
@@ -9793,11 +12282,18 @@
     "xpack.fileUpload.indexNameForm.indexNameReqField": "Nom d'index, champ requis",
     "xpack.fileUpload.indexNameRequired": "Nom d'index requis",
     "xpack.fileUpload.indexSettings.enterIndexTypeLabel": "Type d'index",
+    "xpack.fileUpload.invalidRuntimeFieldMessage": "Champ d'exécution non valide",
     "xpack.fileUpload.maxFileSizeUiSetting.description": "Définit la limite de taille du fichier lors de l'importation des fichiers. La plus grande valeur prise en charge pour ce paramètre est de 1 Go.",
     "xpack.fileUpload.maxFileSizeUiSetting.error": "Doit être une taille de données valide, par exemple, 200 Mo, 1 Go",
     "xpack.fileUpload.maxFileSizeUiSetting.name": "Taille maximale de chargement de fichier",
     "xpack.fileUpload.noFileNameError": "Nom de fichier non fourni",
+    "xpack.fileUpload.shapefile.sideCarFilePicker.error": "{ext} prévu pour être {shapefileName}{ext}",
+    "xpack.fileUpload.shapefile.sideCarFilePicker.promptText": "Sélectionner fichier \"{ext}\"",
     "xpack.fleet.addAgentButton": "Ajouter un agent",
+    "xpack.fleet.addAgentHelpPopover.documentationLink": "En savoir plus sur Elastic Agent.",
+    "xpack.fleet.addAgentHelpPopover.footActionButton": "Parfait",
+    "xpack.fleet.addAgentHelpPopover.popoverBody": "Pour que les intégrations fonctionnent correctement, ajoutez {elasticAgent} à votre hôte pour collecter les données et les envoyer à Elastic Stack. {learnMoreLink}",
+    "xpack.fleet.addAgentHelpPopover.title": "N'oubliez pas d'ajouter l'agent à votre hôte",
     "xpack.fleet.agentBulkActions.agentsSelected": "{count, plural, one {# agent sélectionné} other {# agents sélectionnés} =all {Tous les agents sélectionnés}}",
     "xpack.fleet.agentBulkActions.clearSelection": "Effacer la sélection",
     "xpack.fleet.agentBulkActions.reassignPolicy": "Attribuer à la nouvelle politique",
@@ -9827,6 +12323,7 @@
     "xpack.fleet.agentDetails.unexceptedErrorTitle": "Erreur lors du chargement de l'agent",
     "xpack.fleet.agentDetails.versionLabel": "Version d'agent",
     "xpack.fleet.agentDetails.viewAgentListTitle": "Afficher tous les agents",
+    "xpack.fleet.agentDetails.viewDashboardButtonLabel": "Afficher le tableau de bord de l'agent",
     "xpack.fleet.agentDetailsIntegrations.actionsLabel": "Actions",
     "xpack.fleet.agentDetailsIntegrations.inputTypeEndpointText": "Point de terminaison",
     "xpack.fleet.agentDetailsIntegrations.inputTypeLabel": "Entrée",
@@ -9838,26 +12335,33 @@
     "xpack.fleet.agentEnrollment.agentDescription": "Ajoutez des agents Elastic à vos hôtes pour collecter des données et les envoyer à la Suite Elastic.",
     "xpack.fleet.agentEnrollment.agentsNotInitializedText": "Avant d'enregistrer des agents, {link}.",
     "xpack.fleet.agentEnrollment.closeFlyoutButtonLabel": "Fermer",
-    "xpack.fleet.agentEnrollment.copyPolicyButton": "Copier dans le presse-papier",
-    "xpack.fleet.agentEnrollment.downloadDescription": "Le serveur Fleet fonctionne sur un agent Elastic Agent. Vous pouvez télécharger les fichiers binaires et les signatures de vérification d'Elastic Agent à partir de la page de téléchargement d'Elastic.",
+    "xpack.fleet.agentEnrollment.confirmation.button": "Voir les agents inscrits",
+    "xpack.fleet.agentEnrollment.copyPolicyButton": "Copier dans le presse-papiers",
+    "xpack.fleet.agentEnrollment.downloadDescription": "Installez l'agent Elastic sur les hôtes que vous souhaitez monitorer. N'installez pas cette politique d'agent sur un hôte contenant Fleet Server. Vous pouvez télécharger les fichiers binaires et les signatures de vérification d'Elastic Agent à partir de la page de téléchargement d'Elastic.",
+    "xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer": "Le serveur Fleet fonctionne sur un agent Elastic Agent. Installez cet agent sur un hôte centralisé afin que les autres hôtes que vous souhaitez monitorer puissent s'y connecter. En production, nous recommandons d'utiliser un ou plusieurs hôtes dédiés. Vous pouvez télécharger les fichiers binaires et les signatures de vérification d'Elastic Agent à partir de la page de téléchargement d'Elastic.",
     "xpack.fleet.agentEnrollment.downloadLink": "Accéder à la page de téléchargement",
-    "xpack.fleet.agentEnrollment.downloadPolicyButton": "Télécharger la stratégie",
-    "xpack.fleet.agentEnrollment.downloadUseLinuxInstaller": "Utilisateurs de Linux : nous vous recommandons d'utiliser les programmes d'installation sur (RPM/DEB), car ils permettent la mise à niveau de votre agent dans Fleet.",
+    "xpack.fleet.agentEnrollment.downloadPolicyButton": "Télécharger la politique",
+    "xpack.fleet.agentEnrollment.downloadPolicyButtonk8s": "Télécharger le manifeste",
+    "xpack.fleet.agentEnrollment.downloadUseLinuxInstaller": "Utilisateurs de Linux : Nous recommandons le programme d'installation (TAR) plutôt que les packs système (RPM/DEB), car il vous permet de mettre à jour votre agent dans Fleet.",
+    "xpack.fleet.agentEnrollment.enrollFleetTabLabel": "Enregistrer dans Fleet",
+    "xpack.fleet.agentEnrollment.enrollStandaloneTabLabel": "Exécuter de façon autonome",
     "xpack.fleet.agentEnrollment.fleetSettingsLink": "Paramètres de Fleet",
     "xpack.fleet.agentEnrollment.flyoutTitle": "Ajouter un agent",
     "xpack.fleet.agentEnrollment.managedDescription": "L'enregistrement d'un agent Elastic Agent dans Fleet permet de centraliser la gestion de ce dernier tout en déployant automatiquement les mises à jour.",
     "xpack.fleet.agentEnrollment.missingFleetHostCalloutText": "L'enregistrement d'agents dans Fleet nécessite l'URL de l'hôte de votre serveur Fleet. Vous pouvez ajouter ces informations dans Paramètres de Fleet. Pour en savoir plus, consultez {link}.",
     "xpack.fleet.agentEnrollment.missingFleetHostCalloutTitle": "URL de l'hôte du serveur Fleet manquante",
-    "xpack.fleet.agentEnrollment.missingFleetHostGuideLink": "Guide de l'utilisateur de Fleet",
+    "xpack.fleet.agentEnrollment.missingFleetHostGuideLink": "Guide de Fleet et d'Elastic Agent",
     "xpack.fleet.agentEnrollment.setUpAgentsLink": "configurer la gestion centralisée des agents Elastic",
     "xpack.fleet.agentEnrollment.standaloneDescription": "Exécutez un agent Elastic Agent de façon autonome pour le configurer et le mettre à jour manuellement sur l'hôte sur lequel il est installé.",
-    "xpack.fleet.agentEnrollment.stepChooseAgentPolicyTitle": "Sélectionner une stratégie d'agent",
+    "xpack.fleet.agentEnrollment.stepChooseAgentPolicyTitle": "Quel type d'hôte ajoutez-vous ?",
     "xpack.fleet.agentEnrollment.stepConfigureAgentDescription": "Copiez cette stratégie dans le fichier {fileName} de l'hôte sur lequel l'agent Elastic Agent est installé. Modifiez {ESUsernameVariable} et {ESPasswordVariable} dans la section {outputSection} du fichier {fileName} pour utiliser vos identifiants de connexion Elasticsearch.",
+    "xpack.fleet.agentEnrollment.stepConfigureAgentDescriptionk8s": "Copiez ou téléchargez le manifeste Kubernetes à l'intérieur du cluster Kubernetes. Modifiez {ESUsernameVariable} et {ESPasswordVariable} dans les variables d'environnement de Daemonset et appliquez le manifeste.",
     "xpack.fleet.agentEnrollment.stepConfigureAgentTitle": "Configurer l'agent",
     "xpack.fleet.agentEnrollment.stepConfigurePolicyAuthenticationTitle": "Sélectionner le jeton d'enregistrement",
+    "xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle": "Télécharger le serveur Fleet sur un hôte centralisé",
     "xpack.fleet.agentEnrollment.stepDownloadAgentTitle": "Télécharger l'agent Elastic Agent sur votre hôte",
     "xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle": "Enregistrer et démarrer l'agent Elastic Agent",
-    "xpack.fleet.agentEnrollment.stepRunAgentDescription": "Depuis le répertoire des agents, exécutez cette commande pour installer, enregistrer et démarrer un agent Elastic Agent. Vous pouvez réutiliser cette commande pour configurer des agents sur plusieurs hôtes. Cette action nécessite de disposer de privilèges d'administrateur.",
+    "xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s": "À partir du répertoire où le manifeste Kubernetes est téléchargé, exécutez la commande Appliquer.",
     "xpack.fleet.agentHealth.checkInTooltipText": "Dernier archivage le {lastCheckIn}",
     "xpack.fleet.agentHealth.healthyStatusText": "Sain",
     "xpack.fleet.agentHealth.inactiveStatusText": "Inactif",
@@ -9900,6 +12404,7 @@
     "xpack.fleet.agentLogs.downloadLink": "télécharger",
     "xpack.fleet.agentLogs.logDisabledCallOutDescription": "Mettez à jour la stratégie de l'agent {settingsLink} pour activer la collecte de logs.",
     "xpack.fleet.agentLogs.logDisabledCallOutTitle": "La collecte de logs est désactivée",
+    "xpack.fleet.agentLogs.logLevelEmpty": "Aucun log trouvé",
     "xpack.fleet.agentLogs.logLevelSelectText": "Niveau du log",
     "xpack.fleet.agentLogs.oldAgentWarningTitle": "La vue Logs requiert Elastic Agent 7.11 ou une version ultérieure. Pour mettre à niveau un agent, accédez au menu Actions ou {downloadLink} une version plus récente.",
     "xpack.fleet.agentLogs.openInLogsUiLinkText": "Ouvrir dans Logs",
@@ -9917,25 +12422,49 @@
     "xpack.fleet.agentPolicy.confirmModalDescription": "Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
     "xpack.fleet.agentPolicy.confirmModalTitle": "Enregistrer et déployer les modifications",
     "xpack.fleet.agentPolicy.linkedAgentCountText": "{count, plural, one {# agent} other {# agents}}",
+    "xpack.fleet.agentPolicy.outputOptions.defaultOutputText": "Par défaut (actuellement {defaultOutputName})",
+    "xpack.fleet.agentPolicy.postInstallAddAgentModal": "Intégration de {packageName} ajoutée",
+    "xpack.fleet.agentPolicy.postInstallAddAgentModalCancelButtonLabel": "Ajouter Elastic Agent ultérieurement",
+    "xpack.fleet.agentPolicy.postInstallAddAgentModalConfirmButtonLabel": "Ajouter Elastic Agent à vos hôtes",
+    "xpack.fleet.agentPolicy.postInstallAddAgentModalDescription": "Pour terminer cette intégration, ajoutez {elasticAgent} à vos hôtes pour collecter les données et les envoyer à Elastic Stack",
+    "xpack.fleet.agentPolicy.saveIntegrationTooltip": "Pour enregistrer la politique d'intégration, vous devez avoir activé la sécurité et disposer du privilège Tout pour les intégrations. Contactez votre administrateur.",
     "xpack.fleet.agentPolicyActionMenu.buttonText": "Actions",
-    "xpack.fleet.agentPolicyActionMenu.copyPolicyActionText": "Copier la stratégie",
+    "xpack.fleet.agentPolicyActionMenu.copyPolicyActionText": "Dupliquer la politique",
     "xpack.fleet.agentPolicyActionMenu.enrollAgentActionText": "Ajouter un agent",
-    "xpack.fleet.agentPolicyActionMenu.viewPolicyText": "Afficher la stratégie",
+    "xpack.fleet.agentPolicyActionMenu.viewPolicyText": "Afficher la politique",
+    "xpack.fleet.agentPolicyCreation.created": "Politique d'agent créée",
+    "xpack.fleet.agentPolicyCreation.errorMessage": "Une politique d'agent existe déjà avec ce nom.",
+    "xpack.fleet.agentPolicyCreation.failed": "Échec de la création de la politique d'agent",
     "xpack.fleet.agentPolicyForm.advancedOptionsToggleLabel": "Options avancées",
+    "xpack.fleet.agentPolicyForm.createAgentPolicyDescription": "Ajoutez cette intégration à un nouvel ensemble d'hôtes en créant une nouvelle politique d'agent. Vous pouvez ajouter un agent à l'étape suivante.",
+    "xpack.fleet.agentPolicyForm.createAgentPolicyDocLink": "politique d'agent",
+    "xpack.fleet.agentPolicyForm.createAgentPolicyFleetServer": "Fleet Server fonctionne sur Elastic Agent, et les agents sont inscrits dans des politiques d'agent qui représentent des hôtes. Nous devons créer une politique d'agent dédié pour que Fleet Server fonctionne sur des hôtes dédiés.",
+    "xpack.fleet.agentPolicyForm.createAgentPolicyLabel": "Créer une stratégie d'agent",
+    "xpack.fleet.agentPolicyForm.createAgentPolicyText": "Créer une politique",
+    "xpack.fleet.agentPolicyForm.createAgentPolicyTypeOfHosts": "Les types d'hôtes sont contrôlés par une {agentPolicy}. Créez une nouvelle politique d'agent pour commencer.",
+    "xpack.fleet.agentPolicyForm.dataOutputDescription": "Sélectionnez la sortie à utiliser pour les données provenant des intégrations.",
+    "xpack.fleet.agentPolicyForm.dataOutputLabel": "Sortie pour les intégrations",
+    "xpack.fleet.agentPolicyForm.descriptionDescription": "Ajoutez une description de la manière dont cette politique sera utilisée.",
     "xpack.fleet.agentPolicyForm.descriptionFieldLabel": "Description",
-    "xpack.fleet.agentPolicyForm.descriptionFieldPlaceholder": "Comment cette stratégie sera-t-elle utilisée ?",
+    "xpack.fleet.agentPolicyForm.descriptionFieldPlaceholder": "Description facultative",
+    "xpack.fleet.agentPolicyForm.monitoringDescription": "La collecte des logs de monitoring et des indicateurs créera également une intégration {agent}. Les données de monitoring sont écrites dans l'espace de nom par défaut indiqué ci-dessus.",
     "xpack.fleet.agentPolicyForm.monitoringLabel": "Monitoring des agents",
     "xpack.fleet.agentPolicyForm.monitoringLogsFieldLabel": "Collecter les logs des agents",
     "xpack.fleet.agentPolicyForm.monitoringLogsTooltipText": "Collecter les logs des agents Elastic Agent qui utilisent cette stratégie.",
     "xpack.fleet.agentPolicyForm.monitoringMetricsFieldLabel": "Collecter les indicateurs des agents",
     "xpack.fleet.agentPolicyForm.monitoringMetricsTooltipText": "Collecter les indicateurs des agents Elastic Agent qui utilisent cette stratégie.",
+    "xpack.fleet.agentPolicyForm.monitoringOutputDescription": "Sélectionner la sortie à utiliser pour les données de surveillance propres aux agents.",
+    "xpack.fleet.agentPolicyForm.monitoringOutputLabel": "Sortie pour le monitoring des agents",
     "xpack.fleet.agentPolicyForm.nameFieldLabel": "Nom",
     "xpack.fleet.agentPolicyForm.nameFieldPlaceholder": "Choisir un nom",
     "xpack.fleet.agentPolicyForm.nameRequiredErrorMessage": "Le nom de la stratégie d'agent est obligatoire",
     "xpack.fleet.agentPolicyForm.namespaceFieldDescription": "Les espaces de noms sont des regroupements arbitraires configurables par l'utilisateur qui facilitent la recherche de données et la gestion des autorisations utilisateur. L'espace de nom d'une stratégie permet de nommer les flux de données de son intégration. {fleetUserGuide}.",
     "xpack.fleet.agentPolicyForm.nameSpaceFieldDescription.fleetUserGuideLabel": "En savoir plus",
     "xpack.fleet.agentPolicyForm.namespaceFieldLabel": "Espace de nom par défaut",
-    "xpack.fleet.agentPolicyForm.systemMonitoringText": "Collecter les indicateurs système",
+    "xpack.fleet.agentPolicyForm.newAgentPolicyFieldLabel": "Nouveau nom de la stratégie d'agent",
+    "xpack.fleet.agentPolicyForm.outputOptionDisabledAPMAndLogstashText": "La sortie Logstash pour l'intégration des agents n'est pas prise en charge pour APM",
+    "xpack.fleet.agentPolicyForm.systemMonitoringText": "Collecte des logs et des mesures du système",
+    "xpack.fleet.agentPolicyForm.systemMonitoringTooltipText": "Cela ajoutera également une intégration {system} pour collecter les logs et les indicateurs du système.",
     "xpack.fleet.agentPolicyForm.unenrollmentTimeoutDescription": "Délai d'expiration facultatif en secondes. Si une valeur est renseignée, un agent est automatiquement désenregistré après une période d'inactivité équivalente à ce délai.",
     "xpack.fleet.agentPolicyForm.unenrollmentTimeoutLabel": "Délai d'expiration pour le désenregistrement",
     "xpack.fleet.agentPolicyForm.unenrollTimeoutMinValueErrorMessage": "Le délai d'expiration doit être supérieur à zéro.",
@@ -9966,37 +12495,44 @@
     "xpack.fleet.agentStatus.inactiveLabel": "Inactif",
     "xpack.fleet.agentStatus.offlineLabel": "Hors ligne",
     "xpack.fleet.agentStatus.unhealthyLabel": "Défectueux",
-    "xpack.fleet.agentStatus.updatingLabel": "Mise à jour en cours",
+    "xpack.fleet.agentStatus.updatingLabel": "Mise à jour",
     "xpack.fleet.appNavigation.agentsLinkText": "Agents",
     "xpack.fleet.appNavigation.dataStreamsLinkText": "Flux de données",
     "xpack.fleet.appNavigation.enrollmentTokensText": "Jetons d'enregistrement",
-    "xpack.fleet.appNavigation.integrationsAllLinkText": "Parcourir",
-    "xpack.fleet.appNavigation.integrationsInstalledLinkText": "Gérer",
+    "xpack.fleet.appNavigation.integrationsAllLinkText": "Parcourir les intégrations",
+    "xpack.fleet.appNavigation.integrationsInstalledLinkText": "Intégrations installées",
     "xpack.fleet.appNavigation.policiesLinkText": "Stratégies d'agent",
     "xpack.fleet.appNavigation.sendFeedbackButton": "Envoyer des commentaires",
+    "xpack.fleet.appNavigation.settingsLinkText": "Paramètres",
     "xpack.fleet.appTitle": "Fleet",
     "xpack.fleet.assets.customLogs.description": "Afficher les données de logs personnalisés dans l'application Logs",
     "xpack.fleet.assets.customLogs.name": "Logs",
     "xpack.fleet.breadcrumbs.addPackagePolicyPageTitle": "Ajouter une intégration",
     "xpack.fleet.breadcrumbs.agentsPageTitle": "Agents",
-    "xpack.fleet.breadcrumbs.allIntegrationsPageTitle": "Parcourir",
+    "xpack.fleet.breadcrumbs.allIntegrationsPageTitle": "Parcourir les intégrations",
     "xpack.fleet.breadcrumbs.appTitle": "Fleet",
     "xpack.fleet.breadcrumbs.datastreamsPageTitle": "Flux de données",
     "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "Modifier l'intégration",
     "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "Jetons d'enregistrement",
-    "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "Gérer",
+    "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "Intégrations installées",
     "xpack.fleet.breadcrumbs.integrationsAppTitle": "Intégrations",
     "xpack.fleet.breadcrumbs.policiesPageTitle": "Stratégies d'agent",
-    "xpack.fleet.config.invalidPackageVersionError": "doit être un serveur valide, ou le mot clé \"latest\"",
+    "xpack.fleet.breadcrumbs.settingsPageTitle": "Paramètres",
+    "xpack.fleet.breadcrumbs.upgradePackagePolicyPageTitle": "Mettre à niveau l'intégration ",
+    "xpack.fleet.config.invalidPackageVersionError": "doit être un serveur valide, ou le mot clé 'latest'",
+    "xpack.fleet.confirmIncomingData.installApmAgentButtonText": "Installer l'agent APM",
+    "xpack.fleet.confirmIncomingData.subtitle": "Votre agent a été correctement enregistré et vos données ont été reçues.",
+    "xpack.fleet.confirmIncomingData.title": "Données entrantes reçues de {numAgentsWithData} { enrolledAgents, plural, one {agent récemment enregistré} other {agents récemment enregistrés}}  sur {enrolledAgents}.",
+    "xpack.fleet.confirmIncomingData.viewDataAssetsButtonText": "Voir les ressources",
     "xpack.fleet.copyAgentPolicy.confirmModal.cancelButtonLabel": "Annuler",
-    "xpack.fleet.copyAgentPolicy.confirmModal.confirmButtonLabel": "Copier la stratégie",
+    "xpack.fleet.copyAgentPolicy.confirmModal.confirmButtonLabel": "Dupliquer la politique",
     "xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyPrompt": "Attribuez un nom et ajoutez une description à votre nouvelle stratégie d'agent.",
-    "xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyTitle": "Copier la stratégie d'agent \"{name}\"",
+    "xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyTitle": "Dupliquer la stratégie d'agent \"{name}\"",
     "xpack.fleet.copyAgentPolicy.confirmModal.defaultNewPolicyName": "{name} (copie)",
     "xpack.fleet.copyAgentPolicy.confirmModal.newDescriptionLabel": "Description",
     "xpack.fleet.copyAgentPolicy.confirmModal.newNameLabel": "Nouveau nom de stratégie",
-    "xpack.fleet.copyAgentPolicy.fatalErrorNotificationTitle": "Erreur lors de la copie de la stratégie d'agent",
-    "xpack.fleet.copyAgentPolicy.successNotificationTitle": "Stratégie d'agent copiée",
+    "xpack.fleet.copyAgentPolicy.fatalErrorNotificationTitle": "Erreur lors de la duplication de la stratégie d'agent",
+    "xpack.fleet.copyAgentPolicy.successNotificationTitle": "Stratégie d’agent dupliquée",
     "xpack.fleet.createAgentPolicy.cancelButtonLabel": "Annuler",
     "xpack.fleet.createAgentPolicy.errorNotificationTitle": "Impossible de créer une stratégie d'agent",
     "xpack.fleet.createAgentPolicy.flyoutTitle": "Créer une stratégie d'agent",
@@ -10013,7 +12549,7 @@
     "xpack.fleet.createPackagePolicy.pageDescriptionfromPolicy": "Configurez une intégration pour la stratégie d'agent sélectionnée.",
     "xpack.fleet.createPackagePolicy.pageTitle": "Ajouter une intégration",
     "xpack.fleet.createPackagePolicy.pageTitleWithPackageName": "Ajouter l'intégration {packageName}",
-    "xpack.fleet.createPackagePolicy.saveButton": "Enregistrer l'intégration",
+    "xpack.fleet.createPackagePolicy.saveButton": "Enregistrer et continuer",
     "xpack.fleet.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText": "Options avancées",
     "xpack.fleet.createPackagePolicy.stepConfigure.errorCountText": "{count, plural, one {# erreur} other {# erreurs}}",
     "xpack.fleet.createPackagePolicy.stepConfigure.hideStreamsAriaLabel": "Masquer les entrées {type}",
@@ -10031,15 +12567,18 @@
     "xpack.fleet.createPackagePolicy.stepConfigure.showStreamsAriaLabel": "Afficher les entrées {type}",
     "xpack.fleet.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText": "Options avancées",
     "xpack.fleet.createPackagePolicy.stepConfigurePackagePolicyTitle": "Configurer l'intégration",
-    "xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle": "Appliquer à la stratégie d'agent",
+    "xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle": "Où ajouter cette intégration ?",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText": "{count, plural, one {# agent est enregistré} other {# agents sont enregistrés}} avec la stratégie d'agent sélectionnée.",
-    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupDescription": "Les stratégies d'agent permettent de gérer un groupe d'intégrations dans un ensemble d'agents",
-    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupTitle": "Stratégie d'agent",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyDisabledAPMLogstashOuputText": "La sortie Logstash pour l'intégration des agents n'est pas prise en charge avec APM.",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupDescription": "Les stratégies d'agent permettent de gérer un groupe d'intégrations pour un ensemble d'agents.",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupTitle": "Politique d'agent",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyLabel": "Stratégie d'agent",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyPlaceholderText": "Sélectionner une stratégie d'agent à laquelle ajouter cette intégration",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.cannotAddLimitedIntegrationError": "Cette intégration ne peut être ajoutée qu’une fois par stratégie d’agent.",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle": "Erreur lors du chargement des stratégies d'agent",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle": "Erreur lors du chargement des informations de pack",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle": "Erreur lors du chargement de la stratégie d'agent sélectionnée",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.noPolicySelectedError": "Une stratégie d'agent est requise.",
     "xpack.fleet.dataStreamList.actionsColumnTitle": "Actions",
     "xpack.fleet.dataStreamList.datasetColumnTitle": "Ensemble de données",
     "xpack.fleet.dataStreamList.integrationColumnTitle": "Intégration",
@@ -10060,7 +12599,8 @@
     "xpack.fleet.deleteAgentPolicy.confirmModal.cancelButtonLabel": "Annuler",
     "xpack.fleet.deleteAgentPolicy.confirmModal.confirmButtonLabel": "Supprimer la stratégie",
     "xpack.fleet.deleteAgentPolicy.confirmModal.deletePolicyTitle": "Souhaitez-vous vraiment supprimer cette stratégie d'agent ?",
-    "xpack.fleet.deleteAgentPolicy.confirmModal.irreversibleMessage": "Impossible d'annuler cette action.",
+    "xpack.fleet.deleteAgentPolicy.confirmModal.fleetServerMessage": "REMARQUE : Cette stratégie comporte l’intégration de serveur Fleet, qui est requise pour utiliser Fleet.",
+    "xpack.fleet.deleteAgentPolicy.confirmModal.irreversibleMessage": "Cette action ne peut pas être annulée.",
     "xpack.fleet.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage": "Vérification du nombre d'agents concernés en cours…",
     "xpack.fleet.deleteAgentPolicy.confirmModal.loadingButtonLabel": "Chargement…",
     "xpack.fleet.deleteAgentPolicy.failureSingleNotificationTitle": "Erreur lors de la suppression de la stratégie d'agent \"{id}\"",
@@ -10098,15 +12638,25 @@
     "xpack.fleet.editPackagePolicy.settingsTabName": "Paramètres",
     "xpack.fleet.editPackagePolicy.updatedNotificationMessage": "Fleet déploie les mises à jour de tous les agents qui utilisent la stratégie \"{agentPolicyName}\"",
     "xpack.fleet.editPackagePolicy.updatedNotificationTitle": "\"{packagePolicyName}\" a bien été mise à jour",
+    "xpack.fleet.editPackagePolicy.upgradeButton": "Mettre à niveau l'intégration",
     "xpack.fleet.editPackagePolicy.upgradePageTitleWithPackageName": "Mettre à niveau l'intégration {packageName}",
     "xpack.fleet.enrollemntAPIKeyList.emptyMessage": "Jeton d'enregistrement introuvable.",
     "xpack.fleet.enrollemntAPIKeyList.loadingTokensMessage": "Chargement des jetons d'enregistrement en cours…",
+    "xpack.fleet.enrollmentInstructions.callout": "Nous vous recommandons d'utiliser les programmes d'installation (TAR/ZIP) plutôt que les packages de système (RPM/DEB), car ils permettent la mise à niveau de votre agent avec Fleet.",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux": "Linux",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux.deb": "DEB",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux.rpm": "RPM",
+    "xpack.fleet.enrollmentInstructions.platformButtons.mac": "Mac",
+    "xpack.fleet.enrollmentInstructions.platformButtons.windows": "Windows",
     "xpack.fleet.enrollmentInstructions.platformSelectAriaLabel": "Plateforme",
     "xpack.fleet.enrollmentInstructions.troubleshootingLink": "guide de résolution des problèmes",
     "xpack.fleet.enrollmentInstructions.troubleshootingText": "Si vous rencontrez des difficultés pour vous connecter, consultez notre {link}.",
+    "xpack.fleet.enrollmentStepAgentPolicy.addPolicyButton": "Créer une stratégie d'agent",
+    "xpack.fleet.enrollmentStepAgentPolicy.createAgentPolicyText": "Les types d'hôtes sont contrôlés par une {agentPolicy}. Choisissez une stratégie d’agent ou créez-en une.",
     "xpack.fleet.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel": "Jeton d'enregistrement",
     "xpack.fleet.enrollmentStepAgentPolicy.noEnrollmentTokensForSelectedPolicyCallout": "Aucun jeton d'enregistrement n'est disponible pour la stratégie d'agent sélectionnée",
-    "xpack.fleet.enrollmentStepAgentPolicy.policySelectAriaLabel": "Stratégie d'agent",
+    "xpack.fleet.enrollmentStepAgentPolicy.policySelectAriaLabel": "Politique d'agent",
+    "xpack.fleet.enrollmentStepAgentPolicy.selectAgentPolicyFleetServerText": "Fleet Server fonctionne sur Elastic Agent, et les agents sont inscrits dans des politiques d'agent qui représentent des hôtes. Vous pouvez sélectionner une stratégie d’agent existante déjà configurée pour le serveur Fleet ou choisir d’en créer une nouvelle.",
     "xpack.fleet.enrollmentStepAgentPolicy.setUpAgentsLink": "Créer un jeton d'enregistrement",
     "xpack.fleet.enrollmentStepAgentPolicy.showAuthenticationSettingsButton": "Paramètres d'authentification",
     "xpack.fleet.enrollmentTokenDeleteModal.cancelButton": "Annuler",
@@ -10124,18 +12674,47 @@
     "xpack.fleet.enrollmentTokensList.revokeTokenButtonLabel": "Révoquer le jeton",
     "xpack.fleet.enrollmentTokensList.secretTitle": "Secret",
     "xpack.fleet.enrollmentTokensList.showTokenButtonLabel": "Afficher le jeton",
+    "xpack.fleet.epm.addPackagePolicyButtonPrivilegesRequiredTooltip": "Les intégrations Elastic Agent requièrent de disposer de tous les privilèges pour Fleet et de tous les privilèges pour les intégrations. Contactez votre administrateur.",
+    "xpack.fleet.epm.addPackagePolicyButtonSecurityRequiredTooltip": "Pour ajouter des intégrations Elastic Agent, vous devez avoir activé Security et disposer de tous les privilèges pour Fleet. Contactez votre administrateur.",
     "xpack.fleet.epm.addPackagePolicyButtonText": "Ajouter {packageName}",
     "xpack.fleet.epm.assetGroupTitle": "Ressources {assetType}",
+    "xpack.fleet.epm.assetTitles.cloudSecurityPostureRuleTemplate": "Modèle de règle de niveau de sécurité du cloud",
+    "xpack.fleet.epm.assetTitles.componentTemplates": "Modèles de composants",
+    "xpack.fleet.epm.assetTitles.dashboards": "Tableaux de bord",
+    "xpack.fleet.epm.assetTitles.dataStreamILM": "Stratégies ILM pour les flux de données",
+    "xpack.fleet.epm.assetTitles.ilmPolicies": "Stratégies ILM",
+    "xpack.fleet.epm.assetTitles.indexPatterns": "Modèles d'indexation",
+    "xpack.fleet.epm.assetTitles.indexTemplates": "Modèles d'index",
+    "xpack.fleet.epm.assetTitles.ingestPipelines": "Pipelines d'ingestion",
+    "xpack.fleet.epm.assetTitles.lens": "Lens",
+    "xpack.fleet.epm.assetTitles.maps": "Cartes",
+    "xpack.fleet.epm.assetTitles.mlModels": "Modèles ML",
+    "xpack.fleet.epm.assetTitles.mlModules": "Modules ML",
+    "xpack.fleet.epm.assetTitles.osqueryPackAsset": "Packs Osquery",
+    "xpack.fleet.epm.assetTitles.savedSearches": "Recherches enregistrées",
+    "xpack.fleet.epm.assetTitles.securityRules": "Règles de sécurité",
+    "xpack.fleet.epm.assetTitles.tag": "Balise",
+    "xpack.fleet.epm.assetTitles.transforms": "Transformations",
+    "xpack.fleet.epm.assetTitles.views": "Vues",
+    "xpack.fleet.epm.assetTitles.visualizations": "Visualisations",
     "xpack.fleet.epm.browseAllButtonText": "Parcourir toutes les intégrations",
     "xpack.fleet.epm.categoryLabel": "Catégorie",
     "xpack.fleet.epm.detailsTitle": "Détails",
+    "xpack.fleet.epm.elasticAgentBadgeLabel": "Elastic Agent",
     "xpack.fleet.epm.errorLoadingNotice": "Erreur lors du chargement de NOTICE.txt",
     "xpack.fleet.epm.featuresLabel": "Fonctionnalités",
     "xpack.fleet.epm.install.packageInstallError": "Erreur lors de l'installation de {pkgName} {pkgVersion}",
     "xpack.fleet.epm.install.packageUpdateError": "Erreur lors de la mise à jour de {pkgName} vers la version {pkgVersion}",
+    "xpack.fleet.epm.integrationPreference.beatsLabel": "Beats uniquement",
+    "xpack.fleet.epm.integrationPreference.elasticAgentLabel": "Elastic Agent uniquement",
+    "xpack.fleet.epm.integrationPreference.recommendedLabel": "Recommandé",
+    "xpack.fleet.epm.integrationPreference.recommendedTooltip": "Nous recommandons les intégrations Elastic Agent lorsqu’elles sont disponibles.",
+    "xpack.fleet.epm.integrationPreference.title": "Si une intégration est disponible pour {link}, montrer :",
+    "xpack.fleet.epm.integrationPreference.titleLink": "Elastic Agent et Beats",
     "xpack.fleet.epm.licenseLabel": "Licence",
     "xpack.fleet.epm.loadingIntegrationErrorTitle": "Erreur lors du chargement des détails de l'intégration",
     "xpack.fleet.epm.noticeModalCloseBtn": "Fermer",
+    "xpack.fleet.epm.packageDetails.assets.assetsNotAvailableInCurrentSpace": "Cette intégration est installée, mais aucune ressource n’est disponible dans cet espace.",
     "xpack.fleet.epm.packageDetails.assets.fetchAssetsErrorTitle": "Erreur lors du chargement des ressources",
     "xpack.fleet.epm.packageDetails.assets.noAssetsFoundLabel": "Ressource introuvable",
     "xpack.fleet.epm.packageDetails.integrationList.actions": "Actions",
@@ -10143,7 +12722,7 @@
     "xpack.fleet.epm.packageDetails.integrationList.agentCount": "Agents",
     "xpack.fleet.epm.packageDetails.integrationList.agentPolicy": "Stratégie d'agent",
     "xpack.fleet.epm.packageDetails.integrationList.loadingPoliciesMessage": "Chargement des stratégies d'intégration en cours…",
-    "xpack.fleet.epm.packageDetails.integrationList.name": "Intégration",
+    "xpack.fleet.epm.packageDetails.integrationList.name": "Stratégie d'intégration",
     "xpack.fleet.epm.packageDetails.integrationList.packageVersion": "v{version}",
     "xpack.fleet.epm.packageDetails.integrationList.updatedAt": "Dernière mise à jour",
     "xpack.fleet.epm.packageDetails.integrationList.updatedBy": "Dernière mise à jour par",
@@ -10151,13 +12730,16 @@
     "xpack.fleet.epm.packageDetailsNav.overviewLinkText": "Aperçu",
     "xpack.fleet.epm.packageDetailsNav.packageAssetsLinkText": "Ressources",
     "xpack.fleet.epm.packageDetailsNav.packageCustomLinkText": "Avancé",
-    "xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText": "Stratégies",
+    "xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText": "Stratégies d'intégration",
     "xpack.fleet.epm.packageDetailsNav.settingsLinkText": "Paramètres",
-    "xpack.fleet.epm.pageSubtitle": "Collecter des données à partir d'applications et de services populaires utilisant Elastic Agent",
+    "xpack.fleet.epm.packageDetailsSecurityRequiredCalloutDescription": "Pour tirer pleinement parti de Fleet, vous devez activer les fonctionnalités de sécurité d’Elasticsearch et de Kibana. Suivez ce {guideLink} pour activer la sécurité.",
+    "xpack.fleet.epm.packageDetailsSecurityRequiredCalloutDescriptionGuideLink": "guide",
+    "xpack.fleet.epm.packageDetailsSecurityRequiredCalloutTitle": "La sécurité doit être activée pour pouvoir ajouter des intégrations Elastic Agent.",
+    "xpack.fleet.epm.pageSubtitle": "Choisissez une intégration pour commencer à collecter et à analyser vos données.",
     "xpack.fleet.epm.releaseBadge.betaDescription": "Il n'est pas recommandé d'utiliser cette intégration dans les environnements de production.",
-    "xpack.fleet.epm.releaseBadge.betaLabel": "Version bêta",
-    "xpack.fleet.epm.releaseBadge.experimentalDescription": "Il est possible que cette intégration comporte des changements majeurs ou soit supprimée dans une version ultérieure.",
-    "xpack.fleet.epm.releaseBadge.experimentalLabel": "Expérimental",
+    "xpack.fleet.epm.releaseBadge.betaLabel": "Bêta",
+    "xpack.fleet.epm.releaseBadge.experimentalDescription": "Cette fonctionnalité est en version d’évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "xpack.fleet.epm.releaseBadge.experimentalLabel": "Version d’évaluation technique",
     "xpack.fleet.epm.screenshotAltText": "Capture d'écran n° {imageNumber} de {packageName}",
     "xpack.fleet.epm.screenshotErrorText": "Impossible de charger cette capture d'écran",
     "xpack.fleet.epm.screenshotPaginationAriaLabel": "Pagination des captures d'écran de {packageName}",
@@ -10165,13 +12747,41 @@
     "xpack.fleet.epm.updateAvailableTooltip": "Mise à jour disponible",
     "xpack.fleet.epm.usedByLabel": "Stratégies d'agent",
     "xpack.fleet.epm.versionLabel": "Version",
-    "xpack.fleet.epmList.allPackagesFilterLinkText": "Tous",
+    "xpack.fleet.epmList.allPackagesFilterLinkText": "Toutes les catégories",
+    "xpack.fleet.epmList.allPackagesInstalledFilterLinkText": "Tous les packages installés",
+    "xpack.fleet.epmList.availableCalloutBlogText": "article de blog d'annonce",
+    "xpack.fleet.epmList.availableCalloutIntroText": "Pour en savoir plus sur les intégrations et Elastic Agent, lisez notre {link}.",
+    "xpack.fleet.epmList.availableCalloutTitle": "Seules les intégrations Elastic Agent installées sont affichées.",
+    "xpack.fleet.epmList.eprUnavailable400500CalloutTitle": "Kibana ne peut pas se connecter au registre de package Elastic, qui fournit les intégrations Elastic Agent.\n",
+    "xpack.fleet.epmList.eprUnavailableBadGatewayCalloutTitle": "Kibana n’a pas accès au registre de package Elastic, qui fournit les intégrations Elastic Agent.\n",
+    "xpack.fleet.epmList.eprUnavailableCallouBdGatewaytTitleMessage": "Pour voir ces intégrations, configurez un {registryproxy} ou hébergez {onpremregistry}.",
+    "xpack.fleet.epmList.eprUnavailableCallout400500TitleMessage": "Assurez-vous que le {registryproxy} ou {onpremregistry} sont configurés correctement ou réessayez plus tard.",
     "xpack.fleet.epmList.missingIntegrationPlaceholder": "Nous n'avons trouvé aucune intégration correspondant au terme que vous recherchez. Essayez un autre mot clé ou parcourez les catégories situées à gauche.",
-    "xpack.fleet.epmList.noPackagesFoundPlaceholder": "Package introuvable",
+    "xpack.fleet.epmList.noPackagesFoundPlaceholder": "Aucune intégration trouvée",
+    "xpack.fleet.epmList.onPremLinkSnippetText": "votre propre registre",
+    "xpack.fleet.epmList.proxyLinkSnippedText": "serveur proxy",
     "xpack.fleet.epmList.searchPackagesPlaceholder": "Rechercher des intégrations",
     "xpack.fleet.epmList.updatesAvailableFilterLinkText": "Mises à jour disponibles",
     "xpack.fleet.featureCatalogueDescription": "Ajouter et gérer des intégrations avec Elastic Agent",
     "xpack.fleet.featureCatalogueTitle": "Ajouter des intégrations Elastic Agent",
+    "xpack.fleet.featuredObsDesc": "Surveillez, détectez et diagnostiquez des problèmes de performance complexes depuis votre application.",
+    "xpack.fleet.featuredObsTitle": "Elastic APM",
+    "xpack.fleet.featuredSearchDesc": "Ajoutez la recherche à votre site web avec le robot d'indexation App Search.",
+    "xpack.fleet.featuredSearchTitle": "Robot d’indexation",
+    "xpack.fleet.featuredSecurityDesc": "Protégez vos hôtes grâce à la prévention des menaces, la détection et la visibilité des données en profondeur en toute sécurité.",
+    "xpack.fleet.featuredSecurityTitle": "Endpoint Security",
+    "xpack.fleet.fleetServerCloudRequiredCallout.calloutDescription": "Un serveur Fleet intègre est nécessaire pour enregistrer des agents avec Fleet. Activez un serveur Fleet dans votre {cloudDeploymentLink}. Pour en savoir plus, consultez le {guideLink}.",
+    "xpack.fleet.fleetServerCloudRequiredCallout.cloudDeploymentLink": "déploiement sur le cloud",
+    "xpack.fleet.fleetServerCloudRequiredCallout.editDeploymentButtonLabel": "Modifier le déploiement",
+    "xpack.fleet.fleetServerCloudRequiredCallout.guideLink": "Guide de Fleet et d’Elastic Agent",
+    "xpack.fleet.fleetServerCloudUnhealthyCallout.calloutTitle": "Le serveur Fleet n’est pas intègre.",
+    "xpack.fleet.fleetServerOnPremRequiredCallout.calloutDescription": "Suivez les instructions ci-après pour configurer un serveur Fleet. Pour en savoir plus, consultez le {guideLink}.",
+    "xpack.fleet.fleetServerOnPremRequiredCallout.calloutTitle": "Un serveur Fleet est nécessaire pour enregistrer des agents avec Fleet.",
+    "xpack.fleet.fleetServerOnPremRequiredCallout.guideLink": "Guide de Fleet et d’Elastic Agent",
+    "xpack.fleet.fleetServerOnPremUnhealthyCallout.addFleetServerButtonLabel": "Ajouter un serveur Fleet",
+    "xpack.fleet.fleetServerOnPremUnhealthyCallout.calloutDescription": "Un serveur Fleet intègre est nécessaire pour enregistrer des agents avec Fleet.  Pour en savoir plus, consultez le {guideLink}.",
+    "xpack.fleet.fleetServerOnPremUnhealthyCallout.calloutTitle": "Le serveur Fleet n’est pas intègre.",
+    "xpack.fleet.fleetServerOnPremUnhealthyCallout.guideLink": "Guide de Fleet et d’Elastic Agent",
     "xpack.fleet.fleetServerSetup.addFleetServerHostButton": "Ajouter un hôte",
     "xpack.fleet.fleetServerSetup.addFleetServerHostInputLabel": "Hôte du serveur Fleet",
     "xpack.fleet.fleetServerSetup.addFleetServerHostInvalidUrlError": "URL non valide",
@@ -10180,8 +12790,8 @@
     "xpack.fleet.fleetServerSetup.addFleetServerHostSuccessText": "{host} ajouté. Vous pouvez modifier les hôtes de votre serveur Fleet dans {fleetSettingsLink}.",
     "xpack.fleet.fleetServerSetup.addFleetServerHostSuccessTitle": "Hôte du serveur Fleet ajouté",
     "xpack.fleet.fleetServerSetup.cloudDeploymentLink": "Modifier le déploiement",
-    "xpack.fleet.fleetServerSetup.cloudSetupText": "Un serveur Fleet est nécessaire pour enregistrer des agents avec Fleet. Vous pouvez en ajouter un à votre déploiement en activant APM et Fleet. Pour en savoir plus, consultez {link}",
-    "xpack.fleet.fleetServerSetup.cloudSetupTitle": "Activer APM et Fleet",
+    "xpack.fleet.fleetServerSetup.cloudSetupText": "Un serveur Fleet est nécessaire pour enregistrer des agents avec Fleet. Le moyen le plus simple d’en obtenir un est d’ajouter un serveur d’intégration, qui prend en charge l’intégration du serveur Fleet. Vous pouvez l’ajouter à votre déploiement dans la console cloud. Pour en savoir plus, consultez {link}",
+    "xpack.fleet.fleetServerSetup.cloudSetupTitle": "Activer un serveur Fleet",
     "xpack.fleet.fleetServerSetup.continueButton": "Continuer",
     "xpack.fleet.fleetServerSetup.deploymentModeProductionOption": "{production} : fournissez vos propres certificats. Cette option demande aux agents de préciser une clé de certificat lors de leur enregistrement avec Fleet",
     "xpack.fleet.fleetServerSetup.deploymentModeQuickStartOption": "{quickStart} : le serveur Fleet génère un certificat autosigné. Les agents suivants doivent être enregistrés avec l'indicateur --insecure. Non recommandé pour les cas d'utilisation en production.",
@@ -10196,18 +12806,22 @@
     "xpack.fleet.fleetServerSetup.quickStartText": "Démarrage rapide",
     "xpack.fleet.fleetServerSetup.saveServiceTokenDescription": "Enregistrez les informations de votre jeton de service. Ce message s'affiche une seule fois.",
     "xpack.fleet.fleetServerSetup.serviceTokenLabel": "Jeton de service",
-    "xpack.fleet.fleetServerSetup.setupGuideLink": "Guide de l'utilisateur de Fleet",
+    "xpack.fleet.fleetServerSetup.setupGuideLink": "Guide de Fleet et d’Elastic Agent",
     "xpack.fleet.fleetServerSetup.setupText": "Un serveur Fleet est nécessaire pour enregistrer des agents avec Fleet. Suivez les instructions ci-après pour configurer un serveur Fleet. Pour en savoir plus, consultez le {userGuideLink}.",
     "xpack.fleet.fleetServerSetup.setupTitle": "Ajouter un serveur Fleet",
+    "xpack.fleet.fleetServerSetup.stepCreateAgentPolicyTitle": "Créer une stratégie d’agent pour héberger le serveur Fleet",
     "xpack.fleet.fleetServerSetup.stepDeploymentModeDescriptionText": "Fleet utilise le protocole TLS (Transport Layer Security) pour chiffrer le trafic entre les agents Elastic et d'autres composants de la Suite Elastic. Sélectionnez un mode de déploiement pour définir comment vous souhaitez gérer les certificats. Votre sélection impactera la commande de configuration du serveur Fleet qui s'affichera à une étape ultérieure.",
     "xpack.fleet.fleetServerSetup.stepDeploymentModeTitle": "Sélectionner un mode de déploiement pour Security",
     "xpack.fleet.fleetServerSetup.stepFleetServerCompleteDescription": "Vous pouvez désormais enregistrer des agents avec Fleet.",
     "xpack.fleet.fleetServerSetup.stepFleetServerCompleteTitle": "Serveur Fleet connecté",
     "xpack.fleet.fleetServerSetup.stepGenerateServiceTokenTitle": "Générer un jeton de service",
     "xpack.fleet.fleetServerSetup.stepInstallAgentTitle": "Lancer le serveur Fleet",
-    "xpack.fleet.fleetServerSetup.stepSelectAgentPolicyTitle": "Sélectionner une stratégie d'agent",
+    "xpack.fleet.fleetServerSetup.stepSelectAgentPolicyTitle": "Sélectionner une stratégie d’agent pour héberger le serveur Fleet",
     "xpack.fleet.fleetServerSetup.stepWaitingForFleetServerTitle": "En attente de connexion du serveur Fleet…",
     "xpack.fleet.fleetServerSetup.waitingText": "En attente de connexion d'un serveur Fleet…",
+    "xpack.fleet.fleetServerSetupPermissionDeniedErrorMessage": "Le serveur Fleet doit être configuré. Pour cela, le privilège de cluster {roleName} est requis. Contactez votre administrateur.",
+    "xpack.fleet.fleetServerSetupPermissionDeniedErrorTitle": "Autorisation refusée",
+    "xpack.fleet.fleetServerUnhealthy.requestError": "Une erreur s’est produite lors de la récupération du statut du serveur Fleet.",
     "xpack.fleet.fleetServerUpgradeModal.announcementImageAlt": "Annonce de mise à niveau du serveur Fleet",
     "xpack.fleet.fleetServerUpgradeModal.breakingChangeMessage": "Il s'agit d'un changement majeur, c'est pourquoi nous l'appliquons dans une version bêta. Nous vous prions de nous excuser pour la gêne occasionnée. Partagez {link} si vous avez des questions ou si vous avez besoin d'aide.",
     "xpack.fleet.fleetServerUpgradeModal.checkboxLabel": "Ne plus afficher ce message",
@@ -10225,12 +12839,21 @@
     "xpack.fleet.homeIntegration.tutorialModule.noticeText": "{notePrefix} Une version plus récente de ce module est {availableAsIntegrationLink}. Pour en savoir plus sur les intégrations et le nouvel agent Elastic Agent, lisez notre {blogPostLink}.",
     "xpack.fleet.homeIntegration.tutorialModule.noticeText.blogPostLink": "article de blog d'annonce",
     "xpack.fleet.homeIntegration.tutorialModule.noticeText.integrationLink": "disponible en tant qu'intégration Elastic Agent",
-    "xpack.fleet.homeIntegration.tutorialModule.noticeText.notePrefix": "Remarque :",
+    "xpack.fleet.homeIntegration.tutorialModule.noticeText.notePrefix": "Note",
     "xpack.fleet.initializationErrorMessageTitle": "Initialisation de Fleet impossible",
+    "xpack.fleet.integration.settings.versionInfo.updatesAvailableBody": "Passez à la version {latestVersion} pour bénéficier des fonctionnalités les plus récentes.",
+    "xpack.fleet.integrations.confirmUpdateModal.body.agentCount": "{agentCount, plural, one {# agent} other {# agents}}",
+    "xpack.fleet.integrations.confirmUpdateModal.body.policyCount": "{packagePolicyCount, plural, one {# stratégie d’intégration} other {# stratégies d’intégration}}",
     "xpack.fleet.integrations.customInputsLink": "entrées personnalisées",
-    "xpack.fleet.integrations.discussForumLink": "forum de discussion",
+    "xpack.fleet.integrations.deploymentButton": "Voir les détails du déploiement",
+    "xpack.fleet.integrations.discussForumLink": "forum",
     "xpack.fleet.integrations.installPackage.installingPackageButtonLabel": "Installation des ressources {title} en cours",
     "xpack.fleet.integrations.installPackage.installPackageButtonLabel": "Installer les ressources {title}",
+    "xpack.fleet.integrations.integrationSaved": "Paramètres de l'intégration enregistrés",
+    "xpack.fleet.integrations.integrationSavedError": "Erreur lors de l’enregistrement des paramètres de l'intégration",
+    "xpack.fleet.integrations.keepPoliciesUpToDateDisabledSuccess": "Fleet ne mettra pas à jour automatiquement les stratégies d’intégration pour {title}.",
+    "xpack.fleet.integrations.keepPoliciesUpToDateEnabledSuccess": "Fleet mettra à jour automatiquement les stratégies d’intégration pour {title}.",
+    "xpack.fleet.integrations.keepPoliciesUpToDateError": "Erreur lors de l’enregistrement des paramètres de l'intégration pour {title}",
     "xpack.fleet.integrations.packageInstallErrorDescription": "Nous avons rencontré un problème en tentant d'installer ce package. Réessayez plus tard.",
     "xpack.fleet.integrations.packageInstallErrorTitle": "Échec de l'installation du package {title}",
     "xpack.fleet.integrations.packageInstallSuccessDescription": "Installation de {title} terminée",
@@ -10239,6 +12862,8 @@
     "xpack.fleet.integrations.packageUninstallErrorTitle": "Échec de la désinstallation du package {title}",
     "xpack.fleet.integrations.packageUninstallSuccessDescription": "Désinstallation de {title} terminée",
     "xpack.fleet.integrations.packageUninstallSuccessTitle": "{title} désinstallé",
+    "xpack.fleet.integrations.packageUpdateSuccessDescription": "{title} mis à jour et stratégies mises à niveau avec succès",
+    "xpack.fleet.integrations.packageUpdateSuccessTitle": "{title} mis à jour et stratégies mises à niveau",
     "xpack.fleet.integrations.settings.confirmInstallModal.cancelButtonLabel": "Annuler",
     "xpack.fleet.integrations.settings.confirmInstallModal.installButtonLabel": "Installer {packageName}",
     "xpack.fleet.integrations.settings.confirmInstallModal.installCalloutTitle": "Cette action installe {numOfAssets} ressources",
@@ -10246,10 +12871,20 @@
     "xpack.fleet.integrations.settings.confirmInstallModal.installTitle": "Installer {packageName}",
     "xpack.fleet.integrations.settings.confirmUninstallModal.cancelButtonLabel": "Annuler",
     "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallButtonLabel": "Désinstaller {packageName}",
-    "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallCallout.description": "Les ressources Kibana et Elasticsearch créées par cette intégration sont supprimées. Les stratégies des agents, ainsi que les données qu'ils ont envoyées, ne sont pas concernées.",
-    "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallCallout.title": "Cette action supprime {numOfAssets} ressources",
+    "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallCallout.description": "Les actifs Kibana et Elasticsearch créés par cette intégration sont supprimés. Les stratégies des agents, ainsi que les données qu’ils ont envoyés, ne seront pas affectées.",
+    "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallCallout.title": "Cette action supprime {numOfAssets} actifs",
     "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallDescription": "Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
     "xpack.fleet.integrations.settings.confirmUninstallModal.uninstallTitle": "Désinstaller {packageName}",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.body": "Cette action déploie des mises à jour pour tous les agents qui utilisent ces stratégies. Fleet a détecté que {packagePolicyCountText} {packagePolicyCount, plural, one { est prêt} other { sont prêts}} à être mis à niveau et que {packagePolicyCount, plural, one { est déjà utilisé} other { sont déjà utilisés}} par {agentCountText}.",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.cancel": "Annuler",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.confirm": "Mettre à niveau {packageName} et les stratégies",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.conflictCallOut.body": "{conflictCount, plural, one { rencontre} other { rencontrent}} des conflits ; la mise à niveau automatique ne sera pas effectuée. Vous pourrez résoudre manuellement ces conflits via les paramètres de stratégie d’agent dans Fleet après avoir réalisé cette mise à niveau.",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.conflictCallOut.integrationPolicyCount": "{conflictCount, plural, one {# stratégie d’intégration} other {# stratégies d’intégration}}",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.conflictCallOut.title": "Certaines stratégies d’intégration rencontrent des conflits.",
+    "xpack.fleet.integrations.settings.confirmUpdateModal.updateTitle": "Mettre à niveau {packageName} et les stratégies",
+    "xpack.fleet.integrations.settings.keepIntegrationPoliciesUpToDateDescription": "Lorsque cette option est activée, Fleet essaiera de se mettre à niveau et de déployer les stratégies d’intégration automatiquement",
+    "xpack.fleet.integrations.settings.keepIntegrationPoliciesUpToDateDisabledDescription": "Cette intégration nécessite que Fleet mette automatiquement à niveau ses stratégies d’intégration.",
+    "xpack.fleet.integrations.settings.keepIntegrationPoliciesUpToDateLabel": "Mettre à jour automatiquement les stratégies d’intégration",
     "xpack.fleet.integrations.settings.packageInstallDescription": "Installez cette intégration pour configurer les ressources Kibana et Elasticsearch conçues pour les données {title}.",
     "xpack.fleet.integrations.settings.packageInstallTitle": "Installer {title}",
     "xpack.fleet.integrations.settings.packageLatestVersionLink": "dernière version",
@@ -10263,14 +12898,17 @@
     "xpack.fleet.integrations.settings.packageVersionTitle": "Version de {title}",
     "xpack.fleet.integrations.settings.versionInfo.installedVersion": "Version installée",
     "xpack.fleet.integrations.settings.versionInfo.latestVersion": "Dernière version",
-    "xpack.fleet.integrations.settings.versionInfo.updatesAvailable": "Des mises à jour sont disponibles",
+    "xpack.fleet.integrations.settings.versionInfo.updatesAvailable": "Nouvelle version disponible",
     "xpack.fleet.integrations.uninstallPackage.uninstallingPackageButtonLabel": "Désinstallation de {title} en cours",
     "xpack.fleet.integrations.uninstallPackage.uninstallPackageButtonLabel": "Désinstaller {title}",
-    "xpack.fleet.integrations.updatePackage.updatePackageButtonLabel": "Mettre à jour vers la dernière version",
+    "xpack.fleet.integrations.updatePackage.updatePackageButtonLabel": "Mettre à niveau vers la dernière version",
+    "xpack.fleet.integrations.updatePackage.upgradePoliciesCheckboxLabel": "Mettre à niveau les stratégies d'intégration",
     "xpack.fleet.integrationsAppTitle": "Intégrations",
-    "xpack.fleet.integrationsHeaderTitle": "Intégrations d'Elastic Agent",
+    "xpack.fleet.integrationsHeaderTitle": "Intégrations",
     "xpack.fleet.invalidLicenseDescription": "Votre licence actuelle a expiré. Les agents Beats enregistrés continuent à fonctionner, mais vous avez besoin d'une licence valide pour accéder à l'interface d'Elastic Fleet.",
     "xpack.fleet.invalidLicenseTitle": "Licence expirée",
+    "xpack.fleet.multiRowInput.addRow": "Ajouter une ligne",
+    "xpack.fleet.multiRowInput.deleteButton": "Supprimer la ligne",
     "xpack.fleet.multiTextInput.addRow": "Ajouter une ligne",
     "xpack.fleet.multiTextInput.deleteRowButton": "Supprimer la ligne",
     "xpack.fleet.namespaceValidation.invalidCharactersErrorMessage": "L'espace de nom contient des caractères non valides",
@@ -10278,27 +12916,36 @@
     "xpack.fleet.namespaceValidation.requiredErrorMessage": "L'espace de nom est obligatoire",
     "xpack.fleet.namespaceValidation.tooLongErrorMessage": "L'espace de nom ne peut pas dépasser 100 octets",
     "xpack.fleet.newEnrollmentKey.cancelButtonLabel": "Annuler",
+    "xpack.fleet.newEnrollmentKey.helpText": "Un ID de jeton sera utilisé si ce champ est laissé vide.",
     "xpack.fleet.newEnrollmentKey.keyCreatedToasts": "Jeton d'enregistrement créé",
     "xpack.fleet.newEnrollmentKey.modalTitle": "Créer un jeton d'enregistrement",
-    "xpack.fleet.newEnrollmentKey.nameLabel": "Nom",
-    "xpack.fleet.newEnrollmentKey.policyLabel": "Stratégie",
+    "xpack.fleet.newEnrollmentKey.nameLabel": "Nom de jeton",
+    "xpack.fleet.newEnrollmentKey.placeholder": "Saisir un nom de jeton",
+    "xpack.fleet.newEnrollmentKey.policyLabel": "Politique",
     "xpack.fleet.newEnrollmentKey.submitButton": "Créer un jeton d'enregistrement",
-    "xpack.fleet.noAccess.accessDeniedDescription": "Vous n'êtes pas autorisé à accéder à Elastic Fleet. Pour utiliser Elastic Fleet, vous devez disposer d'un rôle utilisateur doté d'une autorisation d'accès en lecture ou de toutes les autorisations pour cette application.",
+    "xpack.fleet.newEnrollmentKeyForm.policyIdRequireErrorMessage": "Une stratégie est requise.",
+    "xpack.fleet.noAccess.accessDeniedDescription": "Vous n'êtes pas autorisé à accéder à Elastic Fleet. Pour utiliser Elastic Fleet, vous devez disposer d'un rôle utilisateur doté de toutes les autorisations pour cette application.",
     "xpack.fleet.noAccess.accessDeniedTitle": "Accès refusé",
     "xpack.fleet.oldAppTitle": "Gestionnaire d'ingestion",
-    "xpack.fleet.overviewPageSubtitle": "Gestion centralisée des agents Elastic Agent",
+    "xpack.fleet.overviewPageSubtitle": "Gestion centralisée des agents Elastic Agent.",
     "xpack.fleet.overviewPageTitle": "Fleet",
+    "xpack.fleet.packagePolicy.ineligibleForUpgradeError": "La version {version} de la stratégie {id} du package {name} est plus récente que la version de package installée. Veuillez installer la dernière version de {name}.",
     "xpack.fleet.packagePolicy.packageNotFoundError": "La stratégie de package possédant l'ID {id} ne contient pas de package nommé",
+    "xpack.fleet.packagePolicy.packageNotInstalledError": "Le package {name} n’est pas installé.",
     "xpack.fleet.packagePolicy.policyNotFoundError": "Stratégie de package possédant l'ID {id} introuvable",
     "xpack.fleet.packagePolicyField.yamlCodeEditor": "Éditeur de code YAML",
+    "xpack.fleet.packagePolicyInvalidError": "La stratégie de package est invalide : {errors}.",
+    "xpack.fleet.packagePolicyValidation.boolValueError": "Les valeurs booléennes doivent être définies sur \"true\" ou \"false\".",
     "xpack.fleet.packagePolicyValidation.invalidArrayErrorMessage": "Format non valide",
     "xpack.fleet.packagePolicyValidation.invalidYamlFormatErrorMessage": "Format YAML non valide",
     "xpack.fleet.packagePolicyValidation.nameRequiredErrorMessage": "Le nom est obligatoire",
     "xpack.fleet.packagePolicyValidation.quoteStringErrorMessage": "Les chaînes commençant par des caractères YAML spéciaux, comme * ou &amp;, requièrent des guillemets doubles.",
     "xpack.fleet.packagePolicyValidation.requiredErrorMessage": "{fieldName} obligatoire",
+    "xpack.fleet.permissionDeniedErrorMessage": "Vous n'êtes pas autorisé à accéder à Fleet. Le privilège Kibana {roleName1} est requis pour Fleet, et le privilège {roleName2} ou {roleName1} est requis pour les intégrations.",
     "xpack.fleet.permissionDeniedErrorTitle": "Autorisation refusée",
     "xpack.fleet.permissionsRequestErrorMessageDescription": "Un problème est survenu lors de la vérification des autorisations Fleet",
     "xpack.fleet.permissionsRequestErrorMessageTitle": "Impossible de vérifier les autorisations",
+    "xpack.fleet.policyDetails.addAgentButton": "Ajouter un agent",
     "xpack.fleet.policyDetails.addPackagePolicyButtonText": "Ajouter une intégration",
     "xpack.fleet.policyDetails.ErrorGettingFullAgentPolicy": "Erreur lors du chargement de la stratégie d'agent",
     "xpack.fleet.policyDetails.packagePoliciesTable.actionsColumnTitle": "Actions",
@@ -10308,7 +12955,7 @@
     "xpack.fleet.policyDetails.packagePoliciesTable.namespaceColumnTitle": "Espace de nom",
     "xpack.fleet.policyDetails.packagePoliciesTable.packageNameColumnTitle": "Intégration",
     "xpack.fleet.policyDetails.packagePoliciesTable.packageVersion": "v{version}",
-    "xpack.fleet.policyDetails.packagePoliciesTable.upgradeActionTitle": "Mettre à niveau la stratégie de package",
+    "xpack.fleet.policyDetails.packagePoliciesTable.upgradeActionTitle": "Mettre à niveau la stratégie d'intégration",
     "xpack.fleet.policyDetails.packagePoliciesTable.upgradeAvailable": "Mise à niveau disponible",
     "xpack.fleet.policyDetails.packagePoliciesTable.upgradeButton": "Mettre à niveau",
     "xpack.fleet.policyDetails.policyDetailsHostedPolicyTooltip": "Cette stratégie est gérée en dehors de Fleet. La plupart des actions liées à cette stratégie sont indisponibles.",
@@ -10319,7 +12966,7 @@
     "xpack.fleet.policyDetails.summary.integrations": "Intégrations",
     "xpack.fleet.policyDetails.summary.lastUpdated": "Dernière mise à jour le",
     "xpack.fleet.policyDetails.summary.revision": "Révision",
-    "xpack.fleet.policyDetails.summary.usedBy": "Utilisation par",
+    "xpack.fleet.policyDetails.summary.usedBy": "Agents",
     "xpack.fleet.policyDetails.unexceptedErrorTitle": "Une erreur est survenue lors du chargement de la stratégie d'agent",
     "xpack.fleet.policyDetails.viewAgentListTitle": "Afficher toutes les stratégies d'agent",
     "xpack.fleet.policyDetails.yamlDownloadButtonLabel": "Télécharger la stratégie",
@@ -10336,17 +12983,116 @@
     "xpack.fleet.policyForm.generalSettingsGroupTitle": "Paramètres généraux",
     "xpack.fleet.preconfiguration.duplicatePackageError": "Packages en double spécifiés dans la configuration : {duplicateList}",
     "xpack.fleet.preconfiguration.missingIDError": "{agentPolicyName} ne possède pas de champ \"id\". \"id\" obligatoire, sauf pour les stratégies marquées \"is_default\" ou \"is_default_fleet_server\".",
-    "xpack.fleet.preconfiguration.packageMissingError": "Impossible d'ajouter {agentPolicyName}. {pkgName} n'est pas installé, ajoutez {pkgName} à \"{packagesConfigValue}\" ou supprimez-le de {packagePolicyName}.",
+    "xpack.fleet.preconfiguration.packageMissingError": "Impossible d'ajouter [{agentPolicyName}]. [{pkgName}] n'est pas installé. Veuillez ajouter [{pkgName}] à [{packagesConfigValue}] ou le retirer de [{packagePolicyName}].",
+    "xpack.fleet.preconfiguration.packageRejectedError": "Impossible d'ajouter [{agentPolicyName}]. [{pkgName}] n'a pas pu être installé en raison d’une erreur : [{errorMessage}].",
     "xpack.fleet.preconfiguration.policyDeleted": "La stratégie préconfigurée {id} a été supprimée ; ignorer la création",
     "xpack.fleet.serverError.agentPolicyDoesNotExist": "La stratégie d'agent {agentPolicyId} n'existe pas",
     "xpack.fleet.serverError.enrollmentKeyDuplicate": "Une clé d'enregistrement nommée {providedKeyName} existe déjà pour la stratégie d'agent {agentPolicyId}",
     "xpack.fleet.serverError.returnedIncorrectKey": "La commande find enrollmentKeyById a renvoyé une clé erronée",
     "xpack.fleet.serverError.unableToCreateEnrollmentKey": "Impossible de créer une clé d'API d'enregistrement",
+    "xpack.fleet.serverPlugin.integrationsPrivilegesTooltip": "Tous les espaces sont requis pour l’accès à toutes les intégrations.",
+    "xpack.fleet.serverPlugin.privilegesTooltip": "Tous les espaces sont requis pour l’accès à Fleet.",
+    "xpack.fleet.settings.confirmModal.cancelButtonText": "Annuler",
+    "xpack.fleet.settings.confirmModal.confirmButtonText": "Enregistrer et déployer",
+    "xpack.fleet.settings.deleteOutput.agentPolicyCount": "{agentPolicyCount, plural, one {# stratégie d’agent} other {# stratégies d’agent}}",
+    "xpack.fleet.settings.deleteOutput.agentsCount": "{agentCount, plural, one {# agent} other {# agents}}",
+    "xpack.fleet.settings.deleteOutput.confirmModalText": "Cette action supprimera la sortie {outputName}. Elle mettra à jour les {policies} et {agents}. Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
+    "xpack.fleet.settings.deleteOutput.confirmModalTitle": "Supprimer et déployer les modifications ?",
+    "xpack.fleet.settings.deleteOutputs.confirmButtonLabel": "Supprimer et déployer",
+    "xpack.fleet.settings.deleteOutputs.errorToastTitle": "Erreur lors de la suppression de la sortie",
+    "xpack.fleet.settings.editOutputFlyout.agentIntegrationsBold": "intégrations d’agent",
+    "xpack.fleet.settings.editOutputFlyout.agentMonitoringBold": "monitoring des agents",
+    "xpack.fleet.settings.editOutputFlyout.caTrustedFingerprintInputLabel": "Empreinte digitale Elasticsearch autorisée par une autorité reconnue (CA) (facultatif)",
+    "xpack.fleet.settings.editOutputFlyout.caTrustedFingerprintInputPlaceholder": "Indiquer l’empreinte digitale Elasticsearch autorisée par une autorité reconnue (CA)",
+    "xpack.fleet.settings.editOutputFlyout.createTitle": "Ajouter une sortie",
+    "xpack.fleet.settings.editOutputFlyout.defaultMontoringOutputSwitchLabel": "Choisissez cette sortie par défaut pour le {boldAgentMonitoring}.",
+    "xpack.fleet.settings.editOutputFlyout.defaultOutputSwitchLabel": "Choisissez cette sortie par défaut pour les {boldAgentIntegrations}.",
+    "xpack.fleet.settings.editOutputFlyout.editTitle": "Modifier la sortie",
+    "xpack.fleet.settings.editOutputFlyout.esHostsInputLabel": "Hôtes",
+    "xpack.fleet.settings.editOutputFlyout.esHostsInputPlaceholder": "Indiquer l’URL de l’hôte",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputDescription": "Précisez les URL que vos agents doivent utiliser pour se connecter à un hôte Logstash. Pour en savoir plus, consultez le {guideLink}.",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputLabel": "Hôtes Logstash",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputPlaceholder": "Indiquer l’hôte",
+    "xpack.fleet.settings.editOutputFlyout.nameInputLabel": "Nom",
+    "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "Indiquer le nom",
+    "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "La plupart des actions liées à cette sortie sont indisponibles. Reportez-vous à votre configuration Kibana pour en savoir plus.",
+    "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "Cette sortie est gérée en dehors de Fleet.",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputLabel": "Autorités de certificat SSL du serveur",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputPlaceholder": "Indiquer l’autorité de certificat",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateInputLabel": "Certificat SSL client",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateInputPlaceholder": "Indiquer le certificat SSL",
+    "xpack.fleet.settings.editOutputFlyout.sslKeyInputLabel": "Clé du certificat SSL client",
+    "xpack.fleet.settings.editOutputFlyout.sslKeyInputPlaceholder": "Indiquer la clé du certificat",
+    "xpack.fleet.settings.editOutputFlyout.typeInputLabel": "Type",
+    "xpack.fleet.settings.editOutputFlyout.typeInputPlaceholder": "Indiquer le type",
+    "xpack.fleet.settings.editOutputFlyout.yamlConfigInputLabel": "Configuration YAML avancée",
+    "xpack.fleet.settings.editOutputFlyout.yamlConfigInputPlaceholder": "Ces # paramètres YAML seront ajoutés à la section de sortie de chaque stratégie d’agent.",
+    "xpack.fleet.settings.fleetServerHostEditButtonLabel": "Modifier les hôtes",
     "xpack.fleet.settings.fleetServerHostsDifferentPathOrProtocolError": "Le protocole et le chemin doivent être identiques pour chaque URL",
+    "xpack.fleet.settings.fleetServerHostsDuplicateError": "URL en double",
+    "xpack.fleet.settings.fleetServerHostSectionSubtitle": "Précisez les URL que vos agents doivent utiliser pour se connecter à un serveur Fleet. Si plusieurs URL existent, Fleet affichera la première URL fournie à des fins d'enregistrement. Pour en savoir plus, consultez le {guideLink}.",
+    "xpack.fleet.settings.fleetServerHostSectionTitle": "Hôtes du serveur Fleet",
     "xpack.fleet.settings.fleetServerHostsEmptyError": "Au moins une URL est obligatoire",
     "xpack.fleet.settings.fleetServerHostsError": "URL non valide",
+    "xpack.fleet.settings.fleetServerHostsFlyout.agentPolicyCount": "{agentPolicyCount, plural, one {# stratégie d’agent} other {# stratégies d’agent}}",
+    "xpack.fleet.settings.fleetServerHostsFlyout.agentsCount": "{agentCount, plural, one {# agent} other {# agents}}",
+    "xpack.fleet.settings.fleetServerHostsFlyout.cancelButtonLabel": "Annuler",
+    "xpack.fleet.settings.fleetServerHostsFlyout.confirmModalText": "Cette action mettra à jour les {policies} et {agents}. Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
+    "xpack.fleet.settings.fleetServerHostsFlyout.confirmModalTitle": "Enregistrer et déployer les modifications ?",
+    "xpack.fleet.settings.fleetServerHostsFlyout.description": "Précisez les URL que vos agents doivent utiliser pour se connecter à un serveur Fleet. Si plusieurs URL existent, Fleet affiche la première URL fournie à des fins d'enregistrement. Le serveur Fleet utilise le port 8220 par défaut. Reportez-vous à {link}.",
+    "xpack.fleet.settings.fleetServerHostsFlyout.errorToastTitle": "Une erreur est survenue lors de l’enregistrement des paramètres.",
+    "xpack.fleet.settings.fleetServerHostsFlyout.fleetServerHostsInputPlaceholder": "Indiquer l’URL de l’hôte",
+    "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "Enregistrer et appliquer les paramètres",
+    "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "Paramètres enregistrés",
+    "xpack.fleet.settings.fleetServerHostsFlyout.title": "Hôtes du serveur Fleet",
+    "xpack.fleet.settings.fleetServerHostsFlyout.userGuideLink": "Guide de Fleet et d’Elastic Agent",
+    "xpack.fleet.settings.fleetServerHostUrlColumnTitle": "URL de l’hôte",
+    "xpack.fleet.settings.fleetUserGuideLink": "Guide de l'utilisateur de Fleet",
+    "xpack.fleet.settings.logstashInstructions.apiKeyStepDescription": "Nous recommandons d'autoriser Logstash à effectuer la sortie vers Elasticsearch avec les privilèges minimum pour Elastic Agent.",
+    "xpack.fleet.settings.logstashInstructions.calloutTitle": "Configurer Logstash pour Elastic Agent",
+    "xpack.fleet.settings.logstashInstructions.collapseInstructionsButtonLabel": "Réduire les instructions",
+    "xpack.fleet.settings.logstashInstructions.copyApiKeyButtonLabel": "Copier le message",
+    "xpack.fleet.settings.logstashInstructions.description": "Vous devez ajouter un pipeline pour Elastic Agent vers Logstash. Pour en savoir plus, consultez notre {documentationLink}.",
+    "xpack.fleet.settings.logstashInstructions.documentationLink": "documentation",
+    "xpack.fleet.settings.logstashInstructions.generateApiKeyButtonLabel": "Générer une clé API",
+    "xpack.fleet.settings.logstashInstructions.generateApiKeyError": "Impossible de générer une clé API",
+    "xpack.fleet.settings.logstashInstructions.ourDocumentationLink": "notre documentation",
+    "xpack.fleet.settings.logstashInstructions.replaceStepDescription": "Remplacez les parties entre crochets par les chemins d’accès aux certificats SSL générés. Consultez {documentationLink} pour générer les certificats.",
+    "xpack.fleet.settings.logstashInstructions.saveAndRestartStepDescription": "Enregistrez le pipeline et redémarrez Logstash pour que les modifications prennent effet.",
+    "xpack.fleet.settings.logstashInstructions.viewInstructionButtonLabel": "Voir les instructions",
+    "xpack.fleet.settings.outputCreateButtonLabel": "Ajouter une sortie",
+    "xpack.fleet.settings.outputForm.caTrusterdFingerprintInvalidErrorMessage": "L’empreinte digitale autorisée par une autorité reconnue (CA) doit être de type base64 CA sha256.",
+    "xpack.fleet.settings.outputForm.elasticHostDuplicateError": "URL en double",
+    "xpack.fleet.settings.outputForm.elasticHostError": "URL non valide",
+    "xpack.fleet.settings.outputForm.elasticUrlRequiredError": "L'URL est requise",
+    "xpack.fleet.settings.outputForm.errorToastTitle": "Erreur lors de l’enregistrement de la sortie",
+    "xpack.fleet.settings.outputForm.invalidYamlFormatErrorMessage": "YAML non valide : {reason}",
+    "xpack.fleet.settings.outputForm.logstashHostDuplicateError": "Hôte en double",
+    "xpack.fleet.settings.outputForm.logstashHostError": "Hôte non valide",
+    "xpack.fleet.settings.outputForm.logstashHostProtocolError": "L’hôte Logstash n’est pas valide ; il ne doit pas commencer par http(s).",
+    "xpack.fleet.settings.outputForm.logstashHostRequiredError": "L'hôte est requis",
+    "xpack.fleet.settings.outputForm.nameIsRequiredErrorMessage": "Le nom est obligatoire",
+    "xpack.fleet.settings.outputForm.sslCertificateRequiredErrorMessage": "Certificat SSL requis",
+    "xpack.fleet.settings.outputForm.sslKeyRequiredErrorMessage": "Clé SSL requise",
+    "xpack.fleet.settings.outputs.defaultMonitoringOutputBadgeTitle": "Monitoring des agents",
+    "xpack.fleet.settings.outputs.defaultOutputBadgeTitle": "Intégrations d’agent",
+    "xpack.fleet.settings.outputSection.actionsColomnTitle": "Actions",
+    "xpack.fleet.settings.outputSection.defaultColomnTitle": "Par défaut",
+    "xpack.fleet.settings.outputSection.deleteButtonTitle": "Supprimer",
+    "xpack.fleet.settings.outputSection.editButtonTitle": "Modifier",
+    "xpack.fleet.settings.outputSectionSubtitle": "Indiquez l’emplacement vers lequel les agents doivent envoyer les données.",
+    "xpack.fleet.settings.outputSectionTitle": "Sorties",
+    "xpack.fleet.settings.outputsTable.elasticsearchTypeLabel": "Elasticsearch",
+    "xpack.fleet.settings.outputsTable.hostColomnTitle": "Hôtes",
+    "xpack.fleet.settings.outputsTable.managedTooltip": "Cette sortie est gérée en dehors de Fleet.",
+    "xpack.fleet.settings.outputsTable.nameColomnTitle": "Nom",
+    "xpack.fleet.settings.outputsTable.typeColomnTitle": "Type",
     "xpack.fleet.settings.sortHandle": "Trier par identification d'hôte",
-    "xpack.fleet.settings.userGuideLink": "Guide de l'utilisateur de Fleet",
+    "xpack.fleet.settings.updateOutput.agentPolicyCount": "{agentPolicyCount, plural, one {# stratégie d’agent} other {# stratégies d’agent}}",
+    "xpack.fleet.settings.updateOutput.agentsCount": "{agentCount, plural, one {# agent} other {# agents}}",
+    "xpack.fleet.settings.updateOutput.confirmModalText": "Cette action mettra à jour la sortie {outputName}. Elle mettra à jour les {policies} et {agents}. Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
+    "xpack.fleet.settings.updateOutput.confirmModalTitle": "Enregistrer et déployer les modifications ?",
+    "xpack.fleet.settings.userGuideLink": "Guide de Fleet et d’Elastic Agent",
     "xpack.fleet.settings.yamlCodeEditor": "Éditeur de code YAML",
     "xpack.fleet.setup.titleLabel": "Chargement de Fleet en cours…",
     "xpack.fleet.setup.uiPreconfigurationErrorTitle": "Erreur de configuration",
@@ -10390,8 +13136,9 @@
     "xpack.fleet.upgradeAgents.upgradeSingleDescription": "Cette action met à niveau l'agent qui s'exécute sur \"{hostName}\" vers la version {version}. Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
     "xpack.fleet.upgradeAgents.upgradeSingleTitle": "Mettre l'agent à niveau vers la dernière version",
     "xpack.fleet.upgradePackagePolicy.pageDescriptionFromUpgrade": "Mettre à niveau cette intégration et déployer les modifications sur la stratégie d'agent sélectionnée",
-    "xpack.fleet.upgradePackagePolicy.previousVersionFlyout.title": "Stratégie de package \"{name}\"",
-    "xpack.fleet.upgradePackagePolicy.statusCallout.errorContent": "Cette intégration contient des champs conflictuels entre la version {currentVersion} et la version {upgradeVersion}. Vérifiez et enregistrez la configuration pour exécuter la mise à niveau. Vous pouvez consulter votre {previousConfigurationLink} pour comparer.",
+    "xpack.fleet.upgradePackagePolicy.pageTitle": "Mettre à niveau l'intégration",
+    "xpack.fleet.upgradePackagePolicy.previousVersionFlyout.title": "Stratégie d'intégration \"{name}\"",
+    "xpack.fleet.upgradePackagePolicy.statusCallout.errorContent": "Cette intégration contient des champs conflictuels entre la version {currentVersion} et la version {upgradeVersion}. Vérifiez la configuration, puis enregistrez pour exécuter la mise à niveau. Vous pouvez consulter votre {previousConfigurationLink} pour comparer.",
     "xpack.fleet.upgradePackagePolicy.statusCallOut.errorTitle": "Examiner les conflits entre les champs",
     "xpack.fleet.upgradePackagePolicy.statusCallout.previousConfigurationLink": "configuration précédente",
     "xpack.fleet.upgradePackagePolicy.statusCallout.successContent": "Cette intégration est prête pour une mise à niveau de la version {currentVersion} vers la version {upgradeVersion}. Vérifiez les modifications ci-après et enregistrez pour effectuer la mise à niveau.",
@@ -10405,15 +13152,21 @@
     "xpack.globalSearchBar.searchBar.noResultsImageAlt": "Illustration d'un trou noir",
     "xpack.globalSearchBar.searchBar.optionTagListAriaLabel": "Balises",
     "xpack.globalSearchBar.searchbar.overflowTagsAriaLabel": "{n} {n, plural, one {balise} other {balises}} de plus : {tags}",
+    "xpack.globalSearchBar.searchBar.placeholder": "Cherchez des applications, du contenu, et plus encore. Ex : Découverte",
     "xpack.globalSearchBar.searchBar.shortcutDescription.macCommandDescription": "Commande + /",
     "xpack.globalSearchBar.searchBar.shortcutDescription.shortcutDetail": "{shortcutDescription} {commandDescription}",
     "xpack.globalSearchBar.searchBar.shortcutDescription.shortcutInstructionDescription": "Raccourci",
     "xpack.globalSearchBar.searchBar.shortcutDescription.windowsCommandDescription": "Contrôle + /",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.description": "Raccourci clavier",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.macCommandDescription": "Commande + /",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.windowsCommandDescription": "Contrôle + /",
     "xpack.globalSearchBar.suggestions.filterByTagLabel": "Filtrer par nom de balise",
     "xpack.globalSearchBar.suggestions.filterByTypeLabel": "Filtrer par type",
     "xpack.graph.badge.readOnly.text": "Lecture seule",
     "xpack.graph.badge.readOnly.tooltip": "Impossible d'enregistrer les espaces de travail Graph",
     "xpack.graph.bar.exploreLabel": "Graph",
+    "xpack.graph.bar.exploreLabelNoFields": "Sélectionner au moins un champ",
+    "xpack.graph.bar.exploreLabelNoIndexPattern": "Sélectionner une source de données",
     "xpack.graph.bar.pickFieldsLabel": "Ajouter des champs",
     "xpack.graph.bar.pickSourceLabel": "Sélectionner une source de données",
     "xpack.graph.bar.pickSourceTooltip": "Sélectionner une source de données pour commencer à représenter les relations graphiquement.",
@@ -10496,6 +13249,7 @@
     "xpack.graph.leaveWorkspace.confirmButtonLabel": "Quitter",
     "xpack.graph.leaveWorkspace.confirmText": "Si vous quittez maintenant, vous perdez les modifications non enregistrées.",
     "xpack.graph.leaveWorkspace.modalTitle": "Modifications non enregistrées",
+    "xpack.graph.legacyUrlConflict.objectNoun": "Graph",
     "xpack.graph.listing.createNewGraph.combineDataViewFromKibanaAppDescription": "Découvrez des modèles et des relations dans vos index Elasticsearch.",
     "xpack.graph.listing.createNewGraph.createButtonLabel": "Créer un graphe",
     "xpack.graph.listing.createNewGraph.newToKibanaDescription": "Vous découvrez Kibana ? Commencez par {sampleDataInstallLink}.",
@@ -10509,9 +13263,11 @@
     "xpack.graph.listing.table.entityName": "graphe",
     "xpack.graph.listing.table.entityNamePlural": "graphes",
     "xpack.graph.listing.table.titleColumnName": "Titre",
+    "xpack.graph.loadWorkspace.missingDataViewErrorMessage": "Vue de données \"{name}\" introuvable",
     "xpack.graph.missingWorkspaceErrorMessage": "Impossible de charger le graphe avec l'ID",
     "xpack.graph.newGraphTitle": "Graphe non enregistré",
-    "xpack.graph.noDataSourceNotificationMessageText": "Source de données introuvable. Accédez à {managementIndexPatternsLink} et créez un modèle d'indexation pour vos index Elasticsearch.",
+    "xpack.graph.noDataSourceNotificationMessageText": "Source de données introuvable. Accédez à {managementIndexPatternsLink} et créez une vue de données pour vos index Elasticsearch.",
+    "xpack.graph.noDataSourceNotificationMessageText.managementDataViewLinkText": "Gestion > Vues de données",
     "xpack.graph.noDataSourceNotificationMessageTitle": "Aucune source de données",
     "xpack.graph.outlinkEncoders.esqPlainDescription": "JSON encodé avec un encodage d'URL standard",
     "xpack.graph.outlinkEncoders.esqPlainTitle": "requête elasticsearch (encodage simple)",
@@ -10586,6 +13342,7 @@
     "xpack.graph.sidebar.linkSummary.leftTermCountTooltip": "{count} documents contiennent le terme {term}",
     "xpack.graph.sidebar.linkSummary.mergeTerm1ToTerm2ButtonTooltip": "Fusionner {term1} dans {term2}",
     "xpack.graph.sidebar.linkSummary.mergeTerm2ToTerm1ButtonTooltip": "Fusionner {term2} dans {term1}",
+    "xpack.graph.sidebar.linkSummary.noData": "Aucune intersection de termes trouvée pour la sélection de lien.",
     "xpack.graph.sidebar.linkSummary.rightTermCountTooltip": "{count} documents contiennent le terme {term}",
     "xpack.graph.sidebar.linkSummaryTitle": "Sommaire des liens",
     "xpack.graph.sidebar.selections.invertSelectionButtonLabel": "inverser",
@@ -10612,6 +13369,7 @@
     "xpack.graph.sidebar.ungroupButtonLabel": "dégrouper",
     "xpack.graph.sidebar.ungroupButtonTooltip": "dégrouper {latestSelectionLabel}",
     "xpack.graph.sourceModal.notFoundLabel": "Source de données introuvable.",
+    "xpack.graph.sourceModal.savedObjectType.dataView": "Vue de données",
     "xpack.graph.sourceModal.title": "Sélectionner une source de données",
     "xpack.graph.templates.addLabel": "Nouvelle exploration",
     "xpack.graph.templates.newTemplateFormLabel": "Ajouter une exploration",
@@ -10758,7 +13516,7 @@
     "xpack.idxMgmt.componentTemplatesSelector.emptyPromptLearnMoreLinkText": "En savoir plus.",
     "xpack.idxMgmt.componentTemplatesSelector.emptyPromptTitle": "Vous n'avez pas encore de composant",
     "xpack.idxMgmt.componentTemplatesSelector.filters.aliasesLabel": "Alias",
-    "xpack.idxMgmt.componentTemplatesSelector.filters.indexSettingsLabel": "Paramètres d'index",
+    "xpack.idxMgmt.componentTemplatesSelector.filters.indexSettingsLabel": "Paramètres des index",
     "xpack.idxMgmt.componentTemplatesSelector.filters.mappingsLabel": "Mappings",
     "xpack.idxMgmt.componentTemplatesSelector.loadingComponentsDescription": "Chargement des modèles de composants en cours…",
     "xpack.idxMgmt.componentTemplatesSelector.loadingComponentsErrorMessage": "Erreur lors du chargement des composants",
@@ -10849,6 +13607,10 @@
     "xpack.idxMgmt.deleteTemplatesModal.successDeleteMultipleNotificationMessageText": "{numSuccesses, plural, one {# modèle supprimé} other {# modèles supprimés}}",
     "xpack.idxMgmt.deleteTemplatesModal.successDeleteSingleNotificationMessageText": "Le modèle \"{templateName}\" a été supprimé",
     "xpack.idxMgmt.deleteTemplatesModal.systemTemplateLabel": "Modèle système",
+    "xpack.idxMgmt.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.idxMgmt.deprecations.enabled.manualStepTwoMessage": "Remplacez le paramètre \"xpack.index_management.enabled\" par \"xpack.index_management.ui.enabled\".",
+    "xpack.idxMgmt.deprecations.enabledMessage": "Pour empêcher les utilisateurs d'accéder à l’interface utilisateur de gestion des index, utilisez le paramètre \"xpack.index_management.ui.enabled\" au lieu de \"xpack.index_management.enabled\".",
+    "xpack.idxMgmt.deprecations.enabledTitle": "Le paramètre \"xpack.index_management.enabled\" est déclassé.",
     "xpack.idxMgmt.detailPanel.manageContextMenuLabel": "Gérer",
     "xpack.idxMgmt.detailPanel.missingIndexMessage": "Cet index n'existe pas. Il a peut-être été supprimé par une tâche en cours d'exécution ou par un autre système.",
     "xpack.idxMgmt.detailPanel.missingIndexTitle": "Index manquant",
@@ -10859,6 +13621,7 @@
     "xpack.idxMgmt.detailPanel.tabSummaryLabel": "Résumé",
     "xpack.idxMgmt.editIndexSettingsAction.successfullySavedSettingsForIndicesMessage": "Les paramètres de {indexName} ont bien été enregistrés",
     "xpack.idxMgmt.editSettingsJSON.saveJSONButtonLabel": "Enregistrer",
+    "xpack.idxMgmt.editSettingsJSON.saveJSONCalloutErrorTitle": "Une erreur est survenue lors de l’enregistrement de vos paramètres.",
     "xpack.idxMgmt.editSettingsJSON.saveJSONDescription": "Modifiez, puis enregistrez votre JSON",
     "xpack.idxMgmt.editSettingsJSON.settingsReferenceLinkText": "Référence des paramètres",
     "xpack.idxMgmt.editTemplate.editTemplatePageTitle": "Modifier le modèle \"{name}\"",
@@ -10882,7 +13645,7 @@
     "xpack.idxMgmt.formWizard.stepSettings.settingsDescription": "Définissez le comportement de vos index.",
     "xpack.idxMgmt.formWizard.stepSettings.settingsEditorHelpText": "Utiliser le format JSON : {code}",
     "xpack.idxMgmt.formWizard.stepSettings.stepTitle": "Paramètres d'index (facultatif)",
-    "xpack.idxMgmt.frozenBadgeLabel": "Gelé",
+    "xpack.idxMgmt.frozenBadgeLabel": "Frozen",
     "xpack.idxMgmt.home.appTitle": "Gestion des index",
     "xpack.idxMgmt.home.componentTemplates.checkingPrivilegesDescription": "Vérification des privilèges…",
     "xpack.idxMgmt.home.componentTemplates.checkingPrivilegesErrorMessage": "Erreur lors de la récupération des privilèges utilisateur depuis le serveur.",
@@ -11044,6 +13807,7 @@
     "xpack.idxMgmt.mappingsEditor.configuration.numericFieldDescription": "Par exemple, \"1.0\" serait mappé en tant qu'élément flottant et \"1\" serait mappé en tant qu'entier.",
     "xpack.idxMgmt.mappingsEditor.configuration.numericFieldLabel": "Mapper les chaînes numériques en tant que nombres",
     "xpack.idxMgmt.mappingsEditor.configuration.routingLabel": "Demander une valeur _routing pour les opérations CRUD",
+    "xpack.idxMgmt.mappingsEditor.configuration.sizeLabel": "Indexer la taille du champ _source en octets",
     "xpack.idxMgmt.mappingsEditor.configuration.sourceFieldLabel": "Activer le champ _source",
     "xpack.idxMgmt.mappingsEditor.configuration.sourceFieldPathComboBoxHelpText": "Accepte un chemin d'accès au champ, y compris les caractères génériques.",
     "xpack.idxMgmt.mappingsEditor.configuration.throwErrorsForUnmappedFieldsLabel": "Lever une exception lorsqu'un document contient un champ non mappé",
@@ -11369,9 +14133,9 @@
     "xpack.idxMgmt.mappingsEditor.loadJsonModal.validationErrorDescription": "Si vous continuez de charger l'objet, seules les options valides sont acceptées.",
     "xpack.idxMgmt.mappingsEditor.loadJsonModal.validationErrorTitle": "{totalErrors} {totalErrors, plural, one {option non valide détectée} other {options non valides détectées}} dans l'objet {mappings}",
     "xpack.idxMgmt.mappingsEditor.loadJsonModalTitle": "Charger le JSON",
-    "xpack.idxMgmt.mappingsEditor.mappingTypesDetectedCallOutDescription": "Le mapping de ce modèle utilise plusieurs types qui ne sont pas pris en charge. {docsLink}",
+    "xpack.idxMgmt.mappingsEditor.mappingTypesDetectedCallOutDescription": "Les mappings pour ce modèle utilisent des types qui ont été retirés. {docsLink}",
     "xpack.idxMgmt.mappingsEditor.mappingTypesDetectedCallOutDocumentationLink": "Envisagez ces alternatives aux types de mappings.",
-    "xpack.idxMgmt.mappingsEditor.mappingTypesDetectedCallOutTitle": "Plusieurs types de mappings détectés",
+    "xpack.idxMgmt.mappingsEditor.mappingTypesDetectedCallOutTitle": "Types de mappings détectés",
     "xpack.idxMgmt.mappingsEditor.maxShingleSizeFieldDescription": "La valeur par défaut est trois sous-champs de tuiles. Utiliser plus de sous-champs permet d’effectuer des requêtes plus spécifiques, mais augmente la taille de l'index.",
     "xpack.idxMgmt.mappingsEditor.maxShingleSizeFieldTitle": "Définir la taille de tuile maximale",
     "xpack.idxMgmt.mappingsEditor.metaFieldDescription": "Utilisez le champ _meta pour stocker les métadonnées que vous souhaitez. {docsLink}",
@@ -11484,6 +14248,9 @@
     "xpack.idxMgmt.mappingsEditor.shapeType.ignoredMalformedFieldDescription": "Par défaut, les documents qui contiennent des formes GeoJSON ou WKT malformées ne sont pas indexés. Si cette option est activée, ces documents sont indexés, mais les champs contenant des formes malformées sont filtrés. Attention, si le nombre de documents indexés de cette manière est trop important, les requêtes effectuées sur le champ deviennent vides de sens.",
     "xpack.idxMgmt.mappingsEditor.showAllErrorsButtonLabel": "Afficher {numErrors} erreurs supplémentaires",
     "xpack.idxMgmt.mappingsEditor.similarityDocLinkText": "Documentation sur les similarités",
+    "xpack.idxMgmt.mappingsEditor.sizeDescription": "Le plug-in Mapper Size peut indexer la taille du champ {_source} d’origine. {docsLink}",
+    "xpack.idxMgmt.mappingsEditor.sizeDocumentionLink": "En savoir plus.",
+    "xpack.idxMgmt.mappingsEditor.sizeTitle": "_taille",
     "xpack.idxMgmt.mappingsEditor.sourceExcludeField.placeholderLabel": "path.to.field.*",
     "xpack.idxMgmt.mappingsEditor.sourceFieldDescription": "Le champ _source contient le corps du document JSON d'origine qui a été fourni au moment de l'indexation. Vous pouvez nettoyer des champs individuels en définissant ceux à inclure ou exclure du champ _source. {docsLink}",
     "xpack.idxMgmt.mappingsEditor.sourceFieldDocumentionLink": "En savoir plus.",
@@ -11542,7 +14309,7 @@
     "xpack.idxMgmt.summary.headers.replicaHeader": "Répliques",
     "xpack.idxMgmt.summary.headers.statusHeader": "Statut",
     "xpack.idxMgmt.summary.headers.storageSizeHeader": "Taille du stockage",
-    "xpack.idxMgmt.summary.summaryTitle": "Généralités",
+    "xpack.idxMgmt.summary.summaryTitle": "Général",
     "xpack.idxMgmt.templateBadgeType.cloudManaged": "Géré dans le cloud",
     "xpack.idxMgmt.templateBadgeType.managed": "Géré",
     "xpack.idxMgmt.templateBadgeType.system": "Système",
@@ -11707,7 +14474,17 @@
     "xpack.indexLifecycleMgmt.confirmDelete.undoneWarning": "Vous ne pouvez pas récupérer de stratégie supprimée.",
     "xpack.indexLifecycleMgmt.dataTier.noTiersAvailableUsingNodeAttributesDescription": "Impossible d'allouer les données : aucun nœud de données disponible.",
     "xpack.indexLifecycleMgmt.dataTier.willUseFallbackTierUsingNodeAttributesDescription": "Aucun nœud {phase} disponible. Les données sont allouées au niveau {fallbackTier}.",
+    "xpack.indexLifecycleMgmt.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.indexLifecycleMgmt.deprecations.enabled.manualStepTwoMessage": "Remplacez le paramètre \"xpack.ilm.enabled\" par \"xpack.ilm.ui.enabled\".",
+    "xpack.indexLifecycleMgmt.deprecations.enabledMessage": "Pour empêcher les utilisateurs d'accéder à l'interface utilisateur des stratégies de cycle de vie des index, utilisez le paramètre \"xpack.ilm.ui.enabled\" au lieu de \"xpack.ilm.enabled\".",
+    "xpack.indexLifecycleMgmt.deprecations.enabledTitle": "Le paramètre \"xpack.ilm.enabled\" est déclassé",
     "xpack.indexLifecycleMgmt.editPolicy.andDependenciesLink": " et {indexTemplatesLink}",
+    "xpack.indexLifecycleMgmt.editPolicy.byteSizeUnits.bytesLabel": "octets",
+    "xpack.indexLifecycleMgmt.editPolicy.byteSizeUnits.gigabytesLabel": "gigaoctets",
+    "xpack.indexLifecycleMgmt.editPolicy.byteSizeUnits.kilobytesLabel": "kilobytes",
+    "xpack.indexLifecycleMgmt.editPolicy.byteSizeUnits.megabytesLabel": "mégaoctets",
+    "xpack.indexLifecycleMgmt.editPolicy.byteSizeUnits.petabytesLabel": "pétaoctets",
+    "xpack.indexLifecycleMgmt.editPolicy.byteSizeUnits.terabytesLabel": "téraoctets",
     "xpack.indexLifecycleMgmt.editPolicy.cancelButton": "Annuler",
     "xpack.indexLifecycleMgmt.editPolicy.cloudDataTierCallout.body": "Migrer votre déploiement Elastic Cloud pour utiliser des niveaux de données.",
     "xpack.indexLifecycleMgmt.editPolicy.cloudDataTierCallout.linkToCloudDeploymentDescription": "Afficher le déploiement sur le cloud",
@@ -11802,6 +14579,7 @@
     "xpack.indexLifecycleMgmt.editPolicy.linkedIndices": "{indicesCount, plural, one {# index lié} other {# index liés}}",
     "xpack.indexLifecycleMgmt.editPolicy.loadSnapshotRepositoriesErrorBody": "Actualisez ce champ et saisissez le nom d'un référentiel de snapshot existant.",
     "xpack.indexLifecycleMgmt.editPolicy.loadSnapshotRepositoriesErrorTitle": "Impossible de charger les référentiels de snapshots",
+    "xpack.indexLifecycleMgmt.editPolicy.maximumPrimaryShardSizeAriaLabel": "Unités de la taille de partition maximale",
     "xpack.indexLifecycleMgmt.editPolicy.minAgeSmallerThanColdPhaseError": "Doit être supérieure ou égale à la valeur de la phase \"cold\" ({value})",
     "xpack.indexLifecycleMgmt.editPolicy.minAgeSmallerThanFrozenPhaseError": "Doit être supérieure ou égale à la valeur de la phase \"frozen\" ({value})",
     "xpack.indexLifecycleMgmt.editPolicy.minAgeSmallerThanWarmPhaseError": "Doit être supérieure ou égale à la valeur de la phase \"warm\" ({value})",
@@ -11853,16 +14631,25 @@
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshot.repositoryHelpText": "Chaque phase utilise le même référentiel de snapshot.",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshot.storageHelpText": "Type de snapshot installé pour le snapshot qu’il est possible de rechercher. Il s'agit d'une option avancée. Ne la modifiez que si vous savez ce que vous faites.",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshot.storageLabel": "Stockage",
-    "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotCalloutBody": "Les actions Forcer la fusion, Réduire, Lecture seule et Geler ne sont pas autorisées lors de la conversion des données en index entièrement installé dans cette phase.",
+    "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotCalloutBody": "Les actions Forcer la fusion, Réduire et Lecture seule ne sont pas autorisées lors de la conversion des données en index entièrement installé dans cette phase.",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotLicenseCalloutBody": "Licence Enterprise obligatoire pour créer un snapshot qu’il est possible de rechercher.",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotLicenseCalloutTitle": "Licence Enterprise requise",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotRepoFieldLabel": "Référentiel de snapshot",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotRepoRequiredError": "Nom de référentiel de snapshot obligatoire.",
     "xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotStorageFieldLabel": "Stockage de snapshots qu’il est possible de rechercher",
-    "xpack.indexLifecycleMgmt.editPolicy.showPolicyJsonButton": "Afficher la demande",
+    "xpack.indexLifecycleMgmt.editPolicy.showPolicyJsonButton": "Afficher la requête",
+    "xpack.indexLifecycleMgmt.editPolicy.shrink.configureShardCountLabel": "Configurer le nombre de partitions",
+    "xpack.indexLifecycleMgmt.editPolicy.shrink.configureShardSizeLabel": "Configurer la taille des partitions",
     "xpack.indexLifecycleMgmt.editPolicy.shrinkIndexExplanationText": "Réduisez l'index en un nouvel index contenant moins de partitions principales.",
     "xpack.indexLifecycleMgmt.editPolicy.shrinkText": "Réduire",
     "xpack.indexLifecycleMgmt.editPolicy.successfulSaveMessage": "{verb} la stratégie de cycle de vie \"{lifecycleName}\"",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.daysLabel": "jours",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.hoursLabel": "heures",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.microsecondsLabel": "microsecondes",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.millisecondsLabel": "millisecondes",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.minutesLabel": "minutes",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.nanosecondsLabel": "nanosecondes",
+    "xpack.indexLifecycleMgmt.editPolicy.timeUnits.secondsLabel": "secondes",
     "xpack.indexLifecycleMgmt.editPolicy.updatedMessage": "Mis à jour",
     "xpack.indexLifecycleMgmt.editPolicy.validPolicyNameMessage": "Un nom de stratégie ne peut pas commencer par un trait de soulignement et ne peut pas contenir de virgule ou d'espace.",
     "xpack.indexLifecycleMgmt.editPolicy.viewNodeDetailsButton": "Afficher les nœuds avec l'attribut sélectionné",
@@ -11991,6 +14778,7 @@
     "xpack.indexLifecycleMgmt.searchableSnapshot.disallowedCalloutBody": "Pour utiliser un snapshot qu’il est possible de rechercher dans cette phase, vous devez désactiver le snapshot qu’il est possible de rechercher en phase \"hot\".",
     "xpack.indexLifecycleMgmt.searchableSnapshot.disallowedCalloutTitle": "Snapshot qu’il est possible de rechercher désactivé",
     "xpack.indexLifecycleMgmt.searchSnapshotlicenseCheckErrorMessage": "L'utilisation de snapshots qu'il est possible de rechercher nécessite au moins une licence Enterprise.",
+    "xpack.indexLifecycleMgmt.shrink.enableShrinkLabel": "Réduire l'index",
     "xpack.indexLifecycleMgmt.shrink.numberOfPrimaryShardsLabel": "Nombre de partitions principales",
     "xpack.indexLifecycleMgmt.templateNotFoundMessage": "Modèle {name} introuvable.",
     "xpack.indexLifecycleMgmt.timeline.coldPhaseSectionTitle": "Phase \"cold\"",
@@ -12070,6 +14858,25 @@
     "xpack.infra.dataSearch.cancelButtonLabel": "Annuler la demande",
     "xpack.infra.dataSearch.loadingErrorRetryButtonLabel": "Réessayer",
     "xpack.infra.dataSearch.shardFailureErrorMessage": "Index {indexName} : {errorMessage}",
+    "xpack.infra.deprecations.containerAdjustIndexing": "Ajustez votre indexation pour identifier les conteneurs Docker utilisant \"{field}\".",
+    "xpack.infra.deprecations.containerIdFieldName": "ID de conteneur",
+    "xpack.infra.deprecations.containerIdFieldTitle": "Le champ de configuration source \"ID de conteneur\" est déclassé.",
+    "xpack.infra.deprecations.deprecatedFieldConfigDescription": "La configuration de \"xpack.infra.sources.default.fields.{fieldKey}\" a été déclassée et sera retirée dans la version 8.0.0.",
+    "xpack.infra.deprecations.deprecatedFieldConfigTitle": "\"{fieldKey}\" est déclassé.",
+    "xpack.infra.deprecations.deprecatedFieldDescription": "La configuration du champ \"{fieldName}\" a été déclassée et sera retirée dans la version 8.0.0. Ce plug-in est conçu pour fonctionner avec ECS et attend la valeur \"{defaultValue}\" pour ce champ. Celui-ci présente une valeur différente dans {configCount, plural, one {la configuration} other {les configurations}} source : {configNames}.",
+    "xpack.infra.deprecations.hostAdjustIndexing": "Ajustez votre indexation pour identifier les hôtes utilisant \"{field}\".",
+    "xpack.infra.deprecations.hostnameFieldName": "nom d'hôte",
+    "xpack.infra.deprecations.hostnameFieldTitle": "Le champ de configuration source \"nom d’hôte\" est déclassé.",
+    "xpack.infra.deprecations.podAdjustIndexing": "Ajustez votre indexation pour identifier les pods Kubernetes utilisant \"{field}\".",
+    "xpack.infra.deprecations.podIdFieldName": "ID de pod",
+    "xpack.infra.deprecations.podIdFieldTitle": "Le champ de configuration source \"ID de pod\" est déclassé.",
+    "xpack.infra.deprecations.removeConfigField": "Retirez \"xpack.infra.sources.default.fields.{fieldKey}\" de votre configuration Kibana.",
+    "xpack.infra.deprecations.tiebreakerAdjustIndexing": "Ajustez votre indexation pour utiliser \"{field}\" comme départage.",
+    "xpack.infra.deprecations.tiebreakerFieldName": "Départage",
+    "xpack.infra.deprecations.tiebreakerFieldTitle": "Le champ de configuration source \"départage\" est déclassé.",
+    "xpack.infra.deprecations.timestampAdjustIndexing": "Ajustez votre indexation pour utiliser \"{field}\" comme horodatage.",
+    "xpack.infra.deprecations.timestampFieldName": "timestamp",
+    "xpack.infra.deprecations.timestampFieldTitle": "Le champ de configuration source \"horodatage\" est déclassé.",
     "xpack.infra.durationUnits.days.plural": "jours",
     "xpack.infra.durationUnits.days.singular": "jour",
     "xpack.infra.durationUnits.hours.plural": "heures",
@@ -12114,7 +14921,7 @@
     "xpack.infra.homePage.documentTitle": "Indicateurs",
     "xpack.infra.homePage.inventoryTabTitle": "Inventory",
     "xpack.infra.homePage.metricsExplorerTabTitle": "Metrics Explorer",
-    "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "Afficher les instructions de configuration",
+    "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "Voir les instructions de configuration",
     "xpack.infra.homePage.settingsTabTitle": "Paramètres",
     "xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder": "Rechercher des données d'infrastructure… (par exemple host.name:host-1)",
     "xpack.infra.homePage.toolbar.showingLastOneMinuteDataText": "Dernières {duration} de données pour l'heure sélectionnée",
@@ -12218,6 +15025,11 @@
     "xpack.infra.logs.alerting.comparator.notEqNumber": "n'est pas égal à",
     "xpack.infra.logs.alerting.comparator.notMatch": "ne correspond pas à",
     "xpack.infra.logs.alerting.comparator.notMatchPhrase": "ne correspond pas à l'expression",
+    "xpack.infra.logs.alerting.comparator.symbol.match": "correspond à",
+    "xpack.infra.logs.alerting.comparator.symbol.matchPhrase": "correspond à l'expression",
+    "xpack.infra.logs.alerting.comparator.symbol.notMatch": "ne correspond pas à",
+    "xpack.infra.logs.alerting.comparator.symbol.notMatchPhrase": "ne correspond pas à l'expression",
+    "xpack.infra.logs.alerting.threshold.alertReasonMessageActionVariableDescription": "Une description concise de la raison du signalement",
     "xpack.infra.logs.alerting.threshold.conditionsActionVariableDescription": "Conditions à remplir par les entrées de logs",
     "xpack.infra.logs.alerting.threshold.defaultActionMessage": "\\{\\{^context.isRatio\\}\\}\\{\\{#context.group\\}\\}\\{\\{context.group\\}\\} - les entrées de logs \\{\\{/context.group\\}\\}\\{\\{context.matchingDocuments\\}\\} correspondent aux conditions suivantes : \\{\\{context.conditions\\}\\}\\{\\{/context.isRatio\\}\\}\\{\\{#context.isRatio\\}\\}\\{\\{#context.group\\}\\}\\{\\{context.group\\}\\} – \\{\\{/context.group\\}\\} Rapport du nombre d'entrées de logs qui correspondent à \\{\\{context.numeratorConditions\\}\\} sur le nombre d'entrées de logs qui correspondent à \\{\\{context.denominatorConditions\\}\\} était \\{\\{context.ratio\\}\\}\\{\\{/context.isRatio\\}\\}",
     "xpack.infra.logs.alerting.threshold.denominatorConditionsActionVariableDescription": "Conditions à remplir par le dénominateur du rapport",
@@ -12225,12 +15037,17 @@
     "xpack.infra.logs.alerting.threshold.everythingSeriesName": "Entrées de logs",
     "xpack.infra.logs.alerting.threshold.fired": "Déclenché",
     "xpack.infra.logs.alerting.threshold.groupByActionVariableDescription": "Nom du groupe responsable du déclenchement de l'alerte",
+    "xpack.infra.logs.alerting.threshold.groupedCountAlertReasonDescription": "{actualCount, plural, one {{actualCount} entrée de log} other {{actualCount} entrées de log}} dans les dernières {duration} pour {groupName}. Signaler quand {comparator} {expectedCount}.",
+    "xpack.infra.logs.alerting.threshold.groupedRatioAlertReasonDescription": "Le rapport des logs sélectionnés est de {actualRatio} dans les dernières {duration} pour {groupName}. Signaler quand {comparator} {expectedRatio}.",
     "xpack.infra.logs.alerting.threshold.isRatioActionVariableDescription": "Indique si cette alerte a été configurée avec un rapport",
     "xpack.infra.logs.alerting.threshold.numeratorConditionsActionVariableDescription": "Conditions à remplir par le numérateur du rapport",
     "xpack.infra.logs.alerting.threshold.ratioActionVariableDescription": "Valeur du rapport des deux ensembles de critères",
     "xpack.infra.logs.alerting.threshold.ratioCriteriaQueryAText": "Requête A",
     "xpack.infra.logs.alerting.threshold.ratioCriteriaQueryBText": "Requête B",
     "xpack.infra.logs.alerting.threshold.timestampActionVariableDescription": "Horodatage UTC du moment où l'alerte a été déclenchée",
+    "xpack.infra.logs.alerting.threshold.ungroupedCountAlertReasonDescription": "{actualCount, plural, one {{actualCount} entrée de log} other {{actualCount} entrées de log}} dans les dernières {duration}. Signaler quand {comparator} {expectedCount}.",
+    "xpack.infra.logs.alerting.threshold.ungroupedRatioAlertReasonDescription": "Le rapport des logs sélectionnés est de {actualRatio} dans les dernières {duration}. Signaler quand {comparator} {expectedRatio}.",
+    "xpack.infra.logs.alerting.threshold.viewInAppUrlActionVariableDescription": "Lien vers la vue ou la fonctionnalité dans Elastic qui peut être utilisée pour examiner l'alerte et son contexte de manière plus approfondie",
     "xpack.infra.logs.alertName": "Seuil de log",
     "xpack.infra.logs.alerts.dataTimeRangeLabel": "Dernières {lookback} {timeLabel} de données",
     "xpack.infra.logs.alerts.dataTimeRangeLabelWithGrouping": "Dernières {lookback} {timeLabel} de données, regroupées par {groupByLabel} ({displayedGroups}/{totalGroups} groupes affichés)",
@@ -12350,6 +15167,9 @@
     "xpack.infra.logs.logEntryRate.setupDescription": "Pour activer les anomalies de logs, configurer une tâche de Machine Learning",
     "xpack.infra.logs.logEntryRate.setupTitle": "Configurer l'analyse d'anomalies de logs",
     "xpack.infra.logs.logEntryRate.showAnalysisSetupButtonLabel": "Configuration ML",
+    "xpack.infra.logs.noDataConfig.beatsCard.description": "Utilisez Elastic Agent ou Beats pour envoyer des logs à Elasticsearch. Nous facilitons les choses avec des intégrations pour de nombreux systèmes et applications populaires.",
+    "xpack.infra.logs.noDataConfig.beatsCard.title": "Ajouter une intégration au logging",
+    "xpack.infra.logs.noDataConfig.solutionName": "Observabilité",
     "xpack.infra.logs.pluginTitle": "Logs",
     "xpack.infra.logs.scrollableLogTextStreamView.loadingEntriesLabel": "Chargement des entrées",
     "xpack.infra.logs.search.nextButtonLabel": "Suivant",
@@ -12371,13 +15191,23 @@
     "xpack.infra.logs.viewInContext.logsFromFileTitle": "Les logs affichés proviennent du fichier {file} et de l'hôte {host}",
     "xpack.infra.logsHeaderAddDataButtonLabel": "Ajouter des données",
     "xpack.infra.logSourceConfiguration.childFormElementErrorMessage": "L'état d'au moins un champ du formulaire est non valide.",
+    "xpack.infra.logSourceConfiguration.dataViewDescription": "Vue de données contenant les données de log",
+    "xpack.infra.logSourceConfiguration.dataViewLabel": "Vue de données de log",
+    "xpack.infra.logSourceConfiguration.dataViewSectionTitle": "Vue de données (recommandé)",
+    "xpack.infra.logSourceConfiguration.dataViewSelectorPlaceholder": "Choisir une vue de données",
+    "xpack.infra.logSourceConfiguration.dataViewsManagementLinkText": "écran de gestion des vues de données",
+    "xpack.infra.logSourceConfiguration.dataViewTitle": "Vue de données de log",
     "xpack.infra.logSourceConfiguration.emptyColumnListErrorMessage": "La liste de colonnes ne doit pas être vide.",
     "xpack.infra.logSourceConfiguration.emptyFieldErrorMessage": "Le champ \"{fieldName}\" ne doit pas être vide.",
     "xpack.infra.logSourceConfiguration.invalidMessageFieldTypeErrorMessage": "Le champ {messageField} doit être un champ textuel.",
+    "xpack.infra.logSourceConfiguration.logDataViewHelpText": "Les vues de données sont partagées entre les applications dans l'espace Kibana et peuvent être gérées via l’{dataViewsManagementLink}. Une vue de données peut cibler plusieurs index.",
     "xpack.infra.logSourceConfiguration.logSourceConfigurationFormErrorsCalloutTitle": "Configuration de la source incohérente",
-    "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "Le modèle d'indexation doit contenir un champ {messageField}.",
-    "xpack.infra.logSourceConfiguration.missingTimestampFieldErrorMessage": "Le modèle d'indexation doit être temporel.",
-    "xpack.infra.logSourceConfiguration.rollupIndexPatternErrorMessage": "Le modèle d'indexation ne doit pas être un modèle d'indexation de cumul.",
+    "xpack.infra.logSourceConfiguration.logSourcesTitle": "Sources de log",
+    "xpack.infra.logSourceConfiguration.missingDataViewErrorMessage": "La vue de données {dataViewId} doit exister.",
+    "xpack.infra.logSourceConfiguration.missingDataViewsLabel": "Vue de données {indexPatternId} manquante",
+    "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "La vue de données doit contenir un champ {messageField}.",
+    "xpack.infra.logSourceConfiguration.missingTimestampFieldErrorMessage": "La vue de données doit être basée sur le temps.",
+    "xpack.infra.logSourceConfiguration.rollupIndexPatternErrorMessage": "La vue de données ne doit pas être un modèle d'indexation de cumul.",
     "xpack.infra.logSourceConfiguration.unsavedFormPromptMessage": "Voulez-vous vraiment quitter ? Les modifications seront perdues",
     "xpack.infra.logSourceErrorPage.failedToLoadSourceMessage": "Des erreurs se sont produites lors du chargement de la configuration. Réessayez ou modifiez la configuration pour résoudre le problème.",
     "xpack.infra.logSourceErrorPage.failedToLoadSourceTitle": "Impossible de charger la configuration",
@@ -12400,10 +15230,10 @@
     "xpack.infra.metricDetailPage.awsMetricsLayout.cpuUtilSection.sectionLabel": "Utilisation CPU",
     "xpack.infra.metricDetailPage.awsMetricsLayout.diskioBytesSection.readsSeriesLabel": "lit",
     "xpack.infra.metricDetailPage.awsMetricsLayout.diskioBytesSection.sectionLabel": "Octets d'E/S sur le disque",
-    "xpack.infra.metricDetailPage.awsMetricsLayout.diskioBytesSection.writesSeriesLabel": "writes",
+    "xpack.infra.metricDetailPage.awsMetricsLayout.diskioBytesSection.writesSeriesLabel": "écrit",
     "xpack.infra.metricDetailPage.awsMetricsLayout.diskioOperationsSection.readsSeriesLabel": "lit",
     "xpack.infra.metricDetailPage.awsMetricsLayout.diskioOperationsSection.sectionLabel": "Opérations d'E/S sur le disque",
-    "xpack.infra.metricDetailPage.awsMetricsLayout.diskioOperationsSection.writesSeriesLabel": "writes",
+    "xpack.infra.metricDetailPage.awsMetricsLayout.diskioOperationsSection.writesSeriesLabel": "écrit",
     "xpack.infra.metricDetailPage.awsMetricsLayout.networkBytesSection.rxSeriesLabel": "entrée",
     "xpack.infra.metricDetailPage.awsMetricsLayout.networkBytesSection.sectionLabel": "Trafic réseau",
     "xpack.infra.metricDetailPage.awsMetricsLayout.networkBytesSection.txSeriesLabel": "sortie",
@@ -12418,10 +15248,10 @@
     "xpack.infra.metricDetailPage.containerMetricsLayout.cpuUsageSection.sectionLabel": "Utilisation CPU",
     "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.readRateSeriesLabel": "lit",
     "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.sectionLabel": "ES sur le disque (octets)",
-    "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.writeRateSeriesLabel": "writes",
+    "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.writeRateSeriesLabel": "écrit",
     "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.readRateSeriesLabel": "lit",
     "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.sectionLabel": "ES sur le disque (opérations)",
-    "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.writeRateSeriesLabel": "writes",
+    "xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.writeRateSeriesLabel": "écrit",
     "xpack.infra.metricDetailPage.containerMetricsLayout.layoutLabel": "Conteneur",
     "xpack.infra.metricDetailPage.containerMetricsLayout.memoryUsageSection.sectionLabel": "Utilisation mémoire",
     "xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel": "entrée",
@@ -12437,7 +15267,7 @@
     "xpack.infra.metricDetailPage.ec2MetricsLayout.cpuUsageSection.sectionLabel": "Utilisation CPU",
     "xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.readLabel": "lit",
     "xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.sectionLabel": "ES sur le disque (octets)",
-    "xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.writeLabel": "writes",
+    "xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.writeLabel": "écrit",
     "xpack.infra.metricDetailPage.ec2MetricsLayout.networkTrafficSection.sectionLabel": "Trafic réseau",
     "xpack.infra.metricDetailPage.ec2MetricsLayout.overviewSection.sectionLabel": "Aperçu EC2 AWS",
     "xpack.infra.metricDetailPage.hostMetricsLayout.cpuUsageSection.sectionLabel": "Utilisation CPU",
@@ -12533,7 +15363,10 @@
     "xpack.infra.metrics.alertFlyout.aggregationText.rate": "Taux",
     "xpack.infra.metrics.alertFlyout.aggregationText.sum": "Somme",
     "xpack.infra.metrics.alertFlyout.alertDescription": "Alerter lorsque l'agrégation d'indicateurs dépasse le seuil.",
+    "xpack.infra.metrics.alertFlyout.alertOnGroupDisappear": "Me prévenir si un groupe cesse de signaler les données",
     "xpack.infra.metrics.alertFlyout.alertOnNoData": "M'alerter s'il n'y a aucune donnée",
+    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError": "Il est possible que cette règle signale {matchedGroups} moins que prévu, car la requête de filtre comporte une correspondance pour {groupCount, plural, one {ce champ} other {ces champs}}. Pour en savoir plus, veuillez consulter {filteringAndGroupingLink}.",
+    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError.docsLink": "les documents",
     "xpack.infra.metrics.alertFlyout.anomalyFilterHelpText": "Limitez la portée de votre déclenchement d'alerte aux anomalies influencées par certains nœuds.",
     "xpack.infra.metrics.alertFlyout.anomalyFilterHelpTextExample": "Par exemple : \"my-node-1\" ou \"my-node-*\"",
     "xpack.infra.metrics.alertFlyout.anomalyInfluencerFilterPlaceholder": "Tout",
@@ -12542,11 +15375,13 @@
     "xpack.infra.metrics.alertFlyout.anomalyJobs.networkOut": "Sortie réseau",
     "xpack.infra.metrics.alertFlyout.conditions": "Conditions",
     "xpack.infra.metrics.alertFlyout.createAlertPerHelpText": "Créer une alerte pour chaque valeur unique. Par exemple : \"host.id\" ou \"cloud.region\".",
-    "xpack.infra.metrics.alertFlyout.createAlertPerText": "Créer une alerte par (facultatif)",
+    "xpack.infra.metrics.alertFlyout.createAlertPerText": "Regrouper les alertes par (facultatif)",
     "xpack.infra.metrics.alertFlyout.criticalThreshold": "Alerte",
+    "xpack.infra.metrics.alertFlyout.docCountNoDataDisabledHelpText": "[Ce paramètre n’est pas applicable à l’agrégateur du nombre de documents.]",
     "xpack.infra.metrics.alertFlyout.dropPartialBucketsHelpText": "Activez cette option pour abandonner le groupe de données d'évaluation le plus récent s'il fait moins de {timeSize}{timeUnit}.",
     "xpack.infra.metrics.alertFlyout.error.aggregationRequired": "L'agrégation est requise.",
-    "xpack.infra.metrics.alertFlyout.error.customMetricFieldRequired": "Le champ est requis.",
+    "xpack.infra.metrics.alertFlyout.error.customMetricFieldRequired": "Champ obligatoire.",
+    "xpack.infra.metrics.alertFlyout.error.invalidFilterQuery": "La requête de filtre n'est pas valide.",
     "xpack.infra.metrics.alertFlyout.error.metricRequired": "L'indicateur est requis.",
     "xpack.infra.metrics.alertFlyout.error.mlCapabilitiesRequired": "Impossible de créer une alerte d'anomalie lors que le Machine Learning est désactivé.",
     "xpack.infra.metrics.alertFlyout.error.thresholdRequired": "Le seuil est requis.",
@@ -12567,6 +15402,7 @@
     "xpack.infra.metrics.alertFlyout.filterByNodeLabel": "Filtrer par nœud",
     "xpack.infra.metrics.alertFlyout.filterHelpText": "Utilisez une expression KQL pour limiter la portée de votre déclenchement d'alerte.",
     "xpack.infra.metrics.alertFlyout.filterLabel": "Filtre (facultatif)",
+    "xpack.infra.metrics.alertFlyout.groupDisappearHelpText": "Activez cette option pour déclencher l’action si un groupe précédemment détecté cesse de signaler des résultats. Ce n’est pas recommandé pour les infrastructures à montée en charge dynamique qui peuvent rapidement lancer ou mettre fin à des nœuds automatiquement.",
     "xpack.infra.metrics.alertFlyout.noDataHelpText": "Activez cette option pour déclencher l'action si l'indicateur ou les indicateurs ne signale(nt) aucune donnée sur la période attendue, ou si l'alerte ne parvient pas à interroger Elasticsearch",
     "xpack.infra.metrics.alertFlyout.ofExpression.helpTextDetail": "Vous ne trouvez pas d'indicateur ? {documentationLink}.",
     "xpack.infra.metrics.alertFlyout.ofExpression.popoverLinkLabel": "Apprenez comment ajouter davantage de données",
@@ -12595,25 +15431,30 @@
     "xpack.infra.metrics.alerting.inventory.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\} est à l'état \\{\\{context.alertState\\}\\}\n\nRaison :\n\\{\\{context.reason\\}\\}\n",
     "xpack.infra.metrics.alerting.inventory.threshold.fired": "Alerte",
     "xpack.infra.metrics.alerting.metricActionVariableDescription": "Nom de l'indicateur dans la condition spécifiée. Utilisation : (ctx.metric.condition0, ctx.metric.condition1, etc...).",
-    "xpack.infra.metrics.alerting.reasonActionVariableDescription": "Description détaillant pourquoi l'alerte est dans cet état, et indiquant quels indicateurs ont dépassé quels seuils",
+    "xpack.infra.metrics.alerting.reasonActionVariableDescription": "Une description concise de la raison du signalement",
     "xpack.infra.metrics.alerting.threshold.aboveRecovery": "supérieur à",
     "xpack.infra.metrics.alerting.threshold.alertState": "ALERTE",
     "xpack.infra.metrics.alerting.threshold.belowRecovery": "inférieur à",
     "xpack.infra.metrics.alerting.threshold.betweenRecovery": "entre",
     "xpack.infra.metrics.alerting.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\} est à l'état \\{\\{context.alertState\\}\\}\n\nRaison :\n\\{\\{context.reason\\}\\}\n",
-    "xpack.infra.metrics.alerting.threshold.documentCount": "Compte du document",
+    "xpack.infra.metrics.alerting.threshold.documentCount": "Nombre de documents",
     "xpack.infra.metrics.alerting.threshold.errorAlertReason": "Elasticsearch a échoué lors de l'interrogation des données de {metric}",
     "xpack.infra.metrics.alerting.threshold.errorState": "ERREUR",
     "xpack.infra.metrics.alerting.threshold.fired": "Alerte",
+    "xpack.infra.metrics.alerting.threshold.firedAlertReason": "{metric} est de {currentValue} dans les dernières {duration} pour {group}. Signaler quand {comparator} {threshold}.",
+    "xpack.infra.metrics.alerting.threshold.noDataAlertReason": "{metric} n’a signalé aucune donnée dans les dernières {interval} pour {group}.",
     "xpack.infra.metrics.alerting.threshold.noDataFormattedValue": "[AUCUNE DONNÉE]",
     "xpack.infra.metrics.alerting.threshold.noDataState": "AUCUNE DONNÉE",
     "xpack.infra.metrics.alerting.threshold.okState": "OK [Récupéré]",
+    "xpack.infra.metrics.alerting.threshold.queryErrorAlertReason": "L’alerte utilise une requête KQL incorrectement formée : {filterQueryText}.",
+    "xpack.infra.metrics.alerting.threshold.recoveredAlertReason": "{metric} est maintenant {comparator} un seuil de {threshold} (la valeur actuelle est de {currentValue}) pour {group}",
     "xpack.infra.metrics.alerting.threshold.thresholdRange": "{a} et {b}",
     "xpack.infra.metrics.alerting.threshold.warning": "Avertissement",
     "xpack.infra.metrics.alerting.threshold.warningState": "AVERTISSEMENT",
     "xpack.infra.metrics.alerting.thresholdActionVariableDescription": "Valeur de seuil de l'indicateur pour la condition spécifiée. Utilisation : (ctx.threshold.condition0, ctx.threshold.condition1, etc...).",
     "xpack.infra.metrics.alerting.timestampDescription": "Horodatage du moment où l'alerte a été détectée.",
     "xpack.infra.metrics.alerting.valueActionVariableDescription": "Valeur de l'indicateur dans la condition spécifiée. Utilisation : (ctx.value.condition0, ctx.value.condition1, etc...).",
+    "xpack.infra.metrics.alerting.viewInAppUrlActionVariableDescription": "Lien vers la vue ou la fonctionnalité dans Elastic qui peut être utilisée pour examiner l'alerte et son contexte de manière plus approfondie",
     "xpack.infra.metrics.alertName": "Seuil de l'indicateur",
     "xpack.infra.metrics.alerts.dataTimeRangeLabel": "Dernier {lookback} {timeLabel}",
     "xpack.infra.metrics.alerts.dataTimeRangeLabelWithGrouping": "Dernier {lookback} {timeLabel} de données pour {id}",
@@ -12630,6 +15471,9 @@
     "xpack.infra.metrics.loadingNodeDataText": "Chargement des données",
     "xpack.infra.metrics.metricsExplorerTitle": "Metrics Explorer",
     "xpack.infra.metrics.missingTSVBModelError": "Le modèle TSVB pour {metricId} n'existe pas pour {nodeType}",
+    "xpack.infra.metrics.noDataConfig.beatsCard.description": "Utilisez Beats pour envoyer des données d’indicateur à Elasticsearch. Nous facilitons les choses avec des modules pour de nombreux systèmes et applications populaires.",
+    "xpack.infra.metrics.noDataConfig.beatsCard.title": "Ajouter une intégration d’indicateur",
+    "xpack.infra.metrics.noDataConfig.solutionName": "Observabilité",
     "xpack.infra.metrics.nodeDetails.noProcesses": "Aucun processus trouvé",
     "xpack.infra.metrics.nodeDetails.noProcessesBody": "Essayez de modifier votre filtre. Seuls les processus figurant dans les {metricbeatDocsLink} configurés seront affichés ici.",
     "xpack.infra.metrics.nodeDetails.noProcessesBody.metricbeatDocsLinkText": "N premiers par CPU ou mémoire",
@@ -12888,7 +15732,7 @@
     "xpack.infra.trialStatus.trialStatusNetworkErrorMessage": "Nous n'avons pas pu déterminer si la licence d'essai est disponible",
     "xpack.infra.useHTTPRequest.error.body.message": "Message",
     "xpack.infra.useHTTPRequest.error.status": "Erreur",
-    "xpack.infra.useHTTPRequest.error.title": "Erreur pendant la récupération des ressources",
+    "xpack.infra.useHTTPRequest.error.title": "Erreur lors de la récupération des ressources",
     "xpack.infra.useHTTPRequest.error.url": "URL",
     "xpack.infra.viewSwitcher.lenged": "Basculer entre les vues tableau et carte",
     "xpack.infra.viewSwitcher.mapViewLabel": "Vue carte",
@@ -12989,15 +15833,38 @@
     "xpack.ingestPipelines.app.checkingPrivilegesErrorMessage": "Erreur lors de la récupération des privilèges utilisateur depuis le serveur.",
     "xpack.ingestPipelines.app.deniedPrivilegeDescription": "Pour utiliser les pipelines d'ingestion, vous devez posséder {privilegesCount, plural, one {ce privilège de cluster} other {ces privilèges de cluster}} : {missingPrivileges}.",
     "xpack.ingestPipelines.app.deniedPrivilegeTitle": "Privilèges de cluster requis",
-    "xpack.ingestPipelines.appTitle": "Pipelines de nœuds d'ingestion",
+    "xpack.ingestPipelines.appTitle": "Pipelines d'ingestion",
     "xpack.ingestPipelines.breadcrumb.createPipelineLabel": "Créer un pipeline",
     "xpack.ingestPipelines.breadcrumb.editPipelineLabel": "Modifier le pipeline",
-    "xpack.ingestPipelines.breadcrumb.pipelinesLabel": "Pipelines de nœuds d'ingestion",
+    "xpack.ingestPipelines.breadcrumb.pipelinesLabel": "Pipelines d'ingestion",
     "xpack.ingestPipelines.clone.loadingPipelinesDescription": "Chargement du pipeline…",
     "xpack.ingestPipelines.clone.loadSourcePipelineErrorTitle": "Impossible de charger {name}.",
     "xpack.ingestPipelines.create.docsButtonLabel": "Créer des documents de pipeline",
     "xpack.ingestPipelines.create.pageTitle": "Créer un pipeline",
+    "xpack.ingestPipelines.createFromCSV.docsButtonLabel": "CSV vers documents de pipeline",
+    "xpack.ingestPipelines.createFromCsv.errorMessage": "{message}",
+    "xpack.ingestPipelines.createFromCsv.fetchPipeline.unexpectedErrorDetails": "Erreur inattendue",
+    "xpack.ingestPipelines.createFromCsv.fetchPipeline.unexpectedErrorTitle": "Un problème est survenu",
+    "xpack.ingestPipelines.createFromCsv.fileUpload.filePickerTitle": "Charger un fichier (jusqu’à {maxFileSize})",
+    "xpack.ingestPipelines.createFromCsv.fileUpload.processButton": "Traiter un fichier CSV",
+    "xpack.ingestPipelines.createFromCsv.fileUpload.selectOrDragAndDropFileDescription": "Sélectionner ou glisser-déposer un fichier CSV",
+    "xpack.ingestPipelines.createFromCsv.fileUpload.settingDescription": "Détermine si le champ doit être copié ou renommé lorsque aucune action n’est indiquée dans le CSV.",
+    "xpack.ingestPipelines.createFromCsv.instructions": "Utilisez un fichier CSV pour définir le mapping de votre source de données personnalisée avec l’Elastic Common Schema (ECS). Pour chaque {source}, vous pouvez indiquer une {destination} et des ajustements de format. Reportez-vous au {templateLink} pour connaître les en-têtes pris en charge.",
+    "xpack.ingestPipelines.createFromCsv.instructions.continued": "Ajoutez des processeurs au pipeline de démarrage obtenu pour effectuer des transformations de données supplémentaires.",
+    "xpack.ingestPipelines.createFromCsv.pageTitle": "Créer un pipeline à partir d’un CSV",
+    "xpack.ingestPipelines.createFromCsv.preview.copy": "Copier le JSON",
+    "xpack.ingestPipelines.createFromCsv.preview.createPipeline": "Continuer pour créer le pipeline",
+    "xpack.ingestPipelines.createFromCsv.preview.download": "Télécharger le JSON",
+    "xpack.ingestPipelines.createFromCsv.preview.invalidJson": "Syntaxe JSON non valide.",
+    "xpack.ingestPipelines.createFromCsv.preview.jsonMapSuccessful": "Vous pouvez enregistrer ou modifier le JSON avant de générer le pipeline.",
+    "xpack.ingestPipelines.createFromCsv.processFile.emptyFileError": "Le fichier fourni est vide.",
+    "xpack.ingestPipelines.createFromCsv.processFile.emptyFileErrorTitle": "Fichier vide",
+    "xpack.ingestPipelines.createFromCsv.processFile.fileTooLargeError": "Le fichier dépasse la taille autorisée de {maxBytes} octets.",
+    "xpack.ingestPipelines.createFromCsv.processFile.fileTooLargeErrorTitle": "Fichier trop volumineux",
+    "xpack.ingestPipelines.createFromCsv.processFile.unexpectedError": "Impossible de lire le fichier fourni.",
+    "xpack.ingestPipelines.createFromCsv.processFile.unexpectedErrorTitle": "Erreur lors de la lecture du fichier",
     "xpack.ingestPipelines.createRoute.duplicatePipelineIdErrorMessage": "Il existe déjà un pipeline avec le nom \"{name}\".",
+    "xpack.ingestPipelines.csvToIngestPipeline.error.emptyFileErrors": "Erreur lors de la lecture du fichier. Le fichier fourni est vide.",
     "xpack.ingestPipelines.deleteModal.cancelButtonLabel": "Annuler",
     "xpack.ingestPipelines.deleteModal.confirmButtonLabel": "Supprimer {numPipelinesToDelete, plural, one {le pipeline} other {les pipelines} }",
     "xpack.ingestPipelines.deleteModal.deleteDescription": "Vous êtes sur le point de supprimer {numPipelinesToDelete, plural, one {ce pipeline} other {ces pipelines} } :",
@@ -13032,7 +15899,7 @@
     "xpack.ingestPipelines.form.unknownError": "Une erreur inconnue s'est produite.",
     "xpack.ingestPipelines.form.versionFieldLabel": "Version (facultatif)",
     "xpack.ingestPipelines.form.versionToggleDescription": "Ajouter un numéro de version",
-    "xpack.ingestPipelines.list.listTitle": "Pipelines de nœuds d'ingestion",
+    "xpack.ingestPipelines.list.listTitle": "Pipelines d'ingestion",
     "xpack.ingestPipelines.list.loadErrorTitle": "Impossible de charger les pipelines",
     "xpack.ingestPipelines.list.loadingMessage": "Chargement des pipelines...",
     "xpack.ingestPipelines.list.loadPipelineReloadButton": "Réessayer",
@@ -13048,23 +15915,30 @@
     "xpack.ingestPipelines.list.pipelineDetails.managePipelinePanelTitle": "Options de pipeline",
     "xpack.ingestPipelines.list.pipelineDetails.processorsTitle": "Processeurs",
     "xpack.ingestPipelines.list.pipelineDetails.versionTitle": "Version",
-    "xpack.ingestPipelines.list.pipelinesDescription": "Définissez un pipeline pour le prétraitement des documents avant indexation.",
-    "xpack.ingestPipelines.list.pipelinesDocsLinkText": "Documents des pipelines de nœuds d'ingestion",
+    "xpack.ingestPipelines.list.pipelinesDescription": "Utilisez des pipelines pour retirer ou transformer des champs, extraire des valeurs à partir de texte et enrichir vos données avant l’indexation.",
+    "xpack.ingestPipelines.list.pipelinesDocsLinkText": "Documents relatifs aux pipelines d'ingestion",
     "xpack.ingestPipelines.list.table.actionColumnTitle": "Actions",
     "xpack.ingestPipelines.list.table.cloneActionDescription": "Cloner ce pipeline",
     "xpack.ingestPipelines.list.table.cloneActionLabel": "Cloner",
-    "xpack.ingestPipelines.list.table.createPipelineButtonLabel": "Créer un pipeline",
+    "xpack.ingestPipelines.list.table.createPipelineButtonLabel": "Nouveau pipeline",
+    "xpack.ingestPipelines.list.table.createPipelineDropdownLabel": "Créer un pipeline",
+    "xpack.ingestPipelines.list.table.createPipelineFromCsvButtonLabel": "Nouveau pipeline à partir d’un CSV",
     "xpack.ingestPipelines.list.table.deleteActionDescription": "Supprimer ce pipeline",
     "xpack.ingestPipelines.list.table.deleteActionLabel": "Supprimer",
     "xpack.ingestPipelines.list.table.deletePipelinesButtonLabel": "Supprimer le {count, plural, one {le pipeline} other {les pipelines} }",
     "xpack.ingestPipelines.list.table.editActionDescription": "Modifier ce pipeline",
     "xpack.ingestPipelines.list.table.editActionLabel": "Modifier",
-    "xpack.ingestPipelines.list.table.emptyPrompt.createButtonLabel": "Créer un pipeline",
-    "xpack.ingestPipelines.list.table.emptyPromptDescription": "Par exemple, vous pourriez créer un pipeline avec un processeur qui supprime un champ et un autre processeur qui renomme un champ.",
+    "xpack.ingestPipelines.list.table.emptyCreatePipelineDropdownLabel": "Créer un pipeline",
+    "xpack.ingestPipelines.list.table.emptyPrompt.createButtonLabel": "Nouveau pipeline",
+    "xpack.ingestPipelines.list.table.emptyPrompt.createButtonLabel.createPipelineFromCsvButtonLabel": "Nouveau pipeline à partir d’un CSV",
+    "xpack.ingestPipelines.list.table.emptyPromptDescription": "Utilisez des pipelines pour retirer ou transformer des champs, extraire des valeurs à partir de texte et enrichir vos données avant l’indexation.",
     "xpack.ingestPipelines.list.table.emptyPromptDocumentionLink": "En savoir plus",
     "xpack.ingestPipelines.list.table.emptyPromptTitle": "Commencer en créant un pipeline",
     "xpack.ingestPipelines.list.table.nameColumnTitle": "Nom",
     "xpack.ingestPipelines.list.table.reloadButtonLabel": "Recharger",
+    "xpack.ingestPipelines.mapToIngestPipeline.error.invalidFormatAction": "Action de format non valide [{ formatAction }]. Les actions valides sont {formatActions}.",
+    "xpack.ingestPipelines.mapToIngestPipeline.error.missingHeaders": "En-têtes requis manquants. Ajoutez {missingHeadersCount, plural, one {l’en-tête} other {les en-têtes}} {missingHeaders} dans le fichier CSV.",
+    "xpack.ingestPipelines.mapToIngestPipeline.error.parseErrors": "Erreur lors de la lecture du fichier. Un problème est survenu lors du traitement du fichier.",
     "xpack.ingestPipelines.pipelineEditor.addDocuments.addDocumentButtonLabel": "Ajouter un document",
     "xpack.ingestPipelines.pipelineEditor.addDocuments.addDocumentErrorMessage": "Erreur lors de l'ajout du document",
     "xpack.ingestPipelines.pipelineEditor.addDocuments.addDocumentSuccessMessage": "Document ajouté",
@@ -13198,7 +16072,7 @@
     "xpack.ingestPipelines.pipelineEditor.dissectForm.patternFieldLabel": "Modèle",
     "xpack.ingestPipelines.pipelineEditor.dissectForm.patternRequiredError": "Une valeur de modèle est requise.",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameHelpText": "Champ contenant une notation par points.",
-    "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameRequiresDotError": "Une valeur de champ requiert au moins un caractère point.",
+    "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameRequiresDotError": "Le nom du champ doit soit être un astérisque, soit contenir un point.",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.pathFieldLabel": "Chemin",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.pathHelpText": "Champ de sortie. Requis uniquement si le champ à développer fait partie d'un autre champ d'objet.",
     "xpack.ingestPipelines.pipelineEditor.dragAndDropList.removeItemLabel": "Retirer l'élément",
@@ -13273,7 +16147,9 @@
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.fieldMapHelpText": "Mappe les noms de champ du document aux noms de champ connus du modèle. Prévaut sur tout mapping dans le modèle.",
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.fieldMapInvalidJSONError": "JSON non valide",
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.fieldMapLabel": "Mapping de champ (facultatif)",
+    "xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigField.documentationLinkLabel": "documentation",
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigLabel": "Configuration de l'inférence (facultatif)",
+    "xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigurationHelpText": "Contient le type d'inférence et ses options. Reportez-vous à la {documentation} pour connaître les options de configuration disponibles.",
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.modelIDFieldHelpText": "ID du modèle sur lequel porte l'inférence.",
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.modelIDFieldLabel": "ID du modèle",
     "xpack.ingestPipelines.pipelineEditor.inferenceForm.patternRequiredError": "Une valeur d'ID de modèle est requise.",
@@ -13458,6 +16334,8 @@
     "xpack.ingestPipelines.processors.defaultDescription.dateIndexName.indexNamePrefixDefault.noPrefixValueLabel": "sans préfixe",
     "xpack.ingestPipelines.processors.defaultDescription.dateIndexName.indexNamePrefixDefault.prefixValueLabel": "avec le préfixe \"{prefix}\"",
     "xpack.ingestPipelines.processors.defaultDescription.dissect": "Extrait les valeurs de \"{field}\" qui correspondent à un modèle dissect",
+    "xpack.ingestPipelines.processors.defaultDescription.dot_expander.dot_notation": "Développe \"{field}\" en un champ d'objet",
+    "xpack.ingestPipelines.processors.defaultDescription.dot_expander.wildcard": "Tous les champs de niveau supérieur seront étendus.",
     "xpack.ingestPipelines.processors.defaultDescription.drop": "Abandonne les documents sans renvoyer d'erreur",
     "xpack.ingestPipelines.processors.defaultDescription.enrich": "Enrichit les données dans \"{target_field}\" si la politique \"{policy_name}\" correspond à \"{field}\"",
     "xpack.ingestPipelines.processors.defaultDescription.fail": "Lève une exception qui interrompt l'exécution",
@@ -13508,13 +16386,13 @@
     "xpack.ingestPipelines.processors.description.grok": "Utilise les expressions {grokLink} pour extraire les correspondances à partir d'un champ.",
     "xpack.ingestPipelines.processors.description.gsub": "Utilise une expression régulière pour remplacer les sous-chaînes de champ.",
     "xpack.ingestPipelines.processors.description.htmlStrip": "Retire les balises HTML d'un champ.",
-    "xpack.ingestPipelines.processors.description.inference": "Utilise un modèle d'analyse du cadre de données pré-entraîné pour effectuer une inférence avec les données entrantes.",
+    "xpack.ingestPipelines.processors.description.inference": "Utilise un modèle entraîné pour effectuer une inférence avec les données entrantes.",
     "xpack.ingestPipelines.processors.description.join": "Joint les éléments de tableau dans une chaîne. Insère un séparateur entre chaque élément.",
     "xpack.ingestPipelines.processors.description.json": "Crée un objet JSON à partir d'une chaîne compatible.",
     "xpack.ingestPipelines.processors.description.kv": "Extrait des champs à partir d'une chaîne contenant des paires clé-valeur.",
     "xpack.ingestPipelines.processors.description.lowercase": "Convertit une chaîne en minuscules.",
     "xpack.ingestPipelines.processors.description.networkDirection": "Calcule la direction du réseau en fonction d'une adresse IP source.",
-    "xpack.ingestPipelines.processors.description.pipeline": "Exécute un autre pipeline de nœud d'ingestion.",
+    "xpack.ingestPipelines.processors.description.pipeline": "Exécute un autre pipeline d'ingestion.",
     "xpack.ingestPipelines.processors.description.registeredDomain": "Extrait le domaine enregistré (domaine de niveau supérieur effectif), le sous-domaine et le domaine de niveau supérieur à partir d'un nom de domaine complet.",
     "xpack.ingestPipelines.processors.description.remove": "Retire un ou plusieurs champs.",
     "xpack.ingestPipelines.processors.description.rename": "Renomme un champ existant.",
@@ -13604,6 +16482,10 @@
     "xpack.licenseMgmt.app.deniedPermissionTitle": "Privilèges de cluster requis",
     "xpack.licenseMgmt.app.loadingPermissionsDescription": "Vérification des autorisations…",
     "xpack.licenseMgmt.dashboard.breadcrumb": "Gestion des licences",
+    "xpack.licenseMgmt.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.licenseMgmt.deprecations.enabled.manualStepTwoMessage": "Remplacez le paramètre \"xpack.index_management.enabled\" par \"xpack.index_management.ui.enabled\".",
+    "xpack.licenseMgmt.deprecations.enabledMessage": "Pour empêcher les utilisateurs d'accéder à l’interface utilisateur de gestion des licences, utilisez le paramètre \"xpack.license_management.ui.enabled\" au lieu de \"xpack.license_management.enabled\".",
+    "xpack.licenseMgmt.deprecations.enabledTitle": "Le paramètre \"xpack.license_management.enabled\" est déclassé.",
     "xpack.licenseMgmt.licenseDashboard.addLicense.updateLicenseButtonLabel": "Mettre à jour la licence",
     "xpack.licenseMgmt.licenseDashboard.addLicense.updateLicenseTitle": "Mettre à jour votre licence",
     "xpack.licenseMgmt.licenseDashboard.addLicense.useAvailableLicenseDescription": "Si vous avez déjà une nouvelle licence, chargez-la maintenant.",
@@ -13683,11 +16565,13 @@
     "xpack.lists.exceptions.builder.exceptionFieldPlaceholder": "Rechercher",
     "xpack.lists.exceptions.builder.exceptionFieldValuePlaceholder": "Rechercher la valeur de champ...",
     "xpack.lists.exceptions.builder.exceptionListsPlaceholder": "Rechercher la liste...",
+    "xpack.lists.exceptions.builder.exceptionMatchesOperator.warningMessage.wildcardInFilepath": "Pour obtenir un filtre d’événement plus efficace, utilisez plusieurs conditions et faites en sorte qu’elles soient aussi précises que possible en cas d’utilisation de caractères génériques dans les valeurs de chemin. Par exemple, ajoutez un champ process.name ou file.name.",
     "xpack.lists.exceptions.builder.exceptionOperatorPlaceholder": "Opérateur",
     "xpack.lists.exceptions.builder.fieldLabel": "Champ",
     "xpack.lists.exceptions.builder.operatorLabel": "Opérateur",
     "xpack.lists.exceptions.builder.valueLabel": "Valeur",
     "xpack.lists.exceptions.orDescription": "OR",
+    "xpack.lists.services.items.fileUploadFromFileSystem": "Fichier chargé depuis le système de fichiers de {fileName}",
     "xpack.logstash.addRoleAlert.grantAdditionalPrivilegesDescription": "Dans Kibana Management, affectez le rôle {role} à votre utilisateur Kibana.",
     "xpack.logstash.addRoleAlert.grantAdditionalPrivilegesTitle": "Accordez des privilèges supplémentaires.",
     "xpack.logstash.alertCallOut.howToSeeAdditionalPipelinesDescription": "Comment visualiser les pipelines supplémentaires ?",
@@ -13813,6 +16697,9 @@
     "xpack.maps.common.esSpatialRelation.disjointLabel": "disjoint",
     "xpack.maps.common.esSpatialRelation.intersectsLabel": "intersections",
     "xpack.maps.common.esSpatialRelation.withinLabel": "dans",
+    "xpack.maps.dataView.label": "Vue de données",
+    "xpack.maps.dataView.notFoundMessage": "Vue de données \"{id}\" introuvable",
+    "xpack.maps.dataView.selectPlacholder": "Sélectionner la vue de données",
     "xpack.maps.deleteBtnTitle": "Supprimer",
     "xpack.maps.discover.visualizeFieldLabel": "Visualiser dans Maps",
     "xpack.maps.distanceFilterForm.filterLabelLabel": "Étiquette du filtre",
@@ -13828,7 +16715,7 @@
     "xpack.maps.drawTooltip.polygonInstructions": "Cliquez pour commencer la forme. Cliquez pour ajouter le vertex. Double-cliquez pour terminer.",
     "xpack.maps.embeddable.boundsFilterLabel": "Limites de carte au centre : {lat}, {lon}, zoom : {zoom}",
     "xpack.maps.embeddableDisplayName": "carte",
-    "xpack.maps.emsFileSelect.selectPlaceholder": "Sélectionner la couche EMS",
+    "xpack.maps.emsFileSelect.selectPlaceholder": "Sélectionner les limites EMS",
     "xpack.maps.emsSource.tooltipsTitle": "Champs d'infobulle",
     "xpack.maps.es_geo_utils.convert.unsupportedGeometryTypeErrorMessage": "Impossible de convertir la géométrie {geometryType} en geojson, non pris en charge",
     "xpack.maps.es_geo_utils.distanceFilterAlias": "dans un rayon de {distanceKm} km de {pointLabel}",
@@ -13852,23 +16739,32 @@
     "xpack.maps.fileUpload.trimmedResultsMsg": "Résultats limités à {numFeatures} fonctionnalités, {previewCoverage} % du fichier.",
     "xpack.maps.fileUploadWizard.configureDocumentLayerLabel": "Ajouter comme calque du document",
     "xpack.maps.fileUploadWizard.configureUploadLabel": "Importer un fichier",
-    "xpack.maps.fileUploadWizard.description": "Données GeoJSON d'index dans Elasticsearch",
-    "xpack.maps.fileUploadWizard.disabledDesc": "Impossible de charger les fichiers, vous ne disposez pas du privilège Kibana \"Gestion du modèle d'indexation\".",
-    "xpack.maps.fileUploadWizard.title": "Charger GeoJSON",
+    "xpack.maps.fileUploadWizard.description": "Données d'index GeoJSON et Shapefile dans Elasticsearch",
+    "xpack.maps.fileUploadWizard.disabledDesc": "Impossible de charger les fichiers, vous ne disposez pas du privilège Kibana de gestion des vues de données.",
+    "xpack.maps.fileUploadWizard.title": "Charger le fichier",
     "xpack.maps.fileUploadWizard.uploadLabel": "Importation du fichier",
     "xpack.maps.filterByMapExtentMenuItem.disableDisplayName": "Désactiver le filtre par étendue de carte",
     "xpack.maps.filterByMapExtentMenuItem.enableDisplayName": "Activer le filtre par étendue de carte",
-    "xpack.maps.filterEditor.applyGlobalQueryCheckboxLabel": "Appliquer un filtre global aux données de calque",
+    "xpack.maps.filterEditor.applyForceRefreshLabel": "Appliquer une actualisation globale aux données de calque",
+    "xpack.maps.filterEditor.applyForceRefreshTooltip": "Lorsque cette option est activée, le calque récupère à nouveau les données au moment de l’actualisation automatique ainsi que chaque fois que le bouton \"Actualiser\" est sélectionné.",
+    "xpack.maps.filterEditor.applyGlobalFilterHelp": "Lorsque cette option est activée, les résultats sont affinés par recherche globale.",
+    "xpack.maps.filterEditor.applyGlobalQueryCheckboxLabel": "Appliquer une recherche globale aux données de calque",
     "xpack.maps.filterEditor.applyGlobalTimeCheckboxLabel": "Appliquer une heure globale aux données de calque",
-    "xpack.maps.geoGrid.resolutionLabel": "Résolution de la grille",
+    "xpack.maps.filterEditor.applyGlobalTimeHelp": "Lorsque cette option est activée, les résultats sont affinés par heure globale.",
+    "xpack.maps.fitToData.autoFitToDataBounds": "Le paramètre de carte \"Ajuster automatiquement la carte aux limites de données\" est activé : la carte effectuera un panoramique et zoomera automatiquement pour afficher les limites de données.",
+    "xpack.maps.fitToData.label": "Ajuster aux limites de données",
+    "xpack.maps.geoGrid.resolutionLabel": "Résolution",
     "xpack.maps.geometryFilterForm.geometryLabelLabel": "Étiquette de géométrie",
     "xpack.maps.geometryFilterForm.relationLabel": "Relation spatiale",
     "xpack.maps.geoTileAgg.disabled.docValues": "Le clustering requiert des agrégations. Activez les agrégations en définissant doc_values sur vrai.",
     "xpack.maps.geoTileAgg.disabled.license": "Le clustering geo_shape requiert une licence Gold.",
     "xpack.maps.heatmap.colorRampLabel": "Gamme de couleurs",
     "xpack.maps.heatmapLegend.coldLabel": "froid",
-    "xpack.maps.heatmapLegend.hotLabel": "chaud",
+    "xpack.maps.heatmapLegend.hotLabel": "hot",
+    "xpack.maps.hexbin.geoShape.disabledReason": "{hexLabel} requiert un champ de cluster \"geo_point\".",
+    "xpack.maps.hexbin.license.disabledReason": "{hexLabel} est une fonctionnalité soumise à abonnement.",
     "xpack.maps.indexData.indexExists": "Index : \"{index}\" introuvable. Un index valide doit être fourni",
+    "xpack.maps.indexSettings.fetchErrorMsg": "Impossible de récupérer les paramètres d'index pour la vue de données \"{indexPatternTitle}\".\n      Assurez-vous d'avoir le rôle \"{viewIndexMetaRole}\".",
     "xpack.maps.initialLayers.unableToParseMessage": "Impossible d'analyser le contenu du paramètre \"initialLayers\". Erreur : {errorMsg}",
     "xpack.maps.initialLayers.unableToParseTitle": "Calques initiaux non ajoutés à la carte",
     "xpack.maps.inspector.centerLatLabel": "Latitude centre",
@@ -13880,8 +16776,8 @@
     "xpack.maps.inspector.zoomLabel": "Zoom",
     "xpack.maps.kilometersAbbr": "km",
     "xpack.maps.layer.isUsingBoundsFilter": "Résultats affinés par zone de carte visible",
-    "xpack.maps.layer.isUsingSearchMsg": "Résultats affinés par requête et filtres",
-    "xpack.maps.layer.isUsingTimeFilter": "Résultats affinés par filtre de temps",
+    "xpack.maps.layer.isUsingSearchMsg": "Résultats affinés par recherche globale",
+    "xpack.maps.layer.isUsingTimeFilter": "Résultats affinés par heure globale",
     "xpack.maps.layer.layerHiddenTooltip": "Le calque est masqué.",
     "xpack.maps.layer.loadWarningAriaLabel": "Avertissement de charge",
     "xpack.maps.layer.zoomFeedbackTooltip": "Le calque est visible entre les niveaux de zoom {minZoom} et {maxZoom}.",
@@ -13899,7 +16795,7 @@
     "xpack.maps.layerControl.tocEntry.hideDetailsButtonTitle": "Masquer les détails du calque",
     "xpack.maps.layerControl.tocEntry.showDetailsButtonAriaLabel": "Afficher les détails du calque",
     "xpack.maps.layerControl.tocEntry.showDetailsButtonTitle": "Afficher les détails du calque",
-    "xpack.maps.layerPanel.filterEditor.addFilterButtonLabel": "Ajouter un filtre",
+    "xpack.maps.layerPanel.filterEditor.addFilterButtonLabel": "Définir le filtre",
     "xpack.maps.layerPanel.filterEditor.editFilterButtonLabel": "Modifier le filtre",
     "xpack.maps.layerPanel.filterEditor.emptyState.description": "Ajouter un filtre pour affiner les données du calque.",
     "xpack.maps.layerPanel.filterEditor.queryBarSubmitButtonLabel": "Définir le filtre",
@@ -13908,12 +16804,10 @@
     "xpack.maps.layerPanel.footer.closeButtonLabel": "Fermer",
     "xpack.maps.layerPanel.footer.removeLayerButtonLabel": "Retirer un calque",
     "xpack.maps.layerPanel.footer.saveAndCloseButtonLabel": "Enregistrer et fermer",
-    "xpack.maps.layerPanel.join.applyGlobalQueryCheckboxLabel": "Appliquer un filtre global à la liaison",
+    "xpack.maps.layerPanel.join.applyGlobalQueryCheckboxLabel": "Appliquer une recherche globale à la liaison",
     "xpack.maps.layerPanel.join.applyGlobalTimeCheckboxLabel": "Appliquer une heure globale à la liaison",
     "xpack.maps.layerPanel.join.deleteJoinAriaLabel": "Supprimer la liaison",
     "xpack.maps.layerPanel.join.deleteJoinTitle": "Supprimer la liaison",
-    "xpack.maps.layerPanel.joinEditor.addJoinAriaLabel": "Ajouter une liaison",
-    "xpack.maps.layerPanel.joinEditor.addJoinButtonLabel": "Ajouter une liaison",
     "xpack.maps.layerPanel.joinEditor.termJoinsTitle": "Liaisons de terme",
     "xpack.maps.layerPanel.joinEditor.termJoinTooltip": "Utilisez les liaisons de terme pour ajouter à ce calque les propriétés de style basées sur les données.",
     "xpack.maps.layerPanel.joinExpression.helpText": "Configurez la clé partagée.",
@@ -13951,9 +16845,12 @@
     "xpack.maps.layerPanel.whereExpression.helpText": "Utilisez une recherche pour afficher la source droite.",
     "xpack.maps.layerPanel.whereExpression.queryBarSubmitButtonLabel": "Définir le filtre",
     "xpack.maps.layers.newVectorLayerWizard.createIndexError": "Impossible de créer l'index avec le nom {message}",
-    "xpack.maps.layers.newVectorLayerWizard.createIndexErrorTitle": "Désolé, impossible de créer le modèle d'indexation",
+    "xpack.maps.layers.newVectorLayerWizard.createIndexErrorTitle": "Impossible de créer l’index",
+    "xpack.maps.layers.newVectorLayerWizard.indexPermissionsError": "Vous devez disposer des privilèges \"create\" et \"create_index\" pour pouvoir créer et écrire des données sur \"{indexName}\".",
+    "xpack.maps.layers.newVectorLayerWizard.indexPrivsErrorTitle": "Privilèges d'index manquants",
     "xpack.maps.layerSettings.attributionLegend": "Attribution",
     "xpack.maps.layerTocActions.cloneLayerTitle": "Cloner le calque",
+    "xpack.maps.layerTocActions.editFeaturesTooltip.disabledMessage": "Les fonctionnalités de modification sont uniquement prises en charge pour les calques de document sans clustering, liaisons de termes, filtrage temporel ou recherche globale.",
     "xpack.maps.layerTocActions.fitToDataTitle": "Ajuster aux données",
     "xpack.maps.layerTocActions.hideLayerTitle": "Masquer le calque",
     "xpack.maps.layerTocActions.layerActionsTitle": "Actions du calque",
@@ -13965,9 +16862,24 @@
     "xpack.maps.layerWizardSelect.elasticsearchCategoryLabel": "Elasticsearch",
     "xpack.maps.layerWizardSelect.referenceCategoryLabel": "Référence",
     "xpack.maps.layerWizardSelect.solutionsCategoryLabel": "Solutions",
+    "xpack.maps.legacyVisualizations.editMessage": "Maps a remplacé {label}. Pour effectuer une modification, convertissez vers Maps.",
+    "xpack.maps.legacyVisualizations.openInMapsButtonLabel": "Afficher dans Maps",
+    "xpack.maps.legacyVisualizations.title": "{label} a effectué la transition vers Maps.",
+    "xpack.maps.legacyVisualizations.useMapsMsg": "Avec Maps, vous pouvez ajouter plusieurs calques et index, tracer des documents individuels, symboliser des fonctionnalités à partir de valeurs de données, ajouter des cartes thermiques, des grilles et des clusters, et plus encore.",
     "xpack.maps.legend.upto": "jusqu'à",
+    "xpack.maps.lens.choropleth.label": "Carte de région",
+    "xpack.maps.lens.choroplethChart.addLayer": "Ajouter un calque de visualisation",
+    "xpack.maps.lens.choroplethChart.choroplethLayerLabel": "{emsLayerLabel} par {accessorLabel}",
+    "xpack.maps.lens.choroplethChart.metricValueLabel": "Indicateur",
+    "xpack.maps.lens.choroplethChart.regionKeyLabel": "Clé de région",
+    "xpack.maps.lens.choroplethChart.suggestionLabel": "{emsLayerLabel} par {metricLabel}",
+    "xpack.maps.lens.groupLabel": "Carte",
     "xpack.maps.loadMap.errorAttemptingToLoadSavedMap": "Impossible de charger la carte",
+    "xpack.maps.logDatatable.region": "Clé de région",
+    "xpack.maps.logDatatable.value": "Valeur",
     "xpack.maps.map.initializeErrorTitle": "Initialisation de la carte impossible",
+    "xpack.maps.mapActions.addFeatureError": "Impossible d’ajouter la fonctionnalité à l’index.",
+    "xpack.maps.mapActions.removeFeatureError": "Impossible de retirer la fonctionnalité de l’index.",
     "xpack.maps.mapListing.descriptionFieldTitle": "Description",
     "xpack.maps.mapListing.entityName": "carte",
     "xpack.maps.mapListing.entityNamePlural": "cartes",
@@ -14010,8 +16922,8 @@
     "xpack.maps.metricSelect.averageDropDownOptionLabel": "Moyenne",
     "xpack.maps.metricSelect.cardinalityDropDownOptionLabel": "Compte unique",
     "xpack.maps.metricSelect.countDropDownOptionLabel": "Compte",
-    "xpack.maps.metricSelect.maxDropDownOptionLabel": "Max",
-    "xpack.maps.metricSelect.minDropDownOptionLabel": "Min",
+    "xpack.maps.metricSelect.maxDropDownOptionLabel": "Max.",
+    "xpack.maps.metricSelect.minDropDownOptionLabel": "Min.",
     "xpack.maps.metricSelect.percentileDropDownOptionLabel": "Centile",
     "xpack.maps.metricSelect.selectAggregationPlaceholder": "Choisir une agrégation",
     "xpack.maps.metricSelect.sumDropDownOptionLabel": "Somme",
@@ -14025,15 +16937,15 @@
     "xpack.maps.mvtSource.trashButtonAriaLabel": "Retirer le champ",
     "xpack.maps.mvtSource.trashButtonTitle": "Retirer le champ",
     "xpack.maps.newVectorLayerWizard.description": "Dessiner les formes sur la carte et indexer dans Elasticsearch",
-    "xpack.maps.newVectorLayerWizard.disabledDesc": "Impossible de créer l'index, vous ne disposez pas du privilège Kibana \"Gestion du modèle d'indexation\".",
+    "xpack.maps.newVectorLayerWizard.disabledDesc": "Impossible de créer l'index, vous ne disposez pas du privilège Kibana de gestion des vues de données.",
     "xpack.maps.newVectorLayerWizard.indexNewLayer": "Créer un index",
     "xpack.maps.newVectorLayerWizard.title": "Créer un index",
-    "xpack.maps.noGeoFieldInIndexPattern.message": "Le modèle d'indexation ne contient aucun champ géospatial",
-    "xpack.maps.noIndexPattern.doThisLinkTextDescription": "Créez un modèle d'indexation.",
+    "xpack.maps.noGeoFieldInIndexPattern.message": "La vue de données ne contient aucun champ géospatial.",
+    "xpack.maps.noIndexPattern.doThisLinkTextDescription": "Créez une vue de données.",
     "xpack.maps.noIndexPattern.doThisPrefixDescription": "Vous devrez ",
-    "xpack.maps.noIndexPattern.getStartedLinkText": "Commencez avec des ensembles de données échantillons.",
+    "xpack.maps.noIndexPattern.getStartedLinkText": "Commencez avec des échantillons d'ensembles de données.",
     "xpack.maps.noIndexPattern.hintDescription": "Vous n'avez aucune donnée ? ",
-    "xpack.maps.noIndexPattern.messageTitle": "Impossible de trouver un modèle d'indexation",
+    "xpack.maps.noIndexPattern.messageTitle": "Aucune vue de données n’a été trouvée",
     "xpack.maps.observability.apmRumPerformanceLabel": "Performances RUM APM",
     "xpack.maps.observability.apmRumPerformanceLayerName": "Performances",
     "xpack.maps.observability.apmRumTrafficLabel": "Trafic RUM APM",
@@ -14043,7 +16955,7 @@
     "xpack.maps.observability.countLabel": "Compte",
     "xpack.maps.observability.countMetricName": "Total",
     "xpack.maps.observability.desc": "Calques APM",
-    "xpack.maps.observability.disabledDesc": "Impossible de trouver le modèle d'indexation APM. Pour commencer à utiliser Observability, accédez à Observability > Overview (Aperçu).",
+    "xpack.maps.observability.disabledDesc": "Vue de données APM introuvable. Pour commencer à utiliser Observability, accédez à Observability > Overview (Aperçu).",
     "xpack.maps.observability.displayLabel": "Affichage",
     "xpack.maps.observability.durationMetricName": "Durée",
     "xpack.maps.observability.gridsLabel": "Grilles",
@@ -14054,21 +16966,44 @@
     "xpack.maps.observability.transactionDurationLabel": "Durée de la transaction",
     "xpack.maps.observability.uniqueCountLabel": "Compte unique",
     "xpack.maps.observability.uniqueCountMetricName": "Compte unique",
+    "xpack.maps.regionMap.function.help": "Visualisation de la carte des régions",
+    "xpack.maps.regionMap.vis.description": "Affichez les indicateurs sur une carte thématique.",
+    "xpack.maps.regionMapMap.vis.title": "Carte des régions",
+    "xpack.maps.registerIntegrations.gdal.integrationDescription": "Chargez des fichiers Shapefile et effectuez leur ingestion depuis des bases de données relationnelles comme PostGIS ou Oracle Spatial avec GDAL.",
+    "xpack.maps.registerIntegrations.gdal.integrationTitle": "GDAL",
+    "xpack.maps.registerIntegrations.geojson.integrationDescription": "Chargez des fichiers GeoJSON avec Elastic Maps.",
+    "xpack.maps.registerIntegrations.geojson.integrationTitle": "GeoJSON",
+    "xpack.maps.registerIntegrations.shapefile.integrationDescription": "Chargez des fichiers Shapefile avec Elastic Maps.",
+    "xpack.maps.registerIntegrations.shapefile.integrationTitle": "Shapefile",
     "xpack.maps.sampleData.ecommerceSpec.mapsTitle": "[eCommerce] Commandes par pays",
     "xpack.maps.sampleData.flightaSpec.logsTitle": "[Logs] Total demandes et octets",
     "xpack.maps.sampleData.flightsSpec.mapsTitle": "[Vols] Retard heure d'origine",
     "xpack.maps.sampleDataLinkLabel": "Carte",
+    "xpack.maps.scalingDocs.clustersDetails": "Affichez les clusters lorsque les résultats dépassent {maxResultWindow} documents. Affichez les documents lorsqu’il y a moins de {maxResultWindow} résultats.",
+    "xpack.maps.scalingDocs.clustersUseCase": "Utilisez cette option pour afficher de grands ensembles de données. Ne prend pas en charge les liaisons de termes.",
+    "xpack.maps.scalingDocs.limitDetails": "Affichez les fonctionnalités des {maxResultWindow} premiers documents.",
+    "xpack.maps.scalingDocs.maxResultWindow": "Contrainte {maxResultWindow} fournie par le paramètre d’index {link}.",
+    "xpack.maps.scalingDocs.mvtDetails": "Partitionnez votre carte en tuiles, chacune affichant les fonctionnalités des {maxResultWindow} premiers documents. Les résultats dépassant {maxResultWindow} ne sont pas affichés en tuile. Une zone de délimitation indique la zone où les données sont incomplètes.",
+    "xpack.maps.scalingDocs.mvtUseCase": "Utilisez cette option pour afficher de grands ensembles de données avec les temps de chargement les plus courts. Ne prend pas en charge les liaisons de termes, les étiquettes formatées et les styles fondés sur les données à partir de champs scriptés.",
     "xpack.maps.security.desc": "Calques de sécurité",
-    "xpack.maps.security.disabledDesc": "Impossible de trouver le modèle d'indexation de sécurité. Pour commencer à utiliser Security, accédez à Security > Overview (Aperçu).",
-    "xpack.maps.security.title": "Security",
+    "xpack.maps.security.disabledDesc": "Vue de données Security introuvable. Pour commencer à utiliser Security, accédez à Security > Overview (Aperçu).",
+    "xpack.maps.security.title": "Sécurité",
     "xpack.maps.sescurity.destinationLayerLabel": "{indexPatternTitle} | Point de destination",
-    "xpack.maps.sescurity.lineLayerLabel": "{indexPatternTitle} | Line",
+    "xpack.maps.sescurity.lineLayerLabel": "{indexPatternTitle} | Ligne",
     "xpack.maps.sescurity.sourceLayerLabel": "{indexPatternTitle} | Point source",
     "xpack.maps.setViewControl.goToButtonLabel": "Atteindre",
     "xpack.maps.setViewControl.latitudeLabel": "Latitude",
     "xpack.maps.setViewControl.longitudeLabel": "Longitude",
+    "xpack.maps.setViewControl.mgrsInvalid": "MGRS non valide",
+    "xpack.maps.setViewControl.mgrsLabel": "MGRS",
     "xpack.maps.setViewControl.submitButtonLabel": "Go",
-    "xpack.maps.setViewControl.zoomLabel": "Zoom",
+    "xpack.maps.setViewControl.utmEastingLabel": "Abscisse UTM",
+    "xpack.maps.setViewControl.utmInvalidEasting": "Abscisse UTM non valide",
+    "xpack.maps.setViewControl.utmInvalidNorthing": "Ordonnée UTM non valide",
+    "xpack.maps.setViewControl.utmInvalidZone": "Zone UTM non valide",
+    "xpack.maps.setViewControl.utmNorthingLabel": "Ordonnée UTM",
+    "xpack.maps.setViewControl.utmZoneLabel": "Zone UTM",
+    "xpack.maps.setViewControl.zoomLabel": "Effectuer un zoom",
     "xpack.maps.source.dataSourceLabel": "Source de données",
     "xpack.maps.source.ems_xyzDescription": "Service de cartographie d'images matricielles utilisant le modèle URL {z}/{x}/{y}.",
     "xpack.maps.source.ems_xyzTitle": "Tile Map Service (Service de cartographie)",
@@ -14080,7 +17015,7 @@
     "xpack.maps.source.emsFile.layerLabel": "Calque",
     "xpack.maps.source.emsFile.unableToFindFileIdErrorMessage": "Impossible de trouver des formes de vecteur EMS pour l'ID : {id}. {info}",
     "xpack.maps.source.emsFileDisabledReason": "Le serveur Elastic Maps requiert une licence Enterprise",
-    "xpack.maps.source.emsFileSelect.selectLabel": "Calque",
+    "xpack.maps.source.emsFileSelect.selectLabel": "Limites EMS",
     "xpack.maps.source.emsFileSourceDescription": "Limites administratives de {host}",
     "xpack.maps.source.emsFileTitle": "Limites EMS",
     "xpack.maps.source.emsOnPremFileTitle": "Limites du serveur Elastic Maps",
@@ -14095,12 +17030,17 @@
     "xpack.maps.source.emsTileDisabledReason": "Le serveur Elastic Maps requiert une licence Enterprise",
     "xpack.maps.source.emsTileSourceDescription": "Service de fonds de carte de {host}",
     "xpack.maps.source.emsTileTitle": "Fonds de carte EMS",
-    "xpack.maps.source.esAggSource.topTermLabel": "Top {fieldLabel}",
-    "xpack.maps.source.esGeoGrid.geofieldLabel": "Champ géospatial",
+    "xpack.maps.source.esAggSource.topTermLabel": "Premier {fieldLabel}",
+    "xpack.maps.source.esGeoGrid.clusterDescription": "Regroupez les documents en grilles avec un centre pondéré pour chaque cellule.",
+    "xpack.maps.source.esGeoGrid.geofieldLabel": "Champ de cluster",
     "xpack.maps.source.esGeoGrid.geofieldPlaceholder": "Sélectionner un champ géographique",
-    "xpack.maps.source.esGeoGrid.gridRectangleDropdownOption": "grilles",
-    "xpack.maps.source.esGeoGrid.pointsDropdownOption": "clusters",
+    "xpack.maps.source.esGeoGrid.gridDescription": "Regroupez les documents en grilles.",
+    "xpack.maps.source.esGeoGrid.gridRectangleDropdownOption": "Grilles",
+    "xpack.maps.source.esGeoGrid.hexDescription": "Regroupez les documents en hexagones.",
+    "xpack.maps.source.esGeoGrid.hexDropdownOption": "Hexagones",
+    "xpack.maps.source.esGeoGrid.pointsDropdownOption": "Clusters",
     "xpack.maps.source.esGeoGrid.showAsLabel": "Afficher en tant que",
+    "xpack.maps.source.esGeoGrid.showAsSelector": "Sélectionner la méthode d’affichage",
     "xpack.maps.source.esGeoLine.entityRequestDescription": "Requête de termes Elasticsearch pour récupérer des entités dans la mémoire tampon de la carte.",
     "xpack.maps.source.esGeoLine.entityRequestName": "Entités {layerName}",
     "xpack.maps.source.esGeoLine.geofieldLabel": "Champ géospatial",
@@ -14120,12 +17060,19 @@
     "xpack.maps.source.esGeoLineTitle": "Pistes",
     "xpack.maps.source.esGrid.compositeInspectorDescription": "Demande d'agrégation de grille géographique Elasticsearch : {requestId}",
     "xpack.maps.source.esGrid.compositePaginationErrorMessage": "{layerName} génère trop de requêtes. Réduisez \"Résolution de la grille\" et/ou réduisez le nombre d'indicateurs de premier terme.",
-    "xpack.maps.source.esGrid.geospatialFieldLabel": "Champ géospatial",
+    "xpack.maps.source.esGrid.geospatialFieldLabel": "Champ de cluster",
+    "xpack.maps.source.esGrid.highLabel": "élevé",
     "xpack.maps.source.esGrid.inspectorDescription": "Demande d'agrégation de grille géographique Elasticsearch",
+    "xpack.maps.source.esGrid.lowLabel": "bas",
     "xpack.maps.source.esGrid.metricsLabel": "Indicateurs",
     "xpack.maps.source.esGrid.resolutionParamErrorMessage": "Paramètre de résolution de grille non reconnu : {resolution}",
-    "xpack.maps.source.esGridClustersDescription": "Données géospatiales regroupées dans des grilles avec des indicateurs pour chaque cellule à grille",
-    "xpack.maps.source.esGridClustersTitle": "Clusters et grilles",
+    "xpack.maps.source.esGrid.superFineHelpText": "La haute résolution utilise des tuiles vectorielles.",
+    "xpack.maps.source.esGrid.vectorTileModal.cancelBtnLabel": "Annuler",
+    "xpack.maps.source.esGrid.vectorTileModal.confirmBtnLabel": "Accepter",
+    "xpack.maps.source.esGrid.vectorTileModal.message": "La haute résolution utilise des tuiles vectorielles de l’API de tuiles vectorielles d’Elasticsearch. L’API de tuiles vectorielles d’Elasticsearch ne prend pas en charge l’indicateur \"Premiers termes\". Le passage à une résolution en grille très fine entraîne la suppression de tous les indicateurs \"Premiers termes\" de la configuration de calque.",
+    "xpack.maps.source.esGrid.vectorTileModal.title": "Indicateur \"Premiers termes\" non pris en charge",
+    "xpack.maps.source.esGridClustersDescription": "Regrouper les documents Elasticsearch en grilles et en hexagones, et afficher les indicateurs pour chaque groupe",
+    "xpack.maps.source.esGridClustersTitle": "Clusters",
     "xpack.maps.source.esGridHeatmapDescription": "Données géospatiales regroupées dans des grilles pour afficher la densité",
     "xpack.maps.source.esGridHeatmapTitle": "Carte thermique",
     "xpack.maps.source.esJoin.countLabel": "Compte de {indexPatternTitle}",
@@ -14139,10 +17086,14 @@
     "xpack.maps.source.esSearch.geofieldLabel": "Champ géospatial",
     "xpack.maps.source.esSearch.geoFieldLabel": "Champ géospatial",
     "xpack.maps.source.esSearch.geoFieldTypeLabel": "Type de champ géospatial",
+    "xpack.maps.source.esSearch.indexOverOneLengthEditError": "Votre vue de données pointe vers plusieurs index. Un seul index est autorisé par vue de données.",
+    "xpack.maps.source.esSearch.indexZeroLengthEditError": "Votre vue de données ne pointe vers aucun index.",
     "xpack.maps.source.esSearch.joinsDisabledReason": "Les liaisons ne sont pas prises en charge lors de la montée en charge par rapport aux clusters",
-    "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "Les liaisons ne sont pas prises en charge lors de la montée en charge par rapport aux tuiles vectorielles MVT",
     "xpack.maps.source.esSearch.limitScalingLabel": "Limiter les résultats à {maxResultWindow}",
     "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "Document introuvable, _id : {docId}",
+    "xpack.maps.source.esSearch.scalingModal.cancelBtnLabel": "Annuler",
+    "xpack.maps.source.esSearch.scalingModal.confirmBtnLabel": "Accepter",
+    "xpack.maps.source.esSearch.scalingModal.title": "Liaisons de termes non prises en charge",
     "xpack.maps.source.esSearch.selectLabel": "Sélectionner un champ géographique",
     "xpack.maps.source.esSearch.sortFieldLabel": "Champ",
     "xpack.maps.source.esSearch.sortFieldSelectPlaceholder": "Sélectionner le champ de tri",
@@ -14153,7 +17104,7 @@
     "xpack.maps.source.esSearch.useMVTVectorTiles": "Utiliser les tuiles vectorielles",
     "xpack.maps.source.esSearchDescription": "Points, lignes et polygones d'Elasticsearch",
     "xpack.maps.source.esSearchTitle": "Documents",
-    "xpack.maps.source.esSource.noGeoFieldErrorMessage": "Le modèle d'indexation {indexPatternTitle} ne contient plus le champ géographique {geoField}",
+    "xpack.maps.source.esSource.noGeoFieldErrorMessage": "La vue de données {indexPatternTitle} ne contient plus le champ géographique {geoField}.",
     "xpack.maps.source.esSource.requestFailedErrorMessage": "Échec de la demande de recherche Elasticsearch, erreur : {message}",
     "xpack.maps.source.esSource.stylePropsMetaRequestDescription": "Recherche Elasticsearch récupérant les métadonnées de champ utilisées pour le calcul des champs de symbolisation.",
     "xpack.maps.source.esSource.stylePropsMetaRequestName": "{layerName} - métadonnées",
@@ -14182,7 +17133,7 @@
     "xpack.maps.source.pewPew.destGeoFieldPlaceholder": "Sélectionner le champ géographique de destination",
     "xpack.maps.source.pewPew.inspectorDescription": "Demande de connexions source-destination",
     "xpack.maps.source.pewPew.metricsLabel": "Indicateurs",
-    "xpack.maps.source.pewPew.noSourceAndDestDetails": "Le modèle d'indexation sélectionné ne contient pas de champs source et de destination.",
+    "xpack.maps.source.pewPew.noSourceAndDestDetails": "La vue de données sélectionnée ne contient pas de champs source et de destination.",
     "xpack.maps.source.pewPew.sourceGeoFieldLabel": "Source",
     "xpack.maps.source.pewPew.sourceGeoFieldPlaceholder": "Sélectionner le champ géographique source",
     "xpack.maps.source.pewPewDescription": "Chemins de données agrégé entre la source et la destination",
@@ -14262,11 +17213,18 @@
     "xpack.maps.styles.vector.orientationLabel": "Orientation du symbole",
     "xpack.maps.styles.vector.selectFieldPlaceholder": "Sélectionner un champ",
     "xpack.maps.styles.vector.symbolSizeLabel": "Taille du symbole",
+    "xpack.maps.tileMap.function.help": "Visualisation de la carte de tuiles",
+    "xpack.maps.tileMap.vis.description": "Tracer les coordonnées de latitude et de longitude sur une carte",
+    "xpack.maps.tileMap.vis.title": "Carte de coordonnées",
+    "xpack.maps.tiles.resultsCompleteMsg": "{countPrefix}{count} documents trouvés.",
+    "xpack.maps.tiles.resultsTrimmedMsg": "Résultats limités à {countPrefix}{count} documents.",
+    "xpack.maps.tiles.shapeCountMsg": " Ce nombre est approximatif.",
     "xpack.maps.timeslider.closeLabel": "Fermer le curseur temporel",
     "xpack.maps.timeslider.nextTimeWindowLabel": "Fenêtre temporelle suivante",
     "xpack.maps.timeslider.pauseLabel": "Pause",
     "xpack.maps.timeslider.playLabel": "Lecture",
     "xpack.maps.timeslider.previousTimeWindowLabel": "Fenêtre temporelle précédente",
+    "xpack.maps.timeslider.setGlobalTime": "Définir l’heure globale sur {timeslice}",
     "xpack.maps.timesliderToggleButton.closeLabel": "Fermer le curseur temporel",
     "xpack.maps.timesliderToggleButton.openLabel": "Ouvrir le curseur temporel",
     "xpack.maps.toolbarOverlay.drawBounds.initialGeometryLabel": "limites",
@@ -14298,6 +17256,7 @@
     "xpack.maps.tooltip.filterOnPropertyTitle": "Filtrer sur propriété",
     "xpack.maps.tooltip.geometryFilterForm.createFilterButtonLabel": "Créer un filtre",
     "xpack.maps.tooltip.geometryFilterForm.filterTooLargeMessage": "Impossible de créer le filtre. Les filtres sont ajoutés à l'URL, et cette forme possède trop de vertex pour s'adapter à l'URL.",
+    "xpack.maps.tooltip.joinPropertyTooltipContent": "La clé partagée \"{leftFieldName}\" est reliée à {rightSources}.",
     "xpack.maps.tooltip.layerFilterLabel": "Filtrer les résultats par calque",
     "xpack.maps.tooltip.loadingMsg": "Chargement",
     "xpack.maps.tooltip.pageNumerText": "{pageNumber} sur {total}",
@@ -14334,8 +17293,8 @@
     "xpack.maps.tutorials.ems.downloadStepText": "1. Accédez à Elastic Maps Service [page d'accueil]({emsLandingPageUrl}/).\n2. Dans la barre latérale de gauche, sélectionnez une limite administrative.\n3. Cliquez sur le bouton \"Télécharger GeoJSON\".",
     "xpack.maps.tutorials.ems.downloadStepTitle": "Télécharger les limites Elastic Maps Service",
     "xpack.maps.tutorials.ems.longDescription": "[Elastic Maps Service (EMS)](https://www.elastic.co/elastic-maps-service) héberge des calques de cartographie et des formes de vecteurs de limites administratives. L'indexation des limites administratives EMS dans Elasticsearch permet la recherche sur les champs de propriétés de limite.",
-    "xpack.maps.tutorials.ems.nameTitle": "Limites EMS",
-    "xpack.maps.tutorials.ems.shortDescription": "Limites administratives d'Elastic Maps Service.",
+    "xpack.maps.tutorials.ems.nameTitle": "Elastic Maps Service",
+    "xpack.maps.tutorials.ems.shortDescription": "Ajoutez des limites administratives à vos données avec Elastic Maps Service.",
     "xpack.maps.tutorials.ems.uploadStepText": "1. Ouvrez [Maps]({newMapUrl}).\n2. Cliquez sur \"Ajouter un calque\", puis sélectionnez \"Charger GeoJSON\".\n3. Chargez le fichier GeoJSON et cliquez sur \"Importer un fichier\".",
     "xpack.maps.tutorials.ems.uploadStepTitle": "Indexer les limites d'Elastic Maps Service",
     "xpack.maps.validatedNumberInput.invalidClampErrorMessage": "Doit être compris entre {min} et {max}",
@@ -14363,7 +17322,7 @@
     "xpack.maps.visTypeAlias.title": "Cartes",
     "xpack.ml.accessDenied.description": "Vous ne disposez pas d'autorisation pour afficher le plug-in de Machine Learning. L'accès au plug-in requiert que la fonctionnalité de Machine Learning soit visible dans cet espace.",
     "xpack.ml.accessDeniedLabel": "Accès refusé",
-    "xpack.ml.actions.applyEntityFieldsFiltersTitle": "Filtre pour la valeur",
+    "xpack.ml.actions.applyEntityFieldsFiltersTitle": "Filtrer sur la valeur",
     "xpack.ml.actions.applyInfluencersFiltersTitle": "Filtre pour la valeur",
     "xpack.ml.actions.applyTimeRangeSelectionTitle": "Appliquer la sélection de la plage temporelle",
     "xpack.ml.actions.clearSelectionTitle": "Effacer la sélection",
@@ -14389,7 +17348,7 @@
     "xpack.ml.alertContext.timestampIso8601Description": "Heure du groupe de l'anomalie au format ISO8601",
     "xpack.ml.alertContext.topInfluencersDescription": "Principaux influenceurs",
     "xpack.ml.alertContext.topRecordsDescription": "Premiers enregistrements",
-    "xpack.ml.alertTypes.anomalyDetection.defaultActionMessage": "Alerte de Machine Learning Elastic Stack :\n- ID de tâches : \\{\\{context.jobIds\\}\\}\n- Heure : \\{\\{context.timestampIso8601\\}\\}\n- Score d'anomalies : \\{\\{context.score\\}\\}\n\n\\{\\{context.message\\}\\}\n\n\\{\\{#context.topInfluencers.length\\}\\}\n  Principaux influenceurs :\n  \\{\\{#context.topInfluencers\\}\\}\n    \\{\\{influencer_field_name\\}\\} = \\{\\{influencer_field_value\\}\\} [\\{\\{score\\}\\}]\n  \\{\\{/context.topInfluencers\\}\\}\n\\{\\{/context.topInfluencers.length\\}\\}\n\n\\{\\{#context.topRecords.length\\}\\}\n  Premiers enregistrements :\n  \\{\\{#context.topRecords\\}\\}\n    \\{\\{function\\}\\}(\\{\\{field_name\\}\\}) \\{\\{by_field_value\\}\\} \\{\\{over_field_value\\}\\} \\{\\{partition_field_value\\}\\} [\\{\\{score\\}\\}]\n  \\{\\{/context.topRecords\\}\\}\n\\{\\{/context.topRecords.length\\}\\}\n\n\\{\\{! Remplacer kibanaBaseUrl s'il n'est pas configuré dans Kibana \\}\\}\n[Ouvrir dans Anomaly Explorer](\\{\\{\\{kibanaBaseUrl\\}\\}\\}\\{\\{\\{context.anomalyExplorerUrl\\}\\}\\})\n",
+    "xpack.ml.alertTypes.anomalyDetection.defaultActionMessage": "Alerte de Machine Learning Elastic Stack :\n- ID de tâches : \\{\\{context.jobIds\\}\\}\n- Heure : \\{\\{context.timestampIso8601\\}\\}\n- Score d'anomalies : \\{\\{context.score\\}\\}\n\n\\{\\{context.message\\}\\}\n\n\\{\\{#context.topInfluencers.length\\}\\}\n  Principaux influenceurs :\n  \\{\\{#context.topInfluencers\\}\\}\n    \\{\\{influencer_field_name\\}\\} = \\{\\{influencer_field_value\\}\\} [\\{\\{score\\}\\}]\n  \\{\\{/context.topInfluencers\\}\\}\n\\{\\{/context.topInfluencers.length\\}\\}\n\n\\{\\{#context.topRecords.length\\}\\}\n  Premiers enregistrements :\n  \\{\\{#context.topRecords\\}\\}\n    \\{\\{function\\}\\}(\\{\\{field_name\\}\\}) \\{\\{by_field_value\\}\\}\\{\\{over_field_value\\}\\}\\{\\{partition_field_value\\}\\} [\\{\\{score\\}\\}]. Typique : \\{\\{typical\\}\\}, Réelle : \\{\\{actual\\}\\}\n  \\{\\{/context.topRecords\\}\\}\n\\{\\{/context.topRecords.length\\}\\}\n\n\\{\\{! Remplacer kibanaBaseUrl s'il n'est pas configuré dans Kibana \\}\\}\n[Ouvrir dans Anomaly Explorer](\\{\\{\\{kibanaBaseUrl\\}\\}\\}\\{\\{\\{context.anomalyExplorerUrl\\}\\}\\})\n",
     "xpack.ml.alertTypes.anomalyDetection.description": "Alerte lorsque les résultats des tâches de détection des anomalies correspondent à la condition.",
     "xpack.ml.alertTypes.anomalyDetection.jobSelection.errorMessage": "La sélection d'une tâche est requise",
     "xpack.ml.alertTypes.anomalyDetection.lookbackInterval.errorMessage": "L'intervalle d'historique n'est pas valide",
@@ -14401,19 +17360,25 @@
     "xpack.ml.alertTypes.jobsHealthAlertingRule.alertContext.resultsDescription": "Résultats de l'exécution de la règle",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.behindRealtimeCheckDescription": "La tâche est en retard sur le temps réel",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.behindRealtimeCheckName": "La tâche est en retard sur le temps réel",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.betaBadgeTooltipContent": "La fonctionnalité d'alerte d’intégrité des tâches de détection des anomalies est en version bêta. Nous aimerions beaucoup connaître votre avis.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.datafeedCheckDescription": "Soyez alerté si le flux de données correspondant de la tâche n'est pas démarré",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.datafeedCheckName": "Le flux de données n'est pas démarré",
-    "xpack.ml.alertTypes.jobsHealthAlertingRule.defaultActionMessage": "Résultat de vérification de l'intégrité des tâches de détection des anomalies :\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  ID de tâche : \\{\\{job_id\\}\\}\n  \\{\\{#datafeed_id\\}\\}ID de flux de données : \\{\\{datafeed_id\\}\\}\n  \\{\\{/datafeed_id\\}\\} \\{\\{#datafeed_state\\}\\}État du flux de données : \\{\\{datafeed_state\\}\\}\n  \\{\\{/datafeed_state\\}\\} \\{\\{#memory_status\\}\\}Statut de la mémoire : \\{\\{memory_status\\}\\}\n  \\{\\{/memory_status\\}\\} \\{\\{#log_time\\}\\}Heure de logging dans la mémoire : \\{\\{log_time\\}\\}\n  \\{\\{/log_time\\}\\} \\{\\{#failed_category_count\\}\\}Compte de catégories échouées : \\{\\{failed_category_count\\}\\}\n  \\{\\{/failed_category_count\\}\\} \\{\\{#annotation\\}\\}Annotation : \\{\\{annotation\\}\\}\n  \\{\\{/annotation\\}\\} \\{\\{#missed_docs_count\\}\\}Nombre de documents manquants : \\{\\{missed_docs_count\\}\\}\n  \\{\\{/missed_docs_count\\}\\} \\{\\{#end_timestamp\\}\\}Dernier groupe finalisé avec les documents manquants : \\{\\{end_timestamp\\}\\}\n  \\{\\{/end_timestamp\\}\\} \\{\\{#errors\\}\\}Message d'erreur : \\{\\{message\\}\\} \\{\\{/errors\\}\\}\n\\{\\{/context.results\\}\\}\n",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.datafeedStateMessage": "Le flux de données n'a pas démarré pour {count, plural, one {la tâche} other {les tâches}} {jobsString}.",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.defaultActionMessage": "[\\{\\{rule.name\\}\\}] Résultat du contrôle d'intégrité des tâches de détection des anomalies :\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  ID de tâche : \\{\\{job_id\\}\\}\n  \\{\\{#datafeed_id\\}\\}ID de flux de données : \\{\\{datafeed_id\\}\\}\n  \\{\\{/datafeed_id\\}\\}\\{\\{#datafeed_state\\}\\}État du flux de données : \\{\\{datafeed_state\\}\\}\n  \\{\\{/datafeed_state\\}\\}\\{\\{#memory_status\\}\\}Statut de la mémoire : \\{\\{memory_status\\}\\}\n  \\{\\{/memory_status\\}\\}\\{\\{#model_bytes\\}\\}Taille du modèle : \\{\\{model_bytes\\}\\}\n  \\{\\{/model_bytes\\}\\}\\{\\{#model_bytes_memory_limit\\}\\}Limite de mémoire du modèle : \\{\\{model_bytes_memory_limit\\}\\}\n  \\{\\{/model_bytes_memory_limit\\}\\}\\{\\{#peak_model_bytes\\}\\}Pic d'octets du modèle : \\{\\{peak_model_bytes\\}\\}\n  \\{\\{/peak_model_bytes\\}\\}\\{\\{#model_bytes_exceeded\\}\\}Dépassement du modèle : \\{\\{model_bytes_exceeded\\}\\}\n  \\{\\{/model_bytes_exceeded\\}\\}\\{\\{#log_time\\}\\}Heure de logging dans la mémoire : \\{\\{log_time\\}\\}\n  \\{\\{/log_time\\}\\}\\{\\{#failed_category_count\\}\\}Compte de catégories échouées : \\{\\{failed_category_count\\}\\}\n  \\{\\{/failed_category_count\\}\\}\\{\\{#annotation\\}\\}Annotation : \\{\\{annotation\\}\\}\n  \\{\\{/annotation\\}\\}\\{\\{#missed_docs_count\\}\\}Nombre de documents manquants : \\{\\{missed_docs_count\\}\\}\n  \\{\\{/missed_docs_count\\}\\}\\{\\{#end_timestamp\\}\\}Dernier groupe finalisé avec les documents manquants : \\{\\{end_timestamp\\}\\}\n  \\{\\{/end_timestamp\\}\\}\\{\\{#errors\\}\\}Message d'erreur : \\{\\{message\\}\\} \\{\\{/errors\\}\\}\n\\{\\{/context.results\\}\\}\n",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.delayedDataCheckDescription": "Soyez alerté si des données sont manquantes pour une tâche en raison d'un retard de données.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.delayedDataCheckName": "Un retard de données s'est produit",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.delayedDataMessage": "{count, plural, one {La tâche} other {Les tâches}} {jobsString} {count, plural, one {subit} other {subissent}} des retards de données.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.description": "Alerte lorsque les tâches de détection des anomalies rencontrent des problèmes de fonctionnement. Activez les alertes appropriées pour les tâches d'une importance critique.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.errorMessagesCheckDescription": "Soyez alerté si une tâche contient des erreurs dans les messages liés à la tâche.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.errorMessagesCheckName": "Erreurs dans les messages liés à la tâche",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.errorMessagesMessage": "{count, plural, one {La tâche} other {Les tâches}} {jobsString} {count, plural, one {contient} other {contiennent}} des erreurs dans les messages.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.excludeJobs.label": "Exclure des tâches ou des groupes",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.includeJobs.errorMessage": "La sélection d'une tâche est requise",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.includeJobs.label": "Inclure des tâches ou des groupes",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.mmlCheckDescription": "Soyez alerté lorsque la tâche atteint une limite stricte ou non stricte de mémoire du modèle.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.mmlCheckName": "Limite de mémoire du modèle atteinte",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.mmlMessage": "{count, plural, one {La tâche} other {Les tâches}} {jobsString} {count, plural, one {a atteint} other {ont atteint}} la limite stricte de mémoire du modèle. Affectez à la tâche davantage de mémoire et effectuez une restauration à partir d'un snapshot antérieur à l'atteinte de la limite stricte.",
+    "xpack.ml.alertTypes.jobsHealthAlertingRule.mmlSoftLimitMessage": "{count, plural, one {La tâche} other {Les tâches}} {jobsString} {count, plural, one {a atteint} other {ont atteint}} la limite non stricte de mémoire du modèle. Affectez à la tâche davantage de mémoire ou modifiez le filtre du flux de données pour limiter la portée de l'analyse.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsConfig.delayedData.docsCountErrorMessage": "Nombre de documents non valide",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsConfig.delayedData.timeIntervalErrorMessage": "Intervalle de temps non valide",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsConfig.errorMessage": "Au moins une vérification d'intégrité doit être activée.",
@@ -14422,6 +17387,19 @@
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.delayedData.timeIntervalHint": "Intervalle d'historique à vérifier lors de l'exécution de la règle pour les données retardées. Par défaut, il est dérivé de la plus grande valeur de durée d'intervalle et de retard de requête.",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.delayedData.timeIntervalLabel": "Intervalle de temps",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.enableTestLabel": "Activer",
+    "xpack.ml.analyticsSelector.analyticsFetchErrorMessage": "Une erreur s’est produite lors de la récupération des tâches d’analyse. Actualisez et réessayez.",
+    "xpack.ml.analyticsSelector.applyFlyoutButton": "Appliquer",
+    "xpack.ml.analyticsSelector.closeFlyoutButton": "Fermer",
+    "xpack.ml.analyticsSelector.description": "Description",
+    "xpack.ml.analyticsSelector.destinationIndex": "Index de destination",
+    "xpack.ml.analyticsSelector.flyoutTitle": "Sélection d’analyse",
+    "xpack.ml.analyticsSelector.id": "ID",
+    "xpack.ml.analyticsSelector.jobsTab": "Tâches",
+    "xpack.ml.analyticsSelector.modelsList.modelDescriptionHeader": "Description",
+    "xpack.ml.analyticsSelector.modelsList.modelIdHeader": "ID",
+    "xpack.ml.analyticsSelector.modelsTab": "Modèles",
+    "xpack.ml.analyticsSelector.sourceIndex": "Index source",
+    "xpack.ml.analyticsSelector.trainedModelsFetchErrorMessage": "Une erreur s’est produite lors de la récupération des modèles entraînés. Actualisez et réessayez.",
     "xpack.ml.annotationFlyout.applyToPartitionTextLabel": "Appliquer l'annotation à cette série",
     "xpack.ml.annotationsTable.actionsColumnName": "Actions",
     "xpack.ml.annotationsTable.annotationColumnName": "Annotation",
@@ -14459,7 +17437,7 @@
     "xpack.ml.anomaliesTable.anomalyDetails.anomalyTimeRangeLabel": "{anomalyTime} à {anomalyEndTime}",
     "xpack.ml.anomaliesTable.anomalyDetails.categoryExamplesTitle": "Exemples de catégorie",
     "xpack.ml.anomaliesTable.anomalyDetails.causeValuesDescription": "{causeEntityValue} ({actualValue} réel, {typicalValue} typique, {probabilityValue} probabilité)",
-    "xpack.ml.anomaliesTable.anomalyDetails.causeValuesTitle": "{causeEntityName} values",
+    "xpack.ml.anomaliesTable.anomalyDetails.causeValuesTitle": "Valeurs {causeEntityName}",
     "xpack.ml.anomaliesTable.anomalyDetails.descriptionTitle": "Description",
     "xpack.ml.anomaliesTable.anomalyDetails.detailsOnHighestSeverityAnomalyTitle": "Détails sur l'anomalie la plus sévère",
     "xpack.ml.anomaliesTable.anomalyDetails.detailsTitle": "Détails",
@@ -14503,13 +17481,16 @@
     "xpack.ml.anomaliesTable.influencersCell.showLessInfluencersLinkText": "afficher moins",
     "xpack.ml.anomaliesTable.influencersColumnName": "Influencé par",
     "xpack.ml.anomaliesTable.jobIdColumnName": "ID tâche",
+    "xpack.ml.anomaliesTable.linksMenu.autoGeneratedDiscoverLinkErrorMessage": "Liaison avec Discover impossible ; aucune vue de données n’existe pour l’index \"{index}\".",
     "xpack.ml.anomaliesTable.linksMenu.configureRulesLabel": "Configurer les règles de tâche",
+    "xpack.ml.anomaliesTable.linksMenu.discoverLocatorMissingErrorMessage": "Aucun localisateur pour Discover détecté",
     "xpack.ml.anomaliesTable.linksMenu.loadingDetailsErrorMessage": "Impossible de voir les exemples car une erreur est survenue pendant le chargement des détails sur l'ID de catégorie {categoryId}",
     "xpack.ml.anomaliesTable.linksMenu.noMappingCouldBeFoundErrorMessage": "Impossible de voir les exemples de documents avec mlcategory {categoryId} car aucun mapping n'a été trouvé pour le champ de catégorisation {categorizationFieldName}",
     "xpack.ml.anomaliesTable.linksMenu.selectActionAriaLabel": "Sélectionner une action pour l'anomalie à {time}",
     "xpack.ml.anomaliesTable.linksMenu.unableToOpenLinkErrorMessage": "Impossible d'ouvrir le lien car une erreur est survenue pendant le chargement des détails sur l'ID de catégorie {categoryId}",
     "xpack.ml.anomaliesTable.linksMenu.unableToViewExamplesErrorMessage": "Impossible de voir les exemples car aucun détail n'a été trouvé pour l'ID de tâche {jobId}",
     "xpack.ml.anomaliesTable.linksMenu.viewExamplesLabel": "Voir les exemples",
+    "xpack.ml.anomaliesTable.linksMenu.viewInDiscover": "Afficher dans Discover",
     "xpack.ml.anomaliesTable.linksMenu.viewSeriesLabel": "Voir la série",
     "xpack.ml.anomaliesTable.metricDescriptionSortColumnName": "Description",
     "xpack.ml.anomaliesTable.noMatchingAnomaliesFoundTitle": "Aucune anomalie correspondante trouvée",
@@ -14525,7 +17506,10 @@
     "xpack.ml.anomalyChartsEmbeddable.setupModal.confirmButtonLabel": "Confirmer les configurations",
     "xpack.ml.anomalyChartsEmbeddable.setupModal.title": "Configuration des graphiques Anomaly Explorer",
     "xpack.ml.anomalyChartsEmbeddable.title": "Graphiques d'anomalies de ML pour {jobIds}",
+    "xpack.ml.anomalyDetection.anomalyExplorer.docTitle": "Anomaly Explorer (Explorateur d'anomalies)",
     "xpack.ml.anomalyDetection.anomalyExplorerLabel": "Anomaly Explorer (Explorateur d'anomalies)",
+    "xpack.ml.anomalyDetection.jobs.docTitle": "Tâches de détection des anomalies",
+    "xpack.ml.anomalyDetection.jobsManagementLabel": "Tâches",
     "xpack.ml.anomalyDetection.singleMetricViewerLabel": "Single Metric Viewer (Visionneuse d'indicateur unique)",
     "xpack.ml.anomalyDetectionAlert.actionGroupName": "Le score d'anomalies correspond à la condition",
     "xpack.ml.anomalyDetectionAlert.advancedSettingsLabel": "Paramètres avancés",
@@ -14548,7 +17532,7 @@
     "xpack.ml.anomalyUtils.multiBucketImpact.mediumLabel": "moyen",
     "xpack.ml.anomalyUtils.multiBucketImpact.noneLabel": "aucun",
     "xpack.ml.anomalyUtils.severity.criticalLabel": "critique",
-    "xpack.ml.anomalyUtils.severity.majorLabel": "majeure",
+    "xpack.ml.anomalyUtils.severity.majorLabel": "majeur",
     "xpack.ml.anomalyUtils.severity.minorLabel": "mineure",
     "xpack.ml.anomalyUtils.severity.unknownLabel": "inconnue",
     "xpack.ml.anomalyUtils.severity.warningLabel": "avertissement",
@@ -14615,14 +17599,16 @@
     "xpack.ml.calendarsList.table.jobsColumnName": "Tâches",
     "xpack.ml.calendarsList.table.newButtonLabel": "Nouveauté",
     "xpack.ml.checkLicense.licenseHasExpiredMessage": "Votre licence de Machine Learning a expiré.",
-    "xpack.ml.chrome.help.appName": "Machine Learning",
+    "xpack.ml.chrome.help.appName": "Machine Learning",
+    "xpack.ml.common.learnMoreQuestion": "Envie d'en savoir plus ?",
+    "xpack.ml.common.readDocumentationLink": "Lire la documentation",
     "xpack.ml.components.colorRangeLegend.blueColorRangeLabel": "Bleu",
-    "xpack.ml.components.colorRangeLegend.greenRedColorRangeLabel": "Vert - Rouge",
+    "xpack.ml.components.colorRangeLegend.greenRedColorRangeLabel": "Vert – Rouge",
     "xpack.ml.components.colorRangeLegend.influencerScaleLabel": "Échelle personnalisée de l'influenceur",
     "xpack.ml.components.colorRangeLegend.linearScaleLabel": "Linéaire",
     "xpack.ml.components.colorRangeLegend.redColorRangeLabel": "Rouge",
-    "xpack.ml.components.colorRangeLegend.redGreenColorRangeLabel": "Rouge - Vert",
-    "xpack.ml.components.colorRangeLegend.sqrtScaleLabel": "Racine",
+    "xpack.ml.components.colorRangeLegend.redGreenColorRangeLabel": "Rouge – Vert",
+    "xpack.ml.components.colorRangeLegend.sqrtScaleLabel": "Racine carrée",
     "xpack.ml.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "Jaune - Vert – Bleu",
     "xpack.ml.components.jobAnomalyScoreEmbeddable.description": "Affichez les résultats de détection des anomalies dans une chronologie.",
     "xpack.ml.components.jobAnomalyScoreEmbeddable.displayName": "Couloir d'anomalie",
@@ -14634,7 +17620,7 @@
     "xpack.ml.controls.selectInterval.hourLabel": "1 heure",
     "xpack.ml.controls.selectInterval.showAllLabel": "Afficher tout",
     "xpack.ml.controls.selectSeverity.criticalLabel": "critique",
-    "xpack.ml.controls.selectSeverity.majorLabel": "majeure",
+    "xpack.ml.controls.selectSeverity.majorLabel": "majeur",
     "xpack.ml.controls.selectSeverity.minorLabel": "mineure",
     "xpack.ml.controls.selectSeverity.scoreDetailsDescription": "score {value} et supérieur",
     "xpack.ml.controls.selectSeverity.warningLabel": "avertissement",
@@ -14654,6 +17640,7 @@
     "xpack.ml.customUrlEditorList.urlLabel": "URL",
     "xpack.ml.customUrlsEditor.createNewCustomUrlTitle": "Créer une nouvelle URL personnalisée",
     "xpack.ml.customUrlsEditor.dashboardNameLabel": "Nom du tableau de bord",
+    "xpack.ml.customUrlsEditor.dataViewLabel": "Vue de données",
     "xpack.ml.customUrlsEditor.intervalLabel": "Intervalle",
     "xpack.ml.customUrlsEditor.invalidLabelErrorMessage": "Une étiquette unique doit être fournie",
     "xpack.ml.customUrlsEditor.labelLabel": "Étiquette",
@@ -14771,25 +17758,36 @@
     "xpack.ml.dataframe.analytics.create.configDetails.sourceIndex": "Index source",
     "xpack.ml.dataframe.analytics.create.configDetails.standardizationEnabled": "Normalisation activée",
     "xpack.ml.dataframe.analytics.create.configDetails.trainingPercent": "Pourcentage d'entraînement",
+    "xpack.ml.dataframe.analytics.create.createDataViewErrorMessage": "Une erreur est survenue lors de la création de la vue de données Kibana :",
+    "xpack.ml.dataframe.analytics.create.createDataViewLabel": "Créer une vue de données",
+    "xpack.ml.dataframe.analytics.create.createDataViewSuccessMessage": "Vue de données Kibana {dataViewName} créée.",
+    "xpack.ml.dataframe.analytics.create.dataViewExistsError": "Une vue de données avec le titre {title} existe déjà.",
+    "xpack.ml.dataframe.analytics.create.dataViewPermissionWarning": "Vous devez disposer d'une autorisation pour pouvoir créer des vues de données.",
     "xpack.ml.dataframe.analytics.create.dependentVariableClassificationPlaceholder": "Sélectionnez le champ numérique, de catégorie ou booléen sur lequel vous souhaitez effectuer une prédiction.",
     "xpack.ml.dataframe.analytics.create.dependentVariableInputAriaLabel": "Entrez le champ à utiliser comme variable dépendante.",
     "xpack.ml.dataframe.analytics.create.dependentVariableLabel": "Variable dépendante",
     "xpack.ml.dataframe.analytics.create.dependentVariableMaxDistictValuesError": "Non valide. {message}",
     "xpack.ml.dataframe.analytics.create.dependentVariableOptionsFetchError": "Un problème est survenu lors de la récupération des champs. Veuillez actualiser la page et réessayer.",
-    "xpack.ml.dataframe.analytics.create.dependentVariableOptionsNoNumericalFields": "Aucun champ numérique n'a été trouvé pour ce modèle d'indexation.",
+    "xpack.ml.dataframe.analytics.create.dependentVariableOptionsNoNumericalFields": "Aucun champ numérique n'a été trouvé pour cette vue de données.",
     "xpack.ml.dataframe.analytics.create.dependentVariableRegressionPlaceholder": "Sélectionnez le champ numérique sur lequel vous souhaitez effectuer une prédiction.",
     "xpack.ml.dataframe.analytics.create.destinationIndexHelpText": "Un index portant ce nom existe déjà. Notez que l'exécution de cette tâche d'analyse modifiera cet index de destination.",
     "xpack.ml.dataframe.analytics.create.destinationIndexInputAriaLabel": "Choisissez un nom d'index de destination unique.",
     "xpack.ml.dataframe.analytics.create.destinationIndexInvalidError": "Nom d'index de destination non valide.",
     "xpack.ml.dataframe.analytics.create.destinationIndexLabel": "Index de destination",
+    "xpack.ml.dataframe.analytics.create.destinationIndexNotCreatedForDataFrameAnalyticsJob": "Aucun index de destination n’a encore été créé.",
     "xpack.ml.dataframe.analytics.create.DestIndexSameAsIdLabel": "Index de destination identique à l'ID de tâche",
     "xpack.ml.dataframe.analytics.create.detailsDetails.editButtonText": "Modifier",
     "xpack.ml.dataframe.analytics.create.downsampleFactorInputAriaLabel": "Fraction de données utilisée pour calculer les dérivés de la fonction de perte pour l'entraînement de l'arborescence.",
     "xpack.ml.dataframe.analytics.create.downsampleFactorLabel": "Facteur de sous-échantillonnage",
     "xpack.ml.dataframe.analytics.create.downsampleFactorText": "Fraction de données utilisée pour calculer les dérivés de la fonction de perte pour l'entraînement de l'arborescence. Doit être compris entre 0 et 1.",
+    "xpack.ml.dataframe.analytics.create.duplicateDataViewErrorMessage": "Une erreur est survenue lors de la création de la vue de données Kibana :",
+    "xpack.ml.dataframe.analytics.create.duplicateDataViewErrorMessageError": "La vue de données {dataViewName} existe déjà.",
+    "xpack.ml.dataframe.analytics.create.errorCheckingDestinationIndexDataFrameAnalyticsJob": "{errorMessage}",
     "xpack.ml.dataframe.analytics.create.errorCheckingIndexExists": "L'erreur suivante s'est produite lors de l'obtention des noms d'index existants : {error}",
     "xpack.ml.dataframe.analytics.create.errorCheckingJobIdExists": "L'erreur suivante s'est produite lors de la vérification de l'existence de l'ID de la tâche : {error}",
     "xpack.ml.dataframe.analytics.create.errorCreatingDataFrameAnalyticsJob": "Une erreur s'est produite lors de la création de la tâche d'analyse du cadre de données :",
+    "xpack.ml.dataframe.analytics.create.errorGettingDataViewNames": "Une erreur est survenue lors de l'obtention des noms de vues de données existants :",
+    "xpack.ml.dataframe.analytics.create.errorOccurredCheckingDestinationIndexDataFrameAnalyticsJob": "Une erreur est survenue lors de la vérification de l’existence d’un index de destination.",
     "xpack.ml.dataframe.analytics.create.errorStartingDataFrameAnalyticsJob": "Une erreur s'est produite lors du démarrage de la tâche d'analyse du cadre de données :",
     "xpack.ml.dataframe.analytics.create.etaGrowthRatePerTreeInputAriaLabel": "Taux auquel l'eta augmente pour chaque nouvelle arborescence ajoutée à la forêt.",
     "xpack.ml.dataframe.analytics.create.etaGrowthRatePerTreeLabel": "Taux de croissance de l'eta par arborescence",
@@ -14870,10 +17868,13 @@
     "xpack.ml.dataframe.analytics.create.savedSearchLabel": "Recherche enregistrée",
     "xpack.ml.dataframe.analytics.create.scatterplotMatrixLabel": "Matrice de nuages de points",
     "xpack.ml.dataframe.analytics.create.scatterplotMatrixLabelHelpText": "Permet de visualiser les relations entre les paires de champs inclus sélectionnés.",
-    "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutTitle": "Les modèles d'indexation utilisant la recherche inter-clusters ne sont pas pris en charge.",
-    "xpack.ml.dataFrame.analytics.create.searchSelection.notFoundLabel": "Aucun index ou aucune recherche enregistrée correspondant(e) n'a été trouvé(e).",
-    "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.indexPattern": "Modèle d'indexation",
+    "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutBody": "La recherche enregistrée \"{savedSearchTitle}\" utilise la vue de données \"{dataViewName}\".",
+    "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutTitle": "Les vues de données utilisant la recherche inter-clusters ne sont pas prises en charge.",
+    "xpack.ml.dataFrame.analytics.create.searchSelection.errorGettingDataViewTitle": "Erreur lors du chargement de la vue de données utilisée par la recherche enregistrée",
+    "xpack.ml.dataFrame.analytics.create.searchSelection.notFoundLabel": "Aucun recherche enregistrée ni aucun index correspondants n'ont été trouvés.",
+    "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.indexPattern": "Vue de données",
     "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.search": "Recherche enregistrée",
+    "xpack.ml.dataframe.analytics.create.shouldCreateDataViewMessage": "Vous ne pourrez peut-être pas visualiser les résultats de la tâche si aucune vue de données n'est créée pour l'index de destination.",
     "xpack.ml.dataframe.analytics.create.softTreeDepthLimitInputAriaLabel": "Les arbres de décision dépassant cette profondeur sont pénalisés dans les calculs de perte.",
     "xpack.ml.dataframe.analytics.create.softTreeDepthLimitLabel": "Limite de profondeur d'arborescence non stricte",
     "xpack.ml.dataframe.analytics.create.softTreeDepthLimitText": "Les arbres de décision dépassant cette profondeur sont pénalisés dans les calculs de perte. Doit être supérieur ou égal à 0. ",
@@ -14881,9 +17882,9 @@
     "xpack.ml.dataframe.analytics.create.softTreeDepthToleranceLabel": "Tolérance de profondeur d'arborescence non stricte",
     "xpack.ml.dataframe.analytics.create.softTreeDepthToleranceText": "Spécifie la rapidité avec laquelle la perte augmente lorsque les profondeurs d'arborescence dépassent les limites non strictes. Plus la valeur est petite, plus la perte augmente rapidement. Doit être supérieur ou égal à 0,01. ",
     "xpack.ml.dataframe.analytics.create.sourceIndexFieldsCheckError": "Un problème est survenu lors de la vérification des champs pris en charge pour le type de tâche. Veuillez actualiser la page et réessayer.",
-    "xpack.ml.dataframe.analytics.create.sourceObjectClassificationHelpText": "Le modèle d'indexation ne contient aucun champ pris en charge. Les tâches de classification requièrent des champs de catégorie, numériques ou booléens.",
-    "xpack.ml.dataframe.analytics.create.sourceObjectHelpText": "Ce modèle d'indexation ne contient aucun de type numérique. La tâche d'analyse ne pourra peut-être trouver aucune aberration.",
-    "xpack.ml.dataframe.analytics.create.sourceObjectRegressionHelpText": "Le modèle d'indexation ne contient aucun champ pris en charge. Les tâches de régression requièrent des champs numériques.",
+    "xpack.ml.dataframe.analytics.create.sourceObjectClassificationHelpText": "Cette vue de données ne contient aucun champ pris en charge. Les tâches de classification requièrent des champs de catégorie, numériques ou booléens.",
+    "xpack.ml.dataframe.analytics.create.sourceObjectHelpText": "Cette vue de données ne contient aucun champ de type numérique. La tâche d'analyse ne pourra peut-être trouver aucune aberration.",
+    "xpack.ml.dataframe.analytics.create.sourceObjectRegressionHelpText": "Cette vue de données ne contient aucun champ pris en charge. Les tâches de régression requièrent des champs numériques.",
     "xpack.ml.dataframe.analytics.create.sourceQueryLabel": "Requête",
     "xpack.ml.dataframe.analytics.create.standardizationEnabledFalseValue": "Faux",
     "xpack.ml.dataframe.analytics.create.standardizationEnabledHelpText": "Si la valeur est Vrai, l'opération suivante est effectuée sur les colonnes avant de calculer les scores d'aberrations : (x_i - mean(x_i)) / sd(x_i).",
@@ -14895,6 +17896,7 @@
     "xpack.ml.dataframe.analytics.create.switchToJsonEditorSwitch": "Basculer vers l'éditeur json",
     "xpack.ml.dataframe.analytics.create.trainingPercentHelpText": "Définit le pourcentage de documents éligibles qui seront utilisés pour l'entraînement.",
     "xpack.ml.dataframe.analytics.create.trainingPercentLabel": "Pourcentage d'entraînement",
+    "xpack.ml.dataframe.analytics.create.unableToCreateDataViewForDataFrameAnalyticsJob": "Impossible de créer la vue de données.",
     "xpack.ml.dataframe.analytics.create.unableToFetchExplainDataMessage": "Une erreur s'est produite lors de la récupération des données des champs d'analyse.",
     "xpack.ml.dataframe.analytics.create.unsupportedFieldsError": "Non valide. {message}",
     "xpack.ml.dataframe.analytics.create.useEstimatedMmlLabel": "Utiliser la limite de mémoire du modèle estimée",
@@ -14925,7 +17927,11 @@
     "xpack.ml.dataframe.analytics.creation.createStepTitle": "Créer",
     "xpack.ml.dataframe.analytics.creation.detailsStepTitle": "Détails de la tâche",
     "xpack.ml.dataframe.analytics.creation.validationStepTitle": "Validation",
+    "xpack.ml.dataframe.analytics.creationPageSourceIndexTitle": "Vue de données source : {dataViewTitle}",
     "xpack.ml.dataframe.analytics.creationPageTitle": "Créer une tâche",
+    "xpack.ml.dataframe.analytics.dataViewPromptLink": "{linkToDataViewManagement} for {destIndex}.",
+    "xpack.ml.dataframe.analytics.dataViewPromptLinkText": "Créer une vue de données",
+    "xpack.ml.dataframe.analytics.dataViewPromptMessage": "Il n’existe aucune vue de données pour l’index {destIndex}. ",
     "xpack.ml.dataframe.analytics.decisionPathFeatureBaselineTitle": "référence de base",
     "xpack.ml.dataframe.analytics.decisionPathFeatureOtherTitle": "autre",
     "xpack.ml.dataframe.analytics.errorCallout.evaluateErrorTitle": "Une erreur s'est produite lors du chargement des données.",
@@ -14991,6 +17997,7 @@
     "xpack.ml.dataframe.analytics.regressionExploration.trainingDocsCount": "{docsCount, plural, one {# document évalué} other {# documents évalués}}",
     "xpack.ml.dataframe.analytics.regressionExploration.trainingErrorTitle": "Erreur d'entraînement",
     "xpack.ml.dataframe.analytics.regressionExploration.trainingFilterText": ". Filtrage pour les données de test.",
+    "xpack.ml.dataframe.analytics.results.dataViewMissingErrorMessage": "Pour visualiser cette page, une vue de données Kibana est nécessaire pour l'index de destination ou l'index source de cette tâche d'analyse.",
     "xpack.ml.dataframe.analytics.rocChartSpec.xAxisTitle": "Taux de faux positifs",
     "xpack.ml.dataframe.analytics.rocChartSpec.yAxisTitle": "Taux de vrais positifs (également appelé \"rappel\")",
     "xpack.ml.dataframe.analytics.rocCurveAuc": "À partir de ce tracé, la valeur AUC (Area Under the Curve, zone sous la courbe) peut être calculée ; il s'agit d'un nombre compris entre 0 et 1. Plus la valeur s'approche de 1, meilleures sont les performances de l'algorithme.",
@@ -14998,6 +18005,8 @@
     "xpack.ml.dataframe.analytics.rocCurveCompute": "Elle compare le taux de vrais positifs (axe Y) pour une classe spécifique avec le taux de faux positifs (axe X) aux différents niveaux de seuil pour créer la courbe.",
     "xpack.ml.dataframe.analytics.rocCurvePopoverTitle": "Courbe ROC (Receiver operating characteristic, caractéristique de fonctionnement du récepteur)",
     "xpack.ml.dataframe.analytics.validation.validationFetchErrorMessage": "Erreur lors de la validation de la tâche",
+    "xpack.ml.dataframe.analyticsExploration.title": "Explorer les résultats",
+    "xpack.ml.dataframe.analyticsExploration.titleWithId": "Explorer les résultats pour l’ID de tâche {id}",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.expandedRowJsonPane": "JSON de la configuration de l'analyse du cadre de données",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsMessagesLabel": "Messages liés à la tâche",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsStatsLabel": "Statistiques de la tâche",
@@ -15010,12 +18019,15 @@
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsErrorMessage": "Une erreur s'est produite lors de la suppression de la tâche d'analyse du cadre de données {analyticsId}",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsPrivilegeErrorMessage": "L'utilisateur ne dispose pas d'autorisation pour supprimer l'index {indexName} : {error}",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage": "Requête de suppression de la tâche d'analyse du cadre de données {analyticsId} reconnue.",
+    "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithDataViewErrorMessage": "Une erreur s'est produite lors de la suppression de la vue de données {destinationIndex} : {error}",
+    "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithDataViewSuccessMessage": "Requête de suppression de la vue de données {destinationIndex} reconnue.",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexErrorMessage": "Une erreur s'est produite lors de la suppression de l'index de destination {destinationIndex}",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexSuccessMessage": "Requête de suppression de l'index de destination {destinationIndex} reconnue.",
     "xpack.ml.dataframe.analyticsList.deleteDestinationIndexTitle": "Supprimer l'index de destination {indexName}",
     "xpack.ml.dataframe.analyticsList.deleteModalCancelButton": "Annuler",
     "xpack.ml.dataframe.analyticsList.deleteModalDeleteButton": "Supprimer",
     "xpack.ml.dataframe.analyticsList.deleteModalTitle": "Supprimer {analyticsId} ?",
+    "xpack.ml.dataframe.analyticsList.deleteTargetDataViewTitle": "Supprimer la vue de données {dataView}",
     "xpack.ml.dataframe.analyticsList.description": "Description",
     "xpack.ml.dataframe.analyticsList.destinationIndex": "Index de destination",
     "xpack.ml.dataframe.analyticsList.editActionNameText": "Modifier",
@@ -15041,6 +18053,7 @@
     "xpack.ml.dataFrame.analyticsList.emptyPromptButtonText": "Créer une tâche",
     "xpack.ml.dataFrame.analyticsList.emptyPromptTitle": "Créer votre première tâche d'analyse du cadre de données",
     "xpack.ml.dataFrame.analyticsList.errorPromptTitle": "Une erreur s'est produite lors de l'obtention de la liste d'analyse du cadre de données.",
+    "xpack.ml.dataframe.analyticsList.errorWithCheckingIfDataViewExistsNotificationErrorMessage": "Une erreur s’est produite lors de la vérification de l’existence de la vue de données {dataView} : {error}",
     "xpack.ml.dataframe.analyticsList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "Une erreur s'est produite lors de la vérification de la possibilité pour un utilisateur de supprimer {destinationIndex} : {error}",
     "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.analysisStats": "Statistiques d'analyse",
     "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.phase": "Phase",
@@ -15048,14 +18061,16 @@
     "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.state": "État",
     "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.stats": "Statistiques",
     "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettingsLabel": "Détails de la tâche",
+    "xpack.ml.dataframe.analyticsList.fetchSourceDataViewForCloneErrorMessage": "Une erreur s’est produite lors de la vérification de l’existence de la vue de données {dataView} : {error}",
     "xpack.ml.dataframe.analyticsList.forceStopModalBody": "{analyticsId} est en état d'échec. Vous devez arrêter la tâche et corriger la défaillance.",
     "xpack.ml.dataframe.analyticsList.forceStopModalCancelButton": "Annuler",
-    "xpack.ml.dataframe.analyticsList.forceStopModalStartButton": "Forcer l'arrêt",
+    "xpack.ml.dataframe.analyticsList.forceStopModalStartButton": "Arrêt",
     "xpack.ml.dataframe.analyticsList.forceStopModalTitle": "Forcer cette tâche à s'arrêter ?",
     "xpack.ml.dataframe.analyticsList.id": "ID",
     "xpack.ml.dataframe.analyticsList.mapActionDisabledTooltipContent": "Type d'analyse inconnu.",
     "xpack.ml.dataframe.analyticsList.mapActionName": "Mapping",
     "xpack.ml.dataframe.analyticsList.memoryStatus": "Statut de la mémoire",
+    "xpack.ml.dataframe.analyticsList.noSourceDataViewForClone": "Impossible de cloner la tâche d'analyse. Il n’existe aucune vue de données pour l’index {dataView}.",
     "xpack.ml.dataframe.analyticsList.progress": "Progression",
     "xpack.ml.dataframe.analyticsList.progressOfPhase": "Progression de la phase {currentPhase} : {progress}%",
     "xpack.ml.dataframe.analyticsList.refreshButtonLabel": "Actualiser",
@@ -15073,11 +18088,11 @@
     "xpack.ml.dataframe.analyticsList.startModalTitle": "Démarrer {analyticsId} ?",
     "xpack.ml.dataframe.analyticsList.status": "Statut",
     "xpack.ml.dataframe.analyticsList.statusFilter": "Statut",
-    "xpack.ml.dataframe.analyticsList.stopActionNameText": "Arrêter",
+    "xpack.ml.dataframe.analyticsList.stopActionNameText": "Arrêt",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsErrorMessage": "Une erreur s'est produite lors de l'arrêt de l'analyse du cadre de données {analyticsId} : {error}",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsSuccessMessage": "Requête d'arrêt de l'analyse du cadre de données {analyticsId} reconnue.",
     "xpack.ml.dataframe.analyticsList.tableActionLabel": "Actions",
-    "xpack.ml.dataframe.analyticsList.title": "Analyse du cadre de données",
+    "xpack.ml.dataframe.analyticsList.title": "Tâches d’analyse du cadre de données",
     "xpack.ml.dataframe.analyticsList.type": "Type",
     "xpack.ml.dataframe.analyticsList.typeFilter": "Type",
     "xpack.ml.dataframe.analyticsList.viewActionJobFailedToolTipContent": "L'analyse du cadre de données a échoué. Aucune page de résultats n'est disponible.",
@@ -15085,10 +18100,12 @@
     "xpack.ml.dataframe.analyticsList.viewActionJobNotStartedToolTipContent": "La tâche d'analyse du cadre de données n'a pas démarré. Aucune page de résultats n'est disponible.",
     "xpack.ml.dataframe.analyticsList.viewActionName": "Afficher",
     "xpack.ml.dataframe.analyticsList.viewActionUnknownJobTypeToolTipContent": "Aucune page de résultats n'est disponible pour ce type de tâche d'analyse du cadre de données.",
+    "xpack.ml.dataframe.analyticsMap.analyticsIdTitle": "Mapping pour l’ID de tâche {jobId}",
     "xpack.ml.dataframe.analyticsMap.emptyResponseMessage": "Aucune tâche d'analyse associée n'a été trouvée pour {id}.",
     "xpack.ml.dataframe.analyticsMap.fetchDataErrorMessage": "Impossible de récupérer certaines données. Une erreur s'est produite : {error}",
     "xpack.ml.dataframe.analyticsMap.flyout.cloneJobButton": "Cloner la tâche",
     "xpack.ml.dataframe.analyticsMap.flyout.createJobButton": "Créer une tâche à partir de cet index",
+    "xpack.ml.dataframe.analyticsMap.flyout.dataViewMissingMessage": "Pour pouvoir créer une tâche à partir de cet index, vous devez d’abord créer une vue de données pour {indexTitle}.",
     "xpack.ml.dataframe.analyticsMap.flyout.deleteJobButton": "Supprimer la tâche",
     "xpack.ml.dataframe.analyticsMap.flyout.fetchRelatedNodesButton": "Récupérer les nœuds associés",
     "xpack.ml.dataframe.analyticsMap.flyout.nodeActionsButton": "Actions sur les nœuds",
@@ -15099,12 +18116,24 @@
     "xpack.ml.dataframe.analyticsMap.legend.showJobTypesAriaLabel": "Afficher les types de tâche",
     "xpack.ml.dataframe.analyticsMap.legend.trainedModelLabel": "modèle entraîné",
     "xpack.ml.dataframe.analyticsMap.modelIdTitle": "Mapping pour l'ID de modèle entraîné {modelId}",
+    "xpack.ml.dataframe.analyticsMap.noJobSelectedLabel": "Aucun ID d’analyse sélectionné",
+    "xpack.ml.dataframe.analyticsMap.title": "Mapping pour l’analyse",
+    "xpack.ml.dataframe.analyticsSourceSelection.title": "Nouvelle tâche d’analyse / Sélectionner une vue de données source",
     "xpack.ml.dataframe.stepCreateForm.createDataFrameAnalyticsSuccessMessage": "Requête de création de l'analyse du cadre de données {jobId} reconnue.",
     "xpack.ml.dataframe.stepDetailsForm.destinationIndexInvalidErrorLink": "Découvrez les limitations relatives aux noms d'index.",
+    "xpack.ml.dataFrameAnalytics.analyticsMap.docTitle": "Mapping d'analyse",
+    "xpack.ml.dataFrameAnalytics.createJob.docTitle": "Créer une tâche",
+    "xpack.ml.dataFrameAnalytics.exploration.docTitle": "Explorateur de résultats",
+    "xpack.ml.dataFrameAnalytics.jobs.docTitle": "Tâches d’analyse du cadre de données",
+    "xpack.ml.dataFrameAnalytics.sourceSelection.docTitle": "Sélection de la source",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.analyticsMapLabel": "Mapping d'analyse",
-    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameExplorationLabel": "Exploration",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameCreationLabel": "Créer une tâche",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameExplorationLabel": "Explorateur de résultats",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameSourceSelectionLabel": "Sélection de la source",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataViewLabel": "Vue de données",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.jobsManagementLabel": "Tâches",
     "xpack.ml.dataFrameAnalyticsLabel": "Analyse du cadre de données",
-    "xpack.ml.dataGrid.CcsWarningCalloutBody": "Un problème est survenu lors de la récupération des données pour le modèle d'indexation. L'aperçu de la source combiné avec la recherche inter-clusters est uniquement pris en charge pour les versions 7.10 et supérieures. Toutefois, vous pouvez toujours configurer et créer la transformation.",
+    "xpack.ml.dataGrid.CcsWarningCalloutBody": "Un problème est survenu lors de la récupération des données pour la vue de données. L'aperçu de la source combiné avec la recherche inter-clusters est uniquement pris en charge pour les versions 7.10 et supérieures. Toutefois, vous pouvez toujours configurer et créer la transformation.",
     "xpack.ml.dataGrid.CcsWarningCalloutTitle": "La recherche inter-clusters n'a renvoyé aucune donnée de champ.",
     "xpack.ml.dataGrid.columnChart.ErrorMessageToast": "Une erreur s'est produite lors de la récupération des données de l'histogramme : {error}",
     "xpack.ml.dataGrid.dataGridNoDataCalloutTitle": "Aperçu de l'index non disponible",
@@ -15116,20 +18145,30 @@
     "xpack.ml.dataGrid.invalidSortingColumnError": "La colonne \"{columnId}\" ne peut pas être utilisée pour le tri.",
     "xpack.ml.dataGridChart.histogramNotAvailable": "Graphique non pris en charge.",
     "xpack.ml.dataGridChart.notEnoughData": "0 document contient le champ.",
-    "xpack.ml.dataGridChart.singleCategoryLegend": "{cardinality, plural, one {# catégorie} other {# catégories}}",
+    "xpack.ml.dataGridChart.singleCategoryLegend": "{cardinality, plural, one {# catégorie} other {# catégories}}",
     "xpack.ml.dataGridChart.topCategoriesLegend": "Premières {maxChartColumns} des catégories {cardinality}",
+    "xpack.ml.dataViewNotBasedOnTimeSeriesNotificationDescription": "La détection des anomalies ne s'exécute que sur des index temporels",
+    "xpack.ml.dataViewNotBasedOnTimeSeriesNotificationTitle": "La vue de données {dataViewName} n’est pas basée sur une série temporelle.",
+    "xpack.ml.dataVisualizer.dataView.docTitle": "Index Data Visualizer (Visualiseur de données pour les index)",
+    "xpack.ml.dataVisualizer.docTitle": "Data Visualizer (Visualiseur de données)",
+    "xpack.ml.dataVisualizer.file.docTitle": "File Data Visualizer (Visualiseur de données pour les fichiers)",
     "xpack.ml.dataVisualizer.fileBasedLabel": "Fichier",
+    "xpack.ml.dataVisualizer.pageHeader": "Data Visualizer (Visualiseur de données)",
     "xpack.ml.datavisualizer.selector.dataVisualizerDescription": "L'outil de Machine Learning Data Visualizer (Visualiseur de données) vous aide à comprendre vos données en analysant les indicateurs et les champs dans un fichier log ou un index Elasticsearch existant.",
     "xpack.ml.datavisualizer.selector.dataVisualizerTitle": "File Data Visualizer (Visualiseur de données pour les fichiers)",
     "xpack.ml.datavisualizer.selector.importDataDescription": "Importez les données à partir d'un fichier log. Vous pouvez charger des fichiers d'une taille allant jusqu'à {maxFileSize}.",
-    "xpack.ml.datavisualizer.selector.importDataTitle": "Importer des données",
-    "xpack.ml.datavisualizer.selector.startTrialButtonLabel": "Démarrer l'essai",
+    "xpack.ml.datavisualizer.selector.importDataTitle": "Visualiser les données à partir d'un fichier",
+    "xpack.ml.datavisualizer.selector.selectDataViewButtonLabel": "Sélectionner la vue de données",
+    "xpack.ml.datavisualizer.selector.selectDataViewTitle": "Visualiser les données à partir d'une vue de données",
+    "xpack.ml.datavisualizer.selector.startTrialButtonLabel": "Commencer l'essai",
     "xpack.ml.datavisualizer.selector.startTrialTitle": "Démarrer l'essai",
     "xpack.ml.datavisualizer.selector.uploadFileButtonLabel": "Sélectionner un fichier",
     "xpack.ml.datavisualizer.startTrial.fullMLFeaturesDescription": "Pour profiter des fonctionnalités complètes de Machine Learning offertes par un {subscriptionsLink}, démarrez un essai de 30 jours.",
     "xpack.ml.datavisualizer.startTrial.subscriptionsLinkText": "Abonnement Platinum ou Enterprise",
     "xpack.ml.datavisualizerBreadcrumbLabel": "File Data Visualizer (Visualiseur de données pour les fichiers)",
-    "xpack.ml.dataVisualizerPageLabel": "File Data Visualizer (Visualiseur de données pour les fichiers)",
+    "xpack.ml.dataVisualizerPageLabel": "Data Visualizer (Visualiseur de données)",
+    "xpack.ml.datePicker.shortRefreshIntervalTimeFilterWarningMessage": "L’intervalle d’actualisation défini dans les paramètres avancés est plus court que le minimum pris en charge par Machine Learning.",
+    "xpack.ml.datePicker.shortRefreshIntervalURLWarningMessage": "L’intervalle d’actualisation défini dans l’URL est plus court que le minimum pris en charge par Machine Learning.",
     "xpack.ml.deepLink.anomalyDetection": "Détection des anomalies",
     "xpack.ml.deepLink.calendarSettings": "Calendriers",
     "xpack.ml.deepLink.dataFrameAnalytics": "Analyse du cadre de données",
@@ -15137,9 +18176,29 @@
     "xpack.ml.deepLink.fileUpload": "Chargement du fichier",
     "xpack.ml.deepLink.filterListsSettings": "Listes de filtres",
     "xpack.ml.deepLink.indexDataVisualizer": "Index Data Visualizer (Visualiseur de données pour les index)",
+    "xpack.ml.deepLink.modelManagement": "Gestion des modèles",
+    "xpack.ml.deepLink.nodesOverview": "Nœuds",
     "xpack.ml.deepLink.overview": "Aperçu",
     "xpack.ml.deepLink.settings": "Paramètres",
     "xpack.ml.deepLink.trainedModels": "Modèles entraînés",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanDelete.job": "Continuer pour supprimer {length, plural, one {# tâche} other {# tâches}}",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanDelete.model": "Continuer pour supprimer {length, plural, one {# modèle} other {# modèles}}",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanUnTagConfirm": "Retirer de l'espace en cours",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextClose": "Fermer",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextNoAction": "Fermer",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextCanDelete": "{ids} ne peuvent pas être supprimés.",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextCanUnTag": "{ids} ne peuvent pas être supprimés mais ils peuvent être retirés de l'espace en cours.",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose": "{ids} ne peuvent être ni supprimés ni retirés de l'espace en cours. ",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose.job": "Cette tâche est affectée à l'espace * et vous n'avez pas accès à tous les espaces.",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose.model": "Ce modèle est affecté à l'espace * et vous n'avez pas accès à tous les espaces.",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction": "{ids} ont des autorisations d'espaces différentes. ",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction.job": "Lorsque vous supprimez plusieurs tâches, elles doivent avoir les mêmes autorisations. Désélectionnez les tâches et essayez de supprimer chaque tâche individuellement.",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction.model": "Lorsque vous supprimez plusieurs modèles, ceux-ci doivent présenter les mêmes autorisations. Désélectionnez les modèles, puis essayez de les supprimer individuellement.",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTitle": "Vérification des autorisations d'espaces",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.shouldUnTagLabel.job": "Retirer la tâche de l'espace en cours",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.shouldUnTagLabel.model": "Retirer le modèle de l’espace en cours",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.unTagErrorTitle": "Erreur lors de la mise à jour de {id}",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.unTagSuccessTitle": "Mise à jour réussie de {id}",
     "xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorMessage": "Impossible de charger les messages",
     "xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorToastMessageTitle": "Erreur lors du chargement des messages liés à la tâche",
     "xpack.ml.editModelSnapshotFlyout.calloutText": "Il s'agit du snapshot actuel qui est en cours d'utilisation par {jobId} ; il ne peut donc pas être supprimé.",
@@ -15163,7 +18222,7 @@
     "xpack.ml.explorer.addToDashboard.anomalyCharts.maxSeriesToPlotLabel": "Nombre maximal de séries à tracer",
     "xpack.ml.explorer.addToDashboard.cancelButtonLabel": "Annuler",
     "xpack.ml.explorer.addToDashboard.selectDashboardsLabel": "Sélectionner les tableaux de bord :",
-    "xpack.ml.explorer.addToDashboard.swimlanes.dashboardsTitle": "Ajouter des couloirs aux tableaux de bord",
+    "xpack.ml.explorer.addToDashboard.swimlanes.dashboardsTitle": "Ajouter un couloir à un tableau de bord",
     "xpack.ml.explorer.addToDashboard.swimlanes.selectSwimlanesLabel": "Sélectionner la vue de couloir :",
     "xpack.ml.explorer.addToDashboardLabel": "Ajouter au tableau de bord",
     "xpack.ml.explorer.annotationsErrorCallOutTitle": "Une erreur s'est produite lors du chargement des annotations :",
@@ -15193,7 +18252,9 @@
     "xpack.ml.explorer.charts.tooManyBucketsDescription": "Cette sélection contient trop de groupes à afficher. Choisissez une période plus courte pour la vue ou limitez la sélection dans la chronologie.",
     "xpack.ml.explorer.charts.viewLabel": "Afficher",
     "xpack.ml.explorer.clearSelectionLabel": "Effacer la sélection",
+    "xpack.ml.explorer.dashboardsTable.actionsHeader": "Actions",
     "xpack.ml.explorer.dashboardsTable.descriptionColumnHeader": "Description",
+    "xpack.ml.explorer.dashboardsTable.editActionName": "Ajouter au tableau de bord",
     "xpack.ml.explorer.dashboardsTable.titleColumnHeader": "Titre",
     "xpack.ml.explorer.distributionChart.anomalyScoreLabel": "score d'anomalies",
     "xpack.ml.explorer.distributionChart.entityLabel": "entité",
@@ -15213,6 +18274,7 @@
     "xpack.ml.explorer.noConfiguredInfluencersTooltip": "La liste Principaux influenceurs est masquée, car aucun influenceur n'a été configuré pour les tâches sélectionnées.",
     "xpack.ml.explorer.noInfluencersFoundTitle": "Aucun influenceur {viewBySwimlaneFieldName} n'a été trouvé",
     "xpack.ml.explorer.noInfluencersFoundTitleFilterMessage": "Aucun influenceur {viewBySwimlaneFieldName} n'a été trouvé pour le filtre spécifié",
+    "xpack.ml.explorer.noJobSelectedLabel": "Aucune tâche sélectionnée",
     "xpack.ml.explorer.noMatchingAnomaliesFoundTitle": "Aucune anomalie correspondante trouvée",
     "xpack.ml.explorer.noResultForSelectedJobsMessage": "Aucun résultat trouvé pour {jobsCount, plural, one {la tâche sélectionnée} other {les tâches sélectionnées}}",
     "xpack.ml.explorer.noResultsFoundLabel": "Aucun résultat trouvé",
@@ -15268,13 +18330,20 @@
     "xpack.ml.formatters.metricChangeDescription.unusuallyLowDescription": "Inhabituellement bas",
     "xpack.ml.formatters.metricChangeDescription.unusualValuesDescription": "Valeurs inhabituelles",
     "xpack.ml.fullTimeRangeSelector.errorSettingTimeRangeNotification": "Une erreur s'est produite lors de la définition de la plage temporelle.",
+    "xpack.ml.fullTimeRangeSelector.useFullDataButtonLabel": "Utiliser toutes les données",
+    "xpack.ml.fullTimeRangeSelector.useFullDataExcludingFrozenButtonTooltip": "Utilisez toute la plage de données à l’exception du niveau de données frozen.",
+    "xpack.ml.fullTimeRangeSelector.useFullDataExcludingFrozenMenuLabel": "Exclure le niveau de données frozen",
+    "xpack.ml.fullTimeRangeSelector.useFullDataIncludingFrozenButtonTooltip": "Utilisez toute la plage de données, y compris le niveau de données frozen, qui peut inclure des résultats de recherche plus lents.",
+    "xpack.ml.fullTimeRangeSelector.useFullDataIncludingFrozenMenuLabel": "Inclure le niveau de données frozen",
     "xpack.ml.helpPopover.ariaLabel": "Aide",
     "xpack.ml.importExport.exportButton": "Exporter les tâches",
+    "xpack.ml.importExport.exportFlyout.adDeselectAllButton": "Tout désélectionner",
     "xpack.ml.importExport.exportFlyout.adJobsError": "Impossible de charger les tâches de détection des anomalies",
     "xpack.ml.importExport.exportFlyout.adSelectAllButton": "Tout sélectionner",
     "xpack.ml.importExport.exportFlyout.adTab": "Détection des anomalies",
     "xpack.ml.importExport.exportFlyout.calendarsError": "Impossible de charger les calendriers",
     "xpack.ml.importExport.exportFlyout.closeButton": "Fermer",
+    "xpack.ml.importExport.exportFlyout.dfaDeselectAllButton": "Tout désélectionner",
     "xpack.ml.importExport.exportFlyout.dfaJobsError": "Impossible de charger les tâches d'analyse du cadre de données",
     "xpack.ml.importExport.exportFlyout.dfaSelectAllButton": "Tout sélectionner",
     "xpack.ml.importExport.exportFlyout.dfaTab": "Analyse",
@@ -15325,12 +18394,15 @@
     "xpack.ml.indexDatavisualizer.actionsPanel.dataframeDescription": "Créez des analyses de détection des aberrations, de régression ou de classification.",
     "xpack.ml.indexDatavisualizer.actionsPanel.dataframeTitle": "Analyse du cadre de données",
     "xpack.ml.inference.modelsList.analyticsMapActionLabel": "Mapping d'analyse",
+    "xpack.ml.inference.modelsList.startModelDeploymentActionLabel": "Démarrer le déploiement",
+    "xpack.ml.inference.modelsList.stopModelDeploymentActionLabel": "Arrêter le déploiement",
     "xpack.ml.influencerResultType.description": "Quelles sont les entités les plus inhabituelles dans une plage temporelle ?",
     "xpack.ml.influencerResultType.title": "Influenceur",
     "xpack.ml.influencersList.maxAnomalyScoreTooltipDescription": "Score maximal d'anomalie : {maxScoreLabel}",
     "xpack.ml.influencersList.noInfluencersFoundTitle": "Aucun influenceur n'a été trouvé",
     "xpack.ml.influencersList.totalAnomalyScoreTooltipDescription": "Score total d'anomalie : {totalScoreLabel}",
     "xpack.ml.interimResultsControl.label": "Inclure les résultats temporaires",
+    "xpack.ml.invalidRuntimeFieldMessage": "Champ d'exécution non valide",
     "xpack.ml.itemsGrid.itemsCountLabel": "Éléments {pageSize}",
     "xpack.ml.itemsGrid.itemsPerPageButtonLabel": "Éléments par page : {itemsPerPage}",
     "xpack.ml.itemsGrid.noItemsAddedTitle": "Aucun élément n'a été ajouté",
@@ -15351,11 +18423,20 @@
     "xpack.ml.jobMessages.toggleInChartTooltipText": "Basculer dans le graphique",
     "xpack.ml.jobsAwaitingNodeWarning.noMLNodesAvailableDescription": "Il y {jobCount, plural, other {a}} {jobCount, plural, one {# tâche} other {# tâches}} en attente des nœuds de Machine Learning pour démarrer.",
     "xpack.ml.jobsAwaitingNodeWarning.title": "Nœud de Machine Learning en attente",
+    "xpack.ml.jobsAwaitingNodeWarningShared.isCloud": "Les déploiements Elastic Cloud proposent la mise à l’échelle automatique afin d’ajouter davantage de capacité ML. Cela prend entre 5 et 20 minutes. ",
+    "xpack.ml.jobsAwaitingNodeWarningShared.isCloud.link": "Vous pouvez suivre la progression via la {link}.",
+    "xpack.ml.jobsAwaitingNodeWarningShared.linkToCloud.learnMore": "En savoir plus.",
+    "xpack.ml.jobsAwaitingNodeWarningShared.linkToCloud.linkText": "console administrateur Elastic Cloud",
+    "xpack.ml.jobsAwaitingNodeWarningShared.noMLNodesAvailableDescription": "Il y {jobCount, plural, other {a}} {jobCount, plural, one {# tâche} other {# tâches}} en attente des nœuds de Machine Learning pour démarrer.",
+    "xpack.ml.jobsAwaitingNodeWarningShared.notCloud": "Les déploiements Elastic Cloud sont les seuls à proposer la mise à l’échelle automatique. Vous devez ajouter des nœuds Machine Learning. {link}",
+    "xpack.ml.jobsAwaitingNodeWarningShared.title": "Nœud de Machine Learning en attente",
     "xpack.ml.jobsBreadcrumbs.advancedConfigurationLabel": "Configuration avancée",
     "xpack.ml.jobsBreadcrumbs.categorizationLabel": "Catégorisation",
+    "xpack.ml.jobsBreadcrumbs.createJobLabel": "Créer une tâche",
     "xpack.ml.jobsBreadcrumbs.multiMetricLabel": "À plusieurs indicateurs",
     "xpack.ml.jobsBreadcrumbs.populationLabel": "Population",
     "xpack.ml.jobsBreadcrumbs.rareLabel": "Rare",
+    "xpack.ml.jobsBreadcrumbs.selectDateViewLabel": "Vue de données",
     "xpack.ml.jobsBreadcrumbs.selectIndexOrSearchLabelRecognize": "Index reconnu",
     "xpack.ml.jobsBreadcrumbs.selectJobType": "Créer une tâche",
     "xpack.ml.jobsBreadcrumbs.singleMetricLabel": "Indicateur unique",
@@ -15383,6 +18464,7 @@
     "xpack.ml.jobSelector.jobsTab": "Tâches",
     "xpack.ml.jobSelector.jobTimeRangeLabel": "{fromString} vers {toString}",
     "xpack.ml.jobSelector.noJobsFoundTitle": "Aucune tâche de détection des anomalies n'a été trouvée",
+    "xpack.ml.jobSelector.noJobsSelectedLabel": "Aucune tâche sélectionnée",
     "xpack.ml.jobSelector.noResultsForJobLabel": "Aucun résultat",
     "xpack.ml.jobSelector.selectAllGroupLabel": "Tout sélectionner",
     "xpack.ml.jobSelector.selectAllOptionLabel": "*",
@@ -15406,12 +18488,12 @@
     "xpack.ml.jobsList.alertingRules.tooltipContent": "La tâche a {rulesCount} {rulesCount, plural, one { règle d'alerte associée} other { règles d'alerte associées}}",
     "xpack.ml.jobsList.analyticsSpacesLabel": "Espaces",
     "xpack.ml.jobsList.auditMessageColumn.screenReaderDescription": "Cette colonne affiche des icônes lorsque des erreurs ou des avertissements pour la tâche ont été signalé(e)s au cours des dernières 24 heures",
-    "xpack.ml.jobsList.breadcrumb": "Tâches",
     "xpack.ml.jobsList.cannotSelectRowForJobMessage": "Impossible de sélectionner l'ID de tâche {jobId}",
     "xpack.ml.jobsList.cloneJobErrorMessage": "Impossible de cloner {jobId}. La tâche est introuvable",
     "xpack.ml.jobsList.closeActionStatusText": "fermer",
     "xpack.ml.jobsList.closedActionStatusText": "fermé",
     "xpack.ml.jobsList.closeJobErrorMessage": "Impossible de fermer les tâches",
+    "xpack.ml.jobsList.closeJobsModal.closeManagedDatafeedsDescription": "fermeture",
     "xpack.ml.jobsList.collapseJobDetailsAriaLabel": "Masquer les détails pour {itemId}",
     "xpack.ml.jobsList.createNewJobButtonLabel": "Créer une tâche",
     "xpack.ml.jobsList.datafeedChart.annotationLineSeriesId": "Résultat de la ligne d'annotations",
@@ -15446,8 +18528,11 @@
     "xpack.ml.jobsList.datafeedStateLabel": "État du flux de données",
     "xpack.ml.jobsList.deleteActionStatusText": "supprimer",
     "xpack.ml.jobsList.deletedActionStatusText": "supprimé",
+    "xpack.ml.jobsList.deleteJobCheckModal.removeAction": "retrait",
+    "xpack.ml.jobsList.deleteJobCheckModal.removeOrDeleteAction": "retrait ou suppression",
     "xpack.ml.jobsList.deleteJobErrorMessage": "Impossible de supprimer les tâches",
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "Annuler",
+    "xpack.ml.jobsList.deleteJobModal.deleteAction": "suppression",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "Supprimer",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "Supprimer {jobsCount, plural, one {{jobId}} other {# tâches}} ?",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "La suppression {jobsCount, plural, one {d’une tâche} other {de plusieurs tâches}} peut prendre beaucoup de temps. {jobsCount, plural, one {Elle sera supprimée en arrière-plan et pourra} other {Elles seront supprimées en arrière-plan et pourront}} ne pas disparaître instantanément de la liste de tâches.",
@@ -15462,6 +18547,7 @@
     "xpack.ml.jobsList.editJobFlyout.customUrls.buildUrlErrorNotificationMessage": "Une erreur s'est produite lors de la création de l'URL personnalisée pour effectuer des tests à partir des paramètres fournis",
     "xpack.ml.jobsList.editJobFlyout.customUrls.closeEditorAriaLabel": "Fermer l'éditeur d'URL personnalisé",
     "xpack.ml.jobsList.editJobFlyout.customUrls.getTestUrlErrorNotificationMessage": "Une erreur est survenue lors de l'obtention de l'URL pour tester la configuration",
+    "xpack.ml.jobsList.editJobFlyout.customUrls.loadDataViewsErrorNotificationMessage": "Une erreur est survenue lors du chargement de la liste des vues de données enregistrées.",
     "xpack.ml.jobsList.editJobFlyout.customUrls.loadSavedDashboardsErrorNotificationMessage": "Une erreur est survenue lors du chargement de la liste de tableaux de bord Kibana enregistrés",
     "xpack.ml.jobsList.editJobFlyout.customUrls.testButtonLabel": "Test",
     "xpack.ml.jobsList.editJobFlyout.customUrlsTitle": "URL personnalisées",
@@ -15471,6 +18557,7 @@
     "xpack.ml.jobsList.editJobFlyout.datafeed.readOnlyCalloutText": "Les paramètres de flux de données ne peuvent pas être modifiés lorsque le flux de données est en cours d'exécution. Veuillez arrêter la tâche si vous souhaitez modifier ces paramètres.",
     "xpack.ml.jobsList.editJobFlyout.datafeed.scrollSizeLabel": "Taille de la barre de défilement",
     "xpack.ml.jobsList.editJobFlyout.datafeedTitle": "Flux de données",
+    "xpack.ml.jobsList.editJobFlyout.detectors.title": "Modifier la description des détecteurs",
     "xpack.ml.jobsList.editJobFlyout.detectorsTitle": "Détecteurs",
     "xpack.ml.jobsList.editJobFlyout.groupsAndJobsHasSameIdErrorMessage": "Une tâche avec cet ID existe déjà. Les groupes et les tâches ne peuvent pas utiliser le même ID.",
     "xpack.ml.jobsList.editJobFlyout.jobDetails.dailyModelSnapshotRetentionAfterDaysLabel": "Nombre de jours de conservation des snapshots de modèle quotidiens",
@@ -15488,6 +18575,7 @@
     "xpack.ml.jobsList.editJobFlyout.saveChangesButtonLabel": "Enregistrer les modifications",
     "xpack.ml.jobsList.editJobFlyout.unsavedChangesDialogMessage": "Si vous n'enregistrez pas, vos modifications seront perdues.",
     "xpack.ml.jobsList.editJobFlyout.unsavedChangesDialogTitle": "Enregistrer les modifications avant de quitter ?",
+    "xpack.ml.jobsList.editJobModal.editManagedJobDescription": "modification",
     "xpack.ml.jobsList.expandJobDetailsAriaLabel": "Afficher les détails pour {itemId}",
     "xpack.ml.jobsList.idLabel": "ID",
     "xpack.ml.jobsList.jobActionsColumn.screenReaderDescription": "Cette colonne contient des actions supplémentaires dans un menu qui peuvent être effectuées sur chaque tâche",
@@ -15546,6 +18634,8 @@
     "xpack.ml.jobsList.jobStateLabel": "État de la tâche",
     "xpack.ml.jobsList.latestTimestampLabel": "Dernier horodatage",
     "xpack.ml.jobsList.loadingJobsLabel": "Chargement des tâches…",
+    "xpack.ml.jobsList.managedBadgeLabel": "Géré",
+    "xpack.ml.jobsList.managedBadgeTooltip": "Cette tâche est préconfigurée et gérée par Elastic. Les autres éléments du produit peuvent présenter des dépendances envers ce comportement.",
     "xpack.ml.jobsList.managementActions.cloneJobDescription": "Cloner la tâche",
     "xpack.ml.jobsList.managementActions.cloneJobLabel": "Cloner la tâche",
     "xpack.ml.jobsList.managementActions.closeJobDescription": "Fermer la tâche",
@@ -15555,6 +18645,7 @@
     "xpack.ml.jobsList.managementActions.deleteJobLabel": "Supprimer la tâche",
     "xpack.ml.jobsList.managementActions.editJobDescription": "Modifier la tâche",
     "xpack.ml.jobsList.managementActions.editJobLabel": "Modifier la tâche",
+    "xpack.ml.jobsList.managementActions.noSourceDataViewForClone": "Impossible de cloner la tâche de détection des anomalies {jobId}. Il n’existe aucune vue de données pour l’index {dataViewTitle}.",
     "xpack.ml.jobsList.managementActions.resetJobDescription": "Réinitialiser la tâche",
     "xpack.ml.jobsList.managementActions.resetJobLabel": "Réinitialiser la tâche",
     "xpack.ml.jobsList.managementActions.startDatafeedDescription": "Démarrer le flux de données",
@@ -15562,8 +18653,11 @@
     "xpack.ml.jobsList.managementActions.stopDatafeedDescription": "Arrêter le flux de données",
     "xpack.ml.jobsList.managementActions.stopDatafeedLabel": "Arrêter le flux de données",
     "xpack.ml.jobsList.memoryStatusLabel": "Statut de la mémoire",
-    "xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link": "Stack Management (Gestion de la Suite)",
-    "xpack.ml.jobsList.missingSavedObjectWarning.title": "Synchronisation de la tâche de ML requise",
+    "xpack.ml.jobsList.missingSavedObjectWarning.description": "Certaines tâches ou certains modèles entraînés manquent ou présentent des objets enregistrés incomplets. ",
+    "xpack.ml.jobsList.missingSavedObjectWarning.link": " {link}",
+    "xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link": "Veuillez synchroniser les tâches.",
+    "xpack.ml.jobsList.missingSavedObjectWarning.noPermission": "Un administrateur peut synchroniser les tâches sous Gestion de la Suite.",
+    "xpack.ml.jobsList.missingSavedObjectWarning.title": "Synchronisation des tâches et modèles entraînés ML requise",
     "xpack.ml.jobsList.multiJobActions.groupSelector.addButtonAriaLabel": "Ajouter",
     "xpack.ml.jobsList.multiJobActions.groupSelector.addNewGroupPlaceholder": "Ajouter un nouveau groupe",
     "xpack.ml.jobsList.multiJobActions.groupSelector.applyButtonLabel": "Appliquer",
@@ -15580,7 +18674,6 @@
     "xpack.ml.jobsList.multiJobsActions.startDatafeedsLabel": "Démarrer {jobsCount, plural, one {le flux de données} other {les flux de données}}",
     "xpack.ml.jobsList.multiJobsActions.stopDatafeedsLabel": "Arrêter {jobsCount, plural, one {le flux de données} other {les flux de données}}",
     "xpack.ml.jobsList.nodeAvailableWarning.linkToCloud.hereLinkText": "Déploiement Elastic Cloud",
-    "xpack.ml.jobsList.nodeAvailableWarning.linkToCloudDescription": "Veuillez modifier votre {link}. Vous pouvez activer un nœud de Machine Learning de 1 Go ou développer votre configuration de ML existante.",
     "xpack.ml.jobsList.nodeAvailableWarning.noMLNodesAvailableDescription": "Aucun nœud de ML n'est disponible.",
     "xpack.ml.jobsList.nodeAvailableWarning.noMLNodesAvailableTitle": "Aucun nœud de ML disponible",
     "xpack.ml.jobsList.nodeAvailableWarning.unavailableCreateOrRunJobsDescription": "Vous ne pourrez ni créer ni exécuter de tâches.",
@@ -15618,6 +18711,11 @@
     "xpack.ml.jobsList.startDatafeedModal.startButtonLabel": "Démarrage",
     "xpack.ml.jobsList.startDatafeedModal.startFromNowLabel": "Démarrer à partir de maintenant",
     "xpack.ml.jobsList.startDatafeedModal.startJobsTitle": "Démarrer {jobsCount, plural, one {{jobId}} other {# tâches}}",
+    "xpack.ml.jobsList.startDatafeedsConfirmModal.cancelButtonLabel": "Annuler",
+    "xpack.ml.jobsList.startDatafeedsConfirmModal.closeButtonLabel": "Fermer la/les {jobsCount, plural, one {tâche} other {tâches}}",
+    "xpack.ml.jobsList.startDatafeedsModal.closeDatafeedsTitle": "Fermer {jobsCount, plural, one {{jobId}} other {# tâches}} ?",
+    "xpack.ml.jobsList.startDatafeedsModal.resetManagedDatafeedsDescription": "réinitialisation",
+    "xpack.ml.jobsList.startDatafeedsModal.startManagedDatafeedsDescription": "{jobsCount, plural, one {Cette tâche} other {Au moins l’une de ces tâches}} est préconfigurée par Elastic. Le fait de {jobsCount, plural, one {la} other {les}} démarrer avec une heure de fin spécifique peut avoir un impact sur d’autres éléments du produit.",
     "xpack.ml.jobsList.startedActionStatusText": "démarré",
     "xpack.ml.jobsList.startJobErrorMessage": "Impossible de démarrer les tâches",
     "xpack.ml.jobsList.statsBar.activeDatafeedsLabel": "Flux de données actifs",
@@ -15627,6 +18725,10 @@
     "xpack.ml.jobsList.statsBar.openJobsLabel": "Ouvrir les tâches",
     "xpack.ml.jobsList.statsBar.totalJobsLabel": "Total de tâches",
     "xpack.ml.jobsList.stopActionStatusText": "arrêter",
+    "xpack.ml.jobsList.stopDatafeedsConfirmModal.cancelButtonLabel": "Annuler",
+    "xpack.ml.jobsList.stopDatafeedsConfirmModal.stopButtonLabel": "Arrêter {jobsCount, plural, one {le flux de données} other {les flux de données}}",
+    "xpack.ml.jobsList.stopDatafeedsModal.stopDatafeedsTitle": "Arrêter le flux de données pour {jobsCount, plural, one {{jobId}} other {# tâches}} ?",
+    "xpack.ml.jobsList.stopDatafeedsModal.stopManagedDatafeedsDescription": "arrêt en cours",
     "xpack.ml.jobsList.stopJobErrorMessage": "Impossible d'arrêter les tâches",
     "xpack.ml.jobsList.stoppedActionStatusText": "arrêté",
     "xpack.ml.jobsList.title": "Tâches de détection des anomalies",
@@ -15634,7 +18736,8 @@
     "xpack.ml.machineLearningBreadcrumbLabel": "Machine Learning",
     "xpack.ml.machineLearningDescription": "Modélisez automatiquement le comportement normal de vos données de série temporelle pour détecter les anomalies.",
     "xpack.ml.machineLearningSubtitle": "Modélisez, prédisez et détectez.",
-    "xpack.ml.machineLearningTitle": "Machine Learning",
+    "xpack.ml.machineLearningTitle": "Machine Learning",
+    "xpack.ml.managedJobsWarningCallout": "{jobsCount, plural, one {Cette tâche} other {Au moins l’une de ces tâches}} est préconfigurée par Elastic. Le fait de {jobsCount, plural, one {la} other {les}} {action} peut avoir un impact sur d’autres éléments du produit.",
     "xpack.ml.management.jobsList.accessDeniedTitle": "Accès refusé",
     "xpack.ml.management.jobsList.analyticsDocsLabel": "Documents de tâches d'analyse",
     "xpack.ml.management.jobsList.analyticsTab": "Analyse",
@@ -15648,7 +18751,10 @@
     "xpack.ml.management.jobsList.noGrantedPrivilegesDescription": "Vous ne disposez pas d'autorisation pour gérer les tâches de Machine Learning. L'accès au plug-in requiert que la fonctionnalité de Machine Learning soit visible dans cet espace.",
     "xpack.ml.management.jobsList.noPermissionToAccessLabel": "Accès refusé",
     "xpack.ml.management.jobsList.syncFlyoutButton": "Synchroniser les objets enregistrés",
+    "xpack.ml.management.jobsList.trainedModelsTab": "Modèles entraînés",
     "xpack.ml.management.jobsListTitle": "Tâches de Machine Learning",
+    "xpack.ml.management.jobsSpacesList.jobObjectNoun": "tâche",
+    "xpack.ml.management.jobsSpacesList.modelObjectNoun": "modèle entraîné",
     "xpack.ml.management.jobsSpacesList.updateSpaces.error": "Erreur lors de la mise à jour de {id}",
     "xpack.ml.management.syncSavedObjectsFlyout.closeButton": "Fermer",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsAdded.description": "Si des objets enregistrés n'ont pas d'ID de flux de données pour les tâches de détection des anomalies, l'ID sera ajouté.",
@@ -15661,9 +18767,40 @@
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsCreated.title": "Objets enregistrés manquants ({count})",
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsDeleted.description": "Si des objets enregistrés n'ont pas de tâche associée, ils seront supprimés.",
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsDeleted.title": "Objets enregistrés sans correspondance ({count})",
-    "xpack.ml.management.syncSavedObjectsFlyout.sync.error": "Certaines tâches ne peuvent pas être synchronisées.",
-    "xpack.ml.management.syncSavedObjectsFlyout.sync.success": "{successCount} {successCount, plural, one {tâche synchronisée} other {tâches synchronisées}}",
+    "xpack.ml.management.syncSavedObjectsFlyout.sync.error": "Certaines tâches ou certains modèles entraînés ne peuvent pas être synchronisés.",
+    "xpack.ml.management.syncSavedObjectsFlyout.sync.success": "{successCount} {successCount, plural, one {élément} other {éléments}} synchronisés",
     "xpack.ml.management.syncSavedObjectsFlyout.syncButton": "Synchroniser",
+    "xpack.ml.maps.anomalyLayerActualLabel": "Réel",
+    "xpack.ml.maps.anomalyLayerByFieldNameLabel": "Par nom de champ",
+    "xpack.ml.maps.anomalyLayerByFieldValueLabel": "Par valeur de champ",
+    "xpack.ml.maps.anomalyLayerDescription": "Afficher les anomalies d’une tâche Machine Learning",
+    "xpack.ml.maps.anomalyLayerFieldNameLabel": "Nom du champ",
+    "xpack.ml.maps.anomalyLayerFunctionDescriptionLabel": "Fonction",
+    "xpack.ml.maps.anomalyLayerInfluencersLabel": "Influenceurs",
+    "xpack.ml.maps.anomalyLayerOverFieldNameLabel": "Nom du champ de base de comparaison",
+    "xpack.ml.maps.anomalyLayerOverFieldValueLabel": "Valeur du champ de base de comparaison",
+    "xpack.ml.maps.anomalyLayerPartitionFieldNameLabel": "Nom du champ de partition",
+    "xpack.ml.maps.anomalyLayerPartitionFieldValueLabel": "Valeur du champ de partition",
+    "xpack.ml.maps.anomalyLayerRecordScoreLabel": "Score d'enregistrement",
+    "xpack.ml.maps.anomalyLayerTimeStampLabel": "Heure",
+    "xpack.ml.maps.anomalyLayerTitle": "Anomalies ML",
+    "xpack.ml.maps.anomalyLayerTypicalLabel": "Type",
+    "xpack.ml.maps.anomalyLayerTypicalToActualLabel": "Type à réel",
+    "xpack.ml.maps.anomalyLayerUnavailableMessage": "Les couches d’anomalies sont une fonctionnalité soumise à abonnement. Assurez-vous de disposer de l’abonnement et de l’accès appropriés à Machine Learning.",
+    "xpack.ml.maps.anomalySource.displayLabel": "{typicalActual} pour {jobId}",
+    "xpack.ml.maps.anomalySourcePropLabel": "ID tâche",
+    "xpack.ml.maps.jobIdLabel": "ID tâche",
+    "xpack.ml.maps.settingsEditorLabel": "Anomalies",
+    "xpack.ml.maps.sourceTooltip": "Cela indique les anomalies.",
+    "xpack.ml.maps.typicalActualLabel": "Type",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.createJobButtonText": "Créer une tâche",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.createJobMessage": "Créer une tâche de détection des anomalies",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.emptyPromptText": "La détection des anomalies permet d’identifier un comportement inhabituel dans des données géographiques. Créez une tâche utilisant la fonction lat_long, requise pour la couche d’anomalies de mapping.",
+    "xpack.ml.modelManagement.nodesOverview.docTitle": "Nœuds",
+    "xpack.ml.modelManagement.nodesOverviewHeader": "Nœuds",
+    "xpack.ml.modelManagement.trainedModels.docTitle": "Modèles entraînés",
+    "xpack.ml.modelManagement.trainedModelsHeader": "Modèles entraînés",
+    "xpack.ml.modelManagementLabel": "Gestion des modèles",
     "xpack.ml.models.dfaValidation.messages.analysisFieldsEmptyWarningText": "Certains champs inclus pour l'analyse ont au moins {percentEmpty} % de valeurs vides et peuvent ne pas être adaptés à l'analyse.",
     "xpack.ml.models.dfaValidation.messages.analysisFieldsHeading": "Champs d'analyse",
     "xpack.ml.models.dfaValidation.messages.analysisFieldsHighWarningText": "Plus de {includedFieldsThreshold} champs sont sélectionnés pour l'analyse. Cela peut augmenter l'utilisation des ressources et allonger le temps d'exécution des tâches.",
@@ -15732,6 +18869,9 @@
     "xpack.ml.models.jobValidation.messages.categorizationFiltersValidMessage": "La vérification des filtres de catégorisation a réussi.",
     "xpack.ml.models.jobValidation.messages.categorizerMissingPerPartitionFieldMessage": "Le champ de partition doit être défini pour les détecteurs qui référencent \"mlcategory\" lorsque la catégorisation par partition est activée.",
     "xpack.ml.models.jobValidation.messages.categorizerVaryingPerPartitionFieldNamesMessage": "Les détecteurs ayant le mot-clé \"mlcategory\" ne peuvent pas avoir un partition_field_name différent lorsque la catégorisation par partition est activée. Trouvé [{fields}].",
+    "xpack.ml.models.jobValidation.messages.datafeedPreviewFailedMessage": "Échec de l’aperçu du flux de données. Cela peut être dû à une erreur dans la configuration de la tâche ou du flux de données.",
+    "xpack.ml.models.jobValidation.messages.datafeedPreviewNoDocumentsHeading": "Aperçu du flux de données",
+    "xpack.ml.models.jobValidation.messages.datafeedPreviewNoDocumentsMessage": "La génération de l’aperçu du flux de données pour la configuration de tâche actuelle ne produit aucun résultat. Si l’index ne contient pas de documents, vous pouvez ignorer cet avertissement. Sinon, il est possible que la tâche ne soit pas correctement configurée.",
     "xpack.ml.models.jobValidation.messages.detectorsDuplicatesMessage": "Des détecteurs en double ont été trouvés. Les détecteurs ayant la même configuration combinée pour {functionParam}, {fieldNameParam}, {byFieldNameParam}, {overFieldNameParam} et {partitionFieldNameParam} ne sont pas autorisés dans la même tâche.",
     "xpack.ml.models.jobValidation.messages.detectorsEmptyMessage": "Aucun détecteur n'a été trouvé. Au moins un détecteur doit être spécifié.",
     "xpack.ml.models.jobValidation.messages.detectorsFunctionEmptyMessage": "Une des fonctions du détecteur est valide.",
@@ -15791,12 +18931,12 @@
     "xpack.ml.modelSnapshotTable.actions.revert.description": "Revenir à ce snapshot",
     "xpack.ml.modelSnapshotTable.actions.revert.name": "Restaurer",
     "xpack.ml.modelSnapshotTable.closeJobConfirm.cancelButton": "Annuler",
-    "xpack.ml.modelSnapshotTable.closeJobConfirm.close.button": "Forcer la fermeture",
+    "xpack.ml.modelSnapshotTable.closeJobConfirm.close.button": "Fermer",
     "xpack.ml.modelSnapshotTable.closeJobConfirm.close.title": "Fermer la tâche ?",
     "xpack.ml.modelSnapshotTable.closeJobConfirm.content": "La restauration du snapshot n'est possible que sur les tâches fermées.",
     "xpack.ml.modelSnapshotTable.closeJobConfirm.contentOpen": "La tâche est actuellement ouverte.",
     "xpack.ml.modelSnapshotTable.closeJobConfirm.contentOpenAndRunning": "La tâche est actuellement ouverte et en cours d'exécution.",
-    "xpack.ml.modelSnapshotTable.closeJobConfirm.stopAndClose.button": "Forcer l'arrêt et fermer",
+    "xpack.ml.modelSnapshotTable.closeJobConfirm.stopAndClose.button": "Arrêter et fermer",
     "xpack.ml.modelSnapshotTable.closeJobConfirm.stopAndClose.title": "Arrêter le flux de données et fermer la tâche ?",
     "xpack.ml.modelSnapshotTable.description": "Description",
     "xpack.ml.modelSnapshotTable.id": "ID",
@@ -15804,13 +18944,27 @@
     "xpack.ml.modelSnapshotTable.retain": "Conserver",
     "xpack.ml.modelSnapshotTable.time": "Date de création",
     "xpack.ml.multiSelectPicker.NoFiltersFoundMessage": "Aucun filtre trouvé",
+    "xpack.ml.navMenu.anomalyDetection.anomalyExplorerText": "Anomaly Explorer (Explorateur d'anomalies)",
+    "xpack.ml.navMenu.anomalyDetection.jobsManagementText": "Tâches",
+    "xpack.ml.navMenu.anomalyDetection.singleMetricViewerText": "Single Metric Viewer (Visionneuse d'indicateur unique)",
     "xpack.ml.navMenu.anomalyDetectionTabLinkText": "Détection des anomalies",
+    "xpack.ml.navMenu.dataFrameAnalytics.analyticsMapText": "Mapping d'analyse",
+    "xpack.ml.navMenu.dataFrameAnalytics.jobsManagementText": "Tâches",
+    "xpack.ml.navMenu.dataFrameAnalytics.resultsExplorerText": "Explorateur de résultats",
     "xpack.ml.navMenu.dataFrameAnalyticsTabLinkText": "Analyse du cadre de données",
-    "xpack.ml.navMenu.dataVisualizerTabLinkText": "File Data Visualizer (Visualiseur de données pour les fichiers)",
-    "xpack.ml.navMenu.mlAppNameText": "Machine Learning",
+    "xpack.ml.navMenu.dataViewDataVisualizerLinkText": "Vue de données",
+    "xpack.ml.navMenu.dataVisualizerTabLinkText": "Data Visualizer (Visualiseur de données)",
+    "xpack.ml.navMenu.fileDataVisualizerLinkText": "Fichier",
+    "xpack.ml.navMenu.mlAppNameText": "Machine Learning",
+    "xpack.ml.navMenu.modelManagementText": "Gestion des modèles",
+    "xpack.ml.navMenu.nodesOverviewText": "Nœuds",
     "xpack.ml.navMenu.overviewTabLinkText": "Aperçu",
     "xpack.ml.navMenu.settingsTabLinkText": "Paramètres",
+    "xpack.ml.navMenu.trainedModelsTabBetaLabel": "Version d’évaluation technique",
+    "xpack.ml.navMenu.trainedModelsTabBetaTooltipContent": "Cette fonctionnalité est en version d’évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "xpack.ml.navMenu.trainedModelsText": "Modèles entraînés",
     "xpack.ml.newJob.page.createJob": "Créer une tâche",
+    "xpack.ml.newJob.page.createJob.dataViewName": "À l’aide de la vue de données {dataViewName}",
     "xpack.ml.newJob.recognize.advancedLabel": "Avancé",
     "xpack.ml.newJob.recognize.advancedSettingsAriaLabel": "Paramètres avancés",
     "xpack.ml.newJob.recognize.alreadyExistsLabel": "(existe déjà)",
@@ -15821,6 +18975,7 @@
     "xpack.ml.newJob.recognize.datafeed.savedAriaLabel": "Enregistré",
     "xpack.ml.newJob.recognize.datafeed.saveFailedAriaLabel": "L'enregistrement a échoué",
     "xpack.ml.newJob.recognize.datafeedLabel": "Flux de données",
+    "xpack.ml.newJob.recognize.dataViewPageTitle": "vue de données {dataViewName}",
     "xpack.ml.newJob.recognize.job.overrideJobConfigurationLabel": "Remplacer la configuration de la tâche",
     "xpack.ml.newJob.recognize.job.savedAriaLabel": "Enregistré",
     "xpack.ml.newJob.recognize.job.saveFailedAriaLabel": "L'enregistrement a échoué",
@@ -15868,6 +19023,26 @@
     "xpack.ml.newJob.wizard.datafeedPreviewFlyout.noDetectors": "Aucun détecteur configuré",
     "xpack.ml.newJob.wizard.datafeedPreviewFlyout.showButton": "Aperçu du flux de données",
     "xpack.ml.newJob.wizard.datafeedPreviewFlyout.title": "Aperçu du flux de données",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.changeDataView.button": "Changer de vue de données",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.description": "La vue de données actuellement utilisée pour cette tâche.",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step0.title": "Changer de vue de données",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step1.dataView": "Vue de données",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step1.noMatchingError": "Aucun recherche enregistrée ni aucun index correspondants n'ont été trouvés.",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step1.title": "Sélectionner une nouvelle vue de données pour la tâche",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step2.ApplyButton": "Appliquer",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step2.backButton": "Retour",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step2.title": "Remplacer {dv1} par {dv2}",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.step2.validatingText": "Vérification de la compatibilité entre la vue de données et la tâche",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.title": "Vue de données",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.invalid.message": "Cette vue de données a entraîné une erreur lors de la génération de l’aperçu du flux de données. Il est possible que les champs sélectionnés pour cette tâche n’existent pas dans {dataViewTitle}.",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.invalid.reason": "Raison :",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.invalid.title": "Vue de données non valide",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.noDetectors.message": "Aucun détecteur n’a été configuré. Cette vue de données peut être appliquée à la tâche.",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.noDetectors.title": "Vue de données valide",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.possiblyInvalid.message": "Cette vue de données n’a produit aucun résultat lors de la génération de l’aperçu du flux de données. Il est possible qu’il n’y ait pas de documents dans {dataViewTitle}.",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.possiblyInvalid.title": "Vue de données potentiellement non valide",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.valid.message": "Cette vue de données peut être appliquée à la tâche.",
+    "xpack.ml.newJob.wizard.datafeedStep.dataView.validation.valid.title": "Vue de données valide",
     "xpack.ml.newJob.wizard.datafeedStep.frequency.description": "Intervalle entre les recherches.",
     "xpack.ml.newJob.wizard.datafeedStep.frequency.title": "Fréquence",
     "xpack.ml.newJob.wizard.datafeedStep.query.title": "Recherche Elasticsearch",
@@ -15880,7 +19055,7 @@
     "xpack.ml.newJob.wizard.datafeedStep.resetQueryConfirm.title": "Réinitialiser la requête de flux de données",
     "xpack.ml.newJob.wizard.datafeedStep.scrollSize.description": "Nombre maximal de documents à renvoyer dans chaque requête de recherche.",
     "xpack.ml.newJob.wizard.datafeedStep.scrollSize.title": "Taille de la barre de défilement",
-    "xpack.ml.newJob.wizard.datafeedStep.timeField.description": "Le champ temporel par défaut du modèle d'indexation est automatiquement sélectionné, mais il ne peut pas être remplacé.",
+    "xpack.ml.newJob.wizard.datafeedStep.timeField.description": "Le champ temporel par défaut de la vue de données est automatiquement sélectionné, mais il ne peut pas être remplacé.",
     "xpack.ml.newJob.wizard.datafeedStep.timeField.title": "Champ temporel",
     "xpack.ml.newJob.wizard.editCategorizationAnalyzerFlyoutButton": "Modifier l'analyseur de catégorisation",
     "xpack.ml.newJob.wizard.editJsonButton": "Modifier le JSON",
@@ -15930,7 +19105,10 @@
     "xpack.ml.newJob.wizard.jobType.categorizationDescription": "Regroupez les messages log dans des catégories et détectez les anomalies à l'intérieur.",
     "xpack.ml.newJob.wizard.jobType.categorizationTitle": "Catégorisation",
     "xpack.ml.newJob.wizard.jobType.createJobFromTitle": "Créer une tâche à partir de {pageTitleLabel}",
-    "xpack.ml.newJob.wizard.jobType.dataVisualizerAriaLabel": "File Data Visualizer (Visualiseur de données pour les fichiers)",
+    "xpack.ml.newJob.wizard.jobType.dataViewFromSavedSearchNotTimeBasedMessage": "{savedSearchTitle} utilise la vue de données {dataViewName}, qui n’est pas une vue de données temporelle.",
+    "xpack.ml.newJob.wizard.jobType.dataViewNotTimeBasedMessage": "La vue de données {dataViewName} n’est pas une vue de données temporelle.",
+    "xpack.ml.newJob.wizard.jobType.dataViewPageTitleLabel": "vue de données {dataViewName}",
+    "xpack.ml.newJob.wizard.jobType.dataVisualizerAriaLabel": "Data Visualizer (Visualiseur de données)",
     "xpack.ml.newJob.wizard.jobType.dataVisualizerDescription": "Découvrez les caractéristiques de vos données et identifiez les champs pour l'analyse avec Machine Learning.",
     "xpack.ml.newJob.wizard.jobType.dataVisualizerTitle": "File Data Visualizer (Visualiseur de données pour les fichiers)",
     "xpack.ml.newJob.wizard.jobType.howToRunAnomalyDetectionDescription": "La détection des anomalies peut être exécutée uniquement sur les index temporels.",
@@ -15946,7 +19124,7 @@
     "xpack.ml.newJob.wizard.jobType.rareDescription": "Détectez les valeurs rares dans les données temporelles.",
     "xpack.ml.newJob.wizard.jobType.rareTitle": "Rare",
     "xpack.ml.newJob.wizard.jobType.savedSearchPageTitleLabel": "recherche enregistrée {savedSearchTitle}",
-    "xpack.ml.newJob.wizard.jobType.selectDifferentIndexLinkText": "Sélectionner un autre index",
+    "xpack.ml.newJob.wizard.jobType.selectDifferentIndexLinkText": "Sélectionnez une autre vue de données ou une autre recherche enregistrée.",
     "xpack.ml.newJob.wizard.jobType.singleMetricAriaLabel": "Tâche à indicateur unique",
     "xpack.ml.newJob.wizard.jobType.singleMetricDescription": "Détectez les anomalies dans une série temporelle unique.",
     "xpack.ml.newJob.wizard.jobType.singleMetricTitle": "Indicateur unique",
@@ -15956,7 +19134,7 @@
     "xpack.ml.newJob.wizard.jsonFlyout.autoSetJobCreatorTimeRange.error": "Erreur lors de la récupération des heures de début et de fin de l'index",
     "xpack.ml.newJob.wizard.jsonFlyout.closeButton": "Fermer",
     "xpack.ml.newJob.wizard.jsonFlyout.datafeed.title": "JSON de configuration du flux de données",
-    "xpack.ml.newJob.wizard.jsonFlyout.indicesChange.calloutText": "Il est impossible d'altérer les index utilisés par le flux de données ici. Si vous souhaitez sélectionner un autre modèle d'indexation ou une autre recherche enregistrée, veuillez redémarrer la création de la tâche en sélectionnant un autre modèle d'indexation.",
+    "xpack.ml.newJob.wizard.jsonFlyout.indicesChange.calloutText": "Vous ne pouvez pas altérer les index utilisés par le flux de données. Pour sélectionner une autre vue de données ou une autre recherche enregistrée, accédez à l’étape 1 de l’assistant et sélectionnez l’option permettant de changer de vue de données.",
     "xpack.ml.newJob.wizard.jsonFlyout.indicesChange.calloutTitle": "Les index ont été modifiés",
     "xpack.ml.newJob.wizard.jsonFlyout.job.title": "JSON de configuration de la tâche",
     "xpack.ml.newJob.wizard.jsonFlyout.saveButton": "Enregistrer",
@@ -16010,7 +19188,7 @@
     "xpack.ml.newJob.wizard.pickFieldsStep.influencers.description": "Sélectionnez les champs de catégorie ayant une influence sur les résultats. Qui ou quel élément serait \"responsable\" d'une anomalie ? Recommandez entre 1 et 3 influenceurs.",
     "xpack.ml.newJob.wizard.pickFieldsStep.influencers.title": "Influenceurs",
     "xpack.ml.newJob.wizard.pickFieldsStep.invalidCssVersionCallout.mesage": "Impossible de trouver d'exemples de catégories, cela peut provenir d'une version non prise en charge de l'un des clusters.",
-    "xpack.ml.newJob.wizard.pickFieldsStep.invalidCssVersionCallout.title": "Le modèle d'indexation semble être inter-clusters",
+    "xpack.ml.newJob.wizard.pickFieldsStep.invalidCssVersionCallout.title": "La vue de données semble être inter-clusters.",
     "xpack.ml.newJob.wizard.pickFieldsStep.multiMetricView.addMetric": "Ajouter un indicateur",
     "xpack.ml.newJob.wizard.pickFieldsStep.noDetectorsCallout.message": "Au moins un détecteur est nécessaire pour créer une tâche.",
     "xpack.ml.newJob.wizard.pickFieldsStep.noDetectorsCallout.title": "Aucun détecteur",
@@ -16065,8 +19243,10 @@
     "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.title": "Restaurer le snapshot du modèle {ssId}",
     "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.warningCallout.contents": "Tous les résultats de détection des anomalies postérieurs au {date} seront supprimés.",
     "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.warningCallout.title": "Les données d'anomalie seront supprimées",
-    "xpack.ml.newJob.wizard.searchSelection.notFoundLabel": "Aucun index ou aucune recherche enregistrée correspondant(e) n'a été trouvé(e).",
+    "xpack.ml.newJob.wizard.searchSelection.notFoundLabel": "Aucune vue de données ni recherche enregistrée correspondante détectée.",
+    "xpack.ml.newJob.wizard.searchSelection.savedObjectType.dataView": "Vue de données",
     "xpack.ml.newJob.wizard.searchSelection.savedObjectType.search": "Recherche enregistrée",
+    "xpack.ml.newJob.wizard.selectDataViewOrSavedSearch": "Sélectionner une vue de données ou une recherche enregistrée",
     "xpack.ml.newJob.wizard.step.configureDatafeedTitle": "Configurer le flux de données",
     "xpack.ml.newJob.wizard.step.jobDetailsTitle": "Détails de la tâche",
     "xpack.ml.newJob.wizard.step.pickFieldsTitle": "Choisir des champs",
@@ -16076,6 +19256,7 @@
     "xpack.ml.newJob.wizard.stepComponentWrapper.configureDatafeedTitle": "Configurer le flux de données",
     "xpack.ml.newJob.wizard.stepComponentWrapper.jobDetailsTitle": "Détails de la tâche",
     "xpack.ml.newJob.wizard.stepComponentWrapper.pickFieldsTitle": "Choisir des champs",
+    "xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleDataView": "Nouvelle tâche de la vue de données {dataViewName}",
     "xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleSavedSearch": "Nouvelle tâche de la recherche enregistrée {title}",
     "xpack.ml.newJob.wizard.stepComponentWrapper.timeRangeTitle": "Plage temporelle",
     "xpack.ml.newJob.wizard.stepComponentWrapper.validationTitle": "Validation",
@@ -16142,7 +19323,10 @@
     "xpack.ml.newJob.wizard.validateJob.summaryCountFieldMissing": "Le champ requis comme flux de données utilise des agrégations.",
     "xpack.ml.newJobAwaitingNodeWarning.noMLNodesAvailableDescription": "Aucun nœud n'est actuellement en mesure d'exécuter la tâche, qui restera donc à l'état d'OUVERTURE jusqu'à ce qu'un nœud approprié devienne disponible.",
     "xpack.ml.overview.analytics.resultActions.openJobText": "Afficher les résultats de la tâche",
-    "xpack.ml.overview.analyticsList.emptyPromptText": "L'analyse du cadre de données vous permet d'effectuer une analyse de détection d'aberrations, de régression ou de classification sur vos données et l'annote avec les résultats. La tâche place les données annotées ainsi qu'une copie des données source dans un nouvel index.",
+    "xpack.ml.overview.analytics.viewJobActionName": "Afficher la tâche",
+    "xpack.ml.overview.analytics.viewResultsActionName": "Afficher les résultats",
+    "xpack.ml.overview.analyticsList.emptyPromptHelperText": "Avant de créer une tâche d’analyse du cadre de données, utilisez des {transforms} pour créer une {sourcedata}.",
+    "xpack.ml.overview.analyticsList.emptyPromptText": "Entraînez des modèles Machine Learning de régression, de classification ou de détection des aberrations à l’aide d’une analyse du cadre de données.",
     "xpack.ml.overview.analyticsList.errorPromptTitle": "Une erreur s'est produite lors de l'obtention de la liste d'analyse du cadre de données.",
     "xpack.ml.overview.analyticsList.id": "ID",
     "xpack.ml.overview.analyticsList.manageJobsButtonText": "Gérer les tâches",
@@ -16155,21 +19339,33 @@
     "xpack.ml.overview.anomalyDetection.createJobButtonText": "Créer une tâche",
     "xpack.ml.overview.anomalyDetection.emptyPromptText": "La détection des anomalies vous permet de trouver un comportement inhabituel dans des données temporelles. Démarrez automatiquement la détection des anomalies qui se cachent dans vos données et résolvez les problèmes plus rapidement.",
     "xpack.ml.overview.anomalyDetection.errorPromptTitle": "Une erreur s'est produite lors de l'obtention de la liste des tâches de détection des anomalies.",
+    "xpack.ml.overview.anomalyDetection.errorWithFetchingSwimLanesData": "Une erreur s'est produite lors de la récupération des résultats d'anomalie.",
     "xpack.ml.overview.anomalyDetection.manageJobsButtonText": "Gérer les tâches",
+    "xpack.ml.overview.anomalyDetection.noAnomaliesFoundMessage": "Aucune anomalie n'a été trouvée",
+    "xpack.ml.overview.anomalyDetection.noResultsFoundMessage": "Résultat introuvable",
+    "xpack.ml.overview.anomalyDetection.overallScore": "Score général",
     "xpack.ml.overview.anomalyDetection.panelTitle": "Détection des anomalies",
+    "xpack.ml.overview.anomalyDetection.resultActions.openInJobManagementText": "Afficher les tâches",
+    "xpack.ml.overview.anomalyDetection.resultActions.openJobsInAnomalyExplorerText": "Afficher dans l’Explorateur d'anomalies",
     "xpack.ml.overview.anomalyDetection.tableActionLabel": "Actions",
     "xpack.ml.overview.anomalyDetection.tableActualTooltip": "Valeurs réelles dans les résultats d'enregistrement des anomalies.",
     "xpack.ml.overview.anomalyDetection.tableDocsProcessed": "Documents traités",
     "xpack.ml.overview.anomalyDetection.tableId": "ID du groupe",
     "xpack.ml.overview.anomalyDetection.tableLatestTimestamp": "Dernier horodatage",
     "xpack.ml.overview.anomalyDetection.tableNumJobs": "Tâches dans le groupe",
+    "xpack.ml.overview.anomalyDetection.tableOverallScoreTooltip": "Scores d’anomalies généraux dans la plage temporelle sélectionnée",
     "xpack.ml.overview.anomalyDetection.tableSeverityTooltip": "Score normalisé compris entre 0 et 100, qui indique l'importance relative des résultats d'enregistrement des anomalies.",
     "xpack.ml.overview.anomalyDetection.tableTypicalTooltip": "Valeurs typiques dans les résultats d'enregistrement des anomalies.",
+    "xpack.ml.overview.anomalyDetection.viewJobsActionName": "Afficher les tâches",
+    "xpack.ml.overview.anomalyDetection.viewResultsActionName": "Afficher dans l’Explorateur d'anomalies",
     "xpack.ml.overview.feedbackSectionLink": "commentaires en ligne",
     "xpack.ml.overview.feedbackSectionText": "Si vous avez un avis ou des suggestions concernant votre expérience, envoyez des {feedbackLink}.",
+    "xpack.ml.overview.gettingStartedSectionDismiss": "Rejeter",
     "xpack.ml.overview.gettingStartedSectionDocs": "documentation",
+    "xpack.ml.overview.gettingStartedSectionSourceData": "ensemble de données source centré sur les entités",
+    "xpack.ml.overview.gettingStartedSectionText": "Bienvenue dans Machine Learning. Commencez en passant en revue nos {docs} ou en créant une nouvelle tâche.",
     "xpack.ml.overview.gettingStartedSectionTitle": "Premiers pas",
-    "xpack.ml.overview.gettingStartedSectionTransforms": "Transformations d'Elasticsearch",
+    "xpack.ml.overview.gettingStartedSectionTransforms": "transformations",
     "xpack.ml.overview.overviewLabel": "Aperçu",
     "xpack.ml.overview.statsBar.failedAnalyticsLabel": "Échoué",
     "xpack.ml.overview.statsBar.runningAnalyticsLabel": "En cours d'exécution",
@@ -16180,7 +19376,10 @@
     "xpack.ml.overviewJobsList.statsBar.failedJobsLabel": "Tâches échouées",
     "xpack.ml.overviewJobsList.statsBar.openJobsLabel": "Ouvrir les tâches",
     "xpack.ml.overviewJobsList.statsBar.totalJobsLabel": "Total de tâches",
-    "xpack.ml.plugin.title": "Machine Learning",
+    "xpack.ml.pageRefreshButton": "Actualiser",
+    "xpack.ml.pageRefreshResetButton": "Définir sur {defaultInterval}",
+    "xpack.ml.plugin.title": "Machine Learning",
+    "xpack.ml.previewAlert.actualLabel": "Réel :",
     "xpack.ml.previewAlert.hideResultsButtonLabel": "Masquer les résultats",
     "xpack.ml.previewAlert.intervalLabel": "Vérifier la condition de règle avec un intervalle",
     "xpack.ml.previewAlert.jobsLabel": "ID de tâches :",
@@ -16193,6 +19392,7 @@
     "xpack.ml.previewAlert.timeLabel": "Heure : ",
     "xpack.ml.previewAlert.topInfluencersLabel": "Principaux influenceurs :",
     "xpack.ml.previewAlert.topRecordsLabel": "Premiers enregistrements :",
+    "xpack.ml.previewAlert.typicalLabel": "Type :",
     "xpack.ml.privilege.licenseHasExpiredTooltip": "Votre licence a expiré.",
     "xpack.ml.privilege.noPermission.createCalendarsTooltip": "Vous ne disposez pas d'autorisation pour créer des calendriers.",
     "xpack.ml.privilege.noPermission.createMLJobsTooltip": "Vous ne disposez pas d'autorisation pour créer des tâches de Machine Learning.",
@@ -16293,6 +19493,7 @@
     "xpack.ml.ruleEditor.selectRuleAction.orText": "Ou ",
     "xpack.ml.ruleEditor.typicalAppliesTypeText": "typique",
     "xpack.ml.sampleDataLinkLabel": "Tâches de ML",
+    "xpack.ml.selectDataViewLabel": "Sélectionner la vue de données",
     "xpack.ml.settings.anomalyDetection.anomalyDetectionTitle": "Détection des anomalies",
     "xpack.ml.settings.anomalyDetection.calendarsSummaryCount": "Vous avez {calendarsCountBadge} {calendarsCount, plural, one {calendrier} other {calendriers}}",
     "xpack.ml.settings.anomalyDetection.calendarsText": "Les calendriers contiennent une liste d'événements programmés pour lesquels vous ne souhaitez pas générer d'anomalies, tels que des pannes système planifiées ou les jours fériés.",
@@ -16312,11 +19513,18 @@
     "xpack.ml.settings.breadcrumbs.filterLists.createLabel": "Créer",
     "xpack.ml.settings.breadcrumbs.filterLists.editLabel": "Modifier",
     "xpack.ml.settings.breadcrumbs.filterListsLabel": "Liste de filtres",
+    "xpack.ml.settings.calendarList.docTitle": "Calendriers",
     "xpack.ml.settings.calendars.listHeader.calendarsDescription": "Les calendriers contiennent une liste d'événements programmés pour lesquels vous ne souhaitez pas générer d'anomalies, tels que des pannes système planifiées ou les jours fériés. Un même calendrier peut être affecté à plusieurs tâches.{br}{learnMoreLink}",
     "xpack.ml.settings.calendars.listHeader.calendarsDescription.learnMoreLinkText": "En savoir plus",
     "xpack.ml.settings.calendars.listHeader.calendarsListTotalCount": "{totalCount} en tout",
     "xpack.ml.settings.calendars.listHeader.calendarsTitle": "Calendriers",
     "xpack.ml.settings.calendars.listHeader.refreshButtonLabel": "Actualiser",
+    "xpack.ml.settings.createCalendar.docTitle": "Créer un calendrier",
+    "xpack.ml.settings.createFilter.docTitle": "Créer un filtre",
+    "xpack.ml.settings.docTitle": "Paramètres",
+    "xpack.ml.settings.editCalendar.docTitle": "Modifier le calendrier",
+    "xpack.ml.settings.editFilter.docTitle": "Modifier le filtre",
+    "xpack.ml.settings.filterList.docTitle": "Filtres",
     "xpack.ml.settings.filterLists.addItemPopover.addButtonLabel": "Ajouter",
     "xpack.ml.settings.filterLists.addItemPopover.addItemButtonLabel": "Ajouter un élément",
     "xpack.ml.settings.filterLists.addItemPopover.enterItemPerLineDescription": "Entrer un élément par ligne",
@@ -16509,7 +19717,7 @@
     "xpack.ml.timeSeriesExplorer.timeSeriesChart.modelPlotEnabled.actualLabel": "réel",
     "xpack.ml.timeSeriesExplorer.timeSeriesChart.modelPlotEnabled.lowerBoundsLabel": "limites inférieures",
     "xpack.ml.timeSeriesExplorer.timeSeriesChart.modelPlotEnabled.upperBoundsLabel": "limites supérieures",
-    "xpack.ml.timeSeriesExplorer.timeSeriesChart.moreThanOneUnusualByFieldValuesLabel": "{numberOfCauses}{plusSign} unusual {byFieldName} values",
+    "xpack.ml.timeSeriesExplorer.timeSeriesChart.moreThanOneUnusualByFieldValuesLabel": "{numberOfCauses}{plusSign} valeurs {byFieldName} inhabituelles",
     "xpack.ml.timeSeriesExplorer.timeSeriesChart.multiBucketImpactLabel": "impact sur plusieurs compartiments",
     "xpack.ml.timeSeriesExplorer.timeSeriesChart.scheduledEventsLabel": "événement programmé {counter}",
     "xpack.ml.timeSeriesExplorer.timeSeriesChart.typicalLabel": "typique",
@@ -16549,6 +19757,7 @@
     "xpack.ml.trainedModels.modelsList.disableSelectableMessage": "Le modèle a des pipelines associés",
     "xpack.ml.trainedModels.modelsList.expandedRow.analyticsConfigTitle": "Configuration de l'analyse",
     "xpack.ml.trainedModels.modelsList.expandedRow.configTabLabel": "Config",
+    "xpack.ml.trainedModels.modelsList.expandedRow.deploymentStatsTitle": "Statistiques de déploiement",
     "xpack.ml.trainedModels.modelsList.expandedRow.detailsTabLabel": "Détails",
     "xpack.ml.trainedModels.modelsList.expandedRow.detailsTitle": "Détails",
     "xpack.ml.trainedModels.modelsList.expandedRow.editPipelineLabel": "Modifier",
@@ -16556,24 +19765,75 @@
     "xpack.ml.trainedModels.modelsList.expandedRow.inferenceStatsTitle": "Statistiques d'inférence",
     "xpack.ml.trainedModels.modelsList.expandedRow.ingestStatsTitle": "Statistiques d'ingestion",
     "xpack.ml.trainedModels.modelsList.expandedRow.metadataTitle": "Métadonnées",
+    "xpack.ml.trainedModels.modelsList.expandedRow.modelSizeStatsTitle": "Statistiques de taille du modèle",
     "xpack.ml.trainedModels.modelsList.expandedRow.pipelinesTabLabel": "Pipelines",
-    "xpack.ml.trainedModels.modelsList.expandedRow.processorsTitle": "Processeurs",
+    "xpack.ml.trainedModels.modelsList.expandedRow.processorsTitle": "Définition",
     "xpack.ml.trainedModels.modelsList.expandedRow.statsTabLabel": "Statistiques",
     "xpack.ml.trainedModels.modelsList.expandRow": "Développer",
     "xpack.ml.trainedModels.modelsList.fetchDeletionErrorMessage": "La suppression du/des {modelsCount, plural, one {modèle} other {modèles}} a échoué",
     "xpack.ml.trainedModels.modelsList.fetchFailedErrorMessage": "La récupération des modèles a échoué",
     "xpack.ml.trainedModels.modelsList.fetchModelStatsErrorMessage": "Les statistiques de récupération de modèle ont échoué",
+    "xpack.ml.trainedModels.modelsList.forceStopDialog.cancelText": "Annuler",
+    "xpack.ml.trainedModels.modelsList.forceStopDialog.confirmText": "Arrêt",
+    "xpack.ml.trainedModels.modelsList.forceStopDialog.pipelinesWarning": "Vous devez redémarrer le modèle pour pouvoir utiliser ces pipelines d’ingestion :",
+    "xpack.ml.trainedModels.modelsList.forceStopDialog.title": "Arrêter le modèle {modelId} ?",
     "xpack.ml.trainedModels.modelsList.modelDescriptionHeader": "Description",
     "xpack.ml.trainedModels.modelsList.modelIdHeader": "ID",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.countDescription": "Nombre total de documents ingérés pendant toute la durée de vie de ce nœud",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.countHeader": "Décompte",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.currentDescription": "Nombre total de documents en cours d’ingestion",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.currentHeader": "Actuel",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.failedDescription": "Nombre total d’ingestions ayant échoué pendant toute la durée de vie de ce nœud",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.failedHeader": "Échoué",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.timePerDocDescription": "Temps total passé sur le prétraitement des documents d’ingestion pendant toute la durée de vie de ce nœud",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.timePerDocHeader": "Temps par document",
+    "xpack.ml.trainedModels.modelsList.pipelines.processorStats.typeHeader": "Type de processeur",
+    "xpack.ml.trainedModels.modelsList.refreshManagementList": "Actualiser",
     "xpack.ml.trainedModels.modelsList.selectableMessage": "Sélectionner un modèle",
     "xpack.ml.trainedModels.modelsList.selectedModelsMessage": "{modelsCount, plural, one{# modèle sélectionné} other {# modèles sélectionnés}}",
+    "xpack.ml.trainedModels.modelsList.spacesLabel": "Espaces",
+    "xpack.ml.trainedModels.modelsList.startFailed": "Impossible de démarrer \"{modelId}\"",
+    "xpack.ml.trainedModels.modelsList.startSuccess": "Le déploiement pour \"{modelId}\" a été démarré avec succès.",
+    "xpack.ml.trainedModels.modelsList.stateHeader": "État",
+    "xpack.ml.trainedModels.modelsList.stopFailed": "Impossible d’arrêter \"{modelId}\"",
+    "xpack.ml.trainedModels.modelsList.stopSuccess": "Le déploiement pour \"{modelId}\" a été arrêté avec succès.",
+    "xpack.ml.trainedModels.modelsList.successfullyDeletedMessage": "{modelsCount, plural, one {Le modèle {modelIds}} other {# modèles}} {modelsCount, plural, one {a été supprimé} other {ont été supprimés}} avec succès.",
     "xpack.ml.trainedModels.modelsList.totalAmountLabel": "Total de modèles entraînés",
     "xpack.ml.trainedModels.modelsList.typeHeader": "Type",
     "xpack.ml.trainedModels.modelsList.viewTrainingDataActionLabel": "Afficher les données d'entraînement",
+    "xpack.ml.trainedModels.nodesList.adMemoryUsage": "Tâches de détection des anomalies",
+    "xpack.ml.trainedModels.nodesList.availableMemory": "Estimation de mémoire disponible",
+    "xpack.ml.trainedModels.nodesList.collapseRow": "Réduire",
+    "xpack.ml.trainedModels.nodesList.dfaMemoryUsage": "Tâches d’analyse du cadre de données",
+    "xpack.ml.trainedModels.nodesList.expandedRow.allocatedModelsTitle": "Modèles alloués",
+    "xpack.ml.trainedModels.nodesList.expandedRow.attributesTitle": "Attributs",
+    "xpack.ml.trainedModels.nodesList.expandedRow.detailsTitle": "Détails",
+    "xpack.ml.trainedModels.nodesList.expandRow": "Développer",
+    "xpack.ml.trainedModels.nodesList.jvmHeapSIze": "Taille du tas JVM",
+    "xpack.ml.trainedModels.nodesList.memoryBreakdown": "Répartition approximative de la mémoire",
+    "xpack.ml.trainedModels.nodesList.mlMaxMemory": "Mémoire maximum autorisée pour les processus ML natifs",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelAvgInferenceTimeHeader": "Temps d’inférence moyen",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelInferenceCountHeader": "Nombre d'inférences",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelLastAccessHeader": "Dernier accès",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelNameHeader": "Nom",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelNumberOfPendingRequestsHeader": "Requêtes en attente",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelRoutingStateHeader": "État de routage",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelSizeHeader": "Taille",
+    "xpack.ml.trainedModels.nodesList.modelsList.modelStartTimeHeader": "Heure de début",
+    "xpack.ml.trainedModels.nodesList.modelsList.nodeNameHeader": "Nom du nœud",
+    "xpack.ml.trainedModels.nodesList.modelsList.throughputLastMinuteHeader": "Rendement",
+    "xpack.ml.trainedModels.nodesList.modelsMemoryUsage": "Modèles entraînés",
+    "xpack.ml.trainedModels.nodesList.nodeMemoryUsageHeader": "Utilisation mémoire",
+    "xpack.ml.trainedModels.nodesList.nodeNameHeader": "Nom",
+    "xpack.ml.trainedModels.nodesList.nodesFetchError": "La récupération des nœuds a échoué.",
+    "xpack.ml.trainedModels.nodesList.nodeTotalMemoryHeader": "Mémoire totale",
+    "xpack.ml.trainedModels.nodesList.totalAmountLabel": "Nombre total de nœuds Machine Learning",
+    "xpack.ml.trainedModelsBreadcrumbs.nodeOverviewLabel": "Nœuds",
+    "xpack.ml.trainedModelsBreadcrumbs.trainedModelsLabel": "Modèles entraînés",
     "xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningDescription": "Les index associés au Machine Learning sont actuellement en cours de mise à niveau.",
     "xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningDescriptionExtra": "Certaines actions ne seront pas disponibles pendant cette opération.",
     "xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningTitle": "Migration de l'index en cours",
-    "xpack.ml.useResolver.errorIndexPatternIdEmptyString": "indexPatternId ne doit pas être une chaîne vide.",
+    "xpack.ml.useResolver.errorIndexPatternIdEmptyString": "dataViewId ne doit pas être une chaîne vide.",
     "xpack.ml.useResolver.errorTitle": "Une erreur s'est produite",
     "xpack.ml.validateJob.allPassed": "Toutes les vérifications de validation ont réussi",
     "xpack.ml.validateJob.jobValidationIncludesErrorText": "La validation de la tâche a échoué, mais vous pouvez quand même continuer pour créer la tâche. Notez que la tâche peut rencontrer des problèmes lors de son exécution.",
@@ -16675,6 +19935,8 @@
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.label": "Non-correspondance de version d'Elasticsearch",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.shortAction": "Vérifiez que vous avez la même version sur tous les nœuds.",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.firingMessage": "Plusieurs versions d'Elasticsearch ({versions}) s'exécutent dans ce cluster.",
+    "xpack.monitoring.alerts.filterHelpText": "Utilisez une expression KQL pour limiter la portée de votre déclenchement d'alerte.",
+    "xpack.monitoring.alerts.filterLable": "Filtre",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.dayLabel": "{timeValue, plural, one {jour} other {jours}}",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.hourLabel": "{timeValue, plural, one {heure} other {heures}}",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.minuteLabel": "{timeValue, plural, one {minute} other {minutes}}",
@@ -16688,6 +19950,7 @@
     "xpack.monitoring.alerts.kibanaVersionMismatch.label": "Non-correspondance de version de Kibana",
     "xpack.monitoring.alerts.kibanaVersionMismatch.shortAction": "Vérifiez que vous avez la même version sur toutes les instances.",
     "xpack.monitoring.alerts.kibanaVersionMismatch.ui.firingMessage": "Plusieurs versions de Kibana ({versions}) s'exécutent dans ce cluster.",
+    "xpack.monitoring.alerts.kqlSearchFieldPlaceholder": "Rechercher des données de monitoring",
     "xpack.monitoring.alerts.licenseExpiration.action": "Veuillez mettre à jour votre licence.",
     "xpack.monitoring.alerts.licenseExpiration.actionVariables.clusterName": "Cluster auquel la licence appartient.",
     "xpack.monitoring.alerts.licenseExpiration.actionVariables.expiredDate": "Date à laquelle la licence expirera.",
@@ -16843,6 +20106,7 @@
     "xpack.monitoring.apm.overview.routeTitle": "Serveur APM",
     "xpack.monitoring.apmNavigation.instancesLinkText": "Instances",
     "xpack.monitoring.apmNavigation.overviewLinkText": "Aperçu",
+    "xpack.monitoring.beats.beat.heading": "Beat",
     "xpack.monitoring.beats.filterBeatsPlaceholder": "Filtrer les agents Beats...",
     "xpack.monitoring.beats.instance.bytesSentLabel": "Octets envoyés",
     "xpack.monitoring.beats.instance.configReloadsLabel": "Rechargements de la config",
@@ -16895,6 +20159,7 @@
     "xpack.monitoring.breadcrumbs.beats.instancesLabel": "Instances",
     "xpack.monitoring.breadcrumbs.beatsLabel": "Beats",
     "xpack.monitoring.breadcrumbs.clustersLabel": "Clusters",
+    "xpack.monitoring.breadcrumbs.entSearchLabel": "Enterprise Search",
     "xpack.monitoring.breadcrumbs.es.ccrLabel": "CCR",
     "xpack.monitoring.breadcrumbs.es.indicesLabel": "Index",
     "xpack.monitoring.breadcrumbs.es.jobsLabel": "Tâches de Machine Learning",
@@ -16935,6 +20200,7 @@
     "xpack.monitoring.cluster.listing.standaloneClusterCallOutText": "Ou cliquez sur Cluster autonome dans le tableau ci-dessous",
     "xpack.monitoring.cluster.listing.standaloneClusterCallOutTitle": "Il semblerait que vous ayez des instances qui ne soient pas connectées à un cluster Elasticsearch.",
     "xpack.monitoring.cluster.listing.statusColumnTitle": "Statut d'alerte",
+    "xpack.monitoring.cluster.listing.tabTitle": "Clusters",
     "xpack.monitoring.cluster.listing.unknownHealthMessage": "Inconnu",
     "xpack.monitoring.cluster.overview.apmPanel.agentServersTotalLinkLabel": "Serveurs APM et Fleet : {apmsTotal}",
     "xpack.monitoring.cluster.overview.apmPanel.apmFleetTitle": "Serveur APM et Fleet",
@@ -16955,6 +20221,17 @@
     "xpack.monitoring.cluster.overview.beatsPanel.overviewLinkAriaLabel": "Aperçu Beats",
     "xpack.monitoring.cluster.overview.beatsPanel.overviewLinkLabel": "Aperçu",
     "xpack.monitoring.cluster.overview.beatsPanel.totalEventsLabel": "Total des événements",
+    "xpack.monitoring.cluster.overview.entSearchPanel.appSearchEngines": "Moteurs",
+    "xpack.monitoring.cluster.overview.entSearchPanel.entSearchTitle": "Enterprise Search",
+    "xpack.monitoring.cluster.overview.entSearchPanel.memoryUsageLabel": "Utilisation mémoire",
+    "xpack.monitoring.cluster.overview.entSearchPanel.nodesTotalLinkLabel": "Nœuds : {nodesTotal}",
+    "xpack.monitoring.cluster.overview.entSearchPanel.overviewLinkAriaLabel": "Aperçu Enterprise Search",
+    "xpack.monitoring.cluster.overview.entSearchPanel.overviewLinkLabel": "Aperçu",
+    "xpack.monitoring.cluster.overview.entSearchPanel.uptimeLabel": "Uptime",
+    "xpack.monitoring.cluster.overview.entSearchPanel.versionLabel": "Version",
+    "xpack.monitoring.cluster.overview.entSearchPanel.versionNotAvailableDescription": "S. O.",
+    "xpack.monitoring.cluster.overview.entSearchPanel.workplaceSearchOrgSources": "Sources d’organisation",
+    "xpack.monitoring.cluster.overview.entSearchPanel.workplaceSearchPrivateSources": "Sources privées",
     "xpack.monitoring.cluster.overview.esPanel.debugLogsTooltipText": "Nombre de logs de débogage",
     "xpack.monitoring.cluster.overview.esPanel.diskAvailableLabel": "Disque disponible",
     "xpack.monitoring.cluster.overview.esPanel.diskUsageLabel": "Utilisation du disque",
@@ -16967,7 +20244,7 @@
     "xpack.monitoring.cluster.overview.esPanel.indicesCountLinkLabel": "Index : {indicesCount}",
     "xpack.monitoring.cluster.overview.esPanel.infoLogsTooltipText": "Nombre de logs d'information",
     "xpack.monitoring.cluster.overview.esPanel.jobsLabel": "Tâches de Machine Learning",
-    "xpack.monitoring.cluster.overview.esPanel.jvmHeapLabel": "{javaVirtualMachine} Heap",
+    "xpack.monitoring.cluster.overview.esPanel.jvmHeapLabel": "Tas {javaVirtualMachine}",
     "xpack.monitoring.cluster.overview.esPanel.licenseLabel": "Licence",
     "xpack.monitoring.cluster.overview.esPanel.logsLinkAriaLabel": "Logs Elasticsearch",
     "xpack.monitoring.cluster.overview.esPanel.logsLinkLabel": "Logs",
@@ -16996,7 +20273,7 @@
     "xpack.monitoring.cluster.overview.logstashPanel.betaFeatureTooltip": "Fonctionnalité bêta",
     "xpack.monitoring.cluster.overview.logstashPanel.eventsEmittedLabel": "Événements émis",
     "xpack.monitoring.cluster.overview.logstashPanel.eventsReceivedLabel": "Événements reçus",
-    "xpack.monitoring.cluster.overview.logstashPanel.jvmHeapLabel": "{javaVirtualMachine} Heap",
+    "xpack.monitoring.cluster.overview.logstashPanel.jvmHeapLabel": "Tas {javaVirtualMachine}",
     "xpack.monitoring.cluster.overview.logstashPanel.logstashTitle": "Logstash",
     "xpack.monitoring.cluster.overview.logstashPanel.nodesCountLinkAriaLabel": "Nœuds Logstash : {nodesCount}",
     "xpack.monitoring.cluster.overview.logstashPanel.nodesCountLinkLabel": "Nœuds : {nodesCount}",
@@ -17022,6 +20299,7 @@
     "xpack.monitoring.elasticsearch.ccr.pageTitle": "Elasticsearch Ccr",
     "xpack.monitoring.elasticsearch.ccr.shard.instanceTitle": "Index : {followerIndex} Partition : {shardId}",
     "xpack.monitoring.elasticsearch.ccr.shard.pageTitle": "Partition Elasticsearch Ccr - Index : {followerIndex} Partition : {shardId}",
+    "xpack.monitoring.elasticsearch.ccr.shard.title": "Elasticsearch - Ccr - Partition",
     "xpack.monitoring.elasticsearch.ccr.shardsTable.alertsColumnTitle": "Alertes",
     "xpack.monitoring.elasticsearch.ccr.shardsTable.errorColumnTitle": "Erreur",
     "xpack.monitoring.elasticsearch.ccr.shardsTable.lastFetchTimeColumnTitle": "Dernière heure de récupération",
@@ -17030,6 +20308,7 @@
     "xpack.monitoring.elasticsearch.ccr.shardsTable.syncLagOpsColumn.followerLagTooltip": "Décalage du suiveur : {syncLagOpsFollower}",
     "xpack.monitoring.elasticsearch.ccr.shardsTable.syncLagOpsColumn.leaderLagTooltip": "Décalage du meneur : {syncLagOpsLeader}",
     "xpack.monitoring.elasticsearch.ccr.shardsTable.syncLagOpsColumnTitle": "Décalage de synchronisation (opérations)",
+    "xpack.monitoring.elasticsearch.ccr.title": "Elasticsearch - Ccr",
     "xpack.monitoring.elasticsearch.ccrShard.errorsTable.reasonColumnTitle": "Raison",
     "xpack.monitoring.elasticsearch.ccrShard.errorsTable.typeColumnTitle": "Type",
     "xpack.monitoring.elasticsearch.ccrShard.errorsTableTitle": "Erreurs",
@@ -17048,6 +20327,10 @@
     "xpack.monitoring.elasticsearch.clusterStatus.totalShardsLabel": "Nombre total de partitions",
     "xpack.monitoring.elasticsearch.clusterStatus.unassignedShardsLabel": "Partitions non affectées",
     "xpack.monitoring.elasticsearch.healthStatusLabel": "Intégrité : {status}",
+    "xpack.monitoring.elasticsearch.index.advanced.heading": "Vue avancée des index Elasticsearch",
+    "xpack.monitoring.elasticsearch.index.advanced.title": "Elasticsearch - Index - {indexName} - Avancé",
+    "xpack.monitoring.elasticsearch.index.overview.pageTitle": "Index : {indexName}",
+    "xpack.monitoring.elasticsearch.index.overview.title": "Elasticsearch - Index - {indexName} - Aperçu",
     "xpack.monitoring.elasticsearch.indexDetailStatus.alerts": "Alertes",
     "xpack.monitoring.elasticsearch.indexDetailStatus.documentsTitle": "Documents",
     "xpack.monitoring.elasticsearch.indexDetailStatus.iconStatusLabel": "Intégrité : {elasticsearchStatusIcon}",
@@ -17058,6 +20341,7 @@
     "xpack.monitoring.elasticsearch.indices.alertsColumnTitle": "Alertes",
     "xpack.monitoring.elasticsearch.indices.dataTitle": "Données",
     "xpack.monitoring.elasticsearch.indices.documentCountTitle": "Compte du document",
+    "xpack.monitoring.elasticsearch.indices.heading": "Index Elasticsearch",
     "xpack.monitoring.elasticsearch.indices.howToShowSystemIndicesDescription": "Si vous recherchez les index système (par ex., .kibana), essayez de vérifier \"Afficher les index système\".",
     "xpack.monitoring.elasticsearch.indices.indexRateTitle": "Taux d'indexation",
     "xpack.monitoring.elasticsearch.indices.monitoringTablePlaceholder": "Filtrer les index…",
@@ -17081,6 +20365,8 @@
     "xpack.monitoring.elasticsearch.mlJobListing.statusIconLabel": "Statut de la tâche : {status}",
     "xpack.monitoring.elasticsearch.mlJobs.pageTitle": "Tâches de Machine Learning Elasticsearch",
     "xpack.monitoring.elasticsearch.mlJobs.routeTitle": "Elasticsearch - Tâches de Machine Learning",
+    "xpack.monitoring.elasticsearch.node.advanced.pageTitle": "Nœud Elasticsearch : {nodeName}",
+    "xpack.monitoring.elasticsearch.node.advanced.title": "Elasticsearch - Nœuds - {nodeName} - Avancé",
     "xpack.monitoring.elasticsearch.node.cells.tooltip.iconLabel": "Plus d'informations sur cet indicateur",
     "xpack.monitoring.elasticsearch.node.cells.tooltip.max": "Valeur max",
     "xpack.monitoring.elasticsearch.node.cells.tooltip.min": "Valeur min",
@@ -17088,23 +20374,27 @@
     "xpack.monitoring.elasticsearch.node.cells.tooltip.trending": "Tendance",
     "xpack.monitoring.elasticsearch.node.cells.trendingDownText": "bas",
     "xpack.monitoring.elasticsearch.node.cells.trendingUpText": "haut",
+    "xpack.monitoring.elasticsearch.node.heading": "Nœud Elasticsearch",
     "xpack.monitoring.elasticsearch.node.overview.pageTitle": "Nœud Elasticsearch : {node}",
+    "xpack.monitoring.elasticsearch.node.overview.title": "Elasticsearch - Nœuds - {nodeName} - Aperçu",
     "xpack.monitoring.elasticsearch.node.statusIconLabel": "Statut : {status}",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.alerts": "Alertes",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.dataLabel": "Données",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.documentsLabel": "Documents",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.freeDiskSpaceLabel": "Espace disque libre",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.indicesLabel": "Index",
-    "xpack.monitoring.elasticsearch.nodeDetailStatus.jvmHeapLabel": "{javaVirtualMachine} Heap",
+    "xpack.monitoring.elasticsearch.nodeDetailStatus.jvmHeapLabel": "Tas {javaVirtualMachine}",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.shardsLabel": "Partitions",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.transportAddress": "Adresse de transport",
     "xpack.monitoring.elasticsearch.nodeDetailStatus.typeLabel": "Type",
+    "xpack.monitoring.elasticsearch.nodes.advanced.heading": "Nœud Elasticsearch avancé",
     "xpack.monitoring.elasticsearch.nodes.alertsColumnTitle": "Alertes",
     "xpack.monitoring.elasticsearch.nodes.cpuThrottlingColumnTitle": "Régulation CPU",
     "xpack.monitoring.elasticsearch.nodes.cpuUsageColumnTitle": "Utilisation CPU",
     "xpack.monitoring.elasticsearch.nodes.diskFreeSpaceColumnTitle": "Espace libre sur le disque",
+    "xpack.monitoring.elasticsearch.nodes.heading": "Nœuds Elasticsearch",
     "xpack.monitoring.elasticsearch.nodes.healthAltIcon": "Statut : {status}",
-    "xpack.monitoring.elasticsearch.nodes.jvmMemoryColumnTitle": "{javaVirtualMachine} Heap",
+    "xpack.monitoring.elasticsearch.nodes.jvmMemoryColumnTitle": "Tas {javaVirtualMachine}",
     "xpack.monitoring.elasticsearch.nodes.loadAverageColumnTitle": "Moyenne de la charge",
     "xpack.monitoring.elasticsearch.nodes.metricbeatMigration.detectedNodeDescription": "Les nœuds suivants ne sont pas monitorés. Cliquez sur \"Monitorer avec Metricbeat\" ci-dessous pour commencer le monitoring.",
     "xpack.monitoring.elasticsearch.nodes.metricbeatMigration.detectedNodeTitle": "Nœud Elasticsearch détecté",
@@ -17121,6 +20411,7 @@
     "xpack.monitoring.elasticsearch.nodes.statusColumnTitle": "Statut",
     "xpack.monitoring.elasticsearch.nodes.unknownNodeTypeLabel": "Inconnu",
     "xpack.monitoring.elasticsearch.overview.pageTitle": "Aperçu Elasticsearch",
+    "xpack.monitoring.elasticsearch.overview.title": "Elasticsearch",
     "xpack.monitoring.elasticsearch.shardActivity.completedRecoveriesLabel": "Récupérations terminées",
     "xpack.monitoring.elasticsearch.shardActivity.noActiveShardRecoveriesMessage.completedRecoveriesLinkText": "récupérations terminées",
     "xpack.monitoring.elasticsearch.shardActivity.noActiveShardRecoveriesMessage.completedRecoveriesLinkTextProblem": "Il n'existe aucune récupération de partition active pour ce cluster.",
@@ -17155,6 +20446,17 @@
     "xpack.monitoring.elasticsearch.shardAllocation.unassignedDisplayName": "Non affecté",
     "xpack.monitoring.elasticsearch.shardAllocation.unassignedPrimaryLabel": "Principal non affecté",
     "xpack.monitoring.elasticsearch.shardAllocation.unassignedReplicaLabel": "Réplique non affectée",
+    "xpack.monitoring.entSearch.overview.appSearchEngines": "Moteurs App Search",
+    "xpack.monitoring.entSearch.overview.appSearchSummary": "Résumé App Search",
+    "xpack.monitoring.entSearch.overview.heading": "Aperçu Enterprise Search",
+    "xpack.monitoring.entSearch.overview.instances": "Instances",
+    "xpack.monitoring.entSearch.overview.lowLevelSummary": "Résumé d’utilisation des ressources de bas niveau",
+    "xpack.monitoring.entSearch.overview.networkingSummary": "Résumé du trafic réseau",
+    "xpack.monitoring.entSearch.overview.pageTitle": "Aperçu Enterprise Search",
+    "xpack.monitoring.entSearch.overview.routeTitle": "Enterprise Search - Aperçu",
+    "xpack.monitoring.entSearch.overview.workplaceSearchOrgSources": "Sources de contenu d’organisation",
+    "xpack.monitoring.entSearch.overview.workplaceSearchPrivateSources": "Sources de contenu privées",
+    "xpack.monitoring.entSearch.overview.workplaceSearchSummary": "Résumé Workplace Search",
     "xpack.monitoring.errors.connectionErrorMessage": "Erreur de connexion : vérifiez la connexion réseau du cluster de monitoring Elasticsearch et reportez-vous aux logs Kibana pour en savoir plus.",
     "xpack.monitoring.errors.insufficientUserErrorMessage": "Autorisations d'utilisateur insuffisantes pour les données de monitoring",
     "xpack.monitoring.errors.invalidAuthErrorMessage": "Authentification non valide pour le cluster de monitoring",
@@ -17174,6 +20476,8 @@
     "xpack.monitoring.es.nodeType.masterNodeLabel": "Nœud maître",
     "xpack.monitoring.es.nodeType.masterOnlyNodeLabel": "Nœud maître uniquement",
     "xpack.monitoring.es.nodeType.nodeLabel": "Nœud",
+    "xpack.monitoring.esItemNavigation.advancedLinkText": "Avancé",
+    "xpack.monitoring.esItemNavigation.overviewLinkText": "Aperçu",
     "xpack.monitoring.esNavigation.ccrLinkText": "CCR",
     "xpack.monitoring.esNavigation.indicesLinkText": "Index",
     "xpack.monitoring.esNavigation.jobsLinkText": "Tâches de Machine Learning",
@@ -17190,11 +20494,13 @@
     "xpack.monitoring.featureCatalogueDescription": "Suivez l'état et les performances de votre déploiement en temps réel.",
     "xpack.monitoring.featureCatalogueTitle": "Monitorer la Suite",
     "xpack.monitoring.featureRegistry.monitoringFeatureName": "Monitoring de la Suite",
+    "xpack.monitoring.formatMsg.toaster.errorStatusMessage": "Erreur {errStatus} {errStatusText} : {errMessage}.",
+    "xpack.monitoring.formatMsg.toaster.unavailableServerErrorMessage": "Échec de connexion d'une requête HTTP. Vérifiez que le serveur Kibana est en cours d'exécution et que votre navigateur dispose d'une connexion opérationnelle, ou contactez votre administrateur système.",
     "xpack.monitoring.formatNumbers.notAvailableLabel": "S. O.",
     "xpack.monitoring.healthCheck.disabledWatches.text": "Consultez la définition de l'alerte à l'aide du mode Configuration et configurez des connecteurs d'action supplémentaires pour être notifié par le biais de votre méthode favorite.",
     "xpack.monitoring.healthCheck.disabledWatches.title": "Nouvelles alertes créées",
     "xpack.monitoring.healthCheck.encryptionErrorAction": "Découvrez comment faire.",
-    "xpack.monitoring.healthCheck.tlsAndEncryptionError": "Le monitoring de la Suite requiert Transport Layer Security entre Kibana et Elasticsearch, et une clé de chiffrement dans votre fichier kibana.yml.",
+    "xpack.monitoring.healthCheck.tlsAndEncryptionError": "Les règles de monitoring de la Suite requièrent l’activation des clés API ainsi que la configuration d’une clé de chiffrement.",
     "xpack.monitoring.healthCheck.tlsAndEncryptionErrorTitle": "Configuration supplémentaire requise",
     "xpack.monitoring.healthCheck.unableToDisableWatches.action": "En savoir plus.",
     "xpack.monitoring.healthCheck.unableToDisableWatches.text": "Impossible de retirer les alertes des clusters existants. Veuillez vérifier le log du serveur Kibana pour plus de détails, ou réessayez ultérieurement.",
@@ -17223,6 +20529,7 @@
     "xpack.monitoring.kibana.listing.responseTimeColumnTitle": "Temps de réponse",
     "xpack.monitoring.kibana.listing.statusColumnTitle": "Statut",
     "xpack.monitoring.kibana.overview.pageTitle": "Aperçu Kibana",
+    "xpack.monitoring.kibana.overview.title": "Kibana",
     "xpack.monitoring.kibana.shardActivity.bytesTitle": "Octets",
     "xpack.monitoring.kibana.shardActivity.filesTitle": "Fichiers",
     "xpack.monitoring.kibana.shardActivity.indexTitle": "Index",
@@ -17291,6 +20598,7 @@
     "xpack.monitoring.logstash.detailStatus.versionLabel": "Version",
     "xpack.monitoring.logstash.filterNodesPlaceholder": "Filtrer les nœuds…",
     "xpack.monitoring.logstash.filterPipelinesPlaceholder": "Filtrer les pipelines…",
+    "xpack.monitoring.logstash.instances.heading": "Instances Logstash",
     "xpack.monitoring.logstash.node.advanced.pageTitle": "Nœud Logstash : {nodeName}",
     "xpack.monitoring.logstash.node.advanced.routeTitle": "Logstash - {nodeName} - Avancé",
     "xpack.monitoring.logstash.node.pageTitle": "Nœud Logstash : {nodeName}",
@@ -17309,7 +20617,10 @@
     "xpack.monitoring.logstash.nodes.pageTitle": "Nœuds Logstash",
     "xpack.monitoring.logstash.nodes.routeTitle": "Logstash - Nœuds",
     "xpack.monitoring.logstash.nodes.versionTitle": "Version",
+    "xpack.monitoring.logstash.overview.heading": "Aperçu Logstash",
     "xpack.monitoring.logstash.overview.pageTitle": "Aperçu de Logstash",
+    "xpack.monitoring.logstash.overview.title": "Logstash",
+    "xpack.monitoring.logstash.pipeline_viewer.heading": "Pipelines Logstash",
     "xpack.monitoring.logstash.pipeline.detailDrawer.conditionalStatementDescription": "Il s'agit d'une instruction conditionnelle de votre pipeline.",
     "xpack.monitoring.logstash.pipeline.detailDrawer.eventsEmittedLabel": "Événements émis",
     "xpack.monitoring.logstash.pipeline.detailDrawer.eventsEmittedRateLabel": "Taux d'événements émis",
@@ -17335,6 +20646,7 @@
     "xpack.monitoring.logstash.pipelineViewer.filtersTitle": "Filtres",
     "xpack.monitoring.logstash.pipelineViewer.inputsTitle": "Entrées",
     "xpack.monitoring.logstash.pipelineViewer.outputsTitle": "Sorties",
+    "xpack.monitoring.logstash.pipline_listing.heading": "Pipelines Logstash",
     "xpack.monitoring.logstashNavigation.instance.advancedLinkText": "Avancé",
     "xpack.monitoring.logstashNavigation.instance.overviewLinkText": "Aperçu",
     "xpack.monitoring.logstashNavigation.instance.pipelinesLinkText": "Pipelines",
@@ -17625,6 +20937,59 @@
     "xpack.monitoring.metrics.beatsInstance.throughput.bytesSentDescription": "Octets écrits vers la sortie (comprennent la taille des en-têtes réseau et la charge utile compressée)",
     "xpack.monitoring.metrics.beatsInstance.throughput.bytesSentLabel": "Octets envoyés",
     "xpack.monitoring.metrics.beatsInstance.throughputTitle": "Rendement",
+    "xpack.monitoring.metrics.enterpriseSearch.heap_total.description": "Nombre maximal de segments de mémoire JVM disponibles pour l’application.",
+    "xpack.monitoring.metrics.entSearch.active_crawler_workers": "Actif",
+    "xpack.monitoring.metrics.entSearch.active_crawler_workers.description": "Robots d’indexation App Search actuellement actifs.",
+    "xpack.monitoring.metrics.entSearch.app_search_engines": "Moteurs App Search",
+    "xpack.monitoring.metrics.entSearch.app_search_engines.description": "Nombre de moteurs App Search actuellement compris dans le déploiement Enterprise Search.",
+    "xpack.monitoring.metrics.entSearch.crawler_workers": "Robots d’indexation",
+    "xpack.monitoring.metrics.entSearch.current_http_connections.description": "Taux de connexions HTTP entrantes sur toutes les instances.",
+    "xpack.monitoring.metrics.entSearch.finalizer_objects": "Objets JVM en attente de finalisation",
+    "xpack.monitoring.metrics.entSearch.finalizer_objects.description": "Nombre d’objets du tas JVM en attente du thread finaliseur.",
+    "xpack.monitoring.metrics.entSearch.gc_rate": "Taux RM JVM",
+    "xpack.monitoring.metrics.entSearch.gc_rate.description": "Taux d’invocations de récupération de mémoire JVM sur l’ensemble du parc.",
+    "xpack.monitoring.metrics.entSearch.gc_time": "Temps passé sur la récupération de mémoire JVM",
+    "xpack.monitoring.metrics.entSearch.gc_time.description": "Temps passé à effectuer les récupérations de mémoire JVM",
+    "xpack.monitoring.metrics.entSearch.heap_committed": "Alloué",
+    "xpack.monitoring.metrics.entSearch.heap_committed.description": "Quantité de mémoire disponible pour l’application, allouée par JVM à partir du système d’exploitation.",
+    "xpack.monitoring.metrics.entSearch.heap_total": "Total",
+    "xpack.monitoring.metrics.entSearch.heap_used": "Utilisé",
+    "xpack.monitoring.metrics.entSearch.heap_used.description": "Nombre de segments de mémoire JVM actuellement utilisés par l’application.",
+    "xpack.monitoring.metrics.entSearch.http_1xx.rate.description": "Réponses HTTP 1xx sortantes sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_2xx.rate.description": "Réponses HTTP 2xx sortantes sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_3xx.rate.description": "Réponses HTTP 3xx sortantes sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_4xx.rate.description": "Réponses HTTP 4xx sortantes sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_5xx.rate.description": "Réponses HTTP 5xx sortantes sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_bytes_received.rate": "Reçu",
+    "xpack.monitoring.metrics.entSearch.http_bytes_received.rate.description": "Trafic HTTP entrant sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_bytes_received.total": "Octets HTTP reçus",
+    "xpack.monitoring.metrics.entSearch.http_bytes_received.total.description": "Nombre total d’octets reçus par l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_bytes_sent.rate": "Envoyé",
+    "xpack.monitoring.metrics.entSearch.http_bytes_sent.rate.description": "Trafic HTTP sortant sur l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_bytes_sent.total": "Octets HTTP envoyés",
+    "xpack.monitoring.metrics.entSearch.http_bytes_sent.total.description": "Nombre total d’octets envoyés par l’ensemble des instances du déploiement.",
+    "xpack.monitoring.metrics.entSearch.http_connections.current": "Connexions HTTP ouvertes",
+    "xpack.monitoring.metrics.entSearch.http_connections.current.description": "Connexions HTTP entrantes actuellement ouvertes sur l’ensemble des instances.",
+    "xpack.monitoring.metrics.entSearch.http_connections.rate": "Taux de connexions HTTP",
+    "xpack.monitoring.metrics.entSearch.http_response_rate": "Réponses HTTP",
+    "xpack.monitoring.metrics.entSearch.http_traffic": "Trafic HTTP",
+    "xpack.monitoring.metrics.entSearch.jvm_heap_usage": "Utilisation du tas JVM",
+    "xpack.monitoring.metrics.entSearch.msTimeUnitLabel": "ms",
+    "xpack.monitoring.metrics.entSearch.perSecondUnitLabel": "/s",
+    "xpack.monitoring.metrics.entSearch.threads": "Threads JVM",
+    "xpack.monitoring.metrics.entSearch.threads.current": "Threads actifs",
+    "xpack.monitoring.metrics.entSearch.threads.current.description": "Threads JVM en cours d’exécution utilisés par l’application.",
+    "xpack.monitoring.metrics.entSearch.threads.daemon": "Threads démon",
+    "xpack.monitoring.metrics.entSearch.threads.daemon.description": "Threads démon JVM en cours d’exécution utilisés par l’application.",
+    "xpack.monitoring.metrics.entSearch.threads.rate": "Taux de création de threads",
+    "xpack.monitoring.metrics.entSearch.threads.rate.description": "Threads JVM en cours d’exécution utilisés par l’application.",
+    "xpack.monitoring.metrics.entSearch.total_crawler_workers": "Total",
+    "xpack.monitoring.metrics.entSearch.total_crawler_workers.description": "Nombre de robots d’indexation configurés sur toutes les instances d’App Search.",
+    "xpack.monitoring.metrics.entSearch.workplace_search_content_sources": "Sources de contenu Workpace Search",
+    "xpack.monitoring.metrics.entSearch.workplace_search_org_sources": "Sources d’organisation",
+    "xpack.monitoring.metrics.entSearch.workplace_search_org_sources.description": "Nombre de sources de contenu d’organisation Workplace Search actuellement comprises dans le déploiement Enterprise Search.",
+    "xpack.monitoring.metrics.entSearch.workplace_search_private_sources": "Sources privées",
+    "xpack.monitoring.metrics.entSearch.workplace_search_private_sources.description": "Nombre de sources de contenu privées Workplace Search actuellement comprises dans le déploiement Enterprise Search.",
     "xpack.monitoring.metrics.es.indexingLatencyDescription": "Latence moyenne pour l'indexation des documents, ce qui correspond à la durée d'indexation des documents divisée par le nombre de documents indexés. Seules les partitions principales sont prises en compte.",
     "xpack.monitoring.metrics.es.indexingLatencyLabel": "Latence d'indexation",
     "xpack.monitoring.metrics.es.indexingRate.primaryShardsDescription": "Nombre de documents en cours d'indexation pour les partitions principales.",
@@ -17662,6 +21027,7 @@
     "xpack.monitoring.metrics.esIndex.fielddataLabel": "Données de champ",
     "xpack.monitoring.metrics.esIndex.fixedBitsetsDescription": "Tas utilisé par les tableaux de bits fixes (par ex., documents profondément imbriqués). Il fait partie de Lucene Total.",
     "xpack.monitoring.metrics.esIndex.fixedBitsetsLabel": "Tableaux de bits fixes",
+    "xpack.monitoring.metrics.esIndex.fixedBitsetsTitle": "Mémoire d'index - Lucene",
     "xpack.monitoring.metrics.esIndex.indexingRate.primaryShardsDescription": "Nombre de documents en cours d'indexation pour les partitions principales.",
     "xpack.monitoring.metrics.esIndex.indexingRate.primaryShardsLabel": "Partitions principales",
     "xpack.monitoring.metrics.esIndex.indexingRate.totalShardsDescription": "Nombre de documents en cours d'indexation pour les partitions principales et les répliques.",
@@ -17716,7 +21082,7 @@
     "xpack.monitoring.metrics.esNode.cgroupCfsStats.cgroupThrottledCountDescription": "Nombre de fois où le processeur a été régulé par le Cgroup.",
     "xpack.monitoring.metrics.esNode.cgroupCfsStats.cgroupThrottledCountLabel": "Nombre de régulations Cgroup",
     "xpack.monitoring.metrics.esNode.cgroupCfsStatsTitle": "Statistiques CFS Cgroup",
-    "xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupThrottlingDescription": "Durée de régulation du Cgroup enregistrée en nanosecondes.",
+    "xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupThrottlingDescription": "Durée de régulation du Cgroup, enregistrée en nanosecondes.",
     "xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupThrottlingLabel": "Régulation Cgroup",
     "xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupUsageDescription": "Utilisation du Cgroup, enregistrée en nanosecondes. À comparer avec la régulation pour découvrir les erreurs.",
     "xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupUsageLabel": "Utilisation du Cgroup",
@@ -17734,6 +21100,7 @@
     "xpack.monitoring.metrics.esNode.fielddataLabel": "Données de champ",
     "xpack.monitoring.metrics.esNode.fixedBitsetsDescription": "Tas utilisé par les tableaux de bits fixes (par ex., documents profondément imbriqués). Il fait partie de Lucene Total.",
     "xpack.monitoring.metrics.esNode.fixedBitsetsLabel": "Tableaux de bits fixes",
+    "xpack.monitoring.metrics.esNode.fixedBitsetsTitle": "Mémoire d'index - Lucene",
     "xpack.monitoring.metrics.esNode.gcCount.oldDescription": "Nombre de récupérations de mémoire anciennes.",
     "xpack.monitoring.metrics.esNode.gcCount.oldLabel": "Ancien",
     "xpack.monitoring.metrics.esNode.gcCount.youngDescription": "Nombre de récupérations de mémoire récentes.",
@@ -17742,7 +21109,7 @@
     "xpack.monitoring.metrics.esNode.gcDuration.oldLabel": "Ancien",
     "xpack.monitoring.metrics.esNode.gcDuration.youngDescription": "Temps passé à effectuer les récupérations de mémoire récentes.",
     "xpack.monitoring.metrics.esNode.gcDuration.youngLabel": "Récent",
-    "xpack.monitoring.metrics.esNode.gsCountTitle": "Nb de récupérations de mémoire",
+    "xpack.monitoring.metrics.esNode.gsCountTitle": "Taux RM",
     "xpack.monitoring.metrics.esNode.gsDurationTitle": "Durée de récupération de mémoire",
     "xpack.monitoring.metrics.esNode.indexingThreads.searchRejectionsDescription": "Nombre d'opérations de recherche ayant été rejetées en cas de saturation de la file d'attente.",
     "xpack.monitoring.metrics.esNode.indexingThreads.searchRejectionsLabel": "Rejets de recherche",
@@ -17768,7 +21135,7 @@
     "xpack.monitoring.metrics.esNode.jvmHeap.maxHeapLabel": "Tas max.",
     "xpack.monitoring.metrics.esNode.jvmHeap.usedHeapDescription": "Tas total utilisé par l'exécution d'Elasticsearch sur la JVM.",
     "xpack.monitoring.metrics.esNode.jvmHeap.usedHeapLabel": "Tas utilisé",
-    "xpack.monitoring.metrics.esNode.jvmHeapTitle": "{javaVirtualMachine} Heap",
+    "xpack.monitoring.metrics.esNode.jvmHeapTitle": "Tas {javaVirtualMachine}",
     "xpack.monitoring.metrics.esNode.latency.indexingDescription": "Latence moyenne pour l'indexation des documents, ce qui correspond à la durée d'indexation des documents divisée par le nombre de documents indexés. Sont prises en compte toutes les partitions se trouvant sur ce nœud, y compris les répliques.",
     "xpack.monitoring.metrics.esNode.latency.indexingLabel": "Indexation",
     "xpack.monitoring.metrics.esNode.latency.searchDescription": "Latence moyenne pour les recherches, ce qui correspond à la durée d'exécution des recherches divisée par le nombre de recherches soumises. Sont prises en compte les partitions principales et les répliques.",
@@ -17908,7 +21275,7 @@
     "xpack.monitoring.metrics.logstashInstance.jvmHeap.maxHeapLabel": "Tas max.",
     "xpack.monitoring.metrics.logstashInstance.jvmHeap.usedHeapDescription": "Tas total utilisé par l'exécution Logstash sur la JVM.",
     "xpack.monitoring.metrics.logstashInstance.jvmHeap.usedHeapLabel": "Tas utilisé",
-    "xpack.monitoring.metrics.logstashInstance.jvmHeapTitle": "{javaVirtualMachine} Heap",
+    "xpack.monitoring.metrics.logstashInstance.jvmHeapTitle": "Tas {javaVirtualMachine}",
     "xpack.monitoring.metrics.logstashInstance.maxQueueSizeDescription": "Taille maximale définie pour les files d'attente persistantes sur ce nœud.",
     "xpack.monitoring.metrics.logstashInstance.maxQueueSizeLabel": "Taille de file d'attente maximale",
     "xpack.monitoring.metrics.logstashInstance.persistentQueueEventsTitle": "Événements en file d'attente persistante",
@@ -17925,6 +21292,8 @@
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last1MinuteLabel": "1 min",
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last5MinutesDescription": "Moyenne de la charge sur les 5 dernières minutes.",
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last5MinutesLabel": "5 min",
+    "xpack.monitoring.no_data.heading": "Aucune donnée de monitoring n'a été trouvée.",
+    "xpack.monitoring.no_data.internal_collection.heading": "Aucune donnée de monitoring n'a été trouvée.",
     "xpack.monitoring.noData.blurbs.changesNeededDescription": "Pour lancer le monitoring, veuillez effectuer la procédure suivante",
     "xpack.monitoring.noData.blurbs.changesNeededTitle": "Vous devez faire quelques ajustements",
     "xpack.monitoring.noData.blurbs.cloudDeploymentDescription": "Configurer le monitoring via ",
@@ -17934,12 +21303,14 @@
     "xpack.monitoring.noData.blurbs.lookingForMonitoringDataTitle": "Nous recherchons vos données de monitoring",
     "xpack.monitoring.noData.blurbs.monitoringIsOffDescription": "Le monitoring fournit des informations précieuses sur les performances matérielles et la charge.",
     "xpack.monitoring.noData.blurbs.monitoringIsOffTitle": "Le monitoring est actuellement désactivé",
+    "xpack.monitoring.noData.checker.clusterSettings": "Vérification de l’API des paramètres de cluster sur le cluster de production",
+    "xpack.monitoring.noData.checker.nodesSettings": "Vérification de l’API des paramètres de nœud sur le cluster de production",
     "xpack.monitoring.noData.checkerErrors.checkEsSettingsErrorMessage": "Des erreurs se sont produites lors de la vérification des paramètres Elasticsearch. Vous devez disposer des droits d'administrateur pour vérifier les paramètres et, si besoin, pour activer les paramètres de collecte de monitoring.",
     "xpack.monitoring.noData.cloud.description": "Le monitoring fournit des informations précieuses sur les performances matérielles et la charge.",
     "xpack.monitoring.noData.cloud.heading": "Aucune donnée de monitoring n'a été trouvée.",
     "xpack.monitoring.noData.cloud.title": "Données de monitoring non disponibles",
     "xpack.monitoring.noData.collectionInterval.turnOnMonitoringButtonLabel": "Configurer le monitoring avec Metricbeat",
-    "xpack.monitoring.noData.defaultLoadingMessage": "Chargement en cours, veuillez patienter",
+    "xpack.monitoring.noData.defaultLoadingMessage": "Chargement en cours, veuillez patienter...",
     "xpack.monitoring.noData.explanations.collectionEnabled.monitoringTurnedOnDescription": "Lorsque les données se trouvent dans votre cluster, votre tableau de bord de monitoring s'affiche ici. Cela peut prendre quelques secondes.",
     "xpack.monitoring.noData.explanations.collectionEnabled.monitoringTurnedOnTitle": "Cette action a réussi ! Obtention de vos données de monitoring.",
     "xpack.monitoring.noData.explanations.collectionEnabled.stillWaitingLinkText": "Vous attendez toujours ?",
@@ -18011,90 +21382,145 @@
     "xpack.monitoring.summaryStatus.statusIconLabel": "Statut : {status}",
     "xpack.monitoring.summaryStatus.statusIconTitle": "Statut : {statusIcon}",
     "xpack.monitoring.updateLicenseButtonLabel": "Mettre à jour la licence",
-    "xpack.monitoring.updateLicenseTitle": "Mettez à jour votre licence",
+    "xpack.monitoring.updateLicenseTitle": "Mettre à jour votre licence",
     "xpack.monitoring.useAvailableLicenseDescription": "Si vous avez déjà une nouvelle licence, chargez-la maintenant.",
+    "xpack.observability..synthetics.addDataButtonLabel": "Ajouter des données synthétiques",
+    "xpack.observability.alerts.alertStatusFilter.active": "Actif",
+    "xpack.observability.alerts.alertStatusFilter.recovered": "Récupéré",
+    "xpack.observability.alerts.alertStatusFilter.showAll": "Afficher tout",
     "xpack.observability.alerts.manageRulesButtonLabel": "Gérer les règles",
-    "xpack.observability.alerts.searchBarPlaceholder": "kibana.alert.evaluation.threshold > 75",
-    "xpack.observability.alertsDisclaimerLinkText": "Alertes et actions",
-    "xpack.observability.alertsDisclaimerTitle": "Expérimental",
+    "xpack.observability.alerts.ruleStats.disabled": "Désactivé",
+    "xpack.observability.alerts.ruleStats.errors": "Erreurs",
+    "xpack.observability.alerts.ruleStats.loadError": "Impossible de charger les statistiques de règles",
+    "xpack.observability.alerts.ruleStats.muted": "Répété",
+    "xpack.observability.alerts.ruleStats.ruleCount": "Nombre de règles",
+    "xpack.observability.alerts.searchBarPlaceholder": "Alertes de recherche (par exemple, kibana.alert.evaluation.threshold > 75)",
+    "xpack.observability.alerts.workflowStatusFilter.acknowledgedButtonLabel": "Reconnue(s)",
+    "xpack.observability.alerts.workflowStatusFilter.closedButtonLabel": "Fermé",
+    "xpack.observability.alerts.workflowStatusFilter.openButtonLabel": "Ouvrir",
+    "xpack.observability.alertsDisclaimerDismissMessage": "Ignorer le message",
+    "xpack.observability.alertsDisclaimerLinkText": "commentaires",
+    "xpack.observability.alertsDisclaimerText": "Cette fonctionnalité est en version d’évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Veuillez laisser des {feedback}.",
+    "xpack.observability.alertsDisclaimerTitle": "Version d’évaluation technique",
     "xpack.observability.alertsFlyout.actualValueLabel": "Valeur réelle",
+    "xpack.observability.alertsFlyout.documentSummaryTitle": "Résumé du document",
     "xpack.observability.alertsFlyout.durationLabel": "Durée",
     "xpack.observability.alertsFlyout.expectedValueLabel": "Valeur attendue",
+    "xpack.observability.alertsFlyout.lastUpdatedLabel": "Dernière mise à jour",
+    "xpack.observability.alertsFlyout.reasonTitle": "Raison",
     "xpack.observability.alertsFlyout.ruleTypeLabel": "Type de règle",
     "xpack.observability.alertsFlyout.statusLabel": "Statut",
+    "xpack.observability.alertsFlyout.viewInAppButtonText": "Afficher dans l'application",
+    "xpack.observability.alertsFlyout.viewRulesDetailsLinkText": "Afficher les détails de la règle",
     "xpack.observability.alertsLinkTitle": "Alertes",
     "xpack.observability.alertsTable.actionsTextLabel": "Actions",
     "xpack.observability.alertsTable.footerTextLabel": "alertes",
     "xpack.observability.alertsTable.loadingTextLabel": "chargement des alertes",
+    "xpack.observability.alertsTable.moreActionsTextLabel": "Plus d'actions",
+    "xpack.observability.alertsTable.notEnoughPermissions": "Privilèges supplémentaires requis",
     "xpack.observability.alertsTable.showingAlertsTitle": "{totalAlerts, plural, =1 {alerte} other {alertes}}",
+    "xpack.observability.alertsTable.viewDetailsTextLabel": "Afficher les détails",
+    "xpack.observability.alertsTable.viewInAppTextLabel": "Afficher dans l'application",
+    "xpack.observability.alertsTable.viewRuleDetailsButtonText": "Afficher les détails de la règle",
     "xpack.observability.alertsTGrid.durationColumnDescription": "Durée",
     "xpack.observability.alertsTGrid.lastUpdatedColumnDescription": "Dernière mise à jour",
     "xpack.observability.alertsTGrid.reasonColumnDescription": "Raison",
-    "xpack.observability.alertsTGrid.statusColumnDescription": "Statut",
+    "xpack.observability.alertsTGrid.statusActiveDescription": "Actif",
+    "xpack.observability.alertsTGrid.statusColumnDescription": "Statut de l'alerte",
+    "xpack.observability.alertsTGrid.statusRecoveredDescription": "Récupéré",
     "xpack.observability.alertsTitle": "Alertes",
+    "xpack.observability.apmServiceInventoryOptimizedSorting": "Optimiser les performances de chargement de la page d’inventaire des services APM",
+    "xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} Tri par défaut de la page d’inventaire des services APM (pour les services hors Machine Learning) en fonction du nom de service",
+    "xpack.observability.apply.label": "Appliquer",
     "xpack.observability.breadcrumbs.alertsLinkText": "Alertes",
     "xpack.observability.breadcrumbs.landingLinkText": "Premiers pas",
     "xpack.observability.breadcrumbs.observabilityLinkText": "Observability",
     "xpack.observability.breadcrumbs.overviewLinkText": "Aperçu",
+    "xpack.observability.breadcrumbs.rulesLinkText": "Règles",
     "xpack.observability.cases.caseFeatureNoPermissionsMessage": "Pour afficher les cas, vous devez disposer de privilèges pour la fonctionnalité Cas dans l'espace Kibana. Pour en savoir plus, contactez votre administrateur Kibana.",
     "xpack.observability.cases.caseFeatureNoPermissionsTitle": "Privilèges de fonctionnalité Kibana requis",
     "xpack.observability.cases.caseView.goToDocumentationButton": "Afficher la documentation",
-    "xpack.observability.emptySection.apps.alert.description": "Beaucoup d'erreurs 503 ? Les services répondent-ils ? L'utilisation de la RAM et du processeur explose ? Consultez les avertissements au moment où ils apparaissent, pas au cours de l'analyse post-mortem.",
+    "xpack.observability.defaultApmServiceEnvironment": "Environnement de service par défaut",
+    "xpack.observability.defaultApmServiceEnvironmentDescription": "Définissez l’environnement par défaut pour l’application APM. Sinon, les données de tous les environnements sont affichées par défaut.",
+    "xpack.observability.detectionEngine.alerts.actions.addToCase": "Ajouter à un cas existant",
+    "xpack.observability.detectionEngine.alerts.actions.addToNewCase": "Ajouter au nouveau cas",
+    "xpack.observability.emptySection.apps.alert.description": "Détectez des conditions complexes dans Observability et déclenchez des actions lorsque ces conditions sont satisfaites.",
     "xpack.observability.emptySection.apps.alert.link": "Créer une règle",
     "xpack.observability.emptySection.apps.alert.title": "Aucune alerte n'a été trouvée.",
-    "xpack.observability.emptySection.apps.apm.description": "Suivez les transactions via une architecture distribuée et mappez vos interactions de services pour repérer facilement les goulets d'étranglement des performances.",
+    "xpack.observability.emptySection.apps.apm.description": "Obtenez une meilleure visibilité sur vos applications avec un support technique renforcé pour les langues populaires, OpenTelemetry et le traçage distribué.",
     "xpack.observability.emptySection.apps.apm.link": "Installer l'agent",
     "xpack.observability.emptySection.apps.apm.title": "APM",
-    "xpack.observability.emptySection.apps.logs.description": "Centralisez les logs à partir de n'importe quelle source. Recherchez, suivez, automatisez la détection des anomalies et visualisez les tendances afin d'entreprendre des actions plus rapidement.",
+    "xpack.observability.emptySection.apps.logs.description": "Un monitoring rapide, simple, évolutif et centralisé des logs avec un support technique dédié pour les sources de données les plus communes.",
     "xpack.observability.emptySection.apps.logs.link": "Installer Filebeat",
     "xpack.observability.emptySection.apps.logs.title": "Logs",
-    "xpack.observability.emptySection.apps.metrics.description": "Analysez les indicateurs à partir de votre infrastructure, vos applications et vos services. Découvrez les tendances, prévoyez les comportements, recevez des alertes sur les anomalies, et plus encore.",
+    "xpack.observability.emptySection.apps.metrics.description": "Diffusez, visualisez et analysez vos indicateurs d’infrastructure.",
     "xpack.observability.emptySection.apps.metrics.link": "Installer Metricbeat",
     "xpack.observability.emptySection.apps.metrics.title": "Indicateurs",
-    "xpack.observability.emptySection.apps.uptime.description": "Monitorez de façon proactive la disponibilité de vos sites et services. Recevez des alertes et corrigez les problèmes plus rapidement pour optimiser l'expérience de vos utilisateurs.",
+    "xpack.observability.emptySection.apps.uptime.description": "Monitorez la disponibilité et la fonctionnalité de manière proactive sur les parcours de vos clients.",
     "xpack.observability.emptySection.apps.uptime.link": "Installer Heartbeat",
     "xpack.observability.emptySection.apps.uptime.title": "Uptime",
-    "xpack.observability.emptySection.apps.ux.description": "Les performances se mesurent selon une distribution. Mesurez les expériences de tous les visiteurs sur votre application Web et comprenez comment améliorer l'expérience de tous.",
+    "xpack.observability.emptySection.apps.ux.description": "Collectez, mesurez et analysez les données de performances reflétant les expériences des utilisateurs réels.",
     "xpack.observability.emptySection.apps.ux.link": "Installer RUM Agent",
     "xpack.observability.emptySection.apps.ux.title": "Expérience utilisateur",
+    "xpack.observability.enableComparisonByDefault": "Fonctionnalité de comparaison",
+    "xpack.observability.enableComparisonByDefaultDescription": "Activer la fonctionnalité de comparaison dans l’application APM",
+    "xpack.observability.enableInfrastructureView": "Fonctionnalité d'infrastructure",
+    "xpack.observability.enableInfrastructureViewDescription": "Activer la fonctionnalité d’infrastructure dans l’application APM",
     "xpack.observability.enableInspectEsQueriesExperimentDescription": "Inspectez les recherches Elasticsearch dans les réponses API.",
-    "xpack.observability.enableInspectEsQueriesExperimentName": "inspecter les recherches ES",
+    "xpack.observability.enableInspectEsQueriesExperimentName": "Inspecter les recherches ES",
+    "xpack.observability.enableServiceGroups": "Fonctionnalité de groupes de services",
+    "xpack.observability.enableServiceGroupsDescription": "{technicalPreviewLabel} Activer la fonctionnalité de groupes de services sur l’interface utilisateur APM",
     "xpack.observability.exp.breakDownFilter.noBreakdown": "Pas de répartition",
-    "xpack.observability.experimentalBadgeDescription": "Cette fonctionnalité est expérimentale et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités expérimentales ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
-    "xpack.observability.experimentalBadgeLabel": "Expérimental",
+    "xpack.observability.exp.breakDownFilter.unavailable": "La répartition par nom d’étape n’est pas disponible pour l’indicateur de durée de monitoring. Utilisez l’indicateur de durée d’étape pour répartir par nom d’étape.",
+    "xpack.observability.exp.breakDownFilter.warning": "Les répartitions ne peuvent être appliquées qu’à une seule série à la fois.",
+    "xpack.observability.experimentalBadgeDescription": "Cette fonctionnalité est en version d’évaluation technique et peut être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "xpack.observability.experimentalBadgeLabel": "Version d’évaluation technique",
+    "xpack.observability.exploratoryView.logs.logRateXAxisLabel": "Horodatage",
+    "xpack.observability.exploratoryView.logs.logRateYAxisLabel": "Taux de log par minute",
     "xpack.observability.exploratoryView.noBrusing": "Zoomer sur une sélection par brossage est une fonctionnalité disponible uniquement dans les graphiques de séries temporelles.",
+    "xpack.observability.expView.addToCase": "Ajouter au cas",
     "xpack.observability.expView.chartTypes.label": "Type de graphique",
     "xpack.observability.expView.columns.label": "{percentileValue} centile de {sourceField}",
     "xpack.observability.expView.columns.operation.label": "{operationType} de {sourceField}",
     "xpack.observability.expView.dateRanger.endDate": "Date de fin",
     "xpack.observability.expView.dateRanger.startDate": "Date de début",
+    "xpack.observability.expView.explore": "Explorer",
     "xpack.observability.expView.fieldLabels.agentHost": "Hôte de l'agent",
+    "xpack.observability.expView.fieldLabels.agentType": "Type d'agent",
     "xpack.observability.expView.fieldLabels.backend": "Heure de backend",
     "xpack.observability.expView.fieldLabels.browserFamily": "Famille de navigateurs",
     "xpack.observability.expView.fieldLabels.browserVersion": "Version de navigateur",
     "xpack.observability.expView.fieldLabels.carrierLocation": "Emplacement de l'opérateur",
     "xpack.observability.expView.fieldLabels.carrierName": "Nom de l'opérateur",
+    "xpack.observability.expView.fieldLabels.chooseField": "Champ d’étiquettes",
     "xpack.observability.expView.fieldLabels.cls": "Cumulative Layout Shift",
     "xpack.observability.expView.fieldLabels.connectionType": "Type de connexion",
     "xpack.observability.expView.fieldLabels.coreWebVitals": "Core Web Vitals",
     "xpack.observability.expView.fieldLabels.cpuUsage": "Utilisation CPU",
+    "xpack.observability.expView.fieldLabels.cpuUsage.docker": "Utilisation CPU Docker",
+    "xpack.observability.expView.fieldLabels.cpuUsage.k8sDocker": "Utilisation CPU pod K8s",
+    "xpack.observability.expView.fieldLabels.cpuUsage.system": "Utilisation CPU système",
     "xpack.observability.expView.fieldLabels.dcl": "Contenu DOM chargé",
     "xpack.observability.expView.fieldLabels.device": "Appareil",
     "xpack.observability.expView.fieldLabels.deviceDistribution": "Distribution de l'appareil",
     "xpack.observability.expView.fieldLabels.deviceModel": "Modèle de l'appareil",
     "xpack.observability.expView.fieldLabels.downPings": "Pings arrêtés",
     "xpack.observability.expView.fieldLabels.environment": "Environnement",
+    "xpack.observability.expView.fieldLabels.eventDataset": "Ensemble de données",
     "xpack.observability.expView.fieldLabels.fcp": "First Contentful Paint",
     "xpack.observability.expView.fieldLabels.fid": "First Input Delay",
     "xpack.observability.expView.fieldLabels.hostName": "Nom de l'hôte",
     "xpack.observability.expView.fieldLabels.hostOS": "Système d'exploitation de l'hôte",
     "xpack.observability.expView.fieldLabels.kpi": "KPI",
     "xpack.observability.expView.fieldLabels.kpiOverTime": "KPI sur la durée",
+    "xpack.observability.expView.fieldLabels.labels": "Étiquettes",
     "xpack.observability.expView.fieldLabels.lcp": "Largest Contentful Paint",
     "xpack.observability.expView.fieldLabels.location": "Emplacement",
+    "xpack.observability.expView.fieldLabels.logRate": "Taux du log",
     "xpack.observability.expView.fieldLabels.memoryUsage": "Utilisation mémoire système",
+    "xpack.observability.expView.fieldLabels.message": "Message",
     "xpack.observability.expView.fieldLabels.metric": "Indicateur",
-    "xpack.observability.expView.fieldLabels.mobile.memoryUsage": "Utilisation mémoire",
+    "xpack.observability.expView.fieldLabels.mobile.memoryUsage": "Utilisation mémoire système",
     "xpack.observability.expView.fieldLabels.mobileApp": "Application mobile",
     "xpack.observability.expView.fieldLabels.mobileResponse": "Réponse mobile",
     "xpack.observability.expView.fieldLabels.monitorDurationLabel": "Durée du moniteur",
@@ -18116,7 +21542,10 @@
     "xpack.observability.expView.fieldLabels.requestMethod": "Méthode de requête",
     "xpack.observability.expView.fieldLabels.responseLatency": "Latence",
     "xpack.observability.expView.fieldLabels.serviceName": "Nom de service",
+    "xpack.observability.expView.fieldLabels.serviceType": "Type de service",
     "xpack.observability.expView.fieldLabels.serviceVersion": "Version du service",
+    "xpack.observability.expView.fieldLabels.stepDurationLabel": "Durée de l’étape",
+    "xpack.observability.expView.fieldLabels.stepNameLabel": "Nom de l'étape",
     "xpack.observability.expView.fieldLabels.tags": "Balises",
     "xpack.observability.expView.fieldLabels.tbt": "Temps de blocage total",
     "xpack.observability.expView.fieldLabels.transactionPerMinute": "Rendement",
@@ -18124,38 +21553,81 @@
     "xpack.observability.expView.fieldLabels.url": "URL",
     "xpack.observability.expView.fieldLabels.webApplication": "Application Web",
     "xpack.observability.expView.filterValueButton.negate": "Pas {value}",
-    "xpack.observability.expView.heading.label": "Analyser les données",
+    "xpack.observability.expView.heading.addToCase": "Ajouter au cas",
+    "xpack.observability.expView.heading.addToCase.notification": "Visualisation correctement ajoutée au cas : {caseTitle}",
+    "xpack.observability.expView.heading.addToCase.notification.error": "Impossible d’ajouter la visualisation au cas sélectionné.",
+    "xpack.observability.expView.heading.addToCase.notification.viewCase": "Afficher le cas",
+    "xpack.observability.expView.heading.label": "Explorer les données",
     "xpack.observability.expView.heading.openInLens": "Ouvrir dans Lens",
     "xpack.observability.expView.heading.saveLensVisualization": "Enregistrer",
+    "xpack.observability.expView.lastUpdated.label": "Dernière mise à jour : {updatedDate}",
+    "xpack.observability.expView.openInLens": "Ouvrir dans Lens",
     "xpack.observability.expView.operationType.75thPercentile": "75e centile",
     "xpack.observability.expView.operationType.90thPercentile": "90e centile",
     "xpack.observability.expView.operationType.95thPercentile": "95e centile",
     "xpack.observability.expView.operationType.99thPercentile": "99e centile",
     "xpack.observability.expView.operationType.average": "Moyenne",
+    "xpack.observability.expView.operationType.lastValue": "Dernière valeur",
     "xpack.observability.expView.operationType.median": "Médiane",
     "xpack.observability.expView.operationType.sum": "Somme",
     "xpack.observability.expView.reportType.selectDataType": "Sélectionnez un type de données pour créer une visualisation.",
+    "xpack.observability.expView.reportType.selectLabel": "Sélectionner le type de rapport",
+    "xpack.observability.expView.save": "Enregistrer la visualisation",
+    "xpack.observability.expView.seriesBuilder.accordion.label": "Afficher/Masquer les informations de série",
     "xpack.observability.expView.seriesBuilder.addSeries": "Ajouter une série",
+    "xpack.observability.expView.seriesBuilder.addSeries.limitation": "Vous ne pouvez ajouter qu’une seule série à ce type de rapport.",
+    "xpack.observability.expView.seriesBuilder.addSeries.selectReportType": "Vous devez sélectionner un type de rapport pour pouvoir ajouter des séries.",
     "xpack.observability.expView.seriesBuilder.apply": "Appliquer les modifications",
+    "xpack.observability.expView.seriesBuilder.breakdownBy": "Répartir par",
+    "xpack.observability.expView.seriesBuilder.creationContext": "Afficher à partir de",
+    "xpack.observability.expView.seriesBuilder.creationTime": "Graphique créé",
+    "xpack.observability.expView.seriesBuilder.date": "Date",
     "xpack.observability.expView.seriesBuilder.emptyReportDefinition": "Sélectionnez une définition de rapport pour créer une visualisation.",
     "xpack.observability.expView.seriesBuilder.emptyview": "Rien à afficher.",
+    "xpack.observability.expView.seriesBuilder.labelField": "Sélectionner le champ d’étiquette",
     "xpack.observability.expView.seriesBuilder.loadingView": "Chargement de la vue...",
+    "xpack.observability.expView.seriesBuilder.operation": "Opération",
+    "xpack.observability.expView.seriesBuilder.reportType": "Type de rapport",
+    "xpack.observability.expView.seriesBuilder.reportType.aria": "Sélectionnez le type de rapport à créer.",
+    "xpack.observability.expView.seriesBuilder.selectFilters": "Filtres",
     "xpack.observability.expView.seriesBuilder.selectReportType": "Aucun type de rapport sélectionné",
     "xpack.observability.expView.seriesBuilder.selectReportType.empty": "Sélectionnez un type de rapport pour créer une visualisation.",
     "xpack.observability.expView.seriesEditor.clearFilter": "Effacer les filtres",
+    "xpack.observability.expView.seriesEditor.editChartSeriesLabel": "Modifier le type de graphique pour les séries",
+    "xpack.observability.expView.seriesEditor.editName": "Modifier le nom",
+    "xpack.observability.expView.seriesEditor.noData": "Aucune donnée disponible",
+    "xpack.observability.expView.seriesEditor.noPermissions": "Impossible de créer la vue de données. Vous ne disposez pas des autorisations requises. Veuillez contacter votre administrateur.",
     "xpack.observability.expView.seriesEditor.notFound": "Aucune série trouvée. Veuillez ajouter une série.",
-    "xpack.observability.expView.seriesEditor.removeSeries": "Cliquez pour retirer une série",
+    "xpack.observability.expView.seriesEditor.removeReportMetric": "Supprimer l’indicateur de rapport",
+    "xpack.observability.expView.seriesEditor.removeSeries": "Supprimer la série",
+    "xpack.observability.expView.seriesEditor.removeSeriesDisabled": "Les séries principales ne peuvent pas être supprimées. Veuillez supprimer toutes les séries ci-dessous avant de supprimer celle-ci.",
+    "xpack.observability.expView.seriesEditor.reportMetricTooltip": "Indicateur de rapport",
+    "xpack.observability.expView.seriesEditor.selectReportMetric": "Sélectionner l’indicateur de rapport",
+    "xpack.observability.expView.seriesEditor.selectReportMetric.noFieldData": "Aucune donnée disponible pour le champ {field}.",
+    "xpack.observability.expView.seriesEditor.seriesName": "Nom de la série",
     "xpack.observability.featureCatalogueDescription": "Consolidez vos logs, indicateurs, traces d'application et disponibilités système avec les interfaces utilisateur spécialement conçues.",
     "xpack.observability.featureCatalogueTitle": "Observabilité",
     "xpack.observability.featureRegistry.linkObservabilityTitle": "Cas",
     "xpack.observability.feedbackMenu.appName": "Observabilité",
     "xpack.observability.fieldValueSelection.apply": "Appliquer",
+    "xpack.observability.fieldValueSelection.apply.label": "Appliquer les filtres sélectionnés pour {label}",
     "xpack.observability.fieldValueSelection.loading": "Chargement",
     "xpack.observability.fieldValueSelection.placeholder": "Filtrer {label}",
     "xpack.observability.fieldValueSelection.placeholder.search": "Rechercher dans {label}",
     "xpack.observability.filterButton.label": "développe le groupe de filtres pour le filtre {label}",
+    "xpack.observability.filters.expanded.labels.backTo": "Retour aux étiquettes",
+    "xpack.observability.filters.expanded.labels.fields": "Champs d’étiquette",
+    "xpack.observability.filters.expanded.labels.label": "Étiquettes",
     "xpack.observability.filters.expanded.noFilter": "Aucun filtre trouvé.",
     "xpack.observability.filters.expanded.search": "Rechercher {label}",
+    "xpack.observability.filters.filterByUrl": "Filtrer par URL",
+    "xpack.observability.filters.label.wildcard": "Caractère générique {label}",
+    "xpack.observability.filters.searchResults": "{total} résultats de recherche",
+    "xpack.observability.filters.select": "Sélectionner",
+    "xpack.observability.filters.topPages": "Premières pages",
+    "xpack.observability.filters.url": "Url",
+    "xpack.observability.filters.url.loadingResults": "Chargement des résultats",
+    "xpack.observability.filters.url.noResults": "Aucun résultat disponible",
     "xpack.observability.fleet.button": "Essayer Fleet",
     "xpack.observability.fleet.text": "Elastic Agent offre un moyen simple et unifié d'ajouter un monitoring pour les logs, les indicateurs et d'autres types de données à vos hôtes. Vous n'avez plus besoin d'installer plusieurs agents Beats, ce qui facilite et accélère le déploiement de configurations dans votre infrastructure.",
     "xpack.observability.fleet.title": "Avez-vous vu notre nouveau Fleet ?",
@@ -18169,48 +21641,139 @@
     "xpack.observability.formatters.minutesTimeUnitLabelExtended": "minutes",
     "xpack.observability.formatters.secondsTimeUnitLabel": "s",
     "xpack.observability.formatters.secondsTimeUnitLabelExtended": "secondes",
-    "xpack.observability.home.addData": "Ajouter des données",
+    "xpack.observability.home.addData": "Ajouter des intégrations",
+    "xpack.observability.hoverActions.filterForValue": "Filtrer sur la valeur",
+    "xpack.observability.hoverActions.filterForValueButtonLabel": "Inclure",
+    "xpack.observability.inspector.stats.dataViewDescription": "La vue de données qui se connecte aux index Elasticsearch.",
+    "xpack.observability.inspector.stats.dataViewLabel": "Vue de données",
+    "xpack.observability.inspector.stats.hitsDescription": "Le nombre de documents renvoyés par la requête.",
+    "xpack.observability.inspector.stats.hitsLabel": "Résultats",
+    "xpack.observability.inspector.stats.hitsTotalDescription": "Le nombre de documents correspondant à la requête.",
+    "xpack.observability.inspector.stats.hitsTotalLabel": "Résultats (total)",
+    "xpack.observability.inspector.stats.kibanaApiQueryParametersDescription": "Les paramètres de requête utilisés dans la requête d’API Kibana à l’origine de la requête Elasticsearch.",
+    "xpack.observability.inspector.stats.kibanaApiQueryParametersLabel": "Paramètres de requête d’API Kibana",
+    "xpack.observability.inspector.stats.kibanaApiRouteDescription": "Le chemin de la requête d’API Kibana à l’origine de la requête Elasticsearch.",
+    "xpack.observability.inspector.stats.kibanaApiRouteLabel": "Chemin de l’API Kibana",
+    "xpack.observability.inspector.stats.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la requête ni l'analyser dans le navigateur.",
+    "xpack.observability.inspector.stats.queryTimeLabel": "Durée de la requête",
+    "xpack.observability.inspector.stats.queryTimeValue": "{queryTime} ms",
+    "xpack.observability.maxSuggestionsUiSettingDescription": "Nombre maximal de suggestions récupérées pour les zones de saisie semi-automatique.",
+    "xpack.observability.maxSuggestionsUiSettingName": "Nombre maximal de suggestions",
+    "xpack.observability.mobile.addDataButtonLabel": "Ajouter des données mobiles",
     "xpack.observability.navigation.newBadge": "NOUVEAUTÉ",
     "xpack.observability.news.readFullStory": "Lire toute l'histoire",
     "xpack.observability.news.title": "Nouveautés",
+    "xpack.observability.noDataConfig.beatsCard.description": "Utilisez des agents Beats et APM pour envoyer des données d’observabilité à Elasticsearch. Nous facilitons les choses en proposant un support technique pour un grand nombre de langues, d’applications et de systèmes courants.",
+    "xpack.observability.noDataConfig.beatsCard.title": "Ajouter des intégrations",
+    "xpack.observability.noDataConfig.solutionName": "Observabilité",
     "xpack.observability.notAvailable": "S. O.",
     "xpack.observability.overview.alert.allTypes": "Tous les types",
-    "xpack.observability.overview.alert.appLink": "Gérer les alertes",
+    "xpack.observability.overview.alert.appLink": "Afficher toutes les alertes",
+    "xpack.observability.overview.alert.errorMessage": "Une erreur s’est produite lors du chargement des données d’alerte. Réessayez plus tard.",
+    "xpack.observability.overview.alert.errorTitle": "Impossible de charger les données d’alerte.",
+    "xpack.observability.overview.alerts.appLink": "Afficher les alertes",
     "xpack.observability.overview.alerts.muted": "Muet",
     "xpack.observability.overview.alerts.title": "Alertes",
-    "xpack.observability.overview.apm.appLink": "Afficher dans l'application",
+    "xpack.observability.overview.apm.appLink": "Afficher l’inventaire des services",
     "xpack.observability.overview.apm.services": "Services",
     "xpack.observability.overview.apm.throughput": "Rendement",
-    "xpack.observability.overview.apm.title": "APM",
-    "xpack.observability.overview.exploratoryView": "Analyser les données",
+    "xpack.observability.overview.apm.throughputTip": "Les valeurs sont calculées pour les transactions de type \"requête\" ou \"chargement de page\". Si aucune transaction de ce type n’est disponible, les valeurs reflètent le premier type de transaction.",
+    "xpack.observability.overview.apm.title": "Services",
+    "xpack.observability.overview.exploratoryView": "Explorer les données",
+    "xpack.observability.overview.exploratoryView.editSeriesColor": "Modifier la couleur de la série",
+    "xpack.observability.overview.exploratoryView.hideChart": "Masquer le graphique",
     "xpack.observability.overview.exploratoryView.lensDisabled": "L'application Lens n'est pas disponible, veuillez activer Lens pour utiliser la vue d'exploration.",
+    "xpack.observability.overview.exploratoryView.logsLabel": "Logs",
+    "xpack.observability.overview.exploratoryView.metricsLabel": "Indicateurs",
+    "xpack.observability.overview.exploratoryView.missingDataType": "Type de données manquant",
+    "xpack.observability.overview.exploratoryView.missingReportDefinition": "{reportDefinition} manquant",
+    "xpack.observability.overview.exploratoryView.missingReportMetric": "Indicateur de rapport manquant",
+    "xpack.observability.overview.exploratoryView.mobileExperienceLabel": "Expérience mobile",
+    "xpack.observability.overview.exploratoryView.noDataAvailable": "Aucune donnée {dataType} disponible.",
+    "xpack.observability.overview.exploratoryView.pickColor": "Sélectionner une couleur",
+    "xpack.observability.overview.exploratoryView.preview": "Aperçu",
+    "xpack.observability.overview.exploratoryView.refresh": "Actualiser",
+    "xpack.observability.overview.exploratoryView.selectDataType": "Sélectionner le type de données",
+    "xpack.observability.overview.exploratoryView.selectDataTypeTooltip": "Impossible de modifier le type de données.",
+    "xpack.observability.overview.exploratoryView.showChart": "Afficher le graphique",
+    "xpack.observability.overview.exploratoryView.syntheticsLabel": "Monitoring synthétique",
+    "xpack.observability.overview.exploratoryView.uxLabel": "Expérience utilisateur (RUM)",
+    "xpack.observability.overview.guidedSetupButton": "Configuration guidée",
     "xpack.observability.overview.loadingObservability": "Chargement d'Observability",
-    "xpack.observability.overview.logs.appLink": "Afficher dans l'application",
+    "xpack.observability.overview.logs.appLink": "Afficher le flux de log",
     "xpack.observability.overview.logs.subtitle": "Taux de logs par minute",
-    "xpack.observability.overview.logs.title": "Logs",
-    "xpack.observability.overview.metrics.appLink": "Afficher dans l'application",
+    "xpack.observability.overview.logs.title": "Événements de log",
+    "xpack.observability.overview.metrics.appLink": "Afficher l’inventaire",
     "xpack.observability.overview.metrics.colunms.cpu": "% CPU",
     "xpack.observability.overview.metrics.colunms.hostname": "Nom d'hôte",
     "xpack.observability.overview.metrics.colunms.load15": "Charge 15",
     "xpack.observability.overview.metrics.colunms.uptime": "Uptime",
-    "xpack.observability.overview.metrics.title": "Indicateurs",
+    "xpack.observability.overview.metrics.title": "Hôtes",
     "xpack.observability.overview.pageTitle": "Aperçu",
-    "xpack.observability.overview.uptime.appLink": "Afficher dans l'application",
+    "xpack.observability.overview.statusVisualizationFlyoutDescription": "Suivez votre progression pour l’ajout d’intégrations et de fonctionnalités d’observabilité.",
+    "xpack.observability.overview.statusVisualizationFlyoutTitle": "Configuration guidée",
+    "xpack.observability.overview.uptime.appLink": "Afficher les moniteurs",
     "xpack.observability.overview.uptime.chart.down": "Arrêté",
     "xpack.observability.overview.uptime.chart.up": "Opérationnel",
     "xpack.observability.overview.uptime.down": "Arrêté",
-    "xpack.observability.overview.uptime.monitors": "Monitorings",
-    "xpack.observability.overview.uptime.title": "Uptime",
+    "xpack.observability.overview.uptime.monitors": "Moniteurs",
+    "xpack.observability.overview.uptime.title": "Moniteurs",
     "xpack.observability.overview.uptime.up": "Opérationnel",
-    "xpack.observability.overview.ux.appLink": "Afficher dans l'application",
+    "xpack.observability.overview.ux.appLink": "Afficher le tableau de bord",
     "xpack.observability.overview.ux.title": "Expérience utilisateur",
     "xpack.observability.overviewLinkTitle": "Aperçu",
+    "xpack.observability.page_header.addMobileDataLink.label": "Accédez à un tutoriel sur l'ajout de données APM mobiles.",
+    "xpack.observability.page_header.addUptimeDataLink.label": "Accédez à un tutoriel sur l'ajout de données Uptime",
+    "xpack.observability.page_header.addUXDataLink.label": "Accédez à un tutoriel sur l'ajout de données APM d’expérience utilisateur.",
     "xpack.observability.pageLayout.sideNavTitle": "Observabilité",
     "xpack.observability.resources.documentation": "Documentation",
     "xpack.observability.resources.forum": "Forum de discussion",
     "xpack.observability.resources.quick_start": "Vidéos de démarrage rapide",
     "xpack.observability.resources.title": "Ressources",
     "xpack.observability.resources.training": "Cours gratuit Observability",
+    "xpack.observability.rules.addRuleButtonLabel": "Créer une règle",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.cancelButtonLabel": "Annuler",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.deleteButtonLabel": "Supprimer {numIdsToDelete, plural, one {{singleTitle}} other {# {multipleTitle}}} ",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.descriptionText": "Vous ne pouvez pas récupérer {numIdsToDelete, plural, one {un {singleTitle} supprimé} other {des {multipleTitle} supprimés}}.",
+    "xpack.observability.rules.deleteSelectedIdsErrorNotification.descriptionText": "Impossible de supprimer {numErrors, number} {numErrors, plural, one {{singleTitle}} other {{multipleTitle}}}",
+    "xpack.observability.rules.deleteSelectedIdsSuccessNotification.descriptionText": "Suppression de {numSuccesses, number} {numSuccesses, plural, one {{singleTitle}} other {{multipleTitle}}} effectuée",
+    "xpack.observability.rules.docsLinkText": "Documentation",
+    "xpack.observability.rules.emptyPrompt.emptyButton": "Créer une règle",
+    "xpack.observability.rules.emptyPrompt.emptyTitle": "Créer votre première règle",
+    "xpack.observability.rules.loadError": "Impossible de charger les règles",
+    "xpack.observability.rules.noDataPrompt.noDataDesc": "Les règles permettent de recevoir des alertes et d’automatiser des actions personnalisées lorsque des conditions spécifiques sont satisfaites.",
+    "xpack.observability.rules.noPermissionToCreateDescription": "Contactez votre administrateur système.",
+    "xpack.observability.rules.noPermissionToCreateTitle": "Aucune autorisation pour créer des règles",
+    "xpack.observability.rules.refreshRulesButtonLabel": "Actualiser",
+    "xpack.observability.rules.ruleLastResponseFilterLabel": "Dernière réponse",
+    "xpack.observability.rules.rulesTable.changeStatusAriaLabel": "Modifier le statut",
+    "xpack.observability.rules.rulesTable.columns.actionsTitle": "Actions",
+    "xpack.observability.rules.rulesTable.columns.deleteAriaLabel": "Supprimer",
+    "xpack.observability.rules.rulesTable.columns.deleteButtonTooltip": "Supprimer",
+    "xpack.observability.rules.rulesTable.columns.editAriaLabel": "Modifier",
+    "xpack.observability.rules.rulesTable.columns.editButtonTooltip": "Modifier",
+    "xpack.observability.rules.rulesTable.columns.lastResponseTitle": "Dernière réponse",
+    "xpack.observability.rules.rulesTable.columns.lastRunTitle": "Dernière exécution",
+    "xpack.observability.rules.rulesTable.columns.nameTitle": "Règle",
+    "xpack.observability.rules.rulesTable.columns.statusTitle": "Statut",
+    "xpack.observability.rules.rulesTable.pluralTitle": "règles",
+    "xpack.observability.rules.rulesTable.ruleStatusActive": "Actif",
+    "xpack.observability.rules.rulesTable.ruleStatusDisabled": "Désactivé",
+    "xpack.observability.rules.rulesTable.ruleStatusEnabled": "Activé",
+    "xpack.observability.rules.rulesTable.ruleStatusError": "Erreur",
+    "xpack.observability.rules.rulesTable.ruleStatusLicenseError": "Erreur de licence",
+    "xpack.observability.rules.rulesTable.ruleStatusOk": "Ok",
+    "xpack.observability.rules.rulesTable.ruleStatusPending": "En attente",
+    "xpack.observability.rules.rulesTable.ruleStatusSnoozedIndefinitely": "Répété indéfiniment",
+    "xpack.observability.rules.rulesTable.ruleStatusUnknown": "Inconnu",
+    "xpack.observability.rules.rulesTable.ruleStatusWarning": "avertissement",
+    "xpack.observability.rules.rulesTable.singleTitle": "règle",
+    "xpack.observability.rules.searchPlaceholderTitle": "Recherche",
+    "xpack.observability.rules.totalItemsCountDescription": "Affichage : {pageSize} sur {totalItemCount} règles",
+    "xpack.observability.rules.typeFilterLabel": "Type",
+    "xpack.observability.rulesLinkTitle": "Règles",
+    "xpack.observability.rulesTitle": "Règles",
+    "xpack.observability.search.url.close": "Fermer",
     "xpack.observability.section.apps.apm.description": "Suivez les transactions via une architecture distribuée et mappez vos interactions de services pour repérer facilement les goulets d'étranglement des performances.",
     "xpack.observability.section.apps.apm.title": "APM",
     "xpack.observability.section.apps.logs.description": "Centralisez les logs à partir de n'importe quelle source. Recherchez, suivez, automatisez la détection des anomalies et visualisez les tendances afin d'entreprendre des actions plus rapidement.",
@@ -18219,10 +21782,51 @@
     "xpack.observability.section.apps.metrics.title": "Indicateurs",
     "xpack.observability.section.apps.uptime.description": "Monitorez de façon proactive la disponibilité de vos sites et services. Recevez des alertes et corrigez les problèmes plus rapidement pour optimiser l'expérience de vos utilisateurs.",
     "xpack.observability.section.apps.uptime.title": "Uptime",
-    "xpack.observability.section.errorPanel": "Une erreur est survenue pendant la tentative de récupération des données. Veuillez réessayer",
-    "xpack.observability.seriesEditor.clone": "Copier la série",
+    "xpack.observability.section.errorPanel": "Une erreur est survenue pendant la tentative de récupération des données. Réessayez plus tard",
+    "xpack.observability.seriesEditor.actionsAriaContextLabel": "Liste des actions de la série",
+    "xpack.observability.seriesEditor.clone": "Dupliquer la série",
     "xpack.observability.seriesEditor.edit": "Modifier la série",
+    "xpack.observability.seriesEditor.hide": "Masquer la série",
+    "xpack.observability.seriesEditor.popoverButtonLabel": "Afficher les actions de la série",
+    "xpack.observability.seriesEditor.sampleDocuments": "Afficher la transaction dans Discover",
+    "xpack.observability.seriesEditor.show": "Afficher la série",
+    "xpack.observability.status.dataAvailable": "Des données sont disponibles.",
+    "xpack.observability.status.dataAvailableTitle": "Données disponibles pour",
+    "xpack.observability.status.learnMoreButton": "En savoir plus",
+    "xpack.observability.status.progressBarDescription": "Suivez votre progression pour l’ajout d’intégrations et de fonctionnalités d’observabilité.",
+    "xpack.observability.status.progressBarDismiss": "Rejeter",
+    "xpack.observability.status.progressBarTitle": "Configuration guidée pour Observability",
+    "xpack.observability.status.progressBarViewDetails": "Afficher les détails",
+    "xpack.observability.status.recommendedSteps": "Recommandations pour la suite",
+    "xpack.observability.statusVisualization.alert.description": "Détectez des conditions complexes dans Observability et déclenchez des actions lorsque ces conditions sont satisfaites.",
+    "xpack.observability.statusVisualization.alert.goToAppTitle": "Afficher les alertes",
+    "xpack.observability.statusVisualization.alert.link": "Créer des règles",
+    "xpack.observability.statusVisualization.alert.title": "Alerting",
+    "xpack.observability.statusVisualization.apm.description": "Obtenez une meilleure visibilité sur vos applications avec un support technique renforcé pour les langues populaires, OpenTelemetry et le traçage distribué.",
+    "xpack.observability.statusVisualization.apm.goToAppTitle": "Afficher l’inventaire des services",
+    "xpack.observability.statusVisualization.apm.link": "Ajouter des données",
+    "xpack.observability.statusVisualization.apm.title": "APM",
+    "xpack.observability.statusVisualization.logs.description": "Un monitoring rapide, simple, évolutif et centralisé des logs avec un support technique dédié pour les sources de données les plus communes.",
+    "xpack.observability.statusVisualization.logs.goToAppTitle": "Afficher le flux de log",
+    "xpack.observability.statusVisualization.logs.link": "Ajouter des intégrations",
+    "xpack.observability.statusVisualization.logs.title": "Logs",
+    "xpack.observability.statusVisualization.metrics.description": "Diffusez, visualisez et analysez vos indicateurs d’infrastructure.",
+    "xpack.observability.statusVisualization.metrics.goToAppTitle": "Afficher l’inventaire",
+    "xpack.observability.statusVisualization.metrics.link": "Ajouter des intégrations",
+    "xpack.observability.statusVisualization.metrics.title": "Infrastructure",
+    "xpack.observability.statusVisualization.uptime.description": "Monitorez la disponibilité et la fonctionnalité de manière proactive sur les parcours de vos clients.",
+    "xpack.observability.statusVisualization.uptime.goToAppTitle": "Afficher les moniteurs ",
+    "xpack.observability.statusVisualization.uptime.link": "Ajouter des moniteurs",
+    "xpack.observability.statusVisualization.uptime.title": "Uptime",
+    "xpack.observability.statusVisualization.ux.description": "Collectez, mesurez et analysez les données de performances reflétant les expériences des utilisateurs réels.",
+    "xpack.observability.statusVisualization.ux.goToAppTitle": "Afficher le tableau de bord",
+    "xpack.observability.statusVisualization.ux.link": "Ajouter des données",
+    "xpack.observability.statusVisualization.ux.title": "Expérience utilisateur",
+    "xpack.observability.textDefinitionField.placeholder.search": "Rechercher dans {label}",
     "xpack.observability.transactionRateLabel": "{value} tpm",
+    "xpack.observability.uiSettings.technicalPreviewLabel": "version d’évaluation technique",
+    "xpack.observability.urlFilter.wildcard": "Utiliser le caractère générique *{wildcard}*",
+    "xpack.observability.ux.addDataButtonLabel": "Ajouter des données d’expérience utilisateur",
     "xpack.observability.ux.coreVitals.average": "une moyenne",
     "xpack.observability.ux.coreVitals.averageMessage": " et inférieur à {bad}",
     "xpack.observability.ux.coreVitals.cls": "Cumulative Layout Shift",
@@ -18256,12 +21860,19 @@
     "xpack.osquery.action_results.errorSearchDescription": "Une erreur s'est produite lors de la recherche des résultats d'action",
     "xpack.osquery.action_results.failSearchDescription": "Impossible de récupérer les résultats d'action",
     "xpack.osquery.action_results.fetchError": "Erreur lors de la récupération des résultats d'action",
+    "xpack.osquery.action.agentStatus": "Pour exécuter des requêtes sur cet hôte, Elastic Agent doit être actif. Vérifiez le statut de cet agent dans Fleet.",
+    "xpack.osquery.action.empty": "Elastic Agent n’est pas installé sur cet hôte. Pour exécuter des requêtes, installez Elastic Agent sur l’hôte, puis ajoutez l’intégration Osquery Manager à la politique d’agent dans Fleet.",
+    "xpack.osquery.action.permissionDenied": "Autorisation refusée",
+    "xpack.osquery.action.shortEmptyTitle": "Osquery n’est pas disponible.",
+    "xpack.osquery.action.unavailable": "L’intégration Osquery Manager n’a pas été ajoutée à la politique d’agent. Pour exécuter des requêtes sur l’hôte, ajoutez l’intégration Osquery Manager à la politique d’agent dans Fleet.",
     "xpack.osquery.actionDetails.errorSearchDescription": "Une erreur s'est produite lors de la recherche des détails d'action",
     "xpack.osquery.actionDetails.failSearchDescription": "Impossible de récupérer les détails d'action",
     "xpack.osquery.actionResults.errorSearchDescription": "Une erreur s'est produite lors de la recherche des résultats d'action",
     "xpack.osquery.actionResults.failSearchDescription": "Impossible de récupérer les résultats d'action",
     "xpack.osquery.actions.errorSearchDescription": "Une erreur s'est produite lors de la recherche de toutes les actions",
     "xpack.osquery.actions.failSearchDescription": "Impossible de récupérer les actions",
+    "xpack.osquery.addPack.pageTitle": "Ajouter un pack",
+    "xpack.osquery.addPack.viewPacksListTitle": "Afficher tous les packs",
     "xpack.osquery.addSavedQuery.form.cancelButtonLabel": "Annuler",
     "xpack.osquery.addSavedQuery.form.saveQueryButtonLabel": "Enregistrer la recherche",
     "xpack.osquery.addSavedQuery.pageTitle": "Ajouter une recherche enregistrée",
@@ -18271,6 +21882,7 @@
     "xpack.osquery.agent_policy_details.fetchError": "Erreur lors de la récupération des détails de politiques d'agents",
     "xpack.osquery.agent_status.fetchError": "Erreur lors de la récupération du statut des agents",
     "xpack.osquery.agentDetails.fetchError": "Erreur lors de la récupération des détails des agents",
+    "xpack.osquery.agentPolicy.confirmModalCalloutDescription": "Fleet a détecté que {agentPolicyCount, plural, one {la politique d’agent sélectionnée est} other {les politiques d’agent sélectionnées sont}} déjà en cours d’utilisation par certains de vos agents. Par conséquent, Fleet déploiera des mises à jour pour tous les agents utilisant {agentPolicyCount, plural, one {cette politique d’agent} other {ces politiques d’agent}}.",
     "xpack.osquery.agentPolicy.confirmModalCalloutTitle": "Cette action met à jour {agentCount, plural, one {# agent} other {# agents}}",
     "xpack.osquery.agentPolicy.confirmModalCancelButtonLabel": "Annuler",
     "xpack.osquery.agentPolicy.confirmModalConfirmButtonLabel": "Enregistrer et déployer les modifications",
@@ -18289,15 +21901,34 @@
     "xpack.osquery.all_actions.fetchError": "Erreur lors de la récupération des actions",
     "xpack.osquery.appNavigation.liveQueriesLinkText": "Recherches en direct",
     "xpack.osquery.appNavigation.manageIntegrationButton": "Gérer l'intégration",
+    "xpack.osquery.appNavigation.packsLinkText": "Packs",
     "xpack.osquery.appNavigation.savedQueriesLinkText": "Recherches enregistrées",
     "xpack.osquery.appNavigation.sendFeedbackButton": "Envoyer des commentaires",
+    "xpack.osquery.breadcrumbs.addpacksPageTitle": "Ajouter",
     "xpack.osquery.breadcrumbs.appTitle": "Osquery",
+    "xpack.osquery.breadcrumbs.editpacksPageTitle": "Modifier",
     "xpack.osquery.breadcrumbs.liveQueriesPageTitle": "Recherches en direct",
     "xpack.osquery.breadcrumbs.newLiveQueryPageTitle": "Nouveau",
     "xpack.osquery.breadcrumbs.newSavedQueryPageTitle": "Nouveau",
     "xpack.osquery.breadcrumbs.overviewPageTitle": "Aperçu",
+    "xpack.osquery.breadcrumbs.packsPageTitle": "Packs",
     "xpack.osquery.breadcrumbs.savedQueriesPageTitle": "Recherches enregistrées",
+    "xpack.osquery.configUploader.exampleConfigLinkLabel": "Exemple de configuration",
+    "xpack.osquery.configUploader.initialPromptTextLabel": "Sélectionner ou glisser-déposer le fichier de configuration Osquery",
+    "xpack.osquery.configUploader.unsupportedFileTypeText": "Le type de fichier {fileType} n'est pas pris en charge, veuillez charger le fichier config {supportedFileTypes}",
     "xpack.osquery.createScheduledQuery.agentPolicyAgentsCountText": "{count, plural, one {# agent enregistré} other {# agents enregistrés}}",
+    "xpack.osquery.deletePack.confirmationModal.body": "Vous êtes sur le point de supprimer ce pack. Voulez-vous vraiment continuer ?",
+    "xpack.osquery.deletePack.confirmationModal.cancelButtonLabel": "Annuler",
+    "xpack.osquery.deletePack.confirmationModal.confirmButtonLabel": "Confirmer",
+    "xpack.osquery.deletePack.confirmationModal.title": "Voulez-vous vraiment supprimer ce pack ?",
+    "xpack.osquery.deletePack.successToastMessageText": "Le pack a été supprimé avec succès.",
+    "xpack.osquery.deleteSavedQuery.confirmationModal.body": "Vous êtes sur le point de supprimer cette requête. Voulez-vous vraiment continuer ?",
+    "xpack.osquery.deleteSavedQuery.confirmationModal.cancelButtonLabel": "Annuler",
+    "xpack.osquery.deleteSavedQuery.confirmationModal.confirmButtonLabel": "Confirmer",
+    "xpack.osquery.deleteSavedQuery.confirmationModal.title": "Voulez-vous vraiment supprimer cette requête ?",
+    "xpack.osquery.editPack.deletePackButtonLabel": "Supprimer le pack",
+    "xpack.osquery.editPack.pageTitle": "Modifier {queryName}",
+    "xpack.osquery.editPack.viewPackListTitle": "Afficher les détails de {queryName}",
     "xpack.osquery.editSavedQuery.deleteSavedQueryButtonLabel": "Supprimer la recherche",
     "xpack.osquery.editSavedQuery.deleteSuccessToastMessageText": "Suppression réussie de la recherche enregistrée",
     "xpack.osquery.editSavedQuery.form.cancelButtonLabel": "Annuler",
@@ -18305,14 +21936,26 @@
     "xpack.osquery.editSavedQuery.pageTitle": "Modifier \"{savedQueryId}\"",
     "xpack.osquery.editSavedQuery.successToastMessageText": "Mise à jour réussie de la recherche \"{savedQueryName}\"",
     "xpack.osquery.editSavedQuery.viewSavedQueriesListTitle": "Afficher toutes les recherches enregistrées",
+    "xpack.osquery.emptyState.addOsqueryManagerButton": "Ajouter Osquery Manager",
+    "xpack.osquery.emptyState.pageDescription": "Ajoutez cette intégration pour exécuter et planifier des requêtes pour Elastic Agent.",
+    "xpack.osquery.emptyState.pageTitle": "Ajouter Osquery Manager",
     "xpack.osquery.features.liveQueriesSubFeatureName": "Recherches en direct",
     "xpack.osquery.features.osqueryFeatureName": "Osquery",
+    "xpack.osquery.features.packsSubFeatureName": "Packs",
     "xpack.osquery.features.runSavedQueriesPrivilegeName": "Exécuter les recherches enregistrées",
     "xpack.osquery.features.savedQueriesSubFeatureName": "Recherches enregistrées",
+    "xpack.osquery.fleetIntegration.osqueryConfig.accordionFieldLabel": "Avancé",
+    "xpack.osquery.fleetIntegration.osqueryConfig.configFieldError": "JSON non valide",
+    "xpack.osquery.fleetIntegration.osqueryConfig.configFieldLabel": "Configuration Osquery",
+    "xpack.osquery.fleetIntegration.osqueryConfig.packConfigFilesErrorMessage": "Les fichiers de configuration de pack ne sont pas pris en charge. Les packs suivants doivent être supprimés : {packNames}.",
+    "xpack.osquery.fleetIntegration.osqueryConfig.restrictedOptionsErrorMessage": "Les options Osquery suivantes ne sont pas prises en charge et doivent être supprimées : {restrictedFlags}.",
+    "xpack.osquery.fleetIntegration.packsButtonText": "Packs",
     "xpack.osquery.fleetIntegration.runLiveQueriesButtonText": "Exécuter les recherches en direct",
     "xpack.osquery.fleetIntegration.saveIntegrationCalloutTitle": "Enregistrer l'intégration pour accéder aux options ci-dessous",
     "xpack.osquery.liveQueriesHistory.newLiveQueryButtonLabel": "Nouvelle recherche en direct",
     "xpack.osquery.liveQueriesHistory.pageTitle": "Historique des recherches en direct",
+    "xpack.osquery.liveQuery.permissionDeniedPromptBody": "Pour pouvoir consulter les résultats de requête, demandez à votre administrateur de mettre à jour votre rôle utilisateur de sorte à disposer des privilèges de {read} pour les index {logs}.",
+    "xpack.osquery.liveQuery.permissionDeniedPromptTitle": "Autorisation refusée",
     "xpack.osquery.liveQuery.queryForm.largeQueryError": "La recherche est trop volumineuse ({maxLength} caractères maxi)",
     "xpack.osquery.liveQueryActionResults.summary.agentsQueriedLabelText": "Recherche effectuée pour {count, plural, one {# agent} other {# agents}}",
     "xpack.osquery.liveQueryActionResults.summary.expiredLabelText": "Expiré",
@@ -18341,23 +21984,107 @@
     "xpack.osquery.liveQueryForm.steps.queryStepHeading": "Entrer la recherche",
     "xpack.osquery.liveQueryForm.steps.resultsStepHeading": "Vérifier les résultats",
     "xpack.osquery.liveQueryResults.table.agentColumnTitle": "agent",
+    "xpack.osquery.liveQueryResults.table.fieldMappedLabel": "Le champ est mappé à",
     "xpack.osquery.newLiveQuery.pageTitle": "Nouvelle recherche en direct",
     "xpack.osquery.newLiveQuery.viewLiveQueriesHistoryTitle": "Afficher l'historique des recherches en direct",
+    "xpack.osquery.newPack.successToastMessageText": "Le pack \"{packName}\" a été créé avec succès.",
     "xpack.osquery.newSavedQuery.successToastMessageText": "Enregistrement réussi de la recherche \"{savedQueryId}\"",
     "xpack.osquery.osquery_integration.fetchError": "Erreur lors de la récupération de l'intégration osquery",
     "xpack.osquery.osquery_policies.fetchError": "Erreur lors de la récupération des politiques osquery",
     "xpack.osquery.osquerySchemaLinkLabel": "Schéma Osquery",
+    "xpack.osquery.pack.form.agentPoliciesFieldHelpText": "Les requêtes de ce pack sont planifiées pour les agents des politiques sélectionnées.",
+    "xpack.osquery.pack.form.agentPoliciesFieldLabel": "Politiques d’agent planifiées (facultatif)",
+    "xpack.osquery.pack.form.cancelButtonLabel": "Annuler",
+    "xpack.osquery.pack.form.descriptionFieldLabel": "Description (facultative)",
+    "xpack.osquery.pack.form.ecsMappingSection.description": "Utilisez les champs ci-dessous pour mapper les résultats de cette recherche aux champs ECS.",
+    "xpack.osquery.pack.form.ecsMappingSection.osqueryValueOptionLabel": "Valeur Osquery",
+    "xpack.osquery.pack.form.ecsMappingSection.staticValueOptionLabel": "Valeur statique",
+    "xpack.osquery.pack.form.ecsMappingSection.title": "Mapping ECS",
+    "xpack.osquery.pack.form.nameFieldLabel": "Nom",
+    "xpack.osquery.pack.form.nameFieldRequiredErrorMessage": "Le nom est un champ requis",
+    "xpack.osquery.pack.form.savePackButtonLabel": "Enregistrer le pack",
+    "xpack.osquery.pack.form.updatePackButtonLabel": "Mettre à jour le pack",
+    "xpack.osquery.pack.queriesForm.addQueryButtonLabel": "Ajouter une recherche",
+    "xpack.osquery.pack.queriesTable.actionsColumnTitle": "Actions",
+    "xpack.osquery.pack.queriesTable.deleteActionAriaLabel": "Supprimer {queryName}",
+    "xpack.osquery.pack.queriesTable.editActionAriaLabel": "Modifier {queryName}",
+    "xpack.osquery.pack.queriesTable.idColumnTitle": "ID",
+    "xpack.osquery.pack.queriesTable.intervalColumnTitle": "Intervalle (s)",
+    "xpack.osquery.pack.queriesTable.lastResultsColumnTitle": "Derniers résultats",
+    "xpack.osquery.pack.queriesTable.osqueryVersionAllLabel": "TOUS",
+    "xpack.osquery.pack.queriesTable.platformColumnTitle": "Plateforme",
+    "xpack.osquery.pack.queriesTable.queryColumnTitle": "Recherche",
+    "xpack.osquery.pack.queriesTable.versionColumnTitle": "Version Osquery mini",
+    "xpack.osquery.pack.queriesTable.viewDiscoverResultsActionAriaLabel": "Afficher dans Discover",
+    "xpack.osquery.pack.queriesTable.viewLensResultsActionAriaLabel": "Afficher dans Lens",
+    "xpack.osquery.pack.queriesTable.viewLogsErrorsActionAriaLabel": "Afficher dans Logs",
+    "xpack.osquery.pack.queriesTable.viewResultsColumnTitle": "Afficher les résultats",
+    "xpack.osquery.pack.queryFlyoutForm.cancelButtonLabel": "Annuler",
+    "xpack.osquery.pack.queryFlyoutForm.deleteECSMappingRowButtonAriaLabel": "Supprimer la ligne de mapping ECS",
+    "xpack.osquery.pack.queryFlyoutForm.descriptionFieldLabel": "Description (facultative)",
+    "xpack.osquery.pack.queryFlyoutForm.ecsFieldRequiredErrorMessage": "Le champ ECS est requis.",
+    "xpack.osquery.pack.queryFlyoutForm.emptyIdError": "L'ID est requis",
+    "xpack.osquery.pack.queryFlyoutForm.emptyQueryError": "La recherche est requise",
+    "xpack.osquery.pack.queryFlyoutForm.idFieldLabel": "ID",
+    "xpack.osquery.pack.queryFlyoutForm.intervalFieldLabel": "Intervalle (s)",
+    "xpack.osquery.pack.queryFlyoutForm.invalidIdError": "Les caractères doivent être alphanumériques, _ ou -",
+    "xpack.osquery.pack.queryFlyoutForm.invalidIntervalField": "Une valeur d'intervalle positive est requise",
+    "xpack.osquery.pack.queryFlyoutForm.mappingEcsFieldLabel": "Champ ECS",
+    "xpack.osquery.pack.queryFlyoutForm.mappingValueFieldLabel": "Valeur",
+    "xpack.osquery.pack.queryFlyoutForm.osqueryResultFieldRequiredErrorMessage": "Valeur obligatoire.",
+    "xpack.osquery.pack.queryFlyoutForm.osqueryResultFieldValueMissingErrorMessage": "La recherche en cours ne retourne pas de champ {columnName}",
+    "xpack.osquery.pack.queryFlyoutForm.platformFieldLabel": "Plateforme",
+    "xpack.osquery.pack.queryFlyoutForm.platformLinusLabel": "macOS",
+    "xpack.osquery.pack.queryFlyoutForm.platformMacOSLabel": "Linux",
+    "xpack.osquery.pack.queryFlyoutForm.platformWindowsLabel": "Windows",
+    "xpack.osquery.pack.queryFlyoutForm.queryFieldLabel": "Recherche",
+    "xpack.osquery.pack.queryFlyoutForm.saveButtonLabel": "Enregistrer",
+    "xpack.osquery.pack.queryFlyoutForm.uniqueIdError": "L'ID doit être unique",
+    "xpack.osquery.pack.queryFlyoutForm.versionFieldLabel": "Version Osquery minimale",
+    "xpack.osquery.pack.table.activatedSuccessToastMessageText": "Le pack \"{packName}\" a été activé avec succès.",
+    "xpack.osquery.pack.table.deactivatedSuccessToastMessageText": "Le pack \"{packName}\" a été désactivé avec succès.",
+    "xpack.osquery.pack.table.deleteQueriesButtonLabel": "Supprimer {queriesCount, plural, one {# recherche} other {# recherches}}",
+    "xpack.osquery.packDetails.pageTitle": "Détails de {queryName}",
+    "xpack.osquery.packDetails.viewAllPackListTitle": "Afficher tous les packs",
+    "xpack.osquery.packDetailsPage.editQueryButtonLabel": "Modifier",
+    "xpack.osquery.packDetailsPage.kpis.policiesLabelText": "Politiques",
+    "xpack.osquery.packList.addPackButtonLabel": "Ajouter un pack",
+    "xpack.osquery.packList.integrationAssets.loadSuccessToastMessageText": "Les packs prédéfinis ont été chargés avec succès.",
+    "xpack.osquery.packList.integrationAssets.updateSuccessToastMessageText": "Les packs prédéfinis ont été mis à jour avec succès.",
+    "xpack.osquery.packList.pageSubtitle": "Créez des packs pour organiser des ensembles de requêtes et planifier des requêtes pour les politiques d’agent.",
+    "xpack.osquery.packList.pageTitle": "Packs",
+    "xpack.osquery.packList.prePackagedPacks.emptyPromptTitle": "Charger les pack prédéfinis Elastic",
+    "xpack.osquery.packList.prePackagedPacks.emptyPromptTitle.emptyPromptMessage": "Un pack est un ensemble de requêtes pouvant être planifié. Chargez des packs prédéfinis ou créez vos propres packs.",
+    "xpack.osquery.packList.prePackagedPacks.loadButtonLabel": "Charger les pack prédéfinis Elastic",
+    "xpack.osquery.packList.prePackagedPacks.updateButtonLabel": "Mettre à jour les pack prédéfinis Elastic",
+    "xpack.osquery.packs.table.activeColumnTitle": "Actif",
+    "xpack.osquery.packs.table.createdByColumnTitle": "Créé par",
+    "xpack.osquery.packs.table.nameColumnTitle": "Nom",
+    "xpack.osquery.packs.table.numberOfQueriesColumnTitle": "Nombre de recherches",
+    "xpack.osquery.packs.table.policyColumnTitle": "Politiques planifiées",
     "xpack.osquery.packUploader.examplePacksLinkLabel": "Exemples de packs",
     "xpack.osquery.packUploader.initialPromptTextLabel": "Sélectionner ou glisser-déposer le fichier config du pack osquery",
     "xpack.osquery.packUploader.unsupportedFileTypeText": "Le type de fichier {fileType} n'est pas pris en charge, veuillez charger le fichier config {supportedFileTypes}",
     "xpack.osquery.permissionDeniedErrorMessage": "Vous n'êtes pas autorisé à accéder à cette page.",
     "xpack.osquery.permissionDeniedErrorTitle": "Autorisation refusée",
+    "xpack.osquery.queriesStatusTable.agentsLabelText": "{count, plural, one {Agent} other {Agents}}",
+    "xpack.osquery.queriesStatusTable.documentLabelText": "{count, plural, one {Document} other {Documents}}",
+    "xpack.osquery.queriesStatusTable.errorsLabelText": "{count, plural, one {Erreur} other {Erreurs}}",
+    "xpack.osquery.queriesTable.osqueryVersionAllLabel": "TOUS",
+    "xpack.osquery.queryFlyoutForm.addFormTitle": "Attacher la recherche suivante",
+    "xpack.osquery.queryFlyoutForm.cancelButtonLabel": "Annuler",
+    "xpack.osquery.queryFlyoutForm.editFormTitle": "Modifier la recherche",
+    "xpack.osquery.queryFlyoutForm.saveButtonLabel": "Enregistrer",
+    "xpack.osquery.queryFlyoutForm.versionFieldOptionalLabel": "(facultatif)",
+    "xpack.osquery.queryPlaygroundFlyout.title": "Tester la recherche",
     "xpack.osquery.results.errorSearchDescription": "Une erreur s'est produite lors de la recherche de tous les résultats",
     "xpack.osquery.results.failSearchDescription": "Impossible de récupérer les résultats",
     "xpack.osquery.results.fetchError": "Erreur lors de la récupération des résultats",
     "xpack.osquery.results.multipleAgentsResponded": "{agentsResponded, plural, one {# agent a} other {# agents ont}} répondu, aucune donnée osquery n'a été signalée.",
     "xpack.osquery.savedQueries.dropdown.searchFieldLabel": "Créer à partir d'une recherche enregistrée (facultatif)",
     "xpack.osquery.savedQueries.dropdown.searchFieldPlaceholder": "Rechercher les recherches enregistrées",
+    "xpack.osquery.savedQueries.form.packConfigSection.description": "Les options répertoriées ci-dessous sont facultatives et ne sont appliquées que lorsque la requête est affectée à un pack.",
+    "xpack.osquery.savedQueries.form.packConfigSection.title": "Configuration du pack",
     "xpack.osquery.savedQueries.table.actionsColumnTitle": "Actions",
     "xpack.osquery.savedQueries.table.createdByColumnTitle": "Créé par",
     "xpack.osquery.savedQueries.table.descriptionColumnTitle": "Description",
@@ -18368,6 +22095,9 @@
     "xpack.osquery.savedQueryList.pageTitle": "Recherches enregistrées",
     "xpack.osquery.savedQueryList.queriesTable.editActionAriaLabel": "Modifier {savedQueryName}",
     "xpack.osquery.savedQueryList.queriesTable.runActionAriaLabel": "Exécuter {savedQueryName}",
+    "xpack.osquery.scheduledQueryErrorsTable.agentIdColumnTitle": "ID d'agent",
+    "xpack.osquery.scheduledQueryErrorsTable.errorColumnTitle": "Erreur",
+    "xpack.osquery.updatePack.successToastMessageText": "Le pack \"{packName}\" a été mis à jour avec succès.",
     "xpack.osquery.viewSavedQuery.pageTitle": "Détails de \"{savedQueryId}\"",
     "xpack.painlessLab.apiReferenceButtonLabel": "Référence d'API",
     "xpack.painlessLab.context.defaultLabel": "Le résultat de script sera converti en chaîne",
@@ -18425,6 +22155,10 @@
     "xpack.remoteClusters.connectedStatus.notConnectedToolTip": "Assurez-vous que les nœuds initiaux sont configurés avec le port de transport du cluster distant, et non pas le port http.",
     "xpack.remoteClusters.deleteRemoteCluster.noRemoteClusterErrorMessage": "Aucun cluster distant ne porte ce nom.",
     "xpack.remoteClusters.deleteRemoteCluster.unknownRemoteClusterErrorMessage": "Impossible de supprimer le cluster, les informations sont toujours renvoyées depuis ES.",
+    "xpack.remoteClusters.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.remoteClusters.deprecations.enabled.manualStepTwoMessage": "Modifier le paramètre \"xpack.remote_clusters.enabled\" pour \"xpack.remote_clusters.ui.enabled\".",
+    "xpack.remoteClusters.deprecations.enabledMessage": "Pour empêcher les utilisateurs d’accéder à l’interface utilisateur des clusters distants, utilisez le paramètre \"xpack.remote_clusters.ui.enabled\" au lieu de \"xpack.remote_clusters.enabled\".",
+    "xpack.remoteClusters.deprecations.enabledTitle": "Le paramètre \"xpack.remote_clusters.enabled\" est déclassé.",
     "xpack.remoteClusters.detailPanel.closeButtonLabel": "Fermer",
     "xpack.remoteClusters.detailPanel.connectedLabel": "Connexion",
     "xpack.remoteClusters.detailPanel.connectedNodesLabel": "Nœuds connectés",
@@ -18566,6 +22300,8 @@
     "xpack.remoteClusters.updateRemoteCluster.unknownRemoteClusterErrorMessage": "Impossible de modifier le cluster, aucune réponse renvoyée d'ES.",
     "xpack.reporting.apiClient.unknownError": "La tâche de reporting {job} a échoué. Erreur inconnue.",
     "xpack.reporting.breadcrumb": "Reporting",
+    "xpack.reporting.common.browserCouldNotLaunchErrorMessage": "Impossible de générer des captures d’écran, car le navigateur ne s’est pas lancé.",
+    "xpack.reporting.common.pdfWorkerOutOfMemoryErrorMessage": "Impossible de générer le PDF en raison d’une quantité de mémoire insuffisante. Envisagez de réduire la taille du PDF pour ce rapport avant de réessayer.",
     "xpack.reporting.dashboard.csvDownloadStartedMessage": "Votre CSV sera téléchargé dans un instant.",
     "xpack.reporting.dashboard.csvDownloadStartedTitle": "Téléchargement du CSV démarré",
     "xpack.reporting.dashboard.downloadCsvPanelTitle": "Télécharger CSV",
@@ -18573,24 +22309,59 @@
     "xpack.reporting.dashboard.failedCsvDownloadTitle": "Le téléchargement du CSV a échoué",
     "xpack.reporting.deprecations.migrateIndexIlmPolicy.manualStepOneMessage": "Mettez à jour tous les index de reporting de façon à ce qu'ils utilisent la politique \"{reportingIlmPolicy}\" à l'aide de l'API de paramètres des index.",
     "xpack.reporting.deprecations.migrateIndexIlmPolicyActionMessage": "Les nouveaux index de reporting seront gérés par la politique ILM provisionnée \"{reportingIlmPolicy}\". Vous devez modifier cette politique pour gérer le cycle de vie des rapports. Cette modification vise tous les index possédant le préfixe \"{indexPattern}\".",
+    "xpack.reporting.deprecations.migrateIndexIlmPolicyActionTitle": "Des index de reporting gérés par une politique ILM personnalisée ont été détectés.",
+    "xpack.reporting.deprecations.reportingRole.forbiddenErrorCorrectiveAction": "Assurez-vous de disposer du privilège de cluster \"manage_security\".",
+    "xpack.reporting.deprecations.reportingRole.forbiddenErrorMessage": "Vous n’avez pas les autorisations requises pour remédier à ce déclassement.",
+    "xpack.reporting.deprecations.reportingRole.unknownErrorCorrectiveAction": "Pour plus d’informations, veuillez consulter les logs Kibana.",
+    "xpack.reporting.deprecations.reportingRole.unknownErrorMessage": "Impossible d’exécuter la vérification de déclassement. Pour plus d’informations, veuillez consulter les logs Kibana.",
+    "xpack.reporting.deprecations.reportingRoleMappings.description": "Le mécanisme par défaut pour les privilèges de reporting fonctionnera différemment dans les versions futures, et ce cluster a des mappings de rôle associés à un rôle déclassé pour ces privilèges. Définissez \"xpack.reporting.roles.enabled\" sur \"false\" pour adopter le comportement futur avant la mise à niveau.",
+    "xpack.reporting.deprecations.reportingRoleMappings.manualStepFive": "Supprimez le rôle \"reporting_user\" pour tous les mappings de rôle et ajoutez le rôle personnalisé. Les mappings de rôle concernés sont les suivants : {roleMappings}.",
+    "xpack.reporting.deprecations.reportingRoleMappings.manualStepFour": "Accordez les privilèges de reporting aux utilisateurs en leur affectant l’un des nouveaux rôles.",
+    "xpack.reporting.deprecations.reportingRoleMappings.manualStepOne": "Définissez \"xpack.reporting.roles.enabled\" sur \"false\" dans le fichier kibana.yml.",
+    "xpack.reporting.deprecations.reportingRoleMappings.manualStepThree": "Sous Gestion > Sécurité > Rôles, créez un ou plusieurs rôles permettant d’accorder les privilèges de reporting pour l’application Kibana.",
+    "xpack.reporting.deprecations.reportingRoleMappings.manualStepTwo": "Supprimez le paramètre \"xpack.reporting.roles.allow\" du fichier kibana.yml, le cas échéant.",
+    "xpack.reporting.deprecations.reportingRoleMappings.title": "Le rôle \"{reportingUserRoleName}\" est déclassé : vérifiez les mappings de rôle.",
+    "xpack.reporting.deprecations.reportingRoles.description": "Le mécanisme par défaut pour les privilèges de reporting fonctionnera différemment dans les versions futures, ce qui affectera le comportement de ce cluster. Définissez \"xpack.reporting.roles.enabled\" sur \"false\" pour adopter le comportement futur avant la mise à niveau.",
+    "xpack.reporting.deprecations.reportingRoles.manualStepFour": "Accordez les privilèges de reporting aux utilisateurs en leur affectant l’un des nouveaux rôles.",
+    "xpack.reporting.deprecations.reportingRoles.manualStepOne": "Définissez \"xpack.reporting.roles.enabled\" sur \"false\" dans le fichier kibana.yml.",
+    "xpack.reporting.deprecations.reportingRoles.manualStepThree": "Sous Gestion > Sécurité > Rôles, créez un ou plusieurs rôles permettant d’accorder les privilèges de reporting pour l’application Kibana.",
+    "xpack.reporting.deprecations.reportingRoles.manualStepTwo": "Supprimez le paramètre \"xpack.reporting.roles.allow\" du fichier kibana.yml, le cas échéant.",
+    "xpack.reporting.deprecations.reportingRoles.title": "Le paramètre \"{fromPath}.roles\" est déclassé.",
+    "xpack.reporting.deprecations.reportingRoleUsers.description": "Le mécanisme par défaut pour les privilèges de reporting fonctionnera différemment dans les versions futures, et ce cluster a des utilisateurs associés à un rôle déclassé pour ces privilèges. Définissez \"xpack.reporting.roles.enabled\" sur \"false\" pour adopter le comportement futur avant la mise à niveau.",
+    "xpack.reporting.deprecations.reportingRoleUsers.manualStepFive": "Supprimez le rôle \"reporting_user\" pour tous les utilisateurs et ajoutez le rôle personnalisé. Les utilisateurs concernés sont les suivants : {usersRoles}.",
+    "xpack.reporting.deprecations.reportingRoleUsers.manualStepFour": "Accordez les privilèges de reporting aux utilisateurs en leur affectant l’un des nouveaux rôles.",
+    "xpack.reporting.deprecations.reportingRoleUsers.manualStepOne": "Définissez \"xpack.reporting.roles.enabled\" sur \"false\" dans le fichier kibana.yml.",
+    "xpack.reporting.deprecations.reportingRoleUsers.manualStepThree": "Sous Gestion > Sécurité > Rôles, créez un ou plusieurs rôles permettant d’accorder les privilèges de reporting pour l’application Kibana.",
+    "xpack.reporting.deprecations.reportingRoleUsers.manualStepTwo": "Supprimez le paramètre \"xpack.reporting.roles.allow\" du fichier kibana.yml, le cas échéant.",
+    "xpack.reporting.deprecations.reportingRoleUsers.title": "Le rôle \"{reportingUserRoleName}\" est déclassé : vérifiez les rôles utilisateur.",
     "xpack.reporting.diagnostic.browserMissingDependency": "Le navigateur n'a pas pu démarrer correctement en raison de dépendances système manquantes. Veuillez consulter {url}",
     "xpack.reporting.diagnostic.browserMissingFonts": "Le navigateur n'a pas réussi à localiser de police par défaut. Consultez {url} pour corriger le problème.",
     "xpack.reporting.diagnostic.noUsableSandbox": "Impossible d'utiliser la sandbox Chromium. Vous pouvez la désactiver à vos risques et périls avec \"xpack.reporting.capture.browser.chromium.disableSandbox\". Veuillez consulter {url}",
     "xpack.reporting.diagnostic.screenshotFailureMessage": "Impossible d'effectuer une capture d'écran de votre installation Kibana.",
+    "xpack.reporting.errorHandler.unknownError": "Erreur inconnue",
     "xpack.reporting.exportTypes.common.failedToDecryptReportJobDataErrorMessage": "Impossible de déchiffrer les données de la tâche de reporting. Veuillez vous assurer que {encryptionKey} est défini et générez à nouveau ce rapport. {err}",
     "xpack.reporting.exportTypes.common.missingJobHeadersErrorMessage": "Les en-têtes de tâche sont manquants",
+    "xpack.reporting.exportTypes.csv.generateCsv.authenticationExpired.partialResultsMessage": "Ce rapport contient des résultats CSV partiels, car le token d’authentification a expiré. Exportez une quantité moindre de données ou augmentez le délai d’expiration du token d’authentification.",
     "xpack.reporting.exportTypes.csv.generateCsv.escapedFormulaValues": "Le CSV peut contenir des formules dont les valeurs sont précédées d'un caractère d'échappement",
+    "xpack.reporting.jobCreatedBy.unknownUserPlaceholderText": "Inconnu",
     "xpack.reporting.jobsQuery.deleteError": "Impossible de supprimer le rapport : {error}",
+    "xpack.reporting.jobsQuery.infoError.unauthorizedErrorMessage": "Désolé, vous n’êtes pas autorisé à voir les informations {jobType}.",
     "xpack.reporting.jobStatusDetail.attemptXofY": "Tentative {attempts} sur {max_attempts}.",
     "xpack.reporting.jobStatusDetail.deprecatedText": "Il s'agit d'un type d'exportation déclassé. L'automatisation de ce rapport devra être à nouveau créée pour une question de compatibilité avec les futures versions de Kibana.",
     "xpack.reporting.jobStatusDetail.errorText": "Consultez les informations de rapport pour plus de détails sur l'erreur.",
     "xpack.reporting.jobStatusDetail.pendingStatusReachedText": "En attente du traitement de la tâche.",
+    "xpack.reporting.jobStatusDetail.timeoutSeconds": "{timeout} secondes",
+    "xpack.reporting.jobStatusDetail.timeoutSecondsUnknown": "Inconnu",
+    "xpack.reporting.jobStatusDetail.unknownText": "Inconnu",
     "xpack.reporting.jobStatusDetail.warningsText": "Consultez les informations de rapport pour plus de détails sur les avertissements.",
     "xpack.reporting.jobStatuses.completedText": "Terminé",
     "xpack.reporting.jobStatuses.failedText": "Échoué",
     "xpack.reporting.jobStatuses.pendingText": "En attente",
     "xpack.reporting.jobStatuses.processingText": "Traitement",
     "xpack.reporting.jobStatuses.warningText": "Terminé",
+    "xpack.reporting.jobType.csvOutputName": "CSV",
+    "xpack.reporting.jobType.pdfOutputName": "PDF",
+    "xpack.reporting.jobType.pngOutputName": "PNG",
     "xpack.reporting.jobWarning.csvContainsFormulas": "Votre fichier CSV contient des caractères que les applications de feuilles de calcul pourraient considérer comme des formules.",
     "xpack.reporting.jobWarning.exportTypeDeprecated": "Il s'agit d'un type d'exportation déclassé. L'automatisation de ce rapport devra être à nouveau créée pour une question de compatibilité avec les futures versions de Kibana.",
     "xpack.reporting.jobWarning.maxSizeReachedTooltip": "Votre recherche a atteint la taille maximale et contient des données partielles.",
@@ -18608,21 +22379,37 @@
     "xpack.reporting.listing.diagnosticSuccessMessage": "Tout semble correct pour le bon fonctionnement du reporting.",
     "xpack.reporting.listing.diagnosticSuccessTitle": "Tout est prêt !",
     "xpack.reporting.listing.diagnosticTitle": "Diagnostic de reporting",
+    "xpack.reporting.listing.flyout.closeButtonLabel": "Fermer",
     "xpack.reporting.listing.ilmPolicyCallout.migrateIndicesButtonLabel": "Appliquer la politique {ilmPolicyName}",
     "xpack.reporting.listing.ilmPolicyCallout.migrateIndicesErrorTitle": "Impossible de migrer les index de reporting",
     "xpack.reporting.listing.ilmPolicyCallout.migrateIndicesSuccessTitle": "Politique de reporting active pour tous les index de reporting",
     "xpack.reporting.listing.ilmPolicyCallout.migrationNeededDescription": "Pour vous assurer que vos rapports sont gérés de façon cohérente, tous les index de reporting doivent utiliser la politique {ilmPolicyName}.",
     "xpack.reporting.listing.ilmPolicyCallout.migrationNeededTitle": "Appliquer une nouvelle politique de cycle de vie pour les rapports",
+    "xpack.reporting.listing.infoPanel.attempts": "{attempts} sur {maxAttempts}",
     "xpack.reporting.listing.infoPanel.attemptsInfo": "Tentatives",
+    "xpack.reporting.listing.infoPanel.callout.failedReportTitle": "Échec du rapport",
+    "xpack.reporting.listing.infoPanel.callout.warningsTitle": "Ce rapport contient des avertissements.",
     "xpack.reporting.listing.infoPanel.completedAtInfo": "Terminé à",
     "xpack.reporting.listing.infoPanel.contentTypeInfo": "Type de contenu",
+    "xpack.reporting.listing.infoPanel.cpuInfo": "Utilisation CPU",
     "xpack.reporting.listing.infoPanel.createdAtInfo": "Créé à",
+    "xpack.reporting.listing.infoPanel.csvRows": "Lignes CSV",
+    "xpack.reporting.listing.infoPanel.dimensionsInfoHeight": "Hauteur en pixels",
+    "xpack.reporting.listing.infoPanel.dimensionsInfoWidth": "Largeur en pixels",
+    "xpack.reporting.listing.infoPanel.kibanaVersion": "Version de Kibana",
+    "xpack.reporting.listing.infoPanel.memoryInfo": "Utilisation RAM",
+    "xpack.reporting.listing.infoPanel.notApplicableLabel": "S. O.",
+    "xpack.reporting.listing.infoPanel.outputSectionTitle": "Sortie",
+    "xpack.reporting.listing.infoPanel.pdfPagesInfo": "Nombre de pages",
     "xpack.reporting.listing.infoPanel.processedByInfo": "Traité par",
     "xpack.reporting.listing.infoPanel.sizeInfo": "Taille en octets",
+    "xpack.reporting.listing.infoPanel.space": "Espace Kibana",
     "xpack.reporting.listing.infoPanel.startedAtInfo": "Démarré à",
     "xpack.reporting.listing.infoPanel.statusInfo": "Statut",
     "xpack.reporting.listing.infoPanel.timeoutInfo": "Délai d'expiration",
+    "xpack.reporting.listing.infoPanel.timestampSectionTitle": "Horodatages",
     "xpack.reporting.listing.infoPanel.tzInfo": "Fuseau horaire",
+    "xpack.reporting.listing.infoPanel.unknownLabel": "inconnue",
     "xpack.reporting.listing.reports.ilmPolicyLinkText": "Modifier la politique ILM de reporting",
     "xpack.reporting.listing.reports.subtitle": "Obtenir les rapports générés dans les applications Kibana.",
     "xpack.reporting.listing.reportstitle": "Rapports",
@@ -18635,18 +22422,28 @@
     "xpack.reporting.listing.table.deleteFailedErrorMessage": "Le rapport n'a pas été supprimé : {error}",
     "xpack.reporting.listing.table.deleteNumConfirmTitle": "Supprimer les {num} rapports ?",
     "xpack.reporting.listing.table.deleteReportButton": "Supprimer {num, plural, one {le rapport} other {les rapports} }",
+    "xpack.reporting.listing.table.downloadReportButtonLabel": "Télécharger le rapport",
+    "xpack.reporting.listing.table.downloadReportDescription": "Téléchargez ce rapport dans un nouvel onglet.",
     "xpack.reporting.listing.table.loadingReportsDescription": "Chargement des rapports",
     "xpack.reporting.listing.table.noCreatedReportsDescription": "Aucun rapport n'a été créé",
+    "xpack.reporting.listing.table.noTitleLabel": "Sans titre",
+    "xpack.reporting.listing.table.openInKibanaAppDescription": "Ouvrez l’application Kibana directement à l’emplacement de génération de ce rapport.",
+    "xpack.reporting.listing.table.openInKibanaAppLabel": "Ouvrir dans Kibana",
     "xpack.reporting.listing.table.reportInfoAndErrorButtonTooltip": "Consultez les informations de rapport et le message d'erreur.",
     "xpack.reporting.listing.table.reportInfoAndWarningsButtonTooltip": "Consultez les informations de rapport et les avertissements.",
     "xpack.reporting.listing.table.reportInfoButtonTooltip": "Consultez les informations de rapport.",
     "xpack.reporting.listing.table.reportInfoUnableToFetch": "Impossible de récupérer les informations de rapport.",
     "xpack.reporting.listing.table.requestFailedErrorMessage": "Demande refusée",
     "xpack.reporting.listing.table.showReportInfoAriaLabel": "Afficher les informations de rapport",
+    "xpack.reporting.listing.table.untitledReport": "Rapport sans titre",
+    "xpack.reporting.listing.table.viewReportingInfoActionButtonDescription": "Accédez à des informations supplémentaires sur ce rapport.",
+    "xpack.reporting.listing.table.viewReportingInfoActionButtonLabel": "Afficher les informations du rapport",
     "xpack.reporting.listing.tableColumns.actionsTitle": "Actions",
+    "xpack.reporting.listing.tableColumns.content": "Contenu",
     "xpack.reporting.listing.tableColumns.createdAtTitle": "Créé à",
-    "xpack.reporting.listing.tableColumns.reportTitle": "Générer des rapports",
+    "xpack.reporting.listing.tableColumns.reportTitle": "Titre",
     "xpack.reporting.listing.tableColumns.statusTitle": "Statut",
+    "xpack.reporting.listing.tableColumns.typeTitle": "Type",
     "xpack.reporting.management.reportingTitle": "Reporting",
     "xpack.reporting.panelContent.advancedOptions": "Options avancées",
     "xpack.reporting.panelContent.copyUrlButtonLabel": "Copier l'URL POST",
@@ -18657,21 +22454,36 @@
     "xpack.reporting.panelContent.saveWorkDescription": "Veuillez enregistrer votre travail avant de générer un rapport.",
     "xpack.reporting.panelContent.successfullyQueuedReportNotificationDescription": "Suivre sa progression dans {path}",
     "xpack.reporting.panelContent.successfullyQueuedReportNotificationTitle": "Rapport mis en file d'attente pour {objectType}",
+    "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthDescription": "Impossible de copier cette URL.",
+    "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthTitle": "URL trop longue",
+    "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthTrySaveDescription": "Impossible de copier cette URL. Essayez d’enregistrer votre travail.",
+    "xpack.reporting.panelContent.unsavedStateErrorText": "Enregistrez votre travail avant de copier cette URL.",
+    "xpack.reporting.panelContent.unsavedStateErrorTitle": "Travail non enregistré",
     "xpack.reporting.pdfFooterImageDescription": "Image personnalisée à utiliser dans le pied de page du PDF",
     "xpack.reporting.pdfFooterImageLabel": "Image de pied de page du PDF",
+    "xpack.reporting.publicNotifier.csvContainsFormulas.formulaReportMessage": "Le rapport \"{reportObjectTitle}\" contient des caractères que les applications de feuilles de calcul peuvent considérer comme des formules.",
+    "xpack.reporting.publicNotifier.csvContainsFormulas.formulaReportTitle": "Les rapports du type {reportType} peuvent contenir des formules.",
     "xpack.reporting.publicNotifier.downloadReportButtonLabel": "Télécharger le rapport",
     "xpack.reporting.publicNotifier.error.calloutTitle": "La tâche de reporting a échoué",
-    "xpack.reporting.publicNotifier.error.checkManagement": "D'autres informations sont disponibles ici : {path}.",
-    "xpack.reporting.publicNotifier.error.reportingSectionUrlLinkLabel": "Gestion > Kibana > Reporting",
+    "xpack.reporting.publicNotifier.error.checkManagement": "Accédez à {path} pour plus d’informations.",
+    "xpack.reporting.publicNotifier.error.couldNotCreateReportTitle": "Impossible de créer un rapport {reportType} pour \"{reportObjectTitle}\".",
+    "xpack.reporting.publicNotifier.error.reportingSectionUrlLinkLabel": "Gestion de la Suite > Kibana > Reporting",
     "xpack.reporting.publicNotifier.error.tryRefresh": "Essayez d'actualiser la page.",
     "xpack.reporting.publicNotifier.httpErrorMessage": "Impossible de vérifier le statut de la tâche de reporting !",
     "xpack.reporting.publicNotifier.maxSizeReached.partialReportDescription": "Le rapport a atteint la taille maximale et contient des données partielles.",
+    "xpack.reporting.publicNotifier.maxSizeReached.partialReportTitle": "Création partielle du rapport {reportType} pour \"{reportObjectTitle}\"",
     "xpack.reporting.publicNotifier.pollingErrorMessage": "Erreur de notification de reporting !",
-    "xpack.reporting.publicNotifier.reportLink.reportingSectionUrlLinkLabel": "Stack Management > Alerts and Insights > Reporting",
+    "xpack.reporting.publicNotifier.reportLink.reportingSectionUrlLinkLabel": "Gestion de la Suite > Reporting",
+    "xpack.reporting.publicNotifier.reportLinkDescription": "Téléchargez-le maintenant ou retrouvez-le ultérieurement sous {path}.",
+    "xpack.reporting.publicNotifier.successfullyCreatedReportNotificationTitle": "Rapport {reportType} créé pour \"{reportObjectTitle}\"",
+    "xpack.reporting.publicNotifier.warning.title": "Rapport {reportType} terminé avec des problèmes",
     "xpack.reporting.redirectApp.errorTitle": "Erreur de redirection",
     "xpack.reporting.redirectApp.redirectConsoleErrorPrefixLabel": "Erreur de page de redirection :",
     "xpack.reporting.registerFeature.reportingDescription": "Gérez vos rapports générés depuis Discover, Visualize et le tableau de bord.",
     "xpack.reporting.registerFeature.reportingTitle": "Reporting",
+    "xpack.reporting.reportInfoFlyout.actionsButtonLabel": "Actions",
+    "xpack.reporting.reportInfoFlyout.downloadButtonLabel": "Télécharger",
+    "xpack.reporting.reportInfoFlyout.openInKibanaAppButtonLabel": "Ouvrir dans Kibana",
     "xpack.reporting.screenCapturePanelContent.canvasLayoutHelpText": "Supprimer les bordures et le logo de pied de page",
     "xpack.reporting.screenCapturePanelContent.canvasLayoutLabel": "Mise en page complète",
     "xpack.reporting.screenCapturePanelContent.optimizeForPrintingHelpText": "Utilise plusieurs pages, affichant au maximum 2 visualisations par page",
@@ -18679,6 +22491,14 @@
     "xpack.reporting.shareContextMenu.csvReportsButtonLabel": "Rapports CSV",
     "xpack.reporting.shareContextMenu.pdfReportsButtonLabel": "Rapports PDF",
     "xpack.reporting.shareContextMenu.pngReportsButtonLabel": "Rapports PNG",
+    "xpack.reporting.statusIndicator.completedLabel": "Terminé",
+    "xpack.reporting.statusIndicator.completedWithWarningsLabel": "Terminé, avec des avertissements",
+    "xpack.reporting.statusIndicator.failedLabel": "Échoué",
+    "xpack.reporting.statusIndicator.lastStatusUpdateLabel": "Mis à jour le {date}",
+    "xpack.reporting.statusIndicator.pendingLabel": "En attente",
+    "xpack.reporting.statusIndicator.processingLabel": "En cours de traitement, tentative {attempt}",
+    "xpack.reporting.statusIndicator.processingMaxAttemptsLabel": "En cours de traitement, tentative {attempt} sur {of}",
+    "xpack.reporting.statusIndicator.unknownLabel": "Inconnu",
     "xpack.reporting.uiSettings.validate.customLogo.badFile": "Désolé, ce fichier ne convient pas. Veuillez essayer un autre fichier image.",
     "xpack.reporting.uiSettings.validate.customLogo.tooLarge": "Désolé, ce fichier est trop volumineux. Le fichier image doit être inférieur à 200 kilo-octets.",
     "xpack.rollupJobs.appTitle": "Tâches de cumul",
@@ -18814,6 +22634,10 @@
     "xpack.rollupJobs.deleteAction.errorTitle": "Erreur lors de la suppression des travaux de cumul",
     "xpack.rollupJobs.deleteAction.successMultipleNotificationTitle": "{count} tâches de cumul ont été supprimées",
     "xpack.rollupJobs.deleteAction.successSingleNotificationTitle": "La tâche de cumul \"{jobId}\" a été supprimée",
+    "xpack.rollupJobs.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.rollupJobs.deprecations.enabled.manualStepTwoMessage": "Remplacez le paramètre \"xpack.rollup.enabled\" par \"xpack.rollup.ui.enabled\".",
+    "xpack.rollupJobs.deprecations.enabledMessage": "Pour empêcher les utilisateurs d’accéder à l’interface utilisateur des tâches de cumul, utilisez le paramètre \"xpack.rollup.ui.enabled\" au lieu de \"xpack.rollup.enabled\".",
+    "xpack.rollupJobs.deprecations.enabledTitle": "Le paramètre \"xpack.rollup.enabled\" est déclassé.",
     "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "Gérer",
     "xpack.rollupJobs.detailPanel.loadingLabel": "Chargement de la tâche de cumul…",
     "xpack.rollupJobs.detailPanel.notFoundLabel": "Tâche de cumul introuvable",
@@ -18887,6 +22711,8 @@
     "xpack.rollupJobs.licenseCheckErrorMessage": "La vérification de la licence a échoué",
     "xpack.rollupJobs.listBreadcrumbTitle": "Tâches de cumul",
     "xpack.rollupJobs.refreshAction.errorTitle": "Erreur lors de l'actualisation des tâches de cumul",
+    "xpack.rollupJobs.rollupDataViewsDescription": "Activez la création de vues de données capturant les index de cumul\n              qui, à leur tour, activent les visualisations sur la base des données de cumul.",
+    "xpack.rollupJobs.rollupDataViewsTitle": "Activer les vues de données de cumul",
     "xpack.rollupJobs.rollupJobsDocsLinkText": "Documents liés aux tâches de cumul",
     "xpack.rollupJobs.startJobsAction.errorTitle": "Erreur lors du démarrage des tâches de cumul",
     "xpack.rollupJobs.stopJobsAction.errorTitle": "Erreur lors de l'arrêt des tâches de cumul",
@@ -18978,6 +22804,8 @@
     "xpack.savedObjectsTagging.validation.description.errorTooLong": "La description de balise ne doit pas dépasser {length} caractères",
     "xpack.savedObjectsTagging.validation.name.errorTooLong": "Le nom de balise ne doit pas dépasser {length} caractères",
     "xpack.savedObjectsTagging.validation.name.errorTooShort": "Le nom de balise doit comprendre au moins {length} caractères",
+    "xpack.screenshotting.exportTypes.printablePdf.logoDescription": "Propulsé par Elastic",
+    "xpack.screenshotting.exportTypes.printablePdf.pagingDescription": "Page {currentPage} sur {pageCount}",
     "xpack.searchProfiler.advanceTimeDescription": "Temps passé sur l'avancée de l'itérateur jusqu'au document suivant.",
     "xpack.searchProfiler.aggregationProfileTabTitle": "Profil d'agrégation",
     "xpack.searchProfiler.basicLicenseTitle": "Basic",
@@ -18986,7 +22814,9 @@
     "xpack.searchProfiler.editorElementLabel": "Éditeur de Search Profiler des outils de développement",
     "xpack.searchProfiler.emptyProfileTreeDescription": "Entrez une recherche, cliquez sur Profil et visualisez les résultats ici.",
     "xpack.searchProfiler.emptyProfileTreeTitle": "Aucune recherche à profiler",
-    "xpack.searchProfiler.errorSomethingWentWrongTitle": "Quelque chose n'a pas fonctionné",
+    "xpack.searchProfiler.errorNoShardsDescription": "Assurez-vous que l’index spécifié correspond à un index valide.",
+    "xpack.searchProfiler.errorNoShardsTitle": "Profilage impossible",
+    "xpack.searchProfiler.errorSomethingWentWrongTitle": "Un problème est survenu",
     "xpack.searchProfiler.errorToastTitle": "Erreur d'analyse JSON",
     "xpack.searchProfiler.formIndexLabel": "Index",
     "xpack.searchProfiler.formProfileButtonLabel": "Profil",
@@ -19068,10 +22898,29 @@
     "xpack.security.conflictingSessionError": "Désolé, vous avez déjà une session Kibana active. Si vous souhaitez en démarrer une nouvelle, veuillez d'abord vous déconnecter de la première session.",
     "xpack.security.copyTokenField.copyButton": "Copier dans le presse-papiers",
     "xpack.security.copyTokenField.tokenLabel": "Token",
+    "xpack.security.deprecations.authcProviders.manualSteps1": "Supprimez le paramètre \"xpack.security.authc.providers\" du fichier kibana.yml.",
+    "xpack.security.deprecations.authcProviders.manualSteps2": "Ajoutez vos fournisseurs d’authentification à l’aide du nouveau format d’objet.",
+    "xpack.security.deprecations.authcProvidersMessage": "Utilisez le nouveau format d’objet plutôt qu’un tableau des types de fournisseur.",
+    "xpack.security.deprecations.authcProvidersTitle": "Le format de tableau pour le paramètre \"xpack.security.authc.providers\" est déclassé.",
+    "xpack.security.deprecations.basicAndTokenProviders.manualSteps1": "Supprimez le fournisseur \"{basicProvider}\" du paramètre \"xpack.security.authc.providers\" dans le fichier kibana.yml.",
+    "xpack.security.deprecations.basicAndTokenProvidersMessage": "Utilisez l’un de ces fournisseurs uniquement. Lorsque les deux fournisseurs sont définis, Kibana utilise uniquement le fournisseur \"{tokenProvider}\".",
+    "xpack.security.deprecations.basicAndTokenProvidersTitle": "Le fait d’utiliser les deux fournisseurs \"{basicProvider}\" et \"{tokenProvider}\" pour le paramètre \"xpack.security.authc.providers\" n’a aucune incidence.",
+    "xpack.security.deprecations.kibanaUser.deprecationMessage": "Utilisez le rôle \"{adminRoleName}\" pour donner accès à toutes les fonctionnalités Kibana dans l’ensemble des espaces.",
+    "xpack.security.deprecations.kibanaUser.deprecationTitle": "Le rôle \"{userRoleName}\" est déclassé.",
+    "xpack.security.deprecations.kibanaUser.forbiddenErrorCorrectiveAction": "Assurez-vous de disposer du privilège de cluster \"manage_security\".",
+    "xpack.security.deprecations.kibanaUser.forbiddenErrorMessage": "Vous n’avez pas les autorisations requises pour remédier à ce déclassement.",
+    "xpack.security.deprecations.kibanaUser.roleMappingsDeprecationCorrectiveAction": "Supprimez le rôle \"{userRoleName}\" pour tous les mappings de rôle et ajoutez le rôle \"{adminRoleName}\". Les mappings de rôle concernés sont les suivants : {roleMappings}.",
+    "xpack.security.deprecations.kibanaUser.unknownErrorCorrectiveAction": "Pour plus d’informations, veuillez consulter les logs Kibana.",
+    "xpack.security.deprecations.kibanaUser.unknownErrorMessage": "Impossible d’exécuter la vérification de déclassement. Pour plus d’informations, veuillez consulter les logs Kibana.",
+    "xpack.security.deprecations.kibanaUser.usersDeprecationCorrectiveAction": "Supprimez le rôle \"{userRoleName}\" pour tous les utilisateurs et ajoutez le rôle \"{adminRoleName}\". Les utilisateurs concernés sont les suivants : {users}.",
+    "xpack.security.deprecations.maxRedirectURLSize.manualSteps1": "Supprimez le paramètre \"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize\" du fichier kibana.yml.",
+    "xpack.security.deprecations.maxRedirectURLSizeMessage": "Ce paramètre n’est plus utilisé.",
+    "xpack.security.deprecations.maxRedirectURLSizeTitle": "Le paramètre \"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize\" n’a aucune incidence.",
     "xpack.security.formFlyout.cancelButton": "Annuler",
     "xpack.security.loggedOut.login": "Connexion",
     "xpack.security.loggedOut.title": "Déconnecté avec succès",
     "xpack.security.loggedOutAppTitle": "Déconnecté",
+    "xpack.security.login.authenticationErrorDescription": "Une erreur d’authentification inattendue s’est produite. Veuillez vous reconnecter.",
     "xpack.security.login.basicLoginForm.logInButtonLabel": "Connexion",
     "xpack.security.login.basicLoginForm.passwordFormRowLabel": "Mot de passe",
     "xpack.security.login.basicLoginForm.unknownErrorMessage": "Impossible de vous connecter. Veuillez réessayer.",
@@ -19092,6 +22941,11 @@
     "xpack.security.loginPage.loginSelectorLinkText": "Plus d'options de connexion",
     "xpack.security.loginPage.noLoginMethodsAvailableMessage": "Contactez votre administrateur système.",
     "xpack.security.loginPage.noLoginMethodsAvailableTitle": "La connexion est désactivée.",
+    "xpack.security.loginPage.openInNewWindowButton": "Ouvrir dans une nouvelle fenêtre",
+    "xpack.security.loginPage.openInNewWindowOrChangeBrowserSettingsTitle": "Pour afficher ce contenu, ouvrez-le dans une nouvelle fenêtre ou autorisez les cookies tiers dans les paramètres de votre navigateur.",
+    "xpack.security.loginPage.openInNewWindowOrChangeKibanaConfigTitle": "Pour afficher ce contenu, ouvrez-le dans une nouvelle fenêtre ou demandez à votre administrateur d’autoriser les cookies entre origines multiples.",
+    "xpack.security.loginPage.requiresCookiesMessage": "Activez les cookies dans les paramètres du navigateur pour pouvoir continuer.",
+    "xpack.security.loginPage.requiresCookiesTitle": "Les cookies sont nécessaires pour pouvoir se connecter à Elastic",
     "xpack.security.loginPage.requiresSecureConnectionMessage": "Contactez votre administrateur système.",
     "xpack.security.loginPage.requiresSecureConnectionTitle": "Une connexion sécurisée est requise pour se connecter",
     "xpack.security.loginPage.unknownLayoutMessage": "Consultez les logs Kibana pour plus de détails et essayez de recharger la page.",
@@ -19360,6 +23214,8 @@
     "xpack.security.management.editRolespacePrivilegeForm.updatePrivilegeButton": "Mettre à jour le privilège d'espace",
     "xpack.security.management.enabledBadge": "Activé",
     "xpack.security.management.reservedBadge": "Réservé",
+    "xpack.security.management.roleMappings.actionCloneAriaLabel": "Cloner ''{name}''",
+    "xpack.security.management.roleMappings.actionCloneTooltip": "Cloner",
     "xpack.security.management.roleMappings.actionDeleteAriaLabel": "Supprimer \"{name}\"",
     "xpack.security.management.roleMappings.actionDeleteTooltip": "Supprimer",
     "xpack.security.management.roleMappings.actionEditAriaLabel": "Modifier \"{name}\"",
@@ -19398,16 +23254,22 @@
     "xpack.security.management.roleMappings.roleTemplates": "{templateCount, plural, one{# modèle de rôle défini} other {# modèles de rôles définis}}",
     "xpack.security.management.roleMappingsTitle": "Mappings de rôle",
     "xpack.security.management.roles.actionsColumnName": "Actions",
+    "xpack.security.management.roles.cloneRoleActionLabel": "Cloner {roleName}",
+    "xpack.security.management.roles.cloneRoleActionName": "Cloner",
     "xpack.security.management.roles.confirmDelete.cancelButtonLabel": "Annuler",
     "xpack.security.management.roles.confirmDelete.deleteButtonLabel": "Supprimer",
     "xpack.security.management.roles.confirmDelete.removingRolesDescription": "Vous êtes sur le point de supprimer ces rôles :",
     "xpack.security.management.roles.confirmDelete.roleDeletingErrorNotificationMessage": "Erreur lors de la suppression du rôle {roleName}",
     "xpack.security.management.roles.confirmDelete.roleSuccessfullyDeletedNotificationMessage": "Rôle {roleName} supprimé",
     "xpack.security.management.roles.createRoleButtonLabel": "Créer le rôle",
+    "xpack.security.management.roles.deleteRoleActionLabel": "Supprimer {roleName}",
+    "xpack.security.management.roles.deleteRoleActionName": "Supprimer",
     "xpack.security.management.roles.deleteRoleTitle": "Supprimer rôle{value, plural, one {{roleName}} other {s}}",
     "xpack.security.management.roles.deleteSelectedRolesButtonLabel": "Supprimer {numSelected} rôle{numSelected, plural, one { } other {s}}",
     "xpack.security.management.roles.deletingRolesWarningMessage": "Cette opération ne peut pas être annulée.",
     "xpack.security.management.roles.deniedPermissionTitle": "Vous devez disposer d'une autorisation pour gérer les rôles",
+    "xpack.security.management.roles.editRoleActionLabel": "Modifier {roleName}",
+    "xpack.security.management.roles.editRoleActionName": "Modifier",
     "xpack.security.management.roles.fetchingRolesErrorMessage": "Erreur lors de la récupération des rôles : {message}",
     "xpack.security.management.roles.nameColumnName": "Rôle",
     "xpack.security.management.roles.noIndexPatternsPermission": "Vous devez disposer d'une autorisation pour accéder à la liste de modèles d'indexation disponibles.",
@@ -19548,6 +23410,10 @@
     "xpack.security.overwrittenSession.continueAsUserText": "Continuer en tant que {username}",
     "xpack.security.overwrittenSession.title": "Vous vous êtes connecté précédemment sous un autre nom d'utilisateur.",
     "xpack.security.overwrittenSessionAppTitle": "Session écrasée",
+    "xpack.security.privilegeDeprecationsService.error.retrievingRoles.message": "Erreur lors de la récupération des rôles pour les déclassements de privilège : {message}.",
+    "xpack.security.privilegeDeprecationsService.error.title": "Erreur relative aux services de déclassement de privilège",
+    "xpack.security.privilegeDeprecationsService.error.unauthorized.message": "Vous devez disposer du privilège de cluster \"manage_security\" pour remédier aux déclassements de rôle.",
+    "xpack.security.privilegeDeprecationsService.manualSteps.message": "Un utilisateur présentant le privilège de cluster \"manage_security\" est requis pour réaliser cette vérification.",
     "xpack.security.registerFeature.securitySettingsDescription": "Contrôle quel utilisateur a accès et quelles tâches il peut effectuer.",
     "xpack.security.registerFeature.securitySettingsTitle": "Gérer les autorisations",
     "xpack.security.resetSession.description": "Revenez à la page précédente ou connectez-vous sous un autre nom d'utilisateur.",
@@ -19571,6 +23437,7 @@
     "xpack.security.users.breadcrumb": "Utilisateurs",
     "xpack.security.users.editUserPage.createBreadcrumb": "Créer",
     "xpack.securitySolution.accessibility.tooltipWithKeyboardShortcut.pressTooltipLabel": "Appuyer",
+    "xpack.securitySolution.actionsContextMenu.label": "Ouvrir",
     "xpack.securitySolution.administration.list.beta": "Bêta",
     "xpack.securitySolution.administration.os.linux": "Linux",
     "xpack.securitySolution.administration.os.macos": "Mac",
@@ -19585,8 +23452,21 @@
     "xpack.securitySolution.alertDetails.noIndicatorEnrichmentsDescription": "Nous n'avons trouvé d'indicateur de Threat Intelligence avec aucune règle de correspondance d'indicateur.",
     "xpack.securitySolution.alertDetails.noInvestigationEnrichmentsDescription": "Nous n'avons pas trouvé de valeur de champ comportant des informations supplémentaires disponibles depuis les sources de Threat Intelligence dans lesquelles nous avons lancé la recherche sur les 30 derniers jours par défaut.",
     "xpack.securitySolution.alertDetails.noInvestigationEnrichmentsTitle": "Aucun enrichissement avec la Threat Intelligence n'a été trouvé",
+    "xpack.securitySolution.alertDetails.noRiskDataDescription": "Aucune donnée de risque de l’hôte n’a été détectée pour cette alerte.",
     "xpack.securitySolution.alertDetails.overview": "Aperçu",
+    "xpack.securitySolution.alertDetails.overview.enrichedDataTitle": "Données enrichies",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields": "Champs en surbrillance",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalence": "Prévalence d’alerte",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalenceTooltip": "Nombre total d’alertes de même valeur dans la plage temporelle actuellement sélectionnée. Cette valeur n’est pas affectée par d’autres filtres.",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.field": "Champ",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.value": "Valeur",
+    "xpack.securitySolution.alertDetails.overview.hostDataTooltipContent": "La classification des risques n’est affichée que lorsqu’elle est disponible pour un hôte. Vérifiez que {hostsRiskScoreDocumentationLink} est activé dans votre environnement.",
+    "xpack.securitySolution.alertDetails.overview.hostRiskDataTitle": "Données de risque de l’hôte",
+    "xpack.securitySolution.alertDetails.overview.hostsRiskScoreLink": "Score de risque de l’hôte",
     "xpack.securitySolution.alertDetails.overview.investigationGuide": "Guide d'investigation",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesCount": "{caseCount} {caseCount, plural, =0 {cas.} =1 {cas:} other {cas:}}",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesFailure": "Impossible de charger les cas connexes : \"{error}\".",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesFound": "Alerte détectée dans",
     "xpack.securitySolution.alertDetails.refresh": "Actualiser",
     "xpack.securitySolution.alertDetails.summary.readLess": "Lire moins",
     "xpack.securitySolution.alertDetails.summary.readMore": "En savoir plus",
@@ -19596,7 +23476,7 @@
     "xpack.securitySolution.alerts.riskScoreMapping.defaultRiskScoreTitle": "Score de risque par défaut",
     "xpack.securitySolution.alerts.riskScoreMapping.mappingDescriptionLabel": "Utilisez une valeur d'événement source pour remplacer le score de risque par défaut.",
     "xpack.securitySolution.alerts.riskScoreMapping.mappingDetailsLabel": "Si une valeur est hors limites, ou si le champ n'est pas présent, le score de risque par défaut sera utilisé.",
-    "xpack.securitySolution.alerts.riskScoreMapping.riskScoreFieldTitle": "signal.rule.risk_score",
+    "xpack.securitySolution.alerts.riskScoreMapping.riskScoreFieldTitle": "kibana.alert.risk_score",
     "xpack.securitySolution.alerts.riskScoreMapping.riskScoreMappingTitle": "Remplacement du score de risque",
     "xpack.securitySolution.alerts.riskScoreMapping.riskScoreTitle": "Score de risque",
     "xpack.securitySolution.alerts.riskScoreMapping.sourceFieldTitle": "Champ source",
@@ -19617,6 +23497,8 @@
     "xpack.securitySolution.alertsView.categoryLabel": "catégorie",
     "xpack.securitySolution.alertsView.errorFetchingAlertsData": "Impossible d'interroger les données d'alertes",
     "xpack.securitySolution.alertsView.moduleLabel": "module",
+    "xpack.securitySolution.alertsView.osqueryAlertTitle": "Exécuter Osquery",
+    "xpack.securitySolution.alertsView.osqueryBackToAlertDetails": "Détails de l'alerte",
     "xpack.securitySolution.alertsView.showing": "Affichage",
     "xpack.securitySolution.alertsView.totalCountOfAlerts": "alertes externes",
     "xpack.securitySolution.alertsView.unit": "{totalCount, plural, =1 {alerte externe} other {alertes externes}}",
@@ -19628,6 +23510,64 @@
     "xpack.securitySolution.anomaliesTable.table.anomaliesTooltip": "Le tableau d'anomalies ne peut pas être filtré via la recherche KQL globale SIEM.",
     "xpack.securitySolution.anomaliesTable.table.showingDescription": "Affichage",
     "xpack.securitySolution.anomaliesTable.table.unit": "{totalCount, plural, =1 {anomalie} other {anomalies}}",
+    "xpack.securitySolution.artifactCard.comments.label.hide": "Masquer les commentaires ({count})",
+    "xpack.securitySolution.artifactCard.comments.label.show": "Afficher les commentaires ({count})",
+    "xpack.securitySolution.artifactCard.conditions.and": "AND",
+    "xpack.securitySolution.artifactCard.conditions.existsOperator": "existe",
+    "xpack.securitySolution.artifactCard.conditions.linux": "Linux",
+    "xpack.securitySolution.artifactCard.conditions.listOperator": "inclus dans",
+    "xpack.securitySolution.artifactCard.conditions.macos": "Mac",
+    "xpack.securitySolution.artifactCard.conditions.matchAnyOperator": "est l'une des options suivantes",
+    "xpack.securitySolution.artifactCard.conditions.matchAnyOperator.not": "n'est pas l'une des options suivantes",
+    "xpack.securitySolution.artifactCard.conditions.matchOperator": "IS",
+    "xpack.securitySolution.artifactCard.conditions.matchOperator.not": "N'EST PAS",
+    "xpack.securitySolution.artifactCard.conditions.nestedOperator": "a",
+    "xpack.securitySolution.artifactCard.conditions.os": "Système d'exploitation",
+    "xpack.securitySolution.artifactCard.conditions.wildcardMatchesOperator": "CORRESPONDANCES",
+    "xpack.securitySolution.artifactCard.conditions.windows": "Windows",
+    "xpack.securitySolution.artifactCard.created": "Créé",
+    "xpack.securitySolution.artifactCard.createdBy": "Créé par",
+    "xpack.securitySolution.artifactCard.globalEffectScope": "Appliqué de manière générale",
+    "xpack.securitySolution.artifactCard.lastUpdated": "Dernière mise à jour",
+    "xpack.securitySolution.artifactCard.lastUpdatedBy": "Mis à jour par",
+    "xpack.securitySolution.artifactCard.policyEffectScope": "Appliqué à {count} {count, plural, one {politique} other {politiques}}",
+    "xpack.securitySolution.artifactCard.policyEffectScope.title": "Appliqué {count, plural, one {à la politique suivante} other {aux politiques suivantes}}",
+    "xpack.securitySolution.artifactCardGrid.assignmentColumn": "Affectation",
+    "xpack.securitySolution.artifactCardGrid.DescriptionColumn": "Description",
+    "xpack.securitySolution.artifactCardGrid.expandCollapseLabel": "{action} toutes les cartes",
+    "xpack.securitySolution.artifactCardGrid.nameColumn": "Nom",
+    "xpack.securitySolution.artifactExpandableCard.collpase": "Réduire",
+    "xpack.securitySolution.artifactExpandableCard.expand": "Développer",
+    "xpack.securitySolution.artifactListPage.aboutInfo": "Liste d’artefacts pour le point de terminaison",
+    "xpack.securitySolution.artifactListPage.addButtonTitle": "Ajouter un artefact",
+    "xpack.securitySolution.artifactListPage.cardActionDeleteLabel": "Supprimer le filtre d'événement",
+    "xpack.securitySolution.artifactListPage.cardActionEditLabel": "Modifier l’artefact",
+    "xpack.securitySolution.artifactListPage.deleteActionFailure": "Impossible de supprimer \"{itemName}\". Raison : {errorMessage}.",
+    "xpack.securitySolution.artifactListPage.deleteActionSuccess": "\"{itemName}\" a été supprimé.",
+    "xpack.securitySolution.artifactListPage.deleteModalCancelButtonTitle": "Annuler",
+    "xpack.securitySolution.artifactListPage.deleteModalConfirmInfo": "Cette action ne peut pas être annulée. Voulez-vous vraiment continuer ?",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactInfo": "La suppression de cette entrée entraînera son retrait dans {count} {count, plural, one {politique associée} other {politiques associées}}.",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactInfoAll": "tous",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactTitle": "Avertissement",
+    "xpack.securitySolution.artifactListPage.deleteModalSubmitButtonTitle": "Supprimer",
+    "xpack.securitySolution.artifactListPage.deleteModalTitle": "Supprimer {itemName}",
+    "xpack.securitySolution.artifactListPage.emptyStateInfo": "Ajouter un artefact",
+    "xpack.securitySolution.artifactListPage.emptyStatePrimaryButtonLabel": "Ajouter",
+    "xpack.securitySolution.artifactListPage.emptyStateTitle": "Ajouter votre premier artefact",
+    "xpack.securitySolution.artifactListPage.expiredLicenseTitle": "Licence expirée",
+    "xpack.securitySolution.artifactListPage.flyoutCancelButtonLabel": "Annuler",
+    "xpack.securitySolution.artifactListPage.flyoutCreateSubmitButtonLabel": "Ajouter",
+    "xpack.securitySolution.artifactListPage.flyoutCreateTitle": "Créer un artefact",
+    "xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseDocsInfo": "Pour en savoir plus, consultez notre documentation.",
+    "xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseInfo": "Votre licence Kibana est passée à une version inférieure. Les futures configurations de politiques seront désormais globalement affectées à toutes les politiques.",
+    "xpack.securitySolution.artifactListPage.flyoutEditItemLoadFailure": "Impossible de récupérer l’élément pour modification. Raison : {errorMessage}.",
+    "xpack.securitySolution.artifactListPage.flyoutEditSubmitButtonLabel": "Enregistrer",
+    "xpack.securitySolution.artifactListPage.flyoutEditSubmitSuccess": "\"{name}\" a été mis à jour.",
+    "xpack.securitySolution.artifactListPage.flyoutEditTitle": "Ajouter un artefact",
+    "xpack.securitySolution.artifactListPage.pageTitle": "Artefact",
+    "xpack.securitySolution.artifactListPage.searchPlaceholderInfo": "Rechercher sur les champs ci-dessous : nom, description, commentaires, valeur",
+    "xpack.securitySolution.artifactListPage.showingTotal": "Affichage de {total, plural, one {# artefact} other {# artefacts}}",
+    "xpack.securitySolution.artifactMinifiedCard.descriptionLabel": "Description",
     "xpack.securitySolution.auditd.abortedAuditStartupDescription": "démarrage de l'audit abandonné",
     "xpack.securitySolution.auditd.accessErrorDescription": "erreur d'accès",
     "xpack.securitySolution.auditd.accessPermissionDescription": "autorisation d'accès",
@@ -19766,8 +23706,25 @@
     "xpack.securitySolution.authenticationsTable.user": "Utilisateur",
     "xpack.securitySolution.authz.mlUnavailable": "Le plug-in de Machine Learning n'est pas disponible. Essayez d'activer le plug-in.",
     "xpack.securitySolution.authz.userIsNotMlAdminMessage": "L'utilisateur actuel n'est pas un administrateur de Machine Learning.",
+    "xpack.securitySolution.badge.readOnly.text": "Lecture seule",
     "xpack.securitySolution.beatFields.errorSearchDescription": "Une erreur s'est produite lors de l'obtention des champs d'agents Beats",
     "xpack.securitySolution.beatFields.failSearchDescription": "Impossible de lancer une recherche sur les champs d'agents Beats",
+    "xpack.securitySolution.blocklist.cardActionDeleteLabel": "Supprimer la liste noire",
+    "xpack.securitySolution.blocklist.cardActionEditLabel": "Modifier la liste noire",
+    "xpack.securitySolution.blocklist.deleteSuccess": "\"{itemName}\" a été retiré de la liste noire.",
+    "xpack.securitySolution.blocklist.emptyStateInfo": "Ajouter une liste noire afin d’empêcher l’exécution de certaines applications sur le point de terminaison",
+    "xpack.securitySolution.blocklist.emptyStatePrimaryButtonLabel": "Ajouter une liste noire",
+    "xpack.securitySolution.blocklist.emptyStateTitle": "Ajouter votre première liste noire",
+    "xpack.securitySolution.blocklist.flyoutCreateSubmitButtonLabel": "Ajouter une liste noire",
+    "xpack.securitySolution.blocklist.flyoutCreateSubmitSuccess": "\"{name}\" a été ajouté à votre liste noire.",
+    "xpack.securitySolution.blocklist.flyoutCreateTitle": "Ajouter une liste noire",
+    "xpack.securitySolution.blocklist.flyoutEditSubmitSuccess": "\"{name}\" a été mis à jour.",
+    "xpack.securitySolution.blocklist.flyoutEditTitle": "Modifier la liste noire",
+    "xpack.securitySolution.blocklist.pageAboutInfo": "La liste noire empêche l’exécution des applications sélectionnées sur vos hôtes en étendant la liste des processus considérés comme malveillants par le point de terminaison.",
+    "xpack.securitySolution.blocklist.pageAddButtonTitle": "Ajouter une entrée dans la liste noire",
+    "xpack.securitySolution.blocklist.pageTitle": "Liste noire",
+    "xpack.securitySolution.blocklist.searchPlaceholderInfo": "Rechercher sur les champs ci-dessous : nom, description, valeur",
+    "xpack.securitySolution.blocklist.showingTotal": "Affichage de {total} {total, plural, one {entrée de liste noire} other {entrées de liste noire}}",
     "xpack.securitySolution.callouts.dismissButton": "Rejeter",
     "xpack.securitySolution.cases.caseTable.caseDetailsLinkAria": "cliquez pour visiter le cas portant le titre {detailName}",
     "xpack.securitySolution.cases.caseView.breadcrumb": "Créer",
@@ -19777,6 +23734,7 @@
     "xpack.securitySolution.certificate.fingerprint.serverCertLabel": "certification serveur",
     "xpack.securitySolution.chart.dataAllValuesZerosTitle": "Toutes les valeurs ont renvoyé zéro",
     "xpack.securitySolution.chart.dataNotAvailableTitle": "Données graphiques non disponibles",
+    "xpack.securitySolution.chart.emptyValueLabel": "valeur vide",
     "xpack.securitySolution.chrome.helpMenu.documentation": "Documentation Security",
     "xpack.securitySolution.chrome.helpMenu.documentation.ecs": "Documentation ECS",
     "xpack.securitySolution.clipboard.copied": "Copié",
@@ -19855,6 +23813,26 @@
     "xpack.securitySolution.components.mlPopup.upgradeDescription": "Pour accéder aux fonctionnalités de détection des anomalies de SIEM, vous devez mettre à niveau votre licence vers Platinum, démarrer un essai gratuit de 30 jours ou lancer un {cloudLink} sur AWS, GCP ou Azure. Vous pourrez ensuite exécuter des tâches de Machine Learning et visualiser les anomalies.",
     "xpack.securitySolution.components.mlPopup.upgradeTitle": "Mettre à niveau vers Elastic Platinum",
     "xpack.securitySolution.components.stepDefineRule.ruleTypeField.subscriptionsLink": "Abonnement Platinum",
+    "xpack.securitySolution.console.builtInCommands.clearAbout": "Purger la mémoire tampon de la console",
+    "xpack.securitySolution.console.builtInCommands.helpAbout": "Afficher la liste des commandes disponibles",
+    "xpack.securitySolution.console.commandList.footerText": "Pour plus d’informations sur les commandes ci-dessus, utilisez l’argument {helpOption}. Exemple : {cmdExample}",
+    "xpack.securitySolution.console.commandOutput.runInBackgroundButtonLabel": "Exécuter en arrière-plan",
+    "xpack.securitySolution.console.commandOutput.runInBackgroundMsg": "La réponse à la commande prend un peu de temps. Cliquez ici pour l’exécuter en arrière-plan et être averti lors de la réception de la réponse.",
+    "xpack.securitySolution.console.commandUsage.atLeastOneOptionRequiredMessage": "Remarque : au moins une option doit être utilisée.",
+    "xpack.securitySolution.console.commandUsage.inputUsage": "Utilisation :",
+    "xpack.securitySolution.console.commandUsage.optionsLabel": "Options :",
+    "xpack.securitySolution.console.commandValidation.argSupportedOnlyOnce": "cet argument ne peut être utilisé qu’une fois : {argName}.",
+    "xpack.securitySolution.console.commandValidation.cmdHelpTitle": "commande {cmdName}",
+    "xpack.securitySolution.console.commandValidation.invalidArgValue": "valeur d’argument non valide : {argName}. {error}",
+    "xpack.securitySolution.console.commandValidation.missingRequiredArg": "argument requis manquant : {argName}",
+    "xpack.securitySolution.console.commandValidation.mustHaveArgs": "arguments requis manquants : {requiredArgs}",
+    "xpack.securitySolution.console.commandValidation.noArgumentsSupported": "cette commande ne prend pas en charge les arguments.",
+    "xpack.securitySolution.console.commandValidation.oneArgIsRequired": "au moins un argument doit être utilisé.",
+    "xpack.securitySolution.console.commandValidation.unknownArgument": "argument(s) inconnu(s) : {unknownArgs}",
+    "xpack.securitySolution.console.commandValidation.unsupportedArg": "argument non pris en charge : {argName}",
+    "xpack.securitySolution.console.unknownCommand.helpMessage": "Pour obtenir la liste des commandes disponibles, entrez : {helpCmd}.",
+    "xpack.securitySolution.console.unknownCommand.title": "Commande inconnue",
+    "xpack.securitySolution.consolesPopoverHeaderItem.buttonLabel": "Consoles de point de terminaison",
     "xpack.securitySolution.containers.anomalies.errorFetchingAnomaliesData": "Impossible d'interroger les données d'anomalies",
     "xpack.securitySolution.containers.anomalies.stackByJobId": "tâche",
     "xpack.securitySolution.containers.anomalies.title": "Anomalies",
@@ -19870,9 +23848,12 @@
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedRuleAndTimelineSuccesDescription": "Installation effectuée des règles et modèles de chronologies prépackagés à partir d'Elastic",
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedRuleSuccesDescription": "Installation effectuée des règles prépackagées à partir d'Elastic",
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedTimelineSuccesDescription": "Installation effectuée des modèles de chronologies prépackagées à partir d'Elastic",
+    "xpack.securitySolution.containers.detectionEngine.ruleExecutionEventsFetchFailDescription": "Impossible de récupérer les événements d’exécution de règle",
+    "xpack.securitySolution.containers.detectionEngine.ruleExecutionLogFailureDescription": "Impossible de récupérer les événements d’exécution de règle",
     "xpack.securitySolution.containers.detectionEngine.rulesAndTimelines": "Impossible de récupérer les règles et les chronologies",
     "xpack.securitySolution.containers.detectionEngine.tagFetchFailDescription": "Impossible de récupérer les balises",
     "xpack.securitySolution.containers.errors.stopJobFailureTitle": "Échec d'arrêt de la tâche",
+    "xpack.securitySolution.contextMenuItemByRouter.viewDetails": "Afficher les détails",
     "xpack.securitySolution.customizeEventRenderers.customizeEventRenderersDescription": "Les outils de rendu d'événement transmettent automatiquement les détails les plus pertinents d'un événement pour révéler son histoire",
     "xpack.securitySolution.customizeEventRenderers.customizeEventRenderersTitle": "Personnaliser les outils de rendu d'événement",
     "xpack.securitySolution.customizeEventRenderers.disableAllRenderersButtonLabel": "Tout désactiver",
@@ -19919,7 +23900,8 @@
     "xpack.securitySolution.detectionEngine.alerts.actions.addEndpointException": "Ajouter une exception de point de terminaison",
     "xpack.securitySolution.detectionEngine.alerts.actions.addEventFilter": "Ajouter un filtre d'événement de point de terminaison",
     "xpack.securitySolution.detectionEngine.alerts.actions.addException": "Ajouter une exception à une règle",
-    "xpack.securitySolution.detectionEngine.alerts.actions.addToCase": "Ajouter au cas",
+    "xpack.securitySolution.detectionEngine.alerts.actions.addToCase": "Ajouter à un cas existant",
+    "xpack.securitySolution.detectionEngine.alerts.actions.addToNewCase": "Ajouter au nouveau cas",
     "xpack.securitySolution.detectionEngine.alerts.actions.closeAlertTitle": "Fermer l'alerte",
     "xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineAriaLabel": "Envoyer une alerte à la chronologie",
     "xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineTitle": "Investiguer dans la chronologie",
@@ -19929,12 +23911,16 @@
     "xpack.securitySolution.detectionEngine.alerts.closedAlertsTitle": "Fermée",
     "xpack.securitySolution.detectionEngine.alerts.closedAlertSuccessToastMessage": "Fermeture réussie de {totalAlerts} {totalAlerts, plural, =1 {alerte} other {alertes}}.",
     "xpack.securitySolution.detectionEngine.alerts.count.countTableColumnTitle": "Compte",
-    "xpack.securitySolution.detectionEngine.alerts.count.countTableTitle": "Compte",
+    "xpack.securitySolution.detectionEngine.alerts.count.countTableTitle": "Décompte",
+    "xpack.securitySolution.detectionEngine.alerts.createThresholdTimelineFailure": "Impossible de créer une chronologie pour l’ID de document : {id}",
+    "xpack.securitySolution.detectionEngine.alerts.createThresholdTimelineFailureTitle": "Impossible de créer une chronologie d’alerte de seuil",
     "xpack.securitySolution.detectionEngine.alerts.documentTypeTitle": "Alertes",
     "xpack.securitySolution.detectionEngine.alerts.histogram.allOthersGroupingLabel": "Toutes les autres",
     "xpack.securitySolution.detectionEngine.alerts.histogram.headerTitle": "Tendance",
     "xpack.securitySolution.detectionEngine.alerts.histogram.showingAlertsTitle": "Affichage de : {modifier}{totalAlertsFormatted} {totalAlerts, plural, =1 {alerte} other {alertes}}",
+    "xpack.securitySolution.detectionEngine.alerts.histogram.stackByOptions.stackByAriaLabel": "Empiler l’histogramme des alertes en fonction d’une valeur de champ",
     "xpack.securitySolution.detectionEngine.alerts.histogram.stackByOptions.stackByLabel": "Empiler par",
+    "xpack.securitySolution.detectionEngine.alerts.histogram.stackByOptions.stackByPlaceholder": "Sélectionner le champ en fonction duquel empiler",
     "xpack.securitySolution.detectionEngine.alerts.histogram.topNLabel": "Premiers {fieldName}",
     "xpack.securitySolution.detectionEngine.alerts.histogram.viewAlertsButtonLabel": "Afficher les alertes",
     "xpack.securitySolution.detectionEngine.alerts.loadingAlertsTitle": "Chargement des alertes",
@@ -19955,12 +23941,34 @@
     "xpack.securitySolution.detectionEngine.alerts.utilityBar.batchActions.viewSelectedInTimelineTitle": "Afficher la sélection dans la chronologie",
     "xpack.securitySolution.detectionEngine.alerts.utilityBar.batchActionsTitle": "Actions par lots",
     "xpack.securitySolution.detectionEngine.alerts.utilityBar.clearSelectionTitle": "Effacer la sélection",
-    "xpack.securitySolution.detectionEngine.alerts.utilityBar.selectAllAlertsTitle": "Sélectionner {totalAlertsFormatted} {totalAlerts, plural, =1 {alerte} other {alertes}}",
-    "xpack.securitySolution.detectionEngine.alerts.utilityBar.selectedAlertsTitle": "{selectedAlertsFormatted} {selectedAlerts, plural, =1 {alerte sélectionnée} other {alertes sélectionnées}}",
+    "xpack.securitySolution.detectionEngine.alerts.utilityBar.selectAllAlertsTitle": "Sélectionner un total de {totalAlertsFormatted} {totalAlerts, plural, =1 {alerte} other {alertes}}",
+    "xpack.securitySolution.detectionEngine.alerts.utilityBar.selectedAlertsTitle": "{selectedAlertsFormatted} {selectedAlerts, plural, =1 {alerte} other {alertes}} sélectionnée(s)",
     "xpack.securitySolution.detectionEngine.alerts.utilityBar.showingAlertsTitle": "Affichage de {totalAlertsFormatted} {totalAlerts, plural, =1 {alerte} other {alertes}}",
     "xpack.securitySolution.detectionEngine.alerts.utilityBar.takeActionTitle": "Entreprendre une action",
     "xpack.securitySolution.detectionEngine.alertTitle": "Alertes",
     "xpack.securitySolution.detectionEngine.buttonManageRules": "Gérer les règles",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditConfirmation.confirmButtonLabel": "Modifier les règles personnalisées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditConfirmationCancelButtonLabel": "Annuler",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsComboboxHelpText": "Sélectionnez les modèles d'indexation par défaut des index Elasticsearch à partir de la liste déroulante. Vous pouvez ajouter des modèles d'indexation personnalisés, puis appuyer sur Entrée pour en ajouter un nouveau.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsComboboxLabel": "Ajouter des modèles d'indexation pour les règles sélectionnées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsOverwriteCheckboxLabel": "Écraser tous les modèles d'indexation pour les règles sélectionnées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsTitle": "Ajouter des modèles d'indexation",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxHelpText": "Ajoutez une ou plusieurs balises pour les règles sélectionnées à partir de la liste déroulante. Vous pouvez également spécifier des balises d’identification personnalisées, puis appuyer sur Entrée pour en ajouter une nouvelle.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxLabel": "Ajouter des balises pour les règles sélectionnées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsOverwriteCheckboxLabel": "Écraser toutes les balises pour les règles sélectionnées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsTitle": "Ajouter des balises",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.closeButtonLabel": "Fermer",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsComboboxHelpText": "Supprimez de la liste déroulante les modèles d'indexation par défaut des index Elasticsearch. Vous pouvez ajouter des modèles d'indexation personnalisés, puis appuyer sur Entrée pour en ajouter un nouveau.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsComboboxLabel": "Supprimer les modèles d'indexation pour les règles sélectionnées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsTitle": "Supprimer les modèles d'indexation",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxHelpText": "Supprimez de la liste déroulante une ou plusieurs balises pour les règles sélectionnées. Vous pouvez également spécifier des balises d’identification personnalisées, puis appuyer sur Entrée pour en ajouter une nouvelle.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxLabel": "Supprimer les balises pour les règles sélectionnées",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsTitle": "Supprimer les balises",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.indexPatternsRequiredErrorMessage": "Au minimum un modèle d'indexation est requis.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.saveButtonLabel": "Enregistrer",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.setIndexPatternsWarningCallout": "Vous êtes sur le point d’écraser les modèles d'indexation pour {rulesCount, plural, one {# règle sélectionnée} other {# règles sélectionnées}}. Sélectionnez Enregistrer pour appliquer les modifications.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.setTagsWarningCallout": "Vous êtes sur le point d’écraser les balises pour {rulesCount, plural, one {# règle sélectionnée} other {# règles sélectionnées}}. Sélectionnez Enregistrer pour appliquer les modifications.",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.tagsComoboxRequiredErrorMessage": "Au moins une balise est requise.",
     "xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationBody": "Cette action supprimera toutes les règles correspondant à la requête de filtre en cours. Cliquez sur \"Confirmer\" pour continuer.",
     "xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationCancel": "Annuler",
     "xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationConfirm": "Confirmer",
@@ -19969,10 +23977,15 @@
     "xpack.securitySolution.detectionEngine.components.allRules.refreshPromptConfirm": "Continuer",
     "xpack.securitySolution.detectionEngine.components.allRules.refreshPromptTitle": "Êtes-vous toujours là ?",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.cancelTitle": "Annuler",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.importRuleTitle": "Importer la règle",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.exceptionsSuccessLabel": "Importation réussie pour {totalExceptions} {totalExceptions, plural, =1 {exception} other {exceptions}}.",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.importExceptionsFailedLabel": "Impossible d’importer {totalExceptions} {totalExceptions, plural, =1 {exception} other {exceptions}}.",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedDetailedTitle": "{message}",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedTitle": "Impossible d’importer {totalRules} {totalRules, plural, =1 {règle} other {règles}}.",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.importRuleTitle": "Importer",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.initialPromptTextDescription": "Sélectionnez ou glissez-déposez un fichier rules_export.ndjson valide",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.overwriteDescription": "Écraser les règles de détection existantes avec l'ID de la règle conflictuelle",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.selectRuleDescription": "Sélectionnez les règles Security (telles qu'exportées depuis la page Règles de détection) à importer",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.overwriteDescription": "Écraser les règles de détection existantes avec l’ID de règle conflictuel \"rule_id\"",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.overwriteExceptionLabel": "Écraser les listes d’exception existantes avec l’ID de liste conflictuel \"list_id\"",
+    "xpack.securitySolution.detectionEngine.components.importRuleModal.selectRuleDescription": "Sélectionnez les règles à importer. Les actions et exceptions de règles associées peuvent être incluses.",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.successfullyImportedRulesTitle": "Importation réussie de {totalRules} {totalRules, plural, =1 {règle} other {règles}}",
     "xpack.securitySolution.detectionEngine.createRule.backToRulesButton": "Règles",
     "xpack.securitySolution.detectionEngine.createRule.editRuleButton": "Modifier",
@@ -20015,7 +24028,8 @@
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.guideLabel": "Guide d'investigation",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.nameFieldRequiredError": "Un nom est requis.",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutrule.noteHelpText": "Ajouter un guide d'investigation sur les règles...",
-    "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.tagFieldEmptyError": "Une balise doit être renseignée",
+    "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.tagFieldEmptyError": "Une balise ne doit pas être vide",
+    "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.threatIndicatorPathFieldEmptyError": "Le remplacement du préfixe d’indicateur ne peut pas être vide.",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.addFalsePositiveDescription": "Ajouter un exemple de faux positif",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.addReferenceDescription": "Ajouter une URL de référence",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.advancedSettingsButton": "Paramètres avancés",
@@ -20030,6 +24044,7 @@
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.customThreatQueryFieldRequiredEmptyError": "Toutes les correspondances requièrent un champ et un champ d'index des menaces.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.customThreatQueryFieldRequiredError": "Au moins une correspondance d'indicateur est requise.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.EqlQueryBarLabel": "Requête EQL",
+    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.eqlQueryFieldRequiredError": "Une requête EQL est requise.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldAnomalyThresholdLabel": "Seuil de score d'anomalie",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldMachineLearningJobIdLabel": "Tâche de Machine Learning",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldQuerBarLabel": "Requête personnalisée",
@@ -20046,11 +24061,11 @@
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.indicesHelperDescription": "Entrez le modèle des index Elasticsearch dans lesquels vous souhaitez que cette règle s'exécute. Par défaut, il s'agira notamment des modèles d'indexation définis dans les paramètres avancés de la solution Security.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.machineLearningJobIdHelpText": "Nous avons fourni quelques tâches courantes pour vous aider à commencer. Pour ajouter vos propres tâches personnalisées, affectez un groupe de \"sécurité\" à ces tâches dans l'application {machineLearning} pour les faire apparaître ici.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.machineLearningJobIdRequired": "Une tâche de Machine Learning est requise.",
-    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobMulti": "Les tâches de ML sélectionnées, {jobNames}, ne sont pas en cours d'exécution. Veuillez définir toutes ces tâches de façon à ce qu'elles s'exécutent via les \"Paramètres de tâches de ML\" avant d'activer cette règle.",
-    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobSingle": "La tâche de ML sélectionnée, {jobName}, n'est pas en cours d'exécution. Veuillez définir{jobName} de façon à ce qu'elle s'exécute via les \"Paramètres de tâches de ML\" avant d'activer cette règle.",
+    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobMulti": "Les tâches de ML sélectionnées, {jobNames}, ne sont pas en cours d'exécution. Veuillez définir l’exécution de ces tâches via les paramètres de tâche ML avant d’activer cette règle.",
+    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobSingle": "La tâche de ML sélectionnée, {jobName}, n'est pas en cours d'exécution. Veuillez définir l’exécution de la tâche {jobName} via les paramètres de tâche ML avant d’activer cette règle.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlJobSelectPlaceholderText": "Sélectionner une tâche",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.outputIndiceNameFieldRequiredError": "Au minimum un modèle d'indexation est requis.",
-    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.referencesUrlInvalidError": "L'URL possède un format non valide",
+    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.referencesUrlInvalidError": "Le format de l’URL n’est pas valide.",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.resetDefaultIndicesButton": "Réinitialiser sur les modèles d'indexation par défaut",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.ruleTypeField.eqlTypeDescription": "Utiliser Event Query Language (EQL) pour faire correspondre les événements, générer des séquences et empiler des données",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.ruleTypeField.eqlTypeTitle": "Corrélation d'événements",
@@ -20073,6 +24088,8 @@
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.invalidMustacheTemplateErrorMessage": "{key} n'est pas un modèle de moustache valide",
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.noConnectorSelectedErrorMessage": "Aucun connecteur sélectionné",
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.noReadActionsPrivileges": "Impossible de créer des actions de règle. Vous ne disposez pas des autorisations \"Lire\" pour le plug-in \"Actions\".",
+    "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.completeWithEnablingTitle": "Créer et activer la règle",
+    "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.completeWithoutEnablingTitle": "Créer la règle sans l’activer",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackHelpText": "Ajoute du temps à la période de récupération pour éviter de manquer des alertes.",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackLabel": "Temps de récupération supplémentaire",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldIntervalHelpText": "Les règles s'exécutent de façon régulière et détectent les alertes dans la période de temps spécifiée.",
@@ -20115,10 +24132,13 @@
     "xpack.securitySolution.detectionEngine.eqlValidation.title": "Erreurs de validation EQL",
     "xpack.securitySolution.detectionEngine.goToDocumentationButton": "Afficher la documentation",
     "xpack.securitySolution.detectionEngine.lastSignalTitle": "Dernière alerte",
-    "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.cannotEditAlerts": "Sans ces privilèges, vous ne pouvez ni ouvrir ni fermer les alertes.",
+    "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.cannotEditAlerts": "Sans ces privilèges, vous ne pouvez ni consulter ni modifier le statut des alertes.",
     "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.cannotEditLists": "Sans ces privilèges, vous ne pouvez ni créer ni modifier de listes de valeurs.",
     "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.cannotEditRules": "Sans ce privilège, vous ne pouvez ni créer ni modifier les règles du moteur de détection.",
     "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageBody.essenceDescription": "Vous avez besoin des privilèges suivants pour accéder totalement à cette fonctionnalité. Contactez votre administrateur si vous avez besoin d'aide.",
+    "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageBody.featurePrivilegesTitle": "Privilèges de fonctionnalité Kibana manquants :",
+    "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageBody.indexPrivilegesTitle": "Privilèges d’index Elasticsearch manquants :",
+    "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageBody.messageDetail": "Documentation concernant {indexPrivileges} {featurePrivileges} {essence} : {docs}",
     "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageBody.missingFeaturePrivileges": "Privilèges {privileges} manquants pour la fonctionnalité {index}. {explanation}",
     "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageBody.missingIndexPrivileges": "Privilèges {privileges} manquants pour l'index {index}. {explanation}",
     "xpack.securitySolution.detectionEngine.missingPrivilegesCallOut.messageTitle": "Privilèges insuffisants",
@@ -20175,6 +24195,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cloudGroupsT1069Description": "Groupes cloud (T1069.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cloudInstanceMetadataApiT1552Description": "API de métadonnées d'instance cloud (T1552.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cmstpT1218Description": "CMSTP (T1218.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeRepositoriesT1213Description": "Référentiels de code (T1213.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningCertificatesT1587Description": "Certificats de signature du code (T1587.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningCertificatesT1588Description": "Certificats de signature du code (T1588.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningPolicyModificationT1553Description": "Modification de la politique de signature du code (T1553.006)",
@@ -20239,6 +24260,8 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainsT1583Description": "Domaines (T1583.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainsT1584Description": "Domaines (T1584.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainTrustModificationT1484Description": "Modification de la confiance du domaine (T1484.002)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.doubleFileExtensionT1036Description": "Extension de fichier double (T1036.007)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.downgradeAttackT1562Description": "Passage de l’attaque à un niveau inférieur (T1562.010)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.downgradeSystemImageT1601Description": "Passage de l'image système à un niveau inférieur (T1601.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.driveByTargetT1608Description": "Cible furtive (T1608.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.dylibHijackingT1574Description": "Piratage Dylib (T1574.004)",
@@ -20251,6 +24274,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailAccountT1087Description": "Compte de messagerie électronique (T1087.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailAddressesT1589Description": "Adresses e-mail (T1589.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailForwardingRuleT1114Description": "Règle de transfert d'e-mail (T1114.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailHidingRulesT1564Description": "Règles de masquage d’e-mail (T1564.008)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emondT1546Description": "Emond (T1546.014)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.employeeNamesT1589Description": "Noms d'employés (T1589.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.environmentalKeyingT1480Description": "Saisie environnementale (T1480.001)",
@@ -20283,8 +24307,10 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenFileSystemT1564Description": "Système de fichiers cachés (T1564.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenUsersT1564Description": "Utilisateurs cachés (T1564.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenWindowT1564Description": "Fenêtre cachée (T1564.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.htmlSmugglingT1027Description": "Contrebande HTML (T1027.006)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.identifyBusinessTempoT1591Description": "Identification du tempo de travail (T1591.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.identifyRolesT1591Description": "Identification des rôles (T1591.004)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.iisComponentsT1505Description": "Composants IIS (T1505.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.imageFileExecutionOptionsInjectionT1546Description": "Injection d'options d'exécution de fichiers image (T1546.012)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.impairCommandHistoryLoggingT1562Description": "Détérioration du logging d'historique des commandes (T1562.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.indicatorBlockingT1562Description": "Blocage de l'indicateur (T1562.006)",
@@ -20317,6 +24343,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localDataStagingT1074Description": "Mise en service de données locales (T1074.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localEmailCollectionT1114Description": "Collection d'e-mails locaux (T1114.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localGroupsT1069Description": "Groupes locaux (T1069.001)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.loginItemsT1547Description": "Éléments de connexion (T1547.015)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.logonScriptMacT1037Description": "Script de connexion (Mac) (T1037.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.logonScriptWindowsT1037Description": "Script de connexion (Windows) (T1037.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.lsaSecretsT1003Description": "Secrets LSA (T1003.004)",
@@ -20332,6 +24359,8 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.markOfTheWebBypassT1553Description": "Contournement Mark-of-the-Web (T1553.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.masqueradeTaskOrServiceT1036Description": "Tâche ou service de mascarade (T1036.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.matchLegitimateNameOrLocationT1036Description": "Correspondance de nom ou d'emplacement légitime (T1036.005)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mavinjectT1218Description": "Mavinject (T1218.013)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mmcT1218Description": "MMC (T1218.014)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.msBuildT1127Description": "MSBuild (T1127.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mshtaT1218Description": "Mshta (T1218.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.msiexecT1218Description": "Msiexec (T1218.007)",
@@ -20399,12 +24428,14 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.remoteEmailCollectionT1114Description": "Collection d'e-mails distants (T1114.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.renameSystemUtilitiesT1036Description": "Renommage d'utilitaires système (T1036.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.reOpenedApplicationsT1547Description": "Réouverture d'applications (T1547.007)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.resourceForkingT1564Description": "Fourchettes de ressources (T1564.009)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.revertCloudInstanceT1578Description": "Restauration d'une instance de cloud (T1578.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rightToLeftOverrideT1036Description": "Remplacement de droite à gauche (T1036.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rommoNkitT1542Description": "ROMMONkit (T1542.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rundll32T1218Description": "Rundll32 (T1218.011)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.runtimeDataManipulationT1565Description": "Manipulation de données d'exécution (T1565.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.runVirtualInstanceT1564Description": "Exécution d'une instance virtuelle (T1564.006)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.safeModeBootT1562Description": "Démarrage en mode sans échec (T1562.009)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.samlTokensT1606Description": "Tokens SAML (T1606.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.scanDatabasesT1596Description": "Analyse de bases de données (T1596.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.scanningIpBlocksT1595Description": "Analyse de blocs IP (T1595.001)",
@@ -20456,6 +24487,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemdServiceT1543Description": "Service Systemd (T1543.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemdTimersT1053Description": "Minuteurs Systemd (T1053.006)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemFirmwareT1542Description": "Microprogramme système (T1542.001)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemLanguageDiscoveryT1614Description": "Découverte de la langue du système (T1614.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.tftpBootT1542Description": "Démarrage TFTP (T1542.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.threadExecutionHijackingT1055Description": "Piratage d'exécution de thread (T1055.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.threadLocalStorageT1055Description": "Stockage local de threads (T1055.005)",
@@ -20520,6 +24552,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.accountManipulationDescription": "Manipulation de compte (T1098)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.acquireInfrastructureDescription": "Acquisition d'infrastructure (T1583)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.activeScanningDescription": "Analyse active (T1595)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.adversaryInTheMiddleDescription": "Adversary-in-the-Middle (T1557)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.applicationLayerProtocolDescription": "Protocole de couche applicative (T1071)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.applicationWindowDiscoveryDescription": "Découverte de fenêtre d'application (T1010)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.archiveCollectedDataDescription": "Archivage de données collectées (T1560)",
@@ -20531,12 +24564,14 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.bootOrLogonInitializationScriptsDescription": "Scripts de démarrage ou d'initialisation de connexion (T1037)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserBookmarkDiscoveryDescription": "Découverte de favoris de navigateur (T1217)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserExtensionsDescription": "Extensions de navigateur (T1176)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserSessionHijackingDescription": "Détournement de session de navigateur (T1185)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.bruteForceDescription": "Force brute (T1110)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.buildImageOnHostDescription": "Création d'image sur l'hôte (T1612)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.clipboardDataDescription": "Données de presse-papiers (T1115)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudInfrastructureDiscoveryDescription": "Découverte d'infrastructure cloud (T1580)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudServiceDashboardDescription": "Tableau de bord de service cloud (T1538)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudServiceDiscoveryDescription": "Découverte de service cloud (T1526)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudStorageObjectDiscoveryDescription": "Découverte d'objet de stockage cloud (T1619)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.commandAndScriptingInterpreterDescription": "Interpréteur de commandes et de scripts (T1059)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.commonlyUsedPortDescription": "Port couramment utilisé (T1043)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.communicationThroughRemovableMediaDescription": "Communication via support amovible (T1092)",
@@ -20602,6 +24637,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.gatherVictimNetworkInformationDescription": "Collecte d'informations de réseau des victimes (T1590)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.gatherVictimOrgInformationDescription": "Collecte d'informations d'organisation des victimes (T1591)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.graphicalUserInterfaceDescription": "Interface utilisateur graphique (T1061)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.groupPolicyDiscoveryDescription": "Découverte de la politique de groupe (T1615)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hardwareAdditionsDescription": "Ajouts matériels (T1200)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hideArtifactsDescription": "Masquage d'artefacts (T1564)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hijackExecutionFlowDescription": "Piratage du flux d'exécution (T1574)",
@@ -20649,6 +24685,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.proxyDescription": "Proxy (T1090)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.queryRegistryDescription": "Interrogation du registre (T1012)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.redundantAccessDescription": "Accès redondant (T1108)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.reflectiveCodeLoadingDescription": "Chargement de code réflexif (T1620)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteAccessSoftwareDescription": "Logiciel d'accès à distance(T1219)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteServicesDescription": "Services distants (T1021)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteServiceSessionHijackingDescription": "Piratage de session de service distant (T1563)",
@@ -20722,6 +24759,8 @@
     "xpack.securitySolution.detectionEngine.noApiIntegrationKeyCallOutMsg": "Une nouvelle clé de chiffrement est générée pour les objets enregistrés chaque fois que vous démarrez Kibana. Sans clé persistante, vous ne pouvez pas supprimer ou modifier des règles après le redémarrage de Kibana. Pour définir une clé persistante, ajoutez le paramètre xpack.encryptedSavedObjects.encryptionKey avec n'importe quelle valeur texte de 32 caractères ou plus au fichier kibana.yml.",
     "xpack.securitySolution.detectionEngine.noApiIntegrationKeyCallOutTitle": "Clé d'intégration d'API requise",
     "xpack.securitySolution.detectionEngine.noIndexTitle": "Configurons votre moteur de détection",
+    "xpack.securitySolution.detectionEngine.noPermissionsMessage": "Pour afficher les alertes, vous devez mettre à jour les privilèges. Pour en savoir plus, contactez votre administrateur Kibana.",
+    "xpack.securitySolution.detectionEngine.noPermissionsTitle": "Privilèges requis",
     "xpack.securitySolution.detectionEngine.pageTitle": "Moteur de détection",
     "xpack.securitySolution.detectionEngine.panelSubtitleShowing": "Affichant",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphCountLabel": "Compte",
@@ -20735,7 +24774,8 @@
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewGraphTitle": "{hits} {hits, plural, =1 {résultat} other {résultats}}",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewHelpText": "Sélectionner une période de temps pour les données afin d'afficher l'aperçu des résultats de requête",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewLabel": "Aperçu de la recherche rapide",
-    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading": "... en cours de chargement",
+    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllErrors": "Afficher toutes les erreurs",
+    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllWarnings": "Afficher tous les avertissements",
     "xpack.securitySolution.detectionEngine.queryPreview.queryThresholdGraphCountLabel": "Compte de seuil cumulé",
     "xpack.securitySolution.detectionEngine.rule.editRule.errorMsgDescription": "Une entrée est incorrecte dans {countError, plural, one {cet onglet} other {ces onglets}} : {tabHasError}",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStartedDescription": "Démarré",
@@ -20744,16 +24784,44 @@
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAllDescription": "Tous les résultats",
     "xpack.securitySolution.detectionEngine.ruleDetails.backToRulesButton": "Règles",
     "xpack.securitySolution.detectionEngine.ruleDetails.deletedRule": "Règle supprimée",
+    "xpack.securitySolution.detectionEngine.ruleDetails.enableRuleLabel": "Activer",
     "xpack.securitySolution.detectionEngine.ruleDetails.exceptionsTab": "Exceptions",
-    "xpack.securitySolution.detectionEngine.ruleDetails.experimentalDescription": "Expérimental",
+    "xpack.securitySolution.detectionEngine.ruleDetails.experimentalDescription": "Version d’évaluation technique",
     "xpack.securitySolution.detectionEngine.ruleDetails.pageTitle": "Détails de la règle",
     "xpack.securitySolution.detectionEngine.ruleDetails.ruleCreationDescription": "Créé par : {by} le {date}",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionFieldNotFoundErrorDescription": "Impossible de trouver le champ \"kibana.alert.rule.execution.uuid\" dans l'index des alertes.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionFieldNotFoundErrorTitle": "Impossible de filtrer les alertes",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionsColumn": "Actions",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionsColumnTooltip": "Filtrez les alertes par ID d'exécution de règle.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.durationColumn": "Durée",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.durationColumnTooltip": "Temps passé sur l'exécution de la règle (hh:mm:ss:SSS).",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapDurationColumn": "Durée d'écart",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapDurationColumnTooltip": "Durée de l'écart dans l'exécution de la règle (hh:mm:ss:SSS). Ajustez l'historique des règles ou {seeDocs} pour réduire les écarts.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapTooltipSeeDocsDescription": "consultez la documentation",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.indexDurationColumn": "Durée de l'index",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.indexDurationColumnTooltip": "Temps passé sur l'indexation des alertes détectées (hh:mm:ss:SSS).",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.messageColumn": "Message",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.messageColumnTooltip": "Message relatif au résultat de l'exécution.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.schedulingDelayColumn": "Délai de planification",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.schedulingDelayColumnTooltip": "Temps écoulé entre la planification et l'exécution de la règle (hh:mm:ss:SSS).",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchDurationColumn": "Durée de la recherche",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchDurationColumnTooltip": "Temps passé sur la recherche des alertes (hh:mm:ss:SSS).",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchLimitExceededLabel": "Plus de {totalItems} exceptions de règle correspondent aux filtres fournis. Affichage des {maxItems} premières en fonction du \"@timestamp\" le plus récent. Utilisez d'autres contraintes de filtres pour afficher des événements d'exécution supplémentaires.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchPlaceholder": "duration > 100 et gapDuration > 10",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.showMetricColumnsSwitchTitle": "Afficher les colonnes d'indicateurs",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.statusColumn": "Statut",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.statusColumnTooltip": "Statut général de l'exécution.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.timestampColumn": "Horodatage",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.timestampColumnTooltip": "Date et heures auxquelles l'exécution de la règle a été lancée.",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.totalExecutionsLabel": "Affichage de {totalItems} {totalItems, plural, =1 {exécution de règle} other {exécutions de règle}}",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLogsTab": "Logs d'exécution de règle ",
     "xpack.securitySolution.detectionEngine.ruleDetails.ruleUpdateDescription": "Mis à jour par : {by} le {date}",
     "xpack.securitySolution.detectionEngine.ruleDetails.statusFailedDescription": "Échoué",
     "xpack.securitySolution.detectionEngine.ruleDetails.unknownDescription": "Inconnu",
     "xpack.securitySolution.detectionEngine.rules.aboutRuleTitle": "À propos de la règle",
     "xpack.securitySolution.detectionEngine.rules.addNewRuleTitle": "Créer une nouvelle règle",
     "xpack.securitySolution.detectionEngine.rules.addPageTitle": "Créer",
+    "xpack.securitySolution.detectionEngine.rules.all.exceptions.actionsTitle": "Actions",
     "xpack.securitySolution.detectionEngine.rules.all.exceptions.dateCreatedTitle": "Date de création",
     "xpack.securitySolution.detectionEngine.rules.all.exceptions.dateUpdatedTitle": "Date de dernière modification",
     "xpack.securitySolution.detectionEngine.rules.all.exceptions.deleteError": "Une erreur s'est produite lors de la suppression de la liste d'exceptions",
@@ -20764,13 +24832,13 @@
     "xpack.securitySolution.detectionEngine.rules.all.exceptions.listName": "Nom",
     "xpack.securitySolution.detectionEngine.rules.all.exceptions.numberRulesAssignedTitle": "Nombre de règles affectées à",
     "xpack.securitySolution.detectionEngine.rules.all.exceptions.rulesAssignedTitle": "Règles affectées à",
+    "xpack.securitySolution.detectionEngine.rules.all.exceptions.rulesPopoverButton": "+ {rulesCount} {rulesCount, plural, =1 {règle} other {règles}}",
     "xpack.securitySolution.detectionEngine.rules.allExceptionLists.filters.noExceptionsTitle": "Aucune liste d'exceptions n'a été trouvée",
     "xpack.securitySolution.detectionEngine.rules.allExceptionLists.search.placeholder": "Rechercher les listes d'exceptions",
     "xpack.securitySolution.detectionEngine.rules.allExceptions.filters.noListsBody": "Nous n'avons trouvé aucune liste d'exceptions.",
-    "xpack.securitySolution.detectionEngine.rules.allExceptions.tableTitle": "Exceptions",
+    "xpack.securitySolution.detectionEngine.rules.allExceptions.tableTitle": "Listes d'exceptions",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.deleteRuleDescription": "Supprimer la règle",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.duplicateRuleDescription": "Dupliquer la règle",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastTitle": "Erreur lors de la duplication de la règle",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.duplicateTitle": "Dupliquer",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.editRuleSettingsDescription": "Modifier les paramètres de règles",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.editRuleSettingsToolTip": "Vous ne disposez pas des privilèges d'actions Kibana",
@@ -20778,13 +24846,60 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.activeRuleDescription": "active",
     "xpack.securitySolution.detectionEngine.rules.allRules.batchActions.deleteSelectedImmutableTitle": "La sélection contient des règles immuables qui ne peuvent pas être supprimées",
     "xpack.securitySolution.detectionEngine.rules.allRules.batchActionsTitle": "Actions groupées",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkAction.enable.successToastDescription": "Activation réussie de {totalRules, plural, =1 {{totalRules} règle} other {{totalRules} règles}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.addIndexPatternsTitle": "Ajouter des modèles d'indexation",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.addTagsTitle": "Ajouter des balises",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationDescription": "L'action de mise à jour sera appliquée uniquement à {customRulesCount, plural, =1 {# règle personnalisée que vous avez sélectionnée} other {# règles personnalisées que vous avez sélectionnées}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationTitle": "Impossible de modifier {elasticRulesCount, plural, =1 {# règle Elastic} other {# règles Elastic}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditRejectionDescription": "Les règles Elastic ne sont pas modifiables. L'action de mise à jour sera appliquée uniquement aux règles personnalisées.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastDescription": "{rulesCount, plural, =1 {# règle est} other {# règles sont}} en cours de mise à jour.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastNotifyButtonLabel": "M'envoyer une notification à la fin",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastTitle": "Les mises à jour des règles sont en cours",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.contextMenuTitle": "Options",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.errorToastDescription": "Impossible de supprimer {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.errorToastTitle": "Erreur lors de la suppression des règles",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.successToastDescription": "Suppression réussie de {totalRules, plural, =1 {{totalRules} règle} other {{totalRules} règles}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.successToastTitle": "Règles supprimées",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteIndexPatternsTitle": "Supprimer les modèles d'indexation",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteTagsTitle": "Supprimer les balises",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteTitle": "Supprimer",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.errorToastDescription": "Impossible de désactiver {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.errorToastTitle": "Erreur lors de la désactivation des règles",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.successToastDescription": "Désactivation réussie de {totalRules, plural, =1 {{totalRules} règle} other {{totalRules} règles}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.successToastTitle": "Règles désactivées",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disableTitle": "Désactiver",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastDescription": "Impossible de dupliquer {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastTitle": "Erreur lors de la duplication de la règle",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastDescription": "Duplication réussie de {totalRules, plural, =1 {{totalRules} règle} other {{totalRules} règles}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastTitle": "Règles dupliquées",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicateTitle": "Dupliquer",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastDescription": "Impossible de mettre à jour {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastTitle": "Erreur lors de la mise à jour des règles",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastDescription": "Vous avez correctement mis à jour {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastTitle": "Règles mises à jour",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.errorToastDescription": "Impossible d'activer {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.errorToastTitle": "Erreur lors de l'activation des règles",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.successToastTitle": "Règles activées",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enableTitle": "Activer",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.errorToastDescription": "Impossible d'exporter {rulesCount, plural, =1 {# règle} other {# règles}}.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.errorToastTitle": "Erreur lors de l'exportation des règles",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastDescription": "Exportation réussie de {exportedRules} sur {totalRules} {totalRules, plural, =1 {règle} other {règles}}. Les règles prédéfinies ont été exclues du fichier résultant.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastTitle": "Règles exportées",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.exportTitle": "Exporter",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.indexPatternsTitle": "Modèles d'indexation",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.tagsTitle": "Balises",
     "xpack.securitySolution.detectionEngine.rules.allRules.clearSelectionTitle": "Effacer la sélection",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.enabledTitle": "Activé",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gap": "Dernier écart (le cas échéant)",
-    "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimes": "Heure d'indexation (ms)",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.gapTooltip": "Durée de l'écart le plus récent dans l'exécution de la règle. Ajustez l'historique des règles ou {seeDocs} pour réduire les écarts.",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.gapTooltipSeeDocsDescription": "consultez la documentation",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimes": "Durée de l'indexation (ms)",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimesTooltip": "Temps total passé sur l'indexation des alertes lors de la dernière exécution de règle",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastResponseTitle": "Dernière réponse",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastRunTitle": "Dernière exécution",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastUpdateTitle": "Dernière mise à jour",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.queryTimes": "Durée de la requête (ms)",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.queryTimesTooltip": "Temps total passé sur l'interrogation des index source lors de la dernière exécution de règle",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.riskScoreTitle": "Score de risque",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.ruleTitle": "Règle",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.severityTitle": "Sévérité",
@@ -20792,6 +24907,7 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.tagsTitle": "Balises",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.versionTitle": "Version",
     "xpack.securitySolution.detectionEngine.rules.allRules.exportFilenameTitle": "rules_export",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.tourTitle": "Nouveautés",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.customRulesTitle": "Règles personnalisées",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.elasticRulesTitle": "Règles Elastic",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.noRulesBodyTitle": "Nous n'avons trouvé aucune règle avec les filtres ci-dessus.",
@@ -20801,12 +24917,11 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.inactiveRuleDescription": "inactive",
     "xpack.securitySolution.detectionEngine.rules.allRules.refreshTitle": "Actualiser",
     "xpack.securitySolution.detectionEngine.rules.allRules.searchAriaLabel": "Rechercher les règles",
+    "xpack.securitySolution.detectionEngine.rules.allRules.searchPlaceholder": "Effectuer une recherche par nom de règle, modèle d'indexation, ou tactique ou technique MITRE ATT&amp;CK",
     "xpack.securitySolution.detectionEngine.rules.allRules.selectAllRulesTitle": "Sélection totale de {totalRules} {totalRules, plural, =1 {règle} other {règles}} effectuée",
     "xpack.securitySolution.detectionEngine.rules.allRules.selectedRulesTitle": "Sélection de {selectedRules} {selectedRules, plural, =1 {règle} other {règles}} effectuée",
     "xpack.securitySolution.detectionEngine.rules.allRules.showingExceptionLists": "Affichage de {totalLists} {totalLists, plural, =1 {liste} other {listes}}",
     "xpack.securitySolution.detectionEngine.rules.allRules.showingRulesTitle": "Affichage de {totalRules} {totalRules, plural, =1 {règle} other {règles}}",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastDescription": "Duplication réussie de {totalRules, plural, =1 {{totalRules} règle} other {{totalRules} règles}}",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastDescription": "Exportation réussie de {exportedRules} sur {totalRules} {totalRules, plural, =1 {règle} other {règles}}. Les règles prédéfinies ont été exclues du fichier résultant.",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.exceptions": "Listes d'exceptions",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.monitoring": "Monitoring des règles",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.rules": "Règles",
@@ -20818,12 +24933,16 @@
     "xpack.securitySolution.detectionEngine.rules.defineRuleTitle": "Définir la règle",
     "xpack.securitySolution.detectionEngine.rules.deleteDescription": "Supprimer",
     "xpack.securitySolution.detectionEngine.rules.editPageTitle": "Modifier",
+    "xpack.securitySolution.detectionEngine.rules.experimentalDescription": "La vue expérimentale du tableau des règles est en version d'évaluation technique et permet de bénéficier de capacités de tri avancées. Si vous rencontrez des problèmes de performances lorsque vous travaillez avec ce tableau, vous pouvez désactiver ce paramètre.",
+    "xpack.securitySolution.detectionEngine.rules.experimentalOff": "Version d'évaluation technique : Désactivé",
+    "xpack.securitySolution.detectionEngine.rules.experimentalOn": "Version d'évaluation technique : Activé",
     "xpack.securitySolution.detectionEngine.rules.importRuleTitle": "Importer les règles",
     "xpack.securitySolution.detectionEngine.rules.loadPrePackagedRulesAndTemplatesButton": "Charger les règles prédéfinies d'Elastic et les modèles de chronologie",
     "xpack.securitySolution.detectionEngine.rules.loadPrePackagedRulesButton": "Charger les règles prédéfinies d'Elastic",
     "xpack.securitySolution.detectionEngine.rules.loadPrePackagedTimelineTemplatesButton": "Charger les modèles de chronologie prédéfinis d'Elastic",
     "xpack.securitySolution.detectionEngine.rules.optionalFieldDescription": "Facultatif",
     "xpack.securitySolution.detectionEngine.rules.pageTitle": "Règles",
+    "xpack.securitySolution.detectionEngine.rules.popoverTooltip.ariaLabel": "Infobulle pour la colonne : {columnName}",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.createOwnRuletButton": "Créer vos propres règles",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptMessage": "Elastic Security est fourni avec des règles de détection prédéfinies qui s'exécutent en arrière-plan et créent des alertes lorsque leurs conditions sont remplies. Par défaut, toutes les règles prédéfinies à l'exception de la règle Endpoint Security sont désactivées. Vous pouvez sélectionner des règles supplémentaires que vous souhaitez activer.",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptTitle": "Charger les règles de détection prédéfinies d'Elastic",
@@ -20848,11 +24967,14 @@
     "xpack.securitySolution.detectionEngine.rules.updatePrePackagedRulesTitle": "Mise à jour disponible pour les règles ou les modèles de chronologie prédéfinis d'Elastic",
     "xpack.securitySolution.detectionEngine.rules.updatePrePackagedTimelinesButton": "Mettez à jour {updateTimelines} {updateTimelines, plural, =1 {chronologie prédéfinie} other {chronologies prédéfinies}} d'Elastic",
     "xpack.securitySolution.detectionEngine.rules.updatePrePackagedTimelinesMsg": "Vous pouvez mettre à jour {updateTimelines} {updateTimelines, plural, =1 {chronologie prédéfinie} other {chronologies prédéfinies}} d'Elastic",
+    "xpack.securitySolution.detectionEngine.ruleStatus.errorCalloutTitle": "Échec de règle à",
+    "xpack.securitySolution.detectionEngine.ruleStatus.partialErrorCalloutTitle": "Avertissement à",
     "xpack.securitySolution.detectionEngine.ruleStatus.refreshButton": "Actualiser",
     "xpack.securitySolution.detectionEngine.ruleStatus.statusAtDescription": "à",
     "xpack.securitySolution.detectionEngine.ruleStatus.statusDateDescription": "Date du statut",
     "xpack.securitySolution.detectionEngine.ruleStatus.statusDescription": "Dernière réponse",
     "xpack.securitySolution.detectionEngine.signalRuleAlert.actionGroups.default": "Par défaut",
+    "xpack.securitySolution.detectionEngine.signals.alertReasonDescription": "{eventCategory, select, null {} other {{eventCategory}{whitespace}}}événement{hasFieldOfInterest, select, false {} other {{whitespace}avec}}{processName, select, null {} other {{whitespace}processus {processName},} }{processParentName, select, null {} other {{whitespace}processus parent {processParentName},} }{fileName, select, null {} other {{whitespace}fichier {fileName},} }{sourceAddress, select, null {} other {{whitespace}source {sourceAddress}}}{sourcePort, select, null {} other {:{sourcePort},}}{destinationAddress, select, null {} other {{whitespace}destination {destinationAddress}}}{destinationPort, select, null {} other {:{destinationPort},}}{userName, select, null {} other {{whitespace}par {userName}} }{hostName, select, null {} other {{whitespace}sur {hostName}} } alerte {alertSeverity} {alertName} créée.",
     "xpack.securitySolution.detectionEngine.signalTitle": "Alertes détectées",
     "xpack.securitySolution.detectionEngine.totalSignalTitle": "Total",
     "xpack.securitySolution.detectionEngine.userUnauthenticatedMsgBody": "Vous ne disposez pas des autorisations requises pour visualiser le moteur de détection. Pour une aide supplémentaire, contactez votre administrateur.",
@@ -20861,7 +24983,12 @@
     "xpack.securitySolution.detectionEngine.validations.thresholdCardinalityValueFieldData.numberGreaterThanOrEqualOneErrorMessage": "La valeur doit être supérieure ou égale à un.",
     "xpack.securitySolution.detectionEngine.validations.thresholdFieldFieldData.arrayLengthGreaterThanMaxErrorMessage": "Le nombre de champs doit être de 3 au maximum.",
     "xpack.securitySolution.detectionEngine.validations.thresholdValueFieldData.numberGreaterThanOrEqualOneErrorMessage": "La valeur doit être supérieure ou égale à un.",
+    "xpack.securitySolution.detectionResponse.pageTitle": "Détection et réponse - SOC",
+    "xpack.securitySolution.detectionResponse.updated": "Mis à jour",
+    "xpack.securitySolution.detectionResponse.updating": "Mise à jour...",
     "xpack.securitySolution.detections.alerts.agentStatus": "Statut de l'agent",
+    "xpack.securitySolution.detections.alerts.ruleType": "Type de règle",
+    "xpack.securitySolution.detections.alerts.sourceEventId": "ID événement source",
     "xpack.securitySolution.detections.hostIsolation.impactedCases": "Cette action sera ajoutée aux {cases}.",
     "xpack.securitySolution.documentationLinks.ariaLabelEnding": "cliquez pour ouvrir la documentation dans un nouvel onglet",
     "xpack.securitySolution.documentationLinks.detectionsRequirements.text": "Prérequis et exigences des détections",
@@ -20890,6 +25017,8 @@
     "xpack.securitySolution.editDataProvider.selectAnOperatorPlaceholder": "Sélectionner un opérateur",
     "xpack.securitySolution.editDataProvider.valueLabel": "Valeur",
     "xpack.securitySolution.editDataProvider.valuePlaceholder": "valeur",
+    "xpack.securitySolution.effectedPolicySelect.assignmentSectionDescription": "Effectuez une affectation globale à toutes les politiques, ou une affectation spécifique à certaines politiques.",
+    "xpack.securitySolution.effectedPolicySelect.assignmentSectionTitle": "Affectation",
     "xpack.securitySolution.effectedPolicySelect.viewPolicyLinkLabel": "Afficher la politique",
     "xpack.securitySolution.emptyString.emptyStringDescription": "Chaîne vide",
     "xpack.securitySolution.endpoint.actions.agentDetails": "Afficher les détails de l'agent",
@@ -20898,6 +25027,7 @@
     "xpack.securitySolution.endpoint.actions.hostDetails": "Afficher les détails de l'hôte",
     "xpack.securitySolution.endpoint.actions.isolateHost": "Isoler l'hôte",
     "xpack.securitySolution.endpoint.actions.unIsolateHost": "Libérer l'hôte",
+    "xpack.securitySolution.endpoint.blocklists.fleetIntegration.title": "Liste noire",
     "xpack.securitySolution.endpoint.details.agentStatus": "Statut de l'agent",
     "xpack.securitySolution.endpoint.details.endpointVersion": "Version du point de terminaison",
     "xpack.securitySolution.endpoint.details.errorBody": "Veuillez quitter le menu volant et sélectionner un hôte disponible.",
@@ -20908,6 +25038,7 @@
     "xpack.securitySolution.endpoint.details.os": "Système d'exploitation",
     "xpack.securitySolution.endpoint.details.policy": "Politique",
     "xpack.securitySolution.endpoint.details.policy.revisionNumber": "rév. {revNumber}",
+    "xpack.securitySolution.endpoint.details.policyResponse.behavior_protection": "Comportement malveillant",
     "xpack.securitySolution.endpoint.details.policyResponse.configure_dns_events": "Configurer les événements DNS",
     "xpack.securitySolution.endpoint.details.policyResponse.configure_elasticsearch_connection": "Configurer la connexion Elasticsearch",
     "xpack.securitySolution.endpoint.details.policyResponse.configure_file_events": "Configurer les événements de fichier",
@@ -20935,6 +25066,7 @@
     "xpack.securitySolution.endpoint.details.policyResponse.load_malware_model": "Charger le modèle de malware",
     "xpack.securitySolution.endpoint.details.policyResponse.logging": "Logging",
     "xpack.securitySolution.endpoint.details.policyResponse.malware": "Malware",
+    "xpack.securitySolution.endpoint.details.policyResponse.memory_protection": "Menace sur la mémoire",
     "xpack.securitySolution.endpoint.details.policyResponse.read_elasticsearch_config": "Lire la config Elasticsearch",
     "xpack.securitySolution.endpoint.details.policyResponse.read_events_config": "Lire la config des événements",
     "xpack.securitySolution.endpoint.details.policyResponse.read_kernel_config": "Lire la config du noyau",
@@ -20947,11 +25079,33 @@
     "xpack.securitySolution.endpoint.details.policyStatus": "Statut de la politique",
     "xpack.securitySolution.endpoint.details.policyStatusValue": "{policyStatus, select, success {Succès} warning {Avertissement} failure {Échec} other {Inconnu}}",
     "xpack.securitySolution.endpoint.detailsActions.buttonLabel": "Entreprendre une action",
-    "xpack.securitySolution.endpoint.fleetCustomExtension.backButtonLabel": "Retour à l'intégration du point de terminaison",
+    "xpack.securitySolution.endpoint.effectedPolicySelect.global": "Global",
+    "xpack.securitySolution.endpoint.effectedPolicySelect.perPolicy": "Par politique",
+    "xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title": "Filtres d'événements",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.artifactsSummaryError": "Une erreur s'est produite lors de la tentative de récupération des statistiques d'artefacts : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.backButtonLabel": "Revenir aux intégrations Endpoint Security",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques de liste noire : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques de filtres d'événements : \"{error}\"",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.linux": "Linux",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.macos": "Mac",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.total": "Total",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.windows": "Windows",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques d'exceptions d'isolation de l'hôte : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.manageArtifactsLinkLabel": "Gérer",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.title": "Artefacts",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques des applications de confiance : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifacts.backButtonLabel": "Retour à la politique d'intégration de Fleet",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifactsManageLabel": "Gérer les artefacts",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifactsSummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques d'artefacts : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.blocklistsManageLabel": "Gérer la liste noire",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.blocklistsSummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques de listes noires : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.eventFiltersManageLabel": "Gérer les filtres d'événements",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.eventFiltersSummarySummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques de filtres d'événements : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.hostIsolationExceptionsManageLabel": "Gérer les exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.hostIsolationExceptionsSummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques d'exceptions d'isolation de l'hôte : \"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.title": "Artefacts",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.trustedAppsManageLabel": "Gérer les applications de confiance",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.trustedAppsSummarySummary.error": "Une erreur s'est produite lors de la tentative de récupération des statistiques des applications de confiance : \"{error}\"",
     "xpack.securitySolution.endpoint.hostIsolation.cancel": "Annuler",
     "xpack.securitySolution.endpoint.hostIsolation.casesFromAlerts.title": "Impossible de trouver les cas associés",
     "xpack.securitySolution.endpoint.hostIsolation.comment": "Commentaire",
@@ -20974,6 +25128,7 @@
     "xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage": "La libération de l'hôte {hostName} a été soumise avec succès",
     "xpack.securitySolution.endpoint.hostIsolation.unisolateHost": "Libérer l'hôte",
     "xpack.securitySolution.endpoint.hostIsolation.unIsolateThisHost": "{hostName} est actuellement {isolated}. Voulez-vous vraiment {unisolate} cet hôte ?",
+    "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "Exceptions d'isolation de l'hôte",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating": "Isolation",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isolated": "Isolé",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating": "Libération",
@@ -20984,6 +25139,7 @@
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "Nous enregistrerons votre intégration avec nos valeurs par défaut recommandées. Vous pourrez les changer ultérieurement en modifiant l'intégration Endpoint Security dans la politique de votre agent.",
     "xpack.securitySolution.endpoint.list.actionmenu": "Ouvrir",
     "xpack.securitySolution.endpoint.list.actions": "Actions",
+    "xpack.securitySolution.endpoint.list.backToPolicyButton": "Retour à la liste des politiques",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling": "Les points de terminaison sont en cours d'enregistrement. {agentsLink} pour suivre la progression.",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling.viewAgentsLink": "Afficher les agents",
     "xpack.securitySolution.endpoint.list.endpointVersion": "Version",
@@ -21021,21 +25177,26 @@
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.global.interval": "Intervalle entre les tentatives de téléchargement du manifeste des artefacts globaux, en secondes. Par défaut : 3 600.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.global.manifest_relative_url": "URL relative à partir de laquelle télécharger les manifestes d'artefacts globaux. Par défaut : /downloads/endpoint/manifest/artifacts-<version>.zip.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.global.public_key": "Clé publique à encodage PEM utilisée pour vérifier la signature du manifeste d'artefacts globaux.",
+    "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.user.ca_cert": "Certificat à encodage PEM pour l'autorité de certificat du serveur Fleet.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.user.public_key": "Clé publique à encodage PEM utilisée pour vérifier la signature du manifeste d'artefacts d'utilisateur.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.diagnostic.enabled": "La valeur \"false\" désactive les fonctionnalités de diagnostic sur Endpoint. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.delay": "Délai d'envoi des événements à Elasticsearch, en secondes. Par défaut : 120.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.ca_cert": "Certificat à encodage PEM pour l'autorité de certificat d'Elasticsearch.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.verify_hostname": "S'il faut vérifier que le nom d'hôte du pair est celui indiqué dans le certificat. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.verify_peer": "S'il faut vérifier les certificats présentés par le pair. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.kernel.capture_mode": "Permet aux utilisateurs de spécifier si kprobes ou ebpf doit être utilisé pour rassembler les données. Les options possibles sont kprobes, ebpf ou auto. Par défaut : auto",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.logging.file": "La valeur fournie remplacera le niveau de log configuré pour les logs enregistrés sur le disque et diffusés vers Elasticsearch. Il est recommandé d'utiliser Fleet pour modifier ce logging dans la plupart des cas. Les valeurs autorisées sont error (erreur), warning (avertissement), info, debug (débogage) et trace.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.logging.syslog": "La valeur fournie configurera le logging sur syslog. Les valeurs autorisées sont error (erreur), warning (avertissement), info, debug (débogage) et trace.",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.malware.quarantine": "Si la quarantaine doit être activée lorsque la prévention contre les malware est activée. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.memory_protection.memory_scan": "Autorisez l'analyse des régions de mémoire malveillantes dans le cadre de la protection de la mémoire. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.memory_protection.memory_scan_collect_sample": "Collectez 4 Mo de mémoire autour des régions de mémoire malveillantes détectées. Valeur par défaut : false. L'activation de cette valeur peut augmenter considérablement la quantité de données stockée dans Elasticsearch.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.agent.connection_delay": "Combien de temps attendre la connectivité de l'agent avant d'envoyer la première réponse de politique, en secondes. Par défaut : 60.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.alerts.cloud_lookup": "La valeur \"false\" désactive la recherche dans le cloud pour les alertes Mac. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.global.base_url": "URL à partir de laquelle télécharger les manifestes d'artefacts globaux.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.global.interval": "Intervalle entre les tentatives de téléchargement du manifeste des artefacts globaux, en secondes. Par défaut : 3 600.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.global.manifest_relative_url": "URL relative à partir de laquelle télécharger les manifestes d'artefacts globaux. Par défaut : /downloads/endpoint/manifest/artifacts-<version>.zip.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.global.public_key": "Clé publique à encodage PEM utilisée pour vérifier la signature du manifeste d'artefacts globaux.",
+    "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.user.ca_cert": "Certificat à encodage PEM pour l'autorité de certificat du serveur Fleet.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.user.public_key": "Clé publique à encodage PEM utilisée pour vérifier la signature du manifeste d'artefacts d'utilisateur.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.diagnostic.enabled": "La valeur \"false\" désactive les fonctionnalités de diagnostic sur Endpoint. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.elasticsearch.delay": "Délai d'envoi des événements à Elasticsearch, en secondes. Par défaut : 120.",
@@ -21046,11 +25207,15 @@
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.kernel.connect": "S'il faut établir une connexion au pilote du noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.kernel.filewrite": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements d'écriture de fichier dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.kernel.network": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements de réseau dans le noyau. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.kernel.network_extension.enable_content_filtering": "Activez ou désactivez le filtre de contenu réseau, cela permettra d'activer ou de désactiver les événements réseau. L'isolation de l'hôte échouera si cette option est désactivée. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.kernel.network_extension.enable_packet_filtering": "Activez ou désactivez le filtre de paquets réseau. L'isolation de l'hôte échouera si cette option est désactivée. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.kernel.process": "La valeur \"false\" remplace tous les autres paramètres de configuration qui activeraient les événements de processus dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.logging.file": "La valeur fournie remplacera le niveau de log configuré pour les logs enregistrés sur le disque et diffusés vers Elasticsearch. Il est recommandé d'utiliser Fleet pour modifier ce logging dans la plupart des cas. Les valeurs autorisées sont error (erreur), warning (avertissement), info, debug (débogage) et trace.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.logging.syslog": "La valeur fournie configurera le logging sur syslog. Les valeurs autorisées sont error (erreur), warning (avertissement), info, debug (débogage) et trace.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.malware.quarantine": "Si la quarantaine doit être activée lorsque la prévention contre les malware est activée. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.malware.threshold": "Le seuil doit être utilisé pour évaluer les malware. Les valeurs autorisées sont normal, conservative (prudent) et aggressive (agressif). Par défaut : normal.",
+    "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.memory_protection.memory_scan": "Autorisez l'analyse des régions de mémoire malveillantes dans le cadre de la protection de la mémoire. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.mac.advanced.memory_protection.memory_scan_collect_sample": "Collectez 4 Mo de mémoire autour des régions de mémoire malveillantes détectées. Valeur par défaut : false. L'activation de cette valeur peut augmenter considérablement la quantité de données stockée dans Elasticsearch.",
     "xpack.securitySolution.endpoint.policy.advanced.show": "Paramètres avancés de {action}",
     "xpack.securitySolution.endpoint.policy.advanced.warningMessage": "Cette section contient les valeurs de politique qui prennent en charge les cas d'utilisation avancés. En cas de configuration\n    incorrecte, ces valeurs peuvent entraîner un comportement imprévisible. Veuillez lire la documentation\n    attentivement ou contacter le support technique avant de modifier ces valeurs.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.agent.connection_delay": "Combien de temps attendre la connectivité de l'agent avant d'envoyer la première réponse de politique, en secondes. Par défaut : 60.",
@@ -21059,35 +25224,84 @@
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.global.interval": "Intervalle entre les tentatives de téléchargement du manifeste des artefacts globaux, en secondes. Par défaut : 3 600.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.global.manifest_relative_url": "URL relative à partir de laquelle télécharger les manifestes d'artefacts globaux. Par défaut : /downloads/endpoint/manifest/artifacts-<version>.zip.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.global.public_key": "Clé publique à encodage PEM utilisée pour vérifier la signature du manifeste d'artefacts globaux.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.user.ca_cert": "Certificat à encodage PEM pour l'autorité de certificat du serveur Fleet.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.user.public_key": "Clé publique à encodage PEM utilisée pour vérifier la signature du manifeste d'artefacts d'utilisateur.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.diagnostic.enabled": "La valeur \"false\" désactive les fonctionnalités de diagnostic sur Endpoint. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.diagnostic.rollback_telemetry_enabled": "Activez la télémétrie de restauration de diagnostic. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.elasticsearch.delay": "Délai d'envoi des événements à Elasticsearch, en secondes. Par défaut : 120.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.elasticsearch.tls.ca_cert": "Certificat à encodage PEM pour l'autorité de certificat d'Elasticsearch.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.elasticsearch.tls.verify_hostname": "S'il faut vérifier que le nom d'hôte du pair est celui indiqué dans le certificat. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.elasticsearch.tls.verify_peer": "S'il faut vérifier les certificats présentés par le pair. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.events.etw": "Activez la collection d'événements ETW. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.asyncimageload": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements de chargement d'image asynchrones dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.connect": "S'il faut établir une connexion au pilote du noyau. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.fileaccess": "Signalez les événements d'accès limité aux fichiers (read). Les chemins ne sont pas configurables par l'utilisateur. La valeur par défaut est \"true\".",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.fileopen": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements d'ouverture de fichier dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.filewrite": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements d'écriture de fichier dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.network": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements de réseau dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.process": "La valeur \"false\" remplace tous les autres paramètres de configuration qui activeraient les événements de processus dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.registry": "La valeur \"false\" remplace tous les autres paramètres de configuration qui activeraient les événements de registre dans le noyau. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.registryaccess": "Signalez les événements d'accès limité au registre (queryvalue, savekey). Les chemins ne sont pas configurables par l'utilisateur. La valeur par défaut est \"true\".",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.kernel.syncimageload": "La valeur \"false\" remplace tous les autres paramètres qui activeraient les événements de chargement d'image synchrones dans le noyau. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.logging.debugview": "La valeur fournie configurera le logging sur Debugview (outil Sysinternals). Les valeurs autorisées sont error (erreur), warning (avertissement), info, debug (débogage) et trace.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.logging.file": "La valeur fournie remplacera le niveau de log configuré pour les logs enregistrés sur le disque et diffusés vers Elasticsearch. Il est recommandé d'utiliser Fleet pour modifier ce logging dans la plupart des cas. Les valeurs autorisées sont error (erreur), warning (avertissement), info, debug (débogage) et trace.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.malware.quarantine": "Si la quarantaine doit être activée lorsque la prévention contre les malware est activée. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.malware.threshold": "Le seuil doit être utilisé pour évaluer les malware. Les valeurs autorisées sont normal, conservative (prudent) et aggressive (agressif). Par défaut : normal.",
-    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode": "La valeur \"false\" désactive Shellcode Injection Protection (protection contre les injections d'un shellcode), fonctionnalité Memory Protection (protection de la mémoire). Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.memory_scan": "Autorisez l'analyse des régions de mémoire malveillantes dans le cadre de la protection de la mémoire. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.memory_scan_collect_sample": "Collectez 4 Mo de mémoire autour des régions de mémoire malveillantes détectées. Valeur par défaut : false. L'activation de cette valeur peut augmenter considérablement la quantité de données stockée dans Elasticsearch.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode": "Activez la détection des injections de shellcode dans le cadre de la protection de la mémoire. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_collect_sample": "Collectez 4 Mo de mémoire autour des régions de shellcode détectées. Valeur par défaut : false. L'activation de cette valeur peut augmenter considérablement la quantité de données stockée dans Elasticsearch.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_trampoline_detection": "Activez la détection des injections de shellcode basé sur un trampoline dans le cadre de la protection de la mémoire. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.canary": "La valeur \"false\" désactive la protection canari des Ransomware. Par défaut : true.",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.mbr": "La valeur \"false\" désactive la protection Ransomware MBR. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.memory_protection.shellcode_enhanced_pe_parsing": "Essayez d'identifier et d'extraire des métadonnées PE à partir du shellcode injecté, incluant des signatures Authenticode et des informations de ressources de version. Par défaut : true.",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.backButtonLabel": "Retour à la politique {policyName}",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.content": "Aucun artefact n'est actuellement affecté à {policyName}. Affectez des artefacts maintenant, ou ajoutez-les et gérez-les sur la page des artefacts.",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.primaryAction": "Affecter des artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.secondaryAction": "Gérer les artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.title": "Aucun artefact affecté",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.action": "Ajouter des artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.content": "Aucun artefact n'est actuellement appliqué à vos points de terminaison.",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.title": "Il n'existe aucun artefact",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.about": "Il y {count, plural, other {a}} {count} {count, plural, =1 {artefact associé} other {artefacts associés}} à cette politique. Cliquer ici pour afficher tous les artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.about.viewAllLinkLabel": "afficher tous les artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.assignToPolicy": "Affecter l'artefact à la politique",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.cancel": "Annuler",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.confirm": "Affecter à {policyName}",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.noAssignable": "Aucun artefact ne peut être affecté à cette politique.",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.noResults": "Aucun élément n'a été trouvé",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.searchWarning.text": "Seuls les {maxNumber} premiers artefacts sont affichés. Veuillez utiliser la barre de recherche pour affiner les résultats.",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.searchWarning.title": "Résultats de recherche limités",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.subtitle": "Sélectionner les artefacts à ajouter à {policyName}",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.title": "Affecter des artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastError.text": "Une erreur s'est produite lors de la mise à jour des artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.textMultiples": "{count} artefacts ont été ajoutés à votre liste.",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.textSingle": "\"{name}\" a été ajouté à votre liste d'artefacts.",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.title": "Réussite",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.search.label": "Rechercher les artefacts",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.title": "Artefacts affectés",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.fullDetailsAction": "Afficher tous les détails",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeAction": "Retirer de la politique",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeActionNotAllowed": "L'artefact appliqué globalement ne peut pas être retiré de la politique.",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.cancelLabel": "Annuler",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.confirmLabel": "Retirer de la politique",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.errorToastTitle": "Erreur lors de la tentative de retrait de l'artefact",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.message": "Voulez-vous vraiment continuer ?",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.messageCallout": "Cet artefact sera retiré uniquement de cette politique ; il sera toujours disponible et gérable à partir de la page d'artefacts.",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.successToastText": "\"{artifactName}\" a été retiré de la politique {policyName}",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.successToastTitle": "Retrait effectué avec succès",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.title": "Retirer l'artefact de la politique",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.search.placeholder": "Rechercher sur les champs ci-dessous : nom, description, valeur",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.totalItemCount": "Affichage de {totalItemsCount, plural, one {# artefact} other {# artefacts}}",
+    "xpack.securitySolution.endpoint.policy.blocklists.list.totalItemCount": "Affichage de {totalItemsCount, plural, one {# entrée de liste noire} other {# entrées de liste noire}}",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.explanation": "Activez la bascule pour enregistrer Elastic comme solution d'antivirus officielle pour le système d'exploitation Windows. Cela désactivera également Windows Defender.",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.osRestriction": "Restrictions",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.toggle": "Enregistrer comme antivirus",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.type": "Enregistrer comme antivirus",
     "xpack.securitySolution.endpoint.policy.details.av.windowsServerNotSupported": "Systèmes d'exploitation Windows Server non pris en charge",
-    "xpack.securitySolution.endpoint.policy.details.backToListTitle": "Retour aux hôtes du point de terminaison",
-    "xpack.securitySolution.endpoint.policy.details.behavior": "Comportement",
-    "xpack.securitySolution.endpoint.policy.details.behavior_protection": "Protection contre les comportements",
+    "xpack.securitySolution.endpoint.policy.details.backToListTitle": "Afficher tous les points de terminaison",
+    "xpack.securitySolution.endpoint.policy.details.behavior": "Comportement malveillant",
+    "xpack.securitySolution.endpoint.policy.details.behavior_protection": "Comportement malveillant",
     "xpack.securitySolution.endpoint.policy.details.cancel": "Annuler",
     "xpack.securitySolution.endpoint.policy.details.cloudDeploymentLInk": "déploiement sur le cloud",
     "xpack.securitySolution.endpoint.policy.details.detect": "Détecter",
@@ -21097,8 +25311,8 @@
     "xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled": "l{selected} {selected, plural, one{collection d'événements activée} other{collections d'événements activées}} sur / {total}",
     "xpack.securitySolution.endpoint.policy.details.lockedCardUpgradeMessage": "Pour activer cette protection, vous devez mettre à niveau votre licence vers Platinum, démarrer un essai gratuit de 30 jours ou lancer un {cloudDeploymentLink} sur AWS, GCP ou Azure.",
     "xpack.securitySolution.endpoint.policy.details.malware": "Malware",
-    "xpack.securitySolution.endpoint.policy.details.memory": "Mémoire",
-    "xpack.securitySolution.endpoint.policy.details.memory_protection": "Protection de la mémoire",
+    "xpack.securitySolution.endpoint.policy.details.memory": "Menace sur la mémoire",
+    "xpack.securitySolution.endpoint.policy.details.memory_protection": "Menace sur la mémoire",
     "xpack.securitySolution.endpoint.policy.details.platinum": "Platinum",
     "xpack.securitySolution.endpoint.policy.details.prevent": "Prévention",
     "xpack.securitySolution.endpoint.policy.details.protections": "Protections",
@@ -21106,6 +25320,11 @@
     "xpack.securitySolution.endpoint.policy.details.ransomware": "Ransomware",
     "xpack.securitySolution.endpoint.policy.details.save": "Enregistrer",
     "xpack.securitySolution.endpoint.policy.details.settings": "Paramètres",
+    "xpack.securitySolution.endpoint.policy.details.tabs.blocklists": "Liste noire",
+    "xpack.securitySolution.endpoint.policy.details.tabs.eventFilters": "Filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.details.tabs.isInHostIsolationExceptions": "Exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.details.tabs.policyForm": "Paramètres de politique",
+    "xpack.securitySolution.endpoint.policy.details.tabs.trustedApps": "Applications de confiance",
     "xpack.securitySolution.endpoint.policy.details.updateConfirm.cancelButtonTitle": "Annuler",
     "xpack.securitySolution.endpoint.policy.details.updateConfirm.confirmButtonTitle": "Enregistrer et déployer les modifications",
     "xpack.securitySolution.endpoint.policy.details.updateConfirm.message": "Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
@@ -21116,27 +25335,114 @@
     "xpack.securitySolution.endpoint.policy.details.updateSuccessMessage": "L'intégration {name} a été mise à jour.",
     "xpack.securitySolution.endpoint.policy.details.updateSuccessTitle": "Cette action a réussi !",
     "xpack.securitySolution.endpoint.policy.details.upgradeToPlatinum": "Mettre à niveau vers Elastic Platinum",
-    "xpack.securitySolution.endpoint.policy.protections.behavior": "Protections contre les comportements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unassigned.content": "Aucun filtre d'événement n'est actuellement affecté à {policyName}. Affectez des filtres d'événements maintenant, ou ajoutez-les et gérez-les sur la page des filtres d'événements.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unassigned.primaryAction": "Affecter des filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unassigned.secondaryAction": "Gérer les filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unassigned.title": "Aucun filtre d'événement affecté",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unexisting.action": "Ajouter des filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unexisting.content": "Aucun filtre d'événement n'est actuellement appliqué à vos points de terminaison.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.empty.unexisting.title": "Il n'existe aucun filtre d'événement",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.about.viewAllLinkLabel": "afficher tous les filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.assignToPolicy": "Affecter des filtres d'événements à la politique",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.noAssignable": "Aucun filtre d'événement ne peut être affecté à cette politique.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.searchWarning.text": "Seuls les {maxNumber} filtres d'événements sont affichés. Veuillez utiliser la barre de recherche pour affiner les résultats.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.subtitle": "Sélectionner des filtres d'événements à ajouter à {policyName}",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.title": "Affecter des filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastError.text": "Une erreur s'est produite lors de la mise à jour des filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastSuccess.textMultiples": "{count} filtres d'événements ont été ajoutés à votre liste.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastSuccess.textSingle": "\"{name}\" a été ajouté à votre liste de filtres d'événements.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.search.label": "Rechercher des filtres d'événements",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.title": "Filtres d'événements affectés",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.about": "Il y {count, plural, other {a}} {count} {count, plural, =1 {filtre d'événement associé} other {filtres d'événements associés}} à cette politique. Cliquez ici pour {link}",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.removeActionNotAllowed": "Le filtre d'événement appliqué globalement ne peut pas être retiré de la politique.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.errorToastTitle": "Erreur lors de la tentative de retrait du filtre d'événement",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.messageCallout": "Ce filtre d'événement sera retiré uniquement de cette politique ; il sera toujours disponible et gérable à partir de la page d'artefacts.",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.title": "Retirer le filtre d'événement de la politique",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.search.placeholder": "Rechercher sur les champs ci-dessous : nom, description, commentaires, valeur",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.totalItemCount": "Affichage de {totalItemsCount, plural, one {# filtre d'événement} other {# filtres d'événements}}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.content": "Il n'existe actuellement aucune exception d'isolation de l'hôte affectée à {policyName}. Affectez des exceptions d'isolation de l'hôte maintenant, ou ajoutez-les et gérez-les sur la page d'exceptions d'isolation de l'hôte.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.primaryAction": "Affecter des exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.secondaryAction": "Gérer les exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.title": "Aucune exception d'isolation de l'hôte affectée",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.action": "Ajouter des exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.content": "Aucune exception d'isolation de l'hôte n'est actuellement appliquée à vos points de terminaison.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.title": "Il n'existe aucune exception d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.about.viewAllLinkLabel": "afficher toutes les exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.assignToPolicy": "Affecter des exceptions d'isolation de l'hôte à la politique",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.noAssignable": "Aucune exception d'isolation de l'hôte ne peut être affectée à cette politique.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.searchWarning.text": "Seules les {maxNumber} premières exceptions d'isolation de l'hôte sont affichées. Veuillez utiliser la barre de recherche pour affiner les résultats.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.subtitle": "Sélectionner des exceptions d'isolation de l'hôte à ajouter à {policyName}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.title": "Affecter des exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastError.text": "Une erreur s'est produite lors de la mise à jour des exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastSuccess.textMultiples": "{count} exceptions d'isolation de l'hôte ont été ajoutées à votre liste.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastSuccess.textSingle": "\"{name}\" a été ajouté à votre liste d'exceptions d'isolation de l'hôte.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.search.label": "Rechercher des exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.title": "Exceptions d'isolation de l'hôte affectées",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeActionNotAllowed": "L'exception d'isolation de l'hôte globalement appliquée ne peut pas être retirée de la politique.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.errorToastTitle": "Erreur lors de la tentative de retrait de l'exception d'isolation de l'hôte",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.messageCallout": "Cette exception d'isolation de l'hôte sera retirée uniquement de cette politique ; elle sera toujours disponible et gérable à partir de la page d'artefacts.",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.title": "Retirer l'exception d'isolation de l'hôte de la politique",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.search.placeholder": "Rechercher sur les champs ci-dessous : nom, description, IP",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.totalItemCount": "Affichage de {totalItemsCount, plural, one {# exception d'isolation de l'hôte} other {# exceptions d'isolation de l'hôte}}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationExceptions.list.about": "Il y {count, plural, other {a}} {count} {count, plural, =1 {exception d'isolation de l'hôte associée} other {exceptions d'isolation de l'hôte associées}} à cette politique. Cliquez ici pour {link}",
+    "xpack.securitySolution.endpoint.policy.protections.behavior": "Protections contre les comportements malveillants",
+    "xpack.securitySolution.endpoint.policy.protections.blocklist": "Liste noire activée",
     "xpack.securitySolution.endpoint.policy.protections.malware": "Protections contre les malware",
-    "xpack.securitySolution.endpoint.policy.protections.memory": "Protections de la mémoire",
+    "xpack.securitySolution.endpoint.policy.protections.memory": "Protections de la mémoire contre les menaces",
     "xpack.securitySolution.endpoint.policy.protections.ransomware": "Protections contre les ransomware",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unassigned.content": "Aucune application de confiance n'est actuellement affectée à {policyName}. Affectez des applications de confiance maintenant, ou ajoutez-les et gérez-les sur la page des applications de confiance.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unassigned.primaryAction": "Affecter des applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unassigned.secondaryAction": "Gérer les applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unassigned.title": "Aucune application de confiance affectée",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unexisting.action": "Ajouter des applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unexisting.content": "Aucune application de confiance n'est actuellement appliquée à vos points de terminaison.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.empty.unexisting.title": "Il n'existe aucune application de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.about.viewAllLinkLabel": "afficher toutes les applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.assignToPolicy": "Affecter des applications de confiance à la politique",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.noAssignable": "Aucune application de confiance ne peut être affectée à cette politique.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.searchWarning.text": "Seules les {maxNumber} premières applications de confiance sont affichées. Veuillez utiliser la barre de recherche pour affiner les résultats.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.subtitle": "Sélectionner des applications de confiance à ajouter à {policyName}",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.title": "Affecter des applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastError.text": "Une erreur s'est produite lors de la mise à jour des applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textMultiples": "{count} applications de confiance ont été ajoutées à votre liste.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textSingle": "\"{name}\" a été ajouté à votre liste d'applications de confiance.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.search.label": "Rechercher des applications de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.title": "Applications de confiance affectées",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.about": "Il y {count, plural, other {a}} {count} {count, plural, =1 {application de confiance associée} other {applications de confiance associées}} à cette politique. Cliquez ici pour {link}",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeActionNotAllowed": "L'application de confiance globalement appliquée ne peut pas être retirée de la politique.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.errorToastTitle": "Erreur lors de la tentative de retrait de l'application de confiance",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.messageCallout": "Cette application de confiance sera retirée uniquement de cette politique ; elle sera toujours disponible et gérable à partir de la page d'artefacts.",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.title": "Retirer l'application de confiance de la politique",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.search.placeholder": "Rechercher sur les champs ci-dessous : nom, description, valeur",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.totalItemCount": "Affichage de {totalItemsCount, plural, one {# application de confiance} other {# applications de confiance}}",
+    "xpack.securitySolution.endpoint.policyDetail.behaviorProtectionTooltip": "comportement malveillant",
+    "xpack.securitySolution.endpoint.policyDetail.filename": "nom de fichier",
+    "xpack.securitySolution.endpoint.policyDetail.memoryProtectionTooltip": "menace sur la mémoire",
     "xpack.securitySolution.endpoint.policyDetail.notifyUser": "Notifier l'utilisateur",
+    "xpack.securitySolution.endpoint.policyDetail.rule": "règle",
     "xpack.securitySolution.endpoint.policyDetailOS": "Système d'exploitation",
-    "xpack.securitySolution.endpoint.policyDetails.agentsSummary.errorTitle": "En mauvais état",
+    "xpack.securitySolution.endpoint.policyDetails.agentsSummary.errorTitle": "Défectueux",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.offlineTitle": "Hors ligne",
-    "xpack.securitySolution.endpoint.policyDetails.agentsSummary.onlineTitle": "Sain",
-    "xpack.securitySolution.endpoint.policyDetails.agentsSummary.totalTitle": "Agents",
+    "xpack.securitySolution.endpoint.policyDetails.agentsSummary.onlineTitle": "Intègre",
+    "xpack.securitySolution.endpoint.policyDetails.agentsSummary.totalTitle": "Total des agents",
+    "xpack.securitySolution.endpoint.policyDetails.artifacts.title": "Artefacts",
+    "xpack.securitySolution.endpoint.policyDetails.loadError": "Impossible de charger les paramètres de la politique des points de terminaison",
+    "xpack.securitySolution.endpoint.policyDetails.settings.title": "Paramètres de politique",
     "xpack.securitySolution.endpoint.policyDetails.supportedVersion": "Version de l'agent {version}",
     "xpack.securitySolution.endpoint.policyDetails.userNotification.placeholder": "Saisir votre message de notification personnalisé",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.blocklistTooltip": "Active ou désactive la liste noire associée à cette politique. La liste noire est une collection de hachages, de chemins ou de signataires qui étend la liste de processus considérés comme malveillants par le point de terminaison. Consultez l'onglet de la liste noire pour plus de détails sur l'entrée.",
     "xpack.securitySolution.endpoint.policyDetailsConfig.customizeUserNotification": "Personnaliser le message de notification",
     "xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents": "Événements",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.file": "Fichier",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.network": "Réseau",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.process": "Processus",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.session_data": "Inclure les données de session",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.session_data.tooltip": "Capturez les données d'événement de processus étendues requises pour la vue de session. La vue de session vous aide à examiner l'activité des processus, des utilisateurs et des services dans votre infrastructure Linux en affichant les données d'exécution de session et de processus organisées dans une arborescence respectant le modèle de processus Linux. REMARQUE : La capture d'événements de processus étendus augmente considérablement l'utilisation des données.",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.file": "Fichier",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.network": "Réseau",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.process": "Processus",
     "xpack.securitySolution.endpoint.policyDetailsConfig.notifyUserTooltip.a": "La sélection de l'option de notification à l'utilisateur affichera une notification à l'utilisateur de l'hôte lorsque { protectionName } est bloqué ou détecté.",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.notifyUserTooltip.c": " La notification à l'utilisateur peut être personnalisée dans la zone de texte ci-dessous. Les crochets peuvent être utilisés pour remplir de façon dynamique l'action applicable (par ex. blocage de prévention ou détection) et le { bracketText }.",
     "xpack.securitySolution.endpoint.policyDetailsConfig.protectionLevel": "Niveau de protection",
     "xpack.securitySolution.endpoint.policyDetailsConfig.userNotification": "Notification à l'utilisateur",
     "xpack.securitySolution.endpoint.policyDetailsConfig.windows.events.dllDriverLoad": "Chargement de la DLL et du pilote",
@@ -21152,21 +25458,17 @@
     "xpack.securitySolution.endpoint.policyList.onboardingDocsLink": "afficher la documentation Elastic Security",
     "xpack.securitySolution.endpoint.policyList.onboardingSectionOne": "Protégez vos hôtes grâce à la prévention des menaces, la détection et la visibilité des données en profondeur en toute sécurité.",
     "xpack.securitySolution.endpoint.policyList.onboardingSectionThree": "Pour commencer, ajoutez l'intégration Endpoint Security à vos agents. Pour en savoir plus, ",
+    "xpack.securitySolution.endpoint.policyList.onboardingSectionTwo.fromEndpointPage": "À partir de cette page, vous pourrez afficher et gérer les hôtes dans votre environnement exécutant Endpoint Security.",
+    "xpack.securitySolution.endpoint.policyList.onboardingSectionTwo.fromPolicyPage": "À partir de cette page, vous pourrez afficher et gérer les politiques d'intégration Endpoint Security dans votre environnement exécutant Endpoint Security.",
     "xpack.securitySolution.endpoint.policyList.onboardingTitle": "Débuter avec Endpoint Security",
     "xpack.securitySolution.endpoint.policyResponse.appliedOn": "Révision {rev} appliquée le {date}",
     "xpack.securitySolution.endpoint.policyResponse.backLinkTitle": "Détails de point de terminaison",
     "xpack.securitySolution.endpoint.policyResponse.title": "Réponse de politique",
-    "xpack.securitySolution.endpoint.resolver.compactBillions": "B",
-    "xpack.securitySolution.endpoint.resolver.compactMillions": "M",
-    "xpack.securitySolution.endpoint.resolver.compactOverflow": "+",
-    "xpack.securitySolution.endpoint.resolver.compactThousands": "k",
-    "xpack.securitySolution.endpoint.resolver.compactTrillions": "T",
     "xpack.securitySolution.endpoint.resolver.eitherLineageLimitExceeded": "Certains événements de processus dans la visualisation et la liste d'événements ci-dessous n'ont pas pu être affichés, car la limite de données a été atteinte.",
     "xpack.securitySolution.endpoint.resolver.elapsedTime": "{duration} {durationType}",
     "xpack.securitySolution.endpoint.resolver.errorProcess": "Processus d'erreur",
     "xpack.securitySolution.endpoint.resolver.loadingError": "Erreur lors du chargement des données.",
     "xpack.securitySolution.endpoint.resolver.loadingProcess": "Processus de chargement",
-    "xpack.securitySolution.endpoint.resolver.node.pillNumber": "{mantissa}{scale}{hasRemainder}",
     "xpack.securitySolution.endpoint.resolver.panel.error.error": "Erreur",
     "xpack.securitySolution.endpoint.resolver.panel.error.events": "Événements",
     "xpack.securitySolution.endpoint.resolver.panel.error.goBack": "Afficher tous les processus",
@@ -21174,7 +25476,7 @@
     "xpack.securitySolution.endpoint.resolver.panel.nodeEventsByType.errorSecondary": "Une erreur s'est produite lors de la récupération des événements.",
     "xpack.securitySolution.endpoint.resolver.panel.nodeEventsByType.loadMore": "Charger plus de données",
     "xpack.securitySolution.endpoint.resolver.panel.processDescList.events": "Événements",
-    "xpack.securitySolution.endpoint.resolver.panel.processDescList.numberOfEvents": "{relatedEventTotal} Events",
+    "xpack.securitySolution.endpoint.resolver.panel.processDescList.numberOfEvents": "{relatedEventTotal} événements",
     "xpack.securitySolution.endpoint.resolver.panel.processEventCounts.events": "Événements",
     "xpack.securitySolution.endpoint.resolver.panel.processEventListByType.events": "Événements",
     "xpack.securitySolution.endpoint.resolver.panel.relatedCounts.numberOfEventsInCrumb": "{totalCount} événements",
@@ -21201,28 +25503,41 @@
     "xpack.securitySolution.endpoint.resolver.terminatedProcess": "Processus arrêté",
     "xpack.securitySolution.endpoint.resolver.terminatedTrigger": "Déclenchement arrêté",
     "xpack.securitySolution.endpoint.takeAction.changeAlertStatus": "Modifier le statut de l'alerte",
+    "xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title": "Applications de confiance",
     "xpack.securitySolution.endpointDetails.activityLog": "Log d'activité",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.endOfLog": "Pas d'autre élément à afficher",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.failedEndpointIsolateAction": "n'a pas pu envoyer la requête : Isoler l'hôte",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.failedEndpointReleaseAction": "n'a pas pu envoyer la requête : Libérer l'hôte",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.isolated": "requête soumise : Isoler l'hôte",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.unisolated": "requête soumise : Libérer l'hôte",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.dateRangeMessage.title": "Rien à afficher pour la plage de dates sélectionnée, veuillez en sélectionner une autre et réessayer.",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.emptyState.body": "Aucune action n'a été enregistrée dans un log pour ce point de terminaison.",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.emptyState.title": "Aucune action enregistrée dans un log",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.isolationCompletedAndSuccessful": "Requête d'isolation de l'hôte effectuée par Endpoint",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.isolationCompletedAndUnsuccessful": "Requête d'isolation de l'hôte effectuée par Endpoint avec des erreurs",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.isolationFailed": "Requête d'isolation de l'hôte reçue par Endpoint avec des erreurs",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.isolationSuccessful": "Requête d'isolation de l'hôte reçue par Endpoint",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.unisolationCompletedAndSuccessful": "Requête de libération effectuée par Endpoint",
+    "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.unisolationCompletedAndUnsuccessful": "Requête de libération effectuée par Endpoint avec des erreurs",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.unisolationFailed": "Requête de libération de l'hôte reçue par Endpoint avec des erreurs",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.response.unisolationSuccessful": "Requête de libération de l'hôte reçue par Endpoint",
     "xpack.securitySolution.endpointDetails.activityLog.search": "Rechercher dans le log d'activité",
     "xpack.securitySolution.endpointDetails.overview": "Aperçu",
-    "xpack.securitySolution.endpointManagement.noPermissionsSubText": "Il semblerait que Fleet soit désactivé. Fleet doit être activé pour pouvoir utiliser cette fonctionnalité. Si vous ne disposez pas d'autorisations pour activer Fleet, contactez votre administrateur Kibana.",
+    "xpack.securitySolution.endpointManagement.noPermissionsSubText": "Vous devez disposer du rôle de superutilisateur pour utiliser cette fonctionnalité. Si vous ne disposez pas de ce rôle, ni d'autorisations pour modifier les rôles d'utilisateur, contactez votre administrateur Kibana.",
     "xpack.securitySolution.endpointManagemnet.noPermissionsText": "Vous ne disposez pas des autorisations Kibana requises pour utiliser Elastic Security Administration",
     "xpack.securitySolution.endpointsTab": "Points de terminaison",
     "xpack.securitySolution.enpdoint.resolver.panelutils.invaliddate": "Date non valide",
     "xpack.securitySolution.enpdoint.resolver.panelutils.noTimestampRetrieved": "Aucun horodatage récupéré",
     "xpack.securitySolution.event.module.linkToElasticEndpointSecurityDescription": "Ouvrir dans Endpoint Security",
+    "xpack.securitySolution.event.reason.reasonRendererTitle": "Outil de rendu d'événement : {eventRendererName} ",
     "xpack.securitySolution.eventDetails.blank": " ",
     "xpack.securitySolution.eventDetails.copyToClipboard": "Copier dans le Presse-papiers",
     "xpack.securitySolution.eventDetails.copyToClipboardTooltip": "Copier dans le Presse-papiers",
+    "xpack.securitySolution.eventDetails.ctiSummary.feedNamePreposition": "de",
+    "xpack.securitySolution.eventDetails.ctiSummary.indicatorEnrichmentTitle": "Correspondance de menace détectée",
     "xpack.securitySolution.eventDetails.ctiSummary.indicatorEnrichmentTooltipContent": "Cette valeur de champ correspond à un indicateur de Threat Intelligence avec une règle que vous avez créée.",
+    "xpack.securitySolution.eventDetails.ctiSummary.informationAriaLabel": "Informations",
+    "xpack.securitySolution.eventDetails.ctiSummary.investigationEnrichmentTitle": "Enrichi avec la Threat Intelligence",
     "xpack.securitySolution.eventDetails.ctiSummary.investigationEnrichmentTooltipContent": "Cette valeur de champ possède des informations supplémentaires disponibles provenant de sources de Threat Intelligence.",
     "xpack.securitySolution.eventDetails.description": "Description",
     "xpack.securitySolution.eventDetails.field": "Champ",
@@ -21235,9 +25550,12 @@
     "xpack.securitySolution.eventDetails.table": "Tableau",
     "xpack.securitySolution.eventDetails.table.actions": "Actions",
     "xpack.securitySolution.eventDetails.value": "Valeur",
+    "xpack.securitySolution.eventDetails.viewAllFields": "Afficher tous les champs dans le tableau",
     "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "Afficher la colonne {field}",
     "xpack.securitySolution.eventDetails.viewRuleDetailPage": "Afficher la page Détails de la règle",
     "xpack.securitySolution.eventFilter.form.creationSuccessToastTitle": "\"{name}\" a été ajouté à la liste de filtres d'événements.",
+    "xpack.securitySolution.eventFilter.form.description.label": "Décrivez votre filtre d'événement",
+    "xpack.securitySolution.eventFilter.form.description.placeholder": "Description",
     "xpack.securitySolution.eventFilter.form.failedToastTitle.create": "Une erreur est survenue lors de la création du nouveau filtre d'événement : \"{error}\"",
     "xpack.securitySolution.eventFilter.form.failedToastTitle.get": "Impossible de modifier le filtre d'événement : \"{error}\"",
     "xpack.securitySolution.eventFilter.form.failedToastTitle.update": "Une erreur est survenue lors de la mise à jour du filtre d'événement : \"{error}\"",
@@ -21247,23 +25565,39 @@
     "xpack.securitySolution.eventFilter.form.os.label": "Sélectionner un système d'exploitation",
     "xpack.securitySolution.eventFilter.form.rule.name": "Filtrage d'événement Endpoint",
     "xpack.securitySolution.eventFilter.form.updateSuccessToastTitle": "{name} a été mis à jour avec succès.",
-    "xpack.securitySolution.eventFilter.search.placeholder": "Rechercher sur les filtres ci-dessous : nom, commentaires, valeur",
+    "xpack.securitySolution.eventFilter.search.placeholder": "Rechercher sur les champs ci-dessous : nom, description, commentaires, valeur",
     "xpack.securitySolution.eventFilters.aboutInfo": "Ajouter un filtre d'événement pour exclure les volumes importants ou les événements non souhaités de l'écriture dans Elasticsearch.",
+    "xpack.securitySolution.eventFilters.commentsSectionDescription": "Ajouter un commentaire à votre filtre d'événement.",
+    "xpack.securitySolution.eventFilters.commentsSectionTitle": "Commentaires",
+    "xpack.securitySolution.eventFilters.criteriaSectionDescription": "Sélectionnez un système d'exploitation et ajoutez des conditions.",
+    "xpack.securitySolution.eventFilters.criteriaSectionTitle": "Conditions",
+    "xpack.securitySolution.eventFilters.deletionDialog.calloutMessage": "La suppression de cette entrée entraînera son retrait dans {count} {count, plural, one {politique associée} other {politiques associées}}.",
+    "xpack.securitySolution.eventFilters.deletionDialog.calloutTitle": "Avertissement",
     "xpack.securitySolution.eventFilters.deletionDialog.cancelButton": "Annuler",
-    "xpack.securitySolution.eventFilters.deletionDialog.confirmButton": "Retirer le filtre d'événement",
-    "xpack.securitySolution.eventFilters.deletionDialog.deleteFailure": "Impossible de retirer \"{name}\" de la liste Filtres d'événements. Raison : {message}",
-    "xpack.securitySolution.eventFilters.deletionDialog.deleteSuccess": "\"{name}\" a été retiré de la liste Filtres d'événements.",
-    "xpack.securitySolution.eventFilters.deletionDialog.subMessage": "Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
+    "xpack.securitySolution.eventFilters.deletionDialog.confirmButton": "Supprimer",
+    "xpack.securitySolution.eventFilters.deletionDialog.deleteFailure": "Impossible de retirer \"{name}\" de la liste de filtres d'événements. Raison : {message}",
+    "xpack.securitySolution.eventFilters.deletionDialog.deleteSuccess": "\"{name}\" a été retiré de la liste de filtres d'événements.",
+    "xpack.securitySolution.eventFilters.deletionDialog.subMessage": "Cette action ne peut pas être annulée. Voulez-vous vraiment continuer ?",
+    "xpack.securitySolution.eventFilters.deletionDialog.title": "Supprimer \"{name}\"",
+    "xpack.securitySolution.eventFilters.detailsSectionTitle": "Détails",
+    "xpack.securitySolution.eventFilters.docsLink": "Documentation relative aux filtres d'événements.",
     "xpack.securitySolution.eventFilters.eventFiltersFlyout.actions.cancel": "Annuler",
     "xpack.securitySolution.eventFilters.eventFiltersFlyout.actions.confirm.create": "Ajouter un filtre d'événement",
-    "xpack.securitySolution.eventFilters.eventFiltersFlyout.actions.confirm.update": "Mettre à jour le filtre d'événement",
+    "xpack.securitySolution.eventFilters.eventFiltersFlyout.actions.confirm.update": "Enregistrer",
+    "xpack.securitySolution.eventFilters.eventFiltersFlyout.actions.confirm.update.withData": "Ajouter un filtre d'événement de point de terminaison",
     "xpack.securitySolution.eventFilters.eventFiltersFlyout.subtitle.create": "Ajouter un filtre d'événement",
+    "xpack.securitySolution.eventFilters.eventFiltersFlyout.subtitle.create.withData": "Endpoint Security",
     "xpack.securitySolution.eventFilters.eventFiltersFlyout.subtitle.update": "Mettre à jour le filtre d'événement",
+    "xpack.securitySolution.eventFilters.eventFiltersFlyout.title.create.withData": "Ajouter un filtre d'événement de point de terminaison",
+    "xpack.securitySolution.eventFilters.expiredLicenseMessage": "Votre licence Kibana est passée à une version inférieure. Les futures configurations de politiques seront désormais globalement affectées à toutes les politiques. Pour en savoir plus, consultez notre ",
+    "xpack.securitySolution.eventFilters.expiredLicenseTitle": "Licence expirée",
+    "xpack.securitySolution.eventFilters.list.cardAction.delete": "Supprimer le filtre d'événement",
+    "xpack.securitySolution.eventFilters.list.cardAction.edit": "Modifier le filtre d'événement",
     "xpack.securitySolution.eventFilters.list.pageAddButton": "Ajouter un filtre d'événement",
     "xpack.securitySolution.eventFilters.list.pageTitle": "Filtres d'événements",
     "xpack.securitySolution.eventFilters.list.totalCount": "Affichage de {total, plural, one {# filtre d'événement} other {# filtres d'événements}}",
     "xpack.securitySolution.eventFilters.listEmpty.addButton": "Ajouter un filtre d'événement",
-    "xpack.securitySolution.eventFilters.listEmpty.message": "Aucun filtre d'événement n'est actuellement présent sur votre point de terminaison.",
+    "xpack.securitySolution.eventFilters.listEmpty.message": "Ajouter un filtre d'événement pour exclure les volumes importants ou les événements non souhaités de l'écriture dans Elasticsearch.",
     "xpack.securitySolution.eventFilters.listEmpty.title": "Ajouter votre premier filtre d'événement",
     "xpack.securitySolution.eventFiltersTab": "Filtres d'événements",
     "xpack.securitySolution.eventRenderers.alertsDescription": "Les alertes sont affichées lorsqu'un malware ou ransomware est bloqué ou détecté",
@@ -21311,6 +25645,7 @@
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.methodTitle": "Méthode",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.reasonTitle": "Raison",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.riskScoreTitle": "Score de risque",
+    "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.ruleDescriptionTitle": "Description de la règle",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.ruleNameTitle": "Nom de règle",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.ruleTitle": "Règle",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.severityTitle": "Sévérité",
@@ -21320,6 +25655,8 @@
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.thresholdTerms": "Termes de seuil",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.triggeredTitle": "Déclenché",
     "xpack.securitySolution.eventsViewer.alerts.defaultHeaders.versionTitle": "Version",
+    "xpack.securitySolution.eventsViewer.alerts.overview.changeAlertStatus": "Modifier le statut de l'alerte",
+    "xpack.securitySolution.eventsViewer.alerts.overview.clickToChangeAlertStatus": "Cliquer pour modifier le statut de l'alerte",
     "xpack.securitySolution.eventsViewer.alerts.overviewTable.signalStatusTitle": "Statut",
     "xpack.securitySolution.eventsViewer.errorFetchingEventsData": "Impossible d'interroger les données d'événements",
     "xpack.securitySolution.eventsViewer.eventsLabel": "Événements",
@@ -21339,6 +25676,7 @@
     "xpack.securitySolution.exceptions.addException.sequenceWarning": "La requête de cette règle contient une instruction de séquence EQL. L'exception créée s'appliquera à tous les événements de la séquence.",
     "xpack.securitySolution.exceptions.addException.success": "Exception ajoutée avec succès",
     "xpack.securitySolution.exceptions.andDescription": "AND",
+    "xpack.securitySolution.exceptions.badge.readOnly.tooltip": "Impossible de créer, de modifier ou de supprimer des exceptions",
     "xpack.securitySolution.exceptions.cancelLabel": "Annuler",
     "xpack.securitySolution.exceptions.clearExceptionsLabel": "Retirer la liste d'exceptions",
     "xpack.securitySolution.exceptions.commentEventLabel": "a ajouté un commentaire",
@@ -21367,6 +25705,7 @@
     "xpack.securitySolution.exceptions.endpointListLabel": "Liste de points de terminaison",
     "xpack.securitySolution.exceptions.errorLabel": "Erreur",
     "xpack.securitySolution.exceptions.exceptionsPaginationLabel": "Éléments par page : {items}",
+    "xpack.securitySolution.exceptions.failedLoadPolicies": "Une erreur s'est produite lors du chargement des politiques : \"{error}\"",
     "xpack.securitySolution.exceptions.fetch404Error": "La liste d'exceptions associée ({listId}) n'existe plus. Veuillez retirer la liste d'exceptions manquante pour ajouter des exceptions supplémentaires à la règle de détection.",
     "xpack.securitySolution.exceptions.fetchError": "Erreur lors de la récupération de la liste d'exceptions",
     "xpack.securitySolution.exceptions.fieldDescription": "Champ",
@@ -21411,21 +25750,44 @@
     "xpack.securitySolution.exceptions.viewer.noSearchResultsPromptBody": "Aucun résultat n'a été trouvé pour la recherche.",
     "xpack.securitySolution.exceptions.viewer.searchDefaultPlaceholder": "Champ de recherche (ex : host.name)",
     "xpack.securitySolution.exitFullScreenButton": "Quitter le plein écran",
+    "xpack.securitySolution.expandedValue.hideTopValues.HideTopValues": "Masquer les valeurs les plus élevées",
+    "xpack.securitySolution.expandedValue.links.expandIpDetails": "Développer les détails d'IP",
+    "xpack.securitySolution.expandedValue.links.viewEventReference": "Afficher la référence de l'événement",
+    "xpack.securitySolution.expandedValue.links.viewHostSummary": "Afficher le résumé de l'hôte",
+    "xpack.securitySolution.expandedValue.links.viewIndicatorReference": "Afficher la référence de l'indicateur",
+    "xpack.securitySolution.expandedValue.links.viewPortDetails": "Afficher les détails du port",
+    "xpack.securitySolution.expandedValue.links.viewRuleDetails": "Afficher les détails de la règle",
+    "xpack.securitySolution.expandedValue.links.viewRuleReference": "Afficher la référence de la règle",
+    "xpack.securitySolution.expandedValue.links.viewUserSummary": "Afficher le résumé de l'utilisateur",
+    "xpack.securitySolution.expandedValue.showTopN.showTopValues": "Afficher les valeurs les plus élevées",
     "xpack.securitySolution.featureCatalogueDescription": "Prévenez, collectez, détectez et traitez les menaces pour une protection unifiée dans toute votre infrastructure.",
+    "xpack.securitySolution.featureRegistry.linkSecuritySolutionCaseTitle": "Cas",
     "xpack.securitySolution.featureRegistry.linkSecuritySolutionTitle": "Sécurité",
     "xpack.securitySolution.featureRegistry.manageAlertsName": "Alertes",
     "xpack.securitySolution.featureRegistry.subfeature.alertsAllName": "Tous",
     "xpack.securitySolution.featureRegistry.subfeature.alertsReadName": "Lire",
+    "xpack.securitySolution.fieldBrowser.actionsLabel": "Actions",
+    "xpack.securitySolution.fieldBrowser.categoryLabel": "Catégorie",
+    "xpack.securitySolution.fieldBrowser.createFieldButton": "Créer un champ",
+    "xpack.securitySolution.fieldBrowser.descriptionForScreenReaderOnly": "Description pour le champ {field} :",
+    "xpack.securitySolution.fieldBrowser.descriptionLabel": "Description",
+    "xpack.securitySolution.fieldBrowser.editButton": "Modifier",
+    "xpack.securitySolution.fieldBrowser.editButtonDescription": "Modifier le champ de temps d'exécution",
+    "xpack.securitySolution.fieldBrowser.fieldName": "Nom",
+    "xpack.securitySolution.fieldBrowser.removeButton": "Supprimer",
+    "xpack.securitySolution.fieldBrowser.removeButtonDescription": "Supprimer un champ de temps d'exécution",
+    "xpack.securitySolution.fieldBrowser.runtimeLabel": "Temps d’exécution",
+    "xpack.securitySolution.fieldBrowser.runtimeTitle": "Champ de temps d'exécution",
     "xpack.securitySolution.fieldNameIcons.booleanAriaLabel": "Champ booléen",
     "xpack.securitySolution.fieldNameIcons.conflictFieldAriaLabel": "Champ conflictuel",
     "xpack.securitySolution.fieldNameIcons.dateFieldAriaLabel": "Champ de date",
     "xpack.securitySolution.fieldNameIcons.geoPointFieldAriaLabel": "Champ de point géographique",
     "xpack.securitySolution.fieldNameIcons.geoShapeFieldAriaLabel": "Champ de forme géométrique",
-    "xpack.securitySolution.fieldNameIcons.ipAddressFieldAriaLabel": "Champ de l'adresse IP",
+    "xpack.securitySolution.fieldNameIcons.ipAddressFieldAriaLabel": "Champ d'adresse IP",
     "xpack.securitySolution.fieldNameIcons.murmur3FieldAriaLabel": "Champ Murmur3",
     "xpack.securitySolution.fieldNameIcons.nestedFieldAriaLabel": "Champ imbriqué",
-    "xpack.securitySolution.fieldNameIcons.numberFieldAriaLabel": "Champ du numéro",
-    "xpack.securitySolution.fieldNameIcons.sourceFieldAriaLabel": "Champ de source",
+    "xpack.securitySolution.fieldNameIcons.numberFieldAriaLabel": "Champ numérique",
+    "xpack.securitySolution.fieldNameIcons.sourceFieldAriaLabel": "Champ source",
     "xpack.securitySolution.fieldNameIcons.stringFieldAriaLabel": "Champ de chaîne",
     "xpack.securitySolution.fieldNameIcons.unknownFieldAriaLabel": "Champ inconnu",
     "xpack.securitySolution.fieldRenderers.moreLabel": "Plus",
@@ -21437,6 +25799,7 @@
     "xpack.securitySolution.flyout.button.timeline": "chronologie",
     "xpack.securitySolution.footer.autoRefreshActiveDescription": "Actualisation automatique active",
     "xpack.securitySolution.footer.autoRefreshActiveTooltip": "Lorsque l'actualisation automatique est activée, la chronologie vous montrera les {numberOfItems} derniers événements correspondant à votre recherche.",
+    "xpack.securitySolution.footer.cancel": "Annuler",
     "xpack.securitySolution.footer.data": "données",
     "xpack.securitySolution.footer.events": "Événements",
     "xpack.securitySolution.footer.live": "Live",
@@ -21457,7 +25820,8 @@
     "xpack.securitySolution.formattedDuration.tooltipLabel": "brut",
     "xpack.securitySolution.getCurrentUser.Error": "Erreur lors de l'obtention de l'utilisateur",
     "xpack.securitySolution.getCurrentUser.unknownUser": "Inconnu",
-    "xpack.securitySolution.globalHeader.buttonAddData": "Ajouter des données",
+    "xpack.securitySolution.globalHeader.buttonAddData": "Ajouter des intégrations",
+    "xpack.securitySolution.goToDocumentationButton": "Afficher la documentation",
     "xpack.securitySolution.header.editableTitle.cancel": "Annuler",
     "xpack.securitySolution.header.editableTitle.editButtonAria": "Vous pouvez modifier {title} en cliquant",
     "xpack.securitySolution.header.editableTitle.save": "Enregistrer",
@@ -21474,6 +25838,8 @@
     "xpack.securitySolution.host.details.overview.cloudProviderTitle": "Fournisseur cloud",
     "xpack.securitySolution.host.details.overview.familyTitle": "Famille",
     "xpack.securitySolution.host.details.overview.hostIdTitle": "ID de l'hôte",
+    "xpack.securitySolution.host.details.overview.hostRiskClassification": "Classification de risque de l'hôte",
+    "xpack.securitySolution.host.details.overview.hostRiskScoreTitle": "Score de risque de l'hôte",
     "xpack.securitySolution.host.details.overview.inspectTitle": "Aperçu de l'hôte",
     "xpack.securitySolution.host.details.overview.instanceIdTitle": "ID de l'instance",
     "xpack.securitySolution.host.details.overview.ipAddressesTitle": "Adresses IP",
@@ -21485,8 +25851,43 @@
     "xpack.securitySolution.host.details.overview.regionTitle": "Région",
     "xpack.securitySolution.host.details.versionLabel": "Version",
     "xpack.securitySolution.hostIsolation.agentStatuses.empty": "-",
+    "xpack.securitySolution.hostIsolationExceptions.form.conditions.subtitle": "Les exceptions d'isolation de l'hôte s'appliqueront à tous les systèmes d'exploitation.",
+    "xpack.securitySolution.hostIsolationExceptions.form.conditions.title": "Conditions",
+    "xpack.securitySolution.hostIsolationExceptions.form.creationSuccessToastTitle": "\"{name}\" a été ajouté à la liste d'exceptions d'isolation de l'hôte.",
+    "xpack.securitySolution.hostIsolationExceptions.form.description": "Permet aux hôtes isolés de se connecter à ces adresses IP. Accepte uniquement IPv4 avec CIDR facultatif.",
+    "xpack.securitySolution.hostIsolationExceptions.form.description.label": "Description",
+    "xpack.securitySolution.hostIsolationExceptions.form.description.placeholder": "Décrire votre exception d'isolation de l'hôte",
+    "xpack.securitySolution.hostIsolationExceptions.form.editingSuccessToastTitle": "\"{name}\" a été mis à jour.",
+    "xpack.securitySolution.hostIsolationExceptions.form.failedToastTitle.create": "Une erreur est survenue lors de la création de l'exception : \"{error}\"",
+    "xpack.securitySolution.hostIsolationExceptions.form.failedToastTitle.get": "Impossible de modifier l'exception : \"{error}\"",
+    "xpack.securitySolution.hostIsolationExceptions.form.failedToastTitle.update": "Une erreur est survenue lors de la mise à jour de l'exception : \"{error}\"",
+    "xpack.securitySolution.hostIsolationExceptions.form.ip.error": "L'IP n'est pas valide. Seul IPv4 avec CIDR facultatif est pris en charge",
+    "xpack.securitySolution.hostIsolationExceptions.form.ip.label": "Entrer l'adresse IP",
+    "xpack.securitySolution.hostIsolationExceptions.form.ip.placeholder": "Ex 0.0.0.0/24",
+    "xpack.securitySolution.hostIsolationExceptions.form.name.error": "Le nom doit être renseigné",
+    "xpack.securitySolution.hostIsolationExceptions.form.name.label": "Nommer vos exceptions d'isolation de l'hôte",
+    "xpack.securitySolution.hostIsolationExceptions.form.name.placeholder": "Nom de l'exception d'isolation de l'hôte",
+    "xpack.securitySolution.hostIsolationExceptions.form.title": "Détails",
+    "xpack.securitySolution.hostIsolationExceptions.list.action.delete": "Supprimer l'exception",
+    "xpack.securitySolution.hostIsolationExceptions.list.action.edit": "Modifier l'exception",
     "xpack.securitySolution.hostOverview.errorSearchDescription": "Une erreur s'est produite sur la recherche de l'aperçu de l'hôte",
     "xpack.securitySolution.hostOverview.failSearchDescription": "Impossible de lancer une recherche sur l'aperçu de l'hôte",
+    "xpack.securitySolution.hosts.hostRiskInformation.buttonLabel": "Comment le score de risque est-il calculé ?",
+    "xpack.securitySolution.hosts.hostRiskInformation.classificationHeader": "Classification",
+    "xpack.securitySolution.hosts.hostRiskInformation.closeBtn": "Fermer",
+    "xpack.securitySolution.hosts.hostRiskInformation.criticalRiskDescription": "90 et supérieur",
+    "xpack.securitySolution.hosts.hostRiskInformation.explanation": "Cette fonctionnalité utilise une transformation, avec une agrégation scriptée personnalisée pour calculer les scores de risque de l'hôte en fonction des alertes de règle de détection ayant le statut \"ouvert\", sur une fenêtre temporelle de 5 jours. La transformation s'exécute toutes les heures afin que le score reste à jour au moment où de nouvelles alertes de règles de détection sont transmises.",
+    "xpack.securitySolution.hosts.hostRiskInformation.informationAriaLabel": "Informations",
+    "xpack.securitySolution.hosts.hostRiskInformation.introduction": "La fonctionnalité de score de risque de l'hôte détecte les hôtes à risque depuis l'intérieur de votre environnement.",
+    "xpack.securitySolution.hosts.hostRiskInformation.learnMore": "Pour en savoir plus sur le risque de l'hôte, cliquez {hostsRiskScoreDocumentationLink}",
+    "xpack.securitySolution.hosts.hostRiskInformation.link": "ici",
+    "xpack.securitySolution.hosts.hostRiskInformation.riskHeader": "Plage de scores de risque de l'hôte",
+    "xpack.securitySolution.hosts.hostRiskInformation.title": "Comment le risque de l'hôte est-il calculé ?",
+    "xpack.securitySolution.hosts.hostRiskInformation.unknownRiskDescription": "Inférieur à 20",
+    "xpack.securitySolution.hosts.hostScoreOverTime.riskScore": "Score de risque",
+    "xpack.securitySolution.hosts.hostScoreOverTime.riskyLabel": "À risque",
+    "xpack.securitySolution.hosts.hostScoreOverTime.riskyThresholdHeader": "Seuil du niveau À risque",
+    "xpack.securitySolution.hosts.hostScoreOverTime.title": "Score de risque de l'hôte sur la durée",
     "xpack.securitySolution.hosts.kqlPlaceholder": "par ex. hôte.nom : \"foo\"",
     "xpack.securitySolution.hosts.navigation.alertsTitle": "Alertes externes",
     "xpack.securitySolution.hosts.navigation.allHostsTitle": "Tous les hôtes",
@@ -21494,43 +25895,105 @@
     "xpack.securitySolution.hosts.navigation.authenticationsTitle": "Authentifications",
     "xpack.securitySolution.hosts.navigation.dns.histogram.errorFetchingDnsData": "Impossible d'interroger les données DNS",
     "xpack.securitySolution.hosts.navigation.eventsTitle": "Événements",
+    "xpack.securitySolution.hosts.navigation.hostRisk": "Hôtes par risque",
+    "xpack.securitySolution.hosts.navigation.sessionsTitle": "Sessions",
     "xpack.securitySolution.hosts.navigation.uncommonProcessesTitle": "Processus inhabituels",
+    "xpack.securitySolution.hosts.navigaton.eventsUnit": "{totalCount, plural, =1 {événement} other {événements}}",
+    "xpack.securitySolution.hosts.navigaton.hostRisk.viewDashboardButtonLabel": "Afficher le tableau de bord de la source",
     "xpack.securitySolution.hosts.navigaton.matrixHistogram.errorFetchingAuthenticationsData": "Impossible d'interroger les données d'authentifications",
     "xpack.securitySolution.hosts.navigaton.matrixHistogram.errorFetchingEventsData": "Impossible d'interroger les données d'événements",
     "xpack.securitySolution.hosts.pageTitle": "Hôtes",
+    "xpack.securitySolution.hosts.topRiskScoreContributors.rankColumnTitle": "Rang",
+    "xpack.securitySolution.hosts.topRiskScoreContributors.ruleNameColumnTitle": "Nom de règle",
+    "xpack.securitySolution.hosts.topRiskScoreContributors.title": "Principaux contributeurs de score de risque",
     "xpack.securitySolution.hostsKpiAuthentications.errorSearchDescription": "Une erreur s'est produite lors de la recherche d'authentifications du KPI des hôtes",
     "xpack.securitySolution.hostsKpiAuthentications.failSearchDescription": "Impossible de lancer une recherche sur les authentifications du KPI des hôtes",
     "xpack.securitySolution.hostsKpiHosts.errorSearchDescription": "Une erreur s'est produite lors de la recherche du KPI des hôtes",
     "xpack.securitySolution.hostsKpiHosts.failSearchDescription": "Impossible de lancer une recherche sur le KPI des hôtes",
     "xpack.securitySolution.hostsKpiUniqueIps.errorSearchDescription": "Une erreur s'est produite lors de la recherche des IP uniques du KPI des hôtes",
     "xpack.securitySolution.hostsKpiUniqueIps.failSearchDescription": "Impossible de lancer une recherche sur les IP uniques du KPI des hôtes",
+    "xpack.securitySolution.hostsRiskTable.filteredHostsTitle": "Afficher les hôtes à risque {severity}",
+    "xpack.securitySolution.hostsRiskTable.hostNameTitle": "Nom d'hôte",
+    "xpack.securitySolution.hostsRiskTable.hostRiskScoreTitle": "Score de risque de l'hôte",
+    "xpack.securitySolution.hostsRiskTable.hostRiskToolTip": "La classification des risques de l'hôte est déterminée par score de risque de l'hôte. Les hôtes classés comme étant Critique ou Élevé sont indiqués comme étant \"à risque\".",
+    "xpack.securitySolution.hostsRiskTable.hostsTableTitle": "Le tableau des risques de l'hôte n'est pas affecté par la plage temporelle KQL. Ce tableau montre le dernier score de risque enregistré pour chaque hôte.",
+    "xpack.securitySolution.hostsRiskTable.hostsTitle": "Hôtes par risque",
+    "xpack.securitySolution.hostsRiskTable.riskTitle": "Classification de risque de l'hôte",
+    "xpack.securitySolution.hostsRiskTable.tableTitle": "Risque de l'hôte",
+    "xpack.securitySolution.hostsRiskTable.usersTableTitle": "Le tableau des risques de l'utilisateur n'est pas affecté par la plage temporelle KQL. Ce tableau montre le dernier score de risque enregistré pour chaque utilisateur.",
     "xpack.securitySolution.hostsTable.firstLastSeenToolTip": "Par rapport à la plage de dates sélectionnée",
+    "xpack.securitySolution.hostsTable.hostRiskTitle": "Classification de risque de l'hôte",
+    "xpack.securitySolution.hostsTable.hostRiskToolTip": "La classification des risques de l'hôte est déterminée par score de risque de l'hôte. Les hôtes classés comme étant Critique ou Élevé sont indiqués comme étant \"à risque\".",
     "xpack.securitySolution.hostsTable.hostsTitle": "Tous les hôtes",
     "xpack.securitySolution.hostsTable.lastSeenTitle": "Vu en dernier",
-    "xpack.securitySolution.hostsTable.nameTitle": "Nom de l'hôte",
+    "xpack.securitySolution.hostsTable.nameTitle": "Nom d'hôte",
+    "xpack.securitySolution.hostsTable.osLastSeenToolTip": "Dernier système d'exploitation observé",
     "xpack.securitySolution.hostsTable.osTitle": "Système d'exploitation",
     "xpack.securitySolution.hostsTable.rows": "{numRows} {numRows, plural, =0 {ligne} =1 {ligne} other {lignes}}",
     "xpack.securitySolution.hostsTable.unit": "{totalCount, plural, =1 {hôte} other {hôtes}}",
     "xpack.securitySolution.hostsTable.versionTitle": "Version",
     "xpack.securitySolution.hoverActions.showTopTooltip": "Afficher les premiers {fieldName}",
+    "xpack.securitySolution.indexPatterns.add": "Ajouter un modèle d'indexation",
+    "xpack.securitySolution.indexPatterns.advancedOptionsTitle": "Options avancées",
+    "xpack.securitySolution.indexPatterns.alertsBadgeTitle": "Alertes",
+    "xpack.securitySolution.indexPatterns.callOutDeprecxatedTemplateTitle": "Ce modèle de chronologie utilise un sélecteur de vue de données existant",
+    "xpack.securitySolution.indexPatterns.callOutDeprecxatedTitle": "Cette chronologie utilise un sélecteur de vue de données existant",
+    "xpack.securitySolution.indexPatterns.callOutMissingPatternsTemplateTitle": "Ce modèle de chronologie n'est pas à jour avec la vue de données Security",
+    "xpack.securitySolution.indexPatterns.callOutMissingPatternsTitle": "Cette chronologie n'est pas à jour avec la vue de données Security",
+    "xpack.securitySolution.indexPatterns.callOutTimelineTitle": "La vue de données ne peut pas être modifiée lorsque l'option Afficher uniquement les alertes de détection est sélectionnée",
+    "xpack.securitySolution.indexPatterns.callOutTitle": "La vue de données ne peut pas être modifiée sur cette page",
+    "xpack.securitySolution.indexPatterns.chooseDataViewLabel": "Choisir une vue de données",
+    "xpack.securitySolution.indexPatterns.closeButton": "Fermer",
+    "xpack.securitySolution.indexPatterns.continue": "Continuer sans ajouter",
+    "xpack.securitySolution.indexPatterns.dataViewLabel": "Vue de données",
+    "xpack.securitySolution.indexPatterns.descriptionsLabel": "Il s'agit des modèles d'indexation actuellement sélectionnés. Le filtrage des modèles d'indexation à partir de votre vue de données peut améliorer les performances globales.",
     "xpack.securitySolution.indexPatterns.disabled": "Des modèles d'indexation désactivés sont recommandés sur cette page, mais ils doivent d'abord être configurés dans vos paramètres de modèle d'indexation Kibana",
+    "xpack.securitySolution.indexPatterns.failureToastText": "Une erreur inattendue s'est produite lors de la mise à jour. Si vous souhaitez modifier vos données, vous pouvez sélectionner manuellement une vue de données {link}.",
+    "xpack.securitySolution.indexPatterns.failureToastTitle": "Impossible de mettre à jour la vue de données",
+    "xpack.securitySolution.indexPatterns.inactive": "Modèles d'indexation inactifs",
+    "xpack.securitySolution.indexPatterns.indexPatternsLabel": "Modèles d'indexation",
+    "xpack.securitySolution.indexPatterns.missingPatterns": "La vue de données Security ne contient pas les modèles d'indexation suivants nécessaires pour recréer la vue de données de la chronologie précédente : {callout}",
+    "xpack.securitySolution.indexPatterns.missingPatterns.callout": "La vue de données Security ne contient pas les modèles d'indexation suivants : {callout}",
+    "xpack.securitySolution.indexPatterns.modifiedBadgeTitle": "Modifié",
+    "xpack.securitySolution.indexPatterns.noData": "Le modèle d'indexation de cette chronologie ne correspond à aucun flux de données, index ni alias d'index.",
+    "xpack.securitySolution.indexPatterns.onlyDetectionAlertsLabel": "Afficher uniquement les alertes de détection",
     "xpack.securitySolution.indexPatterns.pickIndexPatternsCombo": "Choisir les modèles d'indexation",
+    "xpack.securitySolution.indexPatterns.reloadPageTitle": "Actualiser la page",
     "xpack.securitySolution.indexPatterns.resetButton": "Réinitialiser",
     "xpack.securitySolution.indexPatterns.save": "Enregistrer",
+    "xpack.securitySolution.indexPatterns.securityDataViewLabel": "Vue de données Security",
+    "xpack.securitySolution.indexPatterns.securityDefaultDataViewLabel": "Vue de données Security par défaut",
+    "xpack.securitySolution.indexPatterns.selectDataView": "Sélection de la vue de données",
+    "xpack.securitySolution.indexPatterns.successToastTitle": "Un ou plusieurs paramètres nécessitent l'actualisation de la page pour pouvoir prendre effet",
+    "xpack.securitySolution.indexPatterns.toggleToNewSourcerer.link": "ici",
+    "xpack.securitySolution.indexPatterns.update": "Mettre à jour et recréer la vue de données",
+    "xpack.securitySolution.indexPatterns.updateAvailableBadgeTitle": "Mise à jour disponible",
+    "xpack.securitySolution.indexPatterns.updateDataView": "Souhaitez-vous ajouter ce modèle d'indexation à la vue de données Security ? Sinon, nous pouvons recréer la vue de données sans les modèles d'indexation manquants.",
+    "xpack.securitySolution.indexPatterns.updateSecurityDataView": "Mettre à jour la vue de données Security",
     "xpack.securitySolution.insert.timeline.insertTimelineButton": "Insérer un lien de chronologie",
     "xpack.securitySolution.inspect.modal.closeTitle": "Fermer",
     "xpack.securitySolution.inspect.modal.indexPatternDescription": "Modèle d'indexation qui se connecte aux index Elasticsearch. Ces index peuvent être configurés dans Kibana > Paramètres avancés.",
     "xpack.securitySolution.inspect.modal.indexPatternLabel": "Modèle d'indexation",
     "xpack.securitySolution.inspect.modal.noAlertIndexFound": "Aucun index d'alerte n'a été trouvé",
-    "xpack.securitySolution.inspect.modal.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la demande ou l'analyser dans le navigateur.",
+    "xpack.securitySolution.inspect.modal.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la requête ni l'analyser dans le navigateur.",
     "xpack.securitySolution.inspect.modal.queryTimeLabel": "Heure de la requête",
     "xpack.securitySolution.inspect.modal.reqTimestampDescription": "Heure à laquelle le début de la requête a été enregistré",
     "xpack.securitySolution.inspect.modal.reqTimestampLabel": "Horodatage de la requête",
     "xpack.securitySolution.inspect.modal.somethingWentWrongDescription": "Désolé, un problème est survenu.",
     "xpack.securitySolution.inspectDescription": "Inspecter",
+    "xpack.securitySolution.inspectPatternDifferent": "Cet élément possède un modèle d'indexation unique séparé du paramètre de vue de données.",
+    "xpack.securitySolution.inspectPatternExcludeLogs": "Lorsque le modèle d'indexation logs-* est sélectionné, les logs Elastic Cloud sont exclus de la recherche.",
     "xpack.securitySolution.investigationEnrichment.requestError": "Une erreur est survenue lors de la demande de Threat Intelligence",
     "xpack.securitySolution.ja3.fingerprint.ja3.fingerprintLabel": "ja3",
+    "xpack.securitySolution.kpiHost.enableHostRiskText": "Activer le module de risque de l'hôte pour afficher davantage de données",
+    "xpack.securitySolution.kpiHost.hostRiskData": "données de risque de l'hôte",
+    "xpack.securitySolution.kpiHost.learnMore": "Découvrez",
     "xpack.securitySolution.kpiHosts.hosts.title": "Hôtes",
+    "xpack.securitySolution.kpiHosts.riskyHosts.description": "{formattedQuantity} {quantity, plural, =1 {hôte} other {hôtes}} à risque",
+    "xpack.securitySolution.kpiHosts.riskyHosts.errorMessage": "Erreur lors de la récupération de l'API d'hôtes à risque",
+    "xpack.securitySolution.kpiHosts.riskyHosts.hostsCount": "{quantity} {quantity, plural, =1 {hôte} other {hôtes}}",
+    "xpack.securitySolution.kpiHosts.riskyHosts.inspectTitle": "Hôtes à risque",
+    "xpack.securitySolution.kpiHosts.riskyHosts.title": "Hôtes à risque",
     "xpack.securitySolution.kpiHosts.uniqueIps.destinationChartLabel": "Dest.",
     "xpack.securitySolution.kpiHosts.uniqueIps.destinationUnitLabel": "destination",
     "xpack.securitySolution.kpiHosts.uniqueIps.sourceChartLabel": "Src.",
@@ -21550,6 +26013,8 @@
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.sourceChartLabel": "Src.",
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.sourceUnitLabel": "source",
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.title": "IP privés uniques",
+    "xpack.securitySolution.kpiUsers.totalUsers.errorSearchDescription": "Une erreur s'est produite sur la recherche du KPI du total des utilisateurs",
+    "xpack.securitySolution.kpiUsers.totalUsers.title": "Utilisateurs",
     "xpack.securitySolution.lastEventTime.errorSearchDescription": "Une erreur s'est produite sur la recherche de dernière heure de l'événement",
     "xpack.securitySolution.lastEventTime.failSearchDescription": "Impossible de lancer une recherche sur la dernière heure de l'événement",
     "xpack.securitySolution.licensing.unsupportedMachineLearningMessage": "Votre licence ne prend pas en charge le Machine Learning. Veuillez mettre votre licence à niveau.",
@@ -21591,10 +26056,12 @@
     "xpack.securitySolution.management.policiesSelector.unassignedEntries": "Entrées non affectées",
     "xpack.securitySolution.management.search.button": "Actualiser",
     "xpack.securitySolution.markdownEditor.markdownInputHelp": "Aide pour la syntaxe Markdown",
+    "xpack.securitySolution.markdownEditor.plugins.timeline.failedRetrieveTimelineErrorMsg": "Impossible de récupérer l'ID de chronologie : { timelineId }",
     "xpack.securitySolution.markdownEditor.plugins.timeline.insertTimelineButtonLabel": "Insérer un lien de chronologie",
     "xpack.securitySolution.markdownEditor.plugins.timeline.noParenthesesErrorMsg": "Parenthèses gauches attendues",
     "xpack.securitySolution.markdownEditor.plugins.timeline.noTimelineIdFoundErrorMsg": "Aucun ID de chronologie n'a été trouvé",
     "xpack.securitySolution.markdownEditor.plugins.timeline.noTimelineNameFoundErrorMsg": "Aucun nom de chronologie n'a été trouvé",
+    "xpack.securitySolution.markdownEditor.plugins.timeline.timelineErrorTitle": "Erreur de chronologie",
     "xpack.securitySolution.markdownEditor.plugins.timeline.toolTip.timelineId": "ID de chronologie : { timelineId }",
     "xpack.securitySolution.markdownEditor.plugins.timeline.toolTip.timelineUrlIsNotValidErrorMsg": "L'URL de chronologie n'est pas valide => {timelineUrl}",
     "xpack.securitySolution.markdownEditor.preview": "Aperçu",
@@ -21614,15 +26081,20 @@
     "xpack.securitySolution.ml.table.networkNameTitle": "IP réseau",
     "xpack.securitySolution.ml.table.scoreTitle": "Score d'anomalie",
     "xpack.securitySolution.ml.table.timestampTitle": "Horodatage",
+    "xpack.securitySolution.ml.table.userNameTitle": "Nom d'utilisateur",
     "xpack.securitySolution.modalAllErrors.close.button": "Fermer",
     "xpack.securitySolution.modalAllErrors.seeAllErrors.button": "Voir l'erreur ou les erreurs entières",
     "xpack.securitySolution.modalAllErrors.title": "Votre visualisation comporte une ou plusieurs erreurs",
     "xpack.securitySolution.navigation.administration": "Administration",
+    "xpack.securitySolution.navigation.administration.policies": "Politiques",
     "xpack.securitySolution.navigation.alerts": "Alertes",
+    "xpack.securitySolution.navigation.blocklist": "Liste noire",
     "xpack.securitySolution.navigation.case": "Cas",
     "xpack.securitySolution.navigation.detect": "Détecter",
-    "xpack.securitySolution.navigation.exceptions": "Exceptions",
+    "xpack.securitySolution.navigation.detectionResponse": "Détection et réponse",
+    "xpack.securitySolution.navigation.exceptions": "Listes d'exceptions",
     "xpack.securitySolution.navigation.explore": "Explorer",
+    "xpack.securitySolution.navigation.gettingStarted": "Premiers pas",
     "xpack.securitySolution.navigation.hosts": "Hôtes",
     "xpack.securitySolution.navigation.investigate": "Investiguer",
     "xpack.securitySolution.navigation.mainLabel": "Sécurité",
@@ -21631,6 +26103,7 @@
     "xpack.securitySolution.navigation.overview": "Aperçu",
     "xpack.securitySolution.navigation.rules": "Règles",
     "xpack.securitySolution.navigation.timelines": "Chronologies",
+    "xpack.securitySolution.navigation.users": "Utilisateurs",
     "xpack.securitySolution.network.dns.stackByUniqueSubdomain": "Premiers domaines par {groupByField}",
     "xpack.securitySolution.network.ipDetails.ipOverview.asDestinationDropDownOptionLabel": "Comme destination",
     "xpack.securitySolution.network.ipDetails.ipOverview.asSourceDropDownOptionLabel": "Comme source",
@@ -21737,9 +26210,11 @@
     "xpack.securitySolution.networkTopNFlowTable.unit": "{totalCount, plural, other {IP}}",
     "xpack.securitySolution.networkUsers.errorSearchDescription": "Une erreur s'est produite sur la recherche des utilisateurs du réseau",
     "xpack.securitySolution.networkUsers.failSearchDescription": "Impossible de lancer la recherche sur les utilisateurs du réseau",
-    "xpack.securitySolution.newsFeed.advancedSettingsLinkTitle": "Paramètres SIEM avancés",
+    "xpack.securitySolution.newsFeed.advancedSettingsLinkTitle": "Paramètres avancés de la solution Security",
     "xpack.securitySolution.newsFeed.noNewsMessage": "Votre URL de fil d'actualités en cours n'a renvoyé aucune nouvelle récente.",
     "xpack.securitySolution.newsFeed.noNewsMessageForAdmin": "Votre URL de fil d'actualités en cours n'a renvoyé aucune nouvelle récente. Vous pouvez mettre à jour l'URL ou désactiver les nouvelles de sécurité via",
+    "xpack.securitySolution.noPermissionsMessage": "Pour afficher {subPluginKey}, vous devez mettre à jour les privilèges. Pour en savoir plus, contactez votre administrateur Kibana.",
+    "xpack.securitySolution.noPermissionsTitle": "Privilèges requis",
     "xpack.securitySolution.notes.addANotePlaceholder": "Ajouter une note",
     "xpack.securitySolution.notes.addedANoteLabel": "Note ajoutée",
     "xpack.securitySolution.notes.addNoteButtonLabel": "Ajouter la note",
@@ -21810,11 +26285,14 @@
     "xpack.securitySolution.overview.auditBeatProcessTitle": "Processus",
     "xpack.securitySolution.overview.auditBeatSocketTitle": "Socket",
     "xpack.securitySolution.overview.auditBeatUserTitle": "Utilisateur",
+    "xpack.securitySolution.overview.ctiDashboardDangerButton": "Activer les sources",
     "xpack.securitySolution.overview.ctiDashboardDangerPanelTitle": "Aucune donnée de Threat Intelligence disponible à afficher",
-    "xpack.securitySolution.overview.ctiDashboardEnableThreatIntel": "Vous devez activer le module de Threat Intelligence Filebeat pour pouvoir afficher les données de différentes sources.",
+    "xpack.securitySolution.overview.ctiDashboardEnableThreatIntel": "Vous devez activer les sources de Threat Intelligence pour afficher les données.",
     "xpack.securitySolution.overview.ctiDashboardInfoPanelBody": "Suivez ces conseils pour activer votre tableau de bord pour pouvoir afficher vos sources dans les visualisations.",
     "xpack.securitySolution.overview.ctiDashboardInfoPanelButton": "Comment charger les tableaux de bord Kibana",
     "xpack.securitySolution.overview.ctiDashboardInfoPanelTitle": "Activer le tableau de bord Kibana pour visualiser les sources",
+    "xpack.securitySolution.overview.ctiDashboardOtherDatasourceTitle": "Autres",
+    "xpack.securitySolution.overview.ctiDashboardSubtitle": "Affichage : {totalCount} {totalCount, plural, one {indicateur} other {indicateurs}}",
     "xpack.securitySolution.overview.ctiDashboardTitle": "Threat Intelligence",
     "xpack.securitySolution.overview.ctiDashboardWarningPanelBody": "Nous n'avons détecté aucune donnée de la plage temporelle sélectionnée, veuillez réessayer avec une autre plage temporelle.",
     "xpack.securitySolution.overview.ctiDashboardWarningPanelTitle": "Aucune donnée de Threat Intelligence disponible à afficher",
@@ -21844,6 +26322,16 @@
     "xpack.securitySolution.overview.hostStatGroupFilebeat": "Filebeat",
     "xpack.securitySolution.overview.hostStatGroupWinlogbeat": "Winlogbeat",
     "xpack.securitySolution.overview.hostsTitle": "Événements d'hôte",
+    "xpack.securitySolution.overview.landingCards.box.endpoint.desc": "Prévention, collecte, détection et réponse, le tout avec Elastic Agent.",
+    "xpack.securitySolution.overview.landingCards.box.endpoint.title": "Endpoint Security à grande échelle",
+    "xpack.securitySolution.overview.landingCards.box.siem.cta": "Ajouter des intégrations de sécurité",
+    "xpack.securitySolution.overview.landingCards.box.siem.desc": "Grâce à Elastic Security, les équipes sont en mesure de prévenir les menaces, de les détecter et de réagir en conséquence à l'échelle du cloud et grâce à sa vitesse. Ainsi, elles sécurisent les opérations de l'entreprise via une plateforme ouverte unifiée.",
+    "xpack.securitySolution.overview.landingCards.box.siem.header": "Elastic Security",
+    "xpack.securitySolution.overview.landingCards.box.siem.title": "La sécurité à la vitesse d'Elastic",
+    "xpack.securitySolution.overview.landingCards.box.siemCard.desc": "Détection des menaces en constante évolution, investigations et réponses adaptées",
+    "xpack.securitySolution.overview.landingCards.box.siemCard.title": "SIEM pour le centre opérationnel de sécurité moderne",
+    "xpack.securitySolution.overview.landingCards.box.unify.desc": "Elastic Security modernise les opérations de sécurité en facilitant l'analyse des données collectées au fil des ans, en automatisant les principaux processus et en garantissant une sécurité native aux points de terminaison pour chaque hôte.",
+    "xpack.securitySolution.overview.landingCards.box.unify.title": "Unification du SIEM, de la sécurité aux points de terminaison et de la sécurité cloud",
     "xpack.securitySolution.overview.networkAction": "Afficher le réseau",
     "xpack.securitySolution.overview.networkStatGroupAuditbeat": "Auditbeat",
     "xpack.securitySolution.overview.networkStatGroupFilebeat": "Filebeat",
@@ -21858,6 +26346,14 @@
     "xpack.securitySolution.overview.pageSubtitle": "Gestion des informations de sécurité et des événements avec Elastic Stack",
     "xpack.securitySolution.overview.recentCasesSidebarTitle": "Cas récents",
     "xpack.securitySolution.overview.recentTimelinesSidebarTitle": "Chronologies récentes",
+    "xpack.securitySolution.overview.riskyHostsDashboardDangerPanelButton": "Activer le score de risque",
+    "xpack.securitySolution.overview.riskyHostsDashboardDangerPanelTitle": "Aucune donnée de score de risque de l'hôte à afficher",
+    "xpack.securitySolution.overview.riskyHostsDashboardEnableThreatIntel": "Veuillez activer le module de score de risque de l'hôte pour afficher la liste des hôtes à risque.",
+    "xpack.securitySolution.overview.riskyHostsDashboardSubtitle": "Affichage : {totalCount} {totalCount, plural, one {hôte} other {hôtes}}",
+    "xpack.securitySolution.overview.riskyHostsDashboardTitle": "Scores de risque de l'hôte actuel",
+    "xpack.securitySolution.overview.riskyHostsDashboardWarningPanelBody": "Nous n'avons détecté aucune donnée de score de risque de l'hôte provenant des hôtes de votre environnement pour la plage temporelle sélectionnée.",
+    "xpack.securitySolution.overview.riskyHostsDashboardWarningPanelTitle": "Aucune donnée de score de risque de l'hôte disponible pour l'affichage",
+    "xpack.securitySolution.overview.riskyHostsSource": "Source",
     "xpack.securitySolution.overview.showTopTooltip": "Afficher les premiers {fieldName}",
     "xpack.securitySolution.overview.signalCountTitle": "Tendance de l'alerte de détection",
     "xpack.securitySolution.overview.topNLabel": "Premiers {fieldName}",
@@ -21874,6 +26370,7 @@
     "xpack.securitySolution.pages.common.emptyActionEndpoint": "Ajouter Endpoint Security",
     "xpack.securitySolution.pages.common.emptyActionEndpointDescription": "Protégez vos hôtes grâce à la prévention des menaces, la détection et la visibilité des données en profondeur en toute sécurité.",
     "xpack.securitySolution.pages.common.emptyActionSecondary": "guide de premiers pas.",
+    "xpack.securitySolution.pages.common.solutionName": "Sécurité",
     "xpack.securitySolution.pages.common.updateAlertStatusFailed": "Impossible de mettre à jour { conflicts } {conflicts, plural, =1 {alerte} other {alertes}}.",
     "xpack.securitySolution.pages.common.updateAlertStatusFailedDetailed": "{ updated } {updated, plural, =1 {alerte a été mise à jour} other {alertes ont été mises à jour}} correctement, mais { conflicts } n'ont pas pu être mis à jour\n         car { conflicts, plural, =1 {elle était} other {elles étaient}} déjà en cours de modification.",
     "xpack.securitySolution.pages.fourohfour.pageNotFoundDescription": "Page introuvable",
@@ -21882,6 +26379,21 @@
     "xpack.securitySolution.paginatedTable.tooManyResultsToastText": "Affiner votre recherche pour mieux filtrer les résultats",
     "xpack.securitySolution.paginatedTable.tooManyResultsToastTitle": " - trop de résultats",
     "xpack.securitySolution.policiesTab": "Politiques",
+    "xpack.securitySolution.policy.backToPolicyList": "Retour à la liste des politiques",
+    "xpack.securitySolution.policy.list.createdAt": "Date de création",
+    "xpack.securitySolution.policy.list.createdBy": "Créé par",
+    "xpack.securitySolution.policy.list.endpoints": "Points de terminaison",
+    "xpack.securitySolution.policy.list.errorMessage": "Erreur lors de la récupération de la liste de politiques",
+    "xpack.securitySolution.policy.list.lastUpdatedBy": "Dernière mise à jour par",
+    "xpack.securitySolution.policy.list.name": "Nom",
+    "xpack.securitySolution.policy.list.subtitle": "Utiliser les politiques de point de terminaison pour personnaliser les protections de sécurité des points de terminaison et d'autres configurations",
+    "xpack.securitySolution.policy.list.title": "Liste des politiques",
+    "xpack.securitySolution.policy.list.totalCount": "Affichage de {totalItemCount, plural, one {# politique} other {# politiques}}",
+    "xpack.securitySolution.policy.list.updatedAt": "Dernière mise à jour",
+    "xpack.securitySolution.policyDetails.backToEndpointList": "Afficher tous les points de terminaison",
+    "xpack.securitySolution.policyDetails.backToPolicyButton": "Retour à la liste des politiques",
+    "xpack.securitySolution.policyList.endpointCountError": "Erreur lors de la récupération du nombre de points de terminaison",
+    "xpack.securitySolution.policyList.packageVersionError": "Erreur lors de la récupération de la version du pack de points de terminaison",
     "xpack.securitySolution.policyStatusText.failure": "Échec",
     "xpack.securitySolution.policyStatusText.success": "Succès",
     "xpack.securitySolution.policyStatusText.unsupported": "Non pris en charge",
@@ -21908,7 +26420,7 @@
     "xpack.securitySolution.resolver.graphControls.center": "Centre",
     "xpack.securitySolution.resolver.graphControls.currentlyLoadingCube": "Processus de chargement",
     "xpack.securitySolution.resolver.graphControls.east": "Est",
-    "xpack.securitySolution.resolver.graphControls.errorCube": "Erreur",
+    "xpack.securitySolution.resolver.graphControls.errorCube": "Processus d'erreur",
     "xpack.securitySolution.resolver.graphControls.nodeLegend": "légende",
     "xpack.securitySolution.resolver.graphControls.nodeLegendButtonTitle": "Légende du nœud",
     "xpack.securitySolution.resolver.graphControls.north": "Nord",
@@ -21927,6 +26439,7 @@
     "xpack.securitySolution.resolver.graphControls.zoomOut": "Zoom arrière",
     "xpack.securitySolution.resolver.node_button_name": "{nodeState, select, error {Recharger {nodeName}} other {{nodeName}}}",
     "xpack.securitySolution.resolver.node_icon": "{state, select, running {Processus en cours d'exécution} terminated {Processus arrêté} loading {Processus en cours de chargement} error {Processus en erreur}}",
+    "xpack.securitySolution.resolver.noProcessEvents.dataView": "Si vous avez sélectionné une autre vue de données,\n          assurez-vous que votre vue de données contient tous les index stockés dans l'événement source dans \"{field}\".",
     "xpack.securitySolution.resolver.noProcessEvents.eventCategory": "Vous pouvez également ajouter les éléments ci-dessous à votre recherche de chronologie pour rechercher les événements de processus.\n            Si la liste n'en contient pas, il est impossible de créer un graphique à partir des événements trouvés dans cette recherche.",
     "xpack.securitySolution.resolver.noProcessEvents.timeRange": "\n            L'outil Analyze Event crée des graphiques basés sur les événements de processus.\n            Si l'événement analysé ne possède aucun processus associé dans la plage temporelle en cours\n            ou stocké dans Elasticsearch dans n'importe quelle plage temporelle, aucun graphique ne sera créé.\n            Vous pouvez rechercher les processus associés en développant votre plage temporelle.\n          ",
     "xpack.securitySolution.resolver.noProcessEvents.title": "Aucun événement de processus n'a été trouvé",
@@ -21963,18 +26476,25 @@
     "xpack.securitySolution.rowRenderer.wasPreventedFromExecutingAMaliciousProcessDescription": "a été bloqué dans sa tentative d'exécution d'un processus malveillant",
     "xpack.securitySolution.rowRenderer.wasPreventedFromModifyingAMaliciousFileDescription": "a été bloqué dans sa tentative de modification d'un fichier malveillant",
     "xpack.securitySolution.rowRenderer.wasPreventedFromRenamingAMaliciousFileDescription": "a été bloqué dans sa tentative de renommage d'un fichier malveillant",
+    "xpack.securitySolution.rules.badge.readOnly.tooltip": "Impossible de créer, de modifier ou de supprimer des règles",
     "xpack.securitySolution.search.administration.endpoints": "Points de terminaison",
     "xpack.securitySolution.search.administration.eventFilters": "Filtres d'événements",
+    "xpack.securitySolution.search.administration.hostIsolationExceptions": "Exceptions d'isolation de l'hôte",
     "xpack.securitySolution.search.administration.trustedApps": "Applications de confiance",
     "xpack.securitySolution.search.alerts": "Alertes",
     "xpack.securitySolution.search.detect": "Détecter",
-    "xpack.securitySolution.search.exceptions": "Exceptions",
+    "xpack.securitySolution.search.detectionAndResponse": "Détection et réponse",
+    "xpack.securitySolution.search.exceptions": "Listes d'exceptions",
+    "xpack.securitySolution.search.explore": "Explorer",
+    "xpack.securitySolution.search.getStarted": "Premiers pas",
     "xpack.securitySolution.search.hosts": "Hôtes",
     "xpack.securitySolution.search.hosts.anomalies": "Anomalies",
     "xpack.securitySolution.search.hosts.authentications": "Authentifications",
     "xpack.securitySolution.search.hosts.events": "Événements",
     "xpack.securitySolution.search.hosts.externalAlerts": "Alertes externes",
+    "xpack.securitySolution.search.hosts.sessions": "Sessions",
     "xpack.securitySolution.search.hosts.uncommonProcesses": "Processus inhabituels",
+    "xpack.securitySolution.search.investigate": "Examiner",
     "xpack.securitySolution.search.manage": "Gérer",
     "xpack.securitySolution.search.network": "Réseau",
     "xpack.securitySolution.search.network.dns": "DNS",
@@ -21985,9 +26505,26 @@
     "xpack.securitySolution.search.rules": "Règles",
     "xpack.securitySolution.search.timeline.templates": "Modèles",
     "xpack.securitySolution.search.timelines": "Chronologies",
+    "xpack.securitySolution.search.users": "Utilisateurs",
+    "xpack.securitySolution.search.users.anomalies": "Anomalies",
+    "xpack.securitySolution.search.users.risk": "Risque",
+    "xpack.securitySolution.searchStrategy.error": "Impossible d'exécuter la recherche : {factoryQueryType}",
+    "xpack.securitySolution.sessionsView.singleCountOfSessions": "session",
+    "xpack.securitySolution.sessionsView.totalCountOfSessions": "sessions",
+    "xpack.securitySolution.some_page.flyoutCreateSubmitSuccess": "\"{name}\" a été ajouté.",
     "xpack.securitySolution.source.destination.packetsLabel": "pkts",
+    "xpack.securitySolution.sourcerer.disabled": "Les mises à jour apportées à la vue de données requièrent l'actualisation de la page pour pouvoir prendre effet.",
+    "xpack.securitySolution.sourcerer.error.title": "Erreur lors de la mise à jour de la vue de données Security",
+    "xpack.securitySolution.sourcerer.error.toastMessage": "Actualiser la page",
+    "xpack.securitySolution.sourcerer.permissions.title": "Rôle d'écriture requis pour générer les données",
+    "xpack.securitySolution.sourcerer.permissions.toastMessage": "Les utilisateurs disposant de l'autorisation d'écriture doivent accéder à l'application Elastic Security pour initialiser les données source de l'application.",
+    "xpack.securitySolution.stepDefineRule.lastDay": "Dernier jour",
+    "xpack.securitySolution.stepDefineRule.lastHour": "Dernière heure",
+    "xpack.securitySolution.stepDefineRule.lastMonth": "Mois dernier",
+    "xpack.securitySolution.stepDefineRule.lastWeek": "Semaine dernière",
     "xpack.securitySolution.stepDefineRule.previewQueryAriaLabel": "Sélection de la chronologie pour l'aperçu de la recherche",
     "xpack.securitySolution.stepDefineRule.previewQueryButton": "Prévisualiser les résultats",
+    "xpack.securitySolution.stepDefineRule.previewTimeoutWarning": "L'aperçu a expiré au bout de 60 secondes",
     "xpack.securitySolution.system.acceptedAConnectionViaDescription": "a accepté une connexion via",
     "xpack.securitySolution.system.acceptedDescription": "a accepté l'utilisateur via",
     "xpack.securitySolution.system.attemptedLoginDescription": "a tenté une connexion via",
@@ -22023,6 +26560,7 @@
     "xpack.securitySolution.system.withExitCodeDescription": "avec le code de sortie",
     "xpack.securitySolution.system.withResultDescription": "avec le résultat",
     "xpack.securitySolution.tables.rowItemHelper.moreDescription": "plus non affiché",
+    "xpack.securitySolution.tables.rowItemHelper.overflowButtonDescription": "+ {count} de plus",
     "xpack.securitySolution.threatMatch.andDescription": "AND",
     "xpack.securitySolution.threatMatch.fieldDescription": "Champ",
     "xpack.securitySolution.threatMatch.fieldPlaceholderDescription": "Rechercher",
@@ -22045,7 +26583,7 @@
     "xpack.securitySolution.timeline.body.actions.investigateInResolverTooltip": "Analyser l'événement",
     "xpack.securitySolution.timeline.body.actions.investigateLabel": "Investiguer",
     "xpack.securitySolution.timeline.body.actions.moreActionsForRowAriaLabel": "Sélectionner davantage d'actions pour l'alerte ou l'événement de la ligne {ariaRowindex}, avec les colonnes {columnValues}",
-    "xpack.securitySolution.timeline.body.actions.pinEventForRowAriaLabel": "{isEventPinned, select, false {Épingler} true {Désépingler}} l'événement de la ligne {ariaRowindex} dans la chronologie, avec les colonnes {columnValues}",
+    "xpack.securitySolution.timeline.body.actions.pinEventForRowAriaLabel": "{isEventPinned, select, false {Épingler} true {Désépingler}} l'événement de la ligne {ariaRowindex} {isEventPinned, select, false{dans} true {de}} la chronologie, avec les colonnes {columnValues}",
     "xpack.securitySolution.timeline.body.actions.sendAlertToTimelineForRowAriaLabel": "Envoyer l'alerte de la ligne {ariaRowindex} à la chronologie, avec les colonnes {columnValues}",
     "xpack.securitySolution.timeline.body.actions.viewDetailsAriaLabel": "Afficher les détails",
     "xpack.securitySolution.timeline.body.actions.viewDetailsForRowAriaLabel": "Afficher les détails pour l'alerte ou l'événement de la ligne {ariaRowindex}, avec les colonnes {columnValues}",
@@ -22113,7 +26651,8 @@
     "xpack.securitySolution.timeline.failSearchDescription": "Impossible de lancer la recherche",
     "xpack.securitySolution.timeline.fieldTooltip": "Champ",
     "xpack.securitySolution.timeline.file.fromOriginalPathDescription": "depuis son chemin d'origine",
-    "xpack.securitySolution.timeline.flyout.pane.removeColumnButtonLabel": "Retirer une colonne",
+    "xpack.securitySolution.timeline.flyout.header.closeTimelineButtonLabel": "Fermer {isTimeline, select, true {la chronologie} false {le modèle}}",
+    "xpack.securitySolution.timeline.flyout.pane.removeColumnButtonLabel": "Supprimer la colonne",
     "xpack.securitySolution.timeline.flyout.pane.timelinePropertiesAriaLabel": "Propriétés de la chronologie",
     "xpack.securitySolution.timeline.flyoutTimelineTemplateLabel": "Modèle de chronologie",
     "xpack.securitySolution.timeline.fullScreenButton": "Plein écran",
@@ -22129,6 +26668,7 @@
     "xpack.securitySolution.timeline.nameTimeline.modal.header": "Nommer la chronologie",
     "xpack.securitySolution.timeline.nameTimeline.save.title": "Enregistrer",
     "xpack.securitySolution.timeline.nameTimelineTemplate.modal.header": "Nommer le modèle de chronologie",
+    "xpack.securitySolution.timeline.participantsTitle": "Participants",
     "xpack.securitySolution.timeline.properties.addTimelineButtonLabel": "Ajouter une nouvelle chronologie ou un nouveau modèle",
     "xpack.securitySolution.timeline.properties.addToFavoriteButtonLabel": "Ajouter aux favoris",
     "xpack.securitySolution.timeline.properties.attachTimelineToCaseTooltip": "Veuillez fournir un titre pour votre chronologie afin de l'attacher à un cas",
@@ -22199,8 +26739,10 @@
     "xpack.securitySolution.timeline.sidePanel.networkDetails.close": "fermer",
     "xpack.securitySolution.timeline.sidePanel.networkDetails.networkDetailsPageLink": "Afficher la page de détails",
     "xpack.securitySolution.timeline.sidePanel.networkDetails.title": "Détails réseau",
+    "xpack.securitySolution.timeline.sidePanel.networkDetails.userDetails": "Afficher la page de détails",
+    "xpack.securitySolution.timeline.sidePanel.userDetails.title": "Détails de l'utilisateur",
     "xpack.securitySolution.timeline.sortAZLabel": "Trier A-Z",
-    "xpack.securitySolution.timeline.sortFieldsButton": "Champs de tri",
+    "xpack.securitySolution.timeline.sortFieldsButton": "Trier les champs",
     "xpack.securitySolution.timeline.sortZALabel": "Trier Z-A",
     "xpack.securitySolution.timeline.source": "Source",
     "xpack.securitySolution.timeline.tabs.analyserTabTimelineTitle": "Analyseur",
@@ -22219,6 +26761,8 @@
     "xpack.securitySolution.timelines.allTimelines.errorFetchingTimelinesTitle": "Impossible d'interroger les données de toutes les chronologies",
     "xpack.securitySolution.timelines.allTimelines.importTimelineTitle": "Importer",
     "xpack.securitySolution.timelines.allTimelines.panelTitle": "Toutes les chronologies",
+    "xpack.securitySolution.timelines.components.importTimelineModal.importFailedDetailedTitle": "{message}",
+    "xpack.securitySolution.timelines.components.importTimelineModal.importFailedTitle": "Impossible d'importer {totalTimelines} {totalTimelines, plural, =1 {règle} other {règles}}",
     "xpack.securitySolution.timelines.components.importTimelineModal.importTimelineTitle": "Importer",
     "xpack.securitySolution.timelines.components.importTimelineModal.importTitle": "Importer…",
     "xpack.securitySolution.timelines.components.importTimelineModal.initialPromptTextDescription": "Sélectionnez ou glissez-déposez un fichier timelines_export.ndjson valide",
@@ -22232,42 +26776,26 @@
     "xpack.securitySolution.timelines.pageTitle": "Chronologies",
     "xpack.securitySolution.timelines.updateTimelineErrorText": "Quelque chose n'a pas fonctionné",
     "xpack.securitySolution.timelines.updateTimelineErrorTitle": "Erreur de chronologie",
+    "xpack.securitySolution.toggleQuery.off": "Fermé",
+    "xpack.securitySolution.toggleQuery.on": "Ouvrir",
     "xpack.securitySolution.topN.alertEventsSelectLabel": "Alertes de détection",
     "xpack.securitySolution.topN.allEventsSelectLabel": "Tous les événements",
     "xpack.securitySolution.topN.closeButtonLabel": "Fermer",
     "xpack.securitySolution.topN.rawEventsSelectLabel": "Événements bruts",
     "xpack.securitySolution.trustedapps.aboutInfo": "Ajoutez une application de confiance pour améliorer les performances ou réduire les conflits avec d'autres applications en cours d'exécution sur vos hôtes.",
+    "xpack.securitySolution.trustedApps.assignmentSectionDescription": "Affectez cette application de confiance globalement à toutes les politiques, ou de façon spécifique à certaines politiques.",
     "xpack.securitySolution.trustedapps.card.operator.is": "est",
-    "xpack.securitySolution.trustedapps.card.operator.matches": "correspond",
+    "xpack.securitySolution.trustedapps.card.operator.matches": "correspond à",
+    "xpack.securitySolution.trustedapps.create.conditionFieldDegradedPerformanceMsg": "[{row}] L'utilisation d'un caractère générique dans le nom de fichier affectera les performances du point de terminaison",
+    "xpack.securitySolution.trustedapps.create.conditionFieldDuplicatedMsg": "{field} ne peut pas être ajouté plus d'une fois",
     "xpack.securitySolution.trustedapps.create.conditionFieldInvalidHashMsg": "[{row}] Valeur de hachage non valide",
     "xpack.securitySolution.trustedapps.create.conditionFieldInvalidPathMsg": "[{row}] Le chemin est peut-être incorrectement formé ; vérifiez la valeur",
     "xpack.securitySolution.trustedapps.create.conditionFieldValueRequiredMsg": "[{row}] L'entrée de champ doit inclure une valeur",
     "xpack.securitySolution.trustedapps.create.conditionRequiredMsg": "Au moins une définition de champ est requise",
     "xpack.securitySolution.trustedapps.create.description": "Description",
-    "xpack.securitySolution.trustedapps.create.name": "Nommer votre application de confiance",
     "xpack.securitySolution.trustedapps.create.nameRequiredMsg": "Le nom est requis",
-    "xpack.securitySolution.trustedapps.create.os": "Sélectionner un système d'exploitation",
     "xpack.securitySolution.trustedapps.create.osRequiredMsg": "Le système d'exploitation est requis",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.cancelButton": "Annuler",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.createSaveButton": "Ajouter une application de confiance",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.createTitle": "Ajouter une application de confiance",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.editSaveButton": "Enregistrer",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.editTitle": "Modifier une application de confiance",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.notFoundToastMessage": "Impossible de modifier l'application de confiance ({apiMsg})",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.successToastTitle": "\"{name}\" a été ajouté à la liste Applications de confiance.",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.updateSuccessToastTitle": "\"{name}\" a été mis à jour.",
-    "xpack.securitySolution.trustedapps.creationSuccess.title": "Cette action a réussi !",
-    "xpack.securitySolution.trustedapps.deletionDialog.cancelButton": "Annuler",
-    "xpack.securitySolution.trustedapps.deletionDialog.confirmButton": "Retirer une application de confiance",
-    "xpack.securitySolution.trustedapps.deletionDialog.subMessage": "Impossible d'annuler cette action. Voulez-vous vraiment continuer ?",
-    "xpack.securitySolution.trustedapps.deletionError.text": "Impossible de retirer \"{name}\" de la liste Applications de confiance. Raison : {message}",
-    "xpack.securitySolution.trustedapps.deletionError.title": "Échec du retrait",
-    "xpack.securitySolution.trustedapps.deletionSuccess.text": "\"{name}\" a été retiré de la liste Applications de confiance.",
-    "xpack.securitySolution.trustedapps.deletionSuccess.title": "Retrait effectué avec succès",
     "xpack.securitySolution.trustedapps.list.addButton": "Ajouter une application de confiance",
-    "xpack.securitySolution.trustedapps.list.pageTitle": "Applications de confiance",
-    "xpack.securitySolution.trustedapps.list.search.placeholder": "Rechercher sur les champs ci-dessous : nom, description, valeur",
-    "xpack.securitySolution.trustedapps.list.totalCount": "Affichage de {totalItemsCount, plural, one {# application de confiance} other {# applications de confiance}}",
     "xpack.securitySolution.trustedapps.listEmptyState.message": "Aucune application de confiance ne figure actuellement dans votre point de terminaison.",
     "xpack.securitySolution.trustedapps.listEmptyState.title": "Ajouter votre première application de confiance",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.description.hash": "md5, sha1 ou sha256",
@@ -22279,14 +26807,9 @@
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.removeLabel": "Retirer l'entrée",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.group.andOperator": "AND",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.noEntries": "Aucune condition définie",
-    "xpack.securitySolution.trustedapps.middleware.editIdMissing": "Aucun ID fourni",
     "xpack.securitySolution.trustedapps.trustedapp.entry.field": "Champ",
     "xpack.securitySolution.trustedapps.trustedapp.entry.operator": "Opérateur",
     "xpack.securitySolution.trustedapps.trustedapp.entry.value": "Valeur",
-    "xpack.securitySolution.trustedapps.updateSuccess.title": "Cette action a réussi !",
-    "xpack.securitySolution.trustedapps.view.toggle.grid": "Vue Grille",
-    "xpack.securitySolution.trustedapps.view.toggle.list": "Vue Liste",
-    "xpack.securitySolution.trustedapps.viewTypeToggle.controlLegend": "Type de vue",
     "xpack.securitySolution.trustedAppsTab": "Applications de confiance",
     "xpack.securitySolution.uiSettings.defaultAnomalyScoreDescription": "<p>Valeur au-dessus de laquelle les anomalies de tâche de Machine Learning sont affichées dans l'application Security.</p><p>Valeurs valides : 0 à 100.</p>",
     "xpack.securitySolution.uiSettings.defaultAnomalyScoreLabel": "Seuil d'anomalie",
@@ -22298,6 +26821,8 @@
     "xpack.securitySolution.uiSettings.defaultThreatIndexLabel": "Index de menaces",
     "xpack.securitySolution.uiSettings.defaultTimeRangeDescription": "<p>Période de temps par défaut dans le filtre de temps Security.</p>",
     "xpack.securitySolution.uiSettings.defaultTimeRangeLabel": "Période du filtre de temps",
+    "xpack.securitySolution.uiSettings.enableCcsReadWarningLabel": "Avertissement lié aux privilèges de la règle CCS",
+    "xpack.securitySolution.uiSettings.enableCcsWarningDescription": "<p>Active les avertissements de vérification des privilèges dans les règles relatives aux index CCS</p>",
     "xpack.securitySolution.uiSettings.enableNewsFeedDescription": "<p>Active le fil d'actualités</p>",
     "xpack.securitySolution.uiSettings.enableNewsFeedLabel": "Fil d'actualités",
     "xpack.securitySolution.uiSettings.ipReputationLinks": "Liens de réputation d'IP",
@@ -22316,6 +26841,49 @@
     "xpack.securitySolution.uncommonProcessTable.numberOfInstances": "Instances",
     "xpack.securitySolution.uncommonProcessTable.rows": "{numRows} {numRows, plural, =0 {ligne} =1 {ligne} other {lignes}}",
     "xpack.securitySolution.uncommonProcessTable.unit": "{totalCount, plural, other {processus}}",
+    "xpack.securitySolution.user.details.overview.familyTitle": "Famille",
+    "xpack.securitySolution.user.details.overview.inspectTitle": "Aperçu de l'utilisateur",
+    "xpack.securitySolution.user.details.overview.ipAddressesTitle": "Adresses IP",
+    "xpack.securitySolution.user.details.overview.maxAnomalyScoreByJobTitle": "Score maximal d'anomalie par tâche",
+    "xpack.securitySolution.user.details.overview.osTitle": "Système d'exploitation",
+    "xpack.securitySolution.user.details.overview.userDomainTitle": "Domaine",
+    "xpack.securitySolution.user.details.overview.userIdTitle": "ID utilisateur",
+    "xpack.securitySolution.user.details.overview.userRiskClassification": "Classification de risque de l'utilisateur",
+    "xpack.securitySolution.user.details.overview.userRiskScoreTitle": "Score de risque de l'utilisateur",
+    "xpack.securitySolution.user.ipDetails.ipOverview.lastSeenTitle": "Vu en dernier",
+    "xpack.securitySolution.userDetails.errorSearchDescription": "Une erreur s'est produite lors de la recherche des détails de l'utilisateur",
+    "xpack.securitySolution.userDetails.failSearchDescription": "Impossible de lancer la recherche sur les détails de l'utilisateur",
+    "xpack.securitySolution.users.navigation.alertsTitle": "Alertes externes",
+    "xpack.securitySolution.users.navigation.allUsersTitle": "Tous les utilisateurs",
+    "xpack.securitySolution.users.navigation.anomaliesTitle": "Anomalies",
+    "xpack.securitySolution.users.navigation.authenticationsTitle": "Authentifications",
+    "xpack.securitySolution.users.navigation.eventsTitle": "Événements",
+    "xpack.securitySolution.users.navigation.riskTitle": "Utilisateurs par risque",
+    "xpack.securitySolution.users.pageTitle": "Utilisateurs",
+    "xpack.securitySolution.usersRiskTable.filteredUsersTitle": "Afficher les utilisateurs à risque {severity}",
+    "xpack.securitySolution.usersRiskTable.riskTitle": "Classification de risque de l'utilisateur",
+    "xpack.securitySolution.usersRiskTable.userNameTitle": "Nom d'utilisateur",
+    "xpack.securitySolution.usersRiskTable.userRiskScoreTitle": "Score de risque de l'utilisateur",
+    "xpack.securitySolution.usersRiskTable.userRiskToolTip": "La classification des risques de l'utilisateur est déterminée par score de risque de l'utilisateur. Les utilisateurs classés comme étant Critique ou Élevé sont indiqués comme étant \"à risque\".",
+    "xpack.securitySolution.usersTable.domainTitle": "Domaine",
+    "xpack.securitySolution.usersTable.lastSeenTitle": "Vu en dernier",
+    "xpack.securitySolution.usersTable.rows": "{numRows} {numRows, plural, =0 {ligne} =1 {ligne} other {lignes}}",
+    "xpack.securitySolution.usersTable.title": "Utilisateurs",
+    "xpack.securitySolution.usersTable.unit": "{totalCount, plural, =1 {utilisateur} other {utilisateurs}}",
+    "xpack.securitySolution.usersTable.userNameTitle": "Nom d'utilisateur",
+    "xpack.securitySolution.userTab.errorFetchingsData": "Impossible d'interroger les données des utilisateurs",
+    "xpack.securitySolution.visualizationActions.addToCaseSuccessContent": "Visualisation correctement ajoutée au cas",
+    "xpack.securitySolution.visualizationActions.addToExistingCase": "Ajouter à un cas existant",
+    "xpack.securitySolution.visualizationActions.addToNewCase": "Ajouter au nouveau cas",
+    "xpack.securitySolution.visualizationActions.inspect": "Inspecter",
+    "xpack.securitySolution.visualizationActions.moreActions": "Plus d'actions",
+    "xpack.securitySolution.visualizationActions.openInLens": "Ouvrir dans Lens",
+    "xpack.securitySolution.visualizationActions.uniqueIps.destinationChartLabel": "Dest.",
+    "xpack.securitySolution.visualizationActions.uniqueIps.sourceChartLabel": "Src.",
+    "xpack.securitySolution.visualizationActions.userAuthentications.failChartLabel": "Échec",
+    "xpack.securitySolution.visualizationActions.userAuthentications.failUnitLabel": "échec",
+    "xpack.securitySolution.visualizationActions.userAuthentications.successChartLabel": "Succ.",
+    "xpack.securitySolution.visualizationActions.userAuthentications.successUnitLabel": "réussite",
     "xpack.securitySolution.zeek.othDescription": "Pas de SYN vu, juste le trafic à mi-chemin",
     "xpack.securitySolution.zeek.rejDescription": "Tentative de connexion rejetée",
     "xpack.securitySolution.zeek.rstoODescription": "Connexion établie, abandon de l'initiateur (envoi d'un RST)",
@@ -22329,6 +26897,42 @@
     "xpack.securitySolution.zeek.sfDescription": "Finalisation SYN/FIN normale",
     "xpack.securitySolution.zeek.shDescription": "L'initiateur a envoyé un SYN suivi d'un FIN, pas de SYN ACK de la part de l'équipe de réponse",
     "xpack.securitySolution.zeek.shrDescription": "L'équipe de réponse a envoyé un SYN ACK suivi d'un FIN, pas de SYN de la part de l'initiateur",
+    "xpack.sessionView.alert": "Alerte",
+    "xpack.sessionView.alertDetailsTab.groupView": "Vue Groupe",
+    "xpack.sessionView.alertDetailsTab.listView": "Vue Liste",
+    "xpack.sessionView.alertDetailsTab.toggleViewMode": "Basculer le mode d'aperçu",
+    "xpack.sessionView.alerts": "Alertes",
+    "xpack.sessionView.backToInvestigatedAlert": "Retour à l'alerte examinée",
+    "xpack.sessionView.buttonOpenDetailPanel": "Panneau de détails",
+    "xpack.sessionView.childProcesses": "Processus enfants",
+    "xpack.sessionView.detailPanel.entryLeaderTooltip": "Processus meneur de session associé au terminal initial ou à l'accès à distance via SSH, SSM et d'autres protocoles d'accès à distance. Les sessions d'entrée sont également utilisées pour représenter un service démarré directement par le processus init. Dans de nombreux cas, cela équivaut à session_leader.",
+    "xpack.sessionView.detailPanel.processGroupLeaderTooltip": "Meneur de groupe de processus du processus actuel.",
+    "xpack.sessionView.detailPanel.processParentTooltip": "Parent direct du processus actuel.",
+    "xpack.sessionView.detailPanel.sessionLeaderTooltip": "Généralement identique à entry_leader. En cas de différence, cela représente une session démarrée à l'intérieur d'une autre session. Certains outils tels que tmux et screen démarreront une nouvelle session pour obtenir un nouveau tty et/ou sépareront leur cycle de vie de la session d'entrée.",
+    "xpack.sessionView.detailPanelAlertListItem.investigatedLabel": "Alerte examinée",
+    "xpack.sessionView.detailPanelAlertListItem.jumpToAlert": "Passer au processus de déclenchement d'alerte",
+    "xpack.sessionView.detailPanelAlertListItem.moreButton": "Plus",
+    "xpack.sessionView.detailPanelAlertListItem.showDetailsAction": "Afficher les détails de l'alerte",
+    "xpack.sessionView.detailPanelAlertsEmptyMsg": "Aucune alerte n'a été créée pour cette session.",
+    "xpack.sessionView.detailPanelAlertsEmptyTitle": "Aucune alerte",
+    "xpack.sessionView.detailPanelCopy.copyButton": "Copier",
+    "xpack.sessionView.detailsPanel.alerts": "Alertes",
+    "xpack.sessionView.detailsPanel.host": "Hôte",
+    "xpack.sessionView.detailsPanel.process": "Processus",
+    "xpack.sessionView.emptyDataMessage": "Aucun événement de processus n'a été trouvé pour cette requête.",
+    "xpack.sessionView.emptyDataTitle": "Aucune donnée à rendre",
+    "xpack.sessionView.errorHeading": "Erreur lors du chargement de la vue de session",
+    "xpack.sessionView.errorMessage": "Une erreur s'est produite lors du chargement de la vue de session.",
+    "xpack.sessionView.execUserChange": "Exec user change: ",
+    "xpack.sessionView.loadingProcessTree": "Chargement de la session…",
+    "xpack.sessionView.processNode.tooltipExec": "Processus exécuté",
+    "xpack.sessionView.processNode.tooltipFork": "Processus ramifié (pas d'exéc.)",
+    "xpack.sessionView.processNode.tooltipOrphan": "Parent manquant pour le processus (orphelin)",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsTimestamp": "Horodatage",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsVerbosemode": "Mode détaillé",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsVerboseModeTooltips": "Le mode détaillé affiche tous les processus créés au cours d'une session, notamment le démarrage de l'environnement, la finalisation de l'environnement et les forks provoqués par des commandes intégrées",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleTitle": "Options d’affichage",
+    "xpack.sessionView.startedBy": "démarré par",
     "xpack.snapshotRestore.addPolicy.breadcrumbTitle": "Ajouter une politique",
     "xpack.snapshotRestore.addPolicy.loadingIndicesDescription": "Chargement des index disponibles…",
     "xpack.snapshotRestore.addPolicy.LoadingIndicesErrorMessage": "Erreur lors du chargement des index disponibles",
@@ -22382,6 +26986,10 @@
     "xpack.snapshotRestore.deleteSnapshot.errorSingleNotificationTitle": "Erreur lors de la suppression du snapshot \"{name}\"",
     "xpack.snapshotRestore.deleteSnapshot.successMultipleNotificationTitle": "Suppression de {count} snapshots effectuée",
     "xpack.snapshotRestore.deleteSnapshot.successSingleNotificationTitle": "Suppression du snapshot \"{name}\" effectuée",
+    "xpack.snapshotRestore.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.snapshotRestore.deprecations.enabled.manualStepTwoMessage": "Modifiez le paramètre \"xpack.snapshot_restore.enabled\" en \"xpack.snapshot_restore.ui.enabled\".",
+    "xpack.snapshotRestore.deprecations.enabledMessage": "Pour empêcher les utilisateurs d'accéder à l'interface utilisateur de snapshot et de restauration, utilisez le paramètre \"xpack.snapshot_restore.ui.enabled\" au lieu de \"xpack.snapshot_restore.enabled\".",
+    "xpack.snapshotRestore.deprecations.enabledTitle": "Le paramètre \"xpack.snapshot_restore.enabled\" est déclassé",
     "xpack.snapshotRestore.editPolicy.breadcrumbTitle": "Modifier la politique",
     "xpack.snapshotRestore.editPolicy.loadingIndicesDescription": "Chargement des index disponibles…",
     "xpack.snapshotRestore.editPolicy.LoadingIndicesErrorMessage": "Erreur lors du chargement des index disponibles",
@@ -22504,7 +27112,7 @@
     "xpack.snapshotRestore.policyForm.stepLogistics.policySnapshotNameHelpText": "Prend en charge les expressions mathématiques de date. {docLink}",
     "xpack.snapshotRestore.policyForm.stepLogistics.policySnapshotNameHelpTextDocLink": "En savoir plus.",
     "xpack.snapshotRestore.policyForm.stepLogistics.policySnapshotNameLabel": "Nom du snapshot",
-    "xpack.snapshotRestore.policyForm.stepLogistics.policySnapshotNamePlaceholder": "&lt;daily-snap-\\{now \\}>",
+    "xpack.snapshotRestore.policyForm.stepLogistics.policySnapshotNamePlaceholder": "&lt;daily-snap-\\{now d\\}>",
     "xpack.snapshotRestore.policyForm.stepLogistics.repositoryDescription": "Référentiel dans lequel vous souhaitez stocker les snapshots.",
     "xpack.snapshotRestore.policyForm.stepLogistics.repositoryDescriptionTitle": "Référentiel",
     "xpack.snapshotRestore.policyForm.stepLogistics.scheduleDescription": "Fréquence à laquelle les snapshots doivent être pris.",
@@ -22514,8 +27122,9 @@
     "xpack.snapshotRestore.policyForm.stepLogistics.snapshotNameDescription": "Nom des snapshots. Un identifiant unique est ajouté automatiquement à chaque nom.",
     "xpack.snapshotRestore.policyForm.stepLogistics.snapshotNameDescriptionTitle": "Nom du snapshot",
     "xpack.snapshotRestore.policyForm.stepLogisticsTitle": "Logistique",
+    "xpack.snapshotRestore.policyForm.stepRetention.countDescription": "Nombres minimal et maximal de snapshots à stocker pour la politique.",
     "xpack.snapshotRestore.policyForm.stepRetention.countTitle": "Snapshots à conserver",
-    "xpack.snapshotRestore.policyForm.stepRetention.docsButtonLabel": "Documents de conservation des snapshots",
+    "xpack.snapshotRestore.policyForm.stepRetention.docsButtonLabel": "Documentation relative aux snapshots",
     "xpack.snapshotRestore.policyForm.stepRetention.expirationDescription": "Temps d'attente avant la suppression des snapshots.",
     "xpack.snapshotRestore.policyForm.stepRetention.expirationTitle": "Expiration",
     "xpack.snapshotRestore.policyForm.stepRetention.expireAfterLabel": "Supprimer après",
@@ -22565,7 +27174,7 @@
     "xpack.snapshotRestore.policyForm.stepSettings.dataStreamsAndIndicesTitle": "Flux de données et index",
     "xpack.snapshotRestore.policyForm.stepSettings.dataStreamsAndIndicesToggleListLink": "Sélectionner les flux de données et index",
     "xpack.snapshotRestore.policyForm.stepSettings.deselectAllIndicesLink": "Tout désélectionner",
-    "xpack.snapshotRestore.policyForm.stepSettings.docsButtonLabel": "Documents de paramètres des snapshots",
+    "xpack.snapshotRestore.policyForm.stepSettings.docsButtonLabel": "Documentation relative aux snapshots",
     "xpack.snapshotRestore.policyForm.stepSettings.ignoreUnavailableDescription": "Ignore les index qui ne sont pas disponibles lors de la prise du snapshot. Autrement, le snapshot tout entier échoue.",
     "xpack.snapshotRestore.policyForm.stepSettings.ignoreUnavailableDescriptionTitle": "Ignorer les index non disponibles",
     "xpack.snapshotRestore.policyForm.stepSettings.ignoreUnavailableLabel": "Ignorer les index non disponibles",
@@ -22643,7 +27252,7 @@
     "xpack.snapshotRestore.repositories.breadcrumbTitle": "Référentiels",
     "xpack.snapshotRestore.repositoryDetails.cleanupButtonLabel": "Nettoyer le référentiel",
     "xpack.snapshotRestore.repositoryDetails.cleanupDetailsTitle": "Détails",
-    "xpack.snapshotRestore.repositoryDetails.cleanupErrorTitle": "Désolé, une erreur est survenue lors du nettoyage du référentiel.",
+    "xpack.snapshotRestore.repositoryDetails.cleanupErrorTitle": "Erreur lors du nettoyage du référentiel",
     "xpack.snapshotRestore.repositoryDetails.cleanupRepositoryMessage": "Vous pouvez nettoyer un référentiel pour supprimer toute donnée non référencée d'un snapshot. Cela peut permettre d'économiser de l'espace de stockage. Remarque : si vous supprimez régulièrement des snapshots, cette fonctionnalité ne sera peut-être pas avantageuse, et son utilisation devrait être moins fréquente.",
     "xpack.snapshotRestore.repositoryDetails.cleanupTitle": "Nettoyage du référentiel",
     "xpack.snapshotRestore.repositoryDetails.closeButtonLabel": "Fermer",
@@ -22726,7 +27335,7 @@
     "xpack.snapshotRestore.repositoryForm.commonFields.maxSnapshotBytesTitle": "Maximum d'octets de snapshot par seconde",
     "xpack.snapshotRestore.repositoryForm.errorUnknownRepositoryTypesMessage": "Le type de référentiel \"{type}\" n'est pas pris en charge.",
     "xpack.snapshotRestore.repositoryForm.errorUnknownRepositoryTypesTitle": "Type de référentiel inconnu",
-    "xpack.snapshotRestore.repositoryForm.fields.defaultTypeDescription": "Elasticsearch prend en charge le système de fichiers et les référentiels d'URL en lecture seule. Les types supplémentaires requièrent des plug-ins. {docLink}",
+    "xpack.snapshotRestore.repositoryForm.fields.defaultTypeDescription": "Emplacement de stockage pour vos snapshots. {docLink}",
     "xpack.snapshotRestore.repositoryForm.fields.nameDescription": "Nom unique pour le référentiel.",
     "xpack.snapshotRestore.repositoryForm.fields.nameDescriptionTitle": "Nom du référentiel",
     "xpack.snapshotRestore.repositoryForm.fields.nameLabel": "Nom",
@@ -22737,7 +27346,7 @@
     "xpack.snapshotRestore.repositoryForm.fields.sourceOnlyLabel": "Snapshots de source uniquement",
     "xpack.snapshotRestore.repositoryForm.fields.typeDescriptionTitle": "Type de référentiel",
     "xpack.snapshotRestore.repositoryForm.fields.typeDocsLinkText": "En savoir plus",
-    "xpack.snapshotRestore.repositoryForm.fields.typePluginsDocLinkText": "En savoir plus sur les plug-ins.",
+    "xpack.snapshotRestore.repositoryForm.fields.typePluginsDocLinkText": "Découvrez plus d'informations sur les types de référentiels.",
     "xpack.snapshotRestore.repositoryForm.loadingRepositoryTypesDescription": "Chargement des types de référentiel…",
     "xpack.snapshotRestore.repositoryForm.loadingRepositoryTypesErrorMessage": "Erreur lors du chargement des types de référentiels",
     "xpack.snapshotRestore.repositoryForm.nextButtonLabel": "Suivant",
@@ -23050,9 +27659,11 @@
     "xpack.snapshotRestore.snapshotList.emptyPrompt.noSnapshotsDescription": "Créez un snapshot à l'aide de l'API Elasticsearch.",
     "xpack.snapshotRestore.snapshotList.emptyPrompt.noSnapshotsTitle": "Vous n'avez pas encore de snapshots",
     "xpack.snapshotRestore.snapshotList.emptyPrompt.repositoryWarningDescription": "Accédez à {repositoryLink} pour corriger les erreurs.",
-    "xpack.snapshotRestore.snapshotList.emptyPrompt.usePolicyDescription": "Exécutez une politique de cycle de vie de snapshot pour créer un snapshot. Les snapshots peuvent également être créés à l'aide de {docLink}.",
+    "xpack.snapshotRestore.snapshotList.emptyPrompt.usePolicyDescription": "Exécutez une politique de cycle de vie de snapshot pour créer un snapshot. Vous pouvez également créer un snapshot à l'aide de l'{docLink}.",
     "xpack.snapshotRestore.snapshotList.loadingSnapshotsDescription": "Chargement des snapshots…",
     "xpack.snapshotRestore.snapshotList.loadingSnapshotsErrorMessage": "Erreur lors du chargement des snapshots",
+    "xpack.snapshotRestore.snapshotList.searchBar.invalidSearchMessage": "Recherche non valide : {errorMessage}",
+    "xpack.snapshotRestore.snapshotList.searchBar.onlyOneClauseMessage": "Vous ne pouvez utiliser qu'une seule clause dans la barre de recherche",
     "xpack.snapshotRestore.snapshotList.table.actionDeleteAriaLabel": "Supprimer le snapshot \"{name}\"",
     "xpack.snapshotRestore.snapshotList.table.actionDeleteTooltip": "Supprimer",
     "xpack.snapshotRestore.snapshotList.table.actionRestoreAriaLabel": "Stocker le snapshot \"{name}\"",
@@ -23083,8 +27694,17 @@
     "xpack.snapshotRestore.snapshotState.partialTipDescription": "L'état du cluster global a été stocké, mais au moins une partition n'a pas été stockée correctement. Consultez l'onglet \"Index échoués\".",
     "xpack.spaces.defaultSpaceDescription": "Il s'agit de votre espace par défaut !",
     "xpack.spaces.defaultSpaceTitle": "Par défaut",
-    "xpack.spaces.displayName": "Spaces",
+    "xpack.spaces.displayName": "Espaces",
+    "xpack.spaces.embeddableLegacyUrlConflict.calloutTitle": "Copier ce JSON et l'utiliser avec la {documentationLink}",
+    "xpack.spaces.embeddableLegacyUrlConflict.detailsButton": "Afficher les détails",
+    "xpack.spaces.embeddableLegacyUrlConflict.messageText": "Nous avons trouvé 2 objets enregistrés pour ce panneau. Désactivez l'alias de l'URL existant pour corriger cette erreur.",
     "xpack.spaces.featureDescription": "Organisez vos tableaux de bord et autres objets enregistrés en catégories pertinentes.",
+    "xpack.spaces.legacyUrlConflict.calloutBodyText": "Assurez-vous qu'il s'agit du {objectNoun} que vous recherchez. Sinon, consultez le deuxième. {documentationLink}",
+    "xpack.spaces.legacyUrlConflict.calloutTitle": "2 objets enregistrés utilisent cette URL",
+    "xpack.spaces.legacyUrlConflict.dismissButton": "Rejeter",
+    "xpack.spaces.legacyUrlConflict.documentationLinkText": "En savoir plus",
+    "xpack.spaces.legacyUrlConflict.linkButton": "Accéder à un autre {objectNoun}",
+    "xpack.spaces.legacyURLConflict.toolTipText": "Ce {objectNoun} possède l'ID [id={currentObjectId}]. L'autre {objectNoun} possède l'ID [id={otherObjectId}].",
     "xpack.spaces.management.advancedSettingsSubtitle.applyingSettingsOnPageToSpaceDescription": "Les paramètres de cette page s'appliquent à l'espace {spaceName}, sauf indication contraire.",
     "xpack.spaces.management.advancedSettingsTitle.settingsTitle": "Paramètres",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.cancelButton": "Annuler",
@@ -23233,11 +27853,14 @@
     "xpack.spaces.navControl.spacesMenu.changeCurrentSpaceTitle": "Modifier l'espace en cours",
     "xpack.spaces.navControl.spacesMenu.findSpacePlaceholder": "Rechercher un espace",
     "xpack.spaces.navControl.spacesMenu.noSpacesFoundTitle": " aucun espace trouvé ",
+    "xpack.spaces.redirectLegacyUrlToast.text": "Le {objectNoun} que vous recherchez possède un nouvel emplacement. Utilisez cette URL à partir de maintenant.",
+    "xpack.spaces.redirectLegacyUrlToast.title": "Nous vous avons redirigé vers une nouvelle URL",
     "xpack.spaces.shareToSpace.aliasTableCalloutBody": "{aliasesToDisableCount, plural, one {# URL existante sera désactivée} other {# URL existantes seront désactivées}}.",
     "xpack.spaces.shareToSpace.aliasTableCalloutTitle": "Conflit d'URL existantes",
     "xpack.spaces.shareToSpace.allSpacesTarget": "tous les espaces",
     "xpack.spaces.shareToSpace.cancelButton": "Annuler",
     "xpack.spaces.shareToSpace.continueButton": "Continuer",
+    "xpack.spaces.shareToSpace.currentSpaceBadge": "Actuel",
     "xpack.spaces.shareToSpace.featureIsDisabledTooltip": "Cette fonctionnalité est désactivée dans cet espace.",
     "xpack.spaces.shareToSpace.flyoutTitle": "Attribuer {objectNoun} aux espaces",
     "xpack.spaces.shareToSpace.noAvailableSpaces.canCreateNewSpace.linkText": "créer un nouvel espace",
@@ -23258,7 +27881,7 @@
     "xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.text": "Rendre {objectNoun} disponible dans tous les espaces, actuels et futurs.",
     "xpack.spaces.shareToSpace.shareModeControl.shareToExplicitSpaces.buttonLabel": "Sélectionner les espaces",
     "xpack.spaces.shareToSpace.shareModeControl.shareToExplicitSpaces.text": "Rendre {objectNoun} disponible uniquement dans les espaces sélectionnés.",
-    "xpack.spaces.shareToSpace.shareSuccessAddRemoveText": "oel \"{object}\" {relativesCount, plural, =0 {a été ajouté} =1 {et {relativesCount} objet associé ont été ajoutés} other {et {relativesCount} objets associés ont été ajoutés}} à {spacesTargetAdd} et {relativesCount, plural, =0{retiré} other {retirés}} de {spacesTargetRemove}",
+    "xpack.spaces.shareToSpace.shareSuccessAddRemoveText": "\"{object}\" {relativesCount, plural, =0 {a été ajouté} =1 {et {relativesCount} objet associé ont été ajoutés} other {et {relativesCount} objets associés ont été ajoutés}} à {spacesTargetAdd} et {relativesCount, plural, =0{retiré} other {retirés}} de {spacesTargetRemove}",
     "xpack.spaces.shareToSpace.shareSuccessAddText": "\"{object}\" {relativesCount, plural, =0 {a été ajouté} =1 {et {relativesCount} objet associé ont été ajoutés} other {et {relativesCount} objets associés ont été ajoutés}} à {spacesTarget}.",
     "xpack.spaces.shareToSpace.shareSuccessRemoveText": "\"{object}\" {relativesCount, plural, =0 {a été supprimé} =1 {et {relativesCount} objet associé ont été supprimés} other {et {relativesCount} objets associés ont été supprimés}} de {spacesTarget}.",
     "xpack.spaces.shareToSpace.shareSuccessTitle": "{objectNoun} mis à jour",
@@ -23273,10 +27896,11 @@
     "xpack.spaces.spaceList.showMoreSpacesLink": "+{count} de plus",
     "xpack.spaces.spaceList.unauthorizedSpacesCountLabel": "Vous ne disposez pas d'autorisation pour afficher ces espaces.",
     "xpack.spaces.spaceSelector.appTitle": "Sélectionner un espace",
-    "xpack.spaces.spaceSelector.changeSpaceAnytimeAvailabilityText": "Vous pouvez modifier votre espace à tout moment",
+    "xpack.spaces.spaceSelector.changeSpaceAnytimeAvailabilityText": "Vous pouvez modifier votre espace à tout moment.",
     "xpack.spaces.spaceSelector.contactSysAdminDescription": "Contactez votre administrateur système.",
     "xpack.spaces.spaceSelector.errorLoadingSpacesDescription": "Erreur lors du chargement des espaces ({message})",
     "xpack.spaces.spaceSelector.findSpacePlaceholder": "Rechercher un espace",
+    "xpack.spaces.spaceSelector.noSpacesMatchSearchCriteriaDescription": "Aucun espace ne correspond à {searchTerm}",
     "xpack.spaces.spaceSelector.selectSpacesTitle": "Sélectionner votre espace",
     "xpack.spaces.spacesTitle": "Espaces",
     "xpack.spaces.uiApi.errorBoundaryToastMessage": "Rechargez la page pour continuer.",
@@ -23310,8 +27934,9 @@
     "xpack.stackAlerts.esQuery.missingEsQueryErrorMessage": "[esQuery] : doit contenir \"query\"",
     "xpack.stackAlerts.esQuery.ui.alertParams.fixErrorInExpressionBelowValidationMessage": "L'expression contient des erreurs.",
     "xpack.stackAlerts.esQuery.ui.alertType.defaultActionMessage": "L'alerte de recherche Elasticsearch \"\\{\\{alertName\\}\\}\" est active :\n\n- Valeur : \\{\\{context.value\\}\\}\n- Conditions remplies : \\{\\{context.conditions\\}\\} sur \\{\\{params.timeWindowSize\\}\\}\\{\\{params.timeWindowUnit\\}\\}\n- Horodatage : \\{\\{context.date\\}\\}",
-    "xpack.stackAlerts.esQuery.ui.alertType.descriptionText": "Alerte sur les correspondances d'une recherche Elasticsearch.",
+    "xpack.stackAlerts.esQuery.ui.alertType.descriptionText": "Alerte lorsque des correspondances sont trouvées au cours de la dernière exécution de la requête.",
     "xpack.stackAlerts.esQuery.ui.conditionPrompt": "Lorsque le nombre de correspondances",
+    "xpack.stackAlerts.esQuery.ui.conditionPrompt.toolTip": "La fenêtre temporelle définie ci-dessous s'applique uniquement à la première vérification de règle.",
     "xpack.stackAlerts.esQuery.ui.numQueryMatchesText": "La recherche correspond à {count} documents dans le/la/les dernier(s)/dernière(s) {window}.",
     "xpack.stackAlerts.esQuery.ui.queryEditor": "Éditeur de recherche Elasticsearch",
     "xpack.stackAlerts.esQuery.ui.queryError": "Erreur lors du test de la recherche : {message}",
@@ -23347,25 +27972,25 @@
     "xpack.stackAlerts.geoContainment.descriptionText": "Alerte lorsqu'une entité est contenue dans une limite géographique.",
     "xpack.stackAlerts.geoContainment.entityByLabel": "par",
     "xpack.stackAlerts.geoContainment.entityIndexLabel": "index",
-    "xpack.stackAlerts.geoContainment.entityIndexSelect": "Sélectionner un modèle d'indexation et un champ de point géographique",
+    "xpack.stackAlerts.geoContainment.entityIndexSelect": "Sélectionner une vue de données et un champ de point géographique",
     "xpack.stackAlerts.geoContainment.error.requiredBoundaryGeoFieldText": "Le champ de limite géographique est requis.",
-    "xpack.stackAlerts.geoContainment.error.requiredBoundaryIndexTitleText": "Le titre du modèle d'indexation de limite est requis.",
+    "xpack.stackAlerts.geoContainment.error.requiredBoundaryIndexTitleText": "Le titre de la vue de données de limite est requis.",
     "xpack.stackAlerts.geoContainment.error.requiredBoundaryTypeText": "Le type de limite est requis.",
     "xpack.stackAlerts.geoContainment.error.requiredDateFieldText": "Le champ de date est requis.",
     "xpack.stackAlerts.geoContainment.error.requiredEntityText": "L'entité est requise.",
     "xpack.stackAlerts.geoContainment.error.requiredGeoFieldText": "Le champ géographique est requis.",
-    "xpack.stackAlerts.geoContainment.error.requiredIndexTitleText": "Le modèle d'indexation est requis.",
+    "xpack.stackAlerts.geoContainment.error.requiredIndexTitleText": "La vue de données est requise.",
     "xpack.stackAlerts.geoContainment.fixErrorInExpressionBelowValidationMessage": "L'expression contient des erreurs.",
     "xpack.stackAlerts.geoContainment.geofieldLabel": "Champ géospatial",
     "xpack.stackAlerts.geoContainment.indexLabel": "index",
-    "xpack.stackAlerts.geoContainment.indexPatternSelectLabel": "Modèle d'indexation",
-    "xpack.stackAlerts.geoContainment.indexPatternSelectPlaceholder": "Sélectionner un modèle d'indexation",
-    "xpack.stackAlerts.geoContainment.noGeoFieldInIndexPattern.message": "Le modèle d'indexation ne contient aucun champ géospatial autorisé. Il doit en contenir un de type {geoFields}.",
-    "xpack.stackAlerts.geoContainment.noIndexPattern.doThisLinkTextDescription": "Créez un modèle d'indexation.",
+    "xpack.stackAlerts.geoContainment.indexPatternSelectLabel": "Vue de données",
+    "xpack.stackAlerts.geoContainment.indexPatternSelectPlaceholder": "Sélectionner la vue de données",
+    "xpack.stackAlerts.geoContainment.noGeoFieldInIndexPattern.message": "La vue de données ne contient aucun champ géospatial autorisé. Il doit en contenir un de type {geoFields}.",
+    "xpack.stackAlerts.geoContainment.noIndexPattern.doThisLinkTextDescription": "Créez une vue de données.",
     "xpack.stackAlerts.geoContainment.noIndexPattern.doThisPrefixDescription": "Vous devrez ",
     "xpack.stackAlerts.geoContainment.noIndexPattern.getStartedLinkText": "Commencez avec des échantillons d'ensembles de données.",
     "xpack.stackAlerts.geoContainment.noIndexPattern.hintDescription": "Vous n'avez aucune donnée ? ",
-    "xpack.stackAlerts.geoContainment.noIndexPattern.messageTitle": "Impossible de trouver un modèle d'indexation",
+    "xpack.stackAlerts.geoContainment.noIndexPattern.messageTitle": "Aucune vue de données n’a été trouvée",
     "xpack.stackAlerts.geoContainment.notGeoContained": "Plus contenu",
     "xpack.stackAlerts.geoContainment.selectBoundaryIndex": "Sélectionner une limite",
     "xpack.stackAlerts.geoContainment.selectEntity": "Sélectionner une entité",
@@ -23386,6 +28011,8 @@
     "xpack.stackAlerts.indexThreshold.actionVariableContextValueLabel": "Valeur ayant dépassé le seuil.",
     "xpack.stackAlerts.indexThreshold.alertTypeContextMessageDescription": "l'alerte \"{name}\" est active pour le groupe \"{group}\" :\n\n- Valeur : {value}\n- Conditions remplies : {conditions} sur {window}\n- Horodatage : {date}",
     "xpack.stackAlerts.indexThreshold.alertTypeContextSubjectTitle": "le groupe {group} de l'alerte {name} a atteint le seuil",
+    "xpack.stackAlerts.indexThreshold.alertTypeRecoveryContextMessageDescription": "l'alerte \"{name}\" est récupérée pour le groupe \"{group}\" :\n\n- Valeur : {value}\n- Conditions remplies : {conditions} sur {window}\n- Horodatage : {date}",
+    "xpack.stackAlerts.indexThreshold.alertTypeRecoveryContextSubjectTitle": "groupe {group} de l'alerte {name} récupéré",
     "xpack.stackAlerts.indexThreshold.alertTypeTitle": "Seuil de l'index",
     "xpack.stackAlerts.indexThreshold.invalidComparatorErrorMessage": "thresholdComparator spécifié non valide : {comparator}",
     "xpack.stackAlerts.indexThreshold.invalidThreshold2ErrorMessage": "[threshold] : requiert deux éléments pour le comparateur \"{thresholdComparator}\"",
@@ -23438,13 +28065,18 @@
     "xpack.timelines.fieldBrowser.descriptionLabel": "Description",
     "xpack.timelines.fieldBrowser.fieldBrowserTitle": "Champs",
     "xpack.timelines.fieldBrowser.fieldLabel": "Champ",
-    "xpack.timelines.fieldBrowser.fieldsCountTitle": "{totalCount} {totalCount, plural, =1 {champ} other {champs}}",
+    "xpack.timelines.fieldBrowser.fieldName": "Nom",
+    "xpack.timelines.fieldBrowser.fieldsCountShowing": "Affichage",
+    "xpack.timelines.fieldBrowser.fieldsCountTitle": "{totalCount, plural, =1 {champ} other {champs}}",
     "xpack.timelines.fieldBrowser.fieldsTitle": "Champs",
     "xpack.timelines.fieldBrowser.filterPlaceholder": "Nom du champ",
     "xpack.timelines.fieldBrowser.noFieldsMatchInputLabel": "Aucun champ ne correspond à {searchInput}",
     "xpack.timelines.fieldBrowser.noFieldsMatchLabel": "Aucun champ ne correspond",
     "xpack.timelines.fieldBrowser.resetFieldsLink": "Réinitialiser les champs",
+    "xpack.timelines.fieldBrowser.viewAll": "tous",
     "xpack.timelines.fieldBrowser.viewColumnCheckboxAriaLabel": "Afficher la colonne {field}",
+    "xpack.timelines.fieldBrowser.viewLabel": "Afficher",
+    "xpack.timelines.fieldBrowser.viewSelected": "sélectionné",
     "xpack.timelines.footer.autoRefreshActiveDescription": "Actualisation automatique active",
     "xpack.timelines.footer.autoRefreshActiveTooltip": "Lorsque l'actualisation automatique est activée, la chronologie vous montrera les derniers événements {numberOfItems} correspondant à votre recherche.",
     "xpack.timelines.footer.events": "Événements",
@@ -23455,8 +28087,11 @@
     "xpack.timelines.footer.rowsPerPageLabel": "Lignes par page : {rowsPerPage}",
     "xpack.timelines.footer.totalCountOfEvents": "événements",
     "xpack.timelines.hoverActions.addToTimeline": "Ajouter à l'investigation de chronologie",
+    "xpack.timelines.hoverActions.addToTimeline.addedFieldMessage": "Ajout effectué de {fieldOrValue} {isTimeline, select, true {à la chronologie} false {au modèle}}",
     "xpack.timelines.hoverActions.columnToggleLabel": "Basculer la vue {field} dans le tableau",
     "xpack.timelines.hoverActions.fieldLabel": "Champ",
+    "xpack.timelines.hoverActions.filterIn": "Inclure",
+    "xpack.timelines.hoverActions.filterOut": "Exclure",
     "xpack.timelines.hoverActions.moreActions": "Plus d'actions",
     "xpack.timelines.hoverActions.nestedColumnToggleLabel": "Le champ {field} est un objet, et il est composé de champs imbriqués qui peuvent être ajoutés en tant que colonnes",
     "xpack.timelines.hoverActions.tooltipWithKeyboardShortcut.pressTooltipLabel": "Appuyer",
@@ -23473,6 +28108,8 @@
     "xpack.timelines.lastUpdated.updated": "Mis à jour",
     "xpack.timelines.lastUpdated.updating": "Mise à jour...",
     "xpack.timelines.tgrid.body.ariaLabel": "Alertes",
+    "xpack.timelines.tgrid.empty.description": "Essayer de rechercher sur une période plus longue ou de modifier votre recherche",
+    "xpack.timelines.tgrid.empty.title": "Aucun résultat ne correspond à vos critères de recherche.",
     "xpack.timelines.tGrid.eventsLabel": "Événements",
     "xpack.timelines.tGrid.footer.loadingEventsDataLabel": "Chargement des événements",
     "xpack.timelines.tGrid.footer.totalCountOfEvents": "événements",
@@ -23496,7 +28133,7 @@
     "xpack.timelines.timeline.body.actions.viewDetailsAriaLabel": "Afficher les détails",
     "xpack.timelines.timeline.body.actions.viewDetailsForRowAriaLabel": "Afficher les détails pour l'alerte ou l'événement de la ligne {ariaRowindex}, avec les colonnes {columnValues}",
     "xpack.timelines.timeline.body.actions.viewSummaryLabel": "Afficher le résumé",
-    "xpack.timelines.timeline.body.copyToClipboardButtonLabel": "Copier dans le presse-papiers",
+    "xpack.timelines.timeline.body.copyToClipboardButtonLabel": "Copier dans le Presse-papiers",
     "xpack.timelines.timeline.body.notes.addOrViewNotesForThisEventTooltip": "Ajouter des notes pour cet évènement",
     "xpack.timelines.timeline.body.notes.disableEventTooltip": "Les notes ne peuvent pas être ajoutées ici lors de la modification d'une chronologie de modèle",
     "xpack.timelines.timeline.body.pinning.disablePinnnedTooltip": "Cet événement ne peut pas être épinglé lors de la modification d'une chronologie de modèle",
@@ -23508,7 +28145,7 @@
     "xpack.timelines.timeline.categoryTooltip": "Catégorie",
     "xpack.timelines.timeline.closedAlertFailedToastMessage": "Impossible de fermer l'alerte ou les alertes.",
     "xpack.timelines.timeline.closedAlertSuccessToastMessage": "Fermeture réussie de {totalAlerts} {totalAlerts, plural, =1 {alerte} other {alertes}}.",
-    "xpack.timelines.timeline.closeSelectedTitle": "Fermer la sélection",
+    "xpack.timelines.timeline.closeSelectedTitle": "Marquer comme fermé",
     "xpack.timelines.timeline.descriptionTooltip": "Description",
     "xpack.timelines.timeline.eventHasEventRendererScreenReaderOnly": "L'événement de la ligne {row} possède un outil de rendu d'événement. Appuyez sur Maj + flèche vers le bas pour faire la mise au point dessus.",
     "xpack.timelines.timeline.eventHasNotesScreenReaderOnly": "L'événement de la ligne {row} possède {notesCount, plural, =1 {une note} other {{notesCount} des notes}}. Appuyez sur Maj + flèche vers la droite pour faire la mise au point sur les notes.",
@@ -23518,22 +28155,24 @@
     "xpack.timelines.timeline.fullScreenButton": "Plein écran",
     "xpack.timelines.timeline.openedAlertFailedToastMessage": "Impossible d'ouvrir l'alerte/les alertes",
     "xpack.timelines.timeline.openedAlertSuccessToastMessage": "Ouverture réussie de {totalAlerts} {totalAlerts, plural, =1 {alerte} other {alertes}}.",
-    "xpack.timelines.timeline.openSelectedTitle": "Ouvrir la sélection",
+    "xpack.timelines.timeline.openSelectedTitle": "Marquer comme ouvert",
     "xpack.timelines.timeline.properties.timelineToggleButtonAriaLabel": "{isOpen, select, false {Ouvrir} true {Fermer} other {Basculer}} la chronologie {title}",
     "xpack.timelines.timeline.sortAZLabel": "Trier A-Z",
     "xpack.timelines.timeline.sortFieldsButton": "Trier les champs",
     "xpack.timelines.timeline.sortZALabel": "Trier Z-A",
     "xpack.timelines.timeline.typeTooltip": "Type",
     "xpack.timelines.timeline.updateAlertStatusFailed": "Impossible de mettre à jour { conflicts } {conflicts, plural, =1 {alerte} other {alertes}}.",
-    "xpack.timelines.timeline.updateAlertStatusFailedDetailed": "{ updated } {updated, plural, =1 {alerte a été correctement mise} other {alertes ont été correctement mises}} à jour, mais { conflicts } n'ont pas pu être mises à jour,\n         car { conflicts, plural, =1 {elle était} other {elles étaient}} déjà en cours de modification.",
+    "xpack.timelines.timeline.updateAlertStatusFailedDetailed": "{ updated } {updated, plural, =1 {alerte a été mise à jour} other {alertes ont été mises à jour}} correctement, mais { conflicts } n'ont pas pu être mis à jour\n         car { conflicts, plural, =1 {elle était} other {elles étaient}} déjà en cours de modification.",
     "xpack.timelines.timeline.updateAlertStatusFailedSingleAlert": "Impossible de mettre à jour l'alerte, car elle était déjà en cours de modification.",
     "xpack.timelines.timeline.youAreInAnEventRendererScreenReaderOnly": "Vous êtes dans un outil de rendu d'événement pour la ligne : {row}. Appuyez sur la touche fléchée vers le haut pour quitter et revenir à la ligne en cours, ou sur la touche fléchée vers le bas pour quitter et passer à la ligne suivante.",
     "xpack.timelines.timeline.youAreInATableCellScreenReaderOnly": "Vous êtes dans une cellule de tableau. Ligne : {row}, colonne : {column}",
     "xpack.timelines.timelineEvents.errorSearchDescription": "Une erreur s'est produite lors de la recherche d'événements de la chronologie",
     "xpack.timelines.toolbar.bulkActions.clearSelectionTitle": "Effacer la sélection",
-    "xpack.timelines.toolbar.bulkActions.selectAllAlertsTitle": "Sélectionner {totalAlertsFormatted} {totalAlerts, plural, =1 {alerte} other {alertes}}",
-    "xpack.timelines.toolbar.bulkActions.selectedAlertsTitle": "{selectedAlertsFormatted} {selectedAlerts, plural, =1 {alerte sélectionnée} other {alertes sélectionnées}} ",
+    "xpack.timelines.toolbar.bulkActions.selectAllAlertsTitle": "Sélectionner un total de {totalAlertsFormatted} {totalAlerts, plural, =1 {alerte} other {alertes}}",
+    "xpack.timelines.toolbar.bulkActions.selectedAlertsTitle": "{selectedAlertsFormatted} {selectedAlerts, plural, =1 {alerte sélectionnée} other {alertes sélectionnées}}",
+    "xpack.transform.actionDeleteTransform.bulkDeleteDestDataViewTitle": "Supprimer les vues de données de destination",
     "xpack.transform.actionDeleteTransform.bulkDeleteDestinationIndexTitle": "Supprimer les index de destination",
+    "xpack.transform.actionDeleteTransform.deleteDestDataViewTitle": "Supprimer la vue de données {destinationIndex}",
     "xpack.transform.actionDeleteTransform.deleteDestinationIndexTitle": "Supprimer l'index de destination {destinationIndex}",
     "xpack.transform.agg.popoverForm.aggLabel": "Agrégation",
     "xpack.transform.agg.popoverForm.aggNameAlreadyUsedError": "Une autre agrégation utilise déjà ce nom.",
@@ -23546,33 +28185,59 @@
     "xpack.transform.agg.popoverForm.filerAgg.term.errorFetchSuggestions": "Impossible de récupérer des suggestions",
     "xpack.transform.agg.popoverForm.filerAgg.term.valueLabel": "Valeur",
     "xpack.transform.agg.popoverForm.filerAggLabel": "Filtrer la recherche",
+    "xpack.transform.agg.popoverForm.filerQueryAdvancedSuggestionTooltip": "Pour ajouter d'autres agrégations de requêtes de filtre, modifiez la configuration JSON.",
     "xpack.transform.agg.popoverForm.nameLabel": "Nom de l'agrégation",
-    "xpack.transform.agg.popoverForm.percentsLabel": "Pourcents",
+    "xpack.transform.agg.popoverForm.percentsLabel": "Pour cent",
+    "xpack.transform.agg.popoverForm.sizeLabel": "Taille",
     "xpack.transform.agg.popoverForm.sortDirectionTopMetricsLabel": "Sens de tri",
     "xpack.transform.agg.popoverForm.sortFieldTopMetricsLabel": "Champ de tri",
     "xpack.transform.agg.popoverForm.submitButtonLabel": "Appliquer",
     "xpack.transform.agg.popoverForm.unsupportedAggregationHelpText": "Seul le nom de l'agrégation peut être modifié dans ce formulaire. Veuillez utiliser l'éditeur avancé pour modifier les autres parties de l'agrégation.",
     "xpack.transform.aggLabelForm.deleteItemAriaLabel": "Supprimer un élément",
     "xpack.transform.aggLabelForm.editAggAriaLabel": "Modifier l'agrégation",
+    "xpack.transform.alertingRuleTypes.transformHealth.actionGroupName": "Problème détecté",
+    "xpack.transform.alertingRuleTypes.transformHealth.description": "Alerte lorsque les transformations rencontrent des problèmes de fonctionnement.",
+    "xpack.transform.alertingRuleTypes.transformHealth.fetchErrorMessage": "Impossible de récupérer les transformations",
+    "xpack.transform.alertingRuleTypes.transformHealth.name": "Intégrité de la transformation",
+    "xpack.transform.alertTypes.transformHealth.alertContext.messageDescription": "Message d'info d'alerte",
+    "xpack.transform.alertTypes.transformHealth.alertContext.resultsDescription": "Résultats d'exécution de la règle",
+    "xpack.transform.alertTypes.transformHealth.defaultActionMessage": "[\\{\\{rule.name\\}\\}] Résultat de la vérification d'intégrité de la transformation :\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  ID de la transformation : \\{\\{transform_id\\}\\}\n  \\{\\{#description\\}\\}Description de la transformation : \\{\\{description\\}\\}\n  \\{\\{/description\\}\\}\\{\\{#transform_state\\}\\}État de la transformation : \\{\\{transform_state\\}\\}\n  \\{\\{/transform_state\\}\\}\\{\\{#failure_reason\\}\\}Raison de l'échec : \\{\\{failure_reason\\}\\}\n  \\{\\{/failure_reason\\}\\}\\{\\{#notification_message\\}\\}Message de notification : \\{\\{notification_message\\}\\}\n  \\{\\{/notification_message\\}\\}\\{\\{#node_name\\}\\}Nom du nœud : \\{\\{node_name\\}\\}\n  \\{\\{/node_name\\}\\}\\{\\{#timestamp\\}\\}Horodatage : \\{\\{timestamp\\}\\}\n  \\{\\{/timestamp\\}\\}\n\n\\{\\{/context.results\\}\\}\n",
+    "xpack.transform.alertTypes.transformHealth.excludeTransformsLabel": "Exclure les transformations",
+    "xpack.transform.alertTypes.transformHealth.includeTransforms.errorMessage": "Au moins une transformation doit être sélectionnée",
+    "xpack.transform.alertTypes.transformHealth.includeTransformsLabel": "Inclure les transformations",
+    "xpack.transform.alertTypes.transformHealth.notStartedCheckDescription": "Recevez des alertes lorsque la transformation n'a pas démarré ou n'indexe pas les données.",
+    "xpack.transform.alertTypes.transformHealth.notStartedCheckName": "La transformation n'a pas démarré",
+    "xpack.transform.alertTypes.transformHealth.notStartedMessage": "{count, plural, one {La transformation} other {Les transformations}} {transformsString} {count, plural, one {n'a} other {n'ont}} pas démarré.",
+    "xpack.transform.alertTypes.transformHealth.testsSelection.enableTestLabel": "Activer",
     "xpack.transform.app.checkingPrivilegesDescription": "Vérification des privilèges…",
     "xpack.transform.app.checkingPrivilegesErrorMessage": "Erreur lors de la récupération des privilèges utilisateur depuis le serveur",
     "xpack.transform.app.deniedPrivilegeDescription": "Pour utiliser cette section de Transformations, vous devez posséder {privilegesCount, plural, one {ce privilège de cluster} other {ces privilèges de cluster}} : {missingPrivileges}.",
     "xpack.transform.app.deniedPrivilegeTitle": "Vous ne disposez pas de privilèges de cluster",
     "xpack.transform.appName": "Transformations",
     "xpack.transform.appTitle": "Transformations",
+    "xpack.transform.capability.noPermission.canCreateTransformAlertsTooltip": "Vous ne disposez pas d'autorisation pour créer des règles d'alerte de transformation.",
     "xpack.transform.capability.noPermission.createTransformTooltip": "Vous ne disposez pas d'autorisation pour créer des transformations.",
     "xpack.transform.capability.noPermission.deleteTransformTooltip": "Vous ne disposez pas d'autorisation pour supprimer des transformations.",
     "xpack.transform.capability.noPermission.noTransformNodesTooltip": "Aucun nœud de transformation n'est disponible.",
+    "xpack.transform.capability.noPermission.resetTransformTooltip": "Vous ne disposez pas d'autorisation pour réinitialiser des transformations.",
     "xpack.transform.capability.noPermission.startOrStopTransformTooltip": "Vous ne disposez pas d'autorisation pour démarrer ni arrêter des transformations.",
     "xpack.transform.capability.pleaseContactAdministratorTooltip": "{message} Veuillez contacter votre administrateur.",
-    "xpack.transform.clone.errorPromptText": "Une erreur s'est produite lors de la vérification de l'existence d'un modèle d'indexation source",
+    "xpack.transform.clone.errorPromptText": "Une erreur s'est produite lors de la vérification de l'existence des données source",
     "xpack.transform.clone.errorPromptTitle": "Une erreur s'est produite lors de l'obtention de la configuration de la transformation.",
-    "xpack.transform.clone.fetchErrorPromptText": "Impossible de récupérer l'ID du modèle d'indexation Kibana.",
+    "xpack.transform.clone.fetchErrorPromptText": "Impossible de récupérer l'ID de vue des données Kibana.",
+    "xpack.transform.clone.noDataViewErrorPromptText": "Impossible de cloner la transformation {transformId}. Il n'existe aucune vue de données pour {dataViewTitle}.",
     "xpack.transform.cloneTransform.breadcrumbTitle": "Cloner la transformation",
     "xpack.transform.createTransform.breadcrumbTitle": "Créer une transformation",
+    "xpack.transform.danglingTasksError": "Des détails de configuration sont manquants pour {count} {count, plural, one {transformation} other {transformations}} : [{transformIds}] {count, plural, one {Cette transformation ne peut pas être récupérée et doit être supprimée} other {Ces transformations ne peuvent pas être récupérées et doivent être supprimées}}.",
+    "xpack.transform.deleteTransform.deleteAnalyticsWithDataViewErrorMessage": "Une erreur s'est produite lors de la suppression de la vue de données {destinationIndex}",
+    "xpack.transform.deleteTransform.deleteAnalyticsWithDataViewSuccessMessage": "Requête de suppression de la vue de données {destinationIndex} reconnue.",
     "xpack.transform.deleteTransform.deleteAnalyticsWithIndexErrorMessage": "Une erreur s'est produite lors de la suppression de l'index de destination {destinationIndex}",
-    "xpack.transform.deleteTransform.deleteAnalyticsWithIndexSuccessMessage": "Requête de suppression de l'index de destination {destinationIndex} reconnu.",
+    "xpack.transform.deleteTransform.deleteAnalyticsWithIndexSuccessMessage": "Requête de suppression de l'index de destination {destinationIndex} reconnue.",
+    "xpack.transform.deleteTransform.errorWithCheckingIfDataViewExistsNotificationErrorMessage": "Une erreur s’est produite lors de la vérification de l’existence de la vue de données {dataView} : {error}",
     "xpack.transform.description": "Description",
+    "xpack.transform.edit.errorPromptText": "Une erreur s'est produite lors de la vérification de l'existence des données source",
+    "xpack.transform.edit.noDataViewErrorPromptText": "Impossible d'obtenir la vue de données pour la transformation {transformId}. Il n'existe aucune vue de données pour {dataViewTitle}.",
+    "xpack.transform.forceDeleteTransformMessage": "Supprimer {count} {count, plural, one {transformation} other {transformations}}",
     "xpack.transform.groupby.popoverForm.aggLabel": "Agrégation",
     "xpack.transform.groupBy.popoverForm.aggNameAlreadyUsedError": "Une autre configuration Regrouper par utilise déjà ce nom.",
     "xpack.transform.groupBy.popoverForm.aggNameInvalidCharError": "Nom invalide. Les caractères \"[\", \"]\" et \">\" ne sont pas autorisés, et le nom ne doit pas commencer ni se terminer par un caractère d'espace.",
@@ -23580,6 +28245,7 @@
     "xpack.transform.groupBy.popoverForm.intervalError": "Intervalle non valide.",
     "xpack.transform.groupBy.popoverForm.intervalLabel": "Intervalle",
     "xpack.transform.groupBy.popoverForm.intervalPercents": "Entrer une liste de centiles séparés par des virgules",
+    "xpack.transform.groupBy.popoverForm.invalidSizeErrorMessage": "Entrer un nombre positif valide",
     "xpack.transform.groupBy.popoverForm.missingBucketCheckboxHelpText": "Cochez cette case pour inclure les documents sans valeur.",
     "xpack.transform.groupby.popoverForm.missingBucketCheckboxLabel": "Inclure les compartiments manquants",
     "xpack.transform.groupBy.popoverForm.nameLabel": "Nom pour Regrouper par",
@@ -23590,11 +28256,13 @@
     "xpack.transform.home.breadcrumbTitle": "Transformations",
     "xpack.transform.indexPreview.copyClipboardTooltip": "Copier la déclaration Dev Console de l'aperçu de l'index dans le presse-papiers.",
     "xpack.transform.indexPreview.copyRuntimeFieldsClipboardTooltip": "Copier la déclaration Dev Console des champs de temps d'exécution dans le presse-papiers.",
+    "xpack.transform.invalidRuntimeFieldMessage": "Champ d'exécution non valide",
     "xpack.transform.latestPreview.latestPreviewIncompleteConfigCalloutBody": "Veuillez choisir au moins une clé unique et un champ de tri.",
     "xpack.transform.licenseCheckErrorMessage": "La vérification de la licence a échoué",
     "xpack.transform.list.emptyPromptButtonText": "Créez votre première transformation",
     "xpack.transform.list.emptyPromptTitle": "Aucune transformation n'a été trouvée",
     "xpack.transform.list.errorPromptTitle": "Une erreur s'est produite lors de l'obtention de la liste de transformations",
+    "xpack.transform.managedTransformsWarningCallout": "{count, plural, one {Cette transformation} other {Au moins une de ces transformations}} est préconfigurée par Elastic ; le fait de {count, plural, one {la} other {les}} {action} pourrait avoir un impact sur d'autres éléments du produit.",
     "xpack.transform.mode": "Mode",
     "xpack.transform.modeFilter": "Mode",
     "xpack.transform.models.transformService.allOtherRequestsCancelledDescription": "Toutes les autres requêtes ont été annulées.",
@@ -23604,13 +28272,14 @@
     "xpack.transform.newTransform.chooseSourceTitle": "Choisissez une source",
     "xpack.transform.newTransform.newTransformTitle": "Nouvelle transformation",
     "xpack.transform.newTransform.searchSelection.notFoundLabel": "Aucun recherche enregistrée ni aucun index correspondants n'ont été trouvés.",
+    "xpack.transform.newTransform.searchSelection.savedObjectType.dataView": "Vue de données",
     "xpack.transform.newTransform.searchSelection.savedObjectType.search": "Recherche enregistrée",
     "xpack.transform.pivotPreview.copyClipboardTooltip": "Copier la déclaration Dev Console de l'aperçu de la transformation dans le presse-papiers.",
     "xpack.transform.pivotPreview.PivotPreviewIncompleteConfigCalloutBody": "Veuillez choisir au moins un champ Regrouper par et une agrégation.",
     "xpack.transform.pivotPreview.PivotPreviewNoDataCalloutBody": "La requête d'aperçu n'a renvoyé aucune donnée. Veuillez vous assurer que la requête facultative renvoie des données et que les valeurs existent pour le champ utilisé par le champ Regrouper par et le champ d'agrégation.",
     "xpack.transform.pivotPreview.transformPreviewTitle": "Aperçu de la transformation",
     "xpack.transform.progress": "Progression",
-    "xpack.transform.searchItems.errorInitializationTitle": "Une erreur s'est produite lors de l'initialisation du modèle d'indexation Kibana ou de la recherche enregistrée.",
+    "xpack.transform.searchItems.errorInitializationTitle": "Une erreur s'est produite lors de l'initialisation de la vue de données Kibana ou de la recherche enregistrée.",
     "xpack.transform.statsBar.batchTransformsLabel": "Lot",
     "xpack.transform.statsBar.continuousTransformsLabel": "Continu",
     "xpack.transform.statsBar.failedTransformsLabel": "Échoué",
@@ -23622,14 +28291,21 @@
     "xpack.transform.stepCreateForm.continuousModeLabel": "Mode continu",
     "xpack.transform.stepCreateForm.copyTransformConfigToClipboardButton": "Copier dans le presse-papiers",
     "xpack.transform.stepCreateForm.copyTransformConfigToClipboardDescription": "Copie dans le presse-papiers la commande Kibana Dev Console pour créer la transformation.",
+    "xpack.transform.stepCreateForm.createAlertRuleButton": "Créer une règle d'alerte",
+    "xpack.transform.stepCreateForm.createAlertRuleDescription": "Ouvre un assistant pour créer une règle d'alerte permettant de monitorer l'intégrité de la transformation.",
     "xpack.transform.stepCreateForm.createAndStartTransformButton": "Créer et démarrer",
-    "xpack.transform.stepCreateForm.createAndStartTransformDescription": "Crée et démarre la transformation. Une transformation permet d'augmenter la charge de recherche et d'indexation dans votre cluster. Néanmoins, arrêtez la transformation en cas de charge excessive. Une fois la transformation commencée, vous pourrez choisir entre différentes options pour continuer à explorer la transformation.",
+    "xpack.transform.stepCreateForm.createAndStartTransformDescription": "Crée et démarre la transformation. Une transformation permet d'augmenter la charge de recherche et d'indexation dans votre cluster. Néanmoins, arrêtez la transformation en cas de charge excessive. Une fois la transformation commencée, vous pourrez choisir entre différentes options pour continuer à l’explorer.",
+    "xpack.transform.stepCreateForm.createDataViewErrorMessage": "Une erreur s'est produite lors de la création de la vue de données Kibana {dataViewName} :",
+    "xpack.transform.stepCreateForm.createDataViewLabel": "Créer une vue de données Kibana",
+    "xpack.transform.stepCreateForm.createDataViewSuccessMessage": "Vue de données Kibana {dataViewName} correctement créée.",
     "xpack.transform.stepCreateForm.createTransformButton": "Créer",
-    "xpack.transform.stepCreateForm.createTransformDescription": "Créez la transformation sans la démarrer. Vous pourrez démarrer la transformation ultérieurement en revenant à la liste de transformations.",
+    "xpack.transform.stepCreateForm.createTransformDescription": "Crée la transformation sans la démarrer. Vous pourrez démarrer la transformation ultérieurement en revenant à la liste de transformations.",
     "xpack.transform.stepCreateForm.createTransformErrorMessage": "Une erreur s'est produite lors de la création de la transformation {transformId} :",
     "xpack.transform.stepCreateForm.createTransformSuccessMessage": "La requête pour créer la transformation {transformId} a été reconnue.",
+    "xpack.transform.stepCreateForm.creatingDataViewMessage": "Création de la vue de données Kibana...",
     "xpack.transform.stepCreateForm.discoverCardDescription": "Utilisez Discover pour explorer la transformation.",
-    "xpack.transform.stepCreateForm.discoverCardTitle": "Discover",
+    "xpack.transform.stepCreateForm.discoverCardTitle": "Découverte",
+    "xpack.transform.stepCreateForm.duplicateDataViewErrorMessage": "Une erreur s'est produite lors de la création de la vue de données Kibana {dataViewName} : La vue de données existe déjà.",
     "xpack.transform.stepCreateForm.progressErrorMessage": "Une erreur s'est produite lors de l'obtention du pourcentage de progression :",
     "xpack.transform.stepCreateForm.progressTitle": "Progression",
     "xpack.transform.stepCreateForm.retentionPolicyLabel": "Politique de conservation",
@@ -23663,6 +28339,7 @@
     "xpack.transform.stepDefineForm.aggExistsErrorMessage": "Une configuration d'agrégation avec le nom \"{aggName}\" existe déjà.",
     "xpack.transform.stepDefineForm.aggregationsLabel": "Agrégations",
     "xpack.transform.stepDefineForm.aggregationsPlaceholder": "Ajouter une agrégation...",
+    "xpack.transform.stepDefineForm.dataViewLabel": "Vue de données",
     "xpack.transform.stepDefineForm.groupByExistsErrorMessage": "Une configuration Regrouper par avec le nom \"{aggName}\" existe déjà.",
     "xpack.transform.stepDefineForm.groupByLabel": "Regrouper par",
     "xpack.transform.stepDefineForm.groupByPlaceholder": "Ajouter un champ Regrouper par...",
@@ -23692,8 +28369,9 @@
     "xpack.transform.stepDefineForm.uniqueKeysLabel": "Clés uniques",
     "xpack.transform.stepDefineForm.uniqueKeysPlaceholder": "Ajouter des clés uniques...",
     "xpack.transform.stepDefineSummary.aggregationsLabel": "Agrégations",
+    "xpack.transform.stepDefineSummary.dataViewLabel": "Vue de données",
     "xpack.transform.stepDefineSummary.groupByLabel": "Regrouper par",
-    "xpack.transform.stepDefineSummary.queryCodeBlockLabel": "Requête",
+    "xpack.transform.stepDefineSummary.queryCodeBlockLabel": "Recherche",
     "xpack.transform.stepDefineSummary.queryLabel": "Requête",
     "xpack.transform.stepDefineSummary.savedSearchLabel": "Recherche enregistrée",
     "xpack.transform.stepDetailsForm.advancedSettingsAccordionButtonContent": "Paramètres avancés",
@@ -23706,15 +28384,26 @@
     "xpack.transform.stepDetailsForm.continuousModeDelayPlaceholderText": "retard, par exemple {exampleValue}",
     "xpack.transform.stepDetailsForm.continuousModeError": "Le mode continu n'est pas disponible pour les index sans champ de date.",
     "xpack.transform.stepDetailsForm.createIndexAPI": "API de création d'index",
+    "xpack.transform.stepDetailsForm.dataViewPermissionWarning": "Vous devez disposer d'une autorisation pour pouvoir créer des vues de données.",
+    "xpack.transform.stepDetailsForm.dataViewTimeFieldHelpText": "Sélectionnez un champ temporel principal à utiliser avec le filtre temporel global.",
+    "xpack.transform.stepDetailsForm.dataViewTimeFieldLabel": "Champ temporel pour la vue de données Kibana",
+    "xpack.transform.stepDetailsForm.dataViewTitleError": "Une vue de données avec ce titre existe déjà.",
     "xpack.transform.stepDetailsForm.destinationIndexHelpText": "Un index portant ce nom existe déjà. Notez que l'exécution de cette transformation modifiera cet index de destination.",
     "xpack.transform.stepDetailsForm.destinationIndexInputAriaLabel": "Choisissez un nom d'index de destination unique.",
     "xpack.transform.stepDetailsForm.destinationIndexInvalidError": "Nom d'index de destination non valide.",
     "xpack.transform.stepDetailsForm.destinationIndexInvalidErrorLink": "Découvrez les limitations relatives aux noms d'index.",
     "xpack.transform.stepDetailsForm.destinationIndexLabel": "Index de destination",
     "xpack.transform.stepDetailsForm.destinationIndexWarning": "Avant de démarrer la transformation, utilisez les modèles d'index ou {docsLink} pour vous assurer que les mappings de votre index de destination correspondent à l'index source. Autrement, l'index de destination sera créé avec des mappings dynamiques. Si la transformation échoue, recherchez les erreurs dans l'onglet des messages sur la page Gestion de la Suite.",
+    "xpack.transform.stepDetailsForm.destinationIngestPipelineAriaLabel": "Sélectionner un pipeline d'ingestion (facultatif)",
+    "xpack.transform.stepDetailsForm.destinationIngestPipelineComboBoxPlaceholder": "Sélectionner un pipeline d'ingestion (facultatif)",
+    "xpack.transform.stepDetailsForm.destinationIngestPipelineLabel": "Pipeline d'ingestion de destination",
+    "xpack.transform.stepDetailsForm.editFlyoutFormDestinationIngestPipelineFieldSelectAriaLabel": "Sélectionner un pipeline d'ingestion",
+    "xpack.transform.stepDetailsForm.editFlyoutFormDestinationIngestPipelineFieldSelectPlaceholder": "Sélectionner un pipeline d'ingestion",
     "xpack.transform.stepDetailsForm.editFlyoutFormFrequencyPlaceholderText": "Par défaut : {defaultValue}",
     "xpack.transform.stepDetailsForm.editFlyoutFormMaxPageSearchSizePlaceholderText": "Par défaut : {defaultValue}",
+    "xpack.transform.stepDetailsForm.errorGettingDataViewTitles": "Une erreur s'est produite lors de l'obtention des titres de vues de données existants :",
     "xpack.transform.stepDetailsForm.errorGettingIndexNames": "Une erreur s'est produite lors de l'obtention des noms d'index existants :",
+    "xpack.transform.stepDetailsForm.errorGettingIngestPipelines": "Une erreur s'est produite lors de l'obtention des noms des pipelines d'ingestion existants :",
     "xpack.transform.stepDetailsForm.errorGettingTransformList": "Une erreur s'est produite lors de l'obtention des ID de transformations existants :",
     "xpack.transform.stepDetailsForm.errorGettingTransformPreview": "Une erreur s'est produite lors de la récupération de l'aperçu de la transformation",
     "xpack.transform.stepDetailsForm.frequencyAriaLabel": "Choisissez une fréquence.",
@@ -23744,7 +28433,10 @@
     "xpack.transform.stepDetailsForm.transformIdLabel": "ID de transformation",
     "xpack.transform.stepDetailsSummary.advancedSettingsAccordionButtonContent": "Paramètres avancés",
     "xpack.transform.stepDetailsSummary.continuousModeDateFieldLabel": "Champ de date du mode continu",
+    "xpack.transform.stepDetailsSummary.createDataViewMessage": "Une vue de données Kibana sera créée pour cette transformation.",
+    "xpack.transform.stepDetailsSummary.dataViewTimeFieldLabel": "Champ temporel de la vue de données Kibana",
     "xpack.transform.stepDetailsSummary.destinationIndexLabel": "Index de destination",
+    "xpack.transform.stepDetailsSummary.destinationIngestPipelineLabel": "Pipeline d'ingestion de destination",
     "xpack.transform.stepDetailsSummary.frequencyLabel": "Fréquence",
     "xpack.transform.stepDetailsSummary.maxPageSearchSizeLabel": "Taille maximale de recherche de pages",
     "xpack.transform.stepDetailsSummary.retentionPolicyDateFieldLabel": "Champ de date de la politique de conservation",
@@ -23756,17 +28448,25 @@
     "xpack.transform.toastText.modalTitle": "Détails de l'erreur",
     "xpack.transform.toastText.openModalButtonText": "Afficher les détails",
     "xpack.transform.transformForm.sizeNotationPlaceholder": "Exemples : {example1}, {example2}, {example3}, {example4}",
+    "xpack.transform.transformList.alertingRules.screenReaderDescription": "Cette colonne affiche une icône lorsqu'il existe des règles d'alerte associées à une transformation",
+    "xpack.transform.transformList.alertingRules.tooltipContent": "La transformation a {rulesCount} {rulesCount, plural, one { règle d'alerte associée} other { règles d'alerte associées}}",
+    "xpack.transform.transformList.bulkDeleteDestDataViewSuccessMessage": "Suppression réussie de {count} {count, plural, one {vue} other {vues}} de données de destination.",
     "xpack.transform.transformList.bulkDeleteDestIndexSuccessMessage": "Suppression réussie de {count} {count, plural, other {index}} de destination.",
     "xpack.transform.transformList.bulkDeleteModalTitle": "Supprimer {count} {count, plural, one {transformation} other {transformations}} ?",
     "xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "Suppression réussie de {count} {count, plural, one {transformation} other {transformations}}.",
+    "xpack.transform.transformList.bulkResetModalTitle": "Réinitialiser {count} {count, plural, one {transformation} other {transformations}} ?",
+    "xpack.transform.transformList.bulkResetTransformSuccessMessage": "Réinitialisation réussie de {count} {count, plural, one {transformation} other {transformations}}.",
     "xpack.transform.transformList.bulkStartModalTitle": "Démarrer {count} {count, plural, one {transformation} other {transformations}} ?",
+    "xpack.transform.transformList.bulkStopModalTitle": "Arrêter {count} {count, plural, one {transformation} other {transformations}} ?",
     "xpack.transform.transformList.cloneActionNameText": "Cloner",
     "xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "Une ou plusieurs transformations sont des transformations par lots terminées et ne peuvent pas être redémarrées.",
     "xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} est une transformation par lots terminée et ne peut pas être redémarrée.",
+    "xpack.transform.transformList.createAlertRuleNameText": "Créer une règle d'alerte",
     "xpack.transform.transformList.createTransformButton": "Créer une transformation",
     "xpack.transform.transformList.deleteActionDisabledToolTipContent": "Arrêtez la transformation pour pouvoir la supprimer.",
     "xpack.transform.transformList.deleteActionNameText": "Supprimer",
     "xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "Une ou plusieurs transformations sélectionnées doivent être arrêtées pour pouvoir les supprimer.",
+    "xpack.transform.transformList.deleteManagedTransformDescription": "suppression",
     "xpack.transform.transformList.deleteModalCancelButton": "Annuler",
     "xpack.transform.transformList.deleteModalDeleteButton": "Supprimer",
     "xpack.transform.transformList.deleteModalTitle": "Supprimer {transformId} ?",
@@ -23775,6 +28475,7 @@
     "xpack.transform.transformList.deleteTransformSuccessMessage": "La requête pour supprimer la transformation {transformId} a été reconnue.",
     "xpack.transform.transformList.discoverActionNameText": "Afficher dans Discover",
     "xpack.transform.transformList.discoverTransformBulkToolTip": "Les liens vers Discover ne sont pas pris en charge en tant qu'action groupée.",
+    "xpack.transform.transformList.discoverTransformNoDataViewToolTip": "Une vue de données Kibana est requise pour que l'index de destination puisse s'afficher dans Discover",
     "xpack.transform.transformList.discoverTransformToolTip": "La transformation doit être redémarrée pour être disponible dans Discover.",
     "xpack.transform.transformList.editActionNameText": "Modifier",
     "xpack.transform.transformList.editFlyoutCalloutDocs": "Afficher les documents",
@@ -23784,6 +28485,7 @@
     "xpack.transform.transformList.editFlyoutFormDescriptionLabel": "Description",
     "xpack.transform.transformList.editFlyoutFormDestinationButtonContent": "Configuration de destination",
     "xpack.transform.transformList.editFlyoutFormDestinationIndexLabel": "Index de destination",
+    "xpack.transform.transformList.editFlyoutFormDestinationIngestPipelineLabel": "Pipeline d'ingestion",
     "xpack.transform.transformList.editFlyoutFormDocsPerSecondHelptext": "Pour activer la régulation, définissez une limite de documents à saisir par seconde.",
     "xpack.transform.transformList.editFlyoutFormDocsPerSecondLabel": "Documents par seconde",
     "xpack.transform.transformList.editFlyoutFormFrequencyHelpText": "Intervalle entre les vérifications de modifications dans les index source lorsque la transformation est exécutée en continu. Détermine également l'intervalle des nouvelles tentatives en cas d'échecs temporaires lorsque la transformation effectue une recherche ou une indexation. La valeur minimale est de 1 s et la valeur maximale de 1 h.",
@@ -23797,15 +28499,31 @@
     "xpack.transform.transformList.editFlyoutFormNumberRange10To10000NotValidErrorMessage": "La valeur doit être un entier compris entre 10 et 10 000.",
     "xpack.transform.transformList.editFlyoutFormRequiredErrorMessage": "Champs requis.",
     "xpack.transform.transformList.editFlyoutFormRetentionMaxAgeFieldLabel": "Âge maximal",
+    "xpack.transform.transformList.editFlyoutFormRetentionPolicyDateFieldHelpText": "Sélectionnez le champ de date pouvant être utilisé pour identifier les documents obsolètes dans l'index de destination.",
     "xpack.transform.transformList.editFlyoutFormRetentionPolicyFieldLabel": "Champ",
+    "xpack.transform.transformList.editFlyoutFormRetentionPolicyFieldSelectAriaLabel": "Champ de date pour définir la politique de conservation",
     "xpack.transform.transformList.editFlyoutFormRetentionPolicyMaxAgeNotValidErrorMessage": "Format d'âge maximal non valide. Le minimum requis est de 60 s.",
+    "xpack.transform.transformList.editFlyoutFormRetentionPolicySwitchLabel": "Politique de conservation",
     "xpack.transform.transformList.editFlyoutFormStringNotValidErrorMessage": "La valeur doit être de type chaîne.",
     "xpack.transform.transformList.editFlyoutTitle": "Modifier {transformId}",
     "xpack.transform.transformList.editFlyoutUpdateButtonText": "Mettre à jour",
+    "xpack.transform.transformList.editManagedTransformsDescription": "modification",
     "xpack.transform.transformList.editTransformGenericErrorMessage": "Une erreur s'est produite lors de l'appel du point de terminaison de l'API pour mettre à jour les transformations.",
     "xpack.transform.transformList.editTransformSuccessMessage": "Transformation {transformId} mise à jour.",
     "xpack.transform.transformList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "Une erreur s'est produite lors de la vérification de la possibilité pour un utilisateur de supprimer l'index de destination",
+    "xpack.transform.transformList.managedBadgeLabel": "Géré",
+    "xpack.transform.transformList.managedBadgeTooltip": "Cette transformation est préconfigurée et gérée par Elastic. Les autres éléments du produit peuvent dépendre de ce comportement.",
     "xpack.transform.transformList.refreshButtonLabel": "Recharger",
+    "xpack.transform.transformList.resetActionDisabledToolTipContent": "Arrêtez la transformation pour pouvoir la réinitialiser.",
+    "xpack.transform.transformList.resetActionNameText": "Réinitialiser",
+    "xpack.transform.transformList.resetBulkActionDisabledToolTipContent": "Une ou plusieurs transformations sélectionnées doivent être arrêtées pour pouvoir les réinitialiser.",
+    "xpack.transform.transformList.resetManagedTransformDescription": "réinitialisation",
+    "xpack.transform.transformList.resetModalCancelButton": "Annuler",
+    "xpack.transform.transformList.resetModalResetButton": "Réinitialiser",
+    "xpack.transform.transformList.resetModalTitle": "Réinitialiser {transformId} ?",
+    "xpack.transform.transformList.resetTransformErrorMessage": "Une erreur s'est produite lors de la réinitialisation de la transformation {transformId}",
+    "xpack.transform.transformList.resetTransformGenericErrorMessage": "Une erreur s'est produite lors de l'appel du point de terminaison de l'API pour réinitialiser les transformations.",
+    "xpack.transform.transformList.resetTransformSuccessMessage": "Requête pour réinitialiser la transformation {transformId} reconnue.",
     "xpack.transform.transformList.rowCollapse": "Masquer les détails pour {transformId}",
     "xpack.transform.transformList.rowExpand": "Afficher les détails pour {transformId}",
     "xpack.transform.transformList.showDetailsColumn.screenReaderDescription": "Cette colonne contient des commandes accessibles en un clic pour afficher davantage de détails sur chaque transformation",
@@ -23814,17 +28532,21 @@
     "xpack.transform.transformList.startedTransformToolTip": "{transformId} est déjà démarrée.",
     "xpack.transform.transformList.startModalBody": "Une transformation permet d'augmenter la charge de recherche et d'indexation dans votre cluster. Néanmoins, en cas de charge excessive, arrêtez la transformation.",
     "xpack.transform.transformList.startModalCancelButton": "Annuler",
-    "xpack.transform.transformList.startModalStartButton": "Démarrer",
+    "xpack.transform.transformList.startModalStartButton": "Début",
+    "xpack.transform.transformList.startModalStopButton": "Arrêt",
     "xpack.transform.transformList.startModalTitle": "Démarrer {transformId} ?",
     "xpack.transform.transformList.startTransformErrorMessage": "Une erreur s'est produite lors du démarrage de la transformation {transformId}",
     "xpack.transform.transformList.startTransformSuccessMessage": "La requête pour démarrer la transformation {transformId} a été reconnue.",
-    "xpack.transform.transformList.stopActionNameText": "Arrêter",
+    "xpack.transform.transformList.stopActionNameText": "Arrêt",
+    "xpack.transform.transformList.stopManagedTransformsDescription": "arrêt en cours",
+    "xpack.transform.transformList.stopModalTitle": "Arrêter {transformId} ?",
     "xpack.transform.transformList.stoppedTransformBulkToolTip": "Une ou plusieurs transformations sont déjà arrêtées.",
     "xpack.transform.transformList.stoppedTransformToolTip": "{transformId} est déjà arrêtée.",
     "xpack.transform.transformList.stopTransformErrorMessage": "Une erreur s'est produite lors de l'arrêt de la transformation du cadre de données {transformId}",
     "xpack.transform.transformList.stopTransformResponseSchemaErrorMessage": "Une erreur s'est produite lors de l'appel de la requête d'arrêt des transformations.",
     "xpack.transform.transformList.stopTransformSuccessMessage": "La requête pour arrêter la transformation du cadre de données {transformId} a été reconnue.",
     "xpack.transform.transformList.transformDescription": "Utilisez les transformations pour réorganiser les index Elasticsearch existants en index centrés sur l'entité résumés ou pour créer une vue indexée des derniers documents pour un accès rapide.",
+    "xpack.transform.transformList.transformDetails.alertRulesTitle": "Règles d'alerte",
     "xpack.transform.transformList.transformDetails.expandedRowJsonPane": "JSON de configuration de transformation",
     "xpack.transform.transformList.transformDetails.messagesPane.errorMessage": "Impossible de charger les messages",
     "xpack.transform.transformList.transformDetails.messagesPane.messageLabel": "Message",
@@ -23876,6 +28598,7 @@
     "xpack.triggersActionsUI.cases.configureCases.mappingFieldSummary": "Résumé",
     "xpack.triggersActionsUI.checkActionTypeEnabled.actionTypeDisabledByConfigMessage": "Ce connecteur est désactivé par la configuration de Kibana.",
     "xpack.triggersActionsUI.checkActionTypeEnabled.actionTypeDisabledByLicenseMessage": "Ce connecteur requiert une licence {minimumLicenseRequired}.",
+    "xpack.triggersActionsUI.checkRuleTypeEnabled.ruleTypeDisabledByLicenseMessage": "Ce type de règle requiert une licence {minimumLicenseRequired}.",
     "xpack.triggersActionsUI.common.constants.comparators.groupByTypes.allDocumentsLabel": "tous les documents",
     "xpack.triggersActionsUI.common.constants.comparators.groupByTypes.topLabel": "premiers",
     "xpack.triggersActionsUI.common.constants.comparators.isAboveLabel": "Est supérieur à",
@@ -23899,8 +28622,18 @@
     "xpack.triggersActionsUI.components.addMessageVariables.addRuleVariableTitle": "Ajouter une variable de règle",
     "xpack.triggersActionsUI.components.addMessageVariables.addVariablePopoverButton": "Ajouter une variable",
     "xpack.triggersActionsUI.components.builtinActionTypes.common.requiredShortDescTextField": "Une brève description est requise.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.email.exchangeForm.clientIdHelpLabel": "Configurer l'ID client",
+    "xpack.triggersActionsUI.components.builtinActionTypes.email.exchangeForm.clientSecretHelpLabel": "Configurer l'identifiant client secret",
+    "xpack.triggersActionsUI.components.builtinActionTypes.email.exchangeForm.tenantIdHelpLabel": "Configurer l'ID locataire",
     "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.actionTypeTitle": "Envoyer vers la messagerie électronique",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.amazonSesServerTypeLabel": "Amazon SES",
     "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.configureAccountsHelpLabel": "Configurer les comptes de messagerie électronique",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.elasticCloudServerTypeLabel": "Elastic Cloud",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.exchangeServerTypeLabel": "MS Exchange Server",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.gmailServerTypeLabel": "Gmail",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.otherServerTypeLabel": "Autre",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.outlookServerTypeLabel": "Outlook",
+    "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.reenterClientSecretLabel": "L'identifiant client secret est chiffré. Veuillez entrer à nouveau une valeur pour ce champ.",
     "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.reenterValuesLabel": "Le nom d'utilisateur et le mot de passe sont chiffrés. Veuillez entrer à nouveau les valeurs de ces champs.",
     "xpack.triggersActionsUI.components.builtinActionTypes.emailAction.selectMessageText": "Envoyez un e-mail à partir de votre serveur.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.badIndexOverrideSuffix": "L'index d'historique d'alertes doit contenir un suffixe valide.",
@@ -23908,6 +28641,8 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.error.formatFromText": "L'expéditeur n'est pas une adresse e-mail valide.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthPasswordText": "Le mot de passe est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthUserNameText": "Le nom d'utilisateur est requis.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredClientIdText": "L'ID client est requis.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredClientSecretText": "L'identifiant client secret est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredDocumentJson": "Le document est requis et doit être un objet JSON valide.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredEntryText": "Aucune entrée À, Cc ou Cci.  Au moins une entrée est requise.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredFromText": "L'expéditeur est requis.",
@@ -23916,8 +28651,10 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPasswordText": "Le mot de passe est requis lorsque le nom d'utilisateur est utilisé.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPortText": "Le port est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredServerLogMessageText": "Le message est requis.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredServiceText": "Le service est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredSlackMessageText": "Le message est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredSubjectText": "Le sujet est requis.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredTenantIdText": "L'ID locataire est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredUserText": "Le nom d'utilisateur est requis lorsque le mot de passe est utilisé.",
     "xpack.triggersActionsUI.components.builtinActionTypes.error.requiredWebhookBodyText": "Le corps est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.actionTypeTitle": "Données d'index",
@@ -23931,7 +28668,7 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.executionTimeFieldLabel": "Champ temporel",
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.howToBroadenSearchQueryDescription": "Utilisez le caractère * pour élargir votre recherche.",
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.indexDocumentHelpLabel": "Exemple de document d'index.",
-    "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.indicesAndIndexPatternsLabel": "Basé sur vos modèles d'indexation",
+    "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.indicesAndIndexPatternsLabel": "Basé sur vos vues de données",
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.indicesToQueryLabel": "Index",
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.jsonDocAriaLabel": "Éditeur de code",
     "xpack.triggersActionsUI.components.builtinActionTypes.indexAction.preconfiguredIndex": "Index Elasticsearch",
@@ -23970,7 +28707,7 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.summaryFieldLabel": "Résumé (requis)",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.unableToGetFieldsMessage": "Impossible d'obtenir les champs",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.unableToGetIssueMessage": "Impossible d'obtenir l'erreur avec l'ID {id}",
-    "xpack.triggersActionsUI.components.builtinActionTypes.jira.unableToGetIssuesMessage": "Impossible d'obtenir les erreurs",
+    "xpack.triggersActionsUI.components.builtinActionTypes.jira.unableToGetIssuesMessage": "Impossible d'obtenir les problèmes",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.unableToGetIssueTypesMessage": "Impossible d'obtenir les types d'erreurs",
     "xpack.triggersActionsUI.components.builtinActionTypes.jira.urgencySelectFieldLabel": "Type d'erreur",
     "xpack.triggersActionsUI.components.builtinActionTypes.missingSecretsValuesLabel": "Les informations sensibles ne sont pas importées. Veuillez entrer {encryptedFieldsLength, plural, one {la valeur} other {les valeurs}} pour {encryptedFieldsLength, plural, one {le champ suivant} other {les champs suivants}}.",
@@ -24033,32 +28770,75 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.serverLogAction.logLevelFieldLabel": "Niveau",
     "xpack.triggersActionsUI.components.builtinActionTypes.serverLogAction.logMessageFieldLabel": "Message",
     "xpack.triggersActionsUI.components.builtinActionTypes.serverLogAction.selectMessageText": "Ajouter un message au log Kibana.",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.apiUrlTextFieldLabel": "URL",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.apiInfoError": "Statut reçu : {status} lors de la tentative d'obtention d'informations sur l'application",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.apiUrlHelpText": "Spécifiez l'URL complète.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.apiUrlTextFieldLabel": "URL d'instance ServiceNow",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.appInstallationInfo": "{update} {create} ",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.applicationRequiredCallout": "Application Elastic ServiceNow non installée",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.applicationRequiredCallout.content": "Veuillez vous rendre dans l'app store ServiceNow pour installer l'application",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.applicationRequiredCallout.errorMessage": "Message d'erreur",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.authenticationLabel": "Authentification",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.cancelButtonText": "Annuler",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.categoryTitle": "Catégorie",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.commentsTextAreaFieldLabel": "Commentaires supplémentaires",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.confirmButtonText": "Mettre à jour",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.correlationDisplay": "Affichage de la corrélation (facultatif)",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.correlationID": "ID corrélation (facultatif)",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.deprecatedCalloutCreate": "ou créez-en un nouveau.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.deprecatedCalloutMigrate": "Supprimez ce connecteur",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.deprecatedCalloutTitle": "Ce type de connecteur est déclassé",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.descriptionTextAreaFieldLabel": "Description",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.eventClassTextAreaFieldLabel": "Instance source",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.impactSelectFieldLabel": "Impact",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.install": "installer",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.installationCalloutTitle": "Pour utiliser ce connecteur, installez d'abord l'application Elastic à partir de l'app store ServiceNow.",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.invalidApiUrlTextField": "L'URL n'est pas valide.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.messageKeyTextAreaFieldLabel": "Clé de message",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.metricNameTextAreaFieldLabel": "Nom de l'indicateur",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.nodeTextAreaFieldLabel": "Nœud",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.passwordTextFieldLabel": "Mot de passe",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.prioritySelectFieldLabel": "Priorité",
-    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.reenterValuesLabel": "Le nom d'utilisateur et le mot de passe sont chiffrés. Veuillez entrer à nouveau les valeurs de ces champs.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.reenterValuesLabel": "Vous devrez vous authentifier chaque fois que vous modifierez le connecteur.",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.rememberValuesLabel": "Mémorisez ces valeurs. Vous devrez les entrer à nouveau chaque fois que vous modifierez le connecteur.",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requiredApiUrlTextField": "L'URL est requise.",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requiredPasswordTextField": "Le mot de passe est requis.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requiredSeverityTextField": "La sévérité est requise.",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requiredUsernameTextField": "Le nom d'utilisateur est requis.",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.requireHttpsApiUrlTextField": "L'URL doit commencer par https://.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.resourceTextAreaFieldLabel": "Ressource",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.setupDevInstance": "configurer une instance de développeur",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.severityRequiredSelectFieldLabel": "Sévérité (requise)",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.severitySelectFieldLabel": "Sévérité",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.snInstanceLabel": "Instance ServiceNow",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.sourceTextAreaFieldLabel": "Source",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.subcategoryTitle": "Sous-catégorie",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.title": "Incident",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.titleFieldLabel": "Brève description (requise)",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.typeTextAreaFieldLabel": "Type",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.unableToGetChoicesMessage": "Impossible d'obtenir les choix",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.unknown": "INCONNU",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.updateCalloutText": "Le connecteur a été mis à jour.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.updateFormCredentialsTitle": "Fournir les informations d'authentification",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.updateFormInstallTitle": "Installer l'application Elastic ServiceNow",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.updateFormTitle": "Mettre à jour le connecteur ServiceNow",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.updateFormUrlTitle": "Entrer votre URL d'instance ServiceNow",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.updateSuccessToastTitle": "Connecteur {connectorName} mis à jour",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.urgencySelectFieldLabel": "Urgence",
     "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.usernameTextFieldLabel": "Nom d'utilisateur",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenow.visitSNStore": "Visiter l'app store ServiceNow",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.warningMessage": "Cette action mettra à jour toutes les instances de ce connecteur et ne pourra pas être annulée.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowAction.apiUrlHelpLabel": "Fournissez l'URL complète vers l'instance ServiceNow souhaitée. Si vous n'en avez pas, {instance}.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowAction.correlationIDHelpLabel": "Identificateur pour les incidents de mise à jour",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowAction.serviceNowAppRunning": "L'application Elastic de l'app store ServiceNow doit être installée avant d'exécuter la mise à jour. {visitLink} pour installer l'application",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITOM.actionTypeTitle": "ServiceNow ITOM",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenowITOM.event": "Événement",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITOM.selectMessageText": "Créez un événement dans ServiceNow ITOM.",
     "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITSM.actionTypeTitle": "ServiceNow ITSM",
     "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITSM.selectMessageText": "Créez un incident dans ServiceNow ITSM.",
     "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIR.actionTypeTitle": "ServiceNow SecOps",
     "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIR.selectMessageText": "Créez un incident dans ServiceNow SecOps.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.servicenowSIR.title": "Incident de sécurité",
+    "xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIRAction.correlationIDHelpLabel": "Identificateur pour les incidents de mise à jour",
     "xpack.triggersActionsUI.components.builtinActionTypes.slackAction.actionTypeTitle": "Envoyer vers Slack",
     "xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.invalidWebhookUrlText": "L'URL de webhook n'est pas valide.",
     "xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.requiredWebhookUrlText": "L'URL de webhook est requise.",
@@ -24140,6 +28920,28 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.userTextFieldLabel": "Nom d'utilisateur",
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.valueTextFieldLabel": "Valeur",
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.viewHeadersSwitch": "Ajouter un en-tête HTTP",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.actionTypeTitle": "Données xMatters",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.authenticationLabel": "Authentification",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.basicAuthLabel": "Authentification de base",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.connectorSettingsFieldLabel": "URL d'initiation",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.connectorSettingsLabel": "Sélectionnez la méthode d'authentification utilisée pour la configuration du déclencheur xMatters.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.error.invalidUrlTextField": "L'URL n'est pas valide.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.error.requiredUrlText": "L'URL est requise.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.initiationUrlHelpText": "Spécifiez l'URL xMatters complète.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.passwordTextFieldLabel": "Mot de passe",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.reenterBasicAuthValuesLabel": "Le nom d'utilisateur et le mot de passe sont chiffrés. Veuillez entrer à nouveau les valeurs de ces champs.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.reenterUrlAuthValuesLabel": "L'URL est chiffrée. Veuillez entrer à nouveau des valeurs pour ce champ.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.selectMessageText": "Déclenchez un workflow xMatters.",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severity": "Sévérité",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectCriticalOptionLabel": "Critique",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectHighOptionLabel": "Élevé",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectLowOptionLabel": "Bas",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectMediumOptionLabel": "Moyenne",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectMinimalOptionLabel": "Minimale",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.tags": "Balises",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.urlAuthLabel": "Authentification de l'URL",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.userCredsLabel": "Identifiants d'utilisateur",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.userTextFieldLabel": "Nom d'utilisateur",
     "xpack.triggersActionsUI.components.deleteSelectedIdsErrorNotification.descriptionText": "Impossible de supprimer {numErrors, number} {numErrors, plural, one {{singleTitle}} other {{multipleTitle}}}",
     "xpack.triggersActionsUI.components.deleteSelectedIdsSuccessNotification.descriptionText": "Suppression de {numSuccesses, number} {numSuccesses, plural, one {{singleTitle}} other {{multipleTitle}}} effectuée",
     "xpack.triggersActionsUI.components.emptyConnectorsPrompt.addConnectorButtonLabel": "Créer un connecteur",
@@ -24151,9 +28953,17 @@
     "xpack.triggersActionsUI.components.healthCheck.alertsError": "Pour créer une règle, vous devez activer les plug-ins d'alerting et d'actions. ",
     "xpack.triggersActionsUI.components.healthCheck.alertsErrorAction": "Découvrez comment faire.",
     "xpack.triggersActionsUI.components.healthCheck.alertsErrorTitle": "Vous devez activer Alerting et Actions",
-    "xpack.triggersActionsUI.components.healthCheck.encryptionErrorAction": "Découvrez comment faire.",
-    "xpack.triggersActionsUI.components.healthCheck.encryptionErrorBeforeKey": "Pour créer une règle, définissez une valeur pour ",
-    "xpack.triggersActionsUI.components.healthCheck.encryptionErrorTitle": "Les objets enregistrés chiffrés ne sont pas disponibles",
+    "xpack.triggersActionsUI.components.healthCheck.apiKeysAndEncryptionError": "Vous devez activer les clés d'API et configurer une clé de chiffrement pour utiliser Alerting. ",
+    "xpack.triggersActionsUI.components.healthCheck.apiKeysAndEncryptionErrorAction": "En savoir plus.",
+    "xpack.triggersActionsUI.components.healthCheck.apiKeysAndEncryptionErrorTitle": "Configuration supplémentaire requise",
+    "xpack.triggersActionsUI.components.healthCheck.apiKeysDisabledError": "Vous devez activer les clés d'API pour utiliser Alerting. ",
+    "xpack.triggersActionsUI.components.healthCheck.apiKeysDisabledErrorAction": "En savoir plus.",
+    "xpack.triggersActionsUI.components.healthCheck.apiKeysDisabledErrorTitle": "Configuration supplémentaire requise",
+    "xpack.triggersActionsUI.components.healthCheck.encryptionErrorAction": "En savoir plus.",
+    "xpack.triggersActionsUI.components.healthCheck.encryptionErrorBeforeKey": "Vous devez configurer une clé de chiffrement pour utiliser Alerting. ",
+    "xpack.triggersActionsUI.components.healthCheck.encryptionErrorTitle": "Configuration supplémentaire requise",
+    "xpack.triggersActionsUI.components.jsonEditorWithMessageVariable.noEditorErrorMessage": "L'éditeur est introuvable. Veuillez actualiser la page et réessayer",
+    "xpack.triggersActionsUI.components.jsonEditorWithMessageVariable.noEditorErrorTitle": "Impossible d'ajouter une variable de message",
     "xpack.triggersActionsUI.connectors.breadcrumbTitle": "Connecteurs",
     "xpack.triggersActionsUI.data.coreQueryParams.aggTypeRequiredErrorMessage": "[aggField] : doit posséder une valeur lorsque [aggType] est \"{aggType}\"",
     "xpack.triggersActionsUI.data.coreQueryParams.dateStartGTdateEndErrorMessage": "[dateStart] : est postérieure à [dateEnd]",
@@ -24183,6 +28993,7 @@
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseMessageTitle": "Cette fonctionnalité requiert une licence {minimumLicenseRequired}.",
     "xpack.triggersActionsUI.managementSection.displayDescription": "Détecter les conditions à l'aide des règles, et entreprendre des actions à l'aide des connecteurs.",
     "xpack.triggersActionsUI.managementSection.displayName": "Règles et connecteurs",
+    "xpack.triggersActionsUI.parseInterval.errorMessage": "{value} n'est pas une chaîne d'intervalle",
     "xpack.triggersActionsUI.rules.breadcrumbTitle": "Règles",
     "xpack.triggersActionsUI.sections.actionConnectorAdd.backButtonLabel": "Précédent",
     "xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel": "Annuler",
@@ -24201,8 +29012,10 @@
     "xpack.triggersActionsUI.sections.actionConnectorForm.loadingConnectorSettingsDescription": "Chargement des paramètres du connecteur…",
     "xpack.triggersActionsUI.sections.actionForm.actionSectionsTitle": "Actions",
     "xpack.triggersActionsUI.sections.actionForm.addActionButtonLabel": "Ajouter une action",
+    "xpack.triggersActionsUI.sections.actionForm.deprecatedTooltipTitle": "Connecteur déclassé",
     "xpack.triggersActionsUI.sections.actionForm.getMoreConnectorsTitle": "Obtenir davantage de connecteurs",
     "xpack.triggersActionsUI.sections.actionForm.getMoreRuleTypesTitle": "Obtenir davantage de types de règles",
+    "xpack.triggersActionsUI.sections.actionForm.incidentManagementSystemLabel": "Système de gestion des incidents",
     "xpack.triggersActionsUI.sections.actionForm.loadingConnectorsDescription": "Chargement des connecteurs…",
     "xpack.triggersActionsUI.sections.actionForm.loadingConnectorTypesDescription": "Chargement des types de connecteurs…",
     "xpack.triggersActionsUI.sections.actionForm.preconfiguredTitleMessage": "(préconfiguré)",
@@ -24248,6 +29061,10 @@
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredMethodText": "La méthode est requise.",
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredPasswordText": "Le mot de passe est requis lorsque le nom d'utilisateur est utilisé.",
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredUserText": "Le nom d'utilisateur est requis lorsque le mot de passe est utilisé.",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredAuthPasswordText": "Le mot de passe est requis.",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredAuthUserNameText": "Le nom d'utilisateur est requis.",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredPasswordText": "Le mot de passe est requis lorsque le nom d'utilisateur est utilisé.",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredUserText": "Le nom d'utilisateur est requis lorsque le mot de passe est utilisé.",
     "xpack.triggersActionsUI.sections.addConnectorForm.flyoutTitle": "Connecteur {actionTypeName}",
     "xpack.triggersActionsUI.sections.addConnectorForm.selectConnectorFlyoutTitle": "Sélectionner un connecteur",
     "xpack.triggersActionsUI.sections.addConnectorForm.updateErrorNotificationText": "Impossible de créer un connecteur.",
@@ -24259,6 +29076,8 @@
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addBccButton": "Cci",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton": "Cc",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.authenticationLabel": "Authentification",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientIdFieldLabel": "ID client",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientSecretTextFieldLabel": "Identifiant client secret",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.fromTextFieldLabel": "Expéditeur",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hasAuthSwitchLabel": "Demander une authentification pour ce serveur",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hostTextFieldLabel": "Hôte",
@@ -24269,16 +29088,28 @@
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel": "Cc",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel": "À",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.secureSwitchLabel": "Sécurisé",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.serviceTextFieldLabel": "Service",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel": "Objet",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.tenantIdFieldLabel": "ID locataire",
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "Nom d'utilisateur",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseCancelButtonText": "Annuler",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseConfirmButtonText": "Abandonner les modifications",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseMessage": "Vous ne pouvez pas récupérer de modifications non enregistrées.",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseTitle": "Abandonner les modifications non enregistrées apportées à la règle ?",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveCancelButtonText": "Annuler",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveConfirmButtonText": "Enregistrer la règle",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveTitle": "Enregistrer la règle ne contenant aucune action ?",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveWithoutActionsMessage": "Vous pouvez ajouter une action à tout moment.",
     "xpack.triggersActionsUI.sections.connectorAddInline.accordion.deleteIconAriaLabel": "Supprimer",
     "xpack.triggersActionsUI.sections.connectorAddInline.addConnectorButtonLabel": "Créer un connecteur",
     "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.actionIdLabel": "Utiliser un autre connecteur {connectorInstance}",
     "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.addNewConnectorEmptyButton": "Ajouter un connecteur",
     "xpack.triggersActionsUI.sections.connectorAddInline.emptyConnectorsLabel": "Aucun connecteur {actionTypeName}",
+    "xpack.triggersActionsUI.sections.connectorAddInline.newRuleActionTypeEditTitle": "{actionConnectorName}",
     "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle": "Impossible de charger le connecteur",
     "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle'": "Impossible de charger le connecteur",
     "xpack.triggersActionsUI.sections.connectorAddInline.unauthorizedToCreateForEmptyConnectors": "Seuls les utilisateurs autorisés peuvent configurer un connecteur. Contactez votre administrateur.",
+    "xpack.triggersActionsUI.sections.deprecatedTitleMessage": "(déclassé)",
     "xpack.triggersActionsUI.sections.editConnectorForm.actionTypeDescription": "{actionDescription}",
     "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "Annuler",
     "xpack.triggersActionsUI.sections.editConnectorForm.descriptionText": "Ce connecteur est en lecture seule.",
@@ -24289,11 +29120,204 @@
     "xpack.triggersActionsUI.sections.editConnectorForm.tabText": "Configuration",
     "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "Impossible de mettre à jour un connecteur.",
     "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "Mise à jour de \"{connectorName}\" effectuée",
+    "xpack.triggersActionsUI.sections.executionDurationChart.avgDurationLabel": "Durée moy.",
+    "xpack.triggersActionsUI.sections.executionDurationChart.durationLabel": "Durée",
+    "xpack.triggersActionsUI.sections.executionDurationChart.executionDurationNoData": "Aucune exécution n'est disponible pour cette règle.",
+    "xpack.triggersActionsUI.sections.executionDurationChart.numberOfExecutionsOption": "{value} exécutions",
+    "xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTitle": "Durée des exécutions récentes",
+    "xpack.triggersActionsUI.sections.executionDurationChart.selectNumberOfExecutionDurationsLabel": "Sélectionner le nombre d'exécutions",
+    "xpack.triggersActionsUI.sections.isDeprecatedDescription": "Ce connecteur est déclassé. Mettez-le à jour, ou créez-en un nouveau.",
     "xpack.triggersActionsUI.sections.manageLicense.manageLicenseCancelButtonText": "Annuler",
     "xpack.triggersActionsUI.sections.manageLicense.manageLicenseConfirmButtonText": "Gérer la licence",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseMessage": "Le type de règle {ruleTypeId} est désactivé, car il requiert une licence {licenseRequired}. Continuez vers Gestion des licences pour afficher les options de mise à niveau.",
     "xpack.triggersActionsUI.sections.manageLicense.manageLicenseTitle": "Licence {licenseRequired} requise",
     "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.flyoutTitle": "{connectorName}",
     "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.tooltipContent": "Ce connecteur est préconfiguré et ne peut pas être modifié",
+    "xpack.triggersActionsUI.sections.ruleAdd.flyoutTitle": "Créer une règle",
+    "xpack.triggersActionsUI.sections.ruleAdd.indexControls.timeFieldOptionLabel": "Choisir un champ",
+    "xpack.triggersActionsUI.sections.ruleAdd.operationName": "créer",
+    "xpack.triggersActionsUI.sections.ruleAdd.saveErrorNotificationText": "Impossible de créer une règle.",
+    "xpack.triggersActionsUI.sections.ruleAdd.saveSuccessNotificationText": "Création de la règle \"{ruleName}\" effectuée",
+    "xpack.triggersActionsUI.sections.ruleAddFooter.cancelButtonLabel": "Annuler",
+    "xpack.triggersActionsUI.sections.ruleAddFooter.saveButtonLabel": "Enregistrer",
+    "xpack.triggersActionsUI.sections.ruleDetails.actionWithBrokenConnectorWarningBannerEditText": "Modifier la règle",
+    "xpack.triggersActionsUI.sections.ruleDetails.actionWithBrokenConnectorWarningBannerTitle": "Il existe un problème avec l'un des connecteurs associés à cette règle.",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.avgDurationDescription": "Durée moyenne",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.Alert": "Alerte",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.duration": "Durée",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.mute": "Muet",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.start": "Démarrer",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.status": "Statut",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.ruleTypeExcessDurationMessage": "La durée dépasse le temps d'exécution attendu de la règle.",
+    "xpack.triggersActionsUI.sections.ruleDetails.editRuleButtonLabel": "Modifier",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.activeAlerts": "Alertes actives",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.apiError": "Impossible de récupérer l'historique d'exécution",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.duration": "Durée",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.erroredActions": "Actions comportant des erreurs",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.esSearchDuration": "Durée de la recherche ES",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.id": "Id",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.message": "Message",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.newAlerts": "Nouvelles alertes",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.recoveredAlerts": "Alertes récupérées",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.scheduleDelay": "Retard sur la planification",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.status": "Statut",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.succeededActions": "Actions ayant réussi",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.timedOut": "Expiré",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.timestamp": "Horodatage",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.totalSearchDuration": "Durée de la recherche totale",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.triggeredActions": "Actions déclenchées",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogStatusFilterLabel": "Statut",
+    "xpack.triggersActionsUI.sections.ruleDetails.manageLicensePlanBannerLinkTitle": "Gérer la licence",
+    "xpack.triggersActionsUI.sections.ruleDetails.redirectObjectNoun": "règle",
+    "xpack.triggersActionsUI.sections.ruleDetails.rule.alertsTabText": "Alertes",
+    "xpack.triggersActionsUI.sections.ruleDetails.rule.eventLogTabText": "Historique d'exécution",
+    "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.ruleLastExecutionDescription": "Dernière réponse",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.status.active": "Actif",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.status.inactive": "Récupéré",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastMessage": "Cette règle possède un intervalle défini en dessous de l'intervalle minimal configuré. Cela peut avoir un impact sur les performances.",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastMessageButton": "Modifier la règle",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastTitle": "Paramètres de configuration",
+    "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRuleMessage": "Impossible de charger la règle : {message}",
+    "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRulesMessage": "Impossible de charger les règles : {message}",
+    "xpack.triggersActionsUI.sections.ruleDetails.viewRuleInAppButtonLabel": "Afficher dans l'application",
+    "xpack.triggersActionsUI.sections.ruleEdit.cancelButtonLabel": "Annuler",
+    "xpack.triggersActionsUI.sections.ruleEdit.disabledActionsWarningTitle": "Cette règle possède des actions qui sont désactivées",
+    "xpack.triggersActionsUI.sections.ruleEdit.flyoutTitle": "Modifier la règle",
+    "xpack.triggersActionsUI.sections.ruleEdit.saveButtonLabel": "Enregistrer",
+    "xpack.triggersActionsUI.sections.ruleEdit.saveErrorNotificationText": "Impossible de mettre à jour la règle.",
+    "xpack.triggersActionsUI.sections.ruleEdit.saveSuccessNotificationText": "Mise à jour de \"{ruleName}\" effectuée",
+    "xpack.triggersActionsUI.sections.ruleForm.changeRuleTypeAriaLabel": "Supprimer",
+    "xpack.triggersActionsUI.sections.ruleForm.checkEveryHelpSuggestionText": "Des intervalles inférieurs à {minimum} ne sont pas recommandés pour des raisons de performances.",
+    "xpack.triggersActionsUI.sections.ruleForm.checkEveryHelpText": "L'intervalle doit être au minimum de {minimum}.",
+    "xpack.triggersActionsUI.sections.ruleForm.checkFieldLabel": "Vérifier toutes les",
+    "xpack.triggersActionsUI.sections.ruleForm.checkWithTooltip": "Définir la fréquence d'évaluation de la condition. Les vérifications sont mises en file d'attente ; elles seront exécutées au plus près de la valeur définie, en fonction de la capacité. Le paramètre xpack.alerting.rules.minimumScheduleInterval.value définit la valeur minimale. Le paramètre xpack.alerting.rules.minimumScheduleInterval.enforce définit si ce minimum est requis ou suggéré.",
+    "xpack.triggersActionsUI.sections.ruleForm.conditions.addConditionLabel": "Ajouter :",
+    "xpack.triggersActionsUI.sections.ruleForm.conditions.removeConditionLabel": "Retirer",
+    "xpack.triggersActionsUI.sections.ruleForm.conditions.title": "Conditions :",
+    "xpack.triggersActionsUI.sections.ruleForm.documentationLabel": "Documentation",
+    "xpack.triggersActionsUI.sections.ruleForm.error.belowMinimumText": "L'intervalle doit être au minimum de {minimum}.",
+    "xpack.triggersActionsUI.sections.ruleForm.error.noAuthorizedRuleTypes": "Afin de {operation} une règle, vous devez avoir reçu les privilèges associés.",
+    "xpack.triggersActionsUI.sections.ruleForm.error.noAuthorizedRuleTypesTitle": "Vous n'avez été autorisé à {operation} aucun type de règle",
+    "xpack.triggersActionsUI.sections.ruleForm.error.requiredActionConnector": "L'action pour le connecteur {actionTypeId} est requis.",
+    "xpack.triggersActionsUI.sections.ruleForm.error.requiredIntervalText": "L'intervalle de vérification est requis.",
+    "xpack.triggersActionsUI.sections.ruleForm.error.requiredNameText": "Le nom est requis.",
+    "xpack.triggersActionsUI.sections.ruleForm.error.requiredRuleTypeIdText": "Le type de règle est requis.",
+    "xpack.triggersActionsUI.sections.ruleForm.loadingRuleTypeParamsDescription": "Chargement des paramètres de types de règles…",
+    "xpack.triggersActionsUI.sections.ruleForm.loadingRuleTypesDescription": "Chargement des types de règles…",
+    "xpack.triggersActionsUI.sections.ruleForm.renotifyFieldLabel": "Notifier",
+    "xpack.triggersActionsUI.sections.ruleForm.renotifyWithTooltip": "Définir la fréquence de répétition de l'action pendant que la règle est active.",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNameLabel": "Nom",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label": "Chaque",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.description": "Les actions sont exécutées lorsque le statut de la règle change.",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.display": "Seulement lors d'un changement de statut",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.label": "Seulement lors d'un changement de statut",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.description": "Les actions se répètent selon l'intervalle des règles lorsque la règle est active.",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.display": "Chaque fois que la règle est active",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.label": "Chaque fois que la règle est active",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.description": "Actions exécutées à l'aide de l'intervalle que vous avez défini.",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.display": "Selon un intervalle d'action personnalisé",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.label": "Selon un intervalle d'action personnalisé",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleTypeSelectLabel": "Sélectionner le type de règle",
+    "xpack.triggersActionsUI.sections.ruleForm.searchPlaceholderTitle": "Rechercher",
+    "xpack.triggersActionsUI.sections.ruleForm.solutionFilterLabel": "Filtrer par cas d'utilisation",
+    "xpack.triggersActionsUI.sections.ruleForm.tagsFieldLabel": "Balises (facultatives)",
+    "xpack.triggersActionsUI.sections.ruleForm.unableToLoadRuleTypesMessage": "Impossible de charger les types de règles",
+    "xpack.triggersActionsUI.sections.rulesList.actionTypeFilterLabel": "Type d'action",
+    "xpack.triggersActionsUI.sections.rulesList.addRuleButtonLabel": "Créer une règle",
+    "xpack.triggersActionsUI.sections.rulesList.applySnooze": "Appliquer",
+    "xpack.triggersActionsUI.sections.rulesList.attentionBannerTitle": "Erreur détectée dans {totalStatusesError, plural, one {# règle} other {# règles}}.",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.buttonTitle": "Gérer les règles",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.deleteAllTitle": "Supprimer",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.disableAllTitle": "Désactiver",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.enableAllTitle": "Activer",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToDeleteRulesMessage": "Impossible de supprimer la ou les règles",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToDisableRulesMessage": "Impossible de désactiver la ou les règles",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToEnableRulesMessage": "Impossible d'activer la ou les règles",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToMuteRulesMessage": "Impossible de définir la ou les règles sur Muet",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.failedToUnmuteRulesMessage": "Impossible d'annuler la définition de la ou des règles sur Muet",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.muteAllTitle": "Muet",
+    "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.unmuteAllTitle": "Réactiver le son",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.deleteRuleTitle": "Supprimer la règle",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.disableTitle": "Désactiver",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.editTitle": "Modifier la règle",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.enableTitle": "Activer",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.muteTitle": "Muet",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.popoverButtonTitle": "Actions",
+    "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.unmuteTitle": "Réactiver le son",
+    "xpack.triggersActionsUI.sections.rulesList.daysLabel": "jours",
+    "xpack.triggersActionsUI.sections.rulesList.disabledRuleStatus": "Désactivé",
+    "xpack.triggersActionsUI.sections.rulesList.enabledRuleStatus": "Activé",
+    "xpack.triggersActionsUI.sections.rulesList.fixLicenseLink": "Corriger",
+    "xpack.triggersActionsUI.sections.rulesList.hoursLabel": "heures",
+    "xpack.triggersActionsUI.sections.rulesList.minutesLabel": "minutes",
+    "xpack.triggersActionsUI.sections.rulesList.monthsLabel": "mois",
+    "xpack.triggersActionsUI.sections.rulesList.multipleTitle": "règles",
+    "xpack.triggersActionsUI.sections.rulesList.noPermissionToCreateDescription": "Contactez votre administrateur système.",
+    "xpack.triggersActionsUI.sections.rulesList.noPermissionToCreateTitle": "Aucune autorisation pour créer des règles",
+    "xpack.triggersActionsUI.sections.rulesList.refreshRulesButtonLabel": "Actualiser",
+    "xpack.triggersActionsUI.sections.rulesList.remainingSnoozeIndefinite": "Indéfiniment",
+    "xpack.triggersActionsUI.sections.rulesList.resetDefaultIndexLabel": "Réinitialiser l'index par défaut",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDecrypting": "Une erreur s'est produite lors du déchiffrement de la règle.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDisabled": "La règle n'a pas pu s'exécuter, car elle a été lancée après sa désactivation.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonLicense": "Impossible d'exécuter la règle",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonReading": "Une erreur s'est produite lors de la lecture de la règle.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonRunning": "Une erreur s'est produite lors de l'exécution de la règle.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonTimeout": "Exécution de la règle annulée en raison du délai d'expiration.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonUnknown": "Une erreur s'est produite pour des raisons inconnues.",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsTex": "Actions",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsWarningTooltip": "Impossible de charger l'un des connecteurs associés à cette règle. Modifiez la règle pour sélectionner un nouveau connecteur.",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteAriaLabel": "Supprimer",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteButtonTooltip": "Supprimer",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.durationTitle": "Temps passé sur l'exécution de la règle (mm:ss).",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editAriaLabel": "Modifier",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editButtonTooltip": "Modifier",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalIconAriaLabel": "Au-dessous de l'intervalle minimal configuré",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalTooltipText": "L'intervalle de règle de {interval} est inférieur à l'intervalle minimal configuré de {minimumInterval}. Cela peut avoir un impact sur les performances d'alerting.",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalTooltipTitle": "Au-dessous de l'intervalle minimal configuré",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastExecutionDateTitle": "Heure de début de la dernière exécution.",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastResponseTitle": "Dernière réponse",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.nameTitle": "Nom",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleExecutionPercentileSelectButton": "sélectionner le centile",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleExecutionPercentileTooltip": "{percentileOrdinal} centile des {sampleLimit} dernières durées d'exécution de cette règle (mm:ss).",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleTypeTitle": "Type",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.scheduleTitle": "Intervalle",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.successRatioTitle": "Fréquence à laquelle cette règle s'exécute correctement.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusActive": "Actif",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusDropdownMenuLabel": "Modifier le statut de la règle ou répéter",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusError": "Erreur",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusFilterLabel": "Dernière réponse",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusLicenseError": "Erreur de licence",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusOk": "Ok",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusPending": "En attente",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusUnknown": "Inconnu",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusWarning": "Avertissement",
+    "xpack.triggersActionsUI.sections.rulesList.ruleTypeExcessDurationMessage": "La durée dépasse le temps d'exécution attendu de la règle.",
+    "xpack.triggersActionsUI.sections.rulesList.ruleWarningReasonMaxExecutableActions": "Limite d'action dépassée",
+    "xpack.triggersActionsUI.sections.rulesList.ruleWarningReasonUnknown": "Raison inconnue",
+    "xpack.triggersActionsUI.sections.rulesList.searchPlaceholderTitle": "Recherche",
+    "xpack.triggersActionsUI.sections.rulesList.singleTitle": "règle",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeCommonlyUsed": "Couramment utilisées",
+    "xpack.triggersActionsUI.sections.rulesList.snoozedRuleStatus": "Répété",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeIndefinitely": "Répéter indéfiniment",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeMenuTitle": "Répéter",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeOneDay": "1 jour",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeOneHour": "1 heure",
+    "xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalUnitLabel": "Unité d'intervalle de répétition",
+    "xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalValueLabel": "Valeur d'intervalle de répétition",
+    "xpack.triggersActionsUI.sections.rulesList.totalItemsCountDescription": "Affichage : {pageSize} sur {totalItemCount} règles.",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesActiveDescription": "Actif : {totalStatusesActive}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesErrorDescription": "Erreur : {totalStatusesError}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesOkDescription": "Ok : {totalStatusesOk}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesPendingDescription": "En attente : {totalStatusesPending}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesUnknownDescription": "Inconnu : {totalStatusesUnknown}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesWarningDescription": "Avertissement : {totalStatusesWarning}",
+    "xpack.triggersActionsUI.sections.rulesList.typeFilterLabel": "Type",
+    "xpack.triggersActionsUI.sections.rulesList.unableToLoadConnectorTypesMessage": "Impossible de charger les types de connecteurs",
+    "xpack.triggersActionsUI.sections.rulesList.unableToLoadRulesMessage": "Impossible de charger les règles",
+    "xpack.triggersActionsUI.sections.rulesList.unableToLoadRuleStatusInfoMessage": "Impossible de charger les infos de statut de règles",
+    "xpack.triggersActionsUI.sections.rulesList.unableToLoadRuleTypesMessage": "Impossible de charger les types de règles",
+    "xpack.triggersActionsUI.sections.rulesList.weeksLabel": "semaines",
     "xpack.triggersActionsUI.sections.testConnectorForm.awaitingExecutionDescription": "Lorsque vous exécutez le test, les résultats s'afficheront ici.",
     "xpack.triggersActionsUI.sections.testConnectorForm.createActionHeader": "Créer une action",
     "xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton": "Exécuter",
@@ -24315,14 +29339,14 @@
     "xpack.triggersActionsUI.typeRegistry.get.missingActionTypeErrorMessage": "Le type d'objet \"{id}\" n'est pas enregistré.",
     "xpack.triggersActionsUI.typeRegistry.register.duplicateObjectTypeErrorMessage": "Le type d'objet \"{id}\" est déjà enregistré.",
     "xpack.uiActionsEnhanced.components.actionWizard.betaActionLabel": "Bêta",
-    "xpack.uiActionsEnhanced.components.actionWizard.betaActionTooltip": "Cette action est en version bêta et susceptible d'être modifiée. La conception et le code sont moins matures que les fonctionnalités officielles en disponibilité générale et sont fournis tels quels sans aucune garantie. Les fonctionnalités bêta ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Nous vous remercions de bien vouloir nous aider en nous signalant tout bug ou en nous envoyant d'autres commentaires.",
+    "xpack.uiActionsEnhanced.components.actionWizard.betaActionTooltip": "Cette action est en version bêta et susceptible d'être modifiée. La conception et le code sont moins matures que les fonctionnalités officielles en disponibilité générale et sont fournis tels quels sans aucune garantie. Les fonctionnalités bêta ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Nous vous remercions de bien vouloir nous aider en nous signalant les bugs ou en nous envoyant d'autres commentaires.",
     "xpack.uiActionsEnhanced.components.actionWizard.changeButton": "Modifier",
     "xpack.uiActionsEnhanced.components.actionWizard.insufficientLicenseLevelTooltip": "Niveau de licence insuffisant",
     "xpack.uiActionsEnhanced.components.actionWizard.triggerPickerHelpText": "Qu'est-ce que c'est ?",
     "xpack.uiActionsEnhanced.components.actionWizard.triggerPickerHelpTooltip": "Détermine quand la recherche s'affiche dans le menu contextuel",
     "xpack.uiActionsEnhanced.components.actionWizard.triggerPickerLabel": "Afficher l'option sur :",
     "xpack.uiActionsEnhanced.components.DrilldownForm.betaActionLabel": "Bêta",
-    "xpack.uiActionsEnhanced.components.DrilldownForm.betaActionTooltip": "Cette action est en version bêta et susceptible d'être modifiée. La conception et le code sont moins matures que les fonctionnalités officielles en disponibilité générale et sont fournis tels quels sans aucune garantie. Les fonctionnalités bêta ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Nous vous remercions de bien vouloir nous aider en nous signalant tout bug ou en nous envoyant d'autres commentaires.",
+    "xpack.uiActionsEnhanced.components.DrilldownForm.betaActionTooltip": "Cette action est en version bêta et susceptible d'être modifiée. La conception et le code sont moins matures que les fonctionnalités officielles en disponibilité générale et sont fournis tels quels sans aucune garantie. Les fonctionnalités bêta ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale. Nous vous remercions de bien vouloir nous aider en nous signalant les bugs ou en nous envoyant d'autres commentaires.",
     "xpack.uiActionsEnhanced.components.DrilldownForm.changeButton": "Modifier",
     "xpack.uiActionsEnhanced.components.DrilldownForm.drilldownAction": "Action",
     "xpack.uiActionsEnhanced.components.DrilldownForm.getMoreActionsLinkLabel": "Obtenir plus d'actions",
@@ -24391,66 +29415,227 @@
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlPreviewHelpText": "Veuillez noter que dans l'aperçu, les variables \\{\\{event.*\\}\\} sont remplacées par des valeurs factices.",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlPreviewLabel": "Aperçu de l'URL :",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlPreviewLinkText": "Aperçu",
-    "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateLabel": "Entrer l'URL :",
+    "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateLabel": "Entrer l'URL",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplatePlaceholderText": "Exemple : {exampleUrl}",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateSyntaxHelpLinkText": "Aide pour la syntaxe",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateVariablesFilterPlaceholderText": "Variables de filtre",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateVariablesHelpLinkText": "Aide",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatErrorMessage": "Format non valide : {message}",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "Format non valide. Exemple : {exampleUrl}",
-    "xpack.upgradeAssistant.breadcrumb.esDeprecationsLabel": "Déclassements Elasticsearch",
-    "xpack.upgradeAssistant.breadcrumb.kibanaDeprecationsLabel": "Déclassements Kibana",
+    "xpack.upgradeAssistant.app.deniedPrivilegeDescription": "Afin d'utiliser l'assistant de mise à niveau et de résoudre les problèmes de déclassement, vous devez disposer d’un accès permettant de gérer tous les espaces Kibana.",
+    "xpack.upgradeAssistant.app.deniedPrivilegeTitle": "Rôle d'administrateur Kibana requis",
+    "xpack.upgradeAssistant.appTitle": "Assistant de mise à niveau",
+    "xpack.upgradeAssistant.breadcrumb.esDeprecationLogsLabel": "Logs de déclassements Elasticsearch",
+    "xpack.upgradeAssistant.breadcrumb.esDeprecationsLabel": "Problèmes de déclassement Elasticsearch",
+    "xpack.upgradeAssistant.breadcrumb.kibanaDeprecationsLabel": "Problèmes de déclassement Kibana",
     "xpack.upgradeAssistant.breadcrumb.overviewLabel": "Assistant de mise à niveau",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "Annuler",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "Retour",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "Fermer",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.continueButtonLabel": "Continuer avec la réindexation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.continueButtonLabel": "Continuer la réindexation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.fetchFailedCalloutTitle": "Statut de réindexation non disponible",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.insufficientPrivilegeCallout.calloutTitle": "Vous ne disposez pas de privilèges suffisants pour réindexer cet index",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.readonlyCallout.backgroundResumeDetail": "La réindexation continuera en arrière-plan, mais si Kibana s'arrête ou redémarre, vous devrez revenir sur cette page pour reprendre la réindexation.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceCalloutDescription": "L'utilisation du disque a dépassé le niveau inférieur, ce qui peut empêcher la réindexation. Les nœuds suivants sont affectés :",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceCalloutTitle": "Nœuds avec espace disque faible",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceUsedText": "{nodeName} ({available} disponible)",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.readonlyCallout.backgroundResumeDetail": "La réindexation s'effectue en arrière-plan. Vous pouvez revenir à l'assistant de mise à niveau pour visualiser la progression ou reprendre la réindexation après redémarrage de Kibana.",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.reindexingLabel": "Réindexation…",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.resumeLabel": "Reprendre",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.runReindexLabel": "Exécuter la réindexation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.restartLabel": "Redémarrer la réindexation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.resumeLabel": "Reprendre la réindexation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.runReindexLabel": "Démarrer la réindexation",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.tryAgainLabel": "Réessayer",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexDescription": "L'index sera en lecture seule pendant la réindexation. Vous ne pourrez pas ajouter, mettre à jour ni supprimer des documents avant la fin de la réindexation. Si vous avez besoin d'effectuer une réindexation dans un nouveau cluster, utilisez l'API de réindexation. {docsLink}",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.aliasCreatedStepTitle": "Créez l'alias {indexName} pour l'index {reindexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.aliasesUpdatedStepTitle": "Mettez à jour les alias {existingAliases} afin qu'ils pointent vers l'index {reindexName}.",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.cancelLabel": "Annuler",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.cancelledLabel": "Annulé",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.cancellingLabel": "Annulation…",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.errorLabel": "Annulation impossible",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.reindexingDocumentsStepTitle": "Réindexation des documents",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelledTitle": "Réindexation annulée.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.createIndexStepTitle": "Créez l'index {reindexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.inProgress.aliasCreatedStepTitle": "Création de l'alias {indexName} pour l'index {reindexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.inProgress.aliasesUpdatedStepTitle": "Mise à jour des alias {existingAliases} afin qu'ils pointent vers l'index {reindexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.inProgress.createIndexStepTitle": "Création de l'index {reindexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.inProgress.originalIndexDeletedStepTitle": "Suppression de l'index d'origine {indexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.inProgress.readonlyStepTitle": "Définition de l'index {indexName} sur lecture seule.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.inProgress.reindexingDocumentsStepTitle": "Réindexation des documents.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.originalIndexDeletedStepTitle": "Supprimez l'index d'origine {indexName}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.readonlyStepTitle": "Définissez l'index {indexName} sur lecture seule.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.reindexingDocumentsStepTitle": "Réindexez les documents.",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklistTitle": "Processus de réindexation",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningDetail": "Les types de mapping ne sont plus pris en charge dans la version 8.0. Assurez-vous qu'aucun code d'application ou script n'utilise {mappingType}.",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingFailedCalloutTitle": "Erreur de réindexation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingInProgressTitle": "Réindexation en cours… {percents}",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.flyoutHeader": "Réindexer {index}",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.learnMoreLinkLabel": "En savoir plus",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.acceptChangesTitle": "Accepter les modifications",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningDetail": "Les types de mapping ne sont plus pris en charge dans Elastic 8.x. Assurez-vous qu'aucun code d'application ou script n'utilise {mappingType}.",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningTitle": "Remplacer le type de mapping {mappingType} par {defaultType}",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.deprecatedIndexSettingsWarningDetail": "Les paramètres d'index déclassés ont été détectés :",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.deprecatedIndexSettingsWarningTitle": "Retirer les paramètres d'index déclassés",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.destructiveCallout.calloutDetail": "Sauvegardez l'index avant de continuer. Pour poursuivre avec la réindexation, acceptez chaque modification.",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.destructiveCallout.calloutTitle": "Cet index requiert des modifications destructives qui ne pourront pas être annulées",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.documentationLinkLabel": "Documentation",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.replaceIndexWithAliasWarningDetail": "Vous pourrez effectuer des recherches dans {indexName} comme avant. Pour supprimer les données, vous devrez supprimer {reindexName}",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.replaceIndexWithAliasWarningTitle": "Remplacer l'index {indexName} par l'index {reindexName} et créer l'alias d'index {indexName}",
+    "xpack.upgradeAssistant.deprecationBadge.criticalBadgeLabel": "Critique",
+    "xpack.upgradeAssistant.deprecationBadge.resolvedBadgeLabel": "Résolu",
+    "xpack.upgradeAssistant.deprecationBadge.warningBadgeLabel": "Avertissement",
+    "xpack.upgradeAssistant.deprecationCount.criticalStatusLabel": "Critique : {count}",
+    "xpack.upgradeAssistant.deprecationCount.warningStatusLabel": "Avertissement : {count}",
+    "xpack.upgradeAssistant.deprecationFlyout.learnMoreLinkLabel": "En savoir plus",
+    "xpack.upgradeAssistant.deprecations.enabled.manualStepOneMessage": "Ouvrir le fichier de configuration kibana.yml.",
+    "xpack.upgradeAssistant.deprecations.enabled.manualStepTwoMessage": "Modifiez le paramètre \"xpack.upgrade_assistant.enabled\" en \"xpack.upgrade_assistant.ui.enabled\".",
+    "xpack.upgradeAssistant.deprecations.enabledMessage": "Pour ne plus autoriser les utilisateurs à accéder à l'interface utilisateur de l'assistant de mise à niveau, utilisez le paramètre \"xpack.upgrade_assistant.ui.enabled\" à la place de \"xpack.upgrade_assistant.enabled\".",
+    "xpack.upgradeAssistant.deprecations.enabledTitle": "Le paramètre \"xpack.upgrade_assistant.enabled\" est déclassé",
+    "xpack.upgradeAssistant.deprecationsPageLoadingError.title": "Impossible de récupérer les problèmes de déclassement de {deprecationSource}",
+    "xpack.upgradeAssistant.deprecationStats.criticalDeprecationsTitle": "Critique",
+    "xpack.upgradeAssistant.deprecationStats.loadingErrorMessage": "Impossible de récupérer les problèmes de déclassement Kibana.",
+    "xpack.upgradeAssistant.deprecationStats.warningDeprecationsTitle": "Avertissement",
     "xpack.upgradeAssistant.emptyPrompt.learnMoreDescription": "Découvrez plus d'informations sur la migration vers {nextMajor}.",
     "xpack.upgradeAssistant.emptyPrompt.title": "Assistant de mise à niveau {uaVersion}",
     "xpack.upgradeAssistant.emptyPrompt.upgradeAssistantDescription": "L'Assistant de mise à niveau identifie les paramètres déclassés dans votre cluster et vous aide à résoudre les problèmes avant votre mise à niveau. Revenez ensuite ici pour effectuer la mise à niveau vers Elastic {nextMajor}.",
-    "xpack.upgradeAssistant.esDeprecationErrors.loadingErrorMessage": "Impossible de récupérer les déclassements Elasticsearch.",
+    "xpack.upgradeAssistant.esDeprecationErrors.loadingErrorMessage": "Impossible de récupérer les problèmes de déclassement Elasticsearch.",
     "xpack.upgradeAssistant.esDeprecationErrors.partiallyUpgradedWarningMessage": "Mettez à niveau Kibana vers la même version que votre cluster Elasticsearch. Un ou plusieurs nœuds du cluster exécutent une version différente de celle de Kibana.",
-    "xpack.upgradeAssistant.esDeprecationErrors.permissionsErrorMessage": "Vous n'êtes pas autorisé à afficher les déclassements Elasticsearch.",
-    "xpack.upgradeAssistant.esDeprecationErrors.upgradedWarningMessage": "Votre configuration est à jour. Kibana et tous les nœuds Elasticsearch exécutent la même version.",
-    "xpack.upgradeAssistant.esDeprecations.loadingText": "Chargement des déclassements…",
-    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.deletingButtonLabel": "Suppression…",
+    "xpack.upgradeAssistant.esDeprecationErrors.permissionsErrorMessage": "Vous n'êtes pas autorisé à afficher les problèmes de déclassement Elasticsearch.",
+    "xpack.upgradeAssistant.esDeprecationErrors.upgradedWarningMessage": "Tous les nœuds Elasticsearch ont été mis à niveau.",
+    "xpack.upgradeAssistant.esDeprecationLogs.documentationLinkText": "Documentation",
+    "xpack.upgradeAssistant.esDeprecationLogs.pageDescription": "Consultez les logs de déclassement pour déterminer si vos applications utilisent des API déclassées. Mettez à jour vos applications pour empêcher des erreurs ou des changements de comportement après votre mise à niveau.",
+    "xpack.upgradeAssistant.esDeprecationLogs.pageTitle": "Logs de déclassements Elasticsearch",
+    "xpack.upgradeAssistant.esDeprecations.batchReindexingDocsDescription": "Pour démarrer plusieurs tâches de réindexation dans une seule requête, utilisez l'{docsLink} Kibana.",
+    "xpack.upgradeAssistant.esDeprecations.batchReindexingDocsLink": "API de réindexation par lots",
+    "xpack.upgradeAssistant.esDeprecations.clusterDeprecationTypeLabel": "Cluster",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deleteCompleteText": "Paramètres déclassés retirés",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deleteFailedText": "Échec du retrait des paramètres",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deletingButtonLabel": "Retrait des paramètres en cours…",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.resolutionText": "Retirer les paramètres",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.resolutionTooltipLabel": "Corrigez ce problème en retirant les paramètres de ce cluster. La correction peut s'effectuer automatiquement.",
+    "xpack.upgradeAssistant.esDeprecations.defaultDeprecation.manualCellLabel": "Manuel",
+    "xpack.upgradeAssistant.esDeprecations.deprecationDetailsFlyout.closeButtonLabel": "Fermer",
+    "xpack.upgradeAssistant.esDeprecations.deprecationDetailsFlyout.secondaryDescription": "Index : {indexName}",
+    "xpack.upgradeAssistant.esDeprecations.indexDeprecationTypeLabel": "Index",
+    "xpack.upgradeAssistant.esDeprecations.indexSettings.deleteCompleteText": "Paramètres déclassés retirés",
+    "xpack.upgradeAssistant.esDeprecations.indexSettings.deleteFailedText": "Échec du retrait des paramètres",
+    "xpack.upgradeAssistant.esDeprecations.indexSettings.deletingButtonLabel": "Retrait des paramètres en cours…",
+    "xpack.upgradeAssistant.esDeprecations.indexSettings.resolutionText": "Retirer les paramètres",
+    "xpack.upgradeAssistant.esDeprecations.indexSettings.resolutionTooltipLabel": "Corrigez ce problème en retirant les paramètres de cet index. La correction peut s'effectuer automatiquement.",
+    "xpack.upgradeAssistant.esDeprecations.loadingText": "Chargement des problèmes de déclassement…",
+    "xpack.upgradeAssistant.esDeprecations.mlDeprecationTypeLabel": "Machine Learning",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.deleteCompleteText": "Suppression terminée",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.deleteFailedText": "Échec de la suppression",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.deletingButtonLabel": "Suppression en cours…",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.closeButtonLabel": "Fermer",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.deleteButtonLabel": "Supprimer",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.deleteSnapshotErrorTitle": "Erreur lors de la suppression du snapshot",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.deletingButtonLabel": "Suppression…",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.retryDeleteButtonLabel": "Réessayer la suppression",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.retryUpgradeButtonLabel": "Réessayer la mise à niveau",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.title": "Mettre à niveau ou supprimer le snapshot modèle",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.upgradeButtonLabel": "Mettre à niveau",
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.upgradeSnapshotErrorTitle": "Erreur lors de la mise à niveau du snapshot",
-    "xpack.upgradeAssistant.esDeprecations.pageDescription": "Passez en revue les paramètres de cluster et d'index déclassés. Vous devez résoudre tout problème critique avant d'effectuer la mise à niveau.",
-    "xpack.upgradeAssistant.esDeprecations.pageTitle": "Elasticsearch",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.upgradingButtonLabel": "Mise à niveau…",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.resolutionText": "Mettre à niveau ou supprimer les snapshots",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.resolutionTooltipLabel": "Corrigez ce problème en mettant à niveau ou en supprimant un snapshot de modèle de tâche. La correction peut s'effectuer automatiquement.",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.upgradeCompleteText": "Mise à niveau terminée",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.upgradeFailedText": "Échec de la mise à niveau",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.upgradeInProgressText": "Mise à niveau en cours…",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.upgradeModeEnabledDocsLink": "En savoir plus",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.upgradeModeEnabledErrorDescription": "Aucune action ne peut être appliquée aux snapshots de Machine Learning lorsque le mode de mise à niveau est activé. {docsLink}.",
+    "xpack.upgradeAssistant.esDeprecations.mlSnapshots.upgradeModeEnabledErrorTitle": "Le mode de mise à niveau de Machine Learning est activé",
+    "xpack.upgradeAssistant.esDeprecations.nodeDeprecationTypeLabel": "Nœud",
+    "xpack.upgradeAssistant.esDeprecations.pageDescription": "Corrigez tout problème critique avant d'effectuer la mise à niveau. Avant d'effectuer des modifications, assurez-vous de disposer d'un snapshot actuel de votre cluster. Les index créés avant la version 7.0 doivent être réindexés ou retirés, y compris les index masqués tels que ceux qui ont été utilisés pour stocker les données de Machine Learning.",
+    "xpack.upgradeAssistant.esDeprecations.pageTitle": "Problèmes de déclassement Elasticsearch",
+    "xpack.upgradeAssistant.esDeprecations.reindex.manualCellTooltipLabel": "Ce problème doit être corrigé manuellement.",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexCanceledText": "Réindexation annulée",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexCompleteText": "Réindexation terminée",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexFailedText": "Échec de la réindexation",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexFetchFailedText": "Statut de réindexation non disponible",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexInProgressText": "Réindexation en cours…",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexLoadingStatusText": "Chargement du statut…",
+    "xpack.upgradeAssistant.esDeprecations.reindex.reindexPausedText": "Réindexation suspendue",
+    "xpack.upgradeAssistant.esDeprecations.reindex.resolutionLabel": "Réindexer",
+    "xpack.upgradeAssistant.esDeprecations.reindex.resolutionTooltipLabel": "Corrigez ce problème en réindexant cet index. La correction peut s'effectuer automatiquement.",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersDetectedDescription": "Vous avez {remoteClustersCount} {remoteClustersCount, plural, one {cluster distant configuré} other {clusters distants configurés}}. Si vous utilisez la recherche inter-clusters, notez que la version 8.x peut uniquement effectuer les recherches dans les clusters distants exécutant la version mineure précédente ou ultérieure. Si vous utilisez la réplication inter-clusters, un cluster contenant des index suiveurs doit exécuter la même version, ou une version plus récente, que le cluster distant.",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersDetectedTitle": "Compatibilité des clusters distants",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersLinkText": "Affichez les clusters distants.",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.closeButtonLabel": "Fermer",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.deleteErrorTitle": "Erreur lors de la suppression des paramètres de cluster",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.description": "Retirer {clusterSettingsCount, plural, one {le paramètre suivant} other {les paramètres suivants}} de cluster déclassé ?",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.removeButtonLabel": "Retirer les paramètres déclassés",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.resolvedButtonLabel": "Résolu",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.retryRemoveButtonLabel": "Réessayer de retirer les paramètres déclassés",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.closeButtonLabel": "Fermer",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.deleteErrorTitle": "Erreur lors de la suppression des paramètres d'index",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.description": "Retirer {indexSettingsCount, plural, one {le paramètre suivant} other {les paramètres suivants}} d'index déclassé ?",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.removeButtonLabel": "Retirer les paramètres déclassés",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.resolvedButtonLabel": "Résolu",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.retryRemoveButtonLabel": "Réessayer de retirer les paramètres déclassés",
+    "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.secondaryDescription": "Index : {indexName}",
+    "xpack.upgradeAssistant.esDeprecations.table.criticalFilterLabel": "Critique",
+    "xpack.upgradeAssistant.esDeprecations.table.issueColumnTitle": "Problème",
+    "xpack.upgradeAssistant.esDeprecations.table.nameColumnTitle": "Nom",
+    "xpack.upgradeAssistant.esDeprecations.table.noDeprecationsMessage": "Aucun problème de déclassement Elasticsearch trouvé",
+    "xpack.upgradeAssistant.esDeprecations.table.refreshButtonLabel": "Actualiser",
+    "xpack.upgradeAssistant.esDeprecations.table.resolutionColumnTitle": "Résolution",
+    "xpack.upgradeAssistant.esDeprecations.table.searchPlaceholderLabel": "Filtre",
+    "xpack.upgradeAssistant.esDeprecations.table.statusColumnTitle": "Statut",
+    "xpack.upgradeAssistant.esDeprecations.table.typeColumnTitle": "Type",
+    "xpack.upgradeAssistant.esDeprecations.table.typeFilterLabel": "Type",
     "xpack.upgradeAssistant.kibanaDeprecations.deprecationLabel": "Kibana",
     "xpack.upgradeAssistant.kibanaDeprecations.docLinkText": "Documentation",
-    "xpack.upgradeAssistant.kibanaDeprecations.loadingText": "Chargement des déclassements…",
-    "xpack.upgradeAssistant.kibanaDeprecations.pageDescription": "Passez en revue les problèmes répertoriés ici et effectuez les modifications nécessaires avant de procéder à la mise à niveau. Les problèmes critiques doivent être résolus avant la mise à niveau.",
-    "xpack.upgradeAssistant.kibanaDeprecations.pageTitle": "Kibana",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.closeButtonLabel": "Fermer",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.manualFixTitle": "Comment résoudre le problème",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.quickResolveButtonLabel": "Résolution rapide",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.quickResolveCalloutTitle": "Cliquez sur {quickResolve} pour corriger ce problème automatiquement.",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.quickResolveErrorTitle": "Erreur lors de la résolution du problème",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.quickResolveInProgressButtonLabel": "Résolution en cours…",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.quickResolveText": "Résolution rapide",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.resolvedButtonLabel": "Résolu",
+    "xpack.upgradeAssistant.kibanaDeprecations.flyout.retryQuickResolveButtonLabel": "Réessayer",
+    "xpack.upgradeAssistant.kibanaDeprecations.kibanaDeprecationErrorDescription": "Impossible d'obtenir les problèmes de déclassement pour {pluginCount, plural, one {ce plug-in} other {ces plug-ins}} : {pluginIds}. Consultez les logs de serveur Kibana pour en savoir plus.",
+    "xpack.upgradeAssistant.kibanaDeprecations.kibanaDeprecationErrorTitle": "La liste des problèmes de déclassement est peut-être incomplète",
+    "xpack.upgradeAssistant.kibanaDeprecations.loadingText": "Chargement des problèmes de déclassement…",
+    "xpack.upgradeAssistant.kibanaDeprecations.pageDescription": "Corrigez tout problème critique avant d'effectuer la mise à niveau.",
+    "xpack.upgradeAssistant.kibanaDeprecations.pageTitle": "Problèmes de déclassement Kibana",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.automatedCellLabel": "Automatisé",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.automatedCellTooltipLabel": "La correction peut s'effectuer automatiquement.",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.automationCompleteCellLabel": "Résolu",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.automationFailedCellLabel": "Échec de la résolution",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.automationInProgressCellLabel": "Résolution en cours…",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.configDeprecationTypeCellLabel": "Config",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.criticalFilterLabel": "Critique",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.featureDeprecationTypeCellLabel": "Fonctionnalité",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.issueColumnTitle": "Problème",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.manualCellLabel": "Manuel",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.manualCellTooltipLabel": "Ce problème doit être corrigé manuellement.",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.refreshButtonLabel": "Actualiser",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.resolutionColumnTitle": "Résolution",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.searchPlaceholderLabel": "Filtre",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.statusColumnTitle": "Statut",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.typeColumnTitle": "Type",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.typeFilterLabel": "Type",
+    "xpack.upgradeAssistant.kibanaDeprecations.table.unknownDeprecationTypeCellLabel": "Non catégorisé",
+    "xpack.upgradeAssistant.levelInfoTip.criticalLabel": "Les problèmes critiques doivent être résolus avant la mise à niveau",
+    "xpack.upgradeAssistant.levelInfoTip.warningLabel": "Les problèmes d'avertissement peuvent être ignorés à votre discrétion",
+    "xpack.upgradeAssistant.ml_snapshots.modelSnapshotUpgradeFailed": "Le processus de mise à niveau pour ce snapshot de modèle a échoué. Consultez les logs Elasticsearch pour plus de détails.",
+    "xpack.upgradeAssistant.noDeprecationsMessage": "Aucun problème",
+    "xpack.upgradeAssistant.noDeprecationsPrompt.description": "Votre configuration {deprecationType} est à jour",
     "xpack.upgradeAssistant.noDeprecationsPrompt.nextStepsDescription": "Vérifiez la {overviewButton} pour rechercher les autres déclassements de la Suite Elastic.",
     "xpack.upgradeAssistant.noDeprecationsPrompt.overviewLinkText": "Page d'aperçu",
+    "xpack.upgradeAssistant.noPartialDeprecationsMessage": "Aucun",
     "xpack.upgradeAssistant.overview.analyzeTitle": "Analyser les logs de déclassement",
-    "xpack.upgradeAssistant.overview.deprecationLogs.buttonLabel": "Activer le logging et l'indexation des déclassements",
-    "xpack.upgradeAssistant.overview.deprecationLogs.deprecationWarningBody": "Accédez à votre répertoire de logs pour afficher les logs de déclassement ou activer la collecte de logs pour les voir dans l'interface utilisateur.",
+    "xpack.upgradeAssistant.overview.apiCompatibilityNoteBody": "Nous vous recommandons de résoudre tous les problèmes de déclassement avant la mise à niveau. Si besoin, vous pouvez appliquer des en-têtes de compatibilité d'API aux requêtes utilisant des fonctionnalités déclassées. {learnMoreLink}.",
+    "xpack.upgradeAssistant.overview.apiCompatibilityNoteLink": "En savoir plus",
+    "xpack.upgradeAssistant.overview.apiCompatibilityNoteTitle": "Appliquer les en-têtes de compatibilité d'API (facultatif)",
+    "xpack.upgradeAssistant.overview.backupStepDescription": "Assurez-vous de disposer d'un snapshot actuel avant d'effectuer des modifications.",
+    "xpack.upgradeAssistant.overview.backupStepTitle": "Sauvegarder vos données",
+    "xpack.upgradeAssistant.overview.cloudBackup.hasSnapshotMessage": "Dernier snapshot créé le {lastBackupTime}.",
+    "xpack.upgradeAssistant.overview.cloudBackup.loadingError": "Une erreur s'est produite lors de la récupération du dernier statut de snapshot",
+    "xpack.upgradeAssistant.overview.cloudBackup.noSnapshotMessage": "Vos données n'ont pas été sauvegardées.",
+    "xpack.upgradeAssistant.overview.cloudBackup.retryButton": "Réessayer",
+    "xpack.upgradeAssistant.overview.cloudBackup.snapshotsLink": "Créer un snapshot",
+    "xpack.upgradeAssistant.overview.deprecationLogs.buttonLabel": "Activer la collecte de journaux de déclassement",
+    "xpack.upgradeAssistant.overview.deprecationLogs.deniedPrivilegeDescription": "Les logs de déclassement continueront à être indexés, mais vous ne pourrez pas les analyser tant que vous ne disposerez pas {privilegesCount, plural, one {d'un privilège} other {de privilèges}} de lecture d'index pour : {missingPrivileges}",
+    "xpack.upgradeAssistant.overview.deprecationLogs.deniedPrivilegeTitle": "Vous avez besoin de privilèges d'index pour analyser les logs de déclassement",
+    "xpack.upgradeAssistant.overview.deprecationLogs.deprecationWarningBody": "Accédez à votre répertoire de logs pour afficher les logs de déclassement ou activez la collecte de logs de déclassement pour les voir dans Kibana.",
     "xpack.upgradeAssistant.overview.deprecationLogs.deprecationWarningTitle": "Vos logs sont en cours d'écriture dans le répertoire de logs",
     "xpack.upgradeAssistant.overview.deprecationLogs.disabledToastMessage": "Les requêtes d'API déclassées ne seront pas enregistrées dans un log.",
     "xpack.upgradeAssistant.overview.deprecationLogs.enabledToastMessage": "Les requêtes d'API déclassées seront enregistrées dans un log et indexées.",
@@ -24458,21 +29643,75 @@
     "xpack.upgradeAssistant.overview.deprecationLogs.fetchErrorMessage": "Impossible de récupérer les informations de logging.",
     "xpack.upgradeAssistant.overview.deprecationLogs.reloadButtonLabel": "Réessayer",
     "xpack.upgradeAssistant.overview.deprecationLogs.updateErrorMessage": "Impossible de mettre à jour l'état de logging.",
+    "xpack.upgradeAssistant.overview.deprecationsCountCheckpointTitle": "Résoudre les problèmes de déclassement et vérifier vos modifications",
     "xpack.upgradeAssistant.overview.documentationLinkText": "Documentation",
-    "xpack.upgradeAssistant.overview.loadingLogsLabel": "Chargement de l'état de collecte des logs…",
+    "xpack.upgradeAssistant.overview.errorLoadingUpgradeStatus": "Une erreur s'est produite lors de la récupération du statut de mise à niveau",
+    "xpack.upgradeAssistant.overview.fixIssuesStepDescription": "Vous devez résoudre tous les problèmes critiques de configuration Elasticsearch et Kibana avant d'effectuer la mise à niveau vers Elastic 8.x. Si vous ignorez les avertissements, des différences de comportement pourront apparaître après votre mise à niveau.",
+    "xpack.upgradeAssistant.overview.fixIssuesStepTitle": "Passer en revue les paramètres déclassés et résoudre les problèmes",
+    "xpack.upgradeAssistant.overview.loadingLogsLabel": "Chargement de l'état de la collecte de logs de déclassement…",
+    "xpack.upgradeAssistant.overview.loadingUpgradeStatus": "Chargement du statut de mise à niveau",
+    "xpack.upgradeAssistant.overview.logsStep.description": "Consultez les logs de déclassement Elasticsearch pour vous assurer que vous n'utilisez pas d'API déclassées.",
+    "xpack.upgradeAssistant.overview.logsStep.enableLogsButtonLabel": "Activer le logging",
+    "xpack.upgradeAssistant.overview.logsStep.loadingError": "Une erreur s'est produite lors de la récupération du nombre de logs de déclassement",
+    "xpack.upgradeAssistant.overview.logsStep.missingPrivilegesDescription": "Les logs de déclassement continueront à être indexés, mais vous ne pourrez pas les analyser tant que vous ne disposerez pas {privilegesCount, plural, one {d'un privilège} other {de privilèges}} de lecture d'index pour : {missingPrivileges}",
+    "xpack.upgradeAssistant.overview.logsStep.missingPrivilegesTitle": "Vous avez besoin de privilèges d'index pour analyser les logs de déclassement",
+    "xpack.upgradeAssistant.overview.logsStep.retryButton": "Réessayer",
+    "xpack.upgradeAssistant.overview.logsStep.title": "Traiter les déclassements d'API",
+    "xpack.upgradeAssistant.overview.logsStep.viewLogsButtonLabel": "Afficher les logs",
     "xpack.upgradeAssistant.overview.observe.discoveryDescription": "Recherchez et filtrez les logs de déclassement pour comprendre les types de modifications que vous devez effectuer.",
     "xpack.upgradeAssistant.overview.observe.observabilityDescription": "Obtenez des informations sur les API déclassées qui sont utilisées et les applications que vous devez mettre à jour.",
-    "xpack.upgradeAssistant.overview.pageDescription": "Préparez-vous pour la prochaine version de la Suite Elastic !",
+    "xpack.upgradeAssistant.overview.pageDescription": "Préparez-vous pour la prochaine version d'Elastic !",
     "xpack.upgradeAssistant.overview.pageTitle": "Assistant de mise à niveau",
+    "xpack.upgradeAssistant.overview.snapshotRestoreLink": "Créer un snapshot",
+    "xpack.upgradeAssistant.overview.systemIndices.body": "Préparez les index système qui stockent des informations internes pour la mise à niveau. Tous les {hiddenIndicesLink} devant être réindexés seront affichés à l'étape suivante.",
+    "xpack.upgradeAssistant.overview.systemIndices.body.hiddenIndicesLink": "index masqués",
+    "xpack.upgradeAssistant.overview.systemIndices.errorLabel": "Échec de la migration",
+    "xpack.upgradeAssistant.overview.systemIndices.featureNameTableColumn": "Fonctionnalité",
+    "xpack.upgradeAssistant.overview.systemIndices.flyoutCloseButtonLabel": "Fermer",
+    "xpack.upgradeAssistant.overview.systemIndices.flyoutDescription": "Migrez les index qui stockent des informations pour les fonctionnalités suivantes avant d'effectuer votre mise à niveau.",
+    "xpack.upgradeAssistant.overview.systemIndices.flyoutTitle": "Migrer les index système",
+    "xpack.upgradeAssistant.overview.systemIndices.inProgressButtonLabel": "Migration en cours",
+    "xpack.upgradeAssistant.overview.systemIndices.loadingError": "Impossible de récupérer le statut des index système",
+    "xpack.upgradeAssistant.overview.systemIndices.migratingLabel": "Migration en cours",
+    "xpack.upgradeAssistant.overview.systemIndices.migrationCompleteLabel": "Migration terminée",
+    "xpack.upgradeAssistant.overview.systemIndices.migrationFailedBody": "Une erreur s'est produite lors de la migration des index système pour {feature} : {failureCause}",
+    "xpack.upgradeAssistant.overview.systemIndices.migrationFailedTitle": "Échec de la migration des index système",
+    "xpack.upgradeAssistant.overview.systemIndices.needsMigrationLabel": "Migration requise",
+    "xpack.upgradeAssistant.overview.systemIndices.noMigrationNeeded": "Migration terminée",
+    "xpack.upgradeAssistant.overview.systemIndices.retryButtonLabel": "Réessayer la migration",
+    "xpack.upgradeAssistant.overview.systemIndices.startButtonLabel": "Migrer les index",
+    "xpack.upgradeAssistant.overview.systemIndices.statusTableColumn": "Statut",
+    "xpack.upgradeAssistant.overview.systemIndices.title": "Migrer les index système",
+    "xpack.upgradeAssistant.overview.systemIndices.viewSystemIndicesStatus": "Afficher les détails de migration",
     "xpack.upgradeAssistant.overview.upgradeGuideLink": "Afficher le guide de mise à niveau",
+    "xpack.upgradeAssistant.overview.upgradeStatus.retryButton": "Réessayer",
     "xpack.upgradeAssistant.overview.upgradeStepCloudLink": "Mettre à niveau sur le cloud",
-    "xpack.upgradeAssistant.overview.upgradeStepDescription": "Une fois que vous avez résolu tous les problèmes critiques et vérifié que vos applications sont prêtes, vous pouvez mettre à niveau la Suite Elastic.",
-    "xpack.upgradeAssistant.overview.upgradeStepDescriptionForCloud": "Une fois que vous avez résolu tous les problèmes critiques et vérifié que vos applications sont prêtes, vous pouvez mettre à niveau la Suite Elastic. Mettez à niveau votre déploiement sur Elastic Cloud.",
+    "xpack.upgradeAssistant.overview.upgradeStepDescription": "Une fois que vous avez résolu tous les problèmes critiques et vérifié que vos applications sont prêtes, vous pouvez effectuer la mise à niveau vers Elastic 8.x. Veillez à sauvegarder à nouveau vos données avant d'effectuer la mise à niveau.",
+    "xpack.upgradeAssistant.overview.upgradeStepDescriptionForCloud": "Une fois que vous avez résolu tous les problèmes critiques et vérifié que vos applications sont prêtes, vous pouvez effectuer la mise à niveau vers Elastic 8.x. Veillez à sauvegarder à nouveau vos données avant d'effectuer la mise à niveau. Mettez à niveau votre déploiement sur Elastic Cloud.",
+    "xpack.upgradeAssistant.overview.upgradeStepTitle": "Mettre à niveau vers Elastic 8.x",
+    "xpack.upgradeAssistant.overview.verifyChanges.calloutBody": "Après avoir effectué des modifications, réinitialisez le compteur et poursuivez le monitoring pour vérifier que vous n'utilisez plus de fonctionnalités déclassées.",
+    "xpack.upgradeAssistant.overview.verifyChanges.calloutTitle": "{warningsCount, plural, =0 {Aucun} other {{warningsCount}}} {warningsCount, plural, one {problème} other {problèmes}} de déclassement depuis {previousCheck}",
+    "xpack.upgradeAssistant.overview.verifyChanges.errorToastTitle": "Impossible de supprimer le cache des logs de déclassement",
+    "xpack.upgradeAssistant.overview.verifyChanges.loadingError": "Une erreur s'est produite lors de la récupération du nombre de logs de déclassement",
+    "xpack.upgradeAssistant.overview.verifyChanges.resetCounterButton": "Réinitialiser le compteur",
+    "xpack.upgradeAssistant.overview.verifyChanges.retryButton": "Réessayer",
     "xpack.upgradeAssistant.overview.viewDiscoverResultsAction": "Analyser les logs dans Discover",
     "xpack.upgradeAssistant.overview.viewObservabilityResultsAction": "Afficher les logs de déclassement dans Observability",
+    "xpack.upgradeAssistant.overview.whatsNewLink": "Nouveautés de la version 8.x",
     "xpack.upgradeAssistant.reindex.reindexPrivilegesErrorBatch": "Vous ne disposez pas des privilèges appropriés pour réindexer \"{indexName}\".",
-    "xpack.upgradeAssistant.status.allDeprecationsResolvedMessage": "Tous les problèmes de déclassement ont été résolus.",
+    "xpack.upgradeAssistant.status.allDeprecationsResolvedMessage": "Tous les avertissements de déclassement ont été résolus.",
+    "xpack.upgradeAssistant.status.deprecationsUnresolvedMessage": "Les problèmes suivants doivent être résolus avant la mise à niveau : {upgradeIssues}.",
+    "xpack.upgradeAssistant.status.esTotalCriticalDepsMessage": "{esTotalCriticalDeps} {esTotalCriticalDeps, plural, one {problème} other {problèmes}} de déclassement Elasticsearch",
+    "xpack.upgradeAssistant.status.kibanaTotalCriticalDepsMessage": "{kibanaTotalCriticalDeps} {kibanaTotalCriticalDeps, plural, one {problème} other {problèmes}} de déclassement Kibana",
+    "xpack.upgradeAssistant.status.systemIndicesMessage": "{notMigratedSystemIndices} {notMigratedSystemIndices, plural, one {index système non migré} other {index système non migrés}}",
+    "xpack.upgradeAssistant.upgradedDescription": "Tous les nœuds Elasticsearch ont été mis à niveau. Vous pouvez maintenant mettre à niveau Kibana.",
+    "xpack.upgradeAssistant.upgradedTitle": "Votre cluster a été mis à niveau",
+    "xpack.upgradeAssistant.upgradingDescription": "Un ou plusieurs nœuds Elasticsearch ont une version plus récente d'Elasticsearch que Kibana. Une fois que tous vos nœuds auront été mis à niveau, procédez à la mise à niveau de Kibana.",
+    "xpack.upgradeAssistant.upgradingTitle": "Votre cluster est en cours de mise à niveau",
     "xpack.uptime.addDataButtonLabel": "Ajouter des données",
+    "xpack.uptime.addMonitor.pageHeader.title": "Ajouter un moniteur",
+    "xpack.uptime.addMonitorRoute.title": "Ajouter un moniteur | {baseTitle}",
+    "xpack.uptime.alertDropdown.noWritePermissions": "Vous devez disposer d'un accès en lecture-écriture à Uptime pour créer des alertes dans cette application.",
     "xpack.uptime.alerts.anomaly.criteriaExpression.ariaLabel": "Expression affichant les critères d'un moniteur sélectionné.",
     "xpack.uptime.alerts.anomaly.criteriaExpression.description": "Quand le moniteur",
     "xpack.uptime.alerts.anomaly.scoreExpression.ariaLabel": "Expression affichant les critères d'un seuil d'alerte d'anomalie.",
@@ -24493,8 +29732,11 @@
     "xpack.uptime.alerts.durationAnomaly.description": "Alerte lorsque la durée du moniteur Uptime est anormale.",
     "xpack.uptime.alerts.monitorExpression.label": "Retirer le filtre {title}",
     "xpack.uptime.alerts.monitorStatus": "Statut du moniteur Uptime",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.availabilityMessage": "La disponibilité {interval} est de {availabilityRatio} %. Alerte lorsque &lt; {expectedAvailability} %.",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.context.alertReasonMessage.description": "Une description concise de la raison du signalement",
     "xpack.uptime.alerts.monitorStatus.actionVariables.context.downMonitorsWithGeo.description": "Résumé généré montrant certains ou tous les moniteurs détectés comme \"arrêtés\" par l'alerte",
     "xpack.uptime.alerts.monitorStatus.actionVariables.context.message.description": "Message généré résumant les moniteurs actuellement arrêtés",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.context.viewInAppUrl.description": "Lien vers la vue ou la fonctionnalité dans Elastic qui peut être utilisée pour examiner l'alerte et son contexte de manière plus approfondie",
     "xpack.uptime.alerts.monitorStatus.actionVariables.state.currentTriggerStarted": "Horodatage indiquant à quel moment l'état de déclenchement actuel a commencé, si l'alerte est déclenchée",
     "xpack.uptime.alerts.monitorStatus.actionVariables.state.firstCheckedAt": "Horodatage indiquant à quel moment cette alerte a effectué des vérifications pour la première fois",
     "xpack.uptime.alerts.monitorStatus.actionVariables.state.firstTriggeredAt": "Horodatage indiquant à quel moment cette alerte a été déclenchée pour la première fois",
@@ -24516,6 +29758,7 @@
     "xpack.uptime.alerts.monitorStatus.addFilter.tag": "Balise",
     "xpack.uptime.alerts.monitorStatus.addFilter.type": "Type",
     "xpack.uptime.alerts.monitorStatus.availability.isEnabledCheckbox.label": "Disponibilité",
+    "xpack.uptime.alerts.monitorStatus.availability.threshold.anyMonitorDescription": "tout moniteur est opérationnel dans",
     "xpack.uptime.alerts.monitorStatus.availability.threshold.ariaLabel": "Spécifier les seuils de disponibilité pour cette alerte",
     "xpack.uptime.alerts.monitorStatus.availability.threshold.description": "les moniteurs correspondants sont opérationnels dans",
     "xpack.uptime.alerts.monitorStatus.availability.threshold.input.ariaLabel": "Saisir un seuil de disponibilité à vérifier pour cette alerte",
@@ -24526,7 +29769,7 @@
     "xpack.uptime.alerts.monitorStatus.availability.unit.headline": "Sélectionner l'unité de la plage temporelle",
     "xpack.uptime.alerts.monitorStatus.availability.unit.selectable": "Utiliser cette sélection pour définir les unités de la plage temporelle pour cette alerte",
     "xpack.uptime.alerts.monitorStatus.clientName": "Statut du moniteur Uptime",
-    "xpack.uptime.alerts.monitorStatus.defaultActionMessage": "Le moniteur {monitorName} possédant l'URL {monitorUrl} est {statusMessage} à partir de {observerLocation}. Le dernier message d'erreur est {latestErrorMessage}",
+    "xpack.uptime.alerts.monitorStatus.defaultActionMessage": "Moniteur {monitorName} avec l'URL {monitorUrl} depuis {observerLocation} {statusMessage} Le dernier message d'erreur est {latestErrorMessage}",
     "xpack.uptime.alerts.monitorStatus.description": "Alerte lorsqu'un monitoring est arrêté ou qu'un seuil de disponibilité est dépassé.",
     "xpack.uptime.alerts.monitorStatus.filterBar.ariaLabel": "Entrée qui permet le filtrage de critères pour l'alerte de statut du moniteur",
     "xpack.uptime.alerts.monitorStatus.filters.anyLocation": "tout emplacement",
@@ -24568,6 +29811,7 @@
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.expression": "dans",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.value": "dernier/dernière(s) {value}",
     "xpack.uptime.alerts.searchPlaceholder.kql": "Filtrer à l'aide de la syntaxe KQL",
+    "xpack.uptime.alerts.settings.addConnector": "Ajouter un connecteur",
     "xpack.uptime.alerts.timerangeUnitSelectable.daysOption.ariaLabel": "Élément de sélection de la plage temporelle \"Jours\"",
     "xpack.uptime.alerts.timerangeUnitSelectable.hoursOption.ariaLabel": "Élément de sélection de la plage temporelle \"Heures\"",
     "xpack.uptime.alerts.timerangeUnitSelectable.minutesOption.ariaLabel": "Élément de sélection de la plage temporelle \"Minutes\"",
@@ -24589,6 +29833,7 @@
     "xpack.uptime.alerts.tls.criteriaExpression.ariaLabel": "Expression affichant les critères des moniteurs surveillés par cette alerte",
     "xpack.uptime.alerts.tls.criteriaExpression.description": "quand",
     "xpack.uptime.alerts.tls.criteriaExpression.value": "tout moniteur",
+    "xpack.uptime.alerts.tls.defaultActionMessage": "Le certificat TLS {commonName} détecté de l'émetteur {issuer} est {status}. Certificat {summary}\n",
     "xpack.uptime.alerts.tls.description": "Alerte lorsque le certificat TLS d'un moniteur Uptime est sur le point d'expirer.",
     "xpack.uptime.alerts.tls.expirationExpression.ariaLabel": "Expression affichant le seuil qui déclenchera l'alerte TLS pour l'expiration des certificats",
     "xpack.uptime.alerts.tls.expirationExpression.description": "possède un certificat expirant dans",
@@ -24597,6 +29842,7 @@
     "xpack.uptime.alerts.tls.expiringLabel": "sur le point d'expirer",
     "xpack.uptime.alerts.tls.invalidLabel": "non valide",
     "xpack.uptime.alerts.tls.legacy.clientName": "Uptime TLS (existant)",
+    "xpack.uptime.alerts.tls.legacy.defaultActionMessage": "Détection de {count} certificats TLS sur le point d'expirer ou devenant trop anciens.\n{expiringConditionalOpen}\nNombre de certificats sur le point d'expirer : {expiringCount}\nCertificats sur le point d'expirer : {expiringCommonNameAndDate}\n{expiringConditionalClose}\n{agingConditionalOpen}\nNombre de certificats vieillissants : {agingCount}\nCertificats vieillissants : {agingCommonNameAndDate}\n{agingConditionalClose}\n",
     "xpack.uptime.alerts.tls.legacy.description": "Alerte lorsque le certificat TLS d'un moniteur Uptime est sur le point d'expirer. Cette alerte sera déclassée dans une future version.",
     "xpack.uptime.alerts.tls.settingsPageNav.text": "Vous pouvez modifier ces seuils sur la {settingsPageLink}.",
     "xpack.uptime.alerts.tls.validAfterExpiredString": "expiré le {date}, il y a {relativeDate} jours.",
@@ -24606,8 +29852,8 @@
     "xpack.uptime.alerts.tlsLegacy": "Uptime TLS (existant)",
     "xpack.uptime.alerts.toggleAlertFlyoutButtonText": "Alertes et règles",
     "xpack.uptime.alertsPopover.toggleButton.ariaLabel": "Ouvrir le menu contextuel des alertes et règles",
-    "xpack.uptime.analyzeDataButtonLabel": "Analyser les données",
-    "xpack.uptime.analyzeDataButtonLabel.message": "EXPÉRIMENTAL - La fonctionnalité Analyser les données vous permet de sélectionner et de filtrer les données de résultat dans toute dimension et de rechercher la cause ou l'impact des problèmes de performances.",
+    "xpack.uptime.analyzeDataButtonLabel": "Explorer les données",
+    "xpack.uptime.analyzeDataButtonLabel.message": "La fonctionnalité Explorer les données vous permet de sélectionner et de filtrer les données de résultat dans toute dimension et de rechercher la cause ou l'impact des problèmes de performances.",
     "xpack.uptime.apmIntegrationAction.description": "Rechercher ce monitoring dans APM",
     "xpack.uptime.apmIntegrationAction.text": "Afficher les données APM",
     "xpack.uptime.availabilityLabelText": "{value} %",
@@ -24616,6 +29862,7 @@
     "xpack.uptime.breadcrumbs.observabilityText": "Observabilité",
     "xpack.uptime.breadcrumbs.overviewBreadcrumbText": "Uptime",
     "xpack.uptime.certificates.heading": "Certificats TLS ({total})",
+    "xpack.uptime.certificates.loading": "Chargement des certificats...",
     "xpack.uptime.certificates.refresh": "Actualiser",
     "xpack.uptime.certificatesPage.heading": "Certificats TLS",
     "xpack.uptime.certificatesRoute.title": "Certificats | {baseTitle}",
@@ -24639,17 +29886,42 @@
     "xpack.uptime.charts.mlAnnotation.header": "Note : {score}",
     "xpack.uptime.charts.mlAnnotation.severity": "Sévérité : {severity}",
     "xpack.uptime.controls.selectSeverity.criticalLabel": "critique",
-    "xpack.uptime.controls.selectSeverity.majorLabel": "majeure",
+    "xpack.uptime.controls.selectSeverity.majorLabel": "majeur",
     "xpack.uptime.controls.selectSeverity.minorLabel": "mineure",
-    "xpack.uptime.controls.selectSeverity.scoreDetailsDescription": "note {value} et supérieur",
+    "xpack.uptime.controls.selectSeverity.scoreDetailsDescription": "score {value} et supérieur",
     "xpack.uptime.controls.selectSeverity.warningLabel": "avertissement",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browser.scriptRecorder.experimentalLabel": "Préversion technique",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browser.scriptRecorder.experimentalTooltip": "Prévisualisez la méthode la plus rapide permettant de créer des scripts de monitoring Elastic Synthetics avec notre enregistreur Elastic Synthetics",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browser.scriptRecorder.label": "Enregistreur de scripts",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.description": "Fournissez une configuration précise pour l'agent synthétique.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.filtering.description": "Utilisez ces options pour appliquer les paramètres de moniteur sélectionnés à un sous-ensemble des tests de votre suite. Seul le sous-ensemble configuré sera exécuté par ce moniteur.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.filtering.title": "Tests sélectifs",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.ignoreHttpsErrors.helpText": "Définissez cette option sur \"true\" pour désactiver la validation TLS/SSL dans le navigateur synthétique. Cette opération est utile pour tester les sites qui utilisent des certificats autosignés.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.ignoreHttpsErrors.label": "Ignorer les erreurs HTTPS",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.journeyFiltersMatch.helpText": "Exécutez uniquement les parcours dont le nom correspond au glob fourni avec ce moniteur.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.journeyFiltersMatch.label": "Filtrer la correspondance",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.journeyFiltersTags.helpText": "Exécutez uniquement les parcours en utilisant les balises données avec ce moniteur.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.journeyFiltersTags.label": "Filtrer les balises",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.screenshots.helpText": "Définissez cette option pour gérer les captures d'écran effectuées par l'agent synthétique.",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.screenshots.label": "Options de capture d'écran",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.syntheticsArgs.helpText": "Arguments supplémentaires à transmettre au package de l'agent synthétique. Accepte une liste de chaînes. Cela est utile dans des scénarios rares et ne devrait normalement pas avoir besoin d'être défini.",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.syntheticsArgs.label": "Arguments synthétiques",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.message": "Lorsque vous désactivez la régulation, la bande passante de votre moniteur sera toujours limitée par les configurations des nœuds synthétiques dans lesquels votre moniteur est en cours d'exécution.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.title": "Limite automatique",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.description": "Contrôlez les vitesses de téléchargement et chargement du moniteur, ainsi que sa latence pour simuler le comportement de votre application sur des réseaux plus lents.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.error": "La vitesse de téléchargement doit être supérieure à zéro.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.label": "Vitesse de téléchargement",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.message": "Lors de l'utilisation de valeurs de régulation plus élevées que la limite de la bande passante d'un nœud synthétique, la bande passante de votre moniteur sera toujours limitée.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.title": "Vous avez dépassé les limites de bande passante du nœud synthétique",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error": "La latence ne doit pas être négative.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.label": "Latence",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.switch.description": "Activer la régulation",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.title": "Options de régulation",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.upload.error": "La vitesse de chargement doit être supérieure à zéro.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.upload.label": "Vitesse de chargement",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.title": "Options de l'agent synthétique",
     "xpack.uptime.createPackagePolicy.stepConfigure.certificateSettings.enableSSLSettings.label": "Activer la configuration TLS",
+    "xpack.uptime.createPackagePolicy.stepConfigure.certificateSettings.enableZipUrlSSLSettings.label": "Activer la configuration TLS pour l'URL du zip",
     "xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificate.helpText": "Certificat formaté PEM pour l'authentification du client TLS.",
     "xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificate.label": "certificat",
     "xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateAuthorities.helpText": "Autorités de certificats personnalisés formatés PEM.",
@@ -24704,32 +29976,49 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.httpAdvancedOptions.responseConfiguration.title": "Configuration des réponses",
     "xpack.uptime.createPackagePolicy.stepConfigure.httpAdvancedOptions.responseHeadersField.error": "La clé d'en-tête doit être un token HTTP valide.",
     "xpack.uptime.createPackagePolicy.stepConfigure.httpAdvancedOptions.responseHeadersField.helpText": "Liste d'en-têtes de réponse attendus.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.icmpAdvancedOptions": "Options ICMP avancées",
     "xpack.uptime.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel": "Facultatif",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.APMServiceName.helpText": "Nom de service APM pour ce monitoring. Correspond au champ ECS service.name. Définissez-le lors du monitoring d'une application qui utilise également APM pour activer les intégrations entre les données Uptime et APM dans Kibana.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.APMServiceName.label": "Nom de service APM",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.inlineScript.error": "Le script est requis",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.brower.proxyURL.label": "URL du zip du proxy",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.http.helpText": "Proxy HTTP pour l'URL du zip.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.inlineScript.error": "Script obligatoire",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.inlineScript.helpText": "Exécute des scripts de tests synthétiques définis en ligne.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.inlineScript.label": "Script en ligne",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.params.helpText": "Objet JSON qui définit toute variable dont vos tests ont besoin.",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.params.label": "Params",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.params.label": "Paramètres",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.scriptRecorder.closeButtonLabel": "Fermer le menu volant du script",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.scriptRecorder.mockFileName": "test_script.js",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.sourceType.label": "Type de source",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.uploader.fieldLabel": "Script de test",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.uploader.invalidFileError": "Type de fichier non valide. Veuillez charger un fichier .js généré par l'enregistreur Elastic Synthetics.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.uploader.label": "Sélectionner un fichier .js généré par l'enregistreur",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.uploader.parsingError": "Erreur lors du chargement du fichier. Veuillez charger un fichier .js généré par l'enregistreur Elastic Synthetics au format de script en ligne.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrl.error": "L'URL de zip est requise",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrl.helpText": "Emplacement du fichier zip du référentiel du projet synthétique.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrl.label": "URL du zip",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrl.recorderLink": "Télécharger l'enregistreur Elastic Synthetics",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrl.removeScriptLabel": "Retirer le script",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrl.showScriptLabel": "Afficher le script",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrlFolder.helpText": "Chemin de répertoire relatif d'emplacement des fichiers de parcours synthétiques dans le référentiel.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrlFolder.label": "Dossier",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrlPassword.abel": "Mot de passe de l'URL du zip",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrlPassword.helpText": "Mot de passe pour l'authentification avec le point de terminaison du zip.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrlUsername.helpText": "Nom d'utilisateur pour l'authentification avec le point de terminaison du zip.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.zipUrlUsername.label": "Nom d'utilisateur de l'URL du zip",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browserLabel": "Navigateur (version bêta)",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.enabled.helpText": "Désactivez cette configuration pour désactiver le moniteur.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.enabled.label": "Activé",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.icmp.hosts": "Hôte",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.icmp.hosts.error": "L'hôte est requis",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects": "Nb maxi de redirections",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects.error": "Le nb maxi de redirections doit être supérieur ou égal à 0",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects.helpText": "Nombre total de redirections à suivre.",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval": "Intervalle de monitoring",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval.error": "L'intervalle de monitoring est requis",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval": "Fréquence",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval.error": "La fréquence du moniteur est requise",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType": "Type de moniteur",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.description": "Pour créer un moniteur \"Navigateur\", veuillez vous assurer que vous utilisez le conteneur Docker elastic-agent-complete, qui inclut les dépendances permettant d'exécuter ces moniteurs. Pour en savoir plus, visitez notre {link}.",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.link": "documentation Synthetics",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.error": "Le type de moniteur est requis",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.password.helpText": "Mot de passe pour l'authentification avec le serveur.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.password.label": "Mot de passe",
@@ -24744,7 +30033,7 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tcp.hosts.error": "L'hôte et le port sont requis",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.helpText": "Temps total autorisé pour tester la connexion et l'échange de données.",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.label": "Délai d'expiration en secondes",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError": "Le délai d'expiration doit être inférieur à l'intervalle de monitoring",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError": "Le délai d'expiration doit être inférieur à la fréquence du moniteur",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.moreThanZeroError": "Le délai d'expiration doit être supérieur ou égal à 0",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.URL": "URL",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.URL.error": "L'URL est requise",
@@ -24782,11 +30071,13 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.tlsSettings.label": "Paramètres TLS",
     "xpack.uptime.durationChart.emptyPrompt.description": "Ce monitoring n'a jamais été {emphasizedText} au cours de la plage temporelle sélectionnée.",
     "xpack.uptime.durationChart.emptyPrompt.title": "Aucune donnée de durée n'est disponible",
+    "xpack.uptime.editMonitor.pageHeader.title": "Modifier le moniteur",
+    "xpack.uptime.editMonitorRoute.title": "Modifier le moniteur | {baseTitle}",
     "xpack.uptime.emptyState.loadingMessage": "Chargement…",
     "xpack.uptime.emptyStateError.notAuthorized": "Vous n'êtes pas autorisé à afficher les données Uptime, veuillez contacter votre administrateur système.",
     "xpack.uptime.emptyStateError.notFoundPage": "Page introuvable",
     "xpack.uptime.emptyStateError.title": "Erreur",
-    "xpack.uptime.featureRegistry.uptimeFeatureName": "Uptime",
+    "xpack.uptime.enableAlert.editAlert": "Modifier l'alerte",
     "xpack.uptime.filterBar.ariaLabel": "Saisissez des critères de filtre pour la page d'aperçu",
     "xpack.uptime.filterBar.filterAllLabel": "Tous",
     "xpack.uptime.filterBar.options.location.name": "Emplacement",
@@ -24795,6 +30086,7 @@
     "xpack.uptime.filterBar.options.tagsLabel": "Balise",
     "xpack.uptime.fleetIntegration.assets.description": "Afficher les moniteurs dans Uptime",
     "xpack.uptime.fleetIntegration.assets.name": "Moniteurs",
+    "xpack.uptime.inspectButtonText": "Inspecter",
     "xpack.uptime.integrationLink.missingDataMessage": "Les données requises pour cette intégration sont introuvables.",
     "xpack.uptime.keyValuePairsField.deleteItem.label": "Supprimer le numéro d'élément {index}, {key}:{value}",
     "xpack.uptime.keyValuePairsField.key.ariaLabel": "Clé",
@@ -24804,8 +30096,12 @@
     "xpack.uptime.kueryBar.searchPlaceholder.kql": "Rechercher à l'aide de la syntaxe KQL des ID, noms et types etc. de moniteurs (par ex. monitor.type: \"http\" AND tags: \"dev\")",
     "xpack.uptime.kueryBar.searchPlaceholder.simple": "Rechercher par ID, nom ou URL de moniteur (par ex. http:// )",
     "xpack.uptime.locationName.helpLinkAnnotation": "Ajouter un emplacement",
+    "xpack.uptime.mappingErrorRoute.breadcrumb": "Erreur de mapping",
+    "xpack.uptime.mappingErrorRoute.pageHeader.title": "Erreur de mapping",
+    "xpack.uptime.mappingErrorRoute.title": "Synthetics | erreur de mapping",
     "xpack.uptime.millisecond.abbreviation.label": "ms",
     "xpack.uptime.ml.durationChart.exploreInMlApp": "Explorer dans ML App",
+    "xpack.uptime.ml.enableAnomalyDetectionPanel.add_job_permissions_needed": "Autorisations requises",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.anomalyDetectionTitle": "Détection des anomalies",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.cancelLabel": "Annuler",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.createMLJobDescription": "Ici, vous pouvez créer une tâche de Machine Learning afin de calculer les scores d'anomalie pour\n    les durées de réponse pour Uptime Monitor. Une fois activé, le graphique de durée de monitoring de la page des détails\n    affichera les limites attendues et annotera le graphique avec les anomalies. Vous pouvez aussi éventuellement\n     identifier les périodes de latence augmentées selon les zones géographiques.",
@@ -24815,6 +30111,8 @@
     "xpack.uptime.ml.enableAnomalyDetectionPanel.enable_or_manage_job": "Vous pouvez activer la tâche de détection des anomalies, ou, si elle est déjà présente, vous pouvez gérer la tâche ou l'alerte.",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.enableAnomalyAlert": "Activer l'alerte d'anomalie",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.enableAnomalyDetectionTitle": "Activer la détection des anomalies",
+    "xpack.uptime.ml.enableAnomalyDetectionPanel.insufficient_permissions_add_job": "Vous devez disposer des privilèges Kibana de Machine Learning pour utiliser cette fonctionnalité.",
+    "xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedLazyNotificationText": "L'analyse attend qu'un nœud de ML devienne disponible. L'ajout des résultats au graphique peut prendre un certain temps.",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedNotificationText": "L'analyse est à présent en cours d'exécution pour le graphique de durée de réponse. L'ajout des résultats au graphique peut prendre un certain temps.",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedNotificationText.viewJobLinkText": "Afficher la tâche",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.jobCreatedNotificationTitle": "Tâche créée avec succès",
@@ -24827,8 +30125,10 @@
     "xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription": "Une fois qu'une tâche a été créée, vous pouvez la gérer et afficher davantage de détails sur la {mlJobsPageLink}.",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription.mlJobsPageLinkText": "Page de gestion des tâches de Machine Learning",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.manageMLJobDescription.noteText": "Remarque : La tâche peut mettre un certain temps à démarrer le calcul des résultats.",
+    "xpack.uptime.ml.enableAnomalyDetectionPanel.noPermissionsTooltip": "Vous devez disposer d'un accès en lecture-écriture à Uptime pour créer des alertes d'anomalie.",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.startTrial": "Commencer un essai gratuit de 14 jours",
     "xpack.uptime.ml.enableAnomalyDetectionPanel.startTrialDesc": "Pour pouvoir accéder à la détection des anomalies de durée, vous devez être abonné à une licence Elastic Platinum.",
+    "xpack.uptime.monitor.simpleStatusAlert.email.subject": "Le moniteur {monitor} possédant l'URL {url} est arrêté",
     "xpack.uptime.monitorCharts.durationChart.leftAxis.title": "Durée en {unit}",
     "xpack.uptime.monitorCharts.durationChart.wrapper.label": "Graphique affichant la durée de ping du moniteur, avec regroupement par emplacement.",
     "xpack.uptime.monitorCharts.monitorDuration.titleLabel": "Durée du moniteur",
@@ -24847,6 +30147,7 @@
     "xpack.uptime.monitorDetails.title.pingType.http": "Ping HTTP",
     "xpack.uptime.monitorDetails.title.pingType.icmp": "Ping ICMP",
     "xpack.uptime.monitorDetails.title.pingType.tcp": "Ping TCP",
+    "xpack.uptime.monitorList.allMonitors": "Tous les moniteurs",
     "xpack.uptime.monitorList.anomalyColumn.label": "Score d'anomalies de réponse",
     "xpack.uptime.monitorList.defineConnector.description": "Définissez un connecteur par défaut dans {link} pour activer les alertes de statut du moniteur.",
     "xpack.uptime.monitorList.defineConnector.popover.description": "pour recevoir les alertes de statut.",
@@ -24859,6 +30160,7 @@
     "xpack.uptime.monitorList.enabledAlerts.noAlert": "Aucune règle n'est activée pour ce moniteur.",
     "xpack.uptime.monitorList.enabledAlerts.title": "Règles activées",
     "xpack.uptime.monitorList.enableDownAlert": "Activer les alertes de statut",
+    "xpack.uptime.monitorList.errorSummary": "Résumé des erreurs",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "Développer la ligne du moniteur avec l'ID {id}",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "Ajouter un emplacement",
     "xpack.uptime.monitorList.infraIntegrationAction.container.message": "Afficher les indicateurs de conteneurs",
@@ -24871,7 +30173,9 @@
     "xpack.uptime.monitorList.infraIntegrationAction.kubernetes.message": "Afficher les indicateurs de pod",
     "xpack.uptime.monitorList.infraIntegrationAction.kubernetes.tooltip": "Vérifier l'interface utilisateur de l'infrastructure pour l'UID de pod \"{podUid}\".",
     "xpack.uptime.monitorList.integrationGroup.emptyMessage": "Aucune application intégrée n'est disponible",
+    "xpack.uptime.monitorList.invalidMonitors": "Moniteurs non valides",
     "xpack.uptime.monitorList.loading": "Chargement...",
+    "xpack.uptime.monitorList.locations.expand": "Cliquer pour afficher les emplacements restants",
     "xpack.uptime.monitorList.loggingIntegrationAction.container.id": "Afficher les logs du conteneur",
     "xpack.uptime.monitorList.loggingIntegrationAction.container.message": "Afficher les logs du conteneur",
     "xpack.uptime.monitorList.loggingIntegrationAction.container.tooltip": "Vérifier l'interface utilisateur de logging pour l'ID de conteneur \"{containerId}\"",
@@ -24898,9 +30202,14 @@
     "xpack.uptime.monitorList.redirects.openWindow": "Le lien s'ouvrira dans une nouvelle fenêtre.",
     "xpack.uptime.monitorList.redirects.title": "Redirections",
     "xpack.uptime.monitorList.redirects.title.number": "{number}",
+    "xpack.uptime.monitorList.refresh": "Actualiser",
     "xpack.uptime.monitorList.statusAlert.label": "Alerte de statut",
+    "xpack.uptime.monitorList.statusColumn.checkedTimestamp": "Vérifié à {timestamp}",
     "xpack.uptime.monitorList.statusColumn.completeLabel": "Terminé",
     "xpack.uptime.monitorList.statusColumn.downLabel": "Arrêté",
+    "xpack.uptime.monitorList.statusColumn.error.logs": "Logs d'erreurs",
+    "xpack.uptime.monitorList.statusColumn.error.message": "{message}. Cliquez pour en savoir plus.",
+    "xpack.uptime.monitorList.statusColumn.error.messageLabel": "{message}. Cliquez pour en savoir plus.",
     "xpack.uptime.monitorList.statusColumn.failedLabel": "Échoué",
     "xpack.uptime.monitorList.statusColumn.locStatusMessage": "dans {noLoc} emplacement",
     "xpack.uptime.monitorList.statusColumn.locStatusMessage.multiple": "dans {noLoc} emplacements",
@@ -24913,7 +30222,87 @@
     "xpack.uptime.monitorList.table.url.name": "Url",
     "xpack.uptime.monitorList.tags.expand": "Cliquer pour afficher les balises restantes",
     "xpack.uptime.monitorList.tags.filter": "Filtrer tous les moniteurs avec la balise {tag}",
+    "xpack.uptime.monitorList.testNow.AriaLabel": "Cliquer pour exécuter le test maintenant",
+    "xpack.uptime.monitorList.testNow.available": "L'option Tester maintenant est uniquement disponible pour les moniteurs ajoutés via la liste Gestion des moniteurs.",
+    "xpack.uptime.monitorList.testNow.label": "Tester maintenant",
+    "xpack.uptime.monitorList.testNow.scheduled": "Le test est déjà programmé",
+    "xpack.uptime.monitorList.testRunLogs": "Logs d'exécution de test",
+    "xpack.uptime.monitorList.timestamp": "Horodatage",
     "xpack.uptime.monitorList.tlsColumnLabel": "Certificat TLS",
+    "xpack.uptime.monitorList.viewInDiscover": "Afficher dans Discover",
+    "xpack.uptime.monitorManagement.addMonitorCrumb": "Ajouter un moniteur",
+    "xpack.uptime.monitorManagement.addMonitorError": "Impossible de charger les emplacements de services. Réessayez plus tard.",
+    "xpack.uptime.monitorManagement.addMonitorLabel": "Ajouter un moniteur",
+    "xpack.uptime.monitorManagement.addMonitorLoadingError": "Erreur lors du chargement de la liste Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.addMonitorLoadingLabel": "Chargement de la liste Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.addMonitorServiceLocationsLoadingError": "Impossible de charger les emplacements de services. Réessayez plus tard.",
+    "xpack.uptime.monitorManagement.closeButtonLabel": "Fermer",
+    "xpack.uptime.monitorManagement.completed": "TERMINÉ",
+    "xpack.uptime.monitorManagement.confirmDescriptionLabel": "Cette action supprimera le moniteur mais conservera toute donnée collectée. Cette action ne peut pas être annulée.",
+    "xpack.uptime.monitorManagement.deleteMonitorLabel": "Supprimer le moniteur",
+    "xpack.uptime.monitorManagement.disableMonitorLabel": "Désactiver le moniteur",
+    "xpack.uptime.monitorManagement.discardLabel": "Abandonner",
+    "xpack.uptime.monitorManagement.duplicateNameError": "Le nom du moniteur existe déjà.",
+    "xpack.uptime.monitorManagement.editMonitorCrumb": "Modifier le moniteur",
+    "xpack.uptime.monitorManagement.editMonitorError": "Erreur lors du chargement de la liste Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.editMonitorErrorBody": "Impossible de charger la configuration du moniteur. Réessayez plus tard.",
+    "xpack.uptime.monitorManagement.editMonitorLabel": "Modifier le moniteur",
+    "xpack.uptime.monitorManagement.editMonitorLoadingLabel": "Chargement du moniteur",
+    "xpack.uptime.monitorManagement.enableMonitorLabel": "Activer le moniteur",
+    "xpack.uptime.monitorManagement.failed": "ÉCHOUÉ",
+    "xpack.uptime.monitorManagement.failedRun": "Impossible d'exécuter les étapes",
+    "xpack.uptime.monitorManagement.inProgress": "EN COURS",
+    "xpack.uptime.monitorManagement.label": "Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.loading.label": "Chargement de la liste Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.loadingSteps": "Chargement des étapes...",
+    "xpack.uptime.monitorManagement.monitorAddedSuccessMessage": "Moniteur ajouté avec succès.",
+    "xpack.uptime.monitorManagement.monitorAdvancedOptions.dataStreamConfiguration.description": "Configurez les options de flux de données supplémentaires.",
+    "xpack.uptime.monitorManagement.monitorAdvancedOptions.dataStreamConfiguration.title": "Paramètres de flux de données",
+    "xpack.uptime.monitorManagement.monitorAdvancedOptions.monitorNamespaceFieldLabel": "Espace de nom",
+    "xpack.uptime.monitorManagement.monitorAdvancedOptions.namespaceHelpLabel": "Modifiez l'espace de nom par défaut. Ce paramètre modifie le nom du flux de données du moniteur. {learnMore}.",
+    "xpack.uptime.monitorManagement.monitorAdvancedOptions.namespaceHelpLearnMoreLabel": "En savoir plus",
+    "xpack.uptime.monitorManagement.monitorDeleteFailureMessage": "Impossible de supprimer le moniteur. Réessayez plus tard.",
+    "xpack.uptime.monitorManagement.monitorDeleteLoadingMessage": "Suppression du moniteur...",
+    "xpack.uptime.monitorManagement.monitorDeleteSuccessMessage": "Moniteur supprimé avec succès.",
+    "xpack.uptime.monitorManagement.monitorDisabledSuccessMessage": "Moniteur {name} désactivé avec succès.",
+    "xpack.uptime.monitorManagement.monitorEditedSuccessMessage": "Moniteur mis à jour avec succès.",
+    "xpack.uptime.monitorManagement.monitorEnabledSuccessMessage": "Moniteur {name} activé avec succès.",
+    "xpack.uptime.monitorManagement.monitorEnabledUpdateFailureMessage": "Impossible de mettre à jour le moniteur {name}.",
+    "xpack.uptime.monitorManagement.monitorFailureMessage": "Impossible d'enregistrer le moniteur. Réessayez plus tard.",
+    "xpack.uptime.monitorManagement.monitorList.actions": "Actions",
+    "xpack.uptime.monitorManagement.monitorList.enabled": "Activé",
+    "xpack.uptime.monitorManagement.monitorList.locations": "Emplacements",
+    "xpack.uptime.monitorManagement.monitorList.monitorName": "Nom de moniteur",
+    "xpack.uptime.monitorManagement.monitorList.monitorType": "Type de moniteur",
+    "xpack.uptime.monitorManagement.monitorList.schedule": "Fréquence (min)",
+    "xpack.uptime.monitorManagement.monitorList.tags": "Balises",
+    "xpack.uptime.monitorManagement.monitorList.title": "Liste Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.monitorList.URL": "URL",
+    "xpack.uptime.monitorManagement.monitorLocationsLabel": "Emplacements des moniteurs",
+    "xpack.uptime.monitorManagement.monitorManagementCrumb": "Gestion des moniteurs",
+    "xpack.uptime.monitorManagement.monitorNameFieldError": "Le nom de moniteur est requis",
+    "xpack.uptime.monitorManagement.monitorNameFieldLabel": "Nom de moniteur",
+    "xpack.uptime.monitorManagement.noLabel": "Annuler",
+    "xpack.uptime.monitorManagement.pageHeader.title": "Gérer les moniteurs",
+    "xpack.uptime.monitorManagement.pending": "EN ATTENTE",
+    "xpack.uptime.monitorManagement.publicBetaDescription": "La liste Gestion des moniteurs est disponible uniquement pour les utilisateurs de la version bêta publique sélectionnés. Avec un accès\nà la version bêta publique, vous pourrez ajouter des vérifications HTTP, TCP, ICMP et Navigateur qui seront\nexécutées sur les nœuds de service synthétiques gérés d'Elastic.",
+    "xpack.uptime.monitorManagement.requestAccess": "Demander un accès",
+    "xpack.uptime.monitorManagement.reRunTest": "Exécuter à nouveau le test",
+    "xpack.uptime.monitorManagement.runTest": "Exécuter le test",
+    "xpack.uptime.monitorManagement.saveMonitorLabel": "Enregistrer le moniteur",
+    "xpack.uptime.monitorManagement.service.error.message": "Votre moniteur a été enregistré, mais un problème est survenu lors de la synchronisation de la configuration pour {location}. Nous réessaierons plus tard de façon automatique. Si le problème persiste, vos moniteurs arrêteront de fonctionner dans {location}. Veuillez contacter le support technique pour obtenir de l'aide.",
+    "xpack.uptime.monitorManagement.service.error.reason": "Raison : {reason}.",
+    "xpack.uptime.monitorManagement.service.error.status": "Statut : {status}. ",
+    "xpack.uptime.monitorManagement.service.error.title": "Impossible de synchroniser la configuration du moniteur",
+    "xpack.uptime.monitorManagement.serviceLocationsValidationError": "Au moins un emplacement de service doit être spécifié",
+    "xpack.uptime.monitorManagement.stepCompleted": "{stepCount, number} {stepCount, plural, one {étape terminée} other {étapes terminées}}",
+    "xpack.uptime.monitorManagement.testResult": "Résultat du test",
+    "xpack.uptime.monitorManagement.timeTaken": "Durée de {timeTaken}",
+    "xpack.uptime.monitorManagement.updateMonitorLabel": "Mettre à jour le moniteur",
+    "xpack.uptime.monitorManagement.validationError": "Votre moniteur comporte des erreurs. Corrigez-les avant de l'enregistrer.",
+    "xpack.uptime.monitorManagement.viewTestRunDetails": "Afficher les détails du résultat du test",
+    "xpack.uptime.monitorManagement.yesLabel": "Supprimer",
+    "xpack.uptime.monitorManagementRoute.title": "Gérer les moniteurs | {baseTitle}",
     "xpack.uptime.monitorRoute.title": "Moniteur | {baseTitle}",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "Durée du monitoring en millisecondes",
     "xpack.uptime.monitorStatusBar.healthStatusMessageAriaLabel": "Statut du moniteur",
@@ -24935,6 +30324,9 @@
     "xpack.uptime.monitorStatusBar.type.label": "Type",
     "xpack.uptime.navigateToAlertingButton.content": "Gérer les règles",
     "xpack.uptime.navigateToAlertingUi": "Quitter Uptime et accéder à la page de gestion Alerting",
+    "xpack.uptime.noDataConfig.beatsCard.description": "Monitorez de façon proactive la disponibilité de vos sites et services. Recevez des alertes et corrigez les problèmes plus rapidement pour optimiser l'expérience de vos utilisateurs.",
+    "xpack.uptime.noDataConfig.beatsCard.title": "Ajouter des moniteurs avec Heartbeat",
+    "xpack.uptime.noDataConfig.solutionName": "Observabilité",
     "xpack.uptime.notFountPage.homeLinkText": "Retour à l'accueil",
     "xpack.uptime.openAlertContextPanel.ariaLabel": "Ouvrez le panneau de contexte des règles pour choisir un type de règle",
     "xpack.uptime.openAlertContextPanel.label": "Créer une règle",
@@ -24953,9 +30345,10 @@
     "xpack.uptime.overviewPageLink.next.ariaLabel": "Page de résultats suivante",
     "xpack.uptime.overviewPageLink.prev.ariaLabel": "Page de résultats précédente",
     "xpack.uptime.page_header.addDataLink.label": "Accédez à un tutoriel sur l'ajout de données Uptime",
-    "xpack.uptime.page_header.analyzeData.label": "Accédez à la vue \"Analyser les données\" pour visualiser les données synthétiques/d'utilisateur",
+    "xpack.uptime.page_header.analyzeData.label": "Accédez à la vue \"Explorer les données\" pour visualiser les données synthétiques/d'utilisateur",
     "xpack.uptime.page_header.defineConnector.popover.defaultLink": "Définir un connecteur par défaut",
     "xpack.uptime.page_header.defineConnector.settingsLink": "Paramètres",
+    "xpack.uptime.page_header.manageLink.label": "Accéder à la page de gestion des moniteurs Uptime",
     "xpack.uptime.page_header.settingsLink": "Paramètres",
     "xpack.uptime.page_header.settingsLink.label": "Accédez à la page de paramètres Uptime",
     "xpack.uptime.pingHistogram.analyze": "Analyser",
@@ -24983,11 +30376,15 @@
     "xpack.uptime.pingList.recencyMessage": "Vérifié {fromNow}",
     "xpack.uptime.pingList.responseCodeColumnLabel": "Code de réponse",
     "xpack.uptime.pingList.statusColumnLabel": "Statut",
+    "xpack.uptime.pingList.stepDurationHeader": "Durée de l’étape",
     "xpack.uptime.pingList.synthetics.performanceBreakDown": "Afficher la répartition des performances",
     "xpack.uptime.pingList.synthetics.waterfall.filters.collapseRequestsLabel": "Réduire pour afficher uniquement les requêtes correspondantes",
     "xpack.uptime.pingList.synthetics.waterfall.filters.popover": "Cliquer pour ouvrir les filtres de cascade",
     "xpack.uptime.pingList.timestampColumnLabel": "Horodatage",
     "xpack.uptime.pluginDescription": "Monitoring Uptime",
+    "xpack.uptime.public.pages.mappingError.bodyDocsLink": "Vous pouvez apprendre à corriger ce problème dans la {docsLink}.",
+    "xpack.uptime.public.pages.mappingError.bodyMessage": "Mappings incorrects détectés ! Vous avez peut-être oublié d'exécuter la commande {setup} Heartbeat ?",
+    "xpack.uptime.public.pages.mappingError.title": "Mappings Heartbeat manquants",
     "xpack.uptime.routes.baseTitle": "Uptime - Kibana",
     "xpack.uptime.seconds.label": "secondes",
     "xpack.uptime.seconds.shortForm.label": "s",
@@ -25018,6 +30415,10 @@
     "xpack.uptime.sourceConfiguration.ageLimitThresholdInput.ariaLabel": "Entrée contrôlant le nombre maximal de jours pendant lesquels un certificat TLS peut être valide avant que Kibana n'affiche un avertissement.",
     "xpack.uptime.sourceConfiguration.ageThresholdDefaultValue": "La valeur par défaut est {defaultValue}",
     "xpack.uptime.sourceConfiguration.alertConnectors": "Connecteurs d'alerte",
+    "xpack.uptime.sourceConfiguration.alertConnectors.defaultEmail": "E-mail par défaut",
+    "xpack.uptime.sourceConfiguration.alertDefaultForm.emailConnectorPlaceHolder": "À : pour le connecteur d'e-mails",
+    "xpack.uptime.sourceConfiguration.alertDefaultForm.invalidEmail": "{val} n'est pas un e-mail valide.",
+    "xpack.uptime.sourceConfiguration.alertDefaultForm.requiredEmail": "L'e-mail du destinataire est requis pour le connecteur d'e-mails",
     "xpack.uptime.sourceConfiguration.alertDefaultForm.selectConnector": "Veuillez sélectionner un ou plusieurs connecteurs",
     "xpack.uptime.sourceConfiguration.alertDefaults": "Valeurs par défaut des alertes",
     "xpack.uptime.sourceConfiguration.applySettingsButtonLabel": "Appliquer les modifications",
@@ -25026,6 +30427,7 @@
     "xpack.uptime.sourceConfiguration.certificationSectionTitle": "Expiration du certificat",
     "xpack.uptime.sourceConfiguration.defaultConnectors": "Connecteurs par défaut",
     "xpack.uptime.sourceConfiguration.defaultConnectors.description": "Connecteurs par défaut à utiliser pour envoyer une alerte.",
+    "xpack.uptime.sourceConfiguration.defaultConnectors.description.defaultEmail": "Paramètres d'e-mails requis pour les connecteurs d'alertes d'e-mails sélectionnés.",
     "xpack.uptime.sourceConfiguration.discardSettingsButtonLabel": "Annuler",
     "xpack.uptime.sourceConfiguration.errorStateLabel": "Seuil d'expiration",
     "xpack.uptime.sourceConfiguration.expirationThreshold": "Seuils expiration/âge",
@@ -25059,6 +30461,9 @@
     "xpack.uptime.synthetics.journey.allSucceededMessage": "{total} étapes - toutes réussies",
     "xpack.uptime.synthetics.journey.loadingSteps": "Chargement des étapes...",
     "xpack.uptime.synthetics.journey.partialSuccessMessage": "{total} étapes - {succeeded} réussies",
+    "xpack.uptime.synthetics.markers.explore": "Explorer",
+    "xpack.uptime.synthetics.markers.noFieldIcon.label": "Icône indiquant que ce marqueur ne possède aucun champ associé",
+    "xpack.uptime.synthetics.markers.openEmbeddableButton.label": "Utilisez ce bouton icône pour afficher les indicateurs pour ce marqueur d'annotation.",
     "xpack.uptime.synthetics.nextStepButton.ariaLabel": "Étape suivante",
     "xpack.uptime.synthetics.performanceBreakDown.label": "Répartition des performances",
     "xpack.uptime.synthetics.pingTimestamp.captionContent": "Étape : {stepNumber} sur {totalSteps}",
@@ -25066,9 +30471,12 @@
     "xpack.uptime.synthetics.screenshot.noImageMessage": "Aucune image disponible",
     "xpack.uptime.synthetics.screenshotDisplay.altText": "Capture d'écran de l'étape portant le nom \"{stepName}\"",
     "xpack.uptime.synthetics.screenshotDisplay.altTextWithoutName": "Capture d'écran",
+    "xpack.uptime.synthetics.service.apiKey": "Clé d'API du service Synthetics",
     "xpack.uptime.synthetics.statusBadge.failedMessage": "Échoué",
     "xpack.uptime.synthetics.statusBadge.skippedMessage": "Ignoré",
     "xpack.uptime.synthetics.statusBadge.succeededMessage": "Réussi",
+    "xpack.uptime.synthetics.step.duration": "{value} secondes",
+    "xpack.uptime.synthetics.step.durationTrend": "Tendance de durée de l'étape",
     "xpack.uptime.synthetics.stepDetail.nextCheckButtonText": "Vérification suivante",
     "xpack.uptime.synthetics.stepDetail.noData": "Aucune donnée n'a été trouvée pour cette étape",
     "xpack.uptime.synthetics.stepDetail.previousCheckButtonText": "Vérification précédente",
@@ -25080,12 +30488,18 @@
     "xpack.uptime.synthetics.stepList.nextCheck": "Vérification suivante",
     "xpack.uptime.synthetics.stepList.previousCheck": "Vérification précédente",
     "xpack.uptime.synthetics.thumbnail.fullSize.alt": "Version plus grande de la capture d'écran de la miniature de l'étape du parcours.",
+    "xpack.uptime.synthetics.waterfall.domContentLabel": "Contenu DOM chargé",
+    "xpack.uptime.synthetics.waterfall.fcpLabel": "First Contentful Paint",
     "xpack.uptime.synthetics.waterfall.filterGroup.filterScreenreaderLabel": "Filtrer par",
     "xpack.uptime.synthetics.waterfall.filterGroup.removeFilterScreenReaderLabel": "Retirer le filtre Filtrer par",
     "xpack.uptime.synthetics.waterfall.flyout.certificates": "En-têtes de certificat",
     "xpack.uptime.synthetics.waterfall.flyout.details": "Détails",
     "xpack.uptime.synthetics.waterfall.flyout.requestHeaders": "En-têtes de la requête",
     "xpack.uptime.synthetics.waterfall.flyout.responseHeaders": "En-têtes de réponse",
+    "xpack.uptime.synthetics.waterfall.layoutShiftLabel": "Layout Shift",
+    "xpack.uptime.synthetics.waterfall.lcpLabel": "Largest Contentful Paint",
+    "xpack.uptime.synthetics.waterfall.loadEventLabel": "Charger l'événement",
+    "xpack.uptime.synthetics.waterfall.offsetUnit": "{offset} ms",
     "xpack.uptime.synthetics.waterfall.requestsHighlightedMessage": "({numHighlightedRequests} correspondent au filtre)",
     "xpack.uptime.synthetics.waterfall.requestsTotalMessage": "{numNetworkRequests} requêtes réseau",
     "xpack.uptime.synthetics.waterfall.requestsTotalMessage.first": "Premier(s)/première(s) {count}",
@@ -25117,12 +30531,18 @@
     "xpack.uptime.synthetics.waterfallChart.labels.timings.send": "Envoi de la requête",
     "xpack.uptime.synthetics.waterfallChart.labels.timings.ssl": "TLS",
     "xpack.uptime.synthetics.waterfallChart.labels.timings.wait": "En attente (TTFB)",
+    "xpack.uptime.syntheticsMonitors": "Uptime - Moniteur",
+    "xpack.uptime.testRun.description": "Tester votre moniteur et vérifier les résultats avant d'enregistrer",
+    "xpack.uptime.testRun.pushError": "Impossible d'envoyer le moniteur vers le service.",
+    "xpack.uptime.testRun.pushErrorLabel": "Erreur d'envoi",
+    "xpack.uptime.testRun.pushing.description": "Envoi du moniteur vers le service...",
     "xpack.uptime.title": "Uptime",
     "xpack.uptime.toggleAlertButton.content": "Règle de statut du moniteur",
     "xpack.uptime.toggleAlertFlyout.ariaLabel": "Ouvrir le menu volant d'ajout de règle",
     "xpack.uptime.toggleTlsAlertButton.ariaLabel": "Ouvrir le menu volant de règle TLS",
     "xpack.uptime.toggleTlsAlertButton.content": "Règle TLS",
     "xpack.uptime.uptimeFeatureCatalogueTitle": "Uptime",
+    "xpack.uptime.uptimeSettings.index": "Paramètres Uptime - Index",
     "xpack.uptime.waterfallChart.sidebar.url.https": "https",
     "xpack.urlDrilldown.click.event.key.documentation": "Nom du champ derrière le point de données sur lequel l'utilisateur a cliqué.",
     "xpack.urlDrilldown.click.event.key.title": "Nom du champ sur lequel l'utilisateur a cliqué.",
@@ -25166,6 +30586,102 @@
     "xpack.urlDrilldown.row.event.values.documentation": "Tableau de toutes les valeurs de cellules pour la ligne sur laquelle l'action sera exécutée.",
     "xpack.urlDrilldown.row.event.values.title": "Liste des valeurs de cellules de lignes.",
     "xpack.urlDrilldown.valuePreview": "Valeur : {value}",
+    "xpack.ux.addDataButtonLabel": "Ajouter des données",
+    "xpack.ux.analyzeDataButtonLabel": "Explorer les données",
+    "xpack.ux.analyzeDataButtonLabel.message": "La fonctionnalité Explorer les données vous permet de sélectionner et de filtrer les données de résultat dans toute dimension et de rechercher la cause ou l'impact des problèmes de performances.",
+    "xpack.ux.breadcrumbs.dashboard": "Tableau de bord",
+    "xpack.ux.breadcrumbs.root": "Expérience utilisateur",
+    "xpack.ux.breakdownFilter.browser": "Navigateur",
+    "xpack.ux.breakdownFilter.device": "Appareil",
+    "xpack.ux.breakdownFilter.location": "Lieu",
+    "xpack.ux.breakDownFilter.noBreakdown": "Pas de répartition",
+    "xpack.ux.breakdownFilter.os": "Système d'exploitation",
+    "xpack.ux.clearFilters": "Effacer les filtres",
+    "xpack.ux.coreVitals.dataUndefined": "S. O.",
+    "xpack.ux.coreVitals.fcp": "First Contentful Paint",
+    "xpack.ux.coreVitals.fcpTooltip": "First Contentful Paint (FCP) se concentre sur le rendu initial et mesure la durée entre le début du chargement d'une page et le moment où une partie du contenu de la page s'affiche à l'écran.",
+    "xpack.ux.coreVitals.tbt": "Temps de blocage total",
+    "xpack.ux.coreVitals.tbtTooltip": "Total Blocking Time (TBT) est la somme du temps de blocage (durée supérieure à 50 ms) pour chaque tâche de longue durée qui intervient entre le First Contentful Paint et le moment où la transaction est terminée.",
+    "xpack.ux.dashboard.backend": "Back-end",
+    "xpack.ux.dashboard.dataMissing": "N/A",
+    "xpack.ux.dashboard.frontend": "Frontend",
+    "xpack.ux.dashboard.impactfulMetrics.highTrafficPages": "Pages à trafic élevé",
+    "xpack.ux.dashboard.impactfulMetrics.jsErrors": "Erreurs JavaScript",
+    "xpack.ux.dashboard.overall.label": "Général",
+    "xpack.ux.dashboard.pageLoad.label": "Chargement de la page",
+    "xpack.ux.dashboard.pageLoadDistribution.label": "Distribution du chargement de la page",
+    "xpack.ux.dashboard.pageLoadDuration.label": "Durée du chargement de la page",
+    "xpack.ux.dashboard.pageLoadTime.label": "Temps de chargement de la page (secondes)",
+    "xpack.ux.dashboard.pageLoadTimes.label": "Temps de chargement de la page",
+    "xpack.ux.dashboard.pagesLoaded.label": "Pages chargées",
+    "xpack.ux.dashboard.pageViews": "Total des visualisations de la page",
+    "xpack.ux.dashboard.resetZoom.label": "Réinitialiser le zoom",
+    "xpack.ux.dashboard.tooltips.backEnd": "Le temps de back-end représente le temps jusqu'au premier octet (TTFB), c'est-à-dire à la réception du premier paquet de réponse après le lancement de la requête",
+    "xpack.ux.dashboard.tooltips.frontEnd": "Le temps de frontend représente la durée totale du chargement de la page, moins le temps de back-end",
+    "xpack.ux.dashboard.tooltips.totalPageLoad": "Le total représente la durée de chargement de la page entière",
+    "xpack.ux.dashboard.totalPageLoad": "Total",
+    "xpack.ux.emptyState.loadingMessage": "Chargement…",
+    "xpack.ux.fetcher.error.status": "Erreur",
+    "xpack.ux.fetcher.error.title": "Erreur lors de la récupération des ressources",
+    "xpack.ux.fetcher.error.url": "URL",
+    "xpack.ux.filter.environment.allLabel": "Tous",
+    "xpack.ux.filter.environment.label": "Environnement",
+    "xpack.ux.filter.environment.notDefinedLabel": "Non défini",
+    "xpack.ux.filter.environment.selectEnvironmentLabel": "Sélectionner l'environnement",
+    "xpack.ux.filterGroup.breakdown": "Répartition",
+    "xpack.ux.filterGroup.coreWebVitals": "Core Web Vitals",
+    "xpack.ux.filterGroup.seconds": "secondes",
+    "xpack.ux.filterGroup.selectBreakdown": "Sélectionner la répartition",
+    "xpack.ux.filters.filterByUrl": "Filtrer par URL",
+    "xpack.ux.filters.searchResults": "{total} résultats de recherche",
+    "xpack.ux.filters.select": "Sélectionner",
+    "xpack.ux.filters.topPages": "Premières pages",
+    "xpack.ux.filters.url": "Url",
+    "xpack.ux.filters.url.loadingResults": "Chargement des résultats",
+    "xpack.ux.filters.url.noResults": "Aucun résultat disponible",
+    "xpack.ux.inspectButtonText": "Inspecter",
+    "xpack.ux.jsErrors.errorMessage": "Message d'erreur",
+    "xpack.ux.jsErrors.errorRate": "Taux d'erreur",
+    "xpack.ux.jsErrors.impactedPageLoads": "Chargements de pages impactés",
+    "xpack.ux.jsErrors.percent": "{pageLoadPercent} %",
+    "xpack.ux.jsErrors.totalErrors": "Total des erreurs",
+    "xpack.ux.jsErrorsTable.errorMessage": "Impossible de récupérer",
+    "xpack.ux.localFilters.titles.browser": "Navigateur",
+    "xpack.ux.localFilters.titles.device": "Appareil",
+    "xpack.ux.localFilters.titles.location": "Lieu",
+    "xpack.ux.localFilters.titles.os": "Système d'exploitation",
+    "xpack.ux.localFilters.titles.serviceName": "Nom de service",
+    "xpack.ux.localFilters.titles.transactionUrl": "URL",
+    "xpack.ux.localFilters.titles.webApplication": "Application Web",
+    "xpack.ux.localFiltersTitle": "Filtres",
+    "xpack.ux.median": "médiane",
+    "xpack.ux.metrics": "Indicateurs",
+    "xpack.ux.overview.beatsCard.description": "Activer RUM avec l'agent APM pour collecter les données d'expérience utilisateur.",
+    "xpack.ux.overview.beatsCard.title": "Ajouter les données RUM",
+    "xpack.ux.overview.heading": "Tableau de bord",
+    "xpack.ux.overview.solutionName": "Observabilité",
+    "xpack.ux.pageViews.analyze": "Analyser",
+    "xpack.ux.percentile.50thMedian": "50e (médiane)",
+    "xpack.ux.percentile.75th": "75e",
+    "xpack.ux.percentile.90th": "90e",
+    "xpack.ux.percentile.95th": "95e",
+    "xpack.ux.percentile.99th": "99e",
+    "xpack.ux.percentile.label": "Centile",
+    "xpack.ux.percentiles.label": "{value}e centile",
+    "xpack.ux.title": "Tableau de bord",
+    "xpack.ux.urlFilter.wildcard": "Utiliser le caractère générique *{wildcard}*",
+    "xpack.ux.uxMetrics.longestLongTasks": "Durée de la plus longue tâche",
+    "xpack.ux.uxMetrics.longestLongTasksTooltip": "Durée de la plus longue tâche. Une tâche longue se définit par toute activité d'utilisateur ou par une tâche de navigateur qui monopolise le thread de l'interface utilisateur sur une longue période (plus de 50 millisecondes) et qui bloque l'exécution d'autres tâches critiques (taux de trames ou latence d'entrée).",
+    "xpack.ux.uxMetrics.noOfLongTasks": "Nombre de tâches longues",
+    "xpack.ux.uxMetrics.noOfLongTasksTooltip": "Nombre de tâches longues. Une tâche longue se définit par toute activité d'utilisateur ou par une tâche de navigateur qui monopolise le thread de l'interface utilisateur sur une longue période (plus de 50 millisecondes) et qui bloque l'exécution d'autres tâches critiques (taux de trames ou latence d'entrée).",
+    "xpack.ux.uxMetrics.sumLongTasks": "Durée totale des longues tâches",
+    "xpack.ux.uxMetrics.sumLongTasksTooltip": "Durée totale des tâches longues. Une tâche longue se définit par toute activité d'utilisateur ou par une tâche de navigateur qui monopolise le thread de l'interface utilisateur sur une longue période (plus de 50 millisecondes) et qui bloque l'exécution d'autres tâches critiques (taux de trames ou latence d'entrée).",
+    "xpack.ux.visitorBreakdown": "Répartition des visiteurs",
+    "xpack.ux.visitorBreakdown.browser": "Navigateur",
+    "xpack.ux.visitorBreakdown.noData": "Aucune donnée.",
+    "xpack.ux.visitorBreakdown.operatingSystem": "Système d'exploitation",
+    "xpack.ux.visitorBreakdownMap.avgPageLoadDuration": "Durée moyenne du chargement de la page",
+    "xpack.ux.visitorBreakdownMap.pageLoadDurationByRegion": "Durée de chargement de la page par région (moy.)",
     "xpack.watcher.app.licenseErrorLinkText": "Gérer votre licence",
     "xpack.watcher.app.licenseErrorTitle": "Erreur de licence",
     "xpack.watcher.appName": "Watcher",
@@ -25425,7 +30941,7 @@
     "xpack.watcher.sections.watchHistory.deleteWatchButtonLabel": "Supprimer",
     "xpack.watcher.sections.watchHistory.timeSpan.1h": "Dernière heure",
     "xpack.watcher.sections.watchHistory.timeSpan.1y": "Année dernière",
-    "xpack.watcher.sections.watchHistory.timeSpan.24h": "Dernières 24 heures",
+    "xpack.watcher.sections.watchHistory.timeSpan.24h": "Dernières 24 heures",
     "xpack.watcher.sections.watchHistory.timeSpan.30d": "30 derniers jours",
     "xpack.watcher.sections.watchHistory.timeSpan.6M": "6 derniers mois",
     "xpack.watcher.sections.watchHistory.timeSpan.7d": "7 derniers jours",
@@ -25510,6 +31026,137 @@
     "xpack.watcher.watchActions.webhook.portIsRequiredValidationMessage": "Le port webhook est requis.",
     "xpack.watcher.watchActions.webhook.usernameIsRequiredIfPasswordValidationMessage": "Le nom d'utilisateur est requis.",
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "Ce champ est requis.",
-    "xpack.watcher.watcherDescription": "Détectez les modifications survenant dans vos données en créant, gérant et monitorant des alertes."
+    "xpack.watcher.watcherDescription": "Détectez les modifications survenant dans vos données en créant, gérant et monitorant des alertes.",
+    "unifiedSearch.noDataPopover.content": "Cette plage temporelle ne contient pas de données. Étendez ou ajustez la plage temporelle pour obtenir plus de champs et pouvoir créer des graphiques.",
+    "unifiedSearch.noDataPopover.dismissAction": "Ne plus afficher",
+    "unifiedSearch.noDataPopover.subtitle": "Conseil",
+    "unifiedSearch.noDataPopover.title": "Ensemble de données vide",
+    "unifiedSearch.query.queryBar.clearInputLabel": "Effacer l'entrée",
+    "unifiedSearch.query.queryBar.comboboxAriaLabel": "Rechercher et filtrer la page {pageType}",
+    "unifiedSearch.query.queryBar.kqlFullLanguageName": "Langage de requête Kibana",
+    "unifiedSearch.query.queryBar.kqlLanguageName": "KQL",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "documents",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "Ne plus afficher",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoText": "Il semblerait que votre requête porte sur un champ imbriqué. Selon le résultat visé, il existe plusieurs façons de construire une syntaxe KQL pour des requêtes imbriquées. Apprenez-en plus avec notre {link}.",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "Syntaxe de requête imbriquée KQL",
+    "unifiedSearch.query.queryBar.kqlOffLabel": "Désactivé",
+    "unifiedSearch.query.queryBar.kqlOnLabel": "Activé",
+    "unifiedSearch.query.queryBar.languageSwitcher.toText": "Passer au langage de requête Kibana pour la recherche",
+    "unifiedSearch.query.queryBar.luceneLanguageName": "Lucene",
+    "unifiedSearch.query.queryBar.searchInputAriaLabel": "Commencer à taper pour rechercher et filtrer la page {pageType}",
+    "unifiedSearch.query.queryBar.searchInputPlaceholder": "Recherche",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) offre une syntaxe de requête simplifiée et la prise en charge des champs scriptés. KQL offre également une fonctionnalité de saisie semi-automatique. Si vous désactivez KQL, {nonKqlModeHelpText}.",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "Kibana utilise Lucene.",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionLabelText": "Description",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionText": "Enregistrez le texte et les filtres de la requête que vous souhaitez réutiliser.",
+    "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "Ce nom est en conflit avec une requête enregistrée existante.",
+    "unifiedSearch.search.searchBar.savedQueryFormCancelButtonText": "Annuler",
+    "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "Enregistrer",
+    "unifiedSearch.search.searchBar.savedQueryFormTitle": "Enregistrer la requête",
+    "unifiedSearch.search.searchBar.savedQueryIncludeFiltersLabelText": "Inclure les filtres",
+    "unifiedSearch.search.searchBar.savedQueryIncludeTimeFilterLabelText": "Inclure le filtre temporel",
+    "unifiedSearch.search.searchBar.savedQueryNameHelpText": "Un nom est requis. Le nom ne peut pas contenir d'espace vide au début ou à la fin. Le nom doit être unique.",
+    "unifiedSearch.search.searchBar.savedQueryNameLabelText": "Nom",
+    "unifiedSearch.search.searchBar.savedQueryNoSavedQueriesText": "Aucune requête enregistrée.",
+    "unifiedSearch.search.searchBar.savedQueryPopoverButtonText": "Voir les requêtes enregistrées",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "Effacer la requête enregistrée en cours",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonText": "Effacer",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "Annuler",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "Supprimer",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "Supprimer \"{savedQueryName}\" ?",
+    "unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "Supprimer la requête enregistrée {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "Enregistrer en tant que nouvelle requête enregistrée",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "Enregistrer en tant que nouvelle",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "Enregistrer une nouvelle requête enregistrée",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonText": "Enregistrer la requête en cours",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "Enregistrer les modifications apportées à {title}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonText": "Enregistrer les modifications",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "Description de {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName} sélectionné. Appuyez pour effacer les modifications.",
+    "unifiedSearch.search.searchBar.savedQueryPopoverTitleText": "Requêtes enregistrées",
+    "unifiedSearch.search.unableToGetSavedQueryToastTitle": "Impossible de charger la requête enregistrée {savedQueryId}",
+    "unifiedSearch.query.queryBar.syntaxOptionsTitle": "Options de syntaxe",
+    "unifiedSearch.filter.applyFilterActionTitle": "Appliquer le filtre à la vue en cours",
+    "unifiedSearch.filter.applyFilters.popupHeader": "Sélectionner les filtres à appliquer",
+    "unifiedSearch.filter.applyFiltersPopup.cancelButtonLabel": "Annuler",
+    "unifiedSearch.filter.applyFiltersPopup.saveButtonLabel": "Appliquer",
+    "unifiedSearch.filter.filterBar.addFilterButtonLabel": "Ajouter un filtre",
+    "unifiedSearch.filter.filterBar.deleteFilterButtonLabel": "Supprimer",
+    "unifiedSearch.filter.filterBar.disabledFilterPrefix": "Désactivé",
+    "unifiedSearch.filter.filterBar.disableFilterButtonLabel": "Désactiver temporairement",
+    "unifiedSearch.filter.filterBar.editFilterButtonLabel": "Modifier le filtre",
+    "unifiedSearch.filter.filterBar.enableFilterButtonLabel": "Réactiver",
+    "unifiedSearch.filter.filterBar.excludeFilterButtonLabel": "Exclure les résultats",
+    "unifiedSearch.filter.filterBar.filterItemBadgeAriaLabel": "Actions de filtrage",
+    "unifiedSearch.filter.filterBar.filterItemBadgeIconAriaLabel": "Supprimer {filter}",
+    "unifiedSearch.filter.filterBar.includeFilterButtonLabel": "Inclure les résultats",
+    "unifiedSearch.filter.filterBar.indexPatternSelectPlaceholder": "Sélectionner un modèle d'indexation",
+    "unifiedSearch.filter.filterBar.labelErrorInfo": "Modèle d'indexation {indexPattern} introuvable",
+    "unifiedSearch.filter.filterBar.labelErrorText": "Erreur",
+    "unifiedSearch.filter.filterBar.labelWarningInfo": "Le champ {fieldName} n'existe pas dans la vue en cours.",
+    "unifiedSearch.filter.filterBar.labelWarningText": "Avertissement",
+    "unifiedSearch.filter.filterBar.moreFilterActionsMessage": "Filtre : {innerText}. Sélectionner pour plus d’actions de filtrage.",
+    "unifiedSearch.filter.filterBar.negatedFilterPrefix": "NON ",
+    "unifiedSearch.filter.filterBar.pinFilterButtonLabel": "Épingler dans toutes les applications",
+    "unifiedSearch.filter.filterBar.pinnedFilterPrefix": "Épinglé",
+    "unifiedSearch.filter.filterBar.unpinFilterButtonLabel": "Désépingler",
+    "unifiedSearch.filter.filterEditor.cancelButtonLabel": "Annuler",
+    "unifiedSearch.filter.filterEditor.createCustomLabelInputLabel": "Étiquette personnalisée",
+    "unifiedSearch.filter.filterEditor.createCustomLabelSwitchLabel": "Créer une étiquette personnalisée ?",
+    "unifiedSearch.filter.filterEditor.doesNotExistOperatorOptionLabel": "n'existe pas",
+    "unifiedSearch.filter.filterEditor.editFilterPopupTitle": "Modifier le filtre",
+    "unifiedSearch.filter.filterEditor.editFilterValuesButtonLabel": "Modifier les valeurs du filtre",
+    "unifiedSearch.filter.filterEditor.editQueryDslButtonLabel": "Modifier en tant que Query DSL",
+    "unifiedSearch.filter.filterEditor.existsOperatorOptionLabel": "existe",
+    "unifiedSearch.filter.filterEditor.falseOptionLabel": "false",
+    "unifiedSearch.filter.filterEditor.fieldSelectLabel": "Champ",
+    "unifiedSearch.filter.filterEditor.fieldSelectPlaceholder": "Sélectionner d'abord un champ",
+    "unifiedSearch.filter.filterEditor.indexPatternSelectLabel": "Modèle d'indexation",
+    "unifiedSearch.filter.filterEditor.isBetweenOperatorOptionLabel": "est entre",
+    "unifiedSearch.filter.filterEditor.isNotBetweenOperatorOptionLabel": "n'est pas entre",
+    "unifiedSearch.filter.filterEditor.isNotOneOfOperatorOptionLabel": "n'est pas l'une des options suivantes",
+    "unifiedSearch.filter.filterEditor.isNotOperatorOptionLabel": "n'est pas",
+    "unifiedSearch.filter.filterEditor.isOneOfOperatorOptionLabel": "est l'une des options suivantes",
+    "unifiedSearch.filter.filterEditor.isOperatorOptionLabel": "est",
+    "unifiedSearch.filter.filterEditor.operatorSelectLabel": "Opérateur",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderSelect": "Sélectionner",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderWaiting": "En attente",
+    "unifiedSearch.filter.filterEditor.queryDslLabel": "Query DSL d'Elasticsearch",
+    "unifiedSearch.filter.filterEditor.rangeEndInputPlaceholder": "Fin de la plage",
+    "unifiedSearch.filter.filterEditor.rangeInputLabel": "Plage",
+    "unifiedSearch.filter.filterEditor.rangeStartInputPlaceholder": "Début de la plage",
+    "unifiedSearch.filter.filterEditor.saveButtonLabel": "Enregistrer",
+    "unifiedSearch.filter.filterEditor.trueOptionLabel": "vrai",
+    "unifiedSearch.filter.filterEditor.valueInputLabel": "Valeur",
+    "unifiedSearch.filter.filterEditor.valueInputPlaceholder": "Saisir une valeur",
+    "unifiedSearch.filter.filterEditor.valueSelectPlaceholder": "Sélectionner une valeur",
+    "unifiedSearch.filter.filterEditor.valuesSelectLabel": "Valeurs",
+    "unifiedSearch.filter.filterEditor.valuesSelectPlaceholder": "Sélectionner des valeurs",
+    "unifiedSearch.filter.options.changeAllFiltersButtonLabel": "Changer tous les filtres",
+    "unifiedSearch.filter.options.deleteAllFiltersButtonLabel": "Tout supprimer",
+    "unifiedSearch.filter.options.disableAllFiltersButtonLabel": "Tout désactiver",
+    "unifiedSearch.filter.options.enableAllFiltersButtonLabel": "Tout activer",
+    "unifiedSearch.filter.options.invertDisabledFiltersButtonLabel": "Inverser l’activation/désactivation",
+    "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "Inverser l'inclusion",
+    "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "Tout épingler",
+    "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "Tout désépingler",
+    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "Changer tous les filtres",
+    "unifiedSearch.kueryAutocomplete.andOperatorDescription": "Nécessite que {bothArguments} soient ''vrai''.",
+    "unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "les deux arguments",
+    "unifiedSearch.kueryAutocomplete.equalOperatorDescription": "{equals} une certaine valeur",
+    "unifiedSearch.kueryAutocomplete.equalOperatorDescription.equalsText": "égale",
+    "unifiedSearch.kueryAutocomplete.existOperatorDescription": "{exists} sous un certain format",
+    "unifiedSearch.kueryAutocomplete.existOperatorDescription.existsText": "existe",
+    "unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription": "est {greaterThan} une certaine valeur",
+    "unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText": "supérieur à",
+    "unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription": "est {greaterThanOrEqualTo} une certaine valeur",
+    "unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText": "supérieur ou égal à",
+    "unifiedSearch.kueryAutocomplete.lessThanOperatorDescription": "est {lessThan} une certaine valeur",
+    "unifiedSearch.kueryAutocomplete.lessThanOperatorDescription.lessThanText": "inférieur à",
+    "unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription": "est {lessThanOrEqualTo} une certaine valeur",
+    "unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "inférieur ou égal à",
+    "unifiedSearch.kueryAutocomplete.orOperatorDescription": "Nécessite qu’{oneOrMoreArguments} soit ''vrai''.",
+    "unifiedSearch.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "au moins un argument"
   }
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 72aa6e24034d6..520061476f96d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -111,6 +111,7 @@
     "xpack.lens.indexPattern.overall_min.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの最小値を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_min」はすべてのディメンションで最小値を計算します。\n\n例：範囲の割合\n`(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))`\n      ",
     "xpack.lens.indexPattern.overall_sum.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの合計を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_sum」はすべてのディメンションで合計値を計算します。\n\n例：合計の割合\n`sum(bytes) / overall_sum(sum(bytes))`\n      ",
     "xpack.lens.indexPattern.percentile.documentation.markdown": "\nフィールドの値の指定された百分位数を返します。これはドキュメントに出現する値のnパーセントが小さい値です。\n\n例：値の95 %より大きいバイト数を取得：\n`percentile(bytes, percentile=95)`\n      ",
+    "xpack.lens.indexPattern.time_scale.documentation.markdown": "\n\nこの高度な機能は、特定の期間に対してカウントと合計を正規化する際に役立ちます。すでに特定の期間に対して正規化され、保存されたメトリックとの統合が可能です。\n\nこの機能は、現在のグラフで日付ヒストグラム関数が使用されている場合にのみ使用できます。\n\n例：すでに正規化されているメトリックを、正規化が必要な別のメトリックと比較した比率。\n`normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)`\n      ",
     "xpack.lens.advancedSettings.useFieldExistenceSampling.description": "有効な場合、インデックスマッピングを使用するのではなく、ドキュメントサンプリングを使用して、Lensフィールドリストのフィールドの存在（使用可能または空）を決定します。",
     "xpack.lens.advancedSettings.useFieldExistenceSampling.title": "フィールド存在サンプリングを使用",
     "xpack.lens.app.addToLibrary": "ライブラリに保存",
@@ -120,8 +121,13 @@
     "xpack.lens.app.downloadButtonAriaLabel": "データを CSV ファイルとしてダウンロード",
     "xpack.lens.app.downloadButtonFormulasWarning": "CSVには、スプレッドシートアプリケーションで式と解釈される可能性のある文字が含まれています。",
     "xpack.lens.app.downloadCSV": "CSV をダウンロード",
+    "xpack.lens.app.goBackLabel": "{contextOriginatingApp}に戻る",
+    "xpack.lens.app.goBackModalCancelBtn": "キャンセル",
+    "xpack.lens.app.goBackModalMessage": "ここで行った変更は元の{contextOriginatingApp}ビジュアライゼーションと後方互換性がありません。これらの保存されていない変更を破棄し、{contextOriginatingApp}に戻りますか?",
+    "xpack.lens.app.goBackModalTitle": "変更を破棄しますか?",
     "xpack.lens.app.inspect": "検査",
     "xpack.lens.app.inspectAriaLabel": "検査",
+    "xpack.lens.app.lensContext": "Lensコンテキスト（{language}）",
     "xpack.lens.app.save": "保存",
     "xpack.lens.app.saveAndReturn": "保存して戻る",
     "xpack.lens.app.saveAndReturnButtonAriaLabel": "現在のLensビジュアライゼーションを保存し、前回使用していたアプリに戻る",
@@ -129,7 +135,14 @@
     "xpack.lens.app.saveButtonAriaLabel": "現在のLensビジュアライゼーションを保存",
     "xpack.lens.app.saveModalType": "レンズビジュアライゼーション",
     "xpack.lens.app.saveVisualization.successNotificationText": "保存された'{visTitle}'",
+    "xpack.lens.app.settings": "設定",
+    "xpack.lens.app.settingsAriaLabel": "Lens設定メニューを開く",
+    "xpack.lens.app.showUnderlyingDataMultipleLayers": "複数レイヤーのビジュアライゼーションでは、基本データを表示できません",
+    "xpack.lens.app.showUnderlyingDataNoData": "ビジュアライゼーションには表示するデータがありません",
+    "xpack.lens.app.showUnderlyingDataTimeShifts": "時間シフトが構成されているときには基本データを表示できません",
+    "xpack.lens.app.showUnderlyingDataUnsupportedDatasource": "基本データは現在のデータソースをサポートしません",
     "xpack.lens.app.unsavedFilename": "未保存",
+    "xpack.lens.app.unsavedWorkConfirmBtn": "変更を破棄",
     "xpack.lens.app.unsavedWorkMessage": "作業内容を保存せずに、Lens から移動しますか?",
     "xpack.lens.app.unsavedWorkTitle": "保存されていない変更",
     "xpack.lens.app.updatePanel": "{originatingAppName}でパネルを更新",
@@ -151,11 +164,14 @@
     "xpack.lens.configPanel.color.tooltip.auto": "カスタム色を指定しない場合、Lensは自動的に色を選択します。",
     "xpack.lens.configPanel.color.tooltip.custom": "［自動］モードに戻すには、カスタム色をオフにしてください。",
     "xpack.lens.configPanel.color.tooltip.disabled": "レイヤーに「内訳条件」が含まれている場合は、個別の系列をカスタム色にできません。",
+    "xpack.lens.configPanel.experimentalLabel": "テクニカルプレビュー",
+    "xpack.lens.configPanel.selectLayerType": "レイヤータイプを選択",
     "xpack.lens.configPanel.selectVisualization": "ビジュアライゼーションを選択してください",
     "xpack.lens.configPanel.visualizationType": "ビジュアライゼーションタイプ",
     "xpack.lens.configure.configurePanelTitle": "{groupLabel}",
     "xpack.lens.configure.editConfig": "{label}構成の編集",
     "xpack.lens.configure.emptyConfig": "フィールドを追加するか、ドラッグアンドドロップします",
+    "xpack.lens.configure.emptyConfigClick": "注釈の追加",
     "xpack.lens.configure.invalidBottomReferenceLineDimension": "この基準線は存在しないか有効ではない軸に割り当てられています。この基準線を別の使用可能な軸に移動するか、削除することができます。",
     "xpack.lens.configure.invalidConfigTooltip": "無効な構成です。",
     "xpack.lens.configure.invalidConfigTooltipClick": "詳細はクリックしてください。",
@@ -166,11 +182,12 @@
     "xpack.lens.confirmModal.saveDuplicateConfirmationMessage": "「{title}」というタイトルの {name} がすでに存在します。保存しますか？",
     "xpack.lens.customBucketContainer.dragToReorder": "ドラッグして並べ替え",
     "xpack.lens.dataPanelWrapper.switchDatasource": "データソースに切り替える",
-    "xpack.lens.datatable.addLayer": "ビジュアライゼーションレイヤーを追加",
+    "xpack.lens.datatable.addLayer": "ビジュアライゼーション",
     "xpack.lens.datatable.breakdownColumns": "列",
     "xpack.lens.datatable.breakdownColumns.description": "フィールドでメトリックを列に分割します。列数を少なくし、横スクロールを避けることをお勧めします。",
     "xpack.lens.datatable.breakdownRows": "行",
     "xpack.lens.datatable.breakdownRows.description": "フィールドで表の行を分割します。これは高カーディナリティ内訳にお勧めです。",
+    "xpack.lens.datatable.column.help": "データテーブル列",
     "xpack.lens.datatable.conjunctionSign": " &amp; ",
     "xpack.lens.datatable.expressionHelpLabel": "データベースレンダー",
     "xpack.lens.datatable.groupLabel": "タブ",
@@ -242,26 +259,9 @@
     "xpack.lens.dragDrop.keyboardInstructionsReorder": "スペースまたはEnterを押してドラッグを開始します。ドラッグするときには、上下矢印キーを使用すると、グループの項目を並べ替えます。左右矢印キーを使用すると、グループの外側でドロップ対象を選択します。もう一度スペースまたはEnterを押すと終了します。",
     "xpack.lens.dragDrop.shift": "Shift",
     "xpack.lens.dragDrop.swap": "入れ替える",
-    "coloring.dynamicColoring.customPalette.addColor": "色を追加",
-    "coloring.dynamicColoring.customPalette.addColorAriaLabel": "色を追加",
-    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "削除",
-    "coloring.dynamicColoring.customPalette.disallowedEditMinMaxValues": "現在の構成にはカスタム値を設定できません",
-    "coloring.dynamicColoring.customPalette.distributeValues": "値を分散",
-    "coloring.dynamicColoring.customPalette.distributeValuesAriaLabel": "値を分散",
-    "coloring.dynamicColoring.customPalette.invalidMaxValue": "最大値は前の値より大きくなければなりません",
-    "coloring.dynamicColoring.customPalette.invalidValueOrColor": "1つ以上の色範囲に正しくない値または色が含まれています",
-    "coloring.dynamicColoring.customPalette.maximumStepsApplied": "ステップの最大数を適用しました",
-    "coloring.dynamicColoring.customPalette.maxValuePlaceholder": "最大値",
-    "coloring.dynamicColoring.customPalette.minValuePlaceholder": "最小値",
-    "coloring.dynamicColoring.customPalette.oneColorRange": "複数の色が必要です",
-    "coloring.dynamicColoring.customPalette.rangeAriaLabel": "範囲{index}",
-    "coloring.dynamicColoring.customPalette.reverseColors": "色を反転",
-    "coloring.dynamicColoring.customPalette.selectNewColor": "新しい色を選択",
-    "coloring.dynamicColoring.customPalette.setCustomMaxValue": "カスタム最小値を設定",
-    "coloring.dynamicColoring.customPalette.setCustomMinValue": "カスタム最大値を設定",
-    "coloring.dynamicColoring.customPalette.useAutoMaxValue": "最大データ値を使用",
-    "coloring.dynamicColoring.customPalette.useAutoMinValue": "最小データ値を使用",
-    "coloring.dynamicColoring.customPaletteAriaLabel": "色を反転",
+    "xpack.lens.editorFrame.applyChanges": "変更を適用",
+    "xpack.lens.editorFrame.applyChangesLabel": "変更を適用",
+    "xpack.lens.editorFrame.applyChangesWorkspacePrompt": "変更を適用してビジュアライゼーションを表示",
     "xpack.lens.editorFrame.buildExpressionError": "グラフの準備中に予期しないエラーが発生しました",
     "xpack.lens.editorFrame.colorIndicatorLabel": "このディメンションの色：{hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} {errors, plural, other  {エラー}}",
@@ -296,6 +296,12 @@
     "xpack.lens.embeddable.missingTimeRangeParam.shortMessage": "timeRangeプロパティがありません",
     "xpack.lens.embeddable.moreErrors": "Lensエディターで編集すると、エラーの詳細が表示されます",
     "xpack.lens.embeddableDisplayName": "レンズ",
+    "xpack.lens.endValue.nearest": "最も近い",
+    "xpack.lens.endValue.none": "非表示",
+    "xpack.lens.endValue.zero": "ゼロ",
+    "xpack.lens.endValueDescription.nearest": "最初/最後の値の系列をグラフの端まで拡張",
+    "xpack.lens.endValueDescription.none": "系列をグラフの端まで拡張しない",
+    "xpack.lens.endValueDescription.zero": "系列をゼロとしてグラフの端まで拡張",
     "xpack.lens.fieldFormats.longSuffix.d": "日単位",
     "xpack.lens.fieldFormats.longSuffix.h": "時間単位",
     "xpack.lens.fieldFormats.longSuffix.m": "分単位",
@@ -366,7 +372,7 @@
     "xpack.lens.functions.renameColumns.idMap.help": "キーが古い列 ID で値が対応する新しい列 ID となるように JSON エンコーディングされたオブジェクトです。他の列 ID はすべてのそのままです。",
     "xpack.lens.functions.timeScale.dateColumnMissingMessage": "指定した dateColumnId {columnId} は存在しません。",
     "xpack.lens.functions.timeScale.timeInfoMissingMessage": "日付ヒストグラム情報を取得できませんでした",
-    "xpack.lens.gauge.addLayer": "ビジュアライゼーションレイヤーを追加",
+    "xpack.lens.gauge.addLayer": "ビジュアライゼーション",
     "xpack.lens.gauge.appearanceLabel": "見た目",
     "xpack.lens.gauge.dynamicColoring.label": "帯色",
     "xpack.lens.gauge.gaugeLabel": "ゲージ",
@@ -384,7 +390,7 @@
     "xpack.lens.geoFieldWorkspace.dropZoneLabel": "Mapsで開くにはゾーンをドロップします",
     "xpack.lens.guageVisualization.chartCannotRenderEqual": "最小値と最大値を同じにすることはできません",
     "xpack.lens.guageVisualization.chartCannotRenderMinGreaterMax": "最小値は最大値以下でなければなりません",
-    "xpack.lens.heatmap.addLayer": "ビジュアライゼーションレイヤーを追加",
+    "xpack.lens.heatmap.addLayer": "ビジュアライゼーション",
     "xpack.lens.heatmap.cellValueLabel": "セル値",
     "xpack.lens.heatmap.groupLabel": "ヒートマップ",
     "xpack.lens.heatmap.heatmapLabel": "ヒートマップ",
@@ -399,8 +405,12 @@
     "xpack.lens.heatmapVisualization.heatmapLabel": "ヒートマップ",
     "xpack.lens.heatmapVisualization.missingXAccessorLongMessage": "横軸の構成がありません。",
     "xpack.lens.heatmapVisualization.missingXAccessorShortMessage": "横軸がありません。",
+    "xpack.lens.indexPattern.addColumnAriaLabel": "フィールドを追加するか、{groupLabel}までドラッグアンドドロップします",
+    "xpack.lens.indexPattern.addColumnAriaLabelClick": "注釈を{groupLabel}に追加",
     "xpack.lens.indexPattern.advancedSettings": "高度なオプションを追加",
     "xpack.lens.indexPattern.allFieldsLabel": "すべてのフィールド",
+    "xpack.lens.indexPattern.allFieldsLabelHelp": "使用可能なフィールドをワークスペースまでドラッグし、ビジュアライゼーションを作成します。使用可能なフィールドを変更するには、別のデータビューを選択するか、クエリを編集するか、別の時間範囲を使用します。一部のフィールドタイプは、完全なテキストおよびグラフィックフィールドを含む Lens では、ビジュアライゼーションできません。",
+    "xpack.lens.indexPattern.allFieldsSamplingLabelHelp": "使用可能なフィールドには、フィルターと一致する最初の 500 件のドキュメントのデータがあります。すべてのフィールドを表示するには、空のフィールドを展開します。全文、地理、フラット化、オブジェクトフィールドでビジュアライゼーションを作成できません。",
     "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning": "データのインデックス方法のため、このビジュアライゼーションの{name}は近似される場合があります。レコード数の昇順ではなく希少性で並べ替えてください。この制限の詳細については、{link}。",
     "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning.link": "ドキュメントをご覧ください",
     "xpack.lens.indexPattern.availableFieldsLabel": "利用可能なフィールド",
@@ -418,7 +428,7 @@
     "xpack.lens.indexPattern.chooseFieldLabel": "この関数を使用するには、フィールドを選択してください。",
     "xpack.lens.indexPattern.chooseSubFunction": "サブ関数を選択",
     "xpack.lens.indexPattern.columnFormatLabel": "値の形式",
-    "xpack.lens.indexPattern.columnLabel": "表示名",
+    "xpack.lens.indexPattern.columnLabel": "名前",
     "xpack.lens.indexPattern.count": "カウント",
     "xpack.lens.indexPattern.counterRate": "カウンターレート",
     "xpack.lens.indexPattern.counterRate.signature": "メトリック：数値",
@@ -436,8 +446,13 @@
     "xpack.lens.indexPattern.dateHistogram.autoInterval": "時間範囲のカスタマイズ",
     "xpack.lens.indexPattern.dateHistogram.autoIntervalHeader": "使用される間隔",
     "xpack.lens.indexPattern.dateHistogram.autoLongerExplanation": "間隔を選択するには、Lensは指定された時間範囲を{targetBarSetting}設定で除算します。Lensはデータに最適な間隔を計算します。たとえば、30分、1時間、12です。棒の最大数は{maxBarSetting}値で設定します。",
+    "xpack.lens.indexPattern.dateHistogram.bindToGlobalTimePicker": "グローバル時刻ピッカーにバインド",
     "xpack.lens.indexPattern.dateHistogram.days": "日",
+    "xpack.lens.indexPattern.dateHistogram.dropPartialBuckets": "不完全なバケットをドロップ",
+    "xpack.lens.indexPattern.dateHistogram.dropPartialBucketsHelp": "不完全なバケットのドロップは無効です。これらは、右上のグローバル時刻ピッカーにバインドされた時刻フィールドでのみ計算できます。",
+    "xpack.lens.indexPattern.dateHistogram.globalTimePickerHelp": "右上のグローバル時刻ピッカーで選択したフィールドをフィルタリングします。現在のデータビューのデフォルト時刻フィールドではこの設定をオンにできません。",
     "xpack.lens.indexPattern.dateHistogram.hours": "時間",
+    "xpack.lens.indexPattern.dateHistogram.includeEmptyRows": "空の行を含める",
     "xpack.lens.indexPattern.dateHistogram.milliseconds": "ミリ秒",
     "xpack.lens.indexPattern.dateHistogram.minimumInterval": "最低間隔",
     "xpack.lens.indexPattern.dateHistogram.minutes": "分",
@@ -469,12 +484,16 @@
     "xpack.lens.indexPattern.fieldNoOperation": "フィールド{field}は演算なしで使用できません",
     "xpack.lens.indexPattern.fieldPanelEmptyStringValue": "空の文字列",
     "xpack.lens.indexPattern.fieldPlaceholder": "フィールド",
+    "xpack.lens.indexPattern.fieldsNotFound": "{count, plural, other {個のフィールド}} {missingFields} {count, plural, other {が}}見つかりません",
     "xpack.lens.indexPattern.fieldStatsButtonAriaLabel": "プレビュー{fieldName}：{fieldType}",
     "xpack.lens.indexPattern.fieldStatsButtonEmptyLabel": "このフィールドにはデータがありませんが、ドラッグアンドドロップで可視化できます。",
     "xpack.lens.indexPattern.fieldStatsButtonLabel": "フィールドプレビューを表示するには、クリックします。可視化するには、ドラッグアンドドロップします。",
     "xpack.lens.indexPattern.fieldStatsCountLabel": "カウント",
     "xpack.lens.indexPattern.fieldStatsDisplayToggle": "次のどちらかを切り替えます：",
     "xpack.lens.indexPattern.fieldStatsLimited": "範囲タイプフィールドの概要情報がありません。",
+    "xpack.lens.indexPattern.fieldStatsNoData": "Lensはこのフィールドのビジュアライゼーションを作成できません。フィールドにデータがありません。ビジュアライゼーションを作成するには、別のフィールドをドラッグします。",
+    "xpack.lens.indexPattern.fieldStatsSamplingNoData": "Lensはこのフィールドのビジュアライゼーションを作成できません。フィルターと一致する最初の500件のドキュメントではフィールドにデータがありません。ビジュアライゼーションを作成するには、別のフィールドをドラッグします。",
+    "xpack.lens.indexPattern.fieldsWrongType": "{count, plural, other {個のフィールド}} {invalidFields} {count, plural, other {の}}型が正しくありません",
     "xpack.lens.indexPattern.fieldTimeDistributionLabel": "時間分布",
     "xpack.lens.indexPattern.fieldTopValuesLabel": "トップの値",
     "xpack.lens.indexPattern.filterBy.clickToEdit": "クリックして編集",
@@ -517,6 +536,7 @@
     "xpack.lens.indexPattern.formulaWithTooManyArguments": "演算{operation}の引数が多すぎます",
     "xpack.lens.indexPattern.functionsLabel": "関数",
     "xpack.lens.indexPattern.groupByDropdown": "グループ分けの条件",
+    "xpack.lens.indexPattern.hideZero": "ゼロ値を非表示",
     "xpack.lens.indexPattern.incompleteOperation": "（未完了）",
     "xpack.lens.indexPattern.intervals": "間隔",
     "xpack.lens.indexPattern.invalidFieldLabel": "無効なフィールドです。データビューを確認するか、別のフィールドを選択してください。",
@@ -527,6 +547,9 @@
     "xpack.lens.indexPattern.lastValue": "最終値",
     "xpack.lens.indexPattern.lastValue.disabled": "この関数には、データビューの日付フィールドが必要です",
     "xpack.lens.indexPattern.lastValue.invalidTypeSortField": "フィールド {invalidField} は日付フィールドではないため、並べ替えで使用できません",
+    "xpack.lens.indexPattern.lastValue.showArrayValues": "ゼロ値を表示",
+    "xpack.lens.indexPattern.lastValue.showArrayValuesExplanation": "各最後のドキュメントのこのフィールドに関連付けられたすべての値を表示します。",
+    "xpack.lens.indexPattern.lastValue.showArrayValuesWithTopValuesWarning": "配列値を表示するときには、このフィールドを使用して上位の値をランク付けできません。",
     "xpack.lens.indexPattern.lastValue.signature": "フィールド：文字列",
     "xpack.lens.indexPattern.lastValue.sortField": "日付フィールドで並べ替え",
     "xpack.lens.indexPattern.lastValue.sortFieldNotFound": "フィールド {invalidField} が見つかりませんでした",
@@ -565,6 +588,7 @@
     "xpack.lens.indexPattern.multipleTermsOf": "上位の値{name} + {count} {count, plural, other  {個のその他の値}}",
     "xpack.lens.indexPattern.noDataViewDescription": "データビューを作成するか、別のデータソースに切り替えてください",
     "xpack.lens.indexPattern.noDataViewsLabel": "データビューがありません",
+    "xpack.lens.indexPattern.noRealMetricError": "静的値のみのレイヤーには結果が表示されません。1つ以上の動的メトリックを使用してください",
     "xpack.lens.indexPattern.numberFormatLabel": "数字",
     "xpack.lens.indexPattern.ofDocumentsLabel": "ドキュメント",
     "xpack.lens.indexPattern.operationsNotFound": "{operationLength, plural, other  {個の演算}} {operationsList}が見つかりました",
@@ -583,8 +607,8 @@
     "xpack.lens.indexPattern.percentile.errorMessage": "パーセンタイルは1～99の範囲の整数でなければなりません。",
     "xpack.lens.indexPattern.percentile.percentileValue": "パーセンタイル",
     "xpack.lens.indexPattern.percentile.signature": "フィールド：文字列、[percentile]：数値",
+    "xpack.lens.indexPattern.percentileOf": "{name}の{percentile, selectordinal, other  {#}}パーセンタイル",
     "xpack.lens.indexPattern.pinnedTopValuesLabel": "{field}のフィルター",
-    "xpack.lens.indexPattern.precisionErrorWarning": "データのインデックス方法のため、このビジュアライゼーションの{name}は近似される場合があります。{topValues}の数を増やすか、正確な結果を得るには{topValues}ではなく{filters}を使用してください。この制限の詳細については、{link}。",
     "xpack.lens.indexPattern.precisionErrorWarning.filters": "フィルター",
     "xpack.lens.indexPattern.precisionErrorWarning.link": "ドキュメントをご覧ください",
     "xpack.lens.indexPattern.precisionErrorWarning.topValues": "トップの値",
@@ -603,6 +627,7 @@
     "xpack.lens.indexPattern.ranges.granularityPopoverBasicExplanation": "間隔の粒度は、フィールドの最小値と最大値に基づいて、フィールドを均等な幅の間隔に分割します。",
     "xpack.lens.indexPattern.ranges.granularityPopoverExplanation": "間隔のサイズは「nice」値です。スライダーの粒度を変更すると、「nice」間隔が同じときには、間隔が同じままです。最小粒度は1です。最大値は{setting}です。最大粒度を変更するには、［高度な設定］に移動します。",
     "xpack.lens.indexPattern.ranges.granularityPopoverTitle": "粒度間隔の仕組み",
+    "xpack.lens.indexPattern.ranges.includeEmptyRows": "空の行を含める",
     "xpack.lens.indexPattern.ranges.increaseButtonLabel": "粒度を上げる",
     "xpack.lens.indexPattern.ranges.lessThanOrEqualAppend": "≤",
     "xpack.lens.indexPattern.ranges.lessThanOrEqualTooltip": "以下",
@@ -621,6 +646,8 @@
     "xpack.lens.indexPattern.staticValueLabelWithValue": "固定値：{value}",
     "xpack.lens.indexPattern.staticValueWarning": "現在適用されている固定値",
     "xpack.lens.indexPattern.staticValueWarningText": "固定値を上書きするには、クイック関数を選択します",
+    "xpack.lens.indexPattern.suffixLabel": "接尾辞",
+    "xpack.lens.indexPattern.suggestedValueAriaLabel": "提案された値：{groupLabel}の{value}",
     "xpack.lens.indexpattern.suggestions.nestingChangeLabel": "各 {outerOperation} の {innerOperation}",
     "xpack.lens.indexpattern.suggestions.overallLabel": "全体の {operation}",
     "xpack.lens.indexpattern.suggestions.overTimeLabel": "一定時間",
@@ -637,6 +664,7 @@
     "xpack.lens.indexPattern.terms.deleteButtonDisabled": "この関数には定義された1つのフィールドの最小値が必須です",
     "xpack.lens.indexPattern.terms.deleteButtonLabel": "削除",
     "xpack.lens.indexPattern.terms.dragToReorder": "ドラッグして並べ替え",
+    "xpack.lens.indexPattern.terms.invalidFieldsErrorShort": "無効な{invalidFieldsCount, plural, other {個のフィールド}}: {invalidFields}。データビューを確認するか、別のフィールドを選択してください。",
     "xpack.lens.indexPattern.terms.maxDocCount": "用語ごとの最大ドキュメント数",
     "xpack.lens.indexPattern.terms.missingBucketDescription": "このフィールドなしでドキュメントを含める",
     "xpack.lens.indexPattern.terms.missingLabel": "（欠落値）",
@@ -653,12 +681,17 @@
     "xpack.lens.indexPattern.terms.size": "値の数",
     "xpack.lens.indexPattern.terms.sizeLimitMax": "値が最大値{max}を超えています。最大値が使用されます。",
     "xpack.lens.indexPattern.terms.sizeLimitMin": "値が最小値{min}未満です。最小値が使用されます。",
+    "xpack.lens.indexPattern.termsOf": "{name}の上位{numberOfTermsLabel}{termsCount, plural, other {の値}}",
     "xpack.lens.indexPattern.termsWithMultipleShifts": "単一のレイヤーでは、メトリックを異なる時間シフトと動的な上位の値と組み合わせることができません。すべてのメトリックで同じ時間シフト値を使用するか、上位の値ではなくフィルターを使用します。",
     "xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel": "フィルターを使用",
     "xpack.lens.indexPattern.termsWithMultipleTermsAndScriptedFields": "複数のフィールドを使用するときには、スクリプトフィールドがサポートされていません。{fields}が見つかりました",
+    "xpack.lens.indexPattern.time_scale": "メトリック：数値、単位：s|m|h|d|w|M|y",
+    "xpack.lens.indexPattern.timeScale": "単位で正規化",
     "xpack.lens.indexPattern.timeScale.enableTimeScale": "単位で正規化",
     "xpack.lens.indexPattern.timeScale.label": "単位で正規化",
+    "xpack.lens.indexPattern.timeScale.missingUnit": "単位による正規化の単位が指定されていません。",
     "xpack.lens.indexPattern.timeScale.tooltip": "基本の日付間隔に関係なく、常に指定された時間単位のレートとして表示されるように値を正規化します。",
+    "xpack.lens.indexPattern.timeScale.wrongUnit": "不明な単位が指定されました。s、m、h、dのいずれかを使用してください。",
     "xpack.lens.indexPattern.timeShift.12hours": "12時間前（12h）",
     "xpack.lens.indexPattern.timeShift.3hours": "3時間前（3h）",
     "xpack.lens.indexPattern.timeShift.3months": "3か月前（3M）",
@@ -702,28 +735,42 @@
     "xpack.lens.label.gauge.labelMajor.header": "タイトル",
     "xpack.lens.label.gauge.labelMinor.header": "サブタイトル",
     "xpack.lens.label.header": "ラベル",
+    "xpack.lens.label.shared.axisHeader": "軸のタイトル",
     "xpack.lens.labelInput.label": "ラベル",
     "xpack.lens.layerPanel.layerVisualizationType": "レイヤービジュアライゼーションタイプ",
     "xpack.lens.layerPanel.missingDataView": "データビューが見つかりません",
     "xpack.lens.legacyUrlConflict.objectNoun": "レンズビジュアライゼーション",
     "xpack.lens.lensSavedObjectLabel": "レンズビジュアライゼーション",
-    "xpack.lens.metric.addLayer": "ビジュアライゼーションレイヤーを追加",
+    "xpack.lens.lineMarker.positionRequirementTooltip": "位置を変更するには、アイコンを選択するか、名前を表示する必要があります",
+    "xpack.lens.lineMarker.textVisibility": "テキスト装飾",
+    "xpack.lens.metric.addLayer": "ビジュアライゼーション",
     "xpack.lens.metric.dynamicColoring.background": "塗りつぶし",
     "xpack.lens.metric.dynamicColoring.label": "値別の色",
     "xpack.lens.metric.dynamicColoring.none": "なし",
     "xpack.lens.metric.dynamicColoring.text": "テキスト",
     "xpack.lens.metric.groupLabel": "目標値と単一の値",
     "xpack.lens.metric.label": "メトリック",
+    "xpack.lens.metricChart.alignLabel.center": "中央に合わせる",
+    "xpack.lens.metricChart.alignLabel.left": "左に合わせる",
+    "xpack.lens.metricChart.alignLabel.right": "右に合わせる",
+    "xpack.lens.metricChart.metricSize.extraLarge": "XL",
+    "xpack.lens.metricChart.metricSize.extraSmall": "XS",
+    "xpack.lens.metricChart.metricSize.large": "L",
+    "xpack.lens.metricChart.metricSize.medium": "M",
+    "xpack.lens.metricChart.metricSize.small": "S",
+    "xpack.lens.metricChart.metricSize.xxl": "XXL",
+    "xpack.lens.metricChart.textFormattingLabel": "テキスト書式",
+    "xpack.lens.metricChart.titleAlignLabel": "配置",
+    "xpack.lens.metricChart.titlePositionLabel": "タイトル位置",
     "xpack.lens.pageTitle": "レンズ",
     "xpack.lens.paletteHeatmapGradient.customize": "編集",
     "xpack.lens.paletteHeatmapGradient.customizeLong": "パレットを編集",
     "xpack.lens.paletteHeatmapGradient.label": "色",
     "xpack.lens.paletteMetricGradient.label": "色",
-    "coloring.dynamicColoring.palettePicker.colorRangesLabel": "色の範囲",
     "xpack.lens.palettePicker.label": "カラーパレット",
     "xpack.lens.paletteTableGradient.customize": "編集",
     "xpack.lens.paletteTableGradient.label": "色",
-    "xpack.lens.pie.addLayer": "ビジュアライゼーションレイヤーを追加",
+    "xpack.lens.pie.addLayer": "ビジュアライゼーション",
     "xpack.lens.pie.arrayValues": "{label}には配列値が含まれます。可視化が想定通りに表示されない場合があります。",
     "xpack.lens.pie.donutLabel": "ドーナッツ",
     "xpack.lens.pie.groupLabel": "比率",
@@ -766,6 +813,9 @@
     "xpack.lens.section.configPanelLabel": "構成パネル",
     "xpack.lens.section.dataPanelLabel": "データパネル",
     "xpack.lens.section.workspaceLabel": "ビジュアライゼーションワークスペース",
+    "xpack.lens.settings.autoApply": "ビジュアライゼーションの変更を自動適用",
+    "xpack.lens.settings.title": "Lens設定",
+    "xpack.lens.shared.AppearanceLabel": "見た目",
     "xpack.lens.shared.axisNameLabel": "軸のタイトル",
     "xpack.lens.shared.chartValueLabelVisibilityLabel": "ラベル",
     "xpack.lens.shared.curveLabel": "視覚オプション",
@@ -776,8 +826,6 @@
     "xpack.lens.shared.legendInsideAlignmentLabel": "アラインメント",
     "xpack.lens.shared.legendInsideColumnsLabel": "列の数",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "アラインメント",
-    "xpack.lens.shared.legendInsideTooltip": "凡例をビジュアライゼーション内に配置する必要があります",
-    "xpack.lens.shared.legendIsTruncated": "テキストを切り捨てる必要があります",
     "xpack.lens.shared.legendLabel": "凡例",
     "xpack.lens.shared.legendLocationBottomLeft": "左下",
     "xpack.lens.shared.legendLocationBottomRight": "右下",
@@ -788,9 +836,15 @@
     "xpack.lens.shared.legendPositionLeft": "左",
     "xpack.lens.shared.legendPositionRight": "右",
     "xpack.lens.shared.legendPositionTop": "トップ",
+    "xpack.lens.shared.legendSizeSetting.label": "凡例幅",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.auto": "自動",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.extraLarge": "特大",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.large": "大",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.medium": "中",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.small": "小",
     "xpack.lens.shared.legendVisibilityLabel": "表示",
-    "xpack.lens.shared.legendVisibleTooltip": "凡例を表示する必要があります",
     "xpack.lens.shared.maxLinesLabel": "最大行",
+    "xpack.lens.shared.metric.appearanceLabel": "見た目",
     "xpack.lens.shared.nestedLegendLabel": "ネスト済み",
     "xpack.lens.shared.overwriteAxisTitle": "軸タイトルを上書き",
     "xpack.lens.shared.ticksPositionOptions": "帯の目盛",
@@ -801,6 +855,8 @@
     "xpack.lens.shared.valueLabelsVisibility.inside": "表示",
     "xpack.lens.sugegstion.refreshSuggestionLabel": "更新",
     "xpack.lens.suggestion.refreshSuggestionTooltip": "選択したビジュアライゼーションに基づいて、候補を更新します。",
+    "xpack.lens.suggestions.applyChangesLabel": "変更を適用",
+    "xpack.lens.suggestions.applyChangesPrompt": "提案を表示するには、最新の変更を適用する必要があります。",
     "xpack.lens.suggestions.currentVisLabel": "現在のビジュアライゼーション",
     "xpack.lens.table.actionsLabel": "アクションを表示",
     "xpack.lens.table.alignment.center": "中央",
@@ -812,17 +868,16 @@
     "xpack.lens.table.columnVisibilityLabel": "列を非表示",
     "xpack.lens.table.defaultAriaLabel": "データ表ビジュアライゼーション",
     "xpack.lens.table.dynamicColoring.cell": "セル",
-    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "割合値は使用可能なデータ値の全範囲に対して相対的です。",
     "xpack.lens.table.dynamicColoring.label": "値別の色",
     "xpack.lens.table.dynamicColoring.none": "なし",
-    "coloring.dynamicColoring.rangeType.label": "値型",
-    "coloring.dynamicColoring.rangeType.number": "数字",
-    "coloring.dynamicColoring.rangeType.percent": "割合（%）",
     "xpack.lens.table.dynamicColoring.text": "テキスト",
     "xpack.lens.table.hide.hideLabel": "非表示",
     "xpack.lens.table.palettePanelContainer.back": "戻る",
     "xpack.lens.table.palettePanelTitle": "色の編集",
     "xpack.lens.table.resize.reset": "幅のリセット",
+    "xpack.lens.table.rowHeight.auto": "自動的に合わせる",
+    "xpack.lens.table.rowHeight.custom": "カスタム",
+    "xpack.lens.table.rowHeight.single": "単一",
     "xpack.lens.table.sort.ascLabel": "昇順に並べ替える",
     "xpack.lens.table.sort.descLabel": "降順に並べ替える",
     "xpack.lens.table.summaryRow.average": "平均",
@@ -838,22 +893,34 @@
     "xpack.lens.table.tableCellFilter.filterOutValueAriaLabel": "値の除外：{cellContent}",
     "xpack.lens.table.tableCellFilter.filterOutValueText": "値を除外",
     "xpack.lens.table.valuesVisualOptions": "視覚オプション",
-    "xpack.lens.table.visualOptionsFitRowToContentLabel": "行を内容に合わせる",
+    "xpack.lens.table.visualOptionsFitRowToContentLabel": "セル行高さ",
+    "xpack.lens.table.visualOptionsHeaderRowHeightLabel": "ヘッダー行高さ",
     "xpack.lens.table.visualOptionsPaginateTable": "表のページ制御",
     "xpack.lens.table.visualOptionsPaginateTableTooltip": "項目が9件以下の場合、ページ制御は非表示です",
     "xpack.lens.timeScale.removeLabel": "時間単位で正規化を削除",
     "xpack.lens.timeShift.removeLabel": "時間シフトを削除",
+    "xpack.lens.TSVBLabel": "TSVB",
+    "xpack.lens.uniqueLabel": "{label} [{num}]",
+    "xpack.lens.unknownVisType.longMessage": "ビジュアライゼーションタイプ{visType}を解決できませんでした。",
+    "xpack.lens.unknownVisType.shortMessage": "不明なビジュアライゼーションタイプ",
     "xpack.lens.visTypeAlias.description": "ドラッグアンドドロップエディターでビジュアライゼーションを作成します。いつでもビジュアライゼーションタイプを切り替えることができます。",
     "xpack.lens.visTypeAlias.note": "ほとんどのユーザーに推奨されます。",
     "xpack.lens.visTypeAlias.title": "レンズ",
     "xpack.lens.visTypeAlias.type": "レンズ",
     "xpack.lens.visualizeGeoFieldMessage": "Lensは{fieldType}フィールドを可視化できません",
-    "xpack.lens.xyChart.addDataLayerLabel": "ビジュアライゼーションレイヤーを追加",
+    "xpack.lens.visualizeTSVBLegend": "TSVBグラフを可視化",
+    "xpack.lens.xyChart.addAnnotationsLayerLabel": "注釈",
+    "xpack.lens.xyChart.addAnnotationsLayerLabelDisabledHelp": "注釈では時間に基づくグラフが動作する必要があります。日付ヒストグラムを追加します。",
+    "xpack.lens.xyChart.addDataLayerLabel": "ビジュアライゼーション",
     "xpack.lens.xyChart.addLayer": "レイヤーを追加",
     "xpack.lens.xyChart.addLayerTooltip": "複数のレイヤーを使用すると、ビジュアライゼーションタイプを組み合わせたり、別のデータビューを可視化したりすることができます。",
-    "xpack.lens.xyChart.addReferenceLineLayerLabel": "基準レイヤーの追加",
+    "xpack.lens.xyChart.addReferenceLineLayerLabel": "基準線",
     "xpack.lens.xyChart.addReferenceLineLayerLabelDisabledHelp": "一部のデータを追加して、基準レイヤーを有効にする",
+    "xpack.lens.xyChart.annotation.name": "注釈を非表示",
+    "xpack.lens.xyChart.annotationDate": "注釈日",
+    "xpack.lens.xyChart.appearance": "見た目",
     "xpack.lens.xyChart.axisExtent.custom": "カスタム",
+    "xpack.lens.xyChart.axisExtent.dataBounds": "データ",
     "xpack.lens.xyChart.axisExtent.disabledDataBoundsMessage": "折れ線グラフのみをデータ境界に合わせることができます",
     "xpack.lens.xyChart.axisExtent.full": "完全",
     "xpack.lens.xyChart.axisExtent.label": "境界",
@@ -861,7 +928,6 @@
     "xpack.lens.xyChart.axisOrientation.horizontal": "横",
     "xpack.lens.xyChart.axisOrientation.label": "向き",
     "xpack.lens.xyChart.axisOrientation.vertical": "縦",
-    "xpack.lens.xyChart.axisOrientationMultilayer.disabled": "このオプションは時間に基づかない軸でのみ構成できます",
     "xpack.lens.xyChart.axisSide.auto": "自動",
     "xpack.lens.xyChart.axisSide.bottom": "一番下",
     "xpack.lens.xyChart.axisSide.label": "軸側",
@@ -872,12 +938,36 @@
     "xpack.lens.xyChart.bottomAxisLabel": "下の軸",
     "xpack.lens.xyChart.boundaryError": "下界は上界よりも大きくなければなりません",
     "xpack.lens.xyChart.curveStyleLabel": "曲線",
+    "xpack.lens.xyChart.defaultAnnotationLabel": "イベント",
+    "xpack.lens.xyChart.endValuesLabel": "終了値",
+    "xpack.lens.xyChart.fill.above": "上",
+    "xpack.lens.xyChart.fill.after": "後",
+    "xpack.lens.xyChart.fill.before": "前",
+    "xpack.lens.xyChart.fill.below": "下",
+    "xpack.lens.xyChart.fill.label": "塗りつぶし",
+    "xpack.lens.xyChart.fill.none": "なし",
     "xpack.lens.xyChart.fillOpacityLabel": "塗りつぶしの透明度",
     "xpack.lens.xyChart.Gridlines": "グリッド線",
     "xpack.lens.xyChart.horizontalAxisLabel": "横軸",
     "xpack.lens.xyChart.horizontalLeftAxisLabel": "横上軸",
     "xpack.lens.xyChart.horizontalRightAxisLabel": "横下軸",
+    "xpack.lens.xyChart.iconSelect.alertIconLabel": "アラート",
+    "xpack.lens.xyChart.iconSelect.asteriskIconLabel": "アスタリスク",
+    "xpack.lens.xyChart.iconSelect.bellIconLabel": "ベル",
+    "xpack.lens.xyChart.iconSelect.boltIconLabel": "ボルト",
+    "xpack.lens.xyChart.iconSelect.bugIconLabel": "バグ",
+    "xpack.lens.xyChart.iconSelect.circleIconLabel": "円",
+    "xpack.lens.xyChart.iconSelect.commentIconLabel": "コメント",
+    "xpack.lens.xyChart.iconSelect.flagIconLabel": "旗",
+    "xpack.lens.xyChart.iconSelect.heartLabel": "ハート",
+    "xpack.lens.xyChart.iconSelect.mapMarkerLabel": "マップマーカー",
+    "xpack.lens.xyChart.iconSelect.mapPinLabel": "マップピン",
+    "xpack.lens.xyChart.iconSelect.noIconLabel": "なし",
+    "xpack.lens.xyChart.iconSelect.starLabel": "星",
+    "xpack.lens.xyChart.iconSelect.tagIconLabel": "タグ",
+    "xpack.lens.xyChart.iconSelect.triangleIconLabel": "三角形",
     "xpack.lens.xyChart.inclusiveZero": "境界にはゼロを含める必要があります。",
+    "xpack.lens.xyChart.layerAnnotationsLabel": "注釈",
     "xpack.lens.xyChart.layerReferenceLineLabel": "基準線",
     "xpack.lens.xyChart.leftAxisDisabledHelpText": "この設定は、左の軸が有効であるときにのみ適用されます。",
     "xpack.lens.xyChart.leftAxisLabel": "左の軸",
@@ -886,13 +976,25 @@
     "xpack.lens.xyChart.legendVisibility.auto": "自動",
     "xpack.lens.xyChart.legendVisibility.hide": "非表示",
     "xpack.lens.xyChart.legendVisibility.show": "表示",
+    "xpack.lens.xyChart.lineColor.label": "色",
+    "xpack.lens.xyChart.lineMarker.auto": "自動",
+    "xpack.lens.xyChart.lineMarker.icon": "アイコン装飾",
+    "xpack.lens.xyChart.lineMarker.position": "装飾位置",
+    "xpack.lens.xyChart.lineMarker.textVisibility.name": "名前",
+    "xpack.lens.xyChart.lineMarker.textVisibility.none": "なし",
+    "xpack.lens.xyChart.lineStyle.dashed": "鎖線",
+    "xpack.lens.xyChart.lineStyle.dotted": "点線",
+    "xpack.lens.xyChart.lineStyle.label": "折れ線",
+    "xpack.lens.xyChart.lineStyle.solid": "塗りつぶし",
     "xpack.lens.xyChart.markerPosition.above": "トップ",
     "xpack.lens.xyChart.markerPosition.below": "一番下",
     "xpack.lens.xyChart.markerPosition.left": "左",
     "xpack.lens.xyChart.markerPosition.right": "右",
     "xpack.lens.xyChart.missingValuesLabel": "欠測値",
-    "xpack.lens.xyChart.missingValuesLabelHelpText": "デフォルトでは、Lensではデータのギャップが表示されません。ギャップを埋めるには、選択します。",
+    "xpack.lens.xyChart.missingValuesLabelHelpText": "デフォルトでは、面グラフと折れ線グラフはデータのギャップが非表示になります。ギャップを埋めるには、選択します。",
+    "xpack.lens.xyChart.missingValuesStyle": "点線として表示",
     "xpack.lens.xyChart.nestUnderRoot": "データセット全体",
+    "xpack.lens.xyChart.placement": "配置",
     "xpack.lens.xyChart.rightAxisDisabledHelpText": "この設定は、右の軸が有効であるときにのみ適用されます。",
     "xpack.lens.xyChart.rightAxisLabel": "右の軸",
     "xpack.lens.xyChart.seriesColor.auto": "自動",
@@ -946,49 +1048,6 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "H.割合棒",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "縦棒割合",
     "xpack.lens.xyVisualization.xyLabel": "XY",
-    "expressionXY.legend.filterForValueButtonAriaLabel": "値でフィルター",
-    "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}、フィルターオプション",
-    "expressionXY.legend.filterOutValueButtonAriaLabel": "値を除外",
-    "expressionXY.xyVis.axisTitlesVisibilitySettings.help": "xおよびy軸のタイトルを表示",
-    "expressionXY.xyVis.curveType.help": "折れ線グラフで曲線タイプをレンダリングする方法を定義します",
-    "expressionXY.xyChart.emptyXLabel": "（空）",
-    "expressionXY.axisExtentConfig.extentMode.help": "範囲モード",
-    "expressionXY.xyVis.fillOpacity.help": "エリアグラフの塗りつぶしの透明度を定義",
-    "expressionXY.xyVis.fittingFunction.help": "欠測値の処理方法を定義",
-    "expressionXY.legendConfig.floatingColumns.help": "凡例がグラフ内に表示されるときに列数を指定します。",
-    "expressionXY.xyVis.gridlinesVisibilitySettings.help": "xおよびy軸のグリッド線を表示",
-    "expressionXY.xyVis.help": "X/Y チャート",
-    "expressionXY.xyVis.hideEndzones.help": "部分データの終了ゾーンマーカーを非表示",
-    "expressionXY.legendConfig.horizontalAlignment.help": "凡例がグラフ内に表示されるときに凡例の横の配置を指定します。",
-    "expressionXY.legendConfig.isInside.help": "凡例がグラフ内に表示されるかどうかを指定します",
-    "expressionXY.legendConfig.isVisible.help": "判例の表示・非表示を指定します。",
-    "expressionXY.xyVis.labelsOrientation.help": "軸ラベルの回転を定義します",
-    "expressionXY.xyVis.legend.help": "チャートの凡例を構成します。",
-    "expressionXY.legendConfig.maxLines.help": "凡例項目ごとの行数を指定します。",
-    "expressionXY.legendConfig.position.help": "凡例の配置を指定します。",
-    "expressionXY.xyVis.renderer.help": "X/Y チャートを再レンダリング",
-    "expressionXY.legendConfig.shouldTruncate.help": "凡例項目が切り捨てられるかどうかを指定します",
-    "expressionXY.legendConfig.showSingleSeries.help": "エントリが1件の凡例を表示するかどうかを指定します",
-    "expressionXY.xyVis.tickLabelsVisibilitySettings.help": "xおよびy軸の目盛ラベルを表示",
-    "expressionXY.xyVis.valuesInLegend.help": "凡例に値を表示",
-    "expressionXY.legendConfig.verticalAlignment.help": "凡例がグラフ内に表示されるときに凡例の縦の配置を指定します。",
-    "expressionXY.gridlinesConfig.x.help": "x 軸のグリッド線を表示するかどうかを指定します。",
-    "expressionXY.labelsOrientationConfig.x.help": "x軸のラベルの向きを指定します。",
-    "expressionXY.tickLabelsConfig.x.help": "x軸の目盛ラベルを表示するかどうかを指定します。",
-    "expressionXY.axisTitlesVisibilityConfig.x.help": "x軸のタイトルを表示するかどうかを指定します。",
-    "expressionXY.xyVis.xTitle.help": "x軸のタイトル",
-    "expressionXY.gridlinesConfig.yLeft.help": "左y軸のグリッド線を表示するかどうかを指定します。",
-    "expressionXY.labelsOrientationConfig.yLeft.help": "左y軸のラベルの向きを指定します。",
-    "expressionXY.tickLabelsConfig.yLeft.help": "左y軸の目盛ラベルを表示するかどうかを指定します。",
-    "expressionXY.axisTitlesVisibilityConfig.yLeft.help": "左y軸のタイトルを表示するかどうかを指定します。",
-    "expressionXY.xyVis.yLeftExtent.help": "Y左軸範囲",
-    "expressionXY.xyVis.yLeftTitle.help": "左y軸のタイトル",
-    "expressionXY.gridlinesConfig.yRight.help": "右y軸のグリッド線を表示するかどうかを指定します。",
-    "expressionXY.labelsOrientationConfig.yRight.help": "右y軸のラベルの向きを指定します。",
-    "expressionXY.tickLabelsConfig.yRight.help": "右y軸の目盛ラベルを表示するかどうかを指定します。",
-    "expressionXY.axisTitlesVisibilityConfig.yRight.help": "右y軸のタイトルを表示するかどうかを指定します。",
-    "expressionXY.xyVis.yRightExtent.help": "Y右軸範囲",
-    "expressionXY.xyVis.yRightTitle.help": "右 y 軸のタイトル",
     "advancedSettings.advancedSettingsLabel": "高度な設定",
     "advancedSettings.badge.readOnly.text": "読み取り専用",
     "advancedSettings.badge.readOnly.tooltip": "高度な設定を保存できません",
@@ -1143,7 +1202,6 @@
     "console.notification.error.historyQuotaReachedMessage": "リクエスト履歴が満杯です。コンソール履歴を消去するか、新しいリクエストの保存を無効にしてください。",
     "console.notification.error.noRequestSelectedTitle": "リクエストを選択していません。リクエストの中にカーソルを置いて選択します。",
     "console.notification.error.unknownErrorTitle": "不明なリクエストエラー",
-    "console.outputCannotPreviewBinaryData": "バイナリデータをプレビューできません。",
     "console.outputTextarea": "開発ツールコンソール出力",
     "console.pageHeading": "コンソール",
     "console.requestInProgressBadgeText": "リクエストが進行中",
@@ -1155,6 +1213,7 @@
     "console.sendRequestButtonTooltip": "クリックしてリクエストを送信",
     "console.settingsPage.autocompleteLabel": "自動入力",
     "console.settingsPage.cancelButtonLabel": "キャンセル",
+    "console.settingsPage.dataStreamsLabelText": "データストリーム",
     "console.settingsPage.fieldsLabelText": "フィールド",
     "console.settingsPage.fontSizeLabel": "フォントサイズ",
     "console.settingsPage.historyLabel": "履歴",
@@ -1193,17 +1252,19 @@
     "console.welcomePage.supportedRequestFormatTitle": "コンソールは cURL と同様に、コンパクトなフォーマットのリクエストを理解できます。",
     "controls.controlGroup.emptyState.addControlButtonTitle": "コントロールを追加",
     "controls.controlGroup.emptyState.callToAction": "コントロールを使用すると、ダッシュボードデータのフィルタリングと操作が可能です",
+    "controls.controlGroup.emptyState.dismissButton": "閉じる",
     "controls.controlGroup.emptyState.twoLineLoadingTitle": "...",
     "controls.controlGroup.floatingActions.editTitle": "コントロールを編集",
     "controls.controlGroup.floatingActions.removeTitle": "コントロールを削除",
     "controls.controlGroup.manageControl.cancelTitle": "キャンセル",
+    "controls.controlGroup.manageControl.controlTypesTitle": "コントロールタイプ",
     "controls.controlGroup.manageControl.createFlyoutTitle": "コントロールを作成",
     "controls.controlGroup.manageControl.editFlyoutTitle": "コントロールを編集",
     "controls.controlGroup.manageControl.saveChangesTitle": "保存して閉じる",
-    "controls.controlGroup.manageControl.titleInputTitle": "タイトル",
+    "controls.controlGroup.manageControl.titleInputTitle": "ラベル",
     "controls.controlGroup.manageControl.widthInputTitle": "コントロールサイズ",
     "controls.controlGroup.management.addControl": "コントロールを追加",
-    "controls.controlGroup.management.buttonTitle": "コントロールを構成",
+    "controls.controlGroup.management.buttonTitle": "設定",
     "controls.controlGroup.management.defaultWidthTitle": "デフォルトサイズ",
     "controls.controlGroup.management.delete": "コントロールを削除",
     "controls.controlGroup.management.delete.cancel": "キャンセル",
@@ -1220,27 +1281,67 @@
     "controls.controlGroup.management.discard.confirm": "変更を破棄",
     "controls.controlGroup.management.discard.sub": "このコントロールの変更は破棄されます。続行しますか？",
     "controls.controlGroup.management.discard.title": "変更を破棄しますか?",
-    "controls.controlGroup.management.flyoutTitle": "コントロールを構成",
+    "controls.controlGroup.management.flyoutTitle": "設定をコントロールします",
+    "controls.controlGroup.management.hierarchy.subtitle": "1つのコントロールで項目を選択すると、次で使用可能なオプションが絞り込まれます。コントロールは左から右に連鎖されます。",
+    "controls.controlGroup.management.hierarchy.title": "コントロールの連鎖",
+    "controls.controlGroup.management.labelPosition.above": "上",
+    "controls.controlGroup.management.labelPosition.designSwitchLegend": "インラインと上記との間でラベル位置を切り替える",
+    "controls.controlGroup.management.labelPosition.inline": "インライン",
+    "controls.controlGroup.management.labelPosition.title": "ラベル位置",
     "controls.controlGroup.management.layout.auto": "自動",
     "controls.controlGroup.management.layout.controlWidthLegend": "コントロールサイズを変更",
     "controls.controlGroup.management.layout.large": "大",
     "controls.controlGroup.management.layout.medium": "中",
     "controls.controlGroup.management.layout.small": "小",
+    "controls.controlGroup.management.query.advancedSettings": "高度な設定",
+    "controls.controlGroup.management.query.ignoreFilterPills": "フィルターピルを無視",
+    "controls.controlGroup.management.query.ignoreQuery": "クエリバーを無視",
+    "controls.controlGroup.management.query.ignoreTimerange": "時間範囲を無視",
+    "controls.controlGroup.management.query.searchSettingsTitle": "クエリバーと同期",
+    "controls.controlGroup.management.query.useAllSearchSettingsTitle": "時間範囲、フィルターピル、クエリバーからのクエリを適用して、コントロールグループを常にクエリと同期します",
     "controls.controlGroup.management.setAllWidths": "すべてのサイズをデフォルトに設定",
+    "controls.controlGroup.management.validate.subtitle": "データがないコントロール選択は自動的に無視されます。",
+    "controls.controlGroup.management.validate.title": "ユーザー選択を検証",
     "controls.controlGroup.title": "コントロールグループ",
+    "controls.controlGroup.toolbarButtonTitle": "コントロール",
+    "controls.optionsList.description": "フィールド値を選択するメニューを追加",
+    "controls.optionsList.displayName": "オプションリスト",
     "controls.optionsList.editor.allowMultiselectTitle": "ドロップダウンでの複数選択を許可",
     "controls.optionsList.editor.dataViewTitle": "データビュー",
     "controls.optionsList.editor.fieldTitle": "フィールド",
     "controls.optionsList.editor.noDataViewTitle": "データビューを選択",
     "controls.optionsList.errors.dataViewNotFound": "データビュー{dataViewId}が見つかりませんでした",
+    "controls.optionsList.errors.fieldNotFound": "フィールド{fieldId}が見つかりませんでした",
     "controls.optionsList.popover.allOptionsTitle": "すべてのオプションを表示",
+    "controls.optionsList.popover.cardinalityPlaceholder": "{totalOptions}個の使用可能な{totalOptions, plural, other {オプション}}を検索",
+    "controls.optionsList.popover.cardinalityTooltip": "{totalOptions}個のオプションを使用できます。",
     "controls.optionsList.popover.clearAllSelectionsTitle": "選択した項目をクリア",
-    "controls.optionsList.popover.empty": "フィルターが見つかりません",
-    "controls.optionsList.popover.loading": "フィルターを読み込み中",
+    "controls.optionsList.popover.empty": "オプションが見つかりません",
+    "controls.optionsList.popover.invalidSelectionsAriaLabel": "すべての無視された選択項目を選択解除",
+    "controls.optionsList.popover.invalidSelectionsSectionTitle": "{invalidSelectionCount, plural, other {個の選択項目}}",
+    "controls.optionsList.popover.invalidSelectionsTitle": "{invalidSelectionCount}個の選択されたオプションが無視されました",
+    "controls.optionsList.popover.invalidSelectionsTooltip": "{selectedOptions}個の選択した{selectedOptions, plural, other {オプション}} {selectedOptions, plural, other {が}}無視されます。{selectedOptions, plural, other {オプションが}}データに存在しません。",
+    "controls.optionsList.popover.loading": "オプションを読み込み中",
     "controls.optionsList.popover.selectedOptionsTitle": "選択したオプションのみを表示",
     "controls.optionsList.popover.selectionsEmpty": "選択されていません",
     "controls.optionsList.summary.placeholder": "選択してください...",
     "controls.optionsList.summary.separator": ",",
+    "controls.rangeSlider.description": "フィールド値の範囲を選択するためのコントロールを追加",
+    "controls.rangeSlider.displayName": "範囲スライダー",
+    "controls.rangeSlider.editor.dataViewTitle": "データビュー",
+    "controls.rangeSlider.editor.fieldTitle": "フィールド",
+    "controls.rangeSlider.editor.noDataViewTitle": "データビューを選択",
+    "controls.rangeSlider.popover.allOptionsTitle": "すべてのオプションを表示",
+    "controls.rangeSlider.popover.clearRangeTitle": "範囲を消去",
+    "controls.rangeSlider.popover.noDataHelpText": "選択した範囲が使用可能なデータの範囲外です。フィルターが適用されませんでした。",
+    "controls.rangeSlider.popover.upperLessThanLowerErrorMessage": "上限は下限以上でなければなりません。",
+    "controls.timeSlider.description": "時間範囲を選択するためのスライダーを追加",
+    "controls.timeSlider.displayName": "時間スライダー",
+    "controls.timeSlider.editor.dataViewTitle": "データビュー",
+    "controls.timeSlider.editor.fieldTitle": "フィールド",
+    "controls.timeSlider.editor.noDataViewTitle": "データビューを選択",
+    "controls.timeSlider.noDocuments.label": "ドキュメントが見つかりませんでした。 範囲選択を使用できません。",
+    "controls.timeSlider.resetButton.label": "選択項目をリセット",
     "core.application.appContainer.loadingAriaLabel": "アプリケーションを読み込んでいます",
     "core.application.appNotFound.pageDescription": "この URL にアプリケーションが見つかりませんでした。前の画面に戻るか、メニューからアプリを選択してみてください。",
     "core.application.appNotFound.title": "アプリケーションが見つかりません",
@@ -1261,6 +1362,7 @@
     "core.deprecations.elasticsearchUsername.message": "Kibanaは\"{username}\"ユーザーを使用してElasticsearchで認証するように構成されています。代わりにサービスアカウントトークンを使用します。",
     "core.deprecations.elasticsearchUsername.title": "「elasticsearch.username: {username}」は廃止予定です",
     "core.deprecations.noCorrectiveAction": "この廃止予定は自動的に解決できません。",
+    "core.euiAbsoluteTab.dateFormatError": "想定される形式：{dateFormat}",
     "core.euiAccordion.isLoading": "読み込み中",
     "core.euiAutoRefresh.autoRefreshLabel": "自動更新",
     "core.euiAutoRefresh.buttonLabelOff": "自動更新はオフです",
@@ -1322,6 +1424,7 @@
     "core.euiColumnSortingDraggable.defaultSortDesc": "Z-A",
     "core.euiColumnSortingDraggable.removeSortLabel": "データグリッドの並べ替えから{display}を削除",
     "core.euiColumnSortingDraggable.toggleLegend": "{display}の並べ替え方法を選択",
+    "core.euiComboBox.listboxAriaLabel": "次のオプションから選択",
     "core.euiComboBoxOptionsList.allOptionsSelected": "利用可能なオプションをすべて選択しました",
     "core.euiComboBoxOptionsList.alreadyAdded": "{label} はすでに追加されています",
     "core.euiComboBoxOptionsList.createCustomOption": "{searchValue}をカスタムオプションとして追加",
@@ -1338,6 +1441,7 @@
     "core.euiDataGrid.ariaLabelledBy": "{page}/{pageCount}ページ。",
     "core.euiDataGrid.screenReaderNotice": "セルにはインタラクティブコンテンツが含まれます。",
     "core.euiDataGridCell.position": "行：{row}、列：{col}",
+    "core.euiDataGridCellActions.expandButtonTitle": "クリックするか enter を押すと、セルのコンテンツとインタラクトできます。",
     "core.euiDataGridHeaderCell.headerActions": "ヘッダーアクション",
     "core.euiDataGridPagination.detailedPaginationLabel": "前のグリッドのページネーション：{label}",
     "core.euiDataGridPagination.paginationLabel": "前のグリッドのページネーション",
@@ -1352,6 +1456,14 @@
     "core.euiDataGridSchema.numberSortTextAsc": "低-高",
     "core.euiDataGridSchema.numberSortTextDesc": "高-低",
     "core.euiDatePopoverButton.outdatedTitle": "更新が必要：{title}",
+    "core.euiDatePopoverContent.absoluteTabLabel": "絶対",
+    "core.euiDatePopoverContent.endDateLabel": "終了日",
+    "core.euiDatePopoverContent.nowTabButtonEnd": "終了日時を現在に設定",
+    "core.euiDatePopoverContent.nowTabButtonStart": "開始日時を現在に設定",
+    "core.euiDatePopoverContent.nowTabContent": "日時を現在の日時に設定すると、更新するたびに、この日時が更新日時に設定されます。",
+    "core.euiDatePopoverContent.nowTabLabel": "今",
+    "core.euiDatePopoverContent.relativeTabLabel": "相対",
+    "core.euiDatePopoverContent.startDateLabel": "開始日",
     "core.euiDisplaySelector.buttonText": "表示オプション",
     "core.euiDisplaySelector.densityLabel": "密度",
     "core.euiDisplaySelector.labelAuto": "自動的に合わせる",
@@ -1375,6 +1487,8 @@
     "core.euiFlyout.closeAriaLabel": "このダイアログを閉じる",
     "core.euiForm.addressFormErrors": "ハイライトされたエラーを修正してください。",
     "core.euiFormControlLayoutClearButton.label": "インプットを消去",
+    "core.euiFullscreenSelector.fullscreenButton": "全画面モードを開始",
+    "core.euiFullscreenSelector.fullscreenButtonActive": "全画面モードを終了",
     "core.euiHeaderLinks.appNavigation": "アプリメニュー",
     "core.euiHeaderLinks.openNavigationMenu": "メニューを開く",
     "core.euiHue.label": "HSV カラーモードの「色相」値を選択",
@@ -1427,6 +1541,39 @@
     "core.euiPinnableListGroup.pinExtraActionLabel": "項目をピン留め",
     "core.euiPinnableListGroup.pinnedExtraActionLabel": "項目のピン留めを外す",
     "core.euiPopover.screenReaderAnnouncement": "これはダイアログです。ダイアログを閉じるには、 escape を押してください。",
+    "core.euiPrettyDuration.durationRoundedToDay": "{prettyDuration}は日に端数処理されました",
+    "core.euiPrettyDuration.durationRoundedToHour": "{prettyDuration}は時間に端数処理されました",
+    "core.euiPrettyDuration.durationRoundedToMinute": "{prettyDuration}は分に端数処理されました",
+    "core.euiPrettyDuration.durationRoundedToMonth": "{prettyDuration}は月に端数処理されました",
+    "core.euiPrettyDuration.durationRoundedToSecond": "{prettyDuration}は秒に端数処理されました",
+    "core.euiPrettyDuration.durationRoundedToWeek": "{prettyDuration}は週に端数処理されました",
+    "core.euiPrettyDuration.durationRoundedToYear": "{prettyDuration}は年に端数処理されました",
+    "core.euiPrettyDuration.fallbackDuration": "{displayFrom}から{displayTo}",
+    "core.euiPrettyDuration.invalid": "無効な日付",
+    "core.euiPrettyDuration.lastDurationDays": "過去{duration, plural, other {#日間}}",
+    "core.euiPrettyDuration.lastDurationHours": "過去{duration, plural, other {#時間}}",
+    "core.euiPrettyDuration.lastDurationMinutes": "過去{duration, plural, other {#分間}}",
+    "core.euiPrettyDuration.lastDurationMonths": "過去{duration, plural, other {#か月間}}",
+    "core.euiPrettyDuration.lastDurationSeconds": "過去{duration, plural, other {#秒間}}",
+    "core.euiPrettyDuration.lastDurationWeeks": "過去{duration, plural, other {#週間}}",
+    "core.euiPrettyDuration.lastDurationYears": "過去{duration, plural, other {#年間}}",
+    "core.euiPrettyDuration.nextDurationHours": "今後{duration, plural, other {#時間}}",
+    "core.euiPrettyDuration.nextDurationMinutes": "今後{duration, plural, other {#分間}}",
+    "core.euiPrettyDuration.nextDurationMonths": "今後{duration, plural, other {#か月間}}",
+    "core.euiPrettyDuration.nextDurationSeconds": "今後{duration, plural, other {#秒間}}",
+    "core.euiPrettyDuration.nextDurationWeeks": "今後{duration, plural, other {#週間}}",
+    "core.euiPrettyDuration.nextDurationYears": "今後{duration, plural, other {#年間}}",
+    "core.euiPrettyDuration.nexttDurationDays": "今後{duration, plural, other {#日間}}",
+    "core.euiPrettyDuration.now": "今",
+    "core.euiPrettyInterval.days": "{interval, plural, other {#日間}}",
+    "core.euiPrettyInterval.daysShorthand": "{interval} d",
+    "core.euiPrettyInterval.hours": "{interval, plural, other  {# 時間}}",
+    "core.euiPrettyInterval.hoursShorthand": "{interval} h",
+    "core.euiPrettyInterval.minutes": "{interval, plural, other {# 分間}}",
+    "core.euiPrettyInterval.minutesShorthand": "{interval} m",
+    "core.euiPrettyInterval.off": "オフ",
+    "core.euiPrettyInterval.seconds": "{interval, plural, other {#秒間}}",
+    "core.euiPrettyInterval.secondsShorthand": "{interval}",
     "core.euiProgress.valueText": "{value}%",
     "core.euiQuickSelect.applyButton": "適用",
     "core.euiQuickSelect.fullDescription": "現在 {timeTense} {timeValue} {timeUnit}に設定されています。",
@@ -1455,10 +1602,15 @@
     "core.euiSelectable.noAvailableOptions": "オプションがありません",
     "core.euiSelectable.noMatchingOptions": "{searchValue} はどのオプションにも一致していません",
     "core.euiSelectable.placeholderName": "フィルターオプション",
+    "core.euiSelectable.screenReaderInstructions": "オプションのフォーカスを移動するには、上下矢印を使用します。Enterを押すと選択します。Escapeを押すとオプションを折りたたみます。",
+    "core.euiSelectable.searchResults": "{resultsLength, plural, other {#件の結果}}",
+    "core.euiSelectableListItem.checkedOption": "選択されたオプション。",
+    "core.euiSelectableListItem.checkedOptionInstructions": "このオプションをオフにするには、Enterを押します。",
     "core.euiSelectableListItem.excludedOption": "除外されたオプション。",
-    "core.euiSelectableListItem.excludedOptionInstructions": "このオプションの選択を解除するには、Enterを押します。",
-    "core.euiSelectableListItem.includedOption": "追加されたオプション。",
+    "core.euiSelectableListItem.excludedOptionInstructions": "このオプションをオフにするには、Enterを押します。",
+    "core.euiSelectableListItem.includedOption": "選択されたオプション。",
     "core.euiSelectableListItem.includedOptionInstructions": "このオプションを除外するには、Enterを押します",
+    "core.euiSelectableListItem.unckeckedOptionInstructions": "このオプションをオンにするには、Enterを押します。",
     "core.euiSelectableTemplateSitewide.loadingResults": "結果を読み込み中",
     "core.euiSelectableTemplateSitewide.noResults": "結果がありません",
     "core.euiSelectableTemplateSitewide.onFocusBadgeGoTo": "移動：",
@@ -1480,6 +1632,12 @@
     "core.euiStepStrings.simpleWarning": "ステップ{number}には警告があります",
     "core.euiStepStrings.step": "ステップ{number}: {title}",
     "core.euiStepStrings.warning": "ステップ{number}: {title}には警告があります",
+    "core.euiSuggest.stateLoading": "状態：読み込み中。",
+    "core.euiSuggest.stateSaved": "状態：保存済み。",
+    "core.euiSuggest.stateSavedTooltip": "保存されました。",
+    "core.euiSuggest.stateUnchanged": "状態：未変更。",
+    "core.euiSuggest.stateUnsaved": "状態：未保存。",
+    "core.euiSuggest.stateUnsavedTooltip": "変更は保存されていません。",
     "core.euiSuperSelect.screenReaderAnnouncement": "フォームセレクターを使用中で、1 つのオプションを選択する必要があります。上下の矢印キーで移動するか、Escキーで閉じます。",
     "core.euiSuperSelectControl.selectAnOption": "オプションの選択：{selectedValue} を選択済み",
     "core.euiSuperUpdateButton.cannotUpdateTooltip": "アップデートできません",
@@ -1488,9 +1646,49 @@
     "core.euiSuperUpdateButton.updateButtonLabel": "更新",
     "core.euiSuperUpdateButton.updatingButtonLabel": "更新中",
     "core.euiTableHeaderCell.titleTextWithDesc": "{innerText}; {description}",
+    "core.euiTablePagination.allRows": "すべての行を表示しています",
     "core.euiTablePagination.rowsPerPage": "ページごとの行数",
     "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage}行",
+    "core.euiTablePagination.rowsPerPageOptionShowAllRows": "すべての行を表示",
     "core.euiTableSortMobile.sorting": "並べ替え",
+    "core.euiTimeOptions.days": "日",
+    "core.euiTimeOptions.daysAgo": "日前",
+    "core.euiTimeOptions.daysFromNow": "現在からの日数",
+    "core.euiTimeOptions.hours": "時間",
+    "core.euiTimeOptions.hoursAgo": "時間前",
+    "core.euiTimeOptions.hoursFromNow": "現在からの時間数",
+    "core.euiTimeOptions.last": "最後",
+    "core.euiTimeOptions.minutes": "分",
+    "core.euiTimeOptions.minutesAgo": "分前",
+    "core.euiTimeOptions.minutesFromNow": "現在からの分数",
+    "core.euiTimeOptions.months": "か月",
+    "core.euiTimeOptions.monthsAgo": "か月前",
+    "core.euiTimeOptions.monthsFromNow": "現在からの月数",
+    "core.euiTimeOptions.monthToDate": "月初めから今日まで",
+    "core.euiTimeOptions.next": "次へ",
+    "core.euiTimeOptions.roundToDay": "日に端数処理",
+    "core.euiTimeOptions.roundToHour": "時間に端数処理",
+    "core.euiTimeOptions.roundToMinute": "分に端数処理",
+    "core.euiTimeOptions.roundToMonth": "月に端数処理",
+    "core.euiTimeOptions.roundToSecond": "秒に端数処理",
+    "core.euiTimeOptions.roundToWeek": "週に端数処理",
+    "core.euiTimeOptions.roundToYear": "年に端数処理",
+    "core.euiTimeOptions.seconds": "秒",
+    "core.euiTimeOptions.secondsAgo": "秒前",
+    "core.euiTimeOptions.secondsFromNow": "現在からの秒数",
+    "core.euiTimeOptions.thisMonth": "今月",
+    "core.euiTimeOptions.thisWeek": "今週",
+    "core.euiTimeOptions.thisYear": "今年",
+    "core.euiTimeOptions.today": "今日",
+    "core.euiTimeOptions.weeks": "週間",
+    "core.euiTimeOptions.weeksAgo": "週間前",
+    "core.euiTimeOptions.weeksFromNow": "現在からの週数",
+    "core.euiTimeOptions.weekToDate": "週初めから今日まで",
+    "core.euiTimeOptions.years": "年",
+    "core.euiTimeOptions.yearsAgo": "年前",
+    "core.euiTimeOptions.yearsFromNow": "現在からの年数",
+    "core.euiTimeOptions.yearToDate": "年度の頭から今日まで",
+    "core.euiTimeOptions.yesterday": "昨日",
     "core.euiToast.dismissToast": "トーストを閉じる",
     "core.euiToast.newNotification": "新しい通知が表示されます",
     "core.euiToast.notification": "通知",
@@ -1544,12 +1742,16 @@
     "core.toasts.errorToast.seeFullError": "完全なエラーを表示",
     "core.ui_settings.params.darkModeText": "Kibana UIのダークモードを有効にします。この設定を適用するにはページの更新が必要です。",
     "core.ui_settings.params.darkModeTitle": "ダークモード",
+    "core.ui_settings.params.dateFormat.dayOfWeekText": "週の開始の曜日。",
     "core.ui_settings.params.dateFormat.dayOfWeekTitle": "曜日",
     "core.ui_settings.params.dateFormat.optionsLinkText": "フォーマット",
     "core.ui_settings.params.dateFormat.scaled.intervalsLinkText": "ISO8601間隔",
     "core.ui_settings.params.dateFormat.scaledText": "時間ベースのデータが順番にレンダリングされ、フォーマットされたタイムスタンプが測定値の間隔に適応すべき状況で使用されるフォーマットを定義する値です。キーは{intervalsLink}です。",
     "core.ui_settings.params.dateFormat.scaledTitle": "スケーリングされたデータフォーマットです",
     "core.ui_settings.params.dateFormat.timezone.invalidValidationMessage": "無効なタイムゾーン：{timezone}",
+    "core.ui_settings.params.dateFormat.timezoneText": "デフォルトタイムゾーン。",
+    "core.ui_settings.params.dateFormat.timezoneTitle": "タイムゾーン",
+    "core.ui_settings.params.dateFormatText": "適切な書式の日付の{formatLink}。",
     "core.ui_settings.params.dateFormatTitle": "データフォーマット",
     "core.ui_settings.params.dateNanosFormatTitle": "ナノ秒フォーマットでの日付",
     "core.ui_settings.params.dateNanosLinkTitle": "date_nanos",
@@ -1607,6 +1809,9 @@
     "core.ui.primaryNav.screenReaderLabel": "プライマリ",
     "core.ui.primaryNav.toggleNavAriaLabel": "プライマリナビゲーションを切り替える",
     "core.ui.primaryNavSection.screenReaderLabel": "プライマリナビゲーションリンク、{category}",
+    "core.ui.publicBaseUrlWarning.configRecommendedDescription": "本番環境では、{configKey}を構成することをお勧めします。",
+    "core.ui.publicBaseUrlWarning.configRecommendedTitle": "構成が推奨されます",
+    "core.ui.publicBaseUrlWarning.learnMoreLinkLabel": "詳細情報",
     "core.ui.publicBaseUrlWarning.muteWarningButtonLabel": "ミュート警告",
     "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}、タイプ：{pageType}",
     "core.ui.recentlyViewed": "最近閲覧",
@@ -1864,22 +2069,6 @@
     "data.inspector.table.tableLabel": "テーブル{index}",
     "data.inspector.table.tablesDescription": "合計で{tablesCount, plural, other  {# 個のテーブル} }があります",
     "data.inspector.table.tableSelectorLabel": "選択済み：",
-    "data.kueryAutocomplete.andOperatorDescription": "{bothArguments} が true であることを条件とする",
-    "data.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "両方の引数",
-    "data.kueryAutocomplete.equalOperatorDescription": "一部の値に{equals}",
-    "data.kueryAutocomplete.equalOperatorDescription.equalsText": "一致する",
-    "data.kueryAutocomplete.existOperatorDescription": "いずれかの形式中に{exists}",
-    "data.kueryAutocomplete.existOperatorDescription.existsText": "存在する",
-    "data.kueryAutocomplete.greaterThanOperatorDescription": "が一部の値{greaterThan}",
-    "data.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText": "より大きい",
-    "data.kueryAutocomplete.greaterThanOrEqualOperatorDescription": "が一部の値{greaterThanOrEqualTo}",
-    "data.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText": "よりも大きいまたは等しい",
-    "data.kueryAutocomplete.lessThanOperatorDescription": "が一部の値{lessThan}",
-    "data.kueryAutocomplete.lessThanOperatorDescription.lessThanText": "より小さい",
-    "data.kueryAutocomplete.lessThanOrEqualOperatorDescription": "が一部の値{lessThanOrEqualTo}",
-    "data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "より小さいまたは等しい",
-    "data.kueryAutocomplete.orOperatorDescription": "{oneOrMoreArguments} が true であることを条件とする",
-    "data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "1つ以上の引数",
     "data.painlessError.buttonTxt": "スクリプトを編集",
     "data.painlessError.painlessScriptedFieldErrorMessage": "インデックスパターン{indexPatternName}でのランタイムフィールドまたはスクリプトフィールドの実行エラー",
     "data.parseEsInterval.invalidEsCalendarIntervalErrorMessage": "無効なカレンダー間隔：{interval}、1よりも大きな値が必要です",
@@ -1892,6 +2081,7 @@
     "data.search.aggs.buckets.dateHistogram.dropPartials.help": "このアグリゲーションでdrop_partialsを使用するかどうかを指定します",
     "data.search.aggs.buckets.dateHistogram.enabled.help": "このアグリゲーションが有効かどうかを指定します",
     "data.search.aggs.buckets.dateHistogram.extendedBounds.help": "extended_bounds設定を使用すると、強制的にヒストグラムアグリゲーションを実行し、特定の最小値に対してバケットの作成を開始し、最大値までバケットを作成し続けます。 ",
+    "data.search.aggs.buckets.dateHistogram.extendToTimeRange.help": "拡張された境界を現在適用されている時間範囲に自動設定します。extended_boundsが設定されている場合は無視",
     "data.search.aggs.buckets.dateHistogram.field.help": "このアグリゲーションで使用するフィールド",
     "data.search.aggs.buckets.dateHistogram.format.help": "このアグリゲーションで使用するフォーマット",
     "data.search.aggs.buckets.dateHistogram.id.help": "このアグリゲーションのID",
@@ -1956,6 +2146,7 @@
     "data.search.aggs.buckets.geoTile.schema.help": "このアグリゲーションで使用するスキーマ",
     "data.search.aggs.buckets.geoTile.useGeocentroid.help": "このアグリゲーションでgeocentroid使用するかどうかを指定します",
     "data.search.aggs.buckets.geotileGridTitle": "ジオタイル",
+    "data.search.aggs.buckets.histogram.autoExtendBounds.help": "True に設定すると、境界をデータの領域まで拡張します。これにより、境界内の各間隔バケットが確実に個別のテーブル行を作成します",
     "data.search.aggs.buckets.histogram.customLabel.help": "このアグリゲーションのカスタムラベルを表します",
     "data.search.aggs.buckets.histogram.enabled.help": "このアグリゲーションが有効かどうかを指定します",
     "data.search.aggs.buckets.histogram.extendedBounds.help": "extended_bounds設定を使用すると、強制的にヒストグラムアグリゲーションを実行し、特定の最小値に対してバケットの作成を開始し、最大値までバケットを作成し続けます。 ",
@@ -2122,6 +2313,7 @@
     "data.search.aggs.function.metrics.std_deviation.help": "標準偏差アグリゲーションのシリアル化されたアグリゲーション構成を生成します",
     "data.search.aggs.function.metrics.sum.help": "合計値アグリゲーションのシリアル化されたアグリゲーション構成を生成します",
     "data.search.aggs.function.metrics.top_hit.help": "上位一致のシリアル化されたアグリゲーション構成を生成します",
+    "data.search.aggs.function.metrics.topMetrics.help": "上位メトリックのシリアル化されたアグリゲーション構成を生成します。",
     "data.search.aggs.histogram.missingMaxMinValuesWarning": "自動スケールヒストグラムバケットから最高値と最低値を取得できません。これによりビジュアライゼーションのパフォーマンスが低下する可能性があります。",
     "data.search.aggs.metrics.averageBucketTitle": "平均バケット",
     "data.search.aggs.metrics.averageLabel": "平均 {field}",
@@ -2192,6 +2384,7 @@
     "data.search.aggs.metrics.derivative.schema.help": "このアグリゲーションで使用するスキーマ",
     "data.search.aggs.metrics.derivativeLabel": "派生",
     "data.search.aggs.metrics.derivativeTitle": "派生",
+    "data.search.aggs.metrics.emptyAsNull.help": "True に設定すると、結果データテーブルで欠損値がヌルとして処理されます。False に設定すると、ゼロが入力されます",
     "data.search.aggs.metrics.filtered_metric.customBucket.help": "兄弟パイプラインアグリゲーションを構築するために使用するアグリゲーション構成フィルターアグリゲーションでなければなりません",
     "data.search.aggs.metrics.filtered_metric.customLabel.help": "このアグリゲーションのカスタムラベルを表します",
     "data.search.aggs.metrics.filtered_metric.customMetric.help": "兄弟パイプラインアグリゲーションを構築するために使用するアグリゲーション構成",
@@ -2340,6 +2533,22 @@
     "data.search.aggs.metrics.topHit.minLabel": "最低",
     "data.search.aggs.metrics.topHit.sumLabel": "合計",
     "data.search.aggs.metrics.topHitTitle": "トップヒット",
+    "data.search.aggs.metrics.topMetrics.ascendingLabel": "昇順",
+    "data.search.aggs.metrics.topMetrics.ascNoSizeLabel": "\"{sortField}\"順の最初の\"{fieldName}\"値",
+    "data.search.aggs.metrics.topMetrics.ascWithSizeLabel": "\"{sortField}\"順の最初の{size} \"{fieldName}\"値",
+    "data.search.aggs.metrics.topMetrics.customLabel.help": "このアグリゲーションのカスタムラベルを表します",
+    "data.search.aggs.metrics.topMetrics.descendingLabel": "降順",
+    "data.search.aggs.metrics.topMetrics.descNoSizeLabel": "\"{sortField}\"順の最後の\"{fieldName}\"値",
+    "data.search.aggs.metrics.topMetrics.descWithSizeLabel": "\"{sortField}\"順の最後の{size} \"{fieldName}\"値",
+    "data.search.aggs.metrics.topMetrics.enabled.help": "このアグリゲーションが有効かどうかを指定します",
+    "data.search.aggs.metrics.topMetrics.field.help": "このアグリゲーションで使用するフィールド",
+    "data.search.aggs.metrics.topMetrics.id.help": "このアグリゲーションのID",
+    "data.search.aggs.metrics.topMetrics.json.help": "アグリゲーションがElasticsearchに送信されるときに含める高度なJSON",
+    "data.search.aggs.metrics.topMetrics.schema.help": "このアグリゲーションで使用するスキーマ",
+    "data.search.aggs.metrics.topMetrics.size.help": "取得する上位の値の数",
+    "data.search.aggs.metrics.topMetrics.sortField.help": "結果を並べ替える基準のフィールド",
+    "data.search.aggs.metrics.topMetrics.sortOrder.help": "結果を返す順序：昇順または降順",
+    "data.search.aggs.metrics.topMetricsTitle": "上位メトリック",
     "data.search.aggs.metrics.uniqueCountLabel": "{field} のユニークカウント",
     "data.search.aggs.metrics.uniqueCountTitle": "ユニークカウント",
     "data.search.aggs.otherBucket.labelForMissingValuesLabel": "欠測値のラベル",
@@ -2531,6 +2740,7 @@
     "discover.advancedSettings.defaultColumnsText": "デフォルトでDiscoverアプリに表示される列。空の場合、ドキュメントの概要が表示されます。",
     "discover.advancedSettings.defaultColumnsTitle": "デフォルトの列",
     "discover.advancedSettings.disableDocumentExplorer": "ドキュメントエクスプローラーまたはクラシックビュー",
+    "discover.advancedSettings.disableDocumentExplorerDescription": "クラシックビューではなく、新しい{documentExplorerDocs}を使用するには、このオプションをオフにします。ドキュメントエクスプローラーでは、データの並べ替え、列のサイズ変更、全画面表示といった優れた機能を使用できます。",
     "discover.advancedSettings.discover.fieldStatisticsLinkText": "フィールド統計情報ビュー",
     "discover.advancedSettings.discover.modifyColumnsOnSwitchText": "新しいデータビューで使用できない列を削除します。",
     "discover.advancedSettings.discover.modifyColumnsOnSwitchTitle": "データビューを変更するときに列を修正",
@@ -2543,6 +2753,7 @@
     "discover.advancedSettings.discover.showMultifieldsDescription": "拡張ドキュメントビューに{multiFields}が表示されるかどうかを制御します。ほとんどの場合、マルチフィールドは元のフィールドと同じです。「searchFieldsFromSource」がオフのときにのみこのオプションを使用できます。",
     "discover.advancedSettings.docTableHideTimeColumnText": "Discover と、ダッシュボードのすべての保存された検索で、「時刻」列を非表示にします。",
     "discover.advancedSettings.docTableHideTimeColumnTitle": "「時刻」列を非表示",
+    "discover.advancedSettings.documentExplorerLinkText": "ドキュメントエクスプローラー",
     "discover.advancedSettings.fieldsPopularLimitText": "最も頻繁に使用されるフィールドのトップNを表示します",
     "discover.advancedSettings.fieldsPopularLimitTitle": "頻繁に使用されるフィールドの制限",
     "discover.advancedSettings.maxDocFieldsDisplayedText": "ドキュメント概要でレンダリングされるフィールドの最大数",
@@ -2603,8 +2814,14 @@
     "discover.doc.somethingWentWrongDescription": "{indexName}が見つかりません。",
     "discover.doc.somethingWentWrongDescriptionAddon": "インデックスが存在することを確認してください。",
     "discover.docExplorerCallout.closeButtonAriaLabel": "閉じる",
+    "discover.docExplorerCallout.documentExplorer": "ドキュメントエクスプローラー",
     "discover.docExplorerCallout.headerMessage": "より効率的な探索方法",
+    "discover.docExplorerCallout.learnMore": "詳細",
     "discover.docExplorerCallout.tryDocumentExplorer": "ドキュメントエクスプローラーを試す",
+    "discover.docExplorerUpdateCallout.closeButtonAriaLabel": "閉じる",
+    "discover.docExplorerUpdateCallout.documentExplorer": "ドキュメントエクスプローラー",
+    "discover.docExplorerUpdateCallout.fieldStatistics": "フィールド統計情報",
+    "discover.docExplorerUpdateCallout.headerMessage": "より効率的な探索方法",
     "discover.docTable.documentsNavigation": "ドキュメントナビゲーション",
     "discover.docTable.limitedSearchResultLabel": "{resultCount}件の結果のみが表示されます。検索結果を絞り込みます。",
     "discover.docTable.noResultsTitle": "結果が見つかりませんでした",
@@ -2661,6 +2878,7 @@
     "discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "インデックスがないフィールドまたは無視された値は検索できません",
     "discover.docViews.table.unpinFieldAriaLabel": "フィールドを固定解除",
     "discover.docViews.table.unpinFieldLabel": "フィールドを固定解除",
+    "discover.editVisualizationButton": "ビジュアライゼーションを編集",
     "discover.embeddable.inspectorRequestDataTitle": "データ",
     "discover.embeddable.inspectorRequestDescription": "このリクエストはElasticsearchにクエリをかけ、検索データを取得します。",
     "discover.embeddable.search.displayName": "検索",
@@ -2731,6 +2949,7 @@
     "discover.fieldNameIcons.unknownFieldAriaLabel": "不明なフィールド",
     "discover.fieldNameIcons.versionFieldAriaLabel": "バージョンフィールド",
     "discover.goToDiscoverMainViewButtonText": "Discoverメインビューに移動",
+    "discover.grid.copyToClipBoardButton": "クリップボードにコピー",
     "discover.grid.documentHeader": "ドキュメント",
     "discover.grid.filterFor": "フィルター",
     "discover.grid.filterForAria": "この{value}でフィルターを適用",
@@ -2742,6 +2961,7 @@
     "discover.grid.flyout.toastFilterAdded": "フィルターが追加されました",
     "discover.grid.tableRow.detailHeading": "拡張ドキュメント",
     "discover.grid.tableRow.viewSingleDocumentLinkTextSimple": "1つのドキュメント",
+    "discover.grid.tableRow.viewSurroundingDocumentsHover": "このドキュメントの前後に出現したドキュメントを検査します。周りのドキュメントビューでは、固定されたフィルターのみがアクティブのままです。",
     "discover.grid.tableRow.viewSurroundingDocumentsLinkTextSimple": "周りのドキュメント",
     "discover.grid.tableRow.viewText": "表示：",
     "discover.grid.viewDoc": "詳細ダイアログを切り替え",
@@ -2953,12 +3173,48 @@
     "esUi.formWizard.saveButtonLabel": "保存",
     "esUi.formWizard.savingButtonLabel": "保存中...",
     "esUi.validation.string.invalidJSONError": "無効なJSON",
+    "esUi.viewApiRequest.closeButtonLabel": "閉じる",
+    "esUi.viewApiRequest.copyToClipboardButton": "クリップボードにコピー",
+    "esUi.viewApiRequest.openInConsoleButton": "コンソールで開く",
+    "eventAnnotation.group.args.annotationConfigs": "注釈構成",
+    "eventAnnotation.group.description": "イベント注釈グループ",
+    "eventAnnotation.manualAnnotation.args.color": "行の色",
+    "eventAnnotation.manualAnnotation.args.icon": "注釈行で使用される任意のアイコン",
+    "eventAnnotation.manualAnnotation.args.isHidden": "注釈を非表示",
+    "eventAnnotation.manualAnnotation.args.label": "注釈の名前",
+    "eventAnnotation.manualAnnotation.args.lineStyle": "注釈行のスタイル",
+    "eventAnnotation.manualAnnotation.args.lineWidth": "注釈行の幅",
+    "eventAnnotation.manualAnnotation.args.textVisibility": "注釈行のラベルの表示",
+    "eventAnnotation.manualAnnotation.args.time": "注釈のタイムスタンプ",
+    "eventAnnotation.manualAnnotation.description": "手動注釈の構成",
     "expressionError.errorComponent.description": "表現が失敗し次のメッセージが返されました：",
     "expressionError.errorComponent.title": "おっと！表現が失敗しました",
     "expressionError.renderer.debug.displayName": "デバッグ",
     "expressionError.renderer.debug.helpDescription": "デバッグアウトプットをフォーマットされた {JSON} としてレンダリングします",
     "expressionError.renderer.error.displayName": "エラー情報",
     "expressionError.renderer.error.helpDescription": "エラーデータをユーザーにわかるようにレンダリングします",
+    "expressionGauge.functions.gauge.args.centralMajor.help": "グラフ内に表示されるゲージグラフのcentralMajorを指定します。",
+    "expressionGauge.functions.gauge.args.centralMajorMode.help": "centralMajorのモードを指定します",
+    "expressionGauge.functions.gauge.args.colorMode.help": "パレットに設定した場合、パレットの色が帯に適用されます",
+    "expressionGauge.functions.gauge.args.commonLabel.help": "グラフ外の共通ラベルを指定します",
+    "expressionGauge.functions.gauge.args.goal.help": "目標値",
+    "expressionGauge.functions.gauge.args.labelMajor.help": "グラフ内に表示されるゲージグラフのlabelMajorを指定します。",
+    "expressionGauge.functions.gauge.args.labelMajorMode.help": "labelMajorのモードを指定します",
+    "expressionGauge.functions.gauge.args.labelMinor.help": "ゲージグラフのlabelMinorを指定します",
+    "expressionGauge.functions.gauge.args.max.help": "最高値",
+    "expressionGauge.functions.gauge.args.metric.help": "現在の値",
+    "expressionGauge.functions.gauge.args.min.help": "最小値",
+    "expressionGauge.functions.gauge.args.palette.help": "値の色を指定します",
+    "expressionGauge.functions.gauge.args.shape.help": "ゲージグラフのタイプ",
+    "expressionGauge.functions.gauge.args.ticksPosition.help": "目盛の配置を指定します",
+    "expressionGauge.functions.gauge.errors.centralMajorNotSupportedForShapeError": "\"centralMajor\" および \"centralMajorMode\" フィールドは図形 \"{shape}\" でサポートされていません",
+    "expressionGauge.functions.gauge.help": "ゲージビジュアライゼーション",
+    "expressionGauge.functions.gauge.percentageMode.help": "相対割合モードを有効にします",
+    "expressionGauge.functions.gaugeChart.config.ariaLabel.help": "ゲージグラフのariaラベルを指定します",
+    "expressionGauge.logDatatable.goal": "ゴール",
+    "expressionGauge.logDatatable.max": "最高",
+    "expressionGauge.logDatatable.metric": "メトリック",
+    "expressionGauge.logDatatable.min": "最低",
     "expressionGauge.renderer.chartCannotRenderEqual": "最小値と最大値を同じにすることはできません",
     "expressionGauge.renderer.chartCannotRenderMinGreaterMax": "最小値は最大値以下でなければなりません",
     "expressionGauge.renderer.visualizationName": "ゲージ",
@@ -2978,6 +3234,7 @@
     "expressionHeatmap.function.args.legend.maxLines.help": "凡例項目ごとの行数を指定します。",
     "expressionHeatmap.function.args.legend.position.help": "凡例の配置を指定します。",
     "expressionHeatmap.function.args.legend.shouldTruncate.help": "凡例項目を切り捨てるかどうかを指定します。",
+    "expressionHeatmap.function.args.legendSize.help": "凡例サイズをピクセルで指定します。",
     "expressionHeatmap.function.args.splitColumnAccessorHelpText": "分割された列または対応するディメンションのID",
     "expressionHeatmap.function.args.splitRowAccessorHelpText": "分割された行または対応するディメンションのID",
     "expressionHeatmap.function.args.valueAccessorHelpText": "値列または対応するディメンションのID",
@@ -2993,6 +3250,7 @@
     "expressionHeatmap.function.legendConfig.help": "チャートの凡例を構成します。",
     "expressionHeatmap.function.palette.help": "境界に基づく値の色を指定します。",
     "expressionHeatmap.function.percentageMode.help": "オンにすると、ツールチップと凡例が割合として表示されます。",
+    "expressionHeatmap.functions.args.ariaLabelHelpText": "ヒートマップのariaラベルを指定します",
     "expressionHeatmap.visualizationName": "ヒートマップ",
     "expressionImage.functions.image.args.dataurlHelpText": "画像の {https} {URL} または {BASE64} データ {URL} です。",
     "expressionImage.functions.image.args.modeHelpText": "{contain} はサイズに合わせて拡大・縮小して画像全体を表示し、{cover} はコンテナーを画像で埋め、必要に応じて両端や下をクロップします。{stretch} は画像の高さと幅をコンテナーの 100% になるよう変更します。",
@@ -3007,16 +3265,64 @@
     "expressionMetric.functions.metricHelpText": "ラベルの上に数字を表示します。",
     "expressionMetric.renderer.metric.displayName": "メトリック",
     "expressionMetric.renderer.metric.helpDescription": "ラベルの上に数字をレンダリングします",
+    "expressionMetricVis.function.autoScale.help": "自動スケールを有効にする",
     "expressionMetricVis.function.bucket.help": "バケットディメンションの構成です。",
+    "expressionMetricVis.function.colorFullBackground.help": "選択した背景色をビジュアライゼーションコンテナー全体に適用します",
     "expressionMetricVis.function.colorMode.help": "色を変更するメトリックの部分",
     "expressionMetricVis.function.dimension.metric": "メトリック",
     "expressionMetricVis.function.dimension.splitGroup": "グループを分割",
+    "expressionMetricVis.function.errors.severalMetricsAndColorFullBackgroundSpecified": "全体の背景色は複数のメトリックがあるビジュアライゼーションには適用できません。",
+    "expressionMetricVis.function.errors.splitByBucketAndColorFullBackgroundSpecified": "全体の背景色はバケットが指定されたビジュアライゼーションには適用できません。",
     "expressionMetricVis.function.font.help": "フォント設定です。",
     "expressionMetricVis.function.help": "メトリックビジュアライゼーション",
+    "expressionMetricVis.function.labelFont.help": "ラベルフォント設定です。",
+    "expressionMetricVis.function.labelPosition.help": "ラベル位置",
     "expressionMetricVis.function.metric.help": "メトリックディメンションの構成です。",
     "expressionMetricVis.function.palette.help": "境界に基づく値の色を指定します。",
     "expressionMetricVis.function.percentageMode.help": "百分率モードでメトリックを表示します。colorRange を設定する必要があります。",
     "expressionMetricVis.function.showLabels.help": "メトリック値の下にラベルを表示します。",
+    "expressionPartitionVis.legend.filterForValueButtonAriaLabel": "値でフィルター",
+    "expressionPartitionVis.legend.filterOptionsLegend": "{legendDataLabel}、フィルターオプション",
+    "expressionPartitionVis.legend.filterOutValueButtonAriaLabel": "値を除外",
+    "expressionPartitionVis.negativeValuesFound": "{chartType}グラフは負の値では表示できません。",
+    "expressionPartitionVis.partitionLabels.function.args.last_level.help": "マルチレイヤーの円/ドーナツグラフでのみ上位ラベルを表示",
+    "expressionPartitionVis.partitionLabels.function.args.percentDecimals.help": "割合として値に表示される10進数を定義します",
+    "expressionPartitionVis.partitionLabels.function.args.position.help": "ラベル位置を定義します",
+    "expressionPartitionVis.partitionLabels.function.args.show.help": "パーティショングラフラベルを表示します",
+    "expressionPartitionVis.partitionLabels.function.args.truncate.help": "マルチレイヤーの円/ドーナツグラフでのみスライス値が表示する文字数を定義します",
+    "expressionPartitionVis.partitionLabels.function.args.values.help": "スライス内の値を定義します",
+    "expressionPartitionVis.partitionLabels.function.args.valuesFormat.help": "値の形式を定義します",
+    "expressionPartitionVis.partitionLabels.function.help": "パーティションラベルオブジェクトを生成します",
+    "expressionPartitionVis.pieVis.function.args.distinctColorsHelpText": "スライスごとに異なる色をマッピングします。同じ値のスライスは同じ色になります",
+    "expressionPartitionVis.pieVis.function.help": "パイビジュアライゼーション",
+    "expressionPartitionVis.renderer.partitionVis.pie.displayName": "パーティションビジュアライゼーション",
+    "expressionPartitionVis.renderer.partitionVis.pie.helpDescription": "円/ドーナツ/ツリーマップ/モザイク/ワッフルグラフを表示",
+    "expressionPartitionVis.reusable.function.args.addTooltipHelpText": "スライスにカーソルを置いたときにツールチップを表示",
+    "expressionPartitionVis.reusable.function.args.bucketsHelpText": "バケットディメンション構成",
+    "expressionPartitionVis.reusable.function.args.emptySizeRatioHelpText": "ドーナツの内側の空の領域のサイズを定義します",
+    "expressionPartitionVis.reusable.function.args.isDonutHelpText": "円グラフをドーナツグラフとして表示します",
+    "expressionPartitionVis.reusable.function.args.labelsHelpText": "円グラフラベル構成",
+    "expressionPartitionVis.reusable.function.args.legendDisplayHelpText": "グラフ凡例を表示",
+    "expressionPartitionVis.reusable.function.args.legendPositionHelpText": "グラフの上、下、左、右に凡例を配置",
+    "expressionPartitionVis.reusable.function.args.legendSizeHelpText": "凡例サイズをピクセルで指定します",
+    "expressionPartitionVis.reusable.function.args.maxLegendLinesHelpText": "凡例項目ごとの行数を定義します",
+    "expressionPartitionVis.reusable.function.args.metricHelpText": "メトリックディメンション構成",
+    "expressionPartitionVis.reusable.function.args.nestedLegendHelpText": "詳細凡例を表示",
+    "expressionPartitionVis.reusable.function.args.paletteHelpText": "グラフパレット名を定義します",
+    "expressionPartitionVis.reusable.function.args.respectSourceOrderHelpText": "データソースから返された要素の順序を保持します",
+    "expressionPartitionVis.reusable.function.args.splitColumnHelpText": "列ディメンション構成で分割",
+    "expressionPartitionVis.reusable.function.args.splitRowHelpText": "行ディメンション構成で分割",
+    "expressionPartitionVis.reusable.function.args.startPlacementWithSecondLargestSliceHelpText": "2番目に大きいスライスで配置を開始します",
+    "expressionPartitionVis.reusable.function.args.truncateLegendHelpText": "凡例項目が切り捨てられるかどうかを定義します",
+    "expressionPartitionVis.reusable.function.dimension.buckets": "スライス",
+    "expressionPartitionVis.reusable.function.dimension.metric": "スライスサイズ",
+    "expressionPartitionVis.reusable.function.dimension.splitcolumn": "列分割",
+    "expressionPartitionVis.reusable.function.dimension.splitrow": "行分割",
+    "expressionPartitionVis.reusable.function.errors.moreThenNumberBuckets": "{maxLength}を超えるバケットはサポートされません",
+    "expressionPartitionVis.reusable.function.errors.splitRowAndColumnSpecified": "分割された行と列が指定されています。式は一度にいずれかのみをサポートしています。",
+    "expressionPartitionVis.reusable.functions.args.ariaLabelHelpText": "グラフのariaラベルを指定します",
+    "expressionPartitionVis.waffle.function.args.bucketHelpText": "バケットディメンション構成",
+    "expressionPartitionVis.waffle.function.args.showValuesInLegendHelpText": "凡例に値を表示",
     "expressionRepeatImage.error.repeatImage.missingMaxArgument": "{emptyImageArgument} を指定する場合は、{maxArgument} を設定する必要があります",
     "expressionRepeatImage.functions.repeatImage.args.emptyImageHelpText": "この画像のエレメントについて、{CONTEXT}および{maxArg}パラメーターの差異を解消します。画像アセットは{BASE64}データ{URL}として提供するか、部分式で渡します。",
     "expressionRepeatImage.functions.repeatImage.args.imageHelpText": "繰り返す画像です。画像アセットは{BASE64}データ{URL}として提供するか、部分式で渡します。",
@@ -3079,6 +3385,7 @@
     "expressions.functions.mathColumn.args.nameHelpText": "結果の列の名前です。名前は一意である必要はありません。",
     "expressions.functions.mathColumn.arrayValueError": "{name}で配列値に対する演算を実行できません",
     "expressions.functions.mathColumn.uniqueIdError": "IDは一意でなければなりません",
+    "expressions.functions.mathColumnHelpText": "各行で{tinymath}を評価して列を追加します。この関数は演算用に最適化され、{mapColumnFn}での演算式を使用するよりもパフォーマンスが高くなります。",
     "expressions.functions.mathHelpText": "{TYPE_NUMBER}または{DATATABLE}を{CONTEXT}として使用して、{TINYMATH}数式を解釈します。{DATATABLE}列は列名で表示されます。{CONTEXT}が数字の場合は、{value}と表示されます。",
     "expressions.functions.movingAverage.args.byHelpText": "移動平均計算を分割する列",
     "expressions.functions.movingAverage.args.inputColumnIdHelpText": "移動平均を計算する列",
@@ -3131,6 +3438,7 @@
     "expressionShape.renderer.shape.helpDescription": "基本的な図形をレンダリングします",
     "expressionTagcloud.feedbackMessage.tooSmallContainerDescription": "コンテナーが小さすぎてクラウド全体を表示できません。タグが切り取られたか省略されている可能性があります。",
     "expressionTagcloud.feedbackMessage.truncatedTagsDescription": "描写時間が長くなるのを防ぐため、タグの数が切り捨てられています。",
+    "expressionTagcloud.functions.tagcloud.args.ariaLabelHelpText": "tagcloudのariaラベルを指定します",
     "expressionTagcloud.functions.tagcloud.args.bucketHelpText": "バケットディメンションの構成です。",
     "expressionTagcloud.functions.tagcloud.args.maxFontSizeHelpText": "最大フォントサイズ",
     "expressionTagcloud.functions.tagcloud.args.metricHelpText": "メトリックディメンションの構成です。",
@@ -3146,6 +3454,107 @@
     "expressionTagcloud.functions.tagcloudHelpText": "Tagcloudのビジュアライゼーションです。",
     "expressionTagcloud.renderer.tagcloud.displayName": "Tag Cloudのビジュアライゼーションです",
     "expressionTagcloud.renderer.tagcloud.helpDescription": "Tag Cloudを表示",
+    "expressionXY.axisExtentConfig.extentMode.help": "範囲モード",
+    "expressionXY.axisExtentConfig.help": "xyグラフの軸範囲を構成",
+    "expressionXY.axisExtentConfig.lowerBound.help": "下界",
+    "expressionXY.axisExtentConfig.upperBound.help": "上界",
+    "expressionXY.axisTitlesVisibilityConfig.help": "xyグラフの軸タイトル表示を構成",
+    "expressionXY.axisTitlesVisibilityConfig.x.help": "x軸のタイトルを表示するかどうかを指定します。",
+    "expressionXY.axisTitlesVisibilityConfig.yLeft.help": "左y軸のタイトルを表示するかどうかを指定します。",
+    "expressionXY.axisTitlesVisibilityConfig.yRight.help": "右y軸のタイトルを表示するかどうかを指定します。",
+    "expressionXY.dataLayer.accessors.help": "y軸に表示する列。",
+    "expressionXY.dataLayer.columnToLabel.help": "ラベリングする列IDのJSONキー値のペア",
+    "expressionXY.dataLayer.help": "xyグラフでレイヤーを構成",
+    "expressionXY.dataLayer.hide.help": "軸を表示/非表示",
+    "expressionXY.dataLayer.isHistogram.help": "グラフをヒストグラムとしてレイアウトするかどうか",
+    "expressionXY.dataLayer.layerId.help": "レイヤーID",
+    "expressionXY.dataLayer.palette.help": "パレット",
+    "expressionXY.dataLayer.seriesType.help": "表示するグラフのタイプ。",
+    "expressionXY.dataLayer.splitAccessor.help": "分割の基準となる列",
+    "expressionXY.dataLayer.xAccessor.help": "X 軸",
+    "expressionXY.dataLayer.xScaleType.help": "x軸の目盛タイプ",
+    "expressionXY.dataLayer.yConfig.help": "y軸の詳細構成",
+    "expressionXY.dataLayer.yScaleType.help": "y軸の目盛タイプ",
+    "expressionXY.gridlinesConfig.help": "xyグラフのグリッド線表示を構成",
+    "expressionXY.gridlinesConfig.x.help": "x 軸のグリッド線を表示するかどうかを指定します。",
+    "expressionXY.gridlinesConfig.yLeft.help": "左y軸のグリッド線を表示するかどうかを指定します。",
+    "expressionXY.gridlinesConfig.yRight.help": "右y軸のグリッド線を表示するかどうかを指定します。",
+    "expressionXY.labelsOrientationConfig.help": "xyグラフのティックラベルの向きを構成",
+    "expressionXY.labelsOrientationConfig.x.help": "x軸のラベルの向きを指定します。",
+    "expressionXY.labelsOrientationConfig.yLeft.help": "左y軸のラベルの向きを指定します。",
+    "expressionXY.labelsOrientationConfig.yRight.help": "右y軸のラベルの向きを指定します。",
+    "expressionXY.legend.filterForValueButtonAriaLabel": "値でフィルター",
+    "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}、フィルターオプション",
+    "expressionXY.legend.filterOutValueButtonAriaLabel": "値を除外",
+    "expressionXY.legendConfig.floatingColumns.help": "凡例がグラフ内に表示されるときに列数を指定します。",
+    "expressionXY.legendConfig.help": "xyグラフの凡例を構成",
+    "expressionXY.legendConfig.horizontalAlignment.help": "凡例がグラフ内に表示されるときに凡例の横の配置を指定します。",
+    "expressionXY.legendConfig.isInside.help": "凡例がグラフ内に表示されるかどうかを指定します",
+    "expressionXY.legendConfig.isVisible.help": "判例の表示・非表示を指定します。",
+    "expressionXY.legendConfig.legendSize.help": "凡例サイズをピクセルで指定します。",
+    "expressionXY.legendConfig.maxLines.help": "凡例項目ごとの行数を指定します。",
+    "expressionXY.legendConfig.position.help": "凡例の配置を指定します。",
+    "expressionXY.legendConfig.shouldTruncate.help": "凡例項目が切り捨てられるかどうかを指定します",
+    "expressionXY.legendConfig.showSingleSeries.help": "エントリが1件の凡例を表示するかどうかを指定します",
+    "expressionXY.legendConfig.verticalAlignment.help": "凡例がグラフ内に表示されるときに凡例の縦の配置を指定します。",
+    "expressionXY.referenceLineLayer.accessors.help": "y軸に表示する列。",
+    "expressionXY.referenceLineLayer.columnToLabel.help": "ラベリングする列IDのJSONキー値のペア",
+    "expressionXY.referenceLineLayer.help": "xyグラフで基準線を構成",
+    "expressionXY.referenceLineLayer.layerId.help": "レイヤーID",
+    "expressionXY.referenceLineLayer.yConfig.help": "y軸の詳細構成",
+    "expressionXY.tickLabelsConfig.help": "xyグラフのティックラベルの表示を構成",
+    "expressionXY.tickLabelsConfig.x.help": "x軸の目盛ラベルを表示するかどうかを指定します。",
+    "expressionXY.tickLabelsConfig.yLeft.help": "左y軸の目盛ラベルを表示するかどうかを指定します。",
+    "expressionXY.tickLabelsConfig.yRight.help": "右y軸の目盛ラベルを表示するかどうかを指定します。",
+    "expressionXY.xyChart.emptyXLabel": "（空）",
+    "expressionXY.xyChart.iconSelect.alertIconLabel": "アラート",
+    "expressionXY.xyChart.iconSelect.asteriskIconLabel": "アスタリスク",
+    "expressionXY.xyChart.iconSelect.bellIconLabel": "ベル",
+    "expressionXY.xyChart.iconSelect.boltIconLabel": "ボルト",
+    "expressionXY.xyChart.iconSelect.bugIconLabel": "バグ",
+    "expressionXY.xyChart.iconSelect.circleIconLabel": "円",
+    "expressionXY.xyChart.iconSelect.commentIconLabel": "コメント",
+    "expressionXY.xyChart.iconSelect.flagIconLabel": "旗",
+    "expressionXY.xyChart.iconSelect.heartLabel": "ハート",
+    "expressionXY.xyChart.iconSelect.mapMarkerLabel": "マップマーカー",
+    "expressionXY.xyChart.iconSelect.mapPinLabel": "マップピン",
+    "expressionXY.xyChart.iconSelect.starLabel": "星",
+    "expressionXY.xyChart.iconSelect.tagIconLabel": "タグ",
+    "expressionXY.xyChart.iconSelect.triangleIconLabel": "三角形",
+    "expressionXY.xyVis.ariaLabel.help": "xyグラフのariaラベルを指定します",
+    "expressionXY.xyVis.axisTitlesVisibilitySettings.help": "xおよびy軸のタイトルを表示",
+    "expressionXY.xyVis.curveType.help": "折れ線グラフで曲線タイプをレンダリングする方法を定義します",
+    "expressionXY.xyVis.endValue.help": "終了値",
+    "expressionXY.xyVis.fillOpacity.help": "エリアグラフの塗りつぶしの透明度を定義",
+    "expressionXY.xyVis.fittingFunction.help": "欠測値の処理方法を定義",
+    "expressionXY.xyVis.gridlinesVisibilitySettings.help": "xおよびy軸のグリッド線を表示",
+    "expressionXY.xyVis.help": "X/Y チャート",
+    "expressionXY.xyVis.hideEndzones.help": "部分データの終了ゾーンマーカーを非表示",
+    "expressionXY.xyVis.labelsOrientation.help": "軸ラベルの回転を定義します",
+    "expressionXY.xyVis.layers.help": "視覚的な系列のレイヤー",
+    "expressionXY.xyVis.legend.help": "チャートの凡例を構成します。",
+    "expressionXY.xyVis.logDatatable.breakDown": "内訳の基準",
+    "expressionXY.xyVis.logDatatable.metric": "縦軸",
+    "expressionXY.xyVis.logDatatable.x": "横軸",
+    "expressionXY.xyVis.renderer.help": "X/Y チャートを再レンダリング",
+    "expressionXY.xyVis.tickLabelsVisibilitySettings.help": "xおよびy軸の目盛ラベルを表示",
+    "expressionXY.xyVis.valueLabels.help": "値ラベルモード",
+    "expressionXY.xyVis.valuesInLegend.help": "凡例に値を表示",
+    "expressionXY.xyVis.xTitle.help": "x軸のタイトル",
+    "expressionXY.xyVis.yLeftExtent.help": "Y左軸範囲",
+    "expressionXY.xyVis.yLeftTitle.help": "左y軸のタイトル",
+    "expressionXY.xyVis.yRightExtent.help": "Y右軸範囲",
+    "expressionXY.xyVis.yRightTitle.help": "右 y 軸のタイトル",
+    "expressionXY.yConfig.axisMode.help": "メトリックの軸モード",
+    "expressionXY.yConfig.color.help": "系列の色",
+    "expressionXY.yConfig.fill.help": "塗りつぶし",
+    "expressionXY.yConfig.forAccessor.help": "この構成のアクセサー",
+    "expressionXY.yConfig.help": "xyグラフのy軸メトリックの動作を構成",
+    "expressionXY.yConfig.icon.help": "基準線で使用される任意のアイコン",
+    "expressionXY.yConfig.iconPosition.help": "基準線のアイコンの配置",
+    "expressionXY.yConfig.lineStyle.help": "基準線のスタイル",
+    "expressionXY.yConfig.lineWidth.help": "基準線の幅",
+    "expressionXY.yConfig.textVisibility.help": "基準線のラベルの表示",
     "fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数字フォーマット",
     "fieldFormats.advancedSettings.format.bytesFormatText": "「バイト」フォーマットのデフォルト{numeralFormatLink}です",
     "fieldFormats.advancedSettings.format.bytesFormatTitle": "バイトフォーマット",
@@ -4063,6 +4472,7 @@
     "home.tutorials.zscalerLogs.shortDescription": "Filebeatを使用してZscaler NSSからログを収集して解析します。",
     "home.welcomeTitle": "Elasticへようこそ",
     "indexPatternEditor.aliasLabel": "エイリアス",
+    "indexPatternEditor.createDataView.emptyState.createAnywayLink": "非表示のシステムまたはデフォルトインデックスに対してデータビューを作成します。",
     "indexPatternEditor.createIndex.noMatch": "名前は1つ以上のデータストリーム、インデックス、またはインデックスエイリアスと一致する必要があります。",
     "indexPatternEditor.createIndexPattern.emptyState.checkDataButton": "新規データを確認",
     "indexPatternEditor.createIndexPattern.emptyState.createAnywayTxt": "{link}もできます。",
@@ -4285,9 +4695,18 @@
     "indexPatternManagement.dataViews.badge.readOnly.tooltip": "データビューの保存に失敗しました",
     "indexPatternManagement.dataViews.createBreadcrumb": "データビューを作成",
     "indexPatternManagement.dataViews.listBreadcrumb": "データビュー",
+    "indexPatternManagement.dataViewTable.columnDelete": "削除",
+    "indexPatternManagement.dataViewTable.columnDeleteDescription": "このデータビューを削除",
     "indexPatternManagement.dataViewTable.createBtn": "データビューを作成",
+    "indexPatternManagement.dataViewTable.dataViewColumnName": "データビュー",
+    "indexPatternManagement.dataViewTable.deleteButtonLabel": "{selectedItems, number} {selectedItems, plural, other {個のデータビュー} }を削除",
+    "indexPatternManagement.dataViewTable.deleteConfirmSummary": "{count, number} {count, plural, other {個のデータビュー} }を完全に削除します。",
     "indexPatternManagement.dataViewTable.indexPatternExplanation": "Elasticsearchからのデータの取得に役立つデータビューを作成して管理します。",
     "indexPatternManagement.dataViewTable.nameColumn": "名前",
+    "indexPatternManagement.dataViewTable.spaceCountAll": "すべて",
+    "indexPatternManagement.dataViewTable.spacesColumn": "スペース",
+    "indexPatternManagement.dataViewTable.spacesColumnName": "スペース",
+    "indexPatternManagement.dataViewTable.tableTitle": "削除対象として選択されたデータビュー",
     "indexPatternManagement.dataViewTable.title": "データビュー",
     "indexPatternManagement.defaultFormatDropDown": "- デフォルト -",
     "indexPatternManagement.defaultFormatHeader": "フォーマット（デフォルト：{defaultFormat}）",
@@ -4299,7 +4718,9 @@
     "indexPatternManagement.deleteFieldLabel": "削除されたフィールドは復元できません。{separator}続行してよろしいですか？",
     "indexPatternManagement.disabledCallOutHeader": "スクリプティングが無効です",
     "indexPatternManagement.disabledCallOutLabel": "Elasticsearchでのすべてのインラインスクリプティングが無効になっています。Kibanaでスクリプトフィールドを使用するには、インラインスクリプティングを有効にする必要があります。",
-    "indexPatternManagement.editDataView.deleteHeader": "データビューを削除しますか?",
+    "indexPatternManagement.editDataView.deleteHeader": "データビューを削除",
+    "indexPatternManagement.editDataView.deleteWarning": "データビュー{dataViewName}は削除されます。この操作は元に戻すことができません。",
+    "indexPatternManagement.editDataView.deleteWarningWithNamespaces": "共有されているすべてのスペースからデータビュー{dataViewName}を削除します。この操作は元に戻すことができません。",
     "indexPatternManagement.editDataView.detailsAria": "データビュー詳細",
     "indexPatternManagement.editDataView.fields.table.conflictType": "競合",
     "indexPatternManagement.editDataView.fields.table.runtimeIconTipText": "このフィールドはデータビューにのみ存在します。",
@@ -4316,8 +4737,15 @@
     "indexPatternManagement.editIndexPattern.fields.conflictModal.closeBtn": "閉じる",
     "indexPatternManagement.editIndexPattern.fields.conflictModal.description": "{fieldName}フィールドの型がインデックス全体で変更され、検索、視覚化、他の分析で使用できない可能性があります。",
     "indexPatternManagement.editIndexPattern.fields.conflictModal.title": "このフィールドは型が競合しています",
+    "indexPatternManagement.editIndexPattern.fields.filter": "フィールド型",
     "indexPatternManagement.editIndexPattern.fields.filterAria": "フィールドタイプをフィルター",
     "indexPatternManagement.editIndexPattern.fields.filterPlaceholder": "検索",
+    "indexPatternManagement.editIndexPattern.fields.indexed": "インデックス作成済み",
+    "indexPatternManagement.editIndexPattern.fields.runtime": "ランタイム",
+    "indexPatternManagement.editIndexPattern.fields.schema": "スキーマタイプ",
+    "indexPatternManagement.editIndexPattern.fields.schemaAria": "スキーマフィールドのフィルター",
+    "indexPatternManagement.editIndexPattern.fields.scriptedFieldFilter": "すべての言語",
+    "indexPatternManagement.editIndexPattern.fields.scriptedFieldFilterAria": "スクリプト化されたフィールド言語のフィルター",
     "indexPatternManagement.editIndexPattern.fields.searchAria": "検索フィールド",
     "indexPatternManagement.editIndexPattern.fields.table.additionalInfoAriaLabel": "追加フィールド情報",
     "indexPatternManagement.editIndexPattern.fields.table.aggregatableDescription": "これらのフィールドはビジュアライゼーションの集約に使用できます",
@@ -4401,6 +4829,7 @@
     "indexPatternManagement.indexPatterns.badge.readOnly.text": "読み取り専用",
     "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "フィールドを作成",
     "indexPatternManagement.indexPatternTable.badge.securityDataViewTitle": "セキュリティデータビュー",
+    "indexPatternManagement.indexPatternTable.savedObjectName": "データビュー",
     "indexPatternManagement.labelHelpText": "このフィールドが Discover、Maps、Visualize に表示されるときに使用するカスタムラベルを設定します。現在、クエリとフィルターはカスタムラベルをサポートせず、元のフィールド名が使用されます。",
     "indexPatternManagement.languageLabel": "言語",
     "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict} {fieldName}というフィールドはすでに存在します。スクリプトフィールドに同じ名前を付けると、同時に両方のフィールドにクエリが実行できなくなります。",
@@ -4512,6 +4941,7 @@
     "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "これは通常、データを取得する必要がないか、エレメントがまだデータの取得を開始していないことを意味します。",
     "inspector.requests.noRequestsLoggedTitle": "リクエストが記録されていません",
     "inspector.requests.openInConsoleLabel": "コンソールで開く",
+    "inspector.requests.openInSearchProfilerLabel": "検索プロファイラーで開く",
     "inspector.requests.requestFailedTooltipTitle": "リクエストに失敗しました",
     "inspector.requests.requestInProgressAriaLabel": "リクエストが進行中",
     "inspector.requests.requestsDescriptionTooltip": "データを収集したリクエストを表示します",
@@ -4685,6 +5115,7 @@
     "lists.exceptions.isNotOperatorLabel": "is not",
     "lists.exceptions.isOneOfOperatorLabel": "is one of",
     "lists.exceptions.isOperatorLabel": "is",
+    "lists.exceptions.matchesOperatorLabel": "一致",
     "management.breadcrumb": "スタック管理",
     "management.landing.header": "Stack Management {version}へようこそ",
     "management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibanaの設定、その他を管理します。",
@@ -4844,14 +5275,14 @@
     "savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "保存されたオブジェクトのインポート",
     "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "すべての変更を確定",
     "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完了",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新規インデックスパターンを作成",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないインデックスパターンを使用しています。関連付け直す別のインデックスパターンを選択してください。必要に応じて、{indexPatternLink}できます。",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "インデックスパターンの矛盾",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新しいデータビューを作成",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないデータビューを使用しています。もう一度関連付けするデータビューを選択してください。必要に応じて、{indexPatternLink}できます。",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "データビューの競合",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
-    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンのIDです",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "データビューのID",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新規インデックスパターン",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新しいデータビュー",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "影響されるオブジェクトのサンプル",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "影響されるオブジェクトのサンプル",
     "savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "インポートするファイルを選択してください",
@@ -4914,16 +5345,22 @@
     "savedObjectsManagement.objectsTable.unableFindSavedObjectNotificationMessage": "保存されたオブジェクトが見つかりません",
     "savedObjectsManagement.objectsTable.unableFindSavedObjectsNotificationMessage": "保存されたオブジェクトが見つかりません",
     "savedObjectsManagement.objectView.unableFindSavedObjectNotificationMessage": "保存されたオブジェクトが見つかりません",
-    "savedObjectsManagement.shareToSpace.actionDescription": "この保存されたオブジェクトを1つ以上のスペースと共有します。",
-    "savedObjectsManagement.shareToSpace.actionTitle": "スペースと共有",
-    "savedObjectsManagement.shareToSpace.columnDescription": "このオブジェクトが現在共有されている他のスペース",
-    "savedObjectsManagement.shareToSpace.columnTitle": "共有されているスペース",
+    "savedObjectsManagement.shareToSpace.actionDescription": "このオブジェクトが割り当てられているスペースを変更",
+    "savedObjectsManagement.shareToSpace.actionTitle": "スペースの割り当て",
+    "savedObjectsManagement.shareToSpace.columnDescription": "このオブジェクトが現在割り当てられている他のスペース",
+    "savedObjectsManagement.shareToSpace.columnTitle": "スペース",
+    "savedObjectsManagement.shareToSpace.globalObjectTypeContent": "この保存されたオブジェクトはすべてのスペースで使用可能であり、変更できません。",
+    "savedObjectsManagement.shareToSpace.globalObjectTypeTitle": "グローバル保存されたオブジェクト",
+    "savedObjectsManagement.shareToSpace.isolatedObjectTypeContent": "この保存されたオブジェクトは1つのスペースでのみ使用可能であり、複数のスペースに割り当てられません。",
+    "savedObjectsManagement.shareToSpace.isolatedObjectTypeTitle": "分離した保存されたオブジェクト",
+    "savedObjectsManagement.shareToSpace.shareableSoonObjectTypeContent": "この保存されたオブジェクトは1つのスペースでのみ使用できます。今後のリリースでは複数のスペースに割り当てられます。",
+    "savedObjectsManagement.shareToSpace.shareableSoonObjectTypeTitle": "まもなくリリース保存されたオブジェクトを複数のスペースに割り当て",
     "savedObjectsManagement.view.copyToClipboardLabel": "クリップボードにコピー",
     "savedObjectsManagement.view.deleteItemButtonLabel": "削除",
-    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "このオブジェクトに関連付けられたフィールドは、現在このインデックスパターンに存在しません。",
+    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "このオブジェクトに関連付けられたフィールドは、現在このデータビューに存在しません。",
     "savedObjectsManagement.view.howToFixErrorDescription": "このエラーの原因がわかる場合は、{savedObjectsApis}を使用して修正できます。わからない場合は、上の削除ボタンをクリックしてください。",
     "savedObjectsManagement.view.howToFixErrorDescriptionLinkText": "保存済みオブジェクトAPI",
-    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "このオブジェクトに関連付けられたインデックスパターンは現在存在しません。",
+    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "このオブジェクトに関連付けられたデータビューは現在存在しません。",
     "savedObjectsManagement.view.inspectCodeEditorAriaLabel": "{ title }の検査",
     "savedObjectsManagement.view.inspectItemTitle": "{title}の検査",
     "savedObjectsManagement.view.savedObjectProblemErrorMessage": "この保存されたオブジェクトに問題があります",
@@ -4959,8 +5396,18 @@
     "share.urlService.redirect.RedirectManager.missingParamLocator": "ロケｰターIDが指定されていません。URLで「l」検索パラメーターを指定します。これは既存のロケｰターIDにしてください。",
     "share.urlService.redirect.RedirectManager.missingParamParams": "ロケーターパラメーターが指定されていません。URLで「p」検索パラメーターを指定します。これはロケーターパラメーターのJSONシリアル化オブジェクトにしてください。",
     "share.urlService.redirect.RedirectManager.missingParamVersion": "ロケーターパラメーターバージョンが指定されていません。URLで「v」検索パラメーターを指定します。これはロケーターパラメーターが生成されたときのKibanaのリリースバージョンです。",
-    "sharedUXComponents.exitFullScreenButton.exitFullScreenModeButtonText": "全画面を終了",
-    "sharedUXComponents.exitFullScreenButton.fullScreenModeDescription": "ESC キーで全画面モードを終了します。",
+    "sharedUXComponents.noDataPage.elasticAgentCard.description": "Elasticエージェントを使用すると、シンプルで統一された方法でコンピューターからデータを収集するできます。",
+    "sharedUXComponents.noDataPage.elasticAgentCard.noPermission.description": "この統合はまだ有効ではありません。管理者にはオンにするために必要なアクセス権があります。",
+    "sharedUXComponents.noDataPage.elasticAgentCard.noPermission.title": "管理者にお問い合わせください",
+    "sharedUXComponents.noDataPage.elasticAgentCard.title": "Elasticエージェントの追加",
+    "sharedUXComponents.noDataViews.dataViewExplanation": "Kibanaでは、探索するデータストリーム、インデックス、インデックスエイリアスを特定するためにデータビューが必要です。データビューは、昨日のログデータなど特定のインデックス、またはログデータを含むすべてのインデックスを参照できます。",
+    "sharedUXComponents.noDataViews.learnMore": "詳細について",
+    "sharedUXComponents.noDataViews.nowCreate": "ここでデータビューを作成します。",
+    "sharedUXComponents.noDataViews.readDocumentation": "<b>ドキュメント</b><b>を読む</b>",
+    "sharedUXComponents.noDataViews.youHaveData": "Elasticsearchにデータがあります。",
+    "sharedUXComponents.noDataViewsPage.addDataViewText": "データビューを作成",
+    "sharedUXComponents.pageTemplate.noDataCard.description": "データを収集せずに続行",
+    "sharedUXComponents.toolbar.buttons.addFromLibrary.libraryButtonLabel": "ライブラリから追加",
     "telemetry.callout.appliesSettingTitle": "この設定に加えた変更は {allOfKibanaText} に適用され、自動的に保存されます。",
     "telemetry.callout.appliesSettingTitle.allOfKibanaText": "Kibana のすべて",
     "telemetry.callout.clusterStatisticsDescription": "これは収集される基本的なクラスター統計の例です。インデックス、シャード、ノードの数が含まれます。監視がオンになっているかどうかなどのハイレベルの使用統計も含まれます。",
@@ -4970,6 +5417,12 @@
     "telemetry.callout.errorUnprivilegedUserDescription": "暗号化されていないクラスター統計を表示するアクセス権がありません。",
     "telemetry.callout.errorUnprivilegedUserTitle": "クラスター統計の表示エラー",
     "telemetry.clusterData": "クラスターデータ",
+    "telemetry.dataManagementDisableCollection": " 収集を停止するには、",
+    "telemetry.dataManagementDisableCollectionLink": "ここで使用状況データを無効にします。",
+    "telemetry.dataManagementDisclaimerPrivacy": "使用状況データがどのように製品とサービスの管理と改善につながるのかに関する詳細については ",
+    "telemetry.dataManagementDisclaimerPrivacyLink": "プライバシーポリシーをご覧ください。",
+    "telemetry.dataManagementEnableCollection": " 収集を開始するには、",
+    "telemetry.dataManagementEnableCollectionLink": "ここで使用状況データを有効にします。",
     "telemetry.optInErrorToastText": "使用状況統計設定の設定中にエラーが発生しました。",
     "telemetry.optInErrorToastTitle": "エラー",
     "telemetry.optInNoticeSeenErrorTitle": "エラー",
@@ -4997,6 +5450,7 @@
     "timelion.expressionSuggestions.func.description.chainableHelpText": "連鎖可能",
     "timelion.expressionSuggestions.func.description.dataSourceHelpText": "データソース",
     "timelion.fitFunctions.carry.downSampleErrorMessage": "ダウンサンプルには「carry」フィットメソドを使用せず、「scale」または「average」を使用してください",
+    "timelion.function.args.ariaLabelHelpText": "Timelionのariaラベルを指定します",
     "timelion.function.help": "Timelion のビジュアライゼーションです。",
     "timelion.help.functions.absHelpText": "数列リストの各値の絶対値を返します",
     "timelion.help.functions.aggregate.args.functionHelpText": "{functions} の 1 つ",
@@ -5176,6 +5630,8 @@
     "uiActions.errors.incompatibleAction": "操作に互換性がありません",
     "uiActions.triggers.rowClickkDescription": "テーブル行をクリック",
     "uiActions.triggers.rowClickTitle": "テーブル行クリック",
+    "utils.filename.pathWarning": "パスの形式が正しくない可能性があります。値を検証してください",
+    "utils.filename.wildcardWarning": "ファイルパスでワイルドカードを使用すると、エンドポイントのパフォーマンスに影響する可能性があります",
     "visDefaultEditor.advancedToggle.advancedLinkLabel": "高度な設定",
     "visDefaultEditor.agg.disableAggButtonTooltip": "{schemaTitle} {aggTitle} アグリゲーションを無効にする",
     "visDefaultEditor.agg.enableAggButtonTooltip": "{schemaTitle} {aggTitle} アグリゲーションを有効にする",
@@ -5307,6 +5763,13 @@
     "visDefaultEditor.options.colorSchema.howToChangeColorsDescription": "それぞれの色は凡例で変更できます。",
     "visDefaultEditor.options.colorSchema.resetColorsButtonLabel": "色をリセット",
     "visDefaultEditor.options.colorSchema.reverseColorSchemaLabel": "図表を反転",
+    "visDefaultEditor.options.legendSizeSetting.label": "凡例サイズ",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.auto": "自動",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.extraLarge": "特大",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.large": "大",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.medium": "中",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.small": "小",
+    "visDefaultEditor.options.legendSizeSetting.legendVertical": "凡例を左または右に寄せる必要があります",
     "visDefaultEditor.options.longLegends.maxLegendLinesLabel": "最大凡例行",
     "visDefaultEditor.options.longLegends.truncateLegendTextLabel": "凡例テキストを切り捨てる",
     "visDefaultEditor.options.percentageMode.documentationLabel": "Numeral.jsドキュメント",
@@ -5337,6 +5800,38 @@
     "visDefaultEditor.sidebar.tabs.optionsLabel": "オプション",
     "visDefaultEditor.sidebar.updateChartButtonLabel": "更新",
     "visDefaultEditor.sidebar.updateInfoTooltip": "CTRL + Enterは更新のショートカットです。",
+    "visTypeGauge.advancedSettings.visualization.legacyGaugeChartsLibrary.description": "Visualizeでゲージグラフのレガシーグラフライブラリを有効にします。",
+    "visTypeGauge.advancedSettings.visualization.legacyGaugeChartsLibrary.name": "ゲージグラフのレガシーグラフライブラリ",
+    "visTypeGauge.controls.gaugeOptions.alignmentLabel": "アラインメント",
+    "visTypeGauge.controls.gaugeOptions.autoExtendRangeLabel": "範囲を自動拡張",
+    "visTypeGauge.controls.gaugeOptions.extendRangeTooltip": "範囲をデータの最高値に広げます。",
+    "visTypeGauge.controls.gaugeOptions.extendRangeTooltipNotAvailable": "新しいグラフライブラリは拡張された範囲のみをサポートします。無効にするには、ゲージグラフのレガシーグラフライブラリと詳細設定を有効にしてください。",
+    "visTypeGauge.controls.gaugeOptions.gaugeTypeLabel": "ゲージタイプ",
+    "visTypeGauge.controls.gaugeOptions.labelsTitle": "ラベル",
+    "visTypeGauge.controls.gaugeOptions.rangesTitle": "範囲",
+    "visTypeGauge.controls.gaugeOptions.showLabelsLabel": "ラベルを表示",
+    "visTypeGauge.controls.gaugeOptions.showLegendLabel": "凡例を表示",
+    "visTypeGauge.controls.gaugeOptions.showLegendNotAvailable": "凡例は新しいグラフライブラリでサポートされていません。ゲージグラフのレガシーグラフライブラリと詳細設定を有効にしてください。",
+    "visTypeGauge.controls.gaugeOptions.showOutline": "アウトラインを表示",
+    "visTypeGauge.controls.gaugeOptions.showOutlineNotAvailable": "アウトラインは新しいグラフライブラリでサポートされていません。ゲージグラフのレガシーグラフライブラリと詳細設定を有効にしてください。",
+    "visTypeGauge.controls.gaugeOptions.showScaleLabel": "縮尺を表示",
+    "visTypeGauge.controls.gaugeOptions.styleTitle": "スタイル",
+    "visTypeGauge.controls.gaugeOptions.subTextLabel": "サブラベル",
+    "visTypeGauge.editors.gauge.alignmentNotAvailable": "整列は新しいグラフライブラリでサポートされていません。ゲージグラフのレガシーグラフライブラリと詳細設定を有効にしてください。",
+    "visTypeGauge.gauge.alignmentAutomaticTitle": "自動",
+    "visTypeGauge.gauge.alignmentHorizontalTitle": "横",
+    "visTypeGauge.gauge.alignmentVerticalTitle": "縦",
+    "visTypeGauge.gauge.gaugeDescription": "メトリックのステータスを示します。",
+    "visTypeGauge.gauge.gaugeTitle": "ゲージ",
+    "visTypeGauge.gauge.gaugeTypes.arcText": "弧形",
+    "visTypeGauge.gauge.gaugeTypes.circleText": "円",
+    "visTypeGauge.gauge.groupTitle": "グループを分割",
+    "visTypeGauge.gauge.metricTitle": "メトリック",
+    "visTypeGauge.goal.goalDescription": "メトリックがどのように目標まで進むのかを追跡します。",
+    "visTypeGauge.goal.goalTitle": "ゴール",
+    "visTypeGauge.goal.groupTitle": "グループを分割",
+    "visTypeGauge.goal.metricTitle": "メトリック",
+    "visTypeGauge.splitTitle.tooltip": "分割グラフアグリゲーションは、新しいグラフライブラリでまだサポートされていません。分割グラフアグリゲーションを使用するには、ゲージグラフのレガシーグラフライブラリと詳細設定を有効にしてください。",
     "visTypeHeatmap.advancedSettings.visualization.legacyHeatmapChartsLibrary.description": "Visualizeでヒートマップのレガシーグラフライブラリを有効にします。",
     "visTypeHeatmap.advancedSettings.visualization.legacyHeatmapChartsLibrary.name": "ヒートマップのレガシーグラフライブラリ",
     "visTypeHeatmap.controls.heatmapOptions.colorLabel": "色",
@@ -5357,7 +5852,7 @@
     "visTypeHeatmap.editors.heatmap.overwriteColorlNotAvailable": "自動色の上書きは新しいグラフライブラリでサポートされていません。ヒートマップのレガシーグラフライブラリと詳細設定を有効にしてください。",
     "visTypeHeatmap.editors.heatmap.rotateLabelNotAvailable": "ラベルの回転は新しいグラフライブラリでサポートされていません。ヒートマップのレガシーグラフライブラリと詳細設定を有効にしてください。",
     "visTypeHeatmap.heatmap.groupTitle": "Y 軸",
-    "visTypeHeatmap.heatmap.heatmapDescription": "マトリックスのセルのデータを網掛けにします。",
+    "visTypeHeatmap.heatmap.heatmapDescription": "行列で値を色として表示します。",
     "visTypeHeatmap.heatmap.heatmapTitle": "ヒートマップ",
     "visTypeHeatmap.heatmap.metricTitle": "値",
     "visTypeHeatmap.heatmap.segmentTitle": "X 軸",
@@ -5405,6 +5900,7 @@
     "visTypePie.editors.pie.emptySizeRatioLabel": "内側の領域のサイズ",
     "visTypePie.editors.pie.labelPositionLabel": "ラベル位置",
     "visTypePie.editors.pie.labelsSettingsTitle": "ラベル設定",
+    "visTypePie.editors.pie.legendDisplayLabel": "凡例を表示",
     "visTypePie.editors.pie.nestedLegendLabel": "ネスト凡例",
     "visTypePie.editors.pie.pieSettingsTitle": "パイ設定",
     "visTypePie.editors.pie.showLabelsLabel": "ラベルを表示",
@@ -5497,7 +5993,7 @@
     "visTypeTimeseries.addDeleteButtons.temporarilyDisableTooltip": "一時的に無効にする",
     "visTypeTimeseries.advancedSettings.allowCheckingForFailedShardsText": "一部のシャードでリクエストが成功し、その他のシャードで失敗した場合に、TSVBグラフの部分データに関する警告メッセージを表示します。",
     "visTypeTimeseries.advancedSettings.allowCheckingForFailedShardsTitle": "TSVBリクエストシャード失敗",
-    "visTypeTimeseries.advancedSettings.allowStringIndicesText": "<strong>TSVB</strong>ビジュアライゼーションでインデックスパターンとElasticsearchを使用できます。",
+    "visTypeTimeseries.advancedSettings.allowStringIndicesText": "<strong>TSVB</strong>ビジュアライゼーションでElasticsearchインデックスをクエリできます。",
     "visTypeTimeseries.advancedSettings.allowStringIndicesTitle": "TSVBで文字列インデックスを許可",
     "visTypeTimeseries.advancedSettings.maxBucketsText": "TSVBヒストグラム密度に影響します。「histogram:maxBars」よりも大きく設定する必要があります。",
     "visTypeTimeseries.advancedSettings.maxBucketsTitle": "TSVBバケット制限",
@@ -5623,7 +6119,10 @@
     "visTypeTimeseries.externalUrlErrorModal.closeButtonLabel": "閉じる",
     "visTypeTimeseries.externalUrlErrorModal.headerTitle": "この外部URLへのアクセスはまだ有効ではありません",
     "visTypeTimeseries.fetchFields.loadIndexPatternFieldsErrorMessage": "index_pattern フィールドを読み込めません",
+    "visTypeTimeseries.fieldSelect.dragAriaLabel": "フィールドをドラッグ",
+    "visTypeTimeseries.fieldSelect.fieldIsNotValid": "\"{fieldParameter}\"選択は無効であり、現在のインデックスで使用できません。",
     "visTypeTimeseries.fieldSelect.selectFieldPlaceholder": "フィールドを選択してください...",
+    "visTypeTimeseries.fieldUtils.multiFieldLabel": "{firstFieldLabel} + {count} {count, plural, other  {個のその他の値}}",
     "visTypeTimeseries.filterCannotBeAppliedError": "この構成ではフィルターを適用できません",
     "visTypeTimeseries.filterRatio.aggregationLabel": "アグリゲーション",
     "visTypeTimeseries.filterRatio.denominatorLabel": "分母",
@@ -5808,6 +6307,7 @@
     "visTypeTimeseries.searchStrategyUndefinedErrorMessage": "検索ストラテジが定義されていませんでした",
     "visTypeTimeseries.serialDiff.aggregationLabel": "アグリゲーション",
     "visTypeTimeseries.serialDiff.lagLabel": "ラグ",
+    "visTypeTimeseries.serialDiff.lagLabel.hint": "現在の値から減算する履歴バケット。ゼロ以外の正の整数でなければなりません",
     "visTypeTimeseries.serialDiff.metricLabel": "メトリック",
     "visTypeTimeseries.series.missingAggregationKeyErrorMessage": "返答から集約キーが欠けています。このリクエストのパーミッションを確認してください。",
     "visTypeTimeseries.series.shouldOneSeriesPerRequestErrorMessage": "1 つのリクエストに複数の数列を含めることはできません。",
@@ -6063,6 +6563,7 @@
     "visTypeVega.inspector.dataSetsLabel": "データセット",
     "visTypeVega.inspector.dataViewer.dataSetAriaLabel": "データセット",
     "visTypeVega.inspector.dataViewer.gridAriaLabel": "{name}データグリッド",
+    "visTypeVega.inspector.errorHeading": "Vegaは正常に表示されませんでした",
     "visTypeVega.inspector.signalValuesLabel": "単一の値",
     "visTypeVega.inspector.signalViewer.gridAriaLabel": "単一の値のデータグリッド",
     "visTypeVega.inspector.specLabel": "仕様",
@@ -6126,31 +6627,6 @@
     "visTypeVislib.vislib.legend.toggleOptionsButtonAriaLabel": "{legendDataLabel}、トグルオプション",
     "visTypeVislib.vislib.tooltip.fieldLabel": "フィールド",
     "visTypeVislib.vislib.tooltip.valueLabel": "値",
-    "visTypeGauge.controls.gaugeOptions.alignmentLabel": "アラインメント",
-    "visTypeGauge.controls.gaugeOptions.autoExtendRangeLabel": "範囲を自動拡張",
-    "visTypeGauge.controls.gaugeOptions.extendRangeTooltip": "範囲をデータの最高値に広げます。",
-    "visTypeGauge.controls.gaugeOptions.gaugeTypeLabel": "ゲージタイプ",
-    "visTypeGauge.controls.gaugeOptions.labelsTitle": "ラベル",
-    "visTypeGauge.controls.gaugeOptions.rangesTitle": "範囲",
-    "visTypeGauge.controls.gaugeOptions.showLabelsLabel": "ラベルを表示",
-    "visTypeGauge.controls.gaugeOptions.showLegendLabel": "凡例を表示",
-    "visTypeGauge.controls.gaugeOptions.showOutline": "アウトラインを表示",
-    "visTypeGauge.controls.gaugeOptions.showScaleLabel": "縮尺を表示",
-    "visTypeGauge.controls.gaugeOptions.styleTitle": "スタイル",
-    "visTypeGauge.controls.gaugeOptions.subTextLabel": "サブラベル",
-    "visTypeGauge.gauge.alignmentAutomaticTitle": "自動",
-    "visTypeGauge.gauge.alignmentHorizontalTitle": "横",
-    "visTypeGauge.gauge.alignmentVerticalTitle": "縦",
-    "visTypeGauge.gauge.gaugeDescription": "メトリックのステータスを示します。",
-    "visTypeGauge.gauge.gaugeTitle": "ゲージ",
-    "visTypeGauge.gauge.gaugeTypes.arcText": "弧形",
-    "visTypeGauge.gauge.gaugeTypes.circleText": "円",
-    "visTypeGauge.gauge.groupTitle": "グループを分割",
-    "visTypeGauge.gauge.metricTitle": "メトリック",
-    "visTypeGauge.goal.goalDescription": "メトリックがどのように目標まで進むのかを追跡します。",
-    "visTypeGauge.goal.goalTitle": "ゴール",
-    "visTypeGauge.goal.groupTitle": "グループを分割",
-    "visTypeGauge.goal.metricTitle": "メトリック",
     "visTypeXy.aggResponse.allDocsTitle": "すべてのドキュメント",
     "visTypeXy.area.areaDescription": "軸と線の間のデータを強調します。",
     "visTypeXy.area.areaTitle": "エリア",
@@ -6241,7 +6717,9 @@
     "visTypeXy.function.args.addTimeMarker.help": "時刻マーカーを表示",
     "visTypeXy.function.args.addTooltip.help": "カーソルを置いたときにツールチップを表示",
     "visTypeXy.function.args.args.chartType.help": "グラフの種類。折れ線、エリア、ヒストグラムを選択できます",
+    "visTypeXy.function.args.args.legendSize.help": "凡例サイズをピクセルで指定します。",
     "visTypeXy.function.args.args.maxLegendLines.help": "凡例項目の最大行数を定義します",
+    "visTypeXy.function.args.ariaLabel.help": "xyグラフのariaラベルを指定します",
     "visTypeXy.function.args.categoryAxes.help": "カテゴリ軸構成",
     "visTypeXy.function.args.detailedTooltip.help": "詳細ツールチップを表示",
     "visTypeXy.function.args.fillOpacity.help": "エリアグラフの塗りつぶしの透明度を定義します",
@@ -6383,6 +6861,7 @@
     "visualizations.embeddable.legacyURLConflict.errorMessage": "このビジュアライゼーションにはレガシーエイリアスと同じURLがあります。このエラーを解決するには、エイリアスを無効にしてください：{json}",
     "visualizations.embeddable.placeholderTitle": "プレースホルダータイトル",
     "visualizations.experimentalVisInfoText": "この機能はテクニカルプレビュー中であり、将来のリリースでは変更されたり完全に削除されたりする場合があります。Elasticは最善の努力を講じてすべての問題の修正に努めますが、テクニカルプレビュー中の機能には正式なGA機能のサポートSLAが適用されません。フィードバックがある場合は、{githubLink}で問題を報告してください。",
+    "visualizations.function.findAccessorOrFail.error.accessor": "入力された列名またはインデックスが無効です：{accessor}",
     "visualizations.function.range.from.help": "範囲の開始",
     "visualizations.function.range.help": "範囲オブジェクトを生成します",
     "visualizations.function.range.to.help": "範囲の終了",
@@ -6416,7 +6895,7 @@
     "visualizations.listing.table.typeColumnName": "型",
     "visualizations.listingPageTitle": "Visualizeライブラリ",
     "visualizations.newChart.conditionalMessage.advancedSettingsLink": "高度な設定",
-    "visualizations.newChart.conditionalMessage.newLibrary": "{link}で古いライブラリに切り替える",
+    "visualizations.newGaugeChart.notificationMessage": "新しいゲージグラフライブラリはまだ分割グラフアグリゲーションをサポートしていません。{conditionalMessage}",
     "visualizations.newHeatmapChart.notificationMessage": "新しいヒートマップグラフライブラリはまだ分割グラフアグリゲーションをサポートしていません。{conditionalMessage}",
     "visualizations.newVisWizard.aggBasedGroupDescription": "クラシック Visualize ライブラリを使用して、アグリゲーションに基づいてグラフを作成します。",
     "visualizations.newVisWizard.aggBasedGroupTitle": "アグリゲーションに基づく",
@@ -6445,9 +6924,12 @@
     "visualizations.savedObjectName": "ビジュアライゼーション",
     "visualizations.saveDuplicateRejectedDescription": "重複ファイルの保存確認が拒否されました",
     "visualizations.savingVisualizationFailed.errorMsg": "ビジュアライゼーションの保存が失敗しました",
+    "visualizations.tonNavMenu.tryItBadgeText": "お試しください",
     "visualizations.topNavMenu.cancelAndReturnButtonTooltip": "完了する前に変更を破棄",
     "visualizations.topNavMenu.cancelButtonAriaLabel": "変更を保存せずに最後に使用していたアプリに戻る",
     "visualizations.topNavMenu.cancelButtonLabel": "キャンセル",
+    "visualizations.topNavMenu.goToLensButtonAriaLabel": "現在の構成でLensに移動",
+    "visualizations.topNavMenu.goToLensButtonLabel": "Lensでビジュアライゼーションを編集",
     "visualizations.topNavMenu.openInspectorButtonAriaLabel": "ビジュアライゼーションのインスペクターを開く",
     "visualizations.topNavMenu.openInspectorButtonLabel": "検査",
     "visualizations.topNavMenu.openInspectorDisabledButtonTooltip": "このビジュアライゼーションはインスペクターをサポートしていません。",
@@ -6528,6 +7010,24 @@
     "xpack.actions.builtin.webhook.webhookConfigurationError": "Web フックアクションの構成中にエラーが発生：{message}",
     "xpack.actions.builtin.webhook.webhookConfigurationErrorNoHostname": "Webフックアクションの構成エラーです。URLを解析できません。{err}",
     "xpack.actions.builtin.webhookTitle": "Web フック",
+    "xpack.actions.builtin.xmatters.invalidUsernamePassword": "ユーザーとパスワードの両方を指定する必要があります。",
+    "xpack.actions.builtin.xmatters.missingConfigUrl": "有効なconfigUrlを指定してください",
+    "xpack.actions.builtin.xmatters.missingPassword": "有効なパスワードを指定してください",
+    "xpack.actions.builtin.xmatters.missingSecretsUrl": "有効なsecretsUrlとAPIキーを指定してください",
+    "xpack.actions.builtin.xmatters.missingUser": "有効なユーザー名を指定してください",
+    "xpack.actions.builtin.xmatters.noSecretsProvided": "認証するには、secretsUrlリンクまたはユーザー/パスワードを指定してください",
+    "xpack.actions.builtin.xmatters.noUserPassWhenSecretsUrl": "URL認証ではユーザー/パスワードを使用できません。有効なsecretsUrlを指定するか、基本認証を使用してください。",
+    "xpack.actions.builtin.xmatters.postingErrorMessage": "xMattersワークフローのトリガーエラー",
+    "xpack.actions.builtin.xmatters.postingRetryErrorMessage": "xMattersフローのトリガーエラー：HTTPステータス{status}。しばらくたってから再試行してください",
+    "xpack.actions.builtin.xmatters.shouldNotHaveConfigUrl": "usesBasicがfalseのときには、configUrlを指定しないでください",
+    "xpack.actions.builtin.xmatters.shouldNotHaveSecretsUrl": "usesBasicがtrueのときには、secretsUrlを指定しないでください",
+    "xpack.actions.builtin.xmatters.shouldNotHaveUsernamePassword": "usesBasicがfalseのときには、ユーザー名とパスワードを指定しないでください",
+    "xpack.actions.builtin.xmatters.unexpectedStatusErrorMessage": "xMattersフローのトリガーエラー：予期しないステータス{status}",
+    "xpack.actions.builtin.xmatters.xmattersConfigurationError": "xMattersアクションの設定エラー：{message}",
+    "xpack.actions.builtin.xmatters.xmattersConfigurationErrorNoHostname": "xMattersアクションの構成エラー：URLを解析できません：{err}",
+    "xpack.actions.builtin.xmatters.xmattersHostnameNotAllowed": "{message}",
+    "xpack.actions.builtin.xmatters.xmattersInvalidUrlError": "無効なsecretsUrl：{err}",
+    "xpack.actions.builtin.xmattersTitle": "xMatters",
     "xpack.actions.disabledActionTypeError": "アクションタイプ \"{actionType}\" は、Kibana 構成 xpack.actions.enabledActionTypes では有効化されません",
     "xpack.actions.featureRegistry.actionsFeatureName": "アクションとコネクター",
     "xpack.actions.savedObjects.goToConnectorsButtonText": "コネクターに移動",
@@ -6560,6 +7060,7 @@
     "xpack.alerting.serverSideErrors.invalidLicenseErrorMessage": "{licenseType}ライセンスが必要であるため、ルール{ruleTypeId}は無効です。アップグレードオプションを表示するには、［ライセンス管理］に移動してください。",
     "xpack.alerting.serverSideErrors.unavailableLicenseErrorMessage": "現時点でライセンス情報を入手できないため、ルール{ruleTypeId}は無効です。",
     "xpack.alerting.serverSideErrors.unavailableLicenseInformationErrorMessage": "アラートを利用できません。現在ライセンス情報が利用できません。",
+    "xpack.alerting.taskRunner.warning.maxExecutableActions": "このルールタイプのアクションの最大数に達しました。超過したアクションはトリガーされません。",
     "xpack.apm.a.thresholdMet": "しきい値一致",
     "xpack.apm.addDataButtonLabel": "データの追加",
     "xpack.apm.agentConfig.allOptionLabel": "すべて",
@@ -6628,9 +7129,11 @@
     "xpack.apm.agentConfig.servicePage.cancelButton": "キャンセル",
     "xpack.apm.agentConfig.servicePage.environment.description": "構成ごとに 1 つの環境のみがサポートされます。",
     "xpack.apm.agentConfig.servicePage.environment.fieldLabel": "サービス環境",
+    "xpack.apm.agentConfig.servicePage.environment.placeholder": "オプションを選択",
     "xpack.apm.agentConfig.servicePage.environment.title": "環境",
     "xpack.apm.agentConfig.servicePage.service.description": "構成するサービスを選択してください。",
     "xpack.apm.agentConfig.servicePage.service.fieldLabel": "サービス名",
+    "xpack.apm.agentConfig.servicePage.service.placeholder": "オプションを選択",
     "xpack.apm.agentConfig.servicePage.service.title": "サービス",
     "xpack.apm.agentConfig.settingsPage.discardChangesButton": "変更を破棄",
     "xpack.apm.agentConfig.settingsPage.notFound.message": "リクエストされた構成が存在しません",
@@ -6678,20 +7181,24 @@
     "xpack.apm.alerting.fields.type": "型",
     "xpack.apm.alerts.action_variables.environment": "アラートが作成されるトランザクションタイプ",
     "xpack.apm.alerts.action_variables.intervalSize": "アラート条件が満たされた期間の長さと単位",
+    "xpack.apm.alerts.action_variables.reasonMessage": "アラートの理由の簡潔な説明",
     "xpack.apm.alerts.action_variables.serviceName": "アラートが作成されるサービス",
     "xpack.apm.alerts.action_variables.threshold": "この値を超えるすべてのトリガーによりアラートが実行されます",
     "xpack.apm.alerts.action_variables.transactionType": "アラートが作成されるトランザクションタイプ",
     "xpack.apm.alerts.action_variables.triggerValue": "しきい値に達し、アラートをトリガーした値",
+    "xpack.apm.alerts.action_variables.viewInAppUrl": "アラートとコンテキストを調査するために使用できる、Elastic内のビューまたは機能へのリンク",
     "xpack.apm.alerts.anomalySeverity.criticalLabel": "致命的",
     "xpack.apm.alerts.anomalySeverity.majorLabel": "メジャー",
     "xpack.apm.alerts.anomalySeverity.minor": "マイナー",
     "xpack.apm.alerts.anomalySeverity.scoreDetailsDescription": "スコア {value} {value, select, critical {} other {以上}}",
     "xpack.apm.alerts.anomalySeverity.warningLabel": "警告",
+    "xpack.apm.alertTypes.anomaly.description": "サービスのレイテンシ、スループット、失敗したトランザクションの比率が異常であるときにアラートを発行します。",
     "xpack.apm.alertTypes.errorCount.defaultActionMessage": "次の条件のため、\\{\\{alertName\\}\\}アラートが実行されています。\n\n- サービス名：\\{\\{context.serviceName\\}\\}\n- 環境：\\{\\{context.environment\\}\\}\n- しきい値\\{\\{context.threshold\\}\\}エラー\n- トリガーされた値：過去\\{\\{context.interval\\}\\}に\\{\\{context.triggerValue\\}\\}件のエラー",
     "xpack.apm.alertTypes.errorCount.description": "サービスのエラー数が定義されたしきい値を超過したときにアラートを発行します。",
     "xpack.apm.alertTypes.transactionDuration.defaultActionMessage": "次の条件のため、\\{\\{alertName\\}\\}アラートが実行されています。\n\n- サービス名：\\{\\{context.serviceName\\}\\}\n- タイプ：\\{\\{context.transactionType\\}\\}\n- 環境：\\{\\{context.environment\\}\\}\n- レイテンシしきい値：\\{\\{context.threshold\\}\\}ミリ秒\n- 観察されたレイテンシ：直前の\\{\\{context.interval\\}\\}に\\{\\{context.triggerValue\\}\\}",
     "xpack.apm.alertTypes.transactionDuration.description": "サービスの特定のトランザクションタイプのレイテンシが定義されたしきい値を超えたときにアラートを発行します。",
     "xpack.apm.alertTypes.transactionDurationAnomaly.defaultActionMessage": "次の条件のため、\\{\\{alertName\\}\\}アラートが実行されています。\n\n- サービス名：\\{\\{context.serviceName\\}\\}\n- タイプ：\\{\\{context.transactionType\\}\\}\n- 環境：\\{\\{context.environment\\}\\}\n- 重要度しきい値：\\{\\{context.threshold\\}\\}%\n- 重要度値：\\{\\{context.triggerValue\\}\\}\n",
+    "xpack.apm.alertTypes.transactionDurationAnomaly.reason": "過去{interval}における{serviceName}のスコア{measured}の{severityLevel}異常が検知されました。",
     "xpack.apm.alertTypes.transactionErrorRate.defaultActionMessage": "次の条件のため、\\{\\{alertName\\}\\}アラートが実行されています。\n\n- サービス名：\\{\\{context.serviceName\\}\\}\n- タイプ：\\{\\{context.transactionType\\}\\}\n- 環境：\\{\\{context.environment\\}\\}\n- しきい値：\\{\\{context.threshold\\}\\}%\n- トリガーされた値：過去\\{\\{context.interval\\}\\}にエラーの\\{\\{context.triggerValue\\}\\}%",
     "xpack.apm.alertTypes.transactionErrorRate.description": "サービスのトランザクションエラー率が定義されたしきい値を超過したときにアラートを発行します。",
     "xpack.apm.analyzeDataButton.label": "データの探索",
@@ -6701,6 +7208,7 @@
     "xpack.apm.anomaly_detection.error.missing_write_privileges": "異常検知ジョブを作成するには、機械学習およびAPMの「書き込み」権限が必要です",
     "xpack.apm.anomaly_detection.error.not_available": "機械学習を利用できません",
     "xpack.apm.anomaly_detection.error.not_available_in_space": "選択したスペースでは、機械学習を利用できません",
+    "xpack.apm.anomalyAlert.name": "異常",
     "xpack.apm.anomalyDetection.createJobs.failed.text": "APMサービス環境[{environments}]用に1つ以上の異常検知ジョブを作成しているときに問題が発生しました。エラー：「{errorMessage}」",
     "xpack.apm.anomalyDetection.createJobs.failed.title": "異常検知ジョブを作成できませんでした",
     "xpack.apm.anomalyDetection.createJobs.succeeded.text": "APMサービス環境[{environments}]の異常検知ジョブが正常に作成されました。機械学習がトラフィック異常値の分析を開始するには、少し時間がかかります。",
@@ -6716,6 +7224,7 @@
     "xpack.apm.api.fleet.fleetSecurityRequired": "FleetおよびSecurityプラグインが必要です",
     "xpack.apm.apmDescription": "アプリケーション内から自動的に詳細なパフォーマンスメトリックやエラーを集めます。",
     "xpack.apm.apmSchema.index": "APMサーバースキーマ - インデックス",
+    "xpack.apm.apmServiceGroups.index": "APMサービスグループ - インデックス",
     "xpack.apm.apmSettings.index": "APM 設定 - インデックス",
     "xpack.apm.backendDetail.dependenciesTableColumnBackend": "サービス",
     "xpack.apm.backendDetail.dependenciesTableTitle": "アップストリームサービス",
@@ -6760,6 +7269,7 @@
     "xpack.apm.correlations.failedTransactions.correlationsTable.pValueDescription": "成功したトランザクションの普及率が与えられているときの、失敗したトランザクションのフィールド名と値について少なくともこの量を取得する確率。",
     "xpack.apm.correlations.failedTransactions.correlationsTable.pValueLabel": "p値",
     "xpack.apm.correlations.failedTransactions.correlationsTable.scoreLabel": "スコア",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.scoreTooltip": "属性のスコア[0-1]。スコアが大きいほど、属性の遅延が大きくなります。",
     "xpack.apm.correlations.failedTransactions.correlationsTable.successPercentageDescription": "成功したトランザクションでこの用語が表示される時間の割合。",
     "xpack.apm.correlations.failedTransactions.correlationsTable.successPercentageLabel": "成功%",
     "xpack.apm.correlations.failedTransactions.errorTitle": "失敗したトランザクションで相関関係の実行中にエラーが発生しました",
@@ -6767,9 +7277,6 @@
     "xpack.apm.correlations.failedTransactions.helpPopover.performanceExplanation": "この分析は多数の属性に対して統計検索を実行します。広い時間範囲やトランザクションスループットが高いサービスでは、時間がかかる場合があります。パフォーマンスを改善するには、時間範囲を絞り込みます。",
     "xpack.apm.correlations.failedTransactions.helpPopover.tableExplanation": "表はスコア別に並べ替えられます。これは高、中、低影響度にマッピングされます。影響度が高い属性は、失敗したトランザクションの原因である可能性が高くなります。",
     "xpack.apm.correlations.failedTransactions.helpPopover.title": "失敗したトランザクションの相関関係",
-    "xpack.apm.correlations.highImpactText": "高",
-    "xpack.apm.correlations.lowImpactText": "低",
-    "xpack.apm.correlations.mediumImpactText": "中",
     "xpack.apm.correlations.failedTransactions.panelTitle": "失敗したトランザクションの遅延分布",
     "xpack.apm.correlations.failedTransactions.tableTitle": "相関関係",
     "xpack.apm.correlations.fieldContextPopover.addFilterAriaLabel": "{fieldName}のフィルター：\"{value}\"",
@@ -6779,6 +7286,7 @@
     "xpack.apm.correlations.fieldContextPopover.notTopTenValueMessage": "選択した用語は上位10件にありません",
     "xpack.apm.correlations.fieldContextPopover.removeFilterAriaLabel": "{fieldName}の除外：\"{value}\"",
     "xpack.apm.correlations.fieldContextPopover.topFieldValuesAriaLabel": "上位10フィールド値を表示",
+    "xpack.apm.correlations.highImpactText": "高",
     "xpack.apm.correlations.latencyCorrelations.advancedStatisticsLabel": "詳細統計情報",
     "xpack.apm.correlations.latencyCorrelations.advancedStatisticsTooltipContent": "相関関係結果の詳細統計情報を有効にします。",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.actionsLabel": "フィルター",
@@ -6791,6 +7299,7 @@
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.filterDescription": "値でフィルタリング",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.filterLabel": "フィルター",
     "xpack.apm.correlations.latencyCorrelations.errorTitle": "相関関係の取得中にエラーが発生しました",
+    "xpack.apm.correlations.latencyCorrelations.fallbackCorrelationBadgeMessage": "非常に低い",
     "xpack.apm.correlations.latencyCorrelations.panelTitle": "レイテンシ分布",
     "xpack.apm.correlations.latencyCorrelations.tableTitle": "相関関係",
     "xpack.apm.correlations.latencyCorrelations.titleHelp": "このグラフは、両方の軸で対数目盛を使用し、異常値による歪みを回避します",
@@ -6801,19 +7310,24 @@
     "xpack.apm.correlations.latencyPopoverTableExplanation": "この表は0～1の相関係数で並べ替えられます。相関値が高い属性は、遅延が長いトランザクションの原因である可能性が高くなります。",
     "xpack.apm.correlations.latencyPopoverTitle": "遅延の相関関係",
     "xpack.apm.correlations.license.text": "相関関係APIを使用するには、Elastic Platinumライセンスのサブスクリプションが必要です。",
+    "xpack.apm.correlations.lowImpactText": "低",
+    "xpack.apm.correlations.mediumImpactText": "中",
     "xpack.apm.correlations.noCorrelationsTextLine1": "重要な影響がある場合にのみ、相関関係が特定されます。",
     "xpack.apm.correlations.noCorrelationsTextLine2": "別の時間範囲を選択するか、追加されたフィルターを削除してみてください。",
     "xpack.apm.correlations.noCorrelationsTitle": "有意な相関関係がありません",
     "xpack.apm.correlations.progressAriaLabel": "進捗",
     "xpack.apm.correlations.progressTitle": "進捗状況: {progress}%",
     "xpack.apm.correlations.refreshButtonTitle": "更新",
+    "xpack.apm.correlations.veryLowImpactText": "非常に低い",
     "xpack.apm.customLink.buttom.create": "カスタムリンクを作成",
     "xpack.apm.customLink.buttom.create.title": "作成",
     "xpack.apm.customLink.buttom.manage": "カスタムリンクを管理",
     "xpack.apm.customLink.empty": "カスタムリンクが見つかりません。独自のカスタムリンク、たとえば特定のダッシュボードまたは外部リンクへのリンクをセットアップします。",
     "xpack.apm.dependencies.kueryBarPlaceholder": "依存関係メトリックを検索（例：span.destination.service.resource:elasticsearch）",
     "xpack.apm.dependenciesTable.columnErrorRate": "失敗したトランザクション率",
+    "xpack.apm.dependenciesTable.columnErrorRateTip": "選択したサービスの失敗したトランザクションの割合。4xxステータスコード（クライアントエラー）のHTTPサーバートランザクションは、サーバーではなく呼び出し側が失敗の原因であるため、失敗と見なされません。",
     "xpack.apm.dependenciesTable.columnImpact": "インパクト",
+    "xpack.apm.dependenciesTable.columnImpactTip": "ご利用のサービスで最も頻繁に使用されていて、最も遅いエンドポイントです。レイテンシをスループットで乗算して計算されました。",
     "xpack.apm.dependenciesTable.columnLatency": "レイテンシ（平均）",
     "xpack.apm.dependenciesTable.columnThroughput": "スループット",
     "xpack.apm.dependenciesTable.notFoundLabel": "依存関係が見つかりません",
@@ -6845,6 +7359,7 @@
     "xpack.apm.errorRate": "失敗したトランザクション率",
     "xpack.apm.errorRate.chart.errorRate": "失敗したトランザクション率（平均）",
     "xpack.apm.errorRate.chart.errorRate.previousPeriodLabel": "前の期間",
+    "xpack.apm.errorRate.tip": "選択したサービスの失敗したトランザクションの割合。4xxステータスコード（クライアントエラー）のHTTPサーバートランザクションは、サーバーではなく呼び出し側が失敗の原因であるため、失敗と見なされません。",
     "xpack.apm.errorsTable.errorMessageAndCulpritColumnLabel": "エラーメッセージと原因",
     "xpack.apm.errorsTable.groupIdColumnDescription": "スタックトレースのハッシュ。動的パラメータのため、エラーメッセージが異なる場合でも、類似したエラーをグループ化します。",
     "xpack.apm.errorsTable.groupIdColumnLabel": "グループ ID",
@@ -6948,6 +7463,8 @@
     "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPolicies": "テールサンプリングポリシー",
     "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPoliciesDescription": "ポリシーはトレースイベントをサンプルレートにマッピングします。各ポリシーはサンプルレートを指定する必要があります。トレースイベントは指定された順序でポリシーと照合されます。トレースイベントが一致するには、すべてのポリシー条件をtrueにする必要があります。各ポリシーリストの最後は、サンプルレートのみを指定するポリシーにしてください。この最終ポリシーは、より厳密なポリシーと一致しない残りのトレースイベントを取り込むために使用されます。",
     "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPoliciesTitle": "ポリシー",
+    "xpack.apm.fleet_integration.settings.tailSamplingDocsHelpText": "トレールサンプリングポリシーの詳細については、{link}を参照してください。",
+    "xpack.apm.fleet_integration.settings.tailSamplingDocsHelpTextLink": "ドキュメント",
     "xpack.apm.fleet_integration.settings.tls.settings.subtitle": "TLS構成の設定。",
     "xpack.apm.fleet_integration.settings.tls.settings.title": "TLS設定",
     "xpack.apm.fleet_integration.settings.tls.tlsCertificateLabel": "サーバー証明書へのファイルパス。",
@@ -7008,7 +7525,7 @@
     "xpack.apm.home.alertsMenu.alerts": "アラートとルール",
     "xpack.apm.home.alertsMenu.createAnomalyAlert": "異常ルールを作成",
     "xpack.apm.home.alertsMenu.createThresholdAlert": "しきい値ルールを作成",
-    "xpack.apm.home.alertsMenu.errorCount": "エラー数",
+    "xpack.apm.home.alertsMenu.errorCount": " エラーカウントルールを作製",
     "xpack.apm.home.alertsMenu.transactionDuration": "レイテンシ",
     "xpack.apm.home.alertsMenu.transactionErrorRate": "失敗したトランザクション率",
     "xpack.apm.home.alertsMenu.viewActiveAlerts": "ルールの管理",
@@ -7070,6 +7587,8 @@
     "xpack.apm.navigation.serviceMapTitle": "サービスマップ",
     "xpack.apm.navigation.servicesTitle": "サービス",
     "xpack.apm.navigation.tracesTitle": "トレース",
+    "xpack.apm.noDataConfig.addApmIntegrationButtonLabel": "APM統合を追加",
+    "xpack.apm.noDataConfig.addDataButtonLabel": "データの追加",
     "xpack.apm.noDataConfig.solutionName": "Observability",
     "xpack.apm.notAvailableLabel": "N/A",
     "xpack.apm.profiling.collapseSimilarFrames": "類似した項目を折りたたむ",
@@ -7085,6 +7604,7 @@
     "xpack.apm.propertiesTable.tabs.metadataLabel": "メタデータ",
     "xpack.apm.propertiesTable.tabs.timelineLabel": "Timeline",
     "xpack.apm.searchInput.filter": "フィルター...",
+    "xpack.apm.selectCustomOptionText": "\\{searchValue\\}を新しいオプションとして追加",
     "xpack.apm.selectPlaceholder": "オプションを選択：",
     "xpack.apm.serviceDependencies.breakdownChartTitle": "依存関係にかかった時間",
     "xpack.apm.serviceDetails.dependenciesTabLabel": "依存関係",
@@ -7100,6 +7620,64 @@
     "xpack.apm.serviceDetails.profilingTabExperimentalLabel": "テクニカルプレビュー",
     "xpack.apm.serviceDetails.profilingTabLabel": "プロファイリング",
     "xpack.apm.serviceDetails.transactionsTabLabel": "トランザクション",
+    "xpack.apm.serviceGroup.allServices.title": "サービス",
+    "xpack.apm.serviceGroup.serviceInventory": "インベントリ",
+    "xpack.apm.serviceGroup.serviceMap": "サービスマップ",
+    "xpack.apm.serviceGroups.breadcrumb.title": "サービス",
+    "xpack.apm.serviceGroups.cardsList.emptyDescription": "説明がありません",
+    "xpack.apm.serviceGroups.cardsList.serviceCount": "{servicesCount} {servicesCount, plural, other {個のサービス}}",
+    "xpack.apm.serviceGroups.createFailure.toast.title": "\"{groupName}\"グループの作成エラー",
+    "xpack.apm.serviceGroups.createGroupLabel": "グループを作成",
+    "xpack.apm.serviceGroups.createSuccess.toast.text": "グループは、グループの新しいサービスビューに表示されます。",
+    "xpack.apm.serviceGroups.createSucess.toast.title": "\"{groupName}\"グループが作成されました",
+    "xpack.apm.serviceGroups.deleteFailure.toast.title": "\"{groupName}\"グループの削除エラー",
+    "xpack.apm.serviceGroups.deleteFailure.unknownId.toast.text": "グループを削除できません。不明なサービスグループIDです。",
+    "xpack.apm.serviceGroups.deleteFailure.unknownId.toast.title": "\"{groupName}\"グループの削除エラー",
+    "xpack.apm.serviceGroups.deleteSuccess.toast.title": "\"{groupName}\"グループが削除されました",
+    "xpack.apm.serviceGroups.editFailure.toast.title": "\"{groupName}\"グループの編集エラー",
+    "xpack.apm.serviceGroups.editGroupLabel": "グループを編集",
+    "xpack.apm.serviceGroups.editSuccess.toast.text": "サービスグループの新しいグループが保存されました。",
+    "xpack.apm.serviceGroups.editSucess.toast.title": "\"{groupName}\"グループが編集されました",
+    "xpack.apm.serviceGroups.emptyPrompt.message": "このフィルターのグループが見つかりません",
+    "xpack.apm.serviceGroups.emptyPrompt.serviceGroups": "サービスグループ",
+    "xpack.apm.serviceGroups.groupDetailsForm.cancel": "キャンセル",
+    "xpack.apm.serviceGroups.groupDetailsForm.color": "色",
+    "xpack.apm.serviceGroups.groupDetailsForm.create.title": "グループを作成",
+    "xpack.apm.serviceGroups.groupDetailsForm.deleteGroup": "グループを削除",
+    "xpack.apm.serviceGroups.groupDetailsForm.description": "説明",
+    "xpack.apm.serviceGroups.groupDetailsForm.description.optional": "オプション",
+    "xpack.apm.serviceGroups.groupDetailsForm.edit.title": "グループを編集",
+    "xpack.apm.serviceGroups.groupDetailsForm.invalidColorError": "有効な色値を指定してください",
+    "xpack.apm.serviceGroups.groupDetailsForm.name": "名前",
+    "xpack.apm.serviceGroups.groupDetailsForm.selectServices": "サービスを選択",
+    "xpack.apm.serviceGroups.groupsCount": "{servicesCount} {servicesCount, plural, other {グループ}}",
+    "xpack.apm.serviceGroups.list.allServices.description": "すべてのサービスを表示",
+    "xpack.apm.serviceGroups.list.allServices.name": "すべてのサービス",
+    "xpack.apm.serviceGroups.list.sort.alphabetical": "アルファベット順",
+    "xpack.apm.serviceGroups.list.sort.recentlyAdded": "最近追加された項目",
+    "xpack.apm.serviceGroups.selectServicesForm.cancel": "キャンセル",
+    "xpack.apm.serviceGroups.selectServicesForm.editGroupDetails": "グループ詳細を編集",
+    "xpack.apm.serviceGroups.selectServicesForm.kql": "例：labels.team: \"web\"",
+    "xpack.apm.serviceGroups.selectServicesForm.matchingServiceCount": "{servicesCount} {servicesCount, plural, other {個のサービス}}がクエリと一致します",
+    "xpack.apm.serviceGroups.selectServicesForm.panelLabel": "クエリを入力してサービスを選択",
+    "xpack.apm.serviceGroups.selectServicesForm.preview": "プレビュー",
+    "xpack.apm.serviceGroups.selectServicesForm.refresh": "更新",
+    "xpack.apm.serviceGroups.selectServicesForm.saveGroup": "グループを保存",
+    "xpack.apm.serviceGroups.selectServicesForm.subtitle": "クエリを使用してこのグループのサービスを選択します。過去24時間以内にこのクエリと一致したサービスはグループに割り当てられます。",
+    "xpack.apm.serviceGroups.selectServicesForm.title": "サービスを選択",
+    "xpack.apm.serviceGroups.selectServicesList.environmentColumnLabel": "環境",
+    "xpack.apm.serviceGroups.selectServicesList.nameColumnLabel": "名前",
+    "xpack.apm.serviceGroups.selectServicesList.notFoundLabel": "過去24時間以内にサービスはありません。グループを作成できます。クエリと一致するサービスが追加されます。",
+    "xpack.apm.serviceGroups.sortLabel": "並べ替え",
+    "xpack.apm.serviceGroups.tour.content.link": "詳細は{docsLink}をご覧ください。",
+    "xpack.apm.serviceGroups.tour.content.link.docs": "ドキュメント",
+    "xpack.apm.serviceGroups.tour.createGroups.content": "サービスをグループ化し、ノイズを減らした編集済みのインベントリビューを作成し、サービス全体での調査を簡素化します。グループはKibanaスペース固有であり、適切なアクセス権のあるユーザーが使用できます。",
+    "xpack.apm.serviceGroups.tour.createGroups.title": "サービスグループの概要",
+    "xpack.apm.serviceGroups.tour.dismiss": "閉じる",
+    "xpack.apm.serviceGroups.tour.editGroups.content": "編集オプションを使用して、名前、クエリ、このサービスグループの詳細を変更します。",
+    "xpack.apm.serviceGroups.tour.editGroups.title": "このサービスグループを編集",
+    "xpack.apm.serviceGroups.tour.serviceGroups.content": "サービスグループが作成されたため、すべてのサービスインベントリがここに移動されました。このグループは編集または削除できません。",
+    "xpack.apm.serviceGroups.tour.serviceGroups.title": "すべてのサービスグループ",
     "xpack.apm.serviceHealthStatus.critical": "重大",
     "xpack.apm.serviceHealthStatus.healthy": "正常",
     "xpack.apm.serviceHealthStatus.unknown": "不明",
@@ -7172,6 +7750,7 @@
     "xpack.apm.serviceOverview.dependenciesTableColumn": "依存関係",
     "xpack.apm.serviceOverview.dependenciesTableTabLink": "依存関係を表示",
     "xpack.apm.serviceOverview.dependenciesTableTitle": "依存関係",
+    "xpack.apm.serviceOverview.dependenciesTableTitleTip": "計測されていないダウンストリームサービス、または計測されたサービスの終了スパンから派生した外部接続。",
     "xpack.apm.serviceOverview.errorsTable.errorMessage": "取得できませんでした",
     "xpack.apm.serviceOverview.errorsTable.loading": "読み込み中...",
     "xpack.apm.serviceOverview.errorsTable.noResults": "エラーが見つかりません",
@@ -7211,9 +7790,11 @@
     "xpack.apm.serviceOverview.noResultsText": "インスタンスが見つかりません",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "前の期間",
     "xpack.apm.serviceOverview.throughtputChartTitle": "スループット",
-    "xpack.apm.serviceOverview.tpmHelp": "スループットは1分あたりのトランザクション数（tpm）で測定されます",
+    "xpack.apm.serviceOverview.tpmHelp": "スループットは1分あたりのトランザクション数（tpm）で測定されます。",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "失敗したトランザクション率",
+    "xpack.apm.serviceOverview.transactionsTableColumnErrorRateTip": "選択したサービスの失敗したトランザクションの割合。4xxステータスコード（クライアントエラー）のHTTPサーバートランザクションは、サーバーではなく呼び出し側が失敗の原因であるため、失敗と見なされません。",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "インパクト",
+    "xpack.apm.serviceOverview.transactionsTableColumnImpactTip": "ご利用のサービスで最も頻繁に使用されていて、最も遅いエンドポイントです。レイテンシをスループットで乗算して計算されました。",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "名前",
     "xpack.apm.serviceOverview.transactionsTableColumnThroughput": "スループット",
     "xpack.apm.serviceProfiling.valueTypeLabel.allocObjects": "Alloc. objects",
@@ -7224,6 +7805,8 @@
     "xpack.apm.serviceProfiling.valueTypeLabel.samples": "サンプル",
     "xpack.apm.serviceProfiling.valueTypeLabel.unknown": "その他",
     "xpack.apm.serviceProfiling.valueTypeLabel.wallTime": "Wall",
+    "xpack.apm.servicesGroups.filter": "フィルターグループ",
+    "xpack.apm.servicesGroups.loadingServiceGroups": "サービスグループを読み込み中",
     "xpack.apm.servicesTable.environmentColumnLabel": "環境",
     "xpack.apm.servicesTable.environmentCount": "{environmentCount, plural, other  {# 個の環境}}",
     "xpack.apm.servicesTable.healthColumnLabel": "ヘルス",
@@ -7319,6 +7902,7 @@
     "xpack.apm.settings.apmIndices.noPermissionTooltipLabel": "ユーザーロールには、APMインデックスを変更する権限がありません",
     "xpack.apm.settings.apmIndices.onboardingIndicesLabel": "オンボーディングインデックス",
     "xpack.apm.settings.apmIndices.sourcemapIndicesLabel": "ソースマップインデックス",
+    "xpack.apm.settings.apmIndices.spaceDescription": "インデックス設定が{spaceName}スペースに適用されます。",
     "xpack.apm.settings.apmIndices.spanIndicesLabel": "スパンインデックス",
     "xpack.apm.settings.apmIndices.title": "インデックス",
     "xpack.apm.settings.apmIndices.transactionIndicesLabel": "トランザクションインデックス",
@@ -7420,7 +8004,7 @@
     "xpack.apm.toggleHeight.showLessButtonLabel": "表示する行数を減らす",
     "xpack.apm.toggleHeight.showMoreButtonLabel": "表示する行数を増やす",
     "xpack.apm.tracesTable.avgResponseTimeColumnLabel": "レイテンシ（平均）",
-    "xpack.apm.tracesTable.impactColumnDescription": "ご利用のサービスで最も頻繁に使用されていて、最も遅いエンドポイントです。レイテンシとスループットを乗算した結果です",
+    "xpack.apm.tracesTable.impactColumnDescription": "ご利用のサービスで最も頻繁に使用されていて、最も遅いエンドポイントです。レイテンシをスループットで乗算して計算されました。",
     "xpack.apm.tracesTable.impactColumnLabel": "インパクト",
     "xpack.apm.tracesTable.nameColumnLabel": "名前",
     "xpack.apm.tracesTable.notFoundLabel": "このクエリのトレースが見つかりません",
@@ -7449,7 +8033,8 @@
     "xpack.apm.transactionActionMenu.trace.subtitle": "トレースログを表示し、さらに詳細を確認できます。",
     "xpack.apm.transactionActionMenu.trace.title": "トレースの詳細",
     "xpack.apm.transactionActionMenu.viewInUptime": "ステータス",
-    "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "サンプルドキュメントを表示",
+    "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "Discoverでトランザクションを表示",
+    "xpack.apm.transactionBreakdown.chartHelp": "各スパンタイプの平均期間。「app」はサービス内で何かが発生していたことを示します。これは、データベースや外部リクエストではなく、アプリケーションコードで時間がかかったこと、またはAPMエージェントの自動計測で実行されたコードが明らかにならないことを意味する場合があります。",
     "xpack.apm.transactionBreakdown.chartTitle": "スパンタイプ別時間",
     "xpack.apm.transactionDetails.clearSelectionAriaLabel": "選択した項目をクリア",
     "xpack.apm.transactionDetails.coldstartBadge": "コールドスタート",
@@ -7514,6 +8099,7 @@
     "xpack.apm.transactionsTable.cardinalityWarning.body": "一意のトランザクション名の数が構成された値{bucketSize}を超えています。エージェントを再構成し、類似したトランザクションをグループ化するか、{codeBlock}の値を増やしてください。",
     "xpack.apm.transactionsTable.cardinalityWarning.docsLink": "詳細はドキュメントをご覧ください",
     "xpack.apm.transactionsTable.cardinalityWarning.title": "このビューには、報告されたトランザクションのサブセットが表示されます。",
+    "xpack.apm.transactionsTable.errorMessage": "取得できませんでした",
     "xpack.apm.transactionsTable.linkText": "トランザクションを表示",
     "xpack.apm.transactionsTable.title": "トランザクション",
     "xpack.apm.transactionTypesSelectPlaceholder": "トランザクションタイプを選択",
@@ -7601,7 +8187,7 @@
     "xpack.apm.tutorial.javaClient.startApplication.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]（{documentationLink}）をご覧ください。",
     "xpack.apm.tutorial.javaClient.startApplication.textPre": "「-javaagent」フラグを追加し、システムプロパティを使用してエージェントを構成します。\n\n * 任意のサービス名を設定します（使用可能な文字は a-z、A-Z、0-9、-、_、スペースです）\n * カスタム APM Server URL（デフォルト：{customApmServerUrl}）を設定します\n * APM Server シークレットトークンを設定します\n * サービス環境を設定します\n * アプリケーションのベースパッケージを設定します",
     "xpack.apm.tutorial.javaClient.startApplication.title": "javaagent フラグでアプリケーションを起動",
-    "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.textPre": "デフォルトでは、APM Server を実行すると RUM サポートは無効になります。RUM サポートを有効にする手順については、[ドキュメンテーション]（{documentationLink}）をご覧ください。",
+    "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.textPre": "デフォルトでは、APM Server を実行すると RUM サポートは無効になります。RUM サポートを有効にする手順については、[ドキュメンテーション]（{documentationLink}）をご覧ください。FleetでAPM統合を使用するときには、RUMサポートが自動的に有効になります。",
     "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.title": "APM Server のリアルユーザー監視サポートを有効にする",
     "xpack.apm.tutorial.jsClient.installDependency.commands.setCustomApmServerUrlComment": "カスタム APM Server URL（デフォルト：{defaultApmServerUrl}）を設定します",
     "xpack.apm.tutorial.jsClient.installDependency.commands.setRequiredServiceNameComment": "任意のサービス名を設定します（使用可能な文字は a-z、A-Z、0-9、-、_、スペースです）",
@@ -7671,6 +8257,8 @@
     "xpack.apm.views.metrics.title": "メトリック",
     "xpack.apm.views.nodes.title": "JVM",
     "xpack.apm.views.overview.title": "概要",
+    "xpack.apm.views.serviceGroups.breadcrumbLabel": "サービス",
+    "xpack.apm.views.serviceGroups.title": "サービスグループ",
     "xpack.apm.views.serviceInventory.title": "サービス",
     "xpack.apm.views.serviceMap.title": "サービスマップ",
     "xpack.apm.views.serviceProfiling.title": "プロファイリング",
@@ -7895,6 +8483,7 @@
     "xpack.canvas.functions.alterColumn.args.typeHelpText": "列の変換語のタイプです。タイプを変更しない場合は未入力のままにします。",
     "xpack.canvas.functions.alterColumn.cannotConvertTypeErrorMessage": "「{type}」に変換できません",
     "xpack.canvas.functions.alterColumn.columnNotFoundErrorMessage": "列が見つかりません。'{column}'",
+    "xpack.canvas.functions.alterColumnHelpText": "{list}、{end}などのコアタイプを変換し、列名を変更します。{mapColumnFn}、{mathColumnFn}および{staticColumnFn}も参照してください。",
     "xpack.canvas.functions.any.args.conditionHelpText": "確認する条件です。",
     "xpack.canvas.functions.anyHelpText": "少なくとも 1 つの条件が満たされている場合、{BOOLEAN_TRUE} が返されます。{all_fn} もご参照ください。",
     "xpack.canvas.functions.as.args.nameHelpText": "列に付ける名前です。",
@@ -7958,12 +8547,12 @@
     "xpack.canvas.functions.embeddableHelpText": "指定された構成の埋め込み可能オブジェクトを返します",
     "xpack.canvas.functions.eq.args.valueHelpText": "{CONTEXT} と比較される値です。",
     "xpack.canvas.functions.eqHelpText": "{CONTEXT}が引数と等しいかを戻します。",
-    "xpack.canvas.functions.escount.args.indexHelpText": "インデックスまたはインデックスパターンです。例：{example}。",
+    "xpack.canvas.functions.escount.args.indexHelpText": "インデックスまたはデータビュー。例：{example}。",
     "xpack.canvas.functions.escount.args.queryHelpText": "{LUCENE} クエリ文字列です。",
     "xpack.canvas.functions.escountHelpText": "{ELASTICSEARCH} にクエリを実行して、指定されたクエリに一致するヒット数を求めます。",
     "xpack.canvas.functions.esdocs.args.countHelpText": "取得するドキュメント数です。パフォーマンスを向上させるには、小さなデータセットを使用します。",
     "xpack.canvas.functions.esdocs.args.fieldsHelpText": "フィールドのコンマ区切りのリストです。パフォーマンスを向上させるには、フィールドの数を減らします。",
-    "xpack.canvas.functions.esdocs.args.indexHelpText": "インデックスまたはインデックスパターンです。例：{example}。",
+    "xpack.canvas.functions.esdocs.args.indexHelpText": "インデックスまたはデータビュー。例：{example}。",
     "xpack.canvas.functions.esdocs.args.metaFieldsHelpText": "メタフィールドのコンマ区切りのリストです。例：{example}。",
     "xpack.canvas.functions.esdocs.args.queryHelpText": "{LUCENE} クエリ文字列です。",
     "xpack.canvas.functions.esdocs.args.sortHelpText": "{directions} フォーマットの並べ替え方向です。例：{example1} または {example2}。",
@@ -8095,6 +8684,7 @@
     "xpack.canvas.functions.sortHelpText": "{DATATABLE}を指定された列で並べ替えます。",
     "xpack.canvas.functions.staticColumn.args.nameHelpText": "新しい列の名前です。",
     "xpack.canvas.functions.staticColumn.args.valueHelpText": "新しい列の各行に挿入する値です。ヒント：部分式を使用して他の列を静的値にロールアップします。",
+    "xpack.canvas.functions.staticColumnHelpText": "すべての行に同じ静的値の列を追加します。{alterColumnFn}、{mapColumnFn}および{mathColumnFn}も参照してください",
     "xpack.canvas.functions.string.args.valueHelpText": "1 つの文字列に結合する値です。必要な場所にスペースを入れてください。",
     "xpack.canvas.functions.stringHelpText": "すべての引数を 1 つの文字列に連結させます。",
     "xpack.canvas.functions.switch.args.caseHelpText": "確認する条件です。",
@@ -8405,7 +8995,7 @@
     "xpack.canvas.uis.dataSources.esdocs.fieldsLabel": "スクリプトフィールドを利用できません",
     "xpack.canvas.uis.dataSources.esdocs.fieldsTitle": "フィールド",
     "xpack.canvas.uis.dataSources.esdocs.fieldsWarningLabel": "このデータソースは、10 個以下のフィールドで最も高い性能を発揮します",
-    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "インデックス名を入力するか、インデックスパターンを選択してください",
+    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "インデックス名を入力するか、データビューを選択してください",
     "xpack.canvas.uis.dataSources.esdocs.indexTitle": "インデックス",
     "xpack.canvas.uis.dataSources.esdocs.queryLabel": "{lucene} クエリ文字列構文",
     "xpack.canvas.uis.dataSources.esdocs.queryTitle": "クエリ",
@@ -8845,6 +9435,10 @@
     "xpack.canvas.workpadTemplates.table.descriptionColumnTitle": "説明",
     "xpack.canvas.workpadTemplates.table.nameColumnTitle": "テンプレート名",
     "xpack.canvas.workpadTemplates.table.tagsColumnTitle": "タグ",
+    "xpack.cases.actions.caseAlertSuccessSyncText": "このケースのアラートはステータスがケースステータスと同期されました",
+    "xpack.cases.actions.caseAlertSuccessToast": "アラートが「{title}」に追加されました",
+    "xpack.cases.actions.caseSuccessToast": "{title}が更新されました",
+    "xpack.cases.actions.viewCase": "ケースの表示",
     "xpack.cases.addConnector.title": "コネクターの追加",
     "xpack.cases.allCases.actions": "アクション",
     "xpack.cases.allCases.comments": "コメント",
@@ -8935,8 +9529,6 @@
     "xpack.cases.caseView.errorsPushServiceCallOutTitle": "外部コネクターを選択",
     "xpack.cases.caseView.fieldChanged": "変更されたコネクターフィールド",
     "xpack.cases.caseView.fieldRequiredError": "必須フィールド",
-    "xpack.cases.caseView.generatedAlertCommentLabelTitle": "から追加されました",
-    "xpack.cases.caseView.generatedAlertCountCommentLabelTitle": "{totalCount} {totalCount, plural, other  {アラート}}",
     "xpack.cases.caseView.isolatedHost": "ホストで分離リクエストが送信されました",
     "xpack.cases.caseView.lockedIncidentDesc": "更新は必要ありません",
     "xpack.cases.caseView.lockedIncidentTitle": "{ thirdParty }インシデントは最新です",
@@ -8991,11 +9583,13 @@
     "xpack.cases.common.alertLabel": "アラート",
     "xpack.cases.common.alertsLabel": "アラート",
     "xpack.cases.common.allCases.caseModal.title": "ケースを選択",
+    "xpack.cases.common.appDescription": "問題を開いて追跡し、情報をサードパーティシステムに配信します。",
     "xpack.cases.common.appropriateLicense": "適切なライセンス",
+    "xpack.cases.common.appTitle": "ケース",
     "xpack.cases.common.noConnector": "コネクターを選択していません",
     "xpack.cases.components.create.syncAlertHelpText": "このオプションを有効にすると、このケースのアラートのステータスをケースステータスと同期します。",
     "xpack.cases.configure.connectorDeletedOrLicenseWarning": "選択したコネクターが削除されたか、使用するための{appropriateLicense}がありません。別のコネクターを選択するか、新しいコネクターを作成してください。",
-    "xpack.cases.configure.readPermissionsErrorDescription": "コネクターを表示するアクセス権がありません。このケースに関連付けら他コネクターを表示する場合は、Kibana管理者に連絡してください。",
+    "xpack.cases.configure.readPermissionsErrorDescription": "コネクターを表示するアクセス権がありません。コネクターを表示する場合は、Kibana管理者に連絡してください。",
     "xpack.cases.configure.successSaveToast": "保存された外部接続設定",
     "xpack.cases.configureCases": "ケースを構成",
     "xpack.cases.configureCases.addNewConnector": "新しいコネクターを追加",
@@ -9097,8 +9691,13 @@
     "xpack.cases.createCase.titleFieldRequiredError": "タイトルが必要です。",
     "xpack.cases.editConnector.editConnectorLinkAria": "クリックしてコネクターを編集",
     "xpack.cases.emptyString.emptyStringDescription": "空の文字列",
+    "xpack.cases.features.casesFeatureName": "ケース",
     "xpack.cases.getCurrentUser.Error": "ユーザーの取得エラー",
     "xpack.cases.getCurrentUser.unknownUser": "不明",
+    "xpack.cases.header.badge.betaDesc": "現在、この機能はベータです。不具合を見つけた場合やご意見がある場合、サポートに問い合わせるか、またはディスカッションフォーラムにご報告ください。",
+    "xpack.cases.header.badge.betaLabel": "ベータ",
+    "xpack.cases.header.badge.experimentalDesc": "この機能はテクニカルプレビュー中であり、将来のリリースでは変更されたり完全に削除されたりする場合があります。Elasticは最善の努力を講じてすべての問題の修正に努めますが、テクニカルプレビュー中の機能には正式なGA機能のサポートSLAが適用されません。",
+    "xpack.cases.header.badge.experimentalLabel": "テクニカルプレビュー",
     "xpack.cases.header.editableTitle.cancel": "キャンセル",
     "xpack.cases.header.editableTitle.editButtonAria": "クリックすると {title} を編集できます",
     "xpack.cases.header.editableTitle.save": "保存",
@@ -9145,6 +9744,8 @@
     "xpack.cases.status.iconAria": "ステータスの変更",
     "xpack.cases.status.inProgress": "進行中",
     "xpack.cases.status.open": "開く",
+    "xpack.cloud.chat.chatFrameTitle": "チャット",
+    "xpack.cloud.chat.hideChatButtonLabel": "グラフを非表示",
     "xpack.cloud.deploymentLinkLabel": "このデプロイの管理",
     "xpack.cloud.userMenuLinks.accountLinkText": "会計・請求",
     "xpack.cloud.userMenuLinks.profileLinkText": "プロフィール",
@@ -9460,7 +10061,129 @@
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.singleUnfollowDescription": "フォロワーインデックスは標準のインデックスに変換されます。今後クラスター横断レプリケーションには表示されませんが、インデックス管理で管理できます。この操作は元に戻すことができません。",
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowMultipleTitle": "{count} 件のリーダーインデックスのフォローを解除しますか？",
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowSingleTitle": "「{name}」のリーダーインデックスのフォローを解除しますか？",
+    "xpack.csp.active_frameworks": "アクティブなフレームワーク",
+    "xpack.csp.benchmarks.integrationsNotFoundForNameMessage": " \"{name}\"",
+    "xpack.csp.benchmarks.integrationsNotFoundMessage": "ベンチマーク統合が見つかりません",
+    "xpack.csp.benchmarks.integrationsNotFoundWithFiltersMessage": "上記のフィルターでベンチマーク統合が見つかりませんでした。",
+    "xpack.csp.benchmarks.searchPlaceholder": "例：ベンチマーク名",
+    "xpack.csp.benchmarks.totalIntegrationsCountMessage": "{pageCount}/{totalCount, plural, other {#個の統合}}を表示しています",
+    "xpack.csp.cloud_posture": "クラウド態勢",
+    "xpack.csp.cloud_posture_score": "クラウド態勢スコア",
+    "xpack.csp.coming_soon": "まもなくリリース",
+    "xpack.csp.compliance_score": "コンプライアンススコア",
+    "xpack.csp.compliance_trend": "コンプライアンス傾向",
+    "xpack.csp.complianceDashboard.failedFindingsChartLabel": "失敗した調査結果",
+    "xpack.csp.complianceDashboard.noDataConfig.actionDescription": "データの再取得を試行できます",
+    "xpack.csp.complianceDashboard.noDataConfig.actionTitle": "再試行",
+    "xpack.csp.complianceDashboard.noDataConfig.pageTitle": "クラウドセキュリティコンプライアンスダッシュボード",
+    "xpack.csp.complianceDashboard.noDataConfig.solutionNameLabel": "クラウドセキュリティ態勢",
+    "xpack.csp.cspPageTemplate.defaultNoDataConfig.pageTitle": "データが見つかりません",
+    "xpack.csp.cspPageTemplate.defaultNoDataConfig.solutionNameLabel": "クラウドセキュリティ態勢",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.buttonLabel": "CIS統合を追加",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.description": "CIS Kubernetes Benchmark統合は、CISの推奨事項に照らしてKubernetesクラスター設定を測定します。",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.pageTitle": "開始するには統合をインストールしてください",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.solutionNameLabel": "クラウドセキュリティ態勢",
+    "xpack.csp.cspSettings.rules": "CSPセキュリティルール - ",
+    "xpack.csp.error": "エラー",
+    "xpack.csp.failed": "失敗",
+    "xpack.csp.findings": "調査結果",
+    "xpack.csp.findings.agentLabel": "エージェント",
+    "xpack.csp.findings.architectureLabel": "アーキテクチャー",
+    "xpack.csp.findings.auditLabel": "監査",
+    "xpack.csp.findings.benchmarkLabel": "ベンチマーク",
+    "xpack.csp.findings.codenameLabel": "コード名",
+    "xpack.csp.findings.containerizedLabel": "コンテナー化",
+    "xpack.csp.findings.defaultValueLabel": "デフォルト値",
+    "xpack.csp.findings.descriptionLabel": "説明",
+    "xpack.csp.findings.evaluationLabel": "評価",
+    "xpack.csp.findings.evidenceLabel": "証拠",
+    "xpack.csp.findings.expectedLabel": "期待値",
+    "xpack.csp.findings.familyLabel": "ファミリー",
+    "xpack.csp.findings.filenameLabel": "ファイル名",
+    "xpack.csp.findings.frameworkSourcesLabel": "フレームワークソース",
+    "xpack.csp.findings.gidLabel": "GID",
+    "xpack.csp.findings.hostLabel": "ホスト",
+    "xpack.csp.findings.hostnameLabel": "ホスト名",
+    "xpack.csp.findings.idLabel": "ID",
+    "xpack.csp.findings.impactLabel": "インパクト",
+    "xpack.csp.findings.indexLabel": "インデックス",
+    "xpack.csp.findings.ipLabel": "IP",
+    "xpack.csp.findings.kernelLabel": "カーネル",
+    "xpack.csp.findings.macLabel": "Mac",
+    "xpack.csp.findings.modeLabel": "モード",
+    "xpack.csp.findings.nameLabel": "名前",
+    "xpack.csp.findings.nonFindingsLabel": "調査結果はありません",
+    "xpack.csp.findings.osLabel": "OS",
+    "xpack.csp.findings.pathLabel": "パス",
+    "xpack.csp.findings.platformLabel": "プラットフォーム",
+    "xpack.csp.findings.profileApplicabilityLabel": "プロファイル適用性",
+    "xpack.csp.findings.rationaleLabel": "根拠",
+    "xpack.csp.findings.remediationLabel": "修正",
+    "xpack.csp.findings.resourceLabel": "リソース",
+    "xpack.csp.findings.resultLabel": "結果詳細",
+    "xpack.csp.findings.ruleEvaluatedAt": "ルール評価日",
+    "xpack.csp.findings.ruleLabel": "ルール",
+    "xpack.csp.findings.ruleNameLabel": "ルール名",
+    "xpack.csp.findings.searchFailedLabel": "検索失敗",
+    "xpack.csp.findings.sectionLabel": "セクション",
+    "xpack.csp.findings.severityLabel": "深刻度",
+    "xpack.csp.findings.tagsLabel": "タグ",
+    "xpack.csp.findings.timestampLabel": "タイムスタンプ",
+    "xpack.csp.findings.typeLabel": "型",
+    "xpack.csp.findings.uidLabel": "UID",
+    "xpack.csp.findings.versionLabel": "バージョン",
+    "xpack.csp.open_cases": "ケースを開く",
+    "xpack.csp.pageTemplate.errorDetails.errorBodyTitle": "{body}",
+    "xpack.csp.pageTemplate.errorDetails.errorCodeTitle": "{error} {statusCode}",
+    "xpack.csp.pageTemplate.loadErrorMessage": "クラウドセキュリティ態勢データを取得できませんでした",
+    "xpack.csp.passed": "合格",
+    "xpack.csp.posture_score": "態勢スコア",
+    "xpack.csp.posture_score_trend": "態勢スコア傾向",
+    "xpack.csp.resource_type": "リソースタイプ",
+    "xpack.csp.rules.activateAllButtonLabel": "{count, plural, other {#個のルール}}をアクティブ化",
+    "xpack.csp.rules.activatedLabel": "有効化",
+    "xpack.csp.rules.activateLabel": "有効化",
+    "xpack.csp.rules.bulkActionsButtonLabel": "一括アクション",
+    "xpack.csp.rules.cancelButtonLabel": "キャンセル",
+    "xpack.csp.rules.clearSelectionButtonLabel": "選択した項目をクリア",
+    "xpack.csp.rules.deactivateAllButtonLabel": "{count, plural, other {#個のルール}}を非アクティブ化",
+    "xpack.csp.rules.deactivateLabel": "無効化",
+    "xpack.csp.rules.disableLabel": "無効にする",
+    "xpack.csp.rules.enableLabel": "有効にする",
+    "xpack.csp.rules.header.rulesCountLabel": "{count, plural, other {個のルール}}",
+    "xpack.csp.rules.header.selectedRulesCount": "選択した{rules}",
+    "xpack.csp.rules.header.totalRulesCount": "{rules}を表示しています",
+    "xpack.csp.rules.manageIntegrationButtonLabel": "統合を管理",
+    "xpack.csp.rules.missingRulesMessage": "ルールがありません",
+    "xpack.csp.rules.refreshButtonLabel": "更新",
+    "xpack.csp.rules.ruleFlyout.auditLabel": "監査",
+    "xpack.csp.rules.ruleFlyout.defaultValueLabel": "デフォルト値",
+    "xpack.csp.rules.ruleFlyout.frameworkSourcesLabel": "フレームワークソース",
+    "xpack.csp.rules.ruleFlyout.impactLabel": "インパクト",
+    "xpack.csp.rules.ruleFlyout.profileApplicabilityLabel": "プロファイル適用性",
+    "xpack.csp.rules.ruleFlyout.rationaleLabel": "根拠",
+    "xpack.csp.rules.ruleFlyout.referencesLabel": "基準",
+    "xpack.csp.rules.ruleFlyout.remediationLabel": "修正",
+    "xpack.csp.rules.ruleFlyout.sectionsLabel": "セクション",
+    "xpack.csp.rules.ruleFlyout.tabs.overviewTabLabel": "概要",
+    "xpack.csp.rules.ruleFlyout.tabs.regoCodeTabLabel": "Regoコード",
+    "xpack.csp.rules.ruleFlyout.tabs.remediationTabLabel": "修正",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.enabledLabel": "有効",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.lastModifiedLabel": "最終更新：",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.nameLabel": "ルール名",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.sectionLabel": "セクション",
+    "xpack.csp.rules.saveButtonLabel": "保存",
+    "xpack.csp.rules.searchPlaceholder": "検索",
+    "xpack.csp.rules.selectAllButtonLabel": "すべて選択",
+    "xpack.csp.rules.tableHeader.lastModificationLabel": "統合{timeAgo}の前回変更日 ",
+    "xpack.csp.rules.unknownErrorMessage": "不明なエラー",
+    "xpack.csp.rules.updateFailedMessage": "更新が失敗しました",
+    "xpack.csp.status": "ステータス",
+    "xpack.csp.total_failures": "合計失敗数",
+    "xpack.csp.total_resources": "合計リソース数",
+    "xpack.csp.view_all_failed_findings": "すべてのフィールド調査結果を表示",
     "xpack.dashboard.components.DashboardDrilldownConfig.chooseDestinationDashboard": "対象ダッシュボードを選択",
+    "xpack.dashboard.components.DashboardDrilldownConfig.openInNewTab": "新しいタブでダッシュボードを開く",
     "xpack.dashboard.components.DashboardDrilldownConfig.useCurrentDateRange": "元のダッシュボードから日付範囲を使用",
     "xpack.dashboard.components.DashboardDrilldownConfig.useCurrentFilters": "元のダッシュボードからフィルターとクエリを使用",
     "xpack.dashboard.drilldown.errorDestinationDashboardIsMissing": "対象ダッシュボード（'{dashboardId}'）は存在しません。別のダッシュボードを選択してください。",
@@ -9819,6 +10542,8 @@
     "xpack.dataVisualizer.index.dataViewManagement.actionsPopoverLabel": "データビュー設定",
     "xpack.dataVisualizer.index.dataViewManagement.addFieldButton": "フィールドをデータビューに追加",
     "xpack.dataVisualizer.index.dataViewManagement.manageFieldButton": "データビューフィールドを管理",
+    "xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationDescription": "異常検知は時間ベースのインデックスでのみ実行されます",
+    "xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationTitle": "データビュー{dataViewTitle}は時系列に基づいていません",
     "xpack.dataVisualizer.index.embeddableErrorDescription": "埋め込み可能オブジェクトの読み込みエラーが発生しました。すべての必須入力が有効であるかどうかを確認してください。",
     "xpack.dataVisualizer.index.embeddableErrorTitle": "埋め込み可能オブジェクトの読み込みエラー",
     "xpack.dataVisualizer.index.embeddableNoResultsMessage": "結果が見つかりませんでした",
@@ -9829,6 +10554,7 @@
     "xpack.dataVisualizer.index.fieldTypeSelect": "フィールド型",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification": "時間範囲の設定中にエラーが発生しました。",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.moreOptionsButtonAriaLabel": "その他のオプション",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.noResults": "検索条件と一致する結果がありません。",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataButtonLabel": "完全なデータを使用",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataExcludingFrozenMenuLabel": "凍結されたデータティアを除外",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataIncludingFrozenMenuLabel": "凍結されたデータティアを含める",
@@ -9846,6 +10572,7 @@
     "xpack.dataVisualizer.searchPanel.numberFieldsLabel": "数値フィールド",
     "xpack.dataVisualizer.searchPanel.ofFieldsTotal": "合計 {totalCount}",
     "xpack.dataVisualizer.searchPanel.queryBarPlaceholder": "小さいサンプルサイズを選択することで、クエリの実行時間を短縮しクラスターへの負荷を軽減できます。",
+    "xpack.dataVisualizer.searchPanel.queryBarPlaceholderText": "検索…（例：status:200 AND extension:\"PHP\"）",
     "xpack.dataVisualizer.searchPanel.sampleSizeAriaLabel": "サンプリングするドキュメント数を選択してください",
     "xpack.dataVisualizer.searchPanel.sampleSizeOptionLabel": "サンプルサイズ（シャード単位）：{wrappedValue}",
     "xpack.dataVisualizer.searchPanel.showEmptyFields": "空のフィールドを表示",
@@ -9873,6 +10600,7 @@
     "xpack.enterpriseSearch.appSearch.allEnginesDescription": "すべてのエンジンへの割り当てには、後から作成および管理されるすべての現在および将来のエンジンが含まれます。",
     "xpack.enterpriseSearch.appSearch.allEnginesLabel": "すべてのエンジンに割り当て",
     "xpack.enterpriseSearch.appSearch.analystRoleTypeDescription": "アナリストは、ドキュメント、クエリテスト、分析のみを表示できます。",
+    "xpack.enterpriseSearch.appSearch.audit.title": "監査",
     "xpack.enterpriseSearch.appSearch.crawler.action.deleteDomain.confirmationPopupMessage": "ドメイン\"{domainUrl}\"とすべての設定を削除しますか？",
     "xpack.enterpriseSearch.appSearch.crawler.action.deleteDomain.successMessage": "ドメイン'{domainUrl}'が削除されました",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainFlyout.description": "複数のドメインをこのエンジンのWebクローラーに追加できます。ここで別のドメインを追加して、[管理]ページからエントリポイントとクロールルールを変更します。",
@@ -9908,6 +10636,20 @@
     "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlDepthLabel": "最大クロール深度",
     "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlTypeLabel": "クロールタイプ",
     "xpack.enterpriseSearch.appSearch.crawler.configurationDocumentationLinkDescription": "Kibanaでのクローラーログの構成の詳細をご覧ください",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.customEntryPointUrlsTextboxLabel": "カスタム入力ポイントURL",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.customSitemapUrlsTextboxLabel": "カスタムサイトマップURL",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.domainsAccordionButtonLabel": "ドメインをクロールに追加",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.emptyDomainsMessage": "ドメインを選択してください。",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.entryPointsTabLabel": "エントリポイント",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.flyoutHeaderDescription": "カスタム設定でワンタイムクロールを設定します。",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.flyoutHeadTitle": "カスタムクロール構成",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.includeSitemapsCheckboxLabel": "{robotsDotTxt}で検出されたサイトマップを含める",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.maxCrawlDepthFieldDescription": "クローラーが走査するページの数を指定する最大クロール深度を設定します。クロールをエントリポイントのみに制限する場合は、値を1に設定します。",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.maxCrawlDepthFieldLabel": "最大クロール深度",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.seedUrlsAccordionButtonLabel": "シードURL",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.selectedDescriptor": "選択済み",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.sitemapsTabLabel": "サイトマップ",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.startCrawlButtonLabel": "今すぐ適用してクロール",
     "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.previewTabLabel": "プレビュー",
     "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.rawJSONTabLabel": "元のJSON",
     "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.title": "クロールリクエスト詳細",
@@ -10019,8 +10761,10 @@
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.title": "サイトマップ",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.urlTableHead": "URL",
     "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlAllDomainsMenuLabel": "このエンジンのすべてのドメインをクロール",
+    "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlCustomSettingsMenuLabel": "カスタム設定でクロール",
     "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlSelectDomainsMenuLabel": "選択したドメインをクロール",
     "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.startACrawlButtonLabel": "クロールを開始",
+    "xpack.enterpriseSearch.appSearch.crawler.urlComboBox.invalidUrlErrorMessage": "有効なURLを入力してください",
     "xpack.enterpriseSearch.appSearch.credentials.apiEndpoint": "エンドポイント",
     "xpack.enterpriseSearch.appSearch.credentials.apiKeys": "APIキー",
     "xpack.enterpriseSearch.appSearch.credentials.copied": "コピー完了",
@@ -10082,10 +10826,31 @@
     "xpack.enterpriseSearch.appSearch.documentCreation.api.description": "{documentsApiLink}を使用すると、新しいドキュメントをエンジンに追加できるほか、ドキュメントの更新、IDによるドキュメントの取得、ドキュメントの削除が可能です。基本操作を説明するさまざまな{clientLibrariesLink}があります。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.example": "実行中のAPIを表示するには、コマンドラインまたはクライアントライブラリを使用して、次の要求の例で実験することができます。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.title": "APIでインデックス",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.apiDescription": "ドキュメントエンドポイントにPOST",
     "xpack.enterpriseSearch.appSearch.documentCreation.buttons.apiTitle": "API からインデックス",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.crawlDescription": "URLから自動的にドキュメントにインデックス",
     "xpack.enterpriseSearch.appSearch.documentCreation.buttons.crawlTitle": "Crawler を使用",
-    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonTitle": "JSON の貼り付け",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateFooterLink": "ドキュメンテーションを表示",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateFooterText": "ドキュメントのインデックスの詳細",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateIllustrationAltText": "図解",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateTitle": "ドキュメントを追加",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonDescription": "元のJSONを貼り付けるかアップロードして、ドキュメントを追加",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonTitle": "JSONを貼り付けまたはアップロード",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.button": "インデックスに接続",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.description": "エンタープライズ サーチUIを使用して、既存のElasticsearchインデックスに直接接続し、データを検索可能かつチューニング可能にできるようになりました。{learnMoreLink}",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.docCount": "ドキュメント数：",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.indexSelectorAriaLabel": "Elasticsearchインデックスを選択",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.link": "既存のインデックスの使用の詳細",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.selectable.empty": "Elasticsearchインデックスがありません",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.selectable.loading": "Elasticsearchインデックスを読み込んでいます",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.status": "ステータス：",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.storage": "ストレージサイズ：",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.title": "Elasticsearchインデックスを関連付け",
     "xpack.enterpriseSearch.appSearch.documentCreation.errorsTitle": "何か問題が発生しましたエラーを解決して、再試行してください。",
+    "xpack.enterpriseSearch.appSearch.documentCreation.helperText": "ドキュメントをインデックスのためにエンジンに送信するには、3つの方法があります。JSONファイルの貼り付けやアップロード、ドキュメントAPIエンドポイントへのPOST、Elastic Webクローラーの使用によって、URLから自動的にドキュメントにインデックスを作成できます。",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.pasteTabName": "貼り付け",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.title": "JSONを貼り付けまたはアップロード",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.uploadTabName": "アップロード",
     "xpack.enterpriseSearch.appSearch.documentCreation.largeFile": "非常に大きいファイルをアップロードしています。ブラウザーがロックされたり、処理に非常に時間がかかったりする可能性があります。可能な場合は、データを複数の小さいファイルに分割してください。",
     "xpack.enterpriseSearch.appSearch.documentCreation.noFileFound": "ファイルが見つかりません。",
     "xpack.enterpriseSearch.appSearch.documentCreation.notValidJson": "ドキュメントの内容は、有効なJSON配列またはオブジェクトでなければなりません。",
@@ -10109,6 +10874,8 @@
     "xpack.enterpriseSearch.appSearch.documentDetail.fieldHeader": "フィールド",
     "xpack.enterpriseSearch.appSearch.documentDetail.title": "ドキュメント：{documentId}",
     "xpack.enterpriseSearch.appSearch.documentDetail.valueHeader": "値",
+    "xpack.enterpriseSearch.appSearch.documents.elasticsearchEngineCallout": "エンジンは{elasticsearchIndexName}に接続されています。Kibanaでこのインデックスのデータを修正できます。",
+    "xpack.enterpriseSearch.appSearch.documents.elasticsearchEngineCallout.title": "このエンジンのデータはElasticsearchで管理されています。",
     "xpack.enterpriseSearch.appSearch.documents.empty.description": "JSONをアップロードするか、APIを使用して、App Search Web Crawlerを使用して、ドキュメントをインデックスできます。",
     "xpack.enterpriseSearch.appSearch.documents.empty.title": "最初のドキュメントを追加",
     "xpack.enterpriseSearch.appSearch.documents.indexDocuments": "ドキュメントのインデックスを作成",
@@ -10135,8 +10902,14 @@
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.ariaLabel": "結果の並べ替え条件",
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.ascendingDropDownOptionLabel": "{fieldName}（昇順）",
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.descendingDropDownOptionLabel": "{fieldName}（降順）",
+    "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.documentId": "ドキュメントID",
+    "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.relevance": "<b>関連性</b>",
     "xpack.enterpriseSearch.appSearch.documents.title": "ドキュメント",
     "xpack.enterpriseSearch.appSearch.editorRoleTypeDescription": "エディターは検索設定を管理できます。",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateButton": "インデックスの管理",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateIllustrationAltText": "図解",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateTitle": "ドキュメントをインデックスに追加",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.helperText": "Elasticsearchインデックスの{elasticsearchIndexName}にはまだドキュメントがありません。Kibanaでインデックス管理を開き、Elasticsearchを変更します。",
     "xpack.enterpriseSearch.appSearch.emptyState.createFirstEngineCta": "エンジンを作成",
     "xpack.enterpriseSearch.appSearch.emptyState.description1": "App Searchエンジンは、検索エクスペリエンスのために、ドキュメントを格納します。",
     "xpack.enterpriseSearch.appSearch.emptyState.nonAdmin.description": "App Search管理者に問い合わせ、エンジンへのアクセスを作成するか、付与するように依頼してください。",
@@ -10247,7 +11020,6 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryButtonLabel": "クエリを管理",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryDescription": "このキュレーションのクエリを編集、追加、削除します。",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryTitle": "クエリを管理",
-    "xpack.enterpriseSearch.appSearch.engine.curations.newBadgeLabel": "新機能！",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.description": "表示するオーガニック結果はありません。{manualDescription}",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.manualDescription": "上記のアクティブなクエリを追加または変更します。",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.title": "\"{currentQuery}\"の上位のオーガニックドキュメント",
@@ -10308,6 +11080,7 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.table.title": "アクティブなキュレーション",
     "xpack.enterpriseSearch.appSearch.engine.curations.title": "キュレーション",
     "xpack.enterpriseSearch.appSearch.engine.documents.empty.buttonLabel": "ドキュメントガイドを読む",
+    "xpack.enterpriseSearch.appSearch.engine.elasticsearchEngineBadge": "ELASTICSEARCHインデックス",
     "xpack.enterpriseSearch.appSearch.engine.metaEngineBadge": "メタエンジン",
     "xpack.enterpriseSearch.appSearch.engine.notFound": "名前「{engineName}」のエンジンが見つかりませんでした。",
     "xpack.enterpriseSearch.appSearch.engine.overview.analyticsLink": "分析を表示",
@@ -10341,6 +11114,7 @@
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.description": "エンジンの精度および関連性設定を管理",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.disabledFields.title": "無効なフィールド ",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.disabledFieldsExplanationMessage": "フィールド型の競合のため無効です",
+    "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.elasticsearch.description": "エンジンの精度および関連性設定を管理",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.buttonLabel": "関連するチューニングガイドをお読みください",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.description": "一部のドキュメントにインデックスを作成すると、スキーマが自動的に作成されます。",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.title": "関連性を調整するドキュメントを追加",
@@ -10444,6 +11218,8 @@
     "xpack.enterpriseSearch.appSearch.engine.schema.metaEngine.title": "メタエンジンスキーマ",
     "xpack.enterpriseSearch.appSearch.engine.schema.pageDescription": "新しいフィールドを追加するか、既存のフィールドの型を変更します。",
     "xpack.enterpriseSearch.appSearch.engine.schema.pageTitle": "メタエンジンスキーマを管理",
+    "xpack.enterpriseSearch.appSearch.engine.schema.readOnly.pageDescription": "スキーマフィールド型を表示します。",
+    "xpack.enterpriseSearch.appSearch.engine.schema.readOnly.pageTitle": "エンジンスキーマ",
     "xpack.enterpriseSearch.appSearch.engine.schema.reindexErrorsBreadcrumb": "再インデックスエラー",
     "xpack.enterpriseSearch.appSearch.engine.schema.reindexJob.title": "スキーマ変更エラー",
     "xpack.enterpriseSearch.appSearch.engine.schema.title": "スキーマ",
@@ -10509,6 +11285,8 @@
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.sanitizedNameHelpText": "エンジン名が変更されます",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.submitButton.buttonLabel": "エンジンを作成",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.title": "<u>エンジン名を指定</u>",
+    "xpack.enterpriseSearch.appSearch.engineCreation.searchIndexSelectable.helpText": "エイリアス'search-'のインデックスのみを選択できます",
+    "xpack.enterpriseSearch.appSearch.engineCreation.searchIndexSelectable.label": "使用するElasticsearchインデックスを選択",
     "xpack.enterpriseSearch.appSearch.engineCreation.successMessage": "エンジン'{name}'が作成されました",
     "xpack.enterpriseSearch.appSearch.engineCreation.supportedLanguages.chineseDropDownOptionLabel": "中国語",
     "xpack.enterpriseSearch.appSearch.engineCreation.supportedLanguages.danishDropDownOptionLabel": "デンマーク語",
@@ -10529,6 +11307,12 @@
     "xpack.enterpriseSearch.appSearch.engineRequiredError": "1つ以上の割り当てられたエンジンが必要です。",
     "xpack.enterpriseSearch.appSearch.engines.apiLogs.newEventsButtonLabel": "更新",
     "xpack.enterpriseSearch.appSearch.engines.apiLogs.newEventsMessage": "新しいイベントが記録されました。",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.closeButton": "閉じる",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.eventTip": "過去24時間のイベントを表示しています",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.eventCategory": "イベントカテゴリ",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.eventType": "イベントタイプ",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.outcome": "成果",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.updatedBy": "更新者",
     "xpack.enterpriseSearch.appSearch.engines.createEngineButtonLabel": "エンジンを作成",
     "xpack.enterpriseSearch.appSearch.engines.createMetaEngineButtonLabel": "メタエンジンを作成",
     "xpack.enterpriseSearch.appSearch.engines.metaEngines.emptyPromptButtonLabel": "メタエンジンの詳細",
@@ -10547,6 +11331,7 @@
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.documentCount": "ドキュメントカウント",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.fieldCount": "フィールドカウント",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.language": "言語",
+    "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.lastUpdated": "最終更新",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.name": "名前",
     "xpack.enterpriseSearch.appSearch.enginesOverview.title": "エンジン概要",
     "xpack.enterpriseSearch.appSearch.integrations.apiDescription": "App Searchの堅牢なAPIを使用して、検索をアプリケーションに追加します。",
@@ -10569,6 +11354,8 @@
     "xpack.enterpriseSearch.appSearch.logRetention.type.analytics.title.lowercase": "分析",
     "xpack.enterpriseSearch.appSearch.logRetention.type.api.title.capitalized": "API",
     "xpack.enterpriseSearch.appSearch.logRetention.type.api.title.lowercase": "API",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.audit.title.capitalized": "監査",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.audit.title.lowercase": "監査",
     "xpack.enterpriseSearch.appSearch.logRetention.type.crawler.title.capitalized": "Webクローラー",
     "xpack.enterpriseSearch.appSearch.logRetention.type.crawler.title.lowercase": "Webクローラー",
     "xpack.enterpriseSearch.appSearch.metaEngineCreation.form.documentationDescription": "基本操作については、{documentationLink}。",
@@ -10607,6 +11394,7 @@
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.title": "ティアを始めたばかりの場合",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.analytics.label": "ログ分析イベント",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.api.label": "ログAPIイベント",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.audit.label": "監査イベントのログ出力",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.crawler.label": "Webクローラーログ",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.description": "ログ保持はデプロイのILMポリシーで決定されます。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.learnMore": "エンタープライズ サーチのログ保持の詳細をご覧ください。",
@@ -10616,6 +11404,9 @@
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.description": "書き込みを無効にすると、エンジンがAPIイベントのログを停止します。既存のデータは保存時間フレームに従って削除されます。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.subheading": "API ログは現在 {minAgeDays} 日間保存されています。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.title": "API 書き込みを無効にする",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.description": "書き込みを無効にすると、エンジンが監査イベントのログを停止します。既存のデータは保存時間フレームに従って削除されます。",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.subheading": "監査ログは現在{minAgeDays}日間保存されています。",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.title": "監査の書き込みを無効にする",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.description": "書き込みを無効にすると、エンジンがWebクローラーイベントのログを停止します。既存のデータは保存時間フレームに従って削除されます。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.subheading": "現在、Webクローラーログは{minAgeDays}日間保存されています。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.title": "Webクローラーの書き込みを無効にする",
@@ -10646,9 +11437,24 @@
     "xpack.enterpriseSearch.appSearch.tokens.search.description": "エンドポイントのみの検索では、公開検索キーが使用されます。",
     "xpack.enterpriseSearch.appSearch.tokens.search.name": "公開検索キー",
     "xpack.enterpriseSearch.appSearch.tokens.update": "APIキー'{name}'が更新されました",
+    "xpack.enterpriseSearch.content.description": "エンタープライズ サーチでは、さまざまな方法で簡単にデータを検索可能にできます。Webクローラー、Elasticsearchインデックス、API、直接アップロード、サードパーティコネクターから選択します。",
+    "xpack.enterpriseSearch.content.nav.appSearchTitle": "App Search",
+    "xpack.enterpriseSearch.content.nav.contentTitle": "コンテンツ",
+    "xpack.enterpriseSearch.content.nav.enterpriseSearchOverviewTitle": "概要",
+    "xpack.enterpriseSearch.content.nav.searchIndicesTitle": "インデックスの検索",
+    "xpack.enterpriseSearch.content.nav.workplaceSearchTitle": "Workplace Search",
+    "xpack.enterpriseSearch.content.navTitle": "コンテンツ",
+    "xpack.enterpriseSearch.content.productName": "Enterprise Search",
     "xpack.enterpriseSearch.curations.settings.licenseUpgradeLink": "ライセンスアップグレードの詳細",
     "xpack.enterpriseSearch.curations.settings.start30DayTrialButtonLabel": "30 日間のトライアルの開始",
     "xpack.enterpriseSearch.emailLabel": "メール",
+    "xpack.enterpriseSearch.engineCreation.appSearchManagedDescription": "エンジンを追加し、Webクローラー、API、JSONファイル経由でドキュメントを追加します。",
+    "xpack.enterpriseSearch.engineCreation.appSearchManagedLabel": "App Searchでデータを取り込み、管理する",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLabel": "Elasticsearchインデックスで管理されたデータに基づいてエンジンを作成します。",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLink": "既存のElasticsearchインデックスの使用の詳細",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchManagedLabel": "Elasticsearchでデータを管理する",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchTechPreviewBadge": "テクニカルプレビュー",
+    "xpack.enterpriseSearch.engineCreation.engineTypeLabel": "このエンジンのインデックスを管理する方法を選択",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.description": "場所を問わず、何でも検索。組織を支える多忙なチームのために、パワフルでモダンな検索エクスペリエンスを簡単に導入できます。Webサイトやアプリ、ワークプレイスに事前調整済みの検索をすばやく追加しましょう。何でもシンプルに検索できます。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.notConfigured": "エンタープライズサーチはまだKibanaインスタンスで構成されていません。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.videoAlt": "エンタープライズ サーチの基本操作",
@@ -10662,30 +11468,54 @@
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuth": "ユーザー認証を確認してください。",
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthNative": "Elasticsearchネイティブ認証、SSO/SAML、またはOpenID Connectを使用して認証する必要があります。",
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthSAML": "SAMLやOpenID Connectなどの外部SSOプロバイダーを使用している場合は、エンタープライズ サーチでSAML/OIDCレルムを設定できる必要があります。",
-    "xpack.enterpriseSearch.overview.description": "厳選されたAPIとツールを使用して検索エクスペリエンスを作成します。",
     "xpack.enterpriseSearch.hiddenText": "非表示のテキスト",
     "xpack.enterpriseSearch.inlineEditableTable.newRowButtonLabel": "新しい行",
     "xpack.enterpriseSearch.licenseCalloutBody": "SAML経由のエンタープライズ認証、ドキュメントレベルのアクセス権と許可サポート、カスタム検索経験などは有効なPlatinumライセンスで提供されます。",
     "xpack.enterpriseSearch.licenseDocumentationLink": "ライセンス機能の詳細",
     "xpack.enterpriseSearch.licenseManagementLink": "ライセンスを更新",
-    "xpack.enterpriseSearch.overview.navTitle": "概要",
     "xpack.enterpriseSearch.notFound.action1": "ダッシュボードに戻す",
     "xpack.enterpriseSearch.notFound.action2": "サポートに問い合わせる",
     "xpack.enterpriseSearch.notFound.description": "お探しのページは見つかりませんでした。",
     "xpack.enterpriseSearch.notFound.title": "404 エラー",
+    "xpack.enterpriseSearch.overview.description": "厳選されたAPIとツールを使用して検索エクスペリエンスを作成します。",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.button": "使ってみる",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.description": "Elasticsearchで直接、パフォーマンスと関連性が高い、検索対応アプリケーションまたは大規模検索実装を設計して構築",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.heading": "Elasticsearchをはじめよう",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.cloudIdLabel": "クラウドID",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.copyCloudIdAriaLabel": "クラウドIDのコピー",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.heading": "マイデプロイ",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.manageApiKeysLink": "APIキーの管理",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.manageLink": "管理",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.connectToElasticsearchDescription": "Elasticは複数の一般的な言語でクライアントを構築および保守します。Elasticのコミュニティはさらに多くを提供しています。無限の可能性を持つElasticsearch。あなたの自由なアイデアを妨げません。",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.connectToElasticsearchTitle": "Elasticsearchに接続",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsLink": "Elasticsearchクライアントの詳細",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsSelectAriaLabel": "言語クライアント",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsSelectLabel": "クライアントを選択",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchDescription": "検索対応アプリケーションを構築する場合でも、大規模検索実装を設計する場合でも、Elasticsearchは最も関連性とパフォーマンスが高い検索エクスペリエンスを作成するための低レベルのツールを提供します。",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchExperienceDescription": "興味をそそる最新の検索エクスペリエンスをアプリケーションやWebサイトに追加しませんか。世界クラスの検索エクスペリエンスを構築するためのElasticのJavaScript検索フレームワークであるSearch UIを活用できます。",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchExperienceTitle": "Elasticsearchで検索エクスペリエンスを構築",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchUIGitHubLink": "GitHubのSearch UI",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchUIMarketingLink": "Search UIの詳細を参照してください",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchTitle": "Elasticsearchを使い始める",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.createIndex": "新しいインデックスを作成",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.elasticsearchClients": "Elasticsearchクライアント",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.gettingStarted": "Elasticsearchを使い始める",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.searchUi": "ElasticsearchのUIを検索",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.title": "リソース",
     "xpack.enterpriseSearch.overview.heading": "Elasticエンタープライズサーチへようこそ",
     "xpack.enterpriseSearch.overview.insufficientPermissionsBody": "このページを表示するためのアクセス権がありません。エラーだと思われる場合は、管理者に問い合わせてください。",
     "xpack.enterpriseSearch.overview.insufficientPermissionsButtonLabel": "Kibanaダッシュボードに移動",
     "xpack.enterpriseSearch.overview.insufficientPermissionsFooterBody": "Kibanaダッシュボードに移動",
     "xpack.enterpriseSearch.overview.insufficientPermissionsFooterLinkLabel": "ドキュメンテーションを表示",
     "xpack.enterpriseSearch.overview.insufficientPermissionsTitle": "パーミッションがありません",
+    "xpack.enterpriseSearch.overview.navTitle": "概要",
     "xpack.enterpriseSearch.overview.productCard.heading": "Elastic {productName}",
     "xpack.enterpriseSearch.overview.productCard.launchButton": "{productName}を開く",
     "xpack.enterpriseSearch.overview.productCard.setupButton": "{productName}をセットアップ",
+    "xpack.enterpriseSearch.overview.productName": "Enterprise Search",
     "xpack.enterpriseSearch.overview.setupCta.description": "Elastic App Search および Workplace Search を使用して、アプリまたは社内組織に検索を追加できます。検索が簡単になるとどのような利点があるのかについては、動画をご覧ください。",
     "xpack.enterpriseSearch.overview.setupHeading": "セットアップする製品を選択し、開始してください。",
     "xpack.enterpriseSearch.overview.subheading": "アプリまたは組織に検索機能を追加できます。",
-    "xpack.enterpriseSearch.overview.productName": "Enterprise Search",
     "xpack.enterpriseSearch.productSelectorCalloutTitle": "あらゆる規模のチームに対応するエンタープライズ級の機能",
     "xpack.enterpriseSearch.readOnlyMode.warning": "エンタープライズ サーチは読み取り専用モードです。作成、編集、削除などの変更を実行できません。",
     "xpack.enterpriseSearch.roleMapping.addRoleMappingButtonLabel": "マッピングを追加",
@@ -10790,6 +11620,9 @@
     "xpack.enterpriseSearch.setupGuide.cloud.step5.instruction1": "時系列統計データを含む {productName} インデックスでは、{configurePolicyLink}。これにより、最適なパフォーマンスと長期的に費用対効果が高いストレージを保証できます。",
     "xpack.enterpriseSearch.setupGuide.cloud.step5.instruction1LinkText": "インデックスライフサイクルポリシーを構成",
     "xpack.enterpriseSearch.setupGuide.cloud.step5.title": "{productName} は利用可能です",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.instruction1": "一般的なセットアップの問題のヘルプについては、{link}ガイドをお読みください。",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.instruction1LinkText": "エンタープライズ サーチ設定のトラブルシューティング",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.title": "トラブルシューティングのヒント",
     "xpack.enterpriseSearch.setupGuide.step1.instruction1": "{configFile} ファイルで、{configSetting} を {productName} インスタンスの URL に設定します。例：",
     "xpack.enterpriseSearch.setupGuide.step1.title": "{productName}ホストURLをKibana構成に追加",
     "xpack.enterpriseSearch.setupGuide.step2.instruction1": "Kibanaを再起動して、前のステップから構成変更を取得します。",
@@ -10802,6 +11635,8 @@
     "xpack.enterpriseSearch.trialCalloutTitle": "Platinum機能を有効にするElastic Stack試用版ライセンスは{days, plural, other  {# 日}}後に期限切れになります。",
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.description": "このプラグインは現在、異なるクラスターで実行されている{productName}とKibanaをサポートしていません。",
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.title": "{productName}とKibanaは別のElasticsearchクラスターにあります",
+    "xpack.enterpriseSearch.troubleshooting.setup.description": "他の一般的なセットアップの問題のヘルプについては、{link}ガイドをお読みください。",
+    "xpack.enterpriseSearch.troubleshooting.setup.documentationLinkLabel": "エンタープライズ サーチ設定のトラブルシューティング",
     "xpack.enterpriseSearch.units.allDaysLabel": "すべての日",
     "xpack.enterpriseSearch.units.daysLabel": "日",
     "xpack.enterpriseSearch.units.daysOfWeekLabel.friday": "金曜日",
@@ -10868,6 +11703,19 @@
     "xpack.enterpriseSearch.workplaceSearch.connectors.header.description": "構成可能なコネクターすべて。",
     "xpack.enterpriseSearch.workplaceSearch.connectors.header.title": "コンテンツソースコネクター",
     "xpack.enterpriseSearch.workplaceSearch.consumerKey.label": "コンシューマキー",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.description": "構成を準備するには、コネクターパッケージをすばやくデプロイするために必要なすべての前提条件を{deploymentGuideLink}で確認してください。次のステップでコネクターのURLとAPIキーを設定し、エンタープライズ サーチで構成を確定します。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.discussLinkLabel": "ご質問は、こちらのディスカッションをご利用ください。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.feedbackLinkLabel": "当社は常に改善を目指しています。<b>フィードバックにご協力をお願いいたします</b>  ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.heading": "{name}コネクターは完全にカスタマイズ可能であり、任意のインフラストラクチャーで自己管理されます。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.linkLabel": "ドキュメンテーション",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.configCompleted.feedbackCallOutText": "{name}コネクターパッケージのデプロイに関するフィードバックをお寄せください。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.apiKeyLabel": "コネクターAPIキー",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.error": "有効なURLを入力してください",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.helpText": "URLの先頭はhttps://でなければなりません",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.insecureTitle": "接続が安全ではありません",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.insecureWarning": "コネクターはHTTP接続を使用しています。この接続はプライベートではありません。このコネクターによって同期される情報は他者から見られる場合があります。情報を保護するには、HTTPSで接続してください。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.stepTitle": "適切な構成情報を入力する",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.urlLabel": "コネクターURL",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.emptyBody": "管理者がこの組織にソースを追加するときに、検索のソースを使用できます。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.emptyTitle": "使用可能なソースがありません",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.newSourceDescription": "ソースを構成して接続するときには、コンテンツプラットフォームから同期された検索可能なコンテンツのある異なるエンティティを作成しています。使用可能ないずれかのソースコネクターを使用して、またはカスタムAPIソースを経由してソースを追加すると、柔軟性を高めることができます。",
@@ -10892,9 +11740,28 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.link": "非公開ソース接続を有効にする",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.message": "必ずセキュリティ設定で{securityLink}してください。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.button": "カスタムAPIソースの作成",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.createNamedSourceButtonLabel": "{name}の構成",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.description": "構成を準備するには、コネクターパッケージをすばやくデプロイするために必要なすべての前提条件を{deploymentGuideLink}で確認してください。{name}コンテンツソースのわかりやすい名前でエンタープライズ サーチの構成を確定し、次のステップで提供されるソースIDでコネクター構成ファイルを更新します。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.discussLinkLabel": "ご質問は、こちらのディスカッションをご利用ください。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.feedbackLinkLabel": "当社は常に改善を目指しています。<b>フィードバックにご協力をお願いいたします</b>  ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.githubRepoLinkLabel": "ここでコネクターをカスタマイズします。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.heading": "{name}コネクターは完全にカスタマイズ可能であり、任意のインフラストラクチャーで自己管理されます。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.linkLabel": "ドキュメンテーション",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.description": "カスタムAPIソースの詳細については、{link}。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.text": "ドキュメントを読む",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.title": "{name}を追加する方法",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configDocs.applicationPortal.button": "{name}アプリケーションポータル",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.button": "<b>手順</b>",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.description": "構成可能性と制御を強化するために、カスタムコネクターを設定します。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.title": "カスタムコネクター",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.betaLabel": "ベータ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.button": "<b>手順</b>",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.description": "高度なユースケースでは、自己管理されたインフラストラクチャーでこのコネクターパッケージをデプロイします。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.recommendedLabel": "推奨",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.title": "コネクターパッケージ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.button": "接続",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.description": "このコネクターを使用すると、追加のインフラストラクチャーをデプロイせずにすばやく開始できます。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.title": "コネクター",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.alt.text": "接続の例",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.configure.button": "{name}の構成",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.badge": "ワンタイムアクション",
@@ -10910,10 +11777,12 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configOauth.label": "同期するGitHub組織を選択",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.accountOnlyTooltip": "非公開コンテンツソース。各ユーザーは独自の個人ダッシュボードからコンテンツソースを追加する必要があります。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.body": "構成が完了し、接続できます。",
-    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton": "別の接続",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton": "別の接続",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton": "接続",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.emptyState": "クエリと一致する構成されたソースはありません。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.title": "構成されたコンテンツソース",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.unConnectedTooltip": "接続されたソースはありません",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSourcesList.betaBadge": "ベータ",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.button": "{name}を接続",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.docPermissionsUnavailable.message": "ドキュメントレベルのアクセス権はこのソースでは使用できません。{link}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.needsPermissions.text": "ドキュメントレベルのアクセス権情報は同期されます。ドキュメントを検索で使用する前には、初期設定の後に、追加の構成が必要です。",
@@ -10930,6 +11799,7 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.oauthStep1": "組織の{sourceName}アカウントでOAuthアプリを作成する",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.oauthStep2": "適切な構成情報を入力する",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.body1": "エンドポイントは要求を承認できます。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.configureNewSourceButtonLabel": "新しいコンテンツソースを構成",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.heading": "{name}が作成されました",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.addField.button": "フィールドの追加",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.empty.description": "一部のドキュメントにインデックスを作成すると、スキーマが作成されます。あらかじめスキーマフィールドを作成するには、以下をクリックします。",
@@ -11012,10 +11882,20 @@
     "xpack.enterpriseSearch.workplaceSearch.customize.header.title": "Workplace Searchのカスタマイズ",
     "xpack.enterpriseSearch.workplaceSearch.customize.name.button": "組織名の保存",
     "xpack.enterpriseSearch.workplaceSearch.customize.name.label": "組織名",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.documentationLinkLabel": "{name}コネクタードキュメンテーション",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.genericDocumentationHelpText": "任意のセルフマネージドインフラストラクチャーで独自のコネクターを構築してデプロイする方法については、{documentationLink}を確認してください。",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.genericDocumentationLabel": "カスタムAPIソースドキュメント",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.preconfiguredDocumentationHelpText": "{documentationLink}を確認し、任意のセルフマネージドインフラストラクチャーで自己管理するコネクターパッケージをデプロイしてください。",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.preconfiguredRepositoryInstructions": "{githubRepositoryLink}を複製してコネクターを設定",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.repositoryLinkLabel": "{name}コネクターリポジトリ",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.sourceIdentifierHelpText": "デプロイされたコネクターの構成ファイルで次のソースIDと{apiKeyLink}を指定し、ドキュメントを同期します。",
+    "xpack.enterpriseSearch.workplaceSearch.deployment.title": "デプロイ",
     "xpack.enterpriseSearch.workplaceSearch.description.label": "説明",
     "xpack.enterpriseSearch.workplaceSearch.documentsHeader": "ドキュメント",
     "xpack.enterpriseSearch.workplaceSearch.editField.label": "フィールドの編集",
     "xpack.enterpriseSearch.workplaceSearch.explorePlatinumFeatures.link": "プラチナ機能の詳細",
+    "xpack.enterpriseSearch.workplaceSearch.externalConnectorApiKey.label": "コネクターAPIキー",
+    "xpack.enterpriseSearch.workplaceSearch.externalConnectorUrl.label": "コネクターURL",
     "xpack.enterpriseSearch.workplaceSearch.field.label": "フィールド",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.heading": "グループを追加",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.label": "グループ名",
@@ -11105,6 +11985,8 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.servicenowName": "ServiceNow",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription": "Workplace Searchを使用して、SharePointに保存されたファイルを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineName": "SharePoint Online",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointServerDescription": "Workplace Searchを使用して、Microsoft SharePoint Serverに保存されたファイルを検索します。",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointServerName": "SharePoint Server",
     "xpack.enterpriseSearch.workplaceSearch.integrations.slackDescription": "Workplace Searchを使用して、Slackのメッセージを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.slackName": "Slack",
     "xpack.enterpriseSearch.workplaceSearch.integrations.zendeskDescription": "Workplace Searchを使用して、Zendeskのチケットを検索します。",
@@ -11131,6 +12013,7 @@
     "xpack.enterpriseSearch.workplaceSearch.nav.settingsSourcePrioritization": "コンテンツソースコネクター",
     "xpack.enterpriseSearch.workplaceSearch.nav.sources": "ソース",
     "xpack.enterpriseSearch.workplaceSearch.nav.synchronization": "同期",
+    "xpack.enterpriseSearch.workplaceSearch.nav.synchronizationAssetsAndObjects": "アセットとオブジェクト",
     "xpack.enterpriseSearch.workplaceSearch.nav.synchronizationFrequency": "頻度",
     "xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthDescription": "Workplace Search検索APIを安全に使用するために、OAuthアプリケーションを構成します。プラチナライセンスにアップグレードして、検索APIを有効にし、OAuthアプリケーションを作成します。",
     "xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthTitle": "カスタム検索アプリケーションのOAuthを構成",
@@ -11221,6 +12104,7 @@
     "xpack.enterpriseSearch.workplaceSearch.settings.configRemoved.message": "{name}の構成が正常に削除されました。",
     "xpack.enterpriseSearch.workplaceSearch.settings.confirmRemoveConfig.message": "{name}のOAuth構成を削除しますか？",
     "xpack.enterpriseSearch.workplaceSearch.settings.confirmRemoveConfigTitle": "構成を削除",
+    "xpack.enterpriseSearch.workplaceSearch.settings.feedbackCallOutText": "{name}コネクターパッケージのデプロイに関するフィードバックをお寄せください。",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconDescription": "小さい画面サイズおよびブラウザーアイコンのブランド要素として使用されます",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconHelpText": "最大ファイルサイズは2MB、推奨アスペクト比は1:1です。PNGファイルのみがサポートされています。",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconText": "アイコン",
@@ -11239,6 +12123,7 @@
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.imageAlt": "Workplace Searchの基本というガイドでは、Workplace Searchを起動して実行する方法について説明します。",
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.notConfigured": "Workplace SearchはKibanaでは構成されていません。このページの手順に従ってください。",
     "xpack.enterpriseSearch.workplaceSearch.source.text": "送信元",
+    "xpack.enterpriseSearch.workplaceSearch.sourceIdentifier.sourceIdentifierFieldLabel": "ソース識別子",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.detailsLabel": "詳細",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.reauthenticateStatusLinkLabel": "再認証",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.remoteLabel": "リモート",
@@ -11252,6 +12137,11 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.blockedEmptyStateDescription": "適切な時刻にのみ実行するには、ブロックされた時間帯を追加します。",
     "xpack.enterpriseSearch.workplaceSearch.sources.blockedEmptyStateTitle": "ブロックされた時間帯はありません",
     "xpack.enterpriseSearch.workplaceSearch.sources.blockedWindowsTitle": "ブロックされた時間帯",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud": "クラウド",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing": "ファイル共有",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft": "Microsoft",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.office": "Office 365",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.storage": "ストレージ",
     "xpack.enterpriseSearch.workplaceSearch.sources.config.link": "コネクター設定の編集",
     "xpack.enterpriseSearch.workplaceSearch.sources.config.title": "コンテンツソース構成",
     "xpack.enterpriseSearch.workplaceSearch.sources.configuration.title": "構成",
@@ -11265,7 +12155,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.customSourceDocs.text": "コンテンツの追加の詳細については、{documentationLink}を参照してください",
     "xpack.enterpriseSearch.workplaceSearch.sources.deletionSyncDescription": "コンテンツソースに存在しないドキュメントを削除します",
     "xpack.enterpriseSearch.workplaceSearch.sources.deletionSyncLabel": "削除同期",
-    "xpack.enterpriseSearch.workplaceSearch.sources.docPermissions.description": "ドキュメントレベルのアクセス権は、個別またはグループの属性でコンテンツアクセスコンテンツを管理します。特定のドキュメントへのアクセスを許可または拒否。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.docPermissions.description": "ドキュメントレベルのアクセス権は、個別またはグループの属性でアクセスコンテンツを管理します。特定のドキュメントへのアクセスを許可または拒否。",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentation": "ドキュメント",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissions.text": "ドキュメントレベルのアクセス権を使用",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissions.title": "ドキュメントレベルのアクセス権",
@@ -11276,11 +12166,14 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.event.header": "イベント",
     "xpack.enterpriseSearch.workplaceSearch.sources.externalIdentities.link": "外部ID API",
     "xpack.enterpriseSearch.workplaceSearch.sources.externalIdentities.text": "{externalIdentitiesLink}を使用して、ユーザーアクセスマッピングを構成する必要があります。詳細については、ガイドをお読みください。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.feedbackCallOutText": "{name}コネクターパッケージのデプロイに関するフィードバックをお寄せください。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.feedbackLinkLabel": "{name}コネクターのデプロイに関するフィードバックをお寄せください。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.additionalConfigurationNeeded": "このソースは追加の構成が必要です。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceConfigUpdated": "構成が正常に更新されました。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceConnected": "正常に{sourceName}を接続しました。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceNameChanged": "名前が正常に{sourceName}に変更されました。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceRemoved": "{sourceName}が正常に削除されました。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.externalConnectorCreated": "外部コネクターが正常に作成されました。",
     "xpack.enterpriseSearch.workplaceSearch.sources.fullSyncDescription": "コンテンツソースからすべてのドキュメントを取得します",
     "xpack.enterpriseSearch.workplaceSearch.sources.fullSyncLabel": "完全同期",
     "xpack.enterpriseSearch.workplaceSearch.sources.groupAccess.title": "グループアクセス",
@@ -11288,6 +12181,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.id.label": "ソース識別子",
     "xpack.enterpriseSearch.workplaceSearch.sources.incrementalSyncDescription": "前回の同期ジョブ以降に発生したドキュメント/更新を取得します",
     "xpack.enterpriseSearch.workplaceSearch.sources.incrementalSyncLabel": "差分同期",
+    "xpack.enterpriseSearch.workplaceSearch.sources.indexingRulesTable.includeEverythingMessage": "このソースの他のすべての項目を含める",
     "xpack.enterpriseSearch.workplaceSearch.sources.items.header": "アイテム",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnCustom.features.button": "プラチナ機能の詳細",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnMore.link": "詳細",
@@ -11357,6 +12251,21 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.settings.heading": "設定",
     "xpack.enterpriseSearch.workplaceSearch.sources.settings.title": "コンテンツソース名",
     "xpack.enterpriseSearch.workplaceSearch.sources.settingsModal.text": "ソースドキュメントはWorkplace Searchから削除されます。{lineBreak}{name}を削除しますか？",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsAddRuleLabel": "インデックスルールを追加",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsAssetsLabel": "アセット",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsDescription": "以下の粒度の高いコントロールを使用して、同期されるドキュメントを柔軟に管理し、検索可能にします。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsLearnMoreLink": "同期オブジェクトタイプの詳細",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsDescription": "インデックスルールを追加して、{contentSourceName}から同期されるデータをカスタマイズします。デフォルトではすべてが含まれます。ドキュメントは、リストの最上位から下に向かって、構成されたインデックスルールのセットに対して検証されます。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsLabel": "オブジェクト",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableExcludeLabel": "除外",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableFileLabel": "ファイルタイプ",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableIncludeLabel": "含める",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableItemLabel": "項目",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTablePathLabel": "パス",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTablePolicyLabel": "ポリシー",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableRuleLabel": "ルール",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableValueLabel": "値",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsSyncLearnMoreLink": "インデックスルールのカスタマイズの詳細をご覧ください。",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceBlockedTimeWindowsLinkLabel": "ブロックされた時間帯",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.searchBar.filter.placeholder": "コンテンツのフィルター...",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.searchBar.search.placeholder": "コンテンツの検索...",
@@ -11382,6 +12291,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.salesforceSandbox": "Salesforce Sandbox",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.serviceNow": "ServiceNow",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.sharePoint": "SharePoint Online",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.sharePointServer": "SharePoint Server",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.slack": "Slack",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zendesk": "Zendesk",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceOverviewTitle": "ソース概要",
@@ -11446,6 +12356,7 @@
     "xpack.features.ossFeatures.visualizeShortUrlSubFeatureName": "短い URL",
     "xpack.features.savedObjectsManagementFeatureName": "保存されたオブジェクトの管理",
     "xpack.features.visualizeFeatureName": "Visualizeライブラリ",
+    "xpack.fileUpload.dataViewAlreadyExistsErrorMessage": "データビューはすでに存在します。",
     "xpack.fileUpload.fileSizeError": "ファイルサイズ{fileSize}は最大ファイルサイズの{maxFileSize}を超えています",
     "xpack.fileUpload.fileTypeError": "ファイルは使用可能なタイプのいずれかではありません。{types}",
     "xpack.fileUpload.geoFilePicker.acceptedFormats": "使用可能な形式：{fileTypes}",
@@ -11453,11 +12364,14 @@
     "xpack.fileUpload.geoFilePicker.noFeaturesDetected": "選択したファイルには特徴量がありません。",
     "xpack.fileUpload.geoFilePicker.previewSummary": "{numFeatures}個の特徴量。ファイルの{previewCoverage}%。",
     "xpack.fileUpload.geojsonImporter.noGeometry": "特長量には必須フィールド「ジオメトリ」が含まれていません",
+    "xpack.fileUpload.geoUploadWizard.creatingDataView": "データビュー{indexName}を作成しています",
     "xpack.fileUpload.geoUploadWizard.dataIndexingError": "データインデックスエラー",
     "xpack.fileUpload.geoUploadWizard.dataIndexingStarted": "インデックスを作成中：{indexName}",
+    "xpack.fileUpload.geoUploadWizard.dataViewError": "データビューを作成できません",
     "xpack.fileUpload.geoUploadWizard.writingToIndex": "インデックスに書き込み中：{progress}%完了",
     "xpack.fileUpload.import.noIdOrIndexSuppliedErrorMessage": "ID またはインデックスが提供されていません",
     "xpack.fileUpload.importComplete.copyButtonAriaLabel": "クリップボードにコピー",
+    "xpack.fileUpload.importComplete.dataViewResponse": "データビュー応答",
     "xpack.fileUpload.importComplete.failedFeaturesMsg": "{numFailures}個の特長量にインデックスを作成できませんでした。",
     "xpack.fileUpload.importComplete.indexingResponse": "応答をインポート",
     "xpack.fileUpload.importComplete.indexMgmtLink": "インデックス管理。",
@@ -11472,7 +12386,7 @@
     "xpack.fileUpload.indexNameContainsIllegalCharactersErrorMessage": "インデックス名に許可されていない文字が含まれています。",
     "xpack.fileUpload.indexNameForm.enterIndexNameLabel": "インデックス名",
     "xpack.fileUpload.indexNameForm.guidelines.cannotBe": ".または..にすることはできません。",
-    "xpack.fileUpload.indexNameForm.guidelines.cannotInclude": "\\\\、/、*、?、\"、&lt;、>、|、                      \" \"（スペース文字）、,（カンマ）、#を使用することはできません。",
+    "xpack.fileUpload.indexNameForm.guidelines.cannotInclude": "\\\\、/、*、?、\"、&lt;、>、|、                      \" \"（スペース文字）、,（カンマ）、#を使用することはできません",
     "xpack.fileUpload.indexNameForm.guidelines.cannotStartWith": "-、_、+を先頭にすることはできません",
     "xpack.fileUpload.indexNameForm.guidelines.length": "256バイト以上にすることはできません（これはバイト数であるため、複数バイト文字では255文字の文字制限のカウントが速くなります）",
     "xpack.fileUpload.indexNameForm.guidelines.lowercaseOnly": "小文字のみ",
@@ -11522,6 +12436,7 @@
     "xpack.fleet.agentDetails.unexceptedErrorTitle": "エージェントの読み込み中にエラーが発生しました",
     "xpack.fleet.agentDetails.versionLabel": "エージェントバージョン",
     "xpack.fleet.agentDetails.viewAgentListTitle": "すべてのエージェントを表示",
+    "xpack.fleet.agentDetails.viewDashboardButtonLabel": "エージェントダッシュボードを表示",
     "xpack.fleet.agentDetailsIntegrations.actionsLabel": "アクション",
     "xpack.fleet.agentDetailsIntegrations.inputTypeEndpointText": "エンドポイント",
     "xpack.fleet.agentDetailsIntegrations.inputTypeLabel": "インプット",
@@ -11533,15 +12448,22 @@
     "xpack.fleet.agentEnrollment.agentDescription": "Elastic エージェントをホストに追加し、データを収集して、Elastic Stack に送信します。",
     "xpack.fleet.agentEnrollment.agentsNotInitializedText": "エージェントを登録する前に、{link}。",
     "xpack.fleet.agentEnrollment.closeFlyoutButtonLabel": "閉じる",
+    "xpack.fleet.agentEnrollment.confirmation.button": "登録されたエージェントを表示",
     "xpack.fleet.agentEnrollment.copyPolicyButton": "クリップボードにコピー",
     "xpack.fleet.agentEnrollment.downloadDescription": "監視するホストにElasticエージェントをインストールします。このエージェントポリシーは、Fleetサーバーがあるホストにインストールしないでください。Elasticエージェントダウンロードページでは、Elasticエージェントバイナリと検証署名をダウンロードできます。",
     "xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer": "FleetサーバーはElasticエージェントで実行されます。このエージェントを一元化されたホストにインストールし、監視する他のホストがそれに接続できるようにします。本番では、1つ以上の専用ホストを使用することをお勧めします。Elasticエージェントダウンロードページでは、Elasticエージェントバイナリと検証署名をダウンロードできます。",
+    "xpack.fleet.agentEnrollment.downloadDescriptionForK8s": "Kubernetesクラスター内でKubernetesマニフェストをコピーしてダウンロードします。Daemonset環境変数で{FleetUrlVariable}と{FleetTokenVariable}を確認し、マニフェストを適用します。",
     "xpack.fleet.agentEnrollment.downloadLink": "ダウンロードページに移動",
+    "xpack.fleet.agentEnrollment.downloadManifestButtonk8s": "マニフェストのダウンロード",
     "xpack.fleet.agentEnrollment.downloadPolicyButton": "ポリシーのダウンロード",
     "xpack.fleet.agentEnrollment.downloadPolicyButtonk8s": "マニフェストのダウンロード",
     "xpack.fleet.agentEnrollment.downloadUseLinuxInstaller": "Linuxユーザー：Fleetでエージェントをアップグレードできるため、システムパッケージ（RPM/DEB）ではインストーラー（TAR）をお勧めします。",
+    "xpack.fleet.agentEnrollment.enrollFleetTabLabel": "Fleetで登録",
+    "xpack.fleet.agentEnrollment.enrollStandaloneTabLabel": "スタンドアロンで実行",
     "xpack.fleet.agentEnrollment.fleetSettingsLink": "Fleet設定",
     "xpack.fleet.agentEnrollment.flyoutTitle": "エージェントの追加",
+    "xpack.fleet.agentEnrollment.loadk8sManifestErrorTitle": "エージェントマニフェストの取得エラー",
+    "xpack.fleet.agentEnrollment.loadPolicyErrorMessage": "ポリシーを読み込む間にエラーが発生しました",
     "xpack.fleet.agentEnrollment.managedDescription": "ElasticエージェントをFleetに登録して、自動的に更新をデプロイしたり、一元的にエージェントを管理したりします。",
     "xpack.fleet.agentEnrollment.missingFleetHostCalloutText": "Fleetにエージェントを登録するには、FleetサーバーホストのURLが必要です。Fleet設定でこの情報を追加できます。詳細は{link}をご覧ください。",
     "xpack.fleet.agentEnrollment.missingFleetHostCalloutTitle": "FleetサーバーホストのURLが見つかりません",
@@ -11554,9 +12476,9 @@
     "xpack.fleet.agentEnrollment.stepConfigureAgentTitle": "エージェントの構成",
     "xpack.fleet.agentEnrollment.stepConfigurePolicyAuthenticationTitle": "登録トークンを選択",
     "xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle": "Fleetサーバーを一元化されたホストにダウンロード",
+    "xpack.fleet.agentEnrollment.stepDownloadAgentForK8sTitle": "Elasticエージェントマニフェストをダウンロード",
     "xpack.fleet.agentEnrollment.stepDownloadAgentTitle": "Elasticエージェントをホストにダウンロード",
     "xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle": "Elasticエージェントを登録して実行",
-    "xpack.fleet.agentEnrollment.stepRunAgentDescription": "エージェントのディレクトリから、このコマンドを実行し、Elasticエージェントを、インストール、登録、起動します。このコマンドを再利用すると、複数のホストでエージェントを設定できます。管理者権限が必要です。",
     "xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s": "Kubernetesマニフェストがダウンロードされるディレクトリから適用コマンドを実行します。",
     "xpack.fleet.agentHealth.checkInTooltipText": "前回のチェックイン {lastCheckIn}",
     "xpack.fleet.agentHealth.healthyStatusText": "正常",
@@ -11617,6 +12539,7 @@
     "xpack.fleet.agentPolicy.confirmModalDescription": "このアクションは元に戻せません。続行していいですか？",
     "xpack.fleet.agentPolicy.confirmModalTitle": "変更を保存してデプロイ",
     "xpack.fleet.agentPolicy.linkedAgentCountText": "{count, plural, other  {#個のエージェント}}",
+    "xpack.fleet.agentPolicy.outputOptions.defaultOutputText": "デフォルト（現在{defaultOutputName}）",
     "xpack.fleet.agentPolicy.postInstallAddAgentModal": "{packageName}統合が追加されました",
     "xpack.fleet.agentPolicy.postInstallAddAgentModalCancelButtonLabel": "後でElasticエージェントを追加",
     "xpack.fleet.agentPolicy.postInstallAddAgentModalConfirmButtonLabel": "Elasticエージェントをホストに追加",
@@ -11627,6 +12550,7 @@
     "xpack.fleet.agentPolicyActionMenu.enrollAgentActionText": "エージェントの追加",
     "xpack.fleet.agentPolicyActionMenu.viewPolicyText": "ポリシーを表示",
     "xpack.fleet.agentPolicyCreation.created": "エージェントポリシーが作成されました",
+    "xpack.fleet.agentPolicyCreation.errorMessage": "この名前のエージェントポリシーはすでに存在します。",
     "xpack.fleet.agentPolicyCreation.failed": "エージェントポリシーの作成が失敗しました",
     "xpack.fleet.agentPolicyForm.advancedOptionsToggleLabel": "高度なオプション",
     "xpack.fleet.agentPolicyForm.createAgentPolicyDescription": "新しいエージェントポリシーを作成し、この統合を新しいホストに追加します。次のステップでエージェントを追加できます。",
@@ -11635,6 +12559,8 @@
     "xpack.fleet.agentPolicyForm.createAgentPolicyLabel": "エージェントポリシーを作成",
     "xpack.fleet.agentPolicyForm.createAgentPolicyText": "ポリシーを作成",
     "xpack.fleet.agentPolicyForm.createAgentPolicyTypeOfHosts": "ホストのタイプは{agentPolicy}で制御されています。開始するには、新しいエージェントポリシーを作成してください。",
+    "xpack.fleet.agentPolicyForm.dataOutputDescription": "統合からデータで使用する出力を選択します。",
+    "xpack.fleet.agentPolicyForm.dataOutputLabel": "統合の出力",
     "xpack.fleet.agentPolicyForm.descriptionDescription": "このポリシーを使用する方法に関する説明を追加します。",
     "xpack.fleet.agentPolicyForm.descriptionFieldLabel": "説明",
     "xpack.fleet.agentPolicyForm.descriptionFieldPlaceholder": "任意の説明",
@@ -11644,6 +12570,8 @@
     "xpack.fleet.agentPolicyForm.monitoringLogsTooltipText": "このポリシーを使用するElasticエージェントからログを収集します。",
     "xpack.fleet.agentPolicyForm.monitoringMetricsFieldLabel": "エージェントメトリックを収集",
     "xpack.fleet.agentPolicyForm.monitoringMetricsTooltipText": "このポリシーを使用するElasticエージェントからメトリックを収集します。",
+    "xpack.fleet.agentPolicyForm.monitoringOutputDescription": "エージェント独自の監視データで使用する出力を選択します。",
+    "xpack.fleet.agentPolicyForm.monitoringOutputLabel": "エージェント監視の出力",
     "xpack.fleet.agentPolicyForm.nameFieldLabel": "名前",
     "xpack.fleet.agentPolicyForm.nameFieldPlaceholder": "名前を選択",
     "xpack.fleet.agentPolicyForm.nameRequiredErrorMessage": "エージェントポリシー名が必要です。",
@@ -11651,6 +12579,7 @@
     "xpack.fleet.agentPolicyForm.nameSpaceFieldDescription.fleetUserGuideLabel": "詳細",
     "xpack.fleet.agentPolicyForm.namespaceFieldLabel": "デフォルト名前空間",
     "xpack.fleet.agentPolicyForm.newAgentPolicyFieldLabel": "新しいエージェントポリシー名",
+    "xpack.fleet.agentPolicyForm.outputOptionDisabledAPMAndLogstashText": "APMではエージェント統合のLogstash出力はサポートされていません",
     "xpack.fleet.agentPolicyForm.systemMonitoringText": "システムログとメトリックの収集",
     "xpack.fleet.agentPolicyForm.systemMonitoringTooltipText": "これにより、{system}統合も追加され、システムログとメトリックを収集します。",
     "xpack.fleet.agentPolicyForm.unenrollmentTimeoutDescription": "任意のタイムアウト（秒）。指定されている場合、この期間が経過した後、エージェントは自動的に登録解除されます。",
@@ -11708,6 +12637,10 @@
     "xpack.fleet.breadcrumbs.settingsPageTitle": "設定",
     "xpack.fleet.breadcrumbs.upgradePackagePolicyPageTitle": "統合のアップグレード ",
     "xpack.fleet.config.invalidPackageVersionError": "有効なサーバーまたはキーワード「latest」でなければなりません",
+    "xpack.fleet.confirmIncomingData.installApmAgentButtonText": "APMエージェントのインストール",
+    "xpack.fleet.confirmIncomingData.subtitle": "エージェントは正常に登録されました。データは受信されました。",
+    "xpack.fleet.confirmIncomingData.title": "受信データは{enrolledAgents}最近登録された{ enrolledAgents, plural, other {エージェント}}の{numAgentsWithData}から受信されました。",
+    "xpack.fleet.confirmIncomingData.viewDataAssetsButtonText": "アセットを表示",
     "xpack.fleet.copyAgentPolicy.confirmModal.cancelButtonLabel": "キャンセル",
     "xpack.fleet.copyAgentPolicy.confirmModal.confirmButtonLabel": "ポリシーの複製",
     "xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyPrompt": "新しいエージェントポリシーの名前と説明を選択してください。",
@@ -11743,6 +12676,9 @@
     "xpack.fleet.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription": "この統合の使用方法を識別できるように、名前と説明を選択してください。",
     "xpack.fleet.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle": "統合設定",
     "xpack.fleet.createPackagePolicy.stepConfigure.noPolicyOptionsMessage": "構成するものがありません",
+    "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionLabel": "データ保持設定",
+    "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionLearnMoreLink": "詳細",
+    "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionText": "デフォルトでは、すべてのログとメトリックがホットティアに格納されます。この統合のデータ保持ポリシーの変更については、{learnMore}してください。",
     "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel": "説明",
     "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel": "統合名",
     "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyNamespaceHelpLabel": "選択したエージェントポリシーから継承されたデフォルト名前空間を変更します。この設定により、統合のデータストリームの名前が変更されます。{learnMore}。",
@@ -11753,6 +12689,7 @@
     "xpack.fleet.createPackagePolicy.stepConfigurePackagePolicyTitle": "統合の構成",
     "xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle": "この統合を追加する場所",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText": "{count, plural, other  {# 個のエージェント}}が選択したエージェントポリシーで登録されています。",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyDisabledAPMLogstashOuputText": "APMではエージェント統合のLogstash出力はサポートされていません",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupDescription": "エージェントポリシーは、エージェントのセットで統合のグループを管理するために使用されます。",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupTitle": "エージェントポリシー",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyLabel": "エージェントポリシー",
@@ -11825,7 +12762,11 @@
     "xpack.fleet.editPackagePolicy.upgradePageTitleWithPackageName": "{packageName}統合をアップグレード",
     "xpack.fleet.enrollemntAPIKeyList.emptyMessage": "登録トークンが見つかりません。",
     "xpack.fleet.enrollemntAPIKeyList.loadingTokensMessage": "登録トークンを読み込んでいます...",
-    "xpack.fleet.enrollmentInstructions.platformButtons.linux": "Linux / macOS",
+    "xpack.fleet.enrollmentInstructions.callout": "システムパッケージ（RPM/DEB）ではインストーラー（TAR/ZIP）を使用することをお勧めします。インストーラーではFleetでエージェントをアップグレードできます。",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux": "Linux",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux.deb": "DEB",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux.rpm": "1分あたりリクエスト数",
+    "xpack.fleet.enrollmentInstructions.platformButtons.mac": "Mac",
     "xpack.fleet.enrollmentInstructions.platformButtons.windows": "Windows",
     "xpack.fleet.enrollmentInstructions.platformSelectAriaLabel": "プラットフォーム",
     "xpack.fleet.enrollmentInstructions.troubleshootingLink": "トラブルシューティングガイド",
@@ -11857,6 +12798,7 @@
     "xpack.fleet.epm.addPackagePolicyButtonSecurityRequiredTooltip": "Elasticエージェント統合を追加するには、セキュリティを有効にし、Fleetの「すべて」権限が必要です。管理者にお問い合わせください。",
     "xpack.fleet.epm.addPackagePolicyButtonText": "{packageName}の追加",
     "xpack.fleet.epm.assetGroupTitle": "{assetType}アセット",
+    "xpack.fleet.epm.assetTitles.cloudSecurityPostureRuleTemplate": "クラウドセキュリティ態勢ルールテンプレート",
     "xpack.fleet.epm.assetTitles.componentTemplates": "コンポーネントテンプレート",
     "xpack.fleet.epm.assetTitles.dashboards": "ダッシュボード",
     "xpack.fleet.epm.assetTitles.dataStreamILM": "データストリームILMポリシー",
@@ -11868,6 +12810,7 @@
     "xpack.fleet.epm.assetTitles.maps": "マップ",
     "xpack.fleet.epm.assetTitles.mlModels": "MLモデル",
     "xpack.fleet.epm.assetTitles.mlModules": "機械学習モジュール",
+    "xpack.fleet.epm.assetTitles.osqueryPackAsset": "Osqueryパック",
     "xpack.fleet.epm.assetTitles.savedSearches": "保存された検索",
     "xpack.fleet.epm.assetTitles.securityRules": "セキュリティルール",
     "xpack.fleet.epm.assetTitles.tag": "タグ",
@@ -11891,6 +12834,7 @@
     "xpack.fleet.epm.licenseLabel": "ライセンス",
     "xpack.fleet.epm.loadingIntegrationErrorTitle": "統合詳細の読み込みエラー",
     "xpack.fleet.epm.noticeModalCloseBtn": "閉じる",
+    "xpack.fleet.epm.packageDetails.assets.assetsNotAvailableInCurrentSpace": "この統合はインストールされますが、アセットはこのスペースで使用できません",
     "xpack.fleet.epm.packageDetails.assets.fetchAssetsErrorTitle": "アセットの読み込みエラー",
     "xpack.fleet.epm.packageDetails.assets.noAssetsFoundLabel": "アセットが見つかりません",
     "xpack.fleet.epm.packageDetails.integrationList.actions": "アクション",
@@ -11966,8 +12910,8 @@
     "xpack.fleet.fleetServerSetup.addFleetServerHostSuccessText": "{host}が追加されました。 {fleetSettingsLink}でFleetサーバーを編集できます。",
     "xpack.fleet.fleetServerSetup.addFleetServerHostSuccessTitle": "追加されたFleetサーバーホスト",
     "xpack.fleet.fleetServerSetup.cloudDeploymentLink": "デプロイを編集",
-    "xpack.fleet.fleetServerSetup.cloudSetupText": "Fleetにエージェントを登録する前に、Fleetサーバーが必要です。APM &amp; Fleetを有効にしてデプロイに追加できます。詳細は{link}をご覧ください。",
-    "xpack.fleet.fleetServerSetup.cloudSetupTitle": "APM &amp; Fleetを有効にする",
+    "xpack.fleet.fleetServerSetup.cloudSetupText": "Fleetにエージェントを登録する前に、Fleetサーバーが必要です。取得するための最も簡単な方法は、Fleetサーバー統合を実行する統合サーバーを追加することです。クラウドコンソールでデプロイに追加できます。詳細は{link}をご覧ください。",
+    "xpack.fleet.fleetServerSetup.cloudSetupTitle": "Fleetサーバーを有効にする",
     "xpack.fleet.fleetServerSetup.continueButton": "続行",
     "xpack.fleet.fleetServerSetup.deploymentModeProductionOption": "{production} – 独自の証明書を指定します。このオプションでは、Fleetに登録するときに、エージェントで証明書鍵を指定する必要があります。",
     "xpack.fleet.fleetServerSetup.deploymentModeQuickStartOption": "{quickStart} – Fleetサーバーは自己署名証明書を生成します。後続のエージェントは--insecureフラグを使用して登録する必要があります。本番ユースケースには推奨されません。",
@@ -12084,6 +13028,8 @@
     "xpack.fleet.integrationsHeaderTitle": "統合",
     "xpack.fleet.invalidLicenseDescription": "現在のライセンスは期限切れです。登録されたビートエージェントは引き続き動作しますが、Elastic Fleet インターフェイスにアクセスするには有効なライセンスが必要です。",
     "xpack.fleet.invalidLicenseTitle": "ライセンスの期限切れ",
+    "xpack.fleet.multiRowInput.addRow": "行の追加",
+    "xpack.fleet.multiRowInput.deleteButton": "行の削除",
     "xpack.fleet.multiTextInput.addRow": "行の追加",
     "xpack.fleet.multiTextInput.deleteRowButton": "行の削除",
     "xpack.fleet.namespaceValidation.invalidCharactersErrorMessage": "名前空間に無効な文字が含まれています",
@@ -12173,6 +13119,7 @@
     "xpack.fleet.settings.deleteOutput.agentsCount": "{agentCount, plural, other  {# 個のエージェント}}",
     "xpack.fleet.settings.deleteOutput.confirmModalText": "{outputName}出力が削除されます。{policies}と{agents}が更新されます。このアクションは元に戻せません。続行していいですか？",
     "xpack.fleet.settings.deleteOutput.confirmModalTitle": "変更を保存してデプロイしますか？",
+    "xpack.fleet.settings.deleteOutputs.confirmButtonLabel": "削除してデプロイ",
     "xpack.fleet.settings.deleteOutputs.errorToastTitle": "出力の削除エラー",
     "xpack.fleet.settings.editOutputFlyout.agentIntegrationsBold": "エージェント統合",
     "xpack.fleet.settings.editOutputFlyout.agentMonitoringBold": "エージェント監視",
@@ -12182,14 +13129,25 @@
     "xpack.fleet.settings.editOutputFlyout.defaultMontoringOutputSwitchLabel": "この出力を{boldAgentMonitoring}のデフォルトにします。",
     "xpack.fleet.settings.editOutputFlyout.defaultOutputSwitchLabel": "この出力を{boldAgentIntegrations}のデフォルトにします。",
     "xpack.fleet.settings.editOutputFlyout.editTitle": "出力を編集",
+    "xpack.fleet.settings.editOutputFlyout.esHostsInputLabel": "ホスト",
+    "xpack.fleet.settings.editOutputFlyout.esHostsInputPlaceholder": "ホストURLを指定",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputDescription": "エージェントがLogstashに接続するために使用するURLを指定します。詳細については、{guideLink}を参照してください。",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputLabel": "Logstashホスト",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputPlaceholder": "ホストを指定",
     "xpack.fleet.settings.editOutputFlyout.nameInputLabel": "名前",
     "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "名前を指定",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "この出力に関連するほとんどのアクションは使用できません。詳細については、Kibana構成を参照してください。",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "この出力はFleet外で管理されます",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputLabel": "サーバーSSL認証局",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputPlaceholder": "認証局を指定",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateInputLabel": "クライアントSSL証明書",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateInputPlaceholder": "SSL証明書を指定",
+    "xpack.fleet.settings.editOutputFlyout.sslKeyInputLabel": "クライアントSSL証明書鍵",
+    "xpack.fleet.settings.editOutputFlyout.sslKeyInputPlaceholder": "証明書鍵を指定",
     "xpack.fleet.settings.editOutputFlyout.typeInputLabel": "型",
     "xpack.fleet.settings.editOutputFlyout.typeInputPlaceholder": "タイプを指定",
     "xpack.fleet.settings.editOutputFlyout.yamlConfigInputLabel": "詳細YAML構成",
-    "xpack.fleet.settings.editOutputFlyout.yamlConfigInputPlaceholder": "# このYAML設定は、各エージェントポリシーのElasticsearch出力セクションに追加されます。",
+    "xpack.fleet.settings.editOutputFlyout.yamlConfigInputPlaceholder": "# このYAML設定は、各エージェントポリシーの出力セクションに追加されます。",
     "xpack.fleet.settings.fleetServerHostEditButtonLabel": "ホストを編集",
     "xpack.fleet.settings.fleetServerHostsDifferentPathOrProtocolError": "各URLのプロトコルとパスは同じでなければなりません",
     "xpack.fleet.settings.fleetServerHostsDuplicateError": "重複するURL",
@@ -12204,19 +13162,39 @@
     "xpack.fleet.settings.fleetServerHostsFlyout.confirmModalTitle": "変更を保存してデプロイしますか？",
     "xpack.fleet.settings.fleetServerHostsFlyout.description": "エージェントがFleetサーバーに接続するために使用するURLを指定します。複数のURLが存在する場合、Fleetは登録目的で最初に指定されたURLを表示します。Fleetサーバーはデフォルトで8220番ポートを使用します。{link}を参照してください。",
     "xpack.fleet.settings.fleetServerHostsFlyout.errorToastTitle": "設定の保存中にエラーが発生しました",
+    "xpack.fleet.settings.fleetServerHostsFlyout.fleetServerHostsInputPlaceholder": "ホストURLを指定",
     "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "設定を保存して適用",
     "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "設定が保存されました",
     "xpack.fleet.settings.fleetServerHostsFlyout.title": "Fleetサーバーホスト",
     "xpack.fleet.settings.fleetServerHostsFlyout.userGuideLink": "FleetおよびElasticエージェントガイド",
     "xpack.fleet.settings.fleetServerHostUrlColumnTitle": "ホストURL",
     "xpack.fleet.settings.fleetUserGuideLink": "Fleetユーザーガイド",
+    "xpack.fleet.settings.logstashInstructions.apiKeyStepDescription": "Elasticエージェントの最小限の権限で、LogstashがElasticsearchに出力できるようにすることをお勧めします。",
+    "xpack.fleet.settings.logstashInstructions.calloutTitle": "Elasticエージェント用にLogstashを構成",
+    "xpack.fleet.settings.logstashInstructions.collapseInstructionsButtonLabel": "手順を折りたたむ",
+    "xpack.fleet.settings.logstashInstructions.copyApiKeyButtonLabel": "メッセージをコピー",
+    "xpack.fleet.settings.logstashInstructions.description": "LogstashへのElasticエージェントのパイプラインを追加します。詳細については、{documentationLink}を参照してください。",
+    "xpack.fleet.settings.logstashInstructions.documentationLink": "ドキュメンテーション",
+    "xpack.fleet.settings.logstashInstructions.generateApiKeyButtonLabel": "APIキーを生成",
+    "xpack.fleet.settings.logstashInstructions.generateApiKeyError": "APIキーを生成できません",
+    "xpack.fleet.settings.logstashInstructions.ourDocumentationLink": "ドキュメント",
+    "xpack.fleet.settings.logstashInstructions.replaceStepDescription": "括弧内の部分に生成されたSSL証明書ファイルパスを入力します。証明書を生成するには、{documentationLink}を参照してください。",
+    "xpack.fleet.settings.logstashInstructions.saveAndRestartStepDescription": "パイプラインを保存し、Logstashを保存して、変更を適用します。",
+    "xpack.fleet.settings.logstashInstructions.viewInstructionButtonLabel": "<b>手順を表示</b>",
     "xpack.fleet.settings.outputCreateButtonLabel": "出力を追加",
     "xpack.fleet.settings.outputForm.caTrusterdFingerprintInvalidErrorMessage": "CAが信頼するフィンガープリントはbase64 CA sha256フィンガープリントにしてください",
     "xpack.fleet.settings.outputForm.elasticHostDuplicateError": "重複するURL",
     "xpack.fleet.settings.outputForm.elasticHostError": "無効なURL",
+    "xpack.fleet.settings.outputForm.elasticUrlRequiredError": "URLが必要です",
     "xpack.fleet.settings.outputForm.errorToastTitle": "出力の保存エラー",
     "xpack.fleet.settings.outputForm.invalidYamlFormatErrorMessage": "無効なYAML形式：{reason}",
+    "xpack.fleet.settings.outputForm.logstashHostDuplicateError": "重複するホスト",
+    "xpack.fleet.settings.outputForm.logstashHostError": "無効なホスト",
+    "xpack.fleet.settings.outputForm.logstashHostProtocolError": "無効なLogstashホストです。先頭をhttp(s)にすることはできません",
+    "xpack.fleet.settings.outputForm.logstashHostRequiredError": "ホストは必須です",
     "xpack.fleet.settings.outputForm.nameIsRequiredErrorMessage": "名前が必要です",
+    "xpack.fleet.settings.outputForm.sslCertificateRequiredErrorMessage": "SSL証明書が必要です",
+    "xpack.fleet.settings.outputForm.sslKeyRequiredErrorMessage": "SSL鍵が必要です",
     "xpack.fleet.settings.outputs.defaultMonitoringOutputBadgeTitle": "アラート監視",
     "xpack.fleet.settings.outputs.defaultOutputBadgeTitle": "エージェント統合",
     "xpack.fleet.settings.outputSection.actionsColomnTitle": "アクション",
@@ -12227,6 +13205,7 @@
     "xpack.fleet.settings.outputSectionTitle": "アウトプット",
     "xpack.fleet.settings.outputsTable.elasticsearchTypeLabel": "Elasticsearch",
     "xpack.fleet.settings.outputsTable.hostColomnTitle": "ホスト",
+    "xpack.fleet.settings.outputsTable.managedTooltip": "この出力はFleet外で管理されます。",
     "xpack.fleet.settings.outputsTable.nameColomnTitle": "名前",
     "xpack.fleet.settings.outputsTable.typeColomnTitle": "型",
     "xpack.fleet.settings.sortHandle": "ホストハンドルの並べ替え",
@@ -12294,15 +13273,21 @@
     "xpack.globalSearchBar.searchBar.noResultsImageAlt": "ブラックホールの図",
     "xpack.globalSearchBar.searchBar.optionTagListAriaLabel": "タグ",
     "xpack.globalSearchBar.searchbar.overflowTagsAriaLabel": "{n} その他の {n, plural, other  {個のタグ}}：{tags}",
+    "xpack.globalSearchBar.searchBar.placeholder": "アプリ、コンテンツなどを検索します。例：Discover",
     "xpack.globalSearchBar.searchBar.shortcutDescription.macCommandDescription": "コマンド+ /",
     "xpack.globalSearchBar.searchBar.shortcutDescription.shortcutDetail": "{shortcutDescription} {commandDescription}",
     "xpack.globalSearchBar.searchBar.shortcutDescription.shortcutInstructionDescription": "ショートカット",
     "xpack.globalSearchBar.searchBar.shortcutDescription.windowsCommandDescription": "コントロール+ /",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.description": "キーボードショートカット",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.macCommandDescription": "コマンド+ /",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.windowsCommandDescription": "コントロール+ /",
     "xpack.globalSearchBar.suggestions.filterByTagLabel": "タグ名でフィルター",
     "xpack.globalSearchBar.suggestions.filterByTypeLabel": "タイプでフィルタリング",
     "xpack.graph.badge.readOnly.text": "読み取り専用",
     "xpack.graph.badge.readOnly.tooltip": "Graph ワークスペースを保存できません",
     "xpack.graph.bar.exploreLabel": "グラフ",
+    "xpack.graph.bar.exploreLabelNoFields": "1つ以上のフィールドを選択",
+    "xpack.graph.bar.exploreLabelNoIndexPattern": "データソースを選択",
     "xpack.graph.bar.pickFieldsLabel": "フィールドを追加",
     "xpack.graph.bar.pickSourceLabel": "データソースを選択",
     "xpack.graph.bar.pickSourceTooltip": "グラフの関係性を開始するデータソースを選択します。",
@@ -12478,6 +13463,7 @@
     "xpack.graph.sidebar.linkSummary.leftTermCountTooltip": "{count} 件のドキュメントに {term} があります",
     "xpack.graph.sidebar.linkSummary.mergeTerm1ToTerm2ButtonTooltip": "{term1} を {term2} に結合します",
     "xpack.graph.sidebar.linkSummary.mergeTerm2ToTerm1ButtonTooltip": "{term2} を {term1} に結合します",
+    "xpack.graph.sidebar.linkSummary.noData": "リンク選択の用語交差が見つかりません。",
     "xpack.graph.sidebar.linkSummary.rightTermCountTooltip": "{count} 件のドキュメントに {term} があります",
     "xpack.graph.sidebar.linkSummaryTitle": "リンクの概要",
     "xpack.graph.sidebar.selections.invertSelectionButtonLabel": "反転",
@@ -14160,6 +15146,11 @@
     "xpack.infra.logs.alerting.comparator.notEqNumber": "等しくない",
     "xpack.infra.logs.alerting.comparator.notMatch": "一致しない",
     "xpack.infra.logs.alerting.comparator.notMatchPhrase": "語句と一致しない",
+    "xpack.infra.logs.alerting.comparator.symbol.match": "一致",
+    "xpack.infra.logs.alerting.comparator.symbol.matchPhrase": "語句と一致",
+    "xpack.infra.logs.alerting.comparator.symbol.notMatch": "一致しない",
+    "xpack.infra.logs.alerting.comparator.symbol.notMatchPhrase": "語句と一致しない",
+    "xpack.infra.logs.alerting.threshold.alertReasonMessageActionVariableDescription": "アラートの理由の簡潔な説明",
     "xpack.infra.logs.alerting.threshold.conditionsActionVariableDescription": "ログエントリが満たす必要がある条件",
     "xpack.infra.logs.alerting.threshold.defaultActionMessage": "\\{\\{^context.isRatio\\}\\}\\{\\{#context.group\\}\\}\\{\\{context.group\\}\\} - \\{\\{/context.group\\}\\}\\{\\{context.matchingDocuments\\}\\}ログエントリが次の条件と一致しました。\\{\\{context.conditions\\}\\}\\{\\{/context.isRatio\\}\\}\\{\\{#context.isRatio\\}\\}\\{\\{#context.group\\}\\}\\{\\{context.group\\}\\} - \\{\\{/context.group\\}\\} \\{\\{context.denominatorConditions\\}\\}と一致するログエントリ数に対する\\{\\{context.numeratorConditions\\}\\}と一致するログエントリ数の比率は\\{\\{context.ratio\\}\\}\\{\\{/context.isRatio\\}\\}でした",
     "xpack.infra.logs.alerting.threshold.denominatorConditionsActionVariableDescription": "比率の分母が満たす必要がある条件",
@@ -14167,12 +15158,17 @@
     "xpack.infra.logs.alerting.threshold.everythingSeriesName": "ログエントリ",
     "xpack.infra.logs.alerting.threshold.fired": "実行",
     "xpack.infra.logs.alerting.threshold.groupByActionVariableDescription": "アラートのトリガーを実行するグループの名前",
+    "xpack.infra.logs.alerting.threshold.groupedCountAlertReasonDescription": "過去{duration}における{groupName}の{actualCount, plural, other  {{actualCount}件のログエントリ}}。{comparator} {expectedCount}のときにアラートを発効します。",
+    "xpack.infra.logs.alerting.threshold.groupedRatioAlertReasonDescription": "過去{duration}における選択された{groupName}のログの比率は{actualRatio}です。{comparator} {expectedRatio}のときにアラートを発効します。",
     "xpack.infra.logs.alerting.threshold.isRatioActionVariableDescription": "このアラートが比率で構成されていたかどうかを示します",
     "xpack.infra.logs.alerting.threshold.numeratorConditionsActionVariableDescription": "比率の分子が満たす必要がある条件",
     "xpack.infra.logs.alerting.threshold.ratioActionVariableDescription": "2つのセットの条件の比率値",
     "xpack.infra.logs.alerting.threshold.ratioCriteriaQueryAText": "クエリA",
     "xpack.infra.logs.alerting.threshold.ratioCriteriaQueryBText": "クエリB",
     "xpack.infra.logs.alerting.threshold.timestampActionVariableDescription": "アラートがトリガーされた時点のOTCタイムスタンプ",
+    "xpack.infra.logs.alerting.threshold.ungroupedCountAlertReasonDescription": "過去{duration}における{actualCount, plural, other  {{actualCount}件のログエントリ}}。{comparator} {expectedCount}のときにアラートを発効します。",
+    "xpack.infra.logs.alerting.threshold.ungroupedRatioAlertReasonDescription": "過去{duration}における選択されたログの比率は{actualRatio}です。{comparator} {expectedRatio}のときにアラートを発効します。",
+    "xpack.infra.logs.alerting.threshold.viewInAppUrlActionVariableDescription": "アラートとコンテキストを調査するために使用できる、Elastic内のビューまたは機能へのリンク",
     "xpack.infra.logs.alertName": "ログしきい値",
     "xpack.infra.logs.alerts.dataTimeRangeLabel": "過去{lookback} {timeLabel}のデータ",
     "xpack.infra.logs.alerts.dataTimeRangeLabelWithGrouping": "{groupByLabel}でグループ化された、過去{lookback} {timeLabel}のデータ（{displayedGroups}/{totalGroups}個のグループを表示）",
@@ -14235,7 +15231,7 @@
     "xpack.infra.logs.customizeLogs.customizeButtonLabel": "カスタマイズ",
     "xpack.infra.logs.customizeLogs.lineWrappingFormRowLabel": "改行",
     "xpack.infra.logs.customizeLogs.textSizeFormRowLabel": "テキストサイズ",
-    "xpack.infra.logs.customizeLogs.textSizeRadioGroup": "{textScale, select, small {小さい} Medium {中くらい} Large {大きい } other {{textScale}}}",
+    "xpack.infra.logs.customizeLogs.textSizeRadioGroup": "{textScale, select, small {小} Medium {中} Large {大} other {{textScale}} }",
     "xpack.infra.logs.customizeLogs.wrapLongLinesSwitchLabel": "長い行を改行",
     "xpack.infra.logs.emptyView.checkForNewDataButtonLabel": "新規データを確認",
     "xpack.infra.logs.emptyView.noLogMessageDescription": "フィルターを調整してみてください。",
@@ -14318,7 +15314,7 @@
     "xpack.infra.logSourceConfiguration.childFormElementErrorMessage": "1つ以上のフォームフィールドが無効な状態です。",
     "xpack.infra.logSourceConfiguration.dataViewDescription": "ログデータを含むデータビュー",
     "xpack.infra.logSourceConfiguration.dataViewLabel": "ログデータビュー",
-    "xpack.infra.logSourceConfiguration.dataViewSectionTitle": "データビュー",
+    "xpack.infra.logSourceConfiguration.dataViewSectionTitle": "データビュー（推奨）",
     "xpack.infra.logSourceConfiguration.dataViewSelectorPlaceholder": "データビューを選択",
     "xpack.infra.logSourceConfiguration.dataViewsManagementLinkText": "データビュー管理画面",
     "xpack.infra.logSourceConfiguration.dataViewTitle": "ログデータビュー",
@@ -14326,6 +15322,7 @@
     "xpack.infra.logSourceConfiguration.emptyFieldErrorMessage": "フィールド'{fieldName}'は未入力のままにできません。",
     "xpack.infra.logSourceConfiguration.invalidMessageFieldTypeErrorMessage": "{messageField}フィールドはテキストフィールドでなければなりません。",
     "xpack.infra.logSourceConfiguration.logSourceConfigurationFormErrorsCalloutTitle": "一貫しないソース構成",
+    "xpack.infra.logSourceConfiguration.logSourcesTitle": "ログソース",
     "xpack.infra.logSourceConfiguration.missingDataViewErrorMessage": "データビュー{dataViewId}が存在する必要があります。",
     "xpack.infra.logSourceConfiguration.missingDataViewsLabel": "データビュー{indexPatternId}が見つかりません",
     "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "データビューには{messageField}フィールドが必要です。",
@@ -14554,7 +15551,7 @@
     "xpack.infra.metrics.alerting.inventory.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\}は状態\\{\\{context.alertState\\}\\}です\n\n理由：\n\\{\\{context.reason\\}\\}\n",
     "xpack.infra.metrics.alerting.inventory.threshold.fired": "アラート",
     "xpack.infra.metrics.alerting.metricActionVariableDescription": "指定された条件のメトリック名。使用方法：（ctx.metric.condition0、ctx.metric.condition1など）。",
-    "xpack.infra.metrics.alerting.reasonActionVariableDescription": "どのメトリックがどのしきい値を超えたのかを含む、アラートがこの状態である理由に関する説明",
+    "xpack.infra.metrics.alerting.reasonActionVariableDescription": "アラートの理由の簡潔な説明",
     "xpack.infra.metrics.alerting.threshold.aboveRecovery": "より大",
     "xpack.infra.metrics.alerting.threshold.alertState": "アラート",
     "xpack.infra.metrics.alerting.threshold.belowRecovery": "より小",
@@ -14577,6 +15574,7 @@
     "xpack.infra.metrics.alerting.thresholdActionVariableDescription": "指定された条件のメトリックのしきい値。使用方法：（ctx.threshold.condition0、ctx.threshold.condition1など）。",
     "xpack.infra.metrics.alerting.timestampDescription": "アラートが検出された時点のタイムスタンプ。",
     "xpack.infra.metrics.alerting.valueActionVariableDescription": "指定された条件のメトリックの値。使用方法：（ctx.value.condition0、ctx.value.condition1など）。",
+    "xpack.infra.metrics.alerting.viewInAppUrlActionVariableDescription": "アラートとコンテキストを調査するために使用できる、Elastic内のビューまたは機能へのリンク",
     "xpack.infra.metrics.alertName": "メトリックしきい値",
     "xpack.infra.metrics.alerts.dataTimeRangeLabel": "過去{lookback} {timeLabel}",
     "xpack.infra.metrics.alerts.dataTimeRangeLabelWithGrouping": "{id}のデータの過去{lookback} {timeLabel}",
@@ -14963,6 +15961,7 @@
     "xpack.ingestPipelines.clone.loadSourcePipelineErrorTitle": "{name}を読み込めません。",
     "xpack.ingestPipelines.create.docsButtonLabel": "パイプラインドキュメントの作成",
     "xpack.ingestPipelines.create.pageTitle": "パイプラインの作成",
+    "xpack.ingestPipelines.createFromCSV.docsButtonLabel": "パイプラインドキュメントへのCSV",
     "xpack.ingestPipelines.createFromCsv.errorMessage": "{message}",
     "xpack.ingestPipelines.createFromCsv.fetchPipeline.unexpectedErrorDetails": "予期しないエラー",
     "xpack.ingestPipelines.createFromCsv.fetchPipeline.unexpectedErrorTitle": "問題が発生しました",
@@ -15193,7 +16192,7 @@
     "xpack.ingestPipelines.pipelineEditor.dissectForm.patternFieldLabel": "パターン",
     "xpack.ingestPipelines.pipelineEditor.dissectForm.patternRequiredError": "パターン値が必要です。",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameHelpText": "ドット表記を含むフィールド。",
-    "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameRequiresDotError": "フィールド値には、1つ以上のドット文字が必要です。",
+    "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameRequiresDotError": "フィールド名はアスタリスクにするか、ドット文字を使用する必要があります。",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.pathFieldLabel": "パス",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.pathHelpText": "出力フィールド。展開するフィールドが別のオブジェクトフィールドの一部である場合にのみ必要です。",
     "xpack.ingestPipelines.pipelineEditor.dragAndDropList.removeItemLabel": "項目を削除",
@@ -15455,6 +16454,8 @@
     "xpack.ingestPipelines.processors.defaultDescription.dateIndexName.indexNamePrefixDefault.noPrefixValueLabel": "プレフィックスなし",
     "xpack.ingestPipelines.processors.defaultDescription.dateIndexName.indexNamePrefixDefault.prefixValueLabel": "プレフィックス\"{prefix}\"を使用",
     "xpack.ingestPipelines.processors.defaultDescription.dissect": "分離したパターンと一致する値を\"{field}\"から抽出します",
+    "xpack.ingestPipelines.processors.defaultDescription.dot_expander.dot_notation": "\"{field}\"をオブジェクトフィールドに拡張します",
+    "xpack.ingestPipelines.processors.defaultDescription.dot_expander.wildcard": "すべての上位のフィールドが展開されます",
     "xpack.ingestPipelines.processors.defaultDescription.drop": "エラーを返さずにドキュメントを破棄します",
     "xpack.ingestPipelines.processors.defaultDescription.enrich": "\"{policy_name}\"ポリシーが\"{field}\"と一致した場合に、データを\"{target_field}\"に改善します",
     "xpack.ingestPipelines.processors.defaultDescription.fail": "実行を停止する例外を発生させます",
@@ -15684,6 +16685,7 @@
     "xpack.lists.exceptions.builder.exceptionFieldPlaceholder": "検索",
     "xpack.lists.exceptions.builder.exceptionFieldValuePlaceholder": "検索フィールド値...",
     "xpack.lists.exceptions.builder.exceptionListsPlaceholder": "リストを検索...",
+    "xpack.lists.exceptions.builder.exceptionMatchesOperator.warningMessage.wildcardInFilepath": "より効率的なイベントフィルターを作成するには、複数の条件を使用して、パス値でワイルドカードを使用するときにできるかぎり具体的にします。たとえば、process.nameまたはfile.nameフィールドを追加します。",
     "xpack.lists.exceptions.builder.exceptionOperatorPlaceholder": "演算子",
     "xpack.lists.exceptions.builder.fieldLabel": "フィールド",
     "xpack.lists.exceptions.builder.operatorLabel": "演算子",
@@ -15815,6 +16817,21 @@
     "xpack.maps.common.esSpatialRelation.disjointLabel": "disjoint",
     "xpack.maps.common.esSpatialRelation.intersectsLabel": "intersects",
     "xpack.maps.common.esSpatialRelation.withinLabel": "within",
+    "xpack.maps.customIconModal.advancedOptionsLabel": "高度なオプション",
+    "xpack.maps.customIconModal.cancelButtonLabel": "キャンセル",
+    "xpack.maps.customIconModal.cutoffRangeLabel": "アルファしきい値",
+    "xpack.maps.customIconModal.cutoffRangeTooltip": "アイコンの内側（1に近い）と外側（0に近い）の間で符号付き距離関数のバランスを調整します。",
+    "xpack.maps.customIconModal.deleteButtonLabel": "削除",
+    "xpack.maps.customIconModal.elementPreviewTitle": "プレビューを表示",
+    "xpack.maps.customIconModal.elementPreviewTooltip": "動的スタイルでは、符号付き距離関数を使用して、SVGアイコンを表示する必要があります。結果として、鋭い角と複雑な詳細が正しく表示されない場合があります。質の高い結果を得るために、アルファしきい値と半径を微調整できる場合があります。",
+    "xpack.maps.customIconModal.imageFilePickerPlaceholder": "SVGアイコンを選択するかドラッグしてください",
+    "xpack.maps.customIconModal.imageInputDescription": "鋭い角と複雑な詳細がないSVGが最適です。詳細オプションで設定を修正すると、レンダリングが改善される場合があります。",
+    "xpack.maps.customIconModal.invalidFileError": "アイコンはSVG形式でなければなりません。他の画像タイプはサポートされていません。",
+    "xpack.maps.customIconModal.nameInputLabel": "名前",
+    "xpack.maps.customIconModal.radiusRangeLabel": "半径",
+    "xpack.maps.customIconModal.raduisRangeTooltip": "アイコンサイズの割合として、アルファしきい値の周辺で、符号付き距離関数のサイズを調整します。",
+    "xpack.maps.customIconModal.resetButtonLabel": "リセット",
+    "xpack.maps.customIconModal.saveButtonLabel": "保存",
     "xpack.maps.dataView.label": "データビュー",
     "xpack.maps.dataView.notFoundMessage": "データビュー'{id}'が見つかりません",
     "xpack.maps.dataView.selectPlacholder": "データビューを選択",
@@ -15833,7 +16850,7 @@
     "xpack.maps.drawTooltip.polygonInstructions": "クリックしてシェイプを開始します。クリックして頂点を追加します。ダブルクリックして終了します。",
     "xpack.maps.embeddable.boundsFilterLabel": "中央のマップの境界：{lat}、{lon}、ズーム：{zoom}",
     "xpack.maps.embeddableDisplayName": "マップ",
-    "xpack.maps.emsFileSelect.selectPlaceholder": "EMSレイヤーを選択",
+    "xpack.maps.emsFileSelect.selectPlaceholder": "EMS境界を選択",
     "xpack.maps.emsSource.tooltipsTitle": "ツールチップフィールド",
     "xpack.maps.es_geo_utils.convert.unsupportedGeometryTypeErrorMessage": "{geometryType} ジオメトリから Geojson に変換できません。サポートされていません",
     "xpack.maps.es_geo_utils.distanceFilterAlias": "{pointLabel}の{distanceKm} km以内",
@@ -15879,6 +16896,8 @@
     "xpack.maps.heatmap.colorRampLabel": "色の範囲",
     "xpack.maps.heatmapLegend.coldLabel": "コールド",
     "xpack.maps.heatmapLegend.hotLabel": "ホット",
+    "xpack.maps.hexbin.geoShape.disabledReason": "{hexLabel}には'geo_point'クラスターフィールドが必要です。",
+    "xpack.maps.hexbin.license.disabledReason": "{hexLabel}はサブスクリプション機能です。",
     "xpack.maps.indexData.indexExists": "インデックス'{index}'が見つかりません。有効なインデックスを設定する必要があります",
     "xpack.maps.indexSettings.fetchErrorMsg": "データビュー'{indexPatternTitle}'のインデックス設定を取得できません。\n      '{viewIndexMetaRole}'ロールがあることを確認してください。",
     "xpack.maps.initialLayers.unableToParseMessage": "「initialLayers」パラメーターのコンテンツをパースできません。エラー：{errorMsg}",
@@ -15924,8 +16943,6 @@
     "xpack.maps.layerPanel.join.applyGlobalTimeCheckboxLabel": "結合するグローバル時刻を適用",
     "xpack.maps.layerPanel.join.deleteJoinAriaLabel": "ジョブの削除",
     "xpack.maps.layerPanel.join.deleteJoinTitle": "ジョブの削除",
-    "xpack.maps.layerPanel.joinEditor.addJoinAriaLabel": "結合を追加",
-    "xpack.maps.layerPanel.joinEditor.addJoinButtonLabel": "結合を追加",
     "xpack.maps.layerPanel.joinEditor.termJoinsTitle": "用語結合",
     "xpack.maps.layerPanel.joinEditor.termJoinTooltip": "用語結合を使用すると、データに基づくスタイル設定のプロパティでこのレイヤーを強化します。",
     "xpack.maps.layerPanel.joinExpression.helpText": "共有キーを構成します。",
@@ -15985,9 +17002,19 @@
     "xpack.maps.legacyVisualizations.title": "{label}はMapsに変換されました。",
     "xpack.maps.legacyVisualizations.useMapsMsg": "Mapsを使用すると、複数のレイヤーとインデックスを追加する、個別のドキュメントをプロットする、データ値から特徴を表現する、ヒートマップ、グリッド、クラスターを追加するなど、さまざまなことが可能です。",
     "xpack.maps.legend.upto": "最大",
+    "xpack.maps.lens.choropleth.label": "地域マップ",
+    "xpack.maps.lens.choroplethChart.addLayer": "ビジュアライゼーションレイヤーを追加",
+    "xpack.maps.lens.choroplethChart.choroplethLayerLabel": "{accessorLabel}別{emsLayerLabel}",
+    "xpack.maps.lens.choroplethChart.metricValueLabel": "メトリック",
+    "xpack.maps.lens.choroplethChart.regionKeyLabel": "リージョンキー",
+    "xpack.maps.lens.choroplethChart.suggestionLabel": "{metricLabel}別{emsLayerLabel}",
+    "xpack.maps.lens.groupLabel": "マップ",
     "xpack.maps.loadMap.errorAttemptingToLoadSavedMap": "マップを読み込めません",
+    "xpack.maps.logDatatable.region": "リージョンキー",
+    "xpack.maps.logDatatable.value": "値",
     "xpack.maps.map.initializeErrorTitle": "マップを初期化できません",
     "xpack.maps.mapActions.addFeatureError": "機能をインデックスに追加できません。",
+    "xpack.maps.mapActions.deleteCustomIconWarning": "アイコンを削除できません。アイコンは{count, plural, other {個のレイヤー}}によって使用されています：{layerNames}",
     "xpack.maps.mapActions.removeFeatureError": "インデックスから機能を削除できません。",
     "xpack.maps.mapListing.descriptionFieldTitle": "説明",
     "xpack.maps.mapListing.entityName": "マップ",
@@ -15996,13 +17023,18 @@
     "xpack.maps.mapListing.tableCaption": "マップ",
     "xpack.maps.mapListing.titleFieldTitle": "タイトル",
     "xpack.maps.mapSavedObjectLabel": "マップ",
+    "xpack.maps.mapSettingsPanel.addCustomIcon": "カスタムアイコンを追加",
     "xpack.maps.mapSettingsPanel.autoFitToBoundsLocationLabel": "自動的にマップをデータ境界に合わせる",
     "xpack.maps.mapSettingsPanel.autoFitToDataBoundsLabel": "自動的にマップをデータ境界に合わせる",
     "xpack.maps.mapSettingsPanel.backgroundColorLabel": "背景色",
     "xpack.maps.mapSettingsPanel.browserLocationLabel": "ブラウザーの位置情報",
     "xpack.maps.mapSettingsPanel.cancelLabel": "キャンセル",
     "xpack.maps.mapSettingsPanel.closeLabel": "閉じる",
+    "xpack.maps.mapSettingsPanel.customIcons.emptyState.description": "このマップのレイヤーで使用できるカスタムアイコンを追加します。",
+    "xpack.maps.mapSettingsPanel.customIconsAddIconButton": "追加",
+    "xpack.maps.mapSettingsPanel.customIconsTitle": "カスタムアイコン",
     "xpack.maps.mapSettingsPanel.displayTitle": "表示",
+    "xpack.maps.mapSettingsPanel.editCustomIcon": "カスタムアイコンを編集",
     "xpack.maps.mapSettingsPanel.fixedLocationLabel": "固定の場所",
     "xpack.maps.mapSettingsPanel.initialLatLabel": "緯度初期値",
     "xpack.maps.mapSettingsPanel.initialLonLabel": "経度初期値",
@@ -16046,7 +17078,7 @@
     "xpack.maps.mvtSource.trashButtonAriaLabel": "フィールドの削除",
     "xpack.maps.mvtSource.trashButtonTitle": "フィールドの削除",
     "xpack.maps.newVectorLayerWizard.description": "マップに図形を描画し、Elasticsearchでインデックス",
-    "xpack.maps.newVectorLayerWizard.disabledDesc": "インデックスを作成できません。Kibanaの「インデックスパターン管理」権限がありません。",
+    "xpack.maps.newVectorLayerWizard.disabledDesc": "インデックスを作成できません。Kibana「データビュー管理」権限がありません。",
     "xpack.maps.newVectorLayerWizard.indexNewLayer": "インデックスの作成",
     "xpack.maps.newVectorLayerWizard.title": "インデックスの作成",
     "xpack.maps.noGeoFieldInIndexPattern.message": "データビューには地理空間フィールドが含まれていません",
@@ -16080,6 +17112,10 @@
     "xpack.maps.regionMapMap.vis.title": "地域マップ",
     "xpack.maps.registerIntegrations.gdal.integrationDescription": "shapefilesをアップロードし、GDALを使用してPostGISやOracle Spatialなどの関係データベースから取り込みます。",
     "xpack.maps.registerIntegrations.gdal.integrationTitle": "GDAL",
+    "xpack.maps.registerIntegrations.geojson.integrationDescription": "ElasticマップでGeoJSONファイルをアップロードします。",
+    "xpack.maps.registerIntegrations.geojson.integrationTitle": "GeoJSON",
+    "xpack.maps.registerIntegrations.shapefile.integrationDescription": "ElasticマップでShapeファイルをアップロードします。",
+    "xpack.maps.registerIntegrations.shapefile.integrationTitle": "図形ファイル",
     "xpack.maps.sampleData.ecommerceSpec.mapsTitle": "[e コマース] 国別の注文",
     "xpack.maps.sampleData.flightaSpec.logsTitle": "[ログ ] 合計リクエスト数とバイト数",
     "xpack.maps.sampleData.flightsSpec.mapsTitle": "[フライト] 出発地の時間の遅延",
@@ -16087,7 +17123,6 @@
     "xpack.maps.scalingDocs.clustersDetails": "結果が{maxResultWindow}ドキュメントを超えたときにクラスターを表示します。結果が{maxResultWindow}未満のときにドキュメントを表示します。",
     "xpack.maps.scalingDocs.clustersUseCase": "このオプションを使用して、大きいデータセットを表示します。用語結合はサポートされていません。",
     "xpack.maps.scalingDocs.limitDetails": "最初の{maxResultWindow}ドキュメントから特徴量を表示します。",
-    "xpack.maps.scalingDocs.limitUseCase": "このオプションを使用すると、境界を越えて統計情報を比較する階級区分図を作成します。",
     "xpack.maps.scalingDocs.maxResultWindow": "{link}インデックス設定で提供された{maxResultWindow}制約。",
     "xpack.maps.scalingDocs.mvtDetails": "マップをタイルに区分します。各タイルには、最初の{maxResultWindow}ドキュメントの特徴量が表示されます。{maxResultWindow}を超える結果はタイルに表示されません。バウンディングボックスは、データが不完全である領域を示します。",
     "xpack.maps.scalingDocs.mvtUseCase": "このオプションを使用すると、最速読み込み時間で大きいデータセットを表示します。用語結合、書式設定されたラベル、スクリプトフィールドからのデータドリブンスタイルはサポートされません。",
@@ -16121,7 +17156,7 @@
     "xpack.maps.source.emsFile.layerLabel": "レイヤー",
     "xpack.maps.source.emsFile.unableToFindFileIdErrorMessage": "ID {id} の EMS ベクターシェイプが見つかりません。{info}",
     "xpack.maps.source.emsFileDisabledReason": "ElasticマップサーバーにはEnterpriseライセンスが必要です",
-    "xpack.maps.source.emsFileSelect.selectLabel": "レイヤー",
+    "xpack.maps.source.emsFileSelect.selectLabel": "EMS境界",
     "xpack.maps.source.emsFileSourceDescription": "{host} からの管理境界",
     "xpack.maps.source.emsFileTitle": "ベクターシェイプ",
     "xpack.maps.source.emsOnPremFileTitle": "Elasticマップサーバー境界",
@@ -16137,9 +17172,13 @@
     "xpack.maps.source.emsTileSourceDescription": "{host} からのベースマップサービス",
     "xpack.maps.source.emsTileTitle": "タイル",
     "xpack.maps.source.esAggSource.topTermLabel": "上位の {fieldLabel}",
-    "xpack.maps.source.esGeoGrid.geofieldLabel": "地理空間フィールド",
+    "xpack.maps.source.esGeoGrid.clusterDescription": "各グリッドセルで重み付けされた中心を使用して、ドキュメントをグリッドにグループ化します。",
+    "xpack.maps.source.esGeoGrid.geofieldLabel": "クラスターフィールド",
     "xpack.maps.source.esGeoGrid.geofieldPlaceholder": "ジオフィールドを選択",
+    "xpack.maps.source.esGeoGrid.gridDescription": "ドキュメントをグリッドにグループ化します。",
     "xpack.maps.source.esGeoGrid.gridRectangleDropdownOption": "グリッド",
+    "xpack.maps.source.esGeoGrid.hexDescription": "ドキュメントを六角形にグループ化します。",
+    "xpack.maps.source.esGeoGrid.hexDropdownOption": "六角形",
     "xpack.maps.source.esGeoGrid.pointsDropdownOption": "クラスター",
     "xpack.maps.source.esGeoGrid.showAsLabel": "表示形式",
     "xpack.maps.source.esGeoGrid.showAsSelector": "表示方法を選択",
@@ -16162,7 +17201,7 @@
     "xpack.maps.source.esGeoLineTitle": "追跡",
     "xpack.maps.source.esGrid.compositeInspectorDescription": "Elasticsearch ジオグリッド集約リクエスト：{requestId}",
     "xpack.maps.source.esGrid.compositePaginationErrorMessage": "{layerName} はリクエスト過多の原因になります。「グリッド解像度」を下げるか、またはトップ用語「メトリック」の数を減らしてください。",
-    "xpack.maps.source.esGrid.geospatialFieldLabel": "地理空間フィールド",
+    "xpack.maps.source.esGrid.geospatialFieldLabel": "クラスターフィールド",
     "xpack.maps.source.esGrid.highLabel": "高",
     "xpack.maps.source.esGrid.inspectorDescription": "Elasticsearch ジオグリッド集約リクエスト",
     "xpack.maps.source.esGrid.lowLabel": "低",
@@ -16173,8 +17212,8 @@
     "xpack.maps.source.esGrid.vectorTileModal.confirmBtnLabel": "承諾",
     "xpack.maps.source.esGrid.vectorTileModal.message": "高解像度はElasticsearchベクトルタイルAPIのベクトルタイルを使用します。ElasticsearchベクトルタイルAPIは「上位の用語」メトリックをサポートしていません。高精細グリッド解像度に切り替えると、すべての「上位の用語」メトリックがレイヤー構成から削除されます。",
     "xpack.maps.source.esGrid.vectorTileModal.title": "「上位の用語」メトリックはサポートされていません",
-    "xpack.maps.source.esGridClustersDescription": "それぞれのグリッド付きセルのメトリックでグリッドにグループ分けされた地理空間データです。",
-    "xpack.maps.source.esGridClustersTitle": "クラスターとグリッド",
+    "xpack.maps.source.esGridClustersDescription": "Elasticsearchドキュメントをグリッドと六角形にグループ化し、各グループのメトリックを表示",
+    "xpack.maps.source.esGridClustersTitle": "クラスター",
     "xpack.maps.source.esGridHeatmapDescription": "密度を示すグリッドでグループ化された地理空間データ",
     "xpack.maps.source.esGridHeatmapTitle": "ヒートマップ",
     "xpack.maps.source.esJoin.countLabel": "{indexPatternTitle} の件数",
@@ -16191,15 +17230,11 @@
     "xpack.maps.source.esSearch.indexOverOneLengthEditError": "データビューは複数のインデックスを参照しています。データビューごとに1つのインデックスのみが許可されています。",
     "xpack.maps.source.esSearch.indexZeroLengthEditError": "データビューはどのインデックスも参照していません。",
     "xpack.maps.source.esSearch.joinsDisabledReason": "クラスターでスケーリングするときに、結合はサポートされていません",
-    "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "ベクトルタイルでスケーリングするときに、結合はサポートされていません",
     "xpack.maps.source.esSearch.limitScalingLabel": "結果を{maxResultWindow}に限定",
     "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "ドキュメントが見つかりません。_id：{docId}",
     "xpack.maps.source.esSearch.scalingModal.cancelBtnLabel": "キャンセル",
-    "xpack.maps.source.esSearch.scalingModal.clusters": "クラスター",
     "xpack.maps.source.esSearch.scalingModal.confirmBtnLabel": "承諾",
-    "xpack.maps.source.esSearch.scalingModal.message": "スケーリングオプション{scalingOptionLabel}は用語結合をサポートしていません。{scalingOptionLabel}に切り替えると、すべての用語結合がレイヤー構成から削除されます。",
     "xpack.maps.source.esSearch.scalingModal.title": "用語結合はサポートされていません",
-    "xpack.maps.source.esSearch.scalingModal.vectorTiles": "ベクトルタイル",
     "xpack.maps.source.esSearch.selectLabel": "ジオフィールドを選択",
     "xpack.maps.source.esSearch.sortFieldLabel": "フィールド",
     "xpack.maps.source.esSearch.sortFieldSelectPlaceholder": "ソートフィールドを選択",
@@ -16311,6 +17346,9 @@
     "xpack.maps.styles.vector.disabledByMessage": "「{styleLabel}」を有効に設定する",
     "xpack.maps.styles.vector.fillColorLabel": "塗りつぶす色",
     "xpack.maps.styles.vector.iconLabel": "アイコン",
+    "xpack.maps.styles.vector.iconSelect.addCustomIconButtonLabel": "カスタムアイコンを追加",
+    "xpack.maps.styles.vector.iconSelect.customIconsGroupLabel": "カスタムアイコン",
+    "xpack.maps.styles.vector.iconSelect.kibanaIconsGroupLabel": "Kibanaアイコン",
     "xpack.maps.styles.vector.labelBorderColorLabel": "ラベル枠線色",
     "xpack.maps.styles.vector.labelBorderWidthLabel": "ラベル枠線幅",
     "xpack.maps.styles.vector.labelColorLabel": "ラベル色",
@@ -16493,6 +17531,19 @@
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.delayedData.timeIntervalHint": "遅延したデータのルール実行中に確認する確認間隔。デフォルトでは、最長バケットスパンとクエリ遅延から取得されます。",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.delayedData.timeIntervalLabel": "時間間隔",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.enableTestLabel": "有効にする",
+    "xpack.ml.analyticsSelector.analyticsFetchErrorMessage": "分析ジョブの取得中にエラーが発生しました。更新して再試行してください。",
+    "xpack.ml.analyticsSelector.applyFlyoutButton": "適用",
+    "xpack.ml.analyticsSelector.closeFlyoutButton": "閉じる",
+    "xpack.ml.analyticsSelector.description": "説明",
+    "xpack.ml.analyticsSelector.destinationIndex": "デスティネーションインデックス",
+    "xpack.ml.analyticsSelector.flyoutTitle": "分析選択",
+    "xpack.ml.analyticsSelector.id": "ID",
+    "xpack.ml.analyticsSelector.jobsTab": "ジョブ",
+    "xpack.ml.analyticsSelector.modelsList.modelDescriptionHeader": "説明",
+    "xpack.ml.analyticsSelector.modelsList.modelIdHeader": "ID",
+    "xpack.ml.analyticsSelector.modelsTab": "モデル",
+    "xpack.ml.analyticsSelector.sourceIndex": "ソースインデックス",
+    "xpack.ml.analyticsSelector.trainedModelsFetchErrorMessage": "学習済みモデルの取得中にエラーが発生しました。更新して再試行してください。",
     "xpack.ml.annotationFlyout.applyToPartitionTextLabel": "注釈をこの系列に適用",
     "xpack.ml.annotationsTable.actionsColumnName": "アクション",
     "xpack.ml.annotationsTable.annotationColumnName": "注釈",
@@ -16574,7 +17625,9 @@
     "xpack.ml.anomaliesTable.influencersCell.showLessInfluencersLinkText": "縮小表示",
     "xpack.ml.anomaliesTable.influencersColumnName": "影響因子：",
     "xpack.ml.anomaliesTable.jobIdColumnName": "ジョブID",
+    "xpack.ml.anomaliesTable.linksMenu.autoGeneratedDiscoverLinkErrorMessage": "Discoverにリンクできません。インデックス'{index}'のデータビューが存在しません",
     "xpack.ml.anomaliesTable.linksMenu.configureRulesLabel": "ジョブルールを構成",
+    "xpack.ml.anomaliesTable.linksMenu.discoverLocatorMissingErrorMessage": "Discoverのロケーターが検出されません",
     "xpack.ml.anomaliesTable.linksMenu.loadingDetailsErrorMessage": "カテゴリー ID {categoryId} の詳細の読み込み中にエラーが発生したため例を表示できません",
     "xpack.ml.anomaliesTable.linksMenu.noMappingCouldBeFoundErrorMessage": "カテゴリー分けフィールド {categorizationFieldName} のマッピングが見つからなかったため、ML カテゴリー {categoryId} のドキュメントの例を表示できません",
     "xpack.ml.anomaliesTable.linksMenu.selectActionAriaLabel": "{time} の異常のアクションを選択",
@@ -17094,6 +18147,8 @@
     "xpack.ml.dataframe.analytics.rocCurveCompute": "特定のクラスの真陽性率（y軸）を異なるしきい値レベルの偽陽性率（x軸）に対して比較して、曲線を作成します。",
     "xpack.ml.dataframe.analytics.rocCurvePopoverTitle": "受信者操作特性（ROC）曲線",
     "xpack.ml.dataframe.analytics.validation.validationFetchErrorMessage": "ジョブの検証エラー",
+    "xpack.ml.dataframe.analyticsExploration.title": "結果の探索",
+    "xpack.ml.dataframe.analyticsExploration.titleWithId": "ジョブID {id}の結果を探索",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.expandedRowJsonPane": "データフレーム分析構成のJSON",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsMessagesLabel": "ジョブメッセージ",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsStatsLabel": "ジョブ統計情報",
@@ -17179,7 +18234,7 @@
     "xpack.ml.dataframe.analyticsList.stopAnalyticsErrorMessage": "データフレーム分析{analyticsId}の停止中にエラーが発生しました。{error}",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsSuccessMessage": "データフレーム分析 {analyticsId} の停止リクエストが受け付けられました。",
     "xpack.ml.dataframe.analyticsList.tableActionLabel": "アクション",
-    "xpack.ml.dataframe.analyticsList.title": "データフレーム分析",
+    "xpack.ml.dataframe.analyticsList.title": "データフレーム分析ジョブ",
     "xpack.ml.dataframe.analyticsList.type": "型",
     "xpack.ml.dataframe.analyticsList.typeFilter": "型",
     "xpack.ml.dataframe.analyticsList.viewActionJobFailedToolTipContent": "データフレーム分析ジョブに失敗しました。結果ページがありません。",
@@ -17187,6 +18242,7 @@
     "xpack.ml.dataframe.analyticsList.viewActionJobNotStartedToolTipContent": "データフレーム分析ジョブが開始しませんでした。結果ページがありません。",
     "xpack.ml.dataframe.analyticsList.viewActionName": "表示",
     "xpack.ml.dataframe.analyticsList.viewActionUnknownJobTypeToolTipContent": "このタイプのデータフレーム分析ジョブでは、結果ページがありません。",
+    "xpack.ml.dataframe.analyticsMap.analyticsIdTitle": "ジョブID {jobId}のマップ",
     "xpack.ml.dataframe.analyticsMap.emptyResponseMessage": "{id} の関連する分析ジョブが見つかりませんでした。",
     "xpack.ml.dataframe.analyticsMap.fetchDataErrorMessage": "一部のデータを取得できません。エラーが発生しました：{error}",
     "xpack.ml.dataframe.analyticsMap.flyout.cloneJobButton": "ジョブのクローンを作成します",
@@ -17202,14 +18258,19 @@
     "xpack.ml.dataframe.analyticsMap.legend.showJobTypesAriaLabel": "ジョブタイプを表示",
     "xpack.ml.dataframe.analyticsMap.legend.trainedModelLabel": "学習済みモデル",
     "xpack.ml.dataframe.analyticsMap.modelIdTitle": "学習済みモデル ID {modelId} のマップ",
+    "xpack.ml.dataframe.analyticsMap.noJobSelectedLabel": "分析IDが選択されていません",
+    "xpack.ml.dataframe.analyticsMap.title": "分析のマップ",
+    "xpack.ml.dataframe.analyticsSourceSelection.title": "新しい分析ジョブ/ソースデータビューを選択",
     "xpack.ml.dataframe.stepDetailsForm.destinationIndexInvalidErrorLink": "インデックス名の制限に関する詳細。",
     "xpack.ml.dataFrameAnalytics.analyticsMap.docTitle": "分析マップ",
     "xpack.ml.dataFrameAnalytics.createJob.docTitle": "ジョブの作成",
-    "xpack.ml.dataFrameAnalytics.exploration.docTitle": "探索",
+    "xpack.ml.dataFrameAnalytics.exploration.docTitle": "結果エクスプローラー",
     "xpack.ml.dataFrameAnalytics.jobs.docTitle": "データフレーム分析ジョブ",
+    "xpack.ml.dataFrameAnalytics.sourceSelection.docTitle": "ソース選択",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.analyticsMapLabel": "分析マップ",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameCreationLabel": "ジョブの作成",
-    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameExplorationLabel": "探索",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameExplorationLabel": "結果エクスプローラー",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameSourceSelectionLabel": "ソース選択",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataViewLabel": "データビュー",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.jobsManagementLabel": "ジョブ",
     "xpack.ml.dataFrameAnalyticsLabel": "データフレーム分析",
@@ -17247,6 +18308,8 @@
     "xpack.ml.datavisualizer.startTrial.subscriptionsLinkText": "PlatinumまたはEnterprise サブスクリプション",
     "xpack.ml.datavisualizerBreadcrumbLabel": "データビジュアライザー",
     "xpack.ml.dataVisualizerPageLabel": "データビジュアライザー",
+    "xpack.ml.datePicker.shortRefreshIntervalTimeFilterWarningMessage": "詳細設定の更新間隔が機械学習でサポートされている最小値よりも短くなっています。",
+    "xpack.ml.datePicker.shortRefreshIntervalURLWarningMessage": "URLの更新間隔が機械学習でサポートされている最小値よりも短くなっています。",
     "xpack.ml.deepLink.anomalyDetection": "異常検知",
     "xpack.ml.deepLink.calendarSettings": "カレンダー",
     "xpack.ml.deepLink.dataFrameAnalytics": "データフレーム分析",
@@ -17259,6 +18322,24 @@
     "xpack.ml.deepLink.overview": "概要",
     "xpack.ml.deepLink.settings": "設定",
     "xpack.ml.deepLink.trainedModels": "学習済みモデル",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanDelete.job": "続行して、{length, plural, other  {# 個のジョブ}}を削除します",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanDelete.model": "続行して、{length, plural, other {# 個のモデル}}を削除します",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanUnTagConfirm": "現在のスペースから削除",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextClose": "閉じる",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextNoAction": "閉じる",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextCanDelete": "{ids} を削除できません。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextCanUnTag": "{ids} を削除できませんが、現在のスペースから削除することはできます。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose": "{ids} を削除できず、現在のスペースからも削除できません。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose.job": "このジョブは * スペースに割り当てられていますが、すべてのスペースへのアクセス権がありません。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose.model": "このモデルは*スペースに割り当てられており、すべてのスペースへのアクセス権があるわけではありません。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction": "{ids} には別のスペースアクセス権があります。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction.job": "複数のジョブを削除するときには、同じアクセス権が必要です。ジョブの選択を解除し、各ジョブを個別に削除してください。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction.model": "複数のモデルを削除するときには、同じアクセス権が必要です。モデルの選択を解除し、各モデルを個別に削除してください。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTitle": "スペースアクセス権を確認しています",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.shouldUnTagLabel.job": "現在のスペースからジョブを削除",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.shouldUnTagLabel.model": "現在のスペースからモデルを削除",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.unTagErrorTitle": "{id} の更新エラー",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.unTagSuccessTitle": "正常に {id} を更新しました",
     "xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorMessage": "メッセージを読み込めませんでした",
     "xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorToastMessageTitle": "ジョブメッセージの読み込みエラー",
     "xpack.ml.editModelSnapshotFlyout.calloutText": "これはジョブ{jobId}で使用されている現在のスナップショットであるため削除できません。",
@@ -17308,8 +18389,10 @@
     "xpack.ml.explorer.charts.infoTooltip.chartPopulationDistributionDescription": "グレーの点は、{overFieldValuesParam} のサンプルの一定期間の値のおおよその分布を示しています。",
     "xpack.ml.explorer.charts.infoTooltip.jobIdTitle": "ジョブID",
     "xpack.ml.explorer.charts.mapsPluginMissingMessage": "マップまたは埋め込み可能起動プラグインが見つかりません",
+    "xpack.ml.explorer.charts.openInMapsPluginMessage": "Mapsで表示",
     "xpack.ml.explorer.charts.openInSingleMetricViewerButtonLabel": "シングルメトリックビューアーで開く",
     "xpack.ml.explorer.charts.tooManyBucketsDescription": "この選択には、表示するバケットが多すぎます。ビューの時間範囲を狭めるか、タイムラインの選択を絞り込んでください。",
+    "xpack.ml.explorer.charts.viewInMapsLabel": "表示",
     "xpack.ml.explorer.charts.viewLabel": "表示",
     "xpack.ml.explorer.clearSelectionLabel": "選択した項目をクリア",
     "xpack.ml.explorer.dashboardsTable.actionsHeader": "アクション",
@@ -17460,6 +18543,7 @@
     "xpack.ml.inference.modelsList.analyticsMapActionLabel": "分析マップ",
     "xpack.ml.inference.modelsList.startModelDeploymentActionLabel": "デプロイを開始",
     "xpack.ml.inference.modelsList.stopModelDeploymentActionLabel": "デプロイを停止",
+    "xpack.ml.inference.modelsList.testModelActionLabel": "モデルの学習",
     "xpack.ml.influencerResultType.description": "時間範囲で最も異常なエンティティ。",
     "xpack.ml.influencerResultType.title": "影響因子",
     "xpack.ml.influencersList.maxAnomalyScoreTooltipDescription": "最高異常スコア：{maxScoreLabel}",
@@ -17552,7 +18636,6 @@
     "xpack.ml.jobsList.alertingRules.tooltipContent": "ジョブ{rulesCount}はアラート{rulesCount, plural, other  { ルール}}に関連付けられています",
     "xpack.ml.jobsList.analyticsSpacesLabel": "スペース",
     "xpack.ml.jobsList.auditMessageColumn.screenReaderDescription": "この列は、過去24時間にエラーまたは警告があった場合にアイコンを表示します",
-    "xpack.ml.jobsList.breadcrumb": "ジョブ",
     "xpack.ml.jobsList.cannotSelectRowForJobMessage": "ジョブID {jobId}を選択できません",
     "xpack.ml.jobsList.cloneJobErrorMessage": "{jobId} のクローンを作成できませんでした。ジョブが見つかりませんでした",
     "xpack.ml.jobsList.closeActionStatusText": "閉じる",
@@ -17718,11 +18801,11 @@
     "xpack.ml.jobsList.managementActions.stopDatafeedDescription": "データフィードを停止します",
     "xpack.ml.jobsList.managementActions.stopDatafeedLabel": "データフィードを停止します",
     "xpack.ml.jobsList.memoryStatusLabel": "メモリー状態",
-    "xpack.ml.jobsList.missingSavedObjectWarning.description": "一部のジョブが見つからないか、保存されたオブジェクトが不完全です。",
+    "xpack.ml.jobsList.missingSavedObjectWarning.description": "一部のジョブまたは学習されたモデルが見つからないか、保存されたオブジェクトが不完全です。",
     "xpack.ml.jobsList.missingSavedObjectWarning.link": " {link}",
-    "xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link": "ジョブを同期します。",
-    "xpack.ml.jobsList.missingSavedObjectWarning.noPermission": "管理者はスタック管理でジョブを同期できます。",
-    "xpack.ml.jobsList.missingSavedObjectWarning.title": "MLジョブ同期は必須です",
+    "xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link": "ジョブと学習されたモデルを同期します。",
+    "xpack.ml.jobsList.missingSavedObjectWarning.noPermission": "管理者はスタック管理でジョブと学習されたモデルを同期できます。",
+    "xpack.ml.jobsList.missingSavedObjectWarning.title": "MLジョブと学習されたモデルの同期が必要です",
     "xpack.ml.jobsList.multiJobActions.groupSelector.addButtonAriaLabel": "追加",
     "xpack.ml.jobsList.multiJobActions.groupSelector.addNewGroupPlaceholder": "新規グループを追加",
     "xpack.ml.jobsList.multiJobActions.groupSelector.applyButtonLabel": "適用",
@@ -17739,7 +18822,6 @@
     "xpack.ml.jobsList.multiJobsActions.startDatafeedsLabel": "{jobsCount, plural, other  {データフィード}}を開始",
     "xpack.ml.jobsList.multiJobsActions.stopDatafeedsLabel": "{jobsCount, plural, other  {データフィード}}を停止",
     "xpack.ml.jobsList.nodeAvailableWarning.linkToCloud.hereLinkText": "Elastic Cloud 展開",
-    "xpack.ml.jobsList.nodeAvailableWarning.linkToCloudDescription": "{link}を編集してください。1GBの空き機械学習ノードを有効にするか、既存のML構成を拡張することができます。",
     "xpack.ml.jobsList.nodeAvailableWarning.noMLNodesAvailableDescription": "利用可能な ML ノードがありません。",
     "xpack.ml.jobsList.nodeAvailableWarning.noMLNodesAvailableTitle": "利用可能な ML ノードがありません",
     "xpack.ml.jobsList.nodeAvailableWarning.unavailableCreateOrRunJobsDescription": "ジョブの作成または実行はできません。",
@@ -17811,12 +18893,15 @@
     "xpack.ml.management.jobsList.insufficientLicenseDescription": "これらの機械学習機能を使用するには、{link}する必要があります。",
     "xpack.ml.management.jobsList.insufficientLicenseDescription.link": "試用版を開始するか、サブスクリプションをアップグレード",
     "xpack.ml.management.jobsList.insufficientLicenseLabel": "サブスクリプション機能のアップグレード",
-    "xpack.ml.management.jobsList.jobsListTagline": "機械学習分析と異常検知ジョブを表示、エクスポート、インポートします。",
-    "xpack.ml.management.jobsList.jobsListTitle": "機械学習ジョブ",
+    "xpack.ml.management.jobsList.jobsListTagline": "機械学習分析と異常検知項目を表示、エクスポート、インポートします。",
+    "xpack.ml.management.jobsList.jobsListTitle": "機械学習",
     "xpack.ml.management.jobsList.noGrantedPrivilegesDescription": "機械学習ジョブを管理するアクセス権がありません。プラグインにアクセスするには、機械学習機能をこのスペースで表示する必要があります。",
     "xpack.ml.management.jobsList.noPermissionToAccessLabel": "アクセスが拒否されました",
     "xpack.ml.management.jobsList.syncFlyoutButton": "保存されたオブジェクトを同期",
-    "xpack.ml.management.jobsListTitle": "機械学習ジョブ",
+    "xpack.ml.management.jobsList.trainedModelsTab": "学習済みモデル",
+    "xpack.ml.management.jobsListTitle": "機械学習",
+    "xpack.ml.management.jobsSpacesList.jobObjectNoun": "ジョブ",
+    "xpack.ml.management.jobsSpacesList.modelObjectNoun": "学習済みモデル",
     "xpack.ml.management.jobsSpacesList.updateSpaces.error": "{id} の更新エラー",
     "xpack.ml.management.syncSavedObjectsFlyout.closeButton": "閉じる",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsAdded.description": "異常検知のデータフィード ID がない保存されたオブジェクトがある場合は、ID が追加されます。",
@@ -17829,8 +18914,8 @@
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsCreated.title": "見つからない保存されたオブジェクト（{count}）",
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsDeleted.description": "付属するジョブがない保存されたオブジェクトがある場合、削除されます。",
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsDeleted.title": "一致しない保存されたオブジェクト（{count}）",
-    "xpack.ml.management.syncSavedObjectsFlyout.sync.error": "一部のジョブを同期できません。",
-    "xpack.ml.management.syncSavedObjectsFlyout.sync.success": "{successCount} {successCount, plural, other  {件のジョブ}}が同期されました",
+    "xpack.ml.management.syncSavedObjectsFlyout.sync.error": "一部のジョブまたは学習されたモデルを同期できません。",
+    "xpack.ml.management.syncSavedObjectsFlyout.sync.success": "{successCount} {successCount, plural, other {個の項目}}が同期されました",
     "xpack.ml.management.syncSavedObjectsFlyout.syncButton": "同期",
     "xpack.ml.maps.anomalyLayerActualLabel": "実際",
     "xpack.ml.maps.anomalyLayerByFieldNameLabel": "フィールド名別",
@@ -17838,6 +18923,7 @@
     "xpack.ml.maps.anomalyLayerDescription": "機械学習ジョブから異常を表示",
     "xpack.ml.maps.anomalyLayerFieldNameLabel": "フィールド名",
     "xpack.ml.maps.anomalyLayerFunctionDescriptionLabel": "関数",
+    "xpack.ml.maps.anomalyLayerInfluencersLabel": "影響",
     "xpack.ml.maps.anomalyLayerOverFieldNameLabel": "オーバーフィールド名",
     "xpack.ml.maps.anomalyLayerOverFieldValueLabel": "オーバーフィールド値",
     "xpack.ml.maps.anomalyLayerPartitionFieldNameLabel": "パーティションフィールド名",
@@ -17851,9 +18937,13 @@
     "xpack.ml.maps.anomalySource.displayLabel": "{jobId}の{typicalActual}",
     "xpack.ml.maps.anomalySourcePropLabel": "ジョブID",
     "xpack.ml.maps.jobIdLabel": "ジョブID",
+    "xpack.ml.maps.resultsTrimmedMsg": "結果は初めの {count} 件のドキュメントに制限されています。",
     "xpack.ml.maps.settingsEditorLabel": "異常",
     "xpack.ml.maps.sourceTooltip": "異常を表示",
     "xpack.ml.maps.typicalActualLabel": "型",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.createJobButtonText": "ジョブを作成",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.createJobMessage": "異常検知ジョブを作成しますか？",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.emptyPromptText": "異常検知により、地理データの異常な動作を検出できます。lat_long関数を使用するジョブを作成します。これはMaps異常レイヤーで必要です。",
     "xpack.ml.modelManagement.nodesOverview.docTitle": "ノード",
     "xpack.ml.modelManagement.nodesOverviewHeader": "ノード",
     "xpack.ml.modelManagement.trainedModels.docTitle": "学習済みモデル",
@@ -18006,7 +19096,9 @@
     "xpack.ml.navMenu.anomalyDetection.jobsManagementText": "ジョブ",
     "xpack.ml.navMenu.anomalyDetection.singleMetricViewerText": "シングルメトリックビューアー",
     "xpack.ml.navMenu.anomalyDetectionTabLinkText": "異常検知",
+    "xpack.ml.navMenu.dataFrameAnalytics.analyticsMapText": "分析マップ",
     "xpack.ml.navMenu.dataFrameAnalytics.jobsManagementText": "ジョブ",
+    "xpack.ml.navMenu.dataFrameAnalytics.resultsExplorerText": "結果エクスプローラー",
     "xpack.ml.navMenu.dataFrameAnalyticsTabLinkText": "データフレーム分析",
     "xpack.ml.navMenu.dataViewDataVisualizerLinkText": "データビュー",
     "xpack.ml.navMenu.dataVisualizerTabLinkText": "データビジュアライザー",
@@ -18433,6 +19525,7 @@
     "xpack.ml.overviewJobsList.statsBar.openJobsLabel": "ジョブを開く",
     "xpack.ml.overviewJobsList.statsBar.totalJobsLabel": "合計ジョブ数",
     "xpack.ml.pageRefreshButton": "更新",
+    "xpack.ml.pageRefreshResetButton": "{defaultInterval}に設定",
     "xpack.ml.plugin.title": "機械学習",
     "xpack.ml.previewAlert.actualLabel": "実際：",
     "xpack.ml.previewAlert.hideResultsButtonLabel": "結果を非表示",
@@ -18820,6 +19913,7 @@
     "xpack.ml.trainedModels.modelsList.expandedRow.inferenceStatsTitle": "推論統計情報",
     "xpack.ml.trainedModels.modelsList.expandedRow.ingestStatsTitle": "統計情報を取り込む",
     "xpack.ml.trainedModels.modelsList.expandedRow.metadataTitle": "メタデータ",
+    "xpack.ml.trainedModels.modelsList.expandedRow.modelSizeStatsTitle": "モデルサイズ統計",
     "xpack.ml.trainedModels.modelsList.expandedRow.pipelinesTabLabel": "パイプライン",
     "xpack.ml.trainedModels.modelsList.expandedRow.processorsTitle": "定義",
     "xpack.ml.trainedModels.modelsList.expandedRow.statsTabLabel": "統計",
@@ -18842,8 +19936,10 @@
     "xpack.ml.trainedModels.modelsList.pipelines.processorStats.timePerDocDescription": "このノードのライフタイム中にドキュメントの取り込みの前処理にかかった合計時間",
     "xpack.ml.trainedModels.modelsList.pipelines.processorStats.timePerDocHeader": "ドキュメントごとの時間",
     "xpack.ml.trainedModels.modelsList.pipelines.processorStats.typeHeader": "プロセッサータイプ",
+    "xpack.ml.trainedModels.modelsList.refreshManagementList": "更新",
     "xpack.ml.trainedModels.modelsList.selectableMessage": "モデルを選択",
     "xpack.ml.trainedModels.modelsList.selectedModelsMessage": "{modelsCount, plural, other  {#個のモデル}}が選択されました",
+    "xpack.ml.trainedModels.modelsList.spacesLabel": "スペース",
     "xpack.ml.trainedModels.modelsList.startFailed": "\"{modelId}\"の開始に失敗しました",
     "xpack.ml.trainedModels.modelsList.startSuccess": "\"{modelId}\"のデプロイが正常に開始しました。",
     "xpack.ml.trainedModels.modelsList.stateHeader": "ステータス",
@@ -18862,6 +19958,7 @@
     "xpack.ml.trainedModels.nodesList.expandRow": "拡張",
     "xpack.ml.trainedModels.nodesList.jvmHeapSIze": "JVMヒープサイズ",
     "xpack.ml.trainedModels.nodesList.memoryBreakdown": "メモリー分析を近似",
+    "xpack.ml.trainedModels.nodesList.mlMaxMemory": "MLネイティブプロセスで許可された最大メモリ",
     "xpack.ml.trainedModels.nodesList.modelsList.modelAvgInferenceTimeHeader": "平均推定時間",
     "xpack.ml.trainedModels.nodesList.modelsList.modelInferenceCountHeader": "推定件数",
     "xpack.ml.trainedModels.nodesList.modelsList.modelLastAccessHeader": "前回アクセス",
@@ -18871,12 +19968,25 @@
     "xpack.ml.trainedModels.nodesList.modelsList.modelSizeHeader": "サイズ",
     "xpack.ml.trainedModels.nodesList.modelsList.modelStartTimeHeader": "開始時刻",
     "xpack.ml.trainedModels.nodesList.modelsList.nodeNameHeader": "ノード名",
+    "xpack.ml.trainedModels.nodesList.modelsList.throughputLastMinuteHeader": "スループット",
     "xpack.ml.trainedModels.nodesList.modelsMemoryUsage": "学習済みモデル",
     "xpack.ml.trainedModels.nodesList.nodeMemoryUsageHeader": "メモリー使用状況",
     "xpack.ml.trainedModels.nodesList.nodeNameHeader": "名前",
     "xpack.ml.trainedModels.nodesList.nodesFetchError": "ノードの取り込みが失敗しました",
     "xpack.ml.trainedModels.nodesList.nodeTotalMemoryHeader": "合計メモリー",
     "xpack.ml.trainedModels.nodesList.totalAmountLabel": "合計機械学習ノード",
+    "xpack.ml.trainedModels.testModelsFlyout.headerLabel": "学習済みモデルのテスト",
+    "xpack.ml.trainedModels.testModelsFlyout.inferenceError": "エラーが発生しました",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.inputText": "入力テキスト",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.markupTab": "アウトプット",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.language_title": "言語",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.probability_title": "確率",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.title": "これは{lang}のようになります",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.titleUnknown": "不明な言語コード：{code}",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.rawOutput": "元の出力",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.runButton": "テスト",
+    "xpack.ml.trainedModels.testModelsFlyout.ner.output.probabilityTitle": "確率",
+    "xpack.ml.trainedModels.testModelsFlyout.ner.output.typeTitle": "型",
     "xpack.ml.trainedModelsBreadcrumbs.nodeOverviewLabel": "ノード",
     "xpack.ml.trainedModelsBreadcrumbs.trainedModelsLabel": "学習済みモデル",
     "xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningDescription": "機械学習に関連したインデックスは現在アップグレード中です。",
@@ -19145,9 +20255,9 @@
     "xpack.monitoring.apm.instances.totalEventsRateTitle": "合計イベントレート",
     "xpack.monitoring.apm.instances.versionFilter": "バージョン",
     "xpack.monitoring.apm.instances.versionTitle": "バージョン",
-    "xpack.monitoring.apm.metrics.agentHeading": "APM &amp; Fleetサーバー",
+    "xpack.monitoring.apm.metrics.agentHeading": "統合サーバー",
     "xpack.monitoring.apm.metrics.heading": "APM Server ",
-    "xpack.monitoring.apm.metrics.topCharts.agentTitle": "APM &amp; Fleetサーバー - リソース使用量",
+    "xpack.monitoring.apm.metrics.topCharts.agentTitle": "統合サーバー - リソース使用量",
     "xpack.monitoring.apm.metrics.topCharts.title": "APMサーバー - リソース使用量",
     "xpack.monitoring.apm.overview.pageTitle": "APM Server 概要",
     "xpack.monitoring.apm.overview.panels.title": "APMサーバー - メトリック",
@@ -19250,15 +20360,15 @@
     "xpack.monitoring.cluster.listing.statusColumnTitle": "アラートステータス",
     "xpack.monitoring.cluster.listing.tabTitle": "クラスター",
     "xpack.monitoring.cluster.listing.unknownHealthMessage": "不明",
-    "xpack.monitoring.cluster.overview.apmPanel.agentServersTotalLinkLabel": "APM &amp; Fleetサーバー：{apmsTotal}",
-    "xpack.monitoring.cluster.overview.apmPanel.apmFleetTitle": "APM &amp; Fleetサーバー",
+    "xpack.monitoring.cluster.overview.apmPanel.agentServersTotalLinkLabel": "統合サーバー：{apmsTotal}",
+    "xpack.monitoring.cluster.overview.apmPanel.apmFleetTitle": "統合サーバー",
     "xpack.monitoring.cluster.overview.apmPanel.apmTitle": "APM Server ",
-    "xpack.monitoring.cluster.overview.apmPanel.instancesAndFleetsTotalLinkAriaLabel": "APMおよびFleetサーバーインスタンス：{apmsTotal}",
+    "xpack.monitoring.cluster.overview.apmPanel.instancesAndFleetsTotalLinkAriaLabel": "統合サーバーインスタンス：{apmsTotal}",
     "xpack.monitoring.cluster.overview.apmPanel.instancesTotalLinkAriaLabel": "APM Server インスタンス：{apmsTotal}",
     "xpack.monitoring.cluster.overview.apmPanel.lastEventDescription": "{timeOfLastEvent} ago",
     "xpack.monitoring.cluster.overview.apmPanel.lastEventLabel": "最後のイベント",
     "xpack.monitoring.cluster.overview.apmPanel.memoryUsageLabel": "メモリー使用状況（差分）",
-    "xpack.monitoring.cluster.overview.apmPanel.overviewFleetLinkLabel": "APM &amp; Fleetサーバー概要",
+    "xpack.monitoring.cluster.overview.apmPanel.overviewFleetLinkLabel": "統合サーバー概要",
     "xpack.monitoring.cluster.overview.apmPanel.overviewLinkLabel": "APM Server 概要",
     "xpack.monitoring.cluster.overview.apmPanel.processedEventsLabel": "処理済みのイベント",
     "xpack.monitoring.cluster.overview.apmPanel.serversTotalLinkLabel": "APM Server：{apmsTotal}",
@@ -20439,7 +21549,7 @@
     "xpack.observability.alerts.ruleStats.disabled": "無効",
     "xpack.observability.alerts.ruleStats.errors": "エラー",
     "xpack.observability.alerts.ruleStats.loadError": "ルール統計情報を読み込めません",
-    "xpack.observability.alerts.ruleStats.muted": "ミュート",
+    "xpack.observability.alerts.ruleStats.muted": "スヌーズ済み",
     "xpack.observability.alerts.ruleStats.ruleCount": "ルール数",
     "xpack.observability.alerts.searchBarPlaceholder": "検索アラート（例：kibana.alert.evaluation.threshold > 75）",
     "xpack.observability.alerts.workflowStatusFilter.acknowledgedButtonLabel": "認識",
@@ -20476,30 +21586,37 @@
     "xpack.observability.alertsTGrid.statusColumnDescription": "アラートステータス",
     "xpack.observability.alertsTGrid.statusRecoveredDescription": "回復済み",
     "xpack.observability.alertsTitle": "アラート",
+    "xpack.observability.apmServiceInventoryOptimizedSorting": "APMサービスインベントリ読み込みページパフォーマンスを最適化",
+    "xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} サービス名によるデフォルトAPMサービスインベントリページの並べ替え（機械学習が適用されていないサービス）",
     "xpack.observability.apply.label": "適用",
     "xpack.observability.breadcrumbs.alertsLinkText": "アラート",
     "xpack.observability.breadcrumbs.landingLinkText": "はじめて使う",
     "xpack.observability.breadcrumbs.observabilityLinkText": "Observability",
     "xpack.observability.breadcrumbs.overviewLinkText": "概要",
+    "xpack.observability.breadcrumbs.rulesLinkText": "ルール",
     "xpack.observability.cases.caseFeatureNoPermissionsMessage": "ケースを表示するには、Kibana スペースでケース機能の権限が必要です。詳細については、Kibana管理者に連絡してください。",
     "xpack.observability.cases.caseFeatureNoPermissionsTitle": "Kibana機能権限が必要です",
     "xpack.observability.cases.caseView.goToDocumentationButton": "ドキュメンテーションを表示",
-    "xpack.observability.emptySection.apps.alert.description": "503 エラーが累積していますか?サービスは応答していますか?CPUとRAMの使用量が跳ね上がっていますか?このような警告を、事後にではなく、発生と同時に把握しましょう。",
+    "xpack.observability.defaultApmServiceEnvironment": "デフォルトのサービス環境",
+    "xpack.observability.defaultApmServiceEnvironmentDescription": "APMアプリのデフォルト環境を設定します。空にすると、すべての環境からのデータがデフォルトで表示されます。",
+    "xpack.observability.detectionEngine.alerts.actions.addToCase": "既存のケースに追加",
+    "xpack.observability.detectionEngine.alerts.actions.addToNewCase": "新しいケースに追加",
+    "xpack.observability.emptySection.apps.alert.description": "オブザーバビリティで複雑な条件を検出し、それらの条件が満たされたときにアクションをトリガーします。",
     "xpack.observability.emptySection.apps.alert.link": "ルールを作成",
     "xpack.observability.emptySection.apps.alert.title": "アラートが見つかりません。",
-    "xpack.observability.emptySection.apps.apm.description": "分散アーキテクチャ全体でトランザクションを追跡し、サービスの通信をマップ化して、簡単にパフォーマンスボトルネックを特定できます。",
+    "xpack.observability.emptySection.apps.apm.description": "人気のプログラミング言語やOpenTelemetry、分散トレーシングを強力にサポートするElasticで、アプリへの深い可視性を確立しましょう。",
     "xpack.observability.emptySection.apps.apm.link": "エージェントのインストール",
     "xpack.observability.emptySection.apps.apm.title": "APM",
-    "xpack.observability.emptySection.apps.logs.description": "任意のソースからログを一元化します。より迅速に対応できるように、検索、追跡、異常検知の自動化、傾向の可視化を行います。",
+    "xpack.observability.emptySection.apps.logs.description": "共通データソースのアウトオブボックスサポートで、一元化されたログ監視の速度、容易性、拡張性を高めます。",
     "xpack.observability.emptySection.apps.logs.link": "Filebeatをインストール",
     "xpack.observability.emptySection.apps.logs.title": "ログ",
-    "xpack.observability.emptySection.apps.metrics.description": "インフラストラクチャ、アプリ、サービスからメトリックを分析します。傾向、予測動作を発見し、異常などに関するアラートを通知します。",
+    "xpack.observability.emptySection.apps.metrics.description": "インフラストラクチャーメトリックをストリーム、可視化、分析します。",
     "xpack.observability.emptySection.apps.metrics.link": "Metricbeatのインストール",
     "xpack.observability.emptySection.apps.metrics.title": "メトリック",
-    "xpack.observability.emptySection.apps.uptime.description": "サイトとサービスの可用性をアクティブに監視するアラートを受信し、問題をより迅速に解決して、ユーザーエクスペリエンスを最適化します。",
+    "xpack.observability.emptySection.apps.uptime.description": "エンドユーザーが体験する可用性と機能性をプロアクティブに監視します。",
     "xpack.observability.emptySection.apps.uptime.link": "Heartbeatのインストール",
     "xpack.observability.emptySection.apps.uptime.title": "アップタイム",
-    "xpack.observability.emptySection.apps.ux.description": "パフォーマンスは分散です。Web アプリケーションにアクセスするすべてのユーザーの経験を計測し、全員にとっての経験を改善する方法を理解します。",
+    "xpack.observability.emptySection.apps.ux.description": "現実世界のエンドユーザーエクスペリエンスを反映するパフォーマンスデータを収集、計測、分析しましょう。",
     "xpack.observability.emptySection.apps.ux.link": "Rum エージェントをインストール",
     "xpack.observability.emptySection.apps.ux.title": "ユーザーエクスペリエンス",
     "xpack.observability.enableComparisonByDefault": "比較機能",
@@ -20508,11 +21625,15 @@
     "xpack.observability.enableInfrastructureViewDescription": "APMアプリでインフラストラクチャビュー機能を有効にする",
     "xpack.observability.enableInspectEsQueriesExperimentDescription": "API応答でElasticsearchクエリを調査します。",
     "xpack.observability.enableInspectEsQueriesExperimentName": "ESクエリを調査",
+    "xpack.observability.enableServiceGroups": "サービスグループ機能",
+    "xpack.observability.enableServiceGroupsDescription": "{technicalPreviewLabel} APM UIでサービスグループ機能を有効にする",
     "xpack.observability.exp.breakDownFilter.noBreakdown": "内訳なし",
     "xpack.observability.exp.breakDownFilter.unavailable": "モニター期間メトリックでは、ステップ名内訳を使用できません。ステップ期間メトリックを使用して、ステップ名で分解します。",
     "xpack.observability.exp.breakDownFilter.warning": "内訳は一度に1つの系列にのみ適用できます。",
     "xpack.observability.experimentalBadgeDescription": "この機能はテクニカルプレビュー中であり、将来のリリースでは変更されたり完全に削除されたりする場合があります。Elasticは最善の努力を講じてすべての問題の修正に努めますが、テクニカルプレビュー中の機能には正式なGA機能のサポートSLAが適用されません。",
     "xpack.observability.experimentalBadgeLabel": "テクニカルプレビュー",
+    "xpack.observability.exploratoryView.logs.logRateXAxisLabel": "タイムスタンプ",
+    "xpack.observability.exploratoryView.logs.logRateYAxisLabel": "毎分のログレート",
     "xpack.observability.exploratoryView.noBrusing": "ブラシ選択によるズームは時系列グラフでのみ使用できます。",
     "xpack.observability.expView.addToCase": "ケースに追加",
     "xpack.observability.expView.chartTypes.label": "チャートタイプ",
@@ -20522,6 +21643,7 @@
     "xpack.observability.expView.dateRanger.startDate": "開始日",
     "xpack.observability.expView.explore": "探索",
     "xpack.observability.expView.fieldLabels.agentHost": "エージェントホスト",
+    "xpack.observability.expView.fieldLabels.agentType": "エージェントタイプ",
     "xpack.observability.expView.fieldLabels.backend": "バックエンド時刻",
     "xpack.observability.expView.fieldLabels.browserFamily": "ブラウザーファミリー",
     "xpack.observability.expView.fieldLabels.browserVersion": "ブラウザーバージョン",
@@ -20541,6 +21663,7 @@
     "xpack.observability.expView.fieldLabels.deviceModel": "デバイスモデル",
     "xpack.observability.expView.fieldLabels.downPings": "Down Ping",
     "xpack.observability.expView.fieldLabels.environment": "環境",
+    "xpack.observability.expView.fieldLabels.eventDataset": "データセット",
     "xpack.observability.expView.fieldLabels.fcp": "初回コンテンツの描画",
     "xpack.observability.expView.fieldLabels.fid": "初回入力遅延",
     "xpack.observability.expView.fieldLabels.hostName": "ホスト名",
@@ -20550,7 +21673,9 @@
     "xpack.observability.expView.fieldLabels.labels": "ラベル",
     "xpack.observability.expView.fieldLabels.lcp": "最大コンテンツの描画",
     "xpack.observability.expView.fieldLabels.location": "場所",
+    "xpack.observability.expView.fieldLabels.logRate": "ログレート",
     "xpack.observability.expView.fieldLabels.memoryUsage": "システムメモリー使用状況",
+    "xpack.observability.expView.fieldLabels.message": "メッセージ",
     "xpack.observability.expView.fieldLabels.metric": "メトリック",
     "xpack.observability.expView.fieldLabels.mobile.memoryUsage": "システムメモリー使用状況",
     "xpack.observability.expView.fieldLabels.mobileApp": "モバイルアプリ",
@@ -20574,6 +21699,7 @@
     "xpack.observability.expView.fieldLabels.requestMethod": "リクエストメソッド",
     "xpack.observability.expView.fieldLabels.responseLatency": "レイテンシ",
     "xpack.observability.expView.fieldLabels.serviceName": "サービス名",
+    "xpack.observability.expView.fieldLabels.serviceType": "サービスタイプ",
     "xpack.observability.expView.fieldLabels.serviceVersion": "サービスバージョン",
     "xpack.observability.expView.fieldLabels.stepDurationLabel": "ステップ期間",
     "xpack.observability.expView.fieldLabels.stepNameLabel": "ステップ名",
@@ -20592,6 +21718,7 @@
     "xpack.observability.expView.heading.openInLens": "Lensで開く",
     "xpack.observability.expView.heading.saveLensVisualization": "保存",
     "xpack.observability.expView.lastUpdated.label": "前回更新日時：{updatedDate}",
+    "xpack.observability.expView.openInLens": "Lensで開く",
     "xpack.observability.expView.operationType.75thPercentile": "75パーセンタイル",
     "xpack.observability.expView.operationType.90thPercentile": "90パーセンタイル",
     "xpack.observability.expView.operationType.95thPercentile": "95パーセンタイル",
@@ -20698,20 +21825,23 @@
     "xpack.observability.noDataConfig.solutionName": "Observability",
     "xpack.observability.notAvailable": "N/A",
     "xpack.observability.overview.alert.allTypes": "すべてのタイプ",
-    "xpack.observability.overview.alert.appLink": "アラートを管理",
+    "xpack.observability.overview.alert.appLink": "すべてのアラートを表示",
     "xpack.observability.overview.alert.errorMessage": "アラートデータの読み込みエラーが発生しました。しばらくたってから再試行してください。",
     "xpack.observability.overview.alert.errorTitle": "アラートデータを読み込めませんでした",
+    "xpack.observability.overview.alerts.appLink": "アラートを表示",
     "xpack.observability.overview.alerts.muted": "ミュート",
     "xpack.observability.overview.alerts.title": "アラート",
-    "xpack.observability.overview.apm.appLink": "アプリで表示",
+    "xpack.observability.overview.apm.appLink": "サービスインベントリを表示",
     "xpack.observability.overview.apm.services": "サービス",
     "xpack.observability.overview.apm.throughput": "スループット",
-    "xpack.observability.overview.apm.title": "APM",
+    "xpack.observability.overview.apm.throughputTip": "タイプ「リクエスト」または「ペイロード」のトランザクションの値が計算されます。いずれも使用できない場合は、値は上位のトランザクションタイプになります。",
+    "xpack.observability.overview.apm.title": "サービス",
     "xpack.observability.overview.exploratoryView": "データの探索",
     "xpack.observability.overview.exploratoryView.editSeriesColor": "系列の色を編集",
     "xpack.observability.overview.exploratoryView.hideChart": "グラフを非表示",
     "xpack.observability.overview.exploratoryView.lensDisabled": "Lensアプリを使用できません。調査ビューを使用するには、Lensを有効にしてください。",
-    "xpack.observability.overview.exploratoryView.metricsLabel": "Infraメトリック",
+    "xpack.observability.overview.exploratoryView.logsLabel": "ログ",
+    "xpack.observability.overview.exploratoryView.metricsLabel": "メトリック",
     "xpack.observability.overview.exploratoryView.missingDataType": "データ型が見つかりません",
     "xpack.observability.overview.exploratoryView.missingReportDefinition": "{reportDefinition}が見つかりません",
     "xpack.observability.overview.exploratoryView.missingReportMetric": "レポートメトリックが見つかりません",
@@ -20725,25 +21855,28 @@
     "xpack.observability.overview.exploratoryView.showChart": "グラフを表示",
     "xpack.observability.overview.exploratoryView.syntheticsLabel": "Synthetics監視",
     "xpack.observability.overview.exploratoryView.uxLabel": "ユーザーエクスペリエンス（RUM）",
+    "xpack.observability.overview.guidedSetupButton": "段階的な設定",
     "xpack.observability.overview.loadingObservability": "オブザーバビリティを読み込んでいます",
-    "xpack.observability.overview.logs.appLink": "アプリで表示",
+    "xpack.observability.overview.logs.appLink": "ログストリームを表示",
     "xpack.observability.overview.logs.subtitle": "毎分のログレート",
-    "xpack.observability.overview.logs.title": "ログ",
-    "xpack.observability.overview.metrics.appLink": "アプリで表示",
+    "xpack.observability.overview.logs.title": "ログイベント",
+    "xpack.observability.overview.metrics.appLink": "インベントリを表示",
     "xpack.observability.overview.metrics.colunms.cpu": "CPU %",
     "xpack.observability.overview.metrics.colunms.hostname": "ホスト名",
     "xpack.observability.overview.metrics.colunms.load15": "読み込み15",
     "xpack.observability.overview.metrics.colunms.uptime": "アップタイム",
-    "xpack.observability.overview.metrics.title": "メトリック",
+    "xpack.observability.overview.metrics.title": "ホスト",
     "xpack.observability.overview.pageTitle": "概要",
-    "xpack.observability.overview.uptime.appLink": "アプリで表示",
+    "xpack.observability.overview.statusVisualizationFlyoutDescription": "オブザーバビリティ統合および機能の追加の進行状況を追跡します。",
+    "xpack.observability.overview.statusVisualizationFlyoutTitle": "段階的な設定",
+    "xpack.observability.overview.uptime.appLink": "モニターを表示",
     "xpack.observability.overview.uptime.chart.down": "ダウン",
     "xpack.observability.overview.uptime.chart.up": "アップ",
     "xpack.observability.overview.uptime.down": "ダウン",
     "xpack.observability.overview.uptime.monitors": "監視",
-    "xpack.observability.overview.uptime.title": "アップタイム",
+    "xpack.observability.overview.uptime.title": "監視",
     "xpack.observability.overview.uptime.up": "アップ",
-    "xpack.observability.overview.ux.appLink": "アプリで表示",
+    "xpack.observability.overview.ux.appLink": "ダッシュボードを表示",
     "xpack.observability.overview.ux.title": "ユーザーエクスペリエンス",
     "xpack.observability.overviewLinkTitle": "概要",
     "xpack.observability.page_header.addMobileDataLink.label": "モバイルAPMデータの追加に関するチュートリアルに移動",
@@ -20755,6 +21888,48 @@
     "xpack.observability.resources.quick_start": "クイックスタートビデオ",
     "xpack.observability.resources.title": "リソース",
     "xpack.observability.resources.training": "無料のObservabilityコース",
+    "xpack.observability.rules.addRuleButtonLabel": "ルールを作成",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.deleteButtonLabel": "{numIdsToDelete, plural, one {{singleTitle}} other {# {multipleTitle}}}を削除 ",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.descriptionText": "{numIdsToDelete, plural, one {削除された {singleTitle}} other {deleted {multipleTitle}}}を回復できません。",
+    "xpack.observability.rules.deleteSelectedIdsErrorNotification.descriptionText": "{numErrors, number} {numErrors, plural, one {{singleTitle}} other {{multipleTitle}}}を削除できませんでした",
+    "xpack.observability.rules.deleteSelectedIdsSuccessNotification.descriptionText": "{numSuccesses, number} {numSuccesses, plural, one {{singleTitle}} other {{multipleTitle}}}を削除しました",
+    "xpack.observability.rules.docsLinkText": "ドキュメント",
+    "xpack.observability.rules.emptyPrompt.emptyButton": "ルールの作成",
+    "xpack.observability.rules.emptyPrompt.emptyTitle": "最初のルールを作成",
+    "xpack.observability.rules.loadError": "ルールを読み込めません",
+    "xpack.observability.rules.noDataPrompt.noDataDesc": "ルールでは、特定の条件が満たされたときに、アラートを受信し、カスタムアクションを自動化できます。",
+    "xpack.observability.rules.noPermissionToCreateDescription": "システム管理者にお問い合わせください。",
+    "xpack.observability.rules.noPermissionToCreateTitle": "ルールを作成する権限がありません",
+    "xpack.observability.rules.refreshRulesButtonLabel": "更新",
+    "xpack.observability.rules.ruleLastResponseFilterLabel": "前回の応答",
+    "xpack.observability.rules.rulesTable.changeStatusAriaLabel": "ステータスの変更",
+    "xpack.observability.rules.rulesTable.columns.actionsTitle": "アクション",
+    "xpack.observability.rules.rulesTable.columns.deleteAriaLabel": "削除",
+    "xpack.observability.rules.rulesTable.columns.deleteButtonTooltip": "削除",
+    "xpack.observability.rules.rulesTable.columns.editAriaLabel": "編集",
+    "xpack.observability.rules.rulesTable.columns.editButtonTooltip": "編集",
+    "xpack.observability.rules.rulesTable.columns.lastResponseTitle": "前回の応答",
+    "xpack.observability.rules.rulesTable.columns.lastRunTitle": "前回の実行",
+    "xpack.observability.rules.rulesTable.columns.nameTitle": "ルール",
+    "xpack.observability.rules.rulesTable.columns.statusTitle": "ステータス",
+    "xpack.observability.rules.rulesTable.pluralTitle": "ルール",
+    "xpack.observability.rules.rulesTable.ruleStatusActive": "アクティブ",
+    "xpack.observability.rules.rulesTable.ruleStatusDisabled": "無効",
+    "xpack.observability.rules.rulesTable.ruleStatusEnabled": "有効",
+    "xpack.observability.rules.rulesTable.ruleStatusError": "エラー",
+    "xpack.observability.rules.rulesTable.ruleStatusLicenseError": "ライセンスエラー",
+    "xpack.observability.rules.rulesTable.ruleStatusOk": "OK",
+    "xpack.observability.rules.rulesTable.ruleStatusPending": "保留中",
+    "xpack.observability.rules.rulesTable.ruleStatusSnoozedIndefinitely": "無期限にスヌーズ",
+    "xpack.observability.rules.rulesTable.ruleStatusUnknown": "不明",
+    "xpack.observability.rules.rulesTable.ruleStatusWarning": "警告",
+    "xpack.observability.rules.rulesTable.singleTitle": "ルール",
+    "xpack.observability.rules.searchPlaceholderTitle": "検索",
+    "xpack.observability.rules.totalItemsCountDescription": "{pageSize}/{totalItemCount}件のルールを表示しています",
+    "xpack.observability.rules.typeFilterLabel": "型",
+    "xpack.observability.rulesLinkTitle": "ルール",
+    "xpack.observability.rulesTitle": "ルール",
     "xpack.observability.search.url.close": "閉じる",
     "xpack.observability.section.apps.apm.description": "分散アーキテクチャ全体でトランザクションを追跡し、サービスの通信をマップ化して、簡単にパフォーマンスボトルネックを特定できます。",
     "xpack.observability.section.apps.apm.title": "APM",
@@ -20765,12 +21940,48 @@
     "xpack.observability.section.apps.uptime.description": "サイトとサービスの可用性をアクティブに監視するアラートを受信し、問題をより迅速に解決して、ユーザーエクスペリエンスを最適化します。",
     "xpack.observability.section.apps.uptime.title": "アップタイム",
     "xpack.observability.section.errorPanel": "データの取得時にエラーが発生しました。再試行してください",
+    "xpack.observability.seriesEditor.actionsAriaContextLabel": "系列アクションリスト",
     "xpack.observability.seriesEditor.clone": "系列の複製",
     "xpack.observability.seriesEditor.edit": "系列を編集",
     "xpack.observability.seriesEditor.hide": "系列を非表示",
-    "xpack.observability.seriesEditor.sampleDocuments": "新しいタブでサンプルドキュメントを表示",
+    "xpack.observability.seriesEditor.popoverButtonLabel": "系列アクションを表示",
+    "xpack.observability.seriesEditor.sampleDocuments": "Discoverでトランザクションを表示",
+    "xpack.observability.seriesEditor.show": "系列を表示",
+    "xpack.observability.status.dataAvailable": "利用可能なデータがありません。",
+    "xpack.observability.status.dataAvailableTitle": "利用可能なデータがありません",
     "xpack.observability.status.learnMoreButton": "詳細",
+    "xpack.observability.status.progressBarDescription": "オブザーバビリティ統合および機能の追加の進行状況を追跡します。",
+    "xpack.observability.status.progressBarDismiss": "閉じる",
+    "xpack.observability.status.progressBarTitle": "段階的なオブザーバビリティの設定",
+    "xpack.observability.status.progressBarViewDetails": "詳細を表示",
+    "xpack.observability.status.recommendedSteps": "推奨される次のステップ",
+    "xpack.observability.statusVisualization.alert.description": "オブザーバビリティで複雑な条件を検出し、それらの条件が満たされたときにアクションをトリガーします。",
+    "xpack.observability.statusVisualization.alert.goToAppTitle": "アラートを表示",
+    "xpack.observability.statusVisualization.alert.link": "ルールを作成",
+    "xpack.observability.statusVisualization.alert.title": "アラート",
+    "xpack.observability.statusVisualization.apm.description": "人気のプログラミング言語やOpenTelemetry、分散トレーシングを強力にサポートするElasticで、アプリへの深い可視性を確立しましょう。",
+    "xpack.observability.statusVisualization.apm.goToAppTitle": "サービスインベントリを表示",
+    "xpack.observability.statusVisualization.apm.link": "データの追加",
+    "xpack.observability.statusVisualization.apm.title": "APM",
+    "xpack.observability.statusVisualization.logs.description": "共通データソースのアウトオブボックスサポートで、一元化されたログ監視の速度、容易性、拡張性を高めます。",
+    "xpack.observability.statusVisualization.logs.goToAppTitle": "ログストリームを表示",
+    "xpack.observability.statusVisualization.logs.link": "統合の追加",
+    "xpack.observability.statusVisualization.logs.title": "ログ",
+    "xpack.observability.statusVisualization.metrics.description": "インフラストラクチャーメトリックをストリーム、可視化、分析します。",
+    "xpack.observability.statusVisualization.metrics.goToAppTitle": "インベントリを表示",
+    "xpack.observability.statusVisualization.metrics.link": "統合の追加",
+    "xpack.observability.statusVisualization.metrics.title": "インフラストラクチャー",
+    "xpack.observability.statusVisualization.uptime.description": "エンドユーザーが体験する可用性と機能性をプロアクティブに監視します。",
+    "xpack.observability.statusVisualization.uptime.goToAppTitle": "モニターを表示 ",
+    "xpack.observability.statusVisualization.uptime.link": "モニターを追加",
+    "xpack.observability.statusVisualization.uptime.title": "アップタイム",
+    "xpack.observability.statusVisualization.ux.description": "現実世界のエンドユーザーエクスペリエンスを反映するパフォーマンスデータを収集、計測、分析しましょう。",
+    "xpack.observability.statusVisualization.ux.goToAppTitle": "ダッシュボードを表示",
+    "xpack.observability.statusVisualization.ux.link": "データの追加",
+    "xpack.observability.statusVisualization.ux.title": "ユーザーエクスペリエンス",
+    "xpack.observability.textDefinitionField.placeholder.search": "{label}を検索",
     "xpack.observability.transactionRateLabel": "{value} tpm",
+    "xpack.observability.uiSettings.technicalPreviewLabel": "テクニカルプレビュー",
     "xpack.observability.urlFilter.wildcard": "ワイルドカード*{wildcard}*を使用",
     "xpack.observability.ux.addDataButtonLabel": "UXデータを追加",
     "xpack.observability.ux.coreVitals.average": "平均",
@@ -20806,6 +22017,11 @@
     "xpack.osquery.action_results.errorSearchDescription": "アクション結果検索でエラーが発生しました",
     "xpack.osquery.action_results.failSearchDescription": "アクション詳細を取得できませんでした",
     "xpack.osquery.action_results.fetchError": "アクション結果の取得中にエラーが発生しました",
+    "xpack.osquery.action.agentStatus": "このホストでクエリを実行するには、Elasticエージェントがアクティブでなければなりません。Fleetでこのエージェントのステータスを確認します。",
+    "xpack.osquery.action.empty": "このホストにはElasticエージェントがインストールされていません。クエリを実行するには、ホストでElasticエージェントをインストールし、FleetでOsqueryマネージャー統合をエージェントポリシーに追加してください。",
+    "xpack.osquery.action.permissionDenied": "パーミッションが拒否されました",
+    "xpack.osquery.action.shortEmptyTitle": "Osqueryが使用できません",
+    "xpack.osquery.action.unavailable": "Osqueryマネージャー統合がエージェントポリシーに追加されていません。ホストでクエリを実行するには、FleetでOsqueryマネージャー統合をエージェントポリシーに追加してください。",
     "xpack.osquery.actionDetails.errorSearchDescription": "アクション詳細検索でエラーが発生しました",
     "xpack.osquery.actionDetails.failSearchDescription": "アクション詳細を取得できませんでした",
     "xpack.osquery.actionResults.errorSearchDescription": "アクション結果検索でエラーが発生しました",
@@ -20989,8 +22205,14 @@
     "xpack.osquery.packDetailsPage.editQueryButtonLabel": "編集",
     "xpack.osquery.packDetailsPage.kpis.policiesLabelText": "ポリシー",
     "xpack.osquery.packList.addPackButtonLabel": "パックの追加",
+    "xpack.osquery.packList.integrationAssets.loadSuccessToastMessageText": "事前構築済みパックが正常に読み込まれました",
+    "xpack.osquery.packList.integrationAssets.updateSuccessToastMessageText": "事前構築済みパックが正常に更新されました",
     "xpack.osquery.packList.pageSubtitle": "パックを作成して、クエリのセットを整理し、エージェントポリシーのクエリをスケジュールします。",
     "xpack.osquery.packList.pageTitle": "パック",
+    "xpack.osquery.packList.prePackagedPacks.emptyPromptTitle": "Elastic事前構築済みパックを読み込む",
+    "xpack.osquery.packList.prePackagedPacks.emptyPromptTitle.emptyPromptMessage": "パックはスケジュールできるクエリのセットです。事前構築済みパックを読み込むか、独自のパックを作成します。",
+    "xpack.osquery.packList.prePackagedPacks.loadButtonLabel": "Elastic事前構築済みパックを読み込む",
+    "xpack.osquery.packList.prePackagedPacks.updateButtonLabel": "Elastic事前構築済みパックの更新",
     "xpack.osquery.packs.table.activeColumnTitle": "アクティブ",
     "xpack.osquery.packs.table.createdByColumnTitle": "作成者",
     "xpack.osquery.packs.table.nameColumnTitle": "名前",
@@ -21233,6 +22455,8 @@
     "xpack.remoteClusters.updateRemoteCluster.unknownRemoteClusterErrorMessage": "ES からレスポンスが返らず、クラスターを編集できません。",
     "xpack.reporting.apiClient.unknownError": "レポートジョブ{job}が失敗しました。不明なエラーです。",
     "xpack.reporting.breadcrumb": "レポート",
+    "xpack.reporting.common.browserCouldNotLaunchErrorMessage": "ブラウザーが起動していないため、スクリーンショットを生成できません。",
+    "xpack.reporting.common.pdfWorkerOutOfMemoryErrorMessage": "メモリが低下しているため、PDFを生成できません。このレポートを再試行する前に、PDFのサイズを小さくすることを検討してください。",
     "xpack.reporting.dashboard.csvDownloadStartedMessage": "間もなく CSV がダウンロードされます。",
     "xpack.reporting.dashboard.csvDownloadStartedTitle": "CSV のダウンロードが開始しました",
     "xpack.reporting.dashboard.downloadCsvPanelTitle": "CSV をダウンロード",
@@ -21272,6 +22496,7 @@
     "xpack.reporting.errorHandler.unknownError": "不明なエラー",
     "xpack.reporting.exportTypes.common.failedToDecryptReportJobDataErrorMessage": "レポートジョブデータの解読に失敗しました。{encryptionKey}が設定されていることを確認してこのレポートを再生成してください。{err}",
     "xpack.reporting.exportTypes.common.missingJobHeadersErrorMessage": "ジョブヘッダーがありません",
+    "xpack.reporting.exportTypes.csv.generateCsv.authenticationExpired.partialResultsMessage": "認証トークが有効期限切れのため、このレポートには一部のCSVの結果が含まれています。少ない量のデータをエクスポートするか、認証トークンのタイムアウトを大きくします。",
     "xpack.reporting.exportTypes.csv.generateCsv.escapedFormulaValues": "CSVには、値がエスケープされた式が含まれる場合があります",
     "xpack.reporting.jobCreatedBy.unknownUserPlaceholderText": "不明",
     "xpack.reporting.jobsQuery.deleteError": "レポートを削除できません：{error}",
@@ -21321,12 +22546,16 @@
     "xpack.reporting.listing.infoPanel.callout.warningsTitle": "レポートには警告があります",
     "xpack.reporting.listing.infoPanel.completedAtInfo": "完了日時",
     "xpack.reporting.listing.infoPanel.contentTypeInfo": "コンテンツタイプ",
+    "xpack.reporting.listing.infoPanel.cpuInfo": "CPU 使用状況",
     "xpack.reporting.listing.infoPanel.createdAtInfo": "作成日時：",
+    "xpack.reporting.listing.infoPanel.csvRows": "CSV行",
     "xpack.reporting.listing.infoPanel.dimensionsInfoHeight": "ピクセル単位の高さ",
     "xpack.reporting.listing.infoPanel.dimensionsInfoWidth": "ピクセル単位の幅",
     "xpack.reporting.listing.infoPanel.kibanaVersion": "Kibanaバージョン",
+    "xpack.reporting.listing.infoPanel.memoryInfo": "RAM使用状況",
     "xpack.reporting.listing.infoPanel.notApplicableLabel": "N/A",
     "xpack.reporting.listing.infoPanel.outputSectionTitle": "アウトプット",
+    "xpack.reporting.listing.infoPanel.pdfPagesInfo": "ページ数",
     "xpack.reporting.listing.infoPanel.processedByInfo": "処理方法",
     "xpack.reporting.listing.infoPanel.sizeInfo": "サイズ（バイト）",
     "xpack.reporting.listing.infoPanel.space": "Kibanaスペース",
@@ -21378,7 +22607,7 @@
     "xpack.reporting.panelContent.howToCallGenerationDescription": "POST URL をコピーして Kibana 外または ウォッチャー から生成を実行することもできます。",
     "xpack.reporting.panelContent.notification.reportingErrorTitle": "レポートのしました",
     "xpack.reporting.panelContent.saveWorkDescription": "レポートの生成前に変更内容を保存してください。",
-    "xpack.reporting.panelContent.successfullyQueuedReportNotificationDescription": "{path}で進捗状況を追跡",
+    "xpack.reporting.panelContent.successfullyQueuedReportNotificationDescription": "{path}で進捗状況を追跡します。",
     "xpack.reporting.panelContent.successfullyQueuedReportNotificationTitle": "{objectType} のレポートキュー",
     "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthDescription": "このURLはコピーできません。",
     "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthTitle": "URLが長すぎます",
@@ -21399,9 +22628,10 @@
     "xpack.reporting.publicNotifier.maxSizeReached.partialReportDescription": "レポートが最大サイズに達し、部分データが含まれています。",
     "xpack.reporting.publicNotifier.maxSizeReached.partialReportTitle": "'{reportObjectTitle}'の部分{reportType}レポートが作成されました",
     "xpack.reporting.publicNotifier.pollingErrorMessage": "レポート通知エラー",
-    "xpack.reporting.publicNotifier.reportLink.reportingSectionUrlLinkLabel": "スタック管理 > アラートとインサイト > レポート",
+    "xpack.reporting.publicNotifier.reportLink.reportingSectionUrlLinkLabel": "スタック管理 > レポート",
     "xpack.reporting.publicNotifier.reportLinkDescription": "今すぐダウンロードするか、後から{path}でダウンロードできます。",
     "xpack.reporting.publicNotifier.successfullyCreatedReportNotificationTitle": "'{reportObjectTitle}'の{reportType}が作成されました",
+    "xpack.reporting.publicNotifier.warning.title": "{reportType}が完了しましたが、問題があります",
     "xpack.reporting.redirectApp.errorTitle": "リダイレクトエラー",
     "xpack.reporting.redirectApp.redirectConsoleErrorPrefixLabel": "リダイレクトページエラー：",
     "xpack.reporting.registerFeature.reportingDescription": "Discover、可視化、ダッシュボードから生成されたレポートを管理します。",
@@ -21729,6 +22959,8 @@
     "xpack.savedObjectsTagging.validation.description.errorTooLong": "タグ説明は {length} 文字以下で入力してください",
     "xpack.savedObjectsTagging.validation.name.errorTooLong": "タグ名は {length} 文字以下で入力してください",
     "xpack.savedObjectsTagging.validation.name.errorTooShort": "タグ名は {length} 文字以上で入力してください",
+    "xpack.screenshotting.exportTypes.printablePdf.logoDescription": "Elastic 提供",
+    "xpack.screenshotting.exportTypes.printablePdf.pagingDescription": "{pageCount} ページ中 {currentPage} ページ目",
     "xpack.searchProfiler.advanceTimeDescription": "イテレーターを次のドキュメントに進めるためにかかった時間。",
     "xpack.searchProfiler.aggregationProfileTabTitle": "集約プロフィール",
     "xpack.searchProfiler.basicLicenseTitle": "基本",
@@ -21737,6 +22969,8 @@
     "xpack.searchProfiler.editorElementLabel": "開発ツール検索プロファイラーエディター",
     "xpack.searchProfiler.emptyProfileTreeDescription": "クエリを入力し、[プロフィール]をクリックすると、ここに結果が表示されます。",
     "xpack.searchProfiler.emptyProfileTreeTitle": "プロフィールへのクエリはありません",
+    "xpack.searchProfiler.errorNoShardsDescription": "インデックス入力が有効なインデックスと一致していることを検証",
+    "xpack.searchProfiler.errorNoShardsTitle": "プロファイルできません",
     "xpack.searchProfiler.errorSomethingWentWrongTitle": "問題が発生しました",
     "xpack.searchProfiler.errorToastTitle": "JSON 解析エラー",
     "xpack.searchProfiler.formIndexLabel": "インデックス",
@@ -22377,10 +23611,17 @@
     "xpack.securitySolution.alertDetails.overview": "概要",
     "xpack.securitySolution.alertDetails.overview.enrichedDataTitle": "強化されたデータ",
     "xpack.securitySolution.alertDetails.overview.highlightedFields": "ハイライトされたフィールド",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalence": "アラート発生",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalenceTooltip": "現在選択した時間範囲内で同じ値のアラートの合計件数。この値は追加のフィルターによる影響は受けません。",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.field": "フィールド",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.value": "値",
     "xpack.securitySolution.alertDetails.overview.hostDataTooltipContent": "リスク分類は、ホストで使用可能なときにのみ表示されます。環境内で{hostsRiskScoreDocumentationLink}が有効であることを確認してください。",
     "xpack.securitySolution.alertDetails.overview.hostRiskDataTitle": "ホストリスクデータ",
     "xpack.securitySolution.alertDetails.overview.hostsRiskScoreLink": "ホストリスクスコア",
     "xpack.securitySolution.alertDetails.overview.investigationGuide": "調査ガイド",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesCount": "{caseCount} {caseCount, plural, other {個のケース：}}",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesFailure": "関連するケースを読み込めません：\"{error}\"",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesFound": "このアラートは次の場所で見つかりました",
     "xpack.securitySolution.alertDetails.refresh": "更新",
     "xpack.securitySolution.alertDetails.summary.readLess": "表示を減らす",
     "xpack.securitySolution.alertDetails.summary.readMore": "続きを読む",
@@ -22411,6 +23652,8 @@
     "xpack.securitySolution.alertsView.categoryLabel": "カテゴリー",
     "xpack.securitySolution.alertsView.errorFetchingAlertsData": "アラートデータをクエリできませんでした",
     "xpack.securitySolution.alertsView.moduleLabel": "モジュール",
+    "xpack.securitySolution.alertsView.osqueryAlertTitle": "Osqueryの実行",
+    "xpack.securitySolution.alertsView.osqueryBackToAlertDetails": "アラートの詳細",
     "xpack.securitySolution.alertsView.showing": "表示中",
     "xpack.securitySolution.alertsView.totalCountOfAlerts": "外部アラート",
     "xpack.securitySolution.alertsView.unit": "外部{totalCount, plural, other  {アラート}}",
@@ -22435,6 +23678,7 @@
     "xpack.securitySolution.artifactCard.conditions.matchOperator.not": "IS NOT",
     "xpack.securitySolution.artifactCard.conditions.nestedOperator": "がある",
     "xpack.securitySolution.artifactCard.conditions.os": "OS",
+    "xpack.securitySolution.artifactCard.conditions.wildcardMatchesOperator": "一致",
     "xpack.securitySolution.artifactCard.conditions.windows": "Windows",
     "xpack.securitySolution.artifactCard.created": "作成済み",
     "xpack.securitySolution.artifactCard.createdBy": "作成者",
@@ -22449,6 +23693,35 @@
     "xpack.securitySolution.artifactCardGrid.nameColumn": "名前",
     "xpack.securitySolution.artifactExpandableCard.collpase": "縮小",
     "xpack.securitySolution.artifactExpandableCard.expand": "拡張",
+    "xpack.securitySolution.artifactListPage.aboutInfo": "エンドポイントのアーティファクトのリスト",
+    "xpack.securitySolution.artifactListPage.addButtonTitle": "アーティファクトの追加",
+    "xpack.securitySolution.artifactListPage.cardActionDeleteLabel": "イベントフィルターを削除",
+    "xpack.securitySolution.artifactListPage.cardActionEditLabel": "アーティファクトの編集",
+    "xpack.securitySolution.artifactListPage.deleteActionFailure": "\"{itemName}\"を削除できません。理由：{errorMessage}",
+    "xpack.securitySolution.artifactListPage.deleteActionSuccess": "\"{itemName}\"が削除されました",
+    "xpack.securitySolution.artifactListPage.deleteModalCancelButtonTitle": "キャンセル",
+    "xpack.securitySolution.artifactListPage.deleteModalConfirmInfo": "この操作は元に戻すことができません。続行していいですか？",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactInfo": "このエントリを削除すると、{count}個の関連付けられた{count, plural, other  {ポリシー}}から削除されます。",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactInfoAll": "すべて",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactTitle": "警告",
+    "xpack.securitySolution.artifactListPage.deleteModalSubmitButtonTitle": "削除",
+    "xpack.securitySolution.artifactListPage.deleteModalTitle": "{itemName}を削除",
+    "xpack.securitySolution.artifactListPage.emptyStateInfo": "アーティファクトの追加",
+    "xpack.securitySolution.artifactListPage.emptyStatePrimaryButtonLabel": "追加",
+    "xpack.securitySolution.artifactListPage.emptyStateTitle": "最初のアーティファクトを追加",
+    "xpack.securitySolution.artifactListPage.expiredLicenseTitle": "失効したライセンス",
+    "xpack.securitySolution.artifactListPage.flyoutCancelButtonLabel": "キャンセル",
+    "xpack.securitySolution.artifactListPage.flyoutCreateSubmitButtonLabel": "追加",
+    "xpack.securitySolution.artifactListPage.flyoutCreateTitle": "アーティファクトの作成",
+    "xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseDocsInfo": "詳細については、ドキュメンテーションを参照してください。",
+    "xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseInfo": "Kibanaライセンスがダウングレードされました。今後のポリシー構成はグローバルにすべてのポリシーに割り当てられます。",
+    "xpack.securitySolution.artifactListPage.flyoutEditItemLoadFailure": "編集する項目を取得できませんでした。理由：{errorMessage}",
+    "xpack.securitySolution.artifactListPage.flyoutEditSubmitButtonLabel": "保存",
+    "xpack.securitySolution.artifactListPage.flyoutEditSubmitSuccess": "\"{name}\"が更新されました。",
+    "xpack.securitySolution.artifactListPage.flyoutEditTitle": "アーティファクトの追加",
+    "xpack.securitySolution.artifactListPage.pageTitle": "アーティファクト",
+    "xpack.securitySolution.artifactListPage.searchPlaceholderInfo": "次のフィールドで検索：名前、説明、コメント、値",
+    "xpack.securitySolution.artifactListPage.showingTotal": "{total, plural, other {#個のアーティファクト}}を表示しています",
     "xpack.securitySolution.artifactMinifiedCard.descriptionLabel": "説明",
     "xpack.securitySolution.auditd.abortedAuditStartupDescription": "中断された監査のスタートアップ",
     "xpack.securitySolution.auditd.accessErrorDescription": "アクセスエラー",
@@ -22588,8 +23861,25 @@
     "xpack.securitySolution.authenticationsTable.user": "ユーザー",
     "xpack.securitySolution.authz.mlUnavailable": "機械学習プラグインが使用できません。プラグインを有効にしてください。",
     "xpack.securitySolution.authz.userIsNotMlAdminMessage": "現在のユーザーは機械学習管理者ではありません。",
+    "xpack.securitySolution.badge.readOnly.text": "読み取り専用",
     "xpack.securitySolution.beatFields.errorSearchDescription": "Beatフィールドの取得でエラーが発生しました",
     "xpack.securitySolution.beatFields.failSearchDescription": "Beat フィールドで検索を実行できませんでした",
+    "xpack.securitySolution.blocklist.cardActionDeleteLabel": "ブロックリストの削除",
+    "xpack.securitySolution.blocklist.cardActionEditLabel": "ブロックリストの編集",
+    "xpack.securitySolution.blocklist.deleteSuccess": "\"{itemName}\"がブロックリストから削除されました",
+    "xpack.securitySolution.blocklist.emptyStateInfo": "ブロックリストを追加して、エンドポイントでの実行を防止",
+    "xpack.securitySolution.blocklist.emptyStatePrimaryButtonLabel": "ブロックリストの追加",
+    "xpack.securitySolution.blocklist.emptyStateTitle": "最初のブロックリストを追加",
+    "xpack.securitySolution.blocklist.flyoutCreateSubmitButtonLabel": "ブロックリストの追加",
+    "xpack.securitySolution.blocklist.flyoutCreateSubmitSuccess": "\"{name}\"がブロックリストに追加されました。",
+    "xpack.securitySolution.blocklist.flyoutCreateTitle": "ブロックリストの追加",
+    "xpack.securitySolution.blocklist.flyoutEditSubmitSuccess": "\"{name}\"が更新されました。",
+    "xpack.securitySolution.blocklist.flyoutEditTitle": "ブロックリストの編集",
+    "xpack.securitySolution.blocklist.pageAboutInfo": "ブロックリストを使用すると、エンドポイントで悪意があると見なされるプロセスのリストが拡張され、選択したアプリケーションがホストで実行されるのを防止します。",
+    "xpack.securitySolution.blocklist.pageAddButtonTitle": "ブロックリストエントリの追加",
+    "xpack.securitySolution.blocklist.pageTitle": "ブロックリスト",
+    "xpack.securitySolution.blocklist.searchPlaceholderInfo": "次のフィールドで検索：名前、説明、値",
+    "xpack.securitySolution.blocklist.showingTotal": "{total} {total, plural, other {件のブロックリストエントリ}}を表示しています",
     "xpack.securitySolution.callouts.dismissButton": "閉じる",
     "xpack.securitySolution.cases.caseTable.caseDetailsLinkAria": "クリックすると、タイトル{detailName}のケースを表示します",
     "xpack.securitySolution.cases.caseView.breadcrumb": "作成",
@@ -22678,6 +23968,26 @@
     "xpack.securitySolution.components.mlPopup.upgradeDescription": "SIEMの異常検出機能にアクセスするには、ライセンスをプラチナに更新するか、30日間の無料トライアルを開始するか、AWS、GCP、またはAzureで{cloudLink}にサインアップしてください。その後、機械学習ジョブを実行して異常を表示できます。",
     "xpack.securitySolution.components.mlPopup.upgradeTitle": "E lastic Platinumへのアップグレード",
     "xpack.securitySolution.components.stepDefineRule.ruleTypeField.subscriptionsLink": "プラチナサブスクリプション",
+    "xpack.securitySolution.console.builtInCommands.clearAbout": "コンソールバッファーを消去",
+    "xpack.securitySolution.console.builtInCommands.helpAbout": "使用可能なコマンドのリストを表示",
+    "xpack.securitySolution.console.commandList.footerText": "上記のコマンドの詳細については、{helpOption}引数を使用してください。例：{cmdExample}",
+    "xpack.securitySolution.console.commandOutput.runInBackgroundButtonLabel": "バックグラウンドで実行",
+    "xpack.securitySolution.console.commandOutput.runInBackgroundMsg": "コマンド応答には時間がかかります。ここをクリックするとバックグラウンドで実行し、応答を受信したときに通知が表示されます",
+    "xpack.securitySolution.console.commandUsage.atLeastOneOptionRequiredMessage": "注記：1つ以上のオプションを使用する必要があります",
+    "xpack.securitySolution.console.commandUsage.inputUsage": "使用方法：",
+    "xpack.securitySolution.console.commandUsage.optionsLabel": "オプション：",
+    "xpack.securitySolution.console.commandValidation.argSupportedOnlyOnce": "引数{argName}は一度だけ使用できます",
+    "xpack.securitySolution.console.commandValidation.cmdHelpTitle": "{cmdName}コマンド",
+    "xpack.securitySolution.console.commandValidation.invalidArgValue": "無効な引数値：{argName}。{error}",
+    "xpack.securitySolution.console.commandValidation.missingRequiredArg": "不足している必須の引数：{argName}",
+    "xpack.securitySolution.console.commandValidation.mustHaveArgs": "不足している必須の引数：{requiredArgs}",
+    "xpack.securitySolution.console.commandValidation.noArgumentsSupported": "コマンドは引数をサポートしていません",
+    "xpack.securitySolution.console.commandValidation.oneArgIsRequired": "1つ以上の引数を使用する必要があります",
+    "xpack.securitySolution.console.commandValidation.unknownArgument": "不明な引数：{unknownArgs}",
+    "xpack.securitySolution.console.commandValidation.unsupportedArg": "サポートされていない引数：{argName}",
+    "xpack.securitySolution.console.unknownCommand.helpMessage": "使用可能なコマンドのリストについては、{helpCmd}を入力します",
+    "xpack.securitySolution.console.unknownCommand.title": "不明なコマンド",
+    "xpack.securitySolution.consolesPopoverHeaderItem.buttonLabel": "エンドポイントコンソール",
     "xpack.securitySolution.containers.anomalies.errorFetchingAnomaliesData": "異常データをクエリできませんでした",
     "xpack.securitySolution.containers.anomalies.stackByJobId": "ジョブ",
     "xpack.securitySolution.containers.anomalies.title": "異常",
@@ -22694,6 +24004,7 @@
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedRuleSuccesDescription": "Elastic から事前にパッケージ化されているルールをインストールしました",
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedTimelineSuccesDescription": "Elasticから事前にパッケージ化されているタイムラインテンプレートをインストールしました",
     "xpack.securitySolution.containers.detectionEngine.ruleExecutionEventsFetchFailDescription": "ルール実行イベントを取得できませんでした",
+    "xpack.securitySolution.containers.detectionEngine.ruleExecutionLogFailureDescription": "ルール実行イベントを取得できませんでした",
     "xpack.securitySolution.containers.detectionEngine.rulesAndTimelines": "ルールとタイムラインを取得できませんでした",
     "xpack.securitySolution.containers.detectionEngine.tagFetchFailDescription": "タグを取得できませんでした",
     "xpack.securitySolution.containers.errors.stopJobFailureTitle": "ジョブ停止エラー",
@@ -22744,6 +24055,8 @@
     "xpack.securitySolution.detectionEngine.alerts.actions.addEndpointException": "エンドポイント例外の追加",
     "xpack.securitySolution.detectionEngine.alerts.actions.addEventFilter": "エンドポイントイベントフィルターを追加",
     "xpack.securitySolution.detectionEngine.alerts.actions.addException": "ルール例外の追加",
+    "xpack.securitySolution.detectionEngine.alerts.actions.addToCase": "既存のケースに追加",
+    "xpack.securitySolution.detectionEngine.alerts.actions.addToNewCase": "新しいケースに追加",
     "xpack.securitySolution.detectionEngine.alerts.actions.closeAlertTitle": "アラートを閉じる",
     "xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineAriaLabel": "アラートをタイムラインに送信",
     "xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineTitle": "タイムラインで調査",
@@ -22754,7 +24067,10 @@
     "xpack.securitySolution.detectionEngine.alerts.closedAlertSuccessToastMessage": "{totalAlerts} {totalAlerts, plural, other  {件のアラート}}を正常にクローズしました。",
     "xpack.securitySolution.detectionEngine.alerts.count.countTableColumnTitle": "カウント",
     "xpack.securitySolution.detectionEngine.alerts.count.countTableTitle": "カウント",
+    "xpack.securitySolution.detectionEngine.alerts.createThresholdTimelineFailure": "document _idのタイムラインを作成できませんでした：{id}",
+    "xpack.securitySolution.detectionEngine.alerts.createThresholdTimelineFailureTitle": "しきい値アラートタイムラインを作成できませんでした",
     "xpack.securitySolution.detectionEngine.alerts.documentTypeTitle": "アラート",
+    "xpack.securitySolution.detectionEngine.alerts.fetchExceptionsFailure": "例外の取得エラーです。",
     "xpack.securitySolution.detectionEngine.alerts.histogram.allOthersGroupingLabel": "その他すべて",
     "xpack.securitySolution.detectionEngine.alerts.histogram.headerTitle": "傾向",
     "xpack.securitySolution.detectionEngine.alerts.histogram.showingAlertsTitle": "{modifier}{totalAlertsFormatted} {totalAlerts, plural, other  {件のアラート}}を表示しています",
@@ -22793,7 +24109,7 @@
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsComboboxLabel": "選択したルールのインデックスパターンを追加",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsOverwriteCheckboxLabel": "すべての選択したルールインデックスパターンを上書き",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsTitle": "インデックスパターンを追加",
-    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxHelpText": "選択したルールの1つ以上のカスタム識別タグを追加します。新しいタグを開始するには、各タグの後でEnterを押します。",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxHelpText": "ドロップダウンから選択したルールの1つ以上のタグを追加します。カスタム識別タグを入力して、Enterを押して、新規開始することもできます。",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxLabel": "選択したルールのタグを追加",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsOverwriteCheckboxLabel": "すべての選択したルールタグを上書き",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsTitle": "タグを追加",
@@ -22801,7 +24117,7 @@
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsComboboxHelpText": "Elasticsearchインデックスのデフォルトインデックスパターンをドロップダウンから削除します。カスタムインデックスパターンを追加し、Enterを押すと、新しいインデックスパターンを開始できます。",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsComboboxLabel": "選択したルールのインデックスパターンを削除",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsTitle": "インデックスパターンを削除",
-    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxHelpText": "選択したルールの1つ以上のカスタム識別タグを削除します。新しいタグを開始するには、各タグの後でEnterを押します。",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxHelpText": "ドロップダウンから選択したルールの1つ以上のタグを削除します。カスタム識別タグを入力して、Enterを押して、新規開始することもできます。",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxLabel": "選択したルールのタグを削除",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsTitle": "タグを削除",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.indexPatternsRequiredErrorMessage": "インデックスパターンが最低1つ必要です。",
@@ -22928,6 +24244,8 @@
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.invalidMustacheTemplateErrorMessage": "{key}は有効なmustacheテンプレートではありません",
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.noConnectorSelectedErrorMessage": "コネクターを選択していません",
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.noReadActionsPrivileges": "ルールアクションを作成できません。「Actions」プラグインの「読み取り」アクセス権がありません。",
+    "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.completeWithEnablingTitle": "ルールを作成して有効にする",
+    "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.completeWithoutEnablingTitle": "有効にせずにルールを作成",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackHelpText": "ルックバック期間に時間を追加してアラートの見落としを防ぎます。",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackLabel": "追加のルックバック時間",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldIntervalHelpText": "ルールを定期的に実行し、指定の時間枠内でアラートを検出します。",
@@ -23033,6 +24351,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cloudGroupsT1069Description": "クラウドグループ（T1069.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cloudInstanceMetadataApiT1552Description": "クラウドインスタンスメタデータ API（T1552.005）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cmstpT1218Description": "CMSTP (T1218.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeRepositoriesT1213Description": "コードリポジトリ（T1213.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningCertificatesT1587Description": "コード署名証明書（T1587.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningCertificatesT1588Description": "コード署名証明書（T1588.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningPolicyModificationT1553Description": "コード署名ポリシー修正 (T1553.006)",
@@ -23097,6 +24416,8 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainsT1583Description": "ドメイン（T1583.001）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainsT1584Description": "ドメイン（T1584.001）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainTrustModificationT1484Description": "ドメイン信頼修正（T1484.002）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.doubleFileExtensionT1036Description": "二重のファイル拡張子（T1036.007）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.downgradeAttackT1562Description": "ダウングレード攻撃（T1562.010）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.downgradeSystemImageT1601Description": "システムイメージのダウングレード（T1601.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.driveByTargetT1608Description": "ドライブバイターゲット (T1608.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.dylibHijackingT1574Description": "Dylib ハイジャック（T1574.004）",
@@ -23109,6 +24430,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailAccountT1087Description": "電子メールアカウント（T1087.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailAddressesT1589Description": "電子メールアドレス（T1589.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailForwardingRuleT1114Description": "電子メール転送ルール（T1114.003）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailHidingRulesT1564Description": "電子メール非表示ルール（T1564.008）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emondT1546Description": "Emond（T1546.014）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.employeeNamesT1589Description": "従業員名（T1589.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.environmentalKeyingT1480Description": "環境キーイング（T1480.001）",
@@ -23141,8 +24463,10 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenFileSystemT1564Description": "非表示のファイルシステム（T1564.005）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenUsersT1564Description": "非表示のユーザー（T1564.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenWindowT1564Description": "非表示のウィンドウ（T1564.003）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.htmlSmugglingT1027Description": "HTML Smuggling (T1027.006)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.identifyBusinessTempoT1591Description": "Business Tempo の特定（T1591.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.identifyRolesT1591Description": "ロールの特定（T1591.004）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.iisComponentsT1505Description": "IISコンポーネント（T1505.004）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.imageFileExecutionOptionsInjectionT1546Description": "画像ファイル実行オプションインジェクション（T1546.012）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.impairCommandHistoryLoggingT1562Description": "コマンド履歴ログの破損（T1562.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.indicatorBlockingT1562Description": "インジケーターブロック（T1562.006）",
@@ -23175,6 +24499,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localDataStagingT1074Description": "ローカルデータステージング（T1074.001）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localEmailCollectionT1114Description": "ローカル電子メール収集（T1114.001）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localGroupsT1069Description": "ローカルグループ（T1069.001）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.loginItemsT1547Description": "Login Items (T1547.015)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.logonScriptMacT1037Description": "ログオンスクリプト（Mac）（T1037.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.logonScriptWindowsT1037Description": "ログオンスクリプト（Windows）（T1037.001）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.lsaSecretsT1003Description": "LSA シークレット（T1003.004）",
@@ -23190,6 +24515,8 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.markOfTheWebBypassT1553Description": "Mark-of-the-Webバイパス (T1553.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.masqueradeTaskOrServiceT1036Description": "マスカレードタスクまたはサービス（T1036.004）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.matchLegitimateNameOrLocationT1036Description": "合法的な名前または場所と一致（T1036.005）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mavinjectT1218Description": "Mavinject (T1218.013)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mmcT1218Description": "MMC (T1218.014)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.msBuildT1127Description": "MSBuild（T1127.001）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mshtaT1218Description": "Mshta (T1218.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.msiexecT1218Description": "Msiexec（T1218.007）",
@@ -23257,12 +24584,14 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.remoteEmailCollectionT1114Description": "リモート電子メール収集（T1114.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.renameSystemUtilitiesT1036Description": "システムユーティリティ名の変更（T1036.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.reOpenedApplicationsT1547Description": "再オープンされたアプリケーション（T1547.007）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.resourceForkingT1564Description": "リソースフォーク（T1564.009）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.revertCloudInstanceT1578Description": "クラウドインスタンスの取り消し（T1578.004）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rightToLeftOverrideT1036Description": "Right-to-Left Override（T1036.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rommoNkitT1542Description": "ROMMONkit（T1542.004）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rundll32T1218Description": "Rundll32（T1218.011）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.runtimeDataManipulationT1565Description": "ランタイムデータ操作（T1565.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.runVirtualInstanceT1564Description": "仮想インスタンスの実行（T1564.006）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.safeModeBootT1562Description": "セーフモード起動（T1562.009）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.samlTokensT1606Description": "SAMLトークン（T1606.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.scanDatabasesT1596Description": "データベースのスキャン（T1596.005）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.scanningIpBlocksT1595Description": "IP ブロックのスキャン（T1595.001）",
@@ -23314,6 +24643,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemdServiceT1543Description": "Systemd サービス（T1543.002）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemdTimersT1053Description": "Systemd Timers（T1053.006）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemFirmwareT1542Description": "システムファームウェア（T1542.001）",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemLanguageDiscoveryT1614Description": "System Language Discovery (T1614.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.tftpBootT1542Description": "TFTP ブート（T1542.005）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.threadExecutionHijackingT1055Description": "スレッド実行ハイジャック（T1055.003）",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.threadLocalStorageT1055Description": "スレッドローカルストレージ（T1055.005）",
@@ -23378,6 +24708,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.accountManipulationDescription": "アカウント操作（T1098）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.acquireInfrastructureDescription": "インフラストラクチャの取得（T1583）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.activeScanningDescription": "アクティブスキャン（T1595）",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.adversaryInTheMiddleDescription": "中間者攻撃（T1557）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.applicationLayerProtocolDescription": "アプリケーション層プロトコル（T1071）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.applicationWindowDiscoveryDescription": "アプリケーションウィンドウ検出（T1010）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.archiveCollectedDataDescription": "収集されたデータのアーカイブ（T1560）",
@@ -23389,12 +24720,14 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.bootOrLogonInitializationScriptsDescription": "ブートまたはログオン初期化スクリプト（T1037）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserBookmarkDiscoveryDescription": "ブラウザーブックマーク検出（T1217）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserExtensionsDescription": "ブラウザー拡張（T1176）",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserSessionHijackingDescription": "ブラウザーセッションハイジャック（T1185）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.bruteForceDescription": "Brute Force（T1110）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.buildImageOnHostDescription": "Build Image on Host (T1612)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.clipboardDataDescription": "クリップボードデータ（T1115）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudInfrastructureDiscoveryDescription": "クラウドインフラストラクチャ検出（T1580）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudServiceDashboardDescription": "クラウドサービスダッシュボード（T1538）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudServiceDiscoveryDescription": "Cloud Service Discovery（T1526）",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudStorageObjectDiscoveryDescription": "クラウドストレージオブジェクト検出（T1619）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.commandAndScriptingInterpreterDescription": "コマンドおよびスクリプトインタープリター（T1059）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.commonlyUsedPortDescription": "一般的に使用されるポート（T1043）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.communicationThroughRemovableMediaDescription": "リムーバブルメディア経由の通信（T1092）",
@@ -23460,6 +24793,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.gatherVictimNetworkInformationDescription": "被害者ネットワーク情報の収集（T1590）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.gatherVictimOrgInformationDescription": "被害者組織情報の収集（T1591）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.graphicalUserInterfaceDescription": "グラフィカルユーザーインターフェイス（T1061）",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.groupPolicyDiscoveryDescription": "グループポリシー検出（T1615）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hardwareAdditionsDescription": "ハードウェア追加（T1200）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hideArtifactsDescription": "アーチファクトの非表示（T1564）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hijackExecutionFlowDescription": "ハイジャック実行フロー（T1574）",
@@ -23507,6 +24841,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.proxyDescription": "プロキシ（T1090）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.queryRegistryDescription": "クエリレジストリ（T1012）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.redundantAccessDescription": "冗長アクセス（T1108）",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.reflectiveCodeLoadingDescription": "Reflective Code Loading（T1620）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteAccessSoftwareDescription": "リモートアクセスソフトウェア（T1219）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteServicesDescription": "リモートサービス（T1021）",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteServiceSessionHijackingDescription": "リモートサービスセッションハイジャック（T1563）",
@@ -23584,6 +24919,7 @@
     "xpack.securitySolution.detectionEngine.noPermissionsTitle": "権限が必要です",
     "xpack.securitySolution.detectionEngine.pageTitle": "検出エンジン",
     "xpack.securitySolution.detectionEngine.panelSubtitleShowing": "表示中",
+    "xpack.securitySolution.detectionEngine.queryPreview.actions": "アクション",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphCountLabel": "カウント",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphPreviewError": "プレビュー取得エラー",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphPreviewInspectTitle": "クエリプレビュー",
@@ -23597,8 +24933,9 @@
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewLabel": "クイッククエリプレビュー",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllErrors": "すべてのエラーを表示",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllWarnings": "すべての警告を表示",
-    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading": "...loading",
     "xpack.securitySolution.detectionEngine.queryPreview.queryThresholdGraphCountLabel": "累積しきい値数",
+    "xpack.securitySolution.detectionEngine.queryPreview.viewDetailsAriaLabel": "詳細を表示",
+    "xpack.securitySolution.detectionEngine.queryPreview.viewDetailsForRowAriaLabel": "行 {ariaRowindex}、列 {columnValues} のアラートまたはイベントの詳細を表示",
     "xpack.securitySolution.detectionEngine.rule.editRule.errorMsgDescription": "{countError, plural, one {このタブ} other {これらのタブ}}に無効な入力があります：{tabHasError}",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStartedDescription": "開始",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStoppedDescription": "停止",
@@ -23606,10 +24943,37 @@
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAllDescription": "すべての結果",
     "xpack.securitySolution.detectionEngine.ruleDetails.backToRulesButton": "ルール",
     "xpack.securitySolution.detectionEngine.ruleDetails.deletedRule": "削除されたルール",
+    "xpack.securitySolution.detectionEngine.ruleDetails.enableRuleLabel": "有効にする",
     "xpack.securitySolution.detectionEngine.ruleDetails.exceptionsTab": "例外",
     "xpack.securitySolution.detectionEngine.ruleDetails.experimentalDescription": "テクニカルプレビュー",
     "xpack.securitySolution.detectionEngine.ruleDetails.pageTitle": "ルール詳細",
-    "xpack.securitySolution.detectionEngine.ruleDetails.ruleCreationDescription": "作成者: {by} 日付: {date}",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleCreationDescription": "作成者：{by} 日付：{date}",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionFieldNotFoundErrorDescription": "アラートインデックスにフィールド'kibana.alert.rule.execution.uuid'が見つかりません。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionFieldNotFoundErrorTitle": "アラートをフィルターできません",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionsColumn": "アクション",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionsColumnTooltip": "ルール実行IDでアラートをフィルターします。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.durationColumn": "期間",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.durationColumnTooltip": "ルールを実行するのにかかる時間（hh:mm:ss:SSS）。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapDurationColumn": "ギャップ期間",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapDurationColumnTooltip": "ルール実行のギャップの期間（hh:mm:ss:SSS）。ルールルックバックを調整するか、ギャップの軽減については{seeDocs}してください。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapTooltipSeeDocsDescription": "ドキュメントを参照",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.indexDurationColumn": "インデックス期間",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.indexDurationColumnTooltip": "検出されたアラートにインデックスを作成するのにかかる時間（hh:mm:ss:SSS）。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.messageColumn": "メッセージ",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.messageColumnTooltip": "実行結果からの関連するメッセージ。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.schedulingDelayColumn": "スケジュール遅延",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.schedulingDelayColumnTooltip": "ルールスケジュールからルール実行までの時間（hh:mm:ss:SSS）。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchDurationColumn": "検索期間",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchDurationColumnTooltip": "アラートを検索するのにかかる時間（hh:mm:ss:SSS）。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchLimitExceededLabel": "{totalItems}件以上のルール実行が指定されたフィルターと一致します。最新の「@timestamp」で最初の{maxItems}を表示しています。さらにフィルターを絞り込み、追加の実行イベントを表示します。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchPlaceholder": "期間 > 100およびgapDuration > 10",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.showMetricColumnsSwitchTitle": "メトリック列を表示",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.statusColumn": "ステータス",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.statusColumnTooltip": "実行の全体的なステータス。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.timestampColumn": "タイムスタンプ",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.timestampColumnTooltip": "日時ルール実行が開始されました。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.totalExecutionsLabel": "{totalItems} {totalItems, plural, other {個のルール例外}}を表示しています",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLogsTab": "ルール実行ログ ",
     "xpack.securitySolution.detectionEngine.ruleDetails.ruleUpdateDescription": "更新者：{by} 日付：{date}",
     "xpack.securitySolution.detectionEngine.ruleDetails.statusFailedDescription": "失敗",
     "xpack.securitySolution.detectionEngine.ruleDetails.unknownDescription": "不明",
@@ -23634,7 +24998,6 @@
     "xpack.securitySolution.detectionEngine.rules.allExceptions.tableTitle": "例外リスト",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.deleteRuleDescription": "ルールの削除",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.duplicateRuleDescription": "ルールの複製",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastTitle": "ルールの複製エラー",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.duplicateTitle": "複製",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.editRuleSettingsDescription": "ルール設定の編集",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.editRuleSettingsToolTip": "Kibana アクション特権がありません",
@@ -23642,24 +25005,51 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.activeRuleDescription": "アクティブ",
     "xpack.securitySolution.detectionEngine.rules.allRules.batchActions.deleteSelectedImmutableTitle": "選択には削除できないイミュータブルルールがあります",
     "xpack.securitySolution.detectionEngine.rules.allRules.batchActionsTitle": "一斉アクション",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkAction.enable.successToastDescription": "{totalRules, plural, other {{totalRules}個のルール}}が正常に有効にされました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.addIndexPatternsTitle": "インデックスパターンを追加",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.addTagsTitle": "タグを追加",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationDescription": "更新アクションは、選択した{customRulesCount, plural, other  {#個のカスタムルール}}にのみ適用されます。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.applyTimelineTemplateTitle": "タイムラインテンプレートを適用",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationDescription": "更新アクションは、選択した{customRulesCount, plural, other {#個のカスタムルール}}にのみ適用されます。",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationTitle": "{elasticRulesCount, plural, other  {#個のElasticルール}}を編集できません",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastDescription": "{rulesCount, plural, other  {#個のルール}}を更新できませんでした。",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditRejectionDescription": "Elasticルールは変更できません。更新アクションはカスタムルールにのみ適用されます。",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastDescription": "{rulesCount, plural, other  {#個のルール}}を正常に更新しました。",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastTitle": "ルール変更が更新されました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastDescription": "{rulesCount, plural, other  {#個のルール}}を更新しています。",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastNotifyButtonLabel": "完了時に通知",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastTitle": "ルールを更新しています",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.contextMenuTitle": "オプション",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.errorToastDescription": "{rulesCount, plural, other {#個のルール}}を削除できませんでした。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.errorToastTitle": "ルールの削除エラー",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.successToastDescription": "{totalRules, plural, other {{totalRules}ルール}}が正常に削除されました",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.successToastTitle": "ルールが削除されました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteIndexPatternsTitle": "インデックスパターンを削除",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteTagsTitle": "タグを削除",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteTitle": "削除",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.errorToastDescription": "{rulesCount, plural, other {#個のルール}}を無効にできませんでした。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.errorToastTitle": "ルールの無効化エラー",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.successToastDescription": "{totalRules, plural, other {{totalRules}ルール}}が正常に無効にされました",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.successToastTitle": "ルールが無効にされました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disableTitle": "無効にする",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastDescription": "{rulesCount, plural, other {#個のルール}}を複製できませんでした。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastTitle": "ルールの複製エラー",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastDescription": "{totalRules, plural, other  {{totalRules}ルール}}を正常に複製しました",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastTitle": "ルールが複製されました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicateTitle": "複製",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.formTitle": "タイムラインテンプレートを適用",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorDefaultValue": "なし",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorHelpText": "生成されたアラートを調査するときに、選択したルールに適用するタイムラインを選択します。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorLabel": "選択したルールにタイムラインテンプレートを適用",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.warningCalloutMessage": "{rulesCount, plural, other {# 個の選択したルール}}に変更を適用しようとしています。すでにテンプレートをこれらのルールに適用している場合は、上書きされるか、（［なし］を選択した場合は）［なし］にリセットされます。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastDescription": "{rulesCount, plural, other {#個のルール}}を更新できませんでした。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastTitle": "ルールの更新エラー",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastDescription": "{rulesCount, plural, other {#個のルール}}を正常に更新しました。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastTitle": "ルールが更新されました",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.errorToastDescription": "{rulesCount, plural, other {#個のルール}}を有効にできませんでした。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.errorToastTitle": "ルールの有効化エラー",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.successToastTitle": "ルールが有効にされました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enableTitle": "有効にする",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.errorToastDescription": "{rulesCount, plural, other {#個のルール}}をエクスポートできませんでした。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.errorToastTitle": "ルールのエクスポートエラー",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastDescription": "{exportedRules}/{totalRules} {totalRules, plural, other  {件のルール}}を正常にエクスポートしました事前構築済みルールは結果のファイルから除外されました。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastTitle": "ルールがエクスポートされました",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.exportTitle": "エクスポート",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.indexPatternsTitle": "インデックスパターン",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.tagsTitle": "タグ",
@@ -23667,6 +25057,7 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.enabledTitle": "有効",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gap": "最後のギャップ（該当する場合）",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gapTooltip": "ルール実行の最新のギャップの期間。ルールルックバックを調整するか、ギャップの軽減については{seeDocs}してください。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.gapTooltipSeeDocsDescription": "ドキュメントを参照",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimes": "インデックス時間（ミリ秒）",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimesTooltip": "前回のルール実行中にアラートのインデックスにかかった合計時間",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastResponseTitle": "前回の応答",
@@ -23681,6 +25072,11 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.tagsTitle": "タグ",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.versionTitle": "バージョン",
     "xpack.securitySolution.detectionEngine.rules.allRules.exportFilenameTitle": "rules_export",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.nextStepLabel": "次のステップに進む",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.previousStepLabel": "前のステップに戻る",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.searchCapabilitiesDescription": "「filebeat-*」などのインデックスパターンや、「Defense Evasion」や「TA0005」などのMITRE ATT&amp;CK™方式または手法でルールを検索できます。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.searchCapabilitiesTitle": "拡張検索機能",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.tourTitle": "新機能",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.customRulesTitle": "カスタムルール",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.elasticRulesTitle": "Elasticルール",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.noRulesBodyTitle": "上記のフィルターでルールが見つかりませんでした。",
@@ -23690,12 +25086,11 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.inactiveRuleDescription": "非アクティブ",
     "xpack.securitySolution.detectionEngine.rules.allRules.refreshTitle": "更新",
     "xpack.securitySolution.detectionEngine.rules.allRules.searchAriaLabel": "ルールの検索",
+    "xpack.securitySolution.detectionEngine.rules.allRules.searchPlaceholder": "ルール名、インデックスパターン（例：「filebeat-*」）、またはMITRE ATT&amp;CK™方式や手法（例：「Defense Evasion」や「TA0005」）",
     "xpack.securitySolution.detectionEngine.rules.allRules.selectAllRulesTitle": "すべての{totalRules} {totalRules, plural, other  {個のルール}}を選択",
     "xpack.securitySolution.detectionEngine.rules.allRules.selectedRulesTitle": "{selectedRules} {selectedRules, plural, other  {ルール}}を選択しました",
     "xpack.securitySolution.detectionEngine.rules.allRules.showingExceptionLists": "{totalLists} {totalLists, plural, other  {件のリスト}}を表示しています。",
     "xpack.securitySolution.detectionEngine.rules.allRules.showingRulesTitle": "{totalRules} {totalRules, plural, other  {ルール}}を表示中",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastDescription": "{totalRules, plural, other  {{totalRules}ルール}}を正常に複製しました",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastDescription": "{exportedRules}/{totalRules} {totalRules, plural, other  {件のルール}}を正常にエクスポートしました事前構築済みルールは結果のファイルから除外されました。",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.exceptions": "例外リスト",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.monitoring": "ルール監視",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.rules": "ルール",
@@ -23718,7 +25113,7 @@
     "xpack.securitySolution.detectionEngine.rules.pageTitle": "ルール",
     "xpack.securitySolution.detectionEngine.rules.popoverTooltip.ariaLabel": "列のツールチップ：{columnName}",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.createOwnRuletButton": "独自のルールの作成",
-    "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptMessage": "Elasticセキュリティには、バックグラウンドで実行され、条件が合うとアラートを作成する事前構築済み検出ルールがあります。デフォルトでは、Endpoint Securityルールを除くすべての事前構築済みルールが無効になっています。有効にする追加のルールを選択することができます。",
+    "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptMessage": "Elasticセキュリティには、バックグラウンドで実行され、条件が合うとアラートを作成する事前構築済み検出ルールがあります。デフォルトでは、Endpoint Securityルールを除くすべての事前構築済みルールが無効になっています。有効にする追加のルールを選択できます。",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptTitle": "Elastic 事前構築済み検出ルールを読み込む",
     "xpack.securitySolution.detectionEngine.rules.refreshRulePopoverDescription": "表の自動更新",
     "xpack.securitySolution.detectionEngine.rules.refreshRulePopoverLabel": "自動更新設定",
@@ -23757,7 +25152,12 @@
     "xpack.securitySolution.detectionEngine.validations.thresholdCardinalityValueFieldData.numberGreaterThanOrEqualOneErrorMessage": "値は 1 以上でなければなりません。",
     "xpack.securitySolution.detectionEngine.validations.thresholdFieldFieldData.arrayLengthGreaterThanMaxErrorMessage": "フィールド数は3以下でなければなりません。",
     "xpack.securitySolution.detectionEngine.validations.thresholdValueFieldData.numberGreaterThanOrEqualOneErrorMessage": "値は 1 以上でなければなりません。",
+    "xpack.securitySolution.detectionResponse.pageTitle": "検出と対応 - SOC",
+    "xpack.securitySolution.detectionResponse.updated": "更新しました",
+    "xpack.securitySolution.detectionResponse.updating": "更新中...",
     "xpack.securitySolution.detections.alerts.agentStatus": "エージェントステータス",
+    "xpack.securitySolution.detections.alerts.ruleType": "ルールタイプ",
+    "xpack.securitySolution.detections.alerts.sourceEventId": "ソースイベントID",
     "xpack.securitySolution.detections.hostIsolation.impactedCases": "このアクションは{cases}に追加されます。",
     "xpack.securitySolution.documentationLinks.ariaLabelEnding": "クリックすると、新しいタブでドキュメントを開きます",
     "xpack.securitySolution.documentationLinks.detectionsRequirements.text": "検出の前提条件と要件",
@@ -23796,6 +25196,7 @@
     "xpack.securitySolution.endpoint.actions.hostDetails": "ホスト詳細を表示",
     "xpack.securitySolution.endpoint.actions.isolateHost": "ホストの分離",
     "xpack.securitySolution.endpoint.actions.unIsolateHost": "ホストのリリース",
+    "xpack.securitySolution.endpoint.blocklists.fleetIntegration.title": "ブロックリスト",
     "xpack.securitySolution.endpoint.details.agentStatus": "エージェントステータス",
     "xpack.securitySolution.endpoint.details.endpointVersion": "エンドポイントバージョン",
     "xpack.securitySolution.endpoint.details.errorBody": "フライアウトを終了して、利用可能なホストを選択してください。",
@@ -23850,11 +25251,30 @@
     "xpack.securitySolution.endpoint.effectedPolicySelect.global": "グローバル",
     "xpack.securitySolution.endpoint.effectedPolicySelect.perPolicy": "ポリシー単位",
     "xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title": "イベントフィルター",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.artifactsSummaryError": "アーティファクト統計情報の取得中にエラーが発生しました：\"{error}\"",
     "xpack.securitySolution.endpoint.fleetCustomExtension.backButtonLabel": "Endpoint Security統合に戻る",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error": "ブロックリスト統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error": "イベントフィルター統計情報の取得中にエラーが発生しました：\"{error}\"",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.linux": "Linux",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.macos": "Mac",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.total": "合計",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.windows": "Windows",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error": "ホスト分離例外統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.manageArtifactsLinkLabel": "管理",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.title": "アーチファクト",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error": "信頼できるアプリケーション統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifacts.backButtonLabel": "Fleet統合ポリシーに戻る",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifactsManageLabel": "アーティファクトの管理",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifactsSummary.error": "アーティファクト統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.blocklistsManageLabel": "ブロックリストの管理",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.blocklistsSummary.error": "ブロックリスト統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.eventFiltersManageLabel": "イベントフィルターの管理",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.eventFiltersSummarySummary.error": "イベントフィルター統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.hostIsolationExceptionsManageLabel": "ホスト分離例外の管理",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.hostIsolationExceptionsSummary.error": "ホスト分離例外統計情報の取得中にエラーが発生しました：\"{error}\"",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.title": "アーチファクト",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.trustedAppsManageLabel": "信頼できるアプリケーションを管理",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.trustedAppsSummarySummary.error": "信頼できるアプリ統計情報の取得中にエラーが発生しました：\"{error}\"",
     "xpack.securitySolution.endpoint.hostIsolation.cancel": "キャンセル",
     "xpack.securitySolution.endpoint.hostIsolation.casesFromAlerts.title": "関連付けられたケースが見つかりませんでした",
     "xpack.securitySolution.endpoint.hostIsolation.comment": "コメント",
@@ -23877,7 +25297,7 @@
     "xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage": "ホスト{hostName}でのリリースは正常に送信されました",
     "xpack.securitySolution.endpoint.hostIsolation.unisolateHost": "ホストのリリース",
     "xpack.securitySolution.endpoint.hostIsolation.unIsolateThisHost": "現在{hostName}は{isolated}です。このホストを{unisolate}しますか？",
-    "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "ホスト分離例外アプリケーション",
+    "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "ホスト分離例外",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating": "分離中",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isolated": "分離済み",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating": "リリース中",
@@ -23888,6 +25308,7 @@
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "推奨のデフォルト値で統合が保存されます。後からこれを変更するには、エージェントポリシー内で Endpoint Security 統合を編集します。",
     "xpack.securitySolution.endpoint.list.actionmenu": "開く",
     "xpack.securitySolution.endpoint.list.actions": "アクション",
+    "xpack.securitySolution.endpoint.list.backToPolicyButton": "ポリシーリストに戻る",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling": "エンドポイントを登録しています。進行状況を追跡するには、{agentsLink}してください。",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling.viewAgentsLink": "エージェントを表示",
     "xpack.securitySolution.endpoint.list.endpointVersion": "バージョン",
@@ -23932,6 +25353,7 @@
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.ca_cert": "Elasticsearch 認証局の PEM 暗号化証明書。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.verify_hostname": "ピアのホスト名が証明書で定義されていることを検証するかどうか。デフォルト：true",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.verify_peer": "ピアが提示した証明書を検証するかどうか。デフォルト：true",
+    "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.kernel.capture_mode": "データの収集でkprobesまたはebpfのどちらが使用されるのかを制御できます。使用可能なオプションはkprobes、ebpf、autoです。デフォルト：auto",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.logging.file": "入力した値は、ディスクに保存されたログと Elasticsearch にストリームされたログに構成されたログレベルよりも優先されます。ほとんどの環境でこのログを変更するには、Fleet を使用することをお勧めします。許可された値は、エラー、警告、情報、デバッグ、トレースです。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.logging.syslog": "入力された値はログを Syslog に構成します。許可された値は、エラー、警告、情報、デバッグ、トレースです。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.malware.quarantine": "マルウェア防御が有効なときに、隔離を有効にするかどうか。デフォルト：true",
@@ -23998,9 +25420,49 @@
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.memory_scan_collect_sample": "検出された悪意のあるメモリ領域周辺の4MBのメモリを収集します。デフォルト：false。この値を有効にすると、Elasticsearchに格納されたデータの量が大幅に増加する可能性があります。",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode": "メモリ保護の一部としてshellcodeインジェクション検出を有効にします。デフォルト：true",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_collect_sample": "検出されたshellcode領域周辺の4MBのメモリを収集します。デフォルト：false。この値を有効にすると、Elasticsearchに格納されたデータの量が大幅に増加する可能性があります。",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_trampoline_detection": "メモリ保護の一部としてtrampolineベースのshellcodeインジェクション検出を有効にします。デフォルト：true",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.canary": "値「false」はランサムウェアcanary保護を無効にします。デフォルト：true",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.mbr": "値「false」はランサムウェアMBR保護を無効にします。デフォルト：true",
     "xpack.securitySolution.endpoint.policy.advanced.windows.memory_protection.shellcode_enhanced_pe_parsing": "Authenticode署名およびバージョンリソース情報を含め、インジェクトされたshellcodeからPEメタデータを特定して抽出することを試みます。デフォルト：true",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.backButtonLabel": "{policyName}ポリシー",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.content": "現在、{policyName}に割り当てられたアーティファクトがありません。今すぐアーティファクトを割り当てるか、アーティファクトページでアーティファクトを追加および管理してください。",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.primaryAction": "アーティファクトの割り当て",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.secondaryAction": "アーティファクトの管理",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.title": "割り当てられたアーティファクトがありません",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.action": "アーティファクトの追加",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.content": "現在、エンドポイントにはアーティファクトが適用されていません。",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.title": "アーティファクトが存在しません",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.about": "{count, plural, other {}} {count}個の{count, plural, other {アーティファクト}}がこのポリシーに関連付けられています。ここをクリックすると、すべてのアーティファクトが表示されます",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.about.viewAllLinkLabel": "すべてのアーティファクトを表示",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.assignToPolicy": "アーティファクトをポリシーに割り当てる",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.cancel": "キャンセル",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.confirm": "{policyName}に割り当てる",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.noAssignable": "このポリシーに割り当てられるアーティファクトがありません。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.noResults": "項目が見つかりません",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.searchWarning.text": "最初の{maxNumber}個のアーティファクトのみが表示されます。検索バーを使用して、結果を絞り込んでください。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.searchWarning.title": "絞り込まれた検索結果",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.subtitle": "{policyName}に追加するアーティファクトを選択",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.title": "アーティファクトの割り当て",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastError.text": "アーチファクトの更新中にエラーが発生しました",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.textMultiples": "{count}個のアーティファクトがリストに追加されました。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.textSingle": "\"{name}\"がアーティファクトリストに追加されました。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.title": "成功",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.search.label": "アーティファクトの検索",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.title": "割り当てられたアーティファクト",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.fullDetailsAction": "詳細を表示",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeAction": "ポリシーから削除",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeActionNotAllowed": "グローバルで適用されたアーティファクトはポリシーから削除できません。",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.cancelLabel": "キャンセル",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.confirmLabel": "ポリシーから削除",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.errorToastTitle": "アーティファクトの削除エラー",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.message": "続行していいですか？",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.messageCallout": "このアーティファクトはこのポリシーからのみ削除されます。アーティファクトページには表示され、管理できます。",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.successToastText": "\"{artifactName}\"が{policyName}ポリシーから削除されました",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.successToastTitle": "正常に削除されました",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.title": "アーティファクトをポリシーから削除",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.search.placeholder": "次のフィールドで検索：名前、説明、値",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.totalItemCount": "{totalItemsCount, plural, other {#個のアーティファクト}}を表示しています",
+    "xpack.securitySolution.endpoint.policy.blocklists.list.totalItemCount": "{totalItemsCount, plural, other {#件のブロックリストエントリ}}を表示しています",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.explanation": "オンにすると、ElasticをWindows OSのオフィシャルウイルス対策ソリューションとして登録します。これで Windows Defender も無効になります。",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.osRestriction": "制限事項",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.toggle": "ウイルス対策として登録",
@@ -24027,6 +25489,7 @@
     "xpack.securitySolution.endpoint.policy.details.ransomware": "ランサムウェア",
     "xpack.securitySolution.endpoint.policy.details.save": "保存",
     "xpack.securitySolution.endpoint.policy.details.settings": "設定",
+    "xpack.securitySolution.endpoint.policy.details.tabs.blocklists": "ブロックリスト",
     "xpack.securitySolution.endpoint.policy.details.tabs.eventFilters": "イベントフィルター",
     "xpack.securitySolution.endpoint.policy.details.tabs.isInHostIsolationExceptions": "ホスト分離例外",
     "xpack.securitySolution.endpoint.policy.details.tabs.policyForm": "ポリシー設定",
@@ -24050,20 +25513,48 @@
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.about.viewAllLinkLabel": "すべてのイベントフィルターを表示",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.assignToPolicy": "イベントフィルターをポリシーに割り当て",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.noAssignable": "このポリシーに割り当てられるイベントフィルターがありません。",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.searchWarning.text": "最初の{maxNumber}個のイベントフィルターのみが表示されます。検索バーを使用して、結果を絞り込んでください。",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.subtitle": "{policyName}に追加するイベントフィルターを選択",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.title": "イベントフィルターの割り当て",
-    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastError.text": "アーチファクトの更新中にエラーが発生しました",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastError.text": "イベントフィルターの更新中にエラーが発生しました",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastSuccess.textMultiples": "{count}個のイベントフィルターがリストに追加されました。",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastSuccess.textSingle": "\"{name}\"がイベントフィルターリストに追加されました。",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.search.label": "イベントフィルターの検索",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.title": "割り当てられたイベントフィルター",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.about": "{count, plural, other  {}} {count}個のイベント{count, plural, other  {フィルター}}がこのポリシーに関連付けられています。ここをクリックすると、{link}",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeActionNotAllowed": "グローバルで適用されたイベントフィルターはポリシーから削除できません。",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.errorToastTitle": "イベントフィルターの削除エラー",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.messageCallout": "このイベントフィルターはこのポリシーからのみ削除されます。イベントフィルターページには表示され、管理できます。",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.title": "ポリシーからイベントフィルターを削除",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.search.placeholder": "次のフィールドで検索：名前、説明、コメント、値",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.totalItemCount": "{totalItemsCount, plural, other  {#個のイベントフィルター}}を表示中",
-    "xpack.securitySolution.endpoint.policy.hostIsolationExceptions.list.about": "{count, plural, other  {}} {count}個の{count, plural, other  {ホスト分離例外}}がこのポリシーに関連付けられています。ここをクリックすると、{link}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.content": "現在{policyName}に割り当てられたホスト分離例外はありません。今すぐホスト分離例外を割り当てるか、ホスト分離例外ページで追加して管理してください。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.primaryAction": "ホスト分離例外の割り当て",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.secondaryAction": "ホスト分離例外の管理",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.title": "割り当てられたホスト分離例外がありません",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.action": "ホスト分離例外の追加",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.content": "現在、エンドポイントにはホスト分離例外が適用されていません。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.title": "ホスト分離例外が存在しません",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.about.viewAllLinkLabel": "ホスト分離例外を表示",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.assignToPolicy": "ホスト分離例外をポリシーに割り当てる",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.noAssignable": "このポリシーに割り当てられるホスト分離例外はありません。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.searchWarning.text": "最初の{maxNumber}個のホスト分離例外のみが表示されます。検索バーを使用して、結果を絞り込んでください。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.subtitle": "{policyName}に追加するホスト分離例外を選択",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.title": "ホスト分離例外の割り当て",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastError.text": "ホスト分離例外の更新中にエラーが発生しました",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastSuccess.textMultiples": "{count}個のホスト分離例外がリストに追加されました。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastSuccess.textSingle": "\"{name}\"はホスト分離例外リストに追加されました。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.search.label": "ホスト分離例外の検索",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.title": "割り当てられたホスト分離例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeActionNotAllowed": "グローバルで適用されたホスト分離例外はポリシーから削除できません。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.errorToastTitle": "ホスト分離例外の削除試行中のエラー",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.messageCallout": "このホスト分離例外はこのポリシーからのみ削除されます。アーティファクトページには表示され、管理できます。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.title": "ポリシーからホスト分離例外を削除",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.search.placeholder": "次のフィールドで検索：名前、説明、IP",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.totalItemCount": "{totalItemsCount, plural, other  {#個のホスト分離例外}}を表示中",
+    "xpack.securitySolution.endpoint.policy.hostIsolationExceptions.list.about": "{count, plural, other {}} {count}個の{count, plural, other {例外}}がこのポリシーに関連付けられています。ここをクリックすると、{link}",
     "xpack.securitySolution.endpoint.policy.protections.behavior": "悪意ある動作に対する保護",
+    "xpack.securitySolution.endpoint.policy.protections.blocklist": "ブロックリストが有効にされました",
     "xpack.securitySolution.endpoint.policy.protections.malware": "マルウェア保護",
     "xpack.securitySolution.endpoint.policy.protections.memory": "メモリ脅威に対する保護",
     "xpack.securitySolution.endpoint.policy.protections.ransomware": "ランサムウェア保護",
@@ -24077,16 +25568,20 @@
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.about.viewAllLinkLabel": "信頼できるアプリケーションを表示",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.assignToPolicy": "信頼できるアプリケーションをポリシーに割り当てる",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.noAssignable": "このポリシーに割り当てられる信頼できるアプリケーションがありません。",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.searchWarning.text": "最初の{maxNumber}個の信頼できるアプリケーションのみが表示されます。検索バーを使用して、結果を絞り込んでください。",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.subtitle": "{policyName}に追加する信頼できるアプリケーションを選択",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.title": "信頼できるアプリケーションの割り当て",
-    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastError.text": "アーチファクトの更新中にエラーが発生しました",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastError.text": "信頼できるアプリケーションの更新中にエラーが発生しました",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textMultiples": "{count}個の信頼できるアプリケーションがリストに追加されました。",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textSingle": "\"{name}\"は信頼できるアプリケーションリストに追加されました。",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.search.label": "信頼できるアプリケーションを検索",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.title": "割り当てられた信頼できるアプリケーション",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.about": "{count, plural, other  {}} {count}個の信頼できる{count,  plural, other {アプリケーション}}がこのポリシーに関連付けられています。\nここをクリックすると、{link}",
     "xpack.securitySolution.endpoint.policy.trustedApps.list.removeActionNotAllowed": "グローバルで適用された信頼できるアプリケーションはポリシーから削除できません。",
-    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.errorToastTitle": "信頼できるアプリケーションの削除エラー",
-    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.messageCallout": "この信頼できるアプリケーションはこのポリシーからのみ削除されます。信頼できるアプリケーションページには表示され、管理できます。",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.errorToastTitle": "信頼できるアプリの削除エラー",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.messageCallout": "この信頼できるアプリケーションはこのポリシーからのみ削除されます。アーティファクトページには表示され、管理できます。",
     "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.title": "信頼できるアプリケーションをポリシーから削除",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.search.placeholder": "次のフィールドで検索：名前、説明、値",
     "xpack.securitySolution.endpoint.policyDetail.behaviorProtectionTooltip": "悪意のある動作",
     "xpack.securitySolution.endpoint.policyDetail.filename": "ファイル名",
     "xpack.securitySolution.endpoint.policyDetail.memoryProtectionTooltip": "メモリ脅威",
@@ -24102,11 +25597,14 @@
     "xpack.securitySolution.endpoint.policyDetails.settings.title": "ポリシー設定",
     "xpack.securitySolution.endpoint.policyDetails.supportedVersion": "エージェントバージョン {version}",
     "xpack.securitySolution.endpoint.policyDetails.userNotification.placeholder": "カスタム通知メッセージを入力",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.blocklistTooltip": "このポリシーに関連付けられたブロックリストを有効または無効にします。このブロックリストは、コレクションハッシュ、パス、または署名者です。これはエンドポイントによって悪意があると見なされるプロセスのリストを拡張します。エントリ詳細については、ブロックリストタブを参照してください。",
     "xpack.securitySolution.endpoint.policyDetailsConfig.customizeUserNotification": "通知メッセージをカスタマイズ",
     "xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents": "イベント",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.file": "ファイル",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.network": "ネットワーク",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.process": "プロセス",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.session_data": "セッションデータを含める",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.session_data.tooltip": "セッションビューに必要な拡張プロセスイベントデータを取り込みます。セッションビューでは、Linuxプロセスモデルに従い、セッションおよびプロセス実行データをツリービューに整理することで、Linuxインフラストラクチャーのプロセス、ユーザー、サービスアクティビティを調査できます。注：拡張されたプロセスイベントを取り込むと、データ使用量が大幅に増加します。",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.file": "ファイル",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.network": "ネットワーク",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.process": "プロセス",
@@ -24127,21 +25625,17 @@
     "xpack.securitySolution.endpoint.policyList.onboardingDocsLink": "Elasticsearch Securityドキュメントを表示",
     "xpack.securitySolution.endpoint.policyList.onboardingSectionOne": "脅威防御、検出、深いセキュリティデータの可視化を実現し、ホストを保護します。",
     "xpack.securitySolution.endpoint.policyList.onboardingSectionThree": "開始するには、Endpoint Security 統合をエージェントに追加します。詳細については、",
+    "xpack.securitySolution.endpoint.policyList.onboardingSectionTwo.fromEndpointPage": "このページでは、Endpoint Securityを実行している環境でホストを表示して管理できます。",
+    "xpack.securitySolution.endpoint.policyList.onboardingSectionTwo.fromPolicyPage": "このページでは、Endpoint Securityを実行している環境で、Endpoint Security統合ポリシーを表示して管理できます。",
     "xpack.securitySolution.endpoint.policyList.onboardingTitle": "Endpoint Securityの基本",
     "xpack.securitySolution.endpoint.policyResponse.appliedOn": "{date}に改訂{rev}が適用されました",
     "xpack.securitySolution.endpoint.policyResponse.backLinkTitle": "エンドポイント詳細",
     "xpack.securitySolution.endpoint.policyResponse.title": "ポリシー応答",
-    "xpack.securitySolution.endpoint.resolver.compactBillions": "B",
-    "xpack.securitySolution.endpoint.resolver.compactMillions": "M",
-    "xpack.securitySolution.endpoint.resolver.compactOverflow": "+",
-    "xpack.securitySolution.endpoint.resolver.compactThousands": "k",
-    "xpack.securitySolution.endpoint.resolver.compactTrillions": "T",
     "xpack.securitySolution.endpoint.resolver.eitherLineageLimitExceeded": "以下のビジュアライゼーションとイベントリストの一部のプロセスイベントを表示できませんでした。データの上限に達しました。",
     "xpack.securitySolution.endpoint.resolver.elapsedTime": "{duration} {durationType}",
     "xpack.securitySolution.endpoint.resolver.errorProcess": "エラープロセス",
     "xpack.securitySolution.endpoint.resolver.loadingError": "データの読み込み中にエラーが発生しました。",
     "xpack.securitySolution.endpoint.resolver.loadingProcess": "プロセスの読み込み中",
-    "xpack.securitySolution.endpoint.resolver.node.pillNumber": "{mantissa}{scale}{hasRemainder}",
     "xpack.securitySolution.endpoint.resolver.panel.error.error": "エラー",
     "xpack.securitySolution.endpoint.resolver.panel.error.events": "イベント",
     "xpack.securitySolution.endpoint.resolver.panel.error.goBack": "すべてのプロセスを表示",
@@ -24176,6 +25670,7 @@
     "xpack.securitySolution.endpoint.resolver.terminatedProcess": "プロセスを中断しました",
     "xpack.securitySolution.endpoint.resolver.terminatedTrigger": "トリガーを中断しました",
     "xpack.securitySolution.endpoint.takeAction.changeAlertStatus": "アラートステータスを変更",
+    "xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title": "信頼できるアプリケーション",
     "xpack.securitySolution.endpointDetails.activityLog": "アクティビティログ",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.endOfLog": "表示する情報がありません",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.failedEndpointIsolateAction": "要求を送信できませんでした。ホストの分離",
@@ -24271,6 +25766,7 @@
     "xpack.securitySolution.eventFilters.listEmpty.addButton": "イベントフィルターを追加",
     "xpack.securitySolution.eventFilters.listEmpty.message": "イベントフィルターを追加して、大量のイベントや不要なイベントがElasticsearchに書き込まれないように除外します。",
     "xpack.securitySolution.eventFilters.listEmpty.title": "最初のイベントフィルターを追加",
+    "xpack.securitySolution.eventFilters.warningMessage.duplicateFields": "同じフィールド値の乗数を使用すると、エンドポイントパフォーマンスが劣化したり、効果的ではないルールが作成されたりすることがあります",
     "xpack.securitySolution.eventFiltersTab": "イベントフィルター",
     "xpack.securitySolution.eventRenderers.alertsDescription": "マルウェアまたはランサムウェアが防御、検出されたときにアラートが表示されます。",
     "xpack.securitySolution.eventRenderers.alertsName": "アラート",
@@ -24348,6 +25844,7 @@
     "xpack.securitySolution.exceptions.addException.sequenceWarning": "このルールのクエリにはEQLシーケンス文があります。作成された例外は、シーケンスのすべてのイベントに適用されます。",
     "xpack.securitySolution.exceptions.addException.success": "正常に例外を追加しました",
     "xpack.securitySolution.exceptions.andDescription": "AND",
+    "xpack.securitySolution.exceptions.badge.readOnly.tooltip": "例外を作成、編集、削除できません",
     "xpack.securitySolution.exceptions.cancelLabel": "キャンセル",
     "xpack.securitySolution.exceptions.clearExceptionsLabel": "例外リストを削除",
     "xpack.securitySolution.exceptions.commentEventLabel": "コメントを追加しました",
@@ -24429,6 +25926,7 @@
     "xpack.securitySolution.expandedValue.links.viewPortDetails": "ポート詳細を表示",
     "xpack.securitySolution.expandedValue.links.viewRuleDetails": "ルール詳細を表示",
     "xpack.securitySolution.expandedValue.links.viewRuleReference": "ルール参照を表示",
+    "xpack.securitySolution.expandedValue.links.viewUserSummary": "ユーザー概要を表示",
     "xpack.securitySolution.expandedValue.showTopN.showTopValues": "上位の値を表示",
     "xpack.securitySolution.featureCatalogueDescription": "インフラストラクチャ全体の統合保護のため、脅威を防止、収集、検出し、それに対応します。",
     "xpack.securitySolution.featureRegistry.linkSecuritySolutionCaseTitle": "ケース",
@@ -24436,7 +25934,18 @@
     "xpack.securitySolution.featureRegistry.manageAlertsName": "アラート",
     "xpack.securitySolution.featureRegistry.subfeature.alertsAllName": "すべて",
     "xpack.securitySolution.featureRegistry.subfeature.alertsReadName": "読み取り",
+    "xpack.securitySolution.fieldBrowser.actionsLabel": "アクション",
+    "xpack.securitySolution.fieldBrowser.categoryLabel": "カテゴリー",
     "xpack.securitySolution.fieldBrowser.createFieldButton": "フィールドを作成",
+    "xpack.securitySolution.fieldBrowser.descriptionForScreenReaderOnly": "フィールド {field} の説明：",
+    "xpack.securitySolution.fieldBrowser.descriptionLabel": "説明",
+    "xpack.securitySolution.fieldBrowser.editButton": "編集",
+    "xpack.securitySolution.fieldBrowser.editButtonDescription": "ランタイムフィールドを編集",
+    "xpack.securitySolution.fieldBrowser.fieldName": "名前",
+    "xpack.securitySolution.fieldBrowser.removeButton": "削除",
+    "xpack.securitySolution.fieldBrowser.removeButtonDescription": "ランタイムフィールドを削除",
+    "xpack.securitySolution.fieldBrowser.runtimeLabel": "ランタイム",
+    "xpack.securitySolution.fieldBrowser.runtimeTitle": "ランタイムフィールド",
     "xpack.securitySolution.fieldNameIcons.booleanAriaLabel": "ブールフィールド",
     "xpack.securitySolution.fieldNameIcons.conflictFieldAriaLabel": "矛盾フィールド",
     "xpack.securitySolution.fieldNameIcons.dateFieldAriaLabel": "日付フィールド",
@@ -24458,6 +25967,7 @@
     "xpack.securitySolution.flyout.button.timeline": "タイムライン",
     "xpack.securitySolution.footer.autoRefreshActiveDescription": "自動更新アクション",
     "xpack.securitySolution.footer.autoRefreshActiveTooltip": "自動更新が有効な間、タイムラインはクエリに一致する最新の {numberOfItems} 件のイベントを表示します。",
+    "xpack.securitySolution.footer.cancel": "キャンセル",
     "xpack.securitySolution.footer.data": "データ",
     "xpack.securitySolution.footer.events": "イベント",
     "xpack.securitySolution.footer.live": "ライブ",
@@ -24509,19 +26019,6 @@
     "xpack.securitySolution.host.details.overview.regionTitle": "地域",
     "xpack.securitySolution.host.details.versionLabel": "バージョン",
     "xpack.securitySolution.hostIsolation.agentStatuses.empty": "-",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.calloutMessage": "このエントリを削除すると、{count}個の関連付けられた{count, plural, other  {ポリシー}}から削除されます。",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.calloutTitle": "警告",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.cancel": "キャンセル",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.confirmation": "この操作は元に戻すことができません。続行していいですか？",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.confirmButton": "削除",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.deleteFailure": "ホスト分離例外リストから\"{name}\"を削除できません。理由：{message}",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.deleteSuccess": "\"{name}\"はホスト分離例外リストから削除されました。",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.title": "ホスト分離例外を削除",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.cancel": "キャンセル",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.createButton": "ホスト分離例外を追加",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.editButton": "保存",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.editTitle": "ホスト分離例外を編集",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.title": "ホスト分離例外を追加",
     "xpack.securitySolution.hostIsolationExceptions.form.conditions.subtitle": "ホスト分離例外はすべてのオペレーティングシステムに適用されます。",
     "xpack.securitySolution.hostIsolationExceptions.form.conditions.title": "条件",
     "xpack.securitySolution.hostIsolationExceptions.form.creationSuccessToastTitle": "\"{name}\"はホスト分離例外リストに追加されました。",
@@ -24541,14 +26038,6 @@
     "xpack.securitySolution.hostIsolationExceptions.form.title": "詳細",
     "xpack.securitySolution.hostIsolationExceptions.list.action.delete": "例外を削除",
     "xpack.securitySolution.hostIsolationExceptions.list.action.edit": "例外の編集",
-    "xpack.securitySolution.hostIsolationExceptions.list.addButton": "ホスト分離例外を追加",
-    "xpack.securitySolution.hostIsolationExceptions.list.pageSubTitle": "ホスト分離例外を追加して、分離されたホストが特定のIPと通信することを許可します。",
-    "xpack.securitySolution.hostIsolationExceptions.list.pageTitle": "ホスト分離例外",
-    "xpack.securitySolution.hostIsolationExceptions.list.totalCount": "{total, plural, other  {#個のホスト分離例外}}を表示中",
-    "xpack.securitySolution.hostIsolationExceptions.listEmpty.addButton": "ホスト分離例外を追加",
-    "xpack.securitySolution.hostIsolationExceptions.listEmpty.message": "ホスト分離例外を追加して、分離されたホストが特定のIPと通信することを許可します。",
-    "xpack.securitySolution.hostIsolationExceptions.listEmpty.title": "最初のホスト分離例外を追加",
-    "xpack.securitySolution.hostIsolationExceptions.search.placeholder": "次のフィールドで検索：名前、説明、IP",
     "xpack.securitySolution.hostOverview.errorSearchDescription": "ホスト概要検索でエラーが発生しました",
     "xpack.securitySolution.hostOverview.failSearchDescription": "ホスト概要で検索を実行できませんでした",
     "xpack.securitySolution.hosts.hostRiskInformation.buttonLabel": "リスクスコアを計算する方法",
@@ -24575,6 +26064,7 @@
     "xpack.securitySolution.hosts.navigation.dns.histogram.errorFetchingDnsData": "DNSデータをクエリできませんでした",
     "xpack.securitySolution.hosts.navigation.eventsTitle": "イベント",
     "xpack.securitySolution.hosts.navigation.hostRisk": "リスク別ホスト",
+    "xpack.securitySolution.hosts.navigation.sessionsTitle": "セッション",
     "xpack.securitySolution.hosts.navigation.uncommonProcessesTitle": "非共通プロセス",
     "xpack.securitySolution.hosts.navigaton.eventsUnit": "{totalCount, plural, other  {イベント}}",
     "xpack.securitySolution.hosts.navigaton.hostRisk.viewDashboardButtonLabel": "ソースダッシュボードを表示",
@@ -24598,6 +26088,7 @@
     "xpack.securitySolution.hostsRiskTable.hostsTitle": "リスク別ホスト",
     "xpack.securitySolution.hostsRiskTable.riskTitle": "ホストリスク分類",
     "xpack.securitySolution.hostsRiskTable.tableTitle": "ホストリスク",
+    "xpack.securitySolution.hostsRiskTable.usersTableTitle": "ユーザーリスク表はKQL時間範囲の影響を受けません。この表は、各ユーザーの最後に記録されたリスクスコアを示します。",
     "xpack.securitySolution.hostsTable.firstLastSeenToolTip": "選択された日付範囲との相関付けです",
     "xpack.securitySolution.hostsTable.hostRiskTitle": "ホストリスク分類",
     "xpack.securitySolution.hostsTable.hostRiskToolTip": "ホストリスク分類はホストリスクスコアで決まります。「重大」または「高」に分類されたホストはリスクが高いことが示されます。",
@@ -24613,7 +26104,9 @@
     "xpack.securitySolution.indexPatterns.add": "インデックスパターンを追加",
     "xpack.securitySolution.indexPatterns.advancedOptionsTitle": "高度なオプション",
     "xpack.securitySolution.indexPatterns.alertsBadgeTitle": "アラート",
+    "xpack.securitySolution.indexPatterns.callOutDeprecxatedTemplateTitle": "このタイムラインテンプレートはレガシーデータビューセレクターを使用します",
     "xpack.securitySolution.indexPatterns.callOutDeprecxatedTitle": "このタイムラインはレガシーデータビューセレクターを使用します",
+    "xpack.securitySolution.indexPatterns.callOutMissingPatternsTemplateTitle": "このタイムラインテンプレートはセキュリティデータビューの日付の範囲外です",
     "xpack.securitySolution.indexPatterns.callOutMissingPatternsTitle": "このタイムラインはセキュリティデータビューの日付の範囲外です",
     "xpack.securitySolution.indexPatterns.callOutTimelineTitle": "［検出アラートのみを表示］が選択されているときには、データビューを修正できません",
     "xpack.securitySolution.indexPatterns.callOutTitle": "このページではデータビューを修正できません",
@@ -24656,6 +26149,8 @@
     "xpack.securitySolution.inspect.modal.reqTimestampLabel": "リクエストのタイムスタンプ",
     "xpack.securitySolution.inspect.modal.somethingWentWrongDescription": "申し訳ございませんが、何か問題が発生しました。",
     "xpack.securitySolution.inspectDescription": "検査",
+    "xpack.securitySolution.inspectPatternDifferent": "この要素には、データビュー設定とは別の固有のインデックスパターンがあります。",
+    "xpack.securitySolution.inspectPatternExcludeLogs": "logs-*インデックスパターンが選択されると、Elasticクラウドログは検索から除外されます。",
     "xpack.securitySolution.investigationEnrichment.requestError": "脅威インテリジェンスの要求中にエラーが発生しました",
     "xpack.securitySolution.ja3.fingerprint.ja3.fingerprintLabel": "ja3",
     "xpack.securitySolution.kpiHost.enableHostRiskText": "その他のデータを表示するには、ホストリスクモジュールを有効にしてください",
@@ -24665,7 +26160,7 @@
     "xpack.securitySolution.kpiHosts.riskyHosts.description": "{formattedQuantity} Risky {quantity, plural, other  {ホスト}}",
     "xpack.securitySolution.kpiHosts.riskyHosts.errorMessage": "高リスクホストAPIの取得エラー",
     "xpack.securitySolution.kpiHosts.riskyHosts.hostsCount": "{quantity} {quantity, plural, other  {ホスト}}",
-    "xpack.securitySolution.kpiHosts.riskyHosts.inspectTitle": "KPI高リスクホスト",
+    "xpack.securitySolution.kpiHosts.riskyHosts.inspectTitle": "高リスクホスト",
     "xpack.securitySolution.kpiHosts.riskyHosts.title": "高リスクホスト",
     "xpack.securitySolution.kpiHosts.uniqueIps.destinationChartLabel": "Dest.",
     "xpack.securitySolution.kpiHosts.uniqueIps.destinationUnitLabel": "デスティネーション",
@@ -24686,6 +26181,8 @@
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.sourceChartLabel": "Src.",
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.sourceUnitLabel": "ソース",
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.title": "固有のプライベート IP",
+    "xpack.securitySolution.kpiUsers.totalUsers.errorSearchDescription": "統計ユーザーKPI検索でエラーが発生しました",
+    "xpack.securitySolution.kpiUsers.totalUsers.title": "ユーザー",
     "xpack.securitySolution.lastEventTime.errorSearchDescription": "前回のイベント時刻検索でエラーが発生しました。",
     "xpack.securitySolution.lastEventTime.failSearchDescription": "前回のイベント時刻で検索を実行できませんでした",
     "xpack.securitySolution.licensing.unsupportedMachineLearningMessage": "ご使用のライセンスは機械翻訳をサポートしていません。ライセンスをアップグレードしてください。",
@@ -24752,16 +26249,20 @@
     "xpack.securitySolution.ml.table.networkNameTitle": "ネットワークIP",
     "xpack.securitySolution.ml.table.scoreTitle": "異常スコア",
     "xpack.securitySolution.ml.table.timestampTitle": "タイムスタンプ",
+    "xpack.securitySolution.ml.table.userNameTitle": "ユーザー名",
     "xpack.securitySolution.modalAllErrors.close.button": "閉じる",
     "xpack.securitySolution.modalAllErrors.seeAllErrors.button": "完全なエラーを表示",
     "xpack.securitySolution.modalAllErrors.title": "ビジュアライゼーションにエラーがあります",
     "xpack.securitySolution.navigation.administration": "管理",
     "xpack.securitySolution.navigation.administration.policies": "ポリシー",
     "xpack.securitySolution.navigation.alerts": "アラート",
+    "xpack.securitySolution.navigation.blocklist": "ブロックリスト",
     "xpack.securitySolution.navigation.case": "ケース",
     "xpack.securitySolution.navigation.detect": "検知",
+    "xpack.securitySolution.navigation.detectionResponse": "検出と対応",
     "xpack.securitySolution.navigation.exceptions": "例外リスト",
     "xpack.securitySolution.navigation.explore": "探索",
+    "xpack.securitySolution.navigation.gettingStarted": "はじめて使う",
     "xpack.securitySolution.navigation.hosts": "ホスト",
     "xpack.securitySolution.navigation.investigate": "調査",
     "xpack.securitySolution.navigation.mainLabel": "セキュリティ",
@@ -24770,6 +26271,7 @@
     "xpack.securitySolution.navigation.overview": "概要",
     "xpack.securitySolution.navigation.rules": "ルール",
     "xpack.securitySolution.navigation.timelines": "タイムライン",
+    "xpack.securitySolution.navigation.users": "ユーザー",
     "xpack.securitySolution.network.dns.stackByUniqueSubdomain": "{groupByField}別トップドメイン",
     "xpack.securitySolution.network.ipDetails.ipOverview.asDestinationDropDownOptionLabel": "送信先として",
     "xpack.securitySolution.network.ipDetails.ipOverview.asSourceDropDownOptionLabel": "送信元として",
@@ -24988,6 +26490,16 @@
     "xpack.securitySolution.overview.hostStatGroupFilebeat": "Filebeat",
     "xpack.securitySolution.overview.hostStatGroupWinlogbeat": "Winlogbeat",
     "xpack.securitySolution.overview.hostsTitle": "ホストイベント",
+    "xpack.securitySolution.overview.landingCards.box.endpoint.desc": "防御から収集、検知、対応まで実行する、Elastic Agent",
+    "xpack.securitySolution.overview.landingCards.box.endpoint.title": "大規模なEndpoint Security",
+    "xpack.securitySolution.overview.landingCards.box.siem.cta": "セキュリティ統合を追加",
+    "xpack.securitySolution.overview.landingCards.box.siem.desc": "クラウドのスピードと規模を活かすElasticセキュリティで、脅威の防御、検知、対応まで完結させましょう。一元的でオープンなプラットフォーム1つで、事業経営を安全に維持できます。",
+    "xpack.securitySolution.overview.landingCards.box.siem.header": "Elasticセキュリティ",
+    "xpack.securitySolution.overview.landingCards.box.siem.title": "セキュリティも、Elasticの速さで",
+    "xpack.securitySolution.overview.landingCards.box.siemCard.desc": "進化する脅威を検知、調査、対応する",
+    "xpack.securitySolution.overview.landingCards.box.siemCard.title": "最先端を行くSOCのSIEM",
+    "xpack.securitySolution.overview.landingCards.box.unify.desc": "Elasticセキュリティは数年分に及ぶデータの分析を可能にするほか、主要プロセスを自動化し、ネイティブなエンドポイントセキュリティを全ホストに配備して、最先端のセキュリティオペレーションを実現します。",
+    "xpack.securitySolution.overview.landingCards.box.unify.title": "SIEM、エンドポイントセキュリティ、クラウドセキュリティを一体化",
     "xpack.securitySolution.overview.networkAction": "ネットワークを表示",
     "xpack.securitySolution.overview.networkStatGroupAuditbeat": "Auditbeat",
     "xpack.securitySolution.overview.networkStatGroupFilebeat": "Filebeat",
@@ -25028,13 +26540,28 @@
     "xpack.securitySolution.pages.common.emptyActionSecondary": "入門ガイドを表示します。",
     "xpack.securitySolution.pages.common.solutionName": "セキュリティ",
     "xpack.securitySolution.pages.common.updateAlertStatusFailed": "{ conflicts } {conflicts, plural, other  {アラート}}を更新できませんでした。",
-    "xpack.securitySolution.pages.common.updateAlertStatusFailedDetailed": "{ updated } {updated, plural, other  {アラート}}が正常に更新されましたが、{ conflicts }は更新できませんでした。\n         { conflicts, plural, other  {}}すでに修正されています。",
+    "xpack.securitySolution.pages.common.updateAlertStatusFailedDetailed": "{ updated } {updated, plural, other  {アラート}}が正常に更新されましたが、{ conflicts }は更新できませんでした。\n         { conflicts, plural, other {}}すでに修正されています。",
     "xpack.securitySolution.pages.fourohfour.pageNotFoundDescription": "ページが見つかりません",
     "xpack.securitySolution.paginatedTable.rowsButtonLabel": "ページごとの行数",
     "xpack.securitySolution.paginatedTable.showingSubtitle": "表示中",
     "xpack.securitySolution.paginatedTable.tooManyResultsToastText": "クエリ範囲を縮めて結果をさらにフィルタリングしてください",
     "xpack.securitySolution.paginatedTable.tooManyResultsToastTitle": " - 結果が多すぎます",
     "xpack.securitySolution.policiesTab": "ポリシー",
+    "xpack.securitySolution.policy.backToPolicyList": "ポリシーリストに戻る",
+    "xpack.securitySolution.policy.list.createdAt": "作成日",
+    "xpack.securitySolution.policy.list.createdBy": "作成者",
+    "xpack.securitySolution.policy.list.endpoints": "エンドポイント",
+    "xpack.securitySolution.policy.list.errorMessage": "ポリシーリストの取得エラー",
+    "xpack.securitySolution.policy.list.lastUpdatedBy": "最終更新者",
+    "xpack.securitySolution.policy.list.name": "名前",
+    "xpack.securitySolution.policy.list.subtitle": "エンドポイントを使用して、エンドポイントセキュリティ保護と他の構成をカスタマイズ",
+    "xpack.securitySolution.policy.list.title": "ポリシーリスト",
+    "xpack.securitySolution.policy.list.totalCount": "{totalItemCount, plural, other {#個のポリシー}}を表示しています",
+    "xpack.securitySolution.policy.list.updatedAt": "最終更新",
+    "xpack.securitySolution.policyDetails.backToEndpointList": "すべてのエンドポイントを表示",
+    "xpack.securitySolution.policyDetails.backToPolicyButton": "ポリシーリストに戻る",
+    "xpack.securitySolution.policyList.endpointCountError": "エンドポイント数の取得エラー",
+    "xpack.securitySolution.policyList.packageVersionError": "エンドポイントパッケージバージョンの取得エラー",
     "xpack.securitySolution.policyStatusText.failure": "失敗",
     "xpack.securitySolution.policyStatusText.success": "成功",
     "xpack.securitySolution.policyStatusText.unsupported": "サポートされていない",
@@ -25117,19 +26644,23 @@
     "xpack.securitySolution.rowRenderer.wasPreventedFromExecutingAMaliciousProcessDescription": "悪意のあるファイルの実行が防止されました",
     "xpack.securitySolution.rowRenderer.wasPreventedFromModifyingAMaliciousFileDescription": "悪意のあるファイルの修正が防止されました",
     "xpack.securitySolution.rowRenderer.wasPreventedFromRenamingAMaliciousFileDescription": "悪意のあるファイルの名前変更が防止されました",
+    "xpack.securitySolution.rules.badge.readOnly.tooltip": "ルールを作成、編集、削除できません",
     "xpack.securitySolution.search.administration.endpoints": "エンドポイント",
     "xpack.securitySolution.search.administration.eventFilters": "イベントフィルター",
     "xpack.securitySolution.search.administration.hostIsolationExceptions": "ホスト分離例外",
     "xpack.securitySolution.search.administration.trustedApps": "信頼できるアプリケーション",
     "xpack.securitySolution.search.alerts": "アラート",
     "xpack.securitySolution.search.detect": "検知",
+    "xpack.securitySolution.search.detectionAndResponse": "検出と対応",
     "xpack.securitySolution.search.exceptions": "例外リスト",
     "xpack.securitySolution.search.explore": "探索",
+    "xpack.securitySolution.search.getStarted": "はじめて使う",
     "xpack.securitySolution.search.hosts": "ホスト",
     "xpack.securitySolution.search.hosts.anomalies": "異常",
     "xpack.securitySolution.search.hosts.authentications": "認証",
     "xpack.securitySolution.search.hosts.events": "イベント",
     "xpack.securitySolution.search.hosts.externalAlerts": "外部アラート",
+    "xpack.securitySolution.search.hosts.sessions": "セッション",
     "xpack.securitySolution.search.hosts.uncommonProcesses": "非共通プロセス",
     "xpack.securitySolution.search.investigate": "調査",
     "xpack.securitySolution.search.manage": "管理",
@@ -25142,6 +26673,16 @@
     "xpack.securitySolution.search.rules": "ルール",
     "xpack.securitySolution.search.timeline.templates": "テンプレート",
     "xpack.securitySolution.search.timelines": "タイムライン",
+    "xpack.securitySolution.search.users": "ユーザー",
+    "xpack.securitySolution.search.users.anomalies": "異常",
+    "xpack.securitySolution.search.users.authentications": "認証",
+    "xpack.securitySolution.search.users.events": "イベント",
+    "xpack.securitySolution.search.users.externalAlerts": "外部アラート",
+    "xpack.securitySolution.search.users.risk": "リスク",
+    "xpack.securitySolution.searchStrategy.error": "検索を実行できませんでした：{factoryQueryType}",
+    "xpack.securitySolution.sessionsView.singleCountOfSessions": "セッション",
+    "xpack.securitySolution.sessionsView.totalCountOfSessions": "セッション",
+    "xpack.securitySolution.some_page.flyoutCreateSubmitSuccess": "\"{name}\"が追加されました。",
     "xpack.securitySolution.source.destination.packetsLabel": "パケット",
     "xpack.securitySolution.sourcerer.disabled": "データビューの更新を有効にするには、ページを再読み込みする必要があります。",
     "xpack.securitySolution.sourcerer.error.title": "セキュリティデータビューの更新エラー",
@@ -25154,6 +26695,7 @@
     "xpack.securitySolution.stepDefineRule.lastWeek": "先週",
     "xpack.securitySolution.stepDefineRule.previewQueryAriaLabel": "クエリプレビュータイムフレーム選択",
     "xpack.securitySolution.stepDefineRule.previewQueryButton": "結果を表示",
+    "xpack.securitySolution.stepDefineRule.previewTimeoutWarning": "プレビューは60秒後にタイムアウトしました",
     "xpack.securitySolution.system.acceptedAConnectionViaDescription": "次の手段で接続を受け付けました。",
     "xpack.securitySolution.system.acceptedDescription": "以下を経由してユーザーを受け入れました。",
     "xpack.securitySolution.system.attemptedLoginDescription": "以下を経由してログインを試行しました：",
@@ -25220,6 +26762,7 @@
     "xpack.securitySolution.timeline.body.copyToClipboardButtonLabel": "クリップボードにコピー",
     "xpack.securitySolution.timeline.body.notes.addOrViewNotesForThisEventTooltip": "このイベントのメモを追加します",
     "xpack.securitySolution.timeline.body.notes.disableEventTooltip": "テンプレートタイムラインの編集中には、メモが追加されない場合があります",
+    "xpack.securitySolution.timeline.body.openSessionViewLabel": "セッションビューを開く",
     "xpack.securitySolution.timeline.body.pinning.disablePinnnedTooltip": "テンプレートタイムラインの編集中には、このイベントがピン留めされない場合があります",
     "xpack.securitySolution.timeline.body.pinning.pinnedTooltip": "ピン付けされたイベント",
     "xpack.securitySolution.timeline.body.pinning.pinnnedWithNotesTooltip": "イベントにメモがあり、ピンを外すことができません",
@@ -25286,6 +26829,7 @@
     "xpack.securitySolution.timeline.flyoutTimelineTemplateLabel": "タイムラインテンプレート",
     "xpack.securitySolution.timeline.fullScreenButton": "全画面",
     "xpack.securitySolution.timeline.graphOverlay.closeAnalyzerButton": "アナライザーを閉じる",
+    "xpack.securitySolution.timeline.graphOverlay.closeSessionButton": "セッションの終了",
     "xpack.securitySolution.timeline.hideColumnLabel": "列を非表示",
     "xpack.securitySolution.timeline.kpiFailDescription": "エラーが発生しました",
     "xpack.securitySolution.timeline.kpiFailSearchDescription": "KPIの読み込みに失敗",
@@ -25368,6 +26912,8 @@
     "xpack.securitySolution.timeline.sidePanel.networkDetails.close": "閉じる",
     "xpack.securitySolution.timeline.sidePanel.networkDetails.networkDetailsPageLink": "詳細ページを表示",
     "xpack.securitySolution.timeline.sidePanel.networkDetails.title": "ネットワーク詳細",
+    "xpack.securitySolution.timeline.sidePanel.networkDetails.userDetails": "詳細ページを表示",
+    "xpack.securitySolution.timeline.sidePanel.userDetails.title": "ユーザー詳細",
     "xpack.securitySolution.timeline.sortAZLabel": "A-Zの昇順で並べ替え",
     "xpack.securitySolution.timeline.sortFieldsButton": "フィールドの並べ替え",
     "xpack.securitySolution.timeline.sortZALabel": "ZｰAの降順で並べ替え",
@@ -25377,6 +26923,7 @@
     "xpack.securitySolution.timeline.tabs.notesTabTimelineTitle": "メモ",
     "xpack.securitySolution.timeline.tabs.pinnedTabTimelineTitle": "ピン付け済み",
     "xpack.securitySolution.timeline.tabs.queyTabTimelineTitle": "クエリ",
+    "xpack.securitySolution.timeline.tabs.sessionTabTimelineTitle": "セッションビュー",
     "xpack.securitySolution.timeline.tcp": "TCP",
     "xpack.securitySolution.timeline.toggleEventDetailsTitle": "イベントの詳細を展開",
     "xpack.securitySolution.timeline.typeTooltip": "型",
@@ -25403,6 +26950,8 @@
     "xpack.securitySolution.timelines.pageTitle": "タイムライン",
     "xpack.securitySolution.timelines.updateTimelineErrorText": "問題が発生しました",
     "xpack.securitySolution.timelines.updateTimelineErrorTitle": "タイムラインエラー",
+    "xpack.securitySolution.toggleQuery.off": "終了",
+    "xpack.securitySolution.toggleQuery.on": "開く",
     "xpack.securitySolution.topN.alertEventsSelectLabel": "検出アラート",
     "xpack.securitySolution.topN.allEventsSelectLabel": "すべてのイベント",
     "xpack.securitySolution.topN.closeButtonLabel": "閉じる",
@@ -25411,8 +26960,6 @@
     "xpack.securitySolution.trustedApps.assignmentSectionDescription": "すべてのポリシーでグローバルにこの信頼できるアプリケーションを割り当てるか、特定のポリシーに割り当てます。",
     "xpack.securitySolution.trustedapps.card.operator.is": "is",
     "xpack.securitySolution.trustedapps.card.operator.matches": "一致",
-    "xpack.securitySolution.trustedApps.conditionsSectionDescription": "オペレーティングシステムを選択して、条件を追加します。条件の可用性は選択したOSによって異なる場合があります。",
-    "xpack.securitySolution.trustedApps.conditionsSectionTitle": "条件",
     "xpack.securitySolution.trustedapps.create.conditionFieldDegradedPerformanceMsg": "[{row}] ファイル名のワイルドカードはエンドポイントのパフォーマンスに影響します",
     "xpack.securitySolution.trustedapps.create.conditionFieldDuplicatedMsg": "{field}を複数回追加できません",
     "xpack.securitySolution.trustedapps.create.conditionFieldInvalidHashMsg": "[{row}] 無効なハッシュ値",
@@ -25420,39 +26967,9 @@
     "xpack.securitySolution.trustedapps.create.conditionFieldValueRequiredMsg": "[{row}] フィールドエントリには値が必要です",
     "xpack.securitySolution.trustedapps.create.conditionRequiredMsg": "1つ以上のフィールド定義が必要です",
     "xpack.securitySolution.trustedapps.create.description": "説明",
-    "xpack.securitySolution.trustedapps.create.name": "信頼できるアプリケーションに名前を付ける",
     "xpack.securitySolution.trustedapps.create.nameRequiredMsg": "名前が必要です",
-    "xpack.securitySolution.trustedapps.create.os": "オペレーティングシステムを選択",
     "xpack.securitySolution.trustedapps.create.osRequiredMsg": "オペレーティングシステムは必須です",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.cancelButton": "キャンセル",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.createSaveButton": "信頼できるアプリケーションを追加",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.createTitle": "信頼できるアプリケーションを追加",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.editSaveButton": "保存",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.editTitle": "信頼できるアプリケーションを編集",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseMessage": "Kibanaライセンスがダウングレードされました。今後のポリシー構成はグローバルにすべてのポリシーに割り当てられます。詳細はご覧ください。 ",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseTitle": "失効したライセンス",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.notFoundToastMessage": "信頼できるアプリケーションを編集できません（{apiMsg}）",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.successToastTitle": "\"{name}\"は信頼できるアプリケーションリストに追加されました。",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.updateSuccessToastTitle": "\"{name}\"が更新されました。",
-    "xpack.securitySolution.trustedapps.creationSuccess.title": "成功！",
-    "xpack.securitySolution.trustedapps.deletionDialog.calloutMessage": "このエントリを削除すると、{count}個の関連付けられた{count, plural, other  {ポリシー}}から削除されます。",
-    "xpack.securitySolution.trustedapps.deletionDialog.calloutTitle": "警告",
-    "xpack.securitySolution.trustedapps.deletionDialog.cancelButton": "キャンセル",
-    "xpack.securitySolution.trustedapps.deletionDialog.confirmButton": "削除",
-    "xpack.securitySolution.trustedapps.deletionDialog.subMessage": "この操作は元に戻すことができません。続行していいですか？",
-    "xpack.securitySolution.trustedapps.deletionDialog.title": "\"{name}\"を削除",
-    "xpack.securitySolution.trustedapps.deletionError.text": "信頼できるアプリケーションリストから\"{name}\"を削除できません。理由：{message}",
-    "xpack.securitySolution.trustedapps.deletionError.title": "削除失敗",
-    "xpack.securitySolution.trustedapps.deletionSuccess.text": "\"{name}\"は信頼できるアプリケーションリストから削除されました。",
-    "xpack.securitySolution.trustedapps.deletionSuccess.title": "正常に削除されました",
-    "xpack.securitySolution.trustedApps.detailsSectionTitle": "詳細",
-    "xpack.securitySolution.trustedapps.docsLink": "信頼できるアプリケーションドキュメント。",
-    "xpack.securitySolution.trustedapps.grid.cardAction.delete": "信頼できるアプリケーションを削除",
-    "xpack.securitySolution.trustedapps.grid.cardAction.edit": "信頼できるアプリケーションを編集",
-    "xpack.securitySolution.trustedapps.grid.policyDetailsLinkBackLabel": "信頼できるアプリケーションに戻る",
     "xpack.securitySolution.trustedapps.list.addButton": "信頼できるアプリケーションを追加",
-    "xpack.securitySolution.trustedapps.list.pageTitle": "信頼できるアプリケーション",
-    "xpack.securitySolution.trustedapps.list.search.placeholder": "次のフィールドで検索：名前、説明、値",
     "xpack.securitySolution.trustedapps.listEmptyState.message": "パフォーマンスを改善したり、ホストで実行されている他のアプリケーションとの競合を解消したりするには、信頼できるアプリケーションを追加します。",
     "xpack.securitySolution.trustedapps.listEmptyState.title": "最初の信頼できるアプリケーションを追加",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.description.hash": "md5、sha1、sha256",
@@ -25464,14 +26981,9 @@
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.removeLabel": "エントリを削除",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.group.andOperator": "AND",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.noEntries": "条件が定義されていません",
-    "xpack.securitySolution.trustedapps.middleware.editIdMissing": "IDが指定されていません",
     "xpack.securitySolution.trustedapps.trustedapp.entry.field": "フィールド",
     "xpack.securitySolution.trustedapps.trustedapp.entry.operator": "演算子",
     "xpack.securitySolution.trustedapps.trustedapp.entry.value": "値",
-    "xpack.securitySolution.trustedapps.updateSuccess.title": "成功！",
-    "xpack.securitySolution.trustedapps.view.toggle.grid": "グリッドビュー",
-    "xpack.securitySolution.trustedapps.view.toggle.list": "リストビュー",
-    "xpack.securitySolution.trustedapps.viewTypeToggle.controlLegend": "ビュータイプ",
     "xpack.securitySolution.trustedAppsTab": "信頼できるアプリケーション",
     "xpack.securitySolution.uiSettings.defaultAnomalyScoreDescription": "<p>機械学習ジョブの異常がこの値を超えると、セキュリティアプリに表示されます。</p><p>有効な値：0 ～ 100。</p>",
     "xpack.securitySolution.uiSettings.defaultAnomalyScoreLabel": "デフォルトの異常しきい値",
@@ -25483,6 +26995,8 @@
     "xpack.securitySolution.uiSettings.defaultThreatIndexLabel": "脅威インデックス",
     "xpack.securitySolution.uiSettings.defaultTimeRangeDescription": "<p>セキュリティ時間フィルダーのデフォルトの期間です。</p>",
     "xpack.securitySolution.uiSettings.defaultTimeRangeLabel": "時間フィルターの期間",
+    "xpack.securitySolution.uiSettings.enableCcsReadWarningLabel": "CCSルール権限警告",
+    "xpack.securitySolution.uiSettings.enableCcsWarningDescription": "<p>CCSインデックスのルールで権限チェック警告を有効にします</p>",
     "xpack.securitySolution.uiSettings.enableNewsFeedDescription": "<p>ニュースフィードを有効にします</p>",
     "xpack.securitySolution.uiSettings.enableNewsFeedLabel": "ニュースフィード",
     "xpack.securitySolution.uiSettings.ipReputationLinks": "IP 評判リンク",
@@ -25501,6 +27015,49 @@
     "xpack.securitySolution.uncommonProcessTable.numberOfInstances": "インスタンス",
     "xpack.securitySolution.uncommonProcessTable.rows": "{numRows} {numRows, plural, other  {行}}",
     "xpack.securitySolution.uncommonProcessTable.unit": "{totalCount, plural, other  {プロセス}}",
+    "xpack.securitySolution.user.details.overview.familyTitle": "ファミリー",
+    "xpack.securitySolution.user.details.overview.inspectTitle": "ユーザー概要",
+    "xpack.securitySolution.user.details.overview.ipAddressesTitle": "IP アドレス",
+    "xpack.securitySolution.user.details.overview.maxAnomalyScoreByJobTitle": "ジョブ別の最高異常スコア",
+    "xpack.securitySolution.user.details.overview.osTitle": "オペレーティングシステム",
+    "xpack.securitySolution.user.details.overview.userDomainTitle": "ドメイン",
+    "xpack.securitySolution.user.details.overview.userIdTitle": "ユーザーID",
+    "xpack.securitySolution.user.details.overview.userRiskClassification": "ユーザーリスク分類",
+    "xpack.securitySolution.user.details.overview.userRiskScoreTitle": "ユーザーリスクスコア",
+    "xpack.securitySolution.user.ipDetails.ipOverview.lastSeenTitle": "前回の認識",
+    "xpack.securitySolution.userDetails.errorSearchDescription": "ユーザー詳細検索でエラーが発生しました",
+    "xpack.securitySolution.userDetails.failSearchDescription": "ユーザー詳細で検索を実行できませんでした",
+    "xpack.securitySolution.users.navigation.alertsTitle": "外部アラート",
+    "xpack.securitySolution.users.navigation.allUsersTitle": "すべてのユーザー",
+    "xpack.securitySolution.users.navigation.anomaliesTitle": "異常",
+    "xpack.securitySolution.users.navigation.authenticationsTitle": "認証",
+    "xpack.securitySolution.users.navigation.eventsTitle": "イベント",
+    "xpack.securitySolution.users.navigation.riskTitle": "リスク別ユーザー",
+    "xpack.securitySolution.users.pageTitle": "ユーザー",
+    "xpack.securitySolution.usersRiskTable.filteredUsersTitle": "{severity}リスクのユーザーを表示",
+    "xpack.securitySolution.usersRiskTable.riskTitle": "ユーザーリスク分類",
+    "xpack.securitySolution.usersRiskTable.userNameTitle": "ユーザー名",
+    "xpack.securitySolution.usersRiskTable.userRiskScoreTitle": "ユーザーリスクスコア",
+    "xpack.securitySolution.usersRiskTable.userRiskToolTip": "ユーザーリスク分類はユーザーリスクスコアで決まります。「重大」または「高」に分類されたユーザーはリスクが高いことが示されます。",
+    "xpack.securitySolution.usersTable.domainTitle": "ドメイン",
+    "xpack.securitySolution.usersTable.lastSeenTitle": "前回の認識",
+    "xpack.securitySolution.usersTable.rows": "{numRows} {numRows, plural, other  {行}}",
+    "xpack.securitySolution.usersTable.title": "ユーザー",
+    "xpack.securitySolution.usersTable.unit": "{totalCount, plural, other  {ユーザー}}",
+    "xpack.securitySolution.usersTable.userNameTitle": "ユーザー名",
+    "xpack.securitySolution.userTab.errorFetchingsData": "ユーザーデータをクエリできませんでした",
+    "xpack.securitySolution.visualizationActions.addToCaseSuccessContent": "ビジュアライゼーションが正常にケースに追加されました",
+    "xpack.securitySolution.visualizationActions.addToExistingCase": "既存のケースに追加",
+    "xpack.securitySolution.visualizationActions.addToNewCase": "新しいケースに追加",
+    "xpack.securitySolution.visualizationActions.inspect": "検査",
+    "xpack.securitySolution.visualizationActions.moreActions": "さらにアクションを表示",
+    "xpack.securitySolution.visualizationActions.openInLens": "Lensで開く",
+    "xpack.securitySolution.visualizationActions.uniqueIps.destinationChartLabel": "Dest.",
+    "xpack.securitySolution.visualizationActions.uniqueIps.sourceChartLabel": "Src.",
+    "xpack.securitySolution.visualizationActions.userAuthentications.failChartLabel": "失敗",
+    "xpack.securitySolution.visualizationActions.userAuthentications.failUnitLabel": "失敗",
+    "xpack.securitySolution.visualizationActions.userAuthentications.successChartLabel": "成功",
+    "xpack.securitySolution.visualizationActions.userAuthentications.successUnitLabel": "成功",
     "xpack.securitySolution.zeek.othDescription": "SYNが検出されません。ミッドストリームトラフィックのみです",
     "xpack.securitySolution.zeek.rejDescription": "接続試行が拒否されました",
     "xpack.securitySolution.zeek.rstoODescription": "接続が確立され、接続元が中断しました（RSTを送信）",
@@ -25514,6 +27071,43 @@
     "xpack.securitySolution.zeek.sfDescription": "通常のSYN/FIN完了",
     "xpack.securitySolution.zeek.shDescription": "接続元がFINに続きSYNを送信しました。レスポンダーからSYN-ACKはありません",
     "xpack.securitySolution.zeek.shrDescription": "レスポンダーがFINに続きSYNを送信しました。接続元からSYN-ACKはありません",
+    "xpack.sessionView.alert": "アラート",
+    "xpack.sessionView.alertDetailsTab.groupView": "グループビュー",
+    "xpack.sessionView.alertDetailsTab.listView": "リストビュー",
+    "xpack.sessionView.alertDetailsTab.toggleViewMode": "表示モードを切り替える",
+    "xpack.sessionView.alerts": "アラート",
+    "xpack.sessionView.backToInvestigatedAlert": "調査されたアラートに戻る",
+    "xpack.sessionView.buttonOpenDetailPanel": "詳細パネル",
+    "xpack.sessionView.childProcesses": "子プロセス",
+    "xpack.sessionView.detailPanel.entryLeaderTooltip": "初期ターミナル、またはSSH、SSM、その他のリモートアクセスプロトコル経由でのリモートアクセスに関連付けられたセッションリーダープロセス。エントリセッションは、初期プロセスで直接開始されたサービスを表示するためにも使用されます。多くの場合、これはsession_leaderと同じです。",
+    "xpack.sessionView.detailPanel.processGroupLeaderTooltip": "現在のプロセスへのプロセスグループリーダー。",
+    "xpack.sessionView.detailPanel.processParentTooltip": "現在のプロセスの直接の親。",
+    "xpack.sessionView.detailPanel.sessionLeaderTooltip": "多くの場合、entry_leaderと同じです。異なるときには、別のセッション内で開始したセッションを表します。tmuxやscreenなどの一部のツールは新しいセッションを開始して、新しいttyを取得したり、エントリセッションからライフサイクルを分離したりします。",
+    "xpack.sessionView.detailPanelAlertListItem.investigatedLabel": "調査されたアラーと",
+    "xpack.sessionView.detailPanelAlertListItem.jumpToAlert": "アラートが発行されたプロセスに移動",
+    "xpack.sessionView.detailPanelAlertListItem.moreButton": "詳細",
+    "xpack.sessionView.detailPanelAlertListItem.showDetailsAction": "アラート詳細を表示",
+    "xpack.sessionView.detailPanelAlertsEmptyMsg": "このセッションで作成されたアラートはありません。",
+    "xpack.sessionView.detailPanelAlertsEmptyTitle": "アラートなし",
+    "xpack.sessionView.detailPanelCopy.copyButton": "コピー",
+    "xpack.sessionView.detailsPanel.alerts": "アラート",
+    "xpack.sessionView.detailsPanel.host": "ホスト",
+    "xpack.sessionView.detailsPanel.process": "プロセス",
+    "xpack.sessionView.emptyDataMessage": "このクエリのプロセスイベントが見つかりません。",
+    "xpack.sessionView.emptyDataTitle": "表示するデータがありません",
+    "xpack.sessionView.errorHeading": "セッションビューの読み込みエラー",
+    "xpack.sessionView.errorMessage": "セッションビューの読み込みエラーが発生しました。",
+    "xpack.sessionView.execUserChange": "実行ユーザー変更：",
+    "xpack.sessionView.loadingProcessTree": "セッションを読み込んでいます...",
+    "xpack.sessionView.processNode.tooltipExec": "プロセスが実行されました",
+    "xpack.sessionView.processNode.tooltipFork": "プロセスがフォークされました（実行なし）",
+    "xpack.sessionView.processNode.tooltipOrphan": "親がないプロセス（オーファン）",
+    "xpack.sessionView.searchBar.searchBarKeyPlaceholder": "検索...",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsTimestamp": "タイムスタンプ",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsVerbosemode": "詳細モード",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsVerboseModeTooltips": "詳細モードでは、シェル起動、シェル完了、組み込みコマンドによるフォークといった、セッションで作成されたすべてのプロセスが表示されます。",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleTitle": "表示オプション",
+    "xpack.sessionView.startedBy": "開始方法",
     "xpack.snapshotRestore.addPolicy.breadcrumbTitle": "ポリシーを追加",
     "xpack.snapshotRestore.addPolicy.loadingIndicesDescription": "利用可能なインデックスを読み込み中…",
     "xpack.snapshotRestore.addPolicy.LoadingIndicesErrorMessage": "利用可能なインデックスを読み込み中にエラーが発生",
@@ -26441,6 +28035,7 @@
     "xpack.spaces.shareToSpace.allSpacesTarget": "すべてのスペース",
     "xpack.spaces.shareToSpace.cancelButton": "キャンセル",
     "xpack.spaces.shareToSpace.continueButton": "続行",
+    "xpack.spaces.shareToSpace.currentSpaceBadge": "このスペース",
     "xpack.spaces.shareToSpace.featureIsDisabledTooltip": "この機能はこのスペースでは無効です。",
     "xpack.spaces.shareToSpace.flyoutTitle": "{objectNoun}をスペースに割り当てる",
     "xpack.spaces.shareToSpace.noAvailableSpaces.canCreateNewSpace.linkText": "新しいスペースを作成",
@@ -26455,6 +28050,7 @@
     "xpack.spaces.shareToSpace.saveButton": "保存して閉じる",
     "xpack.spaces.shareToSpace.shareErrorTitle": "{objectNoun}の更新エラー",
     "xpack.spaces.shareToSpace.shareModeControl.buttonGroupLegend": "この共有方法を選択",
+    "xpack.spaces.shareToSpace.shareModeControl.selectedCountLabel": "{selectedCount}/{totalCount}個が選択されました",
     "xpack.spaces.shareToSpace.shareModeControl.selectSpacesLabel": "スペースを選択",
     "xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.buttonLabel": "すべてのスペース",
     "xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.cannotChangeTooltip": "このオプションを変更するには、追加権限が必要です。",
@@ -26471,15 +28067,17 @@
     "xpack.spaces.shareToSpace.spacesLoadErrorTitle": "利用可能なスペースを読み込み中にエラーが発生",
     "xpack.spaces.shareToSpace.spacesTarget": "{spacesCount, plural, other  {# 個のスペース}}",
     "xpack.spaces.shareToSpace.unknownSpacesLabel.additionalPrivilegesLink": "追加権限",
+    "xpack.spaces.shareToSpace.unknownSpacesLabel.text": "{hiddenCount}個の非表示のスペースを表示するには、{additionalPrivilegesLink}が必要です。",
     "xpack.spaces.spaceList.allSpacesLabel": "*すべてのスペース",
     "xpack.spaces.spaceList.showLessSpacesLink": "縮小表示",
     "xpack.spaces.spaceList.showMoreSpacesLink": "他 {count} 件",
     "xpack.spaces.spaceList.unauthorizedSpacesCountLabel": "これらのスペースを表示するアクセス権がありません。",
     "xpack.spaces.spaceSelector.appTitle": "スペースを選択",
-    "xpack.spaces.spaceSelector.changeSpaceAnytimeAvailabilityText": "スペースはいつでも変更できます",
+    "xpack.spaces.spaceSelector.changeSpaceAnytimeAvailabilityText": "スペースはいつでも変更できます。",
     "xpack.spaces.spaceSelector.contactSysAdminDescription": "システム管理者にお問い合わせください。",
     "xpack.spaces.spaceSelector.errorLoadingSpacesDescription": "スペースの読み込みエラー（{message}）",
     "xpack.spaces.spaceSelector.findSpacePlaceholder": "スペースを検索",
+    "xpack.spaces.spaceSelector.noSpacesMatchSearchCriteriaDescription": "{searchTerm}に一致するスペースがありません",
     "xpack.spaces.spaceSelector.selectSpacesTitle": "スペースの選択",
     "xpack.spaces.spacesTitle": "スペース",
     "xpack.spaces.uiApi.errorBoundaryToastMessage": "続行するにはページを再読み込みしてください。",
@@ -26513,8 +28111,9 @@
     "xpack.stackAlerts.esQuery.missingEsQueryErrorMessage": "[esQuery]：「query」を含む必要があります",
     "xpack.stackAlerts.esQuery.ui.alertParams.fixErrorInExpressionBelowValidationMessage": "下の表現のエラーを修正してください。",
     "xpack.stackAlerts.esQuery.ui.alertType.defaultActionMessage": "Elasticsearchクエリアラート'\\{\\{alertName\\}\\}'が有効です。\n\n- 値：\\{\\{context.value\\}\\}\n- 満たされた条件：\\{\\{context.conditions\\}\\} over \\{\\{params.timeWindowSize\\}\\}\\{\\{params.timeWindowUnit\\}\\}\n- タイムスタンプ：\\{\\{context.date\\}\\}",
-    "xpack.stackAlerts.esQuery.ui.alertType.descriptionText": "Elasticsearchクエリと一致したときにアラートを発行します。",
+    "xpack.stackAlerts.esQuery.ui.alertType.descriptionText": "前回のクエリ実行中に一致が見つかったときにアラートを発行します。",
     "xpack.stackAlerts.esQuery.ui.conditionPrompt": "一致数",
+    "xpack.stackAlerts.esQuery.ui.conditionPrompt.toolTip": "以下で定義された時間枠は最初のルールチェックにのみ適用されます。",
     "xpack.stackAlerts.esQuery.ui.numQueryMatchesText": "前回の{window}でクエリが{count}個のドキュメントと一致しました。",
     "xpack.stackAlerts.esQuery.ui.queryEditor": "Elasticsearchクエリエディター",
     "xpack.stackAlerts.esQuery.ui.queryError": "クエリのテストエラー：{message}",
@@ -26589,6 +28188,8 @@
     "xpack.stackAlerts.indexThreshold.actionVariableContextValueLabel": "しきい値を超えた値。",
     "xpack.stackAlerts.indexThreshold.alertTypeContextMessageDescription": "グループ「{group}」のアラート「{name}」はアクティブです。\n\n- 値：{value}\n- 条件が満たされました：{window} の {conditions}\n- タイムスタンプ：{date}",
     "xpack.stackAlerts.indexThreshold.alertTypeContextSubjectTitle": "アラート {name} グループ {group} がしきい値に達しました",
+    "xpack.stackAlerts.indexThreshold.alertTypeRecoveryContextMessageDescription": "グループ'{group}'のアラート'{name}'が回復されました。\n\n- 値：{value}\n- 条件が満たされました：{window} の {conditions}\n- タイムスタンプ：{date}",
+    "xpack.stackAlerts.indexThreshold.alertTypeRecoveryContextSubjectTitle": "アラート{name}グループ{group}が回復されました",
     "xpack.stackAlerts.indexThreshold.alertTypeTitle": "インデックスしきい値",
     "xpack.stackAlerts.indexThreshold.invalidComparatorErrorMessage": "無効な thresholdComparator が指定されました：{comparator}",
     "xpack.stackAlerts.indexThreshold.invalidThreshold2ErrorMessage": "[threshold]：「{thresholdComparator}」比較子の場合には2つの要素が必要です",
@@ -26641,13 +28242,18 @@
     "xpack.timelines.fieldBrowser.descriptionLabel": "説明",
     "xpack.timelines.fieldBrowser.fieldBrowserTitle": "フィールド",
     "xpack.timelines.fieldBrowser.fieldLabel": "フィールド",
-    "xpack.timelines.fieldBrowser.fieldsCountTitle": "{totalCount} {totalCount, plural, other  {フィールド}}",
+    "xpack.timelines.fieldBrowser.fieldName": "名前",
+    "xpack.timelines.fieldBrowser.fieldsCountShowing": "表示中",
+    "xpack.timelines.fieldBrowser.fieldsCountTitle": "{totalCount, plural, other {フィールド}}",
     "xpack.timelines.fieldBrowser.fieldsTitle": "フィールド",
     "xpack.timelines.fieldBrowser.filterPlaceholder": "フィールド名",
     "xpack.timelines.fieldBrowser.noFieldsMatchInputLabel": "{searchInput} に一致するフィールドがありません",
     "xpack.timelines.fieldBrowser.noFieldsMatchLabel": "一致するフィールドがありません",
     "xpack.timelines.fieldBrowser.resetFieldsLink": "フィールドをリセット",
+    "xpack.timelines.fieldBrowser.viewAll": "すべて",
     "xpack.timelines.fieldBrowser.viewColumnCheckboxAriaLabel": "{field} 列を表示",
+    "xpack.timelines.fieldBrowser.viewLabel": "表示",
+    "xpack.timelines.fieldBrowser.viewSelected": "選択済み",
     "xpack.timelines.footer.autoRefreshActiveDescription": "自動更新アクション",
     "xpack.timelines.footer.autoRefreshActiveTooltip": "自動更新が有効な間、タイムラインはクエリに一致する最新の {numberOfItems} 件のイベントを表示します。",
     "xpack.timelines.footer.events": "イベント",
@@ -26772,13 +28378,17 @@
     "xpack.transform.alertingRuleTypes.transformHealth.name": "変換の正常性",
     "xpack.transform.alertTypes.transformHealth.alertContext.messageDescription": "アラート情報メッセージ",
     "xpack.transform.alertTypes.transformHealth.alertContext.resultsDescription": "ルール実行結果",
-    "xpack.transform.alertTypes.transformHealth.defaultActionMessage": "[\\{\\{rule.name\\}\\}] 変換正常性チェック結果：\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  変換ID：\\{\\{transform_id\\}\\}\n  \\{\\{#description\\}\\}変換の説明：\\{\\{description\\}\\}\n  \\{\\{/description\\}\\}\\{\\{#transform_state\\}\\}変換の状態：\\{\\{transform_state\\}\\}\n  \\{\\{/transform_state\\}\\}\\{\\{#failure_reason\\}\\}失敗理由：\\{\\{failure_reason\\}\\}\n  \\{\\{/failure_reason\\}\\}\\{\\{#notification_message\\}\\}通知メッセージ：\\{\\{notification_message\\}\\}\n  \\{\\{/notification_message\\}\\}\\{\\{#node_name\\}\\}ノード名：\\{\\{node_name\\}\\}\n  \\{\\{/node_name\\}\\}\\{\\{#timestamp\\}\\}Timestamp: \\{\\{timestamp\\}\\}\n  \\{\\{/timestamp\\}\\}\n\n\\{\\{/context.results\\}\\}\n",
+    "xpack.transform.alertTypes.transformHealth.defaultActionMessage": "[\\{\\{rule.name\\}\\}] 変換正常性チェック結果：\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  変換ID：\\{\\{transform_id\\}\\}\n  \\{\\{#description\\}\\}変換の説明：\\{\\{description\\}\\}\n  \\{\\{/description\\}\\}\\{\\{#transform_state\\}\\}変換の状態：\\{\\{transform_state\\}\\}\n  \\{\\{/transform_state\\}\\}\\{\\{#failure_reason\\}\\}失敗理由：\\{\\{failure_reason\\}\\}\n  \\{\\{/failure_reason\\}\\}\\{\\{#notification_message\\}\\}通知メッセージ：\\{\\{notification_message\\}\\}\n  \\{\\{/notification_message\\}\\}\\{\\{#node_name\\}\\}ノード名：\\{\\{node_name\\}\\}\n  \\{\\{/node_name\\}\\}\\{\\{#timestamp\\}\\}Timestamp: \\{\\{timestamp\\}\\}\n  \\{\\{/timestamp\\}\\}\\{\\{#errors_messages\\}\\}エラーメッセージ：\\{\\{message\\}\\} \\{\\{/errors\\}\\}\n  \\{\\{/error_messages\\}\\}\n\n\\{\\{/context.results\\}\\}\n",
+    "xpack.transform.alertTypes.transformHealth.errorMessagesCheckDescription": "変換メッセージで変換にエラーがある場合にアラートを取得します。",
+    "xpack.transform.alertTypes.transformHealth.errorMessagesCheckName": "変換メッセージのエラー",
+    "xpack.transform.alertTypes.transformHealth.errorMessagesMessage": "{count, plural, other {個の変換}} {transformsString} {count, plural, other {}}にエラーメッセージがあります。",
     "xpack.transform.alertTypes.transformHealth.excludeTransformsLabel": "変換を除外",
     "xpack.transform.alertTypes.transformHealth.includeTransforms.errorMessage": "1つ以上の変換を選択する必要があります",
     "xpack.transform.alertTypes.transformHealth.includeTransformsLabel": "変換を含む",
     "xpack.transform.alertTypes.transformHealth.notStartedCheckDescription": "変換が開始しないか、データにインデックスを作成していないときにアラートを受信します。",
     "xpack.transform.alertTypes.transformHealth.notStartedCheckName": "変換が開始していません",
-    "xpack.transform.alertTypes.transformHealth.notStartedMessage": "{count, plural, other  {変換}} {transformsString} {count, plural, other  {が}}開始していません。",
+    "xpack.transform.alertTypes.transformHealth.notStartedMessage": "{count, plural, other {個の変換}} {transformsString} {count, plural, other {}}が開始していません。",
+    "xpack.transform.alertTypes.transformHealth.testsConfigTransforms.errorMessage": "1つ以上の正常性チェックを選択する必要があります",
     "xpack.transform.alertTypes.transformHealth.testsSelection.enableTestLabel": "有効にする",
     "xpack.transform.app.checkingPrivilegesDescription": "権限を確認中…",
     "xpack.transform.app.checkingPrivilegesErrorMessage": "サーバーからユーザー特権を取得しているときにエラーが発生しました",
@@ -27490,6 +29100,28 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.userTextFieldLabel": "ユーザー名",
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.valueTextFieldLabel": "値",
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.viewHeadersSwitch": "HTTP ヘッダーを追加",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.actionTypeTitle": "xMattersデータ",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.authenticationLabel": "認証",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.basicAuthLabel": "基本認証",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.connectorSettingsFieldLabel": "開始URL",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.connectorSettingsLabel": "xMattersトリガーを設定するときに使用される認証方法を選択します。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.error.invalidUrlTextField": "URL が無効です。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.error.requiredUrlText": "URL が必要です。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.initiationUrlHelpText": "完全なxMatters URLを含めます。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.passwordTextFieldLabel": "パスワード",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.reenterBasicAuthValuesLabel": "ユーザー名とパスワードは暗号化されます。これらのフィールドの値を再入力してください。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.reenterUrlAuthValuesLabel": "URLは暗号化されています。このフィールドの値を再入力してください。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.selectMessageText": "xMattersワークフローをトリガーします。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severity": "深刻度",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectCriticalOptionLabel": "重大",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectHighOptionLabel": "高",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectLowOptionLabel": "低",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectMediumOptionLabel": "中",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectMinimalOptionLabel": "最小",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.tags": "タグ",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.urlAuthLabel": "URL認証",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.userCredsLabel": "ユーザー認証情報",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.userTextFieldLabel": "ユーザー名",
     "xpack.triggersActionsUI.components.deleteSelectedIdsErrorNotification.descriptionText": "{numErrors, number} {numErrors, plural, one {{singleTitle}} other {{multipleTitle}}}を削除できませんでした",
     "xpack.triggersActionsUI.components.deleteSelectedIdsSuccessNotification.descriptionText": "{numSuccesses, number} {numSuccesses, plural, one {{singleTitle}} other {{multipleTitle}}}を削除しました",
     "xpack.triggersActionsUI.components.emptyConnectorsPrompt.addConnectorButtonLabel": "コネクターを作成",
@@ -27535,12 +29167,14 @@
     "xpack.triggersActionsUI.home.docsLinkText": "ドキュメント",
     "xpack.triggersActionsUI.home.rulesTabTitle": "ルール",
     "xpack.triggersActionsUI.home.sectionDescription": "ルールを使用して条件を検出し、コネクターを使用してアクションを実行します。",
+    "xpack.triggersActionsUI.home.TabTitle": "アラート（内部使用のみ）",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByConfigMessageTitle": "この機能は Kibana の構成で無効になっています。",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseLinkTitle": "ライセンスオプションを表示",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseMessageDescription": "このアクションを再び有効にするには、ライセンスをアップグレードしてください。",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseMessageTitle": "この機能には {minimumLicenseRequired} ライセンスが必要です。",
     "xpack.triggersActionsUI.managementSection.displayDescription": "ルールを使用して条件を検出し、コネクターを使用してアクションを実行します。",
     "xpack.triggersActionsUI.managementSection.displayName": "ルールとコネクター",
+    "xpack.triggersActionsUI.parseInterval.errorMessage": "{value}は間隔文字列ではありません",
     "xpack.triggersActionsUI.rules.breadcrumbTitle": "ルール",
     "xpack.triggersActionsUI.sections.actionConnectorAdd.backButtonLabel": "戻る",
     "xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel": "キャンセル",
@@ -27608,6 +29242,10 @@
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredMethodText": "メソッドが必要です。",
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredPasswordText": "ユーザー名の使用時にはパスワードが必要です。",
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredUserText": "パスワードの使用時にはユーザー名が必要です。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredAuthPasswordText": "パスワードが必要です。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredAuthUserNameText": "ユーザー名が必要です。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredPasswordText": "ユーザー名の使用時にはパスワードが必要です。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredUserText": "パスワードの使用時にはユーザー名が必要です。",
     "xpack.triggersActionsUI.sections.addConnectorForm.flyoutTitle": "{actionTypeName}コネクター",
     "xpack.triggersActionsUI.sections.addConnectorForm.selectConnectorFlyoutTitle": "コネクターを選択",
     "xpack.triggersActionsUI.sections.addConnectorForm.updateErrorNotificationText": "コネクターを作成できません。",
@@ -27616,6 +29254,66 @@
     "xpack.triggersActionsUI.sections.addModalConnectorForm.flyoutTitle": "{actionTypeName}コネクター",
     "xpack.triggersActionsUI.sections.addModalConnectorForm.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.addModalConnectorForm.updateSuccessNotificationText": "「{connectorName}」を作成しました",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addBccButton": "Bcc",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton": "Cc",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.authenticationLabel": "認証",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientIdFieldLabel": "クライアントID",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientSecretTextFieldLabel": "クライアントシークレット",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.fromTextFieldLabel": "送信元",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hasAuthSwitchLabel": "このサーバーの認証が必要です",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hostTextFieldLabel": "ホスト",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel": "メッセージ",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel": "パスワード",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.portTextFieldLabel": "ポート",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientBccTextFieldLabel": "Bcc",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel": "Cc",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel": "終了：",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.secureSwitchLabel": "セキュア",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.serviceTextFieldLabel": "サービス",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel": "件名",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.tenantIdFieldLabel": "テナントID",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "ユーザー名",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseCancelButtonText": "キャンセル",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseConfirmButtonText": "変更を破棄",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseMessage": "保存されていない変更は回復できません。",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseTitle": "ルールの保存されていない変更を破棄しますか？",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveCancelButtonText": "キャンセル",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveConfirmButtonText": "ルールを保存",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveTitle": "アクションがないルールを保存しますか？",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveWithoutActionsMessage": "いつでもアクションを追加できます。",
+    "xpack.triggersActionsUI.sections.connectorAddInline.accordion.deleteIconAriaLabel": "削除",
+    "xpack.triggersActionsUI.sections.connectorAddInline.addConnectorButtonLabel": "コネクターを作成する",
+    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.actionIdLabel": "別の{connectorInstance}コネクターを使用",
+    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.addNewConnectorEmptyButton": "コネクターの追加",
+    "xpack.triggersActionsUI.sections.connectorAddInline.emptyConnectorsLabel": "{actionTypeName}コネクターがありません",
+    "xpack.triggersActionsUI.sections.connectorAddInline.newRuleActionTypeEditTitle": "{actionConnectorName}",
+    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle": "コネクターを読み込めません",
+    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle'": "コネクターを読み込めません",
+    "xpack.triggersActionsUI.sections.connectorAddInline.unauthorizedToCreateForEmptyConnectors": "許可されたユーザーのみがコネクターを構成できます。管理者にお問い合わせください。",
+    "xpack.triggersActionsUI.sections.deprecatedTitleMessage": "（非推奨）",
+    "xpack.triggersActionsUI.sections.editConnectorForm.actionTypeDescription": "{actionDescription}",
+    "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "キャンセル",
+    "xpack.triggersActionsUI.sections.editConnectorForm.descriptionText": "このコネクターは読み取り専用です。",
+    "xpack.triggersActionsUI.sections.editConnectorForm.flyoutPreconfiguredTitle": "コネクターを編集",
+    "xpack.triggersActionsUI.sections.editConnectorForm.preconfiguredHelpLabel": "あらかじめ構成されたコネクターの詳細をご覧ください。",
+    "xpack.triggersActionsUI.sections.editConnectorForm.saveAndCloseButtonLabel": "保存して閉じる",
+    "xpack.triggersActionsUI.sections.editConnectorForm.saveButtonLabel": "保存",
+    "xpack.triggersActionsUI.sections.editConnectorForm.tabText": "構成",
+    "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "コネクターを更新できません。",
+    "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "「{connectorName}」を更新しました",
+    "xpack.triggersActionsUI.sections.executionDurationChart.avgDurationLabel": "平均期間",
+    "xpack.triggersActionsUI.sections.executionDurationChart.durationLabel": "期間",
+    "xpack.triggersActionsUI.sections.executionDurationChart.executionDurationNoData": "このルールの実行がありません。",
+    "xpack.triggersActionsUI.sections.executionDurationChart.numberOfExecutionsOption": "{value}回の実行",
+    "xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTitle": "最近の実行時間",
+    "xpack.triggersActionsUI.sections.executionDurationChart.selectNumberOfExecutionDurationsLabel": "実行数を選択",
+    "xpack.triggersActionsUI.sections.isDeprecatedDescription": "このコネクターは廃止予定です。更新するか新しく作成してください。",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseCancelButtonText": "キャンセル",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseConfirmButtonText": "ライセンスの管理",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseMessage": "ルールタイプ{ruleTypeId}は無効です。{licenseRequired}ライセンスが必要です。アップグレードオプションを表示するには、［ライセンス管理］に移動してください。",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseTitle": "{licenseRequired}ライセンスが必要です",
+    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.flyoutTitle": "{connectorName}",
+    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.tooltipContent": "このコネクターはあらかじめ構成されているため、編集できません。",
     "xpack.triggersActionsUI.sections.ruleAdd.flyoutTitle": "ルールを作成",
     "xpack.triggersActionsUI.sections.ruleAdd.indexControls.timeFieldOptionLabel": "フィールドを選択",
     "xpack.triggersActionsUI.sections.ruleAdd.operationName": "作成",
@@ -27625,12 +29323,45 @@
     "xpack.triggersActionsUI.sections.ruleAddFooter.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.ruleDetails.actionWithBrokenConnectorWarningBannerEditText": "ルールを編集",
     "xpack.triggersActionsUI.sections.ruleDetails.actionWithBrokenConnectorWarningBannerTitle": "このルールに関連付けられたコネクターの1つで問題が発生しています。",
-    "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.avgDurationDescription": "平均時間",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.Alert": "アラート",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.duration": "期間",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.mute": "ミュート",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.start": "開始",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.status": "ステータス",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.ruleTypeExcessDurationMessage": "期間がルールの想定実行時間を超えています。",
     "xpack.triggersActionsUI.sections.ruleDetails.editRuleButtonLabel": "編集",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.activeAlerts": "アクティブアラート",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.apiError": "実行履歴を取得できませんでした",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.duration": "期間",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.erroredActions": "エラーのアクション",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.esSearchDuration": "ES検索期間",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.id": "Id",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.message": "メッセージ",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.newAlerts": "新しいアラート",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.recoveredAlerts": "回復されたアラート",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.scheduledActions": "スケジュールされたアクション",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.scheduleDelay": "遅延をスケジュール",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.status": "ステータス",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.succeededActions": "成功したアクション",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.timedOut": "タイムアウトしました",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.timestamp": "タイムスタンプ",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.totalSearchDuration": "合計検索期間",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.triggeredActions": "トリガーされたアクション",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogStatusFilterLabel": "ステータス",
     "xpack.triggersActionsUI.sections.ruleDetails.manageLicensePlanBannerLinkTitle": "ライセンスの管理",
     "xpack.triggersActionsUI.sections.ruleDetails.redirectObjectNoun": "ルール",
+    "xpack.triggersActionsUI.sections.ruleDetails.rule.alertsTabText": "アラート",
+    "xpack.triggersActionsUI.sections.ruleDetails.rule.eventLogTabText": "実行履歴",
+    "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.ruleLastExecutionDescription": "前回の応答",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.status.active": "アクティブ",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.status.inactive": "回復済み",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastMessage": "このルールには、構成した最小間隔を下回る間隔が設定されています。これはパフォーマンスに影響する場合があります。",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastMessageButton": "ルールを編集",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastTitle": "構成設定",
     "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRuleMessage": "ルールを読み込めません：{message}",
-    "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRulesMessage": "アラートを読み込めません：{message}",
+    "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRulesMessage": "ルールを読み込めません：{message}",
     "xpack.triggersActionsUI.sections.ruleDetails.viewRuleInAppButtonLabel": "アプリで表示",
     "xpack.triggersActionsUI.sections.ruleEdit.cancelButtonLabel": "キャンセル",
     "xpack.triggersActionsUI.sections.ruleEdit.disabledActionsWarningTitle": "このアラートには無効なアクションがあります",
@@ -27638,24 +29369,16 @@
     "xpack.triggersActionsUI.sections.ruleEdit.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.ruleEdit.saveErrorNotificationText": "ルールを更新できません",
     "xpack.triggersActionsUI.sections.ruleEdit.saveSuccessNotificationText": "'{ruleName}'を更新しました",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNameLabel": "名前",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label": "毎",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.description": "アラートステータスが変更されるときにアクションを実行します。",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.display": "ステータス変更時のみ",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.label": "ステータス変更時のみ",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.description": "アラートがアクティブなときは、ルール間隔でアクションが繰り返されます。",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.display": "アラートがアクティブになるたびに実行",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.label": "アラートがアクティブになるたびに実行",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.description": "設定した間隔を使用してアクションを実行します。",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.display": "カスタムアクション間隔",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.label": "カスタムアクション間隔",
     "xpack.triggersActionsUI.sections.ruleForm.changeRuleTypeAriaLabel": "削除",
+    "xpack.triggersActionsUI.sections.ruleForm.checkEveryHelpSuggestionText": "パフォーマンスの考慮から、{minimum}未満の間隔は推奨されません。",
+    "xpack.triggersActionsUI.sections.ruleForm.checkEveryHelpText": "間隔は{minimum}以上でなければなりません。",
     "xpack.triggersActionsUI.sections.ruleForm.checkFieldLabel": "確認間隔",
-    "xpack.triggersActionsUI.sections.ruleForm.checkWithTooltip": "条件を評価する頻度を定義します。",
+    "xpack.triggersActionsUI.sections.ruleForm.checkWithTooltip": "条件を評価する頻度を定義します。チェックはキューに登録されています。可能なかぎり定義された値に近づくように実行されます。xpack.alerting.rules.minimumScheduleInterval.value設定は最小値を定義します。xpack.alerting.rules.minimumScheduleInterval.enforce設定は、この最小値が必須か推奨であるかを定義します。",
     "xpack.triggersActionsUI.sections.ruleForm.conditions.addConditionLabel": "追加：",
     "xpack.triggersActionsUI.sections.ruleForm.conditions.removeConditionLabel": "削除",
     "xpack.triggersActionsUI.sections.ruleForm.conditions.title": "条件：",
     "xpack.triggersActionsUI.sections.ruleForm.documentationLabel": "ドキュメント",
+    "xpack.triggersActionsUI.sections.ruleForm.error.belowMinimumText": "間隔は{minimum}以上でなければなりません。",
     "xpack.triggersActionsUI.sections.ruleForm.error.noAuthorizedRuleTypes": "ルールを{operation}するには、適切な権限が付与されている必要があります。",
     "xpack.triggersActionsUI.sections.ruleForm.error.noAuthorizedRuleTypesTitle": "ルールタイプを{operation}する権限がありません。",
     "xpack.triggersActionsUI.sections.ruleForm.error.requiredActionConnector": "{actionTypeId}コネクターのアクションが必要です。",
@@ -27666,6 +29389,17 @@
     "xpack.triggersActionsUI.sections.ruleForm.loadingRuleTypesDescription": "ルールタイプを読み込んでいます…",
     "xpack.triggersActionsUI.sections.ruleForm.renotifyFieldLabel": "通知",
     "xpack.triggersActionsUI.sections.ruleForm.renotifyWithTooltip": "ルールがアクティブな間にアクションを繰り返す頻度を定義します。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNameLabel": "名前",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label": "毎",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.description": "ルールステータスが変更されるときにアクションを実行します。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.display": "ステータス変更時のみ",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.label": "ステータス変更時のみ",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.description": "ルールがアクティブなときは、ルール間隔でアクションが繰り返されます。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.display": "ルールがアクティブになるたびに実行",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.label": "ルールがアクティブになるたびに実行",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.description": "設定した間隔を使用してアクションを実行します。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.display": "カスタムアクション間隔",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.label": "カスタムアクション間隔",
     "xpack.triggersActionsUI.sections.ruleForm.ruleTypeSelectLabel": "ルールタイプを選択",
     "xpack.triggersActionsUI.sections.ruleForm.searchPlaceholderTitle": "検索",
     "xpack.triggersActionsUI.sections.ruleForm.solutionFilterLabel": "ユースケースでフィルタリング",
@@ -27673,29 +29407,8 @@
     "xpack.triggersActionsUI.sections.ruleForm.unableToLoadRuleTypesMessage": "ルールタイプを読み込めません",
     "xpack.triggersActionsUI.sections.rulesList.actionTypeFilterLabel": "アクションタイプ",
     "xpack.triggersActionsUI.sections.rulesList.addRuleButtonLabel": "ルールを作成",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDecrypting": "ルールの復号中にエラーが発生しました。",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonLicense": "ルールを実行できません",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonReading": "ルールの読み取り中にエラーが発生しました。",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonRunning": "ルールの実行中にエラーが発生しました。",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonUnknown": "不明な理由でエラーが発生しました。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsTex": "アクション",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsWarningTooltip": "このルールに関連付けられたコネクターの1つを読み込めません。ルールを編集して、新しいコネクターを選択します。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleTypeTitle": "型",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteAriaLabel": "削除",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteButtonTooltip": "削除",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.durationTitle": "ルールを実行するのにかかる時間。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editAriaLabel": "編集",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editButtonTooltip": "編集",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastExecutionDateTitle": "前回の実行の開始時間。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.nameTitle": "名前",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.scheduleTitle": "間隔",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusActive": "アクティブ",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusError": "エラー",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusFilterLabel": "ステータス",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusLicenseError": "ライセンスエラー",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusOk": "OK",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusPending": "保留中",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusUnknown": "不明",
+    "xpack.triggersActionsUI.sections.rulesList.applySnooze": "適用",
+    "xpack.triggersActionsUI.sections.rulesList.attentionBannerTitle": "{totalStatusesError, plural, other  {# 件のルール}}でエラーが見つかりました。",
     "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.buttonTitle": "ルールの管理",
     "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.deleteAllTitle": "削除",
     "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.disableAllTitle": "無効にする",
@@ -27714,85 +29427,82 @@
     "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.muteTitle": "ミュート",
     "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.popoverButtonTitle": "アクション",
     "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.unmuteTitle": "ミュート解除",
+    "xpack.triggersActionsUI.sections.rulesList.daysLabel": "日",
+    "xpack.triggersActionsUI.sections.rulesList.disabledRuleStatus": "無効",
+    "xpack.triggersActionsUI.sections.rulesList.enabledRuleStatus": "有効",
+    "xpack.triggersActionsUI.sections.rulesList.expandRow.title": "前回の実行のエラー",
     "xpack.triggersActionsUI.sections.rulesList.fixLicenseLink": "修正",
+    "xpack.triggersActionsUI.sections.rulesList.hideAllErrors": "{totalStatusesError, plural, other {件のエラー}}を非表示",
+    "xpack.triggersActionsUI.sections.rulesList.hoursLabel": "時間",
+    "xpack.triggersActionsUI.sections.rulesList.minutesLabel": "分",
+    "xpack.triggersActionsUI.sections.rulesList.monthsLabel": "月",
     "xpack.triggersActionsUI.sections.rulesList.multipleTitle": "ルール",
     "xpack.triggersActionsUI.sections.rulesList.noPermissionToCreateDescription": "システム管理者にお問い合わせください。",
     "xpack.triggersActionsUI.sections.rulesList.noPermissionToCreateTitle": "ルールを作成する権限がありません",
     "xpack.triggersActionsUI.sections.rulesList.refreshRulesButtonLabel": "更新",
+    "xpack.triggersActionsUI.sections.rulesList.remainingSnoozeIndefinite": "永久",
     "xpack.triggersActionsUI.sections.rulesList.resetDefaultIndexLabel": "デフォルトのインデックスをリセット",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDecrypting": "ルールの復号中にエラーが発生しました。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDisabled": "ルールを実行できませんでした。ルールは無効化された後に実行されました。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonLicense": "ルールを実行できません",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonReading": "ルールの読み取り中にエラーが発生しました。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonRunning": "ルールの実行中にエラーが発生しました。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonTimeout": "タイムアウトのためルール実行がキャンセルされました。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonUnknown": "不明な理由でエラーが発生しました。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsTex": "アクション",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsWarningTooltip": "このルールに関連付けられたコネクターの1つを読み込めません。ルールを編集して、新しいコネクターを選択します。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteAriaLabel": "削除",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteButtonTooltip": "削除",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.durationTitle": "ルールを実行するのにかかる時間（mm:ss）。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editAriaLabel": "編集",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editButtonTooltip": "編集",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalIconAriaLabel": "構成された最小間隔未満",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalTooltipText": "ルール間隔{interval}は構成された最小間隔{minimumInterval}を下回ります。これはアラートのパフォーマンスに影響する場合があります。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalTooltipTitle": "構成された最小間隔未満",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastExecutionDateTitle": "前回の実行の開始時間。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastResponseTitle": "前回の応答",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.nameTitle": "名前",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleExecutionPercentileSelectButton": "パーセンタイルを選択",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleExecutionPercentileTooltip": "このルールの過去{sampleLimit}実行期間の{percentileOrdinal}パーセンタイル（mm:ss）。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleTypeTitle": "型",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.scheduleTitle": "間隔",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.successRatioTitle": "このルールが正常に実行される頻度。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusActive": "アクティブ",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusDropdownMenuLabel": "ルールステータスまたはスヌーズを変更",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusError": "エラー",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusFilterLabel": "前回の応答",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusLicenseError": "ライセンスエラー",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusOk": "OK",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusPending": "保留中",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusUnknown": "不明",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusWarning": "警告",
     "xpack.triggersActionsUI.sections.rulesList.ruleTypeExcessDurationMessage": "期間がルールの想定実行時間を超えています。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleWarningReasonMaxExecutableActions": "アクション制限超過",
+    "xpack.triggersActionsUI.sections.rulesList.ruleWarningReasonUnknown": "不明な理由",
     "xpack.triggersActionsUI.sections.rulesList.searchPlaceholderTitle": "検索",
+    "xpack.triggersActionsUI.sections.rulesList.showAllErrors": "{totalStatusesError, plural, other {件のエラー}}を表示",
     "xpack.triggersActionsUI.sections.rulesList.singleTitle": "ルール",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeCommonlyUsed": "頻繁に使用",
+    "xpack.triggersActionsUI.sections.rulesList.snoozedRuleStatus": "スヌーズ済み",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeIndefinitely": "無期限にスヌーズ",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeMenuTitle": "スヌーズ",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeOneDay": "1日",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeOneHour": "1時間",
+    "xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalUnitLabel": "スヌーズ間隔単位",
+    "xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalValueLabel": "スヌーズ間隔値",
     "xpack.triggersActionsUI.sections.rulesList.totalItemsCountDescription": "{pageSize}/{totalItemCount}件のルールを表示しています。",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesActiveDescription": "アクティブ：{totalStatusesActive}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesErrorDescription": "エラー：{totalStatusesError}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesOkDescription": "Ok：{totalStatusesOk}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesPendingDescription": "保留：{totalStatusesPending}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesWarningDescription": "警告：{totalStatusesWarning}",
     "xpack.triggersActionsUI.sections.rulesList.typeFilterLabel": "型",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadConnectorTypesMessage": "コネクタータイプを読み込めません",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadRulesMessage": "ルールを読み込めません",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadRuleStatusInfoMessage": "ルールステータス情報を読み込めません",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadRuleTypesMessage": "ルールタイプを読み込めません",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addBccButton": "Bcc",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton": "Cc",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.authenticationLabel": "認証",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientIdFieldLabel": "クライアントID",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientSecretTextFieldLabel": "クライアントシークレット",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.fromTextFieldLabel": "送信元",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hasAuthSwitchLabel": "このサーバーの認証が必要です",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hostTextFieldLabel": "ホスト",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel": "メッセージ",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel": "パスワード",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.portTextFieldLabel": "ポート",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientBccTextFieldLabel": "Bcc",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel": "Cc",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel": "終了：",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.secureSwitchLabel": "セキュア",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.serviceTextFieldLabel": "サービス",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel": "件名",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.tenantIdFieldLabel": "テナントID",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "ユーザー名",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseCancelButtonText": "キャンセル",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseConfirmButtonText": "変更を破棄",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseMessage": "保存されていない変更は回復できません。",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseTitle": "ルールの保存されていない変更を破棄しますか？",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveCancelButtonText": "キャンセル",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveConfirmButtonText": "ルールを保存",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveTitle": "アクションがないルールを保存しますか？",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveWithoutActionsMessage": "いつでもアクションを追加できます。",
-    "xpack.triggersActionsUI.sections.connectorAddInline.accordion.deleteIconAriaLabel": "削除",
-    "xpack.triggersActionsUI.sections.connectorAddInline.addConnectorButtonLabel": "コネクターを作成する",
-    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.actionIdLabel": "別の{connectorInstance}コネクターを使用",
-    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.addNewConnectorEmptyButton": "コネクターの追加",
-    "xpack.triggersActionsUI.sections.connectorAddInline.emptyConnectorsLabel": "{actionTypeName}コネクターがありません",
-    "xpack.triggersActionsUI.sections.connectorAddInline.newRuleActionTypeEditTitle": "{actionConnectorName}",
-    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle": "コネクターを読み込めません",
-    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle'": "コネクターを読み込めません",
-    "xpack.triggersActionsUI.sections.connectorAddInline.unauthorizedToCreateForEmptyConnectors": "許可されたユーザーのみがコネクターを構成できます。管理者にお問い合わせください。",
-    "xpack.triggersActionsUI.sections.deprecatedTitleMessage": "（非推奨）",
-    "xpack.triggersActionsUI.sections.editConnectorForm.actionTypeDescription": "{actionDescription}",
-    "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "キャンセル",
-    "xpack.triggersActionsUI.sections.editConnectorForm.descriptionText": "このコネクターは読み取り専用です。",
-    "xpack.triggersActionsUI.sections.editConnectorForm.flyoutPreconfiguredTitle": "コネクターを編集",
-    "xpack.triggersActionsUI.sections.editConnectorForm.preconfiguredHelpLabel": "あらかじめ構成されたコネクターの詳細をご覧ください。",
-    "xpack.triggersActionsUI.sections.editConnectorForm.saveAndCloseButtonLabel": "保存して閉じる",
-    "xpack.triggersActionsUI.sections.editConnectorForm.saveButtonLabel": "保存",
-    "xpack.triggersActionsUI.sections.editConnectorForm.tabText": "構成",
-    "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "コネクターを更新できません。",
-    "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "「{connectorName}」を更新しました",
-    "xpack.triggersActionsUI.sections.executionDurationChart.avgDurationLabel": "平均期間",
-    "xpack.triggersActionsUI.sections.executionDurationChart.durationLabel": "期間",
-    "xpack.triggersActionsUI.sections.executionDurationChart.executionDurationNoData": "このルールの実行がありません。",
-    "xpack.triggersActionsUI.sections.executionDurationChart.numberOfExecutionsOption": "{value}回の実行",
-    "xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTitle": "最近の実行時間",
-    "xpack.triggersActionsUI.sections.executionDurationChart.selectNumberOfExecutionDurationsLabel": "実行数を選択",
-    "xpack.triggersActionsUI.sections.isDeprecatedDescription": "このコネクターは廃止予定です。更新するか新しく作成してください。",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseCancelButtonText": "キャンセル",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseConfirmButtonText": "ライセンスの管理",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseMessage": "ルールタイプ{ruleTypeId}は無効です。{licenseRequired}ライセンスが必要です。アップグレードオプションを表示するには、［ライセンス管理］に移動してください。",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseTitle": "{licenseRequired}ライセンスが必要です",
-    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.flyoutTitle": "{connectorName}",
-    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.tooltipContent": "このコネクターはあらかじめ構成されているため、編集できません。",
+    "xpack.triggersActionsUI.sections.rulesList.viewBannerButtonLabel": "エラーがある{totalStatusesError, plural, other {個のルール}}を表示",
+    "xpack.triggersActionsUI.sections.rulesList.weeksLabel": "週",
     "xpack.triggersActionsUI.sections.testConnectorForm.awaitingExecutionDescription": "ルールを実行すると、結果がここに表示されます。",
     "xpack.triggersActionsUI.sections.testConnectorForm.createActionHeader": "アクションを作成",
     "xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton": "実行",
@@ -27897,6 +29607,8 @@
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateVariablesHelpLinkText": "ヘルプ",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatErrorMessage": "無効な形式：{message}",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "無効なフォーマット。例：{exampleUrl}",
+    "xpack.upgradeAssistant.app.deniedPrivilegeDescription": "アップグレードアシスタントを使用して、廃止予定の問題を解決するには、すべてのKibanaスペースを管理するためのアクセス権が必要です。",
+    "xpack.upgradeAssistant.app.deniedPrivilegeTitle": "Kibana管理者ロールが必要です",
     "xpack.upgradeAssistant.appTitle": "アップグレードアシスタント",
     "xpack.upgradeAssistant.breadcrumb.esDeprecationLogsLabel": "Elasticsearchの廃止予定ログ",
     "xpack.upgradeAssistant.breadcrumb.esDeprecationsLabel": "Elasticsearchの廃止予定の問題",
@@ -27907,6 +29619,9 @@
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.continueButtonLabel": "再インデックスを続行",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.fetchFailedCalloutTitle": "再インデックスステータスがありません",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.insufficientPrivilegeCallout.calloutTitle": "このインデックスを再インデックスするための権限がありません",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceCalloutDescription": "ディスク使用量が低レベルを超えました。再インデックスが防止される場合があります。次のノードが影響を受けます。",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceCalloutTitle": "ディスク容量が低下しているノード",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceUsedText": "{nodeName}（{available}空き）",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.readonlyCallout.backgroundResumeDetail": "再インデックスはバックグラウンドで実行されます。アップグレードアシスタントに戻って進捗状況を表示するか、Kibanaの再起動後に再インデックスを再開できます。",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.reindexingLabel": "再インデックス中…",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.restartLabel": "再インデックスの再起動",
@@ -27973,6 +29688,11 @@
     "xpack.upgradeAssistant.esDeprecations.batchReindexingDocsDescription": "1つの要求で複数の再インデックスタスクを開始するには、Kibana {docsLink}を使用します。",
     "xpack.upgradeAssistant.esDeprecations.batchReindexingDocsLink": "バッチ再インデックスAPI",
     "xpack.upgradeAssistant.esDeprecations.clusterDeprecationTypeLabel": "クラスター",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deleteCompleteText": "廃止予定の設定が削除されました",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deleteFailedText": "設定の削除が失敗しました",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deletingButtonLabel": "設定を削除中…",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.resolutionText": "設定の削除",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.resolutionTooltipLabel": "このクラスターから設定を削除して、この問題を解決します。この問題は自動的に解決できます。",
     "xpack.upgradeAssistant.esDeprecations.defaultDeprecation.manualCellLabel": "手動",
     "xpack.upgradeAssistant.esDeprecations.deprecationDetailsFlyout.closeButtonLabel": "閉じる",
     "xpack.upgradeAssistant.esDeprecations.deprecationDetailsFlyout.secondaryDescription": "インデックス：{indexName}",
@@ -28018,6 +29738,15 @@
     "xpack.upgradeAssistant.esDeprecations.reindex.reindexPausedText": "再インデックスは一時停止されました",
     "xpack.upgradeAssistant.esDeprecations.reindex.resolutionLabel": "再インデックス",
     "xpack.upgradeAssistant.esDeprecations.reindex.resolutionTooltipLabel": "このインデックスを再インデックスして、この問題を解決します。この問題は自動的に解決できます。",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersDetectedDescription": "{remoteClustersCount} {remoteClustersCount, plural, other {個のリモートクラスター}}が構成されています。クラスター横断検索を使用する場合、8.xは前のマイナーバージョン以降を実行しているリモートクラスターのみを検索できます。クラスター横断レプリケーションを使用する場合、フォロワーインデックスを含むクラスターは、リモートクラスターと同じかそれ以上のバージョンを実行する必要があります。",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersDetectedTitle": "リモートクラスターの互換性",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersLinkText": "リモートクラスターを表示します。",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.closeButtonLabel": "閉じる",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.deleteErrorTitle": "クラスター設定の削除エラー",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.description": "次の廃止予定のクラスター{clusterSettingsCount, plural, other {設定}}を削除しますか?",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.removeButtonLabel": "廃止予定の設定を削除",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.resolvedButtonLabel": "解決済み",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.retryRemoveButtonLabel": "廃止予定の設定の削除を再試行",
     "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.closeButtonLabel": "閉じる",
     "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.deleteErrorTitle": "インデックス設定の削除エラー",
     "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.description": "次の廃止予定のインデックス{indexSettingsCount, plural, other  {設定}}を削除しますか？",
@@ -28102,9 +29831,19 @@
     "xpack.upgradeAssistant.overview.deprecationsCountCheckpointTitle": "廃止予定の問題を解決して変更を検証",
     "xpack.upgradeAssistant.overview.documentationLinkText": "ドキュメント",
     "xpack.upgradeAssistant.overview.errorLoadingUpgradeStatus": "アップグレードステータスの取得中にエラーが発生しました",
+    "xpack.upgradeAssistant.overview.fixIssuesStepDescription": "Elastic 8.xにアップグレードする前に、重大なElasticsearchおよびKibana構成の問題を解決する必要があります。警告を無視すると、アップグレード後に動作が変更される場合があります。",
     "xpack.upgradeAssistant.overview.fixIssuesStepTitle": "廃止予定設定を確認し、問題を解決",
     "xpack.upgradeAssistant.overview.loadingLogsLabel": "廃止予定ログ収集状態を読み込んでいます...",
     "xpack.upgradeAssistant.overview.loadingUpgradeStatus": "アップグレードステータスを読み込んでいます",
+    "xpack.upgradeAssistant.overview.logsStep.countDescription": "{checkpoint}以降、{deprecationCount, plural, =0 {0} other {{deprecationCount}}}個の廃止予定の{deprecationCount, plural, other {問題}}があります。",
+    "xpack.upgradeAssistant.overview.logsStep.description": "Elasticsearch廃止予定ログを確認し、廃止予定のAPIを使用していないことを確かめてください。",
+    "xpack.upgradeAssistant.overview.logsStep.enableLogsButtonLabel": "ロギングを有効にする",
+    "xpack.upgradeAssistant.overview.logsStep.loadingError": "廃止予定ログ件数の取得中にエラーが発生しました",
+    "xpack.upgradeAssistant.overview.logsStep.missingPrivilegesDescription": "廃止予定ログのインデックスは続行されますが、次の読み取りインデックス{privilegesCount, plural, other  {権限}}が付与されるまでは分析できません：{missingPrivileges}",
+    "xpack.upgradeAssistant.overview.logsStep.missingPrivilegesTitle": "廃止予定ログを分析するには、インデックス権限が必要です",
+    "xpack.upgradeAssistant.overview.logsStep.retryButton": "再試行",
+    "xpack.upgradeAssistant.overview.logsStep.title": "API廃止予定に対処",
+    "xpack.upgradeAssistant.overview.logsStep.viewLogsButtonLabel": "ログを表示",
     "xpack.upgradeAssistant.overview.observe.discoveryDescription": "廃止予定ログを検索およびフィルターし、必要な変更のタイプを把握します。",
     "xpack.upgradeAssistant.overview.observe.observabilityDescription": "使用中のAPIのうち廃止予定のAPIと、更新が必要なアプリケーションを特定できます。",
     "xpack.upgradeAssistant.overview.pageDescription": "次のバージョンのElasticをお待ちください。",
@@ -28147,6 +29886,10 @@
     "xpack.upgradeAssistant.overview.whatsNewLink": "8.xの新機能",
     "xpack.upgradeAssistant.reindex.reindexPrivilegesErrorBatch": "「{indexName}」に再インデックスするための権限が不十分です。",
     "xpack.upgradeAssistant.status.allDeprecationsResolvedMessage": "すべての廃止予定の警告が解決されました。",
+    "xpack.upgradeAssistant.status.deprecationsUnresolvedMessage": "アップグレード前に次の問題を解決する必要があります：{upgradeIssues}。",
+    "xpack.upgradeAssistant.status.esTotalCriticalDepsMessage": "{esTotalCriticalDeps} Elasticsearch廃止予定の {esTotalCriticalDeps, plural, other {問題}}",
+    "xpack.upgradeAssistant.status.kibanaTotalCriticalDepsMessage": "{kibanaTotalCriticalDeps} Kibana廃止予定の {kibanaTotalCriticalDeps, plural, other {問題}}",
+    "xpack.upgradeAssistant.status.systemIndicesMessage": "{notMigratedSystemIndices}移行されていないシステム{notMigratedSystemIndices, plural, other {インデックス}}",
     "xpack.upgradeAssistant.upgradedDescription": "すべての Elasticsearch ノードがアップグレードされました。Kibana をアップデートする準備ができました。",
     "xpack.upgradeAssistant.upgradedTitle": "クラスターがアップグレードされました",
     "xpack.upgradeAssistant.upgradingDescription": "1 つまたは複数の Elasticsearch ノードに、 Kibana よりも新しいバージョンの Elasticsearch があります。すべてのノードがアップグレードされた後で Kibana をアップグレードしてください。",
@@ -28176,8 +29919,10 @@
     "xpack.uptime.alerts.monitorExpression.label": "フィルター{title}を削除",
     "xpack.uptime.alerts.monitorStatus": "稼働状況の監視ステータス",
     "xpack.uptime.alerts.monitorStatus.actionVariables.availabilityMessage": "{interval}の可用性は{availabilityRatio}%です。{expectedAvailability}%未満のときにアラートを発行します。",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.context.alertReasonMessage.description": "アラートの理由の簡潔な説明",
     "xpack.uptime.alerts.monitorStatus.actionVariables.context.downMonitorsWithGeo.description": "アラートによって「ダウン」と検知された一部またはすべてのモニターを示す、生成された概要。",
     "xpack.uptime.alerts.monitorStatus.actionVariables.context.message.description": "現在ダウンしているモニターを要約する生成されたメッセージ。",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.context.viewInAppUrl.description": "アラートとコンテキストを調査するために使用できる、Elastic内のビューまたは機能へのリンク",
     "xpack.uptime.alerts.monitorStatus.actionVariables.down": "過去{interval}に{count}回失敗しました。{numTimes}を超えるとアラートを発行します。",
     "xpack.uptime.alerts.monitorStatus.actionVariables.downAndAvailabilityMessage": "{downMonitorsMessage} {availabilityBreachMessage}",
     "xpack.uptime.alerts.monitorStatus.actionVariables.state.currentTriggerStarted": "アラートがトリガーされた場合、現在のトリガー状態が開始するときを示すタイムスタンプ",
@@ -28349,9 +30094,13 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.screenshots.label": "スクリーンショットオプション",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.syntheticsArgs.helpText": "Syntheticsエージェントパッケージに渡す追加の引数。文字列のリストを取ります。これはごくまれなシナリオで有用ですが、通常は設定する必要がありません。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.syntheticsArgs.label": "Synthetics引数",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.message": "スロットリングを無効にするときには、モニターが実行されているSyntheticsノードの構成によって、モニターの帯域幅がまだ制限されます。",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.title": "自動制限",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.description": "モニターのダウンロードおよびアップロードの速度、ならびにレイテンシを制御し、低速または遅延しているネットワークでアプリケーションの動作をシミュレートしてください。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.error": "ダウンロード速度は0よりも大きい値でなければなりません。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.label": "ダウンロード速度",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.message": "Syntheticsノード帯域幅上限より大きいスロットリング値を使用するときには、モニターの帯域幅がまだ制限されます。",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.title": "Syntheticsノード帯域幅上限を超えました",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error": "レイテンシは負数にできません。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.label": "レイテンシ",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.switch.description": "スロットリングを有効にする",
@@ -28453,8 +30202,8 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects": "最大リダイレクト数",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects.error": "最大リダイレクト数は0以上でなければなりません",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects.helpText": "従うリダイレクトの合計数。",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval": "監視間隔",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval.error": "監視間隔は必須です",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval": "頻度",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval.error": "監視頻度は必須です",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType": "モニタータイプ",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.description": "「Browser」モニターを作成するには、elastic-agent-complete Dockerコンテナーを使用していることを確認します。これには、これらのモニターを実行するための依存関係が含まれています。詳細については、{link}をご覧ください。",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.link": "Syntheticsドキュメンテーション",
@@ -28472,7 +30221,7 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tcp.hosts.error": "ホストとポートは必須です",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.helpText": "接続のテストとデータの交換に許可された合計時間。",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.label": "タイムアウト（秒）",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError": "タイムアウトは監視間隔未満でなければなりません",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError": "タイムアウトは監視頻度未満でなければなりません",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.moreThanZeroError": "タイムアウトは0以上でなければなりません",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.URL": "URL",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.URL.error": "URLが必要です",
@@ -28517,7 +30266,6 @@
     "xpack.uptime.emptyStateError.notFoundPage": "ページが見つかりません",
     "xpack.uptime.emptyStateError.title": "エラー",
     "xpack.uptime.enableAlert.editAlert": "アラートを編集",
-    "xpack.uptime.featureRegistry.uptimeFeatureName": "アップタイム",
     "xpack.uptime.filterBar.ariaLabel": "概要ページのインプットフィルター基準",
     "xpack.uptime.filterBar.filterAllLabel": "すべて",
     "xpack.uptime.filterBar.options.location.name": "場所",
@@ -28587,6 +30335,7 @@
     "xpack.uptime.monitorDetails.title.pingType.http": "HTTP ping",
     "xpack.uptime.monitorDetails.title.pingType.icmp": "ICMP ping",
     "xpack.uptime.monitorDetails.title.pingType.tcp": "TCP ping",
+    "xpack.uptime.monitorList.allMonitors": "すべてのモニター",
     "xpack.uptime.monitorList.anomalyColumn.label": "レスポンス異常スコア",
     "xpack.uptime.monitorList.defineConnector.description": "{link}でデフォルトコネクターを定義し、モニターステータスアラートを有効にします。",
     "xpack.uptime.monitorList.defineConnector.popover.description": "ステータスアラートを受信します。",
@@ -28599,6 +30348,7 @@
     "xpack.uptime.monitorList.enabledAlerts.noAlert": "このモニターではルールが有効ではありません。",
     "xpack.uptime.monitorList.enabledAlerts.title": "有効なルール",
     "xpack.uptime.monitorList.enableDownAlert": "ステータスアラートを有効にする",
+    "xpack.uptime.monitorList.errorSummary": "エラー概要",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "ID {id}のモニターの行を展開",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "場所を追加",
     "xpack.uptime.monitorList.infraIntegrationAction.container.message": "コンテナーメトリックを表示",
@@ -28611,6 +30361,7 @@
     "xpack.uptime.monitorList.infraIntegrationAction.kubernetes.message": "ポッドメトリックを表示",
     "xpack.uptime.monitorList.infraIntegrationAction.kubernetes.tooltip": "ポッド UID「{podUid}」のインフラストラクチャ UI を確認します。",
     "xpack.uptime.monitorList.integrationGroup.emptyMessage": "統合されたアプリケーションがありません",
+    "xpack.uptime.monitorList.invalidMonitors": "無効なモニター",
     "xpack.uptime.monitorList.loading": "読み込み中...",
     "xpack.uptime.monitorList.locations.expand": "クリックすると、残りの場所が表示されます",
     "xpack.uptime.monitorList.loggingIntegrationAction.container.id": "コンテナーログを表示",
@@ -28639,9 +30390,14 @@
     "xpack.uptime.monitorList.redirects.openWindow": "リンクは新しいウィンドウで開きます。",
     "xpack.uptime.monitorList.redirects.title": "リダイレクト",
     "xpack.uptime.monitorList.redirects.title.number": "{number}",
+    "xpack.uptime.monitorList.refresh": "更新",
     "xpack.uptime.monitorList.statusAlert.label": "ステータスアラート",
+    "xpack.uptime.monitorList.statusColumn.checkedTimestamp": "チェック済み{timestamp}",
     "xpack.uptime.monitorList.statusColumn.completeLabel": "完了",
     "xpack.uptime.monitorList.statusColumn.downLabel": "ダウン",
+    "xpack.uptime.monitorList.statusColumn.error.logs": "エラーログ",
+    "xpack.uptime.monitorList.statusColumn.error.message": "{message}。詳細はクリックしてください。",
+    "xpack.uptime.monitorList.statusColumn.error.messageLabel": "{message}。詳細はクリックしてください。",
     "xpack.uptime.monitorList.statusColumn.failedLabel": "失敗",
     "xpack.uptime.monitorList.statusColumn.locStatusMessage": "場所 {noLoc} か所",
     "xpack.uptime.monitorList.statusColumn.locStatusMessage.multiple": "場所 {noLoc} か所",
@@ -28654,27 +30410,53 @@
     "xpack.uptime.monitorList.table.url.name": "Url",
     "xpack.uptime.monitorList.tags.expand": "クリックすると、残りのタグが表示されます",
     "xpack.uptime.monitorList.tags.filter": "タグ {tag} ですべての監視をフィルター",
+    "xpack.uptime.monitorList.testNow.AriaLabel": "クリックすると今すぐテストを実行します",
+    "xpack.uptime.monitorList.testNow.available": "現在、テストはモニター管理で追加されたモニターでのみ使用できます。",
+    "xpack.uptime.monitorList.testNow.label": "今すぐテストを実行",
+    "xpack.uptime.monitorList.testNow.scheduled": "テストはすでにスケジュールされています",
+    "xpack.uptime.monitorList.testRunLogs": "テスト実行ログ",
+    "xpack.uptime.monitorList.timestamp": "タイムスタンプ",
     "xpack.uptime.monitorList.tlsColumnLabel": "TLS 証明書",
+    "xpack.uptime.monitorList.viewInDiscover": "Discoverに表示",
     "xpack.uptime.monitorManagement.addMonitorCrumb": "モニターを追加",
     "xpack.uptime.monitorManagement.addMonitorError": "サービスの場所を読み込めませんでした。しばらくたってから再試行してください。",
     "xpack.uptime.monitorManagement.addMonitorLabel": "モニターを追加",
     "xpack.uptime.monitorManagement.addMonitorLoadingError": "モニター管理の読み込みエラー",
     "xpack.uptime.monitorManagement.addMonitorLoadingLabel": "モニター管理を読み込んでいます",
     "xpack.uptime.monitorManagement.addMonitorServiceLocationsLoadingError": "サービスの場所を読み込めませんでした。しばらくたってから再試行してください。",
+    "xpack.uptime.monitorManagement.apiKeysDisabledToolTip": "このクラスターのAPIキーが無効です。モニター管理では、Elasticsearchクラスターに書き込むためにAPIキーを使用する必要があります。APIキーを有効にするには、管理者に連絡してください。",
+    "xpack.uptime.monitorManagement.callout.description.disabled": "モニター管理は現在無効です。Elasticで管理されたSyntheticsサービスでモニターを実行するには、モニター管理を有効にします。既存のモニターが一時停止しています。",
+    "xpack.uptime.monitorManagement.callout.disabled": "モニター管理が無効です",
+    "xpack.uptime.monitorManagement.callout.disabled.adminContact": "モニター管理を有効にするには、管理者に連絡してください。",
+    "xpack.uptime.monitorManagement.closeButtonLabel": "閉じる",
     "xpack.uptime.monitorManagement.completed": "完了",
+    "xpack.uptime.monitorManagement.confirmDescriptionLabel": "このアクションにより、モニターが削除されますが、収集されたデータはすべて保持されます。この操作は元に戻すことができません。",
     "xpack.uptime.monitorManagement.deleteMonitorLabel": "モニターの削除",
     "xpack.uptime.monitorManagement.disableMonitorLabel": "モニターを無効にする",
     "xpack.uptime.monitorManagement.discardLabel": "破棄",
     "xpack.uptime.monitorManagement.duplicateNameError": "モニター名はすでに存在します。",
     "xpack.uptime.monitorManagement.editMonitorCrumb": "モニターを編集",
     "xpack.uptime.monitorManagement.editMonitorError": "モニター管理の読み込みエラー",
+    "xpack.uptime.monitorManagement.editMonitorError.description": "モニター管理設定を読み込めませんでした。サポートに問い合わせてください。",
     "xpack.uptime.monitorManagement.editMonitorErrorBody": "モニター構成を読み込めませんでした。しばらくたってから再試行してください。",
     "xpack.uptime.monitorManagement.editMonitorLabel": "モニターを編集",
     "xpack.uptime.monitorManagement.editMonitorLoadingLabel": "モニターを読み込んでいます",
+    "xpack.uptime.monitorManagement.emptyState.enablement": "モニター管理を有効にすると、世界中のホスティングされたテスト場所から軽量でリアルなブラウザーモニターを実行できます。モニター管理を有効にすると、APIキーが生成され、SyntheticsサービスはElasticsearchクラスターに書き込むことができます。",
+    "xpack.uptime.monitorManagement.emptyState.enablement.disabled.title": "モニター管理が無効です",
+    "xpack.uptime.monitorManagement.emptyState.enablement.disabledDescription": "モニター管理は現在無効です。モニター管理では、世界中のホスティングされたテスト場所から軽量のチェックとリアルなブラウザーモニターを実行できます。モニター管理を有効にするには、管理者に連絡してください。",
+    "xpack.uptime.monitorManagement.emptyState.enablement.doc": "<b>ドキュメント</b><b>を読む</b>",
+    "xpack.uptime.monitorManagement.emptyState.enablement.enabled.title": "モニター管理を有効にする",
+    "xpack.uptime.monitorManagement.emptyState.enablement.learnMore": "詳細について",
+    "xpack.uptime.monitorManagement.emptyState.enablement.title": "有効にする",
     "xpack.uptime.monitorManagement.enableMonitorLabel": "モニターを有効にする",
+    "xpack.uptime.monitorManagement.failed": "失敗",
     "xpack.uptime.monitorManagement.failedRun": "ステップを実行できませんでした",
     "xpack.uptime.monitorManagement.inProgress": "進行中",
+    "xpack.uptime.monitorManagement.label": "モニター管理",
+    "xpack.uptime.monitorManagement.loading.label": "モニター管理を読み込んでいます",
     "xpack.uptime.monitorManagement.loadingSteps": "ステップを読み込んでいます...",
+    "xpack.uptime.monitorManagement.manageMonitorLoadingLabel": "モニター管理を読み込んでいます",
+    "xpack.uptime.monitorManagement.manageMonitorLoadingLabel.callout.learnMore": "詳細情報",
     "xpack.uptime.monitorManagement.monitorAddedSuccessMessage": "モニターが正常に追加されました。",
     "xpack.uptime.monitorManagement.monitorAdvancedOptions.dataStreamConfiguration.description": "追加のデータストリームオプションを構成します。",
     "xpack.uptime.monitorManagement.monitorAdvancedOptions.dataStreamConfiguration.title": "データストリーム設定",
@@ -28694,7 +30476,7 @@
     "xpack.uptime.monitorManagement.monitorList.locations": "場所",
     "xpack.uptime.monitorManagement.monitorList.monitorName": "モニター名",
     "xpack.uptime.monitorManagement.monitorList.monitorType": "モニタータイプ",
-    "xpack.uptime.monitorManagement.monitorList.schedule": "スケジュール",
+    "xpack.uptime.monitorManagement.monitorList.schedule": "頻度（分）",
     "xpack.uptime.monitorManagement.monitorList.tags": "タグ",
     "xpack.uptime.monitorManagement.monitorList.title": "モニター管理リスト",
     "xpack.uptime.monitorManagement.monitorList.URL": "URL",
@@ -28702,18 +30484,40 @@
     "xpack.uptime.monitorManagement.monitorManagementCrumb": "モニター管理",
     "xpack.uptime.monitorManagement.monitorNameFieldError": "モニター名は必須です",
     "xpack.uptime.monitorManagement.monitorNameFieldLabel": "モニター名",
+    "xpack.uptime.monitorManagement.monitorSync.failure.content": "1つ以上の場所でモニターを同期するときに問題が発生しました。",
+    "xpack.uptime.monitorManagement.monitorSync.failure.dismissLabel": "閉じる",
+    "xpack.uptime.monitorManagement.monitorSync.failure.reasonLabel": "理由",
+    "xpack.uptime.monitorManagement.monitorSync.failure.statusLabel": "ステータス",
+    "xpack.uptime.monitorManagement.monitorSync.failure.title": "モニターをSyntheticsサービスと同期できませんでした",
+    "xpack.uptime.monitorManagement.noLabel": "キャンセル",
     "xpack.uptime.monitorManagement.pageHeader.title": "モニターの管理",
     "xpack.uptime.monitorManagement.pending": "保留中",
+    "xpack.uptime.monitorManagement.publicBetaDescription": "選択した一般ベータユーザーでのみモニター管理を使用できます。一般\nベータアクセスでは、HTTP、TCP、ICMPを追加できます。ブラウザーは\nElasticで管理されたSyntheticsサービスノードでどれが実行されるのかを確認します。",
+    "xpack.uptime.monitorManagement.requestAccess": "アクセスをリクエストする",
     "xpack.uptime.monitorManagement.reRunTest": "テストの再実行",
     "xpack.uptime.monitorManagement.runTest": "テストの実行",
     "xpack.uptime.monitorManagement.saveMonitorLabel": "モニターを保存",
+    "xpack.uptime.monitorManagement.service.error.message": "モニターは保存されますが、{location}の構成の同期中に問題が発生しました。しばらくたってから自動的に再試行されます。問題が解決しない場合は、{location}でのモニターの実行が停止します。ヘルプについては、サポートに問い合わせてください。",
+    "xpack.uptime.monitorManagement.service.error.reason": "理由：{reason}。",
+    "xpack.uptime.monitorManagement.service.error.status": "ステータス：{status}。",
+    "xpack.uptime.monitorManagement.service.error.title": "モニター構成を同期できません",
     "xpack.uptime.monitorManagement.serviceLocationsValidationError": "1つ以上のサービスの場所を指定する必要があります",
     "xpack.uptime.monitorManagement.stepCompleted": "{stepCount, number} {stepCount, plural, other  {個のステップ}}が完了しました",
+    "xpack.uptime.monitorManagement.syntheticsDisabled": "モニター管理は現在無効です。モニター管理を有効にするには、管理者に連絡してください。",
+    "xpack.uptime.monitorManagement.syntheticsDisabledFailure": "モニター管理を無効にできませんでした。サポートに問い合わせてください。",
+    "xpack.uptime.monitorManagement.syntheticsDisabledSuccess": "モニター管理は正常に無効にされました。",
+    "xpack.uptime.monitorManagement.syntheticsDisableToolTip": "モニター管理を無効にすると、すべてのテスト場所でモニターの実行が即時停止され、新しいモニターの作成が防止されます。",
+    "xpack.uptime.monitorManagement.syntheticsEnabledFailure": "モニター管理を有効にできませんでした。サポートに問い合わせてください。",
+    "xpack.uptime.monitorManagement.syntheticsEnableLabel": "有効にする",
+    "xpack.uptime.monitorManagement.syntheticsEnableLabel.management": "モニター管理を有効にする",
+    "xpack.uptime.monitorManagement.syntheticsEnableSuccess": "モニター管理は正常に有効にされました。",
+    "xpack.uptime.monitorManagement.syntheticsEnableToolTip": "モニター管理を有効にすると、世界中の場所から軽量でリアルなブラウザーモニターを作成できます。",
     "xpack.uptime.monitorManagement.testResult": "テスト結果",
     "xpack.uptime.monitorManagement.timeTaken": "かかった時間{timeTaken}",
     "xpack.uptime.monitorManagement.updateMonitorLabel": "モニターの更新",
     "xpack.uptime.monitorManagement.validationError": "モニターにはエラーがあります。保存前に修正してください。",
     "xpack.uptime.monitorManagement.viewTestRunDetails": "テスト結果詳細を表示",
+    "xpack.uptime.monitorManagement.yesLabel": "削除",
     "xpack.uptime.monitorManagementRoute.title": "モニターの管理 | {baseTitle}",
     "xpack.uptime.monitorRoute.title": "モニター | {baseTitle}",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "ミリ秒単位の監視時間",
@@ -28998,6 +30802,102 @@
     "xpack.urlDrilldown.row.event.values.documentation": "アクションが実行される行のすべてのセル値の配列。",
     "xpack.urlDrilldown.row.event.values.title": "行セル値のリスト。",
     "xpack.urlDrilldown.valuePreview": "値: {value}",
+    "xpack.ux.addDataButtonLabel": "データの追加",
+    "xpack.ux.analyzeDataButtonLabel": "データの探索",
+    "xpack.ux.analyzeDataButtonLabel.message": "データの探索では、任意のディメンションの結果データを選択してフィルタリングし、パフォーマンスの問題の原因または影響を調査することができます。",
+    "xpack.ux.breadcrumbs.dashboard": "ダッシュボード",
+    "xpack.ux.breadcrumbs.root": "ユーザーエクスペリエンス",
+    "xpack.ux.breakdownFilter.browser": "ブラウザー",
+    "xpack.ux.breakdownFilter.device": "デバイス",
+    "xpack.ux.breakdownFilter.location": "場所",
+    "xpack.ux.breakDownFilter.noBreakdown": "内訳なし",
+    "xpack.ux.breakdownFilter.os": "OS",
+    "xpack.ux.clearFilters": "フィルターを消去",
+    "xpack.ux.coreVitals.dataUndefined": "N/A",
+    "xpack.ux.coreVitals.fcp": "初回コンテンツの描画",
+    "xpack.ux.coreVitals.fcpTooltip": "初回コンテンツの描画（FCP）は初期のレンダリングに集中し、ページの読み込みが開始してから、ページのコンテンツのいずれかの部分が画面に表示されるときまでの時間を測定します。",
+    "xpack.ux.coreVitals.tbt": "合計ブロック時間",
+    "xpack.ux.coreVitals.tbtTooltip": "合計ブロック時間（TBT）は、初回コンテンツの描画からトランザクションが完了したときまでに発生する、各長いタスクのブロック時間（50 ミリ秒超）の合計です。",
+    "xpack.ux.dashboard.backend": "バックエンド",
+    "xpack.ux.dashboard.dataMissing": "N/A",
+    "xpack.ux.dashboard.frontend": "フロントエンド",
+    "xpack.ux.dashboard.impactfulMetrics.highTrafficPages": "高トラフィックページ",
+    "xpack.ux.dashboard.impactfulMetrics.jsErrors": "JavaScript エラー",
+    "xpack.ux.dashboard.overall.label": "全体",
+    "xpack.ux.dashboard.pageLoad.label": "ページの読み込み",
+    "xpack.ux.dashboard.pageLoadDistribution.label": "ページ読み込み分布",
+    "xpack.ux.dashboard.pageLoadDuration.label": "ページ読み込み時間",
+    "xpack.ux.dashboard.pageLoadTime.label": "ページ読み込み時間（秒）",
+    "xpack.ux.dashboard.pageLoadTimes.label": "ページ読み込み時間",
+    "xpack.ux.dashboard.pagesLoaded.label": "ページが読み込まれました",
+    "xpack.ux.dashboard.pageViews": "合計ページビュー",
+    "xpack.ux.dashboard.resetZoom.label": "ズームをリセット",
+    "xpack.ux.dashboard.tooltips.backEnd": "バックエンド時間は、最初の 1 バイトを受信するまでの時間（TTFB）です。これは、要求が実行された後、最初の応答パケットが受信された時点です。",
+    "xpack.ux.dashboard.tooltips.frontEnd": "フロントエンド時間は、合計ページ読み込み時間からバックエンド時間を減算した時間です。",
+    "xpack.ux.dashboard.tooltips.totalPageLoad": "合計はすべてのページ読み込み時間です。",
+    "xpack.ux.dashboard.totalPageLoad": "合計",
+    "xpack.ux.emptyState.loadingMessage": "読み込み中…",
+    "xpack.ux.fetcher.error.status": "エラー",
+    "xpack.ux.fetcher.error.title": "リソースの取得中にエラーが発生しました",
+    "xpack.ux.fetcher.error.url": "URL",
+    "xpack.ux.filter.environment.allLabel": "すべて",
+    "xpack.ux.filter.environment.label": "環境",
+    "xpack.ux.filter.environment.notDefinedLabel": "未定義",
+    "xpack.ux.filter.environment.selectEnvironmentLabel": "環境を選択",
+    "xpack.ux.filterGroup.breakdown": "内訳",
+    "xpack.ux.filterGroup.coreWebVitals": "コアWebバイタル",
+    "xpack.ux.filterGroup.seconds": "秒",
+    "xpack.ux.filterGroup.selectBreakdown": "内訳を選択",
+    "xpack.ux.filters.filterByUrl": "IDでフィルタリング",
+    "xpack.ux.filters.searchResults": "{total}件の検索結果",
+    "xpack.ux.filters.select": "選択してください",
+    "xpack.ux.filters.topPages": "上位のページ",
+    "xpack.ux.filters.url": "Url",
+    "xpack.ux.filters.url.loadingResults": "結果を読み込み中",
+    "xpack.ux.filters.url.noResults": "結果がありません",
+    "xpack.ux.inspectButtonText": "検査",
+    "xpack.ux.jsErrors.errorMessage": "エラーメッセージ",
+    "xpack.ux.jsErrors.errorRate": "エラー率",
+    "xpack.ux.jsErrors.impactedPageLoads": "影響を受けるページ読み込み数",
+    "xpack.ux.jsErrors.percent": "{pageLoadPercent} %",
+    "xpack.ux.jsErrors.totalErrors": "合計エラー数",
+    "xpack.ux.jsErrorsTable.errorMessage": "取得できませんでした",
+    "xpack.ux.localFilters.titles.browser": "ブラウザー",
+    "xpack.ux.localFilters.titles.device": "デバイス",
+    "xpack.ux.localFilters.titles.location": "場所",
+    "xpack.ux.localFilters.titles.os": "OS",
+    "xpack.ux.localFilters.titles.serviceName": "サービス名",
+    "xpack.ux.localFilters.titles.transactionUrl": "URL",
+    "xpack.ux.localFilters.titles.webApplication": "Webアプリケーション",
+    "xpack.ux.localFiltersTitle": "フィルター",
+    "xpack.ux.median": "中間",
+    "xpack.ux.metrics": "メトリック",
+    "xpack.ux.overview.beatsCard.description": "APMエージェントでRUMを有効にして、ユーザーエクスペリエンスデータを収集します。",
+    "xpack.ux.overview.beatsCard.title": "RUMデータを追加",
+    "xpack.ux.overview.heading": "ダッシュボード",
+    "xpack.ux.overview.solutionName": "Observability",
+    "xpack.ux.pageViews.analyze": "分析",
+    "xpack.ux.percentile.50thMedian": "50 番目（中央値）",
+    "xpack.ux.percentile.75th": "75番目",
+    "xpack.ux.percentile.90th": "90番目",
+    "xpack.ux.percentile.95th": "95番目",
+    "xpack.ux.percentile.99th": "99番目",
+    "xpack.ux.percentile.label": "パーセンタイル",
+    "xpack.ux.percentiles.label": "{value} パーセンタイル",
+    "xpack.ux.title": "ダッシュボード",
+    "xpack.ux.urlFilter.wildcard": "ワイルドカード*{wildcard}*を使用",
+    "xpack.ux.uxMetrics.longestLongTasks": "最長タスク時間",
+    "xpack.ux.uxMetrics.longestLongTasksTooltip": "最も長いタスクの時間。長いタスクは、UI スレッドを長時間（50 ミリ秒以上）独占し、他の重要なタスク（フレームレートや入力レイテンシ）の実行を妨害するユーザーアクティビティまたはブラウザータスクとして定義されます。",
+    "xpack.ux.uxMetrics.noOfLongTasks": "時間がかかるタスク数",
+    "xpack.ux.uxMetrics.noOfLongTasksTooltip": "長いタスクの数。長いタスクは、UI スレッドを長時間（50 ミリ秒以上）独占し、他の重要なタスク（フレームレートや入力レイテンシ）の実行を妨害するユーザーアクティビティまたはブラウザータスクとして定義されます。",
+    "xpack.ux.uxMetrics.sumLongTasks": "時間がかかるタスクの合計時間",
+    "xpack.ux.uxMetrics.sumLongTasksTooltip": "長いタスクの合計時間。長いタスクは、UI スレッドを長時間（50 ミリ秒以上）独占し、他の重要なタスク（フレームレートや入力レイテンシ）の実行を妨害するユーザーアクティビティまたはブラウザータスクとして定義されます。",
+    "xpack.ux.visitorBreakdown": "アクセスユーザー内訳",
+    "xpack.ux.visitorBreakdown.browser": "ブラウザー",
+    "xpack.ux.visitorBreakdown.noData": "データがありません。",
+    "xpack.ux.visitorBreakdown.operatingSystem": "オペレーティングシステム",
+    "xpack.ux.visitorBreakdownMap.avgPageLoadDuration": "平均ページ読み込み時間",
+    "xpack.ux.visitorBreakdownMap.pageLoadDurationByRegion": "地域別ページ読み込み時間（平均）",
     "xpack.watcher.app.licenseErrorLinkText": "ライセンスを更新",
     "xpack.watcher.app.licenseErrorTitle": "ライセンスエラー",
     "xpack.watcher.appName": "Watcher",
@@ -29458,6 +31358,22 @@
     "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "含める・除外を反転",
     "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "すべてピン付け",
     "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "すべてのピンを外す",
-    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "すべてのフィルターの変更"
+    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "すべてのフィルターの変更",
+    "unifiedSearch.kueryAutocomplete.andOperatorDescription": "{bothArguments} が true であることを条件とする",
+    "unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "両方の引数",
+    "unifiedSearch.kueryAutocomplete.equalOperatorDescription": "一部の値に{equals}",
+    "unifiedSearch.kueryAutocomplete.equalOperatorDescription.equalsText": "一致する",
+    "unifiedSearch.kueryAutocomplete.existOperatorDescription": "いずれかの形式中に{exists}",
+    "unifiedSearch.kueryAutocomplete.existOperatorDescription.existsText": "存在する",
+    "unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription": "が一部の値{greaterThan}",
+    "unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText": "より大きい",
+    "unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription": "が一部の値{greaterThanOrEqualTo}",
+    "unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText": "よりも大きいまたは等しい",
+    "unifiedSearch.kueryAutocomplete.lessThanOperatorDescription": "が一部の値{lessThan}",
+    "unifiedSearch.kueryAutocomplete.lessThanOperatorDescription.lessThanText": "より小さい",
+    "unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription": "が一部の値{lessThanOrEqualTo}",
+    "unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "より小さいまたは等しい",
+    "unifiedSearch.kueryAutocomplete.orOperatorDescription": "{oneOrMoreArguments} が true であることを条件とする",
+    "unifiedSearch.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "1つ以上の引数"
   }
 }
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 41e2dab0f29ec..444d5e9db060b 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -111,6 +111,7 @@
     "xpack.lens.indexPattern.overall_min.documentation.markdown": "\n为当前图表中序列的所有数据点计算指标的最小值。序列由维度使用 Date Histogram 或时间间隔函数定义。\n分解数据的其他维度，如排名最前值或筛选，将被视为不同的序列。\n\n如果当前图表未使用 Date Histogram 或时间间隔函数，则无论使用什么函数，`overall_min` 都将计算所有维度的最小值\n\n例如：范围的百分比\n`(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))`\n      ",
     "xpack.lens.indexPattern.overall_sum.documentation.markdown": "\n计算当前图表中序列所有数据点的指标的和。序列由维度使用 Date Histogram 或时间间隔函数定义。\n分解数据的其他维度，如排名最前值或筛选，将被视为不同的序列。\n\n如果当前图表未使用 Date Histogram 或时间间隔函数，则无论使用什么函数，`overall_sum` 都将计算所有维度的和。\n\n例如：总计的百分比\n`sum(bytes) / overall_sum(sum(bytes))`\n      ",
     "xpack.lens.indexPattern.percentile.documentation.markdown": "\n返回字段的值的指定百分位数。文档中百分之 n 的值比此值小。\n\n例如：获取大于 95 % 的值的字节数：\n`percentile(bytes, percentile=95)`\n      ",
+    "xpack.lens.indexPattern.time_scale.documentation.markdown": "\n\n此高级函数用于将计数和总和标准化为特定时间间隔。它允许集成所存储的已标准化为特定时间间隔的指标。\n\n此函数只能在当前图表中使用了日期直方图函数时使用。\n\n例如：将已标准化指标与其他需要标准化的指标进行比较的比率。\n`normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)`\n      ",
     "xpack.lens.advancedSettings.useFieldExistenceSampling.description": "如果启用，文档采样将用于确定 Lens 字段列表中的字段是否存在（可用或为空），而不依赖索引映射。",
     "xpack.lens.advancedSettings.useFieldExistenceSampling.title": "使用字段存在采样",
     "xpack.lens.app.addToLibrary": "保存到库",
@@ -120,8 +121,13 @@
     "xpack.lens.app.downloadButtonAriaLabel": "将数据下载为 CSV 文件",
     "xpack.lens.app.downloadButtonFormulasWarning": "您的 CSV 包含电子表格应用程序可能解释为公式的字符。",
     "xpack.lens.app.downloadCSV": "下载为 CSV",
+    "xpack.lens.app.goBackLabel": "返回到 {contextOriginatingApp}",
+    "xpack.lens.app.goBackModalCancelBtn": "取消",
+    "xpack.lens.app.goBackModalMessage": "您在此所做的更改不向后兼容您的原始 {contextOriginatingApp} 可视化。是否确定要放弃这些未保存更改并返回到 {contextOriginatingApp}？",
+    "xpack.lens.app.goBackModalTitle": "放弃更改？",
     "xpack.lens.app.inspect": "检查",
     "xpack.lens.app.inspectAriaLabel": "检查",
+    "xpack.lens.app.lensContext": "Lens 上下文 ({language})",
     "xpack.lens.app.save": "保存",
     "xpack.lens.app.saveAndReturn": "保存并返回",
     "xpack.lens.app.saveAndReturnButtonAriaLabel": "保存当前 Lens 可视化并返回到上一应用",
@@ -129,7 +135,14 @@
     "xpack.lens.app.saveButtonAriaLabel": "保存当前的 Lens 可视化",
     "xpack.lens.app.saveModalType": "Lens 可视化",
     "xpack.lens.app.saveVisualization.successNotificationText": "已保存“{visTitle}”",
+    "xpack.lens.app.settings": "设置",
+    "xpack.lens.app.settingsAriaLabel": "打开 Lens 设置菜单",
+    "xpack.lens.app.showUnderlyingDataMultipleLayers": "无法显示具有多个图层的可视化的底层数据",
+    "xpack.lens.app.showUnderlyingDataNoData": "可视化没有可显示的可用数据",
+    "xpack.lens.app.showUnderlyingDataTimeShifts": "配置了时间偏移时无法显示底层数据",
+    "xpack.lens.app.showUnderlyingDataUnsupportedDatasource": "底层数据不支持当前数据源",
     "xpack.lens.app.unsavedFilename": "未保存",
+    "xpack.lens.app.unsavedWorkConfirmBtn": "放弃更改",
     "xpack.lens.app.unsavedWorkMessage": "离开有未保存工作的 Lens？",
     "xpack.lens.app.unsavedWorkTitle": "未保存的更改",
     "xpack.lens.app.updatePanel": "更新 {originatingAppName} 中的面板",
@@ -151,11 +164,14 @@
     "xpack.lens.configPanel.color.tooltip.auto": "Lens 自动为您选取颜色，除非您指定定制颜色。",
     "xpack.lens.configPanel.color.tooltip.custom": "清除定制颜色以返回到“自动”模式。",
     "xpack.lens.configPanel.color.tooltip.disabled": "当图层包括“细分依据”，各个系列无法定制颜色。",
+    "xpack.lens.configPanel.experimentalLabel": "技术预览",
+    "xpack.lens.configPanel.selectLayerType": "选择图层类型",
     "xpack.lens.configPanel.selectVisualization": "选择可视化",
     "xpack.lens.configPanel.visualizationType": "可视化类型",
     "xpack.lens.configure.configurePanelTitle": "{groupLabel}",
     "xpack.lens.configure.editConfig": "编辑 {label} 配置",
     "xpack.lens.configure.emptyConfig": "添加或拖放字段",
+    "xpack.lens.configure.emptyConfigClick": "添加标注",
     "xpack.lens.configure.invalidBottomReferenceLineDimension": "此参考线分配给了不再存在或不再有效的轴。您可以将此参考线移到其他可用的轴，或将其移除。",
     "xpack.lens.configure.invalidConfigTooltip": "配置无效。",
     "xpack.lens.configure.invalidConfigTooltipClick": "单击了解更多详情。",
@@ -166,11 +182,12 @@
     "xpack.lens.confirmModal.saveDuplicateConfirmationMessage": "具有标题“{title}”的 {name} 已存在。是否确定要保存？",
     "xpack.lens.customBucketContainer.dragToReorder": "拖动以重新排序",
     "xpack.lens.dataPanelWrapper.switchDatasource": "切换到数据源",
-    "xpack.lens.datatable.addLayer": "添加可视化图层",
+    "xpack.lens.datatable.addLayer": "可视化",
     "xpack.lens.datatable.breakdownColumns": "列",
     "xpack.lens.datatable.breakdownColumns.description": "按字段拆分指标列。建议减少列数目以避免水平滚动。",
     "xpack.lens.datatable.breakdownRows": "行",
     "xpack.lens.datatable.breakdownRows.description": "按字段拆分表行。建议将其用于高基数分解。",
+    "xpack.lens.datatable.column.help": "数据表列",
     "xpack.lens.datatable.conjunctionSign": " &amp; ",
     "xpack.lens.datatable.expressionHelpLabel": "数据表呈现器",
     "xpack.lens.datatable.groupLabel": "表格",
@@ -247,26 +264,9 @@
     "xpack.lens.dragDrop.keyboardInstructionsReorder": "按空格键或 enter 键开始拖动。拖动时，请使用上下箭头键重新排列组中的项目，使用左右箭头键在组之外选择拖动目标。再次按空格键或 enter 键结束操作。",
     "xpack.lens.dragDrop.shift": "Shift 键",
     "xpack.lens.dragDrop.swap": "交换",
-    "coloring.dynamicColoring.customPalette.addColor": "添加颜色",
-    "coloring.dynamicColoring.customPalette.addColorAriaLabel": "添加颜色",
-    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "删除",
-    "coloring.dynamicColoring.customPalette.disallowedEditMinMaxValues": "无法为当前配置设置定制值",
-    "coloring.dynamicColoring.customPalette.distributeValues": "分配值",
-    "coloring.dynamicColoring.customPalette.distributeValuesAriaLabel": "分配值",
-    "coloring.dynamicColoring.customPalette.invalidMaxValue": "最大值必须大于之前的值",
-    "coloring.dynamicColoring.customPalette.invalidValueOrColor": "至少一个颜色范围包含错误的值或颜色",
-    "coloring.dynamicColoring.customPalette.maximumStepsApplied": "您已应用最大步数",
-    "coloring.dynamicColoring.customPalette.maxValuePlaceholder": "最大值",
-    "coloring.dynamicColoring.customPalette.minValuePlaceholder": "最小值",
-    "coloring.dynamicColoring.customPalette.oneColorRange": "需要多种颜色",
-    "coloring.dynamicColoring.customPalette.rangeAriaLabel": "范围 {index}",
-    "coloring.dynamicColoring.customPalette.reverseColors": "反转颜色",
-    "coloring.dynamicColoring.customPalette.selectNewColor": "选择新颜色",
-    "coloring.dynamicColoring.customPalette.setCustomMaxValue": "设置定制最小值",
-    "coloring.dynamicColoring.customPalette.setCustomMinValue": "设置定制最大值",
-    "coloring.dynamicColoring.customPalette.useAutoMaxValue": "使用最大数据值",
-    "coloring.dynamicColoring.customPalette.useAutoMinValue": "使用最小数据值",
-    "coloring.dynamicColoring.customPaletteAriaLabel": "反转颜色",
+    "xpack.lens.editorFrame.applyChanges": "应用更改",
+    "xpack.lens.editorFrame.applyChangesLabel": "应用更改",
+    "xpack.lens.editorFrame.applyChangesWorkspacePrompt": "应用更改以呈现可视化",
     "xpack.lens.editorFrame.buildExpressionError": "准备图表时发生意外错误",
     "xpack.lens.editorFrame.colorIndicatorLabel": "此维度的颜色：{hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} 个{errors, plural, other {错误}}",
@@ -301,6 +301,12 @@
     "xpack.lens.embeddable.missingTimeRangeParam.shortMessage": "缺少 timeRange 属性",
     "xpack.lens.embeddable.moreErrors": "在 Lens 编辑器中编辑以查看更多错误",
     "xpack.lens.embeddableDisplayName": "lens",
+    "xpack.lens.endValue.nearest": "最近",
+    "xpack.lens.endValue.none": "隐藏",
+    "xpack.lens.endValue.zero": "零",
+    "xpack.lens.endValueDescription.nearest": "将包含第一个/最后一个值的序列扩展到图表边缘",
+    "xpack.lens.endValueDescription.none": "不将序列扩展到图表边缘",
+    "xpack.lens.endValueDescription.zero": "将为零序列扩展到图表边缘",
     "xpack.lens.fieldFormats.longSuffix.d": "每天",
     "xpack.lens.fieldFormats.longSuffix.h": "每小时",
     "xpack.lens.fieldFormats.longSuffix.m": "每分钟",
@@ -371,9 +377,9 @@
     "xpack.lens.functions.renameColumns.idMap.help": "旧列 ID 为键且相应新列 ID 为值的 JSON 编码对象。所有其他列 ID 都将保留。",
     "xpack.lens.functions.timeScale.dateColumnMissingMessage": "指定的 dateColumnId {columnId} 不存在。",
     "xpack.lens.functions.timeScale.timeInfoMissingMessage": "无法获取日期直方图信息",
-    "xpack.lens.gauge.addLayer": "添加可视化图层",
+    "xpack.lens.gauge.addLayer": "可视化",
     "xpack.lens.gauge.appearanceLabel": "外观",
-    "xpack.lens.gauge.dynamicColoring.label": "波段颜色",
+    "xpack.lens.gauge.dynamicColoring.label": "带颜色",
     "xpack.lens.gauge.gaugeLabel": "仪表盘",
     "xpack.lens.gauge.goalValueLabel": "目标值",
     "xpack.lens.gauge.maxValueLabel": "最大值",
@@ -389,7 +395,7 @@
     "xpack.lens.geoFieldWorkspace.dropZoneLabel": "放置区域以在 Maps 中打开",
     "xpack.lens.guageVisualization.chartCannotRenderEqual": "最小值和最大值不能相等",
     "xpack.lens.guageVisualization.chartCannotRenderMinGreaterMax": "最小值不能大于最大值",
-    "xpack.lens.heatmap.addLayer": "添加可视化图层",
+    "xpack.lens.heatmap.addLayer": "可视化",
     "xpack.lens.heatmap.cellValueLabel": "单元格值",
     "xpack.lens.heatmap.groupLabel": "热图",
     "xpack.lens.heatmap.heatmapLabel": "热图",
@@ -404,8 +410,12 @@
     "xpack.lens.heatmapVisualization.heatmapLabel": "热图",
     "xpack.lens.heatmapVisualization.missingXAccessorLongMessage": "水平轴配置缺失。",
     "xpack.lens.heatmapVisualization.missingXAccessorShortMessage": "缺失水平轴。",
+    "xpack.lens.indexPattern.addColumnAriaLabel": "将字段添加或拖放到 {groupLabel}",
+    "xpack.lens.indexPattern.addColumnAriaLabelClick": "添加标注到 {groupLabel}",
     "xpack.lens.indexPattern.advancedSettings": "添加高级选项",
     "xpack.lens.indexPattern.allFieldsLabel": "所有字段",
+    "xpack.lens.indexPattern.allFieldsLabelHelp": "将可用字段拖放到工作区并创建可视化。要更改可用字段，请选择不同数据视图，编辑您的查询或使用不同时间范围。一些字段类型无法在 Lens 中可视化，包括全文本字段和地理字段。",
+    "xpack.lens.indexPattern.allFieldsSamplingLabelHelp": "可用字段包含与您的筛选匹配的前 500 个文档中的数据。要查看所有字段，请展开空字段。无法使用全文本、地理、扁平和对象字段创建可视化。",
     "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning": "由于数据的索引方式，此可视化的 {name} 可能为近似值。尝试按稀有度排序，而不是采用升序记录计数。有关此限制的详情，{link}。",
     "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning.link": "访问文档",
     "xpack.lens.indexPattern.availableFieldsLabel": "可用字段",
@@ -423,7 +433,7 @@
     "xpack.lens.indexPattern.chooseFieldLabel": "要使用此函数，请选择字段。",
     "xpack.lens.indexPattern.chooseSubFunction": "选择子函数",
     "xpack.lens.indexPattern.columnFormatLabel": "值格式",
-    "xpack.lens.indexPattern.columnLabel": "显示名称",
+    "xpack.lens.indexPattern.columnLabel": "名称",
     "xpack.lens.indexPattern.count": "计数",
     "xpack.lens.indexPattern.counterRate": "计数率",
     "xpack.lens.indexPattern.counterRate.signature": "指标：数字",
@@ -441,8 +451,13 @@
     "xpack.lens.indexPattern.dateHistogram.autoInterval": "定制时间间隔",
     "xpack.lens.indexPattern.dateHistogram.autoIntervalHeader": "已用时间间隔",
     "xpack.lens.indexPattern.dateHistogram.autoLongerExplanation": "要选择时间间隔，Lens 按 {targetBarSetting} 设置分割指定的时间范围。Lens 为您的数据计算最佳时间间隔。例如 30m、1h 和 12。最大条形数由 {maxBarSetting} 值设置。",
+    "xpack.lens.indexPattern.dateHistogram.bindToGlobalTimePicker": "绑定到全局时间选取器",
     "xpack.lens.indexPattern.dateHistogram.days": "天",
+    "xpack.lens.indexPattern.dateHistogram.dropPartialBuckets": "丢弃部分存储桶",
+    "xpack.lens.indexPattern.dateHistogram.dropPartialBucketsHelp": "禁止丢弃部分存储桶，因为只可以为绑定到右上角的全局时间选取器的时间字段计算这些存储桶。",
+    "xpack.lens.indexPattern.dateHistogram.globalTimePickerHelp": "按右上角的全局时间选取器筛选选定字段。不能对当前数据视图的默认时间字段关闭此设置。",
     "xpack.lens.indexPattern.dateHistogram.hours": "小时",
+    "xpack.lens.indexPattern.dateHistogram.includeEmptyRows": "包括空行",
     "xpack.lens.indexPattern.dateHistogram.milliseconds": "毫秒",
     "xpack.lens.indexPattern.dateHistogram.minimumInterval": "最小时间间隔",
     "xpack.lens.indexPattern.dateHistogram.minutes": "分钟",
@@ -474,12 +489,16 @@
     "xpack.lens.indexPattern.fieldNoOperation": "没有运算，无法使用字段 {field}",
     "xpack.lens.indexPattern.fieldPanelEmptyStringValue": "空字符串",
     "xpack.lens.indexPattern.fieldPlaceholder": "字段",
+    "xpack.lens.indexPattern.fieldsNotFound": "找不到{count, plural, other {字段}} {missingFields} {count, plural, other {}}",
     "xpack.lens.indexPattern.fieldStatsButtonAriaLabel": "预览 {fieldName}：{fieldType}",
     "xpack.lens.indexPattern.fieldStatsButtonEmptyLabel": "此字段不包含任何数据，但您仍然可以拖放以进行可视化。",
     "xpack.lens.indexPattern.fieldStatsButtonLabel": "单击以进行字段预览，或拖放以进行可视化。",
     "xpack.lens.indexPattern.fieldStatsCountLabel": "计数",
     "xpack.lens.indexPattern.fieldStatsDisplayToggle": "切换",
     "xpack.lens.indexPattern.fieldStatsLimited": "摘要信息不适用于范围类型字段。",
+    "xpack.lens.indexPattern.fieldStatsNoData": "Lens 无法使用此字段创建可视化，因为其中未包含数据。要创建可视化，请拖放其他字段。",
+    "xpack.lens.indexPattern.fieldStatsSamplingNoData": "Lens 无法使用此字段创建可视化，因为其中未包含与您的筛选匹配的前 500 个文档中的数据。要创建可视化，请拖放其他字段。",
+    "xpack.lens.indexPattern.fieldsWrongType": "{count, plural, other {字段}} {invalidFields} 的类型不正确",
     "xpack.lens.indexPattern.fieldTimeDistributionLabel": "时间分布",
     "xpack.lens.indexPattern.fieldTopValuesLabel": "排名最前值",
     "xpack.lens.indexPattern.filterBy.clickToEdit": "单击以编辑",
@@ -522,6 +541,7 @@
     "xpack.lens.indexPattern.formulaWithTooManyArguments": "运算 {operation} 的参数过多",
     "xpack.lens.indexPattern.functionsLabel": "函数",
     "xpack.lens.indexPattern.groupByDropdown": "分组依据",
+    "xpack.lens.indexPattern.hideZero": "隐藏零值",
     "xpack.lens.indexPattern.incompleteOperation": "（不完整）",
     "xpack.lens.indexPattern.intervals": "时间间隔",
     "xpack.lens.indexPattern.invalidFieldLabel": "字段无效。检查数据视图或选取其他字段。",
@@ -532,6 +552,9 @@
     "xpack.lens.indexPattern.lastValue": "最后值",
     "xpack.lens.indexPattern.lastValue.disabled": "此功能要求数据视图中存在日期字段",
     "xpack.lens.indexPattern.lastValue.invalidTypeSortField": "字段 {invalidField} 不是日期字段，不能用于排序",
+    "xpack.lens.indexPattern.lastValue.showArrayValues": "显示数组值",
+    "xpack.lens.indexPattern.lastValue.showArrayValuesExplanation": "显示与最后每个文档中的此字段关联的所有值。",
+    "xpack.lens.indexPattern.lastValue.showArrayValuesWithTopValuesWarning": "显示数组值时，无法使用此字段对排名最前值排名。",
     "xpack.lens.indexPattern.lastValue.signature": "field: string",
     "xpack.lens.indexPattern.lastValue.sortField": "按日期字段排序",
     "xpack.lens.indexPattern.lastValue.sortFieldNotFound": "未找到字段 {invalidField}",
@@ -570,6 +593,7 @@
     "xpack.lens.indexPattern.multipleTermsOf": "{name} 排名最前值 + {count} 个{count, plural, other {其他值}}",
     "xpack.lens.indexPattern.noDataViewDescription": "请创建数据视图或切换到其他数据源",
     "xpack.lens.indexPattern.noDataViewsLabel": "无数据视图",
+    "xpack.lens.indexPattern.noRealMetricError": "仅包含静态值的图层将不显示结果，请至少使用一个动态指标",
     "xpack.lens.indexPattern.numberFormatLabel": "数字",
     "xpack.lens.indexPattern.ofDocumentsLabel": "文档",
     "xpack.lens.indexPattern.operationsNotFound": "未找到{operationLength, plural, other {运算}} {operationsList}",
@@ -590,7 +614,6 @@
     "xpack.lens.indexPattern.percentile.signature": "field: string, [percentile]: number",
     "xpack.lens.indexPattern.percentileOf": "{name} 的{percentile, selectordinal, one {第一个} two {第二个} few {第三个} other {第 #th 个}}百分位数",
     "xpack.lens.indexPattern.pinnedTopValuesLabel": "{field} 的筛选",
-    "xpack.lens.indexPattern.precisionErrorWarning": "由于数据的索引方式，此可视化的 {name} 可能为近似值。尝试增加 {topValues} 的数量或使用 {filters}（而不是 {topValues}），以获得准确的结果。有关此限制的详情，{link}。",
     "xpack.lens.indexPattern.precisionErrorWarning.filters": "筛选",
     "xpack.lens.indexPattern.precisionErrorWarning.link": "访问文档",
     "xpack.lens.indexPattern.precisionErrorWarning.topValues": "排名最前值",
@@ -609,6 +632,7 @@
     "xpack.lens.indexPattern.ranges.granularityPopoverBasicExplanation": "时间间隔粒度基于字段的最小值和最大值将字段分割为平均分布的时间间隔。",
     "xpack.lens.indexPattern.ranges.granularityPopoverExplanation": "时间间隔的大小是“好”值。滑块的粒度更改时，如果“好的”时间间隔不变，时间间隔也不变。最小粒度为 1，最大值为 {setting}。要更改最大粒度，请前往“高级设置”。",
     "xpack.lens.indexPattern.ranges.granularityPopoverTitle": "粒度时间间隔的工作原理",
+    "xpack.lens.indexPattern.ranges.includeEmptyRows": "包括空行",
     "xpack.lens.indexPattern.ranges.increaseButtonLabel": "增加粒度",
     "xpack.lens.indexPattern.ranges.lessThanOrEqualAppend": "≤",
     "xpack.lens.indexPattern.ranges.lessThanOrEqualTooltip": "小于或等于",
@@ -627,6 +651,8 @@
     "xpack.lens.indexPattern.staticValueLabelWithValue": "静态值：{value}",
     "xpack.lens.indexPattern.staticValueWarning": "当前已应用静态值",
     "xpack.lens.indexPattern.staticValueWarningText": "要覆盖静态值，请选择快速函数",
+    "xpack.lens.indexPattern.suffixLabel": "后缀",
+    "xpack.lens.indexPattern.suggestedValueAriaLabel": "建议值：{groupLabel} 的 {value}",
     "xpack.lens.indexpattern.suggestions.nestingChangeLabel": "每个 {outerOperation} 的 {innerOperation}",
     "xpack.lens.indexpattern.suggestions.overallLabel": "总体 {operation}",
     "xpack.lens.indexpattern.suggestions.overTimeLabel": "时移",
@@ -643,6 +669,7 @@
     "xpack.lens.indexPattern.terms.deleteButtonDisabled": "此函数需要至少定义一个字段",
     "xpack.lens.indexPattern.terms.deleteButtonLabel": "删除",
     "xpack.lens.indexPattern.terms.dragToReorder": "拖动以重新排序",
+    "xpack.lens.indexPattern.terms.invalidFieldsErrorShort": "{invalidFieldsCount, plural, other {字段}}无效：{invalidFields}。检查数据视图或选取其他字段。",
     "xpack.lens.indexPattern.terms.maxDocCount": "每个词的最大文档计数",
     "xpack.lens.indexPattern.terms.missingBucketDescription": "包括没有此字段的文档",
     "xpack.lens.indexPattern.terms.missingLabel": "（缺失值)",
@@ -659,12 +686,17 @@
     "xpack.lens.indexPattern.terms.size": "值数目",
     "xpack.lens.indexPattern.terms.sizeLimitMax": "值大于最大值 {max}，将改为使用最大值。",
     "xpack.lens.indexPattern.terms.sizeLimitMin": "值小于最小值 {min}，将改为使用最小值。",
+    "xpack.lens.indexPattern.termsOf": "{name} 的排名前 {numberOfTermsLabel} 的{termsCount, plural, other {值}}",
     "xpack.lens.indexPattern.termsWithMultipleShifts": "在单个图层中，无法将指标与不同时间偏移和动态排名最前值组合。将相同的时间偏移值用于所有指标或使用筛选，而非排名最前值。",
     "xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel": "使用筛选",
     "xpack.lens.indexPattern.termsWithMultipleTermsAndScriptedFields": "使用多个字段时不支持脚本字段，找到 {fields}",
+    "xpack.lens.indexPattern.time_scale": "指标：数字，单位：s|m|h|d|w|M|y",
+    "xpack.lens.indexPattern.timeScale": "按单位标准化",
     "xpack.lens.indexPattern.timeScale.enableTimeScale": "按单位标准化",
     "xpack.lens.indexPattern.timeScale.label": "按单位标准化",
+    "xpack.lens.indexPattern.timeScale.missingUnit": "没有为按单位标准化指定单位。",
     "xpack.lens.indexPattern.timeScale.tooltip": "将值标准化为始终显示为每指定时间单位速率，无论基础日期时间间隔是多少。",
+    "xpack.lens.indexPattern.timeScale.wrongUnit": "指定了未知单位，请使用 s、m、h 或 d。",
     "xpack.lens.indexPattern.timeShift.12hours": "12 小时前 (12h)",
     "xpack.lens.indexPattern.timeShift.3hours": "3 小时前 (3h)",
     "xpack.lens.indexPattern.timeShift.3months": "3 个月前 (3M)",
@@ -708,28 +740,42 @@
     "xpack.lens.label.gauge.labelMajor.header": "标题",
     "xpack.lens.label.gauge.labelMinor.header": "子标题",
     "xpack.lens.label.header": "标签",
+    "xpack.lens.label.shared.axisHeader": "轴标题",
     "xpack.lens.labelInput.label": "标签",
     "xpack.lens.layerPanel.layerVisualizationType": "图层可视化类型",
     "xpack.lens.layerPanel.missingDataView": "找不到数据视图",
     "xpack.lens.legacyUrlConflict.objectNoun": "Lens 可视化",
     "xpack.lens.lensSavedObjectLabel": "Lens 可视化",
-    "xpack.lens.metric.addLayer": "添加可视化图层",
+    "xpack.lens.lineMarker.positionRequirementTooltip": "必须选择图标或显示名称才能更改其位置",
+    "xpack.lens.lineMarker.textVisibility": "文本装饰",
+    "xpack.lens.metric.addLayer": "可视化",
     "xpack.lens.metric.dynamicColoring.background": "填充",
     "xpack.lens.metric.dynamicColoring.label": "按值上色",
     "xpack.lens.metric.dynamicColoring.none": "无",
     "xpack.lens.metric.dynamicColoring.text": "文本",
     "xpack.lens.metric.groupLabel": "目标值和单值",
     "xpack.lens.metric.label": "指标",
+    "xpack.lens.metricChart.alignLabel.center": "中间对齐",
+    "xpack.lens.metricChart.alignLabel.left": "左对齐",
+    "xpack.lens.metricChart.alignLabel.right": "右对齐",
+    "xpack.lens.metricChart.metricSize.extraLarge": "XL",
+    "xpack.lens.metricChart.metricSize.extraSmall": "XS",
+    "xpack.lens.metricChart.metricSize.large": "L",
+    "xpack.lens.metricChart.metricSize.medium": "M",
+    "xpack.lens.metricChart.metricSize.small": "S",
+    "xpack.lens.metricChart.metricSize.xxl": "XXL",
+    "xpack.lens.metricChart.textFormattingLabel": "文本格式",
+    "xpack.lens.metricChart.titleAlignLabel": "对齐",
+    "xpack.lens.metricChart.titlePositionLabel": "标题位置",
     "xpack.lens.pageTitle": "Lens",
     "xpack.lens.paletteHeatmapGradient.customize": "编辑",
     "xpack.lens.paletteHeatmapGradient.customizeLong": "编辑调色板",
     "xpack.lens.paletteHeatmapGradient.label": "颜色",
     "xpack.lens.paletteMetricGradient.label": "颜色",
-    "coloring.dynamicColoring.palettePicker.colorRangesLabel": "颜色范围",
     "xpack.lens.palettePicker.label": "调色板",
     "xpack.lens.paletteTableGradient.customize": "编辑",
     "xpack.lens.paletteTableGradient.label": "颜色",
-    "xpack.lens.pie.addLayer": "添加可视化图层",
+    "xpack.lens.pie.addLayer": "可视化",
     "xpack.lens.pie.arrayValues": "{label} 包含数组值。您的可视化可能无法正常渲染。",
     "xpack.lens.pie.donutLabel": "圆环图",
     "xpack.lens.pie.groupLabel": "比例",
@@ -772,16 +818,19 @@
     "xpack.lens.section.configPanelLabel": "配置面板",
     "xpack.lens.section.dataPanelLabel": "数据面板",
     "xpack.lens.section.workspaceLabel": "可视化工作区",
+    "xpack.lens.settings.autoApply": "自动应用可视化更改",
+    "xpack.lens.settings.title": "Lens 设置",
+    "xpack.lens.shared.AppearanceLabel": "外观",
     "xpack.lens.shared.axisNameLabel": "轴标题",
     "xpack.lens.shared.chartValueLabelVisibilityLabel": "标签",
     "xpack.lens.shared.curveLabel": "视觉选项",
+    "xpack.lens.shared.legend.filterForValueButtonAriaLabel": "筛留值",
     "xpack.lens.shared.legend.filterOptionsLegend": "{legendDataLabel}, 筛选选项",
+    "xpack.lens.shared.legend.filterOutValueButtonAriaLabel": "筛除值",
     "xpack.lens.shared.legendAlignmentLabel": "对齐方式",
     "xpack.lens.shared.legendInsideAlignmentLabel": "对齐方式",
     "xpack.lens.shared.legendInsideColumnsLabel": "列数目",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "对齐方式",
-    "xpack.lens.shared.legendInsideTooltip": "需要图例位于可视化内",
-    "xpack.lens.shared.legendIsTruncated": "需要截断文本",
     "xpack.lens.shared.legendLabel": "图例",
     "xpack.lens.shared.legendLocationBottomLeft": "左下方",
     "xpack.lens.shared.legendLocationBottomRight": "右下方",
@@ -792,19 +841,27 @@
     "xpack.lens.shared.legendPositionLeft": "左",
     "xpack.lens.shared.legendPositionRight": "右",
     "xpack.lens.shared.legendPositionTop": "顶部",
+    "xpack.lens.shared.legendSizeSetting.label": "图例宽度",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.auto": "自动",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.extraLarge": "特大",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.large": "大",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.medium": "中",
+    "xpack.lens.shared.legendSizeSetting.legendSizeOptions.small": "小",
     "xpack.lens.shared.legendVisibilityLabel": "显示",
-    "xpack.lens.shared.legendVisibleTooltip": "需要图表显示",
     "xpack.lens.shared.maxLinesLabel": "最大行数",
+    "xpack.lens.shared.metric.appearanceLabel": "外观",
     "xpack.lens.shared.nestedLegendLabel": "嵌套",
     "xpack.lens.shared.overwriteAxisTitle": "覆盖轴标题",
-    "xpack.lens.shared.ticksPositionOptions": "波段上的刻度",
-    "xpack.lens.shared.ticksPositionOptionsTooltip": "将刻度放在每个波段边框上，而不是平均分布",
+    "xpack.lens.shared.ticksPositionOptions": "带上的刻度",
+    "xpack.lens.shared.ticksPositionOptionsTooltip": "将刻度放在每个带边框上，而不是平均分布",
     "xpack.lens.shared.truncateLegend": "截断文本",
     "xpack.lens.shared.valueInLegendLabel": "显示值",
     "xpack.lens.shared.valueLabelsVisibility.auto": "隐藏",
     "xpack.lens.shared.valueLabelsVisibility.inside": "显示",
     "xpack.lens.sugegstion.refreshSuggestionLabel": "刷新",
     "xpack.lens.suggestion.refreshSuggestionTooltip": "基于选定可视化刷新建议。",
+    "xpack.lens.suggestions.applyChangesLabel": "应用更改",
+    "xpack.lens.suggestions.applyChangesPrompt": "必须应用最新更改才能查看建议。",
     "xpack.lens.suggestions.currentVisLabel": "当前可视化",
     "xpack.lens.table.actionsLabel": "显示操作",
     "xpack.lens.table.alignment.center": "居中",
@@ -816,17 +873,16 @@
     "xpack.lens.table.columnVisibilityLabel": "隐藏列",
     "xpack.lens.table.defaultAriaLabel": "数据表可视化",
     "xpack.lens.table.dynamicColoring.cell": "单元格",
-    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "百分比值是相对于全范围可用数据值的类型。",
     "xpack.lens.table.dynamicColoring.label": "按值上色",
     "xpack.lens.table.dynamicColoring.none": "无",
-    "coloring.dynamicColoring.rangeType.label": "值类型",
-    "coloring.dynamicColoring.rangeType.number": "数字",
-    "coloring.dynamicColoring.rangeType.percent": "百分比",
     "xpack.lens.table.dynamicColoring.text": "文本",
     "xpack.lens.table.hide.hideLabel": "隐藏",
     "xpack.lens.table.palettePanelContainer.back": "返回",
     "xpack.lens.table.palettePanelTitle": "编辑颜色",
     "xpack.lens.table.resize.reset": "重置宽度",
+    "xpack.lens.table.rowHeight.auto": "自动适应",
+    "xpack.lens.table.rowHeight.custom": "定制",
+    "xpack.lens.table.rowHeight.single": "单个",
     "xpack.lens.table.sort.ascLabel": "升序",
     "xpack.lens.table.sort.descLabel": "降序",
     "xpack.lens.table.summaryRow.average": "平均值",
@@ -842,22 +898,34 @@
     "xpack.lens.table.tableCellFilter.filterOutValueAriaLabel": "筛除值：{cellContent}",
     "xpack.lens.table.tableCellFilter.filterOutValueText": "筛除值",
     "xpack.lens.table.valuesVisualOptions": "视觉选项",
-    "xpack.lens.table.visualOptionsFitRowToContentLabel": "使行适应内容",
+    "xpack.lens.table.visualOptionsFitRowToContentLabel": "单元格行高",
+    "xpack.lens.table.visualOptionsHeaderRowHeightLabel": "标题行高",
     "xpack.lens.table.visualOptionsPaginateTable": "对表分页",
     "xpack.lens.table.visualOptionsPaginateTableTooltip": "如果小于 10 项，将隐藏分页",
     "xpack.lens.timeScale.removeLabel": "删除按时间单位标准化",
     "xpack.lens.timeShift.removeLabel": "移除时间偏移",
+    "xpack.lens.TSVBLabel": "TSVB",
+    "xpack.lens.uniqueLabel": "{label} [{num}]",
+    "xpack.lens.unknownVisType.longMessage": "无法解析可视化类型 {visType}。",
+    "xpack.lens.unknownVisType.shortMessage": "可视化类型未知",
     "xpack.lens.visTypeAlias.description": "使用拖放编辑器创建可视化。随时在可视化类型之间切换。",
     "xpack.lens.visTypeAlias.note": "适合绝大多数用户。",
     "xpack.lens.visTypeAlias.title": "Lens",
     "xpack.lens.visTypeAlias.type": "Lens",
     "xpack.lens.visualizeGeoFieldMessage": "Lens 无法可视化 {fieldType} 字段",
-    "xpack.lens.xyChart.addDataLayerLabel": "添加可视化图层",
+    "xpack.lens.visualizeTSVBLegend": "可视化 TSVB 图表",
+    "xpack.lens.xyChart.addAnnotationsLayerLabel": "标注",
+    "xpack.lens.xyChart.addAnnotationsLayerLabelDisabledHelp": "标注需要基于时间的图表才能运行。添加日期直方图。",
+    "xpack.lens.xyChart.addDataLayerLabel": "可视化",
     "xpack.lens.xyChart.addLayer": "添加图层",
     "xpack.lens.xyChart.addLayerTooltip": "使用多个图层以组合可视化类型或可视化不同的数据视图。",
-    "xpack.lens.xyChart.addReferenceLineLayerLabel": "添加参考图层",
+    "xpack.lens.xyChart.addReferenceLineLayerLabel": "参考线",
     "xpack.lens.xyChart.addReferenceLineLayerLabelDisabledHelp": "添加一些数据以启用参考图层",
+    "xpack.lens.xyChart.annotation.name": "隐藏标注",
+    "xpack.lens.xyChart.annotationDate": "标注日期",
+    "xpack.lens.xyChart.appearance": "外观",
     "xpack.lens.xyChart.axisExtent.custom": "定制",
+    "xpack.lens.xyChart.axisExtent.dataBounds": "数据",
     "xpack.lens.xyChart.axisExtent.disabledDataBoundsMessage": "仅折线图可适应数据边界",
     "xpack.lens.xyChart.axisExtent.full": "实线",
     "xpack.lens.xyChart.axisExtent.label": "边界",
@@ -865,7 +933,6 @@
     "xpack.lens.xyChart.axisOrientation.horizontal": "水平",
     "xpack.lens.xyChart.axisOrientation.label": "方向",
     "xpack.lens.xyChart.axisOrientation.vertical": "垂直",
-    "xpack.lens.xyChart.axisOrientationMultilayer.disabled": "只能使用非基于时间的轴配置这些选项",
     "xpack.lens.xyChart.axisSide.auto": "自动",
     "xpack.lens.xyChart.axisSide.bottom": "底部",
     "xpack.lens.xyChart.axisSide.label": "轴侧",
@@ -876,12 +943,36 @@
     "xpack.lens.xyChart.bottomAxisLabel": "底轴",
     "xpack.lens.xyChart.boundaryError": "下边界必须大于上边界",
     "xpack.lens.xyChart.curveStyleLabel": "曲线",
+    "xpack.lens.xyChart.defaultAnnotationLabel": "事件",
+    "xpack.lens.xyChart.endValuesLabel": "结束值",
+    "xpack.lens.xyChart.fill.above": "之上",
+    "xpack.lens.xyChart.fill.after": "之后",
+    "xpack.lens.xyChart.fill.before": "之前",
+    "xpack.lens.xyChart.fill.below": "之下",
+    "xpack.lens.xyChart.fill.label": "填充",
+    "xpack.lens.xyChart.fill.none": "无",
     "xpack.lens.xyChart.fillOpacityLabel": "填充透明度",
     "xpack.lens.xyChart.Gridlines": "网格线",
     "xpack.lens.xyChart.horizontalAxisLabel": "水平轴",
     "xpack.lens.xyChart.horizontalLeftAxisLabel": "水平顶轴",
     "xpack.lens.xyChart.horizontalRightAxisLabel": "水平底轴",
+    "xpack.lens.xyChart.iconSelect.alertIconLabel": "告警",
+    "xpack.lens.xyChart.iconSelect.asteriskIconLabel": "星号",
+    "xpack.lens.xyChart.iconSelect.bellIconLabel": "钟铃",
+    "xpack.lens.xyChart.iconSelect.boltIconLabel": "闪电",
+    "xpack.lens.xyChart.iconSelect.bugIconLabel": "昆虫",
+    "xpack.lens.xyChart.iconSelect.circleIconLabel": "圆形",
+    "xpack.lens.xyChart.iconSelect.commentIconLabel": "注释",
+    "xpack.lens.xyChart.iconSelect.flagIconLabel": "旗帜",
+    "xpack.lens.xyChart.iconSelect.heartLabel": "心形",
+    "xpack.lens.xyChart.iconSelect.mapMarkerLabel": "地图标记",
+    "xpack.lens.xyChart.iconSelect.mapPinLabel": "地图图钉",
+    "xpack.lens.xyChart.iconSelect.noIconLabel": "无",
+    "xpack.lens.xyChart.iconSelect.starLabel": "五角星",
+    "xpack.lens.xyChart.iconSelect.tagIconLabel": "标签",
+    "xpack.lens.xyChart.iconSelect.triangleIconLabel": "三角形",
     "xpack.lens.xyChart.inclusiveZero": "边界必须包括零。",
+    "xpack.lens.xyChart.layerAnnotationsLabel": "标注",
     "xpack.lens.xyChart.layerReferenceLineLabel": "参考线",
     "xpack.lens.xyChart.leftAxisDisabledHelpText": "此设置仅在启用左轴时应用。",
     "xpack.lens.xyChart.leftAxisLabel": "左轴",
@@ -890,13 +981,25 @@
     "xpack.lens.xyChart.legendVisibility.auto": "自动",
     "xpack.lens.xyChart.legendVisibility.hide": "隐藏",
     "xpack.lens.xyChart.legendVisibility.show": "显示",
+    "xpack.lens.xyChart.lineColor.label": "颜色",
+    "xpack.lens.xyChart.lineMarker.auto": "自动",
+    "xpack.lens.xyChart.lineMarker.icon": "图标装饰",
+    "xpack.lens.xyChart.lineMarker.position": "装饰位置",
+    "xpack.lens.xyChart.lineMarker.textVisibility.name": "名称",
+    "xpack.lens.xyChart.lineMarker.textVisibility.none": "无",
+    "xpack.lens.xyChart.lineStyle.dashed": "虚线",
+    "xpack.lens.xyChart.lineStyle.dotted": "点线",
+    "xpack.lens.xyChart.lineStyle.label": "折线图",
+    "xpack.lens.xyChart.lineStyle.solid": "纯色",
     "xpack.lens.xyChart.markerPosition.above": "顶部",
     "xpack.lens.xyChart.markerPosition.below": "底部",
     "xpack.lens.xyChart.markerPosition.left": "左",
     "xpack.lens.xyChart.markerPosition.right": "右",
     "xpack.lens.xyChart.missingValuesLabel": "缺少的值",
-    "xpack.lens.xyChart.missingValuesLabelHelpText": "默认情况下，Lens 隐藏数据中的缺口。要填充缺口，请进行选择。",
+    "xpack.lens.xyChart.missingValuesLabelHelpText": "默认情况下，面积图和折线图会隐藏数据中的缺口。要填充缺口，请进行选择。",
+    "xpack.lens.xyChart.missingValuesStyle": "显示为虚线",
     "xpack.lens.xyChart.nestUnderRoot": "整个数据集",
+    "xpack.lens.xyChart.placement": "位置",
     "xpack.lens.xyChart.rightAxisDisabledHelpText": "此设置仅在启用右轴时应用。",
     "xpack.lens.xyChart.rightAxisLabel": "右轴",
     "xpack.lens.xyChart.seriesColor.auto": "自动",
@@ -950,49 +1053,6 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "水平百分比条形图",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "垂直百分比条形图",
     "xpack.lens.xyVisualization.xyLabel": "XY",
-    "expressionXY.legend.filterForValueButtonAriaLabel": "筛留值",
-    "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}, 筛选选项",
-    "expressionXY.legend.filterOutValueButtonAriaLabel": "筛除值",
-    "expressionXY.xyVis.axisTitlesVisibilitySettings.help": "显示 x 和 y 轴标题",
-    "expressionXY.xyVis.curveType.help": "定义为折线图渲染曲线类型的方式",
-    "expressionXY.xyChart.emptyXLabel": "（空）",
-    "expressionXY.axisExtentConfig.extentMode.help": "范围模式",
-    "expressionXY.xyVis.fillOpacity.help": "定义面积图填充透明度",
-    "expressionXY.xyVis.fittingFunction.help": "定义处理缺失值的方式",
-    "expressionXY.legendConfig.floatingColumns.help": "指定图例显示在图表内时的列数。",
-    "expressionXY.xyVis.gridlinesVisibilitySettings.help": "显示 x 和 y 轴网格线",
-    "expressionXY.xyVis.help": "X/Y 图表",
-    "expressionXY.xyVis.hideEndzones.help": "隐藏部分数据的末日区域标记",
-    "expressionXY.legendConfig.horizontalAlignment.help": "指定图例显示在图表内时水平对齐。",
-    "expressionXY.legendConfig.isInside.help": "指定图例是否在图表内",
-    "expressionXY.legendConfig.isVisible.help": "指定图例是否可见。",
-    "expressionXY.xyVis.labelsOrientation.help": "定义轴标签的旋转",
-    "expressionXY.xyVis.legend.help": "配置图表图例。",
-    "expressionXY.legendConfig.maxLines.help": "指定每个图例项的行数。",
-    "expressionXY.legendConfig.position.help": "指定图例位置。",
-    "expressionXY.xyVis.renderer.help": "X/Y 图表呈现器",
-    "expressionXY.legendConfig.shouldTruncate.help": "指定是否将截断图例项",
-    "expressionXY.legendConfig.showSingleSeries.help": "指定是否应显示只包含一个条目的图例",
-    "expressionXY.xyVis.tickLabelsVisibilitySettings.help": "显示 x 和 y 轴刻度标签",
-    "expressionXY.xyVis.valuesInLegend.help": "在图例中显示值",
-    "expressionXY.legendConfig.verticalAlignment.help": "指定图例显示在图表内时垂直对齐。",
-    "expressionXY.gridlinesConfig.x.help": "指定 x 轴的网格线是否可见。",
-    "expressionXY.labelsOrientationConfig.x.help": "指定 x 轴的标签方向。",
-    "expressionXY.tickLabelsConfig.x.help": "指定 x 轴的刻度标签是否可见。",
-    "expressionXY.axisTitlesVisibilityConfig.x.help": "指定 x 轴的标题是否可见。",
-    "expressionXY.xyVis.xTitle.help": "X 轴标题",
-    "expressionXY.gridlinesConfig.yLeft.help": "指定左侧 y 轴的网格线是否可见。",
-    "expressionXY.labelsOrientationConfig.yLeft.help": "指定左 y 轴的标签方向。",
-    "expressionXY.tickLabelsConfig.yLeft.help": "指定左侧 y 轴的刻度标签是否可见。",
-    "expressionXY.axisTitlesVisibilityConfig.yLeft.help": "指定左侧 y 轴的标题是否可见。",
-    "expressionXY.xyVis.yLeftExtent.help": "左侧 Y 轴范围",
-    "expressionXY.xyVis.yLeftTitle.help": "左侧 Y 轴标题",
-    "expressionXY.gridlinesConfig.yRight.help": "指定右侧 y 轴的网格线是否可见。",
-    "expressionXY.labelsOrientationConfig.yRight.help": "指定右 y 轴的标签方向。",
-    "expressionXY.tickLabelsConfig.yRight.help": "指定右侧 y 轴的刻度标签是否可见。",
-    "expressionXY.axisTitlesVisibilityConfig.yRight.help": "指定右侧 y 轴的标题是否可见。",
-    "expressionXY.xyVis.yRightExtent.help": "右侧 Y 轴范围",
-    "expressionXY.xyVis.yRightTitle.help": "右侧 Y 轴标题",
     "advancedSettings.advancedSettingsLabel": "高级设置",
     "advancedSettings.badge.readOnly.text": "只读",
     "advancedSettings.badge.readOnly.tooltip": "无法保存高级设置",
@@ -1147,7 +1207,6 @@
     "console.notification.error.historyQuotaReachedMessage": "请求历史记录已满。请清除控制台历史记录或禁止保存新的请求。",
     "console.notification.error.noRequestSelectedTitle": "未选择任何请求。将鼠标置于请求内即可选择。",
     "console.notification.error.unknownErrorTitle": "未知请求错误",
-    "console.outputCannotPreviewBinaryData": "无法预览二进制数据。",
     "console.outputTextarea": "开发工具控制台输出",
     "console.pageHeading": "控制台",
     "console.requestInProgressBadgeText": "进行中的请求",
@@ -1159,6 +1218,7 @@
     "console.sendRequestButtonTooltip": "单击以发送请求",
     "console.settingsPage.autocompleteLabel": "自动完成",
     "console.settingsPage.cancelButtonLabel": "取消",
+    "console.settingsPage.dataStreamsLabelText": "数据流",
     "console.settingsPage.fieldsLabelText": "字段",
     "console.settingsPage.fontSizeLabel": "字体大小",
     "console.settingsPage.historyLabel": "历史记录",
@@ -1197,17 +1257,19 @@
     "console.welcomePage.supportedRequestFormatTitle": "Console 理解紧凑格式的请求，类似于 cURL：",
     "controls.controlGroup.emptyState.addControlButtonTitle": "添加控件",
     "controls.controlGroup.emptyState.callToAction": "您可以通过控件筛选仪表板数据并与其进行交互",
+    "controls.controlGroup.emptyState.dismissButton": "关闭",
     "controls.controlGroup.emptyState.twoLineLoadingTitle": "......",
     "controls.controlGroup.floatingActions.editTitle": "编辑控件",
     "controls.controlGroup.floatingActions.removeTitle": "删除控件",
     "controls.controlGroup.manageControl.cancelTitle": "取消",
+    "controls.controlGroup.manageControl.controlTypesTitle": "控件类型",
     "controls.controlGroup.manageControl.createFlyoutTitle": "创建控件",
     "controls.controlGroup.manageControl.editFlyoutTitle": "编辑控件",
     "controls.controlGroup.manageControl.saveChangesTitle": "保存并关闭",
-    "controls.controlGroup.manageControl.titleInputTitle": "标题",
+    "controls.controlGroup.manageControl.titleInputTitle": "标签",
     "controls.controlGroup.manageControl.widthInputTitle": "控件大小",
     "controls.controlGroup.management.addControl": "添加控件",
-    "controls.controlGroup.management.buttonTitle": "配置控件",
+    "controls.controlGroup.management.buttonTitle": "设置",
     "controls.controlGroup.management.defaultWidthTitle": "默认大小",
     "controls.controlGroup.management.delete": "删除控件",
     "controls.controlGroup.management.delete.cancel": "取消",
@@ -1224,27 +1286,67 @@
     "controls.controlGroup.management.discard.confirm": "放弃更改",
     "controls.controlGroup.management.discard.sub": "将放弃您对此控件所做的更改，是否确定要继续？",
     "controls.controlGroup.management.discard.title": "放弃更改？",
-    "controls.controlGroup.management.flyoutTitle": "配置控件",
+    "controls.controlGroup.management.flyoutTitle": "控制设置",
+    "controls.controlGroup.management.hierarchy.subtitle": "在一个控件中选择的内容会缩小下一个控件中可用选项的范围。控件将从左至右串接在一起。",
+    "controls.controlGroup.management.hierarchy.title": "串接控件",
+    "controls.controlGroup.management.labelPosition.above": "之上",
+    "controls.controlGroup.management.labelPosition.designSwitchLegend": "在内联与之上之间切换标签位置",
+    "controls.controlGroup.management.labelPosition.inline": "内联",
+    "controls.controlGroup.management.labelPosition.title": "标签位置",
     "controls.controlGroup.management.layout.auto": "自动",
     "controls.controlGroup.management.layout.controlWidthLegend": "更改控件大小",
     "controls.controlGroup.management.layout.large": "大",
     "controls.controlGroup.management.layout.medium": "中",
     "controls.controlGroup.management.layout.small": "小",
+    "controls.controlGroup.management.query.advancedSettings": "高级",
+    "controls.controlGroup.management.query.ignoreFilterPills": "忽略筛选胶囊",
+    "controls.controlGroup.management.query.ignoreQuery": "忽略查询栏",
+    "controls.controlGroup.management.query.ignoreTimerange": "忽略时间范围",
+    "controls.controlGroup.management.query.searchSettingsTitle": "与查询栏同步",
+    "controls.controlGroup.management.query.useAllSearchSettingsTitle": "通过从查询栏应用时间范围、筛选胶囊和查询，使控件组与查询栏保持同步",
     "controls.controlGroup.management.setAllWidths": "将所有大小设为默认值",
+    "controls.controlGroup.management.validate.subtitle": "自动忽略所有不会生成数据的控件选择。",
+    "controls.controlGroup.management.validate.title": "验证用户选择",
     "controls.controlGroup.title": "控件组",
+    "controls.controlGroup.toolbarButtonTitle": "控件",
+    "controls.optionsList.description": "添加用于选择字段值的菜单。",
+    "controls.optionsList.displayName": "选项列表",
     "controls.optionsList.editor.allowMultiselectTitle": "下拉列表中允许多选",
     "controls.optionsList.editor.dataViewTitle": "数据视图",
     "controls.optionsList.editor.fieldTitle": "字段",
     "controls.optionsList.editor.noDataViewTitle": "选择数据视图",
     "controls.optionsList.errors.dataViewNotFound": "找不到数据视图：{dataViewId}",
+    "controls.optionsList.errors.fieldNotFound": "找不到字段：{fieldId}",
     "controls.optionsList.popover.allOptionsTitle": "显示所有选项",
+    "controls.optionsList.popover.cardinalityPlaceholder": "搜索 {totalOptions} 个可用{totalOptions, plural, other {选项}}",
+    "controls.optionsList.popover.cardinalityTooltip": "{totalOptions} 个可用选项。",
     "controls.optionsList.popover.clearAllSelectionsTitle": "清除所选内容",
-    "controls.optionsList.popover.empty": "未找到任何筛选",
-    "controls.optionsList.popover.loading": "正在加载筛选",
+    "controls.optionsList.popover.empty": "找不到选项",
+    "controls.optionsList.popover.invalidSelectionsAriaLabel": "取消选择所有已忽略的选择",
+    "controls.optionsList.popover.invalidSelectionsSectionTitle": "已忽略{invalidSelectionCount, plural, other {个选择}}",
+    "controls.optionsList.popover.invalidSelectionsTitle": "已忽略 {invalidSelectionCount} 个选定的选项",
+    "controls.optionsList.popover.invalidSelectionsTooltip": "{selectedOptions} 个选定{selectedOptions, plural, other {选项}} {selectedOptions, plural, other {已}}忽略，因为{selectedOptions, plural, one {其} other {它们}}已不再在数据中。",
+    "controls.optionsList.popover.loading": "正在加载选项",
     "controls.optionsList.popover.selectedOptionsTitle": "仅显示选定选项",
     "controls.optionsList.popover.selectionsEmpty": "您未选择任何内容",
     "controls.optionsList.summary.placeholder": "选择......",
     "controls.optionsList.summary.separator": ",",
+    "controls.rangeSlider.description": "添加用于选择字段值范围的控件。",
+    "controls.rangeSlider.displayName": "范围滑块",
+    "controls.rangeSlider.editor.dataViewTitle": "数据视图",
+    "controls.rangeSlider.editor.fieldTitle": "字段",
+    "controls.rangeSlider.editor.noDataViewTitle": "选择数据视图",
+    "controls.rangeSlider.popover.allOptionsTitle": "显示所有选项",
+    "controls.rangeSlider.popover.clearRangeTitle": "清除范围",
+    "controls.rangeSlider.popover.noDataHelpText": "选定的范围在可用数据以外。未应用任何筛选。",
+    "controls.rangeSlider.popover.upperLessThanLowerErrorMessage": "上边界必须大于或等于下边界。",
+    "controls.timeSlider.description": "添加用于选择时间范围的滑块",
+    "controls.timeSlider.displayName": "时间滑块",
+    "controls.timeSlider.editor.dataViewTitle": "数据视图",
+    "controls.timeSlider.editor.fieldTitle": "字段",
+    "controls.timeSlider.editor.noDataViewTitle": "选择数据视图",
+    "controls.timeSlider.noDocuments.label": "找不到文档。 范围选择不可用。",
+    "controls.timeSlider.resetButton.label": "重置选择",
     "core.application.appContainer.loadingAriaLabel": "正在加载应用程序",
     "core.application.appNotFound.pageDescription": "在此 URL 未找到任何应用程序。尝试返回或从菜单中选择应用。",
     "core.application.appNotFound.title": "未找到应用程序",
@@ -1265,6 +1367,7 @@
     "core.deprecations.elasticsearchUsername.message": "Kibana 已配置为通过“{username}”用户验证到 Elasticsearch。改为使用服务帐户令牌。",
     "core.deprecations.elasticsearchUsername.title": "使用“elasticsearch.username: {username}”已过时",
     "core.deprecations.noCorrectiveAction": "无法自动解决此弃用。",
+    "core.euiAbsoluteTab.dateFormatError": "预期格式：{dateFormat}",
     "core.euiAccordion.isLoading": "正在加载",
     "core.euiAutoRefresh.autoRefreshLabel": "自动刷新",
     "core.euiAutoRefresh.buttonLabelOff": "自动刷新已关闭",
@@ -1326,6 +1429,7 @@
     "core.euiColumnSortingDraggable.defaultSortDesc": "Z-A",
     "core.euiColumnSortingDraggable.removeSortLabel": "从数据网格排序中移除 {display}",
     "core.euiColumnSortingDraggable.toggleLegend": "为 {display} 选择排序方法",
+    "core.euiComboBox.listboxAriaLabel": "从以下选项中选择",
     "core.euiComboBoxOptionsList.allOptionsSelected": "您已选择所有可用选项",
     "core.euiComboBoxOptionsList.alreadyAdded": "{label} 已添加",
     "core.euiComboBoxOptionsList.createCustomOption": "将 {searchValue} 添加为自定义选项",
@@ -1342,6 +1446,7 @@
     "core.euiDataGrid.ariaLabelledBy": "第 {page} 页，共 {pageCount} 页。",
     "core.euiDataGrid.screenReaderNotice": "单元格包含交互内容。",
     "core.euiDataGridCell.position": "行：{row}；列：{col}",
+    "core.euiDataGridCellActions.expandButtonTitle": "单击或按 Enter 键以便与单元格内容进行交互",
     "core.euiDataGridHeaderCell.headerActions": "标题操作",
     "core.euiDataGridPagination.detailedPaginationLabel": "前面网格的分页：{label}",
     "core.euiDataGridPagination.paginationLabel": "前面网格的分页",
@@ -1357,6 +1462,14 @@
     "core.euiDataGridSchema.numberSortTextDesc": "高-低",
     "core.euiDatePopoverButton.invalidTitle": "无效日期：{title}",
     "core.euiDatePopoverButton.outdatedTitle": "需要更新：{title}",
+    "core.euiDatePopoverContent.absoluteTabLabel": "绝对",
+    "core.euiDatePopoverContent.endDateLabel": "结束日期",
+    "core.euiDatePopoverContent.nowTabButtonEnd": "将结束日期和时间设置为现在",
+    "core.euiDatePopoverContent.nowTabButtonStart": "将开始日期和时间设置为现在",
+    "core.euiDatePopoverContent.nowTabContent": "将时间设置为“现在”意味着每次刷新时，都会将该时间设置为刷新时间。",
+    "core.euiDatePopoverContent.nowTabLabel": "现在",
+    "core.euiDatePopoverContent.relativeTabLabel": "相对",
+    "core.euiDatePopoverContent.startDateLabel": "开始日期",
     "core.euiDisplaySelector.buttonText": "显示选项",
     "core.euiDisplaySelector.densityLabel": "密度",
     "core.euiDisplaySelector.labelAuto": "自动适应",
@@ -1380,6 +1493,8 @@
     "core.euiFlyout.closeAriaLabel": "关闭此对话框",
     "core.euiForm.addressFormErrors": "请解决突出显示的错误。",
     "core.euiFormControlLayoutClearButton.label": "清除输入",
+    "core.euiFullscreenSelector.fullscreenButton": "进入全屏",
+    "core.euiFullscreenSelector.fullscreenButtonActive": "退出全屏",
     "core.euiHeaderLinks.appNavigation": "应用菜单",
     "core.euiHeaderLinks.openNavigationMenu": "打开菜单",
     "core.euiHue.label": "选择 HSV 颜色模式“色调”值",
@@ -1432,6 +1547,39 @@
     "core.euiPinnableListGroup.pinExtraActionLabel": "固定项目",
     "core.euiPinnableListGroup.pinnedExtraActionLabel": "取消固定项目",
     "core.euiPopover.screenReaderAnnouncement": "您在对话框中。要关闭此对话框，请按 Esc 键。",
+    "core.euiPrettyDuration.durationRoundedToDay": "{prettyDuration} 已舍入到天",
+    "core.euiPrettyDuration.durationRoundedToHour": "{prettyDuration} 已舍入到小时",
+    "core.euiPrettyDuration.durationRoundedToMinute": "{prettyDuration} 已舍入到分钟",
+    "core.euiPrettyDuration.durationRoundedToMonth": "{prettyDuration} 已舍入到月",
+    "core.euiPrettyDuration.durationRoundedToSecond": "{prettyDuration} 已舍入到秒",
+    "core.euiPrettyDuration.durationRoundedToWeek": "{prettyDuration} 已舍入到周",
+    "core.euiPrettyDuration.durationRoundedToYear": "{prettyDuration} 已舍入到年",
+    "core.euiPrettyDuration.fallbackDuration": "{displayFrom} 到 {displayTo}",
+    "core.euiPrettyDuration.invalid": "日期无效",
+    "core.euiPrettyDuration.lastDurationDays": "过去 {duration, plural, other {# 天}}",
+    "core.euiPrettyDuration.lastDurationHours": "过去 {duration, plural, other {# 小时}}",
+    "core.euiPrettyDuration.lastDurationMinutes": "过去 {duration, plural, other {# 分钟}}",
+    "core.euiPrettyDuration.lastDurationMonths": "过去 {duration, plural, other {# 个月}}",
+    "core.euiPrettyDuration.lastDurationSeconds": "过去 {duration, plural, other {# 秒}}",
+    "core.euiPrettyDuration.lastDurationWeeks": "过去 {duration, plural, other {# 周}}",
+    "core.euiPrettyDuration.lastDurationYears": "过去 {duration, plural, other {# 年}}",
+    "core.euiPrettyDuration.nextDurationHours": "未来 {duration, plural, other {# 小时}}",
+    "core.euiPrettyDuration.nextDurationMinutes": "未来 {duration, plural, other {# 分钟}}",
+    "core.euiPrettyDuration.nextDurationMonths": "未来 {duration, plural, other {# 个月}}",
+    "core.euiPrettyDuration.nextDurationSeconds": "未来 {duration, plural, other {# 秒}}",
+    "core.euiPrettyDuration.nextDurationWeeks": "未来 {duration, plural, other {# 周}}",
+    "core.euiPrettyDuration.nextDurationYears": "未来 {duration, plural, other {# 年}}",
+    "core.euiPrettyDuration.nexttDurationDays": "未来 {duration, plural, other {# 天}}",
+    "core.euiPrettyDuration.now": "现在",
+    "core.euiPrettyInterval.days": "{interval, plural, other {# 天}}",
+    "core.euiPrettyInterval.daysShorthand": "{interval} d",
+    "core.euiPrettyInterval.hours": "{interval, plural, other {# 小时}}",
+    "core.euiPrettyInterval.hoursShorthand": "{interval} h",
+    "core.euiPrettyInterval.minutes": "{interval, plural, other {# 分钟}}",
+    "core.euiPrettyInterval.minutesShorthand": "{interval} m",
+    "core.euiPrettyInterval.off": "关闭",
+    "core.euiPrettyInterval.seconds": "{interval, plural, other {# 秒}}",
+    "core.euiPrettyInterval.secondsShorthand": "{interval} s",
     "core.euiProgress.valueText": "{value}%",
     "core.euiQuickSelect.applyButton": "应用",
     "core.euiQuickSelect.fullDescription": "当前设置为 {timeTense} {timeValue} {timeUnit}。",
@@ -1460,10 +1608,15 @@
     "core.euiSelectable.noAvailableOptions": "没有可用选项",
     "core.euiSelectable.noMatchingOptions": "{searchValue} 不匹配任何选项",
     "core.euiSelectable.placeholderName": "筛选选项",
+    "core.euiSelectable.screenReaderInstructions": "使用向上和向下箭头键将焦点移到选项上。按 Enter 键进行选择。按 Esc 键折叠选项。",
+    "core.euiSelectable.searchResults": "{resultsLength, plural, other {# 个结果}}",
+    "core.euiSelectableListItem.checkedOption": "选中的选项。",
+    "core.euiSelectableListItem.checkedOptionInstructions": "要取消选中此选项，请按 Enter 键。",
     "core.euiSelectableListItem.excludedOption": "排除的选项。",
-    "core.euiSelectableListItem.excludedOptionInstructions": "要取消选择此选项，请按 Enter 键。",
-    "core.euiSelectableListItem.includedOption": "包括的选项。",
+    "core.euiSelectableListItem.excludedOptionInstructions": "要取消选中此选项，请按 Enter 键。",
+    "core.euiSelectableListItem.includedOption": "选定的选项。",
     "core.euiSelectableListItem.includedOptionInstructions": "要排除此选项，请按 Enter 键。",
+    "core.euiSelectableListItem.unckeckedOptionInstructions": "要选择此选项，请按 Enter 键。",
     "core.euiSelectableTemplateSitewide.loadingResults": "正在加载结果",
     "core.euiSelectableTemplateSitewide.noResults": "没有可用结果",
     "core.euiSelectableTemplateSitewide.onFocusBadgeGoTo": "前往",
@@ -1485,6 +1638,12 @@
     "core.euiStepStrings.simpleWarning": "第 {number} 步有警告",
     "core.euiStepStrings.step": "第 {number} 步：{title}",
     "core.euiStepStrings.warning": "第 {number} 步：{title} 有警告",
+    "core.euiSuggest.stateLoading": "状态：正在加载。",
+    "core.euiSuggest.stateSaved": "状态：已保存。",
+    "core.euiSuggest.stateSavedTooltip": "已保存。",
+    "core.euiSuggest.stateUnchanged": "状态：未更改。",
+    "core.euiSuggest.stateUnsaved": "状态：未保存。",
+    "core.euiSuggest.stateUnsavedTooltip": "更改尚未保存。",
     "core.euiSuperSelect.screenReaderAnnouncement": "您位于表单选择器中，必须选择单个选项。使用向上和向下箭头键导航，使用 Esc 键关闭。",
     "core.euiSuperSelectControl.selectAnOption": "选择选项：{selectedValue} 已选",
     "core.euiSuperUpdateButton.cannotUpdateTooltip": "无法更新",
@@ -1493,9 +1652,49 @@
     "core.euiSuperUpdateButton.updateButtonLabel": "更新",
     "core.euiSuperUpdateButton.updatingButtonLabel": "正在更新",
     "core.euiTableHeaderCell.titleTextWithDesc": "{innerText}；{description}",
+    "core.euiTablePagination.allRows": "正在显示所有行",
     "core.euiTablePagination.rowsPerPage": "每页行数",
     "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} 行",
+    "core.euiTablePagination.rowsPerPageOptionShowAllRows": "显示所有行",
     "core.euiTableSortMobile.sorting": "排序",
+    "core.euiTimeOptions.days": "天",
+    "core.euiTimeOptions.daysAgo": "天前",
+    "core.euiTimeOptions.daysFromNow": "自现在开始的天数",
+    "core.euiTimeOptions.hours": "小时",
+    "core.euiTimeOptions.hoursAgo": "小时前",
+    "core.euiTimeOptions.hoursFromNow": "自现在开始的小时数",
+    "core.euiTimeOptions.last": "最后一个",
+    "core.euiTimeOptions.minutes": "分钟",
+    "core.euiTimeOptions.minutesAgo": "分钟前",
+    "core.euiTimeOptions.minutesFromNow": "自现在开始的分钟数",
+    "core.euiTimeOptions.months": "月",
+    "core.euiTimeOptions.monthsAgo": "个月前",
+    "core.euiTimeOptions.monthsFromNow": "自现在开始的月份数",
+    "core.euiTimeOptions.monthToDate": "本月迄今为止",
+    "core.euiTimeOptions.next": "下一步",
+    "core.euiTimeOptions.roundToDay": "舍入到天",
+    "core.euiTimeOptions.roundToHour": "舍入到小时",
+    "core.euiTimeOptions.roundToMinute": "舍入到分钟",
+    "core.euiTimeOptions.roundToMonth": "舍入到月",
+    "core.euiTimeOptions.roundToSecond": "舍入到秒",
+    "core.euiTimeOptions.roundToWeek": "舍入到周",
+    "core.euiTimeOptions.roundToYear": "舍入到年",
+    "core.euiTimeOptions.seconds": "秒",
+    "core.euiTimeOptions.secondsAgo": "秒前",
+    "core.euiTimeOptions.secondsFromNow": "自现在开始的秒数",
+    "core.euiTimeOptions.thisMonth": "本月",
+    "core.euiTimeOptions.thisWeek": "本周",
+    "core.euiTimeOptions.thisYear": "本年",
+    "core.euiTimeOptions.today": "今日",
+    "core.euiTimeOptions.weeks": "周",
+    "core.euiTimeOptions.weeksAgo": "周前",
+    "core.euiTimeOptions.weeksFromNow": "自现在开始的周数",
+    "core.euiTimeOptions.weekToDate": "本周迄今为止",
+    "core.euiTimeOptions.years": "年",
+    "core.euiTimeOptions.yearsAgo": "年前",
+    "core.euiTimeOptions.yearsFromNow": "自现在开始的年数",
+    "core.euiTimeOptions.yearToDate": "本年迄今为止",
+    "core.euiTimeOptions.yesterday": "昨天",
     "core.euiToast.dismissToast": "关闭 Toast",
     "core.euiToast.newNotification": "新通知出现",
     "core.euiToast.notification": "通知",
@@ -1549,13 +1748,18 @@
     "core.toasts.errorToast.seeFullError": "请参阅完整的错误信息",
     "core.ui_settings.params.darkModeText": "对 Kibana UI 启用深色模式。需要刷新页面，才能应用设置。",
     "core.ui_settings.params.darkModeTitle": "深色模式",
+    "core.ui_settings.params.dateFormat.dayOfWeekText": "一周开始的那一天。",
     "core.ui_settings.params.dateFormat.dayOfWeekTitle": "周内日",
     "core.ui_settings.params.dateFormat.optionsLinkText": "格式",
     "core.ui_settings.params.dateFormat.scaled.intervalsLinkText": "ISO8601 时间间隔",
     "core.ui_settings.params.dateFormat.scaledText": "定义在以下场合中采用的格式的值：基于时间的数据按顺序呈现，且经格式化的时间戳应适应度量之间的时间间隔。键是{intervalsLink}。",
     "core.ui_settings.params.dateFormat.scaledTitle": "标度日期格式",
     "core.ui_settings.params.dateFormat.timezone.invalidValidationMessage": "时区无效：{timezone}",
+    "core.ui_settings.params.dateFormat.timezoneText": "默认时区。",
+    "core.ui_settings.params.dateFormat.timezoneTitle": "时区",
+    "core.ui_settings.params.dateFormatText": "格式正确的日期的 {formatLink}。",
     "core.ui_settings.params.dateFormatTitle": "日期格式",
+    "core.ui_settings.params.dateNanosFormatText": "{dateNanosLink} 数据的格式。",
     "core.ui_settings.params.dateNanosFormatTitle": "纳秒格式的日期",
     "core.ui_settings.params.dateNanosLinkTitle": "date_nanos",
     "core.ui_settings.params.dayOfWeekText.invalidValidationMessage": "周内日无效：{dayOfWeek}",
@@ -1612,6 +1816,9 @@
     "core.ui.primaryNav.screenReaderLabel": "主分片",
     "core.ui.primaryNav.toggleNavAriaLabel": "切换主导航",
     "core.ui.primaryNavSection.screenReaderLabel": "主导航链接, {category}",
+    "core.ui.publicBaseUrlWarning.configRecommendedDescription": "在生产环境中，建议您配置 {configKey}。",
+    "core.ui.publicBaseUrlWarning.configRecommendedTitle": "建议配置",
+    "core.ui.publicBaseUrlWarning.learnMoreLinkLabel": "了解详情。",
     "core.ui.publicBaseUrlWarning.muteWarningButtonLabel": "静音警告",
     "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}，类型：{pageType}",
     "core.ui.recentlyViewed": "最近查看",
@@ -1869,22 +2076,6 @@
     "data.inspector.table.tableLabel": "表 {index}",
     "data.inspector.table.tablesDescription": "总共有 {tablesCount, plural, other {# 个表} }",
     "data.inspector.table.tableSelectorLabel": "已选定：",
-    "data.kueryAutocomplete.andOperatorDescription": "需要{bothArguments}为 true",
-    "data.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "两个参数都",
-    "data.kueryAutocomplete.equalOperatorDescription": "{equals}某一值",
-    "data.kueryAutocomplete.equalOperatorDescription.equalsText": "等于",
-    "data.kueryAutocomplete.existOperatorDescription": "以任意形式{exists}",
-    "data.kueryAutocomplete.existOperatorDescription.existsText": "存在",
-    "data.kueryAutocomplete.greaterThanOperatorDescription": "{greaterThan}某一值",
-    "data.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText": "大于",
-    "data.kueryAutocomplete.greaterThanOrEqualOperatorDescription": "{greaterThanOrEqualTo}某一值",
-    "data.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText": "大于或等于",
-    "data.kueryAutocomplete.lessThanOperatorDescription": "{lessThan}某一值",
-    "data.kueryAutocomplete.lessThanOperatorDescription.lessThanText": "小于",
-    "data.kueryAutocomplete.lessThanOrEqualOperatorDescription": "{lessThanOrEqualTo}某一值",
-    "data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "小于或等于",
-    "data.kueryAutocomplete.orOperatorDescription": "需要{oneOrMoreArguments}为 true",
-    "data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "一个或多个参数",
     "data.painlessError.buttonTxt": "编辑脚本",
     "data.painlessError.painlessScriptedFieldErrorMessage": "在索引模式 {indexPatternName} 上执行运行时字段或脚本字段时出错",
     "data.parseEsInterval.invalidEsCalendarIntervalErrorMessage": "无效的日历时间间隔：{interval}，值必须为 1",
@@ -1897,6 +2088,7 @@
     "data.search.aggs.buckets.dateHistogram.dropPartials.help": "指定是否将 drop_partials 用于此聚合",
     "data.search.aggs.buckets.dateHistogram.enabled.help": "指定是否启用此聚合",
     "data.search.aggs.buckets.dateHistogram.extendedBounds.help": "使用 extended_bounds 设置，现在可以“强制”Histogram 聚合先基于特定最小值构建存储桶，然后继续构建不超过最大值的存储桶 ",
+    "data.search.aggs.buckets.dateHistogram.extendToTimeRange.help": "自动将扩展边界设置为当前应用的时间范围。在已设置 extended_bounds 时忽略",
     "data.search.aggs.buckets.dateHistogram.field.help": "要用于此聚合的字段",
     "data.search.aggs.buckets.dateHistogram.format.help": "要用于此聚合的格式",
     "data.search.aggs.buckets.dateHistogram.id.help": "此聚合的 ID",
@@ -1924,7 +2116,7 @@
     "data.search.aggs.buckets.diversifiedSampler.id.help": "此聚合的 ID",
     "data.search.aggs.buckets.diversifiedSampler.maxDocsPerValue.help": "限制每个消重值选择允许的文档数。",
     "data.search.aggs.buckets.diversifiedSampler.schema.help": "要用于此聚合的方案",
-    "data.search.aggs.buckets.diversifiedSampler.shardSize.help": "shard_size 参数限制在每个分片上处理的样例中收集的评分最高文档数。",
+    "data.search.aggs.buckets.diversifiedSampler.shardSize.help": "shard_size 参数限制有多少个最高评分文档将收集在每个分片上处理的取样中。",
     "data.search.aggs.buckets.diversifiedSamplerTitle": "多样化取样器",
     "data.search.aggs.buckets.filter.customLabel.help": "表示此聚合的定制标签",
     "data.search.aggs.buckets.filter.enabled.help": "指定是否启用此聚合",
@@ -1961,6 +2153,7 @@
     "data.search.aggs.buckets.geoTile.schema.help": "要用于此聚合的方案",
     "data.search.aggs.buckets.geoTile.useGeocentroid.help": "指定是否将 geocentroid 用于此聚合",
     "data.search.aggs.buckets.geotileGridTitle": "地理磁贴",
+    "data.search.aggs.buckets.histogram.autoExtendBounds.help": "设置为 true 以将边界延伸到数据域。这样可确保这些边界内的每个时间间隔存储桶将创建单独的表行",
     "data.search.aggs.buckets.histogram.customLabel.help": "表示此聚合的定制标签",
     "data.search.aggs.buckets.histogram.enabled.help": "指定是否启用此聚合",
     "data.search.aggs.buckets.histogram.extendedBounds.help": "使用 extended_bounds 设置，现在可以“强制”Histogram 聚合先基于特定最小值构建存储桶，然后继续构建不超过最大值的存储桶 ",
@@ -2025,7 +2218,7 @@
     "data.search.aggs.buckets.sampler.enabled.help": "指定是否启用此聚合",
     "data.search.aggs.buckets.sampler.id.help": "此聚合的 ID",
     "data.search.aggs.buckets.sampler.schema.help": "要用于此聚合的方案",
-    "data.search.aggs.buckets.sampler.shardSize.help": "shard_size 参数限制在每个分片上处理的样例中收集的评分最高文档数。",
+    "data.search.aggs.buckets.sampler.shardSize.help": "shard_size 参数限制有多少个最高评分文档将收集在每个分片上处理的取样中。",
     "data.search.aggs.buckets.samplerTitle": "取样器",
     "data.search.aggs.buckets.shardDelay.customLabel.help": "表示此聚合的定制标签",
     "data.search.aggs.buckets.shardDelay.delay.help": "要处理的分片之间的延迟。例如：“5s”。",
@@ -2127,6 +2320,7 @@
     "data.search.aggs.function.metrics.std_deviation.help": "为标准偏差聚合生成序列化聚合配置",
     "data.search.aggs.function.metrics.sum.help": "为求和聚合生成序列化聚合配置",
     "data.search.aggs.function.metrics.top_hit.help": "为最高命中结果聚合生成序列化聚合配置",
+    "data.search.aggs.function.metrics.topMetrics.help": "为排名靠前的指标生成序列化聚合配置。",
     "data.search.aggs.histogram.missingMaxMinValuesWarning": "无法检索最大值和最小值以自动缩放直方图存储桶。这可能会导致可视化性能低下。",
     "data.search.aggs.metrics.averageBucketTitle": "平均值存储桶",
     "data.search.aggs.metrics.averageLabel": "{field}平均值",
@@ -2197,6 +2391,7 @@
     "data.search.aggs.metrics.derivative.schema.help": "要用于此聚合的方案",
     "data.search.aggs.metrics.derivativeLabel": "导数",
     "data.search.aggs.metrics.derivativeTitle": "导数",
+    "data.search.aggs.metrics.emptyAsNull.help": "如果设置为 true，会在生成的数据表中将缺失值视为 null。如果设置为 false，则填充“零”",
     "data.search.aggs.metrics.filtered_metric.customBucket.help": "要用于构建同级管道聚合的聚合配置。必须是筛选聚合",
     "data.search.aggs.metrics.filtered_metric.customLabel.help": "表示此聚合的定制标签",
     "data.search.aggs.metrics.filtered_metric.customMetric.help": "要用于构建同级管道聚合的聚合配置",
@@ -2345,6 +2540,22 @@
     "data.search.aggs.metrics.topHit.minLabel": "最小值",
     "data.search.aggs.metrics.topHit.sumLabel": "求和",
     "data.search.aggs.metrics.topHitTitle": "最高命中结果",
+    "data.search.aggs.metrics.topMetrics.ascendingLabel": "升序",
+    "data.search.aggs.metrics.topMetrics.ascNoSizeLabel": "第一个按“{sortField}”排序的“{fieldName}”值",
+    "data.search.aggs.metrics.topMetrics.ascWithSizeLabel": "前 {size} 个按“{sortField}”排序的“{fieldName}”值",
+    "data.search.aggs.metrics.topMetrics.customLabel.help": "表示此聚合的定制标签",
+    "data.search.aggs.metrics.topMetrics.descendingLabel": "降序",
+    "data.search.aggs.metrics.topMetrics.descNoSizeLabel": "最后一个按“{sortField}”排序的“{fieldName}”值",
+    "data.search.aggs.metrics.topMetrics.descWithSizeLabel": "最后 {size} 个按“{sortField}”排序的“{fieldName}”值",
+    "data.search.aggs.metrics.topMetrics.enabled.help": "指定是否启用此聚合",
+    "data.search.aggs.metrics.topMetrics.field.help": "要用于此聚合的字段",
+    "data.search.aggs.metrics.topMetrics.id.help": "此聚合的 ID",
+    "data.search.aggs.metrics.topMetrics.json.help": "聚合发送至 Elasticsearch 时要包括的高级 JSON",
+    "data.search.aggs.metrics.topMetrics.schema.help": "要用于此聚合的方案",
+    "data.search.aggs.metrics.topMetrics.size.help": "要检索的排名最前值数量",
+    "data.search.aggs.metrics.topMetrics.sortField.help": "排列结果的依据字段",
+    "data.search.aggs.metrics.topMetrics.sortOrder.help": "返回结果的顺序：asc 或 desc",
+    "data.search.aggs.metrics.topMetricsTitle": "排名靠前的指标",
     "data.search.aggs.metrics.uniqueCountLabel": "“{field}”的唯一计数",
     "data.search.aggs.metrics.uniqueCountTitle": "唯一计数",
     "data.search.aggs.otherBucket.labelForMissingValuesLabel": "缺失值的标签",
@@ -2536,6 +2747,7 @@
     "discover.advancedSettings.defaultColumnsText": "Discover 应用中默认显示的列。如果为空，将显示文档摘要。",
     "discover.advancedSettings.defaultColumnsTitle": "默认列",
     "discover.advancedSettings.disableDocumentExplorer": "Document Explorer 或经典视图",
+    "discover.advancedSettings.disableDocumentExplorerDescription": "要使用新的 {documentExplorerDocs}，而非经典视图，请关闭此选项。Document Explorer 提供了更合理的数据排序、可调整大小的列和全屏视图。",
     "discover.advancedSettings.discover.fieldStatisticsLinkText": "字段统计信息视图",
     "discover.advancedSettings.discover.modifyColumnsOnSwitchText": "移除新数据视图中不存在的列。",
     "discover.advancedSettings.discover.modifyColumnsOnSwitchTitle": "在更改数据视图时修改列",
@@ -2548,6 +2760,7 @@
     "discover.advancedSettings.discover.showMultifieldsDescription": "控制 {multiFields} 是否显示在展开的文档视图中。多数情况下，多字段与原始字段相同。此选项仅在 `searchFieldsFromSource` 关闭时可用。",
     "discover.advancedSettings.docTableHideTimeColumnText": "在 Discover 中和仪表板上的所有已保存搜索中隐藏“时间”列。",
     "discover.advancedSettings.docTableHideTimeColumnTitle": "隐藏“时间”列",
+    "discover.advancedSettings.documentExplorerLinkText": "Document Explorer",
     "discover.advancedSettings.fieldsPopularLimitText": "要显示的排名前 N 最常见字段",
     "discover.advancedSettings.fieldsPopularLimitTitle": "常见字段限制",
     "discover.advancedSettings.maxDocFieldsDisplayedText": "在文档摘要中渲染的最大字段数目",
@@ -2607,9 +2820,17 @@
     "discover.doc.loadingDescription": "正在加载……",
     "discover.doc.somethingWentWrongDescription": "{indexName} 缺失。",
     "discover.doc.somethingWentWrongDescriptionAddon": "请确保索引存在。",
+    "discover.docExplorerCallout.bodyMessage": "使用 {documentExplorer} 快速排序、选择和比较数据，调整列大小并以全屏方式查看文档。",
     "discover.docExplorerCallout.closeButtonAriaLabel": "关闭",
+    "discover.docExplorerCallout.documentExplorer": "Document Explorer",
     "discover.docExplorerCallout.headerMessage": "更好的浏览方式",
+    "discover.docExplorerCallout.learnMore": "了解详情",
     "discover.docExplorerCallout.tryDocumentExplorer": "试用 Document Explorer",
+    "discover.docExplorerUpdateCallout.bodyMessage": "体验新的 {documentExplorer}。通过 {fieldStatistics} 了解您数据的形状。",
+    "discover.docExplorerUpdateCallout.closeButtonAriaLabel": "关闭",
+    "discover.docExplorerUpdateCallout.documentExplorer": "Document Explorer",
+    "discover.docExplorerUpdateCallout.fieldStatistics": "字段统计信息",
+    "discover.docExplorerUpdateCallout.headerMessage": "更好的浏览方式",
     "discover.docTable.documentsNavigation": "文档导航",
     "discover.docTable.limitedSearchResultLabel": "仅限于 {resultCount} 个结果。优化您的搜索。",
     "discover.docTable.noResultsTitle": "找不到结果",
@@ -2667,6 +2888,7 @@
     "discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "无法搜索未编入索引的字段或被忽略的值",
     "discover.docViews.table.unpinFieldAriaLabel": "取消固定字段",
     "discover.docViews.table.unpinFieldLabel": "取消固定字段",
+    "discover.editVisualizationButton": "编辑可视化",
     "discover.embeddable.inspectorRequestDataTitle": "数据",
     "discover.embeddable.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
     "discover.embeddable.search.displayName": "搜索",
@@ -2737,6 +2959,7 @@
     "discover.fieldNameIcons.unknownFieldAriaLabel": "未知字段",
     "discover.fieldNameIcons.versionFieldAriaLabel": "版本字段",
     "discover.goToDiscoverMainViewButtonText": "前往 Discover 主视图",
+    "discover.grid.copyToClipBoardButton": "复制到剪贴板",
     "discover.grid.documentHeader": "文档",
     "discover.grid.filterFor": "筛留",
     "discover.grid.filterForAria": "筛留此 {value}",
@@ -2748,6 +2971,7 @@
     "discover.grid.flyout.toastFilterAdded": "已添加筛选",
     "discover.grid.tableRow.detailHeading": "已展开文档",
     "discover.grid.tableRow.viewSingleDocumentLinkTextSimple": "单个文档",
+    "discover.grid.tableRow.viewSurroundingDocumentsHover": "检查在此文档之前和之后出现的文档。在周围文档视图中，仅已固定筛选仍处于活动状态。",
     "discover.grid.tableRow.viewSurroundingDocumentsLinkTextSimple": "周围文档",
     "discover.grid.tableRow.viewText": "视图：",
     "discover.grid.viewDoc": "切换具有详情的对话框",
@@ -2959,12 +3183,48 @@
     "esUi.formWizard.saveButtonLabel": "保存",
     "esUi.formWizard.savingButtonLabel": "正在保存......",
     "esUi.validation.string.invalidJSONError": "JSON 无效",
+    "esUi.viewApiRequest.closeButtonLabel": "关闭",
+    "esUi.viewApiRequest.copyToClipboardButton": "复制到剪贴板",
+    "esUi.viewApiRequest.openInConsoleButton": "在 Console 中打开",
+    "eventAnnotation.group.args.annotationConfigs": "标注配置",
+    "eventAnnotation.group.description": "事件标注组",
+    "eventAnnotation.manualAnnotation.args.color": "线条的颜色",
+    "eventAnnotation.manualAnnotation.args.icon": "用于标注线条的可选图标",
+    "eventAnnotation.manualAnnotation.args.isHidden": "切换到隐藏标注",
+    "eventAnnotation.manualAnnotation.args.label": "标注的名称",
+    "eventAnnotation.manualAnnotation.args.lineStyle": "标注线条的样式",
+    "eventAnnotation.manualAnnotation.args.lineWidth": "标注线条的宽度",
+    "eventAnnotation.manualAnnotation.args.textVisibility": "标注线条上标签的可见性",
+    "eventAnnotation.manualAnnotation.args.time": "标注的时间戳",
+    "eventAnnotation.manualAnnotation.description": "配置手动标注",
     "expressionError.errorComponent.description": "表达式失败，并显示消息：",
     "expressionError.errorComponent.title": "哎哟！表达式失败",
     "expressionError.renderer.debug.displayName": "故障排查",
     "expressionError.renderer.debug.helpDescription": "将故障排查输出呈现为带格式的 {JSON}",
     "expressionError.renderer.error.displayName": "错误信息",
     "expressionError.renderer.error.helpDescription": "以用户友好的方式呈现错误数据",
+    "expressionGauge.functions.gauge.args.centralMajor.help": "指定在图表内部显示的仪表盘图表的 centralMajor。",
+    "expressionGauge.functions.gauge.args.centralMajorMode.help": "指定 centralMajor 的模式",
+    "expressionGauge.functions.gauge.args.colorMode.help": "如果设置为调色板，将对带应用调色板颜色",
+    "expressionGauge.functions.gauge.args.commonLabel.help": "指定图表外部的通用标签",
+    "expressionGauge.functions.gauge.args.goal.help": "目标值",
+    "expressionGauge.functions.gauge.args.labelMajor.help": "指定在图表内显示的仪表盘图表的 labelMajor。",
+    "expressionGauge.functions.gauge.args.labelMajorMode.help": "指定 labelMajor 的模式",
+    "expressionGauge.functions.gauge.args.labelMinor.help": "指定仪表盘图表的 labelMinor",
+    "expressionGauge.functions.gauge.args.max.help": "最大值",
+    "expressionGauge.functions.gauge.args.metric.help": "当前值",
+    "expressionGauge.functions.gauge.args.min.help": "最小值",
+    "expressionGauge.functions.gauge.args.palette.help": "为值提供颜色",
+    "expressionGauge.functions.gauge.args.shape.help": "仪表盘图表的类型",
+    "expressionGauge.functions.gauge.args.ticksPosition.help": "指定刻度的位置",
+    "expressionGauge.functions.gauge.errors.centralMajorNotSupportedForShapeError": "形状“{shape}”不支持“centralMajor”和“centralMajorMode”字段",
+    "expressionGauge.functions.gauge.help": "仪表盘可视化",
+    "expressionGauge.functions.gauge.percentageMode.help": "启用相对百分比模式",
+    "expressionGauge.functions.gaugeChart.config.ariaLabel.help": "指定仪表盘图表的 aria 标签",
+    "expressionGauge.logDatatable.goal": "目标图",
+    "expressionGauge.logDatatable.max": "最大值",
+    "expressionGauge.logDatatable.metric": "指标",
+    "expressionGauge.logDatatable.min": "最小值",
     "expressionGauge.renderer.chartCannotRenderEqual": "最小值和最大值不能相等",
     "expressionGauge.renderer.chartCannotRenderMinGreaterMax": "最小值不能大于最大值",
     "expressionGauge.renderer.visualizationName": "仪表盘",
@@ -2984,6 +3244,7 @@
     "expressionHeatmap.function.args.legend.maxLines.help": "指定每个图例项的行数。",
     "expressionHeatmap.function.args.legend.position.help": "指定图例位置。",
     "expressionHeatmap.function.args.legend.shouldTruncate.help": "指定是否截断图例项。",
+    "expressionHeatmap.function.args.legendSize.help": "指定图例大小（像素）。",
     "expressionHeatmap.function.args.splitColumnAccessorHelpText": "拆分列或对应维度的 ID",
     "expressionHeatmap.function.args.splitRowAccessorHelpText": "拆分行或对应维度的 ID",
     "expressionHeatmap.function.args.valueAccessorHelpText": "值列或对应维度的 ID",
@@ -2999,6 +3260,7 @@
     "expressionHeatmap.function.legendConfig.help": "配置图表图例。",
     "expressionHeatmap.function.palette.help": "根据边界为值提供颜色。",
     "expressionHeatmap.function.percentageMode.help": "如果打开，将以百分比显示工具提示和图例。",
+    "expressionHeatmap.functions.args.ariaLabelHelpText": "指定热图的 aria 标签",
     "expressionHeatmap.visualizationName": "热图",
     "expressionImage.functions.image.args.dataurlHelpText": "图像的 {https} {URL} 或 {BASE64} 数据 {URL}。",
     "expressionImage.functions.image.args.modeHelpText": "{contain} 将显示整个图像，图像缩放至适合大小。{cover} 将使用该图像填充容器，根据需要在两边或底部裁剪图像。{stretch} 将图像的高和宽调整为容器的 100%。",
@@ -3013,16 +3275,64 @@
     "expressionMetric.functions.metricHelpText": "在标签上显示数字。",
     "expressionMetric.renderer.metric.displayName": "指标",
     "expressionMetric.renderer.metric.helpDescription": "在标签上呈现数字",
+    "expressionMetricVis.function.autoScale.help": "启用自动缩放",
     "expressionMetricVis.function.bucket.help": "存储桶维度配置",
+    "expressionMetricVis.function.colorFullBackground.help": "将选定背景色应用于全可视化容器",
     "expressionMetricVis.function.colorMode.help": "指标的哪部分要上色",
     "expressionMetricVis.function.dimension.metric": "指标",
     "expressionMetricVis.function.dimension.splitGroup": "拆分组",
+    "expressionMetricVis.function.errors.severalMetricsAndColorFullBackgroundSpecified": "无法将全背景着色应用于具有多个指标的可视化。",
+    "expressionMetricVis.function.errors.splitByBucketAndColorFullBackgroundSpecified": "无法将全背景着色应用于指定了存储桶的可视化。",
     "expressionMetricVis.function.font.help": "字体设置。",
     "expressionMetricVis.function.help": "指标可视化",
+    "expressionMetricVis.function.labelFont.help": "标签字体设置。",
+    "expressionMetricVis.function.labelPosition.help": "标签位置",
     "expressionMetricVis.function.metric.help": "指标维度配置",
     "expressionMetricVis.function.palette.help": "根据边界为值提供颜色。",
     "expressionMetricVis.function.percentageMode.help": "以百分比模式显示指标。需要设置 colorRange。",
     "expressionMetricVis.function.showLabels.help": "在指标值下显示标签。",
+    "expressionPartitionVis.legend.filterForValueButtonAriaLabel": "筛留值",
+    "expressionPartitionVis.legend.filterOptionsLegend": "{legendDataLabel}, 筛选选项",
+    "expressionPartitionVis.legend.filterOutValueButtonAriaLabel": "筛除值",
+    "expressionPartitionVis.negativeValuesFound": "{chartType} 图表无法使用负值进行呈现。",
+    "expressionPartitionVis.partitionLabels.function.args.last_level.help": "仅为多层饼图/圆环图显示顶层标签",
+    "expressionPartitionVis.partitionLabels.function.args.percentDecimals.help": "定义在值中将显示为百分比的小数位数",
+    "expressionPartitionVis.partitionLabels.function.args.position.help": "定义标签位置",
+    "expressionPartitionVis.partitionLabels.function.args.show.help": "显示分区图表标签",
+    "expressionPartitionVis.partitionLabels.function.args.truncate.help": "仅为多层饼图/圆环图定义切片值将显示的字符数",
+    "expressionPartitionVis.partitionLabels.function.args.values.help": "定义切片内的值",
+    "expressionPartitionVis.partitionLabels.function.args.valuesFormat.help": "定义值的格式",
+    "expressionPartitionVis.partitionLabels.function.help": "生成分区标签对象",
+    "expressionPartitionVis.pieVis.function.args.distinctColorsHelpText": "每个切片映射不同颜色。具有相同值的切片具有相同的颜色",
+    "expressionPartitionVis.pieVis.function.help": "饼图可视化",
+    "expressionPartitionVis.renderer.partitionVis.pie.displayName": "分区可视化",
+    "expressionPartitionVis.renderer.partitionVis.pie.helpDescription": "呈现饼图/圆环图/树状图/马赛克/华夫饼图",
+    "expressionPartitionVis.reusable.function.args.addTooltipHelpText": "在切片上悬浮时显示工具提示",
+    "expressionPartitionVis.reusable.function.args.bucketsHelpText": "存储桶维度配置",
+    "expressionPartitionVis.reusable.function.args.emptySizeRatioHelpText": "定义圆环图内部空面积大小",
+    "expressionPartitionVis.reusable.function.args.isDonutHelpText": "将饼图显示为圆环图",
+    "expressionPartitionVis.reusable.function.args.labelsHelpText": "饼图标签配置",
+    "expressionPartitionVis.reusable.function.args.legendDisplayHelpText": "显示图表图例",
+    "expressionPartitionVis.reusable.function.args.legendPositionHelpText": "将图例定位于图表的顶部、底部、左侧、右侧",
+    "expressionPartitionVis.reusable.function.args.legendSizeHelpText": "指定图例大小（像素）",
+    "expressionPartitionVis.reusable.function.args.maxLegendLinesHelpText": "定义每个图例项的行数",
+    "expressionPartitionVis.reusable.function.args.metricHelpText": "指标维度配置",
+    "expressionPartitionVis.reusable.function.args.nestedLegendHelpText": "显示更详细的图例",
+    "expressionPartitionVis.reusable.function.args.paletteHelpText": "定义图表调色板名称",
+    "expressionPartitionVis.reusable.function.args.respectSourceOrderHelpText": "保留从数据源返回的元素顺序",
+    "expressionPartitionVis.reusable.function.args.splitColumnHelpText": "按列维度配置拆分",
+    "expressionPartitionVis.reusable.function.args.splitRowHelpText": "按行维度配置拆分",
+    "expressionPartitionVis.reusable.function.args.startPlacementWithSecondLargestSliceHelpText": "用第二大的切片开始放置",
+    "expressionPartitionVis.reusable.function.args.truncateLegendHelpText": "定义是否将截断图例项",
+    "expressionPartitionVis.reusable.function.dimension.buckets": "切片",
+    "expressionPartitionVis.reusable.function.dimension.metric": "切片大小",
+    "expressionPartitionVis.reusable.function.dimension.splitcolumn": "列拆分",
+    "expressionPartitionVis.reusable.function.dimension.splitrow": "行拆分",
+    "expressionPartitionVis.reusable.function.errors.moreThenNumberBuckets": "不支持 {maxLength} 个以上的存储桶",
+    "expressionPartitionVis.reusable.function.errors.splitRowAndColumnSpecified": "指定了拆分行和列。表达式一次只支持其中一项。",
+    "expressionPartitionVis.reusable.functions.args.ariaLabelHelpText": "指定图表的 aria 标签",
+    "expressionPartitionVis.waffle.function.args.bucketHelpText": "存储桶维度配置",
+    "expressionPartitionVis.waffle.function.args.showValuesInLegendHelpText": "在图例中显示值",
     "expressionRepeatImage.error.repeatImage.missingMaxArgument": "如果提供 {emptyImageArgument}，则必须设置 {maxArgument}",
     "expressionRepeatImage.functions.repeatImage.args.emptyImageHelpText": "使用此图像填充元素的 {CONTEXT} 和 {maxArg} 参数之间的差距。以 {BASE64} 数据 {URL} 的形式提供图像资产或传入子表达式。",
     "expressionRepeatImage.functions.repeatImage.args.imageHelpText": "要重复的图像。以 {BASE64} 数据 {URL} 的形式提供图像资产或传入子表达式。",
@@ -3085,6 +3395,7 @@
     "expressions.functions.mathColumn.args.nameHelpText": "结果列的名称。名称不需要唯一。",
     "expressions.functions.mathColumn.arrayValueError": "无法对 {name} 的数组值执行数学运算",
     "expressions.functions.mathColumn.uniqueIdError": "ID 必须唯一",
+    "expressions.functions.mathColumnHelpText": "通过评估每行上的 {tinymath} 来添加列。此函数针对数学进行了优化，比在 {mapColumnFn} 中使用数学表达式更好。",
     "expressions.functions.mathHelpText": "使用 {TYPE_NUMBER} 或 {DATATABLE} 作为 {CONTEXT} 来解释 {TINYMATH} 数学表达式。{DATATABLE} 列按列名使用。如果 {CONTEXT} 是数字，则作为 {value} 使用。",
     "expressions.functions.movingAverage.args.byHelpText": "用于移动平均值计算拆分依据的列",
     "expressions.functions.movingAverage.args.inputColumnIdHelpText": "要计算移动平均值的列",
@@ -3137,6 +3448,7 @@
     "expressionShape.renderer.shape.helpDescription": "呈现基本形状",
     "expressionTagcloud.feedbackMessage.tooSmallContainerDescription": "容器太小，无法显示整个云。标签可能被裁剪或省略。",
     "expressionTagcloud.feedbackMessage.truncatedTagsDescription": "标签数量已截断，以避免绘制时间过长。",
+    "expressionTagcloud.functions.tagcloud.args.ariaLabelHelpText": "指定标签云图的 aria 标签",
     "expressionTagcloud.functions.tagcloud.args.bucketHelpText": "存储桶维度配置",
     "expressionTagcloud.functions.tagcloud.args.maxFontSizeHelpText": "最大字体大小",
     "expressionTagcloud.functions.tagcloud.args.metricHelpText": "指标维度配置",
@@ -3152,6 +3464,107 @@
     "expressionTagcloud.functions.tagcloudHelpText": "标签云图可视化。",
     "expressionTagcloud.renderer.tagcloud.displayName": "标签云图可视化",
     "expressionTagcloud.renderer.tagcloud.helpDescription": "呈现标签云图",
+    "expressionXY.axisExtentConfig.extentMode.help": "范围模式",
+    "expressionXY.axisExtentConfig.help": "配置 xy 图表的轴范围",
+    "expressionXY.axisExtentConfig.lowerBound.help": "下边界",
+    "expressionXY.axisExtentConfig.upperBound.help": "上边界",
+    "expressionXY.axisTitlesVisibilityConfig.help": "配置 xy 图表的轴标题外观",
+    "expressionXY.axisTitlesVisibilityConfig.x.help": "指定 x 轴的标题是否可见。",
+    "expressionXY.axisTitlesVisibilityConfig.yLeft.help": "指定左侧 y 轴的标题是否可见。",
+    "expressionXY.axisTitlesVisibilityConfig.yRight.help": "指定右侧 y 轴的标题是否可见。",
+    "expressionXY.dataLayer.accessors.help": "要在 y 轴上显示的列。",
+    "expressionXY.dataLayer.columnToLabel.help": "要标记的列 ID 的 JSON 键值对",
+    "expressionXY.dataLayer.help": "配置 xy 图表中的图层",
+    "expressionXY.dataLayer.hide.help": "显示/隐藏轴",
+    "expressionXY.dataLayer.isHistogram.help": "是否将图表布局为直方图",
+    "expressionXY.dataLayer.layerId.help": "图层 ID",
+    "expressionXY.dataLayer.palette.help": "调色板",
+    "expressionXY.dataLayer.seriesType.help": "要显示的图表的类型。",
+    "expressionXY.dataLayer.splitAccessor.help": "拆分要依据的列",
+    "expressionXY.dataLayer.xAccessor.help": "X 轴",
+    "expressionXY.dataLayer.xScaleType.help": "x 轴的缩放类型",
+    "expressionXY.dataLayer.yConfig.help": "y 轴的其他配置",
+    "expressionXY.dataLayer.yScaleType.help": "y 轴的缩放类型",
+    "expressionXY.gridlinesConfig.help": "配置 xy 图表的网格线外观",
+    "expressionXY.gridlinesConfig.x.help": "指定 x 轴的网格线是否可见。",
+    "expressionXY.gridlinesConfig.yLeft.help": "指定左侧 y 轴的网格线是否可见。",
+    "expressionXY.gridlinesConfig.yRight.help": "指定右侧 y 轴的网格线是否可见。",
+    "expressionXY.labelsOrientationConfig.help": "配置 xy 图表的刻度标签方向",
+    "expressionXY.labelsOrientationConfig.x.help": "指定 x 轴的标签方向。",
+    "expressionXY.labelsOrientationConfig.yLeft.help": "指定左 y 轴的标签方向。",
+    "expressionXY.labelsOrientationConfig.yRight.help": "指定右 y 轴的标签方向。",
+    "expressionXY.legend.filterForValueButtonAriaLabel": "筛留值",
+    "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}, 筛选选项",
+    "expressionXY.legend.filterOutValueButtonAriaLabel": "筛除值",
+    "expressionXY.legendConfig.floatingColumns.help": "指定图例显示在图表内时的列数。",
+    "expressionXY.legendConfig.help": "配置 xy 图表的图例",
+    "expressionXY.legendConfig.horizontalAlignment.help": "指定图例显示在图表内时水平对齐。",
+    "expressionXY.legendConfig.isInside.help": "指定图例是否在图表内",
+    "expressionXY.legendConfig.isVisible.help": "指定图例是否可见。",
+    "expressionXY.legendConfig.legendSize.help": "指定图例大小（像素）。",
+    "expressionXY.legendConfig.maxLines.help": "指定每个图例项的行数。",
+    "expressionXY.legendConfig.position.help": "指定图例位置。",
+    "expressionXY.legendConfig.shouldTruncate.help": "指定是否将截断图例项",
+    "expressionXY.legendConfig.showSingleSeries.help": "指定是否应显示只包含一个条目的图例",
+    "expressionXY.legendConfig.verticalAlignment.help": "指定图例显示在图表内时垂直对齐。",
+    "expressionXY.referenceLineLayer.accessors.help": "要在 y 轴上显示的列。",
+    "expressionXY.referenceLineLayer.columnToLabel.help": "要标记的列 ID 的 JSON 键值对",
+    "expressionXY.referenceLineLayer.help": "配置 xy 图表中的参考线",
+    "expressionXY.referenceLineLayer.layerId.help": "图层 ID",
+    "expressionXY.referenceLineLayer.yConfig.help": "y 轴的其他配置",
+    "expressionXY.tickLabelsConfig.help": "配置 xy 图表的刻度标签外观",
+    "expressionXY.tickLabelsConfig.x.help": "指定 x 轴的刻度标签是否可见。",
+    "expressionXY.tickLabelsConfig.yLeft.help": "指定左侧 y 轴的刻度标签是否可见。",
+    "expressionXY.tickLabelsConfig.yRight.help": "指定右侧 y 轴的刻度标签是否可见。",
+    "expressionXY.xyChart.emptyXLabel": "（空）",
+    "expressionXY.xyChart.iconSelect.alertIconLabel": "告警",
+    "expressionXY.xyChart.iconSelect.asteriskIconLabel": "星号",
+    "expressionXY.xyChart.iconSelect.bellIconLabel": "钟铃",
+    "expressionXY.xyChart.iconSelect.boltIconLabel": "闪电",
+    "expressionXY.xyChart.iconSelect.bugIconLabel": "昆虫",
+    "expressionXY.xyChart.iconSelect.circleIconLabel": "圆形",
+    "expressionXY.xyChart.iconSelect.commentIconLabel": "注释",
+    "expressionXY.xyChart.iconSelect.flagIconLabel": "旗帜",
+    "expressionXY.xyChart.iconSelect.heartLabel": "心形",
+    "expressionXY.xyChart.iconSelect.mapMarkerLabel": "地图标记",
+    "expressionXY.xyChart.iconSelect.mapPinLabel": "地图图钉",
+    "expressionXY.xyChart.iconSelect.starLabel": "五角星",
+    "expressionXY.xyChart.iconSelect.tagIconLabel": "标签",
+    "expressionXY.xyChart.iconSelect.triangleIconLabel": "三角形",
+    "expressionXY.xyVis.ariaLabel.help": "指定 xy 图表的 aria 标签",
+    "expressionXY.xyVis.axisTitlesVisibilitySettings.help": "显示 x 和 y 轴标题",
+    "expressionXY.xyVis.curveType.help": "定义为折线图渲染曲线类型的方式",
+    "expressionXY.xyVis.endValue.help": "结束值",
+    "expressionXY.xyVis.fillOpacity.help": "定义面积图填充透明度",
+    "expressionXY.xyVis.fittingFunction.help": "定义处理缺失值的方式",
+    "expressionXY.xyVis.gridlinesVisibilitySettings.help": "显示 x 和 y 轴网格线",
+    "expressionXY.xyVis.help": "X/Y 图表",
+    "expressionXY.xyVis.hideEndzones.help": "隐藏部分数据的末日区域标记",
+    "expressionXY.xyVis.labelsOrientation.help": "定义轴标签的旋转",
+    "expressionXY.xyVis.layers.help": "可视序列的图层",
+    "expressionXY.xyVis.legend.help": "配置图表图例。",
+    "expressionXY.xyVis.logDatatable.breakDown": "细分方式",
+    "expressionXY.xyVis.logDatatable.metric": "垂直轴",
+    "expressionXY.xyVis.logDatatable.x": "水平轴",
+    "expressionXY.xyVis.renderer.help": "X/Y 图表呈现器",
+    "expressionXY.xyVis.tickLabelsVisibilitySettings.help": "显示 x 和 y 轴刻度标签",
+    "expressionXY.xyVis.valueLabels.help": "值标签模式",
+    "expressionXY.xyVis.valuesInLegend.help": "在图例中显示值",
+    "expressionXY.xyVis.xTitle.help": "X 轴标题",
+    "expressionXY.xyVis.yLeftExtent.help": "左侧 Y 轴范围",
+    "expressionXY.xyVis.yLeftTitle.help": "左侧 Y 轴标题",
+    "expressionXY.xyVis.yRightExtent.help": "右侧 Y 轴范围",
+    "expressionXY.xyVis.yRightTitle.help": "右侧 Y 轴标题",
+    "expressionXY.yConfig.axisMode.help": "指标的轴模式",
+    "expressionXY.yConfig.color.help": "序列的颜色",
+    "expressionXY.yConfig.fill.help": "填充",
+    "expressionXY.yConfig.forAccessor.help": "此配置针对的访问器",
+    "expressionXY.yConfig.help": "配置 xy 图表的 y 轴指标的行为",
+    "expressionXY.yConfig.icon.help": "用于参考线的可选图标",
+    "expressionXY.yConfig.iconPosition.help": "参考线图标的位置",
+    "expressionXY.yConfig.lineStyle.help": "参考线的样式",
+    "expressionXY.yConfig.lineWidth.help": "参考线的宽度",
+    "expressionXY.yConfig.textVisibility.help": "参考线上标签的可见性",
     "fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数值格式",
     "fieldFormats.advancedSettings.format.bytesFormatText": "“字节”格式的默认{numeralFormatLink}",
     "fieldFormats.advancedSettings.format.bytesFormatTitle": "字节格式",
@@ -4070,6 +4483,7 @@
     "home.tutorials.zscalerLogs.shortDescription": "使用 Filebeat 从 Zscaler NSS 收集并解析日志。",
     "home.welcomeTitle": "欢迎使用 Elastic",
     "indexPatternEditor.aliasLabel": "别名",
+    "indexPatternEditor.createDataView.emptyState.createAnywayLink": "根据隐藏、系统或默认索引创建数据视图。",
     "indexPatternEditor.createIndex.noMatch": "名称必须匹配一个或多个数据流、索引或索引别名。",
     "indexPatternEditor.createIndexPattern.emptyState.checkDataButton": "检查新数据",
     "indexPatternEditor.createIndexPattern.emptyState.createAnywayTxt": "您还可以{link}",
@@ -4292,9 +4706,18 @@
     "indexPatternManagement.dataViews.badge.readOnly.tooltip": "无法保存数据视图",
     "indexPatternManagement.dataViews.createBreadcrumb": "创建数据视图",
     "indexPatternManagement.dataViews.listBreadcrumb": "数据视图",
+    "indexPatternManagement.dataViewTable.columnDelete": "删除",
+    "indexPatternManagement.dataViewTable.columnDeleteDescription": "删除此数据视图",
     "indexPatternManagement.dataViewTable.createBtn": "创建数据视图",
+    "indexPatternManagement.dataViewTable.dataViewColumnName": "数据视图",
+    "indexPatternManagement.dataViewTable.deleteButtonLabel": "删除 {selectedItems, number} 个{selectedItems, plural, other {数据视图} }",
+    "indexPatternManagement.dataViewTable.deleteConfirmSummary": "您将永久删除 {count, number} 个{count, plural, other {数据视图} }。",
     "indexPatternManagement.dataViewTable.indexPatternExplanation": "创建和管理帮助您从 Elasticsearch 中检索数据的数据视图。",
     "indexPatternManagement.dataViewTable.nameColumn": "名称",
+    "indexPatternManagement.dataViewTable.spaceCountAll": "全部",
+    "indexPatternManagement.dataViewTable.spacesColumn": "工作区",
+    "indexPatternManagement.dataViewTable.spacesColumnName": "工作区",
+    "indexPatternManagement.dataViewTable.tableTitle": "选定数据视图以便删除",
     "indexPatternManagement.dataViewTable.title": "数据视图",
     "indexPatternManagement.defaultFormatDropDown": "- 默认值 -",
     "indexPatternManagement.defaultFormatHeader": "格式（默认值：{defaultFormat}）",
@@ -4306,7 +4729,9 @@
     "indexPatternManagement.deleteFieldLabel": "您无法恢复已删除字段。{separator}确定要执行此操作？",
     "indexPatternManagement.disabledCallOutHeader": "脚本已禁用",
     "indexPatternManagement.disabledCallOutLabel": "所有内联脚本在 Elasticsearch 中已禁用。必须至少为一种语言启用内联脚本，才能在 Kibana 中使用脚本字段。",
-    "indexPatternManagement.editDataView.deleteHeader": "删除数据视图？",
+    "indexPatternManagement.editDataView.deleteHeader": "删除数据视图",
+    "indexPatternManagement.editDataView.deleteWarning": "将删除数据视图 {dataViewName}。此操作无法撤消。",
+    "indexPatternManagement.editDataView.deleteWarningWithNamespaces": "从共享数据视图的每个工作区中删除数据视图 {dataViewName}。此操作无法撤消。",
     "indexPatternManagement.editDataView.detailsAria": "数据视图详情",
     "indexPatternManagement.editDataView.fields.table.conflictType": "冲突",
     "indexPatternManagement.editDataView.fields.table.runtimeIconTipText": "此字段仅在数据视图上存在。",
@@ -4323,8 +4748,15 @@
     "indexPatternManagement.editIndexPattern.fields.conflictModal.closeBtn": "关闭",
     "indexPatternManagement.editIndexPattern.fields.conflictModal.description": "{fieldName} 字段的类型在不同索引中会有所不同，并且可能无法用于搜索、可视化和其他分析。",
     "indexPatternManagement.editIndexPattern.fields.conflictModal.title": "此字段存在类型冲突",
+    "indexPatternManagement.editIndexPattern.fields.filter": "字段类型",
     "indexPatternManagement.editIndexPattern.fields.filterAria": "筛选字段类型",
     "indexPatternManagement.editIndexPattern.fields.filterPlaceholder": "搜索",
+    "indexPatternManagement.editIndexPattern.fields.indexed": "已索引",
+    "indexPatternManagement.editIndexPattern.fields.runtime": "运行时",
+    "indexPatternManagement.editIndexPattern.fields.schema": "架构类型",
+    "indexPatternManagement.editIndexPattern.fields.schemaAria": "筛选架构类型",
+    "indexPatternManagement.editIndexPattern.fields.scriptedFieldFilter": "所有语言",
+    "indexPatternManagement.editIndexPattern.fields.scriptedFieldFilterAria": "筛选脚本字段语言",
     "indexPatternManagement.editIndexPattern.fields.searchAria": "搜索字段",
     "indexPatternManagement.editIndexPattern.fields.table.additionalInfoAriaLabel": "其他字段信息",
     "indexPatternManagement.editIndexPattern.fields.table.aggregatableDescription": "这些字段可用在可视化聚合中",
@@ -4408,6 +4840,7 @@
     "indexPatternManagement.indexPatterns.badge.readOnly.text": "只读",
     "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "创建字段",
     "indexPatternManagement.indexPatternTable.badge.securityDataViewTitle": "安全数据视图",
+    "indexPatternManagement.indexPatternTable.savedObjectName": "数据视图",
     "indexPatternManagement.labelHelpText": "设置此字段在 Discover、Maps 和 Visualize 中显示时要使用的定制标签。当前查询和筛选不支持定制标签，将使用原始字段名称。",
     "indexPatternManagement.languageLabel": "语言",
     "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict}您已经有名称为 {fieldName} 的字段。使用相同的名称命名您的脚本字段意味着您将无法同时查找两个字段。",
@@ -4519,6 +4952,7 @@
     "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "这通常表示无需提取任何数据，或该元素尚未开始提取数据。",
     "inspector.requests.noRequestsLoggedTitle": "未记录任何请求",
     "inspector.requests.openInConsoleLabel": "在 Console 中打开",
+    "inspector.requests.openInSearchProfilerLabel": "在 Search Profiler 中打开",
     "inspector.requests.requestFailedTooltipTitle": "请求失败",
     "inspector.requests.requestInProgressAriaLabel": "进行中的请求",
     "inspector.requests.requestsDescriptionTooltip": "查看已收集数据的请求",
@@ -4692,6 +5126,7 @@
     "lists.exceptions.isNotOperatorLabel": "不是",
     "lists.exceptions.isOneOfOperatorLabel": "属于",
     "lists.exceptions.isOperatorLabel": "是",
+    "lists.exceptions.matchesOperatorLabel": "匹配",
     "management.breadcrumb": "Stack Management",
     "management.landing.header": "欢迎使用 Stack Management {version}",
     "management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
@@ -4851,14 +5286,14 @@
     "savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "导入已保存对象",
     "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "确认所有更改",
     "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完成",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的索引模式",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的索引模式。请选择要重新关联的索引模式。必要时可以{indexPatternLink}。",
-    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "索引模式冲突",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的数据视图",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的数据视图。请选择要重新关联的数据视图。必要时可以{indexPatternLink}。",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "数据视图冲突",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "计数",
-    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "数据视图的 ID",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新建索引模式",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新数据视图",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "受影响对象样例",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "受影响对象样例",
     "savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "选择要导入的文件",
@@ -4921,16 +5356,22 @@
     "savedObjectsManagement.objectsTable.unableFindSavedObjectNotificationMessage": "找不到已保存对象",
     "savedObjectsManagement.objectsTable.unableFindSavedObjectsNotificationMessage": "找不到已保存对象",
     "savedObjectsManagement.objectView.unableFindSavedObjectNotificationMessage": "找不到已保存对象",
-    "savedObjectsManagement.shareToSpace.actionDescription": "将此已保存对象共享到一个或多个工作区",
-    "savedObjectsManagement.shareToSpace.actionTitle": "共享到工作区",
-    "savedObjectsManagement.shareToSpace.columnDescription": "目前将此对象共享到的其他工作区",
-    "savedObjectsManagement.shareToSpace.columnTitle": "共享工作区",
+    "savedObjectsManagement.shareToSpace.actionDescription": "更改将此对象分配到的工作区",
+    "savedObjectsManagement.shareToSpace.actionTitle": "分配工作区",
+    "savedObjectsManagement.shareToSpace.columnDescription": "此对象当前分配到的工作区",
+    "savedObjectsManagement.shareToSpace.columnTitle": "工作区",
+    "savedObjectsManagement.shareToSpace.globalObjectTypeContent": "此已保存对象在所有工作区中均可用，无法更改。",
+    "savedObjectsManagement.shareToSpace.globalObjectTypeTitle": "全局已保存对象",
+    "savedObjectsManagement.shareToSpace.isolatedObjectTypeContent": "此已保存对象仅在一个工作区中可用，无法将其分配给多个工作区。",
+    "savedObjectsManagement.shareToSpace.isolatedObjectTypeTitle": "隔离的已保存对象",
+    "savedObjectsManagement.shareToSpace.shareableSoonObjectTypeContent": "此已保存对象仅在一个工作区中可用。在未来版本中，可以将其分配给多个工作区。",
+    "savedObjectsManagement.shareToSpace.shareableSoonObjectTypeTitle": "即将推出：将已保存对象分配给多个工作区",
     "savedObjectsManagement.view.copyToClipboardLabel": "复制到剪贴板",
     "savedObjectsManagement.view.deleteItemButtonLabel": "删除",
-    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "与此对象关联的字段在该索引模式中已不存在。",
+    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "与此对象关联的字段在该数据视图中已不再存在。",
     "savedObjectsManagement.view.howToFixErrorDescription": "如果您清楚此错误的含义，可以使用 {savedObjectsApis} 修复该错误 — 否则单击上面的删除按钮。",
     "savedObjectsManagement.view.howToFixErrorDescriptionLinkText": "已保存对象 API",
-    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "与此对象关联的索引模式已不存在。",
+    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "与此对象关联的数据视图不再存在。",
     "savedObjectsManagement.view.inspectCodeEditorAriaLabel": "检查 { title }",
     "savedObjectsManagement.view.inspectItemTitle": "检查 {title}",
     "savedObjectsManagement.view.savedObjectProblemErrorMessage": "此已保存对象有问题",
@@ -4966,8 +5407,18 @@
     "share.urlService.redirect.RedirectManager.missingParamLocator": "未指定定位器 ID。在 URL 中指定“l”搜索参数，其应为现有定位器 ID。",
     "share.urlService.redirect.RedirectManager.missingParamParams": "定位器参数未指定。在 URL 中指定“p”搜索参数，其应为定位器参数的 JSON 序列化对象。",
     "share.urlService.redirect.RedirectManager.missingParamVersion": "定位器参数版本未指定。在 URL 中指定“v”搜索参数，其应为生成定位器参数时 Kibana 的版本。",
-    "sharedUXComponents.exitFullScreenButton.exitFullScreenModeButtonText": "退出全屏",
-    "sharedUXComponents.exitFullScreenButton.fullScreenModeDescription": "在全屏模式下，按 ESC 键可退出。",
+    "sharedUXComponents.noDataPage.elasticAgentCard.description": "使用 Elastic 代理以简单统一的方式从您的计算机中收集数据。",
+    "sharedUXComponents.noDataPage.elasticAgentCard.noPermission.description": "尚未启用此集成。您的管理员具有打开它所需的权限。",
+    "sharedUXComponents.noDataPage.elasticAgentCard.noPermission.title": "请联系您的管理员",
+    "sharedUXComponents.noDataPage.elasticAgentCard.title": "添加 Elastic 代理",
+    "sharedUXComponents.noDataViews.dataViewExplanation": "Kibana 需要数据视图来识别您要浏览的数据流、索引和索引别名。数据视图可以指向特定索引（例如昨天的日志数据），或包含日志数据的所有索引。",
+    "sharedUXComponents.noDataViews.learnMore": "希望了解详情？",
+    "sharedUXComponents.noDataViews.nowCreate": "现在，创建数据视图。",
+    "sharedUXComponents.noDataViews.readDocumentation": "阅读文档",
+    "sharedUXComponents.noDataViews.youHaveData": "您在 Elasticsearch 中有数据。",
+    "sharedUXComponents.noDataViewsPage.addDataViewText": "创建数据视图",
+    "sharedUXComponents.pageTemplate.noDataCard.description": "继续，而不收集数据",
+    "sharedUXComponents.toolbar.buttons.addFromLibrary.libraryButtonLabel": "从库中添加",
     "telemetry.callout.appliesSettingTitle": "对此设置的更改将应用到{allOfKibanaText} 且会自动保存。",
     "telemetry.callout.appliesSettingTitle.allOfKibanaText": "整个 Kibana",
     "telemetry.callout.clusterStatisticsDescription": "这是我们将收集的基本集群统计信息的示例。其包括索引、分片和节点的数目。还包括概括性的使用情况统计信息，例如监测是否打开。",
@@ -4977,6 +5428,12 @@
     "telemetry.callout.errorUnprivilegedUserDescription": "您无权查看未加密的集群统计信息。",
     "telemetry.callout.errorUnprivilegedUserTitle": "显示集群统计信息时出错",
     "telemetry.clusterData": "集群数据",
+    "telemetry.dataManagementDisableCollection": " 要停止收集，",
+    "telemetry.dataManagementDisableCollectionLink": "请在此禁用使用情况数据。",
+    "telemetry.dataManagementDisclaimerPrivacy": "要了解使用情况数据如何帮助我们管理和改善产品和服务，请参阅我们的 ",
+    "telemetry.dataManagementDisclaimerPrivacyLink": "隐私声明。",
+    "telemetry.dataManagementEnableCollection": " 要启动收集，",
+    "telemetry.dataManagementEnableCollectionLink": "请在此处启用使用情况数据。",
     "telemetry.optInErrorToastText": "尝试设置使用情况统计信息首选项时发生错误。",
     "telemetry.optInErrorToastTitle": "错误",
     "telemetry.optInNoticeSeenErrorTitle": "错误",
@@ -5005,6 +5462,7 @@
     "timelion.expressionSuggestions.func.description.chainableHelpText": "可串接",
     "timelion.expressionSuggestions.func.description.dataSourceHelpText": "数据源",
     "timelion.fitFunctions.carry.downSampleErrorMessage": "请勿使用“carry”拟合方法降低采样率，而是使用“scale”或“average”",
+    "timelion.function.args.ariaLabelHelpText": "指定 Timelion 的 aria 标签",
     "timelion.function.help": "Timelion 可视化",
     "timelion.help.functions.absHelpText": "返回序列列表中每个值的绝对值",
     "timelion.help.functions.aggregate.args.functionHelpText": "以下选项之一：{functions}",
@@ -5184,6 +5642,8 @@
     "uiActions.errors.incompatibleAction": "操作不兼容",
     "uiActions.triggers.rowClickkDescription": "表格行的单击",
     "uiActions.triggers.rowClickTitle": "表格行单击",
+    "utils.filename.pathWarning": "路径的格式可能不正确；请验证值",
+    "utils.filename.wildcardWarning": "在文件路径中使用通配符可能会影响终端性能",
     "visDefaultEditor.advancedToggle.advancedLinkLabel": "高级",
     "visDefaultEditor.agg.disableAggButtonTooltip": "禁用 {schemaTitle} {aggTitle} 聚合",
     "visDefaultEditor.agg.enableAggButtonTooltip": "启用 {schemaTitle} {aggTitle} 聚合",
@@ -5315,6 +5775,13 @@
     "visDefaultEditor.options.colorSchema.howToChangeColorsDescription": "可以更改图例中的各个颜色。",
     "visDefaultEditor.options.colorSchema.resetColorsButtonLabel": "重置颜色",
     "visDefaultEditor.options.colorSchema.reverseColorSchemaLabel": "反向方案",
+    "visDefaultEditor.options.legendSizeSetting.label": "图例大小",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.auto": "自动",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.extraLarge": "特大",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.large": "大",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.medium": "中",
+    "visDefaultEditor.options.legendSizeSetting.legendSizeOptions.small": "小",
+    "visDefaultEditor.options.legendSizeSetting.legendVertical": "需要图例右对齐或左对齐",
     "visDefaultEditor.options.longLegends.maxLegendLinesLabel": "最大图例行数",
     "visDefaultEditor.options.longLegends.truncateLegendTextLabel": "截断图例文本",
     "visDefaultEditor.options.percentageMode.documentationLabel": "Numeral.js 文档",
@@ -5345,6 +5812,38 @@
     "visDefaultEditor.sidebar.tabs.optionsLabel": "选项",
     "visDefaultEditor.sidebar.updateChartButtonLabel": "更新",
     "visDefaultEditor.sidebar.updateInfoTooltip": "CTRL + Enter 键是用于更新的快捷键。",
+    "visTypeGauge.advancedSettings.visualization.legacyGaugeChartsLibrary.description": "在 Visualize 中启用仪表盘图表的旧版图表库。",
+    "visTypeGauge.advancedSettings.visualization.legacyGaugeChartsLibrary.name": "仪表盘旧版图表库",
+    "visTypeGauge.controls.gaugeOptions.alignmentLabel": "对齐方式",
+    "visTypeGauge.controls.gaugeOptions.autoExtendRangeLabel": "自动扩展范围",
+    "visTypeGauge.controls.gaugeOptions.extendRangeTooltip": "将数据范围扩展到数据中的最大值。",
+    "visTypeGauge.controls.gaugeOptions.extendRangeTooltipNotAvailable": "新图表库仅支持扩展范围。要禁用它，请启用仪表盘旧版图表库高级设置。",
+    "visTypeGauge.controls.gaugeOptions.gaugeTypeLabel": "仪表类型",
+    "visTypeGauge.controls.gaugeOptions.labelsTitle": "标签",
+    "visTypeGauge.controls.gaugeOptions.rangesTitle": "范围",
+    "visTypeGauge.controls.gaugeOptions.showLabelsLabel": "显示标签",
+    "visTypeGauge.controls.gaugeOptions.showLegendLabel": "显示图例",
+    "visTypeGauge.controls.gaugeOptions.showLegendNotAvailable": "新图表库不支持图例。请启用仪表盘旧版图表库高级设置。",
+    "visTypeGauge.controls.gaugeOptions.showOutline": "显示轮廓",
+    "visTypeGauge.controls.gaugeOptions.showOutlineNotAvailable": "新图表库不支持轮廓。请启用仪表盘旧版图表库高级设置。",
+    "visTypeGauge.controls.gaugeOptions.showScaleLabel": "显示比例",
+    "visTypeGauge.controls.gaugeOptions.styleTitle": "样式",
+    "visTypeGauge.controls.gaugeOptions.subTextLabel": "子标签",
+    "visTypeGauge.editors.gauge.alignmentNotAvailable": "新图表库尚不支持对齐方式。请启用仪表盘旧版图表库高级设置。",
+    "visTypeGauge.gauge.alignmentAutomaticTitle": "自动",
+    "visTypeGauge.gauge.alignmentHorizontalTitle": "水平",
+    "visTypeGauge.gauge.alignmentVerticalTitle": "垂直",
+    "visTypeGauge.gauge.gaugeDescription": "显示指标的状态。",
+    "visTypeGauge.gauge.gaugeTitle": "仪表盘",
+    "visTypeGauge.gauge.gaugeTypes.arcText": "弧形",
+    "visTypeGauge.gauge.gaugeTypes.circleText": "圆形",
+    "visTypeGauge.gauge.groupTitle": "拆分组",
+    "visTypeGauge.gauge.metricTitle": "指标",
+    "visTypeGauge.goal.goalDescription": "跟踪指标如何达到目标。",
+    "visTypeGauge.goal.goalTitle": "目标图",
+    "visTypeGauge.goal.groupTitle": "拆分组",
+    "visTypeGauge.goal.metricTitle": "指标",
+    "visTypeGauge.splitTitle.tooltip": "新图表库尚不支持拆分图表聚合。请启用仪表盘旧版图表库高级设置以使用拆分图表聚合。",
     "visTypeHeatmap.advancedSettings.visualization.legacyHeatmapChartsLibrary.description": "在 Visualize 中启用热图图表的旧版图表库。",
     "visTypeHeatmap.advancedSettings.visualization.legacyHeatmapChartsLibrary.name": "热图旧版图表库",
     "visTypeHeatmap.controls.heatmapOptions.colorLabel": "颜色",
@@ -5365,7 +5864,7 @@
     "visTypeHeatmap.editors.heatmap.overwriteColorlNotAvailable": "新图表库不支持覆盖自动配色。请启用热图旧版图表库高级设置。",
     "visTypeHeatmap.editors.heatmap.rotateLabelNotAvailable": "新图表库不支持旋转标签。请启用热图旧版图表库高级设置。",
     "visTypeHeatmap.heatmap.groupTitle": "Y 轴",
-    "visTypeHeatmap.heatmap.heatmapDescription": "给矩阵单元格中的数据添加阴影。",
+    "visTypeHeatmap.heatmap.heatmapDescription": "将值显示为矩阵中的颜色。",
     "visTypeHeatmap.heatmap.heatmapTitle": "热图",
     "visTypeHeatmap.heatmap.metricTitle": "值",
     "visTypeHeatmap.heatmap.segmentTitle": "X 轴",
@@ -5413,6 +5912,7 @@
     "visTypePie.editors.pie.emptySizeRatioLabel": "内部面积大小",
     "visTypePie.editors.pie.labelPositionLabel": "标签位置",
     "visTypePie.editors.pie.labelsSettingsTitle": "标签设置",
+    "visTypePie.editors.pie.legendDisplayLabel": "显示图例",
     "visTypePie.editors.pie.nestedLegendLabel": "嵌套图例",
     "visTypePie.editors.pie.pieSettingsTitle": "饼图设置",
     "visTypePie.editors.pie.showLabelsLabel": "显示标签",
@@ -5505,7 +6005,7 @@
     "visTypeTimeseries.addDeleteButtons.temporarilyDisableTooltip": "暂时禁用",
     "visTypeTimeseries.advancedSettings.allowCheckingForFailedShardsText": "如果请求对某些分片成功，但对其他分片失败，将对 TSVB 图表中的部分数据显示警告消息。",
     "visTypeTimeseries.advancedSettings.allowCheckingForFailedShardsTitle": "显示 TSVB 请求分片失败",
-    "visTypeTimeseries.advancedSettings.allowStringIndicesText": "允许您在 <strong>TSVB</strong> 可视化中使用索引模式和 Elasticsearch 索引。",
+    "visTypeTimeseries.advancedSettings.allowStringIndicesText": "允许您在 <strong>TSVB</strong> 可视化中查询 Elasticsearch 索引。",
     "visTypeTimeseries.advancedSettings.allowStringIndicesTitle": "TSVB 中允许字符串索引",
     "visTypeTimeseries.advancedSettings.maxBucketsText": "影响 TSVB 直方图密度。必须设置为高于“histogram:maxBars”。",
     "visTypeTimeseries.advancedSettings.maxBucketsTitle": "TSVB 存储桶限制",
@@ -5631,7 +6131,10 @@
     "visTypeTimeseries.externalUrlErrorModal.closeButtonLabel": "关闭",
     "visTypeTimeseries.externalUrlErrorModal.headerTitle": "尚未启用对此外部 URL 的访问权限",
     "visTypeTimeseries.fetchFields.loadIndexPatternFieldsErrorMessage": "无法加载 index_pattern 字段",
+    "visTypeTimeseries.fieldSelect.dragAriaLabel": "拖动字段",
+    "visTypeTimeseries.fieldSelect.fieldIsNotValid": "“{fieldParameter}”选择无效，无法用于当前索引。",
     "visTypeTimeseries.fieldSelect.selectFieldPlaceholder": "选择字段......",
+    "visTypeTimeseries.fieldUtils.multiFieldLabel": "{firstFieldLabel} + {count, plural, other {其他}} {count} 个",
     "visTypeTimeseries.filterCannotBeAppliedError": "在此配置下，不能应用该“筛选”",
     "visTypeTimeseries.filterRatio.aggregationLabel": "聚合",
     "visTypeTimeseries.filterRatio.denominatorLabel": "分母",
@@ -5817,6 +6320,7 @@
     "visTypeTimeseries.searchStrategyUndefinedErrorMessage": "未定义搜索策略",
     "visTypeTimeseries.serialDiff.aggregationLabel": "聚合",
     "visTypeTimeseries.serialDiff.lagLabel": "延迟",
+    "visTypeTimeseries.serialDiff.lagLabel.hint": "要从当前值中减去的历史存储桶。必须为非零正整数",
     "visTypeTimeseries.serialDiff.metricLabel": "指标",
     "visTypeTimeseries.series.missingAggregationKeyErrorMessage": "响应中缺少聚合密钥，请检查您对此请求的权限。",
     "visTypeTimeseries.series.shouldOneSeriesPerRequestErrorMessage": "每个请求仅应有一个序列。",
@@ -6072,6 +6576,7 @@
     "visTypeVega.inspector.dataSetsLabel": "数据集",
     "visTypeVega.inspector.dataViewer.dataSetAriaLabel": "数据集",
     "visTypeVega.inspector.dataViewer.gridAriaLabel": "{name} 数据网格",
+    "visTypeVega.inspector.errorHeading": "Vega 未成功呈现",
     "visTypeVega.inspector.signalValuesLabel": "信号值",
     "visTypeVega.inspector.signalViewer.gridAriaLabel": "信号值数据网格",
     "visTypeVega.inspector.specLabel": "规范",
@@ -6135,31 +6640,6 @@
     "visTypeVislib.vislib.legend.toggleOptionsButtonAriaLabel": "{legendDataLabel}, 切换选项",
     "visTypeVislib.vislib.tooltip.fieldLabel": "字段",
     "visTypeVislib.vislib.tooltip.valueLabel": "值",
-    "visTypeGauge.controls.gaugeOptions.alignmentLabel": "对齐方式",
-    "visTypeGauge.controls.gaugeOptions.autoExtendRangeLabel": "自动扩展范围",
-    "visTypeGauge.controls.gaugeOptions.extendRangeTooltip": "将数据范围扩展到数据中的最大值。",
-    "visTypeGauge.controls.gaugeOptions.gaugeTypeLabel": "仪表类型",
-    "visTypeGauge.controls.gaugeOptions.labelsTitle": "标签",
-    "visTypeGauge.controls.gaugeOptions.rangesTitle": "范围",
-    "visTypeGauge.controls.gaugeOptions.showLabelsLabel": "显示标签",
-    "visTypeGauge.controls.gaugeOptions.showLegendLabel": "显示图例",
-    "visTypeGauge.controls.gaugeOptions.showOutline": "显示轮廓",
-    "visTypeGauge.controls.gaugeOptions.showScaleLabel": "显示比例",
-    "visTypeGauge.controls.gaugeOptions.styleTitle": "样式",
-    "visTypeGauge.controls.gaugeOptions.subTextLabel": "子标签",
-    "visTypeGauge.gauge.alignmentAutomaticTitle": "自动",
-    "visTypeGauge.gauge.alignmentHorizontalTitle": "水平",
-    "visTypeGauge.gauge.alignmentVerticalTitle": "垂直",
-    "visTypeGauge.gauge.gaugeDescription": "显示指标的状态。",
-    "visTypeGauge.gauge.gaugeTitle": "仪表盘",
-    "visTypeGauge.gauge.gaugeTypes.arcText": "弧形",
-    "visTypeGauge.gauge.gaugeTypes.circleText": "圆形",
-    "visTypeGauge.gauge.groupTitle": "拆分组",
-    "visTypeGauge.gauge.metricTitle": "指标",
-    "visTypeGauge.goal.goalDescription": "跟踪指标如何达到目标。",
-    "visTypeGauge.goal.goalTitle": "目标图",
-    "visTypeGauge.goal.groupTitle": "拆分组",
-    "visTypeGauge.goal.metricTitle": "指标",
     "visTypeXy.aggResponse.allDocsTitle": "所有文档",
     "visTypeXy.area.areaDescription": "突出轴与线之间的数据。",
     "visTypeXy.area.areaTitle": "面积图",
@@ -6250,7 +6730,9 @@
     "visTypeXy.function.args.addTimeMarker.help": "显示时间标记",
     "visTypeXy.function.args.addTooltip.help": "在悬浮时显示工具提示",
     "visTypeXy.function.args.args.chartType.help": "图表的类型。可以是折线图、面积图或直方图",
+    "visTypeXy.function.args.args.legendSize.help": "指定图例大小（像素）。",
     "visTypeXy.function.args.args.maxLegendLines.help": "定义每个图例项的最大行数",
+    "visTypeXy.function.args.ariaLabel.help": "指定 xy 图表的 aria 标签",
     "visTypeXy.function.args.categoryAxes.help": "类别轴配置",
     "visTypeXy.function.args.detailedTooltip.help": "显示详细的工具提示",
     "visTypeXy.function.args.fillOpacity.help": "定义面积图填充透明度",
@@ -6392,6 +6874,7 @@
     "visualizations.embeddable.legacyURLConflict.errorMessage": "此可视化具有与旧版别名相同的 URL。请禁用别名以解决此错误：{json}",
     "visualizations.embeddable.placeholderTitle": "占位符标题",
     "visualizations.experimentalVisInfoText": "此功能处于技术预览状态，在未来版本中可能会更改或完全移除。Elastic 将尽最大努力来修复任何问题，但处于技术预览状态的功能不受正式 GA 功能支持 SLA 的约束。如欲提供反馈，请在 {githubLink} 中创建问题。",
+    "visualizations.function.findAccessorOrFail.error.accessor": "提供的列名称或索引无效：{accessor}",
     "visualizations.function.range.from.help": "范围起始",
     "visualizations.function.range.help": "生成范围对象",
     "visualizations.function.range.to.help": "范围结束",
@@ -6425,7 +6908,7 @@
     "visualizations.listing.table.typeColumnName": "类型",
     "visualizations.listingPageTitle": "Visualize 库",
     "visualizations.newChart.conditionalMessage.advancedSettingsLink": "免费的 API 密钥。",
-    "visualizations.newChart.conditionalMessage.newLibrary": "切换到{link}中的旧库",
+    "visualizations.newGaugeChart.notificationMessage": "新的仪表盘图表库尚不支持拆分图表聚合。{conditionalMessage}",
     "visualizations.newHeatmapChart.notificationMessage": "新的热图图表库尚不支持拆分图表聚合。{conditionalMessage}",
     "visualizations.newVisWizard.aggBasedGroupDescription": "使用我们的经典可视化库，基于聚合创建图表。",
     "visualizations.newVisWizard.aggBasedGroupTitle": "基于聚合",
@@ -6454,9 +6937,12 @@
     "visualizations.savedObjectName": "可视化",
     "visualizations.saveDuplicateRejectedDescription": "已拒绝使用重复标题保存确认",
     "visualizations.savingVisualizationFailed.errorMsg": "保存可视化失败",
+    "visualizations.tonNavMenu.tryItBadgeText": "试用",
     "visualizations.topNavMenu.cancelAndReturnButtonTooltip": "完成前放弃所做的更改",
     "visualizations.topNavMenu.cancelButtonAriaLabel": "返回到上一个应用而不保存更改",
     "visualizations.topNavMenu.cancelButtonLabel": "取消",
+    "visualizations.topNavMenu.goToLensButtonAriaLabel": "使用您当前的配置前往 Lens",
+    "visualizations.topNavMenu.goToLensButtonLabel": "在 Lens 中编辑可视化",
     "visualizations.topNavMenu.openInspectorButtonAriaLabel": "打开检查器查看可视化",
     "visualizations.topNavMenu.openInspectorButtonLabel": "检查",
     "visualizations.topNavMenu.openInspectorDisabledButtonTooltip": "此可视化不支持任何检查器。",
@@ -6537,6 +7023,24 @@
     "xpack.actions.builtin.webhook.webhookConfigurationError": "配置 Webhook 操作时出错：{message}",
     "xpack.actions.builtin.webhook.webhookConfigurationErrorNoHostname": "配置 Webhook 操作时出错：无法解析 url：{err}",
     "xpack.actions.builtin.webhookTitle": "Webhook",
+    "xpack.actions.builtin.xmatters.invalidUsernamePassword": "必须同时指定用户和密码。",
+    "xpack.actions.builtin.xmatters.missingConfigUrl": "请提供有效的 configUrl",
+    "xpack.actions.builtin.xmatters.missingPassword": "请提供有效密码",
+    "xpack.actions.builtin.xmatters.missingSecretsUrl": "请提供具有 API 密钥的有效 secretsUrl",
+    "xpack.actions.builtin.xmatters.missingUser": "请提供有效用户名",
+    "xpack.actions.builtin.xmatters.noSecretsProvided": "请提供 secretsUrl 链接或用户/密码以进行身份验证",
+    "xpack.actions.builtin.xmatters.noUserPassWhenSecretsUrl": "无法将用户/密码用于 URL 身份验证。请提供有效 secretsUrl 或使用基本身份验证。",
+    "xpack.actions.builtin.xmatters.postingErrorMessage": "触发 xMatters 工作流时出错",
+    "xpack.actions.builtin.xmatters.postingRetryErrorMessage": "触发 xMatters 流时出错：http 状态为 {status}，请稍后重试",
+    "xpack.actions.builtin.xmatters.shouldNotHaveConfigUrl": "usesBasic 为 false 时不得提供 configUrl",
+    "xpack.actions.builtin.xmatters.shouldNotHaveSecretsUrl": "usesBasic 为 true 时不得提供 secretsUrl",
+    "xpack.actions.builtin.xmatters.shouldNotHaveUsernamePassword": "usesBasic 为 false 时不得提供用户名和密码",
+    "xpack.actions.builtin.xmatters.unexpectedStatusErrorMessage": "触发 xMatters 流时出错：非预期状态 {status}",
+    "xpack.actions.builtin.xmatters.xmattersConfigurationError": "配置 xMatters 操作时出错：{message}",
+    "xpack.actions.builtin.xmatters.xmattersConfigurationErrorNoHostname": "配置 xMatters 操作时出错：无法解析 url：{err}",
+    "xpack.actions.builtin.xmatters.xmattersHostnameNotAllowed": "{message}",
+    "xpack.actions.builtin.xmatters.xmattersInvalidUrlError": "secretsUrl 无效：{err}",
+    "xpack.actions.builtin.xmattersTitle": "xMatters",
     "xpack.actions.disabledActionTypeError": "操作类型“{actionType}”在 Kibana 配置 xpack.actions.enabledActionTypes 中未启用",
     "xpack.actions.featureRegistry.actionsFeatureName": "操作和连接器",
     "xpack.actions.savedObjects.goToConnectorsButtonText": "前往连接器",
@@ -6570,6 +7074,7 @@
     "xpack.alerting.serverSideErrors.invalidLicenseErrorMessage": "规则 {ruleTypeId} 已禁用，因为它需要{licenseType}许可证。前往“许可证管理”以查看升级选项。",
     "xpack.alerting.serverSideErrors.unavailableLicenseErrorMessage": "规则类型 {ruleTypeId} 已禁用，因为许可证信息当前不可用。",
     "xpack.alerting.serverSideErrors.unavailableLicenseInformationErrorMessage": "告警不可用 - 许可信息当前不可用。",
+    "xpack.alerting.taskRunner.warning.maxExecutableActions": "已达到此规则类型的最大操作数；将不会触发过量操作。",
     "xpack.apm.a.thresholdMet": "已达到阈值",
     "xpack.apm.addDataButtonLabel": "添加数据",
     "xpack.apm.agentConfig.allOptionLabel": "全部",
@@ -6638,9 +7143,11 @@
     "xpack.apm.agentConfig.servicePage.cancelButton": "取消",
     "xpack.apm.agentConfig.servicePage.environment.description": "每个配置仅支持单个环境。",
     "xpack.apm.agentConfig.servicePage.environment.fieldLabel": "服务环境",
+    "xpack.apm.agentConfig.servicePage.environment.placeholder": "选择选项",
     "xpack.apm.agentConfig.servicePage.environment.title": "环境",
     "xpack.apm.agentConfig.servicePage.service.description": "选择要配置的服务。",
     "xpack.apm.agentConfig.servicePage.service.fieldLabel": "服务名称",
+    "xpack.apm.agentConfig.servicePage.service.placeholder": "选择选项",
     "xpack.apm.agentConfig.servicePage.service.title": "服务",
     "xpack.apm.agentConfig.settingsPage.discardChangesButton": "放弃更改",
     "xpack.apm.agentConfig.settingsPage.notFound.message": "请求的配置不存在",
@@ -6688,15 +7195,18 @@
     "xpack.apm.alerting.fields.type": "类型",
     "xpack.apm.alerts.action_variables.environment": "创建告警的事务类型",
     "xpack.apm.alerts.action_variables.intervalSize": "符合告警条件的时段的长度和单位",
+    "xpack.apm.alerts.action_variables.reasonMessage": "告警原因的简洁描述",
     "xpack.apm.alerts.action_variables.serviceName": "创建告警的服务",
     "xpack.apm.alerts.action_variables.threshold": "只要触发值大于此值，就会导致告警触发",
     "xpack.apm.alerts.action_variables.transactionType": "创建告警的事务类型",
     "xpack.apm.alerts.action_variables.triggerValue": "超过阈值并触发告警的值",
+    "xpack.apm.alerts.action_variables.viewInAppUrl": "Elastic 中可用于进一步调查告警及其上下文的视图或功能的链接",
     "xpack.apm.alerts.anomalySeverity.criticalLabel": "紧急",
     "xpack.apm.alerts.anomalySeverity.majorLabel": "重大",
     "xpack.apm.alerts.anomalySeverity.minor": "轻微",
     "xpack.apm.alerts.anomalySeverity.scoreDetailsDescription": "分数 {value} {value, select, critical {} other {及以上}}",
     "xpack.apm.alerts.anomalySeverity.warningLabel": "警告",
+    "xpack.apm.alertTypes.anomaly.description": "服务的延迟、吞吐量或失败事务率异常时告警。",
     "xpack.apm.alertTypes.errorCount.defaultActionMessage": "由于以下条件 \\{\\{alertName\\}\\} 告警触发：\n\n- 服务名称：\\{\\{context.serviceName\\}\\}\n- 环境：\\{\\{context.environment\\}\\}\n- 阈值：\\{\\{context.threshold\\}\\} 个错误\n- 已触发的值：在过去 \\{\\{context.interval\\}\\}有 \\{\\{context.triggerValue\\}\\} 个错误",
     "xpack.apm.alertTypes.errorCount.description": "当服务中的错误数量超过定义的阈值时告警。",
     "xpack.apm.alertTypes.errorCount.reason": "对于 {serviceName}，过去 {interval}的错误计数为 {measured}。超出 {threshold} 时告警。",
@@ -6704,6 +7214,7 @@
     "xpack.apm.alertTypes.transactionDuration.description": "当服务中特定事务类型的延迟超过定义的阈值时告警。",
     "xpack.apm.alertTypes.transactionDuration.reason": "对于 {serviceName}，过去 {interval}的 {aggregationType} 延迟为 {measured}。超出 {threshold} 时告警。",
     "xpack.apm.alertTypes.transactionDurationAnomaly.defaultActionMessage": "由于以下条件 \\{\\{alertName\\}\\} 告警触发：\n\n- 服务名称：\\{\\{context.serviceName\\}\\}\n- 类型：\\{\\{context.transactionType\\}\\}\n- 环境：\\{\\{context.environment\\}\\}\n- 严重性阈值：\\{\\{context.threshold\\}\\}\n- 严重性值：\\{\\{context.triggerValue\\}\\}\n",
+    "xpack.apm.alertTypes.transactionDurationAnomaly.reason": "对于 {serviceName}，过去 {interval}检测到分数为 {measured} 的 {severityLevel} 异常。",
     "xpack.apm.alertTypes.transactionErrorRate.defaultActionMessage": "由于以下条件 \\{\\{alertName\\}\\} 告警触发：\n\n- 服务名称：\\{\\{context.serviceName\\}\\}\n- 类型：\\{\\{context.transactionType\\}\\}\n- 环境：\\{\\{context.environment\\}\\}\n- 阈值：\\{\\{context.threshold\\}\\}%\n- 已触发的值：在过去 \\{\\{context.interval\\}\\}有 \\{\\{context.triggerValue\\}\\}% 的错误",
     "xpack.apm.alertTypes.transactionErrorRate.description": "当服务中的事务错误率超过定义的阈值时告警。",
     "xpack.apm.alertTypes.transactionErrorRate.reason": "对于 {serviceName}，过去 {interval}的失败事务数为 {measured}。超出 {threshold} 时告警。",
@@ -6714,6 +7225,7 @@
     "xpack.apm.anomaly_detection.error.missing_write_privileges": "必须对 Machine Learning 和 APM 具有“写”权限，才能创建“异常检测”作业",
     "xpack.apm.anomaly_detection.error.not_available": "Machine Learning 不可用",
     "xpack.apm.anomaly_detection.error.not_available_in_space": "Machine learning 在选定工作区内不可用",
+    "xpack.apm.anomalyAlert.name": "异常",
     "xpack.apm.anomalyDetection.createJobs.failed.text": "为 APM 服务环境 [{environments}] 创建一个或多个异常检测作业时出现问题。错误：“{errorMessage}”",
     "xpack.apm.anomalyDetection.createJobs.failed.title": "无法创建异常检测作业",
     "xpack.apm.anomalyDetection.createJobs.succeeded.text": "APM 服务环境 [{environments}] 的异常检测作业已成功创建。Machine Learning 要过一些时间才会开始分析流量以发现异常。",
@@ -6729,6 +7241,7 @@
     "xpack.apm.api.fleet.fleetSecurityRequired": "需要 Fleet 和 Security 插件",
     "xpack.apm.apmDescription": "自动从您的应用程序内收集深层的性能指标和错误。",
     "xpack.apm.apmSchema.index": "APM Server 架构 - 索引",
+    "xpack.apm.apmServiceGroups.index": "APM 服务组 - 索引",
     "xpack.apm.apmSettings.index": "APM 设置 - 索引",
     "xpack.apm.backendDetail.dependenciesTableColumnBackend": "服务",
     "xpack.apm.backendDetail.dependenciesTableTitle": "上游服务",
@@ -6773,6 +7286,7 @@
     "xpack.apm.correlations.failedTransactions.correlationsTable.pValueDescription": "鉴于其在成功事务中的普及率至少获取此数量的失败事务字段名称和值的几率。",
     "xpack.apm.correlations.failedTransactions.correlationsTable.pValueLabel": "p-value",
     "xpack.apm.correlations.failedTransactions.correlationsTable.scoreLabel": "分数",
+    "xpack.apm.correlations.failedTransactions.correlationsTable.scoreTooltip": "属性的分数 [0-1]；分数越大，属性造成事务失败的可能性越大。",
     "xpack.apm.correlations.failedTransactions.correlationsTable.successPercentageDescription": "字词在成功事务中显示的时间百分比。",
     "xpack.apm.correlations.failedTransactions.correlationsTable.successPercentageLabel": "成功 %",
     "xpack.apm.correlations.failedTransactions.errorTitle": "对失败的事务执行相关性时出错",
@@ -6780,9 +7294,6 @@
     "xpack.apm.correlations.failedTransactions.helpPopover.performanceExplanation": "此分析会对大量属性执行统计搜索。对于较大时间范围和具有高事务吞吐量的服务，这可能需要些时间。减少时间范围以改善性能。",
     "xpack.apm.correlations.failedTransactions.helpPopover.tableExplanation": "表按分数排序，分数映射高、中或低影响级别。具有高影响级别的属性更可能造成事务失败。",
     "xpack.apm.correlations.failedTransactions.helpPopover.title": "失败事务相关性",
-    "xpack.apm.correlations.highImpactText": "高",
-    "xpack.apm.correlations.lowImpactText": "低",
-    "xpack.apm.correlations.mediumImpactText": "中",
     "xpack.apm.correlations.failedTransactions.panelTitle": "失败事务延迟分布",
     "xpack.apm.correlations.failedTransactions.tableTitle": "相关性",
     "xpack.apm.correlations.fieldContextPopover.addFilterAriaLabel": "筛留 {fieldName}：“{value}”",
@@ -6792,6 +7303,7 @@
     "xpack.apm.correlations.fieldContextPopover.notTopTenValueMessage": "选定的词未排名前 10",
     "xpack.apm.correlations.fieldContextPopover.removeFilterAriaLabel": "筛除 {fieldName}：“{value}”",
     "xpack.apm.correlations.fieldContextPopover.topFieldValuesAriaLabel": "显示排名前 10 字段值",
+    "xpack.apm.correlations.highImpactText": "高",
     "xpack.apm.correlations.latencyCorrelations.advancedStatisticsLabel": "高级统计信息",
     "xpack.apm.correlations.latencyCorrelations.advancedStatisticsTooltipContent": "启用相关性结果的其他统计信息。",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.actionsLabel": "筛选",
@@ -6804,6 +7316,7 @@
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.filterDescription": "按值筛选",
     "xpack.apm.correlations.latencyCorrelations.correlationsTable.filterLabel": "筛选",
     "xpack.apm.correlations.latencyCorrelations.errorTitle": "提取关联性时发生错误",
+    "xpack.apm.correlations.latencyCorrelations.fallbackCorrelationBadgeMessage": "极低",
     "xpack.apm.correlations.latencyCorrelations.panelTitle": "延迟分布",
     "xpack.apm.correlations.latencyCorrelations.tableTitle": "相关性",
     "xpack.apm.correlations.latencyCorrelations.titleHelp": "此图表在两个轴上使用对数标度，以避免离群值导致失真",
@@ -6814,19 +7327,24 @@
     "xpack.apm.correlations.latencyPopoverTableExplanation": "表按范围是 0 到 1 的相关性系数排序。具有较高相关性值的属性更可能造成事务高延迟。",
     "xpack.apm.correlations.latencyPopoverTitle": "延迟相关性",
     "xpack.apm.correlations.license.text": "要使用相关性 API，必须订阅 Elastic 白金级许可证。",
+    "xpack.apm.correlations.lowImpactText": "低",
+    "xpack.apm.correlations.mediumImpactText": "中",
     "xpack.apm.correlations.noCorrelationsTextLine1": "相关性只有重大影响时，才会得到识别。",
     "xpack.apm.correlations.noCorrelationsTextLine2": "请尝试选择其他时间范围或移除任何已添加的筛选。",
     "xpack.apm.correlations.noCorrelationsTitle": "没有重大相关性",
     "xpack.apm.correlations.progressAriaLabel": "进度",
     "xpack.apm.correlations.progressTitle": "进度：{progress}%",
     "xpack.apm.correlations.refreshButtonTitle": "刷新",
+    "xpack.apm.correlations.veryLowImpactText": "极低",
     "xpack.apm.customLink.buttom.create": "创建定制链接",
     "xpack.apm.customLink.buttom.create.title": "创建",
     "xpack.apm.customLink.buttom.manage": "管理定制链接",
     "xpack.apm.customLink.empty": "未找到定制链接。设置自己的定制链接，如特定仪表板的链接或外部链接。",
     "xpack.apm.dependencies.kueryBarPlaceholder": "搜索依赖项指标（例如，span.destination.service.resource:elasticsearch）",
     "xpack.apm.dependenciesTable.columnErrorRate": "失败事务率",
+    "xpack.apm.dependenciesTable.columnErrorRateTip": "选定服务的失败事务百分比。状态代码为 4xx 的 HTTP 服务器事务（客户端错误）不会视为失败，因为是调用方而不是服务器造成了失败。",
     "xpack.apm.dependenciesTable.columnImpact": "影响",
+    "xpack.apm.dependenciesTable.columnImpactTip": "服务中最常用的和最慢的终端节点。已通过延迟和吞吐量相乘进行计算。",
     "xpack.apm.dependenciesTable.columnLatency": "延迟（平均值）",
     "xpack.apm.dependenciesTable.columnThroughput": "吞吐量",
     "xpack.apm.dependenciesTable.notFoundLabel": "未找到依赖项",
@@ -6858,6 +7376,7 @@
     "xpack.apm.errorRate": "失败事务率",
     "xpack.apm.errorRate.chart.errorRate": "失败事务率（平均值）",
     "xpack.apm.errorRate.chart.errorRate.previousPeriodLabel": "上一时段",
+    "xpack.apm.errorRate.tip": "选定服务的失败事务百分比。状态代码为 4xx 的 HTTP 服务器事务（客户端错误）不会视为失败，因为是调用方而不是服务器造成了失败。",
     "xpack.apm.errorsTable.errorMessageAndCulpritColumnLabel": "错误消息和原因",
     "xpack.apm.errorsTable.groupIdColumnDescription": "堆栈跟踪的哈希。将类似错误分组在一起，即使因动态参数造成错误消息不同。",
     "xpack.apm.errorsTable.groupIdColumnLabel": "组 ID",
@@ -6961,6 +7480,8 @@
     "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPolicies": "尾部采样策略",
     "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPoliciesDescription": "策略会将跟踪事件映射到采样速率。每个策略必须指定一个采样速率。跟踪事件将按指定的顺序与策略进行匹配。所有策略条件必须为 true 才能匹配跟踪事件。每个策略列表应以一个仅指定一个采样速率的策略结尾。这个最终策略用于捕获与更严格的策略不匹配的剩余跟踪事件。",
     "xpack.apm.fleet_integration.settings.tailSampling.tailSamplingPoliciesTitle": "策略",
+    "xpack.apm.fleet_integration.settings.tailSamplingDocsHelpText": "在我们的{link}中详细了解尾部采样策略。",
+    "xpack.apm.fleet_integration.settings.tailSamplingDocsHelpTextLink": "文档",
     "xpack.apm.fleet_integration.settings.tls.settings.subtitle": "TLS 认证的设置。",
     "xpack.apm.fleet_integration.settings.tls.settings.title": "TLS 设置",
     "xpack.apm.fleet_integration.settings.tls.tlsCertificateLabel": "服务器证书的文件路径",
@@ -7021,7 +7542,7 @@
     "xpack.apm.home.alertsMenu.alerts": "告警和规则",
     "xpack.apm.home.alertsMenu.createAnomalyAlert": "创建异常规则",
     "xpack.apm.home.alertsMenu.createThresholdAlert": "创建阈值规则",
-    "xpack.apm.home.alertsMenu.errorCount": "错误计数",
+    "xpack.apm.home.alertsMenu.errorCount": " 创建错误计数规则",
     "xpack.apm.home.alertsMenu.transactionDuration": "延迟",
     "xpack.apm.home.alertsMenu.transactionErrorRate": "失败事务率",
     "xpack.apm.home.alertsMenu.viewActiveAlerts": "管理规则",
@@ -7084,6 +7605,8 @@
     "xpack.apm.navigation.serviceMapTitle": "服务地图",
     "xpack.apm.navigation.servicesTitle": "服务",
     "xpack.apm.navigation.tracesTitle": "追溯",
+    "xpack.apm.noDataConfig.addApmIntegrationButtonLabel": "添加 APM 集成",
+    "xpack.apm.noDataConfig.addDataButtonLabel": "添加数据",
     "xpack.apm.noDataConfig.solutionName": "Observability",
     "xpack.apm.notAvailableLabel": "不可用",
     "xpack.apm.percentOfParent": "({parentType, select, transaction {事务} trace {追溯} }的{value})",
@@ -7100,6 +7623,7 @@
     "xpack.apm.propertiesTable.tabs.metadataLabel": "元数据",
     "xpack.apm.propertiesTable.tabs.timelineLabel": "时间线",
     "xpack.apm.searchInput.filter": "筛选...",
+    "xpack.apm.selectCustomOptionText": "将 \\{searchValue\\} 添加为新选项",
     "xpack.apm.selectPlaceholder": "选择选项：",
     "xpack.apm.serviceDependencies.breakdownChartTitle": "依赖项花费的时间",
     "xpack.apm.serviceDetails.dependenciesTabLabel": "依赖项",
@@ -7115,6 +7639,64 @@
     "xpack.apm.serviceDetails.profilingTabExperimentalLabel": "技术预览",
     "xpack.apm.serviceDetails.profilingTabLabel": "分析",
     "xpack.apm.serviceDetails.transactionsTabLabel": "事务",
+    "xpack.apm.serviceGroup.allServices.title": "服务",
+    "xpack.apm.serviceGroup.serviceInventory": "库存",
+    "xpack.apm.serviceGroup.serviceMap": "服务地图",
+    "xpack.apm.serviceGroups.breadcrumb.title": "服务",
+    "xpack.apm.serviceGroups.cardsList.emptyDescription": "描述不可用",
+    "xpack.apm.serviceGroups.cardsList.serviceCount": "{servicesCount} 项{servicesCount, plural, other {服务}}",
+    "xpack.apm.serviceGroups.createFailure.toast.title": "创建“{groupName}”组时出错",
+    "xpack.apm.serviceGroups.createGroupLabel": "创建组",
+    "xpack.apm.serviceGroups.createSuccess.toast.text": "您的组当前在组的新服务视图中可见。",
+    "xpack.apm.serviceGroups.createSucess.toast.title": "已创建“{groupName}”组",
+    "xpack.apm.serviceGroups.deleteFailure.toast.title": "删除“{groupName}”组时出错",
+    "xpack.apm.serviceGroups.deleteFailure.unknownId.toast.text": "无法删除组：服务组 ID 未知。",
+    "xpack.apm.serviceGroups.deleteFailure.unknownId.toast.title": "删除“{groupName}”组时出错",
+    "xpack.apm.serviceGroups.deleteSuccess.toast.title": "已删除“{groupName}”组",
+    "xpack.apm.serviceGroups.editFailure.toast.title": "编辑“{groupName}”组时出错",
+    "xpack.apm.serviceGroups.editGroupLabel": "编辑组",
+    "xpack.apm.serviceGroups.editSuccess.toast.text": "已将新更改保存到服务组。",
+    "xpack.apm.serviceGroups.editSucess.toast.title": "已编辑“{groupName}”组",
+    "xpack.apm.serviceGroups.emptyPrompt.message": "找不到此筛选的组",
+    "xpack.apm.serviceGroups.emptyPrompt.serviceGroups": "服务组",
+    "xpack.apm.serviceGroups.groupDetailsForm.cancel": "取消",
+    "xpack.apm.serviceGroups.groupDetailsForm.color": "颜色",
+    "xpack.apm.serviceGroups.groupDetailsForm.create.title": "创建组",
+    "xpack.apm.serviceGroups.groupDetailsForm.deleteGroup": "删除组",
+    "xpack.apm.serviceGroups.groupDetailsForm.description": "描述",
+    "xpack.apm.serviceGroups.groupDetailsForm.description.optional": "可选",
+    "xpack.apm.serviceGroups.groupDetailsForm.edit.title": "编辑组",
+    "xpack.apm.serviceGroups.groupDetailsForm.invalidColorError": "请提供有效的颜色值",
+    "xpack.apm.serviceGroups.groupDetailsForm.name": "名称",
+    "xpack.apm.serviceGroups.groupDetailsForm.selectServices": "选择服务",
+    "xpack.apm.serviceGroups.groupsCount": "{servicesCount} 个{servicesCount, plural, other {组}}",
+    "xpack.apm.serviceGroups.list.allServices.description": "查看所有服务",
+    "xpack.apm.serviceGroups.list.allServices.name": "所有服务",
+    "xpack.apm.serviceGroups.list.sort.alphabetical": "按字母顺序",
+    "xpack.apm.serviceGroups.list.sort.recentlyAdded": "最近添加",
+    "xpack.apm.serviceGroups.selectServicesForm.cancel": "取消",
+    "xpack.apm.serviceGroups.selectServicesForm.editGroupDetails": "编辑组详情",
+    "xpack.apm.serviceGroups.selectServicesForm.kql": "例如，labels.team: \"web\"",
+    "xpack.apm.serviceGroups.selectServicesForm.matchingServiceCount": "{servicesCount} 项{servicesCount, plural, other {服务}}与该查询相匹配",
+    "xpack.apm.serviceGroups.selectServicesForm.panelLabel": "输入查询以选择服务",
+    "xpack.apm.serviceGroups.selectServicesForm.preview": "预览",
+    "xpack.apm.serviceGroups.selectServicesForm.refresh": "刷新",
+    "xpack.apm.serviceGroups.selectServicesForm.saveGroup": "保存组",
+    "xpack.apm.serviceGroups.selectServicesForm.subtitle": "使用查询为该组选择服务。过去 24 小时内与此查询匹配的服务将分配给该组。",
+    "xpack.apm.serviceGroups.selectServicesForm.title": "选择服务",
+    "xpack.apm.serviceGroups.selectServicesList.environmentColumnLabel": "环境",
+    "xpack.apm.serviceGroups.selectServicesList.nameColumnLabel": "名称",
+    "xpack.apm.serviceGroups.selectServicesList.notFoundLabel": "过去 24 小时内没有服务可用。您仍然可以创建该组，并且会添加与您的查询匹配的服务。",
+    "xpack.apm.serviceGroups.sortLabel": "排序",
+    "xpack.apm.serviceGroups.tour.content.link": "在{docsLink}中了解详情。",
+    "xpack.apm.serviceGroups.tour.content.link.docs": "文档",
+    "xpack.apm.serviceGroups.tour.createGroups.content": "将服务组合在一起以构建策展库存视图，进而跨服务消除噪音并简化调查。组特定于 Kibana 工作区，并且可用于任何具有适当访问权限的用户。",
+    "xpack.apm.serviceGroups.tour.createGroups.title": "服务组简介",
+    "xpack.apm.serviceGroups.tour.dismiss": "关闭",
+    "xpack.apm.serviceGroups.tour.editGroups.content": "使用编辑选项更改此服务组的名称、查询或详情。",
+    "xpack.apm.serviceGroups.tour.editGroups.title": "编辑此服务组",
+    "xpack.apm.serviceGroups.tour.serviceGroups.content": "既然您已创建服务组，您的所有服务库存已移到此处。无法编辑或移除该组。",
+    "xpack.apm.serviceGroups.tour.serviceGroups.title": "所有服务组",
     "xpack.apm.serviceHealthStatus.critical": "紧急",
     "xpack.apm.serviceHealthStatus.healthy": "运行正常",
     "xpack.apm.serviceHealthStatus.unknown": "未知",
@@ -7187,6 +7769,7 @@
     "xpack.apm.serviceOverview.dependenciesTableColumn": "依赖项",
     "xpack.apm.serviceOverview.dependenciesTableTabLink": "查看依赖项",
     "xpack.apm.serviceOverview.dependenciesTableTitle": "依赖项",
+    "xpack.apm.serviceOverview.dependenciesTableTitleTip": "未检测的下游服务或派生自已检测服务的退出跨度的外部连接。",
     "xpack.apm.serviceOverview.errorsTable.errorMessage": "无法提取",
     "xpack.apm.serviceOverview.errorsTable.loading": "正在加载……",
     "xpack.apm.serviceOverview.errorsTable.noResults": "未找到错误",
@@ -7226,9 +7809,11 @@
     "xpack.apm.serviceOverview.noResultsText": "未找到实例",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "上一时段",
     "xpack.apm.serviceOverview.throughtputChartTitle": "吞吐量",
-    "xpack.apm.serviceOverview.tpmHelp": "吞吐量按每分钟事务数 (tpm) 来度量",
+    "xpack.apm.serviceOverview.tpmHelp": "吞吐量按每分钟事务数 (tpm) 来度量。",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "失败事务率",
+    "xpack.apm.serviceOverview.transactionsTableColumnErrorRateTip": "选定服务的失败事务百分比。状态代码为 4xx 的 HTTP 服务器事务（客户端错误）不会视为失败，因为是调用方而不是服务器造成了失败。",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "影响",
+    "xpack.apm.serviceOverview.transactionsTableColumnImpactTip": "服务中最常用的和最慢的终端节点。已通过延迟和吞吐量相乘进行计算。",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "名称",
     "xpack.apm.serviceOverview.transactionsTableColumnThroughput": "吞吐量",
     "xpack.apm.serviceProfiling.valueTypeLabel.allocObjects": "分配的对象",
@@ -7239,6 +7824,8 @@
     "xpack.apm.serviceProfiling.valueTypeLabel.samples": "样例",
     "xpack.apm.serviceProfiling.valueTypeLabel.unknown": "其他",
     "xpack.apm.serviceProfiling.valueTypeLabel.wallTime": "现实时间",
+    "xpack.apm.servicesGroups.filter": "筛选组",
+    "xpack.apm.servicesGroups.loadingServiceGroups": "正在加载服务组",
     "xpack.apm.servicesTable.environmentColumnLabel": "环境",
     "xpack.apm.servicesTable.environmentCount": "{environmentCount, plural, one {1 个环境} other {# 个环境}}",
     "xpack.apm.servicesTable.healthColumnLabel": "运行状况",
@@ -7334,6 +7921,7 @@
     "xpack.apm.settings.apmIndices.noPermissionTooltipLabel": "您的用户角色无权更改 APM 索引",
     "xpack.apm.settings.apmIndices.onboardingIndicesLabel": "载入索引",
     "xpack.apm.settings.apmIndices.sourcemapIndicesLabel": "源地图索引",
+    "xpack.apm.settings.apmIndices.spaceDescription": "索引设置适用于 {spaceName} 工作区。",
     "xpack.apm.settings.apmIndices.spanIndicesLabel": "跨度索引",
     "xpack.apm.settings.apmIndices.title": "索引",
     "xpack.apm.settings.apmIndices.transactionIndicesLabel": "事务索引",
@@ -7435,7 +8023,7 @@
     "xpack.apm.toggleHeight.showLessButtonLabel": "显示较少行",
     "xpack.apm.toggleHeight.showMoreButtonLabel": "显示更多行",
     "xpack.apm.tracesTable.avgResponseTimeColumnLabel": "延迟（平均值）",
-    "xpack.apm.tracesTable.impactColumnDescription": "服务中最常用的和最慢的终端节点。这是延迟和吞吐量相乘的结果",
+    "xpack.apm.tracesTable.impactColumnDescription": "服务中最常用的和最慢的终端节点。已通过延迟和吞吐量相乘进行计算。",
     "xpack.apm.tracesTable.impactColumnLabel": "影响",
     "xpack.apm.tracesTable.nameColumnLabel": "名称",
     "xpack.apm.tracesTable.notFoundLabel": "未找到与此查询的任何追溯信息",
@@ -7464,7 +8052,8 @@
     "xpack.apm.transactionActionMenu.trace.subtitle": "查看跟踪日志以获取进一步详情。",
     "xpack.apm.transactionActionMenu.trace.title": "跟踪详情",
     "xpack.apm.transactionActionMenu.viewInUptime": "状态",
-    "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "查看样例文档",
+    "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "在 Discover 中查看事务",
+    "xpack.apm.transactionBreakdown.chartHelp": "每种跨度类型的平均持续时间。“应用”表示该服务内有情况发生 — 这可能指在应用程序代码而不是数据库或外部请求中花费的时间，或 APM 代理自动检测未覆盖已执行的代码。",
     "xpack.apm.transactionBreakdown.chartTitle": "跨度类型花费的时间",
     "xpack.apm.transactionDetails.clearSelectionAriaLabel": "清除所选内容",
     "xpack.apm.transactionDetails.coldstartBadge": "冷启动",
@@ -7530,6 +8119,7 @@
     "xpack.apm.transactionsTable.cardinalityWarning.body": "唯一事务名称的数目超过 {bucketSize} 的已配置值。尝试重新配置您的代理以对类似的事务分组或增大 {codeBlock} 的值",
     "xpack.apm.transactionsTable.cardinalityWarning.docsLink": "在文档中了解详情",
     "xpack.apm.transactionsTable.cardinalityWarning.title": "此视图显示已报告事务的子集。",
+    "xpack.apm.transactionsTable.errorMessage": "无法提取",
     "xpack.apm.transactionsTable.linkText": "查看事务",
     "xpack.apm.transactionsTable.title": "事务",
     "xpack.apm.transactionTypesSelectPlaceholder": "选择事务类型",
@@ -7617,7 +8207,7 @@
     "xpack.apm.tutorial.javaClient.startApplication.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。",
     "xpack.apm.tutorial.javaClient.startApplication.textPre": "添加 `-javaagent` 标志并使用系统属性配置代理。\n\n * 设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）\n * 设置定制 APM Server URL（默认值：{customApmServerUrl}）\n * 设置 APM Server 机密令牌\n * 设置服务环境\n * 设置您的应用程序的基础软件包",
     "xpack.apm.tutorial.javaClient.startApplication.title": "使用 javaagent 标志启动您的应用程序",
-    "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.textPre": "APM Server 默认禁用 RUM 支持。请参阅[文档]({documentationLink})以详细了解如何启用 RUM 支持。",
+    "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.textPre": "APM Server 默认禁用 RUM 支持。请参阅[文档]({documentationLink})以详细了解如何启用 RUM 支持。将 APM 集成用于 Fleet 时，会自动启用 RUM 支持。",
     "xpack.apm.tutorial.jsClient.enableRealUserMonitoring.title": "在 APM Server 中启用真实用户监测支持",
     "xpack.apm.tutorial.jsClient.installDependency.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
     "xpack.apm.tutorial.jsClient.installDependency.commands.setRequiredServiceNameComment": "设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）",
@@ -7687,6 +8277,8 @@
     "xpack.apm.views.metrics.title": "指标",
     "xpack.apm.views.nodes.title": "JVM",
     "xpack.apm.views.overview.title": "概览",
+    "xpack.apm.views.serviceGroups.breadcrumbLabel": "服务",
+    "xpack.apm.views.serviceGroups.title": "服务组",
     "xpack.apm.views.serviceInventory.title": "服务",
     "xpack.apm.views.serviceMap.title": "服务地图",
     "xpack.apm.views.serviceProfiling.title": "分析",
@@ -7911,6 +8503,7 @@
     "xpack.canvas.functions.alterColumn.args.typeHelpText": "将列转换成的类型。留空将不更改类型。",
     "xpack.canvas.functions.alterColumn.cannotConvertTypeErrorMessage": "无法转换为“{type}”",
     "xpack.canvas.functions.alterColumn.columnNotFoundErrorMessage": "找不到列：“{column}”",
+    "xpack.canvas.functions.alterColumnHelpText": "在核心类型（包括 {list} 和 {end}）之间转换，并重命名列。另请参见 {mapColumnFn}、{mathColumnFn} 和 {staticColumnFn}。",
     "xpack.canvas.functions.any.args.conditionHelpText": "要检查的条件。",
     "xpack.canvas.functions.anyHelpText": "至少满足一个条件时，返回 {BOOLEAN_TRUE}。另见 {all_fn}。",
     "xpack.canvas.functions.as.args.nameHelpText": "要为列提供的名称。",
@@ -7975,12 +8568,12 @@
     "xpack.canvas.functions.embeddableHelpText": "返回采用所提供的配置的可嵌入对象",
     "xpack.canvas.functions.eq.args.valueHelpText": "与 {CONTEXT} 比较的值。",
     "xpack.canvas.functions.eqHelpText": "返回 {CONTEXT} 是否等于参数。",
-    "xpack.canvas.functions.escount.args.indexHelpText": "索引或索引模式。例如，{example}。",
+    "xpack.canvas.functions.escount.args.indexHelpText": "索引或数据视图。例如，{example}。",
     "xpack.canvas.functions.escount.args.queryHelpText": "{LUCENE} 查询字符串。",
     "xpack.canvas.functions.escountHelpText": "在 {ELASTICSEARCH} 中查询匹配指定查询的命中数。",
     "xpack.canvas.functions.esdocs.args.countHelpText": "要检索的文档数目。要获取更佳的性能，请使用较小的数据集。",
     "xpack.canvas.functions.esdocs.args.fieldsHelpText": "字段逗号分隔列表。要获取更佳的性能，请使用较少的字段。",
-    "xpack.canvas.functions.esdocs.args.indexHelpText": "索引或索引模式。例如，{example}。",
+    "xpack.canvas.functions.esdocs.args.indexHelpText": "索引或数据视图。例如，{example}。",
     "xpack.canvas.functions.esdocs.args.metaFieldsHelpText": "元字段逗号分隔列表。例如，{example}。",
     "xpack.canvas.functions.esdocs.args.queryHelpText": "{LUCENE} 查询字符串。",
     "xpack.canvas.functions.esdocs.args.sortHelpText": "格式为 {directions} 的排序方向。例如 {example1} 或 {example2}。",
@@ -8112,6 +8705,7 @@
     "xpack.canvas.functions.sortHelpText": "按指定列对 {DATATABLE} 进行排序。",
     "xpack.canvas.functions.staticColumn.args.nameHelpText": "新列的名称。",
     "xpack.canvas.functions.staticColumn.args.valueHelpText": "要在新列的每一行中插入的值。提示：使用子表达式可将其他列汇总为静态值。",
+    "xpack.canvas.functions.staticColumnHelpText": "添加每一行都具有相同静态值的列。另请参见 {alterColumnFn}、{mapColumnFn} 和 {mathColumnFn}",
     "xpack.canvas.functions.string.args.valueHelpText": "要连结成一个字符串的值。根据需要加入空格。",
     "xpack.canvas.functions.stringHelpText": "将所有参数串联成单个字符串。",
     "xpack.canvas.functions.switch.args.caseHelpText": "要检查的条件。",
@@ -8422,7 +9016,7 @@
     "xpack.canvas.uis.dataSources.esdocs.fieldsLabel": "脚本字段不可用",
     "xpack.canvas.uis.dataSources.esdocs.fieldsTitle": "字段",
     "xpack.canvas.uis.dataSources.esdocs.fieldsWarningLabel": "字段不超过 10 个时，此数据源性能最佳",
-    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "输入索引名称或选择索引模式",
+    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "输入索引名称或选择数据视图",
     "xpack.canvas.uis.dataSources.esdocs.indexTitle": "索引",
     "xpack.canvas.uis.dataSources.esdocs.queryLabel": "{lucene} 查询字符串语法",
     "xpack.canvas.uis.dataSources.esdocs.queryTitle": "查询",
@@ -8862,6 +9456,10 @@
     "xpack.canvas.workpadTemplates.table.descriptionColumnTitle": "描述",
     "xpack.canvas.workpadTemplates.table.nameColumnTitle": "模板名称",
     "xpack.canvas.workpadTemplates.table.tagsColumnTitle": "标签",
+    "xpack.cases.actions.caseAlertSuccessSyncText": "此案例中的告警的状态已经与案例状态同步",
+    "xpack.cases.actions.caseAlertSuccessToast": "告警已添加到“{title}”",
+    "xpack.cases.actions.caseSuccessToast": "{title} 已更新",
+    "xpack.cases.actions.viewCase": "查看案例",
     "xpack.cases.addConnector.title": "添加连接器",
     "xpack.cases.allCases.actions": "操作",
     "xpack.cases.allCases.comments": "注释",
@@ -8952,8 +9550,6 @@
     "xpack.cases.caseView.errorsPushServiceCallOutTitle": "选择外部连接器",
     "xpack.cases.caseView.fieldChanged": "已更改连接器字段",
     "xpack.cases.caseView.fieldRequiredError": "必填字段",
-    "xpack.cases.caseView.generatedAlertCommentLabelTitle": "添加自",
-    "xpack.cases.caseView.generatedAlertCountCommentLabelTitle": "{totalCount} 个{totalCount, plural, other {告警}}",
     "xpack.cases.caseView.isolatedHost": "在主机上已提交隔离请求",
     "xpack.cases.caseView.lockedIncidentDesc": "不需要任何更新",
     "xpack.cases.caseView.lockedIncidentTitle": "{ thirdParty } 事件是最新的",
@@ -9008,11 +9604,13 @@
     "xpack.cases.common.alertLabel": "告警",
     "xpack.cases.common.alertsLabel": "告警",
     "xpack.cases.common.allCases.caseModal.title": "选择案例",
+    "xpack.cases.common.appDescription": "打开并跟踪问题，推送信息到第三方系统。",
     "xpack.cases.common.appropriateLicense": "适当的许可证",
+    "xpack.cases.common.appTitle": "案例",
     "xpack.cases.common.noConnector": "未选择任何连接器",
     "xpack.cases.components.create.syncAlertHelpText": "启用此选项将使本案例中的告警状态与案例状态同步。",
     "xpack.cases.configure.connectorDeletedOrLicenseWarning": "选定连接器已删除或您没有{appropriateLicense}来使用它。选择不同的连接器或创建新的连接器。",
-    "xpack.cases.configure.readPermissionsErrorDescription": "您无权查看连接器。如果要查看与此案例关联的连接器，请联系Kibana 管理员。",
+    "xpack.cases.configure.readPermissionsErrorDescription": "您无权查看连接器。如果要查看连接器，请联系 Kibana 管理员。",
     "xpack.cases.configure.successSaveToast": "已保存外部连接设置",
     "xpack.cases.configureCases": "配置案例",
     "xpack.cases.configureCases.addNewConnector": "添加新连接器",
@@ -9114,8 +9712,13 @@
     "xpack.cases.createCase.titleFieldRequiredError": "标题必填。",
     "xpack.cases.editConnector.editConnectorLinkAria": "单击以编辑连接器",
     "xpack.cases.emptyString.emptyStringDescription": "空字符串",
+    "xpack.cases.features.casesFeatureName": "案例",
     "xpack.cases.getCurrentUser.Error": "获取用户时出错",
     "xpack.cases.getCurrentUser.unknownUser": "未知",
+    "xpack.cases.header.badge.betaDesc": "此功能当前为公测版。如果遇到任何错误或有任何反馈，请报告问题或访问我们的论坛。",
+    "xpack.cases.header.badge.betaLabel": "公测版",
+    "xpack.cases.header.badge.experimentalDesc": "此功能处于技术预览状态，在未来版本中可能会更改或完全移除。Elastic 将尽最大努力来修复任何问题，但处于技术预览状态的功能不受正式 GA 功能支持 SLA 的约束。",
+    "xpack.cases.header.badge.experimentalLabel": "技术预览",
     "xpack.cases.header.editableTitle.cancel": "取消",
     "xpack.cases.header.editableTitle.editButtonAria": "通过单击，可以编辑 {title}",
     "xpack.cases.header.editableTitle.save": "保存",
@@ -9162,6 +9765,8 @@
     "xpack.cases.status.iconAria": "更改状态",
     "xpack.cases.status.inProgress": "进行中",
     "xpack.cases.status.open": "打开",
+    "xpack.cloud.chat.chatFrameTitle": "聊天",
+    "xpack.cloud.chat.hideChatButtonLabel": "隐藏聊天",
     "xpack.cloud.deploymentLinkLabel": "管理此部署",
     "xpack.cloud.userMenuLinks.accountLinkText": "帐户和帐单",
     "xpack.cloud.userMenuLinks.profileLinkText": "配置文件",
@@ -9477,7 +10082,129 @@
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.singleUnfollowDescription": "Follower 索引将转换为标准索引。它不再显示在跨集群复制中，但您可以在“索引管理”中管理它。此操作无法撤消。",
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowMultipleTitle": "取消跟随 {count} 个 Leader 索引？",
     "xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowSingleTitle": "取消跟随“{name}”的 Leader 索引？",
+    "xpack.csp.active_frameworks": "活动框架",
+    "xpack.csp.benchmarks.integrationsNotFoundForNameMessage": " 对于“{name}”",
+    "xpack.csp.benchmarks.integrationsNotFoundMessage": "找不到基准集成",
+    "xpack.csp.benchmarks.integrationsNotFoundWithFiltersMessage": "使用上述筛选，我们无法找到任何基准集成。",
+    "xpack.csp.benchmarks.searchPlaceholder": "例如，基准名称",
+    "xpack.csp.benchmarks.totalIntegrationsCountMessage": "正在显示 {pageCount}/{totalCount, plural, other {# 个集成}}",
+    "xpack.csp.cloud_posture": "云态势",
+    "xpack.csp.cloud_posture_score": "云态势分数",
+    "xpack.csp.coming_soon": "即将推出",
+    "xpack.csp.compliance_score": "合规性分数",
+    "xpack.csp.compliance_trend": "合规性趋势",
+    "xpack.csp.complianceDashboard.failedFindingsChartLabel": "失败的结果",
+    "xpack.csp.complianceDashboard.noDataConfig.actionDescription": "您可以尝试重新提取数据",
+    "xpack.csp.complianceDashboard.noDataConfig.actionTitle": "重试",
+    "xpack.csp.complianceDashboard.noDataConfig.pageTitle": "云安全合规性仪表板",
+    "xpack.csp.complianceDashboard.noDataConfig.solutionNameLabel": "云安全态势",
+    "xpack.csp.cspPageTemplate.defaultNoDataConfig.pageTitle": "未找到任何数据",
+    "xpack.csp.cspPageTemplate.defaultNoDataConfig.solutionNameLabel": "云安全态势",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.buttonLabel": "添加 CIS 集成",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.description": "使用我们的 CIS Kubernetes 基准集成根据 CIS 建议衡量 Kubernetes 集群设置。",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.pageTitle": "安装集成以开始",
+    "xpack.csp.cspPageTemplate.packageNotInstalled.solutionNameLabel": "云安全态势",
+    "xpack.csp.cspSettings.rules": "CSP 安全规则 - ",
+    "xpack.csp.error": "错误",
+    "xpack.csp.failed": "失败",
+    "xpack.csp.findings": "结果",
+    "xpack.csp.findings.agentLabel": "代理",
+    "xpack.csp.findings.architectureLabel": "架构",
+    "xpack.csp.findings.auditLabel": "审计",
+    "xpack.csp.findings.benchmarkLabel": "基准",
+    "xpack.csp.findings.codenameLabel": "代号",
+    "xpack.csp.findings.containerizedLabel": "容器化",
+    "xpack.csp.findings.defaultValueLabel": "默认值",
+    "xpack.csp.findings.descriptionLabel": "描述",
+    "xpack.csp.findings.evaluationLabel": "评估",
+    "xpack.csp.findings.evidenceLabel": "证据",
+    "xpack.csp.findings.expectedLabel": "预期",
+    "xpack.csp.findings.familyLabel": "系列",
+    "xpack.csp.findings.filenameLabel": "文件名",
+    "xpack.csp.findings.frameworkSourcesLabel": "框架源",
+    "xpack.csp.findings.gidLabel": "GID",
+    "xpack.csp.findings.hostLabel": "主机",
+    "xpack.csp.findings.hostnameLabel": "主机名",
+    "xpack.csp.findings.idLabel": "ID",
+    "xpack.csp.findings.impactLabel": "影响",
+    "xpack.csp.findings.indexLabel": "索引",
+    "xpack.csp.findings.ipLabel": "IP",
+    "xpack.csp.findings.kernelLabel": "内核",
+    "xpack.csp.findings.macLabel": "Mac",
+    "xpack.csp.findings.modeLabel": "模式",
+    "xpack.csp.findings.nameLabel": "名称",
+    "xpack.csp.findings.nonFindingsLabel": "无结果",
+    "xpack.csp.findings.osLabel": "OS",
+    "xpack.csp.findings.pathLabel": "路径",
+    "xpack.csp.findings.platformLabel": "平台",
+    "xpack.csp.findings.profileApplicabilityLabel": "配置文件适用性",
+    "xpack.csp.findings.rationaleLabel": "理由",
+    "xpack.csp.findings.remediationLabel": "补救",
+    "xpack.csp.findings.resourceLabel": "资源",
+    "xpack.csp.findings.resultLabel": "结果详情",
+    "xpack.csp.findings.ruleEvaluatedAt": "规则评估时间",
+    "xpack.csp.findings.ruleLabel": "规则",
+    "xpack.csp.findings.ruleNameLabel": "规则名称",
+    "xpack.csp.findings.searchFailedLabel": "搜索失败",
+    "xpack.csp.findings.sectionLabel": "部分",
+    "xpack.csp.findings.severityLabel": "严重性",
+    "xpack.csp.findings.tagsLabel": "标签",
+    "xpack.csp.findings.timestampLabel": "时间戳",
+    "xpack.csp.findings.typeLabel": "类型",
+    "xpack.csp.findings.uidLabel": "UID",
+    "xpack.csp.findings.versionLabel": "版本",
+    "xpack.csp.open_cases": "未结案例",
+    "xpack.csp.pageTemplate.errorDetails.errorBodyTitle": "{body}",
+    "xpack.csp.pageTemplate.errorDetails.errorCodeTitle": "{error} {statusCode}",
+    "xpack.csp.pageTemplate.loadErrorMessage": "我们无法提取您的云安全态势数据",
+    "xpack.csp.passed": "通过",
+    "xpack.csp.posture_score": "态势分数",
+    "xpack.csp.posture_score_trend": "态势分数趋势",
+    "xpack.csp.resource_type": "资源类型",
+    "xpack.csp.rules.activateAllButtonLabel": "激活 {count, plural, other {# 个规则}}",
+    "xpack.csp.rules.activatedLabel": "已激活",
+    "xpack.csp.rules.activateLabel": "激活",
+    "xpack.csp.rules.bulkActionsButtonLabel": "批处理操作",
+    "xpack.csp.rules.cancelButtonLabel": "取消",
+    "xpack.csp.rules.clearSelectionButtonLabel": "清除所选内容",
+    "xpack.csp.rules.deactivateAllButtonLabel": "停用 {count, plural, other {# 个规则}}",
+    "xpack.csp.rules.deactivateLabel": "停用",
+    "xpack.csp.rules.disableLabel": "禁用",
+    "xpack.csp.rules.enableLabel": "启用",
+    "xpack.csp.rules.header.rulesCountLabel": "{count, plural, other { 规则}}",
+    "xpack.csp.rules.header.selectedRulesCount": "已选定 {rules}",
+    "xpack.csp.rules.header.totalRulesCount": "正在显示 {rules}",
+    "xpack.csp.rules.manageIntegrationButtonLabel": "管理集成",
+    "xpack.csp.rules.missingRulesMessage": "规则缺失",
+    "xpack.csp.rules.refreshButtonLabel": "刷新",
+    "xpack.csp.rules.ruleFlyout.auditLabel": "审计",
+    "xpack.csp.rules.ruleFlyout.defaultValueLabel": "默认值",
+    "xpack.csp.rules.ruleFlyout.frameworkSourcesLabel": "框架源",
+    "xpack.csp.rules.ruleFlyout.impactLabel": "影响",
+    "xpack.csp.rules.ruleFlyout.profileApplicabilityLabel": "配置文件适用性",
+    "xpack.csp.rules.ruleFlyout.rationaleLabel": "理由",
+    "xpack.csp.rules.ruleFlyout.referencesLabel": "参考",
+    "xpack.csp.rules.ruleFlyout.remediationLabel": "补救",
+    "xpack.csp.rules.ruleFlyout.sectionsLabel": "部分",
+    "xpack.csp.rules.ruleFlyout.tabs.overviewTabLabel": "概览",
+    "xpack.csp.rules.ruleFlyout.tabs.regoCodeTabLabel": "Rego 代码",
+    "xpack.csp.rules.ruleFlyout.tabs.remediationTabLabel": "补救",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.enabledLabel": "已启用",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.lastModifiedLabel": "最后修改时间",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.nameLabel": "规则名称",
+    "xpack.csp.rules.rulesTable.rulesTableColumn.sectionLabel": "部分",
+    "xpack.csp.rules.saveButtonLabel": "保存",
+    "xpack.csp.rules.searchPlaceholder": "搜索",
+    "xpack.csp.rules.selectAllButtonLabel": "全选",
+    "xpack.csp.rules.tableHeader.lastModificationLabel": "上次修改集成 {timeAgo} ",
+    "xpack.csp.rules.unknownErrorMessage": "未知错误",
+    "xpack.csp.rules.updateFailedMessage": "更新失败",
+    "xpack.csp.status": "状态",
+    "xpack.csp.total_failures": "失败总数",
+    "xpack.csp.total_resources": "资源总数",
+    "xpack.csp.view_all_failed_findings": "查看所有失败的结果",
     "xpack.dashboard.components.DashboardDrilldownConfig.chooseDestinationDashboard": "选择目标仪表板",
+    "xpack.dashboard.components.DashboardDrilldownConfig.openInNewTab": "在新选项卡中打开仪表板",
     "xpack.dashboard.components.DashboardDrilldownConfig.useCurrentDateRange": "使用源仪表板的日期范围",
     "xpack.dashboard.components.DashboardDrilldownConfig.useCurrentFilters": "使用源仪表板的筛选和查询",
     "xpack.dashboard.drilldown.errorDestinationDashboardIsMissing": "目标仪表板（“{dashboardId}”）已不存在。选择其他仪表板。",
@@ -9817,7 +10544,7 @@
     "xpack.dataVisualizer.fileBeatConfigFlyout.closeButton": "关闭",
     "xpack.dataVisualizer.fileBeatConfigFlyout.copyButton": "复制到剪贴板",
     "xpack.dataVisualizer.fullTimeRangeSelector.useFullDataExcludingFrozenButtonTooltip": "使用全范围数据，不包括冻结的数据层。",
-    "xpack.dataVisualizer.fullTimeRangeSelector.useFullDataIncludingFrozenButtonTooltip": "使用全范围数据，包括冻结的数据层，这可能会导致搜索结果更慢显示出来。",
+    "xpack.dataVisualizer.fullTimeRangeSelector.useFullDataIncludingFrozenButtonTooltip": "使用全范围数据，包括冻结的数据层，这可能会使搜索结果变慢。",
     "xpack.dataVisualizer.index.actionsPanel.discoverAppTitle": "Discover",
     "xpack.dataVisualizer.index.actionsPanel.exploreTitle": "浏览您的数据",
     "xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription": "浏览您的索引中的文档。",
@@ -9837,6 +10564,8 @@
     "xpack.dataVisualizer.index.dataViewManagement.actionsPopoverLabel": "数据视图设置",
     "xpack.dataVisualizer.index.dataViewManagement.addFieldButton": "将字段添加到数据视图",
     "xpack.dataVisualizer.index.dataViewManagement.manageFieldButton": "管理数据视图字段",
+    "xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationDescription": "仅针对基于时间的索引运行异常检测",
+    "xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationTitle": "数据视图 {dataViewTitle} 并非基于时间序列",
     "xpack.dataVisualizer.index.embeddableErrorDescription": "加载可嵌入对象时出现错误。请检查所有必需的输入是否有效。",
     "xpack.dataVisualizer.index.embeddableErrorTitle": "加载可嵌入对象时出错",
     "xpack.dataVisualizer.index.embeddableNoResultsMessage": "找不到结果",
@@ -9847,6 +10576,7 @@
     "xpack.dataVisualizer.index.fieldTypeSelect": "字段类型",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification": "设置时间范围时出错。",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.moreOptionsButtonAriaLabel": "更多选项",
+    "xpack.dataVisualizer.index.fullTimeRangeSelector.noResults": "没有任何结果匹配您的搜索条件",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataButtonLabel": "使用完整的数据",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataExcludingFrozenMenuLabel": "排除冻结的数据层",
     "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataIncludingFrozenMenuLabel": "包括冻结的数据层",
@@ -9892,6 +10622,7 @@
     "xpack.enterpriseSearch.appSearch.allEnginesDescription": "分配给所有引擎包括之后创建和管理的所有当前和未来引擎。",
     "xpack.enterpriseSearch.appSearch.allEnginesLabel": "分配给所有引擎",
     "xpack.enterpriseSearch.appSearch.analystRoleTypeDescription": "分析人员仅可以查看文档、查询测试器和分析。",
+    "xpack.enterpriseSearch.appSearch.audit.title": "审计",
     "xpack.enterpriseSearch.appSearch.crawler.action.deleteDomain.confirmationPopupMessage": "确定要移除域“{domainUrl}”和其所有设置？",
     "xpack.enterpriseSearch.appSearch.crawler.action.deleteDomain.successMessage": "域“{domainUrl}”已删除",
     "xpack.enterpriseSearch.appSearch.crawler.addDomainFlyout.description": "可以将多个域添加到此引擎的网络爬虫。在此添加其他域并从“管理”页面修改入口点和爬网规则。",
@@ -9927,6 +10658,20 @@
     "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlDepthLabel": "最大爬网深度",
     "xpack.enterpriseSearch.appSearch.crawler.components.crawlDetailsSummary.crawlTypeLabel": "爬网类型",
     "xpack.enterpriseSearch.appSearch.crawler.configurationDocumentationLinkDescription": "详细了解如何在 Kibana 中配置网络爬虫",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.customEntryPointUrlsTextboxLabel": "定制入口点 URL",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.customSitemapUrlsTextboxLabel": "定制站点地图 URL",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.domainsAccordionButtonLabel": "添加域到您的爬网",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.emptyDomainsMessage": "请选择域。",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.entryPointsTabLabel": "入口点",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.flyoutHeaderDescription": "使用定制设置设置一次性爬网。",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.flyoutHeadTitle": "定制爬网配置",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.includeSitemapsCheckboxLabel": "包括在 {robotsDotTxt} 中发现的站点地图",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.maxCrawlDepthFieldDescription": "设置最大爬网深度以指定网络爬虫应遍历的页面深度。将该值设置为一 (1) 可将爬网仅限定为入口点。",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.maxCrawlDepthFieldLabel": "最大爬网深度",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.seedUrlsAccordionButtonLabel": "种子 URL",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.selectedDescriptor": "已选定",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.sitemapsTabLabel": "站点地图",
+    "xpack.enterpriseSearch.appSearch.crawler.crawlCustomSettingsFlyout.startCrawlButtonLabel": "立即应用并爬网",
     "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.previewTabLabel": "预览",
     "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.rawJSONTabLabel": "原始 JSON",
     "xpack.enterpriseSearch.appSearch.crawler.crawlDetailsFlyout.title": "爬网请求详情",
@@ -10038,8 +10783,10 @@
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.title": "站点地图",
     "xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.urlTableHead": "URL",
     "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlAllDomainsMenuLabel": "爬网此引擎上的所有域",
+    "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlCustomSettingsMenuLabel": "使用定制设置执行爬网",
     "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.crawlSelectDomainsMenuLabel": "爬网选定域",
     "xpack.enterpriseSearch.appSearch.crawler.startCrawlContextMenu.startACrawlButtonLabel": "开始爬网",
+    "xpack.enterpriseSearch.appSearch.crawler.urlComboBox.invalidUrlErrorMessage": "请输入有效 URL",
     "xpack.enterpriseSearch.appSearch.credentials.apiEndpoint": "终端",
     "xpack.enterpriseSearch.appSearch.credentials.apiKeys": "API 密钥",
     "xpack.enterpriseSearch.appSearch.credentials.copied": "已复制",
@@ -10101,10 +10848,31 @@
     "xpack.enterpriseSearch.appSearch.documentCreation.api.description": "{documentsApiLink} 可用于将新文档添加到您的引擎、更新文档、按 ID 检索文档以及删除文档。有各种{clientLibrariesLink}可帮助您入门。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.example": "要了解如何使用 API，可以在下面通过命令行或客户端库试用示例请求。",
     "xpack.enterpriseSearch.appSearch.documentCreation.api.title": "按 API 索引",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.apiDescription": "POST 到文档终端",
     "xpack.enterpriseSearch.appSearch.documentCreation.buttons.apiTitle": "从 API 索引",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.crawlDescription": "自动索引 URL 的文档",
     "xpack.enterpriseSearch.appSearch.documentCreation.buttons.crawlTitle": "使用网络爬虫",
-    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonTitle": "粘贴 JSON",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateFooterLink": "阅读文档",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateFooterText": "希望了解有关索引文档的详情？",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateIllustrationAltText": "图示",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.emptyStateTitle": "添加文档",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonDescription": "通过粘贴或上传原始 JSON 来添加文档",
+    "xpack.enterpriseSearch.appSearch.documentCreation.buttons.jsonTitle": "粘贴或上传 JSON",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.button": "连接到索引",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.description": "现在您可以直接连接到现有 Elasticsearch 索引，以便可以通过 Enterprise Search Ul 搜索和调整其数据。{learnMoreLink}",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.docCount": "文档计数：",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.indexSelectorAriaLabel": "选择 Elasticsearch 索引",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.link": "详细了解如何使用现有索引",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.selectable.empty": "无 Elasticsearch 索引可用",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.selectable.loading": "正在加载 Elasticsearch 索引",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.status": "状态：",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.storage": "存储大小：",
+    "xpack.enterpriseSearch.appSearch.documentCreation.elasticsearchIndex.title": "连接 Elasticsearch 索引",
     "xpack.enterpriseSearch.appSearch.documentCreation.errorsTitle": "出问题了。请解决这些错误，然后重试。",
+    "xpack.enterpriseSearch.appSearch.documentCreation.helperText": "有三种方法将文档发送到引擎进行索引。您可以粘贴或上传 JSON 文件、POST 到文档 API 终端，或者使用 Elastic 网络爬虫来自动索引 URL 中的文档。",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.pasteTabName": "粘贴",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.title": "粘贴或上传 JSON",
+    "xpack.enterpriseSearch.appSearch.documentCreation.jsonFlyout.uploadTabName": "上传",
     "xpack.enterpriseSearch.appSearch.documentCreation.largeFile": "您正在上传极大的文件。这可能会锁定您的浏览器，或需要很长时间才能处理完。如果可能，请尝试将您的数据拆分成多个较小的文件。",
     "xpack.enterpriseSearch.appSearch.documentCreation.noFileFound": "未找到文件。",
     "xpack.enterpriseSearch.appSearch.documentCreation.notValidJson": "文档内容必须是有效的 JSON 数组或对象。",
@@ -10128,6 +10896,8 @@
     "xpack.enterpriseSearch.appSearch.documentDetail.fieldHeader": "字段",
     "xpack.enterpriseSearch.appSearch.documentDetail.title": "文档：{documentId}",
     "xpack.enterpriseSearch.appSearch.documentDetail.valueHeader": "值",
+    "xpack.enterpriseSearch.appSearch.documents.elasticsearchEngineCallout": "此引擎已附加到 {elasticsearchIndexName}。您可以在 Kibana 中修改此索引的数据。",
+    "xpack.enterpriseSearch.appSearch.documents.elasticsearchEngineCallout.title": "此引擎的数据由 Elasticsearch 管理。",
     "xpack.enterpriseSearch.appSearch.documents.empty.description": "您可以使用 App Search 网络爬虫通过上传 JSON 或使用 API 索引文档。",
     "xpack.enterpriseSearch.appSearch.documents.empty.title": "添加您的首批文档",
     "xpack.enterpriseSearch.appSearch.documents.indexDocuments": "索引文档",
@@ -10154,8 +10924,14 @@
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.ariaLabel": "结果排序方式",
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.ascendingDropDownOptionLabel": "{fieldName}（升序）",
     "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.descendingDropDownOptionLabel": "{fieldName}（降序）",
+    "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.documentId": "文档 ID",
+    "xpack.enterpriseSearch.appSearch.documents.search.sortBy.option.relevance": "相关性",
     "xpack.enterpriseSearch.appSearch.documents.title": "文档",
     "xpack.enterpriseSearch.appSearch.editorRoleTypeDescription": "编辑人员可以管理搜索设置。",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateButton": "管理索引",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateIllustrationAltText": "图示",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.emptyStateTitle": "添加文档到您的索引",
+    "xpack.enterpriseSearch.appSearch.elasticsearchEngine.helperText": "您的 Elasticsearch 索引 {elasticsearchIndexName} 尚没有任何文档。在 Kibana 中打开索引管理以更改您的 Elasticsearch 索引。",
     "xpack.enterpriseSearch.appSearch.emptyState.createFirstEngineCta": "创建引擎",
     "xpack.enterpriseSearch.appSearch.emptyState.description1": "App Search 引擎存储文档以提升您的搜索体验。",
     "xpack.enterpriseSearch.appSearch.emptyState.nonAdmin.description": "请联系您的 App Search 管理员，为您创建或授予引擎的访问权限。",
@@ -10266,7 +11042,6 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryButtonLabel": "管理查询",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryDescription": "编辑、添加或移除此策展的查询。",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryTitle": "管理查询",
-    "xpack.enterpriseSearch.appSearch.engine.curations.newBadgeLabel": "新！",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.description": "没有要显示的有机结果。{manualDescription}",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.manualDescription": "在上面添加或更改活动查询。",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.title": "“{currentQuery}”的排名靠前有机文档",
@@ -10327,6 +11102,7 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.table.title": "活动策展",
     "xpack.enterpriseSearch.appSearch.engine.curations.title": "策展",
     "xpack.enterpriseSearch.appSearch.engine.documents.empty.buttonLabel": "阅读文档指南",
+    "xpack.enterpriseSearch.appSearch.engine.elasticsearchEngineBadge": "ELASTICSEARCH 索引",
     "xpack.enterpriseSearch.appSearch.engine.metaEngineBadge": "元引擎",
     "xpack.enterpriseSearch.appSearch.engine.notFound": "找不到名为“{engineName}”的引擎。",
     "xpack.enterpriseSearch.appSearch.engine.overview.analyticsLink": "查看分析",
@@ -10360,6 +11136,7 @@
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.description": "管理引擎的精确性和相关性设置",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.disabledFields.title": "已禁用字段",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.disabledFieldsExplanationMessage": "由于字段类型冲突，为非活动",
+    "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.elasticsearch.description": "管理引擎的相关性设置",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.buttonLabel": "阅读相关性调整指南",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.description": "您索引一些文档后，系统便会自动为您创建架构。",
     "xpack.enterpriseSearch.appSearch.engine.relevanceTuning.empty.title": "添加文档以调整相关性",
@@ -10463,6 +11240,8 @@
     "xpack.enterpriseSearch.appSearch.engine.schema.metaEngine.title": "元引擎架构",
     "xpack.enterpriseSearch.appSearch.engine.schema.pageDescription": "添加新字段或更改现有字段的类型。",
     "xpack.enterpriseSearch.appSearch.engine.schema.pageTitle": "管理引擎架构",
+    "xpack.enterpriseSearch.appSearch.engine.schema.readOnly.pageDescription": "查看架构字段类型。",
+    "xpack.enterpriseSearch.appSearch.engine.schema.readOnly.pageTitle": "引擎架构",
     "xpack.enterpriseSearch.appSearch.engine.schema.reindexErrorsBreadcrumb": "重新索引错误",
     "xpack.enterpriseSearch.appSearch.engine.schema.reindexJob.title": "架构更改错误",
     "xpack.enterpriseSearch.appSearch.engine.schema.title": "架构",
@@ -10528,6 +11307,8 @@
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.sanitizedNameHelpText": "您的引擎将命名为",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.submitButton.buttonLabel": "创建引擎",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.title": "命名您的引擎",
+    "xpack.enterpriseSearch.appSearch.engineCreation.searchIndexSelectable.helpText": "只可以选择别名含“search-”的索引",
+    "xpack.enterpriseSearch.appSearch.engineCreation.searchIndexSelectable.label": "选择要使用的 Elasticsearch 索引",
     "xpack.enterpriseSearch.appSearch.engineCreation.successMessage": "引擎“{name}”已创建",
     "xpack.enterpriseSearch.appSearch.engineCreation.supportedLanguages.chineseDropDownOptionLabel": "中文",
     "xpack.enterpriseSearch.appSearch.engineCreation.supportedLanguages.danishDropDownOptionLabel": "丹麦语",
@@ -10548,6 +11329,12 @@
     "xpack.enterpriseSearch.appSearch.engineRequiredError": "至少需要分配一个引擎。",
     "xpack.enterpriseSearch.appSearch.engines.apiLogs.newEventsButtonLabel": "刷新",
     "xpack.enterpriseSearch.appSearch.engines.apiLogs.newEventsMessage": "已记录新事件。",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.closeButton": "关闭",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.eventTip": "正在显示过去 24 小时的事件",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.eventCategory": "事件类别",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.eventType": "事件类型",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.outcome": "结果",
+    "xpack.enterpriseSearch.appSearch.engines.auditLogsModal.headers.updatedBy": "更新者",
     "xpack.enterpriseSearch.appSearch.engines.createEngineButtonLabel": "创建引擎",
     "xpack.enterpriseSearch.appSearch.engines.createMetaEngineButtonLabel": "创建元引擎",
     "xpack.enterpriseSearch.appSearch.engines.metaEngines.emptyPromptButtonLabel": "详细了解元引擎",
@@ -10566,6 +11353,7 @@
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.documentCount": "文档计数",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.fieldCount": "字段计数",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.language": "语言",
+    "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.lastUpdated": "上次更新时间",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.name": "名称",
     "xpack.enterpriseSearch.appSearch.enginesOverview.title": "引擎概览",
     "xpack.enterpriseSearch.appSearch.integrations.apiDescription": "通过 App Search 稳健的 API 将搜索功能添加到您的应用程序。",
@@ -10588,6 +11376,8 @@
     "xpack.enterpriseSearch.appSearch.logRetention.type.analytics.title.lowercase": "分析",
     "xpack.enterpriseSearch.appSearch.logRetention.type.api.title.capitalized": "API",
     "xpack.enterpriseSearch.appSearch.logRetention.type.api.title.lowercase": "API",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.audit.title.capitalized": "审计",
+    "xpack.enterpriseSearch.appSearch.logRetention.type.audit.title.lowercase": "审计",
     "xpack.enterpriseSearch.appSearch.logRetention.type.crawler.title.capitalized": "网络爬虫",
     "xpack.enterpriseSearch.appSearch.logRetention.type.crawler.title.lowercase": "网络爬虫",
     "xpack.enterpriseSearch.appSearch.metaEngineCreation.form.documentationDescription": "{documentationLink}以了解如何开始。",
@@ -10626,6 +11416,7 @@
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.title": "刚做过测试？",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.analytics.label": "记录分析事件",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.api.label": "记录 API 事件",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.audit.label": "记录审计事件",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.crawler.label": "网络爬虫日志",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.description": "日志保留由适用于您的部署的 ILM 策略决定。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.learnMore": "详细了解企业搜索的日志保留。",
@@ -10635,6 +11426,9 @@
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.description": "禁用写入时，引擎将停止记录 API 事件。您的已有数据将根据存储期限进行删除。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.subheading": "当前您的 API 日志将存储 {minAgeDays} 天。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.title": "禁用 API 写入",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.description": "禁用写入时，引擎将停止记录审计事件。您的已有数据将根据存储期限进行删除。",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.subheading": "当前您的审计日志将存储 {minAgeDays} 天。",
+    "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.audit.title": "禁用审计写入",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.description": "禁用写入时，引擎将停止记录网络爬虫事件。您的已有数据将根据存储期限进行删除。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.subheading": "当前您的网络爬虫日志将存储 {minAgeDays} 天。",
     "xpack.enterpriseSearch.appSearch.settings.logRetention.modal.crawler.title": "禁用网络爬虫写入",
@@ -10665,9 +11459,24 @@
     "xpack.enterpriseSearch.appSearch.tokens.search.description": "公有搜索密钥仅用于搜索终端。",
     "xpack.enterpriseSearch.appSearch.tokens.search.name": "公有搜索密钥",
     "xpack.enterpriseSearch.appSearch.tokens.update": "API 密钥“{name}”已更新",
+    "xpack.enterpriseSearch.content.description": "Enterprise Search 提供了各种方法以便您轻松搜索数据。从网络爬虫、Elasticsearch 索引、API、直接上传或第三方连接器中选择。",
+    "xpack.enterpriseSearch.content.nav.appSearchTitle": "App Search",
+    "xpack.enterpriseSearch.content.nav.contentTitle": "内容",
+    "xpack.enterpriseSearch.content.nav.enterpriseSearchOverviewTitle": "概览",
+    "xpack.enterpriseSearch.content.nav.searchIndicesTitle": "搜索索引",
+    "xpack.enterpriseSearch.content.nav.workplaceSearchTitle": "Workplace Search",
+    "xpack.enterpriseSearch.content.navTitle": "内容",
+    "xpack.enterpriseSearch.content.productName": "Enterprise Search",
     "xpack.enterpriseSearch.curations.settings.licenseUpgradeLink": "详细了解许可证升级",
     "xpack.enterpriseSearch.curations.settings.start30DayTrialButtonLabel": "开始为期 30 天的试用",
     "xpack.enterpriseSearch.emailLabel": "电子邮件",
+    "xpack.enterpriseSearch.engineCreation.appSearchManagedDescription": "创建引擎并通过网络爬虫、API 或 JSON 文件添加文档。",
+    "xpack.enterpriseSearch.engineCreation.appSearchManagedLabel": "我需要 App Search 来采集和管理我的数据",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLabel": "基于 Elasticsearch 索引中管理的数据创建引擎。",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchIndexedLink": "详细了解如何使用现有 Elasticsearch 索引",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchManagedLabel": "我希望使用 Elasticsearch 来管理我的数据",
+    "xpack.enterpriseSearch.engineCreation.elasticsearchTechPreviewBadge": "技术预览",
+    "xpack.enterpriseSearch.engineCreation.engineTypeLabel": "选择您希望如何管理此引擎的索引",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.description": "随时随地进行全面搜索。为工作繁忙的团队轻松实现强大的现代搜索体验。将预先调整的搜索功能快速添加到您的网站、应用或工作区。全面搜索就是这么简单。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.notConfigured": "企业搜索尚未在您的 Kibana 实例中配置。",
     "xpack.enterpriseSearch.enterpriseSearch.setupGuide.videoAlt": "企业搜索入门",
@@ -10681,30 +11490,54 @@
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuth": "检查您的用户身份验证：",
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthNative": "必须使用 Elasticsearch 本机身份验证、SSO/SAML 或 OpenID Connect 执行身份验证。",
     "xpack.enterpriseSearch.errorConnectingState.troubleshootAuthSAML": "如果使用外部 SSO 提供程序，如 SAML 或 OpenID Connect，还必须在 Enterprise Search 上设置 SAML/OIDC Realm。",
-    "xpack.enterpriseSearch.overview.description": "使用一组优化的 API 和工具打造搜索体验。",
     "xpack.enterpriseSearch.hiddenText": "隐藏文本",
     "xpack.enterpriseSearch.inlineEditableTable.newRowButtonLabel": "新行",
     "xpack.enterpriseSearch.licenseCalloutBody": "使用有效的白金级许可证，可获得通过 SAML 实现的企业验证、文档级别权限和授权支持、定制搜索体验等等。",
     "xpack.enterpriseSearch.licenseDocumentationLink": "详细了解许可证功能",
     "xpack.enterpriseSearch.licenseManagementLink": "管理您的许可",
-    "xpack.enterpriseSearch.overview.navTitle": "概览",
     "xpack.enterpriseSearch.notFound.action1": "返回到您的仪表板",
     "xpack.enterpriseSearch.notFound.action2": "联系支持人员",
     "xpack.enterpriseSearch.notFound.description": "找不到您要查找的页面。",
     "xpack.enterpriseSearch.notFound.title": "404 错误",
+    "xpack.enterpriseSearch.overview.description": "使用一组优化的 API 和工具打造搜索体验。",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.button": "开始使用",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.description": "直接在 Elasticsearch 中设计并构建由相关搜索提供支持的高性能应用程序或大规模搜索实现",
+    "xpack.enterpriseSearch.overview.elasticsearchCard.heading": "Elasticsearch 入门",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.cloudIdLabel": "云 ID",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.copyCloudIdAriaLabel": "复制云 ID",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.heading": "我的部署",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.manageApiKeysLink": "管理 API 密钥",
+    "xpack.enterpriseSearch.overview.elasticsearchCloudId.manageLink": "管理",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.connectToElasticsearchDescription": "Elastic 以几种流行语言构建和维护客户端，我们的社区也做出了许多贡献。这些客户端使用起来简单自然，而且就像 Elasticsearch 一样，不会对您的使用方式进行限制。",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.connectToElasticsearchTitle": "连接到 Elasticsearch",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsLink": "详细了解 Elasticsearch 客户端",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsSelectAriaLabel": "语言客户端",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchClientsSelectLabel": "选择客户端",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchDescription": "无论是构建由搜索提供支持的应用程序，还是设计大规模搜索实现，Elasticsearch 都提供了低级别工具来创建最相关而高效的搜索体验。",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchExperienceDescription": "准备为您的应用程序或网站添加富于吸引力的现代搜索体验？搜索 UI 是 Elastic 用于构建世界级搜索体验的 JavaScript 搜索框架，它专为执行该任务而设计。",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchExperienceTitle": "使用 Elasticsearch 构建搜索体验",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchUIGitHubLink": "GitHub 上的搜索 UI",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchSearchUIMarketingLink": "详细了解搜索 UI",
+    "xpack.enterpriseSearch.overview.elasticsearchGuide.elasticsearchTitle": "Elasticsearch 入门",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.createIndex": "创建新索引",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.elasticsearchClients": "Elasticsearch 客户端",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.gettingStarted": "Elasticsearch 入门",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.searchUi": "Elasticsearch 的搜索 UI",
+    "xpack.enterpriseSearch.overview.elasticsearchResources.title": "资源",
     "xpack.enterpriseSearch.overview.heading": "欢迎使用 Elastic 企业搜索",
     "xpack.enterpriseSearch.overview.insufficientPermissionsBody": "您无权查看此页面。如果您认为这可能是个错误，请联系您的管理员。",
     "xpack.enterpriseSearch.overview.insufficientPermissionsButtonLabel": "前往 Kibana 仪表板",
     "xpack.enterpriseSearch.overview.insufficientPermissionsFooterBody": "前往 Kibana 仪表板",
     "xpack.enterpriseSearch.overview.insufficientPermissionsFooterLinkLabel": "阅读文档",
     "xpack.enterpriseSearch.overview.insufficientPermissionsTitle": "权限不足",
+    "xpack.enterpriseSearch.overview.navTitle": "概览",
     "xpack.enterpriseSearch.overview.productCard.heading": "Elastic {productName}",
     "xpack.enterpriseSearch.overview.productCard.launchButton": "打开 {productName}",
     "xpack.enterpriseSearch.overview.productCard.setupButton": "设置 {productName}",
+    "xpack.enterpriseSearch.overview.productName": "Enterprise Search",
     "xpack.enterpriseSearch.overview.setupCta.description": "通过 Elastic App Search 和 Workplace Search，将搜索添加到您的应用或内部组织中。观看视频，了解方便易用的搜索功能可以帮您做些什么。",
     "xpack.enterpriseSearch.overview.setupHeading": "选择产品进行设置并开始使用。",
     "xpack.enterpriseSearch.overview.subheading": "将搜索功能添加到您的应用或组织。",
-    "xpack.enterpriseSearch.overview.productName": "Enterprise Search",
     "xpack.enterpriseSearch.productSelectorCalloutTitle": "适用于大型和小型团队的企业级功能",
     "xpack.enterpriseSearch.readOnlyMode.warning": "企业搜索处于只读模式。您将无法执行更改，例如创建、编辑或删除。",
     "xpack.enterpriseSearch.roleMapping.addRoleMappingButtonLabel": "添加映射",
@@ -10809,6 +11642,9 @@
     "xpack.enterpriseSearch.setupGuide.cloud.step5.instruction1": "对于包含时间序列统计数据的 {productName} 索引，您可能想要{configurePolicyLink}，以确保较长时期内性能理想且存储划算。",
     "xpack.enterpriseSearch.setupGuide.cloud.step5.instruction1LinkText": "配置索引生命周期策略",
     "xpack.enterpriseSearch.setupGuide.cloud.step5.title": "{productName} 现在可以使用了",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.instruction1": "如需帮助解决常见的设置问题，请阅读我们的 {link}指南。",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.instruction1LinkText": "Enterprise Search 设置故障排除",
+    "xpack.enterpriseSearch.setupGuide.cloud.step6.title": "解决问题",
     "xpack.enterpriseSearch.setupGuide.step1.instruction1": "在 {configFile} 文件中，将 {configSetting} 设置为 {productName} 实例的 URL。例如：",
     "xpack.enterpriseSearch.setupGuide.step1.title": "将 {productName} 主机 URL 添加到 Kibana 配置",
     "xpack.enterpriseSearch.setupGuide.step2.instruction1": "重新启动 Kibana 以应用上一步骤中的配置更改。",
@@ -10821,6 +11657,8 @@
     "xpack.enterpriseSearch.trialCalloutTitle": "您的可启用白金级功能的 Elastic Stack 试用版许可证将 {days, plural, other {# 天}}后过期。",
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.description": "此插件当前不支持在不同集群中运行的 {productName} 和 Kibana。",
     "xpack.enterpriseSearch.troubleshooting.differentEsClusters.title": "{productName} 和 Kibana 在不同的 Elasticsearch 集群中",
+    "xpack.enterpriseSearch.troubleshooting.setup.description": "如需帮助解决其他常见的设置问题，请阅读我们的 {link}指南。",
+    "xpack.enterpriseSearch.troubleshooting.setup.documentationLinkLabel": "Enterprise Search 设置故障排除",
     "xpack.enterpriseSearch.units.allDaysLabel": "所有日期",
     "xpack.enterpriseSearch.units.daysLabel": "天",
     "xpack.enterpriseSearch.units.daysOfWeekLabel.friday": "星期五",
@@ -10887,6 +11725,19 @@
     "xpack.enterpriseSearch.workplaceSearch.connectors.header.description": "您的所有可配置连接器。",
     "xpack.enterpriseSearch.workplaceSearch.connectors.header.title": "内容源连接器",
     "xpack.enterpriseSearch.workplaceSearch.consumerKey.label": "使用者密钥",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.description": "要准备进行配置，请查阅我们的{deploymentGuideLink}了解快速部署连接器软件包所需满足的所有先决条件。通过在下一步中设置连接器的 URL 和 API 密钥，在 Enterprise Search 中确定您的配置。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.discussLinkLabel": "有疑问？请在此处讨论。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.feedbackLinkLabel": "我们始终在努力做出改进。分享您的反馈  ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.heading": "{name} 连接器完全可定制，并将在您选择的基础架构上进行自我管理。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addExternalConnector.documentation.linkLabel": "文档",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.configCompleted.feedbackCallOutText": "具有关于部署 {name} 连接器软件包的反馈？请告诉我们。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.apiKeyLabel": "连接器 API 密钥",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.error": "请使用有效的 URL",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.helpText": "URL 应以 https:// 开头",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.insecureTitle": "连接不安全",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.insecureWarning": "您的连接器使用的是 HTTP 连接，这不是专用连接。其他人可以查看此连接器同步的信息。请通过 HTTPS 建立连接以确保您的信息安全。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.stepTitle": "提供适当的配置信息",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.addSource.externalConnectorConfig.urlLabel": "连接器 URL",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.emptyBody": "管理员将源添加到此组织后，它们便可供搜索。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.emptyTitle": "没有可用源",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.addSourceList.newSourceDescription": "配置并连接源时，您将会使用从内容平台本身同步的可搜索内容创建不同的实体。可以使用以下一个可用连接器添加源，也可以通过定制 API 源，实现更多的灵活性。",
@@ -10911,9 +11762,28 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.link": "启用专用源连接",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.message": "切记在安全设置中{securityLink}。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.button": "创建定制 API 源",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.createNamedSourceButtonLabel": "配置 {name}",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.description": "要准备进行配置，请查阅我们的{deploymentGuideLink}了解快速部署连接器软件包所需满足的所有先决条件。在 Enterprise Search 中使用 {name} 内容源的描述性名称确定您的配置，然后用在下一步中提供的源 ID 更新连接器配置文件。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.discussLinkLabel": "有疑问？请在此处讨论。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.feedbackLinkLabel": "我们始终在努力做出改进。分享您的反馈  ",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.githubRepoLinkLabel": "在此处定制连接器。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.heading": "{name} 连接器完全可定制，并将在您选择的基础架构上进行自我管理。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.deploymentGuide.linkLabel": "文档",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.description": "{link}以详细了解定制 API 源。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.text": "阅读文档",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.title": "如何添加 {name}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configDocs.applicationPortal.button": "{name} 应用程序门户",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.button": "说明",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.description": "设置定制连接器以提高可配置性和控制能力。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.custom.title": "定制连接器",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.betaLabel": "公测版",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.button": "说明",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.description": "在自我管理基础架构上部署此连接器软件包以用于高级用例。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.recommendedLabel": "推荐",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.external.title": "连接器软件包",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.button": "连接",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.description": "使用此连接器快速开始，而无需部署其他基础架构。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configExternalChoice.internal.title": "连接器",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.alt.text": "连接图示",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.configure.button": "配置 {name}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.badge": "一次性操作",
@@ -10929,10 +11799,12 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configOauth.label": "选择要同步的 GitHub 组织",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.accountOnlyTooltip": "专用内容源。每个用户必须从自己的个人仪表板添加内容源。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.body": "已配置且准备好连接。",
-    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton": "连接另一个",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton": "连接另一个",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton": "连接",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.emptyState": "没有已配置的源匹配您的查询。",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.title": "已配置内容源",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.unConnectedTooltip": "没有已连接源",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSourcesList.betaBadge": "公测版",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.button": "连接 {name}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.docPermissionsUnavailable.message": "尚没有文档级别权限可用于此源。{link}",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.connect.needsPermissions.text": "将同步文档级别权限信息。在初始连接后，需要进行其他配置，然后文档才可供搜索。",
@@ -10949,6 +11821,7 @@
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.oauthStep1": "在组织的 {sourceName} 帐户中创建 OAuth 应用",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.oauthStep2": "提供适当的配置信息",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.body1": "您的终端已准备好接受请求。",
+    "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.configureNewSourceButtonLabel": "配置新的内容源",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.heading": "{name} 已创建",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.addField.button": "添加字段",
     "xpack.enterpriseSearch.workplaceSearch.contentSource.schema.empty.description": "您索引一些文档后，系统便会为您创建架构。单击下面，以提前创建架构字段。",
@@ -11031,10 +11904,20 @@
     "xpack.enterpriseSearch.workplaceSearch.customize.header.title": "定制 Workplace Search",
     "xpack.enterpriseSearch.workplaceSearch.customize.name.button": "保存组织名称",
     "xpack.enterpriseSearch.workplaceSearch.customize.name.label": "组织名称",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.documentationLinkLabel": "{name} 连接器文档",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.genericDocumentationHelpText": "查阅 {documentationLink}了解如何在您选择的自我管理基础架构上构建和部署您自己的连接器。",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.genericDocumentationLabel": "定制 API 源文档",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.preconfiguredDocumentationHelpText": "查阅{documentationLink}并在您选择的基础架构上部署将进行自我管理的连接器软件包。",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.preconfiguredRepositoryInstructions": "通过克隆 {githubRepositoryLink}设置您的连接器",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.repositoryLinkLabel": "{name} 连接器存储库",
+    "xpack.enterpriseSearch.workplaceSearch.customSourceDeployment.sourceIdentifierHelpText": "在部署的连接器的配置文件中指定以下源标识符以及 {apiKeyLink}，以便同步文档。",
+    "xpack.enterpriseSearch.workplaceSearch.deployment.title": "部署",
     "xpack.enterpriseSearch.workplaceSearch.description.label": "描述",
     "xpack.enterpriseSearch.workplaceSearch.documentsHeader": "文档",
     "xpack.enterpriseSearch.workplaceSearch.editField.label": "编辑字段",
     "xpack.enterpriseSearch.workplaceSearch.explorePlatinumFeatures.link": "了解白金级功能",
+    "xpack.enterpriseSearch.workplaceSearch.externalConnectorApiKey.label": "连接器 API 密钥",
+    "xpack.enterpriseSearch.workplaceSearch.externalConnectorUrl.label": "连接器 URL",
     "xpack.enterpriseSearch.workplaceSearch.field.label": "字段",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.heading": "添加组",
     "xpack.enterpriseSearch.workplaceSearch.groups.addGroup.label": "组名",
@@ -11124,6 +12007,8 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.servicenowName": "ServiceNow",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription": "通过 Workplace Search 搜索存储在 SharePoint Online 上的文件。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineName": "Sharepoint",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointServerDescription": "通过 Workplace Search 搜索存储在 Microsoft SharePoint Server 上的文件。",
+    "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointServerName": "SharePoint Server",
     "xpack.enterpriseSearch.workplaceSearch.integrations.slackDescription": "通过 Workplace Search 搜索 Slack 上的消息。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.slackName": "Slack",
     "xpack.enterpriseSearch.workplaceSearch.integrations.zendeskDescription": "通过 Workplace Search 搜索 Zendesk 上的工单。",
@@ -11150,6 +12035,7 @@
     "xpack.enterpriseSearch.workplaceSearch.nav.settingsSourcePrioritization": "内容源连接器",
     "xpack.enterpriseSearch.workplaceSearch.nav.sources": "源",
     "xpack.enterpriseSearch.workplaceSearch.nav.synchronization": "同步",
+    "xpack.enterpriseSearch.workplaceSearch.nav.synchronizationAssetsAndObjects": "资产和对象",
     "xpack.enterpriseSearch.workplaceSearch.nav.synchronizationFrequency": "频率",
     "xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthDescription": "配置 OAuth 应用程序，以安全使用 Workplace Search 搜索 API。升级到白金级许可证，以启用搜索 API 并创建您的 OAuth 应用程序。",
     "xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthTitle": "正在为定制搜索应用程序配置 OAuth",
@@ -11240,6 +12126,7 @@
     "xpack.enterpriseSearch.workplaceSearch.settings.configRemoved.message": "已成功为 {name} 移除配置。",
     "xpack.enterpriseSearch.workplaceSearch.settings.confirmRemoveConfig.message": "确定要为 {name} 移除 OAuth 配置？",
     "xpack.enterpriseSearch.workplaceSearch.settings.confirmRemoveConfigTitle": "移除配置",
+    "xpack.enterpriseSearch.workplaceSearch.settings.feedbackCallOutText": "具有关于部署 {name} 连接器软件包的反馈？请告诉我们。",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconDescription": "用作较小尺寸屏幕和浏览器图标的品牌元素",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconHelpText": "最大文件大小为 2MB，建议的纵横比为 1:1。仅支持 PNG 文件。",
     "xpack.enterpriseSearch.workplaceSearch.settings.iconText": "图标",
@@ -11258,6 +12145,7 @@
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.imageAlt": "Workplace Search 入门 - 指导您如何开始使用 Workplace Search 的指南",
     "xpack.enterpriseSearch.workplaceSearch.setupGuide.notConfigured": "Workplace Search 在 Kibana 中未配置。请按照本页上的说明执行操作。",
     "xpack.enterpriseSearch.workplaceSearch.source.text": "源",
+    "xpack.enterpriseSearch.workplaceSearch.sourceIdentifier.sourceIdentifierFieldLabel": "源标识符",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.detailsLabel": "详情",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.reauthenticateStatusLinkLabel": "重新验证",
     "xpack.enterpriseSearch.workplaceSearch.sourceRow.remoteLabel": "远程",
@@ -11271,6 +12159,11 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.blockedEmptyStateDescription": "添加受阻时间范围，以仅在适当时间执行同步。",
     "xpack.enterpriseSearch.workplaceSearch.sources.blockedEmptyStateTitle": "您没有受阻时间范围",
     "xpack.enterpriseSearch.workplaceSearch.sources.blockedWindowsTitle": "受阻时间范围",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud": "云",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing": "文件共享",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft": "Microsoft",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.office": "Office 365",
+    "xpack.enterpriseSearch.workplaceSearch.sources.categories.storage": "存储",
     "xpack.enterpriseSearch.workplaceSearch.sources.config.link": "编辑连接器设置",
     "xpack.enterpriseSearch.workplaceSearch.sources.config.title": "内容源配置",
     "xpack.enterpriseSearch.workplaceSearch.sources.configuration.title": "配置",
@@ -11284,7 +12177,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.customSourceDocs.text": "在我们的{documentationLink}中详细了解如何添加内容",
     "xpack.enterpriseSearch.workplaceSearch.sources.deletionSyncDescription": "移除内容源中不再存在的文档",
     "xpack.enterpriseSearch.workplaceSearch.sources.deletionSyncLabel": "删除同步",
-    "xpack.enterpriseSearch.workplaceSearch.sources.docPermissions.description": "文档级别权限管理有关单个属性或组属性的内容访问内容。允许或拒绝对特定文档的访问。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.docPermissions.description": "文档级别权限管理有关单个属性或组属性的内容访问权限。允许或拒绝对特定文档的访问。",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentation": "文档",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissions.text": "使用文档级别权限",
     "xpack.enterpriseSearch.workplaceSearch.sources.documentPermissions.title": "文档级权限",
@@ -11295,11 +12188,14 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.event.header": "事件",
     "xpack.enterpriseSearch.workplaceSearch.sources.externalIdentities.link": "外部身份 API",
     "xpack.enterpriseSearch.workplaceSearch.sources.externalIdentities.text": "{externalIdentitiesLink} 必须用于配置用户访问权限映射。阅读指南以了解详情。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.feedbackCallOutText": "具有关于部署 {name} 连接器软件包的反馈？请告诉我们。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.feedbackLinkLabel": "具有关于部署 {name} 连接器的反馈？请告诉我们。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.additionalConfigurationNeeded": "此源需要其他配置。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceConfigUpdated": "已成功更新配置。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceConnected": "已成功连接 {sourceName}。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceNameChanged": "已成功将名称更改为 {sourceName}。",
     "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.contentSourceRemoved": "已成功删除 {sourceName}。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.flashMessages.externalConnectorCreated": "已成功创建外部连接器。",
     "xpack.enterpriseSearch.workplaceSearch.sources.fullSyncDescription": "从内容源检索所有可能的文档",
     "xpack.enterpriseSearch.workplaceSearch.sources.fullSyncLabel": "完全同步",
     "xpack.enterpriseSearch.workplaceSearch.sources.groupAccess.title": "组访问权限",
@@ -11307,6 +12203,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.id.label": "源标识符",
     "xpack.enterpriseSearch.workplaceSearch.sources.incrementalSyncDescription": "检索自上次同步作业以来的文档/更新",
     "xpack.enterpriseSearch.workplaceSearch.sources.incrementalSyncLabel": "增量同步",
+    "xpack.enterpriseSearch.workplaceSearch.sources.indexingRulesTable.includeEverythingMessage": "包括来自此源的所有其他内容",
     "xpack.enterpriseSearch.workplaceSearch.sources.items.header": "项",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnCustom.features.button": "了解白金级功能",
     "xpack.enterpriseSearch.workplaceSearch.sources.learnMore.link": "了解详情",
@@ -11376,6 +12273,21 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.settings.heading": "设置",
     "xpack.enterpriseSearch.workplaceSearch.sources.settings.title": "内容源名称",
     "xpack.enterpriseSearch.workplaceSearch.sources.settingsModal.text": "将从 Workplace Search 中删除您的源文档。{lineBreak}确定要移除 {name}？",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsAddRuleLabel": "添加索引规则",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsAssetsLabel": "资产",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsDescription": "灵活管理要同步的文档并使用下面的粒度控件提供搜索功能。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsLearnMoreLink": "详细了解同步对象类型。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsDescription": "添加索引规则以定制要从 {contentSourceName} 同步哪些数据。默认包括所有内容，并根据从上到下列出的已配置索引规则集验证文档。",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsLabel": "对象",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableExcludeLabel": "排除",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableFileLabel": "文件类型",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableIncludeLabel": "包括",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableItemLabel": "项目",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTablePathLabel": "路径",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTablePolicyLabel": "策略",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableRuleLabel": "规则",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsObjectsTableValueLabel": "值",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceAssetsAndObjectsSyncLearnMoreLink": "详细了解如何定制索引规则。",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceBlockedTimeWindowsLinkLabel": "受阻时间范围",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.searchBar.filter.placeholder": "筛选内容......",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceContent.searchBar.search.placeholder": "搜索内容......",
@@ -11401,6 +12313,7 @@
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.salesforceSandbox": "Salesforce Sandbox",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.serviceNow": "ServiceNow",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.sharePoint": "Sharepoint",
+    "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.sharePointServer": "SharePoint Server",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.slack": "Slack",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zendesk": "Zendesk",
     "xpack.enterpriseSearch.workplaceSearch.sources.sourceOverviewTitle": "源概览",
@@ -11465,6 +12378,7 @@
     "xpack.features.ossFeatures.visualizeShortUrlSubFeatureName": "短 URL",
     "xpack.features.savedObjectsManagementFeatureName": "已保存对象管理",
     "xpack.features.visualizeFeatureName": "Visualize 库",
+    "xpack.fileUpload.dataViewAlreadyExistsErrorMessage": "数据视图已存在。",
     "xpack.fileUpload.fileSizeError": "文件大小 {fileSize} 超过最大文件大小 {maxFileSize}",
     "xpack.fileUpload.fileTypeError": "文件不是可接受类型之一：{types}",
     "xpack.fileUpload.geoFilePicker.acceptedFormats": "接受的格式：{fileTypes}",
@@ -11472,11 +12386,14 @@
     "xpack.fileUpload.geoFilePicker.noFeaturesDetected": "选定文件中未找到任何特征。",
     "xpack.fileUpload.geoFilePicker.previewSummary": "正在预览 {numFeatures} 个特征、{previewCoverage}% 的文件。",
     "xpack.fileUpload.geojsonImporter.noGeometry": "特征不包含必需的字段“geometry”",
+    "xpack.fileUpload.geoUploadWizard.creatingDataView": "正在创建数据视图：{indexName}",
     "xpack.fileUpload.geoUploadWizard.dataIndexingError": "数据索引错误",
     "xpack.fileUpload.geoUploadWizard.dataIndexingStarted": "正在创建索引：{indexName}",
+    "xpack.fileUpload.geoUploadWizard.dataViewError": "无法创建数据视图",
     "xpack.fileUpload.geoUploadWizard.writingToIndex": "正在写入索引：已完成 {progress}%",
     "xpack.fileUpload.import.noIdOrIndexSuppliedErrorMessage": "未提供任何 ID 或索引",
     "xpack.fileUpload.importComplete.copyButtonAriaLabel": "复制到剪贴板",
+    "xpack.fileUpload.importComplete.dataViewResponse": "数据视图响应",
     "xpack.fileUpload.importComplete.failedFeaturesMsg": "无法索引 {numFailures} 个特征。",
     "xpack.fileUpload.importComplete.indexingResponse": "导入响应",
     "xpack.fileUpload.importComplete.indexMgmtLink": "索引管理。",
@@ -11491,7 +12408,7 @@
     "xpack.fileUpload.indexNameContainsIllegalCharactersErrorMessage": "索引名称包含非法字符。",
     "xpack.fileUpload.indexNameForm.enterIndexNameLabel": "索引名称",
     "xpack.fileUpload.indexNameForm.guidelines.cannotBe": "不能为 . 或 ..",
-    "xpack.fileUpload.indexNameForm.guidelines.cannotInclude": "不能包含 \\\\、/、*、?、\"、&lt;、>、|、                   “ ”（空格字符）、,（逗号）、#",
+    "xpack.fileUpload.indexNameForm.guidelines.cannotInclude": "不能包含 \\\\、/、*、?、\"、&lt;、>、|、                  “ ”（空格字符）、,（逗号）、#",
     "xpack.fileUpload.indexNameForm.guidelines.cannotStartWith": "不能以 -、_、+ 开头",
     "xpack.fileUpload.indexNameForm.guidelines.length": "不能长于 255 字节（注意是字节，                   因此多字节字符将更快达到 255                   字节限制）",
     "xpack.fileUpload.indexNameForm.guidelines.lowercaseOnly": "仅小写",
@@ -11541,6 +12458,7 @@
     "xpack.fleet.agentDetails.unexceptedErrorTitle": "加载代理时出错",
     "xpack.fleet.agentDetails.versionLabel": "代理版本",
     "xpack.fleet.agentDetails.viewAgentListTitle": "查看所有代理",
+    "xpack.fleet.agentDetails.viewDashboardButtonLabel": "查看代理仪表板",
     "xpack.fleet.agentDetailsIntegrations.actionsLabel": "操作",
     "xpack.fleet.agentDetailsIntegrations.inputTypeEndpointText": "终端",
     "xpack.fleet.agentDetailsIntegrations.inputTypeLabel": "输入",
@@ -11552,15 +12470,22 @@
     "xpack.fleet.agentEnrollment.agentDescription": "将 Elastic 代理添加到您的主机，以收集数据并将其发送到 Elastic Stack。",
     "xpack.fleet.agentEnrollment.agentsNotInitializedText": "注册代理前，请{link}。",
     "xpack.fleet.agentEnrollment.closeFlyoutButtonLabel": "关闭",
+    "xpack.fleet.agentEnrollment.confirmation.button": "查看注册的代理",
     "xpack.fleet.agentEnrollment.copyPolicyButton": "复制到剪贴板",
     "xpack.fleet.agentEnrollment.downloadDescription": "在您希望监测的主机上安装 Elastic 代理。请勿在包含 Fleet 服务器的主机上安装此代理策略。可从 Elastic 的下载页面下载 Elastic 代理二进制文件及验证签名。",
     "xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer": "Fleet 服务器运行在 Elastic 代理上。在集中式主机上安装此代理，以便您希望监测的其他主机与其建立连接。在生产环境中，我们建议使用一台或多台专用主机。可从 Elastic 的下载页面下载 Elastic 代理二进制文件及验证签名。",
+    "xpack.fleet.agentEnrollment.downloadDescriptionForK8s": "复制或下载 Kubernetes 集群内的 Kubernetes 清单。检查 Daemonset 环境变量中的 {FleetUrlVariable} 和 {FleetTokenVariable} 并应用该清单。",
     "xpack.fleet.agentEnrollment.downloadLink": "前往下载页面",
+    "xpack.fleet.agentEnrollment.downloadManifestButtonk8s": "下载清单",
     "xpack.fleet.agentEnrollment.downloadPolicyButton": "下载策略",
     "xpack.fleet.agentEnrollment.downloadPolicyButtonk8s": "下载清单",
     "xpack.fleet.agentEnrollment.downloadUseLinuxInstaller": "Linux 用户：我们建议使用安装程序 (TAR)，而非系统软件包 (RPM/DEB)，因为这允许您在 Fleet 中升级代理。",
+    "xpack.fleet.agentEnrollment.enrollFleetTabLabel": "在 Fleet 中注册",
+    "xpack.fleet.agentEnrollment.enrollStandaloneTabLabel": "独立运行",
     "xpack.fleet.agentEnrollment.fleetSettingsLink": "Fleet 设置",
     "xpack.fleet.agentEnrollment.flyoutTitle": "添加代理",
+    "xpack.fleet.agentEnrollment.loadk8sManifestErrorTitle": "提取代理清单时出错",
+    "xpack.fleet.agentEnrollment.loadPolicyErrorMessage": "加载策略时发生错误",
     "xpack.fleet.agentEnrollment.managedDescription": "在 Fleet 中注册 Elastic 代理，以便自动部署更新并集中管理该代理。",
     "xpack.fleet.agentEnrollment.missingFleetHostCalloutText": "需要 Fleet 服务器主机的 URL，才能使用 Fleet 注册代理。可以在“Fleet 设置”中添加此信息。有关更多信息，请参阅{link}。",
     "xpack.fleet.agentEnrollment.missingFleetHostCalloutTitle": "Fleet 服务器主机的 URL 缺失",
@@ -11573,9 +12498,9 @@
     "xpack.fleet.agentEnrollment.stepConfigureAgentTitle": "配置代理",
     "xpack.fleet.agentEnrollment.stepConfigurePolicyAuthenticationTitle": "选择注册令牌",
     "xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle": "将 Fleet 服务器下载到集中式主机",
+    "xpack.fleet.agentEnrollment.stepDownloadAgentForK8sTitle": "下载 Elastic 代理清单",
     "xpack.fleet.agentEnrollment.stepDownloadAgentTitle": "将 Elastic 代理下载到您的主机",
     "xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle": "注册并启动 Elastic 代理",
-    "xpack.fleet.agentEnrollment.stepRunAgentDescription": "从代理目录运行此命令，以安装、注册并启动 Elastic 代理。您可以重复使用此命令在多个主机上设置代理。需要管理员权限。",
     "xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s": "从下载 Kubernetes 清单的目录运行应用命令。",
     "xpack.fleet.agentHealth.checkInTooltipText": "上次签入时间 {lastCheckIn}",
     "xpack.fleet.agentHealth.healthyStatusText": "运行正常",
@@ -11637,6 +12562,7 @@
     "xpack.fleet.agentPolicy.confirmModalDescription": "此操作无法撤消。是否确定要继续？",
     "xpack.fleet.agentPolicy.confirmModalTitle": "保存并部署更改",
     "xpack.fleet.agentPolicy.linkedAgentCountText": "{count, plural, other {# 个代理}}",
+    "xpack.fleet.agentPolicy.outputOptions.defaultOutputText": "默认值（当前 {defaultOutputName}）",
     "xpack.fleet.agentPolicy.postInstallAddAgentModal": "已添加 {packageName} 集成",
     "xpack.fleet.agentPolicy.postInstallAddAgentModalCancelButtonLabel": "稍后添加 Elastic 代理",
     "xpack.fleet.agentPolicy.postInstallAddAgentModalConfirmButtonLabel": "将 Elastic 代理添加到您的主机",
@@ -11647,6 +12573,7 @@
     "xpack.fleet.agentPolicyActionMenu.enrollAgentActionText": "添加代理",
     "xpack.fleet.agentPolicyActionMenu.viewPolicyText": "查看策略",
     "xpack.fleet.agentPolicyCreation.created": "代理策略已创建",
+    "xpack.fleet.agentPolicyCreation.errorMessage": "此名称的代理策略已存在。",
     "xpack.fleet.agentPolicyCreation.failed": "代理策略创建失败",
     "xpack.fleet.agentPolicyForm.advancedOptionsToggleLabel": "高级选项",
     "xpack.fleet.agentPolicyForm.createAgentPolicyDescription": "通过创建新的代理策略，将此集成添加到一组新主机中。您可以在下一步中添加代理。",
@@ -11655,6 +12582,8 @@
     "xpack.fleet.agentPolicyForm.createAgentPolicyLabel": "创建代理策略",
     "xpack.fleet.agentPolicyForm.createAgentPolicyText": "创建策略",
     "xpack.fleet.agentPolicyForm.createAgentPolicyTypeOfHosts": "主机的类型受 {agentPolicy} 控制。创建新的代理策略以开始。",
+    "xpack.fleet.agentPolicyForm.dataOutputDescription": "为集成中的数据选择要使用的输出。",
+    "xpack.fleet.agentPolicyForm.dataOutputLabel": "集成的输出",
     "xpack.fleet.agentPolicyForm.descriptionDescription": "添加将如何使用此策略的描述。",
     "xpack.fleet.agentPolicyForm.descriptionFieldLabel": "描述",
     "xpack.fleet.agentPolicyForm.descriptionFieldPlaceholder": "可选描述",
@@ -11664,6 +12593,8 @@
     "xpack.fleet.agentPolicyForm.monitoringLogsTooltipText": "从使用此策略的 Elastic 代理收集日志。",
     "xpack.fleet.agentPolicyForm.monitoringMetricsFieldLabel": "收集代理指标",
     "xpack.fleet.agentPolicyForm.monitoringMetricsTooltipText": "从使用此策略的 Elastic 代理收集指标。",
+    "xpack.fleet.agentPolicyForm.monitoringOutputDescription": "为拥有监测数据的代理选择要使用的输出。",
+    "xpack.fleet.agentPolicyForm.monitoringOutputLabel": "代理监测的输出",
     "xpack.fleet.agentPolicyForm.nameFieldLabel": "名称",
     "xpack.fleet.agentPolicyForm.nameFieldPlaceholder": "选择名称",
     "xpack.fleet.agentPolicyForm.nameRequiredErrorMessage": "“代理策略名称”必填。",
@@ -11671,6 +12602,7 @@
     "xpack.fleet.agentPolicyForm.nameSpaceFieldDescription.fleetUserGuideLabel": "了解详情",
     "xpack.fleet.agentPolicyForm.namespaceFieldLabel": "默认命名空间",
     "xpack.fleet.agentPolicyForm.newAgentPolicyFieldLabel": "新代理策略名称",
+    "xpack.fleet.agentPolicyForm.outputOptionDisabledAPMAndLogstashText": "APM 不支持代理集成的 Logstash 输出",
     "xpack.fleet.agentPolicyForm.systemMonitoringText": "收集系统日志和指标",
     "xpack.fleet.agentPolicyForm.systemMonitoringTooltipText": "这还会添加 {system} 集成以收集系统日志和指标。",
     "xpack.fleet.agentPolicyForm.unenrollmentTimeoutDescription": "可选超时（秒）。若提供，代理断开连接此段时间后，将自动注销。",
@@ -11728,6 +12660,10 @@
     "xpack.fleet.breadcrumbs.settingsPageTitle": "设置",
     "xpack.fleet.breadcrumbs.upgradePackagePolicyPageTitle": "升级集成 ",
     "xpack.fleet.config.invalidPackageVersionError": "必须是有效的 semver 或关键字 `latest`",
+    "xpack.fleet.confirmIncomingData.installApmAgentButtonText": "安装 APM 代理",
+    "xpack.fleet.confirmIncomingData.subtitle": "您的代理已成功注册，并将接收您的数据。",
+    "xpack.fleet.confirmIncomingData.title": "从 {numAgentsWithData} 个（共 {enrolledAgents} 个）最近注册的{ enrolledAgents, plural, other {代理}}接收到的传入数据。",
+    "xpack.fleet.confirmIncomingData.viewDataAssetsButtonText": "查看资产",
     "xpack.fleet.copyAgentPolicy.confirmModal.cancelButtonLabel": "取消",
     "xpack.fleet.copyAgentPolicy.confirmModal.confirmButtonLabel": "复制策略",
     "xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyPrompt": "为您的新代理策略选择名称和描述。",
@@ -11763,6 +12699,9 @@
     "xpack.fleet.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription": "选择有助于确定如何使用此集成的名称和描述。",
     "xpack.fleet.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle": "集成设置",
     "xpack.fleet.createPackagePolicy.stepConfigure.noPolicyOptionsMessage": "没有可配置的内容",
+    "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionLabel": "数据保留设置",
+    "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionLearnMoreLink": "了解详情",
+    "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionText": "默认情况下，所有日志和指标数据存储在热层中。{learnMore}如何更改此集成的数据保留策略。",
     "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel": "描述",
     "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel": "集成名称",
     "xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyNamespaceHelpLabel": "更改从选定代理策略继承的默认命名空间。此设置将更改集成的数据流的名称。{learnMore}。",
@@ -11773,6 +12712,7 @@
     "xpack.fleet.createPackagePolicy.stepConfigurePackagePolicyTitle": "配置集成",
     "xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle": "要将此集成添加到什么位置？",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText": "{count, plural, other {# 个代理}}已注册到选定代理策略。",
+    "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyDisabledAPMLogstashOuputText": "APM 不支持代理集成的 Logstash 输出",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupDescription": "代理策略用于跨代理集管理一组集成。",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupTitle": "代理策略",
     "xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyLabel": "代理策略",
@@ -11846,7 +12786,11 @@
     "xpack.fleet.editPackagePolicy.upgradePageTitleWithPackageName": "升级 {packageName} 集成",
     "xpack.fleet.enrollemntAPIKeyList.emptyMessage": "未找到任何注册令牌。",
     "xpack.fleet.enrollemntAPIKeyList.loadingTokensMessage": "正在加载注册令牌......",
-    "xpack.fleet.enrollmentInstructions.platformButtons.linux": "Linux/macOS",
+    "xpack.fleet.enrollmentInstructions.callout": "建议使用安装程序 (TAR/ZIP)，而非系统软件包 (RPM/DEB)，因为它们允许使用 Fleet 来升级代理。",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux": "Linux",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux.deb": "DEB",
+    "xpack.fleet.enrollmentInstructions.platformButtons.linux.rpm": "RPM",
+    "xpack.fleet.enrollmentInstructions.platformButtons.mac": "Mac",
     "xpack.fleet.enrollmentInstructions.platformButtons.windows": "Windows",
     "xpack.fleet.enrollmentInstructions.platformSelectAriaLabel": "平台",
     "xpack.fleet.enrollmentInstructions.troubleshootingLink": "故障排除指南",
@@ -11878,6 +12822,7 @@
     "xpack.fleet.epm.addPackagePolicyButtonSecurityRequiredTooltip": "要添加 Elastic 代理集成，必须启用安全功能并具有 Fleet 的所有权限。请联系您的管理员。",
     "xpack.fleet.epm.addPackagePolicyButtonText": "添加 {packageName}",
     "xpack.fleet.epm.assetGroupTitle": "{assetType} 资产",
+    "xpack.fleet.epm.assetTitles.cloudSecurityPostureRuleTemplate": "云安全态势规则模板",
     "xpack.fleet.epm.assetTitles.componentTemplates": "组件模板",
     "xpack.fleet.epm.assetTitles.dashboards": "仪表板",
     "xpack.fleet.epm.assetTitles.dataStreamILM": "数据流 ILM 策略",
@@ -11889,6 +12834,7 @@
     "xpack.fleet.epm.assetTitles.maps": "Maps",
     "xpack.fleet.epm.assetTitles.mlModels": "ML 模型",
     "xpack.fleet.epm.assetTitles.mlModules": "ML 模块",
+    "xpack.fleet.epm.assetTitles.osqueryPackAsset": "Osquery 包",
     "xpack.fleet.epm.assetTitles.savedSearches": "已保存的搜索",
     "xpack.fleet.epm.assetTitles.securityRules": "安全规则",
     "xpack.fleet.epm.assetTitles.tag": "标签",
@@ -11912,6 +12858,7 @@
     "xpack.fleet.epm.licenseLabel": "许可证",
     "xpack.fleet.epm.loadingIntegrationErrorTitle": "加载集成详情时出错",
     "xpack.fleet.epm.noticeModalCloseBtn": "关闭",
+    "xpack.fleet.epm.packageDetails.assets.assetsNotAvailableInCurrentSpace": "已安装此集成，但该工作区中没有资产可用",
     "xpack.fleet.epm.packageDetails.assets.fetchAssetsErrorTitle": "加载资产时出错",
     "xpack.fleet.epm.packageDetails.assets.noAssetsFoundLabel": "未找到资产",
     "xpack.fleet.epm.packageDetails.integrationList.actions": "操作",
@@ -11987,8 +12934,8 @@
     "xpack.fleet.fleetServerSetup.addFleetServerHostSuccessText": "已添加 {host}。您可以在{fleetSettingsLink}中编辑 Fleet 服务器主机。",
     "xpack.fleet.fleetServerSetup.addFleetServerHostSuccessTitle": "已添加 Fleet 服务器主机",
     "xpack.fleet.fleetServerSetup.cloudDeploymentLink": "编辑部署",
-    "xpack.fleet.fleetServerSetup.cloudSetupText": "需要提供 Fleet 服务器，才能使用 Fleet 注册代理。可以通过启用 APM &amp; Fleet 来将一个添加到部署中。有关更多信息，请参阅{link}",
-    "xpack.fleet.fleetServerSetup.cloudSetupTitle": "启用 APM &amp; Fleet",
+    "xpack.fleet.fleetServerSetup.cloudSetupText": "需要提供 Fleet 服务器，才能使用 Fleet 注册代理。获取 Fleet 服务器的最简单方法是添加集成服务器，它会运行 Fleet 服务器集成。您可以在云控制台中将其添加到部署中。有关更多信息，请参阅{link}",
+    "xpack.fleet.fleetServerSetup.cloudSetupTitle": "启用 Fleet 服务器",
     "xpack.fleet.fleetServerSetup.continueButton": "继续",
     "xpack.fleet.fleetServerSetup.deploymentModeProductionOption": "{production} – 提供您自己的证书。注册到 Fleet 时，此选项将需要代理指定证书密钥",
     "xpack.fleet.fleetServerSetup.deploymentModeQuickStartOption": "{quickStart} – Fleet 服务器将生成自签名证书。必须使用 --insecure 标志注册后续代理。不推荐用于生产用例。",
@@ -12105,6 +13052,8 @@
     "xpack.fleet.integrationsHeaderTitle": "集成",
     "xpack.fleet.invalidLicenseDescription": "您当前的许可证已过期。已注册 Beats 代理将继续工作，但您需要有效的许可证，才能访问 Elastic Fleet 界面。",
     "xpack.fleet.invalidLicenseTitle": "已过期许可证",
+    "xpack.fleet.multiRowInput.addRow": "添加行",
+    "xpack.fleet.multiRowInput.deleteButton": "删除行",
     "xpack.fleet.multiTextInput.addRow": "添加行",
     "xpack.fleet.multiTextInput.deleteRowButton": "删除行",
     "xpack.fleet.namespaceValidation.invalidCharactersErrorMessage": "命名空间包含无效字符",
@@ -12194,6 +13143,7 @@
     "xpack.fleet.settings.deleteOutput.agentsCount": "{agentCount, plural, other {# 个代理}}",
     "xpack.fleet.settings.deleteOutput.confirmModalText": "此操作将删除 {outputName} 输出。它将更新 {policies} 和 {agents}。此操作无法撤消。是否确定要继续？",
     "xpack.fleet.settings.deleteOutput.confirmModalTitle": "删除并部署更改？",
+    "xpack.fleet.settings.deleteOutputs.confirmButtonLabel": "删除并部署",
     "xpack.fleet.settings.deleteOutputs.errorToastTitle": "删除输出时出错",
     "xpack.fleet.settings.editOutputFlyout.agentIntegrationsBold": "代理集成",
     "xpack.fleet.settings.editOutputFlyout.agentMonitoringBold": "代理监测",
@@ -12203,14 +13153,25 @@
     "xpack.fleet.settings.editOutputFlyout.defaultMontoringOutputSwitchLabel": "将此输出设为 {boldAgentMonitoring} 的默认值。",
     "xpack.fleet.settings.editOutputFlyout.defaultOutputSwitchLabel": "将此输出设为 {boldAgentIntegrations} 的默认值。",
     "xpack.fleet.settings.editOutputFlyout.editTitle": "编辑输出",
+    "xpack.fleet.settings.editOutputFlyout.esHostsInputLabel": "主机",
+    "xpack.fleet.settings.editOutputFlyout.esHostsInputPlaceholder": "指定主机 URL",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputDescription": "指定代理用于连接到 Logstash 的 URL。有关详细信息，请参阅 {guideLink}。",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputLabel": "Logstash 主机",
+    "xpack.fleet.settings.editOutputFlyout.logstashHostsInputPlaceholder": "指定主机",
     "xpack.fleet.settings.editOutputFlyout.nameInputLabel": "名称",
     "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "指定名称",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "与此输出相关的操作多数不可用。请参阅 Kibana 配置了解详情。",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "此输出在 Fleet 外部进行管理",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputLabel": "服务器 SSL 证书颁发机构",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputPlaceholder": "指定证书颁发机构",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateInputLabel": "客户端 SSL 证书",
+    "xpack.fleet.settings.editOutputFlyout.sslCertificateInputPlaceholder": "指定 SSL 证书",
+    "xpack.fleet.settings.editOutputFlyout.sslKeyInputLabel": "客户端 SSL 证书密钥",
+    "xpack.fleet.settings.editOutputFlyout.sslKeyInputPlaceholder": "指定证书密钥",
     "xpack.fleet.settings.editOutputFlyout.typeInputLabel": "类型",
     "xpack.fleet.settings.editOutputFlyout.typeInputPlaceholder": "指定类型",
     "xpack.fleet.settings.editOutputFlyout.yamlConfigInputLabel": "高级 YAML 配置",
-    "xpack.fleet.settings.editOutputFlyout.yamlConfigInputPlaceholder": "此处的 # 个 YAML 设置将添加到每个代理策略的 Elasticsearch 输出部分。",
+    "xpack.fleet.settings.editOutputFlyout.yamlConfigInputPlaceholder": "此处的 # 个 YAML 设置将添加到每个代理策略的输出部分。",
     "xpack.fleet.settings.fleetServerHostEditButtonLabel": "编辑主机",
     "xpack.fleet.settings.fleetServerHostsDifferentPathOrProtocolError": "对于每个 URL，协议和路径必须相同",
     "xpack.fleet.settings.fleetServerHostsDuplicateError": "复制 URL",
@@ -12225,19 +13186,39 @@
     "xpack.fleet.settings.fleetServerHostsFlyout.confirmModalTitle": "保存并部署更改？",
     "xpack.fleet.settings.fleetServerHostsFlyout.description": "指定代理用于连接 Fleet 服务器的 URL。如果多个 URL 存在，Fleet 显示提供的第一个 URL 用于注册。Fleet 服务器默认使用端口 8220。请参阅 {link}。",
     "xpack.fleet.settings.fleetServerHostsFlyout.errorToastTitle": "保存设置时出错",
+    "xpack.fleet.settings.fleetServerHostsFlyout.fleetServerHostsInputPlaceholder": "指定主机 URL",
     "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "保存并应用设置",
     "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "设置已保存",
     "xpack.fleet.settings.fleetServerHostsFlyout.title": "Fleet 服务器主机",
     "xpack.fleet.settings.fleetServerHostsFlyout.userGuideLink": "Fleet 和 Elastic 代理指南",
     "xpack.fleet.settings.fleetServerHostUrlColumnTitle": "主机 URL",
     "xpack.fleet.settings.fleetUserGuideLink": "Fleet 用户指南",
+    "xpack.fleet.settings.logstashInstructions.apiKeyStepDescription": "建议授权 Logstash 以 Elastic 代理的最低权限输出到 Elasticsearch。",
+    "xpack.fleet.settings.logstashInstructions.calloutTitle": "为 Elastic 代理配置 Logstash",
+    "xpack.fleet.settings.logstashInstructions.collapseInstructionsButtonLabel": "折叠说明",
+    "xpack.fleet.settings.logstashInstructions.copyApiKeyButtonLabel": "复制消息",
+    "xpack.fleet.settings.logstashInstructions.description": "必须将 Elastic 代理的管道添加到 Logstash。有关更多信息，请访问我们的{documentationLink}。",
+    "xpack.fleet.settings.logstashInstructions.documentationLink": "文档",
+    "xpack.fleet.settings.logstashInstructions.generateApiKeyButtonLabel": "生成 API 密钥",
+    "xpack.fleet.settings.logstashInstructions.generateApiKeyError": "无法生成 api 密钥",
+    "xpack.fleet.settings.logstashInstructions.ourDocumentationLink": "我们的文档",
+    "xpack.fleet.settings.logstashInstructions.replaceStepDescription": "用您生成的 SSL 证书文件路径替换括号之间的内容。查看{documentationLink}以生成证书。",
+    "xpack.fleet.settings.logstashInstructions.saveAndRestartStepDescription": "保存管道并重新启动 Logstash，以使更改生效。",
+    "xpack.fleet.settings.logstashInstructions.viewInstructionButtonLabel": "查看说明",
     "xpack.fleet.settings.outputCreateButtonLabel": "添加输出",
     "xpack.fleet.settings.outputForm.caTrusterdFingerprintInvalidErrorMessage": "CA 受信任的指纹应为 base64 CA sha256 指纹",
     "xpack.fleet.settings.outputForm.elasticHostDuplicateError": "复制 URL",
     "xpack.fleet.settings.outputForm.elasticHostError": "URL 无效",
+    "xpack.fleet.settings.outputForm.elasticUrlRequiredError": "“URL”必填",
     "xpack.fleet.settings.outputForm.errorToastTitle": "保存输出时出错",
     "xpack.fleet.settings.outputForm.invalidYamlFormatErrorMessage": "YAML 无效：{reason}",
+    "xpack.fleet.settings.outputForm.logstashHostDuplicateError": "主机重复",
+    "xpack.fleet.settings.outputForm.logstashHostError": "主机无效",
+    "xpack.fleet.settings.outputForm.logstashHostProtocolError": "logstash 无效，主机不得以 http(s) 开头",
+    "xpack.fleet.settings.outputForm.logstashHostRequiredError": "“主机”必填",
     "xpack.fleet.settings.outputForm.nameIsRequiredErrorMessage": "“名称”必填",
+    "xpack.fleet.settings.outputForm.sslCertificateRequiredErrorMessage": "SSL 证书必填",
+    "xpack.fleet.settings.outputForm.sslKeyRequiredErrorMessage": "SSL 密钥必填",
     "xpack.fleet.settings.outputs.defaultMonitoringOutputBadgeTitle": "代理监测",
     "xpack.fleet.settings.outputs.defaultOutputBadgeTitle": "代理集成",
     "xpack.fleet.settings.outputSection.actionsColomnTitle": "操作",
@@ -12248,6 +13229,7 @@
     "xpack.fleet.settings.outputSectionTitle": "输出",
     "xpack.fleet.settings.outputsTable.elasticsearchTypeLabel": "Elasticsearch",
     "xpack.fleet.settings.outputsTable.hostColomnTitle": "主机",
+    "xpack.fleet.settings.outputsTable.managedTooltip": "此输出在 Fleet 外部进行管理。",
     "xpack.fleet.settings.outputsTable.nameColomnTitle": "名称",
     "xpack.fleet.settings.outputsTable.typeColomnTitle": "类型",
     "xpack.fleet.settings.sortHandle": "排序主机手柄",
@@ -12315,15 +13297,21 @@
     "xpack.globalSearchBar.searchBar.noResultsImageAlt": "黑洞的图示",
     "xpack.globalSearchBar.searchBar.optionTagListAriaLabel": "标签",
     "xpack.globalSearchBar.searchbar.overflowTagsAriaLabel": "另外 {n} 个{n, plural, other {标签}}：{tags}",
+    "xpack.globalSearchBar.searchBar.placeholder": "查找应用、内容等。例如：Discover",
     "xpack.globalSearchBar.searchBar.shortcutDescription.macCommandDescription": "Command + /",
     "xpack.globalSearchBar.searchBar.shortcutDescription.shortcutDetail": "{shortcutDescription} {commandDescription}",
     "xpack.globalSearchBar.searchBar.shortcutDescription.shortcutInstructionDescription": "快捷方式",
     "xpack.globalSearchBar.searchBar.shortcutDescription.windowsCommandDescription": "Control + /",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.description": "快捷键",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.macCommandDescription": "Command + /",
+    "xpack.globalSearchBar.searchBar.shortcutTooltip.windowsCommandDescription": "Control + /",
     "xpack.globalSearchBar.suggestions.filterByTagLabel": "按标签名称筛选",
     "xpack.globalSearchBar.suggestions.filterByTypeLabel": "按类型筛选",
     "xpack.graph.badge.readOnly.text": "只读",
     "xpack.graph.badge.readOnly.tooltip": "无法保存 Graph 工作区",
-    "xpack.graph.bar.exploreLabel": "Graph",
+    "xpack.graph.bar.exploreLabel": "图表",
+    "xpack.graph.bar.exploreLabelNoFields": "至少选择一个字段",
+    "xpack.graph.bar.exploreLabelNoIndexPattern": "选择数据源",
     "xpack.graph.bar.pickFieldsLabel": "添加字段",
     "xpack.graph.bar.pickSourceLabel": "选择数据源",
     "xpack.graph.bar.pickSourceTooltip": "选择数据源以开始绘制关系图。",
@@ -12499,6 +13487,7 @@
     "xpack.graph.sidebar.linkSummary.leftTermCountTooltip": "{count} 个文档具有字词 {term}",
     "xpack.graph.sidebar.linkSummary.mergeTerm1ToTerm2ButtonTooltip": "将 {term1} 合并到 {term2}",
     "xpack.graph.sidebar.linkSummary.mergeTerm2ToTerm1ButtonTooltip": "将 {term2} 合并到 {term1}",
+    "xpack.graph.sidebar.linkSummary.noData": "找不到链接选择的字词交集。",
     "xpack.graph.sidebar.linkSummary.rightTermCountTooltip": "{count} 个文档具有字词 {term}",
     "xpack.graph.sidebar.linkSummaryTitle": "链接摘要",
     "xpack.graph.sidebar.selections.invertSelectionButtonLabel": "反向",
@@ -14181,6 +15170,11 @@
     "xpack.infra.logs.alerting.comparator.notEqNumber": "不等于",
     "xpack.infra.logs.alerting.comparator.notMatch": "不匹配",
     "xpack.infra.logs.alerting.comparator.notMatchPhrase": "不匹配短语",
+    "xpack.infra.logs.alerting.comparator.symbol.match": "匹配",
+    "xpack.infra.logs.alerting.comparator.symbol.matchPhrase": "匹配短语",
+    "xpack.infra.logs.alerting.comparator.symbol.notMatch": "不匹配",
+    "xpack.infra.logs.alerting.comparator.symbol.notMatchPhrase": "不匹配短语",
+    "xpack.infra.logs.alerting.threshold.alertReasonMessageActionVariableDescription": "告警原因的简洁描述",
     "xpack.infra.logs.alerting.threshold.conditionsActionVariableDescription": "日志条目需要满足的条件",
     "xpack.infra.logs.alerting.threshold.defaultActionMessage": "\\{\\{^context.isRatio\\}\\}\\{\\{#context.group\\}\\}\\{\\{context.group\\}\\} - \\{\\{/context.group\\}\\}\\{\\{context.matchingDocuments\\}\\} 个日志条目已符合以下条件：\\{\\{context.conditions\\}\\}\\{\\{/context.isRatio\\}\\}\\{\\{#context.isRatio\\}\\}\\{\\{#context.group\\}\\}\\{\\{context.group\\}\\} - \\{\\{/context.group\\}\\} 与 \\{\\{context.numeratorConditions\\}\\} 匹配的日志条目计数和与 \\{\\{context.denominatorConditions\\}\\} 匹配的日志条目计数的比率为 \\{\\{context.ratio\\}\\}\\{\\{/context.isRatio\\}\\}",
     "xpack.infra.logs.alerting.threshold.denominatorConditionsActionVariableDescription": "比率的分母需要满足的条件",
@@ -14188,12 +15182,17 @@
     "xpack.infra.logs.alerting.threshold.everythingSeriesName": "日志条目",
     "xpack.infra.logs.alerting.threshold.fired": "已触发",
     "xpack.infra.logs.alerting.threshold.groupByActionVariableDescription": "负责触发告警的组的名称",
+    "xpack.infra.logs.alerting.threshold.groupedCountAlertReasonDescription": "对于 {groupName}，过去 {duration}中有 {actualCount, plural, other {{actualCount} 个日志条目}}。{comparator} {expectedCount} 时告警。",
+    "xpack.infra.logs.alerting.threshold.groupedRatioAlertReasonDescription": "对于 {groupName}，过去 {duration}选定日志的比率为 {actualRatio}。{comparator} {expectedRatio} 时告警。",
     "xpack.infra.logs.alerting.threshold.isRatioActionVariableDescription": "表示此告警是否配置了比率",
     "xpack.infra.logs.alerting.threshold.numeratorConditionsActionVariableDescription": "比率的分子需要满足的条件",
     "xpack.infra.logs.alerting.threshold.ratioActionVariableDescription": "两组条件的比率值",
     "xpack.infra.logs.alerting.threshold.ratioCriteriaQueryAText": "查询 A",
     "xpack.infra.logs.alerting.threshold.ratioCriteriaQueryBText": "查询 B",
     "xpack.infra.logs.alerting.threshold.timestampActionVariableDescription": "触发告警时的 UTC 时间戳",
+    "xpack.infra.logs.alerting.threshold.ungroupedCountAlertReasonDescription": "过去 {duration}中有 {actualCount, plural, other {{actualCount} 个日志条目}}。{comparator} {expectedCount} 时告警。",
+    "xpack.infra.logs.alerting.threshold.ungroupedRatioAlertReasonDescription": "过去 {duration}选定日志的比率为 {actualRatio}。{comparator} {expectedRatio} 时告警。",
+    "xpack.infra.logs.alerting.threshold.viewInAppUrlActionVariableDescription": "Elastic 中可用于进一步调查告警及其上下文的视图或功能的链接",
     "xpack.infra.logs.alertName": "日志阈值",
     "xpack.infra.logs.alerts.dataTimeRangeLabel": "过去 {lookback} {timeLabel}的数据",
     "xpack.infra.logs.alerts.dataTimeRangeLabelWithGrouping": "过去 {lookback} {timeLabel}的数据，按 {groupByLabel} 进行分组（显示{displayedGroups}/{totalGroups} 个组）",
@@ -14339,15 +15338,16 @@
     "xpack.infra.logSourceConfiguration.childFormElementErrorMessage": "至少一个表单字段处于无效状态。",
     "xpack.infra.logSourceConfiguration.dataViewDescription": "包含日志数据的数据视图",
     "xpack.infra.logSourceConfiguration.dataViewLabel": "日志数据视图",
-    "xpack.infra.logSourceConfiguration.dataViewSectionTitle": "数据视图",
+    "xpack.infra.logSourceConfiguration.dataViewSectionTitle": "数据视图（建议）",
     "xpack.infra.logSourceConfiguration.dataViewSelectorPlaceholder": "选择数据视图",
     "xpack.infra.logSourceConfiguration.dataViewsManagementLinkText": "数据视图管理屏幕",
     "xpack.infra.logSourceConfiguration.dataViewTitle": "日志数据视图",
     "xpack.infra.logSourceConfiguration.emptyColumnListErrorMessage": "列列表不得为空。",
     "xpack.infra.logSourceConfiguration.emptyFieldErrorMessage": "字段“{fieldName}”不得为空。",
     "xpack.infra.logSourceConfiguration.invalidMessageFieldTypeErrorMessage": "{messageField} 字段必须是文本字段。",
-    "xpack.infra.logSourceConfiguration.logDataViewHelpText": "数据视图在 Kibana 工作区中的应用间共享，并可以通过 {dataViewsManagementLink} 进行管理。",
+    "xpack.infra.logSourceConfiguration.logDataViewHelpText": "数据视图在 Kibana 工作区中的应用间共享，并可以通过 {dataViewsManagementLink} 进行管理。单一数据视图可以针对多个索引。",
     "xpack.infra.logSourceConfiguration.logSourceConfigurationFormErrorsCalloutTitle": "内容配置不一致",
+    "xpack.infra.logSourceConfiguration.logSourcesTitle": "日志源",
     "xpack.infra.logSourceConfiguration.missingDataViewErrorMessage": "数据视图 {dataViewId} 必须存在。",
     "xpack.infra.logSourceConfiguration.missingDataViewsLabel": "缺少数据视图 {indexPatternId}",
     "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "数据视图必须包含 {messageField} 字段。",
@@ -14576,7 +15576,7 @@
     "xpack.infra.metrics.alerting.inventory.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\} 处于 \\{\\{context.alertState\\}\\} 状态\n\n原因：\n\\{\\{context.reason\\}\\}\n",
     "xpack.infra.metrics.alerting.inventory.threshold.fired": "告警",
     "xpack.infra.metrics.alerting.metricActionVariableDescription": "指定条件中的指标名称。用法：(ctx.metric.condition0, ctx.metric.condition1, 诸如此类)。",
-    "xpack.infra.metrics.alerting.reasonActionVariableDescription": "描述告警处于此状态的原因，包括哪些指标已超过哪些阈值",
+    "xpack.infra.metrics.alerting.reasonActionVariableDescription": "告警原因的简洁描述",
     "xpack.infra.metrics.alerting.threshold.aboveRecovery": "高于",
     "xpack.infra.metrics.alerting.threshold.alertState": "告警",
     "xpack.infra.metrics.alerting.threshold.belowRecovery": "低于",
@@ -14599,6 +15599,7 @@
     "xpack.infra.metrics.alerting.thresholdActionVariableDescription": "指定条件中的指标阈值。用法：(ctx.threshold.condition0, ctx.threshold.condition1, 诸如此类)。",
     "xpack.infra.metrics.alerting.timestampDescription": "检测到告警时的时间戳。",
     "xpack.infra.metrics.alerting.valueActionVariableDescription": "指定条件中的指标值。用法：(ctx.value.condition0, ctx.value.condition1, 诸如此类)。",
+    "xpack.infra.metrics.alerting.viewInAppUrlActionVariableDescription": "Elastic 中可用于进一步调查告警及其上下文的视图或功能的链接",
     "xpack.infra.metrics.alertName": "指标阈值",
     "xpack.infra.metrics.alerts.dataTimeRangeLabel": "过去 {lookback} {timeLabel}",
     "xpack.infra.metrics.alerts.dataTimeRangeLabelWithGrouping": "{id} 过去 {lookback} {timeLabel}的数据",
@@ -14985,6 +15986,7 @@
     "xpack.ingestPipelines.clone.loadSourcePipelineErrorTitle": "无法加载 {name}。",
     "xpack.ingestPipelines.create.docsButtonLabel": "创建管道文档",
     "xpack.ingestPipelines.create.pageTitle": "创建管道",
+    "xpack.ingestPipelines.createFromCSV.docsButtonLabel": "CSV 至管道文档",
     "xpack.ingestPipelines.createFromCsv.errorMessage": "{message}",
     "xpack.ingestPipelines.createFromCsv.fetchPipeline.unexpectedErrorDetails": "意外错误",
     "xpack.ingestPipelines.createFromCsv.fetchPipeline.unexpectedErrorTitle": "出问题了",
@@ -15215,7 +16217,7 @@
     "xpack.ingestPipelines.pipelineEditor.dissectForm.patternFieldLabel": "模式",
     "xpack.ingestPipelines.pipelineEditor.dissectForm.patternRequiredError": "需要模式值。",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameHelpText": "包含点表示法的字段。",
-    "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameRequiresDotError": "字段值至少需要一个点字符。",
+    "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.fieldNameRequiresDotError": "字段名称必须为星号或包含点字符。",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.pathFieldLabel": "路径",
     "xpack.ingestPipelines.pipelineEditor.dotExpanderForm.pathHelpText": "输出字段。仅当要扩展的字段属于其他对象字段时才需要。",
     "xpack.ingestPipelines.pipelineEditor.dragAndDropList.removeItemLabel": "移除项目",
@@ -15477,6 +16479,8 @@
     "xpack.ingestPipelines.processors.defaultDescription.dateIndexName.indexNamePrefixDefault.noPrefixValueLabel": "无前缀",
     "xpack.ingestPipelines.processors.defaultDescription.dateIndexName.indexNamePrefixDefault.prefixValueLabel": "带前缀“{prefix}”",
     "xpack.ingestPipelines.processors.defaultDescription.dissect": "从“{field}”提取匹配分解模式的值",
+    "xpack.ingestPipelines.processors.defaultDescription.dot_expander.dot_notation": "将“{field}”扩展成对象字段",
+    "xpack.ingestPipelines.processors.defaultDescription.dot_expander.wildcard": "将扩展所有顶层字段",
     "xpack.ingestPipelines.processors.defaultDescription.drop": "丢弃文档而不返回错误",
     "xpack.ingestPipelines.processors.defaultDescription.enrich": "如果策略“{policy_name}”匹配“{field}”，将数据扩充到“{target_field}”",
     "xpack.ingestPipelines.processors.defaultDescription.fail": "引发使执行停止的异常",
@@ -15706,6 +16710,7 @@
     "xpack.lists.exceptions.builder.exceptionFieldPlaceholder": "搜索",
     "xpack.lists.exceptions.builder.exceptionFieldValuePlaceholder": "搜索字段值......",
     "xpack.lists.exceptions.builder.exceptionListsPlaceholder": "搜索列表......",
+    "xpack.lists.exceptions.builder.exceptionMatchesOperator.warningMessage.wildcardInFilepath": "要进行更高效的事件筛选，在路径值中使用通配符时，请使用多个条件并使它们尽可能具体。例如，添加 process.name 或 file.name 字段。",
     "xpack.lists.exceptions.builder.exceptionOperatorPlaceholder": "运算符",
     "xpack.lists.exceptions.builder.fieldLabel": "字段",
     "xpack.lists.exceptions.builder.operatorLabel": "运算符",
@@ -15837,6 +16842,21 @@
     "xpack.maps.common.esSpatialRelation.disjointLabel": "disjoint",
     "xpack.maps.common.esSpatialRelation.intersectsLabel": "intersects",
     "xpack.maps.common.esSpatialRelation.withinLabel": "之内",
+    "xpack.maps.customIconModal.advancedOptionsLabel": "高级选项",
+    "xpack.maps.customIconModal.cancelButtonLabel": "取消",
+    "xpack.maps.customIconModal.cutoffRangeLabel": "Alpha 阈值",
+    "xpack.maps.customIconModal.cutoffRangeTooltip": "在图标内部（接近 1）和外部（接近 0）之间调整带符号距离函数的平衡。",
+    "xpack.maps.customIconModal.deleteButtonLabel": "删除",
+    "xpack.maps.customIconModal.elementPreviewTitle": "呈现预览",
+    "xpack.maps.customIconModal.elementPreviewTooltip": "动态样式需要使用带符号距离函数呈现 SVG 图标。因此，锐角和复杂的细节可能无法正确呈现。您或许可以调整 Alpha 阈值和半径以获得更好的结果。",
+    "xpack.maps.customIconModal.imageFilePickerPlaceholder": "选择或拖放 SVG 图标",
+    "xpack.maps.customIconModal.imageInputDescription": "不带锐角和复杂细节的 SVG 效果最好。修改高级选项下的设置或许会改善呈现效果。",
+    "xpack.maps.customIconModal.invalidFileError": "图标必须为 SVG 格式。不支持其他类型的图像。",
+    "xpack.maps.customIconModal.nameInputLabel": "名称",
+    "xpack.maps.customIconModal.radiusRangeLabel": "半径",
+    "xpack.maps.customIconModal.raduisRangeTooltip": "将关于 Alpha 阈值的带符号距离函数的大小调整为图标大小百分比。",
+    "xpack.maps.customIconModal.resetButtonLabel": "重置",
+    "xpack.maps.customIconModal.saveButtonLabel": "保存",
     "xpack.maps.dataView.label": "数据视图",
     "xpack.maps.dataView.notFoundMessage": "找不到数据视图“{id}”",
     "xpack.maps.dataView.selectPlacholder": "选择数据视图",
@@ -15855,7 +16875,7 @@
     "xpack.maps.drawTooltip.polygonInstructions": "单击以开始绘制形状。单击以添加顶点。双击以完成。",
     "xpack.maps.embeddable.boundsFilterLabel": "位于中心的地图边界：{lat}, {lon}，缩放：{zoom}",
     "xpack.maps.embeddableDisplayName": "地图",
-    "xpack.maps.emsFileSelect.selectPlaceholder": "选择 EMS 图层",
+    "xpack.maps.emsFileSelect.selectPlaceholder": "选择 EMS 边界",
     "xpack.maps.emsSource.tooltipsTitle": "工具提示字段",
     "xpack.maps.es_geo_utils.convert.unsupportedGeometryTypeErrorMessage": "无法将 {geometryType} 几何图形转换成 geojson，不支持",
     "xpack.maps.es_geo_utils.distanceFilterAlias": "{pointLabel} {distanceKm}km 内",
@@ -15901,6 +16921,8 @@
     "xpack.maps.heatmap.colorRampLabel": "颜色范围",
     "xpack.maps.heatmapLegend.coldLabel": "冷",
     "xpack.maps.heatmapLegend.hotLabel": "热",
+    "xpack.maps.hexbin.geoShape.disabledReason": "{hexLabel} 需要“geo_point”集群字段。",
+    "xpack.maps.hexbin.license.disabledReason": "{hexLabel} 是一项订阅功能。",
     "xpack.maps.indexData.indexExists": "找不到索引“{index}”。必须提供有效的索引",
     "xpack.maps.indexSettings.fetchErrorMsg": "无法提取数据视图“{indexPatternTitle}”的索引设置。\n      确保您具有“{viewIndexMetaRole}”角色。",
     "xpack.maps.initialLayers.unableToParseMessage": "无法解析“initialLayers”参数的内容。错误：{errorMsg}",
@@ -15946,8 +16968,6 @@
     "xpack.maps.layerPanel.join.applyGlobalTimeCheckboxLabel": "应用全局时间到联接",
     "xpack.maps.layerPanel.join.deleteJoinAriaLabel": "删除联接",
     "xpack.maps.layerPanel.join.deleteJoinTitle": "删除联接",
-    "xpack.maps.layerPanel.joinEditor.addJoinAriaLabel": "添加联接",
-    "xpack.maps.layerPanel.joinEditor.addJoinButtonLabel": "添加联接",
     "xpack.maps.layerPanel.joinEditor.termJoinsTitle": "词联接",
     "xpack.maps.layerPanel.joinEditor.termJoinTooltip": "使用词联接及属性增强此图层，以实现数据驱动的样式。",
     "xpack.maps.layerPanel.joinExpression.helpText": "配置共享密钥。",
@@ -16007,9 +17027,19 @@
     "xpack.maps.legacyVisualizations.title": "{label} 已过渡到 Maps。",
     "xpack.maps.legacyVisualizations.useMapsMsg": "使用 Maps，可以添加多个图层和索引，绘制单个文档，使用数据值表示特征，添加热图、网格和集群，等等。",
     "xpack.maps.legend.upto": "最多",
+    "xpack.maps.lens.choropleth.label": "区域地图",
+    "xpack.maps.lens.choroplethChart.addLayer": "添加可视化图层",
+    "xpack.maps.lens.choroplethChart.choroplethLayerLabel": "{emsLayerLabel}（按 {accessorLabel}）",
+    "xpack.maps.lens.choroplethChart.metricValueLabel": "指标",
+    "xpack.maps.lens.choroplethChart.regionKeyLabel": "区域密钥",
+    "xpack.maps.lens.choroplethChart.suggestionLabel": "{emsLayerLabel}（按 {metricLabel}）",
+    "xpack.maps.lens.groupLabel": "地图",
     "xpack.maps.loadMap.errorAttemptingToLoadSavedMap": "无法加载地图",
+    "xpack.maps.logDatatable.region": "区域密钥",
+    "xpack.maps.logDatatable.value": "值",
     "xpack.maps.map.initializeErrorTitle": "无法初始化地图",
     "xpack.maps.mapActions.addFeatureError": "无法添加特征到索引。",
+    "xpack.maps.mapActions.deleteCustomIconWarning": "无法删除图标。此图标正由以下{count, plural, other {图层}}使用：{layerNames}",
     "xpack.maps.mapActions.removeFeatureError": "无法从索引中移除特征。",
     "xpack.maps.mapListing.descriptionFieldTitle": "描述",
     "xpack.maps.mapListing.entityName": "地图",
@@ -16018,13 +17048,18 @@
     "xpack.maps.mapListing.tableCaption": "Maps",
     "xpack.maps.mapListing.titleFieldTitle": "标题",
     "xpack.maps.mapSavedObjectLabel": "地图",
-    "xpack.maps.mapSettingsPanel.autoFitToBoundsLocationLabel": "使地图自适应数据边界",
+    "xpack.maps.mapSettingsPanel.addCustomIcon": "添加定制图标",
+    "xpack.maps.mapSettingsPanel.autoFitToBoundsLocationLabel": "使地图自动适应数据边界",
     "xpack.maps.mapSettingsPanel.autoFitToDataBoundsLabel": "使地图自动适应数据边界",
     "xpack.maps.mapSettingsPanel.backgroundColorLabel": "背景色",
     "xpack.maps.mapSettingsPanel.browserLocationLabel": "浏览器位置",
     "xpack.maps.mapSettingsPanel.cancelLabel": "取消",
     "xpack.maps.mapSettingsPanel.closeLabel": "关闭",
+    "xpack.maps.mapSettingsPanel.customIcons.emptyState.description": "添加可用在此地图的图层中的定制图标。",
+    "xpack.maps.mapSettingsPanel.customIconsAddIconButton": "添加",
+    "xpack.maps.mapSettingsPanel.customIconsTitle": "定制图标",
     "xpack.maps.mapSettingsPanel.displayTitle": "显示",
+    "xpack.maps.mapSettingsPanel.editCustomIcon": "编辑定制图标",
     "xpack.maps.mapSettingsPanel.fixedLocationLabel": "固定位置",
     "xpack.maps.mapSettingsPanel.initialLatLabel": "初始纬度",
     "xpack.maps.mapSettingsPanel.initialLonLabel": "初始经度",
@@ -16068,7 +17103,7 @@
     "xpack.maps.mvtSource.trashButtonAriaLabel": "移除字段",
     "xpack.maps.mvtSource.trashButtonTitle": "移除字段",
     "xpack.maps.newVectorLayerWizard.description": "在地图上绘制形状并在 Elasticsearch 中索引",
-    "xpack.maps.newVectorLayerWizard.disabledDesc": "无法创建索引，您缺少 Kibana 权限“索引模式管理”。",
+    "xpack.maps.newVectorLayerWizard.disabledDesc": "无法创建索引，您缺少 Kibana 权限“数据视图管理”。",
     "xpack.maps.newVectorLayerWizard.indexNewLayer": "创建索引",
     "xpack.maps.newVectorLayerWizard.title": "创建索引",
     "xpack.maps.noGeoFieldInIndexPattern.message": "数据视图不包含任何地理空间字段",
@@ -16102,6 +17137,10 @@
     "xpack.maps.regionMapMap.vis.title": "区域地图",
     "xpack.maps.registerIntegrations.gdal.integrationDescription": "通过 GDAL 上传 Shapefile 并从 PostGIS 或 Oracle Spatial 等关系数据库进行采集。",
     "xpack.maps.registerIntegrations.gdal.integrationTitle": "GDAL",
+    "xpack.maps.registerIntegrations.geojson.integrationDescription": "使用 Elastic Maps 上传 GeoJSON 文件。",
+    "xpack.maps.registerIntegrations.geojson.integrationTitle": "GeoJSON",
+    "xpack.maps.registerIntegrations.shapefile.integrationDescription": "使用 Elastic Maps 上传 Shapefile。",
+    "xpack.maps.registerIntegrations.shapefile.integrationTitle": "Shapefile",
     "xpack.maps.sampleData.ecommerceSpec.mapsTitle": "[电子商务] 订单（按国家/地区）",
     "xpack.maps.sampleData.flightaSpec.logsTitle": "[日志] 请求和字节总数",
     "xpack.maps.sampleData.flightsSpec.mapsTitle": "[Flights] 始发地时间延迟",
@@ -16109,7 +17148,6 @@
     "xpack.maps.scalingDocs.clustersDetails": "结果超过 {maxResultWindow} 个文档时显示集群。结果数小于 {maxResultWindow} 时显示文档。",
     "xpack.maps.scalingDocs.clustersUseCase": "使用此选项可显示大型数据集。不支持词联接。",
     "xpack.maps.scalingDocs.limitDetails": "显示前 {maxResultWindow} 个文档中的特征。",
-    "xpack.maps.scalingDocs.limitUseCase": "使用此选项可创建跨边界比较统计信息的分级统计图。",
     "xpack.maps.scalingDocs.maxResultWindow": "{link} 索引设置提供的 {maxResultWindow} 限制。",
     "xpack.maps.scalingDocs.mvtDetails": "将地图分区为磁贴，每个磁贴显示前 {maxResultWindow} 个文档中的特征。超出 {maxResultWindow} 的结果不在磁贴中显示。边界框指示数据不完整的区域。",
     "xpack.maps.scalingDocs.mvtUseCase": "使用此选项可显示加载时间最快的大型数据集。不支持词联接、格式化标签和脚本字段的数据驱动样式。",
@@ -16143,7 +17181,7 @@
     "xpack.maps.source.emsFile.layerLabel": "图层",
     "xpack.maps.source.emsFile.unableToFindFileIdErrorMessage": "找不到 ID {id} 的 EMS 矢量形状。{info}",
     "xpack.maps.source.emsFileDisabledReason": "Elastic Maps Server 需要企业许可证",
-    "xpack.maps.source.emsFileSelect.selectLabel": "图层",
+    "xpack.maps.source.emsFileSelect.selectLabel": "EMS 边界",
     "xpack.maps.source.emsFileSourceDescription": "来自 {host} 的管理边界",
     "xpack.maps.source.emsFileTitle": "EMS 边界",
     "xpack.maps.source.emsOnPremFileTitle": "Elastic Maps Server 边界",
@@ -16159,9 +17197,13 @@
     "xpack.maps.source.emsTileSourceDescription": "来自 {host} 的 基础地图服务",
     "xpack.maps.source.emsTileTitle": "EMS 基础地图",
     "xpack.maps.source.esAggSource.topTermLabel": "排名靠前 {fieldLabel}",
-    "xpack.maps.source.esGeoGrid.geofieldLabel": "地理空间字段",
+    "xpack.maps.source.esGeoGrid.clusterDescription": "将文档分组成每个网格单元格都具有加权中心的网格。",
+    "xpack.maps.source.esGeoGrid.geofieldLabel": "集群字段",
     "xpack.maps.source.esGeoGrid.geofieldPlaceholder": "选择地理字段",
+    "xpack.maps.source.esGeoGrid.gridDescription": "将文档分组成网格。",
     "xpack.maps.source.esGeoGrid.gridRectangleDropdownOption": "网格",
+    "xpack.maps.source.esGeoGrid.hexDescription": "将文档分组成六边形。",
+    "xpack.maps.source.esGeoGrid.hexDropdownOption": "六边形",
     "xpack.maps.source.esGeoGrid.pointsDropdownOption": "集群",
     "xpack.maps.source.esGeoGrid.showAsLabel": "显示为",
     "xpack.maps.source.esGeoGrid.showAsSelector": "选择显示方法",
@@ -16184,7 +17226,7 @@
     "xpack.maps.source.esGeoLineTitle": "轨迹",
     "xpack.maps.source.esGrid.compositeInspectorDescription": "Elasticsearch 地理网格聚合请求：{requestId}",
     "xpack.maps.source.esGrid.compositePaginationErrorMessage": "{layerName} 正导致过多的请求。降低“网格分辨率”和/或减少热门词“指标”的数量。",
-    "xpack.maps.source.esGrid.geospatialFieldLabel": "地理空间字段",
+    "xpack.maps.source.esGrid.geospatialFieldLabel": "集群字段",
     "xpack.maps.source.esGrid.highLabel": "高",
     "xpack.maps.source.esGrid.inspectorDescription": "Elasticsearch 地理网格聚合请求",
     "xpack.maps.source.esGrid.lowLabel": "低",
@@ -16195,8 +17237,8 @@
     "xpack.maps.source.esGrid.vectorTileModal.confirmBtnLabel": "接受",
     "xpack.maps.source.esGrid.vectorTileModal.message": "高分辨率使用来自 Elasticsearch 矢量磁贴 API 的矢量磁贴。Elasticsearch 矢量磁贴 API 不支持“排名最前字词”指标。切换到超精细网格分辨率将从您的图层配置中移除所有“排名最前字词”指标。",
     "xpack.maps.source.esGrid.vectorTileModal.title": "不支持“排名最前字词”指标",
-    "xpack.maps.source.esGridClustersDescription": "地理空间数据以网格进行分组，每个网格单元格都具有指标",
-    "xpack.maps.source.esGridClustersTitle": "集群和网格",
+    "xpack.maps.source.esGridClustersDescription": "将 Elasticsearch 文档分组成网格和六边形，并显示每个组的指标",
+    "xpack.maps.source.esGridClustersTitle": "集群",
     "xpack.maps.source.esGridHeatmapDescription": "地理空间数据以网格进行分组以显示密度",
     "xpack.maps.source.esGridHeatmapTitle": "热图",
     "xpack.maps.source.esJoin.countLabel": "{indexPatternTitle} 的计数",
@@ -16213,15 +17255,11 @@
     "xpack.maps.source.esSearch.indexOverOneLengthEditError": "您的数据视图指向多个索引。每个数据视图只允许一个索引。",
     "xpack.maps.source.esSearch.indexZeroLengthEditError": "您的数据视图未指向任何索引。",
     "xpack.maps.source.esSearch.joinsDisabledReason": "按集群缩放时不支持联接",
-    "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "按矢量磁贴缩放时不支持联接",
     "xpack.maps.source.esSearch.limitScalingLabel": "将结果数限制到 {maxResultWindow}",
     "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "找不到文档，_id：{docId}",
     "xpack.maps.source.esSearch.scalingModal.cancelBtnLabel": "取消",
-    "xpack.maps.source.esSearch.scalingModal.clusters": "集群",
     "xpack.maps.source.esSearch.scalingModal.confirmBtnLabel": "接受",
-    "xpack.maps.source.esSearch.scalingModal.message": "缩放选项 {scalingOptionLabel} 不支持词联接。切换到 {scalingOptionLabel} 将从您的图层配置中移除所有词联接。",
     "xpack.maps.source.esSearch.scalingModal.title": "不支持词联接",
-    "xpack.maps.source.esSearch.scalingModal.vectorTiles": "矢量磁贴",
     "xpack.maps.source.esSearch.selectLabel": "选择地理字段",
     "xpack.maps.source.esSearch.sortFieldLabel": "字段",
     "xpack.maps.source.esSearch.sortFieldSelectPlaceholder": "选择排序字段",
@@ -16333,6 +17371,9 @@
     "xpack.maps.styles.vector.disabledByMessage": "设置“{styleLabel}”以启用",
     "xpack.maps.styles.vector.fillColorLabel": "填充颜色",
     "xpack.maps.styles.vector.iconLabel": "图标",
+    "xpack.maps.styles.vector.iconSelect.addCustomIconButtonLabel": "添加定制图标",
+    "xpack.maps.styles.vector.iconSelect.customIconsGroupLabel": "定制图标",
+    "xpack.maps.styles.vector.iconSelect.kibanaIconsGroupLabel": "Kibana 图标",
     "xpack.maps.styles.vector.labelBorderColorLabel": "标签边框颜色",
     "xpack.maps.styles.vector.labelBorderWidthLabel": "标签边框宽度",
     "xpack.maps.styles.vector.labelColorLabel": "标签颜色",
@@ -16515,6 +17556,19 @@
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.delayedData.timeIntervalHint": "延迟数据规则执行期间要检查的回溯时间间隔。默认派生自最长的存储桶跨度和查询延迟。",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.delayedData.timeIntervalLabel": "时间间隔",
     "xpack.ml.alertTypes.jobsHealthAlertingRule.testsSelection.enableTestLabel": "启用",
+    "xpack.ml.analyticsSelector.analyticsFetchErrorMessage": "提取分析作业时发生错误。刷新并重试。",
+    "xpack.ml.analyticsSelector.applyFlyoutButton": "应用",
+    "xpack.ml.analyticsSelector.closeFlyoutButton": "关闭",
+    "xpack.ml.analyticsSelector.description": "描述",
+    "xpack.ml.analyticsSelector.destinationIndex": "目标索引",
+    "xpack.ml.analyticsSelector.flyoutTitle": "分析选择",
+    "xpack.ml.analyticsSelector.id": "ID",
+    "xpack.ml.analyticsSelector.jobsTab": "作业",
+    "xpack.ml.analyticsSelector.modelsList.modelDescriptionHeader": "描述",
+    "xpack.ml.analyticsSelector.modelsList.modelIdHeader": "ID",
+    "xpack.ml.analyticsSelector.modelsTab": "模型",
+    "xpack.ml.analyticsSelector.sourceIndex": "源索引",
+    "xpack.ml.analyticsSelector.trainedModelsFetchErrorMessage": "提取已训练模型时发生错误。刷新并重试。",
     "xpack.ml.annotationFlyout.applyToPartitionTextLabel": "将标注应用到此系列",
     "xpack.ml.annotationsTable.actionsColumnName": "操作",
     "xpack.ml.annotationsTable.annotationColumnName": "标注",
@@ -16596,7 +17650,9 @@
     "xpack.ml.anomaliesTable.influencersCell.showLessInfluencersLinkText": "显示更少",
     "xpack.ml.anomaliesTable.influencersColumnName": "影响因素",
     "xpack.ml.anomaliesTable.jobIdColumnName": "作业 ID",
+    "xpack.ml.anomaliesTable.linksMenu.autoGeneratedDiscoverLinkErrorMessage": "无法链接到 Discover；索引“{index}”的数据视图不存在",
     "xpack.ml.anomaliesTable.linksMenu.configureRulesLabel": "配置作业规则",
+    "xpack.ml.anomaliesTable.linksMenu.discoverLocatorMissingErrorMessage": "未检测到 Discover 的定位器",
     "xpack.ml.anomaliesTable.linksMenu.loadingDetailsErrorMessage": "无法查看示例，因为加载有关类别 ID {categoryId} 的详细信息时出错",
     "xpack.ml.anomaliesTable.linksMenu.noMappingCouldBeFoundErrorMessage": "无法查看 mlcategory 为 {categoryId} 的文档的示例，因为找不到分类字段 {categorizationFieldName} 的映射",
     "xpack.ml.anomaliesTable.linksMenu.selectActionAriaLabel": "为 {time} 的异常选择操作",
@@ -17117,6 +18173,8 @@
     "xpack.ml.dataframe.analytics.rocCurveCompute": "其在不同的阈值级别将特定类的真正类率（y 轴）与假正类率（x 轴）进行比较，以创建曲线。",
     "xpack.ml.dataframe.analytics.rocCurvePopoverTitle": "接受者操作特性 (ROC) 曲线",
     "xpack.ml.dataframe.analytics.validation.validationFetchErrorMessage": "验证作业时出错",
+    "xpack.ml.dataframe.analyticsExploration.title": "浏览结果",
+    "xpack.ml.dataframe.analyticsExploration.titleWithId": "浏览作业 ID {id} 的结果",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.expandedRowJsonPane": "数据帧分析配置的的 JSON",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsMessagesLabel": "作业消息",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsStatsLabel": "作业统计信息",
@@ -17202,7 +18260,7 @@
     "xpack.ml.dataframe.analyticsList.stopAnalyticsErrorMessage": "停止数据帧分析 {analyticsId} 时发生错误：{error}",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsSuccessMessage": "数据帧分析 {analyticsId} 停止请求已确认。",
     "xpack.ml.dataframe.analyticsList.tableActionLabel": "操作",
-    "xpack.ml.dataframe.analyticsList.title": "数据帧分析",
+    "xpack.ml.dataframe.analyticsList.title": "数据帧分析作业",
     "xpack.ml.dataframe.analyticsList.type": "类型",
     "xpack.ml.dataframe.analyticsList.typeFilter": "类型",
     "xpack.ml.dataframe.analyticsList.viewActionJobFailedToolTipContent": "数据帧分析作业失败。没有可用的结果页面。",
@@ -17210,6 +18268,7 @@
     "xpack.ml.dataframe.analyticsList.viewActionJobNotStartedToolTipContent": "数据帧分析作业尚未启动。没有可用的结果页面。",
     "xpack.ml.dataframe.analyticsList.viewActionName": "查看",
     "xpack.ml.dataframe.analyticsList.viewActionUnknownJobTypeToolTipContent": "没有可用于此类型数据帧分析作业的结果页面。",
+    "xpack.ml.dataframe.analyticsMap.analyticsIdTitle": "作业 ID {jobId} 的地图",
     "xpack.ml.dataframe.analyticsMap.emptyResponseMessage": "未找到 {id} 的相关分析作业。",
     "xpack.ml.dataframe.analyticsMap.fetchDataErrorMessage": "无法获取某些数据。发生错误：{error}",
     "xpack.ml.dataframe.analyticsMap.flyout.cloneJobButton": "克隆作业",
@@ -17225,15 +18284,20 @@
     "xpack.ml.dataframe.analyticsMap.legend.showJobTypesAriaLabel": "显示作业类型",
     "xpack.ml.dataframe.analyticsMap.legend.trainedModelLabel": "已训练模型",
     "xpack.ml.dataframe.analyticsMap.modelIdTitle": "已训练模型 ID {modelId} 的地图",
+    "xpack.ml.dataframe.analyticsMap.noJobSelectedLabel": "未选择分析 ID",
+    "xpack.ml.dataframe.analyticsMap.title": "用于分析的地图",
+    "xpack.ml.dataframe.analyticsSourceSelection.title": "新分析作业/选择源数据视图",
     "xpack.ml.dataframe.stepCreateForm.createDataFrameAnalyticsSuccessMessage": "数据帧分析 {jobId} 创建请求已确认。",
     "xpack.ml.dataframe.stepDetailsForm.destinationIndexInvalidErrorLink": "详细了解索引名称限制。",
     "xpack.ml.dataFrameAnalytics.analyticsMap.docTitle": "分析地图",
     "xpack.ml.dataFrameAnalytics.createJob.docTitle": "创建作业",
-    "xpack.ml.dataFrameAnalytics.exploration.docTitle": "探查",
+    "xpack.ml.dataFrameAnalytics.exploration.docTitle": "结果浏览器",
     "xpack.ml.dataFrameAnalytics.jobs.docTitle": "数据帧分析作业",
+    "xpack.ml.dataFrameAnalytics.sourceSelection.docTitle": "源选择",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.analyticsMapLabel": "分析地图",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameCreationLabel": "创建作业",
-    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameExplorationLabel": "探查",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameExplorationLabel": "结果浏览器",
+    "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataFrameSourceSelectionLabel": "源选择",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.dataViewLabel": "数据视图",
     "xpack.ml.dataFrameAnalyticsBreadcrumbs.jobsManagementLabel": "作业",
     "xpack.ml.dataFrameAnalyticsLabel": "数据帧分析",
@@ -17271,6 +18335,8 @@
     "xpack.ml.datavisualizer.startTrial.subscriptionsLinkText": "白金级或企业级订阅",
     "xpack.ml.datavisualizerBreadcrumbLabel": "数据可视化工具",
     "xpack.ml.dataVisualizerPageLabel": "数据可视化工具",
+    "xpack.ml.datePicker.shortRefreshIntervalTimeFilterWarningMessage": "高级设置中的刷新时间间隔比 Machine Learning 支持的最小时间间隔更短。",
+    "xpack.ml.datePicker.shortRefreshIntervalURLWarningMessage": "URL 中的刷新时间间隔比 Machine Learning 支持的最小时间间隔更短。",
     "xpack.ml.deepLink.anomalyDetection": "异常检测",
     "xpack.ml.deepLink.calendarSettings": "日历",
     "xpack.ml.deepLink.dataFrameAnalytics": "数据帧分析",
@@ -17283,6 +18349,24 @@
     "xpack.ml.deepLink.overview": "概览",
     "xpack.ml.deepLink.settings": "设置",
     "xpack.ml.deepLink.trainedModels": "已训练模型",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanDelete.job": "继续删除 {length, plural, other {# 个作业}}",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanDelete.model": "继续删除 {length, plural, other {# 个模型}}",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextCanUnTagConfirm": "从当前工作区中移除",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextClose": "关闭",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.buttonTextNoAction": "关闭",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextCanDelete": "{ids} 可以被删除。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextCanUnTag": "无法删除 {ids}，但可以从当前工作区中移除。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose": "无法删除 {ids}，也无法从当前工作区中移除。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose.job": "此作业已分配到 * 工作区，您无权访问所有工作区。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextClose.model": "此模型已分配到 * 工作区，您无权访问所有工作区。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction": "{ids} 具有不同的工作区权限。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction.job": "删除多个作业时，它们必须具有相同的权限。取消选择作业，然后尝试分别删除各个作业。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTextNoAction.model": "删除多个模型时，它们必须具有相同的权限。取消选择模型，然后尝试分别删除各个模型。",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.modalTitle": "正在检查工作区权限",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.shouldUnTagLabel.job": "从当前工作区中移除作业",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.shouldUnTagLabel.model": "从当前工作区中移除模型",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.unTagErrorTitle": "更新 {id} 时出错",
+    "xpack.ml.deleteSpaceAwareItemCheckModal.unTagSuccessTitle": "成功更新 {id}",
     "xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorMessage": "无法加载消息",
     "xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorToastMessageTitle": "加载作业消息时出错",
     "xpack.ml.editModelSnapshotFlyout.calloutText": "这是作业 {jobId} 当前正在使用的快照，因此无法删除。",
@@ -17332,8 +18416,10 @@
     "xpack.ml.explorer.charts.infoTooltip.chartPopulationDistributionDescription": "灰点表示 {overFieldValuesParam} 样例的值随时间的近似分布。",
     "xpack.ml.explorer.charts.infoTooltip.jobIdTitle": "作业 ID",
     "xpack.ml.explorer.charts.mapsPluginMissingMessage": "未找到地图或可嵌入启动插件",
+    "xpack.ml.explorer.charts.openInMapsPluginMessage": "在 Maps 中打开",
     "xpack.ml.explorer.charts.openInSingleMetricViewerButtonLabel": "在 Single Metric Viewer 中打开",
     "xpack.ml.explorer.charts.tooManyBucketsDescription": "此选择包含太多存储桶，因此无法显示。您应该缩小视图的时间范围或缩小时间线中的选择范围。",
+    "xpack.ml.explorer.charts.viewInMapsLabel": "查看",
     "xpack.ml.explorer.charts.viewLabel": "查看",
     "xpack.ml.explorer.clearSelectionLabel": "清除所选内容",
     "xpack.ml.explorer.dashboardsTable.actionsHeader": "操作",
@@ -17418,7 +18504,7 @@
     "xpack.ml.fullTimeRangeSelector.useFullDataButtonLabel": "使用完整的数据",
     "xpack.ml.fullTimeRangeSelector.useFullDataExcludingFrozenButtonTooltip": "使用全范围数据，不包括冻结的数据层。",
     "xpack.ml.fullTimeRangeSelector.useFullDataExcludingFrozenMenuLabel": "排除冻结的数据层",
-    "xpack.ml.fullTimeRangeSelector.useFullDataIncludingFrozenButtonTooltip": "使用全范围数据，包括冻结的数据层，这可能会导致搜索结果更慢显示出来。",
+    "xpack.ml.fullTimeRangeSelector.useFullDataIncludingFrozenButtonTooltip": "使用全范围数据，包括冻结的数据层，这可能会使搜索结果变慢。",
     "xpack.ml.fullTimeRangeSelector.useFullDataIncludingFrozenMenuLabel": "包括冻结的数据层",
     "xpack.ml.helpPopover.ariaLabel": "帮助",
     "xpack.ml.importExport.exportButton": "导出作业",
@@ -17484,6 +18570,7 @@
     "xpack.ml.inference.modelsList.analyticsMapActionLabel": "分析地图",
     "xpack.ml.inference.modelsList.startModelDeploymentActionLabel": "开始部署",
     "xpack.ml.inference.modelsList.stopModelDeploymentActionLabel": "停止部署",
+    "xpack.ml.inference.modelsList.testModelActionLabel": "测试模型",
     "xpack.ml.influencerResultType.description": "时间范围中最异常的实体是什么？",
     "xpack.ml.influencerResultType.title": "影响因素",
     "xpack.ml.influencersList.maxAnomalyScoreTooltipDescription": "最大异常分数：{maxScoreLabel}",
@@ -17576,7 +18663,6 @@
     "xpack.ml.jobsList.alertingRules.tooltipContent": "作业具有 {rulesCount} 个关联的告警{rulesCount, plural, other {规则}}",
     "xpack.ml.jobsList.analyticsSpacesLabel": "工作区",
     "xpack.ml.jobsList.auditMessageColumn.screenReaderDescription": "过去 24 小时里该作业有错误或警告时，此列显示图标",
-    "xpack.ml.jobsList.breadcrumb": "作业",
     "xpack.ml.jobsList.cannotSelectRowForJobMessage": "无法选择作业 ID {jobId}",
     "xpack.ml.jobsList.cloneJobErrorMessage": "无法克隆 {jobId}。找不到作业",
     "xpack.ml.jobsList.closeActionStatusText": "关闭",
@@ -17742,11 +18828,11 @@
     "xpack.ml.jobsList.managementActions.stopDatafeedDescription": "停止数据馈送",
     "xpack.ml.jobsList.managementActions.stopDatafeedLabel": "停止数据馈送",
     "xpack.ml.jobsList.memoryStatusLabel": "内存状态",
-    "xpack.ml.jobsList.missingSavedObjectWarning.description": "一些作业缺少已保存对象或者已保存对象不完整。",
+    "xpack.ml.jobsList.missingSavedObjectWarning.description": "一些作业或已训练模型缺少已保存对象或者已保存对象不完整。",
     "xpack.ml.jobsList.missingSavedObjectWarning.link": " {link}",
-    "xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link": "同步您的作业。",
-    "xpack.ml.jobsList.missingSavedObjectWarning.noPermission": "管理员可以在 Stack Management 中同步作业。",
-    "xpack.ml.jobsList.missingSavedObjectWarning.title": "需要同步 ML 作业",
+    "xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link": "同步作业和已训练模型。",
+    "xpack.ml.jobsList.missingSavedObjectWarning.noPermission": "管理员可以在 Stack Management 中同步作业和已训练模型。",
+    "xpack.ml.jobsList.missingSavedObjectWarning.title": "需要同步 ML 作业和已训练模型",
     "xpack.ml.jobsList.multiJobActions.groupSelector.addButtonAriaLabel": "添加",
     "xpack.ml.jobsList.multiJobActions.groupSelector.addNewGroupPlaceholder": "添加新组",
     "xpack.ml.jobsList.multiJobActions.groupSelector.applyButtonLabel": "应用",
@@ -17763,7 +18849,6 @@
     "xpack.ml.jobsList.multiJobsActions.startDatafeedsLabel": "开始{jobsCount, plural, other {数据馈送}}",
     "xpack.ml.jobsList.multiJobsActions.stopDatafeedsLabel": "停止{jobsCount, plural, other {数据馈送}}",
     "xpack.ml.jobsList.nodeAvailableWarning.linkToCloud.hereLinkText": "Elastic Cloud 部署",
-    "xpack.ml.jobsList.nodeAvailableWarning.linkToCloudDescription": "请编辑您的{link}。可以启用免费的 1GB Machine Learning 节点或扩展现有的 ML 配置。",
     "xpack.ml.jobsList.nodeAvailableWarning.noMLNodesAvailableDescription": "没有可用的 ML 节点。",
     "xpack.ml.jobsList.nodeAvailableWarning.noMLNodesAvailableTitle": "没有可用的 ML 节点",
     "xpack.ml.jobsList.nodeAvailableWarning.unavailableCreateOrRunJobsDescription": "您将无法创建或运行作业。",
@@ -17836,12 +18921,15 @@
     "xpack.ml.management.jobsList.insufficientLicenseDescription": "要使用这些 Machine Learning 功能，必须{link}。",
     "xpack.ml.management.jobsList.insufficientLicenseDescription.link": "开始试用或升级您的订阅",
     "xpack.ml.management.jobsList.insufficientLicenseLabel": "升级以使用订阅功能",
-    "xpack.ml.management.jobsList.jobsListTagline": "查看、导出和导入 Machine Learning 分析和异常检测作业。",
-    "xpack.ml.management.jobsList.jobsListTitle": "Machine Learning 作业",
+    "xpack.ml.management.jobsList.jobsListTagline": "查看、导出和导入 Machine Learning 分析和异常检测项目。",
+    "xpack.ml.management.jobsList.jobsListTitle": "Machine Learning",
     "xpack.ml.management.jobsList.noGrantedPrivilegesDescription": "您无权管理 Machine Learning 作业。要访问该插件，需要 Machine Learning 功能在此工作区中可见。",
     "xpack.ml.management.jobsList.noPermissionToAccessLabel": "访问被拒绝",
     "xpack.ml.management.jobsList.syncFlyoutButton": "同步已保存对象",
-    "xpack.ml.management.jobsListTitle": "Machine Learning 作业",
+    "xpack.ml.management.jobsList.trainedModelsTab": "已训练模型",
+    "xpack.ml.management.jobsListTitle": "Machine Learning",
+    "xpack.ml.management.jobsSpacesList.jobObjectNoun": "作业",
+    "xpack.ml.management.jobsSpacesList.modelObjectNoun": "已训练模型",
     "xpack.ml.management.jobsSpacesList.updateSpaces.error": "更新 {id} 时出错",
     "xpack.ml.management.syncSavedObjectsFlyout.closeButton": "关闭",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsAdded.description": "如果有已保存对象缺失异常检测作业的数据馈送 ID，则将添加该 ID。",
@@ -17854,8 +18942,8 @@
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsCreated.title": "缺失的已保存对象 ({count})",
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsDeleted.description": "如果已保存对象没有伴随的作业，则会被删除。",
     "xpack.ml.management.syncSavedObjectsFlyout.savedObjectsDeleted.title": "不匹配的已保存对象 ({count})",
-    "xpack.ml.management.syncSavedObjectsFlyout.sync.error": "一些作业无法同步。",
-    "xpack.ml.management.syncSavedObjectsFlyout.sync.success": "{successCount} 个{successCount, plural, other {作业}}已同步",
+    "xpack.ml.management.syncSavedObjectsFlyout.sync.error": "无法同步某些作业或已训练模型。",
+    "xpack.ml.management.syncSavedObjectsFlyout.sync.success": "{successCount} 个{successCount, plural, other {项目}}已同步",
     "xpack.ml.management.syncSavedObjectsFlyout.syncButton": "同步",
     "xpack.ml.maps.anomalyLayerActualLabel": "实际",
     "xpack.ml.maps.anomalyLayerByFieldNameLabel": "按字段名称",
@@ -17863,6 +18951,7 @@
     "xpack.ml.maps.anomalyLayerDescription": "显示 Machine Learning 作业的异常",
     "xpack.ml.maps.anomalyLayerFieldNameLabel": "字段名称",
     "xpack.ml.maps.anomalyLayerFunctionDescriptionLabel": "函数",
+    "xpack.ml.maps.anomalyLayerInfluencersLabel": "影响因素",
     "xpack.ml.maps.anomalyLayerOverFieldNameLabel": "范围字段名称",
     "xpack.ml.maps.anomalyLayerOverFieldValueLabel": "范围字段值",
     "xpack.ml.maps.anomalyLayerPartitionFieldNameLabel": "分区字段名称",
@@ -17876,9 +18965,13 @@
     "xpack.ml.maps.anomalySource.displayLabel": "{jobId} 的 {typicalActual}",
     "xpack.ml.maps.anomalySourcePropLabel": "作业 ID",
     "xpack.ml.maps.jobIdLabel": "作业 ID",
+    "xpack.ml.maps.resultsTrimmedMsg": "结果仅限于前 {count} 个文档。",
     "xpack.ml.maps.settingsEditorLabel": "异常",
     "xpack.ml.maps.sourceTooltip": "显示异常",
     "xpack.ml.maps.typicalActualLabel": "类型",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.createJobButtonText": "创建作业",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.createJobMessage": "创建异常检测作业",
+    "xpack.ml.mapsAnomaliesLayerEmptyPrompt.emptyPromptText": "通过异常检测，可发现地理数据中的异常行为。创建使用 lat_long 函数的作业，地图异常图层需要这样做。",
     "xpack.ml.modelManagement.nodesOverview.docTitle": "节点",
     "xpack.ml.modelManagement.nodesOverviewHeader": "节点",
     "xpack.ml.modelManagement.trainedModels.docTitle": "已训练模型",
@@ -18031,7 +19124,9 @@
     "xpack.ml.navMenu.anomalyDetection.jobsManagementText": "作业",
     "xpack.ml.navMenu.anomalyDetection.singleMetricViewerText": "Single Metric Viewer",
     "xpack.ml.navMenu.anomalyDetectionTabLinkText": "异常检测",
+    "xpack.ml.navMenu.dataFrameAnalytics.analyticsMapText": "分析地图",
     "xpack.ml.navMenu.dataFrameAnalytics.jobsManagementText": "作业",
+    "xpack.ml.navMenu.dataFrameAnalytics.resultsExplorerText": "结果浏览器",
     "xpack.ml.navMenu.dataFrameAnalyticsTabLinkText": "数据帧分析",
     "xpack.ml.navMenu.dataViewDataVisualizerLinkText": "数据视图",
     "xpack.ml.navMenu.dataVisualizerTabLinkText": "数据可视化工具",
@@ -18458,6 +19553,7 @@
     "xpack.ml.overviewJobsList.statsBar.openJobsLabel": "打开的作业",
     "xpack.ml.overviewJobsList.statsBar.totalJobsLabel": "总计作业数",
     "xpack.ml.pageRefreshButton": "刷新",
+    "xpack.ml.pageRefreshResetButton": "设置为 {defaultInterval}",
     "xpack.ml.plugin.title": "Machine Learning",
     "xpack.ml.previewAlert.actualLabel": "实际：",
     "xpack.ml.previewAlert.hideResultsButtonLabel": "隐藏结果",
@@ -18846,10 +19942,12 @@
     "xpack.ml.trainedModels.modelsList.expandedRow.inferenceStatsTitle": "推理统计信息",
     "xpack.ml.trainedModels.modelsList.expandedRow.ingestStatsTitle": "采集统计信息",
     "xpack.ml.trainedModels.modelsList.expandedRow.metadataTitle": "元数据",
+    "xpack.ml.trainedModels.modelsList.expandedRow.modelSizeStatsTitle": "模型大小统计",
     "xpack.ml.trainedModels.modelsList.expandedRow.pipelinesTabLabel": "管道",
     "xpack.ml.trainedModels.modelsList.expandedRow.processorsTitle": "定义",
     "xpack.ml.trainedModels.modelsList.expandedRow.statsTabLabel": "统计信息",
     "xpack.ml.trainedModels.modelsList.expandRow": "展开",
+    "xpack.ml.trainedModels.modelsList.fetchDeletionErrorMessage": "{modelsCount, plural, other {模型}}删除失败",
     "xpack.ml.trainedModels.modelsList.fetchFailedErrorMessage": "模型提取失败",
     "xpack.ml.trainedModels.modelsList.fetchModelStatsErrorMessage": "提取模型统计信息失败",
     "xpack.ml.trainedModels.modelsList.forceStopDialog.cancelText": "取消",
@@ -18867,13 +19965,16 @@
     "xpack.ml.trainedModels.modelsList.pipelines.processorStats.timePerDocDescription": "在此节点的生命周期内预处理采集文档的总时间",
     "xpack.ml.trainedModels.modelsList.pipelines.processorStats.timePerDocHeader": "每个文档的时间",
     "xpack.ml.trainedModels.modelsList.pipelines.processorStats.typeHeader": "处理器类型",
+    "xpack.ml.trainedModels.modelsList.refreshManagementList": "刷新",
     "xpack.ml.trainedModels.modelsList.selectableMessage": "选择模型",
     "xpack.ml.trainedModels.modelsList.selectedModelsMessage": "{modelsCount, plural, other {# 个模型}}已选择",
+    "xpack.ml.trainedModels.modelsList.spacesLabel": "工作区",
     "xpack.ml.trainedModels.modelsList.startFailed": "无法启动“{modelId}”",
     "xpack.ml.trainedModels.modelsList.startSuccess": "已成功启动“{modelId}”的部署。",
     "xpack.ml.trainedModels.modelsList.stateHeader": "状态",
     "xpack.ml.trainedModels.modelsList.stopFailed": "无法停止“{modelId}”",
     "xpack.ml.trainedModels.modelsList.stopSuccess": "已成功停止“{modelId}”的部署。",
+    "xpack.ml.trainedModels.modelsList.successfullyDeletedMessage": "{modelsCount, plural, one {模型 {modelIds}} other {# 个模型}}{modelsCount, plural, other {已}}成功删除",
     "xpack.ml.trainedModels.modelsList.totalAmountLabel": "已训练的模型总数",
     "xpack.ml.trainedModels.modelsList.typeHeader": "类型",
     "xpack.ml.trainedModels.modelsList.viewTrainingDataActionLabel": "查看训练数据",
@@ -18887,6 +19988,7 @@
     "xpack.ml.trainedModels.nodesList.expandRow": "展开",
     "xpack.ml.trainedModels.nodesList.jvmHeapSIze": "JVM 堆大小",
     "xpack.ml.trainedModels.nodesList.memoryBreakdown": "近似内存细目",
+    "xpack.ml.trainedModels.nodesList.mlMaxMemory": "ML 本机进程允许的最大内存",
     "xpack.ml.trainedModels.nodesList.modelsList.modelAvgInferenceTimeHeader": "平均推理时间",
     "xpack.ml.trainedModels.nodesList.modelsList.modelInferenceCountHeader": "推理计数",
     "xpack.ml.trainedModels.nodesList.modelsList.modelLastAccessHeader": "上次访问",
@@ -18896,12 +19998,25 @@
     "xpack.ml.trainedModels.nodesList.modelsList.modelSizeHeader": "大小",
     "xpack.ml.trainedModels.nodesList.modelsList.modelStartTimeHeader": "开始时间",
     "xpack.ml.trainedModels.nodesList.modelsList.nodeNameHeader": "节点名称",
+    "xpack.ml.trainedModels.nodesList.modelsList.throughputLastMinuteHeader": "吞吐量",
     "xpack.ml.trainedModels.nodesList.modelsMemoryUsage": "已训练模型",
     "xpack.ml.trainedModels.nodesList.nodeMemoryUsageHeader": "内存使用",
     "xpack.ml.trainedModels.nodesList.nodeNameHeader": "名称",
     "xpack.ml.trainedModels.nodesList.nodesFetchError": "节点提取失败",
     "xpack.ml.trainedModels.nodesList.nodeTotalMemoryHeader": "总内存",
     "xpack.ml.trainedModels.nodesList.totalAmountLabel": "Machine Learning 节点总数",
+    "xpack.ml.trainedModels.testModelsFlyout.headerLabel": "测试已训练模型",
+    "xpack.ml.trainedModels.testModelsFlyout.inferenceError": "发生错误",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.inputText": "输入文本",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.markupTab": "输出",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.language_title": "语言",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.probability_title": "可能性",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.title": "这像是 {lang}",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.output.titleUnknown": "语言代码未知：{code}",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.rawOutput": "原始输出",
+    "xpack.ml.trainedModels.testModelsFlyout.langIdent.runButton": "测试",
+    "xpack.ml.trainedModels.testModelsFlyout.ner.output.probabilityTitle": "可能性",
+    "xpack.ml.trainedModels.testModelsFlyout.ner.output.typeTitle": "类型",
     "xpack.ml.trainedModelsBreadcrumbs.nodeOverviewLabel": "节点",
     "xpack.ml.trainedModelsBreadcrumbs.trainedModelsLabel": "已训练模型",
     "xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningDescription": "当前正在升级与 Machine Learning 相关的索引。",
@@ -19171,9 +20286,9 @@
     "xpack.monitoring.apm.instances.totalEventsRateTitle": "事件合计速率",
     "xpack.monitoring.apm.instances.versionFilter": "版本",
     "xpack.monitoring.apm.instances.versionTitle": "版本",
-    "xpack.monitoring.apm.metrics.agentHeading": "APM 和 Fleet 服务器",
+    "xpack.monitoring.apm.metrics.agentHeading": "集成服务器",
     "xpack.monitoring.apm.metrics.heading": "APM 服务器",
-    "xpack.monitoring.apm.metrics.topCharts.agentTitle": "APM 和 Fleet 服务器 - 资源使用率",
+    "xpack.monitoring.apm.metrics.topCharts.agentTitle": "集成服务器 - 资源使用率",
     "xpack.monitoring.apm.metrics.topCharts.title": "APM 服务器 - 资源使用率",
     "xpack.monitoring.apm.overview.pageTitle": "APM 服务器概览",
     "xpack.monitoring.apm.overview.panels.title": "APM 服务器 - 指标",
@@ -19276,15 +20391,15 @@
     "xpack.monitoring.cluster.listing.statusColumnTitle": "告警状态",
     "xpack.monitoring.cluster.listing.tabTitle": "集群",
     "xpack.monitoring.cluster.listing.unknownHealthMessage": "未知",
-    "xpack.monitoring.cluster.overview.apmPanel.agentServersTotalLinkLabel": "APM 和 Fleet 服务器：{apmsTotal}",
-    "xpack.monitoring.cluster.overview.apmPanel.apmFleetTitle": "APM 和 Fleet 服务器",
+    "xpack.monitoring.cluster.overview.apmPanel.agentServersTotalLinkLabel": "集成服务器：{apmsTotal}",
+    "xpack.monitoring.cluster.overview.apmPanel.apmFleetTitle": "集成服务器",
     "xpack.monitoring.cluster.overview.apmPanel.apmTitle": "APM 服务器",
-    "xpack.monitoring.cluster.overview.apmPanel.instancesAndFleetsTotalLinkAriaLabel": "APM 和 Fleet 服务器实例：{apmsTotal}",
+    "xpack.monitoring.cluster.overview.apmPanel.instancesAndFleetsTotalLinkAriaLabel": "集成服务器实例：{apmsTotal}",
     "xpack.monitoring.cluster.overview.apmPanel.instancesTotalLinkAriaLabel": "APM 服务器实例：{apmsTotal}",
     "xpack.monitoring.cluster.overview.apmPanel.lastEventDescription": "{timeOfLastEvent}前",
     "xpack.monitoring.cluster.overview.apmPanel.lastEventLabel": "最后事件",
     "xpack.monitoring.cluster.overview.apmPanel.memoryUsageLabel": "内存使用率（增量）",
-    "xpack.monitoring.cluster.overview.apmPanel.overviewFleetLinkLabel": "APM 和 Fleet 服务器概览",
+    "xpack.monitoring.cluster.overview.apmPanel.overviewFleetLinkLabel": "集成服务器概览",
     "xpack.monitoring.cluster.overview.apmPanel.overviewLinkLabel": "APM 服务器概览",
     "xpack.monitoring.cluster.overview.apmPanel.processedEventsLabel": "已处理事件",
     "xpack.monitoring.cluster.overview.apmPanel.serversTotalLinkLabel": "APM 服务器：{apmsTotal}",
@@ -20428,6 +21543,7 @@
     "xpack.monitoring.setupMode.instance": "实例",
     "xpack.monitoring.setupMode.instances": "实例",
     "xpack.monitoring.setupMode.metricbeatAllNodes": "Metricbeat 正在监测所有 {identifier}。",
+    "xpack.monitoring.setupMode.migrateSomeToMetricbeatDescription": "某些 {product} {identifier} 通过内部收集进行监测。迁移到使用 Metricbeat 监测。",
     "xpack.monitoring.setupMode.migrateToMetricbeat": "使用 Metricbeat 监测",
     "xpack.monitoring.setupMode.migrateToMetricbeatDescription": "这些 {product} {identifier} 自我监测。\n                单击“使用 Metricbeat 监测”以迁移。",
     "xpack.monitoring.setupMode.monitorAllNodes": "一些节点仅使用内部收集",
@@ -20465,7 +21581,7 @@
     "xpack.observability.alerts.ruleStats.disabled": "已禁用",
     "xpack.observability.alerts.ruleStats.errors": "错误",
     "xpack.observability.alerts.ruleStats.loadError": "无法加载规则统计信息",
-    "xpack.observability.alerts.ruleStats.muted": "已静音",
+    "xpack.observability.alerts.ruleStats.muted": "已暂停",
     "xpack.observability.alerts.ruleStats.ruleCount": "规则计数",
     "xpack.observability.alerts.searchBarPlaceholder": "搜索告警（例如 kibana.alert.evaluation.threshold > 75）",
     "xpack.observability.alerts.workflowStatusFilter.acknowledgedButtonLabel": "已确认",
@@ -20502,30 +21618,37 @@
     "xpack.observability.alertsTGrid.statusColumnDescription": "告警状态",
     "xpack.observability.alertsTGrid.statusRecoveredDescription": "已恢复",
     "xpack.observability.alertsTitle": "告警",
+    "xpack.observability.apmServiceInventoryOptimizedSorting": "优化 APM 服务库存页面加载性能",
+    "xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} 默认 APM 服务库存页面排序（对于未应用 Machine Learning 的服务）将按服务名称排序",
     "xpack.observability.apply.label": "应用",
     "xpack.observability.breadcrumbs.alertsLinkText": "告警",
     "xpack.observability.breadcrumbs.landingLinkText": "入门",
     "xpack.observability.breadcrumbs.observabilityLinkText": "Observability",
     "xpack.observability.breadcrumbs.overviewLinkText": "概览",
+    "xpack.observability.breadcrumbs.rulesLinkText": "规则",
     "xpack.observability.cases.caseFeatureNoPermissionsMessage": "要查看案例，必须对 Kibana 工作区中的案例功能有权限。有关详细信息，请联系您的 Kibana 管理员。",
     "xpack.observability.cases.caseFeatureNoPermissionsTitle": "需要 Kibana 功能权限",
     "xpack.observability.cases.caseView.goToDocumentationButton": "查看文档",
-    "xpack.observability.emptySection.apps.alert.description": "503 错误是否越来越多？服务是否响应？CPU 和 RAM 利用率是否激增？实时查看警告，而不是事后再进行剖析。",
+    "xpack.observability.defaultApmServiceEnvironment": "默认服务环境",
+    "xpack.observability.defaultApmServiceEnvironmentDescription": "为 APM 应用设置默认环境。如果留空，默认情况下将显示所有环境中的数据。",
+    "xpack.observability.detectionEngine.alerts.actions.addToCase": "添加到现有案例",
+    "xpack.observability.detectionEngine.alerts.actions.addToNewCase": "添加到新案例",
+    "xpack.observability.emptySection.apps.alert.description": "检测 Observability 内的复杂条件，并在满足那些条件时触发操作。",
     "xpack.observability.emptySection.apps.alert.link": "创建规则",
     "xpack.observability.emptySection.apps.alert.title": "未找到告警。",
-    "xpack.observability.emptySection.apps.apm.description": "通过分布式体系结构跟踪事务并映射服务的交互以轻松发现性能瓶颈。",
+    "xpack.observability.emptySection.apps.apm.description": "广泛支持各种常用语言、OpenTelemetry 和分布式跟踪，让您实现对应用程序更深入的可见性。",
     "xpack.observability.emptySection.apps.apm.link": "安装代理",
     "xpack.observability.emptySection.apps.apm.title": "APM",
-    "xpack.observability.emptySection.apps.logs.description": "集中任何源的日志。搜索、跟踪、自动化异常检测并可视化趋势，以便您可以更迅速地采取操作。",
+    "xpack.observability.emptySection.apps.logs.description": "通过开箱支持常用数据源，实现快速、轻松而可扩展的集中式日志监测。",
     "xpack.observability.emptySection.apps.logs.link": "安装 Filebeat",
     "xpack.observability.emptySection.apps.logs.title": "日志",
-    "xpack.observability.emptySection.apps.metrics.description": "分析您的基础设施、应用和服务的指标。发现趋势、预测行为、接收异常告警等等。",
+    "xpack.observability.emptySection.apps.metrics.description": "流式传输、可视化并分析您的基础架构指标。",
     "xpack.observability.emptySection.apps.metrics.link": "安装 Metricbeat",
     "xpack.observability.emptySection.apps.metrics.title": "指标",
-    "xpack.observability.emptySection.apps.uptime.description": "主动监测站点和服务的可用性。接收告警并更快地解决问题，从而优化用户体验。",
+    "xpack.observability.emptySection.apps.uptime.description": "主动监测用户旅程的可用性和功能。",
     "xpack.observability.emptySection.apps.uptime.link": "安装 Heartbeat",
     "xpack.observability.emptySection.apps.uptime.title": "运行时间",
-    "xpack.observability.emptySection.apps.ux.description": "性能具有分布特征。测量所有访问者的 Web 应用程序访问体验，并了解如何改善每个人的体验。",
+    "xpack.observability.emptySection.apps.ux.description": "收集、衡量和分析反映真实用户体验的性能数据。",
     "xpack.observability.emptySection.apps.ux.link": "安装 RUM 代理",
     "xpack.observability.emptySection.apps.ux.title": "用户体验",
     "xpack.observability.enableComparisonByDefault": "对比功能",
@@ -20534,11 +21657,15 @@
     "xpack.observability.enableInfrastructureViewDescription": "在 APM 应用中启用基础架构视图功能",
     "xpack.observability.enableInspectEsQueriesExperimentDescription": "检查 API 响应中的 Elasticsearch 查询。",
     "xpack.observability.enableInspectEsQueriesExperimentName": "检查 ES 查询",
+    "xpack.observability.enableServiceGroups": "服务组功能",
+    "xpack.observability.enableServiceGroupsDescription": "{technicalPreviewLabel} 在 APM UI 上启用服务组功能",
     "xpack.observability.exp.breakDownFilter.noBreakdown": "无细目",
     "xpack.observability.exp.breakDownFilter.unavailable": "步骤名称细目不可用于监测持续时间指标。使用步骤持续时间指标以按步骤名称细分。",
     "xpack.observability.exp.breakDownFilter.warning": "一次只能将细目应用于一个序列。",
     "xpack.observability.experimentalBadgeDescription": "此功能处于技术预览状态，在未来版本中可能会更改或完全移除。Elastic 将尽最大努力来修复任何问题，但处于技术预览状态的功能不受正式 GA 功能支持 SLA 的约束。",
     "xpack.observability.experimentalBadgeLabel": "技术预览",
+    "xpack.observability.exploratoryView.logs.logRateXAxisLabel": "时间戳",
+    "xpack.observability.exploratoryView.logs.logRateYAxisLabel": "每分钟日志速率",
     "xpack.observability.exploratoryView.noBrusing": "按画笔选择缩放仅适用于时间序列图表。",
     "xpack.observability.expView.addToCase": "添加到案例",
     "xpack.observability.expView.chartTypes.label": "图表类型",
@@ -20548,6 +21675,7 @@
     "xpack.observability.expView.dateRanger.startDate": "开始日期",
     "xpack.observability.expView.explore": "浏览",
     "xpack.observability.expView.fieldLabels.agentHost": "代理主机",
+    "xpack.observability.expView.fieldLabels.agentType": "代理类型",
     "xpack.observability.expView.fieldLabels.backend": "后端时间",
     "xpack.observability.expView.fieldLabels.browserFamily": "浏览器系列",
     "xpack.observability.expView.fieldLabels.browserVersion": "浏览器版本",
@@ -20567,6 +21695,7 @@
     "xpack.observability.expView.fieldLabels.deviceModel": "设备型号",
     "xpack.observability.expView.fieldLabels.downPings": "关闭 Ping",
     "xpack.observability.expView.fieldLabels.environment": "环境",
+    "xpack.observability.expView.fieldLabels.eventDataset": "数据集",
     "xpack.observability.expView.fieldLabels.fcp": "首次内容绘制",
     "xpack.observability.expView.fieldLabels.fid": "首次输入延迟",
     "xpack.observability.expView.fieldLabels.hostName": "主机名",
@@ -20576,7 +21705,9 @@
     "xpack.observability.expView.fieldLabels.labels": "标签",
     "xpack.observability.expView.fieldLabels.lcp": "最大内容绘制",
     "xpack.observability.expView.fieldLabels.location": "位置",
+    "xpack.observability.expView.fieldLabels.logRate": "日志速率",
     "xpack.observability.expView.fieldLabels.memoryUsage": "系统内存使用",
+    "xpack.observability.expView.fieldLabels.message": "消息",
     "xpack.observability.expView.fieldLabels.metric": "指标",
     "xpack.observability.expView.fieldLabels.mobile.memoryUsage": "系统内存使用",
     "xpack.observability.expView.fieldLabels.mobileApp": "移动应用",
@@ -20600,6 +21731,7 @@
     "xpack.observability.expView.fieldLabels.requestMethod": "请求方法",
     "xpack.observability.expView.fieldLabels.responseLatency": "延迟",
     "xpack.observability.expView.fieldLabels.serviceName": "服务名称",
+    "xpack.observability.expView.fieldLabels.serviceType": "服务类型",
     "xpack.observability.expView.fieldLabels.serviceVersion": "服务版本",
     "xpack.observability.expView.fieldLabels.stepDurationLabel": "步骤持续时间",
     "xpack.observability.expView.fieldLabels.stepNameLabel": "步骤名称",
@@ -20618,6 +21750,7 @@
     "xpack.observability.expView.heading.openInLens": "在 Lens 中打开",
     "xpack.observability.expView.heading.saveLensVisualization": "保存",
     "xpack.observability.expView.lastUpdated.label": "上次更新时间：{updatedDate}",
+    "xpack.observability.expView.openInLens": "在 Lens 中打开",
     "xpack.observability.expView.operationType.75thPercentile": "第 75 个百分位",
     "xpack.observability.expView.operationType.90thPercentile": "第 90 个百分位",
     "xpack.observability.expView.operationType.95thPercentile": "第 95 个百分位",
@@ -20724,20 +21857,23 @@
     "xpack.observability.noDataConfig.solutionName": "Observability",
     "xpack.observability.notAvailable": "不可用",
     "xpack.observability.overview.alert.allTypes": "所有类型",
-    "xpack.observability.overview.alert.appLink": "管理告警",
+    "xpack.observability.overview.alert.appLink": "显示所有告警",
     "xpack.observability.overview.alert.errorMessage": "加载告警数据时出现错误。请稍后重试。",
     "xpack.observability.overview.alert.errorTitle": "我们无法加载告警数据",
+    "xpack.observability.overview.alerts.appLink": "显示告警",
     "xpack.observability.overview.alerts.muted": "已静音",
     "xpack.observability.overview.alerts.title": "告警",
-    "xpack.observability.overview.apm.appLink": "在应用中查看",
+    "xpack.observability.overview.apm.appLink": "显示服务库存",
     "xpack.observability.overview.apm.services": "服务",
     "xpack.observability.overview.apm.throughput": "吞吐量",
-    "xpack.observability.overview.apm.title": "APM",
+    "xpack.observability.overview.apm.throughputTip": "将为类型为“request”或“page-load”的事务计算值。如果两者都不可用，值将反映排名靠前事务类型。",
+    "xpack.observability.overview.apm.title": "服务",
     "xpack.observability.overview.exploratoryView": "浏览数据",
     "xpack.observability.overview.exploratoryView.editSeriesColor": "编辑序列的颜色",
     "xpack.observability.overview.exploratoryView.hideChart": "隐藏图表",
     "xpack.observability.overview.exploratoryView.lensDisabled": "Lens 应用不可用，请启用 Lens 以使用浏览视图。",
-    "xpack.observability.overview.exploratoryView.metricsLabel": "基础架构指标",
+    "xpack.observability.overview.exploratoryView.logsLabel": "日志",
+    "xpack.observability.overview.exploratoryView.metricsLabel": "指标",
     "xpack.observability.overview.exploratoryView.missingDataType": "缺少数据类型",
     "xpack.observability.overview.exploratoryView.missingReportDefinition": "缺少 {reportDefinition}",
     "xpack.observability.overview.exploratoryView.missingReportMetric": "缺少报告指标",
@@ -20751,25 +21887,28 @@
     "xpack.observability.overview.exploratoryView.showChart": "显示图表",
     "xpack.observability.overview.exploratoryView.syntheticsLabel": "Synthetics 监测",
     "xpack.observability.overview.exploratoryView.uxLabel": "用户体验 (RUM)",
+    "xpack.observability.overview.guidedSetupButton": "引导式设置",
     "xpack.observability.overview.loadingObservability": "正在加载可观测性",
-    "xpack.observability.overview.logs.appLink": "在应用中查看",
+    "xpack.observability.overview.logs.appLink": "显示日志流",
     "xpack.observability.overview.logs.subtitle": "每分钟日志速率",
-    "xpack.observability.overview.logs.title": "日志",
-    "xpack.observability.overview.metrics.appLink": "在应用中查看",
+    "xpack.observability.overview.logs.title": "日志事件",
+    "xpack.observability.overview.metrics.appLink": "显示库存",
     "xpack.observability.overview.metrics.colunms.cpu": "CPU %",
     "xpack.observability.overview.metrics.colunms.hostname": "主机名",
     "xpack.observability.overview.metrics.colunms.load15": "加载 15",
     "xpack.observability.overview.metrics.colunms.uptime": "运行时间",
-    "xpack.observability.overview.metrics.title": "指标",
+    "xpack.observability.overview.metrics.title": "主机",
     "xpack.observability.overview.pageTitle": "概览",
-    "xpack.observability.overview.uptime.appLink": "在应用中查看",
+    "xpack.observability.overview.statusVisualizationFlyoutDescription": "跟踪您添加 Observability 集成和功能的进度。",
+    "xpack.observability.overview.statusVisualizationFlyoutTitle": "引导式设置",
+    "xpack.observability.overview.uptime.appLink": "显示监测",
     "xpack.observability.overview.uptime.chart.down": "关闭",
     "xpack.observability.overview.uptime.chart.up": "运行",
     "xpack.observability.overview.uptime.down": "关闭",
     "xpack.observability.overview.uptime.monitors": "监测",
-    "xpack.observability.overview.uptime.title": "运行时间",
+    "xpack.observability.overview.uptime.title": "监测",
     "xpack.observability.overview.uptime.up": "运行",
-    "xpack.observability.overview.ux.appLink": "在应用中查看",
+    "xpack.observability.overview.ux.appLink": "显示仪表板",
     "xpack.observability.overview.ux.title": "用户体验",
     "xpack.observability.overviewLinkTitle": "概览",
     "xpack.observability.page_header.addMobileDataLink.label": "导航到有关如何添加移动 APM 数据的教程",
@@ -20781,6 +21920,47 @@
     "xpack.observability.resources.quick_start": "快速入门视频",
     "xpack.observability.resources.title": "资源",
     "xpack.observability.resources.training": "免费的可观测性课程",
+    "xpack.observability.rules.addRuleButtonLabel": "创建规则",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.cancelButtonLabel": "取消",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.deleteButtonLabel": "删除{numIdsToDelete, plural, one {{singleTitle}} other { # 个{multipleTitle}}} ",
+    "xpack.observability.rules.deleteSelectedIdsConfirmModal.descriptionText": "无法恢复{numIdsToDelete, plural, one {删除的{singleTitle}} other {删除的{multipleTitle}}}。",
+    "xpack.observability.rules.deleteSelectedIdsErrorNotification.descriptionText": "无法删除 {numErrors, number} 个{numErrors, plural, one {{singleTitle}} other {{multipleTitle}}}",
+    "xpack.observability.rules.docsLinkText": "文档",
+    "xpack.observability.rules.emptyPrompt.emptyButton": "创建规则",
+    "xpack.observability.rules.emptyPrompt.emptyTitle": "创建您的首个规则",
+    "xpack.observability.rules.loadError": "无法加载规则",
+    "xpack.observability.rules.noDataPrompt.noDataDesc": "规则允许您接收告警并在满足特定条件时自动完成定制操作。",
+    "xpack.observability.rules.noPermissionToCreateDescription": "请联系您的系统管理员。",
+    "xpack.observability.rules.noPermissionToCreateTitle": "没有创建规则的权限",
+    "xpack.observability.rules.refreshRulesButtonLabel": "刷新",
+    "xpack.observability.rules.ruleLastResponseFilterLabel": "上次响应",
+    "xpack.observability.rules.rulesTable.changeStatusAriaLabel": "更改状态",
+    "xpack.observability.rules.rulesTable.columns.actionsTitle": "操作",
+    "xpack.observability.rules.rulesTable.columns.deleteAriaLabel": "删除",
+    "xpack.observability.rules.rulesTable.columns.deleteButtonTooltip": "删除",
+    "xpack.observability.rules.rulesTable.columns.editAriaLabel": "编辑",
+    "xpack.observability.rules.rulesTable.columns.editButtonTooltip": "编辑",
+    "xpack.observability.rules.rulesTable.columns.lastResponseTitle": "上次响应",
+    "xpack.observability.rules.rulesTable.columns.lastRunTitle": "上次运行",
+    "xpack.observability.rules.rulesTable.columns.nameTitle": "规则",
+    "xpack.observability.rules.rulesTable.columns.statusTitle": "状态",
+    "xpack.observability.rules.rulesTable.pluralTitle": "规则",
+    "xpack.observability.rules.rulesTable.ruleStatusActive": "活动",
+    "xpack.observability.rules.rulesTable.ruleStatusDisabled": "已禁用",
+    "xpack.observability.rules.rulesTable.ruleStatusEnabled": "已启用",
+    "xpack.observability.rules.rulesTable.ruleStatusError": "错误",
+    "xpack.observability.rules.rulesTable.ruleStatusLicenseError": "许可证错误",
+    "xpack.observability.rules.rulesTable.ruleStatusOk": "确定",
+    "xpack.observability.rules.rulesTable.ruleStatusPending": "待处理",
+    "xpack.observability.rules.rulesTable.ruleStatusSnoozedIndefinitely": "已无限期暂停",
+    "xpack.observability.rules.rulesTable.ruleStatusUnknown": "未知",
+    "xpack.observability.rules.rulesTable.ruleStatusWarning": "警告",
+    "xpack.observability.rules.rulesTable.singleTitle": "规则",
+    "xpack.observability.rules.searchPlaceholderTitle": "搜索",
+    "xpack.observability.rules.totalItemsCountDescription": "正在显示：{pageSize} 个规则（共 {totalItemCount} 个）",
+    "xpack.observability.rules.typeFilterLabel": "类型",
+    "xpack.observability.rulesLinkTitle": "规则",
+    "xpack.observability.rulesTitle": "规则",
     "xpack.observability.search.url.close": "关闭",
     "xpack.observability.section.apps.apm.description": "通过分布式体系结构跟踪事务并映射服务的交互以轻松发现性能瓶颈。",
     "xpack.observability.section.apps.apm.title": "APM",
@@ -20791,12 +21971,48 @@
     "xpack.observability.section.apps.uptime.description": "主动监测站点和服务的可用性。接收告警并更快地解决问题，从而优化用户体验。",
     "xpack.observability.section.apps.uptime.title": "运行时间",
     "xpack.observability.section.errorPanel": "尝试提取数据时发生错误。请重试",
+    "xpack.observability.seriesEditor.actionsAriaContextLabel": "序列操作列表",
     "xpack.observability.seriesEditor.clone": "序列重复",
     "xpack.observability.seriesEditor.edit": "编辑序列",
     "xpack.observability.seriesEditor.hide": "隐藏序列",
-    "xpack.observability.seriesEditor.sampleDocuments": "在新选项卡中查看样例文档",
+    "xpack.observability.seriesEditor.popoverButtonLabel": "查看序列操作",
+    "xpack.observability.seriesEditor.sampleDocuments": "在 Discover 中查看事务",
+    "xpack.observability.seriesEditor.show": "显示序列",
+    "xpack.observability.status.dataAvailable": "数据可用。",
+    "xpack.observability.status.dataAvailableTitle": "数据可用于",
     "xpack.observability.status.learnMoreButton": "了解详情",
+    "xpack.observability.status.progressBarDescription": "跟踪您添加 Observability 集成和功能的进度。",
+    "xpack.observability.status.progressBarDismiss": "关闭",
+    "xpack.observability.status.progressBarTitle": "Observability 的引导式设置",
+    "xpack.observability.status.progressBarViewDetails": "查看详情",
+    "xpack.observability.status.recommendedSteps": "建议的后续步骤",
+    "xpack.observability.statusVisualization.alert.description": "检测 Observability 中的复杂条件，并在满足那些条件时触发操作。",
+    "xpack.observability.statusVisualization.alert.goToAppTitle": "显示告警",
+    "xpack.observability.statusVisualization.alert.link": "创建规则",
+    "xpack.observability.statusVisualization.alert.title": "Alerting",
+    "xpack.observability.statusVisualization.apm.description": "广泛支持各种常用语言、OpenTelemetry 和分布式跟踪，让您实现对应用程序更深入的可见性。",
+    "xpack.observability.statusVisualization.apm.goToAppTitle": "显示服务库存",
+    "xpack.observability.statusVisualization.apm.link": "添加数据",
+    "xpack.observability.statusVisualization.apm.title": "APM",
+    "xpack.observability.statusVisualization.logs.description": "通过开箱支持常用数据源，实现快速、轻松而可扩展的集中式日志监测。",
+    "xpack.observability.statusVisualization.logs.goToAppTitle": "显示日志流",
+    "xpack.observability.statusVisualization.logs.link": "添加集成",
+    "xpack.observability.statusVisualization.logs.title": "日志",
+    "xpack.observability.statusVisualization.metrics.description": "流式传输、可视化并分析您的基础架构指标。",
+    "xpack.observability.statusVisualization.metrics.goToAppTitle": "显示库存",
+    "xpack.observability.statusVisualization.metrics.link": "添加集成",
+    "xpack.observability.statusVisualization.metrics.title": "基础设施",
+    "xpack.observability.statusVisualization.uptime.description": "主动监测用户旅程的可用性和功能。",
+    "xpack.observability.statusVisualization.uptime.goToAppTitle": "显示监测 ",
+    "xpack.observability.statusVisualization.uptime.link": "添加监测",
+    "xpack.observability.statusVisualization.uptime.title": "运行时间",
+    "xpack.observability.statusVisualization.ux.description": "收集、衡量和分析反映真实用户体验的性能数据。",
+    "xpack.observability.statusVisualization.ux.goToAppTitle": "显示仪表板",
+    "xpack.observability.statusVisualization.ux.link": "添加数据",
+    "xpack.observability.statusVisualization.ux.title": "用户体验",
+    "xpack.observability.textDefinitionField.placeholder.search": "搜索 {label}",
     "xpack.observability.transactionRateLabel": "{value} tpm",
+    "xpack.observability.uiSettings.technicalPreviewLabel": "技术预览",
     "xpack.observability.urlFilter.wildcard": "使用通配符 *{wildcard}*",
     "xpack.observability.ux.addDataButtonLabel": "添加 UX 数据",
     "xpack.observability.ux.coreVitals.average": "平均值",
@@ -20832,6 +22048,11 @@
     "xpack.osquery.action_results.errorSearchDescription": "搜索操作结果时发生错误",
     "xpack.osquery.action_results.failSearchDescription": "无法获取操作结果",
     "xpack.osquery.action_results.fetchError": "提取操作结果时出错",
+    "xpack.osquery.action.agentStatus": "要在此主机上运行查询，Elastic 代理必须处于活动状态。在 Fleet 中检查此代理的状态。",
+    "xpack.osquery.action.empty": "未在此主机上安装 Elastic 代理。要运行查询，请在该主机上安装 Elastic 代理，然后在 Fleet 中将 Osquery 管理器集成添加到代理策略。",
+    "xpack.osquery.action.permissionDenied": "权限被拒绝",
+    "xpack.osquery.action.shortEmptyTitle": "Osquery 不可用",
+    "xpack.osquery.action.unavailable": "Osquery 管理器集成未添加到代理策略。要在此主机上运行查询，请在 Fleet 中将 Osquery 管理器集成添加到代理策略。",
     "xpack.osquery.actionDetails.errorSearchDescription": "搜索操作详情时发生错误",
     "xpack.osquery.actionDetails.failSearchDescription": "无法获取操作详情",
     "xpack.osquery.actionResults.errorSearchDescription": "搜索操作结果时发生错误",
@@ -21015,8 +22236,14 @@
     "xpack.osquery.packDetailsPage.editQueryButtonLabel": "编辑",
     "xpack.osquery.packDetailsPage.kpis.policiesLabelText": "策略",
     "xpack.osquery.packList.addPackButtonLabel": "添加包",
+    "xpack.osquery.packList.integrationAssets.loadSuccessToastMessageText": "已成功加载预构建包",
+    "xpack.osquery.packList.integrationAssets.updateSuccessToastMessageText": "已成功更新预构建包",
     "xpack.osquery.packList.pageSubtitle": "创建包以组织查询集并为代理策略计划查询。",
     "xpack.osquery.packList.pageTitle": "包",
+    "xpack.osquery.packList.prePackagedPacks.emptyPromptTitle": "加载 Elastic 预构建包",
+    "xpack.osquery.packList.prePackagedPacks.emptyPromptTitle.emptyPromptMessage": "包是您可以计划的一组查询。加载预构建包或创建您自己的预构建包。",
+    "xpack.osquery.packList.prePackagedPacks.loadButtonLabel": "加载 Elastic 预构建包",
+    "xpack.osquery.packList.prePackagedPacks.updateButtonLabel": "更新 Elastic 预构建包",
     "xpack.osquery.packs.table.activeColumnTitle": "活动",
     "xpack.osquery.packs.table.createdByColumnTitle": "创建者",
     "xpack.osquery.packs.table.nameColumnTitle": "名称",
@@ -21260,6 +22487,8 @@
     "xpack.remoteClusters.updateRemoteCluster.unknownRemoteClusterErrorMessage": "无法编辑集群，ES 未返回任何响应。",
     "xpack.reporting.apiClient.unknownError": "报告作业 {job} 失败。错误未知。",
     "xpack.reporting.breadcrumb": "Reporting",
+    "xpack.reporting.common.browserCouldNotLaunchErrorMessage": "无法生成屏幕截图，因为浏览器未启动。",
+    "xpack.reporting.common.pdfWorkerOutOfMemoryErrorMessage": "由于内存不足，无法生成 PDF。考虑生成更小的 PDF，然后重试此报告。",
     "xpack.reporting.dashboard.csvDownloadStartedMessage": "您的 CSV 将很快下载。",
     "xpack.reporting.dashboard.csvDownloadStartedTitle": "CSV 下载已开始",
     "xpack.reporting.dashboard.downloadCsvPanelTitle": "下载 CSV",
@@ -21299,6 +22528,7 @@
     "xpack.reporting.errorHandler.unknownError": "未知错误",
     "xpack.reporting.exportTypes.common.failedToDecryptReportJobDataErrorMessage": "无法解密报告作业数据。请确保已设置 {encryptionKey}，然后重新生成此报告。{err}",
     "xpack.reporting.exportTypes.common.missingJobHeadersErrorMessage": "作业标头缺失",
+    "xpack.reporting.exportTypes.csv.generateCsv.authenticationExpired.partialResultsMessage": "此报告包含部分 CSV 结果，因为身份验证令牌已过期。导出更少量的数据，或增加身份验证令牌的超时时间。",
     "xpack.reporting.exportTypes.csv.generateCsv.escapedFormulaValues": "CSV 可能包含值已转义的公式",
     "xpack.reporting.jobCreatedBy.unknownUserPlaceholderText": "未知",
     "xpack.reporting.jobsQuery.deleteError": "无法删除报告：{error}",
@@ -21348,12 +22578,16 @@
     "xpack.reporting.listing.infoPanel.callout.warningsTitle": "报告包含警告",
     "xpack.reporting.listing.infoPanel.completedAtInfo": "完成时间",
     "xpack.reporting.listing.infoPanel.contentTypeInfo": "内容类型",
+    "xpack.reporting.listing.infoPanel.cpuInfo": "CPU 使用",
     "xpack.reporting.listing.infoPanel.createdAtInfo": "创建于",
+    "xpack.reporting.listing.infoPanel.csvRows": "CSV 行",
     "xpack.reporting.listing.infoPanel.dimensionsInfoHeight": "高（像素）",
     "xpack.reporting.listing.infoPanel.dimensionsInfoWidth": "宽（像素）",
     "xpack.reporting.listing.infoPanel.kibanaVersion": "Kibana 版本",
+    "xpack.reporting.listing.infoPanel.memoryInfo": "RAM 使用",
     "xpack.reporting.listing.infoPanel.notApplicableLabel": "不可用",
     "xpack.reporting.listing.infoPanel.outputSectionTitle": "输出",
+    "xpack.reporting.listing.infoPanel.pdfPagesInfo": "页面计数",
     "xpack.reporting.listing.infoPanel.processedByInfo": "处理者",
     "xpack.reporting.listing.infoPanel.sizeInfo": "大小（字节）",
     "xpack.reporting.listing.infoPanel.space": "Kibana 工作区",
@@ -21405,7 +22639,7 @@
     "xpack.reporting.panelContent.howToCallGenerationDescription": "或者，复制此 POST URL 以从 Kibana 外部或从 Watcher 调用生成。",
     "xpack.reporting.panelContent.notification.reportingErrorTitle": "无法创建报告",
     "xpack.reporting.panelContent.saveWorkDescription": "请在生成报告之前保存您的工作。",
-    "xpack.reporting.panelContent.successfullyQueuedReportNotificationDescription": "在 {path} 中跟踪其进度",
+    "xpack.reporting.panelContent.successfullyQueuedReportNotificationDescription": "在 {path} 中跟踪其进度。",
     "xpack.reporting.panelContent.successfullyQueuedReportNotificationTitle": "已为 {objectType} 排队报告",
     "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthDescription": "无法复制此 URL。",
     "xpack.reporting.panelContent.unsavedStateAndExceedsMaxLengthTitle": "URL 太长",
@@ -21426,9 +22660,10 @@
     "xpack.reporting.publicNotifier.maxSizeReached.partialReportDescription": "报告已达到最大大小，仅包含部分数据。",
     "xpack.reporting.publicNotifier.maxSizeReached.partialReportTitle": "已为“{reportObjectTitle}”创建部分 {reportType}",
     "xpack.reporting.publicNotifier.pollingErrorMessage": "报告通知器错误！",
-    "xpack.reporting.publicNotifier.reportLink.reportingSectionUrlLinkLabel": "“堆栈管理”>“告警和洞见”>“报告”",
+    "xpack.reporting.publicNotifier.reportLink.reportingSectionUrlLinkLabel": "堆栈管理 > 报告",
     "xpack.reporting.publicNotifier.reportLinkDescription": "立即下载，或者稍后在 {path} 中获取。",
     "xpack.reporting.publicNotifier.successfullyCreatedReportNotificationTitle": "为“{reportObjectTitle}”创建了 {reportType}",
+    "xpack.reporting.publicNotifier.warning.title": "{reportType} 已完成，但出现问题",
     "xpack.reporting.redirectApp.errorTitle": "重定向错误",
     "xpack.reporting.redirectApp.redirectConsoleErrorPrefixLabel": "重定向页面错误：",
     "xpack.reporting.registerFeature.reportingDescription": "管理您从 Discover、Visualize 和 Dashboard 生成的报告。",
@@ -21756,6 +22991,8 @@
     "xpack.savedObjectsTagging.validation.description.errorTooLong": "标签描述不能超过 {length} 个字符",
     "xpack.savedObjectsTagging.validation.name.errorTooLong": "标签名称不能超过 {length} 个字符",
     "xpack.savedObjectsTagging.validation.name.errorTooShort": "标签名称必须至少有 {length} 个字符",
+    "xpack.screenshotting.exportTypes.printablePdf.logoDescription": "由 Elastic 提供支持",
+    "xpack.screenshotting.exportTypes.printablePdf.pagingDescription": "第 {currentPage} 页，共 {pageCount} 页",
     "xpack.searchProfiler.advanceTimeDescription": "将迭代器推进至下一文档所用时间。",
     "xpack.searchProfiler.aggregationProfileTabTitle": "聚合配置文件",
     "xpack.searchProfiler.basicLicenseTitle": "基本级",
@@ -21764,6 +23001,8 @@
     "xpack.searchProfiler.editorElementLabel": "开发工具搜索分析器编辑器",
     "xpack.searchProfiler.emptyProfileTreeDescription": "输入查询，单击“剖析”，然后在此处查看结果。",
     "xpack.searchProfiler.emptyProfileTreeTitle": "没有要剖析的查询",
+    "xpack.searchProfiler.errorNoShardsDescription": "验证您的索引输入是否与有效索引相匹配",
+    "xpack.searchProfiler.errorNoShardsTitle": "无法剖析",
     "xpack.searchProfiler.errorSomethingWentWrongTitle": "出问题了",
     "xpack.searchProfiler.errorToastTitle": "JSON 解析错误",
     "xpack.searchProfiler.formIndexLabel": "索引",
@@ -22404,10 +23643,17 @@
     "xpack.securitySolution.alertDetails.overview": "概览",
     "xpack.securitySolution.alertDetails.overview.enrichedDataTitle": "扩充数据",
     "xpack.securitySolution.alertDetails.overview.highlightedFields": "突出显示的字段",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalence": "告警普及率",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.alertPrevalenceTooltip": "在当前选定的时间范围内具有相同值的告警的总计数。此值不受其他筛选影响。",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.field": "字段",
+    "xpack.securitySolution.alertDetails.overview.highlightedFields.value": "值",
     "xpack.securitySolution.alertDetails.overview.hostDataTooltipContent": "仅在其对主机可用时才会显示风险分类。确保在您的环境中启用了 {hostsRiskScoreDocumentationLink}。",
     "xpack.securitySolution.alertDetails.overview.hostRiskDataTitle": "主机风险数据",
     "xpack.securitySolution.alertDetails.overview.hostsRiskScoreLink": "主机风险分数",
     "xpack.securitySolution.alertDetails.overview.investigationGuide": "调查指南",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesCount": "{caseCount} 个{caseCount, plural, other {案例：}}",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesFailure": "无法加载相关案例：“{error}”",
+    "xpack.securitySolution.alertDetails.overview.relatedCasesFound": "发现此告警位于",
     "xpack.securitySolution.alertDetails.refresh": "刷新",
     "xpack.securitySolution.alertDetails.summary.readLess": "阅读更少内容",
     "xpack.securitySolution.alertDetails.summary.readMore": "阅读更多内容",
@@ -22438,6 +23684,8 @@
     "xpack.securitySolution.alertsView.categoryLabel": "类别",
     "xpack.securitySolution.alertsView.errorFetchingAlertsData": "无法查询告警数据",
     "xpack.securitySolution.alertsView.moduleLabel": "模块",
+    "xpack.securitySolution.alertsView.osqueryAlertTitle": "运行 Osquery",
+    "xpack.securitySolution.alertsView.osqueryBackToAlertDetails": "告警详情",
     "xpack.securitySolution.alertsView.showing": "正在显示",
     "xpack.securitySolution.alertsView.totalCountOfAlerts": "个外部告警",
     "xpack.securitySolution.alertsView.unit": "个外部{totalCount, plural, other {告警}}",
@@ -22462,6 +23710,7 @@
     "xpack.securitySolution.artifactCard.conditions.matchOperator.not": "不是",
     "xpack.securitySolution.artifactCard.conditions.nestedOperator": "具有",
     "xpack.securitySolution.artifactCard.conditions.os": "OS",
+    "xpack.securitySolution.artifactCard.conditions.wildcardMatchesOperator": "匹配",
     "xpack.securitySolution.artifactCard.conditions.windows": "Windows",
     "xpack.securitySolution.artifactCard.created": "创建时间",
     "xpack.securitySolution.artifactCard.createdBy": "创建者",
@@ -22476,6 +23725,35 @@
     "xpack.securitySolution.artifactCardGrid.nameColumn": "名称",
     "xpack.securitySolution.artifactExpandableCard.collpase": "折叠",
     "xpack.securitySolution.artifactExpandableCard.expand": "展开",
+    "xpack.securitySolution.artifactListPage.aboutInfo": "终端的项目列表",
+    "xpack.securitySolution.artifactListPage.addButtonTitle": "添加项目",
+    "xpack.securitySolution.artifactListPage.cardActionDeleteLabel": "删除事件筛选",
+    "xpack.securitySolution.artifactListPage.cardActionEditLabel": "编辑项目",
+    "xpack.securitySolution.artifactListPage.deleteActionFailure": "无法移除“{itemName}”。原因：{errorMessage}",
+    "xpack.securitySolution.artifactListPage.deleteActionSuccess": "已移除“{itemName}”",
+    "xpack.securitySolution.artifactListPage.deleteModalCancelButtonTitle": "取消",
+    "xpack.securitySolution.artifactListPage.deleteModalConfirmInfo": "此操作无法撤消。是否确定要继续？",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactInfo": "删除此条目会将其从 {count} 个关联{count, plural, other {策略}}中移除。",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactInfoAll": "全部",
+    "xpack.securitySolution.artifactListPage.deleteModalImpactTitle": "警告",
+    "xpack.securitySolution.artifactListPage.deleteModalSubmitButtonTitle": "删除",
+    "xpack.securitySolution.artifactListPage.deleteModalTitle": "删除 {itemName}",
+    "xpack.securitySolution.artifactListPage.emptyStateInfo": "添加项目",
+    "xpack.securitySolution.artifactListPage.emptyStatePrimaryButtonLabel": "添加",
+    "xpack.securitySolution.artifactListPage.emptyStateTitle": "添加您的首个项目",
+    "xpack.securitySolution.artifactListPage.expiredLicenseTitle": "已过期许可证",
+    "xpack.securitySolution.artifactListPage.flyoutCancelButtonLabel": "取消",
+    "xpack.securitySolution.artifactListPage.flyoutCreateSubmitButtonLabel": "添加",
+    "xpack.securitySolution.artifactListPage.flyoutCreateTitle": "创建项目",
+    "xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseDocsInfo": "有关更多信息，请参阅我们的文档。",
+    "xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseInfo": "您的 Kibana 许可证已降级。现在会将未来的策略配置全局分配给所有策略。",
+    "xpack.securitySolution.artifactListPage.flyoutEditItemLoadFailure": "无法检索项以供编辑。原因：{errorMessage}",
+    "xpack.securitySolution.artifactListPage.flyoutEditSubmitButtonLabel": "保存",
+    "xpack.securitySolution.artifactListPage.flyoutEditSubmitSuccess": "“{name}”已更新。",
+    "xpack.securitySolution.artifactListPage.flyoutEditTitle": "添加项目",
+    "xpack.securitySolution.artifactListPage.pageTitle": "项目",
+    "xpack.securitySolution.artifactListPage.searchPlaceholderInfo": "搜索下面的字段：name、description、comments、value",
+    "xpack.securitySolution.artifactListPage.showingTotal": "正在显示 {total, plural, other {# 个项目}}",
     "xpack.securitySolution.artifactMinifiedCard.descriptionLabel": "描述",
     "xpack.securitySolution.auditd.abortedAuditStartupDescription": "已中止审计启动",
     "xpack.securitySolution.auditd.accessErrorDescription": "访问错误",
@@ -22615,8 +23893,25 @@
     "xpack.securitySolution.authenticationsTable.user": "用户",
     "xpack.securitySolution.authz.mlUnavailable": "Machine Learning 插件不可用。请尝试启用插件。",
     "xpack.securitySolution.authz.userIsNotMlAdminMessage": "当前用户不是 Machine Learning 管理员。",
+    "xpack.securitySolution.badge.readOnly.text": "只读",
     "xpack.securitySolution.beatFields.errorSearchDescription": "获取 Beat 字段时发生错误",
     "xpack.securitySolution.beatFields.failSearchDescription": "无法对 Beat 字段执行搜索",
+    "xpack.securitySolution.blocklist.cardActionDeleteLabel": "删除阻止列表",
+    "xpack.securitySolution.blocklist.cardActionEditLabel": "编辑阻止列表",
+    "xpack.securitySolution.blocklist.deleteSuccess": "已从阻止列表中移除“{itemName}”。",
+    "xpack.securitySolution.blocklist.emptyStateInfo": "添加要防止在终端上执行的阻止列表",
+    "xpack.securitySolution.blocklist.emptyStatePrimaryButtonLabel": "添加阻止列表",
+    "xpack.securitySolution.blocklist.emptyStateTitle": "添加您的首个阻止列表",
+    "xpack.securitySolution.blocklist.flyoutCreateSubmitButtonLabel": "添加阻止列表",
+    "xpack.securitySolution.blocklist.flyoutCreateSubmitSuccess": "“{name}”已添加到您的阻止列表。",
+    "xpack.securitySolution.blocklist.flyoutCreateTitle": "添加阻止列表",
+    "xpack.securitySolution.blocklist.flyoutEditSubmitSuccess": "“{name}”已更新。",
+    "xpack.securitySolution.blocklist.flyoutEditTitle": "编辑阻止列表",
+    "xpack.securitySolution.blocklist.pageAboutInfo": "阻止列表通过扩充终端视为恶意的进程列表，防止在您的主机上运行选定应用程序。",
+    "xpack.securitySolution.blocklist.pageAddButtonTitle": "添加阻止列表条目",
+    "xpack.securitySolution.blocklist.pageTitle": "阻止列表",
+    "xpack.securitySolution.blocklist.searchPlaceholderInfo": "搜索下面的字段：name、description、value",
+    "xpack.securitySolution.blocklist.showingTotal": "正在显示 {total} 个{total, plural, other {阻止列表条目}}",
     "xpack.securitySolution.callouts.dismissButton": "关闭",
     "xpack.securitySolution.cases.caseTable.caseDetailsLinkAria": "单击以访问标题为 {detailName} 的案例",
     "xpack.securitySolution.cases.caseView.breadcrumb": "创建",
@@ -22705,6 +24000,26 @@
     "xpack.securitySolution.components.mlPopup.upgradeDescription": "要访问 SIEM 的异常检测功能，必须将您的许可证更新到白金级、开始 30 天免费试用或在 AWS、GCP 或 Azure 中实施{cloudLink}。然后便可以运行 Machine Learning 作业并查看异常。",
     "xpack.securitySolution.components.mlPopup.upgradeTitle": "升级到 Elastic 白金级",
     "xpack.securitySolution.components.stepDefineRule.ruleTypeField.subscriptionsLink": "白金级订阅",
+    "xpack.securitySolution.console.builtInCommands.clearAbout": "清除控制台缓冲区",
+    "xpack.securitySolution.console.builtInCommands.helpAbout": "查看可用命令列表",
+    "xpack.securitySolution.console.commandList.footerText": "有关上述命令的更多详情，请使用 {helpOption} 参数。示例：{cmdExample}",
+    "xpack.securitySolution.console.commandOutput.runInBackgroundButtonLabel": "在后台运行",
+    "xpack.securitySolution.console.commandOutput.runInBackgroundMsg": "命令响应花费的时间略长。单击此处以在后台运行，并在收到响应时发送通知",
+    "xpack.securitySolution.console.commandUsage.atLeastOneOptionRequiredMessage": "注意：必须至少使用一个选项",
+    "xpack.securitySolution.console.commandUsage.inputUsage": "用法：",
+    "xpack.securitySolution.console.commandUsage.optionsLabel": "选项：",
+    "xpack.securitySolution.console.commandValidation.argSupportedOnlyOnce": "参数只能使用一次：{argName}",
+    "xpack.securitySolution.console.commandValidation.cmdHelpTitle": "{cmdName} 命令",
+    "xpack.securitySolution.console.commandValidation.invalidArgValue": "无效的参数值：{argName}。{error}",
+    "xpack.securitySolution.console.commandValidation.missingRequiredArg": "缺少所需参数：{argName}",
+    "xpack.securitySolution.console.commandValidation.mustHaveArgs": "缺少所需参数：{requiredArgs}",
+    "xpack.securitySolution.console.commandValidation.noArgumentsSupported": "命令不支持任何参数",
+    "xpack.securitySolution.console.commandValidation.oneArgIsRequired": "必须至少使用一个参数",
+    "xpack.securitySolution.console.commandValidation.unknownArgument": "未知参数：{unknownArgs}",
+    "xpack.securitySolution.console.commandValidation.unsupportedArg": "不支持的参数：{argName}",
+    "xpack.securitySolution.console.unknownCommand.helpMessage": "如需可用命令列表，请输入：{helpCmd}",
+    "xpack.securitySolution.console.unknownCommand.title": "未知命令",
+    "xpack.securitySolution.consolesPopoverHeaderItem.buttonLabel": "终端控制台",
     "xpack.securitySolution.containers.anomalies.errorFetchingAnomaliesData": "无法查询异常数据",
     "xpack.securitySolution.containers.anomalies.stackByJobId": "作业",
     "xpack.securitySolution.containers.anomalies.title": "异常",
@@ -22721,6 +24036,7 @@
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedRuleSuccesDescription": "已安装 Elastic 的预打包规则",
     "xpack.securitySolution.containers.detectionEngine.createPrePackagedTimelineSuccesDescription": "安装 Elastic 预先打包的时间线模板",
     "xpack.securitySolution.containers.detectionEngine.ruleExecutionEventsFetchFailDescription": "无法提取规则执行事件",
+    "xpack.securitySolution.containers.detectionEngine.ruleExecutionLogFailureDescription": "无法提取规则执行事件",
     "xpack.securitySolution.containers.detectionEngine.rulesAndTimelines": "无法提取规则和时间线",
     "xpack.securitySolution.containers.detectionEngine.tagFetchFailDescription": "无法提取标签",
     "xpack.securitySolution.containers.errors.stopJobFailureTitle": "停止作业失败",
@@ -22771,6 +24087,8 @@
     "xpack.securitySolution.detectionEngine.alerts.actions.addEndpointException": "添加终端例外",
     "xpack.securitySolution.detectionEngine.alerts.actions.addEventFilter": "添加终端事件筛选",
     "xpack.securitySolution.detectionEngine.alerts.actions.addException": "添加规则例外",
+    "xpack.securitySolution.detectionEngine.alerts.actions.addToCase": "添加到现有案例",
+    "xpack.securitySolution.detectionEngine.alerts.actions.addToNewCase": "添加到新案例",
     "xpack.securitySolution.detectionEngine.alerts.actions.closeAlertTitle": "关闭告警",
     "xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineAriaLabel": "将告警发送到时间线",
     "xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineTitle": "在时间线中调查",
@@ -22781,7 +24099,10 @@
     "xpack.securitySolution.detectionEngine.alerts.closedAlertSuccessToastMessage": "已成功关闭 {totalAlerts} 个{totalAlerts, plural, other {告警}}。",
     "xpack.securitySolution.detectionEngine.alerts.count.countTableColumnTitle": "计数",
     "xpack.securitySolution.detectionEngine.alerts.count.countTableTitle": "计数",
+    "xpack.securitySolution.detectionEngine.alerts.createThresholdTimelineFailure": "无法创建文档 _id 的时间线：{id}",
+    "xpack.securitySolution.detectionEngine.alerts.createThresholdTimelineFailureTitle": "无法创建阈值告警时间线",
     "xpack.securitySolution.detectionEngine.alerts.documentTypeTitle": "告警",
+    "xpack.securitySolution.detectionEngine.alerts.fetchExceptionsFailure": "提取例外时出错。",
     "xpack.securitySolution.detectionEngine.alerts.histogram.allOthersGroupingLabel": "所有其他",
     "xpack.securitySolution.detectionEngine.alerts.histogram.headerTitle": "趋势",
     "xpack.securitySolution.detectionEngine.alerts.histogram.showingAlertsTitle": "正在显示：{modifier}{totalAlertsFormatted} 个{totalAlerts, plural, other {告警}}",
@@ -22820,7 +24141,7 @@
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsComboboxLabel": "为选定规则添加索引模式",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsOverwriteCheckboxLabel": "覆盖所有选定规则索引模式",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addIndexPatternsTitle": "添加索引模式",
-    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxHelpText": "为选定规则添加一个或多个定制识别标签。在每个标签后按 Enter 键可开始新的标签。",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxHelpText": "从下拉列表中为选定规则添加一个或多个标签。您还可以输入定制识别标签，然后按 Enter 键以开始新标签。",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsComboboxLabel": "为选定规则添加标签",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsOverwriteCheckboxLabel": "覆盖所有选定规则标签",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.addTagsTitle": "添加标签",
@@ -22828,7 +24149,7 @@
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsComboboxHelpText": "从下拉列表中删除 Elasticsearch 索引的默认索引模式。您可以添加定制索引模式，然后按 Enter 键以开始新索引。",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsComboboxLabel": "删除选定规则的索引模式",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteIndexPatternsTitle": "删除索引模式",
-    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxHelpText": "删除选定规则的一个或多个定制识别标签。在每个标签后按 Enter 键可开始新的标签。",
+    "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxHelpText": "从下拉列表中删除选定规则的一个或多个标签。您还可以输入定制识别标签，然后按 Enter 键以开始新标签。",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsComboboxLabel": "删除选定规则的标签",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.deleteTagsTitle": "删除标签",
     "xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.indexPatternsRequiredErrorMessage": "至少需要一种索引模式。",
@@ -22928,8 +24249,8 @@
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.indicesHelperDescription": "输入要运行此规则的 Elasticsearch 索引的模式。默认情况下，将包括 Security Solution 高级设置中定义的索引模式。",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.machineLearningJobIdHelpText": "我们提供了一些常见作业来帮助您入门。要添加自己的定制作业，请在 {machineLearning} 应用程序中将一个“security”组分配给这些作业，以使它们显示在此处。",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.machineLearningJobIdRequired": "Machine Learning 作业必填。",
-    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobMulti": "选定的 ML 作业 {jobNames} 当前未运行。在激活此规则之前请通过“ML 作业设置”将所有这些作业设置为运行。",
-    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobSingle": "选定的 ML 作业 {jobName} 当前未运行。在激活此规则之前请通过“ML 作业设置”将 {jobName} 设置为运行。",
+    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobMulti": "选定的 ML 作业 {jobNames} 当前未运行。在启用此规则之前请通过“ML 作业设置”将所有这些作业设置为运行。",
+    "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlEnableJobSingle": "选定的 ML 作业 {jobName} 当前未运行。在启用此规则之前请通过“ML 作业设置”将 {jobName} 设置为运行。",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.mlJobSelectPlaceholderText": "选择作业",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.outputIndiceNameFieldRequiredError": "至少需要一种索引模式。",
     "xpack.securitySolution.detectionEngine.createRule.stepDefineRule.referencesUrlInvalidError": "URL 的格式无效",
@@ -22955,6 +24276,8 @@
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.invalidMustacheTemplateErrorMessage": "{key} 不是有效的 Mustache 模板",
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.noConnectorSelectedErrorMessage": "未选择任何连接器",
     "xpack.securitySolution.detectionEngine.createRule.stepRuleActions.noReadActionsPrivileges": "无法创建规则操作。您对“操作”插件没有“读”权限。",
+    "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.completeWithEnablingTitle": "创建并启用规则",
+    "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.completeWithoutEnablingTitle": "创建规则但不启用",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackHelpText": "增加回查时段的时间以防止错过告警。",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackLabel": "更多回查时间",
     "xpack.securitySolution.detectionEngine.createRule.stepScheduleRule.fieldIntervalHelpText": "规则定期运行并检测指定时间范围内的告警。",
@@ -23060,6 +24383,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cloudGroupsT1069Description": "Cloud Groups (T1069.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cloudInstanceMetadataApiT1552Description": "Cloud Instance Metadata API (T1552.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.cmstpT1218Description": "CMSTP (T1218.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeRepositoriesT1213Description": "Code Repositories (T1213.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningCertificatesT1587Description": "Code Signing Certificates (T1587.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningCertificatesT1588Description": "Code Signing Certificates (T1588.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.codeSigningPolicyModificationT1553Description": "Code Signing Policy Modification (T1553.006)",
@@ -23124,6 +24448,8 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainsT1583Description": "Domains (T1583.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainsT1584Description": "Domains (T1584.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.domainTrustModificationT1484Description": "Domain Trust Modification (T1484.002)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.doubleFileExtensionT1036Description": "Double File Extension (T1036.007)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.downgradeAttackT1562Description": "Downgrade Attack (T1562.010)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.downgradeSystemImageT1601Description": "Downgrade System Image (T1601.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.driveByTargetT1608Description": "Drive-by Target (T1608.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.dylibHijackingT1574Description": "Dylib Hijacking (T1574.004)",
@@ -23136,6 +24462,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailAccountT1087Description": "Email Account (T1087.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailAddressesT1589Description": "Email Addresses (T1589.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailForwardingRuleT1114Description": "Email Forwarding Rule (T1114.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emailHidingRulesT1564Description": "Email Hiding Rules (T1564.008)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.emondT1546Description": "Emond (T1546.014)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.employeeNamesT1589Description": "Employee Names (T1589.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.environmentalKeyingT1480Description": "Environmental Keying (T1480.001)",
@@ -23168,8 +24495,10 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenFileSystemT1564Description": "Hidden File System (T1564.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenUsersT1564Description": "Hidden Users (T1564.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.hiddenWindowT1564Description": "Hidden Window (T1564.003)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.htmlSmugglingT1027Description": "HTML Smuggling (T1027.006)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.identifyBusinessTempoT1591Description": "Identify Business Tempo (T1591.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.identifyRolesT1591Description": "Identify Roles (T1591.004)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.iisComponentsT1505Description": "IIS Components (T1505.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.imageFileExecutionOptionsInjectionT1546Description": "Image File Execution Options Injection (T1546.012)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.impairCommandHistoryLoggingT1562Description": "Impair Command History Logging (T1562.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.indicatorBlockingT1562Description": "Indicator Blocking (T1562.006)",
@@ -23202,6 +24531,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localDataStagingT1074Description": "Local Data Staging (T1074.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localEmailCollectionT1114Description": "Local Email Collection (T1114.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.localGroupsT1069Description": "Local Groups (T1069.001)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.loginItemsT1547Description": "Login Items (T1547.015)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.logonScriptMacT1037Description": "Logon Script (Mac) (T1037.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.logonScriptWindowsT1037Description": "Logon Script (Windows) (T1037.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.lsaSecretsT1003Description": "LSA Secrets (T1003.004)",
@@ -23217,6 +24547,8 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.markOfTheWebBypassT1553Description": "Mark-of-the-Web Bypass (T1553.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.masqueradeTaskOrServiceT1036Description": "Masquerade Task or Service (T1036.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.matchLegitimateNameOrLocationT1036Description": "Match Legitimate Name or Location (T1036.005)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mavinjectT1218Description": "Mavinject (T1218.013)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mmcT1218Description": "MMC (T1218.014)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.msBuildT1127Description": "MSBuild (T1127.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.mshtaT1218Description": "Mshta (T1218.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.msiexecT1218Description": "Msiexec (T1218.007)",
@@ -23284,12 +24616,14 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.remoteEmailCollectionT1114Description": "Remote Email Collection (T1114.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.renameSystemUtilitiesT1036Description": "Rename System Utilities (T1036.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.reOpenedApplicationsT1547Description": "Re-opened Applications (T1547.007)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.resourceForkingT1564Description": "Resource Forking (T1564.009)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.revertCloudInstanceT1578Description": "Revert Cloud Instance (T1578.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rightToLeftOverrideT1036Description": "Right-to-Left Override (T1036.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rommoNkitT1542Description": "ROMMONkit (T1542.004)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.rundll32T1218Description": "Rundll32 (T1218.011)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.runtimeDataManipulationT1565Description": "Runtime Data Manipulation (T1565.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.runVirtualInstanceT1564Description": "Run Virtual Instance (T1564.006)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.safeModeBootT1562Description": "Safe Mode Boot (T1562.009)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.samlTokensT1606Description": "SAML Tokens (T1606.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.scanDatabasesT1596Description": "Scan Databases (T1596.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.scanningIpBlocksT1595Description": "Scanning IP Blocks (T1595.001)",
@@ -23341,6 +24675,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemdServiceT1543Description": "Systemd Service (T1543.002)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemdTimersT1053Description": "Systemd Timers (T1053.006)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemFirmwareT1542Description": "System Firmware (T1542.001)",
+    "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.systemLanguageDiscoveryT1614Description": "System Language Discovery (T1614.001)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.tftpBootT1542Description": "TFTP Boot (T1542.005)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.threadExecutionHijackingT1055Description": "Thread Execution Hijacking (T1055.003)",
     "xpack.securitySolution.detectionEngine.mitreAttackSubtechniques.threadLocalStorageT1055Description": "Thread Local Storage (T1055.005)",
@@ -23405,6 +24740,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.accountManipulationDescription": "Account Manipulation (T1098)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.acquireInfrastructureDescription": "Acquire Infrastructure (T1583)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.activeScanningDescription": "Active Scanning (T1595)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.adversaryInTheMiddleDescription": "Adversary-in-the-Middle (T1557)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.applicationLayerProtocolDescription": "Application Layer Protocol (T1071)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.applicationWindowDiscoveryDescription": "Application Window Discovery (T1010)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.archiveCollectedDataDescription": "Archive Collected Data (T1560)",
@@ -23416,12 +24752,14 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.bootOrLogonInitializationScriptsDescription": "Boot or Logon Initialization Scripts (T1037)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserBookmarkDiscoveryDescription": "Browser Bookmark Discovery (T1217)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserExtensionsDescription": "Browser Extensions (T1176)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.browserSessionHijackingDescription": "Browser Session Hijacking (T1185)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.bruteForceDescription": "Brute Force (T1110)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.buildImageOnHostDescription": "Build Image on Host (T1612)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.clipboardDataDescription": "Clipboard Data (T1115)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudInfrastructureDiscoveryDescription": "Cloud Infrastructure Discovery (T1580)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudServiceDashboardDescription": "Cloud Service Dashboard (T1538)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudServiceDiscoveryDescription": "Cloud Service Discovery (T1526)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.cloudStorageObjectDiscoveryDescription": "Cloud Storage Object Discovery (T1619)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.commandAndScriptingInterpreterDescription": "Command and Scripting Interpreter (T1059)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.commonlyUsedPortDescription": "Commonly Used Port (T1043)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.communicationThroughRemovableMediaDescription": "Communication Through Removable Media (T1092)",
@@ -23487,6 +24825,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.gatherVictimNetworkInformationDescription": "Gather Victim Network Information (T1590)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.gatherVictimOrgInformationDescription": "Gather Victim Org Information (T1591)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.graphicalUserInterfaceDescription": "Graphical User Interface (T1061)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.groupPolicyDiscoveryDescription": "Group Policy Discovery (T1615)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hardwareAdditionsDescription": "Hardware Additions (T1200)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hideArtifactsDescription": "Hide Artifacts (T1564)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.hijackExecutionFlowDescription": "Hijack Execution Flow (T1574)",
@@ -23534,6 +24873,7 @@
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.proxyDescription": "Proxy (T1090)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.queryRegistryDescription": "Query Registry (T1012)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.redundantAccessDescription": "Redundant Access (T1108)",
+    "xpack.securitySolution.detectionEngine.mitreAttackTechniques.reflectiveCodeLoadingDescription": "Reflective Code Loading (T1620)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteAccessSoftwareDescription": "Remote Access Software (T1219)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteServicesDescription": "Remote Services (T1021)",
     "xpack.securitySolution.detectionEngine.mitreAttackTechniques.remoteServiceSessionHijackingDescription": "Remote Service Session Hijacking (T1563)",
@@ -23611,6 +24951,7 @@
     "xpack.securitySolution.detectionEngine.noPermissionsTitle": "需要权限",
     "xpack.securitySolution.detectionEngine.pageTitle": "检测引擎",
     "xpack.securitySolution.detectionEngine.panelSubtitleShowing": "正在显示",
+    "xpack.securitySolution.detectionEngine.queryPreview.actions": "操作",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphCountLabel": "计数",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphPreviewError": "提取预览时出错",
     "xpack.securitySolution.detectionEngine.queryPreview.queryGraphPreviewInspectTitle": "查询预览",
@@ -23624,8 +24965,9 @@
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewLabel": "快速查询预览",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllErrors": "查看所有错误",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllWarnings": "查看所有警告",
-    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading": "...正在加载",
     "xpack.securitySolution.detectionEngine.queryPreview.queryThresholdGraphCountLabel": "累计阈值计数",
+    "xpack.securitySolution.detectionEngine.queryPreview.viewDetailsAriaLabel": "查看详情",
+    "xpack.securitySolution.detectionEngine.queryPreview.viewDetailsForRowAriaLabel": "查看第 {ariaRowindex} 行的告警或事件的详细信息，其中列为 {columnValues}",
     "xpack.securitySolution.detectionEngine.rule.editRule.errorMsgDescription": "您在{countError, plural, other {以下选项卡}}中的输入无效：{tabHasError}",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStartedDescription": "已启动",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStoppedDescription": "已停止",
@@ -23633,10 +24975,37 @@
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAllDescription": "所有结果",
     "xpack.securitySolution.detectionEngine.ruleDetails.backToRulesButton": "规则",
     "xpack.securitySolution.detectionEngine.ruleDetails.deletedRule": "已删除规则",
+    "xpack.securitySolution.detectionEngine.ruleDetails.enableRuleLabel": "启用",
     "xpack.securitySolution.detectionEngine.ruleDetails.exceptionsTab": "例外",
     "xpack.securitySolution.detectionEngine.ruleDetails.experimentalDescription": "技术预览",
     "xpack.securitySolution.detectionEngine.ruleDetails.pageTitle": "规则详情",
     "xpack.securitySolution.detectionEngine.ruleDetails.ruleCreationDescription": "由 {by} 于 {date}创建",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionFieldNotFoundErrorDescription": "在告警索引中找不到字段“kibana.alert.rule.execution.uuid”。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionFieldNotFoundErrorTitle": "无法筛选告警",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionsColumn": "操作",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.actionsColumnTooltip": "按规则执行 ID 筛选告警。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.durationColumn": "持续时间",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.durationColumnTooltip": "运行规则所需的时间长度 (hh:mm:ss:SSS)。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapDurationColumn": "缺口持续时间",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapDurationColumnTooltip": "规则执行中缺口的持续时间 (hh:mm:ss:SSS)。调整规则回查或{seeDocs}以缩小缺口。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.gapTooltipSeeDocsDescription": "参阅文档",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.indexDurationColumn": "索引持续时间",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.indexDurationColumnTooltip": "索引检测到的告警所需的时间长度 (hh:mm:ss:SSS)。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.messageColumn": "消息",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.messageColumnTooltip": "执行结果中的相关消息。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.schedulingDelayColumn": "正在计划延迟",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.schedulingDelayColumnTooltip": "从计划规则到执行规则的时间长度 (hh:mm:ss:SSS)。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchDurationColumn": "搜索持续时间",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchDurationColumnTooltip": "搜索告警所需的时间长度 (hh:mm:ss:SSS)。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchLimitExceededLabel": "超过 {totalItems} 个规则执行与提供的筛选相匹配。正在按最近的“@timestamp”显示前 {maxItems} 项。进一步限制筛选以查看其他执行事件。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.searchPlaceholder": "持续时间 > 100 且缺口持续时间 > 10",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.showMetricColumnsSwitchTitle": "显示指标列",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.statusColumn": "状态",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.statusColumnTooltip": "执行的总体状态。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.timestampColumn": "时间戳",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.timestampColumnTooltip": "已发起日期时间规则执行。",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLog.totalExecutionsLabel": "正在显示 {totalItems} 个{totalItems, plural, other {规则执行}}",
+    "xpack.securitySolution.detectionEngine.ruleDetails.ruleExecutionLogsTab": "规则执行日志 ",
     "xpack.securitySolution.detectionEngine.ruleDetails.ruleUpdateDescription": "由 {by} 于 {date}更新",
     "xpack.securitySolution.detectionEngine.ruleDetails.statusFailedDescription": "失败",
     "xpack.securitySolution.detectionEngine.ruleDetails.unknownDescription": "未知",
@@ -23661,7 +25030,6 @@
     "xpack.securitySolution.detectionEngine.rules.allExceptions.tableTitle": "例外列表",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.deleteRuleDescription": "删除规则",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.duplicateRuleDescription": "复制规则",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastTitle": "复制规则时出错",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.duplicateTitle": "复制",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.editRuleSettingsDescription": "编辑规则设置",
     "xpack.securitySolution.detectionEngine.rules.allRules.actions.editRuleSettingsToolTip": "您没有 Kibana 操作权限",
@@ -23669,24 +25037,51 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.activeRuleDescription": "活动",
     "xpack.securitySolution.detectionEngine.rules.allRules.batchActions.deleteSelectedImmutableTitle": "选择内容包含无法删除的不可变规则",
     "xpack.securitySolution.detectionEngine.rules.allRules.batchActionsTitle": "批处理操作",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkAction.enable.successToastDescription": "已成功启用 {totalRules, plural, other {{totalRules} 个规则}}",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.addIndexPatternsTitle": "添加索引模式",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.addTagsTitle": "添加标签",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.applyTimelineTemplateTitle": "应用时间线模板",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationDescription": "将仅对您选定的 {customRulesCount, plural, other {# 个定制规则}}应用更新操作。",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditConfirmationTitle": "无法编辑 {elasticRulesCount, plural, other {# 个 Elastic 规则}}",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastDescription": "无法更新 {rulesCount, plural, other {# 个规则}}。",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditRejectionDescription": "无法修改 Elastic 规则。将仅对定制规则应用更新操作。",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastDescription": "您已成功更新 {rulesCount, plural, other {# 个规则}}。",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastTitle": "规则更改已更新",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastDescription": "{rulesCount, plural, other {# 个规则}}正在更新。",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastNotifyButtonLabel": "在完成时通知我",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastTitle": "正在进行规则更新",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.contextMenuTitle": "选项",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.errorToastDescription": "无法删除 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.errorToastTitle": "删除规则时出错",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.successToastDescription": "已成功删除 {totalRules, plural, other {{totalRules} 个规则}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.delete.successToastTitle": "规则已删除",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteIndexPatternsTitle": "删除索引模式",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteTagsTitle": "删除标签",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.deleteTitle": "删除",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.errorToastDescription": "无法禁用 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.errorToastTitle": "禁用规则时出错",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.successToastDescription": "已成功禁用 {totalRules, plural, other {{totalRules} 个规则}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disable.successToastTitle": "规则已禁用",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.disableTitle": "禁用",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastDescription": "无法复制 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.errorToastTitle": "复制规则时出错",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastDescription": "已成功复制 {totalRules, plural, other {{totalRules} 个规则}}",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastTitle": "规则已复制",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicateTitle": "复制",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.formTitle": "应用时间线模板",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorDefaultValue": "无",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorHelpText": "选择在调查所生成的告警时要应用于选定规则的时间线。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorLabel": "将时间线模板应用于选定规则",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.warningCalloutMessage": "您即将将更改应用于 {rulesCount, plural, other {# 个选定规则}}。如果已将任何模板应用于这些规则，则会将其覆盖或重置为无（如果您选择了“无”）。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastDescription": "无法更新 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.errorToastTitle": "更新规则时出错",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastDescription": "您已成功更新 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.successToastTitle": "规则已更新",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.errorToastDescription": "无法启用 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.errorToastTitle": "启用规则时出错",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enable.successToastTitle": "规则已启用",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.enableTitle": "启用",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.errorToastDescription": "无法导出 {rulesCount, plural, other {# 个规则}}。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.errorToastTitle": "导出规则时出错",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastDescription": "已成功导出 {exportedRules}/{totalRules} 个{totalRules, plural, other {规则}}。预置规则已从结果文件中排除。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastTitle": "规则已导出",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.exportTitle": "导出",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.indexPatternsTitle": "索引模式",
     "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.tagsTitle": "标签",
@@ -23694,6 +25089,7 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.enabledTitle": "已启用",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gap": "上一缺口（如果有）",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gapTooltip": "规则执行中最近缺口的持续时间。调整规则回查或{seeDocs}以缩小缺口。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.columns.gapTooltipSeeDocsDescription": "参阅文档",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimes": "索引时间 (ms)",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimesTooltip": "上次规则执行期间索引告警花费的总时间",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastResponseTitle": "上次响应",
@@ -23708,6 +25104,11 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.tagsTitle": "标签",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.versionTitle": "版本",
     "xpack.securitySolution.detectionEngine.rules.allRules.exportFilenameTitle": "rules_export",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.nextStepLabel": "前往下一步",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.previousStepLabel": "前往上一步",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.searchCapabilitiesDescription": "现在可以按搜索模式（如“filebeat-*”） 或者 MITRE ATT&amp;CK™ 策略或技术（如“Defense Evasion”或“TA0005”）搜索规则。",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.searchCapabilitiesTitle": "已增强搜索功能",
+    "xpack.securitySolution.detectionEngine.rules.allRules.featureTour.tourTitle": "最新动态",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.customRulesTitle": "定制规则",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.elasticRulesTitle": "Elastic 规则",
     "xpack.securitySolution.detectionEngine.rules.allRules.filters.noRulesBodyTitle": "使用上述筛选，我们无法找到任何规则。",
@@ -23717,12 +25118,11 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.inactiveRuleDescription": "非活动",
     "xpack.securitySolution.detectionEngine.rules.allRules.refreshTitle": "刷新",
     "xpack.securitySolution.detectionEngine.rules.allRules.searchAriaLabel": "搜索规则",
+    "xpack.securitySolution.detectionEngine.rules.allRules.searchPlaceholder": "规则名称、搜索模式（如“filebeat-*”） 或者 MITRE ATT&amp;CK™ 策略或技术（如“Defense Evasion”或“TA0005”）",
     "xpack.securitySolution.detectionEngine.rules.allRules.selectAllRulesTitle": "选择所有 {totalRules} 个{totalRules, plural, other {规则}}",
     "xpack.securitySolution.detectionEngine.rules.allRules.selectedRulesTitle": "已选择 {selectedRules} 个{selectedRules, plural, other {规则}}",
     "xpack.securitySolution.detectionEngine.rules.allRules.showingExceptionLists": "正在显示 {totalLists} 个{totalLists, plural, other {列表}}",
     "xpack.securitySolution.detectionEngine.rules.allRules.showingRulesTitle": "正在显示 {totalRules} 个{totalRules, plural, other {规则}}",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.duplicate.successToastDescription": "已成功复制 {totalRules, plural, other {{totalRules} 个规则}}",
-    "xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.export.successToastDescription": "已成功导出 {exportedRules}/{totalRules} 个{totalRules, plural, other {规则}}。预置规则已从结果文件中排除。",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.exceptions": "例外列表",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.monitoring": "规则监测",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.rules": "规则",
@@ -23745,7 +25145,7 @@
     "xpack.securitySolution.detectionEngine.rules.pageTitle": "规则",
     "xpack.securitySolution.detectionEngine.rules.popoverTooltip.ariaLabel": "列的工具提示：{columnName}",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.createOwnRuletButton": "创建自己的规则",
-    "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptMessage": "Elastic Security 附带预置检测规则，这些规则在后台运行，并在条件得到满足时创建告警。默认情况下，除 Endpoint Security 规则外，所有预置规则都处于禁用状态。您可以选择其他要激活的规则。",
+    "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptMessage": "Elastic Security 附带预置检测规则，这些规则在后台运行，并在条件得到满足时创建告警。默认情况下，除 Endpoint Security 规则外，所有预置规则都处于禁用状态。您可以选择其他要启用的规则。",
     "xpack.securitySolution.detectionEngine.rules.prePackagedRules.emptyPromptTitle": "加载 Elastic 预构建检测规则",
     "xpack.securitySolution.detectionEngine.rules.refreshRulePopoverDescription": "自动刷新表格",
     "xpack.securitySolution.detectionEngine.rules.refreshRulePopoverLabel": "刷新设置",
@@ -23784,7 +25184,12 @@
     "xpack.securitySolution.detectionEngine.validations.thresholdCardinalityValueFieldData.numberGreaterThanOrEqualOneErrorMessage": "值必须大于或等于 1。",
     "xpack.securitySolution.detectionEngine.validations.thresholdFieldFieldData.arrayLengthGreaterThanMaxErrorMessage": "字段数目不得超过 3 个。",
     "xpack.securitySolution.detectionEngine.validations.thresholdValueFieldData.numberGreaterThanOrEqualOneErrorMessage": "值必须大于或等于 1。",
+    "xpack.securitySolution.detectionResponse.pageTitle": "检测和响应 - SOC",
+    "xpack.securitySolution.detectionResponse.updated": "已更新",
+    "xpack.securitySolution.detectionResponse.updating": "正在更新......",
     "xpack.securitySolution.detections.alerts.agentStatus": "代理状态",
+    "xpack.securitySolution.detections.alerts.ruleType": "规则类型",
+    "xpack.securitySolution.detections.alerts.sourceEventId": "源事件 ID",
     "xpack.securitySolution.detections.hostIsolation.impactedCases": "此操作将添加到 {cases}。",
     "xpack.securitySolution.documentationLinks.ariaLabelEnding": "单击以在新选项卡中打开文档",
     "xpack.securitySolution.documentationLinks.detectionsRequirements.text": "检测先决条件和要求",
@@ -23823,6 +25228,7 @@
     "xpack.securitySolution.endpoint.actions.hostDetails": "查看主机详情",
     "xpack.securitySolution.endpoint.actions.isolateHost": "隔离主机",
     "xpack.securitySolution.endpoint.actions.unIsolateHost": "释放主机",
+    "xpack.securitySolution.endpoint.blocklists.fleetIntegration.title": "阻止列表",
     "xpack.securitySolution.endpoint.details.agentStatus": "代理状态",
     "xpack.securitySolution.endpoint.details.endpointVersion": "终端版本",
     "xpack.securitySolution.endpoint.details.errorBody": "请退出浮出控件并选择可用主机。",
@@ -23877,11 +25283,30 @@
     "xpack.securitySolution.endpoint.effectedPolicySelect.global": "全局",
     "xpack.securitySolution.endpoint.effectedPolicySelect.perPolicy": "按策略",
     "xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title": "事件筛选",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.artifactsSummaryError": "尝试提取项目统计时出错：“{error}”",
     "xpack.securitySolution.endpoint.fleetCustomExtension.backButtonLabel": "返回到 Endpoint Security 集成",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error": "尝试提取阻止列表统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error": "尝试提取事件筛选统计时出错：“{error}”",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.linux": "Linux",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.macos": "Mac",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.total": "合计",
     "xpack.securitySolution.endpoint.fleetCustomExtension.exceptionItemsSummary.windows": "Windows",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error": "尝试提取主机隔离例外统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.manageArtifactsLinkLabel": "管理",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.title": "项目",
+    "xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error": "尝试提取受信任应用统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifacts.backButtonLabel": "返回到 Fleet 集成策略",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifactsManageLabel": "管理项目",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.artifactsSummary.error": "尝试提取项目统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.blocklistsManageLabel": "管理阻止列表",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.blocklistsSummary.error": "尝试提取阻止列表统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.eventFiltersManageLabel": "管理事件筛选",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.eventFiltersSummarySummary.error": "尝试提取事件筛选统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.hostIsolationExceptionsManageLabel": "管理主机隔离例外",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.hostIsolationExceptionsSummary.error": "尝试提取主机隔离例外统计时出错：“{error}”",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.title": "项目",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.trustedAppsManageLabel": "管理受信任的应用程序",
+    "xpack.securitySolution.endpoint.fleetIntegrationCard.trustedAppsSummarySummary.error": "尝试提取受信任应用统计时出错：“{error}”",
     "xpack.securitySolution.endpoint.hostIsolation.cancel": "取消",
     "xpack.securitySolution.endpoint.hostIsolation.casesFromAlerts.title": "无法找到关联案例",
     "xpack.securitySolution.endpoint.hostIsolation.comment": "注释",
@@ -23904,7 +25329,7 @@
     "xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage": "已成功提交主机 {hostName} 的释放",
     "xpack.securitySolution.endpoint.hostIsolation.unisolateHost": "释放主机",
     "xpack.securitySolution.endpoint.hostIsolation.unIsolateThisHost": "{hostName} 当前{isolated}。是否确定要{unisolate}此主机？",
-    "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "主机隔离例外应用程序",
+    "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "主机隔离例外",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating": "正在隔离",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isolated": "已隔离",
     "xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating": "正在释放",
@@ -23915,6 +25340,7 @@
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "我们将使用建议的默认值保存您的集成。稍后，您可以通过在代理策略中编辑 Endpoint Security 集成对其进行更改。",
     "xpack.securitySolution.endpoint.list.actionmenu": "打开",
     "xpack.securitySolution.endpoint.list.actions": "操作",
+    "xpack.securitySolution.endpoint.list.backToPolicyButton": "返回到策略列表",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling": "正在注册终端。{agentsLink}以跟踪进度。",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling.viewAgentsLink": "查看代理",
     "xpack.securitySolution.endpoint.list.endpointVersion": "版本",
@@ -23959,6 +25385,7 @@
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.ca_cert": "Elasticsearch 证书颁发机构的 PEM 编码证书。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.verify_hostname": "是否验证对等方的主机名是证书中的主机名。默认值：true。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.elasticsearch.tls.verify_peer": "是否验证对等方提供的证书。默认值：true。",
+    "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.kernel.capture_mode": "允许用户控制是使用 kprobes 还是 ebpf 来收集数据。可能的选项包括 kprobes、ebpf 或自动。默认值：自动",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.logging.file": "提供的值将覆盖为保存到磁盘上并流式传输到 Elasticsearch 的日志配置的日志级别。大多数情况下，建议使用 Fleet 来更改此日志记录。值包括 error、warning、info、debug 和 trace。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.logging.syslog": "提供的值将配置记录到 syslog。值包括 error、warning、info、debug 和 trace。",
     "xpack.securitySolution.endpoint.policy.advanced.linux.advanced.malware.quarantine": "启用恶意软件防护时是否应启用隔离。默认值：true。",
@@ -24025,9 +25452,49 @@
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.memory_scan_collect_sample": "收集检测到的恶意内存区域周围的 4MB 内存。默认值：false。启用此值可能会显著增加 Elasticsearch 中存储的数据量。",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode": "作为内存防护的一部分启用 shellcode 注入检测。默认值：true。",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_collect_sample": "收集检测到的 shellcode 区域周围的 4MB 内存。默认值：false。启用此值可能会显著增加 Elasticsearch 中存储的数据量。",
+    "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.memory_protection.shellcode_trampoline_detection": "作为内存防护的一部分启用基于 trampoline 的 shellcode 注入检测。默认值：true",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.canary": "值“false”将禁用勒索软件金丝雀防护。默认值：true。",
     "xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.mbr": "值“false”将禁用勒索软件 MBR 防护。默认值：true。",
     "xpack.securitySolution.endpoint.policy.advanced.windows.memory_protection.shellcode_enhanced_pe_parsing": "尝试从注入的 shellcode 中识别并提取 PE 元数据，包括 Authenticode 签名和版本资源信息。默认值：true。",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.backButtonLabel": "返回到 {policyName} 策略",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.content": "当前没有项目已分配给 {policyName}。立即分配项目，或在项目页面上添加和管理项目。",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.primaryAction": "分配项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.secondaryAction": "管理项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unassigned.title": "无已分配项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.action": "添加项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.content": "当前没有任何项目已应用于您的终端。",
+    "xpack.securitySolution.endpoint.policy.artifacts.empty.unexisting.title": "项目不存在",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.about": "有 {count, plural, other {}} {count} 个{count, plural, other {项目}}与此策略关联。单击此处查看所有项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.about.viewAllLinkLabel": "查看所有项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.assignToPolicy": "将项目分配给策略",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.cancel": "取消",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.confirm": "分配给 {policyName}",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.noAssignable": "没有可分配给此策略的项目。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.noResults": "找不到项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.searchWarning.text": "仅显示前 {maxNumber} 个项目。请使用搜索栏优化结果。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.searchWarning.title": "有限的搜索结果",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.subtitle": "选择要添加到 {policyName} 的项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.title": "分配项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastError.text": "更新项目时出错",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.textMultiples": "{count} 个项目已添加到您的列表。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.textSingle": "“{name}”已添加到您的项目列表。",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.flyout.toastSuccess.title": "成功",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.search.label": "搜索项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.layout.title": "已分配项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.fullDetailsAction": "查看完整详情",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeAction": "从策略中移除",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeActionNotAllowed": "无法从策略中移除全局应用的项目。",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.cancelLabel": "取消",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.confirmLabel": "从策略中移除",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.errorToastTitle": "尝试移除项目时出错",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.message": "是否确定要继续？",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.messageCallout": "此项目将仅从该策略中移除，但仍可从项目页面找到并进行管理。",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.successToastText": "已从 {policyName} 策略中移除“{artifactName}”",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.successToastTitle": "已成功移除",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.removeDialog.title": "从策略中移除项目",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.search.placeholder": "搜索下面的字段：name、description、value",
+    "xpack.securitySolution.endpoint.policy.artifacts.list.totalItemCount": "正在显示 {totalItemsCount, plural, other {# 个项目}}",
+    "xpack.securitySolution.endpoint.policy.blocklists.list.totalItemCount": "正在显示 {totalItemsCount, plural, other {# 个阻止列表条目}}",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.explanation": "打开可将 Elastic 注册为 Windows 操作系统的正式防病毒解决方案。这也将禁用 Windows Defender。",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.osRestriction": "限制",
     "xpack.securitySolution.endpoint.policy.details.antivirusRegistration.toggle": "注册为防病毒解决方案",
@@ -24054,6 +25521,7 @@
     "xpack.securitySolution.endpoint.policy.details.ransomware": "勒索软件",
     "xpack.securitySolution.endpoint.policy.details.save": "保存",
     "xpack.securitySolution.endpoint.policy.details.settings": "设置",
+    "xpack.securitySolution.endpoint.policy.details.tabs.blocklists": "阻止列表",
     "xpack.securitySolution.endpoint.policy.details.tabs.eventFilters": "事件筛选",
     "xpack.securitySolution.endpoint.policy.details.tabs.isInHostIsolationExceptions": "主机隔离例外",
     "xpack.securitySolution.endpoint.policy.details.tabs.policyForm": "策略设置",
@@ -24078,20 +25546,48 @@
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.about.viewAllLinkLabel": "查看所有事件筛选",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.assignToPolicy": "分配事件筛选到策略",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.noAssignable": "没有可分配给此策略的事件筛选。",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.searchWarning.text": "仅显示前 {maxNumber} 个事件筛选。请使用搜索栏优化结果。",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.subtitle": "选择事件筛选以添加到 {policyName}",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.title": "分配事件筛选",
-    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastError.text": "更新项目时出错",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastError.text": "更新事件筛选时出错",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastSuccess.textMultiples": "{count} 个事件筛选已添加到您的列表。",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.flyout.toastSuccess.textSingle": "“{name}”已添加到您的事件筛选列表。",
+    "xpack.securitySolution.endpoint.policy.eventFilters.layout.search.label": "搜索事件筛选",
     "xpack.securitySolution.endpoint.policy.eventFilters.layout.title": "已分配的事件筛选",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.about": "有 {count, plural, other {}} {count} 个事件{count, plural, other {筛选}}与此策略关联。单击此处以 {link}",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeActionNotAllowed": "无法从策略中移除全局应用的事件筛选。",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.errorToastTitle": "尝试移除事件筛选时出错",
-    "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.messageCallout": "此事件筛选将仅从该策略中移除，但仍可从事件筛选页面找到并进行管理。",
+    "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.messageCallout": "此事件筛选将仅从该策略中移除，但仍可从项目页面找到并进行管理。",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.removeDialog.title": "从策略中移除事件筛选",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.search.placeholder": "搜索下面的字段：name、description、comments、value",
     "xpack.securitySolution.endpoint.policy.eventFilters.list.totalItemCount": "正在显示 {totalItemsCount, plural, other {# 个事件筛选}}",
-    "xpack.securitySolution.endpoint.policy.hostIsolationExceptions.list.about": "有 {count, plural, other {}} {count} 个{count, plural, other {主机隔离例外}}与此策略关联。单击此处以 {link}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.content": "当前没有主机隔离例外分配给 {policyName}。立即分配主机隔离例外，或在主机隔离例外页面添加并管理例外。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.primaryAction": "分配主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.secondaryAction": "管理主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unassigned.title": "无已分配的主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.action": "添加主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.content": "当前没有主机隔离例外已应用于您的终端。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.empty.unexisting.title": "不存在主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.about.viewAllLinkLabel": "查看所有主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.assignToPolicy": "将主机隔离例外分配给策略",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.noAssignable": "没有可分配给此策略的主机隔离例外。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.searchWarning.text": "仅显示前 {maxNumber} 个主机隔离例外。请使用搜索栏优化结果。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.subtitle": "选择主机隔离例外以添加到 {policyName}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.title": "分配主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastError.text": "更新主机隔离例外时出错",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastSuccess.textMultiples": "已将 {count} 个主机隔离例外添加到您的列表。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.flyout.toastSuccess.textSingle": "已将“{name}”添加到您的主机隔离例外列表。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.search.label": "搜索主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.layout.title": "已分配的主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeActionNotAllowed": "无法从策略中移除全局应用的主机隔离例外。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.errorToastTitle": "尝试移除主机隔离例外时出错",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.messageCallout": "此主机隔离例外将仅从该策略中移除，但仍可从项目页面找到并进行管理。",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.removeDialog.title": "从策略中移除主机隔离例外",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.search.placeholder": "搜索下面的字段：name、description、IP",
+    "xpack.securitySolution.endpoint.policy.hostIsolationException.list.totalItemCount": "正显示 {totalItemsCount, plural, other {# 个主机隔离例外}}",
+    "xpack.securitySolution.endpoint.policy.hostIsolationExceptions.list.about": "有 {count, plural, other {}} {count} 个主机隔离{count, plural, other {例外}}与此策略关联。单击此处以 {link}",
     "xpack.securitySolution.endpoint.policy.protections.behavior": "恶意行为防护",
+    "xpack.securitySolution.endpoint.policy.protections.blocklist": "阻止列表已启用",
     "xpack.securitySolution.endpoint.policy.protections.malware": "恶意软件防护",
     "xpack.securitySolution.endpoint.policy.protections.memory": "内存威胁防护",
     "xpack.securitySolution.endpoint.policy.protections.ransomware": "勒索软件防护",
@@ -24105,16 +25601,21 @@
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.about.viewAllLinkLabel": "查看所有受信任的应用程序",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.assignToPolicy": "将受信任的应用程序分配给策略",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.noAssignable": "没有可分配给此策略的受信任应用程序。",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.searchWarning.text": "仅显示前 {maxNumber} 个受信任的应用程序。请使用搜索栏优化结果。",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.subtitle": "选择受信任的应用程序以添加到 {policyName}",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.title": "分配受信任的应用程序",
-    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastError.text": "更新项目时出错",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastError.text": "更新受信任的应用程序时出错",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textMultiples": "{count} 个受信任的应用程序已添加到列表中。",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textSingle": "“{name}”已添加到受信任的应用程序列表。",
+    "xpack.securitySolution.endpoint.policy.trustedApps.layout.search.label": "搜索受信任的应用程序",
     "xpack.securitySolution.endpoint.policy.trustedApps.layout.title": "已分配的受信任应用程序",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.about": "有 {count, plural, other {}} {count} 个受信任的{count, plural, other {应用程序}}与此策略关联。单击此处以 {link}",
     "xpack.securitySolution.endpoint.policy.trustedApps.list.removeActionNotAllowed": "无法从策略中移除全局应用的受信任应用程序。",
     "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.errorToastTitle": "尝试移除受信任的应用程序时出错",
-    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.messageCallout": "此受信任的应用程序将从该策略中移除，但仍可从受信任的应用程序页面找到并进行管理。",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.messageCallout": "此受信任的应用程序将从该策略中移除，但仍可从项目页面找到并进行管理。",
     "xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.title": "从策略中移除受信任的应用程序",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.search.placeholder": "搜索下面的字段：name、description、value",
+    "xpack.securitySolution.endpoint.policy.trustedApps.list.totalItemCount": "正在显示 {totalItemsCount, plural, other {# 个受信任的应用程序}}",
     "xpack.securitySolution.endpoint.policyDetail.behaviorProtectionTooltip": "恶意行为",
     "xpack.securitySolution.endpoint.policyDetail.filename": "文件名",
     "xpack.securitySolution.endpoint.policyDetail.memoryProtectionTooltip": "内存威胁",
@@ -24130,11 +25631,14 @@
     "xpack.securitySolution.endpoint.policyDetails.settings.title": "策略设置",
     "xpack.securitySolution.endpoint.policyDetails.supportedVersion": "代理版本 {version}",
     "xpack.securitySolution.endpoint.policyDetails.userNotification.placeholder": "输入您的定制通知消息",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.blocklistTooltip": "启用或禁用与此策略关联的阻止列表。阻止列表是哈希、路径或签名者的集合，它扩充了终端视为恶意的进程列表。查看阻止列表选项卡了解条目详情。",
     "xpack.securitySolution.endpoint.policyDetailsConfig.customizeUserNotification": "定制通知消息",
     "xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents": "事件",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.file": "文件",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.network": "网络",
     "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.process": "进程",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.session_data": "包括会话数据",
+    "xpack.securitySolution.endpoint.policyDetailsConfig.linux.events.session_data.tooltip": "捕获会话视图所需的扩展进程事件数据。会话视图将根据 Linux 进程模型显示树形结构的会话和进程执行数据，帮助您调查 Linux 基础架构上的进程、用户和服务活动。注意：捕获扩展进程事件会显著增加数据使用。",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.file": "文件",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.network": "网络",
     "xpack.securitySolution.endpoint.policyDetailsConfig.mac.events.process": "进程",
@@ -24155,21 +25659,17 @@
     "xpack.securitySolution.endpoint.policyList.onboardingDocsLink": "查看 Elastic Security 文档",
     "xpack.securitySolution.endpoint.policyList.onboardingSectionOne": "使用威胁防御、检测和深度安全数据可见性功能保护您的主机。",
     "xpack.securitySolution.endpoint.policyList.onboardingSectionThree": "首先，将 Endpoint Security 集成添加到您的代理。有关更多信息，",
+    "xpack.securitySolution.endpoint.policyList.onboardingSectionTwo.fromEndpointPage": "从此页面，您将可以查看和管理环境中运行 Endpoint Security 的主机。",
+    "xpack.securitySolution.endpoint.policyList.onboardingSectionTwo.fromPolicyPage": "从此页面，您将能够查看和管理运行 Endpoint Security 的环境中的 Endpoint Security 集成策略。",
     "xpack.securitySolution.endpoint.policyList.onboardingTitle": "开始使用 Endpoint Security",
     "xpack.securitySolution.endpoint.policyResponse.appliedOn": "修订 {rev} 应用于 {date}",
     "xpack.securitySolution.endpoint.policyResponse.backLinkTitle": "终端详情",
     "xpack.securitySolution.endpoint.policyResponse.title": "策略响应",
-    "xpack.securitySolution.endpoint.resolver.compactBillions": "B",
-    "xpack.securitySolution.endpoint.resolver.compactMillions": "M",
-    "xpack.securitySolution.endpoint.resolver.compactOverflow": "+",
-    "xpack.securitySolution.endpoint.resolver.compactThousands": "k",
-    "xpack.securitySolution.endpoint.resolver.compactTrillions": "T",
     "xpack.securitySolution.endpoint.resolver.eitherLineageLimitExceeded": "下面可视化和事件列表中的一些进程事件无法显示，因为已达到数据限制。",
     "xpack.securitySolution.endpoint.resolver.elapsedTime": "{duration} {durationType}",
     "xpack.securitySolution.endpoint.resolver.errorProcess": "进程错误",
     "xpack.securitySolution.endpoint.resolver.loadingError": "加载数据时出错。",
     "xpack.securitySolution.endpoint.resolver.loadingProcess": "正在加载进程",
-    "xpack.securitySolution.endpoint.resolver.node.pillNumber": "{mantissa}{scale}{hasRemainder}",
     "xpack.securitySolution.endpoint.resolver.panel.error.error": "错误",
     "xpack.securitySolution.endpoint.resolver.panel.error.events": "事件",
     "xpack.securitySolution.endpoint.resolver.panel.error.goBack": "查看所有进程",
@@ -24204,6 +25704,7 @@
     "xpack.securitySolution.endpoint.resolver.terminatedProcess": "已终止进程",
     "xpack.securitySolution.endpoint.resolver.terminatedTrigger": "已终止触发器",
     "xpack.securitySolution.endpoint.takeAction.changeAlertStatus": "更改告警状态",
+    "xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title": "受信任的应用程序",
     "xpack.securitySolution.endpointDetails.activityLog": "活动日志",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.endOfLog": "没有更多要显示的内容",
     "xpack.securitySolution.endpointDetails.activityLog.logEntry.action.failedEndpointIsolateAction": "无法提交请求：隔离主机",
@@ -24299,6 +25800,7 @@
     "xpack.securitySolution.eventFilters.listEmpty.addButton": "添加事件筛选",
     "xpack.securitySolution.eventFilters.listEmpty.message": "添加事件筛选以阻止高数目或非预期事件写入到 Elasticsearch。",
     "xpack.securitySolution.eventFilters.listEmpty.title": "添加您的首个事件筛选",
+    "xpack.securitySolution.eventFilters.warningMessage.duplicateFields": "使用相同提交值的倍数可能会降低终端性能和/或创建低效规则",
     "xpack.securitySolution.eventFiltersTab": "事件筛选",
     "xpack.securitySolution.eventRenderers.alertsDescription": "阻止或检测到恶意软件或勒索软件时，显示告警",
     "xpack.securitySolution.eventRenderers.alertsName": "告警",
@@ -24376,6 +25878,7 @@
     "xpack.securitySolution.exceptions.addException.sequenceWarning": "此规则的查询包含 EQL 序列语句。创建的例外将应用于序列中的所有事件。",
     "xpack.securitySolution.exceptions.addException.success": "已成功添加例外",
     "xpack.securitySolution.exceptions.andDescription": "且",
+    "xpack.securitySolution.exceptions.badge.readOnly.tooltip": "无法创建、编辑或删除例外",
     "xpack.securitySolution.exceptions.cancelLabel": "取消",
     "xpack.securitySolution.exceptions.clearExceptionsLabel": "移除例外列表",
     "xpack.securitySolution.exceptions.commentEventLabel": "已添加注释",
@@ -24457,6 +25960,7 @@
     "xpack.securitySolution.expandedValue.links.viewPortDetails": "查看端口详情",
     "xpack.securitySolution.expandedValue.links.viewRuleDetails": "查看规则详情",
     "xpack.securitySolution.expandedValue.links.viewRuleReference": "查看规则参考",
+    "xpack.securitySolution.expandedValue.links.viewUserSummary": "查看用户摘要",
     "xpack.securitySolution.expandedValue.showTopN.showTopValues": "显示排名最前值",
     "xpack.securitySolution.featureCatalogueDescription": "预防、收集、检测和响应威胁，以对整个基础架构提供统一的保护。",
     "xpack.securitySolution.featureRegistry.linkSecuritySolutionCaseTitle": "案例",
@@ -24464,7 +25968,18 @@
     "xpack.securitySolution.featureRegistry.manageAlertsName": "告警",
     "xpack.securitySolution.featureRegistry.subfeature.alertsAllName": "全部",
     "xpack.securitySolution.featureRegistry.subfeature.alertsReadName": "读取",
+    "xpack.securitySolution.fieldBrowser.actionsLabel": "操作",
+    "xpack.securitySolution.fieldBrowser.categoryLabel": "类别",
     "xpack.securitySolution.fieldBrowser.createFieldButton": "创建字段",
+    "xpack.securitySolution.fieldBrowser.descriptionForScreenReaderOnly": "{field} 字段的描述：",
+    "xpack.securitySolution.fieldBrowser.descriptionLabel": "描述",
+    "xpack.securitySolution.fieldBrowser.editButton": "编辑",
+    "xpack.securitySolution.fieldBrowser.editButtonDescription": "编辑运行时字段",
+    "xpack.securitySolution.fieldBrowser.fieldName": "名称",
+    "xpack.securitySolution.fieldBrowser.removeButton": "移除",
+    "xpack.securitySolution.fieldBrowser.removeButtonDescription": "删除运行时字段",
+    "xpack.securitySolution.fieldBrowser.runtimeLabel": "运行时",
+    "xpack.securitySolution.fieldBrowser.runtimeTitle": "运行时字段",
     "xpack.securitySolution.fieldNameIcons.booleanAriaLabel": "布尔值字段",
     "xpack.securitySolution.fieldNameIcons.conflictFieldAriaLabel": "冲突字段",
     "xpack.securitySolution.fieldNameIcons.dateFieldAriaLabel": "日期字段",
@@ -24486,6 +26001,7 @@
     "xpack.securitySolution.flyout.button.timeline": "时间线",
     "xpack.securitySolution.footer.autoRefreshActiveDescription": "自动刷新已启用",
     "xpack.securitySolution.footer.autoRefreshActiveTooltip": "自动刷新已启用时，时间线将显示匹配查询的最近 {numberOfItems} 个事件。",
+    "xpack.securitySolution.footer.cancel": "取消",
     "xpack.securitySolution.footer.data": "数据",
     "xpack.securitySolution.footer.events": "事件",
     "xpack.securitySolution.footer.live": "实时",
@@ -24537,19 +26053,6 @@
     "xpack.securitySolution.host.details.overview.regionTitle": "地区",
     "xpack.securitySolution.host.details.versionLabel": "版本",
     "xpack.securitySolution.hostIsolation.agentStatuses.empty": "-",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.calloutMessage": "删除此条目会将其从 {count} 个关联{count, plural, other {策略}}中移除。",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.calloutTitle": "警告",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.cancel": "取消",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.confirmation": "此操作无法撤消。是否确定要继续？",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.confirmButton": "删除",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.deleteFailure": "无法从主机隔离例外列表中移除“{name}”。原因：{message}",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.deleteSuccess": "已从主机隔离例外列表中移除“{name}”。",
-    "xpack.securitySolution.hostIsolationExceptions.deletionDialog.title": "删除主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.cancel": "取消",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.createButton": "添加主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.editButton": "保存",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.editTitle": "编辑主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.flyout.title": "添加主机隔离例外",
     "xpack.securitySolution.hostIsolationExceptions.form.conditions.subtitle": "主机隔离例外将应用于所有操作系统。",
     "xpack.securitySolution.hostIsolationExceptions.form.conditions.title": "条件",
     "xpack.securitySolution.hostIsolationExceptions.form.creationSuccessToastTitle": "已将“{name}”添加到主机隔离例外列表。",
@@ -24569,14 +26072,6 @@
     "xpack.securitySolution.hostIsolationExceptions.form.title": "详情",
     "xpack.securitySolution.hostIsolationExceptions.list.action.delete": "删除例外",
     "xpack.securitySolution.hostIsolationExceptions.list.action.edit": "编辑例外",
-    "xpack.securitySolution.hostIsolationExceptions.list.addButton": "添加主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.list.pageSubTitle": "添加主机隔离例外以允许隔离的主机与特定 IP 通信。",
-    "xpack.securitySolution.hostIsolationExceptions.list.pageTitle": "主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.list.totalCount": "正显示 {total, plural, other {# 个主机隔离例外}}",
-    "xpack.securitySolution.hostIsolationExceptions.listEmpty.addButton": "添加主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.listEmpty.message": "添加主机隔离例外以允许隔离的主机与特定 IP 通信。",
-    "xpack.securitySolution.hostIsolationExceptions.listEmpty.title": "添加第一个主机隔离例外",
-    "xpack.securitySolution.hostIsolationExceptions.search.placeholder": "搜索下面的字段：name、description、IP",
     "xpack.securitySolution.hostOverview.errorSearchDescription": "搜索主机概览时发生错误",
     "xpack.securitySolution.hostOverview.failSearchDescription": "无法对主机概览执行搜索",
     "xpack.securitySolution.hosts.hostRiskInformation.buttonLabel": "如何计算风险分数？",
@@ -24603,6 +26098,7 @@
     "xpack.securitySolution.hosts.navigation.dns.histogram.errorFetchingDnsData": "无法查询 DNS 数据",
     "xpack.securitySolution.hosts.navigation.eventsTitle": "事件",
     "xpack.securitySolution.hosts.navigation.hostRisk": "主机（按风险排列）",
+    "xpack.securitySolution.hosts.navigation.sessionsTitle": "会话",
     "xpack.securitySolution.hosts.navigation.uncommonProcessesTitle": "不常见进程",
     "xpack.securitySolution.hosts.navigaton.eventsUnit": "{totalCount, plural, other {个事件}}",
     "xpack.securitySolution.hosts.navigaton.hostRisk.viewDashboardButtonLabel": "查看源仪表板",
@@ -24626,6 +26122,7 @@
     "xpack.securitySolution.hostsRiskTable.hostsTitle": "主机（按风险排列）",
     "xpack.securitySolution.hostsRiskTable.riskTitle": "主机风险分类",
     "xpack.securitySolution.hostsRiskTable.tableTitle": "主机风险",
+    "xpack.securitySolution.hostsRiskTable.usersTableTitle": "用户风险表不受 KQL 时间范围影响。本表显示每个用户最新记录的风险分数。",
     "xpack.securitySolution.hostsTable.firstLastSeenToolTip": "相对于选定日期范围",
     "xpack.securitySolution.hostsTable.hostRiskTitle": "主机风险分类",
     "xpack.securitySolution.hostsTable.hostRiskToolTip": "主机风险分类由主机风险分数决定。分类为紧急或高的主机即表示存在风险。",
@@ -24641,7 +26138,9 @@
     "xpack.securitySolution.indexPatterns.add": "添加索引模式",
     "xpack.securitySolution.indexPatterns.advancedOptionsTitle": "高级选项",
     "xpack.securitySolution.indexPatterns.alertsBadgeTitle": "告警",
+    "xpack.securitySolution.indexPatterns.callOutDeprecxatedTemplateTitle": "此时间线模板使用旧版数据视图选择器",
     "xpack.securitySolution.indexPatterns.callOutDeprecxatedTitle": "此时间线使用旧版数据视图选择器",
+    "xpack.securitySolution.indexPatterns.callOutMissingPatternsTemplateTitle": "对于安全数据视图，此时间线模板已过时",
     "xpack.securitySolution.indexPatterns.callOutMissingPatternsTitle": "对于安全数据视图，此时间线已过时",
     "xpack.securitySolution.indexPatterns.callOutTimelineTitle": "选择仅显示检测告警时，无法修改数据视图",
     "xpack.securitySolution.indexPatterns.callOutTitle": "无法在此页面上修改数据视图",
@@ -24684,6 +26183,8 @@
     "xpack.securitySolution.inspect.modal.reqTimestampLabel": "请求时间戳",
     "xpack.securitySolution.inspect.modal.somethingWentWrongDescription": "抱歉，出现问题。",
     "xpack.securitySolution.inspectDescription": "检查",
+    "xpack.securitySolution.inspectPatternDifferent": "此元素具有与数据视图设置不同的唯一索引模式。",
+    "xpack.securitySolution.inspectPatternExcludeLogs": "选择 logs-* 索引模式时，会从搜索中排除 Elastic Cloud 日志。",
     "xpack.securitySolution.investigationEnrichment.requestError": "请求威胁情报时发生错误",
     "xpack.securitySolution.ja3.fingerprint.ja3.fingerprintLabel": "ja3",
     "xpack.securitySolution.kpiHost.enableHostRiskText": "启用主机风险模块以查看更多数据",
@@ -24693,7 +26194,7 @@
     "xpack.securitySolution.kpiHosts.riskyHosts.description": "{formattedQuantity} 台有风险的{quantity, plural, other {主机}}",
     "xpack.securitySolution.kpiHosts.riskyHosts.errorMessage": "提取有风险主机 API 时出错",
     "xpack.securitySolution.kpiHosts.riskyHosts.hostsCount": "{quantity} 台{quantity, plural, other {主机}}",
-    "xpack.securitySolution.kpiHosts.riskyHosts.inspectTitle": "KPI 有风险的主机",
+    "xpack.securitySolution.kpiHosts.riskyHosts.inspectTitle": "有风险主机",
     "xpack.securitySolution.kpiHosts.riskyHosts.title": "有风险主机",
     "xpack.securitySolution.kpiHosts.uniqueIps.destinationChartLabel": "目标",
     "xpack.securitySolution.kpiHosts.uniqueIps.destinationUnitLabel": "目标",
@@ -24714,6 +26215,8 @@
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.sourceChartLabel": "源",
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.sourceUnitLabel": "源",
     "xpack.securitySolution.kpiNetwork.uniquePrivateIps.title": "唯一专用 IP",
+    "xpack.securitySolution.kpiUsers.totalUsers.errorSearchDescription": "搜索总体用户 KPI 时发生错误",
+    "xpack.securitySolution.kpiUsers.totalUsers.title": "用户",
     "xpack.securitySolution.lastEventTime.errorSearchDescription": "搜索上次事件时间时发生错误",
     "xpack.securitySolution.lastEventTime.failSearchDescription": "无法对上次事件时间执行搜索",
     "xpack.securitySolution.licensing.unsupportedMachineLearningMessage": "您的许可证不支持 Machine Learning。请升级您的许可证。",
@@ -24780,16 +26283,20 @@
     "xpack.securitySolution.ml.table.networkNameTitle": "网络 IP",
     "xpack.securitySolution.ml.table.scoreTitle": "异常分数",
     "xpack.securitySolution.ml.table.timestampTitle": "时间戳",
+    "xpack.securitySolution.ml.table.userNameTitle": "用户名",
     "xpack.securitySolution.modalAllErrors.close.button": "关闭",
     "xpack.securitySolution.modalAllErrors.seeAllErrors.button": "请参阅完整的错误信息",
     "xpack.securitySolution.modalAllErrors.title": "您的可视化有错误",
     "xpack.securitySolution.navigation.administration": "管理",
     "xpack.securitySolution.navigation.administration.policies": "策略",
     "xpack.securitySolution.navigation.alerts": "告警",
+    "xpack.securitySolution.navigation.blocklist": "阻止列表",
     "xpack.securitySolution.navigation.case": "案例",
     "xpack.securitySolution.navigation.detect": "检测",
+    "xpack.securitySolution.navigation.detectionResponse": "检测和响应",
     "xpack.securitySolution.navigation.exceptions": "例外列表",
     "xpack.securitySolution.navigation.explore": "浏览",
+    "xpack.securitySolution.navigation.gettingStarted": "入门",
     "xpack.securitySolution.navigation.hosts": "主机",
     "xpack.securitySolution.navigation.investigate": "调查",
     "xpack.securitySolution.navigation.mainLabel": "安全",
@@ -24798,6 +26305,7 @@
     "xpack.securitySolution.navigation.overview": "概览",
     "xpack.securitySolution.navigation.rules": "规则",
     "xpack.securitySolution.navigation.timelines": "时间线",
+    "xpack.securitySolution.navigation.users": "用户",
     "xpack.securitySolution.network.dns.stackByUniqueSubdomain": "排名最前域（按 {groupByField}）",
     "xpack.securitySolution.network.ipDetails.ipOverview.asDestinationDropDownOptionLabel": "作为目标",
     "xpack.securitySolution.network.ipDetails.ipOverview.asSourceDropDownOptionLabel": "作为源",
@@ -25016,6 +26524,16 @@
     "xpack.securitySolution.overview.hostStatGroupFilebeat": "Filebeat",
     "xpack.securitySolution.overview.hostStatGroupWinlogbeat": "Winlogbeat",
     "xpack.securitySolution.overview.hostsTitle": "主机事件",
+    "xpack.securitySolution.overview.landingCards.box.endpoint.desc": "防御、收集、检测和响应 — 所有这些活动均可通过 Elastic 代理来实现。",
+    "xpack.securitySolution.overview.landingCards.box.endpoint.title": "规模化终端安全",
+    "xpack.securitySolution.overview.landingCards.box.siem.cta": "添加安全集成",
+    "xpack.securitySolution.overview.landingCards.box.siem.desc": "借助 Elastic Security，团队能够以云技术所带来的规模和速度来防御、检测和应对各种威胁，在一体化的开放平台上保护业务运营的安全。",
+    "xpack.securitySolution.overview.landingCards.box.siem.header": "Elastic Security",
+    "xpack.securitySolution.overview.landingCards.box.siem.title": "以 Elastic 的速度实现安全保护",
+    "xpack.securitySolution.overview.landingCards.box.siemCard.desc": "检测和调查不断变化的威胁，并做出有效应对",
+    "xpack.securitySolution.overview.landingCards.box.siemCard.title": "适用于现代 SOC 的 SIEM",
+    "xpack.securitySolution.overview.landingCards.box.unify.desc": "Elastic Security 实现了安全运营现代化，能够对多年的数据进行分析，自动执行关键流程，并将原生的 Endpoint Security 引入每台主机。",
+    "xpack.securitySolution.overview.landingCards.box.unify.title": "集 SIEM、Endpoint Security 和云安全于一体",
     "xpack.securitySolution.overview.networkAction": "查看网络",
     "xpack.securitySolution.overview.networkStatGroupAuditbeat": "Auditbeat",
     "xpack.securitySolution.overview.networkStatGroupFilebeat": "Filebeat",
@@ -25063,6 +26581,21 @@
     "xpack.securitySolution.paginatedTable.tooManyResultsToastText": "缩减您的查询范围，以更好地筛选结果",
     "xpack.securitySolution.paginatedTable.tooManyResultsToastTitle": " - 结果过多",
     "xpack.securitySolution.policiesTab": "策略",
+    "xpack.securitySolution.policy.backToPolicyList": "返回到策略列表",
+    "xpack.securitySolution.policy.list.createdAt": "创建日期",
+    "xpack.securitySolution.policy.list.createdBy": "创建者",
+    "xpack.securitySolution.policy.list.endpoints": "终端",
+    "xpack.securitySolution.policy.list.errorMessage": "检索策略列表时出错",
+    "xpack.securitySolution.policy.list.lastUpdatedBy": "最后更新者",
+    "xpack.securitySolution.policy.list.name": "名称",
+    "xpack.securitySolution.policy.list.subtitle": "使用终端策略定制 Endpoint Security 防护和其他配置",
+    "xpack.securitySolution.policy.list.title": "策略列表",
+    "xpack.securitySolution.policy.list.totalCount": "正在显示 {totalItemCount, plural, other {# 个策略}}",
+    "xpack.securitySolution.policy.list.updatedAt": "上次更新时间",
+    "xpack.securitySolution.policyDetails.backToEndpointList": "查看所有终端",
+    "xpack.securitySolution.policyDetails.backToPolicyButton": "返回到策略列表",
+    "xpack.securitySolution.policyList.endpointCountError": "检索终端计数时出错",
+    "xpack.securitySolution.policyList.packageVersionError": "检索终端软件包版本时出错",
     "xpack.securitySolution.policyStatusText.failure": "失败",
     "xpack.securitySolution.policyStatusText.success": "成功",
     "xpack.securitySolution.policyStatusText.unsupported": "不支持",
@@ -25145,19 +26678,23 @@
     "xpack.securitySolution.rowRenderer.wasPreventedFromExecutingAMaliciousProcessDescription": "被阻止执行恶意进程",
     "xpack.securitySolution.rowRenderer.wasPreventedFromModifyingAMaliciousFileDescription": "被阻止修改恶意文件",
     "xpack.securitySolution.rowRenderer.wasPreventedFromRenamingAMaliciousFileDescription": "被阻止重命名恶意文件",
+    "xpack.securitySolution.rules.badge.readOnly.tooltip": "无法创建、编辑或删除规则",
     "xpack.securitySolution.search.administration.endpoints": "终端",
     "xpack.securitySolution.search.administration.eventFilters": "事件筛选",
     "xpack.securitySolution.search.administration.hostIsolationExceptions": "主机隔离例外",
     "xpack.securitySolution.search.administration.trustedApps": "受信任的应用程序",
     "xpack.securitySolution.search.alerts": "告警",
     "xpack.securitySolution.search.detect": "检测",
+    "xpack.securitySolution.search.detectionAndResponse": "检测和响应",
     "xpack.securitySolution.search.exceptions": "例外列表",
     "xpack.securitySolution.search.explore": "浏览",
+    "xpack.securitySolution.search.getStarted": "入门",
     "xpack.securitySolution.search.hosts": "主机",
     "xpack.securitySolution.search.hosts.anomalies": "异常",
     "xpack.securitySolution.search.hosts.authentications": "身份验证",
     "xpack.securitySolution.search.hosts.events": "事件",
     "xpack.securitySolution.search.hosts.externalAlerts": "外部告警",
+    "xpack.securitySolution.search.hosts.sessions": "会话",
     "xpack.securitySolution.search.hosts.uncommonProcesses": "不常见进程",
     "xpack.securitySolution.search.investigate": "调查",
     "xpack.securitySolution.search.manage": "管理",
@@ -25170,6 +26707,16 @@
     "xpack.securitySolution.search.rules": "规则",
     "xpack.securitySolution.search.timeline.templates": "模板",
     "xpack.securitySolution.search.timelines": "时间线",
+    "xpack.securitySolution.search.users": "用户",
+    "xpack.securitySolution.search.users.anomalies": "异常",
+    "xpack.securitySolution.search.users.authentications": "身份验证",
+    "xpack.securitySolution.search.users.events": "事件",
+    "xpack.securitySolution.search.users.externalAlerts": "外部告警",
+    "xpack.securitySolution.search.users.risk": "风险",
+    "xpack.securitySolution.searchStrategy.error": "无法运行搜索：{factoryQueryType}",
+    "xpack.securitySolution.sessionsView.singleCountOfSessions": "会话",
+    "xpack.securitySolution.sessionsView.totalCountOfSessions": "会话",
+    "xpack.securitySolution.some_page.flyoutCreateSubmitSuccess": "已添加“{name}”。",
     "xpack.securitySolution.source.destination.packetsLabel": "pkts",
     "xpack.securitySolution.sourcerer.disabled": "数据视图的更新需要重新加载页面才能生效。",
     "xpack.securitySolution.sourcerer.error.title": "更新安全数据视图时出错",
@@ -25182,6 +26729,7 @@
     "xpack.securitySolution.stepDefineRule.lastWeek": "上周",
     "xpack.securitySolution.stepDefineRule.previewQueryAriaLabel": "查询预览时间范围选择",
     "xpack.securitySolution.stepDefineRule.previewQueryButton": "预览结果",
+    "xpack.securitySolution.stepDefineRule.previewTimeoutWarning": "预览在 60 秒后超时",
     "xpack.securitySolution.system.acceptedAConnectionViaDescription": "已接受连接 - 通过",
     "xpack.securitySolution.system.acceptedDescription": "已接受该用户 - 通过",
     "xpack.securitySolution.system.attemptedLoginDescription": "已尝试登录 - 通过",
@@ -25248,6 +26796,7 @@
     "xpack.securitySolution.timeline.body.copyToClipboardButtonLabel": "复制到剪贴板",
     "xpack.securitySolution.timeline.body.notes.addOrViewNotesForThisEventTooltip": "为此事件添加备注",
     "xpack.securitySolution.timeline.body.notes.disableEventTooltip": "编辑模板时间线时无法在此处添加备注",
+    "xpack.securitySolution.timeline.body.openSessionViewLabel": "打开会话视图",
     "xpack.securitySolution.timeline.body.pinning.disablePinnnedTooltip": "编辑模板时间线时无法置顶此事件",
     "xpack.securitySolution.timeline.body.pinning.pinnedTooltip": "置顶事件",
     "xpack.securitySolution.timeline.body.pinning.pinnnedWithNotesTooltip": "此事件无法取消置顶，因为其有备注",
@@ -25314,6 +26863,7 @@
     "xpack.securitySolution.timeline.flyoutTimelineTemplateLabel": "时间线模板",
     "xpack.securitySolution.timeline.fullScreenButton": "全屏",
     "xpack.securitySolution.timeline.graphOverlay.closeAnalyzerButton": "关闭分析器",
+    "xpack.securitySolution.timeline.graphOverlay.closeSessionButton": "关闭会话",
     "xpack.securitySolution.timeline.hideColumnLabel": "隐藏列",
     "xpack.securitySolution.timeline.kpiFailDescription": "发生错误",
     "xpack.securitySolution.timeline.kpiFailSearchDescription": "无法加载 KPI",
@@ -25396,6 +26946,8 @@
     "xpack.securitySolution.timeline.sidePanel.networkDetails.close": "关闭",
     "xpack.securitySolution.timeline.sidePanel.networkDetails.networkDetailsPageLink": "查看详情页面",
     "xpack.securitySolution.timeline.sidePanel.networkDetails.title": "网络详情",
+    "xpack.securitySolution.timeline.sidePanel.networkDetails.userDetails": "查看详情页面",
+    "xpack.securitySolution.timeline.sidePanel.userDetails.title": "用户详情",
     "xpack.securitySolution.timeline.sortAZLabel": "A-Z 排序",
     "xpack.securitySolution.timeline.sortFieldsButton": "排序字段",
     "xpack.securitySolution.timeline.sortZALabel": "Z-A 排序",
@@ -25405,6 +26957,7 @@
     "xpack.securitySolution.timeline.tabs.notesTabTimelineTitle": "备注",
     "xpack.securitySolution.timeline.tabs.pinnedTabTimelineTitle": "已固定",
     "xpack.securitySolution.timeline.tabs.queyTabTimelineTitle": "查询",
+    "xpack.securitySolution.timeline.tabs.sessionTabTimelineTitle": "会话视图",
     "xpack.securitySolution.timeline.tcp": "TCP",
     "xpack.securitySolution.timeline.toggleEventDetailsTitle": "展开事件详情",
     "xpack.securitySolution.timeline.typeTooltip": "类型",
@@ -25431,6 +26984,8 @@
     "xpack.securitySolution.timelines.pageTitle": "时间线",
     "xpack.securitySolution.timelines.updateTimelineErrorText": "出问题了",
     "xpack.securitySolution.timelines.updateTimelineErrorTitle": "时间线错误",
+    "xpack.securitySolution.toggleQuery.off": "已关闭",
+    "xpack.securitySolution.toggleQuery.on": "打开",
     "xpack.securitySolution.topN.alertEventsSelectLabel": "检测告警",
     "xpack.securitySolution.topN.allEventsSelectLabel": "所有事件",
     "xpack.securitySolution.topN.closeButtonLabel": "关闭",
@@ -25439,8 +26994,6 @@
     "xpack.securitySolution.trustedApps.assignmentSectionDescription": "跨所有策略全局分配此受信任的应用程序，或将其分配给特定策略。",
     "xpack.securitySolution.trustedapps.card.operator.is": "是",
     "xpack.securitySolution.trustedapps.card.operator.matches": "匹配",
-    "xpack.securitySolution.trustedApps.conditionsSectionDescription": "选择操作系统，然后添加条件。条件的可用性可能取决于您选定的 OS。",
-    "xpack.securitySolution.trustedApps.conditionsSectionTitle": "条件",
     "xpack.securitySolution.trustedapps.create.conditionFieldDegradedPerformanceMsg": "[{row}] 文件名中存在通配符将影响终端性能",
     "xpack.securitySolution.trustedapps.create.conditionFieldDuplicatedMsg": "不能多次添加 {field}",
     "xpack.securitySolution.trustedapps.create.conditionFieldInvalidHashMsg": "[{row}] 无效的哈希值",
@@ -25448,40 +27001,9 @@
     "xpack.securitySolution.trustedapps.create.conditionFieldValueRequiredMsg": "[{row}] 字段条目必须包含值",
     "xpack.securitySolution.trustedapps.create.conditionRequiredMsg": "至少需要一个字段定义",
     "xpack.securitySolution.trustedapps.create.description": "描述",
-    "xpack.securitySolution.trustedapps.create.name": "命名受信任的应用程序",
     "xpack.securitySolution.trustedapps.create.nameRequiredMsg": "“名称”必填",
-    "xpack.securitySolution.trustedapps.create.os": "选择操作系统",
     "xpack.securitySolution.trustedapps.create.osRequiredMsg": "“操作系统”必填",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.cancelButton": "取消",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.createSaveButton": "添加受信任的应用程序",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.createTitle": "添加受信任的应用程序",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.editSaveButton": "保存",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.editTitle": "编辑受信任的应用程序",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseMessage": "您的 Kibana 许可证已降级。现在会将未来的策略配置全局分配给所有策略。有关更多信息，请参见 ",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseTitle": "已过期许可证",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.notFoundToastMessage": "无法编辑受信任的应用程序 ({apiMsg})",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.successToastTitle": "“{name}”已添加到受信任的应用程序列表。",
-    "xpack.securitySolution.trustedapps.createTrustedAppFlyout.updateSuccessToastTitle": "“{name}”已更新。",
-    "xpack.securitySolution.trustedapps.creationSuccess.title": "成功！",
-    "xpack.securitySolution.trustedapps.deletionDialog.calloutMessage": "删除此条目会将其从 {count} 个关联{count, plural, other {策略}}中移除。",
-    "xpack.securitySolution.trustedapps.deletionDialog.calloutTitle": "警告",
-    "xpack.securitySolution.trustedapps.deletionDialog.cancelButton": "取消",
-    "xpack.securitySolution.trustedapps.deletionDialog.confirmButton": "删除",
-    "xpack.securitySolution.trustedapps.deletionDialog.subMessage": "此操作无法撤消。是否确定要继续？",
-    "xpack.securitySolution.trustedapps.deletionDialog.title": "删除“{name}”",
-    "xpack.securitySolution.trustedapps.deletionError.text": "无法从受信任的应用程序列表中移除“{name}”。原因：{message}",
-    "xpack.securitySolution.trustedapps.deletionError.title": "移除失败",
-    "xpack.securitySolution.trustedapps.deletionSuccess.text": "“{name}”已从受信任的应用程序列表中移除。",
-    "xpack.securitySolution.trustedapps.deletionSuccess.title": "已成功移除",
-    "xpack.securitySolution.trustedApps.detailsSectionTitle": "详情",
-    "xpack.securitySolution.trustedapps.docsLink": "受信任的应用程序文档。",
-    "xpack.securitySolution.trustedapps.grid.cardAction.delete": "删除受信任的应用程序",
-    "xpack.securitySolution.trustedapps.grid.cardAction.edit": "编辑受信任的应用程序",
-    "xpack.securitySolution.trustedapps.grid.policyDetailsLinkBackLabel": "返回到受信任的应用程序",
     "xpack.securitySolution.trustedapps.list.addButton": "添加受信任的应用程序",
-    "xpack.securitySolution.trustedapps.list.pageTitle": "受信任的应用程序",
-    "xpack.securitySolution.trustedapps.list.search.placeholder": "搜索下面的字段：name、description、value",
-    "xpack.securitySolution.trustedapps.list.totalCount": "正在显示 {totalItemsCount, plural, other {# 个受信任的应用程序}}",
     "xpack.securitySolution.trustedapps.listEmptyState.message": "添加受信任的应用程序，以提高性能或缓解与主机上运行的其他应用程序的冲突。",
     "xpack.securitySolution.trustedapps.listEmptyState.title": "添加您的首个受信任应用程序",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.description.hash": "md5、sha1 或 sha256",
@@ -25493,14 +27015,9 @@
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.removeLabel": "移除条目",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.group.andOperator": "AND",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.noEntries": "未定义条件",
-    "xpack.securitySolution.trustedapps.middleware.editIdMissing": "未提供 ID",
     "xpack.securitySolution.trustedapps.trustedapp.entry.field": "字段",
     "xpack.securitySolution.trustedapps.trustedapp.entry.operator": "运算符",
     "xpack.securitySolution.trustedapps.trustedapp.entry.value": "值",
-    "xpack.securitySolution.trustedapps.updateSuccess.title": "成功！",
-    "xpack.securitySolution.trustedapps.view.toggle.grid": "网格视图",
-    "xpack.securitySolution.trustedapps.view.toggle.list": "列表视图",
-    "xpack.securitySolution.trustedapps.viewTypeToggle.controlLegend": "视图类型",
     "xpack.securitySolution.trustedAppsTab": "受信任的应用程序",
     "xpack.securitySolution.uiSettings.defaultAnomalyScoreDescription": "<p>要在 Security 应用中显示的 Machine Learning 作业异常所需超过的值。</p><p>有效值：0 到 100。</p>",
     "xpack.securitySolution.uiSettings.defaultAnomalyScoreLabel": "异常阈值",
@@ -25512,6 +27029,8 @@
     "xpack.securitySolution.uiSettings.defaultThreatIndexLabel": "威胁索引",
     "xpack.securitySolution.uiSettings.defaultTimeRangeDescription": "<p>Security 时间筛选中的默认时段。</p>",
     "xpack.securitySolution.uiSettings.defaultTimeRangeLabel": "时间筛选时段",
+    "xpack.securitySolution.uiSettings.enableCcsReadWarningLabel": "CCS 规则权限警告",
+    "xpack.securitySolution.uiSettings.enableCcsWarningDescription": "<p>在规则中为 CCS 索引启用权限检查警告</p>",
     "xpack.securitySolution.uiSettings.enableNewsFeedDescription": "<p>启用新闻源</p>",
     "xpack.securitySolution.uiSettings.enableNewsFeedLabel": "新闻源",
     "xpack.securitySolution.uiSettings.ipReputationLinks": "IP 信誉链接",
@@ -25530,6 +27049,49 @@
     "xpack.securitySolution.uncommonProcessTable.numberOfInstances": "实例",
     "xpack.securitySolution.uncommonProcessTable.rows": "{numRows} {numRows, plural, other {行}}",
     "xpack.securitySolution.uncommonProcessTable.unit": "{totalCount, plural, other {个进程}}",
+    "xpack.securitySolution.user.details.overview.familyTitle": "系列",
+    "xpack.securitySolution.user.details.overview.inspectTitle": "用户概览",
+    "xpack.securitySolution.user.details.overview.ipAddressesTitle": "IP 地址",
+    "xpack.securitySolution.user.details.overview.maxAnomalyScoreByJobTitle": "最大异常分数（按作业）",
+    "xpack.securitySolution.user.details.overview.osTitle": "操作系统",
+    "xpack.securitySolution.user.details.overview.userDomainTitle": "域",
+    "xpack.securitySolution.user.details.overview.userIdTitle": "用户 ID",
+    "xpack.securitySolution.user.details.overview.userRiskClassification": "用户风险分类",
+    "xpack.securitySolution.user.details.overview.userRiskScoreTitle": "用户风险分数",
+    "xpack.securitySolution.user.ipDetails.ipOverview.lastSeenTitle": "最后看到时间",
+    "xpack.securitySolution.userDetails.errorSearchDescription": "搜索用户详情时发生错误",
+    "xpack.securitySolution.userDetails.failSearchDescription": "无法对用户详情执行搜索",
+    "xpack.securitySolution.users.navigation.alertsTitle": "外部告警",
+    "xpack.securitySolution.users.navigation.allUsersTitle": "所有用户",
+    "xpack.securitySolution.users.navigation.anomaliesTitle": "异常",
+    "xpack.securitySolution.users.navigation.authenticationsTitle": "身份验证",
+    "xpack.securitySolution.users.navigation.eventsTitle": "事件",
+    "xpack.securitySolution.users.navigation.riskTitle": "用户（按风险排列）",
+    "xpack.securitySolution.users.pageTitle": "用户",
+    "xpack.securitySolution.usersRiskTable.filteredUsersTitle": "查看{severity}风险用户",
+    "xpack.securitySolution.usersRiskTable.riskTitle": "用户风险分类",
+    "xpack.securitySolution.usersRiskTable.userNameTitle": "用户名",
+    "xpack.securitySolution.usersRiskTable.userRiskScoreTitle": "用户风险分数",
+    "xpack.securitySolution.usersRiskTable.userRiskToolTip": "用户风险分类由用户风险分数决定。分类为紧急或高的用户即表示存在风险。",
+    "xpack.securitySolution.usersTable.domainTitle": "域",
+    "xpack.securitySolution.usersTable.lastSeenTitle": "最后看到时间",
+    "xpack.securitySolution.usersTable.rows": "{numRows} {numRows, plural, other {行}}",
+    "xpack.securitySolution.usersTable.title": "用户",
+    "xpack.securitySolution.usersTable.unit": "{totalCount, plural, other {个用户}}",
+    "xpack.securitySolution.usersTable.userNameTitle": "用户名",
+    "xpack.securitySolution.userTab.errorFetchingsData": "无法查询用户数据",
+    "xpack.securitySolution.visualizationActions.addToCaseSuccessContent": "已成功将可视化添加到案例",
+    "xpack.securitySolution.visualizationActions.addToExistingCase": "添加到现有案例",
+    "xpack.securitySolution.visualizationActions.addToNewCase": "添加到新案例",
+    "xpack.securitySolution.visualizationActions.inspect": "检查",
+    "xpack.securitySolution.visualizationActions.moreActions": "更多操作",
+    "xpack.securitySolution.visualizationActions.openInLens": "在 Lens 中打开",
+    "xpack.securitySolution.visualizationActions.uniqueIps.destinationChartLabel": "目标",
+    "xpack.securitySolution.visualizationActions.uniqueIps.sourceChartLabel": "源",
+    "xpack.securitySolution.visualizationActions.userAuthentications.failChartLabel": "失败",
+    "xpack.securitySolution.visualizationActions.userAuthentications.failUnitLabel": "失败",
+    "xpack.securitySolution.visualizationActions.userAuthentications.successChartLabel": "成功",
+    "xpack.securitySolution.visualizationActions.userAuthentications.successUnitLabel": "成功",
     "xpack.securitySolution.zeek.othDescription": "未看到 SYN，仅中游流量",
     "xpack.securitySolution.zeek.rejDescription": "已拒绝连接尝试",
     "xpack.securitySolution.zeek.rstoODescription": "连接已建立，发起方已中止（已发送 RST）",
@@ -25543,6 +27105,43 @@
     "xpack.securitySolution.zeek.sfDescription": "正常 SYN/FIN 完成",
     "xpack.securitySolution.zeek.shDescription": "发起方已发送 SYN，后跟 FIN，响应方未发送 SYN ACK",
     "xpack.securitySolution.zeek.shrDescription": "响应方已发送 SYN ACK，后跟 FIN，发起方未发送 SYN",
+    "xpack.sessionView.alert": "告警",
+    "xpack.sessionView.alertDetailsTab.groupView": "组视图",
+    "xpack.sessionView.alertDetailsTab.listView": "列表视图",
+    "xpack.sessionView.alertDetailsTab.toggleViewMode": "切换视图模式",
+    "xpack.sessionView.alerts": "告警",
+    "xpack.sessionView.backToInvestigatedAlert": "返回到已调查告警",
+    "xpack.sessionView.buttonOpenDetailPanel": "详情面板",
+    "xpack.sessionView.childProcesses": "子进程",
+    "xpack.sessionView.detailPanel.entryLeaderTooltip": "与初始终端或通过 SSH、SSM 和其他远程访问协议执行的远程访问关联的会话 Leader 进程。入口会话也用于表示直接由初始进程启动的服务。在许多情况下，这与 session_leader 相同。",
+    "xpack.sessionView.detailPanel.processGroupLeaderTooltip": "当前进程的进程组 leader。",
+    "xpack.sessionView.detailPanel.processParentTooltip": "当前进程的直接父级。",
+    "xpack.sessionView.detailPanel.sessionLeaderTooltip": "通常与 entry_leader 相同。如果存在不同，这表示在另一会话内启动的会话。某些工具（如 tmux）和屏幕将启动一个新会话，以获取新的 tty 和/或将其生命周期与入口会话区分开来。",
+    "xpack.sessionView.detailPanelAlertListItem.investigatedLabel": "已调查告警",
+    "xpack.sessionView.detailPanelAlertListItem.jumpToAlert": "跳转到已告警进程",
+    "xpack.sessionView.detailPanelAlertListItem.moreButton": "更多",
+    "xpack.sessionView.detailPanelAlertListItem.showDetailsAction": "查看告警详情",
+    "xpack.sessionView.detailPanelAlertsEmptyMsg": "没有为此会话创建告警。",
+    "xpack.sessionView.detailPanelAlertsEmptyTitle": "无告警",
+    "xpack.sessionView.detailPanelCopy.copyButton": "复制",
+    "xpack.sessionView.detailsPanel.alerts": "告警",
+    "xpack.sessionView.detailsPanel.host": "主机",
+    "xpack.sessionView.detailsPanel.process": "进程",
+    "xpack.sessionView.emptyDataMessage": "找不到此查询的进程事件。",
+    "xpack.sessionView.emptyDataTitle": "没有可呈现的数据",
+    "xpack.sessionView.errorHeading": "加载会话视图时出错",
+    "xpack.sessionView.errorMessage": "加载会话视图时出现错误。",
+    "xpack.sessionView.execUserChange": "执行用户更改：",
+    "xpack.sessionView.loadingProcessTree": "正在加载会话……",
+    "xpack.sessionView.processNode.tooltipExec": "进程已执行",
+    "xpack.sessionView.processNode.tooltipFork": "进程已分叉（无执行）",
+    "xpack.sessionView.processNode.tooltipOrphan": "进程缺少父项（孤立）",
+    "xpack.sessionView.searchBar.searchBarKeyPlaceholder": "查找......",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsTimestamp": "时间戳",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsVerbosemode": "详细模式",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleOptionsVerboseModeTooltips": "详细模式将显示在会话中创建的所有进程，包括 shell 启动、shell 完成和内置命令导致的分叉",
+    "xpack.sessionView.sessionViewToggle.sessionViewToggleTitle": "显示选项",
+    "xpack.sessionView.startedBy": "启动者",
     "xpack.snapshotRestore.addPolicy.breadcrumbTitle": "添加策略",
     "xpack.snapshotRestore.addPolicy.loadingIndicesDescription": "正在加载可用索引……",
     "xpack.snapshotRestore.addPolicy.LoadingIndicesErrorMessage": "加载可用索引时出错",
@@ -26470,6 +28069,7 @@
     "xpack.spaces.shareToSpace.allSpacesTarget": "所有工作区",
     "xpack.spaces.shareToSpace.cancelButton": "取消",
     "xpack.spaces.shareToSpace.continueButton": "继续",
+    "xpack.spaces.shareToSpace.currentSpaceBadge": "此工作区",
     "xpack.spaces.shareToSpace.featureIsDisabledTooltip": "此功能在此工作区中已禁用。",
     "xpack.spaces.shareToSpace.flyoutTitle": "将 {objectNoun} 分配给工作区",
     "xpack.spaces.shareToSpace.noAvailableSpaces.canCreateNewSpace.linkText": "创建新工作区",
@@ -26484,6 +28084,7 @@
     "xpack.spaces.shareToSpace.saveButton": "保存并关闭",
     "xpack.spaces.shareToSpace.shareErrorTitle": "更新 {objectNoun} 时出错",
     "xpack.spaces.shareToSpace.shareModeControl.buttonGroupLegend": "选择共享此对象的方式",
+    "xpack.spaces.shareToSpace.shareModeControl.selectedCountLabel": "已选择 {selectedCount} 个/共 {totalCount} 个",
     "xpack.spaces.shareToSpace.shareModeControl.selectSpacesLabel": "选择工作区",
     "xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.buttonLabel": "所有工作区",
     "xpack.spaces.shareToSpace.shareModeControl.shareToAllSpaces.cannotChangeTooltip": "您还需要其他权限，才能更改此选项。",
@@ -26500,15 +28101,17 @@
     "xpack.spaces.shareToSpace.spacesLoadErrorTitle": "加载可用工作区时出错",
     "xpack.spaces.shareToSpace.spacesTarget": "{spacesCount, plural, other {# 个工作区}}",
     "xpack.spaces.shareToSpace.unknownSpacesLabel.additionalPrivilegesLink": "其他权限",
+    "xpack.spaces.shareToSpace.unknownSpacesLabel.text": "要查看 {hiddenCount} 个隐藏的工作区，您需要{additionalPrivilegesLink}。",
     "xpack.spaces.spaceList.allSpacesLabel": "* 所有工作区",
     "xpack.spaces.spaceList.showLessSpacesLink": "显示更少",
     "xpack.spaces.spaceList.showMoreSpacesLink": "另外 {count} 个",
     "xpack.spaces.spaceList.unauthorizedSpacesCountLabel": "您无权查看这些工作区。",
     "xpack.spaces.spaceSelector.appTitle": "选择工作区",
-    "xpack.spaces.spaceSelector.changeSpaceAnytimeAvailabilityText": "您可以随时更改您的空间",
+    "xpack.spaces.spaceSelector.changeSpaceAnytimeAvailabilityText": "您可以随时更改您的工作区。",
     "xpack.spaces.spaceSelector.contactSysAdminDescription": "请联系您的系统管理员。",
     "xpack.spaces.spaceSelector.errorLoadingSpacesDescription": "加载工作区时出错 ({message})",
     "xpack.spaces.spaceSelector.findSpacePlaceholder": "查找工作区",
+    "xpack.spaces.spaceSelector.noSpacesMatchSearchCriteriaDescription": "没有匹配 {searchTerm} 的工作区",
     "xpack.spaces.spaceSelector.selectSpacesTitle": "选择您的空间",
     "xpack.spaces.spacesTitle": "工作区",
     "xpack.spaces.uiApi.errorBoundaryToastMessage": "重新加载页面以继续。",
@@ -26542,8 +28145,9 @@
     "xpack.stackAlerts.esQuery.missingEsQueryErrorMessage": "[esQuery]：必须包含“query”",
     "xpack.stackAlerts.esQuery.ui.alertParams.fixErrorInExpressionBelowValidationMessage": "表达式包含错误。",
     "xpack.stackAlerts.esQuery.ui.alertType.defaultActionMessage": "Elasticsearch 查询告警“\\{\\{alertName\\}\\}”处于活动状态：\n\n- 值：\\{\\{context.value\\}\\}\n- 满足的条件：\\{\\{context.conditions\\}\\} 超过 \\{\\{params.timeWindowSize\\}\\}\\{\\{params.timeWindowUnit\\}\\}\n- 时间戳：\\{\\{context.date\\}\\}",
-    "xpack.stackAlerts.esQuery.ui.alertType.descriptionText": "匹配 Elasticsearch 查询时告警。",
+    "xpack.stackAlerts.esQuery.ui.alertType.descriptionText": "在运行最新查询期间找到匹配项时告警。",
     "xpack.stackAlerts.esQuery.ui.conditionPrompt": "当匹配数目",
+    "xpack.stackAlerts.esQuery.ui.conditionPrompt.toolTip": "下面定义的时间窗口仅适用于第一次规则检查。",
     "xpack.stackAlerts.esQuery.ui.numQueryMatchesText": "查询在过去 {window} 匹配 {count} 个文档。",
     "xpack.stackAlerts.esQuery.ui.queryEditor": "Elasticsearch 查询编辑器",
     "xpack.stackAlerts.esQuery.ui.queryError": "测试查询时出错：{message}",
@@ -26618,6 +28222,8 @@
     "xpack.stackAlerts.indexThreshold.actionVariableContextValueLabel": "超过阈值的值。",
     "xpack.stackAlerts.indexThreshold.alertTypeContextMessageDescription": "“{group}”组的告警“{name}”处于活动状态：\n\n- 值：{value}\n- 满足的条件：{conditions} 超过 {window}\n- 时间戳：{date}",
     "xpack.stackAlerts.indexThreshold.alertTypeContextSubjectTitle": "告警 {name} 组 {group} 达到阈值",
+    "xpack.stackAlerts.indexThreshold.alertTypeRecoveryContextMessageDescription": "“{group}”组的告警“{name}”已恢复：\n\n- 值：{value}\n- 满足的条件：{conditions} 超过 {window}\n- 时间戳：{date}",
+    "xpack.stackAlerts.indexThreshold.alertTypeRecoveryContextSubjectTitle": "告警 {name} 组 {group} 已恢复",
     "xpack.stackAlerts.indexThreshold.alertTypeTitle": "索引阈值",
     "xpack.stackAlerts.indexThreshold.invalidComparatorErrorMessage": "指定的 thresholdComparator 无效：{comparator}",
     "xpack.stackAlerts.indexThreshold.invalidThreshold2ErrorMessage": "[threshold]：对于“{thresholdComparator}”比较运算符，必须包含两个元素",
@@ -26670,13 +28276,18 @@
     "xpack.timelines.fieldBrowser.descriptionLabel": "描述",
     "xpack.timelines.fieldBrowser.fieldBrowserTitle": "字段",
     "xpack.timelines.fieldBrowser.fieldLabel": "字段",
-    "xpack.timelines.fieldBrowser.fieldsCountTitle": "{totalCount} 个{totalCount, plural, other {字段}}",
+    "xpack.timelines.fieldBrowser.fieldName": "名称",
+    "xpack.timelines.fieldBrowser.fieldsCountShowing": "正在显示",
+    "xpack.timelines.fieldBrowser.fieldsCountTitle": "{totalCount, plural, other {字段}}",
     "xpack.timelines.fieldBrowser.fieldsTitle": "字段",
     "xpack.timelines.fieldBrowser.filterPlaceholder": "字段名称",
     "xpack.timelines.fieldBrowser.noFieldsMatchInputLabel": "没有字段匹配“{searchInput}”",
     "xpack.timelines.fieldBrowser.noFieldsMatchLabel": "没有字段匹配",
     "xpack.timelines.fieldBrowser.resetFieldsLink": "重置字段",
+    "xpack.timelines.fieldBrowser.viewAll": "全部",
     "xpack.timelines.fieldBrowser.viewColumnCheckboxAriaLabel": "查看 {field} 列",
+    "xpack.timelines.fieldBrowser.viewLabel": "查看",
+    "xpack.timelines.fieldBrowser.viewSelected": "已选定",
     "xpack.timelines.footer.autoRefreshActiveDescription": "自动刷新已启用",
     "xpack.timelines.footer.autoRefreshActiveTooltip": "自动刷新已启用时，时间线将显示匹配查询的最近 {numberOfItems} 个事件。",
     "xpack.timelines.footer.events": "事件",
@@ -26801,13 +28412,17 @@
     "xpack.transform.alertingRuleTypes.transformHealth.name": "转换运行状况",
     "xpack.transform.alertTypes.transformHealth.alertContext.messageDescription": "告警信息消息",
     "xpack.transform.alertTypes.transformHealth.alertContext.resultsDescription": "规则执行结果",
-    "xpack.transform.alertTypes.transformHealth.defaultActionMessage": "[\\{\\{rule.name\\}\\}] 转换运行状况检查结果：\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  转换 ID：\\{\\{transform_id\\}\\}\n  \\{\\{#description\\}\\}转换描述：\\{\\{description\\}\\}\n  \\{\\{/description\\}\\}\\{\\{#transform_state\\}\\}转换状态：\\{\\{transform_state\\}\\}\n  \\{\\{/transform_state\\}\\}\\{\\{#failure_reason\\}\\}失败原因：\\{\\{failure_reason\\}\\}\n  \\{\\{/failure_reason\\}\\}\\{\\{#notification_message\\}\\}通知消息：\\{\\{notification_message\\}\\}\n  \\{\\{/notification_message\\}\\}\\{\\{#node_name\\}\\}节点名称：\\{\\{node_name\\}\\}\n  \\{\\{/node_name\\}\\}\\{\\{#timestamp\\}\\}时间戳：\\{\\{timestamp\\}\\}\n  \\{\\{/timestamp\\}\\}\n\n\\{\\{/context.results\\}\\}\n",
+    "xpack.transform.alertTypes.transformHealth.defaultActionMessage": "[\\{\\{rule.name\\}\\}] 转换运行状况检查结果：\n\\{\\{context.message\\}\\}\n\\{\\{#context.results\\}\\}\n  转换 ID：\\{\\{transform_id\\}\\}\n  \\{\\{#description\\}\\}转换描述：\\{\\{description\\}\\}\n  \\{\\{/description\\}\\}\\{\\{#transform_state\\}\\}转换状态：\\{\\{transform_state\\}\\}\n  \\{\\{/transform_state\\}\\}\\{\\{#failure_reason\\}\\}失败原因：\\{\\{failure_reason\\}\\}\n  \\{\\{/failure_reason\\}\\}\\{\\{#notification_message\\}\\}通知消息：\\{\\{notification_message\\}\\}\n  \\{\\{/notification_message\\}\\}\\{\\{#node_name\\}\\}节点名称：\\{\\{node_name\\}\\}\n  \\{\\{/node_name\\}\\}\\{\\{#timestamp\\}\\}时间戳：\\{\\{timestamp\\}\\}\n  \\{\\{/timestamp\\}\\}\\{\\{#error_messages\\}\\}错误消息：\\{\\{message\\}\\}\n  \\{\\{/error_messages\\}\\}\n\n\\{\\{/context.results\\}\\}\n",
+    "xpack.transform.alertTypes.transformHealth.errorMessagesCheckDescription": "转换的消息包含错误时收到告警。",
+    "xpack.transform.alertTypes.transformHealth.errorMessagesCheckName": "转换消息中包含错误",
+    "xpack.transform.alertTypes.transformHealth.errorMessagesMessage": "{count, plural, other {转换}} {transformsString} {count, plural, other {包含}}错误消息。",
     "xpack.transform.alertTypes.transformHealth.excludeTransformsLabel": "排除转换",
     "xpack.transform.alertTypes.transformHealth.includeTransforms.errorMessage": "必须至少选择一个转换",
     "xpack.transform.alertTypes.transformHealth.includeTransformsLabel": "包括转换",
     "xpack.transform.alertTypes.transformHealth.notStartedCheckDescription": "转换未启动或未索引数据时接收告警。",
     "xpack.transform.alertTypes.transformHealth.notStartedCheckName": "转换未启动",
-    "xpack.transform.alertTypes.transformHealth.notStartedMessage": "{count, plural, other {转换}} {transformsString} {count, plural, other {}} 未启动。",
+    "xpack.transform.alertTypes.transformHealth.notStartedMessage": "{count, plural, other {转换}} {transformsString} {count, plural, other {}}未启动。",
+    "xpack.transform.alertTypes.transformHealth.testsConfigTransforms.errorMessage": "必须至少选择一次运行状况检查",
     "xpack.transform.alertTypes.transformHealth.testsSelection.enableTestLabel": "启用",
     "xpack.transform.app.checkingPrivilegesDescription": "正在检查权限……",
     "xpack.transform.app.checkingPrivilegesErrorMessage": "从服务器获取用户权限时出错",
@@ -27520,6 +29135,28 @@
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.userTextFieldLabel": "用户名",
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.valueTextFieldLabel": "值",
     "xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.viewHeadersSwitch": "添加 HTTP 标头",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.actionTypeTitle": "xMatters 数据",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.authenticationLabel": "身份验证",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.basicAuthLabel": "基本身份验证",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.connectorSettingsFieldLabel": "发起 URL",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.connectorSettingsLabel": "选择在设置 xMatters 触发器时使用的身份验证方法。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.error.invalidUrlTextField": "URL 无效。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.error.requiredUrlText": "“URL”必填。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.initiationUrlHelpText": "包括完整 xMatters url。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.passwordTextFieldLabel": "密码",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.reenterBasicAuthValuesLabel": "用户和密码已加密。请为这些字段重新输入值。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.reenterUrlAuthValuesLabel": "URL 已加密。请为此字段重新输入值。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.selectMessageText": "触发 xMatters 工作流。",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severity": "严重性",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectCriticalOptionLabel": "紧急",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectHighOptionLabel": "高",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectLowOptionLabel": "低",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectMediumOptionLabel": "中",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.severitySelectMinimalOptionLabel": "最小",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.tags": "标签",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.urlAuthLabel": "URL 身份验证",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.userCredsLabel": "用户凭据",
+    "xpack.triggersActionsUI.components.builtinActionTypes.xmattersAction.userTextFieldLabel": "用户名",
     "xpack.triggersActionsUI.components.deleteSelectedIdsErrorNotification.descriptionText": "无法删除 {numErrors, number} 个{numErrors, plural, one {{singleTitle}} other {{multipleTitle}}}",
     "xpack.triggersActionsUI.components.emptyConnectorsPrompt.addConnectorButtonLabel": "创建连接器",
     "xpack.triggersActionsUI.components.emptyConnectorsPrompt.addConnectorEmptyBody": "配置电子邮件、Slack、Elasticsearch，以及 Kibana 运行的第三方服务。",
@@ -27564,12 +29201,14 @@
     "xpack.triggersActionsUI.home.docsLinkText": "文档",
     "xpack.triggersActionsUI.home.rulesTabTitle": "规则",
     "xpack.triggersActionsUI.home.sectionDescription": "使规则检测条件，并使用连接器采取操作。",
+    "xpack.triggersActionsUI.home.TabTitle": "告警（仅限内部使用）",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByConfigMessageTitle": "此功能已由 Kibana 配置禁用。",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseLinkTitle": "查看许可证选项",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseMessageDescription": "要重新启用此操作，请升级您的许可证。",
     "xpack.triggersActionsUI.licenseCheck.actionTypeDisabledByLicenseMessageTitle": "此功能需要{minimumLicenseRequired}许可证。",
     "xpack.triggersActionsUI.managementSection.displayDescription": "使规则检测条件，并使用连接器采取操作。",
     "xpack.triggersActionsUI.managementSection.displayName": "规则和连接器",
+    "xpack.triggersActionsUI.parseInterval.errorMessage": "{value} 不是时间间隔字符串",
     "xpack.triggersActionsUI.rules.breadcrumbTitle": "规则",
     "xpack.triggersActionsUI.sections.actionConnectorAdd.backButtonLabel": "返回",
     "xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel": "取消",
@@ -27637,6 +29276,10 @@
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredMethodText": "“方法”必填",
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredPasswordText": "使用用户名时，“密码”必填。",
     "xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredUserText": "使用密码时，“用户名”必填。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredAuthPasswordText": "“密码”必填。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredAuthUserNameText": "“用户名”必填。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredPasswordText": "使用用户名时，“密码”必填。",
+    "xpack.triggersActionsUI.sections.addAction.xmattersAction.error.requiredUserText": "使用密码时，“用户名”必填。",
     "xpack.triggersActionsUI.sections.addConnectorForm.flyoutTitle": "{actionTypeName} 连接器",
     "xpack.triggersActionsUI.sections.addConnectorForm.selectConnectorFlyoutTitle": "选择连接器",
     "xpack.triggersActionsUI.sections.addConnectorForm.updateErrorNotificationText": "无法创建连接器。",
@@ -27645,6 +29288,66 @@
     "xpack.triggersActionsUI.sections.addModalConnectorForm.flyoutTitle": "{actionTypeName} 连接器",
     "xpack.triggersActionsUI.sections.addModalConnectorForm.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.addModalConnectorForm.updateSuccessNotificationText": "已创建“{connectorName}”",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addBccButton": "密送",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton": "抄送",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.authenticationLabel": "身份验证",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientIdFieldLabel": "客户端 ID",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientSecretTextFieldLabel": "客户端密钥",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.fromTextFieldLabel": "发送者",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hasAuthSwitchLabel": "需要对此服务器进行身份验证",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hostTextFieldLabel": "主机",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel": "消息",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel": "密码",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.portTextFieldLabel": "端口",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientBccTextFieldLabel": "密送",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel": "抄送",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel": "至",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.secureSwitchLabel": "安全",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.serviceTextFieldLabel": "服务",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel": "主题",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.tenantIdFieldLabel": "租户 ID",
+    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "用户名",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseCancelButtonText": "取消",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseConfirmButtonText": "放弃更改",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseMessage": "您无法恢复未保存更改。",
+    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseTitle": "丢弃规则的未保存更改？",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveCancelButtonText": "取消",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveConfirmButtonText": "保存规则",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveTitle": "保存规则，而不执行任何操作？",
+    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveWithoutActionsMessage": "您可以随时添加操作。",
+    "xpack.triggersActionsUI.sections.connectorAddInline.accordion.deleteIconAriaLabel": "删除",
+    "xpack.triggersActionsUI.sections.connectorAddInline.addConnectorButtonLabel": "创建连接器",
+    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.actionIdLabel": "使用其他 {connectorInstance} 连接器",
+    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.addNewConnectorEmptyButton": "添加连接器",
+    "xpack.triggersActionsUI.sections.connectorAddInline.emptyConnectorsLabel": "无 {actionTypeName} 连接器",
+    "xpack.triggersActionsUI.sections.connectorAddInline.newRuleActionTypeEditTitle": "{actionConnectorName}",
+    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle": "无法加载连接器",
+    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle'": "无法加载连接器",
+    "xpack.triggersActionsUI.sections.connectorAddInline.unauthorizedToCreateForEmptyConnectors": "只有获得授权的用户才能配置连接器。请联系您的管理员。",
+    "xpack.triggersActionsUI.sections.deprecatedTitleMessage": "（已过时）",
+    "xpack.triggersActionsUI.sections.editConnectorForm.actionTypeDescription": "{actionDescription}",
+    "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "取消",
+    "xpack.triggersActionsUI.sections.editConnectorForm.descriptionText": "此连接器为只读。",
+    "xpack.triggersActionsUI.sections.editConnectorForm.flyoutPreconfiguredTitle": "编辑连接器",
+    "xpack.triggersActionsUI.sections.editConnectorForm.preconfiguredHelpLabel": "详细了解预配置的连接器。",
+    "xpack.triggersActionsUI.sections.editConnectorForm.saveAndCloseButtonLabel": "保存并关闭",
+    "xpack.triggersActionsUI.sections.editConnectorForm.saveButtonLabel": "保存",
+    "xpack.triggersActionsUI.sections.editConnectorForm.tabText": "配置",
+    "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "无法更新连接器。",
+    "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "已更新“{connectorName}”",
+    "xpack.triggersActionsUI.sections.executionDurationChart.avgDurationLabel": "平均持续时间",
+    "xpack.triggersActionsUI.sections.executionDurationChart.durationLabel": "持续时间",
+    "xpack.triggersActionsUI.sections.executionDurationChart.executionDurationNoData": "此规则没有可用执行。",
+    "xpack.triggersActionsUI.sections.executionDurationChart.numberOfExecutionsOption": "{value} 次执行",
+    "xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTitle": "最近执行持续时间",
+    "xpack.triggersActionsUI.sections.executionDurationChart.selectNumberOfExecutionDurationsLabel": "选择执行次数",
+    "xpack.triggersActionsUI.sections.isDeprecatedDescription": "此连接器已过时。请进行更新，或创建新连接器。",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseCancelButtonText": "取消",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseConfirmButtonText": "管理许可证",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseMessage": "规则类型 {ruleTypeId} 已禁用，因为它需要{licenseRequired}许可证。继续前往“许可证管理”查看升级选项。",
+    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseTitle": "需要{licenseRequired}许可证",
+    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.flyoutTitle": "{connectorName}",
+    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.tooltipContent": "这是预配置连接器，无法编辑",
     "xpack.triggersActionsUI.sections.ruleAdd.flyoutTitle": "创建规则",
     "xpack.triggersActionsUI.sections.ruleAdd.indexControls.timeFieldOptionLabel": "选择字段",
     "xpack.triggersActionsUI.sections.ruleAdd.operationName": "创建",
@@ -27654,12 +29357,45 @@
     "xpack.triggersActionsUI.sections.ruleAddFooter.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.ruleDetails.actionWithBrokenConnectorWarningBannerEditText": "编辑规则",
     "xpack.triggersActionsUI.sections.ruleDetails.actionWithBrokenConnectorWarningBannerTitle": "与此规则关联的连接器之一出现问题。",
-    "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.avgDurationDescription": "平均持续时间",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.Alert": "告警",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.duration": "持续时间",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.mute": "静音",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.start": "启动",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.columns.status": "状态",
+    "xpack.triggersActionsUI.sections.ruleDetails.alertsList.ruleTypeExcessDurationMessage": "持续时间超出了规则的预期运行时间。",
     "xpack.triggersActionsUI.sections.ruleDetails.editRuleButtonLabel": "编辑",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.activeAlerts": "活动告警",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.apiError": "无法提取执行历史记录",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.duration": "持续时间",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.erroredActions": "错误操作",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.esSearchDuration": "ES 搜索持续时间",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.id": "ID",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.message": "消息",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.newAlerts": "新告警",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.recoveredAlerts": "已恢复告警",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.scheduledActions": "已计划操作",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.scheduleDelay": "计划延迟",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.status": "状态",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.succeededActions": "成功的操作",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.timedOut": "已超时",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.timestamp": "时间戳",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.totalSearchDuration": "搜索持续时间总计",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.triggeredActions": "已触发操作",
+    "xpack.triggersActionsUI.sections.ruleDetails.eventLogStatusFilterLabel": "状态",
     "xpack.triggersActionsUI.sections.ruleDetails.manageLicensePlanBannerLinkTitle": "管理许可证",
     "xpack.triggersActionsUI.sections.ruleDetails.redirectObjectNoun": "规则",
+    "xpack.triggersActionsUI.sections.ruleDetails.rule.alertsTabText": "告警",
+    "xpack.triggersActionsUI.sections.ruleDetails.rule.eventLogTabText": "执行历史记录",
+    "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.ruleLastExecutionDescription": "上次响应",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.status.active": "活动",
+    "xpack.triggersActionsUI.sections.ruleDetails.rulesList.status.inactive": "已恢复",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastMessage": "此规则设置的时间间隔低于配置的最小时间间隔。这可能会影响性能。",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastMessageButton": "编辑规则",
+    "xpack.triggersActionsUI.sections.ruleDetails.scheduleIntervalToastTitle": "配置设置",
     "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRuleMessage": "无法加载规则：{message}",
-    "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRulesMessage": "无法加载告警：{message}",
+    "xpack.triggersActionsUI.sections.ruleDetails.unableToLoadRulesMessage": "无法加载规则：{message}",
     "xpack.triggersActionsUI.sections.ruleDetails.viewRuleInAppButtonLabel": "在应用中查看",
     "xpack.triggersActionsUI.sections.ruleEdit.cancelButtonLabel": "取消",
     "xpack.triggersActionsUI.sections.ruleEdit.disabledActionsWarningTitle": "此规则具有已禁用的操作",
@@ -27667,24 +29403,16 @@
     "xpack.triggersActionsUI.sections.ruleEdit.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.ruleEdit.saveErrorNotificationText": "无法更新规则。",
     "xpack.triggersActionsUI.sections.ruleEdit.saveSuccessNotificationText": "已更新“{ruleName}”",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNameLabel": "名称",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label": "每",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.description": "操作在告警状态更改时运行。",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.display": "仅在状态更改时",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.label": "仅在状态更改时",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.description": "告警活动时，操作按规则时间间隔重复。",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.display": "每次告警处于活动状态时",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.label": "每次告警处于活动状态时",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.description": "操作按照您设置的时间间隔运行。",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.display": "按定制操作时间间隔",
-    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.label": "按定制操作时间间隔",
     "xpack.triggersActionsUI.sections.ruleForm.changeRuleTypeAriaLabel": "删除",
+    "xpack.triggersActionsUI.sections.ruleForm.checkEveryHelpSuggestionText": "出于性能考虑，不建议时间间隔小于 {minimum}。",
+    "xpack.triggersActionsUI.sections.ruleForm.checkEveryHelpText": "时间间隔必须至少为 {minimum}。",
     "xpack.triggersActionsUI.sections.ruleForm.checkFieldLabel": "检查频率",
-    "xpack.triggersActionsUI.sections.ruleForm.checkWithTooltip": "定义评估条件的频率。",
+    "xpack.triggersActionsUI.sections.ruleForm.checkWithTooltip": "定义评估条件的频率。检查已排队；它们的运行接近于容量允许的定义值。xpack.alerting.rules.minimumScheduleInterval.value 设置定义了最小值。xpack.alerting.rules.minimumScheduleInterval.enforce 设置定义此最小值是必需值还是建议值。",
     "xpack.triggersActionsUI.sections.ruleForm.conditions.addConditionLabel": "添加：",
     "xpack.triggersActionsUI.sections.ruleForm.conditions.removeConditionLabel": "移除",
     "xpack.triggersActionsUI.sections.ruleForm.conditions.title": "条件：",
     "xpack.triggersActionsUI.sections.ruleForm.documentationLabel": "文档",
+    "xpack.triggersActionsUI.sections.ruleForm.error.belowMinimumText": "时间间隔必须至少为 {minimum}。",
     "xpack.triggersActionsUI.sections.ruleForm.error.noAuthorizedRuleTypes": "为了{operation}规则，您需要获得相应的权限。",
     "xpack.triggersActionsUI.sections.ruleForm.error.noAuthorizedRuleTypesTitle": "您尚无权{operation}任何规则类型",
     "xpack.triggersActionsUI.sections.ruleForm.error.requiredActionConnector": "“{actionTypeId} 连接器的操作”必填。",
@@ -27695,6 +29423,17 @@
     "xpack.triggersActionsUI.sections.ruleForm.loadingRuleTypesDescription": "正在加载规则类型……",
     "xpack.triggersActionsUI.sections.ruleForm.renotifyFieldLabel": "通知",
     "xpack.triggersActionsUI.sections.ruleForm.renotifyWithTooltip": "定义规则处于活动状态时重复操作的频率。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNameLabel": "名称",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.label": "每",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.description": "操作在规则状态更改时运行。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.display": "仅在状态更改时",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActionGroupChange.label": "仅在状态更改时",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.description": "规则活动时，操作按规则时间间隔重复。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.display": "每次规则处于活动状态时",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onActiveAlert.label": "每次规则处于活动状态时",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.description": "操作按照您设置的时间间隔运行。",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.display": "按定制操作时间间隔",
+    "xpack.triggersActionsUI.sections.ruleForm.ruleNotifyWhen.onThrottleInterval.label": "按定制操作时间间隔",
     "xpack.triggersActionsUI.sections.ruleForm.ruleTypeSelectLabel": "选择规则类型",
     "xpack.triggersActionsUI.sections.ruleForm.searchPlaceholderTitle": "搜索",
     "xpack.triggersActionsUI.sections.ruleForm.solutionFilterLabel": "按用例筛选",
@@ -27702,29 +29441,7 @@
     "xpack.triggersActionsUI.sections.ruleForm.unableToLoadRuleTypesMessage": "无法加载规则类型",
     "xpack.triggersActionsUI.sections.rulesList.actionTypeFilterLabel": "操作类型",
     "xpack.triggersActionsUI.sections.rulesList.addRuleButtonLabel": "创建规则",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDecrypting": "解密规则时发生错误。",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonLicense": "无法运行规则",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonReading": "读取规则时发生错误。",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonRunning": "运行规则时发生错误。",
-    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonUnknown": "由于未知原因发生错误。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsTex": "操作",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsWarningTooltip": "无法加载与此规则关联的连接器之一。请编辑该规则以选择新连接器。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleTypeTitle": "类型",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteAriaLabel": "删除",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteButtonTooltip": "删除",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.durationTitle": "运行规则所需的时间长度。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editAriaLabel": "编辑",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editButtonTooltip": "编辑",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastExecutionDateTitle": "上次执行的开始时间。",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.nameTitle": "名称",
-    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.scheduleTitle": "时间间隔",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusActive": "活动",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusError": "错误",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusFilterLabel": "状态",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusLicenseError": "许可证错误",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusOk": "确定",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusPending": "待处理",
-    "xpack.triggersActionsUI.sections.rulesList.ruleStatusUnknown": "未知",
+    "xpack.triggersActionsUI.sections.rulesList.applySnooze": "应用",
     "xpack.triggersActionsUI.sections.rulesList.attentionBannerTitle": "{totalStatusesError, plural, other {# 个规则}}中出现错误。",
     "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.buttonTitle": "管理规则",
     "xpack.triggersActionsUI.sections.rulesList.bulkActionPopover.deleteAllTitle": "删除",
@@ -27744,86 +29461,83 @@
     "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.muteTitle": "静音",
     "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.popoverButtonTitle": "操作",
     "xpack.triggersActionsUI.sections.rulesList.collapsedItemActons.unmuteTitle": "取消静音",
+    "xpack.triggersActionsUI.sections.rulesList.daysLabel": "天",
+    "xpack.triggersActionsUI.sections.rulesList.disabledRuleStatus": "已禁用",
+    "xpack.triggersActionsUI.sections.rulesList.enabledRuleStatus": "已启用",
+    "xpack.triggersActionsUI.sections.rulesList.expandRow.title": "错误来自上次运行",
     "xpack.triggersActionsUI.sections.rulesList.fixLicenseLink": "修复",
+    "xpack.triggersActionsUI.sections.rulesList.hideAllErrors": "隐藏{totalStatusesError, plural, other {错误}}",
+    "xpack.triggersActionsUI.sections.rulesList.hoursLabel": "小时",
+    "xpack.triggersActionsUI.sections.rulesList.minutesLabel": "分钟",
+    "xpack.triggersActionsUI.sections.rulesList.monthsLabel": "个月",
     "xpack.triggersActionsUI.sections.rulesList.multipleTitle": "规则",
     "xpack.triggersActionsUI.sections.rulesList.noPermissionToCreateDescription": "请联系您的系统管理员。",
     "xpack.triggersActionsUI.sections.rulesList.noPermissionToCreateTitle": "没有创建规则的权限",
     "xpack.triggersActionsUI.sections.rulesList.refreshRulesButtonLabel": "刷新",
+    "xpack.triggersActionsUI.sections.rulesList.remainingSnoozeIndefinite": "无限期",
     "xpack.triggersActionsUI.sections.rulesList.resetDefaultIndexLabel": "重置默认索引",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDecrypting": "解密规则时发生错误。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonDisabled": "无法执行规则，因为在规则禁用之后已运行。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonLicense": "无法运行规则",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonReading": "读取规则时发生错误。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonRunning": "运行规则时发生错误。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonTimeout": "由于超时，规则执行已取消。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleErrorReasonUnknown": "由于未知原因发生错误。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsTex": "操作",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.actionsWarningTooltip": "无法加载与此规则关联的连接器之一。请编辑该规则以选择新连接器。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteAriaLabel": "删除",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.deleteButtonTooltip": "删除",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.durationTitle": "运行规则所需的时间长度 (mm:ss)。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editAriaLabel": "编辑",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.editButtonTooltip": "编辑",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalIconAriaLabel": "低于配置的最小时间间隔",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalTooltipText": "{interval} 的规则时间间隔低于配置的最小时间间隔 {minimumInterval}。这可能会影响告警性能。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.intervalTooltipTitle": "低于配置的最小时间间隔",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastExecutionDateTitle": "上次执行的开始时间。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.lastResponseTitle": "上次响应",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.nameTitle": "名称",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleExecutionPercentileSelectButton": "选择百分位数",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleExecutionPercentileTooltip": "此规则过去的 {sampleLimit} 执行持续时间 (mm:ss) 的第 {percentileOrdinal} 个百分位。",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.ruleTypeTitle": "类型",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.scheduleTitle": "时间间隔",
+    "xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.successRatioTitle": "成功执行此规则的频率。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusActive": "活动",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusDropdownMenuLabel": "更改规则状态或暂停",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusError": "错误",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusFilterLabel": "上次响应",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusLicenseError": "许可证错误",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusOk": "确定",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusPending": "待处理",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusUnknown": "未知",
+    "xpack.triggersActionsUI.sections.rulesList.ruleStatusWarning": "警告",
     "xpack.triggersActionsUI.sections.rulesList.ruleTypeExcessDurationMessage": "持续时间超出了规则的预期运行时间。",
+    "xpack.triggersActionsUI.sections.rulesList.ruleWarningReasonMaxExecutableActions": "已超过操作限制",
+    "xpack.triggersActionsUI.sections.rulesList.ruleWarningReasonUnknown": "未知原因",
     "xpack.triggersActionsUI.sections.rulesList.searchPlaceholderTitle": "搜索",
+    "xpack.triggersActionsUI.sections.rulesList.showAllErrors": "显示{totalStatusesError, plural, other {错误}}",
     "xpack.triggersActionsUI.sections.rulesList.singleTitle": "规则",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeCommonlyUsed": "常用",
+    "xpack.triggersActionsUI.sections.rulesList.snoozedRuleStatus": "已暂停",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeIndefinitely": "无限期暂停",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeMenuTitle": "暂停",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeOneDay": "1 天",
+    "xpack.triggersActionsUI.sections.rulesList.snoozeOneHour": "1 小时",
+    "xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalUnitLabel": "暂停时间间隔单位",
+    "xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalValueLabel": "暂停时间间隔值",
     "xpack.triggersActionsUI.sections.rulesList.totalItemsCountDescription": "正在显示：{pageSize} 个规则（共 {totalItemCount} 个）。",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesActiveDescription": "活动：{totalStatusesActive}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesErrorDescription": "错误：{totalStatusesError}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesOkDescription": "确定：{totalStatusesOk}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesPendingDescription": "待处理：{totalStatusesPending}",
     "xpack.triggersActionsUI.sections.rulesList.totalStatusesUnknownDescription": "未知：{totalStatusesUnknown}",
+    "xpack.triggersActionsUI.sections.rulesList.totalStatusesWarningDescription": "警告：{totalStatusesWarning}",
     "xpack.triggersActionsUI.sections.rulesList.typeFilterLabel": "类型",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadConnectorTypesMessage": "无法加载连接器类型",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadRulesMessage": "无法加载规则",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadRuleStatusInfoMessage": "无法加载规则状态信息",
     "xpack.triggersActionsUI.sections.rulesList.unableToLoadRuleTypesMessage": "无法加载规则类型",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addBccButton": "密送",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.addCcButton": "抄送",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.authenticationLabel": "身份验证",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientIdFieldLabel": "客户端 ID",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.clientSecretTextFieldLabel": "客户端密钥",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.fromTextFieldLabel": "发送者",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hasAuthSwitchLabel": "需要对此服务器进行身份验证",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hostTextFieldLabel": "主机",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.messageTextAreaFieldLabel": "消息",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel": "密码",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.portTextFieldLabel": "端口",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientBccTextFieldLabel": "密送",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel": "抄送",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel": "至",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.secureSwitchLabel": "安全",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.serviceTextFieldLabel": "服务",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel": "主题",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.tenantIdFieldLabel": "租户 ID",
-    "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "用户名",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseCancelButtonText": "取消",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseConfirmButtonText": "放弃更改",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseMessage": "您无法恢复未保存更改。",
-    "xpack.triggersActionsUI.sections.confirmRuleClose.confirmRuleCloseTitle": "丢弃规则的未保存更改？",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveCancelButtonText": "取消",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveConfirmButtonText": "保存规则",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveTitle": "保存规则，而不执行任何操作？",
-    "xpack.triggersActionsUI.sections.confirmRuleSave.confirmRuleSaveWithoutActionsMessage": "您可以随时添加操作。",
-    "xpack.triggersActionsUI.sections.connectorAddInline.accordion.deleteIconAriaLabel": "删除",
-    "xpack.triggersActionsUI.sections.connectorAddInline.addConnectorButtonLabel": "创建连接器",
-    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.actionIdLabel": "使用其他 {connectorInstance} 连接器",
-    "xpack.triggersActionsUI.sections.connectorAddInline.connectorAddInline.addNewConnectorEmptyButton": "添加连接器",
-    "xpack.triggersActionsUI.sections.connectorAddInline.emptyConnectorsLabel": "无 {actionTypeName} 连接器",
-    "xpack.triggersActionsUI.sections.connectorAddInline.newRuleActionTypeEditTitle": "{actionConnectorName}",
-    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle": "无法加载连接器",
-    "xpack.triggersActionsUI.sections.connectorAddInline.unableToLoadConnectorTitle'": "无法加载连接器",
-    "xpack.triggersActionsUI.sections.connectorAddInline.unauthorizedToCreateForEmptyConnectors": "只有获得授权的用户才能配置连接器。请联系您的管理员。",
-    "xpack.triggersActionsUI.sections.deprecatedTitleMessage": "（已过时）",
-    "xpack.triggersActionsUI.sections.editConnectorForm.actionTypeDescription": "{actionDescription}",
-    "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "取消",
-    "xpack.triggersActionsUI.sections.editConnectorForm.descriptionText": "此连接器为只读。",
-    "xpack.triggersActionsUI.sections.editConnectorForm.flyoutPreconfiguredTitle": "编辑连接器",
-    "xpack.triggersActionsUI.sections.editConnectorForm.preconfiguredHelpLabel": "详细了解预配置的连接器。",
-    "xpack.triggersActionsUI.sections.editConnectorForm.saveAndCloseButtonLabel": "保存并关闭",
-    "xpack.triggersActionsUI.sections.editConnectorForm.saveButtonLabel": "保存",
-    "xpack.triggersActionsUI.sections.editConnectorForm.tabText": "配置",
-    "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "无法更新连接器。",
-    "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "已更新“{connectorName}”",
-    "xpack.triggersActionsUI.sections.executionDurationChart.avgDurationLabel": "平均持续时间",
-    "xpack.triggersActionsUI.sections.executionDurationChart.durationLabel": "持续时间",
-    "xpack.triggersActionsUI.sections.executionDurationChart.executionDurationNoData": "此规则没有可用执行。",
-    "xpack.triggersActionsUI.sections.executionDurationChart.numberOfExecutionsOption": "{value} 次执行",
-    "xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTitle": "最近执行持续时间",
-    "xpack.triggersActionsUI.sections.executionDurationChart.selectNumberOfExecutionDurationsLabel": "选择执行次数",
-    "xpack.triggersActionsUI.sections.isDeprecatedDescription": "此连接器已过时。请进行更新，或创建新连接器。",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseCancelButtonText": "取消",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseConfirmButtonText": "管理许可证",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseMessage": "规则类型 {ruleTypeId} 已禁用，因为它需要{licenseRequired}许可证。继续前往“许可证管理”查看升级选项。",
-    "xpack.triggersActionsUI.sections.manageLicense.manageLicenseTitle": "需要{licenseRequired}许可证",
-    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.flyoutTitle": "{connectorName}",
-    "xpack.triggersActionsUI.sections.preconfiguredConnectorForm.tooltipContent": "这是预配置连接器，无法编辑",
+    "xpack.triggersActionsUI.sections.rulesList.viewBannerButtonLabel": "显示包含错误的{totalStatusesError, plural, other {规则}}",
+    "xpack.triggersActionsUI.sections.rulesList.weeksLabel": "周",
     "xpack.triggersActionsUI.sections.testConnectorForm.awaitingExecutionDescription": "执行测试时，结果将显示在此处。",
     "xpack.triggersActionsUI.sections.testConnectorForm.createActionHeader": "创建操作",
     "xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton": "运行",
@@ -27928,6 +29642,8 @@
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownCollectConfig.urlTemplateVariablesHelpLinkText": "帮助",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatErrorMessage": "格式无效：{message}",
     "xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "格式无效。例如：{exampleUrl}",
+    "xpack.upgradeAssistant.app.deniedPrivilegeDescription": "要使用升级助手并解决弃用问题，必须具有管理所有 Kibana 工作区的访问权限。",
+    "xpack.upgradeAssistant.app.deniedPrivilegeTitle": "需要 Kibana 管理员角色",
     "xpack.upgradeAssistant.appTitle": "升级助手",
     "xpack.upgradeAssistant.breadcrumb.esDeprecationLogsLabel": "Elasticsearch 弃用日志",
     "xpack.upgradeAssistant.breadcrumb.esDeprecationsLabel": "Elasticsearch 弃用问题",
@@ -27938,6 +29654,9 @@
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.continueButtonLabel": "继续重新索引",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.fetchFailedCalloutTitle": "重新索引状态不可用",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.insufficientPrivilegeCallout.calloutTitle": "您没有足够的权限来重新索引此索引",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceCalloutDescription": "磁盘使用已超出低水位线，这可能会阻止重新索引。以下节点会受到影响：",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceCalloutTitle": "磁盘空间不足的节点",
+    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.lowDiskSpaceUsedText": "{nodeName}（{available} 可用）",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.readonlyCallout.backgroundResumeDetail": "将在后台执行重新索引。可以返回到升级助手，查看在 Kibana 重新启动之后恢复重新索引的进度。",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.reindexingLabel": "正在重新索引……",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexButton.restartLabel": "重新启动重新索引",
@@ -28004,6 +29723,11 @@
     "xpack.upgradeAssistant.esDeprecations.batchReindexingDocsDescription": "要在单一请求中启动多个重新索引任务，请使用 Kibana {docsLink}。",
     "xpack.upgradeAssistant.esDeprecations.batchReindexingDocsLink": "批量重新索引 API",
     "xpack.upgradeAssistant.esDeprecations.clusterDeprecationTypeLabel": "集群",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deleteCompleteText": "过时设置已移除",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deleteFailedText": "设置移除失败",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.deletingButtonLabel": "设置移除进行中……",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.resolutionText": "移除设置",
+    "xpack.upgradeAssistant.esDeprecations.clusterSettings.resolutionTooltipLabel": "通过从此集群中移除设置来解决该问题。此问题会自动解决。",
     "xpack.upgradeAssistant.esDeprecations.defaultDeprecation.manualCellLabel": "手动",
     "xpack.upgradeAssistant.esDeprecations.deprecationDetailsFlyout.closeButtonLabel": "关闭",
     "xpack.upgradeAssistant.esDeprecations.deprecationDetailsFlyout.secondaryDescription": "索引：{indexName}",
@@ -28049,6 +29773,15 @@
     "xpack.upgradeAssistant.esDeprecations.reindex.reindexPausedText": "重新索引已暂停",
     "xpack.upgradeAssistant.esDeprecations.reindex.resolutionLabel": "重新索引",
     "xpack.upgradeAssistant.esDeprecations.reindex.resolutionTooltipLabel": "通过重新索引此索引来解决此问题。此问题会自动解决。",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersDetectedDescription": "您配置了 {remoteClustersCount} 个{remoteClustersCount, plural, other {远程集群}}。如果使用跨集群搜索，请注意，8.x 只能搜索运行之前的次要版本或更高版本的远程集群。如果使用跨集群复制，则包含 Follower 索引的集群必须运行与远程集群相同或更新的版本。",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersDetectedTitle": "远程集群兼容性",
+    "xpack.upgradeAssistant.esDeprecations.remoteClustersLinkText": "查看远程集群。",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.closeButtonLabel": "关闭",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.deleteErrorTitle": "删除集群设置时出错",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.description": "是否移除以下过时集群{clusterSettingsCount, plural, other {设置}}？",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.removeButtonLabel": "移除过时设置",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.resolvedButtonLabel": "已解决",
+    "xpack.upgradeAssistant.esDeprecations.removeClusterSettingsFlyout.retryRemoveButtonLabel": "重试移除过时设置",
     "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.closeButtonLabel": "关闭",
     "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.deleteErrorTitle": "删除索引设置时出错",
     "xpack.upgradeAssistant.esDeprecations.removeSettingsFlyout.description": "是否移除以下过时索引{indexSettingsCount, plural, other {设置}}？",
@@ -28133,9 +29866,19 @@
     "xpack.upgradeAssistant.overview.deprecationsCountCheckpointTitle": "解决弃用问题并验证您的更改",
     "xpack.upgradeAssistant.overview.documentationLinkText": "文档",
     "xpack.upgradeAssistant.overview.errorLoadingUpgradeStatus": "检索升级状态时出错",
+    "xpack.upgradeAssistant.overview.fixIssuesStepDescription": "在升级到 Elastic 8.x 之前，必须解决任何严重的 Elasticsearch 和 Kibana 配置问题。在您升级后，忽略警告可能会导致行为差异。",
     "xpack.upgradeAssistant.overview.fixIssuesStepTitle": "复查已弃用设置并解决问题",
     "xpack.upgradeAssistant.overview.loadingLogsLabel": "正在加载弃用日志收集状态……",
     "xpack.upgradeAssistant.overview.loadingUpgradeStatus": "正在加载升级状态",
+    "xpack.upgradeAssistant.overview.logsStep.countDescription": "自 {checkpoint} 以来出现 {deprecationCount, plural, other {{deprecationCount}}} 个弃用{deprecationCount, plural, other {问题}}。",
+    "xpack.upgradeAssistant.overview.logsStep.description": "请复查 Elasticsearch 弃用日志以确保您未使用已弃用的 API。",
+    "xpack.upgradeAssistant.overview.logsStep.enableLogsButtonLabel": "启用日志记录",
+    "xpack.upgradeAssistant.overview.logsStep.loadingError": "检索弃用日志计数时出错",
+    "xpack.upgradeAssistant.overview.logsStep.missingPrivilegesDescription": "将继续索引弃用日志，但您无法分析这些日志，直到您具有索引读取{privilegesCount, plural, other {权限}}：{missingPrivileges}",
+    "xpack.upgradeAssistant.overview.logsStep.missingPrivilegesTitle": "您需要索引权限才能分析弃用日志",
+    "xpack.upgradeAssistant.overview.logsStep.retryButton": "重试",
+    "xpack.upgradeAssistant.overview.logsStep.title": "解决 API 弃用",
+    "xpack.upgradeAssistant.overview.logsStep.viewLogsButtonLabel": "查看日志",
     "xpack.upgradeAssistant.overview.observe.discoveryDescription": "搜索并筛选弃用日志以了解需要进行的更改类型。",
     "xpack.upgradeAssistant.overview.observe.observabilityDescription": "深入了解正在使用哪些已弃用 API 以及需要更新哪些应用程序。",
     "xpack.upgradeAssistant.overview.pageDescription": "准备使用下一版 Elastic！",
@@ -28178,6 +29921,10 @@
     "xpack.upgradeAssistant.overview.whatsNewLink": "8.x 版新增功能",
     "xpack.upgradeAssistant.reindex.reindexPrivilegesErrorBatch": "您没有足够的权限重新索引“{indexName}”。",
     "xpack.upgradeAssistant.status.allDeprecationsResolvedMessage": "所有弃用警告均已解决。",
+    "xpack.upgradeAssistant.status.deprecationsUnresolvedMessage": "在升级之前必须解决以下问题：{upgradeIssues}。",
+    "xpack.upgradeAssistant.status.esTotalCriticalDepsMessage": "{esTotalCriticalDeps} 个 Elasticsearch 弃用{esTotalCriticalDeps, plural, other {问题}}",
+    "xpack.upgradeAssistant.status.kibanaTotalCriticalDepsMessage": "{kibanaTotalCriticalDeps} 个 Kibana 弃用{kibanaTotalCriticalDeps, plural, other {问题}}",
+    "xpack.upgradeAssistant.status.systemIndicesMessage": "{notMigratedSystemIndices} 个未迁移系统{notMigratedSystemIndices, plural, other {索引}}",
     "xpack.upgradeAssistant.upgradedDescription": "所有 Elasticsearch 节点已升级。可以现在升级 Kibana。",
     "xpack.upgradeAssistant.upgradedTitle": "您的集群已升级",
     "xpack.upgradeAssistant.upgradingDescription": "一个或多个 Elasticsearch 节点的 Elasticsearch 版本比 Kibana 版本新。所有节点升级后，请升级 Kibana。",
@@ -28207,8 +29954,10 @@
     "xpack.uptime.alerts.monitorExpression.label": "移除筛选 {title}",
     "xpack.uptime.alerts.monitorStatus": "运行时间监测状态",
     "xpack.uptime.alerts.monitorStatus.actionVariables.availabilityMessage": "{interval} 可用性为 {availabilityRatio}%。小于 {expectedAvailability}% 时告警。",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.context.alertReasonMessage.description": "告警原因的简洁描述",
     "xpack.uptime.alerts.monitorStatus.actionVariables.context.downMonitorsWithGeo.description": "生成的摘要，显示告警已检测为“关闭”的部分或所有监测",
     "xpack.uptime.alerts.monitorStatus.actionVariables.context.message.description": "生成的消息，汇总当前关闭的监测",
+    "xpack.uptime.alerts.monitorStatus.actionVariables.context.viewInAppUrl.description": "Elastic 中可用于进一步调查告警及其上下文的视图或功能的链接",
     "xpack.uptime.alerts.monitorStatus.actionVariables.down": "在过去 {interval}中失败 {count} 次。大于 {numTimes} 时告警。",
     "xpack.uptime.alerts.monitorStatus.actionVariables.downAndAvailabilityMessage": "{downMonitorsMessage} {availabilityBreachMessage}",
     "xpack.uptime.alerts.monitorStatus.actionVariables.state.currentTriggerStarted": "表示告警触发时当前触发状况开始的时间戳",
@@ -28380,9 +30129,13 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.screenshots.label": "屏幕截图选项",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.syntheticsArgs.helpText": "要传递给 Synthetics 代理软件包的附加参数。取字符串列表。这在极少情况下有用，通常应不需要设置。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.syntheticsArgs.label": "Synthetics 参数",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.message": "禁用限制时，您的监测的带宽仍然由其中运行监测的 Synthetics 节点的配置设置上限。",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.title": "自动上限",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.description": "控制监测的下载和上传速度及其延迟，以在更缓慢或更迟缓的网络上模拟应用程序的行为。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.error": "下载速度必须大于零。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.label": "下载速度",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.message": "使用大于 Synthetics 节点带宽限制的限值时，您的监测的带宽仍然具有上限。",
+    "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.title": "您已超出 Synthetics 节点带宽限制",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error": "延迟不得为负。",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.label": "延迟",
     "xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.switch.description": "启用限制",
@@ -28484,8 +30237,8 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects": "最大重定向数",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects.error": "“最大重定向数”必须不小于 0",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.maxRedirects.helpText": "要跟随的重定向总数。",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval": "监测时间间隔",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval.error": "“监测时间间隔”必填。",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval": "频率",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorInterval.error": "监测频率必填",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType": "监测类型",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.description": "要创建“浏览器”监测，请确保使用 elastic-agent-complete Docker 容器，其中包含运行这些监测的依赖项。有关更多信息，请访问我们的 {link}。",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.link": "Synthetics 文档",
@@ -28503,7 +30256,7 @@
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tcp.hosts.error": "主机和端口必填",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.helpText": "允许用于测试连接并交换数据的总时间。",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.label": "超时（秒）",
-    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError": "超时必须小于监测时间间隔",
+    "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError": "超时必须小于监测频率",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.moreThanZeroError": "超时必须大于或等于 0",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.URL": "URL",
     "xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.URL.error": "“URL”必填",
@@ -28548,7 +30301,6 @@
     "xpack.uptime.emptyStateError.notFoundPage": "未找到页面",
     "xpack.uptime.emptyStateError.title": "错误",
     "xpack.uptime.enableAlert.editAlert": "编辑告警",
-    "xpack.uptime.featureRegistry.uptimeFeatureName": "运行时间",
     "xpack.uptime.filterBar.ariaLabel": "概览页面的输入筛选条件",
     "xpack.uptime.filterBar.filterAllLabel": "全部",
     "xpack.uptime.filterBar.options.location.name": "位置",
@@ -28618,6 +30370,7 @@
     "xpack.uptime.monitorDetails.title.pingType.http": "HTTP ping",
     "xpack.uptime.monitorDetails.title.pingType.icmp": "ICMP ping",
     "xpack.uptime.monitorDetails.title.pingType.tcp": "TCP ping",
+    "xpack.uptime.monitorList.allMonitors": "所有监测",
     "xpack.uptime.monitorList.anomalyColumn.label": "响应异常分数",
     "xpack.uptime.monitorList.defineConnector.description": "在 {link} 中定义默认连接器以启用状态告警。",
     "xpack.uptime.monitorList.defineConnector.popover.description": "以接收状态告警。",
@@ -28630,6 +30383,7 @@
     "xpack.uptime.monitorList.enabledAlerts.noAlert": "没有为此监测启用规则。",
     "xpack.uptime.monitorList.enabledAlerts.title": "已启用规则",
     "xpack.uptime.monitorList.enableDownAlert": "启用状态告警",
+    "xpack.uptime.monitorList.errorSummary": "错误摘要",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "展开 ID {id} 的监测行",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "添加位置",
     "xpack.uptime.monitorList.infraIntegrationAction.container.message": "显示容器指标",
@@ -28642,6 +30396,7 @@
     "xpack.uptime.monitorList.infraIntegrationAction.kubernetes.message": "显示 Pod 指标",
     "xpack.uptime.monitorList.infraIntegrationAction.kubernetes.tooltip": "在 Infrastructure UI 上查找 Pod UID“{podUid}”。",
     "xpack.uptime.monitorList.integrationGroup.emptyMessage": "没有可用的集成应用程序",
+    "xpack.uptime.monitorList.invalidMonitors": "监测无效",
     "xpack.uptime.monitorList.loading": "正在加载……",
     "xpack.uptime.monitorList.locations.expand": "单击以查看剩余位置",
     "xpack.uptime.monitorList.loggingIntegrationAction.container.id": "显示容器日志",
@@ -28670,9 +30425,14 @@
     "xpack.uptime.monitorList.redirects.openWindow": "将在新窗口中打开链接。",
     "xpack.uptime.monitorList.redirects.title": "重定向",
     "xpack.uptime.monitorList.redirects.title.number": "{number}",
+    "xpack.uptime.monitorList.refresh": "刷新",
     "xpack.uptime.monitorList.statusAlert.label": "状态告警",
+    "xpack.uptime.monitorList.statusColumn.checkedTimestamp": "已检查 {timestamp}",
     "xpack.uptime.monitorList.statusColumn.completeLabel": "已完成",
     "xpack.uptime.monitorList.statusColumn.downLabel": "关闭",
+    "xpack.uptime.monitorList.statusColumn.error.logs": "错误日志",
+    "xpack.uptime.monitorList.statusColumn.error.message": "{message}。单击了解更多详情。",
+    "xpack.uptime.monitorList.statusColumn.error.messageLabel": "{message}。单击了解更多详情。",
     "xpack.uptime.monitorList.statusColumn.failedLabel": "失败",
     "xpack.uptime.monitorList.statusColumn.locStatusMessage": "在 {noLoc} 个位置",
     "xpack.uptime.monitorList.statusColumn.locStatusMessage.multiple": "在 {noLoc} 个位置",
@@ -28685,27 +30445,53 @@
     "xpack.uptime.monitorList.table.url.name": "URL",
     "xpack.uptime.monitorList.tags.expand": "单击以查看剩余标签",
     "xpack.uptime.monitorList.tags.filter": "筛选带 {tag} 标签的所有监测",
+    "xpack.uptime.monitorList.testNow.AriaLabel": "单击以立即运行测试",
+    "xpack.uptime.monitorList.testNow.available": "立即测试仅适用于通过监测管理添加的监测。",
+    "xpack.uptime.monitorList.testNow.label": "立即测试",
+    "xpack.uptime.monitorList.testNow.scheduled": "已计划测试",
+    "xpack.uptime.monitorList.testRunLogs": "测试运行日志",
+    "xpack.uptime.monitorList.timestamp": "时间戳",
     "xpack.uptime.monitorList.tlsColumnLabel": "TLS 证书",
+    "xpack.uptime.monitorList.viewInDiscover": "在 Discover 中查看",
     "xpack.uptime.monitorManagement.addMonitorCrumb": "添加监测",
     "xpack.uptime.monitorManagement.addMonitorError": "无法加载服务位置。请稍后重试。",
     "xpack.uptime.monitorManagement.addMonitorLabel": "添加监测",
     "xpack.uptime.monitorManagement.addMonitorLoadingError": "加载监测管理时出错",
     "xpack.uptime.monitorManagement.addMonitorLoadingLabel": "正在加载监测管理",
     "xpack.uptime.monitorManagement.addMonitorServiceLocationsLoadingError": "无法加载服务位置。请稍后重试。",
+    "xpack.uptime.monitorManagement.apiKeysDisabledToolTip": "对此集群禁用了 API 密钥。监测管理需要使用 API 密钥才能回写 Elasticsearch 集群。要启用 API 密钥，请与管理员联系。",
+    "xpack.uptime.monitorManagement.callout.description.disabled": "监测管理当前处于禁用状态。要在 Elastic 托管 Synthetics 服务上运行监测，请启用监测管理。现有监测已暂停。",
+    "xpack.uptime.monitorManagement.callout.disabled": "已禁用监测管理",
+    "xpack.uptime.monitorManagement.callout.disabled.adminContact": "请联系管理员启用监测管理。",
+    "xpack.uptime.monitorManagement.closeButtonLabel": "关闭",
     "xpack.uptime.monitorManagement.completed": "已完成",
+    "xpack.uptime.monitorManagement.confirmDescriptionLabel": "此操作将删除监测，但会保留收集的任何数据。此操作无法撤消。",
     "xpack.uptime.monitorManagement.deleteMonitorLabel": "删除监测",
     "xpack.uptime.monitorManagement.disableMonitorLabel": "禁用监测",
     "xpack.uptime.monitorManagement.discardLabel": "丢弃",
     "xpack.uptime.monitorManagement.duplicateNameError": "监测名称已存在。",
     "xpack.uptime.monitorManagement.editMonitorCrumb": "编辑监测",
     "xpack.uptime.monitorManagement.editMonitorError": "加载监测管理时出错",
+    "xpack.uptime.monitorManagement.editMonitorError.description": "无法加载监测管理设置。请联系支持人员。",
     "xpack.uptime.monitorManagement.editMonitorErrorBody": "无法加载监测配置。请稍后重试。",
     "xpack.uptime.monitorManagement.editMonitorLabel": "编辑监测",
     "xpack.uptime.monitorManagement.editMonitorLoadingLabel": "正在加载监测",
+    "xpack.uptime.monitorManagement.emptyState.enablement": "启用监测管理以从全球托管测试地点运行轻量级检查和真正的浏览器监测。启用监测管理将生成 API 密钥，以便 Synthetics 服务回写 Elasticsearch 集群。",
+    "xpack.uptime.monitorManagement.emptyState.enablement.disabled.title": "已禁用监测管理",
+    "xpack.uptime.monitorManagement.emptyState.enablement.disabledDescription": "监测管理当前处于禁用状态。通过监测管理，您可以从全球托管测试地点运行轻量级检查和真正的浏览器监测。要启用监测管理，请与管理员联系。",
+    "xpack.uptime.monitorManagement.emptyState.enablement.doc": "阅读文档",
+    "xpack.uptime.monitorManagement.emptyState.enablement.enabled.title": "启用监测管理",
+    "xpack.uptime.monitorManagement.emptyState.enablement.learnMore": "希望了解详情？",
+    "xpack.uptime.monitorManagement.emptyState.enablement.title": "启用",
     "xpack.uptime.monitorManagement.enableMonitorLabel": "启用监测",
+    "xpack.uptime.monitorManagement.failed": "失败",
     "xpack.uptime.monitorManagement.failedRun": "无法运行步骤",
     "xpack.uptime.monitorManagement.inProgress": "进行中",
+    "xpack.uptime.monitorManagement.label": "监测管理",
+    "xpack.uptime.monitorManagement.loading.label": "正在加载监测管理",
     "xpack.uptime.monitorManagement.loadingSteps": "正在加载步骤......",
+    "xpack.uptime.monitorManagement.manageMonitorLoadingLabel": "正在加载监测管理",
+    "xpack.uptime.monitorManagement.manageMonitorLoadingLabel.callout.learnMore": "了解详情。",
     "xpack.uptime.monitorManagement.monitorAddedSuccessMessage": "已成功添加监测。",
     "xpack.uptime.monitorManagement.monitorAdvancedOptions.dataStreamConfiguration.description": "配置其他数据流选项。",
     "xpack.uptime.monitorManagement.monitorAdvancedOptions.dataStreamConfiguration.title": "数据流设置",
@@ -28725,7 +30511,7 @@
     "xpack.uptime.monitorManagement.monitorList.locations": "位置",
     "xpack.uptime.monitorManagement.monitorList.monitorName": "监测名称",
     "xpack.uptime.monitorManagement.monitorList.monitorType": "监测类型",
-    "xpack.uptime.monitorManagement.monitorList.schedule": "计划",
+    "xpack.uptime.monitorManagement.monitorList.schedule": "频率（分钟）",
     "xpack.uptime.monitorManagement.monitorList.tags": "标签",
     "xpack.uptime.monitorManagement.monitorList.title": "监测管理列表",
     "xpack.uptime.monitorManagement.monitorList.URL": "URL",
@@ -28733,18 +30519,40 @@
     "xpack.uptime.monitorManagement.monitorManagementCrumb": "监测管理",
     "xpack.uptime.monitorManagement.monitorNameFieldError": "监测名称必填",
     "xpack.uptime.monitorManagement.monitorNameFieldLabel": "监测名称",
+    "xpack.uptime.monitorManagement.monitorSync.failure.content": "同步一个或多个位置的监测时遇到问题：",
+    "xpack.uptime.monitorManagement.monitorSync.failure.dismissLabel": "关闭",
+    "xpack.uptime.monitorManagement.monitorSync.failure.reasonLabel": "原因",
+    "xpack.uptime.monitorManagement.monitorSync.failure.statusLabel": "状态",
+    "xpack.uptime.monitorManagement.monitorSync.failure.title": "监测无法与 Synthetics 服务同步",
+    "xpack.uptime.monitorManagement.noLabel": "取消",
     "xpack.uptime.monitorManagement.pageHeader.title": "管理监测",
     "xpack.uptime.monitorManagement.pending": "待处理",
+    "xpack.uptime.monitorManagement.publicBetaDescription": "监测管理仅适用于选定的公共公测版用户。利用公共\n公测版访问权限，您能够添加 HTTP、TCP、ICMP 和浏览器检查，\n这些检查将在 Elastic 的托管 Synthetics 服务节点上运行。",
+    "xpack.uptime.monitorManagement.requestAccess": "请求访问权限",
     "xpack.uptime.monitorManagement.reRunTest": "重新运行测试",
     "xpack.uptime.monitorManagement.runTest": "运行测试",
     "xpack.uptime.monitorManagement.saveMonitorLabel": "保存监测",
+    "xpack.uptime.monitorManagement.service.error.message": "已保存您的监测，但同步 {location} 的配置时遇到问题。我们会在稍后自动重试。如果此问题持续存在，您的监测将在 {location} 中停止运行。请联系支持人员获取帮助。",
+    "xpack.uptime.monitorManagement.service.error.reason": "原因：{reason}。",
+    "xpack.uptime.monitorManagement.service.error.status": "状态：{status}。",
+    "xpack.uptime.monitorManagement.service.error.title": "无法同步监测配置",
     "xpack.uptime.monitorManagement.serviceLocationsValidationError": "必须至少指定一个服务位置",
     "xpack.uptime.monitorManagement.stepCompleted": "已完成 {stepCount, number} 个{stepCount, plural, other {步骤}}",
+    "xpack.uptime.monitorManagement.syntheticsDisabled": "监测管理当前处于禁用状态。请联系管理员启用监测管理。",
+    "xpack.uptime.monitorManagement.syntheticsDisabledFailure": "无法禁用监测管理。请联系支持人员。",
+    "xpack.uptime.monitorManagement.syntheticsDisabledSuccess": "已成功禁用监测管理。",
+    "xpack.uptime.monitorManagement.syntheticsDisableToolTip": "禁用监测管理会立即在所有测试地点停止执行监测并阻止创建新监测。",
+    "xpack.uptime.monitorManagement.syntheticsEnabledFailure": "无法启用监测管理。请联系支持人员。",
+    "xpack.uptime.monitorManagement.syntheticsEnableLabel": "启用",
+    "xpack.uptime.monitorManagement.syntheticsEnableLabel.management": "启用监测管理",
+    "xpack.uptime.monitorManagement.syntheticsEnableSuccess": "已成功启用监测管理。",
+    "xpack.uptime.monitorManagement.syntheticsEnableToolTip": "启用监测管理以在全球各个地点创建轻量级、真正的浏览器监测。",
     "xpack.uptime.monitorManagement.testResult": "测试结果",
     "xpack.uptime.monitorManagement.timeTaken": "耗时 {timeTaken}",
     "xpack.uptime.monitorManagement.updateMonitorLabel": "更新监测",
     "xpack.uptime.monitorManagement.validationError": "您的监测存在错误。请在保存前修复这些错误。",
     "xpack.uptime.monitorManagement.viewTestRunDetails": "查看测试结果详情",
+    "xpack.uptime.monitorManagement.yesLabel": "删除",
     "xpack.uptime.monitorManagementRoute.title": "管理监测 | {baseTitle}",
     "xpack.uptime.monitorRoute.title": "监测 | {baseTitle}",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "监测持续时间（毫秒）",
@@ -29029,6 +30837,102 @@
     "xpack.urlDrilldown.row.event.values.documentation": "将执行操作的行的所有单元格值数组。",
     "xpack.urlDrilldown.row.event.values.title": "行单元格值的列表。",
     "xpack.urlDrilldown.valuePreview": "值：{value}",
+    "xpack.ux.addDataButtonLabel": "添加数据",
+    "xpack.ux.analyzeDataButtonLabel": "浏览数据",
+    "xpack.ux.analyzeDataButtonLabel.message": "“浏览数据”允许您选择和筛选任意维度中的结果数据以及查找性能问题的原因或影响。",
+    "xpack.ux.breadcrumbs.dashboard": "仪表板",
+    "xpack.ux.breadcrumbs.root": "用户体验",
+    "xpack.ux.breakdownFilter.browser": "浏览器",
+    "xpack.ux.breakdownFilter.device": "设备",
+    "xpack.ux.breakdownFilter.location": "位置",
+    "xpack.ux.breakDownFilter.noBreakdown": "无细目",
+    "xpack.ux.breakdownFilter.os": "OS",
+    "xpack.ux.clearFilters": "清除筛选",
+    "xpack.ux.coreVitals.dataUndefined": "不可用",
+    "xpack.ux.coreVitals.fcp": "首次内容绘制",
+    "xpack.ux.coreVitals.fcpTooltip": "首次内容绘制 (FCP) 侧重于初始渲染，并度量从页面开始加载到页面内容的任何部分显示在屏幕的时间。",
+    "xpack.ux.coreVitals.tbt": "阻止总时间",
+    "xpack.ux.coreVitals.tbtTooltip": "总阻塞时间 (TBT) 是指在首次内容绘制与事务完成之间发生的各个长任务的阻塞时间（持续时间超过50毫秒）之和。",
+    "xpack.ux.dashboard.backend": "后端",
+    "xpack.ux.dashboard.dataMissing": "不可用",
+    "xpack.ux.dashboard.frontend": "前端",
+    "xpack.ux.dashboard.impactfulMetrics.highTrafficPages": "高流量页面",
+    "xpack.ux.dashboard.impactfulMetrics.jsErrors": "JavaScript 错误",
+    "xpack.ux.dashboard.overall.label": "总体",
+    "xpack.ux.dashboard.pageLoad.label": "页面加载",
+    "xpack.ux.dashboard.pageLoadDistribution.label": "页面加载分布",
+    "xpack.ux.dashboard.pageLoadDuration.label": "页面加载持续时间",
+    "xpack.ux.dashboard.pageLoadTime.label": "页面加载时间（秒）",
+    "xpack.ux.dashboard.pageLoadTimes.label": "页面加载时间",
+    "xpack.ux.dashboard.pagesLoaded.label": "已加载页面",
+    "xpack.ux.dashboard.pageViews": "页面总查看次数",
+    "xpack.ux.dashboard.resetZoom.label": "重置缩放比例",
+    "xpack.ux.dashboard.tooltips.backEnd": "后端时间表示接收到第一个字节所需的时间 (TTFB)，即从请求发出后接收到第一个响应数据包的时间",
+    "xpack.ux.dashboard.tooltips.frontEnd": "前端时间表示页面加载总持续时间减去后端时间",
+    "xpack.ux.dashboard.tooltips.totalPageLoad": "合计表示整个页面加载持续时间",
+    "xpack.ux.dashboard.totalPageLoad": "合计",
+    "xpack.ux.emptyState.loadingMessage": "正在加载……",
+    "xpack.ux.fetcher.error.status": "错误",
+    "xpack.ux.fetcher.error.title": "提取资源时出错",
+    "xpack.ux.fetcher.error.url": "URL",
+    "xpack.ux.filter.environment.allLabel": "全部",
+    "xpack.ux.filter.environment.label": "环境",
+    "xpack.ux.filter.environment.notDefinedLabel": "未定义",
+    "xpack.ux.filter.environment.selectEnvironmentLabel": "选择环境",
+    "xpack.ux.filterGroup.breakdown": "细目",
+    "xpack.ux.filterGroup.coreWebVitals": "网站体验核心指标",
+    "xpack.ux.filterGroup.seconds": "秒",
+    "xpack.ux.filterGroup.selectBreakdown": "选择细分",
+    "xpack.ux.filters.filterByUrl": "按 URL 筛选",
+    "xpack.ux.filters.searchResults": "{total} 项搜索结果",
+    "xpack.ux.filters.select": "选择",
+    "xpack.ux.filters.topPages": "排名靠前页面",
+    "xpack.ux.filters.url": "URL",
+    "xpack.ux.filters.url.loadingResults": "正在加载结果",
+    "xpack.ux.filters.url.noResults": "没有可用结果",
+    "xpack.ux.inspectButtonText": "检查",
+    "xpack.ux.jsErrors.errorMessage": "错误消息",
+    "xpack.ux.jsErrors.errorRate": "错误率",
+    "xpack.ux.jsErrors.impactedPageLoads": "受影响的页面加载",
+    "xpack.ux.jsErrors.percent": "{pageLoadPercent}%",
+    "xpack.ux.jsErrors.totalErrors": "错误总数",
+    "xpack.ux.jsErrorsTable.errorMessage": "无法提取",
+    "xpack.ux.localFilters.titles.browser": "浏览器",
+    "xpack.ux.localFilters.titles.device": "设备",
+    "xpack.ux.localFilters.titles.location": "位置",
+    "xpack.ux.localFilters.titles.os": "OS",
+    "xpack.ux.localFilters.titles.serviceName": "服务名称",
+    "xpack.ux.localFilters.titles.transactionUrl": "URL",
+    "xpack.ux.localFilters.titles.webApplication": "Web 应用程序",
+    "xpack.ux.localFiltersTitle": "筛选",
+    "xpack.ux.median": "中值",
+    "xpack.ux.metrics": "指标",
+    "xpack.ux.overview.beatsCard.description": "通过 APM 代理启用 RUM，以收集用户体验数据。",
+    "xpack.ux.overview.beatsCard.title": "添加 RUM 数据",
+    "xpack.ux.overview.heading": "仪表板",
+    "xpack.ux.overview.solutionName": "Observability",
+    "xpack.ux.pageViews.analyze": "分析",
+    "xpack.ux.percentile.50thMedian": "第 50 个（中值）",
+    "xpack.ux.percentile.75th": "第 75 个",
+    "xpack.ux.percentile.90th": "第 90 个",
+    "xpack.ux.percentile.95th": "第 95 个",
+    "xpack.ux.percentile.99th": "第 99 个",
+    "xpack.ux.percentile.label": "百分位数",
+    "xpack.ux.percentiles.label": "第 {value} 个百分位",
+    "xpack.ux.title": "仪表板",
+    "xpack.ux.urlFilter.wildcard": "使用通配符 *{wildcard}*",
+    "xpack.ux.uxMetrics.longestLongTasks": "长任务最长持续时间",
+    "xpack.ux.uxMetrics.longestLongTasksTooltip": "最长任务的持续时间。长任务是指独占用户界面线程较长时间（大于50毫秒）并阻止其他关键任务（帧速率或输入延迟）执行的任何用户活动或浏览器任务。",
+    "xpack.ux.uxMetrics.noOfLongTasks": "长任务数目",
+    "xpack.ux.uxMetrics.noOfLongTasksTooltip": "长任务的数量。长任务是指独占用户界面线程较长时间（大于50毫秒）并阻止其他关键任务（帧速率或输入延迟）执行的任何用户活动或浏览器任务。",
+    "xpack.ux.uxMetrics.sumLongTasks": "长任务总持续时间",
+    "xpack.ux.uxMetrics.sumLongTasksTooltip": "长任务的总持续时间。长任务是指独占用户界面线程较长时间（大于50毫秒）并阻止其他关键任务（帧速率或输入延迟）执行的任何用户活动或浏览器任务。",
+    "xpack.ux.visitorBreakdown": "访问者细分",
+    "xpack.ux.visitorBreakdown.browser": "浏览器",
+    "xpack.ux.visitorBreakdown.noData": "无数据。",
+    "xpack.ux.visitorBreakdown.operatingSystem": "操作系统",
+    "xpack.ux.visitorBreakdownMap.avgPageLoadDuration": "页面加载平均持续时间",
+    "xpack.ux.visitorBreakdownMap.pageLoadDurationByRegion": "按区域列出的页面加载持续时间（平均值）",
     "xpack.watcher.app.licenseErrorLinkText": "管理您的许可",
     "xpack.watcher.app.licenseErrorTitle": "许可证错误",
     "xpack.watcher.appName": "Watcher",
@@ -29489,6 +31393,22 @@
     "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "反向包括",
     "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "全部固定",
     "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "全部取消固定",
-    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "更改所有筛选"
+    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "更改所有筛选",
+    "unifiedSearch.kueryAutocomplete.andOperatorDescription": "需要{bothArguments}为 true",
+    "unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "两个参数都",
+    "unifiedSearch.kueryAutocomplete.equalOperatorDescription": "{equals}某一值",
+    "unifiedSearch.kueryAutocomplete.equalOperatorDescription.equalsText": "等于",
+    "unifiedSearch.kueryAutocomplete.existOperatorDescription": "以任意形式{exists}",
+    "unifiedSearch.kueryAutocomplete.existOperatorDescription.existsText": "存在",
+    "unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription": "{greaterThan}某一值",
+    "unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText": "大于",
+    "unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription": "{greaterThanOrEqualTo}某一值",
+    "unifiedSearch.kueryAutocomplete.greaterThanOrEqualOperatorDescription.greaterThanOrEqualToText": "大于或等于",
+    "unifiedSearch.kueryAutocomplete.lessThanOperatorDescription": "{lessThan}某一值",
+    "unifiedSearch.kueryAutocomplete.lessThanOperatorDescription.lessThanText": "小于",
+    "unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription": "{lessThanOrEqualTo}某一值",
+    "unifiedSearch.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "小于或等于",
+    "unifiedSearch.kueryAutocomplete.orOperatorDescription": "需要{oneOrMoreArguments}为 true",
+    "unifiedSearch.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "一个或多个参数"
   }
 }
diff --git a/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts b/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts
index f95ce25122923..21835a5977216 100644
--- a/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts
+++ b/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts
@@ -8,12 +8,13 @@
 export type ExperimentalFeatures = typeof allowedExperimentalValues;
 
 /**
- * A list of allowed values that can be used in `xpack.triggersActionsUi.enableExperimental`.
+ * A list of allowed values that can be used in `xpack.trigger_actions_ui.enableExperimental`.
  * This object is then used to validate and parse the value entered.
  */
 export const allowedExperimentalValues = Object.freeze({
   rulesListDatagrid: true,
   internalAlertsTable: false,
+  internalShareableComponentsSandbox: false,
   rulesDetailLogs: true,
 });
 
@@ -24,7 +25,7 @@ const TriggersActionsUIInvalidExperimentalValue = class extends Error {};
 const allowedKeys = Object.keys(allowedExperimentalValues) as Readonly<ExperimentalConfigKeys>;
 
 /**
- * Parses the string value used in `xpack.triggersActionsUi.enableExperimental` kibana configuration,
+ * Parses the string value used in `xpack.trigger_actions_ui.enableExperimental` kibana configuration,
  * which should be a string of values delimited by a comma (`,`)
  *
  * @param configValue
diff --git a/x-pack/plugins/triggers_actions_ui/kibana.json b/x-pack/plugins/triggers_actions_ui/kibana.json
index 66135f67c0d58..4be95ed2db91d 100644
--- a/x-pack/plugins/triggers_actions_ui/kibana.json
+++ b/x-pack/plugins/triggers_actions_ui/kibana.json
@@ -8,8 +8,8 @@
   "server": true,
   "ui": true,
   "optionalPlugins": ["alerting", "cloud", "features", "home", "spaces"],
-  "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects", "unifiedSearch"],
+  "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects", "unifiedSearch", "dataViews"],
   "configPath": ["xpack", "trigger_actions_ui"],
   "extraPublicDirs": ["public/common", "public/common/constants"],
-  "requiredBundles": ["home", "alerting", "esUiShared", "kibanaReact", "kibanaUtils"]
+  "requiredBundles": ["alerting", "esUiShared", "kibanaReact", "kibanaUtils"]
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
index 94bb58e511c4c..71bcb2ee7d760 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
@@ -7,24 +7,29 @@
 
 import React, { lazy } from 'react';
 import { Switch, Route, Redirect, Router } from 'react-router-dom';
-import { ChromeBreadcrumb, CoreStart, CoreTheme, ScopedHistory } from 'kibana/public';
+import { ChromeBreadcrumb, CoreStart, CoreTheme, ScopedHistory } from '@kbn/core/public';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import useObservable from 'react-use/lib/useObservable';
 import { Observable } from 'rxjs';
-import { KibanaFeature } from '../../../features/common';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { Section, routeToRuleDetails, legacyRouteToRuleDetails } from './constants';
-import { ActionTypeRegistryContract, RuleTypeRegistryContract } from '../types';
-import { ChartsPluginStart } from '../../../../../src/plugins/charts/public';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../../src/plugins/unified_search/public';
-import { PluginStartContract as AlertingStart } from '../../../alerting/public';
-import type { SpacesPluginStart } from '../../../spaces/public';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { suspendedComponentWithProps } from './lib/suspended_component_with_props';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import {
+  ActionTypeRegistryContract,
+  AlertsTableConfigurationRegistryContract,
+  RuleTypeRegistryContract,
+} from '../types';
+import { Section, routeToRuleDetails, legacyRouteToRuleDetails } from './constants';
 
 import { setSavedObjectsClient } from '../common/lib/data_apis';
 import { KibanaContextProvider } from '../common/lib/kibana';
@@ -36,6 +41,7 @@ const RuleDetailsRoute = lazy(
 
 export interface TriggersAndActionsUiServices extends CoreStart {
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   charts: ChartsPluginStart;
   alerting?: AlertingStart;
   spaces?: SpacesPluginStart;
@@ -44,6 +50,7 @@ export interface TriggersAndActionsUiServices extends CoreStart {
   setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
   actionTypeRegistry: ActionTypeRegistryContract;
   ruleTypeRegistry: RuleTypeRegistryContract;
+  alertsTableConfigurationRegistry: AlertsTableConfigurationRegistryContract;
   history: ScopedHistory;
   kibanaFeatures: KibanaFeature[];
   element: HTMLElement;
@@ -61,7 +68,7 @@ export const renderApp = (deps: TriggersAndActionsUiServices) => {
 
 export const App = ({ deps }: { deps: TriggersAndActionsUiServices }) => {
   const { savedObjects, uiSettings, theme$ } = deps;
-  const sections: Section[] = ['rules', 'connectors', 'alerts'];
+  const sections: Section[] = ['rules', 'connectors', 'alerts', '__components_sandbox'];
   const isDarkMode = useObservable<boolean>(uiSettings.get$('theme:darkMode'));
 
   const sectionsRegex = sections.join('|');
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
index 2f220855f9474..08a824f53e465 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
@@ -15,8 +15,8 @@ import {
   EuiText,
 } from '@elastic/eui';
 import './add_message_variables.scss';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { templateActionVariable } from '../lib';
-import { ActionVariable } from '../../../../alerting/common';
 
 interface Props {
   messageVariables?: ActionVariable[];
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
index 82c787426a38e..a799db2702180 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { INTERNAL_BASE_ACTION_API_PATH } from '../../../constants';
 import { EmailConfig } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
index ec86f149e9a43..f91ef64ca28a3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '../index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { EmailActionConnector } from '../types';
 import { getEmailServices } from './email';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
index 709101396edf0..c5da19c305268 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
@@ -8,13 +8,13 @@
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSelectOption } from '@elastic/eui';
+import { AdditionalEmailServices } from '@kbn/actions-plugin/common';
 import {
   ActionTypeModel,
   ConnectorValidationResult,
   GenericValidationResult,
 } from '../../../../types';
 import { EmailActionParams, EmailConfig, EmailSecrets, EmailActionConnector } from '../types';
-import { AdditionalEmailServices } from '../../../../../../actions/common';
 
 const emailServices: EuiSelectOption[] = [
   {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
index 6e591753af35e..e870e0ef38439 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
@@ -21,13 +21,13 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiLink } from '@elastic/eui';
+import { AdditionalEmailServices } from '@kbn/actions-plugin/common';
 import { ActionConnectorFieldsProps } from '../../../../types';
 import { EmailActionConnector } from '../types';
 import { useKibana } from '../../../../common/lib/kibana';
 import { getEncryptedFieldNotifyLabel } from '../../get_encrypted_field_notify_label';
 import { getEmailServices } from './email';
 import { useEmailConfig } from './use_email_config';
-import { AdditionalEmailServices } from '../../../../../../actions/common';
 
 const ExchangeFormFields = lazy(() => import('./exchange_form'));
 export const EmailActionConnectorFields: React.FunctionComponent<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
index ef9dda3bb2d1c..6a640cc734071 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { renderHook, act } from '@testing-library/react-hooks';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useEmailConfig } from './use_email_config';
 
 const http = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
index 9e6df1d1a1019..53ec70b8b62b3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
@@ -6,11 +6,11 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { isEmpty } from 'lodash';
+import { AdditionalEmailServices } from '@kbn/actions-plugin/common';
 import { EmailConfig } from '../types';
 import { getServiceConfig } from './api';
-import { AdditionalEmailServices } from '../../../../../../actions/common';
 
 export function useEmailConfig(
   http: HttpSetup,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
index f43d883be7add..4097adb7b067f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '../index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { EsIndexActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx
index 7b0515d8904e2..1e7259dd802d4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx
@@ -21,7 +21,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { debounce } from 'lodash';
 import { ActionConnectorFieldsProps } from '../../../../types';
-import { EsIndexActionConnector } from '.././types';
+import { EsIndexActionConnector } from '../types';
 import { getTimeFieldOptions } from '../../../../common/lib/get_time_options';
 import { firstFieldOption, getFields, getIndexOptions } from '../../../../common/index_controls';
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
index f5545f2f4c075..0601d0a9b1284 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
@@ -24,7 +24,7 @@ import {
   AlertHistoryDefaultIndexName,
   ALERT_HISTORY_PREFIX,
 } from '../../../../types';
-import { IndexActionParams } from '.././types';
+import { IndexActionParams } from '../types';
 import { JsonEditorWithMessageVariables } from '../../json_editor_with_message_variables';
 import { useKibana } from '../../../../common/lib/kibana';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts
index 853f01246b88b..92e8a550fda05 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts
@@ -6,7 +6,7 @@
  */
 
 import { fromNullable, Option } from 'fp-ts/lib/Option';
-import { ActionVariable } from '../../../../../alerting/common';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 
 export function extractActionVariable(
   actionVariables: ActionVariable[],
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
index 91b4f1e343bc7..24f1a2b5c9f3a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getIssueTypes, getFieldsByIssueType, getIssues, getIssue } from './api';
 
 const issueTypesData = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
index e9cc583ee44ac..f213bbc7bda40 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import { ActionTypeExecutorResult } from '../../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
 import { Fields, Issue, IssueTypes } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
index 1105f17e038e7..425bcf651f104 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { JiraActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
index 38aed2cfc6f88..f2f3aab1c2a7b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
@@ -8,7 +8,7 @@
 import React, { useMemo, useEffect, useCallback, useState, memo } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { useGetIssues } from './use_get_issues';
 import { useGetSingleIssue } from './use_get_single_issue';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
index 6073971912acc..22c727df7bb09 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExecutorSubActionPushParams } from '../../../../../../actions/server/builtin_action_types/jira/types';
+import { ExecutorSubActionPushParams } from '@kbn/actions-plugin/server/builtin_action_types/jira/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type JiraActionConnector = UserConfiguredActionConnector<JiraConfig, JiraSecrets>;
 export interface JiraActionParams {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
index 71dafef4dca2e..4f0e1e143291c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { Fields } from './types';
 import { getFieldsByIssueType } from './api';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
index 09ed90b296d06..97db74630258c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 
 import { ActionConnector } from '../../../../types';
 import { IssueTypes } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
index 3ad67709f82fb..0dea608b78ac9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
@@ -7,7 +7,7 @@
 
 import { isEmpty, debounce } from 'lodash/fp';
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { Issue } from './types';
 import { getIssues } from './api';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
index 62ddb8b6e362b..3967ab25c889e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { Issue } from './types';
 import { getIssue } from './api';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
index db2f82872900c..10bf1a45806e8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
-import { PagerDutyActionConnector } from '.././types';
+import { PagerDutyActionConnector } from '../types';
 
 const ACTION_TYPE_ID = '.pagerduty';
 let actionTypeModel: ActionTypeModel;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
index 8b9902c3d7d09..42813186fe9f1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
@@ -19,7 +19,7 @@ import {
   PagerDutySecrets,
   PagerDutyActionParams,
   EventActionOptions,
-} from '.././types';
+} from '../types';
 import { hasMustacheTokens } from '../../../lib/has_mustache_tokens';
 
 export function getActionType(): ActionTypeModel<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx
index 0d10223af66cf..ee0b4f214cb5c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { PagerDutyActionConnector } from '.././types';
+import { PagerDutyActionConnector } from '../types';
 import PagerDutyActionConnectorFields from './pagerduty_connectors';
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx
index c734750a59f3b..49aaec5bb6f24 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx
@@ -10,7 +10,7 @@ import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { ActionConnectorFieldsProps } from '../../../../types';
-import { PagerDutyActionConnector } from '.././types';
+import { PagerDutyActionConnector } from '../types';
 import { useKibana } from '../../../../common/lib/kibana';
 import { getEncryptedFieldNotifyLabel } from '../../get_encrypted_field_notify_label';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
index 6eb349b8f511c..19f47166b2726 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { EventActionOptions, SeverityActionOptions } from '.././types';
+import { EventActionOptions, SeverityActionOptions } from '../types';
 import PagerDutyParamsFields from './pagerduty_params';
 
 describe('PagerDutyParamsFields renders', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
index a7e6aaeec4129..738f1ca74b1a6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
@@ -10,7 +10,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect, EuiSpacer } from '@el
 import { i18n } from '@kbn/i18n';
 import { isUndefined } from 'lodash';
 import { ActionParamsProps } from '../../../../types';
-import { PagerDutyActionParams } from '.././types';
+import { PagerDutyActionParams } from '../types';
 import { TextFieldWithMessageVariables } from '../../text_field_with_message_variables';
 
 const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDutyActionParams>> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
index a345a9c81beb0..c7097bd83e84c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getIncidentTypes, getSeverity } from './api';
 
 const incidentTypesResponse = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
index daca46247ae3e..b0378be04efd3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
index dc8d210ade98a..89b4b6ee668db 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { ResilientActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts
index 9a638195a17f9..fcee38cf441fa 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExecutorSubActionPushParams } from '../../../../../../actions/server/builtin_action_types/resilient/types';
+import { ExecutorSubActionPushParams } from '@kbn/actions-plugin/server/builtin_action_types/resilient/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type ResilientActionConnector = UserConfiguredActionConnector<
   ResilientConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx
index 91a25f8b7b3fe..e398f1a8dd32c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { getIncidentTypes } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx
index 9462795a78daf..79e3b27d0a081 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { getSeverity } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
index d9bf48c4ab854..739250bee0d19 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionTypeExecutorResult, RewriteResponseCase } from '../../../../../actions/common';
+import { ActionTypeExecutorResult, RewriteResponseCase } from '@kbn/actions-plugin/common';
 
 export type ConnectorExecutorResult<T> = ReturnType<
   RewriteResponseCase<ActionTypeExecutorResult<T>>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx
index d2da049f7de6c..e91f76d94d2fb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel, UserConfiguredActionConnector } from '../../../../types';
 
 const ACTION_TYPE_ID = '.server-log';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
index baaffb6721fc4..90bed8f28701a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { ServerLogLevelOptions } from '.././types';
+import { ServerLogLevelOptions } from '../types';
 import ServerLogParamsFields from './server_log_params';
 
 describe('ServerLogParamsFields renders', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
index 6397ce7bc184e..b8f5b84eb471e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSelect, EuiFormRow } from '@elastic/eui';
 import { ActionParamsProps } from '../../../../types';
-import { ServerLogActionParams } from '.././types';
+import { ServerLogActionParams } from '../types';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
 
 export const ServerLogParamsFields: React.FunctionComponent<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts
index 4b67d256d99bc..f8acc9a6044b3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getChoices, getAppInfo } from './api';
 
 const choicesResponse = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
index 13cd3e5313165..dad3e3e0d0170 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
+import { snExternalServiceConfig } from '@kbn/actions-plugin/server/builtin_action_types/servicenow/config';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { API_INFO_ERROR } from './translations';
 import { AppInfo, RESTApiError } from './types';
 import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
-import { ActionTypeExecutorResult } from '../../../../../../actions/common';
 import { Choice } from './types';
 
 export async function getChoices({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx
index d2d620699f9d3..8bb2974595465 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx
@@ -7,7 +7,7 @@
 
 import React, { memo } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
-import { ActionConnectorFieldsProps } from '../../../../../public/types';
+import { ActionConnectorFieldsProps } from '../../../../types';
 import * as i18n from './translations';
 import { ServiceNowActionConnector } from './types';
 import { CredentialsApiUrl } from './credentials_api_url';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
index 3f22a51b5bd53..0e6eb4d8ff0f2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { ServiceNowActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
index 556e8cfbca3f0..a12d43c35369e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
@@ -8,6 +8,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { EuiSpacer } from '@elastic/eui';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { snExternalServiceConfig } from '@kbn/actions-plugin/server/builtin_action_types/servicenow/config';
 import { ActionConnectorFieldsProps } from '../../../../types';
 
 import * as i18n from './translations';
@@ -26,9 +28,6 @@ import { checkConnectorIsDeprecated } from '../../../../common/connectors_select
 // eslint-disable-next-line import/no-default-export
 export { ServiceNowConnectorFields as default };
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
-
 const ServiceNowConnectorFields: React.FC<
   ActionConnectorFieldsProps<ServiceNowActionConnector>
 > = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
index 40bb47543a3c8..6f665c3360f62 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 import {
   ExecutorSubActionPushParamsITSM,
   ExecutorSubActionPushParamsSIR,
   ExecutorSubActionAddEventParams,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../actions/server/builtin_action_types/servicenow/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/servicenow/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type ServiceNowActionConnector = UserConfiguredActionConnector<
   ServiceNowConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx
index 4e21b0f66642d..732aeed6313ac 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx
@@ -21,15 +21,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ActionConnectorFieldsProps } from '../../../../../public/types';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { snExternalServiceConfig } from '@kbn/actions-plugin/server/builtin_action_types/servicenow/config';
+import { ActionConnectorFieldsProps } from '../../../../types';
 import { ServiceNowActionConnector } from './types';
 import { CredentialsApiUrl } from './credentials_api_url';
 import { isFieldInvalid } from './helpers';
 import { ApplicationRequiredCallout } from './application_required_callout';
 import { SNStoreLink } from './sn_store_button';
 import { CredentialsAuth } from './credentials_auth';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
 
 const title = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.updateFormTitle',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
index bfad678f9b24b..e3b10896e8707 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback, useMemo, useState } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 
 import { ActionConnector } from '../../../../types';
 import { Choice, Fields } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
index b115c84562ae6..e81e0efe56a42 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef, useCallback } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { getChoices } from './api';
 import { Choice } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx
index dbdc123e0098f..95ce25a03349e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { SlackActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
index 07d78a8885c51..5d69af2d08779 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { SwimlaneActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
index f0a54e8b6c3bf..f629f98942504 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
@@ -7,11 +7,11 @@
 
 /* eslint-disable @kbn/eslint/no-restricted-paths */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 import {
   ExecutorSubActionPushParams,
   MappingConfigType,
-} from '../../../../../../actions/server/builtin_action_types/swimlane/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/swimlane/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type SwimlaneActionConnector = UserConfiguredActionConnector<
   SwimlaneConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
index f18770067b8a8..fc35c6c26c945 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useCallback, useRef } from 'react';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { getApplication as getApplicationApi } from './api';
 import * as i18n from './translations';
 import { SwimlaneFieldMappingConfig } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx
index 641c46af6bfc1..da0a67fe79a20 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { TeamsActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
index 3e42e7965c5bd..8a17b1c0b206a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { WebhookActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx
index 62d890d172f0d..93d8c6f5d39db 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { XmattersActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
index b98db1178f462..7626cc49a5c4c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
@@ -8,7 +8,7 @@
 import { EuiConfirmModal } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useKibana } from '../../common/lib/kibana';
 
 export const DeleteModalConfirmation = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
index a488086032f07..402911a5e86bc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
@@ -14,7 +14,7 @@ import { EuiLink, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { EuiEmptyPrompt } from '@elastic/eui';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import './health_check.scss';
 import { useHealthContext } from '../context/health_context';
 import { useKibana } from '../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
index 9ab9ea990c363..ba3470d4a1dfd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
@@ -12,11 +12,11 @@ import { i18n } from '@kbn/i18n';
 import { monaco, XJsonLang } from '@kbn/monaco';
 
 import './add_message_variables.scss';
-import { XJson } from '../../../../../../src/plugins/es_ui_shared/public';
-import { CodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { AddMessageVariables } from './add_message_variables';
-import { ActionVariable } from '../../../../alerting/common';
 import { templateActionVariable } from '../lib';
 
 const NO_EDITOR_ERROR_TITLE = i18n.translate(
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
index 7773c9181c6f7..77938165cf264 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
@@ -8,8 +8,8 @@
 import React, { useState } from 'react';
 import { EuiTextArea, EuiFormRow } from '@elastic/eui';
 import './add_message_variables.scss';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { AddMessageVariables } from './add_message_variables';
-import { ActionVariable } from '../../../../alerting/common';
 import { templateActionVariable } from '../lib';
 
 interface Props {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
index f35156d969d37..e8d43107bc11c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
@@ -8,8 +8,8 @@
 import React, { useState } from 'react';
 import { EuiFieldText } from '@elastic/eui';
 import './add_message_variables.scss';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { AddMessageVariables } from './add_message_variables';
-import { ActionVariable } from '../../../../alerting/common';
 import { templateActionVariable } from '../lib';
 
 interface Props {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
index c6da598a18f8e..99c115def07e6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
@@ -10,16 +10,17 @@ import { i18n } from '@kbn/i18n';
 export {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
-} from '../../../../alerting/common';
-export { BASE_ACTION_API_PATH, INTERNAL_BASE_ACTION_API_PATH } from '../../../../actions/common';
+} from '@kbn/alerting-plugin/common';
+export { BASE_ACTION_API_PATH, INTERNAL_BASE_ACTION_API_PATH } from '@kbn/actions-plugin/common';
 
-export type Section = 'connectors' | 'rules' | 'alerts';
+export type Section = 'connectors' | 'rules' | 'alerts' | '__components_sandbox';
 
 export const routeToHome = `/`;
 export const routeToConnectors = `/connectors`;
 export const routeToRules = `/rules`;
 export const routeToRuleDetails = `/rule/:ruleId`;
 export const routeToInternalAlerts = `/alerts`;
+export const routeToInternalShareableComponentsSandbox = '/__components_sandbox';
 export const legacyRouteToRules = `/alerts`;
 export const legacyRouteToRuleDetails = `/alert/:alertId`;
 
@@ -50,7 +51,7 @@ export const RULE_EXECUTION_LOG_COLUMN_IDS = [
   'num_new_alerts',
   'num_recovered_alerts',
   'num_triggered_actions',
-  'num_scheduled_actions',
+  'num_generated_actions',
   'num_succeeded_actions',
   'num_errored_actions',
   'total_search_duration',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/home.tsx b/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
index 9110ebe1f51c8..802e3178b1554 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/home.tsx
@@ -11,7 +11,13 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSpacer, EuiButtonEmpty, EuiPageHeader } from '@elastic/eui';
 
 import { getIsExperimentalFeatureEnabled } from '../common/get_experimental_features';
-import { Section, routeToConnectors, routeToRules, routeToInternalAlerts } from './constants';
+import {
+  Section,
+  routeToConnectors,
+  routeToRules,
+  routeToInternalAlerts,
+  routeToInternalShareableComponentsSandbox,
+} from './constants';
 import { getAlertingSectionBreadcrumb } from './lib/breadcrumb';
 import { getCurrentDocTitle } from './lib/doc_title';
 import { hasShowActionsCapability } from './lib/capabilities';
@@ -26,6 +32,9 @@ const ActionsConnectorsList = lazy(
 );
 const RulesList = lazy(() => import('./sections/rules_list/components/rules_list'));
 const AlertsPage = lazy(() => import('./sections/alerts_table/alerts_page'));
+const InternalShareableComponentsSandbox = lazy(
+  () => import('./internal/shareable_components_sandbox/shareable_components_sandbox')
+);
 
 export interface MatchParams {
   section: Section;
@@ -45,6 +54,9 @@ export const TriggersActionsUIHome: React.FunctionComponent<RouteComponentProps<
     docLinks,
   } = useKibana().services;
   const isInternalAlertsTableEnabled = getIsExperimentalFeatureEnabled('internalAlertsTable');
+  const isInternalShareableComponentsSandboxEnabled = getIsExperimentalFeatureEnabled(
+    'internalShareableComponentsSandbox'
+  );
 
   const canShowActions = hasShowActionsCapability(capabilities);
   const tabs: Array<{
@@ -150,6 +162,13 @@ export const TriggersActionsUIHome: React.FunctionComponent<RouteComponentProps<
               path={routeToRules}
               component={suspendedComponentWithProps(RulesList, 'xl')}
             />
+            {isInternalShareableComponentsSandboxEnabled && (
+              <Route
+                exact
+                path={routeToInternalShareableComponentsSandbox}
+                component={suspendedComponentWithProps(InternalShareableComponentsSandbox, 'xl')}
+              />
+            )}
             {isInternalAlertsTableEnabled ? (
               <Route
                 exact
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/internal/shareable_components_sandbox/rule_status_dropdown_sandbox.tsx b/x-pack/plugins/triggers_actions_ui/public/application/internal/shareable_components_sandbox/rule_status_dropdown_sandbox.tsx
new file mode 100644
index 0000000000000..46b7fed8e14d4
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/internal/shareable_components_sandbox/rule_status_dropdown_sandbox.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { getRuleStatusDropdownLazy } from '../../../common/get_rule_status_dropdown';
+
+export const RuleStatusDropdownSandbox: React.FC<{}> = () => {
+  const [enabled, setEnabled] = useState(true);
+  const [snoozeEndTime, setSnoozeEndTime] = useState<Date | null>(null);
+  const [muteAll, setMuteAll] = useState(false);
+
+  return getRuleStatusDropdownLazy({
+    rule: {
+      enabled,
+      snoozeEndTime,
+      muteAll,
+    },
+    enableRule: async () => {
+      setEnabled(true);
+      setMuteAll(false);
+      setSnoozeEndTime(null);
+    },
+    disableRule: async () => setEnabled(false),
+    snoozeRule: async (time) => {
+      if (time === -1) {
+        setSnoozeEndTime(null);
+        setMuteAll(true);
+      } else {
+        setSnoozeEndTime(new Date(time));
+        setMuteAll(false);
+      }
+    },
+    unsnoozeRule: async () => {
+      setMuteAll(false);
+      setSnoozeEndTime(null);
+    },
+    onRuleChanged: () => {},
+    isEditable: true,
+  });
+};
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/internal/shareable_components_sandbox/shareable_components_sandbox.tsx b/x-pack/plugins/triggers_actions_ui/public/application/internal/shareable_components_sandbox/shareable_components_sandbox.tsx
new file mode 100644
index 0000000000000..97366832bda0e
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/internal/shareable_components_sandbox/shareable_components_sandbox.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { RuleStatusDropdownSandbox } from './rule_status_dropdown_sandbox';
+
+export const InternalShareableComponentsSandbox: React.FC<{}> = () => {
+  return (
+    <>
+      <RuleStatusDropdownSandbox />
+    </>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export { InternalShareableComponentsSandbox as default };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts
index 8815757df6af5..c24362ed5962b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { ActionType } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { loadActionTypes } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { loadActionTypes } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
index e1b63280cc915..86451cd1b9181 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type { ActionType } from '../../../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts
index 565cc0afebfea..a9216eaec2be5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { loadAllActions } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { loadAllActions } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
index 70997ca52dab1..fbef1521b2024 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type { ActionConnector, ActionConnectorProps } from '../../../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts
index 208970fbfc061..42588610e036b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { ActionConnectorWithoutId } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { createActionConnector } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { createActionConnector } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
index 624aff1cd7773..2799848909446 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { RewriteRequestCase, RewriteResponseCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { RewriteRequestCase, RewriteResponseCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type {
   ActionConnector,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts
index ba4c62471555b..9e0696235b12f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { deleteActions } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { deleteActions } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts
index 8c9495158cc57..e403229c97c80 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ACTION_API_PATH } from '../../constants';
 
 export async function deleteActions({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts
index 2b0cdcb2ca69b..60fc763628bfb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { executeAction } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { executeAction } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
index 0a305413f61f7..74cc4d9484c9b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import {
-  ActionTypeExecutorResult,
-  RewriteRequestCase,
-} from '../../../../../../plugins/actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { ActionTypeExecutorResult, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 
 const rewriteBodyRes: RewriteRequestCase<ActionTypeExecutorResult<unknown>> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts
index 3cee8d225b001..90c0d3adb9235 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { ActionConnectorWithoutId } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { updateActionConnector } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { updateActionConnector } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
index a45dc8cfca2f9..18f4bdd60ad27 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { RewriteRequestCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type {
   ActionConnector,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
index c2ab2936e0cc7..9c123a822a541 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
@@ -7,7 +7,7 @@
 
 import { RuleType, ActionVariables } from '../../types';
 import { transformActionVariables } from './action_variables';
-import { ALERTS_FEATURE_ID } from '../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 
 beforeEach(() => jest.resetAllMocks());
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
index 6aff0781a56c2..bfa28ca2a97a4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { pick } from 'lodash';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { ActionVariables, REQUIRED_ACTION_VARIABLES, CONTEXT_ACTION_VARIABLES } from '../../types';
-import { ActionVariable } from '../../../../alerting/common';
 
 export type OmitMessageVariablesType = 'all' | 'keepContext';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
index 632217bdb06d5..31cf73f2d3d9c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import { padStart } from 'lodash';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { RuleType } from '../../types';
-import { parseDuration } from '../../../../alerting/common';
 
 export function formatMillisForDisplay(value: number | undefined) {
   if (!value) {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
index fdb11cfd0e1fc..fa4a5b6b2b33e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RecoveredActionGroup } from '../../../../alerting/common';
+import { RecoveredActionGroup } from '@kbn/alerting-plugin/common';
 import { AlertProvidedActionVariables } from './action_variables';
 import { getDefaultsForActionParams } from './get_defaults_for_action_params';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
index a06eb360a70c3..d3f60f4c6335d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleActionParam } from '../../../../alerting/common';
+import { RuleActionParam } from '@kbn/alerting-plugin/common';
 import { EventActionOptions } from '../components/builtin_action_types/types';
 import { AlertProvidedActionVariables } from './action_variables';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts
index 53378d1af572d..46653e5bc3911 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRuleAggregations } from './aggregate';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
index d67c4f80b142d..c7bcd438ef697 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { RuleAggregations } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { mapFiltersToKql } from './map_filters_to_kql';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteBodyRes: RewriteRequestCase<RuleAggregations> = ({
   rule_execution_status: ruleExecutionStatus,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
index 10a16313e87a4..67838f4f84881 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { RuleExecutionStatus } from '../../../../../alerting/common';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+import { RuleExecutionStatus } from '@kbn/alerting-plugin/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { Rule, RuleAction, ResolvedRule } from '../../../types';
 
 const transformAction: RewriteRequestCase<RuleAction> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
index acba66c83a735..d3138a115a27b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { RuleUpdates } from '../../../types';
 import { createRule } from './create';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
index 26b6cf6a9628c..4e37f9a02fb80 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract, RewriteResponseCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteResponseCase } from '@kbn/actions-plugin/common';
 import { Rule, RuleUpdates } from '../../../types';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 import { transformRule } from './common_transformations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts
index 95e48cf6e1734..c75314d083e5c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { deleteRules } from './delete';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts
index 053f5d68cdb69..6c0a37c538420 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function deleteRules({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts
index 582fb3b59f86f..fcba288fabce4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { disableRule, disableRules } from './disable';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts
index 5b1e0452f51c1..9f3fed034a252 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function disableRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts
index 993ae31f28832..27bb6b938d234 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { enableRule, enableRules } from './enable';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts
index fa4a462956663..dbea6772a1dad 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function enableRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts
index 9d7a3c5d5e6f5..5a2a4661ef7f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRule } from './get_rule';
 import uuid from 'uuid';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
index 8604de3cc8bcf..1af1fdae94867 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { Rule } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { transformRule } from './common_transformations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts
index e463e0d5c2515..84a9b86fc55d3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { alertingFrameworkHealth } from './health';
 
 describe('alertingFrameworkHealth', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts
index ca9f3bd94f745..80962de1b17f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
-import { AlertingFrameworkHealth, AlertsHealth } from '../../../../../alerting/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
+import { AlertingFrameworkHealth, AlertsHealth } from '@kbn/alerting-plugin/common';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 const rewriteAlertingFrameworkHealth: RewriteRequestCase<AlertsHealth> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts
index c323f0d4fa189..afe52835e1d08 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadExecutionLogAggregations, SortField } from './load_execution_log_aggregations';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts
index bb631b32328f4..ed6199c722ee0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts
@@ -7,16 +7,16 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import type { SortOrder } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 import {
   IExecutionLog,
   ExecutionLogSortFields,
   IExecutionLogWithErrorsResult,
-} from '../../../../../alerting/common';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+} from '@kbn/alerting-plugin/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
+import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 const getRenamedLog = (data: IExecutionLog) => {
   const {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts
index f89dfdd41ebe6..6e16ea7d05151 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { muteRule, muteRules } from './mute';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts
index 81bbcf2e2b270..f3e863172a625 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function muteRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts
index 384bc65754b03..dc046903b25b0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { muteAlertInstance } from './mute_alert';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts
index 05f2417db9472..d2932440090ae 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function muteAlertInstance({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts
index 669a3bbe02a97..7c86c68e99e80 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { resolveRule } from './resolve_rule';
 import uuid from 'uuid';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts
index fa2867ffd85e7..1842ad2d8e01a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { ResolvedRule } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { transformResolvedRule } from './common_transformations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts
index ed81bae9777b6..e75e3d132671c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { RuleSummary } from '../../../types';
 import { loadRuleSummary } from './rule_summary';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts
index 0ddc58602bd5e..ab47b573e0188 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { RewriteRequestCase, AsApiContract } from '@kbn/actions-plugin/common';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { RuleSummary, ExecutionDuration } from '../../../types';
-import { RewriteRequestCase, AsApiContract } from '../../../../../actions/common';
 
 const transformExecutionDuration: RewriteRequestCase<ExecutionDuration> = ({
   values_with_timestamp: valuesWithTimestamp,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts
index cd14c9f707960..05f21f9a53231 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { RuleType } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRuleTypes } from './rule_types';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts
index cae0a10deb052..71b7bc4fd3798 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { RuleType } from '../../../types';
 import { BASE_ALERTING_API_PATH } from '../../constants';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteResponseRes = (results: Array<AsApiContract<RuleType>>): RuleType[] => {
   return results.map((item) => rewriteBodyReq(item));
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts
index 2b70955ded4c3..5f6c6e938a0a7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRules } from './rules';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts
index 97c432a480355..52ba09a5c0adf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { Rule, Pagination, Sorting } from '../../../types';
-import { AsApiContract } from '../../../../../actions/common';
 import { mapFiltersToKql } from './map_filters_to_kql';
 import { transformRule } from './common_transformations';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts
index 02b40a25bc281..acc854caa06f4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { snoozeRule } from './snooze';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts
index 3a414e914df7d..d1f47bbec012e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function snoozeRule({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts
index db22fa4d2d896..9932cccf76c41 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRuleState } from './state';
 import uuid from 'uuid';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts
index 35fd63d92d25b..3f9fc3d61097e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts
@@ -4,14 +4,14 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { Errors, identity } from 'io-ts';
+import { ruleStateSchema } from '@kbn/alerting-plugin/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { RuleTaskState } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
-import { ruleStateSchema } from '../../../../../alerting/common';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteBodyRes: RewriteRequestCase<RuleTaskState> = ({
   rule_type_state: alertTypeState,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts
index fe55c2e2656fb..f521fe2229b55 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { unmuteRule, unmuteRules } from './unmute';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts
index 951038159ca81..4cb8a63fdebc2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function unmuteRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts
index d95c95158b0b7..c7c1b4ab5dab0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { unmuteAlertInstance } from './unmute_alert';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts
index 2e37aa2c0ee29..fa3dd97750f2a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function unmuteAlertInstance({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts
index 58356d81aa7b1..d0a9707cbedf5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { unsnoozeRule } from './unsnooze';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts
index b76b248f9e4ce..3f0ccd0aeab4d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function unsnoozeRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
index 911245de63f67..29bf8027bfe47 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Rule, RuleNotifyWhenType } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { updateRule } from './update';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
index a3b9d081c20d3..76383b405e82a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { pick } from 'lodash';
+import { RewriteResponseCase, AsApiContract } from '@kbn/actions-plugin/common';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 import { Rule, RuleUpdates } from '../../../types';
-import { RewriteResponseCase, AsApiContract } from '../../../../../actions/common';
 import { transformRule } from './common_transformations';
 
 type RuleUpdatesBody = Pick<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
index 88558d1cac836..887564a8213c4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionVariable } from '../../../../alerting/common';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 
 export function templateActionVariable(variable: ActionVariable) {
   return variable.useWithTripleBracesInTemplates
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
index 97945fd8752c1..bf307083af6b0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
@@ -8,7 +8,7 @@
 import React, { lazy } from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { EuiAccordion } from '@elastic/eui';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { act } from 'react-dom/test-utils';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import {
@@ -23,7 +23,7 @@ import { useKibana } from '../../../common/lib/kibana';
 import {
   RecoveredActionGroup,
   isActionGroupDisabledForActionTypeId,
-} from '../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('../../lib/action_connector_api', () => ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 34e2094d51a6d..ea57ca44f52e3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -19,6 +19,7 @@ import {
   EuiToolTip,
   EuiLink,
 } from '@elastic/eui';
+import { ActionGroup, RuleActionParam } from '@kbn/alerting-plugin/common';
 import { loadActionTypes, loadAllActions as loadConnectors } from '../../lib/action_connector_api';
 import {
   ActionTypeModel,
@@ -35,7 +36,6 @@ import { AddConnectorInline } from './connector_add_inline';
 import { actionTypeCompare } from '../../lib/action_type_compare';
 import { checkActionFormActionTypeEnabled } from '../../lib/check_action_type_enabled';
 import { VIEW_LICENSE_OPTIONS_LINK, DEFAULT_HIDDEN_ACTION_TYPES } from '../../../common/constants';
-import { ActionGroup, RuleActionParam } from '../../../../../alerting/common';
 import { useKibana } from '../../../common/lib/kibana';
 import { DefaultActionParamsGetter } from '../../lib/get_defaults_for_action_params';
 import { ConnectorAddModal } from '.';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
index 5c336d37ebb51..8e6c19ed02bb9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
@@ -25,7 +25,7 @@ import {
   EuiErrorBoundary,
 } from '@elastic/eui';
 import { partition } from 'lodash';
-import { ActionVariable, RuleActionParam } from '../../../../../alerting/common';
+import { ActionVariable, RuleActionParam } from '@kbn/alerting-plugin/common';
 import {
   IErrorObject,
   RuleAction,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
index e8a0287d90026..8063bc97334f5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionTypeMenu } from './action_type_menu';
 import { ConnectorValidationResult, GenericValidationResult } from '../../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
index 9870786e5d3cc..02819a714c833 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import ConnectorAddFlyout from './connector_add_flyout';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ConnectorValidationResult, GenericValidationResult } from '../../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
index ef26dfc6fd2a0..06874f22b6428 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
@@ -22,7 +22,7 @@ import {
   EuiCallOut,
   EuiSpacer,
 } from '@elastic/eui';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ActionTypeMenu } from './action_type_menu';
 import { ActionConnectorForm, getConnectorErrors } from './action_connector_form';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
index 0666f8be394d8..0079af71d19f5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
@@ -12,7 +12,7 @@ import ConnectorAddModal from './connector_add_modal';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionType, ConnectorValidationResult, GenericValidationResult } from '../../../types';
 import { useKibana } from '../../../common/lib/kibana';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../../common/lib/kibana');
 const actionTypeRegistry = actionTypeRegistryMock.create();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
index e2bc9d44b147c..524b848dbb275 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ConnectorValidationResult, GenericValidationResult } from '../../../types';
 import ConnectorEditFlyout from './connector_edit_flyout';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
index 80239d069ef6a..89c1d72a32716 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
@@ -27,6 +27,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Option, none, some } from 'fp-ts/lib/Option';
+import { ActionTypeExecutorResult, isActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { ActionConnectorForm, getConnectorErrors } from './action_connector_form';
 import { TestConnectorForm } from './test_connector_form';
 import {
@@ -40,10 +41,6 @@ import {
 import { ConnectorReducer, createConnectorReducer } from './connector_reducer';
 import { updateActionConnector, executeAction } from '../../lib/action_connector_api';
 import { hasSaveActionsCapability } from '../../lib/capabilities';
-import {
-  ActionTypeExecutorResult,
-  isActionTypeExecutorResult,
-} from '../../../../../actions/common';
 import './connector_edit_flyout.scss';
 import { useKibana } from '../../../common/lib/kibana';
 import { getConnectorWithInvalidatedFields } from '../../lib/value_validators';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
index 1ecb651314ba9..3bef8e19abff1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ConnectorsSelection } from './connectors_selection';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionType, ConnectorValidationResult, GenericValidationResult } from '../../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx
index 2b64a01f11827..bd7105edf139d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx
@@ -22,8 +22,8 @@ import { Option, map, getOrElse } from 'fp-ts/lib/Option';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { ActionConnector, ActionTypeRegistryContract, IErrorObject } from '../../../types';
-import { ActionTypeExecutorResult } from '../../../../../actions/common';
 
 export interface ConnectorAddFlyoutProps {
   connector: ActionConnector;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index 1de8ad97af891..4b51c9b306a75 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -11,7 +11,7 @@ import { ThemeProvider } from 'styled-components';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 
 import ActionsConnectorsList from './actions_connectors_list';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { actionTypeRegistryMock } from '../../../action_type_registry.mock';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index d001d08bf63f3..80d1839b231df 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -25,7 +25,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { omit } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withTheme, EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { loadAllActions, loadActionTypes, deleteActions } from '../../../lib/action_connector_api';
 import {
   hasDeleteActionsCapability,
@@ -43,7 +43,7 @@ import {
 } from '../../../../types';
 import { EmptyConnectorsPrompt } from '../../../components/prompts/empty_connectors_prompt';
 import { useKibana } from '../../../../common/lib/kibana';
-import { DEFAULT_HIDDEN_ACTION_TYPES } from '../../../../';
+import { DEFAULT_HIDDEN_ACTION_TYPES } from '../../../..';
 import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner';
 import ConnectorEditFlyout from '../../action_connector_form/connector_edit_flyout';
 import ConnectorAddFlyout from '../../action_connector_form/connector_add_flyout';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx
index c3c02dd064bcb..5d961eaba2455 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx
@@ -20,10 +20,11 @@ import {
   RuleRegistrySearchRequest,
   RuleRegistrySearchResponse,
   RuleRegistrySearchRequestPagination,
-} from '../../../../../../rule_registry/common';
+} from '@kbn/rule-registry-plugin/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
+import { PLUGIN_ID } from '../../../../common/constants';
 import { AlertsTable } from '../alerts_table';
 import { useKibana } from '../../../../common/lib/kibana';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { AlertsData } from '../../../../types';
 
 const consumers = [
@@ -135,29 +136,9 @@ const AlertsPage: React.FunctionComponent = () => {
   };
 
   const tableProps = {
+    configurationId: PLUGIN_ID,
     consumers,
     bulkActions: [],
-    columns: [
-      {
-        id: 'event.action',
-        displayAsText: 'Alert status',
-        initialWidth: 150,
-      },
-      {
-        id: '@timestamp',
-        displayAsText: 'Last updated',
-        initialWidth: 250,
-      },
-      {
-        id: 'kibana.alert.duration.us',
-        displayAsText: 'Duration',
-        initialWidth: 150,
-      },
-      {
-        id: 'kibana.alert.reason',
-        displayAsText: 'Reason',
-      },
-    ],
     deletedEventIds: [],
     disabledCellActions: [],
     pageSize: defaultPagination.pageSize,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/register_alerts_table_configuration.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/register_alerts_table_configuration.tsx
new file mode 100644
index 0000000000000..694d391cc2538
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/register_alerts_table_configuration.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PLUGIN_ID } from '../../../../common/constants';
+import { AlertsTableConfigurationRegistry } from '../../../../types';
+import { TypeRegistry } from '../../../type_registry';
+
+export function registerAlertsTableConfiguration({
+  alertsTableConfigurationRegistry,
+}: {
+  alertsTableConfigurationRegistry: TypeRegistry<AlertsTableConfigurationRegistry>;
+}) {
+  alertsTableConfigurationRegistry.register({
+    id: PLUGIN_ID,
+    columns: [
+      {
+        id: 'event.action',
+        displayAsText: 'Alert status',
+        initialWidth: 150,
+      },
+      {
+        id: '@timestamp',
+        displayAsText: 'Last updated',
+        initialWidth: 250,
+      },
+      {
+        id: 'kibana.alert.duration.us',
+        displayAsText: 'Duration',
+        initialWidth: 150,
+      },
+      {
+        id: 'kibana.alert.reason',
+        displayAsText: 'Reason',
+      },
+    ],
+  });
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
index c0a50e460fe8a..89171f5e06e8d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
@@ -5,14 +5,40 @@
  * 2.0.
  */
 import React from 'react';
-import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { act } from 'react-dom/test-utils';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 import { AlertsTable } from './alerts_table';
 import { AlertsData } from '../../../types';
-jest.mock('../../../../../../../src/plugins/data/public/');
+import { PLUGIN_ID } from '../../../common/constants';
+import { useKibana } from '../../../common/lib/kibana';
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+jest.mock('@kbn/data-plugin/public');
 jest.mock('../../../common/lib/kibana');
 
+const columns = [
+  {
+    id: 'kibana.alert.rule.name',
+    displayAsText: 'Name',
+  },
+  {
+    id: 'kibana.alert.rule.category',
+    displayAsText: 'Category',
+  },
+];
+
+const hookUseKibanaMock = useKibana as jest.Mock;
+const alertsTableConfigurationRegistryMock =
+  hookUseKibanaMock().services.alertsTableConfigurationRegistry;
+alertsTableConfigurationRegistryMock.has.mockImplementation((plugin: string) => {
+  return plugin === PLUGIN_ID;
+});
+alertsTableConfigurationRegistryMock.get.mockImplementation((plugin: string) => {
+  if (plugin === PLUGIN_ID) {
+    return { columns };
+  }
+  return {};
+});
+
 describe('AlertsTable', () => {
   const consumers = [
     AlertConsumers.APM,
@@ -21,16 +47,6 @@ describe('AlertsTable', () => {
     AlertConsumers.INFRASTRUCTURE,
     AlertConsumers.SIEM,
   ];
-  const columns = [
-    {
-      id: 'kibana.alert.rule.name',
-      displayAsText: 'Name',
-    },
-    {
-      id: 'kibana.alert.rule.category',
-      displayAsText: 'Category',
-    },
-  ];
 
   const alerts: AlertsData[] = [
     {
@@ -42,6 +58,7 @@ describe('AlertsTable', () => {
       field2: ['four'],
     },
   ];
+
   const fetchAlertsData = {
     activePage: 0,
     alerts,
@@ -54,14 +71,15 @@ describe('AlertsTable', () => {
     onSortChange: jest.fn(),
     refresh: jest.fn(),
   };
+
   const useFetchAlertsData = () => {
     return fetchAlertsData;
   };
 
   const tableProps = {
+    configurationId: PLUGIN_ID,
     consumers,
     bulkActions: [],
-    columns,
     deletedEventIds: [],
     disabledCellActions: [],
     pageSize: 1,
@@ -76,31 +94,40 @@ describe('AlertsTable', () => {
     'data-test-subj': 'testTable',
   };
 
-  it('should support sorting', async () => {
-    const wrapper = mountWithIntl(<AlertsTable {...tableProps} />);
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
+  beforeEach(() => {
+    alertsTableConfigurationRegistryMock.get.mockClear();
+    alertsTableConfigurationRegistryMock.has.mockClear();
+  });
+
+  describe('Alerts table UI', () => {
+    it('should support sorting', async () => {
+      const renderResult = render(<AlertsTable {...tableProps} />);
+      userEvent.click(renderResult.container.querySelector('.euiDataGridHeaderCell__button')!);
+      userEvent.click(renderResult.getByTestId(`dataGridHeaderCellActionGroup-${columns[0].id}`));
+      userEvent.click(renderResult.getByTitle('Sort A-Z'));
+      expect(fetchAlertsData.onSortChange).toHaveBeenCalledWith([
+        { direction: 'asc', id: 'kibana.alert.rule.name' },
+      ]);
+    });
+
+    it('should support pagination', async () => {
+      const renderResult = render(<AlertsTable {...tableProps} />);
+      userEvent.click(renderResult.getByTestId('pagination-button-1'));
+      expect(fetchAlertsData.onPageChange).toHaveBeenCalledWith({ pageIndex: 1, pageSize: 1 });
     });
-    wrapper.find('.euiDataGridHeaderCell__button').first().simulate('click');
-    wrapper.update();
-    wrapper
-      .find(`[data-test-subj="dataGridHeaderCellActionGroup-${columns[0].id}"]`)
-      .first()
-      .simulate('click');
-    wrapper.find(`.euiListGroupItem__label[title="Sort A-Z"]`).simulate('click');
-    expect(fetchAlertsData.onSortChange).toHaveBeenCalledWith([
-      { direction: 'asc', id: 'kibana.alert.rule.name' },
-    ]);
   });
 
-  it('should support pagination', async () => {
-    const wrapper = mountWithIntl(<AlertsTable {...tableProps} />);
-    await act(async () => {
-      await nextTick();
-      wrapper.update();
+  describe('Alerts table configuration registry', () => {
+    it('should read the configuration from the registry', async () => {
+      render(<AlertsTable {...tableProps} />);
+      expect(alertsTableConfigurationRegistryMock.has).toHaveBeenCalledWith(PLUGIN_ID);
+      expect(alertsTableConfigurationRegistryMock.get).toHaveBeenCalledWith(PLUGIN_ID);
+    });
+
+    it('should render an empty error state when the plugin id owner is not registered', async () => {
+      const props = { ...tableProps, configurationId: 'none' };
+      const result = render(<AlertsTable {...props} />);
+      expect(result.getByTestId('alerts-table-no-configuration')).toBeTruthy();
     });
-    wrapper.find('.euiPagination__item EuiButtonEmpty').at(1).simulate('click');
-    expect(fetchAlertsData.onPageChange).toHaveBeenCalledWith({ pageIndex: 1, pageSize: 1 });
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
index 2568c5b96407b..4b0a7ef6e0e16 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
@@ -5,9 +5,16 @@
  * 2.0.
  */
 import React, { useState } from 'react';
-import { EuiDataGrid } from '@elastic/eui';
+import { EuiDataGrid, EuiEmptyPrompt } from '@elastic/eui';
 import { useSorting, usePagination } from './hooks';
 import { AlertsTableProps } from '../../../types';
+import { useKibana } from '../../../common/lib/kibana';
+import { ALERTS_TABLE_CONF_ERROR_MESSAGE, ALERTS_TABLE_CONF_ERROR_TITLE } from './translations';
+
+const emptyConfiguration = {
+  id: '',
+  columns: [],
+};
 
 const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTableProps) => {
   const { activePage, alertsCount, onPageChange, onSortChange } = props.useFetchAlertsData();
@@ -18,13 +25,22 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
     pageSize: props.pageSize,
   });
 
-  const [visibleColumns, setVisibleColumns] = useState(props.columns.map(({ id }) => id));
+  const alertsTableConfigurationRegistry = useKibana().services.alertsTableConfigurationRegistry;
+  const hasAlertsTableConfiguration = alertsTableConfigurationRegistry.has(props.configurationId);
+
+  const alertsTableConfiguration = hasAlertsTableConfiguration
+    ? alertsTableConfigurationRegistry.get(props.configurationId)
+    : emptyConfiguration;
+
+  const [visibleColumns, setVisibleColumns] = useState(
+    alertsTableConfiguration.columns.map(({ id }) => id)
+  );
 
-  return (
+  return hasAlertsTableConfiguration ? (
     <section data-test-subj={props['data-test-subj']}>
       <EuiDataGrid
         aria-label="Alerts table"
-        columns={props.columns}
+        columns={alertsTableConfiguration.columns}
         columnVisibility={{ visibleColumns, setVisibleColumns }}
         trailingControlColumns={props.trailingControlColumns}
         rowCount={alertsCount}
@@ -38,6 +54,13 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
         }}
       />
     </section>
+  ) : (
+    <EuiEmptyPrompt
+      data-test-subj="alerts-table-no-configuration"
+      iconType="watchesApp"
+      title={<h2>{ALERTS_TABLE_CONF_ERROR_TITLE}</h2>}
+      body={<p>{ALERTS_TABLE_CONF_ERROR_MESSAGE}</p>}
+    />
   );
 };
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts
index 4f00e05ed1122..7c78636559d38 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useCallback, useState } from 'react';
-import { RuleRegistrySearchRequestPagination } from '../../../../../../rule_registry/common';
+import { RuleRegistrySearchRequestPagination } from '@kbn/rule-registry-plugin/common';
 
 type PaginationProps = RuleRegistrySearchRequestPagination & {
   onPageChange: (pagination: RuleRegistrySearchRequestPagination) => void;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/translations.ts
new file mode 100644
index 0000000000000..5bd6b09db427a
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/translations.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { i18n } from '@kbn/i18n';
+
+export const ALERTS_TABLE_CONF_ERROR_TITLE = i18n.translate(
+  'xpack.triggersActionsUI.alertsTable.configuration.errorTitle',
+  {
+    defaultMessage: 'Unable to load alerts table',
+  }
+);
+
+export const ALERTS_TABLE_CONF_ERROR_MESSAGE = i18n.translate(
+  'xpack.triggersActionsUI.alertsTable.configuration.errorBody',
+  {
+    defaultMessage:
+      'There was an error loading the alerts table. This table is missing the necessary configuration. Please contact your administrator for help',
+  }
+);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx
index 3398df07ce219..e82bbaad26743 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 
+import { IExecutionLogWithErrorsResult } from '@kbn/alerting-plugin/common';
 import {
   Rule,
   RuleType,
@@ -38,7 +39,6 @@ import {
   snoozeRule,
   unsnoozeRule,
 } from '../../../lib/rule_api';
-import { IExecutionLogWithErrorsResult } from '../../../../../../alerting/common';
 import { useKibana } from '../../../../common/lib/kibana';
 
 export interface ComponentOpts {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/index.tsx
index 5b8a6ea569344..0aaa3195b7c52 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/index.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/index.tsx
@@ -28,3 +28,7 @@ export const ConnectorEditFlyout = suspendedComponentWithProps(
 export const ActionForm = suspendedComponentWithProps(
   lazy(() => import('./action_connector_form/action_form'))
 );
+
+export const RuleStatusDropdown = suspendedComponentWithProps(
+  lazy(() => import('./rules_list/components/rule_status_dropdown'))
+);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx
index 106567a3c363d..b70eaf20a051d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx
@@ -26,7 +26,7 @@ import {
   ActionGroup,
   RuleExecutionStatusErrorReasons,
   AlertStatusValues,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { Rule, RuleSummary, AlertStatus, RuleType } from '../../../../types';
 import {
   ComponentOpts as RuleApis,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx
index a11bea88a9d3a..b41af16ccab47 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx
@@ -18,7 +18,7 @@ import {
   RuleExecutionStatusErrorReasons,
   RuleExecutionStatusWarningReasons,
   ALERTS_FEATURE_ID,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../../common/lib/kibana';
 import { ruleTypeRegistryMock } from '../../../rule_type_registry.mock';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx
index e8d4c0b089485..b3363159851d0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx
@@ -25,8 +25,8 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
-import { RuleExecutionStatusErrorReasons, parseDuration } from '../../../../../../alerting/common';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { RuleExecutionStatusErrorReasons, parseDuration } from '@kbn/alerting-plugin/common';
 import { hasAllPrivilege, hasExecuteActionsCapability } from '../../../lib/capabilities';
 import { getAlertingSectionBreadcrumb, getRuleDetailsBreadcrumb } from '../../../lib/breadcrumb';
 import { getCurrentDocTitle } from '../../../lib/doc_title';
@@ -271,8 +271,8 @@ export const RuleDetails: React.FunctionComponent<RuleDetailsProps> = ({
                   <EuiText size="s">
                     <p>
                       <FormattedMessage
-                        id="xpack.triggersActionsUI.sections.ruleDetails.triggerActionsTitle"
-                        defaultMessage="Trigger actions"
+                        id="xpack.triggersActionsUI.sections.ruleDetails.stateTitle"
+                        defaultMessage="State"
                       />
                     </p>
                   </EuiText>
@@ -285,11 +285,10 @@ export const RuleDetails: React.FunctionComponent<RuleDetailsProps> = ({
                       await snoozeRule(rule, snoozeEndTime)
                     }
                     unsnoozeRule={async () => await unsnoozeRule(rule)}
-                    item={rule as RuleTableItem}
+                    rule={rule as RuleTableItem}
                     onRuleChanged={requestRefresh}
                     direction="row"
                     isEditable={hasEditButton}
-                    previousSnoozeInterval={null}
                   />
                 </EuiFlexItem>
               </EuiFlexGroup>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx
index 032d69fa7ccc4..46d127479031f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx
@@ -11,11 +11,11 @@ import { shallow } from 'enzyme';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import { createMemoryHistory, createLocation } from 'history';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { RuleDetailsRoute, getRuleData } from './rule_details_route';
 import { Rule } from '../../../../types';
 import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner';
-import { spacesPluginMock } from '../../../../../../spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { useKibana } from '../../../../common/lib/kibana';
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx
index cc7dca2a2c9c1..30319ce13ae15 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState, useEffect } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { EuiSpacer } from '@elastic/eui';
 import { RuleType, ActionType, ResolvedRule } from '../../../../types';
 import { RuleDetailsWithApi as RuleDetails } from './rule_details';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx
index 1c4dd438e180d..1cf4beb0d87c0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx
@@ -20,12 +20,12 @@ import {
   EuiTableSortingType,
   EuiBasicTableColumn,
 } from '@elastic/eui';
+import { IExecutionErrors } from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../../common/lib/kibana';
 
 import { RefineSearchPrompt } from '../refine_search_prompt';
 import { LoadExecutionLogAggregationsProps } from '../../../lib/rule_api';
 import { Rule } from '../../../../types';
-import { IExecutionErrors } from '../../../../../../alerting/common';
 import {
   ComponentOpts as RuleApis,
   withBulkRuleOperations,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx
index 7cc198c1bf58e..e102affd9af38 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx
@@ -20,6 +20,11 @@ import {
   EuiDataGridCellValueElementProps,
   OnTimeChangeProps,
 } from '@elastic/eui';
+import {
+  IExecutionLog,
+  executionLogSortableColumns,
+  ExecutionLogSortFields,
+} from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../../common/lib/kibana';
 import { RULE_EXECUTION_DEFAULT_INITIAL_VISIBLE_COLUMNS } from '../../../constants';
 import { RuleEventLogListStatusFilter } from './rule_event_log_list_status_filter';
@@ -28,11 +33,6 @@ import { RuleEventLogListCellRenderer, ColumnId } from './rule_event_log_list_ce
 import { RefineSearchPrompt } from '../refine_search_prompt';
 import { LoadExecutionLogAggregationsProps } from '../../../lib/rule_api';
 import { Rule } from '../../../../types';
-import {
-  IExecutionLog,
-  executionLogSortableColumns,
-  ExecutionLogSortFields,
-} from '../../../../../../alerting/common';
 import {
   ComponentOpts as RuleApis,
   withBulkRuleOperations,
@@ -144,14 +144,14 @@ const columns = [
     isSortable: getIsColumnSortable('num_triggered_actions'),
   },
   {
-    id: 'num_scheduled_actions',
+    id: 'num_generated_actions',
     displayAsText: i18n.translate(
       'xpack.triggersActionsUI.sections.ruleDetails.eventLogColumn.scheduledActions',
       {
-        defaultMessage: 'Scheduled actions',
+        defaultMessage: 'Generated actions',
       }
     ),
-    isSortable: getIsColumnSortable('num_scheduled_actions'),
+    isSortable: getIsColumnSortable('num_generated_actions'),
   },
   {
     id: 'num_succeeded_actions',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx
index f973815dbd586..a33bdf7e25916 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx
@@ -14,7 +14,7 @@ import {
   DEFAULT_DATE_FORMAT,
 } from './rule_event_log_list_cell_renderer';
 import { RuleEventLogListStatus } from './rule_event_log_list_status';
-import { RuleDurationFormat } from '../../../sections/rules_list/components/rule_duration_format';
+import { RuleDurationFormat } from '../../rules_list/components/rule_duration_format';
 
 describe('rule_event_log_list_cell_renderer', () => {
   it('renders primitive values correctly', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx
index 15765f7414616..20e9274f2d73e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import moment from 'moment';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
 import { RuleEventLogListStatus } from './rule_event_log_list_status';
-import { RuleDurationFormat } from '../../../sections/rules_list/components/rule_duration_format';
+import { RuleDurationFormat } from '../../rules_list/components/rule_duration_format';
 import {
   RULE_EXECUTION_LOG_COLUMN_IDS,
   RULE_EXECUTION_LOG_DURATION_COLUMNS,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx
index 07cd2b325e458..fd28f62bda0cd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiIcon } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
 
 interface RuleEventLogListStatusProps {
   status: EcsEventOutcome;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx
index 0d8bafce130f3..c283dda11ada2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx
@@ -9,7 +9,7 @@ import React, { useState, useCallback } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFilterButton, EuiPopover, EuiFilterGroup, EuiFilterSelectItem } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
 import { RuleEventLogListStatus } from './rule_event_log_list_status';
 
 const statusFilters: EcsEventOutcome[] = ['success', 'failure', 'unknown'];
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx
index d27522e74b6fb..34af31146eb0d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import uuid from 'uuid';
 import { shallow } from 'enzyme';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { RuleRoute, getRuleSummary } from './rule_route';
 import { Rule, RuleSummary, RuleType } from '../../../../types';
 import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx
index 3e11f987138d2..7b72f34d05bac 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { Rule, RuleSummary, RuleType } from '../../../../types';
 import {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx
index 096e3bcf111b9..3f4375aad9ac6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx
@@ -8,7 +8,7 @@
 import React, { useState, useEffect } from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { fromNullable, fold } from 'fp-ts/lib/Option';
 import { pipe } from 'fp-ts/lib/pipeable';
 
@@ -16,7 +16,7 @@ import {
   RuleNavigation,
   RuleStateNavigation,
   RuleUrlNavigation,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { Rule } from '../../../../types';
 import { useKibana } from '../../../../common/lib/kibana';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts
index dcdc6c6431755..96c76cd688e48 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { DEFAULT_RULE_INTERVAL } from '../../constants';
-import { parseDuration } from '../../../../../alerting/common';
 
 export function getInitialInterval(minimumScheduleInterval?: string) {
   if (minimumScheduleInterval) {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx
index 9c9d2da8f6545..a2bd5cc7b3714 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFormLabel } from '@elastic/eui';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import RuleAdd from './rule_add';
 import { createRule } from '../../lib/rule_api';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
@@ -25,7 +25,7 @@ import {
 } from '../../../types';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { ReactWrapper } from 'enzyme';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../common/lib/kibana';
 import { triggersActionsUiConfig } from '../../../common/lib/config_api';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx
index 94acf30ece4ea..2885d34013402 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx
@@ -9,7 +9,7 @@ import React, { PropsWithChildren } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexItem, EuiText, EuiFlexGroup, EuiTitle, EuiButtonEmpty } from '@elastic/eui';
 import { partition } from 'lodash';
-import { ActionGroup, getBuiltinActionGroups } from '../../../../../alerting/common';
+import { ActionGroup, getBuiltinActionGroups } from '@kbn/alerting-plugin/common';
 
 const BUILT_IN_ACTION_GROUPS: Set<string> = new Set(getBuiltinActionGroups().map(({ id }) => id));
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx
index 9183ac6163b60..39214c8e8b214 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import {
   ValidationResult,
@@ -20,7 +20,7 @@ import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { ReactWrapper } from 'enzyme';
 import RuleEdit from './rule_edit';
 import { useKibana } from '../../../common/lib/kibana';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 jest.mock('../../../common/lib/kibana');
 const actionTypeRegistry = actionTypeRegistryMock.create();
 const ruleTypeRegistry = ruleTypeRegistryMock.create();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts
index 7637eb010867b..73769d8d9af10 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts
@@ -6,7 +6,7 @@
  */
 import { isObject } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { formatDuration, parseDuration } from '../../../../../alerting/common/parse_duration';
+import { formatDuration, parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import {
   RuleTypeModel,
   Rule,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
index e14a9fcc21c4d..f64a3c011187a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
@@ -19,8 +19,8 @@ import {
   GenericValidationResult,
 } from '../../../types';
 import { RuleForm } from './rule_form';
-import { coreMock } from 'src/core/public/mocks';
-import { ALERTS_FEATURE_ID, RecoveredActionGroup } from '../../../../../alerting/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ALERTS_FEATURE_ID, RecoveredActionGroup } from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../common/lib/kibana';
 
 const actionTypeRegistry = actionTypeRegistryMock.create();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
index 909fcfa2fb9e5..80923617da064 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
@@ -36,13 +36,19 @@ import {
   EuiCallOut,
 } from '@elastic/eui';
 import { capitalize } from 'lodash';
-import { KibanaFeature } from '../../../../../features/public';
+import { KibanaFeature } from '@kbn/features-plugin/public';
 import {
   formatDuration,
   getDurationNumberInItsUnit,
   getDurationUnitValue,
   parseDuration,
-} from '../../../../../alerting/common/parse_duration';
+} from '@kbn/alerting-plugin/common/parse_duration';
+import {
+  RuleActionParam,
+  ALERTS_FEATURE_ID,
+  RecoveredActionGroup,
+  isActionGroupDisabledForActionTypeId,
+} from '@kbn/alerting-plugin/common';
 import { RuleReducerAction, InitialRule } from './rule_reducer';
 import {
   RuleTypeModel,
@@ -56,12 +62,6 @@ import {
 } from '../../../types';
 import { getTimeOptions } from '../../../common/lib/get_time_options';
 import { ActionForm } from '../action_connector_form';
-import {
-  RuleActionParam,
-  ALERTS_FEATURE_ID,
-  RecoveredActionGroup,
-  isActionGroupDisabledForActionTypeId,
-} from '../../../../../alerting/common';
 import { hasAllPrivilege, hasShowActionsCapability } from '../../lib/capabilities';
 import { SolutionFilter } from './solution_filter';
 import './rule_form.scss';
@@ -120,6 +120,7 @@ export const RuleForm = ({
     charts,
     data,
     unifiedSearch,
+    dataViews,
   } = useKibana().services;
   const canShowActions = hasShowActionsCapability(capabilities);
 
@@ -524,6 +525,7 @@ export const RuleForm = ({
               metadata={metadata}
               charts={charts}
               data={data}
+              dataViews={dataViews}
               unifiedSearch={unifiedSearch}
             />
           </Suspense>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx
index 4098614c1a906..f092475b18e08 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx
@@ -10,7 +10,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { Rule } from '../../../types';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import { RuleNotifyWhen } from './rule_notify_when';
 
 describe('rule_notify_when', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts
index 1e1a1a5b64462..7f9950ddd5d0c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectAttribute } from 'kibana/public';
+import { SavedObjectAttribute } from '@kbn/core/public';
 import { isEqual } from 'lodash';
 import { Reducer } from 'react';
-import { RuleActionParam, IntervalSchedule } from '../../../../../alerting/common';
+import { RuleActionParam, IntervalSchedule } from '@kbn/alerting-plugin/common';
 import { Rule, RuleAction } from '../../../types';
 
 export type InitialRule = Partial<Rule> &
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.test.tsx
index ad642738dfbba..15086518124b4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.test.tsx
@@ -23,8 +23,7 @@ describe('RuleStatusDropdown', () => {
     snoozeRule,
     unsnoozeRule,
     isEditable: true,
-    previousSnoozeInterval: null,
-    item: {
+    rule: {
       id: '1',
       name: 'test rule',
       tags: ['tag1'],
@@ -53,7 +52,7 @@ describe('RuleStatusDropdown', () => {
       index: 0,
       updatedAt: new Date('2020-08-20T19:23:38Z'),
       snoozeEndTime: null,
-    },
+    } as ComponentOpts['rule'],
     onRuleChanged: jest.fn(),
   };
 
@@ -75,7 +74,7 @@ describe('RuleStatusDropdown', () => {
 
   test('renders status control as disabled when rule is disabled', () => {
     const wrapper = mountWithIntl(
-      <RuleStatusDropdown {...{ ...props, item: { ...props.item, enabled: false } }} />
+      <RuleStatusDropdown {...{ ...props, rule: { ...props.rule, enabled: false } }} />
     );
     expect(wrapper.find('[data-test-subj="statusDropdown"]').first().props().title).toBe(
       'Disabled'
@@ -87,7 +86,7 @@ describe('RuleStatusDropdown', () => {
 
     const wrapper = mountWithIntl(
       <RuleStatusDropdown
-        {...{ ...props, item: { ...props.item, snoozeEndTime: SNOOZE_END_TIME } }}
+        {...{ ...props, rule: { ...props.rule, snoozeEndTime: SNOOZE_END_TIME } }}
       />
     );
     expect(wrapper.find('[data-test-subj="statusDropdown"]').first().props().title).toBe('Snoozed');
@@ -98,7 +97,7 @@ describe('RuleStatusDropdown', () => {
     jest.spyOn(global.Date, 'now').mockImplementation(() => new Date(NOW_STRING).valueOf());
 
     const wrapper = mountWithIntl(
-      <RuleStatusDropdown {...{ ...props, item: { ...props.item, muteAll: true } }} />
+      <RuleStatusDropdown {...{ ...props, rule: { ...props.rule, muteAll: true } }} />
     );
     expect(wrapper.find('[data-test-subj="statusDropdown"]').first().props().title).toBe('Snoozed');
     expect(wrapper.find('[data-test-subj="remainingSnoozeTime"]').first().text()).toBe(
@@ -109,7 +108,7 @@ describe('RuleStatusDropdown', () => {
   test('renders status control as disabled when rule is snoozed but also disabled', () => {
     const wrapper = mountWithIntl(
       <RuleStatusDropdown
-        {...{ ...props, item: { ...props.item, enabled: false, snoozeEndTime: SNOOZE_END_TIME } }}
+        {...{ ...props, rule: { ...props.rule, enabled: false, snoozeEndTime: SNOOZE_END_TIME } }}
       />
     );
     expect(wrapper.find('[data-test-subj="statusDropdown"]').first().props().title).toBe(
@@ -122,7 +121,7 @@ describe('RuleStatusDropdown', () => {
       <RuleStatusDropdown
         {...{
           ...props,
-          item: { ...props.item, snoozeEndTime: SNOOZE_END_TIME },
+          rule: { ...props.rule, snoozeEndTime: SNOOZE_END_TIME },
         }}
         isEditable={false}
       />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
index 098d7c08a78f5..40658ae282e16 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
@@ -31,20 +31,22 @@ import {
 } from '@elastic/eui';
 import { parseInterval } from '../../../../../common';
 
-import { RuleTableItem } from '../../../../types';
+import { Rule } from '../../../../types';
 
 type SnoozeUnit = 'm' | 'h' | 'd' | 'w' | 'M';
 const SNOOZE_END_TIME_FORMAT = 'LL @ LT';
 
+type DropdownRuleRecord = Pick<Rule, 'enabled' | 'snoozeEndTime' | 'muteAll'>;
+
 export interface ComponentOpts {
-  item: RuleTableItem;
+  rule: DropdownRuleRecord;
   onRuleChanged: () => void;
   enableRule: () => Promise<void>;
   disableRule: () => Promise<void>;
   snoozeRule: (snoozeEndTime: string | -1, interval: string | null) => Promise<void>;
   unsnoozeRule: () => Promise<void>;
   isEditable: boolean;
-  previousSnoozeInterval: string | null;
+  previousSnoozeInterval?: string | null;
   direction?: 'column' | 'row';
 }
 
@@ -55,34 +57,64 @@ const COMMON_SNOOZE_TIMES: Array<[number, SnoozeUnit]> = [
   [1, 'd'],
 ];
 
+const PREV_SNOOZE_INTERVAL_KEY = 'triggersActionsUi_previousSnoozeInterval';
+const usePreviousSnoozeInterval: (p?: string | null) => [string | null, (n: string) => void] = (
+  propsInterval
+) => {
+  const intervalFromStorage = localStorage.getItem(PREV_SNOOZE_INTERVAL_KEY);
+  const usePropsInterval = typeof propsInterval !== 'undefined';
+  const interval = usePropsInterval ? propsInterval : intervalFromStorage;
+  const [previousSnoozeInterval, setPreviousSnoozeInterval] = useState<string | null>(interval);
+  const storeAndSetPreviousSnoozeInterval = (newInterval: string) => {
+    if (!usePropsInterval) {
+      localStorage.setItem(PREV_SNOOZE_INTERVAL_KEY, newInterval);
+    }
+    setPreviousSnoozeInterval(newInterval);
+  };
+  return [previousSnoozeInterval, storeAndSetPreviousSnoozeInterval];
+};
+
 export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
-  item,
+  rule,
   onRuleChanged,
   disableRule,
   enableRule,
   snoozeRule,
   unsnoozeRule,
   isEditable,
-  previousSnoozeInterval,
+  previousSnoozeInterval: propsPreviousSnoozeInterval,
   direction = 'column',
 }: ComponentOpts) => {
-  const [isEnabled, setIsEnabled] = useState<boolean>(item.enabled);
-  const [isSnoozed, setIsSnoozed] = useState<boolean>(isItemSnoozed(item));
+  const [isEnabled, setIsEnabled] = useState<boolean>(rule.enabled);
+  const [isSnoozed, setIsSnoozed] = useState<boolean>(isRuleSnoozed(rule));
+  const [previousSnoozeInterval, setPreviousSnoozeInterval] = usePreviousSnoozeInterval(
+    propsPreviousSnoozeInterval
+  );
+
   useEffect(() => {
-    setIsEnabled(item.enabled);
-  }, [item.enabled]);
+    setIsEnabled(rule.enabled);
+  }, [rule.enabled]);
   useEffect(() => {
-    setIsSnoozed(isItemSnoozed(item));
-  }, [item]);
+    setIsSnoozed(isRuleSnoozed(rule));
+  }, [rule]);
   const [isUpdating, setIsUpdating] = useState<boolean>(false);
   const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
 
   const onClickBadge = useCallback(() => setIsPopoverOpen((isOpen) => !isOpen), [setIsPopoverOpen]);
   const onClosePopover = useCallback(() => setIsPopoverOpen(false), [setIsPopoverOpen]);
+  const snoozeRuleAndStoreInterval = useCallback(
+    (snoozeEndTime: string | -1, interval: string | null) => {
+      if (interval) {
+        setPreviousSnoozeInterval(interval);
+      }
+      return snoozeRule(snoozeEndTime, interval);
+    },
+    [setPreviousSnoozeInterval, snoozeRule]
+  );
 
   const onChangeEnabledStatus = useCallback(
     async (enable: boolean) => {
-      if (item.enabled === enable) {
+      if (rule.enabled === enable) {
         return;
       }
       setIsUpdating(true);
@@ -98,17 +130,17 @@ export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
         setIsUpdating(false);
       }
     },
-    [item.enabled, isEnabled, onRuleChanged, enableRule, disableRule]
+    [rule.enabled, isEnabled, onRuleChanged, enableRule, disableRule]
   );
   const onChangeSnooze = useCallback(
     async (value: number, unit?: SnoozeUnit) => {
       setIsUpdating(true);
       try {
         if (value === -1) {
-          await snoozeRule(-1, null);
+          await snoozeRuleAndStoreInterval(-1, null);
         } else if (value !== 0) {
           const snoozeEndTime = moment().add(value, unit).toISOString();
-          await snoozeRule(snoozeEndTime, `${value}${unit}`);
+          await snoozeRuleAndStoreInterval(snoozeEndTime, `${value}${unit}`);
         } else await unsnoozeRule();
         setIsSnoozed(value !== 0);
         onRuleChanged();
@@ -116,7 +148,7 @@ export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
         setIsUpdating(false);
       }
     },
-    [setIsUpdating, setIsSnoozed, onRuleChanged, snoozeRule, unsnoozeRule]
+    [setIsUpdating, setIsSnoozed, onRuleChanged, snoozeRuleAndStoreInterval, unsnoozeRule]
   );
 
   const badgeColor = !isEnabled ? 'default' : isSnoozed ? 'warning' : 'primary';
@@ -124,9 +156,13 @@ export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
 
   const remainingSnoozeTime =
     isEnabled && isSnoozed ? (
-      <EuiToolTip content={moment(item.snoozeEndTime).format(SNOOZE_END_TIME_FORMAT)}>
+      <EuiToolTip
+        content={
+          rule.muteAll ? INDEFINITELY : moment(rule.snoozeEndTime).format(SNOOZE_END_TIME_FORMAT)
+        }
+      >
         <EuiText color="subdued" size="xs">
-          {item.muteAll ? INDEFINITELY : moment(item.snoozeEndTime).fromNow(true)}
+          {rule.muteAll ? INDEFINITELY : moment(rule.snoozeEndTime).fromNow(true)}
         </EuiText>
       </EuiToolTip>
     ) : null;
@@ -179,7 +215,7 @@ export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
               onChangeSnooze={onChangeSnooze}
               isEnabled={isEnabled}
               isSnoozed={isSnoozed}
-              snoozeEndTime={item.snoozeEndTime}
+              snoozeEndTime={rule.snoozeEndTime}
               previousSnoozeInterval={previousSnoozeInterval}
             />
           </EuiPopover>
@@ -267,6 +303,7 @@ const RuleStatusMenu: React.FunctionComponent<RuleStatusMenuProps> = ({
           icon: isEnabled && isSnoozed ? 'check' : 'empty',
           panel: 1,
           disabled: !isEnabled,
+          'data-test-subj': 'statusDropdownSnoozeItem',
         },
       ],
     },
@@ -330,6 +367,7 @@ const SnoozePanel: React.FunctionComponent<SnoozePanelProps> = ({
           <EuiButtonEmpty
             style={{ height: '1em' }}
             iconType="refresh"
+            data-test-subj="ruleSnoozePreviousButton"
             onClick={() => applySnooze(parsedPrevSnooze.value, parsedPrevSnooze.unit as SnoozeUnit)}
           >
             {i18n.translate('xpack.triggersActionsUI.sections.rulesList.previousSnooze', {
@@ -338,7 +376,7 @@ const SnoozePanel: React.FunctionComponent<SnoozePanelProps> = ({
           </EuiButtonEmpty>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiText color="subdued" size="s">
+          <EuiText color="subdued" size="s" data-test-subj="ruleSnoozePreviousText">
             {durationToTextString(parsedPrevSnooze.value, parsedPrevSnooze.unit as SnoozeUnit)}
           </EuiText>
         </EuiFlexItem>
@@ -358,6 +396,7 @@ const SnoozePanel: React.FunctionComponent<SnoozePanelProps> = ({
               'xpack.triggersActionsUI.sections.rulesList.snoozePanelIntervalValueLabel',
               { defaultMessage: 'Snooze interval value' }
             )}
+            data-test-subj="ruleSnoozeIntervalValue"
           />
         </EuiFlexItem>
         <EuiFlexItem grow={2}>
@@ -376,6 +415,7 @@ const SnoozePanel: React.FunctionComponent<SnoozePanelProps> = ({
               { value: 'w', text: WEEKS },
               { value: 'M', text: MONTHS },
             ]}
+            data-test-subj="ruleSnoozeIntervalUnit"
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
@@ -434,8 +474,8 @@ const SnoozePanel: React.FunctionComponent<SnoozePanelProps> = ({
   );
 };
 
-const isItemSnoozed = (item: { snoozeEndTime?: Date | null; muteAll: boolean }) => {
-  const { snoozeEndTime, muteAll } = item;
+const isRuleSnoozed = (rule: DropdownRuleRecord) => {
+  const { snoozeEndTime, muteAll } = rule;
   if (muteAll) return true;
   if (!snoozeEndTime) {
     return false;
@@ -548,3 +588,6 @@ const ONE: Record<SnoozeUnit, string> = {
     defaultMessage: '1 month',
   }),
 };
+
+// eslint-disable-next-line import/no-default-export
+export { RuleStatusDropdown as default };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx
index 65a4654b6ac29..cbb1a7f5455da 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx
@@ -14,10 +14,7 @@ import {
   EuiFilterSelectItem,
   EuiHealth,
 } from '@elastic/eui';
-import {
-  RuleExecutionStatuses,
-  RuleExecutionStatusValues,
-} from '../../../../../../alerting/common';
+import { RuleExecutionStatuses, RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { rulesStatusesTranslationsMapping } from '../translations';
 
 interface RuleStatusFilterProps {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx
index 7a73919b4dfec..f87cee4c6547f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx
@@ -18,7 +18,7 @@ import {
   RuleExecutionStatusWarningReasons,
   ALERTS_FEATURE_ID,
   parseDuration,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { getFormattedDuration, getFormattedMilliseconds } from '../../../lib/monitoring_utils';
 
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
index fa74c957d35e4..59515ca3c3622 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
@@ -46,6 +46,15 @@ import { EuiSelectableOptionCheckedType } from '@elastic/eui/src/components/sele
 import { useHistory } from 'react-router-dom';
 
 import { isEmpty } from 'lodash';
+import {
+  RuleExecutionStatus,
+  RuleExecutionStatusValues,
+  ALERTS_FEATURE_ID,
+  RuleExecutionStatusErrorReasons,
+  formatDuration,
+  parseDuration,
+  MONITORING_HISTORY_LIMIT,
+} from '@kbn/alerting-plugin/common';
 import {
   ActionType,
   Rule,
@@ -78,15 +87,6 @@ import { hasAllPrivilege, hasExecuteActionsCapability } from '../../../lib/capab
 import { routeToRuleDetails, DEFAULT_SEARCH_PAGE_SIZE } from '../../../constants';
 import { DeleteModalConfirmation } from '../../../components/delete_modal_confirmation';
 import { EmptyPrompt } from '../../../components/prompts/empty_prompt';
-import {
-  RuleExecutionStatus,
-  RuleExecutionStatusValues,
-  ALERTS_FEATURE_ID,
-  RuleExecutionStatusErrorReasons,
-  formatDuration,
-  parseDuration,
-  MONITORING_HISTORY_LIMIT,
-} from '../../../../../../alerting/common';
 import { rulesStatusesTranslationsMapping, ALERT_STATUS_LICENSE_ERROR } from '../translations';
 import { useKibana } from '../../../../common/lib/kibana';
 import { DEFAULT_HIDDEN_ACTION_TYPES } from '../../../../common/constants';
@@ -160,7 +160,6 @@ export const RulesList: React.FunctionComponent = () => {
   const [editFlyoutVisible, setEditFlyoutVisibility] = useState<boolean>(false);
   const [currentRuleToEdit, setCurrentRuleToEdit] = useState<RuleTableItem | null>(null);
   const [tagPopoverOpenIndex, setTagPopoverOpenIndex] = useState<number>(-1);
-  const [previousSnoozeInterval, setPreviousSnoozeInterval] = useState<string | null>(null);
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<Record<string, ReactNode>>(
     {}
   );
@@ -355,13 +354,11 @@ export const RulesList: React.FunctionComponent = () => {
         enableRule={async () => await enableRule({ http, id: item.id })}
         snoozeRule={async (snoozeEndTime: string | -1, interval: string | null) => {
           await snoozeRule({ http, id: item.id, snoozeEndTime });
-          setPreviousSnoozeInterval(interval);
         }}
         unsnoozeRule={async () => await unsnoozeRule({ http, id: item.id })}
-        item={item}
+        rule={item}
         onRuleChanged={() => loadRulesData()}
         isEditable={item.isEditable && isRuleTypeEditableInContext(item.ruleTypeId)}
-        previousSnoozeInterval={previousSnoozeInterval}
       />
     );
   };
@@ -832,8 +829,8 @@ export const RulesList: React.FunctionComponent = () => {
       {
         field: 'enabled',
         name: i18n.translate(
-          'xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.triggerActionsTitle',
-          { defaultMessage: 'Trigger actions' }
+          'xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.stateTitle',
+          { defaultMessage: 'State' }
         ),
         sortable: true,
         truncateText: false,
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts
index 9e490945e2261..8de3491dccb96 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts
@@ -12,3 +12,5 @@ export { builtInGroupByTypes } from './group_by_types';
 export const VIEW_LICENSE_OPTIONS_LINK = 'https://www.elastic.co/subscriptions';
 // TODO: Remove when cases connector is available across Kibana. Issue: https://github.com/elastic/kibana/issues/82502.
 export const DEFAULT_HIDDEN_ACTION_TYPES = ['.case'];
+
+export const PLUGIN_ID = 'triggersActions';
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/get_experimental_features.test.tsx b/x-pack/plugins/triggers_actions_ui/public/common/get_experimental_features.test.tsx
index aa7de97a6c889..237eccb0b4434 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/get_experimental_features.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/common/get_experimental_features.test.tsx
@@ -18,6 +18,7 @@ describe('getIsExperimentalFeatureEnabled', () => {
         rulesListDatagrid: true,
         internalAlertsTable: true,
         rulesDetailLogs: true,
+        internalShareableComponentsSandbox: true,
       },
     });
 
@@ -33,6 +34,10 @@ describe('getIsExperimentalFeatureEnabled', () => {
 
     expect(result).toEqual(true);
 
+    result = getIsExperimentalFeatureEnabled('internalShareableComponentsSandbox');
+
+    expect(result).toEqual(true);
+
     expect(() => getIsExperimentalFeatureEnabled('doesNotExist' as any)).toThrowError(
       `Invalid enable value doesNotExist. Allowed values are: ${allowedExperimentalValueKeys.join(
         ', '
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/get_rule_status_dropdown.tsx b/x-pack/plugins/triggers_actions_ui/public/common/get_rule_status_dropdown.tsx
new file mode 100644
index 0000000000000..06edadef7fab5
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/common/get_rule_status_dropdown.tsx
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { RuleStatusDropdown } from '../application/sections';
+import type { ComponentOpts } from '../application/sections/rules_list/components/rule_status_dropdown';
+
+export const getRuleStatusDropdownLazy = (props: ComponentOpts) => {
+  return <RuleStatusDropdown {...props} />;
+};
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts
index b05c3f51de4ab..29f2317fc6fcc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { uniq } from 'lodash';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { loadIndexPatterns, getMatchingIndices, getESIndexFields } from '../lib/data_apis';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts
index 28563730c3db7..765c6b2b7b12e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { triggersActionsUiConfig } from './config_api';
 
 describe('triggersActionsUiConfig', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts
index fe9f921fc7f88..ceeae9271b5ba 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_TRIGGERS_ACTIONS_UI_API_PATH } from '../../../common';
 import { TriggersActionsUiConfig } from '../../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts
index 92908dbe4c4c7..9b0d122e24d4e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts
@@ -11,7 +11,7 @@ import {
   getMatchingIndices,
   getESIndexFields,
 } from './data_apis';
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 const mockFind = jest.fn();
 const perPage = 1000;
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts
index 7ccf3bf71bec7..55b1ef4be2c74 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 const DATA_API_ROOT = '/api/triggers_actions_ui/data';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts
index 42a47068a7a65..6454f726e934b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { triggersActionsUiHealth } from './health_api';
 
 describe('triggersActionsUiHealth', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts
index 55db8164bae14..24a7324262316 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_TRIGGERS_ACTIONS_UI_API_PATH } from '../../../common';
 
 interface TriggersActionsUiHealth {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts
index ea89e33bf856d..6772eacc2aaed 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { notificationServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import {
   createKibanaContextProviderMock,
   createStartServicesMock,
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
index 97679041b94c8..f551ebae3bb81 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
@@ -6,17 +6,18 @@
  */
 
 import React from 'react';
-import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from '../../../../../../../src/plugins/unified_search/public/mocks';
-import {
-  coreMock,
-  scopedHistoryMock,
-  themeServiceMock,
-} from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { TriggersAndActionsUiServices } from '../../../application/app';
-import { RuleTypeRegistryContract, ActionTypeRegistryContract } from '../../../types';
+import {
+  RuleTypeRegistryContract,
+  ActionTypeRegistryContract,
+  AlertsTableConfigurationRegistryContract,
+} from '../../../types';
 
 export const createStartServicesMock = (): TriggersAndActionsUiServices => {
   const core = coreMock.createStart();
@@ -38,6 +39,7 @@ export const createStartServicesMock = (): TriggersAndActionsUiServices => {
     history: scopedHistoryMock.create(),
     setBreadcrumbs: jest.fn(),
     data: dataPluginMock.createStartContract(),
+    dataViews: dataViewPluginMocks.createStartContract(),
     unifiedSearch: unifiedSearchPluginMock.createStartContract(),
     actionTypeRegistry: {
       has: jest.fn(),
@@ -45,6 +47,12 @@ export const createStartServicesMock = (): TriggersAndActionsUiServices => {
       get: jest.fn(),
       list: jest.fn(),
     } as ActionTypeRegistryContract,
+    alertsTableConfigurationRegistry: {
+      has: jest.fn(),
+      register: jest.fn(),
+      get: jest.fn(),
+      list: jest.fn(),
+    } as AlertsTableConfigurationRegistryContract,
     charts: chartPluginMock.createStartContract(),
     isCloud: false,
     kibanaFeatures: [],
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts
index d64b57b4b9127..9a9553351a90e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts
@@ -12,7 +12,7 @@ import {
   useUiSetting,
   useUiSetting$,
   withKibana,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { TriggersAndActionsUiServices } from '../../../application/app';
 
 export type KibanaContext = KibanaReactContextValue<TriggersAndActionsUiServices>;
diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
index d68383aaa2018..94fe718363e2b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -9,7 +9,7 @@
 /* eslint-disable @kbn/eslint/no_export_all */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { Plugin } from './plugin';
 
 export type {
@@ -57,6 +57,8 @@ export { enableRule } from './application/lib/rule_api/enable';
 export { disableRule } from './application/lib/rule_api/disable';
 export { muteRule } from './application/lib/rule_api/mute';
 export { unmuteRule } from './application/lib/rule_api/unmute';
+export { snoozeRule } from './application/lib/rule_api/snooze';
+export { unsnoozeRule } from './application/lib/rule_api/unsnooze';
 export { loadRuleAggregations } from './application/lib/rule_api/aggregate';
 export { useLoadRuleTypes } from './application/hooks/use_load_rule_types';
 
@@ -64,4 +66,4 @@ export { loadActionTypes } from './application/lib/action_connector_api/connecto
 
 export type { TIME_UNITS } from './application/constants';
 export { getTimeUnitLabel } from './common/lib/get_time_unit_label';
-export type { TriggersAndActionsUiServices } from '../public/application/app';
+export type { TriggersAndActionsUiServices } from './application/app';
diff --git a/x-pack/plugins/triggers_actions_ui/public/mocks.ts b/x-pack/plugins/triggers_actions_ui/public/mocks.ts
index 706a66963e22f..79edc1f08ac97 100644
--- a/x-pack/plugins/triggers_actions_ui/public/mocks.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/mocks.ts
@@ -21,15 +21,19 @@ import {
   ConnectorAddFlyoutProps,
   ConnectorEditFlyoutProps,
   AlertsTableProps,
+  AlertsTableConfigurationRegistry,
 } from './types';
 import { getAlertsTableLazy } from './common/get_alerts_table';
+import { getRuleStatusDropdownLazy } from './common/get_rule_status_dropdown';
 
 function createStartMock(): TriggersAndActionsUIPublicPluginStart {
   const actionTypeRegistry = new TypeRegistry<ActionTypeModel>();
   const ruleTypeRegistry = new TypeRegistry<RuleTypeModel>();
+  const alertsTableConfigurationRegistry = new TypeRegistry<AlertsTableConfigurationRegistry>();
   return {
     actionTypeRegistry,
     ruleTypeRegistry,
+    alertsTableConfigurationRegistry,
     getAddConnectorFlyout: (props: Omit<ConnectorAddFlyoutProps, 'actionTypeRegistry'>) => {
       return getAddConnectorFlyoutLazy({ ...props, actionTypeRegistry });
     },
@@ -56,6 +60,9 @@ function createStartMock(): TriggersAndActionsUIPublicPluginStart {
     getAlertsTable: (props: AlertsTableProps) => {
       return getAlertsTableLazy(props);
     },
+    getRuleStatusDropdown: (props) => {
+      return getRuleStatusDropdownLazy(props);
+    },
   };
 }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/plugin.ts b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
index 7588af0195006..ba2e869c82e0f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@@ -5,34 +5,31 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin as CorePlugin } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin as CorePlugin } from '@kbn/core/public';
 
 import { i18n } from '@kbn/i18n';
 import { ReactElement } from 'react';
-import { PluginInitializerContext } from 'kibana/public';
-import { FeaturesPluginStart } from '../../features/public';
-import { KibanaFeature } from '../../features/common';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { ManagementAppMountParams, ManagementSetup } from '@kbn/management-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { registerBuiltInActionTypes } from './application/components/builtin_action_types';
 import { TypeRegistry } from './application/type_registry';
-import {
-  ManagementAppMountParams,
-  ManagementSetup,
-} from '../../../../src/plugins/management/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import { PluginStartContract as AlertingStart } from '../../alerting/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { SpacesPluginStart } from '../../spaces/public';
 
 import { getAddConnectorFlyoutLazy } from './common/get_add_connector_flyout';
 import { getEditConnectorFlyoutLazy } from './common/get_edit_connector_flyout';
 import { getAddAlertFlyoutLazy } from './common/get_add_alert_flyout';
 import { getEditAlertFlyoutLazy } from './common/get_edit_alert_flyout';
 import { getAlertsTableLazy } from './common/get_alerts_table';
+import { getRuleStatusDropdownLazy } from './common/get_rule_status_dropdown';
 import { ExperimentalFeaturesService } from './common/experimental_features_service';
 import {
   ExperimentalFeatures,
@@ -47,18 +44,23 @@ import type {
   ConnectorAddFlyoutProps,
   ConnectorEditFlyoutProps,
   AlertsTableProps,
+  RuleStatusDropdownProps,
+  AlertsTableConfigurationRegistry,
 } from './types';
 import { TriggersActionsUiConfigType } from '../common/types';
-import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
+import { registerAlertsTableConfiguration } from './application/sections/alerts_table/alerts_page/register_alerts_table_configuration';
+import { PLUGIN_ID } from './common/constants';
 
 export interface TriggersAndActionsUIPublicPluginSetup {
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
   ruleTypeRegistry: TypeRegistry<RuleTypeModel<any>>;
+  alertsTableConfigurationRegistry: TypeRegistry<AlertsTableConfigurationRegistry>;
 }
 
 export interface TriggersAndActionsUIPublicPluginStart {
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
   ruleTypeRegistry: TypeRegistry<RuleTypeModel<any>>;
+  alertsTableConfigurationRegistry: TypeRegistry<AlertsTableConfigurationRegistry>;
   getAddConnectorFlyout: (
     props: Omit<ConnectorAddFlyoutProps, 'actionTypeRegistry'>
   ) => ReactElement<ConnectorAddFlyoutProps>;
@@ -72,6 +74,7 @@ export interface TriggersAndActionsUIPublicPluginStart {
     props: Omit<RuleEditProps, 'actionTypeRegistry' | 'ruleTypeRegistry'>
   ) => ReactElement<RuleEditProps>;
   getAlertsTable: (props: AlertsTableProps) => ReactElement<AlertsTableProps>;
+  getRuleStatusDropdown: (props: RuleStatusDropdownProps) => ReactElement<RuleStatusDropdownProps>;
 }
 
 interface PluginsSetup {
@@ -82,6 +85,7 @@ interface PluginsSetup {
 
 interface PluginsStart {
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   charts: ChartsPluginStart;
   alerting?: AlertingStart;
   spaces?: SpacesPluginStart;
@@ -101,12 +105,14 @@ export class Plugin
 {
   private actionTypeRegistry: TypeRegistry<ActionTypeModel>;
   private ruleTypeRegistry: TypeRegistry<RuleTypeModel>;
+  private alertsTableConfigurationRegistry: TypeRegistry<AlertsTableConfigurationRegistry>;
   private config: TriggersActionsUiConfigType;
   readonly experimentalFeatures: ExperimentalFeatures;
 
   constructor(ctx: PluginInitializerContext) {
     this.actionTypeRegistry = new TypeRegistry<ActionTypeModel>();
     this.ruleTypeRegistry = new TypeRegistry<RuleTypeModel>();
+    this.alertsTableConfigurationRegistry = new TypeRegistry<AlertsTableConfigurationRegistry>();
     this.config = ctx.config.get();
     this.experimentalFeatures = parseExperimentalConfigValue(this.config.enableExperimental || []);
   }
@@ -114,6 +120,7 @@ export class Plugin
   public setup(core: CoreSetup, plugins: PluginsSetup): TriggersAndActionsUIPublicPluginSetup {
     const actionTypeRegistry = this.actionTypeRegistry;
     const ruleTypeRegistry = this.ruleTypeRegistry;
+    const alertsTableConfigurationRegistry = this.alertsTableConfigurationRegistry;
 
     ExperimentalFeaturesService.init({ experimentalFeatures: this.experimentalFeatures });
 
@@ -129,18 +136,18 @@ export class Plugin
 
     if (plugins.home) {
       plugins.home.featureCatalogue.register({
-        id: 'triggersActions',
+        id: PLUGIN_ID,
         title: featureTitle,
         description: featureDescription,
         icon: 'watchesApp',
         path: '/app/management/insightsAndAlerting/triggersActions',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
     plugins.management.sections.section.insightsAndAlerting.registerApp({
-      id: 'triggersActions',
+      id: PLUGIN_ID,
       title: featureTitle,
       order: 0,
       async mount(params: ManagementAppMountParams) {
@@ -165,6 +172,7 @@ export class Plugin
         return renderApp({
           ...coreStart,
           data: pluginsStart.data,
+          dataViews: pluginsStart.dataViews,
           charts: pluginsStart.charts,
           alerting: pluginsStart.alerting,
           spaces: pluginsStart.spaces,
@@ -177,6 +185,7 @@ export class Plugin
           history: params.history,
           actionTypeRegistry,
           ruleTypeRegistry,
+          alertsTableConfigurationRegistry,
           kibanaFeatures,
         });
       },
@@ -186,9 +195,16 @@ export class Plugin
       actionTypeRegistry: this.actionTypeRegistry,
     });
 
+    if (this.experimentalFeatures.internalAlertsTable) {
+      registerAlertsTableConfiguration({
+        alertsTableConfigurationRegistry: this.alertsTableConfigurationRegistry,
+      });
+    }
+
     return {
       actionTypeRegistry: this.actionTypeRegistry,
       ruleTypeRegistry: this.ruleTypeRegistry,
+      alertsTableConfigurationRegistry: this.alertsTableConfigurationRegistry,
     };
   }
 
@@ -196,6 +212,7 @@ export class Plugin
     return {
       actionTypeRegistry: this.actionTypeRegistry,
       ruleTypeRegistry: this.ruleTypeRegistry,
+      alertsTableConfigurationRegistry: this.alertsTableConfigurationRegistry,
       getAddConnectorFlyout: (props: Omit<ConnectorAddFlyoutProps, 'actionTypeRegistry'>) => {
         return getAddConnectorFlyoutLazy({ ...props, actionTypeRegistry: this.actionTypeRegistry });
       },
@@ -224,6 +241,9 @@ export class Plugin
       getAlertsTable: (props: AlertsTableProps) => {
         return getAlertsTableLazy(props);
       },
+      getRuleStatusDropdown: (props: RuleStatusDropdownProps) => {
+        return getRuleStatusDropdownLazy(props);
+      },
     };
   }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index f4bda5bb2a2d0..2d4268252a353 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -6,11 +6,12 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 import type { ComponentType } from 'react';
-import type { ChartsPluginSetup } from 'src/plugins/charts/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { IconType } from '@elastic/eui';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 import {
@@ -25,8 +26,7 @@ import {
   ALERT_HISTORY_PREFIX,
   AlertHistoryDefaultIndexName,
   AsApiContract,
-} from '../../actions/common';
-import { TypeRegistry } from './application/type_registry';
+} from '@kbn/actions-plugin/common';
 import {
   ActionGroup,
   RuleActionParam,
@@ -44,8 +44,10 @@ import {
   RuleTypeParams,
   ActionVariable,
   RuleType as CommonRuleType,
-} from '../../alerting/common';
-import { RuleRegistrySearchRequestPagination } from '../../rule_registry/common';
+} from '@kbn/alerting-plugin/common';
+import { RuleRegistrySearchRequestPagination } from '@kbn/rule-registry-plugin/common';
+import { TypeRegistry } from './application/type_registry';
+import type { ComponentOpts as RuleStatusDropdownProps } from './application/sections/rules_list/components/rule_status_dropdown';
 
 // In Triggers and Actions we treat all `Alert`s as `SanitizedRule<RuleTypeParams>`
 // so the `Params` is a black-box of Record<string, unknown>
@@ -77,6 +79,7 @@ export type {
   RuleTypeParams,
   ResolvedRule,
   SanitizedRule,
+  RuleStatusDropdownProps,
 };
 export type { ActionType, AsApiContract };
 export {
@@ -93,6 +96,9 @@ export type ActionTypeRegistryContract<
   ActionParams = unknown
 > = PublicMethodsOf<TypeRegistry<ActionTypeModel<ActionConnector, ActionParams>>>;
 export type RuleTypeRegistryContract = PublicMethodsOf<TypeRegistry<RuleTypeModel>>;
+export type AlertsTableConfigurationRegistryContract = PublicMethodsOf<
+  TypeRegistry<AlertsTableConfigurationRegistry>
+>;
 
 export type ActionConnectorFieldsCallbacks = {
   beforeActionConnectorSave?: () => Promise<void>;
@@ -282,6 +288,7 @@ export interface RuleTypeParamsExpressionProps<
   metadata?: MetaData;
   charts: ChartsPluginSetup;
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
@@ -387,9 +394,9 @@ export interface BulkActionsObjectProp {
 }
 
 export interface AlertsTableProps {
+  configurationId: string;
   consumers: AlertConsumers[];
   bulkActions: BulkActionsObjectProp;
-  columns: EuiDataGridColumn[];
   // defaultCellActions: TGridCellAction[];
   deletedEventIds: string[];
   disabledCellActions: string[];
@@ -402,3 +409,8 @@ export interface AlertsTableProps {
   useFetchAlertsData: () => FetchAlertData;
   'data-test-subj': string;
 }
+
+export interface AlertsTableConfigurationRegistry {
+  id: string;
+  columns: EuiDataGridColumn[];
+}
diff --git a/x-pack/plugins/triggers_actions_ui/server/config.ts b/x-pack/plugins/triggers_actions_ui/server/config.ts
index 46593fff21340..ec4196d184310 100644
--- a/x-pack/plugins/triggers_actions_ui/server/config.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import {
   ExperimentalFeatures,
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/index.ts b/x-pack/plugins/triggers_actions_ui/server/data/index.ts
index 1f6f39a57cbc8..c65f44162ecd7 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, IRouter } from '../../../../../src/core/server';
+import { Logger, IRouter } from '@kbn/core/server';
 import { timeSeriesQuery } from './lib/time_series_query';
 import { registerRoutes } from './routes';
 
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts
index 8df735e37e074..9909297da1063 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts
@@ -10,7 +10,7 @@
 import { ObjectType } from '@kbn/config-schema';
 import type { Writable } from '@kbn/utility-types';
 import { CoreQueryParams } from './core_query_types';
-import { MAX_GROUPS } from '../index';
+import { MAX_GROUPS } from '..';
 
 const DefaultParams: Writable<Partial<CoreQueryParams>> = {
   index: 'index-name',
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts
index 91085f80fe814..605a06ab7ab5e 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts
@@ -10,7 +10,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { MAX_GROUPS } from '../index';
+import { MAX_GROUPS } from '..';
 
 export const CoreQueryParamsSchemaProperties = {
   // name of the indices to search
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts
index 116abffc2ca2c..c37945513533e 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { times } from 'lodash';
-import { parseDuration } from '../../../../alerting/server';
-import { MAX_INTERVALS } from '../index';
+import { parseDuration } from '@kbn/alerting-plugin/server';
+import { MAX_INTERVALS } from '..';
 
 // dates as numbers are epoch millis
 // dates as strings are ISO
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts
index c27d14b70c33f..dc037dde8f499 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts
@@ -8,10 +8,10 @@
 // test error conditions of calling timeSeriesQuery - postive results tested in FT
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { Logger } from '../../../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { TimeSeriesQuery, timeSeriesQuery, getResultFromEs } from './time_series_query';
-import { alertsMock } from '../../../../alerting/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 
 const DefaultQueryParams: TimeSeriesQuery = {
   index: 'index-name',
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
index 3ea0958b1f27d..6f5ebbe34a891 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'kibana/server';
-import type { ElasticsearchClient } from 'src/core/server';
-import { getEsErrorMessage } from '../../../../alerting/server';
-import { DEFAULT_GROUPS } from '../index';
+import { Logger } from '@kbn/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { getEsErrorMessage } from '@kbn/alerting-plugin/server';
+import { DEFAULT_GROUPS } from '..';
 import { getDateRangeInfo } from './date_range_info';
 
 import { TimeSeriesQuery, TimeSeriesResult, TimeSeriesResultRow } from './time_series_types';
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts
index 125bdaa487fd2..d59d99c59419f 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts
@@ -11,8 +11,8 @@
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { parseDuration } from '../../../../alerting/server';
-import { MAX_INTERVALS } from '../index';
+import { parseDuration } from '@kbn/alerting-plugin/server';
+import { MAX_INTERVALS } from '..';
 import { CoreQueryParamsSchemaProperties, validateCoreQueryBody } from './core_query_types';
 import {
   getTooManyIntervalsErrorMessage,
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
index c28e6200ba6a9..e2e9b5967305d 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
@@ -13,8 +13,8 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
   ElasticsearchClient,
-} from 'kibana/server';
-import { Logger } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 
 const bodySchema = schema.object({
   indexPatterns: schema.arrayOf(schema.string()),
@@ -34,6 +34,7 @@ export function createFieldsRoute(logger: Logger, router: IRouter, baseRoute: st
     },
     handler
   );
+
   async function handler(
     ctx: RequestHandlerContext,
     req: KibanaRequest<unknown, unknown, RequestBody>,
@@ -49,10 +50,8 @@ export function createFieldsRoute(logger: Logger, router: IRouter, baseRoute: st
     }
 
     try {
-      rawFields = await getRawFields(
-        ctx.core.elasticsearch.client.asCurrentUser,
-        req.body.indexPatterns
-      );
+      const esClient = (await ctx.core).elasticsearch.client.asCurrentUser;
+      rawFields = await getRawFields(esClient, req.body.indexPatterns);
     } catch (err) {
       const indexPatterns = req.body.indexPatterns.join(',');
       logger.warn(
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts
index 59cfa62e5985b..a21b2617325c3 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
 import { createTimeSeriesQueryRoute } from './time_series_query';
 import { createFieldsRoute } from './fields';
 import { createIndicesRoute } from './indices';
-import { IRouter } from '../../../../../../src/core/server';
 import { getService } from '..';
 
 interface RegisterRoutesParams {
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
index ec19379cfa4ba..3fdee6f23b39b 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
@@ -18,8 +18,8 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
   ElasticsearchClient,
-} from 'kibana/server';
-import { Logger } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 
 const bodySchema = schema.object({
   pattern: schema.string(),
@@ -45,6 +45,7 @@ export function createIndicesRoute(logger: Logger, router: IRouter, baseRoute: s
     res: KibanaResponseFactory
   ): Promise<IKibanaResponse> {
     const pattern = req.body.pattern;
+    const esClient = (await ctx.core).elasticsearch.client.asCurrentUser;
     logger.debug(`route ${path} request: ${JSON.stringify(req.body)}`);
 
     if (pattern.trim() === '') {
@@ -53,14 +54,14 @@ export function createIndicesRoute(logger: Logger, router: IRouter, baseRoute: s
 
     let aliases: string[] = [];
     try {
-      aliases = await getAliasesFromPattern(ctx.core.elasticsearch.client.asCurrentUser, pattern);
+      aliases = await getAliasesFromPattern(esClient, pattern);
     } catch (err) {
       logger.warn(`route ${path} error getting aliases from pattern "${pattern}": ${err.message}`);
     }
 
     let indices: string[] = [];
     try {
-      indices = await getIndicesFromPattern(ctx.core.elasticsearch.client.asCurrentUser, pattern);
+      indices = await getIndicesFromPattern(esClient, pattern);
     } catch (err) {
       logger.warn(`route ${path} error getting indices from pattern "${pattern}": ${err.message}`);
     }
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
index 05203d9076e22..1fb7f2217d11b 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
@@ -11,8 +11,8 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { Logger } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 import { TimeSeriesQueryParameters } from '../lib/time_series_query';
 import { TimeSeriesQuery, TimeSeriesQuerySchema, TimeSeriesResult } from '../lib/time_series_types';
 export type { TimeSeriesQuery, TimeSeriesResult } from '../lib/time_series_types';
@@ -41,9 +41,10 @@ export function createTimeSeriesQueryRoute(
   ): Promise<IKibanaResponse> {
     logger.debug(`route ${path} request: ${JSON.stringify(req.body)}`);
 
+    const esClient = (await ctx.core).elasticsearch.client.asCurrentUser;
     const result = await timeSeriesQuery({
       logger,
-      esClient: ctx.core.elasticsearch.client.asCurrentUser,
+      esClient,
       query: req.body,
     });
 
diff --git a/x-pack/plugins/triggers_actions_ui/server/index.ts b/x-pack/plugins/triggers_actions_ui/server/index.ts
index 800eacedab8f3..5b81caa235a29 100644
--- a/x-pack/plugins/triggers_actions_ui/server/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from './config';
 import { TriggersActionsPlugin } from './plugin';
 
diff --git a/x-pack/plugins/triggers_actions_ui/server/plugin.ts b/x-pack/plugins/triggers_actions_ui/server/plugin.ts
index c33ce21777782..77ea47ceaa2c3 100644
--- a/x-pack/plugins/triggers_actions_ui/server/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Logger, Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { PluginSetupContract as AlertingPluginSetup } from '../../alerting/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
+import { Logger, Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { getService, register as registerDataService } from './data';
 import { createHealthRoute, createConfigRoute } from './routes';
 import { BASE_TRIGGERS_ACTIONS_UI_API_PATH } from '../common';
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts b/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts
index b7e0f15623e81..9c27db6135079 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServiceMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { createConfigRoute } from './config';
 
 describe('createConfigRoute', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/config.ts b/x-pack/plugins/triggers_actions_ui/server/routes/config.ts
index e7c880b35d29a..bf8445a736b78 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/config.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/config.ts
@@ -11,9 +11,9 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { Logger } from '../../../../../src/core/server';
-import { AlertingRulesConfig } from '../../../alerting/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
+import { AlertingRulesConfig } from '@kbn/alerting-plugin/server';
 
 export function createConfigRoute(
   logger: Logger,
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/health.ts b/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
index 509ec34de16ae..1ea2ce9eb04be 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
@@ -11,8 +11,8 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { Logger } from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 
 export function createHealthRoute(
   logger: Logger,
diff --git a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
index 41846f1f71ad6..5418f4a8f55d5 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { canInheritTimeRange } from './can_inherit_time_range';
-import { HelloWorldContainer } from '../../../../src/plugins/embeddable/public/lib/test_samples';
-import { HelloWorldEmbeddable } from '../../../../src/plugins/embeddable/public/tests/fixtures';
+import { HelloWorldContainer } from '@kbn/embeddable-plugin/public/lib/test_samples';
+import { HelloWorldEmbeddable } from '@kbn/embeddable-plugin/public/tests/fixtures';
 import { TimeRangeEmbeddable, TimeRangeContainer } from './test_helpers';
 
 test('canInheritTimeRange returns false if embeddable is inside container without a time range', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts
index 19b43ee2fc6be..9a1f089c08302 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Embeddable, IContainer, ContainerInput } from '../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+import { Embeddable, IContainer, ContainerInput } from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 
 interface ContainerTimeRangeInput extends ContainerInput<TimeRangeInput> {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
index 782d7b92588c7..8b5a5c7e6fdde 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
@@ -16,7 +16,7 @@ import {
   urlDrilldownActionFactory,
 } from './test_data';
 import { ActionFactory, BaseActionFactoryContext } from '../../dynamic_actions';
-import { licensingMock } from '../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { SerializableRecord } from '@kbn/utility-types';
 
 test('Pick and configure action', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
index 94fc3de891a75..4d713f2a700c6 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
@@ -23,6 +23,7 @@ import {
   EuiBetaBadge,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 import {
   txtBetaActionFactoryLabel,
   txtBetaActionFactoryTooltip,
@@ -33,7 +34,6 @@ import {
 } from './i18n';
 import './action_wizard.scss';
 import { ActionFactory, BaseActionConfig, BaseActionFactoryContext } from '../../dynamic_actions';
-import { Trigger } from '../../../../../../src/plugins/ui_actions/public';
 
 export interface ActionWizardProps<
   ActionFactoryContext extends BaseActionFactoryContext = BaseActionFactoryContext
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
index e43fc6ad9a1ba..aded7a306a767 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
@@ -7,20 +7,17 @@
 
 import React, { useState } from 'react';
 import { EuiFieldText, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { ActionWizard } from './action_wizard';
-import { ActionFactory, ActionFactoryDefinition, BaseActionConfig } from '../../dynamic_actions';
-import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
-import { licensingMock } from '../../../../licensing/public/mocks';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import {
   Trigger,
   UiActionsActionDefinition as ActionDefinition,
-} from '../../../../../../src/plugins/ui_actions/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../../../src/plugins/data/public';
-import {
-  SELECT_RANGE_TRIGGER,
-  VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
+} from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
+import { ActionFactory, ActionFactoryDefinition, BaseActionConfig } from '../../dynamic_actions';
+import { ActionWizard } from './action_wizard';
 
 export const dashboards = [
   { id: 'dashboard1', title: 'Dashboard 1' },
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx
index 7d9232dc793ef..76d686b14f869 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import { EuiFlexItem, EuiIcon, EuiKeyPadMenuItem, EuiToolTip } from '@elastic/eui';
+import { UiActionsPresentable as Presentable } from '@kbn/ui-actions-plugin/public';
 import {
   txtBetaActionFactoryLabel,
   txtBetaActionFactoryTooltip,
   txtInsufficientLicenseLevel,
 } from './i18n';
-import { UiActionsPresentable as Presentable } from '../../../../../../src/plugins/ui_actions/public';
 
 import './styles.scss';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
index 663161f5ebd2d..e1c6a1aa095e2 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
@@ -12,12 +12,12 @@ import { mount } from 'enzyme';
 
 import { TimeRangeEmbeddable, TimeRangeContainer, TIME_RANGE_EMBEDDABLE } from './test_helpers';
 import { CustomTimeRangeAction } from './custom_time_range_action';
-import { HelloWorldContainer } from '../../../../src/plugins/embeddable/public/lib/test_samples';
+import { HelloWorldContainer } from '@kbn/embeddable-plugin/public/lib/test_samples';
 
 import {
   HelloWorldEmbeddable,
   HELLO_WORLD_EMBEDDABLE,
-} from '../../../../src/plugins/embeddable/public/tests/fixtures';
+} from '@kbn/embeddable-plugin/public/tests/fixtures';
 
 import { nextTick } from '@kbn/test-jest-helpers';
 import { ReactElement } from 'react';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
index f0ec601a0cc2f..58b30c0f2927b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
@@ -12,9 +12,9 @@ import {
   Embeddable,
   EmbeddableInput,
   EmbeddableOutput,
-} from 'src/plugins/embeddable/public';
-import { Action, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { OpenModal, CommonlyUsedRange } from './types';
 
 export const CUSTOM_TIME_RANGE = 'CUSTOM_TIME_RANGE';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx
index 0e6217d360fa5..8f834b439b55b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { PrettyDuration } from '@elastic/eui';
-import { IEmbeddable, Embeddable, EmbeddableInput } from 'src/plugins/embeddable/public';
-import { Action, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+import { IEmbeddable, Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { doesInheritTimeRange } from './does_inherit_time_range';
 import { OpenModal, CommonlyUsedRange } from './types';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx
index aa91d862b6bd5..9dc7bd017740c 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CustomizeTimeRangeModal } from './customize_time_range_modal';
-import { Embeddable } from '../../../../src/plugins/embeddable/public';
+import { Embeddable } from '@kbn/embeddable-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 
 test("Doesn't display refresh interval options", () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx
index 4baf2c5f280f3..f253e2f3de059 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx
@@ -20,8 +20,8 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Embeddable, IContainer, ContainerInput } from '../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+import { Embeddable, IContainer, ContainerInput } from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 import { doesInheritTimeRange } from './does_inherit_time_range';
 import { CommonlyUsedRange } from './types';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts b/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts
index 4b921b0b222ea..58fe86c117f0c 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Embeddable, IContainer, ContainerInput } from '../../../../src/plugins/embeddable/public';
+import { Embeddable, IContainer, ContainerInput } from '@kbn/embeddable-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 
 export function doesInheritTimeRange(embeddable: Embeddable<TimeRangeInput>) {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
index 1dd805342d507..4d64f02d2c14b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
+import { LicenseType } from '@kbn/licensing-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import {
   ActionFactoryDefinition,
   BaseActionConfig,
   BaseActionFactoryContext,
   SerializedEvent,
 } from '../dynamic_actions';
-import { LicenseType } from '../../../licensing/public';
-import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
-import { PersistableStateDefinition } from '../../../../../src/plugins/kibana_utils/common';
 
 /**
  * This is a convenience interface to register a drilldown. Drilldown has
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx
index f341c6b1f27fd..87a32e7198e53 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
-import { DrilldownHelloBar } from './index';
+import { DrilldownHelloBar } from '.';
 
 const Demo = () => {
   const [show, setShow] = React.useState(true);
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx
index a5cd66d6a7b3b..9c4d98ebdf44e 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx
@@ -10,7 +10,7 @@
 import * as React from 'react';
 import { EuiFlyout, EuiButton } from '@elastic/eui';
 import { storiesOf } from '@storybook/react';
-import { FlyoutFrame } from './index';
+import { FlyoutFrame } from '.';
 
 storiesOf('components/FlyoutFrame', module)
   .add('default', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx
index 11ee764ea87b6..f3cfe38910588 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { render as renderTestingLibrary, fireEvent } from '@testing-library/react';
-import { FlyoutFrame } from './index';
+import { FlyoutFrame } from '.';
 
 describe('<FlyoutFrame>', () => {
   test('renders without crashing', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx
index 1ee194fd13107..6e6cd30f65116 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx
@@ -10,9 +10,9 @@ import { DrilldownManagerState, DrilldownManagerStateDeps } from './drilldown_ma
 import { DynamicActionManager } from '../../../dynamic_actions/dynamic_action_manager';
 import { uiActionsEnhancedPluginMock } from '../../../mocks';
 import { AdvancedUiActionsStart } from '../../..';
-import { Trigger } from 'src/plugins/ui_actions/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { notificationServiceMock } from 'src/core/public/mocks';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import { DrilldownState } from './drilldown_state';
 
 class StorageWrapperMock implements IStorageWrapper {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts
index 78944a1712728..59a2e5598fe87 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { ToastsStart } from 'kibana/public';
-import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
-import { Trigger } from '../../../../../../src/plugins/ui_actions/public';
+import { ToastsStart } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 import {
   ActionFactory,
   BaseActionFactoryContext,
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx
index 06851b9112c95..6556a8146a135 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx
@@ -16,6 +16,7 @@ import {
   EuiTextColor,
 } from '@elastic/eui';
 import { monaco } from '@kbn/monaco';
+import { UrlTemplateEditor, UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import { UrlDrilldownConfig } from '../../types';
 import './index.scss';
 import {
@@ -27,10 +28,6 @@ import {
   txtUrlTemplateEncodeDescription,
 } from './i18n';
 import { VariablePopover } from '../variable_popover';
-import {
-  UrlTemplateEditor,
-  UrlTemplateEditorVariable,
-} from '../../../../../../../../src/plugins/kibana_react/public';
 
 export interface UrlDrilldownCollectConfigProps {
   config: UrlDrilldownConfig;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx
index a0c1b2ad24b11..963ed7aeb2484 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx
@@ -16,12 +16,12 @@ import {
   EuiText,
   EuiSelectableOption,
 } from '@elastic/eui';
+import { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import {
   txtAddVariableButtonTitle,
   txtUrlTemplateVariablesHelpLinkText,
   txtUrlTemplateVariablesFilterPlaceholderText,
 } from './i18n';
-import { UrlTemplateEditorVariable } from '../../../../../../../../src/plugins/kibana_react/public';
 
 export interface Props {
   variables: UrlTemplateEditorVariable[];
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts
index fc4ce4c3d9625..479268e948b27 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts
@@ -10,7 +10,7 @@ import { encode, RisonValue } from 'rison-node';
 import dateMath from '@kbn/datemath';
 import moment, { Moment } from 'moment';
 import numeral from '@elastic/numeral';
-import { url } from '../../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 const handlebars = createHandlebars();
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts
index f8e119719fb86..da584f68edfaa 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { UrlDrilldownGlobalScope } from './types';
 
 interface UrlDrilldownGlobalScopeDeps {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
index d82373aee1ae0..9d03e00514e24 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
@@ -7,8 +7,8 @@
 
 import { ActionFactory } from './action_factory';
 import { ActionFactoryDefinition } from './action_factory_definition';
-import { licensingMock } from '../../../licensing/public/mocks';
-import { PublicLicense } from '../../../licensing/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { PublicLicense } from '@kbn/licensing-plugin/public';
 
 const def: ActionFactoryDefinition = {
   id: 'ACTION_FACTORY_1',
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
index 21e053c3e5c36..436c2e7bf8e8a 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
@@ -5,28 +5,28 @@
  * 2.0.
  */
 
-import type { UiComponent, CollectConfigProps } from 'src/plugins/kibana_utils/public';
+import type { UiComponent, CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
 import type {
   MigrateFunctionsObject,
   GetMigrationFunctionObjectFn,
-} from 'src/plugins/kibana_utils/common';
-import { uiToReactComponent } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-utils-plugin/common';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import type {
   UiActionsPresentable as Presentable,
   ActionMenuItemProps,
-} from '../../../../../src/plugins/ui_actions/public';
-import type { ActionFactoryDefinition } from './action_factory_definition';
-import type { Configurable } from '../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/ui-actions-plugin/public';
+import type { Configurable } from '@kbn/kibana-utils-plugin/public';
+import type { ILicense, LicensingPluginStart, LicenseType } from '@kbn/licensing-plugin/public';
+import type { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import type { SavedObjectReference } from '@kbn/core/types';
+import type { PersistableState } from '@kbn/kibana-utils-plugin/common';
 import type {
   BaseActionConfig,
   BaseActionFactoryContext,
   SerializedAction,
   SerializedEvent,
 } from './types';
-import type { ILicense, LicensingPluginStart, LicenseType } from '../../../licensing/public';
-import type { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
-import type { SavedObjectReference } from '../../../../../src/core/types';
-import type { PersistableState } from '../../../../../src/plugins/kibana_utils/common';
+import type { ActionFactoryDefinition } from './action_factory_definition';
 
 export interface ActionFactoryDeps {
   readonly getLicense?: () => ILicense;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
index db26abf8e1166..029933e3b28d3 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { Configurable } from '../../../../../src/plugins/kibana_utils/public';
+import { Configurable } from '@kbn/kibana-utils-plugin/public';
+import { LicenseType } from '@kbn/licensing-plugin/public';
+import {
+  UiActionsActionDefinition as ActionDefinition,
+  UiActionsPresentable as Presentable,
+} from '@kbn/ui-actions-plugin/public';
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import {
   BaseActionConfig,
   BaseActionFactoryContext,
   SerializedAction,
   SerializedEvent,
 } from './types';
-import { LicenseType } from '../../../licensing/public';
-import {
-  UiActionsActionDefinition as ActionDefinition,
-  UiActionsPresentable as Presentable,
-} from '../../../../../src/plugins/ui_actions/public';
-import { PersistableStateDefinition } from '../../../../../src/plugins/kibana_utils/common';
 
 /**
  * This is a convenience interface for registering new action factories.
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts
index 6a2cd0eed348a..ad59d8929b265 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts
@@ -6,9 +6,9 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { EnhancementRegistryDefinition } from '../../../../../src/plugins/embeddable/public';
-import { SavedObjectReference } from '../../../../../src/core/types';
-import { DynamicActionsState } from '../../../ui_actions_enhanced/public';
+import { EnhancementRegistryDefinition } from '@kbn/embeddable-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DynamicActionsState } from '..';
 import { UiActionsServiceEnhancements } from '../services';
 
 export const dynamicActionEnhancement = (
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts
index d13ef573396e7..8e94fead9a7d7 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { UiActionsPresentableGrouping as PresentableGrouping } from '../../../../../src/plugins/ui_actions/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { UiActionsPresentableGrouping as PresentableGrouping } from '@kbn/ui-actions-plugin/public';
 
 export const dynamicActionGrouping: PresentableGrouping<{
   embeddable?: IEmbeddable;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
index 64b8214fe4d4c..ab7d322c8576e 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
@@ -7,13 +7,13 @@
 
 import { DynamicActionManager } from './dynamic_action_manager';
 import { ActionStorage, MemoryActionStorage } from './dynamic_action_storage';
-import { UiActionsService } from '../../../../../src/plugins/ui_actions/public';
-import { ActionRegistry } from '../../../../../src/plugins/ui_actions/public/types';
-import { of } from '../../../../../src/plugins/kibana_utils';
+import { UiActionsService } from '@kbn/ui-actions-plugin/public';
+import { ActionRegistry } from '@kbn/ui-actions-plugin/public/types';
+import { of } from '@kbn/kibana-utils-plugin';
 import { UiActionsServiceEnhancements } from '../services';
 import { ActionFactoryDefinition } from './action_factory_definition';
 import { SerializedAction, SerializedEvent } from './types';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { dynamicActionGrouping } from './dynamic_action_grouping';
 
 const actionFactoryDefinition1: ActionFactoryDefinition = {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts
index 2deb0ab6edeb2..a2bbc0db953c5 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts
@@ -7,13 +7,10 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { Subscription } from 'rxjs';
+import { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { StateContainer, createStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { ActionStorage } from './dynamic_action_storage';
-import { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
 import { defaultState, transitions, selectors, State } from './dynamic_action_manager_state';
-import {
-  StateContainer,
-  createStateContainer,
-} from '../../../../../src/plugins/kibana_utils/common';
 import { StartContract } from '../plugin';
 import { SerializedAction, SerializedEvent } from './types';
 import { dynamicActionGrouping } from './dynamic_action_grouping';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/index.ts b/x-pack/plugins/ui_actions_enhanced/public/index.ts
index 453a633e851af..0b327cd65ff09 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/index.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { AdvancedUiActionsPublicPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/mocks.ts b/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
index 33591c9383703..5743d3d690500 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from '../../../../src/core/public';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { uiActionsPluginMock } from '../../../../src/plugins/ui_actions/public/mocks';
-import { embeddablePluginMock } from '../../../../src/plugins/embeddable/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { licensingMock } from '../../licensing/public/mocks';
 import { StartDependencies } from './plugin';
 
 export type Setup = jest.Mocked<AdvancedUiActionsSetup>;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/plugin.ts b/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
index 291a948e9e9ea..b64f836ad9596 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
@@ -6,28 +6,23 @@
  */
 
 import { BehaviorSubject, Subscription } from 'rxjs';
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-} from '../../../../src/core/public';
-import { createReactOverlays } from '../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../src/plugins/data/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { createReactOverlays } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   CONTEXT_MENU_TRIGGER,
   PANEL_BADGE_TRIGGER,
   EmbeddableSetup,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { ILicense, LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { createStartServicesGetter, Storage } from '@kbn/kibana-utils-plugin/public';
 import { CustomTimeRangeAction } from './custom_time_range_action';
 import { CustomTimeRangeBadge } from './custom_time_range_badge';
 import { CommonlyUsedRange } from './types';
 import { UiActionsServiceEnhancements } from './services';
-import { ILicense, LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
 import { createPublicDrilldownManager, PublicDrilldownManagerComponent } from './drilldowns';
-import { createStartServicesGetter, Storage } from '../../../../src/plugins/kibana_utils/public';
 import { dynamicActionEnhancement } from './dynamic_actions/dynamic_action_enhancement';
 
 interface SetupDependencies {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
index 484a61f661a52..28e7aaa774a7b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
@@ -10,7 +10,7 @@ import {
   UiActionsServiceEnhancementsParams,
 } from './ui_actions_service_enhancements';
 import { ActionFactoryDefinition, ActionFactory } from '../dynamic_actions';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 
 const deps: UiActionsServiceEnhancementsParams = {
   getLicense: () => licensingMock.createLicense(),
diff --git a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
index 40155617b22e0..63f90d5a55a1f 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
@@ -6,7 +6,11 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { ActionFactoryRegistry } from '../types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
+import { DrilldownDefinition } from '../drilldowns';
 import {
   ActionFactory,
   ActionFactoryDefinition,
@@ -14,11 +18,7 @@ import {
   BaseActionFactoryContext,
   SerializedEvent,
 } from '../dynamic_actions';
-import { DrilldownDefinition } from '../drilldowns';
-import { ILicense } from '../../../licensing/common/types';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../../licensing/public';
-import { SavedObjectReference } from '../../../../../src/core/types';
-import { PersistableStateDefinition } from '../../../../../src/plugins/kibana_utils/common';
+import { ActionFactoryRegistry } from '../types';
 
 import { DynamicActionsState } from '../../common/types';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts
index 61f4f4ab1f040..b37a0e54d75bd 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts
@@ -10,8 +10,8 @@ import {
   Container,
   ContainerOutput,
   EmbeddableStart,
-} from '../../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 
 /**
  * interfaces are not allowed to specify a sub-set of the required types until
diff --git a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts
index 3a6512400777e..a916fe6601eed 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts
@@ -10,8 +10,8 @@ import {
   Embeddable,
   EmbeddableInput,
   IContainer,
-} from '../../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 
 interface EmbeddableTimeRangeInput extends EmbeddableInput {
   timeRange: TimeRange;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts
index 1587b144e3a11..4f1fb3af965e8 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts
@@ -9,8 +9,8 @@ import {
   EmbeddableInput,
   IContainer,
   EmbeddableFactoryDefinition,
-} from '../../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { TIME_RANGE_EMBEDDABLE, TimeRangeEmbeddable } from './time_range_embeddable';
 
 interface EmbeddableTimeRangeInput extends EmbeddableInput {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/types.ts b/x-pack/plugins/ui_actions_enhanced/public/types.ts
index 71701b24ca981..7541212569f55 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/types.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaReactOverlays } from '../../../../src/plugins/kibana_react/public';
+import { KibanaReactOverlays } from '@kbn/kibana-react-plugin/public';
 import { ActionFactory } from './dynamic_actions';
 
 export interface CommonlyUsedRange {
diff --git a/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts b/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts
index 45062f36bdfbf..e30567e1231de 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { EnhancementRegistryDefinition } from '../../../../src/plugins/embeddable/server';
-import { SavedObjectReference } from '../../../../src/core/types';
+import { EnhancementRegistryDefinition } from '@kbn/embeddable-plugin/server';
+import { SavedObjectReference } from '@kbn/core/types';
 import { ActionFactory, DynamicActionsState, SerializedEvent } from './types';
 import { dynamicActionsCollector } from './telemetry/dynamic_actions_collector';
 import { dynamicActionFactoriesCollector } from './telemetry/dynamic_action_factories_collector';
diff --git a/x-pack/plugins/ui_actions_enhanced/server/plugin.ts b/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
index f29b1c03b941a..f021924db3731 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
@@ -6,8 +6,8 @@
  */
 
 import { identity } from 'lodash';
-import { CoreSetup, Plugin } from '../../../../src/core/server';
-import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import { dynamicActionEnhancement } from './dynamic_action_enhancement';
 import { ActionFactoryRegistry, SerializedEvent, ActionFactoryDefinition } from './types';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/server/types.ts b/x-pack/plugins/ui_actions_enhanced/server/types.ts
index e0734e31486b5..7280846e9330d 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/types.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  PersistableState,
-  PersistableStateDefinition,
-} from '../../../../src/plugins/kibana_utils/common';
+import { PersistableState, PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 
 import { SerializedAction, SerializedEvent, DynamicActionsState } from '../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx
index ba09db95ee883..27e41d17a5b10 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx
@@ -8,7 +8,7 @@
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { App } from '../../../public/application/app';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts
index 813a269bf5a97..74d2823725286 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { EsDeprecationLogs } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts
index 033b42b1bf973..e6e87087ed55d 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts
@@ -7,7 +7,7 @@
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { EsDeprecations } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
index 3ceadecb208df..ac9404f301a08 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
@@ -14,13 +14,13 @@ import {
   httpServiceMock,
   coreMock,
   scopedHistoryMock,
-} from 'src/core/public/mocks';
-import { sharePluginMock } from 'src/plugins/share/public/mocks';
+} from '@kbn/core/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 import { apiService } from '../../../public/application/lib/api';
 import { breadcrumbService } from '../../../public/application/lib/breadcrumbs';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { cloudMock } from '../../../../../../x-pack/plugins/cloud/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { cloudMock } from '@kbn/cloud-plugin/public/mocks';
 
 const data = dataPluginMock.createStartContract();
 const dataViews = { ...data.dataViews };
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts
index 38a82b8e2d5af..b7de4ef3cc5d6 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 import {
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx
index 7bc6931550a3b..0c328f0deede0 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import SemVer from 'semver/classes/semver';
 import { merge } from 'lodash';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { MAJOR_VERSION } from '../../../common/constants';
 
 import { AuthorizationContext, Authorization, Privileges } from '../../../public/shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts
index e235bdc6f4543..accf23715142c 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts
index 6e63d150c09f8..7a62fa33bb876 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
-import type { DeprecationsServiceStart } from 'kibana/public';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
+import type { DeprecationsServiceStart } from '@kbn/core/public';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts
index 13616286552ef..7a74225e9340a 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
index bde2a78b13302..8899212ca341c 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
@@ -11,7 +11,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { KibanaDeprecations } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts
index 6a3d376acecab..25d4983818210 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DeprecationsServiceStart, DomainDeprecationDetails } from 'kibana/public';
+import type { DeprecationsServiceStart, DomainDeprecationDetails } from '@kbn/core/public';
 
 const kibanaDeprecations: DomainDeprecationDetails[] = [
   {
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx
index 8671b136844ed..50f7389ac8c11 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../../kibana_deprecations/service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx
index cc2cec97cc702..1399897bbdaa0 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../../kibana_deprecations/service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx
index f060a38440ec1..77c8a9e998edf 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
-import type { DomainDeprecationDetails } from 'kibana/public';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
+import type { DomainDeprecationDetails } from '@kbn/core/public';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../../kibana_deprecations/service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts
index 3f56a971b6bf9..d80778d37699e 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { Overview } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts
index 5993d351a8c75..3da2215a14370 100644
--- a/x-pack/plugins/upgrade_assistant/common/types.ts
+++ b/x-pack/plugins/upgrade_assistant/common/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { SavedObject, SavedObjectAttributes } from 'src/core/public';
+import { SavedObject, SavedObjectAttributes } from '@kbn/core/public';
 
 export type DeprecationSource = 'Kibana' | 'Elasticsearch';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/app.tsx b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
index 00c910fd648f7..a939adbc4868d 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/app.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
@@ -9,7 +9,7 @@ import React, { useState, useEffect } from 'react';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiPageContent, EuiLoadingSpinner } from '@elastic/eui';
-import { ScopedHistory } from 'src/core/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { API_BASE_PATH } from '../../common/constants';
 import { ClusterUpgradeState } from '../../common/types';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts
index 4a0bbfba1b540..916d007ebac62 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts
@@ -8,7 +8,7 @@
 import { getDeprecationDataView } from './external_links';
 
 import { DEPRECATION_LOGS_INDEX_PATTERN } from '../../../../../common/constants';
-import { dataPluginMock, Start } from '../../../../../../../../src/plugins/data/public/mocks';
+import { dataPluginMock, Start } from '@kbn/data-plugin/public/mocks';
 
 describe('External Links', () => {
   let dataService: Start;
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx
index e181ca97d21fa..f05e55a1073ad 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx
@@ -16,7 +16,7 @@ import { ChecklistFlyoutStep } from './checklist_step';
 
 jest.mock('../../../../../app_context', () => {
   const { docLinksServiceMock } = jest.requireActual(
-    '../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
+    '@kbn/core/public/doc_links/doc_links_service.mock'
   );
 
   return {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx
index bc944f7773ac7..5e11615d5ca0b 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx
@@ -19,7 +19,7 @@ const kibanaVersion = new SemVer(MAJOR_VERSION);
 
 jest.mock('../../../../../app_context', () => {
   const { docLinksServiceMock } = jest.requireActual(
-    '../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
+    '@kbn/core/public/doc_links/doc_links_service.mock'
   );
 
   return {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx
index 39b3a722055f8..7782d47fc5cc0 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx
@@ -18,7 +18,7 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../common/types';
 
 export const hasReindexWarning = (
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
index b585ea20b1714..db0f5f6356b19 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
@@ -11,7 +11,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { EuiPageHeader, EuiSpacer, EuiPageContent, EuiLink, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 
 import { EnrichedDeprecationInfo } from '../../../../common/types';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx
index 3b4cd5acafb95..49992be691f5e 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx
@@ -12,7 +12,7 @@ import { EuiPageContent, EuiPageHeader, EuiSpacer, EuiCallOut } from '@elastic/e
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import type { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from '@kbn/core/public';
 import { SectionLoading, GlobalFlyout } from '../../../shared_imports';
 import { useAppContext } from '../../app_context';
 import { uiMetricService, UIM_KIBANA_DEPRECATIONS_PAGE_LOAD } from '../../lib/ui_metric';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx
index 1825b04717311..8486a3a4a891f 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx
@@ -9,7 +9,7 @@ import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';
 
-import type { CloudSetup } from '../../../../../../cloud/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
 import { OnPremBackup } from './on_prem_backup';
 import { CloudBackup } from './cloud_backup';
 import type { OverviewStepProps } from '../../types';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx
index b0aa7b592e3a1..d453364806e91 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx
@@ -7,7 +7,7 @@
 
 import React, { FunctionComponent, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from '@kbn/core/public';
 
 import { useAppContext } from '../../../../app_context';
 import { DeprecationIssuesPanel } from './deprecation_issues_panel';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx
index 8fade09bbcb47..22479d971e698 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import type { SystemIndicesMigrationFeature } from '../../../../../common/types';
 import type { OverviewStepProps } from '../../types';
 import { useMigrateSystemIndices } from './use_migrate_system_indices';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
index f55a6c04c640e..73ad9843e6ea5 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   ESUpgradeStatus,
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts
index dd1cc01355696..ebb398d8e0ce9 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts
index 078e3e641569e..33ce1180d94dd 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export const UIM_APP_NAME = 'upgrade_assistant';
 export const UIM_ES_DEPRECATIONS_PAGE_LOAD = 'es_deprecations_page_load';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx
index 6ab764ddcba6d..96ea2004d6e85 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import type { ManagementAppMountParams } from 'src/plugins/management/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { RootComponent } from './app';
 import { AppDependencies } from '../types';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/index.ts b/x-pack/plugins/upgrade_assistant/public/index.ts
index e338b9c044f68..a838b5019cd98 100644
--- a/x-pack/plugins/upgrade_assistant/public/index.ts
+++ b/x-pack/plugins/upgrade_assistant/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UpgradeAssistantUIPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => {
diff --git a/x-pack/plugins/upgrade_assistant/public/plugin.ts b/x-pack/plugins/upgrade_assistant/public/plugin.ts
index 7e39b120b0ab3..9ed30445c2fc5 100644
--- a/x-pack/plugins/upgrade_assistant/public/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import SemVer from 'semver/classes/semver';
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/public';
+import { Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 
 import { apiService } from './application/lib/api';
 import { breadcrumbService } from './application/lib/breadcrumbs';
diff --git a/x-pack/plugins/upgrade_assistant/public/shared_imports.ts b/x-pack/plugins/upgrade_assistant/public/shared_imports.ts
index 7d23f88a95c44..cbed7f5258411 100644
--- a/x-pack/plugins/upgrade_assistant/public/shared_imports.ts
+++ b/x-pack/plugins/upgrade_assistant/public/shared_imports.ts
@@ -12,7 +12,7 @@ export type {
   Privileges,
   MissingPrivileges,
   Authorization,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   sendRequest,
@@ -23,17 +23,17 @@ export {
   AuthorizationProvider,
   AuthorizationContext,
   NotAuthorizedSection,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export { Storage } from '../../../../src/plugins/kibana_utils/public';
+export { Storage } from '@kbn/kibana-utils-plugin/public';
 
 export {
   KibanaContextProvider,
   reactRouterNavigate,
   RedirectAppLinks,
   KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
-export type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+export type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
diff --git a/x-pack/plugins/upgrade_assistant/public/types.ts b/x-pack/plugins/upgrade_assistant/public/types.ts
index 6af71bde7a45a..d6b4860c29612 100644
--- a/x-pack/plugins/upgrade_assistant/public/types.ts
+++ b/x-pack/plugins/upgrade_assistant/public/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import { Observable } from 'rxjs';
-import { ManagementSetup } from 'src/plugins/management/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import { CoreStart, ScopedHistory, CoreTheme } from 'src/core/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { CoreStart, ScopedHistory, CoreTheme } from '@kbn/core/public';
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { CloudSetup } from '../../cloud/public';
-import { LicensingPluginStart } from '../../licensing/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { BreadcrumbService } from './application/lib/breadcrumbs';
 import { ApiService } from './application/lib/api';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/config.ts b/x-pack/plugins/upgrade_assistant/server/config.ts
index cc073a597d046..5406898ecaf77 100644
--- a/x-pack/plugins/upgrade_assistant/server/config.ts
+++ b/x-pack/plugins/upgrade_assistant/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/index.ts b/x-pack/plugins/upgrade_assistant/server/index.ts
index 660aa107292e8..976e7f58bffc7 100644
--- a/x-pack/plugins/upgrade_assistant/server/index.ts
+++ b/x-pack/plugins/upgrade_assistant/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { UpgradeAssistantServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
index b3b93582e2260..2a448e78e370a 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   getDeprecationLoggingStatus,
   isDeprecationLoggingEnabled,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
index 0c1d5e9ef7960..081903ff0f0ee 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { DeprecationLoggingStatus } from '../../common/types';
 
 export async function getDeprecationLoggingStatus(
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
index efcd7d4ae0243..5d24abddb9408 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { getESUpgradeStatus } from './es_deprecations_status';
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
index d4e9a164efa1c..014b11e1dbdb5 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
@@ -6,14 +6,14 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { EnrichedDeprecationInfo, ESUpgradeStatus } from '../../common/types';
 
 import { esIndicesStateCheck } from './es_indices_state_check';
 import {
   getESSystemIndicesMigrationStatus,
   convertFeaturesToIndicesArray,
-} from '../lib/es_system_indices_migration';
+} from './es_system_indices_migration';
 
 export async function getESUpgradeStatus(
   dataClient: IScopedClusterClient
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
index 3dcae8b307d55..deeb9310f9beb 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { getIndexState } from '../../common/get_index_state';
 import { ResolveIndexResponseFromES } from '../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts
index 18345f9a0944e..fcf086abe5388 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts
@@ -6,7 +6,7 @@
  */
 
 import { flow, flatMap, map, flatten, uniq } from 'lodash/fp';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   SystemIndicesMigrationStatus,
   SystemIndicesMigrationFeature,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
index 7205a0458494b..d1df5f8e31170 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { SemVer } from 'semver';
-import { IScopedClusterClient, kibanaResponseFactory } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { licensingMock } from '../../../../plugins/licensing/server/mocks';
+import { IScopedClusterClient, kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { MAJOR_VERSION } from '../../common/constants';
 import { getMockVersionInfo } from './__fixtures__/version';
 
@@ -104,7 +104,10 @@ describe('EsVersionPrecheck', () => {
 
     ctx.core.elasticsearch.client.asInternalUser.nodes.info.mockRejectedValue({ statusCode: 403 });
 
-    const result = await esVersionCheck(ctx, kibanaResponseFactory);
+    const result = await esVersionCheck(
+      coreMock.createCustomRequestHandlerContext(ctx),
+      kibanaResponseFactory
+    );
     expect(result).toHaveProperty('status', 403);
   });
 
@@ -120,7 +123,10 @@ describe('EsVersionPrecheck', () => {
       },
     });
 
-    const result = await esVersionCheck(ctx, kibanaResponseFactory);
+    const result = await esVersionCheck(
+      coreMock.createCustomRequestHandlerContext(ctx),
+      kibanaResponseFactory
+    );
     expect(result).toHaveProperty('status', 426);
     expect(result).toHaveProperty('payload.attributes.allNodesUpgraded', false);
   });
@@ -137,7 +143,10 @@ describe('EsVersionPrecheck', () => {
       },
     });
 
-    const result = await esVersionCheck(ctx, kibanaResponseFactory);
+    const result = await esVersionCheck(
+      coreMock.createCustomRequestHandlerContext(ctx),
+      kibanaResponseFactory
+    );
     expect(result).toHaveProperty('status', 426);
     expect(result).toHaveProperty('payload.attributes.allNodesUpgraded', true);
   });
@@ -154,6 +163,8 @@ describe('EsVersionPrecheck', () => {
       },
     });
 
-    await expect(esVersionCheck(ctx, kibanaResponseFactory)).resolves.toBe(undefined);
+    await expect(
+      esVersionCheck(coreMock.createCustomRequestHandlerContext(ctx), kibanaResponseFactory)
+    ).resolves.toBe(undefined);
   });
 });
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
index 7b656635d8644..2e85cbaf73a94 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
@@ -13,7 +13,7 @@ import {
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { versionService } from './version';
 
 /**
@@ -65,7 +65,7 @@ export const esVersionCheck = async (
   ctx: RequestHandlerContext,
   response: KibanaResponseFactory
 ) => {
-  const { client } = ctx.core.elasticsearch;
+  const { client } = (await ctx.core).elasticsearch;
   let allNodeVersions: SemVer[];
 
   try {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
index 296a313abef38..cc0b270c61f41 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
@@ -6,8 +6,8 @@
  */
 
 import _ from 'lodash';
-import { deprecationsServiceMock } from 'src/core/server/mocks';
-import { DomainDeprecationDetails } from 'src/core/server/types';
+import { deprecationsServiceMock } from '@kbn/core/server/mocks';
+import { DomainDeprecationDetails } from '@kbn/core/server/types';
 
 import { getKibanaUpgradeStatus } from './kibana_status';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts
index 9908f026d3996..89fdd8e83847b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DeprecationsClient } from 'kibana/server';
-import { DomainDeprecationDetails } from 'src/core/server/types';
+import { DeprecationsClient } from '@kbn/core/server';
+import { DomainDeprecationDetails } from '@kbn/core/server/types';
 
 export const getKibanaUpgradeStatus = async (deprecationsClient: DeprecationsClient) => {
   const kibanaDeprecations: DomainDeprecationDetails[] =
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts
index 90adfdfa8fced..061fa0801359d 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
-import { loggingSystemMock, httpServerMock } from 'src/core/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { loggingSystemMock, httpServerMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { ReindexStep, ReindexStatus, ReindexSavedObject } from '../../../common/types';
 import { credentialStoreFactory } from './credential_store';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
index b3d4d5e165a13..4555dfb02d8c1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
@@ -8,9 +8,9 @@
 import { createHash } from 'crypto';
 import stringify from 'json-stable-stringify';
 
-import { KibanaRequest, Logger } from 'src/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 
-import { SecurityPluginStart } from '../../../../security/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
 
 export type Credential = Record<string, any>;
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
index b6064d76bcd7a..c17cc160a6ce1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { ScopedClusterClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import moment from 'moment';
 
 import {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
index 3b4e3ad79cc8c..01c73bf85765b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectsFindResponse,
   SavedObjectsClientContract,
   ElasticsearchClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   REINDEX_OP_TYPE,
   ReindexOperation,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
index a3628a62d8ab0..062782560ef2b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
@@ -8,10 +8,10 @@
 jest.mock('../es_indices_state_check', () => ({ esIndicesStateCheck: jest.fn() }));
 import { BehaviorSubject } from 'rxjs';
 import { TransportResult } from '@elastic/elasticsearch';
-import { Logger } from 'src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { ScopedClusterClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import {
   ReindexOperation,
@@ -20,8 +20,8 @@ import {
   ReindexStep,
 } from '../../../common/types';
 import { MAJOR_VERSION } from '../../../common/constants';
-import { licensingMock } from '../../../../licensing/server/mocks';
-import { LicensingPluginSetup } from '../../../../licensing/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 
 import { getMockVersionInfo } from '../__fixtures__/version';
 import { esIndicesStateCheck } from '../es_indices_state_check';
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index e0ab66bfcb092..bf605ac119fda 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { firstValueFrom } from 'rxjs';
 
-import { LicensingPluginSetup } from '../../../../licensing/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 
 import {
   ReindexSavedObject,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
index 579e4ddb21337..46fcf6a4cec5b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from 'src/core/server';
+import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from '@kbn/core/server';
 import moment from 'moment';
-import { SecurityPluginStart } from '../../../../security/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
 import { Credential, CredentialStore } from './credential_store';
 import { reindexActionsFactory } from './reindex_actions';
 import { ReindexService, reindexServiceFactory } from './reindex_service';
-import { LicensingPluginSetup } from '../../../../licensing/server';
 import { sortAndOrderReindexOperations, queuedOpHasStarted, isQueuedOp } from './op_utils';
 
 const POLL_INTERVAL = 30000;
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
index ad33ad248a564..4c3f7bd0a9f77 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { registerUpgradeAssistantUsageCollector } from './usage_collector';
-import { IClusterClient } from 'src/core/server';
+import { IClusterClient } from '@kbn/core/server';
 
 /**
  * Since these route callbacks are so thin, these serve simply as integration tests
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
index 97361c5f05936..2f0d884e092e6 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, ElasticsearchServiceStart } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { ElasticsearchClient, ElasticsearchServiceStart } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { UpgradeAssistantTelemetry } from '../../../common/types';
 import {
   isDeprecationLogIndexingEnabled,
diff --git a/x-pack/plugins/upgrade_assistant/server/plugin.ts b/x-pack/plugins/upgrade_assistant/server/plugin.ts
index 717f03758f825..40cb2f5b3e35d 100644
--- a/x-pack/plugins/upgrade_assistant/server/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import {
   Plugin,
   CoreSetup,
@@ -14,13 +14,13 @@ import {
   Logger,
   SavedObjectsClient,
   SavedObjectsServiceStart,
-} from '../../../../src/core/server';
-import { SecurityPluginStart } from '../../security/server';
-import { InfraPluginSetup } from '../../infra/server';
+} from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { InfraPluginSetup } from '@kbn/infra-plugin/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { DEPRECATION_LOGS_SOURCE_ID, DEPRECATION_LOGS_INDEX } from '../common/constants';
 
 import { CredentialStore, credentialStoreFactory } from './lib/reindexing/credential_store';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
index e4e9ae95ef30d..172b1d53474d4 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
-import { RequestHandler, RequestHandlerContext } from 'src/core/server';
+import { AwaitedProperties } from '@kbn/utility-types';
+import { RequestHandler, RequestHandlerContext } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   deprecationsServiceMock,
-} from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 export const routeHandlerContextMock = {
   core: {
@@ -20,7 +21,7 @@ export const routeHandlerContextMock = {
     savedObjects: { client: savedObjectsClientMock.create() },
     deprecations: { client: deprecationsServiceMock.createClient() },
   },
-} as unknown as RequestHandlerContext;
+} as unknown as AwaitedProperties<RequestHandlerContext>;
 
 /**
  * Creates a very crude mock of the new platform router implementation. This enables use to test
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/app.ts b/x-pack/plugins/upgrade_assistant/server/routes/app.ts
index b976811a87e5b..2193d69cca255 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/app.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/app.ts
@@ -30,50 +30,43 @@ export function registerAppRoutes({
       path: `${API_BASE_PATH}/privileges`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      const {
+        elasticsearch: { client },
+      } = await core;
+      const privilegesResult: Privileges = {
+        hasAllPrivileges: true,
+        missingPrivileges: {
+          index: [],
         },
-        request,
-        response
-      ) => {
-        const privilegesResult: Privileges = {
-          hasAllPrivileges: true,
-          missingPrivileges: {
-            index: [],
-          },
-        };
+      };
 
-        if (!isSecurityEnabled()) {
-          return response.ok({ body: privilegesResult });
-        }
-
-        try {
-          const { has_all_requested: hasAllPrivileges, index } =
-            await client.asCurrentUser.security.hasPrivileges({
-              body: {
-                index: [
-                  {
-                    names: [DEPRECATION_LOGS_INDEX],
-                    privileges: ['read'],
-                  },
-                ],
-              },
-            });
+      if (!isSecurityEnabled()) {
+        return response.ok({ body: privilegesResult });
+      }
 
-          if (!hasAllPrivileges) {
-            privilegesResult.missingPrivileges.index = extractMissingPrivileges(index);
-          }
+      try {
+        const { has_all_requested: hasAllPrivileges, index } =
+          await client.asCurrentUser.security.hasPrivileges({
+            body: {
+              index: [
+                {
+                  names: [DEPRECATION_LOGS_INDEX],
+                  privileges: ['read'],
+                },
+              ],
+            },
+          });
 
-          privilegesResult.hasAllPrivileges = hasAllPrivileges;
-          return response.ok({ body: privilegesResult });
-        } catch (error) {
-          return handleEsError({ error, response });
+        if (!hasAllPrivileges) {
+          privilegesResult.missingPrivileges.index = extractMissingPrivileges(index);
         }
+
+        privilegesResult.hasAllPrivileges = hasAllPrivileges;
+        return response.ok({ body: privilegesResult });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/cloud_backup_status.ts b/x-pack/plugins/upgrade_assistant/server/routes/cloud_backup_status.ts
index 6dffead8ec91f..17b80f6a685b3 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/cloud_backup_status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/cloud_backup_status.ts
@@ -17,7 +17,7 @@ export function registerCloudBackupStatusRoutes({
   router.get(
     { path: `${API_BASE_PATH}/cloud_backup_status`, validate: false },
     versionCheckHandlerWrapper(async (context, request, response) => {
-      const { client: clusterClient } = context.core.elasticsearch;
+      const { client: clusterClient } = (await context.core).elasticsearch;
 
       try {
         const { snapshots } = await clusterClient.asCurrentUser.snapshot.get({
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/cluster_settings.ts b/x-pack/plugins/upgrade_assistant/server/routes/cluster_settings.ts
index f64c3a383781f..d85123ab3e7d6 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/cluster_settings.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/cluster_settings.ts
@@ -23,59 +23,52 @@ export function registerClusterSettingsRoute({
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const { settings } = request.body;
-
-          // We need to fetch the current cluster settings in order to determine
-          // if the settings to delete were set as transient or persistent settings
-          const currentClusterSettings = await client.asCurrentUser.cluster.getSettings({
-            flat_settings: true,
-          });
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const { settings } = request.body;
 
-          const settingsToDelete = settings.reduce(
-            (settingsBody, currentSetting) => {
-              if (
-                Object.keys(currentClusterSettings.persistent).find((key) => key === currentSetting)
-              ) {
-                settingsBody.persistent[currentSetting] = null;
-              }
+        // We need to fetch the current cluster settings in order to determine
+        // if the settings to delete were set as transient or persistent settings
+        const currentClusterSettings = await client.asCurrentUser.cluster.getSettings({
+          flat_settings: true,
+        });
 
-              if (
-                Object.keys(currentClusterSettings.transient).find((key) => key === currentSetting)
-              ) {
-                settingsBody.transient[currentSetting] = null;
-              }
+        const settingsToDelete = settings.reduce(
+          (settingsBody, currentSetting) => {
+            if (
+              Object.keys(currentClusterSettings.persistent).find((key) => key === currentSetting)
+            ) {
+              settingsBody.persistent[currentSetting] = null;
+            }
 
-              return settingsBody;
-            },
-            { persistent: {}, transient: {} } as {
-              persistent: { [key: string]: null };
-              transient: { [key: string]: null };
+            if (
+              Object.keys(currentClusterSettings.transient).find((key) => key === currentSetting)
+            ) {
+              settingsBody.transient[currentSetting] = null;
             }
-          );
 
-          const settingsResponse = await client.asCurrentUser.cluster.putSettings({
-            body: settingsToDelete,
-            flat_settings: true,
-          });
+            return settingsBody;
+          },
+          { persistent: {}, transient: {} } as {
+            persistent: { [key: string]: null };
+            transient: { [key: string]: null };
+          }
+        );
+
+        const settingsResponse = await client.asCurrentUser.cluster.putSettings({
+          body: settingsToDelete,
+          flat_settings: true,
+        });
 
-          return response.ok({
-            body: settingsResponse,
-          });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({
+          body: settingsResponse,
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
index 07bc3d573e606..8df95072f5ac5 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts
index 70fd5d035ad52..6770869233ab8 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts
@@ -30,24 +30,17 @@ export function registerDeprecationLoggingRoutes({
       path: `${API_BASE_PATH}/deprecation_logging`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const result = await getDeprecationLoggingStatus(client);
-          return response.ok({ body: result });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const result = await getDeprecationLoggingStatus(client);
+        return response.ok({ body: result });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 
   router.put(
@@ -59,26 +52,19 @@ export function registerDeprecationLoggingRoutes({
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const { isEnabled } = request.body as { isEnabled: boolean };
-          return response.ok({
-            body: await setDeprecationLogging(client, isEnabled),
-          });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const { isEnabled } = request.body as { isEnabled: boolean };
+        return response.ok({
+          body: await setDeprecationLogging(client, isEnabled),
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 
   router.get(
@@ -90,56 +76,49 @@ export function registerDeprecationLoggingRoutes({
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const indexExists = await client.asCurrentUser.indices.exists({
-            index: DEPRECATION_LOGS_INDEX,
-          });
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const indexExists = await client.asCurrentUser.indices.exists({
+          index: DEPRECATION_LOGS_INDEX,
+        });
 
-          if (!indexExists) {
-            return response.ok({ body: { count: 0 } });
-          }
+        if (!indexExists) {
+          return response.ok({ body: { count: 0 } });
+        }
 
-          const now = moment().toISOString();
+        const now = moment().toISOString();
 
-          const body = await client.asCurrentUser.count({
-            index: DEPRECATION_LOGS_INDEX,
-            body: {
-              query: {
-                bool: {
-                  must: {
-                    range: {
-                      '@timestamp': {
-                        gte: request.query.from,
-                        lte: now,
-                      },
+        const body = await client.asCurrentUser.count({
+          index: DEPRECATION_LOGS_INDEX,
+          body: {
+            query: {
+              bool: {
+                must: {
+                  range: {
+                    '@timestamp': {
+                      gte: request.query.from,
+                      lte: now,
                     },
                   },
-                  must_not: {
-                    terms: {
-                      [DEPRECATION_LOGS_ORIGIN_FIELD]: [...APPS_WITH_DEPRECATION_LOGS],
-                    },
+                },
+                must_not: {
+                  terms: {
+                    [DEPRECATION_LOGS_ORIGIN_FIELD]: [...APPS_WITH_DEPRECATION_LOGS],
                   },
                 },
               },
             },
-          });
+          },
+        });
 
-          return response.ok({ body: { count: body.count } });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({ body: { count: body.count } });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 
   router.delete(
@@ -147,27 +126,20 @@ export function registerDeprecationLoggingRoutes({
       path: `${API_BASE_PATH}/deprecation_logging/cache`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          await client.asCurrentUser.transport.request({
-            method: 'DELETE',
-            path: '/_logging/deprecation_cache',
-          });
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        await client.asCurrentUser.transport.request({
+          method: 'DELETE',
+          path: '/_logging/deprecation_cache',
+        });
 
-          return response.ok({ body: 'ok' });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({ body: 'ok' });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts
index 4047ce827acbc..2e6dcfcf07849 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 import { handleEsError } from '../shared_imports';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.ts b/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.ts
index 98089e34bdca1..ff04fd694335d 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.ts
@@ -23,41 +23,29 @@ export function registerESDeprecationRoutes({
       path: `${API_BASE_PATH}/es_deprecations`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects: { client: savedObjectsClient },
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const status = await getESUpgradeStatus(client);
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          savedObjects: { client: savedObjectsClient },
+          elasticsearch: { client },
+        } = await core;
+        const status = await getESUpgradeStatus(client);
 
-          const asCurrentUser = client.asCurrentUser;
-          const reindexActions = reindexActionsFactory(savedObjectsClient, asCurrentUser);
-          const reindexService = reindexServiceFactory(
-            asCurrentUser,
-            reindexActions,
-            log,
-            licensing
-          );
-          const indexNames = status.deprecations
-            .filter(({ index }) => typeof index !== 'undefined')
-            .map(({ index }) => index as string);
+        const asCurrentUser = client.asCurrentUser;
+        const reindexActions = reindexActionsFactory(savedObjectsClient, asCurrentUser);
+        const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing);
+        const indexNames = status.deprecations
+          .filter(({ index }) => typeof index !== 'undefined')
+          .map(({ index }) => index as string);
 
-          await reindexService.cleanupReindexOperations(indexNames);
+        await reindexService.cleanupReindexOperations(indexNames);
 
-          return response.ok({
-            body: status,
-          });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({
+          body: status,
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
index 7293c397e5d9f..9e5c61fff5d2e 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { errors as esErrors } from '@elastic/elasticsearch';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
index 38d1b09650b09..1698934e0d8a4 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
@@ -9,7 +9,7 @@ import { errors } from '@elastic/elasticsearch';
 import { i18n } from '@kbn/i18n';
 import type { TransportResult } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+import { IScopedClusterClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { API_BASE_PATH } from '../../common/constants';
 import { MlOperation, ML_UPGRADE_OP_TYPE } from '../../common/types';
@@ -151,47 +151,40 @@ export function registerMlSnapshotRoutes({
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects: { client: savedObjectsClient },
-            elasticsearch: { client: esClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const { snapshotId, jobId } = request.body;
-
-          const body = await esClient.asCurrentUser.ml.upgradeJobSnapshot({
-            job_id: jobId,
-            snapshot_id: snapshotId,
-          });
-
-          const snapshotInfo: MlOperation = {
-            nodeId: body.node,
-            snapshotId,
-            jobId,
-          };
-
-          // Store snapshot in saved object if upgrade not complete
-          if (body.completed !== true) {
-            await createMlOperation(savedObjectsClient, snapshotInfo);
-          }
-
-          return response.ok({
-            body: {
-              ...snapshotInfo,
-              status: body.completed === true ? 'complete' : 'in_progress',
-            },
-          });
-        } catch (error) {
-          return handleEsError({ error, response });
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          savedObjects: { client: savedObjectsClient },
+          elasticsearch: { client: esClient },
+        } = await core;
+        const { snapshotId, jobId } = request.body;
+
+        const body = await esClient.asCurrentUser.ml.upgradeJobSnapshot({
+          job_id: jobId,
+          snapshot_id: snapshotId,
+        });
+
+        const snapshotInfo: MlOperation = {
+          nodeId: body.node,
+          snapshotId,
+          jobId,
+        };
+
+        // Store snapshot in saved object if upgrade not complete
+        if (body.completed !== true) {
+          await createMlOperation(savedObjectsClient, snapshotInfo);
         }
+
+        return response.ok({
+          body: {
+            ...snapshotInfo,
+            status: body.completed === true ? 'complete' : 'in_progress',
+          },
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 
   // Get the status of the upgrade snapshot task
@@ -205,102 +198,67 @@ export function registerMlSnapshotRoutes({
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects: { client: savedObjectsClient },
-            elasticsearch: { client: esClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const { snapshotId, jobId } = request.params;
-
-          // Verify snapshot exists
-          await esClient.asCurrentUser.ml.getModelSnapshots({
-            job_id: jobId,
-            snapshot_id: snapshotId,
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          savedObjects: { client: savedObjectsClient },
+          elasticsearch: { client: esClient },
+        } = await core;
+        const { snapshotId, jobId } = request.params;
+
+        // Verify snapshot exists
+        await esClient.asCurrentUser.ml.getModelSnapshots({
+          job_id: jobId,
+          snapshot_id: snapshotId,
+        });
+
+        const foundSnapshots = await findMlOperation(savedObjectsClient, snapshotId);
+
+        // If snapshot is *not* found in SO, assume there has not been an upgrade operation started
+        if (typeof foundSnapshots === 'undefined' || foundSnapshots.total === 0) {
+          return response.ok({
+            body: {
+              snapshotId,
+              jobId,
+              nodeId: undefined,
+              status: 'idle',
+            },
           });
+        }
 
-          const foundSnapshots = await findMlOperation(savedObjectsClient, snapshotId);
-
-          // If snapshot is *not* found in SO, assume there has not been an upgrade operation started
-          if (typeof foundSnapshots === 'undefined' || foundSnapshots.total === 0) {
+        const upgradeStatus = await getModelSnapshotUpgradeStatus(esClient, jobId, snapshotId);
+        // Create snapshotInfo payload to send back in the response
+        const snapshotOp = foundSnapshots.saved_objects[0];
+        const snapshotInfo: MlOperation = {
+          ...snapshotOp.attributes,
+        };
+
+        if (upgradeStatus) {
+          if (
+            upgradeStatus.state === 'loading_old_state' ||
+            upgradeStatus.state === 'saving_new_state'
+          ) {
             return response.ok({
               body: {
-                snapshotId,
-                jobId,
-                nodeId: undefined,
-                status: 'idle',
+                ...snapshotInfo,
+                status: 'in_progress',
+              },
+            });
+          } else if (upgradeStatus.state === 'failed') {
+            return response.customError({
+              statusCode: 500,
+              body: {
+                message: i18n.translate(
+                  'xpack.upgradeAssistant.ml_snapshots.modelSnapshotUpgradeFailed',
+                  {
+                    defaultMessage:
+                      'The upgrade process for this model snapshot failed. Check the Elasticsearch logs for more details.',
+                  }
+                ),
               },
             });
-          }
-
-          const upgradeStatus = await getModelSnapshotUpgradeStatus(esClient, jobId, snapshotId);
-          // Create snapshotInfo payload to send back in the response
-          const snapshotOp = foundSnapshots.saved_objects[0];
-          const snapshotInfo: MlOperation = {
-            ...snapshotOp.attributes,
-          };
-
-          if (upgradeStatus) {
-            if (
-              upgradeStatus.state === 'loading_old_state' ||
-              upgradeStatus.state === 'saving_new_state'
-            ) {
-              return response.ok({
-                body: {
-                  ...snapshotInfo,
-                  status: 'in_progress',
-                },
-              });
-            } else if (upgradeStatus.state === 'failed') {
-              return response.customError({
-                statusCode: 500,
-                body: {
-                  message: i18n.translate(
-                    'xpack.upgradeAssistant.ml_snapshots.modelSnapshotUpgradeFailed',
-                    {
-                      defaultMessage:
-                        'The upgrade process for this model snapshot failed. Check the Elasticsearch logs for more details.',
-                    }
-                  ),
-                },
-              });
-            } else {
-              // The task ID was not found; verify the deprecation was resolved
-              const { isSuccessful: isSnapshotDeprecationResolved, error: upgradeSnapshotError } =
-                await verifySnapshotUpgrade(esClient, {
-                  snapshotId,
-                  jobId,
-                });
-
-              // Delete the SO; if it's complete, no need to store it anymore. If there's an error, this will give the user a chance to retry
-              await deleteMlOperation(savedObjectsClient, snapshotOp.id);
-
-              if (isSnapshotDeprecationResolved) {
-                return response.ok({
-                  body: {
-                    ...snapshotInfo,
-                    status: 'complete',
-                  },
-                });
-              }
-
-              return response.customError({
-                statusCode: upgradeSnapshotError ? upgradeSnapshotError.statusCode! : 500,
-                body: {
-                  message:
-                    upgradeSnapshotError?.body?.error?.reason ||
-                    'The upgrade process for this model snapshot stopped yet the snapshot is not upgraded. Check the Elasticsearch logs for more details.',
-                },
-              });
-            }
           } else {
-            // No tasks found; verify the deprecation was resolved
+            // The task ID was not found; verify the deprecation was resolved
             const { isSuccessful: isSnapshotDeprecationResolved, error: upgradeSnapshotError } =
               await verifySnapshotUpgrade(esClient, {
                 snapshotId,
@@ -319,23 +277,51 @@ export function registerMlSnapshotRoutes({
               });
             }
 
-            log.error(
-              `Failed to determine status of the ML model upgrade, upgradeStatus is not defined and snapshot upgrade is not completed. snapshotId=${snapshotId} and jobId=${jobId}`
-            );
             return response.customError({
               statusCode: upgradeSnapshotError ? upgradeSnapshotError.statusCode! : 500,
               body: {
                 message:
                   upgradeSnapshotError?.body?.error?.reason ||
-                  'The upgrade process for this model snapshot completed yet the snapshot is not upgraded. Check the Elasticsearch logs for more details.',
+                  'The upgrade process for this model snapshot stopped yet the snapshot is not upgraded. Check the Elasticsearch logs for more details.',
+              },
+            });
+          }
+        } else {
+          // No tasks found; verify the deprecation was resolved
+          const { isSuccessful: isSnapshotDeprecationResolved, error: upgradeSnapshotError } =
+            await verifySnapshotUpgrade(esClient, {
+              snapshotId,
+              jobId,
+            });
+
+          // Delete the SO; if it's complete, no need to store it anymore. If there's an error, this will give the user a chance to retry
+          await deleteMlOperation(savedObjectsClient, snapshotOp.id);
+
+          if (isSnapshotDeprecationResolved) {
+            return response.ok({
+              body: {
+                ...snapshotInfo,
+                status: 'complete',
               },
             });
           }
-        } catch (e) {
-          return handleEsError({ error: e, response });
+
+          log.error(
+            `Failed to determine status of the ML model upgrade, upgradeStatus is not defined and snapshot upgrade is not completed. snapshotId=${snapshotId} and jobId=${jobId}`
+          );
+          return response.customError({
+            statusCode: upgradeSnapshotError ? upgradeSnapshotError.statusCode! : 500,
+            body: {
+              message:
+                upgradeSnapshotError?.body?.error?.reason ||
+                'The upgrade process for this model snapshot completed yet the snapshot is not upgraded. Check the Elasticsearch logs for more details.',
+            },
+          });
         }
+      } catch (e) {
+        return handleEsError({ error: e, response });
       }
-    )
+    })
   );
 
   // Get the ml upgrade mode
@@ -344,29 +330,22 @@ export function registerMlSnapshotRoutes({
       path: `${API_BASE_PATH}/ml_upgrade_mode`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client: esClient },
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client: esClient },
+        } = await core;
+        const mlInfo = await esClient.asCurrentUser.ml.info();
+
+        return response.ok({
+          body: {
+            mlUpgradeModeEnabled: mlInfo.upgrade_mode,
           },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const mlInfo = await esClient.asCurrentUser.ml.info();
-
-          return response.ok({
-            body: {
-              mlUpgradeModeEnabled: mlInfo.upgrade_mode,
-            },
-          });
-        } catch (e) {
-          return handleEsError({ error: e, response });
-        }
+        });
+      } catch (e) {
+        return handleEsError({ error: e, response });
       }
-    )
+    })
   );
 
   // Delete ML model snapshot
@@ -380,31 +359,24 @@ export function registerMlSnapshotRoutes({
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const { snapshotId, jobId } = request.params;
-
-          const deleteSnapshotResponse = await client.asCurrentUser.ml.deleteModelSnapshot({
-            job_id: jobId,
-            snapshot_id: snapshotId,
-          });
-
-          return response.ok({
-            body: deleteSnapshotResponse,
-          });
-        } catch (e) {
-          return handleEsError({ error: e, response });
-        }
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const { snapshotId, jobId } = request.params;
+
+        const deleteSnapshotResponse = await client.asCurrentUser.ml.deleteModelSnapshot({
+          job_id: jobId,
+          snapshot_id: snapshotId,
+        });
+
+        return response.ok({
+          body: deleteSnapshotResponse,
+        });
+      } catch (e) {
+        return handleEsError({ error: e, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts
index a72d1ae0d8b41..e300033f800ba 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.ts b/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.ts
index 9bd6b39cd6f5e..3707bee0f1395 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.ts
@@ -49,91 +49,84 @@ export function registerNodeDiskSpaceRoute({ router, lib: { handleEsError } }: R
       path: `${API_BASE_PATH}/node_disk_space`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const clusterSettings = await client.asCurrentUser.cluster.getSettings({
-            flat_settings: true,
-            include_defaults: true,
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const clusterSettings = await client.asCurrentUser.cluster.getSettings({
+          flat_settings: true,
+          include_defaults: true,
+        });
+
+        const lowDiskWatermarkSetting = getLowDiskWatermarkSetting(clusterSettings);
+
+        if (lowDiskWatermarkSetting) {
+          const nodeStats = await client.asCurrentUser.nodes.stats({
+            metric: 'fs',
           });
 
-          const lowDiskWatermarkSetting = getLowDiskWatermarkSetting(clusterSettings);
+          const nodeIds = Object.keys(nodeStats.nodes);
 
-          if (lowDiskWatermarkSetting) {
-            const nodeStats = await client.asCurrentUser.nodes.stats({
-              metric: 'fs',
-            });
+          const nodesWithLowDiskSpace: NodeWithLowDiskSpace[] = [];
 
-            const nodeIds = Object.keys(nodeStats.nodes);
+          nodeIds.forEach((nodeId) => {
+            const node = nodeStats.nodes[nodeId];
+            const byteStats = node?.fs?.total;
+            // @ts-expect-error @elastic/elasticsearch not supported
+            const { total_in_bytes: totalInBytes, available_in_bytes: availableInBytes } =
+              byteStats;
 
-            const nodesWithLowDiskSpace: NodeWithLowDiskSpace[] = [];
+            // Regex to determine if the low disk watermark setting is configured as a percentage value
+            // Elasticsearch accepts a percentage or bytes value
+            const isLowDiskWatermarkPercentage = /^(\d+|(\.\d+))(\.\d+)?%$/.test(
+              lowDiskWatermarkSetting!
+            );
 
-            nodeIds.forEach((nodeId) => {
-              const node = nodeStats.nodes[nodeId];
-              const byteStats = node?.fs?.total;
-              // @ts-expect-error @elastic/elasticsearch not supported
-              const { total_in_bytes: totalInBytes, available_in_bytes: availableInBytes } =
-                byteStats;
-
-              // Regex to determine if the low disk watermark setting is configured as a percentage value
-              // Elasticsearch accepts a percentage or bytes value
-              const isLowDiskWatermarkPercentage = /^(\d+|(\.\d+))(\.\d+)?%$/.test(
-                lowDiskWatermarkSetting!
+            if (isLowDiskWatermarkPercentage) {
+              const percentageAvailable = (availableInBytes / totalInBytes) * 100;
+              const rawLowDiskWatermarkPercentageValue = Number(
+                lowDiskWatermarkSetting!.replace('%', '')
               );
 
-              if (isLowDiskWatermarkPercentage) {
-                const percentageAvailable = (availableInBytes / totalInBytes) * 100;
-                const rawLowDiskWatermarkPercentageValue = Number(
-                  lowDiskWatermarkSetting!.replace('%', '')
-                );
-
-                // If the percentage available is < the low disk watermark setting, mark node as having low disk space
-                if (percentageAvailable < rawLowDiskWatermarkPercentageValue) {
-                  nodesWithLowDiskSpace.push({
-                    nodeId,
-                    nodeName: node.name || nodeId,
-                    available: `${Math.round(percentageAvailable)}%`,
-                    lowDiskWatermarkSetting: lowDiskWatermarkSetting!,
-                  });
-                }
-              } else {
-                // If not a percentage value, assume user configured low disk watermark setting in bytes
-                const rawLowDiskWatermarkBytesValue = ByteSizeValue.parse(
-                  lowDiskWatermarkSetting!
-                ).getValueInBytes();
-
-                const percentageAvailable = (availableInBytes / totalInBytes) * 100;
-
-                // If bytes available < the low disk watermarket setting, mark node as having low disk space
-                if (availableInBytes < rawLowDiskWatermarkBytesValue) {
-                  nodesWithLowDiskSpace.push({
-                    nodeId,
-                    nodeName: node.name || nodeId,
-                    available: `${Math.round(percentageAvailable)}%`,
-                    lowDiskWatermarkSetting: lowDiskWatermarkSetting!,
-                  });
-                }
+              // If the percentage available is < the low disk watermark setting, mark node as having low disk space
+              if (percentageAvailable < rawLowDiskWatermarkPercentageValue) {
+                nodesWithLowDiskSpace.push({
+                  nodeId,
+                  nodeName: node.name || nodeId,
+                  available: `${Math.round(percentageAvailable)}%`,
+                  lowDiskWatermarkSetting: lowDiskWatermarkSetting!,
+                });
               }
-            });
-
-            return response.ok({ body: nodesWithLowDiskSpace });
-          }
+            } else {
+              // If not a percentage value, assume user configured low disk watermark setting in bytes
+              const rawLowDiskWatermarkBytesValue = ByteSizeValue.parse(
+                lowDiskWatermarkSetting!
+              ).getValueInBytes();
+
+              const percentageAvailable = (availableInBytes / totalInBytes) * 100;
+
+              // If bytes available < the low disk watermarket setting, mark node as having low disk space
+              if (availableInBytes < rawLowDiskWatermarkBytesValue) {
+                nodesWithLowDiskSpace.push({
+                  nodeId,
+                  nodeName: node.name || nodeId,
+                  available: `${Math.round(percentageAvailable)}%`,
+                  lowDiskWatermarkSetting: lowDiskWatermarkSetting!,
+                });
+              }
+            }
+          });
 
-          // If the low disk watermark setting is undefined, send empty array
-          // This could occur if the setting is configured in elasticsearch.yml
-          return response.ok({ body: [] });
-        } catch (error) {
-          return handleEsError({ error, response });
+          return response.ok({ body: nodesWithLowDiskSpace });
         }
+
+        // If the low disk watermark setting is undefined, send empty array
+        // This could occur if the setting is configured in elasticsearch.yml
+        return response.ok({ body: [] });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts
index 961b63b30f4ea..21c88aea907ea 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { licensingMock } from '../../../../licensing/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from '../__mocks__/routes.mock';
 import { createRequestMock } from '../__mocks__/request.mock';
 import { handleEsError } from '../../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
index 62be9a1807aad..c6ea9b4a8fb96 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
@@ -38,37 +38,30 @@ export function registerBatchReindexIndicesRoutes(
       path: `${BASE_PATH}/batch/queue`,
       validate: {},
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client: esClient },
-            savedObjects,
-          },
-        },
-        request,
-        response
-      ) => {
-        const { client } = savedObjects;
-        const callAsCurrentUser = esClient.asCurrentUser;
-        const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
-        try {
-          const inProgressOps = await reindexActions.findAllByStatus(ReindexStatus.inProgress);
-          const { queue } = sortAndOrderReindexOperations(inProgressOps);
-          const result: GetBatchQueueResponse = {
-            queue: queue.map((savedObject) => savedObject.attributes),
-          };
-          return response.ok({
-            body: result,
-          });
-        } catch (error) {
-          if (error instanceof errors.ResponseError) {
-            return handleEsError({ error, response });
-          }
-          return mapAnyErrorToKibanaHttpResponse(error);
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      const {
+        elasticsearch: { client: esClient },
+        savedObjects,
+      } = await core;
+      const { client } = savedObjects;
+      const callAsCurrentUser = esClient.asCurrentUser;
+      const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
+      try {
+        const inProgressOps = await reindexActions.findAllByStatus(ReindexStatus.inProgress);
+        const { queue } = sortAndOrderReindexOperations(inProgressOps);
+        const result: GetBatchQueueResponse = {
+          queue: queue.map((savedObject) => savedObject.attributes),
+        };
+        return response.ok({
+          body: result,
+        });
+      } catch (error) {
+        if (error instanceof errors.ResponseError) {
+          return handleEsError({ error, response });
         }
+        return mapAnyErrorToKibanaHttpResponse(error);
       }
-    )
+    })
   );
 
   // Add indices for reindexing to the worker's batch
@@ -81,53 +74,46 @@ export function registerBatchReindexIndicesRoutes(
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects: { client: savedObjectsClient },
-            elasticsearch: { client: esClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        const { indexNames } = request.body;
-        const results: PostBatchResponse = {
-          enqueued: [],
-          errors: [],
-        };
-        for (const indexName of indexNames) {
-          try {
-            const result = await reindexHandler({
-              savedObjects: savedObjectsClient,
-              dataClient: esClient,
-              indexName,
-              log,
-              licensing,
-              request,
-              credentialStore,
-              reindexOptions: {
-                enqueue: true,
-              },
-              security: getSecurityPlugin(),
-            });
-            results.enqueued.push(result);
-          } catch (e) {
-            results.errors.push({
-              indexName,
-              message: e.message,
-            });
-          }
-        }
-
-        if (results.errors.length < indexNames.length) {
-          // Kick the worker on this node to immediately pickup the batch.
-          getWorker().forceRefresh();
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      const {
+        savedObjects: { client: savedObjectsClient },
+        elasticsearch: { client: esClient },
+      } = await core;
+      const { indexNames } = request.body;
+      const results: PostBatchResponse = {
+        enqueued: [],
+        errors: [],
+      };
+      for (const indexName of indexNames) {
+        try {
+          const result = await reindexHandler({
+            savedObjects: savedObjectsClient,
+            dataClient: esClient,
+            indexName,
+            log,
+            licensing,
+            request,
+            credentialStore,
+            reindexOptions: {
+              enqueue: true,
+            },
+            security: getSecurityPlugin(),
+          });
+          results.enqueued.push(result);
+        } catch (e) {
+          results.errors.push({
+            indexName,
+            message: e.message,
+          });
         }
+      }
 
-        return response.ok({ body: results });
+      if (results.errors.length < indexNames.length) {
+        // Kick the worker on this node to immediately pickup the batch.
+        getWorker().forceRefresh();
       }
-    )
+
+      return response.ok({ body: results });
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts
index d20912e56fe66..81c65330d14b6 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts
@@ -5,14 +5,10 @@
  * 2.0.
  */
 
-import {
-  ElasticsearchServiceStart,
-  Logger,
-  SavedObjectsClient,
-} from '../../../../../../src/core/server';
+import { ElasticsearchServiceStart, Logger, SavedObjectsClient } from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../../licensing/server';
-import { SecurityPluginStart } from '../../../../security/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { ReindexWorker } from '../../lib/reindexing';
 import { CredentialStore } from '../../lib/reindexing/credential_store';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts
index f36e52ffb0eab..2f21e8cb80436 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 import {
   AccessForbidden,
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
index d81dc8cec4c53..970a11b3eb048 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
@@ -11,10 +11,10 @@ import {
   Logger,
   SavedObjectsClientContract,
   KibanaRequest,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../../licensing/server';
-import { SecurityPluginStart } from '../../../../security/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 import { ReindexOperation, ReindexStatus } from '../../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
index 38a78f15f2b50..bb3ccaeb8b125 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { licensingMock } from '../../../../licensing/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from '../__mocks__/routes.mock';
 import { createRequestMock } from '../__mocks__/request.mock';
 import { handleEsError } from '../../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
index d5776cb161b4d..11ebb6d5f4a98 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
@@ -40,44 +40,37 @@ export function registerReindexIndicesRoutes(
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects: { client: savedObjectsClient },
-            elasticsearch: { client: esClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        const { indexName } = request.params;
-        try {
-          const result = await reindexHandler({
-            savedObjects: savedObjectsClient,
-            dataClient: esClient,
-            indexName,
-            log,
-            licensing,
-            request,
-            credentialStore,
-            security: getSecurityPlugin(),
-          });
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      const {
+        savedObjects: { client: savedObjectsClient },
+        elasticsearch: { client: esClient },
+      } = await core;
+      const { indexName } = request.params;
+      try {
+        const result = await reindexHandler({
+          savedObjects: savedObjectsClient,
+          dataClient: esClient,
+          indexName,
+          log,
+          licensing,
+          request,
+          credentialStore,
+          security: getSecurityPlugin(),
+        });
 
-          // Kick the worker on this node to immediately pickup the new reindex operation.
-          getWorker().forceRefresh();
+        // Kick the worker on this node to immediately pickup the new reindex operation.
+        getWorker().forceRefresh();
 
-          return response.ok({
-            body: result,
-          });
-        } catch (error) {
-          if (error instanceof errors.ResponseError) {
-            return handleEsError({ error, response });
-          }
-          return mapAnyErrorToKibanaHttpResponse(error);
+        return response.ok({
+          body: result,
+        });
+      } catch (error) {
+        if (error instanceof errors.ResponseError) {
+          return handleEsError({ error, response });
         }
+        return mapAnyErrorToKibanaHttpResponse(error);
       }
-    )
+    })
   );
 
   // Get status
@@ -90,55 +83,48 @@ export function registerReindexIndicesRoutes(
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects,
-            elasticsearch: { client: esClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        const { client } = savedObjects;
-        const { indexName } = request.params;
-        const asCurrentUser = esClient.asCurrentUser;
-        const reindexActions = reindexActionsFactory(client, asCurrentUser);
-        const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing);
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      const {
+        savedObjects,
+        elasticsearch: { client: esClient },
+      } = await core;
+      const { client } = savedObjects;
+      const { indexName } = request.params;
+      const asCurrentUser = esClient.asCurrentUser;
+      const reindexActions = reindexActionsFactory(client, asCurrentUser);
+      const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing);
 
-        try {
-          const hasRequiredPrivileges = await reindexService.hasRequiredPrivileges(indexName);
-          const reindexOp = await reindexService.findReindexOperation(indexName);
-          // If the user doesn't have privileges than querying for warnings is going to fail.
-          const warnings = hasRequiredPrivileges
-            ? await reindexService.detectReindexWarnings(indexName)
-            : [];
+      try {
+        const hasRequiredPrivileges = await reindexService.hasRequiredPrivileges(indexName);
+        const reindexOp = await reindexService.findReindexOperation(indexName);
+        // If the user doesn't have privileges than querying for warnings is going to fail.
+        const warnings = hasRequiredPrivileges
+          ? await reindexService.detectReindexWarnings(indexName)
+          : [];
 
-          const indexAliases = await reindexService.getIndexAliases(indexName);
+        const indexAliases = await reindexService.getIndexAliases(indexName);
 
-          const body: ReindexStatusResponse = {
-            reindexOp: reindexOp ? reindexOp.attributes : undefined,
-            warnings,
-            hasRequiredPrivileges,
-            meta: {
-              indexName,
-              reindexName: generateNewIndexName(indexName),
-              aliases: Object.keys(indexAliases),
-            },
-          };
+        const body: ReindexStatusResponse = {
+          reindexOp: reindexOp ? reindexOp.attributes : undefined,
+          warnings,
+          hasRequiredPrivileges,
+          meta: {
+            indexName,
+            reindexName: generateNewIndexName(indexName),
+            aliases: Object.keys(indexAliases),
+          },
+        };
 
-          return response.ok({
-            body,
-          });
-        } catch (error) {
-          if (error instanceof errors.ResponseError) {
-            return handleEsError({ error, response });
-          }
-          return mapAnyErrorToKibanaHttpResponse(error);
+        return response.ok({
+          body,
+        });
+      } catch (error) {
+        if (error instanceof errors.ResponseError) {
+          return handleEsError({ error, response });
         }
+        return mapAnyErrorToKibanaHttpResponse(error);
       }
-    )
+    })
   );
 
   // Cancel reindex
@@ -151,40 +137,33 @@ export function registerReindexIndicesRoutes(
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            savedObjects,
-            elasticsearch: { client: esClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        const { indexName } = request.params;
-        const { client } = savedObjects;
-        const callAsCurrentUser = esClient.asCurrentUser;
-        const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
-        const reindexService = reindexServiceFactory(
-          callAsCurrentUser,
-          reindexActions,
-          log,
-          licensing
-        );
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      const {
+        savedObjects,
+        elasticsearch: { client: esClient },
+      } = await core;
+      const { indexName } = request.params;
+      const { client } = savedObjects;
+      const callAsCurrentUser = esClient.asCurrentUser;
+      const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
+      const reindexService = reindexServiceFactory(
+        callAsCurrentUser,
+        reindexActions,
+        log,
+        licensing
+      );
 
-        try {
-          await reindexService.cancelReindexing(indexName);
+      try {
+        await reindexService.cancelReindexing(indexName);
 
-          return response.ok({ body: { acknowledged: true } });
-        } catch (error) {
-          if (error instanceof errors.ResponseError) {
-            return handleEsError({ error, response });
-          }
-
-          return mapAnyErrorToKibanaHttpResponse(error);
+        return response.ok({ body: { acknowledged: true } });
+      } catch (error) {
+        if (error instanceof errors.ResponseError) {
+          return handleEsError({ error, response });
         }
+
+        return mapAnyErrorToKibanaHttpResponse(error);
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/remote_clusters.ts b/x-pack/plugins/upgrade_assistant/server/routes/remote_clusters.ts
index 0d7268e1be5be..6598051e3c7f6 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/remote_clusters.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/remote_clusters.ts
@@ -15,26 +15,19 @@ export function registerRemoteClustersRoute({ router, lib: { handleEsError } }:
       path: `${API_BASE_PATH}/remote_clusters`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const clustersByName = await client.asCurrentUser.cluster.remoteInfo();
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const clustersByName = await client.asCurrentUser.cluster.remoteInfo();
 
-          const remoteClusters = Object.keys(clustersByName);
+        const remoteClusters = Object.keys(clustersByName);
 
-          return response.ok({ body: remoteClusters });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({ body: remoteClusters });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts
index 2d19674d63a75..6b94edb013263 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 import { handleEsError } from '../shared_imports';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/status.ts b/x-pack/plugins/upgrade_assistant/server/routes/status.ts
index 9e8d3f9b2734b..691debfe776cd 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/status.ts
@@ -22,98 +22,89 @@ export function registerUpgradeStatusRoute({ router, lib: { handleEsError } }: R
       path: `${API_BASE_PATH}/status`,
       validate: false,
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client: esClient },
-            deprecations: { client: deprecationsClient },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          // Fetch ES upgrade status
-          const { totalCriticalDeprecations: esTotalCriticalDeps } = await getESUpgradeStatus(
-            esClient
-          );
-          // Fetch system indices migration status
-          const { migration_status: systemIndicesMigrationStatus, features } =
-            await getESSystemIndicesMigrationStatus(esClient.asCurrentUser);
-          const notMigratedSystemIndices = features.filter(
-            (feature) => feature.migration_status !== 'NO_MIGRATION_NEEDED'
-          ).length;
-
-          // Fetch Kibana upgrade status
-          const { totalCriticalDeprecations: kibanaTotalCriticalDeps } =
-            await getKibanaUpgradeStatus(deprecationsClient);
-          const readyForUpgrade =
-            esTotalCriticalDeps === 0 &&
-            kibanaTotalCriticalDeps === 0 &&
-            systemIndicesMigrationStatus === 'NO_MIGRATION_NEEDED';
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client: esClient },
+          deprecations: { client: deprecationsClient },
+        } = await core;
+        // Fetch ES upgrade status
+        const { totalCriticalDeprecations: esTotalCriticalDeps } = await getESUpgradeStatus(
+          esClient
+        );
+        // Fetch system indices migration status
+        const { migration_status: systemIndicesMigrationStatus, features } =
+          await getESSystemIndicesMigrationStatus(esClient.asCurrentUser);
+        const notMigratedSystemIndices = features.filter(
+          (feature) => feature.migration_status !== 'NO_MIGRATION_NEEDED'
+        ).length;
 
-          const getStatusMessage = () => {
-            if (readyForUpgrade) {
-              return i18n.translate(
-                'xpack.upgradeAssistant.status.allDeprecationsResolvedMessage',
-                {
-                  defaultMessage: 'All deprecation warnings have been resolved.',
-                }
-              );
-            }
+        // Fetch Kibana upgrade status
+        const { totalCriticalDeprecations: kibanaTotalCriticalDeps } = await getKibanaUpgradeStatus(
+          deprecationsClient
+        );
+        const readyForUpgrade =
+          esTotalCriticalDeps === 0 &&
+          kibanaTotalCriticalDeps === 0 &&
+          systemIndicesMigrationStatus === 'NO_MIGRATION_NEEDED';
 
-            const upgradeIssues: string[] = [];
+        const getStatusMessage = () => {
+          if (readyForUpgrade) {
+            return i18n.translate('xpack.upgradeAssistant.status.allDeprecationsResolvedMessage', {
+              defaultMessage: 'All deprecation warnings have been resolved.',
+            });
+          }
 
-            if (notMigratedSystemIndices) {
-              upgradeIssues.push(
-                i18n.translate('xpack.upgradeAssistant.status.systemIndicesMessage', {
-                  defaultMessage:
-                    '{notMigratedSystemIndices} unmigrated system {notMigratedSystemIndices, plural, one {index} other {indices}}',
-                  values: { notMigratedSystemIndices },
-                })
-              );
-            }
+          const upgradeIssues: string[] = [];
 
-            if (esTotalCriticalDeps) {
-              upgradeIssues.push(
-                i18n.translate('xpack.upgradeAssistant.status.esTotalCriticalDepsMessage', {
-                  defaultMessage:
-                    '{esTotalCriticalDeps} Elasticsearch deprecation {esTotalCriticalDeps, plural, one {issue} other {issues}}',
-                  values: { esTotalCriticalDeps },
-                })
-              );
-            }
+          if (notMigratedSystemIndices) {
+            upgradeIssues.push(
+              i18n.translate('xpack.upgradeAssistant.status.systemIndicesMessage', {
+                defaultMessage:
+                  '{notMigratedSystemIndices} unmigrated system {notMigratedSystemIndices, plural, one {index} other {indices}}',
+                values: { notMigratedSystemIndices },
+              })
+            );
+          }
 
-            if (kibanaTotalCriticalDeps) {
-              upgradeIssues.push(
-                i18n.translate('xpack.upgradeAssistant.status.kibanaTotalCriticalDepsMessage', {
-                  defaultMessage:
-                    '{kibanaTotalCriticalDeps} Kibana deprecation {kibanaTotalCriticalDeps, plural, one {issue} other {issues}}',
-                  values: { kibanaTotalCriticalDeps },
-                })
-              );
-            }
+          if (esTotalCriticalDeps) {
+            upgradeIssues.push(
+              i18n.translate('xpack.upgradeAssistant.status.esTotalCriticalDepsMessage', {
+                defaultMessage:
+                  '{esTotalCriticalDeps} Elasticsearch deprecation {esTotalCriticalDeps, plural, one {issue} other {issues}}',
+                values: { esTotalCriticalDeps },
+              })
+            );
+          }
 
-            return i18n.translate('xpack.upgradeAssistant.status.deprecationsUnresolvedMessage', {
-              defaultMessage:
-                'The following issues must be resolved before upgrading: {upgradeIssues}.',
-              values: {
-                upgradeIssues: upgradeIssues.join(', '),
-              },
-            });
-          };
+          if (kibanaTotalCriticalDeps) {
+            upgradeIssues.push(
+              i18n.translate('xpack.upgradeAssistant.status.kibanaTotalCriticalDepsMessage', {
+                defaultMessage:
+                  '{kibanaTotalCriticalDeps} Kibana deprecation {kibanaTotalCriticalDeps, plural, one {issue} other {issues}}',
+                values: { kibanaTotalCriticalDeps },
+              })
+            );
+          }
 
-          return response.ok({
-            body: {
-              readyForUpgrade,
-              details: getStatusMessage(),
+          return i18n.translate('xpack.upgradeAssistant.status.deprecationsUnresolvedMessage', {
+            defaultMessage:
+              'The following issues must be resolved before upgrading: {upgradeIssues}.',
+            values: {
+              upgradeIssues: upgradeIssues.join(', '),
             },
           });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        };
+
+        return response.ok({
+          body: {
+            readyForUpgrade,
+            details: getStatusMessage(),
+          },
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts
index 3e8da18f5f70d..914008ccc079c 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.ts b/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.ts
index 67f91aa08a076..aae7df2f43f15 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.ts
@@ -20,57 +20,43 @@ export function registerSystemIndicesMigrationRoutes({
   // GET status of the system indices migration
   router.get(
     { path: `${API_BASE_PATH}/system_indices_migration`, validate: false },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const status = await getESSystemIndicesMigrationStatus(client.asCurrentUser);
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const status = await getESSystemIndicesMigrationStatus(client.asCurrentUser);
 
-          return response.ok({
-            body: {
-              ...status,
-              features: status.features.filter(
-                (feature) => feature.migration_status !== 'NO_MIGRATION_NEEDED'
-              ),
-            },
-          });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({
+          body: {
+            ...status,
+            features: status.features.filter(
+              (feature) => feature.migration_status !== 'NO_MIGRATION_NEEDED'
+            ),
+          },
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 
   // POST starts the system indices migration
   router.post(
     { path: `${API_BASE_PATH}/system_indices_migration`, validate: false },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const status = await startESSystemIndicesMigration(client.asCurrentUser);
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const status = await startESSystemIndicesMigration(client.asCurrentUser);
 
-          return response.ok({
-            body: status,
-          });
-        } catch (error) {
-          return handleEsError({ error, response });
-        }
+        return response.ok({
+          body: status,
+        });
+      } catch (error) {
+        return handleEsError({ error, response });
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts b/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts
index c0d7134ffee5f..382ac77721616 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/update_index_settings.ts
@@ -23,42 +23,35 @@ export function registerUpdateSettingsRoute({ router }: RouteDependencies) {
         }),
       },
     },
-    versionCheckHandlerWrapper(
-      async (
-        {
-          core: {
-            elasticsearch: { client },
-          },
-        },
-        request,
-        response
-      ) => {
-        try {
-          const { indexName } = request.params;
-          const { settings } = request.body;
+    versionCheckHandlerWrapper(async ({ core }, request, response) => {
+      try {
+        const {
+          elasticsearch: { client },
+        } = await core;
+        const { indexName } = request.params;
+        const { settings } = request.body;
 
-          const settingsToDelete = settings.reduce((settingsBody, currentSetting) => {
-            settingsBody[currentSetting] = null;
-            return settingsBody;
-          }, {} as { [key: string]: null });
+        const settingsToDelete = settings.reduce((settingsBody, currentSetting) => {
+          settingsBody[currentSetting] = null;
+          return settingsBody;
+        }, {} as { [key: string]: null });
 
-          const settingsResponse = await client.asCurrentUser.indices.putSettings({
-            index: indexName,
-            body: settingsToDelete,
-          });
+        const settingsResponse = await client.asCurrentUser.indices.putSettings({
+          index: indexName,
+          body: settingsToDelete,
+        });
 
-          return response.ok({
-            body: settingsResponse,
-          });
-        } catch (e) {
-          const status = e.status || e.statusCode;
-          if (status === 403) {
-            return response.forbidden({ body: e });
-          }
-
-          throw e;
+        return response.ok({
+          body: settingsResponse,
+        });
+      } catch (e) {
+        const status = e.status || e.statusCode;
+        if (status === 403) {
+          return response.forbidden({ body: e });
         }
+
+        throw e;
       }
-    )
+    })
   );
 }
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts
index 88540d67b13df..7d26065ce0b82 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, omit, flow, some } from 'lodash';
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 const v716RemoveUnusedTelemetry: SavedObjectMigrationFn<any, any> = (doc) => {
   // Dynamically defined in 6.7 (https://github.com/elastic/kibana/pull/28878)
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
index 6dc70fab1203f..4b8e2d0cb0f82 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { ML_UPGRADE_OP_TYPE } from '../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
index c8bca6ee90177..36e32cfdea66b 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { REINDEX_OP_TYPE } from '../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
index 43cf6c30fccab..a097783022a6b 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { UPGRADE_ASSISTANT_TELEMETRY } from '../../common/constants';
 import { telemetrySavedObjectMigrations } from './migrations';
diff --git a/x-pack/plugins/upgrade_assistant/server/shared_imports.ts b/x-pack/plugins/upgrade_assistant/server/shared_imports.ts
index 1c43f89469ac1..ea52b78b27beb 100644
--- a/x-pack/plugins/upgrade_assistant/server/shared_imports.ts
+++ b/x-pack/plugins/upgrade_assistant/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export type { Privileges } from '../../../../src/plugins/es_ui_shared/common';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export type { Privileges } from '@kbn/es-ui-shared-plugin/common';
diff --git a/x-pack/plugins/upgrade_assistant/server/types.ts b/x-pack/plugins/upgrade_assistant/server/types.ts
index 376514c59d494..f63f5d4666d6f 100644
--- a/x-pack/plugins/upgrade_assistant/server/types.ts
+++ b/x-pack/plugins/upgrade_assistant/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter, Logger, SavedObjectsServiceStart } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginStart } from '../../security/server';
+import { IRouter, Logger, SavedObjectsServiceStart } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { CredentialStore } from './lib/reindexing/credential_store';
 import { handleEsError } from './shared_imports';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.tsx b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.tsx
deleted file mode 100644
index af11553d185a5..0000000000000
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { useEffect } from 'react';
-import * as React from 'react';
-import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import styled from 'styled-components';
-import { StepsList } from '../../../synthetics/check_steps/steps_list';
-import { JourneyStep } from '../../../../../common/runtime_types';
-import { useBrowserRunOnceMonitors } from './use_browser_run_once_monitors';
-import { TestResultHeader } from '../test_result_header';
-import { StdErrorLogs } from '../../../synthetics/check_steps/stderr_logs';
-
-interface Props {
-  monitorId: string;
-  isMonitorSaved: boolean;
-  onDone: () => void;
-}
-export const BrowserTestRunResult = ({ monitorId, isMonitorSaved, onDone }: Props) => {
-  const { data, loading, stepsLoading, stepEnds, journeyStarted, summaryDoc, stepListData } =
-    useBrowserRunOnceMonitors({
-      configId: monitorId,
-    });
-
-  useEffect(() => {
-    if (Boolean(summaryDoc)) {
-      onDone();
-    }
-  }, [summaryDoc, onDone]);
-
-  const hits = data?.hits.hits;
-  const doc = hits?.[0]?._source as JourneyStep;
-
-  const buttonContent = (
-    <div>
-      <TestResultHeader
-        summaryDocs={summaryDoc ? [summaryDoc] : []}
-        doc={doc}
-        journeyStarted={journeyStarted}
-        isCompleted={Boolean(summaryDoc)}
-      />
-      <EuiText size="s">
-        <p>
-          <EuiText color="subdued">
-            {i18n.translate('xpack.uptime.monitorManagement.stepCompleted', {
-              defaultMessage:
-                '{stepCount, number} {stepCount, plural, one {step} other {steps}}  completed',
-              values: {
-                stepCount: stepEnds.length,
-              },
-            })}
-          </EuiText>
-        </p>
-      </EuiText>
-    </div>
-  );
-
-  const isStepsLoading =
-    journeyStarted && stepEnds.length === 0 && (!summaryDoc || (summaryDoc && stepsLoading));
-  const isStepsLoadingFailed = summaryDoc && stepEnds.length === 0 && !isStepsLoading;
-
-  return (
-    <AccordionWrapper
-      id={monitorId}
-      element="fieldset"
-      className="euiAccordionForm"
-      buttonClassName="euiAccordionForm__button"
-      buttonContent={buttonContent}
-      paddingSize="s"
-      data-test-subj="expandResults"
-      initialIsOpen={true}
-    >
-      {isStepsLoading && (
-        <EuiFlexGroup alignItems="center" gutterSize="xs">
-          <EuiFlexItem grow={false}>
-            <EuiText>{LOADING_STEPS}</EuiText>
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiLoadingSpinner size="s" />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      )}
-      {isStepsLoadingFailed && (
-        <EuiText color="danger">{summaryDoc?.error?.message ?? FAILED_TO_RUN}</EuiText>
-      )}
-
-      {isStepsLoadingFailed &&
-        summaryDoc?.error?.message?.includes('journey did not finish executing') && (
-          <StdErrorLogs checkGroup={summaryDoc.monitor.check_group} hideTitle={true} />
-        )}
-
-      {stepEnds.length > 0 && stepListData?.steps && (
-        <StepsList
-          data={stepListData.steps}
-          compactView={true}
-          showStepDurationTrend={isMonitorSaved}
-          loading={Boolean(loading)}
-          error={undefined}
-        />
-      )}
-    </AccordionWrapper>
-  );
-};
-
-const AccordionWrapper = styled(EuiAccordion)`
-  .euiAccordion__buttonContent {
-    width: 100%;
-  }
-`;
-
-const FAILED_TO_RUN = i18n.translate('xpack.uptime.monitorManagement.failedRun', {
-  defaultMessage: 'Failed to run steps',
-});
-
-const LOADING_STEPS = i18n.translate('xpack.uptime.monitorManagement.loadingSteps', {
-  defaultMessage: 'Loading steps...',
-});
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
deleted file mode 100644
index 04605373f369e..0000000000000
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { useSelector } from 'react-redux';
-import { useEffect, useState } from 'react';
-import { selectDynamicSettings } from '../../../../state/selectors';
-import { JourneyStep } from '../../../../../common/runtime_types';
-import { createEsParams, useEsSearch, useFetcher } from '../../../../../../observability/public';
-import { useTickTick } from '../use_tick_tick';
-import { fetchJourneySteps } from '../../../../state/api/journey';
-import { isStepEnd } from '../../../synthetics/check_steps/steps_list';
-
-export const useBrowserEsResults = ({
-  configId,
-  testRunId,
-  lastRefresh,
-}: {
-  configId: string;
-  testRunId?: string;
-  lastRefresh: number;
-}) => {
-  const { settings } = useSelector(selectDynamicSettings);
-
-  return useEsSearch(
-    createEsParams({
-      index: settings?.heartbeatIndices,
-      body: {
-        sort: [
-          {
-            '@timestamp': 'desc',
-          },
-        ],
-        query: {
-          bool: {
-            filter: [
-              {
-                term: {
-                  config_id: configId,
-                },
-              },
-              {
-                terms: {
-                  'synthetics.type': ['heartbeat/summary', 'journey/start'],
-                },
-              },
-              ...(testRunId
-                ? [
-                    {
-                      term: {
-                        test_run_id: testRunId,
-                      },
-                    },
-                  ]
-                : []),
-            ],
-          },
-        },
-      },
-      size: 10,
-    }),
-    [configId, settings?.heartbeatIndices, lastRefresh],
-    { name: 'TestRunData' }
-  );
-};
-
-export const useBrowserRunOnceMonitors = ({
-  configId,
-  testRunId,
-  skipDetails = false,
-  refresh = true,
-}: {
-  configId: string;
-  testRunId?: string;
-  refresh?: boolean;
-  skipDetails?: boolean;
-}) => {
-  const { refreshTimer, lastRefresh } = useTickTick(3 * 1000, refresh);
-
-  const [checkGroupId, setCheckGroupId] = useState('');
-  const [stepEnds, setStepEnds] = useState<JourneyStep[]>([]);
-  const [summary, setSummary] = useState<JourneyStep>();
-
-  const { data, loading } = useBrowserEsResults({ configId, testRunId, lastRefresh });
-
-  const { data: stepListData, loading: stepsLoading } = useFetcher(() => {
-    if (checkGroupId && !skipDetails) {
-      return fetchJourneySteps({
-        checkGroup: checkGroupId,
-      });
-    }
-    return Promise.resolve(null);
-  }, [lastRefresh]);
-
-  useEffect(() => {
-    const hits = data?.hits.hits;
-
-    if (hits && hits.length > 0) {
-      hits?.forEach((hit) => {
-        const doc = hit._source as JourneyStep;
-        if (doc.synthetics?.type === 'journey/start') {
-          setCheckGroupId(doc.monitor.check_group);
-        }
-        if (doc.synthetics?.type === 'heartbeat/summary') {
-          setSummary(doc);
-          clearInterval(refreshTimer);
-        }
-      });
-    }
-  }, [data, refreshTimer]);
-
-  useEffect(() => {
-    if (stepListData?.steps && stepListData?.steps.length > 0) {
-      setStepEnds(stepListData.steps.filter(isStepEnd));
-    }
-  }, [stepListData]);
-
-  return {
-    data,
-    stepEnds,
-    loading,
-    stepsLoading,
-    stepListData,
-    summaryDoc: summary,
-    journeyStarted: Boolean(checkGroupId),
-  };
-};
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.tsx b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.tsx
deleted file mode 100644
index 4fb27fb83d560..0000000000000
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import React, { useEffect, useState } from 'react';
-import { useSimpleRunOnceMonitors } from './use_simple_run_once_monitors';
-import { Ping } from '../../../../../common/runtime_types';
-import { PingListTable } from '../../../monitor/ping_list/ping_list_table';
-import { TestResultHeader } from '../test_result_header';
-
-interface Props {
-  monitorId: string;
-  onDone: () => void;
-}
-export function SimpleTestResults({ monitorId, onDone }: Props) {
-  const [summaryDocs, setSummaryDocs] = useState<Ping[]>([]);
-  const { summaryDoc, loading } = useSimpleRunOnceMonitors({ configId: monitorId });
-
-  useEffect(() => {
-    if (summaryDoc) {
-      setSummaryDocs((prevState) => [summaryDoc, ...prevState]);
-      onDone();
-    }
-  }, [summaryDoc, onDone]);
-
-  return (
-    <>
-      <TestResultHeader summaryDocs={summaryDocs} isCompleted={Boolean(summaryDoc)} />
-      {summaryDoc && <PingListTable pings={summaryDocs} loading={loading} />}
-    </>
-  );
-}
diff --git a/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts b/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts
deleted file mode 100644
index 4b0ce493ba13c..0000000000000
--- a/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { createReducer, PayloadAction } from '@reduxjs/toolkit';
-import { WritableDraft } from 'immer/dist/types/types-external';
-import { clearTestNowMonitorAction, testNowMonitorAction } from '../actions';
-import { TestNowResponse } from '../api';
-import { AppState } from '../index';
-
-export enum TestRunStats {
-  LOADING = 'loading',
-  IN_PROGRESS = 'in-progress',
-  COMPLETED = 'completed',
-}
-
-interface TestNowRun {
-  monitorId: string;
-  testRunId?: string;
-  status: TestRunStats;
-}
-
-export interface TestNowRunsState {
-  testNowRuns: TestNowRun[];
-}
-
-export const initialState: TestNowRunsState = {
-  testNowRuns: [],
-};
-
-export const testNowRunsReducer = createReducer(initialState, (builder) => {
-  builder
-    .addCase(
-      String(testNowMonitorAction.get),
-      (state: WritableDraft<TestNowRunsState>, action: PayloadAction<string>) => ({
-        ...state,
-        testNowRuns: [
-          ...state.testNowRuns,
-          { monitorId: action.payload, status: TestRunStats.LOADING },
-        ],
-      })
-    )
-    .addCase(
-      String(testNowMonitorAction.success),
-      (state: WritableDraft<TestNowRunsState>, { payload }: PayloadAction<TestNowResponse>) => ({
-        ...state,
-        testNowRuns: state.testNowRuns.map((tRun) =>
-          tRun.monitorId === payload.monitorId
-            ? {
-                monitorId: payload.monitorId,
-                testRunId: payload.testRunId,
-                status: TestRunStats.IN_PROGRESS,
-              }
-            : tRun
-        ),
-      })
-    )
-    .addCase(
-      String(testNowMonitorAction.fail),
-      (state: WritableDraft<TestNowRunsState>, action: PayloadAction<TestNowResponse>) => ({
-        ...state,
-        testNowRuns: [...(state.testNowRuns ?? [])],
-      })
-    )
-    .addCase(
-      String(clearTestNowMonitorAction),
-      (state: WritableDraft<TestNowRunsState>, action: PayloadAction<string>) => ({
-        ...state,
-        testNowRuns: state.testNowRuns.filter((tRun) => tRun.monitorId !== action.payload),
-      })
-    );
-});
-
-export const testNowRunsSelector = ({ testNowRuns }: AppState) => testNowRuns.testNowRuns;
-
-export const testNowRunSelector =
-  (monitorId?: string) =>
-  ({ testNowRuns }: AppState) =>
-    testNowRuns.testNowRuns.find((tRun) => monitorId && monitorId === tRun.monitorId);
diff --git a/x-pack/plugins/ux/common/agent_name.ts b/x-pack/plugins/ux/common/agent_name.ts
index d8e079400bff4..d8b7971a0d74e 100644
--- a/x-pack/plugins/ux/common/agent_name.ts
+++ b/x-pack/plugins/ux/common/agent_name.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AgentName } from '../../apm/typings/es_schemas/ui/fields/agent';
+import { AgentName } from '@kbn/apm-plugin/typings/es_schemas/ui/fields/agent';
 
 export const RUM_AGENT_NAMES: AgentName[] = [
   'js-base',
diff --git a/x-pack/plugins/ux/common/fetch_options.ts b/x-pack/plugins/ux/common/fetch_options.ts
index 2f862ec7cbc38..14b8900e6ed26 100644
--- a/x-pack/plugins/ux/common/fetch_options.ts
+++ b/x-pack/plugins/ux/common/fetch_options.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 
 export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
   pathname: string;
diff --git a/x-pack/plugins/ux/public/application/application.test.tsx b/x-pack/plugins/ux/public/application/application.test.tsx
index 1023a7b83345b..82f236631ef7e 100644
--- a/x-pack/plugins/ux/public/application/application.test.tsx
+++ b/x-pack/plugins/ux/public/application/application.test.tsx
@@ -11,11 +11,11 @@ import { mount } from 'enzyme';
 
 import { UXAppRoot } from './ux_app';
 import { RumHome } from '../components/app/rum_dashboard/rum_home';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { createObservabilityRuleTypeRegistryMock } from '../../../observability/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createObservabilityRuleTypeRegistryMock } from '@kbn/observability-plugin/public';
 import { merge } from 'lodash';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
-import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 jest.mock('../services/rest/data_view', () => ({
   createStaticDataView: () => Promise.resolve(undefined),
diff --git a/x-pack/plugins/ux/public/application/ux_app.tsx b/x-pack/plugins/ux/public/application/ux_app.tsx
index 03767959e4d17..d2879d4fa2797 100644
--- a/x-pack/plugins/ux/public/application/ux_app.tsx
+++ b/x-pack/plugins/ux/public/application/ux_app.tsx
@@ -18,14 +18,19 @@ import {
   AppMountParameters,
   CoreStart,
   APP_WRAPPER_CLASS,
-} from '../../../../../src/core/public';
+} from '@kbn/core/public';
 
 import {
   KibanaContextProvider,
   RedirectAppLinks,
   useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
+import {
+  DatePickerContextProvider,
+  InspectorContextProvider,
+  useBreadcrumbs,
+} from '@kbn/observability-plugin/public';
 import {
   DASHBOARD_LABEL,
   RumHome,
@@ -33,11 +38,6 @@ import {
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 import { UXActionMenu } from '../components/app/rum_dashboard/action_menu';
 
-import {
-  DatePickerContextProvider,
-  InspectorContextProvider,
-  useBreadcrumbs,
-} from '../../../observability/public';
 import { UrlParamsProvider } from '../context/url_params_context/url_params_context';
 import { createStaticDataView } from '../services/rest/data_view';
 import { createCallApmApi } from '../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
index 84c297dbdea29..35d6afdfd53b3 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
@@ -12,9 +12,9 @@ import {
   RECORDS_FIELD,
   createExploratoryViewUrl,
   HeaderMenuPortal,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { AppMountParameters } from '../../../../../../../../src/core/public';
 import { SERVICE_NAME } from '../../../../../common/elasticsearch_fieldnames';
 import { UxInspectorHeaderLink } from './inpector_link';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
index 98622184a5cec..0fdebb787f064 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import {
   useInspectorContext,
   enableInspectEsQueries,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 
 export function UxInspectorHeaderLink() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx
index e04a23fd8ddbf..d4986503222b9 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx
@@ -28,11 +28,11 @@ import {
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
 import styled from 'styled-components';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { PercentileAnnotations } from '../page_load_distribution/percentile_annotations';
 import { I18LABELS } from '../translations';
 import { ChartWrapper } from '../chart_wrapper';
 import { PercentileRange } from '../page_load_distribution';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
 import { BreakdownSeries } from '../page_load_distribution/breakdown_series';
 import { BreakdownItem } from '../../../../../typings/ui_filters';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
index 79e60a2117540..3e39d8c4faeb8 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
@@ -27,11 +27,11 @@ import numeral from '@elastic/numeral';
 import moment from 'moment';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { ChartWrapper } from '../chart_wrapper';
 import { I18LABELS } from '../translations';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 
 interface Props {
   data?: {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx
index 2cdeb7be85ce3..c37694317bb16 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx
@@ -21,7 +21,7 @@ import {
   EUI_CHARTS_THEME_DARK,
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { ChartWrapper } from '../chart_wrapper';
 import { I18LABELS } from '../translations';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx
index d896dfd6428d7..8a9dcad9e1915 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { History } from 'history';
 import React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useEnvironmentsFetcher } from '../../../../hooks/use_environments_fetcher';
 import {
   ENVIRONMENT_ALL,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts
index c228f9acb77c8..e208e8536b718 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts
@@ -7,10 +7,10 @@
 
 import { omit } from 'lodash';
 import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { getExcludedName } from '../local_uifilters';
 
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 import { removeUndefinedProps } from '../../../../context/url_params_context/helpers';
 import {
   uxFiltersByName,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx
index 760ed2cba5390..1085e7e5952a6 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx
@@ -19,11 +19,12 @@ import {
 import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
+import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 import { I18LABELS } from '../translations';
 import { CsmSharedContext } from '../csm_shared_context';
-import { FETCH_STATUS } from '../../../../../../observability/public';
 
 interface JSErrorItem {
   errorMessage: string;
@@ -32,6 +33,8 @@ interface JSErrorItem {
 }
 
 export function JSErrors() {
+  const { http } = useKibanaServices();
+  const basePath = http.basePath.get();
   const { rangeId, urlParams, uxUiFilters } = useLegacyUrlParams();
 
   const { start, end, serviceName, searchTerm } = urlParams;
@@ -70,7 +73,9 @@ export function JSErrors() {
       field: 'errorMessage',
       name: I18LABELS.errorMessage,
       render: (errorMessage: string, item: JSErrorItem) => (
-        <EuiLink href={`/services/${serviceName}/errors/${item.errorGroupId}`}>
+        <EuiLink
+          href={`${basePath}/app/apm/services/${serviceName}/errors/${item.errorGroupId}`}
+        >
           {errorMessage}
         </EuiLink>
       ),
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx
index a2771994e8310..a8af8fad43231 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { LocalUIFilters } from './local_uifilters';
 import { RumDashboard } from './rum_dashboard';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx
index 766e4d6f5baa5..b4e5c3546c129 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx
@@ -15,11 +15,11 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ESFilter } from 'src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { FieldValueSuggestions } from '@kbn/observability-plugin/public';
 import { useLocalUIFilters } from '../hooks/use_local_uifilters';
 
 import { useBreakpoints } from '../../../../hooks/use_breakpoints';
-import { FieldValueSuggestions } from '../../../../../../observability/public';
 import { URLFilter } from '../url_filter';
 import { SelectedFilters } from './selected_filters';
 import { useDataView } from './use_data_view';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts
index 7c3f49ca9a869..8718485496f38 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from 'src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 
 import { SERVICE_ENVIRONMENT } from '../../../../../common/elasticsearch_fieldnames';
 import {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx
index 74146fe6d981f..296ef32ca5b8c 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx
@@ -9,10 +9,10 @@ import React, { Fragment } from 'react';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
+import { FilterValueLabel } from '@kbn/observability-plugin/public';
+import { IndexPattern } from '@kbn/data-plugin/common';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { FilterValueLabel } from '../../../../../../observability/public';
 import { FiltersUIHook } from '../hooks/use_local_uifilters';
-import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
 import { SelectedWildcards } from './selected_wildcards';
 import { UxLocalUIFilterName } from '../../../../../common/ux_ui_filter';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
index 46257605a22ce..dd6e7f16f7ec8 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
@@ -12,10 +12,10 @@ import {
   FilterValueLabel,
   fromQuery,
   toQuery,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { IndexPattern } from '@kbn/data-views-plugin/common';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TRANSACTION_URL } from '../../../../../common/elasticsearch_fieldnames';
-import { IndexPattern } from '../../../../../../../../src/plugins/data_views/common';
 
 interface Props {
   indexPattern: IndexPattern;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts
index 959da46da673e..bb80fd68ff283 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../../src/plugins/data/common';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { useFetcher } from '../../../../hooks/use_fetcher';
-import { DataPublicPluginStart } from '../../../../../../../../src/plugins/data/public';
 import { useDynamicDataViewFetcher } from '../../../../hooks/use_dynamic_data_view';
 
 export function useDataView() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx
index 5e98f36cc0798..264c72758a9e3 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx
@@ -12,9 +12,9 @@ import {
   EUI_CHARTS_THEME_DARK,
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
-import { PercentileRange } from './index';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
+import { PercentileRange } from '.';
 import { useBreakdowns } from './use_breakdowns';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   field: string;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx
index dd3c05b7084c1..865148af62a7e 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx
@@ -14,13 +14,13 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { I18LABELS } from '../translations';
 import { BreakdownFilter } from '../breakdowns/breakdown_filter';
 import { PageLoadDistChart } from '../charts/page_load_dist_chart';
 import { ResetPercentileZoom } from './reset_percentile_zoom';
-import { createExploratoryViewUrl } from '../../../../../../observability/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 import { BreakdownItem } from '../../../../../typings/ui_filters';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx
index 96b0198a870a5..0303aef4ec6e5 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx
@@ -14,7 +14,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { I18LABELS } from '../translations';
-import { PercentileRange } from './index';
+import { PercentileRange } from '.';
 
 interface Props {
   percentileRange: PercentileRange;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts
index 244cb6d051251..40748c571cb9c 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts
@@ -7,7 +7,7 @@
 
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { PercentileRange } from './index';
+import { PercentileRange } from '.';
 
 interface Props {
   percentileRange?: PercentileRange;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx
index 062332f680d82..87d6562d869b6 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx
@@ -14,12 +14,12 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { I18LABELS } from '../translations';
 import { BreakdownFilter } from '../breakdowns/breakdown_filter';
 import { PageViewsChart } from '../charts/page_views_chart';
-import { createExploratoryViewUrl } from '../../../../../../observability/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 import { BreakdownItem } from '../../../../../typings/ui_filters';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx
index 275a154c30856..9220d0447b657 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import React from 'react';
+import { DatePicker } from '@kbn/observability-plugin/public';
 import { useUxUrlParams } from '../../../../context/url_params_context/use_ux_url_params';
 import { useDateRangeRedirect } from '../../../../hooks/use_date_range_redirect';
-import { DatePicker } from '../../../../../../observability/public';
 import { clearCache } from '../../../../services/rest/call_api';
 
 export function RumDatePicker() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
index 8fd6663c9ebd1..49696561b475b 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
@@ -8,17 +8,17 @@
 import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiTitle, EuiFlexItem } from '@elastic/eui';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { CsmSharedContextProvider } from './csm_shared_context';
 import { WebApplicationSelect } from './panels/web_application_select';
 import { UserPercentile } from './user_percentile';
 import { useBreakpoints } from '../../../hooks/use_breakpoints';
-import { KibanaPageTemplateProps } from '../../../../../../../src/plugins/kibana_react/public';
 import { useHasRumData } from './hooks/use_has_rum_data';
 import { RumDatePicker } from './rum_datepicker';
 import { EmptyStateLoading } from './empty_state_loading';
 import { useKibanaServices } from '../../../hooks/use_kibana_services';
 import { UxEnvironmentFilter } from './environment_filter';
-import { RumOverview } from './index';
+import { RumOverview } from '.';
 
 export const DASHBOARD_LABEL = i18n.translate('xpack.ux.title', {
   defaultMessage: 'Dashboard',
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx
index 3d5c9ddb3b3a2..8be0fb3a7ff2d 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import { omit } from 'lodash';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { URLSearch } from './url_search';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 import { removeUndefinedProps } from '../../../../context/url_params_context/helpers';
 
 export function URLFilter() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx
index 45b4c8ab8b660..674b9593610ad 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx
@@ -9,8 +9,8 @@ import { EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../../context/url_params_context/use_url_params';
-import { fromQuery, toQuery } from '../../../../../../../observability/public';
 
 interface Props {
   serviceNames?: string[];
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx
index c3c14bd76061a..761724340662c 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx
@@ -8,11 +8,11 @@
 import React, { useEffect, useState } from 'react';
 import { isEqual, map } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { SelectableUrlList } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../../context/url_params_context/use_url_params';
 import { I18LABELS } from '../../translations';
 import { formatToSec } from '../../ux_metrics/key_ux_metrics';
 import { getPercentileLabel } from '../../ux_metrics/translations';
-import { SelectableUrlList } from '../../../../../../../observability/public';
 import { selectableRenderOptions, UrlOption } from './render_option';
 import { useUrlSearch } from './use_url_search';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx
index bac7b818fc03d..6fb7eb7d2f95f 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx
@@ -9,9 +9,9 @@ import React, { useCallback, useEffect } from 'react';
 
 import { EuiSelect } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { I18LABELS } from '../translations';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 
 const DEFAULT_P = 50;
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx
index d8438de4a7e19..440dc22545061 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx
@@ -7,13 +7,13 @@
 
 import React from 'react';
 import { render as testLibRender } from '@testing-library/react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { of } from 'rxjs';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 import { MemoryHistory } from 'history';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { UrlParamsProvider } from '../../../../context/url_params_context/url_params_context';
 
 export const core = {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx
index 9678090928dd6..a5689a7701027 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx
@@ -14,11 +14,11 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
+import { getCoreVitalsComponent } from '@kbn/observability-plugin/public';
 import { I18LABELS } from '../translations';
 import { KeyUXMetrics } from './key_ux_metrics';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useUxQuery } from '../hooks/use_ux_query';
-import { getCoreVitalsComponent } from '../../../../../../observability/public';
 import { CsmSharedContext } from '../csm_shared_context';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { getPercentileLabel } from './translations';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx
index d232b12f3a47b..be811726ed5a9 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { render, Matcher } from '@testing-library/react';
 import * as fetcherHook from '../../../../hooks/use_fetcher';
 import { KeyUXMetrics } from './key_ux_metrics';
-import { FETCH_STATUS } from '../../../../../../observability/public';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 
 describe('KeyUXMetrics', () => {
   it('renders metrics with correct formats', () => {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx
index d95d14c74770b..1dfab3fec5902 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx
@@ -8,6 +8,7 @@
 import React from 'react';
 import { EuiFlexItem, EuiStat, EuiFlexGroup, EuiIconTip } from '@elastic/eui';
 import numeral from '@elastic/numeral';
+import { UXMetrics } from '@kbn/observability-plugin/public';
 import {
   DATA_UNDEFINED_LABEL,
   FCP_LABEL,
@@ -23,7 +24,6 @@ import {
 } from './translations';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useUxQuery } from '../hooks/use_ux_query';
-import { UXMetrics } from '../../../../../../observability/public';
 
 export function formatToSec(
   value?: number | string,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts
index fdf9849d7983f..5d749b1320196 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts
@@ -10,7 +10,7 @@ import {
   HasDataParams,
   UxFetchDataResponse,
   UXHasDataResponse,
-} from '../../../../../observability/public/';
+} from '@kbn/observability-plugin/public';
 import { callApmApi } from '../../../services/rest/create_call_apm_api';
 
 export { createCallApmApi } from '../../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx
index 572661dc8cea4..b2ba69ff8bc94 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx
@@ -9,8 +9,8 @@ import { render } from 'enzyme';
 import React from 'react';
 
 import { EmbeddedMap } from './embedded_map';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { embeddablePluginMock } from '../../../../../../../../src/plugins/embeddable/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 describe('Embedded Map', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx
index 780682d66ae3b..a89320ee02ae5 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx
@@ -9,19 +9,16 @@ import React, { useEffect, useState, useRef } from 'react';
 import uuid from 'uuid';
 import styled from 'styled-components';
 
-import {
-  MapEmbeddable,
-  MapEmbeddableInput,
-} from '../../../../../../maps/public';
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common';
+import { MapEmbeddable, MapEmbeddableInput } from '@kbn/maps-plugin/public';
+import { MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/common';
 import {
   ErrorEmbeddable,
   ViewMode,
   isErrorEmbeddable,
-} from '../../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import type { RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 import { useLayerList } from './use_layer_list';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import type { RenderTooltipContentParams } from '../../../../../../maps/public';
 import { MapToolTip } from './map_tooltip';
 import { useMapFilters } from './use_map_filters';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx
index 56f1ae2014473..8625b8bbd38ef 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx
@@ -14,13 +14,13 @@ import {
   EuiPopoverTitle,
 } from '@elastic/eui';
 import styled from 'styled-components';
+import type { RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 import {
   COUNTRY_NAME,
   REGION_NAME,
   TRANSACTION_DURATION_COUNTRY,
   TRANSACTION_DURATION_REGION,
 } from './use_layer_list';
-import type { RenderTooltipContentParams } from '../../../../../../maps/public';
 import { I18LABELS } from '../translations';
 
 type MapToolTipProps = Partial<RenderTooltipContentParams>;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts
index bdef5c0a35782..29cdab566029f 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts
@@ -19,7 +19,7 @@ import {
   SOURCE_TYPES,
   STYLE_TYPE,
   SYMBOLIZE_AS_TYPES,
-} from '../../../../../../maps/common';
+} from '@kbn/maps-plugin/common';
 
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import {
diff --git a/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts b/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts
index 94beab5c3728e..ee376cff65932 100644
--- a/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts
+++ b/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts
@@ -6,6 +6,7 @@
  */
 
 import { Location } from 'history';
+import { toQuery } from '@kbn/observability-plugin/public';
 import { uxLocalUIFilterNames } from '../../../common/ux_ui_filter';
 import { pickKeys } from '../../../common/utils/pick_keys';
 import {
@@ -16,7 +17,6 @@ import {
   toString,
 } from './helpers';
 import { UrlParams, UxUrlParams } from './types';
-import { toQuery } from '../../../../observability/public';
 import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 
 type TimeUrlParams = Pick<
diff --git a/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts b/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts
index 35e2c2cf14178..1dd84e771406a 100644
--- a/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts
+++ b/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts
@@ -6,7 +6,7 @@
  */
 import qs from 'query-string';
 import { useHistory, useLocation } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { useKibanaServices } from './use_kibana_services';
 
 export interface TimePickerTimeDefaults {
diff --git a/x-pack/plugins/ux/public/hooks/use_fetcher.tsx b/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
index b211f263961ee..35165b0aa620f 100644
--- a/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
+++ b/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
@@ -7,13 +7,13 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useMemo, useState } from 'react';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import {
   useInspectorContext,
   FETCH_STATUS,
-} from '../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import {
   AutoAbortedAPMClient,
   callApmApi,
diff --git a/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx b/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx
index d26499131a49d..364e425c48933 100644
--- a/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx
+++ b/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx
@@ -10,8 +10,8 @@ import {
   DocLinksStart,
   IUiSettingsClient,
   ApplicationStart,
-} from 'kibana/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ApmPluginStartDeps } from '../plugin';
 
 interface UxKibanaServices extends ApmPluginStartDeps {
diff --git a/x-pack/plugins/ux/public/index.ts b/x-pack/plugins/ux/public/index.ts
index 261e8dbe83a69..e4244838a927a 100644
--- a/x-pack/plugins/ux/public/index.ts
+++ b/x-pack/plugins/ux/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from '../../../../src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { UxPlugin, UxPluginSetup, UxPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<UxPluginSetup, UxPluginStart> = () =>
diff --git a/x-pack/plugins/ux/public/plugin.ts b/x-pack/plugins/ux/public/plugin.ts
index 7c6f11378784c..f56c7a140ade5 100644
--- a/x-pack/plugins/ux/public/plugin.ts
+++ b/x-pack/plugins/ux/public/plugin.ts
@@ -13,25 +13,25 @@ import {
   HasDataParams,
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../observability/public';
+} from '@kbn/observability-plugin/public';
 import {
   AppMountParameters,
   CoreSetup,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
   Plugin,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+} from '@kbn/data-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
-import { FeaturesPluginSetup } from '../../features/public';
-import { LicensingPluginSetup } from '../../licensing/public';
-import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { MapsStartApi } from '../../maps/public';
-import { Start as InspectorPluginStart } from '../../../../src/plugins/inspector/public';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { MapsStartApi } from '@kbn/maps-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 
 export type UxPluginSetup = void;
 export type UxPluginStart = void;
diff --git a/x-pack/plugins/ux/public/services/rest/call_api.ts b/x-pack/plugins/ux/public/services/rest/call_api.ts
index 196878a08821e..c0458241460e8 100644
--- a/x-pack/plugins/ux/public/services/rest/call_api.ts
+++ b/x-pack/plugins/ux/public/services/rest/call_api.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import { isString, startsWith } from 'lodash';
 import LRU from 'lru-cache';
 import hash from 'object-hash';
-import { enableInspectEsQueries } from '../../../../observability/public';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/public';
 import { FetchOptions } from '../../../common/fetch_options';
 
 function fetchOptionsWithDebug(
diff --git a/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts b/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts
index ea9a6390a0e7e..eddd5fe07694e 100644
--- a/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts
+++ b/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import type {
   ClientRequestParamsOf,
   formatRequest as formatRequestType,
@@ -18,13 +18,13 @@ import type {
 // so in order to do targeted imports they must me imported separately, and
 // an error is expected here
 import { formatRequest } from '@kbn/server-route-repository/target_node/format_request';
-import { CallApi, callApi } from './call_api';
 import type {
   APMServerRouteRepository,
   APIEndpoint,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../apm/server';
-import { InspectResponse } from '../../../../observability/typings/common';
+} from '@kbn/apm-plugin/server';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
+import { CallApi, callApi } from './call_api';
 import { FetchOptions } from '../../../common/fetch_options';
 
 export type APMClientOptions = Omit<
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx b/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
index 1da2673714a98..283b058f65d44 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
@@ -15,7 +15,7 @@ import {
   httpServiceMock,
   scopedHistoryMock,
   executionContextServiceMock,
-} from '../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { AppDeps } from '../../../public/application/app';
 import { LicenseStatus } from '../../../common/types/license_status';
 
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
index 31c82cc33cd59..05a84227d32b5 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { ROUTES } from '../../../common/constants';
 
 const { API_ROOT } = ROUTES;
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx
index f42b452818cc5..621d0aae75dd3 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { init as initHttpRequests } from './http_requests';
 import { mockContextValue } from './app_context.mock';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts
index 4e76a1687114a..8af924c807372 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
 import { registerRouter } from '../../../public/application/lib/navigation';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
index 5a8d7b23e0b58..a4b7cce96ae03 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
 import { registerRouter } from '../../../public/application/lib/navigation';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts
index 9eb35f3f1bb32..22fc71c8d4636 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
 import { registerRouter } from '../../../public/application/lib/navigation';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts
index f7aca95039863..1da9ad7f23156 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts
@@ -13,7 +13,7 @@ import {
   TestBed,
   AsyncTestBedConfig,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { WatchList } from '../../../public/application/sections/watch_list/components/watch_list';
 import { ROUTES, REFRESH_INTERVALS } from '../../../common/constants';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts
index ab2204f4a6dfe..99e1cf936d1d7 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts
@@ -13,7 +13,7 @@ import {
   TestBed,
   AsyncTestBedConfig,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { registerRouter } from '../../../public/application/lib/navigation';
 import { WatchStatus } from '../../../public/application/sections/watch_status/components/watch_status';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
index 2a70b4852c77a..73b51f0ddbb89 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { WATCH_ID } from './helpers/jest_constants';
 import { getExecuteDetails } from '../../__fixtures__';
 import { WATCH_TYPES, API_BASE_PATH } from '../../common/constants';
diff --git a/x-pack/plugins/watcher/common/constants/plugin.ts b/x-pack/plugins/watcher/common/constants/plugin.ts
index 0751d4fbddc25..797d7f331c136 100644
--- a/x-pack/plugins/watcher/common/constants/plugin.ts
+++ b/x-pack/plugins/watcher/common/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export const PLUGIN = {
   ID: 'watcher',
diff --git a/x-pack/plugins/watcher/public/application/app.tsx b/x-pack/plugins/watcher/public/application/app.tsx
index 7f93d5d8cf798..ab7f1df69f3b7 100644
--- a/x-pack/plugins/watcher/public/application/app.tsx
+++ b/x-pack/plugins/watcher/public/application/app.tsx
@@ -14,7 +14,7 @@ import {
   IUiSettingsClient,
   ApplicationStart,
   ExecutionContextStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 import { Router, Switch, Route, Redirect, withRouter, RouteComponentProps } from 'react-router-dom';
 
@@ -22,12 +22,9 @@ import { EuiPageContent, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import {
-  RegisterManagementAppArgs,
-  ManagementAppMountParams,
-} from '../../../../../src/plugins/management/public';
+import { RegisterManagementAppArgs, ManagementAppMountParams } from '@kbn/management-plugin/public';
 
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import { LicenseStatus } from '../../common/types/license_status';
 import { WatchStatus } from './sections/watch_status/components/watch_status';
 import { WatchEdit } from './sections/watch_edit/components/watch_edit';
diff --git a/x-pack/plugins/watcher/public/application/app_context.tsx b/x-pack/plugins/watcher/public/application/app_context.tsx
index 81fbfa97845a6..dfe022f58981a 100644
--- a/x-pack/plugins/watcher/public/application/app_context.tsx
+++ b/x-pack/plugins/watcher/public/application/app_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { ACTION_TYPES } from '../../common/constants';
 import { AppDeps } from './app';
 
diff --git a/x-pack/plugins/watcher/public/application/index.tsx b/x-pack/plugins/watcher/public/application/index.tsx
index dd5a46c1cf1b5..4b2b83c35980b 100644
--- a/x-pack/plugins/watcher/public/application/index.tsx
+++ b/x-pack/plugins/watcher/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { SavedObjectsClientContract, CoreTheme } from 'kibana/public';
+import { SavedObjectsClientContract, CoreTheme } from '@kbn/core/public';
 
 import { KibanaThemeProvider } from './shared_imports';
 import { App, AppDeps } from './app';
diff --git a/x-pack/plugins/watcher/public/application/lib/api.ts b/x-pack/plugins/watcher/public/application/lib/api.ts
index 0971371f7949b..e514c2d4df5d4 100644
--- a/x-pack/plugins/watcher/public/application/lib/api.ts
+++ b/x-pack/plugins/watcher/public/application/lib/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup, SavedObjectsClientContract } from 'kibana/public';
+import { HttpSetup, SavedObjectsClientContract } from '@kbn/core/public';
 
 import { Settings } from '../models/settings';
 import { Watch } from '../models/watch';
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx
index c7a2039b713ba..c1c271797d720 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx
@@ -9,11 +9,10 @@ import React, { useContext } from 'react';
 
 import { EuiPageContent, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { WatchContext } from '../../watch_context';
 import { useAppContext } from '../../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 export const MonitoringWatchEdit = ({ pageTitle }: { pageTitle: string }) => {
   const { watch } = useContext(WatchContext);
   const { history } = useAppContext();
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
index 23028075daa3b..b8f9e084dea52 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/charts';
 import dateMath from '@kbn/datemath';
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { EuiCallOut, EuiLoadingChart, EuiSpacer, EuiEmptyPrompt, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts b/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts
index cfc67fecbcbbb..25d4d3c623a0a 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToastsSetup } from 'kibana/public';
+import { ToastsSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { ACTION_TYPES, WATCH_TYPES } from '../../../../common/constants';
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
index b8322c792461e..542196fb517fb 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
@@ -28,7 +28,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Moment } from 'moment';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { REFRESH_INTERVALS, PAGINATION, WATCH_TYPES } from '../../../../../common/constants';
 import { listBreadcrumb } from '../../../lib/breadcrumbs';
diff --git a/x-pack/plugins/watcher/public/application/shared_imports.ts b/x-pack/plugins/watcher/public/application/shared_imports.ts
index 4001b55bfdd2e..971182a22a7a7 100644
--- a/x-pack/plugins/watcher/public/application/shared_imports.ts
+++ b/x-pack/plugins/watcher/public/application/shared_imports.ts
@@ -9,7 +9,7 @@ export type {
   SendRequestConfig,
   SendRequestResponse,
   UseRequestConfig,
-} from '../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   sendRequest,
@@ -17,9 +17,6 @@ export {
   XJson,
   PageError,
   EuiCodeEditor,
-} from '../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/watcher/public/legacy/time_buckets.js b/x-pack/plugins/watcher/public/legacy/time_buckets.js
index 173369152f8e0..a0804e07c4662 100644
--- a/x-pack/plugins/watcher/public/legacy/time_buckets.js
+++ b/x-pack/plugins/watcher/public/legacy/time_buckets.js
@@ -7,8 +7,8 @@
 
 import _ from 'lodash';
 import moment from 'moment';
-import { search, UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { FIELD_FORMAT_IDS } from '../../../../../src/plugins/field_formats/common';
+import { search, UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval';
 import {
   convertDurationToNormalizedEsInterval,
diff --git a/x-pack/plugins/watcher/public/plugin.ts b/x-pack/plugins/watcher/public/plugin.ts
index 2da4415010d6c..8f3f549654130 100644
--- a/x-pack/plugins/watcher/public/plugin.ts
+++ b/x-pack/plugins/watcher/public/plugin.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, CoreStart, Capabilities } from 'kibana/public';
+import { CoreSetup, Plugin, CoreStart, Capabilities } from '@kbn/core/public';
 import { first, map, skip } from 'rxjs/operators';
 import { Subject, combineLatest } from 'rxjs';
 
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import { ILicense } from '../../licensing/public';
+import type { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { LicenseStatus } from '../common/types/license_status';
 import { PLUGIN } from '../common/constants';
 import { Dependencies } from './types';
@@ -89,10 +89,10 @@ export class WatcherUIPlugin implements Plugin<void, void, Dependencies, any> {
     // Because the home feature catalogue does not have enable/disable functionality we pass
     // the config in but keep a reference for enabling and disabling showing on home based on
     // license updates.
-    const watcherHome = {
+    const watcherHome: FeatureCatalogueEntry = {
       id: 'watcher',
       title: 'Watcher', // This is a product name so we don't translate it.
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
       description: i18n.translate('xpack.watcher.watcherDescription', {
         defaultMessage: 'Detect changes in your data by creating, managing, and monitoring alerts.',
       }),
diff --git a/x-pack/plugins/watcher/public/types.ts b/x-pack/plugins/watcher/public/types.ts
index 484f6205dc4d4..857acdc2109a1 100644
--- a/x-pack/plugins/watcher/public/types.ts
+++ b/x-pack/plugins/watcher/public/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ManagementSetup } from 'src/plugins/management/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { LicensingPluginSetup } from '../../licensing/public';
-import { DataPublicPluginSetup } from '../../../../src/plugins/data/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import { DataPublicPluginSetup } from '@kbn/data-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export interface Dependencies {
   home: HomePublicPluginSetup;
diff --git a/x-pack/plugins/watcher/server/index.ts b/x-pack/plugins/watcher/server/index.ts
index a98aa235a9cb8..0aba44ed82838 100644
--- a/x-pack/plugins/watcher/server/index.ts
+++ b/x-pack/plugins/watcher/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { WatcherServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new WatcherServerPlugin(ctx);
diff --git a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js
index 92acbbff2d66e..e21b01e4dc398 100644
--- a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js
+++ b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchAllFromScroll } from './fetch_all_from_scroll';
 
 describe('fetch_all_from_scroll', () => {
diff --git a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
index 42524dd7c70aa..eddc924c4c7c3 100644
--- a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
+++ b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { ES_SCROLL_SETTINGS } from '../../../common/constants';
 
diff --git a/x-pack/plugins/watcher/server/plugin.ts b/x-pack/plugins/watcher/server/plugin.ts
index 52d77520183ab..75afac5c4d1f2 100644
--- a/x-pack/plugins/watcher/server/plugin.ts
+++ b/x-pack/plugins/watcher/server/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { SemVer } from 'semver';
-import { CoreStart, CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreStart, CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN, INDEX_NAMES } from '../common/constants';
 
diff --git a/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts b/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts
index 237f6dac6a254..0c49e5ea894dd 100644
--- a/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult } from 'src/core/server';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 export function registerGetIndexPatternsRoute({
@@ -18,8 +18,9 @@ export function registerGetIndexPatternsRoute({
       path: '/api/watcher/indices/index_patterns',
       validate: false,
     },
-    license.guardApiRoute(async ({ core: { savedObjects } }, request, response) => {
+    license.guardApiRoute(async ({ core }, request, response) => {
       try {
+        const { savedObjects } = await core;
         const finder = savedObjects.client.createPointInTimeFinder({
           type: 'index-pattern',
           fields: ['title'],
diff --git a/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts b/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
index 665ff187f17a7..da78238ebd5cd 100644
--- a/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { reduce, size } from 'lodash';
 import { RouteDependencies } from '../../../types';
 
@@ -87,7 +87,8 @@ export function registerGetRoute({ router, license, lib: { handleEsError } }: Ro
       const { pattern } = request.body;
 
       try {
-        const indices = await getIndices(ctx.core.elasticsearch.client, pattern);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const indices = await getIndices(esClient, pattern);
         return response.ok({ body: { indices } });
       } catch (e) {
         return handleEsError({ error: e, response });
diff --git a/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts b/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
index 62fd86bc0d5dc..915695eaf50fa 100644
--- a/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 // @ts-ignore
-import { Fields } from '../../models/fields/index';
+import { Fields } from '../../models/fields';
 import { RouteDependencies } from '../../types';
 
 const bodySchema = schema.object({
@@ -43,7 +43,8 @@ export function registerListFieldsRoute({
       const { indexes } = request.body;
 
       try {
-        const fieldsResponse = await fetchFields(ctx.core.elasticsearch.client, indexes);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const fieldsResponse = await fetchFields(esClient, indexes);
         const json = fieldsResponse.statusCode === 404 ? { fields: [] } : fieldsResponse.body;
         const fields = Fields.fromUpstreamJson(json);
         return response.ok({ body: fields.downstreamJson });
diff --git a/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts b/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
index 7ea35e9e09764..d3a3f07e41b9a 100644
--- a/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
@@ -7,11 +7,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { INDEX_NAMES } from '../../../common/constants';
 import { RouteDependencies } from '../../types';
 // @ts-ignore
-import { WatchHistoryItem } from '../../models/watch_history_item/index';
+import { WatchHistoryItem } from '../../models/watch_history_item';
 
 const paramsSchema = schema.object({
   id: schema.string(),
@@ -46,7 +46,8 @@ export function registerLoadHistoryRoute({
       const id = request.params.id;
 
       try {
-        const responseFromES = await fetchHistoryItem(ctx.core.elasticsearch.client, id);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const responseFromES = await fetchHistoryItem(esClient, id);
         const hit = get(responseFromES, 'hits.hits[0]');
         if (!hit) {
           return response.notFound({ body: `Watch History Item with id = ${id} not found` });
diff --git a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
index 83ba43e8a4e88..6fdbbe1de96ac 100644
--- a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 // @ts-ignore
-import { Settings } from '../../../models/settings/index';
+import { Settings } from '../../../models/settings';
 import { RouteDependencies } from '../../../types';
 
 function fetchClusterSettings(client: IScopedClusterClient) {
@@ -25,7 +25,8 @@ export function registerLoadRoute({ router, license, lib: { handleEsError } }: R
     },
     license.guardApiRoute(async (ctx, request, response) => {
       try {
-        const settings = await fetchClusterSettings(ctx.core.elasticsearch.client);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const settings = await fetchClusterSettings(esClient);
         return response.ok({ body: Settings.fromUpstreamJson(settings).downstreamJson });
       } catch (e) {
         return handleEsError({ error: e, response });
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
index f0fc5ad5b6588..31b6d9ec15995 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
@@ -7,9 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 // @ts-ignore
-import { WatchStatus } from '../../../../models/watch_status/index';
+import { WatchStatus } from '../../../../models/watch_status';
 import { RouteDependencies } from '../../../../types';
 
 const paramsSchema = schema.object({
@@ -40,7 +40,8 @@ export function registerAcknowledgeRoute({
       const { watchId, actionId } = request.params;
 
       try {
-        const hit = await acknowledgeAction(ctx.core.elasticsearch.client, watchId, actionId);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hit = await acknowledgeAction(esClient, watchId, actionId);
         const watchStatusJson = get(hit, 'status');
         const json = {
           id: watchId,
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
index eaf7066e374c9..213567aef26a3 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { WatchStatus } from '../../../models/watch_status/index';
+import { WatchStatus } from '../../../models/watch_status';
 
 function activateWatch(dataClient: IScopedClusterClient, watchId: string) {
   return dataClient.asCurrentUser.watcher.activateWatch({
@@ -38,7 +38,8 @@ export function registerActivateRoute({
       const { watchId } = request.params;
 
       try {
-        const hit = await activateWatch(ctx.core.elasticsearch.client, watchId);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hit = await activateWatch(esClient, watchId);
         const watchStatusJson = get(hit, 'status');
         const json = {
           id: watchId,
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
index c235e97c6e0ba..2d929965468b1 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { WatchStatus } from '../../../models/watch_status/index';
+import { WatchStatus } from '../../../models/watch_status';
 
 const paramsSchema = schema.object({
   watchId: schema.string(),
@@ -38,7 +38,8 @@ export function registerDeactivateRoute({
       const { watchId } = request.params;
 
       try {
-        const hit = await deactivateWatch(ctx.core.elasticsearch.client, watchId);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hit = await deactivateWatch(esClient, watchId);
         const watchStatusJson = get(hit, 'status');
         const json = {
           id: watchId,
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
index a2334741219ec..c35efbd4bb320 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 const paramsSchema = schema.object({
@@ -35,8 +35,9 @@ export function registerDeleteRoute({
       const { watchId } = request.params;
 
       try {
+        const esClient = (await ctx.core).elasticsearch.client;
         return response.ok({
-          body: await deleteWatch(ctx.core.elasticsearch.client, watchId),
+          body: await deleteWatch(esClient, watchId),
         });
       } catch (e) {
         if (e?.statusCode === 404 && e.meta?.body?.error) {
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
index 9882e50356c27..c7a082f640c6a 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
@@ -6,16 +6,16 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { ExecuteDetails } from '../../../models/execute_details/index';
+import { ExecuteDetails } from '../../../models/execute_details';
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 // @ts-ignore
-import { WatchHistoryItem } from '../../../models/watch_history_item/index';
+import { WatchHistoryItem } from '../../../models/watch_history_item';
 
 const bodySchema = schema.object({
   executeDetails: schema.object({}, { unknowns: 'allow' }),
@@ -50,11 +50,8 @@ export function registerExecuteRoute({
       const watch = Watch.fromDownstreamJson(request.body.watch);
 
       try {
-        const hit = await executeWatch(
-          ctx.core.elasticsearch.client,
-          executeDetails.upstreamJson,
-          watch.watchJson
-        );
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hit = await executeWatch(esClient, executeDetails.upstreamJson, watch.watchJson);
         const id = get(hit, '_id');
         const watchHistoryItemJson = get(hit, 'watch_record');
         const watchId = get(hit, 'watch_record.watch_id');
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
index 04050ae2b0e33..f3d810424d9a6 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { WatchHistoryItem } from '../../../models/watch_history_item/index';
+import { WatchHistoryItem } from '../../../models/watch_history_item';
 
 const paramsSchema = schema.object({
   watchId: schema.string(),
@@ -66,7 +66,8 @@ export function registerHistoryRoute({
       const { startTime } = request.query;
 
       try {
-        const hits = await fetchHistoryItems(ctx.core.elasticsearch.client, watchId, startTime);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hits = await fetchHistoryItems(esClient, watchId, startTime);
         const watchHistoryItems = hits.map((hit: any) => {
           const id = get(hit, '_id');
           const watchHistoryItemJson = get(hit, '_source');
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
index c6d96724092d9..a2fea1d5b73d4 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 import { RouteDependencies } from '../../../types';
 
 const paramsSchema = schema.object({
@@ -34,7 +34,8 @@ export function registerLoadRoute({ router, license, lib: { handleEsError } }: R
       const id = request.params.id;
 
       try {
-        const hit = await fetchWatch(ctx.core.elasticsearch.client, id);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hit = await fetchWatch(esClient, id);
         const watchJson = get(hit, 'watch');
         const watchStatusJson = get(hit, 'status');
         const json = {
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts
index 6aebd4968f066..86e3c2d1da102 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts
@@ -37,7 +37,7 @@ export function registerSaveRoute({ router, license, lib: { handleEsError } }: R
       const { id } = request.params;
       const { type, isNew, isActive, ...watchConfig } = request.body;
 
-      const dataClient = ctx.core.elasticsearch.client;
+      const dataClient = (await ctx.core).elasticsearch.client;
 
       // For new watches, verify watch with the same ID doesn't already exist
       if (isNew) {
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
index 25f31ff43373f..defc1b3451e6b 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 // @ts-ignore
-import { VisualizeOptions } from '../../../models/visualize_options/index';
+import { VisualizeOptions } from '../../../models/visualize_options';
 
 const bodySchema = schema.object({
   watch: schema.object({}, { unknowns: 'allow' }),
@@ -52,7 +52,8 @@ export function registerVisualizeRoute({
       const body = watch.getVisualizeQuery(options, kibanaVersion);
 
       try {
-        const hits = await fetchVisualizeData(ctx.core.elasticsearch.client, watch.index, body);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hits = await fetchVisualizeData(esClient, watch.index, body);
         const visualizeData = watch.formatVisualizeData(hits);
 
         return response.ok({
diff --git a/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts b/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
index 592ccac2135d0..5458f850b33e6 100644
--- a/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 const bodySchema = schema.object({
@@ -56,7 +56,8 @@ export function registerDeleteRoute({ router, license }: RouteDependencies) {
       },
     },
     license.guardApiRoute(async (ctx, request, response) => {
-      const results = await deleteWatches(ctx.core.elasticsearch.client, request.body.watchIds);
+      const esClient = (await ctx.core).elasticsearch.client;
+      const results = await deleteWatches(esClient, request.body.watchIds);
       return response.ok({ body: { results } });
     })
   );
diff --git a/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts b/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
index 3ae49fae51da5..9951da819e9e0 100644
--- a/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 
 function fetchWatches(dataClient: IScopedClusterClient) {
   return dataClient.asCurrentUser
@@ -36,7 +36,8 @@ export function registerListRoute({ router, license, lib: { handleEsError } }: R
     },
     license.guardApiRoute(async (ctx, request, response) => {
       try {
-        const hits = await fetchWatches(ctx.core.elasticsearch.client);
+        const esClient = (await ctx.core).elasticsearch.client;
+        const hits = await fetchWatches(esClient);
         const watches = hits.map((hit: any) => {
           const id = get(hit, '_id');
           const watchJson = get(hit, '_source');
diff --git a/x-pack/plugins/watcher/server/shared_imports.ts b/x-pack/plugins/watcher/server/shared_imports.ts
index e9e3ed72aed64..ad01d3942d4d2 100644
--- a/x-pack/plugins/watcher/server/shared_imports.ts
+++ b/x-pack/plugins/watcher/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export { License } from '../../license_api_guard/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export { License } from '@kbn/license-api-guard-plugin/server';
diff --git a/x-pack/plugins/watcher/server/types.ts b/x-pack/plugins/watcher/server/types.ts
index 87cd5e40c2792..d0800947fb50f 100644
--- a/x-pack/plugins/watcher/server/types.ts
+++ b/x-pack/plugins/watcher/server/types.ts
@@ -6,10 +6,10 @@
  */
 
 import { SemVer } from 'semver';
-import type { IRouter } from 'src/core/server';
+import type { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { License, handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
diff --git a/x-pack/tasks/build.ts b/x-pack/tasks/build.ts
index 03beae1108bbd..4680464976d79 100644
--- a/x-pack/tasks/build.ts
+++ b/x-pack/tasks/build.ts
@@ -12,7 +12,8 @@ import { promisify } from 'util';
 import { pipeline } from 'stream';
 
 import { REPO_ROOT } from '@kbn/utils';
-import { ToolingLog, transformFileStream, transformFileWithBabel } from '@kbn/dev-utils';
+import { transformFileStream, transformFileWithBabel } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import gulp from 'gulp';
 import del from 'del';
 import fancyLog from 'fancy-log';
diff --git a/x-pack/tasks/download_chromium.ts b/x-pack/tasks/download_chromium.ts
index 6ac0f07d1c297..785ab5f3f258b 100644
--- a/x-pack/tasks/download_chromium.ts
+++ b/x-pack/tasks/download_chromium.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { download, paths } from '../plugins/screenshotting/server/utils';
+import { download, paths } from '@kbn/screenshotting-plugin/server/utils';
 
 export const downloadChromium = async () => {
   // eslint-disable-next-line no-console
diff --git a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
index b5ee6a1948599..9532e8e365655 100644
--- a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
+++ b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { Datafeed, Job } from '../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
diff --git a/x-pack/test/accessibility/apps/remote_clusters.ts b/x-pack/test/accessibility/apps/remote_clusters.ts
index 099e3f9f170d9..67c85eda60a4a 100644
--- a/x-pack/test/accessibility/apps/remote_clusters.ts
+++ b/x-pack/test/accessibility/apps/remote_clusters.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ClusterPayloadEs } from '@kbn/remote-clusters-plugin/common/lib';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { ClusterPayloadEs } from '../../../plugins/remote_clusters/common/lib';
 
 const emptyPrompt = 'remoteClusterListEmptyPrompt';
 const createButton = 'remoteClusterEmptyPromptCreateButton';
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts
index 778c87f0ed03e..75b66396c269c 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts
@@ -12,10 +12,10 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { SpacesPluginSetup } from '../../../../../../../plugins/spaces/server';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 
 interface FixtureSetupDeps {
   spaces?: SpacesPluginSetup;
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
index e9e6d6732327a..31ae7f1507ca8 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
@@ -11,7 +11,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts
index b7ca07f79a627..b4de0deb47ffb 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts
@@ -11,7 +11,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts
index feb05a952ab53..9a7711dae8211 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts
@@ -12,7 +12,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
index 6e3e1491b633f..4525768a0fb42 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
@@ -7,11 +7,11 @@
 
 import http from 'http';
 import https from 'https';
-import { Plugin, CoreSetup, IRouter } from 'kibana/server';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { PluginSetupContract as ActionsPluginSetupContract } from '../../../../../../../plugins/actions/server/plugin';
-import { ActionType } from '../../../../../../../plugins/actions/server';
+import { Plugin, CoreSetup, IRouter } from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { PluginSetupContract as ActionsPluginSetupContract } from '@kbn/actions-plugin/server/plugin';
+import { ActionType } from '@kbn/actions-plugin/server';
 import { initPlugin as initPagerduty } from './pagerduty_simulation';
 import { initPlugin as initSwimlane } from './swimlane_simulation';
 import { initPlugin as initServiceNow } from './servicenow_simulation';
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts
index d5e82300be2b8..e84e8fd09dc5d 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts
@@ -11,7 +11,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts
index 727ecbf915e93..b6733d0cf07da 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts
@@ -12,7 +12,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
index 2246bdc424264..357458cc38e41 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
+import { ActionType } from '@kbn/actions-plugin/server';
 import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
-import { ActionType } from '../../../../../../../plugins/actions/server';
 
 export function defineActionTypes(
   core: CoreSetup<FixtureStartDeps>,
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts
index 9acc0d791b886..901542bc5b519 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { curry, times } from 'lodash';
-import { ES_TEST_INDEX_NAME } from '../../../../lib';
-import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
 import {
   RuleType,
   AlertInstanceState,
   AlertInstanceContext,
   RuleTypeState,
   RuleTypeParams,
-} from '../../../../../../../plugins/alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { ES_TEST_INDEX_NAME } from '../../../../lib';
+import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
 
 export const EscapableStrings = {
   escapableBold: '*bold*',
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts
index 027ea50a8ae6a..5a260b165f792 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FixturePlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) => new FixturePlugin(initContext);
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts
index 776686bcd1c0a..c0ea6a6379c72 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts
@@ -11,7 +11,7 @@
 // have the caller make explicit conflict checks, where the conflict was
 // caused by a background update.
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 type RetryableForConflicts<T> = () => Promise<T>;
 
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts
index a8270d9861f4b..0a6394632b5a5 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts
@@ -5,22 +5,22 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart, Logger, PluginInitializerContext } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart, Logger, PluginInitializerContext } from '@kbn/core/server';
 import { firstValueFrom, Subject } from 'rxjs';
-import { PluginSetupContract as ActionsPluginSetup } from '../../../../../../../plugins/actions/server/plugin';
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../../plugins/alerting/server/plugin';
+import { PluginSetupContract as ActionsPluginSetup } from '@kbn/actions-plugin/server/plugin';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../../../plugins/task_manager/server/plugin';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+} from '@kbn/task-manager-plugin/server/plugin';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
 import { defineAlertTypes } from './alert_types';
 import { defineActionTypes } from './action_types';
 import { defineRoutes } from './routes';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
-import { PluginStartContract as ActionsPluginStart } from '../../../../../../../plugins/actions/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts
index f4f2a9a007532..837ca4adf217b 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts
@@ -13,15 +13,15 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   Logger,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { InvalidatePendingApiKey } from '../../../../../../../plugins/alerting/server/types';
-import { RawRule } from '../../../../../../../plugins/alerting/server/types';
+import { InvalidatePendingApiKey } from '@kbn/alerting-plugin/server/types';
+import { RawRule } from '@kbn/alerting-plugin/server/types';
 import {
   ConcreteTaskInstance,
   TaskInstance,
   TaskManagerStartContract,
-} from '../../../../../../../plugins/task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { FixtureStartDeps } from './plugin';
 import { retryIfConflicts } from './lib/retry_if_conflicts';
 
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts
index 841d72a45d9f4..a902d2a12a837 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
+import { RuleType } from '@kbn/alerting-plugin/server';
 import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
-import { RuleType } from '../../../../../../../plugins/alerting/server';
 
 export function defineAlertTypes(
   core: CoreSetup<FixtureStartDeps>,
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts
index 8c253839678b2..66a85b32e6be6 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
-import { PluginSetupContract as ActionsPluginSetup } from '../../../../../../../plugins/actions/server/plugin';
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../../plugins/alerting/server/plugin';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { PluginSetupContract as ActionsPluginSetup } from '@kbn/actions-plugin/server/plugin';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { defineAlertTypes } from './alert_types';
 
 export interface FixtureSetupDeps {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts
index 61d04588aaebe..6e4eba065ec70 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts
@@ -13,10 +13,10 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { firstValueFrom, Subject } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import { TaskManagerStartContract } from '../../../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 export interface SampleTaskManagerFixtureStartDeps {
   taskManager: TaskManagerStartContract;
@@ -88,7 +88,8 @@ export class SampleTaskManagerFixturePlugin
         req: KibanaRequest<any, any, any, any>,
         res: KibanaResponseFactory
       ): Promise<IKibanaResponse<any>> {
-        await context.core.elasticsearch.client.asInternalUser.indices.refresh({
+        const coreCtx = await context.core;
+        await coreCtx.elasticsearch.client.asInternalUser.indices.refresh({
           index: '.kibana_task_manager',
         });
         return res.ok({ body: {} });
diff --git a/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts b/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
index 194be6d184692..912e153f9a8c0 100644
--- a/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IValidatedEvent } from '../../../../plugins/event_log/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { getUrlPrefix } from '.';
 import { FtrProviderContext } from '../ftr_provider_context';
 
diff --git a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
index 11e0b047ffd85..d8b1397edbd75 100644
--- a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { Client } from '@elastic/elasticsearch';
-import { SerializedConcreteTaskInstance } from '../../../../plugins/task_manager/server/task';
+import { SerializedConcreteTaskInstance } from '@kbn/task-manager-plugin/server/task';
 
 export interface TaskManagerDoc {
   type: string;
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
index 913baa2517fbb..321d14683ee2f 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { UserAtSpaceScenarios } from '../../scenarios';
 import {
   ESTestIndexTool,
@@ -15,7 +16,6 @@ import {
   getEventLog,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
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 37455149a2a42..15e648bb2166c 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
@@ -8,6 +8,9 @@
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
+import { TaskRunning, TaskRunningStage } from '@kbn/task-manager-plugin/server/task_running';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { UserAtSpaceScenarios, Superuser } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -21,12 +24,6 @@ import {
   TaskManagerUtils,
   getEventLog,
 } from '../../../common/lib';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
-import {
-  TaskRunning,
-  TaskRunningStage,
-} from '../../../../../plugins/task_manager/server/task_running';
-import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
index 2eb33d95fa4ea..4e61fd6593113 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { RuleExecutionStatusErrorReasons } from '../../../../../plugins/alerting/common';
+import { RuleExecutionStatusErrorReasons } from '@kbn/alerting-plugin/common';
 import { Spaces } from '../../scenarios';
 import { getUrlPrefix, getTestRuleData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
index 8134b03e4ba69..a1e23db7944f1 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
@@ -32,28 +32,35 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
         await tearDown(getService);
       });
 
-      loadTestFile(require.resolve('./find'));
-      loadTestFile(require.resolve('./create'));
-      loadTestFile(require.resolve('./delete'));
-      loadTestFile(require.resolve('./disable'));
-      loadTestFile(require.resolve('./enable'));
-      loadTestFile(require.resolve('./execution_status'));
-      loadTestFile(require.resolve('./get'));
-      loadTestFile(require.resolve('./get_alert_state'));
-      loadTestFile(require.resolve('./get_alert_summary'));
-      loadTestFile(require.resolve('./rule_types'));
-      loadTestFile(require.resolve('./mute_all'));
-      loadTestFile(require.resolve('./mute_instance'));
-      loadTestFile(require.resolve('./unmute_all'));
-      loadTestFile(require.resolve('./unmute_instance'));
-      loadTestFile(require.resolve('./update'));
-      loadTestFile(require.resolve('./update_api_key'));
-      loadTestFile(require.resolve('./alerts'));
-      loadTestFile(require.resolve('./event_log'));
-      loadTestFile(require.resolve('./mustache_templates'));
-      loadTestFile(require.resolve('./health'));
-      loadTestFile(require.resolve('./excluded'));
-      loadTestFile(require.resolve('./snooze'));
+      describe('', function () {
+        this.tags('ciGroup17');
+        loadTestFile(require.resolve('./find'));
+        loadTestFile(require.resolve('./create'));
+        loadTestFile(require.resolve('./delete'));
+        loadTestFile(require.resolve('./disable'));
+        loadTestFile(require.resolve('./enable'));
+        loadTestFile(require.resolve('./execution_status'));
+        loadTestFile(require.resolve('./get'));
+        loadTestFile(require.resolve('./get_alert_state'));
+        loadTestFile(require.resolve('./get_alert_summary'));
+        loadTestFile(require.resolve('./rule_types'));
+      });
+
+      describe('', function () {
+        this.tags('ciGroup30');
+        loadTestFile(require.resolve('./mute_all'));
+        loadTestFile(require.resolve('./mute_instance'));
+        loadTestFile(require.resolve('./unmute_all'));
+        loadTestFile(require.resolve('./unmute_instance'));
+        loadTestFile(require.resolve('./update'));
+        loadTestFile(require.resolve('./update_api_key'));
+        loadTestFile(require.resolve('./alerts'));
+        loadTestFile(require.resolve('./event_log'));
+        loadTestFile(require.resolve('./mustache_templates'));
+        loadTestFile(require.resolve('./health'));
+        loadTestFile(require.resolve('./excluded'));
+        loadTestFile(require.resolve('./snooze'));
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
index 4aa8447823dca..4f324cae689cd 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { SavedObjectsUtils } from '@kbn/core/server/saved_objects';
 import { UserAtSpaceScenarios, Superuser } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { ESTestIndexTool, getUrlPrefix, ObjectRemover, AlertUtils } from '../../../common/lib';
 import { setupSpacesAndUsers } from '..';
-import { SavedObjectsUtils } from '../../../../../../src/core/server/saved_objects';
 
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
index 2b26410afeaed..1196e3716347d 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
@@ -58,10 +58,14 @@ export async function tearDown(getService: FtrProviderContext['getService']) {
 // eslint-disable-next-line import/no-default-export
 export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('alerting api integration security and spaces enabled', function () {
-    this.tags('ciGroup17');
+    describe('', function () {
+      this.tags('ciGroup17');
+      loadTestFile(require.resolve('./telemetry'));
+      loadTestFile(require.resolve('./actions'));
+    });
 
-    loadTestFile(require.resolve('./telemetry'));
-    loadTestFile(require.resolve('./actions'));
-    loadTestFile(require.resolve('./alerting'));
+    describe('', function () {
+      loadTestFile(require.resolve('./alerting'));
+    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/telemetry/alerting_telemetry.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/telemetry/alerting_telemetry.ts
index 2773d137f25a4..4a5395b76c694 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/telemetry/alerting_telemetry.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/telemetry/alerting_telemetry.ts
@@ -381,66 +381,66 @@ export default function createAlertingTelemetryTests({ getService }: FtrProvider
       ).to.be.empty();
 
       // percentile calculations for number of scheduled actions
-      expect(telemetry.percentile_num_scheduled_actions_per_day.p50 >= 0).to.be(true);
-      expect(telemetry.percentile_num_scheduled_actions_per_day.p90 > 0).to.be(true);
-      expect(telemetry.percentile_num_scheduled_actions_per_day.p99 > 0).to.be(true);
+      expect(telemetry.percentile_num_generated_actions_per_day.p50 >= 0).to.be(true);
+      expect(telemetry.percentile_num_generated_actions_per_day.p90 > 0).to.be(true);
+      expect(telemetry.percentile_num_generated_actions_per_day.p99 > 0).to.be(true);
 
       // percentile calculations by rule type. most of these rule types don't schedule actions so they should all be 0
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p50['example__always-firing']
+        telemetry.percentile_num_generated_actions_by_type_per_day.p50['example__always-firing']
       ).to.equal(0);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p90['example__always-firing']
+        telemetry.percentile_num_generated_actions_by_type_per_day.p90['example__always-firing']
       ).to.equal(0);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p99['example__always-firing']
+        telemetry.percentile_num_generated_actions_by_type_per_day.p99['example__always-firing']
       ).to.equal(0);
 
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p50.test__onlyContextVariables
+        telemetry.percentile_num_generated_actions_by_type_per_day.p50.test__onlyContextVariables
       ).to.equal(0);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p90.test__onlyContextVariables
+        telemetry.percentile_num_generated_actions_by_type_per_day.p90.test__onlyContextVariables
       ).to.equal(0);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p99.test__onlyContextVariables
+        telemetry.percentile_num_generated_actions_by_type_per_day.p99.test__onlyContextVariables
       ).to.equal(0);
 
-      expect(telemetry.percentile_num_scheduled_actions_by_type_per_day.p50.test__noop).to.equal(0);
-      expect(telemetry.percentile_num_scheduled_actions_by_type_per_day.p90.test__noop).to.equal(0);
-      expect(telemetry.percentile_num_scheduled_actions_by_type_per_day.p99.test__noop).to.equal(0);
+      expect(telemetry.percentile_num_generated_actions_by_type_per_day.p50.test__noop).to.equal(0);
+      expect(telemetry.percentile_num_generated_actions_by_type_per_day.p90.test__noop).to.equal(0);
+      expect(telemetry.percentile_num_generated_actions_by_type_per_day.p99.test__noop).to.equal(0);
 
-      expect(telemetry.percentile_num_scheduled_actions_by_type_per_day.p50.test__throw).to.equal(
+      expect(telemetry.percentile_num_generated_actions_by_type_per_day.p50.test__throw).to.equal(
         0
       );
-      expect(telemetry.percentile_num_scheduled_actions_by_type_per_day.p90.test__throw).to.equal(
+      expect(telemetry.percentile_num_generated_actions_by_type_per_day.p90.test__throw).to.equal(
         0
       );
-      expect(telemetry.percentile_num_scheduled_actions_by_type_per_day.p99.test__throw).to.equal(
+      expect(telemetry.percentile_num_generated_actions_by_type_per_day.p99.test__throw).to.equal(
         0
       );
 
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p50.test__multipleSearches
+        telemetry.percentile_num_generated_actions_by_type_per_day.p50.test__multipleSearches
       ).to.equal(0);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p90.test__multipleSearches
+        telemetry.percentile_num_generated_actions_by_type_per_day.p90.test__multipleSearches
       ).to.equal(0);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p99.test__multipleSearches
+        telemetry.percentile_num_generated_actions_by_type_per_day.p99.test__multipleSearches
       ).to.equal(0);
 
       // this rule type does schedule actions so should be least 1 action scheduled
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p50['test__cumulative-firing'] >=
+        telemetry.percentile_num_generated_actions_by_type_per_day.p50['test__cumulative-firing'] >=
           1
       ).to.be(true);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p90['test__cumulative-firing'] >=
+        telemetry.percentile_num_generated_actions_by_type_per_day.p90['test__cumulative-firing'] >=
           1
       ).to.be(true);
       expect(
-        telemetry.percentile_num_scheduled_actions_by_type_per_day.p99['test__cumulative-firing'] >=
+        telemetry.percentile_num_generated_actions_by_type_per_day.p99['test__cumulative-firing'] >=
           1
       ).to.be(true);
     });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts
index 27b523fa24298..8a6532302a2e1 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObject, SavedObjectReference } from 'src/core/server';
-import { ActionTaskParams } from '../../../../../plugins/actions/server/types';
+import { SavedObject, SavedObjectReference } from '@kbn/core/server';
+import { ActionTaskParams } from '@kbn/actions-plugin/server/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
index 274e147898d9b..79e5928c61739 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { AlertHistoryDefaultIndexName } from '@kbn/actions-plugin/common';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { getTestRuleData, ObjectRemover } from '../../../../common/lib';
-import { AlertHistoryDefaultIndexName } from '../../../../../../plugins/actions/common';
 
 const ALERT_HISTORY_OVERRIDE_INDEX = 'kibana-alert-history-not-the-default';
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
index 389a4beeb8737..06e077f4b9de4 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
@@ -6,6 +6,7 @@
  */
 import type { Client } from '@elastic/elasticsearch';
 import expect from '@kbn/expect';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import {
   ESTestIndexTool,
@@ -15,7 +16,6 @@ import {
   getEventLog,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
index 58ddd5516d8a5..53cb0a1f662ce 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
@@ -9,7 +9,9 @@ import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Response as SupertestResponse } from 'supertest';
-import { RecoveredActionGroup } from '../../../../../plugins/alerting/common';
+import { RecoveredActionGroup } from '@kbn/alerting-plugin/common';
+import { TaskRunning, TaskRunningStage } from '@kbn/task-manager-plugin/server/task_running';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { Space } from '../../../common/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -22,11 +24,6 @@ import {
   ensureDatetimeIsWithinRange,
   TaskManagerUtils,
 } from '../../../common/lib';
-import {
-  TaskRunning,
-  TaskRunningStage,
-} from '../../../../../plugins/task_manager/server/task_running';
-import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
 
 export function alertTests({ getService }: FtrProviderContext, space: Space) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
index 0c27868e3fbb6..e7e750a92b12c 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
@@ -35,8 +35,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
   const esTestIndexTool = new ESTestIndexTool(es, retry);
   const esTestIndexToolOutput = new ESTestIndexTool(es, retry, ES_TEST_OUTPUT_INDEX_NAME);
 
-  // Failing: See https://github.com/elastic/kibana/issues/126949
-  describe.skip('rule', async () => {
+  describe('rule', async () => {
     let endDate: string;
     let connectorId: string;
     const objectRemover = new ObjectRemover(supertest);
@@ -55,7 +54,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
       endDate = new Date(endDateMillis).toISOString();
 
       // write documents from now to the future end date in 3 groups
-      createEsDocumentsInGroups(3);
+      await createEsDocumentsInGroups(3);
     });
 
     afterEach(async () => {
@@ -102,9 +101,6 @@ export default function ruleTests({ getService }: FtrProviderContext) {
     });
 
     it('runs correctly: count grouped <= =>', async () => {
-      // create some more documents in the first group
-      createEsDocumentsInGroups(1);
-
       await createRule({
         name: 'never fire',
         aggType: 'count',
@@ -125,6 +121,9 @@ export default function ruleTests({ getService }: FtrProviderContext) {
         threshold: [0],
       });
 
+      // create some more documents in the first group
+      await createEsDocumentsInGroups(1);
+
       const docs = await waitForDocs(4);
       let inGroup0 = 0;
 
@@ -146,9 +145,6 @@ export default function ruleTests({ getService }: FtrProviderContext) {
     });
 
     it('runs correctly: sum all between', async () => {
-      // create some more documents in the first group
-      createEsDocumentsInGroups(1);
-
       await createRule({
         name: 'never fire',
         aggType: 'sum',
@@ -167,6 +163,9 @@ export default function ruleTests({ getService }: FtrProviderContext) {
         threshold: [0, 1000000],
       });
 
+      // create some more documents in the first group
+      await createEsDocumentsInGroups(1);
+
       const docs = await waitForDocs(2);
       for (const doc of docs) {
         const { name, message } = doc._source.params;
@@ -180,9 +179,6 @@ export default function ruleTests({ getService }: FtrProviderContext) {
     });
 
     it('runs correctly: avg all', async () => {
-      // create some more documents in the first group
-      createEsDocumentsInGroups(1);
-
       // this never fires because of bad fields error
       await createRule({
         name: 'never fire',
@@ -203,6 +199,9 @@ export default function ruleTests({ getService }: FtrProviderContext) {
         threshold: [0],
       });
 
+      // create some more documents in the first group
+      await createEsDocumentsInGroups(1);
+
       const docs = await waitForDocs(4);
       for (const doc of docs) {
         const { name, message } = doc._source.params;
@@ -216,9 +215,6 @@ export default function ruleTests({ getService }: FtrProviderContext) {
     });
 
     it('runs correctly: max grouped', async () => {
-      // create some more documents in the first group
-      createEsDocumentsInGroups(1);
-
       await createRule({
         name: 'never fire',
         aggType: 'max',
@@ -241,6 +237,9 @@ export default function ruleTests({ getService }: FtrProviderContext) {
         threshold: [0],
       });
 
+      // create some more documents in the first group
+      await createEsDocumentsInGroups(1);
+
       const docs = await waitForDocs(4);
       let inGroup2 = 0;
 
@@ -262,9 +261,6 @@ export default function ruleTests({ getService }: FtrProviderContext) {
     });
 
     it('runs correctly: min grouped', async () => {
-      // create some more documents in the first group
-      createEsDocumentsInGroups(1);
-
       await createRule({
         name: 'never fire',
         aggType: 'min',
@@ -287,6 +283,9 @@ export default function ruleTests({ getService }: FtrProviderContext) {
         threshold: [0],
       });
 
+      // create some more documents in the first group
+      await createEsDocumentsInGroups(1);
+
       const docs = await waitForDocs(4);
       let inGroup0 = 0;
 
@@ -316,9 +315,11 @@ export default function ruleTests({ getService }: FtrProviderContext) {
         groupBy: 'all',
         thresholdComparator: '<',
         threshold: [10],
-        timeWindowSize: 60,
+        notifyWhen: 'onActionGroupChange',
       });
 
+      await waitForDocs(1);
+
       await createEsDocumentsInGroups(1);
 
       const docs = await waitForDocs(2);
@@ -334,7 +335,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
       expect(activeGroup).to.be('all documents');
       expect(activeTitle).to.be('alert fire then recovers group all documents met threshold');
       expect(activeMessage).to.match(
-        /alert 'fire then recovers' is active for group \'all documents\':\n\n- Value: \d+\n- Conditions Met: count is less than 10 over 60s\n- Timestamp: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
+        /alert 'fire then recovers' is active for group \'all documents\':\n\n- Value: \d+\n- Conditions Met: count is less than 10 over 15s\n- Timestamp: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
       );
 
       const recoveredDoc = docs[1];
@@ -349,7 +350,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
       expect(recoveredGroup).to.be('all documents');
       expect(recoveredTitle).to.be('alert fire then recovers group all documents recovered');
       expect(recoveredMessage).to.match(
-        /alert 'fire then recovers' is recovered for group \'all documents\':\n\n- Value: \d+\n- Conditions Met: count is NOT less than 10 over 60s\n- Timestamp: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
+        /alert 'fire then recovers' is recovered for group \'all documents\':\n\n- Value: \d+\n- Conditions Met: count is NOT less than 10 over 15s\n- Timestamp: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
       );
     });
 
@@ -383,6 +384,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
       termSize?: number;
       thresholdComparator: string;
       threshold: number[];
+      notifyWhen?: string;
     }
 
     async function createRule(params: CreateRuleParams): Promise<string> {
@@ -441,7 +443,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
           rule_type_id: RULE_TYPE_ID,
           schedule: { interval: `${RULE_INTERVAL_SECONDS}s` },
           actions: [action, recoveryAction],
-          notify_when: 'onActiveAlert',
+          notify_when: params.notifyWhen || 'onActiveAlert',
           params: {
             index: ES_TEST_INDEX_NAME,
             timeField: params.timeField || 'date',
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
index ba063044d9233..943682d185cd6 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
@@ -33,6 +33,7 @@ export async function createEsDocuments(
 ) {
   const endDateMillis = Date.parse(endDate) - intervalMillis / 2;
 
+  const promises: Array<Promise<unknown>> = [];
   times(intervals, (interval) => {
     const date = endDateMillis - interval * intervalMillis;
 
@@ -41,9 +42,10 @@ export async function createEsDocuments(
 
     // don't need await on these, wait at the end of the function
     times(groups, (group) => {
-      createEsDocument(es, date, testedValue + group, `group-${group}`);
+      promises.push(createEsDocument(es, date, testedValue + group, `group-${group}`));
     });
   });
+  await Promise.all(promises);
 
   const totalDocuments = intervals * groups;
   await esTestIndexTool.waitForDocs(DOCUMENT_SOURCE, DOCUMENT_REFERENCE, totalDocuments);
@@ -67,6 +69,7 @@ async function createEsDocument(
   const response = await es.index({
     id: uuid(),
     index: ES_TEST_INDEX_NAME,
+    refresh: 'wait_for',
     body: document,
   });
   // console.log(`writing document to ${ES_TEST_INDEX_NAME}:`, JSON.stringify(document, null, 4));
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
index 741f198607c3e..979f91266afcc 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { TimeSeriesQuery } from '@kbn/triggers-actions-ui-plugin/server';
 import { Spaces } from '../../../../scenarios';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 import { ESTestIndexTool, ES_TEST_INDEX_NAME, getUrlPrefix } from '../../../../../common/lib';
-import { TimeSeriesQuery } from '../../../../../../../plugins/triggers_actions_ui/server';
 
 import { createEsDocuments } from './create_test_data';
 
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 bda5778c2ce1c..143d845d074c4 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,8 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
+import { RawRule } from '@kbn/alerting-plugin/server/types';
 import { Spaces } from '../../scenarios';
 import {
   checkAAD,
@@ -17,7 +18,6 @@ import {
   TaskManagerDoc,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { RawRule } from '../../../../../plugins/alerting/server/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function createAlertTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts
index ac095fd4c4419..008761b3a5d62 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts
@@ -7,6 +7,8 @@
 
 import expect from '@kbn/expect';
 import { flatten } from 'lodash';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
+import { DEFAULT_MAX_EPHEMERAL_ACTIONS_PER_ALERT } from '@kbn/alerting-plugin/server/config';
 import { Spaces } from '../../scenarios';
 import {
   getUrlPrefix,
@@ -17,8 +19,6 @@ import {
   ES_TEST_INDEX_NAME,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
-import { DEFAULT_MAX_EPHEMERAL_ACTIONS_PER_ALERT } from '../../../../../plugins/alerting/server/config';
 
 // eslint-disable-next-line import/no-default-export
 export default function createNotifyWhenTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
index b1a2155ef9f91..909b3315600c2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import uuid from 'uuid';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import {
   getUrlPrefix,
@@ -16,7 +17,6 @@ import {
   ESTestIndexTool,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
index 6d7f95df10d9b..c65ffb1bef5ac 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import { getUrlPrefix, getTestRuleData, ObjectRemover, getEventLog } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 // eslint-disable-next-line import/no-default-export
 export default function eventLogAlertTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_execution_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_execution_log.ts
index 7b4463996edf3..5e9387ad4f0f9 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_execution_log.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_execution_log.ts
@@ -94,7 +94,7 @@ export default function createGetExecutionLogTests({ getService }: FtrProviderCo
         expect(log.num_new_alerts).to.equal(0);
         expect(log.num_recovered_alerts).to.equal(0);
         expect(log.num_triggered_actions).to.equal(0);
-        expect(log.num_scheduled_actions).to.equal(0);
+        expect(log.num_generated_actions).to.equal(0);
         expect(log.num_succeeded_actions).to.equal(0);
         expect(log.num_errored_actions).to.equal(0);
 
@@ -195,7 +195,7 @@ export default function createGetExecutionLogTests({ getService }: FtrProviderCo
         expect(log.num_new_alerts).to.equal(0);
         expect(log.num_recovered_alerts).to.equal(0);
         expect(log.num_triggered_actions).to.equal(0);
-        expect(log.num_scheduled_actions).to.equal(0);
+        expect(log.num_generated_actions).to.equal(0);
         expect(log.num_succeeded_actions).to.equal(0);
         expect(log.num_errored_actions).to.equal(0);
 
@@ -350,7 +350,7 @@ export default function createGetExecutionLogTests({ getService }: FtrProviderCo
         expect(log.num_new_alerts).to.equal(1);
         expect(log.num_recovered_alerts).to.equal(0);
         expect(log.num_triggered_actions).to.equal(1);
-        expect(log.num_scheduled_actions).to.equal(1);
+        expect(log.num_generated_actions).to.equal(1);
         expect(log.num_succeeded_actions).to.equal(1);
         expect(log.num_errored_actions).to.equal(0);
       }
@@ -408,7 +408,7 @@ export default function createGetExecutionLogTests({ getService }: FtrProviderCo
         expect(log.num_new_alerts).to.equal(1);
         expect(log.num_recovered_alerts).to.equal(0);
         expect(log.num_triggered_actions).to.equal(1);
-        expect(log.num_scheduled_actions).to.equal(1);
+        expect(log.num_generated_actions).to.equal(1);
         expect(log.num_succeeded_actions).to.equal(0);
         expect(log.num_errored_actions).to.equal(1);
       }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts
index 23200cdab110a..33cb64dcdbed1 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { RawRule, RawRuleAction } from '@kbn/alerting-plugin/server/types';
+import { FILEBEAT_7X_INDICATOR_PATH } from '@kbn/alerting-plugin/server/saved_objects/migrations';
 import { getUrlPrefix } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import type { RawRule, RawRuleAction } from '../../../../../plugins/alerting/server/types';
-import { FILEBEAT_7X_INDICATOR_PATH } from '../../../../../plugins/alerting/server/saved_objects/migrations';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts
index 0364bd251a4c7..1bc267f86f073 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts
@@ -8,18 +8,18 @@
 import expect from '@kbn/expect';
 import { sample } from 'lodash';
 import { duration } from 'moment';
-import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { MlAnomalyDetectionAlertParams } from '@kbn/ml-plugin/common/types/alerts';
+import { ANOMALY_SCORE_MATCH_GROUP_ID } from '@kbn/ml-plugin/server/lib/alerts/register_anomaly_detection_alert_type';
+import { ML_ALERT_TYPES } from '@kbn/ml-plugin/common/constants/alerts';
+import { Spaces } from '../../../../scenarios';
 import {
   ES_TEST_INDEX_NAME,
   ESTestIndexTool,
   getUrlPrefix,
   ObjectRemover,
 } from '../../../../../common/lib';
-import { Spaces } from '../../../../scenarios';
-import { Datafeed, Job } from '../../../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { MlAnomalyDetectionAlertParams } from '../../../../../../../plugins/ml/common/types/alerts';
-import { ANOMALY_SCORE_MATCH_GROUP_ID } from '../../../../../../../plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type';
-import { ML_ALERT_TYPES } from '../../../../../../../plugins/ml/common/constants/alerts';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 const ACTION_TYPE_ID = '.index';
 const ALERT_TYPE_ID = ML_ALERT_TYPES.ANOMALY_DETECTION;
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts
index 5049f7c863a06..5024a1489f4c8 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import { getUrlPrefix, ObjectRemover, getTestRuleData, getEventLog } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 // eslint-disable-next-line import/no-default-export
 export default function createNotifyWhenTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts
index c5fb4ec61aa4f..c289be244ed3a 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 import {
   ES_TEST_INDEX_NAME,
@@ -14,7 +15,6 @@ import {
   ObjectRemover,
 } from '../../../../../common/lib';
 import { Spaces } from '../../../../scenarios';
-import { PutTransformsRequestSchema } from '../../../../../../../plugins/transform/common/api_schemas/transforms';
 
 const ACTION_TYPE_ID = '.index';
 const ALERT_TYPE_ID = 'transform_health';
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 3339484c2b9a2..289427971c44f 100644
--- a/x-pack/test/api_integration/apis/features/features/features.ts
+++ b/x-pack/test/api_integration/apis/features/features/features.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFeature } from '../../../../../plugins/features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 8cca6b589ef2b..e1bae98269d4e 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -8,11 +8,10 @@
 import moment from 'moment';
 import expect from '@kbn/expect';
 
+import { getDailyEvents } from '@kbn/lens-plugin/server/usage/task';
+import { getVisualizationCounts } from '@kbn/lens-plugin/server/usage/visualization_counts';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import { getDailyEvents } from '../../../../plugins/lens/server/usage/task';
-import { getVisualizationCounts } from '../../../../plugins/lens/server/usage/visualization_counts';
-
 const COMMON_HEADERS = {
   'kbn-xsrf': 'some-xsrf-token',
 };
diff --git a/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts b/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts
index 18f3a181dde53..43699de65e524 100644
--- a/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts
+++ b/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts
@@ -10,14 +10,14 @@ import sinon from 'sinon';
 import {
   executeAlert,
   executeRatioAlert,
-} from '../../../../plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor';
-import { DATES } from '../metrics_ui/constants';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/infra-plugin/server/lib/alerting/log_threshold/log_threshold_executor';
 import {
   Comparator,
   TimeUnit,
   RatioCriteria,
-} from '../../../../plugins/infra/common/alerting/logs/log_threshold/types';
+} from '@kbn/infra-plugin/common/alerting/logs/log_threshold/types';
+import { DATES } from '../metrics_ui/constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/logs_ui/log_views.ts b/x-pack/test/api_integration/apis/logs_ui/log_views.ts
index e2b316218c9fd..646d9fd3bb5e3 100644
--- a/x-pack/test/api_integration/apis/logs_ui/log_views.ts
+++ b/x-pack/test/api_integration/apis/logs_ui/log_views.ts
@@ -6,14 +6,14 @@
  */
 
 import expect from '@kbn/expect';
-import { defaultLogViewId, LogViewAttributes } from '../../../../plugins/infra/common/log_views';
+import { defaultLogViewId, LogViewAttributes } from '@kbn/infra-plugin/common/log_views';
 import {
   defaultSourceConfiguration,
   infraSourceConfigurationSavedObjectName,
   mergeSourceConfiguration,
-} from '../../../../plugins/infra/server/lib/sources';
-import { extractSavedObjectReferences } from '../../../../plugins/infra/server/lib/sources/saved_object_references';
-import { logViewSavedObjectName } from '../../../../plugins/infra/server/saved_objects/log_view';
+} from '@kbn/infra-plugin/server/lib/sources';
+import { extractSavedObjectReferences } from '@kbn/infra-plugin/server/lib/sources/saved_object_references';
+import { logViewSavedObjectName } from '@kbn/infra-plugin/server/saved_objects/log_view';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
index 1471cfed22b60..a17f22c245a4c 100644
--- a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
+import { CSV_QUOTE_VALUES_SETTING } from '@kbn/share-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { CSV_QUOTE_VALUES_SETTING } from '../../../../../../src/plugins/share/common/constants';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest: SuperTest<any> = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js
index 7f5df1e4632fa..d625c2a78f00e 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { FOLLOWER_INDEX_ADVANCED_SETTINGS } from '../../../../../plugins/cross_cluster_replication/common/constants';
+import { FOLLOWER_INDEX_ADVANCED_SETTINGS } from '@kbn/cross-cluster-replication-plugin/common/constants';
 import { getFollowerIndexPayload } from './fixtures';
 import { registerHelpers as registerElasticSearchHelpers } from './lib';
 import { registerHelpers as registerRemoteClustersHelpers } from './remote_clusters.helpers';
diff --git a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
index 8970e8cd642fd..cd3c63ab96f4a 100644
--- a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DataStream } from '@kbn/index-management-plugin/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 // @ts-ignore
 import { API_BASE_PATH } from './constants';
-import { DataStream } from '../../../../../plugins/index_management/common';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts b/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts
index 1677013dd5e7e..d9916da65fec2 100644
--- a/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts
+++ b/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
+import { SnapshotDetails } from '@kbn/snapshot-restore-plugin/common/types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { registerEsHelpers, SlmPolicy } from './lib';
-import { SnapshotDetails } from '../../../../../plugins/snapshot_restore/common/types';
 
 const REPO_NAME_1 = 'test_repo_1';
 const REPO_NAME_2 = 'test_another_repo_2';
diff --git a/x-pack/test/api_integration/apis/maps/get_grid_tile.js b/x-pack/test/api_integration/apis/maps/get_grid_tile.js
index ab8c86215a3a5..38b34257d06ae 100644
--- a/x-pack/test/api_integration/apis/maps/get_grid_tile.js
+++ b/x-pack/test/api_integration/apis/maps/get_grid_tile.js
@@ -192,5 +192,13 @@ export default function ({ getService }) {
         ],
       ]);
     });
+
+    it('should return error when index does not exist', async () => {
+      await supertest
+        .get(URL.replace('index=logstash-*', 'index=notRealIndex') + '&renderAs=point')
+        .set('kbn-xsrf', 'kibana')
+        .responseType('blob')
+        .expect(404);
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/maps/get_tile.js b/x-pack/test/api_integration/apis/maps/get_tile.js
index dd85fd094a804..9f85b6098f2be 100644
--- a/x-pack/test/api_integration/apis/maps/get_tile.js
+++ b/x-pack/test/api_integration/apis/maps/get_tile.js
@@ -84,5 +84,18 @@ export default function ({ getService }) {
         ],
       ]);
     });
+
+    it('should return error when index does not exist', async () => {
+      await supertest
+        .get(
+          `/api/maps/mvt/getTile/2/1/1.pbf\
+?geometryFieldName=geo.coordinates\
+&index=notRealIndex\
+&requestBody=(_source:!f,docvalue_fields:!(bytes,geo.coordinates,machine.os.raw,(field:'@timestamp',format:epoch_millis)),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:10000,stored_fields:!(bytes,geo.coordinates,machine.os.raw,'@timestamp'))`
+        )
+        .set('kbn-xsrf', 'kibana')
+        .responseType('blob')
+        .expect(404);
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/maps/maps_telemetry.ts b/x-pack/test/api_integration/apis/maps/maps_telemetry.ts
index 31ea0c35bba7f..34a7bbb1b2186 100644
--- a/x-pack/test/api_integration/apis/maps/maps_telemetry.ts
+++ b/x-pack/test/api_integration/apis/maps/maps_telemetry.ts
@@ -27,83 +27,81 @@ export default function ({ getService }: FtrProviderContext) {
       const mapUsage = apiResponse.stack_stats.kibana.plugins.maps;
       delete mapUsage.timeCaptured;
 
-      expect(mapUsage).eql({
-        geoShapeAggLayersCount: 1,
-        indexPatternsWithGeoFieldCount: 6,
-        indexPatternsWithGeoPointFieldCount: 4,
-        indexPatternsWithGeoShapeFieldCount: 2,
-        mapsTotalCount: 25,
-        basemaps: {},
-        joins: { term: { min: 1, max: 1, total: 3, avg: 0.12 } },
-        layerTypes: {
-          es_docs: { min: 1, max: 2, total: 17, avg: 0.68 },
-          es_agg_grids: { min: 1, max: 1, total: 6, avg: 0.24 },
-          es_point_to_point: { min: 1, max: 1, total: 1, avg: 0.04 },
-          es_top_hits: { min: 1, max: 1, total: 2, avg: 0.08 },
-          es_agg_heatmap: { min: 1, max: 1, total: 1, avg: 0.04 },
-          kbn_tms_raster: { min: 1, max: 1, total: 1, avg: 0.04 },
-          ems_basemap: { min: 1, max: 1, total: 1, avg: 0.04 },
-          ems_region: { min: 1, max: 1, total: 1, avg: 0.04 },
-        },
-        resolutions: {
-          coarse: { min: 1, max: 1, total: 4, avg: 0.16 },
-          super_fine: { min: 1, max: 1, total: 3, avg: 0.12 },
+      expect(mapUsage.geoShapeAggLayersCount).eql(1);
+      expect(mapUsage.indexPatternsWithGeoFieldCount).eql(6);
+      expect(mapUsage.indexPatternsWithGeoPointFieldCount).eql(4);
+      expect(mapUsage.indexPatternsWithGeoShapeFieldCount).eql(2);
+      expect(mapUsage.mapsTotalCount).eql(26);
+      expect(mapUsage.basemaps).eql({});
+      expect(mapUsage.joins).eql({ term: { min: 1, max: 1, total: 3, avg: 0.11538461538461539 } });
+      expect(mapUsage.layerTypes).eql({
+        es_docs: { min: 1, max: 2, total: 18, avg: 0.6923076923076923 },
+        es_agg_grids: { min: 1, max: 1, total: 6, avg: 0.23076923076923078 },
+        es_point_to_point: { min: 1, max: 1, total: 1, avg: 0.038461538461538464 },
+        es_top_hits: { min: 1, max: 1, total: 2, avg: 0.07692307692307693 },
+        es_agg_heatmap: { min: 1, max: 1, total: 1, avg: 0.038461538461538464 },
+        kbn_tms_raster: { min: 1, max: 1, total: 1, avg: 0.038461538461538464 },
+        ems_basemap: { min: 1, max: 1, total: 1, avg: 0.038461538461538464 },
+        ems_region: { min: 1, max: 1, total: 1, avg: 0.038461538461538464 },
+      });
+      expect(mapUsage.resolutions).eql({
+        coarse: { min: 1, max: 1, total: 4, avg: 0.15384615384615385 },
+        super_fine: { min: 1, max: 1, total: 3, avg: 0.11538461538461539 },
+      });
+      expect(mapUsage.scalingOptions).eql({
+        limit: { min: 1, max: 2, total: 14, avg: 0.5384615384615384 },
+        clusters: { min: 1, max: 1, total: 1, avg: 0.038461538461538464 },
+        mvt: { min: 1, max: 1, total: 3, avg: 0.11538461538461539 },
+      });
+      expect(mapUsage.attributesPerMap).eql({
+        dataSourcesCount: {
+          avg: 1.1538461538461537,
+          max: 5,
+          min: 1,
         },
-        scalingOptions: {
-          limit: { min: 1, max: 2, total: 14, avg: 0.56 },
-          clusters: { min: 1, max: 1, total: 1, avg: 0.04 },
-          mvt: { min: 1, max: 1, total: 2, avg: 0.08 },
+        emsVectorLayersCount: {
+          idThatDoesNotExitForEMSFileSource: {
+            avg: 0.038461538461538464,
+            max: 1,
+            min: 1,
+          },
         },
-        attributesPerMap: {
-          dataSourcesCount: {
-            avg: 1.16,
-            max: 5,
+        layerTypesCount: {
+          BLENDED_VECTOR: {
+            avg: 0.038461538461538464,
+            max: 1,
             min: 1,
           },
-          emsVectorLayersCount: {
-            idThatDoesNotExitForEMSFileSource: {
-              avg: 0.04,
-              max: 1,
-              min: 1,
-            },
+          EMS_VECTOR_TILE: {
+            avg: 0.038461538461538464,
+            max: 1,
+            min: 1,
           },
-          layerTypesCount: {
-            BLENDED_VECTOR: {
-              avg: 0.04,
-              max: 1,
-              min: 1,
-            },
-            EMS_VECTOR_TILE: {
-              avg: 0.04,
-              max: 1,
-              min: 1,
-            },
-            GEOJSON_VECTOR: {
-              avg: 0.84,
-              max: 4,
-              min: 1,
-            },
-            HEATMAP: {
-              avg: 0.04,
-              max: 1,
-              min: 1,
-            },
-            MVT_VECTOR: {
-              avg: 0.2,
-              max: 1,
-              min: 1,
-            },
-            RASTER_TILE: {
-              avg: 0.04,
-              max: 1,
-              min: 1,
-            },
+          GEOJSON_VECTOR: {
+            avg: 0.8076923076923077,
+            max: 4,
+            min: 1,
+          },
+          HEATMAP: {
+            avg: 0.038461538461538464,
+            max: 1,
+            min: 1,
           },
-          layersCount: {
-            avg: 1.2,
-            max: 6,
+          MVT_VECTOR: {
+            avg: 0.23076923076923078,
+            max: 1,
             min: 1,
           },
+          RASTER_TILE: {
+            avg: 0.038461538461538464,
+            max: 1,
+            min: 1,
+          },
+        },
+        layersCount: {
+          avg: 1.1923076923076923,
+          max: 6,
+          min: 1,
         },
       });
     });
diff --git a/x-pack/test/api_integration/apis/metrics_ui/http_source.ts b/x-pack/test/api_integration/apis/metrics_ui/http_source.ts
index f0eba78f90a02..1b298d79b8aa1 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/http_source.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/http_source.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { SourceResponse } from '../../../../plugins/infra/server/lib/sources';
+import { SourceResponse } from '@kbn/infra-plugin/server/lib/sources';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts b/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts
index 9867abcc67a7d..f924966146755 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts
@@ -10,8 +10,8 @@ import {
   LOG_ANALYSIS_VALIDATE_DATASETS_PATH,
   validateLogEntryDatasetsRequestPayloadRT,
   validateLogEntryDatasetsResponsePayloadRT,
-} from '../../../../plugins/infra/common/http_api/log_analysis/validation/datasets';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/log_analysis/validation/datasets';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts b/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts
index 75869e37199c5..b600ab0469b53 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts
@@ -6,18 +6,15 @@
  */
 
 import expect from '@kbn/expect';
-import type { Logger, LogMeta } from 'kibana/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 import sinon from 'sinon';
-import {
-  Comparator,
-  InventoryMetricConditions,
-} from '../../../../plugins/infra/common/alerting/metrics';
+import { Comparator, InventoryMetricConditions } from '@kbn/infra-plugin/common/alerting/metrics';
 import {
   InventoryItemType,
   SnapshotMetricType,
-} from '../../../../plugins/infra/common/inventory_models/types';
-import { evaluateCondition } from '../../../../plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition';
-import { InfraSource } from '../../../../plugins/infra/server/lib/sources';
+} from '@kbn/infra-plugin/common/inventory_models/types';
+import { evaluateCondition } from '@kbn/infra-plugin/server/lib/alerting/inventory_metric_threshold/evaluate_condition';
+import { InfraSource } from '@kbn/infra-plugin/server/lib/sources';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
index a6292769fc5a4..bd9a9a0e7c480 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
@@ -11,13 +11,13 @@ 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 '../../../../plugins/infra/common/runtime_types';
+import { createPlainError, throwErrors } from '@kbn/infra-plugin/common/runtime_types';
 
 import {
   LOG_ENTRIES_HIGHLIGHTS_PATH,
   logEntriesHighlightsRequestRT,
   logEntriesHighlightsResponseRT,
-} from '../../../../plugins/infra/common/http_api';
+} from '@kbn/infra-plugin/common/http_api';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts b/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts
index 3588bedc807be..4ac098f95764d 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts
@@ -13,13 +13,13 @@ 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 '../../../../plugins/infra/common/runtime_types';
+import { createPlainError, throwErrors } from '@kbn/infra-plugin/common/runtime_types';
 
 import {
   LOG_ENTRIES_SUMMARY_PATH,
   logEntriesSummaryRequestRT,
   logEntriesSummaryResponseRT,
-} from '../../../../plugins/infra/common/http_api/log_entries';
+} from '@kbn/infra-plugin/common/http_api/log_entries';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
index 5c57046db030b..5cdca5a369edf 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   InfraMetadata,
   InfraMetadataRequest,
-} from '../../../../plugins/infra/common/http_api/metadata_api';
+} from '@kbn/infra-plugin/common/http_api/metadata_api';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import { DATES } from './constants';
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts b/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
index 1accdaf49156b..9c9d4bd096a63 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
@@ -11,12 +11,12 @@ import {
   Comparator,
   CountMetricExpressionParams,
   NonCountMetricExpressionParams,
-} from '../../../../plugins/infra/common/alerting/metrics';
-import { InfraSource } from '../../../../plugins/infra/common/source_configuration/source_configuration';
+} from '@kbn/infra-plugin/common/alerting/metrics';
+import { InfraSource } from '@kbn/infra-plugin/common/source_configuration/source_configuration';
 import {
   EvaluatedRuleParams,
   evaluateRule,
-} from '../../../../plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule';
+} from '@kbn/infra-plugin/server/lib/alerting/metric_threshold/lib/evaluate_rule';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
index 1011a9ee95dba..5e0cff513002e 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
@@ -8,13 +8,13 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 
-import { InfraTimerangeInput } from '../../../../plugins/infra/common/http_api/snapshot_api';
-import { InventoryMetric } from '../../../../plugins/infra/common/inventory_models/types';
+import { InfraTimerangeInput } from '@kbn/infra-plugin/common/http_api/snapshot_api';
+import { InventoryMetric } from '@kbn/infra-plugin/common/inventory_models/types';
+import { NodeDetailsMetricDataResponse } from '@kbn/infra-plugin/common/http_api/node_details_api';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import { DATES } from './constants';
 
-import { NodeDetailsMetricDataResponse } from '../../../../plugins/infra/common/http_api/node_details_api';
 const { min, max } = DATES['7.0.0'].hosts;
 
 interface NodeDetailsRequest {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts
index 8b77bf7b1c089..7df64d9057a4d 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import moment from 'moment';
-import { MetricExpressionParams } from '../../../../plugins/infra/common/alerting/metrics';
-import { getElasticsearchMetricQuery } from '../../../../plugins/infra/server/lib/alerting/metric_threshold/lib/metric_query';
+import { MetricExpressionParams } from '@kbn/infra-plugin/common/alerting/metrics';
+import { getElasticsearchMetricQuery } from '@kbn/infra-plugin/server/lib/alerting/metric_threshold/lib/metric_query';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts
index 1eaae741f7e05..e5cd8babe8aff 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { first } from 'lodash';
 import moment from 'moment';
+import { metricsExplorerResponseRT } from '@kbn/infra-plugin/common/http_api/metrics_explorer';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { DATES } from './constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { metricsExplorerResponseRT } from '../../../../plugins/infra/common/http_api/metrics_explorer';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
 
 const { min, max } = DATES['7.0.0'].hosts;
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts
index ee73c9bd92a54..b3b3f53d6d6c3 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   TopNodesRequestRT,
   TopNodesResponseRT,
-} from '../../../../plugins/infra/common/http_api/overview_api';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/overview_api';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts
index bba38f622b0ab..87e736c0bc822 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   ProcessListAPIRequestRT,
   ProcessListAPIResponseRT,
-} from '../../../../plugins/infra/common/http_api/host_details/process_list';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/host_details/process_list';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts
index ba4d7123556c1..0884065f11520 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   ProcessListAPIChartRequestRT,
   ProcessListAPIChartResponseRT,
-} from '../../../../plugins/infra/common/http_api/host_details/process_list';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/host_details/process_list';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
index 4181344f064b9..d604dc69a87e9 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   SnapshotNodeResponse,
   SnapshotMetricInput,
   SnapshotRequest,
-} from '../../../../plugins/infra/common/http_api/snapshot_api';
+} from '@kbn/infra-plugin/common/http_api/snapshot_api';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/sources.ts b/x-pack/test/api_integration/apis/metrics_ui/sources.ts
index e9ea8f725073f..0ba6f49634b54 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/sources.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/sources.ts
@@ -11,7 +11,7 @@ import {
   MetricsSourceConfigurationResponse,
   PartialMetricsSourceConfigurationProperties,
   metricsSourceConfigurationResponseRT,
-} from '../../../../plugins/infra/common/metrics_sources';
+} from '@kbn/infra-plugin/common/metrics_sources';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts b/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts
index a3e072c79f916..db075a725b9f6 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ANNOTATION_TYPE } from '../../../../../plugins/ml/common/constants/annotations';
-import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
+import { ANNOTATION_TYPE } from '@kbn/ml-plugin/common/constants/annotations';
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 
 export const commonJobConfig = {
   description: 'test_job_annotation',
diff --git a/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts
index 07575891ba083..4e52f6e130484 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
 import { createJobConfig, createAnnotationRequestBody } from './common_jobs';
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts
index eb1318a2763e9..7227b33f05901 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { ANNOTATION_TYPE } from '@kbn/ml-plugin/common/constants/annotations';
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { ANNOTATION_TYPE } from '../../../../../plugins/ml/common/constants/annotations';
-import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
 import { testSetupJobConfigs, jobIds, testSetupAnnotations } from './common_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
index 7d8fd15681212..dbdf96821779d 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
index 54550c547521f..e5cd2295d0989 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
index 09e98d1430491..2fcdcdacfe927 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { JOB_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/calendars/helpers.ts b/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
index 3d60285bb5d23..e0cf79ae7ba83 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Calendar } from '../../../../../plugins/ml/server/models/calendar';
+import { Calendar } from '@kbn/ml-plugin/server/models/calendar';
 
 type ScheduledEvent = estypes.MlCalendarEvent;
 
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts
index 44c1b0c6fe2bb..22d01b3596af3 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts
index b2d306b923f1d..cee102eb4697a 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts
index 8b03c42caa787..1cd71bc016262 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts
index 31db3b645093b..6a5cb782ed651 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts
index 9faaa32441a30..bef0f56a77ac7 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts
index 8793376374693..431d249d95ee7 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts
@@ -6,12 +6,12 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
index 638e81cf88947..67a5dd3f37900 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts
index c9c54260a93c1..7a11ddb1de1b1 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
index c1a2ea32e942a..30a516a46ea18 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
index 3cc7a1f194409..565333adefaa1 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts
index 530661559dd2b..51a0c9743de4a 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts b/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts
index 8335bd73c1f3f..2ce349bde39ee 100644
--- a/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts
+++ b/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getJobConfig } from './index';
+import { getJobConfig } from '.';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts b/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts
index 2c79f02c75030..046aa248a1951 100644
--- a/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts
+++ b/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts
@@ -10,7 +10,7 @@ import { omit, keyBy } from 'lodash';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { getJobConfig } from './index';
+import { getJobConfig } from '.';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/validate.ts b/x-pack/test/api_integration/apis/ml/job_validation/validate.ts
index 4e335cdbd48d1..c65fd91c733e7 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/validate.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/validate.ts
@@ -10,7 +10,7 @@ import {
   basicValidJobMessages,
   basicInvalidJobMessages,
   nonBasicIssuesMessages,
-} from '../../../../../../x-pack/plugins/ml/common/constants/messages.test.mock';
+} from '@kbn/ml-plugin/common/constants/messages.test.mock';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
index e29ef5efd5192..62250c63fc000 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG, DATAFEED_CONFIG } from './common_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
index a3a6ad309cb31..5e291bac8d716 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts
index 2136e16e3c153..ce8c5648863af 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 export const SINGLE_METRIC_JOB_CONFIG: Job = {
diff --git a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts
index fae4c70666048..b331f5f10878c 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG, DATAFEED_CONFIG } from './common_jobs';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
index 9e282a4ef9a11..b1bbc4fcd22f3 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts
index f837f58543f5b..936a1547ea161 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG, DATAFEED_CONFIG } from './common_jobs';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
index 7af6a6f3ea1bc..55f6b70b8a5ab 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/modules/get_module.ts b/x-pack/test/api_integration/apis/ml/modules/get_module.ts
index 325e89dbb058a..2f0e2d3e9433a 100644
--- a/x-pack/test/api_integration/apis/ml/modules/get_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/get_module.ts
@@ -7,12 +7,11 @@
 
 import expect from '@kbn/expect';
 
+import { isPopulatedObject } from '@kbn/ml-plugin/common/util/object_utils';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
-import { isPopulatedObject } from '../../../../../plugins/ml/common/util/object_utils';
-
 const moduleIds = [
   'apache_data_stream',
   'apache_ecs',
diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
index c9a1c79c260fa..f09376212418a 100644
--- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
@@ -8,10 +8,9 @@
 import expect from '@kbn/expect';
 import { isEmpty, sortBy } from 'lodash';
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
+import { Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-
-import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
-import { Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts
index d062b1880e1bf..547d1bc469a11 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
index c63729cd7ac96..3a515321f1a3d 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { AnomalyCategorizerStatsDoc } from '@kbn/ml-plugin/common/types/anomalies';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { AnomalyCategorizerStatsDoc } from '../../../../../plugins/ml/common/types/anomalies';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts b/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
index a0dfa0e795f5a..3606677fc0a3e 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts b/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
index 3f410dc3ce3cd..ddcdf6244629d 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
index 2ce6e8da49797..f676ab68e7806 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
index 4ee7f6966b64a..c20348e63a028 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { MlSavedObjectType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { MlSavedObjectType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
index 11705b78c690b..53252ab4c5e4d 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { TrainedModelType } from '@kbn/ml-plugin/common/types/saved_objects';
+import { PutTrainedModelConfig } from '@kbn/ml-plugin/common/types/trained_models';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { TrainedModelType } from '../../../../../plugins/ml/common/types/saved_objects';
-import { PutTrainedModelConfig } from '../../../../../plugins/ml/common/types/trained_models';
 
 type ModelType = 'regression' | 'classification';
 
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/index.ts b/x-pack/test/api_integration/apis/ml/saved_objects/index.ts
index 3a30d1789fe9a..f1464095edffe 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/index.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/index.ts
@@ -12,9 +12,11 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./jobs_spaces'));
     loadTestFile(require.resolve('./can_delete_job'));
     loadTestFile(require.resolve('./can_delete_trained_model'));
-    loadTestFile(require.resolve('./initialize'));
+    loadTestFile(require.resolve('./initialize_jobs'));
+    loadTestFile(require.resolve('./initialize_trained_models'));
     loadTestFile(require.resolve('./status'));
-    loadTestFile(require.resolve('./sync'));
+    loadTestFile(require.resolve('./sync_jobs'));
+    loadTestFile(require.resolve('./sync_trained_models'));
     loadTestFile(require.resolve('./update_jobs_spaces'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts b/x-pack/test/api_integration/apis/ml/saved_objects/initialize_jobs.ts
similarity index 97%
rename from x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts
rename to x-pack/test/api_integration/apis/ml/saved_objects/initialize_jobs.ts
index e9a510b1ac2a2..2507a011e2035 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/initialize_jobs.ts
@@ -30,7 +30,7 @@ export default ({ getService }: FtrProviderContext) => {
     return body;
   }
 
-  describe('GET saved_objects/initialize', () => {
+  describe('GET saved_objects/initialize for AD and DFA jobs', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
 
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/initialize_trained_models.ts b/x-pack/test/api_integration/apis/ml/saved_objects/initialize_trained_models.ts
new file mode 100644
index 0000000000000..26acb658fa32f
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/initialize_trained_models.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { sortBy } from 'lodash';
+
+import { PutTrainedModelConfig } from '@kbn/ml-plugin/common/types/trained_models';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
+
+type ModelType = 'regression' | 'classification';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+  const spacesService = getService('spaces');
+  const supertest = getService('supertestWithoutAuth');
+
+  const dfaJobId1 = 'ihp_od_1';
+  const dfaJobIdStarSpace = 'ihp_od_2';
+  const idSpace1 = 'space1';
+  const idSpace2 = 'space2';
+  const modelIdSpace1 = 'dfa1_classification_model_n_0';
+  const modelIdSpace2 = 'dfa2_classification_model_n_0';
+  const modelIdStarSpace = 'dfa3_classification_model_n_0';
+
+  async function runRequest(user: USER, expectedStatusCode: number) {
+    const { body, status } = await supertest
+      .get(`/api/ml/saved_objects/initialize`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(COMMON_REQUEST_HEADERS);
+    ml.api.assertResponseStatusCode(expectedStatusCode, status, body);
+
+    return body;
+  }
+
+  function getTestModel(id: string, modelType: ModelType, jobId?: string) {
+    return {
+      model_id: id,
+      body: {
+        compressed_definition: ml.api.getCompressedModelDefinition(modelType),
+        inference_config: {
+          [modelType]: {},
+        },
+        ...(jobId ? { metadata: { analytics_config: { id: jobId } } } : {}),
+        input: {
+          field_names: ['common_field'],
+        },
+      } as PutTrainedModelConfig,
+    };
+  }
+
+  describe('GET saved_objects/initialize for trained models', () => {
+    before(async () => {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
+
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
+      await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] });
+
+      await ml.api.initSavedObjects();
+
+      await ml.api.createDataFrameAnalyticsJob(
+        ml.commonConfig.getDFAIhpOutlierDetectionJobConfig(dfaJobId1),
+        idSpace1
+      );
+      await ml.api.updateJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace2], [], idSpace1);
+      await ml.api.assertJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace1, idSpace2]);
+
+      await ml.api.createDataFrameAnalyticsJob(
+        ml.commonConfig.getDFAIhpOutlierDetectionJobConfig(dfaJobIdStarSpace),
+        idSpace1
+      );
+
+      await ml.api.updateJobSpaces(
+        dfaJobIdStarSpace,
+        'data-frame-analytics',
+        ['*'],
+        [idSpace1],
+        idSpace1
+      );
+      await ml.api.assertJobSpaces(dfaJobIdStarSpace, 'data-frame-analytics', ['*']);
+
+      await ml.testResources.setKibanaTimeZoneToUTC();
+    });
+
+    after(async () => {
+      await spacesService.delete(idSpace1);
+      await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
+    });
+
+    it('should initialize trained models and inherit job spaces', async () => {
+      // create trained model linked to job, it should inherit the jobs spaces
+      const model = getTestModel(modelIdSpace1, 'classification', dfaJobId1);
+      await ml.api.createTrainedModelES(model.model_id, model.body);
+
+      const body = await runRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+
+      expect(body).to.have.property('trainedModels');
+      expect(body.trainedModels).to.eql([{ id: modelIdSpace1 }]);
+      expect(body).to.have.property('success', true);
+      await ml.api.assertTrainedModelSpaces(modelIdSpace1, [idSpace1, idSpace2]);
+    });
+
+    it('should initialize trained models and inherit job star spaces', async () => {
+      // create trained model linked to job, it should inherit the jobs spaces
+      const model = getTestModel(modelIdStarSpace, 'classification', dfaJobIdStarSpace);
+      await ml.api.createTrainedModelES(model.model_id, model.body);
+
+      const body = await runRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+
+      expect(body).to.have.property('trainedModels');
+      expect(sortBy(body.trainedModels, 'id')).to.eql([{ id: modelIdStarSpace }]);
+      expect(body).to.have.property('success', true);
+      await ml.api.assertTrainedModelSpaces(modelIdStarSpace, ['*']);
+    });
+
+    it('should initialize trained models and not inherit spaces', async () => {
+      // create trained model not linked to job, it should have the current space
+      const model = getTestModel(modelIdSpace2, 'classification');
+      await ml.api.createTrainedModelES(model.model_id, model.body);
+
+      const body = await runRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+
+      expect(body).to.have.property('trainedModels');
+      expect(sortBy(body.trainedModels, 'id')).to.eql([{ id: modelIdSpace2 }]);
+      expect(body).to.have.property('success', true);
+      await ml.api.assertTrainedModelSpaces(modelIdSpace2, ['*']);
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/sync.ts b/x-pack/test/api_integration/apis/ml/saved_objects/sync_jobs.ts
similarity index 98%
rename from x-pack/test/api_integration/apis/ml/saved_objects/sync.ts
rename to x-pack/test/api_integration/apis/ml/saved_objects/sync_jobs.ts
index 149d75429d977..8f2dda89a8ab5 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/sync.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/sync_jobs.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import { cloneDeep } from 'lodash';
+import { MlSavedObjectType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { MlSavedObjectType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/sync_trained_models.ts b/x-pack/test/api_integration/apis/ml/saved_objects/sync_trained_models.ts
new file mode 100644
index 0000000000000..220bea2393ada
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/sync_trained_models.ts
@@ -0,0 +1,205 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { PutTrainedModelConfig } from '@kbn/ml-plugin/common/types/trained_models';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
+
+type ModelType = 'regression' | 'classification';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+  const spacesService = getService('spaces');
+  const supertest = getService('supertestWithoutAuth');
+
+  const dfaJobId1 = 'ihp_od_1';
+  const idSpace1 = 'space1';
+  const idSpace2 = 'space2';
+  const modelIdSpace1 = 'dfa1_classification_model_n_0';
+  const modelIdSpace2 = 'dfa2_classification_model_n_0';
+  const modelIdSpace3 = 'dfa3_classification_model_n_0';
+
+  async function runSyncRequest(user: USER, expectedStatusCode: number) {
+    const { body, status } = await supertest
+      .get(`/s/${idSpace1}/api/ml/saved_objects/sync`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(COMMON_REQUEST_HEADERS);
+    ml.api.assertResponseStatusCode(expectedStatusCode, status, body);
+
+    return body;
+  }
+
+  async function runSyncCheckRequest(user: USER, expectedStatusCode: number) {
+    const { body, status } = await supertest
+      .post(`/s/${idSpace1}/api/ml/saved_objects/sync_check`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(COMMON_REQUEST_HEADERS)
+      .send({ mlSavedObjectType: 'trained-model' });
+    ml.api.assertResponseStatusCode(expectedStatusCode, status, body);
+
+    return body;
+  }
+
+  function getTestModel(id: string, modelType: ModelType, jobId?: string) {
+    return {
+      model_id: id,
+      body: {
+        compressed_definition: ml.api.getCompressedModelDefinition(modelType),
+        inference_config: {
+          [modelType]: {},
+        },
+        ...(jobId ? { metadata: { analytics_config: { id: jobId } } } : {}),
+        input: {
+          field_names: ['common_field'],
+        },
+      } as PutTrainedModelConfig,
+    };
+  }
+
+  describe('GET saved_objects/sync', () => {
+    before(async () => {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
+    });
+
+    beforeEach(async () => {
+      await ml.api.initSavedObjects();
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
+      await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] });
+      await ml.testResources.setKibanaTimeZoneToUTC();
+    });
+
+    afterEach(async () => {
+      await spacesService.delete(idSpace1);
+      await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
+    });
+
+    it('should sync trained model saved objects', async () => {
+      // check to see if a sync is needed
+      const syncNeeded = await runSyncCheckRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      expect(syncNeeded.result).to.eql(false, 'sync should not be needed');
+
+      await ml.api.createDataFrameAnalyticsJob(
+        ml.commonConfig.getDFAIhpOutlierDetectionJobConfig(dfaJobId1),
+        idSpace1
+      );
+      await ml.api.updateJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace2], [], idSpace1);
+      await ml.api.assertJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace1, idSpace2]);
+
+      // create model in es, so saved object creation is needed
+      const model1 = getTestModel(modelIdSpace1, 'classification', dfaJobId1);
+      await ml.api.createTrainedModelES(model1.model_id, model1.body);
+
+      // create model via kibana, so saved object creation is not needed
+      const model2 = getTestModel(modelIdSpace2, 'classification', dfaJobId1);
+      await ml.api.createTrainedModel(model2.model_id, model2.body);
+
+      // create model via kibana, but then delete model in es
+      // so saved object needs removal
+      const model3 = getTestModel(modelIdSpace3, 'classification', dfaJobId1);
+      await ml.api.createTrainedModel(model3.model_id, model3.body);
+      await ml.api.deleteTrainedModelES(model3.model_id);
+
+      // check to see if a sync is needed
+      const syncNeeded2 = await runSyncCheckRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      expect(syncNeeded2.result).to.eql(true, 'sync should be needed');
+
+      // run the sync request and verify the response
+      const body = await runSyncRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+
+      expect(body).to.eql({
+        datafeedsAdded: {},
+        datafeedsRemoved: {},
+        savedObjectsCreated: {
+          'trained-model': {
+            [modelIdSpace1]: { success: true },
+          },
+        },
+        savedObjectsDeleted: {
+          'trained-model': { dfa3_classification_model_n_0: { success: true } },
+        },
+      });
+    });
+
+    it('should not sync anything if all objects are already synced', async () => {
+      // check to see if a sync is needed
+      const syncNeeded = await runSyncCheckRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      expect(syncNeeded.result).to.eql(false, 'sync should not be needed');
+
+      await ml.api.createDataFrameAnalyticsJob(
+        ml.commonConfig.getDFAIhpOutlierDetectionJobConfig(dfaJobId1),
+        idSpace1
+      );
+      await ml.api.updateJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace2], [], idSpace1);
+      await ml.api.assertJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace1, idSpace2]);
+
+      // create model in es, so saved object creation is needed
+      const model1 = getTestModel(modelIdSpace1, 'classification', dfaJobId1);
+      await ml.api.createTrainedModelES(model1.model_id, model1.body);
+
+      // create model via kibana, so saved object creation is not needed
+      const model2 = getTestModel(modelIdSpace2, 'classification', dfaJobId1);
+      await ml.api.createTrainedModel(model2.model_id, model2.body);
+
+      // create model via kibana, but then delete model in es
+      // so saved object needs removal
+      const model3 = getTestModel(modelIdSpace3, 'classification', dfaJobId1);
+      await ml.api.createTrainedModel(model3.model_id, model3.body);
+      await ml.api.deleteTrainedModelES(model3.model_id);
+
+      // check to see if a sync is needed
+      const syncNeeded2 = await runSyncCheckRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      expect(syncNeeded2.result).to.eql(true, 'sync should be needed');
+
+      // run the sync request and verify the response
+      await runSyncRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      const body = await runSyncRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+
+      expect(body).to.eql({
+        datafeedsAdded: {},
+        datafeedsRemoved: {},
+        savedObjectsCreated: {},
+        savedObjectsDeleted: {},
+      });
+    });
+
+    it('sync should have assigned the correct spaces to saved objects', async () => {
+      // check to see if a sync is needed
+      const syncNeeded = await runSyncCheckRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      expect(syncNeeded.result).to.eql(false, 'sync should not be needed');
+
+      await ml.api.createDataFrameAnalyticsJob(
+        ml.commonConfig.getDFAIhpOutlierDetectionJobConfig(dfaJobId1),
+        idSpace1
+      );
+      await ml.api.updateJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace2], [], idSpace1);
+      await ml.api.assertJobSpaces(dfaJobId1, 'data-frame-analytics', [idSpace1, idSpace2]);
+
+      // create trained model linked to job, it should inherit the jobs spaces
+      const model1 = getTestModel(modelIdSpace1, 'classification', dfaJobId1);
+      await ml.api.createTrainedModelES(model1.model_id, model1.body);
+
+      // create trained model not linked to job, it should have the current space
+      const model2 = getTestModel(modelIdSpace2, 'classification');
+      await ml.api.createTrainedModelES(model2.model_id, model2.body);
+
+      // check to see if a sync is needed
+      const syncNeeded2 = await runSyncCheckRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+      expect(syncNeeded2.result).to.eql(true, 'sync should be needed');
+
+      // run the sync request and verify the response
+      await runSyncRequest(USER.ML_POWERUSER_ALL_SPACES, 200);
+
+      await ml.api.assertTrainedModelSpaces(modelIdSpace1, [idSpace1, idSpace2]);
+      await ml.api.assertTrainedModelSpaces(modelIdSpace2, [idSpace1]);
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
index 5d3f113c663ff..079b1b32f10b9 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { JobType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/system/capabilities.ts b/x-pack/test/api_integration/apis/ml/system/capabilities.ts
index 9d5d5a355e7c6..c231d87866c4e 100644
--- a/x-pack/test/api_integration/apis/ml/system/capabilities.ts
+++ b/x-pack/test/api_integration/apis/ml/system/capabilities.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
 
 const NUMBER_OF_CAPABILITIES = 36;
 
diff --git a/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts b/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts
index 23b36a2601c09..234de19dfd79b 100644
--- a/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts
+++ b/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
 
 const idSpaceWithMl = 'space_with_ml';
 const idSpaceNoMl = 'space_no_ml';
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance.js b/x-pack/test/api_integration/apis/monitoring/apm/instance.js
index 229cc05a58a1b..b2b7d67062535 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instance.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instance.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmInstanceFixture from './fixtures/instance';
+import apmInstanceFixture from './fixtures/instance.json';
 
 export default function ({ getService }) {
   // Skipping for now since failure is unclear
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
index 37e17fce25b64..4ab87ffdc7d51 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmInstanceFixture from './fixtures/instance';
+import apmInstanceFixture from './fixtures/instance.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview.js b/x-pack/test/api_integration/apis/monitoring/apm/overview.js
index afa8d55f28adc..543cb153927fa 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmClusterFixture from './fixtures/cluster';
+import apmClusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js
index 8aef96ab1d9e6..2c56416fb230c 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmClusterFixture from './fixtures/cluster';
+import apmClusterFixture from './fixtures/cluster.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/detail.js b/x-pack/test/api_integration/apis/monitoring/beats/detail.js
index 2a347f448f188..8a456410694b8 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatDetailFixture from './fixtures/detail';
+import beatDetailFixture from './fixtures/detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js
index a7f6ebda90feb..7bad06ac7df17 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatDetailFixture from './fixtures/detail';
+import beatDetailFixture from './fixtures/detail.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/overview.js b/x-pack/test/api_integration/apis/monitoring/beats/overview.js
index ce8b6cb317768..b2f002b00af1c 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatsClusterFixture from './fixtures/cluster';
+import beatsClusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js
index c168443f3e778..9be0d00a34f0a 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatsClusterFixture from './fixtures/cluster';
+import beatsClusterFixture from './fixtures/cluster.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/list.js b/x-pack/test/api_integration/apis/monitoring/cluster/list.js
index 686b63b6e7562..6859f13b7b66a 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/list.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/list.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import multiclusterFixture from './fixtures/multicluster';
+import multiclusterFixture from './fixtures/multicluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js b/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js
index a92dd9fd30658..13b5310bc1fe6 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import multiclusterFixture from './fixtures/multicluster';
+import multiclusterFixture from './fixtures/multicluster.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
index 02bf91357ed4b..3f3ad9ce30f9e 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js
index 65243499ce8b8..5ca42e46f2008 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
index a34473501c2e2..22c7706b9a32f 100644
--- a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
+++ b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 import { get } from 'lodash';
-import * as esMetrics from '../../../../../plugins/monitoring/server/lib/metrics/elasticsearch/metrics';
-import * as kibanaMetrics from '../../../../../plugins/monitoring/server/lib/metrics/kibana/metrics';
-import * as logstashMetrics from '../../../../../plugins/monitoring/server/lib/metrics/logstash/metrics';
-import * as beatsMetrics from '../../../../../plugins/monitoring/server/lib/metrics/beats/metrics';
-import * as apmMetrics from '../../../../../plugins/monitoring/server/lib/metrics/apm/metrics';
+import * as esMetrics from '@kbn/monitoring-plugin/server/lib/metrics/elasticsearch/metrics';
+import * as kibanaMetrics from '@kbn/monitoring-plugin/server/lib/metrics/kibana/metrics';
+import * as logstashMetrics from '@kbn/monitoring-plugin/server/lib/metrics/logstash/metrics';
+import * as beatsMetrics from '@kbn/monitoring-plugin/server/lib/metrics/beats/metrics';
+import * as apmMetrics from '@kbn/monitoring-plugin/server/lib/metrics/apm/metrics';
 
 export default function ({ getService }) {
   const es = getService('es');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
index 870bfb31a50e5..0d4c29ede6980 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import ccrFixture from './fixtures/ccr';
+import ccrFixture from './fixtures/ccr.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js
index 5ab23f20d7724..d7b2b2b13d9d2 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import ccrFixture from './fixtures/ccr';
+import ccrFixture from './fixtures/ccr.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js
index a4bca9798b178..5e42cca12a261 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import ccrShardFixture from './fixtures/ccr_shard';
+import ccrShardFixture from './fixtures/ccr_shard.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js
index dd20b9ed4b091..532a3b298f9b1 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash';
 import expect from '@kbn/expect';
-import ccrShardFixture from './fixtures/ccr_shard';
+import ccrShardFixture from './fixtures/ccr_shard.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js
index e243c3a372f7b..699a69c625b27 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import indexDetailFixture from './fixtures/index_detail';
-import indexDetailAdvancedFixture from './fixtures/index_detail_advanced';
+import indexDetailFixture from './fixtures/index_detail.json';
+import indexDetailAdvancedFixture from './fixtures/index_detail_advanced.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js
index 5e2aded61cd40..2bce60939b5f4 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import indexDetailFixture from './fixtures/index_detail';
-import indexDetailAdvancedFixture from './fixtures/index_detail_advanced';
+import indexDetailFixture from './fixtures/index_detail.json';
+import indexDetailAdvancedFixture from './fixtures/index_detail_advanced.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
index 0b94aaa9f27da..a443ce0a525d5 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import relocatingShardsFixture from './fixtures/indices_shards_relocating';
-import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all';
-import indicesRedClusterFixture from './fixtures/indices_red_cluster';
-import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all';
+import relocatingShardsFixture from './fixtures/indices_shards_relocating.json';
+import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all.json';
+import indicesRedClusterFixture from './fixtures/indices_red_cluster.json';
+import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js
index 0aafc8e908d8d..dcd8dbb77a213 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import relocatingShardsFixture from './fixtures/indices_shards_relocating';
-import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all';
-import indicesRedClusterFixture from './fixtures/indices_red_cluster';
-import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all';
+import relocatingShardsFixture from './fixtures/indices_shards_relocating.json';
+import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all.json';
+import indicesRedClusterFixture from './fixtures/indices_red_cluster.json';
+import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js
index 266b805a258e7..1ae82990a8bee 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
+import nodeDetailFixture from './fixtures/node_detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js
index 90c6b6b25f4b0..1ed6a4e736608 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail_advanced.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js
index 29069a9e28d78..9f20bce50f9b1 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail_advanced.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js
index 7c767838f6aa9..c978424951d9e 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
+import nodeDetailFixture from './fixtures/node_detail.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
index e437fd707e763..4b6d1c9eab401 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import nodesListingFixtureGreen from './fixtures/nodes_listing_green';
-import nodesListingFixtureRed from './fixtures/nodes_listing_red';
-import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup';
-import nodesListingFixturePagination from './fixtures/nodes_listing_pagination';
+import nodesListingFixtureGreen from './fixtures/nodes_listing_green.json';
+import nodesListingFixtureRed from './fixtures/nodes_listing_red.json';
+import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup.json';
+import nodesListingFixturePagination from './fixtures/nodes_listing_pagination.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js
index 36d3870cc4562..accc064e14a84 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import nodesListingFixtureGreen from './fixtures/nodes_listing_green';
-import nodesListingFixtureRed from './fixtures/nodes_listing_red';
-import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup';
-import nodesListingFixturePagination from './fixtures/nodes_listing_pagination';
+import nodesListingFixtureGreen from './fixtures/nodes_listing_green.json';
+import nodesListingFixtureRed from './fixtures/nodes_listing_red.json';
+import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup.json';
+import nodesListingFixturePagination from './fixtures/nodes_listing_pagination.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
index 1f023401fbe2e..4d8e2d20d88b9 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum';
-import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum';
-import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating';
+import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum.json';
+import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum.json';
+import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js
index 5760f6e5241cf..870406f3bb469 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum';
-import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum';
-import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating';
+import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum.json';
+import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum.json';
+import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
index 9827c1d888a7e..af7a360ec1bd8 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import instanceFixture from './fixtures/instance';
+import instanceFixture from './fixtures/instance.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js
index f0e73ca9ce537..8ad6f32c2c564 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { normalizeDataTypeDifferences } from '../normalize_data_type_differences';
-import instanceFixture from './fixtures/instance';
+import instanceFixture from './fixtures/instance.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
index 1a5f71150b1d8..ac683a12710ba 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import listingFixture from './fixtures/listing';
+import listingFixture from './fixtures/listing.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js
index 0cef32c560d9c..2876cc29dcccf 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import listingFixture from './fixtures/listing';
+import listingFixture from './fixtures/listing.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
index 23a783d58d2d8..4887e7b62b246 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js
index a08f378b92a15..ca755c742e0b0 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { normalizeDataTypeDifferences } from '../normalize_data_type_differences';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
index 507448a73bdf9..bd12ff4f7e01b 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import clusterFixture from './fixtures/cluster';
+import clusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js b/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js
index cd0dac1cb5f0c..d74554d62ff16 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import indexDetailFixture from './fixtures/index_detail';
+import indexDetailFixture from './fixtures/index_detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js b/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js
index e2d8db4d587ba..251ddbbd4b816 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import multipleClustersFixture from './fixtures/multiple_clusters';
+import multipleClustersFixture from './fixtures/multiple_clusters.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js b/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js
index 3888f3995df36..a6cf9801980c4 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
+import nodeDetailFixture from './fixtures/node_detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
index 801cc55ffbcad..aad42340f0e53 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/multicluster_pipelines';
+import fixture from './fixtures/multicluster_pipelines.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js
index 4c5f3ddb5a20f..521731c920a6f 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/multicluster_pipelines';
+import fixture from './fixtures/multicluster_pipelines.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js
index a9a12d2f2c853..f234b5019edc8 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
-import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail.json';
+import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js
index 08c9db594937f..ad4fdcb462fd9 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { normalizeDataTypeDifferences } from '../normalize_data_type_differences';
-import nodeDetailFixture from './fixtures/node_detail';
-import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail.json';
+import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
index 8911f5f77c3a8..da287e37ea37f 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodesFixture from './fixtures/nodes';
+import nodesFixture from './fixtures/nodes.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js
index 35d3487f1bce7..aac85aff13041 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodesFixture from './fixtures/nodes';
+import nodesFixture from './fixtures/nodes.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
index 7378c37a97357..f64ab3c700cd5 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import pipelinesFixture from './fixtures/pipelines';
+import pipelinesFixture from './fixtures/pipelines.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js
index f1cbc25d6ed9a..7081af982d237 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import pipelinesFixture from './fixtures/pipelines';
+import pipelinesFixture from './fixtures/pipelines.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js
index 744934c1b315f..23718f59feb0f 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_apm';
+import fixture from './fixtures/detect_apm.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js
index 542ee98f3d23d..3945289a242e3 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_beats';
+import fixture from './fixtures/detect_beats.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js
index de805a05af13f..1cb4097b43e5c 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_beats_management';
+import fixture from './fixtures/detect_beats_management.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js
index c7f33061c41c1..e32c86ef126f9 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_logstash';
+import fixture from './fixtures/detect_logstash.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js
index f85636b01dfa3..6f18c74cc8aee 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_logstash_management';
+import fixture from './fixtures/detect_logstash_management.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js
index c6b00d77199ea..56af7410ecd09 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_mb';
+import fixture from './fixtures/es_and_kibana_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js
index 58a8dbc558a0e..482a3173a92f4 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_exclusive_mb';
+import fixture from './fixtures/es_and_kibana_exclusive_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js
index 81467301e7b5f..14d6cefb8e6e3 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_exclusive_mb';
+import fixture from './fixtures/es_and_kibana_exclusive_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js
index c9bd3a4255cc7..53035670753fc 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_mb';
+import fixture from './fixtures/es_and_kibana_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js
index bb4a66e274886..b71e40759a833 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_mb';
+import fixture from './fixtures/kibana_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js
index a730dbe238d6e..4adb8272b1735 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_exclusive_mb';
+import fixture from './fixtures/kibana_exclusive_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js
index 9bdc00179d3ee..85d7775dd6254 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_exclusive_mb';
+import fixture from './fixtures/kibana_exclusive_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js
index 450a8eb571996..1502512352421 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_mb';
+import fixture from './fixtures/kibana_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js
index 2ed84ebf76ecf..4653e7232b920 100644
--- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js
+++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import clusterFixture from './fixtures/cluster';
+import clusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js
index 3b6ccffe63998..ee538544177d3 100644
--- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js
+++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import clustersFixture from './fixtures/clusters';
+import clustersFixture from './fixtures/clusters.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/search/session.ts b/x-pack/test/api_integration/apis/search/session.ts
index 2c8a03ddbc4f2..8a7b3f330bcf8 100644
--- a/x-pack/test/api_integration/apis/search/session.ts
+++ b/x-pack/test/api_integration/apis/search/session.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { SearchSessionStatus } from '../../../../../src/plugins/data/common';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index ecf37477831a9..61ac283dfea34 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -8,7 +8,7 @@
 import util from 'util';
 import { isEqual, isEqualWith } from 'lodash';
 import expect from '@kbn/expect';
-import { RawKibanaPrivileges } from '../../../../plugins/security/common/model';
+import { RawKibanaPrivileges } from '@kbn/security-plugin/common/model';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security_solution/authentications.ts b/x-pack/test/api_integration/apis/security_solution/authentications.ts
index 920be90ba4227..aa098648d86fd 100644
--- a/x-pack/test/api_integration/apis/security_solution/authentications.ts
+++ b/x-pack/test/api_integration/apis/security_solution/authentications.ts
@@ -12,7 +12,7 @@ import {
   UserAuthenticationsRequestOptions,
   UserAuthenticationsStrategyResponse,
   UsersQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts b/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
index e9c00318592c5..67341c0dccb99 100644
--- a/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
+++ b/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 
+import { APP_ID } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   createUsersAndRoles,
@@ -20,7 +21,6 @@ import {
   getCase,
 } from '../../../cases_api_integration/common/lib/utils';
 import { getPostCaseRequest } from '../../../cases_api_integration/common/lib/mock';
-import { APP_ID } from '../../../../plugins/security_solution/common/constants';
 
 const secAll: Role = {
   name: 'sec_all_role',
diff --git a/x-pack/test/api_integration/apis/security_solution/events.ts b/x-pack/test/api_integration/apis/security_solution/events.ts
index fef37e9939fcb..7072ee0fafa71 100644
--- a/x-pack/test/api_integration/apis/security_solution/events.ts
+++ b/x-pack/test/api_integration/apis/security_solution/events.ts
@@ -12,7 +12,7 @@ import {
   Direction,
   TimelineEventsQueries,
   TimelineEventsAllStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { getDocValueFields, getFieldsToRequest, getFilterValue } from './utils';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/host_details.ts b/x-pack/test/api_integration/apis/security_solution/host_details.ts
index d2de0f84a3769..6a28dba22b0ab 100644
--- a/x-pack/test/api_integration/apis/security_solution/host_details.ts
+++ b/x-pack/test/api_integration/apis/security_solution/host_details.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   HostDetailsStrategyResponse,
   HostsQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/hosts.ts b/x-pack/test/api_integration/apis/security_solution/hosts.ts
index bb2969f85a98b..653434f5fb25b 100644
--- a/x-pack/test/api_integration/apis/security_solution/hosts.ts
+++ b/x-pack/test/api_integration/apis/security_solution/hosts.ts
@@ -13,7 +13,7 @@ import {
   HostsStrategyResponse,
   HostDetailsStrategyResponse,
   HostFirstLastSeenStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts
index f38cf406a9dbe..8d6f5520d884b 100644
--- a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts
+++ b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts
@@ -11,7 +11,7 @@ import {
   HostsKpiHostsStrategyResponse,
   HostsKpiQueries,
   HostsKpiUniqueIpsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts
index 637b69ff1daaa..8c9e3e3229585 100644
--- a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts
+++ b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts
@@ -6,7 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   NetworkKpiDnsStrategyResponse,
   NetworkKpiNetworkEventsStrategyResponse,
@@ -14,7 +13,8 @@ import {
   NetworkKpiTlsHandshakesStrategyResponse,
   NetworkKpiUniqueFlowsStrategyResponse,
   NetworkKpiUniquePrivateIpsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts b/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts
index 24cf4699d952c..543c20fd95e45 100644
--- a/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts
+++ b/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts
@@ -11,7 +11,7 @@ import {
   MatrixHistogramQuery,
   MatrixHistogramType,
   NetworkDnsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -20,7 +20,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const bsearch = getService('bsearch');
 
-  describe('Matrix DNS Histogram', () => {
+  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/130692
+  describe.skip('Matrix DNS Histogram', () => {
     describe('Large data set', () => {
       before(
         async () =>
diff --git a/x-pack/test/api_integration/apis/security_solution/network_details.ts b/x-pack/test/api_integration/apis/security_solution/network_details.ts
index 07e526c7c4bf5..c1cbcb6469d9f 100644
--- a/x-pack/test/api_integration/apis/security_solution/network_details.ts
+++ b/x-pack/test/api_integration/apis/security_solution/network_details.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   NetworkDetailsStrategyResponse,
   NetworkQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/network_dns.ts b/x-pack/test/api_integration/apis/security_solution/network_dns.ts
index 474c6261babf0..ed3be02d8cc29 100644
--- a/x-pack/test/api_integration/apis/security_solution/network_dns.ts
+++ b/x-pack/test/api_integration/apis/security_solution/network_dns.ts
@@ -12,7 +12,7 @@ import {
   Direction,
   NetworkDnsFields,
   NetworkDnsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts
index 41b083ab90578..783ef2efe907a 100644
--- a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts
+++ b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts
@@ -13,7 +13,7 @@ import {
   FlowTargetSourceDest,
   NetworkTopTablesFields,
   NetworkTopNFlowStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/overview_host.ts b/x-pack/test/api_integration/apis/security_solution/overview_host.ts
index b2a32ac46c3f3..3c14b4f91d86c 100644
--- a/x-pack/test/api_integration/apis/security_solution/overview_host.ts
+++ b/x-pack/test/api_integration/apis/security_solution/overview_host.ts
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   HostsQueries,
   HostsOverviewStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/overview_network.ts b/x-pack/test/api_integration/apis/security_solution/overview_network.ts
index ffee9b851ffc0..51398a1e396ec 100644
--- a/x-pack/test/api_integration/apis/security_solution/overview_network.ts
+++ b/x-pack/test/api_integration/apis/security_solution/overview_network.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   NetworkOverviewStrategyResponse,
   NetworkQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts
index d3217148ad8bb..e7abf13b2e3d6 100644
--- a/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts
+++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts
@@ -7,7 +7,7 @@
 
 import type SuperTest from 'supertest';
 import uuid from 'uuid';
-import { TimelineType } from '../../../../../plugins/security_solution/common/types/timeline';
+import { TimelineType } from '@kbn/security-solution-plugin/common/types/timeline';
 
 export const createBasicTimeline = async (
   supertest: SuperTest.SuperTest<SuperTest.Test>,
diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts
index 5bdbb76d53908..32d307ebc22d5 100644
--- a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts
+++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts
@@ -6,13 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { TimelineResult, TimelineType } from '@kbn/security-solution-plugin/common/types/timeline';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import {
-  TimelineResult,
-  TimelineType,
-} from '../../../../../plugins/security_solution/common/types/timeline';
-
 import { createBasicTimeline } from './helpers';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security_solution/timeline.ts b/x-pack/test/api_integration/apis/security_solution/timeline.ts
index f586719e6015e..f9a2a795d43ca 100644
--- a/x-pack/test/api_integration/apis/security_solution/timeline.ts
+++ b/x-pack/test/api_integration/apis/security_solution/timeline.ts
@@ -6,10 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  SavedTimeline,
-  TimelineType,
-} from '../../../../plugins/security_solution/common/types/timeline';
+import { SavedTimeline, TimelineType } from '@kbn/security-solution-plugin/common/types/timeline';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { createBasicTimeline, createBasicTimelineTemplate } from './saved_objects/helpers';
diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts
index 9f1b5fccd9d1a..830cb9d84b71b 100644
--- a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts
+++ b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts
@@ -11,7 +11,7 @@ import {
   TimelineEventsQueries,
   TimelineEventsDetailsStrategyResponse,
   TimelineKpiStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts b/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts
index c5ea6e2aeaa63..47c6e28d9bab7 100644
--- a/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts
+++ b/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts
@@ -10,13 +10,13 @@ import {
   noteSavedObjectType,
   pinnedEventSavedObjectType,
   timelineSavedObjectType,
-} from '../../../../plugins/security_solution/server/lib/timeline/saved_object_mappings';
-import { TimelineWithoutExternalRefs } from '../../../../plugins/security_solution/common/types/timeline';
-import { NoteWithoutExternalRefs } from '../../../../plugins/security_solution/common/types/timeline/note';
+} from '@kbn/security-solution-plugin/server/lib/timeline/saved_object_mappings';
+import { TimelineWithoutExternalRefs } from '@kbn/security-solution-plugin/common/types/timeline';
+import { NoteWithoutExternalRefs } from '@kbn/security-solution-plugin/common/types/timeline/note';
 
+import { PinnedEventWithoutExternalRefs } from '@kbn/security-solution-plugin/common/types/timeline/pinned_event';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { getSavedObjectFromES } from './utils';
-import { PinnedEventWithoutExternalRefs } from '../../../../plugins/security_solution/common/types/timeline/pinned_event';
 
 interface TimelineWithoutSavedQueryId {
   [timelineSavedObjectType]: TimelineWithoutExternalRefs;
diff --git a/x-pack/test/api_integration/apis/security_solution/tls.ts b/x-pack/test/api_integration/apis/security_solution/tls.ts
index c872844cb3d46..5949a3b85c2a7 100644
--- a/x-pack/test/api_integration/apis/security_solution/tls.ts
+++ b/x-pack/test/api_integration/apis/security_solution/tls.ts
@@ -12,7 +12,7 @@ import {
   NetworkTlsFields,
   FlowTarget,
   NetworkTlsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts
index a6749b27030e1..bf30a39e80c89 100644
--- a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts
+++ b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   HostsQueries,
   HostsUncommonProcessesStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = '2000-01-01T00:00:00.000Z';
diff --git a/x-pack/test/api_integration/apis/security_solution/users.ts b/x-pack/test/api_integration/apis/security_solution/users.ts
index d592c99bf006f..f9c0cda614a7f 100644
--- a/x-pack/test/api_integration/apis/security_solution/users.ts
+++ b/x-pack/test/api_integration/apis/security_solution/users.ts
@@ -12,7 +12,7 @@ import {
   NetworkUsersFields,
   FlowTarget,
   NetworkUsersStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/telemetry/opt_in.ts b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
index c73f554f2074f..dafdac7e3f219 100644
--- a/x-pack/test/api_integration/apis/telemetry/opt_in.ts
+++ b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository';
+import { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/telemetry_repository';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry.ts b/x-pack/test/api_integration/apis/telemetry/telemetry.ts
index a41346c29c1a3..2f693a82db93e 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry.ts
@@ -9,22 +9,22 @@ import expect from '@kbn/expect';
 import moment from 'moment';
 import type SuperTest from 'supertest';
 import deepmerge from 'deepmerge';
-import type { FtrProviderContext } from '../../ftr_provider_context';
-import type { SecurityService } from '../../../../../test/common/services/security/security';
 
-import multiClusterFixture from './fixtures/multicluster.json';
-import basicClusterFixture from './fixtures/basiccluster.json';
-import ossRootTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_root.json';
-import xpackRootTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_root.json';
-import monitoringRootTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_monitoring.json';
-import ossPluginsTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_plugins.json';
-import xpackPluginsTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_plugins.json';
-import { assertTelemetryPayload } from '../../../../../test/api_integration/apis/telemetry/utils';
-import type { UnencryptedTelemetryPayload } from '../../../../../src/plugins/telemetry/common/types';
+import ossRootTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_root.json';
+import xpackRootTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_root.json';
+import monitoringRootTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_monitoring.json';
+import ossPluginsTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_plugins.json';
+import xpackPluginsTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_plugins.json';
+import type { UnencryptedTelemetryPayload } from '@kbn/telemetry-plugin/common/types';
 import type {
   UsageStatsPayload,
   CacheDetails,
-} from '../../../../../src/plugins/telemetry_collection_manager/server/types';
+} from '@kbn/telemetry-collection-manager-plugin/server/types';
+import { assertTelemetryPayload } from '../../../../../test/api_integration/apis/telemetry/utils';
+import basicClusterFixture from './fixtures/basiccluster.json';
+import multiClusterFixture from './fixtures/multicluster.json';
+import type { SecurityService } from '../../../../../test/common/services/security/security';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 function omitCacheDetails(usagePayload: Array<Record<string, unknown>>) {
   return usagePayload.map(({ cacheDetails, ...item }) => item);
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts b/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts
index 630fdef6a8d1f..4011efac6d758 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts
@@ -7,15 +7,15 @@
 
 import expect from '@kbn/expect';
 import deepmerge from 'deepmerge';
-import type { FtrProviderContext } from '../../ftr_provider_context';
+import ossRootTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_root.json';
+import ossPluginsTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_plugins.json';
+import xpackRootTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_root.json';
+import xpackPluginsTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_plugins.json';
 import {
   assertTelemetryPayload,
   flatKeys,
 } from '../../../../../test/api_integration/apis/telemetry/utils';
-import ossRootTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_root.json';
-import ossPluginsTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_plugins.json';
-import xpackRootTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_root.json';
-import xpackPluginsTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_plugins.json';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 const disableCollection = {
   persistent: {
diff --git a/x-pack/test/api_integration/apis/transform/common.ts b/x-pack/test/api_integration/apis/transform/common.ts
index a4dcf5affcb2d..21001dfb9c8f0 100644
--- a/x-pack/test/api_integration/apis/transform/common.ts
+++ b/x-pack/test/api_integration/apis/transform/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PutTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
+import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
 
 export async function asyncForEach(array: any[], callback: Function) {
   for (let index = 0; index < array.length; index++) {
diff --git a/x-pack/test/api_integration/apis/transform/delete_transforms.ts b/x-pack/test/api_integration/apis/transform/delete_transforms.ts
index 7f14081e5c574..541418889970f 100644
--- a/x-pack/test/api_integration/apis/transform/delete_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/delete_transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { DeleteTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/delete_transforms';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { DeleteTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/delete_transforms';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/reset_transforms.ts b/x-pack/test/api_integration/apis/transform/reset_transforms.ts
index f94a12e4d8e8a..4a219b2d2280a 100644
--- a/x-pack/test/api_integration/apis/transform/reset_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/reset_transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { ResetTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/reset_transforms';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { ResetTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/reset_transforms';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/start_transforms.ts b/x-pack/test/api_integration/apis/transform/start_transforms.ts
index 07a7f6715305a..682003fc6b825 100644
--- a/x-pack/test/api_integration/apis/transform/start_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/start_transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { StartTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/start_transforms';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { StartTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/start_transforms';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/stop_transforms.ts b/x-pack/test/api_integration/apis/transform/stop_transforms.ts
index af07dec07e547..302e53e1fbbae 100644
--- a/x-pack/test/api_integration/apis/transform/stop_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/stop_transforms.ts
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 
-import type { PutTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import type { StopTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/stop_transforms';
-import { isStopTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
+import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import type { StopTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/stop_transforms';
+import { isStopTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/transforms.ts b/x-pack/test/api_integration/apis/transform/transforms.ts
index d962aa1f08eb2..88c9929f8ed73 100644
--- a/x-pack/test/api_integration/apis/transform/transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import type { GetTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { isGetTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
+import type { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { isGetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
 
diff --git a/x-pack/test/api_integration/apis/transform/transforms_nodes.ts b/x-pack/test/api_integration/apis/transform/transforms_nodes.ts
index ef39e963f137d..98ed88375c62a 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_nodes.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_nodes.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import type { GetTransformNodesResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { isGetTransformNodesResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
+import type { GetTransformNodesResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { isGetTransformNodesResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
 
diff --git a/x-pack/test/api_integration/apis/transform/transforms_preview.ts b/x-pack/test/api_integration/apis/transform/transforms_preview.ts
index ec35f04ab817c..6b1f636e051c6 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_preview.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_preview.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import type { PostTransformsPreviewRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
+import type { PostTransformsPreviewRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
diff --git a/x-pack/test/api_integration/apis/transform/transforms_stats.ts b/x-pack/test/api_integration/apis/transform/transforms_stats.ts
index 4d6b761a7828f..6343a2c9f002f 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_stats.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_stats.ts
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import type { GetTransformsStatsResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms_stats';
-import { isGetTransformsStatsResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import type { GetTransformsStatsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms_stats';
+import { isGetTransformsStatsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts b/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts
index 7ca6fbc9ed4d5..90b0c52dbcc3e 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts
index 57eb43068a5a0..59077c9ac2167 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts
@@ -10,7 +10,7 @@ import Chance from 'chance';
 import {
   DEPRECATION_LOGS_INDEX,
   DEPRECATION_LOGS_ORIGIN_FIELD,
-} from '../../../../plugins/upgrade_assistant/common/constants';
+} from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const chance = new Chance();
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts
index 66bf9a46d05d5..a9c79972de0b2 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts
@@ -11,7 +11,7 @@ import {
   DEPRECATION_LOGS_ORIGIN_FIELD,
   APPS_WITH_DEPRECATION_LOGS,
   API_BASE_PATH,
-} from '../../../../plugins/upgrade_assistant/common/constants';
+} from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { initHelpers } from './es_deprecation_logs.helpers';
 
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts
index 7995408eeb1ce..796ac132f7c56 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts b/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts
index 0a023c8a2065e..98784c70d07a2 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts b/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts
index 9bac04bf1d48e..f005aa899b5a4 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { DEPRECATION_LOGS_INDEX } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DEPRECATION_LOGS_INDEX } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const security = getService('security');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts b/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts
index 412f5d2a0c7fd..b63a042455512 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts b/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts
index cd85b048dc8f6..bf61ce885c0da 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
index 9af6acf6a30af..39d7406636353 100644
--- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PINGS_DATE_RANGE_END, PINGS_DATE_RANGE_START } from './constants';
-import { API_URLS } from '../../../../plugins/uptime/common/constants';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
index 2658afd0d90d2..19b78854a8df3 100644
--- a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
+++ b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
@@ -7,9 +7,9 @@
 
 import moment from 'moment';
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { PINGS_DATE_RANGE_START, PINGS_DATE_RANGE_END } from './constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_URLS } from '../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/__snapshots__/monitor_states_real_data.snap b/x-pack/test/api_integration/apis/uptime/rest/__snapshots__/monitor_states_real_data.snap
index f8c068005b862..81348cfa2bb28 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/__snapshots__/monitor_states_real_data.snap
+++ b/x-pack/test/api_integration/apis/uptime/rest/__snapshots__/monitor_states_real_data.snap
@@ -6,62 +6,17 @@ Object {
   "prevPagePagination": null,
   "summaries": Array [
     Object {
-      "histogram": Object {
-        "points": Array [
-          Object {
-            "down": 1,
-            "timestamp": 1568172624744,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172677247,
-          },
-          Object {
-            "down": 1,
-            "timestamp": 1568172729750,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172782253,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172834756,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172887259,
-          },
-          Object {
-            "down": 1,
-            "timestamp": 1568172939762,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172992265,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568173044768,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568173097271,
-          },
-          Object {
-            "down": 1,
-            "timestamp": 1568173149774,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568173202277,
-          },
-        ],
-      },
-      "minInterval": 52503,
       "monitor_id": "0010-down",
       "state": Object {
+        "error": Object {
+          "message": "400 Bad Request",
+          "type": "validate",
+        },
         "monitor": Object {
+          "checkGroup": "d76f07d1-d445-11e9-88e3-3e80641b9c71",
+          "duration": Object {
+            "us": 37926,
+          },
           "name": "",
           "type": "http",
         },
@@ -186,62 +141,17 @@ Object {
       },
     },
     Object {
-      "histogram": Object {
-        "points": Array [
-          Object {
-            "down": 1,
-            "timestamp": 1568172624744,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172677247,
-          },
-          Object {
-            "down": 1,
-            "timestamp": 1568172729750,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172782253,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172834756,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172887259,
-          },
-          Object {
-            "down": 1,
-            "timestamp": 1568172939762,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568172992265,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568173044768,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568173097271,
-          },
-          Object {
-            "down": 1,
-            "timestamp": 1568173149774,
-          },
-          Object {
-            "down": 2,
-            "timestamp": 1568173202277,
-          },
-        ],
-      },
-      "minInterval": 52503,
       "monitor_id": "0020-down",
       "state": Object {
+        "error": Object {
+          "message": "400 Bad Request",
+          "type": "validate",
+        },
         "monitor": Object {
+          "checkGroup": "d7712ecb-d445-11e9-88e3-3e80641b9c71",
+          "duration": Object {
+            "us": 14900,
+          },
           "name": "",
           "type": "http",
         },
diff --git a/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts
index 54c8cbc6b07a9..14fce8f974e92 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts
@@ -6,10 +6,10 @@
  */
 import { omit } from 'lodash';
 import expect from '@kbn/expect';
-import { secretKeys } from '../../../../../plugins/uptime/common/constants/monitor_management';
-import { HTTPFields } from '../../../../../plugins/uptime/common/runtime_types';
+import { secretKeys } from '@kbn/synthetics-plugin/common/constants/monitor_management';
+import { HTTPFields } from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { getFixtureJson } from './helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/certs.ts b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
index b9bc38801d394..ac9cc0e2be15f 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/certs.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
@@ -8,13 +8,13 @@
 import expect from '@kbn/expect';
 import moment from 'moment';
 import { isRight } from 'fp-ts/lib/Either';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { CertType } from '../../../../../plugins/uptime/common/runtime_types';
-import { makeChecksWithStatus } from './helper/make_checks';
+import { CertType } from '@kbn/synthetics-plugin/common/runtime_types';
 import {
   processCertsResult,
   getCertsRequestBody,
-} from '../../../../../plugins/uptime/common/requests/get_certs_request_body';
+} from '@kbn/synthetics-plugin/common/requests/get_certs_request_body';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { makeChecksWithStatus } from './helper/make_checks';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
index 2c215b7ba103c..faff22f750670 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { HTTPFields, MonitorFields } from '../../../../../plugins/uptime/common/runtime_types';
+import { HTTPFields, MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { getFixtureJson } from './helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
index bccde2e6d9cb8..ab5315b92300c 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
@@ -7,15 +7,9 @@
 
 import expect from '@kbn/expect';
 import { isRight } from 'fp-ts/lib/Either';
+import { DynamicSettingsType, DynamicSettings } from '@kbn/synthetics-plugin/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS, API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import {
-  DynamicSettingsType,
-  DynamicSettings,
-} from '../../../../../plugins/uptime/common/runtime_types';
-import {
-  DYNAMIC_SETTINGS_DEFAULTS,
-  API_URLS,
-} from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts
index 4263d7aece810..be94aedc293b3 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts
@@ -6,15 +6,11 @@
  */
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
-import { SimpleSavedObject } from 'kibana/public';
-import { secretKeys } from '../../../../../plugins/uptime/common/constants/monitor_management';
-import {
-  ConfigKey,
-  HTTPFields,
-  MonitorFields,
-} from '../../../../../plugins/uptime/common/runtime_types';
+import { SimpleSavedObject } from '@kbn/core/public';
+import { secretKeys } from '@kbn/synthetics-plugin/common/constants/monitor_management';
+import { ConfigKey, HTTPFields, MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { getFixtureJson } from './helper/get_fixture_json';
 export default function ({ getService }: FtrProviderContext) {
   describe('[PUT] /internal/uptime/service/monitors', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts
index 0fd67b8cb3663..0fa5ed26b791e 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
-import { SimpleSavedObject } from 'kibana/public';
-import { MonitorFields } from '../../../../../plugins/uptime/common/runtime_types';
+import { SimpleSavedObject } from '@kbn/core/public';
+import { MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
+import { formatSecrets } from '@kbn/synthetics-plugin/server/lib/synthetics_service/utils/secrets';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
-import { formatSecrets } from '../../../../../plugins/uptime/server/lib/synthetics_service/utils/secrets';
 import { getFixtureJson } from './helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index 61b1666b3e559..3bfe81534c330 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../../ftr_provider_context';
 import {
   settingsObjectId,
   settingsObjectType,
-} from '../../../../../plugins/uptime/server/lib/saved_objects/uptime_settings';
+} from '@kbn/synthetics-plugin/server/lib/saved_objects/uptime_settings';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index_status.ts b/x-pack/test/api_integration/apis/uptime/rest/index_status.ts
index 23a98fef34d51..620621274a078 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index_status.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index_status.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('docCount query', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts
index 4fa0837e2e812..abd1ac69732b1 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('monitor duration query', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
index 036d3ad856f57..e5cf59be67233 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('get monitor latest status API', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
index c9fd7c76e6d22..5bbe7f7312102 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { MonitorSummary } from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { makeChecksWithStatus } from './helper/make_checks';
-import { MonitorSummary } from '../../../../../plugins/uptime/common/runtime_types';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
index 68d17cf3a4dd2..438211665674a 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
@@ -7,19 +7,17 @@
 
 import expect from '@kbn/expect';
 import { isRight } from 'fp-ts/lib/Either';
-import { FtrProviderContext } from '../../../ftr_provider_context';
 import {
   MonitorSummariesResult,
   MonitorSummariesResultType,
-} from '../../../../../plugins/uptime/common/runtime_types';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
+} from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 interface ExpectedMonitorStatesPage {
   response: any;
   statesIds: string[];
   statuses: string[];
-  absFrom: number;
-  absTo: number;
   size: number;
   prevPagination: null | string;
   nextPagination: null | string;
@@ -34,8 +32,6 @@ const checkMonitorStatesResponse = ({
   response,
   statesIds,
   statuses,
-  absFrom,
-  absTo,
   size,
   prevPagination,
   nextPagination,
@@ -52,11 +48,6 @@ const checkMonitorStatesResponse = ({
     ).to.eql(statuses);
     (summaries ?? []).forEach((s) => {
       expect(s.state.url.full).to.be.ok();
-      expect(Array.isArray(s.histogram?.points)).to.be(true);
-      (s.histogram?.points ?? []).forEach((point) => {
-        expect(point.timestamp).to.be.greaterThan(absFrom);
-        expect(point.timestamp).to.be.lessThan(absTo);
-      });
     });
     expect(prevPagePagination).to.be(prevPagination);
     expect(nextPagePagination).to.eql(nextPagination);
@@ -65,12 +56,9 @@ const checkMonitorStatesResponse = ({
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  // Failing ES Promotion: https://github.com/elastic/kibana/issues/93705
-  describe.skip('monitor states endpoint', () => {
+  describe('monitor states endpoint', () => {
     const from = '2019-09-11T03:30:04.380Z';
     const to = '2019-09-11T03:40:34.410Z';
-    const absFrom = new Date(from).valueOf();
-    const absTo = new Date(to).valueOf();
 
     it('will fetch monitor state data for the given filters and range', async () => {
       const statusFilter = 'up';
@@ -84,8 +72,6 @@ export default function ({ getService }: FtrProviderContext) {
         response: apiResponse.body,
         statesIds: ['0002-up'],
         statuses: ['up'],
-        absFrom,
-        absTo,
         size: 1,
         prevPagination: null,
         nextPagination: null,
@@ -480,8 +466,6 @@ export default function ({ getService }: FtrProviderContext) {
         checkMonitorStatesResponse({
           response: nextData,
           ...expectedNextResults[page - 1],
-          absFrom,
-          absTo,
           size,
         });
 
@@ -493,8 +477,6 @@ export default function ({ getService }: FtrProviderContext) {
           checkMonitorStatesResponse({
             response: prevData,
             ...expectedPrevResults[page - 2],
-            absFrom,
-            absTo,
             size,
           });
         }
@@ -521,8 +503,6 @@ export default function ({ getService }: FtrProviderContext) {
           '0009-up',
         ],
         statuses: ['up', 'up', 'up', 'up', 'up', 'up', 'up', 'up', 'up', 'up'],
-        absFrom,
-        absTo,
         size: LENGTH,
         prevPagination: null,
         nextPagination:
diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts
index fcc0873be9a76..235ae17b7c9e7 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('pingHistogram', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
index 7a0367728eed7..5c179a15b7525 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 import { isLeft } from 'fp-ts/lib/Either';
 import { PathReporter } from 'io-ts/lib/PathReporter';
-import { PingsResponseType } from '../../../../../plugins/uptime/common/runtime_types';
+import { PingsResponseType } from '@kbn/synthetics-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 function decodePingsResponseData(response: any) {
   const decoded = PingsResponseType.decode(response);
diff --git a/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts b/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
index e7f604116e305..d5722fce17b0f 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { makeChecksWithStatus, getChecksDateRange } from './helper/make_checks';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts b/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts
index e9eff005afa3c..04a718e5c7c8f 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts
@@ -6,15 +6,16 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
+import { serviceApiKeyPrivileges } from '@kbn/synthetics-plugin/server/lib/synthetics_service/get_api_key';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
-import { serviceApiKeyPrivileges } from '../../../../../plugins/uptime/server/lib/synthetics_service/get_api_key';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('/internal/uptime/service/enablement', () => {
     const supertestWithAuth = getService('supertest');
     const supertest = getService('supertestWithoutAuth');
     const security = getService('security');
+    const kibanaServer = getService('kibanaServer');
 
     before(async () => {
       await supertestWithAuth.delete(API_URLS.SYNTHETICS_ENABLEMENT).set('kbn-xsrf', 'true');
@@ -311,6 +312,86 @@ export default function ({ getService }: FtrProviderContext) {
           await security.role.delete(roleName);
         }
       });
+
+      it('is space agnostic', async () => {
+        const username = 'admin';
+        const roleName = `synthetics_admin`;
+        const password = `${username}-password`;
+        const SPACE_ID = 'test-space';
+        const SPACE_NAME = 'test-space-name';
+        await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_NAME });
+        try {
+          await security.role.create(roleName, {
+            kibana: [
+              {
+                feature: {
+                  uptime: ['all'],
+                },
+                spaces: ['*'],
+              },
+            ],
+            elasticsearch: {
+              cluster: ['manage_security', ...serviceApiKeyPrivileges.cluster],
+              indices: serviceApiKeyPrivileges.index,
+            },
+          });
+
+          await security.user.create(username, {
+            password,
+            roles: [roleName],
+            full_name: 'a kibana user',
+          });
+
+          // can disable synthetics in default space when enabled in a non default space
+          await supertest
+            .post(`/s/${SPACE_ID}${API_URLS.SYNTHETICS_ENABLEMENT}`)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          await supertest
+            .delete(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          const apiResponse = await supertest
+            .get(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(apiResponse.body).eql({
+            areApiKeysEnabled: true,
+            canEnable: true,
+            isEnabled: false,
+          });
+
+          // can disable synthetics in non default space when enabled in default space
+          await supertest
+            .post(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          await supertest
+            .delete(`/s/${SPACE_ID}${API_URLS.SYNTHETICS_ENABLEMENT}`)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          const apiResponse2 = await supertest
+            .get(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(apiResponse2.body).eql({
+            areApiKeysEnabled: true,
+            canEnable: true,
+            isEnabled: false,
+          });
+        } finally {
+          await security.user.delete(username);
+          await security.role.delete(roleName);
+        }
+      });
     });
   });
 }
diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
index e9aa339f62e14..9c9088e015373 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { makeChecksWithStatus } from './helper/make_checks';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts
index ff257c152daa9..7760ef5c13da9 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { makeChecksWithStatus } from './helper/make_checks';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/services/infraops_source_configuration.ts b/x-pack/test/api_integration/services/infraops_source_configuration.ts
index f78cc880a1d17..e3ec8ff0149b2 100644
--- a/x-pack/test/api_integration/services/infraops_source_configuration.ts
+++ b/x-pack/test/api_integration/services/infraops_source_configuration.ts
@@ -8,7 +8,7 @@
 import {
   PartialMetricsSourceConfiguration,
   MetricsSourceConfigurationResponse,
-} from '../../../plugins/infra/common/metrics_sources';
+} from '@kbn/infra-plugin/common/metrics_sources';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function InfraOpsSourceConfigurationProvider({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/services/usage_api.ts b/x-pack/test/api_integration/services/usage_api.ts
index c761cd0bc93e0..64089d0a9b8ef 100644
--- a/x-pack/test/api_integration/services/usage_api.ts
+++ b/x-pack/test/api_integration/services/usage_api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { TelemetryCollectionManagerPlugin } from '@kbn/telemetry-collection-manager-plugin/server/plugin';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { TelemetryCollectionManagerPlugin } from '../../../../src/plugins/telemetry_collection_manager/server/plugin';
 
 export function UsageAPIProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts b/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
index 14a45b451b94f..3058fc3b66c6d 100644
--- a/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
+++ b/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 
+import { APP_ID } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   createUsersAndRoles,
@@ -20,7 +21,6 @@ import {
   getCase,
 } from '../../../cases_api_integration/common/lib/utils';
 import { getPostCaseRequest } from '../../../cases_api_integration/common/lib/mock';
-import { APP_ID } from '../../../../plugins/security_solution/common/constants';
 
 const secAll: Role = {
   name: 'sec_all_role',
diff --git a/x-pack/test/apm_api_integration/common/apm_api_supertest.ts b/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
index 1c829cbb94b41..86beb73d51ea3 100644
--- a/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
+++ b/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
@@ -8,12 +8,12 @@
 import { format } from 'url';
 import supertest from 'supertest';
 import request from 'superagent';
-import { parseEndpoint } from '../../../plugins/apm/common/apm_api/parse_endpoint';
+import { parseEndpoint } from '@kbn/apm-plugin/common/apm_api/parse_endpoint';
 import type {
   APIReturnType,
   APIClientRequestParamsOf,
-} from '../../../plugins/apm/public/services/rest/create_call_apm_api';
-import type { APIEndpoint } from '../../../plugins/apm/server';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import type { APIEndpoint } from '@kbn/apm-plugin/server';
 
 export function createApmApiClient(st: supertest.SuperTest<supertest.Test>) {
   return async <TEndpoint extends APIEndpoint>(
diff --git a/x-pack/test/apm_api_integration/common/authentication.ts b/x-pack/test/apm_api_integration/common/authentication.ts
index 001aea3224eaa..09390067ff4a9 100644
--- a/x-pack/test/apm_api_integration/common/authentication.ts
+++ b/x-pack/test/apm_api_integration/common/authentication.ts
@@ -6,8 +6,8 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
+import { PrivilegeType } from '@kbn/apm-plugin/common/privilege_type';
 import { SecurityServiceProvider } from '../../../../test/common/services/security';
-import { PrivilegeType } from '../../../plugins/apm/common/privilege_type';
 
 type SecurityService = Awaited<ReturnType<typeof SecurityServiceProvider>>;
 
diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
index c1829869641a9..da483d3127ad9 100644
--- a/x-pack/test/apm_api_integration/common/config.ts
+++ b/x-pack/test/apm_api_integration/common/config.ts
@@ -8,8 +8,8 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 import supertest from 'supertest';
 import { format, UrlObject } from 'url';
-import { SecurityServiceProvider } from 'test/common/services/security';
 import { Client } from '@elastic/elasticsearch';
+import { SecurityServiceProvider } from '../../../../test/common/services/security';
 import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
 import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
 import { APMFtrConfigName } from '../configs';
diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts
index ac59059e49d83..51f4bb6a84e72 100644
--- a/x-pack/test/apm_api_integration/common/registry.ts
+++ b/x-pack/test/apm_api_integration/common/registry.ts
@@ -8,8 +8,8 @@
 import Path from 'path';
 import { castArray, groupBy } from 'lodash';
 import callsites from 'callsites';
-import { maybe } from '../../../plugins/apm/common/utils/maybe';
-import { joinByKey } from '../../../plugins/apm/common/utils/join_by_key';
+import { maybe } from '@kbn/apm-plugin/common/utils/maybe';
+import { joinByKey } from '@kbn/apm-plugin/common/utils/join_by_key';
 import { APMFtrConfigName } from '../configs';
 import { FtrProviderContext } from './ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts b/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts
index bd03493039b49..3a42456742caa 100644
--- a/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts
+++ b/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import job from '../../../../plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/apm_tx_metrics.json';
-import datafeed from '../../../../plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_tx_metrics.json';
+import job from '@kbn/ml-plugin/server/models/data_recognizer/modules/apm_transaction/ml/apm_tx_metrics.json';
+import datafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_tx_metrics.json';
 import { MlApi } from '../../../functional/services/ml/api';
 
 export function createAndRunApmMlJob({ ml, environment }: { ml: MlApi; environment: string }) {
diff --git a/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts b/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
index bab71d166eb15..f7c8d2e27eaaa 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
@@ -8,7 +8,7 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { range } from 'lodash';
-import { AlertType } from '../../../../plugins/apm/common/alert_types';
+import { AlertType } from '@kbn/apm-plugin/common/alert_types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createAndRunApmMlJob } from '../../common/utils/create_and_run_apm_ml_job';
 import { waitForRuleStatus } from './wait_for_rule_status';
diff --git a/x-pack/test/apm_api_integration/tests/alerts/wait_for_rule_status.ts b/x-pack/test/apm_api_integration/tests/alerts/wait_for_rule_status.ts
index b31f8b70eab10..f4814358f1636 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/wait_for_rule_status.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/wait_for_rule_status.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import expect from '@kbn/expect';
 import type SuperTest from 'supertest';
 
diff --git a/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts b/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts
index f6cf860bc05ea..2fc0aaaead898 100644
--- a/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { range, omit } from 'lodash';
 import { apm, timerange } from '@elastic/apm-synthtrace';
+import { ServiceAnomalyTimeseries } from '@kbn/apm-plugin/common/anomaly_detection/service_anomaly_timeseries';
+import { ApmMlDetectorType } from '@kbn/apm-plugin/common/anomaly_detection/apm_ml_detectors';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { ApmApiError } from '../../common/apm_api_supertest';
-import { ServiceAnomalyTimeseries } from '../../../../plugins/apm/common/anomaly_detection/service_anomaly_timeseries';
-import { ApmMlDetectorType } from '../../../../plugins/apm/common/anomaly_detection/apm_ml_detectors';
 import { createAndRunApmMlJob } from '../../common/utils/create_and_run_apm_ml_job';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts b/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts
index a942862891969..fad428a96f18a 100644
--- a/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts
@@ -7,14 +7,14 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 import moment from 'moment';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { dataConfig, generateData } from './generate_data';
 import {
   APIReturnType,
   APIClientRequestParamsOf,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { dataConfig, generateData } from './generate_data';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 type ColdStartRate =
   APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate'>;
diff --git a/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts b/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts
index 4cd9026f6ac51..ed432f58d47aa 100644
--- a/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts
@@ -7,14 +7,14 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 import moment from 'moment';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { dataConfig, generateData } from './generate_data';
 import {
   APIReturnType,
   APIClientRequestParamsOf,
-} from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../../plugins/apm/typings/common';
-import { isFiniteNumber } from '../../../../../plugins/apm/common/utils/is_finite_number';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { dataConfig, generateData } from './generate_data';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 type ColdStartRate =
   APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate_by_transaction_name'>;
diff --git a/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts b/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
index 0a175762fe3e8..8fedcad2a6979 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import type { FailedTransactionsCorrelationsResponse } from '@kbn/apm-plugin/common/correlations/failed_transactions_correlations/types';
+import { EVENT_OUTCOME } from '@kbn/apm-plugin/common/elasticsearch_fieldnames';
+import { EventOutcome } from '@kbn/apm-plugin/common/event_outcome';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import type { FailedTransactionsCorrelationsResponse } from '../../../../plugins/apm/common/correlations/failed_transactions_correlations/types';
-import { EVENT_OUTCOME } from '../../../../plugins/apm/common/elasticsearch_fieldnames';
-import { EventOutcome } from '../../../../plugins/apm/common/event_outcome';
 
 // These tests go through the full sequence of queries required
 // to get the final results for a failed transactions correlation analysis.
diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts b/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
index 1cdd59777c1c5..3e46cd9c7c2b3 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
@@ -9,11 +9,11 @@ import { chunk } from 'lodash';
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 import type {
   LatencyCorrelation,
   LatencyCorrelationsResponse,
-} from '../../../../plugins/apm/common/correlations/latency_correlations/types';
+} from '@kbn/apm-plugin/common/correlations/latency_correlations/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // These tests go through the full sequence of queries required
 // to get the final results for a latency correlation analysis.
diff --git a/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts b/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts
index 9d0b3e1b2cc57..0e5fb6d1c98fd 100644
--- a/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts
@@ -7,7 +7,7 @@
 
 import { apm, ApmSynthtraceEsClient, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
-import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../plugins/apm/common/index_pattern_constants';
+import { APM_STATIC_INDEX_PATTERN_ID } from '@kbn/apm-plugin/common/index_pattern_constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { SupertestReturnType } from '../../common/apm_api_supertest';
 
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts b/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts
index 4445a6cbc31d3..bbec4088235c3 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { BackendNode } from '../../../../plugins/apm/common/connections';
+import { BackendNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts b/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
index 1b4b27c6b441b..b587cdd99b1c9 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { NodeType, BackendNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
-import { NodeType, BackendNode } from '../../../../plugins/apm/common/connections';
 import { roundNumber } from '../../utils';
 
 type TopDependencies = APIReturnType<'GET /internal/apm/backends/top_backends'>;
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts b/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts
index 0c730ebfb53ad..6822048e4e685 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { ServiceNode } from '../../../../plugins/apm/common/connections';
+import { ServiceNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts b/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
index 91c7b1e0ed0c2..77853b78685ec 100644
--- a/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
@@ -7,8 +7,8 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { mean, meanBy, sumBy } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
@@ -41,6 +41,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         params: {
           query: {
             ...commonQuery,
+            probability: 1,
             kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
           },
         },
diff --git a/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts
index 7f7aa7a85d407..011165c874421 100644
--- a/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts
@@ -31,6 +31,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           query: {
             ...commonQuery,
             kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
+            probability: 1,
           },
         },
       }),
diff --git a/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts b/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
index 9511284aba455..4cd338441eefa 100644
--- a/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
@@ -6,12 +6,12 @@
  */
 import expect from '@kbn/expect';
 import { first, last, sumBy } from 'lodash';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { config, generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
index 66a2f7666e289..49f4877231731 100644
--- a/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
@@ -9,8 +9,8 @@ import { apm, timerange } from '@elastic/apm-synthtrace';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 type ErrorGroups =
diff --git a/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts b/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
index 14de478afe4f9..af9a3d01f08a7 100644
--- a/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
@@ -8,8 +8,8 @@ import expect from '@kbn/expect';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { config, generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts b/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
index d1cc42a4c7c9d..4e82dc3509823 100644
--- a/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { PROCESSOR_EVENT } from '../../../../plugins/apm/common/elasticsearch_fieldnames';
-import { ProcessorEvent } from '../../../../plugins/apm/common/processor_event';
+import { PROCESSOR_EVENT } from '@kbn/apm-plugin/common/elasticsearch_fieldnames';
+import { ProcessorEvent } from '@kbn/apm-plugin/common/processor_event';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
index 77b8faf781eb9..21d2ad617f112 100644
--- a/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
@@ -79,7 +79,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     },
     {
       req: {
-        url: `/internal/apm/services?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=`,
+        url: `/internal/apm/services?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=&probability=1`,
       },
       expectForbidden: expect403,
       expectResponse: expect200,
@@ -98,7 +98,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     },
     {
       req: {
-        url: `/internal/apm/traces?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=`,
+        url: `/internal/apm/traces?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=&probability=1`,
       },
       expectForbidden: expect403,
       expectResponse: expect200,
diff --git a/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts b/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
index b4662f881f29b..893a9f81d2526 100644
--- a/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
@@ -7,8 +7,8 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { meanBy, sumBy } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
@@ -44,6 +44,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           query: {
             ...commonQuery,
             kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
+            probability: 1,
           },
         },
       }),
diff --git a/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts
index dc150d598b7a7..2338e9ea128b2 100644
--- a/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts
@@ -31,6 +31,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           query: {
             ...commonQuery,
             kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
+            probability: 1,
           },
         },
       }),
diff --git a/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
index def2e2a4c48e5..92e7c8a80bcb1 100644
--- a/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { first } from 'lodash';
-import { GenericMetricsChart } from '../../../../plugins/apm/server/routes/metrics/fetch_and_transform_metrics';
+import { GenericMetricsChart } from '@kbn/apm-plugin/server/routes/metrics/fetch_and_transform_metrics';
 import { SupertestReturnType } from '../../common/apm_api_supertest';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
index 90c08433b6ab5..cb8fecb1cdf59 100644
--- a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
@@ -29,6 +29,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         params: {
           query: {
             ...commonQuery,
+            probability: 1,
             environment: 'ENVIRONMENT_ALL',
             kuery: '',
           },
diff --git a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
index 454b129464c00..347dad2295565 100644
--- a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { first, isEmpty, last, orderBy, uniq } from 'lodash';
-import { ServiceConnectionNode } from '../../../../plugins/apm/common/service_map';
+import { ServiceConnectionNode } from '@kbn/apm-plugin/common/service_map';
 import { ApmApiError, SupertestReturnType } from '../../common/apm_api_supertest';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
index cbb76183f9a00..af04672913038 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
@@ -8,13 +8,13 @@
 import expect from '@kbn/expect';
 import { last, omit, pick, sortBy } from 'lodash';
 import { ValuesType } from 'utility-types';
-import { Node, NodeType } from '../../../../../plugins/apm/common/connections';
-import { roundNumber } from '../../../utils';
+import { Node, NodeType } from '@kbn/apm-plugin/common/connections';
 import {
   ENVIRONMENT_ALL,
   ENVIRONMENT_NOT_DEFINED,
-} from '../../../../../plugins/apm/common/environment_filter_values';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
+} from '@kbn/apm-plugin/common/environment_filter_values';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { roundNumber } from '../../../utils';
 import archives from '../../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { apmDependenciesMapping, createServiceDependencyDocs } from './es_utils';
@@ -267,7 +267,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const lastValue = roundNumber(last(opbeansNode?.currentStats.latency.timeseries)?.y);
 
         expect(firstValue).to.be(roundNumber(20 / 3));
-        expect(lastValue).to.be('1.000');
+        expect(lastValue).to.be(1);
       });
 
       it('returns postgres as an external dependency', () => {
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts b/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
index 3d07f3feacdd2..8736b46f73459 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { take } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
 import { ApmServices } from '../../common/config';
 
 export async function getServiceNodeIds({
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
index 99c2585162fdf..7f4c0d643bf10 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
@@ -6,9 +6,9 @@
  */
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
 import { getServiceNodeIds } from './get_service_node_ids';
 
 type ServiceOverviewInstanceDetails =
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
index 653a96ad79b3b..6e007fd9b2ebd 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import moment from 'moment';
-import { Coordinate } from '../../../../plugins/apm/typings/timeseries';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { Coordinate } from '@kbn/apm-plugin/typings/timeseries';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
 import { getServiceNodeIds } from './get_service_node_ids';
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
index 373cdecda3615..eef162dd086cb 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
@@ -9,14 +9,14 @@ import expect from '@kbn/expect';
 import { pick, sortBy } from 'lodash';
 import moment from 'moment';
 import { apm, timerange } from '@elastic/apm-synthtrace';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import archives from '../../common/fixtures/es_archiver/archives_metadata';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { ENVIRONMENT_ALL } from '../../../../plugins/apm/common/environment_filter_values';
-import { SERVICE_NODE_NAME_MISSING } from '../../../../plugins/apm/common/service_nodes';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { ENVIRONMENT_ALL } from '@kbn/apm-plugin/common/environment_filter_values';
+import { SERVICE_NODE_NAME_MISSING } from '@kbn/apm-plugin/common/service_nodes';
+import archives from '../../common/fixtures/es_archiver/archives_metadata';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const registry = getService('registry');
diff --git a/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts b/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
index ad261055c8006..68f82c7357dc0 100644
--- a/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
index 8867327ac418a..c0ae9e24c830e 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 import { first, last, sumBy } from 'lodash';
 import moment from 'moment';
-import { isFiniteNumber } from '../../../../../plugins/apm/common/utils/is_finite_number';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { config, generateData } from './generate_data';
 import { getErrorGroupIds } from './get_error_group_ids';
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
index 43df9a5c4ec5e..df86dc2bda16f 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
@@ -9,8 +9,8 @@ import moment from 'moment';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { generateData, config } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts b/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
index cf59b0d39660d..c53c9f9f16e86 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 import { first } from 'lodash';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
 
 type ServiceDetails = APIReturnType<'GET /internal/apm/services/{serviceName}/metadata/details'>;
 
diff --git a/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts b/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts
index 389b8c6ac1fc8..11cb59fff0756 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
 
 type ServiceIconMetadata = APIReturnType<'GET /internal/apm/services/{serviceName}/metadata/icons'>;
 
diff --git a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
index edb2d7d79315f..25672acc76227 100644
--- a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
@@ -5,19 +5,20 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import url from 'url';
 import moment from 'moment';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { ApmApiError } from '../../common/apm_api_supertest';
 
 type ServicesDetailedStatisticsReturn =
   APIReturnType<'GET /internal/apm/services/detailed_statistics'>;
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const registry = getService('registry');
-  const supertest = getService('legacySupertestAsApmReadUser');
+
+  const apmApiClient = getService('apmApiClient');
 
   const archiveName = 'apm_8.0.0';
   const metadata = archives_metadata[archiveName];
@@ -29,9 +30,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     { config: 'basic', archives: [] },
     () => {
       it('handles the empty state', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/detailed_statistics`,
+        const response = await apmApiClient.readUser({
+          endpoint: `GET /internal/apm/services/detailed_statistics`,
+          params: {
             query: {
               start,
               end,
@@ -39,9 +40,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               environment: 'ENVIRONMENT_ALL',
               kuery: '',
               offset: '1d',
+              probability: 1,
             },
-          })
-        );
+          },
+        });
+
         expect(response.status).to.be(200);
         expect(response.body.currentPeriod).to.be.empty();
         expect(response.body.previousPeriod).to.be.empty();
@@ -55,18 +58,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     () => {
       let servicesDetailedStatistics: ServicesDetailedStatisticsReturn;
       before(async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/detailed_statistics`,
+        const response = await apmApiClient.readUser({
+          endpoint: `GET /internal/apm/services/detailed_statistics`,
+          params: {
             query: {
               start,
               end,
               serviceNames: JSON.stringify(serviceNames),
               environment: 'ENVIRONMENT_ALL',
               kuery: '',
+              probability: 1,
             },
-          })
-        );
+          },
+        });
         expect(response.status).to.be(200);
         servicesDetailedStatistics = response.body;
       });
@@ -106,52 +110,61 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('returns empty when empty service names is passed', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/detailed_statistics`,
-            query: {
-              start,
-              end,
-              serviceNames: JSON.stringify([]),
-              environment: 'ENVIRONMENT_ALL',
-              kuery: '',
+        try {
+          await apmApiClient.readUser({
+            endpoint: `GET /internal/apm/services/detailed_statistics`,
+            params: {
+              query: {
+                start,
+                end,
+                serviceNames: JSON.stringify([]),
+                environment: 'ENVIRONMENT_ALL',
+                kuery: '',
+                probability: 1,
+              },
             },
-          })
-        );
-        expect(response.status).to.be(400);
-        expect(response.body.message).to.equal('serviceNames cannot be empty');
+          });
+          expect().fail('Expected API call to throw an error');
+        } catch (error: unknown) {
+          const apiError = error as ApmApiError;
+          expect(apiError.res.status).eql(400);
+
+          expect(apiError.res.body.message).eql('serviceNames cannot be empty');
+        }
       });
 
       it('filters by environment', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/detailed_statistics`,
+        const response = await apmApiClient.readUser({
+          endpoint: `GET /internal/apm/services/detailed_statistics`,
+          params: {
             query: {
               start,
               end,
               serviceNames: JSON.stringify(serviceNames),
               environment: 'production',
               kuery: '',
+              probability: 1,
             },
-          })
-        );
+          },
+        });
         expect(response.status).to.be(200);
         expect(Object.keys(response.body.currentPeriod).length).to.be(1);
         expect(response.body.currentPeriod['opbeans-java']).not.to.be.empty();
       });
       it('filters by kuery', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/detailed_statistics`,
+        const response = await apmApiClient.readUser({
+          endpoint: `GET /internal/apm/services/detailed_statistics`,
+          params: {
             query: {
               start,
               end,
               serviceNames: JSON.stringify(serviceNames),
               environment: 'ENVIRONMENT_ALL',
               kuery: 'transaction.type : "invalid_transaction_type"',
+              probability: 1,
             },
-          })
-        );
+          },
+        });
         expect(response.status).to.be(200);
         expect(Object.keys(response.body.currentPeriod)).to.be.empty();
       });
@@ -164,9 +177,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     () => {
       let servicesDetailedStatistics: ServicesDetailedStatisticsReturn;
       before(async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/detailed_statistics`,
+        const response = await apmApiClient.readUser({
+          endpoint: `GET /internal/apm/services/detailed_statistics`,
+          params: {
             query: {
               start: moment(end).subtract(15, 'minutes').toISOString(),
               end,
@@ -174,9 +187,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               offset: '15m',
               environment: 'ENVIRONMENT_ALL',
               kuery: '',
+              probability: 1,
             },
-          })
-        );
+          },
+        });
+
         expect(response.status).to.be(200);
         servicesDetailedStatistics = response.body;
       });
diff --git a/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts b/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
index cfdf5a022ddbd..b7aa922549092 100644
--- a/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
@@ -9,12 +9,12 @@ import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { first, last, meanBy } from 'lodash';
 import moment from 'moment';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
diff --git a/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts b/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
index ce9f77b2ce70b..3a27221304bc5 100644
--- a/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
@@ -8,29 +8,25 @@
 import expect from '@kbn/expect';
 import { sortBy } from 'lodash';
 import { apm, timerange } from '@elastic/apm-synthtrace';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { ENVIRONMENT_ALL } from '@kbn/apm-plugin/common/environment_filter_values';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
-import { ENVIRONMENT_ALL } from '../../../../plugins/apm/common/environment_filter_values';
+import { SupertestReturnType } from '../../common/apm_api_supertest';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const registry = getService('registry');
-  const supertest = getService('legacySupertestAsApmReadUser');
 
   const apmApiClient = getService('apmApiClient');
   const synthtrace = getService('synthtraceEsClient');
 
-  const supertestAsApmReadUserWithoutMlAccess = getService(
-    'legacySupertestAsApmReadUserWithoutMlAccess'
-  );
-
   const archiveName = 'apm_8.0.0';
 
   const archiveRange = archives_metadata[archiveName];
 
   // url parameters
-  const archiveStart = encodeURIComponent(archiveRange.start);
-  const archiveEnd = encodeURIComponent(archiveRange.end);
+  const archiveStart = archiveRange.start;
+  const archiveEnd = archiveRange.end;
 
   const start = '2021-10-01T00:00:00.000Z';
   const end = '2021-10-01T00:05:00.000Z';
@@ -40,9 +36,18 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     { config: 'basic', archives: ['apm_mappings_only_8.0.0'] },
     () => {
       it('handles the empty state', async () => {
-        const response = await supertest.get(
-          `/internal/apm/services?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=`
-        );
+        const response = await apmApiClient.readUser({
+          endpoint: `GET /internal/apm/services`,
+          params: {
+            query: {
+              start,
+              end,
+              environment: ENVIRONMENT_ALL.value,
+              kuery: '',
+              probability: 1,
+            },
+          },
+        });
 
         expect(response.status).to.be(200);
         expect(response.body.items.length).to.be(0);
@@ -153,6 +158,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 end,
                 environment: ENVIRONMENT_ALL.value,
                 kuery: '',
+                probability: 1,
               },
             },
           });
@@ -204,6 +210,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 end,
                 environment: 'production',
                 kuery: '',
+                probability: 1,
               },
             },
           });
@@ -238,6 +245,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 end,
                 environment: ENVIRONMENT_ALL.value,
                 kuery: 'service.node.name:"multiple-env-service-development"',
+                probability: 1,
               },
             },
           });
@@ -272,6 +280,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 end,
                 environment: ENVIRONMENT_ALL.value,
                 kuery: 'not (transaction.type:request)',
+                probability: 1,
               },
             },
           });
@@ -300,9 +309,18 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           };
 
           before(async () => {
-            response = await supertest.get(
-              `/internal/apm/services?start=${archiveStart}&end=${archiveEnd}&environment=ENVIRONMENT_ALL&kuery=`
-            );
+            response = await apmApiClient.readUser({
+              endpoint: `GET /internal/apm/services`,
+              params: {
+                query: {
+                  start: archiveStart,
+                  end: archiveEnd,
+                  environment: ENVIRONMENT_ALL.value,
+                  kuery: '',
+                  probability: 1,
+                },
+              },
+            });
           });
 
           it('the response is successful', () => {
@@ -344,11 +362,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       describe('with a user that does not have access to ML', () => {
-        let response: Awaited<ReturnType<typeof supertest.get>>;
+        let response: SupertestReturnType<'GET /internal/apm/services'>;
         before(async () => {
-          response = await supertestAsApmReadUserWithoutMlAccess.get(
-            `/internal/apm/services?start=${archiveStart}&end=${archiveEnd}&environment=ENVIRONMENT_ALL&kuery=`
-          );
+          response = await apmApiClient.noMlAccessUser({
+            endpoint: 'GET /internal/apm/services',
+            params: {
+              query: {
+                start: archiveStart,
+                end: archiveEnd,
+                environment: ENVIRONMENT_ALL.value,
+                kuery: '',
+                probability: 1,
+              },
+            },
+          });
         });
 
         it('the response is successful', () => {
@@ -361,7 +388,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         it('contains no health statuses', () => {
           const definedHealthStatuses = response.body.items
-            .map((item: any) => item.healthStatus)
+            .map((item) => item.healthStatus)
             .filter(Boolean);
 
           expect(definedHealthStatuses.length).to.be(0);
@@ -369,13 +396,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       describe('and fetching a list of services with a filter', () => {
-        let response: Awaited<ReturnType<typeof supertest.get>>;
+        let response: SupertestReturnType<'GET /internal/apm/services'>;
         before(async () => {
-          response = await supertest.get(
-            `/internal/apm/services?environment=ENVIRONMENT_ALL&start=${archiveStart}&end=${archiveEnd}&kuery=${encodeURIComponent(
-              'service.name:opbeans-java'
-            )}`
-          );
+          response = await apmApiClient.noMlAccessUser({
+            endpoint: 'GET /internal/apm/services',
+            params: {
+              query: {
+                start: archiveStart,
+                end: archiveEnd,
+                environment: ENVIRONMENT_ALL.value,
+                kuery: 'service.name:opbeans-java',
+                probability: 1,
+              },
+            },
+          });
         });
 
         it('does not return health statuses for services that are not found in APM data', () => {
diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
index f77a901b4ffa3..ecf5b87e82d70 100644
--- a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
@@ -9,8 +9,8 @@ import { inspect } from 'util';
 
 import expect from '@kbn/expect';
 import { omit, orderBy } from 'lodash';
-import { AgentConfigurationIntake } from '../../../../plugins/apm/common/agent_configuration/configuration_types';
-import { AgentConfigSearchParams } from '../../../../plugins/apm/server/routes/settings/agent_configuration/route';
+import { AgentConfigurationIntake } from '@kbn/apm-plugin/common/agent_configuration/configuration_types';
+import { AgentConfigSearchParams } from '@kbn/apm-plugin/server/routes/settings/agent_configuration/route';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts b/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
index 71c0f593cf9f9..4a32ef4a023a6 100644
--- a/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
@@ -6,8 +6,8 @@
  */
 import expect from '@kbn/expect';
 import { first } from 'lodash';
+import { PrivilegeType } from '@kbn/apm-plugin/common/privilege_type';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { PrivilegeType } from '../../../../../plugins/apm/common/privilege_type';
 import { ApmApiError, ApmApiSupertest } from '../../../common/apm_api_supertest';
 import { ApmUser } from '../../../common/authentication';
 
diff --git a/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts b/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
index aeb110dc1faf2..4220a04b02ef1 100644
--- a/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CustomLink } from '../../../../plugins/apm/common/custom_link/custom_link_types';
+import { CustomLink } from '@kbn/apm-plugin/common/custom_link/custom_link_types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { ApmApiError } from '../../common/apm_api_supertest';
 
diff --git a/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts b/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
index 0cd16e5652f65..74bdc860bfba3 100644
--- a/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
@@ -8,7 +8,7 @@ import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
   TRANSACTION_TYPE,
-} from '../../../../plugins/apm/common/elasticsearch_fieldnames';
+} from '@kbn/apm-plugin/common/elasticsearch_fieldnames';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function suggestionsTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
index 6da2afd4e7c5f..ee7c27aa6ddd4 100644
--- a/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
@@ -7,7 +7,7 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { meanBy, sumBy } from 'lodash';
-import { BackendNode, ServiceNode } from '../../../../plugins/apm/common/connections';
+import { BackendNode, ServiceNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
diff --git a/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts b/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
index df1b52aa2da9f..e3b2c348a7f14 100644
--- a/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
@@ -7,7 +7,7 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { meanBy, sumBy } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -37,6 +37,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         params: {
           query: {
             ...commonQuery,
+            probability: 1,
             kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
           },
         },
diff --git a/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts
index 73615ec2db362..0530d166cc3af 100644
--- a/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts
@@ -6,7 +6,6 @@
  */
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
-import { meanBy } from 'lodash';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -19,12 +18,23 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   const start = new Date('2021-01-01T00:00:00.000Z').getTime();
   const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
 
+  const commonQuery = {
+    start: new Date(start).toISOString(),
+    end: new Date(end).toISOString(),
+    environment: 'ENVIRONMENT_ALL',
+  };
+
+  async function callApi() {
+    return await apmApiClient.readUser({
+      endpoint: `GET /internal/apm/service-map/service/{serviceName}`,
+      params: {
+        path: { serviceName },
+        query: commonQuery,
+      },
+    });
+  }
+
   async function getThroughputValues(processorEvent: 'transaction' | 'metric') {
-    const commonQuery = {
-      start: new Date(start).toISOString(),
-      end: new Date(end).toISOString(),
-      environment: 'ENVIRONMENT_ALL',
-    };
     const [serviceInventoryAPIResponse, serviceMapsNodeDetails] = await Promise.all([
       apmApiClient.readUser({
         endpoint: 'GET /internal/apm/services',
@@ -32,6 +42,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           query: {
             ...commonQuery,
             kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
+            probability: 1,
           },
         },
       }),
@@ -46,10 +57,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     const serviceInventoryThroughput = serviceInventoryAPIResponse.body.items[0].throughput;
 
-    const serviceMapsNodeDetailsThroughput = meanBy(
-      serviceMapsNodeDetails.body.currentPeriod.transactionStats?.throughput?.timeseries,
-      'y'
-    );
+    const serviceMapsNodeDetailsThroughput =
+      serviceMapsNodeDetails.body.currentPeriod.transactionStats?.throughput?.value;
 
     return {
       serviceInventoryThroughput,
@@ -81,7 +90,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               .rate(GO_PROD_RATE)
               .generator((timestamp) =>
                 serviceGoProdInstance
-                  .transaction('GET /api/product/list', 'Worker')
+                  .transaction('GET /apple 🍎 ', 'Worker')
                   .duration(1000)
                   .timestamp(timestamp)
               ),
@@ -90,7 +99,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               .rate(GO_DEV_RATE)
               .generator((timestamp) =>
                 serviceGoDevInstance
-                  .transaction('GET /api/product/:id')
+                  .transaction('GET /apple 🍎 ')
                   .duration(1000)
                   .timestamp(timestamp)
               ),
@@ -111,7 +120,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             [
               ...Object.values(throughputTransactionValues),
               ...Object.values(throughputMetricValues),
-            ].forEach((value) => expect(roundNumber(value)).to.be.equal(roundNumber(GO_DEV_RATE)));
+            ].forEach((value) => expect(roundNumber(value)).to.be.equal(GO_DEV_RATE));
+          });
+        });
+
+        describe('when calling service maps transactions stats api', () => {
+          let serviceMapsNodeThroughput: number | null | undefined;
+          before(async () => {
+            const response = await callApi();
+            serviceMapsNodeThroughput =
+              response.body.currentPeriod.transactionStats?.throughput?.value;
+          });
+
+          it('returns expected throughput value', () => {
+            expect(roundNumber(serviceMapsNodeThroughput)).to.be.equal(GO_DEV_RATE);
           });
         });
       });
diff --git a/x-pack/test/apm_api_integration/tests/traces/top_traces.spec.ts b/x-pack/test/apm_api_integration/tests/traces/top_traces.spec.ts
index 06a24cbd34a4b..b49133240c865 100644
--- a/x-pack/test/apm_api_integration/tests/traces/top_traces.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/traces/top_traces.spec.ts
@@ -12,20 +12,28 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const registry = getService('registry');
-  const supertest = getService('legacySupertestAsApmReadUser');
+  const apmApiClient = getService('apmApiClient');
 
   const archiveName = 'apm_8.0.0';
   const metadata = archives_metadata[archiveName];
 
   // url parameters
-  const start = encodeURIComponent(metadata.start);
-  const end = encodeURIComponent(metadata.end);
+  const { start, end } = metadata;
 
   registry.when('Top traces when data is not loaded', { config: 'basic', archives: [] }, () => {
     it('handles empty state', async () => {
-      const response = await supertest.get(
-        `/internal/apm/traces?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=`
-      );
+      const response = await apmApiClient.readUser({
+        endpoint: `GET /internal/apm/traces`,
+        params: {
+          query: {
+            start,
+            end,
+            kuery: '',
+            environment: 'ENVIRONMENT_ALL',
+            probability: 1,
+          },
+        },
+      });
 
       expect(response.status).to.be(200);
       expect(response.body.items.length).to.be(0);
@@ -38,9 +46,18 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     () => {
       let response: any;
       before(async () => {
-        response = await supertest.get(
-          `/internal/apm/traces?start=${start}&end=${end}&environment=ENVIRONMENT_ALL&kuery=`
-        );
+        response = await apmApiClient.readUser({
+          endpoint: 'GET /internal/apm/traces',
+          params: {
+            query: {
+              start,
+              end,
+              kuery: '',
+              environment: 'ENVIRONMENT_ALL',
+              probability: 1,
+            },
+          },
+        });
       });
 
       it('returns the correct status code', async () => {
diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
index 8790e4325f820..54e8c442e7978 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 import { format } from 'url';
 import moment from 'moment';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
index 7a78fe2742ef5..b5d9ba8102b79 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import url from 'url';
 import moment from 'moment';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
index 0895c20371cc1..8087b781eb395 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import qs from 'querystring';
 import { sortBy } from 'lodash';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
index 74ee4a56270a8..770924dd1cf98 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
@@ -8,9 +8,9 @@ import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { first, isEmpty, last, meanBy } from 'lodash';
 import moment from 'moment';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { asPercent } from '../../../../plugins/apm/common/utils/formatters';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { asPercent } from '@kbn/apm-plugin/common/utils/formatters';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
index 56719588b439b..c7e07e6b48b1b 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { pick, sum } from 'lodash';
 import url from 'url';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
 
diff --git a/x-pack/test/apm_api_integration/utils.ts b/x-pack/test/apm_api_integration/utils.ts
index 0fb99e2aa3c7c..8cb818faac52d 100644
--- a/x-pack/test/apm_api_integration/utils.ts
+++ b/x-pack/test/apm_api_integration/utils.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { Coordinate } from '../../plugins/apm/typings/timeseries';
-import { isFiniteNumber } from '../../plugins/apm/common/utils/is_finite_number';
-import { Maybe } from '../../plugins/apm/typings/common';
+import { Coordinate } from '@kbn/apm-plugin/typings/timeseries';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { Maybe } from '@kbn/apm-plugin/typings/common';
 
 export function roundNumber(num: Maybe<number>) {
-  return isFiniteNumber(num) ? num.toPrecision(4) : '';
+  return isFiniteNumber(num) ? Number(num.toPrecision(4)) : null;
 }
 
 export function removeEmptyCoordinates(coordinates: Coordinate[]) {
diff --git a/x-pack/test/cases_api_integration/common/config.ts b/x-pack/test/cases_api_integration/common/config.ts
index a59b78d87ebe5..803327cd037d3 100644
--- a/x-pack/test/cases_api_integration/common/config.ts
+++ b/x-pack/test/cases_api_integration/common/config.ts
@@ -94,7 +94,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     );
 
     return {
-      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
+      testFiles,
       servers,
       services,
       junit: {
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
index d39c2f2e714df..50d0aa6df9b82 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FixturePlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
index 8bb361fba4440..ea42b988d2f26 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
-import { PluginStartContract as CasesPluginStart } from '../../../../../../../plugins/cases/server';
-import { CasesPatchRequest } from '../../../../../../../plugins/cases/common/api';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as CasesPluginStart } from '@kbn/cases-plugin/server';
+import { CasesPatchRequest } from '@kbn/cases-plugin/common/api';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts
index f94358be2bc19..83ec0812264bb 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
index bd3569ef52816..a6eb9ba6f1d5b 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/cases_api_integration/common/lib/authentication/index.ts b/x-pack/test/cases_api_integration/common/lib/authentication/index.ts
index 86016b273ea44..d4776bbcad327 100644
--- a/x-pack/test/cases_api_integration/common/lib/authentication/index.ts
+++ b/x-pack/test/cases_api_integration/common/lib/authentication/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrProviderContext as CommonFtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext as CommonFtrProviderContext } from '../../ftr_provider_context';
 import { Role, User, UserInfo } from './types';
 import { users } from './users';
 import { roles } from './roles';
diff --git a/x-pack/test/cases_api_integration/common/lib/mock.ts b/x-pack/test/cases_api_integration/common/lib/mock.ts
index 713d910f0bd1d..ce025a5681b4f 100644
--- a/x-pack/test/cases_api_integration/common/lib/mock.ts
+++ b/x-pack/test/cases_api_integration/common/lib/mock.ts
@@ -17,7 +17,7 @@ import {
   CaseStatuses,
   CommentRequest,
   CommentRequestActionsType,
-} from '../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
 
 export const defaultUser = { email: null, full_name: null, username: 'elastic' };
 /**
diff --git a/x-pack/test/cases_api_integration/common/lib/utils.ts b/x-pack/test/cases_api_integration/common/lib/utils.ts
index 9c56db80e45fc..a433f5da1d74a 100644
--- a/x-pack/test/cases_api_integration/common/lib/utils.ts
+++ b/x-pack/test/cases_api_integration/common/lib/utils.ts
@@ -15,15 +15,15 @@ import type { TransportResult } from '@elastic/elasticsearch';
 import type { Client } from '@elastic/elasticsearch';
 
 import type SuperTest from 'supertest';
-import { ObjectRemover as ActionsRemover } from '../../../alerting_api_integration/common/lib';
 import {
+  CASES_INTERNAL_URL,
   CASES_URL,
   CASE_CONFIGURE_CONNECTORS_URL,
   CASE_CONFIGURE_URL,
   CASE_REPORTERS_URL,
   CASE_STATUS_URL,
   CASE_TAGS_URL,
-} from '../../../../plugins/cases/common/constants';
+} from '@kbn/cases-plugin/common/constants';
 import {
   CasesConfigureRequest,
   CasesConfigureResponse,
@@ -49,15 +49,18 @@ import {
   CasesByAlertId,
   CaseResolveResponse,
   CaseMetricsResponse,
-} from '../../../../plugins/cases/common/api';
-import { getPostCaseRequest } from './mock';
-import { getCaseUserActionUrl } from '../../../../plugins/cases/common/api/helpers';
-import { SignalHit } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import { ActionResult, FindActionResult } from '../../../../plugins/actions/server/types';
+  BulkCreateCommentRequest,
+  CommentType,
+} from '@kbn/cases-plugin/common/api';
+import { getCaseUserActionUrl } from '@kbn/cases-plugin/common/api/helpers';
+import { SignalHit } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
+import { ActionResult, FindActionResult } from '@kbn/actions-plugin/server/types';
+import { ESCasesConfigureAttributes } from '@kbn/cases-plugin/server/services/configure/types';
+import { ESCaseAttributes } from '@kbn/cases-plugin/server/services/cases/types';
 import { User } from './authentication/types';
 import { superUser } from './authentication/users';
-import { ESCasesConfigureAttributes } from '../../../../plugins/cases/server/services/configure/types';
-import { ESCaseAttributes } from '../../../../plugins/cases/server/services/cases/types';
+import { getPostCaseRequest, postCaseReq } from './mock';
+import { ObjectRemover as ActionsRemover } from '../../../alerting_api_integration/common/lib';
 import { getServiceNowServer } from '../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
 
 function toArray<T>(input: T | T[]): T[] {
@@ -656,6 +659,31 @@ export const createComment = async ({
   return theCase;
 };
 
+export const bulkCreateAttachments = async ({
+  supertest,
+  caseId,
+  params,
+  auth = { user: superUser, space: null },
+  expectedHttpCode = 200,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  caseId: string;
+  params: BulkCreateCommentRequest;
+  auth?: { user: User; space: string | null };
+  expectedHttpCode?: number;
+}): Promise<CaseResponse> => {
+  const { body: theCase } = await supertest
+    .post(
+      `${getSpaceUrlPrefix(auth.space)}${CASES_INTERNAL_URL}/${caseId}/attachments/_bulk_create`
+    )
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(params)
+    .expect(expectedHttpCode);
+
+  return theCase;
+};
+
 export const updateCase = async ({
   supertest,
   params,
@@ -1143,3 +1171,48 @@ export const extractWarningValueFromWarningHeader = (warningHeader: string) => {
   const warningValue = warningHeader.substring(firstQuote + 1, lastQuote);
   return warningValue;
 };
+
+export const getAttachments = (numberOfAttachments: number): BulkCreateCommentRequest => {
+  return [...Array(numberOfAttachments)].map((index) => {
+    if (index % 0) {
+      return {
+        type: CommentType.user,
+        comment: `Test ${index + 1}`,
+        owner: 'securitySolutionFixture',
+      };
+    }
+
+    return {
+      type: CommentType.alert,
+      alertId: `test-id-${index + 1}`,
+      index: `test-index-${index + 1}`,
+      rule: {
+        id: `rule-test-id-${index + 1}`,
+        name: `Test ${index + 1}`,
+      },
+      owner: 'securitySolutionFixture',
+    };
+  });
+};
+
+export const createCaseAndBulkCreateAttachments = async ({
+  supertest,
+  numberOfAttachments = 3,
+  auth = { user: superUser, space: null },
+  expectedHttpCode = 200,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  numberOfAttachments?: number;
+  auth?: { user: User; space: string | null };
+  expectedHttpCode?: number;
+}): Promise<{ theCase: CaseResponse; attachments: BulkCreateCommentRequest }> => {
+  const postedCase = await createCase(supertest, postCaseReq);
+  const attachments = getAttachments(numberOfAttachments);
+  const patchedCase = await bulkCreateAttachments({
+    supertest,
+    caseId: postedCase.id,
+    params: attachments,
+  });
+
+  return { theCase: patchedCase, attachments };
+};
diff --git a/x-pack/test/cases_api_integration/common/lib/validation.ts b/x-pack/test/cases_api_integration/common/lib/validation.ts
index 826ac7e2600e1..c901631388f11 100644
--- a/x-pack/test/cases_api_integration/common/lib/validation.ts
+++ b/x-pack/test/cases_api_integration/common/lib/validation.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CaseResponse, CasesByAlertId } from '../../../../plugins/cases/common/api';
+import { CaseResponse, CasesByAlertId } from '@kbn/cases-plugin/common/api';
 
 /**
  * Ensure that the result of the alerts API request matches with the cases created for the test.
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
index 5285b57f3be72..a78f70710dbad 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 import { postCaseReq } from '../../../../common/lib/mock';
@@ -20,7 +21,6 @@ import {
   createCase,
   pushCase,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
index f1c16e9b6dc56..4d6c20192442a 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
@@ -6,9 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { CaseResponse } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
 import { getPostCaseRequest, postCommentAlertReq } from '../../../../common/lib/mock';
 import {
   createCase,
@@ -17,7 +18,6 @@ import {
   deleteAllCaseItems,
 } from '../../../../common/lib/utils';
 import { validateCasesFromAlertIDResponse } from '../../../../common/lib/validation';
-import { CaseResponse } from '../../../../../../plugins/cases/common/api';
 import {
   globalRead,
   noKibanaPrivileges,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
index 5cf7c4947c23c..657424e644be5 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
@@ -6,9 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { CaseResponse, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
 import {
   postCaseReq,
   postCommentUserReq,
@@ -23,11 +24,6 @@ import {
   updateCase,
   createComment,
 } from '../../../../common/lib/utils';
-import {
-  CaseResponse,
-  CaseStatuses,
-  CommentType,
-} from '../../../../../../plugins/cases/common/api';
 import {
   obsOnly,
   secOnly,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts
index abafc514e56f3..d11cf527da983 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser, getCaseDetailsUrl } from '../../../../../../plugins/cases/common/api';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { AttributesTypeUser, getCaseDetailsUrl } from '@kbn/cases-plugin/common/api';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
index 6093ca55232a7..44da07a845ff7 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
@@ -7,24 +7,14 @@
 
 import expect from '@kbn/expect';
 import { join } from 'path';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import supertest from 'supertest';
-import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
-import {
-  deleteAllCaseItems,
-  createCase,
-  createComment,
-  findCases,
-  getCaseUserActions,
-} from '../../../../common/lib/utils';
-import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   CASES_URL,
   CASE_SAVED_OBJECT,
   CASE_USER_ACTION_SAVED_OBJECT,
   CASE_COMMENT_SAVED_OBJECT,
-} from '../../../../../../plugins/cases/common/constants';
+} from '@kbn/cases-plugin/common/constants';
 import {
   AttributesTypeUser,
   CommentsResponse,
@@ -37,7 +27,17 @@ import {
   CommentUserAction,
   CreateCaseUserAction,
   CaseStatuses,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  deleteAllCaseItems,
+  createCase,
+  createComment,
+  findCases,
+  getCaseUserActions,
+} from '../../../../common/lib/utils';
+import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
index 08e76cd5ab4fd..d844cbae1d79e 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
@@ -6,11 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASES_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import {
   deleteAllCaseItems,
   getCase,
@@ -18,7 +16,6 @@ import {
   resolveCase,
 } from '../../../../common/lib/utils';
 import { superUser } from '../../../../common/lib/authentication/users';
-import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
index c93823822e440..8e25ee9225493 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
@@ -8,15 +8,14 @@
 import expect from '@kbn/expect';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   CasesResponse,
   CaseStatuses,
   CommentType,
   ConnectorTypes,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   getPostCaseRequest,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts
index e302d72bdd575..9cd986a032b24 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
 import {
   ConnectorTypes,
   ConnectorJiraTypeFields,
   CaseStatuses,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
 import { getPostCaseRequest, postCaseResp, defaultUser } from '../../../../common/lib/mock';
 import {
   deleteCasesByESQuery,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts
index 0d7605f9ecaa6..1f681f225938d 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
index 27433c09cd2e0..1a9671385a36c 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
@@ -6,9 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CaseStatuses } from '@kbn/cases-plugin/common/api';
+import { CASE_STATUS_URL } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
 import { getPostCaseRequest, postCaseReq } from '../../../../../common/lib/mock';
 import {
   createCase,
@@ -27,7 +28,6 @@ import {
   secOnlyRead,
   superUser,
 } from '../../../../../common/lib/authentication/users';
-import { CASE_STATUS_URL } from '../../../../../../../plugins/cases/common/constants';
 import { assertWarningHeader } from '../../../../../common/lib/validation';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
index 006deaad27f56..b7af123f9091a 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { CasesResponse, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { postCaseReq } from '../../../../common/lib/mock';
@@ -15,11 +16,6 @@ import {
   deleteAllCaseItems,
   getSignalsWithES,
 } from '../../../../common/lib/utils';
-import {
-  CasesResponse,
-  CaseStatuses,
-  CommentType,
-} from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
index ba3f8e8cba40e..76b0901c3ee8c 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { CommentsResponse } from '../../../../../../plugins/cases/common/api';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { CommentsResponse } from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   getPostCaseRequest,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
index d6e52b6577fef..321cd3e7d8196 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { getCaseCommentsUrl } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { postCaseReq, getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
@@ -28,7 +29,6 @@ import {
   secOnlyRead,
   superUser,
 } from '../../../../common/lib/authentication/users';
-import { getCaseCommentsUrl } from '../../../../../../plugins/cases/common/api';
 import { assertWarningHeader } from '../../../../common/lib/validation';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts
index cc0290bd13666..59c86d0437768 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts
@@ -6,13 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
+import { CommentResponseAlertsType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASES_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import { deleteAllCaseItems, getComment } from '../../../../common/lib/utils';
-import { CommentResponseAlertsType } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
index f22df42678eb5..549e2547f84a0 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
@@ -7,13 +7,13 @@
 
 import { omit } from 'lodash/fp';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
 import {
   AttributesTypeAlerts,
   AttributesTypeUser,
   CommentType,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
 import {
   defaultUser,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
index 9c208139330ea..681f026246542 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
@@ -8,15 +8,15 @@
 import { omit } from 'lodash/fp';
 import expect from '@kbn/expect';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   CommentType,
   AttributesTypeUser,
   AttributesTypeAlerts,
-} from '../../../../../../plugins/cases/common/api';
+  CaseStatuses,
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   postCaseReq,
@@ -35,6 +35,7 @@ import {
   removeServerGeneratedPropertiesFromUserAction,
   removeServerGeneratedPropertiesFromSavedObject,
   superUserSpace1Auth,
+  updateCase,
 } from '../../../../common/lib/utils';
 import {
   createSignalsIndex,
@@ -263,34 +264,29 @@ export default ({ getService }: FtrProviderContext): void => {
         }
       });
 
-      it('400s when case is missing', async () => {
+      it('404s when the case does not exist', async () => {
         await createComment({
           supertest,
           caseId: 'not-exists',
-          params: {
-            // @ts-expect-error
-            bad: 'comment',
-          },
-          expectedHttpCode: 400,
+          params: postCommentUserReq,
+          expectedHttpCode: 404,
         });
       });
 
       it('400s when adding an alert to a closed case', async () => {
         const postedCase = await createCase(supertest, postCaseReq);
-
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
+        await updateCase({
+          supertest,
+          params: {
             cases: [
               {
                 id: postedCase.id,
                 version: postedCase.version,
-                status: 'closed',
+                status: CaseStatuses.closed,
               },
             ],
-          })
-          .expect(200);
+          },
+        });
 
         await createComment({
           supertest,
@@ -299,92 +295,95 @@ export default ({ getService }: FtrProviderContext): void => {
           expectedHttpCode: 400,
         });
       });
-    });
 
-    describe('alerts', () => {
-      beforeEach(async () => {
-        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
-        await createSignalsIndex(supertest, log);
-      });
-
-      afterEach(async () => {
-        await deleteSignalsIndex(supertest, log);
-        await deleteAllAlerts(supertest, log);
-        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      it('400s when attempting to add more than 1K alerts to a case', async () => {
+        const alerts = [...Array(1001).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentAlertReq, alertId: alerts, index: alerts },
+          expectedHttpCode: 400,
+        });
       });
 
-      it('should change the status of the alert if sync alert is on', async () => {
-        const rule = getRuleForSignalTesting(['auditbeat-*']);
+      it('400s when attempting to add an alert to a case that already has 1K alerts', async () => {
+        const alerts = [...Array(1000).keys()].map((num) => `test-${num}`);
         const postedCase = await createCase(supertest, postCaseReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentAlertReq, alertId: alerts, index: alerts },
+        });
 
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: postedCase.id,
-                version: postedCase.version,
-                status: 'in-progress',
-              },
-            ],
-          })
-          .expect(200);
-
-        const { id } = await createRule(supertest, log, rule);
-        await waitForRuleSuccessOrStatus(supertest, log, id);
-        await waitForSignalsToBePresent(supertest, log, 1, [id]);
-        const signals = await getSignalsByIds(supertest, log, [id]);
-
-        const alert = signals.hits.hits[0];
-        expect(alert._source?.[ALERT_WORKFLOW_STATUS]).eql('open');
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentAlertReq, alertId: 'test-id', index: 'test-index' },
+          expectedHttpCode: 400,
+        });
+      });
 
+      it('400s when the case already has alerts and the sum of existing and new alerts exceed 1k', async () => {
+        const alerts = [...Array(1200).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
         await createComment({
           supertest,
           caseId: postedCase.id,
           params: {
-            alertId: alert._id,
-            index: alert._index,
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-            owner: 'securitySolutionFixture',
-            type: CommentType.alert,
+            ...postCommentAlertReq,
+            alertId: alerts.slice(0, 500),
+            index: alerts.slice(0, 500),
           },
         });
 
-        await es.indices.refresh({ index: alert._index });
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: {
+            ...postCommentAlertReq,
+            alertId: alerts.slice(500),
+            index: alerts.slice(500),
+          },
+          expectedHttpCode: 400,
+        });
+      });
+    });
 
-        const { body: updatedAlert } = await supertest
-          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-          .set('kbn-xsrf', 'true')
-          .send(getQuerySignalIds([alert._id]))
-          .expect(200);
+    describe('alerts', () => {
+      beforeEach(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+        await createSignalsIndex(supertest, log);
+      });
 
-        expect(updatedAlert.hits.hits[0]._source[ALERT_WORKFLOW_STATUS]).eql('acknowledged');
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest, log);
+        await deleteAllAlerts(supertest, log);
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
-      it('should NOT change the status of the alert if sync alert is off', async () => {
+      const bulkCreateAlertsAndVerifyAlertStatus = async (
+        syncAlerts: boolean,
+        expectedAlertStatus: string
+      ) => {
         const rule = getRuleForSignalTesting(['auditbeat-*']);
         const postedCase = await createCase(supertest, {
           ...postCaseReq,
-          settings: { syncAlerts: false },
+          settings: { syncAlerts },
         });
 
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
+        await updateCase({
+          supertest,
+          params: {
             cases: [
               {
                 id: postedCase.id,
                 version: postedCase.version,
-                status: 'in-progress',
+                status: CaseStatuses['in-progress'],
               },
             ],
-          })
-          .expect(200);
+          },
+        });
 
         const { id } = await createRule(supertest, log, rule);
         await waitForRuleSuccessOrStatus(supertest, log, id);
@@ -417,7 +416,15 @@ export default ({ getService }: FtrProviderContext): void => {
           .send(getQuerySignalIds([alert._id]))
           .expect(200);
 
-        expect(updatedAlert.hits.hits[0]._source[ALERT_WORKFLOW_STATUS]).eql('open');
+        expect(updatedAlert.hits.hits[0]._source[ALERT_WORKFLOW_STATUS]).eql(expectedAlertStatus);
+      };
+
+      it('should change the status of the alert if sync alert is on', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(true, 'acknowledged');
+      });
+
+      it('should NOT change the status of the alert if sync alert is off', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(false, 'open');
       });
     });
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts
index 79d5a46fa8bdd..308a22c371a48 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts
@@ -6,11 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { CASE_CONFIGURE_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASE_CONFIGURE_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import {
   getConfiguration,
   getConfigureSavedObjectsFromES,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
index 0e92456b66c85..d2fa0d950e774 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 import {
   removeServerGeneratedPropertiesFromSavedObject,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
index 4b7b511d1f414..47744830ec8b8 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts
index a4733d0c87038..f70c8593d3c94 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts
@@ -39,6 +39,12 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./metrics/get_case_metrics_actions'));
     loadTestFile(require.resolve('./metrics/get_case_metrics_connectors'));
 
+    /**
+     * Internal routes
+     */
+
+    loadTestFile(require.resolve('./internal/bulk_create_attachments'));
+
     // NOTE: Migrations are not included because they can inadvertently remove the .kibana indices which removes the users and spaces
     // which causes errors in any tests after them that relies on those
   });
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
new file mode 100644
index 0000000000000..f3c1b190260bc
--- /dev/null
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
@@ -0,0 +1,683 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { omit } from 'lodash/fp';
+import expect from '@kbn/expect';
+import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import {
+  BulkCreateCommentRequest,
+  CaseResponse,
+  CaseStatuses,
+  CommentRequest,
+  CommentType,
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import {
+  defaultUser,
+  postCaseReq,
+  postCommentUserReq,
+  postCommentAlertReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  getCaseUserActions,
+  removeServerGeneratedPropertiesFromUserAction,
+  removeServerGeneratedPropertiesFromSavedObject,
+  superUserSpace1Auth,
+  createCaseAndBulkCreateAttachments,
+  bulkCreateAttachments,
+  updateCase,
+} from '../../../../common/lib/utils';
+import {
+  createSignalsIndex,
+  deleteSignalsIndex,
+  deleteAllAlerts,
+  getRuleForSignalTesting,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+  getSignalsByIds,
+  createRule,
+  getQuerySignalIds,
+} from '../../../../../detection_engine_api_integration/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnly,
+  obsOnlyRead,
+  obsSecRead,
+  secOnly,
+  secOnlyRead,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+  const es = getService('es');
+  const log = getService('log');
+
+  const validateComments = (
+    comments: CaseResponse['comments'],
+    attachments: BulkCreateCommentRequest
+  ) => {
+    comments?.forEach((attachment, index) => {
+      const comment = removeServerGeneratedPropertiesFromSavedObject(attachment);
+
+      expect(comment).to.eql({
+        ...attachments[index],
+        created_by: defaultUser,
+        pushed_at: null,
+        pushed_by: null,
+        updated_by: null,
+      });
+    });
+  };
+
+  describe('bulk_create_attachments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    describe('creation', () => {
+      it('should no create an attachment on empty request', async () => {
+        const { theCase } = await createCaseAndBulkCreateAttachments({
+          supertest,
+          numberOfAttachments: 0,
+        });
+
+        expect(theCase.comments?.length).to.be(0);
+      });
+
+      it('should create one attachment', async () => {
+        const { theCase, attachments } = await createCaseAndBulkCreateAttachments({
+          supertest,
+          numberOfAttachments: 1,
+        });
+
+        validateComments(theCase.comments, attachments);
+      });
+
+      it('should bulk create multiple attachments', async () => {
+        const { theCase, attachments } = await createCaseAndBulkCreateAttachments({
+          supertest,
+        });
+
+        expect(theCase.totalComment).to.eql(attachments.length);
+        expect(theCase.updated_by).to.eql(defaultUser);
+
+        validateComments(theCase.comments, attachments);
+      });
+
+      it('creates the correct user action', async () => {
+        const { theCase, attachments } = await createCaseAndBulkCreateAttachments({
+          supertest,
+        });
+
+        const userActions = await getCaseUserActions({ supertest, caseID: theCase.id });
+
+        userActions.slice(1).forEach((userAction, index) => {
+          const userActionWithoutServerGeneratedAttributes =
+            removeServerGeneratedPropertiesFromUserAction(userAction);
+
+          expect(userActionWithoutServerGeneratedAttributes).to.eql({
+            type: 'comment',
+            action: 'create',
+            created_by: defaultUser,
+            payload: {
+              comment: {
+                ...attachments[index],
+              },
+            },
+            case_id: theCase.id,
+            comment_id: theCase.comments?.find((comment) => comment.id === userAction.comment_id)
+              ?.id,
+            owner: 'securitySolutionFixture',
+          });
+        });
+      });
+    });
+
+    describe('errors', () => {
+      it('400s when attempting to create a comment with a different owner than the case', async () => {
+        const postedCase = await createCase(
+          supertest,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' })
+        );
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'observabilityFixture',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when type is missing', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+            {
+              // @ts-expect-error
+              bad: 'comment',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when missing attributes for type user', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+            // @ts-expect-error
+            {
+              type: CommentType.user,
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when adding excess attributes for type user', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        for (const attribute of ['alertId', 'index']) {
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [
+              {
+                type: CommentType.user,
+                comment: 'test',
+                owner: 'securitySolutionFixture',
+              },
+              {
+                type: CommentType.user,
+                [attribute]: attribute,
+                comment: 'a comment',
+                owner: 'securitySolutionFixture',
+              },
+            ],
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('400s when missing attributes for type alert', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        const allRequestAttributes = {
+          type: CommentType.alert,
+          index: 'test-index',
+          alertId: 'test-id',
+          rule: {
+            id: 'id',
+            name: 'name',
+          },
+          owner: 'securitySolutionFixture',
+        };
+
+        for (const attribute of ['alertId', 'index']) {
+          const requestAttributes = omit(attribute, allRequestAttributes);
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [
+              {
+                type: CommentType.user,
+                comment: 'test',
+                owner: 'securitySolutionFixture',
+              },
+              // @ts-expect-error
+              requestAttributes,
+            ],
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('400s when adding excess attributes for type alert', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        for (const attribute of ['comment']) {
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [
+              {
+                type: CommentType.user,
+                comment: 'test',
+                owner: 'securitySolutionFixture',
+              },
+              {
+                type: CommentType.alert,
+                [attribute]: attribute,
+                alertId: 'test-id',
+                index: 'test-index',
+                rule: {
+                  id: 'id',
+                  name: 'name',
+                },
+                owner: 'securitySolutionFixture',
+              },
+            ],
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('404s when the case does not exist', async () => {
+        await bulkCreateAttachments({
+          supertest,
+          caseId: 'not-exists',
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+          ],
+          expectedHttpCode: 404,
+        });
+      });
+
+      it('400s when adding an alert to a closed case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.alert,
+              alertId: 'test-id',
+              index: 'test-index',
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              owner: 'securitySolutionFixture',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when adding an alert with other attachments to a closed case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        await createCaseAndBulkCreateAttachments({ supertest, expectedHttpCode: 400 });
+      });
+
+      it('400s when attempting to add more than 1K alerts to a case', async () => {
+        const alerts = [...Array(1001).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts,
+              index: alerts,
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when attempting to add more than 1K alerts to a case in the same request', async () => {
+        const alerts = [...Array(1001).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(0, 500),
+              index: alerts.slice(0, 500),
+            },
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(500, alerts.length),
+              index: alerts.slice(500, alerts.length),
+            },
+            postCommentAlertReq,
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when attempting to add an alert to a case that already has 1K alerts', async () => {
+        const alerts = [...Array(1000).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts,
+              index: alerts,
+            },
+          ],
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: 'test-id',
+              index: 'test-index',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when the case already has alerts and the sum of existing and new alerts exceed 1k', async () => {
+        const alerts = [...Array(1200).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(0, 500),
+              index: alerts.slice(0, 500),
+            },
+          ],
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(500),
+              index: alerts.slice(500),
+            },
+            postCommentAlertReq,
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+    });
+
+    describe('alerts', () => {
+      beforeEach(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+        await createSignalsIndex(supertest, log);
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest, log);
+        await deleteAllAlerts(supertest, log);
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      });
+
+      const bulkCreateAlertsAndVerifyAlertStatus = async (
+        syncAlerts: boolean,
+        expectedAlertStatus: string
+      ) => {
+        const rule = getRuleForSignalTesting(['auditbeat-*']);
+        const postedCase = await createCase(supertest, {
+          ...postCaseReq,
+          settings: { syncAlerts },
+        });
+
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+          },
+        });
+
+        const { id } = await createRule(supertest, log, rule);
+        await waitForRuleSuccessOrStatus(supertest, log, id);
+        await waitForSignalsToBePresent(supertest, log, 1, [id]);
+        const signals = await getSignalsByIds(supertest, log, [id]);
+        const attachments: CommentRequest[] = [];
+        const indices: string[] = [];
+        const ids: string[] = [];
+
+        signals.hits.hits.forEach((alert) => {
+          expect(alert._source?.[ALERT_WORKFLOW_STATUS]).eql('open');
+          attachments.push({
+            alertId: alert._id,
+            index: alert._index,
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+            owner: 'securitySolutionFixture',
+            type: CommentType.alert,
+          });
+
+          indices.push(alert._index);
+          ids.push(alert._id);
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: attachments,
+        });
+
+        await es.indices.refresh({ index: indices });
+
+        const { body: updatedAlerts } = await supertest
+          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getQuerySignalIds(ids))
+          .expect(200);
+
+        updatedAlerts.hits.hits.forEach(
+          (alert: { _source: { 'kibana.alert.workflow_status': string } }) => {
+            expect(alert._source[ALERT_WORKFLOW_STATUS]).eql(expectedAlertStatus);
+          }
+        );
+      };
+
+      it('should change the status of the alerts if sync alert is on', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(true, 'acknowledged');
+      });
+
+      it('should NOT change the status of the alert if sync alert is off', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(false, 'open');
+      });
+    });
+
+    describe('alert format', () => {
+      type AlertComment = CommentType.alert;
+
+      for (const [alertId, index, type] of [
+        ['1', ['index1', 'index2'], CommentType.alert],
+        [['1', '2'], 'index', CommentType.alert],
+      ]) {
+        it(`throws an error with an alert comment with contents id: ${alertId} indices: ${index} type: ${type}`, async () => {
+          const postedCase = await createCase(supertest, postCaseReq);
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [{ ...postCommentAlertReq, alertId, index, type: type as AlertComment }],
+            expectedHttpCode: 400,
+          });
+        });
+      }
+
+      it('does not throw an error with correct alert formatting', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const attachments = [
+          {
+            ...postCommentAlertReq,
+            alertId: '1',
+            index: ['index1'],
+            type: CommentType.alert as const,
+          },
+          {
+            ...postCommentAlertReq,
+            alertId: ['1', '2'],
+            index: ['index', 'other-index'],
+            type: CommentType.alert as const,
+          },
+        ];
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: attachments,
+          expectedHttpCode: 200,
+        });
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should bulk create attachments when the user has the correct permissions for that owner', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await bulkCreateAttachments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: [postCommentUserReq],
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+
+      it('should not create a comment when the user does not have permissions for that owner', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          { user: obsOnly, space: 'space1' }
+        );
+
+        await bulkCreateAttachments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: [{ ...postCommentUserReq, owner: 'observabilityFixture' }],
+          auth: { user: secOnly, space: 'space1' },
+          expectedHttpCode: 403,
+        });
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should not create a comment`, async () => {
+          const postedCase = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            superUserSpace1Auth
+          );
+
+          await bulkCreateAttachments({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            params: [postCommentUserReq],
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should not create a comment in a space the user does not have permissions for', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        await bulkCreateAttachments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: [postCommentUserReq],
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts
index adfb22d3cf145..ca99f5fb8a871 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { getPostCaseRequest } from '../../../../common/lib/mock';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -16,7 +17,6 @@ import {
   getCaseMetrics,
   updateCase,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
index b09059966a16b..283e6b0c5301b 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
@@ -6,7 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
   CaseResponse,
@@ -14,8 +13,9 @@ import {
   CommentType,
   ConnectorTypes,
   getCaseUserActionUrl,
-} from '../../../../../../plugins/cases/common/api';
-import { CreateCaseUserAction } from '../../../../../../plugins/cases/common/api/cases/user_actions/create_case';
+} from '@kbn/cases-plugin/common/api';
+import { CreateCaseUserAction } from '@kbn/cases-plugin/common/api/cases/user_actions/create_case';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { postCaseReq, postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
 import {
   deleteAllCaseItems,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
index 744d549aa8790..9bf55018bbbf4 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
@@ -6,13 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
+import { CaseUserActionsResponse, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASES_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import { deleteAllCaseItems, getCaseUserActions } from '../../../../common/lib/utils';
-import { CaseUserActionsResponse, CommentType } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
index 193621a422726..a92e4ee28ff5b 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
@@ -10,6 +10,7 @@
 import http from 'http';
 
 import expect from '@kbn/expect';
+import { CaseConnector, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -36,11 +37,6 @@ import {
   createConfiguration,
   getSignalsWithES,
 } from '../../../../common/lib/utils';
-import {
-  CaseConnector,
-  CaseStatuses,
-  CommentType,
-} from '../../../../../../plugins/cases/common/api';
 import {
   globalRead,
   noKibanaPrivileges,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
index 6d7f8398277f3..ee93dd1b07aab 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { UserActionWithResponse, PushedUserAction } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../../common/ftr_provider_context';
 
 import { defaultUser } from '../../../../../common/lib/mock';
@@ -23,10 +24,6 @@ import {
 } from '../../../../../common/lib/utils';
 
 import { ObjectRemover as ActionsRemover } from '../../../../../../alerting_api_integration/common/lib';
-import {
-  UserActionWithResponse,
-  PushedUserAction,
-} from '../../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
index 404b63376daa4..3809806d9ec11 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
@@ -20,7 +21,6 @@ import {
   getConfigurationOutput,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
index a4e69ab928325..b5a58d3af5086 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CASE_CONFIGURE_CONNECTORS_URL } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CASE_CONFIGURE_CONNECTORS_URL } from '../../../../../../plugins/cases/common/constants';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 import {
   getServiceNowConnector,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
index 26eba77dd2576..6fd90d0620fd2 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -21,7 +22,6 @@ import {
   createConnector,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
index 077bfc5861322..f9df2610dca29 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
@@ -7,7 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
index 1605003bf7015..985393eafe719 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
@@ -24,7 +24,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext): void => {
     // Trial
     loadTestFile(require.resolve('./cases/push_case'));
     loadTestFile(require.resolve('./cases/user_actions/get_all_user_actions'));
-    loadTestFile(require.resolve('./configure/index'));
+    loadTestFile(require.resolve('./configure'));
 
     // Common
     loadTestFile(require.resolve('../common'));
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts
index 1fc70b0f97f5d..4ac0573428445 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { getPostCaseRequest, nullUser, postCaseResp } from '../../../../common/lib/mock';
 import {
   deleteCasesByESQuery,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts
index 7f2a774c28f39..c4e46675e7549 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CaseStatuses } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
 import { postCaseReq } from '../../../../../common/lib/mock';
 import {
   createCase,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts
index 4df4c560413e8..2569d035fabb5 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
 import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
 import {
   createComment,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts
index 452d05c9c2362..286c0d7b6925d 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { AttributesTypeUser, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser, CommentType } from '../../../../../../plugins/cases/common/api';
 import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
 import {
   deleteCasesByESQuery,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts
index 72356d0d314ff..0f268e3288c82 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts
@@ -6,18 +6,16 @@
  */
 
 import expect from '@kbn/expect';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
 import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
 import {
-  deleteCasesByESQuery,
-  deleteCasesUserActions,
-  deleteComments,
   createCase,
   createComment,
   removeServerGeneratedPropertiesFromSavedObject,
   getAuthWithSuperUser,
+  deleteAllCaseItems,
 } from '../../../../common/lib/utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -28,9 +26,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
   describe('post_comment', () => {
     afterEach(async () => {
-      await deleteCasesByESQuery(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
+      await deleteAllCaseItems(es);
     });
 
     it('should post a comment in space1', async () => {
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts
index 251a545f10681..0b18a56bdcd11 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts
@@ -29,5 +29,10 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./configure/get_configure'));
     loadTestFile(require.resolve('./configure/patch_configure'));
     loadTestFile(require.resolve('./configure/post_configure'));
+
+    /**
+     * Internal routes
+     */
+    loadTestFile(require.resolve('./internal/bulk_create_attachments'));
   });
 };
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/internal/bulk_create_attachments.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/internal/bulk_create_attachments.ts
new file mode 100644
index 0000000000000..c39aa4bf1aae3
--- /dev/null
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/internal/bulk_create_attachments.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createCase,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getAuthWithSuperUser,
+  bulkCreateAttachments,
+  deleteAllCaseItems,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('bulk_create_attachments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should bulk create attachments in space1', async () => {
+      const postedCase = await createCase(supertestWithoutAuth, postCaseReq, 200, authSpace1);
+      const patchedCase = await bulkCreateAttachments({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: [postCommentUserReq],
+        auth: authSpace1,
+      });
+
+      const comment = removeServerGeneratedPropertiesFromSavedObject(
+        patchedCase.comments![0] as AttributesTypeUser
+      );
+
+      expect(comment).to.eql({
+        type: postCommentUserReq.type,
+        comment: postCommentUserReq.comment,
+        created_by: nullUser,
+        pushed_at: null,
+        pushed_by: null,
+        updated_by: null,
+        owner: 'securitySolutionFixture',
+      });
+
+      // updates the case correctly after adding a comment
+      expect(patchedCase.totalComment).to.eql(patchedCase.comments!.length);
+      expect(patchedCase.updated_by).to.eql(nullUser);
+    });
+
+    it('should not post a comment on a case in a different space', async () => {
+      const postedCase = await createCase(supertestWithoutAuth, postCaseReq, 200, authSpace1);
+      await bulkCreateAttachments({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: [postCommentUserReq],
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts
index 4da44f08c6236..405323005e64e 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
@@ -21,7 +22,6 @@ import {
   getAuthWithSuperUser,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 import { nullUser } from '../../../../common/lib/mock';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
index ca362d13ae459..084e05921fb47 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -23,7 +24,6 @@ import {
   getActionsSpace,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 import { nullUser } from '../../../../common/lib/mock';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts
index b815278db5bd8..13d2cc6070727 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts
@@ -7,7 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
index 5db4a25036eca..ff490693e86a2 100644
--- a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (): Plugin => ({
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
index 6bea9af2ed310..7f00f2b6b2b5b 100644
--- a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { getSAMLResponse, getSAMLRequestId } from './saml_tools';
 
 export function initRoutes(core: CoreSetup) {
diff --git a/x-pack/test/common/services/bsearch_secure.ts b/x-pack/test/common/services/bsearch_secure.ts
index c1aa173280f54..458e0878e187f 100644
--- a/x-pack/test/common/services/bsearch_secure.ts
+++ b/x-pack/test/common/services/bsearch_secure.ts
@@ -11,7 +11,7 @@
 import expect from '@kbn/expect';
 import request from 'superagent';
 import type SuperTest from 'supertest';
-import { IEsSearchResponse } from 'src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { RetryService } from '../../../../test/common/services/retry/retry';
 
diff --git a/x-pack/test/common/services/infra_log_views.ts b/x-pack/test/common/services/infra_log_views.ts
index df7eb96ebc793..94f7efef7992d 100644
--- a/x-pack/test/common/services/infra_log_views.ts
+++ b/x-pack/test/common/services/infra_log_views.ts
@@ -11,8 +11,8 @@ import {
   PutLogViewRequestPayload,
   putLogViewRequestPayloadRT,
   putLogViewResponsePayloadRT,
-} from '../../../plugins/infra/common/http_api/log_views';
-import { decodeOrThrow } from '../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/log_views';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function InfraLogViewsServiceProvider({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/common/services/ingest_manager.ts b/x-pack/test/common/services/ingest_manager.ts
index 1ee7e2e9316b9..1ef80be40d803 100644
--- a/x-pack/test/common/services/ingest_manager.ts
+++ b/x-pack/test/common/services/ingest_manager.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { fleetSetupRouteService } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { fleetSetupRouteService } from '../../../plugins/fleet/common';
 
 export function IngestManagerProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/common/services/security_solution/roles_users_utils.ts b/x-pack/test/common/services/security_solution/roles_users_utils.ts
index 34829e360cd20..f8e18fadc992e 100644
--- a/x-pack/test/common/services/security_solution/roles_users_utils.ts
+++ b/x-pack/test/common/services/security_solution/roles_users_utils.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { assertUnreachable } from '../../../../plugins/security_solution/common/utility_types';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { assertUnreachable } from '@kbn/security-solution-plugin/common/utility_types';
 import {
   t1AnalystUser,
   t2AnalystUser,
@@ -26,9 +25,10 @@ import {
   platformEngineerRole,
   detectionsAdminRole,
   readerRole,
-} from '../../../../plugins/security_solution/server/lib/detection_engine/scripts/roles_users';
+} from '@kbn/security-solution-plugin/server/lib/detection_engine/scripts/roles_users';
 
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export { ROLES };
 
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
index 8db3d9797b6df..70ee954bd9166 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { PrePackagedRulesAndTimelinesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
+import { PrePackagedRulesAndTimelinesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
 
-import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts
index fa78fdd5fe04e..7d32af43d1913 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts
index bb450d8f0efdc..3bdd1cc914d35 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_BULK_CREATE } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_CREATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts
index e5f828d0f862d..7dc77d7c1ab9b 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts
index 09c2f5960fae5..6d48b558d18a2 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_BULK_DELETE } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_DELETE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts
index 913f93d24c16e..833b9ccb9ee1f 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts
index 5d33e85d2d598..de445454f54ce 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts b/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts
index 6764ed27a43e7..c3b2eb3568ccb 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_PREPACKAGED_URL,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
index 662582fe6f0cc..8df19b4fb910d 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts b/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
index 0c9dfd05c9d4a..a1c34b51e12d5 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { TIMELINE_IMPORT_URL } from '../../../../plugins/security_solution/common/constants';
+import { TIMELINE_IMPORT_URL } from '@kbn/security-solution-plugin/common/constants';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteAllTimelines } from '../../utils';
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts b/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
index 20f5d3567ad23..016d04c64f577 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { TIMELINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { TIMELINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
index 005352a643af1..3ac8e7bb8b574 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
@@ -12,7 +12,8 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
+import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -26,7 +27,6 @@ import {
   waitForRuleSuccessOrStatus,
   getRuleForSignalTesting,
 } from '../../utils';
-import { DetectionAlert } from '../../../../plugins/security_solution/common/detection_engine/schemas/alerts';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts
index 34d0369f72c03..ae92c294867ce 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts
index dd1e36e4fb624..a79c9e19857b8 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts b/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts
index 48d13e8b2afd6..08d0be9d66d9c 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
   ALERTS_AS_DATA_FIND_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { getSignalStatus, createSignalsIndex, deleteSignalsIndex } from '../../utils';
 
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts
index b874f19f30d42..e37c17d35ccdf 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
index d0c839fcb1b62..983fdc4c8a285 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
@@ -9,8 +9,9 @@ import expect from '@kbn/expect';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../plugins/security_solution/common/constants';
-import { RAC_ALERTS_BULK_UPDATE_URL } from '../../../../plugins/timelines/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { RAC_ALERTS_BULK_UPDATE_URL } from '@kbn/timelines-plugin/common/constants';
+import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -23,7 +24,6 @@ import {
   waitForRuleSuccessOrStatus,
   getRuleForSignalTesting,
 } from '../../utils';
-import { DetectionAlert } from '../../../../plugins/security_solution/common/detection_engine/schemas/alerts';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts
index 66baade16bd3c..0a8ac78019630 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts
index a2043c49cdbc2..b614c1defa761 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_RULES_BULK_UPDATE,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
index 5506febb781f6..90c80c172fcfa 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts
index b935a38753e1f..512863e039e3a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { PrePackagedRulesAndTimelinesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
+import { PrePackagedRulesAndTimelinesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
 
-import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts
index 953dfb42b7b46..865185387c57c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts
@@ -11,7 +11,15 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL,
-} from '../../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ThreatEcs } from '@kbn/security-solution-plugin/common/ecs/threat';
+import {
+  EqlCreateSchema,
+  QueryCreateSchema,
+  SavedQueryCreateSchema,
+  ThreatMatchCreateSchema,
+  ThresholdCreateSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import {
   createRule,
   createSignalsIndex,
@@ -30,14 +38,6 @@ import {
   waitForSignalsToBePresent,
 } from '../../../utils';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { ThreatEcs } from '../../../../../plugins/security_solution/common/ecs/threat';
-import {
-  EqlCreateSchema,
-  QueryCreateSchema,
-  SavedQueryCreateSchema,
-  ThreatMatchCreateSchema,
-  ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts
index 766cc5406f2b1..467b87b6c64b9 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts
@@ -6,7 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { ThresholdCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -18,9 +21,6 @@ import {
   getThresholdRuleForSignalTesting,
 } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
-import { ThresholdCreateSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_endpoint_exceptions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_endpoint_exceptions.ts
index 76848db5d55e8..231d4138b1d19 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_endpoint_exceptions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_endpoint_exceptions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import expect from '@kbn/expect';
 
 import type SuperTest from 'supertest';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
index 0dfc753be402c..f44e72f5cd50a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
@@ -16,18 +16,13 @@ import {
   QueryCreateSchema,
   ThreatMatchCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import {
-  createListsIndex,
-  deleteAllExceptions,
-  deleteListsIndex,
-  importFile,
-} from '../../../lists_api_integration/utils';
-import { RulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -52,7 +47,12 @@ import {
   getEqlRuleForSignalTesting,
   getThresholdRuleForSignalTesting,
 } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import {
+  createListsIndex,
+  deleteAllExceptions,
+  deleteListsIndex,
+  importFile,
+} from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
index 6d867877e0dc3..bd39aea863461 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
@@ -9,9 +9,9 @@ import expect from '@kbn/expect';
 import {
   DEFAULT_ALERTS_INDEX,
   DETECTION_ENGINE_INDEX_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 
-import { SIGNALS_FIELD_ALIASES_VERSION } from '../../../../plugins/security_solution/server/lib/detection_engine/routes/index/get_signals_template';
+import { SIGNALS_FIELD_ALIASES_VERSION } from '@kbn/security-solution-plugin/server/lib/detection_engine/routes/index/get_signals_template';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteSignalsIndex } from '../../utils';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts
index 343db03c2ae27..20c914e17ce70 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts
@@ -22,7 +22,12 @@ import {
 } from '@kbn/rule-data-utils';
 import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
-import { MachineLearningCreateSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { MachineLearningCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import {
+  ALERT_ANCESTORS,
+  ALERT_DEPTH,
+  ALERT_ORIGINAL_TIME,
+} from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
@@ -36,11 +41,6 @@ import {
   deleteListsIndex,
   importFile,
 } from '../../../lists_api_integration/utils';
-import {
-  ALERT_ANCESTORS,
-  ALERT_DEPTH,
-  ALERT_ORIGINAL_TIME,
-} from '../../../../plugins/security_solution/common/field_maps/field_names';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts
index 82899ff0de8f7..8f9a057a7e90e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts
@@ -7,10 +7,11 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -30,13 +31,8 @@ import {
   waitForAlertToComplete,
   waitForSignalsToBePresent,
 } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
@@ -311,7 +307,6 @@ export default ({ getService }: FtrProviderContext) => {
           bodyId,
           RuleExecutionStatus['partial failure']
         );
-        await sleep(5000);
 
         const { body: rule } = await supertest
           .get(DETECTION_ENGINE_RULES_URL)
@@ -344,7 +339,6 @@ export default ({ getService }: FtrProviderContext) => {
           bodyId,
           RuleExecutionStatus['partial failure']
         );
-        await sleep(5000);
         await waitForSignalsToBePresent(supertest, log, 2, [bodyId]);
 
         const { body: rule } = await supertest
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts
index d2181d779e4e1..da5d54fdf2d7a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_BULK_CREATE } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_CREATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts
index 60cb8a4017905..5a5011f05aac5 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts
@@ -11,9 +11,10 @@ import {
   DEFAULT_SIGNALS_INDEX,
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-} from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
-import { SIGNALS_TEMPLATE_VERSION } from '../../../../plugins/security_solution/server/lib/detection_engine/routes/index/get_signals_template';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { SIGNALS_TEMPLATE_VERSION } from '@kbn/security-solution-plugin/server/lib/detection_engine/routes/index/get_signals_template';
+import { Signal } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -23,7 +24,6 @@ import {
   waitForIndexToPopulate,
 } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { Signal } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
 
 interface CreateResponse {
   index: string;
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
index 278018796d10a..b38b9b09bbe96 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
@@ -20,10 +20,22 @@ import {
 } from '@kbn/rule-data-utils';
 import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+
+import { getCreateThreatMatchRulesSchemaMock } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request/rule_schemas.mock';
+import { getThreatMatchingSchemaPartialMock } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema.mocks';
+import { ENRICHMENT_TYPES } from '@kbn/security-solution-plugin/common/cti/constants';
+import { Ancestor } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
+import {
+  ALERT_ANCESTORS,
+  ALERT_DEPTH,
+  ALERT_ORIGINAL_EVENT_ACTION,
+  ALERT_ORIGINAL_EVENT_CATEGORY,
+  ALERT_ORIGINAL_EVENT_MODULE,
+  ALERT_ORIGINAL_TIME,
+} from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import {
   createRule,
   createSignalsIndex,
@@ -34,19 +46,7 @@ import {
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
 } from '../../utils';
-
-import { getCreateThreatMatchRulesSchemaMock } from '../../../../plugins/security_solution/common/detection_engine/schemas/request/rule_schemas.mock';
-import { getThreatMatchingSchemaPartialMock } from '../../../../plugins/security_solution/common/detection_engine/schemas/response/rules_schema.mocks';
-import { ENRICHMENT_TYPES } from '../../../../plugins/security_solution/common/cti/constants';
-import { Ancestor } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import {
-  ALERT_ANCESTORS,
-  ALERT_DEPTH,
-  ALERT_ORIGINAL_EVENT_ACTION,
-  ALERT_ORIGINAL_EVENT_CATEGORY,
-  ALERT_ORIGINAL_EVENT_MODULE,
-  ALERT_ORIGINAL_TIME,
-} from '../../../../plugins/security_solution/common/field_maps/field_names';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 const format = (value: unknown): string => JSON.stringify(value, null, 2);
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts
index 19076506998a9..69cbd9fd4d4c7 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { BASE_ALERTING_API_PATH } from '../../../../plugins/alerting/common';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { BASE_ALERTING_API_PATH } from '@kbn/alerting-plugin/common';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createLegacyRuleAction,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts
index a2c20f8496049..29f5d5edf49d9 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { BASE_ALERTING_API_PATH } from '../../../../plugins/alerting/common';
-import { DETECTION_ENGINE_RULES_BULK_DELETE } from '../../../../plugins/security_solution/common/constants';
+import { BASE_ALERTING_API_PATH } from '@kbn/alerting-plugin/common';
+import { DETECTION_ENGINE_RULES_BULK_DELETE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createLegacyRuleAction,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts
index c73f817215da8..ecb4cab25286c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts
@@ -11,8 +11,8 @@ import {
   DEFAULT_SIGNALS_INDEX,
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-} from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createSignalsIndex, deleteSignalsIndex, getIndexNameFromLoad, waitFor } from '../../utils';
 import { createUserAndRole } from '../../../common/services/security_solution';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
index 7ea1985e8d7df..b30e16681d488 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts
index 8733c645112d1..009d212649248 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts
@@ -11,8 +11,8 @@ import {
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-} from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
index a56403ce54252..f2e5e19ed182f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts
index cb1dd1470190e..a374136ce4907 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts
@@ -23,14 +23,24 @@ import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
 import { orderBy, get } from 'lodash';
 
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
 import {
   EqlCreateSchema,
   QueryCreateSchema,
   SavedQueryCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { Ancestor } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
+import {
+  ALERT_ANCESTORS,
+  ALERT_DEPTH,
+  ALERT_ORIGINAL_TIME,
+  ALERT_ORIGINAL_EVENT,
+  ALERT_ORIGINAL_EVENT_CATEGORY,
+  ALERT_GROUP_ID,
+  ALERT_THRESHOLD_RESULT,
+} from '@kbn/security-solution-plugin/common/field_maps/field_names';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   createRule,
   createSignalsIndex,
@@ -46,17 +56,7 @@ import {
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
 } from '../../utils';
-import { Ancestor } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import {
-  ALERT_ANCESTORS,
-  ALERT_DEPTH,
-  ALERT_ORIGINAL_TIME,
-  ALERT_ORIGINAL_EVENT,
-  ALERT_ORIGINAL_EVENT_CATEGORY,
-  ALERT_GROUP_ID,
-  ALERT_THRESHOLD_RESULT,
-} from '../../../../plugins/security_solution/common/field_maps/field_names';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 /**
  * Specific _id to use for some of the tests. If the archiver changes and you see errors
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts
index 6764ed27a43e7..c3b2eb3568ccb 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_PREPACKAGED_URL,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts
index b8287c4433ba4..d3bddc8b0d46c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts
@@ -10,8 +10,8 @@ import expect from '@kbn/expect';
 import moment from 'moment';
 import { set } from '@elastic/safer-lodash-set';
 import uuid from 'uuid';
-import { detectionEngineRuleExecutionEventsUrl } from '../../../../plugins/security_solution/common/constants';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
+import { detectionEngineRuleExecutionEventsUrl } from '@kbn/security-solution-plugin/common/constants';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts
index a1400e865fa56..e5351b7e0f47b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL } from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import { DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createSignalsIndex, deleteSignalsIndex, getIndexNameFromLoad } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts
index 21d545aef0f04..b2dffead914b8 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 
-import { deleteAllExceptions } from '../../../lists_api_integration/utils';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
@@ -21,7 +21,7 @@ import {
   deleteSignalsIndex,
   getSimpleRule,
 } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import { deleteAllExceptions } from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // This test was meant to be more full flow, ensuring that
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
index e26471b0316ed..6c332b09483e2 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
@@ -8,8 +8,14 @@
 import expect from '@kbn/expect';
 
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import {
+  toNdJsonString,
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -22,14 +28,8 @@ import {
   removeServerGeneratedProperties,
   ruleToNdjson,
 } from '../../utils';
-import {
-  toNdJsonString,
-  getImportExceptionsListItemSchemaMock,
-  getImportExceptionsListSchemaMock,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
 import { deleteAllExceptions } from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 
 const getImportRuleBuffer = (connectorId: string) => {
   const rule1 = {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
index dbe24c77b57ae..a6d052a22bee6 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
@@ -25,7 +25,6 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
       loadTestFile(require.resolve('./create_rules_bulk'));
       loadTestFile(require.resolve('./create_ml'));
       loadTestFile(require.resolve('./create_threat_matching'));
-      loadTestFile(require.resolve('./create_exceptions'));
       loadTestFile(require.resolve('./delete_rules'));
       loadTestFile(require.resolve('./delete_rules_bulk'));
       loadTestFile(require.resolve('./export_rules'));
@@ -55,24 +54,30 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
       loadTestFile(require.resolve('./migrations'));
     });
 
+    describe('', function () {
+      this.tags('ciGroup14');
+
+      loadTestFile(require.resolve('./create_exceptions'));
+    });
+
     // That split here enable us on using a different ciGroup to run the tests
     // listed on ./exception_operators_data_types/index
     describe('', function () {
-      loadTestFile(require.resolve('./exception_operators_data_types/index'));
+      loadTestFile(require.resolve('./exception_operators_data_types'));
     });
 
     // That split here enable us on using a different ciGroup to run the tests
     // listed on ./keyword_family/index
     describe('', function () {
-      loadTestFile(require.resolve('./keyword_family/index'));
+      loadTestFile(require.resolve('./keyword_family'));
     });
 
     describe('', function () {
-      loadTestFile(require.resolve('./alerts/index'));
+      loadTestFile(require.resolve('./alerts'));
     });
 
     describe('', function () {
-      loadTestFile(require.resolve('./telemetry/index'));
+      loadTestFile(require.resolve('./telemetry'));
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
index 7b3f938ceef2b..011ed04376281 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   EqlCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_THRESHOLD_RESULT } from '../../../../../plugins/security_solution/common/field_maps/field_names';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_THRESHOLD_RESULT } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
index 964bb40add2a1..c07f0efb1df98 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
@@ -7,6 +7,12 @@
 
 import expect from '@kbn/expect';
 
+import {
+  EqlCreateSchema,
+  QueryCreateSchema,
+  ThresholdCreateSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_THRESHOLD_RESULT } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
   createRule,
@@ -20,12 +26,6 @@ import {
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
 } from '../../../utils';
-import {
-  EqlCreateSchema,
-  QueryCreateSchema,
-  ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_THRESHOLD_RESULT } from '../../../../../plugins/security_solution/common/field_maps/field_names';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
index c33354e383809..52c5ae615da95 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   EqlCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_THRESHOLD_RESULT } from '../../../../../plugins/security_solution/common/field_maps/field_names';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_THRESHOLD_RESULT } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
index 18edf09727d3a..0b7491e00b430 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
@@ -12,7 +12,9 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -28,8 +30,6 @@ import {
   getRuleForSignalTesting,
 } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
-import { DetectionAlert } from '../../../../plugins/security_solution/common/detection_engine/schemas/alerts';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
index ccfd8371c3f2d..ee94c94c99376 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
index e860c097c9964..41f8066e50779 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts
index 5b36d9a880397..10ae8f20da539 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts
@@ -10,11 +10,12 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_RULES_BULK_ACTION,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import {
   BulkAction,
   BulkActionEditType,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/common/schemas';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/common/schemas';
+import { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
@@ -28,7 +29,6 @@ import {
   createLegacyRuleAction,
   getLegacyActionSO,
 } from '../../utils';
-import { RulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts
index 14af40f901461..4f49e5ec17a6d 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_PREVIEW } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_PREVIEW } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteAllAlerts, getSimplePreviewRule, getSimpleRulePreviewOutput } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // eslint-disable-next-line import/no-default-export
@@ -91,6 +91,38 @@ export default ({ getService }: FtrProviderContext) => {
             .expect(403);
         });
       });
+
+      describe('hunter', () => {
+        const role = ROLES.hunter;
+
+        beforeEach(async () => {
+          await createUserAndRole(getService, role);
+        });
+
+        afterEach(async () => {
+          await deleteUserAndRole(getService, role);
+        });
+
+        it('should return with an error about not having correct permissions', async () => {
+          const { body } = await supertestWithoutAuth
+            .post(DETECTION_ENGINE_RULES_PREVIEW)
+            .auth(role, 'changeme')
+            .set('kbn-xsrf', 'true')
+            .send(getSimplePreviewRule())
+            .expect(200);
+
+          const { logs } = getSimpleRulePreviewOutput(undefined, [
+            {
+              errors: [
+                'Missing "read" privileges for the ".preview.alerts-security.alerts" or ".internal.preview.alerts-security.alerts" indices. Without these privileges you cannot use the Rule Preview feature.',
+              ],
+              warnings: [],
+              duration: 0,
+            },
+          ]);
+          expect(body).to.eql({ logs });
+        });
+      });
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts
index dc72146db3834..fa5453f07d22f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { DETECTION_ENGINE_PRIVILEGES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_PRIVILEGES_URL } from '@kbn/security-solution-plugin/common/constants';
 
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
index 92cc8cf52f18f..5f03ce094e95e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts
index b3469c89dd459..2b4b31bb5510b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createSignalsIndex, deleteAllAlerts, deleteSignalsIndex } from '../../utils';
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts
index 8936115ac6e59..d2050179abd0e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('Detection rule type telemetry', function () {
     describe('', function () {
-      this.tags('ciGroup11');
+      this.tags('ciGroup28');
       loadTestFile(require.resolve('./usage_collector/all_types'));
       loadTestFile(require.resolve('./usage_collector/detection_rules'));
       loadTestFile(require.resolve('./usage_collector/detection_rule_status'));
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts
index b80cb9d478ca3..627faebb2daaa 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts
@@ -8,6 +8,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import expect from '@kbn/expect';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   createRule,
@@ -22,7 +23,6 @@ import {
   createExceptionListItem,
 } from '../../../../utils';
 import { deleteAllExceptions } from '../../../../../lists_api_integration/utils';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../../plugins/security_solution/common/constants';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts
index 29baea4e4bd90..2e2a9811356cb 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { getInitialDetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/get_initial_usage';
 import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -13,7 +14,6 @@ import {
   deleteSignalsIndex,
   getStats,
 } from '../../../../utils';
-import { getInitialDetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/get_initial_usage';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts
index 9092cacdad050..05f7ce40d9d32 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts
@@ -6,15 +6,20 @@
  */
 
 import expect from '@kbn/expect';
-import type { MlJobUsageMetric } from '../../../../../../plugins/security_solution/server/usage/detections/ml_jobs/types';
-import type { RulesTypeUsage } from '../../../../../../plugins/security_solution/server/usage/detections/rules/types';
-import type { DetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/types';
+import type { MlJobUsageMetric } from '@kbn/security-solution-plugin/server/usage/detections/ml_jobs/types';
+import type { RulesTypeUsage } from '@kbn/security-solution-plugin/server/usage/detections/rules/types';
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
 import type {
   ThreatMatchCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
-import { getInitialMlJobUsage } from '../../../../../../plugins/security_solution/server/usage/detections/ml_jobs/get_initial_usage';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getInitialMlJobUsage } from '@kbn/security-solution-plugin/server/usage/detections/ml_jobs/get_initial_usage';
+import { getInitialDetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/get_initial_usage';
+import {
+  getInitialMaxAvgMin,
+  getInitialSingleEventLogUsage,
+  getInitialSingleEventMetric,
+} from '@kbn/security-solution-plugin/server/usage/detections/rules/get_initial_usage';
 import {
   createRule,
   createSignalsIndex,
@@ -29,12 +34,7 @@ import {
   waitForSignalsToBePresent,
   deleteAllEventLogExecutionEvents,
 } from '../../../../utils';
-import { getInitialDetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/get_initial_usage';
-import {
-  getInitialMaxAvgMin,
-  getInitialSingleEventLogUsage,
-  getInitialSingleEventMetric,
-} from '../../../../../../plugins/security_solution/server/usage/detections/rules/get_initial_usage';
+import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts
index d565960cb2442..febaf8df1890f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts
@@ -6,11 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import type { DetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/types';
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
 import type {
   ThreatMatchCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../../plugins/security_solution/common/detection_engine/schemas/request';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getInitialDetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/get_initial_usage';
+import { getInitialEventLogUsage } from '@kbn/security-solution-plugin/server/usage/detections/rules/get_initial_usage';
 import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   createLegacyRuleAction,
@@ -34,8 +36,6 @@ import {
   updateRule,
   deleteAllEventLogExecutionEvents,
 } from '../../../../utils';
-import { getInitialDetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/get_initial_usage';
-import { getInitialEventLogUsage } from '../../../../../../plugins/security_solution/server/usage/detections/rules/get_initial_usage';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts
index ec12446f1f9df..9a459b1ffb0e1 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import {
   DETECTION_ENGINE_RULES_URL,
   NOTIFICATION_THROTTLE_NO_ACTIONS,
   NOTIFICATION_THROTTLE_RULE,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts
index e0d539a3fe33b..cdec24ae1cc14 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 import { orderBy } from 'lodash';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
 import {
   EqlCreateSchema,
   QueryCreateSchema,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_ORIGINAL_TIME } from '../../../../plugins/security_solution/common/field_maps/field_names';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_ORIGINAL_TIME } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
@@ -27,10 +27,6 @@ import {
   getEqlRuleForSignalTesting,
 } from '../../utils';
 
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
@@ -70,7 +66,6 @@ export default ({ getService }: FtrProviderContext) => {
           const rule = getRuleForSignalTesting(['timestamp_in_seconds']);
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -86,7 +81,6 @@ export default ({ getService }: FtrProviderContext) => {
           };
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -101,7 +95,6 @@ export default ({ getService }: FtrProviderContext) => {
           const rule = getEqlRuleForSignalTesting(['timestamp_in_seconds']);
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -117,7 +110,6 @@ export default ({ getService }: FtrProviderContext) => {
           };
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -184,7 +176,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 3, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id], 3);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -204,7 +195,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -226,7 +216,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id, id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -249,7 +238,6 @@ export default ({ getService }: FtrProviderContext) => {
           const { id } = await createRule(supertest, log, rule);
 
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id, id]);
           const hits = signalsResponse.hits.hits
@@ -271,7 +259,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -293,7 +280,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id, id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -348,7 +334,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 200, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id], 200);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts
index a46df0711c45d..53062e2c2cae6 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
index 819683b564c68..0291164fd39cb 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
index e754cb2c02080..19447dec2b4a8 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
@@ -6,12 +6,12 @@
  */
 
 import expect from '@kbn/expect';
-import { FullResponseSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 
 import {
   DETECTION_ENGINE_RULES_URL,
   DETECTION_ENGINE_RULES_BULK_UPDATE,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
deleted file mode 100644
index 2087e0d6ab523..0000000000000
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ /dev/null
@@ -1,2111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
-import { KbnClient } from '@kbn/test';
-import { ALERT_RULE_RULE_ID, ALERT_RULE_UUID } from '@kbn/rule-data-utils';
-
-import type { TransportResult } from '@elastic/elasticsearch';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { Client } from '@elastic/elasticsearch';
-import type SuperTest from 'supertest';
-import type {
-  ListArray,
-  NonEmptyEntriesArray,
-  OsTypeArray,
-} from '@kbn/securitysolution-io-ts-list-types';
-import type {
-  CreateExceptionListItemSchema,
-  CreateExceptionListSchema,
-  ExceptionListItemSchema,
-  ExceptionListSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
-import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { ToolingLog } from '@kbn/dev-utils';
-import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import { SavedObjectReference } from 'kibana/server';
-import { PrePackagedRulesAndTimelinesStatusSchema } from '../../plugins/security_solution/common/detection_engine/schemas/response';
-import {
-  CreateRulesSchema,
-  UpdateRulesSchema,
-  FullResponseSchema,
-  QueryCreateSchema,
-  EqlCreateSchema,
-  ThresholdCreateSchema,
-  PreviewRulesSchema,
-  ThreatMatchCreateSchema,
-  RulePreviewLogs,
-  SavedQueryCreateSchema,
-} from '../../plugins/security_solution/common/detection_engine/schemas/request';
-import { signalsMigrationType } from '../../plugins/security_solution/server/lib/detection_engine/migrations/saved_objects';
-import {
-  RuleExecutionStatus,
-  Status,
-  SignalIds,
-} from '../../plugins/security_solution/common/detection_engine/schemas/common';
-import { RulesSchema } from '../../plugins/security_solution/common/detection_engine/schemas/response/rules_schema';
-import {
-  DETECTION_ENGINE_INDEX_URL,
-  DETECTION_ENGINE_PREPACKAGED_URL,
-  DETECTION_ENGINE_QUERY_SIGNALS_URL,
-  DETECTION_ENGINE_RULES_BULK_ACTION,
-  DETECTION_ENGINE_RULES_URL,
-  DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
-  DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-  INTERNAL_IMMUTABLE_KEY,
-  INTERNAL_RULE_ID_KEY,
-  SECURITY_TELEMETRY_URL,
-  UPDATE_OR_CREATE_LEGACY_ACTIONS,
-} from '../../plugins/security_solution/common/constants';
-import { DetectionMetrics } from '../../plugins/security_solution/server/usage/detections/types';
-import { LegacyRuleActions } from '../../plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types';
-import { DetectionAlert } from '../../plugins/security_solution/common/detection_engine/schemas/alerts';
-
-/**
- * This will remove server generated properties such as date times, etc...
- * @param rule Rule to pass in to remove typical server generated properties
- */
-export const removeServerGeneratedProperties = (
-  rule: FullResponseSchema
-): Partial<FullResponseSchema> => {
-  const {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    id,
-    created_at,
-    updated_at,
-    execution_summary,
-    /* eslint-enable @typescript-eslint/naming-convention */
-    ...removedProperties
-  } = rule;
-  return removedProperties;
-};
-
-/**
- * This will remove server generated properties such as date times, etc... including the rule_id
- * @param rule Rule to pass in to remove typical server generated properties
- */
-export const removeServerGeneratedPropertiesIncludingRuleId = (
-  rule: FullResponseSchema
-): Partial<FullResponseSchema> => {
-  const ruleWithRemovedProperties = removeServerGeneratedProperties(rule);
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { rule_id, ...additionalRuledIdRemoved } = ruleWithRemovedProperties;
-  return additionalRuledIdRemoved;
-};
-
-/**
- * This is a typical simple rule for testing that is easy for most basic testing
- * @param ruleId
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getSimpleRule = (ruleId = 'rule-1', enabled = false): QueryCreateSchema => ({
-  name: 'Simple Rule Query',
-  description: 'Simple Rule Query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index: ['auditbeat-*'],
-  type: 'query',
-  query: 'user.name: root or user.name: admin',
-});
-
-/**
- * This is a typical simple preview rule for testing that is easy for most basic testing
- * @param ruleId
- * @param enabled The number of times the rule will be run through the executors. Defaulted to 12,
- * the execution time for the default interval time of 5m.
- */
-export const getSimplePreviewRule = (
-  ruleId = 'preview-rule-1',
-  invocationCount = 12
-): PreviewRulesSchema => ({
-  name: 'Simple Rule Query',
-  description: 'Simple Rule Query',
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index: ['auditbeat-*'],
-  type: 'query',
-  query: 'user.name: root or user.name: admin',
-  invocationCount,
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is rule-1 by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'rule-1',
-  enabled = true
-): QueryCreateSchema => ({
-  name: 'Signal Testing Query',
-  description: 'Tests a simple query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index,
-  type: 'query',
-  query: '*:*',
-  from: '1900-01-01T00:00:00.000Z',
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of Saved Query signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for SavedQuery and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is threshold-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getSavedQueryRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'saved-query-rule',
-  enabled = true
-): SavedQueryCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'saved_query',
-  saved_id: 'abcd',
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of EQL signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for EQL and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is eql-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getEqlRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'eql-rule',
-  enabled = true
-): EqlCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'eql',
-  language: 'eql',
-  query: 'any where true',
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of Threat Match signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for Threat Match and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is threshold-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getThreatMatchRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'threat-match-rule',
-  enabled = true
-): ThreatMatchCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'threat_match',
-  language: 'kuery',
-  query: '*:*',
-  threat_query: '*:*',
-  threat_mapping: [
-    // We match host.name against host.name
-    {
-      entries: [
-        {
-          field: 'host.name',
-          value: 'host.name',
-          type: 'mapping',
-        },
-      ],
-    },
-  ],
-  threat_index: index, // match against same index for simplicity
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of Threshold signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for Threshold and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is threshold-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getThresholdRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'threshold-rule',
-  enabled = true
-): ThresholdCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'threshold',
-  language: 'kuery',
-  query: '*:*',
-  threshold: {
-    field: 'process.name',
-    value: 21,
-  },
-});
-
-export const getRuleForSignalTestingWithTimestampOverride = (
-  index: string[],
-  ruleId = 'rule-1',
-  enabled = true,
-  timestampOverride = 'event.ingested'
-): QueryCreateSchema => ({
-  name: 'Signal Testing Query',
-  description: 'Tests a simple query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index,
-  type: 'query',
-  query: '*:*',
-  timestamp_override: timestampOverride,
-  from: '1900-01-01T00:00:00.000Z',
-});
-
-/**
- * This is a typical simple rule for testing that is easy for most basic testing
- * @param ruleId The rule id
- * @param enabled Set to tru to enable it, by default it is off
- */
-export const getSimpleRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
-  name: 'Simple Rule Query',
-  description: 'Simple Rule Query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index: ['auditbeat-*'],
-  type: 'query',
-  query: 'user.name: root or user.name: admin',
-});
-
-/**
- * This is a representative ML rule payload as expected by the server
- * @param ruleId The rule id
- * @param enabled Set to tru to enable it, by default it is off
- */
-export const getSimpleMlRule = (ruleId = 'rule-1', enabled = false): CreateRulesSchema => ({
-  name: 'Simple ML Rule',
-  description: 'Simple Machine Learning Rule',
-  enabled,
-  anomaly_threshold: 44,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  machine_learning_job_id: ['some_job_id'],
-  type: 'machine_learning',
-});
-
-/**
- * This is a representative ML rule payload as expected by the server for an update
- * @param ruleId The rule id
- * @param enabled Set to tru to enable it, by default it is off
- */
-export const getSimpleMlRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
-  name: 'Simple ML Rule',
-  description: 'Simple Machine Learning Rule',
-  enabled,
-  anomaly_threshold: 44,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  machine_learning_job_id: ['some_job_id'],
-  type: 'machine_learning',
-});
-
-export const getSignalStatus = () => ({
-  aggs: { statuses: { terms: { field: 'kibana.alert.workflow_status', size: 10 } } },
-});
-
-export const getQueryAllSignals = () => ({
-  query: { match_all: {} },
-});
-
-export const getQuerySignalIds = (signalIds: SignalIds) => ({
-  query: {
-    terms: {
-      _id: signalIds,
-    },
-  },
-});
-
-/**
- * Given an array of ruleIds for a test this will get the signals
- * created from that rule_id.
- * @param ruleIds The rule_id to search for signals
- */
-export const getQuerySignalsRuleId = (ruleIds: string[]) => ({
-  query: {
-    terms: {
-      [ALERT_RULE_RULE_ID]: ruleIds,
-    },
-  },
-});
-
-/**
- * Given an array of ids for a test this will get the signals
- * created from that rule's regular id.
- * @param ruleIds The rule_id to search for signals
- */
-export const getQuerySignalsId = (ids: string[], size = 10) => ({
-  size,
-  query: {
-    terms: {
-      [ALERT_RULE_UUID]: ids,
-    },
-  },
-});
-
-export const setSignalStatus = ({
-  signalIds,
-  status,
-}: {
-  signalIds: SignalIds;
-  status: Status;
-}) => ({
-  signal_ids: signalIds,
-  status,
-});
-
-export const getSignalStatusEmptyResponse = () => ({
-  timed_out: false,
-  total: 0,
-  updated: 0,
-  deleted: 0,
-  batches: 0,
-  version_conflicts: 0,
-  noops: 0,
-  retries: { bulk: 0, search: 0 },
-  throttled_millis: 0,
-  requests_per_second: -1,
-  throttled_until_millis: 0,
-  failures: [],
-});
-
-/**
- * This is a typical simple rule for testing that is easy for most basic testing
- */
-export const getSimpleRuleWithoutRuleId = (): CreateRulesSchema => {
-  const simpleRule = getSimpleRule();
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { rule_id, ...ruleWithoutId } = simpleRule;
-  return ruleWithoutId;
-};
-
-/**
- * Useful for export_api testing to convert from a multi-part binary back to a string
- * @param res Response
- * @param callback Callback
- */
-export const binaryToString = (res: any, callback: any): void => {
-  res.setEncoding('binary');
-  res.data = '';
-  res.on('data', (chunk: any) => {
-    res.data += chunk;
-  });
-  res.on('end', () => {
-    callback(null, Buffer.from(res.data));
-  });
-};
-
-/**
- * This is the typical output of a simple rule that Kibana will output with all the defaults
- * except for the server generated properties.  Useful for testing end to end tests.
- */
-export const getSimpleRuleOutput = (ruleId = 'rule-1', enabled = false): Partial<RulesSchema> => ({
-  actions: [],
-  author: [],
-  created_by: 'elastic',
-  description: 'Simple Rule Query',
-  enabled,
-  false_positives: [],
-  from: 'now-6m',
-  immutable: false,
-  index: ['auditbeat-*'],
-  interval: '5m',
-  rule_id: ruleId,
-  language: 'kuery',
-  output_index: '.siem-signals-default',
-  max_signals: 100,
-  risk_score: 1,
-  risk_score_mapping: [],
-  name: 'Simple Rule Query',
-  query: 'user.name: root or user.name: admin',
-  references: [],
-  severity: 'high',
-  severity_mapping: [],
-  updated_by: 'elastic',
-  tags: [],
-  to: 'now',
-  type: 'query',
-  threat: [],
-  throttle: 'no_actions',
-  exceptions_list: [],
-  version: 1,
-});
-
-/**
- * This is the typical output of a simple rule preview, with errors and warnings coming up from the rule
- * execution process and a `previewId` generated server side for later preview querying
- *
- * @param previewId Rule id generated by the server itself
- * @param logs Errors and warnings returned by executor and route file, defaults to empty array
- */
-export const getSimpleRulePreviewOutput = (
-  previewId = undefined,
-  logs: RulePreviewLogs[] = []
-) => ({
-  logs,
-  previewId,
-  isAborted: false,
-});
-
-export const resolveSimpleRuleOutput = (
-  ruleId = 'rule-1',
-  enabled = false
-): Partial<RulesSchema> => ({ outcome: 'exactMatch', ...getSimpleRuleOutput(ruleId, enabled) });
-
-/**
- * This is the typical output of a simple rule that Kibana will output with all the defaults except
- * for all the server generated properties such as created_by. Useful for testing end to end tests.
- */
-export const getSimpleRuleOutputWithoutRuleId = (ruleId = 'rule-1'): Partial<RulesSchema> => {
-  const rule = getSimpleRuleOutput(ruleId);
-  const { rule_id: rId, ...ruleWithoutRuleId } = rule;
-  return ruleWithoutRuleId;
-};
-
-/**
- * This is the typical output of a simple rule that Kibana will output with all the defaults except
- * for all the server generated properties such as created_by. Useful for testing end to end tests.
- */
-export const resolveSimpleRuleOutputWithoutRuleId = (ruleId = 'rule-1'): Partial<RulesSchema> => {
-  const rule = getSimpleRuleOutput(ruleId);
-  const { rule_id: rId, ...ruleWithoutRuleId } = rule;
-  return { outcome: 'exactMatch', ...ruleWithoutRuleId };
-};
-
-export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => {
-  const rule = getSimpleRuleOutput(ruleId);
-  const { query, language, index, ...rest } = rule;
-
-  return {
-    ...rest,
-    name: 'Simple ML Rule',
-    description: 'Simple Machine Learning Rule',
-    anomaly_threshold: 44,
-    machine_learning_job_id: ['some_job_id'],
-    type: 'machine_learning',
-  };
-};
-
-/**
- * Removes all rules by looping over any found and removing them from REST.
- * @param supertest The supertest agent.
- */
-export const deleteAllAlerts = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      await supertest
-        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
-        .send({ action: 'delete', query: '' })
-        .set('kbn-xsrf', 'true');
-
-      const { body: finalCheck } = await supertest
-        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
-        .set('kbn-xsrf', 'true')
-        .send();
-      return finalCheck.data.length === 0;
-    },
-    'deleteAllAlerts',
-    log,
-    50,
-    1000
-  );
-};
-
-export const downgradeImmutableRule = async (
-  es: Client,
-  log: ToolingLog,
-  ruleId: string
-): Promise<void> => {
-  return countDownES(
-    async () => {
-      return es.updateByQuery(
-        {
-          index: '.kibana',
-          refresh: true,
-          wait_for_completion: true,
-          body: {
-            script: {
-              lang: 'painless',
-              source: 'ctx._source.alert.params.version--',
-            },
-            query: {
-              term: {
-                'alert.tags': `${INTERNAL_RULE_ID_KEY}:${ruleId}`,
-              },
-            },
-          },
-        },
-        { meta: true }
-      );
-    },
-    'downgradeImmutableRule',
-    log
-  );
-};
-
-/**
- * Remove all timelines from the .kibana index
- * @param es The ElasticSearch handle
- */
-export const deleteAllTimelines = async (es: Client): Promise<void> => {
-  await es.deleteByQuery({
-    index: '.kibana',
-    q: 'type:siem-ui-timeline',
-    wait_for_completion: true,
-    refresh: true,
-    body: {},
-  });
-};
-
-/**
- * Remove all rules execution info saved objects from the .kibana index
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
- * @param es The ElasticSearch handle
- * @param log The tooling logger
- */
-export const deleteAllRuleExecutionInfo = async (es: Client, log: ToolingLog): Promise<void> => {
-  return countDownES(
-    async () => {
-      return es.deleteByQuery(
-        {
-          index: '.kibana',
-          q: 'type:siem-detection-engine-rule-execution-info',
-          wait_for_completion: true,
-          refresh: true,
-          body: {},
-        },
-        { meta: true }
-      );
-    },
-    'deleteAllRuleExecutionInfo',
-    log
-  );
-};
-
-/**
- * Creates the signals index for use inside of beforeEach blocks of tests
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
- * @param supertest The supertest client library
- */
-export const createSignalsIndex = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
-      return true;
-    },
-    'createSignalsIndex',
-    log
-  );
-};
-
-export const createLegacyRuleAction = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  alertId: string,
-  connectorId: string
-): Promise<unknown> =>
-  supertest
-    .post(`${UPDATE_OR_CREATE_LEGACY_ACTIONS}`)
-    .set('kbn-xsrf', 'true')
-    .query({ alert_id: alertId })
-    .send({
-      name: 'Legacy notification with one action',
-      interval: '1h',
-      actions: [
-        {
-          id: connectorId,
-          group: 'default',
-          params: {
-            message: 'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
-          },
-          actionTypeId: '.slack',
-        },
-      ],
-    });
-
-/**
- * Deletes the signals index for use inside of afterEach blocks of tests
- * @param supertest The supertest client library
- */
-export const deleteSignalsIndex = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
-      return true;
-    },
-    'deleteSignalsIndex',
-    log
-  );
-};
-
-/**
- * Given an array of rule_id strings this will return a ndjson buffer which is useful
- * for testing uploads.
- * @param ruleIds Array of strings of rule_ids
- */
-export const getSimpleRuleAsNdjson = (ruleIds: string[], enabled = false): Buffer => {
-  const stringOfRules = ruleIds.map((ruleId) => {
-    const simpleRule = getSimpleRule(ruleId, enabled);
-    return JSON.stringify(simpleRule);
-  });
-  return Buffer.from(stringOfRules.join('\n'));
-};
-
-/**
- * Given a rule this will convert it to an ndjson buffer which is useful for
- * testing upload features.
- * @param rule The rule to convert to ndjson
- */
-export const ruleToNdjson = (rule: CreateRulesSchema): Buffer => {
-  const stringified = JSON.stringify(rule);
-  return Buffer.from(`${stringified}\n`);
-};
-
-/**
- * This will return a complex rule with all the outputs possible
- * @param ruleId The ruleId to set which is optional and defaults to rule-1
- */
-export const getComplexRule = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
-  actions: [],
-  author: [],
-  name: 'Complex Rule Query',
-  description: 'Complex Rule Query',
-  false_positives: [
-    'https://www.example.com/some-article-about-a-false-positive',
-    'some text string about why another condition could be a false positive',
-  ],
-  risk_score: 1,
-  risk_score_mapping: [],
-  rule_id: ruleId,
-  filters: [
-    {
-      query: {
-        match_phrase: {
-          'host.name': 'siem-windows',
-        },
-      },
-    },
-  ],
-  enabled: false,
-  index: ['auditbeat-*', 'filebeat-*'],
-  interval: '5m',
-  output_index: '.siem-signals-default',
-  meta: {
-    anything_you_want_ui_related_or_otherwise: {
-      as_deep_structured_as_you_need: {
-        any_data_type: {},
-      },
-    },
-  },
-  max_signals: 10,
-  tags: ['tag 1', 'tag 2', 'any tag you want'],
-  to: 'now',
-  from: 'now-6m',
-  severity: 'high',
-  severity_mapping: [],
-  language: 'kuery',
-  type: 'query',
-  threat: [
-    {
-      framework: 'MITRE ATT&CK',
-      tactic: {
-        id: 'TA0040',
-        name: 'impact',
-        reference: 'https://attack.mitre.org/tactics/TA0040/',
-      },
-      technique: [
-        {
-          id: 'T1499',
-          name: 'endpoint denial of service',
-          reference: 'https://attack.mitre.org/techniques/T1499/',
-        },
-      ],
-    },
-    {
-      framework: 'Some other Framework you want',
-      tactic: {
-        id: 'some-other-id',
-        name: 'Some other name',
-        reference: 'https://example.com',
-      },
-      technique: [
-        {
-          id: 'some-other-id',
-          name: 'some other technique name',
-          reference: 'https://example.com',
-        },
-      ],
-    },
-  ],
-  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',
-  timeline_title: 'timeline_title',
-  note: '# some investigation documentation',
-  version: 1,
-  query: 'user.name: root or user.name: admin',
-});
-
-/**
- * This will return a complex rule with all the outputs possible
- * @param ruleId The ruleId to set which is optional and defaults to rule-1
- */
-export const getComplexRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
-  actions: [],
-  author: [],
-  created_by: 'elastic',
-  name: 'Complex Rule Query',
-  description: 'Complex Rule Query',
-  false_positives: [
-    'https://www.example.com/some-article-about-a-false-positive',
-    'some text string about why another condition could be a false positive',
-  ],
-  risk_score: 1,
-  risk_score_mapping: [],
-  rule_id: ruleId,
-  filters: [
-    {
-      query: {
-        match_phrase: {
-          'host.name': 'siem-windows',
-        },
-      },
-    },
-  ],
-  enabled: false,
-  index: ['auditbeat-*', 'filebeat-*'],
-  immutable: false,
-  interval: '5m',
-  output_index: '.siem-signals-default',
-  meta: {
-    anything_you_want_ui_related_or_otherwise: {
-      as_deep_structured_as_you_need: {
-        any_data_type: {},
-      },
-    },
-  },
-  max_signals: 10,
-  tags: ['tag 1', 'tag 2', 'any tag you want'],
-  to: 'now',
-  from: 'now-6m',
-  severity: 'high',
-  severity_mapping: [],
-  language: 'kuery',
-  type: 'query',
-  threat: [
-    {
-      framework: 'MITRE ATT&CK',
-      tactic: {
-        id: 'TA0040',
-        name: 'impact',
-        reference: 'https://attack.mitre.org/tactics/TA0040/',
-      },
-      technique: [
-        {
-          id: 'T1499',
-          name: 'endpoint denial of service',
-          reference: 'https://attack.mitre.org/techniques/T1499/',
-        },
-      ],
-    },
-    {
-      framework: 'Some other Framework you want',
-      tactic: {
-        id: 'some-other-id',
-        name: 'Some other name',
-        reference: 'https://example.com',
-      },
-      technique: [
-        {
-          id: 'some-other-id',
-          name: 'some other technique name',
-          reference: 'https://example.com',
-        },
-      ],
-    },
-  ],
-  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',
-  ],
-  throttle: 'no_actions',
-  timeline_id: 'timeline_id',
-  timeline_title: 'timeline_title',
-  updated_by: 'elastic',
-  note: '# some investigation documentation',
-  version: 1,
-  query: 'user.name: root or user.name: admin',
-  exceptions_list: [],
-});
-
-export const getWebHookAction = () => ({
-  actionTypeId: '.webhook',
-  config: {
-    method: 'post',
-    url: 'http://localhost',
-  },
-  secrets: {
-    user: 'example',
-    password: 'example',
-  },
-  name: 'Some connector',
-});
-
-export const getRuleWithWebHookAction = (
-  id: string,
-  enabled = false,
-  rule?: CreateRulesSchema
-): CreateRulesSchema | UpdateRulesSchema => {
-  const finalRule = rule != null ? { ...rule, enabled } : getSimpleRule('rule-1', enabled);
-  return {
-    ...finalRule,
-    throttle: 'rule',
-    actions: [
-      {
-        group: 'default',
-        id,
-        params: {
-          body: '{}',
-        },
-        action_type_id: '.webhook',
-      },
-    ],
-  };
-};
-
-export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial<RulesSchema> => ({
-  ...getSimpleRuleOutput(),
-  throttle: 'rule',
-  actions: [
-    {
-      action_type_id: '.webhook',
-      group: 'default',
-      id: actionId,
-      params: {
-        body: '{}',
-      },
-    },
-  ],
-});
-
-// Similar to ReactJs's waitFor from here: https://testing-library.com/docs/dom-testing-library/api-async#waitfor
-export const waitFor = async (
-  functionToTest: () => Promise<boolean>,
-  functionName: string,
-  log: ToolingLog,
-  maxTimeout: number = 400000,
-  timeoutWait: number = 250
-): Promise<void> => {
-  let found = false;
-  let numberOfTries = 0;
-  const maxTries = Math.floor(maxTimeout / timeoutWait);
-  while (!found && numberOfTries < maxTries) {
-    if (await functionToTest()) {
-      found = true;
-    } else {
-      log.debug(`Try number ${numberOfTries} out of ${maxTries} for function ${functionName}`);
-      numberOfTries++;
-    }
-
-    await new Promise((resolveTimeout) => setTimeout(resolveTimeout, timeoutWait));
-  }
-
-  if (!found) {
-    throw new Error(`timed out waiting for function condition to be true within ${functionName}`);
-  }
-};
-
-/**
- * Does a plain countdown and checks against es queries for either conflicts in the error
- * or for any over the wire issues such as timeouts or temp 404's to make the tests more
- * reliant.
- * @param esFunction The function to test against
- * @param esFunctionName The name of the function to print if we encounter errors
- * @param log The tooling logger
- * @param retryCount The number of times to retry before giving up (has default)
- * @param timeoutWait Time to wait before trying again (has default)
- */
-export const countDownES = async (
-  esFunction: () => Promise<TransportResult<Record<string, any>, unknown>>,
-  esFunctionName: string,
-  log: ToolingLog,
-  retryCount: number = 20,
-  timeoutWait = 250
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      const result = await esFunction();
-      if (result.body.version_conflicts !== 0) {
-        log.error(`Version conflicts for ${result.body.version_conflicts}`);
-        return false;
-      } else {
-        return true;
-      }
-    },
-    esFunctionName,
-    log,
-    retryCount,
-    timeoutWait
-  );
-};
-
-/**
- * Refresh an index, making changes available to search.
- * Useful for tests where we want to ensure that a rule does NOT create alerts, e.g. testing exceptions.
- * @param es The ElasticSearch handle
- */
-export const refreshIndex = async (es: Client, index?: string) => {
-  await es.indices.refresh({
-    index,
-  });
-};
-
-/**
- * Does a plain countdown and checks against a boolean to determine if to wait and try again.
- * This is useful for over the wire things that can cause issues such as conflict or timeouts
- * for testing resiliency.
- * @param functionToTest The function to test against
- * @param name The name of the function to print if we encounter errors
- * @param log The tooling logger
- * @param retryCount The number of times to retry before giving up (has default)
- * @param timeoutWait Time to wait before trying again (has default)
- */
-export const countDownTest = async (
-  functionToTest: () => Promise<boolean>,
-  name: string,
-  log: ToolingLog,
-  retryCount: number = 20,
-  timeoutWait = 250,
-  ignoreThrow: boolean = false
-) => {
-  if (retryCount > 0) {
-    try {
-      const passed = await functionToTest();
-      if (!passed) {
-        log.error(`Failure trying to ${name}, retries left are: ${retryCount - 1}`);
-        // retry, counting down, and delay a bit before
-        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
-        await countDownTest(functionToTest, name, log, retryCount - 1, timeoutWait, ignoreThrow);
-      }
-    } catch (err) {
-      if (ignoreThrow) {
-        throw err;
-      } else {
-        log.error(
-          `Failure trying to ${name}, with exception message of: ${
-            err.message
-          }, retries left are: ${retryCount - 1}`
-        );
-        // retry, counting down, and delay a bit before
-        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
-        await countDownTest(functionToTest, name, log, retryCount - 1, timeoutWait, ignoreThrow);
-      }
-    }
-  } else {
-    log.error(`Could not ${name}, no retries are left`);
-  }
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. If this detects
- * a conflict it will try to manually remove the rule before re-adding the rule one time and log
- * and error about the race condition.
- * rule a second attempt. It only re-tries adding the rule if it encounters a conflict once.
- * @param supertest The supertest deps
- * @param log The tooling logger
- * @param rule The rule to create
- */
-export const createRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  rule: CreateRulesSchema
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .send(rule);
-  if (response.status === 409) {
-    if (rule.rule_id != null) {
-      log.debug(
-        `Did not get an expected 200 "ok" when creating a rule (createRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-          response.body
-        )}, status: ${JSON.stringify(response.status)}`
-      );
-      await deleteRule(supertest, log, rule.rule_id);
-      const secondResponseTry = await supertest
-        .post(DETECTION_ENGINE_RULES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(rule);
-      if (secondResponseTry.status !== 200) {
-        throw new Error(
-          `Unexpected non 200 ok when attempting to create a rule (second try): ${JSON.stringify(
-            response.body
-          )}`
-        );
-      } else {
-        return secondResponseTry.body;
-      }
-    } else {
-      throw new Error('When creating a rule found an unexpected conflict (404)');
-    }
-  } else if (response.status !== 200) {
-    throw new Error(
-      `Unexpected non 200 ok when attempting to create a rule: ${JSON.stringify(response.status)}`
-    );
-  } else {
-    return response.body;
-  }
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. Does a delete of a rule.
- * It does not check for a 200 "ok" on this.
- * @param supertest The supertest deps
- * @param ruleId The rule id to delete
- * @param log The tooling logger
- */
-export const deleteRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleId: string
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .delete(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
-    .set('kbn-xsrf', 'true');
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when deleting the rule (deleteRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests.
- * @param supertest The supertest deps
- * @param rule The rule to create
- */
-export const createRuleWithAuth = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  rule: CreateRulesSchema,
-  auth: { user: string; pass: string }
-): Promise<FullResponseSchema> => {
-  const { body } = await supertest
-    .post(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .auth(auth.user, auth.pass)
-    .send(rule);
-  return body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This checks for
- * an expected 200 still and does not do any retries.
- * @param supertest The supertest deps
- * @param rule The rule to create
- */
-export const updateRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  updatedRule: UpdateRulesSchema
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .put(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .send(updatedRule);
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when updating a rule (updateRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This
- * creates a new action and expects a 200 and does not do any retries.
- * @param supertest The supertest deps
- */
-export const createNewAction = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-) => {
-  const response = await supertest
-    .post('/api/actions/action')
-    .set('kbn-xsrf', 'true')
-    .send(getWebHookAction());
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when creating a new action. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This
- * uses the find API to get an immutable rule by id.
- * @param supertest The supertest deps
- */
-export const findImmutableRuleById = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleId: string
-): Promise<{
-  page: number;
-  perPage: number;
-  total: number;
-  data: FullResponseSchema[];
-}> => {
-  const response = await supertest
-    .get(
-      `${DETECTION_ENGINE_RULES_URL}/_find?filter=alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true" AND alert.attributes.tags: "${INTERNAL_RULE_ID_KEY}:${ruleId}"`
-    )
-    .set('kbn-xsrf', 'true')
-    .send();
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when finding an immutable rule by id (findImmutableRuleById). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This
- * creates a new action and expects a 200 and does not do any retries.
- * @param supertest The supertest deps
- */
-export const getPrePackagedRulesStatus = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<PrePackagedRulesAndTimelinesStatusSchema> => {
-  const response = await supertest
-    .get(`${DETECTION_ENGINE_PREPACKAGED_URL}/_status`)
-    .set('kbn-xsrf', 'true')
-    .send();
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a pre-packaged rule status. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This checks for
- * an expected 200 still and does not try to any retries. Creates exception lists
- * @param supertest The supertest deps
- * @param exceptionList The exception list to create
- * @param log The tooling logger
- */
-export const createExceptionList = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  exceptionList: CreateExceptionListSchema
-): Promise<ExceptionListSchema> => {
-  const response = await supertest
-    .post(EXCEPTION_LIST_URL)
-    .set('kbn-xsrf', 'true')
-    .send(exceptionList);
-
-  if (response.status === 409) {
-    if (exceptionList.list_id != null) {
-      log.error(
-        `When creating an exception list found an unexpected conflict (409) creating an exception list (createExceptionList), will attempt a cleanup and one time re-try. This usually indicates a bad cleanup or race condition within the tests: ${JSON.stringify(
-          response.body
-        )}, status: ${JSON.stringify(response.status)}`
-      );
-      await deleteExceptionList(supertest, log, exceptionList.list_id);
-      const secondResponseTry = await supertest
-        .post(EXCEPTION_LIST_URL)
-        .set('kbn-xsrf', 'true')
-        .send(exceptionList);
-      if (secondResponseTry.status !== 200) {
-        throw new Error(
-          `Unexpected non 200 ok when attempting to create an exception list (second try): ${JSON.stringify(
-            response.body
-          )}`
-        );
-      } else {
-        return secondResponseTry.body;
-      }
-    } else {
-      throw new Error('When creating an exception list found an unexpected conflict (404)');
-    }
-  } else if (response.status !== 200) {
-    throw new Error(
-      `Unexpected non 200 ok when attempting to create an exception list: ${JSON.stringify(
-        response.status
-      )}`
-    );
-  } else {
-    return response.body;
-  }
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. Does a delete of an exception list.
- * It does not check for a 200 "ok" on this.
- * @param supertest The supertest deps
- * @param listId The exception list to delete
- * @param log The tooling logger
- */
-export const deleteExceptionList = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  listId: string
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .delete(`${EXCEPTION_LIST_URL}?list_id=${listId}`)
-    .set('kbn-xsrf', 'true');
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when deleting an exception list (deleteExceptionList). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This checks for
- * an expected 200 still and does not try to any retries. Creates exception lists
- * @param supertest The supertest deps
- * @param exceptionListItem The exception list item to create
- * @param log The tooling logger
- */
-export const createExceptionListItem = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  exceptionListItem: CreateExceptionListItemSchema
-): Promise<ExceptionListItemSchema> => {
-  const response = await supertest
-    .post(EXCEPTION_LIST_ITEM_URL)
-    .set('kbn-xsrf', 'true')
-    .send(exceptionListItem);
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when creating an exception list item (createExceptionListItem). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This gets
- * a particular rule.
- * @param supertest The supertest deps
- * @param rule The rule to create
- */
-export const getRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleId: string
-): Promise<RulesSchema> => {
-  const response = await supertest
-    .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
-    .set('kbn-xsrf', 'true');
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a rule (getRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-export const waitForAlertToComplete = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  id: string
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const response = await supertest.get(`/api/alerts/alert/${id}/state`).set('kbn-xsrf', 'true');
-      if (response.status !== 200) {
-        log.debug(
-          `Did not get an expected 200 "ok" when waiting for an alert to complete (waitForAlertToComplete). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-            response.body
-          )}, status: ${JSON.stringify(response.status)}`
-        );
-      }
-      return response.body.previousStartedAt != null;
-    },
-    'waitForAlertToComplete',
-    log
-  );
-};
-
-/**
- * Waits for the rule in find status to be 'succeeded'
- * or the provided status, before continuing
- * @param supertest Deps
- */
-export const waitForRuleSuccessOrStatus = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  id: string,
-  status: RuleExecutionStatus = RuleExecutionStatus.succeeded,
-  afterDate?: Date
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      try {
-        const response = await supertest
-          .get(DETECTION_ENGINE_RULES_URL)
-          .set('kbn-xsrf', 'true')
-          .query({ id });
-        if (response.status !== 200) {
-          log.debug(
-            `Did not get an expected 200 "ok" when waiting for a rule success or status (waitForRuleSuccessOrStatus). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-              response.body
-            )}, status: ${JSON.stringify(response.status)}`
-          );
-        }
-
-        // TODO: https://github.com/elastic/kibana/pull/121644 clean up, make type-safe
-        const rule = response.body;
-        const ruleStatus = rule?.execution_summary?.last_execution.status;
-        const ruleStatusDate = rule?.execution_summary?.last_execution.date;
-
-        if (ruleStatus !== status) {
-          log.debug(
-            `Did not get an expected status of ${status} while waiting for a rule success or status for rule id ${id} (waitForRuleSuccessOrStatus). Will continue retrying until status is found. body: ${JSON.stringify(
-              response.body
-            )}, status: ${JSON.stringify(response.status)}`
-          );
-        }
-        return (
-          rule != null &&
-          ruleStatus === status &&
-          (afterDate ? new Date(ruleStatusDate) > afterDate : true)
-        );
-      } catch (e) {
-        if ((e as Error).message.includes('got 503 "Service Unavailable"')) {
-          return false;
-        }
-        throw e;
-      }
-    },
-    'waitForRuleSuccessOrStatus',
-    log
-  );
-};
-
-/**
- * Waits for the signal hits to be greater than the supplied number
- * before continuing with a default of at least one signal
- * @param supertest Deps
- * @param numberOfSignals The number of signals to wait for, default is 1
- */
-export const waitForSignalsToBePresent = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  numberOfSignals = 1,
-  signalIds: string[]
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const signalsOpen = await getSignalsByIds(supertest, log, signalIds, numberOfSignals);
-      return signalsOpen.hits.hits.length >= numberOfSignals;
-    },
-    'waitForSignalsToBePresent',
-    log
-  );
-};
-
-/**
- * Waits for the event-log execution completed doc count to be greater than the
- * supplied number before continuing with a default of at least one execution
- * @param es The ES client
- * @param log
- * @param ruleId The id of rule to check execution logs for
- * @param totalExecutions The number of executions to wait for, default is 1
- */
-export const waitForEventLogExecuteComplete = async (
-  es: Client,
-  log: ToolingLog,
-  ruleId: string,
-  totalExecutions = 1
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const executionCount = await getEventLogExecuteCompleteById(es, log, ruleId);
-      return executionCount >= totalExecutions;
-    },
-    'waitForEventLogExecuteComplete',
-    log
-  );
-};
-
-/**
- * Given a single rule id this will return the number of event-log execution
- * completed docs
- * @param es The ES client
- * @param log
- * @param ruleId Rule id
- */
-export const getEventLogExecuteCompleteById = async (
-  es: Client,
-  log: ToolingLog,
-  ruleId: string
-): Promise<number> => {
-  const response = await es.search({
-    index: '.kibana-event-log*',
-    track_total_hits: true,
-    size: 0,
-    query: {
-      bool: {
-        must: [],
-        filter: [
-          {
-            match_phrase: {
-              'event.provider': 'alerting',
-            },
-          },
-          {
-            match_phrase: {
-              'event.action': 'execute',
-            },
-          },
-          {
-            match_phrase: {
-              'rule.id': ruleId,
-            },
-          },
-        ],
-        should: [],
-        must_not: [],
-      },
-    },
-  });
-
-  return (response?.hits?.total as SearchTotalHits)?.value ?? 0;
-};
-
-/**
- * Indexes provided execution events into .kibana-event-log-*
- * @param es The ElasticSearch handle
- * @param log The tooling logger
- * @param events
- */
-export const indexEventLogExecutionEvents = async (
-  es: Client,
-  log: ToolingLog,
-  events: object[]
-): Promise<void> => {
-  const operations = events.flatMap((doc: object) => [
-    { index: { _index: '.kibana-event-log-*' } },
-    doc,
-  ]);
-
-  await es.bulk({ refresh: true, operations });
-
-  return;
-};
-
-/**
- * Remove all .kibana-event-log-* documents with an execution.uuid
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
- * @param es The ElasticSearch handle
- * @param log The tooling logger
- */
-export const deleteAllEventLogExecutionEvents = async (
-  es: Client,
-  log: ToolingLog
-): Promise<void> => {
-  return countDownES(
-    async () => {
-      return es.deleteByQuery(
-        {
-          index: '.kibana-event-log-*',
-          q: '_exists_:kibana.alert.rule.execution.uuid',
-          wait_for_completion: true,
-          refresh: true,
-          body: {},
-        },
-        { meta: true }
-      );
-    },
-    'deleteAllEventLogExecutionEvents',
-    log
-  );
-};
-
-/**
- * Returns all signals both closed and opened by ruleId
- * @param supertest Deps
- */
-export const getSignalsByRuleIds = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleIds: string[]
-): Promise<estypes.SearchResponse<DetectionAlert>> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-    .set('kbn-xsrf', 'true')
-    .send(getQuerySignalsRuleId(ruleIds));
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a signal by rule_id (getSignalsByRuleIds). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-
-  const { body: signalsOpen }: { body: estypes.SearchResponse<DetectionAlert> } = response;
-  return signalsOpen;
-};
-
-/**
- * Given an array of rule ids this will return only signals based on that rule id both
- * open and closed
- * @param supertest agent
- * @param ids Array of the rule ids
- */
-export const getSignalsByIds = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ids: string[],
-  size?: number
-): Promise<estypes.SearchResponse<DetectionAlert>> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-    .set('kbn-xsrf', 'true')
-    .send(getQuerySignalsId(ids, size));
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a signal by id. CI issues could happen (getSignalsByIds). Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  const { body: signalsOpen }: { body: estypes.SearchResponse<DetectionAlert> } = response;
-  return signalsOpen;
-};
-
-/**
- * Given a single rule id this will return only signals based on that rule id.
- * @param supertest agent
- * @param ids Rule id
- */
-export const getSignalsById = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  id: string
-): Promise<estypes.SearchResponse<DetectionAlert>> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-    .set('kbn-xsrf', 'true')
-    .send(getQuerySignalsId([id]));
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting signals by id (getSignalsById). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  const { body: signalsOpen }: { body: estypes.SearchResponse<DetectionAlert> } = response;
-  return signalsOpen;
-};
-
-export const installPrePackagedRules = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      const { status, body } = await supertest
-        .put(DETECTION_ENGINE_PREPACKAGED_URL)
-        .set('kbn-xsrf', 'true')
-        .send();
-      if (status !== 200) {
-        log.debug(
-          `Did not get an expected 200 "ok" when installing pre-packaged rules (installPrePackagedRules) yet. Retrying until we get a 200 "ok". body: ${JSON.stringify(
-            body
-          )}, status: ${JSON.stringify(status)}`
-        );
-      }
-
-      return status === 200;
-    },
-    'installPrePackagedRules',
-    log
-  );
-};
-
-/**
- * Convenience testing function where you can pass in just the endpoint entries and you will
- * get a container created with the entries.
- * @param supertest super test agent
- * @param endpointEntries The endpoint entries to create the rule and exception list from
- * @param osTypes The os types to optionally add or not to add to the container
- */
-export const createContainerWithEndpointEntries = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  endpointEntries: Array<{
-    entries: NonEmptyEntriesArray;
-    osTypes: OsTypeArray | undefined;
-  }>
-): Promise<ListArray> => {
-  // If not given any endpoint entries, return without any
-  if (endpointEntries.length === 0) {
-    return [];
-  }
-
-  // create the endpoint exception list container
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
-    description: 'endpoint description',
-    list_id: 'endpoint_list',
-    name: 'endpoint_list',
-    type: 'endpoint',
-  });
-
-  // Add the endpoint exception list container to the backend
-  await Promise.all(
-    endpointEntries.map((endpointEntry) => {
-      const exceptionListItem: CreateExceptionListItemSchema = {
-        description: 'endpoint description',
-        entries: endpointEntry.entries,
-        list_id: 'endpoint_list',
-        name: 'endpoint_list',
-        os_types: endpointEntry.osTypes,
-        type: 'simple',
-      };
-      return createExceptionListItem(supertest, log, exceptionListItem);
-    })
-  );
-
-  // To reduce the odds of in-determinism and/or bugs we ensure we have
-  // the same length of entries before continuing.
-  await waitFor(
-    async () => {
-      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
-      return body.data.length === endpointEntries.length;
-    },
-    `within createContainerWithEndpointEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
-    log
-  );
-
-  return [
-    {
-      id,
-      list_id,
-      namespace_type,
-      type,
-    },
-  ];
-};
-
-/**
- * Convenience testing function where you can pass in just the endpoint entries and you will
- * get a container created with the entries.
- * @param supertest super test agent
- * @param entries The entries to create the rule and exception list from
- * @param osTypes The os types to optionally add or not to add to the container
- */
-export const createContainerWithEntries = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  entries: NonEmptyEntriesArray[]
-): Promise<ListArray> => {
-  // If not given any endpoint entries, return without any
-  if (entries.length === 0) {
-    return [];
-  }
-  // Create the rule exception list container
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
-    description: 'some description',
-    list_id: 'some-list-id',
-    name: 'some name',
-    type: 'detection',
-  });
-
-  // Add the rule exception list container to the backend
-  await Promise.all(
-    entries.map((entry) => {
-      const exceptionListItem: CreateExceptionListItemSchema = {
-        description: 'some description',
-        list_id: 'some-list-id',
-        name: 'some name',
-        type: 'simple',
-        entries: entry,
-      };
-      return createExceptionListItem(supertest, log, exceptionListItem);
-    })
-  );
-
-  // To reduce the odds of in-determinism and/or bugs we ensure we have
-  // the same length of entries before continuing.
-  await waitFor(
-    async () => {
-      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
-      return body.data.length === entries.length;
-    },
-    `within createContainerWithEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
-    log
-  );
-
-  return [
-    {
-      id,
-      list_id,
-      namespace_type,
-      type,
-    },
-  ];
-};
-
-/**
- * Convenience testing function where you can pass in just the entries and you will
- * get a rule created with the entries added to an exception list and exception list item
- * all auto-created at once.
- * @param supertest super test agent
- * @param rule The rule to create and attach an exception list to
- * @param entries The entries to create the rule and exception list from
- * @param endpointEntries The endpoint entries to create the rule and exception list from
- * @param osTypes The os types to optionally add or not to add to the container
- */
-export const createRuleWithExceptionEntries = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  rule: CreateRulesSchema,
-  entries: NonEmptyEntriesArray[],
-  endpointEntries?: Array<{
-    entries: NonEmptyEntriesArray;
-    osTypes: OsTypeArray | undefined;
-  }>
-): Promise<FullResponseSchema> => {
-  const maybeExceptionList = await createContainerWithEntries(supertest, log, entries);
-  const maybeEndpointList = await createContainerWithEndpointEntries(
-    supertest,
-    log,
-    endpointEntries ?? []
-  );
-
-  // create the rule but don't run it immediately as running it immediately can cause
-  // the rule to sometimes not filter correctly the first time with an exception list
-  // or other timing issues. Then afterwards wait for the rule to have succeeded before
-  // returning.
-  const ruleWithException: CreateRulesSchema = {
-    ...rule,
-    enabled: false,
-    exceptions_list: [...maybeExceptionList, ...maybeEndpointList],
-  };
-  const ruleResponse = await createRule(supertest, log, ruleWithException);
-  const response = await supertest
-    .patch(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ rule_id: ruleResponse.rule_id, enabled: true });
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when patching a rule with exception entries (createRuleWithExceptionEntries). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return ruleResponse;
-};
-
-export const getIndexNameFromLoad = (loadResponse: Record<string, unknown>): string => {
-  const indexNames = Object.keys(loadResponse);
-  if (indexNames.length > 1) {
-    throw new Error(
-      `expected load response to contain one index, but contained multiple: [${indexNames}]`
-    );
-  }
-  return indexNames[0];
-};
-
-/**
- * Waits for the given index to contain documents
- *
- * @param esClient elasticsearch {@link Client}
- * @param index name of the index to query
- */
-export const waitForIndexToPopulate = async (
-  es: Client,
-  log: ToolingLog,
-  index: string
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const response = await es.count({ index });
-      return response.count > 0;
-    },
-    `waitForIndexToPopulate: ${index}`,
-    log
-  );
-};
-
-export const deleteMigrations = async ({
-  ids,
-  kbnClient,
-}: {
-  ids: string[];
-  kbnClient: KbnClient;
-}): Promise<void> => {
-  await Promise.all(
-    ids.map((id) =>
-      kbnClient.savedObjects.delete({
-        id,
-        type: signalsMigrationType,
-      })
-    )
-  );
-};
-
-interface CreateMigrationResponse {
-  index: string;
-  migration_index: string;
-  migration_id: string;
-}
-
-export const startSignalsMigration = async ({
-  indices,
-  supertest,
-  log,
-}: {
-  supertest: SuperTest.SuperTest<SuperTest.Test>;
-  log: ToolingLog;
-  indices: string[];
-}): Promise<CreateMigrationResponse[]> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_SIGNALS_MIGRATION_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ index: indices });
-
-  const {
-    body: { indices: created },
-  }: { body: { indices: CreateMigrationResponse[] } } = response;
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when starting a signals migration (startSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return created;
-};
-
-interface FinalizeMigrationResponse {
-  id: string;
-  completed?: boolean;
-  error?: unknown;
-}
-
-export const finalizeSignalsMigration = async ({
-  migrationIds,
-  supertest,
-  log,
-}: {
-  supertest: SuperTest.SuperTest<SuperTest.Test>;
-  log: ToolingLog;
-  migrationIds: string[];
-}): Promise<FinalizeMigrationResponse[]> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ migration_ids: migrationIds });
-
-  const {
-    body: { migrations },
-  }: { body: { migrations: FinalizeMigrationResponse[] } } = response;
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when finalizing signals migration (finalizeSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return migrations;
-};
-
-export const getOpenSignals = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  es: Client,
-  rule: FullResponseSchema
-) => {
-  await waitForRuleSuccessOrStatus(supertest, log, rule.id);
-  // Critically important that we wait for rule success AND refresh the write index in that order before we
-  // assert that no signals were created. Otherwise, signals could be written but not available to query yet
-  // when we search, causing tests that check that signals are NOT created to pass when they should fail.
-  await refreshIndex(es, '.alerts-security.alerts-default*');
-  return getSignalsByIds(supertest, log, [rule.id]);
-};
-
-/**
- * Cluster stats URL. Replace this with any from kibana core if there is ever a constant there for this.
- */
-export const getStatsUrl = (): string => '/api/telemetry/v2/clusters/_stats';
-
-/**
- * Given a body this will return the detection metrics from it.
- * @param body The Stats body
- * @returns Detection metrics
- */
-export const getDetectionMetricsFromBody = (
-  body: Array<{
-    stats: {
-      stack_stats: {
-        kibana: { plugins: { security_solution: { detectionMetrics: DetectionMetrics } } };
-      };
-    };
-  }>
-): DetectionMetrics => {
-  return body[0].stats.stack_stats.kibana.plugins.security_solution.detectionMetrics;
-};
-
-/**
- * Gets the stats from the stats endpoint.
- * @param supertest The supertest agent.
- * @returns The detection metrics
- */
-export const getStats = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<DetectionMetrics> => {
-  const response = await supertest
-    .post(getStatsUrl())
-    .set('kbn-xsrf', 'true')
-    .send({ unencrypted: true, refreshCache: true });
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting the stats for detections. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return getDetectionMetricsFromBody(response.body);
-};
-
-/**
- * Gets the stats from the stats endpoint within specifically the security_solutions application.
- * This is considered the "batch" telemetry.
- * @param supertest The supertest agent.
- * @returns The detection metrics
- */
-export const getSecurityTelemetryStats = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<any> => {
-  const response = await supertest
-    .get(SECURITY_TELEMETRY_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ unencrypted: true, refreshCache: true });
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting the batch stats for security_solutions. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * This is a typical simple indicator match/threat match for testing that is easy for most basic testing
- * @param ruleId
- * @param enabled Enables the rule on creation or not. Defaulted to false.
- */
-export const getSimpleThreatMatch = (
-  ruleId = 'rule-1',
-  enabled = false
-): ThreatMatchCreateSchema => ({
-  description: 'Detecting root and admin users',
-  name: 'Query with a rule id',
-  severity: 'high',
-  enabled,
-  index: ['auditbeat-*'],
-  type: 'threat_match',
-  risk_score: 55,
-  language: 'kuery',
-  rule_id: ruleId,
-  from: '1900-01-01T00:00:00.000Z',
-  query: '*:*',
-  threat_query: '*:*',
-  threat_index: ['auditbeat-*'],
-  threat_mapping: [
-    // We match host.name against host.name
-    {
-      entries: [
-        {
-          field: 'host.name',
-          value: 'host.name',
-          type: 'mapping',
-        },
-      ],
-    },
-  ],
-  threat_filters: [],
-});
-
-interface LegacyActionSO extends LegacyRuleActions {
-  references: SavedObjectReference[];
-}
-
-/**
- * Fetch all legacy action sidecar SOs from the .kibana index
- * @param es The ElasticSearch service
- */
-export const getLegacyActionSO = async (es: Client): Promise<SearchResponse<LegacyActionSO>> =>
-  es.search({
-    index: '.kibana',
-    q: 'type:siem-detection-engine-rule-actions',
-  });
diff --git a/x-pack/test/detection_engine_api_integration/utils/binary_to_string.ts b/x-pack/test/detection_engine_api_integration/utils/binary_to_string.ts
new file mode 100644
index 0000000000000..47202a385de56
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/binary_to_string.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Useful for export_api testing to convert from a multi-part binary back to a string
+ * @param res Response
+ * @param callback Callback
+ */
+export const binaryToString = (res: any, callback: any): void => {
+  res.setEncoding('binary');
+  res.data = '';
+  res.on('data', (chunk: any) => {
+    res.data += chunk;
+  });
+  res.on('end', () => {
+    callback(null, Buffer.from(res.data));
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/count_down_es.ts b/x-pack/test/detection_engine_api_integration/utils/count_down_es.ts
new file mode 100644
index 0000000000000..cfbcafbc06cb6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/count_down_es.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TransportResult } from '@elastic/elasticsearch';
+import type { ToolingLog } from '@kbn/tooling-log';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Does a plain countdown and checks against es queries for either conflicts in the error
+ * or for any over the wire issues such as timeouts or temp 404's to make the tests more
+ * reliant.
+ * @param esFunction The function to test against
+ * @param esFunctionName The name of the function to print if we encounter errors
+ * @param log The tooling logger
+ * @param retryCount The number of times to retry before giving up (has default)
+ * @param timeoutWait Time to wait before trying again (has default)
+ */
+export const countDownES = async (
+  esFunction: () => Promise<TransportResult<Record<string, any>, unknown>>,
+  esFunctionName: string,
+  log: ToolingLog,
+  retryCount: number = 50,
+  timeoutWait = 250
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      const result = await esFunction();
+      if (result.body.version_conflicts !== 0) {
+        return {
+          passed: false,
+          errorMessage: 'Version conflicts for ${result.body.version_conflicts}',
+        };
+      } else {
+        return { passed: true };
+      }
+    },
+    esFunctionName,
+    log,
+    retryCount,
+    timeoutWait
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/count_down_test.ts b/x-pack/test/detection_engine_api_integration/utils/count_down_test.ts
new file mode 100644
index 0000000000000..39292a9cbbbb7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/count_down_test.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+
+/**
+ * Does a plain countdown and checks against a boolean to determine if to wait and try again.
+ * This is useful for over the wire things that can cause issues such as conflict or timeouts
+ * for testing resiliency.
+ * @param functionToTest The function to test against
+ * @param name The name of the function to print if we encounter errors
+ * @param log The tooling logger
+ * @param retryCount The number of times to retry before giving up (has default)
+ * @param timeoutWait Time to wait before trying again (has default)
+ */
+export const countDownTest = async <T>(
+  functionToTest: () => Promise<{
+    passed: boolean;
+    returnValue?: T | undefined;
+    errorMessage?: string;
+  }>,
+  name: string,
+  log: ToolingLog,
+  retryCount: number = 50,
+  timeoutWait = 250,
+  ignoreThrow: boolean = false
+): Promise<T | undefined> => {
+  if (retryCount > 0) {
+    try {
+      const testReturn = await functionToTest();
+      if (!testReturn.passed) {
+        const error = testReturn.errorMessage != null ? ` error: ${testReturn.errorMessage},` : '';
+        log.error(`Failure trying to ${name},${error} retries left are: ${retryCount - 1}`);
+        // retry, counting down, and delay a bit before
+        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
+        const returnValue = await countDownTest(
+          functionToTest,
+          name,
+          log,
+          retryCount - 1,
+          timeoutWait,
+          ignoreThrow
+        );
+        return returnValue;
+      } else {
+        return testReturn.returnValue;
+      }
+    } catch (err) {
+      if (ignoreThrow) {
+        throw err;
+      } else {
+        log.error(
+          `Failure trying to ${name}, with exception message of: ${
+            err.message
+          }, retries left are: ${retryCount - 1}`
+        );
+        // retry, counting down, and delay a bit before
+        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
+        const returnValue = await countDownTest(
+          functionToTest,
+          name,
+          log,
+          retryCount - 1,
+          timeoutWait,
+          ignoreThrow
+        );
+        return returnValue;
+      }
+    }
+  } else {
+    log.error(`Could not ${name}, no retries are left`);
+    return undefined;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_container_with_endpoint_entries.ts b/x-pack/test/detection_engine_api_integration/utils/create_container_with_endpoint_entries.ts
new file mode 100644
index 0000000000000..ca04e01c654e9
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_container_with_endpoint_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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type {
+  CreateExceptionListItemSchema,
+  ListArray,
+  NonEmptyEntriesArray,
+  OsTypeArray,
+} from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+import { createExceptionListItem } from './create_exception_list_item';
+import { waitFor } from './wait_for';
+import { createExceptionList } from './create_exception_list';
+
+/**
+ * Convenience testing function where you can pass in just the endpoint entries and you will
+ * get a container created with the entries.
+ * @param supertest super test agent
+ * @param endpointEntries The endpoint entries to create the rule and exception list from
+ * @param osTypes The os types to optionally add or not to add to the container
+ */
+export const createContainerWithEndpointEntries = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  endpointEntries: Array<{
+    entries: NonEmptyEntriesArray;
+    osTypes: OsTypeArray | undefined;
+  }>
+): Promise<ListArray> => {
+  // If not given any endpoint entries, return without any
+  if (endpointEntries.length === 0) {
+    return [];
+  }
+
+  // create the endpoint exception list container
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
+    description: 'endpoint description',
+    list_id: 'endpoint_list',
+    name: 'endpoint_list',
+    type: 'endpoint',
+  });
+
+  // Add the endpoint exception list container to the backend
+  await Promise.all(
+    endpointEntries.map((endpointEntry) => {
+      const exceptionListItem: CreateExceptionListItemSchema = {
+        description: 'endpoint description',
+        entries: endpointEntry.entries,
+        list_id: 'endpoint_list',
+        name: 'endpoint_list',
+        os_types: endpointEntry.osTypes,
+        type: 'simple',
+      };
+      return createExceptionListItem(supertest, log, exceptionListItem);
+    })
+  );
+
+  // To reduce the odds of in-determinism and/or bugs we ensure we have
+  // the same length of entries before continuing.
+  await waitFor(
+    async () => {
+      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
+      return body.data.length === endpointEntries.length;
+    },
+    `within createContainerWithEndpointEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
+    log
+  );
+
+  return [
+    {
+      id,
+      list_id,
+      namespace_type,
+      type,
+    },
+  ];
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_container_with_entries.ts b/x-pack/test/detection_engine_api_integration/utils/create_container_with_entries.ts
new file mode 100644
index 0000000000000..169a9bcea239b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_container_with_entries.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import type { ListArray, NonEmptyEntriesArray } from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+import { createExceptionList } from './create_exception_list';
+import { createExceptionListItem } from './create_exception_list_item';
+import { waitFor } from './wait_for';
+
+/**
+ * Convenience testing function where you can pass in just the endpoint entries and you will
+ * get a container created with the entries.
+ * @param supertest super test agent
+ * @param entries The entries to create the rule and exception list from
+ * @param osTypes The os types to optionally add or not to add to the container
+ */
+export const createContainerWithEntries = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  entries: NonEmptyEntriesArray[]
+): Promise<ListArray> => {
+  // If not given any endpoint entries, return without any
+  if (entries.length === 0) {
+    return [];
+  }
+  // Create the rule exception list container
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
+    description: 'some description',
+    list_id: 'some-list-id',
+    name: 'some name',
+    type: 'detection',
+  });
+
+  // Add the rule exception list container to the backend
+  await Promise.all(
+    entries.map((entry) => {
+      const exceptionListItem: CreateExceptionListItemSchema = {
+        description: 'some description',
+        list_id: 'some-list-id',
+        name: 'some name',
+        type: 'simple',
+        entries: entry,
+      };
+      return createExceptionListItem(supertest, log, exceptionListItem);
+    })
+  );
+
+  // To reduce the odds of in-determinism and/or bugs we ensure we have
+  // the same length of entries before continuing.
+  await waitFor(
+    async () => {
+      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
+      return body.data.length === entries.length;
+    },
+    `within createContainerWithEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
+    log
+  );
+
+  return [
+    {
+      id,
+      list_id,
+      namespace_type,
+      type,
+    },
+  ];
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_exception_list.ts b/x-pack/test/detection_engine_api_integration/utils/create_exception_list.ts
new file mode 100644
index 0000000000000..24ebabb5243b2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_exception_list.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type {
+  CreateExceptionListSchema,
+  ExceptionListSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { deleteExceptionList } from './delete_exception_list';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This checks for
+ * an expected 200 still and does not try to any retries. Creates exception lists
+ * @param supertest The supertest deps
+ * @param exceptionList The exception list to create
+ * @param log The tooling logger
+ */
+export const createExceptionList = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  exceptionList: CreateExceptionListSchema
+): Promise<ExceptionListSchema> => {
+  const response = await supertest
+    .post(EXCEPTION_LIST_URL)
+    .set('kbn-xsrf', 'true')
+    .send(exceptionList);
+
+  if (response.status === 409) {
+    if (exceptionList.list_id != null) {
+      log.error(
+        `When creating an exception list found an unexpected conflict (409) creating an exception list (createExceptionList), will attempt a cleanup and one time re-try. This usually indicates a bad cleanup or race condition within the tests: ${JSON.stringify(
+          response.body
+        )}, status: ${JSON.stringify(response.status)}`
+      );
+      await deleteExceptionList(supertest, log, exceptionList.list_id);
+      const secondResponseTry = await supertest
+        .post(EXCEPTION_LIST_URL)
+        .set('kbn-xsrf', 'true')
+        .send(exceptionList);
+      if (secondResponseTry.status !== 200) {
+        throw new Error(
+          `Unexpected non 200 ok when attempting to create an exception list (second try): ${JSON.stringify(
+            response.body
+          )}`
+        );
+      } else {
+        return secondResponseTry.body;
+      }
+    } else {
+      throw new Error('When creating an exception list found an unexpected conflict (404)');
+    }
+  } else if (response.status !== 200) {
+    throw new Error(
+      `Unexpected non 200 ok when attempting to create an exception list: ${JSON.stringify(
+        response.status
+      )}`
+    );
+  } else {
+    return response.body;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_exception_list_item.ts b/x-pack/test/detection_engine_api_integration/utils/create_exception_list_item.ts
new file mode 100644
index 0000000000000..fccbd3e243b17
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_exception_list_item.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type {
+  CreateExceptionListItemSchema,
+  ExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This checks for
+ * an expected 200 still and does not try to any retries. Creates exception lists
+ * @param supertest The supertest deps
+ * @param exceptionListItem The exception list item to create
+ * @param log The tooling logger
+ */
+export const createExceptionListItem = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  exceptionListItem: CreateExceptionListItemSchema
+): Promise<ExceptionListItemSchema> => {
+  const response = await supertest
+    .post(EXCEPTION_LIST_ITEM_URL)
+    .set('kbn-xsrf', 'true')
+    .send(exceptionListItem);
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when creating an exception list item (createExceptionListItem). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_legacy_rule_action.ts b/x-pack/test/detection_engine_api_integration/utils/create_legacy_rule_action.ts
new file mode 100644
index 0000000000000..6428b41cdeba8
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_legacy_rule_action.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+
+import { UPDATE_OR_CREATE_LEGACY_ACTIONS } from '@kbn/security-solution-plugin/common/constants';
+
+export const createLegacyRuleAction = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  alertId: string,
+  connectorId: string
+): Promise<unknown> =>
+  supertest
+    .post(`${UPDATE_OR_CREATE_LEGACY_ACTIONS}`)
+    .set('kbn-xsrf', 'true')
+    .query({ alert_id: alertId })
+    .send({
+      name: 'Legacy notification with one action',
+      interval: '1h',
+      actions: [
+        {
+          id: connectorId,
+          group: 'default',
+          params: {
+            message: 'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          },
+          actionTypeId: '.slack',
+        },
+      ],
+    });
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_new_action.ts b/x-pack/test/detection_engine_api_integration/utils/create_new_action.ts
new file mode 100644
index 0000000000000..d5093d8d5d39b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_new_action.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { getWebHookAction } from './get_web_hook_action';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This
+ * creates a new action and expects a 200 and does not do any retries.
+ * @param supertest The supertest deps
+ */
+export const createNewAction = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+) => {
+  const response = await supertest
+    .post('/api/actions/action')
+    .set('kbn-xsrf', 'true')
+    .send(getWebHookAction());
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when creating a new action. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_rule.ts b/x-pack/test/detection_engine_api_integration/utils/create_rule.ts
new file mode 100644
index 0000000000000..ab162724ecb68
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type {
+  CreateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { deleteRule } from './delete_rule';
+
+/**
+ * Helper to cut down on the noise in some of the tests. If this detects
+ * a conflict it will try to manually remove the rule before re-adding the rule one time and log
+ * and error about the race condition.
+ * rule a second attempt. It only re-tries adding the rule if it encounters a conflict once.
+ * @param supertest The supertest deps
+ * @param log The tooling logger
+ * @param rule The rule to create
+ */
+export const createRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  rule: CreateRulesSchema
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .post(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .send(rule);
+  if (response.status === 409) {
+    if (rule.rule_id != null) {
+      log.debug(
+        `Did not get an expected 200 "ok" when creating a rule (createRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+          response.body
+        )}, status: ${JSON.stringify(response.status)}`
+      );
+      await deleteRule(supertest, log, rule.rule_id);
+      const secondResponseTry = await supertest
+        .post(DETECTION_ENGINE_RULES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(rule);
+      if (secondResponseTry.status !== 200) {
+        throw new Error(
+          `Unexpected non 200 ok when attempting to create a rule (second try): ${JSON.stringify(
+            response.body
+          )}`
+        );
+      } else {
+        return secondResponseTry.body;
+      }
+    } else {
+      throw new Error('When creating a rule found an unexpected conflict (404)');
+    }
+  } else if (response.status !== 200) {
+    throw new Error(
+      `Unexpected non 200 ok when attempting to create a rule: ${JSON.stringify(response.status)}`
+    );
+  } else {
+    return response.body;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_rule_with_auth.ts b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_auth.ts
new file mode 100644
index 0000000000000..266d01166d1b7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_auth.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import type {
+  CreateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Helper to cut down on the noise in some of the tests.
+ * @param supertest The supertest deps
+ * @param rule The rule to create
+ */
+export const createRuleWithAuth = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  rule: CreateRulesSchema,
+  auth: { user: string; pass: string }
+): Promise<FullResponseSchema> => {
+  const { body } = await supertest
+    .post(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .auth(auth.user, auth.pass)
+    .send(rule);
+  return body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_rule_with_exception_entries.ts b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_exception_entries.ts
new file mode 100644
index 0000000000000..5b47de64d9c0f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_exception_entries.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { NonEmptyEntriesArray, OsTypeArray } from '@kbn/securitysolution-io-ts-list-types';
+import type {
+  CreateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { createContainerWithEntries } from './create_container_with_entries';
+import { createContainerWithEndpointEntries } from './create_container_with_endpoint_entries';
+import { createRule } from './create_rule';
+
+/**
+ * Convenience testing function where you can pass in just the entries and you will
+ * get a rule created with the entries added to an exception list and exception list item
+ * all auto-created at once.
+ * @param supertest super test agent
+ * @param rule The rule to create and attach an exception list to
+ * @param entries The entries to create the rule and exception list from
+ * @param endpointEntries The endpoint entries to create the rule and exception list from
+ * @param osTypes The os types to optionally add or not to add to the container
+ */
+export const createRuleWithExceptionEntries = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  rule: CreateRulesSchema,
+  entries: NonEmptyEntriesArray[],
+  endpointEntries?: Array<{
+    entries: NonEmptyEntriesArray;
+    osTypes: OsTypeArray | undefined;
+  }>
+): Promise<FullResponseSchema> => {
+  const maybeExceptionList = await createContainerWithEntries(supertest, log, entries);
+  const maybeEndpointList = await createContainerWithEndpointEntries(
+    supertest,
+    log,
+    endpointEntries ?? []
+  );
+
+  // create the rule but don't run it immediately as running it immediately can cause
+  // the rule to sometimes not filter correctly the first time with an exception list
+  // or other timing issues. Then afterwards wait for the rule to have succeeded before
+  // returning.
+  const ruleWithException: CreateRulesSchema = {
+    ...rule,
+    enabled: false,
+    exceptions_list: [...maybeExceptionList, ...maybeEndpointList],
+  };
+  const ruleResponse = await createRule(supertest, log, ruleWithException);
+  const response = await supertest
+    .patch(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ rule_id: ruleResponse.rule_id, enabled: true });
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when patching a rule with exception entries (createRuleWithExceptionEntries). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return ruleResponse;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_signals_index.ts b/x-pack/test/detection_engine_api_integration/utils/create_signals_index.ts
new file mode 100644
index 0000000000000..5f490f2dc7c60
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_signals_index.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+import { ToolingLog } from '@kbn/tooling-log';
+
+import { DETECTION_ENGINE_INDEX_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Creates the signals index for use inside of beforeEach blocks of tests
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
+ * @param supertest The supertest client library
+ */
+export const createSignalsIndex = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+      return {
+        passed: true,
+      };
+    },
+    'createSignalsIndex',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_alerts.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_alerts.ts
new file mode 100644
index 0000000000000..95dd94399e414
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_alerts.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import {
+  DETECTION_ENGINE_RULES_BULK_ACTION,
+  DETECTION_ENGINE_RULES_URL,
+} from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Removes all rules by looping over any found and removing them from REST.
+ * @param supertest The supertest agent.
+ */
+export const deleteAllAlerts = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .send({ action: 'delete', query: '' })
+        .set('kbn-xsrf', 'true');
+
+      const { body: finalCheck } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
+        .set('kbn-xsrf', 'true')
+        .send();
+      return {
+        passed: finalCheck.data.length === 0,
+      };
+    },
+    'deleteAllAlerts',
+    log,
+    50,
+    1000
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_event_log_execution_events.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_event_log_execution_events.ts
new file mode 100644
index 0000000000000..6ff1e9fda30be
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_event_log_execution_events.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type { Client } from '@elastic/elasticsearch';
+
+import { countDownES } from './count_down_es';
+
+/**
+ * Remove all .kibana-event-log-* documents with an execution.uuid
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
+ * @param es The ElasticSearch handle
+ * @param log The tooling logger
+ */
+export const deleteAllEventLogExecutionEvents = async (
+  es: Client,
+  log: ToolingLog
+): Promise<void> => {
+  return countDownES(
+    async () => {
+      return es.deleteByQuery(
+        {
+          index: '.kibana-event-log-*',
+          q: '_exists_:kibana.alert.rule.execution.uuid',
+          wait_for_completion: true,
+          refresh: true,
+          body: {},
+        },
+        { meta: true }
+      );
+    },
+    'deleteAllEventLogExecutionEvents',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts
new file mode 100644
index 0000000000000..3a7e3c91fd402
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Client } from '@elastic/elasticsearch';
+import type { ToolingLog } from '@kbn/tooling-log';
+import { countDownES } from './count_down_es';
+
+/**
+ * Remove all rules execution info saved objects from the .kibana index
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
+ * @param es The ElasticSearch handle
+ * @param log The tooling logger
+ */
+export const deleteAllRuleExecutionInfo = async (es: Client, log: ToolingLog): Promise<void> => {
+  return countDownES(
+    async () => {
+      return es.deleteByQuery(
+        {
+          index: '.kibana',
+          q: 'type:siem-detection-engine-rule-execution-info',
+          wait_for_completion: true,
+          refresh: true,
+          body: {},
+        },
+        { meta: true }
+      );
+    },
+    'deleteAllRuleExecutionInfo',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.ts
new file mode 100644
index 0000000000000..973995fc1b619
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Client } from '@elastic/elasticsearch';
+
+/**
+ * Remove all timelines from the .kibana index
+ * @param es The ElasticSearch handle
+ */
+export const deleteAllTimelines = async (es: Client): Promise<void> => {
+  await es.deleteByQuery({
+    index: '.kibana',
+    q: 'type:siem-ui-timeline',
+    wait_for_completion: true,
+    refresh: true,
+    body: {},
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_exception_list.ts b/x-pack/test/detection_engine_api_integration/utils/delete_exception_list.ts
new file mode 100644
index 0000000000000..499f5b94a9752
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_exception_list.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Helper to cut down on the noise in some of the tests. Does a delete of an exception list.
+ * It does not check for a 200 "ok" on this.
+ * @param supertest The supertest deps
+ * @param listId The exception list to delete
+ * @param log The tooling logger
+ */
+export const deleteExceptionList = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  listId: string
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .delete(`${EXCEPTION_LIST_URL}?list_id=${listId}`)
+    .set('kbn-xsrf', 'true');
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when deleting an exception list (deleteExceptionList). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_migrations.ts b/x-pack/test/detection_engine_api_integration/utils/delete_migrations.ts
new file mode 100644
index 0000000000000..9da2e76aba4f9
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_migrations.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { KbnClient } from '@kbn/test';
+
+import { signalsMigrationType } from '@kbn/security-solution-plugin/server/lib/detection_engine/migrations/saved_objects';
+
+export const deleteMigrations = async ({
+  ids,
+  kbnClient,
+}: {
+  ids: string[];
+  kbnClient: KbnClient;
+}): Promise<void> => {
+  await Promise.all(
+    ids.map((id) =>
+      kbnClient.savedObjects.delete({
+        id,
+        type: signalsMigrationType,
+      })
+    )
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_rule.ts b/x-pack/test/detection_engine_api_integration/utils/delete_rule.ts
new file mode 100644
index 0000000000000..2e01c61c33595
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. Does a delete of a rule.
+ * It does not check for a 200 "ok" on this.
+ * @param supertest The supertest deps
+ * @param ruleId The rule id to delete
+ * @param log The tooling logger
+ */
+export const deleteRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleId: string
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .delete(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+    .set('kbn-xsrf', 'true');
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when deleting the rule (deleteRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_signals_index.ts b/x-pack/test/detection_engine_api_integration/utils/delete_signals_index.ts
new file mode 100644
index 0000000000000..875dfd8025989
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_signals_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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+import type { ToolingLog } from '@kbn/tooling-log';
+import { DETECTION_ENGINE_INDEX_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Deletes the signals index for use inside of afterEach blocks of tests
+ * @param supertest The supertest client library
+ */
+export const deleteSignalsIndex = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+      return {
+        passed: true,
+      };
+    },
+    'deleteSignalsIndex',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/downgrade_immutable_rule.ts b/x-pack/test/detection_engine_api_integration/utils/downgrade_immutable_rule.ts
new file mode 100644
index 0000000000000..36ebfaee231d9
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/downgrade_immutable_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type { Client } from '@elastic/elasticsearch';
+import { INTERNAL_RULE_ID_KEY } from '@kbn/security-solution-plugin/common/constants';
+import { countDownES } from './count_down_es';
+
+export const downgradeImmutableRule = async (
+  es: Client,
+  log: ToolingLog,
+  ruleId: string
+): Promise<void> => {
+  return countDownES(
+    async () => {
+      return es.updateByQuery(
+        {
+          index: '.kibana',
+          refresh: true,
+          wait_for_completion: true,
+          body: {
+            script: {
+              lang: 'painless',
+              source: 'ctx._source.alert.params.version--',
+            },
+            query: {
+              term: {
+                'alert.tags': `${INTERNAL_RULE_ID_KEY}:${ruleId}`,
+              },
+            },
+          },
+        },
+        { meta: true }
+      );
+    },
+    'downgradeImmutableRule',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/finalize_signals_migration.ts b/x-pack/test/detection_engine_api_integration/utils/finalize_signals_migration.ts
new file mode 100644
index 0000000000000..e52c85c229edb
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/finalize_signals_migration.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL } from '@kbn/security-solution-plugin/common/constants';
+
+interface FinalizeMigrationResponse {
+  id: string;
+  completed?: boolean;
+  error?: unknown;
+}
+
+export const finalizeSignalsMigration = async ({
+  migrationIds,
+  supertest,
+  log,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  log: ToolingLog;
+  migrationIds: string[];
+}): Promise<FinalizeMigrationResponse[]> => {
+  const response = await supertest
+    .post(DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ migration_ids: migrationIds });
+
+  const {
+    body: { migrations },
+  }: { body: { migrations: FinalizeMigrationResponse[] } } = response;
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when finalizing signals migration (finalizeSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return migrations;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/find_immutable_rule_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/find_immutable_rule_by_id.ts
new file mode 100644
index 0000000000000..2d77cffcdfe41
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/find_immutable_rule_by_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import {
+  DETECTION_ENGINE_RULES_URL,
+  INTERNAL_IMMUTABLE_KEY,
+  INTERNAL_RULE_ID_KEY,
+} from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This
+ * uses the find API to get an immutable rule by id.
+ * @param supertest The supertest deps
+ */
+export const findImmutableRuleById = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleId: string
+): Promise<{
+  page: number;
+  perPage: number;
+  total: number;
+  data: FullResponseSchema[];
+}> => {
+  const response = await supertest
+    .get(
+      `${DETECTION_ENGINE_RULES_URL}/_find?filter=alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true" AND alert.attributes.tags: "${INTERNAL_RULE_ID_KEY}:${ruleId}"`
+    )
+    .set('kbn-xsrf', 'true')
+    .send();
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when finding an immutable rule by id (findImmutableRuleById). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_complex_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule.ts
new file mode 100644
index 0000000000000..07ac5ea879bb6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+/**
+ * This will return a complex rule with all the outputs possible
+ * @param ruleId The ruleId to set which is optional and defaults to rule-1
+ */
+export const getComplexRule = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
+  actions: [],
+  author: [],
+  name: 'Complex Rule Query',
+  description: 'Complex Rule Query',
+  false_positives: [
+    'https://www.example.com/some-article-about-a-false-positive',
+    'some text string about why another condition could be a false positive',
+  ],
+  risk_score: 1,
+  risk_score_mapping: [],
+  rule_id: ruleId,
+  filters: [
+    {
+      query: {
+        match_phrase: {
+          'host.name': 'siem-windows',
+        },
+      },
+    },
+  ],
+  enabled: false,
+  index: ['auditbeat-*', 'filebeat-*'],
+  interval: '5m',
+  output_index: '.siem-signals-default',
+  meta: {
+    anything_you_want_ui_related_or_otherwise: {
+      as_deep_structured_as_you_need: {
+        any_data_type: {},
+      },
+    },
+  },
+  max_signals: 10,
+  tags: ['tag 1', 'tag 2', 'any tag you want'],
+  to: 'now',
+  from: 'now-6m',
+  severity: 'high',
+  severity_mapping: [],
+  language: 'kuery',
+  type: 'query',
+  threat: [
+    {
+      framework: 'MITRE ATT&CK',
+      tactic: {
+        id: 'TA0040',
+        name: 'impact',
+        reference: 'https://attack.mitre.org/tactics/TA0040/',
+      },
+      technique: [
+        {
+          id: 'T1499',
+          name: 'endpoint denial of service',
+          reference: 'https://attack.mitre.org/techniques/T1499/',
+        },
+      ],
+    },
+    {
+      framework: 'Some other Framework you want',
+      tactic: {
+        id: 'some-other-id',
+        name: 'Some other name',
+        reference: 'https://example.com',
+      },
+      technique: [
+        {
+          id: 'some-other-id',
+          name: 'some other technique name',
+          reference: 'https://example.com',
+        },
+      ],
+    },
+  ],
+  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',
+  timeline_title: 'timeline_title',
+  note: '# some investigation documentation',
+  version: 1,
+  query: 'user.name: root or user.name: admin',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_complex_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule_output.ts
new file mode 100644
index 0000000000000..98fdfa99cbd3c
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule_output.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+/**
+ * This will return a complex rule with all the outputs possible
+ * @param ruleId The ruleId to set which is optional and defaults to rule-1
+ */
+export const getComplexRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
+  actions: [],
+  author: [],
+  created_by: 'elastic',
+  name: 'Complex Rule Query',
+  description: 'Complex Rule Query',
+  false_positives: [
+    'https://www.example.com/some-article-about-a-false-positive',
+    'some text string about why another condition could be a false positive',
+  ],
+  risk_score: 1,
+  risk_score_mapping: [],
+  rule_id: ruleId,
+  filters: [
+    {
+      query: {
+        match_phrase: {
+          'host.name': 'siem-windows',
+        },
+      },
+    },
+  ],
+  enabled: false,
+  index: ['auditbeat-*', 'filebeat-*'],
+  immutable: false,
+  interval: '5m',
+  output_index: '.siem-signals-default',
+  meta: {
+    anything_you_want_ui_related_or_otherwise: {
+      as_deep_structured_as_you_need: {
+        any_data_type: {},
+      },
+    },
+  },
+  max_signals: 10,
+  tags: ['tag 1', 'tag 2', 'any tag you want'],
+  to: 'now',
+  from: 'now-6m',
+  severity: 'high',
+  severity_mapping: [],
+  language: 'kuery',
+  type: 'query',
+  threat: [
+    {
+      framework: 'MITRE ATT&CK',
+      tactic: {
+        id: 'TA0040',
+        name: 'impact',
+        reference: 'https://attack.mitre.org/tactics/TA0040/',
+      },
+      technique: [
+        {
+          id: 'T1499',
+          name: 'endpoint denial of service',
+          reference: 'https://attack.mitre.org/techniques/T1499/',
+        },
+      ],
+    },
+    {
+      framework: 'Some other Framework you want',
+      tactic: {
+        id: 'some-other-id',
+        name: 'Some other name',
+        reference: 'https://example.com',
+      },
+      technique: [
+        {
+          id: 'some-other-id',
+          name: 'some other technique name',
+          reference: 'https://example.com',
+        },
+      ],
+    },
+  ],
+  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',
+  ],
+  throttle: 'no_actions',
+  timeline_id: 'timeline_id',
+  timeline_title: 'timeline_title',
+  updated_by: 'elastic',
+  note: '# some investigation documentation',
+  version: 1,
+  query: 'user.name: root or user.name: admin',
+  exceptions_list: [],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_detection_metrics_from_body.ts b/x-pack/test/detection_engine_api_integration/utils/get_detection_metrics_from_body.ts
new file mode 100644
index 0000000000000..20febd5e9180f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_detection_metrics_from_body.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
+
+/**
+ * Given a body this will return the detection metrics from it.
+ * @param body The Stats body
+ * @returns Detection metrics
+ */
+export const getDetectionMetricsFromBody = (
+  body: Array<{
+    stats: {
+      stack_stats: {
+        kibana: { plugins: { security_solution: { detectionMetrics: DetectionMetrics } } };
+      };
+    };
+  }>
+): DetectionMetrics => {
+  return body[0].stats.stack_stats.kibana.plugins.security_solution.detectionMetrics;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_eql_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_eql_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..21a8509a16460
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_eql_rule_for_signal_testing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { EqlCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of EQL signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for EQL and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is eql-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getEqlRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'eql-rule',
+  enabled = true
+): EqlCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'eql',
+  language: 'eql',
+  query: 'any where true',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_event_log_execute_complete_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_event_log_execute_complete_by_id.ts
new file mode 100644
index 0000000000000..b6750c9aa168a
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_event_log_execute_complete_by_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type { Client } from '@elastic/elasticsearch';
+import type { SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
+
+/**
+ * Given a single rule id this will return the number of event-log execution
+ * completed docs
+ * @param es The ES client
+ * @param log
+ * @param ruleId Rule id
+ */
+export const getEventLogExecuteCompleteById = async (
+  es: Client,
+  log: ToolingLog,
+  ruleId: string
+): Promise<number> => {
+  const response = await es.search({
+    index: '.kibana-event-log*',
+    track_total_hits: true,
+    size: 0,
+    query: {
+      bool: {
+        must: [],
+        filter: [
+          {
+            match_phrase: {
+              'event.provider': 'alerting',
+            },
+          },
+          {
+            match_phrase: {
+              'event.action': 'execute',
+            },
+          },
+          {
+            match_phrase: {
+              'rule.id': ruleId,
+            },
+          },
+        ],
+        should: [],
+        must_not: [],
+      },
+    },
+  });
+
+  return (response?.hits?.total as SearchTotalHits)?.value ?? 0;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_index_name_from_load.ts b/x-pack/test/detection_engine_api_integration/utils/get_index_name_from_load.ts
new file mode 100644
index 0000000000000..7fb30f2a867f3
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_index_name_from_load.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getIndexNameFromLoad = (loadResponse: Record<string, unknown>): string => {
+  const indexNames = Object.keys(loadResponse);
+  if (indexNames.length > 1) {
+    throw new Error(
+      `expected load response to contain one index, but contained multiple: [${indexNames}]`
+    );
+  }
+  return indexNames[0];
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts b/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts
new file mode 100644
index 0000000000000..2c714614f9caa
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { Client } from '@elastic/elasticsearch';
+import type { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { SavedObjectReference } from '@kbn/core/server';
+import type { LegacyRuleActions } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_actions/legacy_types';
+
+interface LegacyActionSO extends LegacyRuleActions {
+  references: SavedObjectReference[];
+}
+
+/**
+ * Fetch all legacy action sidecar SOs from the .kibana index
+ * @param es The ElasticSearch service
+ */
+export const getLegacyActionSO = async (es: Client): Promise<SearchResponse<LegacyActionSO>> =>
+  es.search({
+    index: '.kibana',
+    q: 'type:siem-detection-engine-rule-actions',
+  });
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_open_signals.ts b/x-pack/test/detection_engine_api_integration/utils/get_open_signals.ts
new file mode 100644
index 0000000000000..fcbfadec612d5
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_open_signals.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { Client } from '@elastic/elasticsearch';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { waitForRuleSuccessOrStatus } from './wait_for_rule_success_or_status';
+import { refreshIndex } from './refresh_index';
+import { getSignalsByIds } from './get_signals_by_ids';
+
+export const getOpenSignals = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  es: Client,
+  rule: FullResponseSchema
+) => {
+  await waitForRuleSuccessOrStatus(supertest, log, rule.id);
+  // Critically important that we wait for rule success AND refresh the write index in that order before we
+  // assert that no signals were created. Otherwise, signals could be written but not available to query yet
+  // when we search, causing tests that check that signals are NOT created to pass when they should fail.
+  await refreshIndex(es, '.alerts-security.alerts-default*');
+  return getSignalsByIds(supertest, log, [rule.id]);
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_prepackaged_rule_status.ts b/x-pack/test/detection_engine_api_integration/utils/get_prepackaged_rule_status.ts
new file mode 100644
index 0000000000000..b6771cbb85f9c
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_prepackaged_rule_status.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { PrePackagedRulesAndTimelinesStatusSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
+
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This
+ * creates a new action and expects a 200 and does not do any retries.
+ * @param supertest The supertest deps
+ */
+export const getPrePackagedRulesStatus = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<PrePackagedRulesAndTimelinesStatusSchema> => {
+  const response = await supertest
+    .get(`${DETECTION_ENGINE_PREPACKAGED_URL}/_status`)
+    .set('kbn-xsrf', 'true')
+    .send();
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting a pre-packaged rule status. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_all_signals.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_all_signals.ts
new file mode 100644
index 0000000000000..fd003857fdc1f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_all_signals.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getQueryAllSignals = () => ({
+  query: { match_all: {} },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_signal_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_signal_ids.ts
new file mode 100644
index 0000000000000..586a7e9c8de73
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_signal_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SignalIds } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+
+export const getQuerySignalIds = (signalIds: SignalIds) => ({
+  query: {
+    terms: {
+      _id: signalIds,
+    },
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_signals_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_ids.ts
new file mode 100644
index 0000000000000..2a94be5897749
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ALERT_RULE_UUID } from '@kbn/rule-data-utils';
+
+/**
+ * Given an array of ids for a test this will get the signals
+ * created from that rule's regular id.
+ * @param ids The rule_id to search for signals
+ */
+export const getQuerySignalsId = (ids: string[], size = 10) => ({
+  size,
+  query: {
+    terms: {
+      [ALERT_RULE_UUID]: ids,
+    },
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_signals_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_rule_id.ts
new file mode 100644
index 0000000000000..5644d1bff1fbd
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_rule_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ALERT_RULE_RULE_ID } from '@kbn/rule-data-utils';
+
+/**
+ * Given an array of ruleIds for a test this will get the signals
+ * created from that rule_id.
+ * @param ruleIds The rule_id to search for signals
+ */
+export const getQuerySignalsRuleId = (ruleIds: string[]) => ({
+  query: {
+    terms: {
+      [ALERT_RULE_RULE_ID]: ruleIds,
+    },
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule.ts
new file mode 100644
index 0000000000000..da28e867bc976
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This gets
+ * a particular rule.
+ * @param supertest The supertest deps
+ * @param rule The rule to create
+ */
+export const getRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleId: string
+): Promise<RulesSchema> => {
+  const response = await supertest
+    .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+    .set('kbn-xsrf', 'true');
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting a rule (getRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..ee07daad625c7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is rule-1 by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'rule-1',
+  enabled = true
+): QueryCreateSchema => ({
+  name: 'Signal Testing Query',
+  description: 'Tests a simple query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index,
+  type: 'query',
+  query: '*:*',
+  from: '1900-01-01T00:00:00.000Z',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing_with_timestamp_override.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing_with_timestamp_override.ts
new file mode 100644
index 0000000000000..d742e727137c5
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing_with_timestamp_override.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+export const getRuleForSignalTestingWithTimestampOverride = (
+  index: string[],
+  ruleId = 'rule-1',
+  enabled = true,
+  timestampOverride = 'event.ingested'
+): QueryCreateSchema => ({
+  name: 'Signal Testing Query',
+  description: 'Tests a simple query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index,
+  type: 'query',
+  query: '*:*',
+  timestamp_override: timestampOverride,
+  from: '1900-01-01T00:00:00.000Z',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule_with_web_hook_action.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule_with_web_hook_action.ts
new file mode 100644
index 0000000000000..02aaf938b0003
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule_with_web_hook_action.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  CreateRulesSchema,
+  UpdateRulesSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getSimpleRule } from './get_simple_rule';
+
+export const getRuleWithWebHookAction = (
+  id: string,
+  enabled = false,
+  rule?: CreateRulesSchema
+): CreateRulesSchema | UpdateRulesSchema => {
+  const finalRule = rule != null ? { ...rule, enabled } : getSimpleRule('rule-1', enabled);
+  return {
+    ...finalRule,
+    throttle: 'rule',
+    actions: [
+      {
+        group: 'default',
+        id,
+        params: {
+          body: '{}',
+        },
+        action_type_id: '.webhook',
+      },
+    ],
+  };
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_saved_query_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_saved_query_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..da6c17d5a4026
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_saved_query_rule_for_signal_testing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SavedQueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of Saved Query signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for SavedQuery and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is threshold-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getSavedQueryRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'saved-query-rule',
+  enabled = true
+): SavedQueryCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'saved_query',
+  saved_id: 'abcd',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_security_telemetry_stats.ts b/x-pack/test/detection_engine_api_integration/utils/get_security_telemetry_stats.ts
new file mode 100644
index 0000000000000..dd243dd3ca581
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_security_telemetry_stats.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { SECURITY_TELEMETRY_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Gets the stats from the stats endpoint within specifically the security_solutions application.
+ * This is considered the "batch" telemetry.
+ * @param supertest The supertest agent.
+ * @returns The detection metrics
+ */
+export const getSecurityTelemetryStats = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<any> => {
+  const response = await supertest
+    .get(SECURITY_TELEMETRY_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ unencrypted: true, refreshCache: true });
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting the batch stats for security_solutions. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signal_status.ts b/x-pack/test/detection_engine_api_integration/utils/get_signal_status.ts
new file mode 100644
index 0000000000000..d3c922c30ccc6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signal_status.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getSignalStatus = () => ({
+  aggs: { statuses: { terms: { field: 'kibana.alert.workflow_status', size: 10 } } },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signal_status_empty_response.ts b/x-pack/test/detection_engine_api_integration/utils/get_signal_status_empty_response.ts
new file mode 100644
index 0000000000000..bcbc286a9f088
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signal_status_empty_response.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getSignalStatusEmptyResponse = () => ({
+  timed_out: false,
+  total: 0,
+  updated: 0,
+  deleted: 0,
+  batches: 0,
+  version_conflicts: 0,
+  noops: 0,
+  retries: { bulk: 0, search: 0 },
+  throttled_millis: 0,
+  requests_per_second: -1,
+  throttled_until_millis: 0,
+  failures: [],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signals_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_id.ts
new file mode 100644
index 0000000000000..088214a52f6ac
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+import { getQuerySignalsId } from './get_query_signals_ids';
+
+/**
+ * Given a single rule id this will return only signals based on that rule id.
+ * @param supertest agent
+ * @param ids Rule id
+ */
+export const getSignalsById = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  id: string
+): Promise<SearchResponse<DetectionAlert>> => {
+  const signalsOpen = await countDownTest<SearchResponse<DetectionAlert>>(
+    async () => {
+      const response = await supertest
+        .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+        .set('kbn-xsrf', 'true')
+        .send(getQuerySignalsId([id]));
+      if (response.status !== 200) {
+        return {
+          passed: false,
+          returnValue: undefined,
+        };
+      } else {
+        return {
+          passed: true,
+          returnValue: response.body,
+        };
+      }
+    },
+    'getSignalsById',
+    log
+  );
+  if (signalsOpen == null) {
+    throw new Error('Signals not defined after countdown, cannot continue');
+  } else {
+    return signalsOpen;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signals_by_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_ids.ts
new file mode 100644
index 0000000000000..b534925b60118
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+import { getQuerySignalsId } from './get_query_signals_ids';
+
+/**
+ * Given an array of rule ids this will return only signals based on that rule id both
+ * open and closed
+ * @param supertest agent
+ * @param ids Array of the rule ids
+ */
+export const getSignalsByIds = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ids: string[],
+  size?: number
+): Promise<SearchResponse<DetectionAlert>> => {
+  const signalsOpen = await countDownTest<SearchResponse<DetectionAlert>>(
+    async () => {
+      const response = await supertest
+        .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+        .set('kbn-xsrf', 'true')
+        .send(getQuerySignalsId(ids, size));
+      if (response.status !== 200) {
+        return {
+          passed: false,
+          errorMessage: `Status is not 200 as expected, it is: ${response.status}`,
+        };
+      } else {
+        return {
+          passed: true,
+          returnValue: response.body,
+        };
+      }
+    },
+    'getSignalsByIds',
+    log
+  );
+  if (signalsOpen == null) {
+    throw new Error('Signals not defined after countdown, cannot continue');
+  } else {
+    return signalsOpen;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signals_by_rule_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_rule_ids.ts
new file mode 100644
index 0000000000000..85ad0e3d89acb
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_rule_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+import { getQuerySignalsRuleId } from './get_query_signals_rule_id';
+
+/**
+ * Returns all signals both closed and opened by ruleId
+ * @param supertest Deps
+ */
+export const getSignalsByRuleIds = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleIds: string[]
+): Promise<SearchResponse<DetectionAlert>> => {
+  const signalsOpen = await countDownTest<SearchResponse<DetectionAlert>>(
+    async () => {
+      const response = await supertest
+        .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+        .set('kbn-xsrf', 'true')
+        .send(getQuerySignalsRuleId(ruleIds));
+      if (response.status !== 200) {
+        return {
+          passed: false,
+          errorMessage: `Status is not 200 as expected, it is: ${response.status}`,
+        };
+      } else {
+        return {
+          passed: true,
+          returnValue: response.body,
+        };
+      }
+    },
+    'getSignalsByRuleIds',
+    log
+  );
+  if (signalsOpen == null) {
+    throw new Error('Signals not defined after countdown, cannot continue');
+  } else {
+    return signalsOpen;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule.ts
new file mode 100644
index 0000000000000..5cf6c1c41aff4
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a representative ML rule payload as expected by the server
+ * @param ruleId The rule id
+ * @param enabled Set to tru to enable it, by default it is off
+ */
+export const getSimpleMlRule = (ruleId = 'rule-1', enabled = false): CreateRulesSchema => ({
+  name: 'Simple ML Rule',
+  description: 'Simple Machine Learning Rule',
+  enabled,
+  anomaly_threshold: 44,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  machine_learning_job_id: ['some_job_id'],
+  type: 'machine_learning',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_output.ts
new file mode 100644
index 0000000000000..c845c0d343261
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_output.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => {
+  const rule = getSimpleRuleOutput(ruleId);
+  const { query, language, index, ...rest } = rule;
+
+  return {
+    ...rest,
+    name: 'Simple ML Rule',
+    description: 'Simple Machine Learning Rule',
+    anomaly_threshold: 44,
+    machine_learning_job_id: ['some_job_id'],
+    type: 'machine_learning',
+  };
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_update.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_update.ts
new file mode 100644
index 0000000000000..b5200ddd86357
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_update.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { UpdateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a representative ML rule payload as expected by the server for an update
+ * @param ruleId The rule id
+ * @param enabled Set to tru to enable it, by default it is off
+ */
+export const getSimpleMlRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
+  name: 'Simple ML Rule',
+  description: 'Simple Machine Learning Rule',
+  enabled,
+  anomaly_threshold: 44,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  machine_learning_job_id: ['some_job_id'],
+  type: 'machine_learning',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_preview_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_preview_rule.ts
new file mode 100644
index 0000000000000..5232af55b89b6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_preview_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PreviewRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple preview rule for testing that is easy for most basic testing
+ * @param ruleId
+ * @param invocationCount The number of times the rule will be run through the executors. Defaulted to 12,
+ * the execution time for the default interval time of 5m.
+ */
+export const getSimplePreviewRule = (
+  ruleId = 'preview-rule-1',
+  invocationCount = 12
+): PreviewRulesSchema => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index: ['auditbeat-*'],
+  type: 'query',
+  query: 'user.name: root or user.name: admin',
+  invocationCount,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule.ts
new file mode 100644
index 0000000000000..a7e53a368b93c
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple rule for testing that is easy for most basic testing
+ * @param ruleId
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getSimpleRule = (ruleId = 'rule-1', enabled = false): QueryCreateSchema => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index: ['auditbeat-*'],
+  type: 'query',
+  query: 'user.name: root or user.name: admin',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_as_ndjson.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_as_ndjson.ts
new file mode 100644
index 0000000000000..fd416b1682b3d
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_as_ndjson.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getSimpleRule } from './get_simple_rule';
+
+/**
+ * Given an array of rule_id strings this will return a ndjson buffer which is useful
+ * for testing uploads.
+ * @param ruleIds Array of strings of rule_ids
+ */
+export const getSimpleRuleAsNdjson = (ruleIds: string[], enabled = false): Buffer => {
+  const stringOfRules = ruleIds.map((ruleId) => {
+    const simpleRule = getSimpleRule(ruleId, enabled);
+    return JSON.stringify(simpleRule);
+  });
+  return Buffer.from(stringOfRules.join('\n'));
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output.ts
new file mode 100644
index 0000000000000..30dc7eecb9256
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+/**
+ * This is the typical output of a simple rule that Kibana will output with all the defaults
+ * except for the server generated properties.  Useful for testing end to end tests.
+ */
+export const getSimpleRuleOutput = (ruleId = 'rule-1', enabled = false): Partial<RulesSchema> => ({
+  actions: [],
+  author: [],
+  created_by: 'elastic',
+  description: 'Simple Rule Query',
+  enabled,
+  false_positives: [],
+  from: 'now-6m',
+  immutable: false,
+  index: ['auditbeat-*'],
+  interval: '5m',
+  rule_id: ruleId,
+  language: 'kuery',
+  output_index: '.siem-signals-default',
+  max_signals: 100,
+  risk_score: 1,
+  risk_score_mapping: [],
+  name: 'Simple Rule Query',
+  query: 'user.name: root or user.name: admin',
+  references: [],
+  severity: 'high',
+  severity_mapping: [],
+  updated_by: 'elastic',
+  tags: [],
+  to: 'now',
+  type: 'query',
+  threat: [],
+  throttle: 'no_actions',
+  exceptions_list: [],
+  version: 1,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_with_web_hook_action.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_with_web_hook_action.ts
new file mode 100644
index 0000000000000..45dd0bfd5d477
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_with_web_hook_action.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial<RulesSchema> => ({
+  ...getSimpleRuleOutput(),
+  throttle: 'rule',
+  actions: [
+    {
+      action_type_id: '.webhook',
+      group: 'default',
+      id: actionId,
+      params: {
+        body: '{}',
+      },
+    },
+  ],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_without_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_without_rule_id.ts
new file mode 100644
index 0000000000000..dbf94965278d6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_without_rule_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+/**
+ * This is the typical output of a simple rule that Kibana will output with all the defaults except
+ * for all the server generated properties such as created_by. Useful for testing end to end tests.
+ */
+export const getSimpleRuleOutputWithoutRuleId = (ruleId = 'rule-1'): Partial<RulesSchema> => {
+  const rule = getSimpleRuleOutput(ruleId);
+  const { rule_id: rId, ...ruleWithoutRuleId } = rule;
+  return ruleWithoutRuleId;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_preview_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_preview_output.ts
new file mode 100644
index 0000000000000..26fe0eafd1456
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_preview_output.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulePreviewLogs } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is the typical output of a simple rule preview, with errors and warnings coming up from the rule
+ * execution process and a `previewId` generated server side for later preview querying
+ *
+ * @param previewId Rule id generated by the server itself
+ * @param logs Errors and warnings returned by executor and route file, defaults to empty array
+ */
+export const getSimpleRulePreviewOutput = (
+  previewId = undefined,
+  logs: RulePreviewLogs[] = []
+) => ({
+  logs,
+  previewId,
+  isAborted: false,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_update.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_update.ts
new file mode 100644
index 0000000000000..0749abe811784
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_update.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { UpdateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple rule for testing that is easy for most basic testing
+ * @param ruleId The rule id
+ * @param enabled Set to tru to enable it, by default it is off
+ */
+export const getSimpleRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index: ['auditbeat-*'],
+  type: 'query',
+  query: 'user.name: root or user.name: admin',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_without_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_without_rule_id.ts
new file mode 100644
index 0000000000000..25994c8e6e14b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_without_rule_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getSimpleRule } from './get_simple_rule';
+
+/**
+ * This is a typical simple rule for testing that is easy for most basic testing
+ */
+export const getSimpleRuleWithoutRuleId = (): CreateRulesSchema => {
+  const simpleRule = getSimpleRule();
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { rule_id, ...ruleWithoutId } = simpleRule;
+  return ruleWithoutId;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_threat_match.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_threat_match.ts
new file mode 100644
index 0000000000000..57cca015d2c4b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_threat_match.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ThreatMatchCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple indicator match/threat match for testing that is easy for most basic testing
+ * @param ruleId
+ * @param enabled Enables the rule on creation or not. Defaulted to false.
+ */
+export const getSimpleThreatMatch = (
+  ruleId = 'rule-1',
+  enabled = false
+): ThreatMatchCreateSchema => ({
+  description: 'Detecting root and admin users',
+  name: 'Query with a rule id',
+  severity: 'high',
+  enabled,
+  index: ['auditbeat-*'],
+  type: 'threat_match',
+  risk_score: 55,
+  language: 'kuery',
+  rule_id: ruleId,
+  from: '1900-01-01T00:00:00.000Z',
+  query: '*:*',
+  threat_query: '*:*',
+  threat_index: ['auditbeat-*'],
+  threat_mapping: [
+    // We match host.name against host.name
+    {
+      entries: [
+        {
+          field: 'host.name',
+          value: 'host.name',
+          type: 'mapping',
+        },
+      ],
+    },
+  ],
+  threat_filters: [],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_stats.ts b/x-pack/test/detection_engine_api_integration/utils/get_stats.ts
new file mode 100644
index 0000000000000..0871012f8749f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_stats.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
+
+import { getStatsUrl } from './get_stats_url';
+import { getDetectionMetricsFromBody } from './get_detection_metrics_from_body';
+
+/**
+ * Gets the stats from the stats endpoint.
+ * @param supertest The supertest agent.
+ * @returns The detection metrics
+ */
+export const getStats = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<DetectionMetrics> => {
+  const response = await supertest
+    .post(getStatsUrl())
+    .set('kbn-xsrf', 'true')
+    .send({ unencrypted: true, refreshCache: true });
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting the stats for detections. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return getDetectionMetricsFromBody(response.body);
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_stats_url.ts b/x-pack/test/detection_engine_api_integration/utils/get_stats_url.ts
new file mode 100644
index 0000000000000..ac6537f670f77
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_stats_url.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Cluster stats URL. Replace this with any from kibana core if there is ever a constant there for this.
+ */
+export const getStatsUrl = (): string => '/api/telemetry/v2/clusters/_stats';
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_threat_match_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_threat_match_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..3e663607c1186
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_threat_match_rule_for_signal_testing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ThreatMatchCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of Threat Match signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for Threat Match and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is threshold-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getThreatMatchRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'threat-match-rule',
+  enabled = true
+): ThreatMatchCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'threat_match',
+  language: 'kuery',
+  query: '*:*',
+  threat_query: '*:*',
+  threat_mapping: [
+    // We match host.name against host.name
+    {
+      entries: [
+        {
+          field: 'host.name',
+          value: 'host.name',
+          type: 'mapping',
+        },
+      ],
+    },
+  ],
+  threat_index: index, // match against same index for simplicity
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_threshold_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_threshold_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..aea1a5746bf78
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_threshold_rule_for_signal_testing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ThresholdCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of Threshold signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for Threshold and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is threshold-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getThresholdRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'threshold-rule',
+  enabled = true
+): ThresholdCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'threshold',
+  language: 'kuery',
+  query: '*:*',
+  threshold: {
+    field: 'process.name',
+    value: 21,
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_web_hook_action.ts b/x-pack/test/detection_engine_api_integration/utils/get_web_hook_action.ts
new file mode 100644
index 0000000000000..27a93b396b93f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_web_hook_action.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getWebHookAction = () => ({
+  actionTypeId: '.webhook',
+  config: {
+    method: 'post',
+    url: 'http://localhost',
+  },
+  secrets: {
+    user: 'example',
+    password: 'example',
+  },
+  name: 'Some connector',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/index.ts b/x-pack/test/detection_engine_api_integration/utils/index.ts
new file mode 100644
index 0000000000000..3fb9c8ebafc02
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/index.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './binary_to_string';
+export * from './count_down_es';
+export * from './count_down_test';
+export * from './create_container_with_endpoint_entries';
+export * from './create_container_with_entries';
+export * from './create_exception_list';
+export * from './create_exception_list_item';
+export * from './create_legacy_rule_action';
+export * from './create_new_action';
+export * from './create_rule';
+export * from './create_rule_with_auth';
+export * from './create_rule_with_exception_entries';
+export * from './create_signals_index';
+export * from './delete_all_alerts';
+export * from './delete_all_event_log_execution_events';
+export * from './delete_all_rule_execution_info';
+export * from './delete_all_timelines';
+export * from './delete_exception_list';
+export * from './delete_migrations';
+export * from './delete_rule';
+export * from './delete_signals_index';
+export * from './downgrade_immutable_rule';
+export * from './finalize_signals_migration';
+export * from './find_immutable_rule_by_id';
+export * from './get_complex_rule';
+export * from './get_complex_rule_output';
+export * from './get_detection_metrics_from_body';
+export * from './get_eql_rule_for_signal_testing';
+export * from './get_event_log_execute_complete_by_id';
+export * from './get_index_name_from_load';
+export * from './get_legacy_action_so';
+export * from './get_open_signals';
+export * from './get_prepackaged_rule_status';
+export * from './get_query_all_signals';
+export * from './get_query_signal_ids';
+export * from './get_query_signals_ids';
+export * from './get_query_signals_rule_id';
+export * from './get_rule';
+export * from './get_rule_for_signal_testing';
+export * from './get_rule_for_signal_testing_with_timestamp_override';
+export * from './get_rule_with_web_hook_action';
+export * from './get_saved_query_rule_for_signal_testing';
+export * from './get_security_telemetry_stats';
+export * from './get_signal_status';
+export * from './get_signal_status_empty_response';
+export * from './get_signals_by_id';
+export * from './get_signals_by_ids';
+export * from './get_signals_by_rule_ids';
+export * from './get_simple_ml_rule';
+export * from './get_simple_ml_rule_output';
+export * from './get_simple_ml_rule_update';
+export * from './get_simple_preview_rule';
+export * from './get_simple_rule';
+export * from './get_simple_rule_as_ndjson';
+export * from './get_simple_rule_output';
+export * from './get_simple_rule_output_with_web_hook_action';
+export * from './get_simple_rule_output_without_rule_id';
+export * from './get_simple_rule_preview_output';
+export * from './get_simple_rule_update';
+export * from './get_simple_rule_without_rule_id';
+export * from './get_simple_threat_match';
+export * from './get_stats';
+export * from './get_stats_url';
+export * from './get_threat_match_rule_for_signal_testing';
+export * from './get_threshold_rule_for_signal_testing';
+export * from './get_web_hook_action';
+export * from './index_event_log_execution_events';
+export * from './install_prepackaged_rules';
+export * from './refresh_index';
+export * from './remove_server_generated_properties';
+export * from './remove_server_generated_properties_including_rule_id';
+export * from './resolve_simple_rule_output';
+export * from './rule_to_ndjson';
+export * from './set_signal_status';
+export * from './start_signals_migration';
+export * from './update_rule';
+export * from './wait_for';
+export * from './wait_for_alert_to_complete';
+export * from './wait_for_event_log_execute_complete';
+export * from './wait_for_index_to_populate';
+export * from './wait_for_rule_success_or_status';
+export * from './wait_for_signals_to_be_present';
diff --git a/x-pack/test/detection_engine_api_integration/utils/index_event_log_execution_events.ts b/x-pack/test/detection_engine_api_integration/utils/index_event_log_execution_events.ts
new file mode 100644
index 0000000000000..63f8c9f2c8e1b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/index_event_log_execution_events.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type { Client } from '@elastic/elasticsearch';
+
+/**
+ * Indexes provided execution events into .kibana-event-log-*
+ * @param es The ElasticSearch handle
+ * @param log The tooling logger
+ * @param events
+ */
+export const indexEventLogExecutionEvents = async (
+  es: Client,
+  log: ToolingLog,
+  events: object[]
+): Promise<void> => {
+  const operations = events.flatMap((doc: object) => [
+    { index: { _index: '.kibana-event-log-*' } },
+    doc,
+  ]);
+
+  await es.bulk({ refresh: true, operations });
+
+  return;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/install_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/utils/install_prepackaged_rules.ts
new file mode 100644
index 0000000000000..c75e8203bf6cd
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/install_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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+export const installPrePackagedRules = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      const { status, body } = await supertest
+        .put(DETECTION_ENGINE_PREPACKAGED_URL)
+        .set('kbn-xsrf', 'true')
+        .send();
+      if (status !== 200) {
+        return {
+          passed: false,
+          errorMessage: `Did not get an expected 200 "ok" when installing pre-packaged rules (installPrePackagedRules) yet. Retrying until we get a 200 "ok". body: ${JSON.stringify(
+            body
+          )}, status: ${JSON.stringify(status)}`,
+        };
+      } else {
+        return { passed: true };
+      }
+    },
+    'installPrePackagedRules',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/refresh_index.ts b/x-pack/test/detection_engine_api_integration/utils/refresh_index.ts
new file mode 100644
index 0000000000000..f888216cb6eed
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/refresh_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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Client } from '@elastic/elasticsearch';
+
+/**
+ * Refresh an index, making changes available to search.
+ * Useful for tests where we want to ensure that a rule does NOT create alerts, e.g. testing exceptions.
+ * @param es The ElasticSearch handle
+ */
+export const refreshIndex = async (es: Client, index?: string) => {
+  await es.indices.refresh({
+    index,
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties.ts b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties.ts
new file mode 100644
index 0000000000000..5404c09c34aac
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This will remove server generated properties such as date times, etc...
+ * @param rule Rule to pass in to remove typical server generated properties
+ */
+export const removeServerGeneratedProperties = (
+  rule: FullResponseSchema
+): Partial<FullResponseSchema> => {
+  const {
+    /* eslint-disable @typescript-eslint/naming-convention */
+    id,
+    created_at,
+    updated_at,
+    execution_summary,
+    /* eslint-enable @typescript-eslint/naming-convention */
+    ...removedProperties
+  } = rule;
+  return removedProperties;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties_including_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties_including_rule_id.ts
new file mode 100644
index 0000000000000..e8e7e1900afb7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties_including_rule_id.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { removeServerGeneratedProperties } from './remove_server_generated_properties';
+
+/**
+ * This will remove server generated properties such as date times, etc... including the rule_id
+ * @param rule Rule to pass in to remove typical server generated properties
+ */
+export const removeServerGeneratedPropertiesIncludingRuleId = (
+  rule: FullResponseSchema
+): Partial<FullResponseSchema> => {
+  const ruleWithRemovedProperties = removeServerGeneratedProperties(rule);
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { rule_id, ...additionalRuledIdRemoved } = ruleWithRemovedProperties;
+  return additionalRuledIdRemoved;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/resolve_simple_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/resolve_simple_rule_output.ts
new file mode 100644
index 0000000000000..468cbdfa23aa5
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/resolve_simple_rule_output.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+export const resolveSimpleRuleOutput = (
+  ruleId = 'rule-1',
+  enabled = false
+): Partial<RulesSchema> => ({ outcome: 'exactMatch', ...getSimpleRuleOutput(ruleId, enabled) });
diff --git a/x-pack/test/detection_engine_api_integration/utils/rule_to_ndjson.ts b/x-pack/test/detection_engine_api_integration/utils/rule_to_ndjson.ts
new file mode 100644
index 0000000000000..1082212432c01
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/rule_to_ndjson.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Given a rule this will convert it to an ndjson buffer which is useful for
+ * testing upload features.
+ * @param rule The rule to convert to ndjson
+ */
+export const ruleToNdjson = (rule: CreateRulesSchema): Buffer => {
+  const stringified = JSON.stringify(rule);
+  return Buffer.from(`${stringified}\n`);
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/set_signal_status.ts b/x-pack/test/detection_engine_api_integration/utils/set_signal_status.ts
new file mode 100644
index 0000000000000..2cd4cb557f637
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/set_signal_status.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  Status,
+  SignalIds,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+
+export const setSignalStatus = ({
+  signalIds,
+  status,
+}: {
+  signalIds: SignalIds;
+  status: Status;
+}) => ({
+  signal_ids: signalIds,
+  status,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/start_signals_migration.ts b/x-pack/test/detection_engine_api_integration/utils/start_signals_migration.ts
new file mode 100644
index 0000000000000..0470266714fd2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/start_signals_migration.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_SIGNALS_MIGRATION_URL } from '@kbn/security-solution-plugin/common/constants';
+
+interface CreateMigrationResponse {
+  index: string;
+  migration_index: string;
+  migration_id: string;
+}
+
+export const startSignalsMigration = async ({
+  indices,
+  supertest,
+  log,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  log: ToolingLog;
+  indices: string[];
+}): Promise<CreateMigrationResponse[]> => {
+  const response = await supertest
+    .post(DETECTION_ENGINE_SIGNALS_MIGRATION_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ index: indices });
+
+  const {
+    body: { indices: created },
+  }: { body: { indices: CreateMigrationResponse[] } } = response;
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when starting a signals migration (startSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return created;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/update_rule.ts b/x-pack/test/detection_engine_api_integration/utils/update_rule.ts
new file mode 100644
index 0000000000000..c66d86c5594d0
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/update_rule.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import {
+  UpdateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This checks for
+ * an expected 200 still and does not do any retries.
+ * @param supertest The supertest deps
+ * @param rule The rule to create
+ */
+export const updateRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  updatedRule: UpdateRulesSchema
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .put(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .send(updatedRule);
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when updating a rule (updateRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for.ts
new file mode 100644
index 0000000000000..dfa20bd7019d8
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+
+// Similar to ReactJs's waitFor from here: https://testing-library.com/docs/dom-testing-library/api-async#waitfor
+export const waitFor = async (
+  functionToTest: () => Promise<boolean>,
+  functionName: string,
+  log: ToolingLog,
+  maxTimeout: number = 400000,
+  timeoutWait: number = 250
+): Promise<void> => {
+  let found = false;
+  let numberOfTries = 0;
+  const maxTries = Math.floor(maxTimeout / timeoutWait);
+  while (!found && numberOfTries < maxTries) {
+    if (await functionToTest()) {
+      found = true;
+    } else {
+      log.debug(`Try number ${numberOfTries} out of ${maxTries} for function ${functionName}`);
+      numberOfTries++;
+    }
+
+    await new Promise((resolveTimeout) => setTimeout(resolveTimeout, timeoutWait));
+  }
+
+  if (!found) {
+    throw new Error(`timed out waiting for function condition to be true within ${functionName}`);
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_alert_to_complete.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_alert_to_complete.ts
new file mode 100644
index 0000000000000..381116b5a65d2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_alert_to_complete.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { waitFor } from './wait_for';
+
+export const waitForAlertToComplete = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  id: string
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const response = await supertest.get(`/api/alerts/alert/${id}/state`).set('kbn-xsrf', 'true');
+      if (response.status !== 200) {
+        log.debug(
+          `Did not get an expected 200 "ok" when waiting for an alert to complete (waitForAlertToComplete). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+            response.body
+          )}, status: ${JSON.stringify(response.status)}`
+        );
+      }
+      return response.body.previousStartedAt != null;
+    },
+    'waitForAlertToComplete',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_event_log_execute_complete.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_event_log_execute_complete.ts
new file mode 100644
index 0000000000000..0b86a028d036a
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_event_log_execute_complete.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type { Client } from '@elastic/elasticsearch';
+
+import { waitFor } from './wait_for';
+import { getEventLogExecuteCompleteById } from './get_event_log_execute_complete_by_id';
+
+/**
+ * Waits for the event-log execution completed doc count to be greater than the
+ * supplied number before continuing with a default of at least one execution
+ * @param es The ES client
+ * @param log
+ * @param ruleId The id of rule to check execution logs for
+ * @param totalExecutions The number of executions to wait for, default is 1
+ */
+export const waitForEventLogExecuteComplete = async (
+  es: Client,
+  log: ToolingLog,
+  ruleId: string,
+  totalExecutions = 1
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const executionCount = await getEventLogExecuteCompleteById(es, log, ruleId);
+      return executionCount >= totalExecutions;
+    },
+    'waitForEventLogExecuteComplete',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_index_to_populate.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_index_to_populate.ts
new file mode 100644
index 0000000000000..ceba42efd1793
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_index_to_populate.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type { Client } from '@elastic/elasticsearch';
+import { waitFor } from './wait_for';
+
+/**
+ * Waits for the given index to contain documents
+ *
+ * @param esClient elasticsearch {@link Client}
+ * @param index name of the index to query
+ */
+export const waitForIndexToPopulate = async (
+  es: Client,
+  log: ToolingLog,
+  index: string
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const response = await es.count({ index });
+      return response.count > 0;
+    },
+    `waitForIndexToPopulate: ${index}`,
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_success_or_status.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_success_or_status.ts
new file mode 100644
index 0000000000000..0ab4385a54e66
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_success_or_status.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { waitFor } from './wait_for';
+
+/**
+ * Waits for the rule in find status to be 'succeeded'
+ * or the provided status, before continuing
+ * @param supertest Deps
+ */
+export const waitForRuleSuccessOrStatus = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  id: string,
+  status: RuleExecutionStatus = RuleExecutionStatus.succeeded,
+  afterDate?: Date
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      try {
+        const response = await supertest
+          .get(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .query({ id });
+        if (response.status !== 200) {
+          log.debug(
+            `Did not get an expected 200 "ok" when waiting for a rule success or status (waitForRuleSuccessOrStatus). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+              response.body
+            )}, status: ${JSON.stringify(response.status)}`
+          );
+        }
+
+        // TODO: https://github.com/elastic/kibana/pull/121644 clean up, make type-safe
+        const rule = response.body;
+        const ruleStatus = rule?.execution_summary?.last_execution.status;
+        const ruleStatusDate = rule?.execution_summary?.last_execution.date;
+
+        if (ruleStatus !== status) {
+          log.debug(
+            `Did not get an expected status of ${status} while waiting for a rule success or status for rule id ${id} (waitForRuleSuccessOrStatus). Will continue retrying until status is found. body: ${JSON.stringify(
+              response.body
+            )}, status: ${JSON.stringify(response.status)}`
+          );
+        }
+        return (
+          rule != null &&
+          ruleStatus === status &&
+          (afterDate ? new Date(ruleStatusDate) > afterDate : true)
+        );
+      } catch (e) {
+        if ((e as Error).message.includes('got 503 "Service Unavailable"')) {
+          return false;
+        }
+        throw e;
+      }
+    },
+    'waitForRuleSuccessOrStatus',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_signals_to_be_present.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_signals_to_be_present.ts
new file mode 100644
index 0000000000000..59407b116b2ac
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_signals_to_be_present.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/tooling-log';
+import type SuperTest from 'supertest';
+
+import { getSignalsByIds } from './get_signals_by_ids';
+import { waitFor } from './wait_for';
+
+/**
+ * Waits for the signal hits to be greater than the supplied number
+ * before continuing with a default of at least one signal
+ * @param supertest Deps
+ * @param numberOfSignals The number of signals to wait for, default is 1
+ */
+export const waitForSignalsToBePresent = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  numberOfSignals = 1,
+  signalIds: string[]
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const signalsOpen = await getSignalsByIds(supertest, log, signalIds, numberOfSignals);
+      return signalsOpen.hits.hits.length >= numberOfSignals;
+    },
+    'waitForSignalsToBePresent',
+    log
+  );
+};
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts
index fd6701ddd2695..db90569310cbc 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, CoreSetup } from 'kibana/server';
+import { IRouter, CoreSetup } from '@kbn/core/server';
 import { PluginsSetup, PluginsStart } from '.';
 
 export function registerHiddenSORoutes(
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts
index e1cf24521d1b1..b9ab3324750dd 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts
@@ -11,12 +11,12 @@ import {
   PluginInitializer,
   SavedObjectsNamespaceType,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../../../../plugins/encrypted_saved_objects/server';
-import { SpacesPluginSetup } from '../../../../../plugins/spaces/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { registerHiddenSORoutes } from './hidden_saved_object_routes';
 
 const SAVED_OBJECT_WITH_SECRET_TYPE = 'saved-object-with-secret';
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts b/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts
index 79880e1f21cb0..e0743ee31d88e 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObject } from 'src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/examples/config.ts b/x-pack/test/examples/config.ts
index cf37cad5bc243..6eb1e86dd0826 100644
--- a/x-pack/test/examples/config.ts
+++ b/x-pack/test/examples/config.ts
@@ -37,6 +37,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('./search_examples'),
       require.resolve('./embedded_lens'),
       require.resolve('./reporting_examples'),
+      require.resolve('./screenshotting'),
     ],
 
     kbnTestServer: {
diff --git a/x-pack/test/examples/embedded_lens/index.ts b/x-pack/test/examples/embedded_lens/index.ts
index 98ea7f80754a2..debab4773f9eb 100644
--- a/x-pack/test/examples/embedded_lens/index.ts
+++ b/x-pack/test/examples/embedded_lens/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../../../test/plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, loadTestFile }: PluginFunctionalProviderContext) {
diff --git a/x-pack/test/examples/reporting_examples/index.ts b/x-pack/test/examples/reporting_examples/index.ts
index a0e8689a26586..e4e5c93e5eee2 100644
--- a/x-pack/test/examples/reporting_examples/index.ts
+++ b/x-pack/test/examples/reporting_examples/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../../../test/plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: PluginFunctionalProviderContext) {
diff --git a/x-pack/test/examples/screenshotting/index.ts b/x-pack/test/examples/screenshotting/index.ts
new file mode 100644
index 0000000000000..b59663766389f
--- /dev/null
+++ b/x-pack/test/examples/screenshotting/index.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../test/functional/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({
+  getService,
+  getPageObjects,
+  updateBaselines,
+}: FtrProviderContext & { updateBaselines: boolean }) {
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const screenshots = getService('screenshots');
+  const testSubjects = getService('testSubjects');
+  const PageObjects = getPageObjects(['common']);
+
+  describe('Screenshotting Example', function () {
+    before(async () => {
+      this.tags('ciGroup13');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
+      await PageObjects.common.navigateToApp('screenshottingExample');
+
+      await testSubjects.setValue(
+        'expression',
+        `kibana
+          | kibana_context
+          | esaggs
+              index={indexPatternLoad id='logstash-*'}
+              aggs={aggCount id="1" enabled=true schema="metric"}
+              aggs={aggMax id="1" enabled=true schema="metric" field="bytes"}
+              aggs={aggTerms id="2" enabled=true schema="segment" field="response.raw" size=4 order="desc" orderBy="1"}
+          | metricVis metric={visdimension 0}
+        `
+      );
+      await testSubjects.click('run');
+    });
+
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    it('should capture a screenshot ', async () => {
+      const image = await testSubjects.find('image');
+      const difference = await screenshots.compareAgainstBaseline(
+        'screenshotting_example_image',
+        updateBaselines,
+        image
+      );
+
+      expect(difference).to.be.lessThan(0.1);
+    });
+
+    it('should return memory metrics', async () => {
+      const memory = await testSubjects.find('memory');
+      const text = await memory.getVisibleText();
+
+      expect(text).to.match(/\d+\.\d+ MB/);
+    });
+
+    it('should return CPU metrics', async () => {
+      const memory = await testSubjects.find('cpu');
+      const text = await memory.getVisibleText();
+
+      expect(text).to.match(/\d+\.\d+%/);
+    });
+
+    it('should show an error message', async () => {
+      await testSubjects.setValue('expression', 'something');
+      await testSubjects.click('run');
+
+      const error = await testSubjects.find('error');
+      const text = await error.getVisibleText();
+
+      expect(text).to.contain('Function something could not be found.');
+    });
+  });
+}
diff --git a/x-pack/test/examples/search_examples/index.ts b/x-pack/test/examples/search_examples/index.ts
index 18b2acbd56564..c0f8ab22c8f8f 100644
--- a/x-pack/test/examples/search_examples/index.ts
+++ b/x-pack/test/examples/search_examples/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../../../test/plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, loadTestFile }: PluginFunctionalProviderContext) {
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
index 6c2c2c7bc8b48..ba13772b10253 100644
--- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../plugins/fleet/common';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts
index d5fe4b2463d4c..e84c9f53de4cc 100644
--- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import { skipIfNoDockerRegistry } from '../../helpers';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { setupFleetAndAgents } from '../agents/services';
 import {
   AGENT_POLICY_INDEX,
   AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
diff --git a/x-pack/test/fleet_api_integration/apis/agents/status.ts b/x-pack/test/fleet_api_integration/apis/agents/status.ts
index bbcdfb0f1c4c3..75ee62c576669 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/status.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/status.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { AGENTS_INDEX } from '../../../../plugins/fleet/common';
 
 export default function ({ getService }: FtrProviderContext) {
   const es = getService('es');
diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
index e84aa13475564..dd53da8289ccd 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import semver from 'semver';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { setupFleetAndAgents } from './services';
 import { skipIfNoDockerRegistry } from '../../helpers';
-import { AGENTS_INDEX } from '../../../../plugins/fleet/common';
 import { testUsers } from '../test_users';
 
 const makeSnapshotVersion = (version: string) => {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
index e3815150c0b66..29110f5807edf 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { skipIfNoDockerRegistry } from '../../helpers';
 import {
   BulkInstallPackageInfo,
   BulkInstallPackagesResponse,
   IBulkInstallPackageHTTPError,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
 import { testUsers } from '../test_users';
 
diff --git a/x-pack/test/fleet_api_integration/apis/epm/get.ts b/x-pack/test/fleet_api_integration/apis/epm/get.ts
index 891bf7019eda3..a030a988656b9 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/get.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/get.ts
@@ -88,6 +88,26 @@ export default function (providerContext: FtrProviderContext) {
       await uninstallPackage(testPkgName, testPkgVersion);
     });
 
+    it('returns correct package info from upload if a uploaded version is not in registry', async function () {
+      const testPkgArchiveZipV9999 = path.join(
+        path.dirname(__filename),
+        '../fixtures/direct_upload_packages/apache_9999.0.0.zip'
+      );
+      const buf = fs.readFileSync(testPkgArchiveZipV9999);
+      await supertest
+        .post(`/api/fleet/epm/packages`)
+        .set('kbn-xsrf', 'xxxx')
+        .type('application/zip')
+        .send(buf)
+        .expect(200);
+
+      const res = await supertest.get(`/api/fleet/epm/packages/apache/9999.0.0`).expect(200);
+      const packageInfo = res.body.item;
+      expect(packageInfo.description).to.equal('Apache Uploaded Test Integration');
+      expect(packageInfo.download).to.equal(undefined);
+      await uninstallPackage(testPkgName, '9999.0.0');
+    });
+
     it('returns a 404 for a package that do not exists', async function () {
       await supertest.get('/api/fleet/epm/packages/notexists/99.99.99').expect(404);
     });
diff --git a/x-pack/test/fleet_api_integration/apis/epm/index.js b/x-pack/test/fleet_api_integration/apis/epm/index.js
index 6364b1de59fc8..ef103592dfb45 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/index.js
+++ b/x-pack/test/fleet_api_integration/apis/epm/index.js
@@ -27,6 +27,7 @@ export default function loadTests({ loadTestFile }) {
     loadTestFile(require.resolve('./update_assets'));
     loadTestFile(require.resolve('./data_stream'));
     loadTestFile(require.resolve('./package_install_complete'));
+    loadTestFile(require.resolve('./remove_legacy_templates'));
     loadTestFile(require.resolve('./install_error_rollback'));
     loadTestFile(require.resolve('./final_pipeline'));
   });
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
index 34cebed5b5d5a..8f2b3effd94ed 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
@@ -7,7 +7,7 @@
 import type { Client } from '@elastic/elasticsearch';
 import expect from '@kbn/expect';
 import { sortBy } from 'lodash';
-import { AssetReference } from '../../../../plugins/fleet/common';
+import { AssetReference } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_update.ts b/x-pack/test/fleet_api_integration/apis/epm/install_update.ts
index 4774d9e2d844d..baffa5bbd2655 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_update.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_update.ts
@@ -6,12 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
-import {
-  PACKAGES_SAVED_OBJECT_TYPE,
-  MAX_TIME_COMPLETE_INSTALL,
-} from '../../../../plugins/fleet/common';
 import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts b/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts
index 42ac48a4bd281..edc1279a5dbcf 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts
@@ -6,10 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  PACKAGES_SAVED_OBJECT_TYPE,
-  MAX_TIME_COMPLETE_INSTALL,
-} from '../../../../plugins/fleet/common';
+import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '@kbn/fleet-plugin/common';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/apis/epm/remove_legacy_templates.ts b/x-pack/test/fleet_api_integration/apis/epm/remove_legacy_templates.ts
new file mode 100644
index 0000000000000..53022461244b3
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/epm/remove_legacy_templates.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import path from 'path';
+import fs from 'fs';
+import { promisify } from 'util';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { setupFleetAndAgents } from '../agents/services';
+const sleep = promisify(setTimeout);
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const dockerServers = getService('dockerServers');
+  const server = dockerServers.get('registry');
+  const esClient = getService('es');
+
+  const uploadPkgName = 'apache';
+  const uploadPkgVersion = '0.1.4';
+
+  const installUploadPackage = async () => {
+    const buf = fs.readFileSync(testPkgArchiveZip);
+    await supertest
+      .post(`/api/fleet/epm/packages`)
+      .set('kbn-xsrf', 'xxxx')
+      .type('application/zip')
+      .send(buf)
+      .expect(200);
+  };
+
+  const testPkgArchiveZip = path.join(
+    path.dirname(__filename),
+    '../fixtures/direct_upload_packages/apache_0.1.4.zip'
+  );
+
+  const legacyComponentTemplates = [
+    {
+      name: 'logs-apache.access@settings',
+      template: {
+        settings: {
+          index: {
+            lifecycle: {
+              name: 'idontexist',
+            },
+          },
+        },
+      },
+      _meta: {
+        package: {
+          name: 'apache',
+        },
+      },
+    },
+    {
+      name: 'logs-apache.access@mappings',
+      template: {
+        mappings: {
+          dynamic: false,
+        },
+      },
+      _meta: {
+        package: {
+          name: 'apache',
+        },
+      },
+    },
+  ];
+  const createLegacyComponentTemplates = async () =>
+    Promise.all(
+      legacyComponentTemplates.map((tmpl) => esClient.cluster.putComponentTemplate(tmpl))
+    );
+
+  const deleteLegacyComponentTemplates = async () => {
+    esClient.cluster
+      .deleteComponentTemplate({ name: legacyComponentTemplates.map((t) => t.name) })
+      .catch((e) => {});
+  };
+
+  const waitUntilLegacyComponentTemplatesCreated = async () => {
+    const legacyTemplateNames = legacyComponentTemplates.map((t) => t.name);
+    for (let i = 5; i > 0; i--) {
+      const { component_templates: ctmps } = await esClient.cluster.getComponentTemplate();
+
+      const createdTemplates = ctmps.filter((tmp) => legacyTemplateNames.includes(tmp.name));
+
+      if (createdTemplates.length === legacyTemplateNames.length) return;
+
+      await sleep(500);
+    }
+
+    throw new Error('Legacy component templates not created after 5 attempts');
+  };
+  const uninstallPackage = async (pkg: string, version: string) => {
+    await supertest.delete(`/api/fleet/epm/packages/${pkg}/${version}`).set('kbn-xsrf', 'xxxx');
+  };
+
+  describe('legacy component template removal', async () => {
+    skipIfNoDockerRegistry(providerContext);
+    setupFleetAndAgents(providerContext);
+
+    afterEach(async () => {
+      if (!server.enabled) return;
+      await deleteLegacyComponentTemplates();
+      await uninstallPackage(uploadPkgName, uploadPkgVersion);
+    });
+
+    after(async () => {
+      await esClient.indices.deleteIndexTemplate({ name: 'testtemplate' });
+    });
+
+    it('should remove legacy component templates if not in use by index templates', async () => {
+      await createLegacyComponentTemplates();
+
+      await waitUntilLegacyComponentTemplatesCreated();
+      await installUploadPackage();
+
+      const { component_templates: allComponentTemplates } =
+        await esClient.cluster.getComponentTemplate();
+      const allComponentTemplateNames = allComponentTemplates.map((t) => t.name);
+
+      expect(allComponentTemplateNames.includes('logs-apache.access@settings')).to.equal(false);
+      expect(allComponentTemplateNames.includes('logs-apache.access@mappings')).to.equal(false);
+    });
+
+    it('should not remove legacy component templates if in use by index templates', async () => {
+      await createLegacyComponentTemplates();
+
+      await esClient.indices.putIndexTemplate({
+        name: 'testtemplate',
+        index_patterns: ['nonexistentindices'],
+        template: {},
+        composed_of: ['logs-apache.access@settings', 'logs-apache.access@mappings'],
+      });
+
+      await waitUntilLegacyComponentTemplatesCreated();
+      await installUploadPackage();
+
+      const { component_templates: allComponentTemplates } =
+        await esClient.cluster.getComponentTemplate();
+      const allComponentTemplateNames = allComponentTemplates.map((t) => t.name);
+
+      expect(allComponentTemplateNames.includes('logs-apache.access@settings')).to.equal(true);
+      expect(allComponentTemplateNames.includes('logs-apache.access@mappings')).to.equal(true);
+    });
+  });
+}
diff --git a/x-pack/test/fleet_api_integration/apis/epm/setup.ts b/x-pack/test/fleet_api_integration/apis/epm/setup.ts
index 8dc12750b8109..6d79a1c0a85c4 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/setup.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { GetInfoResponse, InstalledRegistry } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
-import { GetInfoResponse, InstalledRegistry } from '../../../../plugins/fleet/common';
 import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/template.ts b/x-pack/test/fleet_api_integration/apis/epm/template.ts
index 9cef0d3f28415..30b2baebe959b 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/template.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/template.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { appContextService } from '@kbn/fleet-plugin/server/services';
+import { getTemplate } from '@kbn/fleet-plugin/server/services/epm/elasticsearch/template/template';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { appContextService } from '../../../../plugins/fleet/server/services';
-import { getTemplate } from '../../../../plugins/fleet/server/services/epm/elasticsearch/template/template';
 
 export default function ({ getService }: FtrProviderContext) {
   const templateName = 'bar';
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/direct_upload_packages/apache_9999.0.0.zip b/x-pack/test/fleet_api_integration/apis/fixtures/direct_upload_packages/apache_9999.0.0.zip
new file mode 100644
index 0000000000000..67a7e09bfec89
Binary files /dev/null and b/x-pack/test/fleet_api_integration/apis/fixtures/direct_upload_packages/apache_9999.0.0.zip differ
diff --git a/x-pack/test/fleet_api_integration/apis/index.js b/x-pack/test/fleet_api_integration/apis/index.js
index 435d7e4f99d6b..9f68eb1c7f81f 100644
--- a/x-pack/test/fleet_api_integration/apis/index.js
+++ b/x-pack/test/fleet_api_integration/apis/index.js
@@ -9,6 +9,8 @@ import { setupTestUsers } from './test_users';
 
 export default function ({ loadTestFile, getService }) {
   describe('Fleet Endpoints', function () {
+    this.tags('ciGroup29');
+
     before(async () => {
       await setupTestUsers(getService('security'));
     });
@@ -39,16 +41,16 @@ export default function ({ loadTestFile, getService }) {
     loadTestFile(require.resolve('./package_policy/upgrade'));
 
     // Agent policies
-    loadTestFile(require.resolve('./agent_policy/index'));
+    loadTestFile(require.resolve('./agent_policy'));
 
     // Data Streams
-    loadTestFile(require.resolve('./data_streams/index'));
+    loadTestFile(require.resolve('./data_streams'));
 
     // Settings
-    loadTestFile(require.resolve('./settings/index'));
+    loadTestFile(require.resolve('./settings'));
 
     // Preconfiguration
-    loadTestFile(require.resolve('./preconfiguration/index'));
+    loadTestFile(require.resolve('./preconfiguration'));
 
     // Service tokens
     loadTestFile(require.resolve('./service_tokens'));
diff --git a/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts b/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
index 532a10f30d689..b53aafd5e03cd 100644
--- a/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
+++ b/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   FLEET_ELASTIC_AGENT_PACKAGE,
   FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID,
-} from '../../../../plugins/fleet/common/constants/epm';
+} from '@kbn/fleet-plugin/common/constants/epm';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
index 28f143aa94d52..6dcc12cd4711d 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { skipIfNoDockerRegistry } from '../../helpers';
-import { setupFleetAndAgents } from '../agents/services';
-
 import {
   UpgradePackagePolicyDryRunResponse,
   UpgradePackagePolicyResponse,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
diff --git a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
index 012ca79c4a809..ee7679d2cef65 100644
--- a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
+++ b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PRECONFIGURATION_API_ROUTES } from '../../../../plugins/fleet/common/constants';
+import { PRECONFIGURATION_API_ROUTES } from '@kbn/fleet-plugin/common/constants';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
diff --git a/x-pack/test/fleet_api_integration/apis/settings/update.ts b/x-pack/test/fleet_api_integration/apis/settings/update.ts
index 566eeb156d243..0398d9155a07a 100644
--- a/x-pack/test/fleet_api_integration/apis/settings/update.ts
+++ b/x-pack/test/fleet_api_integration/apis/settings/update.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { AGENT_POLICY_INDEX } from '../../../../plugins/fleet/common';
+import { AGENT_POLICY_INDEX } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/helpers.ts b/x-pack/test/fleet_api_integration/helpers.ts
index 659e28e3d0aed..42b83ea90a47d 100644
--- a/x-pack/test/fleet_api_integration/helpers.ts
+++ b/x-pack/test/fleet_api_integration/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { Context } from 'mocha';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { FtrProviderContext } from '../api_integration/ftr_provider_context';
 
 export function warnAndSkipTest(mochaContext: Context, log: ToolingLog) {
diff --git a/x-pack/test/fleet_cypress/agent.ts b/x-pack/test/fleet_cypress/agent.ts
index c0e5b2374889d..2bdecd90efdff 100644
--- a/x-pack/test/fleet_cypress/agent.ts
+++ b/x-pack/test/fleet_cypress/agent.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import axios, { AxiosRequestConfig } from 'axios';
 import { ChildProcess, spawn } from 'child_process';
 import { getLatestVersion } from './artifact_manager';
diff --git a/x-pack/test/fleet_cypress/fleet_server.ts b/x-pack/test/fleet_cypress/fleet_server.ts
index d3bb4a385185d..1f166093b0353 100644
--- a/x-pack/test/fleet_cypress/fleet_server.ts
+++ b/x-pack/test/fleet_cypress/fleet_server.ts
@@ -6,7 +6,7 @@
  */
 
 import { ChildProcess, spawn } from 'child_process';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import axios, { AxiosRequestConfig } from 'axios';
 import { Manager } from './resource_manager';
 import { getLatestVersion } from './artifact_manager';
diff --git a/x-pack/test/fleet_functional/page_objects/agents_page.ts b/x-pack/test/fleet_functional/page_objects/agents_page.ts
index 99e9ebfdcc15a..557d554f82673 100644
--- a/x-pack/test/fleet_functional/page_objects/agents_page.ts
+++ b/x-pack/test/fleet_functional/page_objects/agents_page.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-import { PLUGIN_ID } from '../../../plugins/fleet/common';
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
 
 // NOTE: import path below should be the deep path to the actual module - else we get CI errors
-import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths';
+import { pagePathGetters } from '@kbn/fleet-plugin/public/constants/page_paths';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function AgentsPage({ getService, getPageObjects }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
diff --git a/x-pack/test/functional/apps/api_keys/api_keys_helpers.ts b/x-pack/test/functional/apps/api_keys/api_keys_helpers.ts
index 5c9fdb65a503b..80b2795c5bb18 100644
--- a/x-pack/test/functional/apps/api_keys/api_keys_helpers.ts
+++ b/x-pack/test/functional/apps/api_keys/api_keys_helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 export default async function clearAllApiKeys(esClient: Client, logger: ToolingLog) {
   const existingKeys = await esClient.security.queryApiKeys();
diff --git a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
index 71ef909ffa24a..89c58645b64b0 100644
--- a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
+++ b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
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 1b1aa9abc831a..efac6d6739fcb 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
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   createDashboardEditUrl,
   DashboardConstants,
-} from '../../../../../../src/plugins/dashboard/public/dashboard_constants';
+} from '@kbn/dashboard-plugin/public/dashboard_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
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 2cab9263b5f49..0d177a0f3c65b 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
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   createDashboardEditUrl,
   DashboardConstants,
-} from '../../../../../../src/plugins/dashboard/public/dashboard_constants';
+} from '@kbn/dashboard-plugin/public/dashboard_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/apps/dashboard/index.ts b/x-pack/test/functional/apps/dashboard/index.ts
index 4aa379ac19dc7..baf37ff56bd80 100644
--- a/x-pack/test/functional/apps/dashboard/index.ts
+++ b/x-pack/test/functional/apps/dashboard/index.ts
@@ -9,22 +9,27 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('dashboard', function () {
-    this.tags('ciGroup19');
+    describe('', function () {
+      this.tags('ciGroup19');
+      loadTestFile(require.resolve('./feature_controls'));
+      loadTestFile(require.resolve('./preserve_url'));
+      loadTestFile(require.resolve('./reporting'));
+      loadTestFile(require.resolve('./drilldowns'));
+    });
 
-    loadTestFile(require.resolve('./feature_controls'));
-    loadTestFile(require.resolve('./preserve_url'));
-    loadTestFile(require.resolve('./reporting'));
-    loadTestFile(require.resolve('./drilldowns'));
-    loadTestFile(require.resolve('./sync_colors'));
-    loadTestFile(require.resolve('./_async_dashboard'));
-    loadTestFile(require.resolve('./dashboard_tagging'));
-    loadTestFile(require.resolve('./dashboard_lens_by_value'));
-    loadTestFile(require.resolve('./dashboard_maps_by_value'));
-    loadTestFile(require.resolve('./panel_titles'));
+    describe('', function () {
+      this.tags('ciGroup31');
+      loadTestFile(require.resolve('./sync_colors'));
+      loadTestFile(require.resolve('./_async_dashboard'));
+      loadTestFile(require.resolve('./dashboard_tagging'));
+      loadTestFile(require.resolve('./dashboard_lens_by_value'));
+      loadTestFile(require.resolve('./dashboard_maps_by_value'));
+      loadTestFile(require.resolve('./panel_titles'));
 
-    loadTestFile(require.resolve('./migration_smoke_tests/lens_migration_smoke_test'));
-    loadTestFile(require.resolve('./migration_smoke_tests/controls_migration_smoke_test'));
-    loadTestFile(require.resolve('./migration_smoke_tests/visualize_migration_smoke_test'));
-    loadTestFile(require.resolve('./migration_smoke_tests/tsvb_migration_smoke_test'));
+      loadTestFile(require.resolve('./migration_smoke_tests/lens_migration_smoke_test'));
+      loadTestFile(require.resolve('./migration_smoke_tests/controls_migration_smoke_test'));
+      loadTestFile(require.resolve('./migration_smoke_tests/visualize_migration_smoke_test'));
+      loadTestFile(require.resolve('./migration_smoke_tests/tsvb_migration_smoke_test'));
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/dashboard/reporting/__snapshots__/download_csv.snap b/x-pack/test/functional/apps/dashboard/reporting/__snapshots__/download_csv.snap
index e6b31be13861d..d524543183a3f 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/__snapshots__/download_csv.snap
+++ b/x-pack/test/functional/apps/dashboard/reporting/__snapshots__/download_csv.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`dashboard Reporting Download CSV Default Saved Search Data Download CSV export of a saved search panel 1`] = `
+exports[`dashboard  Reporting Download CSV Default Saved Search Data Download CSV export of a saved search panel 1`] = `
 "\\"order_date\\",category,currency,\\"customer_id\\",\\"order_id\\",\\"day_of_week_i\\",\\"products.created_on\\",sku
 \\"Jun 22, 2019 @ 00:00:00.000\\",\\"Men's Clothing, Men's Shoes\\",EUR,23,564670,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0531205312, ZO0684706847\\"
 \\"Jun 22, 2019 @ 00:00:00.000\\",\\"Women's Clothing\\",EUR,44,564710,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0263402634, ZO0499404994\\"
@@ -460,7 +460,7 @@ exports[`dashboard Reporting Download CSV Default Saved Search Data Download CSV
 "
 `;
 
-exports[`dashboard Reporting Download CSV Default Saved Search Data Downloads a filtered CSV export of a saved search panel 1`] = `
+exports[`dashboard  Reporting Download CSV Default Saved Search Data Downloads a filtered CSV export of a saved search panel 1`] = `
 "\\"order_date\\",category,currency,\\"customer_id\\",\\"order_id\\",\\"day_of_week_i\\",\\"products.created_on\\",sku
 \\"Jun 22, 2019 @ 00:00:00.000\\",\\"Men's Clothing, Men's Shoes\\",EUR,23,564670,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0531205312, ZO0684706847\\"
 \\"Jun 22, 2019 @ 00:00:00.000\\",\\"Men's Shoes, Men's Clothing\\",EUR,52,564513,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0390003900, ZO0287902879\\"
@@ -562,13 +562,13 @@ exports[`dashboard Reporting Download CSV Default Saved Search Data Downloads a
 "
 `;
 
-exports[`dashboard Reporting Download CSV Field Formatters and Scripted Fields Download CSV export of a saved search panel 1`] = `
+exports[`dashboard  Reporting Download CSV Field Formatters and Scripted Fields Download CSV export of a saved search panel 1`] = `
 "date,\\"_id\\",name,gender,value,year,\\"years_ago\\",\\"date_informal\\"
 \\"Jan 1, 1982 @ 00:00:00.000\\",\\"1982-Fethany-F\\",Fethany,F,780,1982,\\"37.00000000000000000000\\",\\"Jan 1st 82\\"
 "
 `;
 
-exports[`dashboard Reporting Download CSV Filtered Saved Search Downloads filtered Discover saved search report 1`] = `
+exports[`dashboard  Reporting Download CSV Filtered Saved Search Downloads filtered Discover saved search report 1`] = `
 "\\"order_date\\",category,\\"customer_full_name\\",\\"taxful_total_price\\",currency
 \\"Jun 25, 2019 @ 00:00:00.000\\",\\"Women's Accessories\\",\\"Betty Reese\\",\\"22.984\\",EUR
 \\"Jun 25, 2019 @ 00:00:00.000\\",\\"Women's Accessories, Women's Clothing\\",\\"Betty Brewer\\",\\"28.984\\",EUR
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
index 7032f25debb8f..0a12de3fb44d6 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -31,8 +31,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/106631
-  describe.skip('discover feature controls security', () => {
+  describe('discover feature controls security', () => {
     before(async () => {
       await kibanaServer.importExport.load(
         'x-pack/test/functional/fixtures/kbn_archiver/discover/feature_controls/security'
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
index 936dd49255205..9adcfc552031c 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
@@ -28,14 +28,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/113067
-  describe.skip('spaces', () => {
+  describe('spaces', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/60559
-    describe.skip('space with no features disabled', () => {
+    describe('space with no features disabled', () => {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
@@ -174,13 +172,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await spacesService.delete('custom_space_no_index_patterns');
       });
 
-      it('Navigates to Kibana home rather than index pattern management when no index patterns exist', async () => {
+      it('Navigates to Kibana Analytics overview  when no data views exist', async () => {
         await PageObjects.common.navigateToUrl('discover', '', {
           basePath: '/s/custom_space_no_index_patterns',
           ensureCurrentUrl: false,
           shouldUseHashForSubUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', { timeout: config.get('timeouts.waitFor') });
+        await testSubjects.existOrFail('kbnOverviewAddIntegrations', {
+          timeout: config.get('timeouts.waitFor'),
+        });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/discover/value_suggestions.ts b/x-pack/test/functional/apps/discover/value_suggestions.ts
index 34fbebbba5b55..5afd3d53ca85b 100644
--- a/x-pack/test/functional/apps/discover/value_suggestions.ts
+++ b/x-pack/test/functional/apps/discover/value_suggestions.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
diff --git a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
index 8af2e45b59838..2d5813e81c214 100644
--- a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
+++ b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
@@ -11,7 +11,8 @@ export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
   const security = getService('security');
 
-  describe('auto fit map to bounds', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/129467
+  describe.skip('auto fit map to bounds', () => {
     describe('initial location', () => {
       before(async () => {
         await security.testUser.setRoles(['global_maps_all', 'test_logstash_reader']);
diff --git a/x-pack/test/functional/apps/maps/embeddable/dashboard.js b/x-pack/test/functional/apps/maps/embeddable/dashboard.js
index cab0f9d4df7dd..ca80057850494 100644
--- a/x-pack/test/functional/apps/maps/embeddable/dashboard.js
+++ b/x-pack/test/functional/apps/maps/embeddable/dashboard.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['common', 'dashboard', 'maps']);
diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
index 2f00a5f6d0f91..1beddd72d3fde 100644
--- a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
+++ b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { APP_ID } from '@kbn/maps-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { APP_ID } from '../../../../../plugins/maps/common/constants';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const spacesService = getService('spaces');
diff --git a/x-pack/test/functional/apps/maps/index.js b/x-pack/test/functional/apps/maps/index.js
index dbfacc7941794..9d7e7a9cbddcc 100644
--- a/x-pack/test/functional/apps/maps/index.js
+++ b/x-pack/test/functional/apps/maps/index.js
@@ -87,6 +87,7 @@ export default function ({ loadTestFile, getService }) {
       this.tags('ciGroup10');
       loadTestFile(require.resolve('./es_pew_pew_source'));
       loadTestFile(require.resolve('./joins'));
+      loadTestFile(require.resolve('./mvt_joins'));
       loadTestFile(require.resolve('./mapbox_styles'));
       loadTestFile(require.resolve('./mvt_scaling'));
       loadTestFile(require.resolve('./mvt_geotile_grid'));
diff --git a/x-pack/test/functional/apps/maps/mvt_joins.ts b/x-pack/test/functional/apps/maps/mvt_joins.ts
new file mode 100644
index 0000000000000..2ae8f7ea5943b
--- /dev/null
+++ b/x-pack/test/functional/apps/maps/mvt_joins.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getPageObjects, getService }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['maps']);
+  const security = getService('security');
+  const find = getService('find');
+
+  describe('vector tile layer with joins', () => {
+    before(async () => {
+      await security.testUser.setRoles(
+        ['global_maps_all', 'geoshape_data_reader', 'meta_for_geoshape_data_reader'],
+        { skipBrowserRefresh: true }
+      );
+      await PageObjects.maps.loadSavedMap('mvt join example');
+    });
+
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
+    it('should show dynamic data range in legend', async () => {
+      const layerTOCDetails = await PageObjects.maps.getLayerTOCDetails('geo_shapes*');
+      const split = layerTOCDetails.trim().split('\n');
+
+      // field display name
+      expect(split[0]).to.equal('max prop1');
+
+      // bands 1-8
+      expect(split[1]).to.equal('< 4.13');
+      expect(split[2]).to.equal('4.13 up to 5.25');
+      expect(split[3]).to.equal('5.25 up to 6.38');
+      expect(split[4]).to.equal('6.38 up to 7.5');
+      expect(split[5]).to.equal('7.5 up to 8.63');
+      expect(split[6]).to.equal('8.63 up to 9.75');
+      expect(split[7]).to.equal('9.75 up to 11');
+      expect(split[8]).to.equal('>= 11');
+    });
+
+    it('should show join metrics in tooltip', async () => {
+      // zoom in on feature so tooltip click can not miss
+      await PageObjects.maps.setView(-1, 60, 9);
+      await PageObjects.maps.lockTooltipAtPosition(200, -200);
+
+      const tooltipRows = await find.allByCssSelector(`tr[class='mapFeatureTooltip_row']`);
+      expect(tooltipRows.length).to.equal(2);
+      expect(await tooltipRows[0].getVisibleText()).to.equal('name charlie');
+      expect(await tooltipRows[1].getVisibleText()).to.equal('max prop1 12');
+    });
+
+    describe('query bar', () => {
+      before(async () => {
+        await PageObjects.maps.setAndSubmitQuery('prop1 < 10');
+      });
+
+      after(async () => {
+        await PageObjects.maps.setAndSubmitQuery('');
+      });
+
+      it('should update dynamic data range in legend', async () => {
+        const layerTOCDetails = await PageObjects.maps.getLayerTOCDetails('geo_shapes*');
+        const split = layerTOCDetails.trim().split('\n');
+
+        // field display name
+        expect(split[0]).to.equal('max prop1');
+
+        // bands 1-8
+        expect(split[1]).to.equal('< 3.63');
+        expect(split[2]).to.equal('3.63 up to 4.25');
+        expect(split[3]).to.equal('4.25 up to 4.88');
+        expect(split[4]).to.equal('4.88 up to 5.5');
+        expect(split[5]).to.equal('5.5 up to 6.13');
+        expect(split[6]).to.equal('6.13 up to 6.75');
+        expect(split[7]).to.equal('6.75 up to 7.38');
+        expect(split[8]).to.equal('>= 7.38');
+      });
+
+      it('fit to bounds should exclude source features without join matches', async () => {
+        await PageObjects.maps.clickFitToData();
+
+        const { lat, lon, zoom } = await PageObjects.maps.getView();
+        expect(Math.round(lat)).to.equal(0);
+        expect(Math.round(lon)).to.equal(90);
+        expect(Math.ceil(zoom)).to.equal(5);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/maps/sample_data.js b/x-pack/test/functional/apps/maps/sample_data.js
index 35733e8d75ffb..cf8bd4c85cf26 100644
--- a/x-pack/test/functional/apps/maps/sample_data.js
+++ b/x-pack/test/functional/apps/maps/sample_data.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 export default function ({ getPageObjects, getService, updateBaselines }) {
   const PageObjects = getPageObjects(['common', 'maps', 'header', 'home', 'timePicker']);
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts
index e5b2fb30d4e45..c47171c1cd75a 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
index f7cae920106de..3b36701e651a7 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
index a65963a415392..bf6fcd10a9152 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts
index f8360804d7e83..555040ef8e59e 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '@kbn/ml-plugin/common/constants/categorization_job';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '../../../../../plugins/ml/common/constants/categorization_job';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts b/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts
index 9b27afdcf878a..a83f5d814c028 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { TIME_RANGE_TYPE } from '@kbn/ml-plugin/public/application/jobs/components/custom_url_editor/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { TIME_RANGE_TYPE } from '../../../../../plugins/ml/public/application/jobs/components/custom_url_editor/constants';
 import type {
   DiscoverUrlConfig,
   DashboardUrlConfig,
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts b/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts
index 4f97f9f48dcdb..964e0762d9322 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
index 0a04201eeef81..c0946713a2564 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts
index 84c98ff319869..3a33c95edba42 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts
index 41adf8dc8c49b..57d3922b043a3 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
index fe0baae9ed945..f5610e8b607da 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
@@ -7,8 +7,8 @@
 
 import path from 'path';
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
index a65468e0ca3ec..4334e72e9a16e 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { TestData, MetricFieldVisConfig } from './types';
 import {
@@ -14,7 +15,6 @@ import {
   farequoteLuceneSearchTestData,
   sampleLogTestData,
 } from './index_test_data';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
   const headerPage = getPageObject('header');
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
index 69a1edb403369..6ddf3bba3a81f 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 import { MetricFieldVisConfig, NonMetricFieldVisConfig } from './types';
 interface TestData {
   suiteTitle: string;
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
index b4279e9c2c440..f661ca3014ac7 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { TestData } from './types';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
 export const farequoteDataViewTestData: TestData = {
   suiteTitle: 'farequote index pattern',
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/types.ts b/x-pack/test/functional/apps/ml/data_visualizer/types.ts
index a5a016289b461..1ee0a9d8b6d12 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/types.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FieldVisConfig } from '../../../../../plugins/data_visualizer/public/application/common/components/stats_table/types';
+import type { FieldVisConfig } from '@kbn/data-visualizer-plugin/public/application/common/components/stats_table/types';
 
 export interface MetricFieldVisConfig extends FieldVisConfig {
   fieldName: string;
diff --git a/x-pack/test/functional/apps/ml/embeddables/constants.ts b/x-pack/test/functional/apps/ml/embeddables/constants.ts
index f315b7ee44dc8..e68380b6c01b8 100644
--- a/x-pack/test/functional/apps/ml/embeddables/constants.ts
+++ b/x-pack/test/functional/apps/ml/embeddables/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 export const JOB_CONFIG: Job = {
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
index c3d0ee718cecd..85e249861378f 100644
--- a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import type { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import type { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
 
 const testADJobs: Array<{ job: Job; datafeed: Datafeed }> = [
   {
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
index c1a434e14e2df..ef367797ef7e9 100644
--- a/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
@@ -7,8 +7,8 @@
 
 import path from 'path';
 
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { JobType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/monitoring/index.js b/x-pack/test/functional/apps/monitoring/index.js
index b62e4e750518f..b8f6f223092f6 100644
--- a/x-pack/test/functional/apps/monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/index.js
@@ -7,7 +7,7 @@
 
 export default function ({ loadTestFile }) {
   describe('Monitoring app', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup28');
     loadTestFile(require.resolve('./feature_controls'));
 
     loadTestFile(require.resolve('./cluster/list'));
diff --git a/x-pack/test/functional/apps/reporting_management/report_listing.ts b/x-pack/test/functional/apps/reporting_management/report_listing.ts
index 4e5aaaeba538f..08d585b9aa571 100644
--- a/x-pack/test/functional/apps/reporting_management/report_listing.ts
+++ b/x-pack/test/functional/apps/reporting_management/report_listing.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { REPORT_TABLE_ID } from '../../../../plugins/reporting/common/constants';
+import { REPORT_TABLE_ID } from '@kbn/reporting-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
diff --git a/x-pack/test/functional/apps/rollup_job/index.js b/x-pack/test/functional/apps/rollup_job/index.js
index cda5e56095b20..8fa9cd6f7aa72 100644
--- a/x-pack/test/functional/apps/rollup_job/index.js
+++ b/x-pack/test/functional/apps/rollup_job/index.js
@@ -7,7 +7,7 @@
 
 export default function ({ loadTestFile }) {
   describe('rollup app', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup28');
 
     loadTestFile(require.resolve('./rollup_jobs'));
     loadTestFile(require.resolve('./hybrid_index_pattern'));
diff --git a/x-pack/test/functional/apps/security/users.ts b/x-pack/test/functional/apps/security/users.ts
index d7201eae98bdb..67be1e7ddecce 100644
--- a/x-pack/test/functional/apps/security/users.ts
+++ b/x-pack/test/functional/apps/security/users.ts
@@ -7,10 +7,9 @@
 
 import expect from '@kbn/expect';
 import { keyBy } from 'lodash';
+import type { UserFormValues } from '@kbn/security-plugin/public/management/users/edit_user/user_form';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import type { UserFormValues } from '../../../../plugins/security/public/management/users/edit_user/user_form';
-
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['security', 'settings']);
   const config = getService('config');
diff --git a/x-pack/test/functional/apps/spaces/index.ts b/x-pack/test/functional/apps/spaces/index.ts
index 3f0b35ff9236a..780d355e1f5c6 100644
--- a/x-pack/test/functional/apps/spaces/index.ts
+++ b/x-pack/test/functional/apps/spaces/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function spacesApp({ loadTestFile }: FtrProviderContext) {
   describe('Spaces app', function spacesAppTestSuite() {
-    this.tags('ciGroup4');
+    this.tags('ciGroup9');
 
     loadTestFile(require.resolve('./copy_saved_objects'));
     loadTestFile(require.resolve('./feature_controls/spaces_security'));
diff --git a/x-pack/test/functional/apps/transform/cloning.ts b/x-pack/test/functional/apps/transform/cloning.ts
index 3cbb0892bd4ec..fd414ae5d5365 100644
--- a/x-pack/test/functional/apps/transform/cloning.ts
+++ b/x-pack/test/functional/apps/transform/cloning.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   isLatestTransform,
   isPivotTransform,
   TransformPivotConfig,
-} from '../../../../plugins/transform/common/types/transform';
-import { getLatestTransformConfig } from './index';
+} from '@kbn/transform-plugin/common/types/transform';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getLatestTransformConfig } from '.';
 
 interface TestData {
   type: 'pivot' | 'latest';
diff --git a/x-pack/test/functional/apps/transform/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
index bc680cd2c0ff9..297ae51e42e35 100644
--- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts
+++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
@@ -14,7 +14,7 @@ import {
   isPivotTransformTestData,
   LatestTransformTestData,
   PivotTransformTestData,
-} from './index';
+} from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const canvasElement = getService('canvasElement');
diff --git a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
index 2c7889572ce74..d70e84bd4db71 100644
--- a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
+++ b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -17,7 +17,7 @@ import {
   isPivotTransformTestData,
   LatestTransformTestData,
   PivotTransformTestData,
-} from './index';
+} from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/creation_saved_search.ts b/x-pack/test/functional/apps/transform/creation_saved_search.ts
index b33027da24341..1e69686d363ab 100644
--- a/x-pack/test/functional/apps/transform/creation_saved_search.ts
+++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
@@ -14,7 +14,7 @@ import {
   isPivotTransformTestData,
   LatestTransformTestData,
   PivotTransformTestData,
-} from './index';
+} from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/deleting.ts b/x-pack/test/functional/apps/transform/deleting.ts
index 47a36bb326243..ba49a5c0ae7f9 100644
--- a/x-pack/test/functional/apps/transform/deleting.ts
+++ b/x-pack/test/functional/apps/transform/deleting.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/editing.ts b/x-pack/test/functional/apps/transform/editing.ts
index 36177fcaa3016..62feab8864e05 100644
--- a/x-pack/test/functional/apps/transform/editing.ts
+++ b/x-pack/test/functional/apps/transform/editing.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 import type {
   TransformLatestConfig,
   TransformPivotConfig,
-} from '../../../../plugins/transform/common/types/transform';
+} from '@kbn/transform-plugin/common/types/transform';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/index.ts b/x-pack/test/functional/apps/transform/index.ts
index 4966e018a4b03..181325e83b36b 100644
--- a/x-pack/test/functional/apps/transform/index.ts
+++ b/x-pack/test/functional/apps/transform/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   TransformLatestConfig,
   TransformPivotConfig,
-} from '../../../../plugins/transform/common/types/transform';
+} from '@kbn/transform-plugin/common/types/transform';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts b/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts
index fe29510e82497..59ad6d0d8dfa4 100644
--- a/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts
+++ b/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPivotTransformConfig } from '../index';
+import { getPivotTransformConfig } from '..';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts b/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts
index de70c411cfe2e..be808d606fdd6 100644
--- a/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts
+++ b/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPivotTransformConfig } from '../index';
+import { getPivotTransformConfig } from '..';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/transform/resetting.ts b/x-pack/test/functional/apps/transform/resetting.ts
index ea32c401f3551..471f8f7681a20 100644
--- a/x-pack/test/functional/apps/transform/resetting.ts
+++ b/x-pack/test/functional/apps/transform/resetting.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/starting.ts b/x-pack/test/functional/apps/transform/starting.ts
index e83d90a985a0c..c2940a95aaece 100644
--- a/x-pack/test/functional/apps/transform/starting.ts
+++ b/x-pack/test/functional/apps/transform/starting.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 6ecf87f88b8be..cc0578602951a 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   settingsObjectId,
   settingsObjectType,
-} from '../../../../plugins/uptime/server/lib/saved_objects/uptime_settings';
+} from '@kbn/synthetics-plugin/server/lib/saved_objects/uptime_settings';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
@@ -56,7 +56,6 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
         await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
       });
 
-      loadTestFile(require.resolve('./locations'));
       loadTestFile(require.resolve('./settings'));
       loadTestFile(require.resolve('./certificates'));
     });
diff --git a/x-pack/test/functional/apps/uptime/locations.ts b/x-pack/test/functional/apps/uptime/locations.ts
deleted file mode 100644
index 1e71607845ea4..0000000000000
--- a/x-pack/test/functional/apps/uptime/locations.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { makeChecksWithStatus } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  const { uptime: uptimePage } = getPageObjects(['uptime']);
-  const uptime = getService('uptime');
-  const es = getService('es');
-
-  const monitor = () => uptime.monitor;
-  const MONITOR_ID = 'location-testing-id';
-
-  const LessAvailMonitor = 'less-availability-monitor';
-
-  const addMonitorWithNoLocation = async () => {
-    /**
-     * This mogrify function will strip the documents of their location
-     * data (but preserve their location name), which is necessary for
-     * this test to work as desired.
-     * @param d current document
-     */
-    const mogrifyNoLocation = (d: any) => {
-      if (d.observer?.geo?.location) {
-        d.observer.geo.location = undefined;
-      }
-      return d;
-    };
-    await makeChecksWithStatus(es, MONITOR_ID, 5, 2, 10000, {}, 'up', mogrifyNoLocation);
-  };
-
-  const addLessAvailMonitor = async () => {
-    await makeChecksWithStatus(es, LessAvailMonitor, 5, 2, 10000, {}, 'up');
-    await makeChecksWithStatus(es, LessAvailMonitor, 5, 2, 10000, {}, 'down');
-  };
-
-  // FLAKY: https://github.com/elastic/kibana/issues/85208
-  describe.skip('Observer location', () => {
-    const start = '~ 15 minutes ago';
-    const end = 'now';
-
-    before(async () => {
-      await addMonitorWithNoLocation();
-      await addLessAvailMonitor();
-      await uptime.navigation.goToUptime();
-      await uptimePage.goToRoot(true);
-    });
-
-    beforeEach(async () => {
-      await addMonitorWithNoLocation();
-      await addLessAvailMonitor();
-      if (!(await uptime.navigation.isOnDetailsPage()))
-        await uptimePage.loadDataAndGoToMonitorPage(start, end, MONITOR_ID);
-    });
-
-    it('displays the overall availability', async () => {
-      await monitor().displayOverallAvailability('100.00 %');
-    });
-
-    it('can change the view to map', async () => {
-      await monitor().toggleToMapView();
-    });
-
-    it('renders the location panel and canvas', async () => {
-      await monitor().locationMapIsRendered();
-    });
-
-    it('renders the location missing popover when monitor has location name, but no geo data', async () => {
-      await monitor().locationMissingExists();
-    });
-
-    it('displays less monitor availability', async () => {
-      await uptime.navigation.goToHomeViaBreadCrumb();
-      await uptimePage.loadDataAndGoToMonitorPage(start, end, LessAvailMonitor);
-      await monitor().displayOverallAvailability('50.00 %');
-    });
-  });
-};
diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index 310a5cc0c9970..585de566f2aba 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { DynamicSettings } from '@kbn/synthetics-plugin/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '@kbn/synthetics-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DynamicSettings } from '../../../../plugins/uptime/common/runtime_types';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../plugins/uptime/common/constants';
 import { makeChecks } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
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 80aff8d27c77d..1c57b71e0689b 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
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { VisualizeConstants } from '../../../../../../src/plugins/visualizations/common/constants';
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/apps/visualize/index.ts b/x-pack/test/functional/apps/visualize/index.ts
index e821c1d93edf1..105303aa1b537 100644
--- a/x-pack/test/functional/apps/visualize/index.ts
+++ b/x-pack/test/functional/apps/visualize/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function visualize({ loadTestFile }: FtrProviderContext) {
   describe('Visualize', function visualizeTestSuite() {
-    this.tags(['ciGroup4', 'skipFirefox']);
+    this.tags(['ciGroup30', 'skipFirefox']);
 
     loadTestFile(require.resolve('./feature_controls/visualize_security'));
     loadTestFile(require.resolve('./feature_controls/visualize_spaces'));
diff --git a/x-pack/test/functional/apps/watcher/index.js b/x-pack/test/functional/apps/watcher/index.js
index db5f52d2121e8..fb39fe4aa7b29 100644
--- a/x-pack/test/functional/apps/watcher/index.js
+++ b/x-pack/test/functional/apps/watcher/index.js
@@ -7,7 +7,7 @@
 
 export default function ({ loadTestFile }) {
   describe('watcher app', function () {
-    this.tags(['ciGroup1', 'includeFirefox']);
+    this.tags(['ciGroup28', 'includeFirefox']);
 
     loadTestFile(require.resolve('./watcher_test'));
   });
diff --git a/x-pack/test/functional/fixtures/kbn_archiver/maps.json b/x-pack/test/functional/fixtures/kbn_archiver/maps.json
index 5564e8d502944..e9f4f4290c70d 100644
--- a/x-pack/test/functional/fixtures/kbn_archiver/maps.json
+++ b/x-pack/test/functional/fixtures/kbn_archiver/maps.json
@@ -104,6 +104,35 @@
   "version": "WzUxLDJd"
 }
 
+{
+  "attributes": {
+    "description": "",
+    "layerListJSON": "[{\"id\":\"n1t6f\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"sourceDescriptor\":{\"id\":\"62eca1fc-fe42-11e8-8eb2-f2801f1b9fd1\",\"type\":\"ES_SEARCH\",\"geoField\":\"geometry\",\"limit\":2048,\"filterByMapBounds\":false,\"showTooltip\":true,\"tooltipProperties\":[\"name\"],\"applyGlobalQuery\":false,\"scalingType\":\"MVT\",\"indexPatternRefName\":\"layer_0_source_index_pattern\"},\"visible\":true,\"temporary\":false,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"field\":{\"label\":\"max(prop1) group by meta_for_geo_shapes*.runtime_shape_name\",\"name\":\"__kbnjoin__max_of_prop1__855ccb86-fe42-11e8-8eb2-f2801f1b9fd1\",\"origin\":\"join\"},\"color\":\"Blues\"}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":10}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}}},\"temporary\":true,\"previousStyle\":null},\"type\":\"MVT_VECTOR\",\"joins\":[{\"leftField\":\"name\",\"right\":{\"id\":\"855ccb86-fe42-11e8-8eb2-f2801f1b9fd1\",\"indexPatternTitle\":\"meta_for_geo_shapes*\",\"term\":\"runtime_shape_name\",\"metrics\":[{\"type\":\"max\",\"field\":\"prop1\"}],\"applyGlobalQuery\":true,\"type\":\"ES_TERM_SOURCE\",\"indexPatternRefName\":\"layer_0_join_0_index_pattern\"}}]}]",
+    "mapStateJSON": "{\"zoom\":3.02,\"center\":{\"lon\":77.33426,\"lat\":-0.04647},\"timeFilters\":{\"from\":\"now-17m\",\"to\":\"now\",\"mode\":\"quick\"},\"refreshConfig\":{\"isPaused\":true,\"interval\":1000},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"settings\":{\"autoFitToDataBounds\":false,\"backgroundColor\":\"#ffffff\",\"customIcons\":[],\"disableInteractive\":false,\"disableTooltipControl\":false,\"hideToolbarOverlay\":false,\"hideLayerControl\":false,\"hideViewControl\":false,\"initialLocation\":\"LAST_SAVED_LOCATION\",\"fixedLocation\":{\"lat\":0,\"lon\":0,\"zoom\":2},\"browserLocation\":{\"zoom\":2},\"maxZoom\":24,\"minZoom\":0,\"showScaleControl\":false,\"showSpatialFilters\":true,\"showTimesliderToggleButton\":true,\"spatialFiltersAlpa\":0.3,\"spatialFiltersFillColor\":\"#DA8B45\",\"spatialFiltersLineColor\":\"#DA8B45\"}}",
+    "title": "mvt join example",
+    "uiStateJSON": "{\"isLayerTOCOpen\":true,\"openTOCDetails\":[\"n1t6f\"]}"
+  },
+  "coreMigrationVersion": "8.3.0",
+  "id": "f85dc420-ba99-11ec-8403-51529e77089a",
+  "migrationVersion": {
+    "map": "8.1.0"
+  },
+  "references": [
+      {
+          "id": "561253e0-f731-11e8-8487-11b9dd924f96",
+          "name": "layer_0_source_index_pattern",
+          "type": "index-pattern"
+      },
+      {
+          "id": "e20b2a30-f735-11e8-8ce0-9723965e01e3",
+          "name": "layer_0_join_0_index_pattern",
+          "type": "index-pattern"
+      }
+  ],
+  "type": "map",
+  "version": "Wzk0LDFd"
+}
+
 {
   "attributes": {
     "fields": "[{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['@timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]",
diff --git a/x-pack/test/functional/page_objects/gis_page.ts b/x-pack/test/functional/page_objects/gis_page.ts
index 909a96706575b..1ef767ea0a358 100644
--- a/x-pack/test/functional/page_objects/gis_page.ts
+++ b/x-pack/test/functional/page_objects/gis_page.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { APP_ID } from '../../../plugins/maps/common/constants';
+import { APP_ID } from '@kbn/maps-plugin/common/constants';
 import { FtrService } from '../ftr_provider_context';
 
 function escapeLayerName(layerName: string) {
diff --git a/x-pack/test/functional/page_objects/graph_page.ts b/x-pack/test/functional/page_objects/graph_page.ts
index 95f1bf486d5d1..1203d4077b5b8 100644
--- a/x-pack/test/functional/page_objects/graph_page.ts
+++ b/x-pack/test/functional/page_objects/graph_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrService } from '../ftr_provider_context';
 
 interface Node {
diff --git a/x-pack/test/functional/page_objects/infra_logs_page.ts b/x-pack/test/functional/page_objects/infra_logs_page.ts
index 57252af224b2f..fe43dd1767d94 100644
--- a/x-pack/test/functional/page_objects/infra_logs_page.ts
+++ b/x-pack/test/functional/page_objects/infra_logs_page.ts
@@ -9,9 +9,9 @@
 // import moment from 'moment';
 import querystring from 'querystring';
 import { encode, RisonValue } from 'rison-node';
+import { LogPositionUrlState } from '@kbn/infra-plugin/public/containers/logs/log_position/with_log_position_url_state';
+import { FlyoutOptionsUrlState } from '@kbn/infra-plugin/public/containers/logs/log_flyout';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { LogPositionUrlState } from '../../../../x-pack/plugins/infra/public/containers/logs/log_position/with_log_position_url_state';
-import { FlyoutOptionsUrlState } from '../../../../x-pack/plugins/infra/public/containers/logs/log_flyout';
 
 export interface TabsParams {
   stream: {
diff --git a/x-pack/test/functional/page_objects/infra_metrics_explorer.ts b/x-pack/test/functional/page_objects/infra_metrics_explorer.ts
index 5334125687dfe..b46563cc2d3b5 100644
--- a/x-pack/test/functional/page_objects/infra_metrics_explorer.ts
+++ b/x-pack/test/functional/page_objects/infra_metrics_explorer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function InfraMetricsExplorerProvider({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/page_objects/ingest_pipelines_page.ts b/x-pack/test/functional/page_objects/ingest_pipelines_page.ts
index 0de17f9d943ac..ebee2fbe6d86d 100644
--- a/x-pack/test/functional/page_objects/ingest_pipelines_page.ts
+++ b/x-pack/test/functional/page_objects/ingest_pipelines_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function IngestPipelinesPageProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 5e7922a9b30dc..00bee191a6368 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -720,12 +720,21 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
      */
     async switchToVisualization(subVisualizationId: string, searchTerm?: string) {
       await this.openChartSwitchPopover();
-      const searchInput = await testSubjects.find('lnsChartSwitchSearch');
-      await searchInput.focus();
-      await this.searchOnChartSwitch(subVisualizationId, searchTerm);
+      await this.waitForSearchInputValue(subVisualizationId, searchTerm);
       await testSubjects.click(`lnsChartSwitchPopover_${subVisualizationId}`);
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
+    async waitForSearchInputValue(subVisualizationId: string, searchTerm?: string) {
+      await retry.try(async () => {
+        await this.searchOnChartSwitch(subVisualizationId, searchTerm);
+        await PageObjects.common.sleep(1000); // give time for the value to be typed
+        const searchInputValue = await testSubjects.getAttribute('lnsChartSwitchSearch', 'value');
+        const queryTerm = searchTerm ?? subVisualizationId.substring(subVisualizationId.length - 3);
+        if (searchInputValue !== queryTerm) {
+          throw new Error('Search input value is not the expected value');
+        }
+      });
+    },
 
     async openChartSwitchPopover() {
       if (await testSubjects.exists('lnsChartSwitchList')) {
diff --git a/x-pack/test/functional/page_objects/log_wrapper.ts b/x-pack/test/functional/page_objects/log_wrapper.ts
index cc787e14f9333..97f5a7a89369f 100644
--- a/x-pack/test/functional/page_objects/log_wrapper.ts
+++ b/x-pack/test/functional/page_objects/log_wrapper.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 
 /**
  * Wraps the specified object instance with debug log statements of all method calls.
diff --git a/x-pack/test/functional/page_objects/reporting_page.ts b/x-pack/test/functional/page_objects/reporting_page.ts
index 234e19bf90af0..187149406aae8 100644
--- a/x-pack/test/functional/page_objects/reporting_page.ts
+++ b/x-pack/test/functional/page_objects/reporting_page.ts
@@ -11,7 +11,7 @@ import path from 'path';
 import type SuperTest from 'supertest';
 import { format as formatUrl } from 'url';
 import { promisify } from 'util';
-import { REPORT_TABLE_ID, REPORT_TABLE_ROW_ID } from '../../../plugins/reporting/common/constants';
+import { REPORT_TABLE_ID, REPORT_TABLE_ROW_ID } from '@kbn/reporting-plugin/common/constants';
 import { FtrService } from '../ftr_provider_context';
 
 const writeFileAsync = promisify(fs.writeFile);
diff --git a/x-pack/test/functional/page_objects/search_sessions_management_page.ts b/x-pack/test/functional/page_objects/search_sessions_management_page.ts
index 29faf3cee3b51..269299dd7918a 100644
--- a/x-pack/test/functional/page_objects/search_sessions_management_page.ts
+++ b/x-pack/test/functional/page_objects/search_sessions_management_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SEARCH_SESSIONS_TABLE_ID } from '../../../../src/plugins/data/common';
+import { SEARCH_SESSIONS_TABLE_ID } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function SearchSessionsPageProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index fbdb918b217f2..8731a3a3f5459 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -6,9 +6,9 @@
  */
 
 import { adminTestUser } from '@kbn/test';
+import { AuthenticatedUser, Role } from '@kbn/security-plugin/common/model';
+import type { UserFormValues } from '@kbn/security-plugin/public/management/users/edit_user/user_form';
 import { FtrService } from '../ftr_provider_context';
-import { AuthenticatedUser, Role } from '../../../plugins/security/common/model';
-import type { UserFormValues } from '../../../plugins/security/public/management/users/edit_user/user_form';
 
 interface LoginOptions {
   expectSpaceSelector?: boolean;
diff --git a/x-pack/test/functional/services/cases/api.ts b/x-pack/test/functional/services/cases/api.ts
index e863504c2add3..b58153084aec4 100644
--- a/x-pack/test/functional/services/cases/api.ts
+++ b/x-pack/test/functional/services/cases/api.ts
@@ -6,7 +6,7 @@
  */
 
 import pMap from 'p-map';
-import { CasePostRequest } from '../../../../plugins/cases/common/api';
+import { CasePostRequest } from '@kbn/cases-plugin/common/api';
 import {
   createCase as createCaseAPI,
   deleteAllCaseItems,
diff --git a/x-pack/test/functional/services/cases/common.ts b/x-pack/test/functional/services/cases/common.ts
index bf5b8e6e8b0be..7722c32f79837 100644
--- a/x-pack/test/functional/services/cases/common.ts
+++ b/x-pack/test/functional/services/cases/common.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CaseStatuses } from '../../../../plugins/cases/common';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function CasesCommonServiceProvider({ getService, getPageObject }: FtrProviderContext) {
diff --git a/x-pack/test/functional/services/cases/list.ts b/x-pack/test/functional/services/cases/list.ts
index 29fc34d3f0dd5..651f52434e55f 100644
--- a/x-pack/test/functional/services/cases/list.ts
+++ b/x-pack/test/functional/services/cases/list.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
-import { CaseStatuses } from '../../../../plugins/cases/common';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function CasesTableServiceProvider({ getService, getPageObject }: FtrProviderContext) {
diff --git a/x-pack/test/functional/services/ml/alerting.ts b/x-pack/test/functional/services/ml/alerting.ts
index 0acda99622443..7007f0d00f284 100644
--- a/x-pack/test/functional/services/ml/alerting.ts
+++ b/x-pack/test/functional/services/ml/alerting.ts
@@ -6,12 +6,12 @@
  */
 
 import expect from '@kbn/expect';
+import { ML_ALERT_TYPES } from '@kbn/ml-plugin/common/constants/alerts';
+import { Rule } from '@kbn/alerting-plugin/common';
+import { MlAnomalyDetectionAlertParams } from '@kbn/ml-plugin/common/types/alerts';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 import { MlCommonUI } from './common_ui';
-import { ML_ALERT_TYPES } from '../../../../plugins/ml/common/constants/alerts';
-import { Rule } from '../../../../plugins/alerting/common';
-import { MlAnomalyDetectionAlertParams } from '../../../../plugins/ml/common/types/alerts';
 
 export function MachineLearningAlertingProvider(
   { getService }: FtrProviderContext,
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
index 36e01737adff3..ae7cf5f897311 100644
--- a/x-pack/test/functional/services/ml/api.ts
+++ b/x-pack/test/functional/services/ml/api.ts
@@ -10,21 +10,21 @@ import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 import fs from 'fs';
 import path from 'path';
-import { Calendar } from '../../../../plugins/ml/server/models/calendar/index';
-import { Annotation } from '../../../../plugins/ml/common/types/annotations';
-import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { DATAFEED_STATE, JOB_STATE } from '../../../../plugins/ml/common/constants/states';
-import { DataFrameTaskStateType } from '../../../../plugins/ml/common/types/data_frame_analytics';
-import { DATA_FRAME_TASK_STATE } from '../../../../plugins/ml/common/constants/data_frame_analytics';
-import { Datafeed, Job } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { JobType } from '../../../../plugins/ml/common/types/saved_objects';
+import { Calendar } from '@kbn/ml-plugin/server/models/calendar';
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DATAFEED_STATE, JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
+import { DataFrameTaskStateType } from '@kbn/ml-plugin/common/types/data_frame_analytics';
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import {
   ML_ANNOTATIONS_INDEX_ALIAS_READ,
   ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
-} from '../../../../plugins/ml/common/constants/index_patterns';
-import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
-import { PutTrainedModelConfig } from '../../../../plugins/ml/common/types/trained_models';
+} from '@kbn/ml-plugin/common/constants/index_patterns';
+import { PutTrainedModelConfig } from '@kbn/ml-plugin/common/types/trained_models';
+import { COMMON_REQUEST_HEADERS } from './common_api';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export type MlApi = ProvidedType<typeof MachineLearningAPIProvider>;
 
@@ -1124,6 +1124,26 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
       return model;
     },
 
+    async createTrainedModelES(modelId: string, body: PutTrainedModelConfig) {
+      log.debug(`Creating trained model with id "${modelId}"`);
+      const { body: model, status } = await esSupertest
+        .put(`/_ml/trained_models/${modelId}`)
+        .send(body);
+      this.assertResponseStatusCode(200, status, model);
+
+      log.debug('> Trained model created');
+      return model;
+    },
+
+    async deleteTrainedModelES(modelId: string) {
+      log.debug(`Creating trained model with id "${modelId}"`);
+      const { body: model, status } = await esSupertest.delete(`/_ml/trained_models/${modelId}`);
+      this.assertResponseStatusCode(200, status, model);
+
+      log.debug('> Trained model created');
+      return model;
+    },
+
     async createTestTrainedModels(
       modelType: ModelType,
       count: number = 10,
diff --git a/x-pack/test/functional/services/ml/common_config.ts b/x-pack/test/functional/services/ml/common_config.ts
index af3d393a16754..246dd0899b013 100644
--- a/x-pack/test/functional/services/ml/common_config.ts
+++ b/x-pack/test/functional/services/ml/common_config.ts
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import { DeepPartial } from '../../../../plugins/ml/common/types/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import { Job, Datafeed } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
-
 // @ts-expect-error not full interface
 const FQ_SM_JOB_CONFIG: Job = {
   job_id: ``,
diff --git a/x-pack/test/functional/services/ml/common_ui.ts b/x-pack/test/functional/services/ml/common_ui.ts
index 6432b1675dc9d..d4ad5d863eac1 100644
--- a/x-pack/test/functional/services/ml/common_ui.ts
+++ b/x-pack/test/functional/services/ml/common_ui.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import type { CanvasElementColorStats } from '../canvas_element';
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics.ts b/x-pack/test/functional/services/ml/data_frame_analytics.ts
index 6231e71b766fa..e1e1433dbd79a 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics.ts
@@ -7,11 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 
-import { DATA_FRAME_TASK_STATE } from '../../../../plugins/ml/common/constants/data_frame_analytics';
-
 export function MachineLearningDataFrameAnalyticsProvider(
   { getService }: FtrProviderContext,
   mlApi: MlApi
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
index 89f5ff5ef17a7..88ef0fdf08c8d 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -6,16 +6,16 @@
  */
 
 import expect from '@kbn/expect';
-import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 
+import {
+  isRegressionAnalysis,
+  isClassificationAnalysis,
+} from '@kbn/ml-plugin/common/util/analytics_utils';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import type { CanvasElementColorStats } from '../canvas_element';
 import type { MlCommonUI } from './common_ui';
 import { MlApi } from './api';
-import {
-  isRegressionAnalysis,
-  isClassificationAnalysis,
-} from '../../../../plugins/ml/common/util/analytics_utils';
 
 export function MachineLearningDataFrameAnalyticsCreationProvider(
   { getPageObject, getService }: FtrProviderContext,
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
index 1c64a514de5be..f6e10fa02bce5 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import type { CanvasElementColorStats } from '../canvas_element';
 import type { MlCommonUI } from './common_ui';
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
index 58f3d618c76e3..e2d3977fabea0 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 type ExpectedSectionTableEntries = Record<string, string>;
diff --git a/x-pack/test/functional/services/ml/data_visualizer_table.ts b/x-pack/test/functional/services/ml/data_visualizer_table.ts
index e5c0dafbd00f7..04d9bf98c7b04 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_table.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { ML_JOB_FIELD_TYPES } from '../../../../plugins/ml/common/constants/field_types';
 import { MlCommonUI } from './common_ui';
 export type MlDataVisualizerTable = ProvidedType<typeof MachineLearningDataVisualizerTableProvider>;
 
diff --git a/x-pack/test/functional/services/ml/job_management.ts b/x-pack/test/functional/services/ml/job_management.ts
index b993cc04ceb2c..c07cc91921fd7 100644
--- a/x-pack/test/functional/services/ml/job_management.ts
+++ b/x-pack/test/functional/services/ml/job_management.ts
@@ -7,11 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 
-import { JOB_STATE, DATAFEED_STATE } from '../../../../plugins/ml/common/constants/states';
-
 export function MachineLearningJobManagementProvider(
   { getService }: FtrProviderContext,
   mlApi: MlApi
diff --git a/x-pack/test/functional/services/ml/job_table.ts b/x-pack/test/functional/services/ml/job_table.ts
index 1ba825203518d..28f937b7e597a 100644
--- a/x-pack/test/functional/services/ml/job_table.ts
+++ b/x-pack/test/functional/services/ml/job_table.ts
@@ -8,15 +8,14 @@
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommonUI } from './common_ui';
-import { MlCustomUrls } from './custom_urls';
-
 import {
   TimeRangeType,
   TIME_RANGE_TYPE,
   URL_TYPE,
-} from '../../../../plugins/ml/public/application/jobs/components/custom_url_editor/constants';
+} from '@kbn/ml-plugin/public/application/jobs/components/custom_url_editor/constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { MlCommonUI } from './common_ui';
+import { MlCustomUrls } from './custom_urls';
 
 export type MlADJobTable = ProvidedType<typeof MachineLearningJobTableProvider>;
 
diff --git a/x-pack/test/functional/services/ml/job_wizard_categorization.ts b/x-pack/test/functional/services/ml/job_wizard_categorization.ts
index 95eee8c8edf9f..508a2ff4297af 100644
--- a/x-pack/test/functional/services/ml/job_wizard_categorization.ts
+++ b/x-pack/test/functional/services/ml/job_wizard_categorization.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '@kbn/ml-plugin/common/constants/categorization_job';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '../../../../plugins/ml/common/constants/categorization_job';
 
 export function MachineLearningJobWizardCategorizationProvider({ getService }: FtrProviderContext) {
   const comboBox = getService('comboBox');
diff --git a/x-pack/test/functional/services/ml/stack_management_jobs.ts b/x-pack/test/functional/services/ml/stack_management_jobs.ts
index 63833c1339564..10f55efce8155 100644
--- a/x-pack/test/functional/services/ml/stack_management_jobs.ts
+++ b/x-pack/test/functional/services/ml/stack_management_jobs.ts
@@ -10,12 +10,12 @@ import { REPO_ROOT } from '@kbn/utils';
 import fs from 'fs';
 import path from 'path';
 
+import type { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
+import type { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import type { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 import type { FtrProviderContext } from '../../ftr_provider_context';
 import type { MlADJobTable } from './job_table';
 import type { MlDFAJobTable } from './data_frame_analytics_table';
-import type { JobType } from '../../../../plugins/ml/common/types/saved_objects';
-import type { Job, Datafeed } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import type { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
 
 type SyncFlyoutObjectType =
   | 'MissingObjects'
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index b6675543a04a2..3115eca61b443 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { savedSearches, dashboards } from './test_resources_data';
 import { COMMON_REQUEST_HEADERS } from './common_api';
 import { MlApi } from './api';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { JobType } from '../../../../plugins/ml/common/types/saved_objects';
 
 export enum SavedObjectType {
   CONFIG = 'config',
diff --git a/x-pack/test/functional/services/ml/trained_models_table.ts b/x-pack/test/functional/services/ml/trained_models_table.ts
index 3eed354aca4c1..4028e44b11418 100644
--- a/x-pack/test/functional/services/ml/trained_models_table.ts
+++ b/x-pack/test/functional/services/ml/trained_models_table.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 import { upperFirst } from 'lodash';
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import type { FtrProviderContext } from '../../ftr_provider_context';
 import type { MlCommonUI } from './common_ui';
 
diff --git a/x-pack/test/functional/services/observability/users.ts b/x-pack/test/functional/services/observability/users.ts
index ac2fc8ddd324e..4e33afe270223 100644
--- a/x-pack/test/functional/services/observability/users.ts
+++ b/x-pack/test/functional/services/observability/users.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Role } from '../../../../plugins/security/common/model';
+import { Role } from '@kbn/security-plugin/common/model';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 type CreateRolePayload = Pick<Role, 'metadata' | 'elasticsearch' | 'kibana'>;
diff --git a/x-pack/test/functional/services/search_sessions.ts b/x-pack/test/functional/services/search_sessions.ts
index 4490b87006833..a3d04af530d54 100644
--- a/x-pack/test/functional/services/search_sessions.ts
+++ b/x-pack/test/functional/services/search_sessions.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObjectsFindResponse } from 'src/core/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrService } from '../ftr_provider_context';
 
diff --git a/x-pack/test/functional/services/transform/api.ts b/x-pack/test/functional/services/transform/api.ts
index 748694ce4e804..30a3da31a5dbe 100644
--- a/x-pack/test/functional/services/transform/api.ts
+++ b/x-pack/test/functional/services/transform/api.ts
@@ -7,14 +7,14 @@
 
 import expect from '@kbn/expect';
 
-import type { PutTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { TransformState, TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
-import type { TransformStats } from '../../../../plugins/transform/common/types/transform_stats';
+import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { TransformState, TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
+import type { TransformStats } from '@kbn/transform-plugin/common/types/transform_stats';
 
+import { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { PostTransformsUpdateRequestSchema } from '@kbn/transform-plugin/common/api_schemas/update_transforms';
+import { TransformPivotConfig } from '@kbn/transform-plugin/common/types/transform';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { GetTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { PostTransformsUpdateRequestSchema } from '../../../../plugins/transform/common/api_schemas/update_transforms';
-import { TransformPivotConfig } from '../../../../plugins/transform/common/types/transform';
 
 export async function asyncForEach(array: any[], callback: Function) {
   for (let index = 0; index < array.length; index++) {
diff --git a/x-pack/test/functional/services/uptime/monitor.ts b/x-pack/test/functional/services/uptime/monitor.ts
index 583a37d7f4ef9..a8b8d96381747 100644
--- a/x-pack/test/functional/services/uptime/monitor.ts
+++ b/x-pack/test/functional/services/uptime/monitor.ts
@@ -11,16 +11,10 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export function UptimeMonitorProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
-  const find = getService('find');
 
   const PageObjects = getPageObjects(['header']);
 
   return {
-    async locationMissingExists() {
-      return await testSubjects.existOrFail('xpack.uptime.locationMap.locationMissing', {
-        timeout: 3000,
-      });
-    },
     async displayOverallAvailability(availabilityVal: string) {
       return retry.tryForTime(60 * 1000, async () => {
         await testSubjects.existOrFail('uptimeOverallAvailability');
@@ -28,16 +22,6 @@ export function UptimeMonitorProvider({ getService, getPageObjects }: FtrProvide
         expect(availability).to.be(availabilityVal);
       });
     },
-    async locationMapIsRendered() {
-      return retry.tryForTime(15000, async () => {
-        await testSubjects.existOrFail('xpack.uptime.locationMap.embeddedPanel', {
-          timeout: 3000,
-        });
-        const mapPanel = await testSubjects.find('xpack.uptime.locationMap.embeddedPanel');
-
-        await find.descendantExistsByCssSelector('canvas.mapboxgl-canvas', mapPanel);
-      });
-    },
     async setPingListLocation(location: string) {
       await testSubjects.click('xpack.uptime.pingList.locationSelect', 5000);
       return testSubjects.click(`xpack.uptime.pingList.locationOptions.${location}`, 5000);
@@ -56,9 +40,6 @@ export function UptimeMonitorProvider({ getService, getPageObjects }: FtrProvide
         );
       });
     },
-    async toggleToMapView() {
-      await testSubjects.click('uptimeMonitorToggleMapBtn');
-    },
     async hasRedirectInfo() {
       return retry.tryForTime(30000, async () => {
         await testSubjects.existOrFail('uptimeMonitorRedirectInfo');
diff --git a/x-pack/test/functional/services/uptime/settings.ts b/x-pack/test/functional/services/uptime/settings.ts
index 944bb02ebec80..846fdc7216f63 100644
--- a/x-pack/test/functional/services/uptime/settings.ts
+++ b/x-pack/test/functional/services/uptime/settings.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { DynamicSettings } from '@kbn/synthetics-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DynamicSettings } from '../../../../plugins/uptime/common/runtime_types';
 
 export function UptimeSettingsProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts
index 8815e46323585..6412a3892660d 100644
--- a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts
+++ b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { CorsTestPlugin } from './plugin';
 import { configSchema, ConfigSchema } from './config';
 
diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts
index 9ba373c02fafa..c15845b3ed00a 100644
--- a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts
+++ b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts
@@ -10,7 +10,7 @@ import { kbnTestConfig } from '@kbn/test';
 import Url from 'url';
 import abab from 'abab';
 
-import type { Plugin, CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/server';
+import type { Plugin, CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/server';
 import type { ConfigSchema } from './config';
 
 const apiToken = abab.btoa(kbnTestConfig.getUrlParts().auth!);
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
index 1d032ed6576e7..19c53e78c4876 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IframeEmbeddedPlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
index 4ec484f9485a6..02400226bf062 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import Url from 'url';
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/server';
 
 function renderBody(iframeUrl: string) {
   return `
diff --git a/x-pack/test/functional_execution_context/config.ts b/x-pack/test/functional_execution_context/config.ts
index 336a15026b3a3..6169df6adcef3 100644
--- a/x-pack/test/functional_execution_context/config.ts
+++ b/x-pack/test/functional_execution_context/config.ts
@@ -12,7 +12,7 @@ import { logFilePath } from './test_utils';
 const alertTestPlugin = Path.resolve(__dirname, './fixtures/plugins/alerts');
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const functionalConfig = await readConfigFile(require.resolve('../../test/functional/config'));
+  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
 
   const servers = {
     ...functionalConfig.get('servers'),
@@ -25,7 +25,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...functionalConfig.getAll(),
     rootTags: ['skipCloud'],
-    testFiles: [require.resolve('./tests/')],
+    testFiles: [require.resolve('./tests')],
     junit: {
       reportName: 'Execution Context Functional Tests',
     },
diff --git a/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts b/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts
index 20e0adbf5dacd..e6fc9c5aff6c4 100644
--- a/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts
@@ -6,12 +6,12 @@
  */
 import apmAgent from 'elastic-apm-node';
 
-import type { Plugin, CoreSetup } from 'kibana/server';
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../plugins/alerting/server/plugin';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../plugins/security/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
@@ -103,7 +103,8 @@ export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, Fixtu
           }, 1_000);
         });
 
-        await ctx.core.elasticsearch.client.asInternalUser.ping();
+        const coreCtx = await ctx.core;
+        await coreCtx.elasticsearch.client.asInternalUser.ping();
 
         return res.ok({
           body: {
diff --git a/x-pack/test/functional_execution_context/ftr_provider_context.ts b/x-pack/test/functional_execution_context/ftr_provider_context.ts
index c5aadf858692a..d6c0afa5ceffd 100644
--- a/x-pack/test/functional_execution_context/ftr_provider_context.ts
+++ b/x-pack/test/functional_execution_context/ftr_provider_context.ts
@@ -6,7 +6,7 @@
  */
 
 import { GenericFtrProviderContext } from '@kbn/test';
-import { pageObjects } from '../../test/functional/page_objects';
+import { pageObjects } from '../functional/page_objects';
 import { services } from './services';
 
 export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/x-pack/test/functional_execution_context/services.ts b/x-pack/test/functional_execution_context/services.ts
index e0aaa899deabf..9508ce5eba16d 100644
--- a/x-pack/test/functional_execution_context/services.ts
+++ b/x-pack/test/functional_execution_context/services.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { services as functionalServices } from '../../test/functional/services';
+import { services as functionalServices } from '../functional/services';
 
 export const services = functionalServices;
diff --git a/x-pack/test/functional_execution_context/test_utils.ts b/x-pack/test/functional_execution_context/test_utils.ts
index 94750fa55e964..03299689186a2 100644
--- a/x-pack/test/functional_execution_context/test_utils.ts
+++ b/x-pack/test/functional_execution_context/test_utils.ts
@@ -7,7 +7,7 @@
 import Fs from 'fs/promises';
 import Path from 'path';
 import { isEqualWith } from 'lodash';
-import type { Ecs, KibanaExecutionContext } from 'kibana/server';
+import type { Ecs, KibanaExecutionContext } from '@kbn/core/server';
 import type { RetryService } from '../../../test/common/services/retry';
 
 export const logFilePath = Path.resolve(__dirname, './kibana.log');
diff --git a/x-pack/test/functional_synthetics/apps/uptime/index.ts b/x-pack/test/functional_synthetics/apps/uptime/index.ts
index 64a9da5c30ea3..925731c769bfc 100644
--- a/x-pack/test/functional_synthetics/apps/uptime/index.ts
+++ b/x-pack/test/functional_synthetics/apps/uptime/index.ts
@@ -9,6 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ loadTestFile, getService }: FtrProviderContext) => {
   describe('Uptime app', function () {
+    this.tags('ciGroup8');
     describe('with generated data', () => {
       loadTestFile(require.resolve('./synthetics_integration'));
     });
diff --git a/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts b/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts
index 93635ea0b0a73..aa10329dd820d 100644
--- a/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts
+++ b/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { FullAgentPolicy } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { FullAgentPolicy } from '../../../../plugins/fleet/common';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
 export default function (providerContext: FtrProviderContext) {
@@ -555,7 +555,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: 'on',
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               throttling: '5d/3u/20l',
@@ -605,7 +605,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: 'on',
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               throttling: '5d/3u/20l',
@@ -664,7 +664,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: advancedConfig.screenshots,
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               throttling: '1337d/1338u/1339l',
@@ -728,7 +728,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: advancedConfig.screenshots,
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               'service.name': config.apmServiceName,
diff --git a/x-pack/test/functional_synthetics/helpers.ts b/x-pack/test/functional_synthetics/helpers.ts
index 959827b7490a5..8635609cf35d9 100644
--- a/x-pack/test/functional_synthetics/helpers.ts
+++ b/x-pack/test/functional_synthetics/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { Context } from 'mocha';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { FtrProviderContext } from './ftr_provider_context';
 
 export function warnAndSkipTest(mochaContext: Context, log: ToolingLog) {
diff --git a/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts b/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts
index fba4f2ce80e6b..044a092e5aecb 100644
--- a/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts
+++ b/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function SyntheticsIntegrationPageProvider({
diff --git a/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts b/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts
index 898d527245b16..14c7abaa57343 100644
--- a/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts
+++ b/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   DeletePackagePoliciesRequest,
@@ -13,7 +12,8 @@ import {
   GetFullAgentPolicyResponse,
   GetPackagesResponse,
   GetAgentPoliciesResponse,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const INGEST_API_ROOT = '/api/fleet';
 const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts b/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts
index e1f06f8a33e9f..c64f1514b7c45 100644
--- a/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { CaseStatuses } from '../../../../plugins/cases/common';
 
 export default ({ getPageObject, getService }: FtrProviderContext) => {
   const header = getPageObject('header');
diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts b/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts
index 8c14e7e1263ee..a175e10fb7d18 100644
--- a/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import uuid from 'uuid';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { CaseStatuses } from '../../../../plugins/cases/common';
 
 export default ({ getPageObject, getService }: FtrProviderContext) => {
   const common = getPageObject('common');
diff --git a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
index cfcfbb021b52a..9a486d4983d9c 100644
--- a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
@@ -6,8 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DATAFEED_STATE } from '../../../../plugins/ml/common/constants/states';
 
 function createTestJobAndDatafeed() {
   const timestamp = Date.now();
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
index 7c794d80c3222..39ac7c5b94330 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
@@ -105,8 +105,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     await testSubjects.click('test.always-firing-SelectOption');
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/126873
-  describe.skip('create alert', function () {
+  describe('create alert', function () {
     before(async () => {
       await pageObjects.common.navigateToApp('triggersActions');
       await testSubjects.click('rulesTab');
@@ -291,8 +290,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       const alertName = generateUniqueKey();
       await defineEsQueryAlert(alertName);
 
+      const queryJsonEditor = await testSubjects.find('queryJsonEditor');
+      await queryJsonEditor.clearValue();
       // Invalid query
-      await testSubjects.setValue('queryJsonEditor', '{"query":{"foo":{}}}', {
+      await testSubjects.setValue('queryJsonEditor', JSON.stringify({ query: { foo: {} } }), {
         clearWithKeyboard: true,
       });
       await testSubjects.click('testQuery');
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
index 4069f2f64c027..1127a7423a3aa 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
@@ -10,9 +10,9 @@ import uuid from 'uuid';
 import { omit, mapValues, range, flatten } from 'lodash';
 import moment from 'moment';
 import { asyncForEach } from '@kbn/std';
+import { alwaysFiringAlertType } from '@kbn/alerting-fixture-plugin/server/plugin';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { ObjectRemover } from '../../lib/object_remover';
-import { alwaysFiringAlertType } from '../../fixtures/plugins/alerts/server/plugin';
 import { getTestAlertData, getTestActionData } from '../../lib/get_test_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
@@ -136,7 +136,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     return response;
   }
 
-  describe('Rule Details', function () {
+  // Failing: See https://github.com/elastic/kibana/issues/129337
+  // Failing: See https://github.com/elastic/kibana/issues/129337
+  describe.skip('Rule Details', function () {
     describe('Header', function () {
       const testRunUuid = uuid.v4();
       before(async () => {
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/index.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/index.ts
index 76a952c354ab4..179cd0c7ab8e9 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/index.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/index.ts
@@ -16,5 +16,6 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
     loadTestFile(require.resolve('./details'));
     loadTestFile(require.resolve('./connectors'));
     loadTestFile(require.resolve('./alerts_table'));
+    loadTestFile(require.resolve('./rule_status_dropdown'));
   });
 };
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rule_status_dropdown.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rule_status_dropdown.ts
new file mode 100644
index 0000000000000..b594d88a25689
--- /dev/null
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rule_status_dropdown.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const testSubjects = getService('testSubjects');
+  const PageObjects = getPageObjects(['common', 'triggersActionsUI', 'header']);
+  // const retry = getService('retry');
+  const esArchiver = getService('esArchiver');
+  // const find = getService('find');
+
+  describe('Rule status dropdown', function () {
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+      await PageObjects.common.navigateToUrlWithBrowserHistory(
+        'triggersActions',
+        '/__components_sandbox'
+      );
+    });
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+    });
+
+    it('should load from the shareable lazy loader', async () => {
+      await testSubjects.find('statusDropdown');
+      const exists = await testSubjects.exists('statusDropdown');
+      expect(exists).to.be(true);
+    });
+
+    it('should store the previous snooze interval', async () => {
+      await testSubjects.find('statusDropdown');
+      await testSubjects.click('statusDropdown');
+      await testSubjects.click('statusDropdownSnoozeItem');
+      await testSubjects.setValue('ruleSnoozeIntervalValue', '10');
+      await testSubjects.setValue('ruleSnoozeIntervalUnit', 'h');
+      await testSubjects.click('ruleSnoozeApply');
+
+      // Wait for the dropdown to finish re-rendering before opening again
+      await new Promise((res) => setTimeout(res, 500));
+
+      await testSubjects.click('statusDropdown');
+      await testSubjects.click('statusDropdownSnoozeItem');
+      await testSubjects.setValue('ruleSnoozeIntervalValue', '3');
+      expect(await testSubjects.exists('ruleSnoozePreviousText')).to.be(true);
+      expect(await testSubjects.getVisibleText('ruleSnoozePreviousText')).to.be('10 hours');
+    });
+  });
+};
diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
index 2ad2da6d227c2..8cddb9b08a01b 100644
--- a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
@@ -16,8 +16,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     const supertest = getService('supertest');
     const retry = getService('retry');
 
-    // FLAKY: https://github.com/elastic/kibana/issues/88177
-    describe.skip('overview page alert flyout controls', function () {
+    describe('overview page alert flyout controls', function () {
       const DEFAULT_DATE_START = 'Sep 10, 2019 @ 12:40:08.078';
       const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
       let alerts: any;
@@ -142,8 +141,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/116865
-    describe.skip('tls alert', function () {
+    describe('tls alert', function () {
       const DEFAULT_DATE_START = 'Sep 10, 2019 @ 12:40:08.078';
       const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
       let alerts: any;
diff --git a/x-pack/test/functional_with_es_ssl/config.ts b/x-pack/test/functional_with_es_ssl/config.ts
index 1c10548b90699..5243b97898578 100644
--- a/x-pack/test/functional_with_es_ssl/config.ts
+++ b/x-pack/test/functional_with_es_ssl/config.ts
@@ -71,7 +71,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         `--elasticsearch.hosts=https://${servers.elasticsearch.hostname}:${servers.elasticsearch.port}`,
         `--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`,
         `--plugin-path=${join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
-        `--xpack.trigger_actions_ui.enableExperimental=${JSON.stringify(['internalAlertsTable'])}`,
+        `--xpack.trigger_actions_ui.enableExperimental=${JSON.stringify([
+          'internalAlertsTable',
+          'internalShareableComponentsSandbox',
+        ])}`,
         `--xpack.alerting.rules.minimumScheduleInterval.value="2s"`,
         `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
         `--xpack.actions.preconfiguredAlertHistoryEsIndex=false`,
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx
index 2198ce456be4f..25709923a7c8a 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, RouteComponentProps } from 'react-router-dom';
 import { EuiPage, EuiText } from '@elastic/eui';
-import { AppMountParameters, CoreStart } from '../../../../../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 
 export interface AlertingExampleComponentParams {
   basename: string;
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts
index d3eff0b60955e..43fcb32a0ed20 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
-import { PluginSetupContract as AlertingSetup } from '../../../../../../plugins/alerting/public';
-import { SanitizedRule } from '../../../../../../plugins/alerting/common';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../../../../plugins/triggers_actions_ui/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
 
 export type Setup = void;
 export type Start = void;
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts
index db084696a4dbf..b7c2aea144b5b 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { AlertingFixturePlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new AlertingFixturePlugin();
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts
index 2cd6b50a2062f..18cdf7f385f3e 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts
@@ -5,12 +5,9 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
-import {
-  PluginSetupContract as AlertingSetup,
-  RuleType,
-} from '../../../../../../plugins/alerting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../plugins/features/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { PluginSetupContract as AlertingSetup, RuleType } from '@kbn/alerting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // this plugin's dependendencies
 export interface AlertingExampleDeps {
diff --git a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
index e346971b48ea4..f330a24e218ba 100644
--- a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
+++ b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   CustomCheerio,
   CustomCheerioStatic,
-} from 'test/functional/services/lib/web_element_wrapper/custom_cheerio_api';
+} from '../../../../test/functional/services/lib/web_element_wrapper/custom_cheerio_api';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 const ENTER_KEY = '\uE007';
diff --git a/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts b/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts
index bf2d379521df3..87eefab7f04a1 100644
--- a/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts
+++ b/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
-import { LicensingPluginSetup } from '../../../../../plugins/licensing/public';
+import { CoreSetup } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 interface SetupPlugins {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/test/licensing_plugin/public/feature_usage.ts b/x-pack/test/licensing_plugin/public/feature_usage.ts
index 0e914bca8fc11..f083d789c04f7 100644
--- a/x-pack/test/licensing_plugin/public/feature_usage.ts
+++ b/x-pack/test/licensing_plugin/public/feature_usage.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { LicensingPluginStart, LicenseType } from '@kbn/licensing-plugin/public';
 import { FtrProviderContext } from '../services';
-import { LicensingPluginStart, LicenseType } from '../../../plugins/licensing/public';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 interface FeatureUsage {
   last_used?: number;
diff --git a/x-pack/test/licensing_plugin/public/updates.ts b/x-pack/test/licensing_plugin/public/updates.ts
index d7442e491875a..938f6dd8fcdd7 100644
--- a/x-pack/test/licensing_plugin/public/updates.ts
+++ b/x-pack/test/licensing_plugin/public/updates.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import { FtrProviderContext } from '../services';
-import { LicensingPluginSetup } from '../../../plugins/licensing/public';
 import { createScenario } from '../scenario';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function (ftrContext: FtrProviderContext) {
diff --git a/x-pack/test/licensing_plugin/scenario.ts b/x-pack/test/licensing_plugin/scenario.ts
index 6618c986a5707..f7d2f5790460d 100644
--- a/x-pack/test/licensing_plugin/scenario.ts
+++ b/x-pack/test/licensing_plugin/scenario.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { PublicLicenseJSON } from '@kbn/licensing-plugin/server';
 import { FtrProviderContext } from './services';
-import { PublicLicenseJSON } from '../../plugins/licensing/server';
-import '../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 const delay = (ms: number) => new Promise((res) => setTimeout(res, ms));
 
diff --git a/x-pack/test/licensing_plugin/server/updates.ts b/x-pack/test/licensing_plugin/server/updates.ts
index 55b2b68ff8f82..6acbe42bc1abe 100644
--- a/x-pack/test/licensing_plugin/server/updates.ts
+++ b/x-pack/test/licensing_plugin/server/updates.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../services';
 import { createScenario } from '../scenario';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function (ftrContext: FtrProviderContext) {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts
index 7588d37d4b111..fd8039f4005be 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import {
   getCreateExceptionListItemMinimalSchemaMock,
   getCreateExceptionListItemMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts
index 346e5a1269f3a..a3c71a8be2fc1 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   getCreateExceptionListMinimalSchemaMock,
   getCreateExceptionListMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
 
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts
index 29ea19940a480..40be89af0284a 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts
@@ -8,15 +8,15 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 
 import {
   getCreateMinimalListItemSchemaMock,
   getCreateMinimalListItemSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
   createListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts
index fce6863d1adbe..b64f9d4206db3 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   getCreateMinimalListSchemaMock,
   getCreateMinimalListSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
   createListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts
index 7ff4870174300..1a97ac6db4cb0 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   getCreateExceptionListItemMinimalSchemaMock,
   getCreateExceptionListItemMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListItemServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts
index f1cc67f3dd430..5361bcb82f6a2 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts
@@ -9,11 +9,11 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   getCreateExceptionListMinimalSchemaMock,
   getCreateExceptionListMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts
index 57ca9a95ae7b7..d317e647174f7 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts
@@ -8,11 +8,11 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts
index cecb4510be9c3..3c4adc092d4aa 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts
@@ -13,22 +13,22 @@ import {
   LIST_ITEM_URL,
   LIST_URL,
 } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
   getCreateMinimalListSchemaMock,
   getCreateMinimalListSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMockWithoutId } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { DETECTION_TYPE, LIST_ID } from '@kbn/lists-plugin/common/constants.mock';
 import {
   createListsIndex,
   deleteAllExceptions,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMockWithoutId } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { DETECTION_TYPE, LIST_ID } from '../../../../plugins/lists/common/constants.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
index 54bd8f4d740cc..b3f8e7c0697fe 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
@@ -9,6 +9,8 @@ import expect from '@kbn/expect';
 import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
 
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   removeExceptionListServerGeneratedProperties,
@@ -16,8 +18,6 @@ import {
   binaryToString,
   deleteAllExceptions,
 } from '../../utils';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts
index ce2663cb96acb..fe471e2794b43 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 import type { CreateListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_ITEM_URL, LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
-import { LIST_ID, NAME } from '../../../../plugins/lists/common/constants.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { LIST_ID, NAME } from '@kbn/lists-plugin/common/constants.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { createListsIndex, deleteListsIndex, binaryToString } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts
index 7cfb94451fbb1..bb65b1c9c4933 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListItemServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts
index f5ff59de8eeca..349a44c506949 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts
@@ -8,8 +8,8 @@
 import expect from '@kbn/expect';
 
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts
index 20dadcfda6f22..c4ecce7d4d0e7 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { LIST_ITEM_ID, LIST_ID } from '../../../../plugins/lists/common/constants.mock';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { LIST_ITEM_ID, LIST_ID } from '@kbn/lists-plugin/common/constants.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts
index 25b8c705633fc..ffb13b66c8db9 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts
@@ -8,15 +8,15 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts
index f82ef1f0246f8..8736ad75eeb6f 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts
@@ -7,13 +7,13 @@
 
 import expect from '@kbn/expect';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import {
   toNdJsonString,
   getImportExceptionsListItemSchemaMock,
   getImportExceptionsListSchemaMock,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteAllExceptions } from '../../utils';
 
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts
index 894dcdfbea02a..514ad3eb9f501 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts
@@ -8,8 +8,9 @@
 import expect from '@kbn/expect';
 import type { ListSchema, ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { getImportListItemAsBuffer } from '@kbn/lists-plugin/common/schemas/request/import_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
@@ -20,8 +21,6 @@ import {
   waitFor,
 } from '../../utils';
 
-import { getImportListItemAsBuffer } from '../../../../plugins/lists/common/schemas/request/import_list_item_schema.mock';
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts
index e0035a5ecf079..42783a461ce7e 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   getCreateExceptionListItemMinimalSchemaMock,
   getCreateExceptionListItemMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListItemServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts
index dd39ad9725287..31293e97cb078 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts
@@ -9,11 +9,11 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   getCreateExceptionListMinimalSchemaMock,
   getCreateExceptionListMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts
index 7292440e1a12a..dc99e9d4d180a 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts
@@ -8,11 +8,11 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts
index e2633eea08e12..c84bc80bb0231 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 
 import { LIST_PRIVILEGES_URL } from '@kbn/securitysolution-list-constants';
-import { getReadPrivilegeMock } from '../../../../plugins/lists/server/routes/read_privileges_route.mock';
+import { getReadPrivilegeMock } from '@kbn/lists-plugin/server/routes/read_privileges_route.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts
index 414177d268213..162b57501c479 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts
@@ -8,18 +8,18 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-
 import {
   getCreateMinimalListSchemaMock,
   getCreateMinimalListSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
 import {
   createListsIndex,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts
index 891a56dfe8a30..d5848e7ee44be 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts
@@ -9,10 +9,10 @@ import expect from '@kbn/expect';
 
 import { ExceptionListSummarySchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { LIST_ID } from '../../../../plugins/lists/common/constants.mock';
+import { LIST_ID } from '@kbn/lists-plugin/common/constants.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
 import { createListsIndex, deleteListsIndex, deleteAllExceptions } from '../../utils';
 
 interface SummaryResponseType {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts
index 37c997f686565..f1ee3ec7d981d 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts
@@ -12,15 +12,14 @@ import type {
   ExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
 
-import { getUpdateMinimalExceptionListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_exception_list_item_schema.mock';
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts
index 6844c847e8d92..d4c5cd422e772 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts
@@ -12,14 +12,13 @@ import type {
   ExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
 
-import { getUpdateMinimalExceptionListSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_exception_list_schema.mock';
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts
index a4309d07a879d..e34ce8ba35465 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts
@@ -13,17 +13,17 @@ import type {
   ListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getUpdateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
   removeListItemServerGeneratedProperties,
 } from '../../utils';
-import { getUpdateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_list_item_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts
index 1c3fe393caf0c..7861c9fa2aa91 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts
@@ -9,16 +9,16 @@ import expect from '@kbn/expect';
 
 import type { UpdateListSchema, ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { getUpdateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
-import { getUpdateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/utils.ts b/x-pack/test/lists_api_integration/utils.ts
index c0dc1d930a57e..9407dabcf2763 100644
--- a/x-pack/test/lists_api_integration/utils.ts
+++ b/x-pack/test/lists_api_integration/utils.ts
@@ -21,13 +21,13 @@ import {
   LIST_INDEX,
   LIST_ITEM_URL,
 } from '@kbn/securitysolution-list-constants';
-import { ToolingLog } from '@kbn/dev-utils';
-import { getImportListItemAsBuffer } from '../../plugins/lists/common/schemas/request/import_list_item_schema.mock';
+import { ToolingLog } from '@kbn/tooling-log';
+import { getImportListItemAsBuffer } from '@kbn/lists-plugin/common/schemas/request/import_list_item_schema.mock';
 import { countDownTest } from '../detection_engine_api_integration/utils';
 
 /**
  * Creates the lists and lists items index for use inside of beforeEach blocks of tests
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
  * @param supertest The supertest client library
  */
 export const createListsIndex = async (
@@ -37,7 +37,9 @@ export const createListsIndex = async (
   return countDownTest(
     async () => {
       await supertest.post(LIST_INDEX).set('kbn-xsrf', 'true').send();
-      return true;
+      return {
+        passed: true,
+      };
     },
     'createListsIndex',
     log
@@ -55,7 +57,9 @@ export const deleteListsIndex = async (
   return countDownTest(
     async () => {
       await supertest.delete(LIST_INDEX).set('kbn-xsrf', 'true').send();
-      return true;
+      return {
+        passed: true,
+      };
     },
     'deleteListsIndex',
     log
@@ -64,7 +68,7 @@ export const deleteListsIndex = async (
 
 /**
  * Creates the exception lists and lists items index for use inside of beforeEach blocks of tests
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
  * @param supertest The supertest client library
  */
 export const createExceptionListsIndex = async (
@@ -74,7 +78,9 @@ export const createExceptionListsIndex = async (
   return countDownTest(
     async () => {
       await supertest.post(LIST_INDEX).set('kbn-xsrf', 'true').send();
-      return true;
+      return {
+        passed: true,
+      };
     },
     'createListsIndex',
     log
@@ -223,7 +229,9 @@ export const deleteAllExceptionsByType = async (
         .get(`${EXCEPTION_LIST_URL}/_find?namespace_type=${type}`)
         .set('kbn-xsrf', 'true')
         .send();
-      return finalCheck.data.length === 0;
+      return {
+        passed: finalCheck.data.length === 0,
+      };
     },
     `deleteAllExceptions by type: "${type}"`,
     log,
diff --git a/x-pack/test/load/runner.ts b/x-pack/test/load/runner.ts
index ba40bcf294e57..6437fbd3fe516 100644
--- a/x-pack/test/load/runner.ts
+++ b/x-pack/test/load/runner.ts
@@ -11,7 +11,7 @@ import { REPO_ROOT } from '@kbn/utils';
 import Fs from 'fs';
 import { createFlagError } from '@kbn/dev-utils';
 import { setTimeout as setTimeoutAsync } from 'timers/promises';
-import { FtrProviderContext } from './../functional/ftr_provider_context';
+import { FtrProviderContext } from '../functional/ftr_provider_context';
 
 const baseSimulationPath = 'src/test/scala/org/kibanaLoadTest/simulation';
 const simulationPackage = 'org.kibanaLoadTest.simulation';
diff --git a/x-pack/test/observability_api_integration/trial/tests/annotations.ts b/x-pack/test/observability_api_integration/trial/tests/annotations.ts
index be4e98f9937d0..47ddc7437d146 100644
--- a/x-pack/test/observability_api_integration/trial/tests/annotations.ts
+++ b/x-pack/test/observability_api_integration/trial/tests/annotations.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { JsonObject } from '@kbn/utility-types';
-import { Annotation } from '../../../../plugins/observability/common/annotations';
+import { Annotation } from '@kbn/observability-plugin/common/annotations';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 const DEFAULT_INDEX_NAME = 'observability-annotations';
diff --git a/x-pack/test/osquery_cypress/agent.ts b/x-pack/test/osquery_cypress/agent.ts
index c0e5b2374889d..2bdecd90efdff 100644
--- a/x-pack/test/osquery_cypress/agent.ts
+++ b/x-pack/test/osquery_cypress/agent.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import axios, { AxiosRequestConfig } from 'axios';
 import { ChildProcess, spawn } from 'child_process';
 import { getLatestVersion } from './artifact_manager';
diff --git a/x-pack/test/osquery_cypress/fleet_server.ts b/x-pack/test/osquery_cypress/fleet_server.ts
index b64b1871637bc..77ec56cf20960 100644
--- a/x-pack/test/osquery_cypress/fleet_server.ts
+++ b/x-pack/test/osquery_cypress/fleet_server.ts
@@ -6,7 +6,7 @@
  */
 
 import { ChildProcess, spawn } from 'child_process';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import axios, { AxiosRequestConfig } from 'axios';
 import { Manager } from './resource_manager';
 import { getLatestVersion } from './artifact_manager';
diff --git a/x-pack/test/performance/tests/playwright/index.ts b/x-pack/test/performance/tests/playwright/index.ts
index 05dfe4cdfbc81..d7e7c43b00178 100644
--- a/x-pack/test/performance/tests/playwright/index.ts
+++ b/x-pack/test/performance/tests/playwright/index.ts
@@ -15,6 +15,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
     loadTestFile(require.resolve('./flight_dashboard'));
     loadTestFile(require.resolve('./web_logs_dashboard'));
     loadTestFile(require.resolve('./promotion_tracking_dashboard'));
+    loadTestFile(require.resolve('./many_fields_discover'));
 
     after(async () => {
       await performance.shutdownBrowser();
diff --git a/x-pack/test/performance/tests/playwright/many_fields_discover.ts b/x-pack/test/performance/tests/playwright/many_fields_discover.ts
new file mode 100644
index 0000000000000..0e66b63bb5794
--- /dev/null
+++ b/x-pack/test/performance/tests/playwright/many_fields_discover.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { StepCtx } from '../../services/performance';
+
+export default function manyFieldsDiscover({ getService }: FtrProviderContext) {
+  // FAILING: https://github.com/elastic/kibana/issues/130287
+  describe.skip('many_fields_discover', () => {
+    const performance = getService('performance');
+    const esArchiver = getService('esArchiver');
+    const kibanaServer = getService('kibanaServer');
+
+    before(async () => {
+      await kibanaServer.importExport.load(
+        'test/functional/fixtures/kbn_archiver/many_fields_data_view'
+      );
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/many_fields');
+    });
+
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/many_fields_data_view'
+      );
+      await esArchiver.unload('test/functional/fixtures/es_archiver/many_fields');
+    });
+
+    it('many_fields_discover', async () => {
+      await performance.runUserJourney(
+        'many_fields_discover',
+        [
+          {
+            name: 'Go to Discover Page',
+            handler: async ({ page, kibanaUrl }: StepCtx) => {
+              await page.goto(`${kibanaUrl}/app/discover`);
+              await page.waitForSelector('[data-test-subj="discoverDocTable"]');
+            },
+          },
+          {
+            name: 'Expand the first document',
+            handler: async ({ page }) => {
+              const expandButtons = page.locator('[data-test-subj="docTableExpandToggleColumn"]');
+              await expandButtons.first().click();
+              await page.locator('text="Expanded document"');
+            },
+          },
+        ],
+        {
+          requireAuth: false,
+        }
+      );
+    });
+  });
+}
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
index 6041933f7590c..e8d40e07e10b5 100644
--- a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class ElasticsearchClientXPack implements Plugin {
   constructor() {}
@@ -15,7 +15,8 @@ export class ElasticsearchClientXPack implements Plugin {
     router.get(
       { path: '/api/elasticsearch_client_xpack/context/user', validate: false },
       async (context, req, res) => {
-        const body = await context.core.elasticsearch.client.asCurrentUser.security.getUser();
+        const coreContext = await context.core;
+        const body = await coreContext.elasticsearch.client.asCurrentUser.security.getUser();
         return res.ok({ body });
       }
     );
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts
index a0c68d2b04bae..eb8bfa1b80cff 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { EventLogFixturePlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
index 805feee159f27..f4cbc4ad31ffc 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
@@ -13,9 +13,9 @@ import {
   IRouter,
   Logger,
   RouteValidationResultFactory,
-} from 'kibana/server';
-import { IEventLogService, IEventLogger } from '../../../../../plugins/event_log/server';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server/types';
+} from '@kbn/core/server';
+import { IEventLogService, IEventLogger } from '@kbn/event-log-plugin/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server/types';
 
 export const logEventRoute = (router: IRouter, eventLogger: IEventLogger, logger: Logger) => {
   router.post(
@@ -35,13 +35,14 @@ export const logEventRoute = (router: IRouter, eventLogger: IEventLogger, logger
     ): Promise<IKibanaResponse<any>> {
       const { id } = req.params as { id: string };
       const event: IValidatedEvent = req.body;
+      const soClient = (await context.core).savedObjects.client;
       logger.info(`test fixture: log event: ${id} ${JSON.stringify(event)}`);
       try {
-        await context.core.savedObjects.client.get('event_log_test', id);
+        await soClient.get('event_log_test', id);
         logger.info(`found existing saved object`);
       } catch (ex) {
         logger.info(`log event error: ${ex}`);
-        await context.core.savedObjects.client.create('event_log_test', {}, { id });
+        await soClient.create('event_log_test', {}, { id });
         logger.info(`created saved object ${id}`);
       }
       // mark now as start and end
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
index 8c796546b2bf7..87bb7de7f2f41 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, Logger, PluginInitializerContext } from 'kibana/server';
-import { IEventLogService, IEventLogClientService } from '../../../../../plugins/event_log/server';
+import { Plugin, CoreSetup, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { IEventLogService, IEventLogClientService } from '@kbn/event-log-plugin/server';
 import {
   logEventRoute,
   registerProviderActionsRoute,
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts
index 32161d27a4ff0..b649fbc808272 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import {
   FeatureUsageTestPlugin,
   FeatureUsageTestPluginSetup,
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts
index b52b9da1e1dfc..8bed6fcd0ebab 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
-import {
-  LicensingPluginSetup,
-  LicensingPluginStart,
-} from '../../../../../plugins/licensing/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { registerRoutes } from './routes';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts
index 717f72bf7ab6b..dd514f034b7c1 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, StartServicesAccessor } from 'src/core/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { FeatureUsageTestStartDependencies, FeatureUsageTestPluginStart } from '../plugin';
 
 export function registerFeatureHitRoute(
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
index 492193acbcb54..59e6ed28ea0ee 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter, StartServicesAccessor } from 'src/core/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { FeatureUsageTestStartDependencies, FeatureUsageTestPluginStart } from '../plugin';
 
 import { registerFeatureHitRoute } from './hit';
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
index d761bc50ce080..2d98a58d29d7c 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
@@ -13,9 +13,9 @@ import {
   IKibanaResponse,
   IRouter,
   IScopedClusterClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { EventEmitter } from 'events';
-import { TaskManagerStartContract } from '../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 const scope = 'testing';
 const taskManagerQuery = {
@@ -249,7 +249,7 @@ export function initRoutes(
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       try {
-        await ensureIndexIsRefreshed(context.core.elasticsearch.client);
+        await ensureIndexIsRefreshed((await context.core).elasticsearch.client);
         const taskManager = await taskManagerStart;
         return res.ok({ body: await taskManager.get(req.params.taskId) });
       } catch ({ isBoom, output, message }) {
@@ -268,7 +268,7 @@ export function initRoutes(
       req: KibanaRequest<any, any, any, any>,
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
-      await ensureIndexIsRefreshed(context.core.elasticsearch.client);
+      await ensureIndexIsRefreshed((await context.core).elasticsearch.client);
       return res.ok({ body: {} });
     }
   );
@@ -284,7 +284,7 @@ export function initRoutes(
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       try {
-        await ensureIndexIsRefreshed(context.core.elasticsearch.client);
+        await ensureIndexIsRefreshed((await context.core).elasticsearch.client);
         let tasksFound = 0;
         const taskManager = await taskManagerStart;
         do {
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
index 479a647ed58a4..59cb0ee43d8c1 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
@@ -6,17 +6,17 @@
  */
 
 import _ from 'lodash';
-import { Plugin, CoreSetup, CoreStart } from 'src/core/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
 import { EventEmitter } from 'events';
 import { firstValueFrom, Subject } from 'rxjs';
-import { initRoutes } from './init_routes';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
   ConcreteTaskInstance,
   EphemeralTask,
-} from '../../../../../plugins/task_manager/server';
-import { DEFAULT_MAX_WORKERS } from '../../../../../plugins/task_manager/server/config';
+} from '@kbn/task-manager-plugin/server';
+import { DEFAULT_MAX_WORKERS } from '@kbn/task-manager-plugin/server/config';
+import { initRoutes } from './init_routes';
 
 // this plugin's dependendencies
 export interface SampleTaskManagerFixtureSetupDeps {
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
index 22a794567abfb..a7bcdf2ddc52c 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
@@ -9,9 +9,9 @@ import { merge, omit, chunk, isEmpty } from 'lodash';
 import uuid from 'uuid';
 import expect from '@kbn/expect';
 import moment from 'moment';
+import { IEvent } from '@kbn/event-log-plugin/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { IEvent } from '../../../../plugins/event_log/server';
-import { IValidatedEvent } from '../../../../plugins/event_log/server/types';
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
index f317ad2dcff13..14c92d91138dd 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
@@ -8,7 +8,7 @@
 import _ from 'lodash';
 import uuid from 'uuid';
 import expect from '@kbn/expect';
-import { IEvent } from '../../../../plugins/event_log/server';
+import { IEvent } from '@kbn/event-log-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts
index 90d72adfaab22..5578ee1ea3f72 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import url from 'url';
 import { keyBy, mapValues } from 'lodash';
 import supertest from 'supertest';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server';
 
 interface MonitoringStats {
   last_update: string;
@@ -124,8 +124,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   const monitoredAggregatedStatsRefreshRate = 5000;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/125581
-  describe.skip('health', () => {
+  describe('health', () => {
     it('should return basic configuration of task manager', async () => {
       const health = await getHealth();
       expect(health.status).to.eql('OK');
@@ -244,7 +243,12 @@ export default function ({ getService }: FtrProviderContext) {
 
       // test run with the default poll_interval of 3s and a monitored_aggregated_stats_refresh_rate of 5s,
       // so we expect the estimated_schedule_density to span a minute (which means 20 buckets, as 60s / 3s = 20)
-      expect(workload.estimated_schedule_density.length).to.eql(20);
+      // Note: Due to an issue in ES, sometimes it returns 21 buckets for the active time span
+      // which causes miscalculation of the expected result (22)
+      expect(
+        workload.estimated_schedule_density.length === 20 ||
+          workload.estimated_schedule_density.length === 22
+      ).to.be(true);
     });
 
     it('should return the task manager runtime stats', async () => {
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
index 1b0ffdedb0077..644ed91410299 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
@@ -12,9 +12,9 @@ import {
   ConcreteTaskInstance,
   TaskInstanceWithDeprecatedFields,
   TaskStatus,
-} from '../../../../plugins/task_manager/server/task';
+} from '@kbn/task-manager-plugin/server/task';
+import { SavedObjectsUtils } from '@kbn/core/server/saved_objects';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { SavedObjectsUtils } from '../../../../../src/core/server/saved_objects';
 
 export default function createGetTests({ getService }: FtrProviderContext) {
   const es = getService('es');
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
index 827ed91578e8e..51fb161ac0d6a 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
@@ -8,13 +8,10 @@
 import { random, times } from 'lodash';
 import expect from '@kbn/expect';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import TaskManagerMapping from '@kbn/task-manager-plugin/server/saved_objects/mappings.json';
+import { DEFAULT_MAX_WORKERS, DEFAULT_POLL_INTERVAL } from '@kbn/task-manager-plugin/server/config';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import TaskManagerMapping from '../../../../plugins/task_manager/server/saved_objects/mappings.json';
-import {
-  DEFAULT_MAX_WORKERS,
-  DEFAULT_POLL_INTERVAL,
-} from '../../../../plugins/task_manager/server/config';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server';
 
 const {
   task: { properties: taskManagerIndexMapping },
@@ -56,8 +53,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const testHistoryIndex = '.kibana_task_manager_test_result';
 
-  // Failing: See https://github.com/elastic/kibana/issues/128065
-  describe.skip('scheduling and running tasks', () => {
+  describe('scheduling and running tasks', () => {
     beforeEach(async () => {
       // clean up before each test
       return await supertest.delete('/api/sample_tasks').set('kbn-xsrf', 'xxx').expect(200);
@@ -828,7 +824,7 @@ export default function ({ getService }: FtrProviderContext) {
       expect(await runNowResultWithExpectedFailure).to.eql({ id: taskThatFailsBeforeRunNow.id });
     });
 
-    async function expectReschedule(
+    function expectReschedule(
       originalRunAt: number,
       task: SerializedConcreteTaskInstance<any, any>,
       expectedDiff: number
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts
index 90590f1e3e572..14f75191322b6 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts
@@ -9,8 +9,8 @@ import _ from 'lodash';
 import expect from '@kbn/expect';
 import url from 'url';
 import supertest from 'supertest';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server';
 
 export interface RawDoc {
   _id: string;
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts
index c668ffaaede56..a70225035d03c 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server/task';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server/task';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 export default function createTaskManagementScheduledAtTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts
index e60ad50b9ed85..845bd4cb210e2 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts
@@ -13,12 +13,9 @@ import {
   IKibanaResponse,
   IRouter,
   CoreSetup,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { range, chunk } from 'lodash';
-import {
-  TaskManagerStartContract,
-  ConcreteTaskInstance,
-} from '../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract, ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { PerfApi, PerfResult } from './types';
 
 const scope = 'perf-testing';
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts
index 7e75e65dee896..9d0face98b862 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
 import { firstValueFrom, Subject } from 'rxjs';
 
 import uuid from 'uuid';
@@ -17,7 +17,7 @@ import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
   ConcreteTaskInstance,
-} from '../../../../../plugins/task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { PerfState, PerfApi, PerfResult } from './types';
 import { initRoutes } from './init_routes';
 
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts b/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts
index 495cfbff19eea..9e5b16abfa90a 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GlobalSearchProviderResult } from '../../../../../plugins/global_search/common/types';
+import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/common/types';
 
 export const createResult = (
   parts: Partial<GlobalSearchProviderResult>
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts b/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts
index 9450384458d09..c3b10dd5cf5e1 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   GlobalSearchTestPlugin,
   GlobalSearchTestPluginSetup,
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
index fa0a42288b83f..b203006c60b6b 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
@@ -6,13 +6,13 @@
  */
 
 import { map, reduce } from 'rxjs/operators';
-import { Plugin, CoreSetup, CoreStart, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart, AppMountParameters } from '@kbn/core/public';
 import { lastValueFrom } from 'rxjs';
 import {
   GlobalSearchPluginSetup,
   GlobalSearchPluginStart,
   GlobalSearchResult,
-} from '../../../../../plugins/global_search/public';
+} from '@kbn/global-search-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface GlobalSearchTestPluginSetup {}
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx b/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
index 148b82f613a67..761e16e81bac7 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
@@ -9,15 +9,15 @@ import { Router } from 'react-router-dom';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { useMemo } from 'react';
 import styled from 'styled-components';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   DataAccessLayer,
   ResolverPluginSetup,
-} from '../../../../../../../plugins/security_solution/public/resolver/types';
+} from '@kbn/security-solution-plugin/public/resolver/types';
 
 /**
  * Render the Resolver Test app. Returns a cleanup function.
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts b/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts
index 166c2b45e3df6..5867b687442c1 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   ResolverTestPlugin,
   ResolverTestPluginSetupDependencies,
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
index 3cec96a1f42b9..06f66d6a2c49e 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { PluginSetup as SecuritySolutionPluginSetup } from '../../../../../plugins/security_solution/public';
+import { PluginSetup as SecuritySolutionPluginSetup } from '@kbn/security-solution-plugin/public';
 
 export type ResolverTestPluginSetup = void;
 export type ResolverTestPluginStart = void;
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx b/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
index 2542e82c5e28d..a7fb3ddb10d60 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
@@ -8,12 +8,12 @@
 import { Router } from 'react-router-dom';
 import React, { useCallback, useRef } from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
-import { TimelinesUIStart } from '../../../../../../../plugins/timelines/public';
-import { DataPublicPluginStart } from '../../../../../../../../src/plugins/data/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 type CoreStartTimelines = CoreStart & { data: DataPublicPluginStart };
 
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts b/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts
index 5f038b5b933e6..540e23622b2b3 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   TimelinesTestPlugin,
   TimelinesTestPluginSetupDependencies,
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts
index 86b3c7b0ddf7c..13758e02603a3 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreStart, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreStart, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { TimelinesUIStart } from '../../../../../plugins/timelines/public';
+import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { renderApp } from './applications/timelines_test';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
 
 export type TimelinesTestPluginSetup = void;
 export type TimelinesTestPluginStart = void;
diff --git a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts
index 24bd4e09a4ea3..fd6a46b391cb8 100644
--- a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts
+++ b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { GlobalSearchResult } from '@kbn/global-search-plugin/common/types';
+import { GlobalSearchTestApi } from '@kbn/global-search-test-plugin/public/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { GlobalSearchResult } from '../../../../plugins/global_search/common/types';
-import { GlobalSearchTestApi } from '../../plugins/global_search_test/public/types';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
diff --git a/x-pack/test/plugin_functional/test_suites/resolver/index.ts b/x-pack/test/plugin_functional/test_suites/resolver/index.ts
index 9a243d1e2a2c3..688ba536b1232 100644
--- a/x-pack/test/plugin_functional/test_suites/resolver/index.ts
+++ b/x-pack/test/plugin_functional/test_suites/resolver/index.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { panAnimationDuration } from '@kbn/security-solution-plugin/public/resolver/store/camera/scaling_constants';
 import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { panAnimationDuration } from '../../../../plugins/security_solution/public/resolver/store/camera/scaling_constants';
 
 const expectedDifference = 0.09;
 
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts b/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts
index 6694b5299cd67..922ff565b4e29 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import supertest from 'supertest';
-import { JobParamsDownloadCSV } from '../../../plugins/reporting/server/export_types/csv_searchsource_immediate/types';
+import { JobParamsDownloadCSV } from '@kbn/reporting-plugin/server/export_types/csv_searchsource_immediate/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 const getMockJobParams = (obj: object) => {
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts b/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
index 2ddeeb711600e..5051b74c6e8d1 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ReportApiJSON } from '../../../plugins/reporting/common/types';
+import { ReportApiJSON } from '@kbn/reporting-plugin/common/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts
index 972e1b2f46855..0490cddb568d2 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { SerializedSearchSourceFields } from 'src/plugins/data/common';
-import { ReportApiJSON } from '../../../plugins/reporting/common/types';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import { ReportApiJSON } from '@kbn/reporting-plugin/common/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
index ec2c95e5e41ef..3a360ca0a1f5c 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
@@ -6,10 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { ILM_POLICY_NAME } from '@kbn/reporting-plugin/common/constants';
 import { FtrProviderContext } from '../ftr_provider_context';
 
-import { ILM_POLICY_NAME } from '../../../plugins/reporting/common/constants';
-
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
   const es = getService('es');
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts b/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts
index 771c12b4a2366..ad086319776f9 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
index e1935c2617f41..22be1d776e792 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { pick } from 'lodash';
-import { ReportApiJSON } from '../../../plugins/reporting/common/types';
+import { ReportApiJSON } from '@kbn/reporting-plugin/common/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 const apiResponseFields = [
diff --git a/x-pack/test/reporting_api_integration/services/scenarios.ts b/x-pack/test/reporting_api_integration/services/scenarios.ts
index be72233a26ffc..c61bb809da3a4 100644
--- a/x-pack/test/reporting_api_integration/services/scenarios.ts
+++ b/x-pack/test/reporting_api_integration/services/scenarios.ts
@@ -9,11 +9,11 @@ import rison, { RisonValue } from 'rison-node';
 import {
   API_GET_ILM_POLICY_STATUS,
   API_MIGRATE_ILM_POLICY_URL,
-} from '../../../plugins/reporting/common/constants';
-import { JobParamsCSV } from '../../../plugins/reporting/server/export_types/csv_searchsource/types';
-import { JobParamsDownloadCSV } from '../../../plugins/reporting/server/export_types/csv_searchsource_immediate/types';
-import { JobParamsPNGDeprecated } from '../../../plugins/reporting/server/export_types/png/types';
-import { JobParamsPDFDeprecated } from '../../../plugins/reporting/server/export_types/printable_pdf/types';
+} from '@kbn/reporting-plugin/common/constants';
+import { JobParamsCSV } from '@kbn/reporting-plugin/server/export_types/csv_searchsource/types';
+import { JobParamsDownloadCSV } from '@kbn/reporting-plugin/server/export_types/csv_searchsource_immediate/types';
+import { JobParamsPNGDeprecated } from '@kbn/reporting-plugin/server/export_types/png/types';
+import { JobParamsPDFDeprecated } from '@kbn/reporting-plugin/server/export_types/printable_pdf/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 function removeWhitespace(str: string) {
diff --git a/x-pack/test/reporting_api_integration/services/usage.ts b/x-pack/test/reporting_api_integration/services/usage.ts
index cdc0cfb5305c2..fd16f3859fa11 100644
--- a/x-pack/test/reporting_api_integration/services/usage.ts
+++ b/x-pack/test/reporting_api_integration/services/usage.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import { indexTimestamp } from '../../../plugins/reporting/server/lib/store/index_timestamp';
+import { indexTimestamp } from '@kbn/reporting-plugin/server/lib/store/index_timestamp';
 import {
   AvailableTotal,
   JobTypes,
   LayoutCounts,
   ReportingUsageType,
-} from '../../../plugins/reporting/server/usage/types';
+} from '@kbn/reporting-plugin/server/usage/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // NOTE: the usage stats come from an HTTP API, which converts key names to snake_case
diff --git a/x-pack/test/rule_registry/common/config.ts b/x-pack/test/rule_registry/common/config.ts
index 91cc290f60361..d6fec474a00bf 100644
--- a/x-pack/test/rule_registry/common/config.ts
+++ b/x-pack/test/rule_registry/common/config.ts
@@ -55,7 +55,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     };
 
     return {
-      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
+      testFiles,
       servers,
       services,
       junit: {
diff --git a/x-pack/test/rule_registry/common/lib/authentication/index.ts b/x-pack/test/rule_registry/common/lib/authentication/index.ts
index f76159976a902..438fd972486e1 100644
--- a/x-pack/test/rule_registry/common/lib/authentication/index.ts
+++ b/x-pack/test/rule_registry/common/lib/authentication/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrProviderContext as CommonFtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext as CommonFtrProviderContext } from '../../ftr_provider_context';
 import { Role, User, UserInfo } from './types';
 import { allUsers } from './users';
 import { allRoles } from './roles';
diff --git a/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts b/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts
index fb974da00b52f..82652e5726fcf 100644
--- a/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts
+++ b/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { IRuleDataClient } from '../../../../../plugins/rule_registry/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import { GetService } from '../../types';
 
 export const cleanupRegistryIndices = async (getService: GetService, client: IRuleDataClient) => {
diff --git a/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts b/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts
index 64999aafd2f60..73e15c6cdbaeb 100644
--- a/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts
+++ b/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { Rule } from '@kbn/alerting-plugin/common';
 import { GetService } from '../../types';
 import { getAlertsTargetIndices } from './get_alerts_target_indices';
 import { BULK_INDEX_DELAY, MAX_POLLS } from '../../constants';
-import { Rule } from '../../../../../plugins/alerting/common';
 import { getSpaceUrlPrefix } from '../authentication/spaces';
 import { User } from '../authentication/types';
 
diff --git a/x-pack/test/rule_registry/common/types.ts b/x-pack/test/rule_registry/common/types.ts
index bd457d17a92df..970b131ef8c18 100644
--- a/x-pack/test/rule_registry/common/types.ts
+++ b/x-pack/test/rule_registry/common/types.ts
@@ -11,8 +11,8 @@ import {
   ActionGroupIdsOf,
   AlertInstanceState as AlertState,
   AlertInstanceContext as AlertContext,
-} from '../../../plugins/alerting/common';
-import { RuleTypeState } from '../../../plugins/alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { RuleTypeState } from '@kbn/alerting-plugin/server';
 import { services } from './services';
 
 export type GetService = GenericFtrProviderContext<typeof services, {}>['getService'];
diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts
index e94257f5f9fb6..ef06fc80c485c 100644
--- a/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts
+++ b/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts
@@ -6,7 +6,7 @@
  */
 import expect from '@kbn/expect';
 
-import { ALERT_WORKFLOW_STATUS } from '../../../../../plugins/rule_registry/common/technical_rule_data_field_names';
+import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import {
   superUser,
   globalRead,
diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
index 2c203a4ffbcd3..27dfd7a9c9a90 100644
--- a/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
+++ b/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
@@ -7,8 +7,9 @@
 import expect from '@kbn/expect';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 
+import { RuleRegistrySearchResponse } from '@kbn/rule-registry-plugin/common/search_strategy';
+import { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { RuleRegistrySearchResponse } from '../../../../../plugins/rule_registry/common/search_strategy';
 import {
   deleteSignalsIndex,
   createSignalsIndex,
@@ -19,7 +20,6 @@ import {
   waitForRuleSuccessOrStatus,
 } from '../../../../detection_engine_api_integration/utils';
 import { ID } from '../../../../detection_engine_api_integration/security_and_spaces/tests/generating_signals';
-import { QueryCreateSchema } from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
 import {
   obsOnlySpacesAllEsRead,
   obsOnlySpacesAll,
@@ -42,7 +42,8 @@ export default ({ getService }: FtrProviderContext) => {
 
   const SPACE1 = 'space1';
 
-  describe('ruleRegistryAlertsSearchStrategy', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/129219
+  describe.skip('ruleRegistryAlertsSearchStrategy', () => {
     let kibanaVersion: string;
     before(async () => {
       kibanaVersion = await kbnClient.version.get();
diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts
index 4e9c9c1475388..2e8358b239561 100644
--- a/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts
+++ b/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts
@@ -18,6 +18,7 @@ import {
   VERSION,
 } from '@kbn/rule-data-utils';
 import { omit } from 'lodash';
+import { Rule } from '@kbn/alerting-plugin/common';
 import type { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
   getAlertsTargetIndices,
@@ -29,7 +30,6 @@ import {
   deleteAlert,
 } from '../../../common/lib/helpers';
 import { AlertDef, AlertParams } from '../../../common/types';
-import { Rule } from '../../../../../plugins/alerting/common';
 import { APM_METRIC_INDEX_NAME } from '../../../common/constants';
 import { obsOnly } from '../../../common/lib/authentication/users';
 
diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts
index 689144791b048..d778be1705c46 100644
--- a/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts
+++ b/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts
@@ -5,25 +5,22 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, LogMeta } from 'kibana/server';
+import type { ElasticsearchClient, Logger, LogMeta } from '@kbn/core/server';
 import sinon from 'sinon';
 import expect from '@kbn/expect';
-import { mappingFromFieldMap } from '../../../../../plugins/rule_registry/common/mapping_from_field_map';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
 import {
   AlertConsumers,
   ALERT_REASON,
   ALERT_UUID,
-} from '../../../../../plugins/rule_registry/common/technical_rule_data_field_names';
+} from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import {
   createLifecycleExecutor,
   WrappedLifecycleRuleState,
-} from '../../../../../plugins/rule_registry/server/utils/create_lifecycle_executor';
+} from '@kbn/rule-registry-plugin/server/utils/create_lifecycle_executor';
+import { Dataset, IRuleDataClient, RuleDataService } from '@kbn/rule-registry-plugin/server';
+import { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
 import type { FtrProviderContext } from '../../../common/ftr_provider_context';
-import {
-  Dataset,
-  IRuleDataClient,
-  RuleDataService,
-} from '../../../../../plugins/rule_registry/server';
 import {
   MockRuleParams,
   MockRuleState,
@@ -31,7 +28,6 @@ import {
   MockAlertState,
   MockAllowedActionGroups,
 } from '../../../common/types';
-import { RuleExecutorOptions } from '../../../../../plugins/alerting/server';
 import { cleanupRegistryIndices } from '../../../common/lib/helpers/cleanup_registry_indices';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts b/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
index 36bbbb4bb8755..9221ac18c6dcd 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, SavedObject } from 'kibana/server';
+import { CoreSetup, SavedObject } from '@kbn/core/server';
 
 export class Plugin {
   constructor() {}
diff --git a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
index a4c69ec5a2ab1..82f2e2d5eaec9 100644
--- a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
+++ b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import type { Client } from '@elastic/elasticsearch';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { SPACES, ALL_SPACES_ID } from './spaces';
 import { AUTHENTICATION } from './authentication';
 import { TestCase, TestUser, ExpectResponseBody } from './types';
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
index 454f88e1d8b02..7779c604472e1 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES, ALL_SPACES_ID } from '../lib/spaces';
 import {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/import.ts b/x-pack/test/saved_object_api_integration/common/suites/import.ts
index 58b323e86d607..7580521e170a6 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/import.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/import.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import type { Client } from '@elastic/elasticsearch';
-import type { SavedObjectReference } from 'src/core/server';
+import type { SavedObjectReference } from '@kbn/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import { expectResponses, getUrlPrefix, getTestTitle } from '../lib/saved_object_test_utils';
diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
index c63b6c323f093..a7711719da7df 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import type { Client } from '@elastic/elasticsearch';
-import type { SavedObjectReference, SavedObjectsImportRetry } from 'src/core/server';
+import type { SavedObjectReference, SavedObjectsImportRetry } from '@kbn/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import { expectResponses, getUrlPrefix, getTestTitle } from '../lib/saved_object_test_utils';
diff --git a/x-pack/test/saved_objects_field_count/runner.ts b/x-pack/test/saved_objects_field_count/runner.ts
index 22c6fd5d4612f..b88f2129ba64d 100644
--- a/x-pack/test/saved_objects_field_count/runner.ts
+++ b/x-pack/test/saved_objects_field_count/runner.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CiStatsReporter } from '@kbn/dev-utils';
-import { FtrProviderContext } from './../functional/ftr_provider_context';
+import { CiStatsReporter } from '@kbn/ci-stats-reporter';
+import { FtrProviderContext } from '../functional/ftr_provider_context';
 
 const IGNORED_FIELDS = [
   // The following fields are returned by the _field_caps API but aren't counted
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts
index 6906fa5dfc38a..a329f4de12f62 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { TIME_RANGE_TYPE } from '@kbn/ml-plugin/public/application/jobs/components/custom_url_editor/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { TIME_RANGE_TYPE } from '../../../../../plugins/ml/public/application/jobs/components/custom_url_editor/constants';
 
-import { ECOMMERCE_INDEX_PATTERN } from '../index';
+import { ECOMMERCE_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts
index 7f9da26466414..88759715a36e8 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
-import { ECOMMERCE_INDEX_PATTERN, LOGS_INDEX_PATTERN } from '../index';
+import { ECOMMERCE_INDEX_PATTERN, LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
   const elasticChart = getService('elasticChart');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts
index e1859c5ae0a76..8e58a1db85182 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
-import { LOGS_INDEX_PATTERN } from '../index';
+import { LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
   const header = getPageObject('header');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts
index 23ef7ce03ce09..dd1f5f222c8de 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
-import { LOGS_INDEX_PATTERN } from '../index';
+import { LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const elasticChart = getService('elasticChart');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts
index ba78775a3a2d5..3912e3919e914 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import { FLIGHTS_INDEX_PATTERN } from '../index';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
+import { FLIGHTS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts
index 0571535432ef7..d46900cd8bb3f 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import { LOGS_INDEX_PATTERN } from '../index';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
+import { LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts
index 9b9f5f7a29b31..ea59c68088363 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import { FLIGHTS_INDEX_PATTERN } from '../index';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
+import { FLIGHTS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts
index a534da5b2572b..b87f43f73ed2e 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts
@@ -14,7 +14,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
   const searchSessions = getService('searchSessions');
 
   describe('Dashboard', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts
index d06d5d5ebd6ab..6a13dc268b705 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts
@@ -13,7 +13,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
   const PageObjects = getPageObjects(['common']);
 
   describe('Search session sharing', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts
index 31fcb61cf2278..1f8d219674428 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts
@@ -14,7 +14,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
   const searchSessions = getService('searchSessions');
 
   describe('Discover', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts b/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts
index c559af88fd9d9..5e45db7bd7233 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts
@@ -12,7 +12,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('lens search sessions', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts
index d1e3d9408c0ca..b72d8db06a1d8 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts
@@ -12,7 +12,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('search sessions management', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts b/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts
index f3df8aca222a9..dcbe7a86bf353 100644
--- a/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts
+++ b/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts
@@ -5,14 +5,15 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'src/core/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class AuditTrailTestPlugin implements Plugin {
   public setup(core: CoreSetup) {
     const router = core.http.createRouter();
     router.get({ path: '/audit_log', validate: false }, async (context, request, response) => {
-      await context.core.savedObjects.client.create('dashboard', {});
-      await context.core.savedObjects.client.find({ type: 'dashboard' });
+      const soClient = (await context.core).savedObjects.client;
+      await soClient.create('dashboard', {});
+      await soClient.find({ type: 'dashboard' });
       return response.noContent();
     });
   }
diff --git a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts
index cbee55f2066c7..b5a6123de4398 100644
--- a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts
+++ b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import type { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (): Plugin => ({
diff --git a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts
index eb30d1c3d95f3..81c2e1cb03f49 100644
--- a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts
+++ b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { IRouter } from '../../../../../../../src/core/server';
+import type { IRouter } from '@kbn/core/server';
 import { createTokens } from '../../oidc_tools';
 
 export function initRoutes(router: IRouter) {
diff --git a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts
index 280d79f3b202b..5558cceea2572 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts
+++ b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import type { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (): Plugin => ({
diff --git a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts
index 6d2a8c7b4b529..aee93b1dc7137 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts
+++ b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { getSAMLResponse, getSAMLRequestId } from '../../saml_tools';
 
 export function initRoutes(core: CoreSetup) {
diff --git a/x-pack/test/security_api_integration/session_idle.config.ts b/x-pack/test/security_api_integration/session_idle.config.ts
index ee1fe3782a42a..0c78327c044eb 100644
--- a/x-pack/test/security_api_integration/session_idle.config.ts
+++ b/x-pack/test/security_api_integration/session_idle.config.ts
@@ -51,6 +51,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
             saml_disable: { order: 3, realm: 'saml1', session: { idleTimeout: 0 } },
           },
         })}`,
+        // Exclude Uptime tasks to not interfere (additional ES load) with the session cleanup task.
+        `--xpack.task_manager.unsafe.exclude_task_types=${JSON.stringify(['UPTIME:*'])}`,
       ],
     },
 
diff --git a/x-pack/test/security_api_integration/session_lifespan.config.ts b/x-pack/test/security_api_integration/session_lifespan.config.ts
index e236cbb8484d4..bc3ef851ceeca 100644
--- a/x-pack/test/security_api_integration/session_lifespan.config.ts
+++ b/x-pack/test/security_api_integration/session_lifespan.config.ts
@@ -51,6 +51,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
             saml_disable: { order: 3, realm: 'saml1', session: { lifespan: 0 } },
           },
         })}`,
+        // Exclude Uptime tasks to not interfere (additional ES load) with the session cleanup task.
+        `--xpack.task_manager.unsafe.exclude_task_types=${JSON.stringify(['UPTIME:*'])}`,
       ],
     },
 
diff --git a/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts b/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts
index 0836897bb3f00..5439964a26838 100644
--- a/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts
+++ b/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts
@@ -11,7 +11,7 @@ import { resolve } from 'path';
 import url from 'url';
 import { CA_CERT_PATH } from '@kbn/dev-utils';
 import expect from '@kbn/expect';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common/model';
 import { getStateAndNonce } from '../../fixtures/oidc/oidc_tools';
 import {
   getMutualAuthenticationResponseToken,
diff --git a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
index 1668d9bc1b811..c5639c26b8af4 100644
--- a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
@@ -9,7 +9,7 @@ import { parse as parseCookie, Cookie } from 'tough-cookie';
 import { setTimeout as setTimeoutAsync } from 'timers/promises';
 import expect from '@kbn/expect';
 import { adminTestUser } from '@kbn/test';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common';
 import { getSAMLRequestId, getSAMLResponse } from '../../fixtures/saml/saml_tools';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -76,8 +76,7 @@ export default function ({ getService }: FtrProviderContext) {
     return cookie;
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/121482
-  describe.skip('Session Idle cleanup', () => {
+  describe('Session Idle cleanup', () => {
     beforeEach(async () => {
       await es.cluster.health({ index: '.kibana_security_session*', wait_for_status: 'green' });
       await esDeleteAllIndices('.kibana_security_session*');
diff --git a/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts b/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts
index c8149cfca8a11..a4c70fc2dd54c 100644
--- a/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts
+++ b/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts
@@ -8,7 +8,7 @@
 import { parse as parseCookie, Cookie } from 'tough-cookie';
 import expect from '@kbn/expect';
 import { adminTestUser } from '@kbn/test';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common/model';
 import { getSAMLRequestId, getSAMLResponse } from '../../fixtures/saml/saml_tools';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
index 59c5878f01cab..f39e43856415b 100644
--- a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
@@ -9,7 +9,7 @@ import { parse as parseCookie, Cookie } from 'tough-cookie';
 import { setTimeout as setTimeoutAsync } from 'timers/promises';
 import expect from '@kbn/expect';
 import { adminTestUser } from '@kbn/test';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common/model';
 import { getSAMLRequestId, getSAMLResponse } from '../../fixtures/saml/saml_tools';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx b/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx
index 745a8852968c0..3cb36e7c1fe78 100644
--- a/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx
+++ b/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Plugin } from 'src/core/public';
+import type { CoreSetup, Plugin } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { debounce, filter, first } from 'rxjs/operators';
diff --git a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts
index d06a8c1059b49..43b634048d8cd 100644
--- a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts
+++ b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (initializerContext): Plugin => ({
diff --git a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts
index 443858287cf81..16db5c8242931 100644
--- a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts
+++ b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { errors } from '@elastic/elasticsearch';
-import { CoreSetup, PluginInitializerContext } from '../../../../../../../src/core/server';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/server';
 
 export function initRoutes(initializerContext: PluginInitializerContext, core: CoreSetup) {
   const logger = initializerContext.logger.get();
@@ -62,7 +62,7 @@ export function initRoutes(initializerContext: PluginInitializerContext, core: C
       if (request.body.client === 'start-contract') {
         scopedClient = (await core.getStartServices())[0].elasticsearch.client.asScoped(request);
       } else if (request.body.client === 'request-context') {
-        scopedClient = context.core.elasticsearch.client;
+        scopedClient = (await context.core).elasticsearch.client;
       } else {
         scopedClient = (await core.getStartServices())[0].elasticsearch
           .createClient('custom')
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/data.json.gz b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/data.json.gz
deleted file mode 100644
index 4139fd9d28f46..0000000000000
Binary files a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/data.json.gz and /dev/null differ
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/mappings.json b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/mappings.json
deleted file mode 100644
index 4e5c6e9955310..0000000000000
--- a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/mappings.json
+++ /dev/null
@@ -1,3577 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      "exceptions-8.0.0": {
-        "is_write_index": false
-      },
-      "beats": {
-      },
-      "siem-read-alias": {
-      }
-    },
-    "index": "exceptions-8.0.0-2019.08.30-000021",
-    "mappings": {
-      "_meta": {
-        "beat": "auditbeat",
-        "version": "8.0.0"
-      },
-      "date_detection": false,
-      "dynamic_templates": [
-        {
-          "labels": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "container.labels": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "container.labels.*"
-          }
-        },
-        {
-          "fields": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "fields.*"
-          }
-        },
-        {
-          "docker.container.labels": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "docker.container.labels.*"
-          }
-        },
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
-        }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        },
-        "agent": {
-          "properties": {
-            "ephemeral_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "auditd": {
-          "properties": {
-            "data": {
-              "properties": {
-                "a0": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a1": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a2": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a3": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a[0-3]": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "acct": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "acl": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "action": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "added": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "addr": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "apparmor": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "arch": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "argc": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_backlog_limit": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_backlog_wait_time": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_enabled": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_failure": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "banners": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "bool": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "bus": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "capability": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cgroup": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "changed": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cipher": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "class": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cmd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "compat": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "daddr": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "data": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "default-context": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "device": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dir": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "direction": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dmac": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "enforcing": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "entries": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "exit": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fam": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "feature": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "file": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "flags": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "format": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "grantors": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "grp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "hook": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "hostname": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "icmp_type": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "igid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "img-ctx": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "info": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inif": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ino": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inode_gid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inode_uid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "invalid_context": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ioctlcmd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ip": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ipid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ipx-net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "items": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "iuid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kind": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ksize": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "laddr": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "len": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "list": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "lport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "mac": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "macproto": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "maj": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "major": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "minor": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "model": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "msg": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nargs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-chardev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-disk": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-enabled": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-fs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-log_passwd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-mem": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-range": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-rng": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-seuser": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-vcpu": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_gid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_lock": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nlnk-fam": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nlnk-grp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nlnk-pid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "oauid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_gid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_uid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ocomm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "oflag": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-auid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-chardev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-disk": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-enabled": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-fs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-log_passwd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-mem": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-range": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-rng": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-ses": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-seuser": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-vcpu": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_enforcing": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_lock": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pa": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_prom": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_val": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "op": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "operation": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "opid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "oses": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "outif": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pa": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "parent": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "path": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "per": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "perm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "perm_mask": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "permissive": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pfs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "printer": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "profile": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "prom": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "proto": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "qbytes": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "range": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "reason": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "removed": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "res": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "resrc": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "rport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sauid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "scontext": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "selected-context": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seperm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seperms": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seqno": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seresult": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ses": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seuser": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sig": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sigev_signo": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "smac": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "socket": {
-                  "properties": {
-                    "addr": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "family": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "path": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "port": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "saddr": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "spid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "state": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "subj": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "success": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "syscall": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "table": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tclass": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tcontext": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "terminal": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tty": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "unit": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "uri": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "val": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "virt": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vm-ctx": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vm-pid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "watch": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "message_type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "paths": {
-              "properties": {
-                "cap_fe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inode": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "item": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "mode": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nametype": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_domain": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_user": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "objtype": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ogid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ouid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "rdev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "result": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sequence": {
-              "type": "long"
-            },
-            "session": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "summary": {
-              "properties": {
-                "actor": {
-                  "properties": {
-                    "primary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "secondary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "how": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "object": {
-                  "properties": {
-                    "primary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "secondary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "type": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "client": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cloud": {
-          "properties": {
-            "account": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "availability_zone": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "instance": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "machine": {
-              "properties": {
-                "type": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "project": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "provider": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "region": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "container": {
-          "properties": {
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "image": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tag": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "labels": {
-              "type": "object"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "runtime": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "destination": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "docker": {
-          "properties": {
-            "container": {
-              "properties": {
-                "labels": {
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "ecs": {
-          "properties": {
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "error": {
-          "properties": {
-            "code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "message": {
-              "norms": false,
-              "type": "text"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "event": {
-          "properties": {
-            "action": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "category": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "created": {
-              "type": "date"
-            },
-            "dataset": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "duration": {
-              "type": "long"
-            },
-            "end": {
-              "type": "date"
-            },
-            "hash": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "kind": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "module": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "origin": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "outcome": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "risk_score": {
-              "type": "float"
-            },
-            "risk_score_norm": {
-              "type": "float"
-            },
-            "severity": {
-              "type": "long"
-            },
-            "start": {
-              "type": "date"
-            },
-            "timezone": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "fields": {
-          "type": "object"
-        },
-        "file": {
-          "properties": {
-            "ctime": {
-              "type": "date"
-            },
-            "device": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "extension": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "gid": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "group": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "inode": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "mode": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "mtime": {
-              "type": "date"
-            },
-            "origin": {
-              "fields": {
-                "raw": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              },
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "owner": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "selinux": {
-              "properties": {
-                "domain": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "user": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "setgid": {
-              "type": "boolean"
-            },
-            "setuid": {
-              "type": "boolean"
-            },
-            "size": {
-              "type": "long"
-            },
-            "target_path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "uid": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "flow": {
-          "properties": {
-            "complete": {
-              "type": "boolean"
-            },
-            "final": {
-              "type": "boolean"
-            }
-          }
-        },
-        "geo": {
-          "properties": {
-            "city_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "continent_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "country_iso_code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "country_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "location": {
-              "type": "geo_point"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "region_iso_code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "region_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "geoip": {
-          "properties": {
-            "city_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "continent_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "country_iso_code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "location": {
-              "type": "geo_point"
-            },
-            "region_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "group": {
-          "properties": {
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "hash": {
-          "properties": {
-            "blake2b_256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "blake2b_384": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "blake2b_512": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "md5": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha1": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha224": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha384": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_224": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_384": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_512": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha512": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha512_224": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha512_256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "xxh64": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "host": {
-          "properties": {
-            "architecture": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "containerized": {
-              "type": "boolean"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "os": {
-              "properties": {
-                "build": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "codename": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "platform": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "http": {
-          "properties": {
-            "request": {
-              "properties": {
-                "body": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "content": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "method": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "referrer": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "response": {
-              "properties": {
-                "body": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "content": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "status_code": {
-                  "type": "long"
-                }
-              }
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "jolokia": {
-          "properties": {
-            "agent": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "secured": {
-              "type": "boolean"
-            },
-            "server": {
-              "properties": {
-                "product": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vendor": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "url": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "kubernetes": {
-          "properties": {
-            "annotations": {
-              "type": "object"
-            },
-            "container": {
-              "properties": {
-                "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "deployment": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "labels": {
-              "type": "object"
-            },
-            "namespace": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "node": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "pod": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "uid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "replicaset": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "statefulset": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "labels": {
-          "type": "object"
-        },
-        "log": {
-          "properties": {
-            "level": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "message": {
-          "norms": false,
-          "type": "text"
-        },
-        "network": {
-          "properties": {
-            "application": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "community_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "direction": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "forwarded_ip": {
-              "type": "ip"
-            },
-            "iana_number": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "protocol": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "transport": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "observer": {
-          "properties": {
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "platform": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "serial_number": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "vendor": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "organization": {
-          "properties": {
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "os": {
-          "properties": {
-            "family": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "full": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "kernel": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "platform": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "process": {
-          "properties": {
-            "args": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "created": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "entity_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "executable": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hash": {
-              "properties": {
-                "sha1": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "pid": {
-              "type": "long"
-            },
-            "ppid": {
-              "type": "long"
-            },
-            "start": {
-              "type": "date"
-            },
-            "thread": {
-              "properties": {
-                "id": {
-                  "type": "long"
-                }
-              }
-            },
-            "title": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "working_directory": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "related": {
-          "properties": {
-            "ip": {
-              "type": "ip"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "service": {
-          "properties": {
-            "ephemeral_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "state": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "socket": {
-          "properties": {
-            "entity_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "source": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "system": {
-          "properties": {
-            "audit": {
-              "properties": {
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "boottime": {
-                      "type": "date"
-                    },
-                    "containerized": {
-                      "type": "boolean"
-                    },
-                    "hostname": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "ip": {
-                      "type": "ip"
-                    },
-                    "mac": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "codename": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "kernel": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "name": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "timezone": {
-                      "properties": {
-                        "name": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "offset": {
-                          "properties": {
-                            "sec": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "uptime": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "newsocket": {
-                  "properties": {
-                    "egid": {
-                      "type": "long"
-                    },
-                    "euid": {
-                      "type": "long"
-                    },
-                    "gid": {
-                      "type": "long"
-                    },
-                    "internal_version": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "kernel_sock_address": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "uid": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "package": {
-                  "properties": {
-                    "arch": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "entity_id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "installtime": {
-                      "type": "date"
-                    },
-                    "license": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "release": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "size": {
-                      "type": "long"
-                    },
-                    "summary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "url": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "socket": {
-                  "properties": {
-                    "egid": {
-                      "type": "long"
-                    },
-                    "euid": {
-                      "type": "long"
-                    },
-                    "gid": {
-                      "type": "long"
-                    },
-                    "internal_version": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "kernel_sock_address": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "uid": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "user": {
-                  "properties": {
-                    "dir": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "gid": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "group": {
-                      "properties": {
-                        "gid": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "name": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "password": {
-                      "properties": {
-                        "last_changed": {
-                          "type": "date"
-                        },
-                        "type": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "shell": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "uid": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "user_information": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "tags": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
-        "url": {
-          "properties": {
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "fragment": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "full": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "password": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "port": {
-              "type": "long"
-            },
-            "query": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "scheme": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "username": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "user": {
-          "properties": {
-            "audit": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "effective": {
-              "properties": {
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "email": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "entity_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "filesystem": {
-              "properties": {
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "full_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "group": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "hash": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name_map": {
-              "type": "object"
-            },
-            "saved": {
-              "properties": {
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "selinux": {
-              "properties": {
-                "category": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "domain": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "user": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "terminal": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "user_agent": {
-          "properties": {
-            "device": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "platform": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "lifecycle": {
-          "indexing_complete": "true",
-          "name": "auditbeat-8.0.0",
-          "rollover_alias": "auditbeat-8.0.0"
-        },
-        "mapping": {
-          "total_fields": {
-            "limit": "10000"
-          }
-        },
-        "number_of_replicas": "0",
-        "number_of_shards": "1",
-        "query": {
-          "default_field": [
-            "message",
-            "tags",
-            "agent.ephemeral_id",
-            "agent.id",
-            "agent.name",
-            "agent.type",
-            "agent.version",
-            "client.address",
-            "client.domain",
-            "client.geo.city_name",
-            "client.geo.continent_name",
-            "client.geo.country_iso_code",
-            "client.geo.country_name",
-            "client.geo.name",
-            "client.geo.region_iso_code",
-            "client.geo.region_name",
-            "client.mac",
-            "client.user.email",
-            "client.user.full_name",
-            "client.user.group.id",
-            "client.user.group.name",
-            "client.user.hash",
-            "client.user.id",
-            "client.user.name",
-            "cloud.account.id",
-            "cloud.availability_zone",
-            "cloud.instance.id",
-            "cloud.instance.name",
-            "cloud.machine.type",
-            "cloud.provider",
-            "cloud.region",
-            "container.id",
-            "container.image.name",
-            "container.image.tag",
-            "container.name",
-            "container.runtime",
-            "destination.address",
-            "destination.domain",
-            "destination.geo.city_name",
-            "destination.geo.continent_name",
-            "destination.geo.country_iso_code",
-            "destination.geo.country_name",
-            "destination.geo.name",
-            "destination.geo.region_iso_code",
-            "destination.geo.region_name",
-            "destination.mac",
-            "destination.user.email",
-            "destination.user.full_name",
-            "destination.user.group.id",
-            "destination.user.group.name",
-            "destination.user.hash",
-            "destination.user.id",
-            "destination.user.name",
-            "ecs.version",
-            "error.code",
-            "error.id",
-            "error.message",
-            "event.action",
-            "event.category",
-            "event.dataset",
-            "event.hash",
-            "event.id",
-            "event.kind",
-            "event.module",
-            "event.original",
-            "event.outcome",
-            "event.timezone",
-            "event.type",
-            "file.device",
-            "file.extension",
-            "file.gid",
-            "file.group",
-            "file.inode",
-            "file.mode",
-            "file.owner",
-            "file.path",
-            "file.target_path",
-            "file.type",
-            "file.uid",
-            "geo.city_name",
-            "geo.continent_name",
-            "geo.country_iso_code",
-            "geo.country_name",
-            "geo.name",
-            "geo.region_iso_code",
-            "geo.region_name",
-            "group.id",
-            "group.name",
-            "host.architecture",
-            "host.geo.city_name",
-            "host.geo.continent_name",
-            "host.geo.country_iso_code",
-            "host.geo.country_name",
-            "host.geo.name",
-            "host.geo.region_iso_code",
-            "host.geo.region_name",
-            "host.hostname",
-            "host.id",
-            "host.mac",
-            "host.name",
-            "host.os.family",
-            "host.os.full",
-            "host.os.kernel",
-            "host.os.name",
-            "host.os.platform",
-            "host.os.version",
-            "host.type",
-            "host.user.email",
-            "host.user.full_name",
-            "host.user.group.id",
-            "host.user.group.name",
-            "host.user.hash",
-            "host.user.id",
-            "host.user.name",
-            "http.request.body.content",
-            "http.request.method",
-            "http.request.referrer",
-            "http.response.body.content",
-            "http.version",
-            "log.level",
-            "log.original",
-            "network.application",
-            "network.community_id",
-            "network.direction",
-            "network.iana_number",
-            "network.name",
-            "network.protocol",
-            "network.transport",
-            "network.type",
-            "observer.geo.city_name",
-            "observer.geo.continent_name",
-            "observer.geo.country_iso_code",
-            "observer.geo.country_name",
-            "observer.geo.name",
-            "observer.geo.region_iso_code",
-            "observer.geo.region_name",
-            "observer.hostname",
-            "observer.mac",
-            "observer.os.family",
-            "observer.os.full",
-            "observer.os.kernel",
-            "observer.os.name",
-            "observer.os.platform",
-            "observer.os.version",
-            "observer.serial_number",
-            "observer.type",
-            "observer.vendor",
-            "observer.version",
-            "organization.id",
-            "organization.name",
-            "os.family",
-            "os.full",
-            "os.kernel",
-            "os.name",
-            "os.platform",
-            "os.version",
-            "process.args",
-            "process.executable",
-            "process.name",
-            "process.title",
-            "process.working_directory",
-            "server.address",
-            "server.domain",
-            "server.geo.city_name",
-            "server.geo.continent_name",
-            "server.geo.country_iso_code",
-            "server.geo.country_name",
-            "server.geo.name",
-            "server.geo.region_iso_code",
-            "server.geo.region_name",
-            "server.mac",
-            "server.user.email",
-            "server.user.full_name",
-            "server.user.group.id",
-            "server.user.group.name",
-            "server.user.hash",
-            "server.user.id",
-            "server.user.name",
-            "service.ephemeral_id",
-            "service.id",
-            "service.name",
-            "service.state",
-            "service.type",
-            "service.version",
-            "source.address",
-            "source.domain",
-            "source.geo.city_name",
-            "source.geo.continent_name",
-            "source.geo.country_iso_code",
-            "source.geo.country_name",
-            "source.geo.name",
-            "source.geo.region_iso_code",
-            "source.geo.region_name",
-            "source.mac",
-            "source.user.email",
-            "source.user.full_name",
-            "source.user.group.id",
-            "source.user.group.name",
-            "source.user.hash",
-            "source.user.id",
-            "source.user.name",
-            "url.domain",
-            "url.fragment",
-            "url.full",
-            "url.original",
-            "url.password",
-            "url.path",
-            "url.query",
-            "url.scheme",
-            "url.username",
-            "user.email",
-            "user.full_name",
-            "user.group.id",
-            "user.group.name",
-            "user.hash",
-            "user.id",
-            "user.name",
-            "user_agent.device.name",
-            "user_agent.name",
-            "user_agent.original",
-            "user_agent.os.family",
-            "user_agent.os.full",
-            "user_agent.os.kernel",
-            "user_agent.os.name",
-            "user_agent.os.platform",
-            "user_agent.os.version",
-            "user_agent.version",
-            "agent.hostname",
-            "error.type",
-            "cloud.project.id",
-            "host.os.build",
-            "kubernetes.pod.name",
-            "kubernetes.pod.uid",
-            "kubernetes.namespace",
-            "kubernetes.node.name",
-            "kubernetes.replicaset.name",
-            "kubernetes.deployment.name",
-            "kubernetes.statefulset.name",
-            "kubernetes.container.name",
-            "kubernetes.container.image",
-            "jolokia.agent.version",
-            "jolokia.agent.id",
-            "jolokia.server.product",
-            "jolokia.server.version",
-            "jolokia.server.vendor",
-            "jolokia.url",
-            "raw",
-            "file.origin",
-            "file.selinux.user",
-            "file.selinux.role",
-            "file.selinux.domain",
-            "file.selinux.level",
-            "user.audit.id",
-            "user.audit.name",
-            "user.effective.id",
-            "user.effective.name",
-            "user.effective.group.id",
-            "user.effective.group.name",
-            "user.filesystem.id",
-            "user.filesystem.name",
-            "user.filesystem.group.id",
-            "user.filesystem.group.name",
-            "user.saved.id",
-            "user.saved.name",
-            "user.saved.group.id",
-            "user.saved.group.name",
-            "user.selinux.user",
-            "user.selinux.role",
-            "user.selinux.domain",
-            "user.selinux.level",
-            "user.selinux.category",
-            "source.path",
-            "destination.path",
-            "auditd.message_type",
-            "auditd.session",
-            "auditd.result",
-            "auditd.summary.actor.primary",
-            "auditd.summary.actor.secondary",
-            "auditd.summary.object.type",
-            "auditd.summary.object.primary",
-            "auditd.summary.object.secondary",
-            "auditd.summary.how",
-            "auditd.paths.inode",
-            "auditd.paths.dev",
-            "auditd.paths.obj_user",
-            "auditd.paths.obj_role",
-            "auditd.paths.obj_domain",
-            "auditd.paths.obj_level",
-            "auditd.paths.objtype",
-            "auditd.paths.ouid",
-            "auditd.paths.rdev",
-            "auditd.paths.nametype",
-            "auditd.paths.ogid",
-            "auditd.paths.item",
-            "auditd.paths.mode",
-            "auditd.paths.name",
-            "auditd.data.action",
-            "auditd.data.minor",
-            "auditd.data.acct",
-            "auditd.data.addr",
-            "auditd.data.cipher",
-            "auditd.data.id",
-            "auditd.data.entries",
-            "auditd.data.kind",
-            "auditd.data.ksize",
-            "auditd.data.spid",
-            "auditd.data.arch",
-            "auditd.data.argc",
-            "auditd.data.major",
-            "auditd.data.unit",
-            "auditd.data.table",
-            "auditd.data.terminal",
-            "auditd.data.grantors",
-            "auditd.data.direction",
-            "auditd.data.op",
-            "auditd.data.tty",
-            "auditd.data.syscall",
-            "auditd.data.data",
-            "auditd.data.family",
-            "auditd.data.mac",
-            "auditd.data.pfs",
-            "auditd.data.items",
-            "auditd.data.a0",
-            "auditd.data.a1",
-            "auditd.data.a2",
-            "auditd.data.a3",
-            "auditd.data.hostname",
-            "auditd.data.lport",
-            "auditd.data.rport",
-            "auditd.data.exit",
-            "auditd.data.fp",
-            "auditd.data.laddr",
-            "auditd.data.sport",
-            "auditd.data.capability",
-            "auditd.data.nargs",
-            "auditd.data.new-enabled",
-            "auditd.data.audit_backlog_limit",
-            "auditd.data.dir",
-            "auditd.data.cap_pe",
-            "auditd.data.model",
-            "auditd.data.new_pp",
-            "auditd.data.old-enabled",
-            "auditd.data.oauid",
-            "auditd.data.old",
-            "auditd.data.banners",
-            "auditd.data.feature",
-            "auditd.data.vm-ctx",
-            "auditd.data.opid",
-            "auditd.data.seperms",
-            "auditd.data.seresult",
-            "auditd.data.new-rng",
-            "auditd.data.old-net",
-            "auditd.data.sigev_signo",
-            "auditd.data.ino",
-            "auditd.data.old_enforcing",
-            "auditd.data.old-vcpu",
-            "auditd.data.range",
-            "auditd.data.res",
-            "auditd.data.added",
-            "auditd.data.fam",
-            "auditd.data.nlnk-pid",
-            "auditd.data.subj",
-            "auditd.data.a[0-3]",
-            "auditd.data.cgroup",
-            "auditd.data.kernel",
-            "auditd.data.ocomm",
-            "auditd.data.new-net",
-            "auditd.data.permissive",
-            "auditd.data.class",
-            "auditd.data.compat",
-            "auditd.data.fi",
-            "auditd.data.changed",
-            "auditd.data.msg",
-            "auditd.data.dport",
-            "auditd.data.new-seuser",
-            "auditd.data.invalid_context",
-            "auditd.data.dmac",
-            "auditd.data.ipx-net",
-            "auditd.data.iuid",
-            "auditd.data.macproto",
-            "auditd.data.obj",
-            "auditd.data.ipid",
-            "auditd.data.new-fs",
-            "auditd.data.vm-pid",
-            "auditd.data.cap_pi",
-            "auditd.data.old-auid",
-            "auditd.data.oses",
-            "auditd.data.fd",
-            "auditd.data.igid",
-            "auditd.data.new-disk",
-            "auditd.data.parent",
-            "auditd.data.len",
-            "auditd.data.oflag",
-            "auditd.data.uuid",
-            "auditd.data.code",
-            "auditd.data.nlnk-grp",
-            "auditd.data.cap_fp",
-            "auditd.data.new-mem",
-            "auditd.data.seperm",
-            "auditd.data.enforcing",
-            "auditd.data.new-chardev",
-            "auditd.data.old-rng",
-            "auditd.data.outif",
-            "auditd.data.cmd",
-            "auditd.data.hook",
-            "auditd.data.new-level",
-            "auditd.data.sauid",
-            "auditd.data.sig",
-            "auditd.data.audit_backlog_wait_time",
-            "auditd.data.printer",
-            "auditd.data.old-mem",
-            "auditd.data.perm",
-            "auditd.data.old_pi",
-            "auditd.data.state",
-            "auditd.data.format",
-            "auditd.data.new_gid",
-            "auditd.data.tcontext",
-            "auditd.data.maj",
-            "auditd.data.watch",
-            "auditd.data.device",
-            "auditd.data.grp",
-            "auditd.data.bool",
-            "auditd.data.icmp_type",
-            "auditd.data.new_lock",
-            "auditd.data.old_prom",
-            "auditd.data.acl",
-            "auditd.data.ip",
-            "auditd.data.new_pi",
-            "auditd.data.default-context",
-            "auditd.data.inode_gid",
-            "auditd.data.new-log_passwd",
-            "auditd.data.new_pe",
-            "auditd.data.selected-context",
-            "auditd.data.cap_fver",
-            "auditd.data.file",
-            "auditd.data.net",
-            "auditd.data.virt",
-            "auditd.data.cap_pp",
-            "auditd.data.old-range",
-            "auditd.data.resrc",
-            "auditd.data.new-range",
-            "auditd.data.obj_gid",
-            "auditd.data.proto",
-            "auditd.data.old-disk",
-            "auditd.data.audit_failure",
-            "auditd.data.inif",
-            "auditd.data.vm",
-            "auditd.data.flags",
-            "auditd.data.nlnk-fam",
-            "auditd.data.old-fs",
-            "auditd.data.old-ses",
-            "auditd.data.seqno",
-            "auditd.data.fver",
-            "auditd.data.qbytes",
-            "auditd.data.seuser",
-            "auditd.data.cap_fe",
-            "auditd.data.new-vcpu",
-            "auditd.data.old-level",
-            "auditd.data.old_pp",
-            "auditd.data.daddr",
-            "auditd.data.old-role",
-            "auditd.data.ioctlcmd",
-            "auditd.data.smac",
-            "auditd.data.apparmor",
-            "auditd.data.fe",
-            "auditd.data.perm_mask",
-            "auditd.data.ses",
-            "auditd.data.cap_fi",
-            "auditd.data.obj_uid",
-            "auditd.data.reason",
-            "auditd.data.list",
-            "auditd.data.old_lock",
-            "auditd.data.bus",
-            "auditd.data.old_pe",
-            "auditd.data.new-role",
-            "auditd.data.prom",
-            "auditd.data.uri",
-            "auditd.data.audit_enabled",
-            "auditd.data.old-log_passwd",
-            "auditd.data.old-seuser",
-            "auditd.data.per",
-            "auditd.data.scontext",
-            "auditd.data.tclass",
-            "auditd.data.ver",
-            "auditd.data.new",
-            "auditd.data.val",
-            "auditd.data.img-ctx",
-            "auditd.data.old-chardev",
-            "auditd.data.old_val",
-            "auditd.data.success",
-            "auditd.data.inode_uid",
-            "auditd.data.removed",
-            "auditd.data.socket.port",
-            "auditd.data.socket.saddr",
-            "auditd.data.socket.addr",
-            "auditd.data.socket.family",
-            "auditd.data.socket.path",
-            "geoip.continent_name",
-            "geoip.city_name",
-            "geoip.region_name",
-            "geoip.country_iso_code",
-            "hash.blake2b_256",
-            "hash.blake2b_384",
-            "hash.blake2b_512",
-            "hash.md5",
-            "hash.sha1",
-            "hash.sha224",
-            "hash.sha256",
-            "hash.sha384",
-            "hash.sha3_224",
-            "hash.sha3_256",
-            "hash.sha3_384",
-            "hash.sha3_512",
-            "hash.sha512",
-            "hash.sha512_224",
-            "hash.sha512_256",
-            "hash.xxh64",
-            "event.origin",
-            "user.entity_id",
-            "user.terminal",
-            "process.entity_id",
-            "socket.entity_id",
-            "system.audit.host.timezone.name",
-            "system.audit.host.hostname",
-            "system.audit.host.id",
-            "system.audit.host.architecture",
-            "system.audit.host.mac",
-            "system.audit.host.os.platform",
-            "system.audit.host.os.name",
-            "system.audit.host.os.family",
-            "system.audit.host.os.version",
-            "system.audit.host.os.kernel",
-            "system.audit.package.entity_id",
-            "system.audit.package.name",
-            "system.audit.package.version",
-            "system.audit.package.release",
-            "system.audit.package.arch",
-            "system.audit.package.license",
-            "system.audit.package.summary",
-            "system.audit.package.url",
-            "system.audit.user.name",
-            "system.audit.user.uid",
-            "system.audit.user.gid",
-            "system.audit.user.dir",
-            "system.audit.user.shell",
-            "system.audit.user.user_information",
-            "system.audit.user.password.type",
-            "fields.*"
-          ]
-        },
-        "refresh_interval": "5s"
-      }
-    }
-  }
-}
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/data.json.gz b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/data.json.gz
deleted file mode 100644
index 0fdcb7d783ea6..0000000000000
Binary files a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/data.json.gz and /dev/null differ
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/mappings.json b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/mappings.json
deleted file mode 100644
index 4e5c6e9955310..0000000000000
--- a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/mappings.json
+++ /dev/null
@@ -1,3577 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      "exceptions-8.0.0": {
-        "is_write_index": false
-      },
-      "beats": {
-      },
-      "siem-read-alias": {
-      }
-    },
-    "index": "exceptions-8.0.0-2019.08.30-000021",
-    "mappings": {
-      "_meta": {
-        "beat": "auditbeat",
-        "version": "8.0.0"
-      },
-      "date_detection": false,
-      "dynamic_templates": [
-        {
-          "labels": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "container.labels": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "container.labels.*"
-          }
-        },
-        {
-          "fields": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "fields.*"
-          }
-        },
-        {
-          "docker.container.labels": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "docker.container.labels.*"
-          }
-        },
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
-        }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        },
-        "agent": {
-          "properties": {
-            "ephemeral_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "auditd": {
-          "properties": {
-            "data": {
-              "properties": {
-                "a0": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a1": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a2": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a3": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "a[0-3]": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "acct": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "acl": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "action": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "added": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "addr": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "apparmor": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "arch": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "argc": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_backlog_limit": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_backlog_wait_time": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_enabled": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "audit_failure": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "banners": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "bool": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "bus": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "capability": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cgroup": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "changed": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cipher": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "class": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cmd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "compat": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "daddr": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "data": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "default-context": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "device": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dir": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "direction": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dmac": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "enforcing": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "entries": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "exit": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fam": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "feature": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "file": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "flags": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "format": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "fver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "grantors": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "grp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "hook": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "hostname": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "icmp_type": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "igid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "img-ctx": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "info": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inif": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ino": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inode_gid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inode_uid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "invalid_context": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ioctlcmd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ip": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ipid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ipx-net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "items": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "iuid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kind": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ksize": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "laddr": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "len": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "list": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "lport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "mac": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "macproto": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "maj": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "major": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "minor": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "model": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "msg": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nargs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-chardev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-disk": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-enabled": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-fs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-log_passwd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-mem": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-range": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-rng": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-seuser": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new-vcpu": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_gid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_lock": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "new_pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nlnk-fam": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nlnk-grp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nlnk-pid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "oauid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_gid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_uid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ocomm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "oflag": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-auid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-chardev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-disk": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-enabled": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-fs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-log_passwd": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-mem": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-net": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-range": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-rng": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-ses": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-seuser": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old-vcpu": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_enforcing": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_lock": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pa": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_prom": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "old_val": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "op": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "operation": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "opid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "oses": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "outif": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pa": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "parent": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "path": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "per": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "perm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "perm_mask": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "permissive": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pfs": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "pp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "printer": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "profile": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "prom": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "proto": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "qbytes": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "range": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "reason": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "removed": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "res": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "resrc": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "rport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sauid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "scontext": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "selected-context": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seperm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seperms": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seqno": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seresult": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ses": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "seuser": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sig": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sigev_signo": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "smac": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "socket": {
-                  "properties": {
-                    "addr": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "family": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "path": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "port": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "saddr": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "spid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "sport": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "state": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "subj": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "success": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "syscall": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "table": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tclass": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tcontext": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "terminal": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tty": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "unit": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "uri": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "val": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "virt": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vm": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vm-ctx": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vm-pid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "watch": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "message_type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "paths": {
-              "properties": {
-                "cap_fe": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fi": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fp": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "cap_fver": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "dev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "inode": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "item": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "mode": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "nametype": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_domain": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "obj_user": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "objtype": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ogid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ouid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "rdev": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "result": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sequence": {
-              "type": "long"
-            },
-            "session": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "summary": {
-              "properties": {
-                "actor": {
-                  "properties": {
-                    "primary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "secondary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "how": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "object": {
-                  "properties": {
-                    "primary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "secondary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "type": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "client": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cloud": {
-          "properties": {
-            "account": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "availability_zone": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "instance": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "machine": {
-              "properties": {
-                "type": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "project": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "provider": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "region": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "container": {
-          "properties": {
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "image": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "tag": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "labels": {
-              "type": "object"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "runtime": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "destination": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "docker": {
-          "properties": {
-            "container": {
-              "properties": {
-                "labels": {
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "ecs": {
-          "properties": {
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "error": {
-          "properties": {
-            "code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "message": {
-              "norms": false,
-              "type": "text"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "event": {
-          "properties": {
-            "action": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "category": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "created": {
-              "type": "date"
-            },
-            "dataset": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "duration": {
-              "type": "long"
-            },
-            "end": {
-              "type": "date"
-            },
-            "hash": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "kind": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "module": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "origin": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "outcome": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "risk_score": {
-              "type": "float"
-            },
-            "risk_score_norm": {
-              "type": "float"
-            },
-            "severity": {
-              "type": "long"
-            },
-            "start": {
-              "type": "date"
-            },
-            "timezone": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "fields": {
-          "type": "object"
-        },
-        "file": {
-          "properties": {
-            "ctime": {
-              "type": "date"
-            },
-            "device": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "extension": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "gid": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "group": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "inode": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "mode": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "mtime": {
-              "type": "date"
-            },
-            "origin": {
-              "fields": {
-                "raw": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              },
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "owner": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "selinux": {
-              "properties": {
-                "domain": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "user": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "setgid": {
-              "type": "boolean"
-            },
-            "setuid": {
-              "type": "boolean"
-            },
-            "size": {
-              "type": "long"
-            },
-            "target_path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "uid": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "flow": {
-          "properties": {
-            "complete": {
-              "type": "boolean"
-            },
-            "final": {
-              "type": "boolean"
-            }
-          }
-        },
-        "geo": {
-          "properties": {
-            "city_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "continent_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "country_iso_code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "country_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "location": {
-              "type": "geo_point"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "region_iso_code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "region_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "geoip": {
-          "properties": {
-            "city_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "continent_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "country_iso_code": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "location": {
-              "type": "geo_point"
-            },
-            "region_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "group": {
-          "properties": {
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "hash": {
-          "properties": {
-            "blake2b_256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "blake2b_384": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "blake2b_512": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "md5": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha1": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha224": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha384": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_224": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_384": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha3_512": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha512": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha512_224": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "sha512_256": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "xxh64": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "host": {
-          "properties": {
-            "architecture": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "containerized": {
-              "type": "boolean"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "os": {
-              "properties": {
-                "build": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "codename": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "platform": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "http": {
-          "properties": {
-            "request": {
-              "properties": {
-                "body": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "content": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "method": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "referrer": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "response": {
-              "properties": {
-                "body": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "content": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "status_code": {
-                  "type": "long"
-                }
-              }
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "jolokia": {
-          "properties": {
-            "agent": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "secured": {
-              "type": "boolean"
-            },
-            "server": {
-              "properties": {
-                "product": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "vendor": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "url": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "kubernetes": {
-          "properties": {
-            "annotations": {
-              "type": "object"
-            },
-            "container": {
-              "properties": {
-                "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "deployment": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "labels": {
-              "type": "object"
-            },
-            "namespace": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "node": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "pod": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "uid": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "replicaset": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "statefulset": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "labels": {
-          "type": "object"
-        },
-        "log": {
-          "properties": {
-            "level": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "message": {
-          "norms": false,
-          "type": "text"
-        },
-        "network": {
-          "properties": {
-            "application": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "community_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "direction": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "forwarded_ip": {
-              "type": "ip"
-            },
-            "iana_number": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "protocol": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "transport": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "observer": {
-          "properties": {
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "platform": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "serial_number": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "vendor": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "organization": {
-          "properties": {
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "os": {
-          "properties": {
-            "family": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "full": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "kernel": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "platform": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "process": {
-          "properties": {
-            "args": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "created": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "entity_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "executable": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hash": {
-              "properties": {
-                "sha1": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "pid": {
-              "type": "long"
-            },
-            "ppid": {
-              "type": "long"
-            },
-            "start": {
-              "type": "date"
-            },
-            "thread": {
-              "properties": {
-                "id": {
-                  "type": "long"
-                }
-              }
-            },
-            "title": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "working_directory": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "related": {
-          "properties": {
-            "ip": {
-              "type": "ip"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "service": {
-          "properties": {
-            "ephemeral_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "state": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "type": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "socket": {
-          "properties": {
-            "entity_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "source": {
-          "properties": {
-            "address": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "packets": {
-              "type": "long"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "port": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "email": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "hash": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "system": {
-          "properties": {
-            "audit": {
-              "properties": {
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "boottime": {
-                      "type": "date"
-                    },
-                    "containerized": {
-                      "type": "boolean"
-                    },
-                    "hostname": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "ip": {
-                      "type": "ip"
-                    },
-                    "mac": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "codename": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "kernel": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "name": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "timezone": {
-                      "properties": {
-                        "name": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "offset": {
-                          "properties": {
-                            "sec": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "uptime": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "newsocket": {
-                  "properties": {
-                    "egid": {
-                      "type": "long"
-                    },
-                    "euid": {
-                      "type": "long"
-                    },
-                    "gid": {
-                      "type": "long"
-                    },
-                    "internal_version": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "kernel_sock_address": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "uid": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "package": {
-                  "properties": {
-                    "arch": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "entity_id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "installtime": {
-                      "type": "date"
-                    },
-                    "license": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "release": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "size": {
-                      "type": "long"
-                    },
-                    "summary": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "url": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "socket": {
-                  "properties": {
-                    "egid": {
-                      "type": "long"
-                    },
-                    "euid": {
-                      "type": "long"
-                    },
-                    "gid": {
-                      "type": "long"
-                    },
-                    "internal_version": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "kernel_sock_address": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "uid": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "user": {
-                  "properties": {
-                    "dir": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "gid": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "group": {
-                      "properties": {
-                        "gid": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        },
-                        "name": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "password": {
-                      "properties": {
-                        "last_changed": {
-                          "type": "date"
-                        },
-                        "type": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "shell": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "uid": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "user_information": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "tags": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
-        "url": {
-          "properties": {
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "fragment": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "full": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "password": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "path": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "port": {
-              "type": "long"
-            },
-            "query": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "scheme": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "username": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "user": {
-          "properties": {
-            "audit": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "effective": {
-              "properties": {
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "email": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "entity_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "filesystem": {
-              "properties": {
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "full_name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "group": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "hash": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name_map": {
-              "type": "object"
-            },
-            "saved": {
-              "properties": {
-                "group": {
-                  "properties": {
-                    "id": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "selinux": {
-              "properties": {
-                "category": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "domain": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "level": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "role": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "user": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "terminal": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        },
-        "user_agent": {
-          "properties": {
-            "device": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "original": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "full": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "kernel": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "platform": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "version": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "version": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "lifecycle": {
-          "indexing_complete": "true",
-          "name": "auditbeat-8.0.0",
-          "rollover_alias": "auditbeat-8.0.0"
-        },
-        "mapping": {
-          "total_fields": {
-            "limit": "10000"
-          }
-        },
-        "number_of_replicas": "0",
-        "number_of_shards": "1",
-        "query": {
-          "default_field": [
-            "message",
-            "tags",
-            "agent.ephemeral_id",
-            "agent.id",
-            "agent.name",
-            "agent.type",
-            "agent.version",
-            "client.address",
-            "client.domain",
-            "client.geo.city_name",
-            "client.geo.continent_name",
-            "client.geo.country_iso_code",
-            "client.geo.country_name",
-            "client.geo.name",
-            "client.geo.region_iso_code",
-            "client.geo.region_name",
-            "client.mac",
-            "client.user.email",
-            "client.user.full_name",
-            "client.user.group.id",
-            "client.user.group.name",
-            "client.user.hash",
-            "client.user.id",
-            "client.user.name",
-            "cloud.account.id",
-            "cloud.availability_zone",
-            "cloud.instance.id",
-            "cloud.instance.name",
-            "cloud.machine.type",
-            "cloud.provider",
-            "cloud.region",
-            "container.id",
-            "container.image.name",
-            "container.image.tag",
-            "container.name",
-            "container.runtime",
-            "destination.address",
-            "destination.domain",
-            "destination.geo.city_name",
-            "destination.geo.continent_name",
-            "destination.geo.country_iso_code",
-            "destination.geo.country_name",
-            "destination.geo.name",
-            "destination.geo.region_iso_code",
-            "destination.geo.region_name",
-            "destination.mac",
-            "destination.user.email",
-            "destination.user.full_name",
-            "destination.user.group.id",
-            "destination.user.group.name",
-            "destination.user.hash",
-            "destination.user.id",
-            "destination.user.name",
-            "ecs.version",
-            "error.code",
-            "error.id",
-            "error.message",
-            "event.action",
-            "event.category",
-            "event.dataset",
-            "event.hash",
-            "event.id",
-            "event.kind",
-            "event.module",
-            "event.original",
-            "event.outcome",
-            "event.timezone",
-            "event.type",
-            "file.device",
-            "file.extension",
-            "file.gid",
-            "file.group",
-            "file.inode",
-            "file.mode",
-            "file.owner",
-            "file.path",
-            "file.target_path",
-            "file.type",
-            "file.uid",
-            "geo.city_name",
-            "geo.continent_name",
-            "geo.country_iso_code",
-            "geo.country_name",
-            "geo.name",
-            "geo.region_iso_code",
-            "geo.region_name",
-            "group.id",
-            "group.name",
-            "host.architecture",
-            "host.geo.city_name",
-            "host.geo.continent_name",
-            "host.geo.country_iso_code",
-            "host.geo.country_name",
-            "host.geo.name",
-            "host.geo.region_iso_code",
-            "host.geo.region_name",
-            "host.hostname",
-            "host.id",
-            "host.mac",
-            "host.name",
-            "host.os.family",
-            "host.os.full",
-            "host.os.kernel",
-            "host.os.name",
-            "host.os.platform",
-            "host.os.version",
-            "host.type",
-            "host.user.email",
-            "host.user.full_name",
-            "host.user.group.id",
-            "host.user.group.name",
-            "host.user.hash",
-            "host.user.id",
-            "host.user.name",
-            "http.request.body.content",
-            "http.request.method",
-            "http.request.referrer",
-            "http.response.body.content",
-            "http.version",
-            "log.level",
-            "log.original",
-            "network.application",
-            "network.community_id",
-            "network.direction",
-            "network.iana_number",
-            "network.name",
-            "network.protocol",
-            "network.transport",
-            "network.type",
-            "observer.geo.city_name",
-            "observer.geo.continent_name",
-            "observer.geo.country_iso_code",
-            "observer.geo.country_name",
-            "observer.geo.name",
-            "observer.geo.region_iso_code",
-            "observer.geo.region_name",
-            "observer.hostname",
-            "observer.mac",
-            "observer.os.family",
-            "observer.os.full",
-            "observer.os.kernel",
-            "observer.os.name",
-            "observer.os.platform",
-            "observer.os.version",
-            "observer.serial_number",
-            "observer.type",
-            "observer.vendor",
-            "observer.version",
-            "organization.id",
-            "organization.name",
-            "os.family",
-            "os.full",
-            "os.kernel",
-            "os.name",
-            "os.platform",
-            "os.version",
-            "process.args",
-            "process.executable",
-            "process.name",
-            "process.title",
-            "process.working_directory",
-            "server.address",
-            "server.domain",
-            "server.geo.city_name",
-            "server.geo.continent_name",
-            "server.geo.country_iso_code",
-            "server.geo.country_name",
-            "server.geo.name",
-            "server.geo.region_iso_code",
-            "server.geo.region_name",
-            "server.mac",
-            "server.user.email",
-            "server.user.full_name",
-            "server.user.group.id",
-            "server.user.group.name",
-            "server.user.hash",
-            "server.user.id",
-            "server.user.name",
-            "service.ephemeral_id",
-            "service.id",
-            "service.name",
-            "service.state",
-            "service.type",
-            "service.version",
-            "source.address",
-            "source.domain",
-            "source.geo.city_name",
-            "source.geo.continent_name",
-            "source.geo.country_iso_code",
-            "source.geo.country_name",
-            "source.geo.name",
-            "source.geo.region_iso_code",
-            "source.geo.region_name",
-            "source.mac",
-            "source.user.email",
-            "source.user.full_name",
-            "source.user.group.id",
-            "source.user.group.name",
-            "source.user.hash",
-            "source.user.id",
-            "source.user.name",
-            "url.domain",
-            "url.fragment",
-            "url.full",
-            "url.original",
-            "url.password",
-            "url.path",
-            "url.query",
-            "url.scheme",
-            "url.username",
-            "user.email",
-            "user.full_name",
-            "user.group.id",
-            "user.group.name",
-            "user.hash",
-            "user.id",
-            "user.name",
-            "user_agent.device.name",
-            "user_agent.name",
-            "user_agent.original",
-            "user_agent.os.family",
-            "user_agent.os.full",
-            "user_agent.os.kernel",
-            "user_agent.os.name",
-            "user_agent.os.platform",
-            "user_agent.os.version",
-            "user_agent.version",
-            "agent.hostname",
-            "error.type",
-            "cloud.project.id",
-            "host.os.build",
-            "kubernetes.pod.name",
-            "kubernetes.pod.uid",
-            "kubernetes.namespace",
-            "kubernetes.node.name",
-            "kubernetes.replicaset.name",
-            "kubernetes.deployment.name",
-            "kubernetes.statefulset.name",
-            "kubernetes.container.name",
-            "kubernetes.container.image",
-            "jolokia.agent.version",
-            "jolokia.agent.id",
-            "jolokia.server.product",
-            "jolokia.server.version",
-            "jolokia.server.vendor",
-            "jolokia.url",
-            "raw",
-            "file.origin",
-            "file.selinux.user",
-            "file.selinux.role",
-            "file.selinux.domain",
-            "file.selinux.level",
-            "user.audit.id",
-            "user.audit.name",
-            "user.effective.id",
-            "user.effective.name",
-            "user.effective.group.id",
-            "user.effective.group.name",
-            "user.filesystem.id",
-            "user.filesystem.name",
-            "user.filesystem.group.id",
-            "user.filesystem.group.name",
-            "user.saved.id",
-            "user.saved.name",
-            "user.saved.group.id",
-            "user.saved.group.name",
-            "user.selinux.user",
-            "user.selinux.role",
-            "user.selinux.domain",
-            "user.selinux.level",
-            "user.selinux.category",
-            "source.path",
-            "destination.path",
-            "auditd.message_type",
-            "auditd.session",
-            "auditd.result",
-            "auditd.summary.actor.primary",
-            "auditd.summary.actor.secondary",
-            "auditd.summary.object.type",
-            "auditd.summary.object.primary",
-            "auditd.summary.object.secondary",
-            "auditd.summary.how",
-            "auditd.paths.inode",
-            "auditd.paths.dev",
-            "auditd.paths.obj_user",
-            "auditd.paths.obj_role",
-            "auditd.paths.obj_domain",
-            "auditd.paths.obj_level",
-            "auditd.paths.objtype",
-            "auditd.paths.ouid",
-            "auditd.paths.rdev",
-            "auditd.paths.nametype",
-            "auditd.paths.ogid",
-            "auditd.paths.item",
-            "auditd.paths.mode",
-            "auditd.paths.name",
-            "auditd.data.action",
-            "auditd.data.minor",
-            "auditd.data.acct",
-            "auditd.data.addr",
-            "auditd.data.cipher",
-            "auditd.data.id",
-            "auditd.data.entries",
-            "auditd.data.kind",
-            "auditd.data.ksize",
-            "auditd.data.spid",
-            "auditd.data.arch",
-            "auditd.data.argc",
-            "auditd.data.major",
-            "auditd.data.unit",
-            "auditd.data.table",
-            "auditd.data.terminal",
-            "auditd.data.grantors",
-            "auditd.data.direction",
-            "auditd.data.op",
-            "auditd.data.tty",
-            "auditd.data.syscall",
-            "auditd.data.data",
-            "auditd.data.family",
-            "auditd.data.mac",
-            "auditd.data.pfs",
-            "auditd.data.items",
-            "auditd.data.a0",
-            "auditd.data.a1",
-            "auditd.data.a2",
-            "auditd.data.a3",
-            "auditd.data.hostname",
-            "auditd.data.lport",
-            "auditd.data.rport",
-            "auditd.data.exit",
-            "auditd.data.fp",
-            "auditd.data.laddr",
-            "auditd.data.sport",
-            "auditd.data.capability",
-            "auditd.data.nargs",
-            "auditd.data.new-enabled",
-            "auditd.data.audit_backlog_limit",
-            "auditd.data.dir",
-            "auditd.data.cap_pe",
-            "auditd.data.model",
-            "auditd.data.new_pp",
-            "auditd.data.old-enabled",
-            "auditd.data.oauid",
-            "auditd.data.old",
-            "auditd.data.banners",
-            "auditd.data.feature",
-            "auditd.data.vm-ctx",
-            "auditd.data.opid",
-            "auditd.data.seperms",
-            "auditd.data.seresult",
-            "auditd.data.new-rng",
-            "auditd.data.old-net",
-            "auditd.data.sigev_signo",
-            "auditd.data.ino",
-            "auditd.data.old_enforcing",
-            "auditd.data.old-vcpu",
-            "auditd.data.range",
-            "auditd.data.res",
-            "auditd.data.added",
-            "auditd.data.fam",
-            "auditd.data.nlnk-pid",
-            "auditd.data.subj",
-            "auditd.data.a[0-3]",
-            "auditd.data.cgroup",
-            "auditd.data.kernel",
-            "auditd.data.ocomm",
-            "auditd.data.new-net",
-            "auditd.data.permissive",
-            "auditd.data.class",
-            "auditd.data.compat",
-            "auditd.data.fi",
-            "auditd.data.changed",
-            "auditd.data.msg",
-            "auditd.data.dport",
-            "auditd.data.new-seuser",
-            "auditd.data.invalid_context",
-            "auditd.data.dmac",
-            "auditd.data.ipx-net",
-            "auditd.data.iuid",
-            "auditd.data.macproto",
-            "auditd.data.obj",
-            "auditd.data.ipid",
-            "auditd.data.new-fs",
-            "auditd.data.vm-pid",
-            "auditd.data.cap_pi",
-            "auditd.data.old-auid",
-            "auditd.data.oses",
-            "auditd.data.fd",
-            "auditd.data.igid",
-            "auditd.data.new-disk",
-            "auditd.data.parent",
-            "auditd.data.len",
-            "auditd.data.oflag",
-            "auditd.data.uuid",
-            "auditd.data.code",
-            "auditd.data.nlnk-grp",
-            "auditd.data.cap_fp",
-            "auditd.data.new-mem",
-            "auditd.data.seperm",
-            "auditd.data.enforcing",
-            "auditd.data.new-chardev",
-            "auditd.data.old-rng",
-            "auditd.data.outif",
-            "auditd.data.cmd",
-            "auditd.data.hook",
-            "auditd.data.new-level",
-            "auditd.data.sauid",
-            "auditd.data.sig",
-            "auditd.data.audit_backlog_wait_time",
-            "auditd.data.printer",
-            "auditd.data.old-mem",
-            "auditd.data.perm",
-            "auditd.data.old_pi",
-            "auditd.data.state",
-            "auditd.data.format",
-            "auditd.data.new_gid",
-            "auditd.data.tcontext",
-            "auditd.data.maj",
-            "auditd.data.watch",
-            "auditd.data.device",
-            "auditd.data.grp",
-            "auditd.data.bool",
-            "auditd.data.icmp_type",
-            "auditd.data.new_lock",
-            "auditd.data.old_prom",
-            "auditd.data.acl",
-            "auditd.data.ip",
-            "auditd.data.new_pi",
-            "auditd.data.default-context",
-            "auditd.data.inode_gid",
-            "auditd.data.new-log_passwd",
-            "auditd.data.new_pe",
-            "auditd.data.selected-context",
-            "auditd.data.cap_fver",
-            "auditd.data.file",
-            "auditd.data.net",
-            "auditd.data.virt",
-            "auditd.data.cap_pp",
-            "auditd.data.old-range",
-            "auditd.data.resrc",
-            "auditd.data.new-range",
-            "auditd.data.obj_gid",
-            "auditd.data.proto",
-            "auditd.data.old-disk",
-            "auditd.data.audit_failure",
-            "auditd.data.inif",
-            "auditd.data.vm",
-            "auditd.data.flags",
-            "auditd.data.nlnk-fam",
-            "auditd.data.old-fs",
-            "auditd.data.old-ses",
-            "auditd.data.seqno",
-            "auditd.data.fver",
-            "auditd.data.qbytes",
-            "auditd.data.seuser",
-            "auditd.data.cap_fe",
-            "auditd.data.new-vcpu",
-            "auditd.data.old-level",
-            "auditd.data.old_pp",
-            "auditd.data.daddr",
-            "auditd.data.old-role",
-            "auditd.data.ioctlcmd",
-            "auditd.data.smac",
-            "auditd.data.apparmor",
-            "auditd.data.fe",
-            "auditd.data.perm_mask",
-            "auditd.data.ses",
-            "auditd.data.cap_fi",
-            "auditd.data.obj_uid",
-            "auditd.data.reason",
-            "auditd.data.list",
-            "auditd.data.old_lock",
-            "auditd.data.bus",
-            "auditd.data.old_pe",
-            "auditd.data.new-role",
-            "auditd.data.prom",
-            "auditd.data.uri",
-            "auditd.data.audit_enabled",
-            "auditd.data.old-log_passwd",
-            "auditd.data.old-seuser",
-            "auditd.data.per",
-            "auditd.data.scontext",
-            "auditd.data.tclass",
-            "auditd.data.ver",
-            "auditd.data.new",
-            "auditd.data.val",
-            "auditd.data.img-ctx",
-            "auditd.data.old-chardev",
-            "auditd.data.old_val",
-            "auditd.data.success",
-            "auditd.data.inode_uid",
-            "auditd.data.removed",
-            "auditd.data.socket.port",
-            "auditd.data.socket.saddr",
-            "auditd.data.socket.addr",
-            "auditd.data.socket.family",
-            "auditd.data.socket.path",
-            "geoip.continent_name",
-            "geoip.city_name",
-            "geoip.region_name",
-            "geoip.country_iso_code",
-            "hash.blake2b_256",
-            "hash.blake2b_384",
-            "hash.blake2b_512",
-            "hash.md5",
-            "hash.sha1",
-            "hash.sha224",
-            "hash.sha256",
-            "hash.sha384",
-            "hash.sha3_224",
-            "hash.sha3_256",
-            "hash.sha3_384",
-            "hash.sha3_512",
-            "hash.sha512",
-            "hash.sha512_224",
-            "hash.sha512_256",
-            "hash.xxh64",
-            "event.origin",
-            "user.entity_id",
-            "user.terminal",
-            "process.entity_id",
-            "socket.entity_id",
-            "system.audit.host.timezone.name",
-            "system.audit.host.hostname",
-            "system.audit.host.id",
-            "system.audit.host.architecture",
-            "system.audit.host.mac",
-            "system.audit.host.os.platform",
-            "system.audit.host.os.name",
-            "system.audit.host.os.family",
-            "system.audit.host.os.version",
-            "system.audit.host.os.kernel",
-            "system.audit.package.entity_id",
-            "system.audit.package.name",
-            "system.audit.package.version",
-            "system.audit.package.release",
-            "system.audit.package.arch",
-            "system.audit.package.license",
-            "system.audit.package.summary",
-            "system.audit.package.url",
-            "system.audit.user.name",
-            "system.audit.user.uid",
-            "system.audit.user.gid",
-            "system.audit.user.dir",
-            "system.audit.user.shell",
-            "system.audit.user.user_information",
-            "system.audit.user.password.type",
-            "fields.*"
-          ]
-        },
-        "refresh_interval": "5s"
-      }
-    }
-  }
-}
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions3/data.json.gz b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions3/data.json.gz
deleted file mode 100644
index b378aa64d5ec8..0000000000000
Binary files a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions3/data.json.gz and /dev/null differ
diff --git a/x-pack/test/security_solution_cypress/es_archives/exceptions/data.json b/x-pack/test/security_solution_cypress/es_archives/exceptions/data.json
index bc3c1c302c685..f8152c27084df 100644
--- a/x-pack/test/security_solution_cypress/es_archives/exceptions/data.json
+++ b/x-pack/test/security_solution_cypress/es_archives/exceptions/data.json
@@ -6,7 +6,7 @@
     "source": {
       "@timestamp": "2019-09-01T00:41:06.527Z",
       "agent": {
-        "name": "bond"
+        "name": "foo"
       },
       "unique_value": {
         "test": "test field"
diff --git a/x-pack/test/security_solution_cypress/es_archives/exceptions_2/data.json b/x-pack/test/security_solution_cypress/es_archives/exceptions_2/data.json
new file mode 100644
index 0000000000000..ae2e267abc7cf
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/es_archives/exceptions_2/data.json
@@ -0,0 +1,26 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "_aZE5nwBOpWiDweSth_E",
+    "index": "exceptions-0001",
+    "source": {
+      "@timestamp": "2019-09-02T00:41:06.527Z",
+      "agent": {
+        "name": "foo"
+      },
+      "unique_value": {
+        "test": "test field 2"
+      },
+      "user" : [ 
+        {
+          "name" : "foo",
+          "id" :  "123"
+        },
+        {
+          "name" : "bar",
+          "id" :  "456"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/security_solution_cypress/es_archives/exceptions_2/mappings.json b/x-pack/test/security_solution_cypress/es_archives/exceptions_2/mappings.json
new file mode 100644
index 0000000000000..3b5cc2dae545c
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/es_archives/exceptions_2/mappings.json
@@ -0,0 +1,50 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      "exceptions": {
+        "is_write_index": false
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "5s"
+      }
+    },
+    "index": "exceptions-0001",
+    "mappings": {
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "unique_value": {
+          "properties": {
+            "test": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "type": "nested",
+          "properties": {
+            "first": {
+              "type": "keyword"
+            },
+            "last": {
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 3a49278bd21a8..368783b0efd1c 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import {
@@ -13,7 +14,6 @@ import {
   deleteAllDocsFromMetadataCurrentIndex,
   deleteAllDocsFromMetadataUnitedIndex,
 } from '../../../security_solution_endpoint_api_int/apis/data_stream_helper';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'endpoint', 'header', 'endpointPageUtils']);
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
index b27dc32725f03..60d7052984166 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../../common/services/security_solution';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const PageObjects = getPageObjects(['security', 'endpoint', 'detections', 'hosts']);
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/fleet_integrations.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/fleet_integrations.ts
index 4f9b7ad7c0401..ea5746060dedc 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/fleet_integrations.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/fleet_integrations.ts
@@ -48,7 +48,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       it('should show the Trusted Apps page when link is clicked', async () => {
         await (await fleetIntegrations.findIntegrationDetailCustomTab()).click();
         await (await testSubjects.find('trustedApps-artifactsLink')).click();
-        await trustedApps.ensureIsOnTrustedAppsListPage();
+        await trustedApps.ensureIsOnTrustedAppsEmptyPage();
       });
     });
   });
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
index 70d60ba5c1b67..e57895f4f32b7 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getRegistryUrl as getRegistryUrlFromIngest } from '../../../../plugins/fleet/server';
+import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   isRegistryEnabled,
@@ -16,6 +16,7 @@ export default function (providerContext: FtrProviderContext) {
   const { loadTestFile, getService } = providerContext;
 
   describe('endpoint', function () {
+    this.tags('ciGroup7');
     const ingestManager = getService('ingestManager');
     const log = getService('log');
     const endpointTestResources = getService('endpointTestResources');
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index cd56755192fa0..9bf6a19b4a589 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { popupVersionsMap } from '@kbn/security-solution-plugin/public/management/pages/policy/view/policy_forms/protections/popup_options_to_versions';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
-import { popupVersionsMap } from '../../../../plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/popup_options_to_versions';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const browser = getService('browser');
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
index 9476d20ccb4b0..4643b91303be0 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'trustedApps']);
@@ -37,18 +37,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       const SHA256 = 'A4370C0CF81686C0B696FA6261c9d3e0d810ae704ab8301839dffd5d5112f476';
 
       // Add it
-      await testSubjects.click('trustedAppsListAddButton');
-      await testSubjects.setValue(
-        'addTrustedAppFlyout-createForm-nameTextField',
-        'Windows Defender'
-      );
-      await testSubjects.setValue(
-        'addTrustedAppFlyout-createForm-conditionsBuilder-group1-entry0-value',
-        SHA256
-      );
-      await testSubjects.click('addTrustedAppFlyout-createButton');
+      await testSubjects.click('trustedAppsListPage-emptyState-addButton');
+      await testSubjects.setValue('trustedApps-form-nameTextField', 'Windows Defender');
+      await testSubjects.setValue('trustedApps-form-conditionsBuilder-group1-entry0-value', SHA256);
+      await testSubjects.click('trustedAppsListPage-flyout-submitButton');
       expect(
-        await testSubjects.getVisibleText('trustedAppCard-criteriaConditions-condition')
+        await testSubjects.getVisibleText('trustedAppsListPage-card-criteriaConditions-condition')
       ).to.equal(
         'AND process.hash.*IS a4370c0cf81686c0b696fa6261c9d3e0d810ae704ab8301839dffd5d5112f476'
       );
@@ -61,11 +55,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
       // Remove it
       await pageObjects.trustedApps.clickCardActionMenu();
-      await testSubjects.click('deleteTrustedAppAction');
-      await testSubjects.click('trustedAppDeletionConfirm');
-      await testSubjects.waitForDeleted('trustedAppDeletionConfirm');
+      await testSubjects.click('trustedAppsListPage-card-cardDeleteAction');
+      await testSubjects.click('trustedAppsListPage-deleteModal-submitButton');
+      await testSubjects.waitForDeleted('trustedAppsListPage-deleteModal-submitButton');
       // We only expect one trusted app to have been visible
-      await testSubjects.missingOrFail('trustedAppCard');
+      await testSubjects.missingOrFail('trustedAppsListPage-card');
       // Header has gone because there is no trusted app
       await testSubjects.missingOrFail('header-page-title');
     });
diff --git a/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
index f0c0de05b5460..d4e2479d24bc7 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function EndpointPageProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts b/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
index 81e868c5a38cb..b068ba59940a4 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../plugins/fleet/common';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
 
 // NOTE: import path below should be the deep path to the actual module - else we get CI errors
-import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths';
+import { pagePathGetters } from '@kbn/fleet-plugin/public/constants/page_paths';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function FleetIntegrations({ getService, getPageObjects }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
diff --git a/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts b/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
index 1678358acc11e..7dc2e84358f54 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
@@ -24,7 +24,11 @@ export function TrustedAppsPageProvider({ getService, getPageObjects }: FtrProvi
      * ensures that the Policy Page is the currently display view
      */
     async ensureIsOnTrustedAppsListPage() {
-      await testSubjects.existOrFail('trustedAppsListPage');
+      await testSubjects.existOrFail('trustedAppsListPage-list');
+    },
+
+    async ensureIsOnTrustedAppsEmptyPage() {
+      await testSubjects.existOrFail('trustedAppsListPage-emptyState');
     },
 
     /**
@@ -41,7 +45,7 @@ export function TrustedAppsPageProvider({ getService, getPageObjects }: FtrProvi
      */
     async clickCardActionMenu() {
       await this.ensureIsOnTrustedAppsListPage();
-      await testSubjects.click('trustedAppCard-header-actions-button');
+      await testSubjects.click('trustedAppsListPage-card-header-actions-button');
     },
   };
 }
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint.ts b/x-pack/test/security_solution_endpoint/services/endpoint.ts
index 2fd03ca51e346..27dcd67c6d684 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint.ts
@@ -7,22 +7,22 @@
 
 import { errors } from '@elastic/elasticsearch';
 import { Client } from '@elastic/elasticsearch';
-import { FtrService } from '../../functional/ftr_provider_context';
 import {
   metadataCurrentIndexPattern,
   metadataTransformPrefix,
   METADATA_UNITED_INDEX,
-} from '../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   deleteIndexedHostsAndAlerts,
   IndexedHostsAndAlertsResponse,
   indexHostsAndAlerts,
-} from '../../../plugins/security_solution/common/endpoint/index_data';
-import { TransformConfigUnion } from '../../../plugins/transform/common/types/transform';
-import { GetTransformsResponseSchema } from '../../../plugins/transform/common/api_schemas/transforms';
-import { catchAndWrapError } from '../../../plugins/security_solution/server/endpoint/utils';
-import { installOrUpgradeEndpointFleetPackage } from '../../../plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint';
-import { EndpointError } from '../../../plugins/security_solution/common/endpoint/errors';
+} from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { TransformConfigUnion } from '@kbn/transform-plugin/common/types/transform';
+import { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { catchAndWrapError } from '@kbn/security-solution-plugin/server/endpoint/utils';
+import { installOrUpgradeEndpointFleetPackage } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/setup_fleet_for_endpoint';
+import { EndpointError } from '@kbn/security-solution-plugin/common/endpoint/errors';
+import { FtrService } from '../../functional/ftr_provider_context';
 
 export class EndpointTestResources extends FtrService {
   private readonly esClient = this.ctx.getService('es');
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts b/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
index f304e110df266..9c97072d1020b 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
@@ -12,13 +12,13 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { Response } from 'superagent';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/trusted_apps/constants';
+import { EndpointError } from '@kbn/security-solution-plugin/common/endpoint/errors';
+import { EVENT_FILTER_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/event_filters/constants';
+import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/host_isolation_exceptions/constants';
+import { BLOCKLISTS_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/blocklist/constants';
 import { FtrService } from '../../functional/ftr_provider_context';
-import { ExceptionsListItemGenerator } from '../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
-import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/trusted_apps/constants';
-import { EndpointError } from '../../../plugins/security_solution/common/endpoint/errors';
-import { EVENT_FILTER_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/event_filters/constants';
-import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/host_isolation_exceptions/constants';
-import { BLOCKLISTS_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/blocklist/constants';
 
 export interface ArtifactTestData {
   artifact: ExceptionListItemSchema;
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
index a376072cddb3c..8c2e7abc6e9a4 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -6,7 +6,6 @@
  */
 
 import uuid from 'uuid';
-import { FtrProviderContext } from '../ftr_provider_context';
 import {
   CreateAgentPolicyRequest,
   CreateAgentPolicyResponse,
@@ -18,13 +17,14 @@ import {
   GetPackagePoliciesResponse,
   GetFullAgentPolicyResponse,
   GetPackagesResponse,
-} from '../../../plugins/fleet/common';
-import { policyFactory } from '../../../plugins/security_solution/common/endpoint/models/policy_config';
-import { Immutable } from '../../../plugins/security_solution/common/endpoint/types';
+} from '@kbn/fleet-plugin/common';
+import { policyFactory } from '@kbn/security-solution-plugin/common/endpoint/models/policy_config';
+import { Immutable } from '@kbn/security-solution-plugin/common/endpoint/types';
 
 // NOTE: import path below should be the deep path to the actual module - else we get CI errors
-import { pkgKeyFromPackageInfo } from '../../../plugins/fleet/public/services/pkg_key_from_package_info';
-import { EndpointError } from '../../../plugins/security_solution/common/endpoint/errors';
+import { pkgKeyFromPackageInfo } from '@kbn/fleet-plugin/public/services/pkg_key_from_package_info';
+import { EndpointError } from '@kbn/security-solution-plugin/common/endpoint/errors';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 const INGEST_API_ROOT = '/api/fleet';
 const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts b/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts
index 63e9430679f80..d6d759d3830f5 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { AGENTS_INDEX } from '../../../plugins/fleet/common';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
 import {
   metadataIndexPattern,
   eventsIndexPattern,
@@ -16,7 +16,7 @@ import {
   telemetryIndexPattern,
   METADATA_UNITED_INDEX,
   METADATA_DATASTREAM,
-} from '../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
 
 export function deleteDataStream(getService: (serviceName: 'es') => Client, index: string) {
   const client = getService('es');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
index 5f58eb40c0956..68b2cef5b1319 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
@@ -8,14 +8,14 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services//endpoint_artifacts';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
-} from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
+} from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   createUserAndRole,
   deleteUserAndRole,
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
index 8ef3aaf9509dd..517c090605a85 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
@@ -8,20 +8,20 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
+import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import {
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
 import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
-import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../../common/services/security_solution';
-import {
-  getImportExceptionsListSchemaMock,
-  toNdJsonString,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
index 5e1166d03f0d5..acbc72b479544 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
@@ -8,23 +8,23 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
-} from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
+} from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import {
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../../common/services/security_solution';
-import {
-  getImportExceptionsListSchemaMock,
-  toNdJsonString,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
 
 export default function ({ getService }: FtrProviderContext) {
   const USER = ROLES.detections_admin;
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
index 60b479c5b37d9..041b0ea5794fb 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
@@ -8,14 +8,14 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services//endpoint_artifacts';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
-} from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
+} from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   createUserAndRole,
   deleteUserAndRole,
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts
index 1b9ce8911c5bf..f560103c6c862 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { wrapErrorAndRejectPromise } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/utils';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { IndexedHostsAndAlertsResponse } from '../../../plugins/security_solution/common/endpoint/index_data';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../common/services/security_solution';
-import { wrapErrorAndRejectPromise } from '../../../plugins/security_solution/common/endpoint/data_loaders/utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const endpointTestResources = getService('endpointTestResources');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/index.ts b/x-pack/test/security_solution_endpoint_api_int/apis/index.ts
index 94a5a9122f187..3c98b703aed55 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/index.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/index.ts
@@ -5,14 +5,16 @@
  * 2.0.
  */
 
+import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { isRegistryEnabled, getRegistryUrlFromTestEnv } from '../registry';
-import { getRegistryUrl as getRegistryUrlFromIngest } from '../../../plugins/fleet/server';
 
 export default function endpointAPIIntegrationTests(providerContext: FtrProviderContext) {
   const { loadTestFile, getService } = providerContext;
 
   describe('Endpoint plugin', function () {
+    this.tags('ciGroup9');
+
     const ingestManager = getService('ingestManager');
 
     const log = getService('log');
@@ -27,7 +29,7 @@ export default function endpointAPIIntegrationTests(providerContext: FtrProvider
     before(async () => {
       await ingestManager.setup();
     });
-    loadTestFile(require.resolve('./resolver/index'));
+    loadTestFile(require.resolve('./resolver'));
     loadTestFile(require.resolve('./metadata'));
     loadTestFile(require.resolve('./policy'));
     loadTestFile(require.resolve('./package'));
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
index 86c8e32f3bdf9..9b023e6992385 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
@@ -8,7 +8,18 @@
 import uuid from 'uuid';
 import expect from '@kbn/expect';
 import { TransformGetTransformStatsTransformStats } from '@elastic/elasticsearch/lib/api/types';
-import { FtrProviderContext } from '../ftr_provider_context';
+import {
+  METADATA_DATASTREAM,
+  HOST_METADATA_LIST_ROUTE,
+  METADATA_UNITED_INDEX,
+  METADATA_UNITED_TRANSFORM,
+  METADATA_TRANSFORMS_STATUS_ROUTE,
+  metadataTransformPrefix,
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
+import { indexFleetEndpointPolicy } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/index_fleet_endpoint_policy';
+import { TRANSFORM_STATES } from '@kbn/security-solution-plugin/common/constants';
+import { generateAgentDocs, generateMetadataDocs } from './metadata.fixtures';
 import {
   deleteAllDocsFromMetadataCurrentIndex,
   deleteAllDocsFromMetadataDatastream,
@@ -20,18 +31,7 @@ import {
   deleteAllDocsFromIndex,
   bulkIndex,
 } from './data_stream_helper';
-import {
-  METADATA_DATASTREAM,
-  HOST_METADATA_LIST_ROUTE,
-  METADATA_UNITED_INDEX,
-  METADATA_UNITED_TRANSFORM,
-  METADATA_TRANSFORMS_STATUS_ROUTE,
-  metadataTransformPrefix,
-} from '../../../plugins/security_solution/common/endpoint/constants';
-import { AGENTS_INDEX } from '../../../plugins/fleet/common';
-import { generateAgentDocs, generateMetadataDocs } from './metadata.fixtures';
-import { indexFleetEndpointPolicy } from '../../../plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy';
-import { TRANSFORM_STATES } from '../../../plugins/security_solution/common/constants';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
index db993d8c47205..9df605fa32a04 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 import {
   ResolverPaginatedEvents,
   SafeEndpointEvent,
-} from '../../../plugins/security_solution/common/endpoint/types';
-import { eventsIndexPattern } from '../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/types';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   EndpointDocGenerator,
   Event,
-} from '../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { InsertedEvents, processEventsIndex } from '../services/resolver';
 import { deleteEventsStream } from './data_stream_helper';
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
index 7c8c73c2771c3..6c1ee98a153e4 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
@@ -7,27 +7,27 @@
 
 import _ from 'lodash';
 import expect from '@kbn/expect';
-import { firstNonNullValue } from '../../../../plugins/security_solution/common/endpoint/models/ecs_safety_helpers';
-import { NodeID } from '../../../../plugins/security_solution/server/endpoint/routes/resolver/tree/utils';
+import { firstNonNullValue } from '@kbn/security-solution-plugin/common/endpoint/models/ecs_safety_helpers';
+import { NodeID } from '@kbn/security-solution-plugin/server/endpoint/routes/resolver/tree/utils';
 import {
   SafeResolverEvent,
   ResolverNode,
   ResolverSchema,
-} from '../../../../plugins/security_solution/common/endpoint/types';
+} from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   parentEntityIDSafeVersion,
   entityIDSafeVersion,
   eventIDSafeVersion,
   timestampSafeVersion,
   timestampAsDateSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
 import {
   Event,
   Tree,
   TreeNode,
   RelatedEventInfo,
   categoryMapping,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
 
 /**
  * Schema used for the /tree api post requests that uses the ancestry
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts
index 2c9269c76ddb7..268f67a30a918 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants';
-import { ResolverEntityIndex } from '../../../../plugins/security_solution/common/endpoint/types';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
+import { ResolverEntityIndex } from '@kbn/security-solution-plugin/common/endpoint/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts
index e75a3460c6af2..6cf74092caf9e 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts
@@ -9,17 +9,17 @@ import expect from '@kbn/expect';
 import {
   entityIDSafeVersion,
   timestampAsDateSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
-import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   ResolverEntityIndex,
   ResolverNode,
-} from '../../../../plugins/security_solution/common/endpoint/types';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   EndpointDocGenerator,
   Event,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { InsertedEvents, processEventsIndex } from '../../services/resolver';
 import { createAncestryArray, schemaWithAncestry } from './common';
 
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
index 81299e1cc7e2b..10cac58533b24 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
@@ -7,18 +7,18 @@
 
 import expect from '@kbn/expect';
 import { JsonObject } from '@kbn/utility-types';
-import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   eventIDSafeVersion,
   parentEntityIDSafeVersion,
   timestampAsDateSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
-import { ResolverPaginatedEvents } from '../../../../plugins/security_solution/common/endpoint/types';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
+import { ResolverPaginatedEvents } from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   Tree,
   RelatedEventCategory,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { Options, GeneratedTrees } from '../../services/resolver';
 import { compareArrays } from './common';
 
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
index 1da80619cdcc7..e4838b49f7ca1 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
@@ -6,17 +6,17 @@
  */
 
 import expect from '@kbn/expect';
-import { getNameField } from '../../../../plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch';
-import { ResolverNode } from '../../../../plugins/security_solution/common/endpoint/types';
+import { getNameField } from '@kbn/security-solution-plugin/server/endpoint/routes/resolver/tree/utils/fetch';
+import { ResolverNode } from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   parentEntityIDSafeVersion,
   timestampSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
 import {
   Tree,
   RelatedEventCategory,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { Options, GeneratedTrees } from '../../services/resolver';
 import { schemaWithAncestry, schemaWithName, schemaWithoutAncestry, verifyTree } from './common';
 
diff --git a/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts b/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts
index 586de1f1276ee..3c744390dd146 100644
--- a/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts
@@ -10,8 +10,8 @@ import {
   Tree,
   EndpointDocGenerator,
   Event,
-} from '../../../plugins/security_solution/common/endpoint/generate_data';
-import { firstNonNullValue } from '../../../plugins/security_solution/common/endpoint/models/ecs_safety_helpers';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { firstNonNullValue } from '@kbn/security-solution-plugin/common/endpoint/models/ecs_safety_helpers';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export const processEventsIndex = 'logs-endpoint.events.process-default';
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index beb6e94e5dced..6d37b745fcde7 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -434,6 +434,25 @@
   }
 }
 
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:space_1_only_matching_origin",
+    "index": ".kibana",
+    "source": {
+      "originId": "space_1_only",
+      "sharedtype": {
+        "title": "This object only exists to test the second assertion for spacesWithMatchingOrigins in get_shareable_references"
+      },
+      "type": "sharedtype",
+      "namespaces": ["other_space"],
+      "references": [],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
 {
   "type": "doc",
   "value": {
@@ -454,6 +473,25 @@
   }
 }
 
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:space_2_only_matching_origin",
+    "index": ".kibana",
+    "source": {
+      "originId": "space_2_only",
+      "sharedtype": {
+        "title": "This object only exists to test the third assertion for spacesWithMatchingOrigins in get_shareable_references"
+      },
+      "type": "sharedtype",
+      "namespaces": ["*"],
+      "references": [],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
 {
   "type": "doc",
   "value": {
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts b/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
index 88c168b6f6297..1b54ea67554fa 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
+++ b/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
 export class Plugin {
   constructor() {}
diff --git a/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts b/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts
index a4ce22c6c010c..b7e698244ee29 100644
--- a/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts
+++ b/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 export function getUrlPrefix(spaceId?: string) {
   return spaceId && spaceId !== DEFAULT_SPACE_ID ? `/s/${spaceId}` : ``;
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 bd343cad737aa..72997ead35683 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
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { EsArchiver } from '@kbn/es-archiver';
 import type { Client } from '@elastic/elasticsearch';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { CopyResponse } from '../../../../plugins/spaces/server/lib/copy_to_spaces';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+import { CopyResponse } from '@kbn/spaces-plugin/server/lib/copy_to_spaces';
 import { getAggregatedSpaceData, getUrlPrefix } from '../lib/space_test_utils';
 import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
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 d6c429b441341..a1c73125ede28 100644
--- a/x-pack/test/spaces_api_integration/common/suites/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -101,17 +101,17 @@ export function deleteTestSuiteFactory(es: Client, esArchiver: any, supertest: S
 
     expect(buckets).to.eql(expectedBuckets);
 
-    // There were 22 multi-namespace objects.
+    // There were 24 multi-namespace objects.
     // Since Space 2 was deleted, any multi-namespace objects that existed in that space
     // are updated to remove it, and of those, any that don't exist in any space are deleted.
     const multiNamespaceResponse = await es.search<Record<string, any>>({
       index: '.kibana',
-      size: 20,
+      size: 100,
       body: { query: { terms: { type: ['sharedtype'] } } },
     });
     const docs = multiNamespaceResponse.hits.hits;
-    // Just 17 results, since spaces_2_only, conflict_1a_space_2, conflict_1b_space_2, conflict_1c_space_2, and conflict_2_space_2 got deleted.
-    expect(docs).length(17);
+    // Just 19 results, since spaces_2_only, conflict_1a_space_2, conflict_1b_space_2, conflict_1c_space_2, and conflict_2_space_2 got deleted.
+    expect(docs).length(19);
     docs.forEach((doc) => () => {
       const containsSpace2 = doc?._source?.namespaces.includes('space_2');
       expect(containsSpace2).to.eql(false);
diff --git a/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts b/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts
index e99d9b46b8963..f9d1fe6b97236 100644
--- a/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import type { Client } from '@elastic/elasticsearch';
-import { LegacyUrlAlias } from 'src/core/server/saved_objects/object_types';
+import { LegacyUrlAlias } from '@kbn/core/server/saved_objects/object_types';
 import { SPACES } from '../lib/spaces';
 import { getUrlPrefix } from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
 import {
diff --git a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
index 65afaf38f48a9..fb6c22a761f1e 100644
--- a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
@@ -11,7 +11,7 @@ import { SuperTest } from 'supertest';
 import {
   SavedObjectsCollectMultiNamespaceReferencesResponse,
   SavedObjectReferenceWithContext,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import {
@@ -51,6 +51,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
     {
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE,
       spaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
+      spacesWithMatchingOrigins: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
       inboundReferences: [{ type: 'sharedtype', id: CASES.DEFAULT_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in the default space
     },
     {
@@ -64,6 +65,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       type: 'sharedtype',
       id: CASES.DEFAULT_ONLY.id,
       spaces: [DEFAULT_SPACE_ID],
+      spacesWithMatchingOrigins: [DEFAULT_SPACE_ID], // The first test assertion for spacesWithMatchingOrigins is an object that doesn't have any matching origins in other spaces
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
     {
@@ -84,6 +86,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       type: 'sharedtype',
       id: CASES.ALL_SPACES.id,
       spaces: ['*'],
+      spacesWithMatchingOrigins: ['*'],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
   ],
@@ -91,6 +94,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
     {
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE,
       spaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
+      spacesWithMatchingOrigins: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
       inboundReferences: [{ type: 'sharedtype', id: CASES.SPACE_1_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in space 1
     },
     {
@@ -111,8 +115,9 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       type: 'sharedtype',
       id: CASES.SPACE_1_ONLY.id,
       spaces: [SPACE_1_ID],
-      inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       spacesWithMatchingAliases: [DEFAULT_SPACE_ID, SPACE_2_ID], // aliases with a matching targetType and sourceId exist in two other spaces
+      spacesWithMatchingOrigins: ['other_space', SPACE_1_ID], // The second test assertion for spacesWithMatchingOrigins is an object that has a matching origin in one other space
+      inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
     {
       type: 'sharedtype',
@@ -125,6 +130,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       type: 'sharedtype',
       id: CASES.ALL_SPACES.id,
       spaces: ['*'],
+      spacesWithMatchingOrigins: ['*'],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
   ],
@@ -132,6 +138,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
     {
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE,
       spaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
+      spacesWithMatchingOrigins: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
       inboundReferences: [{ type: 'sharedtype', id: CASES.SPACE_2_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in space 2
     },
     {
@@ -159,12 +166,14 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       type: 'sharedtype',
       id: CASES.SPACE_2_ONLY.id,
       spaces: [SPACE_2_ID],
+      spacesWithMatchingOrigins: ['*'], // The third test assertion for spacesWithMatchingOrigins is an object that has a matching origin in all spaces (this takes precedence, causing SPACE_2_ID to be omitted)
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
     {
       type: 'sharedtype',
       id: CASES.ALL_SPACES.id,
       spaces: ['*'],
+      spacesWithMatchingOrigins: ['*'],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
   ],
@@ -177,7 +186,7 @@ const getTestTitle = ({ objects }: GetShareableReferencesTestCase) => {
 };
 const getRedactedSpaces = (authorizedSpace: string | undefined, spaces: string[]) => {
   if (!authorizedSpace) {
-    return spaces; // if authorizedSpace is undefined, we should not redact any spaces
+    return spaces.sort(); // if authorizedSpace is undefined, we should not redact any spaces
   }
   const redactedSpaces = spaces.map((x) => (x !== authorizedSpace && x !== '*' ? '?' : x));
   return redactedSpaces.sort((a, b) => (a === '?' ? 1 : b === '?' ? -1 : 0)); // unknown spaces are always at the end of the array
@@ -200,17 +209,23 @@ export function getShareableReferencesTestSuiteFactory(esArchiver: any, supertes
         const apiResponse = response.body as SavedObjectsCollectMultiNamespaceReferencesResponse;
         expect(apiResponse.objects).to.have.length(expectedResults.length);
         expectedResults.forEach((expectedResult, i) => {
-          const { spaces, spacesWithMatchingAliases } = expectedResult;
+          const { spaces, spacesWithMatchingAliases, spacesWithMatchingOrigins } = expectedResult;
           const expectedSpaces = getRedactedSpaces(authorizedSpace, spaces);
           const expectedSpacesWithMatchingAliases =
             spacesWithMatchingAliases &&
             getRedactedSpaces(authorizedSpace, spacesWithMatchingAliases);
+          const expectedSpacesWithMatchingOrigins =
+            spacesWithMatchingOrigins &&
+            getRedactedSpaces(authorizedSpace, spacesWithMatchingOrigins);
           const expected = {
             ...expectedResult,
             spaces: expectedSpaces,
             ...(expectedSpacesWithMatchingAliases && {
               spacesWithMatchingAliases: expectedSpacesWithMatchingAliases,
             }),
+            ...(expectedSpacesWithMatchingOrigins && {
+              spacesWithMatchingOrigins: expectedSpacesWithMatchingOrigins,
+            }),
           };
           expect(apiResponse.objects[i]).to.eql(expected);
         });
diff --git a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
index 75aea0a3fe4e0..f74434f72227e 100644
--- a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { EsArchiver } from '@kbn/es-archiver';
-import { SavedObject } from 'src/core/server';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { CopyResponse } from '../../../../plugins/spaces/server/lib/copy_to_spaces';
+import { SavedObject } from '@kbn/core/server';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+import { CopyResponse } from '@kbn/spaces-plugin/server/lib/copy_to_spaces';
 import { getUrlPrefix } from '../lib/space_test_utils';
 import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
diff --git a/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts b/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts
index 3b795ae719db8..5528ceaa27602 100644
--- a/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts
@@ -13,7 +13,7 @@ import { SuperTest } from 'supertest';
 import {
   SavedObjectsErrorHelpers,
   SavedObjectsUpdateObjectsSpacesResponse,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 import { SPACES } from '../lib/spaces';
 import {
   expectResponses,
diff --git a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
index af56540841403..9b768ab61baec 100644
--- a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
+++ b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
@@ -7,7 +7,7 @@
 
 import { resolve } from 'path';
 import consumeState from './consume_state';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import chalk from 'chalk';
 import { esTestConfig, kbnTestConfig } from '@kbn/test';
diff --git a/x-pack/test/timeline/common/config.ts b/x-pack/test/timeline/common/config.ts
index 75f0eb24a6cd9..7b0e02aec7efb 100644
--- a/x-pack/test/timeline/common/config.ts
+++ b/x-pack/test/timeline/common/config.ts
@@ -57,7 +57,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     };
 
     return {
-      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
+      testFiles,
       servers,
       services,
       junit: {
diff --git a/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts b/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts
index 1e9cfe3eb841b..828be46bd484a 100644
--- a/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts
+++ b/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts
@@ -9,8 +9,12 @@ import { JsonObject } from '@kbn/utility-types';
 import expect from '@kbn/expect';
 import { ALERT_UUID, ALERT_RULE_CONSUMER } from '@kbn/rule-data-utils';
 
+import { TimelineEdges, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
+import {
+  Direction,
+  TimelineEventsQueries,
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { User } from '../../../../rule_registry/common/lib/authentication/types';
-import { TimelineEdges, TimelineNonEcsData } from '../../../../../plugins/timelines/common/';
 import { getSpaceUrlPrefix } from '../../../../rule_registry/common/lib/authentication/spaces';
 
 import {
@@ -33,10 +37,6 @@ import {
   secOnlySpacesAll,
   noKibanaPrivileges,
 } from '../../../../rule_registry/common/lib/authentication/users';
-import {
-  Direction,
-  TimelineEventsQueries,
-} from '../../../../../plugins/security_solution/common/search_strategy';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 interface TestCase {
diff --git a/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts b/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
index a9ba7bd908a9e..7b2ea3d2cc1b7 100644
--- a/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
+++ b/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
@@ -11,8 +11,12 @@ import { JsonObject } from '@kbn/utility-types';
 import expect from '@kbn/expect';
 import { ALERT_RULE_CONSUMER } from '@kbn/rule-data-utils';
 
+import { TimelineEdges, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
+import {
+  Direction,
+  TimelineEventsQueries,
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { User } from '../../../../rule_registry/common/lib/authentication/types';
-import { TimelineEdges, TimelineNonEcsData } from '../../../../../plugins/timelines/common/';
 import { getSpaceUrlPrefix } from '../../../../rule_registry/common/lib/authentication/spaces';
 
 import {
@@ -22,10 +26,6 @@ import {
   obsMinReadSpacesAll,
   superUser,
 } from '../../../../rule_registry/common/lib/authentication/users';
-import {
-  Direction,
-  TimelineEventsQueries,
-} from '../../../../../plugins/security_solution/common/search_strategy';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 class FileWrapper {
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 91b82bc785ae9..d6bdf8cfaa6fd 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -101,6 +101,6 @@
     { "path": "../plugins/remote_clusters/tsconfig.json" },
     { "path": "../plugins/cross_cluster_replication/tsconfig.json" },
     { "path": "../plugins/index_lifecycle_management/tsconfig.json"},
-    { "path": "../plugins/uptime/tsconfig.json" }
+    { "path": "../plugins/synthetics/tsconfig.json"}
   ]
 }
diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
index 2adbb0509e822..619823d55d3aa 100644
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 export const plugin = () => new FooPlugin();
 
 class FooPlugin implements Plugin {
diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
index 3c72e118e7217..7bb8b446dcc79 100644
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/server';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '../../../../../../../plugins/features/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
 
 export const plugin = () => new FooPlugin();
 
diff --git a/x-pack/test/ui_capabilities/common/services/features.ts b/x-pack/test/ui_capabilities/common/services/features.ts
index de425b6d166b7..e1c79059e6ecb 100644
--- a/x-pack/test/ui_capabilities/common/services/features.ts
+++ b/x-pack/test/ui_capabilities/common/services/features.ts
@@ -8,7 +8,7 @@
 import axios, { AxiosInstance } from 'axios';
 import { format as formatUrl } from 'url';
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { Features } from '../features';
 
diff --git a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
index 45d83eb1d9e8e..3c3febcc30686 100644
--- a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
+++ b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
@@ -6,10 +6,10 @@
  */
 
 import axios, { AxiosInstance } from 'axios';
-import type { Capabilities as UICapabilities } from 'src/core/types';
+import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import { format as formatUrl } from 'url';
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog } from '@kbn/tooling-log';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { FeaturesService, FeaturesProvider } from './features';
 
diff --git a/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts b/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts
index 19a3499b9c87c..98e31129a3ccd 100644
--- a/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts
+++ b/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
 
 export default function ({
   getPageObjects,
diff --git a/x-pack/test/upgrade/reporting_services.ts b/x-pack/test/upgrade/reporting_services.ts
index 2de3b72bc9a47..2467cee0ad822 100644
--- a/x-pack/test/upgrade/reporting_services.ts
+++ b/x-pack/test/upgrade/reporting_services.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { indexTimestamp } from '../../plugins/reporting/server/lib/store/index_timestamp';
+import { indexTimestamp } from '@kbn/reporting-plugin/server/lib/store/index_timestamp';
 import { services as xpackServices } from '../functional/services';
 import { services as apiIntegrationServices } from '../api_integration/services';
 import { FtrProviderContext } from './ftr_provider_context';
diff --git a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
index 635cb8e288ae1..b8f689edb6a31 100644
--- a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
+++ b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import { ReindexStatus, REINDEX_OP_TYPE } from '../../../plugins/upgrade_assistant/common/types';
-import { generateNewIndexName } from '../../../plugins/upgrade_assistant/server/lib/reindexing/index_settings';
-import { getIndexState } from '../../../plugins/upgrade_assistant/common/get_index_state';
+import { ReindexStatus, REINDEX_OP_TYPE } from '@kbn/upgrade-assistant-plugin/common/types';
+import { generateNewIndexName } from '@kbn/upgrade-assistant-plugin/server/lib/reindexing/index_settings';
+import { getIndexState } from '@kbn/upgrade-assistant-plugin/common/get_index_state';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts b/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts
index 57b7350bec2b5..91029671c596a 100644
--- a/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts
+++ b/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 import './types';
 import { firstValueFrom } from 'rxjs';
 
diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts
index 63321649aeea7..22f9f2504fd2a 100644
--- a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts
+++ b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 import './types';
 
 export class StackManagementUsageTest implements Plugin {
diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts
index a39cbfac02428..557558b5b827d 100644
--- a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts
+++ b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 export {}; // Hack to declare this file as a module so TS allows us to extend the Global Window interface
 
 declare global {
diff --git a/x-pack/test/usage_collection/test_suites/application_usage/index.ts b/x-pack/test/usage_collection/test_suites/application_usage/index.ts
index fc53c8ddf5ed3..4b41aada9ad29 100644
--- a/x-pack/test/usage_collection/test_suites/application_usage/index.ts
+++ b/x-pack/test/usage_collection/test_suites/application_usage/index.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { applicationUsageSchema } from '@kbn/kibana-usage-collection-plugin/server/collectors/application_usage/schema';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { applicationUsageSchema } from '../../../../../src/plugins/kibana_usage_collection/server/collectors/application_usage/schema';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Application Usage', function () {
diff --git a/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts b/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts
index 3bcf6f6384fd1..dac552220f7c1 100644
--- a/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts
+++ b/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts
@@ -6,8 +6,8 @@
  */
 
 import _ from 'lodash';
+import { stackManagementSchema } from '@kbn/kibana-usage-collection-plugin/server/collectors/management/schema';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { stackManagementSchema } from '../../../../../src/plugins/kibana_usage_collection/server/collectors/management/schema';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   // FLAKY: https://github.com/elastic/kibana/issues/119038
diff --git a/yarn.lock b/yarn.lock
index 21d306c9ded9b..9a4e679245f8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1228,21 +1228,21 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.16.2.tgz#05dd7f06659759fda30f87b15534f1e42f1201bb"
   integrity sha512-KgqAWMH0emL6f3xH6nqyTryoBMqlJ627LBIe9PT1PRRQPz2FtHib3FIHJPukp1slzF3hJYZvdiVwgPnHbaSOOA==
 
-"@bazel/typescript@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-5.4.0.tgz#0a24e8d47152728f71b26b73adc3913645e5309e"
-  integrity sha512-AWmS9HcnjqGsPQv5lnqecA8xof+d4ChpbI/Z6aiSM0qOemc8e1WT9wb1VzM6g6hRfV5foWyIHt0VhTonTsPhYw==
+"@bazel/typescript@4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.6.2.tgz#9f07b6f8cfb6b0a0e228e5971de412911c910a90"
+  integrity sha512-AUF7kq82bP6DX9Brihr/eQqvNccxVfSXosFxt80h94og5cmMyoc/euXha6rxlOBP3yWXmSo+/qjzO7o8PWJduQ==
   dependencies:
-    "@bazel/worker" "5.4.0"
+    "@bazel/worker" "4.6.2"
     protobufjs "6.8.8"
     semver "5.6.0"
     source-map-support "0.5.9"
     tsutils "3.21.0"
 
-"@bazel/worker@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.4.0.tgz#ce50e34951ccf7233b651f0be665bbd43d7ed7f1"
-  integrity sha512-Rtkol9WoYs0NCZl1wt4Q8T7Rs0wbQjIvFiJzVeeoC/00TG0e/qi4mYE5iQwUJmO8st3N8VnaWz2N31UHc6yhRA==
+"@bazel/worker@4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-4.6.2.tgz#0bd105344533335327c2edfa3fc65b04c39cdea8"
+  integrity sha512-DLpN6iQAH6uiUraAs4CESyqs60u55fcKmYgOOVObGuLSQQuX49Lw7XRIN90NibRPwpbBDQichWE3zfra0yKTTw==
   dependencies:
     google-protobuf "^3.6.1"
 
@@ -1415,33 +1415,29 @@
   dependencies:
     tslib "^2.0.0"
 
-"@elastic/analytics@link:bazel-bin/packages/elastic-analytics":
-  version "0.0.0"
-  uid ""
-
-"@elastic/apm-rum-core@^5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.14.1.tgz#8f65060967c8d68498f2c520e4169ec07eb3b5bb"
-  integrity sha512-RFgTpXUIEIoy44TPnEN7cVcf2YIBOwaNdALrYVc4lOTMH3u0v4gaS0n9/Aee5nTGqWBLKWXXvMk/dAkjQW6qEg==
+"@elastic/apm-rum-core@^5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.15.0.tgz#f1067078080be1b7167c72ae6d155b0ed5cdf6c6"
+  integrity sha512-T5/1hZPskmU6N3Xo2CRNi5tX2ht8R5nLmh5t0I1v8RxkwbQms47AR1f0ZVvXN7W2FCDPadyQXC3f9do3k5A6OA==
   dependencies:
     error-stack-parser "^1.3.5"
     opentracing "^0.14.3"
     promise-polyfill "^8.1.3"
 
-"@elastic/apm-rum-react@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-1.3.4.tgz#f60f1ba55696f4e04eba64edb323e43ef9d67acb"
-  integrity sha512-HPKU/tnTbiSQr6HYxHB9rP4TKBHZ9HKhBPzmCvZj8PNH5tkMFR4nj0PLN9eYL59A7omAmtH2Sg95T47OIG9ZtQ==
+"@elastic/apm-rum-react@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-1.4.0.tgz#f36453e54d2ebdedb0d6d0c4f6cc76e16304b118"
+  integrity sha512-YIBuEJN6fkiB1M/o84PF4lQheAjrd3PQCm6t8pP4dKuWN1cWZnSsojnuGacx2bJn1kWWZxVDQ7wTjPJutkIy2A==
   dependencies:
-    "@elastic/apm-rum" "^5.10.2"
+    "@elastic/apm-rum" "^5.11.0"
     hoist-non-react-statics "^3.3.0"
 
-"@elastic/apm-rum@^5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.10.2.tgz#06d3e9f08adc19e1227073dda7e5c4ab34be48c7"
-  integrity sha512-NrBQcgautAGwJOrJ20WUUXV1Ynux4dEEU/fgeqfdG7G3JGqMbuIlF8s/nqLgQ9oXz72Z5MirOf68P7m5Zh/5HA==
+"@elastic/apm-rum@^5.11.0":
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.11.0.tgz#97dbc426d0ec27b46e78a649f73d9e4a198ae258"
+  integrity sha512-+98NLG4NDa7o1DCtkhXeGmKW5riDPHSpgy2UxzLK4j02ZPBOccOUjIw5F8yZAUsrPUpQmk39x13IJl0mFyzjyA==
   dependencies:
-    "@elastic/apm-rum-core" "^5.14.1"
+    "@elastic/apm-rum-core" "^5.15.0"
 
 "@elastic/apm-synthtrace@link:bazel-bin/packages/elastic-apm-synthtrace":
   version "0.0.0"
@@ -1454,10 +1450,10 @@
   dependencies:
     object-hash "^1.3.0"
 
-"@elastic/charts@45.1.1":
-  version "45.1.1"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-45.1.1.tgz#d65b51ee296138a7e6b3d954fcf9fa41ba379492"
-  integrity sha512-gVk8ZbCBh8fUKxM6Rd61qwhSCgt1zU0wt3y3ZMUe+MdaTFG9I+0SceYrltJR+bf0ycK0wb1yg+WEw0LoN8bEIg==
+"@elastic/charts@46.0.1":
+  version "46.0.1"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-46.0.1.tgz#2d3bd3de9e4f294ddd9d9969dca1dc1ed5c6f278"
+  integrity sha512-CWiyEHaxEk9zKOPOm4ISyAluXSxu6pqLdG+ARBu4jQx0t1ROe93vssICHq6JIrQdiMHn44pleQnWZzKzanZtDw==
   dependencies:
     "@popperjs/core" "^2.4.0"
     chroma-js "^2.1.0"
@@ -1508,10 +1504,10 @@
     "@elastic/transport" "^8.0.2"
     tslib "^2.3.0"
 
-"@elastic/ems-client@8.2.0":
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-8.2.0.tgz#35ca17f07a576c464b15a17ef9b228a51043e329"
-  integrity sha512-NtU/KjTMGntnrCY6+2jdkugn6pqMJj2EV4/Mff/MGlBLrWSlxYkYa6Q6KFhmT3V68RJUxOsId47mUdoQbRi/yg==
+"@elastic/ems-client@8.3.0":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-8.3.0.tgz#9d40c02e33c407d433b8e509d83c5edec24c4902"
+  integrity sha512-DlJDyUQzNrxGbS0AWxGiBNfq1hPQUP3Ib/Zyotgv7+VGGklb0mBwppde7WLVvuj0E+CYc6E63TJsoD8KNUO0MQ==
   dependencies:
     "@types/geojson" "^7946.0.7"
     "@types/lru-cache" "^5.1.0"
@@ -2155,10 +2151,10 @@
     "@hapi/validate" "1.x.x"
     "@hapi/wreck" "17.x.x"
 
-"@hapi/hapi@^20.2.1":
-  version "20.2.1"
-  resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.2.1.tgz#7482bc28757cb4671623a61bdb5ce920bffc8a2f"
-  integrity sha512-OXAU+yWLwkMfPFic+KITo+XPp6Oxpgc9WUH+pxXWcTIuvWbgco5TC/jS8UDvz+NFF5IzRgF2CL6UV/KLdQYUSQ==
+"@hapi/hapi@^20.2.2":
+  version "20.2.2"
+  resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.2.2.tgz#5810efbf5c0aad367932e86d4066d82ac817e98c"
+  integrity sha512-crhU6TIKt7QsksWLYctDBAXogk9PYAm7UzdpETyuBHC2pCa6/+B5NykiOVLG/3FCIgHo/raPVtan8bYtByHORQ==
   dependencies:
     "@hapi/accept" "^5.0.1"
     "@hapi/ammo" "^5.0.1"
@@ -2173,9 +2169,9 @@
     "@hapi/podium" "^4.1.1"
     "@hapi/shot" "^5.0.5"
     "@hapi/somever" "^3.0.0"
-    "@hapi/statehood" "^7.0.3"
+    "@hapi/statehood" "^7.0.4"
     "@hapi/subtext" "^7.0.3"
-    "@hapi/teamwork" "^5.1.0"
+    "@hapi/teamwork" "^5.1.1"
     "@hapi/topo" "^5.0.0"
     "@hapi/validate" "^1.1.1"
 
@@ -2273,10 +2269,10 @@
     "@hapi/bounce" "2.x.x"
     "@hapi/hoek" "9.x.x"
 
-"@hapi/statehood@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.3.tgz#655166f3768344ed3c3b50375a303cdeca8040d9"
-  integrity sha512-pYB+pyCHkf2Amh67QAXz7e/DN9jcMplIL7Z6N8h0K+ZTy0b404JKPEYkbWHSnDtxLjJB/OtgElxocr2fMH4G7w==
+"@hapi/statehood@^7.0.4":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.4.tgz#6acb9d0817b5c657089356f7d9fd60af0bce4f41"
+  integrity sha512-Fia6atroOVmc5+2bNOxF6Zv9vpbNAjEXNcUbWXavDqhnJDlchwUUwKS5LCi5mGtCTxRhUKKHwuxuBZJkmLZ7fw==
   dependencies:
     "@hapi/boom" "9.x.x"
     "@hapi/bounce" "2.x.x"
@@ -2299,10 +2295,10 @@
     "@hapi/pez" "^5.0.1"
     "@hapi/wreck" "17.x.x"
 
-"@hapi/teamwork@5.x.x", "@hapi/teamwork@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-5.1.0.tgz#7801a61fc727f702fd2196ef7625eb4e389f4124"
-  integrity sha512-llqoQTrAJDTXxG3c4Kz/uzhBS1TsmSBa/XG5SPcVXgmffHE1nFtyLIK0hNJHCB3EuBKT84adzd1hZNY9GJLWtg==
+"@hapi/teamwork@5.x.x", "@hapi/teamwork@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-5.1.1.tgz#4d2ba3cac19118a36c44bf49a3a47674de52e4e4"
+  integrity sha512-1oPx9AE5TIv+V6Ih54RP9lTZBso3rP8j4Xhb6iSVwPXtAM+sDopl5TFMv5Paw73UnpZJ9gjcrTE1BXrWt9eQrg==
 
 "@hapi/topo@^5.0.0":
   version "5.0.0"
@@ -2932,6 +2928,14 @@
   version "0.0.0"
   uid ""
 
+"@kbn/analytics-client@link:bazel-bin/packages/analytics/client":
+  version "0.0.0"
+  uid ""
+
+"@kbn/analytics-shippers-fullstory@link:bazel-bin/packages/analytics/shippers/fullstory":
+  version "0.0.0"
+  uid ""
+
 "@kbn/analytics@link:bazel-bin/packages/kbn-analytics":
   version "0.0.0"
   uid ""
@@ -2948,7 +2952,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/babel-code-parser@link:bazel-bin/packages/kbn-babel-code-parser":
+"@kbn/babel-plugin-synthetic-packages@link:bazel-bin/packages/kbn-babel-plugin-synthetic-packages":
   version "0.0.0"
   uid ""
 
@@ -2960,6 +2964,22 @@
   version "0.0.0"
   uid ""
 
+"@kbn/bazel-runner@link:bazel-bin/packages/kbn-bazel-runner":
+  version "0.0.0"
+  uid ""
+
+"@kbn/ci-stats-client@link:bazel-bin/packages/kbn-ci-stats-client":
+  version "0.0.0"
+  uid ""
+
+"@kbn/ci-stats-core@link:bazel-bin/packages/kbn-ci-stats-core":
+  version "0.0.0"
+  uid ""
+
+"@kbn/ci-stats-reporter@link:bazel-bin/packages/kbn-ci-stats-reporter":
+  version "0.0.0"
+  uid ""
+
 "@kbn/cli-dev-mode@link:bazel-bin/packages/kbn-cli-dev-mode":
   version "0.0.0"
   uid ""
@@ -3024,6 +3044,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/find-used-node-modules@link:bazel-bin/packages/kbn-find-used-node-modules":
+  version "0.0.0"
+  uid ""
+
 "@kbn/flot-charts@link:bazel-bin/packages/kbn-flot-charts":
   version "0.0.0"
   uid ""
@@ -3040,6 +3064,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/import-resolver@link:bazel-bin/packages/kbn-import-resolver":
+  version "0.0.0"
+  uid ""
+
 "@kbn/interpreter@link:bazel-bin/packages/kbn-interpreter":
   version "0.0.0"
   uid ""
@@ -3048,6 +3076,14 @@
   version "0.0.0"
   uid ""
 
+"@kbn/jest-serializers@link:bazel-bin/packages/kbn-jest-serializers":
+  version "0.0.0"
+  uid ""
+
+"@kbn/kibana-json-schema@link:bazel-bin/packages/kbn-kibana-json-schema":
+  version "0.0.0"
+  uid ""
+
 "@kbn/logging-mocks@link:bazel-bin/packages/kbn-logging-mocks":
   version "0.0.0"
   uid ""
@@ -3156,6 +3192,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/shared-ux-button-exit-full-screen@link:bazel-bin/packages/shared-ux/button/exit_full_screen":
+  version "0.0.0"
+  uid ""
+
 "@kbn/shared-ux-components@link:bazel-bin/packages/kbn-shared-ux-components":
   version "0.0.0"
   uid ""
@@ -3172,6 +3212,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/sort-package-json@link:bazel-bin/packages/kbn-sort-package-json":
+  version "0.0.0"
+  uid ""
+
 "@kbn/spec-to-console@link:bazel-bin/packages/kbn-spec-to-console":
   version "0.0.0"
   uid ""
@@ -3180,10 +3224,18 @@
   version "0.0.0"
   uid ""
 
+"@kbn/stdio-dev-helpers@link:bazel-bin/packages/kbn-stdio-dev-helpers":
+  version "0.0.0"
+  uid ""
+
 "@kbn/storybook@link:bazel-bin/packages/kbn-storybook":
   version "0.0.0"
   uid ""
 
+"@kbn/synthetic-package-map@link:bazel-bin/packages/kbn-synthetic-package-map":
+  version "0.0.0"
+  uid ""
+
 "@kbn/telemetry-tools@link:bazel-bin/packages/kbn-telemetry-tools":
   version "0.0.0"
   uid ""
@@ -3208,6 +3260,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/tooling-log@link:bazel-bin/packages/kbn-tooling-log":
+  version "0.0.0"
+  uid ""
+
 "@kbn/type-summarizer@link:bazel-bin/packages/kbn-type-summarizer":
   version "0.0.0"
   uid ""
@@ -3381,10 +3437,13 @@
     concat-stream "~2.0.0"
     minimist "^1.2.5"
 
-"@mapbox/geojson-types@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz#9aecf642cb00eab1080a57c4f949a65b4a5846d6"
-  integrity sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==
+"@mapbox/geojson-rewind@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz#adbe16dc683eb40e90934c51a5e28c7bbf44f4e1"
+  integrity sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==
+  dependencies:
+    get-stream "^6.0.1"
+    minimist "^1.2.5"
 
 "@mapbox/hast-util-table-cell-style@^0.1.3":
   version "0.1.3"
@@ -3416,25 +3475,25 @@
   resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.2.3.tgz#a26ecfb3f0061456d93ee8570dd9587d226ea8bd"
   integrity sha512-RaCYfnxULUUUxNwcUimV9C/o2295ktTyLEUzD/+VWkqXqvaVfFcZ5slytGzb2Sd/Jj4MlbxD0DCZbfa6CzcmMw==
 
-"@mapbox/mapbox-gl-supported@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz#f60b6a55a5d8e5ee908347d2ce4250b15103dc8e"
-  integrity sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==
+"@mapbox/mapbox-gl-supported@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz#c15367178d8bfe4765e6b47b542fe821ce259c7b"
+  integrity sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==
 
 "@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2"
   integrity sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=
 
-"@mapbox/tiny-sdf@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz#16a20c470741bfe9191deb336f46e194da4a91ff"
-  integrity sha512-Ihn1nZcGIswJ5XGbgFAvVumOgWpvIjBX9jiRlIl46uQG9vJOF51ViBYHF95rEZupuyQbEmhLaDPLQlU7fUTsBg==
+"@mapbox/tiny-sdf@^2.0.4":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz#cdba698d3d65087643130f9af43a2b622ce0b372"
+  integrity sha512-OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw==
 
-"@mapbox/unitbezier@^0.0.0":
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e"
-  integrity sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4=
+"@mapbox/unitbezier@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz#d32deb66c7177e9e9dfc3bbd697083e2e657ff01"
+  integrity sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==
 
 "@mapbox/vector-tile@1.3.1", "@mapbox/vector-tile@^1.3.1":
   version "1.3.1"
@@ -5140,6 +5199,11 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
   integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
 
+"@tsd/typescript@~4.6.3":
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/@tsd/typescript/-/typescript-4.6.3.tgz#9b4c8198da7614fe1547436fbd5657cfe8327c1d"
+  integrity sha512-WjipklCf6qWQL4Hkw+FSwOXMA5JqKv04ro/c1aviYSzLJFdcFMrR/FHjOGBIEAIq7pb8Bw74wd+G45dWfC/Jnw==
+
 "@turf/along@6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.0.1.tgz#595cecdc48fc7fcfa83c940a8e3eb24d4c2e04d4"
@@ -5311,10 +5375,10 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
   integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
-  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
+"@types/babel__core@*", "@types/babel__core@^7.1.19":
+  version "7.1.19"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
+  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -5322,10 +5386,10 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
-"@types/babel__core@^7.1.19":
-  version "7.1.19"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
+  version "7.1.10"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
+  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -5340,6 +5404,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@types/babel__helper-plugin-utils@^7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.0.tgz#dcd2416f9c189d5837ab2a276368cf67134efe78"
+  integrity sha512-60YtHzhQ9HAkToHVV+TB4VLzBn9lrfgrsOjiJMtbv/c1jPdekBxaByd6DMsGBzROXWoIL6U3lEFvvbu69RkUoA==
+  dependencies:
+    "@types/babel__core" "*"
+
 "@types/babel__template@*":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
@@ -5427,14 +5498,7 @@
   resolved "https://registry.yarnpkg.com/@types/cmd-shim/-/cmd-shim-2.0.0.tgz#c3d81d3c2a51af3c65c19b4f1d493a75abf07a5c"
   integrity sha512-WuV5bOQTGxqzewPnJbrDe51I5mnX2wTRYy+PduRuIvSuBWZlxDYD6Qt/f1m5sezxx1yyE9+1wHJ/0sRuNIoFaQ==
 
-"@types/color-convert@*":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-1.9.0.tgz#bfa8203e41e7c65471e9841d7e306a7cd8b5172d"
-  integrity sha512-OKGEfULrvSL2VRbkl/gnjjgbbF7ycIlpSsX7Nkab4MOWi5XxmgBYvuiQ7lcCFY5cPDz7MUNaKgxte2VRmtr4Fg==
-  dependencies:
-    "@types/color-name" "*"
-
-"@types/color-convert@^2.0.0":
+"@types/color-convert@*", "@types/color-convert@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
   integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
@@ -5446,10 +5510,10 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"@types/color@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.0.tgz#40f8a6bf2fd86e969876b339a837d8ff1b0a6e30"
-  integrity sha512-5qqtNia+m2I0/85+pd2YzAXaTyKO8j+svirO5aN+XaQJ5+eZ8nx0jPtEWZLxCi50xwYsX10xUHetFzfb1WEs4Q==
+"@types/color@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.3.tgz#e6d8d72b7aaef4bb9fe80847c26c7c786191016d"
+  integrity sha512-X//qzJ3d3Zj82J9sC/C18ZY5f43utPbAJ6PhYt/M7uG6etcF6MRpKdN880KBy43B0BMzSfeT96MzrsNjFI3GbA==
   dependencies:
     "@types/color-convert" "*"
 
@@ -5553,10 +5617,6 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.0.6.tgz#aca442289df623bfa8e47c23961f0357847b83fe"
   integrity sha512-fj1hi+ZSW0xPLrJJD+YNwIh9GZbyaIepG26E/gXvp8nCa2pYokxUYO1sK9qjGxp2g8ryZYuon7wmjpwE2cyASQ==
 
-"@types/elastic__analytics@link:bazel-bin/packages/elastic-analytics/npm_module_types":
-  version "0.0.0"
-  uid ""
-
 "@types/elastic__apm-synthtrace@link:bazel-bin/packages/elastic-apm-synthtrace/npm_module_types":
   version "0.0.0"
   uid ""
@@ -5569,7 +5629,7 @@
     "@types/cheerio" "*"
     "@types/react" "*"
 
-"@types/eslint@^7.28.0":
+"@types/eslint@^7.2.13", "@types/eslint@^7.28.0":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
   integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
@@ -5650,6 +5710,11 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
+"@types/geojson@^7946.0.8":
+  version "7946.0.8"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
+  integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
+
 "@types/getos@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/getos/-/getos-3.0.0.tgz#582c758e99e9d634f31f471faf7ce59cf1c39a71"
@@ -5967,6 +6032,14 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__analytics-client@link:bazel-bin/packages/analytics/client/npm_module_types":
+  version "0.0.0"
+  uid ""
+
+"@types/kbn__analytics-shippers-fullstory@link:bazel-bin/packages/analytics/shippers/fullstory/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__analytics@link:bazel-bin/packages/kbn-analytics/npm_module_types":
   version "0.0.0"
   uid ""
@@ -5987,6 +6060,22 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__bazel-runner@link:bazel-bin/packages/kbn-bazel-runner/npm_module_types":
+  version "0.0.0"
+  uid ""
+
+"@types/kbn__ci-stats-client@link:bazel-bin/packages/kbn-ci-stats-client/npm_module_types":
+  version "0.0.0"
+  uid ""
+
+"@types/kbn__ci-stats-core@link:bazel-bin/packages/kbn-ci-stats-core/npm_module_types":
+  version "0.0.0"
+  uid ""
+
+"@types/kbn__ci-stats-reporter@link:bazel-bin/packages/kbn-ci-stats-reporter/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__cli-dev-mode@link:bazel-bin/packages/kbn-cli-dev-mode/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6039,6 +6128,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__find-used-node-modules@link:bazel-bin/packages/kbn-find-used-node-modules/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__generate@link:bazel-bin/packages/kbn-generate/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6051,6 +6144,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__import-resolver@link:bazel-bin/packages/kbn-import-resolver/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__interpreter@link:bazel-bin/packages/kbn-interpreter/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6059,6 +6156,14 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__jest-serializers@link:bazel-bin/packages/kbn-jest-serializers/npm_module_types":
+  version "0.0.0"
+  uid ""
+
+"@types/kbn__kibana-json-schema@link:bazel-bin/packages/kbn-kibana-json-schema/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__logging-mocks@link:bazel-bin/packages/kbn-logging-mocks/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6163,6 +6268,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__shared-ux-button-exit-full-screen@link:bazel-bin/packages/shared-ux/button/exit_full_screen/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__shared-ux-components@link:bazel-bin/packages/kbn-shared-ux-components/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6179,10 +6288,18 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__sort-package-json@link:bazel-bin/packages/kbn-sort-package-json/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__std@link:bazel-bin/packages/kbn-std/npm_module_types":
   version "0.0.0"
   uid ""
 
+"@types/kbn__stdio-dev-helpers@link:bazel-bin/packages/kbn-stdio-dev-helpers/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__storybook@link:bazel-bin/packages/kbn-storybook/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6199,6 +6316,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__tooling-log@link:bazel-bin/packages/kbn-tooling-log/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__typed-react-router-config@link:bazel-bin/packages/kbn-typed-react-router-config/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6281,6 +6402,20 @@
   resolved "https://registry.yarnpkg.com/@types/lz-string/-/lz-string-1.3.34.tgz#69bfadde419314b4a374bf2c8e58659c035ed0a5"
   integrity sha512-j6G1e8DULJx3ONf6NdR5JiR2ZY3K3PaaqiEuKYkLQO0Czfi1AzrtjfnfCROyWGeDd5IVMKCwsgSmMip9OWijow==
 
+"@types/mapbox__point-geometry@*", "@types/mapbox__point-geometry@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz#488a9b76e8457d6792ea2504cdd4ecdd9860a27e"
+  integrity sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA==
+
+"@types/mapbox__vector-tile@1.3.0", "@types/mapbox__vector-tile@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz#8fa1379dbaead1e1b639b8d96cfd174404c379d6"
+  integrity sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==
+  dependencies:
+    "@types/geojson" "*"
+    "@types/mapbox__point-geometry" "*"
+    "@types/pbf" "*"
+
 "@types/markdown-it@^12.2.3":
   version "12.2.3"
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
@@ -6511,6 +6646,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
   integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
 
+"@types/pbf@*", "@types/pbf@3.0.2", "@types/pbf@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.2.tgz#8d291ad68b4b8c533e96c174a2e3e6399a59ed61"
+  integrity sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ==
+
 "@types/pdfkit@*":
   version "0.10.6"
   resolved "https://registry.yarnpkg.com/@types/pdfkit/-/pdfkit-0.10.6.tgz#9ddde7e642e6c3f1245134456a03fbc4b67dc4b5"
@@ -6647,6 +6787,13 @@
   resolved "https://registry.yarnpkg.com/@types/react-intl/-/react-intl-2.3.17.tgz#e1fc6e46e8af58bdef9531259d509380a8a99e8e"
   integrity sha512-FGd6J1GQ7zvl1GZ3BBev83B7nfak8dqoR2PZ+l5MoisKMpd4xOLhZJC1ugpmk3Rz5F85t6HbOg9mYqXW97BsNA==
 
+"@types/react-is@^16.7.1":
+  version "16.7.2"
+  resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.2.tgz#8c2862013d00d741be189ceb71da8e8d21e8fa7d"
+  integrity sha512-rdQUu9J+RUz4Vcr768UyTzv+fZGzKBy1/PPhaxTfzAfaHSW4+b0olA6czXLZv7PO7/ktbHu41kcpAG7Z46kvDQ==
+  dependencies:
+    "@types/react" "^16"
+
 "@types/react-native@*":
   version "0.60.22"
   resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.60.22.tgz#ba199a441cb0612514244ffb1d0fe6f04c878575"
@@ -6741,7 +6888,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16.9.0", "@types/react@^16.9.36":
+"@types/react@*", "@types/react@>=16.9.0", "@types/react@^16", "@types/react@^16.9.36":
   version "16.9.36"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.36.tgz#ade589ff51e2a903e34ee4669e05dbfa0c1ce849"
   integrity sha512-mGgUb/Rk/vGx4NCvquRuSH0GHBQKb1OqpGS9cT9lFxlTLHZgkksgI60TuIxubmn7JuCb+sENHhQciqa0npm0AQ==
@@ -7151,14 +7298,14 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@typescript-eslint/eslint-plugin@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67"
-  integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==
+"@typescript-eslint/eslint-plugin@^5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz#022531a639640ff3faafaf251d1ce00a2ef000a1"
+  integrity sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/type-utils" "5.17.0"
-    "@typescript-eslint/utils" "5.17.0"
+    "@typescript-eslint/scope-manager" "5.20.0"
+    "@typescript-eslint/type-utils" "5.20.0"
+    "@typescript-eslint/utils" "5.20.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -7178,14 +7325,14 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5"
-  integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==
+"@typescript-eslint/parser@^5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.20.0.tgz#4991c4ee0344315c2afc2a62f156565f689c8d0b"
+  integrity sha512-UWKibrCZQCYvobmu3/N8TWbEeo/EPQbS41Ux1F9XqPzGuV7pfg6n50ZrFo6hryynD8qOTTfLHtHjjdQtxJ0h/w==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
+    "@typescript-eslint/scope-manager" "5.20.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/typescript-estree" "5.20.0"
     debug "^4.3.2"
 
 "@typescript-eslint/scope-manager@4.31.2":
@@ -7196,20 +7343,20 @@
     "@typescript-eslint/types" "4.31.2"
     "@typescript-eslint/visitor-keys" "4.31.2"
 
-"@typescript-eslint/scope-manager@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
-  integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==
+"@typescript-eslint/scope-manager@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz#79c7fb8598d2942e45b3c881ced95319818c7980"
+  integrity sha512-h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/visitor-keys" "5.20.0"
 
-"@typescript-eslint/type-utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672"
-  integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==
+"@typescript-eslint/type-utils@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.20.0.tgz#151c21cbe9a378a34685735036e5ddfc00223be3"
+  integrity sha512-WxNrCwYB3N/m8ceyoGCgbLmuZwupvzN0rE8NBuwnl7APgjv24ZJIjkNzoFBXPRCGzLNkoU/WfanW0exvp/+3Iw==
   dependencies:
-    "@typescript-eslint/utils" "5.17.0"
+    "@typescript-eslint/utils" "5.20.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
@@ -7218,10 +7365,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.2.tgz#2aea7177d6d744521a168ed4668eddbd912dfadf"
   integrity sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==
 
-"@typescript-eslint/types@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
-  integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==
+"@typescript-eslint/types@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.20.0.tgz#fa39c3c2aa786568302318f1cb51fcf64258c20c"
+  integrity sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg==
 
 "@typescript-eslint/typescript-estree@4.31.2":
   version "4.31.2"
@@ -7236,28 +7383,28 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.17.0", "@typescript-eslint/typescript-estree@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488"
-  integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==
+"@typescript-eslint/typescript-estree@5.20.0", "@typescript-eslint/typescript-estree@^5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz#ab73686ab18c8781bbf249c9459a55dc9417d6b0"
+  integrity sha512-36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/visitor-keys" "5.20.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306"
-  integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==
+"@typescript-eslint/utils@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.20.0.tgz#b8e959ed11eca1b2d5414e12417fd94cae3517a5"
+  integrity sha512-lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
+    "@typescript-eslint/scope-manager" "5.20.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/typescript-estree" "5.20.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -7269,12 +7416,12 @@
     "@typescript-eslint/types" "4.31.2"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
-  integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==
+"@typescript-eslint/visitor-keys@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz#70236b5c6b67fbaf8b2f58bf3414b76c1e826c2a"
+  integrity sha512-1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
+    "@typescript-eslint/types" "5.20.0"
     eslint-visitor-keys "^3.0.0"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -10361,7 +10508,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.8.2, color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -10385,15 +10532,7 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.4.0, color-string@^1.5.2, color-string@^1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
-  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color-string@^1.9.0:
+color-string@^1.5.2, color-string@^1.6.0, color-string@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa"
   integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
@@ -10406,14 +10545,6 @@ color-support@^1.1.3:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
-  integrity sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=
-  dependencies:
-    color-convert "^1.8.2"
-    color-string "^1.4.0"
-
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
@@ -10423,17 +10554,17 @@ color@3.0.x:
     color-string "^1.5.2"
 
 color@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
-  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
+  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
   dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.4"
+    color-convert "^1.9.3"
+    color-string "^1.6.0"
 
-color@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-4.2.1.tgz#498aee5fce7fc982606c8875cab080ac0547c884"
-  integrity sha512-MFJr0uY4RvTQUKvPq7dh9grVOTYSFeXja2mBXioCGjnjJoXrAp9jJ1NQTDR73c9nwBSAQiNKloKl5zq9WB9UPw==
+color@^4.2.1, color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
   dependencies:
     color-convert "^2.0.1"
     color-string "^1.9.0"
@@ -12828,10 +12959,10 @@ each-props@^1.3.0:
     is-plain-object "^2.0.1"
     object.defaults "^1.1.0"
 
-earcut@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.2.tgz#41b0bc35f63e0fe80da7cddff28511e7e2e80d11"
-  integrity sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ==
+earcut@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.3.tgz#d44ced2ff5a18859568e327dd9c7d46b16f55cf4"
+  integrity sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
@@ -13426,11 +13557,12 @@ eslint-config-prettier@^7.2.0:
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
   integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
 
-eslint-formatter-pretty@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.0.0.tgz#dc15f3bf4fb51b7ba5fbedb77f57ba8841140ce2"
-  integrity sha512-QgdeZxQwWcN0TcXXNZJiS6BizhAANFhCzkE7Yl9HKB7WjElzwED6+FbbZB2gji8ofgJTGPqKm6VRCNT3OGCeEw==
+eslint-formatter-pretty@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz#7a6877c14ffe2672066c853587d89603e97c7708"
+  integrity sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==
   dependencies:
+    "@types/eslint" "^7.2.13"
     ansi-escapes "^4.2.1"
     chalk "^4.1.0"
     eslint-rule-docs "^1.1.5"
@@ -15069,6 +15201,11 @@ get-stream@^5.0.0, get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -15138,7 +15275,12 @@ github-slugger@^1.0.0:
   dependencies:
     emoji-regex ">=6.0.0 <=6.1.1"
 
-gl-matrix@^3.2.1, gl-matrix@~3.3.0:
+gl-matrix@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9"
+  integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==
+
+gl-matrix@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b"
   integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA==
@@ -15261,13 +15403,6 @@ glob@~7.1.1, glob@~7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
-  integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
-  dependencies:
-    ini "^1.3.5"
-
 global-dirs@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
@@ -15535,11 +15670,6 @@ graphql@^16.3.0:
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.3.0.tgz#a91e24d10babf9e60c706919bb182b53ccdffc05"
   integrity sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==
 
-grid-index@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"
-  integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==
-
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -17102,14 +17232,6 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69"
   integrity sha1-bghLvJIGH7sJcexYts5tQE4k2mk=
 
-is-installed-globally@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
-
 is-installed-globally@^0.4.0, is-installed-globally@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -17168,11 +17290,6 @@ is-npm@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-npm@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
-  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
-
 is-npm@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
@@ -18489,6 +18606,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema-typed@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9"
+  integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==
+
 json-schema@0.2.3, json-schema@0.4.0, json-schema@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
@@ -18835,7 +18957,7 @@ latest-version@^1.0.0:
   dependencies:
     package-json "^1.0.0"
 
-latest-version@^5.0.0, latest-version@^5.1.0:
+latest-version@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
   integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
@@ -19604,34 +19726,34 @@ mapcap@^1.0.0:
   resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a"
   integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g==
 
-maplibre-gl@1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.2.tgz#7fb47868b62455af916c090903f2154394450f9c"
-  integrity sha512-uPeV530apb4JfX3cRFfE+awFnbcJTOnCv2QvY4mw4huiInbybElWYkNzTs324YLSADq0f4bidRoYcR81ho3aLA==
+maplibre-gl@2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-2.1.9.tgz#042f3ef4224fa890ecf7a410145243f1fc943dcd"
+  integrity sha512-pnWJmILeZpgA5QSI7K7xFK3yrkyYTd9srw3fCi2Ca52Phm78hsznPwUErEQcZLfxXKn/1h9t8IPdj0TH0NBNbg==
   dependencies:
-    "@mapbox/geojson-rewind" "^0.5.0"
-    "@mapbox/geojson-types" "^1.0.2"
+    "@mapbox/geojson-rewind" "^0.5.1"
     "@mapbox/jsonlint-lines-primitives" "^2.0.2"
-    "@mapbox/mapbox-gl-supported" "^1.5.0"
+    "@mapbox/mapbox-gl-supported" "^2.0.1"
     "@mapbox/point-geometry" "^0.1.0"
-    "@mapbox/tiny-sdf" "^1.1.1"
-    "@mapbox/unitbezier" "^0.0.0"
+    "@mapbox/tiny-sdf" "^2.0.4"
+    "@mapbox/unitbezier" "^0.0.1"
     "@mapbox/vector-tile" "^1.3.1"
     "@mapbox/whoots-js" "^3.1.0"
+    "@types/geojson" "^7946.0.8"
+    "@types/mapbox__point-geometry" "^0.1.2"
+    "@types/mapbox__vector-tile" "^1.3.0"
+    "@types/pbf" "^3.0.2"
     csscolorparser "~1.0.3"
-    earcut "^2.2.2"
+    earcut "^2.2.3"
     geojson-vt "^3.2.1"
-    gl-matrix "^3.2.1"
-    grid-index "^1.1.0"
-    minimist "^1.2.5"
+    gl-matrix "^3.4.3"
     murmurhash-js "^1.0.0"
     pbf "^3.2.1"
-    potpack "^1.0.1"
+    potpack "^1.0.2"
     quickselect "^2.0.0"
-    rw "^1.3.3"
-    supercluster "^7.1.0"
+    supercluster "^7.1.4"
     tinyqueue "^2.0.3"
-    vt-pbf "^3.1.1"
+    vt-pbf "^3.1.3"
 
 marge@^1.0.1:
   version "1.0.1"
@@ -19899,25 +20021,6 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-7.0.1.tgz#1ed4a0a50b3844b451369c48362eb0515f04c1dc"
-  integrity sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    arrify "^2.0.1"
-    camelcase "^6.0.0"
-    camelcase-keys "^6.2.2"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "^4.0.2"
-    normalize-package-data "^2.5.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.13.1"
-    yargs-parser "^18.1.3"
-
 meow@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-8.0.0.tgz#1aa10ee61046719e334ffdc038bb5069250ec99a"
@@ -20131,7 +20234,7 @@ minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@4.1.0, minimist-options@^4.0.2:
+minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
@@ -22879,10 +22982,10 @@ postcss@^7.0.1, postcss@^7.0.27, postcss@^7.0.35, postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-potpack@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
-  integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==
+potpack@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14"
+  integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==
 
 preact-render-to-string@^5.1.19:
   version "5.1.19"
@@ -22937,10 +23040,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.1.tgz#d472797e0d7461605c1609808e27b80c0f9cfe17"
-  integrity sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==
+prettier@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
+  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
 
 prettier@~2.2.1:
   version "2.2.1"
@@ -23305,13 +23408,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726"
-  integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==
-  dependencies:
-    escape-goat "^2.0.0"
-
 pupa@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
@@ -25382,7 +25478,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rw@1, rw@^1.3.2, rw@^1.3.3:
+rw@1, rw@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
@@ -27227,10 +27323,10 @@ superagent@^3.8.2:
     qs "^6.5.1"
     readable-stream "^2.3.5"
 
-supercluster@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.0.tgz#f0a457426ec0ab95d69c5f03b51e049774b94479"
-  integrity sha512-LDasImUAFMhTqhK+cUXfy9C2KTUqJ3gucLjmNLNFmKWOnDUBxLFLH9oKuXOTCLveecmxh8fbk8kgh6Q0gsfe2w==
+supercluster@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.4.tgz#6762aabfd985d3390b49f13b815567d5116a828a"
+  integrity sha512-GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g==
   dependencies:
     kdbush "^3.0.0"
 
@@ -28131,17 +28227,17 @@ tsconfig-paths@^3.11.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tsd@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/tsd/-/tsd-0.13.1.tgz#d2a8baa80b8319dafea37fbeb29fef3cec86e92b"
-  integrity sha512-+UYM8LRG/M4H8ISTg2ow8SWi65PS7Os+4DUnyiQLbJysXBp2DEmws9SMgBH+m8zHcJZqUJQ+mtDWJXP1IAvB2A==
+tsd@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/tsd/-/tsd-0.20.0.tgz#0346321ee3c506545486227e488e753109164248"
+  integrity sha512-iba/JlyT3qtnA9t8VrX2Fipu3L31U48oRIf1PNs+lIwQ7n63GTkt9eQlB5bLtfb7nYfy9t8oZzs+K4QEoEIS8Q==
   dependencies:
-    eslint-formatter-pretty "^4.0.0"
+    "@tsd/typescript" "~4.6.3"
+    eslint-formatter-pretty "^4.1.0"
     globby "^11.0.1"
-    meow "^7.0.1"
+    meow "^9.0.0"
     path-exists "^4.0.0"
     read-pkg-up "^7.0.0"
-    update-notifier "^4.1.0"
 
 tslib@2.3.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@~2.3.1:
   version "2.3.1"
@@ -28221,11 +28317,6 @@ type-detect@^1.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
   integrity sha1-diIXzAbbJY7EiQihKY6LlRIejqI=
 
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
 type-fest@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
@@ -28791,25 +28882,6 @@ update-notifier@^0.5.0:
     semver-diff "^2.0.0"
     string-length "^1.0.0"
 
-update-notifier@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
-  integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
-  dependencies:
-    boxen "^4.2.0"
-    chalk "^3.0.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.1"
-    is-npm "^4.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    pupa "^2.0.1"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
-
 update-notifier@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
@@ -29657,6 +29729,15 @@ vt-pbf@^3.1.1:
     "@mapbox/vector-tile" "^1.3.1"
     pbf "^3.0.5"
 
+vt-pbf@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac"
+  integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==
+  dependencies:
+    "@mapbox/point-geometry" "0.1.0"
+    "@mapbox/vector-tile" "^1.3.1"
+    pbf "^3.2.1"
+
 w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -30477,7 +30558,7 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.2, yargs-parser@^18.1.3:
+yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==